]> git.ipfire.org Git - thirdparty/grsecurity-scrape.git/blob - test/grsecurity-2.9.1-3.6.8-201211271748.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.6.8-201211271748.patch
1 diff --git a/Documentation/dontdiff b/Documentation/dontdiff
2 index 39462cf..611a556 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,14 +163,14 @@ 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 kxgettext
123 lex.c
124 lex.*.c
125 -linux
126 +lib1funcs.S
127 logo_*.c
128 logo_*_clut224.c
129 logo_*_mono.c
130 @@ -163,14 +181,15 @@ machtypes.h
131 map
132 map_hugetlb
133 maui_boot.h
134 -media
135 mconf
136 +mdp
137 miboot*
138 mk_elfconfig
139 mkboot
140 mkbugboot
141 mkcpustr
142 mkdep
143 +mkpiggy
144 mkprep
145 mkregtable
146 mktables
147 @@ -187,6 +206,8 @@ oui.c*
148 page-types
149 parse.c
150 parse.h
151 +parse-events*
152 +pasyms.h
153 patches*
154 pca200e.bin
155 pca200e_ecd.bin2
156 @@ -196,6 +217,7 @@ perf-archive
157 piggyback
158 piggy.gzip
159 piggy.S
160 +pmu-*
161 pnmtologo
162 ppc_defs.h*
163 pss_boot.h
164 @@ -205,7 +227,10 @@ r200_reg_safe.h
165 r300_reg_safe.h
166 r420_reg_safe.h
167 r600_reg_safe.h
168 +realmode.lds
169 +realmode.relocs
170 recordmcount
171 +regdb.c
172 relocs
173 rlim_names.h
174 rn50_reg_safe.h
175 @@ -215,8 +240,11 @@ series
176 setup
177 setup.bin
178 setup.elf
179 +size_overflow_hash.h
180 sImage
181 +slabinfo
182 sm_tbl*
183 +sortextable
184 split-include
185 syscalltab.h
186 tables.c
187 @@ -226,6 +254,7 @@ tftpboot.img
188 timeconst.h
189 times.h*
190 trix_boot.h
191 +user_constants.h
192 utsrelease.h*
193 vdso-syms.lds
194 vdso.lds
195 @@ -237,13 +266,17 @@ vdso32.lds
196 vdso32.so.dbg
197 vdso64.lds
198 vdso64.so.dbg
199 +vdsox32.lds
200 +vdsox32-syms.lds
201 version.h*
202 vmImage
203 vmlinux
204 vmlinux-*
205 vmlinux.aout
206 vmlinux.bin.all
207 +vmlinux.bin.bz2
208 vmlinux.lds
209 +vmlinux.relocs
210 vmlinuz
211 voffset.h
212 vsyscall.lds
213 @@ -251,9 +284,11 @@ vsyscall_32.lds
214 wanxlfw.inc
215 uImage
216 unifdef
217 +utsrelease.h
218 wakeup.bin
219 wakeup.elf
220 wakeup.lds
221 zImage*
222 zconf.hash.c
223 +zconf.lex.c
224 zoffset.h
225 diff --git a/Documentation/kernel-parameters.txt b/Documentation/kernel-parameters.txt
226 index ad7e2e5..199f49e 100644
227 --- a/Documentation/kernel-parameters.txt
228 +++ b/Documentation/kernel-parameters.txt
229 @@ -905,6 +905,9 @@ bytes respectively. Such letter suffixes can also be entirely omitted.
230 gpt [EFI] Forces disk with valid GPT signature but
231 invalid Protective MBR to be treated as GPT.
232
233 + grsec_proc_gid= [GRKERNSEC_PROC_USERGROUP] Chooses GID to
234 + ignore grsecurity's /proc restrictions
235 +
236 hashdist= [KNL,NUMA] Large hashes allocated during boot
237 are distributed across NUMA nodes. Defaults on
238 for 64-bit NUMA, off otherwise.
239 @@ -2050,6 +2053,13 @@ bytes respectively. Such letter suffixes can also be entirely omitted.
240 the specified number of seconds. This is to be used if
241 your oopses keep scrolling off the screen.
242
243 + pax_nouderef [X86] disables UDEREF. Most likely needed under certain
244 + virtualization environments that don't cope well with the
245 + expand down segment used by UDEREF on X86-32 or the frequent
246 + page table updates on X86-64.
247 +
248 + pax_softmode= 0/1 to disable/enable PaX softmode on boot already.
249 +
250 pcbit= [HW,ISDN]
251
252 pcd. [PARIDE]
253 diff --git a/Makefile b/Makefile
254 index c5cc2f0..6570abb 100644
255 --- a/Makefile
256 +++ b/Makefile
257 @@ -241,8 +241,9 @@ CONFIG_SHELL := $(shell if [ -x "$$BASH" ]; then echo $$BASH; \
258
259 HOSTCC = gcc
260 HOSTCXX = g++
261 -HOSTCFLAGS = -Wall -Wmissing-prototypes -Wstrict-prototypes -O2 -fomit-frame-pointer
262 -HOSTCXXFLAGS = -O2
263 +HOSTCFLAGS = -Wall -W -Wmissing-prototypes -Wstrict-prototypes -Wno-unused-parameter -Wno-missing-field-initializers -O2 -fomit-frame-pointer -fno-delete-null-pointer-checks
264 +HOSTCLFAGS += $(call cc-option, -Wno-empty-body)
265 +HOSTCXXFLAGS = -O2 -Wall -W -fno-delete-null-pointer-checks
266
267 # Decide whether to build built-in, modular, or both.
268 # Normally, just do built-in.
269 @@ -404,8 +405,8 @@ export RCS_TAR_IGNORE := --exclude SCCS --exclude BitKeeper --exclude .svn \
270 # Rules shared between *config targets and build targets
271
272 # Basic helpers built in scripts/
273 -PHONY += scripts_basic
274 -scripts_basic:
275 +PHONY += scripts_basic gcc-plugins
276 +scripts_basic: gcc-plugins
277 $(Q)$(MAKE) $(build)=scripts/basic
278 $(Q)rm -f .tmp_quiet_recordmcount
279
280 @@ -561,6 +562,60 @@ else
281 KBUILD_CFLAGS += -O2
282 endif
283
284 +ifndef DISABLE_PAX_PLUGINS
285 +PLUGINCC := $(shell $(CONFIG_SHELL) $(srctree)/scripts/gcc-plugin.sh "$(HOSTCC)" "$(HOSTCXX)" "$(CC)")
286 +ifneq ($(PLUGINCC),)
287 +ifndef DISABLE_PAX_CONSTIFY_PLUGIN
288 +ifndef CONFIG_UML
289 +CONSTIFY_PLUGIN_CFLAGS := -fplugin=$(objtree)/tools/gcc/constify_plugin.so -DCONSTIFY_PLUGIN
290 +endif
291 +endif
292 +ifdef CONFIG_PAX_MEMORY_STACKLEAK
293 +STACKLEAK_PLUGIN_CFLAGS := -fplugin=$(objtree)/tools/gcc/stackleak_plugin.so -DSTACKLEAK_PLUGIN
294 +STACKLEAK_PLUGIN_CFLAGS += -fplugin-arg-stackleak_plugin-track-lowest-sp=100
295 +endif
296 +ifdef CONFIG_KALLOCSTAT_PLUGIN
297 +KALLOCSTAT_PLUGIN_CFLAGS := -fplugin=$(objtree)/tools/gcc/kallocstat_plugin.so
298 +endif
299 +ifdef CONFIG_PAX_KERNEXEC_PLUGIN
300 +KERNEXEC_PLUGIN_CFLAGS := -fplugin=$(objtree)/tools/gcc/kernexec_plugin.so
301 +KERNEXEC_PLUGIN_CFLAGS += -fplugin-arg-kernexec_plugin-method=$(CONFIG_PAX_KERNEXEC_PLUGIN_METHOD) -DKERNEXEC_PLUGIN
302 +KERNEXEC_PLUGIN_AFLAGS := -DKERNEXEC_PLUGIN
303 +endif
304 +ifdef CONFIG_CHECKER_PLUGIN
305 +ifeq ($(call cc-ifversion, -ge, 0406, y), y)
306 +CHECKER_PLUGIN_CFLAGS := -fplugin=$(objtree)/tools/gcc/checker_plugin.so -DCHECKER_PLUGIN
307 +endif
308 +endif
309 +COLORIZE_PLUGIN_CFLAGS := -fplugin=$(objtree)/tools/gcc/colorize_plugin.so
310 +ifdef CONFIG_PAX_SIZE_OVERFLOW
311 +SIZE_OVERFLOW_PLUGIN_CFLAGS := -fplugin=$(objtree)/tools/gcc/size_overflow_plugin.so -DSIZE_OVERFLOW_PLUGIN
312 +endif
313 +ifdef CONFIG_PAX_LATENT_ENTROPY
314 +LATENT_ENTROPY_PLUGIN_CFLAGS := -fplugin=$(objtree)/tools/gcc/latent_entropy_plugin.so -DLATENT_ENTROPY_PLUGIN
315 +endif
316 +GCC_PLUGINS_CFLAGS := $(CONSTIFY_PLUGIN_CFLAGS) $(STACKLEAK_PLUGIN_CFLAGS) $(KALLOCSTAT_PLUGIN_CFLAGS)
317 +GCC_PLUGINS_CFLAGS += $(KERNEXEC_PLUGIN_CFLAGS) $(CHECKER_PLUGIN_CFLAGS) $(COLORIZE_PLUGIN_CFLAGS)
318 +GCC_PLUGINS_CFLAGS += $(SIZE_OVERFLOW_PLUGIN_CFLAGS) $(LATENT_ENTROPY_PLUGIN_CFLAGS)
319 +GCC_PLUGINS_AFLAGS := $(KERNEXEC_PLUGIN_AFLAGS)
320 +export PLUGINCC GCC_PLUGINS_CFLAGS GCC_PLUGINS_AFLAGS CONSTIFY_PLUGIN
321 +ifeq ($(KBUILD_EXTMOD),)
322 +gcc-plugins:
323 + $(Q)$(MAKE) $(build)=tools/gcc
324 +else
325 +gcc-plugins: ;
326 +endif
327 +else
328 +gcc-plugins:
329 +ifeq ($(call cc-ifversion, -ge, 0405, y), y)
330 + $(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.))
331 +else
332 + $(Q)echo "warning, your gcc version does not support plugins, you should upgrade it to gcc 4.5 at least"
333 +endif
334 + $(Q)echo "PAX_MEMORY_STACKLEAK and other features will be less secure"
335 +endif
336 +endif
337 +
338 include $(srctree)/arch/$(SRCARCH)/Makefile
339
340 ifdef CONFIG_READABLE_ASM
341 @@ -715,7 +770,7 @@ export mod_strip_cmd
342
343
344 ifeq ($(KBUILD_EXTMOD),)
345 -core-y += kernel/ mm/ fs/ ipc/ security/ crypto/ block/
346 +core-y += kernel/ mm/ fs/ ipc/ security/ crypto/ block/ grsecurity/
347
348 vmlinux-dirs := $(patsubst %/,%,$(filter %/, $(init-y) $(init-m) \
349 $(core-y) $(core-m) $(drivers-y) $(drivers-m) \
350 @@ -762,6 +817,8 @@ endif
351
352 # The actual objects are generated when descending,
353 # make sure no implicit rule kicks in
354 +$(filter-out $(init-y),$(vmlinux-deps)): KBUILD_CFLAGS += $(GCC_PLUGINS_CFLAGS)
355 +$(filter-out $(init-y),$(vmlinux-deps)): KBUILD_AFLAGS += $(GCC_PLUGINS_AFLAGS)
356 $(sort $(vmlinux-deps)): $(vmlinux-dirs) ;
357
358 # Handle descending into subdirectories listed in $(vmlinux-dirs)
359 @@ -771,7 +828,7 @@ $(sort $(vmlinux-deps)): $(vmlinux-dirs) ;
360 # Error messages still appears in the original language
361
362 PHONY += $(vmlinux-dirs)
363 -$(vmlinux-dirs): prepare scripts
364 +$(vmlinux-dirs): gcc-plugins prepare scripts
365 $(Q)$(MAKE) $(build)=$@
366
367 # Store (new) KERNELRELASE string in include/config/kernel.release
368 @@ -815,6 +872,7 @@ prepare0: archprepare FORCE
369 $(Q)$(MAKE) $(build)=.
370
371 # All the preparing..
372 +prepare: KBUILD_CFLAGS := $(filter-out $(GCC_PLUGINS_CFLAGS),$(KBUILD_CFLAGS))
373 prepare: prepare0
374
375 # Generate some files
376 @@ -922,6 +980,8 @@ all: modules
377 # using awk while concatenating to the final file.
378
379 PHONY += modules
380 +modules: KBUILD_CFLAGS += $(GCC_PLUGINS_CFLAGS)
381 +modules: KBUILD_AFLAGS += $(GCC_PLUGINS_AFLAGS)
382 modules: $(vmlinux-dirs) $(if $(KBUILD_BUILTIN),vmlinux) modules.builtin
383 $(Q)$(AWK) '!x[$$0]++' $(vmlinux-dirs:%=$(objtree)/%/modules.order) > $(objtree)/modules.order
384 @$(kecho) ' Building modules, stage 2.';
385 @@ -937,7 +997,7 @@ modules.builtin: $(vmlinux-dirs:%=%/modules.builtin)
386
387 # Target to prepare building external modules
388 PHONY += modules_prepare
389 -modules_prepare: prepare scripts
390 +modules_prepare: gcc-plugins prepare scripts
391
392 # Target to install modules
393 PHONY += modules_install
394 @@ -994,7 +1054,7 @@ CLEAN_DIRS += $(MODVERDIR)
395 MRPROPER_DIRS += include/config usr/include include/generated \
396 arch/*/include/generated
397 MRPROPER_FILES += .config .config.old .version .old_version \
398 - include/linux/version.h \
399 + include/linux/version.h tools/gcc/size_overflow_hash.h\
400 Module.symvers tags TAGS cscope* GPATH GTAGS GRTAGS GSYMS
401
402 # clean - Delete most, but leave enough to build external modules
403 @@ -1032,6 +1092,7 @@ distclean: mrproper
404 \( -name '*.orig' -o -name '*.rej' -o -name '*~' \
405 -o -name '*.bak' -o -name '#*#' -o -name '.*.orig' \
406 -o -name '.*.rej' \
407 + -o -name '.*.rej' -o -name '*.so' \
408 -o -name '*%' -o -name '.*.cmd' -o -name 'core' \) \
409 -type f -print | xargs rm -f
410
411 @@ -1192,6 +1253,8 @@ PHONY += $(module-dirs) modules
412 $(module-dirs): crmodverdir $(objtree)/Module.symvers
413 $(Q)$(MAKE) $(build)=$(patsubst _module_%,%,$@)
414
415 +modules: KBUILD_CFLAGS += $(GCC_PLUGINS_CFLAGS)
416 +modules: KBUILD_AFLAGS += $(GCC_PLUGINS_AFLAGS)
417 modules: $(module-dirs)
418 @$(kecho) ' Building modules, stage 2.';
419 $(Q)$(MAKE) -f $(srctree)/scripts/Makefile.modpost
420 @@ -1326,17 +1389,21 @@ else
421 target-dir = $(if $(KBUILD_EXTMOD),$(dir $<),$(dir $@))
422 endif
423
424 -%.s: %.c prepare scripts FORCE
425 +%.s: KBUILD_CFLAGS += $(GCC_PLUGINS_CFLAGS)
426 +%.s: KBUILD_AFLAGS += $(GCC_PLUGINS_AFLAGS)
427 +%.s: %.c gcc-plugins prepare scripts FORCE
428 $(Q)$(MAKE) $(build)=$(build-dir) $(target-dir)$(notdir $@)
429 %.i: %.c prepare scripts FORCE
430 $(Q)$(MAKE) $(build)=$(build-dir) $(target-dir)$(notdir $@)
431 -%.o: %.c prepare scripts FORCE
432 +%.o: KBUILD_CFLAGS += $(GCC_PLUGINS_CFLAGS)
433 +%.o: KBUILD_AFLAGS += $(GCC_PLUGINS_AFLAGS)
434 +%.o: %.c gcc-plugins prepare scripts FORCE
435 $(Q)$(MAKE) $(build)=$(build-dir) $(target-dir)$(notdir $@)
436 %.lst: %.c prepare scripts FORCE
437 $(Q)$(MAKE) $(build)=$(build-dir) $(target-dir)$(notdir $@)
438 -%.s: %.S prepare scripts FORCE
439 +%.s: %.S gcc-plugins prepare scripts FORCE
440 $(Q)$(MAKE) $(build)=$(build-dir) $(target-dir)$(notdir $@)
441 -%.o: %.S prepare scripts FORCE
442 +%.o: %.S gcc-plugins prepare scripts FORCE
443 $(Q)$(MAKE) $(build)=$(build-dir) $(target-dir)$(notdir $@)
444 %.symtypes: %.c prepare scripts FORCE
445 $(Q)$(MAKE) $(build)=$(build-dir) $(target-dir)$(notdir $@)
446 @@ -1346,11 +1413,15 @@ endif
447 $(cmd_crmodverdir)
448 $(Q)$(MAKE) KBUILD_MODULES=$(if $(CONFIG_MODULES),1) \
449 $(build)=$(build-dir)
450 -%/: prepare scripts FORCE
451 +%/: KBUILD_CFLAGS += $(GCC_PLUGINS_CFLAGS)
452 +%/: KBUILD_AFLAGS += $(GCC_PLUGINS_AFLAGS)
453 +%/: gcc-plugins prepare scripts FORCE
454 $(cmd_crmodverdir)
455 $(Q)$(MAKE) KBUILD_MODULES=$(if $(CONFIG_MODULES),1) \
456 $(build)=$(build-dir)
457 -%.ko: prepare scripts FORCE
458 +%.ko: KBUILD_CFLAGS += $(GCC_PLUGINS_CFLAGS)
459 +%.ko: KBUILD_AFLAGS += $(GCC_PLUGINS_AFLAGS)
460 +%.ko: gcc-plugins prepare scripts FORCE
461 $(cmd_crmodverdir)
462 $(Q)$(MAKE) KBUILD_MODULES=$(if $(CONFIG_MODULES),1) \
463 $(build)=$(build-dir) $(@:.ko=.o)
464 diff --git a/arch/alpha/include/asm/atomic.h b/arch/alpha/include/asm/atomic.h
465 index c2cbe4f..f7264b4 100644
466 --- a/arch/alpha/include/asm/atomic.h
467 +++ b/arch/alpha/include/asm/atomic.h
468 @@ -250,6 +250,16 @@ static __inline__ int atomic64_add_unless(atomic64_t *v, long a, long u)
469 #define atomic_dec(v) atomic_sub(1,(v))
470 #define atomic64_dec(v) atomic64_sub(1,(v))
471
472 +#define atomic64_read_unchecked(v) atomic64_read(v)
473 +#define atomic64_set_unchecked(v, i) atomic64_set((v), (i))
474 +#define atomic64_add_unchecked(a, v) atomic64_add((a), (v))
475 +#define atomic64_add_return_unchecked(a, v) atomic64_add_return((a), (v))
476 +#define atomic64_sub_unchecked(a, v) atomic64_sub((a), (v))
477 +#define atomic64_inc_unchecked(v) atomic64_inc(v)
478 +#define atomic64_inc_return_unchecked(v) atomic64_inc_return(v)
479 +#define atomic64_dec_unchecked(v) atomic64_dec(v)
480 +#define atomic64_cmpxchg_unchecked(v, o, n) atomic64_cmpxchg((v), (o), (n))
481 +
482 #define smp_mb__before_atomic_dec() smp_mb()
483 #define smp_mb__after_atomic_dec() smp_mb()
484 #define smp_mb__before_atomic_inc() smp_mb()
485 diff --git a/arch/alpha/include/asm/cache.h b/arch/alpha/include/asm/cache.h
486 index ad368a9..fbe0f25 100644
487 --- a/arch/alpha/include/asm/cache.h
488 +++ b/arch/alpha/include/asm/cache.h
489 @@ -4,19 +4,19 @@
490 #ifndef __ARCH_ALPHA_CACHE_H
491 #define __ARCH_ALPHA_CACHE_H
492
493 +#include <linux/const.h>
494
495 /* Bytes per L1 (data) cache line. */
496 #if defined(CONFIG_ALPHA_GENERIC) || defined(CONFIG_ALPHA_EV6)
497 -# define L1_CACHE_BYTES 64
498 # define L1_CACHE_SHIFT 6
499 #else
500 /* Both EV4 and EV5 are write-through, read-allocate,
501 direct-mapped, physical.
502 */
503 -# define L1_CACHE_BYTES 32
504 # define L1_CACHE_SHIFT 5
505 #endif
506
507 +#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT)
508 #define SMP_CACHE_BYTES L1_CACHE_BYTES
509
510 #endif
511 diff --git a/arch/alpha/include/asm/elf.h b/arch/alpha/include/asm/elf.h
512 index 968d999..d36b2df 100644
513 --- a/arch/alpha/include/asm/elf.h
514 +++ b/arch/alpha/include/asm/elf.h
515 @@ -91,6 +91,13 @@ typedef elf_fpreg_t elf_fpregset_t[ELF_NFPREG];
516
517 #define ELF_ET_DYN_BASE (TASK_UNMAPPED_BASE + 0x1000000)
518
519 +#ifdef CONFIG_PAX_ASLR
520 +#define PAX_ELF_ET_DYN_BASE (current->personality & ADDR_LIMIT_32BIT ? 0x10000 : 0x120000000UL)
521 +
522 +#define PAX_DELTA_MMAP_LEN (current->personality & ADDR_LIMIT_32BIT ? 14 : 28)
523 +#define PAX_DELTA_STACK_LEN (current->personality & ADDR_LIMIT_32BIT ? 14 : 19)
524 +#endif
525 +
526 /* $0 is set by ld.so to a pointer to a function which might be
527 registered using atexit. This provides a mean for the dynamic
528 linker to call DT_FINI functions for shared libraries that have
529 diff --git a/arch/alpha/include/asm/pgalloc.h b/arch/alpha/include/asm/pgalloc.h
530 index bc2a0da..8ad11ee 100644
531 --- a/arch/alpha/include/asm/pgalloc.h
532 +++ b/arch/alpha/include/asm/pgalloc.h
533 @@ -29,6 +29,12 @@ pgd_populate(struct mm_struct *mm, pgd_t *pgd, pmd_t *pmd)
534 pgd_set(pgd, pmd);
535 }
536
537 +static inline void
538 +pgd_populate_kernel(struct mm_struct *mm, pgd_t *pgd, pmd_t *pmd)
539 +{
540 + pgd_populate(mm, pgd, pmd);
541 +}
542 +
543 extern pgd_t *pgd_alloc(struct mm_struct *mm);
544
545 static inline void
546 diff --git a/arch/alpha/include/asm/pgtable.h b/arch/alpha/include/asm/pgtable.h
547 index 81a4342..348b927 100644
548 --- a/arch/alpha/include/asm/pgtable.h
549 +++ b/arch/alpha/include/asm/pgtable.h
550 @@ -102,6 +102,17 @@ struct vm_area_struct;
551 #define PAGE_SHARED __pgprot(_PAGE_VALID | __ACCESS_BITS)
552 #define PAGE_COPY __pgprot(_PAGE_VALID | __ACCESS_BITS | _PAGE_FOW)
553 #define PAGE_READONLY __pgprot(_PAGE_VALID | __ACCESS_BITS | _PAGE_FOW)
554 +
555 +#ifdef CONFIG_PAX_PAGEEXEC
556 +# define PAGE_SHARED_NOEXEC __pgprot(_PAGE_VALID | __ACCESS_BITS | _PAGE_FOE)
557 +# define PAGE_COPY_NOEXEC __pgprot(_PAGE_VALID | __ACCESS_BITS | _PAGE_FOW | _PAGE_FOE)
558 +# define PAGE_READONLY_NOEXEC __pgprot(_PAGE_VALID | __ACCESS_BITS | _PAGE_FOW | _PAGE_FOE)
559 +#else
560 +# define PAGE_SHARED_NOEXEC PAGE_SHARED
561 +# define PAGE_COPY_NOEXEC PAGE_COPY
562 +# define PAGE_READONLY_NOEXEC PAGE_READONLY
563 +#endif
564 +
565 #define PAGE_KERNEL __pgprot(_PAGE_VALID | _PAGE_ASM | _PAGE_KRE | _PAGE_KWE)
566
567 #define _PAGE_NORMAL(x) __pgprot(_PAGE_VALID | __ACCESS_BITS | (x))
568 diff --git a/arch/alpha/kernel/module.c b/arch/alpha/kernel/module.c
569 index 2fd00b7..cfd5069 100644
570 --- a/arch/alpha/kernel/module.c
571 +++ b/arch/alpha/kernel/module.c
572 @@ -160,7 +160,7 @@ apply_relocate_add(Elf64_Shdr *sechdrs, const char *strtab,
573
574 /* The small sections were sorted to the end of the segment.
575 The following should definitely cover them. */
576 - gp = (u64)me->module_core + me->core_size - 0x8000;
577 + gp = (u64)me->module_core_rw + me->core_size_rw - 0x8000;
578 got = sechdrs[me->arch.gotsecindex].sh_addr;
579
580 for (i = 0; i < n; i++) {
581 diff --git a/arch/alpha/kernel/osf_sys.c b/arch/alpha/kernel/osf_sys.c
582 index bc1acdd..a922a6d 100644
583 --- a/arch/alpha/kernel/osf_sys.c
584 +++ b/arch/alpha/kernel/osf_sys.c
585 @@ -1312,7 +1312,7 @@ arch_get_unmapped_area_1(unsigned long addr, unsigned long len,
586 /* At this point: (!vma || addr < vma->vm_end). */
587 if (limit - len < addr)
588 return -ENOMEM;
589 - if (!vma || addr + len <= vma->vm_start)
590 + if (check_heap_stack_gap(vma, addr, len))
591 return addr;
592 addr = vma->vm_end;
593 vma = vma->vm_next;
594 @@ -1348,6 +1348,10 @@ arch_get_unmapped_area(struct file *filp, unsigned long addr,
595 merely specific addresses, but regions of memory -- perhaps
596 this feature should be incorporated into all ports? */
597
598 +#ifdef CONFIG_PAX_RANDMMAP
599 + if (!(current->mm->pax_flags & MF_PAX_RANDMMAP))
600 +#endif
601 +
602 if (addr) {
603 addr = arch_get_unmapped_area_1 (PAGE_ALIGN(addr), len, limit);
604 if (addr != (unsigned long) -ENOMEM)
605 @@ -1355,8 +1359,8 @@ arch_get_unmapped_area(struct file *filp, unsigned long addr,
606 }
607
608 /* Next, try allocating at TASK_UNMAPPED_BASE. */
609 - addr = arch_get_unmapped_area_1 (PAGE_ALIGN(TASK_UNMAPPED_BASE),
610 - len, limit);
611 + addr = arch_get_unmapped_area_1 (PAGE_ALIGN(current->mm->mmap_base), len, limit);
612 +
613 if (addr != (unsigned long) -ENOMEM)
614 return addr;
615
616 diff --git a/arch/alpha/mm/fault.c b/arch/alpha/mm/fault.c
617 index 0c4132d..88f0d53 100644
618 --- a/arch/alpha/mm/fault.c
619 +++ b/arch/alpha/mm/fault.c
620 @@ -53,6 +53,124 @@ __load_new_mm_context(struct mm_struct *next_mm)
621 __reload_thread(pcb);
622 }
623
624 +#ifdef CONFIG_PAX_PAGEEXEC
625 +/*
626 + * PaX: decide what to do with offenders (regs->pc = fault address)
627 + *
628 + * returns 1 when task should be killed
629 + * 2 when patched PLT trampoline was detected
630 + * 3 when unpatched PLT trampoline was detected
631 + */
632 +static int pax_handle_fetch_fault(struct pt_regs *regs)
633 +{
634 +
635 +#ifdef CONFIG_PAX_EMUPLT
636 + int err;
637 +
638 + do { /* PaX: patched PLT emulation #1 */
639 + unsigned int ldah, ldq, jmp;
640 +
641 + err = get_user(ldah, (unsigned int *)regs->pc);
642 + err |= get_user(ldq, (unsigned int *)(regs->pc+4));
643 + err |= get_user(jmp, (unsigned int *)(regs->pc+8));
644 +
645 + if (err)
646 + break;
647 +
648 + if ((ldah & 0xFFFF0000U) == 0x277B0000U &&
649 + (ldq & 0xFFFF0000U) == 0xA77B0000U &&
650 + jmp == 0x6BFB0000U)
651 + {
652 + unsigned long r27, addr;
653 + unsigned long addrh = (ldah | 0xFFFFFFFFFFFF0000UL) << 16;
654 + unsigned long addrl = ldq | 0xFFFFFFFFFFFF0000UL;
655 +
656 + addr = regs->r27 + ((addrh ^ 0x80000000UL) + 0x80000000UL) + ((addrl ^ 0x8000UL) + 0x8000UL);
657 + err = get_user(r27, (unsigned long *)addr);
658 + if (err)
659 + break;
660 +
661 + regs->r27 = r27;
662 + regs->pc = r27;
663 + return 2;
664 + }
665 + } while (0);
666 +
667 + do { /* PaX: patched PLT emulation #2 */
668 + unsigned int ldah, lda, br;
669 +
670 + err = get_user(ldah, (unsigned int *)regs->pc);
671 + err |= get_user(lda, (unsigned int *)(regs->pc+4));
672 + err |= get_user(br, (unsigned int *)(regs->pc+8));
673 +
674 + if (err)
675 + break;
676 +
677 + if ((ldah & 0xFFFF0000U) == 0x277B0000U &&
678 + (lda & 0xFFFF0000U) == 0xA77B0000U &&
679 + (br & 0xFFE00000U) == 0xC3E00000U)
680 + {
681 + unsigned long addr = br | 0xFFFFFFFFFFE00000UL;
682 + unsigned long addrh = (ldah | 0xFFFFFFFFFFFF0000UL) << 16;
683 + unsigned long addrl = lda | 0xFFFFFFFFFFFF0000UL;
684 +
685 + regs->r27 += ((addrh ^ 0x80000000UL) + 0x80000000UL) + ((addrl ^ 0x8000UL) + 0x8000UL);
686 + regs->pc += 12 + (((addr ^ 0x00100000UL) + 0x00100000UL) << 2);
687 + return 2;
688 + }
689 + } while (0);
690 +
691 + do { /* PaX: unpatched PLT emulation */
692 + unsigned int br;
693 +
694 + err = get_user(br, (unsigned int *)regs->pc);
695 +
696 + if (!err && (br & 0xFFE00000U) == 0xC3800000U) {
697 + unsigned int br2, ldq, nop, jmp;
698 + unsigned long addr = br | 0xFFFFFFFFFFE00000UL, resolver;
699 +
700 + addr = regs->pc + 4 + (((addr ^ 0x00100000UL) + 0x00100000UL) << 2);
701 + err = get_user(br2, (unsigned int *)addr);
702 + err |= get_user(ldq, (unsigned int *)(addr+4));
703 + err |= get_user(nop, (unsigned int *)(addr+8));
704 + err |= get_user(jmp, (unsigned int *)(addr+12));
705 + err |= get_user(resolver, (unsigned long *)(addr+16));
706 +
707 + if (err)
708 + break;
709 +
710 + if (br2 == 0xC3600000U &&
711 + ldq == 0xA77B000CU &&
712 + nop == 0x47FF041FU &&
713 + jmp == 0x6B7B0000U)
714 + {
715 + regs->r28 = regs->pc+4;
716 + regs->r27 = addr+16;
717 + regs->pc = resolver;
718 + return 3;
719 + }
720 + }
721 + } while (0);
722 +#endif
723 +
724 + return 1;
725 +}
726 +
727 +void pax_report_insns(struct pt_regs *regs, void *pc, void *sp)
728 +{
729 + unsigned long i;
730 +
731 + printk(KERN_ERR "PAX: bytes at PC: ");
732 + for (i = 0; i < 5; i++) {
733 + unsigned int c;
734 + if (get_user(c, (unsigned int *)pc+i))
735 + printk(KERN_CONT "???????? ");
736 + else
737 + printk(KERN_CONT "%08x ", c);
738 + }
739 + printk("\n");
740 +}
741 +#endif
742
743 /*
744 * This routine handles page faults. It determines the address,
745 @@ -133,8 +251,29 @@ retry:
746 good_area:
747 si_code = SEGV_ACCERR;
748 if (cause < 0) {
749 - if (!(vma->vm_flags & VM_EXEC))
750 + if (!(vma->vm_flags & VM_EXEC)) {
751 +
752 +#ifdef CONFIG_PAX_PAGEEXEC
753 + if (!(mm->pax_flags & MF_PAX_PAGEEXEC) || address != regs->pc)
754 + goto bad_area;
755 +
756 + up_read(&mm->mmap_sem);
757 + switch (pax_handle_fetch_fault(regs)) {
758 +
759 +#ifdef CONFIG_PAX_EMUPLT
760 + case 2:
761 + case 3:
762 + return;
763 +#endif
764 +
765 + }
766 + pax_report_fault(regs, (void *)regs->pc, (void *)rdusp());
767 + do_group_exit(SIGKILL);
768 +#else
769 goto bad_area;
770 +#endif
771 +
772 + }
773 } else if (!cause) {
774 /* Allow reads even for write-only mappings */
775 if (!(vma->vm_flags & (VM_READ | VM_WRITE)))
776 diff --git a/arch/arm/include/asm/atomic.h b/arch/arm/include/asm/atomic.h
777 index c79f61f..9ac0642 100644
778 --- a/arch/arm/include/asm/atomic.h
779 +++ b/arch/arm/include/asm/atomic.h
780 @@ -17,17 +17,35 @@
781 #include <asm/barrier.h>
782 #include <asm/cmpxchg.h>
783
784 +#ifdef CONFIG_GENERIC_ATOMIC64
785 +#include <asm-generic/atomic64.h>
786 +#endif
787 +
788 #define ATOMIC_INIT(i) { (i) }
789
790 #ifdef __KERNEL__
791
792 +#define _ASM_EXTABLE(from, to) \
793 +" .pushsection __ex_table,\"a\"\n"\
794 +" .align 3\n" \
795 +" .long " #from ", " #to"\n" \
796 +" .popsection"
797 +
798 /*
799 * On ARM, ordinary assignment (str instruction) doesn't clear the local
800 * strex/ldrex monitor on some implementations. The reason we can use it for
801 * atomic_set() is the clrex or dummy strex done on every exception return.
802 */
803 #define atomic_read(v) (*(volatile int *)&(v)->counter)
804 +static inline int atomic_read_unchecked(const atomic_unchecked_t *v)
805 +{
806 + return v->counter;
807 +}
808 #define atomic_set(v,i) (((v)->counter) = (i))
809 +static inline void atomic_set_unchecked(atomic_unchecked_t *v, int i)
810 +{
811 + v->counter = i;
812 +}
813
814 #if __LINUX_ARM_ARCH__ >= 6
815
816 @@ -42,6 +60,35 @@ static inline void atomic_add(int i, atomic_t *v)
817 int result;
818
819 __asm__ __volatile__("@ atomic_add\n"
820 +"1: ldrex %1, [%3]\n"
821 +" adds %0, %1, %4\n"
822 +
823 +#ifdef CONFIG_PAX_REFCOUNT
824 +" bvc 3f\n"
825 +"2: bkpt 0xf103\n"
826 +"3:\n"
827 +#endif
828 +
829 +" strex %1, %0, [%3]\n"
830 +" teq %1, #0\n"
831 +" bne 1b"
832 +
833 +#ifdef CONFIG_PAX_REFCOUNT
834 +"\n4:\n"
835 + _ASM_EXTABLE(2b, 4b)
836 +#endif
837 +
838 + : "=&r" (result), "=&r" (tmp), "+Qo" (v->counter)
839 + : "r" (&v->counter), "Ir" (i)
840 + : "cc");
841 +}
842 +
843 +static inline void atomic_add_unchecked(int i, atomic_unchecked_t *v)
844 +{
845 + unsigned long tmp;
846 + int result;
847 +
848 + __asm__ __volatile__("@ atomic_add_unchecked\n"
849 "1: ldrex %0, [%3]\n"
850 " add %0, %0, %4\n"
851 " strex %1, %0, [%3]\n"
852 @@ -60,6 +107,42 @@ static inline int atomic_add_return(int i, atomic_t *v)
853 smp_mb();
854
855 __asm__ __volatile__("@ atomic_add_return\n"
856 +"1: ldrex %1, [%3]\n"
857 +" adds %0, %1, %4\n"
858 +
859 +#ifdef CONFIG_PAX_REFCOUNT
860 +" bvc 3f\n"
861 +" mov %0, %1\n"
862 +"2: bkpt 0xf103\n"
863 +"3:\n"
864 +#endif
865 +
866 +" strex %1, %0, [%3]\n"
867 +" teq %1, #0\n"
868 +" bne 1b"
869 +
870 +#ifdef CONFIG_PAX_REFCOUNT
871 +"\n4:\n"
872 + _ASM_EXTABLE(2b, 4b)
873 +#endif
874 +
875 + : "=&r" (result), "=&r" (tmp), "+Qo" (v->counter)
876 + : "r" (&v->counter), "Ir" (i)
877 + : "cc");
878 +
879 + smp_mb();
880 +
881 + return result;
882 +}
883 +
884 +static inline int atomic_add_return_unchecked(int i, atomic_unchecked_t *v)
885 +{
886 + unsigned long tmp;
887 + int result;
888 +
889 + smp_mb();
890 +
891 + __asm__ __volatile__("@ atomic_add_return_unchecked\n"
892 "1: ldrex %0, [%3]\n"
893 " add %0, %0, %4\n"
894 " strex %1, %0, [%3]\n"
895 @@ -80,6 +163,35 @@ static inline void atomic_sub(int i, atomic_t *v)
896 int result;
897
898 __asm__ __volatile__("@ atomic_sub\n"
899 +"1: ldrex %1, [%3]\n"
900 +" subs %0, %1, %4\n"
901 +
902 +#ifdef CONFIG_PAX_REFCOUNT
903 +" bvc 3f\n"
904 +"2: bkpt 0xf103\n"
905 +"3:\n"
906 +#endif
907 +
908 +" strex %1, %0, [%3]\n"
909 +" teq %1, #0\n"
910 +" bne 1b"
911 +
912 +#ifdef CONFIG_PAX_REFCOUNT
913 +"\n4:\n"
914 + _ASM_EXTABLE(2b, 4b)
915 +#endif
916 +
917 + : "=&r" (result), "=&r" (tmp), "+Qo" (v->counter)
918 + : "r" (&v->counter), "Ir" (i)
919 + : "cc");
920 +}
921 +
922 +static inline void atomic_sub_unchecked(int i, atomic_unchecked_t *v)
923 +{
924 + unsigned long tmp;
925 + int result;
926 +
927 + __asm__ __volatile__("@ atomic_sub_unchecked\n"
928 "1: ldrex %0, [%3]\n"
929 " sub %0, %0, %4\n"
930 " strex %1, %0, [%3]\n"
931 @@ -98,11 +210,25 @@ static inline int atomic_sub_return(int i, atomic_t *v)
932 smp_mb();
933
934 __asm__ __volatile__("@ atomic_sub_return\n"
935 -"1: ldrex %0, [%3]\n"
936 -" sub %0, %0, %4\n"
937 +"1: ldrex %1, [%3]\n"
938 +" subs %0, %1, %4\n"
939 +
940 +#ifdef CONFIG_PAX_REFCOUNT
941 +" bvc 3f\n"
942 +" mov %0, %1\n"
943 +"2: bkpt 0xf103\n"
944 +"3:\n"
945 +#endif
946 +
947 " strex %1, %0, [%3]\n"
948 " teq %1, #0\n"
949 " bne 1b"
950 +
951 +#ifdef CONFIG_PAX_REFCOUNT
952 +"\n4:\n"
953 + _ASM_EXTABLE(2b, 4b)
954 +#endif
955 +
956 : "=&r" (result), "=&r" (tmp), "+Qo" (v->counter)
957 : "r" (&v->counter), "Ir" (i)
958 : "cc");
959 @@ -134,6 +260,28 @@ static inline int atomic_cmpxchg(atomic_t *ptr, int old, int new)
960 return oldval;
961 }
962
963 +static inline int atomic_cmpxchg_unchecked(atomic_unchecked_t *ptr, int old, int new)
964 +{
965 + unsigned long oldval, res;
966 +
967 + smp_mb();
968 +
969 + do {
970 + __asm__ __volatile__("@ atomic_cmpxchg_unchecked\n"
971 + "ldrex %1, [%3]\n"
972 + "mov %0, #0\n"
973 + "teq %1, %4\n"
974 + "strexeq %0, %5, [%3]\n"
975 + : "=&r" (res), "=&r" (oldval), "+Qo" (ptr->counter)
976 + : "r" (&ptr->counter), "Ir" (old), "r" (new)
977 + : "cc");
978 + } while (res);
979 +
980 + smp_mb();
981 +
982 + return oldval;
983 +}
984 +
985 static inline void atomic_clear_mask(unsigned long mask, unsigned long *addr)
986 {
987 unsigned long tmp, tmp2;
988 @@ -167,7 +315,17 @@ static inline int atomic_add_return(int i, atomic_t *v)
989
990 return val;
991 }
992 +
993 +static inline int atomic_add_return_unchecked(int i, atomic_unchecked_t *v)
994 +{
995 + return atomic_add_return(i, v);
996 +}
997 +
998 #define atomic_add(i, v) (void) atomic_add_return(i, v)
999 +static inline void atomic_add_unchecked(int i, atomic_unchecked_t *v)
1000 +{
1001 + (void) atomic_add_return(i, v);
1002 +}
1003
1004 static inline int atomic_sub_return(int i, atomic_t *v)
1005 {
1006 @@ -182,6 +340,10 @@ static inline int atomic_sub_return(int i, atomic_t *v)
1007 return val;
1008 }
1009 #define atomic_sub(i, v) (void) atomic_sub_return(i, v)
1010 +static inline void atomic_sub_unchecked(int i, atomic_unchecked_t *v)
1011 +{
1012 + (void) atomic_sub_return(i, v);
1013 +}
1014
1015 static inline int atomic_cmpxchg(atomic_t *v, int old, int new)
1016 {
1017 @@ -197,6 +359,11 @@ static inline int atomic_cmpxchg(atomic_t *v, int old, int new)
1018 return ret;
1019 }
1020
1021 +static inline int atomic_cmpxchg_unchecked(atomic_unchecked_t *v, int old, int new)
1022 +{
1023 + return atomic_cmpxchg(v, old, new);
1024 +}
1025 +
1026 static inline void atomic_clear_mask(unsigned long mask, unsigned long *addr)
1027 {
1028 unsigned long flags;
1029 @@ -209,6 +376,10 @@ static inline void atomic_clear_mask(unsigned long mask, unsigned long *addr)
1030 #endif /* __LINUX_ARM_ARCH__ */
1031
1032 #define atomic_xchg(v, new) (xchg(&((v)->counter), new))
1033 +static inline int atomic_xchg_unchecked(atomic_unchecked_t *v, int new)
1034 +{
1035 + return xchg(&v->counter, new);
1036 +}
1037
1038 static inline int __atomic_add_unless(atomic_t *v, int a, int u)
1039 {
1040 @@ -221,11 +392,27 @@ static inline int __atomic_add_unless(atomic_t *v, int a, int u)
1041 }
1042
1043 #define atomic_inc(v) atomic_add(1, v)
1044 +static inline void atomic_inc_unchecked(atomic_unchecked_t *v)
1045 +{
1046 + atomic_add_unchecked(1, v);
1047 +}
1048 #define atomic_dec(v) atomic_sub(1, v)
1049 +static inline void atomic_dec_unchecked(atomic_unchecked_t *v)
1050 +{
1051 + atomic_sub_unchecked(1, v);
1052 +}
1053
1054 #define atomic_inc_and_test(v) (atomic_add_return(1, v) == 0)
1055 +static inline int atomic_inc_and_test_unchecked(atomic_unchecked_t *v)
1056 +{
1057 + return atomic_add_return_unchecked(1, v) == 0;
1058 +}
1059 #define atomic_dec_and_test(v) (atomic_sub_return(1, v) == 0)
1060 #define atomic_inc_return(v) (atomic_add_return(1, v))
1061 +static inline int atomic_inc_return_unchecked(atomic_unchecked_t *v)
1062 +{
1063 + return atomic_add_return_unchecked(1, v);
1064 +}
1065 #define atomic_dec_return(v) (atomic_sub_return(1, v))
1066 #define atomic_sub_and_test(i, v) (atomic_sub_return(i, v) == 0)
1067
1068 @@ -241,6 +428,14 @@ typedef struct {
1069 u64 __aligned(8) counter;
1070 } atomic64_t;
1071
1072 +#ifdef CONFIG_PAX_REFCOUNT
1073 +typedef struct {
1074 + u64 __aligned(8) counter;
1075 +} atomic64_unchecked_t;
1076 +#else
1077 +typedef atomic64_t atomic64_unchecked_t;
1078 +#endif
1079 +
1080 #define ATOMIC64_INIT(i) { (i) }
1081
1082 static inline u64 atomic64_read(const atomic64_t *v)
1083 @@ -256,6 +451,19 @@ static inline u64 atomic64_read(const atomic64_t *v)
1084 return result;
1085 }
1086
1087 +static inline u64 atomic64_read_unchecked(atomic64_unchecked_t *v)
1088 +{
1089 + u64 result;
1090 +
1091 + __asm__ __volatile__("@ atomic64_read_unchecked\n"
1092 +" ldrexd %0, %H0, [%1]"
1093 + : "=&r" (result)
1094 + : "r" (&v->counter), "Qo" (v->counter)
1095 + );
1096 +
1097 + return result;
1098 +}
1099 +
1100 static inline void atomic64_set(atomic64_t *v, u64 i)
1101 {
1102 u64 tmp;
1103 @@ -270,6 +478,20 @@ static inline void atomic64_set(atomic64_t *v, u64 i)
1104 : "cc");
1105 }
1106
1107 +static inline void atomic64_set_unchecked(atomic64_unchecked_t *v, u64 i)
1108 +{
1109 + u64 tmp;
1110 +
1111 + __asm__ __volatile__("@ atomic64_set_unchecked\n"
1112 +"1: ldrexd %0, %H0, [%2]\n"
1113 +" strexd %0, %3, %H3, [%2]\n"
1114 +" teq %0, #0\n"
1115 +" bne 1b"
1116 + : "=&r" (tmp), "=Qo" (v->counter)
1117 + : "r" (&v->counter), "r" (i)
1118 + : "cc");
1119 +}
1120 +
1121 static inline void atomic64_add(u64 i, atomic64_t *v)
1122 {
1123 u64 result;
1124 @@ -278,6 +500,36 @@ static inline void atomic64_add(u64 i, atomic64_t *v)
1125 __asm__ __volatile__("@ atomic64_add\n"
1126 "1: ldrexd %0, %H0, [%3]\n"
1127 " adds %0, %0, %4\n"
1128 +" adcs %H0, %H0, %H4\n"
1129 +
1130 +#ifdef CONFIG_PAX_REFCOUNT
1131 +" bvc 3f\n"
1132 +"2: bkpt 0xf103\n"
1133 +"3:\n"
1134 +#endif
1135 +
1136 +" strexd %1, %0, %H0, [%3]\n"
1137 +" teq %1, #0\n"
1138 +" bne 1b"
1139 +
1140 +#ifdef CONFIG_PAX_REFCOUNT
1141 +"\n4:\n"
1142 + _ASM_EXTABLE(2b, 4b)
1143 +#endif
1144 +
1145 + : "=&r" (result), "=&r" (tmp), "+Qo" (v->counter)
1146 + : "r" (&v->counter), "r" (i)
1147 + : "cc");
1148 +}
1149 +
1150 +static inline void atomic64_add_unchecked(u64 i, atomic64_unchecked_t *v)
1151 +{
1152 + u64 result;
1153 + unsigned long tmp;
1154 +
1155 + __asm__ __volatile__("@ atomic64_add_unchecked\n"
1156 +"1: ldrexd %0, %H0, [%3]\n"
1157 +" adds %0, %0, %4\n"
1158 " adc %H0, %H0, %H4\n"
1159 " strexd %1, %0, %H0, [%3]\n"
1160 " teq %1, #0\n"
1161 @@ -289,12 +541,49 @@ static inline void atomic64_add(u64 i, atomic64_t *v)
1162
1163 static inline u64 atomic64_add_return(u64 i, atomic64_t *v)
1164 {
1165 - u64 result;
1166 - unsigned long tmp;
1167 + u64 result, tmp;
1168
1169 smp_mb();
1170
1171 __asm__ __volatile__("@ atomic64_add_return\n"
1172 +"1: ldrexd %1, %H1, [%3]\n"
1173 +" adds %0, %1, %4\n"
1174 +" adcs %H0, %H1, %H4\n"
1175 +
1176 +#ifdef CONFIG_PAX_REFCOUNT
1177 +" bvc 3f\n"
1178 +" mov %0, %1\n"
1179 +" mov %H0, %H1\n"
1180 +"2: bkpt 0xf103\n"
1181 +"3:\n"
1182 +#endif
1183 +
1184 +" strexd %1, %0, %H0, [%3]\n"
1185 +" teq %1, #0\n"
1186 +" bne 1b"
1187 +
1188 +#ifdef CONFIG_PAX_REFCOUNT
1189 +"\n4:\n"
1190 + _ASM_EXTABLE(2b, 4b)
1191 +#endif
1192 +
1193 + : "=&r" (result), "=&r" (tmp), "+Qo" (v->counter)
1194 + : "r" (&v->counter), "r" (i)
1195 + : "cc");
1196 +
1197 + smp_mb();
1198 +
1199 + return result;
1200 +}
1201 +
1202 +static inline u64 atomic64_add_return_unchecked(u64 i, atomic64_unchecked_t *v)
1203 +{
1204 + u64 result;
1205 + unsigned long tmp;
1206 +
1207 + smp_mb();
1208 +
1209 + __asm__ __volatile__("@ atomic64_add_return_unchecked\n"
1210 "1: ldrexd %0, %H0, [%3]\n"
1211 " adds %0, %0, %4\n"
1212 " adc %H0, %H0, %H4\n"
1213 @@ -318,6 +607,36 @@ static inline void atomic64_sub(u64 i, atomic64_t *v)
1214 __asm__ __volatile__("@ atomic64_sub\n"
1215 "1: ldrexd %0, %H0, [%3]\n"
1216 " subs %0, %0, %4\n"
1217 +" sbcs %H0, %H0, %H4\n"
1218 +
1219 +#ifdef CONFIG_PAX_REFCOUNT
1220 +" bvc 3f\n"
1221 +"2: bkpt 0xf103\n"
1222 +"3:\n"
1223 +#endif
1224 +
1225 +" strexd %1, %0, %H0, [%3]\n"
1226 +" teq %1, #0\n"
1227 +" bne 1b"
1228 +
1229 +#ifdef CONFIG_PAX_REFCOUNT
1230 +"\n4:\n"
1231 + _ASM_EXTABLE(2b, 4b)
1232 +#endif
1233 +
1234 + : "=&r" (result), "=&r" (tmp), "+Qo" (v->counter)
1235 + : "r" (&v->counter), "r" (i)
1236 + : "cc");
1237 +}
1238 +
1239 +static inline void atomic64_sub_unchecked(u64 i, atomic64_unchecked_t *v)
1240 +{
1241 + u64 result;
1242 + unsigned long tmp;
1243 +
1244 + __asm__ __volatile__("@ atomic64_sub_unchecked\n"
1245 +"1: ldrexd %0, %H0, [%3]\n"
1246 +" subs %0, %0, %4\n"
1247 " sbc %H0, %H0, %H4\n"
1248 " strexd %1, %0, %H0, [%3]\n"
1249 " teq %1, #0\n"
1250 @@ -329,18 +648,32 @@ static inline void atomic64_sub(u64 i, atomic64_t *v)
1251
1252 static inline u64 atomic64_sub_return(u64 i, atomic64_t *v)
1253 {
1254 - u64 result;
1255 - unsigned long tmp;
1256 + u64 result, tmp;
1257
1258 smp_mb();
1259
1260 __asm__ __volatile__("@ atomic64_sub_return\n"
1261 -"1: ldrexd %0, %H0, [%3]\n"
1262 -" subs %0, %0, %4\n"
1263 -" sbc %H0, %H0, %H4\n"
1264 +"1: ldrexd %1, %H1, [%3]\n"
1265 +" subs %0, %1, %4\n"
1266 +" sbcs %H0, %H1, %H4\n"
1267 +
1268 +#ifdef CONFIG_PAX_REFCOUNT
1269 +" bvc 3f\n"
1270 +" mov %0, %1\n"
1271 +" mov %H0, %H1\n"
1272 +"2: bkpt 0xf103\n"
1273 +"3:\n"
1274 +#endif
1275 +
1276 " strexd %1, %0, %H0, [%3]\n"
1277 " teq %1, #0\n"
1278 " bne 1b"
1279 +
1280 +#ifdef CONFIG_PAX_REFCOUNT
1281 +"\n4:\n"
1282 + _ASM_EXTABLE(2b, 4b)
1283 +#endif
1284 +
1285 : "=&r" (result), "=&r" (tmp), "+Qo" (v->counter)
1286 : "r" (&v->counter), "r" (i)
1287 : "cc");
1288 @@ -374,6 +707,30 @@ static inline u64 atomic64_cmpxchg(atomic64_t *ptr, u64 old, u64 new)
1289 return oldval;
1290 }
1291
1292 +static inline u64 atomic64_cmpxchg_unchecked(atomic64_unchecked_t *ptr, u64 old, u64 new)
1293 +{
1294 + u64 oldval;
1295 + unsigned long res;
1296 +
1297 + smp_mb();
1298 +
1299 + do {
1300 + __asm__ __volatile__("@ atomic64_cmpxchg_unchecked\n"
1301 + "ldrexd %1, %H1, [%3]\n"
1302 + "mov %0, #0\n"
1303 + "teq %1, %4\n"
1304 + "teqeq %H1, %H4\n"
1305 + "strexdeq %0, %5, %H5, [%3]"
1306 + : "=&r" (res), "=&r" (oldval), "+Qo" (ptr->counter)
1307 + : "r" (&ptr->counter), "r" (old), "r" (new)
1308 + : "cc");
1309 + } while (res);
1310 +
1311 + smp_mb();
1312 +
1313 + return oldval;
1314 +}
1315 +
1316 static inline u64 atomic64_xchg(atomic64_t *ptr, u64 new)
1317 {
1318 u64 result;
1319 @@ -397,21 +754,34 @@ static inline u64 atomic64_xchg(atomic64_t *ptr, u64 new)
1320
1321 static inline u64 atomic64_dec_if_positive(atomic64_t *v)
1322 {
1323 - u64 result;
1324 - unsigned long tmp;
1325 + u64 result, tmp;
1326
1327 smp_mb();
1328
1329 __asm__ __volatile__("@ atomic64_dec_if_positive\n"
1330 -"1: ldrexd %0, %H0, [%3]\n"
1331 -" subs %0, %0, #1\n"
1332 -" sbc %H0, %H0, #0\n"
1333 +"1: ldrexd %1, %H1, [%3]\n"
1334 +" subs %0, %1, #1\n"
1335 +" sbcs %H0, %H1, #0\n"
1336 +
1337 +#ifdef CONFIG_PAX_REFCOUNT
1338 +" bvc 3f\n"
1339 +" mov %0, %1\n"
1340 +" mov %H0, %H1\n"
1341 +"2: bkpt 0xf103\n"
1342 +"3:\n"
1343 +#endif
1344 +
1345 " teq %H0, #0\n"
1346 -" bmi 2f\n"
1347 +" bmi 4f\n"
1348 " strexd %1, %0, %H0, [%3]\n"
1349 " teq %1, #0\n"
1350 " bne 1b\n"
1351 -"2:"
1352 +"4:\n"
1353 +
1354 +#ifdef CONFIG_PAX_REFCOUNT
1355 + _ASM_EXTABLE(2b, 4b)
1356 +#endif
1357 +
1358 : "=&r" (result), "=&r" (tmp), "+Qo" (v->counter)
1359 : "r" (&v->counter)
1360 : "cc");
1361 @@ -434,13 +804,25 @@ static inline int atomic64_add_unless(atomic64_t *v, u64 a, u64 u)
1362 " teq %0, %5\n"
1363 " teqeq %H0, %H5\n"
1364 " moveq %1, #0\n"
1365 -" beq 2f\n"
1366 +" beq 4f\n"
1367 " adds %0, %0, %6\n"
1368 -" adc %H0, %H0, %H6\n"
1369 +" adcs %H0, %H0, %H6\n"
1370 +
1371 +#ifdef CONFIG_PAX_REFCOUNT
1372 +" bvc 3f\n"
1373 +"2: bkpt 0xf103\n"
1374 +"3:\n"
1375 +#endif
1376 +
1377 " strexd %2, %0, %H0, [%4]\n"
1378 " teq %2, #0\n"
1379 " bne 1b\n"
1380 -"2:"
1381 +"4:\n"
1382 +
1383 +#ifdef CONFIG_PAX_REFCOUNT
1384 + _ASM_EXTABLE(2b, 4b)
1385 +#endif
1386 +
1387 : "=&r" (val), "+r" (ret), "=&r" (tmp), "+Qo" (v->counter)
1388 : "r" (&v->counter), "r" (u), "r" (a)
1389 : "cc");
1390 @@ -453,10 +835,13 @@ static inline int atomic64_add_unless(atomic64_t *v, u64 a, u64 u)
1391
1392 #define atomic64_add_negative(a, v) (atomic64_add_return((a), (v)) < 0)
1393 #define atomic64_inc(v) atomic64_add(1LL, (v))
1394 +#define atomic64_inc_unchecked(v) atomic64_add_unchecked(1LL, (v))
1395 #define atomic64_inc_return(v) atomic64_add_return(1LL, (v))
1396 +#define atomic64_inc_return_unchecked(v) atomic64_add_return_unchecked(1LL, (v))
1397 #define atomic64_inc_and_test(v) (atomic64_inc_return(v) == 0)
1398 #define atomic64_sub_and_test(a, v) (atomic64_sub_return((a), (v)) == 0)
1399 #define atomic64_dec(v) atomic64_sub(1LL, (v))
1400 +#define atomic64_dec_unchecked(v) atomic64_sub_unchecked(1LL, (v))
1401 #define atomic64_dec_return(v) atomic64_sub_return(1LL, (v))
1402 #define atomic64_dec_and_test(v) (atomic64_dec_return((v)) == 0)
1403 #define atomic64_inc_not_zero(v) atomic64_add_unless((v), 1LL, 0LL)
1404 diff --git a/arch/arm/include/asm/cache.h b/arch/arm/include/asm/cache.h
1405 index 75fe66b..2255c86 100644
1406 --- a/arch/arm/include/asm/cache.h
1407 +++ b/arch/arm/include/asm/cache.h
1408 @@ -4,8 +4,10 @@
1409 #ifndef __ASMARM_CACHE_H
1410 #define __ASMARM_CACHE_H
1411
1412 +#include <linux/const.h>
1413 +
1414 #define L1_CACHE_SHIFT CONFIG_ARM_L1_CACHE_SHIFT
1415 -#define L1_CACHE_BYTES (1 << L1_CACHE_SHIFT)
1416 +#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT)
1417
1418 /*
1419 * Memory returned by kmalloc() may be used for DMA, so we must make
1420 diff --git a/arch/arm/include/asm/cacheflush.h b/arch/arm/include/asm/cacheflush.h
1421 index e4448e1..7bc86b7 100644
1422 --- a/arch/arm/include/asm/cacheflush.h
1423 +++ b/arch/arm/include/asm/cacheflush.h
1424 @@ -108,7 +108,7 @@ struct cpu_cache_fns {
1425 void (*dma_unmap_area)(const void *, size_t, int);
1426
1427 void (*dma_flush_range)(const void *, const void *);
1428 -};
1429 +} __no_const;
1430
1431 /*
1432 * Select the calling method
1433 diff --git a/arch/arm/include/asm/cmpxchg.h b/arch/arm/include/asm/cmpxchg.h
1434 index 7eb18c1..e38b6d2 100644
1435 --- a/arch/arm/include/asm/cmpxchg.h
1436 +++ b/arch/arm/include/asm/cmpxchg.h
1437 @@ -102,6 +102,8 @@ static inline unsigned long __xchg(unsigned long x, volatile void *ptr, int size
1438
1439 #define xchg(ptr,x) \
1440 ((__typeof__(*(ptr)))__xchg((unsigned long)(x),(ptr),sizeof(*(ptr))))
1441 +#define xchg_unchecked(ptr,x) \
1442 + ((__typeof__(*(ptr)))__xchg((unsigned long)(x),(ptr),sizeof(*(ptr))))
1443
1444 #include <asm-generic/cmpxchg-local.h>
1445
1446 diff --git a/arch/arm/include/asm/elf.h b/arch/arm/include/asm/elf.h
1447 index 38050b1..9d90e8b 100644
1448 --- a/arch/arm/include/asm/elf.h
1449 +++ b/arch/arm/include/asm/elf.h
1450 @@ -116,7 +116,14 @@ int dump_task_regs(struct task_struct *t, elf_gregset_t *elfregs);
1451 the loader. We need to make sure that it is out of the way of the program
1452 that it will "exec", and that there is sufficient room for the brk. */
1453
1454 -#define ELF_ET_DYN_BASE (2 * TASK_SIZE / 3)
1455 +#define ELF_ET_DYN_BASE (TASK_SIZE / 3 * 2)
1456 +
1457 +#ifdef CONFIG_PAX_ASLR
1458 +#define PAX_ELF_ET_DYN_BASE 0x00008000UL
1459 +
1460 +#define PAX_DELTA_MMAP_LEN ((current->personality == PER_LINUX_32BIT) ? 16 : 10)
1461 +#define PAX_DELTA_STACK_LEN ((current->personality == PER_LINUX_32BIT) ? 16 : 10)
1462 +#endif
1463
1464 /* When the program starts, a1 contains a pointer to a function to be
1465 registered with atexit, as per the SVR4 ABI. A value of 0 means we
1466 @@ -126,8 +133,4 @@ int dump_task_regs(struct task_struct *t, elf_gregset_t *elfregs);
1467 extern void elf_set_personality(const struct elf32_hdr *);
1468 #define SET_PERSONALITY(ex) elf_set_personality(&(ex))
1469
1470 -struct mm_struct;
1471 -extern unsigned long arch_randomize_brk(struct mm_struct *mm);
1472 -#define arch_randomize_brk arch_randomize_brk
1473 -
1474 #endif
1475 diff --git a/arch/arm/include/asm/kmap_types.h b/arch/arm/include/asm/kmap_types.h
1476 index 83eb2f7..ed77159 100644
1477 --- a/arch/arm/include/asm/kmap_types.h
1478 +++ b/arch/arm/include/asm/kmap_types.h
1479 @@ -4,6 +4,6 @@
1480 /*
1481 * This is the "bare minimum". AIO seems to require this.
1482 */
1483 -#define KM_TYPE_NR 16
1484 +#define KM_TYPE_NR 17
1485
1486 #endif
1487 diff --git a/arch/arm/include/asm/outercache.h b/arch/arm/include/asm/outercache.h
1488 index 53426c6..c7baff3 100644
1489 --- a/arch/arm/include/asm/outercache.h
1490 +++ b/arch/arm/include/asm/outercache.h
1491 @@ -35,7 +35,7 @@ struct outer_cache_fns {
1492 #endif
1493 void (*set_debug)(unsigned long);
1494 void (*resume)(void);
1495 -};
1496 +} __no_const;
1497
1498 #ifdef CONFIG_OUTER_CACHE
1499
1500 diff --git a/arch/arm/include/asm/page.h b/arch/arm/include/asm/page.h
1501 index ecf9019..b71d9a1 100644
1502 --- a/arch/arm/include/asm/page.h
1503 +++ b/arch/arm/include/asm/page.h
1504 @@ -114,7 +114,7 @@ struct cpu_user_fns {
1505 void (*cpu_clear_user_highpage)(struct page *page, unsigned long vaddr);
1506 void (*cpu_copy_user_highpage)(struct page *to, struct page *from,
1507 unsigned long vaddr, struct vm_area_struct *vma);
1508 -};
1509 +} __no_const;
1510
1511 #ifdef MULTI_USER
1512 extern struct cpu_user_fns cpu_user;
1513 diff --git a/arch/arm/include/asm/pgalloc.h b/arch/arm/include/asm/pgalloc.h
1514 index 943504f..bf8d667 100644
1515 --- a/arch/arm/include/asm/pgalloc.h
1516 +++ b/arch/arm/include/asm/pgalloc.h
1517 @@ -43,6 +43,11 @@ static inline void pud_populate(struct mm_struct *mm, pud_t *pud, pmd_t *pmd)
1518 set_pud(pud, __pud(__pa(pmd) | PMD_TYPE_TABLE));
1519 }
1520
1521 +static inline void pud_populate_kernel(struct mm_struct *mm, pud_t *pud, pmd_t *pmd)
1522 +{
1523 + pud_populate(mm, pud, pmd);
1524 +}
1525 +
1526 #else /* !CONFIG_ARM_LPAE */
1527
1528 /*
1529 @@ -51,6 +56,7 @@ static inline void pud_populate(struct mm_struct *mm, pud_t *pud, pmd_t *pmd)
1530 #define pmd_alloc_one(mm,addr) ({ BUG(); ((pmd_t *)2); })
1531 #define pmd_free(mm, pmd) do { } while (0)
1532 #define pud_populate(mm,pmd,pte) BUG()
1533 +#define pud_populate_kernel(mm,pmd,pte) BUG()
1534
1535 #endif /* CONFIG_ARM_LPAE */
1536
1537 diff --git a/arch/arm/include/asm/thread_info.h b/arch/arm/include/asm/thread_info.h
1538 index af7b0bd..6750a8c 100644
1539 --- a/arch/arm/include/asm/thread_info.h
1540 +++ b/arch/arm/include/asm/thread_info.h
1541 @@ -148,6 +148,12 @@ extern int vfp_restore_user_hwstate(struct user_vfp __user *,
1542 #define TIF_NOTIFY_RESUME 2 /* callback before returning to user */
1543 #define TIF_SYSCALL_TRACE 8
1544 #define TIF_SYSCALL_AUDIT 9
1545 +
1546 +/* within 8 bits of TIF_SYSCALL_TRACE
1547 + to meet flexible second operand requirements
1548 +*/
1549 +#define TIF_GRSEC_SETXID 10
1550 +
1551 #define TIF_POLLING_NRFLAG 16
1552 #define TIF_USING_IWMMXT 17
1553 #define TIF_MEMDIE 18 /* is terminating due to OOM killer */
1554 @@ -163,9 +169,11 @@ extern int vfp_restore_user_hwstate(struct user_vfp __user *,
1555 #define _TIF_POLLING_NRFLAG (1 << TIF_POLLING_NRFLAG)
1556 #define _TIF_USING_IWMMXT (1 << TIF_USING_IWMMXT)
1557 #define _TIF_SECCOMP (1 << TIF_SECCOMP)
1558 +#define _TIF_GRSEC_SETXID (1 << TIF_GRSEC_SETXID)
1559
1560 /* Checks for any syscall work in entry-common.S */
1561 -#define _TIF_SYSCALL_WORK (_TIF_SYSCALL_TRACE | _TIF_SYSCALL_AUDIT)
1562 +#define _TIF_SYSCALL_WORK (_TIF_SYSCALL_TRACE | _TIF_SYSCALL_AUDIT | \
1563 + _TIF_GRSEC_SETXID)
1564
1565 /*
1566 * Change these and you break ASM code in entry-common.S
1567 diff --git a/arch/arm/include/asm/uaccess.h b/arch/arm/include/asm/uaccess.h
1568 index 77bd79f..ad4cd27 100644
1569 --- a/arch/arm/include/asm/uaccess.h
1570 +++ b/arch/arm/include/asm/uaccess.h
1571 @@ -22,6 +22,8 @@
1572 #define VERIFY_READ 0
1573 #define VERIFY_WRITE 1
1574
1575 +extern void check_object_size(const void *ptr, unsigned long n, bool to);
1576 +
1577 /*
1578 * The exception table consists of pairs of addresses: the first is the
1579 * address of an instruction that is allowed to fault, and the second is
1580 @@ -418,8 +420,23 @@ do { \
1581
1582
1583 #ifdef CONFIG_MMU
1584 -extern unsigned long __must_check __copy_from_user(void *to, const void __user *from, unsigned long n);
1585 -extern unsigned long __must_check __copy_to_user(void __user *to, const void *from, unsigned long n);
1586 +extern unsigned long __must_check ___copy_from_user(void *to, const void __user *from, unsigned long n);
1587 +extern unsigned long __must_check ___copy_to_user(void __user *to, const void *from, unsigned long n);
1588 +
1589 +static inline unsigned long __must_check __copy_from_user(void *to, const void __user *from, unsigned long n)
1590 +{
1591 + if (!__builtin_constant_p(n))
1592 + check_object_size(to, n, false);
1593 + return ___copy_from_user(to, from, n);
1594 +}
1595 +
1596 +static inline unsigned long __must_check __copy_to_user(void __user *to, const void *from, unsigned long n)
1597 +{
1598 + if (!__builtin_constant_p(n))
1599 + check_object_size(from, n, true);
1600 + return ___copy_to_user(to, from, n);
1601 +}
1602 +
1603 extern unsigned long __must_check __copy_to_user_std(void __user *to, const void *from, unsigned long n);
1604 extern unsigned long __must_check __clear_user(void __user *addr, unsigned long n);
1605 extern unsigned long __must_check __clear_user_std(void __user *addr, unsigned long n);
1606 @@ -431,6 +448,9 @@ extern unsigned long __must_check __clear_user_std(void __user *addr, unsigned l
1607
1608 static inline unsigned long __must_check copy_from_user(void *to, const void __user *from, unsigned long n)
1609 {
1610 + if ((long)n < 0)
1611 + return n;
1612 +
1613 if (access_ok(VERIFY_READ, from, n))
1614 n = __copy_from_user(to, from, n);
1615 else /* security hole - plug it */
1616 @@ -440,6 +460,9 @@ static inline unsigned long __must_check copy_from_user(void *to, const void __u
1617
1618 static inline unsigned long __must_check copy_to_user(void __user *to, const void *from, unsigned long n)
1619 {
1620 + if ((long)n < 0)
1621 + return n;
1622 +
1623 if (access_ok(VERIFY_WRITE, to, n))
1624 n = __copy_to_user(to, from, n);
1625 return n;
1626 diff --git a/arch/arm/kernel/armksyms.c b/arch/arm/kernel/armksyms.c
1627 index 60d3b73..9168db0 100644
1628 --- a/arch/arm/kernel/armksyms.c
1629 +++ b/arch/arm/kernel/armksyms.c
1630 @@ -89,8 +89,8 @@ EXPORT_SYMBOL(__memzero);
1631 #ifdef CONFIG_MMU
1632 EXPORT_SYMBOL(copy_page);
1633
1634 -EXPORT_SYMBOL(__copy_from_user);
1635 -EXPORT_SYMBOL(__copy_to_user);
1636 +EXPORT_SYMBOL(___copy_from_user);
1637 +EXPORT_SYMBOL(___copy_to_user);
1638 EXPORT_SYMBOL(__clear_user);
1639
1640 EXPORT_SYMBOL(__get_user_1);
1641 diff --git a/arch/arm/kernel/process.c b/arch/arm/kernel/process.c
1642 index 693b744..e684262 100644
1643 --- a/arch/arm/kernel/process.c
1644 +++ b/arch/arm/kernel/process.c
1645 @@ -28,7 +28,6 @@
1646 #include <linux/tick.h>
1647 #include <linux/utsname.h>
1648 #include <linux/uaccess.h>
1649 -#include <linux/random.h>
1650 #include <linux/hw_breakpoint.h>
1651 #include <linux/cpuidle.h>
1652
1653 @@ -256,9 +255,10 @@ void machine_power_off(void)
1654 machine_shutdown();
1655 if (pm_power_off)
1656 pm_power_off();
1657 + BUG();
1658 }
1659
1660 -void machine_restart(char *cmd)
1661 +__noreturn void machine_restart(char *cmd)
1662 {
1663 machine_shutdown();
1664
1665 @@ -501,12 +501,6 @@ unsigned long get_wchan(struct task_struct *p)
1666 return 0;
1667 }
1668
1669 -unsigned long arch_randomize_brk(struct mm_struct *mm)
1670 -{
1671 - unsigned long range_end = mm->brk + 0x02000000;
1672 - return randomize_range(mm->brk, range_end, 0) ? : mm->brk;
1673 -}
1674 -
1675 #ifdef CONFIG_MMU
1676 /*
1677 * The vectors page is always readable from user space for the
1678 diff --git a/arch/arm/kernel/ptrace.c b/arch/arm/kernel/ptrace.c
1679 index 3e0fc5f..a42d2ec 100644
1680 --- a/arch/arm/kernel/ptrace.c
1681 +++ b/arch/arm/kernel/ptrace.c
1682 @@ -913,11 +913,20 @@ enum ptrace_syscall_dir {
1683 PTRACE_SYSCALL_EXIT,
1684 };
1685
1686 +#ifdef CONFIG_GRKERNSEC_SETXID
1687 +extern void gr_delayed_cred_worker(void);
1688 +#endif
1689 +
1690 static int ptrace_syscall_trace(struct pt_regs *regs, int scno,
1691 enum ptrace_syscall_dir dir)
1692 {
1693 unsigned long ip;
1694
1695 +#ifdef CONFIG_GRKERNSEC_SETXID
1696 + if (unlikely(test_and_clear_thread_flag(TIF_GRSEC_SETXID)))
1697 + gr_delayed_cred_worker();
1698 +#endif
1699 +
1700 if (!test_thread_flag(TIF_SYSCALL_TRACE))
1701 return scno;
1702
1703 diff --git a/arch/arm/kernel/setup.c b/arch/arm/kernel/setup.c
1704 index a81dcec..ac42f0f 100644
1705 --- a/arch/arm/kernel/setup.c
1706 +++ b/arch/arm/kernel/setup.c
1707 @@ -112,13 +112,13 @@ struct processor processor __read_mostly;
1708 struct cpu_tlb_fns cpu_tlb __read_mostly;
1709 #endif
1710 #ifdef MULTI_USER
1711 -struct cpu_user_fns cpu_user __read_mostly;
1712 +struct cpu_user_fns cpu_user __read_only;
1713 #endif
1714 #ifdef MULTI_CACHE
1715 -struct cpu_cache_fns cpu_cache __read_mostly;
1716 +struct cpu_cache_fns cpu_cache __read_only;
1717 #endif
1718 #ifdef CONFIG_OUTER_CACHE
1719 -struct outer_cache_fns outer_cache __read_mostly;
1720 +struct outer_cache_fns outer_cache __read_only;
1721 EXPORT_SYMBOL(outer_cache);
1722 #endif
1723
1724 diff --git a/arch/arm/kernel/traps.c b/arch/arm/kernel/traps.c
1725 index b0179b8..b54c6c1 100644
1726 --- a/arch/arm/kernel/traps.c
1727 +++ b/arch/arm/kernel/traps.c
1728 @@ -266,6 +266,8 @@ static arch_spinlock_t die_lock = __ARCH_SPIN_LOCK_UNLOCKED;
1729 static int die_owner = -1;
1730 static unsigned int die_nest_count;
1731
1732 +extern void gr_handle_kernel_exploit(void);
1733 +
1734 static unsigned long oops_begin(void)
1735 {
1736 int cpu;
1737 @@ -308,6 +310,9 @@ static void oops_end(unsigned long flags, struct pt_regs *regs, int signr)
1738 panic("Fatal exception in interrupt");
1739 if (panic_on_oops)
1740 panic("Fatal exception");
1741 +
1742 + gr_handle_kernel_exploit();
1743 +
1744 if (signr)
1745 do_exit(signr);
1746 }
1747 diff --git a/arch/arm/lib/copy_from_user.S b/arch/arm/lib/copy_from_user.S
1748 index 66a477a..bee61d3 100644
1749 --- a/arch/arm/lib/copy_from_user.S
1750 +++ b/arch/arm/lib/copy_from_user.S
1751 @@ -16,7 +16,7 @@
1752 /*
1753 * Prototype:
1754 *
1755 - * size_t __copy_from_user(void *to, const void *from, size_t n)
1756 + * size_t ___copy_from_user(void *to, const void *from, size_t n)
1757 *
1758 * Purpose:
1759 *
1760 @@ -84,11 +84,11 @@
1761
1762 .text
1763
1764 -ENTRY(__copy_from_user)
1765 +ENTRY(___copy_from_user)
1766
1767 #include "copy_template.S"
1768
1769 -ENDPROC(__copy_from_user)
1770 +ENDPROC(___copy_from_user)
1771
1772 .pushsection .fixup,"ax"
1773 .align 0
1774 diff --git a/arch/arm/lib/copy_page.S b/arch/arm/lib/copy_page.S
1775 index 6ee2f67..d1cce76 100644
1776 --- a/arch/arm/lib/copy_page.S
1777 +++ b/arch/arm/lib/copy_page.S
1778 @@ -10,6 +10,7 @@
1779 * ASM optimised string functions
1780 */
1781 #include <linux/linkage.h>
1782 +#include <linux/const.h>
1783 #include <asm/assembler.h>
1784 #include <asm/asm-offsets.h>
1785 #include <asm/cache.h>
1786 diff --git a/arch/arm/lib/copy_to_user.S b/arch/arm/lib/copy_to_user.S
1787 index d066df6..df28194 100644
1788 --- a/arch/arm/lib/copy_to_user.S
1789 +++ b/arch/arm/lib/copy_to_user.S
1790 @@ -16,7 +16,7 @@
1791 /*
1792 * Prototype:
1793 *
1794 - * size_t __copy_to_user(void *to, const void *from, size_t n)
1795 + * size_t ___copy_to_user(void *to, const void *from, size_t n)
1796 *
1797 * Purpose:
1798 *
1799 @@ -88,11 +88,11 @@
1800 .text
1801
1802 ENTRY(__copy_to_user_std)
1803 -WEAK(__copy_to_user)
1804 +WEAK(___copy_to_user)
1805
1806 #include "copy_template.S"
1807
1808 -ENDPROC(__copy_to_user)
1809 +ENDPROC(___copy_to_user)
1810 ENDPROC(__copy_to_user_std)
1811
1812 .pushsection .fixup,"ax"
1813 diff --git a/arch/arm/lib/uaccess_with_memcpy.c b/arch/arm/lib/uaccess_with_memcpy.c
1814 index 025f742..8432b08 100644
1815 --- a/arch/arm/lib/uaccess_with_memcpy.c
1816 +++ b/arch/arm/lib/uaccess_with_memcpy.c
1817 @@ -104,7 +104,7 @@ out:
1818 }
1819
1820 unsigned long
1821 -__copy_to_user(void __user *to, const void *from, unsigned long n)
1822 +___copy_to_user(void __user *to, const void *from, unsigned long n)
1823 {
1824 /*
1825 * This test is stubbed out of the main function above to keep
1826 diff --git a/arch/arm/mach-kirkwood/common.c b/arch/arm/mach-kirkwood/common.c
1827 index 1201191..eabbb2c 100644
1828 --- a/arch/arm/mach-kirkwood/common.c
1829 +++ b/arch/arm/mach-kirkwood/common.c
1830 @@ -160,7 +160,7 @@ static void clk_gate_fn_disable(struct clk_hw *hw)
1831 clk_gate_ops.disable(hw);
1832 }
1833
1834 -static struct clk_ops clk_gate_fn_ops;
1835 +static clk_ops_no_const clk_gate_fn_ops;
1836
1837 static struct clk __init *clk_register_gate_fn(struct device *dev,
1838 const char *name,
1839 diff --git a/arch/arm/mach-omap2/board-n8x0.c b/arch/arm/mach-omap2/board-n8x0.c
1840 index 677357f..8828dda 100644
1841 --- a/arch/arm/mach-omap2/board-n8x0.c
1842 +++ b/arch/arm/mach-omap2/board-n8x0.c
1843 @@ -593,7 +593,7 @@ static int n8x0_menelaus_late_init(struct device *dev)
1844 }
1845 #endif
1846
1847 -static struct menelaus_platform_data n8x0_menelaus_platform_data __initdata = {
1848 +static struct menelaus_platform_data n8x0_menelaus_platform_data __initconst = {
1849 .late_init = n8x0_menelaus_late_init,
1850 };
1851
1852 diff --git a/arch/arm/mach-omap2/omap_hwmod.c b/arch/arm/mach-omap2/omap_hwmod.c
1853 index 37afbd1..c22ad7c 100644
1854 --- a/arch/arm/mach-omap2/omap_hwmod.c
1855 +++ b/arch/arm/mach-omap2/omap_hwmod.c
1856 @@ -187,10 +187,10 @@ struct omap_hwmod_soc_ops {
1857 int (*is_hardreset_asserted)(struct omap_hwmod *oh,
1858 struct omap_hwmod_rst_info *ohri);
1859 int (*init_clkdm)(struct omap_hwmod *oh);
1860 -};
1861 +} __no_const;
1862
1863 /* soc_ops: adapts the omap_hwmod code to the currently-booted SoC */
1864 -static struct omap_hwmod_soc_ops soc_ops;
1865 +static struct omap_hwmod_soc_ops soc_ops __read_only;
1866
1867 /* omap_hwmod_list contains all registered struct omap_hwmods */
1868 static LIST_HEAD(omap_hwmod_list);
1869 diff --git a/arch/arm/mm/fault.c b/arch/arm/mm/fault.c
1870 index c3bd834..e81ef02 100644
1871 --- a/arch/arm/mm/fault.c
1872 +++ b/arch/arm/mm/fault.c
1873 @@ -174,6 +174,13 @@ __do_user_fault(struct task_struct *tsk, unsigned long addr,
1874 }
1875 #endif
1876
1877 +#ifdef CONFIG_PAX_PAGEEXEC
1878 + if (fsr & FSR_LNX_PF) {
1879 + pax_report_fault(regs, (void *)regs->ARM_pc, (void *)regs->ARM_sp);
1880 + do_group_exit(SIGKILL);
1881 + }
1882 +#endif
1883 +
1884 tsk->thread.address = addr;
1885 tsk->thread.error_code = fsr;
1886 tsk->thread.trap_no = 14;
1887 @@ -397,6 +404,33 @@ do_page_fault(unsigned long addr, unsigned int fsr, struct pt_regs *regs)
1888 }
1889 #endif /* CONFIG_MMU */
1890
1891 +#ifdef CONFIG_PAX_PAGEEXEC
1892 +void pax_report_insns(struct pt_regs *regs, void *pc, void *sp)
1893 +{
1894 + long i;
1895 +
1896 + printk(KERN_ERR "PAX: bytes at PC: ");
1897 + for (i = 0; i < 20; i++) {
1898 + unsigned char c;
1899 + if (get_user(c, (__force unsigned char __user *)pc+i))
1900 + printk(KERN_CONT "?? ");
1901 + else
1902 + printk(KERN_CONT "%02x ", c);
1903 + }
1904 + printk("\n");
1905 +
1906 + printk(KERN_ERR "PAX: bytes at SP-4: ");
1907 + for (i = -1; i < 20; i++) {
1908 + unsigned long c;
1909 + if (get_user(c, (__force unsigned long __user *)sp+i))
1910 + printk(KERN_CONT "???????? ");
1911 + else
1912 + printk(KERN_CONT "%08lx ", c);
1913 + }
1914 + printk("\n");
1915 +}
1916 +#endif
1917 +
1918 /*
1919 * First Level Translation Fault Handler
1920 *
1921 @@ -574,6 +608,20 @@ do_PrefetchAbort(unsigned long addr, unsigned int ifsr, struct pt_regs *regs)
1922 const struct fsr_info *inf = ifsr_info + fsr_fs(ifsr);
1923 struct siginfo info;
1924
1925 +#ifdef CONFIG_PAX_REFCOUNT
1926 + if (fsr_fs(ifsr) == 2) {
1927 + unsigned int bkpt;
1928 +
1929 + if (!probe_kernel_address((unsigned int *)addr, bkpt) && bkpt == 0xe12f1073) {
1930 + current->thread.error_code = ifsr;
1931 + current->thread.trap_no = 0;
1932 + pax_report_refcount_overflow(regs);
1933 + fixup_exception(regs);
1934 + return;
1935 + }
1936 + }
1937 +#endif
1938 +
1939 if (!inf->fn(addr, ifsr | FSR_LNX_PF, regs))
1940 return;
1941
1942 diff --git a/arch/arm/mm/mmap.c b/arch/arm/mm/mmap.c
1943 index ce8cb19..3ec539d 100644
1944 --- a/arch/arm/mm/mmap.c
1945 +++ b/arch/arm/mm/mmap.c
1946 @@ -93,6 +93,10 @@ arch_get_unmapped_area(struct file *filp, unsigned long addr,
1947 if (len > TASK_SIZE)
1948 return -ENOMEM;
1949
1950 +#ifdef CONFIG_PAX_RANDMMAP
1951 + if (!(mm->pax_flags & MF_PAX_RANDMMAP))
1952 +#endif
1953 +
1954 if (addr) {
1955 if (do_align)
1956 addr = COLOUR_ALIGN(addr, pgoff);
1957 @@ -100,15 +104,14 @@ arch_get_unmapped_area(struct file *filp, unsigned long addr,
1958 addr = PAGE_ALIGN(addr);
1959
1960 vma = find_vma(mm, addr);
1961 - if (TASK_SIZE - len >= addr &&
1962 - (!vma || addr + len <= vma->vm_start))
1963 + if (TASK_SIZE - len >= addr && check_heap_stack_gap(vma, addr, len))
1964 return addr;
1965 }
1966 if (len > mm->cached_hole_size) {
1967 - start_addr = addr = mm->free_area_cache;
1968 + start_addr = addr = mm->free_area_cache;
1969 } else {
1970 - start_addr = addr = mm->mmap_base;
1971 - mm->cached_hole_size = 0;
1972 + start_addr = addr = mm->mmap_base;
1973 + mm->cached_hole_size = 0;
1974 }
1975
1976 full_search:
1977 @@ -124,14 +127,14 @@ full_search:
1978 * Start a new search - just in case we missed
1979 * some holes.
1980 */
1981 - if (start_addr != TASK_UNMAPPED_BASE) {
1982 - start_addr = addr = TASK_UNMAPPED_BASE;
1983 + if (start_addr != mm->mmap_base) {
1984 + start_addr = addr = mm->mmap_base;
1985 mm->cached_hole_size = 0;
1986 goto full_search;
1987 }
1988 return -ENOMEM;
1989 }
1990 - if (!vma || addr + len <= vma->vm_start) {
1991 + if (check_heap_stack_gap(vma, addr, len)) {
1992 /*
1993 * Remember the place where we stopped the search:
1994 */
1995 @@ -266,10 +269,22 @@ void arch_pick_mmap_layout(struct mm_struct *mm)
1996
1997 if (mmap_is_legacy()) {
1998 mm->mmap_base = TASK_UNMAPPED_BASE + random_factor;
1999 +
2000 +#ifdef CONFIG_PAX_RANDMMAP
2001 + if (mm->pax_flags & MF_PAX_RANDMMAP)
2002 + mm->mmap_base += mm->delta_mmap;
2003 +#endif
2004 +
2005 mm->get_unmapped_area = arch_get_unmapped_area;
2006 mm->unmap_area = arch_unmap_area;
2007 } else {
2008 mm->mmap_base = mmap_base(random_factor);
2009 +
2010 +#ifdef CONFIG_PAX_RANDMMAP
2011 + if (mm->pax_flags & MF_PAX_RANDMMAP)
2012 + mm->mmap_base -= mm->delta_mmap + mm->delta_stack;
2013 +#endif
2014 +
2015 mm->get_unmapped_area = arch_get_unmapped_area_topdown;
2016 mm->unmap_area = arch_unmap_area_topdown;
2017 }
2018 diff --git a/arch/arm/plat-orion/include/plat/addr-map.h b/arch/arm/plat-orion/include/plat/addr-map.h
2019 index fd556f7..af2e7d2 100644
2020 --- a/arch/arm/plat-orion/include/plat/addr-map.h
2021 +++ b/arch/arm/plat-orion/include/plat/addr-map.h
2022 @@ -26,7 +26,7 @@ struct orion_addr_map_cfg {
2023 value in bridge_virt_base */
2024 void __iomem *(*win_cfg_base) (const struct orion_addr_map_cfg *cfg,
2025 const int win);
2026 -};
2027 +} __no_const;
2028
2029 /*
2030 * Information needed to setup one address mapping.
2031 diff --git a/arch/arm/plat-samsung/include/plat/dma-ops.h b/arch/arm/plat-samsung/include/plat/dma-ops.h
2032 index f5144cd..71f6d1f 100644
2033 --- a/arch/arm/plat-samsung/include/plat/dma-ops.h
2034 +++ b/arch/arm/plat-samsung/include/plat/dma-ops.h
2035 @@ -47,7 +47,7 @@ struct samsung_dma_ops {
2036 int (*started)(unsigned ch);
2037 int (*flush)(unsigned ch);
2038 int (*stop)(unsigned ch);
2039 -};
2040 +} __no_const;
2041
2042 extern void *samsung_dmadev_get_ops(void);
2043 extern void *s3c_dma_get_ops(void);
2044 diff --git a/arch/arm/plat-samsung/include/plat/ehci.h b/arch/arm/plat-samsung/include/plat/ehci.h
2045 index 5f28cae..3d23723 100644
2046 --- a/arch/arm/plat-samsung/include/plat/ehci.h
2047 +++ b/arch/arm/plat-samsung/include/plat/ehci.h
2048 @@ -14,7 +14,7 @@
2049 struct s5p_ehci_platdata {
2050 int (*phy_init)(struct platform_device *pdev, int type);
2051 int (*phy_exit)(struct platform_device *pdev, int type);
2052 -};
2053 +} __no_const;
2054
2055 extern void s5p_ehci_set_platdata(struct s5p_ehci_platdata *pd);
2056
2057 diff --git a/arch/avr32/include/asm/cache.h b/arch/avr32/include/asm/cache.h
2058 index c3a58a1..78fbf54 100644
2059 --- a/arch/avr32/include/asm/cache.h
2060 +++ b/arch/avr32/include/asm/cache.h
2061 @@ -1,8 +1,10 @@
2062 #ifndef __ASM_AVR32_CACHE_H
2063 #define __ASM_AVR32_CACHE_H
2064
2065 +#include <linux/const.h>
2066 +
2067 #define L1_CACHE_SHIFT 5
2068 -#define L1_CACHE_BYTES (1 << L1_CACHE_SHIFT)
2069 +#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT)
2070
2071 /*
2072 * Memory returned by kmalloc() may be used for DMA, so we must make
2073 diff --git a/arch/avr32/include/asm/elf.h b/arch/avr32/include/asm/elf.h
2074 index 3b3159b..425ea94 100644
2075 --- a/arch/avr32/include/asm/elf.h
2076 +++ b/arch/avr32/include/asm/elf.h
2077 @@ -84,8 +84,14 @@ typedef struct user_fpu_struct elf_fpregset_t;
2078 the loader. We need to make sure that it is out of the way of the program
2079 that it will "exec", and that there is sufficient room for the brk. */
2080
2081 -#define ELF_ET_DYN_BASE (2 * TASK_SIZE / 3)
2082 +#define ELF_ET_DYN_BASE (TASK_SIZE / 3 * 2)
2083
2084 +#ifdef CONFIG_PAX_ASLR
2085 +#define PAX_ELF_ET_DYN_BASE 0x00001000UL
2086 +
2087 +#define PAX_DELTA_MMAP_LEN 15
2088 +#define PAX_DELTA_STACK_LEN 15
2089 +#endif
2090
2091 /* This yields a mask that user programs can use to figure out what
2092 instruction set this CPU supports. This could be done in user space,
2093 diff --git a/arch/avr32/include/asm/kmap_types.h b/arch/avr32/include/asm/kmap_types.h
2094 index 479330b..53717a8 100644
2095 --- a/arch/avr32/include/asm/kmap_types.h
2096 +++ b/arch/avr32/include/asm/kmap_types.h
2097 @@ -2,9 +2,9 @@
2098 #define __ASM_AVR32_KMAP_TYPES_H
2099
2100 #ifdef CONFIG_DEBUG_HIGHMEM
2101 -# define KM_TYPE_NR 29
2102 +# define KM_TYPE_NR 30
2103 #else
2104 -# define KM_TYPE_NR 14
2105 +# define KM_TYPE_NR 15
2106 #endif
2107
2108 #endif /* __ASM_AVR32_KMAP_TYPES_H */
2109 diff --git a/arch/avr32/mm/fault.c b/arch/avr32/mm/fault.c
2110 index b92e609..b69c101 100644
2111 --- a/arch/avr32/mm/fault.c
2112 +++ b/arch/avr32/mm/fault.c
2113 @@ -41,6 +41,23 @@ static inline int notify_page_fault(struct pt_regs *regs, int trap)
2114
2115 int exception_trace = 1;
2116
2117 +#ifdef CONFIG_PAX_PAGEEXEC
2118 +void pax_report_insns(struct pt_regs *regs, void *pc, void *sp)
2119 +{
2120 + unsigned long i;
2121 +
2122 + printk(KERN_ERR "PAX: bytes at PC: ");
2123 + for (i = 0; i < 20; i++) {
2124 + unsigned char c;
2125 + if (get_user(c, (unsigned char *)pc+i))
2126 + printk(KERN_CONT "???????? ");
2127 + else
2128 + printk(KERN_CONT "%02x ", c);
2129 + }
2130 + printk("\n");
2131 +}
2132 +#endif
2133 +
2134 /*
2135 * This routine handles page faults. It determines the address and the
2136 * problem, and then passes it off to one of the appropriate routines.
2137 @@ -173,6 +190,16 @@ bad_area:
2138 up_read(&mm->mmap_sem);
2139
2140 if (user_mode(regs)) {
2141 +
2142 +#ifdef CONFIG_PAX_PAGEEXEC
2143 + if (mm->pax_flags & MF_PAX_PAGEEXEC) {
2144 + if (ecr == ECR_PROTECTION_X || ecr == ECR_TLB_MISS_X) {
2145 + pax_report_fault(regs, (void *)regs->pc, (void *)regs->sp);
2146 + do_group_exit(SIGKILL);
2147 + }
2148 + }
2149 +#endif
2150 +
2151 if (exception_trace && printk_ratelimit())
2152 printk("%s%s[%d]: segfault at %08lx pc %08lx "
2153 "sp %08lx ecr %lu\n",
2154 diff --git a/arch/blackfin/include/asm/cache.h b/arch/blackfin/include/asm/cache.h
2155 index 568885a..f8008df 100644
2156 --- a/arch/blackfin/include/asm/cache.h
2157 +++ b/arch/blackfin/include/asm/cache.h
2158 @@ -7,6 +7,7 @@
2159 #ifndef __ARCH_BLACKFIN_CACHE_H
2160 #define __ARCH_BLACKFIN_CACHE_H
2161
2162 +#include <linux/const.h>
2163 #include <linux/linkage.h> /* for asmlinkage */
2164
2165 /*
2166 @@ -14,7 +15,7 @@
2167 * Blackfin loads 32 bytes for cache
2168 */
2169 #define L1_CACHE_SHIFT 5
2170 -#define L1_CACHE_BYTES (1 << L1_CACHE_SHIFT)
2171 +#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT)
2172 #define SMP_CACHE_BYTES L1_CACHE_BYTES
2173
2174 #define ARCH_DMA_MINALIGN L1_CACHE_BYTES
2175 diff --git a/arch/cris/include/arch-v10/arch/cache.h b/arch/cris/include/arch-v10/arch/cache.h
2176 index aea2718..3639a60 100644
2177 --- a/arch/cris/include/arch-v10/arch/cache.h
2178 +++ b/arch/cris/include/arch-v10/arch/cache.h
2179 @@ -1,8 +1,9 @@
2180 #ifndef _ASM_ARCH_CACHE_H
2181 #define _ASM_ARCH_CACHE_H
2182
2183 +#include <linux/const.h>
2184 /* Etrax 100LX have 32-byte cache-lines. */
2185 -#define L1_CACHE_BYTES 32
2186 #define L1_CACHE_SHIFT 5
2187 +#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT)
2188
2189 #endif /* _ASM_ARCH_CACHE_H */
2190 diff --git a/arch/cris/include/arch-v32/arch/cache.h b/arch/cris/include/arch-v32/arch/cache.h
2191 index 7caf25d..ee65ac5 100644
2192 --- a/arch/cris/include/arch-v32/arch/cache.h
2193 +++ b/arch/cris/include/arch-v32/arch/cache.h
2194 @@ -1,11 +1,12 @@
2195 #ifndef _ASM_CRIS_ARCH_CACHE_H
2196 #define _ASM_CRIS_ARCH_CACHE_H
2197
2198 +#include <linux/const.h>
2199 #include <arch/hwregs/dma.h>
2200
2201 /* A cache-line is 32 bytes. */
2202 -#define L1_CACHE_BYTES 32
2203 #define L1_CACHE_SHIFT 5
2204 +#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT)
2205
2206 #define __read_mostly __attribute__((__section__(".data..read_mostly")))
2207
2208 diff --git a/arch/frv/include/asm/atomic.h b/arch/frv/include/asm/atomic.h
2209 index b86329d..6709906 100644
2210 --- a/arch/frv/include/asm/atomic.h
2211 +++ b/arch/frv/include/asm/atomic.h
2212 @@ -186,6 +186,16 @@ static inline void atomic64_dec(atomic64_t *v)
2213 #define atomic64_cmpxchg(v, old, new) (__cmpxchg_64(old, new, &(v)->counter))
2214 #define atomic64_xchg(v, new) (__xchg_64(new, &(v)->counter))
2215
2216 +#define atomic64_read_unchecked(v) atomic64_read(v)
2217 +#define atomic64_set_unchecked(v, i) atomic64_set((v), (i))
2218 +#define atomic64_add_unchecked(a, v) atomic64_add((a), (v))
2219 +#define atomic64_add_return_unchecked(a, v) atomic64_add_return((a), (v))
2220 +#define atomic64_sub_unchecked(a, v) atomic64_sub((a), (v))
2221 +#define atomic64_inc_unchecked(v) atomic64_inc(v)
2222 +#define atomic64_inc_return_unchecked(v) atomic64_inc_return(v)
2223 +#define atomic64_dec_unchecked(v) atomic64_dec(v)
2224 +#define atomic64_cmpxchg_unchecked(v, o, n) atomic64_cmpxchg((v), (o), (n))
2225 +
2226 static __inline__ int __atomic_add_unless(atomic_t *v, int a, int u)
2227 {
2228 int c, old;
2229 diff --git a/arch/frv/include/asm/cache.h b/arch/frv/include/asm/cache.h
2230 index 2797163..c2a401d 100644
2231 --- a/arch/frv/include/asm/cache.h
2232 +++ b/arch/frv/include/asm/cache.h
2233 @@ -12,10 +12,11 @@
2234 #ifndef __ASM_CACHE_H
2235 #define __ASM_CACHE_H
2236
2237 +#include <linux/const.h>
2238
2239 /* bytes per L1 cache line */
2240 #define L1_CACHE_SHIFT (CONFIG_FRV_L1_CACHE_SHIFT)
2241 -#define L1_CACHE_BYTES (1 << L1_CACHE_SHIFT)
2242 +#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT)
2243
2244 #define __cacheline_aligned __attribute__((aligned(L1_CACHE_BYTES)))
2245 #define ____cacheline_aligned __attribute__((aligned(L1_CACHE_BYTES)))
2246 diff --git a/arch/frv/include/asm/kmap_types.h b/arch/frv/include/asm/kmap_types.h
2247 index 43901f2..0d8b865 100644
2248 --- a/arch/frv/include/asm/kmap_types.h
2249 +++ b/arch/frv/include/asm/kmap_types.h
2250 @@ -2,6 +2,6 @@
2251 #ifndef _ASM_KMAP_TYPES_H
2252 #define _ASM_KMAP_TYPES_H
2253
2254 -#define KM_TYPE_NR 17
2255 +#define KM_TYPE_NR 18
2256
2257 #endif
2258 diff --git a/arch/frv/mm/elf-fdpic.c b/arch/frv/mm/elf-fdpic.c
2259 index 385fd30..6c3d97e 100644
2260 --- a/arch/frv/mm/elf-fdpic.c
2261 +++ b/arch/frv/mm/elf-fdpic.c
2262 @@ -73,8 +73,7 @@ unsigned long arch_get_unmapped_area(struct file *filp, unsigned long addr, unsi
2263 if (addr) {
2264 addr = PAGE_ALIGN(addr);
2265 vma = find_vma(current->mm, addr);
2266 - if (TASK_SIZE - len >= addr &&
2267 - (!vma || addr + len <= vma->vm_start))
2268 + if (TASK_SIZE - len >= addr && check_heap_stack_gap(vma, addr, len))
2269 goto success;
2270 }
2271
2272 @@ -89,7 +88,7 @@ unsigned long arch_get_unmapped_area(struct file *filp, unsigned long addr, unsi
2273 for (; vma; vma = vma->vm_next) {
2274 if (addr > limit)
2275 break;
2276 - if (addr + len <= vma->vm_start)
2277 + if (check_heap_stack_gap(vma, addr, len))
2278 goto success;
2279 addr = vma->vm_end;
2280 }
2281 @@ -104,7 +103,7 @@ unsigned long arch_get_unmapped_area(struct file *filp, unsigned long addr, unsi
2282 for (; vma; vma = vma->vm_next) {
2283 if (addr > limit)
2284 break;
2285 - if (addr + len <= vma->vm_start)
2286 + if (check_heap_stack_gap(vma, addr, len))
2287 goto success;
2288 addr = vma->vm_end;
2289 }
2290 diff --git a/arch/h8300/include/asm/cache.h b/arch/h8300/include/asm/cache.h
2291 index c635028..6d9445a 100644
2292 --- a/arch/h8300/include/asm/cache.h
2293 +++ b/arch/h8300/include/asm/cache.h
2294 @@ -1,8 +1,10 @@
2295 #ifndef __ARCH_H8300_CACHE_H
2296 #define __ARCH_H8300_CACHE_H
2297
2298 +#include <linux/const.h>
2299 +
2300 /* bytes per L1 cache line */
2301 -#define L1_CACHE_BYTES 4
2302 +#define L1_CACHE_BYTES _AC(4,UL)
2303
2304 /* m68k-elf-gcc 2.95.2 doesn't like these */
2305
2306 diff --git a/arch/hexagon/include/asm/cache.h b/arch/hexagon/include/asm/cache.h
2307 index 0f01de2..d37d309 100644
2308 --- a/arch/hexagon/include/asm/cache.h
2309 +++ b/arch/hexagon/include/asm/cache.h
2310 @@ -21,9 +21,11 @@
2311 #ifndef __ASM_CACHE_H
2312 #define __ASM_CACHE_H
2313
2314 +#include <linux/const.h>
2315 +
2316 /* Bytes per L1 cache line */
2317 -#define L1_CACHE_SHIFT (5)
2318 -#define L1_CACHE_BYTES (1 << L1_CACHE_SHIFT)
2319 +#define L1_CACHE_SHIFT 5
2320 +#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT)
2321
2322 #define __cacheline_aligned __aligned(L1_CACHE_BYTES)
2323 #define ____cacheline_aligned __aligned(L1_CACHE_BYTES)
2324 diff --git a/arch/ia64/include/asm/atomic.h b/arch/ia64/include/asm/atomic.h
2325 index 6e6fe18..a6ae668 100644
2326 --- a/arch/ia64/include/asm/atomic.h
2327 +++ b/arch/ia64/include/asm/atomic.h
2328 @@ -208,6 +208,16 @@ atomic64_add_negative (__s64 i, atomic64_t *v)
2329 #define atomic64_inc(v) atomic64_add(1, (v))
2330 #define atomic64_dec(v) atomic64_sub(1, (v))
2331
2332 +#define atomic64_read_unchecked(v) atomic64_read(v)
2333 +#define atomic64_set_unchecked(v, i) atomic64_set((v), (i))
2334 +#define atomic64_add_unchecked(a, v) atomic64_add((a), (v))
2335 +#define atomic64_add_return_unchecked(a, v) atomic64_add_return((a), (v))
2336 +#define atomic64_sub_unchecked(a, v) atomic64_sub((a), (v))
2337 +#define atomic64_inc_unchecked(v) atomic64_inc(v)
2338 +#define atomic64_inc_return_unchecked(v) atomic64_inc_return(v)
2339 +#define atomic64_dec_unchecked(v) atomic64_dec(v)
2340 +#define atomic64_cmpxchg_unchecked(v, o, n) atomic64_cmpxchg((v), (o), (n))
2341 +
2342 /* Atomic operations are already serializing */
2343 #define smp_mb__before_atomic_dec() barrier()
2344 #define smp_mb__after_atomic_dec() barrier()
2345 diff --git a/arch/ia64/include/asm/cache.h b/arch/ia64/include/asm/cache.h
2346 index 988254a..e1ee885 100644
2347 --- a/arch/ia64/include/asm/cache.h
2348 +++ b/arch/ia64/include/asm/cache.h
2349 @@ -1,6 +1,7 @@
2350 #ifndef _ASM_IA64_CACHE_H
2351 #define _ASM_IA64_CACHE_H
2352
2353 +#include <linux/const.h>
2354
2355 /*
2356 * Copyright (C) 1998-2000 Hewlett-Packard Co
2357 @@ -9,7 +10,7 @@
2358
2359 /* Bytes per L1 (data) cache line. */
2360 #define L1_CACHE_SHIFT CONFIG_IA64_L1_CACHE_SHIFT
2361 -#define L1_CACHE_BYTES (1 << L1_CACHE_SHIFT)
2362 +#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT)
2363
2364 #ifdef CONFIG_SMP
2365 # define SMP_CACHE_SHIFT L1_CACHE_SHIFT
2366 diff --git a/arch/ia64/include/asm/elf.h b/arch/ia64/include/asm/elf.h
2367 index b5298eb..67c6e62 100644
2368 --- a/arch/ia64/include/asm/elf.h
2369 +++ b/arch/ia64/include/asm/elf.h
2370 @@ -42,6 +42,13 @@
2371 */
2372 #define ELF_ET_DYN_BASE (TASK_UNMAPPED_BASE + 0x800000000UL)
2373
2374 +#ifdef CONFIG_PAX_ASLR
2375 +#define PAX_ELF_ET_DYN_BASE (current->personality == PER_LINUX32 ? 0x08048000UL : 0x4000000000000000UL)
2376 +
2377 +#define PAX_DELTA_MMAP_LEN (current->personality == PER_LINUX32 ? 16 : 3*PAGE_SHIFT - 13)
2378 +#define PAX_DELTA_STACK_LEN (current->personality == PER_LINUX32 ? 16 : 3*PAGE_SHIFT - 13)
2379 +#endif
2380 +
2381 #define PT_IA_64_UNWIND 0x70000001
2382
2383 /* IA-64 relocations: */
2384 diff --git a/arch/ia64/include/asm/pgalloc.h b/arch/ia64/include/asm/pgalloc.h
2385 index 96a8d92..617a1cf 100644
2386 --- a/arch/ia64/include/asm/pgalloc.h
2387 +++ b/arch/ia64/include/asm/pgalloc.h
2388 @@ -39,6 +39,12 @@ pgd_populate(struct mm_struct *mm, pgd_t * pgd_entry, pud_t * pud)
2389 pgd_val(*pgd_entry) = __pa(pud);
2390 }
2391
2392 +static inline void
2393 +pgd_populate_kernel(struct mm_struct *mm, pgd_t * pgd_entry, pud_t * pud)
2394 +{
2395 + pgd_populate(mm, pgd_entry, pud);
2396 +}
2397 +
2398 static inline pud_t *pud_alloc_one(struct mm_struct *mm, unsigned long addr)
2399 {
2400 return quicklist_alloc(0, GFP_KERNEL, NULL);
2401 @@ -57,6 +63,12 @@ pud_populate(struct mm_struct *mm, pud_t * pud_entry, pmd_t * pmd)
2402 pud_val(*pud_entry) = __pa(pmd);
2403 }
2404
2405 +static inline void
2406 +pud_populate_kernel(struct mm_struct *mm, pud_t * pud_entry, pmd_t * pmd)
2407 +{
2408 + pud_populate(mm, pud_entry, pmd);
2409 +}
2410 +
2411 static inline pmd_t *pmd_alloc_one(struct mm_struct *mm, unsigned long addr)
2412 {
2413 return quicklist_alloc(0, GFP_KERNEL, NULL);
2414 diff --git a/arch/ia64/include/asm/pgtable.h b/arch/ia64/include/asm/pgtable.h
2415 index 815810c..d60bd4c 100644
2416 --- a/arch/ia64/include/asm/pgtable.h
2417 +++ b/arch/ia64/include/asm/pgtable.h
2418 @@ -12,7 +12,7 @@
2419 * David Mosberger-Tang <davidm@hpl.hp.com>
2420 */
2421
2422 -
2423 +#include <linux/const.h>
2424 #include <asm/mman.h>
2425 #include <asm/page.h>
2426 #include <asm/processor.h>
2427 @@ -142,6 +142,17 @@
2428 #define PAGE_READONLY __pgprot(__ACCESS_BITS | _PAGE_PL_3 | _PAGE_AR_R)
2429 #define PAGE_COPY __pgprot(__ACCESS_BITS | _PAGE_PL_3 | _PAGE_AR_R)
2430 #define PAGE_COPY_EXEC __pgprot(__ACCESS_BITS | _PAGE_PL_3 | _PAGE_AR_RX)
2431 +
2432 +#ifdef CONFIG_PAX_PAGEEXEC
2433 +# define PAGE_SHARED_NOEXEC __pgprot(__ACCESS_BITS | _PAGE_PL_3 | _PAGE_AR_RW)
2434 +# define PAGE_READONLY_NOEXEC __pgprot(__ACCESS_BITS | _PAGE_PL_3 | _PAGE_AR_R)
2435 +# define PAGE_COPY_NOEXEC __pgprot(__ACCESS_BITS | _PAGE_PL_3 | _PAGE_AR_R)
2436 +#else
2437 +# define PAGE_SHARED_NOEXEC PAGE_SHARED
2438 +# define PAGE_READONLY_NOEXEC PAGE_READONLY
2439 +# define PAGE_COPY_NOEXEC PAGE_COPY
2440 +#endif
2441 +
2442 #define PAGE_GATE __pgprot(__ACCESS_BITS | _PAGE_PL_0 | _PAGE_AR_X_RX)
2443 #define PAGE_KERNEL __pgprot(__DIRTY_BITS | _PAGE_PL_0 | _PAGE_AR_RWX)
2444 #define PAGE_KERNELRX __pgprot(__ACCESS_BITS | _PAGE_PL_0 | _PAGE_AR_RX)
2445 diff --git a/arch/ia64/include/asm/spinlock.h b/arch/ia64/include/asm/spinlock.h
2446 index 54ff557..70c88b7 100644
2447 --- a/arch/ia64/include/asm/spinlock.h
2448 +++ b/arch/ia64/include/asm/spinlock.h
2449 @@ -71,7 +71,7 @@ static __always_inline void __ticket_spin_unlock(arch_spinlock_t *lock)
2450 unsigned short *p = (unsigned short *)&lock->lock + 1, tmp;
2451
2452 asm volatile ("ld2.bias %0=[%1]" : "=r"(tmp) : "r"(p));
2453 - ACCESS_ONCE(*p) = (tmp + 2) & ~1;
2454 + ACCESS_ONCE_RW(*p) = (tmp + 2) & ~1;
2455 }
2456
2457 static __always_inline void __ticket_spin_unlock_wait(arch_spinlock_t *lock)
2458 diff --git a/arch/ia64/include/asm/uaccess.h b/arch/ia64/include/asm/uaccess.h
2459 index 449c8c0..432a3d2 100644
2460 --- a/arch/ia64/include/asm/uaccess.h
2461 +++ b/arch/ia64/include/asm/uaccess.h
2462 @@ -257,7 +257,7 @@ __copy_from_user (void *to, const void __user *from, unsigned long count)
2463 const void *__cu_from = (from); \
2464 long __cu_len = (n); \
2465 \
2466 - if (__access_ok(__cu_to, __cu_len, get_fs())) \
2467 + if (__cu_len > 0 && __cu_len <= INT_MAX && __access_ok(__cu_to, __cu_len, get_fs())) \
2468 __cu_len = __copy_user(__cu_to, (__force void __user *) __cu_from, __cu_len); \
2469 __cu_len; \
2470 })
2471 @@ -269,7 +269,7 @@ __copy_from_user (void *to, const void __user *from, unsigned long count)
2472 long __cu_len = (n); \
2473 \
2474 __chk_user_ptr(__cu_from); \
2475 - if (__access_ok(__cu_from, __cu_len, get_fs())) \
2476 + if (__cu_len > 0 && __cu_len <= INT_MAX && __access_ok(__cu_from, __cu_len, get_fs())) \
2477 __cu_len = __copy_user((__force void __user *) __cu_to, __cu_from, __cu_len); \
2478 __cu_len; \
2479 })
2480 diff --git a/arch/ia64/kernel/module.c b/arch/ia64/kernel/module.c
2481 index 24603be..948052d 100644
2482 --- a/arch/ia64/kernel/module.c
2483 +++ b/arch/ia64/kernel/module.c
2484 @@ -307,8 +307,7 @@ plt_target (struct plt_entry *plt)
2485 void
2486 module_free (struct module *mod, void *module_region)
2487 {
2488 - if (mod && mod->arch.init_unw_table &&
2489 - module_region == mod->module_init) {
2490 + if (mod && mod->arch.init_unw_table && module_region == mod->module_init_rx) {
2491 unw_remove_unwind_table(mod->arch.init_unw_table);
2492 mod->arch.init_unw_table = NULL;
2493 }
2494 @@ -494,15 +493,39 @@ module_frob_arch_sections (Elf_Ehdr *ehdr, Elf_Shdr *sechdrs, char *secstrings,
2495 }
2496
2497 static inline int
2498 +in_init_rx (const struct module *mod, uint64_t addr)
2499 +{
2500 + return addr - (uint64_t) mod->module_init_rx < mod->init_size_rx;
2501 +}
2502 +
2503 +static inline int
2504 +in_init_rw (const struct module *mod, uint64_t addr)
2505 +{
2506 + return addr - (uint64_t) mod->module_init_rw < mod->init_size_rw;
2507 +}
2508 +
2509 +static inline int
2510 in_init (const struct module *mod, uint64_t addr)
2511 {
2512 - return addr - (uint64_t) mod->module_init < mod->init_size;
2513 + return in_init_rx(mod, addr) || in_init_rw(mod, addr);
2514 +}
2515 +
2516 +static inline int
2517 +in_core_rx (const struct module *mod, uint64_t addr)
2518 +{
2519 + return addr - (uint64_t) mod->module_core_rx < mod->core_size_rx;
2520 +}
2521 +
2522 +static inline int
2523 +in_core_rw (const struct module *mod, uint64_t addr)
2524 +{
2525 + return addr - (uint64_t) mod->module_core_rw < mod->core_size_rw;
2526 }
2527
2528 static inline int
2529 in_core (const struct module *mod, uint64_t addr)
2530 {
2531 - return addr - (uint64_t) mod->module_core < mod->core_size;
2532 + return in_core_rx(mod, addr) || in_core_rw(mod, addr);
2533 }
2534
2535 static inline int
2536 @@ -685,7 +708,14 @@ do_reloc (struct module *mod, uint8_t r_type, Elf64_Sym *sym, uint64_t addend,
2537 break;
2538
2539 case RV_BDREL:
2540 - val -= (uint64_t) (in_init(mod, val) ? mod->module_init : mod->module_core);
2541 + if (in_init_rx(mod, val))
2542 + val -= (uint64_t) mod->module_init_rx;
2543 + else if (in_init_rw(mod, val))
2544 + val -= (uint64_t) mod->module_init_rw;
2545 + else if (in_core_rx(mod, val))
2546 + val -= (uint64_t) mod->module_core_rx;
2547 + else if (in_core_rw(mod, val))
2548 + val -= (uint64_t) mod->module_core_rw;
2549 break;
2550
2551 case RV_LTV:
2552 @@ -820,15 +850,15 @@ apply_relocate_add (Elf64_Shdr *sechdrs, const char *strtab, unsigned int symind
2553 * addresses have been selected...
2554 */
2555 uint64_t gp;
2556 - if (mod->core_size > MAX_LTOFF)
2557 + if (mod->core_size_rx + mod->core_size_rw > MAX_LTOFF)
2558 /*
2559 * This takes advantage of fact that SHF_ARCH_SMALL gets allocated
2560 * at the end of the module.
2561 */
2562 - gp = mod->core_size - MAX_LTOFF / 2;
2563 + gp = mod->core_size_rx + mod->core_size_rw - MAX_LTOFF / 2;
2564 else
2565 - gp = mod->core_size / 2;
2566 - gp = (uint64_t) mod->module_core + ((gp + 7) & -8);
2567 + gp = (mod->core_size_rx + mod->core_size_rw) / 2;
2568 + gp = (uint64_t) mod->module_core_rx + ((gp + 7) & -8);
2569 mod->arch.gp = gp;
2570 DEBUGP("%s: placing gp at 0x%lx\n", __func__, gp);
2571 }
2572 diff --git a/arch/ia64/kernel/sys_ia64.c b/arch/ia64/kernel/sys_ia64.c
2573 index d9439ef..b9a4303 100644
2574 --- a/arch/ia64/kernel/sys_ia64.c
2575 +++ b/arch/ia64/kernel/sys_ia64.c
2576 @@ -43,6 +43,13 @@ arch_get_unmapped_area (struct file *filp, unsigned long addr, unsigned long len
2577 if (REGION_NUMBER(addr) == RGN_HPAGE)
2578 addr = 0;
2579 #endif
2580 +
2581 +#ifdef CONFIG_PAX_RANDMMAP
2582 + if (mm->pax_flags & MF_PAX_RANDMMAP)
2583 + addr = mm->free_area_cache;
2584 + else
2585 +#endif
2586 +
2587 if (!addr)
2588 addr = mm->free_area_cache;
2589
2590 @@ -61,14 +68,14 @@ arch_get_unmapped_area (struct file *filp, unsigned long addr, unsigned long len
2591 for (vma = find_vma(mm, addr); ; vma = vma->vm_next) {
2592 /* At this point: (!vma || addr < vma->vm_end). */
2593 if (TASK_SIZE - len < addr || RGN_MAP_LIMIT - len < REGION_OFFSET(addr)) {
2594 - if (start_addr != TASK_UNMAPPED_BASE) {
2595 + if (start_addr != mm->mmap_base) {
2596 /* Start a new search --- just in case we missed some holes. */
2597 - addr = TASK_UNMAPPED_BASE;
2598 + addr = mm->mmap_base;
2599 goto full_search;
2600 }
2601 return -ENOMEM;
2602 }
2603 - if (!vma || addr + len <= vma->vm_start) {
2604 + if (check_heap_stack_gap(vma, addr, len)) {
2605 /* Remember the address where we stopped this search: */
2606 mm->free_area_cache = addr + len;
2607 return addr;
2608 diff --git a/arch/ia64/kernel/vmlinux.lds.S b/arch/ia64/kernel/vmlinux.lds.S
2609 index 0ccb28f..8992469 100644
2610 --- a/arch/ia64/kernel/vmlinux.lds.S
2611 +++ b/arch/ia64/kernel/vmlinux.lds.S
2612 @@ -198,7 +198,7 @@ SECTIONS {
2613 /* Per-cpu data: */
2614 . = ALIGN(PERCPU_PAGE_SIZE);
2615 PERCPU_VADDR(SMP_CACHE_BYTES, PERCPU_ADDR, :percpu)
2616 - __phys_per_cpu_start = __per_cpu_load;
2617 + __phys_per_cpu_start = per_cpu_load;
2618 /*
2619 * ensure percpu data fits
2620 * into percpu page size
2621 diff --git a/arch/ia64/mm/fault.c b/arch/ia64/mm/fault.c
2622 index 8443daf..0a01e30 100644
2623 --- a/arch/ia64/mm/fault.c
2624 +++ b/arch/ia64/mm/fault.c
2625 @@ -72,6 +72,23 @@ mapped_kernel_page_is_present (unsigned long address)
2626 return pte_present(pte);
2627 }
2628
2629 +#ifdef CONFIG_PAX_PAGEEXEC
2630 +void pax_report_insns(struct pt_regs *regs, void *pc, void *sp)
2631 +{
2632 + unsigned long i;
2633 +
2634 + printk(KERN_ERR "PAX: bytes at PC: ");
2635 + for (i = 0; i < 8; i++) {
2636 + unsigned int c;
2637 + if (get_user(c, (unsigned int *)pc+i))
2638 + printk(KERN_CONT "???????? ");
2639 + else
2640 + printk(KERN_CONT "%08x ", c);
2641 + }
2642 + printk("\n");
2643 +}
2644 +#endif
2645 +
2646 # define VM_READ_BIT 0
2647 # define VM_WRITE_BIT 1
2648 # define VM_EXEC_BIT 2
2649 @@ -149,8 +166,21 @@ retry:
2650 if (((isr >> IA64_ISR_R_BIT) & 1UL) && (!(vma->vm_flags & (VM_READ | VM_WRITE))))
2651 goto bad_area;
2652
2653 - if ((vma->vm_flags & mask) != mask)
2654 + if ((vma->vm_flags & mask) != mask) {
2655 +
2656 +#ifdef CONFIG_PAX_PAGEEXEC
2657 + if (!(vma->vm_flags & VM_EXEC) && (mask & VM_EXEC)) {
2658 + if (!(mm->pax_flags & MF_PAX_PAGEEXEC) || address != regs->cr_iip)
2659 + goto bad_area;
2660 +
2661 + up_read(&mm->mmap_sem);
2662 + pax_report_fault(regs, (void *)regs->cr_iip, (void *)regs->r12);
2663 + do_group_exit(SIGKILL);
2664 + }
2665 +#endif
2666 +
2667 goto bad_area;
2668 + }
2669
2670 /*
2671 * If for any reason at all we couldn't handle the fault, make
2672 diff --git a/arch/ia64/mm/hugetlbpage.c b/arch/ia64/mm/hugetlbpage.c
2673 index 5ca674b..e0e1b70 100644
2674 --- a/arch/ia64/mm/hugetlbpage.c
2675 +++ b/arch/ia64/mm/hugetlbpage.c
2676 @@ -171,7 +171,7 @@ unsigned long hugetlb_get_unmapped_area(struct file *file, unsigned long addr, u
2677 /* At this point: (!vmm || addr < vmm->vm_end). */
2678 if (REGION_OFFSET(addr) + len > RGN_MAP_LIMIT)
2679 return -ENOMEM;
2680 - if (!vmm || (addr + len) <= vmm->vm_start)
2681 + if (check_heap_stack_gap(vmm, addr, len))
2682 return addr;
2683 addr = ALIGN(vmm->vm_end, HPAGE_SIZE);
2684 }
2685 diff --git a/arch/ia64/mm/init.c b/arch/ia64/mm/init.c
2686 index 0eab454..bd794f2 100644
2687 --- a/arch/ia64/mm/init.c
2688 +++ b/arch/ia64/mm/init.c
2689 @@ -120,6 +120,19 @@ ia64_init_addr_space (void)
2690 vma->vm_start = current->thread.rbs_bot & PAGE_MASK;
2691 vma->vm_end = vma->vm_start + PAGE_SIZE;
2692 vma->vm_flags = VM_DATA_DEFAULT_FLAGS|VM_GROWSUP|VM_ACCOUNT;
2693 +
2694 +#ifdef CONFIG_PAX_PAGEEXEC
2695 + if (current->mm->pax_flags & MF_PAX_PAGEEXEC) {
2696 + vma->vm_flags &= ~VM_EXEC;
2697 +
2698 +#ifdef CONFIG_PAX_MPROTECT
2699 + if (current->mm->pax_flags & MF_PAX_MPROTECT)
2700 + vma->vm_flags &= ~VM_MAYEXEC;
2701 +#endif
2702 +
2703 + }
2704 +#endif
2705 +
2706 vma->vm_page_prot = vm_get_page_prot(vma->vm_flags);
2707 down_write(&current->mm->mmap_sem);
2708 if (insert_vm_struct(current->mm, vma)) {
2709 diff --git a/arch/m32r/include/asm/cache.h b/arch/m32r/include/asm/cache.h
2710 index 40b3ee9..8c2c112 100644
2711 --- a/arch/m32r/include/asm/cache.h
2712 +++ b/arch/m32r/include/asm/cache.h
2713 @@ -1,8 +1,10 @@
2714 #ifndef _ASM_M32R_CACHE_H
2715 #define _ASM_M32R_CACHE_H
2716
2717 +#include <linux/const.h>
2718 +
2719 /* L1 cache line size */
2720 #define L1_CACHE_SHIFT 4
2721 -#define L1_CACHE_BYTES (1 << L1_CACHE_SHIFT)
2722 +#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT)
2723
2724 #endif /* _ASM_M32R_CACHE_H */
2725 diff --git a/arch/m32r/lib/usercopy.c b/arch/m32r/lib/usercopy.c
2726 index 82abd15..d95ae5d 100644
2727 --- a/arch/m32r/lib/usercopy.c
2728 +++ b/arch/m32r/lib/usercopy.c
2729 @@ -14,6 +14,9 @@
2730 unsigned long
2731 __generic_copy_to_user(void __user *to, const void *from, unsigned long n)
2732 {
2733 + if ((long)n < 0)
2734 + return n;
2735 +
2736 prefetch(from);
2737 if (access_ok(VERIFY_WRITE, to, n))
2738 __copy_user(to,from,n);
2739 @@ -23,6 +26,9 @@ __generic_copy_to_user(void __user *to, const void *from, unsigned long n)
2740 unsigned long
2741 __generic_copy_from_user(void *to, const void __user *from, unsigned long n)
2742 {
2743 + if ((long)n < 0)
2744 + return n;
2745 +
2746 prefetchw(to);
2747 if (access_ok(VERIFY_READ, from, n))
2748 __copy_user_zeroing(to,from,n);
2749 diff --git a/arch/m68k/include/asm/cache.h b/arch/m68k/include/asm/cache.h
2750 index 0395c51..5f26031 100644
2751 --- a/arch/m68k/include/asm/cache.h
2752 +++ b/arch/m68k/include/asm/cache.h
2753 @@ -4,9 +4,11 @@
2754 #ifndef __ARCH_M68K_CACHE_H
2755 #define __ARCH_M68K_CACHE_H
2756
2757 +#include <linux/const.h>
2758 +
2759 /* bytes per L1 cache line */
2760 #define L1_CACHE_SHIFT 4
2761 -#define L1_CACHE_BYTES (1<< L1_CACHE_SHIFT)
2762 +#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT)
2763
2764 #define ARCH_DMA_MINALIGN L1_CACHE_BYTES
2765
2766 diff --git a/arch/microblaze/include/asm/cache.h b/arch/microblaze/include/asm/cache.h
2767 index 4efe96a..60e8699 100644
2768 --- a/arch/microblaze/include/asm/cache.h
2769 +++ b/arch/microblaze/include/asm/cache.h
2770 @@ -13,11 +13,12 @@
2771 #ifndef _ASM_MICROBLAZE_CACHE_H
2772 #define _ASM_MICROBLAZE_CACHE_H
2773
2774 +#include <linux/const.h>
2775 #include <asm/registers.h>
2776
2777 #define L1_CACHE_SHIFT 5
2778 /* word-granular cache in microblaze */
2779 -#define L1_CACHE_BYTES (1 << L1_CACHE_SHIFT)
2780 +#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT)
2781
2782 #define SMP_CACHE_BYTES L1_CACHE_BYTES
2783
2784 diff --git a/arch/mips/include/asm/atomic.h b/arch/mips/include/asm/atomic.h
2785 index 3f4c5cb..3439c6e 100644
2786 --- a/arch/mips/include/asm/atomic.h
2787 +++ b/arch/mips/include/asm/atomic.h
2788 @@ -21,6 +21,10 @@
2789 #include <asm/cmpxchg.h>
2790 #include <asm/war.h>
2791
2792 +#ifdef CONFIG_GENERIC_ATOMIC64
2793 +#include <asm-generic/atomic64.h>
2794 +#endif
2795 +
2796 #define ATOMIC_INIT(i) { (i) }
2797
2798 /*
2799 @@ -765,6 +769,16 @@ static __inline__ int atomic64_add_unless(atomic64_t *v, long a, long u)
2800 */
2801 #define atomic64_add_negative(i, v) (atomic64_add_return(i, (v)) < 0)
2802
2803 +#define atomic64_read_unchecked(v) atomic64_read(v)
2804 +#define atomic64_set_unchecked(v, i) atomic64_set((v), (i))
2805 +#define atomic64_add_unchecked(a, v) atomic64_add((a), (v))
2806 +#define atomic64_add_return_unchecked(a, v) atomic64_add_return((a), (v))
2807 +#define atomic64_sub_unchecked(a, v) atomic64_sub((a), (v))
2808 +#define atomic64_inc_unchecked(v) atomic64_inc(v)
2809 +#define atomic64_inc_return_unchecked(v) atomic64_inc_return(v)
2810 +#define atomic64_dec_unchecked(v) atomic64_dec(v)
2811 +#define atomic64_cmpxchg_unchecked(v, o, n) atomic64_cmpxchg((v), (o), (n))
2812 +
2813 #endif /* CONFIG_64BIT */
2814
2815 /*
2816 diff --git a/arch/mips/include/asm/cache.h b/arch/mips/include/asm/cache.h
2817 index b4db69f..8f3b093 100644
2818 --- a/arch/mips/include/asm/cache.h
2819 +++ b/arch/mips/include/asm/cache.h
2820 @@ -9,10 +9,11 @@
2821 #ifndef _ASM_CACHE_H
2822 #define _ASM_CACHE_H
2823
2824 +#include <linux/const.h>
2825 #include <kmalloc.h>
2826
2827 #define L1_CACHE_SHIFT CONFIG_MIPS_L1_CACHE_SHIFT
2828 -#define L1_CACHE_BYTES (1 << L1_CACHE_SHIFT)
2829 +#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT)
2830
2831 #define SMP_CACHE_SHIFT L1_CACHE_SHIFT
2832 #define SMP_CACHE_BYTES L1_CACHE_BYTES
2833 diff --git a/arch/mips/include/asm/elf.h b/arch/mips/include/asm/elf.h
2834 index 455c0ac..ad65fbe 100644
2835 --- a/arch/mips/include/asm/elf.h
2836 +++ b/arch/mips/include/asm/elf.h
2837 @@ -372,13 +372,16 @@ extern const char *__elf_platform;
2838 #define ELF_ET_DYN_BASE (TASK_SIZE / 3 * 2)
2839 #endif
2840
2841 +#ifdef CONFIG_PAX_ASLR
2842 +#define PAX_ELF_ET_DYN_BASE (TASK_IS_32BIT_ADDR ? 0x00400000UL : 0x00400000UL)
2843 +
2844 +#define PAX_DELTA_MMAP_LEN (TASK_IS_32BIT_ADDR ? 27-PAGE_SHIFT : 36-PAGE_SHIFT)
2845 +#define PAX_DELTA_STACK_LEN (TASK_IS_32BIT_ADDR ? 27-PAGE_SHIFT : 36-PAGE_SHIFT)
2846 +#endif
2847 +
2848 #define ARCH_HAS_SETUP_ADDITIONAL_PAGES 1
2849 struct linux_binprm;
2850 extern int arch_setup_additional_pages(struct linux_binprm *bprm,
2851 int uses_interp);
2852
2853 -struct mm_struct;
2854 -extern unsigned long arch_randomize_brk(struct mm_struct *mm);
2855 -#define arch_randomize_brk arch_randomize_brk
2856 -
2857 #endif /* _ASM_ELF_H */
2858 diff --git a/arch/mips/include/asm/exec.h b/arch/mips/include/asm/exec.h
2859 index c1f6afa..38cc6e9 100644
2860 --- a/arch/mips/include/asm/exec.h
2861 +++ b/arch/mips/include/asm/exec.h
2862 @@ -12,6 +12,6 @@
2863 #ifndef _ASM_EXEC_H
2864 #define _ASM_EXEC_H
2865
2866 -extern unsigned long arch_align_stack(unsigned long sp);
2867 +#define arch_align_stack(x) ((x) & ~0xfUL)
2868
2869 #endif /* _ASM_EXEC_H */
2870 diff --git a/arch/mips/include/asm/page.h b/arch/mips/include/asm/page.h
2871 index da9bd7d..91aa7ab 100644
2872 --- a/arch/mips/include/asm/page.h
2873 +++ b/arch/mips/include/asm/page.h
2874 @@ -98,7 +98,7 @@ extern void copy_user_highpage(struct page *to, struct page *from,
2875 #ifdef CONFIG_CPU_MIPS32
2876 typedef struct { unsigned long pte_low, pte_high; } pte_t;
2877 #define pte_val(x) ((x).pte_low | ((unsigned long long)(x).pte_high << 32))
2878 - #define __pte(x) ({ pte_t __pte = {(x), ((unsigned long long)(x)) >> 32}; __pte; })
2879 + #define __pte(x) ({ pte_t __pte = {(x), (x) >> 32}; __pte; })
2880 #else
2881 typedef struct { unsigned long long pte; } pte_t;
2882 #define pte_val(x) ((x).pte)
2883 diff --git a/arch/mips/include/asm/pgalloc.h b/arch/mips/include/asm/pgalloc.h
2884 index 881d18b..cea38bc 100644
2885 --- a/arch/mips/include/asm/pgalloc.h
2886 +++ b/arch/mips/include/asm/pgalloc.h
2887 @@ -37,6 +37,11 @@ static inline void pud_populate(struct mm_struct *mm, pud_t *pud, pmd_t *pmd)
2888 {
2889 set_pud(pud, __pud((unsigned long)pmd));
2890 }
2891 +
2892 +static inline void pud_populate_kernel(struct mm_struct *mm, pud_t *pud, pmd_t *pmd)
2893 +{
2894 + pud_populate(mm, pud, pmd);
2895 +}
2896 #endif
2897
2898 /*
2899 diff --git a/arch/mips/include/asm/thread_info.h b/arch/mips/include/asm/thread_info.h
2900 index ca97e0e..cd08920 100644
2901 --- a/arch/mips/include/asm/thread_info.h
2902 +++ b/arch/mips/include/asm/thread_info.h
2903 @@ -111,6 +111,8 @@ register struct thread_info *__current_thread_info __asm__("$28");
2904 #define TIF_32BIT_ADDR 23 /* 32-bit address space (o32/n32) */
2905 #define TIF_FPUBOUND 24 /* thread bound to FPU-full CPU set */
2906 #define TIF_LOAD_WATCH 25 /* If set, load watch registers */
2907 +/* li takes a 32bit immediate */
2908 +#define TIF_GRSEC_SETXID 29 /* update credentials on syscall entry/exit */
2909 #define TIF_SYSCALL_TRACE 31 /* syscall trace active */
2910
2911 #ifdef CONFIG_MIPS32_O32
2912 @@ -134,15 +136,18 @@ register struct thread_info *__current_thread_info __asm__("$28");
2913 #define _TIF_32BIT_ADDR (1<<TIF_32BIT_ADDR)
2914 #define _TIF_FPUBOUND (1<<TIF_FPUBOUND)
2915 #define _TIF_LOAD_WATCH (1<<TIF_LOAD_WATCH)
2916 +#define _TIF_GRSEC_SETXID (1<<TIF_GRSEC_SETXID)
2917 +
2918 +#define _TIF_SYSCALL_WORK (_TIF_SYSCALL_TRACE | _TIF_SYSCALL_AUDIT | _TIF_GRSEC_SETXID)
2919
2920 /* work to do in syscall_trace_leave() */
2921 -#define _TIF_WORK_SYSCALL_EXIT (_TIF_SYSCALL_TRACE | _TIF_SYSCALL_AUDIT)
2922 +#define _TIF_WORK_SYSCALL_EXIT (_TIF_SYSCALL_TRACE | _TIF_SYSCALL_AUDIT | _TIF_GRSEC_SETXID)
2923
2924 /* work to do on interrupt/exception return */
2925 #define _TIF_WORK_MASK (0x0000ffef & \
2926 ~(_TIF_SECCOMP | _TIF_SYSCALL_AUDIT))
2927 /* work to do on any return to u-space */
2928 -#define _TIF_ALLWORK_MASK (0x8000ffff & ~_TIF_SECCOMP)
2929 +#define _TIF_ALLWORK_MASK ((0x8000ffff & ~_TIF_SECCOMP) | _TIF_GRSEC_SETXID)
2930
2931 #endif /* __KERNEL__ */
2932
2933 diff --git a/arch/mips/kernel/binfmt_elfn32.c b/arch/mips/kernel/binfmt_elfn32.c
2934 index 9fdd8bc..4bd7f1a 100644
2935 --- a/arch/mips/kernel/binfmt_elfn32.c
2936 +++ b/arch/mips/kernel/binfmt_elfn32.c
2937 @@ -50,6 +50,13 @@ typedef elf_fpreg_t elf_fpregset_t[ELF_NFPREG];
2938 #undef ELF_ET_DYN_BASE
2939 #define ELF_ET_DYN_BASE (TASK32_SIZE / 3 * 2)
2940
2941 +#ifdef CONFIG_PAX_ASLR
2942 +#define PAX_ELF_ET_DYN_BASE (TASK_IS_32BIT_ADDR ? 0x00400000UL : 0x00400000UL)
2943 +
2944 +#define PAX_DELTA_MMAP_LEN (TASK_IS_32BIT_ADDR ? 27-PAGE_SHIFT : 36-PAGE_SHIFT)
2945 +#define PAX_DELTA_STACK_LEN (TASK_IS_32BIT_ADDR ? 27-PAGE_SHIFT : 36-PAGE_SHIFT)
2946 +#endif
2947 +
2948 #include <asm/processor.h>
2949 #include <linux/module.h>
2950 #include <linux/elfcore.h>
2951 diff --git a/arch/mips/kernel/binfmt_elfo32.c b/arch/mips/kernel/binfmt_elfo32.c
2952 index ff44823..97f8906 100644
2953 --- a/arch/mips/kernel/binfmt_elfo32.c
2954 +++ b/arch/mips/kernel/binfmt_elfo32.c
2955 @@ -52,6 +52,13 @@ typedef elf_fpreg_t elf_fpregset_t[ELF_NFPREG];
2956 #undef ELF_ET_DYN_BASE
2957 #define ELF_ET_DYN_BASE (TASK32_SIZE / 3 * 2)
2958
2959 +#ifdef CONFIG_PAX_ASLR
2960 +#define PAX_ELF_ET_DYN_BASE (TASK_IS_32BIT_ADDR ? 0x00400000UL : 0x00400000UL)
2961 +
2962 +#define PAX_DELTA_MMAP_LEN (TASK_IS_32BIT_ADDR ? 27-PAGE_SHIFT : 36-PAGE_SHIFT)
2963 +#define PAX_DELTA_STACK_LEN (TASK_IS_32BIT_ADDR ? 27-PAGE_SHIFT : 36-PAGE_SHIFT)
2964 +#endif
2965 +
2966 #include <asm/processor.h>
2967
2968 /*
2969 diff --git a/arch/mips/kernel/process.c b/arch/mips/kernel/process.c
2970 index e9a5fd7..378809a 100644
2971 --- a/arch/mips/kernel/process.c
2972 +++ b/arch/mips/kernel/process.c
2973 @@ -480,15 +480,3 @@ unsigned long get_wchan(struct task_struct *task)
2974 out:
2975 return pc;
2976 }
2977 -
2978 -/*
2979 - * Don't forget that the stack pointer must be aligned on a 8 bytes
2980 - * boundary for 32-bits ABI and 16 bytes for 64-bits ABI.
2981 - */
2982 -unsigned long arch_align_stack(unsigned long sp)
2983 -{
2984 - if (!(current->personality & ADDR_NO_RANDOMIZE) && randomize_va_space)
2985 - sp -= get_random_int() & ~PAGE_MASK;
2986 -
2987 - return sp & ALMASK;
2988 -}
2989 diff --git a/arch/mips/kernel/ptrace.c b/arch/mips/kernel/ptrace.c
2990 index 4812c6d..2069554 100644
2991 --- a/arch/mips/kernel/ptrace.c
2992 +++ b/arch/mips/kernel/ptrace.c
2993 @@ -528,6 +528,10 @@ static inline int audit_arch(void)
2994 return arch;
2995 }
2996
2997 +#ifdef CONFIG_GRKERNSEC_SETXID
2998 +extern void gr_delayed_cred_worker(void);
2999 +#endif
3000 +
3001 /*
3002 * Notification of system call entry/exit
3003 * - triggered by current->work.syscall_trace
3004 @@ -537,6 +541,11 @@ asmlinkage void syscall_trace_enter(struct pt_regs *regs)
3005 /* do the secure computing check first */
3006 secure_computing_strict(regs->regs[2]);
3007
3008 +#ifdef CONFIG_GRKERNSEC_SETXID
3009 + if (unlikely(test_and_clear_thread_flag(TIF_GRSEC_SETXID)))
3010 + gr_delayed_cred_worker();
3011 +#endif
3012 +
3013 if (!(current->ptrace & PT_PTRACED))
3014 goto out;
3015
3016 diff --git a/arch/mips/kernel/scall32-o32.S b/arch/mips/kernel/scall32-o32.S
3017 index a632bc1..0b77c7c 100644
3018 --- a/arch/mips/kernel/scall32-o32.S
3019 +++ b/arch/mips/kernel/scall32-o32.S
3020 @@ -52,7 +52,7 @@ NESTED(handle_sys, PT_SIZE, sp)
3021
3022 stack_done:
3023 lw t0, TI_FLAGS($28) # syscall tracing enabled?
3024 - li t1, _TIF_SYSCALL_TRACE | _TIF_SYSCALL_AUDIT
3025 + li t1, _TIF_SYSCALL_WORK
3026 and t0, t1
3027 bnez t0, syscall_trace_entry # -> yes
3028
3029 diff --git a/arch/mips/kernel/scall64-64.S b/arch/mips/kernel/scall64-64.S
3030 index 3b5a5e9..e1ee86d 100644
3031 --- a/arch/mips/kernel/scall64-64.S
3032 +++ b/arch/mips/kernel/scall64-64.S
3033 @@ -54,7 +54,7 @@ NESTED(handle_sys64, PT_SIZE, sp)
3034
3035 sd a3, PT_R26(sp) # save a3 for syscall restarting
3036
3037 - li t1, _TIF_SYSCALL_TRACE | _TIF_SYSCALL_AUDIT
3038 + li t1, _TIF_SYSCALL_WORK
3039 LONG_L t0, TI_FLAGS($28) # syscall tracing enabled?
3040 and t0, t1, t0
3041 bnez t0, syscall_trace_entry
3042 diff --git a/arch/mips/kernel/scall64-n32.S b/arch/mips/kernel/scall64-n32.S
3043 index 6be6f70..1859577 100644
3044 --- a/arch/mips/kernel/scall64-n32.S
3045 +++ b/arch/mips/kernel/scall64-n32.S
3046 @@ -53,7 +53,7 @@ NESTED(handle_sysn32, PT_SIZE, sp)
3047
3048 sd a3, PT_R26(sp) # save a3 for syscall restarting
3049
3050 - li t1, _TIF_SYSCALL_TRACE | _TIF_SYSCALL_AUDIT
3051 + li t1, _TIF_SYSCALL_WORK
3052 LONG_L t0, TI_FLAGS($28) # syscall tracing enabled?
3053 and t0, t1, t0
3054 bnez t0, n32_syscall_trace_entry
3055 diff --git a/arch/mips/kernel/scall64-o32.S b/arch/mips/kernel/scall64-o32.S
3056 index 5422855..74e63a3 100644
3057 --- a/arch/mips/kernel/scall64-o32.S
3058 +++ b/arch/mips/kernel/scall64-o32.S
3059 @@ -81,7 +81,7 @@ NESTED(handle_sys, PT_SIZE, sp)
3060 PTR 4b, bad_stack
3061 .previous
3062
3063 - li t1, _TIF_SYSCALL_TRACE | _TIF_SYSCALL_AUDIT
3064 + li t1, _TIF_SYSCALL_WORK
3065 LONG_L t0, TI_FLAGS($28) # syscall tracing enabled?
3066 and t0, t1, t0
3067 bnez t0, trace_a_syscall
3068 diff --git a/arch/mips/mm/fault.c b/arch/mips/mm/fault.c
3069 index c14f6df..537e729 100644
3070 --- a/arch/mips/mm/fault.c
3071 +++ b/arch/mips/mm/fault.c
3072 @@ -27,6 +27,23 @@
3073 #include <asm/highmem.h> /* For VMALLOC_END */
3074 #include <linux/kdebug.h>
3075
3076 +#ifdef CONFIG_PAX_PAGEEXEC
3077 +void pax_report_insns(struct pt_regs *regs, void *pc, void *sp)
3078 +{
3079 + unsigned long i;
3080 +
3081 + printk(KERN_ERR "PAX: bytes at PC: ");
3082 + for (i = 0; i < 5; i++) {
3083 + unsigned int c;
3084 + if (get_user(c, (unsigned int *)pc+i))
3085 + printk(KERN_CONT "???????? ");
3086 + else
3087 + printk(KERN_CONT "%08x ", c);
3088 + }
3089 + printk("\n");
3090 +}
3091 +#endif
3092 +
3093 /*
3094 * This routine handles page faults. It determines the address,
3095 * and the problem, and then passes it off to one of the appropriate
3096 diff --git a/arch/mips/mm/mmap.c b/arch/mips/mm/mmap.c
3097 index 302d779..7d35bf8 100644
3098 --- a/arch/mips/mm/mmap.c
3099 +++ b/arch/mips/mm/mmap.c
3100 @@ -95,6 +95,11 @@ static unsigned long arch_get_unmapped_area_common(struct file *filp,
3101 do_color_align = 1;
3102
3103 /* requesting a specific address */
3104 +
3105 +#ifdef CONFIG_PAX_RANDMMAP
3106 + if (!(current->mm->pax_flags & MF_PAX_RANDMMAP))
3107 +#endif
3108 +
3109 if (addr) {
3110 if (do_color_align)
3111 addr = COLOUR_ALIGN(addr, pgoff);
3112 @@ -102,8 +107,7 @@ static unsigned long arch_get_unmapped_area_common(struct file *filp,
3113 addr = PAGE_ALIGN(addr);
3114
3115 vma = find_vma(mm, addr);
3116 - if (TASK_SIZE - len >= addr &&
3117 - (!vma || addr + len <= vma->vm_start))
3118 + if (TASK_SIZE - len >= addr && check_heap_stack_gap(vmm, addr, len))
3119 return addr;
3120 }
3121
3122 @@ -118,7 +122,7 @@ static unsigned long arch_get_unmapped_area_common(struct file *filp,
3123 /* At this point: (!vma || addr < vma->vm_end). */
3124 if (TASK_SIZE - len < addr)
3125 return -ENOMEM;
3126 - if (!vma || addr + len <= vma->vm_start)
3127 + if (check_heap_stack_gap(vmm, addr, len))
3128 return addr;
3129 addr = vma->vm_end;
3130 if (do_color_align)
3131 @@ -145,7 +149,7 @@ static unsigned long arch_get_unmapped_area_common(struct file *filp,
3132 /* make sure it can fit in the remaining address space */
3133 if (likely(addr > len)) {
3134 vma = find_vma(mm, addr - len);
3135 - if (!vma || addr <= vma->vm_start) {
3136 + if (check_heap_stack_gap(vmm, addr - len, len))
3137 /* cache the address as a hint for next time */
3138 return mm->free_area_cache = addr - len;
3139 }
3140 @@ -165,7 +169,7 @@ static unsigned long arch_get_unmapped_area_common(struct file *filp,
3141 * return with success:
3142 */
3143 vma = find_vma(mm, addr);
3144 - if (likely(!vma || addr + len <= vma->vm_start)) {
3145 + if (check_heap_stack_gap(vmm, addr, len)) {
3146 /* cache the address as a hint for next time */
3147 return mm->free_area_cache = addr;
3148 }
3149 @@ -242,30 +246,3 @@ void arch_pick_mmap_layout(struct mm_struct *mm)
3150 mm->unmap_area = arch_unmap_area_topdown;
3151 }
3152 }
3153 -
3154 -static inline unsigned long brk_rnd(void)
3155 -{
3156 - unsigned long rnd = get_random_int();
3157 -
3158 - rnd = rnd << PAGE_SHIFT;
3159 - /* 8MB for 32bit, 256MB for 64bit */
3160 - if (TASK_IS_32BIT_ADDR)
3161 - rnd = rnd & 0x7ffffful;
3162 - else
3163 - rnd = rnd & 0xffffffful;
3164 -
3165 - return rnd;
3166 -}
3167 -
3168 -unsigned long arch_randomize_brk(struct mm_struct *mm)
3169 -{
3170 - unsigned long base = mm->brk;
3171 - unsigned long ret;
3172 -
3173 - ret = PAGE_ALIGN(base + brk_rnd());
3174 -
3175 - if (ret < mm->brk)
3176 - return mm->brk;
3177 -
3178 - return ret;
3179 -}
3180 diff --git a/arch/mn10300/proc-mn103e010/include/proc/cache.h b/arch/mn10300/proc-mn103e010/include/proc/cache.h
3181 index 967d144..db12197 100644
3182 --- a/arch/mn10300/proc-mn103e010/include/proc/cache.h
3183 +++ b/arch/mn10300/proc-mn103e010/include/proc/cache.h
3184 @@ -11,12 +11,14 @@
3185 #ifndef _ASM_PROC_CACHE_H
3186 #define _ASM_PROC_CACHE_H
3187
3188 +#include <linux/const.h>
3189 +
3190 /* L1 cache */
3191
3192 #define L1_CACHE_NWAYS 4 /* number of ways in caches */
3193 #define L1_CACHE_NENTRIES 256 /* number of entries in each way */
3194 -#define L1_CACHE_BYTES 16 /* bytes per entry */
3195 #define L1_CACHE_SHIFT 4 /* shift for bytes per entry */
3196 +#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT) /* bytes per entry */
3197 #define L1_CACHE_WAYDISP 0x1000 /* displacement of one way from the next */
3198
3199 #define L1_CACHE_TAG_VALID 0x00000001 /* cache tag valid bit */
3200 diff --git a/arch/mn10300/proc-mn2ws0050/include/proc/cache.h b/arch/mn10300/proc-mn2ws0050/include/proc/cache.h
3201 index bcb5df2..84fabd2 100644
3202 --- a/arch/mn10300/proc-mn2ws0050/include/proc/cache.h
3203 +++ b/arch/mn10300/proc-mn2ws0050/include/proc/cache.h
3204 @@ -16,13 +16,15 @@
3205 #ifndef _ASM_PROC_CACHE_H
3206 #define _ASM_PROC_CACHE_H
3207
3208 +#include <linux/const.h>
3209 +
3210 /*
3211 * L1 cache
3212 */
3213 #define L1_CACHE_NWAYS 4 /* number of ways in caches */
3214 #define L1_CACHE_NENTRIES 128 /* number of entries in each way */
3215 -#define L1_CACHE_BYTES 32 /* bytes per entry */
3216 #define L1_CACHE_SHIFT 5 /* shift for bytes per entry */
3217 +#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT) /* bytes per entry */
3218 #define L1_CACHE_WAYDISP 0x1000 /* distance from one way to the next */
3219
3220 #define L1_CACHE_TAG_VALID 0x00000001 /* cache tag valid bit */
3221 diff --git a/arch/openrisc/include/asm/cache.h b/arch/openrisc/include/asm/cache.h
3222 index 4ce7a01..449202a 100644
3223 --- a/arch/openrisc/include/asm/cache.h
3224 +++ b/arch/openrisc/include/asm/cache.h
3225 @@ -19,11 +19,13 @@
3226 #ifndef __ASM_OPENRISC_CACHE_H
3227 #define __ASM_OPENRISC_CACHE_H
3228
3229 +#include <linux/const.h>
3230 +
3231 /* FIXME: How can we replace these with values from the CPU...
3232 * they shouldn't be hard-coded!
3233 */
3234
3235 -#define L1_CACHE_BYTES 16
3236 #define L1_CACHE_SHIFT 4
3237 +#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT)
3238
3239 #endif /* __ASM_OPENRISC_CACHE_H */
3240 diff --git a/arch/parisc/include/asm/atomic.h b/arch/parisc/include/asm/atomic.h
3241 index af9cf30..2aae9b2 100644
3242 --- a/arch/parisc/include/asm/atomic.h
3243 +++ b/arch/parisc/include/asm/atomic.h
3244 @@ -229,6 +229,16 @@ static __inline__ int atomic64_add_unless(atomic64_t *v, long a, long u)
3245
3246 #define atomic64_inc_not_zero(v) atomic64_add_unless((v), 1, 0)
3247
3248 +#define atomic64_read_unchecked(v) atomic64_read(v)
3249 +#define atomic64_set_unchecked(v, i) atomic64_set((v), (i))
3250 +#define atomic64_add_unchecked(a, v) atomic64_add((a), (v))
3251 +#define atomic64_add_return_unchecked(a, v) atomic64_add_return((a), (v))
3252 +#define atomic64_sub_unchecked(a, v) atomic64_sub((a), (v))
3253 +#define atomic64_inc_unchecked(v) atomic64_inc(v)
3254 +#define atomic64_inc_return_unchecked(v) atomic64_inc_return(v)
3255 +#define atomic64_dec_unchecked(v) atomic64_dec(v)
3256 +#define atomic64_cmpxchg_unchecked(v, o, n) atomic64_cmpxchg((v), (o), (n))
3257 +
3258 #endif /* !CONFIG_64BIT */
3259
3260
3261 diff --git a/arch/parisc/include/asm/cache.h b/arch/parisc/include/asm/cache.h
3262 index 47f11c7..3420df2 100644
3263 --- a/arch/parisc/include/asm/cache.h
3264 +++ b/arch/parisc/include/asm/cache.h
3265 @@ -5,6 +5,7 @@
3266 #ifndef __ARCH_PARISC_CACHE_H
3267 #define __ARCH_PARISC_CACHE_H
3268
3269 +#include <linux/const.h>
3270
3271 /*
3272 * PA 2.0 processors have 64-byte cachelines; PA 1.1 processors have
3273 @@ -15,13 +16,13 @@
3274 * just ruin performance.
3275 */
3276 #ifdef CONFIG_PA20
3277 -#define L1_CACHE_BYTES 64
3278 #define L1_CACHE_SHIFT 6
3279 #else
3280 -#define L1_CACHE_BYTES 32
3281 #define L1_CACHE_SHIFT 5
3282 #endif
3283
3284 +#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT)
3285 +
3286 #ifndef __ASSEMBLY__
3287
3288 #define SMP_CACHE_BYTES L1_CACHE_BYTES
3289 diff --git a/arch/parisc/include/asm/elf.h b/arch/parisc/include/asm/elf.h
3290 index 19f6cb1..6c78cf2 100644
3291 --- a/arch/parisc/include/asm/elf.h
3292 +++ b/arch/parisc/include/asm/elf.h
3293 @@ -342,6 +342,13 @@ struct pt_regs; /* forward declaration... */
3294
3295 #define ELF_ET_DYN_BASE (TASK_UNMAPPED_BASE + 0x01000000)
3296
3297 +#ifdef CONFIG_PAX_ASLR
3298 +#define PAX_ELF_ET_DYN_BASE 0x10000UL
3299 +
3300 +#define PAX_DELTA_MMAP_LEN 16
3301 +#define PAX_DELTA_STACK_LEN 16
3302 +#endif
3303 +
3304 /* This yields a mask that user programs can use to figure out what
3305 instruction set this CPU supports. This could be done in user space,
3306 but it's not easy, and we've already done it here. */
3307 diff --git a/arch/parisc/include/asm/pgalloc.h b/arch/parisc/include/asm/pgalloc.h
3308 index fc987a1..6e068ef 100644
3309 --- a/arch/parisc/include/asm/pgalloc.h
3310 +++ b/arch/parisc/include/asm/pgalloc.h
3311 @@ -61,6 +61,11 @@ static inline void pgd_populate(struct mm_struct *mm, pgd_t *pgd, pmd_t *pmd)
3312 (__u32)(__pa((unsigned long)pmd) >> PxD_VALUE_SHIFT));
3313 }
3314
3315 +static inline void pgd_populate_kernel(struct mm_struct *mm, pgd_t *pgd, pmd_t *pmd)
3316 +{
3317 + pgd_populate(mm, pgd, pmd);
3318 +}
3319 +
3320 static inline pmd_t *pmd_alloc_one(struct mm_struct *mm, unsigned long address)
3321 {
3322 pmd_t *pmd = (pmd_t *)__get_free_pages(GFP_KERNEL|__GFP_REPEAT,
3323 @@ -93,6 +98,7 @@ static inline void pmd_free(struct mm_struct *mm, pmd_t *pmd)
3324 #define pmd_alloc_one(mm, addr) ({ BUG(); ((pmd_t *)2); })
3325 #define pmd_free(mm, x) do { } while (0)
3326 #define pgd_populate(mm, pmd, pte) BUG()
3327 +#define pgd_populate_kernel(mm, pmd, pte) BUG()
3328
3329 #endif
3330
3331 diff --git a/arch/parisc/include/asm/pgtable.h b/arch/parisc/include/asm/pgtable.h
3332 index ee99f23..802b0a1 100644
3333 --- a/arch/parisc/include/asm/pgtable.h
3334 +++ b/arch/parisc/include/asm/pgtable.h
3335 @@ -212,6 +212,17 @@ struct vm_area_struct;
3336 #define PAGE_EXECREAD __pgprot(_PAGE_PRESENT | _PAGE_USER | _PAGE_READ | _PAGE_EXEC |_PAGE_ACCESSED)
3337 #define PAGE_COPY PAGE_EXECREAD
3338 #define PAGE_RWX __pgprot(_PAGE_PRESENT | _PAGE_USER | _PAGE_READ | _PAGE_WRITE | _PAGE_EXEC |_PAGE_ACCESSED)
3339 +
3340 +#ifdef CONFIG_PAX_PAGEEXEC
3341 +# define PAGE_SHARED_NOEXEC __pgprot(_PAGE_PRESENT | _PAGE_USER | _PAGE_READ | _PAGE_WRITE | _PAGE_ACCESSED)
3342 +# define PAGE_COPY_NOEXEC __pgprot(_PAGE_PRESENT | _PAGE_USER | _PAGE_READ | _PAGE_ACCESSED)
3343 +# define PAGE_READONLY_NOEXEC __pgprot(_PAGE_PRESENT | _PAGE_USER | _PAGE_READ | _PAGE_ACCESSED)
3344 +#else
3345 +# define PAGE_SHARED_NOEXEC PAGE_SHARED
3346 +# define PAGE_COPY_NOEXEC PAGE_COPY
3347 +# define PAGE_READONLY_NOEXEC PAGE_READONLY
3348 +#endif
3349 +
3350 #define PAGE_KERNEL __pgprot(_PAGE_KERNEL)
3351 #define PAGE_KERNEL_EXEC __pgprot(_PAGE_KERNEL_EXEC)
3352 #define PAGE_KERNEL_RWX __pgprot(_PAGE_KERNEL_RWX)
3353 diff --git a/arch/parisc/include/asm/uaccess.h b/arch/parisc/include/asm/uaccess.h
3354 index 4ba2c93..f5e3974 100644
3355 --- a/arch/parisc/include/asm/uaccess.h
3356 +++ b/arch/parisc/include/asm/uaccess.h
3357 @@ -251,10 +251,10 @@ static inline unsigned long __must_check copy_from_user(void *to,
3358 const void __user *from,
3359 unsigned long n)
3360 {
3361 - int sz = __compiletime_object_size(to);
3362 + size_t sz = __compiletime_object_size(to);
3363 int ret = -EFAULT;
3364
3365 - if (likely(sz == -1 || !__builtin_constant_p(n) || sz >= n))
3366 + if (likely(sz == (size_t)-1 || !__builtin_constant_p(n) || sz >= n))
3367 ret = __copy_from_user(to, from, n);
3368 else
3369 copy_from_user_overflow();
3370 diff --git a/arch/parisc/kernel/module.c b/arch/parisc/kernel/module.c
3371 index 5e34ccf..672bc9c 100644
3372 --- a/arch/parisc/kernel/module.c
3373 +++ b/arch/parisc/kernel/module.c
3374 @@ -98,16 +98,38 @@
3375
3376 /* three functions to determine where in the module core
3377 * or init pieces the location is */
3378 +static inline int in_init_rx(struct module *me, void *loc)
3379 +{
3380 + return (loc >= me->module_init_rx &&
3381 + loc < (me->module_init_rx + me->init_size_rx));
3382 +}
3383 +
3384 +static inline int in_init_rw(struct module *me, void *loc)
3385 +{
3386 + return (loc >= me->module_init_rw &&
3387 + loc < (me->module_init_rw + me->init_size_rw));
3388 +}
3389 +
3390 static inline int in_init(struct module *me, void *loc)
3391 {
3392 - return (loc >= me->module_init &&
3393 - loc <= (me->module_init + me->init_size));
3394 + return in_init_rx(me, loc) || in_init_rw(me, loc);
3395 +}
3396 +
3397 +static inline int in_core_rx(struct module *me, void *loc)
3398 +{
3399 + return (loc >= me->module_core_rx &&
3400 + loc < (me->module_core_rx + me->core_size_rx));
3401 +}
3402 +
3403 +static inline int in_core_rw(struct module *me, void *loc)
3404 +{
3405 + return (loc >= me->module_core_rw &&
3406 + loc < (me->module_core_rw + me->core_size_rw));
3407 }
3408
3409 static inline int in_core(struct module *me, void *loc)
3410 {
3411 - return (loc >= me->module_core &&
3412 - loc <= (me->module_core + me->core_size));
3413 + return in_core_rx(me, loc) || in_core_rw(me, loc);
3414 }
3415
3416 static inline int in_local(struct module *me, void *loc)
3417 @@ -373,13 +395,13 @@ int module_frob_arch_sections(CONST Elf_Ehdr *hdr,
3418 }
3419
3420 /* align things a bit */
3421 - me->core_size = ALIGN(me->core_size, 16);
3422 - me->arch.got_offset = me->core_size;
3423 - me->core_size += gots * sizeof(struct got_entry);
3424 + me->core_size_rw = ALIGN(me->core_size_rw, 16);
3425 + me->arch.got_offset = me->core_size_rw;
3426 + me->core_size_rw += gots * sizeof(struct got_entry);
3427
3428 - me->core_size = ALIGN(me->core_size, 16);
3429 - me->arch.fdesc_offset = me->core_size;
3430 - me->core_size += fdescs * sizeof(Elf_Fdesc);
3431 + me->core_size_rw = ALIGN(me->core_size_rw, 16);
3432 + me->arch.fdesc_offset = me->core_size_rw;
3433 + me->core_size_rw += fdescs * sizeof(Elf_Fdesc);
3434
3435 me->arch.got_max = gots;
3436 me->arch.fdesc_max = fdescs;
3437 @@ -397,7 +419,7 @@ static Elf64_Word get_got(struct module *me, unsigned long value, long addend)
3438
3439 BUG_ON(value == 0);
3440
3441 - got = me->module_core + me->arch.got_offset;
3442 + got = me->module_core_rw + me->arch.got_offset;
3443 for (i = 0; got[i].addr; i++)
3444 if (got[i].addr == value)
3445 goto out;
3446 @@ -415,7 +437,7 @@ static Elf64_Word get_got(struct module *me, unsigned long value, long addend)
3447 #ifdef CONFIG_64BIT
3448 static Elf_Addr get_fdesc(struct module *me, unsigned long value)
3449 {
3450 - Elf_Fdesc *fdesc = me->module_core + me->arch.fdesc_offset;
3451 + Elf_Fdesc *fdesc = me->module_core_rw + me->arch.fdesc_offset;
3452
3453 if (!value) {
3454 printk(KERN_ERR "%s: zero OPD requested!\n", me->name);
3455 @@ -433,7 +455,7 @@ static Elf_Addr get_fdesc(struct module *me, unsigned long value)
3456
3457 /* Create new one */
3458 fdesc->addr = value;
3459 - fdesc->gp = (Elf_Addr)me->module_core + me->arch.got_offset;
3460 + fdesc->gp = (Elf_Addr)me->module_core_rw + me->arch.got_offset;
3461 return (Elf_Addr)fdesc;
3462 }
3463 #endif /* CONFIG_64BIT */
3464 @@ -845,7 +867,7 @@ register_unwind_table(struct module *me,
3465
3466 table = (unsigned char *)sechdrs[me->arch.unwind_section].sh_addr;
3467 end = table + sechdrs[me->arch.unwind_section].sh_size;
3468 - gp = (Elf_Addr)me->module_core + me->arch.got_offset;
3469 + gp = (Elf_Addr)me->module_core_rw + me->arch.got_offset;
3470
3471 DEBUGP("register_unwind_table(), sect = %d at 0x%p - 0x%p (gp=0x%lx)\n",
3472 me->arch.unwind_section, table, end, gp);
3473 diff --git a/arch/parisc/kernel/signal32.c b/arch/parisc/kernel/signal32.c
3474 index fd49aed..5dede04 100644
3475 --- a/arch/parisc/kernel/signal32.c
3476 +++ b/arch/parisc/kernel/signal32.c
3477 @@ -65,7 +65,8 @@ put_sigset32(compat_sigset_t __user *up, sigset_t *set, size_t sz)
3478 {
3479 compat_sigset_t s;
3480
3481 - if (sz != sizeof *set) panic("put_sigset32()");
3482 + if (sz != sizeof *set)
3483 + return -EINVAL;
3484 sigset_64to32(&s, set);
3485
3486 return copy_to_user(up, &s, sizeof s);
3487 @@ -77,7 +78,8 @@ get_sigset32(compat_sigset_t __user *up, sigset_t *set, size_t sz)
3488 compat_sigset_t s;
3489 int r;
3490
3491 - if (sz != sizeof *set) panic("put_sigset32()");
3492 + if (sz != sizeof *set)
3493 + return -EINVAL;
3494
3495 if ((r = copy_from_user(&s, up, sz)) == 0) {
3496 sigset_32to64(set, &s);
3497 diff --git a/arch/parisc/kernel/sys_parisc.c b/arch/parisc/kernel/sys_parisc.c
3498 index 7426e40..30c8dbe 100644
3499 --- a/arch/parisc/kernel/sys_parisc.c
3500 +++ b/arch/parisc/kernel/sys_parisc.c
3501 @@ -43,7 +43,7 @@ static unsigned long get_unshared_area(unsigned long addr, unsigned long len)
3502 /* At this point: (!vma || addr < vma->vm_end). */
3503 if (TASK_SIZE - len < addr)
3504 return -ENOMEM;
3505 - if (!vma || addr + len <= vma->vm_start)
3506 + if (check_heap_stack_gap(vma, addr, len))
3507 return addr;
3508 addr = vma->vm_end;
3509 }
3510 @@ -79,7 +79,7 @@ static unsigned long get_shared_area(struct address_space *mapping,
3511 /* At this point: (!vma || addr < vma->vm_end). */
3512 if (TASK_SIZE - len < addr)
3513 return -ENOMEM;
3514 - if (!vma || addr + len <= vma->vm_start)
3515 + if (check_heap_stack_gap(vma, addr, len))
3516 return addr;
3517 addr = DCACHE_ALIGN(vma->vm_end - offset) + offset;
3518 if (addr < vma->vm_end) /* handle wraparound */
3519 @@ -98,7 +98,7 @@ unsigned long arch_get_unmapped_area(struct file *filp, unsigned long addr,
3520 if (flags & MAP_FIXED)
3521 return addr;
3522 if (!addr)
3523 - addr = TASK_UNMAPPED_BASE;
3524 + addr = current->mm->mmap_base;
3525
3526 if (filp) {
3527 addr = get_shared_area(filp->f_mapping, addr, len, pgoff);
3528 diff --git a/arch/parisc/kernel/traps.c b/arch/parisc/kernel/traps.c
3529 index 45ba99f..8e22c33 100644
3530 --- a/arch/parisc/kernel/traps.c
3531 +++ b/arch/parisc/kernel/traps.c
3532 @@ -732,9 +732,7 @@ void notrace handle_interruption(int code, struct pt_regs *regs)
3533
3534 down_read(&current->mm->mmap_sem);
3535 vma = find_vma(current->mm,regs->iaoq[0]);
3536 - if (vma && (regs->iaoq[0] >= vma->vm_start)
3537 - && (vma->vm_flags & VM_EXEC)) {
3538 -
3539 + if (vma && (regs->iaoq[0] >= vma->vm_start)) {
3540 fault_address = regs->iaoq[0];
3541 fault_space = regs->iasq[0];
3542
3543 diff --git a/arch/parisc/mm/fault.c b/arch/parisc/mm/fault.c
3544 index 18162ce..94de376 100644
3545 --- a/arch/parisc/mm/fault.c
3546 +++ b/arch/parisc/mm/fault.c
3547 @@ -15,6 +15,7 @@
3548 #include <linux/sched.h>
3549 #include <linux/interrupt.h>
3550 #include <linux/module.h>
3551 +#include <linux/unistd.h>
3552
3553 #include <asm/uaccess.h>
3554 #include <asm/traps.h>
3555 @@ -52,7 +53,7 @@ DEFINE_PER_CPU(struct exception_data, exception_data);
3556 static unsigned long
3557 parisc_acctyp(unsigned long code, unsigned int inst)
3558 {
3559 - if (code == 6 || code == 16)
3560 + if (code == 6 || code == 7 || code == 16)
3561 return VM_EXEC;
3562
3563 switch (inst & 0xf0000000) {
3564 @@ -138,6 +139,116 @@ parisc_acctyp(unsigned long code, unsigned int inst)
3565 }
3566 #endif
3567
3568 +#ifdef CONFIG_PAX_PAGEEXEC
3569 +/*
3570 + * PaX: decide what to do with offenders (instruction_pointer(regs) = fault address)
3571 + *
3572 + * returns 1 when task should be killed
3573 + * 2 when rt_sigreturn trampoline was detected
3574 + * 3 when unpatched PLT trampoline was detected
3575 + */
3576 +static int pax_handle_fetch_fault(struct pt_regs *regs)
3577 +{
3578 +
3579 +#ifdef CONFIG_PAX_EMUPLT
3580 + int err;
3581 +
3582 + do { /* PaX: unpatched PLT emulation */
3583 + unsigned int bl, depwi;
3584 +
3585 + err = get_user(bl, (unsigned int *)instruction_pointer(regs));
3586 + err |= get_user(depwi, (unsigned int *)(instruction_pointer(regs)+4));
3587 +
3588 + if (err)
3589 + break;
3590 +
3591 + if (bl == 0xEA9F1FDDU && depwi == 0xD6801C1EU) {
3592 + unsigned int ldw, bv, ldw2, addr = instruction_pointer(regs)-12;
3593 +
3594 + err = get_user(ldw, (unsigned int *)addr);
3595 + err |= get_user(bv, (unsigned int *)(addr+4));
3596 + err |= get_user(ldw2, (unsigned int *)(addr+8));
3597 +
3598 + if (err)
3599 + break;
3600 +
3601 + if (ldw == 0x0E801096U &&
3602 + bv == 0xEAC0C000U &&
3603 + ldw2 == 0x0E881095U)
3604 + {
3605 + unsigned int resolver, map;
3606 +
3607 + err = get_user(resolver, (unsigned int *)(instruction_pointer(regs)+8));
3608 + err |= get_user(map, (unsigned int *)(instruction_pointer(regs)+12));
3609 + if (err)
3610 + break;
3611 +
3612 + regs->gr[20] = instruction_pointer(regs)+8;
3613 + regs->gr[21] = map;
3614 + regs->gr[22] = resolver;
3615 + regs->iaoq[0] = resolver | 3UL;
3616 + regs->iaoq[1] = regs->iaoq[0] + 4;
3617 + return 3;
3618 + }
3619 + }
3620 + } while (0);
3621 +#endif
3622 +
3623 +#ifdef CONFIG_PAX_EMUTRAMP
3624 +
3625 +#ifndef CONFIG_PAX_EMUSIGRT
3626 + if (!(current->mm->pax_flags & MF_PAX_EMUTRAMP))
3627 + return 1;
3628 +#endif
3629 +
3630 + do { /* PaX: rt_sigreturn emulation */
3631 + unsigned int ldi1, ldi2, bel, nop;
3632 +
3633 + err = get_user(ldi1, (unsigned int *)instruction_pointer(regs));
3634 + err |= get_user(ldi2, (unsigned int *)(instruction_pointer(regs)+4));
3635 + err |= get_user(bel, (unsigned int *)(instruction_pointer(regs)+8));
3636 + err |= get_user(nop, (unsigned int *)(instruction_pointer(regs)+12));
3637 +
3638 + if (err)
3639 + break;
3640 +
3641 + if ((ldi1 == 0x34190000U || ldi1 == 0x34190002U) &&
3642 + ldi2 == 0x3414015AU &&
3643 + bel == 0xE4008200U &&
3644 + nop == 0x08000240U)
3645 + {
3646 + regs->gr[25] = (ldi1 & 2) >> 1;
3647 + regs->gr[20] = __NR_rt_sigreturn;
3648 + regs->gr[31] = regs->iaoq[1] + 16;
3649 + regs->sr[0] = regs->iasq[1];
3650 + regs->iaoq[0] = 0x100UL;
3651 + regs->iaoq[1] = regs->iaoq[0] + 4;
3652 + regs->iasq[0] = regs->sr[2];
3653 + regs->iasq[1] = regs->sr[2];
3654 + return 2;
3655 + }
3656 + } while (0);
3657 +#endif
3658 +
3659 + return 1;
3660 +}
3661 +
3662 +void pax_report_insns(struct pt_regs *regs, void *pc, void *sp)
3663 +{
3664 + unsigned long i;
3665 +
3666 + printk(KERN_ERR "PAX: bytes at PC: ");
3667 + for (i = 0; i < 5; i++) {
3668 + unsigned int c;
3669 + if (get_user(c, (unsigned int *)pc+i))
3670 + printk(KERN_CONT "???????? ");
3671 + else
3672 + printk(KERN_CONT "%08x ", c);
3673 + }
3674 + printk("\n");
3675 +}
3676 +#endif
3677 +
3678 int fixup_exception(struct pt_regs *regs)
3679 {
3680 const struct exception_table_entry *fix;
3681 @@ -192,8 +303,33 @@ good_area:
3682
3683 acc_type = parisc_acctyp(code,regs->iir);
3684
3685 - if ((vma->vm_flags & acc_type) != acc_type)
3686 + if ((vma->vm_flags & acc_type) != acc_type) {
3687 +
3688 +#ifdef CONFIG_PAX_PAGEEXEC
3689 + if ((mm->pax_flags & MF_PAX_PAGEEXEC) && (acc_type & VM_EXEC) &&
3690 + (address & ~3UL) == instruction_pointer(regs))
3691 + {
3692 + up_read(&mm->mmap_sem);
3693 + switch (pax_handle_fetch_fault(regs)) {
3694 +
3695 +#ifdef CONFIG_PAX_EMUPLT
3696 + case 3:
3697 + return;
3698 +#endif
3699 +
3700 +#ifdef CONFIG_PAX_EMUTRAMP
3701 + case 2:
3702 + return;
3703 +#endif
3704 +
3705 + }
3706 + pax_report_fault(regs, (void *)instruction_pointer(regs), (void *)regs->gr[30]);
3707 + do_group_exit(SIGKILL);
3708 + }
3709 +#endif
3710 +
3711 goto bad_area;
3712 + }
3713
3714 /*
3715 * If for any reason at all we couldn't handle the fault, make
3716 diff --git a/arch/powerpc/include/asm/atomic.h b/arch/powerpc/include/asm/atomic.h
3717 index da29032..f76c24c 100644
3718 --- a/arch/powerpc/include/asm/atomic.h
3719 +++ b/arch/powerpc/include/asm/atomic.h
3720 @@ -522,6 +522,16 @@ static __inline__ long atomic64_inc_not_zero(atomic64_t *v)
3721 return t1;
3722 }
3723
3724 +#define atomic64_read_unchecked(v) atomic64_read(v)
3725 +#define atomic64_set_unchecked(v, i) atomic64_set((v), (i))
3726 +#define atomic64_add_unchecked(a, v) atomic64_add((a), (v))
3727 +#define atomic64_add_return_unchecked(a, v) atomic64_add_return((a), (v))
3728 +#define atomic64_sub_unchecked(a, v) atomic64_sub((a), (v))
3729 +#define atomic64_inc_unchecked(v) atomic64_inc(v)
3730 +#define atomic64_inc_return_unchecked(v) atomic64_inc_return(v)
3731 +#define atomic64_dec_unchecked(v) atomic64_dec(v)
3732 +#define atomic64_cmpxchg_unchecked(v, o, n) atomic64_cmpxchg((v), (o), (n))
3733 +
3734 #endif /* __powerpc64__ */
3735
3736 #endif /* __KERNEL__ */
3737 diff --git a/arch/powerpc/include/asm/cache.h b/arch/powerpc/include/asm/cache.h
3738 index 9e495c9..b6878e5 100644
3739 --- a/arch/powerpc/include/asm/cache.h
3740 +++ b/arch/powerpc/include/asm/cache.h
3741 @@ -3,6 +3,7 @@
3742
3743 #ifdef __KERNEL__
3744
3745 +#include <linux/const.h>
3746
3747 /* bytes per L1 cache line */
3748 #if defined(CONFIG_8xx) || defined(CONFIG_403GCX)
3749 @@ -22,7 +23,7 @@
3750 #define L1_CACHE_SHIFT 7
3751 #endif
3752
3753 -#define L1_CACHE_BYTES (1 << L1_CACHE_SHIFT)
3754 +#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT)
3755
3756 #define SMP_CACHE_BYTES L1_CACHE_BYTES
3757
3758 diff --git a/arch/powerpc/include/asm/elf.h b/arch/powerpc/include/asm/elf.h
3759 index 3bf9cca..e7457d0 100644
3760 --- a/arch/powerpc/include/asm/elf.h
3761 +++ b/arch/powerpc/include/asm/elf.h
3762 @@ -178,8 +178,19 @@ typedef elf_fpreg_t elf_vsrreghalf_t32[ELF_NVSRHALFREG];
3763 the loader. We need to make sure that it is out of the way of the program
3764 that it will "exec", and that there is sufficient room for the brk. */
3765
3766 -extern unsigned long randomize_et_dyn(unsigned long base);
3767 -#define ELF_ET_DYN_BASE (randomize_et_dyn(0x20000000))
3768 +#define ELF_ET_DYN_BASE (0x20000000)
3769 +
3770 +#ifdef CONFIG_PAX_ASLR
3771 +#define PAX_ELF_ET_DYN_BASE (0x10000000UL)
3772 +
3773 +#ifdef __powerpc64__
3774 +#define PAX_DELTA_MMAP_LEN (is_32bit_task() ? 16 : 28)
3775 +#define PAX_DELTA_STACK_LEN (is_32bit_task() ? 16 : 28)
3776 +#else
3777 +#define PAX_DELTA_MMAP_LEN 15
3778 +#define PAX_DELTA_STACK_LEN 15
3779 +#endif
3780 +#endif
3781
3782 /*
3783 * Our registers are always unsigned longs, whether we're a 32 bit
3784 @@ -274,9 +285,6 @@ extern int arch_setup_additional_pages(struct linux_binprm *bprm,
3785 (0x7ff >> (PAGE_SHIFT - 12)) : \
3786 (0x3ffff >> (PAGE_SHIFT - 12)))
3787
3788 -extern unsigned long arch_randomize_brk(struct mm_struct *mm);
3789 -#define arch_randomize_brk arch_randomize_brk
3790 -
3791 #endif /* __KERNEL__ */
3792
3793 /*
3794 diff --git a/arch/powerpc/include/asm/exec.h b/arch/powerpc/include/asm/exec.h
3795 index 8196e9c..d83a9f3 100644
3796 --- a/arch/powerpc/include/asm/exec.h
3797 +++ b/arch/powerpc/include/asm/exec.h
3798 @@ -4,6 +4,6 @@
3799 #ifndef _ASM_POWERPC_EXEC_H
3800 #define _ASM_POWERPC_EXEC_H
3801
3802 -extern unsigned long arch_align_stack(unsigned long sp);
3803 +#define arch_align_stack(x) ((x) & ~0xfUL)
3804
3805 #endif /* _ASM_POWERPC_EXEC_H */
3806 diff --git a/arch/powerpc/include/asm/kmap_types.h b/arch/powerpc/include/asm/kmap_types.h
3807 index 5acabbd..7ea14fa 100644
3808 --- a/arch/powerpc/include/asm/kmap_types.h
3809 +++ b/arch/powerpc/include/asm/kmap_types.h
3810 @@ -10,7 +10,7 @@
3811 * 2 of the License, or (at your option) any later version.
3812 */
3813
3814 -#define KM_TYPE_NR 16
3815 +#define KM_TYPE_NR 17
3816
3817 #endif /* __KERNEL__ */
3818 #endif /* _ASM_POWERPC_KMAP_TYPES_H */
3819 diff --git a/arch/powerpc/include/asm/mman.h b/arch/powerpc/include/asm/mman.h
3820 index d4a7f64..451de1c 100644
3821 --- a/arch/powerpc/include/asm/mman.h
3822 +++ b/arch/powerpc/include/asm/mman.h
3823 @@ -44,7 +44,7 @@ static inline unsigned long arch_calc_vm_prot_bits(unsigned long prot)
3824 }
3825 #define arch_calc_vm_prot_bits(prot) arch_calc_vm_prot_bits(prot)
3826
3827 -static inline pgprot_t arch_vm_get_page_prot(unsigned long vm_flags)
3828 +static inline pgprot_t arch_vm_get_page_prot(vm_flags_t vm_flags)
3829 {
3830 return (vm_flags & VM_SAO) ? __pgprot(_PAGE_SAO) : __pgprot(0);
3831 }
3832 diff --git a/arch/powerpc/include/asm/page.h b/arch/powerpc/include/asm/page.h
3833 index f072e97..b436dee 100644
3834 --- a/arch/powerpc/include/asm/page.h
3835 +++ b/arch/powerpc/include/asm/page.h
3836 @@ -220,8 +220,9 @@ extern long long virt_phys_offset;
3837 * and needs to be executable. This means the whole heap ends
3838 * up being executable.
3839 */
3840 -#define VM_DATA_DEFAULT_FLAGS32 (VM_READ | VM_WRITE | VM_EXEC | \
3841 - VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC)
3842 +#define VM_DATA_DEFAULT_FLAGS32 \
3843 + (((current->personality & READ_IMPLIES_EXEC) ? VM_EXEC : 0) | \
3844 + VM_READ | VM_WRITE | VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC)
3845
3846 #define VM_DATA_DEFAULT_FLAGS64 (VM_READ | VM_WRITE | \
3847 VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC)
3848 @@ -249,6 +250,9 @@ extern long long virt_phys_offset;
3849 #define is_kernel_addr(x) ((x) >= PAGE_OFFSET)
3850 #endif
3851
3852 +#define ktla_ktva(addr) (addr)
3853 +#define ktva_ktla(addr) (addr)
3854 +
3855 /*
3856 * Use the top bit of the higher-level page table entries to indicate whether
3857 * the entries we point to contain hugepages. This works because we know that
3858 diff --git a/arch/powerpc/include/asm/page_64.h b/arch/powerpc/include/asm/page_64.h
3859 index fed85e6..da5c71b 100644
3860 --- a/arch/powerpc/include/asm/page_64.h
3861 +++ b/arch/powerpc/include/asm/page_64.h
3862 @@ -146,15 +146,18 @@ do { \
3863 * stack by default, so in the absence of a PT_GNU_STACK program header
3864 * we turn execute permission off.
3865 */
3866 -#define VM_STACK_DEFAULT_FLAGS32 (VM_READ | VM_WRITE | VM_EXEC | \
3867 - VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC)
3868 +#define VM_STACK_DEFAULT_FLAGS32 \
3869 + (((current->personality & READ_IMPLIES_EXEC) ? VM_EXEC : 0) | \
3870 + VM_READ | VM_WRITE | VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC)
3871
3872 #define VM_STACK_DEFAULT_FLAGS64 (VM_READ | VM_WRITE | \
3873 VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC)
3874
3875 +#ifndef CONFIG_PAX_PAGEEXEC
3876 #define VM_STACK_DEFAULT_FLAGS \
3877 (is_32bit_task() ? \
3878 VM_STACK_DEFAULT_FLAGS32 : VM_STACK_DEFAULT_FLAGS64)
3879 +#endif
3880
3881 #include <asm-generic/getorder.h>
3882
3883 diff --git a/arch/powerpc/include/asm/pgalloc-64.h b/arch/powerpc/include/asm/pgalloc-64.h
3884 index 292725c..f87ae14 100644
3885 --- a/arch/powerpc/include/asm/pgalloc-64.h
3886 +++ b/arch/powerpc/include/asm/pgalloc-64.h
3887 @@ -50,6 +50,7 @@ static inline void pgd_free(struct mm_struct *mm, pgd_t *pgd)
3888 #ifndef CONFIG_PPC_64K_PAGES
3889
3890 #define pgd_populate(MM, PGD, PUD) pgd_set(PGD, PUD)
3891 +#define pgd_populate_kernel(MM, PGD, PUD) pgd_populate((MM), (PGD), (PUD))
3892
3893 static inline pud_t *pud_alloc_one(struct mm_struct *mm, unsigned long addr)
3894 {
3895 @@ -67,6 +68,11 @@ static inline void pud_populate(struct mm_struct *mm, pud_t *pud, pmd_t *pmd)
3896 pud_set(pud, (unsigned long)pmd);
3897 }
3898
3899 +static inline void pud_populate_kernel(struct mm_struct *mm, pud_t *pud, pmd_t *pmd)
3900 +{
3901 + pud_populate(mm, pud, pmd);
3902 +}
3903 +
3904 #define pmd_populate(mm, pmd, pte_page) \
3905 pmd_populate_kernel(mm, pmd, page_address(pte_page))
3906 #define pmd_populate_kernel(mm, pmd, pte) pmd_set(pmd, (unsigned long)(pte))
3907 @@ -76,6 +82,7 @@ static inline void pud_populate(struct mm_struct *mm, pud_t *pud, pmd_t *pmd)
3908 #else /* CONFIG_PPC_64K_PAGES */
3909
3910 #define pud_populate(mm, pud, pmd) pud_set(pud, (unsigned long)pmd)
3911 +#define pud_populate_kernel(mm, pud, pmd) pud_populate((mm), (pud), (pmd))
3912
3913 static inline void pmd_populate_kernel(struct mm_struct *mm, pmd_t *pmd,
3914 pte_t *pte)
3915 diff --git a/arch/powerpc/include/asm/pgtable.h b/arch/powerpc/include/asm/pgtable.h
3916 index 2e0e411..7899c68 100644
3917 --- a/arch/powerpc/include/asm/pgtable.h
3918 +++ b/arch/powerpc/include/asm/pgtable.h
3919 @@ -2,6 +2,7 @@
3920 #define _ASM_POWERPC_PGTABLE_H
3921 #ifdef __KERNEL__
3922
3923 +#include <linux/const.h>
3924 #ifndef __ASSEMBLY__
3925 #include <asm/processor.h> /* For TASK_SIZE */
3926 #include <asm/mmu.h>
3927 diff --git a/arch/powerpc/include/asm/pte-hash32.h b/arch/powerpc/include/asm/pte-hash32.h
3928 index 4aad413..85d86bf 100644
3929 --- a/arch/powerpc/include/asm/pte-hash32.h
3930 +++ b/arch/powerpc/include/asm/pte-hash32.h
3931 @@ -21,6 +21,7 @@
3932 #define _PAGE_FILE 0x004 /* when !present: nonlinear file mapping */
3933 #define _PAGE_USER 0x004 /* usermode access allowed */
3934 #define _PAGE_GUARDED 0x008 /* G: prohibit speculative access */
3935 +#define _PAGE_EXEC _PAGE_GUARDED
3936 #define _PAGE_COHERENT 0x010 /* M: enforce memory coherence (SMP systems) */
3937 #define _PAGE_NO_CACHE 0x020 /* I: cache inhibit */
3938 #define _PAGE_WRITETHRU 0x040 /* W: cache write-through */
3939 diff --git a/arch/powerpc/include/asm/reg.h b/arch/powerpc/include/asm/reg.h
3940 index 6386086..6982225 100644
3941 --- a/arch/powerpc/include/asm/reg.h
3942 +++ b/arch/powerpc/include/asm/reg.h
3943 @@ -212,6 +212,7 @@
3944 #define SPRN_DBCR 0x136 /* e300 Data Breakpoint Control Reg */
3945 #define SPRN_DSISR 0x012 /* Data Storage Interrupt Status Register */
3946 #define DSISR_NOHPTE 0x40000000 /* no translation found */
3947 +#define DSISR_GUARDED 0x10000000 /* fetch from guarded storage */
3948 #define DSISR_PROTFAULT 0x08000000 /* protection fault */
3949 #define DSISR_ISSTORE 0x02000000 /* access was a store */
3950 #define DSISR_DABRMATCH 0x00400000 /* hit data breakpoint */
3951 diff --git a/arch/powerpc/include/asm/thread_info.h b/arch/powerpc/include/asm/thread_info.h
3952 index faf9352..ab2ccec 100644
3953 --- a/arch/powerpc/include/asm/thread_info.h
3954 +++ b/arch/powerpc/include/asm/thread_info.h
3955 @@ -97,12 +97,14 @@ static inline struct thread_info *current_thread_info(void)
3956 #define TIF_PERFMON_CTXSW 6 /* perfmon needs ctxsw calls */
3957 #define TIF_SYSCALL_AUDIT 7 /* syscall auditing active */
3958 #define TIF_SINGLESTEP 8 /* singlestepping active */
3959 -#define TIF_MEMDIE 9 /* is terminating due to OOM killer */
3960 #define TIF_SECCOMP 10 /* secure computing */
3961 #define TIF_RESTOREALL 11 /* Restore all regs (implies NOERROR) */
3962 #define TIF_NOERROR 12 /* Force successful syscall return */
3963 #define TIF_NOTIFY_RESUME 13 /* callback before returning to user */
3964 #define TIF_SYSCALL_TRACEPOINT 15 /* syscall tracepoint instrumentation */
3965 +#define TIF_MEMDIE 16 /* is terminating due to OOM killer */
3966 +/* mask must be expressable within 16 bits to satisfy 'andi' instruction reqs */
3967 +#define TIF_GRSEC_SETXID 9 /* update credentials on syscall entry/exit */
3968
3969 /* as above, but as bit values */
3970 #define _TIF_SYSCALL_TRACE (1<<TIF_SYSCALL_TRACE)
3971 @@ -119,8 +121,10 @@ static inline struct thread_info *current_thread_info(void)
3972 #define _TIF_NOERROR (1<<TIF_NOERROR)
3973 #define _TIF_NOTIFY_RESUME (1<<TIF_NOTIFY_RESUME)
3974 #define _TIF_SYSCALL_TRACEPOINT (1<<TIF_SYSCALL_TRACEPOINT)
3975 +#define _TIF_GRSEC_SETXID (1<<TIF_GRSEC_SETXID)
3976 #define _TIF_SYSCALL_T_OR_A (_TIF_SYSCALL_TRACE | _TIF_SYSCALL_AUDIT | \
3977 - _TIF_SECCOMP | _TIF_SYSCALL_TRACEPOINT)
3978 + _TIF_SECCOMP | _TIF_SYSCALL_TRACEPOINT | \
3979 + _TIF_GRSEC_SETXID)
3980
3981 #define _TIF_USER_WORK_MASK (_TIF_SIGPENDING | _TIF_NEED_RESCHED | \
3982 _TIF_NOTIFY_RESUME)
3983 diff --git a/arch/powerpc/include/asm/uaccess.h b/arch/powerpc/include/asm/uaccess.h
3984 index 17bb40c..353c98b 100644
3985 --- a/arch/powerpc/include/asm/uaccess.h
3986 +++ b/arch/powerpc/include/asm/uaccess.h
3987 @@ -13,6 +13,8 @@
3988 #define VERIFY_READ 0
3989 #define VERIFY_WRITE 1
3990
3991 +extern void check_object_size(const void *ptr, unsigned long n, bool to);
3992 +
3993 /*
3994 * The fs value determines whether argument validity checking should be
3995 * performed or not. If get_fs() == USER_DS, checking is performed, with
3996 @@ -329,52 +331,6 @@ do { \
3997 extern unsigned long __copy_tofrom_user(void __user *to,
3998 const void __user *from, unsigned long size);
3999
4000 -#ifndef __powerpc64__
4001 -
4002 -static inline unsigned long copy_from_user(void *to,
4003 - const void __user *from, unsigned long n)
4004 -{
4005 - unsigned long over;
4006 -
4007 - if (access_ok(VERIFY_READ, from, n))
4008 - return __copy_tofrom_user((__force void __user *)to, from, n);
4009 - if ((unsigned long)from < TASK_SIZE) {
4010 - over = (unsigned long)from + n - TASK_SIZE;
4011 - return __copy_tofrom_user((__force void __user *)to, from,
4012 - n - over) + over;
4013 - }
4014 - return n;
4015 -}
4016 -
4017 -static inline unsigned long copy_to_user(void __user *to,
4018 - const void *from, unsigned long n)
4019 -{
4020 - unsigned long over;
4021 -
4022 - if (access_ok(VERIFY_WRITE, to, n))
4023 - return __copy_tofrom_user(to, (__force void __user *)from, n);
4024 - if ((unsigned long)to < TASK_SIZE) {
4025 - over = (unsigned long)to + n - TASK_SIZE;
4026 - return __copy_tofrom_user(to, (__force void __user *)from,
4027 - n - over) + over;
4028 - }
4029 - return n;
4030 -}
4031 -
4032 -#else /* __powerpc64__ */
4033 -
4034 -#define __copy_in_user(to, from, size) \
4035 - __copy_tofrom_user((to), (from), (size))
4036 -
4037 -extern unsigned long copy_from_user(void *to, const void __user *from,
4038 - unsigned long n);
4039 -extern unsigned long copy_to_user(void __user *to, const void *from,
4040 - unsigned long n);
4041 -extern unsigned long copy_in_user(void __user *to, const void __user *from,
4042 - unsigned long n);
4043 -
4044 -#endif /* __powerpc64__ */
4045 -
4046 static inline unsigned long __copy_from_user_inatomic(void *to,
4047 const void __user *from, unsigned long n)
4048 {
4049 @@ -398,6 +354,10 @@ static inline unsigned long __copy_from_user_inatomic(void *to,
4050 if (ret == 0)
4051 return 0;
4052 }
4053 +
4054 + if (!__builtin_constant_p(n))
4055 + check_object_size(to, n, false);
4056 +
4057 return __copy_tofrom_user((__force void __user *)to, from, n);
4058 }
4059
4060 @@ -424,6 +384,10 @@ static inline unsigned long __copy_to_user_inatomic(void __user *to,
4061 if (ret == 0)
4062 return 0;
4063 }
4064 +
4065 + if (!__builtin_constant_p(n))
4066 + check_object_size(from, n, true);
4067 +
4068 return __copy_tofrom_user(to, (__force const void __user *)from, n);
4069 }
4070
4071 @@ -441,6 +405,92 @@ static inline unsigned long __copy_to_user(void __user *to,
4072 return __copy_to_user_inatomic(to, from, size);
4073 }
4074
4075 +#ifndef __powerpc64__
4076 +
4077 +static inline unsigned long __must_check copy_from_user(void *to,
4078 + const void __user *from, unsigned long n)
4079 +{
4080 + unsigned long over;
4081 +
4082 + if ((long)n < 0)
4083 + return n;
4084 +
4085 + if (access_ok(VERIFY_READ, from, n)) {
4086 + if (!__builtin_constant_p(n))
4087 + check_object_size(to, n, false);
4088 + return __copy_tofrom_user((__force void __user *)to, from, n);
4089 + }
4090 + if ((unsigned long)from < TASK_SIZE) {
4091 + over = (unsigned long)from + n - TASK_SIZE;
4092 + if (!__builtin_constant_p(n - over))
4093 + check_object_size(to, n - over, false);
4094 + return __copy_tofrom_user((__force void __user *)to, from,
4095 + n - over) + over;
4096 + }
4097 + return n;
4098 +}
4099 +
4100 +static inline unsigned long __must_check copy_to_user(void __user *to,
4101 + const void *from, unsigned long n)
4102 +{
4103 + unsigned long over;
4104 +
4105 + if ((long)n < 0)
4106 + return n;
4107 +
4108 + if (access_ok(VERIFY_WRITE, to, n)) {
4109 + if (!__builtin_constant_p(n))
4110 + check_object_size(from, n, true);
4111 + return __copy_tofrom_user(to, (__force void __user *)from, n);
4112 + }
4113 + if ((unsigned long)to < TASK_SIZE) {
4114 + over = (unsigned long)to + n - TASK_SIZE;
4115 + if (!__builtin_constant_p(n))
4116 + check_object_size(from, n - over, true);
4117 + return __copy_tofrom_user(to, (__force void __user *)from,
4118 + n - over) + over;
4119 + }
4120 + return n;
4121 +}
4122 +
4123 +#else /* __powerpc64__ */
4124 +
4125 +#define __copy_in_user(to, from, size) \
4126 + __copy_tofrom_user((to), (from), (size))
4127 +
4128 +static inline unsigned long __must_check copy_from_user(void *to, const void __user *from, unsigned long n)
4129 +{
4130 + if ((long)n < 0 || n > INT_MAX)
4131 + return n;
4132 +
4133 + if (!__builtin_constant_p(n))
4134 + check_object_size(to, n, false);
4135 +
4136 + if (likely(access_ok(VERIFY_READ, from, n)))
4137 + n = __copy_from_user(to, from, n);
4138 + else
4139 + memset(to, 0, n);
4140 + return n;
4141 +}
4142 +
4143 +static inline unsigned long __must_check copy_to_user(void __user *to, const void *from, unsigned long n)
4144 +{
4145 + if ((long)n < 0 || n > INT_MAX)
4146 + return n;
4147 +
4148 + if (likely(access_ok(VERIFY_WRITE, to, n))) {
4149 + if (!__builtin_constant_p(n))
4150 + check_object_size(from, n, true);
4151 + n = __copy_to_user(to, from, n);
4152 + }
4153 + return n;
4154 +}
4155 +
4156 +extern unsigned long copy_in_user(void __user *to, const void __user *from,
4157 + unsigned long n);
4158 +
4159 +#endif /* __powerpc64__ */
4160 +
4161 extern unsigned long __clear_user(void __user *addr, unsigned long size);
4162
4163 static inline unsigned long clear_user(void __user *addr, unsigned long size)
4164 diff --git a/arch/powerpc/kernel/exceptions-64e.S b/arch/powerpc/kernel/exceptions-64e.S
4165 index 98be7f0..8ef62de 100644
4166 --- a/arch/powerpc/kernel/exceptions-64e.S
4167 +++ b/arch/powerpc/kernel/exceptions-64e.S
4168 @@ -661,6 +661,7 @@ storage_fault_common:
4169 std r14,_DAR(r1)
4170 std r15,_DSISR(r1)
4171 addi r3,r1,STACK_FRAME_OVERHEAD
4172 + bl .save_nvgprs
4173 mr r4,r14
4174 mr r5,r15
4175 ld r14,PACA_EXGEN+EX_R14(r13)
4176 @@ -669,8 +670,7 @@ storage_fault_common:
4177 cmpdi r3,0
4178 bne- 1f
4179 b .ret_from_except_lite
4180 -1: bl .save_nvgprs
4181 - mr r5,r3
4182 +1: mr r5,r3
4183 addi r3,r1,STACK_FRAME_OVERHEAD
4184 ld r4,_DAR(r1)
4185 bl .bad_page_fault
4186 diff --git a/arch/powerpc/kernel/exceptions-64s.S b/arch/powerpc/kernel/exceptions-64s.S
4187 index 39aa97d..dc916ee 100644
4188 --- a/arch/powerpc/kernel/exceptions-64s.S
4189 +++ b/arch/powerpc/kernel/exceptions-64s.S
4190 @@ -890,10 +890,10 @@ handle_page_fault:
4191 11: ld r4,_DAR(r1)
4192 ld r5,_DSISR(r1)
4193 addi r3,r1,STACK_FRAME_OVERHEAD
4194 + bl .save_nvgprs
4195 bl .do_page_fault
4196 cmpdi r3,0
4197 beq+ 12f
4198 - bl .save_nvgprs
4199 mr r5,r3
4200 addi r3,r1,STACK_FRAME_OVERHEAD
4201 lwz r4,_DAR(r1)
4202 diff --git a/arch/powerpc/kernel/module_32.c b/arch/powerpc/kernel/module_32.c
4203 index 2e3200c..72095ce 100644
4204 --- a/arch/powerpc/kernel/module_32.c
4205 +++ b/arch/powerpc/kernel/module_32.c
4206 @@ -162,7 +162,7 @@ int module_frob_arch_sections(Elf32_Ehdr *hdr,
4207 me->arch.core_plt_section = i;
4208 }
4209 if (!me->arch.core_plt_section || !me->arch.init_plt_section) {
4210 - printk("Module doesn't contain .plt or .init.plt sections.\n");
4211 + printk("Module %s doesn't contain .plt or .init.plt sections.\n", me->name);
4212 return -ENOEXEC;
4213 }
4214
4215 @@ -192,11 +192,16 @@ static uint32_t do_plt_call(void *location,
4216
4217 DEBUGP("Doing plt for call to 0x%x at 0x%x\n", val, (unsigned int)location);
4218 /* Init, or core PLT? */
4219 - if (location >= mod->module_core
4220 - && location < mod->module_core + mod->core_size)
4221 + if ((location >= mod->module_core_rx && location < mod->module_core_rx + mod->core_size_rx) ||
4222 + (location >= mod->module_core_rw && location < mod->module_core_rw + mod->core_size_rw))
4223 entry = (void *)sechdrs[mod->arch.core_plt_section].sh_addr;
4224 - else
4225 + else if ((location >= mod->module_init_rx && location < mod->module_init_rx + mod->init_size_rx) ||
4226 + (location >= mod->module_init_rw && location < mod->module_init_rw + mod->init_size_rw))
4227 entry = (void *)sechdrs[mod->arch.init_plt_section].sh_addr;
4228 + else {
4229 + printk(KERN_ERR "%s: invalid R_PPC_REL24 entry found\n", mod->name);
4230 + return ~0UL;
4231 + }
4232
4233 /* Find this entry, or if that fails, the next avail. entry */
4234 while (entry->jump[0]) {
4235 diff --git a/arch/powerpc/kernel/process.c b/arch/powerpc/kernel/process.c
4236 index 1a1f2dd..f4d1bb4 100644
4237 --- a/arch/powerpc/kernel/process.c
4238 +++ b/arch/powerpc/kernel/process.c
4239 @@ -681,8 +681,8 @@ void show_regs(struct pt_regs * regs)
4240 * Lookup NIP late so we have the best change of getting the
4241 * above info out without failing
4242 */
4243 - printk("NIP ["REG"] %pS\n", regs->nip, (void *)regs->nip);
4244 - printk("LR ["REG"] %pS\n", regs->link, (void *)regs->link);
4245 + printk("NIP ["REG"] %pA\n", regs->nip, (void *)regs->nip);
4246 + printk("LR ["REG"] %pA\n", regs->link, (void *)regs->link);
4247 #endif
4248 show_stack(current, (unsigned long *) regs->gpr[1]);
4249 if (!user_mode(regs))
4250 @@ -1181,10 +1181,10 @@ void show_stack(struct task_struct *tsk, unsigned long *stack)
4251 newsp = stack[0];
4252 ip = stack[STACK_FRAME_LR_SAVE];
4253 if (!firstframe || ip != lr) {
4254 - printk("["REG"] ["REG"] %pS", sp, ip, (void *)ip);
4255 + printk("["REG"] ["REG"] %pA", sp, ip, (void *)ip);
4256 #ifdef CONFIG_FUNCTION_GRAPH_TRACER
4257 if ((ip == rth || ip == mrth) && curr_frame >= 0) {
4258 - printk(" (%pS)",
4259 + printk(" (%pA)",
4260 (void *)current->ret_stack[curr_frame].ret);
4261 curr_frame--;
4262 }
4263 @@ -1204,7 +1204,7 @@ void show_stack(struct task_struct *tsk, unsigned long *stack)
4264 struct pt_regs *regs = (struct pt_regs *)
4265 (sp + STACK_FRAME_OVERHEAD);
4266 lr = regs->link;
4267 - printk("--- Exception: %lx at %pS\n LR = %pS\n",
4268 + printk("--- Exception: %lx at %pA\n LR = %pA\n",
4269 regs->trap, (void *)regs->nip, (void *)lr);
4270 firstframe = 1;
4271 }
4272 @@ -1246,58 +1246,3 @@ void __ppc64_runlatch_off(void)
4273 mtspr(SPRN_CTRLT, ctrl);
4274 }
4275 #endif /* CONFIG_PPC64 */
4276 -
4277 -unsigned long arch_align_stack(unsigned long sp)
4278 -{
4279 - if (!(current->personality & ADDR_NO_RANDOMIZE) && randomize_va_space)
4280 - sp -= get_random_int() & ~PAGE_MASK;
4281 - return sp & ~0xf;
4282 -}
4283 -
4284 -static inline unsigned long brk_rnd(void)
4285 -{
4286 - unsigned long rnd = 0;
4287 -
4288 - /* 8MB for 32bit, 1GB for 64bit */
4289 - if (is_32bit_task())
4290 - rnd = (long)(get_random_int() % (1<<(23-PAGE_SHIFT)));
4291 - else
4292 - rnd = (long)(get_random_int() % (1<<(30-PAGE_SHIFT)));
4293 -
4294 - return rnd << PAGE_SHIFT;
4295 -}
4296 -
4297 -unsigned long arch_randomize_brk(struct mm_struct *mm)
4298 -{
4299 - unsigned long base = mm->brk;
4300 - unsigned long ret;
4301 -
4302 -#ifdef CONFIG_PPC_STD_MMU_64
4303 - /*
4304 - * If we are using 1TB segments and we are allowed to randomise
4305 - * the heap, we can put it above 1TB so it is backed by a 1TB
4306 - * segment. Otherwise the heap will be in the bottom 1TB
4307 - * which always uses 256MB segments and this may result in a
4308 - * performance penalty.
4309 - */
4310 - if (!is_32bit_task() && (mmu_highuser_ssize == MMU_SEGSIZE_1T))
4311 - base = max_t(unsigned long, mm->brk, 1UL << SID_SHIFT_1T);
4312 -#endif
4313 -
4314 - ret = PAGE_ALIGN(base + brk_rnd());
4315 -
4316 - if (ret < mm->brk)
4317 - return mm->brk;
4318 -
4319 - return ret;
4320 -}
4321 -
4322 -unsigned long randomize_et_dyn(unsigned long base)
4323 -{
4324 - unsigned long ret = PAGE_ALIGN(base + brk_rnd());
4325 -
4326 - if (ret < base)
4327 - return base;
4328 -
4329 - return ret;
4330 -}
4331 diff --git a/arch/powerpc/kernel/ptrace.c b/arch/powerpc/kernel/ptrace.c
4332 index c10fc28..c4ef063 100644
4333 --- a/arch/powerpc/kernel/ptrace.c
4334 +++ b/arch/powerpc/kernel/ptrace.c
4335 @@ -1660,6 +1660,10 @@ long arch_ptrace(struct task_struct *child, long request,
4336 return ret;
4337 }
4338
4339 +#ifdef CONFIG_GRKERNSEC_SETXID
4340 +extern void gr_delayed_cred_worker(void);
4341 +#endif
4342 +
4343 /*
4344 * We must return the syscall number to actually look up in the table.
4345 * This can be -1L to skip running any syscall at all.
4346 @@ -1670,6 +1674,11 @@ long do_syscall_trace_enter(struct pt_regs *regs)
4347
4348 secure_computing_strict(regs->gpr[0]);
4349
4350 +#ifdef CONFIG_GRKERNSEC_SETXID
4351 + if (unlikely(test_and_clear_thread_flag(TIF_GRSEC_SETXID)))
4352 + gr_delayed_cred_worker();
4353 +#endif
4354 +
4355 if (test_thread_flag(TIF_SYSCALL_TRACE) &&
4356 tracehook_report_syscall_entry(regs))
4357 /*
4358 @@ -1704,6 +1713,11 @@ void do_syscall_trace_leave(struct pt_regs *regs)
4359 {
4360 int step;
4361
4362 +#ifdef CONFIG_GRKERNSEC_SETXID
4363 + if (unlikely(test_and_clear_thread_flag(TIF_GRSEC_SETXID)))
4364 + gr_delayed_cred_worker();
4365 +#endif
4366 +
4367 audit_syscall_exit(regs);
4368
4369 if (unlikely(test_thread_flag(TIF_SYSCALL_TRACEPOINT)))
4370 diff --git a/arch/powerpc/kernel/signal_32.c b/arch/powerpc/kernel/signal_32.c
4371 index 8b4c049..dcd6ef3 100644
4372 --- a/arch/powerpc/kernel/signal_32.c
4373 +++ b/arch/powerpc/kernel/signal_32.c
4374 @@ -852,7 +852,7 @@ int handle_rt_signal32(unsigned long sig, struct k_sigaction *ka,
4375 /* Save user registers on the stack */
4376 frame = &rt_sf->uc.uc_mcontext;
4377 addr = frame;
4378 - if (vdso32_rt_sigtramp && current->mm->context.vdso_base) {
4379 + if (vdso32_rt_sigtramp && current->mm->context.vdso_base != ~0UL) {
4380 if (save_user_regs(regs, frame, 0, 1))
4381 goto badframe;
4382 regs->link = current->mm->context.vdso_base + vdso32_rt_sigtramp;
4383 diff --git a/arch/powerpc/kernel/signal_64.c b/arch/powerpc/kernel/signal_64.c
4384 index d183f87..1867f1a 100644
4385 --- a/arch/powerpc/kernel/signal_64.c
4386 +++ b/arch/powerpc/kernel/signal_64.c
4387 @@ -430,7 +430,7 @@ int handle_rt_signal64(int signr, struct k_sigaction *ka, siginfo_t *info,
4388 current->thread.fpscr.val = 0;
4389
4390 /* Set up to return from userspace. */
4391 - if (vdso64_rt_sigtramp && current->mm->context.vdso_base) {
4392 + if (vdso64_rt_sigtramp && current->mm->context.vdso_base != ~0UL) {
4393 regs->link = current->mm->context.vdso_base + vdso64_rt_sigtramp;
4394 } else {
4395 err |= setup_trampoline(__NR_rt_sigreturn, &frame->tramp[0]);
4396 diff --git a/arch/powerpc/kernel/traps.c b/arch/powerpc/kernel/traps.c
4397 index ae0843f..f16372c 100644
4398 --- a/arch/powerpc/kernel/traps.c
4399 +++ b/arch/powerpc/kernel/traps.c
4400 @@ -133,6 +133,8 @@ static unsigned __kprobes long oops_begin(struct pt_regs *regs)
4401 return flags;
4402 }
4403
4404 +extern void gr_handle_kernel_exploit(void);
4405 +
4406 static void __kprobes oops_end(unsigned long flags, struct pt_regs *regs,
4407 int signr)
4408 {
4409 @@ -182,6 +184,9 @@ static void __kprobes oops_end(unsigned long flags, struct pt_regs *regs,
4410 panic("Fatal exception in interrupt");
4411 if (panic_on_oops)
4412 panic("Fatal exception");
4413 +
4414 + gr_handle_kernel_exploit();
4415 +
4416 do_exit(signr);
4417 }
4418
4419 diff --git a/arch/powerpc/kernel/vdso.c b/arch/powerpc/kernel/vdso.c
4420 index b67db22..38825d2 100644
4421 --- a/arch/powerpc/kernel/vdso.c
4422 +++ b/arch/powerpc/kernel/vdso.c
4423 @@ -34,6 +34,7 @@
4424 #include <asm/firmware.h>
4425 #include <asm/vdso.h>
4426 #include <asm/vdso_datapage.h>
4427 +#include <asm/mman.h>
4428
4429 #include "setup.h"
4430
4431 @@ -218,7 +219,7 @@ int arch_setup_additional_pages(struct linux_binprm *bprm, int uses_interp)
4432 vdso_base = VDSO32_MBASE;
4433 #endif
4434
4435 - current->mm->context.vdso_base = 0;
4436 + current->mm->context.vdso_base = ~0UL;
4437
4438 /* vDSO has a problem and was disabled, just don't "enable" it for the
4439 * process
4440 @@ -238,7 +239,7 @@ int arch_setup_additional_pages(struct linux_binprm *bprm, int uses_interp)
4441 vdso_base = get_unmapped_area(NULL, vdso_base,
4442 (vdso_pages << PAGE_SHIFT) +
4443 ((VDSO_ALIGNMENT - 1) & PAGE_MASK),
4444 - 0, 0);
4445 + 0, MAP_PRIVATE | MAP_EXECUTABLE);
4446 if (IS_ERR_VALUE(vdso_base)) {
4447 rc = vdso_base;
4448 goto fail_mmapsem;
4449 diff --git a/arch/powerpc/lib/usercopy_64.c b/arch/powerpc/lib/usercopy_64.c
4450 index 5eea6f3..5d10396 100644
4451 --- a/arch/powerpc/lib/usercopy_64.c
4452 +++ b/arch/powerpc/lib/usercopy_64.c
4453 @@ -9,22 +9,6 @@
4454 #include <linux/module.h>
4455 #include <asm/uaccess.h>
4456
4457 -unsigned long copy_from_user(void *to, const void __user *from, unsigned long n)
4458 -{
4459 - if (likely(access_ok(VERIFY_READ, from, n)))
4460 - n = __copy_from_user(to, from, n);
4461 - else
4462 - memset(to, 0, n);
4463 - return n;
4464 -}
4465 -
4466 -unsigned long copy_to_user(void __user *to, const void *from, unsigned long n)
4467 -{
4468 - if (likely(access_ok(VERIFY_WRITE, to, n)))
4469 - n = __copy_to_user(to, from, n);
4470 - return n;
4471 -}
4472 -
4473 unsigned long copy_in_user(void __user *to, const void __user *from,
4474 unsigned long n)
4475 {
4476 @@ -35,7 +19,5 @@ unsigned long copy_in_user(void __user *to, const void __user *from,
4477 return n;
4478 }
4479
4480 -EXPORT_SYMBOL(copy_from_user);
4481 -EXPORT_SYMBOL(copy_to_user);
4482 EXPORT_SYMBOL(copy_in_user);
4483
4484 diff --git a/arch/powerpc/mm/fault.c b/arch/powerpc/mm/fault.c
4485 index 08ffcf5..a0ab912 100644
4486 --- a/arch/powerpc/mm/fault.c
4487 +++ b/arch/powerpc/mm/fault.c
4488 @@ -32,6 +32,10 @@
4489 #include <linux/perf_event.h>
4490 #include <linux/magic.h>
4491 #include <linux/ratelimit.h>
4492 +#include <linux/slab.h>
4493 +#include <linux/pagemap.h>
4494 +#include <linux/compiler.h>
4495 +#include <linux/unistd.h>
4496
4497 #include <asm/firmware.h>
4498 #include <asm/page.h>
4499 @@ -68,6 +72,33 @@ static inline int notify_page_fault(struct pt_regs *regs)
4500 }
4501 #endif
4502
4503 +#ifdef CONFIG_PAX_PAGEEXEC
4504 +/*
4505 + * PaX: decide what to do with offenders (regs->nip = fault address)
4506 + *
4507 + * returns 1 when task should be killed
4508 + */
4509 +static int pax_handle_fetch_fault(struct pt_regs *regs)
4510 +{
4511 + return 1;
4512 +}
4513 +
4514 +void pax_report_insns(struct pt_regs *regs, void *pc, void *sp)
4515 +{
4516 + unsigned long i;
4517 +
4518 + printk(KERN_ERR "PAX: bytes at PC: ");
4519 + for (i = 0; i < 5; i++) {
4520 + unsigned int c;
4521 + if (get_user(c, (unsigned int __user *)pc+i))
4522 + printk(KERN_CONT "???????? ");
4523 + else
4524 + printk(KERN_CONT "%08x ", c);
4525 + }
4526 + printk("\n");
4527 +}
4528 +#endif
4529 +
4530 /*
4531 * Check whether the instruction at regs->nip is a store using
4532 * an update addressing form which will update r1.
4533 @@ -215,7 +246,7 @@ int __kprobes do_page_fault(struct pt_regs *regs, unsigned long address,
4534 * indicate errors in DSISR but can validly be set in SRR1.
4535 */
4536 if (trap == 0x400)
4537 - error_code &= 0x48200000;
4538 + error_code &= 0x58200000;
4539 else
4540 is_write = error_code & DSISR_ISSTORE;
4541 #else
4542 @@ -366,7 +397,7 @@ good_area:
4543 * "undefined". Of those that can be set, this is the only
4544 * one which seems bad.
4545 */
4546 - if (error_code & 0x10000000)
4547 + if (error_code & DSISR_GUARDED)
4548 /* Guarded storage error. */
4549 goto bad_area;
4550 #endif /* CONFIG_8xx */
4551 @@ -381,7 +412,7 @@ good_area:
4552 * processors use the same I/D cache coherency mechanism
4553 * as embedded.
4554 */
4555 - if (error_code & DSISR_PROTFAULT)
4556 + if (error_code & (DSISR_PROTFAULT | DSISR_GUARDED))
4557 goto bad_area;
4558 #endif /* CONFIG_PPC_STD_MMU */
4559
4560 @@ -463,6 +494,23 @@ bad_area:
4561 bad_area_nosemaphore:
4562 /* User mode accesses cause a SIGSEGV */
4563 if (user_mode(regs)) {
4564 +
4565 +#ifdef CONFIG_PAX_PAGEEXEC
4566 + if (mm->pax_flags & MF_PAX_PAGEEXEC) {
4567 +#ifdef CONFIG_PPC_STD_MMU
4568 + if (is_exec && (error_code & (DSISR_PROTFAULT | DSISR_GUARDED))) {
4569 +#else
4570 + if (is_exec && regs->nip == address) {
4571 +#endif
4572 + switch (pax_handle_fetch_fault(regs)) {
4573 + }
4574 +
4575 + pax_report_fault(regs, (void *)regs->nip, (void *)regs->gpr[PT_R1]);
4576 + do_group_exit(SIGKILL);
4577 + }
4578 + }
4579 +#endif
4580 +
4581 _exception(SIGSEGV, regs, code, address);
4582 return 0;
4583 }
4584 diff --git a/arch/powerpc/mm/mmap_64.c b/arch/powerpc/mm/mmap_64.c
4585 index 67a42ed..1c7210c 100644
4586 --- a/arch/powerpc/mm/mmap_64.c
4587 +++ b/arch/powerpc/mm/mmap_64.c
4588 @@ -91,10 +91,22 @@ void arch_pick_mmap_layout(struct mm_struct *mm)
4589 */
4590 if (mmap_is_legacy()) {
4591 mm->mmap_base = TASK_UNMAPPED_BASE;
4592 +
4593 +#ifdef CONFIG_PAX_RANDMMAP
4594 + if (mm->pax_flags & MF_PAX_RANDMMAP)
4595 + mm->mmap_base += mm->delta_mmap;
4596 +#endif
4597 +
4598 mm->get_unmapped_area = arch_get_unmapped_area;
4599 mm->unmap_area = arch_unmap_area;
4600 } else {
4601 mm->mmap_base = mmap_base();
4602 +
4603 +#ifdef CONFIG_PAX_RANDMMAP
4604 + if (mm->pax_flags & MF_PAX_RANDMMAP)
4605 + mm->mmap_base -= mm->delta_mmap + mm->delta_stack;
4606 +#endif
4607 +
4608 mm->get_unmapped_area = arch_get_unmapped_area_topdown;
4609 mm->unmap_area = arch_unmap_area_topdown;
4610 }
4611 diff --git a/arch/powerpc/mm/slice.c b/arch/powerpc/mm/slice.c
4612 index 73709f7..6b90313 100644
4613 --- a/arch/powerpc/mm/slice.c
4614 +++ b/arch/powerpc/mm/slice.c
4615 @@ -98,7 +98,7 @@ static int slice_area_is_free(struct mm_struct *mm, unsigned long addr,
4616 if ((mm->task_size - len) < addr)
4617 return 0;
4618 vma = find_vma(mm, addr);
4619 - return (!vma || (addr + len) <= vma->vm_start);
4620 + return check_heap_stack_gap(vma, addr, len);
4621 }
4622
4623 static int slice_low_has_vma(struct mm_struct *mm, unsigned long slice)
4624 @@ -256,7 +256,7 @@ full_search:
4625 addr = _ALIGN_UP(addr + 1, 1ul << SLICE_HIGH_SHIFT);
4626 continue;
4627 }
4628 - if (!vma || addr + len <= vma->vm_start) {
4629 + if (check_heap_stack_gap(vma, addr, len)) {
4630 /*
4631 * Remember the place where we stopped the search:
4632 */
4633 @@ -313,10 +313,14 @@ static unsigned long slice_find_area_topdown(struct mm_struct *mm,
4634 }
4635 }
4636
4637 - addr = mm->mmap_base;
4638 - while (addr > len) {
4639 + if (mm->mmap_base < len)
4640 + addr = -ENOMEM;
4641 + else
4642 + addr = mm->mmap_base - len;
4643 +
4644 + while (!IS_ERR_VALUE(addr)) {
4645 /* Go down by chunk size */
4646 - addr = _ALIGN_DOWN(addr - len, 1ul << pshift);
4647 + addr = _ALIGN_DOWN(addr, 1ul << pshift);
4648
4649 /* Check for hit with different page size */
4650 mask = slice_range_to_mask(addr, len);
4651 @@ -336,7 +340,7 @@ static unsigned long slice_find_area_topdown(struct mm_struct *mm,
4652 * return with success:
4653 */
4654 vma = find_vma(mm, addr);
4655 - if (!vma || (addr + len) <= vma->vm_start) {
4656 + if (check_heap_stack_gap(vma, addr, len)) {
4657 /* remember the address as a hint for next time */
4658 if (use_cache)
4659 mm->free_area_cache = addr;
4660 @@ -348,7 +352,7 @@ static unsigned long slice_find_area_topdown(struct mm_struct *mm,
4661 mm->cached_hole_size = vma->vm_start - addr;
4662
4663 /* try just below the current vma->vm_start */
4664 - addr = vma->vm_start;
4665 + addr = skip_heap_stack_gap(vma, len);
4666 }
4667
4668 /*
4669 @@ -426,6 +430,11 @@ unsigned long slice_get_unmapped_area(unsigned long addr, unsigned long len,
4670 if (fixed && addr > (mm->task_size - len))
4671 return -EINVAL;
4672
4673 +#ifdef CONFIG_PAX_RANDMMAP
4674 + if (!fixed && (mm->pax_flags & MF_PAX_RANDMMAP))
4675 + addr = 0;
4676 +#endif
4677 +
4678 /* If hint, make sure it matches our alignment restrictions */
4679 if (!fixed && addr) {
4680 addr = _ALIGN_UP(addr, 1ul << pshift);
4681 diff --git a/arch/s390/include/asm/atomic.h b/arch/s390/include/asm/atomic.h
4682 index c797832..ce575c8 100644
4683 --- a/arch/s390/include/asm/atomic.h
4684 +++ b/arch/s390/include/asm/atomic.h
4685 @@ -326,6 +326,16 @@ static inline long long atomic64_dec_if_positive(atomic64_t *v)
4686 #define atomic64_dec_and_test(_v) (atomic64_sub_return(1, _v) == 0)
4687 #define atomic64_inc_not_zero(v) atomic64_add_unless((v), 1, 0)
4688
4689 +#define atomic64_read_unchecked(v) atomic64_read(v)
4690 +#define atomic64_set_unchecked(v, i) atomic64_set((v), (i))
4691 +#define atomic64_add_unchecked(a, v) atomic64_add((a), (v))
4692 +#define atomic64_add_return_unchecked(a, v) atomic64_add_return((a), (v))
4693 +#define atomic64_sub_unchecked(a, v) atomic64_sub((a), (v))
4694 +#define atomic64_inc_unchecked(v) atomic64_inc(v)
4695 +#define atomic64_inc_return_unchecked(v) atomic64_inc_return(v)
4696 +#define atomic64_dec_unchecked(v) atomic64_dec(v)
4697 +#define atomic64_cmpxchg_unchecked(v, o, n) atomic64_cmpxchg((v), (o), (n))
4698 +
4699 #define smp_mb__before_atomic_dec() smp_mb()
4700 #define smp_mb__after_atomic_dec() smp_mb()
4701 #define smp_mb__before_atomic_inc() smp_mb()
4702 diff --git a/arch/s390/include/asm/cache.h b/arch/s390/include/asm/cache.h
4703 index 4d7ccac..d03d0ad 100644
4704 --- a/arch/s390/include/asm/cache.h
4705 +++ b/arch/s390/include/asm/cache.h
4706 @@ -9,8 +9,10 @@
4707 #ifndef __ARCH_S390_CACHE_H
4708 #define __ARCH_S390_CACHE_H
4709
4710 -#define L1_CACHE_BYTES 256
4711 +#include <linux/const.h>
4712 +
4713 #define L1_CACHE_SHIFT 8
4714 +#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT)
4715 #define NET_SKB_PAD 32
4716
4717 #define __read_mostly __attribute__((__section__(".data..read_mostly")))
4718 diff --git a/arch/s390/include/asm/elf.h b/arch/s390/include/asm/elf.h
4719 index 9b94a16..63d4034 100644
4720 --- a/arch/s390/include/asm/elf.h
4721 +++ b/arch/s390/include/asm/elf.h
4722 @@ -159,8 +159,14 @@ extern unsigned int vdso_enabled;
4723 the loader. We need to make sure that it is out of the way of the program
4724 that it will "exec", and that there is sufficient room for the brk. */
4725
4726 -extern unsigned long randomize_et_dyn(unsigned long base);
4727 -#define ELF_ET_DYN_BASE (randomize_et_dyn(STACK_TOP / 3 * 2))
4728 +#define ELF_ET_DYN_BASE (STACK_TOP / 3 * 2)
4729 +
4730 +#ifdef CONFIG_PAX_ASLR
4731 +#define PAX_ELF_ET_DYN_BASE (test_thread_flag(TIF_31BIT) ? 0x10000UL : 0x80000000UL)
4732 +
4733 +#define PAX_DELTA_MMAP_LEN (test_thread_flag(TIF_31BIT) ? 15 : 26)
4734 +#define PAX_DELTA_STACK_LEN (test_thread_flag(TIF_31BIT) ? 15 : 26)
4735 +#endif
4736
4737 /* This yields a mask that user programs can use to figure out what
4738 instruction set this CPU supports. */
4739 @@ -209,7 +215,4 @@ struct linux_binprm;
4740 #define ARCH_HAS_SETUP_ADDITIONAL_PAGES 1
4741 int arch_setup_additional_pages(struct linux_binprm *, int);
4742
4743 -extern unsigned long arch_randomize_brk(struct mm_struct *mm);
4744 -#define arch_randomize_brk arch_randomize_brk
4745 -
4746 #endif
4747 diff --git a/arch/s390/include/asm/exec.h b/arch/s390/include/asm/exec.h
4748 index c4a93d6..4d2a9b4 100644
4749 --- a/arch/s390/include/asm/exec.h
4750 +++ b/arch/s390/include/asm/exec.h
4751 @@ -7,6 +7,6 @@
4752 #ifndef __ASM_EXEC_H
4753 #define __ASM_EXEC_H
4754
4755 -extern unsigned long arch_align_stack(unsigned long sp);
4756 +#define arch_align_stack(x) ((x) & ~0xfUL)
4757
4758 #endif /* __ASM_EXEC_H */
4759 diff --git a/arch/s390/include/asm/uaccess.h b/arch/s390/include/asm/uaccess.h
4760 index a8ab18b..75ddbf0 100644
4761 --- a/arch/s390/include/asm/uaccess.h
4762 +++ b/arch/s390/include/asm/uaccess.h
4763 @@ -239,6 +239,10 @@ static inline unsigned long __must_check
4764 copy_to_user(void __user *to, const void *from, unsigned long n)
4765 {
4766 might_fault();
4767 +
4768 + if ((long)n < 0)
4769 + return n;
4770 +
4771 if (access_ok(VERIFY_WRITE, to, n))
4772 n = __copy_to_user(to, from, n);
4773 return n;
4774 @@ -264,6 +268,9 @@ copy_to_user(void __user *to, const void *from, unsigned long n)
4775 static inline unsigned long __must_check
4776 __copy_from_user(void *to, const void __user *from, unsigned long n)
4777 {
4778 + if ((long)n < 0)
4779 + return n;
4780 +
4781 if (__builtin_constant_p(n) && (n <= 256))
4782 return uaccess.copy_from_user_small(n, from, to);
4783 else
4784 @@ -295,10 +302,14 @@ __compiletime_warning("copy_from_user() buffer size is not provably correct")
4785 static inline unsigned long __must_check
4786 copy_from_user(void *to, const void __user *from, unsigned long n)
4787 {
4788 - unsigned int sz = __compiletime_object_size(to);
4789 + size_t sz = __compiletime_object_size(to);
4790
4791 might_fault();
4792 - if (unlikely(sz != -1 && sz < n)) {
4793 +
4794 + if ((long)n < 0)
4795 + return n;
4796 +
4797 + if (unlikely(sz != (size_t)-1 && sz < n)) {
4798 copy_from_user_overflow();
4799 return n;
4800 }
4801 diff --git a/arch/s390/kernel/module.c b/arch/s390/kernel/module.c
4802 index 46412b1..e32874f 100644
4803 --- a/arch/s390/kernel/module.c
4804 +++ b/arch/s390/kernel/module.c
4805 @@ -160,11 +160,11 @@ module_frob_arch_sections(Elf_Ehdr *hdr, Elf_Shdr *sechdrs,
4806
4807 /* Increase core size by size of got & plt and set start
4808 offsets for got and plt. */
4809 - me->core_size = ALIGN(me->core_size, 4);
4810 - me->arch.got_offset = me->core_size;
4811 - me->core_size += me->arch.got_size;
4812 - me->arch.plt_offset = me->core_size;
4813 - me->core_size += me->arch.plt_size;
4814 + me->core_size_rw = ALIGN(me->core_size_rw, 4);
4815 + me->arch.got_offset = me->core_size_rw;
4816 + me->core_size_rw += me->arch.got_size;
4817 + me->arch.plt_offset = me->core_size_rx;
4818 + me->core_size_rx += me->arch.plt_size;
4819 return 0;
4820 }
4821
4822 @@ -241,7 +241,7 @@ apply_rela(Elf_Rela *rela, Elf_Addr base, Elf_Sym *symtab,
4823 if (info->got_initialized == 0) {
4824 Elf_Addr *gotent;
4825
4826 - gotent = me->module_core + me->arch.got_offset +
4827 + gotent = me->module_core_rw + me->arch.got_offset +
4828 info->got_offset;
4829 *gotent = val;
4830 info->got_initialized = 1;
4831 @@ -265,7 +265,7 @@ apply_rela(Elf_Rela *rela, Elf_Addr base, Elf_Sym *symtab,
4832 else if (r_type == R_390_GOTENT ||
4833 r_type == R_390_GOTPLTENT)
4834 *(unsigned int *) loc =
4835 - (val + (Elf_Addr) me->module_core - loc) >> 1;
4836 + (val + (Elf_Addr) me->module_core_rw - loc) >> 1;
4837 else if (r_type == R_390_GOT64 ||
4838 r_type == R_390_GOTPLT64)
4839 *(unsigned long *) loc = val;
4840 @@ -279,7 +279,7 @@ apply_rela(Elf_Rela *rela, Elf_Addr base, Elf_Sym *symtab,
4841 case R_390_PLTOFF64: /* 16 bit offset from GOT to PLT. */
4842 if (info->plt_initialized == 0) {
4843 unsigned int *ip;
4844 - ip = me->module_core + me->arch.plt_offset +
4845 + ip = me->module_core_rx + me->arch.plt_offset +
4846 info->plt_offset;
4847 #ifndef CONFIG_64BIT
4848 ip[0] = 0x0d105810; /* basr 1,0; l 1,6(1); br 1 */
4849 @@ -304,7 +304,7 @@ apply_rela(Elf_Rela *rela, Elf_Addr base, Elf_Sym *symtab,
4850 val - loc + 0xffffUL < 0x1ffffeUL) ||
4851 (r_type == R_390_PLT32DBL &&
4852 val - loc + 0xffffffffULL < 0x1fffffffeULL)))
4853 - val = (Elf_Addr) me->module_core +
4854 + val = (Elf_Addr) me->module_core_rx +
4855 me->arch.plt_offset +
4856 info->plt_offset;
4857 val += rela->r_addend - loc;
4858 @@ -326,7 +326,7 @@ apply_rela(Elf_Rela *rela, Elf_Addr base, Elf_Sym *symtab,
4859 case R_390_GOTOFF32: /* 32 bit offset to GOT. */
4860 case R_390_GOTOFF64: /* 64 bit offset to GOT. */
4861 val = val + rela->r_addend -
4862 - ((Elf_Addr) me->module_core + me->arch.got_offset);
4863 + ((Elf_Addr) me->module_core_rw + me->arch.got_offset);
4864 if (r_type == R_390_GOTOFF16)
4865 *(unsigned short *) loc = val;
4866 else if (r_type == R_390_GOTOFF32)
4867 @@ -336,7 +336,7 @@ apply_rela(Elf_Rela *rela, Elf_Addr base, Elf_Sym *symtab,
4868 break;
4869 case R_390_GOTPC: /* 32 bit PC relative offset to GOT. */
4870 case R_390_GOTPCDBL: /* 32 bit PC rel. off. to GOT shifted by 1. */
4871 - val = (Elf_Addr) me->module_core + me->arch.got_offset +
4872 + val = (Elf_Addr) me->module_core_rw + me->arch.got_offset +
4873 rela->r_addend - loc;
4874 if (r_type == R_390_GOTPC)
4875 *(unsigned int *) loc = val;
4876 diff --git a/arch/s390/kernel/process.c b/arch/s390/kernel/process.c
4877 index 7331753..dd71de4 100644
4878 --- a/arch/s390/kernel/process.c
4879 +++ b/arch/s390/kernel/process.c
4880 @@ -316,39 +316,3 @@ unsigned long get_wchan(struct task_struct *p)
4881 }
4882 return 0;
4883 }
4884 -
4885 -unsigned long arch_align_stack(unsigned long sp)
4886 -{
4887 - if (!(current->personality & ADDR_NO_RANDOMIZE) && randomize_va_space)
4888 - sp -= get_random_int() & ~PAGE_MASK;
4889 - return sp & ~0xf;
4890 -}
4891 -
4892 -static inline unsigned long brk_rnd(void)
4893 -{
4894 - /* 8MB for 32bit, 1GB for 64bit */
4895 - if (is_32bit_task())
4896 - return (get_random_int() & 0x7ffUL) << PAGE_SHIFT;
4897 - else
4898 - return (get_random_int() & 0x3ffffUL) << PAGE_SHIFT;
4899 -}
4900 -
4901 -unsigned long arch_randomize_brk(struct mm_struct *mm)
4902 -{
4903 - unsigned long ret = PAGE_ALIGN(mm->brk + brk_rnd());
4904 -
4905 - if (ret < mm->brk)
4906 - return mm->brk;
4907 - return ret;
4908 -}
4909 -
4910 -unsigned long randomize_et_dyn(unsigned long base)
4911 -{
4912 - unsigned long ret = PAGE_ALIGN(base + brk_rnd());
4913 -
4914 - if (!(current->flags & PF_RANDOMIZE))
4915 - return base;
4916 - if (ret < base)
4917 - return base;
4918 - return ret;
4919 -}
4920 diff --git a/arch/s390/mm/mmap.c b/arch/s390/mm/mmap.c
4921 index c59a5ef..3fae59c 100644
4922 --- a/arch/s390/mm/mmap.c
4923 +++ b/arch/s390/mm/mmap.c
4924 @@ -90,10 +90,22 @@ void arch_pick_mmap_layout(struct mm_struct *mm)
4925 */
4926 if (mmap_is_legacy()) {
4927 mm->mmap_base = TASK_UNMAPPED_BASE;
4928 +
4929 +#ifdef CONFIG_PAX_RANDMMAP
4930 + if (mm->pax_flags & MF_PAX_RANDMMAP)
4931 + mm->mmap_base += mm->delta_mmap;
4932 +#endif
4933 +
4934 mm->get_unmapped_area = arch_get_unmapped_area;
4935 mm->unmap_area = arch_unmap_area;
4936 } else {
4937 mm->mmap_base = mmap_base();
4938 +
4939 +#ifdef CONFIG_PAX_RANDMMAP
4940 + if (mm->pax_flags & MF_PAX_RANDMMAP)
4941 + mm->mmap_base -= mm->delta_mmap + mm->delta_stack;
4942 +#endif
4943 +
4944 mm->get_unmapped_area = arch_get_unmapped_area_topdown;
4945 mm->unmap_area = arch_unmap_area_topdown;
4946 }
4947 @@ -172,10 +184,22 @@ void arch_pick_mmap_layout(struct mm_struct *mm)
4948 */
4949 if (mmap_is_legacy()) {
4950 mm->mmap_base = TASK_UNMAPPED_BASE;
4951 +
4952 +#ifdef CONFIG_PAX_RANDMMAP
4953 + if (mm->pax_flags & MF_PAX_RANDMMAP)
4954 + mm->mmap_base += mm->delta_mmap;
4955 +#endif
4956 +
4957 mm->get_unmapped_area = s390_get_unmapped_area;
4958 mm->unmap_area = arch_unmap_area;
4959 } else {
4960 mm->mmap_base = mmap_base();
4961 +
4962 +#ifdef CONFIG_PAX_RANDMMAP
4963 + if (mm->pax_flags & MF_PAX_RANDMMAP)
4964 + mm->mmap_base -= mm->delta_mmap + mm->delta_stack;
4965 +#endif
4966 +
4967 mm->get_unmapped_area = s390_get_unmapped_area_topdown;
4968 mm->unmap_area = arch_unmap_area_topdown;
4969 }
4970 diff --git a/arch/score/include/asm/cache.h b/arch/score/include/asm/cache.h
4971 index ae3d59f..f65f075 100644
4972 --- a/arch/score/include/asm/cache.h
4973 +++ b/arch/score/include/asm/cache.h
4974 @@ -1,7 +1,9 @@
4975 #ifndef _ASM_SCORE_CACHE_H
4976 #define _ASM_SCORE_CACHE_H
4977
4978 +#include <linux/const.h>
4979 +
4980 #define L1_CACHE_SHIFT 4
4981 -#define L1_CACHE_BYTES (1 << L1_CACHE_SHIFT)
4982 +#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT)
4983
4984 #endif /* _ASM_SCORE_CACHE_H */
4985 diff --git a/arch/score/include/asm/exec.h b/arch/score/include/asm/exec.h
4986 index f9f3cd5..58ff438 100644
4987 --- a/arch/score/include/asm/exec.h
4988 +++ b/arch/score/include/asm/exec.h
4989 @@ -1,6 +1,6 @@
4990 #ifndef _ASM_SCORE_EXEC_H
4991 #define _ASM_SCORE_EXEC_H
4992
4993 -extern unsigned long arch_align_stack(unsigned long sp);
4994 +#define arch_align_stack(x) (x)
4995
4996 #endif /* _ASM_SCORE_EXEC_H */
4997 diff --git a/arch/score/kernel/process.c b/arch/score/kernel/process.c
4998 index 637970c..0b6556b 100644
4999 --- a/arch/score/kernel/process.c
5000 +++ b/arch/score/kernel/process.c
5001 @@ -161,8 +161,3 @@ unsigned long get_wchan(struct task_struct *task)
5002
5003 return task_pt_regs(task)->cp0_epc;
5004 }
5005 -
5006 -unsigned long arch_align_stack(unsigned long sp)
5007 -{
5008 - return sp;
5009 -}
5010 diff --git a/arch/sh/include/asm/cache.h b/arch/sh/include/asm/cache.h
5011 index ef9e555..331bd29 100644
5012 --- a/arch/sh/include/asm/cache.h
5013 +++ b/arch/sh/include/asm/cache.h
5014 @@ -9,10 +9,11 @@
5015 #define __ASM_SH_CACHE_H
5016 #ifdef __KERNEL__
5017
5018 +#include <linux/const.h>
5019 #include <linux/init.h>
5020 #include <cpu/cache.h>
5021
5022 -#define L1_CACHE_BYTES (1 << L1_CACHE_SHIFT)
5023 +#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT)
5024
5025 #define __read_mostly __attribute__((__section__(".data..read_mostly")))
5026
5027 diff --git a/arch/sh/mm/mmap.c b/arch/sh/mm/mmap.c
5028 index afeb710..d1d1289 100644
5029 --- a/arch/sh/mm/mmap.c
5030 +++ b/arch/sh/mm/mmap.c
5031 @@ -74,8 +74,7 @@ unsigned long arch_get_unmapped_area(struct file *filp, unsigned long addr,
5032 addr = PAGE_ALIGN(addr);
5033
5034 vma = find_vma(mm, addr);
5035 - if (TASK_SIZE - len >= addr &&
5036 - (!vma || addr + len <= vma->vm_start))
5037 + if (TASK_SIZE - len >= addr && check_heap_stack_gap(vma, addr, len))
5038 return addr;
5039 }
5040
5041 @@ -106,7 +105,7 @@ full_search:
5042 }
5043 return -ENOMEM;
5044 }
5045 - if (likely(!vma || addr + len <= vma->vm_start)) {
5046 + if (likely(check_heap_stack_gap(vma, addr, len))) {
5047 /*
5048 * Remember the place where we stopped the search:
5049 */
5050 @@ -157,8 +156,7 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
5051 addr = PAGE_ALIGN(addr);
5052
5053 vma = find_vma(mm, addr);
5054 - if (TASK_SIZE - len >= addr &&
5055 - (!vma || addr + len <= vma->vm_start))
5056 + if (TASK_SIZE - len >= addr && check_heap_stack_gap(vma, addr, len))
5057 return addr;
5058 }
5059
5060 @@ -179,7 +177,7 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
5061 /* make sure it can fit in the remaining address space */
5062 if (likely(addr > len)) {
5063 vma = find_vma(mm, addr-len);
5064 - if (!vma || addr <= vma->vm_start) {
5065 + if (check_heap_stack_gap(vma, addr - len, len)) {
5066 /* remember the address as a hint for next time */
5067 return (mm->free_area_cache = addr-len);
5068 }
5069 @@ -188,18 +186,18 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
5070 if (unlikely(mm->mmap_base < len))
5071 goto bottomup;
5072
5073 - addr = mm->mmap_base-len;
5074 - if (do_colour_align)
5075 - addr = COLOUR_ALIGN_DOWN(addr, pgoff);
5076 + addr = mm->mmap_base - len;
5077
5078 do {
5079 + if (do_colour_align)
5080 + addr = COLOUR_ALIGN_DOWN(addr, pgoff);
5081 /*
5082 * Lookup failure means no vma is above this address,
5083 * else if new region fits below vma->vm_start,
5084 * return with success:
5085 */
5086 vma = find_vma(mm, addr);
5087 - if (likely(!vma || addr+len <= vma->vm_start)) {
5088 + if (likely(check_heap_stack_gap(vma, addr, len))) {
5089 /* remember the address as a hint for next time */
5090 return (mm->free_area_cache = addr);
5091 }
5092 @@ -209,10 +207,8 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
5093 mm->cached_hole_size = vma->vm_start - addr;
5094
5095 /* try just below the current vma->vm_start */
5096 - addr = vma->vm_start-len;
5097 - if (do_colour_align)
5098 - addr = COLOUR_ALIGN_DOWN(addr, pgoff);
5099 - } while (likely(len < vma->vm_start));
5100 + addr = skip_heap_stack_gap(vma, len);
5101 + } while (!IS_ERR_VALUE(addr));
5102
5103 bottomup:
5104 /*
5105 diff --git a/arch/sparc/include/asm/atomic_64.h b/arch/sparc/include/asm/atomic_64.h
5106 index ce35a1c..2e7b8f9 100644
5107 --- a/arch/sparc/include/asm/atomic_64.h
5108 +++ b/arch/sparc/include/asm/atomic_64.h
5109 @@ -14,18 +14,40 @@
5110 #define ATOMIC64_INIT(i) { (i) }
5111
5112 #define atomic_read(v) (*(volatile int *)&(v)->counter)
5113 +static inline int atomic_read_unchecked(const atomic_unchecked_t *v)
5114 +{
5115 + return v->counter;
5116 +}
5117 #define atomic64_read(v) (*(volatile long *)&(v)->counter)
5118 +static inline long atomic64_read_unchecked(const atomic64_unchecked_t *v)
5119 +{
5120 + return v->counter;
5121 +}
5122
5123 #define atomic_set(v, i) (((v)->counter) = i)
5124 +static inline void atomic_set_unchecked(atomic_unchecked_t *v, int i)
5125 +{
5126 + v->counter = i;
5127 +}
5128 #define atomic64_set(v, i) (((v)->counter) = i)
5129 +static inline void atomic64_set_unchecked(atomic64_unchecked_t *v, long i)
5130 +{
5131 + v->counter = i;
5132 +}
5133
5134 extern void atomic_add(int, atomic_t *);
5135 +extern void atomic_add_unchecked(int, atomic_unchecked_t *);
5136 extern void atomic64_add(long, atomic64_t *);
5137 +extern void atomic64_add_unchecked(long, atomic64_unchecked_t *);
5138 extern void atomic_sub(int, atomic_t *);
5139 +extern void atomic_sub_unchecked(int, atomic_unchecked_t *);
5140 extern void atomic64_sub(long, atomic64_t *);
5141 +extern void atomic64_sub_unchecked(long, atomic64_unchecked_t *);
5142
5143 extern int atomic_add_ret(int, atomic_t *);
5144 +extern int atomic_add_ret_unchecked(int, atomic_unchecked_t *);
5145 extern long atomic64_add_ret(long, atomic64_t *);
5146 +extern long atomic64_add_ret_unchecked(long, atomic64_unchecked_t *);
5147 extern int atomic_sub_ret(int, atomic_t *);
5148 extern long atomic64_sub_ret(long, atomic64_t *);
5149
5150 @@ -33,13 +55,29 @@ extern long atomic64_sub_ret(long, atomic64_t *);
5151 #define atomic64_dec_return(v) atomic64_sub_ret(1, v)
5152
5153 #define atomic_inc_return(v) atomic_add_ret(1, v)
5154 +static inline int atomic_inc_return_unchecked(atomic_unchecked_t *v)
5155 +{
5156 + return atomic_add_ret_unchecked(1, v);
5157 +}
5158 #define atomic64_inc_return(v) atomic64_add_ret(1, v)
5159 +static inline long atomic64_inc_return_unchecked(atomic64_unchecked_t *v)
5160 +{
5161 + return atomic64_add_ret_unchecked(1, v);
5162 +}
5163
5164 #define atomic_sub_return(i, v) atomic_sub_ret(i, v)
5165 #define atomic64_sub_return(i, v) atomic64_sub_ret(i, v)
5166
5167 #define atomic_add_return(i, v) atomic_add_ret(i, v)
5168 +static inline int atomic_add_return_unchecked(int i, atomic_unchecked_t *v)
5169 +{
5170 + return atomic_add_ret_unchecked(i, v);
5171 +}
5172 #define atomic64_add_return(i, v) atomic64_add_ret(i, v)
5173 +static inline long atomic64_add_return_unchecked(long i, atomic64_unchecked_t *v)
5174 +{
5175 + return atomic64_add_ret_unchecked(i, v);
5176 +}
5177
5178 /*
5179 * atomic_inc_and_test - increment and test
5180 @@ -50,6 +88,10 @@ extern long atomic64_sub_ret(long, atomic64_t *);
5181 * other cases.
5182 */
5183 #define atomic_inc_and_test(v) (atomic_inc_return(v) == 0)
5184 +static inline int atomic_inc_and_test_unchecked(atomic_unchecked_t *v)
5185 +{
5186 + return atomic_inc_return_unchecked(v) == 0;
5187 +}
5188 #define atomic64_inc_and_test(v) (atomic64_inc_return(v) == 0)
5189
5190 #define atomic_sub_and_test(i, v) (atomic_sub_ret(i, v) == 0)
5191 @@ -59,25 +101,60 @@ extern long atomic64_sub_ret(long, atomic64_t *);
5192 #define atomic64_dec_and_test(v) (atomic64_sub_ret(1, v) == 0)
5193
5194 #define atomic_inc(v) atomic_add(1, v)
5195 +static inline void atomic_inc_unchecked(atomic_unchecked_t *v)
5196 +{
5197 + atomic_add_unchecked(1, v);
5198 +}
5199 #define atomic64_inc(v) atomic64_add(1, v)
5200 +static inline void atomic64_inc_unchecked(atomic64_unchecked_t *v)
5201 +{
5202 + atomic64_add_unchecked(1, v);
5203 +}
5204
5205 #define atomic_dec(v) atomic_sub(1, v)
5206 +static inline void atomic_dec_unchecked(atomic_unchecked_t *v)
5207 +{
5208 + atomic_sub_unchecked(1, v);
5209 +}
5210 #define atomic64_dec(v) atomic64_sub(1, v)
5211 +static inline void atomic64_dec_unchecked(atomic64_unchecked_t *v)
5212 +{
5213 + atomic64_sub_unchecked(1, v);
5214 +}
5215
5216 #define atomic_add_negative(i, v) (atomic_add_ret(i, v) < 0)
5217 #define atomic64_add_negative(i, v) (atomic64_add_ret(i, v) < 0)
5218
5219 #define atomic_cmpxchg(v, o, n) (cmpxchg(&((v)->counter), (o), (n)))
5220 +static inline int atomic_cmpxchg_unchecked(atomic_unchecked_t *v, int old, int new)
5221 +{
5222 + return cmpxchg(&v->counter, old, new);
5223 +}
5224 #define atomic_xchg(v, new) (xchg(&((v)->counter), new))
5225 +static inline int atomic_xchg_unchecked(atomic_unchecked_t *v, int new)
5226 +{
5227 + return xchg(&v->counter, new);
5228 +}
5229
5230 static inline int __atomic_add_unless(atomic_t *v, int a, int u)
5231 {
5232 - int c, old;
5233 + int c, old, new;
5234 c = atomic_read(v);
5235 for (;;) {
5236 - if (unlikely(c == (u)))
5237 + if (unlikely(c == u))
5238 break;
5239 - old = atomic_cmpxchg((v), c, c + (a));
5240 +
5241 + asm volatile("addcc %2, %0, %0\n"
5242 +
5243 +#ifdef CONFIG_PAX_REFCOUNT
5244 + "tvs %%icc, 6\n"
5245 +#endif
5246 +
5247 + : "=r" (new)
5248 + : "0" (c), "ir" (a)
5249 + : "cc");
5250 +
5251 + old = atomic_cmpxchg(v, c, new);
5252 if (likely(old == c))
5253 break;
5254 c = old;
5255 @@ -88,20 +165,35 @@ static inline int __atomic_add_unless(atomic_t *v, int a, int u)
5256 #define atomic64_cmpxchg(v, o, n) \
5257 ((__typeof__((v)->counter))cmpxchg(&((v)->counter), (o), (n)))
5258 #define atomic64_xchg(v, new) (xchg(&((v)->counter), new))
5259 +static inline long atomic64_xchg_unchecked(atomic64_unchecked_t *v, long new)
5260 +{
5261 + return xchg(&v->counter, new);
5262 +}
5263
5264 static inline long atomic64_add_unless(atomic64_t *v, long a, long u)
5265 {
5266 - long c, old;
5267 + long c, old, new;
5268 c = atomic64_read(v);
5269 for (;;) {
5270 - if (unlikely(c == (u)))
5271 + if (unlikely(c == u))
5272 break;
5273 - old = atomic64_cmpxchg((v), c, c + (a));
5274 +
5275 + asm volatile("addcc %2, %0, %0\n"
5276 +
5277 +#ifdef CONFIG_PAX_REFCOUNT
5278 + "tvs %%xcc, 6\n"
5279 +#endif
5280 +
5281 + : "=r" (new)
5282 + : "0" (c), "ir" (a)
5283 + : "cc");
5284 +
5285 + old = atomic64_cmpxchg(v, c, new);
5286 if (likely(old == c))
5287 break;
5288 c = old;
5289 }
5290 - return c != (u);
5291 + return c != u;
5292 }
5293
5294 #define atomic64_inc_not_zero(v) atomic64_add_unless((v), 1, 0)
5295 diff --git a/arch/sparc/include/asm/cache.h b/arch/sparc/include/asm/cache.h
5296 index 5bb6991..5c2132e 100644
5297 --- a/arch/sparc/include/asm/cache.h
5298 +++ b/arch/sparc/include/asm/cache.h
5299 @@ -7,10 +7,12 @@
5300 #ifndef _SPARC_CACHE_H
5301 #define _SPARC_CACHE_H
5302
5303 +#include <linux/const.h>
5304 +
5305 #define ARCH_SLAB_MINALIGN __alignof__(unsigned long long)
5306
5307 #define L1_CACHE_SHIFT 5
5308 -#define L1_CACHE_BYTES 32
5309 +#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT)
5310
5311 #ifdef CONFIG_SPARC32
5312 #define SMP_CACHE_BYTES_SHIFT 5
5313 diff --git a/arch/sparc/include/asm/elf_32.h b/arch/sparc/include/asm/elf_32.h
5314 index 2d4d755..81b6662 100644
5315 --- a/arch/sparc/include/asm/elf_32.h
5316 +++ b/arch/sparc/include/asm/elf_32.h
5317 @@ -114,6 +114,13 @@ typedef struct {
5318
5319 #define ELF_ET_DYN_BASE (TASK_UNMAPPED_BASE)
5320
5321 +#ifdef CONFIG_PAX_ASLR
5322 +#define PAX_ELF_ET_DYN_BASE 0x10000UL
5323 +
5324 +#define PAX_DELTA_MMAP_LEN 16
5325 +#define PAX_DELTA_STACK_LEN 16
5326 +#endif
5327 +
5328 /* This yields a mask that user programs can use to figure out what
5329 instruction set this cpu supports. This can NOT be done in userspace
5330 on Sparc. */
5331 diff --git a/arch/sparc/include/asm/elf_64.h b/arch/sparc/include/asm/elf_64.h
5332 index 7df8b7f..4946269 100644
5333 --- a/arch/sparc/include/asm/elf_64.h
5334 +++ b/arch/sparc/include/asm/elf_64.h
5335 @@ -180,6 +180,13 @@ typedef struct {
5336 #define ELF_ET_DYN_BASE 0x0000010000000000UL
5337 #define COMPAT_ELF_ET_DYN_BASE 0x0000000070000000UL
5338
5339 +#ifdef CONFIG_PAX_ASLR
5340 +#define PAX_ELF_ET_DYN_BASE (test_thread_flag(TIF_32BIT) ? 0x10000UL : 0x100000UL)
5341 +
5342 +#define PAX_DELTA_MMAP_LEN (test_thread_flag(TIF_32BIT) ? 14 : 28)
5343 +#define PAX_DELTA_STACK_LEN (test_thread_flag(TIF_32BIT) ? 15 : 29)
5344 +#endif
5345 +
5346 extern unsigned long sparc64_elf_hwcap;
5347 #define ELF_HWCAP sparc64_elf_hwcap
5348
5349 diff --git a/arch/sparc/include/asm/pgalloc_32.h b/arch/sparc/include/asm/pgalloc_32.h
5350 index 9b1c36d..209298b 100644
5351 --- a/arch/sparc/include/asm/pgalloc_32.h
5352 +++ b/arch/sparc/include/asm/pgalloc_32.h
5353 @@ -33,6 +33,7 @@ static inline void pgd_set(pgd_t * pgdp, pmd_t * pmdp)
5354 }
5355
5356 #define pgd_populate(MM, PGD, PMD) pgd_set(PGD, PMD)
5357 +#define pgd_populate_kernel(MM, PGD, PMD) pgd_populate((MM), (PGD), (PMD))
5358
5359 static inline pmd_t *pmd_alloc_one(struct mm_struct *mm,
5360 unsigned long address)
5361 diff --git a/arch/sparc/include/asm/pgalloc_64.h b/arch/sparc/include/asm/pgalloc_64.h
5362 index 40b2d7a..22a665b 100644
5363 --- a/arch/sparc/include/asm/pgalloc_64.h
5364 +++ b/arch/sparc/include/asm/pgalloc_64.h
5365 @@ -26,6 +26,7 @@ static inline void pgd_free(struct mm_struct *mm, pgd_t *pgd)
5366 }
5367
5368 #define pud_populate(MM, PUD, PMD) pud_set(PUD, PMD)
5369 +#define pud_populate_kernel(MM, PUD, PMD) pud_populate((MM), (PUD), (PMD))
5370
5371 static inline pmd_t *pmd_alloc_one(struct mm_struct *mm, unsigned long addr)
5372 {
5373 diff --git a/arch/sparc/include/asm/pgtable_32.h b/arch/sparc/include/asm/pgtable_32.h
5374 index 6fc1348..390c50a 100644
5375 --- a/arch/sparc/include/asm/pgtable_32.h
5376 +++ b/arch/sparc/include/asm/pgtable_32.h
5377 @@ -50,6 +50,9 @@ extern unsigned long calc_highpages(void);
5378 #define PAGE_SHARED SRMMU_PAGE_SHARED
5379 #define PAGE_COPY SRMMU_PAGE_COPY
5380 #define PAGE_READONLY SRMMU_PAGE_RDONLY
5381 +#define PAGE_SHARED_NOEXEC SRMMU_PAGE_SHARED_NOEXEC
5382 +#define PAGE_COPY_NOEXEC SRMMU_PAGE_COPY_NOEXEC
5383 +#define PAGE_READONLY_NOEXEC SRMMU_PAGE_RDONLY_NOEXEC
5384 #define PAGE_KERNEL SRMMU_PAGE_KERNEL
5385
5386 /* Top-level page directory - dummy used by init-mm.
5387 @@ -62,18 +65,18 @@ extern unsigned long ptr_in_current_pgd;
5388
5389 /* xwr */
5390 #define __P000 PAGE_NONE
5391 -#define __P001 PAGE_READONLY
5392 -#define __P010 PAGE_COPY
5393 -#define __P011 PAGE_COPY
5394 +#define __P001 PAGE_READONLY_NOEXEC
5395 +#define __P010 PAGE_COPY_NOEXEC
5396 +#define __P011 PAGE_COPY_NOEXEC
5397 #define __P100 PAGE_READONLY
5398 #define __P101 PAGE_READONLY
5399 #define __P110 PAGE_COPY
5400 #define __P111 PAGE_COPY
5401
5402 #define __S000 PAGE_NONE
5403 -#define __S001 PAGE_READONLY
5404 -#define __S010 PAGE_SHARED
5405 -#define __S011 PAGE_SHARED
5406 +#define __S001 PAGE_READONLY_NOEXEC
5407 +#define __S010 PAGE_SHARED_NOEXEC
5408 +#define __S011 PAGE_SHARED_NOEXEC
5409 #define __S100 PAGE_READONLY
5410 #define __S101 PAGE_READONLY
5411 #define __S110 PAGE_SHARED
5412 diff --git a/arch/sparc/include/asm/pgtsrmmu.h b/arch/sparc/include/asm/pgtsrmmu.h
5413 index 79da178..c2eede8 100644
5414 --- a/arch/sparc/include/asm/pgtsrmmu.h
5415 +++ b/arch/sparc/include/asm/pgtsrmmu.h
5416 @@ -115,6 +115,11 @@
5417 SRMMU_EXEC | SRMMU_REF)
5418 #define SRMMU_PAGE_RDONLY __pgprot(SRMMU_VALID | SRMMU_CACHE | \
5419 SRMMU_EXEC | SRMMU_REF)
5420 +
5421 +#define SRMMU_PAGE_SHARED_NOEXEC __pgprot(SRMMU_VALID | SRMMU_CACHE | SRMMU_WRITE | SRMMU_REF)
5422 +#define SRMMU_PAGE_COPY_NOEXEC __pgprot(SRMMU_VALID | SRMMU_CACHE | SRMMU_REF)
5423 +#define SRMMU_PAGE_RDONLY_NOEXEC __pgprot(SRMMU_VALID | SRMMU_CACHE | SRMMU_REF)
5424 +
5425 #define SRMMU_PAGE_KERNEL __pgprot(SRMMU_VALID | SRMMU_CACHE | SRMMU_PRIV | \
5426 SRMMU_DIRTY | SRMMU_REF)
5427
5428 diff --git a/arch/sparc/include/asm/spinlock_64.h b/arch/sparc/include/asm/spinlock_64.h
5429 index 9689176..63c18ea 100644
5430 --- a/arch/sparc/include/asm/spinlock_64.h
5431 +++ b/arch/sparc/include/asm/spinlock_64.h
5432 @@ -92,14 +92,19 @@ static inline void arch_spin_lock_flags(arch_spinlock_t *lock, unsigned long fla
5433
5434 /* Multi-reader locks, these are much saner than the 32-bit Sparc ones... */
5435
5436 -static void inline arch_read_lock(arch_rwlock_t *lock)
5437 +static inline void arch_read_lock(arch_rwlock_t *lock)
5438 {
5439 unsigned long tmp1, tmp2;
5440
5441 __asm__ __volatile__ (
5442 "1: ldsw [%2], %0\n"
5443 " brlz,pn %0, 2f\n"
5444 -"4: add %0, 1, %1\n"
5445 +"4: addcc %0, 1, %1\n"
5446 +
5447 +#ifdef CONFIG_PAX_REFCOUNT
5448 +" tvs %%icc, 6\n"
5449 +#endif
5450 +
5451 " cas [%2], %0, %1\n"
5452 " cmp %0, %1\n"
5453 " bne,pn %%icc, 1b\n"
5454 @@ -112,10 +117,10 @@ static void inline arch_read_lock(arch_rwlock_t *lock)
5455 " .previous"
5456 : "=&r" (tmp1), "=&r" (tmp2)
5457 : "r" (lock)
5458 - : "memory");
5459 + : "memory", "cc");
5460 }
5461
5462 -static int inline arch_read_trylock(arch_rwlock_t *lock)
5463 +static inline int arch_read_trylock(arch_rwlock_t *lock)
5464 {
5465 int tmp1, tmp2;
5466
5467 @@ -123,7 +128,12 @@ static int inline arch_read_trylock(arch_rwlock_t *lock)
5468 "1: ldsw [%2], %0\n"
5469 " brlz,a,pn %0, 2f\n"
5470 " mov 0, %0\n"
5471 -" add %0, 1, %1\n"
5472 +" addcc %0, 1, %1\n"
5473 +
5474 +#ifdef CONFIG_PAX_REFCOUNT
5475 +" tvs %%icc, 6\n"
5476 +#endif
5477 +
5478 " cas [%2], %0, %1\n"
5479 " cmp %0, %1\n"
5480 " bne,pn %%icc, 1b\n"
5481 @@ -136,13 +146,18 @@ static int inline arch_read_trylock(arch_rwlock_t *lock)
5482 return tmp1;
5483 }
5484
5485 -static void inline arch_read_unlock(arch_rwlock_t *lock)
5486 +static inline void arch_read_unlock(arch_rwlock_t *lock)
5487 {
5488 unsigned long tmp1, tmp2;
5489
5490 __asm__ __volatile__(
5491 "1: lduw [%2], %0\n"
5492 -" sub %0, 1, %1\n"
5493 +" subcc %0, 1, %1\n"
5494 +
5495 +#ifdef CONFIG_PAX_REFCOUNT
5496 +" tvs %%icc, 6\n"
5497 +#endif
5498 +
5499 " cas [%2], %0, %1\n"
5500 " cmp %0, %1\n"
5501 " bne,pn %%xcc, 1b\n"
5502 @@ -152,7 +167,7 @@ static void inline arch_read_unlock(arch_rwlock_t *lock)
5503 : "memory");
5504 }
5505
5506 -static void inline arch_write_lock(arch_rwlock_t *lock)
5507 +static inline void arch_write_lock(arch_rwlock_t *lock)
5508 {
5509 unsigned long mask, tmp1, tmp2;
5510
5511 @@ -177,7 +192,7 @@ static void inline arch_write_lock(arch_rwlock_t *lock)
5512 : "memory");
5513 }
5514
5515 -static void inline arch_write_unlock(arch_rwlock_t *lock)
5516 +static inline void arch_write_unlock(arch_rwlock_t *lock)
5517 {
5518 __asm__ __volatile__(
5519 " stw %%g0, [%0]"
5520 @@ -186,7 +201,7 @@ static void inline arch_write_unlock(arch_rwlock_t *lock)
5521 : "memory");
5522 }
5523
5524 -static int inline arch_write_trylock(arch_rwlock_t *lock)
5525 +static inline int arch_write_trylock(arch_rwlock_t *lock)
5526 {
5527 unsigned long mask, tmp1, tmp2, result;
5528
5529 diff --git a/arch/sparc/include/asm/thread_info_32.h b/arch/sparc/include/asm/thread_info_32.h
5530 index e6cd224..3a71793 100644
5531 --- a/arch/sparc/include/asm/thread_info_32.h
5532 +++ b/arch/sparc/include/asm/thread_info_32.h
5533 @@ -49,6 +49,8 @@ struct thread_info {
5534 unsigned long w_saved;
5535
5536 struct restart_block restart_block;
5537 +
5538 + unsigned long lowest_stack;
5539 };
5540
5541 /*
5542 diff --git a/arch/sparc/include/asm/thread_info_64.h b/arch/sparc/include/asm/thread_info_64.h
5543 index cfa8c38..13f30d3 100644
5544 --- a/arch/sparc/include/asm/thread_info_64.h
5545 +++ b/arch/sparc/include/asm/thread_info_64.h
5546 @@ -63,6 +63,8 @@ struct thread_info {
5547 struct pt_regs *kern_una_regs;
5548 unsigned int kern_una_insn;
5549
5550 + unsigned long lowest_stack;
5551 +
5552 unsigned long fpregs[0] __attribute__ ((aligned(64)));
5553 };
5554
5555 @@ -193,10 +195,11 @@ register struct thread_info *current_thread_info_reg asm("g6");
5556 #define TIF_UNALIGNED 5 /* allowed to do unaligned accesses */
5557 /* flag bit 6 is available */
5558 #define TIF_32BIT 7 /* 32-bit binary */
5559 -/* flag bit 8 is available */
5560 +#define TIF_GRSEC_SETXID 8 /* update credentials on syscall entry/exit */
5561 #define TIF_SECCOMP 9 /* secure computing */
5562 #define TIF_SYSCALL_AUDIT 10 /* syscall auditing active */
5563 #define TIF_SYSCALL_TRACEPOINT 11 /* syscall tracepoint instrumentation */
5564 +
5565 /* NOTE: Thread flags >= 12 should be ones we have no interest
5566 * in using in assembly, else we can't use the mask as
5567 * an immediate value in instructions such as andcc.
5568 @@ -215,12 +218,18 @@ register struct thread_info *current_thread_info_reg asm("g6");
5569 #define _TIF_SYSCALL_AUDIT (1<<TIF_SYSCALL_AUDIT)
5570 #define _TIF_SYSCALL_TRACEPOINT (1<<TIF_SYSCALL_TRACEPOINT)
5571 #define _TIF_POLLING_NRFLAG (1<<TIF_POLLING_NRFLAG)
5572 +#define _TIF_GRSEC_SETXID (1<<TIF_GRSEC_SETXID)
5573
5574 #define _TIF_USER_WORK_MASK ((0xff << TI_FLAG_WSAVED_SHIFT) | \
5575 _TIF_DO_NOTIFY_RESUME_MASK | \
5576 _TIF_NEED_RESCHED)
5577 #define _TIF_DO_NOTIFY_RESUME_MASK (_TIF_NOTIFY_RESUME | _TIF_SIGPENDING)
5578
5579 +#define _TIF_WORK_SYSCALL \
5580 + (_TIF_SYSCALL_TRACE | _TIF_SECCOMP | _TIF_SYSCALL_AUDIT | \
5581 + _TIF_SYSCALL_TRACEPOINT | _TIF_GRSEC_SETXID)
5582 +
5583 +
5584 /*
5585 * Thread-synchronous status.
5586 *
5587 diff --git a/arch/sparc/include/asm/uaccess.h b/arch/sparc/include/asm/uaccess.h
5588 index 0167d26..9acd8ed 100644
5589 --- a/arch/sparc/include/asm/uaccess.h
5590 +++ b/arch/sparc/include/asm/uaccess.h
5591 @@ -1,5 +1,13 @@
5592 #ifndef ___ASM_SPARC_UACCESS_H
5593 #define ___ASM_SPARC_UACCESS_H
5594 +
5595 +#ifdef __KERNEL__
5596 +#ifndef __ASSEMBLY__
5597 +#include <linux/types.h>
5598 +extern void check_object_size(const void *ptr, unsigned long n, bool to);
5599 +#endif
5600 +#endif
5601 +
5602 #if defined(__sparc__) && defined(__arch64__)
5603 #include <asm/uaccess_64.h>
5604 #else
5605 diff --git a/arch/sparc/include/asm/uaccess_32.h b/arch/sparc/include/asm/uaccess_32.h
5606 index 53a28dd..50c38c3 100644
5607 --- a/arch/sparc/include/asm/uaccess_32.h
5608 +++ b/arch/sparc/include/asm/uaccess_32.h
5609 @@ -250,27 +250,46 @@ extern unsigned long __copy_user(void __user *to, const void __user *from, unsig
5610
5611 static inline unsigned long copy_to_user(void __user *to, const void *from, unsigned long n)
5612 {
5613 - if (n && __access_ok((unsigned long) to, n))
5614 + if ((long)n < 0)
5615 + return n;
5616 +
5617 + if (n && __access_ok((unsigned long) to, n)) {
5618 + if (!__builtin_constant_p(n))
5619 + check_object_size(from, n, true);
5620 return __copy_user(to, (__force void __user *) from, n);
5621 - else
5622 + } else
5623 return n;
5624 }
5625
5626 static inline unsigned long __copy_to_user(void __user *to, const void *from, unsigned long n)
5627 {
5628 + if ((long)n < 0)
5629 + return n;
5630 +
5631 + if (!__builtin_constant_p(n))
5632 + check_object_size(from, n, true);
5633 +
5634 return __copy_user(to, (__force void __user *) from, n);
5635 }
5636
5637 static inline unsigned long copy_from_user(void *to, const void __user *from, unsigned long n)
5638 {
5639 - if (n && __access_ok((unsigned long) from, n))
5640 + if ((long)n < 0)
5641 + return n;
5642 +
5643 + if (n && __access_ok((unsigned long) from, n)) {
5644 + if (!__builtin_constant_p(n))
5645 + check_object_size(to, n, false);
5646 return __copy_user((__force void __user *) to, from, n);
5647 - else
5648 + } else
5649 return n;
5650 }
5651
5652 static inline unsigned long __copy_from_user(void *to, const void __user *from, unsigned long n)
5653 {
5654 + if ((long)n < 0)
5655 + return n;
5656 +
5657 return __copy_user((__force void __user *) to, from, n);
5658 }
5659
5660 diff --git a/arch/sparc/include/asm/uaccess_64.h b/arch/sparc/include/asm/uaccess_64.h
5661 index 7c831d8..d440ca7 100644
5662 --- a/arch/sparc/include/asm/uaccess_64.h
5663 +++ b/arch/sparc/include/asm/uaccess_64.h
5664 @@ -10,6 +10,7 @@
5665 #include <linux/compiler.h>
5666 #include <linux/string.h>
5667 #include <linux/thread_info.h>
5668 +#include <linux/kernel.h>
5669 #include <asm/asi.h>
5670 #include <asm/spitfire.h>
5671 #include <asm-generic/uaccess-unaligned.h>
5672 @@ -214,8 +215,15 @@ extern unsigned long copy_from_user_fixup(void *to, const void __user *from,
5673 static inline unsigned long __must_check
5674 copy_from_user(void *to, const void __user *from, unsigned long size)
5675 {
5676 - unsigned long ret = ___copy_from_user(to, from, size);
5677 + unsigned long ret;
5678
5679 + if ((long)size < 0 || size > INT_MAX)
5680 + return size;
5681 +
5682 + if (!__builtin_constant_p(size))
5683 + check_object_size(to, size, false);
5684 +
5685 + ret = ___copy_from_user(to, from, size);
5686 if (unlikely(ret))
5687 ret = copy_from_user_fixup(to, from, size);
5688
5689 @@ -231,8 +239,15 @@ extern unsigned long copy_to_user_fixup(void __user *to, const void *from,
5690 static inline unsigned long __must_check
5691 copy_to_user(void __user *to, const void *from, unsigned long size)
5692 {
5693 - unsigned long ret = ___copy_to_user(to, from, size);
5694 + unsigned long ret;
5695
5696 + if ((long)size < 0 || size > INT_MAX)
5697 + return size;
5698 +
5699 + if (!__builtin_constant_p(size))
5700 + check_object_size(from, size, true);
5701 +
5702 + ret = ___copy_to_user(to, from, size);
5703 if (unlikely(ret))
5704 ret = copy_to_user_fixup(to, from, size);
5705 return ret;
5706 diff --git a/arch/sparc/kernel/Makefile b/arch/sparc/kernel/Makefile
5707 index 6cf591b..b49e65a 100644
5708 --- a/arch/sparc/kernel/Makefile
5709 +++ b/arch/sparc/kernel/Makefile
5710 @@ -3,7 +3,7 @@
5711 #
5712
5713 asflags-y := -ansi
5714 -ccflags-y := -Werror
5715 +#ccflags-y := -Werror
5716
5717 extra-y := head_$(BITS).o
5718
5719 diff --git a/arch/sparc/kernel/leon_kernel.c b/arch/sparc/kernel/leon_kernel.c
5720 index f8b6eee..87f60ee 100644
5721 --- a/arch/sparc/kernel/leon_kernel.c
5722 +++ b/arch/sparc/kernel/leon_kernel.c
5723 @@ -56,11 +56,13 @@ static inline unsigned int leon_eirq_get(int cpu)
5724 static void leon_handle_ext_irq(unsigned int irq, struct irq_desc *desc)
5725 {
5726 unsigned int eirq;
5727 + struct irq_bucket *p;
5728 int cpu = sparc_leon3_cpuid();
5729
5730 eirq = leon_eirq_get(cpu);
5731 - if ((eirq & 0x10) && irq_map[eirq]->irq) /* bit4 tells if IRQ happened */
5732 - generic_handle_irq(irq_map[eirq]->irq);
5733 + p = irq_map[eirq];
5734 + if ((eirq & 0x10) && p && p->irq) /* bit4 tells if IRQ happened */
5735 + generic_handle_irq(p->irq);
5736 }
5737
5738 /* The extended IRQ controller has been found, this function registers it */
5739 diff --git a/arch/sparc/kernel/process_32.c b/arch/sparc/kernel/process_32.c
5740 index 14006d8..8146238 100644
5741 --- a/arch/sparc/kernel/process_32.c
5742 +++ b/arch/sparc/kernel/process_32.c
5743 @@ -126,14 +126,14 @@ void show_regs(struct pt_regs *r)
5744
5745 printk("PSR: %08lx PC: %08lx NPC: %08lx Y: %08lx %s\n",
5746 r->psr, r->pc, r->npc, r->y, print_tainted());
5747 - printk("PC: <%pS>\n", (void *) r->pc);
5748 + printk("PC: <%pA>\n", (void *) r->pc);
5749 printk("%%G: %08lx %08lx %08lx %08lx %08lx %08lx %08lx %08lx\n",
5750 r->u_regs[0], r->u_regs[1], r->u_regs[2], r->u_regs[3],
5751 r->u_regs[4], r->u_regs[5], r->u_regs[6], r->u_regs[7]);
5752 printk("%%O: %08lx %08lx %08lx %08lx %08lx %08lx %08lx %08lx\n",
5753 r->u_regs[8], r->u_regs[9], r->u_regs[10], r->u_regs[11],
5754 r->u_regs[12], r->u_regs[13], r->u_regs[14], r->u_regs[15]);
5755 - printk("RPC: <%pS>\n", (void *) r->u_regs[15]);
5756 + printk("RPC: <%pA>\n", (void *) r->u_regs[15]);
5757
5758 printk("%%L: %08lx %08lx %08lx %08lx %08lx %08lx %08lx %08lx\n",
5759 rw->locals[0], rw->locals[1], rw->locals[2], rw->locals[3],
5760 @@ -168,7 +168,7 @@ void show_stack(struct task_struct *tsk, unsigned long *_ksp)
5761 rw = (struct reg_window32 *) fp;
5762 pc = rw->ins[7];
5763 printk("[%08lx : ", pc);
5764 - printk("%pS ] ", (void *) pc);
5765 + printk("%pA ] ", (void *) pc);
5766 fp = rw->ins[6];
5767 } while (++count < 16);
5768 printk("\n");
5769 diff --git a/arch/sparc/kernel/process_64.c b/arch/sparc/kernel/process_64.c
5770 index aff0c72..9067b39 100644
5771 --- a/arch/sparc/kernel/process_64.c
5772 +++ b/arch/sparc/kernel/process_64.c
5773 @@ -179,14 +179,14 @@ static void show_regwindow(struct pt_regs *regs)
5774 printk("i4: %016lx i5: %016lx i6: %016lx i7: %016lx\n",
5775 rwk->ins[4], rwk->ins[5], rwk->ins[6], rwk->ins[7]);
5776 if (regs->tstate & TSTATE_PRIV)
5777 - printk("I7: <%pS>\n", (void *) rwk->ins[7]);
5778 + printk("I7: <%pA>\n", (void *) rwk->ins[7]);
5779 }
5780
5781 void show_regs(struct pt_regs *regs)
5782 {
5783 printk("TSTATE: %016lx TPC: %016lx TNPC: %016lx Y: %08x %s\n", regs->tstate,
5784 regs->tpc, regs->tnpc, regs->y, print_tainted());
5785 - printk("TPC: <%pS>\n", (void *) regs->tpc);
5786 + printk("TPC: <%pA>\n", (void *) regs->tpc);
5787 printk("g0: %016lx g1: %016lx g2: %016lx g3: %016lx\n",
5788 regs->u_regs[0], regs->u_regs[1], regs->u_regs[2],
5789 regs->u_regs[3]);
5790 @@ -199,7 +199,7 @@ void show_regs(struct pt_regs *regs)
5791 printk("o4: %016lx o5: %016lx sp: %016lx ret_pc: %016lx\n",
5792 regs->u_regs[12], regs->u_regs[13], regs->u_regs[14],
5793 regs->u_regs[15]);
5794 - printk("RPC: <%pS>\n", (void *) regs->u_regs[15]);
5795 + printk("RPC: <%pA>\n", (void *) regs->u_regs[15]);
5796 show_regwindow(regs);
5797 show_stack(current, (unsigned long *) regs->u_regs[UREG_FP]);
5798 }
5799 @@ -284,7 +284,7 @@ void arch_trigger_all_cpu_backtrace(void)
5800 ((tp && tp->task) ? tp->task->pid : -1));
5801
5802 if (gp->tstate & TSTATE_PRIV) {
5803 - printk(" TPC[%pS] O7[%pS] I7[%pS] RPC[%pS]\n",
5804 + printk(" TPC[%pA] O7[%pA] I7[%pA] RPC[%pA]\n",
5805 (void *) gp->tpc,
5806 (void *) gp->o7,
5807 (void *) gp->i7,
5808 diff --git a/arch/sparc/kernel/ptrace_64.c b/arch/sparc/kernel/ptrace_64.c
5809 index 484daba..0674139 100644
5810 --- a/arch/sparc/kernel/ptrace_64.c
5811 +++ b/arch/sparc/kernel/ptrace_64.c
5812 @@ -1057,6 +1057,10 @@ long arch_ptrace(struct task_struct *child, long request,
5813 return ret;
5814 }
5815
5816 +#ifdef CONFIG_GRKERNSEC_SETXID
5817 +extern void gr_delayed_cred_worker(void);
5818 +#endif
5819 +
5820 asmlinkage int syscall_trace_enter(struct pt_regs *regs)
5821 {
5822 int ret = 0;
5823 @@ -1064,6 +1068,11 @@ asmlinkage int syscall_trace_enter(struct pt_regs *regs)
5824 /* do the secure computing check first */
5825 secure_computing_strict(regs->u_regs[UREG_G1]);
5826
5827 +#ifdef CONFIG_GRKERNSEC_SETXID
5828 + if (unlikely(test_and_clear_thread_flag(TIF_GRSEC_SETXID)))
5829 + gr_delayed_cred_worker();
5830 +#endif
5831 +
5832 if (test_thread_flag(TIF_SYSCALL_TRACE))
5833 ret = tracehook_report_syscall_entry(regs);
5834
5835 @@ -1084,6 +1093,11 @@ asmlinkage int syscall_trace_enter(struct pt_regs *regs)
5836
5837 asmlinkage void syscall_trace_leave(struct pt_regs *regs)
5838 {
5839 +#ifdef CONFIG_GRKERNSEC_SETXID
5840 + if (unlikely(test_and_clear_thread_flag(TIF_GRSEC_SETXID)))
5841 + gr_delayed_cred_worker();
5842 +#endif
5843 +
5844 audit_syscall_exit(regs);
5845
5846 if (unlikely(test_thread_flag(TIF_SYSCALL_TRACEPOINT)))
5847 diff --git a/arch/sparc/kernel/sys_sparc_32.c b/arch/sparc/kernel/sys_sparc_32.c
5848 index 0c9b31b..7cb7aee 100644
5849 --- a/arch/sparc/kernel/sys_sparc_32.c
5850 +++ b/arch/sparc/kernel/sys_sparc_32.c
5851 @@ -54,7 +54,7 @@ unsigned long arch_get_unmapped_area(struct file *filp, unsigned long addr, unsi
5852 if (len > TASK_SIZE - PAGE_SIZE)
5853 return -ENOMEM;
5854 if (!addr)
5855 - addr = TASK_UNMAPPED_BASE;
5856 + addr = current->mm->mmap_base;
5857
5858 if (flags & MAP_SHARED)
5859 addr = COLOUR_ALIGN(addr);
5860 @@ -65,7 +65,7 @@ unsigned long arch_get_unmapped_area(struct file *filp, unsigned long addr, unsi
5861 /* At this point: (!vmm || addr < vmm->vm_end). */
5862 if (TASK_SIZE - PAGE_SIZE - len < addr)
5863 return -ENOMEM;
5864 - if (!vmm || addr + len <= vmm->vm_start)
5865 + if (check_heap_stack_gap(vmm, addr, len))
5866 return addr;
5867 addr = vmm->vm_end;
5868 if (flags & MAP_SHARED)
5869 diff --git a/arch/sparc/kernel/sys_sparc_64.c b/arch/sparc/kernel/sys_sparc_64.c
5870 index 11c6c96..3ec33e8 100644
5871 --- a/arch/sparc/kernel/sys_sparc_64.c
5872 +++ b/arch/sparc/kernel/sys_sparc_64.c
5873 @@ -107,7 +107,7 @@ unsigned long arch_get_unmapped_area(struct file *filp, unsigned long addr, unsi
5874 /* We do not accept a shared mapping if it would violate
5875 * cache aliasing constraints.
5876 */
5877 - if ((flags & MAP_SHARED) &&
5878 + if ((filp || (flags & MAP_SHARED)) &&
5879 ((addr - (pgoff << PAGE_SHIFT)) & (SHMLBA - 1)))
5880 return -EINVAL;
5881 return addr;
5882 @@ -122,6 +122,10 @@ unsigned long arch_get_unmapped_area(struct file *filp, unsigned long addr, unsi
5883 if (filp || (flags & MAP_SHARED))
5884 do_color_align = 1;
5885
5886 +#ifdef CONFIG_PAX_RANDMMAP
5887 + if (!(mm->pax_flags & MF_PAX_RANDMMAP))
5888 +#endif
5889 +
5890 if (addr) {
5891 if (do_color_align)
5892 addr = COLOUR_ALIGN(addr, pgoff);
5893 @@ -129,15 +133,14 @@ unsigned long arch_get_unmapped_area(struct file *filp, unsigned long addr, unsi
5894 addr = PAGE_ALIGN(addr);
5895
5896 vma = find_vma(mm, addr);
5897 - if (task_size - len >= addr &&
5898 - (!vma || addr + len <= vma->vm_start))
5899 + if (task_size - len >= addr && check_heap_stack_gap(vma, addr, len))
5900 return addr;
5901 }
5902
5903 if (len > mm->cached_hole_size) {
5904 - start_addr = addr = mm->free_area_cache;
5905 + start_addr = addr = mm->free_area_cache;
5906 } else {
5907 - start_addr = addr = TASK_UNMAPPED_BASE;
5908 + start_addr = addr = mm->mmap_base;
5909 mm->cached_hole_size = 0;
5910 }
5911
5912 @@ -157,14 +160,14 @@ full_search:
5913 vma = find_vma(mm, VA_EXCLUDE_END);
5914 }
5915 if (unlikely(task_size < addr)) {
5916 - if (start_addr != TASK_UNMAPPED_BASE) {
5917 - start_addr = addr = TASK_UNMAPPED_BASE;
5918 + if (start_addr != mm->mmap_base) {
5919 + start_addr = addr = mm->mmap_base;
5920 mm->cached_hole_size = 0;
5921 goto full_search;
5922 }
5923 return -ENOMEM;
5924 }
5925 - if (likely(!vma || addr + len <= vma->vm_start)) {
5926 + if (likely(check_heap_stack_gap(vma, addr, len))) {
5927 /*
5928 * Remember the place where we stopped the search:
5929 */
5930 @@ -198,7 +201,7 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
5931 /* We do not accept a shared mapping if it would violate
5932 * cache aliasing constraints.
5933 */
5934 - if ((flags & MAP_SHARED) &&
5935 + if ((filp || (flags & MAP_SHARED)) &&
5936 ((addr - (pgoff << PAGE_SHIFT)) & (SHMLBA - 1)))
5937 return -EINVAL;
5938 return addr;
5939 @@ -219,8 +222,7 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
5940 addr = PAGE_ALIGN(addr);
5941
5942 vma = find_vma(mm, addr);
5943 - if (task_size - len >= addr &&
5944 - (!vma || addr + len <= vma->vm_start))
5945 + if (task_size - len >= addr && check_heap_stack_gap(vma, addr, len))
5946 return addr;
5947 }
5948
5949 @@ -241,7 +243,7 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
5950 /* make sure it can fit in the remaining address space */
5951 if (likely(addr > len)) {
5952 vma = find_vma(mm, addr-len);
5953 - if (!vma || addr <= vma->vm_start) {
5954 + if (check_heap_stack_gap(vma, addr - len, len)) {
5955 /* remember the address as a hint for next time */
5956 return (mm->free_area_cache = addr-len);
5957 }
5958 @@ -250,18 +252,18 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
5959 if (unlikely(mm->mmap_base < len))
5960 goto bottomup;
5961
5962 - addr = mm->mmap_base-len;
5963 - if (do_color_align)
5964 - addr = COLOUR_ALIGN_DOWN(addr, pgoff);
5965 + addr = mm->mmap_base - len;
5966
5967 do {
5968 + if (do_color_align)
5969 + addr = COLOUR_ALIGN_DOWN(addr, pgoff);
5970 /*
5971 * Lookup failure means no vma is above this address,
5972 * else if new region fits below vma->vm_start,
5973 * return with success:
5974 */
5975 vma = find_vma(mm, addr);
5976 - if (likely(!vma || addr+len <= vma->vm_start)) {
5977 + if (likely(check_heap_stack_gap(vma, addr, len))) {
5978 /* remember the address as a hint for next time */
5979 return (mm->free_area_cache = addr);
5980 }
5981 @@ -271,10 +273,8 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
5982 mm->cached_hole_size = vma->vm_start - addr;
5983
5984 /* try just below the current vma->vm_start */
5985 - addr = vma->vm_start-len;
5986 - if (do_color_align)
5987 - addr = COLOUR_ALIGN_DOWN(addr, pgoff);
5988 - } while (likely(len < vma->vm_start));
5989 + addr = skip_heap_stack_gap(vma, len);
5990 + } while (!IS_ERR_VALUE(addr));
5991
5992 bottomup:
5993 /*
5994 @@ -373,6 +373,12 @@ void arch_pick_mmap_layout(struct mm_struct *mm)
5995 gap == RLIM_INFINITY ||
5996 sysctl_legacy_va_layout) {
5997 mm->mmap_base = TASK_UNMAPPED_BASE + random_factor;
5998 +
5999 +#ifdef CONFIG_PAX_RANDMMAP
6000 + if (mm->pax_flags & MF_PAX_RANDMMAP)
6001 + mm->mmap_base += mm->delta_mmap;
6002 +#endif
6003 +
6004 mm->get_unmapped_area = arch_get_unmapped_area;
6005 mm->unmap_area = arch_unmap_area;
6006 } else {
6007 @@ -385,6 +391,12 @@ void arch_pick_mmap_layout(struct mm_struct *mm)
6008 gap = (task_size / 6 * 5);
6009
6010 mm->mmap_base = PAGE_ALIGN(task_size - gap - random_factor);
6011 +
6012 +#ifdef CONFIG_PAX_RANDMMAP
6013 + if (mm->pax_flags & MF_PAX_RANDMMAP)
6014 + mm->mmap_base -= mm->delta_mmap + mm->delta_stack;
6015 +#endif
6016 +
6017 mm->get_unmapped_area = arch_get_unmapped_area_topdown;
6018 mm->unmap_area = arch_unmap_area_topdown;
6019 }
6020 diff --git a/arch/sparc/kernel/syscalls.S b/arch/sparc/kernel/syscalls.S
6021 index 7f5f65d..3308382 100644
6022 --- a/arch/sparc/kernel/syscalls.S
6023 +++ b/arch/sparc/kernel/syscalls.S
6024 @@ -62,7 +62,7 @@ sys32_rt_sigreturn:
6025 #endif
6026 .align 32
6027 1: ldx [%g6 + TI_FLAGS], %l5
6028 - andcc %l5, (_TIF_SYSCALL_TRACE|_TIF_SECCOMP|_TIF_SYSCALL_AUDIT|_TIF_SYSCALL_TRACEPOINT), %g0
6029 + andcc %l5, _TIF_WORK_SYSCALL, %g0
6030 be,pt %icc, rtrap
6031 nop
6032 call syscall_trace_leave
6033 @@ -179,7 +179,7 @@ linux_sparc_syscall32:
6034
6035 srl %i5, 0, %o5 ! IEU1
6036 srl %i2, 0, %o2 ! IEU0 Group
6037 - andcc %l0, (_TIF_SYSCALL_TRACE|_TIF_SECCOMP|_TIF_SYSCALL_AUDIT|_TIF_SYSCALL_TRACEPOINT), %g0
6038 + andcc %l0, _TIF_WORK_SYSCALL, %g0
6039 bne,pn %icc, linux_syscall_trace32 ! CTI
6040 mov %i0, %l5 ! IEU1
6041 call %l7 ! CTI Group brk forced
6042 @@ -202,7 +202,7 @@ linux_sparc_syscall:
6043
6044 mov %i3, %o3 ! IEU1
6045 mov %i4, %o4 ! IEU0 Group
6046 - andcc %l0, (_TIF_SYSCALL_TRACE|_TIF_SECCOMP|_TIF_SYSCALL_AUDIT|_TIF_SYSCALL_TRACEPOINT), %g0
6047 + andcc %l0, _TIF_WORK_SYSCALL, %g0
6048 bne,pn %icc, linux_syscall_trace ! CTI Group
6049 mov %i0, %l5 ! IEU0
6050 2: call %l7 ! CTI Group brk forced
6051 @@ -218,7 +218,7 @@ ret_sys_call:
6052
6053 cmp %o0, -ERESTART_RESTARTBLOCK
6054 bgeu,pn %xcc, 1f
6055 - andcc %l0, (_TIF_SYSCALL_TRACE|_TIF_SECCOMP|_TIF_SYSCALL_AUDIT|_TIF_SYSCALL_TRACEPOINT), %g0
6056 + andcc %l0, _TIF_WORK_SYSCALL, %g0
6057 ldx [%sp + PTREGS_OFF + PT_V9_TNPC], %l1 ! pc = npc
6058
6059 2:
6060 diff --git a/arch/sparc/kernel/traps_32.c b/arch/sparc/kernel/traps_32.c
6061 index a5785ea..405c5f7 100644
6062 --- a/arch/sparc/kernel/traps_32.c
6063 +++ b/arch/sparc/kernel/traps_32.c
6064 @@ -44,6 +44,8 @@ static void instruction_dump(unsigned long *pc)
6065 #define __SAVE __asm__ __volatile__("save %sp, -0x40, %sp\n\t")
6066 #define __RESTORE __asm__ __volatile__("restore %g0, %g0, %g0\n\t")
6067
6068 +extern void gr_handle_kernel_exploit(void);
6069 +
6070 void die_if_kernel(char *str, struct pt_regs *regs)
6071 {
6072 static int die_counter;
6073 @@ -76,15 +78,17 @@ void die_if_kernel(char *str, struct pt_regs *regs)
6074 count++ < 30 &&
6075 (((unsigned long) rw) >= PAGE_OFFSET) &&
6076 !(((unsigned long) rw) & 0x7)) {
6077 - printk("Caller[%08lx]: %pS\n", rw->ins[7],
6078 + printk("Caller[%08lx]: %pA\n", rw->ins[7],
6079 (void *) rw->ins[7]);
6080 rw = (struct reg_window32 *)rw->ins[6];
6081 }
6082 }
6083 printk("Instruction DUMP:");
6084 instruction_dump ((unsigned long *) regs->pc);
6085 - if(regs->psr & PSR_PS)
6086 + if(regs->psr & PSR_PS) {
6087 + gr_handle_kernel_exploit();
6088 do_exit(SIGKILL);
6089 + }
6090 do_exit(SIGSEGV);
6091 }
6092
6093 diff --git a/arch/sparc/kernel/traps_64.c b/arch/sparc/kernel/traps_64.c
6094 index 3b05e66..6ea2917 100644
6095 --- a/arch/sparc/kernel/traps_64.c
6096 +++ b/arch/sparc/kernel/traps_64.c
6097 @@ -75,7 +75,7 @@ static void dump_tl1_traplog(struct tl1_traplog *p)
6098 i + 1,
6099 p->trapstack[i].tstate, p->trapstack[i].tpc,
6100 p->trapstack[i].tnpc, p->trapstack[i].tt);
6101 - printk("TRAPLOG: TPC<%pS>\n", (void *) p->trapstack[i].tpc);
6102 + printk("TRAPLOG: TPC<%pA>\n", (void *) p->trapstack[i].tpc);
6103 }
6104 }
6105
6106 @@ -95,6 +95,12 @@ void bad_trap(struct pt_regs *regs, long lvl)
6107
6108 lvl -= 0x100;
6109 if (regs->tstate & TSTATE_PRIV) {
6110 +
6111 +#ifdef CONFIG_PAX_REFCOUNT
6112 + if (lvl == 6)
6113 + pax_report_refcount_overflow(regs);
6114 +#endif
6115 +
6116 sprintf(buffer, "Kernel bad sw trap %lx", lvl);
6117 die_if_kernel(buffer, regs);
6118 }
6119 @@ -113,11 +119,16 @@ void bad_trap(struct pt_regs *regs, long lvl)
6120 void bad_trap_tl1(struct pt_regs *regs, long lvl)
6121 {
6122 char buffer[32];
6123 -
6124 +
6125 if (notify_die(DIE_TRAP_TL1, "bad trap tl1", regs,
6126 0, lvl, SIGTRAP) == NOTIFY_STOP)
6127 return;
6128
6129 +#ifdef CONFIG_PAX_REFCOUNT
6130 + if (lvl == 6)
6131 + pax_report_refcount_overflow(regs);
6132 +#endif
6133 +
6134 dump_tl1_traplog((struct tl1_traplog *)(regs + 1));
6135
6136 sprintf (buffer, "Bad trap %lx at tl>0", lvl);
6137 @@ -1141,7 +1152,7 @@ static void cheetah_log_errors(struct pt_regs *regs, struct cheetah_err_info *in
6138 regs->tpc, regs->tnpc, regs->u_regs[UREG_I7], regs->tstate);
6139 printk("%s" "ERROR(%d): ",
6140 (recoverable ? KERN_WARNING : KERN_CRIT), smp_processor_id());
6141 - printk("TPC<%pS>\n", (void *) regs->tpc);
6142 + printk("TPC<%pA>\n", (void *) regs->tpc);
6143 printk("%s" "ERROR(%d): M_SYND(%lx), E_SYND(%lx)%s%s\n",
6144 (recoverable ? KERN_WARNING : KERN_CRIT), smp_processor_id(),
6145 (afsr & CHAFSR_M_SYNDROME) >> CHAFSR_M_SYNDROME_SHIFT,
6146 @@ -1748,7 +1759,7 @@ void cheetah_plus_parity_error(int type, struct pt_regs *regs)
6147 smp_processor_id(),
6148 (type & 0x1) ? 'I' : 'D',
6149 regs->tpc);
6150 - printk(KERN_EMERG "TPC<%pS>\n", (void *) regs->tpc);
6151 + printk(KERN_EMERG "TPC<%pA>\n", (void *) regs->tpc);
6152 panic("Irrecoverable Cheetah+ parity error.");
6153 }
6154
6155 @@ -1756,7 +1767,7 @@ void cheetah_plus_parity_error(int type, struct pt_regs *regs)
6156 smp_processor_id(),
6157 (type & 0x1) ? 'I' : 'D',
6158 regs->tpc);
6159 - printk(KERN_WARNING "TPC<%pS>\n", (void *) regs->tpc);
6160 + printk(KERN_WARNING "TPC<%pA>\n", (void *) regs->tpc);
6161 }
6162
6163 struct sun4v_error_entry {
6164 @@ -1963,9 +1974,9 @@ void sun4v_itlb_error_report(struct pt_regs *regs, int tl)
6165
6166 printk(KERN_EMERG "SUN4V-ITLB: Error at TPC[%lx], tl %d\n",
6167 regs->tpc, tl);
6168 - printk(KERN_EMERG "SUN4V-ITLB: TPC<%pS>\n", (void *) regs->tpc);
6169 + printk(KERN_EMERG "SUN4V-ITLB: TPC<%pA>\n", (void *) regs->tpc);
6170 printk(KERN_EMERG "SUN4V-ITLB: O7[%lx]\n", regs->u_regs[UREG_I7]);
6171 - printk(KERN_EMERG "SUN4V-ITLB: O7<%pS>\n",
6172 + printk(KERN_EMERG "SUN4V-ITLB: O7<%pA>\n",
6173 (void *) regs->u_regs[UREG_I7]);
6174 printk(KERN_EMERG "SUN4V-ITLB: vaddr[%lx] ctx[%lx] "
6175 "pte[%lx] error[%lx]\n",
6176 @@ -1987,9 +1998,9 @@ void sun4v_dtlb_error_report(struct pt_regs *regs, int tl)
6177
6178 printk(KERN_EMERG "SUN4V-DTLB: Error at TPC[%lx], tl %d\n",
6179 regs->tpc, tl);
6180 - printk(KERN_EMERG "SUN4V-DTLB: TPC<%pS>\n", (void *) regs->tpc);
6181 + printk(KERN_EMERG "SUN4V-DTLB: TPC<%pA>\n", (void *) regs->tpc);
6182 printk(KERN_EMERG "SUN4V-DTLB: O7[%lx]\n", regs->u_regs[UREG_I7]);
6183 - printk(KERN_EMERG "SUN4V-DTLB: O7<%pS>\n",
6184 + printk(KERN_EMERG "SUN4V-DTLB: O7<%pA>\n",
6185 (void *) regs->u_regs[UREG_I7]);
6186 printk(KERN_EMERG "SUN4V-DTLB: vaddr[%lx] ctx[%lx] "
6187 "pte[%lx] error[%lx]\n",
6188 @@ -2195,13 +2206,13 @@ void show_stack(struct task_struct *tsk, unsigned long *_ksp)
6189 fp = (unsigned long)sf->fp + STACK_BIAS;
6190 }
6191
6192 - printk(" [%016lx] %pS\n", pc, (void *) pc);
6193 + printk(" [%016lx] %pA\n", pc, (void *) pc);
6194 #ifdef CONFIG_FUNCTION_GRAPH_TRACER
6195 if ((pc + 8UL) == (unsigned long) &return_to_handler) {
6196 int index = tsk->curr_ret_stack;
6197 if (tsk->ret_stack && index >= graph) {
6198 pc = tsk->ret_stack[index - graph].ret;
6199 - printk(" [%016lx] %pS\n", pc, (void *) pc);
6200 + printk(" [%016lx] %pA\n", pc, (void *) pc);
6201 graph++;
6202 }
6203 }
6204 @@ -2226,6 +2237,8 @@ static inline struct reg_window *kernel_stack_up(struct reg_window *rw)
6205 return (struct reg_window *) (fp + STACK_BIAS);
6206 }
6207
6208 +extern void gr_handle_kernel_exploit(void);
6209 +
6210 void die_if_kernel(char *str, struct pt_regs *regs)
6211 {
6212 static int die_counter;
6213 @@ -2254,7 +2267,7 @@ void die_if_kernel(char *str, struct pt_regs *regs)
6214 while (rw &&
6215 count++ < 30 &&
6216 kstack_valid(tp, (unsigned long) rw)) {
6217 - printk("Caller[%016lx]: %pS\n", rw->ins[7],
6218 + printk("Caller[%016lx]: %pA\n", rw->ins[7],
6219 (void *) rw->ins[7]);
6220
6221 rw = kernel_stack_up(rw);
6222 @@ -2267,8 +2280,10 @@ void die_if_kernel(char *str, struct pt_regs *regs)
6223 }
6224 user_instruction_dump ((unsigned int __user *) regs->tpc);
6225 }
6226 - if (regs->tstate & TSTATE_PRIV)
6227 + if (regs->tstate & TSTATE_PRIV) {
6228 + gr_handle_kernel_exploit();
6229 do_exit(SIGKILL);
6230 + }
6231 do_exit(SIGSEGV);
6232 }
6233 EXPORT_SYMBOL(die_if_kernel);
6234 diff --git a/arch/sparc/kernel/unaligned_64.c b/arch/sparc/kernel/unaligned_64.c
6235 index f81d038..e7a4680 100644
6236 --- a/arch/sparc/kernel/unaligned_64.c
6237 +++ b/arch/sparc/kernel/unaligned_64.c
6238 @@ -278,7 +278,7 @@ static void log_unaligned(struct pt_regs *regs)
6239 static DEFINE_RATELIMIT_STATE(ratelimit, 5 * HZ, 5);
6240
6241 if (__ratelimit(&ratelimit)) {
6242 - printk("Kernel unaligned access at TPC[%lx] %pS\n",
6243 + printk("Kernel unaligned access at TPC[%lx] %pA\n",
6244 regs->tpc, (void *) regs->tpc);
6245 }
6246 }
6247 diff --git a/arch/sparc/lib/Makefile b/arch/sparc/lib/Makefile
6248 index dff4096..bd9a388 100644
6249 --- a/arch/sparc/lib/Makefile
6250 +++ b/arch/sparc/lib/Makefile
6251 @@ -2,7 +2,7 @@
6252 #
6253
6254 asflags-y := -ansi -DST_DIV0=0x02
6255 -ccflags-y := -Werror
6256 +#ccflags-y := -Werror
6257
6258 lib-$(CONFIG_SPARC32) += ashrdi3.o
6259 lib-$(CONFIG_SPARC32) += memcpy.o memset.o
6260 diff --git a/arch/sparc/lib/atomic_64.S b/arch/sparc/lib/atomic_64.S
6261 index 4d502da..527c48d 100644
6262 --- a/arch/sparc/lib/atomic_64.S
6263 +++ b/arch/sparc/lib/atomic_64.S
6264 @@ -17,7 +17,12 @@
6265 ENTRY(atomic_add) /* %o0 = increment, %o1 = atomic_ptr */
6266 BACKOFF_SETUP(%o2)
6267 1: lduw [%o1], %g1
6268 - add %g1, %o0, %g7
6269 + addcc %g1, %o0, %g7
6270 +
6271 +#ifdef CONFIG_PAX_REFCOUNT
6272 + tvs %icc, 6
6273 +#endif
6274 +
6275 cas [%o1], %g1, %g7
6276 cmp %g1, %g7
6277 bne,pn %icc, BACKOFF_LABEL(2f, 1b)
6278 @@ -27,10 +32,28 @@ ENTRY(atomic_add) /* %o0 = increment, %o1 = atomic_ptr */
6279 2: BACKOFF_SPIN(%o2, %o3, 1b)
6280 ENDPROC(atomic_add)
6281
6282 +ENTRY(atomic_add_unchecked) /* %o0 = increment, %o1 = atomic_ptr */
6283 + BACKOFF_SETUP(%o2)
6284 +1: lduw [%o1], %g1
6285 + add %g1, %o0, %g7
6286 + cas [%o1], %g1, %g7
6287 + cmp %g1, %g7
6288 + bne,pn %icc, 2f
6289 + nop
6290 + retl
6291 + nop
6292 +2: BACKOFF_SPIN(%o2, %o3, 1b)
6293 +ENDPROC(atomic_add_unchecked)
6294 +
6295 ENTRY(atomic_sub) /* %o0 = decrement, %o1 = atomic_ptr */
6296 BACKOFF_SETUP(%o2)
6297 1: lduw [%o1], %g1
6298 - sub %g1, %o0, %g7
6299 + subcc %g1, %o0, %g7
6300 +
6301 +#ifdef CONFIG_PAX_REFCOUNT
6302 + tvs %icc, 6
6303 +#endif
6304 +
6305 cas [%o1], %g1, %g7
6306 cmp %g1, %g7
6307 bne,pn %icc, BACKOFF_LABEL(2f, 1b)
6308 @@ -40,10 +63,28 @@ ENTRY(atomic_sub) /* %o0 = decrement, %o1 = atomic_ptr */
6309 2: BACKOFF_SPIN(%o2, %o3, 1b)
6310 ENDPROC(atomic_sub)
6311
6312 +ENTRY(atomic_sub_unchecked) /* %o0 = decrement, %o1 = atomic_ptr */
6313 + BACKOFF_SETUP(%o2)
6314 +1: lduw [%o1], %g1
6315 + sub %g1, %o0, %g7
6316 + cas [%o1], %g1, %g7
6317 + cmp %g1, %g7
6318 + bne,pn %icc, 2f
6319 + nop
6320 + retl
6321 + nop
6322 +2: BACKOFF_SPIN(%o2, %o3, 1b)
6323 +ENDPROC(atomic_sub_unchecked)
6324 +
6325 ENTRY(atomic_add_ret) /* %o0 = increment, %o1 = atomic_ptr */
6326 BACKOFF_SETUP(%o2)
6327 1: lduw [%o1], %g1
6328 - add %g1, %o0, %g7
6329 + addcc %g1, %o0, %g7
6330 +
6331 +#ifdef CONFIG_PAX_REFCOUNT
6332 + tvs %icc, 6
6333 +#endif
6334 +
6335 cas [%o1], %g1, %g7
6336 cmp %g1, %g7
6337 bne,pn %icc, BACKOFF_LABEL(2f, 1b)
6338 @@ -53,10 +94,29 @@ ENTRY(atomic_add_ret) /* %o0 = increment, %o1 = atomic_ptr */
6339 2: BACKOFF_SPIN(%o2, %o3, 1b)
6340 ENDPROC(atomic_add_ret)
6341
6342 +ENTRY(atomic_add_ret_unchecked) /* %o0 = increment, %o1 = atomic_ptr */
6343 + BACKOFF_SETUP(%o2)
6344 +1: lduw [%o1], %g1
6345 + addcc %g1, %o0, %g7
6346 + cas [%o1], %g1, %g7
6347 + cmp %g1, %g7
6348 + bne,pn %icc, 2f
6349 + add %g7, %o0, %g7
6350 + sra %g7, 0, %o0
6351 + retl
6352 + nop
6353 +2: BACKOFF_SPIN(%o2, %o3, 1b)
6354 +ENDPROC(atomic_add_ret_unchecked)
6355 +
6356 ENTRY(atomic_sub_ret) /* %o0 = decrement, %o1 = atomic_ptr */
6357 BACKOFF_SETUP(%o2)
6358 1: lduw [%o1], %g1
6359 - sub %g1, %o0, %g7
6360 + subcc %g1, %o0, %g7
6361 +
6362 +#ifdef CONFIG_PAX_REFCOUNT
6363 + tvs %icc, 6
6364 +#endif
6365 +
6366 cas [%o1], %g1, %g7
6367 cmp %g1, %g7
6368 bne,pn %icc, BACKOFF_LABEL(2f, 1b)
6369 @@ -69,7 +129,12 @@ ENDPROC(atomic_sub_ret)
6370 ENTRY(atomic64_add) /* %o0 = increment, %o1 = atomic_ptr */
6371 BACKOFF_SETUP(%o2)
6372 1: ldx [%o1], %g1
6373 - add %g1, %o0, %g7
6374 + addcc %g1, %o0, %g7
6375 +
6376 +#ifdef CONFIG_PAX_REFCOUNT
6377 + tvs %xcc, 6
6378 +#endif
6379 +
6380 casx [%o1], %g1, %g7
6381 cmp %g1, %g7
6382 bne,pn %xcc, BACKOFF_LABEL(2f, 1b)
6383 @@ -79,10 +144,28 @@ ENTRY(atomic64_add) /* %o0 = increment, %o1 = atomic_ptr */
6384 2: BACKOFF_SPIN(%o2, %o3, 1b)
6385 ENDPROC(atomic64_add)
6386
6387 +ENTRY(atomic64_add_unchecked) /* %o0 = increment, %o1 = atomic_ptr */
6388 + BACKOFF_SETUP(%o2)
6389 +1: ldx [%o1], %g1
6390 + addcc %g1, %o0, %g7
6391 + casx [%o1], %g1, %g7
6392 + cmp %g1, %g7
6393 + bne,pn %xcc, 2f
6394 + nop
6395 + retl
6396 + nop
6397 +2: BACKOFF_SPIN(%o2, %o3, 1b)
6398 +ENDPROC(atomic64_add_unchecked)
6399 +
6400 ENTRY(atomic64_sub) /* %o0 = decrement, %o1 = atomic_ptr */
6401 BACKOFF_SETUP(%o2)
6402 1: ldx [%o1], %g1
6403 - sub %g1, %o0, %g7
6404 + subcc %g1, %o0, %g7
6405 +
6406 +#ifdef CONFIG_PAX_REFCOUNT
6407 + tvs %xcc, 6
6408 +#endif
6409 +
6410 casx [%o1], %g1, %g7
6411 cmp %g1, %g7
6412 bne,pn %xcc, BACKOFF_LABEL(2f, 1b)
6413 @@ -92,10 +175,28 @@ ENTRY(atomic64_sub) /* %o0 = decrement, %o1 = atomic_ptr */
6414 2: BACKOFF_SPIN(%o2, %o3, 1b)
6415 ENDPROC(atomic64_sub)
6416
6417 +ENTRY(atomic64_sub_unchecked) /* %o0 = decrement, %o1 = atomic_ptr */
6418 + BACKOFF_SETUP(%o2)
6419 +1: ldx [%o1], %g1
6420 + subcc %g1, %o0, %g7
6421 + casx [%o1], %g1, %g7
6422 + cmp %g1, %g7
6423 + bne,pn %xcc, 2f
6424 + nop
6425 + retl
6426 + nop
6427 +2: BACKOFF_SPIN(%o2, %o3, 1b)
6428 +ENDPROC(atomic64_sub_unchecked)
6429 +
6430 ENTRY(atomic64_add_ret) /* %o0 = increment, %o1 = atomic_ptr */
6431 BACKOFF_SETUP(%o2)
6432 1: ldx [%o1], %g1
6433 - add %g1, %o0, %g7
6434 + addcc %g1, %o0, %g7
6435 +
6436 +#ifdef CONFIG_PAX_REFCOUNT
6437 + tvs %xcc, 6
6438 +#endif
6439 +
6440 casx [%o1], %g1, %g7
6441 cmp %g1, %g7
6442 bne,pn %xcc, BACKOFF_LABEL(2f, 1b)
6443 @@ -105,10 +206,29 @@ ENTRY(atomic64_add_ret) /* %o0 = increment, %o1 = atomic_ptr */
6444 2: BACKOFF_SPIN(%o2, %o3, 1b)
6445 ENDPROC(atomic64_add_ret)
6446
6447 +ENTRY(atomic64_add_ret_unchecked) /* %o0 = increment, %o1 = atomic_ptr */
6448 + BACKOFF_SETUP(%o2)
6449 +1: ldx [%o1], %g1
6450 + addcc %g1, %o0, %g7
6451 + casx [%o1], %g1, %g7
6452 + cmp %g1, %g7
6453 + bne,pn %xcc, 2f
6454 + add %g7, %o0, %g7
6455 + mov %g7, %o0
6456 + retl
6457 + nop
6458 +2: BACKOFF_SPIN(%o2, %o3, 1b)
6459 +ENDPROC(atomic64_add_ret_unchecked)
6460 +
6461 ENTRY(atomic64_sub_ret) /* %o0 = decrement, %o1 = atomic_ptr */
6462 BACKOFF_SETUP(%o2)
6463 1: ldx [%o1], %g1
6464 - sub %g1, %o0, %g7
6465 + subcc %g1, %o0, %g7
6466 +
6467 +#ifdef CONFIG_PAX_REFCOUNT
6468 + tvs %xcc, 6
6469 +#endif
6470 +
6471 casx [%o1], %g1, %g7
6472 cmp %g1, %g7
6473 bne,pn %xcc, BACKOFF_LABEL(2f, 1b)
6474 diff --git a/arch/sparc/lib/ksyms.c b/arch/sparc/lib/ksyms.c
6475 index 3b31218..345c609 100644
6476 --- a/arch/sparc/lib/ksyms.c
6477 +++ b/arch/sparc/lib/ksyms.c
6478 @@ -109,12 +109,18 @@ EXPORT_SYMBOL(__downgrade_write);
6479
6480 /* Atomic counter implementation. */
6481 EXPORT_SYMBOL(atomic_add);
6482 +EXPORT_SYMBOL(atomic_add_unchecked);
6483 EXPORT_SYMBOL(atomic_add_ret);
6484 +EXPORT_SYMBOL(atomic_add_ret_unchecked);
6485 EXPORT_SYMBOL(atomic_sub);
6486 +EXPORT_SYMBOL(atomic_sub_unchecked);
6487 EXPORT_SYMBOL(atomic_sub_ret);
6488 EXPORT_SYMBOL(atomic64_add);
6489 +EXPORT_SYMBOL(atomic64_add_unchecked);
6490 EXPORT_SYMBOL(atomic64_add_ret);
6491 +EXPORT_SYMBOL(atomic64_add_ret_unchecked);
6492 EXPORT_SYMBOL(atomic64_sub);
6493 +EXPORT_SYMBOL(atomic64_sub_unchecked);
6494 EXPORT_SYMBOL(atomic64_sub_ret);
6495
6496 /* Atomic bit operations. */
6497 diff --git a/arch/sparc/mm/Makefile b/arch/sparc/mm/Makefile
6498 index 30c3ecc..736f015 100644
6499 --- a/arch/sparc/mm/Makefile
6500 +++ b/arch/sparc/mm/Makefile
6501 @@ -2,7 +2,7 @@
6502 #
6503
6504 asflags-y := -ansi
6505 -ccflags-y := -Werror
6506 +#ccflags-y := -Werror
6507
6508 obj-$(CONFIG_SPARC64) += ultra.o tlb.o tsb.o gup.o
6509 obj-y += fault_$(BITS).o
6510 diff --git a/arch/sparc/mm/fault_32.c b/arch/sparc/mm/fault_32.c
6511 index 77ac917..baf45db 100644
6512 --- a/arch/sparc/mm/fault_32.c
6513 +++ b/arch/sparc/mm/fault_32.c
6514 @@ -21,6 +21,9 @@
6515 #include <linux/perf_event.h>
6516 #include <linux/interrupt.h>
6517 #include <linux/kdebug.h>
6518 +#include <linux/slab.h>
6519 +#include <linux/pagemap.h>
6520 +#include <linux/compiler.h>
6521
6522 #include <asm/page.h>
6523 #include <asm/pgtable.h>
6524 @@ -159,6 +162,277 @@ static unsigned long compute_si_addr(struct pt_regs *regs, int text_fault)
6525 return safe_compute_effective_address(regs, insn);
6526 }
6527
6528 +#ifdef CONFIG_PAX_PAGEEXEC
6529 +#ifdef CONFIG_PAX_DLRESOLVE
6530 +static void pax_emuplt_close(struct vm_area_struct *vma)
6531 +{
6532 + vma->vm_mm->call_dl_resolve = 0UL;
6533 +}
6534 +
6535 +static int pax_emuplt_fault(struct vm_area_struct *vma, struct vm_fault *vmf)
6536 +{
6537 + unsigned int *kaddr;
6538 +
6539 + vmf->page = alloc_page(GFP_HIGHUSER);
6540 + if (!vmf->page)
6541 + return VM_FAULT_OOM;
6542 +
6543 + kaddr = kmap(vmf->page);
6544 + memset(kaddr, 0, PAGE_SIZE);
6545 + kaddr[0] = 0x9DE3BFA8U; /* save */
6546 + flush_dcache_page(vmf->page);
6547 + kunmap(vmf->page);
6548 + return VM_FAULT_MAJOR;
6549 +}
6550 +
6551 +static const struct vm_operations_struct pax_vm_ops = {
6552 + .close = pax_emuplt_close,
6553 + .fault = pax_emuplt_fault
6554 +};
6555 +
6556 +static int pax_insert_vma(struct vm_area_struct *vma, unsigned long addr)
6557 +{
6558 + int ret;
6559 +
6560 + INIT_LIST_HEAD(&vma->anon_vma_chain);
6561 + vma->vm_mm = current->mm;
6562 + vma->vm_start = addr;
6563 + vma->vm_end = addr + PAGE_SIZE;
6564 + vma->vm_flags = VM_READ | VM_EXEC | VM_MAYREAD | VM_MAYEXEC;
6565 + vma->vm_page_prot = vm_get_page_prot(vma->vm_flags);
6566 + vma->vm_ops = &pax_vm_ops;
6567 +
6568 + ret = insert_vm_struct(current->mm, vma);
6569 + if (ret)
6570 + return ret;
6571 +
6572 + ++current->mm->total_vm;
6573 + return 0;
6574 +}
6575 +#endif
6576 +
6577 +/*
6578 + * PaX: decide what to do with offenders (regs->pc = fault address)
6579 + *
6580 + * returns 1 when task should be killed
6581 + * 2 when patched PLT trampoline was detected
6582 + * 3 when unpatched PLT trampoline was detected
6583 + */
6584 +static int pax_handle_fetch_fault(struct pt_regs *regs)
6585 +{
6586 +
6587 +#ifdef CONFIG_PAX_EMUPLT
6588 + int err;
6589 +
6590 + do { /* PaX: patched PLT emulation #1 */
6591 + unsigned int sethi1, sethi2, jmpl;
6592 +
6593 + err = get_user(sethi1, (unsigned int *)regs->pc);
6594 + err |= get_user(sethi2, (unsigned int *)(regs->pc+4));
6595 + err |= get_user(jmpl, (unsigned int *)(regs->pc+8));
6596 +
6597 + if (err)
6598 + break;
6599 +
6600 + if ((sethi1 & 0xFFC00000U) == 0x03000000U &&
6601 + (sethi2 & 0xFFC00000U) == 0x03000000U &&
6602 + (jmpl & 0xFFFFE000U) == 0x81C06000U)
6603 + {
6604 + unsigned int addr;
6605 +
6606 + regs->u_regs[UREG_G1] = (sethi2 & 0x003FFFFFU) << 10;
6607 + addr = regs->u_regs[UREG_G1];
6608 + addr += (((jmpl | 0xFFFFE000U) ^ 0x00001000U) + 0x00001000U);
6609 + regs->pc = addr;
6610 + regs->npc = addr+4;
6611 + return 2;
6612 + }
6613 + } while (0);
6614 +
6615 + do { /* PaX: patched PLT emulation #2 */
6616 + unsigned int ba;
6617 +
6618 + err = get_user(ba, (unsigned int *)regs->pc);
6619 +
6620 + if (err)
6621 + break;
6622 +
6623 + if ((ba & 0xFFC00000U) == 0x30800000U || (ba & 0xFFF80000U) == 0x30480000U) {
6624 + unsigned int addr;
6625 +
6626 + if ((ba & 0xFFC00000U) == 0x30800000U)
6627 + addr = regs->pc + ((((ba | 0xFFC00000U) ^ 0x00200000U) + 0x00200000U) << 2);
6628 + else
6629 + addr = regs->pc + ((((ba | 0xFFF80000U) ^ 0x00040000U) + 0x00040000U) << 2);
6630 + regs->pc = addr;
6631 + regs->npc = addr+4;
6632 + return 2;
6633 + }
6634 + } while (0);
6635 +
6636 + do { /* PaX: patched PLT emulation #3 */
6637 + unsigned int sethi, bajmpl, nop;
6638 +
6639 + err = get_user(sethi, (unsigned int *)regs->pc);
6640 + err |= get_user(bajmpl, (unsigned int *)(regs->pc+4));
6641 + err |= get_user(nop, (unsigned int *)(regs->pc+8));
6642 +
6643 + if (err)
6644 + break;
6645 +
6646 + if ((sethi & 0xFFC00000U) == 0x03000000U &&
6647 + ((bajmpl & 0xFFFFE000U) == 0x81C06000U || (bajmpl & 0xFFF80000U) == 0x30480000U) &&
6648 + nop == 0x01000000U)
6649 + {
6650 + unsigned int addr;
6651 +
6652 + addr = (sethi & 0x003FFFFFU) << 10;
6653 + regs->u_regs[UREG_G1] = addr;
6654 + if ((bajmpl & 0xFFFFE000U) == 0x81C06000U)
6655 + addr += (((bajmpl | 0xFFFFE000U) ^ 0x00001000U) + 0x00001000U);
6656 + else
6657 + addr = regs->pc + ((((bajmpl | 0xFFF80000U) ^ 0x00040000U) + 0x00040000U) << 2);
6658 + regs->pc = addr;
6659 + regs->npc = addr+4;
6660 + return 2;
6661 + }
6662 + } while (0);
6663 +
6664 + do { /* PaX: unpatched PLT emulation step 1 */
6665 + unsigned int sethi, ba, nop;
6666 +
6667 + err = get_user(sethi, (unsigned int *)regs->pc);
6668 + err |= get_user(ba, (unsigned int *)(regs->pc+4));
6669 + err |= get_user(nop, (unsigned int *)(regs->pc+8));
6670 +
6671 + if (err)
6672 + break;
6673 +
6674 + if ((sethi & 0xFFC00000U) == 0x03000000U &&
6675 + ((ba & 0xFFC00000U) == 0x30800000U || (ba & 0xFFF80000U) == 0x30680000U) &&
6676 + nop == 0x01000000U)
6677 + {
6678 + unsigned int addr, save, call;
6679 +
6680 + if ((ba & 0xFFC00000U) == 0x30800000U)
6681 + addr = regs->pc + 4 + ((((ba | 0xFFC00000U) ^ 0x00200000U) + 0x00200000U) << 2);
6682 + else
6683 + addr = regs->pc + 4 + ((((ba | 0xFFF80000U) ^ 0x00040000U) + 0x00040000U) << 2);
6684 +
6685 + err = get_user(save, (unsigned int *)addr);
6686 + err |= get_user(call, (unsigned int *)(addr+4));
6687 + err |= get_user(nop, (unsigned int *)(addr+8));
6688 + if (err)
6689 + break;
6690 +
6691 +#ifdef CONFIG_PAX_DLRESOLVE
6692 + if (save == 0x9DE3BFA8U &&
6693 + (call & 0xC0000000U) == 0x40000000U &&
6694 + nop == 0x01000000U)
6695 + {
6696 + struct vm_area_struct *vma;
6697 + unsigned long call_dl_resolve;
6698 +
6699 + down_read(&current->mm->mmap_sem);
6700 + call_dl_resolve = current->mm->call_dl_resolve;
6701 + up_read(&current->mm->mmap_sem);
6702 + if (likely(call_dl_resolve))
6703 + goto emulate;
6704 +
6705 + vma = kmem_cache_zalloc(vm_area_cachep, GFP_KERNEL);
6706 +
6707 + down_write(&current->mm->mmap_sem);
6708 + if (current->mm->call_dl_resolve) {
6709 + call_dl_resolve = current->mm->call_dl_resolve;
6710 + up_write(&current->mm->mmap_sem);
6711 + if (vma)
6712 + kmem_cache_free(vm_area_cachep, vma);
6713 + goto emulate;
6714 + }
6715 +
6716 + call_dl_resolve = get_unmapped_area(NULL, 0UL, PAGE_SIZE, 0UL, MAP_PRIVATE);
6717 + if (!vma || (call_dl_resolve & ~PAGE_MASK)) {
6718 + up_write(&current->mm->mmap_sem);
6719 + if (vma)
6720 + kmem_cache_free(vm_area_cachep, vma);
6721 + return 1;
6722 + }
6723 +
6724 + if (pax_insert_vma(vma, call_dl_resolve)) {
6725 + up_write(&current->mm->mmap_sem);
6726 + kmem_cache_free(vm_area_cachep, vma);
6727 + return 1;
6728 + }
6729 +
6730 + current->mm->call_dl_resolve = call_dl_resolve;
6731 + up_write(&current->mm->mmap_sem);
6732 +
6733 +emulate:
6734 + regs->u_regs[UREG_G1] = (sethi & 0x003FFFFFU) << 10;
6735 + regs->pc = call_dl_resolve;
6736 + regs->npc = addr+4;
6737 + return 3;
6738 + }
6739 +#endif
6740 +
6741 + /* PaX: glibc 2.4+ generates sethi/jmpl instead of save/call */
6742 + if ((save & 0xFFC00000U) == 0x05000000U &&
6743 + (call & 0xFFFFE000U) == 0x85C0A000U &&
6744 + nop == 0x01000000U)
6745 + {
6746 + regs->u_regs[UREG_G1] = (sethi & 0x003FFFFFU) << 10;
6747 + regs->u_regs[UREG_G2] = addr + 4;
6748 + addr = (save & 0x003FFFFFU) << 10;
6749 + addr += (((call | 0xFFFFE000U) ^ 0x00001000U) + 0x00001000U);
6750 + regs->pc = addr;
6751 + regs->npc = addr+4;
6752 + return 3;
6753 + }
6754 + }
6755 + } while (0);
6756 +
6757 + do { /* PaX: unpatched PLT emulation step 2 */
6758 + unsigned int save, call, nop;
6759 +
6760 + err = get_user(save, (unsigned int *)(regs->pc-4));
6761 + err |= get_user(call, (unsigned int *)regs->pc);
6762 + err |= get_user(nop, (unsigned int *)(regs->pc+4));
6763 + if (err)
6764 + break;
6765 +
6766 + if (save == 0x9DE3BFA8U &&
6767 + (call & 0xC0000000U) == 0x40000000U &&
6768 + nop == 0x01000000U)
6769 + {
6770 + unsigned int dl_resolve = regs->pc + ((((call | 0xC0000000U) ^ 0x20000000U) + 0x20000000U) << 2);
6771 +
6772 + regs->u_regs[UREG_RETPC] = regs->pc;
6773 + regs->pc = dl_resolve;
6774 + regs->npc = dl_resolve+4;
6775 + return 3;
6776 + }
6777 + } while (0);
6778 +#endif
6779 +
6780 + return 1;
6781 +}
6782 +
6783 +void pax_report_insns(struct pt_regs *regs, void *pc, void *sp)
6784 +{
6785 + unsigned long i;
6786 +
6787 + printk(KERN_ERR "PAX: bytes at PC: ");
6788 + for (i = 0; i < 8; i++) {
6789 + unsigned int c;
6790 + if (get_user(c, (unsigned int *)pc+i))
6791 + printk(KERN_CONT "???????? ");
6792 + else
6793 + printk(KERN_CONT "%08x ", c);
6794 + }
6795 + printk("\n");
6796 +}
6797 +#endif
6798 +
6799 static noinline void do_fault_siginfo(int code, int sig, struct pt_regs *regs,
6800 int text_fault)
6801 {
6802 @@ -230,6 +504,24 @@ good_area:
6803 if (!(vma->vm_flags & VM_WRITE))
6804 goto bad_area;
6805 } else {
6806 +
6807 +#ifdef CONFIG_PAX_PAGEEXEC
6808 + if ((mm->pax_flags & MF_PAX_PAGEEXEC) && text_fault && !(vma->vm_flags & VM_EXEC)) {
6809 + up_read(&mm->mmap_sem);
6810 + switch (pax_handle_fetch_fault(regs)) {
6811 +
6812 +#ifdef CONFIG_PAX_EMUPLT
6813 + case 2:
6814 + case 3:
6815 + return;
6816 +#endif
6817 +
6818 + }
6819 + pax_report_fault(regs, (void *)regs->pc, (void *)regs->u_regs[UREG_FP]);
6820 + do_group_exit(SIGKILL);
6821 + }
6822 +#endif
6823 +
6824 /* Allow reads even for write-only mappings */
6825 if (!(vma->vm_flags & (VM_READ | VM_EXEC)))
6826 goto bad_area;
6827 diff --git a/arch/sparc/mm/fault_64.c b/arch/sparc/mm/fault_64.c
6828 index 1fe0429..8dd5dd5 100644
6829 --- a/arch/sparc/mm/fault_64.c
6830 +++ b/arch/sparc/mm/fault_64.c
6831 @@ -21,6 +21,9 @@
6832 #include <linux/kprobes.h>
6833 #include <linux/kdebug.h>
6834 #include <linux/percpu.h>
6835 +#include <linux/slab.h>
6836 +#include <linux/pagemap.h>
6837 +#include <linux/compiler.h>
6838
6839 #include <asm/page.h>
6840 #include <asm/pgtable.h>
6841 @@ -74,7 +77,7 @@ static void __kprobes bad_kernel_pc(struct pt_regs *regs, unsigned long vaddr)
6842 printk(KERN_CRIT "OOPS: Bogus kernel PC [%016lx] in fault handler\n",
6843 regs->tpc);
6844 printk(KERN_CRIT "OOPS: RPC [%016lx]\n", regs->u_regs[15]);
6845 - printk("OOPS: RPC <%pS>\n", (void *) regs->u_regs[15]);
6846 + printk("OOPS: RPC <%pA>\n", (void *) regs->u_regs[15]);
6847 printk(KERN_CRIT "OOPS: Fault was to vaddr[%lx]\n", vaddr);
6848 dump_stack();
6849 unhandled_fault(regs->tpc, current, regs);
6850 @@ -272,6 +275,466 @@ static void noinline __kprobes bogus_32bit_fault_address(struct pt_regs *regs,
6851 show_regs(regs);
6852 }
6853
6854 +#ifdef CONFIG_PAX_PAGEEXEC
6855 +#ifdef CONFIG_PAX_DLRESOLVE
6856 +static void pax_emuplt_close(struct vm_area_struct *vma)
6857 +{
6858 + vma->vm_mm->call_dl_resolve = 0UL;
6859 +}
6860 +
6861 +static int pax_emuplt_fault(struct vm_area_struct *vma, struct vm_fault *vmf)
6862 +{
6863 + unsigned int *kaddr;
6864 +
6865 + vmf->page = alloc_page(GFP_HIGHUSER);
6866 + if (!vmf->page)
6867 + return VM_FAULT_OOM;
6868 +
6869 + kaddr = kmap(vmf->page);
6870 + memset(kaddr, 0, PAGE_SIZE);
6871 + kaddr[0] = 0x9DE3BFA8U; /* save */
6872 + flush_dcache_page(vmf->page);
6873 + kunmap(vmf->page);
6874 + return VM_FAULT_MAJOR;
6875 +}
6876 +
6877 +static const struct vm_operations_struct pax_vm_ops = {
6878 + .close = pax_emuplt_close,
6879 + .fault = pax_emuplt_fault
6880 +};
6881 +
6882 +static int pax_insert_vma(struct vm_area_struct *vma, unsigned long addr)
6883 +{
6884 + int ret;
6885 +
6886 + INIT_LIST_HEAD(&vma->anon_vma_chain);
6887 + vma->vm_mm = current->mm;
6888 + vma->vm_start = addr;
6889 + vma->vm_end = addr + PAGE_SIZE;
6890 + vma->vm_flags = VM_READ | VM_EXEC | VM_MAYREAD | VM_MAYEXEC;
6891 + vma->vm_page_prot = vm_get_page_prot(vma->vm_flags);
6892 + vma->vm_ops = &pax_vm_ops;
6893 +
6894 + ret = insert_vm_struct(current->mm, vma);
6895 + if (ret)
6896 + return ret;
6897 +
6898 + ++current->mm->total_vm;
6899 + return 0;
6900 +}
6901 +#endif
6902 +
6903 +/*
6904 + * PaX: decide what to do with offenders (regs->tpc = fault address)
6905 + *
6906 + * returns 1 when task should be killed
6907 + * 2 when patched PLT trampoline was detected
6908 + * 3 when unpatched PLT trampoline was detected
6909 + */
6910 +static int pax_handle_fetch_fault(struct pt_regs *regs)
6911 +{
6912 +
6913 +#ifdef CONFIG_PAX_EMUPLT
6914 + int err;
6915 +
6916 + do { /* PaX: patched PLT emulation #1 */
6917 + unsigned int sethi1, sethi2, jmpl;
6918 +
6919 + err = get_user(sethi1, (unsigned int *)regs->tpc);
6920 + err |= get_user(sethi2, (unsigned int *)(regs->tpc+4));
6921 + err |= get_user(jmpl, (unsigned int *)(regs->tpc+8));
6922 +
6923 + if (err)
6924 + break;
6925 +
6926 + if ((sethi1 & 0xFFC00000U) == 0x03000000U &&
6927 + (sethi2 & 0xFFC00000U) == 0x03000000U &&
6928 + (jmpl & 0xFFFFE000U) == 0x81C06000U)
6929 + {
6930 + unsigned long addr;
6931 +
6932 + regs->u_regs[UREG_G1] = (sethi2 & 0x003FFFFFU) << 10;
6933 + addr = regs->u_regs[UREG_G1];
6934 + addr += (((jmpl | 0xFFFFFFFFFFFFE000UL) ^ 0x00001000UL) + 0x00001000UL);
6935 +
6936 + if (test_thread_flag(TIF_32BIT))
6937 + addr &= 0xFFFFFFFFUL;
6938 +
6939 + regs->tpc = addr;
6940 + regs->tnpc = addr+4;
6941 + return 2;
6942 + }
6943 + } while (0);
6944 +
6945 + do { /* PaX: patched PLT emulation #2 */
6946 + unsigned int ba;
6947 +
6948 + err = get_user(ba, (unsigned int *)regs->tpc);
6949 +
6950 + if (err)
6951 + break;
6952 +
6953 + if ((ba & 0xFFC00000U) == 0x30800000U || (ba & 0xFFF80000U) == 0x30480000U) {
6954 + unsigned long addr;
6955 +
6956 + if ((ba & 0xFFC00000U) == 0x30800000U)
6957 + addr = regs->tpc + ((((ba | 0xFFFFFFFFFFC00000UL) ^ 0x00200000UL) + 0x00200000UL) << 2);
6958 + else
6959 + addr = regs->tpc + ((((ba | 0xFFFFFFFFFFF80000UL) ^ 0x00040000UL) + 0x00040000UL) << 2);
6960 +
6961 + if (test_thread_flag(TIF_32BIT))
6962 + addr &= 0xFFFFFFFFUL;
6963 +
6964 + regs->tpc = addr;
6965 + regs->tnpc = addr+4;
6966 + return 2;
6967 + }
6968 + } while (0);
6969 +
6970 + do { /* PaX: patched PLT emulation #3 */
6971 + unsigned int sethi, bajmpl, nop;
6972 +
6973 + err = get_user(sethi, (unsigned int *)regs->tpc);
6974 + err |= get_user(bajmpl, (unsigned int *)(regs->tpc+4));
6975 + err |= get_user(nop, (unsigned int *)(regs->tpc+8));
6976 +
6977 + if (err)
6978 + break;
6979 +
6980 + if ((sethi & 0xFFC00000U) == 0x03000000U &&
6981 + ((bajmpl & 0xFFFFE000U) == 0x81C06000U || (bajmpl & 0xFFF80000U) == 0x30480000U) &&
6982 + nop == 0x01000000U)
6983 + {
6984 + unsigned long addr;
6985 +
6986 + addr = (sethi & 0x003FFFFFU) << 10;
6987 + regs->u_regs[UREG_G1] = addr;
6988 + if ((bajmpl & 0xFFFFE000U) == 0x81C06000U)
6989 + addr += (((bajmpl | 0xFFFFFFFFFFFFE000UL) ^ 0x00001000UL) + 0x00001000UL);
6990 + else
6991 + addr = regs->tpc + ((((bajmpl | 0xFFFFFFFFFFF80000UL) ^ 0x00040000UL) + 0x00040000UL) << 2);
6992 +
6993 + if (test_thread_flag(TIF_32BIT))
6994 + addr &= 0xFFFFFFFFUL;
6995 +
6996 + regs->tpc = addr;
6997 + regs->tnpc = addr+4;
6998 + return 2;
6999 + }
7000 + } while (0);
7001 +
7002 + do { /* PaX: patched PLT emulation #4 */
7003 + unsigned int sethi, mov1, call, mov2;
7004 +
7005 + err = get_user(sethi, (unsigned int *)regs->tpc);
7006 + err |= get_user(mov1, (unsigned int *)(regs->tpc+4));
7007 + err |= get_user(call, (unsigned int *)(regs->tpc+8));
7008 + err |= get_user(mov2, (unsigned int *)(regs->tpc+12));
7009 +
7010 + if (err)
7011 + break;
7012 +
7013 + if ((sethi & 0xFFC00000U) == 0x03000000U &&
7014 + mov1 == 0x8210000FU &&
7015 + (call & 0xC0000000U) == 0x40000000U &&
7016 + mov2 == 0x9E100001U)
7017 + {
7018 + unsigned long addr;
7019 +
7020 + regs->u_regs[UREG_G1] = regs->u_regs[UREG_RETPC];
7021 + addr = regs->tpc + 4 + ((((call | 0xFFFFFFFFC0000000UL) ^ 0x20000000UL) + 0x20000000UL) << 2);
7022 +
7023 + if (test_thread_flag(TIF_32BIT))
7024 + addr &= 0xFFFFFFFFUL;
7025 +
7026 + regs->tpc = addr;
7027 + regs->tnpc = addr+4;
7028 + return 2;
7029 + }
7030 + } while (0);
7031 +
7032 + do { /* PaX: patched PLT emulation #5 */
7033 + unsigned int sethi, sethi1, sethi2, or1, or2, sllx, jmpl, nop;
7034 +
7035 + err = get_user(sethi, (unsigned int *)regs->tpc);
7036 + err |= get_user(sethi1, (unsigned int *)(regs->tpc+4));
7037 + err |= get_user(sethi2, (unsigned int *)(regs->tpc+8));
7038 + err |= get_user(or1, (unsigned int *)(regs->tpc+12));
7039 + err |= get_user(or2, (unsigned int *)(regs->tpc+16));
7040 + err |= get_user(sllx, (unsigned int *)(regs->tpc+20));
7041 + err |= get_user(jmpl, (unsigned int *)(regs->tpc+24));
7042 + err |= get_user(nop, (unsigned int *)(regs->tpc+28));
7043 +
7044 + if (err)
7045 + break;
7046 +
7047 + if ((sethi & 0xFFC00000U) == 0x03000000U &&
7048 + (sethi1 & 0xFFC00000U) == 0x03000000U &&
7049 + (sethi2 & 0xFFC00000U) == 0x0B000000U &&
7050 + (or1 & 0xFFFFE000U) == 0x82106000U &&
7051 + (or2 & 0xFFFFE000U) == 0x8A116000U &&
7052 + sllx == 0x83287020U &&
7053 + jmpl == 0x81C04005U &&
7054 + nop == 0x01000000U)
7055 + {
7056 + unsigned long addr;
7057 +
7058 + regs->u_regs[UREG_G1] = ((sethi1 & 0x003FFFFFU) << 10) | (or1 & 0x000003FFU);
7059 + regs->u_regs[UREG_G1] <<= 32;
7060 + regs->u_regs[UREG_G5] = ((sethi2 & 0x003FFFFFU) << 10) | (or2 & 0x000003FFU);
7061 + addr = regs->u_regs[UREG_G1] + regs->u_regs[UREG_G5];
7062 + regs->tpc = addr;
7063 + regs->tnpc = addr+4;
7064 + return 2;
7065 + }
7066 + } while (0);
7067 +
7068 + do { /* PaX: patched PLT emulation #6 */
7069 + unsigned int sethi, sethi1, sethi2, sllx, or, jmpl, nop;
7070 +
7071 + err = get_user(sethi, (unsigned int *)regs->tpc);
7072 + err |= get_user(sethi1, (unsigned int *)(regs->tpc+4));
7073 + err |= get_user(sethi2, (unsigned int *)(regs->tpc+8));
7074 + err |= get_user(sllx, (unsigned int *)(regs->tpc+12));
7075 + err |= get_user(or, (unsigned int *)(regs->tpc+16));
7076 + err |= get_user(jmpl, (unsigned int *)(regs->tpc+20));
7077 + err |= get_user(nop, (unsigned int *)(regs->tpc+24));
7078 +
7079 + if (err)
7080 + break;
7081 +
7082 + if ((sethi & 0xFFC00000U) == 0x03000000U &&
7083 + (sethi1 & 0xFFC00000U) == 0x03000000U &&
7084 + (sethi2 & 0xFFC00000U) == 0x0B000000U &&
7085 + sllx == 0x83287020U &&
7086 + (or & 0xFFFFE000U) == 0x8A116000U &&
7087 + jmpl == 0x81C04005U &&
7088 + nop == 0x01000000U)
7089 + {
7090 + unsigned long addr;
7091 +
7092 + regs->u_regs[UREG_G1] = (sethi1 & 0x003FFFFFU) << 10;
7093 + regs->u_regs[UREG_G1] <<= 32;
7094 + regs->u_regs[UREG_G5] = ((sethi2 & 0x003FFFFFU) << 10) | (or & 0x3FFU);
7095 + addr = regs->u_regs[UREG_G1] + regs->u_regs[UREG_G5];
7096 + regs->tpc = addr;
7097 + regs->tnpc = addr+4;
7098 + return 2;
7099 + }
7100 + } while (0);
7101 +
7102 + do { /* PaX: unpatched PLT emulation step 1 */
7103 + unsigned int sethi, ba, nop;
7104 +
7105 + err = get_user(sethi, (unsigned int *)regs->tpc);
7106 + err |= get_user(ba, (unsigned int *)(regs->tpc+4));
7107 + err |= get_user(nop, (unsigned int *)(regs->tpc+8));
7108 +
7109 + if (err)
7110 + break;
7111 +
7112 + if ((sethi & 0xFFC00000U) == 0x03000000U &&
7113 + ((ba & 0xFFC00000U) == 0x30800000U || (ba & 0xFFF80000U) == 0x30680000U) &&
7114 + nop == 0x01000000U)
7115 + {
7116 + unsigned long addr;
7117 + unsigned int save, call;
7118 + unsigned int sethi1, sethi2, or1, or2, sllx, add, jmpl;
7119 +
7120 + if ((ba & 0xFFC00000U) == 0x30800000U)
7121 + addr = regs->tpc + 4 + ((((ba | 0xFFFFFFFFFFC00000UL) ^ 0x00200000UL) + 0x00200000UL) << 2);
7122 + else
7123 + addr = regs->tpc + 4 + ((((ba | 0xFFFFFFFFFFF80000UL) ^ 0x00040000UL) + 0x00040000UL) << 2);
7124 +
7125 + if (test_thread_flag(TIF_32BIT))
7126 + addr &= 0xFFFFFFFFUL;
7127 +
7128 + err = get_user(save, (unsigned int *)addr);
7129 + err |= get_user(call, (unsigned int *)(addr+4));
7130 + err |= get_user(nop, (unsigned int *)(addr+8));
7131 + if (err)
7132 + break;
7133 +
7134 +#ifdef CONFIG_PAX_DLRESOLVE
7135 + if (save == 0x9DE3BFA8U &&
7136 + (call & 0xC0000000U) == 0x40000000U &&
7137 + nop == 0x01000000U)
7138 + {
7139 + struct vm_area_struct *vma;
7140 + unsigned long call_dl_resolve;
7141 +
7142 + down_read(&current->mm->mmap_sem);
7143 + call_dl_resolve = current->mm->call_dl_resolve;
7144 + up_read(&current->mm->mmap_sem);
7145 + if (likely(call_dl_resolve))
7146 + goto emulate;
7147 +
7148 + vma = kmem_cache_zalloc(vm_area_cachep, GFP_KERNEL);
7149 +
7150 + down_write(&current->mm->mmap_sem);
7151 + if (current->mm->call_dl_resolve) {
7152 + call_dl_resolve = current->mm->call_dl_resolve;
7153 + up_write(&current->mm->mmap_sem);
7154 + if (vma)
7155 + kmem_cache_free(vm_area_cachep, vma);
7156 + goto emulate;
7157 + }
7158 +
7159 + call_dl_resolve = get_unmapped_area(NULL, 0UL, PAGE_SIZE, 0UL, MAP_PRIVATE);
7160 + if (!vma || (call_dl_resolve & ~PAGE_MASK)) {
7161 + up_write(&current->mm->mmap_sem);
7162 + if (vma)
7163 + kmem_cache_free(vm_area_cachep, vma);
7164 + return 1;
7165 + }
7166 +
7167 + if (pax_insert_vma(vma, call_dl_resolve)) {
7168 + up_write(&current->mm->mmap_sem);
7169 + kmem_cache_free(vm_area_cachep, vma);
7170 + return 1;
7171 + }
7172 +
7173 + current->mm->call_dl_resolve = call_dl_resolve;
7174 + up_write(&current->mm->mmap_sem);
7175 +
7176 +emulate:
7177 + regs->u_regs[UREG_G1] = (sethi & 0x003FFFFFU) << 10;
7178 + regs->tpc = call_dl_resolve;
7179 + regs->tnpc = addr+4;
7180 + return 3;
7181 + }
7182 +#endif
7183 +
7184 + /* PaX: glibc 2.4+ generates sethi/jmpl instead of save/call */
7185 + if ((save & 0xFFC00000U) == 0x05000000U &&
7186 + (call & 0xFFFFE000U) == 0x85C0A000U &&
7187 + nop == 0x01000000U)
7188 + {
7189 + regs->u_regs[UREG_G1] = (sethi & 0x003FFFFFU) << 10;
7190 + regs->u_regs[UREG_G2] = addr + 4;
7191 + addr = (save & 0x003FFFFFU) << 10;
7192 + addr += (((call | 0xFFFFFFFFFFFFE000UL) ^ 0x00001000UL) + 0x00001000UL);
7193 +
7194 + if (test_thread_flag(TIF_32BIT))
7195 + addr &= 0xFFFFFFFFUL;
7196 +
7197 + regs->tpc = addr;
7198 + regs->tnpc = addr+4;
7199 + return 3;
7200 + }
7201 +
7202 + /* PaX: 64-bit PLT stub */
7203 + err = get_user(sethi1, (unsigned int *)addr);
7204 + err |= get_user(sethi2, (unsigned int *)(addr+4));
7205 + err |= get_user(or1, (unsigned int *)(addr+8));
7206 + err |= get_user(or2, (unsigned int *)(addr+12));
7207 + err |= get_user(sllx, (unsigned int *)(addr+16));
7208 + err |= get_user(add, (unsigned int *)(addr+20));
7209 + err |= get_user(jmpl, (unsigned int *)(addr+24));
7210 + err |= get_user(nop, (unsigned int *)(addr+28));
7211 + if (err)
7212 + break;
7213 +
7214 + if ((sethi1 & 0xFFC00000U) == 0x09000000U &&
7215 + (sethi2 & 0xFFC00000U) == 0x0B000000U &&
7216 + (or1 & 0xFFFFE000U) == 0x88112000U &&
7217 + (or2 & 0xFFFFE000U) == 0x8A116000U &&
7218 + sllx == 0x89293020U &&
7219 + add == 0x8A010005U &&
7220 + jmpl == 0x89C14000U &&
7221 + nop == 0x01000000U)
7222 + {
7223 + regs->u_regs[UREG_G1] = (sethi & 0x003FFFFFU) << 10;
7224 + regs->u_regs[UREG_G4] = ((sethi1 & 0x003FFFFFU) << 10) | (or1 & 0x000003FFU);
7225 + regs->u_regs[UREG_G4] <<= 32;
7226 + regs->u_regs[UREG_G5] = ((sethi2 & 0x003FFFFFU) << 10) | (or2 & 0x000003FFU);
7227 + regs->u_regs[UREG_G5] += regs->u_regs[UREG_G4];
7228 + regs->u_regs[UREG_G4] = addr + 24;
7229 + addr = regs->u_regs[UREG_G5];
7230 + regs->tpc = addr;
7231 + regs->tnpc = addr+4;
7232 + return 3;
7233 + }
7234 + }
7235 + } while (0);
7236 +
7237 +#ifdef CONFIG_PAX_DLRESOLVE
7238 + do { /* PaX: unpatched PLT emulation step 2 */
7239 + unsigned int save, call, nop;
7240 +
7241 + err = get_user(save, (unsigned int *)(regs->tpc-4));
7242 + err |= get_user(call, (unsigned int *)regs->tpc);
7243 + err |= get_user(nop, (unsigned int *)(regs->tpc+4));
7244 + if (err)
7245 + break;
7246 +
7247 + if (save == 0x9DE3BFA8U &&
7248 + (call & 0xC0000000U) == 0x40000000U &&
7249 + nop == 0x01000000U)
7250 + {
7251 + unsigned long dl_resolve = regs->tpc + ((((call | 0xFFFFFFFFC0000000UL) ^ 0x20000000UL) + 0x20000000UL) << 2);
7252 +
7253 + if (test_thread_flag(TIF_32BIT))
7254 + dl_resolve &= 0xFFFFFFFFUL;
7255 +
7256 + regs->u_regs[UREG_RETPC] = regs->tpc;
7257 + regs->tpc = dl_resolve;
7258 + regs->tnpc = dl_resolve+4;
7259 + return 3;
7260 + }
7261 + } while (0);
7262 +#endif
7263 +
7264 + do { /* PaX: patched PLT emulation #7, must be AFTER the unpatched PLT emulation */
7265 + unsigned int sethi, ba, nop;
7266 +
7267 + err = get_user(sethi, (unsigned int *)regs->tpc);
7268 + err |= get_user(ba, (unsigned int *)(regs->tpc+4));
7269 + err |= get_user(nop, (unsigned int *)(regs->tpc+8));
7270 +
7271 + if (err)
7272 + break;
7273 +
7274 + if ((sethi & 0xFFC00000U) == 0x03000000U &&
7275 + (ba & 0xFFF00000U) == 0x30600000U &&
7276 + nop == 0x01000000U)
7277 + {
7278 + unsigned long addr;
7279 +
7280 + addr = (sethi & 0x003FFFFFU) << 10;
7281 + regs->u_regs[UREG_G1] = addr;
7282 + addr = regs->tpc + ((((ba | 0xFFFFFFFFFFF80000UL) ^ 0x00040000UL) + 0x00040000UL) << 2);
7283 +
7284 + if (test_thread_flag(TIF_32BIT))
7285 + addr &= 0xFFFFFFFFUL;
7286 +
7287 + regs->tpc = addr;
7288 + regs->tnpc = addr+4;
7289 + return 2;
7290 + }
7291 + } while (0);
7292 +
7293 +#endif
7294 +
7295 + return 1;
7296 +}
7297 +
7298 +void pax_report_insns(struct pt_regs *regs, void *pc, void *sp)
7299 +{
7300 + unsigned long i;
7301 +
7302 + printk(KERN_ERR "PAX: bytes at PC: ");
7303 + for (i = 0; i < 8; i++) {
7304 + unsigned int c;
7305 + if (get_user(c, (unsigned int *)pc+i))
7306 + printk(KERN_CONT "???????? ");
7307 + else
7308 + printk(KERN_CONT "%08x ", c);
7309 + }
7310 + printk("\n");
7311 +}
7312 +#endif
7313 +
7314 asmlinkage void __kprobes do_sparc64_fault(struct pt_regs *regs)
7315 {
7316 struct mm_struct *mm = current->mm;
7317 @@ -343,6 +806,29 @@ retry:
7318 if (!vma)
7319 goto bad_area;
7320
7321 +#ifdef CONFIG_PAX_PAGEEXEC
7322 + /* PaX: detect ITLB misses on non-exec pages */
7323 + if ((mm->pax_flags & MF_PAX_PAGEEXEC) && vma->vm_start <= address &&
7324 + !(vma->vm_flags & VM_EXEC) && (fault_code & FAULT_CODE_ITLB))
7325 + {
7326 + if (address != regs->tpc)
7327 + goto good_area;
7328 +
7329 + up_read(&mm->mmap_sem);
7330 + switch (pax_handle_fetch_fault(regs)) {
7331 +
7332 +#ifdef CONFIG_PAX_EMUPLT
7333 + case 2:
7334 + case 3:
7335 + return;
7336 +#endif
7337 +
7338 + }
7339 + pax_report_fault(regs, (void *)regs->tpc, (void *)(regs->u_regs[UREG_FP] + STACK_BIAS));
7340 + do_group_exit(SIGKILL);
7341 + }
7342 +#endif
7343 +
7344 /* Pure DTLB misses do not tell us whether the fault causing
7345 * load/store/atomic was a write or not, it only says that there
7346 * was no match. So in such a case we (carefully) read the
7347 diff --git a/arch/sparc/mm/hugetlbpage.c b/arch/sparc/mm/hugetlbpage.c
7348 index 07e1453..0a7d9e9 100644
7349 --- a/arch/sparc/mm/hugetlbpage.c
7350 +++ b/arch/sparc/mm/hugetlbpage.c
7351 @@ -67,7 +67,7 @@ full_search:
7352 }
7353 return -ENOMEM;
7354 }
7355 - if (likely(!vma || addr + len <= vma->vm_start)) {
7356 + if (likely(check_heap_stack_gap(vma, addr, len))) {
7357 /*
7358 * Remember the place where we stopped the search:
7359 */
7360 @@ -106,7 +106,7 @@ hugetlb_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
7361 /* make sure it can fit in the remaining address space */
7362 if (likely(addr > len)) {
7363 vma = find_vma(mm, addr-len);
7364 - if (!vma || addr <= vma->vm_start) {
7365 + if (check_heap_stack_gap(vma, addr - len, len)) {
7366 /* remember the address as a hint for next time */
7367 return (mm->free_area_cache = addr-len);
7368 }
7369 @@ -115,16 +115,17 @@ hugetlb_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
7370 if (unlikely(mm->mmap_base < len))
7371 goto bottomup;
7372
7373 - addr = (mm->mmap_base-len) & HPAGE_MASK;
7374 + addr = mm->mmap_base - len;
7375
7376 do {
7377 + addr &= HPAGE_MASK;
7378 /*
7379 * Lookup failure means no vma is above this address,
7380 * else if new region fits below vma->vm_start,
7381 * return with success:
7382 */
7383 vma = find_vma(mm, addr);
7384 - if (likely(!vma || addr+len <= vma->vm_start)) {
7385 + if (likely(check_heap_stack_gap(vma, addr, len))) {
7386 /* remember the address as a hint for next time */
7387 return (mm->free_area_cache = addr);
7388 }
7389 @@ -134,8 +135,8 @@ hugetlb_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
7390 mm->cached_hole_size = vma->vm_start - addr;
7391
7392 /* try just below the current vma->vm_start */
7393 - addr = (vma->vm_start-len) & HPAGE_MASK;
7394 - } while (likely(len < vma->vm_start));
7395 + addr = skip_heap_stack_gap(vma, len);
7396 + } while (!IS_ERR_VALUE(addr));
7397
7398 bottomup:
7399 /*
7400 @@ -181,8 +182,7 @@ hugetlb_get_unmapped_area(struct file *file, unsigned long addr,
7401 if (addr) {
7402 addr = ALIGN(addr, HPAGE_SIZE);
7403 vma = find_vma(mm, addr);
7404 - if (task_size - len >= addr &&
7405 - (!vma || addr + len <= vma->vm_start))
7406 + if (task_size - len >= addr && check_heap_stack_gap(vma, addr, len))
7407 return addr;
7408 }
7409 if (mm->get_unmapped_area == arch_get_unmapped_area)
7410 diff --git a/arch/tile/include/asm/atomic_64.h b/arch/tile/include/asm/atomic_64.h
7411 index f4500c6..889656c 100644
7412 --- a/arch/tile/include/asm/atomic_64.h
7413 +++ b/arch/tile/include/asm/atomic_64.h
7414 @@ -143,6 +143,16 @@ static inline long atomic64_add_unless(atomic64_t *v, long a, long u)
7415
7416 #define atomic64_inc_not_zero(v) atomic64_add_unless((v), 1, 0)
7417
7418 +#define atomic64_read_unchecked(v) atomic64_read(v)
7419 +#define atomic64_set_unchecked(v, i) atomic64_set((v), (i))
7420 +#define atomic64_add_unchecked(a, v) atomic64_add((a), (v))
7421 +#define atomic64_add_return_unchecked(a, v) atomic64_add_return((a), (v))
7422 +#define atomic64_sub_unchecked(a, v) atomic64_sub((a), (v))
7423 +#define atomic64_inc_unchecked(v) atomic64_inc(v)
7424 +#define atomic64_inc_return_unchecked(v) atomic64_inc_return(v)
7425 +#define atomic64_dec_unchecked(v) atomic64_dec(v)
7426 +#define atomic64_cmpxchg_unchecked(v, o, n) atomic64_cmpxchg((v), (o), (n))
7427 +
7428 /* Atomic dec and inc don't implement barrier, so provide them if needed. */
7429 #define smp_mb__before_atomic_dec() smp_mb()
7430 #define smp_mb__after_atomic_dec() smp_mb()
7431 diff --git a/arch/tile/include/asm/cache.h b/arch/tile/include/asm/cache.h
7432 index a9a5299..0fce79e 100644
7433 --- a/arch/tile/include/asm/cache.h
7434 +++ b/arch/tile/include/asm/cache.h
7435 @@ -15,11 +15,12 @@
7436 #ifndef _ASM_TILE_CACHE_H
7437 #define _ASM_TILE_CACHE_H
7438
7439 +#include <linux/const.h>
7440 #include <arch/chip.h>
7441
7442 /* bytes per L1 data cache line */
7443 #define L1_CACHE_SHIFT CHIP_L1D_LOG_LINE_SIZE()
7444 -#define L1_CACHE_BYTES (1 << L1_CACHE_SHIFT)
7445 +#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT)
7446
7447 /* bytes per L2 cache line */
7448 #define L2_CACHE_SHIFT CHIP_L2_LOG_LINE_SIZE()
7449 diff --git a/arch/tile/include/asm/uaccess.h b/arch/tile/include/asm/uaccess.h
7450 index 9ab078a..d6635c2 100644
7451 --- a/arch/tile/include/asm/uaccess.h
7452 +++ b/arch/tile/include/asm/uaccess.h
7453 @@ -403,9 +403,9 @@ static inline unsigned long __must_check copy_from_user(void *to,
7454 const void __user *from,
7455 unsigned long n)
7456 {
7457 - int sz = __compiletime_object_size(to);
7458 + size_t sz = __compiletime_object_size(to);
7459
7460 - if (likely(sz == -1 || sz >= n))
7461 + if (likely(sz == (size_t)-1 || sz >= n))
7462 n = _copy_from_user(to, from, n);
7463 else
7464 copy_from_user_overflow();
7465 diff --git a/arch/um/Makefile b/arch/um/Makefile
7466 index 0970910..9f65c40 100644
7467 --- a/arch/um/Makefile
7468 +++ b/arch/um/Makefile
7469 @@ -62,6 +62,10 @@ USER_CFLAGS = $(patsubst $(KERNEL_DEFINES),,$(patsubst -D__KERNEL__,,\
7470 $(patsubst -I%,,$(KBUILD_CFLAGS)))) $(ARCH_INCLUDE) $(MODE_INCLUDE) \
7471 $(filter -I%,$(CFLAGS)) -D_FILE_OFFSET_BITS=64 -idirafter include
7472
7473 +ifdef CONSTIFY_PLUGIN
7474 +USER_CFLAGS += -fplugin-arg-constify_plugin-no-constify
7475 +endif
7476 +
7477 #This will adjust *FLAGS accordingly to the platform.
7478 include $(srctree)/$(ARCH_DIR)/Makefile-os-$(OS)
7479
7480 diff --git a/arch/um/include/asm/cache.h b/arch/um/include/asm/cache.h
7481 index 19e1bdd..3665b77 100644
7482 --- a/arch/um/include/asm/cache.h
7483 +++ b/arch/um/include/asm/cache.h
7484 @@ -1,6 +1,7 @@
7485 #ifndef __UM_CACHE_H
7486 #define __UM_CACHE_H
7487
7488 +#include <linux/const.h>
7489
7490 #if defined(CONFIG_UML_X86) && !defined(CONFIG_64BIT)
7491 # define L1_CACHE_SHIFT (CONFIG_X86_L1_CACHE_SHIFT)
7492 @@ -12,6 +13,6 @@
7493 # define L1_CACHE_SHIFT 5
7494 #endif
7495
7496 -#define L1_CACHE_BYTES (1 << L1_CACHE_SHIFT)
7497 +#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT)
7498
7499 #endif
7500 diff --git a/arch/um/include/asm/kmap_types.h b/arch/um/include/asm/kmap_types.h
7501 index 2e0a6b1..a64d0f5 100644
7502 --- a/arch/um/include/asm/kmap_types.h
7503 +++ b/arch/um/include/asm/kmap_types.h
7504 @@ -8,6 +8,6 @@
7505
7506 /* No more #include "asm/arch/kmap_types.h" ! */
7507
7508 -#define KM_TYPE_NR 14
7509 +#define KM_TYPE_NR 15
7510
7511 #endif
7512 diff --git a/arch/um/include/asm/page.h b/arch/um/include/asm/page.h
7513 index 7cfc3ce..cbd1a58 100644
7514 --- a/arch/um/include/asm/page.h
7515 +++ b/arch/um/include/asm/page.h
7516 @@ -14,6 +14,9 @@
7517 #define PAGE_SIZE (_AC(1, UL) << PAGE_SHIFT)
7518 #define PAGE_MASK (~(PAGE_SIZE-1))
7519
7520 +#define ktla_ktva(addr) (addr)
7521 +#define ktva_ktla(addr) (addr)
7522 +
7523 #ifndef __ASSEMBLY__
7524
7525 struct page;
7526 diff --git a/arch/um/include/asm/pgtable-3level.h b/arch/um/include/asm/pgtable-3level.h
7527 index 0032f92..cd151e0 100644
7528 --- a/arch/um/include/asm/pgtable-3level.h
7529 +++ b/arch/um/include/asm/pgtable-3level.h
7530 @@ -58,6 +58,7 @@
7531 #define pud_present(x) (pud_val(x) & _PAGE_PRESENT)
7532 #define pud_populate(mm, pud, pmd) \
7533 set_pud(pud, __pud(_PAGE_TABLE + __pa(pmd)))
7534 +#define pud_populate_kernel(mm, pud, pmd) pud_populate((mm), (pud), (pmd))
7535
7536 #ifdef CONFIG_64BIT
7537 #define set_pud(pudptr, pudval) set_64bit((u64 *) (pudptr), pud_val(pudval))
7538 diff --git a/arch/um/kernel/process.c b/arch/um/kernel/process.c
7539 index c5f5afa..6abce4b 100644
7540 --- a/arch/um/kernel/process.c
7541 +++ b/arch/um/kernel/process.c
7542 @@ -402,22 +402,6 @@ int singlestepping(void * t)
7543 return 2;
7544 }
7545
7546 -/*
7547 - * Only x86 and x86_64 have an arch_align_stack().
7548 - * All other arches have "#define arch_align_stack(x) (x)"
7549 - * in their asm/system.h
7550 - * As this is included in UML from asm-um/system-generic.h,
7551 - * we can use it to behave as the subarch does.
7552 - */
7553 -#ifndef arch_align_stack
7554 -unsigned long arch_align_stack(unsigned long sp)
7555 -{
7556 - if (!(current->personality & ADDR_NO_RANDOMIZE) && randomize_va_space)
7557 - sp -= get_random_int() % 8192;
7558 - return sp & ~0xf;
7559 -}
7560 -#endif
7561 -
7562 unsigned long get_wchan(struct task_struct *p)
7563 {
7564 unsigned long stack_page, sp, ip;
7565 diff --git a/arch/unicore32/include/asm/cache.h b/arch/unicore32/include/asm/cache.h
7566 index ad8f795..2c7eec6 100644
7567 --- a/arch/unicore32/include/asm/cache.h
7568 +++ b/arch/unicore32/include/asm/cache.h
7569 @@ -12,8 +12,10 @@
7570 #ifndef __UNICORE_CACHE_H__
7571 #define __UNICORE_CACHE_H__
7572
7573 -#define L1_CACHE_SHIFT (5)
7574 -#define L1_CACHE_BYTES (1 << L1_CACHE_SHIFT)
7575 +#include <linux/const.h>
7576 +
7577 +#define L1_CACHE_SHIFT 5
7578 +#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT)
7579
7580 /*
7581 * Memory returned by kmalloc() may be used for DMA, so we must make
7582 diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig
7583 index 50a1d1f..c26369f 100644
7584 --- a/arch/x86/Kconfig
7585 +++ b/arch/x86/Kconfig
7586 @@ -220,7 +220,7 @@ config X86_HT
7587
7588 config X86_32_LAZY_GS
7589 def_bool y
7590 - depends on X86_32 && !CC_STACKPROTECTOR
7591 + depends on X86_32 && !CC_STACKPROTECTOR && !PAX_MEMORY_UDEREF
7592
7593 config ARCH_HWEIGHT_CFLAGS
7594 string
7595 @@ -1049,7 +1049,7 @@ choice
7596
7597 config NOHIGHMEM
7598 bool "off"
7599 - depends on !X86_NUMAQ
7600 + depends on !X86_NUMAQ && !(PAX_PAGEEXEC && PAX_ENABLE_PAE)
7601 ---help---
7602 Linux can use up to 64 Gigabytes of physical memory on x86 systems.
7603 However, the address space of 32-bit x86 processors is only 4
7604 @@ -1086,7 +1086,7 @@ config NOHIGHMEM
7605
7606 config HIGHMEM4G
7607 bool "4GB"
7608 - depends on !X86_NUMAQ
7609 + depends on !X86_NUMAQ && !(PAX_PAGEEXEC && PAX_ENABLE_PAE)
7610 ---help---
7611 Select this if you have a 32-bit processor and between 1 and 4
7612 gigabytes of physical RAM.
7613 @@ -1140,7 +1140,7 @@ config PAGE_OFFSET
7614 hex
7615 default 0xB0000000 if VMSPLIT_3G_OPT
7616 default 0x80000000 if VMSPLIT_2G
7617 - default 0x78000000 if VMSPLIT_2G_OPT
7618 + default 0x70000000 if VMSPLIT_2G_OPT
7619 default 0x40000000 if VMSPLIT_1G
7620 default 0xC0000000
7621 depends on X86_32
7622 @@ -1528,6 +1528,7 @@ config SECCOMP
7623
7624 config CC_STACKPROTECTOR
7625 bool "Enable -fstack-protector buffer overflow detection"
7626 + depends on X86_64 || !PAX_MEMORY_UDEREF
7627 ---help---
7628 This option turns on the -fstack-protector GCC feature. This
7629 feature puts, at the beginning of functions, a canary value on
7630 @@ -1585,6 +1586,7 @@ config KEXEC_JUMP
7631 config PHYSICAL_START
7632 hex "Physical address where the kernel is loaded" if (EXPERT || CRASH_DUMP)
7633 default "0x1000000"
7634 + range 0x400000 0x40000000
7635 ---help---
7636 This gives the physical address where the kernel is loaded.
7637
7638 @@ -1648,6 +1650,7 @@ config X86_NEED_RELOCS
7639 config PHYSICAL_ALIGN
7640 hex "Alignment value to which kernel should be aligned" if X86_32
7641 default "0x1000000"
7642 + range 0x400000 0x1000000 if PAX_KERNEXEC
7643 range 0x2000 0x1000000
7644 ---help---
7645 This value puts the alignment restrictions on physical address
7646 @@ -1679,9 +1682,10 @@ config HOTPLUG_CPU
7647 Say N if you want to disable CPU hotplug.
7648
7649 config COMPAT_VDSO
7650 - def_bool y
7651 + def_bool n
7652 prompt "Compat VDSO support"
7653 depends on X86_32 || IA32_EMULATION
7654 + depends on !PAX_NOEXEC && !PAX_MEMORY_UDEREF
7655 ---help---
7656 Map the 32-bit VDSO to the predictable old-style address too.
7657
7658 diff --git a/arch/x86/Kconfig.cpu b/arch/x86/Kconfig.cpu
7659 index 706e12e..62e4feb 100644
7660 --- a/arch/x86/Kconfig.cpu
7661 +++ b/arch/x86/Kconfig.cpu
7662 @@ -334,7 +334,7 @@ config X86_PPRO_FENCE
7663
7664 config X86_F00F_BUG
7665 def_bool y
7666 - depends on M586MMX || M586TSC || M586 || M486 || M386
7667 + depends on (M586MMX || M586TSC || M586 || M486 || M386) && !PAX_KERNEXEC
7668
7669 config X86_INVD_BUG
7670 def_bool y
7671 @@ -358,7 +358,7 @@ config X86_POPAD_OK
7672
7673 config X86_ALIGNMENT_16
7674 def_bool y
7675 - depends on MWINCHIP3D || MWINCHIPC6 || MCYRIXIII || MELAN || MK6 || M586MMX || M586TSC || M586 || M486 || MVIAC3_2 || MGEODEGX1
7676 + depends on MWINCHIP3D || MWINCHIPC6 || MCYRIXIII || X86_ELAN || MK8 || MK7 || MK6 || MCORE2 || MPENTIUM4 || MPENTIUMIII || MPENTIUMII || M686 || M586MMX || M586TSC || M586 || M486 || MVIAC3_2 || MGEODEGX1
7677
7678 config X86_INTEL_USERCOPY
7679 def_bool y
7680 @@ -404,7 +404,7 @@ config X86_CMPXCHG64
7681 # generates cmov.
7682 config X86_CMOV
7683 def_bool y
7684 - depends on (MK8 || MK7 || MCORE2 || MPENTIUM4 || MPENTIUMM || MPENTIUMIII || MPENTIUMII || M686 || MVIAC3_2 || MVIAC7 || MCRUSOE || MEFFICEON || X86_64 || MATOM || MGEODE_LX)
7685 + depends on (MK8 || MK7 || MCORE2 || MPSC || MPENTIUM4 || MPENTIUMM || MPENTIUMIII || MPENTIUMII || M686 || MVIAC3_2 || MVIAC7 || MCRUSOE || MEFFICEON || X86_64 || MATOM || MGEODE_LX)
7686
7687 config X86_MINIMUM_CPU_FAMILY
7688 int
7689 diff --git a/arch/x86/Kconfig.debug b/arch/x86/Kconfig.debug
7690 index b322f12..652d0d9 100644
7691 --- a/arch/x86/Kconfig.debug
7692 +++ b/arch/x86/Kconfig.debug
7693 @@ -84,7 +84,7 @@ config X86_PTDUMP
7694 config DEBUG_RODATA
7695 bool "Write protect kernel read-only data structures"
7696 default y
7697 - depends on DEBUG_KERNEL
7698 + depends on DEBUG_KERNEL && BROKEN
7699 ---help---
7700 Mark the kernel read-only data as write-protected in the pagetables,
7701 in order to catch accidental (and incorrect) writes to such const
7702 @@ -102,7 +102,7 @@ config DEBUG_RODATA_TEST
7703
7704 config DEBUG_SET_MODULE_RONX
7705 bool "Set loadable kernel module data as NX and text as RO"
7706 - depends on MODULES
7707 + depends on MODULES && BROKEN
7708 ---help---
7709 This option helps catch unintended modifications to loadable
7710 kernel module's text and read-only data. It also prevents execution
7711 @@ -294,7 +294,7 @@ config OPTIMIZE_INLINING
7712
7713 config DEBUG_STRICT_USER_COPY_CHECKS
7714 bool "Strict copy size checks"
7715 - depends on DEBUG_KERNEL && !TRACE_BRANCH_PROFILING
7716 + depends on DEBUG_KERNEL && !TRACE_BRANCH_PROFILING && !PAX_SIZE_OVERFLOW
7717 ---help---
7718 Enabling this option turns a certain set of sanity checks for user
7719 copy operations into compile time failures.
7720 diff --git a/arch/x86/Makefile b/arch/x86/Makefile
7721 index 05afcca..b6ecb51 100644
7722 --- a/arch/x86/Makefile
7723 +++ b/arch/x86/Makefile
7724 @@ -50,6 +50,7 @@ else
7725 UTS_MACHINE := x86_64
7726 CHECKFLAGS += -D__x86_64__ -m64
7727
7728 + biarch := $(call cc-option,-m64)
7729 KBUILD_AFLAGS += -m64
7730 KBUILD_CFLAGS += -m64
7731
7732 @@ -229,3 +230,12 @@ define archhelp
7733 echo ' FDARGS="..." arguments for the booted kernel'
7734 echo ' FDINITRD=file initrd for the booted kernel'
7735 endef
7736 +
7737 +define OLD_LD
7738 +
7739 +*** ${VERSION}.${PATCHLEVEL} PaX kernels no longer build correctly with old versions of binutils.
7740 +*** Please upgrade your binutils to 2.18 or newer
7741 +endef
7742 +
7743 +archprepare:
7744 + $(if $(LDFLAGS_BUILD_ID),,$(error $(OLD_LD)))
7745 diff --git a/arch/x86/boot/Makefile b/arch/x86/boot/Makefile
7746 index f7535be..37db2d1 100644
7747 --- a/arch/x86/boot/Makefile
7748 +++ b/arch/x86/boot/Makefile
7749 @@ -64,6 +64,9 @@ KBUILD_CFLAGS := $(LINUXINCLUDE) -g -Os -D_SETUP -D__KERNEL__ \
7750 $(call cc-option, -fno-stack-protector) \
7751 $(call cc-option, -mpreferred-stack-boundary=2)
7752 KBUILD_CFLAGS += $(call cc-option, -m32)
7753 +ifdef CONSTIFY_PLUGIN
7754 +KBUILD_CFLAGS += -fplugin-arg-constify_plugin-no-constify
7755 +endif
7756 KBUILD_AFLAGS := $(KBUILD_CFLAGS) -D__ASSEMBLY__
7757 GCOV_PROFILE := n
7758
7759 diff --git a/arch/x86/boot/bitops.h b/arch/x86/boot/bitops.h
7760 index 878e4b9..20537ab 100644
7761 --- a/arch/x86/boot/bitops.h
7762 +++ b/arch/x86/boot/bitops.h
7763 @@ -26,7 +26,7 @@ static inline int variable_test_bit(int nr, const void *addr)
7764 u8 v;
7765 const u32 *p = (const u32 *)addr;
7766
7767 - asm("btl %2,%1; setc %0" : "=qm" (v) : "m" (*p), "Ir" (nr));
7768 + asm volatile("btl %2,%1; setc %0" : "=qm" (v) : "m" (*p), "Ir" (nr));
7769 return v;
7770 }
7771
7772 @@ -37,7 +37,7 @@ static inline int variable_test_bit(int nr, const void *addr)
7773
7774 static inline void set_bit(int nr, void *addr)
7775 {
7776 - asm("btsl %1,%0" : "+m" (*(u32 *)addr) : "Ir" (nr));
7777 + asm volatile("btsl %1,%0" : "+m" (*(u32 *)addr) : "Ir" (nr));
7778 }
7779
7780 #endif /* BOOT_BITOPS_H */
7781 diff --git a/arch/x86/boot/boot.h b/arch/x86/boot/boot.h
7782 index 18997e5..83d9c67 100644
7783 --- a/arch/x86/boot/boot.h
7784 +++ b/arch/x86/boot/boot.h
7785 @@ -85,7 +85,7 @@ static inline void io_delay(void)
7786 static inline u16 ds(void)
7787 {
7788 u16 seg;
7789 - asm("movw %%ds,%0" : "=rm" (seg));
7790 + asm volatile("movw %%ds,%0" : "=rm" (seg));
7791 return seg;
7792 }
7793
7794 @@ -181,7 +181,7 @@ static inline void wrgs32(u32 v, addr_t addr)
7795 static inline int memcmp(const void *s1, const void *s2, size_t len)
7796 {
7797 u8 diff;
7798 - asm("repe; cmpsb; setnz %0"
7799 + asm volatile("repe; cmpsb; setnz %0"
7800 : "=qm" (diff), "+D" (s1), "+S" (s2), "+c" (len));
7801 return diff;
7802 }
7803 diff --git a/arch/x86/boot/compressed/Makefile b/arch/x86/boot/compressed/Makefile
7804 index 8a84501..b2d165f 100644
7805 --- a/arch/x86/boot/compressed/Makefile
7806 +++ b/arch/x86/boot/compressed/Makefile
7807 @@ -14,6 +14,9 @@ cflags-$(CONFIG_X86_64) := -mcmodel=small
7808 KBUILD_CFLAGS += $(cflags-y)
7809 KBUILD_CFLAGS += $(call cc-option,-ffreestanding)
7810 KBUILD_CFLAGS += $(call cc-option,-fno-stack-protector)
7811 +ifdef CONSTIFY_PLUGIN
7812 +KBUILD_CFLAGS += -fplugin-arg-constify_plugin-no-constify
7813 +endif
7814
7815 KBUILD_AFLAGS := $(KBUILD_CFLAGS) -D__ASSEMBLY__
7816 GCOV_PROFILE := n
7817 diff --git a/arch/x86/boot/compressed/eboot.c b/arch/x86/boot/compressed/eboot.c
7818 index b3e0227..f2c02d5 100644
7819 --- a/arch/x86/boot/compressed/eboot.c
7820 +++ b/arch/x86/boot/compressed/eboot.c
7821 @@ -142,7 +142,6 @@ again:
7822 *addr = max_addr;
7823 }
7824
7825 -free_pool:
7826 efi_call_phys1(sys_table->boottime->free_pool, map);
7827
7828 fail:
7829 @@ -206,7 +205,6 @@ static efi_status_t low_alloc(unsigned long size, unsigned long align,
7830 if (i == map_size / desc_size)
7831 status = EFI_NOT_FOUND;
7832
7833 -free_pool:
7834 efi_call_phys1(sys_table->boottime->free_pool, map);
7835 fail:
7836 return status;
7837 diff --git a/arch/x86/boot/compressed/head_32.S b/arch/x86/boot/compressed/head_32.S
7838 index aa4aaf1..6656f2f 100644
7839 --- a/arch/x86/boot/compressed/head_32.S
7840 +++ b/arch/x86/boot/compressed/head_32.S
7841 @@ -116,7 +116,7 @@ preferred_addr:
7842 notl %eax
7843 andl %eax, %ebx
7844 #else
7845 - movl $LOAD_PHYSICAL_ADDR, %ebx
7846 + movl $____LOAD_PHYSICAL_ADDR, %ebx
7847 #endif
7848
7849 /* Target address to relocate to for decompression */
7850 @@ -202,7 +202,7 @@ relocated:
7851 * and where it was actually loaded.
7852 */
7853 movl %ebp, %ebx
7854 - subl $LOAD_PHYSICAL_ADDR, %ebx
7855 + subl $____LOAD_PHYSICAL_ADDR, %ebx
7856 jz 2f /* Nothing to be done if loaded at compiled addr. */
7857 /*
7858 * Process relocations.
7859 @@ -210,8 +210,7 @@ relocated:
7860
7861 1: subl $4, %edi
7862 movl (%edi), %ecx
7863 - testl %ecx, %ecx
7864 - jz 2f
7865 + jecxz 2f
7866 addl %ebx, -__PAGE_OFFSET(%ebx, %ecx)
7867 jmp 1b
7868 2:
7869 diff --git a/arch/x86/boot/compressed/head_64.S b/arch/x86/boot/compressed/head_64.S
7870 index 2c4b171..e1fa5b1 100644
7871 --- a/arch/x86/boot/compressed/head_64.S
7872 +++ b/arch/x86/boot/compressed/head_64.S
7873 @@ -91,7 +91,7 @@ ENTRY(startup_32)
7874 notl %eax
7875 andl %eax, %ebx
7876 #else
7877 - movl $LOAD_PHYSICAL_ADDR, %ebx
7878 + movl $____LOAD_PHYSICAL_ADDR, %ebx
7879 #endif
7880
7881 /* Target address to relocate to for decompression */
7882 @@ -273,7 +273,7 @@ preferred_addr:
7883 notq %rax
7884 andq %rax, %rbp
7885 #else
7886 - movq $LOAD_PHYSICAL_ADDR, %rbp
7887 + movq $____LOAD_PHYSICAL_ADDR, %rbp
7888 #endif
7889
7890 /* Target address to relocate to for decompression */
7891 diff --git a/arch/x86/boot/compressed/misc.c b/arch/x86/boot/compressed/misc.c
7892 index 88f7ff6..ed695dd 100644
7893 --- a/arch/x86/boot/compressed/misc.c
7894 +++ b/arch/x86/boot/compressed/misc.c
7895 @@ -303,7 +303,7 @@ static void parse_elf(void *output)
7896 case PT_LOAD:
7897 #ifdef CONFIG_RELOCATABLE
7898 dest = output;
7899 - dest += (phdr->p_paddr - LOAD_PHYSICAL_ADDR);
7900 + dest += (phdr->p_paddr - ____LOAD_PHYSICAL_ADDR);
7901 #else
7902 dest = (void *)(phdr->p_paddr);
7903 #endif
7904 @@ -352,7 +352,7 @@ asmlinkage void decompress_kernel(void *rmode, memptr heap,
7905 error("Destination address too large");
7906 #endif
7907 #ifndef CONFIG_RELOCATABLE
7908 - if ((unsigned long)output != LOAD_PHYSICAL_ADDR)
7909 + if ((unsigned long)output != ____LOAD_PHYSICAL_ADDR)
7910 error("Wrong destination address");
7911 #endif
7912
7913 diff --git a/arch/x86/boot/cpucheck.c b/arch/x86/boot/cpucheck.c
7914 index 4d3ff03..e4972ff 100644
7915 --- a/arch/x86/boot/cpucheck.c
7916 +++ b/arch/x86/boot/cpucheck.c
7917 @@ -74,7 +74,7 @@ static int has_fpu(void)
7918 u16 fcw = -1, fsw = -1;
7919 u32 cr0;
7920
7921 - asm("movl %%cr0,%0" : "=r" (cr0));
7922 + asm volatile("movl %%cr0,%0" : "=r" (cr0));
7923 if (cr0 & (X86_CR0_EM|X86_CR0_TS)) {
7924 cr0 &= ~(X86_CR0_EM|X86_CR0_TS);
7925 asm volatile("movl %0,%%cr0" : : "r" (cr0));
7926 @@ -90,7 +90,7 @@ static int has_eflag(u32 mask)
7927 {
7928 u32 f0, f1;
7929
7930 - asm("pushfl ; "
7931 + asm volatile("pushfl ; "
7932 "pushfl ; "
7933 "popl %0 ; "
7934 "movl %0,%1 ; "
7935 @@ -115,7 +115,7 @@ static void get_flags(void)
7936 set_bit(X86_FEATURE_FPU, cpu.flags);
7937
7938 if (has_eflag(X86_EFLAGS_ID)) {
7939 - asm("cpuid"
7940 + asm volatile("cpuid"
7941 : "=a" (max_intel_level),
7942 "=b" (cpu_vendor[0]),
7943 "=d" (cpu_vendor[1]),
7944 @@ -124,7 +124,7 @@ static void get_flags(void)
7945
7946 if (max_intel_level >= 0x00000001 &&
7947 max_intel_level <= 0x0000ffff) {
7948 - asm("cpuid"
7949 + asm volatile("cpuid"
7950 : "=a" (tfms),
7951 "=c" (cpu.flags[4]),
7952 "=d" (cpu.flags[0])
7953 @@ -136,7 +136,7 @@ static void get_flags(void)
7954 cpu.model += ((tfms >> 16) & 0xf) << 4;
7955 }
7956
7957 - asm("cpuid"
7958 + asm volatile("cpuid"
7959 : "=a" (max_amd_level)
7960 : "a" (0x80000000)
7961 : "ebx", "ecx", "edx");
7962 @@ -144,7 +144,7 @@ static void get_flags(void)
7963 if (max_amd_level >= 0x80000001 &&
7964 max_amd_level <= 0x8000ffff) {
7965 u32 eax = 0x80000001;
7966 - asm("cpuid"
7967 + asm volatile("cpuid"
7968 : "+a" (eax),
7969 "=c" (cpu.flags[6]),
7970 "=d" (cpu.flags[1])
7971 @@ -203,9 +203,9 @@ int check_cpu(int *cpu_level_ptr, int *req_level_ptr, u32 **err_flags_ptr)
7972 u32 ecx = MSR_K7_HWCR;
7973 u32 eax, edx;
7974
7975 - asm("rdmsr" : "=a" (eax), "=d" (edx) : "c" (ecx));
7976 + asm volatile("rdmsr" : "=a" (eax), "=d" (edx) : "c" (ecx));
7977 eax &= ~(1 << 15);
7978 - asm("wrmsr" : : "a" (eax), "d" (edx), "c" (ecx));
7979 + asm volatile("wrmsr" : : "a" (eax), "d" (edx), "c" (ecx));
7980
7981 get_flags(); /* Make sure it really did something */
7982 err = check_flags();
7983 @@ -218,9 +218,9 @@ int check_cpu(int *cpu_level_ptr, int *req_level_ptr, u32 **err_flags_ptr)
7984 u32 ecx = MSR_VIA_FCR;
7985 u32 eax, edx;
7986
7987 - asm("rdmsr" : "=a" (eax), "=d" (edx) : "c" (ecx));
7988 + asm volatile("rdmsr" : "=a" (eax), "=d" (edx) : "c" (ecx));
7989 eax |= (1<<1)|(1<<7);
7990 - asm("wrmsr" : : "a" (eax), "d" (edx), "c" (ecx));
7991 + asm volatile("wrmsr" : : "a" (eax), "d" (edx), "c" (ecx));
7992
7993 set_bit(X86_FEATURE_CX8, cpu.flags);
7994 err = check_flags();
7995 @@ -231,12 +231,12 @@ int check_cpu(int *cpu_level_ptr, int *req_level_ptr, u32 **err_flags_ptr)
7996 u32 eax, edx;
7997 u32 level = 1;
7998
7999 - asm("rdmsr" : "=a" (eax), "=d" (edx) : "c" (ecx));
8000 - asm("wrmsr" : : "a" (~0), "d" (edx), "c" (ecx));
8001 - asm("cpuid"
8002 + asm volatile("rdmsr" : "=a" (eax), "=d" (edx) : "c" (ecx));
8003 + asm volatile("wrmsr" : : "a" (~0), "d" (edx), "c" (ecx));
8004 + asm volatile("cpuid"
8005 : "+a" (level), "=d" (cpu.flags[0])
8006 : : "ecx", "ebx");
8007 - asm("wrmsr" : : "a" (eax), "d" (edx), "c" (ecx));
8008 + asm volatile("wrmsr" : : "a" (eax), "d" (edx), "c" (ecx));
8009
8010 err = check_flags();
8011 }
8012 diff --git a/arch/x86/boot/header.S b/arch/x86/boot/header.S
8013 index b4e15dd..8ac59ce 100644
8014 --- a/arch/x86/boot/header.S
8015 +++ b/arch/x86/boot/header.S
8016 @@ -391,10 +391,14 @@ setup_data: .quad 0 # 64-bit physical pointer to
8017 # single linked list of
8018 # struct setup_data
8019
8020 -pref_address: .quad LOAD_PHYSICAL_ADDR # preferred load addr
8021 +pref_address: .quad ____LOAD_PHYSICAL_ADDR # preferred load addr
8022
8023 #define ZO_INIT_SIZE (ZO__end - ZO_startup_32 + ZO_z_extract_offset)
8024 +#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
8025 +#define VO_INIT_SIZE (VO__end - VO__text - __PAGE_OFFSET - ____LOAD_PHYSICAL_ADDR)
8026 +#else
8027 #define VO_INIT_SIZE (VO__end - VO__text)
8028 +#endif
8029 #if ZO_INIT_SIZE > VO_INIT_SIZE
8030 #define INIT_SIZE ZO_INIT_SIZE
8031 #else
8032 diff --git a/arch/x86/boot/memory.c b/arch/x86/boot/memory.c
8033 index db75d07..8e6d0af 100644
8034 --- a/arch/x86/boot/memory.c
8035 +++ b/arch/x86/boot/memory.c
8036 @@ -19,7 +19,7 @@
8037
8038 static int detect_memory_e820(void)
8039 {
8040 - int count = 0;
8041 + unsigned int count = 0;
8042 struct biosregs ireg, oreg;
8043 struct e820entry *desc = boot_params.e820_map;
8044 static struct e820entry buf; /* static so it is zeroed */
8045 diff --git a/arch/x86/boot/video-vesa.c b/arch/x86/boot/video-vesa.c
8046 index 11e8c6e..fdbb1ed 100644
8047 --- a/arch/x86/boot/video-vesa.c
8048 +++ b/arch/x86/boot/video-vesa.c
8049 @@ -200,6 +200,7 @@ static void vesa_store_pm_info(void)
8050
8051 boot_params.screen_info.vesapm_seg = oreg.es;
8052 boot_params.screen_info.vesapm_off = oreg.di;
8053 + boot_params.screen_info.vesapm_size = oreg.cx;
8054 }
8055
8056 /*
8057 diff --git a/arch/x86/boot/video.c b/arch/x86/boot/video.c
8058 index 43eda28..5ab5fdb 100644
8059 --- a/arch/x86/boot/video.c
8060 +++ b/arch/x86/boot/video.c
8061 @@ -96,7 +96,7 @@ static void store_mode_params(void)
8062 static unsigned int get_entry(void)
8063 {
8064 char entry_buf[4];
8065 - int i, len = 0;
8066 + unsigned int i, len = 0;
8067 int key;
8068 unsigned int v;
8069
8070 diff --git a/arch/x86/crypto/aes-x86_64-asm_64.S b/arch/x86/crypto/aes-x86_64-asm_64.S
8071 index 5b577d5..3c1fed4 100644
8072 --- a/arch/x86/crypto/aes-x86_64-asm_64.S
8073 +++ b/arch/x86/crypto/aes-x86_64-asm_64.S
8074 @@ -8,6 +8,8 @@
8075 * including this sentence is retained in full.
8076 */
8077
8078 +#include <asm/alternative-asm.h>
8079 +
8080 .extern crypto_ft_tab
8081 .extern crypto_it_tab
8082 .extern crypto_fl_tab
8083 @@ -71,6 +73,8 @@ FUNC: movq r1,r2; \
8084 je B192; \
8085 leaq 32(r9),r9;
8086
8087 +#define ret pax_force_retaddr 0, 1; ret
8088 +
8089 #define epilogue(r1,r2,r3,r4,r5,r6,r7,r8,r9) \
8090 movq r1,r2; \
8091 movq r3,r4; \
8092 diff --git a/arch/x86/crypto/aesni-intel_asm.S b/arch/x86/crypto/aesni-intel_asm.S
8093 index 3470624..201259d 100644
8094 --- a/arch/x86/crypto/aesni-intel_asm.S
8095 +++ b/arch/x86/crypto/aesni-intel_asm.S
8096 @@ -31,6 +31,7 @@
8097
8098 #include <linux/linkage.h>
8099 #include <asm/inst.h>
8100 +#include <asm/alternative-asm.h>
8101
8102 #ifdef __x86_64__
8103 .data
8104 @@ -1436,7 +1437,9 @@ _return_T_done_decrypt:
8105 pop %r14
8106 pop %r13
8107 pop %r12
8108 + pax_force_retaddr 0, 1
8109 ret
8110 +ENDPROC(aesni_gcm_dec)
8111
8112
8113 /*****************************************************************************
8114 @@ -1699,7 +1702,9 @@ _return_T_done_encrypt:
8115 pop %r14
8116 pop %r13
8117 pop %r12
8118 + pax_force_retaddr 0, 1
8119 ret
8120 +ENDPROC(aesni_gcm_enc)
8121
8122 #endif
8123
8124 @@ -1714,6 +1719,7 @@ _key_expansion_256a:
8125 pxor %xmm1, %xmm0
8126 movaps %xmm0, (TKEYP)
8127 add $0x10, TKEYP
8128 + pax_force_retaddr_bts
8129 ret
8130
8131 .align 4
8132 @@ -1738,6 +1744,7 @@ _key_expansion_192a:
8133 shufps $0b01001110, %xmm2, %xmm1
8134 movaps %xmm1, 0x10(TKEYP)
8135 add $0x20, TKEYP
8136 + pax_force_retaddr_bts
8137 ret
8138
8139 .align 4
8140 @@ -1757,6 +1764,7 @@ _key_expansion_192b:
8141
8142 movaps %xmm0, (TKEYP)
8143 add $0x10, TKEYP
8144 + pax_force_retaddr_bts
8145 ret
8146
8147 .align 4
8148 @@ -1769,6 +1777,7 @@ _key_expansion_256b:
8149 pxor %xmm1, %xmm2
8150 movaps %xmm2, (TKEYP)
8151 add $0x10, TKEYP
8152 + pax_force_retaddr_bts
8153 ret
8154
8155 /*
8156 @@ -1881,7 +1890,9 @@ ENTRY(aesni_set_key)
8157 #ifndef __x86_64__
8158 popl KEYP
8159 #endif
8160 + pax_force_retaddr 0, 1
8161 ret
8162 +ENDPROC(aesni_set_key)
8163
8164 /*
8165 * void aesni_enc(struct crypto_aes_ctx *ctx, u8 *dst, const u8 *src)
8166 @@ -1902,7 +1913,9 @@ ENTRY(aesni_enc)
8167 popl KLEN
8168 popl KEYP
8169 #endif
8170 + pax_force_retaddr 0, 1
8171 ret
8172 +ENDPROC(aesni_enc)
8173
8174 /*
8175 * _aesni_enc1: internal ABI
8176 @@ -1959,6 +1972,7 @@ _aesni_enc1:
8177 AESENC KEY STATE
8178 movaps 0x70(TKEYP), KEY
8179 AESENCLAST KEY STATE
8180 + pax_force_retaddr_bts
8181 ret
8182
8183 /*
8184 @@ -2067,6 +2081,7 @@ _aesni_enc4:
8185 AESENCLAST KEY STATE2
8186 AESENCLAST KEY STATE3
8187 AESENCLAST KEY STATE4
8188 + pax_force_retaddr_bts
8189 ret
8190
8191 /*
8192 @@ -2089,7 +2104,9 @@ ENTRY(aesni_dec)
8193 popl KLEN
8194 popl KEYP
8195 #endif
8196 + pax_force_retaddr 0, 1
8197 ret
8198 +ENDPROC(aesni_dec)
8199
8200 /*
8201 * _aesni_dec1: internal ABI
8202 @@ -2146,6 +2163,7 @@ _aesni_dec1:
8203 AESDEC KEY STATE
8204 movaps 0x70(TKEYP), KEY
8205 AESDECLAST KEY STATE
8206 + pax_force_retaddr_bts
8207 ret
8208
8209 /*
8210 @@ -2254,6 +2272,7 @@ _aesni_dec4:
8211 AESDECLAST KEY STATE2
8212 AESDECLAST KEY STATE3
8213 AESDECLAST KEY STATE4
8214 + pax_force_retaddr_bts
8215 ret
8216
8217 /*
8218 @@ -2311,7 +2330,9 @@ ENTRY(aesni_ecb_enc)
8219 popl KEYP
8220 popl LEN
8221 #endif
8222 + pax_force_retaddr 0, 1
8223 ret
8224 +ENDPROC(aesni_ecb_enc)
8225
8226 /*
8227 * void aesni_ecb_dec(struct crypto_aes_ctx *ctx, const u8 *dst, u8 *src,
8228 @@ -2369,7 +2390,9 @@ ENTRY(aesni_ecb_dec)
8229 popl KEYP
8230 popl LEN
8231 #endif
8232 + pax_force_retaddr 0, 1
8233 ret
8234 +ENDPROC(aesni_ecb_dec)
8235
8236 /*
8237 * void aesni_cbc_enc(struct crypto_aes_ctx *ctx, const u8 *dst, u8 *src,
8238 @@ -2410,7 +2433,9 @@ ENTRY(aesni_cbc_enc)
8239 popl LEN
8240 popl IVP
8241 #endif
8242 + pax_force_retaddr 0, 1
8243 ret
8244 +ENDPROC(aesni_cbc_enc)
8245
8246 /*
8247 * void aesni_cbc_dec(struct crypto_aes_ctx *ctx, const u8 *dst, u8 *src,
8248 @@ -2500,7 +2525,9 @@ ENTRY(aesni_cbc_dec)
8249 popl LEN
8250 popl IVP
8251 #endif
8252 + pax_force_retaddr 0, 1
8253 ret
8254 +ENDPROC(aesni_cbc_dec)
8255
8256 #ifdef __x86_64__
8257 .align 16
8258 @@ -2526,6 +2553,7 @@ _aesni_inc_init:
8259 mov $1, TCTR_LOW
8260 MOVQ_R64_XMM TCTR_LOW INC
8261 MOVQ_R64_XMM CTR TCTR_LOW
8262 + pax_force_retaddr_bts
8263 ret
8264
8265 /*
8266 @@ -2554,6 +2582,7 @@ _aesni_inc:
8267 .Linc_low:
8268 movaps CTR, IV
8269 PSHUFB_XMM BSWAP_MASK IV
8270 + pax_force_retaddr_bts
8271 ret
8272
8273 /*
8274 @@ -2614,5 +2643,7 @@ ENTRY(aesni_ctr_enc)
8275 .Lctr_enc_ret:
8276 movups IV, (IVP)
8277 .Lctr_enc_just_ret:
8278 + pax_force_retaddr 0, 1
8279 ret
8280 +ENDPROC(aesni_ctr_enc)
8281 #endif
8282 diff --git a/arch/x86/crypto/blowfish-x86_64-asm_64.S b/arch/x86/crypto/blowfish-x86_64-asm_64.S
8283 index 391d245..67f35c2 100644
8284 --- a/arch/x86/crypto/blowfish-x86_64-asm_64.S
8285 +++ b/arch/x86/crypto/blowfish-x86_64-asm_64.S
8286 @@ -20,6 +20,8 @@
8287 *
8288 */
8289
8290 +#include <asm/alternative-asm.h>
8291 +
8292 .file "blowfish-x86_64-asm.S"
8293 .text
8294
8295 @@ -151,9 +153,11 @@ __blowfish_enc_blk:
8296 jnz __enc_xor;
8297
8298 write_block();
8299 + pax_force_retaddr 0, 1
8300 ret;
8301 __enc_xor:
8302 xor_block();
8303 + pax_force_retaddr 0, 1
8304 ret;
8305
8306 .align 8
8307 @@ -188,6 +192,7 @@ blowfish_dec_blk:
8308
8309 movq %r11, %rbp;
8310
8311 + pax_force_retaddr 0, 1
8312 ret;
8313
8314 /**********************************************************************
8315 @@ -342,6 +347,7 @@ __blowfish_enc_blk_4way:
8316
8317 popq %rbx;
8318 popq %rbp;
8319 + pax_force_retaddr 0, 1
8320 ret;
8321
8322 __enc_xor4:
8323 @@ -349,6 +355,7 @@ __enc_xor4:
8324
8325 popq %rbx;
8326 popq %rbp;
8327 + pax_force_retaddr 0, 1
8328 ret;
8329
8330 .align 8
8331 @@ -386,5 +393,6 @@ blowfish_dec_blk_4way:
8332 popq %rbx;
8333 popq %rbp;
8334
8335 + pax_force_retaddr 0, 1
8336 ret;
8337
8338 diff --git a/arch/x86/crypto/camellia-x86_64-asm_64.S b/arch/x86/crypto/camellia-x86_64-asm_64.S
8339 index 0b33743..7a56206 100644
8340 --- a/arch/x86/crypto/camellia-x86_64-asm_64.S
8341 +++ b/arch/x86/crypto/camellia-x86_64-asm_64.S
8342 @@ -20,6 +20,8 @@
8343 *
8344 */
8345
8346 +#include <asm/alternative-asm.h>
8347 +
8348 .file "camellia-x86_64-asm_64.S"
8349 .text
8350
8351 @@ -229,12 +231,14 @@ __enc_done:
8352 enc_outunpack(mov, RT1);
8353
8354 movq RRBP, %rbp;
8355 + pax_force_retaddr 0, 1
8356 ret;
8357
8358 __enc_xor:
8359 enc_outunpack(xor, RT1);
8360
8361 movq RRBP, %rbp;
8362 + pax_force_retaddr 0, 1
8363 ret;
8364
8365 .global camellia_dec_blk;
8366 @@ -275,6 +279,7 @@ __dec_rounds16:
8367 dec_outunpack();
8368
8369 movq RRBP, %rbp;
8370 + pax_force_retaddr 0, 1
8371 ret;
8372
8373 /**********************************************************************
8374 @@ -468,6 +473,7 @@ __enc2_done:
8375
8376 movq RRBP, %rbp;
8377 popq %rbx;
8378 + pax_force_retaddr 0, 1
8379 ret;
8380
8381 __enc2_xor:
8382 @@ -475,6 +481,7 @@ __enc2_xor:
8383
8384 movq RRBP, %rbp;
8385 popq %rbx;
8386 + pax_force_retaddr 0, 1
8387 ret;
8388
8389 .global camellia_dec_blk_2way;
8390 @@ -517,4 +524,5 @@ __dec2_rounds16:
8391
8392 movq RRBP, %rbp;
8393 movq RXOR, %rbx;
8394 + pax_force_retaddr 0, 1
8395 ret;
8396 diff --git a/arch/x86/crypto/salsa20-x86_64-asm_64.S b/arch/x86/crypto/salsa20-x86_64-asm_64.S
8397 index 6214a9b..1f4fc9a 100644
8398 --- a/arch/x86/crypto/salsa20-x86_64-asm_64.S
8399 +++ b/arch/x86/crypto/salsa20-x86_64-asm_64.S
8400 @@ -1,3 +1,5 @@
8401 +#include <asm/alternative-asm.h>
8402 +
8403 # enter ECRYPT_encrypt_bytes
8404 .text
8405 .p2align 5
8406 @@ -790,6 +792,7 @@ ECRYPT_encrypt_bytes:
8407 add %r11,%rsp
8408 mov %rdi,%rax
8409 mov %rsi,%rdx
8410 + pax_force_retaddr 0, 1
8411 ret
8412 # bytesatleast65:
8413 ._bytesatleast65:
8414 @@ -891,6 +894,7 @@ ECRYPT_keysetup:
8415 add %r11,%rsp
8416 mov %rdi,%rax
8417 mov %rsi,%rdx
8418 + pax_force_retaddr
8419 ret
8420 # enter ECRYPT_ivsetup
8421 .text
8422 @@ -917,4 +921,5 @@ ECRYPT_ivsetup:
8423 add %r11,%rsp
8424 mov %rdi,%rax
8425 mov %rsi,%rdx
8426 + pax_force_retaddr
8427 ret
8428 diff --git a/arch/x86/crypto/serpent-avx-x86_64-asm_64.S b/arch/x86/crypto/serpent-avx-x86_64-asm_64.S
8429 index 504106b..4e50951 100644
8430 --- a/arch/x86/crypto/serpent-avx-x86_64-asm_64.S
8431 +++ b/arch/x86/crypto/serpent-avx-x86_64-asm_64.S
8432 @@ -24,6 +24,8 @@
8433 *
8434 */
8435
8436 +#include <asm/alternative-asm.h>
8437 +
8438 .file "serpent-avx-x86_64-asm_64.S"
8439 .text
8440
8441 @@ -638,12 +640,14 @@ __serpent_enc_blk_8way_avx:
8442 write_blocks(%rsi, RA1, RB1, RC1, RD1, RK0, RK1, RK2);
8443 write_blocks(%rax, RA2, RB2, RC2, RD2, RK0, RK1, RK2);
8444
8445 + pax_force_retaddr
8446 ret;
8447
8448 __enc_xor8:
8449 xor_blocks(%rsi, RA1, RB1, RC1, RD1, RK0, RK1, RK2);
8450 xor_blocks(%rax, RA2, RB2, RC2, RD2, RK0, RK1, RK2);
8451
8452 + pax_force_retaddr
8453 ret;
8454
8455 .align 8
8456 @@ -701,4 +705,5 @@ serpent_dec_blk_8way_avx:
8457 write_blocks(%rsi, RC1, RD1, RB1, RE1, RK0, RK1, RK2);
8458 write_blocks(%rax, RC2, RD2, RB2, RE2, RK0, RK1, RK2);
8459
8460 + pax_force_retaddr
8461 ret;
8462 diff --git a/arch/x86/crypto/serpent-sse2-x86_64-asm_64.S b/arch/x86/crypto/serpent-sse2-x86_64-asm_64.S
8463 index 3ee1ff0..cbc568b 100644
8464 --- a/arch/x86/crypto/serpent-sse2-x86_64-asm_64.S
8465 +++ b/arch/x86/crypto/serpent-sse2-x86_64-asm_64.S
8466 @@ -24,6 +24,8 @@
8467 *
8468 */
8469
8470 +#include <asm/alternative-asm.h>
8471 +
8472 .file "serpent-sse2-x86_64-asm_64.S"
8473 .text
8474
8475 @@ -692,12 +694,14 @@ __serpent_enc_blk_8way:
8476 write_blocks(%rsi, RA1, RB1, RC1, RD1, RK0, RK1, RK2);
8477 write_blocks(%rax, RA2, RB2, RC2, RD2, RK0, RK1, RK2);
8478
8479 + pax_force_retaddr
8480 ret;
8481
8482 __enc_xor8:
8483 xor_blocks(%rsi, RA1, RB1, RC1, RD1, RK0, RK1, RK2);
8484 xor_blocks(%rax, RA2, RB2, RC2, RD2, RK0, RK1, RK2);
8485
8486 + pax_force_retaddr
8487 ret;
8488
8489 .align 8
8490 @@ -755,4 +759,5 @@ serpent_dec_blk_8way:
8491 write_blocks(%rsi, RC1, RD1, RB1, RE1, RK0, RK1, RK2);
8492 write_blocks(%rax, RC2, RD2, RB2, RE2, RK0, RK1, RK2);
8493
8494 + pax_force_retaddr
8495 ret;
8496 diff --git a/arch/x86/crypto/sha1_ssse3_asm.S b/arch/x86/crypto/sha1_ssse3_asm.S
8497 index 49d6987..df66bd4 100644
8498 --- a/arch/x86/crypto/sha1_ssse3_asm.S
8499 +++ b/arch/x86/crypto/sha1_ssse3_asm.S
8500 @@ -28,6 +28,8 @@
8501 * (at your option) any later version.
8502 */
8503
8504 +#include <asm/alternative-asm.h>
8505 +
8506 #define CTX %rdi // arg1
8507 #define BUF %rsi // arg2
8508 #define CNT %rdx // arg3
8509 @@ -104,6 +106,7 @@
8510 pop %r12
8511 pop %rbp
8512 pop %rbx
8513 + pax_force_retaddr 0, 1
8514 ret
8515
8516 .size \name, .-\name
8517 diff --git a/arch/x86/crypto/twofish-avx-x86_64-asm_64.S b/arch/x86/crypto/twofish-avx-x86_64-asm_64.S
8518 index 35f4557..16b379f 100644
8519 --- a/arch/x86/crypto/twofish-avx-x86_64-asm_64.S
8520 +++ b/arch/x86/crypto/twofish-avx-x86_64-asm_64.S
8521 @@ -21,6 +21,8 @@
8522 *
8523 */
8524
8525 +#include <asm/alternative-asm.h>
8526 +
8527 .file "twofish-avx-x86_64-asm_64.S"
8528 .text
8529
8530 @@ -250,12 +252,14 @@ __twofish_enc_blk_8way:
8531 outunpack_blocks(%rsi, RC1, RD1, RA1, RB1, RK1, RX, RY, RK2);
8532 outunpack_blocks(%rax, RC2, RD2, RA2, RB2, RK1, RX, RY, RK2);
8533
8534 + pax_force_retaddr
8535 ret;
8536
8537 __enc_xor8:
8538 outunpack_xor_blocks(%rsi, RC1, RD1, RA1, RB1, RK1, RX, RY, RK2);
8539 outunpack_xor_blocks(%rax, RC2, RD2, RA2, RB2, RK1, RX, RY, RK2);
8540
8541 + pax_force_retaddr
8542 ret;
8543
8544 .align 8
8545 @@ -297,4 +301,5 @@ twofish_dec_blk_8way:
8546 outunpack_blocks(%rsi, RA1, RB1, RC1, RD1, RK1, RX, RY, RK2);
8547 outunpack_blocks(%rax, RA2, RB2, RC2, RD2, RK1, RX, RY, RK2);
8548
8549 + pax_force_retaddr
8550 ret;
8551 diff --git a/arch/x86/crypto/twofish-x86_64-asm_64-3way.S b/arch/x86/crypto/twofish-x86_64-asm_64-3way.S
8552 index 5b012a2..36d5364 100644
8553 --- a/arch/x86/crypto/twofish-x86_64-asm_64-3way.S
8554 +++ b/arch/x86/crypto/twofish-x86_64-asm_64-3way.S
8555 @@ -20,6 +20,8 @@
8556 *
8557 */
8558
8559 +#include <asm/alternative-asm.h>
8560 +
8561 .file "twofish-x86_64-asm-3way.S"
8562 .text
8563
8564 @@ -260,6 +262,7 @@ __twofish_enc_blk_3way:
8565 popq %r13;
8566 popq %r14;
8567 popq %r15;
8568 + pax_force_retaddr 0, 1
8569 ret;
8570
8571 __enc_xor3:
8572 @@ -271,6 +274,7 @@ __enc_xor3:
8573 popq %r13;
8574 popq %r14;
8575 popq %r15;
8576 + pax_force_retaddr 0, 1
8577 ret;
8578
8579 .global twofish_dec_blk_3way
8580 @@ -312,5 +316,6 @@ twofish_dec_blk_3way:
8581 popq %r13;
8582 popq %r14;
8583 popq %r15;
8584 + pax_force_retaddr 0, 1
8585 ret;
8586
8587 diff --git a/arch/x86/crypto/twofish-x86_64-asm_64.S b/arch/x86/crypto/twofish-x86_64-asm_64.S
8588 index 7bcf3fc..f53832f 100644
8589 --- a/arch/x86/crypto/twofish-x86_64-asm_64.S
8590 +++ b/arch/x86/crypto/twofish-x86_64-asm_64.S
8591 @@ -21,6 +21,7 @@
8592 .text
8593
8594 #include <asm/asm-offsets.h>
8595 +#include <asm/alternative-asm.h>
8596
8597 #define a_offset 0
8598 #define b_offset 4
8599 @@ -268,6 +269,7 @@ twofish_enc_blk:
8600
8601 popq R1
8602 movq $1,%rax
8603 + pax_force_retaddr 0, 1
8604 ret
8605
8606 twofish_dec_blk:
8607 @@ -319,4 +321,5 @@ twofish_dec_blk:
8608
8609 popq R1
8610 movq $1,%rax
8611 + pax_force_retaddr 0, 1
8612 ret
8613 diff --git a/arch/x86/ia32/ia32_aout.c b/arch/x86/ia32/ia32_aout.c
8614 index 07b3a68..bd2a388 100644
8615 --- a/arch/x86/ia32/ia32_aout.c
8616 +++ b/arch/x86/ia32/ia32_aout.c
8617 @@ -159,6 +159,8 @@ static int aout_core_dump(long signr, struct pt_regs *regs, struct file *file,
8618 unsigned long dump_start, dump_size;
8619 struct user32 dump;
8620
8621 + memset(&dump, 0, sizeof(dump));
8622 +
8623 fs = get_fs();
8624 set_fs(KERNEL_DS);
8625 has_dumped = 1;
8626 diff --git a/arch/x86/ia32/ia32_signal.c b/arch/x86/ia32/ia32_signal.c
8627 index 673ac9b..7a8c5df 100644
8628 --- a/arch/x86/ia32/ia32_signal.c
8629 +++ b/arch/x86/ia32/ia32_signal.c
8630 @@ -162,7 +162,7 @@ asmlinkage long sys32_sigaltstack(const stack_ia32_t __user *uss_ptr,
8631 }
8632 seg = get_fs();
8633 set_fs(KERNEL_DS);
8634 - ret = do_sigaltstack(uss_ptr ? &uss : NULL, &uoss, regs->sp);
8635 + ret = do_sigaltstack(uss_ptr ? (const stack_t __force_user *)&uss : NULL, (stack_t __force_user *)&uoss, regs->sp);
8636 set_fs(seg);
8637 if (ret >= 0 && uoss_ptr) {
8638 if (!access_ok(VERIFY_WRITE, uoss_ptr, sizeof(stack_ia32_t)))
8639 @@ -361,7 +361,7 @@ static int ia32_setup_sigcontext(struct sigcontext_ia32 __user *sc,
8640 */
8641 static void __user *get_sigframe(struct k_sigaction *ka, struct pt_regs *regs,
8642 size_t frame_size,
8643 - void **fpstate)
8644 + void __user **fpstate)
8645 {
8646 unsigned long sp;
8647
8648 @@ -382,7 +382,7 @@ static void __user *get_sigframe(struct k_sigaction *ka, struct pt_regs *regs,
8649
8650 if (used_math()) {
8651 sp = sp - sig_xstate_ia32_size;
8652 - *fpstate = (struct _fpstate_ia32 *) sp;
8653 + *fpstate = (struct _fpstate_ia32 __user *) sp;
8654 if (save_i387_xstate_ia32(*fpstate) < 0)
8655 return (void __user *) -1L;
8656 }
8657 @@ -390,7 +390,7 @@ static void __user *get_sigframe(struct k_sigaction *ka, struct pt_regs *regs,
8658 sp -= frame_size;
8659 /* Align the stack pointer according to the i386 ABI,
8660 * i.e. so that on function entry ((sp + 4) & 15) == 0. */
8661 - sp = ((sp + 4) & -16ul) - 4;
8662 + sp = ((sp - 12) & -16ul) - 4;
8663 return (void __user *) sp;
8664 }
8665
8666 @@ -448,7 +448,7 @@ int ia32_setup_frame(int sig, struct k_sigaction *ka,
8667 * These are actually not used anymore, but left because some
8668 * gdb versions depend on them as a marker.
8669 */
8670 - put_user_ex(*((u64 *)&code), (u64 *)frame->retcode);
8671 + put_user_ex(*((const u64 *)&code), (u64 __user *)frame->retcode);
8672 } put_user_catch(err);
8673
8674 if (err)
8675 @@ -490,7 +490,7 @@ int ia32_setup_rt_frame(int sig, struct k_sigaction *ka, siginfo_t *info,
8676 0xb8,
8677 __NR_ia32_rt_sigreturn,
8678 0x80cd,
8679 - 0,
8680 + 0
8681 };
8682
8683 frame = get_sigframe(ka, regs, sizeof(*frame), &fpstate);
8684 @@ -520,16 +520,18 @@ int ia32_setup_rt_frame(int sig, struct k_sigaction *ka, siginfo_t *info,
8685
8686 if (ka->sa.sa_flags & SA_RESTORER)
8687 restorer = ka->sa.sa_restorer;
8688 + else if (current->mm->context.vdso)
8689 + /* Return stub is in 32bit vsyscall page */
8690 + restorer = VDSO32_SYMBOL(current->mm->context.vdso, rt_sigreturn);
8691 else
8692 - restorer = VDSO32_SYMBOL(current->mm->context.vdso,
8693 - rt_sigreturn);
8694 + restorer = &frame->retcode;
8695 put_user_ex(ptr_to_compat(restorer), &frame->pretcode);
8696
8697 /*
8698 * Not actually used anymore, but left because some gdb
8699 * versions need it.
8700 */
8701 - put_user_ex(*((u64 *)&code), (u64 *)frame->retcode);
8702 + put_user_ex(*((const u64 *)&code), (u64 __user *)frame->retcode);
8703 } put_user_catch(err);
8704
8705 if (err)
8706 diff --git a/arch/x86/ia32/ia32entry.S b/arch/x86/ia32/ia32entry.S
8707 index 20e5f7b..f33c779 100644
8708 --- a/arch/x86/ia32/ia32entry.S
8709 +++ b/arch/x86/ia32/ia32entry.S
8710 @@ -14,8 +14,10 @@
8711 #include <asm/segment.h>
8712 #include <asm/irqflags.h>
8713 #include <asm/asm.h>
8714 +#include <asm/pgtable.h>
8715 #include <linux/linkage.h>
8716 #include <linux/err.h>
8717 +#include <asm/alternative-asm.h>
8718
8719 /* Avoid __ASSEMBLER__'ifying <linux/audit.h> just for this. */
8720 #include <linux/elf-em.h>
8721 @@ -95,6 +97,32 @@ ENTRY(native_irq_enable_sysexit)
8722 ENDPROC(native_irq_enable_sysexit)
8723 #endif
8724
8725 + .macro pax_enter_kernel_user
8726 + pax_set_fptr_mask
8727 +#ifdef CONFIG_PAX_MEMORY_UDEREF
8728 + call pax_enter_kernel_user
8729 +#endif
8730 + .endm
8731 +
8732 + .macro pax_exit_kernel_user
8733 +#ifdef CONFIG_PAX_MEMORY_UDEREF
8734 + call pax_exit_kernel_user
8735 +#endif
8736 +#ifdef CONFIG_PAX_RANDKSTACK
8737 + pushq %rax
8738 + pushq %r11
8739 + call pax_randomize_kstack
8740 + popq %r11
8741 + popq %rax
8742 +#endif
8743 + .endm
8744 +
8745 +.macro pax_erase_kstack
8746 +#ifdef CONFIG_PAX_MEMORY_STACKLEAK
8747 + call pax_erase_kstack
8748 +#endif
8749 +.endm
8750 +
8751 /*
8752 * 32bit SYSENTER instruction entry.
8753 *
8754 @@ -121,12 +149,6 @@ ENTRY(ia32_sysenter_target)
8755 CFI_REGISTER rsp,rbp
8756 SWAPGS_UNSAFE_STACK
8757 movq PER_CPU_VAR(kernel_stack), %rsp
8758 - addq $(KERNEL_STACK_OFFSET),%rsp
8759 - /*
8760 - * No need to follow this irqs on/off section: the syscall
8761 - * disabled irqs, here we enable it straight after entry:
8762 - */
8763 - ENABLE_INTERRUPTS(CLBR_NONE)
8764 movl %ebp,%ebp /* zero extension */
8765 pushq_cfi $__USER32_DS
8766 /*CFI_REL_OFFSET ss,0*/
8767 @@ -134,22 +156,42 @@ ENTRY(ia32_sysenter_target)
8768 CFI_REL_OFFSET rsp,0
8769 pushfq_cfi
8770 /*CFI_REL_OFFSET rflags,0*/
8771 - movl TI_sysenter_return+THREAD_INFO(%rsp,3*8-KERNEL_STACK_OFFSET),%r10d
8772 - CFI_REGISTER rip,r10
8773 + orl $X86_EFLAGS_IF,(%rsp)
8774 + GET_THREAD_INFO(%r11)
8775 + movl TI_sysenter_return(%r11), %r11d
8776 + CFI_REGISTER rip,r11
8777 pushq_cfi $__USER32_CS
8778 /*CFI_REL_OFFSET cs,0*/
8779 movl %eax, %eax
8780 - pushq_cfi %r10
8781 + pushq_cfi %r11
8782 CFI_REL_OFFSET rip,0
8783 pushq_cfi %rax
8784 cld
8785 SAVE_ARGS 0,1,0
8786 + pax_enter_kernel_user
8787 +
8788 +#ifdef CONFIG_PAX_RANDKSTACK
8789 + pax_erase_kstack
8790 +#endif
8791 +
8792 + /*
8793 + * No need to follow this irqs on/off section: the syscall
8794 + * disabled irqs, here we enable it straight after entry:
8795 + */
8796 + ENABLE_INTERRUPTS(CLBR_NONE)
8797 /* no need to do an access_ok check here because rbp has been
8798 32bit zero extended */
8799 +
8800 +#ifdef CONFIG_PAX_MEMORY_UDEREF
8801 + mov $PAX_USER_SHADOW_BASE,%r11
8802 + add %r11,%rbp
8803 +#endif
8804 +
8805 1: movl (%rbp),%ebp
8806 _ASM_EXTABLE(1b,ia32_badarg)
8807 - orl $TS_COMPAT,TI_status+THREAD_INFO(%rsp,RIP-ARGOFFSET)
8808 - testl $_TIF_WORK_SYSCALL_ENTRY,TI_flags+THREAD_INFO(%rsp,RIP-ARGOFFSET)
8809 + GET_THREAD_INFO(%r11)
8810 + orl $TS_COMPAT,TI_status(%r11)
8811 + testl $_TIF_WORK_SYSCALL_ENTRY,TI_flags(%r11)
8812 CFI_REMEMBER_STATE
8813 jnz sysenter_tracesys
8814 cmpq $(IA32_NR_syscalls-1),%rax
8815 @@ -159,12 +201,15 @@ sysenter_do_call:
8816 sysenter_dispatch:
8817 call *ia32_sys_call_table(,%rax,8)
8818 movq %rax,RAX-ARGOFFSET(%rsp)
8819 + GET_THREAD_INFO(%r11)
8820 DISABLE_INTERRUPTS(CLBR_NONE)
8821 TRACE_IRQS_OFF
8822 - testl $_TIF_ALLWORK_MASK,TI_flags+THREAD_INFO(%rsp,RIP-ARGOFFSET)
8823 + testl $_TIF_ALLWORK_MASK,TI_flags(%r11)
8824 jnz sysexit_audit
8825 sysexit_from_sys_call:
8826 - andl $~TS_COMPAT,TI_status+THREAD_INFO(%rsp,RIP-ARGOFFSET)
8827 + pax_exit_kernel_user
8828 + pax_erase_kstack
8829 + andl $~TS_COMPAT,TI_status(%r11)
8830 /* clear IF, that popfq doesn't enable interrupts early */
8831 andl $~0x200,EFLAGS-R11(%rsp)
8832 movl RIP-R11(%rsp),%edx /* User %eip */
8833 @@ -190,6 +235,9 @@ sysexit_from_sys_call:
8834 movl %eax,%esi /* 2nd arg: syscall number */
8835 movl $AUDIT_ARCH_I386,%edi /* 1st arg: audit arch */
8836 call __audit_syscall_entry
8837 +
8838 + pax_erase_kstack
8839 +
8840 movl RAX-ARGOFFSET(%rsp),%eax /* reload syscall number */
8841 cmpq $(IA32_NR_syscalls-1),%rax
8842 ja ia32_badsys
8843 @@ -201,7 +249,7 @@ sysexit_from_sys_call:
8844 .endm
8845
8846 .macro auditsys_exit exit
8847 - testl $(_TIF_ALLWORK_MASK & ~_TIF_SYSCALL_AUDIT),TI_flags+THREAD_INFO(%rsp,RIP-ARGOFFSET)
8848 + testl $(_TIF_ALLWORK_MASK & ~_TIF_SYSCALL_AUDIT),TI_flags(%r11)
8849 jnz ia32_ret_from_sys_call
8850 TRACE_IRQS_ON
8851 sti
8852 @@ -212,11 +260,12 @@ sysexit_from_sys_call:
8853 1: setbe %al /* 1 if error, 0 if not */
8854 movzbl %al,%edi /* zero-extend that into %edi */
8855 call __audit_syscall_exit
8856 + GET_THREAD_INFO(%r11)
8857 movq RAX-ARGOFFSET(%rsp),%rax /* reload syscall return value */
8858 movl $(_TIF_ALLWORK_MASK & ~_TIF_SYSCALL_AUDIT),%edi
8859 cli
8860 TRACE_IRQS_OFF
8861 - testl %edi,TI_flags+THREAD_INFO(%rsp,RIP-ARGOFFSET)
8862 + testl %edi,TI_flags(%r11)
8863 jz \exit
8864 CLEAR_RREGS -ARGOFFSET
8865 jmp int_with_check
8866 @@ -234,7 +283,7 @@ sysexit_audit:
8867
8868 sysenter_tracesys:
8869 #ifdef CONFIG_AUDITSYSCALL
8870 - testl $(_TIF_WORK_SYSCALL_ENTRY & ~_TIF_SYSCALL_AUDIT),TI_flags+THREAD_INFO(%rsp,RIP-ARGOFFSET)
8871 + testl $(_TIF_WORK_SYSCALL_ENTRY & ~_TIF_SYSCALL_AUDIT),TI_flags(%r11)
8872 jz sysenter_auditsys
8873 #endif
8874 SAVE_REST
8875 @@ -246,6 +295,9 @@ sysenter_tracesys:
8876 RESTORE_REST
8877 cmpq $(IA32_NR_syscalls-1),%rax
8878 ja int_ret_from_sys_call /* sysenter_tracesys has set RAX(%rsp) */
8879 +
8880 + pax_erase_kstack
8881 +
8882 jmp sysenter_do_call
8883 CFI_ENDPROC
8884 ENDPROC(ia32_sysenter_target)
8885 @@ -273,19 +325,25 @@ ENDPROC(ia32_sysenter_target)
8886 ENTRY(ia32_cstar_target)
8887 CFI_STARTPROC32 simple
8888 CFI_SIGNAL_FRAME
8889 - CFI_DEF_CFA rsp,KERNEL_STACK_OFFSET
8890 + CFI_DEF_CFA rsp,0
8891 CFI_REGISTER rip,rcx
8892 /*CFI_REGISTER rflags,r11*/
8893 SWAPGS_UNSAFE_STACK
8894 movl %esp,%r8d
8895 CFI_REGISTER rsp,r8
8896 movq PER_CPU_VAR(kernel_stack),%rsp
8897 + SAVE_ARGS 8*6,0,0
8898 + pax_enter_kernel_user
8899 +
8900 +#ifdef CONFIG_PAX_RANDKSTACK
8901 + pax_erase_kstack
8902 +#endif
8903 +
8904 /*
8905 * No need to follow this irqs on/off section: the syscall
8906 * disabled irqs and here we enable it straight after entry:
8907 */
8908 ENABLE_INTERRUPTS(CLBR_NONE)
8909 - SAVE_ARGS 8,0,0
8910 movl %eax,%eax /* zero extension */
8911 movq %rax,ORIG_RAX-ARGOFFSET(%rsp)
8912 movq %rcx,RIP-ARGOFFSET(%rsp)
8913 @@ -301,10 +359,17 @@ ENTRY(ia32_cstar_target)
8914 /* no need to do an access_ok check here because r8 has been
8915 32bit zero extended */
8916 /* hardware stack frame is complete now */
8917 +
8918 +#ifdef CONFIG_PAX_MEMORY_UDEREF
8919 + mov $PAX_USER_SHADOW_BASE,%r11
8920 + add %r11,%r8
8921 +#endif
8922 +
8923 1: movl (%r8),%r9d
8924 _ASM_EXTABLE(1b,ia32_badarg)
8925 - orl $TS_COMPAT,TI_status+THREAD_INFO(%rsp,RIP-ARGOFFSET)
8926 - testl $_TIF_WORK_SYSCALL_ENTRY,TI_flags+THREAD_INFO(%rsp,RIP-ARGOFFSET)
8927 + GET_THREAD_INFO(%r11)
8928 + orl $TS_COMPAT,TI_status(%r11)
8929 + testl $_TIF_WORK_SYSCALL_ENTRY,TI_flags(%r11)
8930 CFI_REMEMBER_STATE
8931 jnz cstar_tracesys
8932 cmpq $IA32_NR_syscalls-1,%rax
8933 @@ -314,12 +379,15 @@ cstar_do_call:
8934 cstar_dispatch:
8935 call *ia32_sys_call_table(,%rax,8)
8936 movq %rax,RAX-ARGOFFSET(%rsp)
8937 + GET_THREAD_INFO(%r11)
8938 DISABLE_INTERRUPTS(CLBR_NONE)
8939 TRACE_IRQS_OFF
8940 - testl $_TIF_ALLWORK_MASK,TI_flags+THREAD_INFO(%rsp,RIP-ARGOFFSET)
8941 + testl $_TIF_ALLWORK_MASK,TI_flags(%r11)
8942 jnz sysretl_audit
8943 sysretl_from_sys_call:
8944 - andl $~TS_COMPAT,TI_status+THREAD_INFO(%rsp,RIP-ARGOFFSET)
8945 + pax_exit_kernel_user
8946 + pax_erase_kstack
8947 + andl $~TS_COMPAT,TI_status(%r11)
8948 RESTORE_ARGS 0,-ARG_SKIP,0,0,0
8949 movl RIP-ARGOFFSET(%rsp),%ecx
8950 CFI_REGISTER rip,rcx
8951 @@ -347,7 +415,7 @@ sysretl_audit:
8952
8953 cstar_tracesys:
8954 #ifdef CONFIG_AUDITSYSCALL
8955 - testl $(_TIF_WORK_SYSCALL_ENTRY & ~_TIF_SYSCALL_AUDIT),TI_flags+THREAD_INFO(%rsp,RIP-ARGOFFSET)
8956 + testl $(_TIF_WORK_SYSCALL_ENTRY & ~_TIF_SYSCALL_AUDIT),TI_flags(%r11)
8957 jz cstar_auditsys
8958 #endif
8959 xchgl %r9d,%ebp
8960 @@ -361,6 +429,9 @@ cstar_tracesys:
8961 xchgl %ebp,%r9d
8962 cmpq $(IA32_NR_syscalls-1),%rax
8963 ja int_ret_from_sys_call /* cstar_tracesys has set RAX(%rsp) */
8964 +
8965 + pax_erase_kstack
8966 +
8967 jmp cstar_do_call
8968 END(ia32_cstar_target)
8969
8970 @@ -401,19 +472,26 @@ ENTRY(ia32_syscall)
8971 CFI_REL_OFFSET rip,RIP-RIP
8972 PARAVIRT_ADJUST_EXCEPTION_FRAME
8973 SWAPGS
8974 - /*
8975 - * No need to follow this irqs on/off section: the syscall
8976 - * disabled irqs and here we enable it straight after entry:
8977 - */
8978 - ENABLE_INTERRUPTS(CLBR_NONE)
8979 movl %eax,%eax
8980 pushq_cfi %rax
8981 cld
8982 /* note the registers are not zero extended to the sf.
8983 this could be a problem. */
8984 SAVE_ARGS 0,1,0
8985 - orl $TS_COMPAT,TI_status+THREAD_INFO(%rsp,RIP-ARGOFFSET)
8986 - testl $_TIF_WORK_SYSCALL_ENTRY,TI_flags+THREAD_INFO(%rsp,RIP-ARGOFFSET)
8987 + pax_enter_kernel_user
8988 +
8989 +#ifdef CONFIG_PAX_RANDKSTACK
8990 + pax_erase_kstack
8991 +#endif
8992 +
8993 + /*
8994 + * No need to follow this irqs on/off section: the syscall
8995 + * disabled irqs and here we enable it straight after entry:
8996 + */
8997 + ENABLE_INTERRUPTS(CLBR_NONE)
8998 + GET_THREAD_INFO(%r11)
8999 + orl $TS_COMPAT,TI_status(%r11)
9000 + testl $_TIF_WORK_SYSCALL_ENTRY,TI_flags(%r11)
9001 jnz ia32_tracesys
9002 cmpq $(IA32_NR_syscalls-1),%rax
9003 ja ia32_badsys
9004 @@ -436,6 +514,9 @@ ia32_tracesys:
9005 RESTORE_REST
9006 cmpq $(IA32_NR_syscalls-1),%rax
9007 ja int_ret_from_sys_call /* ia32_tracesys has set RAX(%rsp) */
9008 +
9009 + pax_erase_kstack
9010 +
9011 jmp ia32_do_call
9012 END(ia32_syscall)
9013
9014 diff --git a/arch/x86/ia32/sys_ia32.c b/arch/x86/ia32/sys_ia32.c
9015 index 4540bec..714d913 100644
9016 --- a/arch/x86/ia32/sys_ia32.c
9017 +++ b/arch/x86/ia32/sys_ia32.c
9018 @@ -69,8 +69,8 @@ asmlinkage long sys32_ftruncate64(unsigned int fd, unsigned long offset_low,
9019 */
9020 static int cp_stat64(struct stat64 __user *ubuf, struct kstat *stat)
9021 {
9022 - typeof(ubuf->st_uid) uid = 0;
9023 - typeof(ubuf->st_gid) gid = 0;
9024 + typeof(((struct stat64 *)0)->st_uid) uid = 0;
9025 + typeof(((struct stat64 *)0)->st_gid) gid = 0;
9026 SET_UID(uid, from_kuid_munged(current_user_ns(), stat->uid));
9027 SET_GID(gid, from_kgid_munged(current_user_ns(), stat->gid));
9028 if (!access_ok(VERIFY_WRITE, ubuf, sizeof(struct stat64)) ||
9029 @@ -287,7 +287,7 @@ asmlinkage long sys32_sigaction(int sig, struct old_sigaction32 __user *act,
9030 return ret;
9031 }
9032
9033 -asmlinkage long sys32_waitpid(compat_pid_t pid, unsigned int *stat_addr,
9034 +asmlinkage long sys32_waitpid(compat_pid_t pid, unsigned int __user *stat_addr,
9035 int options)
9036 {
9037 return compat_sys_wait4(pid, stat_addr, options, NULL);
9038 @@ -303,7 +303,7 @@ asmlinkage long sys32_sched_rr_get_interval(compat_pid_t pid,
9039 mm_segment_t old_fs = get_fs();
9040
9041 set_fs(KERNEL_DS);
9042 - ret = sys_sched_rr_get_interval(pid, (struct timespec __user *)&t);
9043 + ret = sys_sched_rr_get_interval(pid, (struct timespec __force_user *)&t);
9044 set_fs(old_fs);
9045 if (put_compat_timespec(&t, interval))
9046 return -EFAULT;
9047 @@ -319,7 +319,7 @@ asmlinkage long sys32_rt_sigpending(compat_sigset_t __user *set,
9048 mm_segment_t old_fs = get_fs();
9049
9050 set_fs(KERNEL_DS);
9051 - ret = sys_rt_sigpending((sigset_t __user *)&s, sigsetsize);
9052 + ret = sys_rt_sigpending((sigset_t __force_user *)&s, sigsetsize);
9053 set_fs(old_fs);
9054 if (!ret) {
9055 switch (_NSIG_WORDS) {
9056 @@ -344,7 +344,7 @@ asmlinkage long sys32_rt_sigqueueinfo(int pid, int sig,
9057 if (copy_siginfo_from_user32(&info, uinfo))
9058 return -EFAULT;
9059 set_fs(KERNEL_DS);
9060 - ret = sys_rt_sigqueueinfo(pid, sig, (siginfo_t __user *)&info);
9061 + ret = sys_rt_sigqueueinfo(pid, sig, (siginfo_t __force_user *)&info);
9062 set_fs(old_fs);
9063 return ret;
9064 }
9065 @@ -376,7 +376,7 @@ asmlinkage long sys32_sendfile(int out_fd, int in_fd,
9066 return -EFAULT;
9067
9068 set_fs(KERNEL_DS);
9069 - ret = sys_sendfile(out_fd, in_fd, offset ? (off_t __user *)&of : NULL,
9070 + ret = sys_sendfile(out_fd, in_fd, offset ? (off_t __force_user *)&of : NULL,
9071 count);
9072 set_fs(old_fs);
9073
9074 diff --git a/arch/x86/include/asm/alternative-asm.h b/arch/x86/include/asm/alternative-asm.h
9075 index 952bd01..7692c6f 100644
9076 --- a/arch/x86/include/asm/alternative-asm.h
9077 +++ b/arch/x86/include/asm/alternative-asm.h
9078 @@ -15,6 +15,45 @@
9079 .endm
9080 #endif
9081
9082 +#ifdef KERNEXEC_PLUGIN
9083 + .macro pax_force_retaddr_bts rip=0
9084 + btsq $63,\rip(%rsp)
9085 + .endm
9086 +#ifdef CONFIG_PAX_KERNEXEC_PLUGIN_METHOD_BTS
9087 + .macro pax_force_retaddr rip=0, reload=0
9088 + btsq $63,\rip(%rsp)
9089 + .endm
9090 + .macro pax_force_fptr ptr
9091 + btsq $63,\ptr
9092 + .endm
9093 + .macro pax_set_fptr_mask
9094 + .endm
9095 +#endif
9096 +#ifdef CONFIG_PAX_KERNEXEC_PLUGIN_METHOD_OR
9097 + .macro pax_force_retaddr rip=0, reload=0
9098 + .if \reload
9099 + pax_set_fptr_mask
9100 + .endif
9101 + orq %r10,\rip(%rsp)
9102 + .endm
9103 + .macro pax_force_fptr ptr
9104 + orq %r10,\ptr
9105 + .endm
9106 + .macro pax_set_fptr_mask
9107 + movabs $0x8000000000000000,%r10
9108 + .endm
9109 +#endif
9110 +#else
9111 + .macro pax_force_retaddr rip=0, reload=0
9112 + .endm
9113 + .macro pax_force_fptr ptr
9114 + .endm
9115 + .macro pax_force_retaddr_bts rip=0
9116 + .endm
9117 + .macro pax_set_fptr_mask
9118 + .endm
9119 +#endif
9120 +
9121 .macro altinstruction_entry orig alt feature orig_len alt_len
9122 .long \orig - .
9123 .long \alt - .
9124 diff --git a/arch/x86/include/asm/alternative.h b/arch/x86/include/asm/alternative.h
9125 index 7078068..f58bcda 100644
9126 --- a/arch/x86/include/asm/alternative.h
9127 +++ b/arch/x86/include/asm/alternative.h
9128 @@ -105,7 +105,7 @@ static inline int alternatives_text_reserved(void *start, void *end)
9129 ".section .discard,\"aw\",@progbits\n" \
9130 DISCARD_ENTRY(1) \
9131 ".previous\n" \
9132 - ".section .altinstr_replacement, \"ax\"\n" \
9133 + ".section .altinstr_replacement, \"a\"\n" \
9134 ALTINSTR_REPLACEMENT(newinstr, feature, 1) \
9135 ".previous"
9136
9137 @@ -119,7 +119,7 @@ static inline int alternatives_text_reserved(void *start, void *end)
9138 DISCARD_ENTRY(1) \
9139 DISCARD_ENTRY(2) \
9140 ".previous\n" \
9141 - ".section .altinstr_replacement, \"ax\"\n" \
9142 + ".section .altinstr_replacement, \"a\"\n" \
9143 ALTINSTR_REPLACEMENT(newinstr1, feature1, 1) \
9144 ALTINSTR_REPLACEMENT(newinstr2, feature2, 2) \
9145 ".previous"
9146 diff --git a/arch/x86/include/asm/apic.h b/arch/x86/include/asm/apic.h
9147 index f342612..b3fe911 100644
9148 --- a/arch/x86/include/asm/apic.h
9149 +++ b/arch/x86/include/asm/apic.h
9150 @@ -44,7 +44,7 @@ static inline void generic_apic_probe(void)
9151
9152 #ifdef CONFIG_X86_LOCAL_APIC
9153
9154 -extern unsigned int apic_verbosity;
9155 +extern int apic_verbosity;
9156 extern int local_apic_timer_c2_ok;
9157
9158 extern int disable_apic;
9159 @@ -391,7 +391,7 @@ struct apic {
9160 */
9161 int (*x86_32_numa_cpu_node)(int cpu);
9162 #endif
9163 -};
9164 +} __do_const;
9165
9166 /*
9167 * Pointer to the local APIC driver in use on this system (there's
9168 diff --git a/arch/x86/include/asm/apm.h b/arch/x86/include/asm/apm.h
9169 index 20370c6..a2eb9b0 100644
9170 --- a/arch/x86/include/asm/apm.h
9171 +++ b/arch/x86/include/asm/apm.h
9172 @@ -34,7 +34,7 @@ static inline void apm_bios_call_asm(u32 func, u32 ebx_in, u32 ecx_in,
9173 __asm__ __volatile__(APM_DO_ZERO_SEGS
9174 "pushl %%edi\n\t"
9175 "pushl %%ebp\n\t"
9176 - "lcall *%%cs:apm_bios_entry\n\t"
9177 + "lcall *%%ss:apm_bios_entry\n\t"
9178 "setc %%al\n\t"
9179 "popl %%ebp\n\t"
9180 "popl %%edi\n\t"
9181 @@ -58,7 +58,7 @@ static inline u8 apm_bios_call_simple_asm(u32 func, u32 ebx_in,
9182 __asm__ __volatile__(APM_DO_ZERO_SEGS
9183 "pushl %%edi\n\t"
9184 "pushl %%ebp\n\t"
9185 - "lcall *%%cs:apm_bios_entry\n\t"
9186 + "lcall *%%ss:apm_bios_entry\n\t"
9187 "setc %%bl\n\t"
9188 "popl %%ebp\n\t"
9189 "popl %%edi\n\t"
9190 diff --git a/arch/x86/include/asm/atomic.h b/arch/x86/include/asm/atomic.h
9191 index 58cb6d4..a4b806c 100644
9192 --- a/arch/x86/include/asm/atomic.h
9193 +++ b/arch/x86/include/asm/atomic.h
9194 @@ -22,7 +22,18 @@
9195 */
9196 static inline int atomic_read(const atomic_t *v)
9197 {
9198 - return (*(volatile int *)&(v)->counter);
9199 + return (*(volatile const int *)&(v)->counter);
9200 +}
9201 +
9202 +/**
9203 + * atomic_read_unchecked - read atomic variable
9204 + * @v: pointer of type atomic_unchecked_t
9205 + *
9206 + * Atomically reads the value of @v.
9207 + */
9208 +static inline int atomic_read_unchecked(const atomic_unchecked_t *v)
9209 +{
9210 + return (*(volatile const int *)&(v)->counter);
9211 }
9212
9213 /**
9214 @@ -38,6 +49,18 @@ static inline void atomic_set(atomic_t *v, int i)
9215 }
9216
9217 /**
9218 + * atomic_set_unchecked - set atomic variable
9219 + * @v: pointer of type atomic_unchecked_t
9220 + * @i: required value
9221 + *
9222 + * Atomically sets the value of @v to @i.
9223 + */
9224 +static inline void atomic_set_unchecked(atomic_unchecked_t *v, int i)
9225 +{
9226 + v->counter = i;
9227 +}
9228 +
9229 +/**
9230 * atomic_add - add integer to atomic variable
9231 * @i: integer value to add
9232 * @v: pointer of type atomic_t
9233 @@ -46,7 +69,29 @@ static inline void atomic_set(atomic_t *v, int i)
9234 */
9235 static inline void atomic_add(int i, atomic_t *v)
9236 {
9237 - asm volatile(LOCK_PREFIX "addl %1,%0"
9238 + asm volatile(LOCK_PREFIX "addl %1,%0\n"
9239 +
9240 +#ifdef CONFIG_PAX_REFCOUNT
9241 + "jno 0f\n"
9242 + LOCK_PREFIX "subl %1,%0\n"
9243 + "int $4\n0:\n"
9244 + _ASM_EXTABLE(0b, 0b)
9245 +#endif
9246 +
9247 + : "+m" (v->counter)
9248 + : "ir" (i));
9249 +}
9250 +
9251 +/**
9252 + * atomic_add_unchecked - add integer to atomic variable
9253 + * @i: integer value to add
9254 + * @v: pointer of type atomic_unchecked_t
9255 + *
9256 + * Atomically adds @i to @v.
9257 + */
9258 +static inline void atomic_add_unchecked(int i, atomic_unchecked_t *v)
9259 +{
9260 + asm volatile(LOCK_PREFIX "addl %1,%0\n"
9261 : "+m" (v->counter)
9262 : "ir" (i));
9263 }
9264 @@ -60,7 +105,29 @@ static inline void atomic_add(int i, atomic_t *v)
9265 */
9266 static inline void atomic_sub(int i, atomic_t *v)
9267 {
9268 - asm volatile(LOCK_PREFIX "subl %1,%0"
9269 + asm volatile(LOCK_PREFIX "subl %1,%0\n"
9270 +
9271 +#ifdef CONFIG_PAX_REFCOUNT
9272 + "jno 0f\n"
9273 + LOCK_PREFIX "addl %1,%0\n"
9274 + "int $4\n0:\n"
9275 + _ASM_EXTABLE(0b, 0b)
9276 +#endif
9277 +
9278 + : "+m" (v->counter)
9279 + : "ir" (i));
9280 +}
9281 +
9282 +/**
9283 + * atomic_sub_unchecked - subtract integer from atomic variable
9284 + * @i: integer value to subtract
9285 + * @v: pointer of type atomic_unchecked_t
9286 + *
9287 + * Atomically subtracts @i from @v.
9288 + */
9289 +static inline void atomic_sub_unchecked(int i, atomic_unchecked_t *v)
9290 +{
9291 + asm volatile(LOCK_PREFIX "subl %1,%0\n"
9292 : "+m" (v->counter)
9293 : "ir" (i));
9294 }
9295 @@ -78,7 +145,16 @@ static inline int atomic_sub_and_test(int i, atomic_t *v)
9296 {
9297 unsigned char c;
9298
9299 - asm volatile(LOCK_PREFIX "subl %2,%0; sete %1"
9300 + asm volatile(LOCK_PREFIX "subl %2,%0\n"
9301 +
9302 +#ifdef CONFIG_PAX_REFCOUNT
9303 + "jno 0f\n"
9304 + LOCK_PREFIX "addl %2,%0\n"
9305 + "int $4\n0:\n"
9306 + _ASM_EXTABLE(0b, 0b)
9307 +#endif
9308 +
9309 + "sete %1\n"
9310 : "+m" (v->counter), "=qm" (c)
9311 : "ir" (i) : "memory");
9312 return c;
9313 @@ -92,7 +168,27 @@ static inline int atomic_sub_and_test(int i, atomic_t *v)
9314 */
9315 static inline void atomic_inc(atomic_t *v)
9316 {
9317 - asm volatile(LOCK_PREFIX "incl %0"
9318 + asm volatile(LOCK_PREFIX "incl %0\n"
9319 +
9320 +#ifdef CONFIG_PAX_REFCOUNT
9321 + "jno 0f\n"
9322 + LOCK_PREFIX "decl %0\n"
9323 + "int $4\n0:\n"
9324 + _ASM_EXTABLE(0b, 0b)
9325 +#endif
9326 +
9327 + : "+m" (v->counter));
9328 +}
9329 +
9330 +/**
9331 + * atomic_inc_unchecked - increment atomic variable
9332 + * @v: pointer of type atomic_unchecked_t
9333 + *
9334 + * Atomically increments @v by 1.
9335 + */
9336 +static inline void atomic_inc_unchecked(atomic_unchecked_t *v)
9337 +{
9338 + asm volatile(LOCK_PREFIX "incl %0\n"
9339 : "+m" (v->counter));
9340 }
9341
9342 @@ -104,7 +200,27 @@ static inline void atomic_inc(atomic_t *v)
9343 */
9344 static inline void atomic_dec(atomic_t *v)
9345 {
9346 - asm volatile(LOCK_PREFIX "decl %0"
9347 + asm volatile(LOCK_PREFIX "decl %0\n"
9348 +
9349 +#ifdef CONFIG_PAX_REFCOUNT
9350 + "jno 0f\n"
9351 + LOCK_PREFIX "incl %0\n"
9352 + "int $4\n0:\n"
9353 + _ASM_EXTABLE(0b, 0b)
9354 +#endif
9355 +
9356 + : "+m" (v->counter));
9357 +}
9358 +
9359 +/**
9360 + * atomic_dec_unchecked - decrement atomic variable
9361 + * @v: pointer of type atomic_unchecked_t
9362 + *
9363 + * Atomically decrements @v by 1.
9364 + */
9365 +static inline void atomic_dec_unchecked(atomic_unchecked_t *v)
9366 +{
9367 + asm volatile(LOCK_PREFIX "decl %0\n"
9368 : "+m" (v->counter));
9369 }
9370
9371 @@ -120,7 +236,16 @@ static inline int atomic_dec_and_test(atomic_t *v)
9372 {
9373 unsigned char c;
9374
9375 - asm volatile(LOCK_PREFIX "decl %0; sete %1"
9376 + asm volatile(LOCK_PREFIX "decl %0\n"
9377 +
9378 +#ifdef CONFIG_PAX_REFCOUNT
9379 + "jno 0f\n"
9380 + LOCK_PREFIX "incl %0\n"
9381 + "int $4\n0:\n"
9382 + _ASM_EXTABLE(0b, 0b)
9383 +#endif
9384 +
9385 + "sete %1\n"
9386 : "+m" (v->counter), "=qm" (c)
9387 : : "memory");
9388 return c != 0;
9389 @@ -138,7 +263,35 @@ static inline int atomic_inc_and_test(atomic_t *v)
9390 {
9391 unsigned char c;
9392
9393 - asm volatile(LOCK_PREFIX "incl %0; sete %1"
9394 + asm volatile(LOCK_PREFIX "incl %0\n"
9395 +
9396 +#ifdef CONFIG_PAX_REFCOUNT
9397 + "jno 0f\n"
9398 + LOCK_PREFIX "decl %0\n"
9399 + "int $4\n0:\n"
9400 + _ASM_EXTABLE(0b, 0b)
9401 +#endif
9402 +
9403 + "sete %1\n"
9404 + : "+m" (v->counter), "=qm" (c)
9405 + : : "memory");
9406 + return c != 0;
9407 +}
9408 +
9409 +/**
9410 + * atomic_inc_and_test_unchecked - increment and test
9411 + * @v: pointer of type atomic_unchecked_t
9412 + *
9413 + * Atomically increments @v by 1
9414 + * and returns true if the result is zero, or false for all
9415 + * other cases.
9416 + */
9417 +static inline int atomic_inc_and_test_unchecked(atomic_unchecked_t *v)
9418 +{
9419 + unsigned char c;
9420 +
9421 + asm volatile(LOCK_PREFIX "incl %0\n"
9422 + "sete %1\n"
9423 : "+m" (v->counter), "=qm" (c)
9424 : : "memory");
9425 return c != 0;
9426 @@ -157,7 +310,16 @@ static inline int atomic_add_negative(int i, atomic_t *v)
9427 {
9428 unsigned char c;
9429
9430 - asm volatile(LOCK_PREFIX "addl %2,%0; sets %1"
9431 + asm volatile(LOCK_PREFIX "addl %2,%0\n"
9432 +
9433 +#ifdef CONFIG_PAX_REFCOUNT
9434 + "jno 0f\n"
9435 + LOCK_PREFIX "subl %2,%0\n"
9436 + "int $4\n0:\n"
9437 + _ASM_EXTABLE(0b, 0b)
9438 +#endif
9439 +
9440 + "sets %1\n"
9441 : "+m" (v->counter), "=qm" (c)
9442 : "ir" (i) : "memory");
9443 return c;
9444 @@ -179,7 +341,7 @@ static inline int atomic_add_return(int i, atomic_t *v)
9445 goto no_xadd;
9446 #endif
9447 /* Modern 486+ processor */
9448 - return i + xadd(&v->counter, i);
9449 + return i + xadd_check_overflow(&v->counter, i);
9450
9451 #ifdef CONFIG_M386
9452 no_xadd: /* Legacy 386 processor */
9453 @@ -192,6 +354,34 @@ no_xadd: /* Legacy 386 processor */
9454 }
9455
9456 /**
9457 + * atomic_add_return_unchecked - add integer and return
9458 + * @i: integer value to add
9459 + * @v: pointer of type atomic_unchecked_t
9460 + *
9461 + * Atomically adds @i to @v and returns @i + @v
9462 + */
9463 +static inline int atomic_add_return_unchecked(int i, atomic_unchecked_t *v)
9464 +{
9465 +#ifdef CONFIG_M386
9466 + int __i;
9467 + unsigned long flags;
9468 + if (unlikely(boot_cpu_data.x86 <= 3))
9469 + goto no_xadd;
9470 +#endif
9471 + /* Modern 486+ processor */
9472 + return i + xadd(&v->counter, i);
9473 +
9474 +#ifdef CONFIG_M386
9475 +no_xadd: /* Legacy 386 processor */
9476 + raw_local_irq_save(flags);
9477 + __i = atomic_read_unchecked(v);
9478 + atomic_set_unchecked(v, i + __i);
9479 + raw_local_irq_restore(flags);
9480 + return i + __i;
9481 +#endif
9482 +}
9483 +
9484 +/**
9485 * atomic_sub_return - subtract integer and return
9486 * @v: pointer of type atomic_t
9487 * @i: integer value to subtract
9488 @@ -204,6 +394,10 @@ static inline int atomic_sub_return(int i, atomic_t *v)
9489 }
9490
9491 #define atomic_inc_return(v) (atomic_add_return(1, v))
9492 +static inline int atomic_inc_return_unchecked(atomic_unchecked_t *v)
9493 +{
9494 + return atomic_add_return_unchecked(1, v);
9495 +}
9496 #define atomic_dec_return(v) (atomic_sub_return(1, v))
9497
9498 static inline int atomic_cmpxchg(atomic_t *v, int old, int new)
9499 @@ -211,11 +405,21 @@ static inline int atomic_cmpxchg(atomic_t *v, int old, int new)
9500 return cmpxchg(&v->counter, old, new);
9501 }
9502
9503 +static inline int atomic_cmpxchg_unchecked(atomic_unchecked_t *v, int old, int new)
9504 +{
9505 + return cmpxchg(&v->counter, old, new);
9506 +}
9507 +
9508 static inline int atomic_xchg(atomic_t *v, int new)
9509 {
9510 return xchg(&v->counter, new);
9511 }
9512
9513 +static inline int atomic_xchg_unchecked(atomic_unchecked_t *v, int new)
9514 +{
9515 + return xchg(&v->counter, new);
9516 +}
9517 +
9518 /**
9519 * __atomic_add_unless - add unless the number is already a given value
9520 * @v: pointer of type atomic_t
9521 @@ -227,12 +431,25 @@ static inline int atomic_xchg(atomic_t *v, int new)
9522 */
9523 static inline int __atomic_add_unless(atomic_t *v, int a, int u)
9524 {
9525 - int c, old;
9526 + int c, old, new;
9527 c = atomic_read(v);
9528 for (;;) {
9529 - if (unlikely(c == (u)))
9530 + if (unlikely(c == u))
9531 break;
9532 - old = atomic_cmpxchg((v), c, c + (a));
9533 +
9534 + asm volatile("addl %2,%0\n"
9535 +
9536 +#ifdef CONFIG_PAX_REFCOUNT
9537 + "jno 0f\n"
9538 + "subl %2,%0\n"
9539 + "int $4\n0:\n"
9540 + _ASM_EXTABLE(0b, 0b)
9541 +#endif
9542 +
9543 + : "=r" (new)
9544 + : "0" (c), "ir" (a));
9545 +
9546 + old = atomic_cmpxchg(v, c, new);
9547 if (likely(old == c))
9548 break;
9549 c = old;
9550 @@ -240,6 +457,48 @@ static inline int __atomic_add_unless(atomic_t *v, int a, int u)
9551 return c;
9552 }
9553
9554 +/**
9555 + * atomic_inc_not_zero_hint - increment if not null
9556 + * @v: pointer of type atomic_t
9557 + * @hint: probable value of the atomic before the increment
9558 + *
9559 + * This version of atomic_inc_not_zero() gives a hint of probable
9560 + * value of the atomic. This helps processor to not read the memory
9561 + * before doing the atomic read/modify/write cycle, lowering
9562 + * number of bus transactions on some arches.
9563 + *
9564 + * Returns: 0 if increment was not done, 1 otherwise.
9565 + */
9566 +#define atomic_inc_not_zero_hint atomic_inc_not_zero_hint
9567 +static inline int atomic_inc_not_zero_hint(atomic_t *v, int hint)
9568 +{
9569 + int val, c = hint, new;
9570 +
9571 + /* sanity test, should be removed by compiler if hint is a constant */
9572 + if (!hint)
9573 + return __atomic_add_unless(v, 1, 0);
9574 +
9575 + do {
9576 + asm volatile("incl %0\n"
9577 +
9578 +#ifdef CONFIG_PAX_REFCOUNT
9579 + "jno 0f\n"
9580 + "decl %0\n"
9581 + "int $4\n0:\n"
9582 + _ASM_EXTABLE(0b, 0b)
9583 +#endif
9584 +
9585 + : "=r" (new)
9586 + : "0" (c));
9587 +
9588 + val = atomic_cmpxchg(v, c, new);
9589 + if (val == c)
9590 + return 1;
9591 + c = val;
9592 + } while (c);
9593 +
9594 + return 0;
9595 +}
9596
9597 /*
9598 * atomic_dec_if_positive - decrement by 1 if old value positive
9599 @@ -293,14 +552,37 @@ static inline void atomic_or_long(unsigned long *v1, unsigned long v2)
9600 #endif
9601
9602 /* These are x86-specific, used by some header files */
9603 -#define atomic_clear_mask(mask, addr) \
9604 - asm volatile(LOCK_PREFIX "andl %0,%1" \
9605 - : : "r" (~(mask)), "m" (*(addr)) : "memory")
9606 +static inline void atomic_clear_mask(unsigned int mask, atomic_t *v)
9607 +{
9608 + asm volatile(LOCK_PREFIX "andl %1,%0"
9609 + : "+m" (v->counter)
9610 + : "r" (~(mask))
9611 + : "memory");
9612 +}
9613
9614 -#define atomic_set_mask(mask, addr) \
9615 - asm volatile(LOCK_PREFIX "orl %0,%1" \
9616 - : : "r" ((unsigned)(mask)), "m" (*(addr)) \
9617 - : "memory")
9618 +static inline void atomic_clear_mask_unchecked(unsigned int mask, atomic_unchecked_t *v)
9619 +{
9620 + asm volatile(LOCK_PREFIX "andl %1,%0"
9621 + : "+m" (v->counter)
9622 + : "r" (~(mask))
9623 + : "memory");
9624 +}
9625 +
9626 +static inline void atomic_set_mask(unsigned int mask, atomic_t *v)
9627 +{
9628 + asm volatile(LOCK_PREFIX "orl %1,%0"
9629 + : "+m" (v->counter)
9630 + : "r" (mask)
9631 + : "memory");
9632 +}
9633 +
9634 +static inline void atomic_set_mask_unchecked(unsigned int mask, atomic_unchecked_t *v)
9635 +{
9636 + asm volatile(LOCK_PREFIX "orl %1,%0"
9637 + : "+m" (v->counter)
9638 + : "r" (mask)
9639 + : "memory");
9640 +}
9641
9642 /* Atomic operations are already serializing on x86 */
9643 #define smp_mb__before_atomic_dec() barrier()
9644 diff --git a/arch/x86/include/asm/atomic64_32.h b/arch/x86/include/asm/atomic64_32.h
9645 index b154de7..aadebd8 100644
9646 --- a/arch/x86/include/asm/atomic64_32.h
9647 +++ b/arch/x86/include/asm/atomic64_32.h
9648 @@ -12,6 +12,14 @@ typedef struct {
9649 u64 __aligned(8) counter;
9650 } atomic64_t;
9651
9652 +#ifdef CONFIG_PAX_REFCOUNT
9653 +typedef struct {
9654 + u64 __aligned(8) counter;
9655 +} atomic64_unchecked_t;
9656 +#else
9657 +typedef atomic64_t atomic64_unchecked_t;
9658 +#endif
9659 +
9660 #define ATOMIC64_INIT(val) { (val) }
9661
9662 #define __ATOMIC64_DECL(sym) void atomic64_##sym(atomic64_t *, ...)
9663 @@ -37,21 +45,31 @@ typedef struct {
9664 ATOMIC64_DECL_ONE(sym##_386)
9665
9666 ATOMIC64_DECL_ONE(add_386);
9667 +ATOMIC64_DECL_ONE(add_unchecked_386);
9668 ATOMIC64_DECL_ONE(sub_386);
9669 +ATOMIC64_DECL_ONE(sub_unchecked_386);
9670 ATOMIC64_DECL_ONE(inc_386);
9671 +ATOMIC64_DECL_ONE(inc_unchecked_386);
9672 ATOMIC64_DECL_ONE(dec_386);
9673 +ATOMIC64_DECL_ONE(dec_unchecked_386);
9674 #endif
9675
9676 #define alternative_atomic64(f, out, in...) \
9677 __alternative_atomic64(f, f, ASM_OUTPUT2(out), ## in)
9678
9679 ATOMIC64_DECL(read);
9680 +ATOMIC64_DECL(read_unchecked);
9681 ATOMIC64_DECL(set);
9682 +ATOMIC64_DECL(set_unchecked);
9683 ATOMIC64_DECL(xchg);
9684 ATOMIC64_DECL(add_return);
9685 +ATOMIC64_DECL(add_return_unchecked);
9686 ATOMIC64_DECL(sub_return);
9687 +ATOMIC64_DECL(sub_return_unchecked);
9688 ATOMIC64_DECL(inc_return);
9689 +ATOMIC64_DECL(inc_return_unchecked);
9690 ATOMIC64_DECL(dec_return);
9691 +ATOMIC64_DECL(dec_return_unchecked);
9692 ATOMIC64_DECL(dec_if_positive);
9693 ATOMIC64_DECL(inc_not_zero);
9694 ATOMIC64_DECL(add_unless);
9695 @@ -77,6 +95,21 @@ static inline long long atomic64_cmpxchg(atomic64_t *v, long long o, long long n
9696 }
9697
9698 /**
9699 + * atomic64_cmpxchg_unchecked - cmpxchg atomic64 variable
9700 + * @p: pointer to type atomic64_unchecked_t
9701 + * @o: expected value
9702 + * @n: new value
9703 + *
9704 + * Atomically sets @v to @n if it was equal to @o and returns
9705 + * the old value.
9706 + */
9707 +
9708 +static inline long long atomic64_cmpxchg_unchecked(atomic64_unchecked_t *v, long long o, long long n)
9709 +{
9710 + return cmpxchg64(&v->counter, o, n);
9711 +}
9712 +
9713 +/**
9714 * atomic64_xchg - xchg atomic64 variable
9715 * @v: pointer to type atomic64_t
9716 * @n: value to assign
9717 @@ -112,6 +145,22 @@ static inline void atomic64_set(atomic64_t *v, long long i)
9718 }
9719
9720 /**
9721 + * atomic64_set_unchecked - set atomic64 variable
9722 + * @v: pointer to type atomic64_unchecked_t
9723 + * @n: value to assign
9724 + *
9725 + * Atomically sets the value of @v to @n.
9726 + */
9727 +static inline void atomic64_set_unchecked(atomic64_unchecked_t *v, long long i)
9728 +{
9729 + unsigned high = (unsigned)(i >> 32);
9730 + unsigned low = (unsigned)i;
9731 + alternative_atomic64(set, /* no output */,
9732 + "S" (v), "b" (low), "c" (high)
9733 + : "eax", "edx", "memory");
9734 +}
9735 +
9736 +/**
9737 * atomic64_read - read atomic64 variable
9738 * @v: pointer to type atomic64_t
9739 *
9740 @@ -125,6 +174,19 @@ static inline long long atomic64_read(const atomic64_t *v)
9741 }
9742
9743 /**
9744 + * atomic64_read_unchecked - read atomic64 variable
9745 + * @v: pointer to type atomic64_unchecked_t
9746 + *
9747 + * Atomically reads the value of @v and returns it.
9748 + */
9749 +static inline long long atomic64_read_unchecked(atomic64_unchecked_t *v)
9750 +{
9751 + long long r;
9752 + alternative_atomic64(read, "=&A" (r), "c" (v) : "memory");
9753 + return r;
9754 + }
9755 +
9756 +/**
9757 * atomic64_add_return - add and return
9758 * @i: integer value to add
9759 * @v: pointer to type atomic64_t
9760 @@ -139,6 +201,21 @@ static inline long long atomic64_add_return(long long i, atomic64_t *v)
9761 return i;
9762 }
9763
9764 +/**
9765 + * atomic64_add_return_unchecked - add and return
9766 + * @i: integer value to add
9767 + * @v: pointer to type atomic64_unchecked_t
9768 + *
9769 + * Atomically adds @i to @v and returns @i + *@v
9770 + */
9771 +static inline long long atomic64_add_return_unchecked(long long i, atomic64_unchecked_t *v)
9772 +{
9773 + alternative_atomic64(add_return_unchecked,
9774 + ASM_OUTPUT2("+A" (i), "+c" (v)),
9775 + ASM_NO_INPUT_CLOBBER("memory"));
9776 + return i;
9777 +}
9778 +
9779 /*
9780 * Other variants with different arithmetic operators:
9781 */
9782 @@ -158,6 +235,14 @@ static inline long long atomic64_inc_return(atomic64_t *v)
9783 return a;
9784 }
9785
9786 +static inline long long atomic64_inc_return_unchecked(atomic64_unchecked_t *v)
9787 +{
9788 + long long a;
9789 + alternative_atomic64(inc_return_unchecked, "=&A" (a),
9790 + "S" (v) : "memory", "ecx");
9791 + return a;
9792 +}
9793 +
9794 static inline long long atomic64_dec_return(atomic64_t *v)
9795 {
9796 long long a;
9797 @@ -182,6 +267,21 @@ static inline long long atomic64_add(long long i, atomic64_t *v)
9798 }
9799
9800 /**
9801 + * atomic64_add_unchecked - add integer to atomic64 variable
9802 + * @i: integer value to add
9803 + * @v: pointer to type atomic64_unchecked_t
9804 + *
9805 + * Atomically adds @i to @v.
9806 + */
9807 +static inline long long atomic64_add_unchecked(long long i, atomic64_unchecked_t *v)
9808 +{
9809 + __alternative_atomic64(add_unchecked, add_return_unchecked,
9810 + ASM_OUTPUT2("+A" (i), "+c" (v)),
9811 + ASM_NO_INPUT_CLOBBER("memory"));
9812 + return i;
9813 +}
9814 +
9815 +/**
9816 * atomic64_sub - subtract the atomic64 variable
9817 * @i: integer value to subtract
9818 * @v: pointer to type atomic64_t
9819 diff --git a/arch/x86/include/asm/atomic64_64.h b/arch/x86/include/asm/atomic64_64.h
9820 index 0e1cbfc..5623683 100644
9821 --- a/arch/x86/include/asm/atomic64_64.h
9822 +++ b/arch/x86/include/asm/atomic64_64.h
9823 @@ -18,7 +18,19 @@
9824 */
9825 static inline long atomic64_read(const atomic64_t *v)
9826 {
9827 - return (*(volatile long *)&(v)->counter);
9828 + return (*(volatile const long *)&(v)->counter);
9829 +}
9830 +
9831 +/**
9832 + * atomic64_read_unchecked - read atomic64 variable
9833 + * @v: pointer of type atomic64_unchecked_t
9834 + *
9835 + * Atomically reads the value of @v.
9836 + * Doesn't imply a read memory barrier.
9837 + */
9838 +static inline long atomic64_read_unchecked(const atomic64_unchecked_t *v)
9839 +{
9840 + return (*(volatile const long *)&(v)->counter);
9841 }
9842
9843 /**
9844 @@ -34,6 +46,18 @@ static inline void atomic64_set(atomic64_t *v, long i)
9845 }
9846
9847 /**
9848 + * atomic64_set_unchecked - set atomic64 variable
9849 + * @v: pointer to type atomic64_unchecked_t
9850 + * @i: required value
9851 + *
9852 + * Atomically sets the value of @v to @i.
9853 + */
9854 +static inline void atomic64_set_unchecked(atomic64_unchecked_t *v, long i)
9855 +{
9856 + v->counter = i;
9857 +}
9858 +
9859 +/**
9860 * atomic64_add - add integer to atomic64 variable
9861 * @i: integer value to add
9862 * @v: pointer to type atomic64_t
9863 @@ -42,6 +66,28 @@ static inline void atomic64_set(atomic64_t *v, long i)
9864 */
9865 static inline void atomic64_add(long i, atomic64_t *v)
9866 {
9867 + asm volatile(LOCK_PREFIX "addq %1,%0\n"
9868 +
9869 +#ifdef CONFIG_PAX_REFCOUNT
9870 + "jno 0f\n"
9871 + LOCK_PREFIX "subq %1,%0\n"
9872 + "int $4\n0:\n"
9873 + _ASM_EXTABLE(0b, 0b)
9874 +#endif
9875 +
9876 + : "=m" (v->counter)
9877 + : "er" (i), "m" (v->counter));
9878 +}
9879 +
9880 +/**
9881 + * atomic64_add_unchecked - add integer to atomic64 variable
9882 + * @i: integer value to add
9883 + * @v: pointer to type atomic64_unchecked_t
9884 + *
9885 + * Atomically adds @i to @v.
9886 + */
9887 +static inline void atomic64_add_unchecked(long i, atomic64_unchecked_t *v)
9888 +{
9889 asm volatile(LOCK_PREFIX "addq %1,%0"
9890 : "=m" (v->counter)
9891 : "er" (i), "m" (v->counter));
9892 @@ -56,7 +102,29 @@ static inline void atomic64_add(long i, atomic64_t *v)
9893 */
9894 static inline void atomic64_sub(long i, atomic64_t *v)
9895 {
9896 - asm volatile(LOCK_PREFIX "subq %1,%0"
9897 + asm volatile(LOCK_PREFIX "subq %1,%0\n"
9898 +
9899 +#ifdef CONFIG_PAX_REFCOUNT
9900 + "jno 0f\n"
9901 + LOCK_PREFIX "addq %1,%0\n"
9902 + "int $4\n0:\n"
9903 + _ASM_EXTABLE(0b, 0b)
9904 +#endif
9905 +
9906 + : "=m" (v->counter)
9907 + : "er" (i), "m" (v->counter));
9908 +}
9909 +
9910 +/**
9911 + * atomic64_sub_unchecked - subtract the atomic64 variable
9912 + * @i: integer value to subtract
9913 + * @v: pointer to type atomic64_unchecked_t
9914 + *
9915 + * Atomically subtracts @i from @v.
9916 + */
9917 +static inline void atomic64_sub_unchecked(long i, atomic64_unchecked_t *v)
9918 +{
9919 + asm volatile(LOCK_PREFIX "subq %1,%0\n"
9920 : "=m" (v->counter)
9921 : "er" (i), "m" (v->counter));
9922 }
9923 @@ -74,7 +142,16 @@ static inline int atomic64_sub_and_test(long i, atomic64_t *v)
9924 {
9925 unsigned char c;
9926
9927 - asm volatile(LOCK_PREFIX "subq %2,%0; sete %1"
9928 + asm volatile(LOCK_PREFIX "subq %2,%0\n"
9929 +
9930 +#ifdef CONFIG_PAX_REFCOUNT
9931 + "jno 0f\n"
9932 + LOCK_PREFIX "addq %2,%0\n"
9933 + "int $4\n0:\n"
9934 + _ASM_EXTABLE(0b, 0b)
9935 +#endif
9936 +
9937 + "sete %1\n"
9938 : "=m" (v->counter), "=qm" (c)
9939 : "er" (i), "m" (v->counter) : "memory");
9940 return c;
9941 @@ -88,6 +165,27 @@ static inline int atomic64_sub_and_test(long i, atomic64_t *v)
9942 */
9943 static inline void atomic64_inc(atomic64_t *v)
9944 {
9945 + asm volatile(LOCK_PREFIX "incq %0\n"
9946 +
9947 +#ifdef CONFIG_PAX_REFCOUNT
9948 + "jno 0f\n"
9949 + LOCK_PREFIX "decq %0\n"
9950 + "int $4\n0:\n"
9951 + _ASM_EXTABLE(0b, 0b)
9952 +#endif
9953 +
9954 + : "=m" (v->counter)
9955 + : "m" (v->counter));
9956 +}
9957 +
9958 +/**
9959 + * atomic64_inc_unchecked - increment atomic64 variable
9960 + * @v: pointer to type atomic64_unchecked_t
9961 + *
9962 + * Atomically increments @v by 1.
9963 + */
9964 +static inline void atomic64_inc_unchecked(atomic64_unchecked_t *v)
9965 +{
9966 asm volatile(LOCK_PREFIX "incq %0"
9967 : "=m" (v->counter)
9968 : "m" (v->counter));
9969 @@ -101,7 +199,28 @@ static inline void atomic64_inc(atomic64_t *v)
9970 */
9971 static inline void atomic64_dec(atomic64_t *v)
9972 {
9973 - asm volatile(LOCK_PREFIX "decq %0"
9974 + asm volatile(LOCK_PREFIX "decq %0\n"
9975 +
9976 +#ifdef CONFIG_PAX_REFCOUNT
9977 + "jno 0f\n"
9978 + LOCK_PREFIX "incq %0\n"
9979 + "int $4\n0:\n"
9980 + _ASM_EXTABLE(0b, 0b)
9981 +#endif
9982 +
9983 + : "=m" (v->counter)
9984 + : "m" (v->counter));
9985 +}
9986 +
9987 +/**
9988 + * atomic64_dec_unchecked - decrement atomic64 variable
9989 + * @v: pointer to type atomic64_t
9990 + *
9991 + * Atomically decrements @v by 1.
9992 + */
9993 +static inline void atomic64_dec_unchecked(atomic64_unchecked_t *v)
9994 +{
9995 + asm volatile(LOCK_PREFIX "decq %0\n"
9996 : "=m" (v->counter)
9997 : "m" (v->counter));
9998 }
9999 @@ -118,7 +237,16 @@ static inline int atomic64_dec_and_test(atomic64_t *v)
10000 {
10001 unsigned char c;
10002
10003 - asm volatile(LOCK_PREFIX "decq %0; sete %1"
10004 + asm volatile(LOCK_PREFIX "decq %0\n"
10005 +
10006 +#ifdef CONFIG_PAX_REFCOUNT
10007 + "jno 0f\n"
10008 + LOCK_PREFIX "incq %0\n"
10009 + "int $4\n0:\n"
10010 + _ASM_EXTABLE(0b, 0b)
10011 +#endif
10012 +
10013 + "sete %1\n"
10014 : "=m" (v->counter), "=qm" (c)
10015 : "m" (v->counter) : "memory");
10016 return c != 0;
10017 @@ -136,7 +264,16 @@ static inline int atomic64_inc_and_test(atomic64_t *v)
10018 {
10019 unsigned char c;
10020
10021 - asm volatile(LOCK_PREFIX "incq %0; sete %1"
10022 + asm volatile(LOCK_PREFIX "incq %0\n"
10023 +
10024 +#ifdef CONFIG_PAX_REFCOUNT
10025 + "jno 0f\n"
10026 + LOCK_PREFIX "decq %0\n"
10027 + "int $4\n0:\n"
10028 + _ASM_EXTABLE(0b, 0b)
10029 +#endif
10030 +
10031 + "sete %1\n"
10032 : "=m" (v->counter), "=qm" (c)
10033 : "m" (v->counter) : "memory");
10034 return c != 0;
10035 @@ -155,7 +292,16 @@ static inline int atomic64_add_negative(long i, atomic64_t *v)
10036 {
10037 unsigned char c;
10038
10039 - asm volatile(LOCK_PREFIX "addq %2,%0; sets %1"
10040 + asm volatile(LOCK_PREFIX "addq %2,%0\n"
10041 +
10042 +#ifdef CONFIG_PAX_REFCOUNT
10043 + "jno 0f\n"
10044 + LOCK_PREFIX "subq %2,%0\n"
10045 + "int $4\n0:\n"
10046 + _ASM_EXTABLE(0b, 0b)
10047 +#endif
10048 +
10049 + "sets %1\n"
10050 : "=m" (v->counter), "=qm" (c)
10051 : "er" (i), "m" (v->counter) : "memory");
10052 return c;
10053 @@ -170,6 +316,18 @@ static inline int atomic64_add_negative(long i, atomic64_t *v)
10054 */
10055 static inline long atomic64_add_return(long i, atomic64_t *v)
10056 {
10057 + return i + xadd_check_overflow(&v->counter, i);
10058 +}
10059 +
10060 +/**
10061 + * atomic64_add_return_unchecked - add and return
10062 + * @i: integer value to add
10063 + * @v: pointer to type atomic64_unchecked_t
10064 + *
10065 + * Atomically adds @i to @v and returns @i + @v
10066 + */
10067 +static inline long atomic64_add_return_unchecked(long i, atomic64_unchecked_t *v)
10068 +{
10069 return i + xadd(&v->counter, i);
10070 }
10071
10072 @@ -179,6 +337,10 @@ static inline long atomic64_sub_return(long i, atomic64_t *v)
10073 }
10074
10075 #define atomic64_inc_return(v) (atomic64_add_return(1, (v)))
10076 +static inline long atomic64_inc_return_unchecked(atomic64_unchecked_t *v)
10077 +{
10078 + return atomic64_add_return_unchecked(1, v);
10079 +}
10080 #define atomic64_dec_return(v) (atomic64_sub_return(1, (v)))
10081
10082 static inline long atomic64_cmpxchg(atomic64_t *v, long old, long new)
10083 @@ -186,6 +348,11 @@ static inline long atomic64_cmpxchg(atomic64_t *v, long old, long new)
10084 return cmpxchg(&v->counter, old, new);
10085 }
10086
10087 +static inline long atomic64_cmpxchg_unchecked(atomic64_unchecked_t *v, long old, long new)
10088 +{
10089 + return cmpxchg(&v->counter, old, new);
10090 +}
10091 +
10092 static inline long atomic64_xchg(atomic64_t *v, long new)
10093 {
10094 return xchg(&v->counter, new);
10095 @@ -202,17 +369,30 @@ static inline long atomic64_xchg(atomic64_t *v, long new)
10096 */
10097 static inline int atomic64_add_unless(atomic64_t *v, long a, long u)
10098 {
10099 - long c, old;
10100 + long c, old, new;
10101 c = atomic64_read(v);
10102 for (;;) {
10103 - if (unlikely(c == (u)))
10104 + if (unlikely(c == u))
10105 break;
10106 - old = atomic64_cmpxchg((v), c, c + (a));
10107 +
10108 + asm volatile("add %2,%0\n"
10109 +
10110 +#ifdef CONFIG_PAX_REFCOUNT
10111 + "jno 0f\n"
10112 + "sub %2,%0\n"
10113 + "int $4\n0:\n"
10114 + _ASM_EXTABLE(0b, 0b)
10115 +#endif
10116 +
10117 + : "=r" (new)
10118 + : "0" (c), "ir" (a));
10119 +
10120 + old = atomic64_cmpxchg(v, c, new);
10121 if (likely(old == c))
10122 break;
10123 c = old;
10124 }
10125 - return c != (u);
10126 + return c != u;
10127 }
10128
10129 #define atomic64_inc_not_zero(v) atomic64_add_unless((v), 1, 0)
10130 diff --git a/arch/x86/include/asm/bitops.h b/arch/x86/include/asm/bitops.h
10131 index 72f5009..2f8b9a9 100644
10132 --- a/arch/x86/include/asm/bitops.h
10133 +++ b/arch/x86/include/asm/bitops.h
10134 @@ -40,7 +40,7 @@
10135 * a mask operation on a byte.
10136 */
10137 #define IS_IMMEDIATE(nr) (__builtin_constant_p(nr))
10138 -#define CONST_MASK_ADDR(nr, addr) BITOP_ADDR((void *)(addr) + ((nr)>>3))
10139 +#define CONST_MASK_ADDR(nr, addr) BITOP_ADDR((volatile void *)(addr) + ((nr)>>3))
10140 #define CONST_MASK(nr) (1 << ((nr) & 7))
10141
10142 /**
10143 diff --git a/arch/x86/include/asm/boot.h b/arch/x86/include/asm/boot.h
10144 index b13fe63..0dab13a 100644
10145 --- a/arch/x86/include/asm/boot.h
10146 +++ b/arch/x86/include/asm/boot.h
10147 @@ -11,10 +11,15 @@
10148 #include <asm/pgtable_types.h>
10149
10150 /* Physical address where kernel should be loaded. */
10151 -#define LOAD_PHYSICAL_ADDR ((CONFIG_PHYSICAL_START \
10152 +#define ____LOAD_PHYSICAL_ADDR ((CONFIG_PHYSICAL_START \
10153 + (CONFIG_PHYSICAL_ALIGN - 1)) \
10154 & ~(CONFIG_PHYSICAL_ALIGN - 1))
10155
10156 +#ifndef __ASSEMBLY__
10157 +extern unsigned char __LOAD_PHYSICAL_ADDR[];
10158 +#define LOAD_PHYSICAL_ADDR ((unsigned long)__LOAD_PHYSICAL_ADDR)
10159 +#endif
10160 +
10161 /* Minimum kernel alignment, as a power of two */
10162 #ifdef CONFIG_X86_64
10163 #define MIN_KERNEL_ALIGN_LG2 PMD_SHIFT
10164 diff --git a/arch/x86/include/asm/cache.h b/arch/x86/include/asm/cache.h
10165 index 48f99f1..d78ebf9 100644
10166 --- a/arch/x86/include/asm/cache.h
10167 +++ b/arch/x86/include/asm/cache.h
10168 @@ -5,12 +5,13 @@
10169
10170 /* L1 cache line size */
10171 #define L1_CACHE_SHIFT (CONFIG_X86_L1_CACHE_SHIFT)
10172 -#define L1_CACHE_BYTES (1 << L1_CACHE_SHIFT)
10173 +#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT)
10174
10175 #define __read_mostly __attribute__((__section__(".data..read_mostly")))
10176 +#define __read_only __attribute__((__section__(".data..read_only")))
10177
10178 #define INTERNODE_CACHE_SHIFT CONFIG_X86_INTERNODE_CACHE_SHIFT
10179 -#define INTERNODE_CACHE_BYTES (1 << INTERNODE_CACHE_SHIFT)
10180 +#define INTERNODE_CACHE_BYTES (_AC(1,UL) << INTERNODE_CACHE_SHIFT)
10181
10182 #ifdef CONFIG_X86_VSMP
10183 #ifdef CONFIG_SMP
10184 diff --git a/arch/x86/include/asm/cacheflush.h b/arch/x86/include/asm/cacheflush.h
10185 index 9863ee3..4a1f8e1 100644
10186 --- a/arch/x86/include/asm/cacheflush.h
10187 +++ b/arch/x86/include/asm/cacheflush.h
10188 @@ -27,7 +27,7 @@ static inline unsigned long get_page_memtype(struct page *pg)
10189 unsigned long pg_flags = pg->flags & _PGMT_MASK;
10190
10191 if (pg_flags == _PGMT_DEFAULT)
10192 - return -1;
10193 + return ~0UL;
10194 else if (pg_flags == _PGMT_WC)
10195 return _PAGE_CACHE_WC;
10196 else if (pg_flags == _PGMT_UC_MINUS)
10197 diff --git a/arch/x86/include/asm/checksum_32.h b/arch/x86/include/asm/checksum_32.h
10198 index 46fc474..b02b0f9 100644
10199 --- a/arch/x86/include/asm/checksum_32.h
10200 +++ b/arch/x86/include/asm/checksum_32.h
10201 @@ -31,6 +31,14 @@ asmlinkage __wsum csum_partial_copy_generic(const void *src, void *dst,
10202 int len, __wsum sum,
10203 int *src_err_ptr, int *dst_err_ptr);
10204
10205 +asmlinkage __wsum csum_partial_copy_generic_to_user(const void *src, void *dst,
10206 + int len, __wsum sum,
10207 + int *src_err_ptr, int *dst_err_ptr);
10208 +
10209 +asmlinkage __wsum csum_partial_copy_generic_from_user(const void *src, void *dst,
10210 + int len, __wsum sum,
10211 + int *src_err_ptr, int *dst_err_ptr);
10212 +
10213 /*
10214 * Note: when you get a NULL pointer exception here this means someone
10215 * passed in an incorrect kernel address to one of these functions.
10216 @@ -50,7 +58,7 @@ static inline __wsum csum_partial_copy_from_user(const void __user *src,
10217 int *err_ptr)
10218 {
10219 might_sleep();
10220 - return csum_partial_copy_generic((__force void *)src, dst,
10221 + return csum_partial_copy_generic_from_user((__force void *)src, dst,
10222 len, sum, err_ptr, NULL);
10223 }
10224
10225 @@ -178,7 +186,7 @@ static inline __wsum csum_and_copy_to_user(const void *src,
10226 {
10227 might_sleep();
10228 if (access_ok(VERIFY_WRITE, dst, len))
10229 - return csum_partial_copy_generic(src, (__force void *)dst,
10230 + return csum_partial_copy_generic_to_user(src, (__force void *)dst,
10231 len, sum, NULL, err_ptr);
10232
10233 if (len)
10234 diff --git a/arch/x86/include/asm/cmpxchg.h b/arch/x86/include/asm/cmpxchg.h
10235 index 99480e5..d81165b 100644
10236 --- a/arch/x86/include/asm/cmpxchg.h
10237 +++ b/arch/x86/include/asm/cmpxchg.h
10238 @@ -14,8 +14,12 @@ extern void __cmpxchg_wrong_size(void)
10239 __compiletime_error("Bad argument size for cmpxchg");
10240 extern void __xadd_wrong_size(void)
10241 __compiletime_error("Bad argument size for xadd");
10242 +extern void __xadd_check_overflow_wrong_size(void)
10243 + __compiletime_error("Bad argument size for xadd_check_overflow");
10244 extern void __add_wrong_size(void)
10245 __compiletime_error("Bad argument size for add");
10246 +extern void __add_check_overflow_wrong_size(void)
10247 + __compiletime_error("Bad argument size for add_check_overflow");
10248
10249 /*
10250 * Constants for operation sizes. On 32-bit, the 64-bit size it set to
10251 @@ -67,6 +71,34 @@ extern void __add_wrong_size(void)
10252 __ret; \
10253 })
10254
10255 +#define __xchg_op_check_overflow(ptr, arg, op, lock) \
10256 + ({ \
10257 + __typeof__ (*(ptr)) __ret = (arg); \
10258 + switch (sizeof(*(ptr))) { \
10259 + case __X86_CASE_L: \
10260 + asm volatile (lock #op "l %0, %1\n" \
10261 + "jno 0f\n" \
10262 + "mov %0,%1\n" \
10263 + "int $4\n0:\n" \
10264 + _ASM_EXTABLE(0b, 0b) \
10265 + : "+r" (__ret), "+m" (*(ptr)) \
10266 + : : "memory", "cc"); \
10267 + break; \
10268 + case __X86_CASE_Q: \
10269 + asm volatile (lock #op "q %q0, %1\n" \
10270 + "jno 0f\n" \
10271 + "mov %0,%1\n" \
10272 + "int $4\n0:\n" \
10273 + _ASM_EXTABLE(0b, 0b) \
10274 + : "+r" (__ret), "+m" (*(ptr)) \
10275 + : : "memory", "cc"); \
10276 + break; \
10277 + default: \
10278 + __ ## op ## _check_overflow_wrong_size(); \
10279 + } \
10280 + __ret; \
10281 + })
10282 +
10283 /*
10284 * Note: no "lock" prefix even on SMP: xchg always implies lock anyway.
10285 * Since this is generally used to protect other memory information, we
10286 @@ -167,6 +199,9 @@ extern void __add_wrong_size(void)
10287 #define xadd_sync(ptr, inc) __xadd((ptr), (inc), "lock; ")
10288 #define xadd_local(ptr, inc) __xadd((ptr), (inc), "")
10289
10290 +#define __xadd_check_overflow(ptr, inc, lock) __xchg_op_check_overflow((ptr), (inc), xadd, lock)
10291 +#define xadd_check_overflow(ptr, inc) __xadd_check_overflow((ptr), (inc), LOCK_PREFIX)
10292 +
10293 #define __add(ptr, inc, lock) \
10294 ({ \
10295 __typeof__ (*(ptr)) __ret = (inc); \
10296 diff --git a/arch/x86/include/asm/cpufeature.h b/arch/x86/include/asm/cpufeature.h
10297 index 6b7ee5f..9d664b3 100644
10298 --- a/arch/x86/include/asm/cpufeature.h
10299 +++ b/arch/x86/include/asm/cpufeature.h
10300 @@ -202,13 +202,14 @@
10301 #define X86_FEATURE_BMI1 (9*32+ 3) /* 1st group bit manipulation extensions */
10302 #define X86_FEATURE_HLE (9*32+ 4) /* Hardware Lock Elision */
10303 #define X86_FEATURE_AVX2 (9*32+ 5) /* AVX2 instructions */
10304 -#define X86_FEATURE_SMEP (9*32+ 7) /* Supervisor Mode Execution Protection */
10305 +#define X86_FEATURE_SMEP (9*32+ 7) /* Supervisor Mode Execution Prevention */
10306 #define X86_FEATURE_BMI2 (9*32+ 8) /* 2nd group bit manipulation extensions */
10307 #define X86_FEATURE_ERMS (9*32+ 9) /* Enhanced REP MOVSB/STOSB */
10308 #define X86_FEATURE_INVPCID (9*32+10) /* Invalidate Processor Context ID */
10309 #define X86_FEATURE_RTM (9*32+11) /* Restricted Transactional Memory */
10310 #define X86_FEATURE_RDSEED (9*32+18) /* The RDSEED instruction */
10311 #define X86_FEATURE_ADX (9*32+19) /* The ADCX and ADOX instructions */
10312 +#define X86_FEATURE_SMAP (9*32+20) /* Supervisor Mode Access Prevention */
10313
10314 #if defined(__KERNEL__) && !defined(__ASSEMBLY__)
10315
10316 @@ -373,7 +374,7 @@ static __always_inline __pure bool __static_cpu_has(u16 bit)
10317 ".section .discard,\"aw\",@progbits\n"
10318 " .byte 0xff + (4f-3f) - (2b-1b)\n" /* size check */
10319 ".previous\n"
10320 - ".section .altinstr_replacement,\"ax\"\n"
10321 + ".section .altinstr_replacement,\"a\"\n"
10322 "3: movb $1,%0\n"
10323 "4:\n"
10324 ".previous\n"
10325 diff --git a/arch/x86/include/asm/desc.h b/arch/x86/include/asm/desc.h
10326 index 8bf1c06..f723dfd 100644
10327 --- a/arch/x86/include/asm/desc.h
10328 +++ b/arch/x86/include/asm/desc.h
10329 @@ -4,6 +4,7 @@
10330 #include <asm/desc_defs.h>
10331 #include <asm/ldt.h>
10332 #include <asm/mmu.h>
10333 +#include <asm/pgtable.h>
10334
10335 #include <linux/smp.h>
10336 #include <linux/percpu.h>
10337 @@ -17,6 +18,7 @@ static inline void fill_ldt(struct desc_struct *desc, const struct user_desc *in
10338
10339 desc->type = (info->read_exec_only ^ 1) << 1;
10340 desc->type |= info->contents << 2;
10341 + desc->type |= info->seg_not_present ^ 1;
10342
10343 desc->s = 1;
10344 desc->dpl = 0x3;
10345 @@ -35,19 +37,14 @@ static inline void fill_ldt(struct desc_struct *desc, const struct user_desc *in
10346 }
10347
10348 extern struct desc_ptr idt_descr;
10349 -extern gate_desc idt_table[];
10350 extern struct desc_ptr nmi_idt_descr;
10351 -extern gate_desc nmi_idt_table[];
10352 -
10353 -struct gdt_page {
10354 - struct desc_struct gdt[GDT_ENTRIES];
10355 -} __attribute__((aligned(PAGE_SIZE)));
10356 -
10357 -DECLARE_PER_CPU_PAGE_ALIGNED(struct gdt_page, gdt_page);
10358 +extern gate_desc idt_table[256];
10359 +extern gate_desc nmi_idt_table[256];
10360
10361 +extern struct desc_struct cpu_gdt_table[NR_CPUS][PAGE_SIZE / sizeof(struct desc_struct)];
10362 static inline struct desc_struct *get_cpu_gdt_table(unsigned int cpu)
10363 {
10364 - return per_cpu(gdt_page, cpu).gdt;
10365 + return cpu_gdt_table[cpu];
10366 }
10367
10368 #ifdef CONFIG_X86_64
10369 @@ -72,8 +69,14 @@ static inline void pack_gate(gate_desc *gate, unsigned char type,
10370 unsigned long base, unsigned dpl, unsigned flags,
10371 unsigned short seg)
10372 {
10373 - gate->a = (seg << 16) | (base & 0xffff);
10374 - gate->b = (base & 0xffff0000) | (((0x80 | type | (dpl << 5)) & 0xff) << 8);
10375 + gate->gate.offset_low = base;
10376 + gate->gate.seg = seg;
10377 + gate->gate.reserved = 0;
10378 + gate->gate.type = type;
10379 + gate->gate.s = 0;
10380 + gate->gate.dpl = dpl;
10381 + gate->gate.p = 1;
10382 + gate->gate.offset_high = base >> 16;
10383 }
10384
10385 #endif
10386 @@ -118,12 +121,16 @@ static inline void paravirt_free_ldt(struct desc_struct *ldt, unsigned entries)
10387
10388 static inline void native_write_idt_entry(gate_desc *idt, int entry, const gate_desc *gate)
10389 {
10390 + pax_open_kernel();
10391 memcpy(&idt[entry], gate, sizeof(*gate));
10392 + pax_close_kernel();
10393 }
10394
10395 static inline void native_write_ldt_entry(struct desc_struct *ldt, int entry, const void *desc)
10396 {
10397 + pax_open_kernel();
10398 memcpy(&ldt[entry], desc, 8);
10399 + pax_close_kernel();
10400 }
10401
10402 static inline void
10403 @@ -137,7 +144,9 @@ native_write_gdt_entry(struct desc_struct *gdt, int entry, const void *desc, int
10404 default: size = sizeof(*gdt); break;
10405 }
10406
10407 + pax_open_kernel();
10408 memcpy(&gdt[entry], desc, size);
10409 + pax_close_kernel();
10410 }
10411
10412 static inline void pack_descriptor(struct desc_struct *desc, unsigned long base,
10413 @@ -210,7 +219,9 @@ static inline void native_set_ldt(const void *addr, unsigned int entries)
10414
10415 static inline void native_load_tr_desc(void)
10416 {
10417 + pax_open_kernel();
10418 asm volatile("ltr %w0"::"q" (GDT_ENTRY_TSS*8));
10419 + pax_close_kernel();
10420 }
10421
10422 static inline void native_load_gdt(const struct desc_ptr *dtr)
10423 @@ -247,8 +258,10 @@ static inline void native_load_tls(struct thread_struct *t, unsigned int cpu)
10424 struct desc_struct *gdt = get_cpu_gdt_table(cpu);
10425 unsigned int i;
10426
10427 + pax_open_kernel();
10428 for (i = 0; i < GDT_ENTRY_TLS_ENTRIES; i++)
10429 gdt[GDT_ENTRY_TLS_MIN + i] = t->tls_array[i];
10430 + pax_close_kernel();
10431 }
10432
10433 #define _LDT_empty(info) \
10434 @@ -311,7 +324,7 @@ static inline void set_desc_limit(struct desc_struct *desc, unsigned long limit)
10435 }
10436
10437 #ifdef CONFIG_X86_64
10438 -static inline void set_nmi_gate(int gate, void *addr)
10439 +static inline void set_nmi_gate(int gate, const void *addr)
10440 {
10441 gate_desc s;
10442
10443 @@ -320,7 +333,7 @@ static inline void set_nmi_gate(int gate, void *addr)
10444 }
10445 #endif
10446
10447 -static inline void _set_gate(int gate, unsigned type, void *addr,
10448 +static inline void _set_gate(int gate, unsigned type, const void *addr,
10449 unsigned dpl, unsigned ist, unsigned seg)
10450 {
10451 gate_desc s;
10452 @@ -339,7 +352,7 @@ static inline void _set_gate(int gate, unsigned type, void *addr,
10453 * Pentium F0 0F bugfix can have resulted in the mapped
10454 * IDT being write-protected.
10455 */
10456 -static inline void set_intr_gate(unsigned int n, void *addr)
10457 +static inline void set_intr_gate(unsigned int n, const void *addr)
10458 {
10459 BUG_ON((unsigned)n > 0xFF);
10460 _set_gate(n, GATE_INTERRUPT, addr, 0, 0, __KERNEL_CS);
10461 @@ -369,19 +382,19 @@ static inline void alloc_intr_gate(unsigned int n, void *addr)
10462 /*
10463 * This routine sets up an interrupt gate at directory privilege level 3.
10464 */
10465 -static inline void set_system_intr_gate(unsigned int n, void *addr)
10466 +static inline void set_system_intr_gate(unsigned int n, const void *addr)
10467 {
10468 BUG_ON((unsigned)n > 0xFF);
10469 _set_gate(n, GATE_INTERRUPT, addr, 0x3, 0, __KERNEL_CS);
10470 }
10471
10472 -static inline void set_system_trap_gate(unsigned int n, void *addr)
10473 +static inline void set_system_trap_gate(unsigned int n, const void *addr)
10474 {
10475 BUG_ON((unsigned)n > 0xFF);
10476 _set_gate(n, GATE_TRAP, addr, 0x3, 0, __KERNEL_CS);
10477 }
10478
10479 -static inline void set_trap_gate(unsigned int n, void *addr)
10480 +static inline void set_trap_gate(unsigned int n, const void *addr)
10481 {
10482 BUG_ON((unsigned)n > 0xFF);
10483 _set_gate(n, GATE_TRAP, addr, 0, 0, __KERNEL_CS);
10484 @@ -390,19 +403,31 @@ static inline void set_trap_gate(unsigned int n, void *addr)
10485 static inline void set_task_gate(unsigned int n, unsigned int gdt_entry)
10486 {
10487 BUG_ON((unsigned)n > 0xFF);
10488 - _set_gate(n, GATE_TASK, (void *)0, 0, 0, (gdt_entry<<3));
10489 + _set_gate(n, GATE_TASK, (const void *)0, 0, 0, (gdt_entry<<3));
10490 }
10491
10492 -static inline void set_intr_gate_ist(int n, void *addr, unsigned ist)
10493 +static inline void set_intr_gate_ist(int n, const void *addr, unsigned ist)
10494 {
10495 BUG_ON((unsigned)n > 0xFF);
10496 _set_gate(n, GATE_INTERRUPT, addr, 0, ist, __KERNEL_CS);
10497 }
10498
10499 -static inline void set_system_intr_gate_ist(int n, void *addr, unsigned ist)
10500 +static inline void set_system_intr_gate_ist(int n, const void *addr, unsigned ist)
10501 {
10502 BUG_ON((unsigned)n > 0xFF);
10503 _set_gate(n, GATE_INTERRUPT, addr, 0x3, ist, __KERNEL_CS);
10504 }
10505
10506 +#ifdef CONFIG_X86_32
10507 +static inline void set_user_cs(unsigned long base, unsigned long limit, int cpu)
10508 +{
10509 + struct desc_struct d;
10510 +
10511 + if (likely(limit))
10512 + limit = (limit - 1UL) >> PAGE_SHIFT;
10513 + pack_descriptor(&d, base, limit, 0xFB, 0xC);
10514 + write_gdt_entry(get_cpu_gdt_table(cpu), GDT_ENTRY_DEFAULT_USER_CS, &d, DESCTYPE_S);
10515 +}
10516 +#endif
10517 +
10518 #endif /* _ASM_X86_DESC_H */
10519 diff --git a/arch/x86/include/asm/desc_defs.h b/arch/x86/include/asm/desc_defs.h
10520 index 278441f..b95a174 100644
10521 --- a/arch/x86/include/asm/desc_defs.h
10522 +++ b/arch/x86/include/asm/desc_defs.h
10523 @@ -31,6 +31,12 @@ struct desc_struct {
10524 unsigned base1: 8, type: 4, s: 1, dpl: 2, p: 1;
10525 unsigned limit: 4, avl: 1, l: 1, d: 1, g: 1, base2: 8;
10526 };
10527 + struct {
10528 + u16 offset_low;
10529 + u16 seg;
10530 + unsigned reserved: 8, type: 4, s: 1, dpl: 2, p: 1;
10531 + unsigned offset_high: 16;
10532 + } gate;
10533 };
10534 } __attribute__((packed));
10535
10536 diff --git a/arch/x86/include/asm/e820.h b/arch/x86/include/asm/e820.h
10537 index 3778256..c5d4fce 100644
10538 --- a/arch/x86/include/asm/e820.h
10539 +++ b/arch/x86/include/asm/e820.h
10540 @@ -69,7 +69,7 @@ struct e820map {
10541 #define ISA_START_ADDRESS 0xa0000
10542 #define ISA_END_ADDRESS 0x100000
10543
10544 -#define BIOS_BEGIN 0x000a0000
10545 +#define BIOS_BEGIN 0x000c0000
10546 #define BIOS_END 0x00100000
10547
10548 #define BIOS_ROM_BASE 0xffe00000
10549 diff --git a/arch/x86/include/asm/elf.h b/arch/x86/include/asm/elf.h
10550 index 5939f44..f8845f6 100644
10551 --- a/arch/x86/include/asm/elf.h
10552 +++ b/arch/x86/include/asm/elf.h
10553 @@ -243,7 +243,25 @@ extern int force_personality32;
10554 the loader. We need to make sure that it is out of the way of the program
10555 that it will "exec", and that there is sufficient room for the brk. */
10556
10557 +#ifdef CONFIG_PAX_SEGMEXEC
10558 +#define ELF_ET_DYN_BASE ((current->mm->pax_flags & MF_PAX_SEGMEXEC) ? SEGMEXEC_TASK_SIZE/3*2 : TASK_SIZE/3*2)
10559 +#else
10560 #define ELF_ET_DYN_BASE (TASK_SIZE / 3 * 2)
10561 +#endif
10562 +
10563 +#ifdef CONFIG_PAX_ASLR
10564 +#ifdef CONFIG_X86_32
10565 +#define PAX_ELF_ET_DYN_BASE 0x10000000UL
10566 +
10567 +#define PAX_DELTA_MMAP_LEN (current->mm->pax_flags & MF_PAX_SEGMEXEC ? 15 : 16)
10568 +#define PAX_DELTA_STACK_LEN (current->mm->pax_flags & MF_PAX_SEGMEXEC ? 15 : 16)
10569 +#else
10570 +#define PAX_ELF_ET_DYN_BASE 0x400000UL
10571 +
10572 +#define PAX_DELTA_MMAP_LEN ((test_thread_flag(TIF_ADDR32)) ? 16 : TASK_SIZE_MAX_SHIFT - PAGE_SHIFT - 3)
10573 +#define PAX_DELTA_STACK_LEN ((test_thread_flag(TIF_ADDR32)) ? 16 : TASK_SIZE_MAX_SHIFT - PAGE_SHIFT - 3)
10574 +#endif
10575 +#endif
10576
10577 /* This yields a mask that user programs can use to figure out what
10578 instruction set this CPU supports. This could be done in user space,
10579 @@ -296,16 +314,12 @@ do { \
10580
10581 #define ARCH_DLINFO \
10582 do { \
10583 - if (vdso_enabled) \
10584 - NEW_AUX_ENT(AT_SYSINFO_EHDR, \
10585 - (unsigned long)current->mm->context.vdso); \
10586 + NEW_AUX_ENT(AT_SYSINFO_EHDR, current->mm->context.vdso); \
10587 } while (0)
10588
10589 #define ARCH_DLINFO_X32 \
10590 do { \
10591 - if (vdso_enabled) \
10592 - NEW_AUX_ENT(AT_SYSINFO_EHDR, \
10593 - (unsigned long)current->mm->context.vdso); \
10594 + NEW_AUX_ENT(AT_SYSINFO_EHDR, current->mm->context.vdso); \
10595 } while (0)
10596
10597 #define AT_SYSINFO 32
10598 @@ -320,7 +334,7 @@ else \
10599
10600 #endif /* !CONFIG_X86_32 */
10601
10602 -#define VDSO_CURRENT_BASE ((unsigned long)current->mm->context.vdso)
10603 +#define VDSO_CURRENT_BASE (current->mm->context.vdso)
10604
10605 #define VDSO_ENTRY \
10606 ((unsigned long)VDSO32_SYMBOL(VDSO_CURRENT_BASE, vsyscall))
10607 @@ -336,9 +350,6 @@ extern int x32_setup_additional_pages(struct linux_binprm *bprm,
10608 extern int syscall32_setup_pages(struct linux_binprm *, int exstack);
10609 #define compat_arch_setup_additional_pages syscall32_setup_pages
10610
10611 -extern unsigned long arch_randomize_brk(struct mm_struct *mm);
10612 -#define arch_randomize_brk arch_randomize_brk
10613 -
10614 /*
10615 * True on X86_32 or when emulating IA32 on X86_64
10616 */
10617 diff --git a/arch/x86/include/asm/emergency-restart.h b/arch/x86/include/asm/emergency-restart.h
10618 index 75ce3f4..882e801 100644
10619 --- a/arch/x86/include/asm/emergency-restart.h
10620 +++ b/arch/x86/include/asm/emergency-restart.h
10621 @@ -13,6 +13,6 @@ enum reboot_type {
10622
10623 extern enum reboot_type reboot_type;
10624
10625 -extern void machine_emergency_restart(void);
10626 +extern void machine_emergency_restart(void) __noreturn;
10627
10628 #endif /* _ASM_X86_EMERGENCY_RESTART_H */
10629 diff --git a/arch/x86/include/asm/fpu-internal.h b/arch/x86/include/asm/fpu-internal.h
10630 index 75f4c6d..ee3eb8f 100644
10631 --- a/arch/x86/include/asm/fpu-internal.h
10632 +++ b/arch/x86/include/asm/fpu-internal.h
10633 @@ -86,6 +86,11 @@ static inline int fxrstor_checking(struct i387_fxsave_struct *fx)
10634 {
10635 int err;
10636
10637 +#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
10638 + if ((unsigned long)fx < PAX_USER_SHADOW_BASE)
10639 + fx = (struct i387_fxsave_struct __user *)((void *)fx + PAX_USER_SHADOW_BASE);
10640 +#endif
10641 +
10642 /* See comment in fxsave() below. */
10643 #ifdef CONFIG_AS_FXSAVEQ
10644 asm volatile("1: fxrstorq %[fx]\n\t"
10645 @@ -115,6 +120,11 @@ static inline int fxsave_user(struct i387_fxsave_struct __user *fx)
10646 {
10647 int err;
10648
10649 +#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
10650 + if ((unsigned long)fx < PAX_USER_SHADOW_BASE)
10651 + fx = (struct i387_fxsave_struct __user *)((void __user *)fx + PAX_USER_SHADOW_BASE);
10652 +#endif
10653 +
10654 /*
10655 * Clear the bytes not touched by the fxsave and reserved
10656 * for the SW usage.
10657 @@ -271,7 +281,7 @@ static inline int restore_fpu_checking(struct task_struct *tsk)
10658 "emms\n\t" /* clear stack tags */
10659 "fildl %P[addr]", /* set F?P to defined value */
10660 X86_FEATURE_FXSAVE_LEAK,
10661 - [addr] "m" (tsk->thread.fpu.has_fpu));
10662 + [addr] "m" (init_tss[smp_processor_id()].x86_tss.sp0));
10663
10664 return fpu_restore_checking(&tsk->thread.fpu);
10665 }
10666 diff --git a/arch/x86/include/asm/futex.h b/arch/x86/include/asm/futex.h
10667 index 71ecbcb..bac10b7 100644
10668 --- a/arch/x86/include/asm/futex.h
10669 +++ b/arch/x86/include/asm/futex.h
10670 @@ -11,16 +11,18 @@
10671 #include <asm/processor.h>
10672
10673 #define __futex_atomic_op1(insn, ret, oldval, uaddr, oparg) \
10674 + typecheck(u32 __user *, uaddr); \
10675 asm volatile("1:\t" insn "\n" \
10676 "2:\t.section .fixup,\"ax\"\n" \
10677 "3:\tmov\t%3, %1\n" \
10678 "\tjmp\t2b\n" \
10679 "\t.previous\n" \
10680 _ASM_EXTABLE(1b, 3b) \
10681 - : "=r" (oldval), "=r" (ret), "+m" (*uaddr) \
10682 + : "=r" (oldval), "=r" (ret), "+m" (*(u32 __user *)____m(uaddr))\
10683 : "i" (-EFAULT), "0" (oparg), "1" (0))
10684
10685 #define __futex_atomic_op2(insn, ret, oldval, uaddr, oparg) \
10686 + typecheck(u32 __user *, uaddr); \
10687 asm volatile("1:\tmovl %2, %0\n" \
10688 "\tmovl\t%0, %3\n" \
10689 "\t" insn "\n" \
10690 @@ -33,7 +35,7 @@
10691 _ASM_EXTABLE(1b, 4b) \
10692 _ASM_EXTABLE(2b, 4b) \
10693 : "=&a" (oldval), "=&r" (ret), \
10694 - "+m" (*uaddr), "=&r" (tem) \
10695 + "+m" (*(u32 __user *)____m(uaddr)), "=&r" (tem) \
10696 : "r" (oparg), "i" (-EFAULT), "1" (0))
10697
10698 static inline int futex_atomic_op_inuser(int encoded_op, u32 __user *uaddr)
10699 @@ -60,10 +62,10 @@ static inline int futex_atomic_op_inuser(int encoded_op, u32 __user *uaddr)
10700
10701 switch (op) {
10702 case FUTEX_OP_SET:
10703 - __futex_atomic_op1("xchgl %0, %2", ret, oldval, uaddr, oparg);
10704 + __futex_atomic_op1(__copyuser_seg"xchgl %0, %2", ret, oldval, uaddr, oparg);
10705 break;
10706 case FUTEX_OP_ADD:
10707 - __futex_atomic_op1(LOCK_PREFIX "xaddl %0, %2", ret, oldval,
10708 + __futex_atomic_op1(LOCK_PREFIX __copyuser_seg"xaddl %0, %2", ret, oldval,
10709 uaddr, oparg);
10710 break;
10711 case FUTEX_OP_OR:
10712 @@ -122,13 +124,13 @@ static inline int futex_atomic_cmpxchg_inatomic(u32 *uval, u32 __user *uaddr,
10713 if (!access_ok(VERIFY_WRITE, uaddr, sizeof(u32)))
10714 return -EFAULT;
10715
10716 - asm volatile("1:\t" LOCK_PREFIX "cmpxchgl %4, %2\n"
10717 + asm volatile("1:\t" LOCK_PREFIX __copyuser_seg"cmpxchgl %4, %2\n"
10718 "2:\t.section .fixup, \"ax\"\n"
10719 "3:\tmov %3, %0\n"
10720 "\tjmp 2b\n"
10721 "\t.previous\n"
10722 _ASM_EXTABLE(1b, 3b)
10723 - : "+r" (ret), "=a" (oldval), "+m" (*uaddr)
10724 + : "+r" (ret), "=a" (oldval), "+m" (*(u32 __user *)____m(uaddr))
10725 : "i" (-EFAULT), "r" (newval), "1" (oldval)
10726 : "memory"
10727 );
10728 diff --git a/arch/x86/include/asm/hw_irq.h b/arch/x86/include/asm/hw_irq.h
10729 index eb92a6e..b98b2f4 100644
10730 --- a/arch/x86/include/asm/hw_irq.h
10731 +++ b/arch/x86/include/asm/hw_irq.h
10732 @@ -136,8 +136,8 @@ extern void setup_ioapic_dest(void);
10733 extern void enable_IO_APIC(void);
10734
10735 /* Statistics */
10736 -extern atomic_t irq_err_count;
10737 -extern atomic_t irq_mis_count;
10738 +extern atomic_unchecked_t irq_err_count;
10739 +extern atomic_unchecked_t irq_mis_count;
10740
10741 /* EISA */
10742 extern void eisa_set_level_irq(unsigned int irq);
10743 diff --git a/arch/x86/include/asm/io.h b/arch/x86/include/asm/io.h
10744 index d8e8eef..99f81ae 100644
10745 --- a/arch/x86/include/asm/io.h
10746 +++ b/arch/x86/include/asm/io.h
10747 @@ -194,6 +194,17 @@ extern void set_iounmap_nonlazy(void);
10748
10749 #include <linux/vmalloc.h>
10750
10751 +#define ARCH_HAS_VALID_PHYS_ADDR_RANGE
10752 +static inline int valid_phys_addr_range(unsigned long addr, size_t count)
10753 +{
10754 + return ((addr + count + PAGE_SIZE - 1) >> PAGE_SHIFT) < (1ULL << (boot_cpu_data.x86_phys_bits - PAGE_SHIFT)) ? 1 : 0;
10755 +}
10756 +
10757 +static inline int valid_mmap_phys_addr_range(unsigned long pfn, size_t count)
10758 +{
10759 + return (pfn + (count >> PAGE_SHIFT)) < (1ULL << (boot_cpu_data.x86_phys_bits - PAGE_SHIFT)) ? 1 : 0;
10760 +}
10761 +
10762 /*
10763 * Convert a virtual cached pointer to an uncached pointer
10764 */
10765 diff --git a/arch/x86/include/asm/irqflags.h b/arch/x86/include/asm/irqflags.h
10766 index bba3cf8..06bc8da 100644
10767 --- a/arch/x86/include/asm/irqflags.h
10768 +++ b/arch/x86/include/asm/irqflags.h
10769 @@ -141,6 +141,11 @@ static inline notrace unsigned long arch_local_irq_save(void)
10770 sti; \
10771 sysexit
10772
10773 +#define GET_CR0_INTO_RDI mov %cr0, %rdi
10774 +#define SET_RDI_INTO_CR0 mov %rdi, %cr0
10775 +#define GET_CR3_INTO_RDI mov %cr3, %rdi
10776 +#define SET_RDI_INTO_CR3 mov %rdi, %cr3
10777 +
10778 #else
10779 #define INTERRUPT_RETURN iret
10780 #define ENABLE_INTERRUPTS_SYSEXIT sti; sysexit
10781 diff --git a/arch/x86/include/asm/kprobes.h b/arch/x86/include/asm/kprobes.h
10782 index 5478825..839e88c 100644
10783 --- a/arch/x86/include/asm/kprobes.h
10784 +++ b/arch/x86/include/asm/kprobes.h
10785 @@ -37,13 +37,8 @@ typedef u8 kprobe_opcode_t;
10786 #define RELATIVEJUMP_SIZE 5
10787 #define RELATIVECALL_OPCODE 0xe8
10788 #define RELATIVE_ADDR_SIZE 4
10789 -#define MAX_STACK_SIZE 64
10790 -#define MIN_STACK_SIZE(ADDR) \
10791 - (((MAX_STACK_SIZE) < (((unsigned long)current_thread_info()) + \
10792 - THREAD_SIZE - (unsigned long)(ADDR))) \
10793 - ? (MAX_STACK_SIZE) \
10794 - : (((unsigned long)current_thread_info()) + \
10795 - THREAD_SIZE - (unsigned long)(ADDR)))
10796 +#define MAX_STACK_SIZE 64UL
10797 +#define MIN_STACK_SIZE(ADDR) min(MAX_STACK_SIZE, current->thread.sp0 - (unsigned long)(ADDR))
10798
10799 #define flush_insn_slot(p) do { } while (0)
10800
10801 diff --git a/arch/x86/include/asm/kvm_host.h b/arch/x86/include/asm/kvm_host.h
10802 index 09155d6..d2e6df9 100644
10803 --- a/arch/x86/include/asm/kvm_host.h
10804 +++ b/arch/x86/include/asm/kvm_host.h
10805 @@ -694,7 +694,7 @@ struct kvm_x86_ops {
10806 int (*check_intercept)(struct kvm_vcpu *vcpu,
10807 struct x86_instruction_info *info,
10808 enum x86_intercept_stage stage);
10809 -};
10810 +} __do_const;
10811
10812 struct kvm_arch_async_pf {
10813 u32 token;
10814 diff --git a/arch/x86/include/asm/local.h b/arch/x86/include/asm/local.h
10815 index c8bed0d..e5721fa 100644
10816 --- a/arch/x86/include/asm/local.h
10817 +++ b/arch/x86/include/asm/local.h
10818 @@ -17,26 +17,58 @@ typedef struct {
10819
10820 static inline void local_inc(local_t *l)
10821 {
10822 - asm volatile(_ASM_INC "%0"
10823 + asm volatile(_ASM_INC "%0\n"
10824 +
10825 +#ifdef CONFIG_PAX_REFCOUNT
10826 + "jno 0f\n"
10827 + _ASM_DEC "%0\n"
10828 + "int $4\n0:\n"
10829 + _ASM_EXTABLE(0b, 0b)
10830 +#endif
10831 +
10832 : "+m" (l->a.counter));
10833 }
10834
10835 static inline void local_dec(local_t *l)
10836 {
10837 - asm volatile(_ASM_DEC "%0"
10838 + asm volatile(_ASM_DEC "%0\n"
10839 +
10840 +#ifdef CONFIG_PAX_REFCOUNT
10841 + "jno 0f\n"
10842 + _ASM_INC "%0\n"
10843 + "int $4\n0:\n"
10844 + _ASM_EXTABLE(0b, 0b)
10845 +#endif
10846 +
10847 : "+m" (l->a.counter));
10848 }
10849
10850 static inline void local_add(long i, local_t *l)
10851 {
10852 - asm volatile(_ASM_ADD "%1,%0"
10853 + asm volatile(_ASM_ADD "%1,%0\n"
10854 +
10855 +#ifdef CONFIG_PAX_REFCOUNT
10856 + "jno 0f\n"
10857 + _ASM_SUB "%1,%0\n"
10858 + "int $4\n0:\n"
10859 + _ASM_EXTABLE(0b, 0b)
10860 +#endif
10861 +
10862 : "+m" (l->a.counter)
10863 : "ir" (i));
10864 }
10865
10866 static inline void local_sub(long i, local_t *l)
10867 {
10868 - asm volatile(_ASM_SUB "%1,%0"
10869 + asm volatile(_ASM_SUB "%1,%0\n"
10870 +
10871 +#ifdef CONFIG_PAX_REFCOUNT
10872 + "jno 0f\n"
10873 + _ASM_ADD "%1,%0\n"
10874 + "int $4\n0:\n"
10875 + _ASM_EXTABLE(0b, 0b)
10876 +#endif
10877 +
10878 : "+m" (l->a.counter)
10879 : "ir" (i));
10880 }
10881 @@ -54,7 +86,16 @@ static inline int local_sub_and_test(long i, local_t *l)
10882 {
10883 unsigned char c;
10884
10885 - asm volatile(_ASM_SUB "%2,%0; sete %1"
10886 + asm volatile(_ASM_SUB "%2,%0\n"
10887 +
10888 +#ifdef CONFIG_PAX_REFCOUNT
10889 + "jno 0f\n"
10890 + _ASM_ADD "%2,%0\n"
10891 + "int $4\n0:\n"
10892 + _ASM_EXTABLE(0b, 0b)
10893 +#endif
10894 +
10895 + "sete %1\n"
10896 : "+m" (l->a.counter), "=qm" (c)
10897 : "ir" (i) : "memory");
10898 return c;
10899 @@ -72,7 +113,16 @@ static inline int local_dec_and_test(local_t *l)
10900 {
10901 unsigned char c;
10902
10903 - asm volatile(_ASM_DEC "%0; sete %1"
10904 + asm volatile(_ASM_DEC "%0\n"
10905 +
10906 +#ifdef CONFIG_PAX_REFCOUNT
10907 + "jno 0f\n"
10908 + _ASM_INC "%0\n"
10909 + "int $4\n0:\n"
10910 + _ASM_EXTABLE(0b, 0b)
10911 +#endif
10912 +
10913 + "sete %1\n"
10914 : "+m" (l->a.counter), "=qm" (c)
10915 : : "memory");
10916 return c != 0;
10917 @@ -90,7 +140,16 @@ static inline int local_inc_and_test(local_t *l)
10918 {
10919 unsigned char c;
10920
10921 - asm volatile(_ASM_INC "%0; sete %1"
10922 + asm volatile(_ASM_INC "%0\n"
10923 +
10924 +#ifdef CONFIG_PAX_REFCOUNT
10925 + "jno 0f\n"
10926 + _ASM_DEC "%0\n"
10927 + "int $4\n0:\n"
10928 + _ASM_EXTABLE(0b, 0b)
10929 +#endif
10930 +
10931 + "sete %1\n"
10932 : "+m" (l->a.counter), "=qm" (c)
10933 : : "memory");
10934 return c != 0;
10935 @@ -109,7 +168,16 @@ static inline int local_add_negative(long i, local_t *l)
10936 {
10937 unsigned char c;
10938
10939 - asm volatile(_ASM_ADD "%2,%0; sets %1"
10940 + asm volatile(_ASM_ADD "%2,%0\n"
10941 +
10942 +#ifdef CONFIG_PAX_REFCOUNT
10943 + "jno 0f\n"
10944 + _ASM_SUB "%2,%0\n"
10945 + "int $4\n0:\n"
10946 + _ASM_EXTABLE(0b, 0b)
10947 +#endif
10948 +
10949 + "sets %1\n"
10950 : "+m" (l->a.counter), "=qm" (c)
10951 : "ir" (i) : "memory");
10952 return c;
10953 @@ -132,7 +200,15 @@ static inline long local_add_return(long i, local_t *l)
10954 #endif
10955 /* Modern 486+ processor */
10956 __i = i;
10957 - asm volatile(_ASM_XADD "%0, %1;"
10958 + asm volatile(_ASM_XADD "%0, %1\n"
10959 +
10960 +#ifdef CONFIG_PAX_REFCOUNT
10961 + "jno 0f\n"
10962 + _ASM_MOV "%0,%1\n"
10963 + "int $4\n0:\n"
10964 + _ASM_EXTABLE(0b, 0b)
10965 +#endif
10966 +
10967 : "+r" (i), "+m" (l->a.counter)
10968 : : "memory");
10969 return i + __i;
10970 diff --git a/arch/x86/include/asm/mman.h b/arch/x86/include/asm/mman.h
10971 index 593e51d..fa69c9a 100644
10972 --- a/arch/x86/include/asm/mman.h
10973 +++ b/arch/x86/include/asm/mman.h
10974 @@ -5,4 +5,14 @@
10975
10976 #include <asm-generic/mman.h>
10977
10978 +#ifdef __KERNEL__
10979 +#ifndef __ASSEMBLY__
10980 +#ifdef CONFIG_X86_32
10981 +#define arch_mmap_check i386_mmap_check
10982 +int i386_mmap_check(unsigned long addr, unsigned long len,
10983 + unsigned long flags);
10984 +#endif
10985 +#endif
10986 +#endif
10987 +
10988 #endif /* _ASM_X86_MMAN_H */
10989 diff --git a/arch/x86/include/asm/mmu.h b/arch/x86/include/asm/mmu.h
10990 index 5f55e69..e20bfb1 100644
10991 --- a/arch/x86/include/asm/mmu.h
10992 +++ b/arch/x86/include/asm/mmu.h
10993 @@ -9,7 +9,7 @@
10994 * we put the segment information here.
10995 */
10996 typedef struct {
10997 - void *ldt;
10998 + struct desc_struct *ldt;
10999 int size;
11000
11001 #ifdef CONFIG_X86_64
11002 @@ -18,7 +18,19 @@ typedef struct {
11003 #endif
11004
11005 struct mutex lock;
11006 - void *vdso;
11007 + unsigned long vdso;
11008 +
11009 +#ifdef CONFIG_X86_32
11010 +#if defined(CONFIG_PAX_PAGEEXEC) || defined(CONFIG_PAX_SEGMEXEC)
11011 + unsigned long user_cs_base;
11012 + unsigned long user_cs_limit;
11013 +
11014 +#if defined(CONFIG_PAX_PAGEEXEC) && defined(CONFIG_SMP)
11015 + cpumask_t cpu_user_cs_mask;
11016 +#endif
11017 +
11018 +#endif
11019 +#endif
11020 } mm_context_t;
11021
11022 #ifdef CONFIG_SMP
11023 diff --git a/arch/x86/include/asm/mmu_context.h b/arch/x86/include/asm/mmu_context.h
11024 index cdbf367..adb37ac 100644
11025 --- a/arch/x86/include/asm/mmu_context.h
11026 +++ b/arch/x86/include/asm/mmu_context.h
11027 @@ -24,6 +24,18 @@ void destroy_context(struct mm_struct *mm);
11028
11029 static inline void enter_lazy_tlb(struct mm_struct *mm, struct task_struct *tsk)
11030 {
11031 +
11032 +#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
11033 + unsigned int i;
11034 + pgd_t *pgd;
11035 +
11036 + pax_open_kernel();
11037 + pgd = get_cpu_pgd(smp_processor_id());
11038 + for (i = USER_PGD_PTRS; i < 2 * USER_PGD_PTRS; ++i)
11039 + set_pgd_batched(pgd+i, native_make_pgd(0));
11040 + pax_close_kernel();
11041 +#endif
11042 +
11043 #ifdef CONFIG_SMP
11044 if (this_cpu_read(cpu_tlbstate.state) == TLBSTATE_OK)
11045 this_cpu_write(cpu_tlbstate.state, TLBSTATE_LAZY);
11046 @@ -34,16 +46,30 @@ static inline void switch_mm(struct mm_struct *prev, struct mm_struct *next,
11047 struct task_struct *tsk)
11048 {
11049 unsigned cpu = smp_processor_id();
11050 +#if defined(CONFIG_X86_32) && defined(CONFIG_SMP) && (defined(CONFIG_PAX_PAGEEXEC) || defined(CONFIG_PAX_SEGMEXEC))
11051 + int tlbstate = TLBSTATE_OK;
11052 +#endif
11053
11054 if (likely(prev != next)) {
11055 #ifdef CONFIG_SMP
11056 +#if defined(CONFIG_X86_32) && (defined(CONFIG_PAX_PAGEEXEC) || defined(CONFIG_PAX_SEGMEXEC))
11057 + tlbstate = this_cpu_read(cpu_tlbstate.state);
11058 +#endif
11059 this_cpu_write(cpu_tlbstate.state, TLBSTATE_OK);
11060 this_cpu_write(cpu_tlbstate.active_mm, next);
11061 #endif
11062 cpumask_set_cpu(cpu, mm_cpumask(next));
11063
11064 /* Re-load page tables */
11065 +#ifdef CONFIG_PAX_PER_CPU_PGD
11066 + pax_open_kernel();
11067 + __clone_user_pgds(get_cpu_pgd(cpu), next->pgd);
11068 + __shadow_user_pgds(get_cpu_pgd(cpu) + USER_PGD_PTRS, next->pgd);
11069 + pax_close_kernel();
11070 + load_cr3(get_cpu_pgd(cpu));
11071 +#else
11072 load_cr3(next->pgd);
11073 +#endif
11074
11075 /* stop flush ipis for the previous mm */
11076 cpumask_clear_cpu(cpu, mm_cpumask(prev));
11077 @@ -53,9 +79,38 @@ static inline void switch_mm(struct mm_struct *prev, struct mm_struct *next,
11078 */
11079 if (unlikely(prev->context.ldt != next->context.ldt))
11080 load_LDT_nolock(&next->context);
11081 - }
11082 +
11083 +#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_PAGEEXEC) && defined(CONFIG_SMP)
11084 + if (!(__supported_pte_mask & _PAGE_NX)) {
11085 + smp_mb__before_clear_bit();
11086 + cpu_clear(cpu, prev->context.cpu_user_cs_mask);
11087 + smp_mb__after_clear_bit();
11088 + cpu_set(cpu, next->context.cpu_user_cs_mask);
11089 + }
11090 +#endif
11091 +
11092 +#if defined(CONFIG_X86_32) && (defined(CONFIG_PAX_PAGEEXEC) || defined(CONFIG_PAX_SEGMEXEC))
11093 + if (unlikely(prev->context.user_cs_base != next->context.user_cs_base ||
11094 + prev->context.user_cs_limit != next->context.user_cs_limit))
11095 + set_user_cs(next->context.user_cs_base, next->context.user_cs_limit, cpu);
11096 #ifdef CONFIG_SMP
11097 + else if (unlikely(tlbstate != TLBSTATE_OK))
11098 + set_user_cs(next->context.user_cs_base, next->context.user_cs_limit, cpu);
11099 +#endif
11100 +#endif
11101 +
11102 + }
11103 else {
11104 +
11105 +#ifdef CONFIG_PAX_PER_CPU_PGD
11106 + pax_open_kernel();
11107 + __clone_user_pgds(get_cpu_pgd(cpu), next->pgd);
11108 + __shadow_user_pgds(get_cpu_pgd(cpu) + USER_PGD_PTRS, next->pgd);
11109 + pax_close_kernel();
11110 + load_cr3(get_cpu_pgd(cpu));
11111 +#endif
11112 +
11113 +#ifdef CONFIG_SMP
11114 this_cpu_write(cpu_tlbstate.state, TLBSTATE_OK);
11115 BUG_ON(this_cpu_read(cpu_tlbstate.active_mm) != next);
11116
11117 @@ -64,11 +119,28 @@ static inline void switch_mm(struct mm_struct *prev, struct mm_struct *next,
11118 * tlb flush IPI delivery. We must reload CR3
11119 * to make sure to use no freed page tables.
11120 */
11121 +
11122 +#ifndef CONFIG_PAX_PER_CPU_PGD
11123 load_cr3(next->pgd);
11124 +#endif
11125 +
11126 load_LDT_nolock(&next->context);
11127 +
11128 +#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_PAGEEXEC)
11129 + if (!(__supported_pte_mask & _PAGE_NX))
11130 + cpu_set(cpu, next->context.cpu_user_cs_mask);
11131 +#endif
11132 +
11133 +#if defined(CONFIG_X86_32) && (defined(CONFIG_PAX_PAGEEXEC) || defined(CONFIG_PAX_SEGMEXEC))
11134 +#ifdef CONFIG_PAX_PAGEEXEC
11135 + if (!((next->pax_flags & MF_PAX_PAGEEXEC) && (__supported_pte_mask & _PAGE_NX)))
11136 +#endif
11137 + set_user_cs(next->context.user_cs_base, next->context.user_cs_limit, cpu);
11138 +#endif
11139 +
11140 }
11141 +#endif
11142 }
11143 -#endif
11144 }
11145
11146 #define activate_mm(prev, next) \
11147 diff --git a/arch/x86/include/asm/module.h b/arch/x86/include/asm/module.h
11148 index 9eae775..c914fea 100644
11149 --- a/arch/x86/include/asm/module.h
11150 +++ b/arch/x86/include/asm/module.h
11151 @@ -5,6 +5,7 @@
11152
11153 #ifdef CONFIG_X86_64
11154 /* X86_64 does not define MODULE_PROC_FAMILY */
11155 +#define MODULE_PROC_FAMILY ""
11156 #elif defined CONFIG_M386
11157 #define MODULE_PROC_FAMILY "386 "
11158 #elif defined CONFIG_M486
11159 @@ -59,8 +60,20 @@
11160 #error unknown processor family
11161 #endif
11162
11163 -#ifdef CONFIG_X86_32
11164 -# define MODULE_ARCH_VERMAGIC MODULE_PROC_FAMILY
11165 +#ifdef CONFIG_PAX_KERNEXEC_PLUGIN_METHOD_BTS
11166 +#define MODULE_PAX_KERNEXEC "KERNEXEC_BTS "
11167 +#elif defined(CONFIG_PAX_KERNEXEC_PLUGIN_METHOD_OR)
11168 +#define MODULE_PAX_KERNEXEC "KERNEXEC_OR "
11169 +#else
11170 +#define MODULE_PAX_KERNEXEC ""
11171 #endif
11172
11173 +#ifdef CONFIG_PAX_MEMORY_UDEREF
11174 +#define MODULE_PAX_UDEREF "UDEREF "
11175 +#else
11176 +#define MODULE_PAX_UDEREF ""
11177 +#endif
11178 +
11179 +#define MODULE_ARCH_VERMAGIC MODULE_PROC_FAMILY MODULE_PAX_KERNEXEC MODULE_PAX_UDEREF
11180 +
11181 #endif /* _ASM_X86_MODULE_H */
11182 diff --git a/arch/x86/include/asm/page_64_types.h b/arch/x86/include/asm/page_64_types.h
11183 index 320f7bb..e89f8f8 100644
11184 --- a/arch/x86/include/asm/page_64_types.h
11185 +++ b/arch/x86/include/asm/page_64_types.h
11186 @@ -56,7 +56,7 @@ void copy_page(void *to, void *from);
11187
11188 /* duplicated to the one in bootmem.h */
11189 extern unsigned long max_pfn;
11190 -extern unsigned long phys_base;
11191 +extern const unsigned long phys_base;
11192
11193 extern unsigned long __phys_addr(unsigned long);
11194 #define __phys_reloc_hide(x) (x)
11195 diff --git a/arch/x86/include/asm/paravirt.h b/arch/x86/include/asm/paravirt.h
11196 index a0facf3..c017b15 100644
11197 --- a/arch/x86/include/asm/paravirt.h
11198 +++ b/arch/x86/include/asm/paravirt.h
11199 @@ -632,6 +632,18 @@ static inline void set_pgd(pgd_t *pgdp, pgd_t pgd)
11200 val);
11201 }
11202
11203 +static inline void set_pgd_batched(pgd_t *pgdp, pgd_t pgd)
11204 +{
11205 + pgdval_t val = native_pgd_val(pgd);
11206 +
11207 + if (sizeof(pgdval_t) > sizeof(long))
11208 + PVOP_VCALL3(pv_mmu_ops.set_pgd_batched, pgdp,
11209 + val, (u64)val >> 32);
11210 + else
11211 + PVOP_VCALL2(pv_mmu_ops.set_pgd_batched, pgdp,
11212 + val);
11213 +}
11214 +
11215 static inline void pgd_clear(pgd_t *pgdp)
11216 {
11217 set_pgd(pgdp, __pgd(0));
11218 @@ -713,6 +725,21 @@ static inline void __set_fixmap(unsigned /* enum fixed_addresses */ idx,
11219 pv_mmu_ops.set_fixmap(idx, phys, flags);
11220 }
11221
11222 +#ifdef CONFIG_PAX_KERNEXEC
11223 +static inline unsigned long pax_open_kernel(void)
11224 +{
11225 + return PVOP_CALL0(unsigned long, pv_mmu_ops.pax_open_kernel);
11226 +}
11227 +
11228 +static inline unsigned long pax_close_kernel(void)
11229 +{
11230 + return PVOP_CALL0(unsigned long, pv_mmu_ops.pax_close_kernel);
11231 +}
11232 +#else
11233 +static inline unsigned long pax_open_kernel(void) { return 0; }
11234 +static inline unsigned long pax_close_kernel(void) { return 0; }
11235 +#endif
11236 +
11237 #if defined(CONFIG_SMP) && defined(CONFIG_PARAVIRT_SPINLOCKS)
11238
11239 static inline int arch_spin_is_locked(struct arch_spinlock *lock)
11240 @@ -929,7 +956,7 @@ extern void default_banner(void);
11241
11242 #define PARA_PATCH(struct, off) ((PARAVIRT_PATCH_##struct + (off)) / 4)
11243 #define PARA_SITE(ptype, clobbers, ops) _PVSITE(ptype, clobbers, ops, .long, 4)
11244 -#define PARA_INDIRECT(addr) *%cs:addr
11245 +#define PARA_INDIRECT(addr) *%ss:addr
11246 #endif
11247
11248 #define INTERRUPT_RETURN \
11249 @@ -1004,6 +1031,21 @@ extern void default_banner(void);
11250 PARA_SITE(PARA_PATCH(pv_cpu_ops, PV_CPU_irq_enable_sysexit), \
11251 CLBR_NONE, \
11252 jmp PARA_INDIRECT(pv_cpu_ops+PV_CPU_irq_enable_sysexit))
11253 +
11254 +#define GET_CR0_INTO_RDI \
11255 + call PARA_INDIRECT(pv_cpu_ops+PV_CPU_read_cr0); \
11256 + mov %rax,%rdi
11257 +
11258 +#define SET_RDI_INTO_CR0 \
11259 + call PARA_INDIRECT(pv_cpu_ops+PV_CPU_write_cr0)
11260 +
11261 +#define GET_CR3_INTO_RDI \
11262 + call PARA_INDIRECT(pv_mmu_ops+PV_MMU_read_cr3); \
11263 + mov %rax,%rdi
11264 +
11265 +#define SET_RDI_INTO_CR3 \
11266 + call PARA_INDIRECT(pv_mmu_ops+PV_MMU_write_cr3)
11267 +
11268 #endif /* CONFIG_X86_32 */
11269
11270 #endif /* __ASSEMBLY__ */
11271 diff --git a/arch/x86/include/asm/paravirt_types.h b/arch/x86/include/asm/paravirt_types.h
11272 index 142236e..6a6b4a6 100644
11273 --- a/arch/x86/include/asm/paravirt_types.h
11274 +++ b/arch/x86/include/asm/paravirt_types.h
11275 @@ -84,20 +84,20 @@ struct pv_init_ops {
11276 */
11277 unsigned (*patch)(u8 type, u16 clobber, void *insnbuf,
11278 unsigned long addr, unsigned len);
11279 -};
11280 +} __no_const;
11281
11282
11283 struct pv_lazy_ops {
11284 /* Set deferred update mode, used for batching operations. */
11285 void (*enter)(void);
11286 void (*leave)(void);
11287 -};
11288 +} __no_const;
11289
11290 struct pv_time_ops {
11291 unsigned long long (*sched_clock)(void);
11292 unsigned long long (*steal_clock)(int cpu);
11293 unsigned long (*get_tsc_khz)(void);
11294 -};
11295 +} __no_const;
11296
11297 struct pv_cpu_ops {
11298 /* hooks for various privileged instructions */
11299 @@ -191,7 +191,7 @@ struct pv_cpu_ops {
11300
11301 void (*start_context_switch)(struct task_struct *prev);
11302 void (*end_context_switch)(struct task_struct *next);
11303 -};
11304 +} __no_const;
11305
11306 struct pv_irq_ops {
11307 /*
11308 @@ -222,7 +222,7 @@ struct pv_apic_ops {
11309 unsigned long start_eip,
11310 unsigned long start_esp);
11311 #endif
11312 -};
11313 +} __no_const;
11314
11315 struct pv_mmu_ops {
11316 unsigned long (*read_cr2)(void);
11317 @@ -312,6 +312,7 @@ struct pv_mmu_ops {
11318 struct paravirt_callee_save make_pud;
11319
11320 void (*set_pgd)(pgd_t *pudp, pgd_t pgdval);
11321 + void (*set_pgd_batched)(pgd_t *pudp, pgd_t pgdval);
11322 #endif /* PAGETABLE_LEVELS == 4 */
11323 #endif /* PAGETABLE_LEVELS >= 3 */
11324
11325 @@ -323,6 +324,12 @@ struct pv_mmu_ops {
11326 an mfn. We can tell which is which from the index. */
11327 void (*set_fixmap)(unsigned /* enum fixed_addresses */ idx,
11328 phys_addr_t phys, pgprot_t flags);
11329 +
11330 +#ifdef CONFIG_PAX_KERNEXEC
11331 + unsigned long (*pax_open_kernel)(void);
11332 + unsigned long (*pax_close_kernel)(void);
11333 +#endif
11334 +
11335 };
11336
11337 struct arch_spinlock;
11338 @@ -333,7 +340,7 @@ struct pv_lock_ops {
11339 void (*spin_lock_flags)(struct arch_spinlock *lock, unsigned long flags);
11340 int (*spin_trylock)(struct arch_spinlock *lock);
11341 void (*spin_unlock)(struct arch_spinlock *lock);
11342 -};
11343 +} __no_const;
11344
11345 /* This contains all the paravirt structures: we get a convenient
11346 * number for each function using the offset which we use to indicate
11347 diff --git a/arch/x86/include/asm/pgalloc.h b/arch/x86/include/asm/pgalloc.h
11348 index b4389a4..7024269 100644
11349 --- a/arch/x86/include/asm/pgalloc.h
11350 +++ b/arch/x86/include/asm/pgalloc.h
11351 @@ -63,6 +63,13 @@ static inline void pmd_populate_kernel(struct mm_struct *mm,
11352 pmd_t *pmd, pte_t *pte)
11353 {
11354 paravirt_alloc_pte(mm, __pa(pte) >> PAGE_SHIFT);
11355 + set_pmd(pmd, __pmd(__pa(pte) | _KERNPG_TABLE));
11356 +}
11357 +
11358 +static inline void pmd_populate_user(struct mm_struct *mm,
11359 + pmd_t *pmd, pte_t *pte)
11360 +{
11361 + paravirt_alloc_pte(mm, __pa(pte) >> PAGE_SHIFT);
11362 set_pmd(pmd, __pmd(__pa(pte) | _PAGE_TABLE));
11363 }
11364
11365 @@ -99,12 +106,22 @@ static inline void __pmd_free_tlb(struct mmu_gather *tlb, pmd_t *pmd,
11366
11367 #ifdef CONFIG_X86_PAE
11368 extern void pud_populate(struct mm_struct *mm, pud_t *pudp, pmd_t *pmd);
11369 +static inline void pud_populate_kernel(struct mm_struct *mm, pud_t *pudp, pmd_t *pmd)
11370 +{
11371 + pud_populate(mm, pudp, pmd);
11372 +}
11373 #else /* !CONFIG_X86_PAE */
11374 static inline void pud_populate(struct mm_struct *mm, pud_t *pud, pmd_t *pmd)
11375 {
11376 paravirt_alloc_pmd(mm, __pa(pmd) >> PAGE_SHIFT);
11377 set_pud(pud, __pud(_PAGE_TABLE | __pa(pmd)));
11378 }
11379 +
11380 +static inline void pud_populate_kernel(struct mm_struct *mm, pud_t *pud, pmd_t *pmd)
11381 +{
11382 + paravirt_alloc_pmd(mm, __pa(pmd) >> PAGE_SHIFT);
11383 + set_pud(pud, __pud(_KERNPG_TABLE | __pa(pmd)));
11384 +}
11385 #endif /* CONFIG_X86_PAE */
11386
11387 #if PAGETABLE_LEVELS > 3
11388 @@ -114,6 +131,12 @@ static inline void pgd_populate(struct mm_struct *mm, pgd_t *pgd, pud_t *pud)
11389 set_pgd(pgd, __pgd(_PAGE_TABLE | __pa(pud)));
11390 }
11391
11392 +static inline void pgd_populate_kernel(struct mm_struct *mm, pgd_t *pgd, pud_t *pud)
11393 +{
11394 + paravirt_alloc_pud(mm, __pa(pud) >> PAGE_SHIFT);
11395 + set_pgd(pgd, __pgd(_KERNPG_TABLE | __pa(pud)));
11396 +}
11397 +
11398 static inline pud_t *pud_alloc_one(struct mm_struct *mm, unsigned long addr)
11399 {
11400 return (pud_t *)get_zeroed_page(GFP_KERNEL|__GFP_REPEAT);
11401 diff --git a/arch/x86/include/asm/pgtable-2level.h b/arch/x86/include/asm/pgtable-2level.h
11402 index f2b489c..4f7e2e5 100644
11403 --- a/arch/x86/include/asm/pgtable-2level.h
11404 +++ b/arch/x86/include/asm/pgtable-2level.h
11405 @@ -18,7 +18,9 @@ static inline void native_set_pte(pte_t *ptep , pte_t pte)
11406
11407 static inline void native_set_pmd(pmd_t *pmdp, pmd_t pmd)
11408 {
11409 + pax_open_kernel();
11410 *pmdp = pmd;
11411 + pax_close_kernel();
11412 }
11413
11414 static inline void native_set_pte_atomic(pte_t *ptep, pte_t pte)
11415 diff --git a/arch/x86/include/asm/pgtable-3level.h b/arch/x86/include/asm/pgtable-3level.h
11416 index 4cc9f2b..5fd9226 100644
11417 --- a/arch/x86/include/asm/pgtable-3level.h
11418 +++ b/arch/x86/include/asm/pgtable-3level.h
11419 @@ -92,12 +92,16 @@ static inline void native_set_pte_atomic(pte_t *ptep, pte_t pte)
11420
11421 static inline void native_set_pmd(pmd_t *pmdp, pmd_t pmd)
11422 {
11423 + pax_open_kernel();
11424 set_64bit((unsigned long long *)(pmdp), native_pmd_val(pmd));
11425 + pax_close_kernel();
11426 }
11427
11428 static inline void native_set_pud(pud_t *pudp, pud_t pud)
11429 {
11430 + pax_open_kernel();
11431 set_64bit((unsigned long long *)(pudp), native_pud_val(pud));
11432 + pax_close_kernel();
11433 }
11434
11435 /*
11436 diff --git a/arch/x86/include/asm/pgtable.h b/arch/x86/include/asm/pgtable.h
11437 index c3520d7..cf742ef 100644
11438 --- a/arch/x86/include/asm/pgtable.h
11439 +++ b/arch/x86/include/asm/pgtable.h
11440 @@ -44,6 +44,7 @@ extern struct mm_struct *pgd_page_get_mm(struct page *page);
11441
11442 #ifndef __PAGETABLE_PUD_FOLDED
11443 #define set_pgd(pgdp, pgd) native_set_pgd(pgdp, pgd)
11444 +#define set_pgd_batched(pgdp, pgd) native_set_pgd_batched(pgdp, pgd)
11445 #define pgd_clear(pgd) native_pgd_clear(pgd)
11446 #endif
11447
11448 @@ -81,12 +82,51 @@ extern struct mm_struct *pgd_page_get_mm(struct page *page);
11449
11450 #define arch_end_context_switch(prev) do {} while(0)
11451
11452 +#define pax_open_kernel() native_pax_open_kernel()
11453 +#define pax_close_kernel() native_pax_close_kernel()
11454 #endif /* CONFIG_PARAVIRT */
11455
11456 +#define __HAVE_ARCH_PAX_OPEN_KERNEL
11457 +#define __HAVE_ARCH_PAX_CLOSE_KERNEL
11458 +
11459 +#ifdef CONFIG_PAX_KERNEXEC
11460 +static inline unsigned long native_pax_open_kernel(void)
11461 +{
11462 + unsigned long cr0;
11463 +
11464 + preempt_disable();
11465 + barrier();
11466 + cr0 = read_cr0() ^ X86_CR0_WP;
11467 + BUG_ON(unlikely(cr0 & X86_CR0_WP));
11468 + write_cr0(cr0);
11469 + return cr0 ^ X86_CR0_WP;
11470 +}
11471 +
11472 +static inline unsigned long native_pax_close_kernel(void)
11473 +{
11474 + unsigned long cr0;
11475 +
11476 + cr0 = read_cr0() ^ X86_CR0_WP;
11477 + BUG_ON(unlikely(!(cr0 & X86_CR0_WP)));
11478 + write_cr0(cr0);
11479 + barrier();
11480 + preempt_enable_no_resched();
11481 + return cr0 ^ X86_CR0_WP;
11482 +}
11483 +#else
11484 +static inline unsigned long native_pax_open_kernel(void) { return 0; }
11485 +static inline unsigned long native_pax_close_kernel(void) { return 0; }
11486 +#endif
11487 +
11488 /*
11489 * The following only work if pte_present() is true.
11490 * Undefined behaviour if not..
11491 */
11492 +static inline int pte_user(pte_t pte)
11493 +{
11494 + return pte_val(pte) & _PAGE_USER;
11495 +}
11496 +
11497 static inline int pte_dirty(pte_t pte)
11498 {
11499 return pte_flags(pte) & _PAGE_DIRTY;
11500 @@ -195,9 +235,29 @@ static inline pte_t pte_wrprotect(pte_t pte)
11501 return pte_clear_flags(pte, _PAGE_RW);
11502 }
11503
11504 +static inline pte_t pte_mkread(pte_t pte)
11505 +{
11506 + return __pte(pte_val(pte) | _PAGE_USER);
11507 +}
11508 +
11509 static inline pte_t pte_mkexec(pte_t pte)
11510 {
11511 - return pte_clear_flags(pte, _PAGE_NX);
11512 +#ifdef CONFIG_X86_PAE
11513 + if (__supported_pte_mask & _PAGE_NX)
11514 + return pte_clear_flags(pte, _PAGE_NX);
11515 + else
11516 +#endif
11517 + return pte_set_flags(pte, _PAGE_USER);
11518 +}
11519 +
11520 +static inline pte_t pte_exprotect(pte_t pte)
11521 +{
11522 +#ifdef CONFIG_X86_PAE
11523 + if (__supported_pte_mask & _PAGE_NX)
11524 + return pte_set_flags(pte, _PAGE_NX);
11525 + else
11526 +#endif
11527 + return pte_clear_flags(pte, _PAGE_USER);
11528 }
11529
11530 static inline pte_t pte_mkdirty(pte_t pte)
11531 @@ -389,6 +449,15 @@ pte_t *populate_extra_pte(unsigned long vaddr);
11532 #endif
11533
11534 #ifndef __ASSEMBLY__
11535 +
11536 +#ifdef CONFIG_PAX_PER_CPU_PGD
11537 +extern pgd_t cpu_pgd[NR_CPUS][PTRS_PER_PGD];
11538 +static inline pgd_t *get_cpu_pgd(unsigned int cpu)
11539 +{
11540 + return cpu_pgd[cpu];
11541 +}
11542 +#endif
11543 +
11544 #include <linux/mm_types.h>
11545
11546 static inline int pte_none(pte_t pte)
11547 @@ -565,7 +634,7 @@ static inline pud_t *pud_offset(pgd_t *pgd, unsigned long address)
11548
11549 static inline int pgd_bad(pgd_t pgd)
11550 {
11551 - return (pgd_flags(pgd) & ~_PAGE_USER) != _KERNPG_TABLE;
11552 + return (pgd_flags(pgd) & ~(_PAGE_USER | _PAGE_NX)) != _KERNPG_TABLE;
11553 }
11554
11555 static inline int pgd_none(pgd_t pgd)
11556 @@ -588,7 +657,12 @@ static inline int pgd_none(pgd_t pgd)
11557 * pgd_offset() returns a (pgd_t *)
11558 * pgd_index() is used get the offset into the pgd page's array of pgd_t's;
11559 */
11560 -#define pgd_offset(mm, address) ((mm)->pgd + pgd_index((address)))
11561 +#define pgd_offset(mm, address) ((mm)->pgd + pgd_index(address))
11562 +
11563 +#ifdef CONFIG_PAX_PER_CPU_PGD
11564 +#define pgd_offset_cpu(cpu, address) (get_cpu_pgd(cpu) + pgd_index(address))
11565 +#endif
11566 +
11567 /*
11568 * a shortcut which implies the use of the kernel's pgd, instead
11569 * of a process's
11570 @@ -599,6 +673,20 @@ static inline int pgd_none(pgd_t pgd)
11571 #define KERNEL_PGD_BOUNDARY pgd_index(PAGE_OFFSET)
11572 #define KERNEL_PGD_PTRS (PTRS_PER_PGD - KERNEL_PGD_BOUNDARY)
11573
11574 +#ifdef CONFIG_X86_32
11575 +#define USER_PGD_PTRS KERNEL_PGD_BOUNDARY
11576 +#else
11577 +#define TASK_SIZE_MAX_SHIFT CONFIG_TASK_SIZE_MAX_SHIFT
11578 +#define USER_PGD_PTRS (_AC(1,UL) << (TASK_SIZE_MAX_SHIFT - PGDIR_SHIFT))
11579 +
11580 +#ifdef CONFIG_PAX_MEMORY_UDEREF
11581 +#define PAX_USER_SHADOW_BASE (_AC(1,UL) << TASK_SIZE_MAX_SHIFT)
11582 +#else
11583 +#define PAX_USER_SHADOW_BASE (_AC(0,UL))
11584 +#endif
11585 +
11586 +#endif
11587 +
11588 #ifndef __ASSEMBLY__
11589
11590 extern int direct_gbpages;
11591 @@ -763,11 +851,23 @@ static inline void pmdp_set_wrprotect(struct mm_struct *mm,
11592 * dst and src can be on the same page, but the range must not overlap,
11593 * and must not cross a page boundary.
11594 */
11595 -static inline void clone_pgd_range(pgd_t *dst, pgd_t *src, int count)
11596 +static inline void clone_pgd_range(pgd_t *dst, const pgd_t *src, int count)
11597 {
11598 - memcpy(dst, src, count * sizeof(pgd_t));
11599 + pax_open_kernel();
11600 + while (count--)
11601 + *dst++ = *src++;
11602 + pax_close_kernel();
11603 }
11604
11605 +#ifdef CONFIG_PAX_PER_CPU_PGD
11606 +extern void __clone_user_pgds(pgd_t *dst, const pgd_t *src);
11607 +#endif
11608 +
11609 +#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
11610 +extern void __shadow_user_pgds(pgd_t *dst, const pgd_t *src);
11611 +#else
11612 +static inline void __shadow_user_pgds(pgd_t *dst, const pgd_t *src) {}
11613 +#endif
11614
11615 #include <asm-generic/pgtable.h>
11616 #endif /* __ASSEMBLY__ */
11617 diff --git a/arch/x86/include/asm/pgtable_32.h b/arch/x86/include/asm/pgtable_32.h
11618 index 0c92113..34a77c6 100644
11619 --- a/arch/x86/include/asm/pgtable_32.h
11620 +++ b/arch/x86/include/asm/pgtable_32.h
11621 @@ -25,9 +25,6 @@
11622 struct mm_struct;
11623 struct vm_area_struct;
11624
11625 -extern pgd_t swapper_pg_dir[1024];
11626 -extern pgd_t initial_page_table[1024];
11627 -
11628 static inline void pgtable_cache_init(void) { }
11629 static inline void check_pgt_cache(void) { }
11630 void paging_init(void);
11631 @@ -48,6 +45,12 @@ extern void set_pmd_pfn(unsigned long, unsigned long, pgprot_t);
11632 # include <asm/pgtable-2level.h>
11633 #endif
11634
11635 +extern pgd_t swapper_pg_dir[PTRS_PER_PGD];
11636 +extern pgd_t initial_page_table[PTRS_PER_PGD];
11637 +#ifdef CONFIG_X86_PAE
11638 +extern pmd_t swapper_pm_dir[PTRS_PER_PGD][PTRS_PER_PMD];
11639 +#endif
11640 +
11641 #if defined(CONFIG_HIGHPTE)
11642 #define pte_offset_map(dir, address) \
11643 ((pte_t *)kmap_atomic(pmd_page(*(dir))) + \
11644 @@ -62,7 +65,9 @@ extern void set_pmd_pfn(unsigned long, unsigned long, pgprot_t);
11645 /* Clear a kernel PTE and flush it from the TLB */
11646 #define kpte_clear_flush(ptep, vaddr) \
11647 do { \
11648 + pax_open_kernel(); \
11649 pte_clear(&init_mm, (vaddr), (ptep)); \
11650 + pax_close_kernel(); \
11651 __flush_tlb_one((vaddr)); \
11652 } while (0)
11653
11654 @@ -74,6 +79,9 @@ do { \
11655
11656 #endif /* !__ASSEMBLY__ */
11657
11658 +#define HAVE_ARCH_UNMAPPED_AREA
11659 +#define HAVE_ARCH_UNMAPPED_AREA_TOPDOWN
11660 +
11661 /*
11662 * kern_addr_valid() is (1) for FLATMEM and (0) for
11663 * SPARSEMEM and DISCONTIGMEM
11664 diff --git a/arch/x86/include/asm/pgtable_32_types.h b/arch/x86/include/asm/pgtable_32_types.h
11665 index ed5903b..c7fe163 100644
11666 --- a/arch/x86/include/asm/pgtable_32_types.h
11667 +++ b/arch/x86/include/asm/pgtable_32_types.h
11668 @@ -8,7 +8,7 @@
11669 */
11670 #ifdef CONFIG_X86_PAE
11671 # include <asm/pgtable-3level_types.h>
11672 -# define PMD_SIZE (1UL << PMD_SHIFT)
11673 +# define PMD_SIZE (_AC(1, UL) << PMD_SHIFT)
11674 # define PMD_MASK (~(PMD_SIZE - 1))
11675 #else
11676 # include <asm/pgtable-2level_types.h>
11677 @@ -46,6 +46,19 @@ extern bool __vmalloc_start_set; /* set once high_memory is set */
11678 # define VMALLOC_END (FIXADDR_START - 2 * PAGE_SIZE)
11679 #endif
11680
11681 +#ifdef CONFIG_PAX_KERNEXEC
11682 +#ifndef __ASSEMBLY__
11683 +extern unsigned char MODULES_EXEC_VADDR[];
11684 +extern unsigned char MODULES_EXEC_END[];
11685 +#endif
11686 +#include <asm/boot.h>
11687 +#define ktla_ktva(addr) (addr + LOAD_PHYSICAL_ADDR + PAGE_OFFSET)
11688 +#define ktva_ktla(addr) (addr - LOAD_PHYSICAL_ADDR - PAGE_OFFSET)
11689 +#else
11690 +#define ktla_ktva(addr) (addr)
11691 +#define ktva_ktla(addr) (addr)
11692 +#endif
11693 +
11694 #define MODULES_VADDR VMALLOC_START
11695 #define MODULES_END VMALLOC_END
11696 #define MODULES_LEN (MODULES_VADDR - MODULES_END)
11697 diff --git a/arch/x86/include/asm/pgtable_64.h b/arch/x86/include/asm/pgtable_64.h
11698 index 8251be0..4ea8b46 100644
11699 --- a/arch/x86/include/asm/pgtable_64.h
11700 +++ b/arch/x86/include/asm/pgtable_64.h
11701 @@ -16,10 +16,14 @@
11702
11703 extern pud_t level3_kernel_pgt[512];
11704 extern pud_t level3_ident_pgt[512];
11705 +extern pud_t level3_vmalloc_start_pgt[512];
11706 +extern pud_t level3_vmalloc_end_pgt[512];
11707 +extern pud_t level3_vmemmap_pgt[512];
11708 +extern pud_t level2_vmemmap_pgt[512];
11709 extern pmd_t level2_kernel_pgt[512];
11710 extern pmd_t level2_fixmap_pgt[512];
11711 -extern pmd_t level2_ident_pgt[512];
11712 -extern pgd_t init_level4_pgt[];
11713 +extern pmd_t level2_ident_pgt[512*2];
11714 +extern pgd_t init_level4_pgt[512];
11715
11716 #define swapper_pg_dir init_level4_pgt
11717
11718 @@ -61,7 +65,9 @@ static inline void native_set_pte_atomic(pte_t *ptep, pte_t pte)
11719
11720 static inline void native_set_pmd(pmd_t *pmdp, pmd_t pmd)
11721 {
11722 + pax_open_kernel();
11723 *pmdp = pmd;
11724 + pax_close_kernel();
11725 }
11726
11727 static inline void native_pmd_clear(pmd_t *pmd)
11728 @@ -97,7 +103,9 @@ static inline pmd_t native_pmdp_get_and_clear(pmd_t *xp)
11729
11730 static inline void native_set_pud(pud_t *pudp, pud_t pud)
11731 {
11732 + pax_open_kernel();
11733 *pudp = pud;
11734 + pax_close_kernel();
11735 }
11736
11737 static inline void native_pud_clear(pud_t *pud)
11738 @@ -107,6 +115,13 @@ static inline void native_pud_clear(pud_t *pud)
11739
11740 static inline void native_set_pgd(pgd_t *pgdp, pgd_t pgd)
11741 {
11742 + pax_open_kernel();
11743 + *pgdp = pgd;
11744 + pax_close_kernel();
11745 +}
11746 +
11747 +static inline void native_set_pgd_batched(pgd_t *pgdp, pgd_t pgd)
11748 +{
11749 *pgdp = pgd;
11750 }
11751
11752 diff --git a/arch/x86/include/asm/pgtable_64_types.h b/arch/x86/include/asm/pgtable_64_types.h
11753 index 766ea16..5b96cb3 100644
11754 --- a/arch/x86/include/asm/pgtable_64_types.h
11755 +++ b/arch/x86/include/asm/pgtable_64_types.h
11756 @@ -59,5 +59,10 @@ typedef struct { pteval_t pte; } pte_t;
11757 #define MODULES_VADDR _AC(0xffffffffa0000000, UL)
11758 #define MODULES_END _AC(0xffffffffff000000, UL)
11759 #define MODULES_LEN (MODULES_END - MODULES_VADDR)
11760 +#define MODULES_EXEC_VADDR MODULES_VADDR
11761 +#define MODULES_EXEC_END MODULES_END
11762 +
11763 +#define ktla_ktva(addr) (addr)
11764 +#define ktva_ktla(addr) (addr)
11765
11766 #endif /* _ASM_X86_PGTABLE_64_DEFS_H */
11767 diff --git a/arch/x86/include/asm/pgtable_types.h b/arch/x86/include/asm/pgtable_types.h
11768 index 013286a..8b42f4f 100644
11769 --- a/arch/x86/include/asm/pgtable_types.h
11770 +++ b/arch/x86/include/asm/pgtable_types.h
11771 @@ -16,13 +16,12 @@
11772 #define _PAGE_BIT_PSE 7 /* 4 MB (or 2MB) page */
11773 #define _PAGE_BIT_PAT 7 /* on 4KB pages */
11774 #define _PAGE_BIT_GLOBAL 8 /* Global TLB entry PPro+ */
11775 -#define _PAGE_BIT_UNUSED1 9 /* available for programmer */
11776 +#define _PAGE_BIT_SPECIAL 9 /* special mappings, no associated struct page */
11777 #define _PAGE_BIT_IOMAP 10 /* flag used to indicate IO mapping */
11778 #define _PAGE_BIT_HIDDEN 11 /* hidden by kmemcheck */
11779 #define _PAGE_BIT_PAT_LARGE 12 /* On 2MB or 1GB pages */
11780 -#define _PAGE_BIT_SPECIAL _PAGE_BIT_UNUSED1
11781 -#define _PAGE_BIT_CPA_TEST _PAGE_BIT_UNUSED1
11782 -#define _PAGE_BIT_SPLITTING _PAGE_BIT_UNUSED1 /* only valid on a PSE pmd */
11783 +#define _PAGE_BIT_CPA_TEST _PAGE_BIT_SPECIAL
11784 +#define _PAGE_BIT_SPLITTING _PAGE_BIT_SPECIAL /* only valid on a PSE pmd */
11785 #define _PAGE_BIT_NX 63 /* No execute: only valid after cpuid check */
11786
11787 /* If _PAGE_BIT_PRESENT is clear, we use these: */
11788 @@ -40,7 +39,6 @@
11789 #define _PAGE_DIRTY (_AT(pteval_t, 1) << _PAGE_BIT_DIRTY)
11790 #define _PAGE_PSE (_AT(pteval_t, 1) << _PAGE_BIT_PSE)
11791 #define _PAGE_GLOBAL (_AT(pteval_t, 1) << _PAGE_BIT_GLOBAL)
11792 -#define _PAGE_UNUSED1 (_AT(pteval_t, 1) << _PAGE_BIT_UNUSED1)
11793 #define _PAGE_IOMAP (_AT(pteval_t, 1) << _PAGE_BIT_IOMAP)
11794 #define _PAGE_PAT (_AT(pteval_t, 1) << _PAGE_BIT_PAT)
11795 #define _PAGE_PAT_LARGE (_AT(pteval_t, 1) << _PAGE_BIT_PAT_LARGE)
11796 @@ -57,8 +55,10 @@
11797
11798 #if defined(CONFIG_X86_64) || defined(CONFIG_X86_PAE)
11799 #define _PAGE_NX (_AT(pteval_t, 1) << _PAGE_BIT_NX)
11800 -#else
11801 +#elif defined(CONFIG_KMEMCHECK)
11802 #define _PAGE_NX (_AT(pteval_t, 0))
11803 +#else
11804 +#define _PAGE_NX (_AT(pteval_t, 1) << _PAGE_BIT_HIDDEN)
11805 #endif
11806
11807 #define _PAGE_FILE (_AT(pteval_t, 1) << _PAGE_BIT_FILE)
11808 @@ -96,6 +96,9 @@
11809 #define PAGE_READONLY_EXEC __pgprot(_PAGE_PRESENT | _PAGE_USER | \
11810 _PAGE_ACCESSED)
11811
11812 +#define PAGE_READONLY_NOEXEC PAGE_READONLY
11813 +#define PAGE_SHARED_NOEXEC PAGE_SHARED
11814 +
11815 #define __PAGE_KERNEL_EXEC \
11816 (_PAGE_PRESENT | _PAGE_RW | _PAGE_DIRTY | _PAGE_ACCESSED | _PAGE_GLOBAL)
11817 #define __PAGE_KERNEL (__PAGE_KERNEL_EXEC | _PAGE_NX)
11818 @@ -106,7 +109,7 @@
11819 #define __PAGE_KERNEL_WC (__PAGE_KERNEL | _PAGE_CACHE_WC)
11820 #define __PAGE_KERNEL_NOCACHE (__PAGE_KERNEL | _PAGE_PCD | _PAGE_PWT)
11821 #define __PAGE_KERNEL_UC_MINUS (__PAGE_KERNEL | _PAGE_PCD)
11822 -#define __PAGE_KERNEL_VSYSCALL (__PAGE_KERNEL_RX | _PAGE_USER)
11823 +#define __PAGE_KERNEL_VSYSCALL (__PAGE_KERNEL_RO | _PAGE_USER)
11824 #define __PAGE_KERNEL_VVAR (__PAGE_KERNEL_RO | _PAGE_USER)
11825 #define __PAGE_KERNEL_VVAR_NOCACHE (__PAGE_KERNEL_VVAR | _PAGE_PCD | _PAGE_PWT)
11826 #define __PAGE_KERNEL_LARGE (__PAGE_KERNEL | _PAGE_PSE)
11827 @@ -168,8 +171,8 @@
11828 * bits are combined, this will alow user to access the high address mapped
11829 * VDSO in the presence of CONFIG_COMPAT_VDSO
11830 */
11831 -#define PTE_IDENT_ATTR 0x003 /* PRESENT+RW */
11832 -#define PDE_IDENT_ATTR 0x067 /* PRESENT+RW+USER+DIRTY+ACCESSED */
11833 +#define PTE_IDENT_ATTR 0x063 /* PRESENT+RW+DIRTY+ACCESSED */
11834 +#define PDE_IDENT_ATTR 0x063 /* PRESENT+RW+DIRTY+ACCESSED */
11835 #define PGD_IDENT_ATTR 0x001 /* PRESENT (no other attributes) */
11836 #endif
11837
11838 @@ -207,7 +210,17 @@ static inline pgdval_t pgd_flags(pgd_t pgd)
11839 {
11840 return native_pgd_val(pgd) & PTE_FLAGS_MASK;
11841 }
11842 +#endif
11843
11844 +#if PAGETABLE_LEVELS == 3
11845 +#include <asm-generic/pgtable-nopud.h>
11846 +#endif
11847 +
11848 +#if PAGETABLE_LEVELS == 2
11849 +#include <asm-generic/pgtable-nopmd.h>
11850 +#endif
11851 +
11852 +#ifndef __ASSEMBLY__
11853 #if PAGETABLE_LEVELS > 3
11854 typedef struct { pudval_t pud; } pud_t;
11855
11856 @@ -221,8 +234,6 @@ static inline pudval_t native_pud_val(pud_t pud)
11857 return pud.pud;
11858 }
11859 #else
11860 -#include <asm-generic/pgtable-nopud.h>
11861 -
11862 static inline pudval_t native_pud_val(pud_t pud)
11863 {
11864 return native_pgd_val(pud.pgd);
11865 @@ -242,8 +253,6 @@ static inline pmdval_t native_pmd_val(pmd_t pmd)
11866 return pmd.pmd;
11867 }
11868 #else
11869 -#include <asm-generic/pgtable-nopmd.h>
11870 -
11871 static inline pmdval_t native_pmd_val(pmd_t pmd)
11872 {
11873 return native_pgd_val(pmd.pud.pgd);
11874 @@ -283,7 +292,6 @@ typedef struct page *pgtable_t;
11875
11876 extern pteval_t __supported_pte_mask;
11877 extern void set_nx(void);
11878 -extern int nx_enabled;
11879
11880 #define pgprot_writecombine pgprot_writecombine
11881 extern pgprot_t pgprot_writecombine(pgprot_t prot);
11882 diff --git a/arch/x86/include/asm/processor-flags.h b/arch/x86/include/asm/processor-flags.h
11883 index aea1d1d..680cf09 100644
11884 --- a/arch/x86/include/asm/processor-flags.h
11885 +++ b/arch/x86/include/asm/processor-flags.h
11886 @@ -65,6 +65,7 @@
11887 #define X86_CR4_PCIDE 0x00020000 /* enable PCID support */
11888 #define X86_CR4_OSXSAVE 0x00040000 /* enable xsave and xrestore */
11889 #define X86_CR4_SMEP 0x00100000 /* enable SMEP support */
11890 +#define X86_CR4_SMAP 0x00200000 /* enable SMAP support */
11891
11892 /*
11893 * x86-64 Task Priority Register, CR8
11894 diff --git a/arch/x86/include/asm/processor.h b/arch/x86/include/asm/processor.h
11895 index d048cad..45e350f 100644
11896 --- a/arch/x86/include/asm/processor.h
11897 +++ b/arch/x86/include/asm/processor.h
11898 @@ -289,7 +289,7 @@ struct tss_struct {
11899
11900 } ____cacheline_aligned;
11901
11902 -DECLARE_PER_CPU_SHARED_ALIGNED(struct tss_struct, init_tss);
11903 +extern struct tss_struct init_tss[NR_CPUS];
11904
11905 /*
11906 * Save the original ist values for checking stack pointers during debugging
11907 @@ -822,11 +822,18 @@ static inline void spin_lock_prefetch(const void *x)
11908 */
11909 #define TASK_SIZE PAGE_OFFSET
11910 #define TASK_SIZE_MAX TASK_SIZE
11911 +
11912 +#ifdef CONFIG_PAX_SEGMEXEC
11913 +#define SEGMEXEC_TASK_SIZE (TASK_SIZE / 2)
11914 +#define STACK_TOP ((current->mm->pax_flags & MF_PAX_SEGMEXEC)?SEGMEXEC_TASK_SIZE:TASK_SIZE)
11915 +#else
11916 #define STACK_TOP TASK_SIZE
11917 -#define STACK_TOP_MAX STACK_TOP
11918 +#endif
11919 +
11920 +#define STACK_TOP_MAX TASK_SIZE
11921
11922 #define INIT_THREAD { \
11923 - .sp0 = sizeof(init_stack) + (long)&init_stack, \
11924 + .sp0 = sizeof(init_stack) + (long)&init_stack - 8, \
11925 .vm86_info = NULL, \
11926 .sysenter_cs = __KERNEL_CS, \
11927 .io_bitmap_ptr = NULL, \
11928 @@ -840,7 +847,7 @@ static inline void spin_lock_prefetch(const void *x)
11929 */
11930 #define INIT_TSS { \
11931 .x86_tss = { \
11932 - .sp0 = sizeof(init_stack) + (long)&init_stack, \
11933 + .sp0 = sizeof(init_stack) + (long)&init_stack - 8, \
11934 .ss0 = __KERNEL_DS, \
11935 .ss1 = __KERNEL_CS, \
11936 .io_bitmap_base = INVALID_IO_BITMAP_OFFSET, \
11937 @@ -851,11 +858,7 @@ static inline void spin_lock_prefetch(const void *x)
11938 extern unsigned long thread_saved_pc(struct task_struct *tsk);
11939
11940 #define THREAD_SIZE_LONGS (THREAD_SIZE/sizeof(unsigned long))
11941 -#define KSTK_TOP(info) \
11942 -({ \
11943 - unsigned long *__ptr = (unsigned long *)(info); \
11944 - (unsigned long)(&__ptr[THREAD_SIZE_LONGS]); \
11945 -})
11946 +#define KSTK_TOP(info) ((container_of(info, struct task_struct, tinfo))->thread.sp0)
11947
11948 /*
11949 * The below -8 is to reserve 8 bytes on top of the ring0 stack.
11950 @@ -870,7 +873,7 @@ extern unsigned long thread_saved_pc(struct task_struct *tsk);
11951 #define task_pt_regs(task) \
11952 ({ \
11953 struct pt_regs *__regs__; \
11954 - __regs__ = (struct pt_regs *)(KSTK_TOP(task_stack_page(task))-8); \
11955 + __regs__ = (struct pt_regs *)((task)->thread.sp0); \
11956 __regs__ - 1; \
11957 })
11958
11959 @@ -880,13 +883,13 @@ extern unsigned long thread_saved_pc(struct task_struct *tsk);
11960 /*
11961 * User space process size. 47bits minus one guard page.
11962 */
11963 -#define TASK_SIZE_MAX ((1UL << 47) - PAGE_SIZE)
11964 +#define TASK_SIZE_MAX ((1UL << TASK_SIZE_MAX_SHIFT) - PAGE_SIZE)
11965
11966 /* This decides where the kernel will search for a free chunk of vm
11967 * space during mmap's.
11968 */
11969 #define IA32_PAGE_OFFSET ((current->personality & ADDR_LIMIT_3GB) ? \
11970 - 0xc0000000 : 0xFFFFe000)
11971 + 0xc0000000 : 0xFFFFf000)
11972
11973 #define TASK_SIZE (test_thread_flag(TIF_ADDR32) ? \
11974 IA32_PAGE_OFFSET : TASK_SIZE_MAX)
11975 @@ -897,11 +900,11 @@ extern unsigned long thread_saved_pc(struct task_struct *tsk);
11976 #define STACK_TOP_MAX TASK_SIZE_MAX
11977
11978 #define INIT_THREAD { \
11979 - .sp0 = (unsigned long)&init_stack + sizeof(init_stack) \
11980 + .sp0 = (unsigned long)&init_stack + sizeof(init_stack) - 16 \
11981 }
11982
11983 #define INIT_TSS { \
11984 - .x86_tss.sp0 = (unsigned long)&init_stack + sizeof(init_stack) \
11985 + .x86_tss.sp0 = (unsigned long)&init_stack + sizeof(init_stack) - 16 \
11986 }
11987
11988 /*
11989 @@ -929,6 +932,10 @@ extern void start_thread(struct pt_regs *regs, unsigned long new_ip,
11990 */
11991 #define TASK_UNMAPPED_BASE (PAGE_ALIGN(TASK_SIZE / 3))
11992
11993 +#ifdef CONFIG_PAX_SEGMEXEC
11994 +#define SEGMEXEC_TASK_UNMAPPED_BASE (PAGE_ALIGN(SEGMEXEC_TASK_SIZE / 3))
11995 +#endif
11996 +
11997 #define KSTK_EIP(task) (task_pt_regs(task)->ip)
11998
11999 /* Get/set a process' ability to use the timestamp counter instruction */
12000 @@ -989,12 +996,12 @@ extern bool cpu_has_amd_erratum(const int *);
12001 #define cpu_has_amd_erratum(x) (false)
12002 #endif /* CONFIG_CPU_SUP_AMD */
12003
12004 -extern unsigned long arch_align_stack(unsigned long sp);
12005 +#define arch_align_stack(x) ((x) & ~0xfUL)
12006 extern void free_init_pages(char *what, unsigned long begin, unsigned long end);
12007
12008 void default_idle(void);
12009 bool set_pm_idle_to_default(void);
12010
12011 -void stop_this_cpu(void *dummy);
12012 +void stop_this_cpu(void *dummy) __noreturn;
12013
12014 #endif /* _ASM_X86_PROCESSOR_H */
12015 diff --git a/arch/x86/include/asm/ptrace.h b/arch/x86/include/asm/ptrace.h
12016 index dcfde52..dbfea06 100644
12017 --- a/arch/x86/include/asm/ptrace.h
12018 +++ b/arch/x86/include/asm/ptrace.h
12019 @@ -155,28 +155,29 @@ static inline unsigned long regs_return_value(struct pt_regs *regs)
12020 }
12021
12022 /*
12023 - * user_mode_vm(regs) determines whether a register set came from user mode.
12024 + * user_mode(regs) determines whether a register set came from user mode.
12025 * This is true if V8086 mode was enabled OR if the register set was from
12026 * protected mode with RPL-3 CS value. This tricky test checks that with
12027 * one comparison. Many places in the kernel can bypass this full check
12028 - * if they have already ruled out V8086 mode, so user_mode(regs) can be used.
12029 + * if they have already ruled out V8086 mode, so user_mode_novm(regs) can
12030 + * be used.
12031 */
12032 -static inline int user_mode(struct pt_regs *regs)
12033 +static inline int user_mode_novm(struct pt_regs *regs)
12034 {
12035 #ifdef CONFIG_X86_32
12036 return (regs->cs & SEGMENT_RPL_MASK) == USER_RPL;
12037 #else
12038 - return !!(regs->cs & 3);
12039 + return !!(regs->cs & SEGMENT_RPL_MASK);
12040 #endif
12041 }
12042
12043 -static inline int user_mode_vm(struct pt_regs *regs)
12044 +static inline int user_mode(struct pt_regs *regs)
12045 {
12046 #ifdef CONFIG_X86_32
12047 return ((regs->cs & SEGMENT_RPL_MASK) | (regs->flags & X86_VM_MASK)) >=
12048 USER_RPL;
12049 #else
12050 - return user_mode(regs);
12051 + return user_mode_novm(regs);
12052 #endif
12053 }
12054
12055 @@ -192,15 +193,16 @@ static inline int v8086_mode(struct pt_regs *regs)
12056 #ifdef CONFIG_X86_64
12057 static inline bool user_64bit_mode(struct pt_regs *regs)
12058 {
12059 + unsigned long cs = regs->cs & 0xffff;
12060 #ifndef CONFIG_PARAVIRT
12061 /*
12062 * On non-paravirt systems, this is the only long mode CPL 3
12063 * selector. We do not allow long mode selectors in the LDT.
12064 */
12065 - return regs->cs == __USER_CS;
12066 + return cs == __USER_CS;
12067 #else
12068 /* Headers are too twisted for this to go in paravirt.h. */
12069 - return regs->cs == __USER_CS || regs->cs == pv_info.extra_user_64bit_cs;
12070 + return cs == __USER_CS || cs == pv_info.extra_user_64bit_cs;
12071 #endif
12072 }
12073 #endif
12074 diff --git a/arch/x86/include/asm/realmode.h b/arch/x86/include/asm/realmode.h
12075 index fe1ec5b..dc5c3fe 100644
12076 --- a/arch/x86/include/asm/realmode.h
12077 +++ b/arch/x86/include/asm/realmode.h
12078 @@ -22,16 +22,14 @@ struct real_mode_header {
12079 #endif
12080 /* APM/BIOS reboot */
12081 u32 machine_real_restart_asm;
12082 -#ifdef CONFIG_X86_64
12083 u32 machine_real_restart_seg;
12084 -#endif
12085 };
12086
12087 /* This must match data at trampoline_32/64.S */
12088 struct trampoline_header {
12089 #ifdef CONFIG_X86_32
12090 u32 start;
12091 - u16 gdt_pad;
12092 + u16 boot_cs;
12093 u16 gdt_limit;
12094 u32 gdt_base;
12095 #else
12096 diff --git a/arch/x86/include/asm/reboot.h b/arch/x86/include/asm/reboot.h
12097 index a82c4f1..ac45053 100644
12098 --- a/arch/x86/include/asm/reboot.h
12099 +++ b/arch/x86/include/asm/reboot.h
12100 @@ -6,13 +6,13 @@
12101 struct pt_regs;
12102
12103 struct machine_ops {
12104 - void (*restart)(char *cmd);
12105 - void (*halt)(void);
12106 - void (*power_off)(void);
12107 + void (* __noreturn restart)(char *cmd);
12108 + void (* __noreturn halt)(void);
12109 + void (* __noreturn power_off)(void);
12110 void (*shutdown)(void);
12111 void (*crash_shutdown)(struct pt_regs *);
12112 - void (*emergency_restart)(void);
12113 -};
12114 + void (* __noreturn emergency_restart)(void);
12115 +} __no_const;
12116
12117 extern struct machine_ops machine_ops;
12118
12119 diff --git a/arch/x86/include/asm/rwsem.h b/arch/x86/include/asm/rwsem.h
12120 index 2dbe4a7..ce1db00 100644
12121 --- a/arch/x86/include/asm/rwsem.h
12122 +++ b/arch/x86/include/asm/rwsem.h
12123 @@ -64,6 +64,14 @@ static inline void __down_read(struct rw_semaphore *sem)
12124 {
12125 asm volatile("# beginning down_read\n\t"
12126 LOCK_PREFIX _ASM_INC "(%1)\n\t"
12127 +
12128 +#ifdef CONFIG_PAX_REFCOUNT
12129 + "jno 0f\n"
12130 + LOCK_PREFIX _ASM_DEC "(%1)\n"
12131 + "int $4\n0:\n"
12132 + _ASM_EXTABLE(0b, 0b)
12133 +#endif
12134 +
12135 /* adds 0x00000001 */
12136 " jns 1f\n"
12137 " call call_rwsem_down_read_failed\n"
12138 @@ -85,6 +93,14 @@ static inline int __down_read_trylock(struct rw_semaphore *sem)
12139 "1:\n\t"
12140 " mov %1,%2\n\t"
12141 " add %3,%2\n\t"
12142 +
12143 +#ifdef CONFIG_PAX_REFCOUNT
12144 + "jno 0f\n"
12145 + "sub %3,%2\n"
12146 + "int $4\n0:\n"
12147 + _ASM_EXTABLE(0b, 0b)
12148 +#endif
12149 +
12150 " jle 2f\n\t"
12151 LOCK_PREFIX " cmpxchg %2,%0\n\t"
12152 " jnz 1b\n\t"
12153 @@ -104,6 +120,14 @@ static inline void __down_write_nested(struct rw_semaphore *sem, int subclass)
12154 long tmp;
12155 asm volatile("# beginning down_write\n\t"
12156 LOCK_PREFIX " xadd %1,(%2)\n\t"
12157 +
12158 +#ifdef CONFIG_PAX_REFCOUNT
12159 + "jno 0f\n"
12160 + "mov %1,(%2)\n"
12161 + "int $4\n0:\n"
12162 + _ASM_EXTABLE(0b, 0b)
12163 +#endif
12164 +
12165 /* adds 0xffff0001, returns the old value */
12166 " test %1,%1\n\t"
12167 /* was the count 0 before? */
12168 @@ -141,6 +165,14 @@ static inline void __up_read(struct rw_semaphore *sem)
12169 long tmp;
12170 asm volatile("# beginning __up_read\n\t"
12171 LOCK_PREFIX " xadd %1,(%2)\n\t"
12172 +
12173 +#ifdef CONFIG_PAX_REFCOUNT
12174 + "jno 0f\n"
12175 + "mov %1,(%2)\n"
12176 + "int $4\n0:\n"
12177 + _ASM_EXTABLE(0b, 0b)
12178 +#endif
12179 +
12180 /* subtracts 1, returns the old value */
12181 " jns 1f\n\t"
12182 " call call_rwsem_wake\n" /* expects old value in %edx */
12183 @@ -159,6 +191,14 @@ static inline void __up_write(struct rw_semaphore *sem)
12184 long tmp;
12185 asm volatile("# beginning __up_write\n\t"
12186 LOCK_PREFIX " xadd %1,(%2)\n\t"
12187 +
12188 +#ifdef CONFIG_PAX_REFCOUNT
12189 + "jno 0f\n"
12190 + "mov %1,(%2)\n"
12191 + "int $4\n0:\n"
12192 + _ASM_EXTABLE(0b, 0b)
12193 +#endif
12194 +
12195 /* subtracts 0xffff0001, returns the old value */
12196 " jns 1f\n\t"
12197 " call call_rwsem_wake\n" /* expects old value in %edx */
12198 @@ -176,6 +216,14 @@ static inline void __downgrade_write(struct rw_semaphore *sem)
12199 {
12200 asm volatile("# beginning __downgrade_write\n\t"
12201 LOCK_PREFIX _ASM_ADD "%2,(%1)\n\t"
12202 +
12203 +#ifdef CONFIG_PAX_REFCOUNT
12204 + "jno 0f\n"
12205 + LOCK_PREFIX _ASM_SUB "%2,(%1)\n"
12206 + "int $4\n0:\n"
12207 + _ASM_EXTABLE(0b, 0b)
12208 +#endif
12209 +
12210 /*
12211 * transitions 0xZZZZ0001 -> 0xYYYY0001 (i386)
12212 * 0xZZZZZZZZ00000001 -> 0xYYYYYYYY00000001 (x86_64)
12213 @@ -194,7 +242,15 @@ static inline void __downgrade_write(struct rw_semaphore *sem)
12214 */
12215 static inline void rwsem_atomic_add(long delta, struct rw_semaphore *sem)
12216 {
12217 - asm volatile(LOCK_PREFIX _ASM_ADD "%1,%0"
12218 + asm volatile(LOCK_PREFIX _ASM_ADD "%1,%0\n"
12219 +
12220 +#ifdef CONFIG_PAX_REFCOUNT
12221 + "jno 0f\n"
12222 + LOCK_PREFIX _ASM_SUB "%1,%0\n"
12223 + "int $4\n0:\n"
12224 + _ASM_EXTABLE(0b, 0b)
12225 +#endif
12226 +
12227 : "+m" (sem->count)
12228 : "er" (delta));
12229 }
12230 @@ -204,7 +260,7 @@ static inline void rwsem_atomic_add(long delta, struct rw_semaphore *sem)
12231 */
12232 static inline long rwsem_atomic_update(long delta, struct rw_semaphore *sem)
12233 {
12234 - return delta + xadd(&sem->count, delta);
12235 + return delta + xadd_check_overflow(&sem->count, delta);
12236 }
12237
12238 #endif /* __KERNEL__ */
12239 diff --git a/arch/x86/include/asm/segment.h b/arch/x86/include/asm/segment.h
12240 index c48a950..c6d7468 100644
12241 --- a/arch/x86/include/asm/segment.h
12242 +++ b/arch/x86/include/asm/segment.h
12243 @@ -64,10 +64,15 @@
12244 * 26 - ESPFIX small SS
12245 * 27 - per-cpu [ offset to per-cpu data area ]
12246 * 28 - stack_canary-20 [ for stack protector ]
12247 - * 29 - unused
12248 - * 30 - unused
12249 + * 29 - PCI BIOS CS
12250 + * 30 - PCI BIOS DS
12251 * 31 - TSS for double fault handler
12252 */
12253 +#define GDT_ENTRY_KERNEXEC_EFI_CS (1)
12254 +#define GDT_ENTRY_KERNEXEC_EFI_DS (2)
12255 +#define __KERNEXEC_EFI_CS (GDT_ENTRY_KERNEXEC_EFI_CS*8)
12256 +#define __KERNEXEC_EFI_DS (GDT_ENTRY_KERNEXEC_EFI_DS*8)
12257 +
12258 #define GDT_ENTRY_TLS_MIN 6
12259 #define GDT_ENTRY_TLS_MAX (GDT_ENTRY_TLS_MIN + GDT_ENTRY_TLS_ENTRIES - 1)
12260
12261 @@ -79,6 +84,8 @@
12262
12263 #define GDT_ENTRY_KERNEL_CS (GDT_ENTRY_KERNEL_BASE+0)
12264
12265 +#define GDT_ENTRY_KERNEXEC_KERNEL_CS (4)
12266 +
12267 #define GDT_ENTRY_KERNEL_DS (GDT_ENTRY_KERNEL_BASE+1)
12268
12269 #define GDT_ENTRY_TSS (GDT_ENTRY_KERNEL_BASE+4)
12270 @@ -104,6 +111,12 @@
12271 #define __KERNEL_STACK_CANARY 0
12272 #endif
12273
12274 +#define GDT_ENTRY_PCIBIOS_CS (GDT_ENTRY_KERNEL_BASE+17)
12275 +#define __PCIBIOS_CS (GDT_ENTRY_PCIBIOS_CS * 8)
12276 +
12277 +#define GDT_ENTRY_PCIBIOS_DS (GDT_ENTRY_KERNEL_BASE+18)
12278 +#define __PCIBIOS_DS (GDT_ENTRY_PCIBIOS_DS * 8)
12279 +
12280 #define GDT_ENTRY_DOUBLEFAULT_TSS 31
12281
12282 /*
12283 @@ -141,7 +154,7 @@
12284 */
12285
12286 /* Matches PNP_CS32 and PNP_CS16 (they must be consecutive) */
12287 -#define SEGMENT_IS_PNP_CODE(x) (((x) & 0xf4) == GDT_ENTRY_PNPBIOS_BASE * 8)
12288 +#define SEGMENT_IS_PNP_CODE(x) (((x) & 0xFFFCU) == PNP_CS32 || ((x) & 0xFFFCU) == PNP_CS16)
12289
12290
12291 #else
12292 @@ -165,6 +178,8 @@
12293 #define __USER32_CS (GDT_ENTRY_DEFAULT_USER32_CS*8+3)
12294 #define __USER32_DS __USER_DS
12295
12296 +#define GDT_ENTRY_KERNEXEC_KERNEL_CS 7
12297 +
12298 #define GDT_ENTRY_TSS 8 /* needs two entries */
12299 #define GDT_ENTRY_LDT 10 /* needs two entries */
12300 #define GDT_ENTRY_TLS_MIN 12
12301 @@ -185,6 +200,7 @@
12302 #endif
12303
12304 #define __KERNEL_CS (GDT_ENTRY_KERNEL_CS*8)
12305 +#define __KERNEXEC_KERNEL_CS (GDT_ENTRY_KERNEXEC_KERNEL_CS*8)
12306 #define __KERNEL_DS (GDT_ENTRY_KERNEL_DS*8)
12307 #define __USER_DS (GDT_ENTRY_DEFAULT_USER_DS*8+3)
12308 #define __USER_CS (GDT_ENTRY_DEFAULT_USER_CS*8+3)
12309 @@ -265,7 +281,7 @@ static inline unsigned long get_limit(unsigned long segment)
12310 {
12311 unsigned long __limit;
12312 asm("lsll %1,%0" : "=r" (__limit) : "r" (segment));
12313 - return __limit + 1;
12314 + return __limit;
12315 }
12316
12317 #endif /* !__ASSEMBLY__ */
12318 diff --git a/arch/x86/include/asm/smp.h b/arch/x86/include/asm/smp.h
12319 index 4f19a15..9e14f27 100644
12320 --- a/arch/x86/include/asm/smp.h
12321 +++ b/arch/x86/include/asm/smp.h
12322 @@ -36,7 +36,7 @@ DECLARE_PER_CPU_READ_MOSTLY(cpumask_var_t, cpu_core_map);
12323 /* cpus sharing the last level cache: */
12324 DECLARE_PER_CPU_READ_MOSTLY(cpumask_var_t, cpu_llc_shared_map);
12325 DECLARE_PER_CPU_READ_MOSTLY(u16, cpu_llc_id);
12326 -DECLARE_PER_CPU_READ_MOSTLY(int, cpu_number);
12327 +DECLARE_PER_CPU_READ_MOSTLY(unsigned int, cpu_number);
12328
12329 static inline struct cpumask *cpu_sibling_mask(int cpu)
12330 {
12331 @@ -79,7 +79,7 @@ struct smp_ops {
12332
12333 void (*send_call_func_ipi)(const struct cpumask *mask);
12334 void (*send_call_func_single_ipi)(int cpu);
12335 -};
12336 +} __no_const;
12337
12338 /* Globals due to paravirt */
12339 extern void set_cpu_sibling_map(int cpu);
12340 @@ -190,14 +190,8 @@ extern unsigned disabled_cpus __cpuinitdata;
12341 extern int safe_smp_processor_id(void);
12342
12343 #elif defined(CONFIG_X86_64_SMP)
12344 -#define raw_smp_processor_id() (this_cpu_read(cpu_number))
12345 -
12346 -#define stack_smp_processor_id() \
12347 -({ \
12348 - struct thread_info *ti; \
12349 - __asm__("andq %%rsp,%0; ":"=r" (ti) : "0" (CURRENT_MASK)); \
12350 - ti->cpu; \
12351 -})
12352 +#define raw_smp_processor_id() (this_cpu_read(cpu_number))
12353 +#define stack_smp_processor_id() raw_smp_processor_id()
12354 #define safe_smp_processor_id() smp_processor_id()
12355
12356 #endif
12357 diff --git a/arch/x86/include/asm/spinlock.h b/arch/x86/include/asm/spinlock.h
12358 index 33692ea..350a534 100644
12359 --- a/arch/x86/include/asm/spinlock.h
12360 +++ b/arch/x86/include/asm/spinlock.h
12361 @@ -172,6 +172,14 @@ static inline int arch_write_can_lock(arch_rwlock_t *lock)
12362 static inline void arch_read_lock(arch_rwlock_t *rw)
12363 {
12364 asm volatile(LOCK_PREFIX READ_LOCK_SIZE(dec) " (%0)\n\t"
12365 +
12366 +#ifdef CONFIG_PAX_REFCOUNT
12367 + "jno 0f\n"
12368 + LOCK_PREFIX READ_LOCK_SIZE(inc) " (%0)\n"
12369 + "int $4\n0:\n"
12370 + _ASM_EXTABLE(0b, 0b)
12371 +#endif
12372 +
12373 "jns 1f\n"
12374 "call __read_lock_failed\n\t"
12375 "1:\n"
12376 @@ -181,6 +189,14 @@ static inline void arch_read_lock(arch_rwlock_t *rw)
12377 static inline void arch_write_lock(arch_rwlock_t *rw)
12378 {
12379 asm volatile(LOCK_PREFIX WRITE_LOCK_SUB(%1) "(%0)\n\t"
12380 +
12381 +#ifdef CONFIG_PAX_REFCOUNT
12382 + "jno 0f\n"
12383 + LOCK_PREFIX WRITE_LOCK_ADD(%1) "(%0)\n"
12384 + "int $4\n0:\n"
12385 + _ASM_EXTABLE(0b, 0b)
12386 +#endif
12387 +
12388 "jz 1f\n"
12389 "call __write_lock_failed\n\t"
12390 "1:\n"
12391 @@ -210,13 +226,29 @@ static inline int arch_write_trylock(arch_rwlock_t *lock)
12392
12393 static inline void arch_read_unlock(arch_rwlock_t *rw)
12394 {
12395 - asm volatile(LOCK_PREFIX READ_LOCK_SIZE(inc) " %0"
12396 + asm volatile(LOCK_PREFIX READ_LOCK_SIZE(inc) " %0\n"
12397 +
12398 +#ifdef CONFIG_PAX_REFCOUNT
12399 + "jno 0f\n"
12400 + LOCK_PREFIX READ_LOCK_SIZE(dec) " %0\n"
12401 + "int $4\n0:\n"
12402 + _ASM_EXTABLE(0b, 0b)
12403 +#endif
12404 +
12405 :"+m" (rw->lock) : : "memory");
12406 }
12407
12408 static inline void arch_write_unlock(arch_rwlock_t *rw)
12409 {
12410 - asm volatile(LOCK_PREFIX WRITE_LOCK_ADD(%1) "%0"
12411 + asm volatile(LOCK_PREFIX WRITE_LOCK_ADD(%1) "%0\n"
12412 +
12413 +#ifdef CONFIG_PAX_REFCOUNT
12414 + "jno 0f\n"
12415 + LOCK_PREFIX WRITE_LOCK_SUB(%1) "%0\n"
12416 + "int $4\n0:\n"
12417 + _ASM_EXTABLE(0b, 0b)
12418 +#endif
12419 +
12420 : "+m" (rw->write) : "i" (RW_LOCK_BIAS) : "memory");
12421 }
12422
12423 diff --git a/arch/x86/include/asm/stackprotector.h b/arch/x86/include/asm/stackprotector.h
12424 index 6a99859..03cb807 100644
12425 --- a/arch/x86/include/asm/stackprotector.h
12426 +++ b/arch/x86/include/asm/stackprotector.h
12427 @@ -47,7 +47,7 @@
12428 * head_32 for boot CPU and setup_per_cpu_areas() for others.
12429 */
12430 #define GDT_STACK_CANARY_INIT \
12431 - [GDT_ENTRY_STACK_CANARY] = GDT_ENTRY_INIT(0x4090, 0, 0x18),
12432 + [GDT_ENTRY_STACK_CANARY] = GDT_ENTRY_INIT(0x4090, 0, 0x17),
12433
12434 /*
12435 * Initialize the stackprotector canary value.
12436 @@ -112,7 +112,7 @@ static inline void setup_stack_canary_segment(int cpu)
12437
12438 static inline void load_stack_canary_segment(void)
12439 {
12440 -#ifdef CONFIG_X86_32
12441 +#if defined(CONFIG_X86_32) && !defined(CONFIG_PAX_MEMORY_UDEREF)
12442 asm volatile ("mov %0, %%gs" : : "r" (0));
12443 #endif
12444 }
12445 diff --git a/arch/x86/include/asm/stacktrace.h b/arch/x86/include/asm/stacktrace.h
12446 index 70bbe39..4ae2bd4 100644
12447 --- a/arch/x86/include/asm/stacktrace.h
12448 +++ b/arch/x86/include/asm/stacktrace.h
12449 @@ -11,28 +11,20 @@
12450
12451 extern int kstack_depth_to_print;
12452
12453 -struct thread_info;
12454 +struct task_struct;
12455 struct stacktrace_ops;
12456
12457 -typedef unsigned long (*walk_stack_t)(struct thread_info *tinfo,
12458 - unsigned long *stack,
12459 - unsigned long bp,
12460 - const struct stacktrace_ops *ops,
12461 - void *data,
12462 - unsigned long *end,
12463 - int *graph);
12464 +typedef unsigned long walk_stack_t(struct task_struct *task,
12465 + void *stack_start,
12466 + unsigned long *stack,
12467 + unsigned long bp,
12468 + const struct stacktrace_ops *ops,
12469 + void *data,
12470 + unsigned long *end,
12471 + int *graph);
12472
12473 -extern unsigned long
12474 -print_context_stack(struct thread_info *tinfo,
12475 - unsigned long *stack, unsigned long bp,
12476 - const struct stacktrace_ops *ops, void *data,
12477 - unsigned long *end, int *graph);
12478 -
12479 -extern unsigned long
12480 -print_context_stack_bp(struct thread_info *tinfo,
12481 - unsigned long *stack, unsigned long bp,
12482 - const struct stacktrace_ops *ops, void *data,
12483 - unsigned long *end, int *graph);
12484 +extern walk_stack_t print_context_stack;
12485 +extern walk_stack_t print_context_stack_bp;
12486
12487 /* Generic stack tracer with callbacks */
12488
12489 @@ -40,7 +32,7 @@ struct stacktrace_ops {
12490 void (*address)(void *data, unsigned long address, int reliable);
12491 /* On negative return stop dumping */
12492 int (*stack)(void *data, char *name);
12493 - walk_stack_t walk_stack;
12494 + walk_stack_t *walk_stack;
12495 };
12496
12497 void dump_trace(struct task_struct *tsk, struct pt_regs *regs,
12498 diff --git a/arch/x86/include/asm/switch_to.h b/arch/x86/include/asm/switch_to.h
12499 index 4ec45b3..a4f0a8a 100644
12500 --- a/arch/x86/include/asm/switch_to.h
12501 +++ b/arch/x86/include/asm/switch_to.h
12502 @@ -108,7 +108,7 @@ do { \
12503 "call __switch_to\n\t" \
12504 "movq "__percpu_arg([current_task])",%%rsi\n\t" \
12505 __switch_canary \
12506 - "movq %P[thread_info](%%rsi),%%r8\n\t" \
12507 + "movq "__percpu_arg([thread_info])",%%r8\n\t" \
12508 "movq %%rax,%%rdi\n\t" \
12509 "testl %[_tif_fork],%P[ti_flags](%%r8)\n\t" \
12510 "jnz ret_from_fork\n\t" \
12511 @@ -119,7 +119,7 @@ do { \
12512 [threadrsp] "i" (offsetof(struct task_struct, thread.sp)), \
12513 [ti_flags] "i" (offsetof(struct thread_info, flags)), \
12514 [_tif_fork] "i" (_TIF_FORK), \
12515 - [thread_info] "i" (offsetof(struct task_struct, stack)), \
12516 + [thread_info] "m" (current_tinfo), \
12517 [current_task] "m" (current_task) \
12518 __switch_canary_iparam \
12519 : "memory", "cc" __EXTRA_CLOBBER)
12520 diff --git a/arch/x86/include/asm/sys_ia32.h b/arch/x86/include/asm/sys_ia32.h
12521 index 3fda9db4..4ca1c61 100644
12522 --- a/arch/x86/include/asm/sys_ia32.h
12523 +++ b/arch/x86/include/asm/sys_ia32.h
12524 @@ -40,7 +40,7 @@ asmlinkage long sys32_sigaction(int, struct old_sigaction32 __user *,
12525 struct old_sigaction32 __user *);
12526 asmlinkage long sys32_alarm(unsigned int);
12527
12528 -asmlinkage long sys32_waitpid(compat_pid_t, unsigned int *, int);
12529 +asmlinkage long sys32_waitpid(compat_pid_t, unsigned int __user *, int);
12530 asmlinkage long sys32_sysfs(int, u32, u32);
12531
12532 asmlinkage long sys32_sched_rr_get_interval(compat_pid_t,
12533 diff --git a/arch/x86/include/asm/thread_info.h b/arch/x86/include/asm/thread_info.h
12534 index 89f794f..1422765 100644
12535 --- a/arch/x86/include/asm/thread_info.h
12536 +++ b/arch/x86/include/asm/thread_info.h
12537 @@ -10,6 +10,7 @@
12538 #include <linux/compiler.h>
12539 #include <asm/page.h>
12540 #include <asm/types.h>
12541 +#include <asm/percpu.h>
12542
12543 /*
12544 * low level task data that entry.S needs immediate access to
12545 @@ -24,7 +25,6 @@ struct exec_domain;
12546 #include <linux/atomic.h>
12547
12548 struct thread_info {
12549 - struct task_struct *task; /* main task structure */
12550 struct exec_domain *exec_domain; /* execution domain */
12551 __u32 flags; /* low level flags */
12552 __u32 status; /* thread synchronous flags */
12553 @@ -34,19 +34,13 @@ struct thread_info {
12554 mm_segment_t addr_limit;
12555 struct restart_block restart_block;
12556 void __user *sysenter_return;
12557 -#ifdef CONFIG_X86_32
12558 - unsigned long previous_esp; /* ESP of the previous stack in
12559 - case of nested (IRQ) stacks
12560 - */
12561 - __u8 supervisor_stack[0];
12562 -#endif
12563 + unsigned long lowest_stack;
12564 unsigned int sig_on_uaccess_error:1;
12565 unsigned int uaccess_err:1; /* uaccess failed */
12566 };
12567
12568 -#define INIT_THREAD_INFO(tsk) \
12569 +#define INIT_THREAD_INFO \
12570 { \
12571 - .task = &tsk, \
12572 .exec_domain = &default_exec_domain, \
12573 .flags = 0, \
12574 .cpu = 0, \
12575 @@ -57,7 +51,7 @@ struct thread_info {
12576 }, \
12577 }
12578
12579 -#define init_thread_info (init_thread_union.thread_info)
12580 +#define init_thread_info (init_thread_union.stack)
12581 #define init_stack (init_thread_union.stack)
12582
12583 #else /* !__ASSEMBLY__ */
12584 @@ -98,6 +92,7 @@ struct thread_info {
12585 #define TIF_SYSCALL_TRACEPOINT 28 /* syscall tracepoint instrumentation */
12586 #define TIF_ADDR32 29 /* 32-bit address space on 64 bits */
12587 #define TIF_X32 30 /* 32-bit native x86-64 binary */
12588 +#define TIF_GRSEC_SETXID 31 /* update credentials on syscall entry/exit */
12589
12590 #define _TIF_SYSCALL_TRACE (1 << TIF_SYSCALL_TRACE)
12591 #define _TIF_NOTIFY_RESUME (1 << TIF_NOTIFY_RESUME)
12592 @@ -122,16 +117,18 @@ struct thread_info {
12593 #define _TIF_SYSCALL_TRACEPOINT (1 << TIF_SYSCALL_TRACEPOINT)
12594 #define _TIF_ADDR32 (1 << TIF_ADDR32)
12595 #define _TIF_X32 (1 << TIF_X32)
12596 +#define _TIF_GRSEC_SETXID (1 << TIF_GRSEC_SETXID)
12597
12598 /* work to do in syscall_trace_enter() */
12599 #define _TIF_WORK_SYSCALL_ENTRY \
12600 (_TIF_SYSCALL_TRACE | _TIF_SYSCALL_EMU | _TIF_SYSCALL_AUDIT | \
12601 - _TIF_SECCOMP | _TIF_SINGLESTEP | _TIF_SYSCALL_TRACEPOINT)
12602 + _TIF_SECCOMP | _TIF_SINGLESTEP | _TIF_SYSCALL_TRACEPOINT | \
12603 + _TIF_GRSEC_SETXID)
12604
12605 /* work to do in syscall_trace_leave() */
12606 #define _TIF_WORK_SYSCALL_EXIT \
12607 (_TIF_SYSCALL_TRACE | _TIF_SYSCALL_AUDIT | _TIF_SINGLESTEP | \
12608 - _TIF_SYSCALL_TRACEPOINT)
12609 + _TIF_SYSCALL_TRACEPOINT | _TIF_GRSEC_SETXID)
12610
12611 /* work to do on interrupt/exception return */
12612 #define _TIF_WORK_MASK \
12613 @@ -141,7 +138,8 @@ struct thread_info {
12614
12615 /* work to do on any return to user space */
12616 #define _TIF_ALLWORK_MASK \
12617 - ((0x0000FFFF & ~_TIF_SECCOMP) | _TIF_SYSCALL_TRACEPOINT)
12618 + ((0x0000FFFF & ~_TIF_SECCOMP) | _TIF_SYSCALL_TRACEPOINT | \
12619 + _TIF_GRSEC_SETXID)
12620
12621 /* Only used for 64 bit */
12622 #define _TIF_DO_NOTIFY_MASK \
12623 @@ -157,45 +155,40 @@ struct thread_info {
12624
12625 #define PREEMPT_ACTIVE 0x10000000
12626
12627 -#ifdef CONFIG_X86_32
12628 -
12629 -#define STACK_WARN (THREAD_SIZE/8)
12630 -/*
12631 - * macros/functions for gaining access to the thread information structure
12632 - *
12633 - * preempt_count needs to be 1 initially, until the scheduler is functional.
12634 - */
12635 -#ifndef __ASSEMBLY__
12636 -
12637 -
12638 -/* how to get the current stack pointer from C */
12639 -register unsigned long current_stack_pointer asm("esp") __used;
12640 -
12641 -/* how to get the thread information struct from C */
12642 -static inline struct thread_info *current_thread_info(void)
12643 -{
12644 - return (struct thread_info *)
12645 - (current_stack_pointer & ~(THREAD_SIZE - 1));
12646 -}
12647 -
12648 -#else /* !__ASSEMBLY__ */
12649 -
12650 +#ifdef __ASSEMBLY__
12651 /* how to get the thread information struct from ASM */
12652 #define GET_THREAD_INFO(reg) \
12653 - movl $-THREAD_SIZE, reg; \
12654 - andl %esp, reg
12655 + mov PER_CPU_VAR(current_tinfo), reg
12656
12657 /* use this one if reg already contains %esp */
12658 -#define GET_THREAD_INFO_WITH_ESP(reg) \
12659 - andl $-THREAD_SIZE, reg
12660 +#define GET_THREAD_INFO_WITH_ESP(reg) GET_THREAD_INFO(reg)
12661 +#else
12662 +/* how to get the thread information struct from C */
12663 +DECLARE_PER_CPU(struct thread_info *, current_tinfo);
12664 +
12665 +static __always_inline struct thread_info *current_thread_info(void)
12666 +{
12667 + return this_cpu_read_stable(current_tinfo);
12668 +}
12669 +#endif
12670 +
12671 +#ifdef CONFIG_X86_32
12672 +
12673 +#define STACK_WARN (THREAD_SIZE/8)
12674 +/*
12675 + * macros/functions for gaining access to the thread information structure
12676 + *
12677 + * preempt_count needs to be 1 initially, until the scheduler is functional.
12678 + */
12679 +#ifndef __ASSEMBLY__
12680 +
12681 +/* how to get the current stack pointer from C */
12682 +register unsigned long current_stack_pointer asm("esp") __used;
12683
12684 #endif
12685
12686 #else /* X86_32 */
12687
12688 -#include <asm/percpu.h>
12689 -#define KERNEL_STACK_OFFSET (5*8)
12690 -
12691 /*
12692 * macros/functions for gaining access to the thread information structure
12693 * preempt_count needs to be 1 initially, until the scheduler is functional.
12694 @@ -203,27 +196,8 @@ static inline struct thread_info *current_thread_info(void)
12695 #ifndef __ASSEMBLY__
12696 DECLARE_PER_CPU(unsigned long, kernel_stack);
12697
12698 -static inline struct thread_info *current_thread_info(void)
12699 -{
12700 - struct thread_info *ti;
12701 - ti = (void *)(this_cpu_read_stable(kernel_stack) +
12702 - KERNEL_STACK_OFFSET - THREAD_SIZE);
12703 - return ti;
12704 -}
12705 -
12706 -#else /* !__ASSEMBLY__ */
12707 -
12708 -/* how to get the thread information struct from ASM */
12709 -#define GET_THREAD_INFO(reg) \
12710 - movq PER_CPU_VAR(kernel_stack),reg ; \
12711 - subq $(THREAD_SIZE-KERNEL_STACK_OFFSET),reg
12712 -
12713 -/*
12714 - * Same if PER_CPU_VAR(kernel_stack) is, perhaps with some offset, already in
12715 - * a certain register (to be used in assembler memory operands).
12716 - */
12717 -#define THREAD_INFO(reg, off) KERNEL_STACK_OFFSET+(off)-THREAD_SIZE(reg)
12718 -
12719 +/* how to get the current stack pointer from C */
12720 +register unsigned long current_stack_pointer asm("rsp") __used;
12721 #endif
12722
12723 #endif /* !X86_32 */
12724 @@ -284,5 +258,12 @@ static inline bool is_ia32_task(void)
12725 extern void arch_task_cache_init(void);
12726 extern int arch_dup_task_struct(struct task_struct *dst, struct task_struct *src);
12727 extern void arch_release_task_struct(struct task_struct *tsk);
12728 +
12729 +#define __HAVE_THREAD_FUNCTIONS
12730 +#define task_thread_info(task) (&(task)->tinfo)
12731 +#define task_stack_page(task) ((task)->stack)
12732 +#define setup_thread_stack(p, org) do {} while (0)
12733 +#define end_of_stack(p) ((unsigned long *)task_stack_page(p) + 1)
12734 +
12735 #endif
12736 #endif /* _ASM_X86_THREAD_INFO_H */
12737 diff --git a/arch/x86/include/asm/uaccess.h b/arch/x86/include/asm/uaccess.h
12738 index e1f3a17..1ab364d 100644
12739 --- a/arch/x86/include/asm/uaccess.h
12740 +++ b/arch/x86/include/asm/uaccess.h
12741 @@ -7,12 +7,15 @@
12742 #include <linux/compiler.h>
12743 #include <linux/thread_info.h>
12744 #include <linux/string.h>
12745 +#include <linux/sched.h>
12746 #include <asm/asm.h>
12747 #include <asm/page.h>
12748
12749 #define VERIFY_READ 0
12750 #define VERIFY_WRITE 1
12751
12752 +extern void check_object_size(const void *ptr, unsigned long n, bool to);
12753 +
12754 /*
12755 * The fs value determines whether argument validity checking should be
12756 * performed or not. If get_fs() == USER_DS, checking is performed, with
12757 @@ -28,7 +31,12 @@
12758
12759 #define get_ds() (KERNEL_DS)
12760 #define get_fs() (current_thread_info()->addr_limit)
12761 +#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_MEMORY_UDEREF)
12762 +void __set_fs(mm_segment_t x);
12763 +void set_fs(mm_segment_t x);
12764 +#else
12765 #define set_fs(x) (current_thread_info()->addr_limit = (x))
12766 +#endif
12767
12768 #define segment_eq(a, b) ((a).seg == (b).seg)
12769
12770 @@ -76,8 +84,33 @@
12771 * checks that the pointer is in the user space range - after calling
12772 * this function, memory access functions may still return -EFAULT.
12773 */
12774 -#define access_ok(type, addr, size) \
12775 - (likely(__range_not_ok(addr, size, user_addr_max()) == 0))
12776 +#define __access_ok(type, addr, size) (likely(__range_not_ok(addr, size, user_addr_max()) == 0))
12777 +#define access_ok(type, addr, size) \
12778 +({ \
12779 + long __size = size; \
12780 + unsigned long __addr = (unsigned long)addr; \
12781 + unsigned long __addr_ao = __addr & PAGE_MASK; \
12782 + unsigned long __end_ao = __addr + __size - 1; \
12783 + bool __ret_ao = __range_not_ok(__addr, __size, user_addr_max()) == 0;\
12784 + if (__ret_ao && unlikely((__end_ao ^ __addr_ao) & PAGE_MASK)) { \
12785 + while(__addr_ao <= __end_ao) { \
12786 + char __c_ao; \
12787 + __addr_ao += PAGE_SIZE; \
12788 + if (__size > PAGE_SIZE) \
12789 + cond_resched(); \
12790 + if (__get_user(__c_ao, (char __user *)__addr)) \
12791 + break; \
12792 + if (type != VERIFY_WRITE) { \
12793 + __addr = __addr_ao; \
12794 + continue; \
12795 + } \
12796 + if (__put_user(__c_ao, (char __user *)__addr)) \
12797 + break; \
12798 + __addr = __addr_ao; \
12799 + } \
12800 + } \
12801 + __ret_ao; \
12802 +})
12803
12804 /*
12805 * The exception table consists of pairs of addresses relative to the
12806 @@ -188,12 +221,20 @@ extern int __get_user_bad(void);
12807 asm volatile("call __put_user_" #size : "=a" (__ret_pu) \
12808 : "0" ((typeof(*(ptr)))(x)), "c" (ptr) : "ebx")
12809
12810 -
12811 +#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_MEMORY_UDEREF)
12812 +#define __copyuser_seg "gs;"
12813 +#define __COPYUSER_SET_ES "pushl %%gs; popl %%es\n"
12814 +#define __COPYUSER_RESTORE_ES "pushl %%ss; popl %%es\n"
12815 +#else
12816 +#define __copyuser_seg
12817 +#define __COPYUSER_SET_ES
12818 +#define __COPYUSER_RESTORE_ES
12819 +#endif
12820
12821 #ifdef CONFIG_X86_32
12822 #define __put_user_asm_u64(x, addr, err, errret) \
12823 - asm volatile("1: movl %%eax,0(%2)\n" \
12824 - "2: movl %%edx,4(%2)\n" \
12825 + asm volatile("1: "__copyuser_seg"movl %%eax,0(%2)\n" \
12826 + "2: "__copyuser_seg"movl %%edx,4(%2)\n" \
12827 "3:\n" \
12828 ".section .fixup,\"ax\"\n" \
12829 "4: movl %3,%0\n" \
12830 @@ -205,8 +246,8 @@ extern int __get_user_bad(void);
12831 : "A" (x), "r" (addr), "i" (errret), "0" (err))
12832
12833 #define __put_user_asm_ex_u64(x, addr) \
12834 - asm volatile("1: movl %%eax,0(%1)\n" \
12835 - "2: movl %%edx,4(%1)\n" \
12836 + asm volatile("1: "__copyuser_seg"movl %%eax,0(%1)\n" \
12837 + "2: "__copyuser_seg"movl %%edx,4(%1)\n" \
12838 "3:\n" \
12839 _ASM_EXTABLE_EX(1b, 2b) \
12840 _ASM_EXTABLE_EX(2b, 3b) \
12841 @@ -258,7 +299,7 @@ extern void __put_user_8(void);
12842 __typeof__(*(ptr)) __pu_val; \
12843 __chk_user_ptr(ptr); \
12844 might_fault(); \
12845 - __pu_val = x; \
12846 + __pu_val = (x); \
12847 switch (sizeof(*(ptr))) { \
12848 case 1: \
12849 __put_user_x(1, __pu_val, ptr, __ret_pu); \
12850 @@ -379,7 +420,7 @@ do { \
12851 } while (0)
12852
12853 #define __get_user_asm(x, addr, err, itype, rtype, ltype, errret) \
12854 - asm volatile("1: mov"itype" %2,%"rtype"1\n" \
12855 + asm volatile("1: "__copyuser_seg"mov"itype" %2,%"rtype"1\n"\
12856 "2:\n" \
12857 ".section .fixup,\"ax\"\n" \
12858 "3: mov %3,%0\n" \
12859 @@ -387,7 +428,7 @@ do { \
12860 " jmp 2b\n" \
12861 ".previous\n" \
12862 _ASM_EXTABLE(1b, 3b) \
12863 - : "=r" (err), ltype(x) \
12864 + : "=r" (err), ltype (x) \
12865 : "m" (__m(addr)), "i" (errret), "0" (err))
12866
12867 #define __get_user_size_ex(x, ptr, size) \
12868 @@ -412,7 +453,7 @@ do { \
12869 } while (0)
12870
12871 #define __get_user_asm_ex(x, addr, itype, rtype, ltype) \
12872 - asm volatile("1: mov"itype" %1,%"rtype"0\n" \
12873 + asm volatile("1: "__copyuser_seg"mov"itype" %1,%"rtype"0\n"\
12874 "2:\n" \
12875 _ASM_EXTABLE_EX(1b, 2b) \
12876 : ltype(x) : "m" (__m(addr)))
12877 @@ -429,13 +470,24 @@ do { \
12878 int __gu_err; \
12879 unsigned long __gu_val; \
12880 __get_user_size(__gu_val, (ptr), (size), __gu_err, -EFAULT); \
12881 - (x) = (__force __typeof__(*(ptr)))__gu_val; \
12882 + (x) = (__typeof__(*(ptr)))__gu_val; \
12883 __gu_err; \
12884 })
12885
12886 /* FIXME: this hack is definitely wrong -AK */
12887 struct __large_struct { unsigned long buf[100]; };
12888 -#define __m(x) (*(struct __large_struct __user *)(x))
12889 +#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
12890 +#define ____m(x) \
12891 +({ \
12892 + unsigned long ____x = (unsigned long)(x); \
12893 + if (____x < PAX_USER_SHADOW_BASE) \
12894 + ____x += PAX_USER_SHADOW_BASE; \
12895 + (void __user *)____x; \
12896 +})
12897 +#else
12898 +#define ____m(x) (x)
12899 +#endif
12900 +#define __m(x) (*(struct __large_struct __user *)____m(x))
12901
12902 /*
12903 * Tell gcc we read from memory instead of writing: this is because
12904 @@ -443,7 +495,7 @@ struct __large_struct { unsigned long buf[100]; };
12905 * aliasing issues.
12906 */
12907 #define __put_user_asm(x, addr, err, itype, rtype, ltype, errret) \
12908 - asm volatile("1: mov"itype" %"rtype"1,%2\n" \
12909 + asm volatile("1: "__copyuser_seg"mov"itype" %"rtype"1,%2\n"\
12910 "2:\n" \
12911 ".section .fixup,\"ax\"\n" \
12912 "3: mov %3,%0\n" \
12913 @@ -451,10 +503,10 @@ struct __large_struct { unsigned long buf[100]; };
12914 ".previous\n" \
12915 _ASM_EXTABLE(1b, 3b) \
12916 : "=r"(err) \
12917 - : ltype(x), "m" (__m(addr)), "i" (errret), "0" (err))
12918 + : ltype (x), "m" (__m(addr)), "i" (errret), "0" (err))
12919
12920 #define __put_user_asm_ex(x, addr, itype, rtype, ltype) \
12921 - asm volatile("1: mov"itype" %"rtype"0,%1\n" \
12922 + asm volatile("1: "__copyuser_seg"mov"itype" %"rtype"0,%1\n"\
12923 "2:\n" \
12924 _ASM_EXTABLE_EX(1b, 2b) \
12925 : : ltype(x), "m" (__m(addr)))
12926 @@ -493,8 +545,12 @@ struct __large_struct { unsigned long buf[100]; };
12927 * On error, the variable @x is set to zero.
12928 */
12929
12930 +#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
12931 +#define __get_user(x, ptr) get_user((x), (ptr))
12932 +#else
12933 #define __get_user(x, ptr) \
12934 __get_user_nocheck((x), (ptr), sizeof(*(ptr)))
12935 +#endif
12936
12937 /**
12938 * __put_user: - Write a simple value into user space, with less checking.
12939 @@ -516,8 +572,12 @@ struct __large_struct { unsigned long buf[100]; };
12940 * Returns zero on success, or -EFAULT on error.
12941 */
12942
12943 +#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
12944 +#define __put_user(x, ptr) put_user((x), (ptr))
12945 +#else
12946 #define __put_user(x, ptr) \
12947 __put_user_nocheck((__typeof__(*(ptr)))(x), (ptr), sizeof(*(ptr)))
12948 +#endif
12949
12950 #define __get_user_unaligned __get_user
12951 #define __put_user_unaligned __put_user
12952 @@ -535,7 +595,7 @@ struct __large_struct { unsigned long buf[100]; };
12953 #define get_user_ex(x, ptr) do { \
12954 unsigned long __gue_val; \
12955 __get_user_size_ex((__gue_val), (ptr), (sizeof(*(ptr)))); \
12956 - (x) = (__force __typeof__(*(ptr)))__gue_val; \
12957 + (x) = (__typeof__(*(ptr)))__gue_val; \
12958 } while (0)
12959
12960 #ifdef CONFIG_X86_WP_WORKS_OK
12961 diff --git a/arch/x86/include/asm/uaccess_32.h b/arch/x86/include/asm/uaccess_32.h
12962 index 576e39b..ccd0a39 100644
12963 --- a/arch/x86/include/asm/uaccess_32.h
12964 +++ b/arch/x86/include/asm/uaccess_32.h
12965 @@ -11,15 +11,15 @@
12966 #include <asm/page.h>
12967
12968 unsigned long __must_check __copy_to_user_ll
12969 - (void __user *to, const void *from, unsigned long n);
12970 + (void __user *to, const void *from, unsigned long n) __size_overflow(3);
12971 unsigned long __must_check __copy_from_user_ll
12972 - (void *to, const void __user *from, unsigned long n);
12973 + (void *to, const void __user *from, unsigned long n) __size_overflow(3);
12974 unsigned long __must_check __copy_from_user_ll_nozero
12975 - (void *to, const void __user *from, unsigned long n);
12976 + (void *to, const void __user *from, unsigned long n) __size_overflow(3);
12977 unsigned long __must_check __copy_from_user_ll_nocache
12978 - (void *to, const void __user *from, unsigned long n);
12979 + (void *to, const void __user *from, unsigned long n) __size_overflow(3);
12980 unsigned long __must_check __copy_from_user_ll_nocache_nozero
12981 - (void *to, const void __user *from, unsigned long n);
12982 + (void *to, const void __user *from, unsigned long n) __size_overflow(3);
12983
12984 /**
12985 * __copy_to_user_inatomic: - Copy a block of data into user space, with less checking.
12986 @@ -43,6 +43,9 @@ unsigned long __must_check __copy_from_user_ll_nocache_nozero
12987 static __always_inline unsigned long __must_check
12988 __copy_to_user_inatomic(void __user *to, const void *from, unsigned long n)
12989 {
12990 + if ((long)n < 0)
12991 + return n;
12992 +
12993 if (__builtin_constant_p(n)) {
12994 unsigned long ret;
12995
12996 @@ -61,6 +64,8 @@ __copy_to_user_inatomic(void __user *to, const void *from, unsigned long n)
12997 return ret;
12998 }
12999 }
13000 + if (!__builtin_constant_p(n))
13001 + check_object_size(from, n, true);
13002 return __copy_to_user_ll(to, from, n);
13003 }
13004
13005 @@ -82,12 +87,16 @@ static __always_inline unsigned long __must_check
13006 __copy_to_user(void __user *to, const void *from, unsigned long n)
13007 {
13008 might_fault();
13009 +
13010 return __copy_to_user_inatomic(to, from, n);
13011 }
13012
13013 static __always_inline unsigned long
13014 __copy_from_user_inatomic(void *to, const void __user *from, unsigned long n)
13015 {
13016 + if ((long)n < 0)
13017 + return n;
13018 +
13019 /* Avoid zeroing the tail if the copy fails..
13020 * If 'n' is constant and 1, 2, or 4, we do still zero on a failure,
13021 * but as the zeroing behaviour is only significant when n is not
13022 @@ -137,6 +146,10 @@ static __always_inline unsigned long
13023 __copy_from_user(void *to, const void __user *from, unsigned long n)
13024 {
13025 might_fault();
13026 +
13027 + if ((long)n < 0)
13028 + return n;
13029 +
13030 if (__builtin_constant_p(n)) {
13031 unsigned long ret;
13032
13033 @@ -152,6 +165,8 @@ __copy_from_user(void *to, const void __user *from, unsigned long n)
13034 return ret;
13035 }
13036 }
13037 + if (!__builtin_constant_p(n))
13038 + check_object_size(to, n, false);
13039 return __copy_from_user_ll(to, from, n);
13040 }
13041
13042 @@ -159,6 +174,10 @@ static __always_inline unsigned long __copy_from_user_nocache(void *to,
13043 const void __user *from, unsigned long n)
13044 {
13045 might_fault();
13046 +
13047 + if ((long)n < 0)
13048 + return n;
13049 +
13050 if (__builtin_constant_p(n)) {
13051 unsigned long ret;
13052
13053 @@ -181,15 +200,19 @@ static __always_inline unsigned long
13054 __copy_from_user_inatomic_nocache(void *to, const void __user *from,
13055 unsigned long n)
13056 {
13057 - return __copy_from_user_ll_nocache_nozero(to, from, n);
13058 + if ((long)n < 0)
13059 + return n;
13060 +
13061 + return __copy_from_user_ll_nocache_nozero(to, from, n);
13062 }
13063
13064 -unsigned long __must_check copy_to_user(void __user *to,
13065 - const void *from, unsigned long n);
13066 -unsigned long __must_check _copy_from_user(void *to,
13067 - const void __user *from,
13068 - unsigned long n);
13069 -
13070 +extern void copy_to_user_overflow(void)
13071 +#ifdef CONFIG_DEBUG_STRICT_USER_COPY_CHECKS
13072 + __compiletime_error("copy_to_user() buffer size is not provably correct")
13073 +#else
13074 + __compiletime_warning("copy_to_user() buffer size is not provably correct")
13075 +#endif
13076 +;
13077
13078 extern void copy_from_user_overflow(void)
13079 #ifdef CONFIG_DEBUG_STRICT_USER_COPY_CHECKS
13080 @@ -199,21 +222,65 @@ extern void copy_from_user_overflow(void)
13081 #endif
13082 ;
13083
13084 -static inline unsigned long __must_check copy_from_user(void *to,
13085 - const void __user *from,
13086 - unsigned long n)
13087 +/**
13088 + * copy_to_user: - Copy a block of data into user space.
13089 + * @to: Destination address, in user space.
13090 + * @from: Source address, in kernel space.
13091 + * @n: Number of bytes to copy.
13092 + *
13093 + * Context: User context only. This function may sleep.
13094 + *
13095 + * Copy data from kernel space to user space.
13096 + *
13097 + * Returns number of bytes that could not be copied.
13098 + * On success, this will be zero.
13099 + */
13100 +static inline unsigned long __must_check
13101 +copy_to_user(void __user *to, const void *from, unsigned long n)
13102 {
13103 - int sz = __compiletime_object_size(to);
13104 + size_t sz = __compiletime_object_size(from);
13105
13106 - if (likely(sz == -1 || sz >= n))
13107 - n = _copy_from_user(to, from, n);
13108 - else
13109 + if (unlikely(sz != (size_t)-1 && sz < n))
13110 + copy_to_user_overflow();
13111 + else if (access_ok(VERIFY_WRITE, to, n))
13112 + n = __copy_to_user(to, from, n);
13113 + return n;
13114 +}
13115 +
13116 +/**
13117 + * copy_from_user: - Copy a block of data from user space.
13118 + * @to: Destination address, in kernel space.
13119 + * @from: Source address, in user space.
13120 + * @n: Number of bytes to copy.
13121 + *
13122 + * Context: User context only. This function may sleep.
13123 + *
13124 + * Copy data from user space to kernel space.
13125 + *
13126 + * Returns number of bytes that could not be copied.
13127 + * On success, this will be zero.
13128 + *
13129 + * If some data could not be copied, this function will pad the copied
13130 + * data to the requested size using zero bytes.
13131 + */
13132 +static inline unsigned long __must_check
13133 +copy_from_user(void *to, const void __user *from, unsigned long n)
13134 +{
13135 + size_t sz = __compiletime_object_size(to);
13136 +
13137 + if (unlikely(sz != (size_t)-1 && sz < n))
13138 copy_from_user_overflow();
13139 -
13140 + else if (access_ok(VERIFY_READ, from, n))
13141 + n = __copy_from_user(to, from, n);
13142 + else if ((long)n > 0) {
13143 + if (!__builtin_constant_p(n))
13144 + check_object_size(to, n, false);
13145 + memset(to, 0, n);
13146 + }
13147 return n;
13148 }
13149
13150 -unsigned long __must_check clear_user(void __user *mem, unsigned long len);
13151 -unsigned long __must_check __clear_user(void __user *mem, unsigned long len);
13152 +unsigned long __must_check clear_user(void __user *mem, unsigned long len) __size_overflow(2);
13153 +unsigned long __must_check __clear_user(void __user *mem, unsigned long len) __size_overflow(2);
13154
13155 #endif /* _ASM_X86_UACCESS_32_H */
13156 diff --git a/arch/x86/include/asm/uaccess_64.h b/arch/x86/include/asm/uaccess_64.h
13157 index d8def8b..ac7fc15 100644
13158 --- a/arch/x86/include/asm/uaccess_64.h
13159 +++ b/arch/x86/include/asm/uaccess_64.h
13160 @@ -10,6 +10,9 @@
13161 #include <asm/alternative.h>
13162 #include <asm/cpufeature.h>
13163 #include <asm/page.h>
13164 +#include <asm/pgtable.h>
13165 +
13166 +#define set_fs(x) (current_thread_info()->addr_limit = (x))
13167
13168 /*
13169 * Copy To/From Userspace
13170 @@ -17,13 +20,13 @@
13171
13172 /* Handles exceptions in both to and from, but doesn't do access_ok */
13173 __must_check unsigned long
13174 -copy_user_enhanced_fast_string(void *to, const void *from, unsigned len);
13175 +copy_user_enhanced_fast_string(void *to, const void *from, unsigned len) __size_overflow(3);
13176 __must_check unsigned long
13177 -copy_user_generic_string(void *to, const void *from, unsigned len);
13178 +copy_user_generic_string(void *to, const void *from, unsigned len) __size_overflow(3);
13179 __must_check unsigned long
13180 -copy_user_generic_unrolled(void *to, const void *from, unsigned len);
13181 +copy_user_generic_unrolled(void *to, const void *from, unsigned len) __size_overflow(3);
13182
13183 -static __always_inline __must_check unsigned long
13184 +static __always_inline __must_check __size_overflow(3) unsigned long
13185 copy_user_generic(void *to, const void *from, unsigned len)
13186 {
13187 unsigned ret;
13188 @@ -41,142 +44,238 @@ copy_user_generic(void *to, const void *from, unsigned len)
13189 ASM_OUTPUT2("=a" (ret), "=D" (to), "=S" (from),
13190 "=d" (len)),
13191 "1" (to), "2" (from), "3" (len)
13192 - : "memory", "rcx", "r8", "r9", "r10", "r11");
13193 + : "memory", "rcx", "r8", "r9", "r11");
13194 return ret;
13195 }
13196
13197 +static __always_inline __must_check unsigned long
13198 +__copy_to_user(void __user *to, const void *from, unsigned long len) __size_overflow(3);
13199 +static __always_inline __must_check unsigned long
13200 +__copy_from_user(void *to, const void __user *from, unsigned long len) __size_overflow(3);
13201 __must_check unsigned long
13202 -_copy_to_user(void __user *to, const void *from, unsigned len);
13203 -__must_check unsigned long
13204 -_copy_from_user(void *to, const void __user *from, unsigned len);
13205 -__must_check unsigned long
13206 -copy_in_user(void __user *to, const void __user *from, unsigned len);
13207 +copy_in_user(void __user *to, const void __user *from, unsigned long len) __size_overflow(3);
13208 +
13209 +extern void copy_to_user_overflow(void)
13210 +#ifdef CONFIG_DEBUG_STRICT_USER_COPY_CHECKS
13211 + __compiletime_error("copy_to_user() buffer size is not provably correct")
13212 +#else
13213 + __compiletime_warning("copy_to_user() buffer size is not provably correct")
13214 +#endif
13215 +;
13216 +
13217 +extern void copy_from_user_overflow(void)
13218 +#ifdef CONFIG_DEBUG_STRICT_USER_COPY_CHECKS
13219 + __compiletime_error("copy_from_user() buffer size is not provably correct")
13220 +#else
13221 + __compiletime_warning("copy_from_user() buffer size is not provably correct")
13222 +#endif
13223 +;
13224
13225 static inline unsigned long __must_check copy_from_user(void *to,
13226 const void __user *from,
13227 unsigned long n)
13228 {
13229 - int sz = __compiletime_object_size(to);
13230 -
13231 might_fault();
13232 - if (likely(sz == -1 || sz >= n))
13233 - n = _copy_from_user(to, from, n);
13234 -#ifdef CONFIG_DEBUG_VM
13235 - else
13236 - WARN(1, "Buffer overflow detected!\n");
13237 -#endif
13238 +
13239 + if (access_ok(VERIFY_READ, from, n))
13240 + n = __copy_from_user(to, from, n);
13241 + else if (n < INT_MAX) {
13242 + if (!__builtin_constant_p(n))
13243 + check_object_size(to, n, false);
13244 + memset(to, 0, n);
13245 + }
13246 return n;
13247 }
13248
13249 static __always_inline __must_check
13250 -int copy_to_user(void __user *dst, const void *src, unsigned size)
13251 +int copy_to_user(void __user *dst, const void *src, unsigned long size)
13252 {
13253 might_fault();
13254
13255 - return _copy_to_user(dst, src, size);
13256 + if (access_ok(VERIFY_WRITE, dst, size))
13257 + size = __copy_to_user(dst, src, size);
13258 + return size;
13259 }
13260
13261 static __always_inline __must_check
13262 -int __copy_from_user(void *dst, const void __user *src, unsigned size)
13263 +unsigned long __copy_from_user(void *dst, const void __user *src, unsigned long size)
13264 {
13265 - int ret = 0;
13266 + size_t sz = __compiletime_object_size(dst);
13267 + unsigned ret = 0;
13268
13269 might_fault();
13270 - if (!__builtin_constant_p(size))
13271 - return copy_user_generic(dst, (__force void *)src, size);
13272 +
13273 + if (size > INT_MAX)
13274 + return size;
13275 +
13276 +#ifdef CONFIG_PAX_MEMORY_UDEREF
13277 + if (!__access_ok(VERIFY_READ, src, size))
13278 + return size;
13279 +#endif
13280 +
13281 + if (unlikely(sz != (size_t)-1 && sz < size)) {
13282 + copy_from_user_overflow();
13283 + return size;
13284 + }
13285 +
13286 + if (!__builtin_constant_p(size)) {
13287 + check_object_size(dst, size, false);
13288 +
13289 +#ifdef CONFIG_PAX_MEMORY_UDEREF
13290 + if ((unsigned long)src < PAX_USER_SHADOW_BASE)
13291 + src += PAX_USER_SHADOW_BASE;
13292 +#endif
13293 +
13294 + return copy_user_generic(dst, (__force_kernel const void *)src, size);
13295 + }
13296 switch (size) {
13297 - case 1:__get_user_asm(*(u8 *)dst, (u8 __user *)src,
13298 + case 1:__get_user_asm(*(u8 *)dst, (const u8 __user *)src,
13299 ret, "b", "b", "=q", 1);
13300 return ret;
13301 - case 2:__get_user_asm(*(u16 *)dst, (u16 __user *)src,
13302 + case 2:__get_user_asm(*(u16 *)dst, (const u16 __user *)src,
13303 ret, "w", "w", "=r", 2);
13304 return ret;
13305 - case 4:__get_user_asm(*(u32 *)dst, (u32 __user *)src,
13306 + case 4:__get_user_asm(*(u32 *)dst, (const u32 __user *)src,
13307 ret, "l", "k", "=r", 4);
13308 return ret;
13309 - case 8:__get_user_asm(*(u64 *)dst, (u64 __user *)src,
13310 + case 8:__get_user_asm(*(u64 *)dst, (const u64 __user *)src,
13311 ret, "q", "", "=r", 8);
13312 return ret;
13313 case 10:
13314 - __get_user_asm(*(u64 *)dst, (u64 __user *)src,
13315 + __get_user_asm(*(u64 *)dst, (const u64 __user *)src,
13316 ret, "q", "", "=r", 10);
13317 if (unlikely(ret))
13318 return ret;
13319 __get_user_asm(*(u16 *)(8 + (char *)dst),
13320 - (u16 __user *)(8 + (char __user *)src),
13321 + (const u16 __user *)(8 + (const char __user *)src),
13322 ret, "w", "w", "=r", 2);
13323 return ret;
13324 case 16:
13325 - __get_user_asm(*(u64 *)dst, (u64 __user *)src,
13326 + __get_user_asm(*(u64 *)dst, (const u64 __user *)src,
13327 ret, "q", "", "=r", 16);
13328 if (unlikely(ret))
13329 return ret;
13330 __get_user_asm(*(u64 *)(8 + (char *)dst),
13331 - (u64 __user *)(8 + (char __user *)src),
13332 + (const u64 __user *)(8 + (const char __user *)src),
13333 ret, "q", "", "=r", 8);
13334 return ret;
13335 default:
13336 - return copy_user_generic(dst, (__force void *)src, size);
13337 +
13338 +#ifdef CONFIG_PAX_MEMORY_UDEREF
13339 + if ((unsigned long)src < PAX_USER_SHADOW_BASE)
13340 + src += PAX_USER_SHADOW_BASE;
13341 +#endif
13342 +
13343 + return copy_user_generic(dst, (__force_kernel const void *)src, size);
13344 }
13345 }
13346
13347 static __always_inline __must_check
13348 -int __copy_to_user(void __user *dst, const void *src, unsigned size)
13349 +unsigned long __copy_to_user(void __user *dst, const void *src, unsigned long size)
13350 {
13351 - int ret = 0;
13352 + size_t sz = __compiletime_object_size(src);
13353 + unsigned ret = 0;
13354
13355 might_fault();
13356 - if (!__builtin_constant_p(size))
13357 - return copy_user_generic((__force void *)dst, src, size);
13358 +
13359 + if (size > INT_MAX)
13360 + return size;
13361 +
13362 +#ifdef CONFIG_PAX_MEMORY_UDEREF
13363 + if (!__access_ok(VERIFY_WRITE, dst, size))
13364 + return size;
13365 +#endif
13366 +
13367 + if (unlikely(sz != (size_t)-1 && sz < size)) {
13368 + copy_to_user_overflow();
13369 + return size;
13370 + }
13371 +
13372 + if (!__builtin_constant_p(size)) {
13373 + check_object_size(src, size, true);
13374 +
13375 +#ifdef CONFIG_PAX_MEMORY_UDEREF
13376 + if ((unsigned long)dst < PAX_USER_SHADOW_BASE)
13377 + dst += PAX_USER_SHADOW_BASE;
13378 +#endif
13379 +
13380 + return copy_user_generic((__force_kernel void *)dst, src, size);
13381 + }
13382 switch (size) {
13383 - case 1:__put_user_asm(*(u8 *)src, (u8 __user *)dst,
13384 + case 1:__put_user_asm(*(const u8 *)src, (u8 __user *)dst,
13385 ret, "b", "b", "iq", 1);
13386 return ret;
13387 - case 2:__put_user_asm(*(u16 *)src, (u16 __user *)dst,
13388 + case 2:__put_user_asm(*(const u16 *)src, (u16 __user *)dst,
13389 ret, "w", "w", "ir", 2);
13390 return ret;
13391 - case 4:__put_user_asm(*(u32 *)src, (u32 __user *)dst,
13392 + case 4:__put_user_asm(*(const u32 *)src, (u32 __user *)dst,
13393 ret, "l", "k", "ir", 4);
13394 return ret;
13395 - case 8:__put_user_asm(*(u64 *)src, (u64 __user *)dst,
13396 + case 8:__put_user_asm(*(const u64 *)src, (u64 __user *)dst,
13397 ret, "q", "", "er", 8);
13398 return ret;
13399 case 10:
13400 - __put_user_asm(*(u64 *)src, (u64 __user *)dst,
13401 + __put_user_asm(*(const u64 *)src, (u64 __user *)dst,
13402 ret, "q", "", "er", 10);
13403 if (unlikely(ret))
13404 return ret;
13405 asm("":::"memory");
13406 - __put_user_asm(4[(u16 *)src], 4 + (u16 __user *)dst,
13407 + __put_user_asm(4[(const u16 *)src], 4 + (u16 __user *)dst,
13408 ret, "w", "w", "ir", 2);
13409 return ret;
13410 case 16:
13411 - __put_user_asm(*(u64 *)src, (u64 __user *)dst,
13412 + __put_user_asm(*(const u64 *)src, (u64 __user *)dst,
13413 ret, "q", "", "er", 16);
13414 if (unlikely(ret))
13415 return ret;
13416 asm("":::"memory");
13417 - __put_user_asm(1[(u64 *)src], 1 + (u64 __user *)dst,
13418 + __put_user_asm(1[(const u64 *)src], 1 + (u64 __user *)dst,
13419 ret, "q", "", "er", 8);
13420 return ret;
13421 default:
13422 - return copy_user_generic((__force void *)dst, src, size);
13423 +
13424 +#ifdef CONFIG_PAX_MEMORY_UDEREF
13425 + if ((unsigned long)dst < PAX_USER_SHADOW_BASE)
13426 + dst += PAX_USER_SHADOW_BASE;
13427 +#endif
13428 +
13429 + return copy_user_generic((__force_kernel void *)dst, src, size);
13430 }
13431 }
13432
13433 static __always_inline __must_check
13434 -int __copy_in_user(void __user *dst, const void __user *src, unsigned size)
13435 +unsigned long __copy_in_user(void __user *dst, const void __user *src, unsigned long size)
13436 {
13437 - int ret = 0;
13438 + unsigned ret = 0;
13439
13440 might_fault();
13441 - if (!__builtin_constant_p(size))
13442 - return copy_user_generic((__force void *)dst,
13443 - (__force void *)src, size);
13444 +
13445 + if (size > INT_MAX)
13446 + return size;
13447 +
13448 +#ifdef CONFIG_PAX_MEMORY_UDEREF
13449 + if (!__access_ok(VERIFY_READ, src, size))
13450 + return size;
13451 + if (!__access_ok(VERIFY_WRITE, dst, size))
13452 + return size;
13453 +#endif
13454 +
13455 + if (!__builtin_constant_p(size)) {
13456 +
13457 +#ifdef CONFIG_PAX_MEMORY_UDEREF
13458 + if ((unsigned long)src < PAX_USER_SHADOW_BASE)
13459 + src += PAX_USER_SHADOW_BASE;
13460 + if ((unsigned long)dst < PAX_USER_SHADOW_BASE)
13461 + dst += PAX_USER_SHADOW_BASE;
13462 +#endif
13463 +
13464 + return copy_user_generic((__force_kernel void *)dst,
13465 + (__force_kernel const void *)src, size);
13466 + }
13467 switch (size) {
13468 case 1: {
13469 u8 tmp;
13470 - __get_user_asm(tmp, (u8 __user *)src,
13471 + __get_user_asm(tmp, (const u8 __user *)src,
13472 ret, "b", "b", "=q", 1);
13473 if (likely(!ret))
13474 __put_user_asm(tmp, (u8 __user *)dst,
13475 @@ -185,7 +284,7 @@ int __copy_in_user(void __user *dst, const void __user *src, unsigned size)
13476 }
13477 case 2: {
13478 u16 tmp;
13479 - __get_user_asm(tmp, (u16 __user *)src,
13480 + __get_user_asm(tmp, (const u16 __user *)src,
13481 ret, "w", "w", "=r", 2);
13482 if (likely(!ret))
13483 __put_user_asm(tmp, (u16 __user *)dst,
13484 @@ -195,7 +294,7 @@ int __copy_in_user(void __user *dst, const void __user *src, unsigned size)
13485
13486 case 4: {
13487 u32 tmp;
13488 - __get_user_asm(tmp, (u32 __user *)src,
13489 + __get_user_asm(tmp, (const u32 __user *)src,
13490 ret, "l", "k", "=r", 4);
13491 if (likely(!ret))
13492 __put_user_asm(tmp, (u32 __user *)dst,
13493 @@ -204,7 +303,7 @@ int __copy_in_user(void __user *dst, const void __user *src, unsigned size)
13494 }
13495 case 8: {
13496 u64 tmp;
13497 - __get_user_asm(tmp, (u64 __user *)src,
13498 + __get_user_asm(tmp, (const u64 __user *)src,
13499 ret, "q", "", "=r", 8);
13500 if (likely(!ret))
13501 __put_user_asm(tmp, (u64 __user *)dst,
13502 @@ -212,44 +311,89 @@ int __copy_in_user(void __user *dst, const void __user *src, unsigned size)
13503 return ret;
13504 }
13505 default:
13506 - return copy_user_generic((__force void *)dst,
13507 - (__force void *)src, size);
13508 +
13509 +#ifdef CONFIG_PAX_MEMORY_UDEREF
13510 + if ((unsigned long)src < PAX_USER_SHADOW_BASE)
13511 + src += PAX_USER_SHADOW_BASE;
13512 + if ((unsigned long)dst < PAX_USER_SHADOW_BASE)
13513 + dst += PAX_USER_SHADOW_BASE;
13514 +#endif
13515 +
13516 + return copy_user_generic((__force_kernel void *)dst,
13517 + (__force_kernel const void *)src, size);
13518 }
13519 }
13520
13521 -__must_check unsigned long clear_user(void __user *mem, unsigned long len);
13522 -__must_check unsigned long __clear_user(void __user *mem, unsigned long len);
13523 +__must_check unsigned long clear_user(void __user *mem, unsigned long len) __size_overflow(2);
13524 +__must_check unsigned long __clear_user(void __user *mem, unsigned long len) __size_overflow(2);
13525
13526 static __must_check __always_inline int
13527 -__copy_from_user_inatomic(void *dst, const void __user *src, unsigned size)
13528 +__copy_from_user_inatomic(void *dst, const void __user *src, unsigned long size)
13529 {
13530 - return copy_user_generic(dst, (__force const void *)src, size);
13531 + if (size > INT_MAX)
13532 + return size;
13533 +
13534 +#ifdef CONFIG_PAX_MEMORY_UDEREF
13535 + if (!__access_ok(VERIFY_READ, src, size))
13536 + return size;
13537 +
13538 + if ((unsigned long)src < PAX_USER_SHADOW_BASE)
13539 + src += PAX_USER_SHADOW_BASE;
13540 +#endif
13541 +
13542 + return copy_user_generic(dst, (__force_kernel const void *)src, size);
13543 }
13544
13545 -static __must_check __always_inline int
13546 -__copy_to_user_inatomic(void __user *dst, const void *src, unsigned size)
13547 +static __must_check __always_inline unsigned long
13548 +__copy_to_user_inatomic(void __user *dst, const void *src, unsigned long size)
13549 {
13550 - return copy_user_generic((__force void *)dst, src, size);
13551 + if (size > INT_MAX)
13552 + return size;
13553 +
13554 +#ifdef CONFIG_PAX_MEMORY_UDEREF
13555 + if (!__access_ok(VERIFY_WRITE, dst, size))
13556 + return size;
13557 +
13558 + if ((unsigned long)dst < PAX_USER_SHADOW_BASE)
13559 + dst += PAX_USER_SHADOW_BASE;
13560 +#endif
13561 +
13562 + return copy_user_generic((__force_kernel void *)dst, src, size);
13563 }
13564
13565 -extern long __copy_user_nocache(void *dst, const void __user *src,
13566 - unsigned size, int zerorest);
13567 +extern unsigned long __copy_user_nocache(void *dst, const void __user *src,
13568 + unsigned long size, int zerorest) __size_overflow(3);
13569
13570 -static inline int
13571 -__copy_from_user_nocache(void *dst, const void __user *src, unsigned size)
13572 +static inline unsigned long __copy_from_user_nocache(void *dst, const void __user *src, unsigned long size)
13573 {
13574 might_sleep();
13575 +
13576 + if (size > INT_MAX)
13577 + return size;
13578 +
13579 +#ifdef CONFIG_PAX_MEMORY_UDEREF
13580 + if (!__access_ok(VERIFY_READ, src, size))
13581 + return size;
13582 +#endif
13583 +
13584 return __copy_user_nocache(dst, src, size, 1);
13585 }
13586
13587 -static inline int
13588 -__copy_from_user_inatomic_nocache(void *dst, const void __user *src,
13589 - unsigned size)
13590 +static inline unsigned long __copy_from_user_inatomic_nocache(void *dst, const void __user *src,
13591 + unsigned long size)
13592 {
13593 + if (size > INT_MAX)
13594 + return size;
13595 +
13596 +#ifdef CONFIG_PAX_MEMORY_UDEREF
13597 + if (!__access_ok(VERIFY_READ, src, size))
13598 + return size;
13599 +#endif
13600 +
13601 return __copy_user_nocache(dst, src, size, 0);
13602 }
13603
13604 -unsigned long
13605 -copy_user_handle_tail(char *to, char *from, unsigned len, unsigned zerorest);
13606 +extern unsigned long
13607 +copy_user_handle_tail(char __user *to, char __user *from, unsigned long len, unsigned zerorest) __size_overflow(3);
13608
13609 #endif /* _ASM_X86_UACCESS_64_H */
13610 diff --git a/arch/x86/include/asm/vdso.h b/arch/x86/include/asm/vdso.h
13611 index bb05228..d763d5b 100644
13612 --- a/arch/x86/include/asm/vdso.h
13613 +++ b/arch/x86/include/asm/vdso.h
13614 @@ -11,7 +11,7 @@ extern const char VDSO32_PRELINK[];
13615 #define VDSO32_SYMBOL(base, name) \
13616 ({ \
13617 extern const char VDSO32_##name[]; \
13618 - (void *)(VDSO32_##name - VDSO32_PRELINK + (unsigned long)(base)); \
13619 + (void __user *)(VDSO32_##name - VDSO32_PRELINK + (unsigned long)(base)); \
13620 })
13621 #endif
13622
13623 diff --git a/arch/x86/include/asm/word-at-a-time.h b/arch/x86/include/asm/word-at-a-time.h
13624 index 5b238981..77fdd78 100644
13625 --- a/arch/x86/include/asm/word-at-a-time.h
13626 +++ b/arch/x86/include/asm/word-at-a-time.h
13627 @@ -11,7 +11,7 @@
13628 * and shift, for example.
13629 */
13630 struct word_at_a_time {
13631 - const unsigned long one_bits, high_bits;
13632 + unsigned long one_bits, high_bits;
13633 };
13634
13635 #define WORD_AT_A_TIME_CONSTANTS { REPEAT_BYTE(0x01), REPEAT_BYTE(0x80) }
13636 diff --git a/arch/x86/include/asm/x86_init.h b/arch/x86/include/asm/x86_init.h
13637 index 38155f6..e4184ba 100644
13638 --- a/arch/x86/include/asm/x86_init.h
13639 +++ b/arch/x86/include/asm/x86_init.h
13640 @@ -29,7 +29,7 @@ struct x86_init_mpparse {
13641 void (*mpc_oem_bus_info)(struct mpc_bus *m, char *name);
13642 void (*find_smp_config)(void);
13643 void (*get_smp_config)(unsigned int early);
13644 -};
13645 +} __no_const;
13646
13647 /**
13648 * struct x86_init_resources - platform specific resource related ops
13649 @@ -43,7 +43,7 @@ struct x86_init_resources {
13650 void (*probe_roms)(void);
13651 void (*reserve_resources)(void);
13652 char *(*memory_setup)(void);
13653 -};
13654 +} __no_const;
13655
13656 /**
13657 * struct x86_init_irqs - platform specific interrupt setup
13658 @@ -56,7 +56,7 @@ struct x86_init_irqs {
13659 void (*pre_vector_init)(void);
13660 void (*intr_init)(void);
13661 void (*trap_init)(void);
13662 -};
13663 +} __no_const;
13664
13665 /**
13666 * struct x86_init_oem - oem platform specific customizing functions
13667 @@ -66,7 +66,7 @@ struct x86_init_irqs {
13668 struct x86_init_oem {
13669 void (*arch_setup)(void);
13670 void (*banner)(void);
13671 -};
13672 +} __no_const;
13673
13674 /**
13675 * struct x86_init_mapping - platform specific initial kernel pagetable setup
13676 @@ -77,7 +77,7 @@ struct x86_init_oem {
13677 */
13678 struct x86_init_mapping {
13679 void (*pagetable_reserve)(u64 start, u64 end);
13680 -};
13681 +} __no_const;
13682
13683 /**
13684 * struct x86_init_paging - platform specific paging functions
13685 @@ -87,7 +87,7 @@ struct x86_init_mapping {
13686 struct x86_init_paging {
13687 void (*pagetable_setup_start)(pgd_t *base);
13688 void (*pagetable_setup_done)(pgd_t *base);
13689 -};
13690 +} __no_const;
13691
13692 /**
13693 * struct x86_init_timers - platform specific timer setup
13694 @@ -102,7 +102,7 @@ struct x86_init_timers {
13695 void (*tsc_pre_init)(void);
13696 void (*timer_init)(void);
13697 void (*wallclock_init)(void);
13698 -};
13699 +} __no_const;
13700
13701 /**
13702 * struct x86_init_iommu - platform specific iommu setup
13703 @@ -110,7 +110,7 @@ struct x86_init_timers {
13704 */
13705 struct x86_init_iommu {
13706 int (*iommu_init)(void);
13707 -};
13708 +} __no_const;
13709
13710 /**
13711 * struct x86_init_pci - platform specific pci init functions
13712 @@ -124,7 +124,7 @@ struct x86_init_pci {
13713 int (*init)(void);
13714 void (*init_irq)(void);
13715 void (*fixup_irqs)(void);
13716 -};
13717 +} __no_const;
13718
13719 /**
13720 * struct x86_init_ops - functions for platform specific setup
13721 @@ -140,7 +140,7 @@ struct x86_init_ops {
13722 struct x86_init_timers timers;
13723 struct x86_init_iommu iommu;
13724 struct x86_init_pci pci;
13725 -};
13726 +} __no_const;
13727
13728 /**
13729 * struct x86_cpuinit_ops - platform specific cpu hotplug setups
13730 @@ -151,7 +151,7 @@ struct x86_cpuinit_ops {
13731 void (*setup_percpu_clockev)(void);
13732 void (*early_percpu_clock_init)(void);
13733 void (*fixup_cpu_id)(struct cpuinfo_x86 *c, int node);
13734 -};
13735 +} __no_const;
13736
13737 /**
13738 * struct x86_platform_ops - platform specific runtime functions
13739 @@ -177,7 +177,7 @@ struct x86_platform_ops {
13740 void (*save_sched_clock_state)(void);
13741 void (*restore_sched_clock_state)(void);
13742 void (*apic_post_init)(void);
13743 -};
13744 +} __no_const;
13745
13746 struct pci_dev;
13747
13748 @@ -186,14 +186,14 @@ struct x86_msi_ops {
13749 void (*teardown_msi_irq)(unsigned int irq);
13750 void (*teardown_msi_irqs)(struct pci_dev *dev);
13751 void (*restore_msi_irqs)(struct pci_dev *dev, int irq);
13752 -};
13753 +} __no_const;
13754
13755 struct x86_io_apic_ops {
13756 void (*init) (void);
13757 unsigned int (*read) (unsigned int apic, unsigned int reg);
13758 void (*write) (unsigned int apic, unsigned int reg, unsigned int value);
13759 void (*modify)(unsigned int apic, unsigned int reg, unsigned int value);
13760 -};
13761 +} __no_const;
13762
13763 extern struct x86_init_ops x86_init;
13764 extern struct x86_cpuinit_ops x86_cpuinit;
13765 diff --git a/arch/x86/include/asm/xsave.h b/arch/x86/include/asm/xsave.h
13766 index 8a1b6f9..a29c4e4 100644
13767 --- a/arch/x86/include/asm/xsave.h
13768 +++ b/arch/x86/include/asm/xsave.h
13769 @@ -65,6 +65,11 @@ static inline int xsave_user(struct xsave_struct __user *buf)
13770 {
13771 int err;
13772
13773 +#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
13774 + if ((unsigned long)buf < PAX_USER_SHADOW_BASE)
13775 + buf = (struct xsave_struct __user *)((void __user*)buf + PAX_USER_SHADOW_BASE);
13776 +#endif
13777 +
13778 /*
13779 * Clear the xsave header first, so that reserved fields are
13780 * initialized to zero.
13781 @@ -93,10 +98,15 @@ static inline int xsave_user(struct xsave_struct __user *buf)
13782 static inline int xrestore_user(struct xsave_struct __user *buf, u64 mask)
13783 {
13784 int err;
13785 - struct xsave_struct *xstate = ((__force struct xsave_struct *)buf);
13786 + struct xsave_struct *xstate = ((__force_kernel struct xsave_struct *)buf);
13787 u32 lmask = mask;
13788 u32 hmask = mask >> 32;
13789
13790 +#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
13791 + if ((unsigned long)xstate < PAX_USER_SHADOW_BASE)
13792 + xstate = (struct xsave_struct *)((void *)xstate + PAX_USER_SHADOW_BASE);
13793 +#endif
13794 +
13795 __asm__ __volatile__("1: .byte " REX_PREFIX "0x0f,0xae,0x2f\n"
13796 "2:\n"
13797 ".section .fixup,\"ax\"\n"
13798 diff --git a/arch/x86/kernel/acpi/sleep.c b/arch/x86/kernel/acpi/sleep.c
13799 index 1b8e5a0..354fd59 100644
13800 --- a/arch/x86/kernel/acpi/sleep.c
13801 +++ b/arch/x86/kernel/acpi/sleep.c
13802 @@ -69,8 +69,12 @@ int acpi_suspend_lowlevel(void)
13803 #else /* CONFIG_64BIT */
13804 #ifdef CONFIG_SMP
13805 stack_start = (unsigned long)temp_stack + sizeof(temp_stack);
13806 +
13807 + pax_open_kernel();
13808 early_gdt_descr.address =
13809 (unsigned long)get_cpu_gdt_table(smp_processor_id());
13810 + pax_close_kernel();
13811 +
13812 initial_gs = per_cpu_offset(smp_processor_id());
13813 #endif
13814 initial_code = (unsigned long)wakeup_long64;
13815 diff --git a/arch/x86/kernel/acpi/wakeup_32.S b/arch/x86/kernel/acpi/wakeup_32.S
13816 index 13ab720..95d5442 100644
13817 --- a/arch/x86/kernel/acpi/wakeup_32.S
13818 +++ b/arch/x86/kernel/acpi/wakeup_32.S
13819 @@ -30,13 +30,11 @@ wakeup_pmode_return:
13820 # and restore the stack ... but you need gdt for this to work
13821 movl saved_context_esp, %esp
13822
13823 - movl %cs:saved_magic, %eax
13824 - cmpl $0x12345678, %eax
13825 + cmpl $0x12345678, saved_magic
13826 jne bogus_magic
13827
13828 # jump to place where we left off
13829 - movl saved_eip, %eax
13830 - jmp *%eax
13831 + jmp *(saved_eip)
13832
13833 bogus_magic:
13834 jmp bogus_magic
13835 diff --git a/arch/x86/kernel/alternative.c b/arch/x86/kernel/alternative.c
13836 index ced4534..3e75d69 100644
13837 --- a/arch/x86/kernel/alternative.c
13838 +++ b/arch/x86/kernel/alternative.c
13839 @@ -281,6 +281,13 @@ void __init_or_module apply_alternatives(struct alt_instr *start,
13840 */
13841 for (a = start; a < end; a++) {
13842 instr = (u8 *)&a->instr_offset + a->instr_offset;
13843 +
13844 +#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
13845 + instr += ____LOAD_PHYSICAL_ADDR - LOAD_PHYSICAL_ADDR;
13846 + if (instr < (u8 *)_text || (u8 *)_einittext <= instr)
13847 + instr -= ____LOAD_PHYSICAL_ADDR - LOAD_PHYSICAL_ADDR;
13848 +#endif
13849 +
13850 replacement = (u8 *)&a->repl_offset + a->repl_offset;
13851 BUG_ON(a->replacementlen > a->instrlen);
13852 BUG_ON(a->instrlen > sizeof(insnbuf));
13853 @@ -312,10 +319,16 @@ static void alternatives_smp_lock(const s32 *start, const s32 *end,
13854 for (poff = start; poff < end; poff++) {
13855 u8 *ptr = (u8 *)poff + *poff;
13856
13857 +#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
13858 + ptr += ____LOAD_PHYSICAL_ADDR - LOAD_PHYSICAL_ADDR;
13859 + if (ptr < (u8 *)_text || (u8 *)_einittext <= ptr)
13860 + ptr -= ____LOAD_PHYSICAL_ADDR - LOAD_PHYSICAL_ADDR;
13861 +#endif
13862 +
13863 if (!*poff || ptr < text || ptr >= text_end)
13864 continue;
13865 /* turn DS segment override prefix into lock prefix */
13866 - if (*ptr == 0x3e)
13867 + if (*ktla_ktva(ptr) == 0x3e)
13868 text_poke(ptr, ((unsigned char []){0xf0}), 1);
13869 };
13870 mutex_unlock(&text_mutex);
13871 @@ -333,10 +346,16 @@ static void alternatives_smp_unlock(const s32 *start, const s32 *end,
13872 for (poff = start; poff < end; poff++) {
13873 u8 *ptr = (u8 *)poff + *poff;
13874
13875 +#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
13876 + ptr += ____LOAD_PHYSICAL_ADDR - LOAD_PHYSICAL_ADDR;
13877 + if (ptr < (u8 *)_text || (u8 *)_einittext <= ptr)
13878 + ptr -= ____LOAD_PHYSICAL_ADDR - LOAD_PHYSICAL_ADDR;
13879 +#endif
13880 +
13881 if (!*poff || ptr < text || ptr >= text_end)
13882 continue;
13883 /* turn lock prefix into DS segment override prefix */
13884 - if (*ptr == 0xf0)
13885 + if (*ktla_ktva(ptr) == 0xf0)
13886 text_poke(ptr, ((unsigned char []){0x3E}), 1);
13887 };
13888 mutex_unlock(&text_mutex);
13889 @@ -505,7 +524,7 @@ void __init_or_module apply_paravirt(struct paravirt_patch_site *start,
13890
13891 BUG_ON(p->len > MAX_PATCH_LEN);
13892 /* prep the buffer with the original instructions */
13893 - memcpy(insnbuf, p->instr, p->len);
13894 + memcpy(insnbuf, ktla_ktva(p->instr), p->len);
13895 used = pv_init_ops.patch(p->instrtype, p->clobbers, insnbuf,
13896 (unsigned long)p->instr, p->len);
13897
13898 @@ -573,7 +592,7 @@ void __init alternative_instructions(void)
13899 if (smp_alt_once)
13900 free_init_pages("SMP alternatives",
13901 (unsigned long)__smp_locks,
13902 - (unsigned long)__smp_locks_end);
13903 + PAGE_ALIGN((unsigned long)__smp_locks_end));
13904
13905 restart_nmi();
13906 }
13907 @@ -590,13 +609,17 @@ void __init alternative_instructions(void)
13908 * instructions. And on the local CPU you need to be protected again NMI or MCE
13909 * handlers seeing an inconsistent instruction while you patch.
13910 */
13911 -void *__init_or_module text_poke_early(void *addr, const void *opcode,
13912 +void *__kprobes text_poke_early(void *addr, const void *opcode,
13913 size_t len)
13914 {
13915 unsigned long flags;
13916 local_irq_save(flags);
13917 - memcpy(addr, opcode, len);
13918 +
13919 + pax_open_kernel();
13920 + memcpy(ktla_ktva(addr), opcode, len);
13921 sync_core();
13922 + pax_close_kernel();
13923 +
13924 local_irq_restore(flags);
13925 /* Could also do a CLFLUSH here to speed up CPU recovery; but
13926 that causes hangs on some VIA CPUs. */
13927 @@ -618,36 +641,22 @@ void *__init_or_module text_poke_early(void *addr, const void *opcode,
13928 */
13929 void *__kprobes text_poke(void *addr, const void *opcode, size_t len)
13930 {
13931 - unsigned long flags;
13932 - char *vaddr;
13933 + unsigned char *vaddr = ktla_ktva(addr);
13934 struct page *pages[2];
13935 - int i;
13936 + size_t i;
13937
13938 if (!core_kernel_text((unsigned long)addr)) {
13939 - pages[0] = vmalloc_to_page(addr);
13940 - pages[1] = vmalloc_to_page(addr + PAGE_SIZE);
13941 + pages[0] = vmalloc_to_page(vaddr);
13942 + pages[1] = vmalloc_to_page(vaddr + PAGE_SIZE);
13943 } else {
13944 - pages[0] = virt_to_page(addr);
13945 + pages[0] = virt_to_page(vaddr);
13946 WARN_ON(!PageReserved(pages[0]));
13947 - pages[1] = virt_to_page(addr + PAGE_SIZE);
13948 + pages[1] = virt_to_page(vaddr + PAGE_SIZE);
13949 }
13950 BUG_ON(!pages[0]);
13951 - local_irq_save(flags);
13952 - set_fixmap(FIX_TEXT_POKE0, page_to_phys(pages[0]));
13953 - if (pages[1])
13954 - set_fixmap(FIX_TEXT_POKE1, page_to_phys(pages[1]));
13955 - vaddr = (char *)fix_to_virt(FIX_TEXT_POKE0);
13956 - memcpy(&vaddr[(unsigned long)addr & ~PAGE_MASK], opcode, len);
13957 - clear_fixmap(FIX_TEXT_POKE0);
13958 - if (pages[1])
13959 - clear_fixmap(FIX_TEXT_POKE1);
13960 - local_flush_tlb();
13961 - sync_core();
13962 - /* Could also do a CLFLUSH here to speed up CPU recovery; but
13963 - that causes hangs on some VIA CPUs. */
13964 + text_poke_early(addr, opcode, len);
13965 for (i = 0; i < len; i++)
13966 - BUG_ON(((char *)addr)[i] != ((char *)opcode)[i]);
13967 - local_irq_restore(flags);
13968 + BUG_ON((vaddr)[i] != ((const unsigned char *)opcode)[i]);
13969 return addr;
13970 }
13971
13972 diff --git a/arch/x86/kernel/apic/apic.c b/arch/x86/kernel/apic/apic.c
13973 index 24deb30..94a3426 100644
13974 --- a/arch/x86/kernel/apic/apic.c
13975 +++ b/arch/x86/kernel/apic/apic.c
13976 @@ -185,7 +185,7 @@ int first_system_vector = 0xfe;
13977 /*
13978 * Debug level, exported for io_apic.c
13979 */
13980 -unsigned int apic_verbosity;
13981 +int apic_verbosity;
13982
13983 int pic_mode;
13984
13985 @@ -1923,7 +1923,7 @@ void smp_error_interrupt(struct pt_regs *regs)
13986 apic_write(APIC_ESR, 0);
13987 v1 = apic_read(APIC_ESR);
13988 ack_APIC_irq();
13989 - atomic_inc(&irq_err_count);
13990 + atomic_inc_unchecked(&irq_err_count);
13991
13992 apic_printk(APIC_DEBUG, KERN_DEBUG "APIC error on CPU%d: %02x(%02x)",
13993 smp_processor_id(), v0 , v1);
13994 @@ -2155,7 +2155,9 @@ void __init apic_set_eoi_write(void (*eoi_write)(u32 reg, u32 v))
13995 for (drv = __apicdrivers; drv < __apicdrivers_end; drv++) {
13996 /* Should happen once for each apic */
13997 WARN_ON((*drv)->eoi_write == eoi_write);
13998 - (*drv)->eoi_write = eoi_write;
13999 + pax_open_kernel();
14000 + *(void **)&(*drv)->eoi_write = eoi_write;
14001 + pax_close_kernel();
14002 }
14003 }
14004
14005 diff --git a/arch/x86/kernel/apic/io_apic.c b/arch/x86/kernel/apic/io_apic.c
14006 index c265593..137c4ac 100644
14007 --- a/arch/x86/kernel/apic/io_apic.c
14008 +++ b/arch/x86/kernel/apic/io_apic.c
14009 @@ -1084,7 +1084,7 @@ int IO_APIC_get_PCI_irq_vector(int bus, int slot, int pin,
14010 }
14011 EXPORT_SYMBOL(IO_APIC_get_PCI_irq_vector);
14012
14013 -void lock_vector_lock(void)
14014 +void lock_vector_lock(void) __acquires(vector_lock)
14015 {
14016 /* Used to the online set of cpus does not change
14017 * during assign_irq_vector.
14018 @@ -1092,7 +1092,7 @@ void lock_vector_lock(void)
14019 raw_spin_lock(&vector_lock);
14020 }
14021
14022 -void unlock_vector_lock(void)
14023 +void unlock_vector_lock(void) __releases(vector_lock)
14024 {
14025 raw_spin_unlock(&vector_lock);
14026 }
14027 @@ -2408,7 +2408,7 @@ static void ack_apic_edge(struct irq_data *data)
14028 ack_APIC_irq();
14029 }
14030
14031 -atomic_t irq_mis_count;
14032 +atomic_unchecked_t irq_mis_count;
14033
14034 #ifdef CONFIG_GENERIC_PENDING_IRQ
14035 static bool io_apic_level_ack_pending(struct irq_cfg *cfg)
14036 @@ -2549,7 +2549,7 @@ static void ack_apic_level(struct irq_data *data)
14037 * at the cpu.
14038 */
14039 if (!(v & (1 << (i & 0x1f)))) {
14040 - atomic_inc(&irq_mis_count);
14041 + atomic_inc_unchecked(&irq_mis_count);
14042
14043 eoi_ioapic_irq(irq, cfg);
14044 }
14045 diff --git a/arch/x86/kernel/apm_32.c b/arch/x86/kernel/apm_32.c
14046 index d65464e..1035d31 100644
14047 --- a/arch/x86/kernel/apm_32.c
14048 +++ b/arch/x86/kernel/apm_32.c
14049 @@ -412,7 +412,7 @@ static DEFINE_MUTEX(apm_mutex);
14050 * This is for buggy BIOS's that refer to (real mode) segment 0x40
14051 * even though they are called in protected mode.
14052 */
14053 -static struct desc_struct bad_bios_desc = GDT_ENTRY_INIT(0x4092,
14054 +static const struct desc_struct bad_bios_desc = GDT_ENTRY_INIT(0x4093,
14055 (unsigned long)__va(0x400UL), PAGE_SIZE - 0x400 - 1);
14056
14057 static const char driver_version[] = "1.16ac"; /* no spaces */
14058 @@ -590,7 +590,10 @@ static long __apm_bios_call(void *_call)
14059 BUG_ON(cpu != 0);
14060 gdt = get_cpu_gdt_table(cpu);
14061 save_desc_40 = gdt[0x40 / 8];
14062 +
14063 + pax_open_kernel();
14064 gdt[0x40 / 8] = bad_bios_desc;
14065 + pax_close_kernel();
14066
14067 apm_irq_save(flags);
14068 APM_DO_SAVE_SEGS;
14069 @@ -599,7 +602,11 @@ static long __apm_bios_call(void *_call)
14070 &call->esi);
14071 APM_DO_RESTORE_SEGS;
14072 apm_irq_restore(flags);
14073 +
14074 + pax_open_kernel();
14075 gdt[0x40 / 8] = save_desc_40;
14076 + pax_close_kernel();
14077 +
14078 put_cpu();
14079
14080 return call->eax & 0xff;
14081 @@ -666,7 +673,10 @@ static long __apm_bios_call_simple(void *_call)
14082 BUG_ON(cpu != 0);
14083 gdt = get_cpu_gdt_table(cpu);
14084 save_desc_40 = gdt[0x40 / 8];
14085 +
14086 + pax_open_kernel();
14087 gdt[0x40 / 8] = bad_bios_desc;
14088 + pax_close_kernel();
14089
14090 apm_irq_save(flags);
14091 APM_DO_SAVE_SEGS;
14092 @@ -674,7 +684,11 @@ static long __apm_bios_call_simple(void *_call)
14093 &call->eax);
14094 APM_DO_RESTORE_SEGS;
14095 apm_irq_restore(flags);
14096 +
14097 + pax_open_kernel();
14098 gdt[0x40 / 8] = save_desc_40;
14099 + pax_close_kernel();
14100 +
14101 put_cpu();
14102 return error;
14103 }
14104 @@ -2345,12 +2359,15 @@ static int __init apm_init(void)
14105 * code to that CPU.
14106 */
14107 gdt = get_cpu_gdt_table(0);
14108 +
14109 + pax_open_kernel();
14110 set_desc_base(&gdt[APM_CS >> 3],
14111 (unsigned long)__va((unsigned long)apm_info.bios.cseg << 4));
14112 set_desc_base(&gdt[APM_CS_16 >> 3],
14113 (unsigned long)__va((unsigned long)apm_info.bios.cseg_16 << 4));
14114 set_desc_base(&gdt[APM_DS >> 3],
14115 (unsigned long)__va((unsigned long)apm_info.bios.dseg << 4));
14116 + pax_close_kernel();
14117
14118 proc_create("apm", 0, NULL, &apm_file_ops);
14119
14120 diff --git a/arch/x86/kernel/asm-offsets.c b/arch/x86/kernel/asm-offsets.c
14121 index 68de2dc..1f3c720 100644
14122 --- a/arch/x86/kernel/asm-offsets.c
14123 +++ b/arch/x86/kernel/asm-offsets.c
14124 @@ -33,6 +33,8 @@ void common(void) {
14125 OFFSET(TI_status, thread_info, status);
14126 OFFSET(TI_addr_limit, thread_info, addr_limit);
14127 OFFSET(TI_preempt_count, thread_info, preempt_count);
14128 + OFFSET(TI_lowest_stack, thread_info, lowest_stack);
14129 + DEFINE(TI_task_thread_sp0, offsetof(struct task_struct, thread.sp0) - offsetof(struct task_struct, tinfo));
14130
14131 BLANK();
14132 OFFSET(crypto_tfm_ctx_offset, crypto_tfm, __crt_ctx);
14133 @@ -53,8 +55,26 @@ void common(void) {
14134 OFFSET(PV_CPU_irq_enable_sysexit, pv_cpu_ops, irq_enable_sysexit);
14135 OFFSET(PV_CPU_read_cr0, pv_cpu_ops, read_cr0);
14136 OFFSET(PV_MMU_read_cr2, pv_mmu_ops, read_cr2);
14137 +
14138 +#ifdef CONFIG_PAX_KERNEXEC
14139 + OFFSET(PV_CPU_write_cr0, pv_cpu_ops, write_cr0);
14140 #endif
14141
14142 +#ifdef CONFIG_PAX_MEMORY_UDEREF
14143 + OFFSET(PV_MMU_read_cr3, pv_mmu_ops, read_cr3);
14144 + OFFSET(PV_MMU_write_cr3, pv_mmu_ops, write_cr3);
14145 +#ifdef CONFIG_X86_64
14146 + OFFSET(PV_MMU_set_pgd_batched, pv_mmu_ops, set_pgd_batched);
14147 +#endif
14148 +#endif
14149 +
14150 +#endif
14151 +
14152 + BLANK();
14153 + DEFINE(PAGE_SIZE_asm, PAGE_SIZE);
14154 + DEFINE(PAGE_SHIFT_asm, PAGE_SHIFT);
14155 + DEFINE(THREAD_SIZE_asm, THREAD_SIZE);
14156 +
14157 #ifdef CONFIG_XEN
14158 BLANK();
14159 OFFSET(XEN_vcpu_info_mask, vcpu_info, evtchn_upcall_mask);
14160 diff --git a/arch/x86/kernel/asm-offsets_64.c b/arch/x86/kernel/asm-offsets_64.c
14161 index 1b4754f..fbb4227 100644
14162 --- a/arch/x86/kernel/asm-offsets_64.c
14163 +++ b/arch/x86/kernel/asm-offsets_64.c
14164 @@ -76,6 +76,7 @@ int main(void)
14165 BLANK();
14166 #undef ENTRY
14167
14168 + DEFINE(TSS_size, sizeof(struct tss_struct));
14169 OFFSET(TSS_ist, tss_struct, x86_tss.ist);
14170 BLANK();
14171
14172 diff --git a/arch/x86/kernel/cpu/Makefile b/arch/x86/kernel/cpu/Makefile
14173 index d30a6a9..79becab 100644
14174 --- a/arch/x86/kernel/cpu/Makefile
14175 +++ b/arch/x86/kernel/cpu/Makefile
14176 @@ -8,10 +8,6 @@ CFLAGS_REMOVE_common.o = -pg
14177 CFLAGS_REMOVE_perf_event.o = -pg
14178 endif
14179
14180 -# Make sure load_percpu_segment has no stackprotector
14181 -nostackp := $(call cc-option, -fno-stack-protector)
14182 -CFLAGS_common.o := $(nostackp)
14183 -
14184 obj-y := intel_cacheinfo.o scattered.o topology.o
14185 obj-y += proc.o capflags.o powerflags.o common.o
14186 obj-y += vmware.o hypervisor.o mshyperv.o
14187 diff --git a/arch/x86/kernel/cpu/amd.c b/arch/x86/kernel/cpu/amd.c
14188 index 9d92e19..49d7d79 100644
14189 --- a/arch/x86/kernel/cpu/amd.c
14190 +++ b/arch/x86/kernel/cpu/amd.c
14191 @@ -724,7 +724,7 @@ static unsigned int __cpuinit amd_size_cache(struct cpuinfo_x86 *c,
14192 unsigned int size)
14193 {
14194 /* AMD errata T13 (order #21922) */
14195 - if ((c->x86 == 6)) {
14196 + if (c->x86 == 6) {
14197 /* Duron Rev A0 */
14198 if (c->x86_model == 3 && c->x86_mask == 0)
14199 size = 64;
14200 diff --git a/arch/x86/kernel/cpu/common.c b/arch/x86/kernel/cpu/common.c
14201 index a5fbc3c..2254849 100644
14202 --- a/arch/x86/kernel/cpu/common.c
14203 +++ b/arch/x86/kernel/cpu/common.c
14204 @@ -86,60 +86,6 @@ static const struct cpu_dev __cpuinitconst default_cpu = {
14205
14206 static const struct cpu_dev *this_cpu __cpuinitdata = &default_cpu;
14207
14208 -DEFINE_PER_CPU_PAGE_ALIGNED(struct gdt_page, gdt_page) = { .gdt = {
14209 -#ifdef CONFIG_X86_64
14210 - /*
14211 - * We need valid kernel segments for data and code in long mode too
14212 - * IRET will check the segment types kkeil 2000/10/28
14213 - * Also sysret mandates a special GDT layout
14214 - *
14215 - * TLS descriptors are currently at a different place compared to i386.
14216 - * Hopefully nobody expects them at a fixed place (Wine?)
14217 - */
14218 - [GDT_ENTRY_KERNEL32_CS] = GDT_ENTRY_INIT(0xc09b, 0, 0xfffff),
14219 - [GDT_ENTRY_KERNEL_CS] = GDT_ENTRY_INIT(0xa09b, 0, 0xfffff),
14220 - [GDT_ENTRY_KERNEL_DS] = GDT_ENTRY_INIT(0xc093, 0, 0xfffff),
14221 - [GDT_ENTRY_DEFAULT_USER32_CS] = GDT_ENTRY_INIT(0xc0fb, 0, 0xfffff),
14222 - [GDT_ENTRY_DEFAULT_USER_DS] = GDT_ENTRY_INIT(0xc0f3, 0, 0xfffff),
14223 - [GDT_ENTRY_DEFAULT_USER_CS] = GDT_ENTRY_INIT(0xa0fb, 0, 0xfffff),
14224 -#else
14225 - [GDT_ENTRY_KERNEL_CS] = GDT_ENTRY_INIT(0xc09a, 0, 0xfffff),
14226 - [GDT_ENTRY_KERNEL_DS] = GDT_ENTRY_INIT(0xc092, 0, 0xfffff),
14227 - [GDT_ENTRY_DEFAULT_USER_CS] = GDT_ENTRY_INIT(0xc0fa, 0, 0xfffff),
14228 - [GDT_ENTRY_DEFAULT_USER_DS] = GDT_ENTRY_INIT(0xc0f2, 0, 0xfffff),
14229 - /*
14230 - * Segments used for calling PnP BIOS have byte granularity.
14231 - * They code segments and data segments have fixed 64k limits,
14232 - * the transfer segment sizes are set at run time.
14233 - */
14234 - /* 32-bit code */
14235 - [GDT_ENTRY_PNPBIOS_CS32] = GDT_ENTRY_INIT(0x409a, 0, 0xffff),
14236 - /* 16-bit code */
14237 - [GDT_ENTRY_PNPBIOS_CS16] = GDT_ENTRY_INIT(0x009a, 0, 0xffff),
14238 - /* 16-bit data */
14239 - [GDT_ENTRY_PNPBIOS_DS] = GDT_ENTRY_INIT(0x0092, 0, 0xffff),
14240 - /* 16-bit data */
14241 - [GDT_ENTRY_PNPBIOS_TS1] = GDT_ENTRY_INIT(0x0092, 0, 0),
14242 - /* 16-bit data */
14243 - [GDT_ENTRY_PNPBIOS_TS2] = GDT_ENTRY_INIT(0x0092, 0, 0),
14244 - /*
14245 - * The APM segments have byte granularity and their bases
14246 - * are set at run time. All have 64k limits.
14247 - */
14248 - /* 32-bit code */
14249 - [GDT_ENTRY_APMBIOS_BASE] = GDT_ENTRY_INIT(0x409a, 0, 0xffff),
14250 - /* 16-bit code */
14251 - [GDT_ENTRY_APMBIOS_BASE+1] = GDT_ENTRY_INIT(0x009a, 0, 0xffff),
14252 - /* data */
14253 - [GDT_ENTRY_APMBIOS_BASE+2] = GDT_ENTRY_INIT(0x4092, 0, 0xffff),
14254 -
14255 - [GDT_ENTRY_ESPFIX_SS] = GDT_ENTRY_INIT(0xc092, 0, 0xfffff),
14256 - [GDT_ENTRY_PERCPU] = GDT_ENTRY_INIT(0xc092, 0, 0xfffff),
14257 - GDT_STACK_CANARY_INIT
14258 -#endif
14259 -} };
14260 -EXPORT_PER_CPU_SYMBOL_GPL(gdt_page);
14261 -
14262 static int __init x86_xsave_setup(char *s)
14263 {
14264 setup_clear_cpu_cap(X86_FEATURE_XSAVE);
14265 @@ -376,7 +322,7 @@ void switch_to_new_gdt(int cpu)
14266 {
14267 struct desc_ptr gdt_descr;
14268
14269 - gdt_descr.address = (long)get_cpu_gdt_table(cpu);
14270 + gdt_descr.address = (unsigned long)get_cpu_gdt_table(cpu);
14271 gdt_descr.size = GDT_SIZE - 1;
14272 load_gdt(&gdt_descr);
14273 /* Reload the per-cpu base */
14274 @@ -872,6 +818,10 @@ static void __cpuinit identify_cpu(struct cpuinfo_x86 *c)
14275 /* Filter out anything that depends on CPUID levels we don't have */
14276 filter_cpuid_features(c, true);
14277
14278 +#if defined(CONFIG_X86_32) && (defined(CONFIG_PAX_SEGMEXEC) || defined(CONFIG_PAX_KERNEXEC) || defined(CONFIG_PAX_MEMORY_UDEREF))
14279 + setup_clear_cpu_cap(X86_FEATURE_SEP);
14280 +#endif
14281 +
14282 /* If the model name is still unset, do table lookup. */
14283 if (!c->x86_model_id[0]) {
14284 const char *p;
14285 @@ -1054,10 +1004,12 @@ static __init int setup_disablecpuid(char *arg)
14286 }
14287 __setup("clearcpuid=", setup_disablecpuid);
14288
14289 +DEFINE_PER_CPU(struct thread_info *, current_tinfo) = &init_task.tinfo;
14290 +EXPORT_PER_CPU_SYMBOL(current_tinfo);
14291 +
14292 #ifdef CONFIG_X86_64
14293 struct desc_ptr idt_descr = { NR_VECTORS * 16 - 1, (unsigned long) idt_table };
14294 -struct desc_ptr nmi_idt_descr = { NR_VECTORS * 16 - 1,
14295 - (unsigned long) nmi_idt_table };
14296 +struct desc_ptr nmi_idt_descr = { NR_VECTORS * 16 - 1, (unsigned long) nmi_idt_table };
14297
14298 DEFINE_PER_CPU_FIRST(union irq_stack_union,
14299 irq_stack_union) __aligned(PAGE_SIZE);
14300 @@ -1071,7 +1023,7 @@ DEFINE_PER_CPU(struct task_struct *, current_task) ____cacheline_aligned =
14301 EXPORT_PER_CPU_SYMBOL(current_task);
14302
14303 DEFINE_PER_CPU(unsigned long, kernel_stack) =
14304 - (unsigned long)&init_thread_union - KERNEL_STACK_OFFSET + THREAD_SIZE;
14305 + (unsigned long)&init_thread_union - 16 + THREAD_SIZE;
14306 EXPORT_PER_CPU_SYMBOL(kernel_stack);
14307
14308 DEFINE_PER_CPU(char *, irq_stack_ptr) =
14309 @@ -1165,7 +1117,7 @@ struct pt_regs * __cpuinit idle_regs(struct pt_regs *regs)
14310 {
14311 memset(regs, 0, sizeof(struct pt_regs));
14312 regs->fs = __KERNEL_PERCPU;
14313 - regs->gs = __KERNEL_STACK_CANARY;
14314 + savesegment(gs, regs->gs);
14315
14316 return regs;
14317 }
14318 @@ -1220,7 +1172,7 @@ void __cpuinit cpu_init(void)
14319 int i;
14320
14321 cpu = stack_smp_processor_id();
14322 - t = &per_cpu(init_tss, cpu);
14323 + t = init_tss + cpu;
14324 oist = &per_cpu(orig_ist, cpu);
14325
14326 #ifdef CONFIG_NUMA
14327 @@ -1246,7 +1198,7 @@ void __cpuinit cpu_init(void)
14328 switch_to_new_gdt(cpu);
14329 loadsegment(fs, 0);
14330
14331 - load_idt((const struct desc_ptr *)&idt_descr);
14332 + load_idt(&idt_descr);
14333
14334 memset(me->thread.tls_array, 0, GDT_ENTRY_TLS_ENTRIES * 8);
14335 syscall_init();
14336 @@ -1255,7 +1207,6 @@ void __cpuinit cpu_init(void)
14337 wrmsrl(MSR_KERNEL_GS_BASE, 0);
14338 barrier();
14339
14340 - x86_configure_nx();
14341 if (cpu != 0)
14342 enable_x2apic();
14343
14344 @@ -1311,7 +1262,7 @@ void __cpuinit cpu_init(void)
14345 {
14346 int cpu = smp_processor_id();
14347 struct task_struct *curr = current;
14348 - struct tss_struct *t = &per_cpu(init_tss, cpu);
14349 + struct tss_struct *t = init_tss + cpu;
14350 struct thread_struct *thread = &curr->thread;
14351
14352 if (cpumask_test_and_set_cpu(cpu, cpu_initialized_mask)) {
14353 diff --git a/arch/x86/kernel/cpu/intel.c b/arch/x86/kernel/cpu/intel.c
14354 index 0a4ce29..f211176 100644
14355 --- a/arch/x86/kernel/cpu/intel.c
14356 +++ b/arch/x86/kernel/cpu/intel.c
14357 @@ -174,7 +174,7 @@ static void __cpuinit trap_init_f00f_bug(void)
14358 * Update the IDT descriptor and reload the IDT so that
14359 * it uses the read-only mapped virtual address.
14360 */
14361 - idt_descr.address = fix_to_virt(FIX_F00F_IDT);
14362 + idt_descr.address = (struct desc_struct *)fix_to_virt(FIX_F00F_IDT);
14363 load_idt(&idt_descr);
14364 }
14365 #endif
14366 diff --git a/arch/x86/kernel/cpu/mcheck/mce.c b/arch/x86/kernel/cpu/mcheck/mce.c
14367 index 292d025..b520c94 100644
14368 --- a/arch/x86/kernel/cpu/mcheck/mce.c
14369 +++ b/arch/x86/kernel/cpu/mcheck/mce.c
14370 @@ -45,6 +45,7 @@
14371 #include <asm/processor.h>
14372 #include <asm/mce.h>
14373 #include <asm/msr.h>
14374 +#include <asm/local.h>
14375
14376 #include "mce-internal.h"
14377
14378 @@ -253,7 +254,7 @@ static void print_mce(struct mce *m)
14379 !(m->mcgstatus & MCG_STATUS_EIPV) ? " !INEXACT!" : "",
14380 m->cs, m->ip);
14381
14382 - if (m->cs == __KERNEL_CS)
14383 + if (m->cs == __KERNEL_CS || m->cs == __KERNEXEC_KERNEL_CS)
14384 print_symbol("{%s}", m->ip);
14385 pr_cont("\n");
14386 }
14387 @@ -286,10 +287,10 @@ static void print_mce(struct mce *m)
14388
14389 #define PANIC_TIMEOUT 5 /* 5 seconds */
14390
14391 -static atomic_t mce_paniced;
14392 +static atomic_unchecked_t mce_paniced;
14393
14394 static int fake_panic;
14395 -static atomic_t mce_fake_paniced;
14396 +static atomic_unchecked_t mce_fake_paniced;
14397
14398 /* Panic in progress. Enable interrupts and wait for final IPI */
14399 static void wait_for_panic(void)
14400 @@ -313,7 +314,7 @@ static void mce_panic(char *msg, struct mce *final, char *exp)
14401 /*
14402 * Make sure only one CPU runs in machine check panic
14403 */
14404 - if (atomic_inc_return(&mce_paniced) > 1)
14405 + if (atomic_inc_return_unchecked(&mce_paniced) > 1)
14406 wait_for_panic();
14407 barrier();
14408
14409 @@ -321,7 +322,7 @@ static void mce_panic(char *msg, struct mce *final, char *exp)
14410 console_verbose();
14411 } else {
14412 /* Don't log too much for fake panic */
14413 - if (atomic_inc_return(&mce_fake_paniced) > 1)
14414 + if (atomic_inc_return_unchecked(&mce_fake_paniced) > 1)
14415 return;
14416 }
14417 /* First print corrected ones that are still unlogged */
14418 @@ -693,7 +694,7 @@ static int mce_timed_out(u64 *t)
14419 * might have been modified by someone else.
14420 */
14421 rmb();
14422 - if (atomic_read(&mce_paniced))
14423 + if (atomic_read_unchecked(&mce_paniced))
14424 wait_for_panic();
14425 if (!monarch_timeout)
14426 goto out;
14427 @@ -1619,7 +1620,7 @@ static void unexpected_machine_check(struct pt_regs *regs, long error_code)
14428 }
14429
14430 /* Call the installed machine check handler for this CPU setup. */
14431 -void (*machine_check_vector)(struct pt_regs *, long error_code) =
14432 +void (*machine_check_vector)(struct pt_regs *, long error_code) __read_only =
14433 unexpected_machine_check;
14434
14435 /*
14436 @@ -1642,7 +1643,9 @@ void __cpuinit mcheck_cpu_init(struct cpuinfo_x86 *c)
14437 return;
14438 }
14439
14440 + pax_open_kernel();
14441 machine_check_vector = do_machine_check;
14442 + pax_close_kernel();
14443
14444 __mcheck_cpu_init_generic();
14445 __mcheck_cpu_init_vendor(c);
14446 @@ -1656,7 +1659,7 @@ void __cpuinit mcheck_cpu_init(struct cpuinfo_x86 *c)
14447 */
14448
14449 static DEFINE_SPINLOCK(mce_chrdev_state_lock);
14450 -static int mce_chrdev_open_count; /* #times opened */
14451 +static local_t mce_chrdev_open_count; /* #times opened */
14452 static int mce_chrdev_open_exclu; /* already open exclusive? */
14453
14454 static int mce_chrdev_open(struct inode *inode, struct file *file)
14455 @@ -1664,7 +1667,7 @@ static int mce_chrdev_open(struct inode *inode, struct file *file)
14456 spin_lock(&mce_chrdev_state_lock);
14457
14458 if (mce_chrdev_open_exclu ||
14459 - (mce_chrdev_open_count && (file->f_flags & O_EXCL))) {
14460 + (local_read(&mce_chrdev_open_count) && (file->f_flags & O_EXCL))) {
14461 spin_unlock(&mce_chrdev_state_lock);
14462
14463 return -EBUSY;
14464 @@ -1672,7 +1675,7 @@ static int mce_chrdev_open(struct inode *inode, struct file *file)
14465
14466 if (file->f_flags & O_EXCL)
14467 mce_chrdev_open_exclu = 1;
14468 - mce_chrdev_open_count++;
14469 + local_inc(&mce_chrdev_open_count);
14470
14471 spin_unlock(&mce_chrdev_state_lock);
14472
14473 @@ -1683,7 +1686,7 @@ static int mce_chrdev_release(struct inode *inode, struct file *file)
14474 {
14475 spin_lock(&mce_chrdev_state_lock);
14476
14477 - mce_chrdev_open_count--;
14478 + local_dec(&mce_chrdev_open_count);
14479 mce_chrdev_open_exclu = 0;
14480
14481 spin_unlock(&mce_chrdev_state_lock);
14482 @@ -2407,7 +2410,7 @@ struct dentry *mce_get_debugfs_dir(void)
14483 static void mce_reset(void)
14484 {
14485 cpu_missing = 0;
14486 - atomic_set(&mce_fake_paniced, 0);
14487 + atomic_set_unchecked(&mce_fake_paniced, 0);
14488 atomic_set(&mce_executing, 0);
14489 atomic_set(&mce_callin, 0);
14490 atomic_set(&global_nwo, 0);
14491 diff --git a/arch/x86/kernel/cpu/mcheck/p5.c b/arch/x86/kernel/cpu/mcheck/p5.c
14492 index 2d5454c..51987eb 100644
14493 --- a/arch/x86/kernel/cpu/mcheck/p5.c
14494 +++ b/arch/x86/kernel/cpu/mcheck/p5.c
14495 @@ -11,6 +11,7 @@
14496 #include <asm/processor.h>
14497 #include <asm/mce.h>
14498 #include <asm/msr.h>
14499 +#include <asm/pgtable.h>
14500
14501 /* By default disabled */
14502 int mce_p5_enabled __read_mostly;
14503 @@ -49,7 +50,9 @@ void intel_p5_mcheck_init(struct cpuinfo_x86 *c)
14504 if (!cpu_has(c, X86_FEATURE_MCE))
14505 return;
14506
14507 + pax_open_kernel();
14508 machine_check_vector = pentium_machine_check;
14509 + pax_close_kernel();
14510 /* Make sure the vector pointer is visible before we enable MCEs: */
14511 wmb();
14512
14513 diff --git a/arch/x86/kernel/cpu/mcheck/winchip.c b/arch/x86/kernel/cpu/mcheck/winchip.c
14514 index 2d7998f..17c9de1 100644
14515 --- a/arch/x86/kernel/cpu/mcheck/winchip.c
14516 +++ b/arch/x86/kernel/cpu/mcheck/winchip.c
14517 @@ -10,6 +10,7 @@
14518 #include <asm/processor.h>
14519 #include <asm/mce.h>
14520 #include <asm/msr.h>
14521 +#include <asm/pgtable.h>
14522
14523 /* Machine check handler for WinChip C6: */
14524 static void winchip_machine_check(struct pt_regs *regs, long error_code)
14525 @@ -23,7 +24,9 @@ void winchip_mcheck_init(struct cpuinfo_x86 *c)
14526 {
14527 u32 lo, hi;
14528
14529 + pax_open_kernel();
14530 machine_check_vector = winchip_machine_check;
14531 + pax_close_kernel();
14532 /* Make sure the vector pointer is visible before we enable MCEs: */
14533 wmb();
14534
14535 diff --git a/arch/x86/kernel/cpu/mtrr/main.c b/arch/x86/kernel/cpu/mtrr/main.c
14536 index 6b96110..0da73eb 100644
14537 --- a/arch/x86/kernel/cpu/mtrr/main.c
14538 +++ b/arch/x86/kernel/cpu/mtrr/main.c
14539 @@ -62,7 +62,7 @@ static DEFINE_MUTEX(mtrr_mutex);
14540 u64 size_or_mask, size_and_mask;
14541 static bool mtrr_aps_delayed_init;
14542
14543 -static const struct mtrr_ops *mtrr_ops[X86_VENDOR_NUM];
14544 +static const struct mtrr_ops *mtrr_ops[X86_VENDOR_NUM] __read_only;
14545
14546 const struct mtrr_ops *mtrr_if;
14547
14548 diff --git a/arch/x86/kernel/cpu/mtrr/mtrr.h b/arch/x86/kernel/cpu/mtrr/mtrr.h
14549 index df5e41f..816c719 100644
14550 --- a/arch/x86/kernel/cpu/mtrr/mtrr.h
14551 +++ b/arch/x86/kernel/cpu/mtrr/mtrr.h
14552 @@ -25,7 +25,7 @@ struct mtrr_ops {
14553 int (*validate_add_page)(unsigned long base, unsigned long size,
14554 unsigned int type);
14555 int (*have_wrcomb)(void);
14556 -};
14557 +} __do_const;
14558
14559 extern int generic_get_free_region(unsigned long base, unsigned long size,
14560 int replace_reg);
14561 diff --git a/arch/x86/kernel/cpu/perf_event.c b/arch/x86/kernel/cpu/perf_event.c
14562 index 915b876..171f845 100644
14563 --- a/arch/x86/kernel/cpu/perf_event.c
14564 +++ b/arch/x86/kernel/cpu/perf_event.c
14565 @@ -1757,7 +1757,7 @@ static unsigned long get_segment_base(unsigned int segment)
14566 if (idx > GDT_ENTRIES)
14567 return 0;
14568
14569 - desc = __this_cpu_ptr(&gdt_page.gdt[0]);
14570 + desc = get_cpu_gdt_table(smp_processor_id());
14571 }
14572
14573 return get_desc_base(desc + idx);
14574 @@ -1847,7 +1847,7 @@ perf_callchain_user(struct perf_callchain_entry *entry, struct pt_regs *regs)
14575 break;
14576
14577 perf_callchain_store(entry, frame.return_address);
14578 - fp = frame.next_frame;
14579 + fp = (const void __force_user *)frame.next_frame;
14580 }
14581 }
14582
14583 diff --git a/arch/x86/kernel/cpu/perf_event_intel.c b/arch/x86/kernel/cpu/perf_event_intel.c
14584 index 6bca492..36e4496 100644
14585 --- a/arch/x86/kernel/cpu/perf_event_intel.c
14586 +++ b/arch/x86/kernel/cpu/perf_event_intel.c
14587 @@ -1947,10 +1947,10 @@ __init int intel_pmu_init(void)
14588 * v2 and above have a perf capabilities MSR
14589 */
14590 if (version > 1) {
14591 - u64 capabilities;
14592 + u64 capabilities = x86_pmu.intel_cap.capabilities;
14593
14594 - rdmsrl(MSR_IA32_PERF_CAPABILITIES, capabilities);
14595 - x86_pmu.intel_cap.capabilities = capabilities;
14596 + if (rdmsrl_safe(MSR_IA32_PERF_CAPABILITIES, &x86_pmu.intel_cap.capabilities))
14597 + x86_pmu.intel_cap.capabilities = capabilities;
14598 }
14599
14600 intel_ds_init();
14601 diff --git a/arch/x86/kernel/crash.c b/arch/x86/kernel/crash.c
14602 index 13ad899..f642b9a 100644
14603 --- a/arch/x86/kernel/crash.c
14604 +++ b/arch/x86/kernel/crash.c
14605 @@ -36,10 +36,8 @@ static void kdump_nmi_callback(int cpu, struct pt_regs *regs)
14606 {
14607 #ifdef CONFIG_X86_32
14608 struct pt_regs fixed_regs;
14609 -#endif
14610
14611 -#ifdef CONFIG_X86_32
14612 - if (!user_mode_vm(regs)) {
14613 + if (!user_mode(regs)) {
14614 crash_fixup_ss_esp(&fixed_regs, regs);
14615 regs = &fixed_regs;
14616 }
14617 diff --git a/arch/x86/kernel/doublefault_32.c b/arch/x86/kernel/doublefault_32.c
14618 index 37250fe..bf2ec74 100644
14619 --- a/arch/x86/kernel/doublefault_32.c
14620 +++ b/arch/x86/kernel/doublefault_32.c
14621 @@ -11,7 +11,7 @@
14622
14623 #define DOUBLEFAULT_STACKSIZE (1024)
14624 static unsigned long doublefault_stack[DOUBLEFAULT_STACKSIZE];
14625 -#define STACK_START (unsigned long)(doublefault_stack+DOUBLEFAULT_STACKSIZE)
14626 +#define STACK_START (unsigned long)(doublefault_stack+DOUBLEFAULT_STACKSIZE-2)
14627
14628 #define ptr_ok(x) ((x) > PAGE_OFFSET && (x) < PAGE_OFFSET + MAXMEM)
14629
14630 @@ -21,7 +21,7 @@ static void doublefault_fn(void)
14631 unsigned long gdt, tss;
14632
14633 store_gdt(&gdt_desc);
14634 - gdt = gdt_desc.address;
14635 + gdt = (unsigned long)gdt_desc.address;
14636
14637 printk(KERN_EMERG "PANIC: double fault, gdt at %08lx [%d bytes]\n", gdt, gdt_desc.size);
14638
14639 @@ -58,10 +58,10 @@ struct tss_struct doublefault_tss __cacheline_aligned = {
14640 /* 0x2 bit is always set */
14641 .flags = X86_EFLAGS_SF | 0x2,
14642 .sp = STACK_START,
14643 - .es = __USER_DS,
14644 + .es = __KERNEL_DS,
14645 .cs = __KERNEL_CS,
14646 .ss = __KERNEL_DS,
14647 - .ds = __USER_DS,
14648 + .ds = __KERNEL_DS,
14649 .fs = __KERNEL_PERCPU,
14650
14651 .__cr3 = __pa_nodebug(swapper_pg_dir),
14652 diff --git a/arch/x86/kernel/dumpstack.c b/arch/x86/kernel/dumpstack.c
14653 index ae42418b..787c16b 100644
14654 --- a/arch/x86/kernel/dumpstack.c
14655 +++ b/arch/x86/kernel/dumpstack.c
14656 @@ -2,6 +2,9 @@
14657 * Copyright (C) 1991, 1992 Linus Torvalds
14658 * Copyright (C) 2000, 2001, 2002 Andi Kleen, SuSE Labs
14659 */
14660 +#ifdef CONFIG_GRKERNSEC_HIDESYM
14661 +#define __INCLUDED_BY_HIDESYM 1
14662 +#endif
14663 #include <linux/kallsyms.h>
14664 #include <linux/kprobes.h>
14665 #include <linux/uaccess.h>
14666 @@ -35,16 +38,14 @@ void printk_address(unsigned long address, int reliable)
14667 static void
14668 print_ftrace_graph_addr(unsigned long addr, void *data,
14669 const struct stacktrace_ops *ops,
14670 - struct thread_info *tinfo, int *graph)
14671 + struct task_struct *task, int *graph)
14672 {
14673 - struct task_struct *task;
14674 unsigned long ret_addr;
14675 int index;
14676
14677 if (addr != (unsigned long)return_to_handler)
14678 return;
14679
14680 - task = tinfo->task;
14681 index = task->curr_ret_stack;
14682
14683 if (!task->ret_stack || index < *graph)
14684 @@ -61,7 +62,7 @@ print_ftrace_graph_addr(unsigned long addr, void *data,
14685 static inline void
14686 print_ftrace_graph_addr(unsigned long addr, void *data,
14687 const struct stacktrace_ops *ops,
14688 - struct thread_info *tinfo, int *graph)
14689 + struct task_struct *task, int *graph)
14690 { }
14691 #endif
14692
14693 @@ -72,10 +73,8 @@ print_ftrace_graph_addr(unsigned long addr, void *data,
14694 * severe exception (double fault, nmi, stack fault, debug, mce) hardware stack
14695 */
14696
14697 -static inline int valid_stack_ptr(struct thread_info *tinfo,
14698 - void *p, unsigned int size, void *end)
14699 +static inline int valid_stack_ptr(void *t, void *p, unsigned int size, void *end)
14700 {
14701 - void *t = tinfo;
14702 if (end) {
14703 if (p < end && p >= (end-THREAD_SIZE))
14704 return 1;
14705 @@ -86,14 +85,14 @@ static inline int valid_stack_ptr(struct thread_info *tinfo,
14706 }
14707
14708 unsigned long
14709 -print_context_stack(struct thread_info *tinfo,
14710 +print_context_stack(struct task_struct *task, void *stack_start,
14711 unsigned long *stack, unsigned long bp,
14712 const struct stacktrace_ops *ops, void *data,
14713 unsigned long *end, int *graph)
14714 {
14715 struct stack_frame *frame = (struct stack_frame *)bp;
14716
14717 - while (valid_stack_ptr(tinfo, stack, sizeof(*stack), end)) {
14718 + while (valid_stack_ptr(stack_start, stack, sizeof(*stack), end)) {
14719 unsigned long addr;
14720
14721 addr = *stack;
14722 @@ -105,7 +104,7 @@ print_context_stack(struct thread_info *tinfo,
14723 } else {
14724 ops->address(data, addr, 0);
14725 }
14726 - print_ftrace_graph_addr(addr, data, ops, tinfo, graph);
14727 + print_ftrace_graph_addr(addr, data, ops, task, graph);
14728 }
14729 stack++;
14730 }
14731 @@ -114,7 +113,7 @@ print_context_stack(struct thread_info *tinfo,
14732 EXPORT_SYMBOL_GPL(print_context_stack);
14733
14734 unsigned long
14735 -print_context_stack_bp(struct thread_info *tinfo,
14736 +print_context_stack_bp(struct task_struct *task, void *stack_start,
14737 unsigned long *stack, unsigned long bp,
14738 const struct stacktrace_ops *ops, void *data,
14739 unsigned long *end, int *graph)
14740 @@ -122,7 +121,7 @@ print_context_stack_bp(struct thread_info *tinfo,
14741 struct stack_frame *frame = (struct stack_frame *)bp;
14742 unsigned long *ret_addr = &frame->return_address;
14743
14744 - while (valid_stack_ptr(tinfo, ret_addr, sizeof(*ret_addr), end)) {
14745 + while (valid_stack_ptr(stack_start, ret_addr, sizeof(*ret_addr), end)) {
14746 unsigned long addr = *ret_addr;
14747
14748 if (!__kernel_text_address(addr))
14749 @@ -131,7 +130,7 @@ print_context_stack_bp(struct thread_info *tinfo,
14750 ops->address(data, addr, 1);
14751 frame = frame->next_frame;
14752 ret_addr = &frame->return_address;
14753 - print_ftrace_graph_addr(addr, data, ops, tinfo, graph);
14754 + print_ftrace_graph_addr(addr, data, ops, task, graph);
14755 }
14756
14757 return (unsigned long)frame;
14758 @@ -189,7 +188,7 @@ void dump_stack(void)
14759
14760 bp = stack_frame(current, NULL);
14761 printk("Pid: %d, comm: %.20s %s %s %.*s\n",
14762 - current->pid, current->comm, print_tainted(),
14763 + task_pid_nr(current), current->comm, print_tainted(),
14764 init_utsname()->release,
14765 (int)strcspn(init_utsname()->version, " "),
14766 init_utsname()->version);
14767 @@ -225,6 +224,8 @@ unsigned __kprobes long oops_begin(void)
14768 }
14769 EXPORT_SYMBOL_GPL(oops_begin);
14770
14771 +extern void gr_handle_kernel_exploit(void);
14772 +
14773 void __kprobes oops_end(unsigned long flags, struct pt_regs *regs, int signr)
14774 {
14775 if (regs && kexec_should_crash(current))
14776 @@ -246,7 +247,10 @@ void __kprobes oops_end(unsigned long flags, struct pt_regs *regs, int signr)
14777 panic("Fatal exception in interrupt");
14778 if (panic_on_oops)
14779 panic("Fatal exception");
14780 - do_exit(signr);
14781 +
14782 + gr_handle_kernel_exploit();
14783 +
14784 + do_group_exit(signr);
14785 }
14786
14787 int __kprobes __die(const char *str, struct pt_regs *regs, long err)
14788 @@ -274,7 +278,7 @@ int __kprobes __die(const char *str, struct pt_regs *regs, long err)
14789 print_modules();
14790 show_regs(regs);
14791 #ifdef CONFIG_X86_32
14792 - if (user_mode_vm(regs)) {
14793 + if (user_mode(regs)) {
14794 sp = regs->sp;
14795 ss = regs->ss & 0xffff;
14796 } else {
14797 @@ -302,7 +306,7 @@ void die(const char *str, struct pt_regs *regs, long err)
14798 unsigned long flags = oops_begin();
14799 int sig = SIGSEGV;
14800
14801 - if (!user_mode_vm(regs))
14802 + if (!user_mode(regs))
14803 report_bug(regs->ip, regs);
14804
14805 if (__die(str, regs, err))
14806 diff --git a/arch/x86/kernel/dumpstack_32.c b/arch/x86/kernel/dumpstack_32.c
14807 index 1038a41..ac7e5f6 100644
14808 --- a/arch/x86/kernel/dumpstack_32.c
14809 +++ b/arch/x86/kernel/dumpstack_32.c
14810 @@ -38,15 +38,13 @@ void dump_trace(struct task_struct *task, struct pt_regs *regs,
14811 bp = stack_frame(task, regs);
14812
14813 for (;;) {
14814 - struct thread_info *context;
14815 + void *stack_start = (void *)((unsigned long)stack & ~(THREAD_SIZE-1));
14816
14817 - context = (struct thread_info *)
14818 - ((unsigned long)stack & (~(THREAD_SIZE - 1)));
14819 - bp = ops->walk_stack(context, stack, bp, ops, data, NULL, &graph);
14820 + bp = ops->walk_stack(task, stack_start, stack, bp, ops, data, NULL, &graph);
14821
14822 - stack = (unsigned long *)context->previous_esp;
14823 - if (!stack)
14824 + if (stack_start == task_stack_page(task))
14825 break;
14826 + stack = *(unsigned long **)stack_start;
14827 if (ops->stack(data, "IRQ") < 0)
14828 break;
14829 touch_nmi_watchdog();
14830 @@ -86,7 +84,7 @@ void show_regs(struct pt_regs *regs)
14831 {
14832 int i;
14833
14834 - __show_regs(regs, !user_mode_vm(regs));
14835 + __show_regs(regs, !user_mode(regs));
14836
14837 pr_emerg("Process %.*s (pid: %d, ti=%p task=%p task.ti=%p)\n",
14838 TASK_COMM_LEN, current->comm, task_pid_nr(current),
14839 @@ -95,21 +93,22 @@ void show_regs(struct pt_regs *regs)
14840 * When in-kernel, we also print out the stack and code at the
14841 * time of the fault..
14842 */
14843 - if (!user_mode_vm(regs)) {
14844 + if (!user_mode(regs)) {
14845 unsigned int code_prologue = code_bytes * 43 / 64;
14846 unsigned int code_len = code_bytes;
14847 unsigned char c;
14848 u8 *ip;
14849 + unsigned long cs_base = get_desc_base(&get_cpu_gdt_table(smp_processor_id())[(0xffff & regs->cs) >> 3]);
14850
14851 pr_emerg("Stack:\n");
14852 show_stack_log_lvl(NULL, regs, &regs->sp, 0, KERN_EMERG);
14853
14854 pr_emerg("Code:");
14855
14856 - ip = (u8 *)regs->ip - code_prologue;
14857 + ip = (u8 *)regs->ip - code_prologue + cs_base;
14858 if (ip < (u8 *)PAGE_OFFSET || probe_kernel_address(ip, c)) {
14859 /* try starting at IP */
14860 - ip = (u8 *)regs->ip;
14861 + ip = (u8 *)regs->ip + cs_base;
14862 code_len = code_len - code_prologue + 1;
14863 }
14864 for (i = 0; i < code_len; i++, ip++) {
14865 @@ -118,7 +117,7 @@ void show_regs(struct pt_regs *regs)
14866 pr_cont(" Bad EIP value.");
14867 break;
14868 }
14869 - if (ip == (u8 *)regs->ip)
14870 + if (ip == (u8 *)regs->ip + cs_base)
14871 pr_cont(" <%02x>", c);
14872 else
14873 pr_cont(" %02x", c);
14874 @@ -131,6 +130,7 @@ int is_valid_bugaddr(unsigned long ip)
14875 {
14876 unsigned short ud2;
14877
14878 + ip = ktla_ktva(ip);
14879 if (ip < PAGE_OFFSET)
14880 return 0;
14881 if (probe_kernel_address((unsigned short *)ip, ud2))
14882 @@ -138,3 +138,15 @@ int is_valid_bugaddr(unsigned long ip)
14883
14884 return ud2 == 0x0b0f;
14885 }
14886 +
14887 +#ifdef CONFIG_PAX_MEMORY_STACKLEAK
14888 +void pax_check_alloca(unsigned long size)
14889 +{
14890 + unsigned long sp = (unsigned long)&sp, stack_left;
14891 +
14892 + /* all kernel stacks are of the same size */
14893 + stack_left = sp & (THREAD_SIZE - 1);
14894 + BUG_ON(stack_left < 256 || size >= stack_left - 256);
14895 +}
14896 +EXPORT_SYMBOL(pax_check_alloca);
14897 +#endif
14898 diff --git a/arch/x86/kernel/dumpstack_64.c b/arch/x86/kernel/dumpstack_64.c
14899 index b653675..33190c0 100644
14900 --- a/arch/x86/kernel/dumpstack_64.c
14901 +++ b/arch/x86/kernel/dumpstack_64.c
14902 @@ -119,9 +119,9 @@ void dump_trace(struct task_struct *task, struct pt_regs *regs,
14903 unsigned long *irq_stack_end =
14904 (unsigned long *)per_cpu(irq_stack_ptr, cpu);
14905 unsigned used = 0;
14906 - struct thread_info *tinfo;
14907 int graph = 0;
14908 unsigned long dummy;
14909 + void *stack_start;
14910
14911 if (!task)
14912 task = current;
14913 @@ -142,10 +142,10 @@ void dump_trace(struct task_struct *task, struct pt_regs *regs,
14914 * current stack address. If the stacks consist of nested
14915 * exceptions
14916 */
14917 - tinfo = task_thread_info(task);
14918 for (;;) {
14919 char *id;
14920 unsigned long *estack_end;
14921 +
14922 estack_end = in_exception_stack(cpu, (unsigned long)stack,
14923 &used, &id);
14924
14925 @@ -153,7 +153,7 @@ void dump_trace(struct task_struct *task, struct pt_regs *regs,
14926 if (ops->stack(data, id) < 0)
14927 break;
14928
14929 - bp = ops->walk_stack(tinfo, stack, bp, ops,
14930 + bp = ops->walk_stack(task, estack_end - EXCEPTION_STKSZ, stack, bp, ops,
14931 data, estack_end, &graph);
14932 ops->stack(data, "<EOE>");
14933 /*
14934 @@ -161,6 +161,8 @@ void dump_trace(struct task_struct *task, struct pt_regs *regs,
14935 * second-to-last pointer (index -2 to end) in the
14936 * exception stack:
14937 */
14938 + if ((u16)estack_end[-1] != __KERNEL_DS)
14939 + goto out;
14940 stack = (unsigned long *) estack_end[-2];
14941 continue;
14942 }
14943 @@ -172,7 +174,7 @@ void dump_trace(struct task_struct *task, struct pt_regs *regs,
14944 if (in_irq_stack(stack, irq_stack, irq_stack_end)) {
14945 if (ops->stack(data, "IRQ") < 0)
14946 break;
14947 - bp = ops->walk_stack(tinfo, stack, bp,
14948 + bp = ops->walk_stack(task, irq_stack, stack, bp,
14949 ops, data, irq_stack_end, &graph);
14950 /*
14951 * We link to the next stack (which would be
14952 @@ -191,7 +193,9 @@ void dump_trace(struct task_struct *task, struct pt_regs *regs,
14953 /*
14954 * This handles the process stack:
14955 */
14956 - bp = ops->walk_stack(tinfo, stack, bp, ops, data, NULL, &graph);
14957 + stack_start = (void *)((unsigned long)stack & ~(THREAD_SIZE-1));
14958 + bp = ops->walk_stack(task, stack_start, stack, bp, ops, data, NULL, &graph);
14959 +out:
14960 put_cpu();
14961 }
14962 EXPORT_SYMBOL(dump_trace);
14963 @@ -304,3 +308,50 @@ int is_valid_bugaddr(unsigned long ip)
14964
14965 return ud2 == 0x0b0f;
14966 }
14967 +
14968 +#ifdef CONFIG_PAX_MEMORY_STACKLEAK
14969 +void pax_check_alloca(unsigned long size)
14970 +{
14971 + unsigned long sp = (unsigned long)&sp, stack_start, stack_end;
14972 + unsigned cpu, used;
14973 + char *id;
14974 +
14975 + /* check the process stack first */
14976 + stack_start = (unsigned long)task_stack_page(current);
14977 + stack_end = stack_start + THREAD_SIZE;
14978 + if (likely(stack_start <= sp && sp < stack_end)) {
14979 + unsigned long stack_left = sp & (THREAD_SIZE - 1);
14980 + BUG_ON(stack_left < 256 || size >= stack_left - 256);
14981 + return;
14982 + }
14983 +
14984 + cpu = get_cpu();
14985 +
14986 + /* check the irq stacks */
14987 + stack_end = (unsigned long)per_cpu(irq_stack_ptr, cpu);
14988 + stack_start = stack_end - IRQ_STACK_SIZE;
14989 + if (stack_start <= sp && sp < stack_end) {
14990 + unsigned long stack_left = sp & (IRQ_STACK_SIZE - 1);
14991 + put_cpu();
14992 + BUG_ON(stack_left < 256 || size >= stack_left - 256);
14993 + return;
14994 + }
14995 +
14996 + /* check the exception stacks */
14997 + used = 0;
14998 + stack_end = (unsigned long)in_exception_stack(cpu, sp, &used, &id);
14999 + stack_start = stack_end - EXCEPTION_STKSZ;
15000 + if (stack_end && stack_start <= sp && sp < stack_end) {
15001 + unsigned long stack_left = sp & (EXCEPTION_STKSZ - 1);
15002 + put_cpu();
15003 + BUG_ON(stack_left < 256 || size >= stack_left - 256);
15004 + return;
15005 + }
15006 +
15007 + put_cpu();
15008 +
15009 + /* unknown stack */
15010 + BUG();
15011 +}
15012 +EXPORT_SYMBOL(pax_check_alloca);
15013 +#endif
15014 diff --git a/arch/x86/kernel/early_printk.c b/arch/x86/kernel/early_printk.c
15015 index 9b9f18b..9fcaa04 100644
15016 --- a/arch/x86/kernel/early_printk.c
15017 +++ b/arch/x86/kernel/early_printk.c
15018 @@ -7,6 +7,7 @@
15019 #include <linux/pci_regs.h>
15020 #include <linux/pci_ids.h>
15021 #include <linux/errno.h>
15022 +#include <linux/sched.h>
15023 #include <asm/io.h>
15024 #include <asm/processor.h>
15025 #include <asm/fcntl.h>
15026 diff --git a/arch/x86/kernel/entry_32.S b/arch/x86/kernel/entry_32.S
15027 index 8f8e8ee..3617d6e 100644
15028 --- a/arch/x86/kernel/entry_32.S
15029 +++ b/arch/x86/kernel/entry_32.S
15030 @@ -176,13 +176,153 @@
15031 /*CFI_REL_OFFSET gs, PT_GS*/
15032 .endm
15033 .macro SET_KERNEL_GS reg
15034 +
15035 +#ifdef CONFIG_CC_STACKPROTECTOR
15036 movl $(__KERNEL_STACK_CANARY), \reg
15037 +#elif defined(CONFIG_PAX_MEMORY_UDEREF)
15038 + movl $(__USER_DS), \reg
15039 +#else
15040 + xorl \reg, \reg
15041 +#endif
15042 +
15043 movl \reg, %gs
15044 .endm
15045
15046 #endif /* CONFIG_X86_32_LAZY_GS */
15047
15048 -.macro SAVE_ALL
15049 +.macro pax_enter_kernel
15050 +#ifdef CONFIG_PAX_KERNEXEC
15051 + call pax_enter_kernel
15052 +#endif
15053 +.endm
15054 +
15055 +.macro pax_exit_kernel
15056 +#ifdef CONFIG_PAX_KERNEXEC
15057 + call pax_exit_kernel
15058 +#endif
15059 +.endm
15060 +
15061 +#ifdef CONFIG_PAX_KERNEXEC
15062 +ENTRY(pax_enter_kernel)
15063 +#ifdef CONFIG_PARAVIRT
15064 + pushl %eax
15065 + pushl %ecx
15066 + call PARA_INDIRECT(pv_cpu_ops+PV_CPU_read_cr0)
15067 + mov %eax, %esi
15068 +#else
15069 + mov %cr0, %esi
15070 +#endif
15071 + bts $16, %esi
15072 + jnc 1f
15073 + mov %cs, %esi
15074 + cmp $__KERNEL_CS, %esi
15075 + jz 3f
15076 + ljmp $__KERNEL_CS, $3f
15077 +1: ljmp $__KERNEXEC_KERNEL_CS, $2f
15078 +2:
15079 +#ifdef CONFIG_PARAVIRT
15080 + mov %esi, %eax
15081 + call PARA_INDIRECT(pv_cpu_ops+PV_CPU_write_cr0)
15082 +#else
15083 + mov %esi, %cr0
15084 +#endif
15085 +3:
15086 +#ifdef CONFIG_PARAVIRT
15087 + popl %ecx
15088 + popl %eax
15089 +#endif
15090 + ret
15091 +ENDPROC(pax_enter_kernel)
15092 +
15093 +ENTRY(pax_exit_kernel)
15094 +#ifdef CONFIG_PARAVIRT
15095 + pushl %eax
15096 + pushl %ecx
15097 +#endif
15098 + mov %cs, %esi
15099 + cmp $__KERNEXEC_KERNEL_CS, %esi
15100 + jnz 2f
15101 +#ifdef CONFIG_PARAVIRT
15102 + call PARA_INDIRECT(pv_cpu_ops+PV_CPU_read_cr0);
15103 + mov %eax, %esi
15104 +#else
15105 + mov %cr0, %esi
15106 +#endif
15107 + btr $16, %esi
15108 + ljmp $__KERNEL_CS, $1f
15109 +1:
15110 +#ifdef CONFIG_PARAVIRT
15111 + mov %esi, %eax
15112 + call PARA_INDIRECT(pv_cpu_ops+PV_CPU_write_cr0);
15113 +#else
15114 + mov %esi, %cr0
15115 +#endif
15116 +2:
15117 +#ifdef CONFIG_PARAVIRT
15118 + popl %ecx
15119 + popl %eax
15120 +#endif
15121 + ret
15122 +ENDPROC(pax_exit_kernel)
15123 +#endif
15124 +
15125 +.macro pax_erase_kstack
15126 +#ifdef CONFIG_PAX_MEMORY_STACKLEAK
15127 + call pax_erase_kstack
15128 +#endif
15129 +.endm
15130 +
15131 +#ifdef CONFIG_PAX_MEMORY_STACKLEAK
15132 +/*
15133 + * ebp: thread_info
15134 + */
15135 +ENTRY(pax_erase_kstack)
15136 + pushl %edi
15137 + pushl %ecx
15138 + pushl %eax
15139 +
15140 + mov TI_lowest_stack(%ebp), %edi
15141 + mov $-0xBEEF, %eax
15142 + std
15143 +
15144 +1: mov %edi, %ecx
15145 + and $THREAD_SIZE_asm - 1, %ecx
15146 + shr $2, %ecx
15147 + repne scasl
15148 + jecxz 2f
15149 +
15150 + cmp $2*16, %ecx
15151 + jc 2f
15152 +
15153 + mov $2*16, %ecx
15154 + repe scasl
15155 + jecxz 2f
15156 + jne 1b
15157 +
15158 +2: cld
15159 + mov %esp, %ecx
15160 + sub %edi, %ecx
15161 +
15162 + cmp $THREAD_SIZE_asm, %ecx
15163 + jb 3f
15164 + ud2
15165 +3:
15166 +
15167 + shr $2, %ecx
15168 + rep stosl
15169 +
15170 + mov TI_task_thread_sp0(%ebp), %edi
15171 + sub $128, %edi
15172 + mov %edi, TI_lowest_stack(%ebp)
15173 +
15174 + popl %eax
15175 + popl %ecx
15176 + popl %edi
15177 + ret
15178 +ENDPROC(pax_erase_kstack)
15179 +#endif
15180 +
15181 +.macro __SAVE_ALL _DS
15182 cld
15183 PUSH_GS
15184 pushl_cfi %fs
15185 @@ -205,7 +345,7 @@
15186 CFI_REL_OFFSET ecx, 0
15187 pushl_cfi %ebx
15188 CFI_REL_OFFSET ebx, 0
15189 - movl $(__USER_DS), %edx
15190 + movl $\_DS, %edx
15191 movl %edx, %ds
15192 movl %edx, %es
15193 movl $(__KERNEL_PERCPU), %edx
15194 @@ -213,6 +353,15 @@
15195 SET_KERNEL_GS %edx
15196 .endm
15197
15198 +.macro SAVE_ALL
15199 +#if defined(CONFIG_PAX_KERNEXEC) || defined(CONFIG_PAX_PAGEEXEC) || defined(CONFIG_PAX_SEGMEXEC) || defined(CONFIG_PAX_MEMORY_UDEREF)
15200 + __SAVE_ALL __KERNEL_DS
15201 + pax_enter_kernel
15202 +#else
15203 + __SAVE_ALL __USER_DS
15204 +#endif
15205 +.endm
15206 +
15207 .macro RESTORE_INT_REGS
15208 popl_cfi %ebx
15209 CFI_RESTORE ebx
15210 @@ -296,7 +445,7 @@ ENTRY(ret_from_fork)
15211 popfl_cfi
15212 jmp syscall_exit
15213 CFI_ENDPROC
15214 -END(ret_from_fork)
15215 +ENDPROC(ret_from_fork)
15216
15217 /*
15218 * Interrupt exit functions should be protected against kprobes
15219 @@ -329,7 +478,15 @@ ret_from_intr:
15220 andl $SEGMENT_RPL_MASK, %eax
15221 #endif
15222 cmpl $USER_RPL, %eax
15223 +
15224 +#ifdef CONFIG_PAX_KERNEXEC
15225 + jae resume_userspace
15226 +
15227 + pax_exit_kernel
15228 + jmp resume_kernel
15229 +#else
15230 jb resume_kernel # not returning to v8086 or userspace
15231 +#endif
15232
15233 ENTRY(resume_userspace)
15234 LOCKDEP_SYS_EXIT
15235 @@ -341,8 +498,8 @@ ENTRY(resume_userspace)
15236 andl $_TIF_WORK_MASK, %ecx # is there any work to be done on
15237 # int/exception return?
15238 jne work_pending
15239 - jmp restore_all
15240 -END(ret_from_exception)
15241 + jmp restore_all_pax
15242 +ENDPROC(ret_from_exception)
15243
15244 #ifdef CONFIG_PREEMPT
15245 ENTRY(resume_kernel)
15246 @@ -357,7 +514,7 @@ need_resched:
15247 jz restore_all
15248 call preempt_schedule_irq
15249 jmp need_resched
15250 -END(resume_kernel)
15251 +ENDPROC(resume_kernel)
15252 #endif
15253 CFI_ENDPROC
15254 /*
15255 @@ -391,28 +548,43 @@ sysenter_past_esp:
15256 /*CFI_REL_OFFSET cs, 0*/
15257 /*
15258 * Push current_thread_info()->sysenter_return to the stack.
15259 - * A tiny bit of offset fixup is necessary - 4*4 means the 4 words
15260 - * pushed above; +8 corresponds to copy_thread's esp0 setting.
15261 */
15262 - pushl_cfi ((TI_sysenter_return)-THREAD_SIZE+8+4*4)(%esp)
15263 + pushl_cfi $0
15264 CFI_REL_OFFSET eip, 0
15265
15266 pushl_cfi %eax
15267 SAVE_ALL
15268 + GET_THREAD_INFO(%ebp)
15269 + movl TI_sysenter_return(%ebp),%ebp
15270 + movl %ebp,PT_EIP(%esp)
15271 ENABLE_INTERRUPTS(CLBR_NONE)
15272
15273 /*
15274 * Load the potential sixth argument from user stack.
15275 * Careful about security.
15276 */
15277 + movl PT_OLDESP(%esp),%ebp
15278 +
15279 +#ifdef CONFIG_PAX_MEMORY_UDEREF
15280 + mov PT_OLDSS(%esp),%ds
15281 +1: movl %ds:(%ebp),%ebp
15282 + push %ss
15283 + pop %ds
15284 +#else
15285 cmpl $__PAGE_OFFSET-3,%ebp
15286 jae syscall_fault
15287 1: movl (%ebp),%ebp
15288 +#endif
15289 +
15290 movl %ebp,PT_EBP(%esp)
15291 _ASM_EXTABLE(1b,syscall_fault)
15292
15293 GET_THREAD_INFO(%ebp)
15294
15295 +#ifdef CONFIG_PAX_RANDKSTACK
15296 + pax_erase_kstack
15297 +#endif
15298 +
15299 testl $_TIF_WORK_SYSCALL_ENTRY,TI_flags(%ebp)
15300 jnz sysenter_audit
15301 sysenter_do_call:
15302 @@ -427,12 +599,24 @@ sysenter_do_call:
15303 testl $_TIF_ALLWORK_MASK, %ecx
15304 jne sysexit_audit
15305 sysenter_exit:
15306 +
15307 +#ifdef CONFIG_PAX_RANDKSTACK
15308 + pushl_cfi %eax
15309 + movl %esp, %eax
15310 + call pax_randomize_kstack
15311 + popl_cfi %eax
15312 +#endif
15313 +
15314 + pax_erase_kstack
15315 +
15316 /* if something modifies registers it must also disable sysexit */
15317 movl PT_EIP(%esp), %edx
15318 movl PT_OLDESP(%esp), %ecx
15319 xorl %ebp,%ebp
15320 TRACE_IRQS_ON
15321 1: mov PT_FS(%esp), %fs
15322 +2: mov PT_DS(%esp), %ds
15323 +3: mov PT_ES(%esp), %es
15324 PTGS_TO_GS
15325 ENABLE_INTERRUPTS_SYSEXIT
15326
15327 @@ -449,6 +633,9 @@ sysenter_audit:
15328 movl %eax,%edx /* 2nd arg: syscall number */
15329 movl $AUDIT_ARCH_I386,%eax /* 1st arg: audit arch */
15330 call __audit_syscall_entry
15331 +
15332 + pax_erase_kstack
15333 +
15334 pushl_cfi %ebx
15335 movl PT_EAX(%esp),%eax /* reload syscall number */
15336 jmp sysenter_do_call
15337 @@ -474,10 +661,16 @@ sysexit_audit:
15338
15339 CFI_ENDPROC
15340 .pushsection .fixup,"ax"
15341 -2: movl $0,PT_FS(%esp)
15342 +4: movl $0,PT_FS(%esp)
15343 + jmp 1b
15344 +5: movl $0,PT_DS(%esp)
15345 + jmp 1b
15346 +6: movl $0,PT_ES(%esp)
15347 jmp 1b
15348 .popsection
15349 - _ASM_EXTABLE(1b,2b)
15350 + _ASM_EXTABLE(1b,4b)
15351 + _ASM_EXTABLE(2b,5b)
15352 + _ASM_EXTABLE(3b,6b)
15353 PTGS_TO_GS_EX
15354 ENDPROC(ia32_sysenter_target)
15355
15356 @@ -491,6 +684,11 @@ ENTRY(system_call)
15357 pushl_cfi %eax # save orig_eax
15358 SAVE_ALL
15359 GET_THREAD_INFO(%ebp)
15360 +
15361 +#ifdef CONFIG_PAX_RANDKSTACK
15362 + pax_erase_kstack
15363 +#endif
15364 +
15365 # system call tracing in operation / emulation
15366 testl $_TIF_WORK_SYSCALL_ENTRY,TI_flags(%ebp)
15367 jnz syscall_trace_entry
15368 @@ -509,6 +707,15 @@ syscall_exit:
15369 testl $_TIF_ALLWORK_MASK, %ecx # current->work
15370 jne syscall_exit_work
15371
15372 +restore_all_pax:
15373 +
15374 +#ifdef CONFIG_PAX_RANDKSTACK
15375 + movl %esp, %eax
15376 + call pax_randomize_kstack
15377 +#endif
15378 +
15379 + pax_erase_kstack
15380 +
15381 restore_all:
15382 TRACE_IRQS_IRET
15383 restore_all_notrace:
15384 @@ -565,14 +772,34 @@ ldt_ss:
15385 * compensating for the offset by changing to the ESPFIX segment with
15386 * a base address that matches for the difference.
15387 */
15388 -#define GDT_ESPFIX_SS PER_CPU_VAR(gdt_page) + (GDT_ENTRY_ESPFIX_SS * 8)
15389 +#define GDT_ESPFIX_SS (GDT_ENTRY_ESPFIX_SS * 8)(%ebx)
15390 mov %esp, %edx /* load kernel esp */
15391 mov PT_OLDESP(%esp), %eax /* load userspace esp */
15392 mov %dx, %ax /* eax: new kernel esp */
15393 sub %eax, %edx /* offset (low word is 0) */
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 shr $16, %edx
15402 - mov %dl, GDT_ESPFIX_SS + 4 /* bits 16..23 */
15403 - mov %dh, GDT_ESPFIX_SS + 7 /* bits 24..31 */
15404 +
15405 +#ifdef CONFIG_PAX_KERNEXEC
15406 + mov %cr0, %esi
15407 + btr $16, %esi
15408 + mov %esi, %cr0
15409 +#endif
15410 +
15411 + mov %dl, 4 + GDT_ESPFIX_SS /* bits 16..23 */
15412 + mov %dh, 7 + GDT_ESPFIX_SS /* bits 24..31 */
15413 +
15414 +#ifdef CONFIG_PAX_KERNEXEC
15415 + bts $16, %esi
15416 + mov %esi, %cr0
15417 +#endif
15418 +
15419 pushl_cfi $__ESPFIX_SS
15420 pushl_cfi %eax /* new kernel esp */
15421 /* Disable interrupts, but do not irqtrace this section: we
15422 @@ -601,35 +828,23 @@ work_resched:
15423 movl TI_flags(%ebp), %ecx
15424 andl $_TIF_WORK_MASK, %ecx # is there any work to be done other
15425 # than syscall tracing?
15426 - jz restore_all
15427 + jz restore_all_pax
15428 testb $_TIF_NEED_RESCHED, %cl
15429 jnz work_resched
15430
15431 work_notifysig: # deal with pending signals and
15432 # notify-resume requests
15433 + movl %esp, %eax
15434 #ifdef CONFIG_VM86
15435 testl $X86_EFLAGS_VM, PT_EFLAGS(%esp)
15436 - movl %esp, %eax
15437 - jne work_notifysig_v86 # returning to kernel-space or
15438 + jz 1f # returning to kernel-space or
15439 # vm86-space
15440 - TRACE_IRQS_ON
15441 - ENABLE_INTERRUPTS(CLBR_NONE)
15442 - movb PT_CS(%esp), %bl
15443 - andb $SEGMENT_RPL_MASK, %bl
15444 - cmpb $USER_RPL, %bl
15445 - jb resume_kernel
15446 - xorl %edx, %edx
15447 - call do_notify_resume
15448 - jmp resume_userspace
15449
15450 - ALIGN
15451 -work_notifysig_v86:
15452 pushl_cfi %ecx # save ti_flags for do_notify_resume
15453 call save_v86_state # %eax contains pt_regs pointer
15454 popl_cfi %ecx
15455 movl %eax, %esp
15456 -#else
15457 - movl %esp, %eax
15458 +1:
15459 #endif
15460 TRACE_IRQS_ON
15461 ENABLE_INTERRUPTS(CLBR_NONE)
15462 @@ -640,7 +855,7 @@ work_notifysig_v86:
15463 xorl %edx, %edx
15464 call do_notify_resume
15465 jmp resume_userspace
15466 -END(work_pending)
15467 +ENDPROC(work_pending)
15468
15469 # perform syscall exit tracing
15470 ALIGN
15471 @@ -648,11 +863,14 @@ syscall_trace_entry:
15472 movl $-ENOSYS,PT_EAX(%esp)
15473 movl %esp, %eax
15474 call syscall_trace_enter
15475 +
15476 + pax_erase_kstack
15477 +
15478 /* What it returned is what we'll actually use. */
15479 cmpl $(NR_syscalls), %eax
15480 jnae syscall_call
15481 jmp syscall_exit
15482 -END(syscall_trace_entry)
15483 +ENDPROC(syscall_trace_entry)
15484
15485 # perform syscall exit tracing
15486 ALIGN
15487 @@ -665,20 +883,24 @@ syscall_exit_work:
15488 movl %esp, %eax
15489 call syscall_trace_leave
15490 jmp resume_userspace
15491 -END(syscall_exit_work)
15492 +ENDPROC(syscall_exit_work)
15493 CFI_ENDPROC
15494
15495 RING0_INT_FRAME # can't unwind into user space anyway
15496 syscall_fault:
15497 +#ifdef CONFIG_PAX_MEMORY_UDEREF
15498 + push %ss
15499 + pop %ds
15500 +#endif
15501 GET_THREAD_INFO(%ebp)
15502 movl $-EFAULT,PT_EAX(%esp)
15503 jmp resume_userspace
15504 -END(syscall_fault)
15505 +ENDPROC(syscall_fault)
15506
15507 syscall_badsys:
15508 movl $-ENOSYS,PT_EAX(%esp)
15509 jmp resume_userspace
15510 -END(syscall_badsys)
15511 +ENDPROC(syscall_badsys)
15512 CFI_ENDPROC
15513 /*
15514 * End of kprobes section
15515 @@ -750,6 +972,36 @@ ENTRY(ptregs_clone)
15516 CFI_ENDPROC
15517 ENDPROC(ptregs_clone)
15518
15519 + ALIGN;
15520 +ENTRY(kernel_execve)
15521 + CFI_STARTPROC
15522 + pushl_cfi %ebp
15523 + sub $PT_OLDSS+4,%esp
15524 + pushl_cfi %edi
15525 + pushl_cfi %ecx
15526 + pushl_cfi %eax
15527 + lea 3*4(%esp),%edi
15528 + mov $PT_OLDSS/4+1,%ecx
15529 + xorl %eax,%eax
15530 + rep stosl
15531 + popl_cfi %eax
15532 + popl_cfi %ecx
15533 + popl_cfi %edi
15534 + movl $X86_EFLAGS_IF,PT_EFLAGS(%esp)
15535 + pushl_cfi %esp
15536 + call sys_execve
15537 + add $4,%esp
15538 + CFI_ADJUST_CFA_OFFSET -4
15539 + GET_THREAD_INFO(%ebp)
15540 + test %eax,%eax
15541 + jz syscall_exit
15542 + add $PT_OLDSS+4,%esp
15543 + CFI_ADJUST_CFA_OFFSET -PT_OLDSS-4
15544 + popl_cfi %ebp
15545 + ret
15546 + CFI_ENDPROC
15547 +ENDPROC(kernel_execve)
15548 +
15549 .macro FIXUP_ESPFIX_STACK
15550 /*
15551 * Switch back for ESPFIX stack to the normal zerobased stack
15552 @@ -759,8 +1011,15 @@ ENDPROC(ptregs_clone)
15553 * normal stack and adjusts ESP with the matching offset.
15554 */
15555 /* fixup the stack */
15556 - mov GDT_ESPFIX_SS + 4, %al /* bits 16..23 */
15557 - mov GDT_ESPFIX_SS + 7, %ah /* bits 24..31 */
15558 +#ifdef CONFIG_SMP
15559 + movl PER_CPU_VAR(cpu_number), %ebx
15560 + shll $PAGE_SHIFT_asm, %ebx
15561 + addl $cpu_gdt_table, %ebx
15562 +#else
15563 + movl $cpu_gdt_table, %ebx
15564 +#endif
15565 + mov 4 + GDT_ESPFIX_SS, %al /* bits 16..23 */
15566 + mov 7 + GDT_ESPFIX_SS, %ah /* bits 24..31 */
15567 shl $16, %eax
15568 addl %esp, %eax /* the adjusted stack pointer */
15569 pushl_cfi $__KERNEL_DS
15570 @@ -813,7 +1072,7 @@ vector=vector+1
15571 .endr
15572 2: jmp common_interrupt
15573 .endr
15574 -END(irq_entries_start)
15575 +ENDPROC(irq_entries_start)
15576
15577 .previous
15578 END(interrupt)
15579 @@ -861,7 +1120,7 @@ ENTRY(coprocessor_error)
15580 pushl_cfi $do_coprocessor_error
15581 jmp error_code
15582 CFI_ENDPROC
15583 -END(coprocessor_error)
15584 +ENDPROC(coprocessor_error)
15585
15586 ENTRY(simd_coprocessor_error)
15587 RING0_INT_FRAME
15588 @@ -882,7 +1141,7 @@ ENTRY(simd_coprocessor_error)
15589 #endif
15590 jmp error_code
15591 CFI_ENDPROC
15592 -END(simd_coprocessor_error)
15593 +ENDPROC(simd_coprocessor_error)
15594
15595 ENTRY(device_not_available)
15596 RING0_INT_FRAME
15597 @@ -890,18 +1149,18 @@ ENTRY(device_not_available)
15598 pushl_cfi $do_device_not_available
15599 jmp error_code
15600 CFI_ENDPROC
15601 -END(device_not_available)
15602 +ENDPROC(device_not_available)
15603
15604 #ifdef CONFIG_PARAVIRT
15605 ENTRY(native_iret)
15606 iret
15607 _ASM_EXTABLE(native_iret, iret_exc)
15608 -END(native_iret)
15609 +ENDPROC(native_iret)
15610
15611 ENTRY(native_irq_enable_sysexit)
15612 sti
15613 sysexit
15614 -END(native_irq_enable_sysexit)
15615 +ENDPROC(native_irq_enable_sysexit)
15616 #endif
15617
15618 ENTRY(overflow)
15619 @@ -910,7 +1169,7 @@ ENTRY(overflow)
15620 pushl_cfi $do_overflow
15621 jmp error_code
15622 CFI_ENDPROC
15623 -END(overflow)
15624 +ENDPROC(overflow)
15625
15626 ENTRY(bounds)
15627 RING0_INT_FRAME
15628 @@ -918,7 +1177,7 @@ ENTRY(bounds)
15629 pushl_cfi $do_bounds
15630 jmp error_code
15631 CFI_ENDPROC
15632 -END(bounds)
15633 +ENDPROC(bounds)
15634
15635 ENTRY(invalid_op)
15636 RING0_INT_FRAME
15637 @@ -926,7 +1185,7 @@ ENTRY(invalid_op)
15638 pushl_cfi $do_invalid_op
15639 jmp error_code
15640 CFI_ENDPROC
15641 -END(invalid_op)
15642 +ENDPROC(invalid_op)
15643
15644 ENTRY(coprocessor_segment_overrun)
15645 RING0_INT_FRAME
15646 @@ -934,35 +1193,35 @@ ENTRY(coprocessor_segment_overrun)
15647 pushl_cfi $do_coprocessor_segment_overrun
15648 jmp error_code
15649 CFI_ENDPROC
15650 -END(coprocessor_segment_overrun)
15651 +ENDPROC(coprocessor_segment_overrun)
15652
15653 ENTRY(invalid_TSS)
15654 RING0_EC_FRAME
15655 pushl_cfi $do_invalid_TSS
15656 jmp error_code
15657 CFI_ENDPROC
15658 -END(invalid_TSS)
15659 +ENDPROC(invalid_TSS)
15660
15661 ENTRY(segment_not_present)
15662 RING0_EC_FRAME
15663 pushl_cfi $do_segment_not_present
15664 jmp error_code
15665 CFI_ENDPROC
15666 -END(segment_not_present)
15667 +ENDPROC(segment_not_present)
15668
15669 ENTRY(stack_segment)
15670 RING0_EC_FRAME
15671 pushl_cfi $do_stack_segment
15672 jmp error_code
15673 CFI_ENDPROC
15674 -END(stack_segment)
15675 +ENDPROC(stack_segment)
15676
15677 ENTRY(alignment_check)
15678 RING0_EC_FRAME
15679 pushl_cfi $do_alignment_check
15680 jmp error_code
15681 CFI_ENDPROC
15682 -END(alignment_check)
15683 +ENDPROC(alignment_check)
15684
15685 ENTRY(divide_error)
15686 RING0_INT_FRAME
15687 @@ -970,7 +1229,7 @@ ENTRY(divide_error)
15688 pushl_cfi $do_divide_error
15689 jmp error_code
15690 CFI_ENDPROC
15691 -END(divide_error)
15692 +ENDPROC(divide_error)
15693
15694 #ifdef CONFIG_X86_MCE
15695 ENTRY(machine_check)
15696 @@ -979,7 +1238,7 @@ ENTRY(machine_check)
15697 pushl_cfi machine_check_vector
15698 jmp error_code
15699 CFI_ENDPROC
15700 -END(machine_check)
15701 +ENDPROC(machine_check)
15702 #endif
15703
15704 ENTRY(spurious_interrupt_bug)
15705 @@ -988,7 +1247,7 @@ ENTRY(spurious_interrupt_bug)
15706 pushl_cfi $do_spurious_interrupt_bug
15707 jmp error_code
15708 CFI_ENDPROC
15709 -END(spurious_interrupt_bug)
15710 +ENDPROC(spurious_interrupt_bug)
15711 /*
15712 * End of kprobes section
15713 */
15714 @@ -1102,7 +1361,7 @@ BUILD_INTERRUPT3(xen_hvm_callback_vector, XEN_HVM_EVTCHN_CALLBACK,
15715
15716 ENTRY(mcount)
15717 ret
15718 -END(mcount)
15719 +ENDPROC(mcount)
15720
15721 ENTRY(ftrace_caller)
15722 cmpl $0, function_trace_stop
15723 @@ -1131,7 +1390,7 @@ ftrace_graph_call:
15724 .globl ftrace_stub
15725 ftrace_stub:
15726 ret
15727 -END(ftrace_caller)
15728 +ENDPROC(ftrace_caller)
15729
15730 #else /* ! CONFIG_DYNAMIC_FTRACE */
15731
15732 @@ -1167,7 +1426,7 @@ trace:
15733 popl %ecx
15734 popl %eax
15735 jmp ftrace_stub
15736 -END(mcount)
15737 +ENDPROC(mcount)
15738 #endif /* CONFIG_DYNAMIC_FTRACE */
15739 #endif /* CONFIG_FUNCTION_TRACER */
15740
15741 @@ -1188,7 +1447,7 @@ ENTRY(ftrace_graph_caller)
15742 popl %ecx
15743 popl %eax
15744 ret
15745 -END(ftrace_graph_caller)
15746 +ENDPROC(ftrace_graph_caller)
15747
15748 .globl return_to_handler
15749 return_to_handler:
15750 @@ -1243,15 +1502,18 @@ error_code:
15751 movl $-1, PT_ORIG_EAX(%esp) # no syscall to restart
15752 REG_TO_PTGS %ecx
15753 SET_KERNEL_GS %ecx
15754 - movl $(__USER_DS), %ecx
15755 + movl $(__KERNEL_DS), %ecx
15756 movl %ecx, %ds
15757 movl %ecx, %es
15758 +
15759 + pax_enter_kernel
15760 +
15761 TRACE_IRQS_OFF
15762 movl %esp,%eax # pt_regs pointer
15763 call *%edi
15764 jmp ret_from_exception
15765 CFI_ENDPROC
15766 -END(page_fault)
15767 +ENDPROC(page_fault)
15768
15769 /*
15770 * Debug traps and NMI can happen at the one SYSENTER instruction
15771 @@ -1293,7 +1555,7 @@ debug_stack_correct:
15772 call do_debug
15773 jmp ret_from_exception
15774 CFI_ENDPROC
15775 -END(debug)
15776 +ENDPROC(debug)
15777
15778 /*
15779 * NMI is doubly nasty. It can happen _while_ we're handling
15780 @@ -1330,6 +1592,9 @@ nmi_stack_correct:
15781 xorl %edx,%edx # zero error code
15782 movl %esp,%eax # pt_regs pointer
15783 call do_nmi
15784 +
15785 + pax_exit_kernel
15786 +
15787 jmp restore_all_notrace
15788 CFI_ENDPROC
15789
15790 @@ -1366,12 +1631,15 @@ nmi_espfix_stack:
15791 FIXUP_ESPFIX_STACK # %eax == %esp
15792 xorl %edx,%edx # zero error code
15793 call do_nmi
15794 +
15795 + pax_exit_kernel
15796 +
15797 RESTORE_REGS
15798 lss 12+4(%esp), %esp # back to espfix stack
15799 CFI_ADJUST_CFA_OFFSET -24
15800 jmp irq_return
15801 CFI_ENDPROC
15802 -END(nmi)
15803 +ENDPROC(nmi)
15804
15805 ENTRY(int3)
15806 RING0_INT_FRAME
15807 @@ -1383,14 +1651,14 @@ ENTRY(int3)
15808 call do_int3
15809 jmp ret_from_exception
15810 CFI_ENDPROC
15811 -END(int3)
15812 +ENDPROC(int3)
15813
15814 ENTRY(general_protection)
15815 RING0_EC_FRAME
15816 pushl_cfi $do_general_protection
15817 jmp error_code
15818 CFI_ENDPROC
15819 -END(general_protection)
15820 +ENDPROC(general_protection)
15821
15822 #ifdef CONFIG_KVM_GUEST
15823 ENTRY(async_page_fault)
15824 @@ -1398,7 +1666,7 @@ ENTRY(async_page_fault)
15825 pushl_cfi $do_async_page_fault
15826 jmp error_code
15827 CFI_ENDPROC
15828 -END(async_page_fault)
15829 +ENDPROC(async_page_fault)
15830 #endif
15831
15832 /*
15833 diff --git a/arch/x86/kernel/entry_64.S b/arch/x86/kernel/entry_64.S
15834 index dcdd0ea..8f32835 100644
15835 --- a/arch/x86/kernel/entry_64.S
15836 +++ b/arch/x86/kernel/entry_64.S
15837 @@ -57,6 +57,8 @@
15838 #include <asm/percpu.h>
15839 #include <asm/asm.h>
15840 #include <linux/err.h>
15841 +#include <asm/pgtable.h>
15842 +#include <asm/alternative-asm.h>
15843
15844 /* Avoid __ASSEMBLER__'ifying <linux/audit.h> just for this. */
15845 #include <linux/elf-em.h>
15846 @@ -70,8 +72,9 @@
15847 #ifdef CONFIG_FUNCTION_TRACER
15848 #ifdef CONFIG_DYNAMIC_FTRACE
15849 ENTRY(mcount)
15850 + pax_force_retaddr
15851 retq
15852 -END(mcount)
15853 +ENDPROC(mcount)
15854
15855 ENTRY(ftrace_caller)
15856 cmpl $0, function_trace_stop
15857 @@ -94,8 +97,9 @@ GLOBAL(ftrace_graph_call)
15858 #endif
15859
15860 GLOBAL(ftrace_stub)
15861 + pax_force_retaddr
15862 retq
15863 -END(ftrace_caller)
15864 +ENDPROC(ftrace_caller)
15865
15866 #else /* ! CONFIG_DYNAMIC_FTRACE */
15867 ENTRY(mcount)
15868 @@ -114,6 +118,7 @@ ENTRY(mcount)
15869 #endif
15870
15871 GLOBAL(ftrace_stub)
15872 + pax_force_retaddr
15873 retq
15874
15875 trace:
15876 @@ -123,12 +128,13 @@ trace:
15877 movq 8(%rbp), %rsi
15878 subq $MCOUNT_INSN_SIZE, %rdi
15879
15880 + pax_force_fptr ftrace_trace_function
15881 call *ftrace_trace_function
15882
15883 MCOUNT_RESTORE_FRAME
15884
15885 jmp ftrace_stub
15886 -END(mcount)
15887 +ENDPROC(mcount)
15888 #endif /* CONFIG_DYNAMIC_FTRACE */
15889 #endif /* CONFIG_FUNCTION_TRACER */
15890
15891 @@ -148,8 +154,9 @@ ENTRY(ftrace_graph_caller)
15892
15893 MCOUNT_RESTORE_FRAME
15894
15895 + pax_force_retaddr
15896 retq
15897 -END(ftrace_graph_caller)
15898 +ENDPROC(ftrace_graph_caller)
15899
15900 GLOBAL(return_to_handler)
15901 subq $24, %rsp
15902 @@ -165,6 +172,7 @@ GLOBAL(return_to_handler)
15903 movq 8(%rsp), %rdx
15904 movq (%rsp), %rax
15905 addq $24, %rsp
15906 + pax_force_fptr %rdi
15907 jmp *%rdi
15908 #endif
15909
15910 @@ -180,6 +188,273 @@ ENTRY(native_usergs_sysret64)
15911 ENDPROC(native_usergs_sysret64)
15912 #endif /* CONFIG_PARAVIRT */
15913
15914 + .macro ljmpq sel, off
15915 +#if defined(CONFIG_MPSC) || defined(CONFIG_MCORE2) || defined (CONFIG_MATOM)
15916 + .byte 0x48; ljmp *1234f(%rip)
15917 + .pushsection .rodata
15918 + .align 16
15919 + 1234: .quad \off; .word \sel
15920 + .popsection
15921 +#else
15922 + pushq $\sel
15923 + pushq $\off
15924 + lretq
15925 +#endif
15926 + .endm
15927 +
15928 + .macro pax_enter_kernel
15929 + pax_set_fptr_mask
15930 +#ifdef CONFIG_PAX_KERNEXEC
15931 + call pax_enter_kernel
15932 +#endif
15933 + .endm
15934 +
15935 + .macro pax_exit_kernel
15936 +#ifdef CONFIG_PAX_KERNEXEC
15937 + call pax_exit_kernel
15938 +#endif
15939 + .endm
15940 +
15941 +#ifdef CONFIG_PAX_KERNEXEC
15942 +ENTRY(pax_enter_kernel)
15943 + pushq %rdi
15944 +
15945 +#ifdef CONFIG_PARAVIRT
15946 + PV_SAVE_REGS(CLBR_RDI)
15947 +#endif
15948 +
15949 + GET_CR0_INTO_RDI
15950 + bts $16,%rdi
15951 + jnc 3f
15952 + mov %cs,%edi
15953 + cmp $__KERNEL_CS,%edi
15954 + jnz 2f
15955 +1:
15956 +
15957 +#ifdef CONFIG_PARAVIRT
15958 + PV_RESTORE_REGS(CLBR_RDI)
15959 +#endif
15960 +
15961 + popq %rdi
15962 + pax_force_retaddr
15963 + retq
15964 +
15965 +2: ljmpq __KERNEL_CS,1f
15966 +3: ljmpq __KERNEXEC_KERNEL_CS,4f
15967 +4: SET_RDI_INTO_CR0
15968 + jmp 1b
15969 +ENDPROC(pax_enter_kernel)
15970 +
15971 +ENTRY(pax_exit_kernel)
15972 + pushq %rdi
15973 +
15974 +#ifdef CONFIG_PARAVIRT
15975 + PV_SAVE_REGS(CLBR_RDI)
15976 +#endif
15977 +
15978 + mov %cs,%rdi
15979 + cmp $__KERNEXEC_KERNEL_CS,%edi
15980 + jz 2f
15981 +1:
15982 +
15983 +#ifdef CONFIG_PARAVIRT
15984 + PV_RESTORE_REGS(CLBR_RDI);
15985 +#endif
15986 +
15987 + popq %rdi
15988 + pax_force_retaddr
15989 + retq
15990 +
15991 +2: GET_CR0_INTO_RDI
15992 + btr $16,%rdi
15993 + ljmpq __KERNEL_CS,3f
15994 +3: SET_RDI_INTO_CR0
15995 + jmp 1b
15996 +ENDPROC(pax_exit_kernel)
15997 +#endif
15998 +
15999 + .macro pax_enter_kernel_user
16000 + pax_set_fptr_mask
16001 +#ifdef CONFIG_PAX_MEMORY_UDEREF
16002 + call pax_enter_kernel_user
16003 +#endif
16004 + .endm
16005 +
16006 + .macro pax_exit_kernel_user
16007 +#ifdef CONFIG_PAX_MEMORY_UDEREF
16008 + call pax_exit_kernel_user
16009 +#endif
16010 +#ifdef CONFIG_PAX_RANDKSTACK
16011 + pushq %rax
16012 + call pax_randomize_kstack
16013 + popq %rax
16014 +#endif
16015 + .endm
16016 +
16017 +#ifdef CONFIG_PAX_MEMORY_UDEREF
16018 +ENTRY(pax_enter_kernel_user)
16019 + pushq %rdi
16020 + pushq %rbx
16021 +
16022 +#ifdef CONFIG_PARAVIRT
16023 + PV_SAVE_REGS(CLBR_RDI)
16024 +#endif
16025 +
16026 + GET_CR3_INTO_RDI
16027 + mov %rdi,%rbx
16028 + add $__START_KERNEL_map,%rbx
16029 + sub phys_base(%rip),%rbx
16030 +
16031 +#ifdef CONFIG_PARAVIRT
16032 + pushq %rdi
16033 + cmpl $0, pv_info+PARAVIRT_enabled
16034 + jz 1f
16035 + i = 0
16036 + .rept USER_PGD_PTRS
16037 + mov i*8(%rbx),%rsi
16038 + mov $0,%sil
16039 + lea i*8(%rbx),%rdi
16040 + call PARA_INDIRECT(pv_mmu_ops+PV_MMU_set_pgd_batched)
16041 + i = i + 1
16042 + .endr
16043 + jmp 2f
16044 +1:
16045 +#endif
16046 +
16047 + i = 0
16048 + .rept USER_PGD_PTRS
16049 + movb $0,i*8(%rbx)
16050 + i = i + 1
16051 + .endr
16052 +
16053 +#ifdef CONFIG_PARAVIRT
16054 +2: popq %rdi
16055 +#endif
16056 + SET_RDI_INTO_CR3
16057 +
16058 +#ifdef CONFIG_PAX_KERNEXEC
16059 + GET_CR0_INTO_RDI
16060 + bts $16,%rdi
16061 + SET_RDI_INTO_CR0
16062 +#endif
16063 +
16064 +#ifdef CONFIG_PARAVIRT
16065 + PV_RESTORE_REGS(CLBR_RDI)
16066 +#endif
16067 +
16068 + popq %rbx
16069 + popq %rdi
16070 + pax_force_retaddr
16071 + retq
16072 +ENDPROC(pax_enter_kernel_user)
16073 +
16074 +ENTRY(pax_exit_kernel_user)
16075 + push %rdi
16076 +
16077 +#ifdef CONFIG_PARAVIRT
16078 + pushq %rbx
16079 + PV_SAVE_REGS(CLBR_RDI)
16080 +#endif
16081 +
16082 +#ifdef CONFIG_PAX_KERNEXEC
16083 + GET_CR0_INTO_RDI
16084 + btr $16,%rdi
16085 + SET_RDI_INTO_CR0
16086 +#endif
16087 +
16088 + GET_CR3_INTO_RDI
16089 + add $__START_KERNEL_map,%rdi
16090 + sub phys_base(%rip),%rdi
16091 +
16092 +#ifdef CONFIG_PARAVIRT
16093 + cmpl $0, pv_info+PARAVIRT_enabled
16094 + jz 1f
16095 + mov %rdi,%rbx
16096 + i = 0
16097 + .rept USER_PGD_PTRS
16098 + mov i*8(%rbx),%rsi
16099 + mov $0x67,%sil
16100 + lea i*8(%rbx),%rdi
16101 + call PARA_INDIRECT(pv_mmu_ops+PV_MMU_set_pgd_batched)
16102 + i = i + 1
16103 + .endr
16104 + jmp 2f
16105 +1:
16106 +#endif
16107 +
16108 + i = 0
16109 + .rept USER_PGD_PTRS
16110 + movb $0x67,i*8(%rdi)
16111 + i = i + 1
16112 + .endr
16113 +
16114 +#ifdef CONFIG_PARAVIRT
16115 +2: PV_RESTORE_REGS(CLBR_RDI)
16116 + popq %rbx
16117 +#endif
16118 +
16119 + popq %rdi
16120 + pax_force_retaddr
16121 + retq
16122 +ENDPROC(pax_exit_kernel_user)
16123 +#endif
16124 +
16125 +.macro pax_erase_kstack
16126 +#ifdef CONFIG_PAX_MEMORY_STACKLEAK
16127 + call pax_erase_kstack
16128 +#endif
16129 +.endm
16130 +
16131 +#ifdef CONFIG_PAX_MEMORY_STACKLEAK
16132 +ENTRY(pax_erase_kstack)
16133 + pushq %rdi
16134 + pushq %rcx
16135 + pushq %rax
16136 + pushq %r11
16137 +
16138 + GET_THREAD_INFO(%r11)
16139 + mov TI_lowest_stack(%r11), %rdi
16140 + mov $-0xBEEF, %rax
16141 + std
16142 +
16143 +1: mov %edi, %ecx
16144 + and $THREAD_SIZE_asm - 1, %ecx
16145 + shr $3, %ecx
16146 + repne scasq
16147 + jecxz 2f
16148 +
16149 + cmp $2*8, %ecx
16150 + jc 2f
16151 +
16152 + mov $2*8, %ecx
16153 + repe scasq
16154 + jecxz 2f
16155 + jne 1b
16156 +
16157 +2: cld
16158 + mov %esp, %ecx
16159 + sub %edi, %ecx
16160 +
16161 + cmp $THREAD_SIZE_asm, %rcx
16162 + jb 3f
16163 + ud2
16164 +3:
16165 +
16166 + shr $3, %ecx
16167 + rep stosq
16168 +
16169 + mov TI_task_thread_sp0(%r11), %rdi
16170 + sub $256, %rdi
16171 + mov %rdi, TI_lowest_stack(%r11)
16172 +
16173 + popq %r11
16174 + popq %rax
16175 + popq %rcx
16176 + popq %rdi
16177 + pax_force_retaddr
16178 + ret
16179 +ENDPROC(pax_erase_kstack)
16180 +#endif
16181
16182 .macro TRACE_IRQS_IRETQ offset=ARGOFFSET
16183 #ifdef CONFIG_TRACE_IRQFLAGS
16184 @@ -271,8 +546,8 @@ ENDPROC(native_usergs_sysret64)
16185 .endm
16186
16187 .macro UNFAKE_STACK_FRAME
16188 - addq $8*6, %rsp
16189 - CFI_ADJUST_CFA_OFFSET -(6*8)
16190 + addq $8*6 + ARG_SKIP, %rsp
16191 + CFI_ADJUST_CFA_OFFSET -(6*8 + ARG_SKIP)
16192 .endm
16193
16194 /*
16195 @@ -359,7 +634,7 @@ ENDPROC(native_usergs_sysret64)
16196 movq %rsp, %rsi
16197
16198 leaq -RBP(%rsp),%rdi /* arg1 for handler */
16199 - testl $3, CS-RBP(%rsi)
16200 + testb $3, CS-RBP(%rsi)
16201 je 1f
16202 SWAPGS
16203 /*
16204 @@ -394,9 +669,10 @@ ENTRY(save_rest)
16205 movq_cfi r15, R15+16
16206 movq %r11, 8(%rsp) /* return address */
16207 FIXUP_TOP_OF_STACK %r11, 16
16208 + pax_force_retaddr
16209 ret
16210 CFI_ENDPROC
16211 -END(save_rest)
16212 +ENDPROC(save_rest)
16213
16214 /* save complete stack frame */
16215 .pushsection .kprobes.text, "ax"
16216 @@ -425,9 +701,10 @@ ENTRY(save_paranoid)
16217 js 1f /* negative -> in kernel */
16218 SWAPGS
16219 xorl %ebx,%ebx
16220 -1: ret
16221 +1: pax_force_retaddr_bts
16222 + ret
16223 CFI_ENDPROC
16224 -END(save_paranoid)
16225 +ENDPROC(save_paranoid)
16226 .popsection
16227
16228 /*
16229 @@ -449,7 +726,7 @@ ENTRY(ret_from_fork)
16230
16231 RESTORE_REST
16232
16233 - testl $3, CS-ARGOFFSET(%rsp) # from kernel_thread?
16234 + testb $3, CS-ARGOFFSET(%rsp) # from kernel_thread?
16235 jz retint_restore_args
16236
16237 testl $_TIF_IA32, TI_flags(%rcx) # 32-bit compat task needs IRET
16238 @@ -459,7 +736,7 @@ ENTRY(ret_from_fork)
16239 jmp ret_from_sys_call # go to the SYSRET fastpath
16240
16241 CFI_ENDPROC
16242 -END(ret_from_fork)
16243 +ENDPROC(ret_from_fork)
16244
16245 /*
16246 * System call entry. Up to 6 arguments in registers are supported.
16247 @@ -495,7 +772,7 @@ END(ret_from_fork)
16248 ENTRY(system_call)
16249 CFI_STARTPROC simple
16250 CFI_SIGNAL_FRAME
16251 - CFI_DEF_CFA rsp,KERNEL_STACK_OFFSET
16252 + CFI_DEF_CFA rsp,0
16253 CFI_REGISTER rip,rcx
16254 /*CFI_REGISTER rflags,r11*/
16255 SWAPGS_UNSAFE_STACK
16256 @@ -508,16 +785,23 @@ GLOBAL(system_call_after_swapgs)
16257
16258 movq %rsp,PER_CPU_VAR(old_rsp)
16259 movq PER_CPU_VAR(kernel_stack),%rsp
16260 + SAVE_ARGS 8*6,0
16261 + pax_enter_kernel_user
16262 +
16263 +#ifdef CONFIG_PAX_RANDKSTACK
16264 + pax_erase_kstack
16265 +#endif
16266 +
16267 /*
16268 * No need to follow this irqs off/on section - it's straight
16269 * and short:
16270 */
16271 ENABLE_INTERRUPTS(CLBR_NONE)
16272 - SAVE_ARGS 8,0
16273 movq %rax,ORIG_RAX-ARGOFFSET(%rsp)
16274 movq %rcx,RIP-ARGOFFSET(%rsp)
16275 CFI_REL_OFFSET rip,RIP-ARGOFFSET
16276 - testl $_TIF_WORK_SYSCALL_ENTRY,TI_flags+THREAD_INFO(%rsp,RIP-ARGOFFSET)
16277 + GET_THREAD_INFO(%rcx)
16278 + testl $_TIF_WORK_SYSCALL_ENTRY,TI_flags(%rcx)
16279 jnz tracesys
16280 system_call_fastpath:
16281 #if __SYSCALL_MASK == ~0
16282 @@ -527,7 +811,7 @@ system_call_fastpath:
16283 cmpl $__NR_syscall_max,%eax
16284 #endif
16285 ja badsys
16286 - movq %r10,%rcx
16287 + movq R10-ARGOFFSET(%rsp),%rcx
16288 call *sys_call_table(,%rax,8) # XXX: rip relative
16289 movq %rax,RAX-ARGOFFSET(%rsp)
16290 /*
16291 @@ -541,10 +825,13 @@ sysret_check:
16292 LOCKDEP_SYS_EXIT
16293 DISABLE_INTERRUPTS(CLBR_NONE)
16294 TRACE_IRQS_OFF
16295 - movl TI_flags+THREAD_INFO(%rsp,RIP-ARGOFFSET),%edx
16296 + GET_THREAD_INFO(%rcx)
16297 + movl TI_flags(%rcx),%edx
16298 andl %edi,%edx
16299 jnz sysret_careful
16300 CFI_REMEMBER_STATE
16301 + pax_exit_kernel_user
16302 + pax_erase_kstack
16303 /*
16304 * sysretq will re-enable interrupts:
16305 */
16306 @@ -596,14 +883,18 @@ badsys:
16307 * jump back to the normal fast path.
16308 */
16309 auditsys:
16310 - movq %r10,%r9 /* 6th arg: 4th syscall arg */
16311 + movq R10-ARGOFFSET(%rsp),%r9 /* 6th arg: 4th syscall arg */
16312 movq %rdx,%r8 /* 5th arg: 3rd syscall arg */
16313 movq %rsi,%rcx /* 4th arg: 2nd syscall arg */
16314 movq %rdi,%rdx /* 3rd arg: 1st syscall arg */
16315 movq %rax,%rsi /* 2nd arg: syscall number */
16316 movl $AUDIT_ARCH_X86_64,%edi /* 1st arg: audit arch */
16317 call __audit_syscall_entry
16318 +
16319 + pax_erase_kstack
16320 +
16321 LOAD_ARGS 0 /* reload call-clobbered registers */
16322 + pax_set_fptr_mask
16323 jmp system_call_fastpath
16324
16325 /*
16326 @@ -624,7 +915,7 @@ sysret_audit:
16327 /* Do syscall tracing */
16328 tracesys:
16329 #ifdef CONFIG_AUDITSYSCALL
16330 - testl $(_TIF_WORK_SYSCALL_ENTRY & ~_TIF_SYSCALL_AUDIT),TI_flags+THREAD_INFO(%rsp,RIP-ARGOFFSET)
16331 + testl $(_TIF_WORK_SYSCALL_ENTRY & ~_TIF_SYSCALL_AUDIT),TI_flags(%rcx)
16332 jz auditsys
16333 #endif
16334 SAVE_REST
16335 @@ -632,12 +923,16 @@ tracesys:
16336 FIXUP_TOP_OF_STACK %rdi
16337 movq %rsp,%rdi
16338 call syscall_trace_enter
16339 +
16340 + pax_erase_kstack
16341 +
16342 /*
16343 * Reload arg registers from stack in case ptrace changed them.
16344 * We don't reload %rax because syscall_trace_enter() returned
16345 * the value it wants us to use in the table lookup.
16346 */
16347 LOAD_ARGS ARGOFFSET, 1
16348 + pax_set_fptr_mask
16349 RESTORE_REST
16350 #if __SYSCALL_MASK == ~0
16351 cmpq $__NR_syscall_max,%rax
16352 @@ -646,7 +941,7 @@ tracesys:
16353 cmpl $__NR_syscall_max,%eax
16354 #endif
16355 ja int_ret_from_sys_call /* RAX(%rsp) set to -ENOSYS above */
16356 - movq %r10,%rcx /* fixup for C */
16357 + movq R10-ARGOFFSET(%rsp),%rcx /* fixup for C */
16358 call *sys_call_table(,%rax,8)
16359 movq %rax,RAX-ARGOFFSET(%rsp)
16360 /* Use IRET because user could have changed frame */
16361 @@ -667,7 +962,9 @@ GLOBAL(int_with_check)
16362 andl %edi,%edx
16363 jnz int_careful
16364 andl $~TS_COMPAT,TI_status(%rcx)
16365 - jmp retint_swapgs
16366 + pax_exit_kernel_user
16367 + pax_erase_kstack
16368 + jmp retint_swapgs_pax
16369
16370 /* Either reschedule or signal or syscall exit tracking needed. */
16371 /* First do a reschedule test. */
16372 @@ -713,7 +1010,7 @@ int_restore_rest:
16373 TRACE_IRQS_OFF
16374 jmp int_with_check
16375 CFI_ENDPROC
16376 -END(system_call)
16377 +ENDPROC(system_call)
16378
16379 /*
16380 * Certain special system calls that need to save a complete full stack frame.
16381 @@ -729,7 +1026,7 @@ ENTRY(\label)
16382 call \func
16383 jmp ptregscall_common
16384 CFI_ENDPROC
16385 -END(\label)
16386 +ENDPROC(\label)
16387 .endm
16388
16389 PTREGSCALL stub_clone, sys_clone, %r8
16390 @@ -747,9 +1044,10 @@ ENTRY(ptregscall_common)
16391 movq_cfi_restore R12+8, r12
16392 movq_cfi_restore RBP+8, rbp
16393 movq_cfi_restore RBX+8, rbx
16394 + pax_force_retaddr
16395 ret $REST_SKIP /* pop extended registers */
16396 CFI_ENDPROC
16397 -END(ptregscall_common)
16398 +ENDPROC(ptregscall_common)
16399
16400 ENTRY(stub_execve)
16401 CFI_STARTPROC
16402 @@ -764,7 +1062,7 @@ ENTRY(stub_execve)
16403 RESTORE_REST
16404 jmp int_ret_from_sys_call
16405 CFI_ENDPROC
16406 -END(stub_execve)
16407 +ENDPROC(stub_execve)
16408
16409 /*
16410 * sigreturn is special because it needs to restore all registers on return.
16411 @@ -782,7 +1080,7 @@ ENTRY(stub_rt_sigreturn)
16412 RESTORE_REST
16413 jmp int_ret_from_sys_call
16414 CFI_ENDPROC
16415 -END(stub_rt_sigreturn)
16416 +ENDPROC(stub_rt_sigreturn)
16417
16418 #ifdef CONFIG_X86_X32_ABI
16419 PTREGSCALL stub_x32_sigaltstack, sys32_sigaltstack, %rdx
16420 @@ -851,7 +1149,7 @@ vector=vector+1
16421 2: jmp common_interrupt
16422 .endr
16423 CFI_ENDPROC
16424 -END(irq_entries_start)
16425 +ENDPROC(irq_entries_start)
16426
16427 .previous
16428 END(interrupt)
16429 @@ -871,6 +1169,16 @@ END(interrupt)
16430 subq $ORIG_RAX-RBP, %rsp
16431 CFI_ADJUST_CFA_OFFSET ORIG_RAX-RBP
16432 SAVE_ARGS_IRQ
16433 +#ifdef CONFIG_PAX_MEMORY_UDEREF
16434 + testb $3, CS(%rdi)
16435 + jnz 1f
16436 + pax_enter_kernel
16437 + jmp 2f
16438 +1: pax_enter_kernel_user
16439 +2:
16440 +#else
16441 + pax_enter_kernel
16442 +#endif
16443 call \func
16444 .endm
16445
16446 @@ -902,7 +1210,7 @@ ret_from_intr:
16447
16448 exit_intr:
16449 GET_THREAD_INFO(%rcx)
16450 - testl $3,CS-ARGOFFSET(%rsp)
16451 + testb $3,CS-ARGOFFSET(%rsp)
16452 je retint_kernel
16453
16454 /* Interrupt came from user space */
16455 @@ -924,12 +1232,16 @@ retint_swapgs: /* return to user-space */
16456 * The iretq could re-enable interrupts:
16457 */
16458 DISABLE_INTERRUPTS(CLBR_ANY)
16459 + pax_exit_kernel_user
16460 +retint_swapgs_pax:
16461 TRACE_IRQS_IRETQ
16462 SWAPGS
16463 jmp restore_args
16464
16465 retint_restore_args: /* return to kernel space */
16466 DISABLE_INTERRUPTS(CLBR_ANY)
16467 + pax_exit_kernel
16468 + pax_force_retaddr RIP-ARGOFFSET
16469 /*
16470 * The iretq could re-enable interrupts:
16471 */
16472 @@ -1012,7 +1324,7 @@ ENTRY(retint_kernel)
16473 #endif
16474
16475 CFI_ENDPROC
16476 -END(common_interrupt)
16477 +ENDPROC(common_interrupt)
16478 /*
16479 * End of kprobes section
16480 */
16481 @@ -1029,7 +1341,7 @@ ENTRY(\sym)
16482 interrupt \do_sym
16483 jmp ret_from_intr
16484 CFI_ENDPROC
16485 -END(\sym)
16486 +ENDPROC(\sym)
16487 .endm
16488
16489 #ifdef CONFIG_SMP
16490 @@ -1084,12 +1396,22 @@ ENTRY(\sym)
16491 CFI_ADJUST_CFA_OFFSET ORIG_RAX-R15
16492 call error_entry
16493 DEFAULT_FRAME 0
16494 +#ifdef CONFIG_PAX_MEMORY_UDEREF
16495 + testb $3, CS(%rsp)
16496 + jnz 1f
16497 + pax_enter_kernel
16498 + jmp 2f
16499 +1: pax_enter_kernel_user
16500 +2:
16501 +#else
16502 + pax_enter_kernel
16503 +#endif
16504 movq %rsp,%rdi /* pt_regs pointer */
16505 xorl %esi,%esi /* no error code */
16506 call \do_sym
16507 jmp error_exit /* %ebx: no swapgs flag */
16508 CFI_ENDPROC
16509 -END(\sym)
16510 +ENDPROC(\sym)
16511 .endm
16512
16513 .macro paranoidzeroentry sym do_sym
16514 @@ -1101,15 +1423,25 @@ ENTRY(\sym)
16515 CFI_ADJUST_CFA_OFFSET ORIG_RAX-R15
16516 call save_paranoid
16517 TRACE_IRQS_OFF
16518 +#ifdef CONFIG_PAX_MEMORY_UDEREF
16519 + testb $3, CS(%rsp)
16520 + jnz 1f
16521 + pax_enter_kernel
16522 + jmp 2f
16523 +1: pax_enter_kernel_user
16524 +2:
16525 +#else
16526 + pax_enter_kernel
16527 +#endif
16528 movq %rsp,%rdi /* pt_regs pointer */
16529 xorl %esi,%esi /* no error code */
16530 call \do_sym
16531 jmp paranoid_exit /* %ebx: no swapgs flag */
16532 CFI_ENDPROC
16533 -END(\sym)
16534 +ENDPROC(\sym)
16535 .endm
16536
16537 -#define INIT_TSS_IST(x) PER_CPU_VAR(init_tss) + (TSS_ist + ((x) - 1) * 8)
16538 +#define INIT_TSS_IST(x) (TSS_ist + ((x) - 1) * 8)(%r12)
16539 .macro paranoidzeroentry_ist sym do_sym ist
16540 ENTRY(\sym)
16541 INTR_FRAME
16542 @@ -1119,14 +1451,30 @@ ENTRY(\sym)
16543 CFI_ADJUST_CFA_OFFSET ORIG_RAX-R15
16544 call save_paranoid
16545 TRACE_IRQS_OFF_DEBUG
16546 +#ifdef CONFIG_PAX_MEMORY_UDEREF
16547 + testb $3, CS(%rsp)
16548 + jnz 1f
16549 + pax_enter_kernel
16550 + jmp 2f
16551 +1: pax_enter_kernel_user
16552 +2:
16553 +#else
16554 + pax_enter_kernel
16555 +#endif
16556 movq %rsp,%rdi /* pt_regs pointer */
16557 xorl %esi,%esi /* no error code */
16558 +#ifdef CONFIG_SMP
16559 + imul $TSS_size, PER_CPU_VAR(cpu_number), %r12d
16560 + lea init_tss(%r12), %r12
16561 +#else
16562 + lea init_tss(%rip), %r12
16563 +#endif
16564 subq $EXCEPTION_STKSZ, INIT_TSS_IST(\ist)
16565 call \do_sym
16566 addq $EXCEPTION_STKSZ, INIT_TSS_IST(\ist)
16567 jmp paranoid_exit /* %ebx: no swapgs flag */
16568 CFI_ENDPROC
16569 -END(\sym)
16570 +ENDPROC(\sym)
16571 .endm
16572
16573 .macro errorentry sym do_sym
16574 @@ -1137,13 +1485,23 @@ ENTRY(\sym)
16575 CFI_ADJUST_CFA_OFFSET ORIG_RAX-R15
16576 call error_entry
16577 DEFAULT_FRAME 0
16578 +#ifdef CONFIG_PAX_MEMORY_UDEREF
16579 + testb $3, CS(%rsp)
16580 + jnz 1f
16581 + pax_enter_kernel
16582 + jmp 2f
16583 +1: pax_enter_kernel_user
16584 +2:
16585 +#else
16586 + pax_enter_kernel
16587 +#endif
16588 movq %rsp,%rdi /* pt_regs pointer */
16589 movq ORIG_RAX(%rsp),%rsi /* get error code */
16590 movq $-1,ORIG_RAX(%rsp) /* no syscall to restart */
16591 call \do_sym
16592 jmp error_exit /* %ebx: no swapgs flag */
16593 CFI_ENDPROC
16594 -END(\sym)
16595 +ENDPROC(\sym)
16596 .endm
16597
16598 /* error code is on the stack already */
16599 @@ -1156,13 +1514,23 @@ ENTRY(\sym)
16600 call save_paranoid
16601 DEFAULT_FRAME 0
16602 TRACE_IRQS_OFF
16603 +#ifdef CONFIG_PAX_MEMORY_UDEREF
16604 + testb $3, CS(%rsp)
16605 + jnz 1f
16606 + pax_enter_kernel
16607 + jmp 2f
16608 +1: pax_enter_kernel_user
16609 +2:
16610 +#else
16611 + pax_enter_kernel
16612 +#endif
16613 movq %rsp,%rdi /* pt_regs pointer */
16614 movq ORIG_RAX(%rsp),%rsi /* get error code */
16615 movq $-1,ORIG_RAX(%rsp) /* no syscall to restart */
16616 call \do_sym
16617 jmp paranoid_exit /* %ebx: no swapgs flag */
16618 CFI_ENDPROC
16619 -END(\sym)
16620 +ENDPROC(\sym)
16621 .endm
16622
16623 zeroentry divide_error do_divide_error
16624 @@ -1192,9 +1560,10 @@ gs_change:
16625 2: mfence /* workaround */
16626 SWAPGS
16627 popfq_cfi
16628 + pax_force_retaddr
16629 ret
16630 CFI_ENDPROC
16631 -END(native_load_gs_index)
16632 +ENDPROC(native_load_gs_index)
16633
16634 _ASM_EXTABLE(gs_change,bad_gs)
16635 .section .fixup,"ax"
16636 @@ -1213,13 +1582,14 @@ ENTRY(kernel_thread_helper)
16637 * Here we are in the child and the registers are set as they were
16638 * at kernel_thread() invocation in the parent.
16639 */
16640 + pax_force_fptr %rsi
16641 call *%rsi
16642 # exit
16643 mov %eax, %edi
16644 call do_exit
16645 ud2 # padding for call trace
16646 CFI_ENDPROC
16647 -END(kernel_thread_helper)
16648 +ENDPROC(kernel_thread_helper)
16649
16650 /*
16651 * execve(). This function needs to use IRET, not SYSRET, to set up all state properly.
16652 @@ -1246,11 +1616,11 @@ ENTRY(kernel_execve)
16653 RESTORE_REST
16654 testq %rax,%rax
16655 je int_ret_from_sys_call
16656 - RESTORE_ARGS
16657 UNFAKE_STACK_FRAME
16658 + pax_force_retaddr
16659 ret
16660 CFI_ENDPROC
16661 -END(kernel_execve)
16662 +ENDPROC(kernel_execve)
16663
16664 /* Call softirq on interrupt stack. Interrupts are off. */
16665 ENTRY(call_softirq)
16666 @@ -1268,9 +1638,10 @@ ENTRY(call_softirq)
16667 CFI_DEF_CFA_REGISTER rsp
16668 CFI_ADJUST_CFA_OFFSET -8
16669 decl PER_CPU_VAR(irq_count)
16670 + pax_force_retaddr
16671 ret
16672 CFI_ENDPROC
16673 -END(call_softirq)
16674 +ENDPROC(call_softirq)
16675
16676 #ifdef CONFIG_XEN
16677 zeroentry xen_hypervisor_callback xen_do_hypervisor_callback
16678 @@ -1308,7 +1679,7 @@ ENTRY(xen_do_hypervisor_callback) # do_hypervisor_callback(struct *pt_regs)
16679 decl PER_CPU_VAR(irq_count)
16680 jmp error_exit
16681 CFI_ENDPROC
16682 -END(xen_do_hypervisor_callback)
16683 +ENDPROC(xen_do_hypervisor_callback)
16684
16685 /*
16686 * Hypervisor uses this for application faults while it executes.
16687 @@ -1367,7 +1738,7 @@ ENTRY(xen_failsafe_callback)
16688 SAVE_ALL
16689 jmp error_exit
16690 CFI_ENDPROC
16691 -END(xen_failsafe_callback)
16692 +ENDPROC(xen_failsafe_callback)
16693
16694 apicinterrupt XEN_HVM_EVTCHN_CALLBACK \
16695 xen_hvm_callback_vector xen_evtchn_do_upcall
16696 @@ -1416,16 +1787,31 @@ ENTRY(paranoid_exit)
16697 TRACE_IRQS_OFF_DEBUG
16698 testl %ebx,%ebx /* swapgs needed? */
16699 jnz paranoid_restore
16700 - testl $3,CS(%rsp)
16701 + testb $3,CS(%rsp)
16702 jnz paranoid_userspace
16703 +#ifdef CONFIG_PAX_MEMORY_UDEREF
16704 + pax_exit_kernel
16705 + TRACE_IRQS_IRETQ 0
16706 + SWAPGS_UNSAFE_STACK
16707 + RESTORE_ALL 8
16708 + pax_force_retaddr_bts
16709 + jmp irq_return
16710 +#endif
16711 paranoid_swapgs:
16712 +#ifdef CONFIG_PAX_MEMORY_UDEREF
16713 + pax_exit_kernel_user
16714 +#else
16715 + pax_exit_kernel
16716 +#endif
16717 TRACE_IRQS_IRETQ 0
16718 SWAPGS_UNSAFE_STACK
16719 RESTORE_ALL 8
16720 jmp irq_return
16721 paranoid_restore:
16722 + pax_exit_kernel
16723 TRACE_IRQS_IRETQ_DEBUG 0
16724 RESTORE_ALL 8
16725 + pax_force_retaddr_bts
16726 jmp irq_return
16727 paranoid_userspace:
16728 GET_THREAD_INFO(%rcx)
16729 @@ -1454,7 +1840,7 @@ paranoid_schedule:
16730 TRACE_IRQS_OFF
16731 jmp paranoid_userspace
16732 CFI_ENDPROC
16733 -END(paranoid_exit)
16734 +ENDPROC(paranoid_exit)
16735
16736 /*
16737 * Exception entry point. This expects an error code/orig_rax on the stack.
16738 @@ -1481,12 +1867,13 @@ ENTRY(error_entry)
16739 movq_cfi r14, R14+8
16740 movq_cfi r15, R15+8
16741 xorl %ebx,%ebx
16742 - testl $3,CS+8(%rsp)
16743 + testb $3,CS+8(%rsp)
16744 je error_kernelspace
16745 error_swapgs:
16746 SWAPGS
16747 error_sti:
16748 TRACE_IRQS_OFF
16749 + pax_force_retaddr_bts
16750 ret
16751
16752 /*
16753 @@ -1513,7 +1900,7 @@ bstep_iret:
16754 movq %rcx,RIP+8(%rsp)
16755 jmp error_swapgs
16756 CFI_ENDPROC
16757 -END(error_entry)
16758 +ENDPROC(error_entry)
16759
16760
16761 /* ebx: no swapgs flag (1: don't need swapgs, 0: need it) */
16762 @@ -1533,7 +1920,7 @@ ENTRY(error_exit)
16763 jnz retint_careful
16764 jmp retint_swapgs
16765 CFI_ENDPROC
16766 -END(error_exit)
16767 +ENDPROC(error_exit)
16768
16769 /*
16770 * Test if a given stack is an NMI stack or not.
16771 @@ -1591,9 +1978,11 @@ ENTRY(nmi)
16772 * If %cs was not the kernel segment, then the NMI triggered in user
16773 * space, which means it is definitely not nested.
16774 */
16775 + cmpl $__KERNEXEC_KERNEL_CS, 16(%rsp)
16776 + je 1f
16777 cmpl $__KERNEL_CS, 16(%rsp)
16778 jne first_nmi
16779 -
16780 +1:
16781 /*
16782 * Check the special variable on the stack to see if NMIs are
16783 * executing.
16784 @@ -1752,6 +2141,17 @@ end_repeat_nmi:
16785 */
16786 movq %cr2, %r12
16787
16788 +#ifdef CONFIG_PAX_MEMORY_UDEREF
16789 + testb $3, CS(%rsp)
16790 + jnz 1f
16791 + pax_enter_kernel
16792 + jmp 2f
16793 +1: pax_enter_kernel_user
16794 +2:
16795 +#else
16796 + pax_enter_kernel
16797 +#endif
16798 +
16799 /* paranoidentry do_nmi, 0; without TRACE_IRQS_OFF */
16800 movq %rsp,%rdi
16801 movq $-1,%rsi
16802 @@ -1767,21 +2167,32 @@ end_repeat_nmi:
16803 testl %ebx,%ebx /* swapgs needed? */
16804 jnz nmi_restore
16805 nmi_swapgs:
16806 +#ifdef CONFIG_PAX_MEMORY_UDEREF
16807 + pax_exit_kernel_user
16808 +#else
16809 + pax_exit_kernel
16810 +#endif
16811 SWAPGS_UNSAFE_STACK
16812 + RESTORE_ALL 8
16813 + /* Clear the NMI executing stack variable */
16814 + movq $0, 10*8(%rsp)
16815 + jmp irq_return
16816 nmi_restore:
16817 + pax_exit_kernel
16818 RESTORE_ALL 8
16819 + pax_force_retaddr_bts
16820 /* Clear the NMI executing stack variable */
16821 movq $0, 10*8(%rsp)
16822 jmp irq_return
16823 CFI_ENDPROC
16824 -END(nmi)
16825 +ENDPROC(nmi)
16826
16827 ENTRY(ignore_sysret)
16828 CFI_STARTPROC
16829 mov $-ENOSYS,%eax
16830 sysret
16831 CFI_ENDPROC
16832 -END(ignore_sysret)
16833 +ENDPROC(ignore_sysret)
16834
16835 /*
16836 * End of kprobes section
16837 diff --git a/arch/x86/kernel/ftrace.c b/arch/x86/kernel/ftrace.c
16838 index c3a7cb4..3ad00dc 100644
16839 --- a/arch/x86/kernel/ftrace.c
16840 +++ b/arch/x86/kernel/ftrace.c
16841 @@ -105,6 +105,8 @@ ftrace_modify_code_direct(unsigned long ip, unsigned const char *old_code,
16842 {
16843 unsigned char replaced[MCOUNT_INSN_SIZE];
16844
16845 + ip = ktla_ktva(ip);
16846 +
16847 /*
16848 * Note: Due to modules and __init, code can
16849 * disappear and change, we need to protect against faulting
16850 @@ -212,7 +214,7 @@ int ftrace_update_ftrace_func(ftrace_func_t func)
16851 unsigned char old[MCOUNT_INSN_SIZE], *new;
16852 int ret;
16853
16854 - memcpy(old, &ftrace_call, MCOUNT_INSN_SIZE);
16855 + memcpy(old, (void *)ktla_ktva((unsigned long)ftrace_call), MCOUNT_INSN_SIZE);
16856 new = ftrace_call_replace(ip, (unsigned long)func);
16857
16858 /* See comment above by declaration of modifying_ftrace_code */
16859 @@ -605,6 +607,8 @@ static int ftrace_mod_jmp(unsigned long ip,
16860 {
16861 unsigned char code[MCOUNT_INSN_SIZE];
16862
16863 + ip = ktla_ktva(ip);
16864 +
16865 if (probe_kernel_read(code, (void *)ip, MCOUNT_INSN_SIZE))
16866 return -EFAULT;
16867
16868 diff --git a/arch/x86/kernel/head32.c b/arch/x86/kernel/head32.c
16869 index c18f59d..9c0c9f6 100644
16870 --- a/arch/x86/kernel/head32.c
16871 +++ b/arch/x86/kernel/head32.c
16872 @@ -18,6 +18,7 @@
16873 #include <asm/io_apic.h>
16874 #include <asm/bios_ebda.h>
16875 #include <asm/tlbflush.h>
16876 +#include <asm/boot.h>
16877
16878 static void __init i386_default_early_setup(void)
16879 {
16880 @@ -30,8 +31,7 @@ static void __init i386_default_early_setup(void)
16881
16882 void __init i386_start_kernel(void)
16883 {
16884 - memblock_reserve(__pa_symbol(&_text),
16885 - __pa_symbol(&__bss_stop) - __pa_symbol(&_text));
16886 + memblock_reserve(LOAD_PHYSICAL_ADDR, __pa_symbol(&__bss_stop) - LOAD_PHYSICAL_ADDR);
16887
16888 #ifdef CONFIG_BLK_DEV_INITRD
16889 /* Reserve INITRD */
16890 diff --git a/arch/x86/kernel/head_32.S b/arch/x86/kernel/head_32.S
16891 index d42ab17..87b9555 100644
16892 --- a/arch/x86/kernel/head_32.S
16893 +++ b/arch/x86/kernel/head_32.S
16894 @@ -26,6 +26,12 @@
16895 /* Physical address */
16896 #define pa(X) ((X) - __PAGE_OFFSET)
16897
16898 +#ifdef CONFIG_PAX_KERNEXEC
16899 +#define ta(X) (X)
16900 +#else
16901 +#define ta(X) ((X) - __PAGE_OFFSET)
16902 +#endif
16903 +
16904 /*
16905 * References to members of the new_cpu_data structure.
16906 */
16907 @@ -55,11 +61,7 @@
16908 * and small than max_low_pfn, otherwise will waste some page table entries
16909 */
16910
16911 -#if PTRS_PER_PMD > 1
16912 -#define PAGE_TABLE_SIZE(pages) (((pages) / PTRS_PER_PMD) + PTRS_PER_PGD)
16913 -#else
16914 -#define PAGE_TABLE_SIZE(pages) ((pages) / PTRS_PER_PGD)
16915 -#endif
16916 +#define PAGE_TABLE_SIZE(pages) ((pages) / PTRS_PER_PTE)
16917
16918 /* Number of possible pages in the lowmem region */
16919 LOWMEM_PAGES = (((1<<32) - __PAGE_OFFSET) >> PAGE_SHIFT)
16920 @@ -78,6 +80,12 @@ INIT_MAP_SIZE = PAGE_TABLE_SIZE(KERNEL_PAGES) * PAGE_SIZE
16921 RESERVE_BRK(pagetables, INIT_MAP_SIZE)
16922
16923 /*
16924 + * Real beginning of normal "text" segment
16925 + */
16926 +ENTRY(stext)
16927 +ENTRY(_stext)
16928 +
16929 +/*
16930 * 32-bit kernel entrypoint; only used by the boot CPU. On entry,
16931 * %esi points to the real-mode code as a 32-bit pointer.
16932 * CS and DS must be 4 GB flat segments, but we don't depend on
16933 @@ -85,6 +93,13 @@ RESERVE_BRK(pagetables, INIT_MAP_SIZE)
16934 * can.
16935 */
16936 __HEAD
16937 +
16938 +#ifdef CONFIG_PAX_KERNEXEC
16939 + jmp startup_32
16940 +/* PaX: fill first page in .text with int3 to catch NULL derefs in kernel mode */
16941 +.fill PAGE_SIZE-5,1,0xcc
16942 +#endif
16943 +
16944 ENTRY(startup_32)
16945 movl pa(stack_start),%ecx
16946
16947 @@ -106,6 +121,59 @@ ENTRY(startup_32)
16948 2:
16949 leal -__PAGE_OFFSET(%ecx),%esp
16950
16951 +#ifdef CONFIG_SMP
16952 + movl $pa(cpu_gdt_table),%edi
16953 + movl $__per_cpu_load,%eax
16954 + movw %ax,GDT_ENTRY_PERCPU * 8 + 2(%edi)
16955 + rorl $16,%eax
16956 + movb %al,GDT_ENTRY_PERCPU * 8 + 4(%edi)
16957 + movb %ah,GDT_ENTRY_PERCPU * 8 + 7(%edi)
16958 + movl $__per_cpu_end - 1,%eax
16959 + subl $__per_cpu_start,%eax
16960 + movw %ax,GDT_ENTRY_PERCPU * 8 + 0(%edi)
16961 +#endif
16962 +
16963 +#ifdef CONFIG_PAX_MEMORY_UDEREF
16964 + movl $NR_CPUS,%ecx
16965 + movl $pa(cpu_gdt_table),%edi
16966 +1:
16967 + movl $((((__PAGE_OFFSET-1) & 0xf0000000) >> 12) | 0x00c09700),GDT_ENTRY_KERNEL_DS * 8 + 4(%edi)
16968 + movl $((((__PAGE_OFFSET-1) & 0xf0000000) >> 12) | 0x00c0fb00),GDT_ENTRY_DEFAULT_USER_CS * 8 + 4(%edi)
16969 + movl $((((__PAGE_OFFSET-1) & 0xf0000000) >> 12) | 0x00c0f300),GDT_ENTRY_DEFAULT_USER_DS * 8 + 4(%edi)
16970 + addl $PAGE_SIZE_asm,%edi
16971 + loop 1b
16972 +#endif
16973 +
16974 +#ifdef CONFIG_PAX_KERNEXEC
16975 + movl $pa(boot_gdt),%edi
16976 + movl $__LOAD_PHYSICAL_ADDR,%eax
16977 + movw %ax,GDT_ENTRY_BOOT_CS * 8 + 2(%edi)
16978 + rorl $16,%eax
16979 + movb %al,GDT_ENTRY_BOOT_CS * 8 + 4(%edi)
16980 + movb %ah,GDT_ENTRY_BOOT_CS * 8 + 7(%edi)
16981 + rorl $16,%eax
16982 +
16983 + ljmp $(__BOOT_CS),$1f
16984 +1:
16985 +
16986 + movl $NR_CPUS,%ecx
16987 + movl $pa(cpu_gdt_table),%edi
16988 + addl $__PAGE_OFFSET,%eax
16989 +1:
16990 + movb $0xc0,GDT_ENTRY_KERNEL_CS * 8 + 6(%edi)
16991 + movb $0xc0,GDT_ENTRY_KERNEXEC_KERNEL_CS * 8 + 6(%edi)
16992 + movw %ax,GDT_ENTRY_KERNEL_CS * 8 + 2(%edi)
16993 + movw %ax,GDT_ENTRY_KERNEXEC_KERNEL_CS * 8 + 2(%edi)
16994 + rorl $16,%eax
16995 + movb %al,GDT_ENTRY_KERNEL_CS * 8 + 4(%edi)
16996 + movb %al,GDT_ENTRY_KERNEXEC_KERNEL_CS * 8 + 4(%edi)
16997 + movb %ah,GDT_ENTRY_KERNEL_CS * 8 + 7(%edi)
16998 + movb %ah,GDT_ENTRY_KERNEXEC_KERNEL_CS * 8 + 7(%edi)
16999 + rorl $16,%eax
17000 + addl $PAGE_SIZE_asm,%edi
17001 + loop 1b
17002 +#endif
17003 +
17004 /*
17005 * Clear BSS first so that there are no surprises...
17006 */
17007 @@ -196,8 +264,11 @@ ENTRY(startup_32)
17008 movl %eax, pa(max_pfn_mapped)
17009
17010 /* Do early initialization of the fixmap area */
17011 - movl $pa(initial_pg_fixmap)+PDE_IDENT_ATTR,%eax
17012 - movl %eax,pa(initial_pg_pmd+0x1000*KPMDS-8)
17013 +#ifdef CONFIG_COMPAT_VDSO
17014 + movl $pa(initial_pg_fixmap)+PDE_IDENT_ATTR+_PAGE_USER,pa(initial_pg_pmd+0x1000*KPMDS-8)
17015 +#else
17016 + movl $pa(initial_pg_fixmap)+PDE_IDENT_ATTR,pa(initial_pg_pmd+0x1000*KPMDS-8)
17017 +#endif
17018 #else /* Not PAE */
17019
17020 page_pde_offset = (__PAGE_OFFSET >> 20);
17021 @@ -227,8 +298,11 @@ page_pde_offset = (__PAGE_OFFSET >> 20);
17022 movl %eax, pa(max_pfn_mapped)
17023
17024 /* Do early initialization of the fixmap area */
17025 - movl $pa(initial_pg_fixmap)+PDE_IDENT_ATTR,%eax
17026 - movl %eax,pa(initial_page_table+0xffc)
17027 +#ifdef CONFIG_COMPAT_VDSO
17028 + movl $pa(initial_pg_fixmap)+PDE_IDENT_ATTR+_PAGE_USER,pa(initial_page_table+0xffc)
17029 +#else
17030 + movl $pa(initial_pg_fixmap)+PDE_IDENT_ATTR,pa(initial_page_table+0xffc)
17031 +#endif
17032 #endif
17033
17034 #ifdef CONFIG_PARAVIRT
17035 @@ -242,9 +316,7 @@ page_pde_offset = (__PAGE_OFFSET >> 20);
17036 cmpl $num_subarch_entries, %eax
17037 jae bad_subarch
17038
17039 - movl pa(subarch_entries)(,%eax,4), %eax
17040 - subl $__PAGE_OFFSET, %eax
17041 - jmp *%eax
17042 + jmp *pa(subarch_entries)(,%eax,4)
17043
17044 bad_subarch:
17045 WEAK(lguest_entry)
17046 @@ -256,10 +328,10 @@ WEAK(xen_entry)
17047 __INITDATA
17048
17049 subarch_entries:
17050 - .long default_entry /* normal x86/PC */
17051 - .long lguest_entry /* lguest hypervisor */
17052 - .long xen_entry /* Xen hypervisor */
17053 - .long default_entry /* Moorestown MID */
17054 + .long ta(default_entry) /* normal x86/PC */
17055 + .long ta(lguest_entry) /* lguest hypervisor */
17056 + .long ta(xen_entry) /* Xen hypervisor */
17057 + .long ta(default_entry) /* Moorestown MID */
17058 num_subarch_entries = (. - subarch_entries) / 4
17059 .previous
17060 #else
17061 @@ -310,6 +382,7 @@ default_entry:
17062 orl %edx,%eax
17063 movl %eax,%cr4
17064
17065 +#ifdef CONFIG_X86_PAE
17066 testb $X86_CR4_PAE, %al # check if PAE is enabled
17067 jz 6f
17068
17069 @@ -338,6 +411,9 @@ default_entry:
17070 /* Make changes effective */
17071 wrmsr
17072
17073 + btsl $_PAGE_BIT_NX-32,pa(__supported_pte_mask+4)
17074 +#endif
17075 +
17076 6:
17077
17078 /*
17079 @@ -436,14 +512,20 @@ is386: movl $2,%ecx # set MP
17080 1: movl $(__KERNEL_DS),%eax # reload all the segment registers
17081 movl %eax,%ss # after changing gdt.
17082
17083 - movl $(__USER_DS),%eax # DS/ES contains default USER segment
17084 +# movl $(__KERNEL_DS),%eax # DS/ES contains default KERNEL segment
17085 movl %eax,%ds
17086 movl %eax,%es
17087
17088 movl $(__KERNEL_PERCPU), %eax
17089 movl %eax,%fs # set this cpu's percpu
17090
17091 +#ifdef CONFIG_CC_STACKPROTECTOR
17092 movl $(__KERNEL_STACK_CANARY),%eax
17093 +#elif defined(CONFIG_PAX_MEMORY_UDEREF)
17094 + movl $(__USER_DS),%eax
17095 +#else
17096 + xorl %eax,%eax
17097 +#endif
17098 movl %eax,%gs
17099
17100 xorl %eax,%eax # Clear LDT
17101 @@ -520,8 +602,11 @@ setup_once:
17102 * relocation. Manually set base address in stack canary
17103 * segment descriptor.
17104 */
17105 - movl $gdt_page,%eax
17106 + movl $cpu_gdt_table,%eax
17107 movl $stack_canary,%ecx
17108 +#ifdef CONFIG_SMP
17109 + addl $__per_cpu_load,%ecx
17110 +#endif
17111 movw %cx, 8 * GDT_ENTRY_STACK_CANARY + 2(%eax)
17112 shrl $16, %ecx
17113 movb %cl, 8 * GDT_ENTRY_STACK_CANARY + 4(%eax)
17114 @@ -552,7 +637,7 @@ ENDPROC(early_idt_handlers)
17115 /* This is global to keep gas from relaxing the jumps */
17116 ENTRY(early_idt_handler)
17117 cld
17118 - cmpl $2,%ss:early_recursion_flag
17119 + cmpl $1,%ss:early_recursion_flag
17120 je hlt_loop
17121 incl %ss:early_recursion_flag
17122
17123 @@ -590,8 +675,8 @@ ENTRY(early_idt_handler)
17124 pushl (20+6*4)(%esp) /* trapno */
17125 pushl $fault_msg
17126 call printk
17127 -#endif
17128 call dump_stack
17129 +#endif
17130 hlt_loop:
17131 hlt
17132 jmp hlt_loop
17133 @@ -610,8 +695,11 @@ ENDPROC(early_idt_handler)
17134 /* This is the default interrupt "handler" :-) */
17135 ALIGN
17136 ignore_int:
17137 - cld
17138 #ifdef CONFIG_PRINTK
17139 + cmpl $2,%ss:early_recursion_flag
17140 + je hlt_loop
17141 + incl %ss:early_recursion_flag
17142 + cld
17143 pushl %eax
17144 pushl %ecx
17145 pushl %edx
17146 @@ -620,9 +708,6 @@ ignore_int:
17147 movl $(__KERNEL_DS),%eax
17148 movl %eax,%ds
17149 movl %eax,%es
17150 - cmpl $2,early_recursion_flag
17151 - je hlt_loop
17152 - incl early_recursion_flag
17153 pushl 16(%esp)
17154 pushl 24(%esp)
17155 pushl 32(%esp)
17156 @@ -656,29 +741,43 @@ ENTRY(setup_once_ref)
17157 /*
17158 * BSS section
17159 */
17160 -__PAGE_ALIGNED_BSS
17161 - .align PAGE_SIZE
17162 #ifdef CONFIG_X86_PAE
17163 +.section .initial_pg_pmd,"a",@progbits
17164 initial_pg_pmd:
17165 .fill 1024*KPMDS,4,0
17166 #else
17167 +.section .initial_page_table,"a",@progbits
17168 ENTRY(initial_page_table)
17169 .fill 1024,4,0
17170 #endif
17171 +.section .initial_pg_fixmap,"a",@progbits
17172 initial_pg_fixmap:
17173 .fill 1024,4,0
17174 +.section .empty_zero_page,"a",@progbits
17175 ENTRY(empty_zero_page)
17176 .fill 4096,1,0
17177 +.section .swapper_pg_dir,"a",@progbits
17178 ENTRY(swapper_pg_dir)
17179 +#ifdef CONFIG_X86_PAE
17180 + .fill 4,8,0
17181 +#else
17182 .fill 1024,4,0
17183 +#endif
17184 +
17185 +/*
17186 + * The IDT has to be page-aligned to simplify the Pentium
17187 + * F0 0F bug workaround.. We have a special link segment
17188 + * for this.
17189 + */
17190 +.section .idt,"a",@progbits
17191 +ENTRY(idt_table)
17192 + .fill 256,8,0
17193
17194 /*
17195 * This starts the data section.
17196 */
17197 #ifdef CONFIG_X86_PAE
17198 -__PAGE_ALIGNED_DATA
17199 - /* Page-aligned for the benefit of paravirt? */
17200 - .align PAGE_SIZE
17201 +.section .initial_page_table,"a",@progbits
17202 ENTRY(initial_page_table)
17203 .long pa(initial_pg_pmd+PGD_IDENT_ATTR),0 /* low identity map */
17204 # if KPMDS == 3
17205 @@ -697,12 +796,20 @@ ENTRY(initial_page_table)
17206 # error "Kernel PMDs should be 1, 2 or 3"
17207 # endif
17208 .align PAGE_SIZE /* needs to be page-sized too */
17209 +
17210 +#ifdef CONFIG_PAX_PER_CPU_PGD
17211 +ENTRY(cpu_pgd)
17212 + .rept NR_CPUS
17213 + .fill 4,8,0
17214 + .endr
17215 +#endif
17216 +
17217 #endif
17218
17219 .data
17220 .balign 4
17221 ENTRY(stack_start)
17222 - .long init_thread_union+THREAD_SIZE
17223 + .long init_thread_union+THREAD_SIZE-8
17224
17225 __INITRODATA
17226 int_msg:
17227 @@ -730,7 +837,7 @@ fault_msg:
17228 * segment size, and 32-bit linear address value:
17229 */
17230
17231 - .data
17232 +.section .rodata,"a",@progbits
17233 .globl boot_gdt_descr
17234 .globl idt_descr
17235
17236 @@ -739,7 +846,7 @@ fault_msg:
17237 .word 0 # 32 bit align gdt_desc.address
17238 boot_gdt_descr:
17239 .word __BOOT_DS+7
17240 - .long boot_gdt - __PAGE_OFFSET
17241 + .long pa(boot_gdt)
17242
17243 .word 0 # 32-bit align idt_desc.address
17244 idt_descr:
17245 @@ -750,7 +857,7 @@ idt_descr:
17246 .word 0 # 32 bit align gdt_desc.address
17247 ENTRY(early_gdt_descr)
17248 .word GDT_ENTRIES*8-1
17249 - .long gdt_page /* Overwritten for secondary CPUs */
17250 + .long cpu_gdt_table /* Overwritten for secondary CPUs */
17251
17252 /*
17253 * The boot_gdt must mirror the equivalent in setup.S and is
17254 @@ -759,5 +866,65 @@ ENTRY(early_gdt_descr)
17255 .align L1_CACHE_BYTES
17256 ENTRY(boot_gdt)
17257 .fill GDT_ENTRY_BOOT_CS,8,0
17258 - .quad 0x00cf9a000000ffff /* kernel 4GB code at 0x00000000 */
17259 - .quad 0x00cf92000000ffff /* kernel 4GB data at 0x00000000 */
17260 + .quad 0x00cf9b000000ffff /* kernel 4GB code at 0x00000000 */
17261 + .quad 0x00cf93000000ffff /* kernel 4GB data at 0x00000000 */
17262 +
17263 + .align PAGE_SIZE_asm
17264 +ENTRY(cpu_gdt_table)
17265 + .rept NR_CPUS
17266 + .quad 0x0000000000000000 /* NULL descriptor */
17267 + .quad 0x0000000000000000 /* 0x0b reserved */
17268 + .quad 0x0000000000000000 /* 0x13 reserved */
17269 + .quad 0x0000000000000000 /* 0x1b reserved */
17270 +
17271 +#ifdef CONFIG_PAX_KERNEXEC
17272 + .quad 0x00cf9b000000ffff /* 0x20 alternate kernel 4GB code at 0x00000000 */
17273 +#else
17274 + .quad 0x0000000000000000 /* 0x20 unused */
17275 +#endif
17276 +
17277 + .quad 0x0000000000000000 /* 0x28 unused */
17278 + .quad 0x0000000000000000 /* 0x33 TLS entry 1 */
17279 + .quad 0x0000000000000000 /* 0x3b TLS entry 2 */
17280 + .quad 0x0000000000000000 /* 0x43 TLS entry 3 */
17281 + .quad 0x0000000000000000 /* 0x4b reserved */
17282 + .quad 0x0000000000000000 /* 0x53 reserved */
17283 + .quad 0x0000000000000000 /* 0x5b reserved */
17284 +
17285 + .quad 0x00cf9b000000ffff /* 0x60 kernel 4GB code at 0x00000000 */
17286 + .quad 0x00cf93000000ffff /* 0x68 kernel 4GB data at 0x00000000 */
17287 + .quad 0x00cffb000000ffff /* 0x73 user 4GB code at 0x00000000 */
17288 + .quad 0x00cff3000000ffff /* 0x7b user 4GB data at 0x00000000 */
17289 +
17290 + .quad 0x0000000000000000 /* 0x80 TSS descriptor */
17291 + .quad 0x0000000000000000 /* 0x88 LDT descriptor */
17292 +
17293 + /*
17294 + * Segments used for calling PnP BIOS have byte granularity.
17295 + * The code segments and data segments have fixed 64k limits,
17296 + * the transfer segment sizes are set at run time.
17297 + */
17298 + .quad 0x00409b000000ffff /* 0x90 32-bit code */
17299 + .quad 0x00009b000000ffff /* 0x98 16-bit code */
17300 + .quad 0x000093000000ffff /* 0xa0 16-bit data */
17301 + .quad 0x0000930000000000 /* 0xa8 16-bit data */
17302 + .quad 0x0000930000000000 /* 0xb0 16-bit data */
17303 +
17304 + /*
17305 + * The APM segments have byte granularity and their bases
17306 + * are set at run time. All have 64k limits.
17307 + */
17308 + .quad 0x00409b000000ffff /* 0xb8 APM CS code */
17309 + .quad 0x00009b000000ffff /* 0xc0 APM CS 16 code (16 bit) */
17310 + .quad 0x004093000000ffff /* 0xc8 APM DS data */
17311 +
17312 + .quad 0x00c0930000000000 /* 0xd0 - ESPFIX SS */
17313 + .quad 0x0040930000000000 /* 0xd8 - PERCPU */
17314 + .quad 0x0040910000000017 /* 0xe0 - STACK_CANARY */
17315 + .quad 0x0000000000000000 /* 0xe8 - PCIBIOS_CS */
17316 + .quad 0x0000000000000000 /* 0xf0 - PCIBIOS_DS */
17317 + .quad 0x0000000000000000 /* 0xf8 - GDT entry 31: double-fault TSS */
17318 +
17319 + /* Be sure this is zeroed to avoid false validations in Xen */
17320 + .fill PAGE_SIZE_asm - GDT_SIZE,1,0
17321 + .endr
17322 diff --git a/arch/x86/kernel/head_64.S b/arch/x86/kernel/head_64.S
17323 index 94bf9cc..400455a 100644
17324 --- a/arch/x86/kernel/head_64.S
17325 +++ b/arch/x86/kernel/head_64.S
17326 @@ -20,6 +20,8 @@
17327 #include <asm/processor-flags.h>
17328 #include <asm/percpu.h>
17329 #include <asm/nops.h>
17330 +#include <asm/cpufeature.h>
17331 +#include <asm/alternative-asm.h>
17332
17333 #ifdef CONFIG_PARAVIRT
17334 #include <asm/asm-offsets.h>
17335 @@ -41,6 +43,12 @@ L4_PAGE_OFFSET = pgd_index(__PAGE_OFFSET)
17336 L3_PAGE_OFFSET = pud_index(__PAGE_OFFSET)
17337 L4_START_KERNEL = pgd_index(__START_KERNEL_map)
17338 L3_START_KERNEL = pud_index(__START_KERNEL_map)
17339 +L4_VMALLOC_START = pgd_index(VMALLOC_START)
17340 +L3_VMALLOC_START = pud_index(VMALLOC_START)
17341 +L4_VMALLOC_END = pgd_index(VMALLOC_END)
17342 +L3_VMALLOC_END = pud_index(VMALLOC_END)
17343 +L4_VMEMMAP_START = pgd_index(VMEMMAP_START)
17344 +L3_VMEMMAP_START = pud_index(VMEMMAP_START)
17345
17346 .text
17347 __HEAD
17348 @@ -88,35 +96,23 @@ startup_64:
17349 */
17350 addq %rbp, init_level4_pgt + 0(%rip)
17351 addq %rbp, init_level4_pgt + (L4_PAGE_OFFSET*8)(%rip)
17352 + addq %rbp, init_level4_pgt + (L4_VMALLOC_START*8)(%rip)
17353 + addq %rbp, init_level4_pgt + (L4_VMALLOC_END*8)(%rip)
17354 + addq %rbp, init_level4_pgt + (L4_VMEMMAP_START*8)(%rip)
17355 addq %rbp, init_level4_pgt + (L4_START_KERNEL*8)(%rip)
17356
17357 addq %rbp, level3_ident_pgt + 0(%rip)
17358 +#ifndef CONFIG_XEN
17359 + addq %rbp, level3_ident_pgt + 8(%rip)
17360 +#endif
17361
17362 - addq %rbp, level3_kernel_pgt + (510*8)(%rip)
17363 - addq %rbp, level3_kernel_pgt + (511*8)(%rip)
17364 + addq %rbp, level3_vmemmap_pgt + (L3_VMEMMAP_START*8)(%rip)
17365 +
17366 + addq %rbp, level3_kernel_pgt + (L3_START_KERNEL*8)(%rip)
17367 + addq %rbp, level3_kernel_pgt + (L3_START_KERNEL*8+8)(%rip)
17368
17369 addq %rbp, level2_fixmap_pgt + (506*8)(%rip)
17370 -
17371 - /* Add an Identity mapping if I am above 1G */
17372 - leaq _text(%rip), %rdi
17373 - andq $PMD_PAGE_MASK, %rdi
17374 -
17375 - movq %rdi, %rax
17376 - shrq $PUD_SHIFT, %rax
17377 - andq $(PTRS_PER_PUD - 1), %rax
17378 - jz ident_complete
17379 -
17380 - leaq (level2_spare_pgt - __START_KERNEL_map + _KERNPG_TABLE)(%rbp), %rdx
17381 - leaq level3_ident_pgt(%rip), %rbx
17382 - movq %rdx, 0(%rbx, %rax, 8)
17383 -
17384 - movq %rdi, %rax
17385 - shrq $PMD_SHIFT, %rax
17386 - andq $(PTRS_PER_PMD - 1), %rax
17387 - leaq __PAGE_KERNEL_IDENT_LARGE_EXEC(%rdi), %rdx
17388 - leaq level2_spare_pgt(%rip), %rbx
17389 - movq %rdx, 0(%rbx, %rax, 8)
17390 -ident_complete:
17391 + addq %rbp, level2_fixmap_pgt + (507*8)(%rip)
17392
17393 /*
17394 * Fixup the kernel text+data virtual addresses. Note that
17395 @@ -159,8 +155,8 @@ ENTRY(secondary_startup_64)
17396 * after the boot processor executes this code.
17397 */
17398
17399 - /* Enable PAE mode and PGE */
17400 - movl $(X86_CR4_PAE | X86_CR4_PGE), %eax
17401 + /* Enable PAE mode and PSE/PGE */
17402 + movl $(X86_CR4_PSE | X86_CR4_PAE | X86_CR4_PGE), %eax
17403 movq %rax, %cr4
17404
17405 /* Setup early boot stage 4 level pagetables. */
17406 @@ -182,9 +178,17 @@ ENTRY(secondary_startup_64)
17407 movl $MSR_EFER, %ecx
17408 rdmsr
17409 btsl $_EFER_SCE, %eax /* Enable System Call */
17410 - btl $20,%edi /* No Execute supported? */
17411 + btl $(X86_FEATURE_NX & 31),%edi /* No Execute supported? */
17412 jnc 1f
17413 btsl $_EFER_NX, %eax
17414 + leaq init_level4_pgt(%rip), %rdi
17415 +#ifndef CONFIG_EFI
17416 + btsq $_PAGE_BIT_NX, 8*L4_PAGE_OFFSET(%rdi)
17417 +#endif
17418 + btsq $_PAGE_BIT_NX, 8*L4_VMALLOC_START(%rdi)
17419 + btsq $_PAGE_BIT_NX, 8*L4_VMALLOC_END(%rdi)
17420 + btsq $_PAGE_BIT_NX, 8*L4_VMEMMAP_START(%rdi)
17421 + btsq $_PAGE_BIT_NX, __supported_pte_mask(%rip)
17422 1: wrmsr /* Make changes effective */
17423
17424 /* Setup cr0 */
17425 @@ -246,6 +250,7 @@ ENTRY(secondary_startup_64)
17426 * jump. In addition we need to ensure %cs is set so we make this
17427 * a far return.
17428 */
17429 + pax_set_fptr_mask
17430 movq initial_code(%rip),%rax
17431 pushq $0 # fake return address to stop unwinder
17432 pushq $__KERNEL_CS # set correct cs
17433 @@ -268,7 +273,7 @@ ENTRY(secondary_startup_64)
17434 bad_address:
17435 jmp bad_address
17436
17437 - .section ".init.text","ax"
17438 + __INIT
17439 .globl early_idt_handlers
17440 early_idt_handlers:
17441 # 104(%rsp) %rflags
17442 @@ -347,11 +352,15 @@ ENTRY(early_idt_handler)
17443 addq $16,%rsp # drop vector number and error code
17444 decl early_recursion_flag(%rip)
17445 INTERRUPT_RETURN
17446 + .previous
17447
17448 + __INITDATA
17449 .balign 4
17450 early_recursion_flag:
17451 .long 0
17452 + .previous
17453
17454 + .section .rodata,"a",@progbits
17455 #ifdef CONFIG_EARLY_PRINTK
17456 early_idt_msg:
17457 .asciz "PANIC: early exception %02lx rip %lx:%lx error %lx cr2 %lx\n"
17458 @@ -360,6 +369,7 @@ early_idt_ripmsg:
17459 #endif /* CONFIG_EARLY_PRINTK */
17460 .previous
17461
17462 + .section .rodata,"a",@progbits
17463 #define NEXT_PAGE(name) \
17464 .balign PAGE_SIZE; \
17465 ENTRY(name)
17466 @@ -372,7 +382,6 @@ ENTRY(name)
17467 i = i + 1 ; \
17468 .endr
17469
17470 - .data
17471 /*
17472 * This default setting generates an ident mapping at address 0x100000
17473 * and a mapping for the kernel that precisely maps virtual address
17474 @@ -383,13 +392,41 @@ NEXT_PAGE(init_level4_pgt)
17475 .quad level3_ident_pgt - __START_KERNEL_map + _KERNPG_TABLE
17476 .org init_level4_pgt + L4_PAGE_OFFSET*8, 0
17477 .quad level3_ident_pgt - __START_KERNEL_map + _KERNPG_TABLE
17478 + .org init_level4_pgt + L4_VMALLOC_START*8, 0
17479 + .quad level3_vmalloc_start_pgt - __START_KERNEL_map + _KERNPG_TABLE
17480 + .org init_level4_pgt + L4_VMALLOC_END*8, 0
17481 + .quad level3_vmalloc_end_pgt - __START_KERNEL_map + _KERNPG_TABLE
17482 + .org init_level4_pgt + L4_VMEMMAP_START*8, 0
17483 + .quad level3_vmemmap_pgt - __START_KERNEL_map + _KERNPG_TABLE
17484 .org init_level4_pgt + L4_START_KERNEL*8, 0
17485 /* (2^48-(2*1024*1024*1024))/(2^39) = 511 */
17486 .quad level3_kernel_pgt - __START_KERNEL_map + _PAGE_TABLE
17487
17488 +#ifdef CONFIG_PAX_PER_CPU_PGD
17489 +NEXT_PAGE(cpu_pgd)
17490 + .rept NR_CPUS
17491 + .fill 512,8,0
17492 + .endr
17493 +#endif
17494 +
17495 NEXT_PAGE(level3_ident_pgt)
17496 .quad level2_ident_pgt - __START_KERNEL_map + _KERNPG_TABLE
17497 +#ifdef CONFIG_XEN
17498 .fill 511,8,0
17499 +#else
17500 + .quad level2_ident_pgt + PAGE_SIZE - __START_KERNEL_map + _KERNPG_TABLE
17501 + .fill 510,8,0
17502 +#endif
17503 +
17504 +NEXT_PAGE(level3_vmalloc_start_pgt)
17505 + .fill 512,8,0
17506 +
17507 +NEXT_PAGE(level3_vmalloc_end_pgt)
17508 + .fill 512,8,0
17509 +
17510 +NEXT_PAGE(level3_vmemmap_pgt)
17511 + .fill L3_VMEMMAP_START,8,0
17512 + .quad level2_vmemmap_pgt - __START_KERNEL_map + _KERNPG_TABLE
17513
17514 NEXT_PAGE(level3_kernel_pgt)
17515 .fill L3_START_KERNEL,8,0
17516 @@ -397,20 +434,23 @@ NEXT_PAGE(level3_kernel_pgt)
17517 .quad level2_kernel_pgt - __START_KERNEL_map + _KERNPG_TABLE
17518 .quad level2_fixmap_pgt - __START_KERNEL_map + _PAGE_TABLE
17519
17520 +NEXT_PAGE(level2_vmemmap_pgt)
17521 + .fill 512,8,0
17522 +
17523 NEXT_PAGE(level2_fixmap_pgt)
17524 - .fill 506,8,0
17525 - .quad level1_fixmap_pgt - __START_KERNEL_map + _PAGE_TABLE
17526 - /* 8MB reserved for vsyscalls + a 2MB hole = 4 + 1 entries */
17527 - .fill 5,8,0
17528 + .fill 507,8,0
17529 + .quad level1_vsyscall_pgt - __START_KERNEL_map + _PAGE_TABLE
17530 + /* 6MB reserved for vsyscalls + a 2MB hole = 3 + 1 entries */
17531 + .fill 4,8,0
17532
17533 -NEXT_PAGE(level1_fixmap_pgt)
17534 +NEXT_PAGE(level1_vsyscall_pgt)
17535 .fill 512,8,0
17536
17537 -NEXT_PAGE(level2_ident_pgt)
17538 - /* Since I easily can, map the first 1G.
17539 + /* Since I easily can, map the first 2G.
17540 * Don't set NX because code runs from these pages.
17541 */
17542 - PMDS(0, __PAGE_KERNEL_IDENT_LARGE_EXEC, PTRS_PER_PMD)
17543 +NEXT_PAGE(level2_ident_pgt)
17544 + PMDS(0, __PAGE_KERNEL_IDENT_LARGE_EXEC, 2*PTRS_PER_PMD)
17545
17546 NEXT_PAGE(level2_kernel_pgt)
17547 /*
17548 @@ -423,37 +463,59 @@ NEXT_PAGE(level2_kernel_pgt)
17549 * If you want to increase this then increase MODULES_VADDR
17550 * too.)
17551 */
17552 - PMDS(0, __PAGE_KERNEL_LARGE_EXEC,
17553 - KERNEL_IMAGE_SIZE/PMD_SIZE)
17554 -
17555 -NEXT_PAGE(level2_spare_pgt)
17556 - .fill 512, 8, 0
17557 + PMDS(0, __PAGE_KERNEL_LARGE_EXEC, KERNEL_IMAGE_SIZE/PMD_SIZE)
17558
17559 #undef PMDS
17560 #undef NEXT_PAGE
17561
17562 - .data
17563 + .align PAGE_SIZE
17564 +ENTRY(cpu_gdt_table)
17565 + .rept NR_CPUS
17566 + .quad 0x0000000000000000 /* NULL descriptor */
17567 + .quad 0x00cf9b000000ffff /* __KERNEL32_CS */
17568 + .quad 0x00af9b000000ffff /* __KERNEL_CS */
17569 + .quad 0x00cf93000000ffff /* __KERNEL_DS */
17570 + .quad 0x00cffb000000ffff /* __USER32_CS */
17571 + .quad 0x00cff3000000ffff /* __USER_DS, __USER32_DS */
17572 + .quad 0x00affb000000ffff /* __USER_CS */
17573 +
17574 +#ifdef CONFIG_PAX_KERNEXEC
17575 + .quad 0x00af9b000000ffff /* __KERNEXEC_KERNEL_CS */
17576 +#else
17577 + .quad 0x0 /* unused */
17578 +#endif
17579 +
17580 + .quad 0,0 /* TSS */
17581 + .quad 0,0 /* LDT */
17582 + .quad 0,0,0 /* three TLS descriptors */
17583 + .quad 0x0000f40000000000 /* node/CPU stored in limit */
17584 + /* asm/segment.h:GDT_ENTRIES must match this */
17585 +
17586 + /* zero the remaining page */
17587 + .fill PAGE_SIZE / 8 - GDT_ENTRIES,8,0
17588 + .endr
17589 +
17590 .align 16
17591 .globl early_gdt_descr
17592 early_gdt_descr:
17593 .word GDT_ENTRIES*8-1
17594 early_gdt_descr_base:
17595 - .quad INIT_PER_CPU_VAR(gdt_page)
17596 + .quad cpu_gdt_table
17597
17598 ENTRY(phys_base)
17599 /* This must match the first entry in level2_kernel_pgt */
17600 .quad 0x0000000000000000
17601
17602 #include "../../x86/xen/xen-head.S"
17603 -
17604 - .section .bss, "aw", @nobits
17605 +
17606 + .section .rodata,"a",@progbits
17607 .align L1_CACHE_BYTES
17608 ENTRY(idt_table)
17609 - .skip IDT_ENTRIES * 16
17610 + .fill 512,8,0
17611
17612 .align L1_CACHE_BYTES
17613 ENTRY(nmi_idt_table)
17614 - .skip IDT_ENTRIES * 16
17615 + .fill 512,8,0
17616
17617 __PAGE_ALIGNED_BSS
17618 .align PAGE_SIZE
17619 diff --git a/arch/x86/kernel/i386_ksyms_32.c b/arch/x86/kernel/i386_ksyms_32.c
17620 index 9c3bd4a..e1d9b35 100644
17621 --- a/arch/x86/kernel/i386_ksyms_32.c
17622 +++ b/arch/x86/kernel/i386_ksyms_32.c
17623 @@ -20,8 +20,12 @@ extern void cmpxchg8b_emu(void);
17624 EXPORT_SYMBOL(cmpxchg8b_emu);
17625 #endif
17626
17627 +EXPORT_SYMBOL_GPL(cpu_gdt_table);
17628 +
17629 /* Networking helper routines. */
17630 EXPORT_SYMBOL(csum_partial_copy_generic);
17631 +EXPORT_SYMBOL(csum_partial_copy_generic_to_user);
17632 +EXPORT_SYMBOL(csum_partial_copy_generic_from_user);
17633
17634 EXPORT_SYMBOL(__get_user_1);
17635 EXPORT_SYMBOL(__get_user_2);
17636 @@ -36,3 +40,7 @@ EXPORT_SYMBOL(strstr);
17637
17638 EXPORT_SYMBOL(csum_partial);
17639 EXPORT_SYMBOL(empty_zero_page);
17640 +
17641 +#ifdef CONFIG_PAX_KERNEXEC
17642 +EXPORT_SYMBOL(__LOAD_PHYSICAL_ADDR);
17643 +#endif
17644 diff --git a/arch/x86/kernel/i387.c b/arch/x86/kernel/i387.c
17645 index f250431..54097e7 100644
17646 --- a/arch/x86/kernel/i387.c
17647 +++ b/arch/x86/kernel/i387.c
17648 @@ -59,7 +59,7 @@ static inline bool interrupted_kernel_fpu_idle(void)
17649 static inline bool interrupted_user_mode(void)
17650 {
17651 struct pt_regs *regs = get_irq_regs();
17652 - return regs && user_mode_vm(regs);
17653 + return regs && user_mode(regs);
17654 }
17655
17656 /*
17657 diff --git a/arch/x86/kernel/i8259.c b/arch/x86/kernel/i8259.c
17658 index 36d1853..bf25736 100644
17659 --- a/arch/x86/kernel/i8259.c
17660 +++ b/arch/x86/kernel/i8259.c
17661 @@ -209,7 +209,7 @@ spurious_8259A_irq:
17662 "spurious 8259A interrupt: IRQ%d.\n", irq);
17663 spurious_irq_mask |= irqmask;
17664 }
17665 - atomic_inc(&irq_err_count);
17666 + atomic_inc_unchecked(&irq_err_count);
17667 /*
17668 * Theoretically we do not have to handle this IRQ,
17669 * but in Linux this does not cause problems and is
17670 diff --git a/arch/x86/kernel/ioport.c b/arch/x86/kernel/ioport.c
17671 index 8c96897..be66bfa 100644
17672 --- a/arch/x86/kernel/ioport.c
17673 +++ b/arch/x86/kernel/ioport.c
17674 @@ -6,6 +6,7 @@
17675 #include <linux/sched.h>
17676 #include <linux/kernel.h>
17677 #include <linux/capability.h>
17678 +#include <linux/security.h>
17679 #include <linux/errno.h>
17680 #include <linux/types.h>
17681 #include <linux/ioport.h>
17682 @@ -28,6 +29,12 @@ asmlinkage long sys_ioperm(unsigned long from, unsigned long num, int turn_on)
17683
17684 if ((from + num <= from) || (from + num > IO_BITMAP_BITS))
17685 return -EINVAL;
17686 +#ifdef CONFIG_GRKERNSEC_IO
17687 + if (turn_on && grsec_disable_privio) {
17688 + gr_handle_ioperm();
17689 + return -EPERM;
17690 + }
17691 +#endif
17692 if (turn_on && !capable(CAP_SYS_RAWIO))
17693 return -EPERM;
17694
17695 @@ -54,7 +61,7 @@ asmlinkage long sys_ioperm(unsigned long from, unsigned long num, int turn_on)
17696 * because the ->io_bitmap_max value must match the bitmap
17697 * contents:
17698 */
17699 - tss = &per_cpu(init_tss, get_cpu());
17700 + tss = init_tss + get_cpu();
17701
17702 if (turn_on)
17703 bitmap_clear(t->io_bitmap_ptr, from, num);
17704 @@ -102,6 +109,12 @@ long sys_iopl(unsigned int level, struct pt_regs *regs)
17705 return -EINVAL;
17706 /* Trying to gain more privileges? */
17707 if (level > old) {
17708 +#ifdef CONFIG_GRKERNSEC_IO
17709 + if (grsec_disable_privio) {
17710 + gr_handle_iopl();
17711 + return -EPERM;
17712 + }
17713 +#endif
17714 if (!capable(CAP_SYS_RAWIO))
17715 return -EPERM;
17716 }
17717 diff --git a/arch/x86/kernel/irq.c b/arch/x86/kernel/irq.c
17718 index d44f782..31ab01e 100644
17719 --- a/arch/x86/kernel/irq.c
17720 +++ b/arch/x86/kernel/irq.c
17721 @@ -18,7 +18,7 @@
17722 #include <asm/mce.h>
17723 #include <asm/hw_irq.h>
17724
17725 -atomic_t irq_err_count;
17726 +atomic_unchecked_t irq_err_count;
17727
17728 /* Function pointer for generic interrupt vector handling */
17729 void (*x86_platform_ipi_callback)(void) = NULL;
17730 @@ -121,9 +121,9 @@ int arch_show_interrupts(struct seq_file *p, int prec)
17731 seq_printf(p, "%10u ", per_cpu(mce_poll_count, j));
17732 seq_printf(p, " Machine check polls\n");
17733 #endif
17734 - seq_printf(p, "%*s: %10u\n", prec, "ERR", atomic_read(&irq_err_count));
17735 + seq_printf(p, "%*s: %10u\n", prec, "ERR", atomic_read_unchecked(&irq_err_count));
17736 #if defined(CONFIG_X86_IO_APIC)
17737 - seq_printf(p, "%*s: %10u\n", prec, "MIS", atomic_read(&irq_mis_count));
17738 + seq_printf(p, "%*s: %10u\n", prec, "MIS", atomic_read_unchecked(&irq_mis_count));
17739 #endif
17740 return 0;
17741 }
17742 @@ -164,10 +164,10 @@ u64 arch_irq_stat_cpu(unsigned int cpu)
17743
17744 u64 arch_irq_stat(void)
17745 {
17746 - u64 sum = atomic_read(&irq_err_count);
17747 + u64 sum = atomic_read_unchecked(&irq_err_count);
17748
17749 #ifdef CONFIG_X86_IO_APIC
17750 - sum += atomic_read(&irq_mis_count);
17751 + sum += atomic_read_unchecked(&irq_mis_count);
17752 #endif
17753 return sum;
17754 }
17755 diff --git a/arch/x86/kernel/irq_32.c b/arch/x86/kernel/irq_32.c
17756 index 344faf8..355f60d 100644
17757 --- a/arch/x86/kernel/irq_32.c
17758 +++ b/arch/x86/kernel/irq_32.c
17759 @@ -39,7 +39,7 @@ static int check_stack_overflow(void)
17760 __asm__ __volatile__("andl %%esp,%0" :
17761 "=r" (sp) : "0" (THREAD_SIZE - 1));
17762
17763 - return sp < (sizeof(struct thread_info) + STACK_WARN);
17764 + return sp < STACK_WARN;
17765 }
17766
17767 static void print_stack_overflow(void)
17768 @@ -59,8 +59,8 @@ static inline void print_stack_overflow(void) { }
17769 * per-CPU IRQ handling contexts (thread information and stack)
17770 */
17771 union irq_ctx {
17772 - struct thread_info tinfo;
17773 - u32 stack[THREAD_SIZE/sizeof(u32)];
17774 + unsigned long previous_esp;
17775 + u32 stack[THREAD_SIZE/sizeof(u32)];
17776 } __attribute__((aligned(THREAD_SIZE)));
17777
17778 static DEFINE_PER_CPU(union irq_ctx *, hardirq_ctx);
17779 @@ -80,10 +80,9 @@ static void call_on_stack(void *func, void *stack)
17780 static inline int
17781 execute_on_irq_stack(int overflow, struct irq_desc *desc, int irq)
17782 {
17783 - union irq_ctx *curctx, *irqctx;
17784 + union irq_ctx *irqctx;
17785 u32 *isp, arg1, arg2;
17786
17787 - curctx = (union irq_ctx *) current_thread_info();
17788 irqctx = __this_cpu_read(hardirq_ctx);
17789
17790 /*
17791 @@ -92,16 +91,16 @@ execute_on_irq_stack(int overflow, struct irq_desc *desc, int irq)
17792 * handler) we can't do that and just have to keep using the
17793 * current stack (which is the irq stack already after all)
17794 */
17795 - if (unlikely(curctx == irqctx))
17796 + if (unlikely((void *)current_stack_pointer - (void *)irqctx < THREAD_SIZE))
17797 return 0;
17798
17799 /* build the stack frame on the IRQ stack */
17800 - isp = (u32 *) ((char *)irqctx + sizeof(*irqctx));
17801 - irqctx->tinfo.task = curctx->tinfo.task;
17802 - irqctx->tinfo.previous_esp = current_stack_pointer;
17803 + isp = (u32 *) ((char *)irqctx + sizeof(*irqctx) - 8);
17804 + irqctx->previous_esp = current_stack_pointer;
17805
17806 - /* Copy the preempt_count so that the [soft]irq checks work. */
17807 - irqctx->tinfo.preempt_count = curctx->tinfo.preempt_count;
17808 +#ifdef CONFIG_PAX_MEMORY_UDEREF
17809 + __set_fs(MAKE_MM_SEG(0));
17810 +#endif
17811
17812 if (unlikely(overflow))
17813 call_on_stack(print_stack_overflow, isp);
17814 @@ -113,6 +112,11 @@ execute_on_irq_stack(int overflow, struct irq_desc *desc, int irq)
17815 : "0" (irq), "1" (desc), "2" (isp),
17816 "D" (desc->handle_irq)
17817 : "memory", "cc", "ecx");
17818 +
17819 +#ifdef CONFIG_PAX_MEMORY_UDEREF
17820 + __set_fs(current_thread_info()->addr_limit);
17821 +#endif
17822 +
17823 return 1;
17824 }
17825
17826 @@ -121,29 +125,14 @@ execute_on_irq_stack(int overflow, struct irq_desc *desc, int irq)
17827 */
17828 void __cpuinit irq_ctx_init(int cpu)
17829 {
17830 - union irq_ctx *irqctx;
17831 -
17832 if (per_cpu(hardirq_ctx, cpu))
17833 return;
17834
17835 - irqctx = page_address(alloc_pages_node(cpu_to_node(cpu),
17836 - THREADINFO_GFP,
17837 - THREAD_SIZE_ORDER));
17838 - memset(&irqctx->tinfo, 0, sizeof(struct thread_info));
17839 - irqctx->tinfo.cpu = cpu;
17840 - irqctx->tinfo.preempt_count = HARDIRQ_OFFSET;
17841 - irqctx->tinfo.addr_limit = MAKE_MM_SEG(0);
17842 -
17843 - per_cpu(hardirq_ctx, cpu) = irqctx;
17844 -
17845 - irqctx = page_address(alloc_pages_node(cpu_to_node(cpu),
17846 - THREADINFO_GFP,
17847 - THREAD_SIZE_ORDER));
17848 - memset(&irqctx->tinfo, 0, sizeof(struct thread_info));
17849 - irqctx->tinfo.cpu = cpu;
17850 - irqctx->tinfo.addr_limit = MAKE_MM_SEG(0);
17851 -
17852 - per_cpu(softirq_ctx, cpu) = irqctx;
17853 + per_cpu(hardirq_ctx, cpu) = page_address(alloc_pages_node(cpu_to_node(cpu), THREADINFO_GFP, THREAD_SIZE_ORDER));
17854 + per_cpu(softirq_ctx, cpu) = page_address(alloc_pages_node(cpu_to_node(cpu), THREADINFO_GFP, THREAD_SIZE_ORDER));
17855 +
17856 + printk(KERN_DEBUG "CPU %u irqstacks, hard=%p soft=%p\n",
17857 + cpu, per_cpu(hardirq_ctx, cpu), per_cpu(softirq_ctx, cpu));
17858
17859 printk(KERN_DEBUG "CPU %u irqstacks, hard=%p soft=%p\n",
17860 cpu, per_cpu(hardirq_ctx, cpu), per_cpu(softirq_ctx, cpu));
17861 @@ -152,7 +141,6 @@ void __cpuinit irq_ctx_init(int cpu)
17862 asmlinkage void do_softirq(void)
17863 {
17864 unsigned long flags;
17865 - struct thread_info *curctx;
17866 union irq_ctx *irqctx;
17867 u32 *isp;
17868
17869 @@ -162,15 +150,22 @@ asmlinkage void do_softirq(void)
17870 local_irq_save(flags);
17871
17872 if (local_softirq_pending()) {
17873 - curctx = current_thread_info();
17874 irqctx = __this_cpu_read(softirq_ctx);
17875 - irqctx->tinfo.task = curctx->task;
17876 - irqctx->tinfo.previous_esp = current_stack_pointer;
17877 + irqctx->previous_esp = current_stack_pointer;
17878
17879 /* build the stack frame on the softirq stack */
17880 - isp = (u32 *) ((char *)irqctx + sizeof(*irqctx));
17881 + isp = (u32 *) ((char *)irqctx + sizeof(*irqctx) - 8);
17882 +
17883 +#ifdef CONFIG_PAX_MEMORY_UDEREF
17884 + __set_fs(MAKE_MM_SEG(0));
17885 +#endif
17886
17887 call_on_stack(__do_softirq, isp);
17888 +
17889 +#ifdef CONFIG_PAX_MEMORY_UDEREF
17890 + __set_fs(current_thread_info()->addr_limit);
17891 +#endif
17892 +
17893 /*
17894 * Shouldn't happen, we returned above if in_interrupt():
17895 */
17896 @@ -191,7 +186,7 @@ bool handle_irq(unsigned irq, struct pt_regs *regs)
17897 if (unlikely(!desc))
17898 return false;
17899
17900 - if (user_mode_vm(regs) || !execute_on_irq_stack(overflow, desc, irq)) {
17901 + if (user_mode(regs) || !execute_on_irq_stack(overflow, desc, irq)) {
17902 if (unlikely(overflow))
17903 print_stack_overflow();
17904 desc->handle_irq(irq, desc);
17905 diff --git a/arch/x86/kernel/irq_64.c b/arch/x86/kernel/irq_64.c
17906 index d04d3ec..ea4b374 100644
17907 --- a/arch/x86/kernel/irq_64.c
17908 +++ b/arch/x86/kernel/irq_64.c
17909 @@ -44,7 +44,7 @@ static inline void stack_overflow_check(struct pt_regs *regs)
17910 u64 estack_top, estack_bottom;
17911 u64 curbase = (u64)task_stack_page(current);
17912
17913 - if (user_mode_vm(regs))
17914 + if (user_mode(regs))
17915 return;
17916
17917 if (regs->sp >= curbase + sizeof(struct thread_info) +
17918 diff --git a/arch/x86/kernel/kdebugfs.c b/arch/x86/kernel/kdebugfs.c
17919 index dc1404b..bbc43e7 100644
17920 --- a/arch/x86/kernel/kdebugfs.c
17921 +++ b/arch/x86/kernel/kdebugfs.c
17922 @@ -27,7 +27,7 @@ struct setup_data_node {
17923 u32 len;
17924 };
17925
17926 -static ssize_t setup_data_read(struct file *file, char __user *user_buf,
17927 +static ssize_t __size_overflow(3) setup_data_read(struct file *file, char __user *user_buf,
17928 size_t count, loff_t *ppos)
17929 {
17930 struct setup_data_node *node = file->private_data;
17931 diff --git a/arch/x86/kernel/kgdb.c b/arch/x86/kernel/kgdb.c
17932 index 3f61904..873cea9 100644
17933 --- a/arch/x86/kernel/kgdb.c
17934 +++ b/arch/x86/kernel/kgdb.c
17935 @@ -127,11 +127,11 @@ char *dbg_get_reg(int regno, void *mem, struct pt_regs *regs)
17936 #ifdef CONFIG_X86_32
17937 switch (regno) {
17938 case GDB_SS:
17939 - if (!user_mode_vm(regs))
17940 + if (!user_mode(regs))
17941 *(unsigned long *)mem = __KERNEL_DS;
17942 break;
17943 case GDB_SP:
17944 - if (!user_mode_vm(regs))
17945 + if (!user_mode(regs))
17946 *(unsigned long *)mem = kernel_stack_pointer(regs);
17947 break;
17948 case GDB_GS:
17949 @@ -476,12 +476,12 @@ int kgdb_arch_handle_exception(int e_vector, int signo, int err_code,
17950 case 'k':
17951 /* clear the trace bit */
17952 linux_regs->flags &= ~X86_EFLAGS_TF;
17953 - atomic_set(&kgdb_cpu_doing_single_step, -1);
17954 + atomic_set_unchecked(&kgdb_cpu_doing_single_step, -1);
17955
17956 /* set the trace bit if we're stepping */
17957 if (remcomInBuffer[0] == 's') {
17958 linux_regs->flags |= X86_EFLAGS_TF;
17959 - atomic_set(&kgdb_cpu_doing_single_step,
17960 + atomic_set_unchecked(&kgdb_cpu_doing_single_step,
17961 raw_smp_processor_id());
17962 }
17963
17964 @@ -546,7 +546,7 @@ static int __kgdb_notify(struct die_args *args, unsigned long cmd)
17965
17966 switch (cmd) {
17967 case DIE_DEBUG:
17968 - if (atomic_read(&kgdb_cpu_doing_single_step) != -1) {
17969 + if (atomic_read_unchecked(&kgdb_cpu_doing_single_step) != -1) {
17970 if (user_mode(regs))
17971 return single_step_cont(regs, args);
17972 break;
17973 diff --git a/arch/x86/kernel/kprobes-opt.c b/arch/x86/kernel/kprobes-opt.c
17974 index c5e410e..da6aaf9 100644
17975 --- a/arch/x86/kernel/kprobes-opt.c
17976 +++ b/arch/x86/kernel/kprobes-opt.c
17977 @@ -338,7 +338,7 @@ int __kprobes arch_prepare_optimized_kprobe(struct optimized_kprobe *op)
17978 * Verify if the address gap is in 2GB range, because this uses
17979 * a relative jump.
17980 */
17981 - rel = (long)op->optinsn.insn - (long)op->kp.addr + RELATIVEJUMP_SIZE;
17982 + rel = (long)op->optinsn.insn - ktla_ktva((long)op->kp.addr) + RELATIVEJUMP_SIZE;
17983 if (abs(rel) > 0x7fffffff)
17984 return -ERANGE;
17985
17986 @@ -359,11 +359,11 @@ int __kprobes arch_prepare_optimized_kprobe(struct optimized_kprobe *op)
17987 synthesize_set_arg1(buf + TMPL_MOVE_IDX, (unsigned long)op);
17988
17989 /* Set probe function call */
17990 - synthesize_relcall(buf + TMPL_CALL_IDX, optimized_callback);
17991 + synthesize_relcall(buf + TMPL_CALL_IDX, ktla_ktva(optimized_callback));
17992
17993 /* Set returning jmp instruction at the tail of out-of-line buffer */
17994 synthesize_reljump(buf + TMPL_END_IDX + op->optinsn.size,
17995 - (u8 *)op->kp.addr + op->optinsn.size);
17996 + (u8 *)ktla_ktva(op->kp.addr) + op->optinsn.size);
17997
17998 flush_icache_range((unsigned long) buf,
17999 (unsigned long) buf + TMPL_END_IDX +
18000 @@ -385,7 +385,7 @@ static void __kprobes setup_optimize_kprobe(struct text_poke_param *tprm,
18001 ((long)op->kp.addr + RELATIVEJUMP_SIZE));
18002
18003 /* Backup instructions which will be replaced by jump address */
18004 - memcpy(op->optinsn.copied_insn, op->kp.addr + INT3_SIZE,
18005 + memcpy(op->optinsn.copied_insn, ktla_ktva(op->kp.addr) + INT3_SIZE,
18006 RELATIVE_ADDR_SIZE);
18007
18008 insn_buf[0] = RELATIVEJUMP_OPCODE;
18009 diff --git a/arch/x86/kernel/kprobes.c b/arch/x86/kernel/kprobes.c
18010 index e2f751e..dffa2a0 100644
18011 --- a/arch/x86/kernel/kprobes.c
18012 +++ b/arch/x86/kernel/kprobes.c
18013 @@ -120,8 +120,11 @@ static void __kprobes __synthesize_relative_insn(void *from, void *to, u8 op)
18014 } __attribute__((packed)) *insn;
18015
18016 insn = (struct __arch_relative_insn *)from;
18017 +
18018 + pax_open_kernel();
18019 insn->raddr = (s32)((long)(to) - ((long)(from) + 5));
18020 insn->op = op;
18021 + pax_close_kernel();
18022 }
18023
18024 /* Insert a jump instruction at address 'from', which jumps to address 'to'.*/
18025 @@ -164,7 +167,7 @@ int __kprobes can_boost(kprobe_opcode_t *opcodes)
18026 kprobe_opcode_t opcode;
18027 kprobe_opcode_t *orig_opcodes = opcodes;
18028
18029 - if (search_exception_tables((unsigned long)opcodes))
18030 + if (search_exception_tables(ktva_ktla((unsigned long)opcodes)))
18031 return 0; /* Page fault may occur on this address. */
18032
18033 retry:
18034 @@ -332,7 +335,9 @@ int __kprobes __copy_instruction(u8 *dest, u8 *src)
18035 /* Another subsystem puts a breakpoint, failed to recover */
18036 if (insn.opcode.bytes[0] == BREAKPOINT_INSTRUCTION)
18037 return 0;
18038 + pax_open_kernel();
18039 memcpy(dest, insn.kaddr, insn.length);
18040 + pax_close_kernel();
18041
18042 #ifdef CONFIG_X86_64
18043 if (insn_rip_relative(&insn)) {
18044 @@ -355,7 +360,9 @@ int __kprobes __copy_instruction(u8 *dest, u8 *src)
18045 newdisp = (u8 *) src + (s64) insn.displacement.value - (u8 *) dest;
18046 BUG_ON((s64) (s32) newdisp != newdisp); /* Sanity check. */
18047 disp = (u8 *) dest + insn_offset_displacement(&insn);
18048 + pax_open_kernel();
18049 *(s32 *) disp = (s32) newdisp;
18050 + pax_close_kernel();
18051 }
18052 #endif
18053 return insn.length;
18054 @@ -485,7 +492,7 @@ setup_singlestep(struct kprobe *p, struct pt_regs *regs, struct kprobe_ctlblk *k
18055 * nor set current_kprobe, because it doesn't use single
18056 * stepping.
18057 */
18058 - regs->ip = (unsigned long)p->ainsn.insn;
18059 + regs->ip = ktva_ktla((unsigned long)p->ainsn.insn);
18060 preempt_enable_no_resched();
18061 return;
18062 }
18063 @@ -504,7 +511,7 @@ setup_singlestep(struct kprobe *p, struct pt_regs *regs, struct kprobe_ctlblk *k
18064 if (p->opcode == BREAKPOINT_INSTRUCTION)
18065 regs->ip = (unsigned long)p->addr;
18066 else
18067 - regs->ip = (unsigned long)p->ainsn.insn;
18068 + regs->ip = ktva_ktla((unsigned long)p->ainsn.insn);
18069 }
18070
18071 /*
18072 @@ -583,7 +590,7 @@ static int __kprobes kprobe_handler(struct pt_regs *regs)
18073 setup_singlestep(p, regs, kcb, 0);
18074 return 1;
18075 }
18076 - } else if (*addr != BREAKPOINT_INSTRUCTION) {
18077 + } else if (*(kprobe_opcode_t *)ktla_ktva((unsigned long)addr) != BREAKPOINT_INSTRUCTION) {
18078 /*
18079 * The breakpoint instruction was removed right
18080 * after we hit it. Another cpu has removed
18081 @@ -628,6 +635,9 @@ static void __used __kprobes kretprobe_trampoline_holder(void)
18082 " movq %rax, 152(%rsp)\n"
18083 RESTORE_REGS_STRING
18084 " popfq\n"
18085 +#ifdef KERNEXEC_PLUGIN
18086 + " btsq $63,(%rsp)\n"
18087 +#endif
18088 #else
18089 " pushf\n"
18090 SAVE_REGS_STRING
18091 @@ -765,7 +775,7 @@ static void __kprobes
18092 resume_execution(struct kprobe *p, struct pt_regs *regs, struct kprobe_ctlblk *kcb)
18093 {
18094 unsigned long *tos = stack_addr(regs);
18095 - unsigned long copy_ip = (unsigned long)p->ainsn.insn;
18096 + unsigned long copy_ip = ktva_ktla((unsigned long)p->ainsn.insn);
18097 unsigned long orig_ip = (unsigned long)p->addr;
18098 kprobe_opcode_t *insn = p->ainsn.insn;
18099
18100 @@ -947,7 +957,7 @@ kprobe_exceptions_notify(struct notifier_block *self, unsigned long val, void *d
18101 struct die_args *args = data;
18102 int ret = NOTIFY_DONE;
18103
18104 - if (args->regs && user_mode_vm(args->regs))
18105 + if (args->regs && user_mode(args->regs))
18106 return ret;
18107
18108 switch (val) {
18109 diff --git a/arch/x86/kernel/ldt.c b/arch/x86/kernel/ldt.c
18110 index ebc9873..1b9724b 100644
18111 --- a/arch/x86/kernel/ldt.c
18112 +++ b/arch/x86/kernel/ldt.c
18113 @@ -66,13 +66,13 @@ static int alloc_ldt(mm_context_t *pc, int mincount, int reload)
18114 if (reload) {
18115 #ifdef CONFIG_SMP
18116 preempt_disable();
18117 - load_LDT(pc);
18118 + load_LDT_nolock(pc);
18119 if (!cpumask_equal(mm_cpumask(current->mm),
18120 cpumask_of(smp_processor_id())))
18121 smp_call_function(flush_ldt, current->mm, 1);
18122 preempt_enable();
18123 #else
18124 - load_LDT(pc);
18125 + load_LDT_nolock(pc);
18126 #endif
18127 }
18128 if (oldsize) {
18129 @@ -94,7 +94,7 @@ static inline int copy_ldt(mm_context_t *new, mm_context_t *old)
18130 return err;
18131
18132 for (i = 0; i < old->size; i++)
18133 - write_ldt_entry(new->ldt, i, old->ldt + i * LDT_ENTRY_SIZE);
18134 + write_ldt_entry(new->ldt, i, old->ldt + i);
18135 return 0;
18136 }
18137
18138 @@ -115,6 +115,24 @@ int init_new_context(struct task_struct *tsk, struct mm_struct *mm)
18139 retval = copy_ldt(&mm->context, &old_mm->context);
18140 mutex_unlock(&old_mm->context.lock);
18141 }
18142 +
18143 + if (tsk == current) {
18144 + mm->context.vdso = 0;
18145 +
18146 +#ifdef CONFIG_X86_32
18147 +#if defined(CONFIG_PAX_PAGEEXEC) || defined(CONFIG_PAX_SEGMEXEC)
18148 + mm->context.user_cs_base = 0UL;
18149 + mm->context.user_cs_limit = ~0UL;
18150 +
18151 +#if defined(CONFIG_PAX_PAGEEXEC) && defined(CONFIG_SMP)
18152 + cpus_clear(mm->context.cpu_user_cs_mask);
18153 +#endif
18154 +
18155 +#endif
18156 +#endif
18157 +
18158 + }
18159 +
18160 return retval;
18161 }
18162
18163 @@ -229,6 +247,13 @@ static int write_ldt(void __user *ptr, unsigned long bytecount, int oldmode)
18164 }
18165 }
18166
18167 +#ifdef CONFIG_PAX_SEGMEXEC
18168 + if ((mm->pax_flags & MF_PAX_SEGMEXEC) && (ldt_info.contents & MODIFY_LDT_CONTENTS_CODE)) {
18169 + error = -EINVAL;
18170 + goto out_unlock;
18171 + }
18172 +#endif
18173 +
18174 fill_ldt(&ldt, &ldt_info);
18175 if (oldmode)
18176 ldt.avl = 0;
18177 diff --git a/arch/x86/kernel/machine_kexec_32.c b/arch/x86/kernel/machine_kexec_32.c
18178 index 5b19e4d..6476a76 100644
18179 --- a/arch/x86/kernel/machine_kexec_32.c
18180 +++ b/arch/x86/kernel/machine_kexec_32.c
18181 @@ -26,7 +26,7 @@
18182 #include <asm/cacheflush.h>
18183 #include <asm/debugreg.h>
18184
18185 -static void set_idt(void *newidt, __u16 limit)
18186 +static void set_idt(struct desc_struct *newidt, __u16 limit)
18187 {
18188 struct desc_ptr curidt;
18189
18190 @@ -38,7 +38,7 @@ static void set_idt(void *newidt, __u16 limit)
18191 }
18192
18193
18194 -static void set_gdt(void *newgdt, __u16 limit)
18195 +static void set_gdt(struct desc_struct *newgdt, __u16 limit)
18196 {
18197 struct desc_ptr curgdt;
18198
18199 @@ -216,7 +216,7 @@ void machine_kexec(struct kimage *image)
18200 }
18201
18202 control_page = page_address(image->control_code_page);
18203 - memcpy(control_page, relocate_kernel, KEXEC_CONTROL_CODE_MAX_SIZE);
18204 + memcpy(control_page, (void *)ktla_ktva((unsigned long)relocate_kernel), KEXEC_CONTROL_CODE_MAX_SIZE);
18205
18206 relocate_kernel_ptr = control_page;
18207 page_list[PA_CONTROL_PAGE] = __pa(control_page);
18208 diff --git a/arch/x86/kernel/microcode_intel.c b/arch/x86/kernel/microcode_intel.c
18209 index 0327e2b..e43737b 100644
18210 --- a/arch/x86/kernel/microcode_intel.c
18211 +++ b/arch/x86/kernel/microcode_intel.c
18212 @@ -430,13 +430,13 @@ static enum ucode_state request_microcode_fw(int cpu, struct device *device)
18213
18214 static int get_ucode_user(void *to, const void *from, size_t n)
18215 {
18216 - return copy_from_user(to, from, n);
18217 + return copy_from_user(to, (const void __force_user *)from, n);
18218 }
18219
18220 static enum ucode_state
18221 request_microcode_user(int cpu, const void __user *buf, size_t size)
18222 {
18223 - return generic_load_microcode(cpu, (void *)buf, size, &get_ucode_user);
18224 + return generic_load_microcode(cpu, (__force_kernel void *)buf, size, &get_ucode_user);
18225 }
18226
18227 static void microcode_fini_cpu(int cpu)
18228 diff --git a/arch/x86/kernel/module.c b/arch/x86/kernel/module.c
18229 index 216a4d7..b328f09 100644
18230 --- a/arch/x86/kernel/module.c
18231 +++ b/arch/x86/kernel/module.c
18232 @@ -43,15 +43,60 @@ do { \
18233 } while (0)
18234 #endif
18235
18236 -void *module_alloc(unsigned long size)
18237 +static inline void *__module_alloc(unsigned long size, pgprot_t prot)
18238 {
18239 - if (PAGE_ALIGN(size) > MODULES_LEN)
18240 + if (size == 0 || PAGE_ALIGN(size) > MODULES_LEN)
18241 return NULL;
18242 return __vmalloc_node_range(size, 1, MODULES_VADDR, MODULES_END,
18243 - GFP_KERNEL | __GFP_HIGHMEM, PAGE_KERNEL_EXEC,
18244 + GFP_KERNEL | __GFP_HIGHMEM | __GFP_ZERO, prot,
18245 -1, __builtin_return_address(0));
18246 }
18247
18248 +void *module_alloc(unsigned long size)
18249 +{
18250 +
18251 +#ifdef CONFIG_PAX_KERNEXEC
18252 + return __module_alloc(size, PAGE_KERNEL);
18253 +#else
18254 + return __module_alloc(size, PAGE_KERNEL_EXEC);
18255 +#endif
18256 +
18257 +}
18258 +
18259 +#ifdef CONFIG_PAX_KERNEXEC
18260 +#ifdef CONFIG_X86_32
18261 +void *module_alloc_exec(unsigned long size)
18262 +{
18263 + struct vm_struct *area;
18264 +
18265 + if (size == 0)
18266 + return NULL;
18267 +
18268 + area = __get_vm_area(size, VM_ALLOC, (unsigned long)&MODULES_EXEC_VADDR, (unsigned long)&MODULES_EXEC_END);
18269 + return area ? area->addr : NULL;
18270 +}
18271 +EXPORT_SYMBOL(module_alloc_exec);
18272 +
18273 +void module_free_exec(struct module *mod, void *module_region)
18274 +{
18275 + vunmap(module_region);
18276 +}
18277 +EXPORT_SYMBOL(module_free_exec);
18278 +#else
18279 +void module_free_exec(struct module *mod, void *module_region)
18280 +{
18281 + module_free(mod, module_region);
18282 +}
18283 +EXPORT_SYMBOL(module_free_exec);
18284 +
18285 +void *module_alloc_exec(unsigned long size)
18286 +{
18287 + return __module_alloc(size, PAGE_KERNEL_RX);
18288 +}
18289 +EXPORT_SYMBOL(module_alloc_exec);
18290 +#endif
18291 +#endif
18292 +
18293 #ifdef CONFIG_X86_32
18294 int apply_relocate(Elf32_Shdr *sechdrs,
18295 const char *strtab,
18296 @@ -62,14 +107,16 @@ int apply_relocate(Elf32_Shdr *sechdrs,
18297 unsigned int i;
18298 Elf32_Rel *rel = (void *)sechdrs[relsec].sh_addr;
18299 Elf32_Sym *sym;
18300 - uint32_t *location;
18301 + uint32_t *plocation, location;
18302
18303 DEBUGP("Applying relocate section %u to %u\n",
18304 relsec, sechdrs[relsec].sh_info);
18305 for (i = 0; i < sechdrs[relsec].sh_size / sizeof(*rel); i++) {
18306 /* This is where to make the change */
18307 - location = (void *)sechdrs[sechdrs[relsec].sh_info].sh_addr
18308 - + rel[i].r_offset;
18309 + plocation = (void *)sechdrs[sechdrs[relsec].sh_info].sh_addr + rel[i].r_offset;
18310 + location = (uint32_t)plocation;
18311 + if (sechdrs[sechdrs[relsec].sh_info].sh_flags & SHF_EXECINSTR)
18312 + plocation = ktla_ktva((void *)plocation);
18313 /* This is the symbol it is referring to. Note that all
18314 undefined symbols have been resolved. */
18315 sym = (Elf32_Sym *)sechdrs[symindex].sh_addr
18316 @@ -78,11 +125,15 @@ int apply_relocate(Elf32_Shdr *sechdrs,
18317 switch (ELF32_R_TYPE(rel[i].r_info)) {
18318 case R_386_32:
18319 /* We add the value into the location given */
18320 - *location += sym->st_value;
18321 + pax_open_kernel();
18322 + *plocation += sym->st_value;
18323 + pax_close_kernel();
18324 break;
18325 case R_386_PC32:
18326 /* Add the value, subtract its position */
18327 - *location += sym->st_value - (uint32_t)location;
18328 + pax_open_kernel();
18329 + *plocation += sym->st_value - location;
18330 + pax_close_kernel();
18331 break;
18332 default:
18333 pr_err("%s: Unknown relocation: %u\n",
18334 @@ -127,21 +178,30 @@ int apply_relocate_add(Elf64_Shdr *sechdrs,
18335 case R_X86_64_NONE:
18336 break;
18337 case R_X86_64_64:
18338 + pax_open_kernel();
18339 *(u64 *)loc = val;
18340 + pax_close_kernel();
18341 break;
18342 case R_X86_64_32:
18343 + pax_open_kernel();
18344 *(u32 *)loc = val;
18345 + pax_close_kernel();
18346 if (val != *(u32 *)loc)
18347 goto overflow;
18348 break;
18349 case R_X86_64_32S:
18350 + pax_open_kernel();
18351 *(s32 *)loc = val;
18352 + pax_close_kernel();
18353 if ((s64)val != *(s32 *)loc)
18354 goto overflow;
18355 break;
18356 case R_X86_64_PC32:
18357 val -= (u64)loc;
18358 + pax_open_kernel();
18359 *(u32 *)loc = val;
18360 + pax_close_kernel();
18361 +
18362 #if 0
18363 if ((s64)val != *(s32 *)loc)
18364 goto overflow;
18365 diff --git a/arch/x86/kernel/nmi.c b/arch/x86/kernel/nmi.c
18366 index f84f5c5..e27e54b 100644
18367 --- a/arch/x86/kernel/nmi.c
18368 +++ b/arch/x86/kernel/nmi.c
18369 @@ -479,6 +479,17 @@ static inline void nmi_nesting_postprocess(void)
18370 dotraplinkage notrace __kprobes void
18371 do_nmi(struct pt_regs *regs, long error_code)
18372 {
18373 +
18374 +#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
18375 + if (!user_mode(regs)) {
18376 + unsigned long cs = regs->cs & 0xFFFF;
18377 + unsigned long ip = ktva_ktla(regs->ip);
18378 +
18379 + if ((cs == __KERNEL_CS || cs == __KERNEXEC_KERNEL_CS) && ip <= (unsigned long)_etext)
18380 + regs->ip = ip;
18381 + }
18382 +#endif
18383 +
18384 nmi_nesting_preprocess(regs);
18385
18386 nmi_enter();
18387 diff --git a/arch/x86/kernel/paravirt-spinlocks.c b/arch/x86/kernel/paravirt-spinlocks.c
18388 index 676b8c7..870ba04 100644
18389 --- a/arch/x86/kernel/paravirt-spinlocks.c
18390 +++ b/arch/x86/kernel/paravirt-spinlocks.c
18391 @@ -13,7 +13,7 @@ default_spin_lock_flags(arch_spinlock_t *lock, unsigned long flags)
18392 arch_spin_lock(lock);
18393 }
18394
18395 -struct pv_lock_ops pv_lock_ops = {
18396 +struct pv_lock_ops pv_lock_ops __read_only = {
18397 #ifdef CONFIG_SMP
18398 .spin_is_locked = __ticket_spin_is_locked,
18399 .spin_is_contended = __ticket_spin_is_contended,
18400 diff --git a/arch/x86/kernel/paravirt.c b/arch/x86/kernel/paravirt.c
18401 index 17fff18..7bb2088 100644
18402 --- a/arch/x86/kernel/paravirt.c
18403 +++ b/arch/x86/kernel/paravirt.c
18404 @@ -55,6 +55,9 @@ u64 _paravirt_ident_64(u64 x)
18405 {
18406 return x;
18407 }
18408 +#if defined(CONFIG_X86_32) && defined(CONFIG_X86_PAE)
18409 +PV_CALLEE_SAVE_REGS_THUNK(_paravirt_ident_64);
18410 +#endif
18411
18412 void __init default_banner(void)
18413 {
18414 @@ -147,15 +150,19 @@ unsigned paravirt_patch_default(u8 type, u16 clobbers, void *insnbuf,
18415 if (opfunc == NULL)
18416 /* If there's no function, patch it with a ud2a (BUG) */
18417 ret = paravirt_patch_insns(insnbuf, len, ud2a, ud2a+sizeof(ud2a));
18418 - else if (opfunc == _paravirt_nop)
18419 + else if (opfunc == (void *)_paravirt_nop)
18420 /* If the operation is a nop, then nop the callsite */
18421 ret = paravirt_patch_nop();
18422
18423 /* identity functions just return their single argument */
18424 - else if (opfunc == _paravirt_ident_32)
18425 + else if (opfunc == (void *)_paravirt_ident_32)
18426 ret = paravirt_patch_ident_32(insnbuf, len);
18427 - else if (opfunc == _paravirt_ident_64)
18428 + else if (opfunc == (void *)_paravirt_ident_64)
18429 ret = paravirt_patch_ident_64(insnbuf, len);
18430 +#if defined(CONFIG_X86_32) && defined(CONFIG_X86_PAE)
18431 + else if (opfunc == (void *)__raw_callee_save__paravirt_ident_64)
18432 + ret = paravirt_patch_ident_64(insnbuf, len);
18433 +#endif
18434
18435 else if (type == PARAVIRT_PATCH(pv_cpu_ops.iret) ||
18436 type == PARAVIRT_PATCH(pv_cpu_ops.irq_enable_sysexit) ||
18437 @@ -180,7 +187,7 @@ unsigned paravirt_patch_insns(void *insnbuf, unsigned len,
18438 if (insn_len > len || start == NULL)
18439 insn_len = len;
18440 else
18441 - memcpy(insnbuf, start, insn_len);
18442 + memcpy(insnbuf, ktla_ktva(start), insn_len);
18443
18444 return insn_len;
18445 }
18446 @@ -304,7 +311,7 @@ void arch_flush_lazy_mmu_mode(void)
18447 preempt_enable();
18448 }
18449
18450 -struct pv_info pv_info = {
18451 +struct pv_info pv_info __read_only = {
18452 .name = "bare hardware",
18453 .paravirt_enabled = 0,
18454 .kernel_rpl = 0,
18455 @@ -315,16 +322,16 @@ struct pv_info pv_info = {
18456 #endif
18457 };
18458
18459 -struct pv_init_ops pv_init_ops = {
18460 +struct pv_init_ops pv_init_ops __read_only = {
18461 .patch = native_patch,
18462 };
18463
18464 -struct pv_time_ops pv_time_ops = {
18465 +struct pv_time_ops pv_time_ops __read_only = {
18466 .sched_clock = native_sched_clock,
18467 .steal_clock = native_steal_clock,
18468 };
18469
18470 -struct pv_irq_ops pv_irq_ops = {
18471 +struct pv_irq_ops pv_irq_ops __read_only = {
18472 .save_fl = __PV_IS_CALLEE_SAVE(native_save_fl),
18473 .restore_fl = __PV_IS_CALLEE_SAVE(native_restore_fl),
18474 .irq_disable = __PV_IS_CALLEE_SAVE(native_irq_disable),
18475 @@ -336,7 +343,7 @@ struct pv_irq_ops pv_irq_ops = {
18476 #endif
18477 };
18478
18479 -struct pv_cpu_ops pv_cpu_ops = {
18480 +struct pv_cpu_ops pv_cpu_ops __read_only = {
18481 .cpuid = native_cpuid,
18482 .get_debugreg = native_get_debugreg,
18483 .set_debugreg = native_set_debugreg,
18484 @@ -395,21 +402,26 @@ struct pv_cpu_ops pv_cpu_ops = {
18485 .end_context_switch = paravirt_nop,
18486 };
18487
18488 -struct pv_apic_ops pv_apic_ops = {
18489 +struct pv_apic_ops pv_apic_ops __read_only = {
18490 #ifdef CONFIG_X86_LOCAL_APIC
18491 .startup_ipi_hook = paravirt_nop,
18492 #endif
18493 };
18494
18495 -#if defined(CONFIG_X86_32) && !defined(CONFIG_X86_PAE)
18496 +#ifdef CONFIG_X86_32
18497 +#ifdef CONFIG_X86_PAE
18498 +/* 64-bit pagetable entries */
18499 +#define PTE_IDENT PV_CALLEE_SAVE(_paravirt_ident_64)
18500 +#else
18501 /* 32-bit pagetable entries */
18502 #define PTE_IDENT __PV_IS_CALLEE_SAVE(_paravirt_ident_32)
18503 +#endif
18504 #else
18505 /* 64-bit pagetable entries */
18506 #define PTE_IDENT __PV_IS_CALLEE_SAVE(_paravirt_ident_64)
18507 #endif
18508
18509 -struct pv_mmu_ops pv_mmu_ops = {
18510 +struct pv_mmu_ops pv_mmu_ops __read_only = {
18511
18512 .read_cr2 = native_read_cr2,
18513 .write_cr2 = native_write_cr2,
18514 @@ -459,6 +471,7 @@ struct pv_mmu_ops pv_mmu_ops = {
18515 .make_pud = PTE_IDENT,
18516
18517 .set_pgd = native_set_pgd,
18518 + .set_pgd_batched = native_set_pgd_batched,
18519 #endif
18520 #endif /* PAGETABLE_LEVELS >= 3 */
18521
18522 @@ -478,6 +491,12 @@ struct pv_mmu_ops pv_mmu_ops = {
18523 },
18524
18525 .set_fixmap = native_set_fixmap,
18526 +
18527 +#ifdef CONFIG_PAX_KERNEXEC
18528 + .pax_open_kernel = native_pax_open_kernel,
18529 + .pax_close_kernel = native_pax_close_kernel,
18530 +#endif
18531 +
18532 };
18533
18534 EXPORT_SYMBOL_GPL(pv_time_ops);
18535 diff --git a/arch/x86/kernel/pci-iommu_table.c b/arch/x86/kernel/pci-iommu_table.c
18536 index 35ccf75..7a15747 100644
18537 --- a/arch/x86/kernel/pci-iommu_table.c
18538 +++ b/arch/x86/kernel/pci-iommu_table.c
18539 @@ -2,7 +2,7 @@
18540 #include <asm/iommu_table.h>
18541 #include <linux/string.h>
18542 #include <linux/kallsyms.h>
18543 -
18544 +#include <linux/sched.h>
18545
18546 #define DEBUG 1
18547
18548 diff --git a/arch/x86/kernel/process.c b/arch/x86/kernel/process.c
18549 index ef6a845..8028ed3 100644
18550 --- a/arch/x86/kernel/process.c
18551 +++ b/arch/x86/kernel/process.c
18552 @@ -36,7 +36,8 @@
18553 * section. Since TSS's are completely CPU-local, we want them
18554 * on exact cacheline boundaries, to eliminate cacheline ping-pong.
18555 */
18556 -DEFINE_PER_CPU_SHARED_ALIGNED(struct tss_struct, init_tss) = INIT_TSS;
18557 +struct tss_struct init_tss[NR_CPUS] ____cacheline_internodealigned_in_smp = { [0 ... NR_CPUS-1] = INIT_TSS };
18558 +EXPORT_SYMBOL(init_tss);
18559
18560 #ifdef CONFIG_X86_64
18561 static DEFINE_PER_CPU(unsigned char, is_idle);
18562 @@ -94,7 +95,7 @@ void arch_task_cache_init(void)
18563 task_xstate_cachep =
18564 kmem_cache_create("task_xstate", xstate_size,
18565 __alignof__(union thread_xstate),
18566 - SLAB_PANIC | SLAB_NOTRACK, NULL);
18567 + SLAB_PANIC | SLAB_NOTRACK | SLAB_USERCOPY, NULL);
18568 }
18569
18570 static inline void drop_fpu(struct task_struct *tsk)
18571 @@ -117,7 +118,7 @@ void exit_thread(void)
18572 unsigned long *bp = t->io_bitmap_ptr;
18573
18574 if (bp) {
18575 - struct tss_struct *tss = &per_cpu(init_tss, get_cpu());
18576 + struct tss_struct *tss = init_tss + get_cpu();
18577
18578 t->io_bitmap_ptr = NULL;
18579 clear_thread_flag(TIF_IO_BITMAP);
18580 @@ -148,7 +149,7 @@ void show_regs_common(void)
18581 board = dmi_get_system_info(DMI_BOARD_NAME);
18582
18583 printk(KERN_DEFAULT "Pid: %d, comm: %.20s %s %s %.*s %s %s%s%s\n",
18584 - current->pid, current->comm, print_tainted(),
18585 + task_pid_nr(current), current->comm, print_tainted(),
18586 init_utsname()->release,
18587 (int)strcspn(init_utsname()->version, " "),
18588 init_utsname()->version,
18589 @@ -161,6 +162,9 @@ void flush_thread(void)
18590 {
18591 struct task_struct *tsk = current;
18592
18593 +#if defined(CONFIG_X86_32) && !defined(CONFIG_CC_STACKPROTECTOR) && !defined(CONFIG_PAX_MEMORY_UDEREF)
18594 + loadsegment(gs, 0);
18595 +#endif
18596 flush_ptrace_hw_breakpoint(tsk);
18597 memset(tsk->thread.tls_array, 0, sizeof(tsk->thread.tls_array));
18598 drop_fpu(tsk);
18599 @@ -318,10 +322,10 @@ int kernel_thread(int (*fn)(void *), void *arg, unsigned long flags)
18600 regs.di = (unsigned long) arg;
18601
18602 #ifdef CONFIG_X86_32
18603 - regs.ds = __USER_DS;
18604 - regs.es = __USER_DS;
18605 + regs.ds = __KERNEL_DS;
18606 + regs.es = __KERNEL_DS;
18607 regs.fs = __KERNEL_PERCPU;
18608 - regs.gs = __KERNEL_STACK_CANARY;
18609 + savesegment(gs, regs.gs);
18610 #else
18611 regs.ss = __KERNEL_DS;
18612 #endif
18613 @@ -407,7 +411,7 @@ static void __exit_idle(void)
18614 void exit_idle(void)
18615 {
18616 /* idle loop has pid 0 */
18617 - if (current->pid)
18618 + if (task_pid_nr(current))
18619 return;
18620 __exit_idle();
18621 }
18622 @@ -516,7 +520,7 @@ bool set_pm_idle_to_default(void)
18623
18624 return ret;
18625 }
18626 -void stop_this_cpu(void *dummy)
18627 +__noreturn void stop_this_cpu(void *dummy)
18628 {
18629 local_irq_disable();
18630 /*
18631 @@ -744,16 +748,37 @@ static int __init idle_setup(char *str)
18632 }
18633 early_param("idle", idle_setup);
18634
18635 -unsigned long arch_align_stack(unsigned long sp)
18636 +#ifdef CONFIG_PAX_RANDKSTACK
18637 +void pax_randomize_kstack(struct pt_regs *regs)
18638 {
18639 - if (!(current->personality & ADDR_NO_RANDOMIZE) && randomize_va_space)
18640 - sp -= get_random_int() % 8192;
18641 - return sp & ~0xf;
18642 -}
18643 + struct thread_struct *thread = &current->thread;
18644 + unsigned long time;
18645
18646 -unsigned long arch_randomize_brk(struct mm_struct *mm)
18647 -{
18648 - unsigned long range_end = mm->brk + 0x02000000;
18649 - return randomize_range(mm->brk, range_end, 0) ? : mm->brk;
18650 -}
18651 + if (!randomize_va_space)
18652 + return;
18653 +
18654 + if (v8086_mode(regs))
18655 + return;
18656
18657 + rdtscl(time);
18658 +
18659 + /* P4 seems to return a 0 LSB, ignore it */
18660 +#ifdef CONFIG_MPENTIUM4
18661 + time &= 0x3EUL;
18662 + time <<= 2;
18663 +#elif defined(CONFIG_X86_64)
18664 + time &= 0xFUL;
18665 + time <<= 4;
18666 +#else
18667 + time &= 0x1FUL;
18668 + time <<= 3;
18669 +#endif
18670 +
18671 + thread->sp0 ^= time;
18672 + load_sp0(init_tss + smp_processor_id(), thread);
18673 +
18674 +#ifdef CONFIG_X86_64
18675 + this_cpu_write(kernel_stack, thread->sp0);
18676 +#endif
18677 +}
18678 +#endif
18679 diff --git a/arch/x86/kernel/process_32.c b/arch/x86/kernel/process_32.c
18680 index 516fa18..80bd9e6 100644
18681 --- a/arch/x86/kernel/process_32.c
18682 +++ b/arch/x86/kernel/process_32.c
18683 @@ -64,6 +64,7 @@ asmlinkage void ret_from_fork(void) __asm__("ret_from_fork");
18684 unsigned long thread_saved_pc(struct task_struct *tsk)
18685 {
18686 return ((unsigned long *)tsk->thread.sp)[3];
18687 +//XXX return tsk->thread.eip;
18688 }
18689
18690 void __show_regs(struct pt_regs *regs, int all)
18691 @@ -73,15 +74,14 @@ void __show_regs(struct pt_regs *regs, int all)
18692 unsigned long sp;
18693 unsigned short ss, gs;
18694
18695 - if (user_mode_vm(regs)) {
18696 + if (user_mode(regs)) {
18697 sp = regs->sp;
18698 ss = regs->ss & 0xffff;
18699 - gs = get_user_gs(regs);
18700 } else {
18701 sp = kernel_stack_pointer(regs);
18702 savesegment(ss, ss);
18703 - savesegment(gs, gs);
18704 }
18705 + gs = get_user_gs(regs);
18706
18707 show_regs_common();
18708
18709 @@ -134,13 +134,14 @@ int copy_thread(unsigned long clone_flags, unsigned long sp,
18710 struct task_struct *tsk;
18711 int err;
18712
18713 - childregs = task_pt_regs(p);
18714 + childregs = task_stack_page(p) + THREAD_SIZE - sizeof(struct pt_regs) - 8;
18715 *childregs = *regs;
18716 childregs->ax = 0;
18717 childregs->sp = sp;
18718
18719 p->thread.sp = (unsigned long) childregs;
18720 p->thread.sp0 = (unsigned long) (childregs+1);
18721 + p->tinfo.lowest_stack = (unsigned long)task_stack_page(p);
18722
18723 p->thread.ip = (unsigned long) ret_from_fork;
18724
18725 @@ -231,7 +232,7 @@ __switch_to(struct task_struct *prev_p, struct task_struct *next_p)
18726 struct thread_struct *prev = &prev_p->thread,
18727 *next = &next_p->thread;
18728 int cpu = smp_processor_id();
18729 - struct tss_struct *tss = &per_cpu(init_tss, cpu);
18730 + struct tss_struct *tss = init_tss + cpu;
18731 fpu_switch_t fpu;
18732
18733 /* never put a printk in __switch_to... printk() calls wake_up*() indirectly */
18734 @@ -255,6 +256,10 @@ __switch_to(struct task_struct *prev_p, struct task_struct *next_p)
18735 */
18736 lazy_save_gs(prev->gs);
18737
18738 +#ifdef CONFIG_PAX_MEMORY_UDEREF
18739 + __set_fs(task_thread_info(next_p)->addr_limit);
18740 +#endif
18741 +
18742 /*
18743 * Load the per-thread Thread-Local Storage descriptor.
18744 */
18745 @@ -285,6 +290,9 @@ __switch_to(struct task_struct *prev_p, struct task_struct *next_p)
18746 */
18747 arch_end_context_switch(next_p);
18748
18749 + this_cpu_write(current_task, next_p);
18750 + this_cpu_write(current_tinfo, &next_p->tinfo);
18751 +
18752 /*
18753 * Restore %gs if needed (which is common)
18754 */
18755 @@ -293,8 +301,6 @@ __switch_to(struct task_struct *prev_p, struct task_struct *next_p)
18756
18757 switch_fpu_finish(next_p, fpu);
18758
18759 - this_cpu_write(current_task, next_p);
18760 -
18761 return prev_p;
18762 }
18763
18764 @@ -324,4 +330,3 @@ unsigned long get_wchan(struct task_struct *p)
18765 } while (count++ < 16);
18766 return 0;
18767 }
18768 -
18769 diff --git a/arch/x86/kernel/process_64.c b/arch/x86/kernel/process_64.c
18770 index 0a980c9..1d0e689 100644
18771 --- a/arch/x86/kernel/process_64.c
18772 +++ b/arch/x86/kernel/process_64.c
18773 @@ -153,8 +153,7 @@ int copy_thread(unsigned long clone_flags, unsigned long sp,
18774 struct pt_regs *childregs;
18775 struct task_struct *me = current;
18776
18777 - childregs = ((struct pt_regs *)
18778 - (THREAD_SIZE + task_stack_page(p))) - 1;
18779 + childregs = task_stack_page(p) + THREAD_SIZE - sizeof(struct pt_regs) - 16;
18780 *childregs = *regs;
18781
18782 childregs->ax = 0;
18783 @@ -166,6 +165,7 @@ int copy_thread(unsigned long clone_flags, unsigned long sp,
18784 p->thread.sp = (unsigned long) childregs;
18785 p->thread.sp0 = (unsigned long) (childregs+1);
18786 p->thread.usersp = me->thread.usersp;
18787 + p->tinfo.lowest_stack = (unsigned long)task_stack_page(p);
18788
18789 set_tsk_thread_flag(p, TIF_FORK);
18790
18791 @@ -271,7 +271,7 @@ __switch_to(struct task_struct *prev_p, struct task_struct *next_p)
18792 struct thread_struct *prev = &prev_p->thread;
18793 struct thread_struct *next = &next_p->thread;
18794 int cpu = smp_processor_id();
18795 - struct tss_struct *tss = &per_cpu(init_tss, cpu);
18796 + struct tss_struct *tss = init_tss + cpu;
18797 unsigned fsindex, gsindex;
18798 fpu_switch_t fpu;
18799
18800 @@ -353,10 +353,9 @@ __switch_to(struct task_struct *prev_p, struct task_struct *next_p)
18801 prev->usersp = this_cpu_read(old_rsp);
18802 this_cpu_write(old_rsp, next->usersp);
18803 this_cpu_write(current_task, next_p);
18804 + this_cpu_write(current_tinfo, &next_p->tinfo);
18805
18806 - this_cpu_write(kernel_stack,
18807 - (unsigned long)task_stack_page(next_p) +
18808 - THREAD_SIZE - KERNEL_STACK_OFFSET);
18809 + this_cpu_write(kernel_stack, next->sp0);
18810
18811 /*
18812 * Now maybe reload the debug registers and handle I/O bitmaps
18813 @@ -425,12 +424,11 @@ unsigned long get_wchan(struct task_struct *p)
18814 if (!p || p == current || p->state == TASK_RUNNING)
18815 return 0;
18816 stack = (unsigned long)task_stack_page(p);
18817 - if (p->thread.sp < stack || p->thread.sp >= stack+THREAD_SIZE)
18818 + if (p->thread.sp < stack || p->thread.sp > stack+THREAD_SIZE-16-sizeof(u64))
18819 return 0;
18820 fp = *(u64 *)(p->thread.sp);
18821 do {
18822 - if (fp < (unsigned long)stack ||
18823 - fp >= (unsigned long)stack+THREAD_SIZE)
18824 + if (fp < stack || fp > stack+THREAD_SIZE-16-sizeof(u64))
18825 return 0;
18826 ip = *(u64 *)(fp+8);
18827 if (!in_sched_functions(ip))
18828 diff --git a/arch/x86/kernel/ptrace.c b/arch/x86/kernel/ptrace.c
18829 index c4c6a5c..905f440 100644
18830 --- a/arch/x86/kernel/ptrace.c
18831 +++ b/arch/x86/kernel/ptrace.c
18832 @@ -824,7 +824,7 @@ long arch_ptrace(struct task_struct *child, long request,
18833 unsigned long addr, unsigned long data)
18834 {
18835 int ret;
18836 - unsigned long __user *datap = (unsigned long __user *)data;
18837 + unsigned long __user *datap = (__force unsigned long __user *)data;
18838
18839 switch (request) {
18840 /* read the word at location addr in the USER area. */
18841 @@ -909,14 +909,14 @@ long arch_ptrace(struct task_struct *child, long request,
18842 if ((int) addr < 0)
18843 return -EIO;
18844 ret = do_get_thread_area(child, addr,
18845 - (struct user_desc __user *)data);
18846 + (__force struct user_desc __user *) data);
18847 break;
18848
18849 case PTRACE_SET_THREAD_AREA:
18850 if ((int) addr < 0)
18851 return -EIO;
18852 ret = do_set_thread_area(child, addr,
18853 - (struct user_desc __user *)data, 0);
18854 + (__force struct user_desc __user *) data, 0);
18855 break;
18856 #endif
18857
18858 @@ -1426,7 +1426,7 @@ static void fill_sigtrap_info(struct task_struct *tsk,
18859 memset(info, 0, sizeof(*info));
18860 info->si_signo = SIGTRAP;
18861 info->si_code = si_code;
18862 - info->si_addr = user_mode_vm(regs) ? (void __user *)regs->ip : NULL;
18863 + info->si_addr = user_mode(regs) ? (__force void __user *)regs->ip : NULL;
18864 }
18865
18866 void user_single_step_siginfo(struct task_struct *tsk,
18867 @@ -1455,6 +1455,10 @@ void send_sigtrap(struct task_struct *tsk, struct pt_regs *regs,
18868 # define IS_IA32 0
18869 #endif
18870
18871 +#ifdef CONFIG_GRKERNSEC_SETXID
18872 +extern void gr_delayed_cred_worker(void);
18873 +#endif
18874 +
18875 /*
18876 * We must return the syscall number to actually look up in the table.
18877 * This can be -1L to skip running any syscall at all.
18878 @@ -1463,6 +1467,11 @@ long syscall_trace_enter(struct pt_regs *regs)
18879 {
18880 long ret = 0;
18881
18882 +#ifdef CONFIG_GRKERNSEC_SETXID
18883 + if (unlikely(test_and_clear_thread_flag(TIF_GRSEC_SETXID)))
18884 + gr_delayed_cred_worker();
18885 +#endif
18886 +
18887 /*
18888 * If we stepped into a sysenter/syscall insn, it trapped in
18889 * kernel mode; do_debug() cleared TF and set TIF_SINGLESTEP.
18890 @@ -1511,6 +1520,11 @@ void syscall_trace_leave(struct pt_regs *regs)
18891 {
18892 bool step;
18893
18894 +#ifdef CONFIG_GRKERNSEC_SETXID
18895 + if (unlikely(test_and_clear_thread_flag(TIF_GRSEC_SETXID)))
18896 + gr_delayed_cred_worker();
18897 +#endif
18898 +
18899 audit_syscall_exit(regs);
18900
18901 if (unlikely(test_thread_flag(TIF_SYSCALL_TRACEPOINT)))
18902 diff --git a/arch/x86/kernel/pvclock.c b/arch/x86/kernel/pvclock.c
18903 index 42eb330..139955c 100644
18904 --- a/arch/x86/kernel/pvclock.c
18905 +++ b/arch/x86/kernel/pvclock.c
18906 @@ -81,11 +81,11 @@ unsigned long pvclock_tsc_khz(struct pvclock_vcpu_time_info *src)
18907 return pv_tsc_khz;
18908 }
18909
18910 -static atomic64_t last_value = ATOMIC64_INIT(0);
18911 +static atomic64_unchecked_t last_value = ATOMIC64_INIT(0);
18912
18913 void pvclock_resume(void)
18914 {
18915 - atomic64_set(&last_value, 0);
18916 + atomic64_set_unchecked(&last_value, 0);
18917 }
18918
18919 cycle_t pvclock_clocksource_read(struct pvclock_vcpu_time_info *src)
18920 @@ -121,11 +121,11 @@ cycle_t pvclock_clocksource_read(struct pvclock_vcpu_time_info *src)
18921 * updating at the same time, and one of them could be slightly behind,
18922 * making the assumption that last_value always go forward fail to hold.
18923 */
18924 - last = atomic64_read(&last_value);
18925 + last = atomic64_read_unchecked(&last_value);
18926 do {
18927 if (ret < last)
18928 return last;
18929 - last = atomic64_cmpxchg(&last_value, last, ret);
18930 + last = atomic64_cmpxchg_unchecked(&last_value, last, ret);
18931 } while (unlikely(last != ret));
18932
18933 return ret;
18934 diff --git a/arch/x86/kernel/reboot.c b/arch/x86/kernel/reboot.c
18935 index 52190a9..8074389 100644
18936 --- a/arch/x86/kernel/reboot.c
18937 +++ b/arch/x86/kernel/reboot.c
18938 @@ -36,7 +36,7 @@ void (*pm_power_off)(void);
18939 EXPORT_SYMBOL(pm_power_off);
18940
18941 static const struct desc_ptr no_idt = {};
18942 -static int reboot_mode;
18943 +static unsigned short reboot_mode;
18944 enum reboot_type reboot_type = BOOT_ACPI;
18945 int reboot_force;
18946
18947 @@ -157,6 +157,11 @@ static int __init set_bios_reboot(const struct dmi_system_id *d)
18948
18949 void __noreturn machine_real_restart(unsigned int type)
18950 {
18951 +
18952 +#if defined(CONFIG_X86_32) && (defined(CONFIG_PAX_KERNEXEC) || defined(CONFIG_PAX_MEMORY_UDEREF))
18953 + struct desc_struct *gdt;
18954 +#endif
18955 +
18956 local_irq_disable();
18957
18958 /*
18959 @@ -184,7 +189,29 @@ void __noreturn machine_real_restart(unsigned int type)
18960
18961 /* Jump to the identity-mapped low memory code */
18962 #ifdef CONFIG_X86_32
18963 - asm volatile("jmpl *%0" : :
18964 +
18965 +#if defined(CONFIG_PAX_KERNEXEC) || defined(CONFIG_PAX_MEMORY_UDEREF)
18966 + gdt = get_cpu_gdt_table(smp_processor_id());
18967 + pax_open_kernel();
18968 +#ifdef CONFIG_PAX_MEMORY_UDEREF
18969 + gdt[GDT_ENTRY_KERNEL_DS].type = 3;
18970 + gdt[GDT_ENTRY_KERNEL_DS].limit = 0xf;
18971 + loadsegment(ds, __KERNEL_DS);
18972 + loadsegment(es, __KERNEL_DS);
18973 + loadsegment(ss, __KERNEL_DS);
18974 +#endif
18975 +#ifdef CONFIG_PAX_KERNEXEC
18976 + gdt[GDT_ENTRY_KERNEL_CS].base0 = 0;
18977 + gdt[GDT_ENTRY_KERNEL_CS].base1 = 0;
18978 + gdt[GDT_ENTRY_KERNEL_CS].base2 = 0;
18979 + gdt[GDT_ENTRY_KERNEL_CS].limit0 = 0xffff;
18980 + gdt[GDT_ENTRY_KERNEL_CS].limit = 0xf;
18981 + gdt[GDT_ENTRY_KERNEL_CS].g = 1;
18982 +#endif
18983 + pax_close_kernel();
18984 +#endif
18985 +
18986 + asm volatile("ljmpl *%0" : :
18987 "rm" (real_mode_header->machine_real_restart_asm),
18988 "a" (type));
18989 #else
18990 @@ -539,7 +566,7 @@ void __attribute__((weak)) mach_reboot_fixups(void)
18991 * try to force a triple fault and then cycle between hitting the keyboard
18992 * controller and doing that
18993 */
18994 -static void native_machine_emergency_restart(void)
18995 +static void __noreturn native_machine_emergency_restart(void)
18996 {
18997 int i;
18998 int attempt = 0;
18999 @@ -662,13 +689,13 @@ void native_machine_shutdown(void)
19000 #endif
19001 }
19002
19003 -static void __machine_emergency_restart(int emergency)
19004 +static void __noreturn __machine_emergency_restart(int emergency)
19005 {
19006 reboot_emergency = emergency;
19007 machine_ops.emergency_restart();
19008 }
19009
19010 -static void native_machine_restart(char *__unused)
19011 +static void __noreturn native_machine_restart(char *__unused)
19012 {
19013 pr_notice("machine restart\n");
19014
19015 @@ -677,7 +704,7 @@ static void native_machine_restart(char *__unused)
19016 __machine_emergency_restart(0);
19017 }
19018
19019 -static void native_machine_halt(void)
19020 +static void __noreturn native_machine_halt(void)
19021 {
19022 /* Stop other cpus and apics */
19023 machine_shutdown();
19024 @@ -687,7 +714,7 @@ static void native_machine_halt(void)
19025 stop_this_cpu(NULL);
19026 }
19027
19028 -static void native_machine_power_off(void)
19029 +static void __noreturn native_machine_power_off(void)
19030 {
19031 if (pm_power_off) {
19032 if (!reboot_force)
19033 @@ -696,6 +723,7 @@ static void native_machine_power_off(void)
19034 }
19035 /* A fallback in case there is no PM info available */
19036 tboot_shutdown(TB_SHUTDOWN_HALT);
19037 + unreachable();
19038 }
19039
19040 struct machine_ops machine_ops = {
19041 diff --git a/arch/x86/kernel/relocate_kernel_64.S b/arch/x86/kernel/relocate_kernel_64.S
19042 index 7a6f3b3..bed145d7 100644
19043 --- a/arch/x86/kernel/relocate_kernel_64.S
19044 +++ b/arch/x86/kernel/relocate_kernel_64.S
19045 @@ -11,6 +11,7 @@
19046 #include <asm/kexec.h>
19047 #include <asm/processor-flags.h>
19048 #include <asm/pgtable_types.h>
19049 +#include <asm/alternative-asm.h>
19050
19051 /*
19052 * Must be relocatable PIC code callable as a C function
19053 @@ -160,13 +161,14 @@ identity_mapped:
19054 xorq %rbp, %rbp
19055 xorq %r8, %r8
19056 xorq %r9, %r9
19057 - xorq %r10, %r9
19058 + xorq %r10, %r10
19059 xorq %r11, %r11
19060 xorq %r12, %r12
19061 xorq %r13, %r13
19062 xorq %r14, %r14
19063 xorq %r15, %r15
19064
19065 + pax_force_retaddr 0, 1
19066 ret
19067
19068 1:
19069 diff --git a/arch/x86/kernel/setup.c b/arch/x86/kernel/setup.c
19070 index 5cee802..bc22bc3 100644
19071 --- a/arch/x86/kernel/setup.c
19072 +++ b/arch/x86/kernel/setup.c
19073 @@ -440,7 +440,7 @@ static void __init parse_setup_data(void)
19074
19075 switch (data->type) {
19076 case SETUP_E820_EXT:
19077 - parse_e820_ext(data);
19078 + parse_e820_ext((struct setup_data __force_kernel *)data);
19079 break;
19080 case SETUP_DTB:
19081 add_dtb(pa_data);
19082 @@ -632,7 +632,7 @@ static void __init trim_bios_range(void)
19083 * area (640->1Mb) as ram even though it is not.
19084 * take them out.
19085 */
19086 - e820_remove_range(BIOS_BEGIN, BIOS_END - BIOS_BEGIN, E820_RAM, 1);
19087 + e820_remove_range(ISA_START_ADDRESS, ISA_END_ADDRESS - ISA_START_ADDRESS, E820_RAM, 1);
19088 sanitize_e820_map(e820.map, ARRAY_SIZE(e820.map), &e820.nr_map);
19089 }
19090
19091 @@ -755,14 +755,14 @@ void __init setup_arch(char **cmdline_p)
19092
19093 if (!boot_params.hdr.root_flags)
19094 root_mountflags &= ~MS_RDONLY;
19095 - init_mm.start_code = (unsigned long) _text;
19096 - init_mm.end_code = (unsigned long) _etext;
19097 + init_mm.start_code = ktla_ktva((unsigned long) _text);
19098 + init_mm.end_code = ktla_ktva((unsigned long) _etext);
19099 init_mm.end_data = (unsigned long) _edata;
19100 init_mm.brk = _brk_end;
19101
19102 - code_resource.start = virt_to_phys(_text);
19103 - code_resource.end = virt_to_phys(_etext)-1;
19104 - data_resource.start = virt_to_phys(_etext);
19105 + code_resource.start = virt_to_phys(ktla_ktva(_text));
19106 + code_resource.end = virt_to_phys(ktla_ktva(_etext))-1;
19107 + data_resource.start = virt_to_phys(_sdata);
19108 data_resource.end = virt_to_phys(_edata)-1;
19109 bss_resource.start = virt_to_phys(&__bss_start);
19110 bss_resource.end = virt_to_phys(&__bss_stop)-1;
19111 diff --git a/arch/x86/kernel/setup_percpu.c b/arch/x86/kernel/setup_percpu.c
19112 index 5cdff03..5810740 100644
19113 --- a/arch/x86/kernel/setup_percpu.c
19114 +++ b/arch/x86/kernel/setup_percpu.c
19115 @@ -21,19 +21,17 @@
19116 #include <asm/cpu.h>
19117 #include <asm/stackprotector.h>
19118
19119 -DEFINE_PER_CPU_READ_MOSTLY(int, cpu_number);
19120 +#ifdef CONFIG_SMP
19121 +DEFINE_PER_CPU_READ_MOSTLY(unsigned int, cpu_number);
19122 EXPORT_PER_CPU_SYMBOL(cpu_number);
19123 +#endif
19124
19125 -#ifdef CONFIG_X86_64
19126 #define BOOT_PERCPU_OFFSET ((unsigned long)__per_cpu_load)
19127 -#else
19128 -#define BOOT_PERCPU_OFFSET 0
19129 -#endif
19130
19131 DEFINE_PER_CPU(unsigned long, this_cpu_off) = BOOT_PERCPU_OFFSET;
19132 EXPORT_PER_CPU_SYMBOL(this_cpu_off);
19133
19134 -unsigned long __per_cpu_offset[NR_CPUS] __read_mostly = {
19135 +unsigned long __per_cpu_offset[NR_CPUS] __read_only = {
19136 [0 ... NR_CPUS-1] = BOOT_PERCPU_OFFSET,
19137 };
19138 EXPORT_SYMBOL(__per_cpu_offset);
19139 @@ -155,10 +153,10 @@ static inline void setup_percpu_segment(int cpu)
19140 {
19141 #ifdef CONFIG_X86_32
19142 struct desc_struct gdt;
19143 + unsigned long base = per_cpu_offset(cpu);
19144
19145 - pack_descriptor(&gdt, per_cpu_offset(cpu), 0xFFFFF,
19146 - 0x2 | DESCTYPE_S, 0x8);
19147 - gdt.s = 1;
19148 + pack_descriptor(&gdt, base, (VMALLOC_END - base - 1) >> PAGE_SHIFT,
19149 + 0x83 | DESCTYPE_S, 0xC);
19150 write_gdt_entry(get_cpu_gdt_table(cpu),
19151 GDT_ENTRY_PERCPU, &gdt, DESCTYPE_S);
19152 #endif
19153 @@ -219,6 +217,11 @@ void __init setup_per_cpu_areas(void)
19154 /* alrighty, percpu areas up and running */
19155 delta = (unsigned long)pcpu_base_addr - (unsigned long)__per_cpu_start;
19156 for_each_possible_cpu(cpu) {
19157 +#ifdef CONFIG_CC_STACKPROTECTOR
19158 +#ifdef CONFIG_X86_32
19159 + unsigned long canary = per_cpu(stack_canary.canary, cpu);
19160 +#endif
19161 +#endif
19162 per_cpu_offset(cpu) = delta + pcpu_unit_offsets[cpu];
19163 per_cpu(this_cpu_off, cpu) = per_cpu_offset(cpu);
19164 per_cpu(cpu_number, cpu) = cpu;
19165 @@ -259,6 +262,12 @@ void __init setup_per_cpu_areas(void)
19166 */
19167 set_cpu_numa_node(cpu, early_cpu_to_node(cpu));
19168 #endif
19169 +#ifdef CONFIG_CC_STACKPROTECTOR
19170 +#ifdef CONFIG_X86_32
19171 + if (!cpu)
19172 + per_cpu(stack_canary.canary, cpu) = canary;
19173 +#endif
19174 +#endif
19175 /*
19176 * Up to this point, the boot CPU has been using .init.data
19177 * area. Reload any changed state for the boot CPU.
19178 diff --git a/arch/x86/kernel/signal.c b/arch/x86/kernel/signal.c
19179 index b280908..6de349e 100644
19180 --- a/arch/x86/kernel/signal.c
19181 +++ b/arch/x86/kernel/signal.c
19182 @@ -194,7 +194,7 @@ static unsigned long align_sigframe(unsigned long sp)
19183 * Align the stack pointer according to the i386 ABI,
19184 * i.e. so that on function entry ((sp + 4) & 15) == 0.
19185 */
19186 - sp = ((sp + 4) & -16ul) - 4;
19187 + sp = ((sp - 12) & -16ul) - 4;
19188 #else /* !CONFIG_X86_32 */
19189 sp = round_down(sp, 16) - 8;
19190 #endif
19191 @@ -245,11 +245,11 @@ get_sigframe(struct k_sigaction *ka, struct pt_regs *regs, size_t frame_size,
19192 * Return an always-bogus address instead so we will die with SIGSEGV.
19193 */
19194 if (onsigstack && !likely(on_sig_stack(sp)))
19195 - return (void __user *)-1L;
19196 + return (__force void __user *)-1L;
19197
19198 /* save i387 state */
19199 if (used_math() && save_i387_xstate(*fpstate) < 0)
19200 - return (void __user *)-1L;
19201 + return (__force void __user *)-1L;
19202
19203 return (void __user *)sp;
19204 }
19205 @@ -304,9 +304,9 @@ __setup_frame(int sig, struct k_sigaction *ka, sigset_t *set,
19206 }
19207
19208 if (current->mm->context.vdso)
19209 - restorer = VDSO32_SYMBOL(current->mm->context.vdso, sigreturn);
19210 + restorer = (__force void __user *)VDSO32_SYMBOL(current->mm->context.vdso, sigreturn);
19211 else
19212 - restorer = &frame->retcode;
19213 + restorer = (void __user *)&frame->retcode;
19214 if (ka->sa.sa_flags & SA_RESTORER)
19215 restorer = ka->sa.sa_restorer;
19216
19217 @@ -320,7 +320,7 @@ __setup_frame(int sig, struct k_sigaction *ka, sigset_t *set,
19218 * reasons and because gdb uses it as a signature to notice
19219 * signal handler stack frames.
19220 */
19221 - err |= __put_user(*((u64 *)&retcode), (u64 *)frame->retcode);
19222 + err |= __put_user(*((u64 *)&retcode), (u64 __user *)frame->retcode);
19223
19224 if (err)
19225 return -EFAULT;
19226 @@ -374,7 +374,10 @@ static int __setup_rt_frame(int sig, struct k_sigaction *ka, siginfo_t *info,
19227 err |= __copy_to_user(&frame->uc.uc_sigmask, set, sizeof(*set));
19228
19229 /* Set up to return from userspace. */
19230 - restorer = VDSO32_SYMBOL(current->mm->context.vdso, rt_sigreturn);
19231 + if (current->mm->context.vdso)
19232 + restorer = (__force void __user *)VDSO32_SYMBOL(current->mm->context.vdso, rt_sigreturn);
19233 + else
19234 + restorer = (void __user *)&frame->retcode;
19235 if (ka->sa.sa_flags & SA_RESTORER)
19236 restorer = ka->sa.sa_restorer;
19237 put_user_ex(restorer, &frame->pretcode);
19238 @@ -386,7 +389,7 @@ static int __setup_rt_frame(int sig, struct k_sigaction *ka, siginfo_t *info,
19239 * reasons and because gdb uses it as a signature to notice
19240 * signal handler stack frames.
19241 */
19242 - put_user_ex(*((u64 *)&rt_retcode), (u64 *)frame->retcode);
19243 + put_user_ex(*((u64 *)&rt_retcode), (u64 __user *)frame->retcode);
19244 } put_user_catch(err);
19245
19246 if (err)
19247 diff --git a/arch/x86/kernel/smpboot.c b/arch/x86/kernel/smpboot.c
19248 index 7c5a8c3..88d422f 100644
19249 --- a/arch/x86/kernel/smpboot.c
19250 +++ b/arch/x86/kernel/smpboot.c
19251 @@ -670,6 +670,7 @@ static int __cpuinit do_boot_cpu(int apicid, int cpu, struct task_struct *idle)
19252 idle->thread.sp = (unsigned long) (((struct pt_regs *)
19253 (THREAD_SIZE + task_stack_page(idle))) - 1);
19254 per_cpu(current_task, cpu) = idle;
19255 + per_cpu(current_tinfo, cpu) = &idle->tinfo;
19256
19257 #ifdef CONFIG_X86_32
19258 /* Stack for startup_32 can be just as for start_secondary onwards */
19259 @@ -677,11 +678,13 @@ static int __cpuinit do_boot_cpu(int apicid, int cpu, struct task_struct *idle)
19260 #else
19261 clear_tsk_thread_flag(idle, TIF_FORK);
19262 initial_gs = per_cpu_offset(cpu);
19263 - per_cpu(kernel_stack, cpu) =
19264 - (unsigned long)task_stack_page(idle) -
19265 - KERNEL_STACK_OFFSET + THREAD_SIZE;
19266 + per_cpu(kernel_stack, cpu) = (unsigned long)task_stack_page(idle) - 16 + THREAD_SIZE;
19267 #endif
19268 +
19269 + pax_open_kernel();
19270 early_gdt_descr.address = (unsigned long)get_cpu_gdt_table(cpu);
19271 + pax_close_kernel();
19272 +
19273 initial_code = (unsigned long)start_secondary;
19274 stack_start = idle->thread.sp;
19275
19276 @@ -817,6 +820,12 @@ int __cpuinit native_cpu_up(unsigned int cpu, struct task_struct *tidle)
19277
19278 per_cpu(cpu_state, cpu) = CPU_UP_PREPARE;
19279
19280 +#ifdef CONFIG_PAX_PER_CPU_PGD
19281 + clone_pgd_range(get_cpu_pgd(cpu) + KERNEL_PGD_BOUNDARY,
19282 + swapper_pg_dir + KERNEL_PGD_BOUNDARY,
19283 + KERNEL_PGD_PTRS);
19284 +#endif
19285 +
19286 err = do_boot_cpu(apicid, cpu, tidle);
19287 if (err) {
19288 pr_debug("do_boot_cpu failed %d\n", err);
19289 diff --git a/arch/x86/kernel/step.c b/arch/x86/kernel/step.c
19290 index c346d11..d43b163 100644
19291 --- a/arch/x86/kernel/step.c
19292 +++ b/arch/x86/kernel/step.c
19293 @@ -27,10 +27,10 @@ unsigned long convert_ip_to_linear(struct task_struct *child, struct pt_regs *re
19294 struct desc_struct *desc;
19295 unsigned long base;
19296
19297 - seg &= ~7UL;
19298 + seg >>= 3;
19299
19300 mutex_lock(&child->mm->context.lock);
19301 - if (unlikely((seg >> 3) >= child->mm->context.size))
19302 + if (unlikely(seg >= child->mm->context.size))
19303 addr = -1L; /* bogus selector, access would fault */
19304 else {
19305 desc = child->mm->context.ldt + seg;
19306 @@ -42,7 +42,8 @@ unsigned long convert_ip_to_linear(struct task_struct *child, struct pt_regs *re
19307 addr += base;
19308 }
19309 mutex_unlock(&child->mm->context.lock);
19310 - }
19311 + } else if (seg == __KERNEL_CS || seg == __KERNEXEC_KERNEL_CS)
19312 + addr = ktla_ktva(addr);
19313
19314 return addr;
19315 }
19316 @@ -53,6 +54,9 @@ static int is_setting_trap_flag(struct task_struct *child, struct pt_regs *regs)
19317 unsigned char opcode[15];
19318 unsigned long addr = convert_ip_to_linear(child, regs);
19319
19320 + if (addr == -EINVAL)
19321 + return 0;
19322 +
19323 copied = access_process_vm(child, addr, opcode, sizeof(opcode), 0);
19324 for (i = 0; i < copied; i++) {
19325 switch (opcode[i]) {
19326 diff --git a/arch/x86/kernel/sys_i386_32.c b/arch/x86/kernel/sys_i386_32.c
19327 index 0b0cb5f..db6b9ed 100644
19328 --- a/arch/x86/kernel/sys_i386_32.c
19329 +++ b/arch/x86/kernel/sys_i386_32.c
19330 @@ -24,17 +24,224 @@
19331
19332 #include <asm/syscalls.h>
19333
19334 -/*
19335 - * Do a system call from kernel instead of calling sys_execve so we
19336 - * end up with proper pt_regs.
19337 - */
19338 -int kernel_execve(const char *filename,
19339 - const char *const argv[],
19340 - const char *const envp[])
19341 +int i386_mmap_check(unsigned long addr, unsigned long len, unsigned long flags)
19342 {
19343 - long __res;
19344 - asm volatile ("int $0x80"
19345 - : "=a" (__res)
19346 - : "0" (__NR_execve), "b" (filename), "c" (argv), "d" (envp) : "memory");
19347 - return __res;
19348 + unsigned long pax_task_size = TASK_SIZE;
19349 +
19350 +#ifdef CONFIG_PAX_SEGMEXEC
19351 + if (current->mm->pax_flags & MF_PAX_SEGMEXEC)
19352 + pax_task_size = SEGMEXEC_TASK_SIZE;
19353 +#endif
19354 +
19355 + if (len > pax_task_size || addr > pax_task_size - len)
19356 + return -EINVAL;
19357 +
19358 + return 0;
19359 +}
19360 +
19361 +unsigned long
19362 +arch_get_unmapped_area(struct file *filp, unsigned long addr,
19363 + unsigned long len, unsigned long pgoff, unsigned long flags)
19364 +{
19365 + struct mm_struct *mm = current->mm;
19366 + struct vm_area_struct *vma;
19367 + unsigned long start_addr, pax_task_size = TASK_SIZE;
19368 +
19369 +#ifdef CONFIG_PAX_SEGMEXEC
19370 + if (mm->pax_flags & MF_PAX_SEGMEXEC)
19371 + pax_task_size = SEGMEXEC_TASK_SIZE;
19372 +#endif
19373 +
19374 + pax_task_size -= PAGE_SIZE;
19375 +
19376 + if (len > pax_task_size)
19377 + return -ENOMEM;
19378 +
19379 + if (flags & MAP_FIXED)
19380 + return addr;
19381 +
19382 +#ifdef CONFIG_PAX_RANDMMAP
19383 + if (!(mm->pax_flags & MF_PAX_RANDMMAP))
19384 +#endif
19385 +
19386 + if (addr) {
19387 + addr = PAGE_ALIGN(addr);
19388 + if (pax_task_size - len >= addr) {
19389 + vma = find_vma(mm, addr);
19390 + if (check_heap_stack_gap(vma, addr, len))
19391 + return addr;
19392 + }
19393 + }
19394 + if (len > mm->cached_hole_size) {
19395 + start_addr = addr = mm->free_area_cache;
19396 + } else {
19397 + start_addr = addr = mm->mmap_base;
19398 + mm->cached_hole_size = 0;
19399 + }
19400 +
19401 +#ifdef CONFIG_PAX_PAGEEXEC
19402 + if (!(__supported_pte_mask & _PAGE_NX) && (mm->pax_flags & MF_PAX_PAGEEXEC) && (flags & MAP_EXECUTABLE) && start_addr >= mm->mmap_base) {
19403 + start_addr = 0x00110000UL;
19404 +
19405 +#ifdef CONFIG_PAX_RANDMMAP
19406 + if (mm->pax_flags & MF_PAX_RANDMMAP)
19407 + start_addr += mm->delta_mmap & 0x03FFF000UL;
19408 +#endif
19409 +
19410 + if (mm->start_brk <= start_addr && start_addr < mm->mmap_base)
19411 + start_addr = addr = mm->mmap_base;
19412 + else
19413 + addr = start_addr;
19414 + }
19415 +#endif
19416 +
19417 +full_search:
19418 + for (vma = find_vma(mm, addr); ; vma = vma->vm_next) {
19419 + /* At this point: (!vma || addr < vma->vm_end). */
19420 + if (pax_task_size - len < addr) {
19421 + /*
19422 + * Start a new search - just in case we missed
19423 + * some holes.
19424 + */
19425 + if (start_addr != mm->mmap_base) {
19426 + start_addr = addr = mm->mmap_base;
19427 + mm->cached_hole_size = 0;
19428 + goto full_search;
19429 + }
19430 + return -ENOMEM;
19431 + }
19432 + if (check_heap_stack_gap(vma, addr, len))
19433 + break;
19434 + if (addr + mm->cached_hole_size < vma->vm_start)
19435 + mm->cached_hole_size = vma->vm_start - addr;
19436 + addr = vma->vm_end;
19437 + if (mm->start_brk <= addr && addr < mm->mmap_base) {
19438 + start_addr = addr = mm->mmap_base;
19439 + mm->cached_hole_size = 0;
19440 + goto full_search;
19441 + }
19442 + }
19443 +
19444 + /*
19445 + * Remember the place where we stopped the search:
19446 + */
19447 + mm->free_area_cache = addr + len;
19448 + return addr;
19449 +}
19450 +
19451 +unsigned long
19452 +arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
19453 + const unsigned long len, const unsigned long pgoff,
19454 + const unsigned long flags)
19455 +{
19456 + struct vm_area_struct *vma;
19457 + struct mm_struct *mm = current->mm;
19458 + unsigned long base = mm->mmap_base, addr = addr0, pax_task_size = TASK_SIZE;
19459 +
19460 +#ifdef CONFIG_PAX_SEGMEXEC
19461 + if (mm->pax_flags & MF_PAX_SEGMEXEC)
19462 + pax_task_size = SEGMEXEC_TASK_SIZE;
19463 +#endif
19464 +
19465 + pax_task_size -= PAGE_SIZE;
19466 +
19467 + /* requested length too big for entire address space */
19468 + if (len > pax_task_size)
19469 + return -ENOMEM;
19470 +
19471 + if (flags & MAP_FIXED)
19472 + return addr;
19473 +
19474 +#ifdef CONFIG_PAX_PAGEEXEC
19475 + if (!(__supported_pte_mask & _PAGE_NX) && (mm->pax_flags & MF_PAX_PAGEEXEC) && (flags & MAP_EXECUTABLE))
19476 + goto bottomup;
19477 +#endif
19478 +
19479 +#ifdef CONFIG_PAX_RANDMMAP
19480 + if (!(mm->pax_flags & MF_PAX_RANDMMAP))
19481 +#endif
19482 +
19483 + /* requesting a specific address */
19484 + if (addr) {
19485 + addr = PAGE_ALIGN(addr);
19486 + if (pax_task_size - len >= addr) {
19487 + vma = find_vma(mm, addr);
19488 + if (check_heap_stack_gap(vma, addr, len))
19489 + return addr;
19490 + }
19491 + }
19492 +
19493 + /* check if free_area_cache is useful for us */
19494 + if (len <= mm->cached_hole_size) {
19495 + mm->cached_hole_size = 0;
19496 + mm->free_area_cache = mm->mmap_base;
19497 + }
19498 +
19499 + /* either no address requested or can't fit in requested address hole */
19500 + addr = mm->free_area_cache;
19501 +
19502 + /* make sure it can fit in the remaining address space */
19503 + if (addr > len) {
19504 + vma = find_vma(mm, addr-len);
19505 + if (check_heap_stack_gap(vma, addr - len, len))
19506 + /* remember the address as a hint for next time */
19507 + return (mm->free_area_cache = addr-len);
19508 + }
19509 +
19510 + if (mm->mmap_base < len)
19511 + goto bottomup;
19512 +
19513 + addr = mm->mmap_base-len;
19514 +
19515 + do {
19516 + /*
19517 + * Lookup failure means no vma is above this address,
19518 + * else if new region fits below vma->vm_start,
19519 + * return with success:
19520 + */
19521 + vma = find_vma(mm, addr);
19522 + if (check_heap_stack_gap(vma, addr, len))
19523 + /* remember the address as a hint for next time */
19524 + return (mm->free_area_cache = addr);
19525 +
19526 + /* remember the largest hole we saw so far */
19527 + if (addr + mm->cached_hole_size < vma->vm_start)
19528 + mm->cached_hole_size = vma->vm_start - addr;
19529 +
19530 + /* try just below the current vma->vm_start */
19531 + addr = skip_heap_stack_gap(vma, len);
19532 + } while (!IS_ERR_VALUE(addr));
19533 +
19534 +bottomup:
19535 + /*
19536 + * A failed mmap() very likely causes application failure,
19537 + * so fall back to the bottom-up function here. This scenario
19538 + * can happen with large stack limits and large mmap()
19539 + * allocations.
19540 + */
19541 +
19542 +#ifdef CONFIG_PAX_SEGMEXEC
19543 + if (mm->pax_flags & MF_PAX_SEGMEXEC)
19544 + mm->mmap_base = SEGMEXEC_TASK_UNMAPPED_BASE;
19545 + else
19546 +#endif
19547 +
19548 + mm->mmap_base = TASK_UNMAPPED_BASE;
19549 +
19550 +#ifdef CONFIG_PAX_RANDMMAP
19551 + if (mm->pax_flags & MF_PAX_RANDMMAP)
19552 + mm->mmap_base += mm->delta_mmap;
19553 +#endif
19554 +
19555 + mm->free_area_cache = mm->mmap_base;
19556 + mm->cached_hole_size = ~0UL;
19557 + addr = arch_get_unmapped_area(filp, addr0, len, pgoff, flags);
19558 + /*
19559 + * Restore the topdown base:
19560 + */
19561 + mm->mmap_base = base;
19562 + mm->free_area_cache = base;
19563 + mm->cached_hole_size = ~0UL;
19564 +
19565 + return addr;
19566 }
19567 diff --git a/arch/x86/kernel/sys_x86_64.c b/arch/x86/kernel/sys_x86_64.c
19568 index b4d3c39..82bb73b 100644
19569 --- a/arch/x86/kernel/sys_x86_64.c
19570 +++ b/arch/x86/kernel/sys_x86_64.c
19571 @@ -95,8 +95,8 @@ out:
19572 return error;
19573 }
19574
19575 -static void find_start_end(unsigned long flags, unsigned long *begin,
19576 - unsigned long *end)
19577 +static void find_start_end(struct mm_struct *mm, unsigned long flags,
19578 + unsigned long *begin, unsigned long *end)
19579 {
19580 if (!test_thread_flag(TIF_ADDR32) && (flags & MAP_32BIT)) {
19581 unsigned long new_begin;
19582 @@ -115,7 +115,7 @@ static void find_start_end(unsigned long flags, unsigned long *begin,
19583 *begin = new_begin;
19584 }
19585 } else {
19586 - *begin = TASK_UNMAPPED_BASE;
19587 + *begin = mm->mmap_base;
19588 *end = TASK_SIZE;
19589 }
19590 }
19591 @@ -132,16 +132,19 @@ arch_get_unmapped_area(struct file *filp, unsigned long addr,
19592 if (flags & MAP_FIXED)
19593 return addr;
19594
19595 - find_start_end(flags, &begin, &end);
19596 + find_start_end(mm, flags, &begin, &end);
19597
19598 if (len > end)
19599 return -ENOMEM;
19600
19601 +#ifdef CONFIG_PAX_RANDMMAP
19602 + if (!(mm->pax_flags & MF_PAX_RANDMMAP))
19603 +#endif
19604 +
19605 if (addr) {
19606 addr = PAGE_ALIGN(addr);
19607 vma = find_vma(mm, addr);
19608 - if (end - len >= addr &&
19609 - (!vma || addr + len <= vma->vm_start))
19610 + if (end - len >= addr && check_heap_stack_gap(vma, addr, len))
19611 return addr;
19612 }
19613 if (((flags & MAP_32BIT) || test_thread_flag(TIF_ADDR32))
19614 @@ -172,7 +175,7 @@ full_search:
19615 }
19616 return -ENOMEM;
19617 }
19618 - if (!vma || addr + len <= vma->vm_start) {
19619 + if (check_heap_stack_gap(vma, addr, len)) {
19620 /*
19621 * Remember the place where we stopped the search:
19622 */
19623 @@ -195,7 +198,7 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
19624 {
19625 struct vm_area_struct *vma;
19626 struct mm_struct *mm = current->mm;
19627 - unsigned long addr = addr0, start_addr;
19628 + unsigned long base = mm->mmap_base, addr = addr0, start_addr;
19629
19630 /* requested length too big for entire address space */
19631 if (len > TASK_SIZE)
19632 @@ -208,13 +211,18 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
19633 if (!test_thread_flag(TIF_ADDR32) && (flags & MAP_32BIT))
19634 goto bottomup;
19635
19636 +#ifdef CONFIG_PAX_RANDMMAP
19637 + if (!(mm->pax_flags & MF_PAX_RANDMMAP))
19638 +#endif
19639 +
19640 /* requesting a specific address */
19641 if (addr) {
19642 addr = PAGE_ALIGN(addr);
19643 - vma = find_vma(mm, addr);
19644 - if (TASK_SIZE - len >= addr &&
19645 - (!vma || addr + len <= vma->vm_start))
19646 - return addr;
19647 + if (TASK_SIZE - len >= addr) {
19648 + vma = find_vma(mm, addr);
19649 + if (check_heap_stack_gap(vma, addr, len))
19650 + return addr;
19651 + }
19652 }
19653
19654 /* check if free_area_cache is useful for us */
19655 @@ -240,7 +248,7 @@ try_again:
19656 * return with success:
19657 */
19658 vma = find_vma(mm, addr);
19659 - if (!vma || addr+len <= vma->vm_start)
19660 + if (check_heap_stack_gap(vma, addr, len))
19661 /* remember the address as a hint for next time */
19662 return mm->free_area_cache = addr;
19663
19664 @@ -249,8 +257,8 @@ try_again:
19665 mm->cached_hole_size = vma->vm_start - addr;
19666
19667 /* try just below the current vma->vm_start */
19668 - addr = vma->vm_start-len;
19669 - } while (len < vma->vm_start);
19670 + addr = skip_heap_stack_gap(vma, len);
19671 + } while (!IS_ERR_VALUE(addr));
19672
19673 fail:
19674 /*
19675 @@ -270,13 +278,21 @@ bottomup:
19676 * can happen with large stack limits and large mmap()
19677 * allocations.
19678 */
19679 + mm->mmap_base = TASK_UNMAPPED_BASE;
19680 +
19681 +#ifdef CONFIG_PAX_RANDMMAP
19682 + if (mm->pax_flags & MF_PAX_RANDMMAP)
19683 + mm->mmap_base += mm->delta_mmap;
19684 +#endif
19685 +
19686 + mm->free_area_cache = mm->mmap_base;
19687 mm->cached_hole_size = ~0UL;
19688 - mm->free_area_cache = TASK_UNMAPPED_BASE;
19689 addr = arch_get_unmapped_area(filp, addr0, len, pgoff, flags);
19690 /*
19691 * Restore the topdown base:
19692 */
19693 - mm->free_area_cache = mm->mmap_base;
19694 + mm->mmap_base = base;
19695 + mm->free_area_cache = base;
19696 mm->cached_hole_size = ~0UL;
19697
19698 return addr;
19699 diff --git a/arch/x86/kernel/tboot.c b/arch/x86/kernel/tboot.c
19700 index f84fe00..93fe08f 100644
19701 --- a/arch/x86/kernel/tboot.c
19702 +++ b/arch/x86/kernel/tboot.c
19703 @@ -220,7 +220,7 @@ static int tboot_setup_sleep(void)
19704
19705 void tboot_shutdown(u32 shutdown_type)
19706 {
19707 - void (*shutdown)(void);
19708 + void (* __noreturn shutdown)(void);
19709
19710 if (!tboot_enabled())
19711 return;
19712 @@ -242,7 +242,7 @@ void tboot_shutdown(u32 shutdown_type)
19713
19714 switch_to_tboot_pt();
19715
19716 - shutdown = (void(*)(void))(unsigned long)tboot->shutdown_entry;
19717 + shutdown = (void *)tboot->shutdown_entry;
19718 shutdown();
19719
19720 /* should not reach here */
19721 @@ -300,7 +300,7 @@ static int tboot_sleep(u8 sleep_state, u32 pm1a_control, u32 pm1b_control)
19722 return 0;
19723 }
19724
19725 -static atomic_t ap_wfs_count;
19726 +static atomic_unchecked_t ap_wfs_count;
19727
19728 static int tboot_wait_for_aps(int num_aps)
19729 {
19730 @@ -324,9 +324,9 @@ static int __cpuinit tboot_cpu_callback(struct notifier_block *nfb,
19731 {
19732 switch (action) {
19733 case CPU_DYING:
19734 - atomic_inc(&ap_wfs_count);
19735 + atomic_inc_unchecked(&ap_wfs_count);
19736 if (num_online_cpus() == 1)
19737 - if (tboot_wait_for_aps(atomic_read(&ap_wfs_count)))
19738 + if (tboot_wait_for_aps(atomic_read_unchecked(&ap_wfs_count)))
19739 return NOTIFY_BAD;
19740 break;
19741 }
19742 @@ -345,7 +345,7 @@ static __init int tboot_late_init(void)
19743
19744 tboot_create_trampoline();
19745
19746 - atomic_set(&ap_wfs_count, 0);
19747 + atomic_set_unchecked(&ap_wfs_count, 0);
19748 register_hotcpu_notifier(&tboot_cpu_notifier);
19749
19750 acpi_os_set_prepare_sleep(&tboot_sleep);
19751 diff --git a/arch/x86/kernel/time.c b/arch/x86/kernel/time.c
19752 index 24d3c91..d06b473 100644
19753 --- a/arch/x86/kernel/time.c
19754 +++ b/arch/x86/kernel/time.c
19755 @@ -30,9 +30,9 @@ unsigned long profile_pc(struct pt_regs *regs)
19756 {
19757 unsigned long pc = instruction_pointer(regs);
19758
19759 - if (!user_mode_vm(regs) && in_lock_functions(pc)) {
19760 + if (!user_mode(regs) && in_lock_functions(pc)) {
19761 #ifdef CONFIG_FRAME_POINTER
19762 - return *(unsigned long *)(regs->bp + sizeof(long));
19763 + return ktla_ktva(*(unsigned long *)(regs->bp + sizeof(long)));
19764 #else
19765 unsigned long *sp =
19766 (unsigned long *)kernel_stack_pointer(regs);
19767 @@ -41,11 +41,17 @@ unsigned long profile_pc(struct pt_regs *regs)
19768 * or above a saved flags. Eflags has bits 22-31 zero,
19769 * kernel addresses don't.
19770 */
19771 +
19772 +#ifdef CONFIG_PAX_KERNEXEC
19773 + return ktla_ktva(sp[0]);
19774 +#else
19775 if (sp[0] >> 22)
19776 return sp[0];
19777 if (sp[1] >> 22)
19778 return sp[1];
19779 #endif
19780 +
19781 +#endif
19782 }
19783 return pc;
19784 }
19785 diff --git a/arch/x86/kernel/tls.c b/arch/x86/kernel/tls.c
19786 index 9d9d2f9..cad418a 100644
19787 --- a/arch/x86/kernel/tls.c
19788 +++ b/arch/x86/kernel/tls.c
19789 @@ -84,6 +84,11 @@ int do_set_thread_area(struct task_struct *p, int idx,
19790 if (idx < GDT_ENTRY_TLS_MIN || idx > GDT_ENTRY_TLS_MAX)
19791 return -EINVAL;
19792
19793 +#ifdef CONFIG_PAX_SEGMEXEC
19794 + if ((p->mm->pax_flags & MF_PAX_SEGMEXEC) && (info.contents & MODIFY_LDT_CONTENTS_CODE))
19795 + return -EINVAL;
19796 +#endif
19797 +
19798 set_tls_desc(p, idx, &info, 1);
19799
19800 return 0;
19801 @@ -204,7 +209,7 @@ int regset_tls_set(struct task_struct *target, const struct user_regset *regset,
19802
19803 if (kbuf)
19804 info = kbuf;
19805 - else if (__copy_from_user(infobuf, ubuf, count))
19806 + else if (count > sizeof infobuf || __copy_from_user(infobuf, ubuf, count))
19807 return -EFAULT;
19808 else
19809 info = infobuf;
19810 diff --git a/arch/x86/kernel/traps.c b/arch/x86/kernel/traps.c
19811 index b481341..5918bbe 100644
19812 --- a/arch/x86/kernel/traps.c
19813 +++ b/arch/x86/kernel/traps.c
19814 @@ -70,12 +70,6 @@ asmlinkage int system_call(void);
19815
19816 /* Do we ignore FPU interrupts ? */
19817 char ignore_fpu_irq;
19818 -
19819 -/*
19820 - * The IDT has to be page-aligned to simplify the Pentium
19821 - * F0 0F bug workaround.
19822 - */
19823 -gate_desc idt_table[NR_VECTORS] __page_aligned_data = { { { { 0, 0 } } }, };
19824 #endif
19825
19826 DECLARE_BITMAP(used_vectors, NR_VECTORS);
19827 @@ -108,13 +102,13 @@ static inline void preempt_conditional_cli(struct pt_regs *regs)
19828 }
19829
19830 static void __kprobes
19831 -do_trap(int trapnr, int signr, char *str, struct pt_regs *regs,
19832 +do_trap(int trapnr, int signr, const char *str, struct pt_regs *regs,
19833 long error_code, siginfo_t *info)
19834 {
19835 struct task_struct *tsk = current;
19836
19837 #ifdef CONFIG_X86_32
19838 - if (regs->flags & X86_VM_MASK) {
19839 + if (v8086_mode(regs)) {
19840 /*
19841 * traps 0, 1, 3, 4, and 5 should be forwarded to vm86.
19842 * On nmi (interrupt 2), do_trap should not be called.
19843 @@ -125,7 +119,7 @@ do_trap(int trapnr, int signr, char *str, struct pt_regs *regs,
19844 }
19845 #endif
19846
19847 - if (!user_mode(regs))
19848 + if (!user_mode_novm(regs))
19849 goto kernel_trap;
19850
19851 #ifdef CONFIG_X86_32
19852 @@ -147,7 +141,7 @@ trap_signal:
19853 if (show_unhandled_signals && unhandled_signal(tsk, signr) &&
19854 printk_ratelimit()) {
19855 pr_info("%s[%d] trap %s ip:%lx sp:%lx error:%lx",
19856 - tsk->comm, tsk->pid, str,
19857 + tsk->comm, task_pid_nr(tsk), str,
19858 regs->ip, regs->sp, error_code);
19859 print_vma_addr(" in ", regs->ip);
19860 pr_cont("\n");
19861 @@ -164,8 +158,20 @@ kernel_trap:
19862 if (!fixup_exception(regs)) {
19863 tsk->thread.error_code = error_code;
19864 tsk->thread.trap_nr = trapnr;
19865 +
19866 +#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
19867 + if (trapnr == 12 && ((regs->cs & 0xFFFF) == __KERNEL_CS || (regs->cs & 0xFFFF) == __KERNEXEC_KERNEL_CS))
19868 + str = "PAX: suspicious stack segment fault";
19869 +#endif
19870 +
19871 die(str, regs, error_code);
19872 }
19873 +
19874 +#ifdef CONFIG_PAX_REFCOUNT
19875 + if (trapnr == 4)
19876 + pax_report_refcount_overflow(regs);
19877 +#endif
19878 +
19879 return;
19880
19881 #ifdef CONFIG_X86_32
19882 @@ -258,14 +264,30 @@ do_general_protection(struct pt_regs *regs, long error_code)
19883 conditional_sti(regs);
19884
19885 #ifdef CONFIG_X86_32
19886 - if (regs->flags & X86_VM_MASK)
19887 + if (v8086_mode(regs))
19888 goto gp_in_vm86;
19889 #endif
19890
19891 tsk = current;
19892 - if (!user_mode(regs))
19893 + if (!user_mode_novm(regs))
19894 goto gp_in_kernel;
19895
19896 +#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_PAGEEXEC)
19897 + if (!(__supported_pte_mask & _PAGE_NX) && tsk->mm && (tsk->mm->pax_flags & MF_PAX_PAGEEXEC)) {
19898 + struct mm_struct *mm = tsk->mm;
19899 + unsigned long limit;
19900 +
19901 + down_write(&mm->mmap_sem);
19902 + limit = mm->context.user_cs_limit;
19903 + if (limit < TASK_SIZE) {
19904 + track_exec_limit(mm, limit, TASK_SIZE, VM_EXEC);
19905 + up_write(&mm->mmap_sem);
19906 + return;
19907 + }
19908 + up_write(&mm->mmap_sem);
19909 + }
19910 +#endif
19911 +
19912 tsk->thread.error_code = error_code;
19913 tsk->thread.trap_nr = X86_TRAP_GP;
19914
19915 @@ -297,6 +319,13 @@ gp_in_kernel:
19916 if (notify_die(DIE_GPF, "general protection fault", regs, error_code,
19917 X86_TRAP_GP, SIGSEGV) == NOTIFY_STOP)
19918 return;
19919 +
19920 +#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
19921 + if ((regs->cs & 0xFFFF) == __KERNEL_CS || (regs->cs & 0xFFFF) == __KERNEXEC_KERNEL_CS)
19922 + die("PAX: suspicious general protection fault", regs, error_code);
19923 + else
19924 +#endif
19925 +
19926 die("general protection fault", regs, error_code);
19927 }
19928
19929 @@ -432,7 +461,7 @@ dotraplinkage void __kprobes do_debug(struct pt_regs *regs, long error_code)
19930 /* It's safe to allow irq's after DR6 has been saved */
19931 preempt_conditional_sti(regs);
19932
19933 - if (regs->flags & X86_VM_MASK) {
19934 + if (v8086_mode(regs)) {
19935 handle_vm86_trap((struct kernel_vm86_regs *) regs, error_code,
19936 X86_TRAP_DB);
19937 preempt_conditional_cli(regs);
19938 @@ -447,7 +476,7 @@ dotraplinkage void __kprobes do_debug(struct pt_regs *regs, long error_code)
19939 * We already checked v86 mode above, so we can check for kernel mode
19940 * by just checking the CPL of CS.
19941 */
19942 - if ((dr6 & DR_STEP) && !user_mode(regs)) {
19943 + if ((dr6 & DR_STEP) && !user_mode_novm(regs)) {
19944 tsk->thread.debugreg6 &= ~DR_STEP;
19945 set_tsk_thread_flag(tsk, TIF_SINGLESTEP);
19946 regs->flags &= ~X86_EFLAGS_TF;
19947 @@ -478,7 +507,7 @@ void math_error(struct pt_regs *regs, int error_code, int trapnr)
19948 return;
19949 conditional_sti(regs);
19950
19951 - if (!user_mode_vm(regs))
19952 + if (!user_mode(regs))
19953 {
19954 if (!fixup_exception(regs)) {
19955 task->thread.error_code = error_code;
19956 diff --git a/arch/x86/kernel/uprobes.c b/arch/x86/kernel/uprobes.c
19957 index 36fd420..7e5892d 100644
19958 --- a/arch/x86/kernel/uprobes.c
19959 +++ b/arch/x86/kernel/uprobes.c
19960 @@ -607,7 +607,7 @@ int arch_uprobe_exception_notify(struct notifier_block *self, unsigned long val,
19961 int ret = NOTIFY_DONE;
19962
19963 /* We are only interested in userspace traps */
19964 - if (regs && !user_mode_vm(regs))
19965 + if (regs && !user_mode(regs))
19966 return NOTIFY_DONE;
19967
19968 switch (val) {
19969 diff --git a/arch/x86/kernel/verify_cpu.S b/arch/x86/kernel/verify_cpu.S
19970 index b9242ba..50c5edd 100644
19971 --- a/arch/x86/kernel/verify_cpu.S
19972 +++ b/arch/x86/kernel/verify_cpu.S
19973 @@ -20,6 +20,7 @@
19974 * arch/x86/boot/compressed/head_64.S: Boot cpu verification
19975 * arch/x86/kernel/trampoline_64.S: secondary processor verification
19976 * arch/x86/kernel/head_32.S: processor startup
19977 + * arch/x86/kernel/acpi/realmode/wakeup.S: 32bit processor resume
19978 *
19979 * verify_cpu, returns the status of longmode and SSE in register %eax.
19980 * 0: Success 1: Failure
19981 diff --git a/arch/x86/kernel/vm86_32.c b/arch/x86/kernel/vm86_32.c
19982 index 54abcc0..eb6c848 100644
19983 --- a/arch/x86/kernel/vm86_32.c
19984 +++ b/arch/x86/kernel/vm86_32.c
19985 @@ -43,6 +43,7 @@
19986 #include <linux/ptrace.h>
19987 #include <linux/audit.h>
19988 #include <linux/stddef.h>
19989 +#include <linux/grsecurity.h>
19990
19991 #include <asm/uaccess.h>
19992 #include <asm/io.h>
19993 @@ -150,7 +151,7 @@ struct pt_regs *save_v86_state(struct kernel_vm86_regs *regs)
19994 do_exit(SIGSEGV);
19995 }
19996
19997 - tss = &per_cpu(init_tss, get_cpu());
19998 + tss = init_tss + get_cpu();
19999 current->thread.sp0 = current->thread.saved_sp0;
20000 current->thread.sysenter_cs = __KERNEL_CS;
20001 load_sp0(tss, &current->thread);
20002 @@ -212,6 +213,13 @@ int sys_vm86old(struct vm86_struct __user *v86, struct pt_regs *regs)
20003 struct task_struct *tsk;
20004 int tmp, ret = -EPERM;
20005
20006 +#ifdef CONFIG_GRKERNSEC_VM86
20007 + if (!capable(CAP_SYS_RAWIO)) {
20008 + gr_handle_vm86();
20009 + goto out;
20010 + }
20011 +#endif
20012 +
20013 tsk = current;
20014 if (tsk->thread.saved_sp0)
20015 goto out;
20016 @@ -242,6 +250,14 @@ int sys_vm86(unsigned long cmd, unsigned long arg, struct pt_regs *regs)
20017 int tmp, ret;
20018 struct vm86plus_struct __user *v86;
20019
20020 +#ifdef CONFIG_GRKERNSEC_VM86
20021 + if (!capable(CAP_SYS_RAWIO)) {
20022 + gr_handle_vm86();
20023 + ret = -EPERM;
20024 + goto out;
20025 + }
20026 +#endif
20027 +
20028 tsk = current;
20029 switch (cmd) {
20030 case VM86_REQUEST_IRQ:
20031 @@ -328,7 +344,7 @@ static void do_sys_vm86(struct kernel_vm86_struct *info, struct task_struct *tsk
20032 tsk->thread.saved_fs = info->regs32->fs;
20033 tsk->thread.saved_gs = get_user_gs(info->regs32);
20034
20035 - tss = &per_cpu(init_tss, get_cpu());
20036 + tss = init_tss + get_cpu();
20037 tsk->thread.sp0 = (unsigned long) &info->VM86_TSS_ESP0;
20038 if (cpu_has_sep)
20039 tsk->thread.sysenter_cs = 0;
20040 @@ -535,7 +551,7 @@ static void do_int(struct kernel_vm86_regs *regs, int i,
20041 goto cannot_handle;
20042 if (i == 0x21 && is_revectored(AH(regs), &KVM86->int21_revectored))
20043 goto cannot_handle;
20044 - intr_ptr = (unsigned long __user *) (i << 2);
20045 + intr_ptr = (__force unsigned long __user *) (i << 2);
20046 if (get_user(segoffs, intr_ptr))
20047 goto cannot_handle;
20048 if ((segoffs >> 16) == BIOSSEG)
20049 diff --git a/arch/x86/kernel/vmlinux.lds.S b/arch/x86/kernel/vmlinux.lds.S
20050 index 22a1530..8fbaaad 100644
20051 --- a/arch/x86/kernel/vmlinux.lds.S
20052 +++ b/arch/x86/kernel/vmlinux.lds.S
20053 @@ -26,6 +26,13 @@
20054 #include <asm/page_types.h>
20055 #include <asm/cache.h>
20056 #include <asm/boot.h>
20057 +#include <asm/segment.h>
20058 +
20059 +#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
20060 +#define __KERNEL_TEXT_OFFSET (LOAD_OFFSET + ____LOAD_PHYSICAL_ADDR)
20061 +#else
20062 +#define __KERNEL_TEXT_OFFSET 0
20063 +#endif
20064
20065 #undef i386 /* in case the preprocessor is a 32bit one */
20066
20067 @@ -69,30 +76,43 @@ jiffies_64 = jiffies;
20068
20069 PHDRS {
20070 text PT_LOAD FLAGS(5); /* R_E */
20071 +#ifdef CONFIG_X86_32
20072 + module PT_LOAD FLAGS(5); /* R_E */
20073 +#endif
20074 +#ifdef CONFIG_XEN
20075 + rodata PT_LOAD FLAGS(5); /* R_E */
20076 +#else
20077 + rodata PT_LOAD FLAGS(4); /* R__ */
20078 +#endif
20079 data PT_LOAD FLAGS(6); /* RW_ */
20080 -#ifdef CONFIG_X86_64
20081 + init.begin PT_LOAD FLAGS(6); /* RW_ */
20082 #ifdef CONFIG_SMP
20083 percpu PT_LOAD FLAGS(6); /* RW_ */
20084 #endif
20085 + text.init PT_LOAD FLAGS(5); /* R_E */
20086 + text.exit PT_LOAD FLAGS(5); /* R_E */
20087 init PT_LOAD FLAGS(7); /* RWE */
20088 -#endif
20089 note PT_NOTE FLAGS(0); /* ___ */
20090 }
20091
20092 SECTIONS
20093 {
20094 #ifdef CONFIG_X86_32
20095 - . = LOAD_OFFSET + LOAD_PHYSICAL_ADDR;
20096 - phys_startup_32 = startup_32 - LOAD_OFFSET;
20097 + . = LOAD_OFFSET + ____LOAD_PHYSICAL_ADDR;
20098 #else
20099 - . = __START_KERNEL;
20100 - phys_startup_64 = startup_64 - LOAD_OFFSET;
20101 + . = __START_KERNEL;
20102 #endif
20103
20104 /* Text and read-only data */
20105 - .text : AT(ADDR(.text) - LOAD_OFFSET) {
20106 - _text = .;
20107 + .text (. - __KERNEL_TEXT_OFFSET): AT(ADDR(.text) - LOAD_OFFSET + __KERNEL_TEXT_OFFSET) {
20108 /* bootstrapping code */
20109 +#ifdef CONFIG_X86_32
20110 + phys_startup_32 = startup_32 - LOAD_OFFSET + __KERNEL_TEXT_OFFSET;
20111 +#else
20112 + phys_startup_64 = startup_64 - LOAD_OFFSET + __KERNEL_TEXT_OFFSET;
20113 +#endif
20114 + __LOAD_PHYSICAL_ADDR = . - LOAD_OFFSET + __KERNEL_TEXT_OFFSET;
20115 + _text = .;
20116 HEAD_TEXT
20117 #ifdef CONFIG_X86_32
20118 . = ALIGN(PAGE_SIZE);
20119 @@ -108,13 +128,48 @@ SECTIONS
20120 IRQENTRY_TEXT
20121 *(.fixup)
20122 *(.gnu.warning)
20123 - /* End of text section */
20124 - _etext = .;
20125 } :text = 0x9090
20126
20127 - NOTES :text :note
20128 + . += __KERNEL_TEXT_OFFSET;
20129
20130 - EXCEPTION_TABLE(16) :text = 0x9090
20131 +#ifdef CONFIG_X86_32
20132 + . = ALIGN(PAGE_SIZE);
20133 + .module.text : AT(ADDR(.module.text) - LOAD_OFFSET) {
20134 +
20135 +#if defined(CONFIG_PAX_KERNEXEC) && defined(CONFIG_MODULES)
20136 + MODULES_EXEC_VADDR = .;
20137 + BYTE(0)
20138 + . += (CONFIG_PAX_KERNEXEC_MODULE_TEXT * 1024 * 1024);
20139 + . = ALIGN(HPAGE_SIZE) - 1;
20140 + MODULES_EXEC_END = .;
20141 +#endif
20142 +
20143 + } :module
20144 +#endif
20145 +
20146 + .text.end : AT(ADDR(.text.end) - LOAD_OFFSET) {
20147 + /* End of text section */
20148 + BYTE(0)
20149 + _etext = . - __KERNEL_TEXT_OFFSET;
20150 + }
20151 +
20152 +#ifdef CONFIG_X86_32
20153 + . = ALIGN(PAGE_SIZE);
20154 + .rodata.page_aligned : AT(ADDR(.rodata.page_aligned) - LOAD_OFFSET) {
20155 + *(.idt)
20156 + . = ALIGN(PAGE_SIZE);
20157 + *(.empty_zero_page)
20158 + *(.initial_pg_fixmap)
20159 + *(.initial_pg_pmd)
20160 + *(.initial_page_table)
20161 + *(.swapper_pg_dir)
20162 + } :rodata
20163 +#endif
20164 +
20165 + . = ALIGN(PAGE_SIZE);
20166 + NOTES :rodata :note
20167 +
20168 + EXCEPTION_TABLE(16) :rodata
20169
20170 #if defined(CONFIG_DEBUG_RODATA)
20171 /* .text should occupy whole number of pages */
20172 @@ -126,16 +181,20 @@ SECTIONS
20173
20174 /* Data */
20175 .data : AT(ADDR(.data) - LOAD_OFFSET) {
20176 +
20177 +#ifdef CONFIG_PAX_KERNEXEC
20178 + . = ALIGN(HPAGE_SIZE);
20179 +#else
20180 + . = ALIGN(PAGE_SIZE);
20181 +#endif
20182 +
20183 /* Start of data section */
20184 _sdata = .;
20185
20186 /* init_task */
20187 INIT_TASK_DATA(THREAD_SIZE)
20188
20189 -#ifdef CONFIG_X86_32
20190 - /* 32 bit has nosave before _edata */
20191 NOSAVE_DATA
20192 -#endif
20193
20194 PAGE_ALIGNED_DATA(PAGE_SIZE)
20195
20196 @@ -176,12 +235,19 @@ SECTIONS
20197 #endif /* CONFIG_X86_64 */
20198
20199 /* Init code and data - will be freed after init */
20200 - . = ALIGN(PAGE_SIZE);
20201 .init.begin : AT(ADDR(.init.begin) - LOAD_OFFSET) {
20202 + BYTE(0)
20203 +
20204 +#ifdef CONFIG_PAX_KERNEXEC
20205 + . = ALIGN(HPAGE_SIZE);
20206 +#else
20207 + . = ALIGN(PAGE_SIZE);
20208 +#endif
20209 +
20210 __init_begin = .; /* paired with __init_end */
20211 - }
20212 + } :init.begin
20213
20214 -#if defined(CONFIG_X86_64) && defined(CONFIG_SMP)
20215 +#ifdef CONFIG_SMP
20216 /*
20217 * percpu offsets are zero-based on SMP. PERCPU_VADDR() changes the
20218 * output PHDR, so the next output section - .init.text - should
20219 @@ -190,12 +256,27 @@ SECTIONS
20220 PERCPU_VADDR(INTERNODE_CACHE_BYTES, 0, :percpu)
20221 #endif
20222
20223 - INIT_TEXT_SECTION(PAGE_SIZE)
20224 -#ifdef CONFIG_X86_64
20225 - :init
20226 -#endif
20227 + . = ALIGN(PAGE_SIZE);
20228 + init_begin = .;
20229 + .init.text (. - __KERNEL_TEXT_OFFSET): AT(init_begin - LOAD_OFFSET) {
20230 + VMLINUX_SYMBOL(_sinittext) = .;
20231 + INIT_TEXT
20232 + VMLINUX_SYMBOL(_einittext) = .;
20233 + . = ALIGN(PAGE_SIZE);
20234 + } :text.init
20235
20236 - INIT_DATA_SECTION(16)
20237 + /*
20238 + * .exit.text is discard at runtime, not link time, to deal with
20239 + * references from .altinstructions and .eh_frame
20240 + */
20241 + .exit.text : AT(ADDR(.exit.text) - LOAD_OFFSET + __KERNEL_TEXT_OFFSET) {
20242 + EXIT_TEXT
20243 + . = ALIGN(16);
20244 + } :text.exit
20245 + . = init_begin + SIZEOF(.init.text) + SIZEOF(.exit.text);
20246 +
20247 + . = ALIGN(PAGE_SIZE);
20248 + INIT_DATA_SECTION(16) :init
20249
20250 .x86_cpu_dev.init : AT(ADDR(.x86_cpu_dev.init) - LOAD_OFFSET) {
20251 __x86_cpu_dev_start = .;
20252 @@ -257,19 +338,12 @@ SECTIONS
20253 }
20254
20255 . = ALIGN(8);
20256 - /*
20257 - * .exit.text is discard at runtime, not link time, to deal with
20258 - * references from .altinstructions and .eh_frame
20259 - */
20260 - .exit.text : AT(ADDR(.exit.text) - LOAD_OFFSET) {
20261 - EXIT_TEXT
20262 - }
20263
20264 .exit.data : AT(ADDR(.exit.data) - LOAD_OFFSET) {
20265 EXIT_DATA
20266 }
20267
20268 -#if !defined(CONFIG_X86_64) || !defined(CONFIG_SMP)
20269 +#ifndef CONFIG_SMP
20270 PERCPU_SECTION(INTERNODE_CACHE_BYTES)
20271 #endif
20272
20273 @@ -288,16 +362,10 @@ SECTIONS
20274 .smp_locks : AT(ADDR(.smp_locks) - LOAD_OFFSET) {
20275 __smp_locks = .;
20276 *(.smp_locks)
20277 - . = ALIGN(PAGE_SIZE);
20278 __smp_locks_end = .;
20279 + . = ALIGN(PAGE_SIZE);
20280 }
20281
20282 -#ifdef CONFIG_X86_64
20283 - .data_nosave : AT(ADDR(.data_nosave) - LOAD_OFFSET) {
20284 - NOSAVE_DATA
20285 - }
20286 -#endif
20287 -
20288 /* BSS */
20289 . = ALIGN(PAGE_SIZE);
20290 .bss : AT(ADDR(.bss) - LOAD_OFFSET) {
20291 @@ -313,6 +381,7 @@ SECTIONS
20292 __brk_base = .;
20293 . += 64 * 1024; /* 64k alignment slop space */
20294 *(.brk_reservation) /* areas brk users have reserved */
20295 + . = ALIGN(HPAGE_SIZE);
20296 __brk_limit = .;
20297 }
20298
20299 @@ -339,13 +408,12 @@ SECTIONS
20300 * for the boot processor.
20301 */
20302 #define INIT_PER_CPU(x) init_per_cpu__##x = x + __per_cpu_load
20303 -INIT_PER_CPU(gdt_page);
20304 INIT_PER_CPU(irq_stack_union);
20305
20306 /*
20307 * Build-time check on the image size:
20308 */
20309 -. = ASSERT((_end - _text <= KERNEL_IMAGE_SIZE),
20310 +. = ASSERT((_end - _text - __KERNEL_TEXT_OFFSET <= KERNEL_IMAGE_SIZE),
20311 "kernel image bigger than KERNEL_IMAGE_SIZE");
20312
20313 #ifdef CONFIG_SMP
20314 diff --git a/arch/x86/kernel/vsmp_64.c b/arch/x86/kernel/vsmp_64.c
20315 index 992f890..fc38904 100644
20316 --- a/arch/x86/kernel/vsmp_64.c
20317 +++ b/arch/x86/kernel/vsmp_64.c
20318 @@ -217,8 +217,8 @@ static void fill_vector_allocation_domain(int cpu, struct cpumask *retmask,
20319 static void vsmp_apic_post_init(void)
20320 {
20321 /* need to update phys_pkg_id */
20322 - apic->phys_pkg_id = apicid_phys_pkg_id;
20323 - apic->vector_allocation_domain = fill_vector_allocation_domain;
20324 + *(void **)&apic->phys_pkg_id = apicid_phys_pkg_id;
20325 + *(void **)&apic->vector_allocation_domain = fill_vector_allocation_domain;
20326 }
20327
20328 void __init vsmp_init(void)
20329 diff --git a/arch/x86/kernel/vsyscall_64.c b/arch/x86/kernel/vsyscall_64.c
20330 index 8d141b3..40a0fe4 100644
20331 --- a/arch/x86/kernel/vsyscall_64.c
20332 +++ b/arch/x86/kernel/vsyscall_64.c
20333 @@ -56,15 +56,13 @@
20334 DEFINE_VVAR(int, vgetcpu_mode);
20335 DEFINE_VVAR(struct vsyscall_gtod_data, vsyscall_gtod_data);
20336
20337 -static enum { EMULATE, NATIVE, NONE } vsyscall_mode = EMULATE;
20338 +static enum { EMULATE, NONE } vsyscall_mode = EMULATE;
20339
20340 static int __init vsyscall_setup(char *str)
20341 {
20342 if (str) {
20343 if (!strcmp("emulate", str))
20344 vsyscall_mode = EMULATE;
20345 - else if (!strcmp("native", str))
20346 - vsyscall_mode = NATIVE;
20347 else if (!strcmp("none", str))
20348 vsyscall_mode = NONE;
20349 else
20350 @@ -306,8 +304,7 @@ done:
20351 return true;
20352
20353 sigsegv:
20354 - force_sig(SIGSEGV, current);
20355 - return true;
20356 + do_group_exit(SIGKILL);
20357 }
20358
20359 /*
20360 @@ -360,10 +357,7 @@ void __init map_vsyscall(void)
20361 extern char __vvar_page;
20362 unsigned long physaddr_vvar_page = __pa_symbol(&__vvar_page);
20363
20364 - __set_fixmap(VSYSCALL_FIRST_PAGE, physaddr_vsyscall,
20365 - vsyscall_mode == NATIVE
20366 - ? PAGE_KERNEL_VSYSCALL
20367 - : PAGE_KERNEL_VVAR);
20368 + __set_fixmap(VSYSCALL_FIRST_PAGE, physaddr_vsyscall, PAGE_KERNEL_VVAR);
20369 BUILD_BUG_ON((unsigned long)__fix_to_virt(VSYSCALL_FIRST_PAGE) !=
20370 (unsigned long)VSYSCALL_START);
20371
20372 diff --git a/arch/x86/kernel/x8664_ksyms_64.c b/arch/x86/kernel/x8664_ksyms_64.c
20373 index 6020f6f..bedd6e3 100644
20374 --- a/arch/x86/kernel/x8664_ksyms_64.c
20375 +++ b/arch/x86/kernel/x8664_ksyms_64.c
20376 @@ -30,8 +30,6 @@ EXPORT_SYMBOL(copy_user_generic_string);
20377 EXPORT_SYMBOL(copy_user_generic_unrolled);
20378 EXPORT_SYMBOL(copy_user_enhanced_fast_string);
20379 EXPORT_SYMBOL(__copy_user_nocache);
20380 -EXPORT_SYMBOL(_copy_from_user);
20381 -EXPORT_SYMBOL(_copy_to_user);
20382
20383 EXPORT_SYMBOL(copy_page);
20384 EXPORT_SYMBOL(clear_page);
20385 diff --git a/arch/x86/kernel/xsave.c b/arch/x86/kernel/xsave.c
20386 index 3d3e207..1a73ab2 100644
20387 --- a/arch/x86/kernel/xsave.c
20388 +++ b/arch/x86/kernel/xsave.c
20389 @@ -132,7 +132,7 @@ int check_for_xstate(struct i387_fxsave_struct __user *buf,
20390 fx_sw_user->xstate_size > fx_sw_user->extended_size)
20391 return -EINVAL;
20392
20393 - err = __get_user(magic2, (__u32 *) (((void *)fpstate) +
20394 + err = __get_user(magic2, (__u32 __user *) (((void __user *)fpstate) +
20395 fx_sw_user->extended_size -
20396 FP_XSTATE_MAGIC2_SIZE));
20397 if (err)
20398 @@ -268,7 +268,7 @@ fx_only:
20399 * the other extended state.
20400 */
20401 xrstor_state(init_xstate_buf, pcntxt_mask & ~XSTATE_FPSSE);
20402 - return fxrstor_checking((__force struct i387_fxsave_struct *)buf);
20403 + return fxrstor_checking((struct i387_fxsave_struct __force_kernel *)buf);
20404 }
20405
20406 /*
20407 @@ -297,7 +297,7 @@ int restore_i387_xstate(void __user *buf)
20408 if (use_xsave())
20409 err = restore_user_xstate(buf);
20410 else
20411 - err = fxrstor_checking((__force struct i387_fxsave_struct *)
20412 + err = fxrstor_checking((struct i387_fxsave_struct __force_kernel *)
20413 buf);
20414 if (unlikely(err)) {
20415 /*
20416 diff --git a/arch/x86/kvm/cpuid.c b/arch/x86/kvm/cpuid.c
20417 index 0595f13..b544fa3 100644
20418 --- a/arch/x86/kvm/cpuid.c
20419 +++ b/arch/x86/kvm/cpuid.c
20420 @@ -124,15 +124,20 @@ int kvm_vcpu_ioctl_set_cpuid2(struct kvm_vcpu *vcpu,
20421 struct kvm_cpuid2 *cpuid,
20422 struct kvm_cpuid_entry2 __user *entries)
20423 {
20424 - int r;
20425 + int r, i;
20426
20427 r = -E2BIG;
20428 if (cpuid->nent > KVM_MAX_CPUID_ENTRIES)
20429 goto out;
20430 r = -EFAULT;
20431 - if (copy_from_user(&vcpu->arch.cpuid_entries, entries,
20432 - cpuid->nent * sizeof(struct kvm_cpuid_entry2)))
20433 + if (!access_ok(VERIFY_READ, entries, cpuid->nent * sizeof(struct kvm_cpuid_entry2)))
20434 goto out;
20435 + for (i = 0; i < cpuid->nent; ++i) {
20436 + struct kvm_cpuid_entry2 cpuid_entry;
20437 + if (__copy_from_user(&cpuid_entry, entries + i, sizeof(cpuid_entry)))
20438 + goto out;
20439 + vcpu->arch.cpuid_entries[i] = cpuid_entry;
20440 + }
20441 vcpu->arch.cpuid_nent = cpuid->nent;
20442 kvm_apic_set_version(vcpu);
20443 kvm_x86_ops->cpuid_update(vcpu);
20444 @@ -147,15 +152,19 @@ int kvm_vcpu_ioctl_get_cpuid2(struct kvm_vcpu *vcpu,
20445 struct kvm_cpuid2 *cpuid,
20446 struct kvm_cpuid_entry2 __user *entries)
20447 {
20448 - int r;
20449 + int r, i;
20450
20451 r = -E2BIG;
20452 if (cpuid->nent < vcpu->arch.cpuid_nent)
20453 goto out;
20454 r = -EFAULT;
20455 - if (copy_to_user(entries, &vcpu->arch.cpuid_entries,
20456 - vcpu->arch.cpuid_nent * sizeof(struct kvm_cpuid_entry2)))
20457 + if (!access_ok(VERIFY_WRITE, entries, vcpu->arch.cpuid_nent * sizeof(struct kvm_cpuid_entry2)))
20458 goto out;
20459 + for (i = 0; i < vcpu->arch.cpuid_nent; ++i) {
20460 + struct kvm_cpuid_entry2 cpuid_entry = vcpu->arch.cpuid_entries[i];
20461 + if (__copy_to_user(entries + i, &cpuid_entry, sizeof(cpuid_entry)))
20462 + goto out;
20463 + }
20464 return 0;
20465
20466 out:
20467 diff --git a/arch/x86/kvm/cpuid.h b/arch/x86/kvm/cpuid.h
20468 index a10e460..58fc514 100644
20469 --- a/arch/x86/kvm/cpuid.h
20470 +++ b/arch/x86/kvm/cpuid.h
20471 @@ -24,6 +24,9 @@ static inline bool guest_cpuid_has_xsave(struct kvm_vcpu *vcpu)
20472 {
20473 struct kvm_cpuid_entry2 *best;
20474
20475 + if (!static_cpu_has(X86_FEATURE_XSAVE))
20476 + return 0;
20477 +
20478 best = kvm_find_cpuid_entry(vcpu, 1, 0);
20479 return best && (best->ecx & bit(X86_FEATURE_XSAVE));
20480 }
20481 diff --git a/arch/x86/kvm/emulate.c b/arch/x86/kvm/emulate.c
20482 index a3b57a2..ebbe732 100644
20483 --- a/arch/x86/kvm/emulate.c
20484 +++ b/arch/x86/kvm/emulate.c
20485 @@ -256,6 +256,7 @@ struct gprefix {
20486
20487 #define ____emulate_2op(ctxt, _op, _x, _y, _suffix, _dsttype) \
20488 do { \
20489 + unsigned long _tmp; \
20490 __asm__ __volatile__ ( \
20491 _PRE_EFLAGS("0", "4", "2") \
20492 _op _suffix " %"_x"3,%1; " \
20493 @@ -270,8 +271,6 @@ struct gprefix {
20494 /* Raw emulation: instruction has two explicit operands. */
20495 #define __emulate_2op_nobyte(ctxt,_op,_wx,_wy,_lx,_ly,_qx,_qy) \
20496 do { \
20497 - unsigned long _tmp; \
20498 - \
20499 switch ((ctxt)->dst.bytes) { \
20500 case 2: \
20501 ____emulate_2op(ctxt,_op,_wx,_wy,"w",u16); \
20502 @@ -287,7 +286,6 @@ struct gprefix {
20503
20504 #define __emulate_2op(ctxt,_op,_bx,_by,_wx,_wy,_lx,_ly,_qx,_qy) \
20505 do { \
20506 - unsigned long _tmp; \
20507 switch ((ctxt)->dst.bytes) { \
20508 case 1: \
20509 ____emulate_2op(ctxt,_op,_bx,_by,"b",u8); \
20510 diff --git a/arch/x86/kvm/lapic.c b/arch/x86/kvm/lapic.c
20511 index ce87878..ab48aa3 100644
20512 --- a/arch/x86/kvm/lapic.c
20513 +++ b/arch/x86/kvm/lapic.c
20514 @@ -54,7 +54,7 @@
20515 #define APIC_BUS_CYCLE_NS 1
20516
20517 /* #define apic_debug(fmt,arg...) printk(KERN_WARNING fmt,##arg) */
20518 -#define apic_debug(fmt, arg...)
20519 +#define apic_debug(fmt, arg...) do {} while (0)
20520
20521 #define APIC_LVT_NUM 6
20522 /* 14 is the version for Xeon and Pentium 8.4.8*/
20523 diff --git a/arch/x86/kvm/paging_tmpl.h b/arch/x86/kvm/paging_tmpl.h
20524 index bb7cf01..0348a05 100644
20525 --- a/arch/x86/kvm/paging_tmpl.h
20526 +++ b/arch/x86/kvm/paging_tmpl.h
20527 @@ -196,7 +196,7 @@ retry_walk:
20528 if (unlikely(kvm_is_error_hva(host_addr)))
20529 goto error;
20530
20531 - ptep_user = (pt_element_t __user *)((void *)host_addr + offset);
20532 + ptep_user = (pt_element_t __force_user *)((void *)host_addr + offset);
20533 if (unlikely(__copy_from_user(&pte, ptep_user, sizeof(pte))))
20534 goto error;
20535
20536 diff --git a/arch/x86/kvm/svm.c b/arch/x86/kvm/svm.c
20537 index baead95..90feeb4 100644
20538 --- a/arch/x86/kvm/svm.c
20539 +++ b/arch/x86/kvm/svm.c
20540 @@ -3516,7 +3516,11 @@ static void reload_tss(struct kvm_vcpu *vcpu)
20541 int cpu = raw_smp_processor_id();
20542
20543 struct svm_cpu_data *sd = per_cpu(svm_data, cpu);
20544 +
20545 + pax_open_kernel();
20546 sd->tss_desc->type = 9; /* available 32/64-bit TSS */
20547 + pax_close_kernel();
20548 +
20549 load_TR_desc();
20550 }
20551
20552 @@ -3894,6 +3898,10 @@ static void svm_vcpu_run(struct kvm_vcpu *vcpu)
20553 #endif
20554 #endif
20555
20556 +#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_MEMORY_UDEREF)
20557 + __set_fs(current_thread_info()->addr_limit);
20558 +#endif
20559 +
20560 reload_tss(vcpu);
20561
20562 local_irq_disable();
20563 diff --git a/arch/x86/kvm/vmx.c b/arch/x86/kvm/vmx.c
20564 index ff66a3b..48ad872 100644
20565 --- a/arch/x86/kvm/vmx.c
20566 +++ b/arch/x86/kvm/vmx.c
20567 @@ -1331,7 +1331,11 @@ static void reload_tss(void)
20568 struct desc_struct *descs;
20569
20570 descs = (void *)gdt->address;
20571 +
20572 + pax_open_kernel();
20573 descs[GDT_ENTRY_TSS].type = 9; /* available TSS */
20574 + pax_close_kernel();
20575 +
20576 load_TR_desc();
20577 }
20578
20579 @@ -1541,6 +1545,10 @@ static void vmx_vcpu_load(struct kvm_vcpu *vcpu, int cpu)
20580 vmcs_writel(HOST_TR_BASE, kvm_read_tr_base()); /* 22.2.4 */
20581 vmcs_writel(HOST_GDTR_BASE, gdt->address); /* 22.2.4 */
20582
20583 +#ifdef CONFIG_PAX_PER_CPU_PGD
20584 + vmcs_writel(HOST_CR3, read_cr3()); /* 22.2.3 FIXME: shadow tables */
20585 +#endif
20586 +
20587 rdmsrl(MSR_IA32_SYSENTER_ESP, sysenter_esp);
20588 vmcs_writel(HOST_IA32_SYSENTER_ESP, sysenter_esp); /* 22.2.3 */
20589 vmx->loaded_vmcs->cpu = cpu;
20590 @@ -2674,8 +2682,11 @@ static __init int hardware_setup(void)
20591 if (!cpu_has_vmx_flexpriority())
20592 flexpriority_enabled = 0;
20593
20594 - if (!cpu_has_vmx_tpr_shadow())
20595 - kvm_x86_ops->update_cr8_intercept = NULL;
20596 + if (!cpu_has_vmx_tpr_shadow()) {
20597 + pax_open_kernel();
20598 + *(void **)&kvm_x86_ops->update_cr8_intercept = NULL;
20599 + pax_close_kernel();
20600 + }
20601
20602 if (enable_ept && !cpu_has_vmx_ept_2m_page())
20603 kvm_disable_largepages();
20604 @@ -3745,7 +3756,10 @@ static void vmx_set_constant_host_state(void)
20605
20606 vmcs_writel(HOST_CR0, read_cr0() | X86_CR0_TS); /* 22.2.3 */
20607 vmcs_writel(HOST_CR4, read_cr4()); /* 22.2.3, 22.2.5 */
20608 +
20609 +#ifndef CONFIG_PAX_PER_CPU_PGD
20610 vmcs_writel(HOST_CR3, read_cr3()); /* 22.2.3 FIXME: shadow tables */
20611 +#endif
20612
20613 vmcs_write16(HOST_CS_SELECTOR, __KERNEL_CS); /* 22.2.4 */
20614 #ifdef CONFIG_X86_64
20615 @@ -3767,7 +3781,7 @@ static void vmx_set_constant_host_state(void)
20616 vmcs_writel(HOST_IDTR_BASE, dt.address); /* 22.2.4 */
20617
20618 asm("mov $.Lkvm_vmx_return, %0" : "=r"(tmpl));
20619 - vmcs_writel(HOST_RIP, tmpl); /* 22.2.5 */
20620 + vmcs_writel(HOST_RIP, ktla_ktva(tmpl)); /* 22.2.5 */
20621
20622 rdmsr(MSR_IA32_SYSENTER_CS, low32, high32);
20623 vmcs_write32(HOST_IA32_SYSENTER_CS, low32);
20624 @@ -6321,6 +6335,12 @@ static void __noclone vmx_vcpu_run(struct kvm_vcpu *vcpu)
20625 "jmp .Lkvm_vmx_return \n\t"
20626 ".Llaunched: " __ex(ASM_VMX_VMRESUME) "\n\t"
20627 ".Lkvm_vmx_return: "
20628 +
20629 +#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
20630 + "ljmp %[cs],$.Lkvm_vmx_return2\n\t"
20631 + ".Lkvm_vmx_return2: "
20632 +#endif
20633 +
20634 /* Save guest registers, load host registers, keep flags */
20635 "mov %0, %c[wordsize](%%"R"sp) \n\t"
20636 "pop %0 \n\t"
20637 @@ -6369,6 +6389,11 @@ static void __noclone vmx_vcpu_run(struct kvm_vcpu *vcpu)
20638 #endif
20639 [cr2]"i"(offsetof(struct vcpu_vmx, vcpu.arch.cr2)),
20640 [wordsize]"i"(sizeof(ulong))
20641 +
20642 +#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
20643 + ,[cs]"i"(__KERNEL_CS)
20644 +#endif
20645 +
20646 : "cc", "memory"
20647 , R"ax", R"bx", R"di", R"si"
20648 #ifdef CONFIG_X86_64
20649 @@ -6376,7 +6401,7 @@ static void __noclone vmx_vcpu_run(struct kvm_vcpu *vcpu)
20650 #endif
20651 );
20652
20653 -#ifndef CONFIG_X86_64
20654 +#ifdef CONFIG_X86_32
20655 /*
20656 * The sysexit path does not restore ds/es, so we must set them to
20657 * a reasonable value ourselves.
20658 @@ -6385,8 +6410,18 @@ static void __noclone vmx_vcpu_run(struct kvm_vcpu *vcpu)
20659 * may be executed in interrupt context, which saves and restore segments
20660 * around it, nullifying its effect.
20661 */
20662 - loadsegment(ds, __USER_DS);
20663 - loadsegment(es, __USER_DS);
20664 + loadsegment(ds, __KERNEL_DS);
20665 + loadsegment(es, __KERNEL_DS);
20666 + loadsegment(ss, __KERNEL_DS);
20667 +
20668 +#ifdef CONFIG_PAX_KERNEXEC
20669 + loadsegment(fs, __KERNEL_PERCPU);
20670 +#endif
20671 +
20672 +#ifdef CONFIG_PAX_MEMORY_UDEREF
20673 + __set_fs(current_thread_info()->addr_limit);
20674 +#endif
20675 +
20676 #endif
20677
20678 vcpu->arch.regs_avail = ~((1 << VCPU_REGS_RIP) | (1 << VCPU_REGS_RSP)
20679 diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c
20680 index 2966c84..9ac0c3c 100644
20681 --- a/arch/x86/kvm/x86.c
20682 +++ b/arch/x86/kvm/x86.c
20683 @@ -1379,8 +1379,8 @@ static int xen_hvm_config(struct kvm_vcpu *vcpu, u64 data)
20684 {
20685 struct kvm *kvm = vcpu->kvm;
20686 int lm = is_long_mode(vcpu);
20687 - u8 *blob_addr = lm ? (u8 *)(long)kvm->arch.xen_hvm_config.blob_addr_64
20688 - : (u8 *)(long)kvm->arch.xen_hvm_config.blob_addr_32;
20689 + u8 __user *blob_addr = lm ? (u8 __user *)(long)kvm->arch.xen_hvm_config.blob_addr_64
20690 + : (u8 __user *)(long)kvm->arch.xen_hvm_config.blob_addr_32;
20691 u8 blob_size = lm ? kvm->arch.xen_hvm_config.blob_size_64
20692 : kvm->arch.xen_hvm_config.blob_size_32;
20693 u32 page_num = data & ~PAGE_MASK;
20694 @@ -2243,6 +2243,8 @@ long kvm_arch_dev_ioctl(struct file *filp,
20695 if (n < msr_list.nmsrs)
20696 goto out;
20697 r = -EFAULT;
20698 + if (num_msrs_to_save > ARRAY_SIZE(msrs_to_save))
20699 + goto out;
20700 if (copy_to_user(user_msr_list->indices, &msrs_to_save,
20701 num_msrs_to_save * sizeof(u32)))
20702 goto out;
20703 @@ -2368,7 +2370,7 @@ static int kvm_vcpu_ioctl_set_lapic(struct kvm_vcpu *vcpu,
20704 static int kvm_vcpu_ioctl_interrupt(struct kvm_vcpu *vcpu,
20705 struct kvm_interrupt *irq)
20706 {
20707 - if (irq->irq < 0 || irq->irq >= 256)
20708 + if (irq->irq >= 256)
20709 return -EINVAL;
20710 if (irqchip_in_kernel(vcpu->kvm))
20711 return -ENXIO;
20712 @@ -4889,7 +4891,7 @@ static void kvm_set_mmio_spte_mask(void)
20713 kvm_mmu_set_mmio_spte_mask(mask);
20714 }
20715
20716 -int kvm_arch_init(void *opaque)
20717 +int kvm_arch_init(const void *opaque)
20718 {
20719 int r;
20720 struct kvm_x86_ops *ops = (struct kvm_x86_ops *)opaque;
20721 @@ -5762,6 +5764,9 @@ int kvm_arch_vcpu_ioctl_set_sregs(struct kvm_vcpu *vcpu,
20722 int pending_vec, max_bits, idx;
20723 struct desc_ptr dt;
20724
20725 + if (!guest_cpuid_has_xsave(vcpu) && (sregs->cr4 & X86_CR4_OSXSAVE))
20726 + return -EINVAL;
20727 +
20728 dt.size = sregs->idt.limit;
20729 dt.address = sregs->idt.base;
20730 kvm_x86_ops->set_idt(vcpu, &dt);
20731 diff --git a/arch/x86/lguest/boot.c b/arch/x86/lguest/boot.c
20732 index 642d880..cc9ebac 100644
20733 --- a/arch/x86/lguest/boot.c
20734 +++ b/arch/x86/lguest/boot.c
20735 @@ -1116,12 +1116,12 @@ static u32 lguest_apic_safe_wait_icr_idle(void)
20736
20737 static void set_lguest_basic_apic_ops(void)
20738 {
20739 - apic->read = lguest_apic_read;
20740 - apic->write = lguest_apic_write;
20741 - apic->icr_read = lguest_apic_icr_read;
20742 - apic->icr_write = lguest_apic_icr_write;
20743 - apic->wait_icr_idle = lguest_apic_wait_icr_idle;
20744 - apic->safe_wait_icr_idle = lguest_apic_safe_wait_icr_idle;
20745 + *(void **)&apic->read = lguest_apic_read;
20746 + *(void **)&apic->write = lguest_apic_write;
20747 + *(void **)&apic->icr_read = lguest_apic_icr_read;
20748 + *(void **)&apic->icr_write = lguest_apic_icr_write;
20749 + *(void **)&apic->wait_icr_idle = lguest_apic_wait_icr_idle;
20750 + *(void **)&apic->safe_wait_icr_idle = lguest_apic_safe_wait_icr_idle;
20751 };
20752 #endif
20753
20754 @@ -1200,9 +1200,10 @@ static __init int early_put_chars(u32 vtermno, const char *buf, int count)
20755 * Rebooting also tells the Host we're finished, but the RESTART flag tells the
20756 * Launcher to reboot us.
20757 */
20758 -static void lguest_restart(char *reason)
20759 +static __noreturn void lguest_restart(char *reason)
20760 {
20761 hcall(LHCALL_SHUTDOWN, __pa(reason), LGUEST_SHUTDOWN_RESTART, 0, 0);
20762 + BUG();
20763 }
20764
20765 /*G:050
20766 diff --git a/arch/x86/lib/atomic64_386_32.S b/arch/x86/lib/atomic64_386_32.S
20767 index 00933d5..3a64af9 100644
20768 --- a/arch/x86/lib/atomic64_386_32.S
20769 +++ b/arch/x86/lib/atomic64_386_32.S
20770 @@ -48,6 +48,10 @@ BEGIN(read)
20771 movl (v), %eax
20772 movl 4(v), %edx
20773 RET_ENDP
20774 +BEGIN(read_unchecked)
20775 + movl (v), %eax
20776 + movl 4(v), %edx
20777 +RET_ENDP
20778 #undef v
20779
20780 #define v %esi
20781 @@ -55,6 +59,10 @@ BEGIN(set)
20782 movl %ebx, (v)
20783 movl %ecx, 4(v)
20784 RET_ENDP
20785 +BEGIN(set_unchecked)
20786 + movl %ebx, (v)
20787 + movl %ecx, 4(v)
20788 +RET_ENDP
20789 #undef v
20790
20791 #define v %esi
20792 @@ -70,6 +78,20 @@ RET_ENDP
20793 BEGIN(add)
20794 addl %eax, (v)
20795 adcl %edx, 4(v)
20796 +
20797 +#ifdef CONFIG_PAX_REFCOUNT
20798 + jno 0f
20799 + subl %eax, (v)
20800 + sbbl %edx, 4(v)
20801 + int $4
20802 +0:
20803 + _ASM_EXTABLE(0b, 0b)
20804 +#endif
20805 +
20806 +RET_ENDP
20807 +BEGIN(add_unchecked)
20808 + addl %eax, (v)
20809 + adcl %edx, 4(v)
20810 RET_ENDP
20811 #undef v
20812
20813 @@ -77,6 +99,24 @@ RET_ENDP
20814 BEGIN(add_return)
20815 addl (v), %eax
20816 adcl 4(v), %edx
20817 +
20818 +#ifdef CONFIG_PAX_REFCOUNT
20819 + into
20820 +1234:
20821 + _ASM_EXTABLE(1234b, 2f)
20822 +#endif
20823 +
20824 + movl %eax, (v)
20825 + movl %edx, 4(v)
20826 +
20827 +#ifdef CONFIG_PAX_REFCOUNT
20828 +2:
20829 +#endif
20830 +
20831 +RET_ENDP
20832 +BEGIN(add_return_unchecked)
20833 + addl (v), %eax
20834 + adcl 4(v), %edx
20835 movl %eax, (v)
20836 movl %edx, 4(v)
20837 RET_ENDP
20838 @@ -86,6 +126,20 @@ RET_ENDP
20839 BEGIN(sub)
20840 subl %eax, (v)
20841 sbbl %edx, 4(v)
20842 +
20843 +#ifdef CONFIG_PAX_REFCOUNT
20844 + jno 0f
20845 + addl %eax, (v)
20846 + adcl %edx, 4(v)
20847 + int $4
20848 +0:
20849 + _ASM_EXTABLE(0b, 0b)
20850 +#endif
20851 +
20852 +RET_ENDP
20853 +BEGIN(sub_unchecked)
20854 + subl %eax, (v)
20855 + sbbl %edx, 4(v)
20856 RET_ENDP
20857 #undef v
20858
20859 @@ -96,6 +150,27 @@ BEGIN(sub_return)
20860 sbbl $0, %edx
20861 addl (v), %eax
20862 adcl 4(v), %edx
20863 +
20864 +#ifdef CONFIG_PAX_REFCOUNT
20865 + into
20866 +1234:
20867 + _ASM_EXTABLE(1234b, 2f)
20868 +#endif
20869 +
20870 + movl %eax, (v)
20871 + movl %edx, 4(v)
20872 +
20873 +#ifdef CONFIG_PAX_REFCOUNT
20874 +2:
20875 +#endif
20876 +
20877 +RET_ENDP
20878 +BEGIN(sub_return_unchecked)
20879 + negl %edx
20880 + negl %eax
20881 + sbbl $0, %edx
20882 + addl (v), %eax
20883 + adcl 4(v), %edx
20884 movl %eax, (v)
20885 movl %edx, 4(v)
20886 RET_ENDP
20887 @@ -105,6 +180,20 @@ RET_ENDP
20888 BEGIN(inc)
20889 addl $1, (v)
20890 adcl $0, 4(v)
20891 +
20892 +#ifdef CONFIG_PAX_REFCOUNT
20893 + jno 0f
20894 + subl $1, (v)
20895 + sbbl $0, 4(v)
20896 + int $4
20897 +0:
20898 + _ASM_EXTABLE(0b, 0b)
20899 +#endif
20900 +
20901 +RET_ENDP
20902 +BEGIN(inc_unchecked)
20903 + addl $1, (v)
20904 + adcl $0, 4(v)
20905 RET_ENDP
20906 #undef v
20907
20908 @@ -114,6 +203,26 @@ BEGIN(inc_return)
20909 movl 4(v), %edx
20910 addl $1, %eax
20911 adcl $0, %edx
20912 +
20913 +#ifdef CONFIG_PAX_REFCOUNT
20914 + into
20915 +1234:
20916 + _ASM_EXTABLE(1234b, 2f)
20917 +#endif
20918 +
20919 + movl %eax, (v)
20920 + movl %edx, 4(v)
20921 +
20922 +#ifdef CONFIG_PAX_REFCOUNT
20923 +2:
20924 +#endif
20925 +
20926 +RET_ENDP
20927 +BEGIN(inc_return_unchecked)
20928 + movl (v), %eax
20929 + movl 4(v), %edx
20930 + addl $1, %eax
20931 + adcl $0, %edx
20932 movl %eax, (v)
20933 movl %edx, 4(v)
20934 RET_ENDP
20935 @@ -123,6 +232,20 @@ RET_ENDP
20936 BEGIN(dec)
20937 subl $1, (v)
20938 sbbl $0, 4(v)
20939 +
20940 +#ifdef CONFIG_PAX_REFCOUNT
20941 + jno 0f
20942 + addl $1, (v)
20943 + adcl $0, 4(v)
20944 + int $4
20945 +0:
20946 + _ASM_EXTABLE(0b, 0b)
20947 +#endif
20948 +
20949 +RET_ENDP
20950 +BEGIN(dec_unchecked)
20951 + subl $1, (v)
20952 + sbbl $0, 4(v)
20953 RET_ENDP
20954 #undef v
20955
20956 @@ -132,6 +255,26 @@ BEGIN(dec_return)
20957 movl 4(v), %edx
20958 subl $1, %eax
20959 sbbl $0, %edx
20960 +
20961 +#ifdef CONFIG_PAX_REFCOUNT
20962 + into
20963 +1234:
20964 + _ASM_EXTABLE(1234b, 2f)
20965 +#endif
20966 +
20967 + movl %eax, (v)
20968 + movl %edx, 4(v)
20969 +
20970 +#ifdef CONFIG_PAX_REFCOUNT
20971 +2:
20972 +#endif
20973 +
20974 +RET_ENDP
20975 +BEGIN(dec_return_unchecked)
20976 + movl (v), %eax
20977 + movl 4(v), %edx
20978 + subl $1, %eax
20979 + sbbl $0, %edx
20980 movl %eax, (v)
20981 movl %edx, 4(v)
20982 RET_ENDP
20983 @@ -143,6 +286,13 @@ BEGIN(add_unless)
20984 adcl %edx, %edi
20985 addl (v), %eax
20986 adcl 4(v), %edx
20987 +
20988 +#ifdef CONFIG_PAX_REFCOUNT
20989 + into
20990 +1234:
20991 + _ASM_EXTABLE(1234b, 2f)
20992 +#endif
20993 +
20994 cmpl %eax, %ecx
20995 je 3f
20996 1:
20997 @@ -168,6 +318,13 @@ BEGIN(inc_not_zero)
20998 1:
20999 addl $1, %eax
21000 adcl $0, %edx
21001 +
21002 +#ifdef CONFIG_PAX_REFCOUNT
21003 + into
21004 +1234:
21005 + _ASM_EXTABLE(1234b, 2f)
21006 +#endif
21007 +
21008 movl %eax, (v)
21009 movl %edx, 4(v)
21010 movl $1, %eax
21011 @@ -186,6 +343,13 @@ BEGIN(dec_if_positive)
21012 movl 4(v), %edx
21013 subl $1, %eax
21014 sbbl $0, %edx
21015 +
21016 +#ifdef CONFIG_PAX_REFCOUNT
21017 + into
21018 +1234:
21019 + _ASM_EXTABLE(1234b, 1f)
21020 +#endif
21021 +
21022 js 1f
21023 movl %eax, (v)
21024 movl %edx, 4(v)
21025 diff --git a/arch/x86/lib/atomic64_cx8_32.S b/arch/x86/lib/atomic64_cx8_32.S
21026 index f5cc9eb..51fa319 100644
21027 --- a/arch/x86/lib/atomic64_cx8_32.S
21028 +++ b/arch/x86/lib/atomic64_cx8_32.S
21029 @@ -35,10 +35,20 @@ ENTRY(atomic64_read_cx8)
21030 CFI_STARTPROC
21031
21032 read64 %ecx
21033 + pax_force_retaddr
21034 ret
21035 CFI_ENDPROC
21036 ENDPROC(atomic64_read_cx8)
21037
21038 +ENTRY(atomic64_read_unchecked_cx8)
21039 + CFI_STARTPROC
21040 +
21041 + read64 %ecx
21042 + pax_force_retaddr
21043 + ret
21044 + CFI_ENDPROC
21045 +ENDPROC(atomic64_read_unchecked_cx8)
21046 +
21047 ENTRY(atomic64_set_cx8)
21048 CFI_STARTPROC
21049
21050 @@ -48,10 +58,25 @@ ENTRY(atomic64_set_cx8)
21051 cmpxchg8b (%esi)
21052 jne 1b
21053
21054 + pax_force_retaddr
21055 ret
21056 CFI_ENDPROC
21057 ENDPROC(atomic64_set_cx8)
21058
21059 +ENTRY(atomic64_set_unchecked_cx8)
21060 + CFI_STARTPROC
21061 +
21062 +1:
21063 +/* we don't need LOCK_PREFIX since aligned 64-bit writes
21064 + * are atomic on 586 and newer */
21065 + cmpxchg8b (%esi)
21066 + jne 1b
21067 +
21068 + pax_force_retaddr
21069 + ret
21070 + CFI_ENDPROC
21071 +ENDPROC(atomic64_set_unchecked_cx8)
21072 +
21073 ENTRY(atomic64_xchg_cx8)
21074 CFI_STARTPROC
21075
21076 @@ -60,12 +85,13 @@ ENTRY(atomic64_xchg_cx8)
21077 cmpxchg8b (%esi)
21078 jne 1b
21079
21080 + pax_force_retaddr
21081 ret
21082 CFI_ENDPROC
21083 ENDPROC(atomic64_xchg_cx8)
21084
21085 -.macro addsub_return func ins insc
21086 -ENTRY(atomic64_\func\()_return_cx8)
21087 +.macro addsub_return func ins insc unchecked=""
21088 +ENTRY(atomic64_\func\()_return\unchecked\()_cx8)
21089 CFI_STARTPROC
21090 SAVE ebp
21091 SAVE ebx
21092 @@ -82,27 +108,44 @@ ENTRY(atomic64_\func\()_return_cx8)
21093 movl %edx, %ecx
21094 \ins\()l %esi, %ebx
21095 \insc\()l %edi, %ecx
21096 +
21097 +.ifb \unchecked
21098 +#ifdef CONFIG_PAX_REFCOUNT
21099 + into
21100 +2:
21101 + _ASM_EXTABLE(2b, 3f)
21102 +#endif
21103 +.endif
21104 +
21105 LOCK_PREFIX
21106 cmpxchg8b (%ebp)
21107 jne 1b
21108 -
21109 -10:
21110 movl %ebx, %eax
21111 movl %ecx, %edx
21112 +
21113 +.ifb \unchecked
21114 +#ifdef CONFIG_PAX_REFCOUNT
21115 +3:
21116 +#endif
21117 +.endif
21118 +
21119 RESTORE edi
21120 RESTORE esi
21121 RESTORE ebx
21122 RESTORE ebp
21123 + pax_force_retaddr
21124 ret
21125 CFI_ENDPROC
21126 -ENDPROC(atomic64_\func\()_return_cx8)
21127 +ENDPROC(atomic64_\func\()_return\unchecked\()_cx8)
21128 .endm
21129
21130 addsub_return add add adc
21131 addsub_return sub sub sbb
21132 +addsub_return add add adc _unchecked
21133 +addsub_return sub sub sbb _unchecked
21134
21135 -.macro incdec_return func ins insc
21136 -ENTRY(atomic64_\func\()_return_cx8)
21137 +.macro incdec_return func ins insc unchecked=""
21138 +ENTRY(atomic64_\func\()_return\unchecked\()_cx8)
21139 CFI_STARTPROC
21140 SAVE ebx
21141
21142 @@ -112,21 +155,39 @@ ENTRY(atomic64_\func\()_return_cx8)
21143 movl %edx, %ecx
21144 \ins\()l $1, %ebx
21145 \insc\()l $0, %ecx
21146 +
21147 +.ifb \unchecked
21148 +#ifdef CONFIG_PAX_REFCOUNT
21149 + into
21150 +2:
21151 + _ASM_EXTABLE(2b, 3f)
21152 +#endif
21153 +.endif
21154 +
21155 LOCK_PREFIX
21156 cmpxchg8b (%esi)
21157 jne 1b
21158
21159 -10:
21160 movl %ebx, %eax
21161 movl %ecx, %edx
21162 +
21163 +.ifb \unchecked
21164 +#ifdef CONFIG_PAX_REFCOUNT
21165 +3:
21166 +#endif
21167 +.endif
21168 +
21169 RESTORE ebx
21170 + pax_force_retaddr
21171 ret
21172 CFI_ENDPROC
21173 -ENDPROC(atomic64_\func\()_return_cx8)
21174 +ENDPROC(atomic64_\func\()_return\unchecked\()_cx8)
21175 .endm
21176
21177 incdec_return inc add adc
21178 incdec_return dec sub sbb
21179 +incdec_return inc add adc _unchecked
21180 +incdec_return dec sub sbb _unchecked
21181
21182 ENTRY(atomic64_dec_if_positive_cx8)
21183 CFI_STARTPROC
21184 @@ -138,6 +199,13 @@ ENTRY(atomic64_dec_if_positive_cx8)
21185 movl %edx, %ecx
21186 subl $1, %ebx
21187 sbb $0, %ecx
21188 +
21189 +#ifdef CONFIG_PAX_REFCOUNT
21190 + into
21191 +1234:
21192 + _ASM_EXTABLE(1234b, 2f)
21193 +#endif
21194 +
21195 js 2f
21196 LOCK_PREFIX
21197 cmpxchg8b (%esi)
21198 @@ -147,6 +215,7 @@ ENTRY(atomic64_dec_if_positive_cx8)
21199 movl %ebx, %eax
21200 movl %ecx, %edx
21201 RESTORE ebx
21202 + pax_force_retaddr
21203 ret
21204 CFI_ENDPROC
21205 ENDPROC(atomic64_dec_if_positive_cx8)
21206 @@ -171,6 +240,13 @@ ENTRY(atomic64_add_unless_cx8)
21207 movl %edx, %ecx
21208 addl %ebp, %ebx
21209 adcl %edi, %ecx
21210 +
21211 +#ifdef CONFIG_PAX_REFCOUNT
21212 + into
21213 +1234:
21214 + _ASM_EXTABLE(1234b, 3f)
21215 +#endif
21216 +
21217 LOCK_PREFIX
21218 cmpxchg8b (%esi)
21219 jne 1b
21220 @@ -181,6 +257,7 @@ ENTRY(atomic64_add_unless_cx8)
21221 CFI_ADJUST_CFA_OFFSET -8
21222 RESTORE ebx
21223 RESTORE ebp
21224 + pax_force_retaddr
21225 ret
21226 4:
21227 cmpl %edx, 4(%esp)
21228 @@ -203,6 +280,13 @@ ENTRY(atomic64_inc_not_zero_cx8)
21229 xorl %ecx, %ecx
21230 addl $1, %ebx
21231 adcl %edx, %ecx
21232 +
21233 +#ifdef CONFIG_PAX_REFCOUNT
21234 + into
21235 +1234:
21236 + _ASM_EXTABLE(1234b, 3f)
21237 +#endif
21238 +
21239 LOCK_PREFIX
21240 cmpxchg8b (%esi)
21241 jne 1b
21242 @@ -210,6 +294,7 @@ ENTRY(atomic64_inc_not_zero_cx8)
21243 movl $1, %eax
21244 3:
21245 RESTORE ebx
21246 + pax_force_retaddr
21247 ret
21248 CFI_ENDPROC
21249 ENDPROC(atomic64_inc_not_zero_cx8)
21250 diff --git a/arch/x86/lib/checksum_32.S b/arch/x86/lib/checksum_32.S
21251 index 2af5df3..62b1a5a 100644
21252 --- a/arch/x86/lib/checksum_32.S
21253 +++ b/arch/x86/lib/checksum_32.S
21254 @@ -29,7 +29,8 @@
21255 #include <asm/dwarf2.h>
21256 #include <asm/errno.h>
21257 #include <asm/asm.h>
21258 -
21259 +#include <asm/segment.h>
21260 +
21261 /*
21262 * computes a partial checksum, e.g. for TCP/UDP fragments
21263 */
21264 @@ -293,9 +294,24 @@ unsigned int csum_partial_copy_generic (const char *src, char *dst,
21265
21266 #define ARGBASE 16
21267 #define FP 12
21268 -
21269 -ENTRY(csum_partial_copy_generic)
21270 +
21271 +ENTRY(csum_partial_copy_generic_to_user)
21272 CFI_STARTPROC
21273 +
21274 +#ifdef CONFIG_PAX_MEMORY_UDEREF
21275 + pushl_cfi %gs
21276 + popl_cfi %es
21277 + jmp csum_partial_copy_generic
21278 +#endif
21279 +
21280 +ENTRY(csum_partial_copy_generic_from_user)
21281 +
21282 +#ifdef CONFIG_PAX_MEMORY_UDEREF
21283 + pushl_cfi %gs
21284 + popl_cfi %ds
21285 +#endif
21286 +
21287 +ENTRY(csum_partial_copy_generic)
21288 subl $4,%esp
21289 CFI_ADJUST_CFA_OFFSET 4
21290 pushl_cfi %edi
21291 @@ -317,7 +333,7 @@ ENTRY(csum_partial_copy_generic)
21292 jmp 4f
21293 SRC(1: movw (%esi), %bx )
21294 addl $2, %esi
21295 -DST( movw %bx, (%edi) )
21296 +DST( movw %bx, %es:(%edi) )
21297 addl $2, %edi
21298 addw %bx, %ax
21299 adcl $0, %eax
21300 @@ -329,30 +345,30 @@ DST( movw %bx, (%edi) )
21301 SRC(1: movl (%esi), %ebx )
21302 SRC( movl 4(%esi), %edx )
21303 adcl %ebx, %eax
21304 -DST( movl %ebx, (%edi) )
21305 +DST( movl %ebx, %es:(%edi) )
21306 adcl %edx, %eax
21307 -DST( movl %edx, 4(%edi) )
21308 +DST( movl %edx, %es:4(%edi) )
21309
21310 SRC( movl 8(%esi), %ebx )
21311 SRC( movl 12(%esi), %edx )
21312 adcl %ebx, %eax
21313 -DST( movl %ebx, 8(%edi) )
21314 +DST( movl %ebx, %es:8(%edi) )
21315 adcl %edx, %eax
21316 -DST( movl %edx, 12(%edi) )
21317 +DST( movl %edx, %es:12(%edi) )
21318
21319 SRC( movl 16(%esi), %ebx )
21320 SRC( movl 20(%esi), %edx )
21321 adcl %ebx, %eax
21322 -DST( movl %ebx, 16(%edi) )
21323 +DST( movl %ebx, %es:16(%edi) )
21324 adcl %edx, %eax
21325 -DST( movl %edx, 20(%edi) )
21326 +DST( movl %edx, %es:20(%edi) )
21327
21328 SRC( movl 24(%esi), %ebx )
21329 SRC( movl 28(%esi), %edx )
21330 adcl %ebx, %eax
21331 -DST( movl %ebx, 24(%edi) )
21332 +DST( movl %ebx, %es:24(%edi) )
21333 adcl %edx, %eax
21334 -DST( movl %edx, 28(%edi) )
21335 +DST( movl %edx, %es:28(%edi) )
21336
21337 lea 32(%esi), %esi
21338 lea 32(%edi), %edi
21339 @@ -366,7 +382,7 @@ DST( movl %edx, 28(%edi) )
21340 shrl $2, %edx # This clears CF
21341 SRC(3: movl (%esi), %ebx )
21342 adcl %ebx, %eax
21343 -DST( movl %ebx, (%edi) )
21344 +DST( movl %ebx, %es:(%edi) )
21345 lea 4(%esi), %esi
21346 lea 4(%edi), %edi
21347 dec %edx
21348 @@ -378,12 +394,12 @@ DST( movl %ebx, (%edi) )
21349 jb 5f
21350 SRC( movw (%esi), %cx )
21351 leal 2(%esi), %esi
21352 -DST( movw %cx, (%edi) )
21353 +DST( movw %cx, %es:(%edi) )
21354 leal 2(%edi), %edi
21355 je 6f
21356 shll $16,%ecx
21357 SRC(5: movb (%esi), %cl )
21358 -DST( movb %cl, (%edi) )
21359 +DST( movb %cl, %es:(%edi) )
21360 6: addl %ecx, %eax
21361 adcl $0, %eax
21362 7:
21363 @@ -394,7 +410,7 @@ DST( movb %cl, (%edi) )
21364
21365 6001:
21366 movl ARGBASE+20(%esp), %ebx # src_err_ptr
21367 - movl $-EFAULT, (%ebx)
21368 + movl $-EFAULT, %ss:(%ebx)
21369
21370 # zero the complete destination - computing the rest
21371 # is too much work
21372 @@ -407,11 +423,15 @@ DST( movb %cl, (%edi) )
21373
21374 6002:
21375 movl ARGBASE+24(%esp), %ebx # dst_err_ptr
21376 - movl $-EFAULT,(%ebx)
21377 + movl $-EFAULT,%ss:(%ebx)
21378 jmp 5000b
21379
21380 .previous
21381
21382 + pushl_cfi %ss
21383 + popl_cfi %ds
21384 + pushl_cfi %ss
21385 + popl_cfi %es
21386 popl_cfi %ebx
21387 CFI_RESTORE ebx
21388 popl_cfi %esi
21389 @@ -421,26 +441,43 @@ DST( movb %cl, (%edi) )
21390 popl_cfi %ecx # equivalent to addl $4,%esp
21391 ret
21392 CFI_ENDPROC
21393 -ENDPROC(csum_partial_copy_generic)
21394 +ENDPROC(csum_partial_copy_generic_to_user)
21395
21396 #else
21397
21398 /* Version for PentiumII/PPro */
21399
21400 #define ROUND1(x) \
21401 + nop; nop; nop; \
21402 SRC(movl x(%esi), %ebx ) ; \
21403 addl %ebx, %eax ; \
21404 - DST(movl %ebx, x(%edi) ) ;
21405 + DST(movl %ebx, %es:x(%edi)) ;
21406
21407 #define ROUND(x) \
21408 + nop; nop; nop; \
21409 SRC(movl x(%esi), %ebx ) ; \
21410 adcl %ebx, %eax ; \
21411 - DST(movl %ebx, x(%edi) ) ;
21412 + DST(movl %ebx, %es:x(%edi)) ;
21413
21414 #define ARGBASE 12
21415 -
21416 -ENTRY(csum_partial_copy_generic)
21417 +
21418 +ENTRY(csum_partial_copy_generic_to_user)
21419 CFI_STARTPROC
21420 +
21421 +#ifdef CONFIG_PAX_MEMORY_UDEREF
21422 + pushl_cfi %gs
21423 + popl_cfi %es
21424 + jmp csum_partial_copy_generic
21425 +#endif
21426 +
21427 +ENTRY(csum_partial_copy_generic_from_user)
21428 +
21429 +#ifdef CONFIG_PAX_MEMORY_UDEREF
21430 + pushl_cfi %gs
21431 + popl_cfi %ds
21432 +#endif
21433 +
21434 +ENTRY(csum_partial_copy_generic)
21435 pushl_cfi %ebx
21436 CFI_REL_OFFSET ebx, 0
21437 pushl_cfi %edi
21438 @@ -461,7 +498,7 @@ ENTRY(csum_partial_copy_generic)
21439 subl %ebx, %edi
21440 lea -1(%esi),%edx
21441 andl $-32,%edx
21442 - lea 3f(%ebx,%ebx), %ebx
21443 + lea 3f(%ebx,%ebx,2), %ebx
21444 testl %esi, %esi
21445 jmp *%ebx
21446 1: addl $64,%esi
21447 @@ -482,19 +519,19 @@ ENTRY(csum_partial_copy_generic)
21448 jb 5f
21449 SRC( movw (%esi), %dx )
21450 leal 2(%esi), %esi
21451 -DST( movw %dx, (%edi) )
21452 +DST( movw %dx, %es:(%edi) )
21453 leal 2(%edi), %edi
21454 je 6f
21455 shll $16,%edx
21456 5:
21457 SRC( movb (%esi), %dl )
21458 -DST( movb %dl, (%edi) )
21459 +DST( movb %dl, %es:(%edi) )
21460 6: addl %edx, %eax
21461 adcl $0, %eax
21462 7:
21463 .section .fixup, "ax"
21464 6001: movl ARGBASE+20(%esp), %ebx # src_err_ptr
21465 - movl $-EFAULT, (%ebx)
21466 + movl $-EFAULT, %ss:(%ebx)
21467 # zero the complete destination (computing the rest is too much work)
21468 movl ARGBASE+8(%esp),%edi # dst
21469 movl ARGBASE+12(%esp),%ecx # len
21470 @@ -502,10 +539,17 @@ DST( movb %dl, (%edi) )
21471 rep; stosb
21472 jmp 7b
21473 6002: movl ARGBASE+24(%esp), %ebx # dst_err_ptr
21474 - movl $-EFAULT, (%ebx)
21475 + movl $-EFAULT, %ss:(%ebx)
21476 jmp 7b
21477 .previous
21478
21479 +#ifdef CONFIG_PAX_MEMORY_UDEREF
21480 + pushl_cfi %ss
21481 + popl_cfi %ds
21482 + pushl_cfi %ss
21483 + popl_cfi %es
21484 +#endif
21485 +
21486 popl_cfi %esi
21487 CFI_RESTORE esi
21488 popl_cfi %edi
21489 @@ -514,7 +558,7 @@ DST( movb %dl, (%edi) )
21490 CFI_RESTORE ebx
21491 ret
21492 CFI_ENDPROC
21493 -ENDPROC(csum_partial_copy_generic)
21494 +ENDPROC(csum_partial_copy_generic_to_user)
21495
21496 #undef ROUND
21497 #undef ROUND1
21498 diff --git a/arch/x86/lib/clear_page_64.S b/arch/x86/lib/clear_page_64.S
21499 index f2145cf..cea889d 100644
21500 --- a/arch/x86/lib/clear_page_64.S
21501 +++ b/arch/x86/lib/clear_page_64.S
21502 @@ -11,6 +11,7 @@ ENTRY(clear_page_c)
21503 movl $4096/8,%ecx
21504 xorl %eax,%eax
21505 rep stosq
21506 + pax_force_retaddr
21507 ret
21508 CFI_ENDPROC
21509 ENDPROC(clear_page_c)
21510 @@ -20,6 +21,7 @@ ENTRY(clear_page_c_e)
21511 movl $4096,%ecx
21512 xorl %eax,%eax
21513 rep stosb
21514 + pax_force_retaddr
21515 ret
21516 CFI_ENDPROC
21517 ENDPROC(clear_page_c_e)
21518 @@ -43,6 +45,7 @@ ENTRY(clear_page)
21519 leaq 64(%rdi),%rdi
21520 jnz .Lloop
21521 nop
21522 + pax_force_retaddr
21523 ret
21524 CFI_ENDPROC
21525 .Lclear_page_end:
21526 @@ -58,7 +61,7 @@ ENDPROC(clear_page)
21527
21528 #include <asm/cpufeature.h>
21529
21530 - .section .altinstr_replacement,"ax"
21531 + .section .altinstr_replacement,"a"
21532 1: .byte 0xeb /* jmp <disp8> */
21533 .byte (clear_page_c - clear_page) - (2f - 1b) /* offset */
21534 2: .byte 0xeb /* jmp <disp8> */
21535 diff --git a/arch/x86/lib/cmpxchg16b_emu.S b/arch/x86/lib/cmpxchg16b_emu.S
21536 index 1e572c5..2a162cd 100644
21537 --- a/arch/x86/lib/cmpxchg16b_emu.S
21538 +++ b/arch/x86/lib/cmpxchg16b_emu.S
21539 @@ -53,11 +53,13 @@ this_cpu_cmpxchg16b_emu:
21540
21541 popf
21542 mov $1, %al
21543 + pax_force_retaddr
21544 ret
21545
21546 not_same:
21547 popf
21548 xor %al,%al
21549 + pax_force_retaddr
21550 ret
21551
21552 CFI_ENDPROC
21553 diff --git a/arch/x86/lib/copy_page_64.S b/arch/x86/lib/copy_page_64.S
21554 index 6b34d04..dccb07f 100644
21555 --- a/arch/x86/lib/copy_page_64.S
21556 +++ b/arch/x86/lib/copy_page_64.S
21557 @@ -9,6 +9,7 @@ copy_page_c:
21558 CFI_STARTPROC
21559 movl $4096/8,%ecx
21560 rep movsq
21561 + pax_force_retaddr
21562 ret
21563 CFI_ENDPROC
21564 ENDPROC(copy_page_c)
21565 @@ -20,12 +21,14 @@ ENDPROC(copy_page_c)
21566
21567 ENTRY(copy_page)
21568 CFI_STARTPROC
21569 - subq $2*8,%rsp
21570 - CFI_ADJUST_CFA_OFFSET 2*8
21571 + subq $3*8,%rsp
21572 + CFI_ADJUST_CFA_OFFSET 3*8
21573 movq %rbx,(%rsp)
21574 CFI_REL_OFFSET rbx, 0
21575 movq %r12,1*8(%rsp)
21576 CFI_REL_OFFSET r12, 1*8
21577 + movq %r13,2*8(%rsp)
21578 + CFI_REL_OFFSET r13, 2*8
21579
21580 movl $(4096/64)-5,%ecx
21581 .p2align 4
21582 @@ -37,7 +40,7 @@ ENTRY(copy_page)
21583 movq 16 (%rsi), %rdx
21584 movq 24 (%rsi), %r8
21585 movq 32 (%rsi), %r9
21586 - movq 40 (%rsi), %r10
21587 + movq 40 (%rsi), %r13
21588 movq 48 (%rsi), %r11
21589 movq 56 (%rsi), %r12
21590
21591 @@ -48,7 +51,7 @@ ENTRY(copy_page)
21592 movq %rdx, 16 (%rdi)
21593 movq %r8, 24 (%rdi)
21594 movq %r9, 32 (%rdi)
21595 - movq %r10, 40 (%rdi)
21596 + movq %r13, 40 (%rdi)
21597 movq %r11, 48 (%rdi)
21598 movq %r12, 56 (%rdi)
21599
21600 @@ -67,7 +70,7 @@ ENTRY(copy_page)
21601 movq 16 (%rsi), %rdx
21602 movq 24 (%rsi), %r8
21603 movq 32 (%rsi), %r9
21604 - movq 40 (%rsi), %r10
21605 + movq 40 (%rsi), %r13
21606 movq 48 (%rsi), %r11
21607 movq 56 (%rsi), %r12
21608
21609 @@ -76,7 +79,7 @@ ENTRY(copy_page)
21610 movq %rdx, 16 (%rdi)
21611 movq %r8, 24 (%rdi)
21612 movq %r9, 32 (%rdi)
21613 - movq %r10, 40 (%rdi)
21614 + movq %r13, 40 (%rdi)
21615 movq %r11, 48 (%rdi)
21616 movq %r12, 56 (%rdi)
21617
21618 @@ -89,8 +92,11 @@ ENTRY(copy_page)
21619 CFI_RESTORE rbx
21620 movq 1*8(%rsp),%r12
21621 CFI_RESTORE r12
21622 - addq $2*8,%rsp
21623 - CFI_ADJUST_CFA_OFFSET -2*8
21624 + movq 2*8(%rsp),%r13
21625 + CFI_RESTORE r13
21626 + addq $3*8,%rsp
21627 + CFI_ADJUST_CFA_OFFSET -3*8
21628 + pax_force_retaddr
21629 ret
21630 .Lcopy_page_end:
21631 CFI_ENDPROC
21632 @@ -101,7 +107,7 @@ ENDPROC(copy_page)
21633
21634 #include <asm/cpufeature.h>
21635
21636 - .section .altinstr_replacement,"ax"
21637 + .section .altinstr_replacement,"a"
21638 1: .byte 0xeb /* jmp <disp8> */
21639 .byte (copy_page_c - copy_page) - (2f - 1b) /* offset */
21640 2:
21641 diff --git a/arch/x86/lib/copy_user_64.S b/arch/x86/lib/copy_user_64.S
21642 index 5b2995f..78e7644 100644
21643 --- a/arch/x86/lib/copy_user_64.S
21644 +++ b/arch/x86/lib/copy_user_64.S
21645 @@ -17,6 +17,7 @@
21646 #include <asm/cpufeature.h>
21647 #include <asm/alternative-asm.h>
21648 #include <asm/asm.h>
21649 +#include <asm/pgtable.h>
21650
21651 /*
21652 * By placing feature2 after feature1 in altinstructions section, we logically
21653 @@ -30,7 +31,7 @@
21654 .byte 0xe9 /* 32bit jump */
21655 .long \orig-1f /* by default jump to orig */
21656 1:
21657 - .section .altinstr_replacement,"ax"
21658 + .section .altinstr_replacement,"a"
21659 2: .byte 0xe9 /* near jump with 32bit immediate */
21660 .long \alt1-1b /* offset */ /* or alternatively to alt1 */
21661 3: .byte 0xe9 /* near jump with 32bit immediate */
21662 @@ -69,47 +70,20 @@
21663 #endif
21664 .endm
21665
21666 -/* Standard copy_to_user with segment limit checking */
21667 -ENTRY(_copy_to_user)
21668 - CFI_STARTPROC
21669 - GET_THREAD_INFO(%rax)
21670 - movq %rdi,%rcx
21671 - addq %rdx,%rcx
21672 - jc bad_to_user
21673 - cmpq TI_addr_limit(%rax),%rcx
21674 - ja bad_to_user
21675 - ALTERNATIVE_JUMP X86_FEATURE_REP_GOOD,X86_FEATURE_ERMS, \
21676 - copy_user_generic_unrolled,copy_user_generic_string, \
21677 - copy_user_enhanced_fast_string
21678 - CFI_ENDPROC
21679 -ENDPROC(_copy_to_user)
21680 -
21681 -/* Standard copy_from_user with segment limit checking */
21682 -ENTRY(_copy_from_user)
21683 - CFI_STARTPROC
21684 - GET_THREAD_INFO(%rax)
21685 - movq %rsi,%rcx
21686 - addq %rdx,%rcx
21687 - jc bad_from_user
21688 - cmpq TI_addr_limit(%rax),%rcx
21689 - ja bad_from_user
21690 - ALTERNATIVE_JUMP X86_FEATURE_REP_GOOD,X86_FEATURE_ERMS, \
21691 - copy_user_generic_unrolled,copy_user_generic_string, \
21692 - copy_user_enhanced_fast_string
21693 - CFI_ENDPROC
21694 -ENDPROC(_copy_from_user)
21695 -
21696 .section .fixup,"ax"
21697 /* must zero dest */
21698 ENTRY(bad_from_user)
21699 bad_from_user:
21700 CFI_STARTPROC
21701 + testl %edx,%edx
21702 + js bad_to_user
21703 movl %edx,%ecx
21704 xorl %eax,%eax
21705 rep
21706 stosb
21707 bad_to_user:
21708 movl %edx,%eax
21709 + pax_force_retaddr
21710 ret
21711 CFI_ENDPROC
21712 ENDPROC(bad_from_user)
21713 @@ -139,19 +113,19 @@ ENTRY(copy_user_generic_unrolled)
21714 jz 17f
21715 1: movq (%rsi),%r8
21716 2: movq 1*8(%rsi),%r9
21717 -3: movq 2*8(%rsi),%r10
21718 +3: movq 2*8(%rsi),%rax
21719 4: movq 3*8(%rsi),%r11
21720 5: movq %r8,(%rdi)
21721 6: movq %r9,1*8(%rdi)
21722 -7: movq %r10,2*8(%rdi)
21723 +7: movq %rax,2*8(%rdi)
21724 8: movq %r11,3*8(%rdi)
21725 9: movq 4*8(%rsi),%r8
21726 10: movq 5*8(%rsi),%r9
21727 -11: movq 6*8(%rsi),%r10
21728 +11: movq 6*8(%rsi),%rax
21729 12: movq 7*8(%rsi),%r11
21730 13: movq %r8,4*8(%rdi)
21731 14: movq %r9,5*8(%rdi)
21732 -15: movq %r10,6*8(%rdi)
21733 +15: movq %rax,6*8(%rdi)
21734 16: movq %r11,7*8(%rdi)
21735 leaq 64(%rsi),%rsi
21736 leaq 64(%rdi),%rdi
21737 @@ -177,6 +151,7 @@ ENTRY(copy_user_generic_unrolled)
21738 decl %ecx
21739 jnz 21b
21740 23: xor %eax,%eax
21741 + pax_force_retaddr
21742 ret
21743
21744 .section .fixup,"ax"
21745 @@ -246,6 +221,7 @@ ENTRY(copy_user_generic_string)
21746 3: rep
21747 movsb
21748 4: xorl %eax,%eax
21749 + pax_force_retaddr
21750 ret
21751
21752 .section .fixup,"ax"
21753 @@ -279,6 +255,7 @@ ENTRY(copy_user_enhanced_fast_string)
21754 1: rep
21755 movsb
21756 2: xorl %eax,%eax
21757 + pax_force_retaddr
21758 ret
21759
21760 .section .fixup,"ax"
21761 diff --git a/arch/x86/lib/copy_user_nocache_64.S b/arch/x86/lib/copy_user_nocache_64.S
21762 index cacddc7..09d49e4 100644
21763 --- a/arch/x86/lib/copy_user_nocache_64.S
21764 +++ b/arch/x86/lib/copy_user_nocache_64.S
21765 @@ -8,6 +8,7 @@
21766
21767 #include <linux/linkage.h>
21768 #include <asm/dwarf2.h>
21769 +#include <asm/alternative-asm.h>
21770
21771 #define FIX_ALIGNMENT 1
21772
21773 @@ -15,6 +16,7 @@
21774 #include <asm/asm-offsets.h>
21775 #include <asm/thread_info.h>
21776 #include <asm/asm.h>
21777 +#include <asm/pgtable.h>
21778
21779 .macro ALIGN_DESTINATION
21780 #ifdef FIX_ALIGNMENT
21781 @@ -48,6 +50,15 @@
21782 */
21783 ENTRY(__copy_user_nocache)
21784 CFI_STARTPROC
21785 +
21786 +#ifdef CONFIG_PAX_MEMORY_UDEREF
21787 + mov $PAX_USER_SHADOW_BASE,%rcx
21788 + cmp %rcx,%rsi
21789 + jae 1f
21790 + add %rcx,%rsi
21791 +1:
21792 +#endif
21793 +
21794 cmpl $8,%edx
21795 jb 20f /* less then 8 bytes, go to byte copy loop */
21796 ALIGN_DESTINATION
21797 @@ -57,19 +68,19 @@ ENTRY(__copy_user_nocache)
21798 jz 17f
21799 1: movq (%rsi),%r8
21800 2: movq 1*8(%rsi),%r9
21801 -3: movq 2*8(%rsi),%r10
21802 +3: movq 2*8(%rsi),%rax
21803 4: movq 3*8(%rsi),%r11
21804 5: movnti %r8,(%rdi)
21805 6: movnti %r9,1*8(%rdi)
21806 -7: movnti %r10,2*8(%rdi)
21807 +7: movnti %rax,2*8(%rdi)
21808 8: movnti %r11,3*8(%rdi)
21809 9: movq 4*8(%rsi),%r8
21810 10: movq 5*8(%rsi),%r9
21811 -11: movq 6*8(%rsi),%r10
21812 +11: movq 6*8(%rsi),%rax
21813 12: movq 7*8(%rsi),%r11
21814 13: movnti %r8,4*8(%rdi)
21815 14: movnti %r9,5*8(%rdi)
21816 -15: movnti %r10,6*8(%rdi)
21817 +15: movnti %rax,6*8(%rdi)
21818 16: movnti %r11,7*8(%rdi)
21819 leaq 64(%rsi),%rsi
21820 leaq 64(%rdi),%rdi
21821 @@ -96,6 +107,7 @@ ENTRY(__copy_user_nocache)
21822 jnz 21b
21823 23: xorl %eax,%eax
21824 sfence
21825 + pax_force_retaddr
21826 ret
21827
21828 .section .fixup,"ax"
21829 diff --git a/arch/x86/lib/csum-copy_64.S b/arch/x86/lib/csum-copy_64.S
21830 index 2419d5f..953ee51 100644
21831 --- a/arch/x86/lib/csum-copy_64.S
21832 +++ b/arch/x86/lib/csum-copy_64.S
21833 @@ -9,6 +9,7 @@
21834 #include <asm/dwarf2.h>
21835 #include <asm/errno.h>
21836 #include <asm/asm.h>
21837 +#include <asm/alternative-asm.h>
21838
21839 /*
21840 * Checksum copy with exception handling.
21841 @@ -220,6 +221,7 @@ ENTRY(csum_partial_copy_generic)
21842 CFI_RESTORE rbp
21843 addq $7*8, %rsp
21844 CFI_ADJUST_CFA_OFFSET -7*8
21845 + pax_force_retaddr 0, 1
21846 ret
21847 CFI_RESTORE_STATE
21848
21849 diff --git a/arch/x86/lib/csum-wrappers_64.c b/arch/x86/lib/csum-wrappers_64.c
21850 index 25b7ae8..3b52ccd 100644
21851 --- a/arch/x86/lib/csum-wrappers_64.c
21852 +++ b/arch/x86/lib/csum-wrappers_64.c
21853 @@ -52,7 +52,13 @@ csum_partial_copy_from_user(const void __user *src, void *dst,
21854 len -= 2;
21855 }
21856 }
21857 - isum = csum_partial_copy_generic((__force const void *)src,
21858 +
21859 +#ifdef CONFIG_PAX_MEMORY_UDEREF
21860 + if ((unsigned long)src < PAX_USER_SHADOW_BASE)
21861 + src += PAX_USER_SHADOW_BASE;
21862 +#endif
21863 +
21864 + isum = csum_partial_copy_generic((const void __force_kernel *)src,
21865 dst, len, isum, errp, NULL);
21866 if (unlikely(*errp))
21867 goto out_err;
21868 @@ -105,7 +111,13 @@ csum_partial_copy_to_user(const void *src, void __user *dst,
21869 }
21870
21871 *errp = 0;
21872 - return csum_partial_copy_generic(src, (void __force *)dst,
21873 +
21874 +#ifdef CONFIG_PAX_MEMORY_UDEREF
21875 + if ((unsigned long)dst < PAX_USER_SHADOW_BASE)
21876 + dst += PAX_USER_SHADOW_BASE;
21877 +#endif
21878 +
21879 + return csum_partial_copy_generic(src, (void __force_kernel *)dst,
21880 len, isum, NULL, errp);
21881 }
21882 EXPORT_SYMBOL(csum_partial_copy_to_user);
21883 diff --git a/arch/x86/lib/getuser.S b/arch/x86/lib/getuser.S
21884 index b33b1fb..219f389 100644
21885 --- a/arch/x86/lib/getuser.S
21886 +++ b/arch/x86/lib/getuser.S
21887 @@ -33,15 +33,38 @@
21888 #include <asm/asm-offsets.h>
21889 #include <asm/thread_info.h>
21890 #include <asm/asm.h>
21891 +#include <asm/segment.h>
21892 +#include <asm/pgtable.h>
21893 +#include <asm/alternative-asm.h>
21894 +
21895 +#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_MEMORY_UDEREF)
21896 +#define __copyuser_seg gs;
21897 +#else
21898 +#define __copyuser_seg
21899 +#endif
21900
21901 .text
21902 ENTRY(__get_user_1)
21903 CFI_STARTPROC
21904 +
21905 +#if !defined(CONFIG_X86_32) || !defined(CONFIG_PAX_MEMORY_UDEREF)
21906 GET_THREAD_INFO(%_ASM_DX)
21907 cmp TI_addr_limit(%_ASM_DX),%_ASM_AX
21908 jae bad_get_user
21909 -1: movzb (%_ASM_AX),%edx
21910 +
21911 +#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
21912 + mov $PAX_USER_SHADOW_BASE,%_ASM_DX
21913 + cmp %_ASM_DX,%_ASM_AX
21914 + jae 1234f
21915 + add %_ASM_DX,%_ASM_AX
21916 +1234:
21917 +#endif
21918 +
21919 +#endif
21920 +
21921 +1: __copyuser_seg movzb (%_ASM_AX),%edx
21922 xor %eax,%eax
21923 + pax_force_retaddr
21924 ret
21925 CFI_ENDPROC
21926 ENDPROC(__get_user_1)
21927 @@ -49,12 +72,26 @@ ENDPROC(__get_user_1)
21928 ENTRY(__get_user_2)
21929 CFI_STARTPROC
21930 add $1,%_ASM_AX
21931 +
21932 +#if !defined(CONFIG_X86_32) || !defined(CONFIG_PAX_MEMORY_UDEREF)
21933 jc bad_get_user
21934 GET_THREAD_INFO(%_ASM_DX)
21935 cmp TI_addr_limit(%_ASM_DX),%_ASM_AX
21936 jae bad_get_user
21937 -2: movzwl -1(%_ASM_AX),%edx
21938 +
21939 +#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
21940 + mov $PAX_USER_SHADOW_BASE,%_ASM_DX
21941 + cmp %_ASM_DX,%_ASM_AX
21942 + jae 1234f
21943 + add %_ASM_DX,%_ASM_AX
21944 +1234:
21945 +#endif
21946 +
21947 +#endif
21948 +
21949 +2: __copyuser_seg movzwl -1(%_ASM_AX),%edx
21950 xor %eax,%eax
21951 + pax_force_retaddr
21952 ret
21953 CFI_ENDPROC
21954 ENDPROC(__get_user_2)
21955 @@ -62,12 +99,26 @@ ENDPROC(__get_user_2)
21956 ENTRY(__get_user_4)
21957 CFI_STARTPROC
21958 add $3,%_ASM_AX
21959 +
21960 +#if !defined(CONFIG_X86_32) || !defined(CONFIG_PAX_MEMORY_UDEREF)
21961 jc bad_get_user
21962 GET_THREAD_INFO(%_ASM_DX)
21963 cmp TI_addr_limit(%_ASM_DX),%_ASM_AX
21964 jae bad_get_user
21965 -3: mov -3(%_ASM_AX),%edx
21966 +
21967 +#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
21968 + mov $PAX_USER_SHADOW_BASE,%_ASM_DX
21969 + cmp %_ASM_DX,%_ASM_AX
21970 + jae 1234f
21971 + add %_ASM_DX,%_ASM_AX
21972 +1234:
21973 +#endif
21974 +
21975 +#endif
21976 +
21977 +3: __copyuser_seg mov -3(%_ASM_AX),%edx
21978 xor %eax,%eax
21979 + pax_force_retaddr
21980 ret
21981 CFI_ENDPROC
21982 ENDPROC(__get_user_4)
21983 @@ -80,8 +131,18 @@ ENTRY(__get_user_8)
21984 GET_THREAD_INFO(%_ASM_DX)
21985 cmp TI_addr_limit(%_ASM_DX),%_ASM_AX
21986 jae bad_get_user
21987 +
21988 +#ifdef CONFIG_PAX_MEMORY_UDEREF
21989 + mov $PAX_USER_SHADOW_BASE,%_ASM_DX
21990 + cmp %_ASM_DX,%_ASM_AX
21991 + jae 1234f
21992 + add %_ASM_DX,%_ASM_AX
21993 +1234:
21994 +#endif
21995 +
21996 4: movq -7(%_ASM_AX),%_ASM_DX
21997 xor %eax,%eax
21998 + pax_force_retaddr
21999 ret
22000 CFI_ENDPROC
22001 ENDPROC(__get_user_8)
22002 @@ -91,6 +152,7 @@ bad_get_user:
22003 CFI_STARTPROC
22004 xor %edx,%edx
22005 mov $(-EFAULT),%_ASM_AX
22006 + pax_force_retaddr
22007 ret
22008 CFI_ENDPROC
22009 END(bad_get_user)
22010 diff --git a/arch/x86/lib/insn.c b/arch/x86/lib/insn.c
22011 index b1e6c4b..21ae8fc 100644
22012 --- a/arch/x86/lib/insn.c
22013 +++ b/arch/x86/lib/insn.c
22014 @@ -21,6 +21,11 @@
22015 #include <linux/string.h>
22016 #include <asm/inat.h>
22017 #include <asm/insn.h>
22018 +#ifdef __KERNEL__
22019 +#include <asm/pgtable_types.h>
22020 +#else
22021 +#define ktla_ktva(addr) addr
22022 +#endif
22023
22024 /* Verify next sizeof(t) bytes can be on the same instruction */
22025 #define validate_next(t, insn, n) \
22026 @@ -49,8 +54,8 @@
22027 void insn_init(struct insn *insn, const void *kaddr, int x86_64)
22028 {
22029 memset(insn, 0, sizeof(*insn));
22030 - insn->kaddr = kaddr;
22031 - insn->next_byte = kaddr;
22032 + insn->kaddr = ktla_ktva(kaddr);
22033 + insn->next_byte = ktla_ktva(kaddr);
22034 insn->x86_64 = x86_64 ? 1 : 0;
22035 insn->opnd_bytes = 4;
22036 if (x86_64)
22037 diff --git a/arch/x86/lib/iomap_copy_64.S b/arch/x86/lib/iomap_copy_64.S
22038 index 05a95e7..326f2fa 100644
22039 --- a/arch/x86/lib/iomap_copy_64.S
22040 +++ b/arch/x86/lib/iomap_copy_64.S
22041 @@ -17,6 +17,7 @@
22042
22043 #include <linux/linkage.h>
22044 #include <asm/dwarf2.h>
22045 +#include <asm/alternative-asm.h>
22046
22047 /*
22048 * override generic version in lib/iomap_copy.c
22049 @@ -25,6 +26,7 @@ ENTRY(__iowrite32_copy)
22050 CFI_STARTPROC
22051 movl %edx,%ecx
22052 rep movsd
22053 + pax_force_retaddr
22054 ret
22055 CFI_ENDPROC
22056 ENDPROC(__iowrite32_copy)
22057 diff --git a/arch/x86/lib/memcpy_64.S b/arch/x86/lib/memcpy_64.S
22058 index 1c273be..da9cc0e 100644
22059 --- a/arch/x86/lib/memcpy_64.S
22060 +++ b/arch/x86/lib/memcpy_64.S
22061 @@ -33,6 +33,7 @@
22062 rep movsq
22063 movl %edx, %ecx
22064 rep movsb
22065 + pax_force_retaddr
22066 ret
22067 .Lmemcpy_e:
22068 .previous
22069 @@ -49,6 +50,7 @@
22070 movq %rdi, %rax
22071 movq %rdx, %rcx
22072 rep movsb
22073 + pax_force_retaddr
22074 ret
22075 .Lmemcpy_e_e:
22076 .previous
22077 @@ -76,13 +78,13 @@ ENTRY(memcpy)
22078 */
22079 movq 0*8(%rsi), %r8
22080 movq 1*8(%rsi), %r9
22081 - movq 2*8(%rsi), %r10
22082 + movq 2*8(%rsi), %rcx
22083 movq 3*8(%rsi), %r11
22084 leaq 4*8(%rsi), %rsi
22085
22086 movq %r8, 0*8(%rdi)
22087 movq %r9, 1*8(%rdi)
22088 - movq %r10, 2*8(%rdi)
22089 + movq %rcx, 2*8(%rdi)
22090 movq %r11, 3*8(%rdi)
22091 leaq 4*8(%rdi), %rdi
22092 jae .Lcopy_forward_loop
22093 @@ -105,12 +107,12 @@ ENTRY(memcpy)
22094 subq $0x20, %rdx
22095 movq -1*8(%rsi), %r8
22096 movq -2*8(%rsi), %r9
22097 - movq -3*8(%rsi), %r10
22098 + movq -3*8(%rsi), %rcx
22099 movq -4*8(%rsi), %r11
22100 leaq -4*8(%rsi), %rsi
22101 movq %r8, -1*8(%rdi)
22102 movq %r9, -2*8(%rdi)
22103 - movq %r10, -3*8(%rdi)
22104 + movq %rcx, -3*8(%rdi)
22105 movq %r11, -4*8(%rdi)
22106 leaq -4*8(%rdi), %rdi
22107 jae .Lcopy_backward_loop
22108 @@ -130,12 +132,13 @@ ENTRY(memcpy)
22109 */
22110 movq 0*8(%rsi), %r8
22111 movq 1*8(%rsi), %r9
22112 - movq -2*8(%rsi, %rdx), %r10
22113 + movq -2*8(%rsi, %rdx), %rcx
22114 movq -1*8(%rsi, %rdx), %r11
22115 movq %r8, 0*8(%rdi)
22116 movq %r9, 1*8(%rdi)
22117 - movq %r10, -2*8(%rdi, %rdx)
22118 + movq %rcx, -2*8(%rdi, %rdx)
22119 movq %r11, -1*8(%rdi, %rdx)
22120 + pax_force_retaddr
22121 retq
22122 .p2align 4
22123 .Lless_16bytes:
22124 @@ -148,6 +151,7 @@ ENTRY(memcpy)
22125 movq -1*8(%rsi, %rdx), %r9
22126 movq %r8, 0*8(%rdi)
22127 movq %r9, -1*8(%rdi, %rdx)
22128 + pax_force_retaddr
22129 retq
22130 .p2align 4
22131 .Lless_8bytes:
22132 @@ -161,6 +165,7 @@ ENTRY(memcpy)
22133 movl -4(%rsi, %rdx), %r8d
22134 movl %ecx, (%rdi)
22135 movl %r8d, -4(%rdi, %rdx)
22136 + pax_force_retaddr
22137 retq
22138 .p2align 4
22139 .Lless_3bytes:
22140 @@ -179,6 +184,7 @@ ENTRY(memcpy)
22141 movb %cl, (%rdi)
22142
22143 .Lend:
22144 + pax_force_retaddr
22145 retq
22146 CFI_ENDPROC
22147 ENDPROC(memcpy)
22148 diff --git a/arch/x86/lib/memmove_64.S b/arch/x86/lib/memmove_64.S
22149 index ee16461..c39c199 100644
22150 --- a/arch/x86/lib/memmove_64.S
22151 +++ b/arch/x86/lib/memmove_64.S
22152 @@ -61,13 +61,13 @@ ENTRY(memmove)
22153 5:
22154 sub $0x20, %rdx
22155 movq 0*8(%rsi), %r11
22156 - movq 1*8(%rsi), %r10
22157 + movq 1*8(%rsi), %rcx
22158 movq 2*8(%rsi), %r9
22159 movq 3*8(%rsi), %r8
22160 leaq 4*8(%rsi), %rsi
22161
22162 movq %r11, 0*8(%rdi)
22163 - movq %r10, 1*8(%rdi)
22164 + movq %rcx, 1*8(%rdi)
22165 movq %r9, 2*8(%rdi)
22166 movq %r8, 3*8(%rdi)
22167 leaq 4*8(%rdi), %rdi
22168 @@ -81,10 +81,10 @@ ENTRY(memmove)
22169 4:
22170 movq %rdx, %rcx
22171 movq -8(%rsi, %rdx), %r11
22172 - lea -8(%rdi, %rdx), %r10
22173 + lea -8(%rdi, %rdx), %r9
22174 shrq $3, %rcx
22175 rep movsq
22176 - movq %r11, (%r10)
22177 + movq %r11, (%r9)
22178 jmp 13f
22179 .Lmemmove_end_forward:
22180
22181 @@ -95,14 +95,14 @@ ENTRY(memmove)
22182 7:
22183 movq %rdx, %rcx
22184 movq (%rsi), %r11
22185 - movq %rdi, %r10
22186 + movq %rdi, %r9
22187 leaq -8(%rsi, %rdx), %rsi
22188 leaq -8(%rdi, %rdx), %rdi
22189 shrq $3, %rcx
22190 std
22191 rep movsq
22192 cld
22193 - movq %r11, (%r10)
22194 + movq %r11, (%r9)
22195 jmp 13f
22196
22197 /*
22198 @@ -127,13 +127,13 @@ ENTRY(memmove)
22199 8:
22200 subq $0x20, %rdx
22201 movq -1*8(%rsi), %r11
22202 - movq -2*8(%rsi), %r10
22203 + movq -2*8(%rsi), %rcx
22204 movq -3*8(%rsi), %r9
22205 movq -4*8(%rsi), %r8
22206 leaq -4*8(%rsi), %rsi
22207
22208 movq %r11, -1*8(%rdi)
22209 - movq %r10, -2*8(%rdi)
22210 + movq %rcx, -2*8(%rdi)
22211 movq %r9, -3*8(%rdi)
22212 movq %r8, -4*8(%rdi)
22213 leaq -4*8(%rdi), %rdi
22214 @@ -151,11 +151,11 @@ ENTRY(memmove)
22215 * Move data from 16 bytes to 31 bytes.
22216 */
22217 movq 0*8(%rsi), %r11
22218 - movq 1*8(%rsi), %r10
22219 + movq 1*8(%rsi), %rcx
22220 movq -2*8(%rsi, %rdx), %r9
22221 movq -1*8(%rsi, %rdx), %r8
22222 movq %r11, 0*8(%rdi)
22223 - movq %r10, 1*8(%rdi)
22224 + movq %rcx, 1*8(%rdi)
22225 movq %r9, -2*8(%rdi, %rdx)
22226 movq %r8, -1*8(%rdi, %rdx)
22227 jmp 13f
22228 @@ -167,9 +167,9 @@ ENTRY(memmove)
22229 * Move data from 8 bytes to 15 bytes.
22230 */
22231 movq 0*8(%rsi), %r11
22232 - movq -1*8(%rsi, %rdx), %r10
22233 + movq -1*8(%rsi, %rdx), %r9
22234 movq %r11, 0*8(%rdi)
22235 - movq %r10, -1*8(%rdi, %rdx)
22236 + movq %r9, -1*8(%rdi, %rdx)
22237 jmp 13f
22238 10:
22239 cmpq $4, %rdx
22240 @@ -178,9 +178,9 @@ ENTRY(memmove)
22241 * Move data from 4 bytes to 7 bytes.
22242 */
22243 movl (%rsi), %r11d
22244 - movl -4(%rsi, %rdx), %r10d
22245 + movl -4(%rsi, %rdx), %r9d
22246 movl %r11d, (%rdi)
22247 - movl %r10d, -4(%rdi, %rdx)
22248 + movl %r9d, -4(%rdi, %rdx)
22249 jmp 13f
22250 11:
22251 cmp $2, %rdx
22252 @@ -189,9 +189,9 @@ ENTRY(memmove)
22253 * Move data from 2 bytes to 3 bytes.
22254 */
22255 movw (%rsi), %r11w
22256 - movw -2(%rsi, %rdx), %r10w
22257 + movw -2(%rsi, %rdx), %r9w
22258 movw %r11w, (%rdi)
22259 - movw %r10w, -2(%rdi, %rdx)
22260 + movw %r9w, -2(%rdi, %rdx)
22261 jmp 13f
22262 12:
22263 cmp $1, %rdx
22264 @@ -202,6 +202,7 @@ ENTRY(memmove)
22265 movb (%rsi), %r11b
22266 movb %r11b, (%rdi)
22267 13:
22268 + pax_force_retaddr
22269 retq
22270 CFI_ENDPROC
22271
22272 @@ -210,6 +211,7 @@ ENTRY(memmove)
22273 /* Forward moving data. */
22274 movq %rdx, %rcx
22275 rep movsb
22276 + pax_force_retaddr
22277 retq
22278 .Lmemmove_end_forward_efs:
22279 .previous
22280 diff --git a/arch/x86/lib/memset_64.S b/arch/x86/lib/memset_64.S
22281 index 2dcb380..963660a 100644
22282 --- a/arch/x86/lib/memset_64.S
22283 +++ b/arch/x86/lib/memset_64.S
22284 @@ -30,6 +30,7 @@
22285 movl %edx,%ecx
22286 rep stosb
22287 movq %r9,%rax
22288 + pax_force_retaddr
22289 ret
22290 .Lmemset_e:
22291 .previous
22292 @@ -52,6 +53,7 @@
22293 movq %rdx,%rcx
22294 rep stosb
22295 movq %r9,%rax
22296 + pax_force_retaddr
22297 ret
22298 .Lmemset_e_e:
22299 .previous
22300 @@ -59,7 +61,7 @@
22301 ENTRY(memset)
22302 ENTRY(__memset)
22303 CFI_STARTPROC
22304 - movq %rdi,%r10
22305 + movq %rdi,%r11
22306
22307 /* expand byte value */
22308 movzbl %sil,%ecx
22309 @@ -117,7 +119,8 @@ ENTRY(__memset)
22310 jnz .Lloop_1
22311
22312 .Lende:
22313 - movq %r10,%rax
22314 + movq %r11,%rax
22315 + pax_force_retaddr
22316 ret
22317
22318 CFI_RESTORE_STATE
22319 diff --git a/arch/x86/lib/mmx_32.c b/arch/x86/lib/mmx_32.c
22320 index c9f2d9b..e7fd2c0 100644
22321 --- a/arch/x86/lib/mmx_32.c
22322 +++ b/arch/x86/lib/mmx_32.c
22323 @@ -29,6 +29,7 @@ void *_mmx_memcpy(void *to, const void *from, size_t len)
22324 {
22325 void *p;
22326 int i;
22327 + unsigned long cr0;
22328
22329 if (unlikely(in_interrupt()))
22330 return __memcpy(to, from, len);
22331 @@ -39,44 +40,72 @@ void *_mmx_memcpy(void *to, const void *from, size_t len)
22332 kernel_fpu_begin();
22333
22334 __asm__ __volatile__ (
22335 - "1: prefetch (%0)\n" /* This set is 28 bytes */
22336 - " prefetch 64(%0)\n"
22337 - " prefetch 128(%0)\n"
22338 - " prefetch 192(%0)\n"
22339 - " prefetch 256(%0)\n"
22340 + "1: prefetch (%1)\n" /* This set is 28 bytes */
22341 + " prefetch 64(%1)\n"
22342 + " prefetch 128(%1)\n"
22343 + " prefetch 192(%1)\n"
22344 + " prefetch 256(%1)\n"
22345 "2: \n"
22346 ".section .fixup, \"ax\"\n"
22347 - "3: movw $0x1AEB, 1b\n" /* jmp on 26 bytes */
22348 + "3: \n"
22349 +
22350 +#ifdef CONFIG_PAX_KERNEXEC
22351 + " movl %%cr0, %0\n"
22352 + " movl %0, %%eax\n"
22353 + " andl $0xFFFEFFFF, %%eax\n"
22354 + " movl %%eax, %%cr0\n"
22355 +#endif
22356 +
22357 + " movw $0x1AEB, 1b\n" /* jmp on 26 bytes */
22358 +
22359 +#ifdef CONFIG_PAX_KERNEXEC
22360 + " movl %0, %%cr0\n"
22361 +#endif
22362 +
22363 " jmp 2b\n"
22364 ".previous\n"
22365 _ASM_EXTABLE(1b, 3b)
22366 - : : "r" (from));
22367 + : "=&r" (cr0) : "r" (from) : "ax");
22368
22369 for ( ; i > 5; i--) {
22370 __asm__ __volatile__ (
22371 - "1: prefetch 320(%0)\n"
22372 - "2: movq (%0), %%mm0\n"
22373 - " movq 8(%0), %%mm1\n"
22374 - " movq 16(%0), %%mm2\n"
22375 - " movq 24(%0), %%mm3\n"
22376 - " movq %%mm0, (%1)\n"
22377 - " movq %%mm1, 8(%1)\n"
22378 - " movq %%mm2, 16(%1)\n"
22379 - " movq %%mm3, 24(%1)\n"
22380 - " movq 32(%0), %%mm0\n"
22381 - " movq 40(%0), %%mm1\n"
22382 - " movq 48(%0), %%mm2\n"
22383 - " movq 56(%0), %%mm3\n"
22384 - " movq %%mm0, 32(%1)\n"
22385 - " movq %%mm1, 40(%1)\n"
22386 - " movq %%mm2, 48(%1)\n"
22387 - " movq %%mm3, 56(%1)\n"
22388 + "1: prefetch 320(%1)\n"
22389 + "2: movq (%1), %%mm0\n"
22390 + " movq 8(%1), %%mm1\n"
22391 + " movq 16(%1), %%mm2\n"
22392 + " movq 24(%1), %%mm3\n"
22393 + " movq %%mm0, (%2)\n"
22394 + " movq %%mm1, 8(%2)\n"
22395 + " movq %%mm2, 16(%2)\n"
22396 + " movq %%mm3, 24(%2)\n"
22397 + " movq 32(%1), %%mm0\n"
22398 + " movq 40(%1), %%mm1\n"
22399 + " movq 48(%1), %%mm2\n"
22400 + " movq 56(%1), %%mm3\n"
22401 + " movq %%mm0, 32(%2)\n"
22402 + " movq %%mm1, 40(%2)\n"
22403 + " movq %%mm2, 48(%2)\n"
22404 + " movq %%mm3, 56(%2)\n"
22405 ".section .fixup, \"ax\"\n"
22406 - "3: movw $0x05EB, 1b\n" /* jmp on 5 bytes */
22407 + "3:\n"
22408 +
22409 +#ifdef CONFIG_PAX_KERNEXEC
22410 + " movl %%cr0, %0\n"
22411 + " movl %0, %%eax\n"
22412 + " andl $0xFFFEFFFF, %%eax\n"
22413 + " movl %%eax, %%cr0\n"
22414 +#endif
22415 +
22416 + " movw $0x05EB, 1b\n" /* jmp on 5 bytes */
22417 +
22418 +#ifdef CONFIG_PAX_KERNEXEC
22419 + " movl %0, %%cr0\n"
22420 +#endif
22421 +
22422 " jmp 2b\n"
22423 ".previous\n"
22424 _ASM_EXTABLE(1b, 3b)
22425 - : : "r" (from), "r" (to) : "memory");
22426 + : "=&r" (cr0) : "r" (from), "r" (to) : "memory", "ax");
22427
22428 from += 64;
22429 to += 64;
22430 @@ -158,6 +187,7 @@ static void fast_clear_page(void *page)
22431 static void fast_copy_page(void *to, void *from)
22432 {
22433 int i;
22434 + unsigned long cr0;
22435
22436 kernel_fpu_begin();
22437
22438 @@ -166,42 +196,70 @@ static void fast_copy_page(void *to, void *from)
22439 * but that is for later. -AV
22440 */
22441 __asm__ __volatile__(
22442 - "1: prefetch (%0)\n"
22443 - " prefetch 64(%0)\n"
22444 - " prefetch 128(%0)\n"
22445 - " prefetch 192(%0)\n"
22446 - " prefetch 256(%0)\n"
22447 + "1: prefetch (%1)\n"
22448 + " prefetch 64(%1)\n"
22449 + " prefetch 128(%1)\n"
22450 + " prefetch 192(%1)\n"
22451 + " prefetch 256(%1)\n"
22452 "2: \n"
22453 ".section .fixup, \"ax\"\n"
22454 - "3: movw $0x1AEB, 1b\n" /* jmp on 26 bytes */
22455 + "3: \n"
22456 +
22457 +#ifdef CONFIG_PAX_KERNEXEC
22458 + " movl %%cr0, %0\n"
22459 + " movl %0, %%eax\n"
22460 + " andl $0xFFFEFFFF, %%eax\n"
22461 + " movl %%eax, %%cr0\n"
22462 +#endif
22463 +
22464 + " movw $0x1AEB, 1b\n" /* jmp on 26 bytes */
22465 +
22466 +#ifdef CONFIG_PAX_KERNEXEC
22467 + " movl %0, %%cr0\n"
22468 +#endif
22469 +
22470 " jmp 2b\n"
22471 ".previous\n"
22472 - _ASM_EXTABLE(1b, 3b) : : "r" (from));
22473 + _ASM_EXTABLE(1b, 3b) : "=&r" (cr0) : "r" (from) : "ax");
22474
22475 for (i = 0; i < (4096-320)/64; i++) {
22476 __asm__ __volatile__ (
22477 - "1: prefetch 320(%0)\n"
22478 - "2: movq (%0), %%mm0\n"
22479 - " movntq %%mm0, (%1)\n"
22480 - " movq 8(%0), %%mm1\n"
22481 - " movntq %%mm1, 8(%1)\n"
22482 - " movq 16(%0), %%mm2\n"
22483 - " movntq %%mm2, 16(%1)\n"
22484 - " movq 24(%0), %%mm3\n"
22485 - " movntq %%mm3, 24(%1)\n"
22486 - " movq 32(%0), %%mm4\n"
22487 - " movntq %%mm4, 32(%1)\n"
22488 - " movq 40(%0), %%mm5\n"
22489 - " movntq %%mm5, 40(%1)\n"
22490 - " movq 48(%0), %%mm6\n"
22491 - " movntq %%mm6, 48(%1)\n"
22492 - " movq 56(%0), %%mm7\n"
22493 - " movntq %%mm7, 56(%1)\n"
22494 + "1: prefetch 320(%1)\n"
22495 + "2: movq (%1), %%mm0\n"
22496 + " movntq %%mm0, (%2)\n"
22497 + " movq 8(%1), %%mm1\n"
22498 + " movntq %%mm1, 8(%2)\n"
22499 + " movq 16(%1), %%mm2\n"
22500 + " movntq %%mm2, 16(%2)\n"
22501 + " movq 24(%1), %%mm3\n"
22502 + " movntq %%mm3, 24(%2)\n"
22503 + " movq 32(%1), %%mm4\n"
22504 + " movntq %%mm4, 32(%2)\n"
22505 + " movq 40(%1), %%mm5\n"
22506 + " movntq %%mm5, 40(%2)\n"
22507 + " movq 48(%1), %%mm6\n"
22508 + " movntq %%mm6, 48(%2)\n"
22509 + " movq 56(%1), %%mm7\n"
22510 + " movntq %%mm7, 56(%2)\n"
22511 ".section .fixup, \"ax\"\n"
22512 - "3: movw $0x05EB, 1b\n" /* jmp on 5 bytes */
22513 + "3:\n"
22514 +
22515 +#ifdef CONFIG_PAX_KERNEXEC
22516 + " movl %%cr0, %0\n"
22517 + " movl %0, %%eax\n"
22518 + " andl $0xFFFEFFFF, %%eax\n"
22519 + " movl %%eax, %%cr0\n"
22520 +#endif
22521 +
22522 + " movw $0x05EB, 1b\n" /* jmp on 5 bytes */
22523 +
22524 +#ifdef CONFIG_PAX_KERNEXEC
22525 + " movl %0, %%cr0\n"
22526 +#endif
22527 +
22528 " jmp 2b\n"
22529 ".previous\n"
22530 - _ASM_EXTABLE(1b, 3b) : : "r" (from), "r" (to) : "memory");
22531 + _ASM_EXTABLE(1b, 3b) : "=&r" (cr0) : "r" (from), "r" (to) : "memory", "ax");
22532
22533 from += 64;
22534 to += 64;
22535 @@ -280,47 +338,76 @@ static void fast_clear_page(void *page)
22536 static void fast_copy_page(void *to, void *from)
22537 {
22538 int i;
22539 + unsigned long cr0;
22540
22541 kernel_fpu_begin();
22542
22543 __asm__ __volatile__ (
22544 - "1: prefetch (%0)\n"
22545 - " prefetch 64(%0)\n"
22546 - " prefetch 128(%0)\n"
22547 - " prefetch 192(%0)\n"
22548 - " prefetch 256(%0)\n"
22549 + "1: prefetch (%1)\n"
22550 + " prefetch 64(%1)\n"
22551 + " prefetch 128(%1)\n"
22552 + " prefetch 192(%1)\n"
22553 + " prefetch 256(%1)\n"
22554 "2: \n"
22555 ".section .fixup, \"ax\"\n"
22556 - "3: movw $0x1AEB, 1b\n" /* jmp on 26 bytes */
22557 + "3: \n"
22558 +
22559 +#ifdef CONFIG_PAX_KERNEXEC
22560 + " movl %%cr0, %0\n"
22561 + " movl %0, %%eax\n"
22562 + " andl $0xFFFEFFFF, %%eax\n"
22563 + " movl %%eax, %%cr0\n"
22564 +#endif
22565 +
22566 + " movw $0x1AEB, 1b\n" /* jmp on 26 bytes */
22567 +
22568 +#ifdef CONFIG_PAX_KERNEXEC
22569 + " movl %0, %%cr0\n"
22570 +#endif
22571 +
22572 " jmp 2b\n"
22573 ".previous\n"
22574 - _ASM_EXTABLE(1b, 3b) : : "r" (from));
22575 + _ASM_EXTABLE(1b, 3b) : "=&r" (cr0) : "r" (from) : "ax");
22576
22577 for (i = 0; i < 4096/64; i++) {
22578 __asm__ __volatile__ (
22579 - "1: prefetch 320(%0)\n"
22580 - "2: movq (%0), %%mm0\n"
22581 - " movq 8(%0), %%mm1\n"
22582 - " movq 16(%0), %%mm2\n"
22583 - " movq 24(%0), %%mm3\n"
22584 - " movq %%mm0, (%1)\n"
22585 - " movq %%mm1, 8(%1)\n"
22586 - " movq %%mm2, 16(%1)\n"
22587 - " movq %%mm3, 24(%1)\n"
22588 - " movq 32(%0), %%mm0\n"
22589 - " movq 40(%0), %%mm1\n"
22590 - " movq 48(%0), %%mm2\n"
22591 - " movq 56(%0), %%mm3\n"
22592 - " movq %%mm0, 32(%1)\n"
22593 - " movq %%mm1, 40(%1)\n"
22594 - " movq %%mm2, 48(%1)\n"
22595 - " movq %%mm3, 56(%1)\n"
22596 + "1: prefetch 320(%1)\n"
22597 + "2: movq (%1), %%mm0\n"
22598 + " movq 8(%1), %%mm1\n"
22599 + " movq 16(%1), %%mm2\n"
22600 + " movq 24(%1), %%mm3\n"
22601 + " movq %%mm0, (%2)\n"
22602 + " movq %%mm1, 8(%2)\n"
22603 + " movq %%mm2, 16(%2)\n"
22604 + " movq %%mm3, 24(%2)\n"
22605 + " movq 32(%1), %%mm0\n"
22606 + " movq 40(%1), %%mm1\n"
22607 + " movq 48(%1), %%mm2\n"
22608 + " movq 56(%1), %%mm3\n"
22609 + " movq %%mm0, 32(%2)\n"
22610 + " movq %%mm1, 40(%2)\n"
22611 + " movq %%mm2, 48(%2)\n"
22612 + " movq %%mm3, 56(%2)\n"
22613 ".section .fixup, \"ax\"\n"
22614 - "3: movw $0x05EB, 1b\n" /* jmp on 5 bytes */
22615 + "3:\n"
22616 +
22617 +#ifdef CONFIG_PAX_KERNEXEC
22618 + " movl %%cr0, %0\n"
22619 + " movl %0, %%eax\n"
22620 + " andl $0xFFFEFFFF, %%eax\n"
22621 + " movl %%eax, %%cr0\n"
22622 +#endif
22623 +
22624 + " movw $0x05EB, 1b\n" /* jmp on 5 bytes */
22625 +
22626 +#ifdef CONFIG_PAX_KERNEXEC
22627 + " movl %0, %%cr0\n"
22628 +#endif
22629 +
22630 " jmp 2b\n"
22631 ".previous\n"
22632 _ASM_EXTABLE(1b, 3b)
22633 - : : "r" (from), "r" (to) : "memory");
22634 + : "=&r" (cr0) : "r" (from), "r" (to) : "memory", "ax");
22635
22636 from += 64;
22637 to += 64;
22638 diff --git a/arch/x86/lib/msr-reg.S b/arch/x86/lib/msr-reg.S
22639 index f6d13ee..aca5f0b 100644
22640 --- a/arch/x86/lib/msr-reg.S
22641 +++ b/arch/x86/lib/msr-reg.S
22642 @@ -3,6 +3,7 @@
22643 #include <asm/dwarf2.h>
22644 #include <asm/asm.h>
22645 #include <asm/msr.h>
22646 +#include <asm/alternative-asm.h>
22647
22648 #ifdef CONFIG_X86_64
22649 /*
22650 @@ -16,7 +17,7 @@ ENTRY(\op\()_safe_regs)
22651 CFI_STARTPROC
22652 pushq_cfi %rbx
22653 pushq_cfi %rbp
22654 - movq %rdi, %r10 /* Save pointer */
22655 + movq %rdi, %r9 /* Save pointer */
22656 xorl %r11d, %r11d /* Return value */
22657 movl (%rdi), %eax
22658 movl 4(%rdi), %ecx
22659 @@ -27,16 +28,17 @@ ENTRY(\op\()_safe_regs)
22660 movl 28(%rdi), %edi
22661 CFI_REMEMBER_STATE
22662 1: \op
22663 -2: movl %eax, (%r10)
22664 +2: movl %eax, (%r9)
22665 movl %r11d, %eax /* Return value */
22666 - movl %ecx, 4(%r10)
22667 - movl %edx, 8(%r10)
22668 - movl %ebx, 12(%r10)
22669 - movl %ebp, 20(%r10)
22670 - movl %esi, 24(%r10)
22671 - movl %edi, 28(%r10)
22672 + movl %ecx, 4(%r9)
22673 + movl %edx, 8(%r9)
22674 + movl %ebx, 12(%r9)
22675 + movl %ebp, 20(%r9)
22676 + movl %esi, 24(%r9)
22677 + movl %edi, 28(%r9)
22678 popq_cfi %rbp
22679 popq_cfi %rbx
22680 + pax_force_retaddr
22681 ret
22682 3:
22683 CFI_RESTORE_STATE
22684 diff --git a/arch/x86/lib/putuser.S b/arch/x86/lib/putuser.S
22685 index 7f951c8..ebd573a 100644
22686 --- a/arch/x86/lib/putuser.S
22687 +++ b/arch/x86/lib/putuser.S
22688 @@ -15,7 +15,9 @@
22689 #include <asm/thread_info.h>
22690 #include <asm/errno.h>
22691 #include <asm/asm.h>
22692 -
22693 +#include <asm/segment.h>
22694 +#include <asm/pgtable.h>
22695 +#include <asm/alternative-asm.h>
22696
22697 /*
22698 * __put_user_X
22699 @@ -29,52 +31,119 @@
22700 * as they get called from within inline assembly.
22701 */
22702
22703 -#define ENTER CFI_STARTPROC ; \
22704 - GET_THREAD_INFO(%_ASM_BX)
22705 -#define EXIT ret ; \
22706 +#define ENTER CFI_STARTPROC
22707 +#define EXIT pax_force_retaddr; ret ; \
22708 CFI_ENDPROC
22709
22710 +#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
22711 +#define _DEST %_ASM_CX,%_ASM_BX
22712 +#else
22713 +#define _DEST %_ASM_CX
22714 +#endif
22715 +
22716 +#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_MEMORY_UDEREF)
22717 +#define __copyuser_seg gs;
22718 +#else
22719 +#define __copyuser_seg
22720 +#endif
22721 +
22722 .text
22723 ENTRY(__put_user_1)
22724 ENTER
22725 +
22726 +#if !defined(CONFIG_X86_32) || !defined(CONFIG_PAX_MEMORY_UDEREF)
22727 + GET_THREAD_INFO(%_ASM_BX)
22728 cmp TI_addr_limit(%_ASM_BX),%_ASM_CX
22729 jae bad_put_user
22730 -1: movb %al,(%_ASM_CX)
22731 +
22732 +#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
22733 + mov $PAX_USER_SHADOW_BASE,%_ASM_BX
22734 + cmp %_ASM_BX,%_ASM_CX
22735 + jb 1234f
22736 + xor %ebx,%ebx
22737 +1234:
22738 +#endif
22739 +
22740 +#endif
22741 +
22742 +1: __copyuser_seg movb %al,(_DEST)
22743 xor %eax,%eax
22744 EXIT
22745 ENDPROC(__put_user_1)
22746
22747 ENTRY(__put_user_2)
22748 ENTER
22749 +
22750 +#if !defined(CONFIG_X86_32) || !defined(CONFIG_PAX_MEMORY_UDEREF)
22751 + GET_THREAD_INFO(%_ASM_BX)
22752 mov TI_addr_limit(%_ASM_BX),%_ASM_BX
22753 sub $1,%_ASM_BX
22754 cmp %_ASM_BX,%_ASM_CX
22755 jae bad_put_user
22756 -2: movw %ax,(%_ASM_CX)
22757 +
22758 +#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
22759 + mov $PAX_USER_SHADOW_BASE,%_ASM_BX
22760 + cmp %_ASM_BX,%_ASM_CX
22761 + jb 1234f
22762 + xor %ebx,%ebx
22763 +1234:
22764 +#endif
22765 +
22766 +#endif
22767 +
22768 +2: __copyuser_seg movw %ax,(_DEST)
22769 xor %eax,%eax
22770 EXIT
22771 ENDPROC(__put_user_2)
22772
22773 ENTRY(__put_user_4)
22774 ENTER
22775 +
22776 +#if !defined(CONFIG_X86_32) || !defined(CONFIG_PAX_MEMORY_UDEREF)
22777 + GET_THREAD_INFO(%_ASM_BX)
22778 mov TI_addr_limit(%_ASM_BX),%_ASM_BX
22779 sub $3,%_ASM_BX
22780 cmp %_ASM_BX,%_ASM_CX
22781 jae bad_put_user
22782 -3: movl %eax,(%_ASM_CX)
22783 +
22784 +#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
22785 + mov $PAX_USER_SHADOW_BASE,%_ASM_BX
22786 + cmp %_ASM_BX,%_ASM_CX
22787 + jb 1234f
22788 + xor %ebx,%ebx
22789 +1234:
22790 +#endif
22791 +
22792 +#endif
22793 +
22794 +3: __copyuser_seg movl %eax,(_DEST)
22795 xor %eax,%eax
22796 EXIT
22797 ENDPROC(__put_user_4)
22798
22799 ENTRY(__put_user_8)
22800 ENTER
22801 +
22802 +#if !defined(CONFIG_X86_32) || !defined(CONFIG_PAX_MEMORY_UDEREF)
22803 + GET_THREAD_INFO(%_ASM_BX)
22804 mov TI_addr_limit(%_ASM_BX),%_ASM_BX
22805 sub $7,%_ASM_BX
22806 cmp %_ASM_BX,%_ASM_CX
22807 jae bad_put_user
22808 -4: mov %_ASM_AX,(%_ASM_CX)
22809 +
22810 +#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
22811 + mov $PAX_USER_SHADOW_BASE,%_ASM_BX
22812 + cmp %_ASM_BX,%_ASM_CX
22813 + jb 1234f
22814 + xor %ebx,%ebx
22815 +1234:
22816 +#endif
22817 +
22818 +#endif
22819 +
22820 +4: __copyuser_seg mov %_ASM_AX,(_DEST)
22821 #ifdef CONFIG_X86_32
22822 -5: movl %edx,4(%_ASM_CX)
22823 +5: __copyuser_seg movl %edx,4(_DEST)
22824 #endif
22825 xor %eax,%eax
22826 EXIT
22827 diff --git a/arch/x86/lib/rwlock.S b/arch/x86/lib/rwlock.S
22828 index 1cad221..de671ee 100644
22829 --- a/arch/x86/lib/rwlock.S
22830 +++ b/arch/x86/lib/rwlock.S
22831 @@ -16,13 +16,34 @@ ENTRY(__write_lock_failed)
22832 FRAME
22833 0: LOCK_PREFIX
22834 WRITE_LOCK_ADD($RW_LOCK_BIAS) (%__lock_ptr)
22835 +
22836 +#ifdef CONFIG_PAX_REFCOUNT
22837 + jno 1234f
22838 + LOCK_PREFIX
22839 + WRITE_LOCK_SUB($RW_LOCK_BIAS) (%__lock_ptr)
22840 + int $4
22841 +1234:
22842 + _ASM_EXTABLE(1234b, 1234b)
22843 +#endif
22844 +
22845 1: rep; nop
22846 cmpl $WRITE_LOCK_CMP, (%__lock_ptr)
22847 jne 1b
22848 LOCK_PREFIX
22849 WRITE_LOCK_SUB($RW_LOCK_BIAS) (%__lock_ptr)
22850 +
22851 +#ifdef CONFIG_PAX_REFCOUNT
22852 + jno 1234f
22853 + LOCK_PREFIX
22854 + WRITE_LOCK_ADD($RW_LOCK_BIAS) (%__lock_ptr)
22855 + int $4
22856 +1234:
22857 + _ASM_EXTABLE(1234b, 1234b)
22858 +#endif
22859 +
22860 jnz 0b
22861 ENDFRAME
22862 + pax_force_retaddr
22863 ret
22864 CFI_ENDPROC
22865 END(__write_lock_failed)
22866 @@ -32,13 +53,34 @@ ENTRY(__read_lock_failed)
22867 FRAME
22868 0: LOCK_PREFIX
22869 READ_LOCK_SIZE(inc) (%__lock_ptr)
22870 +
22871 +#ifdef CONFIG_PAX_REFCOUNT
22872 + jno 1234f
22873 + LOCK_PREFIX
22874 + READ_LOCK_SIZE(dec) (%__lock_ptr)
22875 + int $4
22876 +1234:
22877 + _ASM_EXTABLE(1234b, 1234b)
22878 +#endif
22879 +
22880 1: rep; nop
22881 READ_LOCK_SIZE(cmp) $1, (%__lock_ptr)
22882 js 1b
22883 LOCK_PREFIX
22884 READ_LOCK_SIZE(dec) (%__lock_ptr)
22885 +
22886 +#ifdef CONFIG_PAX_REFCOUNT
22887 + jno 1234f
22888 + LOCK_PREFIX
22889 + READ_LOCK_SIZE(inc) (%__lock_ptr)
22890 + int $4
22891 +1234:
22892 + _ASM_EXTABLE(1234b, 1234b)
22893 +#endif
22894 +
22895 js 0b
22896 ENDFRAME
22897 + pax_force_retaddr
22898 ret
22899 CFI_ENDPROC
22900 END(__read_lock_failed)
22901 diff --git a/arch/x86/lib/rwsem.S b/arch/x86/lib/rwsem.S
22902 index 5dff5f0..cadebf4 100644
22903 --- a/arch/x86/lib/rwsem.S
22904 +++ b/arch/x86/lib/rwsem.S
22905 @@ -94,6 +94,7 @@ ENTRY(call_rwsem_down_read_failed)
22906 __ASM_SIZE(pop,_cfi) %__ASM_REG(dx)
22907 CFI_RESTORE __ASM_REG(dx)
22908 restore_common_regs
22909 + pax_force_retaddr
22910 ret
22911 CFI_ENDPROC
22912 ENDPROC(call_rwsem_down_read_failed)
22913 @@ -104,6 +105,7 @@ ENTRY(call_rwsem_down_write_failed)
22914 movq %rax,%rdi
22915 call rwsem_down_write_failed
22916 restore_common_regs
22917 + pax_force_retaddr
22918 ret
22919 CFI_ENDPROC
22920 ENDPROC(call_rwsem_down_write_failed)
22921 @@ -117,7 +119,8 @@ ENTRY(call_rwsem_wake)
22922 movq %rax,%rdi
22923 call rwsem_wake
22924 restore_common_regs
22925 -1: ret
22926 +1: pax_force_retaddr
22927 + ret
22928 CFI_ENDPROC
22929 ENDPROC(call_rwsem_wake)
22930
22931 @@ -131,6 +134,7 @@ ENTRY(call_rwsem_downgrade_wake)
22932 __ASM_SIZE(pop,_cfi) %__ASM_REG(dx)
22933 CFI_RESTORE __ASM_REG(dx)
22934 restore_common_regs
22935 + pax_force_retaddr
22936 ret
22937 CFI_ENDPROC
22938 ENDPROC(call_rwsem_downgrade_wake)
22939 diff --git a/arch/x86/lib/thunk_64.S b/arch/x86/lib/thunk_64.S
22940 index a63efd6..ccecad8 100644
22941 --- a/arch/x86/lib/thunk_64.S
22942 +++ b/arch/x86/lib/thunk_64.S
22943 @@ -8,6 +8,7 @@
22944 #include <linux/linkage.h>
22945 #include <asm/dwarf2.h>
22946 #include <asm/calling.h>
22947 +#include <asm/alternative-asm.h>
22948
22949 /* rdi: arg1 ... normal C conventions. rax is saved/restored. */
22950 .macro THUNK name, func, put_ret_addr_in_rdi=0
22951 @@ -41,5 +42,6 @@
22952 SAVE_ARGS
22953 restore:
22954 RESTORE_ARGS
22955 + pax_force_retaddr
22956 ret
22957 CFI_ENDPROC
22958 diff --git a/arch/x86/lib/usercopy_32.c b/arch/x86/lib/usercopy_32.c
22959 index 1781b2f..90368dd 100644
22960 --- a/arch/x86/lib/usercopy_32.c
22961 +++ b/arch/x86/lib/usercopy_32.c
22962 @@ -42,10 +42,12 @@ do { \
22963 int __d0; \
22964 might_fault(); \
22965 __asm__ __volatile__( \
22966 + __COPYUSER_SET_ES \
22967 "0: rep; stosl\n" \
22968 " movl %2,%0\n" \
22969 "1: rep; stosb\n" \
22970 "2:\n" \
22971 + __COPYUSER_RESTORE_ES \
22972 ".section .fixup,\"ax\"\n" \
22973 "3: lea 0(%2,%0,4),%0\n" \
22974 " jmp 2b\n" \
22975 @@ -97,7 +99,7 @@ EXPORT_SYMBOL(__clear_user);
22976
22977 #ifdef CONFIG_X86_INTEL_USERCOPY
22978 static unsigned long
22979 -__copy_user_intel(void __user *to, const void *from, unsigned long size)
22980 +__generic_copy_to_user_intel(void __user *to, const void *from, unsigned long size)
22981 {
22982 int d0, d1;
22983 __asm__ __volatile__(
22984 @@ -109,36 +111,36 @@ __copy_user_intel(void __user *to, const void *from, unsigned long size)
22985 " .align 2,0x90\n"
22986 "3: movl 0(%4), %%eax\n"
22987 "4: movl 4(%4), %%edx\n"
22988 - "5: movl %%eax, 0(%3)\n"
22989 - "6: movl %%edx, 4(%3)\n"
22990 + "5: "__copyuser_seg" movl %%eax, 0(%3)\n"
22991 + "6: "__copyuser_seg" movl %%edx, 4(%3)\n"
22992 "7: movl 8(%4), %%eax\n"
22993 "8: movl 12(%4),%%edx\n"
22994 - "9: movl %%eax, 8(%3)\n"
22995 - "10: movl %%edx, 12(%3)\n"
22996 + "9: "__copyuser_seg" movl %%eax, 8(%3)\n"
22997 + "10: "__copyuser_seg" movl %%edx, 12(%3)\n"
22998 "11: movl 16(%4), %%eax\n"
22999 "12: movl 20(%4), %%edx\n"
23000 - "13: movl %%eax, 16(%3)\n"
23001 - "14: movl %%edx, 20(%3)\n"
23002 + "13: "__copyuser_seg" movl %%eax, 16(%3)\n"
23003 + "14: "__copyuser_seg" movl %%edx, 20(%3)\n"
23004 "15: movl 24(%4), %%eax\n"
23005 "16: movl 28(%4), %%edx\n"
23006 - "17: movl %%eax, 24(%3)\n"
23007 - "18: movl %%edx, 28(%3)\n"
23008 + "17: "__copyuser_seg" movl %%eax, 24(%3)\n"
23009 + "18: "__copyuser_seg" movl %%edx, 28(%3)\n"
23010 "19: movl 32(%4), %%eax\n"
23011 "20: movl 36(%4), %%edx\n"
23012 - "21: movl %%eax, 32(%3)\n"
23013 - "22: movl %%edx, 36(%3)\n"
23014 + "21: "__copyuser_seg" movl %%eax, 32(%3)\n"
23015 + "22: "__copyuser_seg" movl %%edx, 36(%3)\n"
23016 "23: movl 40(%4), %%eax\n"
23017 "24: movl 44(%4), %%edx\n"
23018 - "25: movl %%eax, 40(%3)\n"
23019 - "26: movl %%edx, 44(%3)\n"
23020 + "25: "__copyuser_seg" movl %%eax, 40(%3)\n"
23021 + "26: "__copyuser_seg" movl %%edx, 44(%3)\n"
23022 "27: movl 48(%4), %%eax\n"
23023 "28: movl 52(%4), %%edx\n"
23024 - "29: movl %%eax, 48(%3)\n"
23025 - "30: movl %%edx, 52(%3)\n"
23026 + "29: "__copyuser_seg" movl %%eax, 48(%3)\n"
23027 + "30: "__copyuser_seg" movl %%edx, 52(%3)\n"
23028 "31: movl 56(%4), %%eax\n"
23029 "32: movl 60(%4), %%edx\n"
23030 - "33: movl %%eax, 56(%3)\n"
23031 - "34: movl %%edx, 60(%3)\n"
23032 + "33: "__copyuser_seg" movl %%eax, 56(%3)\n"
23033 + "34: "__copyuser_seg" movl %%edx, 60(%3)\n"
23034 " addl $-64, %0\n"
23035 " addl $64, %4\n"
23036 " addl $64, %3\n"
23037 @@ -148,10 +150,12 @@ __copy_user_intel(void __user *to, const void *from, unsigned long size)
23038 " shrl $2, %0\n"
23039 " andl $3, %%eax\n"
23040 " cld\n"
23041 + __COPYUSER_SET_ES
23042 "99: rep; movsl\n"
23043 "36: movl %%eax, %0\n"
23044 "37: rep; movsb\n"
23045 "100:\n"
23046 + __COPYUSER_RESTORE_ES
23047 ".section .fixup,\"ax\"\n"
23048 "101: lea 0(%%eax,%0,4),%0\n"
23049 " jmp 100b\n"
23050 @@ -201,46 +205,150 @@ __copy_user_intel(void __user *to, const void *from, unsigned long size)
23051 }
23052
23053 static unsigned long
23054 +__generic_copy_from_user_intel(void *to, const void __user *from, unsigned long size)
23055 +{
23056 + int d0, d1;
23057 + __asm__ __volatile__(
23058 + " .align 2,0x90\n"
23059 + "1: "__copyuser_seg" movl 32(%4), %%eax\n"
23060 + " cmpl $67, %0\n"
23061 + " jbe 3f\n"
23062 + "2: "__copyuser_seg" movl 64(%4), %%eax\n"
23063 + " .align 2,0x90\n"
23064 + "3: "__copyuser_seg" movl 0(%4), %%eax\n"
23065 + "4: "__copyuser_seg" movl 4(%4), %%edx\n"
23066 + "5: movl %%eax, 0(%3)\n"
23067 + "6: movl %%edx, 4(%3)\n"
23068 + "7: "__copyuser_seg" movl 8(%4), %%eax\n"
23069 + "8: "__copyuser_seg" movl 12(%4),%%edx\n"
23070 + "9: movl %%eax, 8(%3)\n"
23071 + "10: movl %%edx, 12(%3)\n"
23072 + "11: "__copyuser_seg" movl 16(%4), %%eax\n"
23073 + "12: "__copyuser_seg" movl 20(%4), %%edx\n"
23074 + "13: movl %%eax, 16(%3)\n"
23075 + "14: movl %%edx, 20(%3)\n"
23076 + "15: "__copyuser_seg" movl 24(%4), %%eax\n"
23077 + "16: "__copyuser_seg" movl 28(%4), %%edx\n"
23078 + "17: movl %%eax, 24(%3)\n"
23079 + "18: movl %%edx, 28(%3)\n"
23080 + "19: "__copyuser_seg" movl 32(%4), %%eax\n"
23081 + "20: "__copyuser_seg" movl 36(%4), %%edx\n"
23082 + "21: movl %%eax, 32(%3)\n"
23083 + "22: movl %%edx, 36(%3)\n"
23084 + "23: "__copyuser_seg" movl 40(%4), %%eax\n"
23085 + "24: "__copyuser_seg" movl 44(%4), %%edx\n"
23086 + "25: movl %%eax, 40(%3)\n"
23087 + "26: movl %%edx, 44(%3)\n"
23088 + "27: "__copyuser_seg" movl 48(%4), %%eax\n"
23089 + "28: "__copyuser_seg" movl 52(%4), %%edx\n"
23090 + "29: movl %%eax, 48(%3)\n"
23091 + "30: movl %%edx, 52(%3)\n"
23092 + "31: "__copyuser_seg" movl 56(%4), %%eax\n"
23093 + "32: "__copyuser_seg" movl 60(%4), %%edx\n"
23094 + "33: movl %%eax, 56(%3)\n"
23095 + "34: movl %%edx, 60(%3)\n"
23096 + " addl $-64, %0\n"
23097 + " addl $64, %4\n"
23098 + " addl $64, %3\n"
23099 + " cmpl $63, %0\n"
23100 + " ja 1b\n"
23101 + "35: movl %0, %%eax\n"
23102 + " shrl $2, %0\n"
23103 + " andl $3, %%eax\n"
23104 + " cld\n"
23105 + "99: rep; "__copyuser_seg" movsl\n"
23106 + "36: movl %%eax, %0\n"
23107 + "37: rep; "__copyuser_seg" movsb\n"
23108 + "100:\n"
23109 + ".section .fixup,\"ax\"\n"
23110 + "101: lea 0(%%eax,%0,4),%0\n"
23111 + " jmp 100b\n"
23112 + ".previous\n"
23113 + _ASM_EXTABLE(1b,100b)
23114 + _ASM_EXTABLE(2b,100b)
23115 + _ASM_EXTABLE(3b,100b)
23116 + _ASM_EXTABLE(4b,100b)
23117 + _ASM_EXTABLE(5b,100b)
23118 + _ASM_EXTABLE(6b,100b)
23119 + _ASM_EXTABLE(7b,100b)
23120 + _ASM_EXTABLE(8b,100b)
23121 + _ASM_EXTABLE(9b,100b)
23122 + _ASM_EXTABLE(10b,100b)
23123 + _ASM_EXTABLE(11b,100b)
23124 + _ASM_EXTABLE(12b,100b)
23125 + _ASM_EXTABLE(13b,100b)
23126 + _ASM_EXTABLE(14b,100b)
23127 + _ASM_EXTABLE(15b,100b)
23128 + _ASM_EXTABLE(16b,100b)
23129 + _ASM_EXTABLE(17b,100b)
23130 + _ASM_EXTABLE(18b,100b)
23131 + _ASM_EXTABLE(19b,100b)
23132 + _ASM_EXTABLE(20b,100b)
23133 + _ASM_EXTABLE(21b,100b)
23134 + _ASM_EXTABLE(22b,100b)
23135 + _ASM_EXTABLE(23b,100b)
23136 + _ASM_EXTABLE(24b,100b)
23137 + _ASM_EXTABLE(25b,100b)
23138 + _ASM_EXTABLE(26b,100b)
23139 + _ASM_EXTABLE(27b,100b)
23140 + _ASM_EXTABLE(28b,100b)
23141 + _ASM_EXTABLE(29b,100b)
23142 + _ASM_EXTABLE(30b,100b)
23143 + _ASM_EXTABLE(31b,100b)
23144 + _ASM_EXTABLE(32b,100b)
23145 + _ASM_EXTABLE(33b,100b)
23146 + _ASM_EXTABLE(34b,100b)
23147 + _ASM_EXTABLE(35b,100b)
23148 + _ASM_EXTABLE(36b,100b)
23149 + _ASM_EXTABLE(37b,100b)
23150 + _ASM_EXTABLE(99b,101b)
23151 + : "=&c"(size), "=&D" (d0), "=&S" (d1)
23152 + : "1"(to), "2"(from), "0"(size)
23153 + : "eax", "edx", "memory");
23154 + return size;
23155 +}
23156 +
23157 +static unsigned long __size_overflow(3)
23158 __copy_user_zeroing_intel(void *to, const void __user *from, unsigned long size)
23159 {
23160 int d0, d1;
23161 __asm__ __volatile__(
23162 " .align 2,0x90\n"
23163 - "0: movl 32(%4), %%eax\n"
23164 + "0: "__copyuser_seg" movl 32(%4), %%eax\n"
23165 " cmpl $67, %0\n"
23166 " jbe 2f\n"
23167 - "1: movl 64(%4), %%eax\n"
23168 + "1: "__copyuser_seg" movl 64(%4), %%eax\n"
23169 " .align 2,0x90\n"
23170 - "2: movl 0(%4), %%eax\n"
23171 - "21: movl 4(%4), %%edx\n"
23172 + "2: "__copyuser_seg" movl 0(%4), %%eax\n"
23173 + "21: "__copyuser_seg" movl 4(%4), %%edx\n"
23174 " movl %%eax, 0(%3)\n"
23175 " movl %%edx, 4(%3)\n"
23176 - "3: movl 8(%4), %%eax\n"
23177 - "31: movl 12(%4),%%edx\n"
23178 + "3: "__copyuser_seg" movl 8(%4), %%eax\n"
23179 + "31: "__copyuser_seg" movl 12(%4),%%edx\n"
23180 " movl %%eax, 8(%3)\n"
23181 " movl %%edx, 12(%3)\n"
23182 - "4: movl 16(%4), %%eax\n"
23183 - "41: movl 20(%4), %%edx\n"
23184 + "4: "__copyuser_seg" movl 16(%4), %%eax\n"
23185 + "41: "__copyuser_seg" movl 20(%4), %%edx\n"
23186 " movl %%eax, 16(%3)\n"
23187 " movl %%edx, 20(%3)\n"
23188 - "10: movl 24(%4), %%eax\n"
23189 - "51: movl 28(%4), %%edx\n"
23190 + "10: "__copyuser_seg" movl 24(%4), %%eax\n"
23191 + "51: "__copyuser_seg" movl 28(%4), %%edx\n"
23192 " movl %%eax, 24(%3)\n"
23193 " movl %%edx, 28(%3)\n"
23194 - "11: movl 32(%4), %%eax\n"
23195 - "61: movl 36(%4), %%edx\n"
23196 + "11: "__copyuser_seg" movl 32(%4), %%eax\n"
23197 + "61: "__copyuser_seg" movl 36(%4), %%edx\n"
23198 " movl %%eax, 32(%3)\n"
23199 " movl %%edx, 36(%3)\n"
23200 - "12: movl 40(%4), %%eax\n"
23201 - "71: movl 44(%4), %%edx\n"
23202 + "12: "__copyuser_seg" movl 40(%4), %%eax\n"
23203 + "71: "__copyuser_seg" movl 44(%4), %%edx\n"
23204 " movl %%eax, 40(%3)\n"
23205 " movl %%edx, 44(%3)\n"
23206 - "13: movl 48(%4), %%eax\n"
23207 - "81: movl 52(%4), %%edx\n"
23208 + "13: "__copyuser_seg" movl 48(%4), %%eax\n"
23209 + "81: "__copyuser_seg" movl 52(%4), %%edx\n"
23210 " movl %%eax, 48(%3)\n"
23211 " movl %%edx, 52(%3)\n"
23212 - "14: movl 56(%4), %%eax\n"
23213 - "91: movl 60(%4), %%edx\n"
23214 + "14: "__copyuser_seg" movl 56(%4), %%eax\n"
23215 + "91: "__copyuser_seg" movl 60(%4), %%edx\n"
23216 " movl %%eax, 56(%3)\n"
23217 " movl %%edx, 60(%3)\n"
23218 " addl $-64, %0\n"
23219 @@ -252,9 +360,9 @@ __copy_user_zeroing_intel(void *to, const void __user *from, unsigned long size)
23220 " shrl $2, %0\n"
23221 " andl $3, %%eax\n"
23222 " cld\n"
23223 - "6: rep; movsl\n"
23224 + "6: rep; "__copyuser_seg" movsl\n"
23225 " movl %%eax,%0\n"
23226 - "7: rep; movsb\n"
23227 + "7: rep; "__copyuser_seg" movsb\n"
23228 "8:\n"
23229 ".section .fixup,\"ax\"\n"
23230 "9: lea 0(%%eax,%0,4),%0\n"
23231 @@ -297,48 +405,48 @@ __copy_user_zeroing_intel(void *to, const void __user *from, unsigned long size)
23232 * hyoshiok@miraclelinux.com
23233 */
23234
23235 -static unsigned long __copy_user_zeroing_intel_nocache(void *to,
23236 +static unsigned long __size_overflow(3) __copy_user_zeroing_intel_nocache(void *to,
23237 const void __user *from, unsigned long size)
23238 {
23239 int d0, d1;
23240
23241 __asm__ __volatile__(
23242 " .align 2,0x90\n"
23243 - "0: movl 32(%4), %%eax\n"
23244 + "0: "__copyuser_seg" movl 32(%4), %%eax\n"
23245 " cmpl $67, %0\n"
23246 " jbe 2f\n"
23247 - "1: movl 64(%4), %%eax\n"
23248 + "1: "__copyuser_seg" movl 64(%4), %%eax\n"
23249 " .align 2,0x90\n"
23250 - "2: movl 0(%4), %%eax\n"
23251 - "21: movl 4(%4), %%edx\n"
23252 + "2: "__copyuser_seg" movl 0(%4), %%eax\n"
23253 + "21: "__copyuser_seg" movl 4(%4), %%edx\n"
23254 " movnti %%eax, 0(%3)\n"
23255 " movnti %%edx, 4(%3)\n"
23256 - "3: movl 8(%4), %%eax\n"
23257 - "31: movl 12(%4),%%edx\n"
23258 + "3: "__copyuser_seg" movl 8(%4), %%eax\n"
23259 + "31: "__copyuser_seg" movl 12(%4),%%edx\n"
23260 " movnti %%eax, 8(%3)\n"
23261 " movnti %%edx, 12(%3)\n"
23262 - "4: movl 16(%4), %%eax\n"
23263 - "41: movl 20(%4), %%edx\n"
23264 + "4: "__copyuser_seg" movl 16(%4), %%eax\n"
23265 + "41: "__copyuser_seg" movl 20(%4), %%edx\n"
23266 " movnti %%eax, 16(%3)\n"
23267 " movnti %%edx, 20(%3)\n"
23268 - "10: movl 24(%4), %%eax\n"
23269 - "51: movl 28(%4), %%edx\n"
23270 + "10: "__copyuser_seg" movl 24(%4), %%eax\n"
23271 + "51: "__copyuser_seg" movl 28(%4), %%edx\n"
23272 " movnti %%eax, 24(%3)\n"
23273 " movnti %%edx, 28(%3)\n"
23274 - "11: movl 32(%4), %%eax\n"
23275 - "61: movl 36(%4), %%edx\n"
23276 + "11: "__copyuser_seg" movl 32(%4), %%eax\n"
23277 + "61: "__copyuser_seg" movl 36(%4), %%edx\n"
23278 " movnti %%eax, 32(%3)\n"
23279 " movnti %%edx, 36(%3)\n"
23280 - "12: movl 40(%4), %%eax\n"
23281 - "71: movl 44(%4), %%edx\n"
23282 + "12: "__copyuser_seg" movl 40(%4), %%eax\n"
23283 + "71: "__copyuser_seg" movl 44(%4), %%edx\n"
23284 " movnti %%eax, 40(%3)\n"
23285 " movnti %%edx, 44(%3)\n"
23286 - "13: movl 48(%4), %%eax\n"
23287 - "81: movl 52(%4), %%edx\n"
23288 + "13: "__copyuser_seg" movl 48(%4), %%eax\n"
23289 + "81: "__copyuser_seg" movl 52(%4), %%edx\n"
23290 " movnti %%eax, 48(%3)\n"
23291 " movnti %%edx, 52(%3)\n"
23292 - "14: movl 56(%4), %%eax\n"
23293 - "91: movl 60(%4), %%edx\n"
23294 + "14: "__copyuser_seg" movl 56(%4), %%eax\n"
23295 + "91: "__copyuser_seg" movl 60(%4), %%edx\n"
23296 " movnti %%eax, 56(%3)\n"
23297 " movnti %%edx, 60(%3)\n"
23298 " addl $-64, %0\n"
23299 @@ -351,9 +459,9 @@ static unsigned long __copy_user_zeroing_intel_nocache(void *to,
23300 " shrl $2, %0\n"
23301 " andl $3, %%eax\n"
23302 " cld\n"
23303 - "6: rep; movsl\n"
23304 + "6: rep; "__copyuser_seg" movsl\n"
23305 " movl %%eax,%0\n"
23306 - "7: rep; movsb\n"
23307 + "7: rep; "__copyuser_seg" movsb\n"
23308 "8:\n"
23309 ".section .fixup,\"ax\"\n"
23310 "9: lea 0(%%eax,%0,4),%0\n"
23311 @@ -391,48 +499,48 @@ static unsigned long __copy_user_zeroing_intel_nocache(void *to,
23312 return size;
23313 }
23314
23315 -static unsigned long __copy_user_intel_nocache(void *to,
23316 +static unsigned long __size_overflow(3) __copy_user_intel_nocache(void *to,
23317 const void __user *from, unsigned long size)
23318 {
23319 int d0, d1;
23320
23321 __asm__ __volatile__(
23322 " .align 2,0x90\n"
23323 - "0: movl 32(%4), %%eax\n"
23324 + "0: "__copyuser_seg" movl 32(%4), %%eax\n"
23325 " cmpl $67, %0\n"
23326 " jbe 2f\n"
23327 - "1: movl 64(%4), %%eax\n"
23328 + "1: "__copyuser_seg" movl 64(%4), %%eax\n"
23329 " .align 2,0x90\n"
23330 - "2: movl 0(%4), %%eax\n"
23331 - "21: movl 4(%4), %%edx\n"
23332 + "2: "__copyuser_seg" movl 0(%4), %%eax\n"
23333 + "21: "__copyuser_seg" movl 4(%4), %%edx\n"
23334 " movnti %%eax, 0(%3)\n"
23335 " movnti %%edx, 4(%3)\n"
23336 - "3: movl 8(%4), %%eax\n"
23337 - "31: movl 12(%4),%%edx\n"
23338 + "3: "__copyuser_seg" movl 8(%4), %%eax\n"
23339 + "31: "__copyuser_seg" movl 12(%4),%%edx\n"
23340 " movnti %%eax, 8(%3)\n"
23341 " movnti %%edx, 12(%3)\n"
23342 - "4: movl 16(%4), %%eax\n"
23343 - "41: movl 20(%4), %%edx\n"
23344 + "4: "__copyuser_seg" movl 16(%4), %%eax\n"
23345 + "41: "__copyuser_seg" movl 20(%4), %%edx\n"
23346 " movnti %%eax, 16(%3)\n"
23347 " movnti %%edx, 20(%3)\n"
23348 - "10: movl 24(%4), %%eax\n"
23349 - "51: movl 28(%4), %%edx\n"
23350 + "10: "__copyuser_seg" movl 24(%4), %%eax\n"
23351 + "51: "__copyuser_seg" movl 28(%4), %%edx\n"
23352 " movnti %%eax, 24(%3)\n"
23353 " movnti %%edx, 28(%3)\n"
23354 - "11: movl 32(%4), %%eax\n"
23355 - "61: movl 36(%4), %%edx\n"
23356 + "11: "__copyuser_seg" movl 32(%4), %%eax\n"
23357 + "61: "__copyuser_seg" movl 36(%4), %%edx\n"
23358 " movnti %%eax, 32(%3)\n"
23359 " movnti %%edx, 36(%3)\n"
23360 - "12: movl 40(%4), %%eax\n"
23361 - "71: movl 44(%4), %%edx\n"
23362 + "12: "__copyuser_seg" movl 40(%4), %%eax\n"
23363 + "71: "__copyuser_seg" movl 44(%4), %%edx\n"
23364 " movnti %%eax, 40(%3)\n"
23365 " movnti %%edx, 44(%3)\n"
23366 - "13: movl 48(%4), %%eax\n"
23367 - "81: movl 52(%4), %%edx\n"
23368 + "13: "__copyuser_seg" movl 48(%4), %%eax\n"
23369 + "81: "__copyuser_seg" movl 52(%4), %%edx\n"
23370 " movnti %%eax, 48(%3)\n"
23371 " movnti %%edx, 52(%3)\n"
23372 - "14: movl 56(%4), %%eax\n"
23373 - "91: movl 60(%4), %%edx\n"
23374 + "14: "__copyuser_seg" movl 56(%4), %%eax\n"
23375 + "91: "__copyuser_seg" movl 60(%4), %%edx\n"
23376 " movnti %%eax, 56(%3)\n"
23377 " movnti %%edx, 60(%3)\n"
23378 " addl $-64, %0\n"
23379 @@ -445,9 +553,9 @@ static unsigned long __copy_user_intel_nocache(void *to,
23380 " shrl $2, %0\n"
23381 " andl $3, %%eax\n"
23382 " cld\n"
23383 - "6: rep; movsl\n"
23384 + "6: rep; "__copyuser_seg" movsl\n"
23385 " movl %%eax,%0\n"
23386 - "7: rep; movsb\n"
23387 + "7: rep; "__copyuser_seg" movsb\n"
23388 "8:\n"
23389 ".section .fixup,\"ax\"\n"
23390 "9: lea 0(%%eax,%0,4),%0\n"
23391 @@ -487,32 +595,36 @@ static unsigned long __copy_user_intel_nocache(void *to,
23392 */
23393 unsigned long __copy_user_zeroing_intel(void *to, const void __user *from,
23394 unsigned long size);
23395 -unsigned long __copy_user_intel(void __user *to, const void *from,
23396 +unsigned long __generic_copy_to_user_intel(void __user *to, const void *from,
23397 + unsigned long size);
23398 +unsigned long __generic_copy_from_user_intel(void *to, const void __user *from,
23399 unsigned long size);
23400 unsigned long __copy_user_zeroing_intel_nocache(void *to,
23401 const void __user *from, unsigned long size);
23402 #endif /* CONFIG_X86_INTEL_USERCOPY */
23403
23404 /* Generic arbitrary sized copy. */
23405 -#define __copy_user(to, from, size) \
23406 +#define __copy_user(to, from, size, prefix, set, restore) \
23407 do { \
23408 int __d0, __d1, __d2; \
23409 __asm__ __volatile__( \
23410 + set \
23411 " cmp $7,%0\n" \
23412 " jbe 1f\n" \
23413 " movl %1,%0\n" \
23414 " negl %0\n" \
23415 " andl $7,%0\n" \
23416 " subl %0,%3\n" \
23417 - "4: rep; movsb\n" \
23418 + "4: rep; "prefix"movsb\n" \
23419 " movl %3,%0\n" \
23420 " shrl $2,%0\n" \
23421 " andl $3,%3\n" \
23422 " .align 2,0x90\n" \
23423 - "0: rep; movsl\n" \
23424 + "0: rep; "prefix"movsl\n" \
23425 " movl %3,%0\n" \
23426 - "1: rep; movsb\n" \
23427 + "1: rep; "prefix"movsb\n" \
23428 "2:\n" \
23429 + restore \
23430 ".section .fixup,\"ax\"\n" \
23431 "5: addl %3,%0\n" \
23432 " jmp 2b\n" \
23433 @@ -537,14 +649,14 @@ do { \
23434 " negl %0\n" \
23435 " andl $7,%0\n" \
23436 " subl %0,%3\n" \
23437 - "4: rep; movsb\n" \
23438 + "4: rep; "__copyuser_seg"movsb\n" \
23439 " movl %3,%0\n" \
23440 " shrl $2,%0\n" \
23441 " andl $3,%3\n" \
23442 " .align 2,0x90\n" \
23443 - "0: rep; movsl\n" \
23444 + "0: rep; "__copyuser_seg"movsl\n" \
23445 " movl %3,%0\n" \
23446 - "1: rep; movsb\n" \
23447 + "1: rep; "__copyuser_seg"movsb\n" \
23448 "2:\n" \
23449 ".section .fixup,\"ax\"\n" \
23450 "5: addl %3,%0\n" \
23451 @@ -627,9 +739,9 @@ survive:
23452 }
23453 #endif
23454 if (movsl_is_ok(to, from, n))
23455 - __copy_user(to, from, n);
23456 + __copy_user(to, from, n, "", __COPYUSER_SET_ES, __COPYUSER_RESTORE_ES);
23457 else
23458 - n = __copy_user_intel(to, from, n);
23459 + n = __generic_copy_to_user_intel(to, from, n);
23460 return n;
23461 }
23462 EXPORT_SYMBOL(__copy_to_user_ll);
23463 @@ -649,10 +761,9 @@ unsigned long __copy_from_user_ll_nozero(void *to, const void __user *from,
23464 unsigned long n)
23465 {
23466 if (movsl_is_ok(to, from, n))
23467 - __copy_user(to, from, n);
23468 + __copy_user(to, from, n, __copyuser_seg, "", "");
23469 else
23470 - n = __copy_user_intel((void __user *)to,
23471 - (const void *)from, n);
23472 + n = __generic_copy_from_user_intel(to, from, n);
23473 return n;
23474 }
23475 EXPORT_SYMBOL(__copy_from_user_ll_nozero);
23476 @@ -679,65 +790,50 @@ unsigned long __copy_from_user_ll_nocache_nozero(void *to, const void __user *fr
23477 if (n > 64 && cpu_has_xmm2)
23478 n = __copy_user_intel_nocache(to, from, n);
23479 else
23480 - __copy_user(to, from, n);
23481 + __copy_user(to, from, n, __copyuser_seg, "", "");
23482 #else
23483 - __copy_user(to, from, n);
23484 + __copy_user(to, from, n, __copyuser_seg, "", "");
23485 #endif
23486 return n;
23487 }
23488 EXPORT_SYMBOL(__copy_from_user_ll_nocache_nozero);
23489
23490 -/**
23491 - * copy_to_user: - Copy a block of data into user space.
23492 - * @to: Destination address, in user space.
23493 - * @from: Source address, in kernel space.
23494 - * @n: Number of bytes to copy.
23495 - *
23496 - * Context: User context only. This function may sleep.
23497 - *
23498 - * Copy data from kernel space to user space.
23499 - *
23500 - * Returns number of bytes that could not be copied.
23501 - * On success, this will be zero.
23502 - */
23503 -unsigned long
23504 -copy_to_user(void __user *to, const void *from, unsigned long n)
23505 -{
23506 - if (access_ok(VERIFY_WRITE, to, n))
23507 - n = __copy_to_user(to, from, n);
23508 - return n;
23509 -}
23510 -EXPORT_SYMBOL(copy_to_user);
23511 -
23512 -/**
23513 - * copy_from_user: - Copy a block of data from user space.
23514 - * @to: Destination address, in kernel space.
23515 - * @from: Source address, in user space.
23516 - * @n: Number of bytes to copy.
23517 - *
23518 - * Context: User context only. This function may sleep.
23519 - *
23520 - * Copy data from user space to kernel space.
23521 - *
23522 - * Returns number of bytes that could not be copied.
23523 - * On success, this will be zero.
23524 - *
23525 - * If some data could not be copied, this function will pad the copied
23526 - * data to the requested size using zero bytes.
23527 - */
23528 -unsigned long
23529 -_copy_from_user(void *to, const void __user *from, unsigned long n)
23530 -{
23531 - if (access_ok(VERIFY_READ, from, n))
23532 - n = __copy_from_user(to, from, n);
23533 - else
23534 - memset(to, 0, n);
23535 - return n;
23536 -}
23537 -EXPORT_SYMBOL(_copy_from_user);
23538 -
23539 void copy_from_user_overflow(void)
23540 {
23541 WARN(1, "Buffer overflow detected!\n");
23542 }
23543 EXPORT_SYMBOL(copy_from_user_overflow);
23544 +
23545 +void copy_to_user_overflow(void)
23546 +{
23547 + WARN(1, "Buffer overflow detected!\n");
23548 +}
23549 +EXPORT_SYMBOL(copy_to_user_overflow);
23550 +
23551 +#ifdef CONFIG_PAX_MEMORY_UDEREF
23552 +void __set_fs(mm_segment_t x)
23553 +{
23554 + switch (x.seg) {
23555 + case 0:
23556 + loadsegment(gs, 0);
23557 + break;
23558 + case TASK_SIZE_MAX:
23559 + loadsegment(gs, __USER_DS);
23560 + break;
23561 + case -1UL:
23562 + loadsegment(gs, __KERNEL_DS);
23563 + break;
23564 + default:
23565 + BUG();
23566 + }
23567 + return;
23568 +}
23569 +EXPORT_SYMBOL(__set_fs);
23570 +
23571 +void set_fs(mm_segment_t x)
23572 +{
23573 + current_thread_info()->addr_limit = x;
23574 + __set_fs(x);
23575 +}
23576 +EXPORT_SYMBOL(set_fs);
23577 +#endif
23578 diff --git a/arch/x86/lib/usercopy_64.c b/arch/x86/lib/usercopy_64.c
23579 index e5b130b..6690d31 100644
23580 --- a/arch/x86/lib/usercopy_64.c
23581 +++ b/arch/x86/lib/usercopy_64.c
23582 @@ -16,6 +16,12 @@ unsigned long __clear_user(void __user *addr, unsigned long size)
23583 {
23584 long __d0;
23585 might_fault();
23586 +
23587 +#ifdef CONFIG_PAX_MEMORY_UDEREF
23588 + if ((unsigned long)addr < PAX_USER_SHADOW_BASE)
23589 + addr += PAX_USER_SHADOW_BASE;
23590 +#endif
23591 +
23592 /* no memory constraint because it doesn't change any memory gcc knows
23593 about */
23594 asm volatile(
23595 @@ -52,12 +58,20 @@ unsigned long clear_user(void __user *to, unsigned long n)
23596 }
23597 EXPORT_SYMBOL(clear_user);
23598
23599 -unsigned long copy_in_user(void __user *to, const void __user *from, unsigned len)
23600 +unsigned long copy_in_user(void __user *to, const void __user *from, unsigned long len)
23601 {
23602 - if (access_ok(VERIFY_WRITE, to, len) && access_ok(VERIFY_READ, from, len)) {
23603 - return copy_user_generic((__force void *)to, (__force void *)from, len);
23604 - }
23605 - return len;
23606 + if (access_ok(VERIFY_WRITE, to, len) && access_ok(VERIFY_READ, from, len)) {
23607 +
23608 +#ifdef CONFIG_PAX_MEMORY_UDEREF
23609 + if ((unsigned long)to < PAX_USER_SHADOW_BASE)
23610 + to += PAX_USER_SHADOW_BASE;
23611 + if ((unsigned long)from < PAX_USER_SHADOW_BASE)
23612 + from += PAX_USER_SHADOW_BASE;
23613 +#endif
23614 +
23615 + return copy_user_generic((void __force_kernel *)to, (void __force_kernel *)from, len);
23616 + }
23617 + return len;
23618 }
23619 EXPORT_SYMBOL(copy_in_user);
23620
23621 @@ -67,7 +81,7 @@ EXPORT_SYMBOL(copy_in_user);
23622 * it is not necessary to optimize tail handling.
23623 */
23624 unsigned long
23625 -copy_user_handle_tail(char *to, char *from, unsigned len, unsigned zerorest)
23626 +copy_user_handle_tail(char __user *to, char __user *from, unsigned long len, unsigned zerorest)
23627 {
23628 char c;
23629 unsigned zero_len;
23630 @@ -84,3 +98,15 @@ copy_user_handle_tail(char *to, char *from, unsigned len, unsigned zerorest)
23631 break;
23632 return len;
23633 }
23634 +
23635 +void copy_from_user_overflow(void)
23636 +{
23637 + WARN(1, "Buffer overflow detected!\n");
23638 +}
23639 +EXPORT_SYMBOL(copy_from_user_overflow);
23640 +
23641 +void copy_to_user_overflow(void)
23642 +{
23643 + WARN(1, "Buffer overflow detected!\n");
23644 +}
23645 +EXPORT_SYMBOL(copy_to_user_overflow);
23646 diff --git a/arch/x86/mm/extable.c b/arch/x86/mm/extable.c
23647 index 903ec1e..c4166b2 100644
23648 --- a/arch/x86/mm/extable.c
23649 +++ b/arch/x86/mm/extable.c
23650 @@ -6,12 +6,24 @@
23651 static inline unsigned long
23652 ex_insn_addr(const struct exception_table_entry *x)
23653 {
23654 - return (unsigned long)&x->insn + x->insn;
23655 + unsigned long reloc = 0;
23656 +
23657 +#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
23658 + reloc = ____LOAD_PHYSICAL_ADDR - LOAD_PHYSICAL_ADDR;
23659 +#endif
23660 +
23661 + return (unsigned long)&x->insn + x->insn + reloc;
23662 }
23663 static inline unsigned long
23664 ex_fixup_addr(const struct exception_table_entry *x)
23665 {
23666 - return (unsigned long)&x->fixup + x->fixup;
23667 + unsigned long reloc = 0;
23668 +
23669 +#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
23670 + reloc = ____LOAD_PHYSICAL_ADDR - LOAD_PHYSICAL_ADDR;
23671 +#endif
23672 +
23673 + return (unsigned long)&x->fixup + x->fixup + reloc;
23674 }
23675
23676 int fixup_exception(struct pt_regs *regs)
23677 @@ -20,7 +32,7 @@ int fixup_exception(struct pt_regs *regs)
23678 unsigned long new_ip;
23679
23680 #ifdef CONFIG_PNPBIOS
23681 - if (unlikely(SEGMENT_IS_PNP_CODE(regs->cs))) {
23682 + if (unlikely(!v8086_mode(regs) && SEGMENT_IS_PNP_CODE(regs->cs))) {
23683 extern u32 pnp_bios_fault_eip, pnp_bios_fault_esp;
23684 extern u32 pnp_bios_is_utter_crap;
23685 pnp_bios_is_utter_crap = 1;
23686 @@ -145,6 +157,13 @@ void sort_extable(struct exception_table_entry *start,
23687 i += 4;
23688 p->fixup -= i;
23689 i += 4;
23690 +
23691 +#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
23692 + BUILD_BUG_ON(!IS_ENABLED(CONFIG_BUILDTIME_EXTABLE_SORT));
23693 + p->insn -= ____LOAD_PHYSICAL_ADDR - LOAD_PHYSICAL_ADDR;
23694 + p->fixup -= ____LOAD_PHYSICAL_ADDR - LOAD_PHYSICAL_ADDR;
23695 +#endif
23696 +
23697 }
23698 }
23699
23700 diff --git a/arch/x86/mm/fault.c b/arch/x86/mm/fault.c
23701 index 76dcd9d..e9dffde 100644
23702 --- a/arch/x86/mm/fault.c
23703 +++ b/arch/x86/mm/fault.c
23704 @@ -13,11 +13,18 @@
23705 #include <linux/perf_event.h> /* perf_sw_event */
23706 #include <linux/hugetlb.h> /* hstate_index_to_shift */
23707 #include <linux/prefetch.h> /* prefetchw */
23708 +#include <linux/unistd.h>
23709 +#include <linux/compiler.h>
23710
23711 #include <asm/traps.h> /* dotraplinkage, ... */
23712 #include <asm/pgalloc.h> /* pgd_*(), ... */
23713 #include <asm/kmemcheck.h> /* kmemcheck_*(), ... */
23714 #include <asm/fixmap.h> /* VSYSCALL_START */
23715 +#include <asm/tlbflush.h>
23716 +
23717 +#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
23718 +#include <asm/stacktrace.h>
23719 +#endif
23720
23721 /*
23722 * Page fault error code bits:
23723 @@ -55,7 +62,7 @@ static inline int __kprobes notify_page_fault(struct pt_regs *regs)
23724 int ret = 0;
23725
23726 /* kprobe_running() needs smp_processor_id() */
23727 - if (kprobes_built_in() && !user_mode_vm(regs)) {
23728 + if (kprobes_built_in() && !user_mode(regs)) {
23729 preempt_disable();
23730 if (kprobe_running() && kprobe_fault_handler(regs, 14))
23731 ret = 1;
23732 @@ -116,7 +123,10 @@ check_prefetch_opcode(struct pt_regs *regs, unsigned char *instr,
23733 return !instr_lo || (instr_lo>>1) == 1;
23734 case 0x00:
23735 /* Prefetch instruction is 0x0F0D or 0x0F18 */
23736 - if (probe_kernel_address(instr, opcode))
23737 + if (user_mode(regs)) {
23738 + if (__copy_from_user_inatomic(&opcode, (unsigned char __force_user *)(instr), 1))
23739 + return 0;
23740 + } else if (probe_kernel_address(instr, opcode))
23741 return 0;
23742
23743 *prefetch = (instr_lo == 0xF) &&
23744 @@ -150,7 +160,10 @@ is_prefetch(struct pt_regs *regs, unsigned long error_code, unsigned long addr)
23745 while (instr < max_instr) {
23746 unsigned char opcode;
23747
23748 - if (probe_kernel_address(instr, opcode))
23749 + if (user_mode(regs)) {
23750 + if (__copy_from_user_inatomic(&opcode, (unsigned char __force_user *)(instr), 1))
23751 + break;
23752 + } else if (probe_kernel_address(instr, opcode))
23753 break;
23754
23755 instr++;
23756 @@ -181,6 +194,34 @@ force_sig_info_fault(int si_signo, int si_code, unsigned long address,
23757 force_sig_info(si_signo, &info, tsk);
23758 }
23759
23760 +#if defined(CONFIG_PAX_PAGEEXEC) || defined(CONFIG_PAX_SEGMEXEC)
23761 +static bool pax_is_fetch_fault(struct pt_regs *regs, unsigned long error_code, unsigned long address);
23762 +#endif
23763 +
23764 +#ifdef CONFIG_PAX_EMUTRAMP
23765 +static int pax_handle_fetch_fault(struct pt_regs *regs);
23766 +#endif
23767 +
23768 +#ifdef CONFIG_PAX_PAGEEXEC
23769 +static inline pmd_t * pax_get_pmd(struct mm_struct *mm, unsigned long address)
23770 +{
23771 + pgd_t *pgd;
23772 + pud_t *pud;
23773 + pmd_t *pmd;
23774 +
23775 + pgd = pgd_offset(mm, address);
23776 + if (!pgd_present(*pgd))
23777 + return NULL;
23778 + pud = pud_offset(pgd, address);
23779 + if (!pud_present(*pud))
23780 + return NULL;
23781 + pmd = pmd_offset(pud, address);
23782 + if (!pmd_present(*pmd))
23783 + return NULL;
23784 + return pmd;
23785 +}
23786 +#endif
23787 +
23788 DEFINE_SPINLOCK(pgd_lock);
23789 LIST_HEAD(pgd_list);
23790
23791 @@ -231,10 +272,22 @@ void vmalloc_sync_all(void)
23792 for (address = VMALLOC_START & PMD_MASK;
23793 address >= TASK_SIZE && address < FIXADDR_TOP;
23794 address += PMD_SIZE) {
23795 +
23796 +#ifdef CONFIG_PAX_PER_CPU_PGD
23797 + unsigned long cpu;
23798 +#else
23799 struct page *page;
23800 +#endif
23801
23802 spin_lock(&pgd_lock);
23803 +
23804 +#ifdef CONFIG_PAX_PER_CPU_PGD
23805 + for (cpu = 0; cpu < nr_cpu_ids; ++cpu) {
23806 + pgd_t *pgd = get_cpu_pgd(cpu);
23807 + pmd_t *ret;
23808 +#else
23809 list_for_each_entry(page, &pgd_list, lru) {
23810 + pgd_t *pgd = page_address(page);
23811 spinlock_t *pgt_lock;
23812 pmd_t *ret;
23813
23814 @@ -242,8 +295,13 @@ void vmalloc_sync_all(void)
23815 pgt_lock = &pgd_page_get_mm(page)->page_table_lock;
23816
23817 spin_lock(pgt_lock);
23818 - ret = vmalloc_sync_one(page_address(page), address);
23819 +#endif
23820 +
23821 + ret = vmalloc_sync_one(pgd, address);
23822 +
23823 +#ifndef CONFIG_PAX_PER_CPU_PGD
23824 spin_unlock(pgt_lock);
23825 +#endif
23826
23827 if (!ret)
23828 break;
23829 @@ -277,6 +335,11 @@ static noinline __kprobes int vmalloc_fault(unsigned long address)
23830 * an interrupt in the middle of a task switch..
23831 */
23832 pgd_paddr = read_cr3();
23833 +
23834 +#ifdef CONFIG_PAX_PER_CPU_PGD
23835 + BUG_ON(__pa(get_cpu_pgd(smp_processor_id())) != (pgd_paddr & PHYSICAL_PAGE_MASK));
23836 +#endif
23837 +
23838 pmd_k = vmalloc_sync_one(__va(pgd_paddr), address);
23839 if (!pmd_k)
23840 return -1;
23841 @@ -372,7 +435,14 @@ static noinline __kprobes int vmalloc_fault(unsigned long address)
23842 * happen within a race in page table update. In the later
23843 * case just flush:
23844 */
23845 +
23846 +#ifdef CONFIG_PAX_PER_CPU_PGD
23847 + BUG_ON(__pa(get_cpu_pgd(smp_processor_id())) != (read_cr3() & PHYSICAL_PAGE_MASK));
23848 + pgd = pgd_offset_cpu(smp_processor_id(), address);
23849 +#else
23850 pgd = pgd_offset(current->active_mm, address);
23851 +#endif
23852 +
23853 pgd_ref = pgd_offset_k(address);
23854 if (pgd_none(*pgd_ref))
23855 return -1;
23856 @@ -540,7 +610,7 @@ static int is_errata93(struct pt_regs *regs, unsigned long address)
23857 static int is_errata100(struct pt_regs *regs, unsigned long address)
23858 {
23859 #ifdef CONFIG_X86_64
23860 - if ((regs->cs == __USER32_CS || (regs->cs & (1<<2))) && (address >> 32))
23861 + if ((regs->cs == __USER32_CS || (regs->cs & SEGMENT_LDT)) && (address >> 32))
23862 return 1;
23863 #endif
23864 return 0;
23865 @@ -567,7 +637,7 @@ static int is_f00f_bug(struct pt_regs *regs, unsigned long address)
23866 }
23867
23868 static const char nx_warning[] = KERN_CRIT
23869 -"kernel tried to execute NX-protected page - exploit attempt? (uid: %d)\n";
23870 +"kernel tried to execute NX-protected page - exploit attempt? (uid: %d, task: %s, pid: %d)\n";
23871
23872 static void
23873 show_fault_oops(struct pt_regs *regs, unsigned long error_code,
23874 @@ -576,15 +646,26 @@ show_fault_oops(struct pt_regs *regs, unsigned long error_code,
23875 if (!oops_may_print())
23876 return;
23877
23878 - if (error_code & PF_INSTR) {
23879 + if ((__supported_pte_mask & _PAGE_NX) && (error_code & PF_INSTR)) {
23880 unsigned int level;
23881
23882 pte_t *pte = lookup_address(address, &level);
23883
23884 if (pte && pte_present(*pte) && !pte_exec(*pte))
23885 - printk(nx_warning, from_kuid(&init_user_ns, current_uid()));
23886 + printk(nx_warning, from_kuid(&init_user_ns, current_uid()), current->comm, task_pid_nr(current));
23887 }
23888
23889 +#ifdef CONFIG_PAX_KERNEXEC
23890 + if (init_mm.start_code <= address && address < init_mm.end_code) {
23891 + if (current->signal->curr_ip)
23892 + printk(KERN_ERR "PAX: From %pI4: %s:%d, uid/euid: %u/%u, attempted to modify kernel code\n",
23893 + &current->signal->curr_ip, current->comm, task_pid_nr(current), current_uid(), current_euid());
23894 + else
23895 + printk(KERN_ERR "PAX: %s:%d, uid/euid: %u/%u, attempted to modify kernel code\n",
23896 + current->comm, task_pid_nr(current), current_uid(), current_euid());
23897 + }
23898 +#endif
23899 +
23900 printk(KERN_ALERT "BUG: unable to handle kernel ");
23901 if (address < PAGE_SIZE)
23902 printk(KERN_CONT "NULL pointer dereference");
23903 @@ -748,6 +829,21 @@ __bad_area_nosemaphore(struct pt_regs *regs, unsigned long error_code,
23904 }
23905 #endif
23906
23907 +#if defined(CONFIG_PAX_PAGEEXEC) || defined(CONFIG_PAX_SEGMEXEC)
23908 + if (pax_is_fetch_fault(regs, error_code, address)) {
23909 +
23910 +#ifdef CONFIG_PAX_EMUTRAMP
23911 + switch (pax_handle_fetch_fault(regs)) {
23912 + case 2:
23913 + return;
23914 + }
23915 +#endif
23916 +
23917 + pax_report_fault(regs, (void *)regs->ip, (void *)regs->sp);
23918 + do_group_exit(SIGKILL);
23919 + }
23920 +#endif
23921 +
23922 if (unlikely(show_unhandled_signals))
23923 show_signal_msg(regs, error_code, address, tsk);
23924
23925 @@ -844,7 +940,7 @@ do_sigbus(struct pt_regs *regs, unsigned long error_code, unsigned long address,
23926 if (fault & (VM_FAULT_HWPOISON|VM_FAULT_HWPOISON_LARGE)) {
23927 printk(KERN_ERR
23928 "MCE: Killing %s:%d due to hardware memory corruption fault at %lx\n",
23929 - tsk->comm, tsk->pid, address);
23930 + tsk->comm, task_pid_nr(tsk), address);
23931 code = BUS_MCEERR_AR;
23932 }
23933 #endif
23934 @@ -900,6 +996,99 @@ static int spurious_fault_check(unsigned long error_code, pte_t *pte)
23935 return 1;
23936 }
23937
23938 +#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_PAGEEXEC)
23939 +static int pax_handle_pageexec_fault(struct pt_regs *regs, struct mm_struct *mm, unsigned long address, unsigned long error_code)
23940 +{
23941 + pte_t *pte;
23942 + pmd_t *pmd;
23943 + spinlock_t *ptl;
23944 + unsigned char pte_mask;
23945 +
23946 + if ((__supported_pte_mask & _PAGE_NX) || (error_code & (PF_PROT|PF_USER)) != (PF_PROT|PF_USER) || v8086_mode(regs) ||
23947 + !(mm->pax_flags & MF_PAX_PAGEEXEC))
23948 + return 0;
23949 +
23950 + /* PaX: it's our fault, let's handle it if we can */
23951 +
23952 + /* PaX: take a look at read faults before acquiring any locks */
23953 + if (unlikely(!(error_code & PF_WRITE) && (regs->ip == address))) {
23954 + /* instruction fetch attempt from a protected page in user mode */
23955 + up_read(&mm->mmap_sem);
23956 +
23957 +#ifdef CONFIG_PAX_EMUTRAMP
23958 + switch (pax_handle_fetch_fault(regs)) {
23959 + case 2:
23960 + return 1;
23961 + }
23962 +#endif
23963 +
23964 + pax_report_fault(regs, (void *)regs->ip, (void *)regs->sp);
23965 + do_group_exit(SIGKILL);
23966 + }
23967 +
23968 + pmd = pax_get_pmd(mm, address);
23969 + if (unlikely(!pmd))
23970 + return 0;
23971 +
23972 + pte = pte_offset_map_lock(mm, pmd, address, &ptl);
23973 + if (unlikely(!(pte_val(*pte) & _PAGE_PRESENT) || pte_user(*pte))) {
23974 + pte_unmap_unlock(pte, ptl);
23975 + return 0;
23976 + }
23977 +
23978 + if (unlikely((error_code & PF_WRITE) && !pte_write(*pte))) {
23979 + /* write attempt to a protected page in user mode */
23980 + pte_unmap_unlock(pte, ptl);
23981 + return 0;
23982 + }
23983 +
23984 +#ifdef CONFIG_SMP
23985 + if (likely(address > get_limit(regs->cs) && cpu_isset(smp_processor_id(), mm->context.cpu_user_cs_mask)))
23986 +#else
23987 + if (likely(address > get_limit(regs->cs)))
23988 +#endif
23989 + {
23990 + set_pte(pte, pte_mkread(*pte));
23991 + __flush_tlb_one(address);
23992 + pte_unmap_unlock(pte, ptl);
23993 + up_read(&mm->mmap_sem);
23994 + return 1;
23995 + }
23996 +
23997 + pte_mask = _PAGE_ACCESSED | _PAGE_USER | ((error_code & PF_WRITE) << (_PAGE_BIT_DIRTY-1));
23998 +
23999 + /*
24000 + * PaX: fill DTLB with user rights and retry
24001 + */
24002 + __asm__ __volatile__ (
24003 + "orb %2,(%1)\n"
24004 +#if defined(CONFIG_M586) || defined(CONFIG_M586TSC)
24005 +/*
24006 + * PaX: let this uncommented 'invlpg' remind us on the behaviour of Intel's
24007 + * (and AMD's) TLBs. namely, they do not cache PTEs that would raise *any*
24008 + * page fault when examined during a TLB load attempt. this is true not only
24009 + * for PTEs holding a non-present entry but also present entries that will
24010 + * raise a page fault (such as those set up by PaX, or the copy-on-write
24011 + * mechanism). in effect it means that we do *not* need to flush the TLBs
24012 + * for our target pages since their PTEs are simply not in the TLBs at all.
24013 +
24014 + * the best thing in omitting it is that we gain around 15-20% speed in the
24015 + * fast path of the page fault handler and can get rid of tracing since we
24016 + * can no longer flush unintended entries.
24017 + */
24018 + "invlpg (%0)\n"
24019 +#endif
24020 + __copyuser_seg"testb $0,(%0)\n"
24021 + "xorb %3,(%1)\n"
24022 + :
24023 + : "r" (address), "r" (pte), "q" (pte_mask), "i" (_PAGE_USER)
24024 + : "memory", "cc");
24025 + pte_unmap_unlock(pte, ptl);
24026 + up_read(&mm->mmap_sem);
24027 + return 1;
24028 +}
24029 +#endif
24030 +
24031 /*
24032 * Handle a spurious fault caused by a stale TLB entry.
24033 *
24034 @@ -972,6 +1161,9 @@ int show_unhandled_signals = 1;
24035 static inline int
24036 access_error(unsigned long error_code, struct vm_area_struct *vma)
24037 {
24038 + if ((__supported_pte_mask & _PAGE_NX) && (error_code & PF_INSTR) && !(vma->vm_flags & VM_EXEC))
24039 + return 1;
24040 +
24041 if (error_code & PF_WRITE) {
24042 /* write, present and write, not present: */
24043 if (unlikely(!(vma->vm_flags & VM_WRITE)))
24044 @@ -1005,18 +1197,33 @@ do_page_fault(struct pt_regs *regs, unsigned long error_code)
24045 {
24046 struct vm_area_struct *vma;
24047 struct task_struct *tsk;
24048 - unsigned long address;
24049 struct mm_struct *mm;
24050 int fault;
24051 int write = error_code & PF_WRITE;
24052 unsigned int flags = FAULT_FLAG_ALLOW_RETRY | FAULT_FLAG_KILLABLE |
24053 (write ? FAULT_FLAG_WRITE : 0);
24054
24055 - tsk = current;
24056 - mm = tsk->mm;
24057 -
24058 /* Get the faulting address: */
24059 - address = read_cr2();
24060 + unsigned long address = read_cr2();
24061 +
24062 +#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
24063 + if (!user_mode(regs) && address < 2 * PAX_USER_SHADOW_BASE) {
24064 + if (!search_exception_tables(regs->ip)) {
24065 + printk(KERN_ERR "PAX: please report this to pageexec@freemail.hu\n");
24066 + bad_area_nosemaphore(regs, error_code, address);
24067 + return;
24068 + }
24069 + if (address < PAX_USER_SHADOW_BASE) {
24070 + printk(KERN_ERR "PAX: please report this to pageexec@freemail.hu\n");
24071 + printk(KERN_ERR "PAX: faulting IP: %pS\n", (void *)regs->ip);
24072 + show_trace_log_lvl(NULL, NULL, (void *)regs->sp, regs->bp, KERN_ERR);
24073 + } else
24074 + address -= PAX_USER_SHADOW_BASE;
24075 + }
24076 +#endif
24077 +
24078 + tsk = current;
24079 + mm = tsk->mm;
24080
24081 /*
24082 * Detect and handle instructions that would cause a page fault for
24083 @@ -1077,7 +1284,7 @@ do_page_fault(struct pt_regs *regs, unsigned long error_code)
24084 * User-mode registers count as a user access even for any
24085 * potential system fault or CPU buglet:
24086 */
24087 - if (user_mode_vm(regs)) {
24088 + if (user_mode(regs)) {
24089 local_irq_enable();
24090 error_code |= PF_USER;
24091 } else {
24092 @@ -1132,6 +1339,11 @@ retry:
24093 might_sleep();
24094 }
24095
24096 +#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_PAGEEXEC)
24097 + if (pax_handle_pageexec_fault(regs, mm, address, error_code))
24098 + return;
24099 +#endif
24100 +
24101 vma = find_vma(mm, address);
24102 if (unlikely(!vma)) {
24103 bad_area(regs, error_code, address);
24104 @@ -1143,18 +1355,24 @@ retry:
24105 bad_area(regs, error_code, address);
24106 return;
24107 }
24108 - if (error_code & PF_USER) {
24109 - /*
24110 - * Accessing the stack below %sp is always a bug.
24111 - * The large cushion allows instructions like enter
24112 - * and pusha to work. ("enter $65535, $31" pushes
24113 - * 32 pointers and then decrements %sp by 65535.)
24114 - */
24115 - if (unlikely(address + 65536 + 32 * sizeof(unsigned long) < regs->sp)) {
24116 - bad_area(regs, error_code, address);
24117 - return;
24118 - }
24119 + /*
24120 + * Accessing the stack below %sp is always a bug.
24121 + * The large cushion allows instructions like enter
24122 + * and pusha to work. ("enter $65535, $31" pushes
24123 + * 32 pointers and then decrements %sp by 65535.)
24124 + */
24125 + if (unlikely(address + 65536 + 32 * sizeof(unsigned long) < task_pt_regs(tsk)->sp)) {
24126 + bad_area(regs, error_code, address);
24127 + return;
24128 }
24129 +
24130 +#ifdef CONFIG_PAX_SEGMEXEC
24131 + if (unlikely((mm->pax_flags & MF_PAX_SEGMEXEC) && vma->vm_end - SEGMEXEC_TASK_SIZE - 1 < address - SEGMEXEC_TASK_SIZE - 1)) {
24132 + bad_area(regs, error_code, address);
24133 + return;
24134 + }
24135 +#endif
24136 +
24137 if (unlikely(expand_stack(vma, address))) {
24138 bad_area(regs, error_code, address);
24139 return;
24140 @@ -1209,3 +1427,292 @@ good_area:
24141
24142 up_read(&mm->mmap_sem);
24143 }
24144 +
24145 +#if defined(CONFIG_PAX_PAGEEXEC) || defined(CONFIG_PAX_SEGMEXEC)
24146 +static bool pax_is_fetch_fault(struct pt_regs *regs, unsigned long error_code, unsigned long address)
24147 +{
24148 + struct mm_struct *mm = current->mm;
24149 + unsigned long ip = regs->ip;
24150 +
24151 + if (v8086_mode(regs))
24152 + ip = ((regs->cs & 0xffff) << 4) + (ip & 0xffff);
24153 +
24154 +#ifdef CONFIG_PAX_PAGEEXEC
24155 + if (mm->pax_flags & MF_PAX_PAGEEXEC) {
24156 + if ((__supported_pte_mask & _PAGE_NX) && (error_code & PF_INSTR))
24157 + return true;
24158 + if (!(error_code & (PF_PROT | PF_WRITE)) && ip == address)
24159 + return true;
24160 + return false;
24161 + }
24162 +#endif
24163 +
24164 +#ifdef CONFIG_PAX_SEGMEXEC
24165 + if (mm->pax_flags & MF_PAX_SEGMEXEC) {
24166 + if (!(error_code & (PF_PROT | PF_WRITE)) && (ip + SEGMEXEC_TASK_SIZE == address))
24167 + return true;
24168 + return false;
24169 + }
24170 +#endif
24171 +
24172 + return false;
24173 +}
24174 +#endif
24175 +
24176 +#ifdef CONFIG_PAX_EMUTRAMP
24177 +static int pax_handle_fetch_fault_32(struct pt_regs *regs)
24178 +{
24179 + int err;
24180 +
24181 + do { /* PaX: libffi trampoline emulation */
24182 + unsigned char mov, jmp;
24183 + unsigned int addr1, addr2;
24184 +
24185 +#ifdef CONFIG_X86_64
24186 + if ((regs->ip + 9) >> 32)
24187 + break;
24188 +#endif
24189 +
24190 + err = get_user(mov, (unsigned char __user *)regs->ip);
24191 + err |= get_user(addr1, (unsigned int __user *)(regs->ip + 1));
24192 + err |= get_user(jmp, (unsigned char __user *)(regs->ip + 5));
24193 + err |= get_user(addr2, (unsigned int __user *)(regs->ip + 6));
24194 +
24195 + if (err)
24196 + break;
24197 +
24198 + if (mov == 0xB8 && jmp == 0xE9) {
24199 + regs->ax = addr1;
24200 + regs->ip = (unsigned int)(regs->ip + addr2 + 10);
24201 + return 2;
24202 + }
24203 + } while (0);
24204 +
24205 + do { /* PaX: gcc trampoline emulation #1 */
24206 + unsigned char mov1, mov2;
24207 + unsigned short jmp;
24208 + unsigned int addr1, addr2;
24209 +
24210 +#ifdef CONFIG_X86_64
24211 + if ((regs->ip + 11) >> 32)
24212 + break;
24213 +#endif
24214 +
24215 + err = get_user(mov1, (unsigned char __user *)regs->ip);
24216 + err |= get_user(addr1, (unsigned int __user *)(regs->ip + 1));
24217 + err |= get_user(mov2, (unsigned char __user *)(regs->ip + 5));
24218 + err |= get_user(addr2, (unsigned int __user *)(regs->ip + 6));
24219 + err |= get_user(jmp, (unsigned short __user *)(regs->ip + 10));
24220 +
24221 + if (err)
24222 + break;
24223 +
24224 + if (mov1 == 0xB9 && mov2 == 0xB8 && jmp == 0xE0FF) {
24225 + regs->cx = addr1;
24226 + regs->ax = addr2;
24227 + regs->ip = addr2;
24228 + return 2;
24229 + }
24230 + } while (0);
24231 +
24232 + do { /* PaX: gcc trampoline emulation #2 */
24233 + unsigned char mov, jmp;
24234 + unsigned int addr1, addr2;
24235 +
24236 +#ifdef CONFIG_X86_64
24237 + if ((regs->ip + 9) >> 32)
24238 + break;
24239 +#endif
24240 +
24241 + err = get_user(mov, (unsigned char __user *)regs->ip);
24242 + err |= get_user(addr1, (unsigned int __user *)(regs->ip + 1));
24243 + err |= get_user(jmp, (unsigned char __user *)(regs->ip + 5));
24244 + err |= get_user(addr2, (unsigned int __user *)(regs->ip + 6));
24245 +
24246 + if (err)
24247 + break;
24248 +
24249 + if (mov == 0xB9 && jmp == 0xE9) {
24250 + regs->cx = addr1;
24251 + regs->ip = (unsigned int)(regs->ip + addr2 + 10);
24252 + return 2;
24253 + }
24254 + } while (0);
24255 +
24256 + return 1; /* PaX in action */
24257 +}
24258 +
24259 +#ifdef CONFIG_X86_64
24260 +static int pax_handle_fetch_fault_64(struct pt_regs *regs)
24261 +{
24262 + int err;
24263 +
24264 + do { /* PaX: libffi trampoline emulation */
24265 + unsigned short mov1, mov2, jmp1;
24266 + unsigned char stcclc, jmp2;
24267 + unsigned long addr1, addr2;
24268 +
24269 + err = get_user(mov1, (unsigned short __user *)regs->ip);
24270 + err |= get_user(addr1, (unsigned long __user *)(regs->ip + 2));
24271 + err |= get_user(mov2, (unsigned short __user *)(regs->ip + 10));
24272 + err |= get_user(addr2, (unsigned long __user *)(regs->ip + 12));
24273 + err |= get_user(stcclc, (unsigned char __user *)(regs->ip + 20));
24274 + err |= get_user(jmp1, (unsigned short __user *)(regs->ip + 21));
24275 + err |= get_user(jmp2, (unsigned char __user *)(regs->ip + 23));
24276 +
24277 + if (err)
24278 + break;
24279 +
24280 + if (mov1 == 0xBB49 && mov2 == 0xBA49 && (stcclc == 0xF8 || stcclc == 0xF9) && jmp1 == 0xFF49 && jmp2 == 0xE3) {
24281 + regs->r11 = addr1;
24282 + regs->r10 = addr2;
24283 + if (stcclc == 0xF8)
24284 + regs->flags &= ~X86_EFLAGS_CF;
24285 + else
24286 + regs->flags |= X86_EFLAGS_CF;
24287 + regs->ip = addr1;
24288 + return 2;
24289 + }
24290 + } while (0);
24291 +
24292 + do { /* PaX: gcc trampoline emulation #1 */
24293 + unsigned short mov1, mov2, jmp1;
24294 + unsigned char jmp2;
24295 + unsigned int addr1;
24296 + unsigned long addr2;
24297 +
24298 + err = get_user(mov1, (unsigned short __user *)regs->ip);
24299 + err |= get_user(addr1, (unsigned int __user *)(regs->ip + 2));
24300 + err |= get_user(mov2, (unsigned short __user *)(regs->ip + 6));
24301 + err |= get_user(addr2, (unsigned long __user *)(regs->ip + 8));
24302 + err |= get_user(jmp1, (unsigned short __user *)(regs->ip + 16));
24303 + err |= get_user(jmp2, (unsigned char __user *)(regs->ip + 18));
24304 +
24305 + if (err)
24306 + break;
24307 +
24308 + if (mov1 == 0xBB41 && mov2 == 0xBA49 && jmp1 == 0xFF49 && jmp2 == 0xE3) {
24309 + regs->r11 = addr1;
24310 + regs->r10 = addr2;
24311 + regs->ip = addr1;
24312 + return 2;
24313 + }
24314 + } while (0);
24315 +
24316 + do { /* PaX: gcc trampoline emulation #2 */
24317 + unsigned short mov1, mov2, jmp1;
24318 + unsigned char jmp2;
24319 + unsigned long addr1, addr2;
24320 +
24321 + err = get_user(mov1, (unsigned short __user *)regs->ip);
24322 + err |= get_user(addr1, (unsigned long __user *)(regs->ip + 2));
24323 + err |= get_user(mov2, (unsigned short __user *)(regs->ip + 10));
24324 + err |= get_user(addr2, (unsigned long __user *)(regs->ip + 12));
24325 + err |= get_user(jmp1, (unsigned short __user *)(regs->ip + 20));
24326 + err |= get_user(jmp2, (unsigned char __user *)(regs->ip + 22));
24327 +
24328 + if (err)
24329 + break;
24330 +
24331 + if (mov1 == 0xBB49 && mov2 == 0xBA49 && jmp1 == 0xFF49 && jmp2 == 0xE3) {
24332 + regs->r11 = addr1;
24333 + regs->r10 = addr2;
24334 + regs->ip = addr1;
24335 + return 2;
24336 + }
24337 + } while (0);
24338 +
24339 + return 1; /* PaX in action */
24340 +}
24341 +#endif
24342 +
24343 +/*
24344 + * PaX: decide what to do with offenders (regs->ip = fault address)
24345 + *
24346 + * returns 1 when task should be killed
24347 + * 2 when gcc trampoline was detected
24348 + */
24349 +static int pax_handle_fetch_fault(struct pt_regs *regs)
24350 +{
24351 + if (v8086_mode(regs))
24352 + return 1;
24353 +
24354 + if (!(current->mm->pax_flags & MF_PAX_EMUTRAMP))
24355 + return 1;
24356 +
24357 +#ifdef CONFIG_X86_32
24358 + return pax_handle_fetch_fault_32(regs);
24359 +#else
24360 + if (regs->cs == __USER32_CS || (regs->cs & SEGMENT_LDT))
24361 + return pax_handle_fetch_fault_32(regs);
24362 + else
24363 + return pax_handle_fetch_fault_64(regs);
24364 +#endif
24365 +}
24366 +#endif
24367 +
24368 +#if defined(CONFIG_PAX_PAGEEXEC) || defined(CONFIG_PAX_SEGMEXEC)
24369 +void pax_report_insns(struct pt_regs *regs, void *pc, void *sp)
24370 +{
24371 + long i;
24372 +
24373 + printk(KERN_ERR "PAX: bytes at PC: ");
24374 + for (i = 0; i < 20; i++) {
24375 + unsigned char c;
24376 + if (get_user(c, (unsigned char __force_user *)pc+i))
24377 + printk(KERN_CONT "?? ");
24378 + else
24379 + printk(KERN_CONT "%02x ", c);
24380 + }
24381 + printk("\n");
24382 +
24383 + printk(KERN_ERR "PAX: bytes at SP-%lu: ", (unsigned long)sizeof(long));
24384 + for (i = -1; i < 80 / (long)sizeof(long); i++) {
24385 + unsigned long c;
24386 + if (get_user(c, (unsigned long __force_user *)sp+i)) {
24387 +#ifdef CONFIG_X86_32
24388 + printk(KERN_CONT "???????? ");
24389 +#else
24390 + if ((regs->cs == __USER32_CS || (regs->cs & SEGMENT_LDT)))
24391 + printk(KERN_CONT "???????? ???????? ");
24392 + else
24393 + printk(KERN_CONT "???????????????? ");
24394 +#endif
24395 + } else {
24396 +#ifdef CONFIG_X86_64
24397 + if ((regs->cs == __USER32_CS || (regs->cs & SEGMENT_LDT))) {
24398 + printk(KERN_CONT "%08x ", (unsigned int)c);
24399 + printk(KERN_CONT "%08x ", (unsigned int)(c >> 32));
24400 + } else
24401 +#endif
24402 + printk(KERN_CONT "%0*lx ", 2 * (int)sizeof(long), c);
24403 + }
24404 + }
24405 + printk("\n");
24406 +}
24407 +#endif
24408 +
24409 +/**
24410 + * probe_kernel_write(): safely attempt to write to a location
24411 + * @dst: address to write to
24412 + * @src: pointer to the data that shall be written
24413 + * @size: size of the data chunk
24414 + *
24415 + * Safely write to address @dst from the buffer at @src. If a kernel fault
24416 + * happens, handle that and return -EFAULT.
24417 + */
24418 +long notrace probe_kernel_write(void *dst, const void *src, size_t size)
24419 +{
24420 + long ret;
24421 + mm_segment_t old_fs = get_fs();
24422 +
24423 + set_fs(KERNEL_DS);
24424 + pagefault_disable();
24425 + pax_open_kernel();
24426 + ret = __copy_to_user_inatomic((void __force_user *)dst, src, size);
24427 + pax_close_kernel();
24428 + pagefault_enable();
24429 + set_fs(old_fs);
24430 +
24431 + return ret ? -EFAULT : 0;
24432 +}
24433 diff --git a/arch/x86/mm/gup.c b/arch/x86/mm/gup.c
24434 index dd74e46..7d26398 100644
24435 --- a/arch/x86/mm/gup.c
24436 +++ b/arch/x86/mm/gup.c
24437 @@ -255,7 +255,7 @@ int __get_user_pages_fast(unsigned long start, int nr_pages, int write,
24438 addr = start;
24439 len = (unsigned long) nr_pages << PAGE_SHIFT;
24440 end = start + len;
24441 - if (unlikely(!access_ok(write ? VERIFY_WRITE : VERIFY_READ,
24442 + if (unlikely(!__access_ok(write ? VERIFY_WRITE : VERIFY_READ,
24443 (void __user *)start, len)))
24444 return 0;
24445
24446 diff --git a/arch/x86/mm/highmem_32.c b/arch/x86/mm/highmem_32.c
24447 index 6f31ee5..8ee4164 100644
24448 --- a/arch/x86/mm/highmem_32.c
24449 +++ b/arch/x86/mm/highmem_32.c
24450 @@ -44,7 +44,11 @@ void *kmap_atomic_prot(struct page *page, pgprot_t prot)
24451 idx = type + KM_TYPE_NR*smp_processor_id();
24452 vaddr = __fix_to_virt(FIX_KMAP_BEGIN + idx);
24453 BUG_ON(!pte_none(*(kmap_pte-idx)));
24454 +
24455 + pax_open_kernel();
24456 set_pte(kmap_pte-idx, mk_pte(page, prot));
24457 + pax_close_kernel();
24458 +
24459 arch_flush_lazy_mmu_mode();
24460
24461 return (void *)vaddr;
24462 diff --git a/arch/x86/mm/hugetlbpage.c b/arch/x86/mm/hugetlbpage.c
24463 index b91e485..d00e7c9 100644
24464 --- a/arch/x86/mm/hugetlbpage.c
24465 +++ b/arch/x86/mm/hugetlbpage.c
24466 @@ -277,13 +277,20 @@ static unsigned long hugetlb_get_unmapped_area_bottomup(struct file *file,
24467 struct hstate *h = hstate_file(file);
24468 struct mm_struct *mm = current->mm;
24469 struct vm_area_struct *vma;
24470 - unsigned long start_addr;
24471 + unsigned long start_addr, pax_task_size = TASK_SIZE;
24472 +
24473 +#ifdef CONFIG_PAX_SEGMEXEC
24474 + if (mm->pax_flags & MF_PAX_SEGMEXEC)
24475 + pax_task_size = SEGMEXEC_TASK_SIZE;
24476 +#endif
24477 +
24478 + pax_task_size -= PAGE_SIZE;
24479
24480 if (len > mm->cached_hole_size) {
24481 - start_addr = mm->free_area_cache;
24482 + start_addr = mm->free_area_cache;
24483 } else {
24484 - start_addr = TASK_UNMAPPED_BASE;
24485 - mm->cached_hole_size = 0;
24486 + start_addr = mm->mmap_base;
24487 + mm->cached_hole_size = 0;
24488 }
24489
24490 full_search:
24491 @@ -291,26 +298,27 @@ full_search:
24492
24493 for (vma = find_vma(mm, addr); ; vma = vma->vm_next) {
24494 /* At this point: (!vma || addr < vma->vm_end). */
24495 - if (TASK_SIZE - len < addr) {
24496 + if (pax_task_size - len < addr) {
24497 /*
24498 * Start a new search - just in case we missed
24499 * some holes.
24500 */
24501 - if (start_addr != TASK_UNMAPPED_BASE) {
24502 - start_addr = TASK_UNMAPPED_BASE;
24503 + if (start_addr != mm->mmap_base) {
24504 + start_addr = mm->mmap_base;
24505 mm->cached_hole_size = 0;
24506 goto full_search;
24507 }
24508 return -ENOMEM;
24509 }
24510 - if (!vma || addr + len <= vma->vm_start) {
24511 - mm->free_area_cache = addr + len;
24512 - return addr;
24513 - }
24514 + if (check_heap_stack_gap(vma, addr, len))
24515 + break;
24516 if (addr + mm->cached_hole_size < vma->vm_start)
24517 mm->cached_hole_size = vma->vm_start - addr;
24518 addr = ALIGN(vma->vm_end, huge_page_size(h));
24519 }
24520 +
24521 + mm->free_area_cache = addr + len;
24522 + return addr;
24523 }
24524
24525 static unsigned long hugetlb_get_unmapped_area_topdown(struct file *file,
24526 @@ -321,9 +329,8 @@ static unsigned long hugetlb_get_unmapped_area_topdown(struct file *file,
24527 struct mm_struct *mm = current->mm;
24528 struct vm_area_struct *vma;
24529 unsigned long base = mm->mmap_base;
24530 - unsigned long addr = addr0;
24531 + unsigned long addr;
24532 unsigned long largest_hole = mm->cached_hole_size;
24533 - unsigned long start_addr;
24534
24535 /* don't allow allocations above current base */
24536 if (mm->free_area_cache > base)
24537 @@ -333,16 +340,15 @@ static unsigned long hugetlb_get_unmapped_area_topdown(struct file *file,
24538 largest_hole = 0;
24539 mm->free_area_cache = base;
24540 }
24541 -try_again:
24542 - start_addr = mm->free_area_cache;
24543
24544 /* make sure it can fit in the remaining address space */
24545 if (mm->free_area_cache < len)
24546 goto fail;
24547
24548 /* either no address requested or can't fit in requested address hole */
24549 - addr = (mm->free_area_cache - len) & huge_page_mask(h);
24550 + addr = mm->free_area_cache - len;
24551 do {
24552 + addr &= huge_page_mask(h);
24553 /*
24554 * Lookup failure means no vma is above this address,
24555 * i.e. return with success:
24556 @@ -351,10 +357,10 @@ try_again:
24557 if (!vma)
24558 return addr;
24559
24560 - if (addr + len <= vma->vm_start) {
24561 + if (check_heap_stack_gap(vma, addr, len)) {
24562 /* remember the address as a hint for next time */
24563 - mm->cached_hole_size = largest_hole;
24564 - return (mm->free_area_cache = addr);
24565 + mm->cached_hole_size = largest_hole;
24566 + return (mm->free_area_cache = addr);
24567 } else if (mm->free_area_cache == vma->vm_end) {
24568 /* pull free_area_cache down to the first hole */
24569 mm->free_area_cache = vma->vm_start;
24570 @@ -363,29 +369,34 @@ try_again:
24571
24572 /* remember the largest hole we saw so far */
24573 if (addr + largest_hole < vma->vm_start)
24574 - largest_hole = vma->vm_start - addr;
24575 + largest_hole = vma->vm_start - addr;
24576
24577 /* try just below the current vma->vm_start */
24578 - addr = (vma->vm_start - len) & huge_page_mask(h);
24579 - } while (len <= vma->vm_start);
24580 + addr = skip_heap_stack_gap(vma, len);
24581 + } while (!IS_ERR_VALUE(addr));
24582
24583 fail:
24584 /*
24585 - * if hint left us with no space for the requested
24586 - * mapping then try again:
24587 - */
24588 - if (start_addr != base) {
24589 - mm->free_area_cache = base;
24590 - largest_hole = 0;
24591 - goto try_again;
24592 - }
24593 - /*
24594 * A failed mmap() very likely causes application failure,
24595 * so fall back to the bottom-up function here. This scenario
24596 * can happen with large stack limits and large mmap()
24597 * allocations.
24598 */
24599 - mm->free_area_cache = TASK_UNMAPPED_BASE;
24600 +
24601 +#ifdef CONFIG_PAX_SEGMEXEC
24602 + if (mm->pax_flags & MF_PAX_SEGMEXEC)
24603 + mm->mmap_base = SEGMEXEC_TASK_UNMAPPED_BASE;
24604 + else
24605 +#endif
24606 +
24607 + mm->mmap_base = TASK_UNMAPPED_BASE;
24608 +
24609 +#ifdef CONFIG_PAX_RANDMMAP
24610 + if (mm->pax_flags & MF_PAX_RANDMMAP)
24611 + mm->mmap_base += mm->delta_mmap;
24612 +#endif
24613 +
24614 + mm->free_area_cache = mm->mmap_base;
24615 mm->cached_hole_size = ~0UL;
24616 addr = hugetlb_get_unmapped_area_bottomup(file, addr0,
24617 len, pgoff, flags);
24618 @@ -393,6 +404,7 @@ fail:
24619 /*
24620 * Restore the topdown base:
24621 */
24622 + mm->mmap_base = base;
24623 mm->free_area_cache = base;
24624 mm->cached_hole_size = ~0UL;
24625
24626 @@ -406,10 +418,19 @@ hugetlb_get_unmapped_area(struct file *file, unsigned long addr,
24627 struct hstate *h = hstate_file(file);
24628 struct mm_struct *mm = current->mm;
24629 struct vm_area_struct *vma;
24630 + unsigned long pax_task_size = TASK_SIZE;
24631
24632 if (len & ~huge_page_mask(h))
24633 return -EINVAL;
24634 - if (len > TASK_SIZE)
24635 +
24636 +#ifdef CONFIG_PAX_SEGMEXEC
24637 + if (mm->pax_flags & MF_PAX_SEGMEXEC)
24638 + pax_task_size = SEGMEXEC_TASK_SIZE;
24639 +#endif
24640 +
24641 + pax_task_size -= PAGE_SIZE;
24642 +
24643 + if (len > pax_task_size)
24644 return -ENOMEM;
24645
24646 if (flags & MAP_FIXED) {
24647 @@ -421,8 +442,7 @@ hugetlb_get_unmapped_area(struct file *file, unsigned long addr,
24648 if (addr) {
24649 addr = ALIGN(addr, huge_page_size(h));
24650 vma = find_vma(mm, addr);
24651 - if (TASK_SIZE - len >= addr &&
24652 - (!vma || addr + len <= vma->vm_start))
24653 + if (pax_task_size - len >= addr && check_heap_stack_gap(vma, addr, len))
24654 return addr;
24655 }
24656 if (mm->get_unmapped_area == arch_get_unmapped_area)
24657 diff --git a/arch/x86/mm/init.c b/arch/x86/mm/init.c
24658 index d7aea41..0fc945b 100644
24659 --- a/arch/x86/mm/init.c
24660 +++ b/arch/x86/mm/init.c
24661 @@ -4,6 +4,7 @@
24662 #include <linux/swap.h>
24663 #include <linux/memblock.h>
24664 #include <linux/bootmem.h> /* for max_low_pfn */
24665 +#include <linux/tboot.h>
24666
24667 #include <asm/cacheflush.h>
24668 #include <asm/e820.h>
24669 @@ -16,6 +17,8 @@
24670 #include <asm/tlb.h>
24671 #include <asm/proto.h>
24672 #include <asm/dma.h> /* for MAX_DMA_PFN */
24673 +#include <asm/desc.h>
24674 +#include <asm/bios_ebda.h>
24675
24676 unsigned long __initdata pgt_buf_start;
24677 unsigned long __meminitdata pgt_buf_end;
24678 @@ -44,7 +47,7 @@ static void __init find_early_table_space(struct map_range *mr, int nr_range)
24679 {
24680 int i;
24681 unsigned long puds = 0, pmds = 0, ptes = 0, tables;
24682 - unsigned long start = 0, good_end;
24683 + unsigned long start = 0x100000, good_end;
24684 phys_addr_t base;
24685
24686 for (i = 0; i < nr_range; i++) {
24687 @@ -321,10 +324,40 @@ unsigned long __init_refok init_memory_mapping(unsigned long start,
24688 * Access has to be given to non-kernel-ram areas as well, these contain the PCI
24689 * mmio resources as well as potential bios/acpi data regions.
24690 */
24691 +
24692 +#ifdef CONFIG_GRKERNSEC_KMEM
24693 +static unsigned int ebda_start __read_only;
24694 +static unsigned int ebda_end __read_only;
24695 +#endif
24696 +
24697 int devmem_is_allowed(unsigned long pagenr)
24698 {
24699 - if (pagenr < 256)
24700 +#ifdef CONFIG_GRKERNSEC_KMEM
24701 + /* allow BDA */
24702 + if (!pagenr)
24703 return 1;
24704 + /* allow EBDA */
24705 + if (pagenr >= ebda_start && pagenr < ebda_end)
24706 + return 1;
24707 + /* if tboot is in use, allow access to its hardcoded serial log range */
24708 + if (tboot_enabled() && ((0x60000 >> PAGE_SHIFT) <= pagenr) && (pagenr < (0x68000 >> PAGE_SHIFT)))
24709 + return 1;
24710 +#else
24711 + if (!pagenr)
24712 + return 1;
24713 +#ifdef CONFIG_VM86
24714 + if (pagenr < (ISA_START_ADDRESS >> PAGE_SHIFT))
24715 + return 1;
24716 +#endif
24717 +#endif
24718 +
24719 + if ((ISA_START_ADDRESS >> PAGE_SHIFT) <= pagenr && pagenr < (ISA_END_ADDRESS >> PAGE_SHIFT))
24720 + return 1;
24721 +#ifdef CONFIG_GRKERNSEC_KMEM
24722 + /* throw out everything else below 1MB */
24723 + if (pagenr <= 256)
24724 + return 0;
24725 +#endif
24726 if (iomem_is_exclusive(pagenr << PAGE_SHIFT))
24727 return 0;
24728 if (!page_is_ram(pagenr))
24729 @@ -381,8 +414,117 @@ void free_init_pages(char *what, unsigned long begin, unsigned long end)
24730 #endif
24731 }
24732
24733 +#ifdef CONFIG_GRKERNSEC_KMEM
24734 +static inline void gr_init_ebda(void)
24735 +{
24736 + unsigned int ebda_addr;
24737 + unsigned int ebda_size = 0;
24738 +
24739 + ebda_addr = get_bios_ebda();
24740 + if (ebda_addr) {
24741 + ebda_size = *(unsigned char *)phys_to_virt(ebda_addr);
24742 + ebda_size <<= 10;
24743 + }
24744 + if (ebda_addr && ebda_size) {
24745 + ebda_start = ebda_addr >> PAGE_SHIFT;
24746 + ebda_end = min((unsigned int)PAGE_ALIGN(ebda_addr + ebda_size), (unsigned int)0xa0000) >> PAGE_SHIFT;
24747 + } else {
24748 + ebda_start = 0x9f000 >> PAGE_SHIFT;
24749 + ebda_end = 0xa0000 >> PAGE_SHIFT;
24750 + }
24751 +}
24752 +#else
24753 +static inline void gr_init_ebda(void) { }
24754 +#endif
24755 +
24756 void free_initmem(void)
24757 {
24758 +#ifdef CONFIG_PAX_KERNEXEC
24759 +#ifdef CONFIG_X86_32
24760 + /* PaX: limit KERNEL_CS to actual size */
24761 + unsigned long addr, limit;
24762 + struct desc_struct d;
24763 + int cpu;
24764 +#else
24765 + pgd_t *pgd;
24766 + pud_t *pud;
24767 + pmd_t *pmd;
24768 + unsigned long addr, end;
24769 +#endif
24770 +#endif
24771 +
24772 + gr_init_ebda();
24773 +
24774 +#ifdef CONFIG_PAX_KERNEXEC
24775 +#ifdef CONFIG_X86_32
24776 + limit = paravirt_enabled() ? ktva_ktla(0xffffffff) : (unsigned long)&_etext;
24777 + limit = (limit - 1UL) >> PAGE_SHIFT;
24778 +
24779 + memset(__LOAD_PHYSICAL_ADDR + PAGE_OFFSET, POISON_FREE_INITMEM, PAGE_SIZE);
24780 + for (cpu = 0; cpu < nr_cpu_ids; cpu++) {
24781 + pack_descriptor(&d, get_desc_base(&get_cpu_gdt_table(cpu)[GDT_ENTRY_KERNEL_CS]), limit, 0x9B, 0xC);
24782 + write_gdt_entry(get_cpu_gdt_table(cpu), GDT_ENTRY_KERNEL_CS, &d, DESCTYPE_S);
24783 + write_gdt_entry(get_cpu_gdt_table(cpu), GDT_ENTRY_KERNEXEC_KERNEL_CS, &d, DESCTYPE_S);
24784 + }
24785 +
24786 + /* PaX: make KERNEL_CS read-only */
24787 + addr = PFN_ALIGN(ktla_ktva((unsigned long)&_text));
24788 + if (!paravirt_enabled())
24789 + set_memory_ro(addr, (PFN_ALIGN(_sdata) - addr) >> PAGE_SHIFT);
24790 +/*
24791 + for (addr = ktla_ktva((unsigned long)&_text); addr < (unsigned long)&_sdata; addr += PMD_SIZE) {
24792 + pgd = pgd_offset_k(addr);
24793 + pud = pud_offset(pgd, addr);
24794 + pmd = pmd_offset(pud, addr);
24795 + set_pmd(pmd, __pmd(pmd_val(*pmd) & ~_PAGE_RW));
24796 + }
24797 +*/
24798 +#ifdef CONFIG_X86_PAE
24799 + set_memory_nx(PFN_ALIGN(__init_begin), (PFN_ALIGN(__init_end) - PFN_ALIGN(__init_begin)) >> PAGE_SHIFT);
24800 +/*
24801 + for (addr = (unsigned long)&__init_begin; addr < (unsigned long)&__init_end; addr += PMD_SIZE) {
24802 + pgd = pgd_offset_k(addr);
24803 + pud = pud_offset(pgd, addr);
24804 + pmd = pmd_offset(pud, addr);
24805 + set_pmd(pmd, __pmd(pmd_val(*pmd) | (_PAGE_NX & __supported_pte_mask)));
24806 + }
24807 +*/
24808 +#endif
24809 +
24810 +#ifdef CONFIG_MODULES
24811 + set_memory_4k((unsigned long)MODULES_EXEC_VADDR, (MODULES_EXEC_END - MODULES_EXEC_VADDR) >> PAGE_SHIFT);
24812 +#endif
24813 +
24814 +#else
24815 + /* PaX: make kernel code/rodata read-only, rest non-executable */
24816 + for (addr = __START_KERNEL_map; addr < __START_KERNEL_map + KERNEL_IMAGE_SIZE; addr += PMD_SIZE) {
24817 + pgd = pgd_offset_k(addr);
24818 + pud = pud_offset(pgd, addr);
24819 + pmd = pmd_offset(pud, addr);
24820 + if (!pmd_present(*pmd))
24821 + continue;
24822 + if ((unsigned long)_text <= addr && addr < (unsigned long)_sdata)
24823 + set_pmd(pmd, __pmd(pmd_val(*pmd) & ~_PAGE_RW));
24824 + else
24825 + set_pmd(pmd, __pmd(pmd_val(*pmd) | (_PAGE_NX & __supported_pte_mask)));
24826 + }
24827 +
24828 + addr = (unsigned long)__va(__pa(__START_KERNEL_map));
24829 + end = addr + KERNEL_IMAGE_SIZE;
24830 + for (; addr < end; addr += PMD_SIZE) {
24831 + pgd = pgd_offset_k(addr);
24832 + pud = pud_offset(pgd, addr);
24833 + pmd = pmd_offset(pud, addr);
24834 + if (!pmd_present(*pmd))
24835 + continue;
24836 + if ((unsigned long)__va(__pa(_text)) <= addr && addr < (unsigned long)__va(__pa(_sdata)))
24837 + set_pmd(pmd, __pmd(pmd_val(*pmd) & ~_PAGE_RW));
24838 + }
24839 +#endif
24840 +
24841 + flush_tlb_all();
24842 +#endif
24843 +
24844 free_init_pages("unused kernel memory",
24845 (unsigned long)(&__init_begin),
24846 (unsigned long)(&__init_end));
24847 diff --git a/arch/x86/mm/init_32.c b/arch/x86/mm/init_32.c
24848 index 575d86f..4987469 100644
24849 --- a/arch/x86/mm/init_32.c
24850 +++ b/arch/x86/mm/init_32.c
24851 @@ -73,36 +73,6 @@ static __init void *alloc_low_page(void)
24852 }
24853
24854 /*
24855 - * Creates a middle page table and puts a pointer to it in the
24856 - * given global directory entry. This only returns the gd entry
24857 - * in non-PAE compilation mode, since the middle layer is folded.
24858 - */
24859 -static pmd_t * __init one_md_table_init(pgd_t *pgd)
24860 -{
24861 - pud_t *pud;
24862 - pmd_t *pmd_table;
24863 -
24864 -#ifdef CONFIG_X86_PAE
24865 - if (!(pgd_val(*pgd) & _PAGE_PRESENT)) {
24866 - if (after_bootmem)
24867 - pmd_table = (pmd_t *)alloc_bootmem_pages(PAGE_SIZE);
24868 - else
24869 - pmd_table = (pmd_t *)alloc_low_page();
24870 - paravirt_alloc_pmd(&init_mm, __pa(pmd_table) >> PAGE_SHIFT);
24871 - set_pgd(pgd, __pgd(__pa(pmd_table) | _PAGE_PRESENT));
24872 - pud = pud_offset(pgd, 0);
24873 - BUG_ON(pmd_table != pmd_offset(pud, 0));
24874 -
24875 - return pmd_table;
24876 - }
24877 -#endif
24878 - pud = pud_offset(pgd, 0);
24879 - pmd_table = pmd_offset(pud, 0);
24880 -
24881 - return pmd_table;
24882 -}
24883 -
24884 -/*
24885 * Create a page table and place a pointer to it in a middle page
24886 * directory entry:
24887 */
24888 @@ -122,13 +92,28 @@ static pte_t * __init one_page_table_init(pmd_t *pmd)
24889 page_table = (pte_t *)alloc_low_page();
24890
24891 paravirt_alloc_pte(&init_mm, __pa(page_table) >> PAGE_SHIFT);
24892 +#if defined(CONFIG_PAX_PAGEEXEC) || defined(CONFIG_PAX_SEGMEXEC)
24893 + set_pmd(pmd, __pmd(__pa(page_table) | _KERNPG_TABLE));
24894 +#else
24895 set_pmd(pmd, __pmd(__pa(page_table) | _PAGE_TABLE));
24896 +#endif
24897 BUG_ON(page_table != pte_offset_kernel(pmd, 0));
24898 }
24899
24900 return pte_offset_kernel(pmd, 0);
24901 }
24902
24903 +static pmd_t * __init one_md_table_init(pgd_t *pgd)
24904 +{
24905 + pud_t *pud;
24906 + pmd_t *pmd_table;
24907 +
24908 + pud = pud_offset(pgd, 0);
24909 + pmd_table = pmd_offset(pud, 0);
24910 +
24911 + return pmd_table;
24912 +}
24913 +
24914 pmd_t * __init populate_extra_pmd(unsigned long vaddr)
24915 {
24916 int pgd_idx = pgd_index(vaddr);
24917 @@ -202,6 +187,7 @@ page_table_range_init(unsigned long start, unsigned long end, pgd_t *pgd_base)
24918 int pgd_idx, pmd_idx;
24919 unsigned long vaddr;
24920 pgd_t *pgd;
24921 + pud_t *pud;
24922 pmd_t *pmd;
24923 pte_t *pte = NULL;
24924
24925 @@ -211,8 +197,13 @@ page_table_range_init(unsigned long start, unsigned long end, pgd_t *pgd_base)
24926 pgd = pgd_base + pgd_idx;
24927
24928 for ( ; (pgd_idx < PTRS_PER_PGD) && (vaddr != end); pgd++, pgd_idx++) {
24929 - pmd = one_md_table_init(pgd);
24930 - pmd = pmd + pmd_index(vaddr);
24931 + pud = pud_offset(pgd, vaddr);
24932 + pmd = pmd_offset(pud, vaddr);
24933 +
24934 +#ifdef CONFIG_X86_PAE
24935 + paravirt_alloc_pmd(&init_mm, __pa(pmd) >> PAGE_SHIFT);
24936 +#endif
24937 +
24938 for (; (pmd_idx < PTRS_PER_PMD) && (vaddr != end);
24939 pmd++, pmd_idx++) {
24940 pte = page_table_kmap_check(one_page_table_init(pmd),
24941 @@ -224,11 +215,20 @@ page_table_range_init(unsigned long start, unsigned long end, pgd_t *pgd_base)
24942 }
24943 }
24944
24945 -static inline int is_kernel_text(unsigned long addr)
24946 +static inline int is_kernel_text(unsigned long start, unsigned long end)
24947 {
24948 - if (addr >= (unsigned long)_text && addr <= (unsigned long)__init_end)
24949 - return 1;
24950 - return 0;
24951 + if ((start > ktla_ktva((unsigned long)_etext) ||
24952 + end <= ktla_ktva((unsigned long)_stext)) &&
24953 + (start > ktla_ktva((unsigned long)_einittext) ||
24954 + end <= ktla_ktva((unsigned long)_sinittext)) &&
24955 +
24956 +#ifdef CONFIG_ACPI_SLEEP
24957 + (start > (unsigned long)__va(acpi_wakeup_address) + 0x4000 || end <= (unsigned long)__va(acpi_wakeup_address)) &&
24958 +#endif
24959 +
24960 + (start > (unsigned long)__va(0xfffff) || end <= (unsigned long)__va(0xc0000)))
24961 + return 0;
24962 + return 1;
24963 }
24964
24965 /*
24966 @@ -245,9 +245,10 @@ kernel_physical_mapping_init(unsigned long start,
24967 unsigned long last_map_addr = end;
24968 unsigned long start_pfn, end_pfn;
24969 pgd_t *pgd_base = swapper_pg_dir;
24970 - int pgd_idx, pmd_idx, pte_ofs;
24971 + unsigned int pgd_idx, pmd_idx, pte_ofs;
24972 unsigned long pfn;
24973 pgd_t *pgd;
24974 + pud_t *pud;
24975 pmd_t *pmd;
24976 pte_t *pte;
24977 unsigned pages_2m, pages_4k;
24978 @@ -280,8 +281,13 @@ repeat:
24979 pfn = start_pfn;
24980 pgd_idx = pgd_index((pfn<<PAGE_SHIFT) + PAGE_OFFSET);
24981 pgd = pgd_base + pgd_idx;
24982 - for (; pgd_idx < PTRS_PER_PGD; pgd++, pgd_idx++) {
24983 - pmd = one_md_table_init(pgd);
24984 + for (; pgd_idx < PTRS_PER_PGD && pfn < max_low_pfn; pgd++, pgd_idx++) {
24985 + pud = pud_offset(pgd, 0);
24986 + pmd = pmd_offset(pud, 0);
24987 +
24988 +#ifdef CONFIG_X86_PAE
24989 + paravirt_alloc_pmd(&init_mm, __pa(pmd) >> PAGE_SHIFT);
24990 +#endif
24991
24992 if (pfn >= end_pfn)
24993 continue;
24994 @@ -293,14 +299,13 @@ repeat:
24995 #endif
24996 for (; pmd_idx < PTRS_PER_PMD && pfn < end_pfn;
24997 pmd++, pmd_idx++) {
24998 - unsigned int addr = pfn * PAGE_SIZE + PAGE_OFFSET;
24999 + unsigned long address = pfn * PAGE_SIZE + PAGE_OFFSET;
25000
25001 /*
25002 * Map with big pages if possible, otherwise
25003 * create normal page tables:
25004 */
25005 if (use_pse) {
25006 - unsigned int addr2;
25007 pgprot_t prot = PAGE_KERNEL_LARGE;
25008 /*
25009 * first pass will use the same initial
25010 @@ -310,11 +315,7 @@ repeat:
25011 __pgprot(PTE_IDENT_ATTR |
25012 _PAGE_PSE);
25013
25014 - addr2 = (pfn + PTRS_PER_PTE-1) * PAGE_SIZE +
25015 - PAGE_OFFSET + PAGE_SIZE-1;
25016 -
25017 - if (is_kernel_text(addr) ||
25018 - is_kernel_text(addr2))
25019 + if (is_kernel_text(address, address + PMD_SIZE))
25020 prot = PAGE_KERNEL_LARGE_EXEC;
25021
25022 pages_2m++;
25023 @@ -331,7 +332,7 @@ repeat:
25024 pte_ofs = pte_index((pfn<<PAGE_SHIFT) + PAGE_OFFSET);
25025 pte += pte_ofs;
25026 for (; pte_ofs < PTRS_PER_PTE && pfn < end_pfn;
25027 - pte++, pfn++, pte_ofs++, addr += PAGE_SIZE) {
25028 + pte++, pfn++, pte_ofs++, address += PAGE_SIZE) {
25029 pgprot_t prot = PAGE_KERNEL;
25030 /*
25031 * first pass will use the same initial
25032 @@ -339,7 +340,7 @@ repeat:
25033 */
25034 pgprot_t init_prot = __pgprot(PTE_IDENT_ATTR);
25035
25036 - if (is_kernel_text(addr))
25037 + if (is_kernel_text(address, address + PAGE_SIZE))
25038 prot = PAGE_KERNEL_EXEC;
25039
25040 pages_4k++;
25041 @@ -465,7 +466,7 @@ void __init native_pagetable_setup_start(pgd_t *base)
25042
25043 pud = pud_offset(pgd, va);
25044 pmd = pmd_offset(pud, va);
25045 - if (!pmd_present(*pmd))
25046 + if (!pmd_present(*pmd) || pmd_huge(*pmd))
25047 break;
25048
25049 pte = pte_offset_kernel(pmd, va);
25050 @@ -517,12 +518,10 @@ void __init early_ioremap_page_table_range_init(void)
25051
25052 static void __init pagetable_init(void)
25053 {
25054 - pgd_t *pgd_base = swapper_pg_dir;
25055 -
25056 - permanent_kmaps_init(pgd_base);
25057 + permanent_kmaps_init(swapper_pg_dir);
25058 }
25059
25060 -pteval_t __supported_pte_mask __read_mostly = ~(_PAGE_NX | _PAGE_GLOBAL | _PAGE_IOMAP);
25061 +pteval_t __supported_pte_mask __read_only = ~(_PAGE_NX | _PAGE_GLOBAL | _PAGE_IOMAP);
25062 EXPORT_SYMBOL_GPL(__supported_pte_mask);
25063
25064 /* user-defined highmem size */
25065 @@ -734,6 +733,12 @@ void __init mem_init(void)
25066
25067 pci_iommu_alloc();
25068
25069 +#ifdef CONFIG_PAX_PER_CPU_PGD
25070 + clone_pgd_range(get_cpu_pgd(0) + KERNEL_PGD_BOUNDARY,
25071 + swapper_pg_dir + KERNEL_PGD_BOUNDARY,
25072 + KERNEL_PGD_PTRS);
25073 +#endif
25074 +
25075 #ifdef CONFIG_FLATMEM
25076 BUG_ON(!mem_map);
25077 #endif
25078 @@ -760,7 +765,7 @@ void __init mem_init(void)
25079 reservedpages++;
25080
25081 codesize = (unsigned long) &_etext - (unsigned long) &_text;
25082 - datasize = (unsigned long) &_edata - (unsigned long) &_etext;
25083 + datasize = (unsigned long) &_edata - (unsigned long) &_sdata;
25084 initsize = (unsigned long) &__init_end - (unsigned long) &__init_begin;
25085
25086 printk(KERN_INFO "Memory: %luk/%luk available (%dk kernel code, "
25087 @@ -801,10 +806,10 @@ void __init mem_init(void)
25088 ((unsigned long)&__init_end -
25089 (unsigned long)&__init_begin) >> 10,
25090
25091 - (unsigned long)&_etext, (unsigned long)&_edata,
25092 - ((unsigned long)&_edata - (unsigned long)&_etext) >> 10,
25093 + (unsigned long)&_sdata, (unsigned long)&_edata,
25094 + ((unsigned long)&_edata - (unsigned long)&_sdata) >> 10,
25095
25096 - (unsigned long)&_text, (unsigned long)&_etext,
25097 + ktla_ktva((unsigned long)&_text), ktla_ktva((unsigned long)&_etext),
25098 ((unsigned long)&_etext - (unsigned long)&_text) >> 10);
25099
25100 /*
25101 @@ -882,6 +887,7 @@ void set_kernel_text_rw(void)
25102 if (!kernel_set_to_readonly)
25103 return;
25104
25105 + start = ktla_ktva(start);
25106 pr_debug("Set kernel text: %lx - %lx for read write\n",
25107 start, start+size);
25108
25109 @@ -896,6 +902,7 @@ void set_kernel_text_ro(void)
25110 if (!kernel_set_to_readonly)
25111 return;
25112
25113 + start = ktla_ktva(start);
25114 pr_debug("Set kernel text: %lx - %lx for read only\n",
25115 start, start+size);
25116
25117 @@ -924,6 +931,7 @@ void mark_rodata_ro(void)
25118 unsigned long start = PFN_ALIGN(_text);
25119 unsigned long size = PFN_ALIGN(_etext) - start;
25120
25121 + start = ktla_ktva(start);
25122 set_pages_ro(virt_to_page(start), size >> PAGE_SHIFT);
25123 printk(KERN_INFO "Write protecting the kernel text: %luk\n",
25124 size >> 10);
25125 diff --git a/arch/x86/mm/init_64.c b/arch/x86/mm/init_64.c
25126 index 3baff25..8b37564 100644
25127 --- a/arch/x86/mm/init_64.c
25128 +++ b/arch/x86/mm/init_64.c
25129 @@ -74,7 +74,7 @@ early_param("gbpages", parse_direct_gbpages_on);
25130 * around without checking the pgd every time.
25131 */
25132
25133 -pteval_t __supported_pte_mask __read_mostly = ~_PAGE_IOMAP;
25134 +pteval_t __supported_pte_mask __read_only = ~(_PAGE_NX | _PAGE_IOMAP);
25135 EXPORT_SYMBOL_GPL(__supported_pte_mask);
25136
25137 int force_personality32;
25138 @@ -107,12 +107,22 @@ void sync_global_pgds(unsigned long start, unsigned long end)
25139
25140 for (address = start; address <= end; address += PGDIR_SIZE) {
25141 const pgd_t *pgd_ref = pgd_offset_k(address);
25142 +
25143 +#ifdef CONFIG_PAX_PER_CPU_PGD
25144 + unsigned long cpu;
25145 +#else
25146 struct page *page;
25147 +#endif
25148
25149 if (pgd_none(*pgd_ref))
25150 continue;
25151
25152 spin_lock(&pgd_lock);
25153 +
25154 +#ifdef CONFIG_PAX_PER_CPU_PGD
25155 + for (cpu = 0; cpu < nr_cpu_ids; ++cpu) {
25156 + pgd_t *pgd = pgd_offset_cpu(cpu, address);
25157 +#else
25158 list_for_each_entry(page, &pgd_list, lru) {
25159 pgd_t *pgd;
25160 spinlock_t *pgt_lock;
25161 @@ -121,6 +131,7 @@ void sync_global_pgds(unsigned long start, unsigned long end)
25162 /* the pgt_lock only for Xen */
25163 pgt_lock = &pgd_page_get_mm(page)->page_table_lock;
25164 spin_lock(pgt_lock);
25165 +#endif
25166
25167 if (pgd_none(*pgd))
25168 set_pgd(pgd, *pgd_ref);
25169 @@ -128,7 +139,10 @@ void sync_global_pgds(unsigned long start, unsigned long end)
25170 BUG_ON(pgd_page_vaddr(*pgd)
25171 != pgd_page_vaddr(*pgd_ref));
25172
25173 +#ifndef CONFIG_PAX_PER_CPU_PGD
25174 spin_unlock(pgt_lock);
25175 +#endif
25176 +
25177 }
25178 spin_unlock(&pgd_lock);
25179 }
25180 @@ -161,7 +175,7 @@ static pud_t *fill_pud(pgd_t *pgd, unsigned long vaddr)
25181 {
25182 if (pgd_none(*pgd)) {
25183 pud_t *pud = (pud_t *)spp_getpage();
25184 - pgd_populate(&init_mm, pgd, pud);
25185 + pgd_populate_kernel(&init_mm, pgd, pud);
25186 if (pud != pud_offset(pgd, 0))
25187 printk(KERN_ERR "PAGETABLE BUG #00! %p <-> %p\n",
25188 pud, pud_offset(pgd, 0));
25189 @@ -173,7 +187,7 @@ static pmd_t *fill_pmd(pud_t *pud, unsigned long vaddr)
25190 {
25191 if (pud_none(*pud)) {
25192 pmd_t *pmd = (pmd_t *) spp_getpage();
25193 - pud_populate(&init_mm, pud, pmd);
25194 + pud_populate_kernel(&init_mm, pud, pmd);
25195 if (pmd != pmd_offset(pud, 0))
25196 printk(KERN_ERR "PAGETABLE BUG #01! %p <-> %p\n",
25197 pmd, pmd_offset(pud, 0));
25198 @@ -202,7 +216,9 @@ void set_pte_vaddr_pud(pud_t *pud_page, unsigned long vaddr, pte_t new_pte)
25199 pmd = fill_pmd(pud, vaddr);
25200 pte = fill_pte(pmd, vaddr);
25201
25202 + pax_open_kernel();
25203 set_pte(pte, new_pte);
25204 + pax_close_kernel();
25205
25206 /*
25207 * It's enough to flush this one mapping.
25208 @@ -261,14 +277,12 @@ static void __init __init_extra_mapping(unsigned long phys, unsigned long size,
25209 pgd = pgd_offset_k((unsigned long)__va(phys));
25210 if (pgd_none(*pgd)) {
25211 pud = (pud_t *) spp_getpage();
25212 - set_pgd(pgd, __pgd(__pa(pud) | _KERNPG_TABLE |
25213 - _PAGE_USER));
25214 + set_pgd(pgd, __pgd(__pa(pud) | _PAGE_TABLE));
25215 }
25216 pud = pud_offset(pgd, (unsigned long)__va(phys));
25217 if (pud_none(*pud)) {
25218 pmd = (pmd_t *) spp_getpage();
25219 - set_pud(pud, __pud(__pa(pmd) | _KERNPG_TABLE |
25220 - _PAGE_USER));
25221 + set_pud(pud, __pud(__pa(pmd) | _PAGE_TABLE));
25222 }
25223 pmd = pmd_offset(pud, phys);
25224 BUG_ON(!pmd_none(*pmd));
25225 @@ -329,7 +343,7 @@ static __ref void *alloc_low_page(unsigned long *phys)
25226 if (pfn >= pgt_buf_top)
25227 panic("alloc_low_page: ran out of memory");
25228
25229 - adr = early_memremap(pfn * PAGE_SIZE, PAGE_SIZE);
25230 + adr = (void __force_kernel *)early_memremap(pfn * PAGE_SIZE, PAGE_SIZE);
25231 clear_page(adr);
25232 *phys = pfn * PAGE_SIZE;
25233 return adr;
25234 @@ -345,7 +359,7 @@ static __ref void *map_low_page(void *virt)
25235
25236 phys = __pa(virt);
25237 left = phys & (PAGE_SIZE - 1);
25238 - adr = early_memremap(phys & PAGE_MASK, PAGE_SIZE);
25239 + adr = (void __force_kernel *)early_memremap(phys & PAGE_MASK, PAGE_SIZE);
25240 adr = (void *)(((unsigned long)adr) | left);
25241
25242 return adr;
25243 @@ -553,7 +567,7 @@ phys_pud_init(pud_t *pud_page, unsigned long addr, unsigned long end,
25244 unmap_low_page(pmd);
25245
25246 spin_lock(&init_mm.page_table_lock);
25247 - pud_populate(&init_mm, pud, __va(pmd_phys));
25248 + pud_populate_kernel(&init_mm, pud, __va(pmd_phys));
25249 spin_unlock(&init_mm.page_table_lock);
25250 }
25251 __flush_tlb_all();
25252 @@ -599,7 +613,7 @@ kernel_physical_mapping_init(unsigned long start,
25253 unmap_low_page(pud);
25254
25255 spin_lock(&init_mm.page_table_lock);
25256 - pgd_populate(&init_mm, pgd, __va(pud_phys));
25257 + pgd_populate_kernel(&init_mm, pgd, __va(pud_phys));
25258 spin_unlock(&init_mm.page_table_lock);
25259 pgd_changed = true;
25260 }
25261 @@ -691,6 +705,12 @@ void __init mem_init(void)
25262
25263 pci_iommu_alloc();
25264
25265 +#ifdef CONFIG_PAX_PER_CPU_PGD
25266 + clone_pgd_range(get_cpu_pgd(0) + KERNEL_PGD_BOUNDARY,
25267 + swapper_pg_dir + KERNEL_PGD_BOUNDARY,
25268 + KERNEL_PGD_PTRS);
25269 +#endif
25270 +
25271 /* clear_bss() already clear the empty_zero_page */
25272
25273 reservedpages = 0;
25274 @@ -851,8 +871,8 @@ int kern_addr_valid(unsigned long addr)
25275 static struct vm_area_struct gate_vma = {
25276 .vm_start = VSYSCALL_START,
25277 .vm_end = VSYSCALL_START + (VSYSCALL_MAPPED_PAGES * PAGE_SIZE),
25278 - .vm_page_prot = PAGE_READONLY_EXEC,
25279 - .vm_flags = VM_READ | VM_EXEC
25280 + .vm_page_prot = PAGE_READONLY,
25281 + .vm_flags = VM_READ
25282 };
25283
25284 struct vm_area_struct *get_gate_vma(struct mm_struct *mm)
25285 @@ -886,7 +906,7 @@ int in_gate_area_no_mm(unsigned long addr)
25286
25287 const char *arch_vma_name(struct vm_area_struct *vma)
25288 {
25289 - if (vma->vm_mm && vma->vm_start == (long)vma->vm_mm->context.vdso)
25290 + if (vma->vm_mm && vma->vm_start == vma->vm_mm->context.vdso)
25291 return "[vdso]";
25292 if (vma == &gate_vma)
25293 return "[vsyscall]";
25294 diff --git a/arch/x86/mm/iomap_32.c b/arch/x86/mm/iomap_32.c
25295 index 7b179b4..6bd1777 100644
25296 --- a/arch/x86/mm/iomap_32.c
25297 +++ b/arch/x86/mm/iomap_32.c
25298 @@ -64,7 +64,11 @@ void *kmap_atomic_prot_pfn(unsigned long pfn, pgprot_t prot)
25299 type = kmap_atomic_idx_push();
25300 idx = type + KM_TYPE_NR * smp_processor_id();
25301 vaddr = __fix_to_virt(FIX_KMAP_BEGIN + idx);
25302 +
25303 + pax_open_kernel();
25304 set_pte(kmap_pte - idx, pfn_pte(pfn, prot));
25305 + pax_close_kernel();
25306 +
25307 arch_flush_lazy_mmu_mode();
25308
25309 return (void *)vaddr;
25310 diff --git a/arch/x86/mm/ioremap.c b/arch/x86/mm/ioremap.c
25311 index 78fe3f1..8293b6f 100644
25312 --- a/arch/x86/mm/ioremap.c
25313 +++ b/arch/x86/mm/ioremap.c
25314 @@ -97,7 +97,7 @@ static void __iomem *__ioremap_caller(resource_size_t phys_addr,
25315 for (pfn = phys_addr >> PAGE_SHIFT; pfn <= last_pfn; pfn++) {
25316 int is_ram = page_is_ram(pfn);
25317
25318 - if (is_ram && pfn_valid(pfn) && !PageReserved(pfn_to_page(pfn)))
25319 + if (is_ram && pfn_valid(pfn) && (pfn >= 0x100 || !PageReserved(pfn_to_page(pfn))))
25320 return NULL;
25321 WARN_ON_ONCE(is_ram);
25322 }
25323 @@ -315,6 +315,9 @@ void *xlate_dev_mem_ptr(unsigned long phys)
25324
25325 /* If page is RAM, we can use __va. Otherwise ioremap and unmap. */
25326 if (page_is_ram(start >> PAGE_SHIFT))
25327 +#ifdef CONFIG_HIGHMEM
25328 + if ((start >> PAGE_SHIFT) < max_low_pfn)
25329 +#endif
25330 return __va(phys);
25331
25332 addr = (void __force *)ioremap_cache(start, PAGE_SIZE);
25333 @@ -344,7 +347,7 @@ static int __init early_ioremap_debug_setup(char *str)
25334 early_param("early_ioremap_debug", early_ioremap_debug_setup);
25335
25336 static __initdata int after_paging_init;
25337 -static pte_t bm_pte[PAGE_SIZE/sizeof(pte_t)] __page_aligned_bss;
25338 +static pte_t bm_pte[PAGE_SIZE/sizeof(pte_t)] __read_only __aligned(PAGE_SIZE);
25339
25340 static inline pmd_t * __init early_ioremap_pmd(unsigned long addr)
25341 {
25342 @@ -381,8 +384,7 @@ void __init early_ioremap_init(void)
25343 slot_virt[i] = __fix_to_virt(FIX_BTMAP_BEGIN - NR_FIX_BTMAPS*i);
25344
25345 pmd = early_ioremap_pmd(fix_to_virt(FIX_BTMAP_BEGIN));
25346 - memset(bm_pte, 0, sizeof(bm_pte));
25347 - pmd_populate_kernel(&init_mm, pmd, bm_pte);
25348 + pmd_populate_user(&init_mm, pmd, bm_pte);
25349
25350 /*
25351 * The boot-ioremap range spans multiple pmds, for which
25352 diff --git a/arch/x86/mm/kmemcheck/kmemcheck.c b/arch/x86/mm/kmemcheck/kmemcheck.c
25353 index d87dd6d..bf3fa66 100644
25354 --- a/arch/x86/mm/kmemcheck/kmemcheck.c
25355 +++ b/arch/x86/mm/kmemcheck/kmemcheck.c
25356 @@ -622,9 +622,9 @@ bool kmemcheck_fault(struct pt_regs *regs, unsigned long address,
25357 * memory (e.g. tracked pages)? For now, we need this to avoid
25358 * invoking kmemcheck for PnP BIOS calls.
25359 */
25360 - if (regs->flags & X86_VM_MASK)
25361 + if (v8086_mode(regs))
25362 return false;
25363 - if (regs->cs != __KERNEL_CS)
25364 + if (regs->cs != __KERNEL_CS && regs->cs != __KERNEXEC_KERNEL_CS)
25365 return false;
25366
25367 pte = kmemcheck_pte_lookup(address);
25368 diff --git a/arch/x86/mm/mmap.c b/arch/x86/mm/mmap.c
25369 index 845df68..1d8d29f 100644
25370 --- a/arch/x86/mm/mmap.c
25371 +++ b/arch/x86/mm/mmap.c
25372 @@ -52,7 +52,7 @@ static unsigned int stack_maxrandom_size(void)
25373 * Leave an at least ~128 MB hole with possible stack randomization.
25374 */
25375 #define MIN_GAP (128*1024*1024UL + stack_maxrandom_size())
25376 -#define MAX_GAP (TASK_SIZE/6*5)
25377 +#define MAX_GAP (pax_task_size/6*5)
25378
25379 static int mmap_is_legacy(void)
25380 {
25381 @@ -82,27 +82,40 @@ static unsigned long mmap_rnd(void)
25382 return rnd << PAGE_SHIFT;
25383 }
25384
25385 -static unsigned long mmap_base(void)
25386 +static unsigned long mmap_base(struct mm_struct *mm)
25387 {
25388 unsigned long gap = rlimit(RLIMIT_STACK);
25389 + unsigned long pax_task_size = TASK_SIZE;
25390 +
25391 +#ifdef CONFIG_PAX_SEGMEXEC
25392 + if (mm->pax_flags & MF_PAX_SEGMEXEC)
25393 + pax_task_size = SEGMEXEC_TASK_SIZE;
25394 +#endif
25395
25396 if (gap < MIN_GAP)
25397 gap = MIN_GAP;
25398 else if (gap > MAX_GAP)
25399 gap = MAX_GAP;
25400
25401 - return PAGE_ALIGN(TASK_SIZE - gap - mmap_rnd());
25402 + return PAGE_ALIGN(pax_task_size - gap - mmap_rnd());
25403 }
25404
25405 /*
25406 * Bottom-up (legacy) layout on X86_32 did not support randomization, X86_64
25407 * does, but not when emulating X86_32
25408 */
25409 -static unsigned long mmap_legacy_base(void)
25410 +static unsigned long mmap_legacy_base(struct mm_struct *mm)
25411 {
25412 - if (mmap_is_ia32())
25413 + if (mmap_is_ia32()) {
25414 +
25415 +#ifdef CONFIG_PAX_SEGMEXEC
25416 + if (mm->pax_flags & MF_PAX_SEGMEXEC)
25417 + return SEGMEXEC_TASK_UNMAPPED_BASE;
25418 + else
25419 +#endif
25420 +
25421 return TASK_UNMAPPED_BASE;
25422 - else
25423 + } else
25424 return TASK_UNMAPPED_BASE + mmap_rnd();
25425 }
25426
25427 @@ -113,11 +126,23 @@ static unsigned long mmap_legacy_base(void)
25428 void arch_pick_mmap_layout(struct mm_struct *mm)
25429 {
25430 if (mmap_is_legacy()) {
25431 - mm->mmap_base = mmap_legacy_base();
25432 + mm->mmap_base = mmap_legacy_base(mm);
25433 +
25434 +#ifdef CONFIG_PAX_RANDMMAP
25435 + if (mm->pax_flags & MF_PAX_RANDMMAP)
25436 + mm->mmap_base += mm->delta_mmap;
25437 +#endif
25438 +
25439 mm->get_unmapped_area = arch_get_unmapped_area;
25440 mm->unmap_area = arch_unmap_area;
25441 } else {
25442 - mm->mmap_base = mmap_base();
25443 + mm->mmap_base = mmap_base(mm);
25444 +
25445 +#ifdef CONFIG_PAX_RANDMMAP
25446 + if (mm->pax_flags & MF_PAX_RANDMMAP)
25447 + mm->mmap_base -= mm->delta_mmap + mm->delta_stack;
25448 +#endif
25449 +
25450 mm->get_unmapped_area = arch_get_unmapped_area_topdown;
25451 mm->unmap_area = arch_unmap_area_topdown;
25452 }
25453 diff --git a/arch/x86/mm/mmio-mod.c b/arch/x86/mm/mmio-mod.c
25454 index dc0b727..dc9d71a 100644
25455 --- a/arch/x86/mm/mmio-mod.c
25456 +++ b/arch/x86/mm/mmio-mod.c
25457 @@ -194,7 +194,7 @@ static void pre(struct kmmio_probe *p, struct pt_regs *regs,
25458 break;
25459 default:
25460 {
25461 - unsigned char *ip = (unsigned char *)instptr;
25462 + unsigned char *ip = (unsigned char *)ktla_ktva(instptr);
25463 my_trace->opcode = MMIO_UNKNOWN_OP;
25464 my_trace->width = 0;
25465 my_trace->value = (*ip) << 16 | *(ip + 1) << 8 |
25466 @@ -234,7 +234,7 @@ static void post(struct kmmio_probe *p, unsigned long condition,
25467 static void ioremap_trace_core(resource_size_t offset, unsigned long size,
25468 void __iomem *addr)
25469 {
25470 - static atomic_t next_id;
25471 + static atomic_unchecked_t next_id;
25472 struct remap_trace *trace = kmalloc(sizeof(*trace), GFP_KERNEL);
25473 /* These are page-unaligned. */
25474 struct mmiotrace_map map = {
25475 @@ -258,7 +258,7 @@ static void ioremap_trace_core(resource_size_t offset, unsigned long size,
25476 .private = trace
25477 },
25478 .phys = offset,
25479 - .id = atomic_inc_return(&next_id)
25480 + .id = atomic_inc_return_unchecked(&next_id)
25481 };
25482 map.map_id = trace->id;
25483
25484 diff --git a/arch/x86/mm/pageattr-test.c b/arch/x86/mm/pageattr-test.c
25485 index b008656..773eac2 100644
25486 --- a/arch/x86/mm/pageattr-test.c
25487 +++ b/arch/x86/mm/pageattr-test.c
25488 @@ -36,7 +36,7 @@ enum {
25489
25490 static int pte_testbit(pte_t pte)
25491 {
25492 - return pte_flags(pte) & _PAGE_UNUSED1;
25493 + return pte_flags(pte) & _PAGE_CPA_TEST;
25494 }
25495
25496 struct split_state {
25497 diff --git a/arch/x86/mm/pageattr.c b/arch/x86/mm/pageattr.c
25498 index a718e0d..45efc32 100644
25499 --- a/arch/x86/mm/pageattr.c
25500 +++ b/arch/x86/mm/pageattr.c
25501 @@ -261,7 +261,7 @@ static inline pgprot_t static_protections(pgprot_t prot, unsigned long address,
25502 */
25503 #ifdef CONFIG_PCI_BIOS
25504 if (pcibios_enabled && within(pfn, BIOS_BEGIN >> PAGE_SHIFT, BIOS_END >> PAGE_SHIFT))
25505 - pgprot_val(forbidden) |= _PAGE_NX;
25506 + pgprot_val(forbidden) |= _PAGE_NX & __supported_pte_mask;
25507 #endif
25508
25509 /*
25510 @@ -269,9 +269,10 @@ static inline pgprot_t static_protections(pgprot_t prot, unsigned long address,
25511 * Does not cover __inittext since that is gone later on. On
25512 * 64bit we do not enforce !NX on the low mapping
25513 */
25514 - if (within(address, (unsigned long)_text, (unsigned long)_etext))
25515 - pgprot_val(forbidden) |= _PAGE_NX;
25516 + if (within(address, ktla_ktva((unsigned long)_text), ktla_ktva((unsigned long)_etext)))
25517 + pgprot_val(forbidden) |= _PAGE_NX & __supported_pte_mask;
25518
25519 +#ifdef CONFIG_DEBUG_RODATA
25520 /*
25521 * The .rodata section needs to be read-only. Using the pfn
25522 * catches all aliases.
25523 @@ -279,6 +280,7 @@ static inline pgprot_t static_protections(pgprot_t prot, unsigned long address,
25524 if (within(pfn, __pa((unsigned long)__start_rodata) >> PAGE_SHIFT,
25525 __pa((unsigned long)__end_rodata) >> PAGE_SHIFT))
25526 pgprot_val(forbidden) |= _PAGE_RW;
25527 +#endif
25528
25529 #if defined(CONFIG_X86_64) && defined(CONFIG_DEBUG_RODATA)
25530 /*
25531 @@ -317,6 +319,13 @@ static inline pgprot_t static_protections(pgprot_t prot, unsigned long address,
25532 }
25533 #endif
25534
25535 +#ifdef CONFIG_PAX_KERNEXEC
25536 + if (within(pfn, __pa((unsigned long)&_text), __pa((unsigned long)&_sdata))) {
25537 + pgprot_val(forbidden) |= _PAGE_RW;
25538 + pgprot_val(forbidden) |= _PAGE_NX & __supported_pte_mask;
25539 + }
25540 +#endif
25541 +
25542 prot = __pgprot(pgprot_val(prot) & ~pgprot_val(forbidden));
25543
25544 return prot;
25545 @@ -369,23 +378,37 @@ EXPORT_SYMBOL_GPL(lookup_address);
25546 static void __set_pmd_pte(pte_t *kpte, unsigned long address, pte_t pte)
25547 {
25548 /* change init_mm */
25549 + pax_open_kernel();
25550 set_pte_atomic(kpte, pte);
25551 +
25552 #ifdef CONFIG_X86_32
25553 if (!SHARED_KERNEL_PMD) {
25554 +
25555 +#ifdef CONFIG_PAX_PER_CPU_PGD
25556 + unsigned long cpu;
25557 +#else
25558 struct page *page;
25559 +#endif
25560
25561 +#ifdef CONFIG_PAX_PER_CPU_PGD
25562 + for (cpu = 0; cpu < nr_cpu_ids; ++cpu) {
25563 + pgd_t *pgd = get_cpu_pgd(cpu);
25564 +#else
25565 list_for_each_entry(page, &pgd_list, lru) {
25566 - pgd_t *pgd;
25567 + pgd_t *pgd = (pgd_t *)page_address(page);
25568 +#endif
25569 +
25570 pud_t *pud;
25571 pmd_t *pmd;
25572
25573 - pgd = (pgd_t *)page_address(page) + pgd_index(address);
25574 + pgd += pgd_index(address);
25575 pud = pud_offset(pgd, address);
25576 pmd = pmd_offset(pud, address);
25577 set_pte_atomic((pte_t *)pmd, pte);
25578 }
25579 }
25580 #endif
25581 + pax_close_kernel();
25582 }
25583
25584 static int
25585 diff --git a/arch/x86/mm/pat.c b/arch/x86/mm/pat.c
25586 index 3d68ef6..7f69136 100644
25587 --- a/arch/x86/mm/pat.c
25588 +++ b/arch/x86/mm/pat.c
25589 @@ -376,7 +376,7 @@ int free_memtype(u64 start, u64 end)
25590
25591 if (!entry) {
25592 printk(KERN_INFO "%s:%d freeing invalid memtype [mem %#010Lx-%#010Lx]\n",
25593 - current->comm, current->pid, start, end - 1);
25594 + current->comm, task_pid_nr(current), start, end - 1);
25595 return -EINVAL;
25596 }
25597
25598 @@ -506,8 +506,8 @@ static inline int range_is_allowed(unsigned long pfn, unsigned long size)
25599
25600 while (cursor < to) {
25601 if (!devmem_is_allowed(pfn)) {
25602 - printk(KERN_INFO "Program %s tried to access /dev/mem between [mem %#010Lx-%#010Lx]\n",
25603 - current->comm, from, to - 1);
25604 + printk(KERN_INFO "Program %s tried to access /dev/mem between [mem %#010Lx-%#010Lx] (%#010Lx)\n",
25605 + current->comm, from, to - 1, cursor);
25606 return 0;
25607 }
25608 cursor += PAGE_SIZE;
25609 @@ -570,7 +570,7 @@ int kernel_map_sync_memtype(u64 base, unsigned long size, unsigned long flags)
25610 if (ioremap_change_attr((unsigned long)__va(base), id_sz, flags) < 0) {
25611 printk(KERN_INFO "%s:%d ioremap_change_attr failed %s "
25612 "for [mem %#010Lx-%#010Lx]\n",
25613 - current->comm, current->pid,
25614 + current->comm, task_pid_nr(current),
25615 cattr_name(flags),
25616 base, (unsigned long long)(base + size-1));
25617 return -EINVAL;
25618 @@ -605,7 +605,7 @@ static int reserve_pfn_range(u64 paddr, unsigned long size, pgprot_t *vma_prot,
25619 flags = lookup_memtype(paddr);
25620 if (want_flags != flags) {
25621 printk(KERN_WARNING "%s:%d map pfn RAM range req %s for [mem %#010Lx-%#010Lx], got %s\n",
25622 - current->comm, current->pid,
25623 + current->comm, task_pid_nr(current),
25624 cattr_name(want_flags),
25625 (unsigned long long)paddr,
25626 (unsigned long long)(paddr + size - 1),
25627 @@ -627,7 +627,7 @@ static int reserve_pfn_range(u64 paddr, unsigned long size, pgprot_t *vma_prot,
25628 free_memtype(paddr, paddr + size);
25629 printk(KERN_ERR "%s:%d map pfn expected mapping type %s"
25630 " for [mem %#010Lx-%#010Lx], got %s\n",
25631 - current->comm, current->pid,
25632 + current->comm, task_pid_nr(current),
25633 cattr_name(want_flags),
25634 (unsigned long long)paddr,
25635 (unsigned long long)(paddr + size - 1),
25636 diff --git a/arch/x86/mm/pf_in.c b/arch/x86/mm/pf_in.c
25637 index 9f0614d..92ae64a 100644
25638 --- a/arch/x86/mm/pf_in.c
25639 +++ b/arch/x86/mm/pf_in.c
25640 @@ -148,7 +148,7 @@ enum reason_type get_ins_type(unsigned long ins_addr)
25641 int i;
25642 enum reason_type rv = OTHERS;
25643
25644 - p = (unsigned char *)ins_addr;
25645 + p = (unsigned char *)ktla_ktva(ins_addr);
25646 p += skip_prefix(p, &prf);
25647 p += get_opcode(p, &opcode);
25648
25649 @@ -168,7 +168,7 @@ static unsigned int get_ins_reg_width(unsigned long ins_addr)
25650 struct prefix_bits prf;
25651 int i;
25652
25653 - p = (unsigned char *)ins_addr;
25654 + p = (unsigned char *)ktla_ktva(ins_addr);
25655 p += skip_prefix(p, &prf);
25656 p += get_opcode(p, &opcode);
25657
25658 @@ -191,7 +191,7 @@ unsigned int get_ins_mem_width(unsigned long ins_addr)
25659 struct prefix_bits prf;
25660 int i;
25661
25662 - p = (unsigned char *)ins_addr;
25663 + p = (unsigned char *)ktla_ktva(ins_addr);
25664 p += skip_prefix(p, &prf);
25665 p += get_opcode(p, &opcode);
25666
25667 @@ -415,7 +415,7 @@ unsigned long get_ins_reg_val(unsigned long ins_addr, struct pt_regs *regs)
25668 struct prefix_bits prf;
25669 int i;
25670
25671 - p = (unsigned char *)ins_addr;
25672 + p = (unsigned char *)ktla_ktva(ins_addr);
25673 p += skip_prefix(p, &prf);
25674 p += get_opcode(p, &opcode);
25675 for (i = 0; i < ARRAY_SIZE(reg_rop); i++)
25676 @@ -470,7 +470,7 @@ unsigned long get_ins_imm_val(unsigned long ins_addr)
25677 struct prefix_bits prf;
25678 int i;
25679
25680 - p = (unsigned char *)ins_addr;
25681 + p = (unsigned char *)ktla_ktva(ins_addr);
25682 p += skip_prefix(p, &prf);
25683 p += get_opcode(p, &opcode);
25684 for (i = 0; i < ARRAY_SIZE(imm_wop); i++)
25685 diff --git a/arch/x86/mm/pgtable.c b/arch/x86/mm/pgtable.c
25686 index 8573b83..4f3ed7e 100644
25687 --- a/arch/x86/mm/pgtable.c
25688 +++ b/arch/x86/mm/pgtable.c
25689 @@ -84,10 +84,64 @@ static inline void pgd_list_del(pgd_t *pgd)
25690 list_del(&page->lru);
25691 }
25692
25693 -#define UNSHARED_PTRS_PER_PGD \
25694 - (SHARED_KERNEL_PMD ? KERNEL_PGD_BOUNDARY : PTRS_PER_PGD)
25695 +#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
25696 +pgdval_t clone_pgd_mask __read_only = ~_PAGE_PRESENT;
25697
25698 +void __shadow_user_pgds(pgd_t *dst, const pgd_t *src)
25699 +{
25700 + unsigned int count = USER_PGD_PTRS;
25701
25702 + while (count--)
25703 + *dst++ = __pgd((pgd_val(*src++) | (_PAGE_NX & __supported_pte_mask)) & ~_PAGE_USER);
25704 +}
25705 +#endif
25706 +
25707 +#ifdef CONFIG_PAX_PER_CPU_PGD
25708 +void __clone_user_pgds(pgd_t *dst, const pgd_t *src)
25709 +{
25710 + unsigned int count = USER_PGD_PTRS;
25711 +
25712 + while (count--) {
25713 + pgd_t pgd;
25714 +
25715 +#ifdef CONFIG_X86_64
25716 + pgd = __pgd(pgd_val(*src++) | _PAGE_USER);
25717 +#else
25718 + pgd = *src++;
25719 +#endif
25720 +
25721 +#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
25722 + pgd = __pgd(pgd_val(pgd) & clone_pgd_mask);
25723 +#endif
25724 +
25725 + *dst++ = pgd;
25726 + }
25727 +
25728 +}
25729 +#endif
25730 +
25731 +#ifdef CONFIG_X86_64
25732 +#define pxd_t pud_t
25733 +#define pyd_t pgd_t
25734 +#define paravirt_release_pxd(pfn) paravirt_release_pud(pfn)
25735 +#define pxd_free(mm, pud) pud_free((mm), (pud))
25736 +#define pyd_populate(mm, pgd, pud) pgd_populate((mm), (pgd), (pud))
25737 +#define pyd_offset(mm, address) pgd_offset((mm), (address))
25738 +#define PYD_SIZE PGDIR_SIZE
25739 +#else
25740 +#define pxd_t pmd_t
25741 +#define pyd_t pud_t
25742 +#define paravirt_release_pxd(pfn) paravirt_release_pmd(pfn)
25743 +#define pxd_free(mm, pud) pmd_free((mm), (pud))
25744 +#define pyd_populate(mm, pgd, pud) pud_populate((mm), (pgd), (pud))
25745 +#define pyd_offset(mm, address) pud_offset((mm), (address))
25746 +#define PYD_SIZE PUD_SIZE
25747 +#endif
25748 +
25749 +#ifdef CONFIG_PAX_PER_CPU_PGD
25750 +static inline void pgd_ctor(struct mm_struct *mm, pgd_t *pgd) {}
25751 +static inline void pgd_dtor(pgd_t *pgd) {}
25752 +#else
25753 static void pgd_set_mm(pgd_t *pgd, struct mm_struct *mm)
25754 {
25755 BUILD_BUG_ON(sizeof(virt_to_page(pgd)->index) < sizeof(mm));
25756 @@ -128,6 +182,7 @@ static void pgd_dtor(pgd_t *pgd)
25757 pgd_list_del(pgd);
25758 spin_unlock(&pgd_lock);
25759 }
25760 +#endif
25761
25762 /*
25763 * List of all pgd's needed for non-PAE so it can invalidate entries
25764 @@ -140,7 +195,7 @@ static void pgd_dtor(pgd_t *pgd)
25765 * -- wli
25766 */
25767
25768 -#ifdef CONFIG_X86_PAE
25769 +#if defined(CONFIG_X86_32) && defined(CONFIG_X86_PAE)
25770 /*
25771 * In PAE mode, we need to do a cr3 reload (=tlb flush) when
25772 * updating the top-level pagetable entries to guarantee the
25773 @@ -152,7 +207,7 @@ static void pgd_dtor(pgd_t *pgd)
25774 * not shared between pagetables (!SHARED_KERNEL_PMDS), we allocate
25775 * and initialize the kernel pmds here.
25776 */
25777 -#define PREALLOCATED_PMDS UNSHARED_PTRS_PER_PGD
25778 +#define PREALLOCATED_PXDS (SHARED_KERNEL_PMD ? KERNEL_PGD_BOUNDARY : PTRS_PER_PGD)
25779
25780 void pud_populate(struct mm_struct *mm, pud_t *pudp, pmd_t *pmd)
25781 {
25782 @@ -170,36 +225,38 @@ void pud_populate(struct mm_struct *mm, pud_t *pudp, pmd_t *pmd)
25783 */
25784 flush_tlb_mm(mm);
25785 }
25786 +#elif defined(CONFIG_X86_64) && defined(CONFIG_PAX_PER_CPU_PGD)
25787 +#define PREALLOCATED_PXDS USER_PGD_PTRS
25788 #else /* !CONFIG_X86_PAE */
25789
25790 /* No need to prepopulate any pagetable entries in non-PAE modes. */
25791 -#define PREALLOCATED_PMDS 0
25792 +#define PREALLOCATED_PXDS 0
25793
25794 #endif /* CONFIG_X86_PAE */
25795
25796 -static void free_pmds(pmd_t *pmds[])
25797 +static void free_pxds(pxd_t *pxds[])
25798 {
25799 int i;
25800
25801 - for(i = 0; i < PREALLOCATED_PMDS; i++)
25802 - if (pmds[i])
25803 - free_page((unsigned long)pmds[i]);
25804 + for(i = 0; i < PREALLOCATED_PXDS; i++)
25805 + if (pxds[i])
25806 + free_page((unsigned long)pxds[i]);
25807 }
25808
25809 -static int preallocate_pmds(pmd_t *pmds[])
25810 +static int preallocate_pxds(pxd_t *pxds[])
25811 {
25812 int i;
25813 bool failed = false;
25814
25815 - for(i = 0; i < PREALLOCATED_PMDS; i++) {
25816 - pmd_t *pmd = (pmd_t *)__get_free_page(PGALLOC_GFP);
25817 - if (pmd == NULL)
25818 + for(i = 0; i < PREALLOCATED_PXDS; i++) {
25819 + pxd_t *pxd = (pxd_t *)__get_free_page(PGALLOC_GFP);
25820 + if (pxd == NULL)
25821 failed = true;
25822 - pmds[i] = pmd;
25823 + pxds[i] = pxd;
25824 }
25825
25826 if (failed) {
25827 - free_pmds(pmds);
25828 + free_pxds(pxds);
25829 return -ENOMEM;
25830 }
25831
25832 @@ -212,51 +269,55 @@ static int preallocate_pmds(pmd_t *pmds[])
25833 * preallocate which never got a corresponding vma will need to be
25834 * freed manually.
25835 */
25836 -static void pgd_mop_up_pmds(struct mm_struct *mm, pgd_t *pgdp)
25837 +static void pgd_mop_up_pxds(struct mm_struct *mm, pgd_t *pgdp)
25838 {
25839 int i;
25840
25841 - for(i = 0; i < PREALLOCATED_PMDS; i++) {
25842 + for(i = 0; i < PREALLOCATED_PXDS; i++) {
25843 pgd_t pgd = pgdp[i];
25844
25845 if (pgd_val(pgd) != 0) {
25846 - pmd_t *pmd = (pmd_t *)pgd_page_vaddr(pgd);
25847 + pxd_t *pxd = (pxd_t *)pgd_page_vaddr(pgd);
25848
25849 - pgdp[i] = native_make_pgd(0);
25850 + set_pgd(pgdp + i, native_make_pgd(0));
25851
25852 - paravirt_release_pmd(pgd_val(pgd) >> PAGE_SHIFT);
25853 - pmd_free(mm, pmd);
25854 + paravirt_release_pxd(pgd_val(pgd) >> PAGE_SHIFT);
25855 + pxd_free(mm, pxd);
25856 }
25857 }
25858 }
25859
25860 -static void pgd_prepopulate_pmd(struct mm_struct *mm, pgd_t *pgd, pmd_t *pmds[])
25861 +static void pgd_prepopulate_pxd(struct mm_struct *mm, pgd_t *pgd, pxd_t *pxds[])
25862 {
25863 - pud_t *pud;
25864 + pyd_t *pyd;
25865 unsigned long addr;
25866 int i;
25867
25868 - if (PREALLOCATED_PMDS == 0) /* Work around gcc-3.4.x bug */
25869 + if (PREALLOCATED_PXDS == 0) /* Work around gcc-3.4.x bug */
25870 return;
25871
25872 - pud = pud_offset(pgd, 0);
25873 +#ifdef CONFIG_X86_64
25874 + pyd = pyd_offset(mm, 0L);
25875 +#else
25876 + pyd = pyd_offset(pgd, 0L);
25877 +#endif
25878
25879 - for (addr = i = 0; i < PREALLOCATED_PMDS;
25880 - i++, pud++, addr += PUD_SIZE) {
25881 - pmd_t *pmd = pmds[i];
25882 + for (addr = i = 0; i < PREALLOCATED_PXDS;
25883 + i++, pyd++, addr += PYD_SIZE) {
25884 + pxd_t *pxd = pxds[i];
25885
25886 if (i >= KERNEL_PGD_BOUNDARY)
25887 - memcpy(pmd, (pmd_t *)pgd_page_vaddr(swapper_pg_dir[i]),
25888 - sizeof(pmd_t) * PTRS_PER_PMD);
25889 + memcpy(pxd, (pxd_t *)pgd_page_vaddr(swapper_pg_dir[i]),
25890 + sizeof(pxd_t) * PTRS_PER_PMD);
25891
25892 - pud_populate(mm, pud, pmd);
25893 + pyd_populate(mm, pyd, pxd);
25894 }
25895 }
25896
25897 pgd_t *pgd_alloc(struct mm_struct *mm)
25898 {
25899 pgd_t *pgd;
25900 - pmd_t *pmds[PREALLOCATED_PMDS];
25901 + pxd_t *pxds[PREALLOCATED_PXDS];
25902
25903 pgd = (pgd_t *)__get_free_page(PGALLOC_GFP);
25904
25905 @@ -265,11 +326,11 @@ pgd_t *pgd_alloc(struct mm_struct *mm)
25906
25907 mm->pgd = pgd;
25908
25909 - if (preallocate_pmds(pmds) != 0)
25910 + if (preallocate_pxds(pxds) != 0)
25911 goto out_free_pgd;
25912
25913 if (paravirt_pgd_alloc(mm) != 0)
25914 - goto out_free_pmds;
25915 + goto out_free_pxds;
25916
25917 /*
25918 * Make sure that pre-populating the pmds is atomic with
25919 @@ -279,14 +340,14 @@ pgd_t *pgd_alloc(struct mm_struct *mm)
25920 spin_lock(&pgd_lock);
25921
25922 pgd_ctor(mm, pgd);
25923 - pgd_prepopulate_pmd(mm, pgd, pmds);
25924 + pgd_prepopulate_pxd(mm, pgd, pxds);
25925
25926 spin_unlock(&pgd_lock);
25927
25928 return pgd;
25929
25930 -out_free_pmds:
25931 - free_pmds(pmds);
25932 +out_free_pxds:
25933 + free_pxds(pxds);
25934 out_free_pgd:
25935 free_page((unsigned long)pgd);
25936 out:
25937 @@ -295,7 +356,7 @@ out:
25938
25939 void pgd_free(struct mm_struct *mm, pgd_t *pgd)
25940 {
25941 - pgd_mop_up_pmds(mm, pgd);
25942 + pgd_mop_up_pxds(mm, pgd);
25943 pgd_dtor(pgd);
25944 paravirt_pgd_free(mm, pgd);
25945 free_page((unsigned long)pgd);
25946 diff --git a/arch/x86/mm/pgtable_32.c b/arch/x86/mm/pgtable_32.c
25947 index a69bcb8..19068ab 100644
25948 --- a/arch/x86/mm/pgtable_32.c
25949 +++ b/arch/x86/mm/pgtable_32.c
25950 @@ -47,10 +47,13 @@ void set_pte_vaddr(unsigned long vaddr, pte_t pteval)
25951 return;
25952 }
25953 pte = pte_offset_kernel(pmd, vaddr);
25954 +
25955 + pax_open_kernel();
25956 if (pte_val(pteval))
25957 set_pte_at(&init_mm, vaddr, pte, pteval);
25958 else
25959 pte_clear(&init_mm, vaddr, pte);
25960 + pax_close_kernel();
25961
25962 /*
25963 * It's enough to flush this one mapping.
25964 diff --git a/arch/x86/mm/setup_nx.c b/arch/x86/mm/setup_nx.c
25965 index 410531d..0f16030 100644
25966 --- a/arch/x86/mm/setup_nx.c
25967 +++ b/arch/x86/mm/setup_nx.c
25968 @@ -5,8 +5,10 @@
25969 #include <asm/pgtable.h>
25970 #include <asm/proto.h>
25971
25972 +#if defined(CONFIG_X86_64) || defined(CONFIG_X86_PAE)
25973 static int disable_nx __cpuinitdata;
25974
25975 +#ifndef CONFIG_PAX_PAGEEXEC
25976 /*
25977 * noexec = on|off
25978 *
25979 @@ -28,12 +30,17 @@ static int __init noexec_setup(char *str)
25980 return 0;
25981 }
25982 early_param("noexec", noexec_setup);
25983 +#endif
25984 +
25985 +#endif
25986
25987 void __cpuinit x86_configure_nx(void)
25988 {
25989 +#if defined(CONFIG_X86_64) || defined(CONFIG_X86_PAE)
25990 if (cpu_has_nx && !disable_nx)
25991 __supported_pte_mask |= _PAGE_NX;
25992 else
25993 +#endif
25994 __supported_pte_mask &= ~_PAGE_NX;
25995 }
25996
25997 diff --git a/arch/x86/mm/tlb.c b/arch/x86/mm/tlb.c
25998 index 613cd83..3a21f1c 100644
25999 --- a/arch/x86/mm/tlb.c
26000 +++ b/arch/x86/mm/tlb.c
26001 @@ -48,7 +48,11 @@ void leave_mm(int cpu)
26002 BUG();
26003 if (cpumask_test_cpu(cpu, mm_cpumask(active_mm))) {
26004 cpumask_clear_cpu(cpu, mm_cpumask(active_mm));
26005 +
26006 +#ifndef CONFIG_PAX_PER_CPU_PGD
26007 load_cr3(swapper_pg_dir);
26008 +#endif
26009 +
26010 }
26011 }
26012 EXPORT_SYMBOL_GPL(leave_mm);
26013 diff --git a/arch/x86/net/bpf_jit.S b/arch/x86/net/bpf_jit.S
26014 index 877b9a1..a8ecf42 100644
26015 --- a/arch/x86/net/bpf_jit.S
26016 +++ b/arch/x86/net/bpf_jit.S
26017 @@ -9,6 +9,7 @@
26018 */
26019 #include <linux/linkage.h>
26020 #include <asm/dwarf2.h>
26021 +#include <asm/alternative-asm.h>
26022
26023 /*
26024 * Calling convention :
26025 @@ -35,6 +36,7 @@ sk_load_word_positive_offset:
26026 jle bpf_slow_path_word
26027 mov (SKBDATA,%rsi),%eax
26028 bswap %eax /* ntohl() */
26029 + pax_force_retaddr
26030 ret
26031
26032 sk_load_half:
26033 @@ -52,6 +54,7 @@ sk_load_half_positive_offset:
26034 jle bpf_slow_path_half
26035 movzwl (SKBDATA,%rsi),%eax
26036 rol $8,%ax # ntohs()
26037 + pax_force_retaddr
26038 ret
26039
26040 sk_load_byte:
26041 @@ -66,6 +69,7 @@ sk_load_byte_positive_offset:
26042 cmp %esi,%r9d /* if (offset >= hlen) goto bpf_slow_path_byte */
26043 jle bpf_slow_path_byte
26044 movzbl (SKBDATA,%rsi),%eax
26045 + pax_force_retaddr
26046 ret
26047
26048 /**
26049 @@ -87,6 +91,7 @@ sk_load_byte_msh_positive_offset:
26050 movzbl (SKBDATA,%rsi),%ebx
26051 and $15,%bl
26052 shl $2,%bl
26053 + pax_force_retaddr
26054 ret
26055
26056 /* rsi contains offset and can be scratched */
26057 @@ -109,6 +114,7 @@ bpf_slow_path_word:
26058 js bpf_error
26059 mov -12(%rbp),%eax
26060 bswap %eax
26061 + pax_force_retaddr
26062 ret
26063
26064 bpf_slow_path_half:
26065 @@ -117,12 +123,14 @@ bpf_slow_path_half:
26066 mov -12(%rbp),%ax
26067 rol $8,%ax
26068 movzwl %ax,%eax
26069 + pax_force_retaddr
26070 ret
26071
26072 bpf_slow_path_byte:
26073 bpf_slow_path_common(1)
26074 js bpf_error
26075 movzbl -12(%rbp),%eax
26076 + pax_force_retaddr
26077 ret
26078
26079 bpf_slow_path_byte_msh:
26080 @@ -133,6 +141,7 @@ bpf_slow_path_byte_msh:
26081 and $15,%al
26082 shl $2,%al
26083 xchg %eax,%ebx
26084 + pax_force_retaddr
26085 ret
26086
26087 #define sk_negative_common(SIZE) \
26088 @@ -157,6 +166,7 @@ sk_load_word_negative_offset:
26089 sk_negative_common(4)
26090 mov (%rax), %eax
26091 bswap %eax
26092 + pax_force_retaddr
26093 ret
26094
26095 bpf_slow_path_half_neg:
26096 @@ -168,6 +178,7 @@ sk_load_half_negative_offset:
26097 mov (%rax),%ax
26098 rol $8,%ax
26099 movzwl %ax,%eax
26100 + pax_force_retaddr
26101 ret
26102
26103 bpf_slow_path_byte_neg:
26104 @@ -177,6 +188,7 @@ sk_load_byte_negative_offset:
26105 .globl sk_load_byte_negative_offset
26106 sk_negative_common(1)
26107 movzbl (%rax), %eax
26108 + pax_force_retaddr
26109 ret
26110
26111 bpf_slow_path_byte_msh_neg:
26112 @@ -190,6 +202,7 @@ sk_load_byte_msh_negative_offset:
26113 and $15,%al
26114 shl $2,%al
26115 xchg %eax,%ebx
26116 + pax_force_retaddr
26117 ret
26118
26119 bpf_error:
26120 @@ -197,4 +210,5 @@ bpf_error:
26121 xor %eax,%eax
26122 mov -8(%rbp),%rbx
26123 leaveq
26124 + pax_force_retaddr
26125 ret
26126 diff --git a/arch/x86/net/bpf_jit_comp.c b/arch/x86/net/bpf_jit_comp.c
26127 index 33643a8..f6211a0 100644
26128 --- a/arch/x86/net/bpf_jit_comp.c
26129 +++ b/arch/x86/net/bpf_jit_comp.c
26130 @@ -11,6 +11,7 @@
26131 #include <asm/cacheflush.h>
26132 #include <linux/netdevice.h>
26133 #include <linux/filter.h>
26134 +#include <linux/random.h>
26135
26136 /*
26137 * Conventions :
26138 @@ -48,13 +49,87 @@ static inline u8 *emit_code(u8 *ptr, u32 bytes, unsigned int len)
26139 return ptr + len;
26140 }
26141
26142 +#ifdef CONFIG_GRKERNSEC_JIT_HARDEN
26143 +#define MAX_INSTR_CODE_SIZE 96
26144 +#else
26145 +#define MAX_INSTR_CODE_SIZE 64
26146 +#endif
26147 +
26148 #define EMIT(bytes, len) do { prog = emit_code(prog, bytes, len); } while (0)
26149
26150 #define EMIT1(b1) EMIT(b1, 1)
26151 #define EMIT2(b1, b2) EMIT((b1) + ((b2) << 8), 2)
26152 #define EMIT3(b1, b2, b3) EMIT((b1) + ((b2) << 8) + ((b3) << 16), 3)
26153 #define EMIT4(b1, b2, b3, b4) EMIT((b1) + ((b2) << 8) + ((b3) << 16) + ((b4) << 24), 4)
26154 +
26155 +#ifdef CONFIG_GRKERNSEC_JIT_HARDEN
26156 +/* original constant will appear in ecx */
26157 +#define DILUTE_CONST_SEQUENCE(_off, _key) \
26158 +do { \
26159 + /* mov ecx, randkey */ \
26160 + EMIT1(0xb9); \
26161 + EMIT(_key, 4); \
26162 + /* xor ecx, randkey ^ off */ \
26163 + EMIT2(0x81, 0xf1); \
26164 + EMIT((_key) ^ (_off), 4); \
26165 +} while (0)
26166 +
26167 +#define EMIT1_off32(b1, _off) \
26168 +do { \
26169 + switch (b1) { \
26170 + case 0x05: /* add eax, imm32 */ \
26171 + case 0x2d: /* sub eax, imm32 */ \
26172 + case 0x25: /* and eax, imm32 */ \
26173 + case 0x0d: /* or eax, imm32 */ \
26174 + case 0xb8: /* mov eax, imm32 */ \
26175 + case 0x3d: /* cmp eax, imm32 */ \
26176 + case 0xa9: /* test eax, imm32 */ \
26177 + DILUTE_CONST_SEQUENCE(_off, randkey); \
26178 + EMIT2((b1) - 4, 0xc8); /* convert imm instruction to eax, ecx */\
26179 + break; \
26180 + case 0xbb: /* mov ebx, imm32 */ \
26181 + DILUTE_CONST_SEQUENCE(_off, randkey); \
26182 + /* mov ebx, ecx */ \
26183 + EMIT2(0x89, 0xcb); \
26184 + break; \
26185 + case 0xbe: /* mov esi, imm32 */ \
26186 + DILUTE_CONST_SEQUENCE(_off, randkey); \
26187 + /* mov esi, ecx */ \
26188 + EMIT2(0x89, 0xce); \
26189 + break; \
26190 + case 0xe9: /* jmp rel imm32 */ \
26191 + EMIT1(b1); \
26192 + EMIT(_off, 4); \
26193 + /* prevent fall-through, we're not called if off = 0 */ \
26194 + EMIT(0xcccccccc, 4); \
26195 + EMIT(0xcccccccc, 4); \
26196 + break; \
26197 + default: \
26198 + EMIT1(b1); \
26199 + EMIT(_off, 4); \
26200 + } \
26201 +} while (0)
26202 +
26203 +#define EMIT2_off32(b1, b2, _off) \
26204 +do { \
26205 + if ((b1) == 0x8d && (b2) == 0xb3) { /* lea esi, [rbx+imm32] */ \
26206 + EMIT2(0x8d, 0xb3); /* lea esi, [rbx+randkey] */ \
26207 + EMIT(randkey, 4); \
26208 + EMIT2(0x8d, 0xb6); /* lea esi, [esi+off-randkey] */ \
26209 + EMIT((_off) - randkey, 4); \
26210 + } else if ((b1) == 0x69 && (b2) == 0xc0) { /* imul eax, imm32 */\
26211 + DILUTE_CONST_SEQUENCE(_off, randkey); \
26212 + /* imul eax, ecx */ \
26213 + EMIT3(0x0f, 0xaf, 0xc1); \
26214 + } else { \
26215 + EMIT2(b1, b2); \
26216 + EMIT(_off, 4); \
26217 + } \
26218 +} while (0)
26219 +#else
26220 #define EMIT1_off32(b1, off) do { EMIT1(b1); EMIT(off, 4);} while (0)
26221 +#define EMIT2_off32(b1, b2, off) do { EMIT2(b1, b2); EMIT(off, 4);} while (0)
26222 +#endif
26223
26224 #define CLEAR_A() EMIT2(0x31, 0xc0) /* xor %eax,%eax */
26225 #define CLEAR_X() EMIT2(0x31, 0xdb) /* xor %ebx,%ebx */
26226 @@ -89,6 +164,24 @@ do { \
26227 #define X86_JBE 0x76
26228 #define X86_JA 0x77
26229
26230 +#ifdef CONFIG_GRKERNSEC_JIT_HARDEN
26231 +#define APPEND_FLOW_VERIFY() \
26232 +do { \
26233 + /* mov ecx, randkey */ \
26234 + EMIT1(0xb9); \
26235 + EMIT(randkey, 4); \
26236 + /* cmp ecx, randkey */ \
26237 + EMIT2(0x81, 0xf9); \
26238 + EMIT(randkey, 4); \
26239 + /* jz after 8 int 3s */ \
26240 + EMIT2(0x74, 0x08); \
26241 + EMIT(0xcccccccc, 4); \
26242 + EMIT(0xcccccccc, 4); \
26243 +} while (0)
26244 +#else
26245 +#define APPEND_FLOW_VERIFY() do { } while (0)
26246 +#endif
26247 +
26248 #define EMIT_COND_JMP(op, offset) \
26249 do { \
26250 if (is_near(offset)) \
26251 @@ -96,6 +189,7 @@ do { \
26252 else { \
26253 EMIT2(0x0f, op + 0x10); \
26254 EMIT(offset, 4); /* jxx .+off32 */ \
26255 + APPEND_FLOW_VERIFY(); \
26256 } \
26257 } while (0)
26258
26259 @@ -120,12 +214,17 @@ static inline void bpf_flush_icache(void *start, void *end)
26260 set_fs(old_fs);
26261 }
26262
26263 +struct bpf_jit_work {
26264 + struct work_struct work;
26265 + void *image;
26266 +};
26267 +
26268 #define CHOOSE_LOAD_FUNC(K, func) \
26269 ((int)K < 0 ? ((int)K >= SKF_LL_OFF ? func##_negative_offset : func) : func##_positive_offset)
26270
26271 void bpf_jit_compile(struct sk_filter *fp)
26272 {
26273 - u8 temp[64];
26274 + u8 temp[MAX_INSTR_CODE_SIZE];
26275 u8 *prog;
26276 unsigned int proglen, oldproglen = 0;
26277 int ilen, i;
26278 @@ -138,6 +237,9 @@ void bpf_jit_compile(struct sk_filter *fp)
26279 unsigned int *addrs;
26280 const struct sock_filter *filter = fp->insns;
26281 int flen = fp->len;
26282 +#ifdef CONFIG_GRKERNSEC_JIT_HARDEN
26283 + unsigned int randkey;
26284 +#endif
26285
26286 if (!bpf_jit_enable)
26287 return;
26288 @@ -146,11 +248,19 @@ void bpf_jit_compile(struct sk_filter *fp)
26289 if (addrs == NULL)
26290 return;
26291
26292 + fp->work = kmalloc(sizeof(*fp->work), GFP_KERNEL);
26293 + if (!fp->work)
26294 + goto out;
26295 +
26296 +#ifdef CONFIG_GRKERNSEC_JIT_HARDEN
26297 + randkey = get_random_int();
26298 +#endif
26299 +
26300 /* Before first pass, make a rough estimation of addrs[]
26301 - * each bpf instruction is translated to less than 64 bytes
26302 + * each bpf instruction is translated to less than MAX_INSTR_CODE_SIZE bytes
26303 */
26304 for (proglen = 0, i = 0; i < flen; i++) {
26305 - proglen += 64;
26306 + proglen += MAX_INSTR_CODE_SIZE;
26307 addrs[i] = proglen;
26308 }
26309 cleanup_addr = proglen; /* epilogue address */
26310 @@ -258,10 +368,8 @@ void bpf_jit_compile(struct sk_filter *fp)
26311 case BPF_S_ALU_MUL_K: /* A *= K */
26312 if (is_imm8(K))
26313 EMIT3(0x6b, 0xc0, K); /* imul imm8,%eax,%eax */
26314 - else {
26315 - EMIT2(0x69, 0xc0); /* imul imm32,%eax */
26316 - EMIT(K, 4);
26317 - }
26318 + else
26319 + EMIT2_off32(0x69, 0xc0, K); /* imul imm32,%eax */
26320 break;
26321 case BPF_S_ALU_DIV_X: /* A /= X; */
26322 seen |= SEEN_XREG;
26323 @@ -281,8 +389,14 @@ void bpf_jit_compile(struct sk_filter *fp)
26324 EMIT4(0x31, 0xd2, 0xf7, 0xf3); /* xor %edx,%edx; div %ebx */
26325 break;
26326 case BPF_S_ALU_DIV_K: /* A = reciprocal_divide(A, K); */
26327 +#ifdef CONFIG_GRKERNSEC_JIT_HARDEN
26328 + DILUTE_CONST_SEQUENCE(K, randkey);
26329 + // imul rax, rcx
26330 + EMIT4(0x48, 0x0f, 0xaf, 0xc1);
26331 +#else
26332 EMIT3(0x48, 0x69, 0xc0); /* imul imm32,%rax,%rax */
26333 EMIT(K, 4);
26334 +#endif
26335 EMIT4(0x48, 0xc1, 0xe8, 0x20); /* shr $0x20,%rax */
26336 break;
26337 case BPF_S_ALU_AND_X:
26338 @@ -509,8 +623,7 @@ common_load_ind: seen |= SEEN_DATAREF | SEEN_XREG;
26339 if (is_imm8(K)) {
26340 EMIT3(0x8d, 0x73, K); /* lea imm8(%rbx), %esi */
26341 } else {
26342 - EMIT2(0x8d, 0xb3); /* lea imm32(%rbx),%esi */
26343 - EMIT(K, 4);
26344 + EMIT2_off32(0x8d, 0xb3, K); /* lea imm32(%rbx),%esi */
26345 }
26346 } else {
26347 EMIT2(0x89,0xde); /* mov %ebx,%esi */
26348 @@ -593,17 +706,18 @@ cond_branch: f_offset = addrs[i + filter[i].jf] - addrs[i];
26349 break;
26350 default:
26351 /* hmm, too complex filter, give up with jit compiler */
26352 - goto out;
26353 + goto error;
26354 }
26355 ilen = prog - temp;
26356 if (image) {
26357 if (unlikely(proglen + ilen > oldproglen)) {
26358 pr_err("bpb_jit_compile fatal error\n");
26359 - kfree(addrs);
26360 - module_free(NULL, image);
26361 - return;
26362 + module_free_exec(NULL, image);
26363 + goto error;
26364 }
26365 + pax_open_kernel();
26366 memcpy(image + proglen, temp, ilen);
26367 + pax_close_kernel();
26368 }
26369 proglen += ilen;
26370 addrs[i] = proglen;
26371 @@ -624,11 +738,9 @@ cond_branch: f_offset = addrs[i + filter[i].jf] - addrs[i];
26372 break;
26373 }
26374 if (proglen == oldproglen) {
26375 - image = module_alloc(max_t(unsigned int,
26376 - proglen,
26377 - sizeof(struct work_struct)));
26378 + image = module_alloc_exec(proglen);
26379 if (!image)
26380 - goto out;
26381 + goto error;
26382 }
26383 oldproglen = proglen;
26384 }
26385 @@ -644,7 +756,10 @@ cond_branch: f_offset = addrs[i + filter[i].jf] - addrs[i];
26386 bpf_flush_icache(image, image + proglen);
26387
26388 fp->bpf_func = (void *)image;
26389 - }
26390 + } else
26391 +error:
26392 + kfree(fp->work);
26393 +
26394 out:
26395 kfree(addrs);
26396 return;
26397 @@ -652,18 +767,20 @@ out:
26398
26399 static void jit_free_defer(struct work_struct *arg)
26400 {
26401 - module_free(NULL, arg);
26402 + module_free_exec(NULL, ((struct bpf_jit_work *)arg)->image);
26403 + kfree(arg);
26404 }
26405
26406 /* run from softirq, we must use a work_struct to call
26407 - * module_free() from process context
26408 + * module_free_exec() from process context
26409 */
26410 void bpf_jit_free(struct sk_filter *fp)
26411 {
26412 if (fp->bpf_func != sk_run_filter) {
26413 - struct work_struct *work = (struct work_struct *)fp->bpf_func;
26414 + struct work_struct *work = &fp->work->work;
26415
26416 INIT_WORK(work, jit_free_defer);
26417 + fp->work->image = fp->bpf_func;
26418 schedule_work(work);
26419 }
26420 }
26421 diff --git a/arch/x86/oprofile/backtrace.c b/arch/x86/oprofile/backtrace.c
26422 index d6aa6e8..266395a 100644
26423 --- a/arch/x86/oprofile/backtrace.c
26424 +++ b/arch/x86/oprofile/backtrace.c
26425 @@ -46,11 +46,11 @@ dump_user_backtrace_32(struct stack_frame_ia32 *head)
26426 struct stack_frame_ia32 *fp;
26427 unsigned long bytes;
26428
26429 - bytes = copy_from_user_nmi(bufhead, head, sizeof(bufhead));
26430 + bytes = copy_from_user_nmi(bufhead, (const char __force_user *)head, sizeof(bufhead));
26431 if (bytes != sizeof(bufhead))
26432 return NULL;
26433
26434 - fp = (struct stack_frame_ia32 *) compat_ptr(bufhead[0].next_frame);
26435 + fp = (struct stack_frame_ia32 __force_kernel *) compat_ptr(bufhead[0].next_frame);
26436
26437 oprofile_add_trace(bufhead[0].return_address);
26438
26439 @@ -92,7 +92,7 @@ static struct stack_frame *dump_user_backtrace(struct stack_frame *head)
26440 struct stack_frame bufhead[2];
26441 unsigned long bytes;
26442
26443 - bytes = copy_from_user_nmi(bufhead, head, sizeof(bufhead));
26444 + bytes = copy_from_user_nmi(bufhead, (const char __force_user *)head, sizeof(bufhead));
26445 if (bytes != sizeof(bufhead))
26446 return NULL;
26447
26448 @@ -111,7 +111,7 @@ x86_backtrace(struct pt_regs * const regs, unsigned int depth)
26449 {
26450 struct stack_frame *head = (struct stack_frame *)frame_pointer(regs);
26451
26452 - if (!user_mode_vm(regs)) {
26453 + if (!user_mode(regs)) {
26454 unsigned long stack = kernel_stack_pointer(regs);
26455 if (depth)
26456 dump_trace(NULL, regs, (unsigned long *)stack, 0,
26457 diff --git a/arch/x86/pci/mrst.c b/arch/x86/pci/mrst.c
26458 index e14a2ff..3fd6b58 100644
26459 --- a/arch/x86/pci/mrst.c
26460 +++ b/arch/x86/pci/mrst.c
26461 @@ -238,7 +238,9 @@ int __init pci_mrst_init(void)
26462 printk(KERN_INFO "Intel MID platform detected, using MID PCI ops\n");
26463 pci_mmcfg_late_init();
26464 pcibios_enable_irq = mrst_pci_irq_enable;
26465 - pci_root_ops = pci_mrst_ops;
26466 + pax_open_kernel();
26467 + memcpy((void *)&pci_root_ops, &pci_mrst_ops, sizeof(pci_mrst_ops));
26468 + pax_close_kernel();
26469 pci_soc_mode = 1;
26470 /* Continue with standard init */
26471 return 1;
26472 diff --git a/arch/x86/pci/pcbios.c b/arch/x86/pci/pcbios.c
26473 index da8fe05..7ee6704 100644
26474 --- a/arch/x86/pci/pcbios.c
26475 +++ b/arch/x86/pci/pcbios.c
26476 @@ -79,50 +79,93 @@ union bios32 {
26477 static struct {
26478 unsigned long address;
26479 unsigned short segment;
26480 -} bios32_indirect = { 0, __KERNEL_CS };
26481 +} bios32_indirect __read_only = { 0, __PCIBIOS_CS };
26482
26483 /*
26484 * Returns the entry point for the given service, NULL on error
26485 */
26486
26487 -static unsigned long bios32_service(unsigned long service)
26488 +static unsigned long __devinit bios32_service(unsigned long service)
26489 {
26490 unsigned char return_code; /* %al */
26491 unsigned long address; /* %ebx */
26492 unsigned long length; /* %ecx */
26493 unsigned long entry; /* %edx */
26494 unsigned long flags;
26495 + struct desc_struct d, *gdt;
26496
26497 local_irq_save(flags);
26498 - __asm__("lcall *(%%edi); cld"
26499 +
26500 + gdt = get_cpu_gdt_table(smp_processor_id());
26501 +
26502 + pack_descriptor(&d, 0UL, 0xFFFFFUL, 0x9B, 0xC);
26503 + write_gdt_entry(gdt, GDT_ENTRY_PCIBIOS_CS, &d, DESCTYPE_S);
26504 + pack_descriptor(&d, 0UL, 0xFFFFFUL, 0x93, 0xC);
26505 + write_gdt_entry(gdt, GDT_ENTRY_PCIBIOS_DS, &d, DESCTYPE_S);
26506 +
26507 + __asm__("movw %w7, %%ds; lcall *(%%edi); push %%ss; pop %%ds; cld"
26508 : "=a" (return_code),
26509 "=b" (address),
26510 "=c" (length),
26511 "=d" (entry)
26512 : "0" (service),
26513 "1" (0),
26514 - "D" (&bios32_indirect));
26515 + "D" (&bios32_indirect),
26516 + "r"(__PCIBIOS_DS)
26517 + : "memory");
26518 +
26519 + pax_open_kernel();
26520 + gdt[GDT_ENTRY_PCIBIOS_CS].a = 0;
26521 + gdt[GDT_ENTRY_PCIBIOS_CS].b = 0;
26522 + gdt[GDT_ENTRY_PCIBIOS_DS].a = 0;
26523 + gdt[GDT_ENTRY_PCIBIOS_DS].b = 0;
26524 + pax_close_kernel();
26525 +
26526 local_irq_restore(flags);
26527
26528 switch (return_code) {
26529 - case 0:
26530 - return address + entry;
26531 - case 0x80: /* Not present */
26532 - printk(KERN_WARNING "bios32_service(0x%lx): not present\n", service);
26533 - return 0;
26534 - default: /* Shouldn't happen */
26535 - printk(KERN_WARNING "bios32_service(0x%lx): returned 0x%x -- BIOS bug!\n",
26536 - service, return_code);
26537 + case 0: {
26538 + int cpu;
26539 + unsigned char flags;
26540 +
26541 + printk(KERN_INFO "bios32_service: base:%08lx length:%08lx entry:%08lx\n", address, length, entry);
26542 + if (address >= 0xFFFF0 || length > 0x100000 - address || length <= entry) {
26543 + printk(KERN_WARNING "bios32_service: not valid\n");
26544 return 0;
26545 + }
26546 + address = address + PAGE_OFFSET;
26547 + length += 16UL; /* some BIOSs underreport this... */
26548 + flags = 4;
26549 + if (length >= 64*1024*1024) {
26550 + length >>= PAGE_SHIFT;
26551 + flags |= 8;
26552 + }
26553 +
26554 + for (cpu = 0; cpu < nr_cpu_ids; cpu++) {
26555 + gdt = get_cpu_gdt_table(cpu);
26556 + pack_descriptor(&d, address, length, 0x9b, flags);
26557 + write_gdt_entry(gdt, GDT_ENTRY_PCIBIOS_CS, &d, DESCTYPE_S);
26558 + pack_descriptor(&d, address, length, 0x93, flags);
26559 + write_gdt_entry(gdt, GDT_ENTRY_PCIBIOS_DS, &d, DESCTYPE_S);
26560 + }
26561 + return entry;
26562 + }
26563 + case 0x80: /* Not present */
26564 + printk(KERN_WARNING "bios32_service(0x%lx): not present\n", service);
26565 + return 0;
26566 + default: /* Shouldn't happen */
26567 + printk(KERN_WARNING "bios32_service(0x%lx): returned 0x%x -- BIOS bug!\n",
26568 + service, return_code);
26569 + return 0;
26570 }
26571 }
26572
26573 static struct {
26574 unsigned long address;
26575 unsigned short segment;
26576 -} pci_indirect = { 0, __KERNEL_CS };
26577 +} pci_indirect __read_only = { 0, __PCIBIOS_CS };
26578
26579 -static int pci_bios_present;
26580 +static int pci_bios_present __read_only;
26581
26582 static int __devinit check_pcibios(void)
26583 {
26584 @@ -131,11 +174,13 @@ static int __devinit check_pcibios(void)
26585 unsigned long flags, pcibios_entry;
26586
26587 if ((pcibios_entry = bios32_service(PCI_SERVICE))) {
26588 - pci_indirect.address = pcibios_entry + PAGE_OFFSET;
26589 + pci_indirect.address = pcibios_entry;
26590
26591 local_irq_save(flags);
26592 - __asm__(
26593 - "lcall *(%%edi); cld\n\t"
26594 + __asm__("movw %w6, %%ds\n\t"
26595 + "lcall *%%ss:(%%edi); cld\n\t"
26596 + "push %%ss\n\t"
26597 + "pop %%ds\n\t"
26598 "jc 1f\n\t"
26599 "xor %%ah, %%ah\n"
26600 "1:"
26601 @@ -144,7 +189,8 @@ static int __devinit check_pcibios(void)
26602 "=b" (ebx),
26603 "=c" (ecx)
26604 : "1" (PCIBIOS_PCI_BIOS_PRESENT),
26605 - "D" (&pci_indirect)
26606 + "D" (&pci_indirect),
26607 + "r" (__PCIBIOS_DS)
26608 : "memory");
26609 local_irq_restore(flags);
26610
26611 @@ -189,7 +235,10 @@ static int pci_bios_read(unsigned int seg, unsigned int bus,
26612
26613 switch (len) {
26614 case 1:
26615 - __asm__("lcall *(%%esi); cld\n\t"
26616 + __asm__("movw %w6, %%ds\n\t"
26617 + "lcall *%%ss:(%%esi); cld\n\t"
26618 + "push %%ss\n\t"
26619 + "pop %%ds\n\t"
26620 "jc 1f\n\t"
26621 "xor %%ah, %%ah\n"
26622 "1:"
26623 @@ -198,7 +247,8 @@ static int pci_bios_read(unsigned int seg, unsigned int bus,
26624 : "1" (PCIBIOS_READ_CONFIG_BYTE),
26625 "b" (bx),
26626 "D" ((long)reg),
26627 - "S" (&pci_indirect));
26628 + "S" (&pci_indirect),
26629 + "r" (__PCIBIOS_DS));
26630 /*
26631 * Zero-extend the result beyond 8 bits, do not trust the
26632 * BIOS having done it:
26633 @@ -206,7 +256,10 @@ static int pci_bios_read(unsigned int seg, unsigned int bus,
26634 *value &= 0xff;
26635 break;
26636 case 2:
26637 - __asm__("lcall *(%%esi); cld\n\t"
26638 + __asm__("movw %w6, %%ds\n\t"
26639 + "lcall *%%ss:(%%esi); cld\n\t"
26640 + "push %%ss\n\t"
26641 + "pop %%ds\n\t"
26642 "jc 1f\n\t"
26643 "xor %%ah, %%ah\n"
26644 "1:"
26645 @@ -215,7 +268,8 @@ static int pci_bios_read(unsigned int seg, unsigned int bus,
26646 : "1" (PCIBIOS_READ_CONFIG_WORD),
26647 "b" (bx),
26648 "D" ((long)reg),
26649 - "S" (&pci_indirect));
26650 + "S" (&pci_indirect),
26651 + "r" (__PCIBIOS_DS));
26652 /*
26653 * Zero-extend the result beyond 16 bits, do not trust the
26654 * BIOS having done it:
26655 @@ -223,7 +277,10 @@ static int pci_bios_read(unsigned int seg, unsigned int bus,
26656 *value &= 0xffff;
26657 break;
26658 case 4:
26659 - __asm__("lcall *(%%esi); cld\n\t"
26660 + __asm__("movw %w6, %%ds\n\t"
26661 + "lcall *%%ss:(%%esi); cld\n\t"
26662 + "push %%ss\n\t"
26663 + "pop %%ds\n\t"
26664 "jc 1f\n\t"
26665 "xor %%ah, %%ah\n"
26666 "1:"
26667 @@ -232,7 +289,8 @@ static int pci_bios_read(unsigned int seg, unsigned int bus,
26668 : "1" (PCIBIOS_READ_CONFIG_DWORD),
26669 "b" (bx),
26670 "D" ((long)reg),
26671 - "S" (&pci_indirect));
26672 + "S" (&pci_indirect),
26673 + "r" (__PCIBIOS_DS));
26674 break;
26675 }
26676
26677 @@ -256,7 +314,10 @@ static int pci_bios_write(unsigned int seg, unsigned int bus,
26678
26679 switch (len) {
26680 case 1:
26681 - __asm__("lcall *(%%esi); cld\n\t"
26682 + __asm__("movw %w6, %%ds\n\t"
26683 + "lcall *%%ss:(%%esi); cld\n\t"
26684 + "push %%ss\n\t"
26685 + "pop %%ds\n\t"
26686 "jc 1f\n\t"
26687 "xor %%ah, %%ah\n"
26688 "1:"
26689 @@ -265,10 +326,14 @@ static int pci_bios_write(unsigned int seg, unsigned int bus,
26690 "c" (value),
26691 "b" (bx),
26692 "D" ((long)reg),
26693 - "S" (&pci_indirect));
26694 + "S" (&pci_indirect),
26695 + "r" (__PCIBIOS_DS));
26696 break;
26697 case 2:
26698 - __asm__("lcall *(%%esi); cld\n\t"
26699 + __asm__("movw %w6, %%ds\n\t"
26700 + "lcall *%%ss:(%%esi); cld\n\t"
26701 + "push %%ss\n\t"
26702 + "pop %%ds\n\t"
26703 "jc 1f\n\t"
26704 "xor %%ah, %%ah\n"
26705 "1:"
26706 @@ -277,10 +342,14 @@ static int pci_bios_write(unsigned int seg, unsigned int bus,
26707 "c" (value),
26708 "b" (bx),
26709 "D" ((long)reg),
26710 - "S" (&pci_indirect));
26711 + "S" (&pci_indirect),
26712 + "r" (__PCIBIOS_DS));
26713 break;
26714 case 4:
26715 - __asm__("lcall *(%%esi); cld\n\t"
26716 + __asm__("movw %w6, %%ds\n\t"
26717 + "lcall *%%ss:(%%esi); cld\n\t"
26718 + "push %%ss\n\t"
26719 + "pop %%ds\n\t"
26720 "jc 1f\n\t"
26721 "xor %%ah, %%ah\n"
26722 "1:"
26723 @@ -289,7 +358,8 @@ static int pci_bios_write(unsigned int seg, unsigned int bus,
26724 "c" (value),
26725 "b" (bx),
26726 "D" ((long)reg),
26727 - "S" (&pci_indirect));
26728 + "S" (&pci_indirect),
26729 + "r" (__PCIBIOS_DS));
26730 break;
26731 }
26732
26733 @@ -394,10 +464,13 @@ struct irq_routing_table * pcibios_get_irq_routing_table(void)
26734
26735 DBG("PCI: Fetching IRQ routing table... ");
26736 __asm__("push %%es\n\t"
26737 + "movw %w8, %%ds\n\t"
26738 "push %%ds\n\t"
26739 "pop %%es\n\t"
26740 - "lcall *(%%esi); cld\n\t"
26741 + "lcall *%%ss:(%%esi); cld\n\t"
26742 "pop %%es\n\t"
26743 + "push %%ss\n\t"
26744 + "pop %%ds\n"
26745 "jc 1f\n\t"
26746 "xor %%ah, %%ah\n"
26747 "1:"
26748 @@ -408,7 +481,8 @@ struct irq_routing_table * pcibios_get_irq_routing_table(void)
26749 "1" (0),
26750 "D" ((long) &opt),
26751 "S" (&pci_indirect),
26752 - "m" (opt)
26753 + "m" (opt),
26754 + "r" (__PCIBIOS_DS)
26755 : "memory");
26756 DBG("OK ret=%d, size=%d, map=%x\n", ret, opt.size, map);
26757 if (ret & 0xff00)
26758 @@ -432,7 +506,10 @@ int pcibios_set_irq_routing(struct pci_dev *dev, int pin, int irq)
26759 {
26760 int ret;
26761
26762 - __asm__("lcall *(%%esi); cld\n\t"
26763 + __asm__("movw %w5, %%ds\n\t"
26764 + "lcall *%%ss:(%%esi); cld\n\t"
26765 + "push %%ss\n\t"
26766 + "pop %%ds\n"
26767 "jc 1f\n\t"
26768 "xor %%ah, %%ah\n"
26769 "1:"
26770 @@ -440,7 +517,8 @@ int pcibios_set_irq_routing(struct pci_dev *dev, int pin, int irq)
26771 : "0" (PCIBIOS_SET_PCI_HW_INT),
26772 "b" ((dev->bus->number << 8) | dev->devfn),
26773 "c" ((irq << 8) | (pin + 10)),
26774 - "S" (&pci_indirect));
26775 + "S" (&pci_indirect),
26776 + "r" (__PCIBIOS_DS));
26777 return !(ret & 0xff00);
26778 }
26779 EXPORT_SYMBOL(pcibios_set_irq_routing);
26780 diff --git a/arch/x86/platform/efi/efi_32.c b/arch/x86/platform/efi/efi_32.c
26781 index 40e4469..1ab536e 100644
26782 --- a/arch/x86/platform/efi/efi_32.c
26783 +++ b/arch/x86/platform/efi/efi_32.c
26784 @@ -44,11 +44,22 @@ void efi_call_phys_prelog(void)
26785 {
26786 struct desc_ptr gdt_descr;
26787
26788 +#ifdef CONFIG_PAX_KERNEXEC
26789 + struct desc_struct d;
26790 +#endif
26791 +
26792 local_irq_save(efi_rt_eflags);
26793
26794 load_cr3(initial_page_table);
26795 __flush_tlb_all();
26796
26797 +#ifdef CONFIG_PAX_KERNEXEC
26798 + pack_descriptor(&d, 0, 0xFFFFF, 0x9B, 0xC);
26799 + write_gdt_entry(get_cpu_gdt_table(0), GDT_ENTRY_KERNEXEC_EFI_CS, &d, DESCTYPE_S);
26800 + pack_descriptor(&d, 0, 0xFFFFF, 0x93, 0xC);
26801 + write_gdt_entry(get_cpu_gdt_table(0), GDT_ENTRY_KERNEXEC_EFI_DS, &d, DESCTYPE_S);
26802 +#endif
26803 +
26804 gdt_descr.address = __pa(get_cpu_gdt_table(0));
26805 gdt_descr.size = GDT_SIZE - 1;
26806 load_gdt(&gdt_descr);
26807 @@ -58,6 +69,14 @@ void efi_call_phys_epilog(void)
26808 {
26809 struct desc_ptr gdt_descr;
26810
26811 +#ifdef CONFIG_PAX_KERNEXEC
26812 + struct desc_struct d;
26813 +
26814 + memset(&d, 0, sizeof d);
26815 + write_gdt_entry(get_cpu_gdt_table(0), GDT_ENTRY_KERNEXEC_EFI_CS, &d, DESCTYPE_S);
26816 + write_gdt_entry(get_cpu_gdt_table(0), GDT_ENTRY_KERNEXEC_EFI_DS, &d, DESCTYPE_S);
26817 +#endif
26818 +
26819 gdt_descr.address = (unsigned long)get_cpu_gdt_table(0);
26820 gdt_descr.size = GDT_SIZE - 1;
26821 load_gdt(&gdt_descr);
26822 diff --git a/arch/x86/platform/efi/efi_stub_32.S b/arch/x86/platform/efi/efi_stub_32.S
26823 index fbe66e6..eae5e38 100644
26824 --- a/arch/x86/platform/efi/efi_stub_32.S
26825 +++ b/arch/x86/platform/efi/efi_stub_32.S
26826 @@ -6,7 +6,9 @@
26827 */
26828
26829 #include <linux/linkage.h>
26830 +#include <linux/init.h>
26831 #include <asm/page_types.h>
26832 +#include <asm/segment.h>
26833
26834 /*
26835 * efi_call_phys(void *, ...) is a function with variable parameters.
26836 @@ -20,7 +22,7 @@
26837 * service functions will comply with gcc calling convention, too.
26838 */
26839
26840 -.text
26841 +__INIT
26842 ENTRY(efi_call_phys)
26843 /*
26844 * 0. The function can only be called in Linux kernel. So CS has been
26845 @@ -36,10 +38,24 @@ ENTRY(efi_call_phys)
26846 * The mapping of lower virtual memory has been created in prelog and
26847 * epilog.
26848 */
26849 - movl $1f, %edx
26850 - subl $__PAGE_OFFSET, %edx
26851 - jmp *%edx
26852 +#ifdef CONFIG_PAX_KERNEXEC
26853 + movl $(__KERNEXEC_EFI_DS), %edx
26854 + mov %edx, %ds
26855 + mov %edx, %es
26856 + mov %edx, %ss
26857 + addl $2f,(1f)
26858 + ljmp *(1f)
26859 +
26860 +__INITDATA
26861 +1: .long __LOAD_PHYSICAL_ADDR, __KERNEXEC_EFI_CS
26862 +.previous
26863 +
26864 +2:
26865 + subl $2b,(1b)
26866 +#else
26867 + jmp 1f-__PAGE_OFFSET
26868 1:
26869 +#endif
26870
26871 /*
26872 * 2. Now on the top of stack is the return
26873 @@ -47,14 +63,8 @@ ENTRY(efi_call_phys)
26874 * parameter 2, ..., param n. To make things easy, we save the return
26875 * address of efi_call_phys in a global variable.
26876 */
26877 - popl %edx
26878 - movl %edx, saved_return_addr
26879 - /* get the function pointer into ECX*/
26880 - popl %ecx
26881 - movl %ecx, efi_rt_function_ptr
26882 - movl $2f, %edx
26883 - subl $__PAGE_OFFSET, %edx
26884 - pushl %edx
26885 + popl (saved_return_addr)
26886 + popl (efi_rt_function_ptr)
26887
26888 /*
26889 * 3. Clear PG bit in %CR0.
26890 @@ -73,9 +83,8 @@ ENTRY(efi_call_phys)
26891 /*
26892 * 5. Call the physical function.
26893 */
26894 - jmp *%ecx
26895 + call *(efi_rt_function_ptr-__PAGE_OFFSET)
26896
26897 -2:
26898 /*
26899 * 6. After EFI runtime service returns, control will return to
26900 * following instruction. We'd better readjust stack pointer first.
26901 @@ -88,35 +97,36 @@ ENTRY(efi_call_phys)
26902 movl %cr0, %edx
26903 orl $0x80000000, %edx
26904 movl %edx, %cr0
26905 - jmp 1f
26906 -1:
26907 +
26908 /*
26909 * 8. Now restore the virtual mode from flat mode by
26910 * adding EIP with PAGE_OFFSET.
26911 */
26912 - movl $1f, %edx
26913 - jmp *%edx
26914 +#ifdef CONFIG_PAX_KERNEXEC
26915 + movl $(__KERNEL_DS), %edx
26916 + mov %edx, %ds
26917 + mov %edx, %es
26918 + mov %edx, %ss
26919 + ljmp $(__KERNEL_CS),$1f
26920 +#else
26921 + jmp 1f+__PAGE_OFFSET
26922 +#endif
26923 1:
26924
26925 /*
26926 * 9. Balance the stack. And because EAX contain the return value,
26927 * we'd better not clobber it.
26928 */
26929 - leal efi_rt_function_ptr, %edx
26930 - movl (%edx), %ecx
26931 - pushl %ecx
26932 + pushl (efi_rt_function_ptr)
26933
26934 /*
26935 - * 10. Push the saved return address onto the stack and return.
26936 + * 10. Return to the saved return address.
26937 */
26938 - leal saved_return_addr, %edx
26939 - movl (%edx), %ecx
26940 - pushl %ecx
26941 - ret
26942 + jmpl *(saved_return_addr)
26943 ENDPROC(efi_call_phys)
26944 .previous
26945
26946 -.data
26947 +__INITDATA
26948 saved_return_addr:
26949 .long 0
26950 efi_rt_function_ptr:
26951 diff --git a/arch/x86/platform/efi/efi_stub_64.S b/arch/x86/platform/efi/efi_stub_64.S
26952 index 4c07cca..2c8427d 100644
26953 --- a/arch/x86/platform/efi/efi_stub_64.S
26954 +++ b/arch/x86/platform/efi/efi_stub_64.S
26955 @@ -7,6 +7,7 @@
26956 */
26957
26958 #include <linux/linkage.h>
26959 +#include <asm/alternative-asm.h>
26960
26961 #define SAVE_XMM \
26962 mov %rsp, %rax; \
26963 @@ -40,6 +41,7 @@ ENTRY(efi_call0)
26964 call *%rdi
26965 addq $32, %rsp
26966 RESTORE_XMM
26967 + pax_force_retaddr 0, 1
26968 ret
26969 ENDPROC(efi_call0)
26970
26971 @@ -50,6 +52,7 @@ ENTRY(efi_call1)
26972 call *%rdi
26973 addq $32, %rsp
26974 RESTORE_XMM
26975 + pax_force_retaddr 0, 1
26976 ret
26977 ENDPROC(efi_call1)
26978
26979 @@ -60,6 +63,7 @@ ENTRY(efi_call2)
26980 call *%rdi
26981 addq $32, %rsp
26982 RESTORE_XMM
26983 + pax_force_retaddr 0, 1
26984 ret
26985 ENDPROC(efi_call2)
26986
26987 @@ -71,6 +75,7 @@ ENTRY(efi_call3)
26988 call *%rdi
26989 addq $32, %rsp
26990 RESTORE_XMM
26991 + pax_force_retaddr 0, 1
26992 ret
26993 ENDPROC(efi_call3)
26994
26995 @@ -83,6 +88,7 @@ ENTRY(efi_call4)
26996 call *%rdi
26997 addq $32, %rsp
26998 RESTORE_XMM
26999 + pax_force_retaddr 0, 1
27000 ret
27001 ENDPROC(efi_call4)
27002
27003 @@ -96,6 +102,7 @@ ENTRY(efi_call5)
27004 call *%rdi
27005 addq $48, %rsp
27006 RESTORE_XMM
27007 + pax_force_retaddr 0, 1
27008 ret
27009 ENDPROC(efi_call5)
27010
27011 @@ -112,5 +119,6 @@ ENTRY(efi_call6)
27012 call *%rdi
27013 addq $48, %rsp
27014 RESTORE_XMM
27015 + pax_force_retaddr 0, 1
27016 ret
27017 ENDPROC(efi_call6)
27018 diff --git a/arch/x86/platform/mrst/mrst.c b/arch/x86/platform/mrst/mrst.c
27019 index fd41a92..9c33628 100644
27020 --- a/arch/x86/platform/mrst/mrst.c
27021 +++ b/arch/x86/platform/mrst/mrst.c
27022 @@ -78,13 +78,15 @@ struct sfi_rtc_table_entry sfi_mrtc_array[SFI_MRTC_MAX];
27023 EXPORT_SYMBOL_GPL(sfi_mrtc_array);
27024 int sfi_mrtc_num;
27025
27026 -static void mrst_power_off(void)
27027 +static __noreturn void mrst_power_off(void)
27028 {
27029 + BUG();
27030 }
27031
27032 -static void mrst_reboot(void)
27033 +static __noreturn void mrst_reboot(void)
27034 {
27035 intel_scu_ipc_simple_command(IPCMSG_COLD_BOOT, 0);
27036 + BUG();
27037 }
27038
27039 /* parse all the mtimer info to a static mtimer array */
27040 diff --git a/arch/x86/power/cpu.c b/arch/x86/power/cpu.c
27041 index 218cdb1..fd55c08 100644
27042 --- a/arch/x86/power/cpu.c
27043 +++ b/arch/x86/power/cpu.c
27044 @@ -132,7 +132,7 @@ static void do_fpu_end(void)
27045 static void fix_processor_context(void)
27046 {
27047 int cpu = smp_processor_id();
27048 - struct tss_struct *t = &per_cpu(init_tss, cpu);
27049 + struct tss_struct *t = init_tss + cpu;
27050
27051 set_tss_desc(cpu, t); /*
27052 * This just modifies memory; should not be
27053 @@ -142,7 +142,9 @@ static void fix_processor_context(void)
27054 */
27055
27056 #ifdef CONFIG_X86_64
27057 + pax_open_kernel();
27058 get_cpu_gdt_table(cpu)[GDT_ENTRY_TSS].type = 9;
27059 + pax_close_kernel();
27060
27061 syscall_init(); /* This sets MSR_*STAR and related */
27062 #endif
27063 diff --git a/arch/x86/realmode/init.c b/arch/x86/realmode/init.c
27064 index cbca565..bae7133 100644
27065 --- a/arch/x86/realmode/init.c
27066 +++ b/arch/x86/realmode/init.c
27067 @@ -62,7 +62,13 @@ void __init setup_real_mode(void)
27068 __va(real_mode_header->trampoline_header);
27069
27070 #ifdef CONFIG_X86_32
27071 - trampoline_header->start = __pa(startup_32_smp);
27072 + trampoline_header->start = __pa(ktla_ktva(startup_32_smp));
27073 +
27074 +#ifdef CONFIG_PAX_KERNEXEC
27075 + trampoline_header->start -= LOAD_PHYSICAL_ADDR;
27076 +#endif
27077 +
27078 + trampoline_header->boot_cs = __BOOT_CS;
27079 trampoline_header->gdt_limit = __BOOT_DS + 7;
27080 trampoline_header->gdt_base = __pa(boot_gdt);
27081 #else
27082 diff --git a/arch/x86/realmode/rm/Makefile b/arch/x86/realmode/rm/Makefile
27083 index 8869287..d577672 100644
27084 --- a/arch/x86/realmode/rm/Makefile
27085 +++ b/arch/x86/realmode/rm/Makefile
27086 @@ -78,5 +78,8 @@ KBUILD_CFLAGS := $(LINUXINCLUDE) -m32 -g -Os -D_SETUP -D__KERNEL__ -D_WAKEUP \
27087 $(call cc-option, -fno-unit-at-a-time)) \
27088 $(call cc-option, -fno-stack-protector) \
27089 $(call cc-option, -mpreferred-stack-boundary=2)
27090 +ifdef CONSTIFY_PLUGIN
27091 +KBUILD_CFLAGS += -fplugin-arg-constify_plugin-no-constify
27092 +endif
27093 KBUILD_AFLAGS := $(KBUILD_CFLAGS) -D__ASSEMBLY__
27094 GCOV_PROFILE := n
27095 diff --git a/arch/x86/realmode/rm/header.S b/arch/x86/realmode/rm/header.S
27096 index a28221d..93c40f1 100644
27097 --- a/arch/x86/realmode/rm/header.S
27098 +++ b/arch/x86/realmode/rm/header.S
27099 @@ -30,7 +30,9 @@ GLOBAL(real_mode_header)
27100 #endif
27101 /* APM/BIOS reboot */
27102 .long pa_machine_real_restart_asm
27103 -#ifdef CONFIG_X86_64
27104 +#ifdef CONFIG_X86_32
27105 + .long __KERNEL_CS
27106 +#else
27107 .long __KERNEL32_CS
27108 #endif
27109 END(real_mode_header)
27110 diff --git a/arch/x86/realmode/rm/trampoline_32.S b/arch/x86/realmode/rm/trampoline_32.S
27111 index c1b2791..f9e31c7 100644
27112 --- a/arch/x86/realmode/rm/trampoline_32.S
27113 +++ b/arch/x86/realmode/rm/trampoline_32.S
27114 @@ -25,6 +25,12 @@
27115 #include <asm/page_types.h>
27116 #include "realmode.h"
27117
27118 +#ifdef CONFIG_PAX_KERNEXEC
27119 +#define ta(X) (X)
27120 +#else
27121 +#define ta(X) (pa_ ## X)
27122 +#endif
27123 +
27124 .text
27125 .code16
27126
27127 @@ -39,8 +45,6 @@ ENTRY(trampoline_start)
27128
27129 cli # We should be safe anyway
27130
27131 - movl tr_start, %eax # where we need to go
27132 -
27133 movl $0xA5A5A5A5, trampoline_status
27134 # write marker for master knows we're running
27135
27136 @@ -56,7 +60,7 @@ ENTRY(trampoline_start)
27137 movw $1, %dx # protected mode (PE) bit
27138 lmsw %dx # into protected mode
27139
27140 - ljmpl $__BOOT_CS, $pa_startup_32
27141 + ljmpl *(trampoline_header)
27142
27143 .section ".text32","ax"
27144 .code32
27145 @@ -67,7 +71,7 @@ ENTRY(startup_32) # note: also used from wakeup_asm.S
27146 .balign 8
27147 GLOBAL(trampoline_header)
27148 tr_start: .space 4
27149 - tr_gdt_pad: .space 2
27150 + tr_boot_cs: .space 2
27151 tr_gdt: .space 6
27152 END(trampoline_header)
27153
27154 diff --git a/arch/x86/realmode/rm/trampoline_64.S b/arch/x86/realmode/rm/trampoline_64.S
27155 index bb360dc..3e5945f 100644
27156 --- a/arch/x86/realmode/rm/trampoline_64.S
27157 +++ b/arch/x86/realmode/rm/trampoline_64.S
27158 @@ -107,7 +107,7 @@ ENTRY(startup_32)
27159 wrmsr
27160
27161 # Enable paging and in turn activate Long Mode
27162 - movl $(X86_CR0_PG | X86_CR0_WP | X86_CR0_PE), %eax
27163 + movl $(X86_CR0_PG | X86_CR0_PE), %eax
27164 movl %eax, %cr0
27165
27166 /*
27167 diff --git a/arch/x86/tools/relocs.c b/arch/x86/tools/relocs.c
27168 index 5a1847d..deccb30 100644
27169 --- a/arch/x86/tools/relocs.c
27170 +++ b/arch/x86/tools/relocs.c
27171 @@ -12,10 +12,13 @@
27172 #include <regex.h>
27173 #include <tools/le_byteshift.h>
27174
27175 +#include "../../../include/generated/autoconf.h"
27176 +
27177 static void die(char *fmt, ...);
27178
27179 #define ARRAY_SIZE(x) (sizeof(x) / sizeof((x)[0]))
27180 static Elf32_Ehdr ehdr;
27181 +static Elf32_Phdr *phdr;
27182 static unsigned long reloc_count, reloc_idx;
27183 static unsigned long *relocs;
27184 static unsigned long reloc16_count, reloc16_idx;
27185 @@ -330,9 +333,39 @@ static void read_ehdr(FILE *fp)
27186 }
27187 }
27188
27189 +static void read_phdrs(FILE *fp)
27190 +{
27191 + unsigned int i;
27192 +
27193 + phdr = calloc(ehdr.e_phnum, sizeof(Elf32_Phdr));
27194 + if (!phdr) {
27195 + die("Unable to allocate %d program headers\n",
27196 + ehdr.e_phnum);
27197 + }
27198 + if (fseek(fp, ehdr.e_phoff, SEEK_SET) < 0) {
27199 + die("Seek to %d failed: %s\n",
27200 + ehdr.e_phoff, strerror(errno));
27201 + }
27202 + if (fread(phdr, sizeof(*phdr), ehdr.e_phnum, fp) != ehdr.e_phnum) {
27203 + die("Cannot read ELF program headers: %s\n",
27204 + strerror(errno));
27205 + }
27206 + for(i = 0; i < ehdr.e_phnum; i++) {
27207 + phdr[i].p_type = elf32_to_cpu(phdr[i].p_type);
27208 + phdr[i].p_offset = elf32_to_cpu(phdr[i].p_offset);
27209 + phdr[i].p_vaddr = elf32_to_cpu(phdr[i].p_vaddr);
27210 + phdr[i].p_paddr = elf32_to_cpu(phdr[i].p_paddr);
27211 + phdr[i].p_filesz = elf32_to_cpu(phdr[i].p_filesz);
27212 + phdr[i].p_memsz = elf32_to_cpu(phdr[i].p_memsz);
27213 + phdr[i].p_flags = elf32_to_cpu(phdr[i].p_flags);
27214 + phdr[i].p_align = elf32_to_cpu(phdr[i].p_align);
27215 + }
27216 +
27217 +}
27218 +
27219 static void read_shdrs(FILE *fp)
27220 {
27221 - int i;
27222 + unsigned int i;
27223 Elf32_Shdr shdr;
27224
27225 secs = calloc(ehdr.e_shnum, sizeof(struct section));
27226 @@ -367,7 +400,7 @@ static void read_shdrs(FILE *fp)
27227
27228 static void read_strtabs(FILE *fp)
27229 {
27230 - int i;
27231 + unsigned int i;
27232 for (i = 0; i < ehdr.e_shnum; i++) {
27233 struct section *sec = &secs[i];
27234 if (sec->shdr.sh_type != SHT_STRTAB) {
27235 @@ -392,7 +425,7 @@ static void read_strtabs(FILE *fp)
27236
27237 static void read_symtabs(FILE *fp)
27238 {
27239 - int i,j;
27240 + unsigned int i,j;
27241 for (i = 0; i < ehdr.e_shnum; i++) {
27242 struct section *sec = &secs[i];
27243 if (sec->shdr.sh_type != SHT_SYMTAB) {
27244 @@ -423,9 +456,11 @@ static void read_symtabs(FILE *fp)
27245 }
27246
27247
27248 -static void read_relocs(FILE *fp)
27249 +static void read_relocs(FILE *fp, int use_real_mode)
27250 {
27251 - int i,j;
27252 + unsigned int i,j;
27253 + uint32_t base;
27254 +
27255 for (i = 0; i < ehdr.e_shnum; i++) {
27256 struct section *sec = &secs[i];
27257 if (sec->shdr.sh_type != SHT_REL) {
27258 @@ -445,9 +480,22 @@ static void read_relocs(FILE *fp)
27259 die("Cannot read symbol table: %s\n",
27260 strerror(errno));
27261 }
27262 + base = 0;
27263 +
27264 +#ifdef CONFIG_X86_32
27265 + for (j = 0; !use_real_mode && j < ehdr.e_phnum; j++) {
27266 + if (phdr[j].p_type != PT_LOAD )
27267 + continue;
27268 + 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)
27269 + continue;
27270 + base = CONFIG_PAGE_OFFSET + phdr[j].p_paddr - phdr[j].p_vaddr;
27271 + break;
27272 + }
27273 +#endif
27274 +
27275 for (j = 0; j < sec->shdr.sh_size/sizeof(Elf32_Rel); j++) {
27276 Elf32_Rel *rel = &sec->reltab[j];
27277 - rel->r_offset = elf32_to_cpu(rel->r_offset);
27278 + rel->r_offset = elf32_to_cpu(rel->r_offset) + base;
27279 rel->r_info = elf32_to_cpu(rel->r_info);
27280 }
27281 }
27282 @@ -456,13 +504,13 @@ static void read_relocs(FILE *fp)
27283
27284 static void print_absolute_symbols(void)
27285 {
27286 - int i;
27287 + unsigned int i;
27288 printf("Absolute symbols\n");
27289 printf(" Num: Value Size Type Bind Visibility Name\n");
27290 for (i = 0; i < ehdr.e_shnum; i++) {
27291 struct section *sec = &secs[i];
27292 char *sym_strtab;
27293 - int j;
27294 + unsigned int j;
27295
27296 if (sec->shdr.sh_type != SHT_SYMTAB) {
27297 continue;
27298 @@ -489,14 +537,14 @@ static void print_absolute_symbols(void)
27299
27300 static void print_absolute_relocs(void)
27301 {
27302 - int i, printed = 0;
27303 + unsigned int i, printed = 0;
27304
27305 for (i = 0; i < ehdr.e_shnum; i++) {
27306 struct section *sec = &secs[i];
27307 struct section *sec_applies, *sec_symtab;
27308 char *sym_strtab;
27309 Elf32_Sym *sh_symtab;
27310 - int j;
27311 + unsigned int j;
27312 if (sec->shdr.sh_type != SHT_REL) {
27313 continue;
27314 }
27315 @@ -558,13 +606,13 @@ static void print_absolute_relocs(void)
27316 static void walk_relocs(void (*visit)(Elf32_Rel *rel, Elf32_Sym *sym),
27317 int use_real_mode)
27318 {
27319 - int i;
27320 + unsigned int i;
27321 /* Walk through the relocations */
27322 for (i = 0; i < ehdr.e_shnum; i++) {
27323 char *sym_strtab;
27324 Elf32_Sym *sh_symtab;
27325 struct section *sec_applies, *sec_symtab;
27326 - int j;
27327 + unsigned int j;
27328 struct section *sec = &secs[i];
27329
27330 if (sec->shdr.sh_type != SHT_REL) {
27331 @@ -588,6 +636,24 @@ static void walk_relocs(void (*visit)(Elf32_Rel *rel, Elf32_Sym *sym),
27332 sym = &sh_symtab[ELF32_R_SYM(rel->r_info)];
27333 r_type = ELF32_R_TYPE(rel->r_info);
27334
27335 + if (!use_real_mode) {
27336 + /* Don't relocate actual per-cpu variables, they are absolute indices, not addresses */
27337 + if (!strcmp(sec_name(sym->st_shndx), ".data..percpu") && strcmp(sym_name(sym_strtab, sym), "__per_cpu_load"))
27338 + continue;
27339 +
27340 +#if defined(CONFIG_PAX_KERNEXEC) && defined(CONFIG_X86_32)
27341 + /* Don't relocate actual code, they are relocated implicitly by the base address of KERNEL_CS */
27342 + if (!strcmp(sec_name(sym->st_shndx), ".text.end") && !strcmp(sym_name(sym_strtab, sym), "_etext"))
27343 + continue;
27344 + if (!strcmp(sec_name(sym->st_shndx), ".init.text"))
27345 + continue;
27346 + if (!strcmp(sec_name(sym->st_shndx), ".exit.text"))
27347 + continue;
27348 + if (!strcmp(sec_name(sym->st_shndx), ".text") && strcmp(sym_name(sym_strtab, sym), "__LOAD_PHYSICAL_ADDR"))
27349 + continue;
27350 +#endif
27351 + }
27352 +
27353 shn_abs = sym->st_shndx == SHN_ABS;
27354
27355 switch (r_type) {
27356 @@ -681,7 +747,7 @@ static int write32(unsigned int v, FILE *f)
27357
27358 static void emit_relocs(int as_text, int use_real_mode)
27359 {
27360 - int i;
27361 + unsigned int i;
27362 /* Count how many relocations I have and allocate space for them. */
27363 reloc_count = 0;
27364 walk_relocs(count_reloc, use_real_mode);
27365 @@ -808,10 +874,11 @@ int main(int argc, char **argv)
27366 fname, strerror(errno));
27367 }
27368 read_ehdr(fp);
27369 + read_phdrs(fp);
27370 read_shdrs(fp);
27371 read_strtabs(fp);
27372 read_symtabs(fp);
27373 - read_relocs(fp);
27374 + read_relocs(fp, use_real_mode);
27375 if (show_absolute_syms) {
27376 print_absolute_symbols();
27377 return 0;
27378 diff --git a/arch/x86/vdso/Makefile b/arch/x86/vdso/Makefile
27379 index fd14be1..e3c79c0 100644
27380 --- a/arch/x86/vdso/Makefile
27381 +++ b/arch/x86/vdso/Makefile
27382 @@ -181,7 +181,7 @@ quiet_cmd_vdso = VDSO $@
27383 -Wl,-T,$(filter %.lds,$^) $(filter %.o,$^) && \
27384 sh $(srctree)/$(src)/checkundef.sh '$(NM)' '$@'
27385
27386 -VDSO_LDFLAGS = -fPIC -shared $(call cc-ldoption, -Wl$(comma)--hash-style=sysv)
27387 +VDSO_LDFLAGS = -fPIC -shared -Wl,--no-undefined $(call cc-ldoption, -Wl$(comma)--hash-style=sysv)
27388 GCOV_PROFILE := n
27389
27390 #
27391 diff --git a/arch/x86/vdso/vdso32-setup.c b/arch/x86/vdso/vdso32-setup.c
27392 index 0faad64..39ef157 100644
27393 --- a/arch/x86/vdso/vdso32-setup.c
27394 +++ b/arch/x86/vdso/vdso32-setup.c
27395 @@ -25,6 +25,7 @@
27396 #include <asm/tlbflush.h>
27397 #include <asm/vdso.h>
27398 #include <asm/proto.h>
27399 +#include <asm/mman.h>
27400
27401 enum {
27402 VDSO_DISABLED = 0,
27403 @@ -226,7 +227,7 @@ static inline void map_compat_vdso(int map)
27404 void enable_sep_cpu(void)
27405 {
27406 int cpu = get_cpu();
27407 - struct tss_struct *tss = &per_cpu(init_tss, cpu);
27408 + struct tss_struct *tss = init_tss + cpu;
27409
27410 if (!boot_cpu_has(X86_FEATURE_SEP)) {
27411 put_cpu();
27412 @@ -249,7 +250,7 @@ static int __init gate_vma_init(void)
27413 gate_vma.vm_start = FIXADDR_USER_START;
27414 gate_vma.vm_end = FIXADDR_USER_END;
27415 gate_vma.vm_flags = VM_READ | VM_MAYREAD | VM_EXEC | VM_MAYEXEC;
27416 - gate_vma.vm_page_prot = __P101;
27417 + gate_vma.vm_page_prot = vm_get_page_prot(gate_vma.vm_flags);
27418
27419 return 0;
27420 }
27421 @@ -330,14 +331,14 @@ int arch_setup_additional_pages(struct linux_binprm *bprm, int uses_interp)
27422 if (compat)
27423 addr = VDSO_HIGH_BASE;
27424 else {
27425 - addr = get_unmapped_area(NULL, 0, PAGE_SIZE, 0, 0);
27426 + addr = get_unmapped_area(NULL, 0, PAGE_SIZE, 0, MAP_EXECUTABLE);
27427 if (IS_ERR_VALUE(addr)) {
27428 ret = addr;
27429 goto up_fail;
27430 }
27431 }
27432
27433 - current->mm->context.vdso = (void *)addr;
27434 + current->mm->context.vdso = addr;
27435
27436 if (compat_uses_vma || !compat) {
27437 /*
27438 @@ -353,11 +354,11 @@ int arch_setup_additional_pages(struct linux_binprm *bprm, int uses_interp)
27439 }
27440
27441 current_thread_info()->sysenter_return =
27442 - VDSO32_SYMBOL(addr, SYSENTER_RETURN);
27443 + (__force void __user *)VDSO32_SYMBOL(addr, SYSENTER_RETURN);
27444
27445 up_fail:
27446 if (ret)
27447 - current->mm->context.vdso = NULL;
27448 + current->mm->context.vdso = 0;
27449
27450 up_write(&mm->mmap_sem);
27451
27452 @@ -404,8 +405,14 @@ __initcall(ia32_binfmt_init);
27453
27454 const char *arch_vma_name(struct vm_area_struct *vma)
27455 {
27456 - if (vma->vm_mm && vma->vm_start == (long)vma->vm_mm->context.vdso)
27457 + if (vma->vm_mm && vma->vm_start == vma->vm_mm->context.vdso)
27458 return "[vdso]";
27459 +
27460 +#ifdef CONFIG_PAX_SEGMEXEC
27461 + if (vma->vm_mm && vma->vm_mirror && vma->vm_mirror->vm_start == vma->vm_mm->context.vdso)
27462 + return "[vdso]";
27463 +#endif
27464 +
27465 return NULL;
27466 }
27467
27468 @@ -415,7 +422,7 @@ struct vm_area_struct *get_gate_vma(struct mm_struct *mm)
27469 * Check to see if the corresponding task was created in compat vdso
27470 * mode.
27471 */
27472 - if (mm && mm->context.vdso == (void *)VDSO_HIGH_BASE)
27473 + if (mm && mm->context.vdso == VDSO_HIGH_BASE)
27474 return &gate_vma;
27475 return NULL;
27476 }
27477 diff --git a/arch/x86/vdso/vma.c b/arch/x86/vdso/vma.c
27478 index 00aaf04..4a26505 100644
27479 --- a/arch/x86/vdso/vma.c
27480 +++ b/arch/x86/vdso/vma.c
27481 @@ -16,8 +16,6 @@
27482 #include <asm/vdso.h>
27483 #include <asm/page.h>
27484
27485 -unsigned int __read_mostly vdso_enabled = 1;
27486 -
27487 extern char vdso_start[], vdso_end[];
27488 extern unsigned short vdso_sync_cpuid;
27489
27490 @@ -141,7 +139,6 @@ static unsigned long vdso_addr(unsigned long start, unsigned len)
27491 * unaligned here as a result of stack start randomization.
27492 */
27493 addr = PAGE_ALIGN(addr);
27494 - addr = align_addr(addr, NULL, ALIGN_VDSO);
27495
27496 return addr;
27497 }
27498 @@ -154,30 +151,31 @@ static int setup_additional_pages(struct linux_binprm *bprm,
27499 unsigned size)
27500 {
27501 struct mm_struct *mm = current->mm;
27502 - unsigned long addr;
27503 + unsigned long addr = 0;
27504 int ret;
27505
27506 - if (!vdso_enabled)
27507 - return 0;
27508 -
27509 down_write(&mm->mmap_sem);
27510 +
27511 +#ifdef CONFIG_PAX_RANDMMAP
27512 + if (!(mm->pax_flags & MF_PAX_RANDMMAP))
27513 +#endif
27514 +
27515 addr = vdso_addr(mm->start_stack, size);
27516 + addr = align_addr(addr, NULL, ALIGN_VDSO);
27517 addr = get_unmapped_area(NULL, addr, size, 0, 0);
27518 if (IS_ERR_VALUE(addr)) {
27519 ret = addr;
27520 goto up_fail;
27521 }
27522
27523 - current->mm->context.vdso = (void *)addr;
27524 + mm->context.vdso = addr;
27525
27526 ret = install_special_mapping(mm, addr, size,
27527 VM_READ|VM_EXEC|
27528 VM_MAYREAD|VM_MAYWRITE|VM_MAYEXEC,
27529 pages);
27530 - if (ret) {
27531 - current->mm->context.vdso = NULL;
27532 - goto up_fail;
27533 - }
27534 + if (ret)
27535 + mm->context.vdso = 0;
27536
27537 up_fail:
27538 up_write(&mm->mmap_sem);
27539 @@ -197,10 +195,3 @@ int x32_setup_additional_pages(struct linux_binprm *bprm, int uses_interp)
27540 vdsox32_size);
27541 }
27542 #endif
27543 -
27544 -static __init int vdso_setup(char *s)
27545 -{
27546 - vdso_enabled = simple_strtoul(s, NULL, 0);
27547 - return 0;
27548 -}
27549 -__setup("vdso=", vdso_setup);
27550 diff --git a/arch/x86/xen/enlighten.c b/arch/x86/xen/enlighten.c
27551 index c1461de..355f120 100644
27552 --- a/arch/x86/xen/enlighten.c
27553 +++ b/arch/x86/xen/enlighten.c
27554 @@ -98,8 +98,6 @@ EXPORT_SYMBOL_GPL(xen_start_info);
27555
27556 struct shared_info xen_dummy_shared_info;
27557
27558 -void *xen_initial_gdt;
27559 -
27560 RESERVE_BRK(shared_info_page_brk, PAGE_SIZE);
27561 __read_mostly int xen_have_vector_callback;
27562 EXPORT_SYMBOL_GPL(xen_have_vector_callback);
27563 @@ -917,21 +915,21 @@ static u32 xen_safe_apic_wait_icr_idle(void)
27564
27565 static void set_xen_basic_apic_ops(void)
27566 {
27567 - apic->read = xen_apic_read;
27568 - apic->write = xen_apic_write;
27569 - apic->icr_read = xen_apic_icr_read;
27570 - apic->icr_write = xen_apic_icr_write;
27571 - apic->wait_icr_idle = xen_apic_wait_icr_idle;
27572 - apic->safe_wait_icr_idle = xen_safe_apic_wait_icr_idle;
27573 - apic->set_apic_id = xen_set_apic_id;
27574 - apic->get_apic_id = xen_get_apic_id;
27575 + *(void **)&apic->read = xen_apic_read;
27576 + *(void **)&apic->write = xen_apic_write;
27577 + *(void **)&apic->icr_read = xen_apic_icr_read;
27578 + *(void **)&apic->icr_write = xen_apic_icr_write;
27579 + *(void **)&apic->wait_icr_idle = xen_apic_wait_icr_idle;
27580 + *(void **)&apic->safe_wait_icr_idle = xen_safe_apic_wait_icr_idle;
27581 + *(void **)&apic->set_apic_id = xen_set_apic_id;
27582 + *(void **)&apic->get_apic_id = xen_get_apic_id;
27583
27584 #ifdef CONFIG_SMP
27585 - apic->send_IPI_allbutself = xen_send_IPI_allbutself;
27586 - apic->send_IPI_mask_allbutself = xen_send_IPI_mask_allbutself;
27587 - apic->send_IPI_mask = xen_send_IPI_mask;
27588 - apic->send_IPI_all = xen_send_IPI_all;
27589 - apic->send_IPI_self = xen_send_IPI_self;
27590 + *(void **)&apic->send_IPI_allbutself = xen_send_IPI_allbutself;
27591 + *(void **)&apic->send_IPI_mask_allbutself = xen_send_IPI_mask_allbutself;
27592 + *(void **)&apic->send_IPI_mask = xen_send_IPI_mask;
27593 + *(void **)&apic->send_IPI_all = xen_send_IPI_all;
27594 + *(void **)&apic->send_IPI_self = xen_send_IPI_self;
27595 #endif
27596 }
27597
27598 @@ -1221,30 +1219,30 @@ static const struct pv_apic_ops xen_apic_ops __initconst = {
27599 #endif
27600 };
27601
27602 -static void xen_reboot(int reason)
27603 +static __noreturn void xen_reboot(int reason)
27604 {
27605 struct sched_shutdown r = { .reason = reason };
27606
27607 - if (HYPERVISOR_sched_op(SCHEDOP_shutdown, &r))
27608 - BUG();
27609 + HYPERVISOR_sched_op(SCHEDOP_shutdown, &r);
27610 + BUG();
27611 }
27612
27613 -static void xen_restart(char *msg)
27614 +static __noreturn void xen_restart(char *msg)
27615 {
27616 xen_reboot(SHUTDOWN_reboot);
27617 }
27618
27619 -static void xen_emergency_restart(void)
27620 +static __noreturn void xen_emergency_restart(void)
27621 {
27622 xen_reboot(SHUTDOWN_reboot);
27623 }
27624
27625 -static void xen_machine_halt(void)
27626 +static __noreturn void xen_machine_halt(void)
27627 {
27628 xen_reboot(SHUTDOWN_poweroff);
27629 }
27630
27631 -static void xen_machine_power_off(void)
27632 +static __noreturn void xen_machine_power_off(void)
27633 {
27634 if (pm_power_off)
27635 pm_power_off();
27636 @@ -1347,7 +1345,17 @@ asmlinkage void __init xen_start_kernel(void)
27637 __userpte_alloc_gfp &= ~__GFP_HIGHMEM;
27638
27639 /* Work out if we support NX */
27640 - x86_configure_nx();
27641 +#if defined(CONFIG_X86_64) || defined(CONFIG_X86_PAE)
27642 + if ((cpuid_eax(0x80000000) & 0xffff0000) == 0x80000000 &&
27643 + (cpuid_edx(0x80000001) & (1U << (X86_FEATURE_NX & 31)))) {
27644 + unsigned l, h;
27645 +
27646 + __supported_pte_mask |= _PAGE_NX;
27647 + rdmsr(MSR_EFER, l, h);
27648 + l |= EFER_NX;
27649 + wrmsr(MSR_EFER, l, h);
27650 + }
27651 +#endif
27652
27653 xen_setup_features();
27654
27655 @@ -1378,13 +1386,6 @@ asmlinkage void __init xen_start_kernel(void)
27656
27657 machine_ops = xen_machine_ops;
27658
27659 - /*
27660 - * The only reliable way to retain the initial address of the
27661 - * percpu gdt_page is to remember it here, so we can go and
27662 - * mark it RW later, when the initial percpu area is freed.
27663 - */
27664 - xen_initial_gdt = &per_cpu(gdt_page, 0);
27665 -
27666 xen_smp_init();
27667
27668 #ifdef CONFIG_ACPI_NUMA
27669 diff --git a/arch/x86/xen/mmu.c b/arch/x86/xen/mmu.c
27670 index dde1a3f..6b663e6 100644
27671 --- a/arch/x86/xen/mmu.c
27672 +++ b/arch/x86/xen/mmu.c
27673 @@ -1784,6 +1784,9 @@ pgd_t * __init xen_setup_kernel_pagetable(pgd_t *pgd,
27674 convert_pfn_mfn(init_level4_pgt);
27675 convert_pfn_mfn(level3_ident_pgt);
27676 convert_pfn_mfn(level3_kernel_pgt);
27677 + convert_pfn_mfn(level3_vmalloc_start_pgt);
27678 + convert_pfn_mfn(level3_vmalloc_end_pgt);
27679 + convert_pfn_mfn(level3_vmemmap_pgt);
27680
27681 l3 = m2v(pgd[pgd_index(__START_KERNEL_map)].pgd);
27682 l2 = m2v(l3[pud_index(__START_KERNEL_map)].pud);
27683 @@ -1802,7 +1805,11 @@ pgd_t * __init xen_setup_kernel_pagetable(pgd_t *pgd,
27684 set_page_prot(init_level4_pgt, PAGE_KERNEL_RO);
27685 set_page_prot(level3_ident_pgt, PAGE_KERNEL_RO);
27686 set_page_prot(level3_kernel_pgt, PAGE_KERNEL_RO);
27687 + set_page_prot(level3_vmalloc_start_pgt, PAGE_KERNEL_RO);
27688 + set_page_prot(level3_vmalloc_end_pgt, PAGE_KERNEL_RO);
27689 + set_page_prot(level3_vmemmap_pgt, PAGE_KERNEL_RO);
27690 set_page_prot(level3_user_vsyscall, PAGE_KERNEL_RO);
27691 + set_page_prot(level2_vmemmap_pgt, PAGE_KERNEL_RO);
27692 set_page_prot(level2_kernel_pgt, PAGE_KERNEL_RO);
27693 set_page_prot(level2_fixmap_pgt, PAGE_KERNEL_RO);
27694
27695 @@ -1986,6 +1993,7 @@ static void __init xen_post_allocator_init(void)
27696 pv_mmu_ops.set_pud = xen_set_pud;
27697 #if PAGETABLE_LEVELS == 4
27698 pv_mmu_ops.set_pgd = xen_set_pgd;
27699 + pv_mmu_ops.set_pgd_batched = xen_set_pgd;
27700 #endif
27701
27702 /* This will work as long as patching hasn't happened yet
27703 @@ -2067,6 +2075,7 @@ static const struct pv_mmu_ops xen_mmu_ops __initconst = {
27704 .pud_val = PV_CALLEE_SAVE(xen_pud_val),
27705 .make_pud = PV_CALLEE_SAVE(xen_make_pud),
27706 .set_pgd = xen_set_pgd_hyper,
27707 + .set_pgd_batched = xen_set_pgd_hyper,
27708
27709 .alloc_pud = xen_alloc_pmd_init,
27710 .release_pud = xen_release_pmd_init,
27711 diff --git a/arch/x86/xen/smp.c b/arch/x86/xen/smp.c
27712 index f58dca7..ad21f52 100644
27713 --- a/arch/x86/xen/smp.c
27714 +++ b/arch/x86/xen/smp.c
27715 @@ -229,11 +229,6 @@ static void __init xen_smp_prepare_boot_cpu(void)
27716 {
27717 BUG_ON(smp_processor_id() != 0);
27718 native_smp_prepare_boot_cpu();
27719 -
27720 - /* We've switched to the "real" per-cpu gdt, so make sure the
27721 - old memory can be recycled */
27722 - make_lowmem_page_readwrite(xen_initial_gdt);
27723 -
27724 xen_filter_cpu_maps();
27725 xen_setup_vcpu_info_placement();
27726 }
27727 @@ -300,12 +295,12 @@ cpu_initialize_context(unsigned int cpu, struct task_struct *idle)
27728 gdt = get_cpu_gdt_table(cpu);
27729
27730 ctxt->flags = VGCF_IN_KERNEL;
27731 - ctxt->user_regs.ds = __USER_DS;
27732 - ctxt->user_regs.es = __USER_DS;
27733 + ctxt->user_regs.ds = __KERNEL_DS;
27734 + ctxt->user_regs.es = __KERNEL_DS;
27735 ctxt->user_regs.ss = __KERNEL_DS;
27736 #ifdef CONFIG_X86_32
27737 ctxt->user_regs.fs = __KERNEL_PERCPU;
27738 - ctxt->user_regs.gs = __KERNEL_STACK_CANARY;
27739 + savesegment(gs, ctxt->user_regs.gs);
27740 #else
27741 ctxt->gs_base_kernel = per_cpu_offset(cpu);
27742 #endif
27743 @@ -355,13 +350,12 @@ static int __cpuinit xen_cpu_up(unsigned int cpu, struct task_struct *idle)
27744 int rc;
27745
27746 per_cpu(current_task, cpu) = idle;
27747 + per_cpu(current_tinfo, cpu) = &idle->tinfo;
27748 #ifdef CONFIG_X86_32
27749 irq_ctx_init(cpu);
27750 #else
27751 clear_tsk_thread_flag(idle, TIF_FORK);
27752 - per_cpu(kernel_stack, cpu) =
27753 - (unsigned long)task_stack_page(idle) -
27754 - KERNEL_STACK_OFFSET + THREAD_SIZE;
27755 + per_cpu(kernel_stack, cpu) = (unsigned long)task_stack_page(idle) - 16 + THREAD_SIZE;
27756 #endif
27757 xen_setup_runstate_info(cpu);
27758 xen_setup_timer(cpu);
27759 diff --git a/arch/x86/xen/xen-asm_32.S b/arch/x86/xen/xen-asm_32.S
27760 index f9643fc..602e8af 100644
27761 --- a/arch/x86/xen/xen-asm_32.S
27762 +++ b/arch/x86/xen/xen-asm_32.S
27763 @@ -84,14 +84,14 @@ ENTRY(xen_iret)
27764 ESP_OFFSET=4 # bytes pushed onto stack
27765
27766 /*
27767 - * Store vcpu_info pointer for easy access. Do it this way to
27768 - * avoid having to reload %fs
27769 + * Store vcpu_info pointer for easy access.
27770 */
27771 #ifdef CONFIG_SMP
27772 - GET_THREAD_INFO(%eax)
27773 - movl TI_cpu(%eax), %eax
27774 - movl __per_cpu_offset(,%eax,4), %eax
27775 - mov xen_vcpu(%eax), %eax
27776 + push %fs
27777 + mov $(__KERNEL_PERCPU), %eax
27778 + mov %eax, %fs
27779 + mov PER_CPU_VAR(xen_vcpu), %eax
27780 + pop %fs
27781 #else
27782 movl xen_vcpu, %eax
27783 #endif
27784 diff --git a/arch/x86/xen/xen-head.S b/arch/x86/xen/xen-head.S
27785 index aaa7291..3f77960 100644
27786 --- a/arch/x86/xen/xen-head.S
27787 +++ b/arch/x86/xen/xen-head.S
27788 @@ -19,6 +19,17 @@ ENTRY(startup_xen)
27789 #ifdef CONFIG_X86_32
27790 mov %esi,xen_start_info
27791 mov $init_thread_union+THREAD_SIZE,%esp
27792 +#ifdef CONFIG_SMP
27793 + movl $cpu_gdt_table,%edi
27794 + movl $__per_cpu_load,%eax
27795 + movw %ax,__KERNEL_PERCPU + 2(%edi)
27796 + rorl $16,%eax
27797 + movb %al,__KERNEL_PERCPU + 4(%edi)
27798 + movb %ah,__KERNEL_PERCPU + 7(%edi)
27799 + movl $__per_cpu_end - 1,%eax
27800 + subl $__per_cpu_start,%eax
27801 + movw %ax,__KERNEL_PERCPU + 0(%edi)
27802 +#endif
27803 #else
27804 mov %rsi,xen_start_info
27805 mov $init_thread_union+THREAD_SIZE,%rsp
27806 diff --git a/arch/x86/xen/xen-ops.h b/arch/x86/xen/xen-ops.h
27807 index 202d4c1..99b072a 100644
27808 --- a/arch/x86/xen/xen-ops.h
27809 +++ b/arch/x86/xen/xen-ops.h
27810 @@ -10,8 +10,6 @@
27811 extern const char xen_hypervisor_callback[];
27812 extern const char xen_failsafe_callback[];
27813
27814 -extern void *xen_initial_gdt;
27815 -
27816 struct trap_info;
27817 void xen_copy_trap_info(struct trap_info *traps);
27818
27819 diff --git a/arch/xtensa/variants/dc232b/include/variant/core.h b/arch/xtensa/variants/dc232b/include/variant/core.h
27820 index 525bd3d..ef888b1 100644
27821 --- a/arch/xtensa/variants/dc232b/include/variant/core.h
27822 +++ b/arch/xtensa/variants/dc232b/include/variant/core.h
27823 @@ -119,9 +119,9 @@
27824 ----------------------------------------------------------------------*/
27825
27826 #define XCHAL_ICACHE_LINESIZE 32 /* I-cache line size in bytes */
27827 -#define XCHAL_DCACHE_LINESIZE 32 /* D-cache line size in bytes */
27828 #define XCHAL_ICACHE_LINEWIDTH 5 /* log2(I line size in bytes) */
27829 #define XCHAL_DCACHE_LINEWIDTH 5 /* log2(D line size in bytes) */
27830 +#define XCHAL_DCACHE_LINESIZE (_AC(1,UL) << XCHAL_DCACHE_LINEWIDTH) /* D-cache line size in bytes */
27831
27832 #define XCHAL_ICACHE_SIZE 16384 /* I-cache size in bytes or 0 */
27833 #define XCHAL_DCACHE_SIZE 16384 /* D-cache size in bytes or 0 */
27834 diff --git a/arch/xtensa/variants/fsf/include/variant/core.h b/arch/xtensa/variants/fsf/include/variant/core.h
27835 index 2f33760..835e50a 100644
27836 --- a/arch/xtensa/variants/fsf/include/variant/core.h
27837 +++ b/arch/xtensa/variants/fsf/include/variant/core.h
27838 @@ -11,6 +11,7 @@
27839 #ifndef _XTENSA_CORE_H
27840 #define _XTENSA_CORE_H
27841
27842 +#include <linux/const.h>
27843
27844 /****************************************************************************
27845 Parameters Useful for Any Code, USER or PRIVILEGED
27846 @@ -112,9 +113,9 @@
27847 ----------------------------------------------------------------------*/
27848
27849 #define XCHAL_ICACHE_LINESIZE 16 /* I-cache line size in bytes */
27850 -#define XCHAL_DCACHE_LINESIZE 16 /* D-cache line size in bytes */
27851 #define XCHAL_ICACHE_LINEWIDTH 4 /* log2(I line size in bytes) */
27852 #define XCHAL_DCACHE_LINEWIDTH 4 /* log2(D line size in bytes) */
27853 +#define XCHAL_DCACHE_LINESIZE (_AC(1,UL) << XCHAL_DCACHE_LINEWIDTH) /* D-cache line size in bytes */
27854
27855 #define XCHAL_ICACHE_SIZE 8192 /* I-cache size in bytes or 0 */
27856 #define XCHAL_DCACHE_SIZE 8192 /* D-cache size in bytes or 0 */
27857 diff --git a/arch/xtensa/variants/s6000/include/variant/core.h b/arch/xtensa/variants/s6000/include/variant/core.h
27858 index af00795..2bb8105 100644
27859 --- a/arch/xtensa/variants/s6000/include/variant/core.h
27860 +++ b/arch/xtensa/variants/s6000/include/variant/core.h
27861 @@ -11,6 +11,7 @@
27862 #ifndef _XTENSA_CORE_CONFIGURATION_H
27863 #define _XTENSA_CORE_CONFIGURATION_H
27864
27865 +#include <linux/const.h>
27866
27867 /****************************************************************************
27868 Parameters Useful for Any Code, USER or PRIVILEGED
27869 @@ -118,9 +119,9 @@
27870 ----------------------------------------------------------------------*/
27871
27872 #define XCHAL_ICACHE_LINESIZE 16 /* I-cache line size in bytes */
27873 -#define XCHAL_DCACHE_LINESIZE 16 /* D-cache line size in bytes */
27874 #define XCHAL_ICACHE_LINEWIDTH 4 /* log2(I line size in bytes) */
27875 #define XCHAL_DCACHE_LINEWIDTH 4 /* log2(D line size in bytes) */
27876 +#define XCHAL_DCACHE_LINESIZE (_AC(1,UL) << XCHAL_DCACHE_LINEWIDTH) /* D-cache line size in bytes */
27877
27878 #define XCHAL_ICACHE_SIZE 32768 /* I-cache size in bytes or 0 */
27879 #define XCHAL_DCACHE_SIZE 32768 /* D-cache size in bytes or 0 */
27880 diff --git a/block/blk-iopoll.c b/block/blk-iopoll.c
27881 index 58916af..9cb880b 100644
27882 --- a/block/blk-iopoll.c
27883 +++ b/block/blk-iopoll.c
27884 @@ -77,7 +77,7 @@ void blk_iopoll_complete(struct blk_iopoll *iopoll)
27885 }
27886 EXPORT_SYMBOL(blk_iopoll_complete);
27887
27888 -static void blk_iopoll_softirq(struct softirq_action *h)
27889 +static void blk_iopoll_softirq(void)
27890 {
27891 struct list_head *list = &__get_cpu_var(blk_cpu_iopoll);
27892 int rearm = 0, budget = blk_iopoll_budget;
27893 diff --git a/block/blk-map.c b/block/blk-map.c
27894 index 623e1cd..ca1e109 100644
27895 --- a/block/blk-map.c
27896 +++ b/block/blk-map.c
27897 @@ -302,7 +302,7 @@ int blk_rq_map_kern(struct request_queue *q, struct request *rq, void *kbuf,
27898 if (!len || !kbuf)
27899 return -EINVAL;
27900
27901 - do_copy = !blk_rq_aligned(q, addr, len) || object_is_on_stack(kbuf);
27902 + do_copy = !blk_rq_aligned(q, addr, len) || object_starts_on_stack(kbuf);
27903 if (do_copy)
27904 bio = bio_copy_kern(q, kbuf, len, gfp_mask, reading);
27905 else
27906 diff --git a/block/blk-softirq.c b/block/blk-softirq.c
27907 index 467c8de..4bddc6d 100644
27908 --- a/block/blk-softirq.c
27909 +++ b/block/blk-softirq.c
27910 @@ -18,7 +18,7 @@ static DEFINE_PER_CPU(struct list_head, blk_cpu_done);
27911 * Softirq action handler - move entries to local list and loop over them
27912 * while passing them to the queue registered handler.
27913 */
27914 -static void blk_done_softirq(struct softirq_action *h)
27915 +static void blk_done_softirq(void)
27916 {
27917 struct list_head *cpu_list, local_list;
27918
27919 diff --git a/block/bsg.c b/block/bsg.c
27920 index ff64ae3..593560c 100644
27921 --- a/block/bsg.c
27922 +++ b/block/bsg.c
27923 @@ -176,16 +176,24 @@ static int blk_fill_sgv4_hdr_rq(struct request_queue *q, struct request *rq,
27924 struct sg_io_v4 *hdr, struct bsg_device *bd,
27925 fmode_t has_write_perm)
27926 {
27927 + unsigned char tmpcmd[sizeof(rq->__cmd)];
27928 + unsigned char *cmdptr;
27929 +
27930 if (hdr->request_len > BLK_MAX_CDB) {
27931 rq->cmd = kzalloc(hdr->request_len, GFP_KERNEL);
27932 if (!rq->cmd)
27933 return -ENOMEM;
27934 - }
27935 + cmdptr = rq->cmd;
27936 + } else
27937 + cmdptr = tmpcmd;
27938
27939 - if (copy_from_user(rq->cmd, (void __user *)(unsigned long)hdr->request,
27940 + if (copy_from_user(cmdptr, (void __user *)(unsigned long)hdr->request,
27941 hdr->request_len))
27942 return -EFAULT;
27943
27944 + if (cmdptr != rq->cmd)
27945 + memcpy(rq->cmd, cmdptr, hdr->request_len);
27946 +
27947 if (hdr->subprotocol == BSG_SUB_PROTOCOL_SCSI_CMD) {
27948 if (blk_verify_command(rq->cmd, has_write_perm))
27949 return -EPERM;
27950 diff --git a/block/compat_ioctl.c b/block/compat_ioctl.c
27951 index 7c668c8..db3521c 100644
27952 --- a/block/compat_ioctl.c
27953 +++ b/block/compat_ioctl.c
27954 @@ -340,7 +340,7 @@ static int compat_fd_ioctl(struct block_device *bdev, fmode_t mode,
27955 err |= __get_user(f->spec1, &uf->spec1);
27956 err |= __get_user(f->fmt_gap, &uf->fmt_gap);
27957 err |= __get_user(name, &uf->name);
27958 - f->name = compat_ptr(name);
27959 + f->name = (void __force_kernel *)compat_ptr(name);
27960 if (err) {
27961 err = -EFAULT;
27962 goto out;
27963 diff --git a/block/partitions/efi.c b/block/partitions/efi.c
27964 index 6296b40..417c00f 100644
27965 --- a/block/partitions/efi.c
27966 +++ b/block/partitions/efi.c
27967 @@ -234,14 +234,14 @@ static gpt_entry *alloc_read_gpt_entries(struct parsed_partitions *state,
27968 if (!gpt)
27969 return NULL;
27970
27971 + if (!le32_to_cpu(gpt->num_partition_entries))
27972 + return NULL;
27973 + pte = kcalloc(le32_to_cpu(gpt->num_partition_entries), le32_to_cpu(gpt->sizeof_partition_entry), GFP_KERNEL);
27974 + if (!pte)
27975 + return NULL;
27976 +
27977 count = le32_to_cpu(gpt->num_partition_entries) *
27978 le32_to_cpu(gpt->sizeof_partition_entry);
27979 - if (!count)
27980 - return NULL;
27981 - pte = kzalloc(count, GFP_KERNEL);
27982 - if (!pte)
27983 - return NULL;
27984 -
27985 if (read_lba(state, le64_to_cpu(gpt->partition_entry_lba),
27986 (u8 *) pte,
27987 count) < count) {
27988 diff --git a/block/scsi_ioctl.c b/block/scsi_ioctl.c
27989 index 9a87daa..fb17486 100644
27990 --- a/block/scsi_ioctl.c
27991 +++ b/block/scsi_ioctl.c
27992 @@ -223,8 +223,20 @@ EXPORT_SYMBOL(blk_verify_command);
27993 static int blk_fill_sghdr_rq(struct request_queue *q, struct request *rq,
27994 struct sg_io_hdr *hdr, fmode_t mode)
27995 {
27996 - if (copy_from_user(rq->cmd, hdr->cmdp, hdr->cmd_len))
27997 + unsigned char tmpcmd[sizeof(rq->__cmd)];
27998 + unsigned char *cmdptr;
27999 +
28000 + if (rq->cmd != rq->__cmd)
28001 + cmdptr = rq->cmd;
28002 + else
28003 + cmdptr = tmpcmd;
28004 +
28005 + if (copy_from_user(cmdptr, hdr->cmdp, hdr->cmd_len))
28006 return -EFAULT;
28007 +
28008 + if (cmdptr != rq->cmd)
28009 + memcpy(rq->cmd, cmdptr, hdr->cmd_len);
28010 +
28011 if (blk_verify_command(rq->cmd, mode & FMODE_WRITE))
28012 return -EPERM;
28013
28014 @@ -433,6 +445,8 @@ int sg_scsi_ioctl(struct request_queue *q, struct gendisk *disk, fmode_t mode,
28015 int err;
28016 unsigned int in_len, out_len, bytes, opcode, cmdlen;
28017 char *buffer = NULL, sense[SCSI_SENSE_BUFFERSIZE];
28018 + unsigned char tmpcmd[sizeof(rq->__cmd)];
28019 + unsigned char *cmdptr;
28020
28021 if (!sic)
28022 return -EINVAL;
28023 @@ -466,9 +480,18 @@ int sg_scsi_ioctl(struct request_queue *q, struct gendisk *disk, fmode_t mode,
28024 */
28025 err = -EFAULT;
28026 rq->cmd_len = cmdlen;
28027 - if (copy_from_user(rq->cmd, sic->data, cmdlen))
28028 +
28029 + if (rq->cmd != rq->__cmd)
28030 + cmdptr = rq->cmd;
28031 + else
28032 + cmdptr = tmpcmd;
28033 +
28034 + if (copy_from_user(cmdptr, sic->data, cmdlen))
28035 goto error;
28036
28037 + if (rq->cmd != cmdptr)
28038 + memcpy(rq->cmd, cmdptr, cmdlen);
28039 +
28040 if (in_len && copy_from_user(buffer, sic->data + cmdlen, in_len))
28041 goto error;
28042
28043 diff --git a/crypto/cryptd.c b/crypto/cryptd.c
28044 index 7bdd61b..afec999 100644
28045 --- a/crypto/cryptd.c
28046 +++ b/crypto/cryptd.c
28047 @@ -63,7 +63,7 @@ struct cryptd_blkcipher_ctx {
28048
28049 struct cryptd_blkcipher_request_ctx {
28050 crypto_completion_t complete;
28051 -};
28052 +} __no_const;
28053
28054 struct cryptd_hash_ctx {
28055 struct crypto_shash *child;
28056 @@ -80,7 +80,7 @@ struct cryptd_aead_ctx {
28057
28058 struct cryptd_aead_request_ctx {
28059 crypto_completion_t complete;
28060 -};
28061 +} __no_const;
28062
28063 static void cryptd_queue_worker(struct work_struct *work);
28064
28065 diff --git a/drivers/acpi/apei/cper.c b/drivers/acpi/apei/cper.c
28066 index e6defd8..c26a225 100644
28067 --- a/drivers/acpi/apei/cper.c
28068 +++ b/drivers/acpi/apei/cper.c
28069 @@ -38,12 +38,12 @@
28070 */
28071 u64 cper_next_record_id(void)
28072 {
28073 - static atomic64_t seq;
28074 + static atomic64_unchecked_t seq;
28075
28076 - if (!atomic64_read(&seq))
28077 - atomic64_set(&seq, ((u64)get_seconds()) << 32);
28078 + if (!atomic64_read_unchecked(&seq))
28079 + atomic64_set_unchecked(&seq, ((u64)get_seconds()) << 32);
28080
28081 - return atomic64_inc_return(&seq);
28082 + return atomic64_inc_return_unchecked(&seq);
28083 }
28084 EXPORT_SYMBOL_GPL(cper_next_record_id);
28085
28086 diff --git a/drivers/acpi/ec_sys.c b/drivers/acpi/ec_sys.c
28087 index 7586544..636a2f0 100644
28088 --- a/drivers/acpi/ec_sys.c
28089 +++ b/drivers/acpi/ec_sys.c
28090 @@ -12,6 +12,7 @@
28091 #include <linux/acpi.h>
28092 #include <linux/debugfs.h>
28093 #include <linux/module.h>
28094 +#include <linux/uaccess.h>
28095 #include "internal.h"
28096
28097 MODULE_AUTHOR("Thomas Renninger <trenn@suse.de>");
28098 @@ -34,7 +35,7 @@ static ssize_t acpi_ec_read_io(struct file *f, char __user *buf,
28099 * struct acpi_ec *ec = ((struct seq_file *)f->private_data)->private;
28100 */
28101 unsigned int size = EC_SPACE_SIZE;
28102 - u8 *data = (u8 *) buf;
28103 + u8 data;
28104 loff_t init_off = *off;
28105 int err = 0;
28106
28107 @@ -47,9 +48,11 @@ static ssize_t acpi_ec_read_io(struct file *f, char __user *buf,
28108 size = count;
28109
28110 while (size) {
28111 - err = ec_read(*off, &data[*off - init_off]);
28112 + err = ec_read(*off, &data);
28113 if (err)
28114 return err;
28115 + if (put_user(data, &buf[*off - init_off]))
28116 + return -EFAULT;
28117 *off += 1;
28118 size--;
28119 }
28120 @@ -65,7 +68,6 @@ static ssize_t acpi_ec_write_io(struct file *f, const char __user *buf,
28121
28122 unsigned int size = count;
28123 loff_t init_off = *off;
28124 - u8 *data = (u8 *) buf;
28125 int err = 0;
28126
28127 if (*off >= EC_SPACE_SIZE)
28128 @@ -76,7 +78,9 @@ static ssize_t acpi_ec_write_io(struct file *f, const char __user *buf,
28129 }
28130
28131 while (size) {
28132 - u8 byte_write = data[*off - init_off];
28133 + u8 byte_write;
28134 + if (get_user(byte_write, &buf[*off - init_off]))
28135 + return -EFAULT;
28136 err = ec_write(*off, byte_write);
28137 if (err)
28138 return err;
28139 diff --git a/drivers/acpi/proc.c b/drivers/acpi/proc.c
28140 index 251c7b62..000462d 100644
28141 --- a/drivers/acpi/proc.c
28142 +++ b/drivers/acpi/proc.c
28143 @@ -343,19 +343,13 @@ acpi_system_write_wakeup_device(struct file *file,
28144 size_t count, loff_t * ppos)
28145 {
28146 struct list_head *node, *next;
28147 - char strbuf[5];
28148 - char str[5] = "";
28149 - unsigned int len = count;
28150 + char strbuf[5] = {0};
28151
28152 - if (len > 4)
28153 - len = 4;
28154 - if (len < 0)
28155 + if (count > 4)
28156 + count = 4;
28157 + if (copy_from_user(strbuf, buffer, count))
28158 return -EFAULT;
28159 -
28160 - if (copy_from_user(strbuf, buffer, len))
28161 - return -EFAULT;
28162 - strbuf[len] = '\0';
28163 - sscanf(strbuf, "%s", str);
28164 + strbuf[count] = '\0';
28165
28166 mutex_lock(&acpi_device_lock);
28167 list_for_each_safe(node, next, &acpi_wakeup_device_list) {
28168 @@ -364,7 +358,7 @@ acpi_system_write_wakeup_device(struct file *file,
28169 if (!dev->wakeup.flags.valid)
28170 continue;
28171
28172 - if (!strncmp(dev->pnp.bus_id, str, 4)) {
28173 + if (!strncmp(dev->pnp.bus_id, strbuf, 4)) {
28174 if (device_can_wakeup(&dev->dev)) {
28175 bool enable = !device_may_wakeup(&dev->dev);
28176 device_set_wakeup_enable(&dev->dev, enable);
28177 diff --git a/drivers/acpi/processor_driver.c b/drivers/acpi/processor_driver.c
28178 index bfc31cb..8213ce1 100644
28179 --- a/drivers/acpi/processor_driver.c
28180 +++ b/drivers/acpi/processor_driver.c
28181 @@ -551,7 +551,7 @@ static int __cpuinit acpi_processor_add(struct acpi_device *device)
28182 return 0;
28183 #endif
28184
28185 - BUG_ON((pr->id >= nr_cpu_ids) || (pr->id < 0));
28186 + BUG_ON(pr->id >= nr_cpu_ids);
28187
28188 /*
28189 * Buggy BIOS check
28190 diff --git a/drivers/ata/libata-core.c b/drivers/ata/libata-core.c
28191 index 8e1039c..ea9cbd4 100644
28192 --- a/drivers/ata/libata-core.c
28193 +++ b/drivers/ata/libata-core.c
28194 @@ -4750,7 +4750,7 @@ void ata_qc_free(struct ata_queued_cmd *qc)
28195 struct ata_port *ap;
28196 unsigned int tag;
28197
28198 - WARN_ON_ONCE(qc == NULL); /* ata_qc_from_tag _might_ return NULL */
28199 + BUG_ON(qc == NULL); /* ata_qc_from_tag _might_ return NULL */
28200 ap = qc->ap;
28201
28202 qc->flags = 0;
28203 @@ -4766,7 +4766,7 @@ void __ata_qc_complete(struct ata_queued_cmd *qc)
28204 struct ata_port *ap;
28205 struct ata_link *link;
28206
28207 - WARN_ON_ONCE(qc == NULL); /* ata_qc_from_tag _might_ return NULL */
28208 + BUG_ON(qc == NULL); /* ata_qc_from_tag _might_ return NULL */
28209 WARN_ON_ONCE(!(qc->flags & ATA_QCFLAG_ACTIVE));
28210 ap = qc->ap;
28211 link = qc->dev->link;
28212 @@ -5828,6 +5828,7 @@ static void ata_finalize_port_ops(struct ata_port_operations *ops)
28213 return;
28214
28215 spin_lock(&lock);
28216 + pax_open_kernel();
28217
28218 for (cur = ops->inherits; cur; cur = cur->inherits) {
28219 void **inherit = (void **)cur;
28220 @@ -5841,8 +5842,9 @@ static void ata_finalize_port_ops(struct ata_port_operations *ops)
28221 if (IS_ERR(*pp))
28222 *pp = NULL;
28223
28224 - ops->inherits = NULL;
28225 + *(struct ata_port_operations **)&ops->inherits = NULL;
28226
28227 + pax_close_kernel();
28228 spin_unlock(&lock);
28229 }
28230
28231 diff --git a/drivers/ata/pata_arasan_cf.c b/drivers/ata/pata_arasan_cf.c
28232 index bfaa5cb..3ba1cc3 100644
28233 --- a/drivers/ata/pata_arasan_cf.c
28234 +++ b/drivers/ata/pata_arasan_cf.c
28235 @@ -854,7 +854,9 @@ static int __devinit arasan_cf_probe(struct platform_device *pdev)
28236 /* Handle platform specific quirks */
28237 if (pdata->quirk) {
28238 if (pdata->quirk & CF_BROKEN_PIO) {
28239 - ap->ops->set_piomode = NULL;
28240 + pax_open_kernel();
28241 + *(void **)&ap->ops->set_piomode = NULL;
28242 + pax_close_kernel();
28243 ap->pio_mask = 0;
28244 }
28245 if (pdata->quirk & CF_BROKEN_MWDMA)
28246 diff --git a/drivers/atm/adummy.c b/drivers/atm/adummy.c
28247 index f9b983a..887b9d8 100644
28248 --- a/drivers/atm/adummy.c
28249 +++ b/drivers/atm/adummy.c
28250 @@ -114,7 +114,7 @@ adummy_send(struct atm_vcc *vcc, struct sk_buff *skb)
28251 vcc->pop(vcc, skb);
28252 else
28253 dev_kfree_skb_any(skb);
28254 - atomic_inc(&vcc->stats->tx);
28255 + atomic_inc_unchecked(&vcc->stats->tx);
28256
28257 return 0;
28258 }
28259 diff --git a/drivers/atm/ambassador.c b/drivers/atm/ambassador.c
28260 index 89b30f3..7964211 100644
28261 --- a/drivers/atm/ambassador.c
28262 +++ b/drivers/atm/ambassador.c
28263 @@ -454,7 +454,7 @@ static void tx_complete (amb_dev * dev, tx_out * tx) {
28264 PRINTD (DBG_FLOW|DBG_TX, "tx_complete %p %p", dev, tx);
28265
28266 // VC layer stats
28267 - atomic_inc(&ATM_SKB(skb)->vcc->stats->tx);
28268 + atomic_inc_unchecked(&ATM_SKB(skb)->vcc->stats->tx);
28269
28270 // free the descriptor
28271 kfree (tx_descr);
28272 @@ -495,7 +495,7 @@ static void rx_complete (amb_dev * dev, rx_out * rx) {
28273 dump_skb ("<<<", vc, skb);
28274
28275 // VC layer stats
28276 - atomic_inc(&atm_vcc->stats->rx);
28277 + atomic_inc_unchecked(&atm_vcc->stats->rx);
28278 __net_timestamp(skb);
28279 // end of our responsibility
28280 atm_vcc->push (atm_vcc, skb);
28281 @@ -510,7 +510,7 @@ static void rx_complete (amb_dev * dev, rx_out * rx) {
28282 } else {
28283 PRINTK (KERN_INFO, "dropped over-size frame");
28284 // should we count this?
28285 - atomic_inc(&atm_vcc->stats->rx_drop);
28286 + atomic_inc_unchecked(&atm_vcc->stats->rx_drop);
28287 }
28288
28289 } else {
28290 @@ -1338,7 +1338,7 @@ static int amb_send (struct atm_vcc * atm_vcc, struct sk_buff * skb) {
28291 }
28292
28293 if (check_area (skb->data, skb->len)) {
28294 - atomic_inc(&atm_vcc->stats->tx_err);
28295 + atomic_inc_unchecked(&atm_vcc->stats->tx_err);
28296 return -ENOMEM; // ?
28297 }
28298
28299 diff --git a/drivers/atm/atmtcp.c b/drivers/atm/atmtcp.c
28300 index b22d71c..d6e1049 100644
28301 --- a/drivers/atm/atmtcp.c
28302 +++ b/drivers/atm/atmtcp.c
28303 @@ -207,7 +207,7 @@ static int atmtcp_v_send(struct atm_vcc *vcc,struct sk_buff *skb)
28304 if (vcc->pop) vcc->pop(vcc,skb);
28305 else dev_kfree_skb(skb);
28306 if (dev_data) return 0;
28307 - atomic_inc(&vcc->stats->tx_err);
28308 + atomic_inc_unchecked(&vcc->stats->tx_err);
28309 return -ENOLINK;
28310 }
28311 size = skb->len+sizeof(struct atmtcp_hdr);
28312 @@ -215,7 +215,7 @@ static int atmtcp_v_send(struct atm_vcc *vcc,struct sk_buff *skb)
28313 if (!new_skb) {
28314 if (vcc->pop) vcc->pop(vcc,skb);
28315 else dev_kfree_skb(skb);
28316 - atomic_inc(&vcc->stats->tx_err);
28317 + atomic_inc_unchecked(&vcc->stats->tx_err);
28318 return -ENOBUFS;
28319 }
28320 hdr = (void *) skb_put(new_skb,sizeof(struct atmtcp_hdr));
28321 @@ -226,8 +226,8 @@ static int atmtcp_v_send(struct atm_vcc *vcc,struct sk_buff *skb)
28322 if (vcc->pop) vcc->pop(vcc,skb);
28323 else dev_kfree_skb(skb);
28324 out_vcc->push(out_vcc,new_skb);
28325 - atomic_inc(&vcc->stats->tx);
28326 - atomic_inc(&out_vcc->stats->rx);
28327 + atomic_inc_unchecked(&vcc->stats->tx);
28328 + atomic_inc_unchecked(&out_vcc->stats->rx);
28329 return 0;
28330 }
28331
28332 @@ -301,7 +301,7 @@ static int atmtcp_c_send(struct atm_vcc *vcc,struct sk_buff *skb)
28333 out_vcc = find_vcc(dev, ntohs(hdr->vpi), ntohs(hdr->vci));
28334 read_unlock(&vcc_sklist_lock);
28335 if (!out_vcc) {
28336 - atomic_inc(&vcc->stats->tx_err);
28337 + atomic_inc_unchecked(&vcc->stats->tx_err);
28338 goto done;
28339 }
28340 skb_pull(skb,sizeof(struct atmtcp_hdr));
28341 @@ -313,8 +313,8 @@ static int atmtcp_c_send(struct atm_vcc *vcc,struct sk_buff *skb)
28342 __net_timestamp(new_skb);
28343 skb_copy_from_linear_data(skb, skb_put(new_skb, skb->len), skb->len);
28344 out_vcc->push(out_vcc,new_skb);
28345 - atomic_inc(&vcc->stats->tx);
28346 - atomic_inc(&out_vcc->stats->rx);
28347 + atomic_inc_unchecked(&vcc->stats->tx);
28348 + atomic_inc_unchecked(&out_vcc->stats->rx);
28349 done:
28350 if (vcc->pop) vcc->pop(vcc,skb);
28351 else dev_kfree_skb(skb);
28352 diff --git a/drivers/atm/eni.c b/drivers/atm/eni.c
28353 index 2059ee4..faf51c7 100644
28354 --- a/drivers/atm/eni.c
28355 +++ b/drivers/atm/eni.c
28356 @@ -522,7 +522,7 @@ static int rx_aal0(struct atm_vcc *vcc)
28357 DPRINTK(DEV_LABEL "(itf %d): trashing empty cell\n",
28358 vcc->dev->number);
28359 length = 0;
28360 - atomic_inc(&vcc->stats->rx_err);
28361 + atomic_inc_unchecked(&vcc->stats->rx_err);
28362 }
28363 else {
28364 length = ATM_CELL_SIZE-1; /* no HEC */
28365 @@ -577,7 +577,7 @@ static int rx_aal5(struct atm_vcc *vcc)
28366 size);
28367 }
28368 eff = length = 0;
28369 - atomic_inc(&vcc->stats->rx_err);
28370 + atomic_inc_unchecked(&vcc->stats->rx_err);
28371 }
28372 else {
28373 size = (descr & MID_RED_COUNT)*(ATM_CELL_PAYLOAD >> 2);
28374 @@ -594,7 +594,7 @@ static int rx_aal5(struct atm_vcc *vcc)
28375 "(VCI=%d,length=%ld,size=%ld (descr 0x%lx))\n",
28376 vcc->dev->number,vcc->vci,length,size << 2,descr);
28377 length = eff = 0;
28378 - atomic_inc(&vcc->stats->rx_err);
28379 + atomic_inc_unchecked(&vcc->stats->rx_err);
28380 }
28381 }
28382 skb = eff ? atm_alloc_charge(vcc,eff << 2,GFP_ATOMIC) : NULL;
28383 @@ -767,7 +767,7 @@ rx_dequeued++;
28384 vcc->push(vcc,skb);
28385 pushed++;
28386 }
28387 - atomic_inc(&vcc->stats->rx);
28388 + atomic_inc_unchecked(&vcc->stats->rx);
28389 }
28390 wake_up(&eni_dev->rx_wait);
28391 }
28392 @@ -1227,7 +1227,7 @@ static void dequeue_tx(struct atm_dev *dev)
28393 PCI_DMA_TODEVICE);
28394 if (vcc->pop) vcc->pop(vcc,skb);
28395 else dev_kfree_skb_irq(skb);
28396 - atomic_inc(&vcc->stats->tx);
28397 + atomic_inc_unchecked(&vcc->stats->tx);
28398 wake_up(&eni_dev->tx_wait);
28399 dma_complete++;
28400 }
28401 @@ -1567,7 +1567,7 @@ tx_complete++;
28402 /*--------------------------------- entries ---------------------------------*/
28403
28404
28405 -static const char *media_name[] __devinitdata = {
28406 +static const char *media_name[] __devinitconst = {
28407 "MMF", "SMF", "MMF", "03?", /* 0- 3 */
28408 "UTP", "05?", "06?", "07?", /* 4- 7 */
28409 "TAXI","09?", "10?", "11?", /* 8-11 */
28410 diff --git a/drivers/atm/firestream.c b/drivers/atm/firestream.c
28411 index 86fed1b..6dc4721 100644
28412 --- a/drivers/atm/firestream.c
28413 +++ b/drivers/atm/firestream.c
28414 @@ -749,7 +749,7 @@ static void process_txdone_queue (struct fs_dev *dev, struct queue *q)
28415 }
28416 }
28417
28418 - atomic_inc(&ATM_SKB(skb)->vcc->stats->tx);
28419 + atomic_inc_unchecked(&ATM_SKB(skb)->vcc->stats->tx);
28420
28421 fs_dprintk (FS_DEBUG_TXMEM, "i");
28422 fs_dprintk (FS_DEBUG_ALLOC, "Free t-skb: %p\n", skb);
28423 @@ -816,7 +816,7 @@ static void process_incoming (struct fs_dev *dev, struct queue *q)
28424 #endif
28425 skb_put (skb, qe->p1 & 0xffff);
28426 ATM_SKB(skb)->vcc = atm_vcc;
28427 - atomic_inc(&atm_vcc->stats->rx);
28428 + atomic_inc_unchecked(&atm_vcc->stats->rx);
28429 __net_timestamp(skb);
28430 fs_dprintk (FS_DEBUG_ALLOC, "Free rec-skb: %p (pushed)\n", skb);
28431 atm_vcc->push (atm_vcc, skb);
28432 @@ -837,12 +837,12 @@ static void process_incoming (struct fs_dev *dev, struct queue *q)
28433 kfree (pe);
28434 }
28435 if (atm_vcc)
28436 - atomic_inc(&atm_vcc->stats->rx_drop);
28437 + atomic_inc_unchecked(&atm_vcc->stats->rx_drop);
28438 break;
28439 case 0x1f: /* Reassembly abort: no buffers. */
28440 /* Silently increment error counter. */
28441 if (atm_vcc)
28442 - atomic_inc(&atm_vcc->stats->rx_drop);
28443 + atomic_inc_unchecked(&atm_vcc->stats->rx_drop);
28444 break;
28445 default: /* Hmm. Haven't written the code to handle the others yet... -- REW */
28446 printk (KERN_WARNING "Don't know what to do with RX status %x: %s.\n",
28447 diff --git a/drivers/atm/fore200e.c b/drivers/atm/fore200e.c
28448 index 361f5ae..7fc552d 100644
28449 --- a/drivers/atm/fore200e.c
28450 +++ b/drivers/atm/fore200e.c
28451 @@ -933,9 +933,9 @@ fore200e_tx_irq(struct fore200e* fore200e)
28452 #endif
28453 /* check error condition */
28454 if (*entry->status & STATUS_ERROR)
28455 - atomic_inc(&vcc->stats->tx_err);
28456 + atomic_inc_unchecked(&vcc->stats->tx_err);
28457 else
28458 - atomic_inc(&vcc->stats->tx);
28459 + atomic_inc_unchecked(&vcc->stats->tx);
28460 }
28461 }
28462
28463 @@ -1084,7 +1084,7 @@ fore200e_push_rpd(struct fore200e* fore200e, struct atm_vcc* vcc, struct rpd* rp
28464 if (skb == NULL) {
28465 DPRINTK(2, "unable to alloc new skb, rx PDU length = %d\n", pdu_len);
28466
28467 - atomic_inc(&vcc->stats->rx_drop);
28468 + atomic_inc_unchecked(&vcc->stats->rx_drop);
28469 return -ENOMEM;
28470 }
28471
28472 @@ -1127,14 +1127,14 @@ fore200e_push_rpd(struct fore200e* fore200e, struct atm_vcc* vcc, struct rpd* rp
28473
28474 dev_kfree_skb_any(skb);
28475
28476 - atomic_inc(&vcc->stats->rx_drop);
28477 + atomic_inc_unchecked(&vcc->stats->rx_drop);
28478 return -ENOMEM;
28479 }
28480
28481 ASSERT(atomic_read(&sk_atm(vcc)->sk_wmem_alloc) >= 0);
28482
28483 vcc->push(vcc, skb);
28484 - atomic_inc(&vcc->stats->rx);
28485 + atomic_inc_unchecked(&vcc->stats->rx);
28486
28487 ASSERT(atomic_read(&sk_atm(vcc)->sk_wmem_alloc) >= 0);
28488
28489 @@ -1212,7 +1212,7 @@ fore200e_rx_irq(struct fore200e* fore200e)
28490 DPRINTK(2, "damaged PDU on %d.%d.%d\n",
28491 fore200e->atm_dev->number,
28492 entry->rpd->atm_header.vpi, entry->rpd->atm_header.vci);
28493 - atomic_inc(&vcc->stats->rx_err);
28494 + atomic_inc_unchecked(&vcc->stats->rx_err);
28495 }
28496 }
28497
28498 @@ -1657,7 +1657,7 @@ fore200e_send(struct atm_vcc *vcc, struct sk_buff *skb)
28499 goto retry_here;
28500 }
28501
28502 - atomic_inc(&vcc->stats->tx_err);
28503 + atomic_inc_unchecked(&vcc->stats->tx_err);
28504
28505 fore200e->tx_sat++;
28506 DPRINTK(2, "tx queue of device %s is saturated, PDU dropped - heartbeat is %08x\n",
28507 diff --git a/drivers/atm/he.c b/drivers/atm/he.c
28508 index b182c2f..1c6fa8a 100644
28509 --- a/drivers/atm/he.c
28510 +++ b/drivers/atm/he.c
28511 @@ -1709,7 +1709,7 @@ he_service_rbrq(struct he_dev *he_dev, int group)
28512
28513 if (RBRQ_HBUF_ERR(he_dev->rbrq_head)) {
28514 hprintk("HBUF_ERR! (cid 0x%x)\n", cid);
28515 - atomic_inc(&vcc->stats->rx_drop);
28516 + atomic_inc_unchecked(&vcc->stats->rx_drop);
28517 goto return_host_buffers;
28518 }
28519
28520 @@ -1736,7 +1736,7 @@ he_service_rbrq(struct he_dev *he_dev, int group)
28521 RBRQ_LEN_ERR(he_dev->rbrq_head)
28522 ? "LEN_ERR" : "",
28523 vcc->vpi, vcc->vci);
28524 - atomic_inc(&vcc->stats->rx_err);
28525 + atomic_inc_unchecked(&vcc->stats->rx_err);
28526 goto return_host_buffers;
28527 }
28528
28529 @@ -1788,7 +1788,7 @@ he_service_rbrq(struct he_dev *he_dev, int group)
28530 vcc->push(vcc, skb);
28531 spin_lock(&he_dev->global_lock);
28532
28533 - atomic_inc(&vcc->stats->rx);
28534 + atomic_inc_unchecked(&vcc->stats->rx);
28535
28536 return_host_buffers:
28537 ++pdus_assembled;
28538 @@ -2114,7 +2114,7 @@ __enqueue_tpd(struct he_dev *he_dev, struct he_tpd *tpd, unsigned cid)
28539 tpd->vcc->pop(tpd->vcc, tpd->skb);
28540 else
28541 dev_kfree_skb_any(tpd->skb);
28542 - atomic_inc(&tpd->vcc->stats->tx_err);
28543 + atomic_inc_unchecked(&tpd->vcc->stats->tx_err);
28544 }
28545 pci_pool_free(he_dev->tpd_pool, tpd, TPD_ADDR(tpd->status));
28546 return;
28547 @@ -2526,7 +2526,7 @@ he_send(struct atm_vcc *vcc, struct sk_buff *skb)
28548 vcc->pop(vcc, skb);
28549 else
28550 dev_kfree_skb_any(skb);
28551 - atomic_inc(&vcc->stats->tx_err);
28552 + atomic_inc_unchecked(&vcc->stats->tx_err);
28553 return -EINVAL;
28554 }
28555
28556 @@ -2537,7 +2537,7 @@ he_send(struct atm_vcc *vcc, struct sk_buff *skb)
28557 vcc->pop(vcc, skb);
28558 else
28559 dev_kfree_skb_any(skb);
28560 - atomic_inc(&vcc->stats->tx_err);
28561 + atomic_inc_unchecked(&vcc->stats->tx_err);
28562 return -EINVAL;
28563 }
28564 #endif
28565 @@ -2549,7 +2549,7 @@ he_send(struct atm_vcc *vcc, struct sk_buff *skb)
28566 vcc->pop(vcc, skb);
28567 else
28568 dev_kfree_skb_any(skb);
28569 - atomic_inc(&vcc->stats->tx_err);
28570 + atomic_inc_unchecked(&vcc->stats->tx_err);
28571 spin_unlock_irqrestore(&he_dev->global_lock, flags);
28572 return -ENOMEM;
28573 }
28574 @@ -2591,7 +2591,7 @@ he_send(struct atm_vcc *vcc, struct sk_buff *skb)
28575 vcc->pop(vcc, skb);
28576 else
28577 dev_kfree_skb_any(skb);
28578 - atomic_inc(&vcc->stats->tx_err);
28579 + atomic_inc_unchecked(&vcc->stats->tx_err);
28580 spin_unlock_irqrestore(&he_dev->global_lock, flags);
28581 return -ENOMEM;
28582 }
28583 @@ -2622,7 +2622,7 @@ he_send(struct atm_vcc *vcc, struct sk_buff *skb)
28584 __enqueue_tpd(he_dev, tpd, cid);
28585 spin_unlock_irqrestore(&he_dev->global_lock, flags);
28586
28587 - atomic_inc(&vcc->stats->tx);
28588 + atomic_inc_unchecked(&vcc->stats->tx);
28589
28590 return 0;
28591 }
28592 diff --git a/drivers/atm/horizon.c b/drivers/atm/horizon.c
28593 index 7d01c2a..4e3ac01 100644
28594 --- a/drivers/atm/horizon.c
28595 +++ b/drivers/atm/horizon.c
28596 @@ -1034,7 +1034,7 @@ static void rx_schedule (hrz_dev * dev, int irq) {
28597 {
28598 struct atm_vcc * vcc = ATM_SKB(skb)->vcc;
28599 // VC layer stats
28600 - atomic_inc(&vcc->stats->rx);
28601 + atomic_inc_unchecked(&vcc->stats->rx);
28602 __net_timestamp(skb);
28603 // end of our responsibility
28604 vcc->push (vcc, skb);
28605 @@ -1186,7 +1186,7 @@ static void tx_schedule (hrz_dev * const dev, int irq) {
28606 dev->tx_iovec = NULL;
28607
28608 // VC layer stats
28609 - atomic_inc(&ATM_SKB(skb)->vcc->stats->tx);
28610 + atomic_inc_unchecked(&ATM_SKB(skb)->vcc->stats->tx);
28611
28612 // free the skb
28613 hrz_kfree_skb (skb);
28614 diff --git a/drivers/atm/idt77252.c b/drivers/atm/idt77252.c
28615 index 8974bd2..b856f85 100644
28616 --- a/drivers/atm/idt77252.c
28617 +++ b/drivers/atm/idt77252.c
28618 @@ -812,7 +812,7 @@ drain_scq(struct idt77252_dev *card, struct vc_map *vc)
28619 else
28620 dev_kfree_skb(skb);
28621
28622 - atomic_inc(&vcc->stats->tx);
28623 + atomic_inc_unchecked(&vcc->stats->tx);
28624 }
28625
28626 atomic_dec(&scq->used);
28627 @@ -1075,13 +1075,13 @@ dequeue_rx(struct idt77252_dev *card, struct rsq_entry *rsqe)
28628 if ((sb = dev_alloc_skb(64)) == NULL) {
28629 printk("%s: Can't allocate buffers for aal0.\n",
28630 card->name);
28631 - atomic_add(i, &vcc->stats->rx_drop);
28632 + atomic_add_unchecked(i, &vcc->stats->rx_drop);
28633 break;
28634 }
28635 if (!atm_charge(vcc, sb->truesize)) {
28636 RXPRINTK("%s: atm_charge() dropped aal0 packets.\n",
28637 card->name);
28638 - atomic_add(i - 1, &vcc->stats->rx_drop);
28639 + atomic_add_unchecked(i - 1, &vcc->stats->rx_drop);
28640 dev_kfree_skb(sb);
28641 break;
28642 }
28643 @@ -1098,7 +1098,7 @@ dequeue_rx(struct idt77252_dev *card, struct rsq_entry *rsqe)
28644 ATM_SKB(sb)->vcc = vcc;
28645 __net_timestamp(sb);
28646 vcc->push(vcc, sb);
28647 - atomic_inc(&vcc->stats->rx);
28648 + atomic_inc_unchecked(&vcc->stats->rx);
28649
28650 cell += ATM_CELL_PAYLOAD;
28651 }
28652 @@ -1135,13 +1135,13 @@ dequeue_rx(struct idt77252_dev *card, struct rsq_entry *rsqe)
28653 "(CDC: %08x)\n",
28654 card->name, len, rpp->len, readl(SAR_REG_CDC));
28655 recycle_rx_pool_skb(card, rpp);
28656 - atomic_inc(&vcc->stats->rx_err);
28657 + atomic_inc_unchecked(&vcc->stats->rx_err);
28658 return;
28659 }
28660 if (stat & SAR_RSQE_CRC) {
28661 RXPRINTK("%s: AAL5 CRC error.\n", card->name);
28662 recycle_rx_pool_skb(card, rpp);
28663 - atomic_inc(&vcc->stats->rx_err);
28664 + atomic_inc_unchecked(&vcc->stats->rx_err);
28665 return;
28666 }
28667 if (skb_queue_len(&rpp->queue) > 1) {
28668 @@ -1152,7 +1152,7 @@ dequeue_rx(struct idt77252_dev *card, struct rsq_entry *rsqe)
28669 RXPRINTK("%s: Can't alloc RX skb.\n",
28670 card->name);
28671 recycle_rx_pool_skb(card, rpp);
28672 - atomic_inc(&vcc->stats->rx_err);
28673 + atomic_inc_unchecked(&vcc->stats->rx_err);
28674 return;
28675 }
28676 if (!atm_charge(vcc, skb->truesize)) {
28677 @@ -1171,7 +1171,7 @@ dequeue_rx(struct idt77252_dev *card, struct rsq_entry *rsqe)
28678 __net_timestamp(skb);
28679
28680 vcc->push(vcc, skb);
28681 - atomic_inc(&vcc->stats->rx);
28682 + atomic_inc_unchecked(&vcc->stats->rx);
28683
28684 return;
28685 }
28686 @@ -1193,7 +1193,7 @@ dequeue_rx(struct idt77252_dev *card, struct rsq_entry *rsqe)
28687 __net_timestamp(skb);
28688
28689 vcc->push(vcc, skb);
28690 - atomic_inc(&vcc->stats->rx);
28691 + atomic_inc_unchecked(&vcc->stats->rx);
28692
28693 if (skb->truesize > SAR_FB_SIZE_3)
28694 add_rx_skb(card, 3, SAR_FB_SIZE_3, 1);
28695 @@ -1304,14 +1304,14 @@ idt77252_rx_raw(struct idt77252_dev *card)
28696 if (vcc->qos.aal != ATM_AAL0) {
28697 RPRINTK("%s: raw cell for non AAL0 vc %u.%u\n",
28698 card->name, vpi, vci);
28699 - atomic_inc(&vcc->stats->rx_drop);
28700 + atomic_inc_unchecked(&vcc->stats->rx_drop);
28701 goto drop;
28702 }
28703
28704 if ((sb = dev_alloc_skb(64)) == NULL) {
28705 printk("%s: Can't allocate buffers for AAL0.\n",
28706 card->name);
28707 - atomic_inc(&vcc->stats->rx_err);
28708 + atomic_inc_unchecked(&vcc->stats->rx_err);
28709 goto drop;
28710 }
28711
28712 @@ -1330,7 +1330,7 @@ idt77252_rx_raw(struct idt77252_dev *card)
28713 ATM_SKB(sb)->vcc = vcc;
28714 __net_timestamp(sb);
28715 vcc->push(vcc, sb);
28716 - atomic_inc(&vcc->stats->rx);
28717 + atomic_inc_unchecked(&vcc->stats->rx);
28718
28719 drop:
28720 skb_pull(queue, 64);
28721 @@ -1955,13 +1955,13 @@ idt77252_send_skb(struct atm_vcc *vcc, struct sk_buff *skb, int oam)
28722
28723 if (vc == NULL) {
28724 printk("%s: NULL connection in send().\n", card->name);
28725 - atomic_inc(&vcc->stats->tx_err);
28726 + atomic_inc_unchecked(&vcc->stats->tx_err);
28727 dev_kfree_skb(skb);
28728 return -EINVAL;
28729 }
28730 if (!test_bit(VCF_TX, &vc->flags)) {
28731 printk("%s: Trying to transmit on a non-tx VC.\n", card->name);
28732 - atomic_inc(&vcc->stats->tx_err);
28733 + atomic_inc_unchecked(&vcc->stats->tx_err);
28734 dev_kfree_skb(skb);
28735 return -EINVAL;
28736 }
28737 @@ -1973,14 +1973,14 @@ idt77252_send_skb(struct atm_vcc *vcc, struct sk_buff *skb, int oam)
28738 break;
28739 default:
28740 printk("%s: Unsupported AAL: %d\n", card->name, vcc->qos.aal);
28741 - atomic_inc(&vcc->stats->tx_err);
28742 + atomic_inc_unchecked(&vcc->stats->tx_err);
28743 dev_kfree_skb(skb);
28744 return -EINVAL;
28745 }
28746
28747 if (skb_shinfo(skb)->nr_frags != 0) {
28748 printk("%s: No scatter-gather yet.\n", card->name);
28749 - atomic_inc(&vcc->stats->tx_err);
28750 + atomic_inc_unchecked(&vcc->stats->tx_err);
28751 dev_kfree_skb(skb);
28752 return -EINVAL;
28753 }
28754 @@ -1988,7 +1988,7 @@ idt77252_send_skb(struct atm_vcc *vcc, struct sk_buff *skb, int oam)
28755
28756 err = queue_skb(card, vc, skb, oam);
28757 if (err) {
28758 - atomic_inc(&vcc->stats->tx_err);
28759 + atomic_inc_unchecked(&vcc->stats->tx_err);
28760 dev_kfree_skb(skb);
28761 return err;
28762 }
28763 @@ -2011,7 +2011,7 @@ idt77252_send_oam(struct atm_vcc *vcc, void *cell, int flags)
28764 skb = dev_alloc_skb(64);
28765 if (!skb) {
28766 printk("%s: Out of memory in send_oam().\n", card->name);
28767 - atomic_inc(&vcc->stats->tx_err);
28768 + atomic_inc_unchecked(&vcc->stats->tx_err);
28769 return -ENOMEM;
28770 }
28771 atomic_add(skb->truesize, &sk_atm(vcc)->sk_wmem_alloc);
28772 diff --git a/drivers/atm/iphase.c b/drivers/atm/iphase.c
28773 index 96cce6d..62c3ec5 100644
28774 --- a/drivers/atm/iphase.c
28775 +++ b/drivers/atm/iphase.c
28776 @@ -1145,7 +1145,7 @@ static int rx_pkt(struct atm_dev *dev)
28777 status = (u_short) (buf_desc_ptr->desc_mode);
28778 if (status & (RX_CER | RX_PTE | RX_OFL))
28779 {
28780 - atomic_inc(&vcc->stats->rx_err);
28781 + atomic_inc_unchecked(&vcc->stats->rx_err);
28782 IF_ERR(printk("IA: bad packet, dropping it");)
28783 if (status & RX_CER) {
28784 IF_ERR(printk(" cause: packet CRC error\n");)
28785 @@ -1168,7 +1168,7 @@ static int rx_pkt(struct atm_dev *dev)
28786 len = dma_addr - buf_addr;
28787 if (len > iadev->rx_buf_sz) {
28788 printk("Over %d bytes sdu received, dropped!!!\n", iadev->rx_buf_sz);
28789 - atomic_inc(&vcc->stats->rx_err);
28790 + atomic_inc_unchecked(&vcc->stats->rx_err);
28791 goto out_free_desc;
28792 }
28793
28794 @@ -1318,7 +1318,7 @@ static void rx_dle_intr(struct atm_dev *dev)
28795 ia_vcc = INPH_IA_VCC(vcc);
28796 if (ia_vcc == NULL)
28797 {
28798 - atomic_inc(&vcc->stats->rx_err);
28799 + atomic_inc_unchecked(&vcc->stats->rx_err);
28800 atm_return(vcc, skb->truesize);
28801 dev_kfree_skb_any(skb);
28802 goto INCR_DLE;
28803 @@ -1330,7 +1330,7 @@ static void rx_dle_intr(struct atm_dev *dev)
28804 if ((length > iadev->rx_buf_sz) || (length >
28805 (skb->len - sizeof(struct cpcs_trailer))))
28806 {
28807 - atomic_inc(&vcc->stats->rx_err);
28808 + atomic_inc_unchecked(&vcc->stats->rx_err);
28809 IF_ERR(printk("rx_dle_intr: Bad AAL5 trailer %d (skb len %d)",
28810 length, skb->len);)
28811 atm_return(vcc, skb->truesize);
28812 @@ -1346,7 +1346,7 @@ static void rx_dle_intr(struct atm_dev *dev)
28813
28814 IF_RX(printk("rx_dle_intr: skb push");)
28815 vcc->push(vcc,skb);
28816 - atomic_inc(&vcc->stats->rx);
28817 + atomic_inc_unchecked(&vcc->stats->rx);
28818 iadev->rx_pkt_cnt++;
28819 }
28820 INCR_DLE:
28821 @@ -2826,15 +2826,15 @@ static int ia_ioctl(struct atm_dev *dev, unsigned int cmd, void __user *arg)
28822 {
28823 struct k_sonet_stats *stats;
28824 stats = &PRIV(_ia_dev[board])->sonet_stats;
28825 - printk("section_bip: %d\n", atomic_read(&stats->section_bip));
28826 - printk("line_bip : %d\n", atomic_read(&stats->line_bip));
28827 - printk("path_bip : %d\n", atomic_read(&stats->path_bip));
28828 - printk("line_febe : %d\n", atomic_read(&stats->line_febe));
28829 - printk("path_febe : %d\n", atomic_read(&stats->path_febe));
28830 - printk("corr_hcs : %d\n", atomic_read(&stats->corr_hcs));
28831 - printk("uncorr_hcs : %d\n", atomic_read(&stats->uncorr_hcs));
28832 - printk("tx_cells : %d\n", atomic_read(&stats->tx_cells));
28833 - printk("rx_cells : %d\n", atomic_read(&stats->rx_cells));
28834 + printk("section_bip: %d\n", atomic_read_unchecked(&stats->section_bip));
28835 + printk("line_bip : %d\n", atomic_read_unchecked(&stats->line_bip));
28836 + printk("path_bip : %d\n", atomic_read_unchecked(&stats->path_bip));
28837 + printk("line_febe : %d\n", atomic_read_unchecked(&stats->line_febe));
28838 + printk("path_febe : %d\n", atomic_read_unchecked(&stats->path_febe));
28839 + printk("corr_hcs : %d\n", atomic_read_unchecked(&stats->corr_hcs));
28840 + printk("uncorr_hcs : %d\n", atomic_read_unchecked(&stats->uncorr_hcs));
28841 + printk("tx_cells : %d\n", atomic_read_unchecked(&stats->tx_cells));
28842 + printk("rx_cells : %d\n", atomic_read_unchecked(&stats->rx_cells));
28843 }
28844 ia_cmds.status = 0;
28845 break;
28846 @@ -2939,7 +2939,7 @@ static int ia_pkt_tx (struct atm_vcc *vcc, struct sk_buff *skb) {
28847 if ((desc == 0) || (desc > iadev->num_tx_desc))
28848 {
28849 IF_ERR(printk(DEV_LABEL "invalid desc for send: %d\n", desc);)
28850 - atomic_inc(&vcc->stats->tx);
28851 + atomic_inc_unchecked(&vcc->stats->tx);
28852 if (vcc->pop)
28853 vcc->pop(vcc, skb);
28854 else
28855 @@ -3044,14 +3044,14 @@ static int ia_pkt_tx (struct atm_vcc *vcc, struct sk_buff *skb) {
28856 ATM_DESC(skb) = vcc->vci;
28857 skb_queue_tail(&iadev->tx_dma_q, skb);
28858
28859 - atomic_inc(&vcc->stats->tx);
28860 + atomic_inc_unchecked(&vcc->stats->tx);
28861 iadev->tx_pkt_cnt++;
28862 /* Increment transaction counter */
28863 writel(2, iadev->dma+IPHASE5575_TX_COUNTER);
28864
28865 #if 0
28866 /* add flow control logic */
28867 - if (atomic_read(&vcc->stats->tx) % 20 == 0) {
28868 + if (atomic_read_unchecked(&vcc->stats->tx) % 20 == 0) {
28869 if (iavcc->vc_desc_cnt > 10) {
28870 vcc->tx_quota = vcc->tx_quota * 3 / 4;
28871 printk("Tx1: vcc->tx_quota = %d \n", (u32)vcc->tx_quota );
28872 diff --git a/drivers/atm/lanai.c b/drivers/atm/lanai.c
28873 index 68c7588..7036683 100644
28874 --- a/drivers/atm/lanai.c
28875 +++ b/drivers/atm/lanai.c
28876 @@ -1303,7 +1303,7 @@ static void lanai_send_one_aal5(struct lanai_dev *lanai,
28877 vcc_tx_add_aal5_trailer(lvcc, skb->len, 0, 0);
28878 lanai_endtx(lanai, lvcc);
28879 lanai_free_skb(lvcc->tx.atmvcc, skb);
28880 - atomic_inc(&lvcc->tx.atmvcc->stats->tx);
28881 + atomic_inc_unchecked(&lvcc->tx.atmvcc->stats->tx);
28882 }
28883
28884 /* Try to fill the buffer - don't call unless there is backlog */
28885 @@ -1426,7 +1426,7 @@ static void vcc_rx_aal5(struct lanai_vcc *lvcc, int endptr)
28886 ATM_SKB(skb)->vcc = lvcc->rx.atmvcc;
28887 __net_timestamp(skb);
28888 lvcc->rx.atmvcc->push(lvcc->rx.atmvcc, skb);
28889 - atomic_inc(&lvcc->rx.atmvcc->stats->rx);
28890 + atomic_inc_unchecked(&lvcc->rx.atmvcc->stats->rx);
28891 out:
28892 lvcc->rx.buf.ptr = end;
28893 cardvcc_write(lvcc, endptr, vcc_rxreadptr);
28894 @@ -1667,7 +1667,7 @@ static int handle_service(struct lanai_dev *lanai, u32 s)
28895 DPRINTK("(itf %d) got RX service entry 0x%X for non-AAL5 "
28896 "vcc %d\n", lanai->number, (unsigned int) s, vci);
28897 lanai->stats.service_rxnotaal5++;
28898 - atomic_inc(&lvcc->rx.atmvcc->stats->rx_err);
28899 + atomic_inc_unchecked(&lvcc->rx.atmvcc->stats->rx_err);
28900 return 0;
28901 }
28902 if (likely(!(s & (SERVICE_TRASH | SERVICE_STREAM | SERVICE_CRCERR)))) {
28903 @@ -1679,7 +1679,7 @@ static int handle_service(struct lanai_dev *lanai, u32 s)
28904 int bytes;
28905 read_unlock(&vcc_sklist_lock);
28906 DPRINTK("got trashed rx pdu on vci %d\n", vci);
28907 - atomic_inc(&lvcc->rx.atmvcc->stats->rx_err);
28908 + atomic_inc_unchecked(&lvcc->rx.atmvcc->stats->rx_err);
28909 lvcc->stats.x.aal5.service_trash++;
28910 bytes = (SERVICE_GET_END(s) * 16) -
28911 (((unsigned long) lvcc->rx.buf.ptr) -
28912 @@ -1691,7 +1691,7 @@ static int handle_service(struct lanai_dev *lanai, u32 s)
28913 }
28914 if (s & SERVICE_STREAM) {
28915 read_unlock(&vcc_sklist_lock);
28916 - atomic_inc(&lvcc->rx.atmvcc->stats->rx_err);
28917 + atomic_inc_unchecked(&lvcc->rx.atmvcc->stats->rx_err);
28918 lvcc->stats.x.aal5.service_stream++;
28919 printk(KERN_ERR DEV_LABEL "(itf %d): Got AAL5 stream "
28920 "PDU on VCI %d!\n", lanai->number, vci);
28921 @@ -1699,7 +1699,7 @@ static int handle_service(struct lanai_dev *lanai, u32 s)
28922 return 0;
28923 }
28924 DPRINTK("got rx crc error on vci %d\n", vci);
28925 - atomic_inc(&lvcc->rx.atmvcc->stats->rx_err);
28926 + atomic_inc_unchecked(&lvcc->rx.atmvcc->stats->rx_err);
28927 lvcc->stats.x.aal5.service_rxcrc++;
28928 lvcc->rx.buf.ptr = &lvcc->rx.buf.start[SERVICE_GET_END(s) * 4];
28929 cardvcc_write(lvcc, SERVICE_GET_END(s), vcc_rxreadptr);
28930 diff --git a/drivers/atm/nicstar.c b/drivers/atm/nicstar.c
28931 index 1c70c45..300718d 100644
28932 --- a/drivers/atm/nicstar.c
28933 +++ b/drivers/atm/nicstar.c
28934 @@ -1654,7 +1654,7 @@ static int ns_send(struct atm_vcc *vcc, struct sk_buff *skb)
28935 if ((vc = (vc_map *) vcc->dev_data) == NULL) {
28936 printk("nicstar%d: vcc->dev_data == NULL on ns_send().\n",
28937 card->index);
28938 - atomic_inc(&vcc->stats->tx_err);
28939 + atomic_inc_unchecked(&vcc->stats->tx_err);
28940 dev_kfree_skb_any(skb);
28941 return -EINVAL;
28942 }
28943 @@ -1662,7 +1662,7 @@ static int ns_send(struct atm_vcc *vcc, struct sk_buff *skb)
28944 if (!vc->tx) {
28945 printk("nicstar%d: Trying to transmit on a non-tx VC.\n",
28946 card->index);
28947 - atomic_inc(&vcc->stats->tx_err);
28948 + atomic_inc_unchecked(&vcc->stats->tx_err);
28949 dev_kfree_skb_any(skb);
28950 return -EINVAL;
28951 }
28952 @@ -1670,14 +1670,14 @@ static int ns_send(struct atm_vcc *vcc, struct sk_buff *skb)
28953 if (vcc->qos.aal != ATM_AAL5 && vcc->qos.aal != ATM_AAL0) {
28954 printk("nicstar%d: Only AAL0 and AAL5 are supported.\n",
28955 card->index);
28956 - atomic_inc(&vcc->stats->tx_err);
28957 + atomic_inc_unchecked(&vcc->stats->tx_err);
28958 dev_kfree_skb_any(skb);
28959 return -EINVAL;
28960 }
28961
28962 if (skb_shinfo(skb)->nr_frags != 0) {
28963 printk("nicstar%d: No scatter-gather yet.\n", card->index);
28964 - atomic_inc(&vcc->stats->tx_err);
28965 + atomic_inc_unchecked(&vcc->stats->tx_err);
28966 dev_kfree_skb_any(skb);
28967 return -EINVAL;
28968 }
28969 @@ -1725,11 +1725,11 @@ static int ns_send(struct atm_vcc *vcc, struct sk_buff *skb)
28970 }
28971
28972 if (push_scqe(card, vc, scq, &scqe, skb) != 0) {
28973 - atomic_inc(&vcc->stats->tx_err);
28974 + atomic_inc_unchecked(&vcc->stats->tx_err);
28975 dev_kfree_skb_any(skb);
28976 return -EIO;
28977 }
28978 - atomic_inc(&vcc->stats->tx);
28979 + atomic_inc_unchecked(&vcc->stats->tx);
28980
28981 return 0;
28982 }
28983 @@ -2046,14 +2046,14 @@ static void dequeue_rx(ns_dev * card, ns_rsqe * rsqe)
28984 printk
28985 ("nicstar%d: Can't allocate buffers for aal0.\n",
28986 card->index);
28987 - atomic_add(i, &vcc->stats->rx_drop);
28988 + atomic_add_unchecked(i, &vcc->stats->rx_drop);
28989 break;
28990 }
28991 if (!atm_charge(vcc, sb->truesize)) {
28992 RXPRINTK
28993 ("nicstar%d: atm_charge() dropped aal0 packets.\n",
28994 card->index);
28995 - atomic_add(i - 1, &vcc->stats->rx_drop); /* already increased by 1 */
28996 + atomic_add_unchecked(i - 1, &vcc->stats->rx_drop); /* already increased by 1 */
28997 dev_kfree_skb_any(sb);
28998 break;
28999 }
29000 @@ -2068,7 +2068,7 @@ static void dequeue_rx(ns_dev * card, ns_rsqe * rsqe)
29001 ATM_SKB(sb)->vcc = vcc;
29002 __net_timestamp(sb);
29003 vcc->push(vcc, sb);
29004 - atomic_inc(&vcc->stats->rx);
29005 + atomic_inc_unchecked(&vcc->stats->rx);
29006 cell += ATM_CELL_PAYLOAD;
29007 }
29008
29009 @@ -2085,7 +2085,7 @@ static void dequeue_rx(ns_dev * card, ns_rsqe * rsqe)
29010 if (iovb == NULL) {
29011 printk("nicstar%d: Out of iovec buffers.\n",
29012 card->index);
29013 - atomic_inc(&vcc->stats->rx_drop);
29014 + atomic_inc_unchecked(&vcc->stats->rx_drop);
29015 recycle_rx_buf(card, skb);
29016 return;
29017 }
29018 @@ -2109,7 +2109,7 @@ static void dequeue_rx(ns_dev * card, ns_rsqe * rsqe)
29019 small or large buffer itself. */
29020 } else if (NS_PRV_IOVCNT(iovb) >= NS_MAX_IOVECS) {
29021 printk("nicstar%d: received too big AAL5 SDU.\n", card->index);
29022 - atomic_inc(&vcc->stats->rx_err);
29023 + atomic_inc_unchecked(&vcc->stats->rx_err);
29024 recycle_iovec_rx_bufs(card, (struct iovec *)iovb->data,
29025 NS_MAX_IOVECS);
29026 NS_PRV_IOVCNT(iovb) = 0;
29027 @@ -2129,7 +2129,7 @@ static void dequeue_rx(ns_dev * card, ns_rsqe * rsqe)
29028 ("nicstar%d: Expected a small buffer, and this is not one.\n",
29029 card->index);
29030 which_list(card, skb);
29031 - atomic_inc(&vcc->stats->rx_err);
29032 + atomic_inc_unchecked(&vcc->stats->rx_err);
29033 recycle_rx_buf(card, skb);
29034 vc->rx_iov = NULL;
29035 recycle_iov_buf(card, iovb);
29036 @@ -2142,7 +2142,7 @@ static void dequeue_rx(ns_dev * card, ns_rsqe * rsqe)
29037 ("nicstar%d: Expected a large buffer, and this is not one.\n",
29038 card->index);
29039 which_list(card, skb);
29040 - atomic_inc(&vcc->stats->rx_err);
29041 + atomic_inc_unchecked(&vcc->stats->rx_err);
29042 recycle_iovec_rx_bufs(card, (struct iovec *)iovb->data,
29043 NS_PRV_IOVCNT(iovb));
29044 vc->rx_iov = NULL;
29045 @@ -2165,7 +2165,7 @@ static void dequeue_rx(ns_dev * card, ns_rsqe * rsqe)
29046 printk(" - PDU size mismatch.\n");
29047 else
29048 printk(".\n");
29049 - atomic_inc(&vcc->stats->rx_err);
29050 + atomic_inc_unchecked(&vcc->stats->rx_err);
29051 recycle_iovec_rx_bufs(card, (struct iovec *)iovb->data,
29052 NS_PRV_IOVCNT(iovb));
29053 vc->rx_iov = NULL;
29054 @@ -2179,7 +2179,7 @@ static void dequeue_rx(ns_dev * card, ns_rsqe * rsqe)
29055 /* skb points to a small buffer */
29056 if (!atm_charge(vcc, skb->truesize)) {
29057 push_rxbufs(card, skb);
29058 - atomic_inc(&vcc->stats->rx_drop);
29059 + atomic_inc_unchecked(&vcc->stats->rx_drop);
29060 } else {
29061 skb_put(skb, len);
29062 dequeue_sm_buf(card, skb);
29063 @@ -2189,7 +2189,7 @@ static void dequeue_rx(ns_dev * card, ns_rsqe * rsqe)
29064 ATM_SKB(skb)->vcc = vcc;
29065 __net_timestamp(skb);
29066 vcc->push(vcc, skb);
29067 - atomic_inc(&vcc->stats->rx);
29068 + atomic_inc_unchecked(&vcc->stats->rx);
29069 }
29070 } else if (NS_PRV_IOVCNT(iovb) == 2) { /* One small plus one large buffer */
29071 struct sk_buff *sb;
29072 @@ -2200,7 +2200,7 @@ static void dequeue_rx(ns_dev * card, ns_rsqe * rsqe)
29073 if (len <= NS_SMBUFSIZE) {
29074 if (!atm_charge(vcc, sb->truesize)) {
29075 push_rxbufs(card, sb);
29076 - atomic_inc(&vcc->stats->rx_drop);
29077 + atomic_inc_unchecked(&vcc->stats->rx_drop);
29078 } else {
29079 skb_put(sb, len);
29080 dequeue_sm_buf(card, sb);
29081 @@ -2210,7 +2210,7 @@ static void dequeue_rx(ns_dev * card, ns_rsqe * rsqe)
29082 ATM_SKB(sb)->vcc = vcc;
29083 __net_timestamp(sb);
29084 vcc->push(vcc, sb);
29085 - atomic_inc(&vcc->stats->rx);
29086 + atomic_inc_unchecked(&vcc->stats->rx);
29087 }
29088
29089 push_rxbufs(card, skb);
29090 @@ -2219,7 +2219,7 @@ static void dequeue_rx(ns_dev * card, ns_rsqe * rsqe)
29091
29092 if (!atm_charge(vcc, skb->truesize)) {
29093 push_rxbufs(card, skb);
29094 - atomic_inc(&vcc->stats->rx_drop);
29095 + atomic_inc_unchecked(&vcc->stats->rx_drop);
29096 } else {
29097 dequeue_lg_buf(card, skb);
29098 #ifdef NS_USE_DESTRUCTORS
29099 @@ -2232,7 +2232,7 @@ static void dequeue_rx(ns_dev * card, ns_rsqe * rsqe)
29100 ATM_SKB(skb)->vcc = vcc;
29101 __net_timestamp(skb);
29102 vcc->push(vcc, skb);
29103 - atomic_inc(&vcc->stats->rx);
29104 + atomic_inc_unchecked(&vcc->stats->rx);
29105 }
29106
29107 push_rxbufs(card, sb);
29108 @@ -2253,7 +2253,7 @@ static void dequeue_rx(ns_dev * card, ns_rsqe * rsqe)
29109 printk
29110 ("nicstar%d: Out of huge buffers.\n",
29111 card->index);
29112 - atomic_inc(&vcc->stats->rx_drop);
29113 + atomic_inc_unchecked(&vcc->stats->rx_drop);
29114 recycle_iovec_rx_bufs(card,
29115 (struct iovec *)
29116 iovb->data,
29117 @@ -2304,7 +2304,7 @@ static void dequeue_rx(ns_dev * card, ns_rsqe * rsqe)
29118 card->hbpool.count++;
29119 } else
29120 dev_kfree_skb_any(hb);
29121 - atomic_inc(&vcc->stats->rx_drop);
29122 + atomic_inc_unchecked(&vcc->stats->rx_drop);
29123 } else {
29124 /* Copy the small buffer to the huge buffer */
29125 sb = (struct sk_buff *)iov->iov_base;
29126 @@ -2341,7 +2341,7 @@ static void dequeue_rx(ns_dev * card, ns_rsqe * rsqe)
29127 #endif /* NS_USE_DESTRUCTORS */
29128 __net_timestamp(hb);
29129 vcc->push(vcc, hb);
29130 - atomic_inc(&vcc->stats->rx);
29131 + atomic_inc_unchecked(&vcc->stats->rx);
29132 }
29133 }
29134
29135 diff --git a/drivers/atm/solos-pci.c b/drivers/atm/solos-pci.c
29136 index 9851093..adb2b1e 100644
29137 --- a/drivers/atm/solos-pci.c
29138 +++ b/drivers/atm/solos-pci.c
29139 @@ -714,7 +714,7 @@ void solos_bh(unsigned long card_arg)
29140 }
29141 atm_charge(vcc, skb->truesize);
29142 vcc->push(vcc, skb);
29143 - atomic_inc(&vcc->stats->rx);
29144 + atomic_inc_unchecked(&vcc->stats->rx);
29145 break;
29146
29147 case PKT_STATUS:
29148 @@ -1009,7 +1009,7 @@ static uint32_t fpga_tx(struct solos_card *card)
29149 vcc = SKB_CB(oldskb)->vcc;
29150
29151 if (vcc) {
29152 - atomic_inc(&vcc->stats->tx);
29153 + atomic_inc_unchecked(&vcc->stats->tx);
29154 solos_pop(vcc, oldskb);
29155 } else
29156 dev_kfree_skb_irq(oldskb);
29157 diff --git a/drivers/atm/suni.c b/drivers/atm/suni.c
29158 index 0215934..ce9f5b1 100644
29159 --- a/drivers/atm/suni.c
29160 +++ b/drivers/atm/suni.c
29161 @@ -49,8 +49,8 @@ static DEFINE_SPINLOCK(sunis_lock);
29162
29163
29164 #define ADD_LIMITED(s,v) \
29165 - atomic_add((v),&stats->s); \
29166 - if (atomic_read(&stats->s) < 0) atomic_set(&stats->s,INT_MAX);
29167 + atomic_add_unchecked((v),&stats->s); \
29168 + if (atomic_read_unchecked(&stats->s) < 0) atomic_set_unchecked(&stats->s,INT_MAX);
29169
29170
29171 static void suni_hz(unsigned long from_timer)
29172 diff --git a/drivers/atm/uPD98402.c b/drivers/atm/uPD98402.c
29173 index 5120a96..e2572bd 100644
29174 --- a/drivers/atm/uPD98402.c
29175 +++ b/drivers/atm/uPD98402.c
29176 @@ -42,7 +42,7 @@ static int fetch_stats(struct atm_dev *dev,struct sonet_stats __user *arg,int ze
29177 struct sonet_stats tmp;
29178 int error = 0;
29179
29180 - atomic_add(GET(HECCT),&PRIV(dev)->sonet_stats.uncorr_hcs);
29181 + atomic_add_unchecked(GET(HECCT),&PRIV(dev)->sonet_stats.uncorr_hcs);
29182 sonet_copy_stats(&PRIV(dev)->sonet_stats,&tmp);
29183 if (arg) error = copy_to_user(arg,&tmp,sizeof(tmp));
29184 if (zero && !error) {
29185 @@ -161,9 +161,9 @@ static int uPD98402_ioctl(struct atm_dev *dev,unsigned int cmd,void __user *arg)
29186
29187
29188 #define ADD_LIMITED(s,v) \
29189 - { atomic_add(GET(v),&PRIV(dev)->sonet_stats.s); \
29190 - if (atomic_read(&PRIV(dev)->sonet_stats.s) < 0) \
29191 - atomic_set(&PRIV(dev)->sonet_stats.s,INT_MAX); }
29192 + { atomic_add_unchecked(GET(v),&PRIV(dev)->sonet_stats.s); \
29193 + if (atomic_read_unchecked(&PRIV(dev)->sonet_stats.s) < 0) \
29194 + atomic_set_unchecked(&PRIV(dev)->sonet_stats.s,INT_MAX); }
29195
29196
29197 static void stat_event(struct atm_dev *dev)
29198 @@ -194,7 +194,7 @@ static void uPD98402_int(struct atm_dev *dev)
29199 if (reason & uPD98402_INT_PFM) stat_event(dev);
29200 if (reason & uPD98402_INT_PCO) {
29201 (void) GET(PCOCR); /* clear interrupt cause */
29202 - atomic_add(GET(HECCT),
29203 + atomic_add_unchecked(GET(HECCT),
29204 &PRIV(dev)->sonet_stats.uncorr_hcs);
29205 }
29206 if ((reason & uPD98402_INT_RFO) &&
29207 @@ -222,9 +222,9 @@ static int uPD98402_start(struct atm_dev *dev)
29208 PUT(~(uPD98402_INT_PFM | uPD98402_INT_ALM | uPD98402_INT_RFO |
29209 uPD98402_INT_LOS),PIMR); /* enable them */
29210 (void) fetch_stats(dev,NULL,1); /* clear kernel counters */
29211 - atomic_set(&PRIV(dev)->sonet_stats.corr_hcs,-1);
29212 - atomic_set(&PRIV(dev)->sonet_stats.tx_cells,-1);
29213 - atomic_set(&PRIV(dev)->sonet_stats.rx_cells,-1);
29214 + atomic_set_unchecked(&PRIV(dev)->sonet_stats.corr_hcs,-1);
29215 + atomic_set_unchecked(&PRIV(dev)->sonet_stats.tx_cells,-1);
29216 + atomic_set_unchecked(&PRIV(dev)->sonet_stats.rx_cells,-1);
29217 return 0;
29218 }
29219
29220 diff --git a/drivers/atm/zatm.c b/drivers/atm/zatm.c
29221 index abe4e20..83c4727 100644
29222 --- a/drivers/atm/zatm.c
29223 +++ b/drivers/atm/zatm.c
29224 @@ -459,7 +459,7 @@ printk("dummy: 0x%08lx, 0x%08lx\n",dummy[0],dummy[1]);
29225 }
29226 if (!size) {
29227 dev_kfree_skb_irq(skb);
29228 - if (vcc) atomic_inc(&vcc->stats->rx_err);
29229 + if (vcc) atomic_inc_unchecked(&vcc->stats->rx_err);
29230 continue;
29231 }
29232 if (!atm_charge(vcc,skb->truesize)) {
29233 @@ -469,7 +469,7 @@ printk("dummy: 0x%08lx, 0x%08lx\n",dummy[0],dummy[1]);
29234 skb->len = size;
29235 ATM_SKB(skb)->vcc = vcc;
29236 vcc->push(vcc,skb);
29237 - atomic_inc(&vcc->stats->rx);
29238 + atomic_inc_unchecked(&vcc->stats->rx);
29239 }
29240 zout(pos & 0xffff,MTA(mbx));
29241 #if 0 /* probably a stupid idea */
29242 @@ -733,7 +733,7 @@ if (*ZATM_PRV_DSC(skb) != (uPD98401_TXPD_V | uPD98401_TXPD_DP |
29243 skb_queue_head(&zatm_vcc->backlog,skb);
29244 break;
29245 }
29246 - atomic_inc(&vcc->stats->tx);
29247 + atomic_inc_unchecked(&vcc->stats->tx);
29248 wake_up(&zatm_vcc->tx_wait);
29249 }
29250
29251 diff --git a/drivers/base/devtmpfs.c b/drivers/base/devtmpfs.c
29252 index deb4a45..211eff2 100644
29253 --- a/drivers/base/devtmpfs.c
29254 +++ b/drivers/base/devtmpfs.c
29255 @@ -347,7 +347,7 @@ int devtmpfs_mount(const char *mntdir)
29256 if (!thread)
29257 return 0;
29258
29259 - err = sys_mount("devtmpfs", (char *)mntdir, "devtmpfs", MS_SILENT, NULL);
29260 + err = sys_mount((char __force_user *)"devtmpfs", (char __force_user *)mntdir, (char __force_user *)"devtmpfs", MS_SILENT, NULL);
29261 if (err)
29262 printk(KERN_INFO "devtmpfs: error mounting %i\n", err);
29263 else
29264 diff --git a/drivers/base/power/wakeup.c b/drivers/base/power/wakeup.c
29265 index cbb463b..babe2cf 100644
29266 --- a/drivers/base/power/wakeup.c
29267 +++ b/drivers/base/power/wakeup.c
29268 @@ -29,14 +29,14 @@ bool events_check_enabled __read_mostly;
29269 * They need to be modified together atomically, so it's better to use one
29270 * atomic variable to hold them both.
29271 */
29272 -static atomic_t combined_event_count = ATOMIC_INIT(0);
29273 +static atomic_unchecked_t combined_event_count = ATOMIC_INIT(0);
29274
29275 #define IN_PROGRESS_BITS (sizeof(int) * 4)
29276 #define MAX_IN_PROGRESS ((1 << IN_PROGRESS_BITS) - 1)
29277
29278 static void split_counters(unsigned int *cnt, unsigned int *inpr)
29279 {
29280 - unsigned int comb = atomic_read(&combined_event_count);
29281 + unsigned int comb = atomic_read_unchecked(&combined_event_count);
29282
29283 *cnt = (comb >> IN_PROGRESS_BITS);
29284 *inpr = comb & MAX_IN_PROGRESS;
29285 @@ -385,7 +385,7 @@ static void wakeup_source_activate(struct wakeup_source *ws)
29286 ws->start_prevent_time = ws->last_time;
29287
29288 /* Increment the counter of events in progress. */
29289 - cec = atomic_inc_return(&combined_event_count);
29290 + cec = atomic_inc_return_unchecked(&combined_event_count);
29291
29292 trace_wakeup_source_activate(ws->name, cec);
29293 }
29294 @@ -511,7 +511,7 @@ static void wakeup_source_deactivate(struct wakeup_source *ws)
29295 * Increment the counter of registered wakeup events and decrement the
29296 * couter of wakeup events in progress simultaneously.
29297 */
29298 - cec = atomic_add_return(MAX_IN_PROGRESS, &combined_event_count);
29299 + cec = atomic_add_return_unchecked(MAX_IN_PROGRESS, &combined_event_count);
29300 trace_wakeup_source_deactivate(ws->name, cec);
29301
29302 split_counters(&cnt, &inpr);
29303 diff --git a/drivers/block/cciss.c b/drivers/block/cciss.c
29304 index b0f553b..77b928b 100644
29305 --- a/drivers/block/cciss.c
29306 +++ b/drivers/block/cciss.c
29307 @@ -1198,6 +1198,8 @@ static int cciss_ioctl32_passthru(struct block_device *bdev, fmode_t mode,
29308 int err;
29309 u32 cp;
29310
29311 + memset(&arg64, 0, sizeof(arg64));
29312 +
29313 err = 0;
29314 err |=
29315 copy_from_user(&arg64.LUN_info, &arg32->LUN_info,
29316 @@ -3007,7 +3009,7 @@ static void start_io(ctlr_info_t *h)
29317 while (!list_empty(&h->reqQ)) {
29318 c = list_entry(h->reqQ.next, CommandList_struct, list);
29319 /* can't do anything if fifo is full */
29320 - if ((h->access.fifo_full(h))) {
29321 + if ((h->access->fifo_full(h))) {
29322 dev_warn(&h->pdev->dev, "fifo full\n");
29323 break;
29324 }
29325 @@ -3017,7 +3019,7 @@ static void start_io(ctlr_info_t *h)
29326 h->Qdepth--;
29327
29328 /* Tell the controller execute command */
29329 - h->access.submit_command(h, c);
29330 + h->access->submit_command(h, c);
29331
29332 /* Put job onto the completed Q */
29333 addQ(&h->cmpQ, c);
29334 @@ -3443,17 +3445,17 @@ startio:
29335
29336 static inline unsigned long get_next_completion(ctlr_info_t *h)
29337 {
29338 - return h->access.command_completed(h);
29339 + return h->access->command_completed(h);
29340 }
29341
29342 static inline int interrupt_pending(ctlr_info_t *h)
29343 {
29344 - return h->access.intr_pending(h);
29345 + return h->access->intr_pending(h);
29346 }
29347
29348 static inline long interrupt_not_for_us(ctlr_info_t *h)
29349 {
29350 - return ((h->access.intr_pending(h) == 0) ||
29351 + return ((h->access->intr_pending(h) == 0) ||
29352 (h->interrupts_enabled == 0));
29353 }
29354
29355 @@ -3486,7 +3488,7 @@ static inline u32 next_command(ctlr_info_t *h)
29356 u32 a;
29357
29358 if (unlikely(!(h->transMethod & CFGTBL_Trans_Performant)))
29359 - return h->access.command_completed(h);
29360 + return h->access->command_completed(h);
29361
29362 if ((*(h->reply_pool_head) & 1) == (h->reply_pool_wraparound)) {
29363 a = *(h->reply_pool_head); /* Next cmd in ring buffer */
29364 @@ -4044,7 +4046,7 @@ static void __devinit cciss_put_controller_into_performant_mode(ctlr_info_t *h)
29365 trans_support & CFGTBL_Trans_use_short_tags);
29366
29367 /* Change the access methods to the performant access methods */
29368 - h->access = SA5_performant_access;
29369 + h->access = &SA5_performant_access;
29370 h->transMethod = CFGTBL_Trans_Performant;
29371
29372 return;
29373 @@ -4316,7 +4318,7 @@ static int __devinit cciss_pci_init(ctlr_info_t *h)
29374 if (prod_index < 0)
29375 return -ENODEV;
29376 h->product_name = products[prod_index].product_name;
29377 - h->access = *(products[prod_index].access);
29378 + h->access = products[prod_index].access;
29379
29380 if (cciss_board_disabled(h)) {
29381 dev_warn(&h->pdev->dev, "controller appears to be disabled\n");
29382 @@ -5041,7 +5043,7 @@ reinit_after_soft_reset:
29383 }
29384
29385 /* make sure the board interrupts are off */
29386 - h->access.set_intr_mask(h, CCISS_INTR_OFF);
29387 + h->access->set_intr_mask(h, CCISS_INTR_OFF);
29388 rc = cciss_request_irq(h, do_cciss_msix_intr, do_cciss_intx);
29389 if (rc)
29390 goto clean2;
29391 @@ -5093,7 +5095,7 @@ reinit_after_soft_reset:
29392 * fake ones to scoop up any residual completions.
29393 */
29394 spin_lock_irqsave(&h->lock, flags);
29395 - h->access.set_intr_mask(h, CCISS_INTR_OFF);
29396 + h->access->set_intr_mask(h, CCISS_INTR_OFF);
29397 spin_unlock_irqrestore(&h->lock, flags);
29398 free_irq(h->intr[h->intr_mode], h);
29399 rc = cciss_request_irq(h, cciss_msix_discard_completions,
29400 @@ -5113,9 +5115,9 @@ reinit_after_soft_reset:
29401 dev_info(&h->pdev->dev, "Board READY.\n");
29402 dev_info(&h->pdev->dev,
29403 "Waiting for stale completions to drain.\n");
29404 - h->access.set_intr_mask(h, CCISS_INTR_ON);
29405 + h->access->set_intr_mask(h, CCISS_INTR_ON);
29406 msleep(10000);
29407 - h->access.set_intr_mask(h, CCISS_INTR_OFF);
29408 + h->access->set_intr_mask(h, CCISS_INTR_OFF);
29409
29410 rc = controller_reset_failed(h->cfgtable);
29411 if (rc)
29412 @@ -5138,7 +5140,7 @@ reinit_after_soft_reset:
29413 cciss_scsi_setup(h);
29414
29415 /* Turn the interrupts on so we can service requests */
29416 - h->access.set_intr_mask(h, CCISS_INTR_ON);
29417 + h->access->set_intr_mask(h, CCISS_INTR_ON);
29418
29419 /* Get the firmware version */
29420 inq_buff = kzalloc(sizeof(InquiryData_struct), GFP_KERNEL);
29421 @@ -5211,7 +5213,7 @@ static void cciss_shutdown(struct pci_dev *pdev)
29422 kfree(flush_buf);
29423 if (return_code != IO_OK)
29424 dev_warn(&h->pdev->dev, "Error flushing cache\n");
29425 - h->access.set_intr_mask(h, CCISS_INTR_OFF);
29426 + h->access->set_intr_mask(h, CCISS_INTR_OFF);
29427 free_irq(h->intr[h->intr_mode], h);
29428 }
29429
29430 diff --git a/drivers/block/cciss.h b/drivers/block/cciss.h
29431 index 7fda30e..eb5dfe0 100644
29432 --- a/drivers/block/cciss.h
29433 +++ b/drivers/block/cciss.h
29434 @@ -101,7 +101,7 @@ struct ctlr_info
29435 /* information about each logical volume */
29436 drive_info_struct *drv[CISS_MAX_LUN];
29437
29438 - struct access_method access;
29439 + struct access_method *access;
29440
29441 /* queue and queue Info */
29442 struct list_head reqQ;
29443 diff --git a/drivers/block/cpqarray.c b/drivers/block/cpqarray.c
29444 index 9125bbe..eede5c8 100644
29445 --- a/drivers/block/cpqarray.c
29446 +++ b/drivers/block/cpqarray.c
29447 @@ -404,7 +404,7 @@ static int __devinit cpqarray_register_ctlr( int i, struct pci_dev *pdev)
29448 if (register_blkdev(COMPAQ_SMART2_MAJOR+i, hba[i]->devname)) {
29449 goto Enomem4;
29450 }
29451 - hba[i]->access.set_intr_mask(hba[i], 0);
29452 + hba[i]->access->set_intr_mask(hba[i], 0);
29453 if (request_irq(hba[i]->intr, do_ida_intr,
29454 IRQF_DISABLED|IRQF_SHARED, hba[i]->devname, hba[i]))
29455 {
29456 @@ -459,7 +459,7 @@ static int __devinit cpqarray_register_ctlr( int i, struct pci_dev *pdev)
29457 add_timer(&hba[i]->timer);
29458
29459 /* Enable IRQ now that spinlock and rate limit timer are set up */
29460 - hba[i]->access.set_intr_mask(hba[i], FIFO_NOT_EMPTY);
29461 + hba[i]->access->set_intr_mask(hba[i], FIFO_NOT_EMPTY);
29462
29463 for(j=0; j<NWD; j++) {
29464 struct gendisk *disk = ida_gendisk[i][j];
29465 @@ -694,7 +694,7 @@ DBGINFO(
29466 for(i=0; i<NR_PRODUCTS; i++) {
29467 if (board_id == products[i].board_id) {
29468 c->product_name = products[i].product_name;
29469 - c->access = *(products[i].access);
29470 + c->access = products[i].access;
29471 break;
29472 }
29473 }
29474 @@ -792,7 +792,7 @@ static int __devinit cpqarray_eisa_detect(void)
29475 hba[ctlr]->intr = intr;
29476 sprintf(hba[ctlr]->devname, "ida%d", nr_ctlr);
29477 hba[ctlr]->product_name = products[j].product_name;
29478 - hba[ctlr]->access = *(products[j].access);
29479 + hba[ctlr]->access = products[j].access;
29480 hba[ctlr]->ctlr = ctlr;
29481 hba[ctlr]->board_id = board_id;
29482 hba[ctlr]->pci_dev = NULL; /* not PCI */
29483 @@ -980,7 +980,7 @@ static void start_io(ctlr_info_t *h)
29484
29485 while((c = h->reqQ) != NULL) {
29486 /* Can't do anything if we're busy */
29487 - if (h->access.fifo_full(h) == 0)
29488 + if (h->access->fifo_full(h) == 0)
29489 return;
29490
29491 /* Get the first entry from the request Q */
29492 @@ -988,7 +988,7 @@ static void start_io(ctlr_info_t *h)
29493 h->Qdepth--;
29494
29495 /* Tell the controller to do our bidding */
29496 - h->access.submit_command(h, c);
29497 + h->access->submit_command(h, c);
29498
29499 /* Get onto the completion Q */
29500 addQ(&h->cmpQ, c);
29501 @@ -1050,7 +1050,7 @@ static irqreturn_t do_ida_intr(int irq, void *dev_id)
29502 unsigned long flags;
29503 __u32 a,a1;
29504
29505 - istat = h->access.intr_pending(h);
29506 + istat = h->access->intr_pending(h);
29507 /* Is this interrupt for us? */
29508 if (istat == 0)
29509 return IRQ_NONE;
29510 @@ -1061,7 +1061,7 @@ static irqreturn_t do_ida_intr(int irq, void *dev_id)
29511 */
29512 spin_lock_irqsave(IDA_LOCK(h->ctlr), flags);
29513 if (istat & FIFO_NOT_EMPTY) {
29514 - while((a = h->access.command_completed(h))) {
29515 + while((a = h->access->command_completed(h))) {
29516 a1 = a; a &= ~3;
29517 if ((c = h->cmpQ) == NULL)
29518 {
29519 @@ -1449,11 +1449,11 @@ static int sendcmd(
29520 /*
29521 * Disable interrupt
29522 */
29523 - info_p->access.set_intr_mask(info_p, 0);
29524 + info_p->access->set_intr_mask(info_p, 0);
29525 /* Make sure there is room in the command FIFO */
29526 /* Actually it should be completely empty at this time. */
29527 for (i = 200000; i > 0; i--) {
29528 - temp = info_p->access.fifo_full(info_p);
29529 + temp = info_p->access->fifo_full(info_p);
29530 if (temp != 0) {
29531 break;
29532 }
29533 @@ -1466,7 +1466,7 @@ DBG(
29534 /*
29535 * Send the cmd
29536 */
29537 - info_p->access.submit_command(info_p, c);
29538 + info_p->access->submit_command(info_p, c);
29539 complete = pollcomplete(ctlr);
29540
29541 pci_unmap_single(info_p->pci_dev, (dma_addr_t) c->req.sg[0].addr,
29542 @@ -1549,9 +1549,9 @@ static int revalidate_allvol(ctlr_info_t *host)
29543 * we check the new geometry. Then turn interrupts back on when
29544 * we're done.
29545 */
29546 - host->access.set_intr_mask(host, 0);
29547 + host->access->set_intr_mask(host, 0);
29548 getgeometry(ctlr);
29549 - host->access.set_intr_mask(host, FIFO_NOT_EMPTY);
29550 + host->access->set_intr_mask(host, FIFO_NOT_EMPTY);
29551
29552 for(i=0; i<NWD; i++) {
29553 struct gendisk *disk = ida_gendisk[ctlr][i];
29554 @@ -1591,7 +1591,7 @@ static int pollcomplete(int ctlr)
29555 /* Wait (up to 2 seconds) for a command to complete */
29556
29557 for (i = 200000; i > 0; i--) {
29558 - done = hba[ctlr]->access.command_completed(hba[ctlr]);
29559 + done = hba[ctlr]->access->command_completed(hba[ctlr]);
29560 if (done == 0) {
29561 udelay(10); /* a short fixed delay */
29562 } else
29563 diff --git a/drivers/block/cpqarray.h b/drivers/block/cpqarray.h
29564 index be73e9d..7fbf140 100644
29565 --- a/drivers/block/cpqarray.h
29566 +++ b/drivers/block/cpqarray.h
29567 @@ -99,7 +99,7 @@ struct ctlr_info {
29568 drv_info_t drv[NWD];
29569 struct proc_dir_entry *proc;
29570
29571 - struct access_method access;
29572 + struct access_method *access;
29573
29574 cmdlist_t *reqQ;
29575 cmdlist_t *cmpQ;
29576 diff --git a/drivers/block/drbd/drbd_int.h b/drivers/block/drbd/drbd_int.h
29577 index b953cc7..e3dc580 100644
29578 --- a/drivers/block/drbd/drbd_int.h
29579 +++ b/drivers/block/drbd/drbd_int.h
29580 @@ -735,7 +735,7 @@ struct drbd_request;
29581 struct drbd_epoch {
29582 struct list_head list;
29583 unsigned int barrier_nr;
29584 - atomic_t epoch_size; /* increased on every request added. */
29585 + atomic_unchecked_t epoch_size; /* increased on every request added. */
29586 atomic_t active; /* increased on every req. added, and dec on every finished. */
29587 unsigned long flags;
29588 };
29589 @@ -1116,7 +1116,7 @@ struct drbd_conf {
29590 void *int_dig_in;
29591 void *int_dig_vv;
29592 wait_queue_head_t seq_wait;
29593 - atomic_t packet_seq;
29594 + atomic_unchecked_t packet_seq;
29595 unsigned int peer_seq;
29596 spinlock_t peer_seq_lock;
29597 unsigned int minor;
29598 @@ -1658,30 +1658,30 @@ static inline int drbd_setsockopt(struct socket *sock, int level, int optname,
29599
29600 static inline void drbd_tcp_cork(struct socket *sock)
29601 {
29602 - int __user val = 1;
29603 + int val = 1;
29604 (void) drbd_setsockopt(sock, SOL_TCP, TCP_CORK,
29605 - (char __user *)&val, sizeof(val));
29606 + (char __force_user *)&val, sizeof(val));
29607 }
29608
29609 static inline void drbd_tcp_uncork(struct socket *sock)
29610 {
29611 - int __user val = 0;
29612 + int val = 0;
29613 (void) drbd_setsockopt(sock, SOL_TCP, TCP_CORK,
29614 - (char __user *)&val, sizeof(val));
29615 + (char __force_user *)&val, sizeof(val));
29616 }
29617
29618 static inline void drbd_tcp_nodelay(struct socket *sock)
29619 {
29620 - int __user val = 1;
29621 + int val = 1;
29622 (void) drbd_setsockopt(sock, SOL_TCP, TCP_NODELAY,
29623 - (char __user *)&val, sizeof(val));
29624 + (char __force_user *)&val, sizeof(val));
29625 }
29626
29627 static inline void drbd_tcp_quickack(struct socket *sock)
29628 {
29629 - int __user val = 2;
29630 + int val = 2;
29631 (void) drbd_setsockopt(sock, SOL_TCP, TCP_QUICKACK,
29632 - (char __user *)&val, sizeof(val));
29633 + (char __force_user *)&val, sizeof(val));
29634 }
29635
29636 void drbd_bump_write_ordering(struct drbd_conf *mdev, enum write_ordering_e wo);
29637 diff --git a/drivers/block/drbd/drbd_main.c b/drivers/block/drbd/drbd_main.c
29638 index f93a032..71c87bf 100644
29639 --- a/drivers/block/drbd/drbd_main.c
29640 +++ b/drivers/block/drbd/drbd_main.c
29641 @@ -2567,7 +2567,7 @@ static int _drbd_send_ack(struct drbd_conf *mdev, enum drbd_packets cmd,
29642 p.sector = sector;
29643 p.block_id = block_id;
29644 p.blksize = blksize;
29645 - p.seq_num = cpu_to_be32(atomic_add_return(1, &mdev->packet_seq));
29646 + p.seq_num = cpu_to_be32(atomic_add_return_unchecked(1, &mdev->packet_seq));
29647
29648 if (!mdev->meta.socket || mdev->state.conn < C_CONNECTED)
29649 return false;
29650 @@ -2865,7 +2865,7 @@ int drbd_send_dblock(struct drbd_conf *mdev, struct drbd_request *req)
29651
29652 p.sector = cpu_to_be64(req->sector);
29653 p.block_id = (unsigned long)req;
29654 - p.seq_num = cpu_to_be32(atomic_add_return(1, &mdev->packet_seq));
29655 + p.seq_num = cpu_to_be32(atomic_add_return_unchecked(1, &mdev->packet_seq));
29656
29657 dp_flags = bio_flags_to_wire(mdev, req->master_bio->bi_rw);
29658
29659 @@ -3150,7 +3150,7 @@ void drbd_init_set_defaults(struct drbd_conf *mdev)
29660 atomic_set(&mdev->unacked_cnt, 0);
29661 atomic_set(&mdev->local_cnt, 0);
29662 atomic_set(&mdev->net_cnt, 0);
29663 - atomic_set(&mdev->packet_seq, 0);
29664 + atomic_set_unchecked(&mdev->packet_seq, 0);
29665 atomic_set(&mdev->pp_in_use, 0);
29666 atomic_set(&mdev->pp_in_use_by_net, 0);
29667 atomic_set(&mdev->rs_sect_in, 0);
29668 @@ -3232,8 +3232,8 @@ void drbd_mdev_cleanup(struct drbd_conf *mdev)
29669 mdev->receiver.t_state);
29670
29671 /* no need to lock it, I'm the only thread alive */
29672 - if (atomic_read(&mdev->current_epoch->epoch_size) != 0)
29673 - dev_err(DEV, "epoch_size:%d\n", atomic_read(&mdev->current_epoch->epoch_size));
29674 + if (atomic_read_unchecked(&mdev->current_epoch->epoch_size) != 0)
29675 + dev_err(DEV, "epoch_size:%d\n", atomic_read_unchecked(&mdev->current_epoch->epoch_size));
29676 mdev->al_writ_cnt =
29677 mdev->bm_writ_cnt =
29678 mdev->read_cnt =
29679 diff --git a/drivers/block/drbd/drbd_nl.c b/drivers/block/drbd/drbd_nl.c
29680 index edb490a..ecd69da 100644
29681 --- a/drivers/block/drbd/drbd_nl.c
29682 +++ b/drivers/block/drbd/drbd_nl.c
29683 @@ -2407,7 +2407,7 @@ static void drbd_connector_callback(struct cn_msg *req, struct netlink_skb_parms
29684 module_put(THIS_MODULE);
29685 }
29686
29687 -static atomic_t drbd_nl_seq = ATOMIC_INIT(2); /* two. */
29688 +static atomic_unchecked_t drbd_nl_seq = ATOMIC_INIT(2); /* two. */
29689
29690 static unsigned short *
29691 __tl_add_blob(unsigned short *tl, enum drbd_tags tag, const void *data,
29692 @@ -2478,7 +2478,7 @@ void drbd_bcast_state(struct drbd_conf *mdev, union drbd_state state)
29693 cn_reply->id.idx = CN_IDX_DRBD;
29694 cn_reply->id.val = CN_VAL_DRBD;
29695
29696 - cn_reply->seq = atomic_add_return(1, &drbd_nl_seq);
29697 + cn_reply->seq = atomic_add_return_unchecked(1, &drbd_nl_seq);
29698 cn_reply->ack = 0; /* not used here. */
29699 cn_reply->len = sizeof(struct drbd_nl_cfg_reply) +
29700 (int)((char *)tl - (char *)reply->tag_list);
29701 @@ -2510,7 +2510,7 @@ void drbd_bcast_ev_helper(struct drbd_conf *mdev, char *helper_name)
29702 cn_reply->id.idx = CN_IDX_DRBD;
29703 cn_reply->id.val = CN_VAL_DRBD;
29704
29705 - cn_reply->seq = atomic_add_return(1, &drbd_nl_seq);
29706 + cn_reply->seq = atomic_add_return_unchecked(1, &drbd_nl_seq);
29707 cn_reply->ack = 0; /* not used here. */
29708 cn_reply->len = sizeof(struct drbd_nl_cfg_reply) +
29709 (int)((char *)tl - (char *)reply->tag_list);
29710 @@ -2588,7 +2588,7 @@ void drbd_bcast_ee(struct drbd_conf *mdev,
29711 cn_reply->id.idx = CN_IDX_DRBD;
29712 cn_reply->id.val = CN_VAL_DRBD;
29713
29714 - cn_reply->seq = atomic_add_return(1,&drbd_nl_seq);
29715 + cn_reply->seq = atomic_add_return_unchecked(1,&drbd_nl_seq);
29716 cn_reply->ack = 0; // not used here.
29717 cn_reply->len = sizeof(struct drbd_nl_cfg_reply) +
29718 (int)((char*)tl - (char*)reply->tag_list);
29719 @@ -2627,7 +2627,7 @@ void drbd_bcast_sync_progress(struct drbd_conf *mdev)
29720 cn_reply->id.idx = CN_IDX_DRBD;
29721 cn_reply->id.val = CN_VAL_DRBD;
29722
29723 - cn_reply->seq = atomic_add_return(1, &drbd_nl_seq);
29724 + cn_reply->seq = atomic_add_return_unchecked(1, &drbd_nl_seq);
29725 cn_reply->ack = 0; /* not used here. */
29726 cn_reply->len = sizeof(struct drbd_nl_cfg_reply) +
29727 (int)((char *)tl - (char *)reply->tag_list);
29728 diff --git a/drivers/block/drbd/drbd_receiver.c b/drivers/block/drbd/drbd_receiver.c
29729 index c74ca2d..860c819 100644
29730 --- a/drivers/block/drbd/drbd_receiver.c
29731 +++ b/drivers/block/drbd/drbd_receiver.c
29732 @@ -898,7 +898,7 @@ retry:
29733 sock->sk->sk_sndtimeo = mdev->net_conf->timeout*HZ/10;
29734 sock->sk->sk_rcvtimeo = MAX_SCHEDULE_TIMEOUT;
29735
29736 - atomic_set(&mdev->packet_seq, 0);
29737 + atomic_set_unchecked(&mdev->packet_seq, 0);
29738 mdev->peer_seq = 0;
29739
29740 if (drbd_send_protocol(mdev) == -1)
29741 @@ -999,7 +999,7 @@ static enum finish_epoch drbd_may_finish_epoch(struct drbd_conf *mdev,
29742 do {
29743 next_epoch = NULL;
29744
29745 - epoch_size = atomic_read(&epoch->epoch_size);
29746 + epoch_size = atomic_read_unchecked(&epoch->epoch_size);
29747
29748 switch (ev & ~EV_CLEANUP) {
29749 case EV_PUT:
29750 @@ -1035,7 +1035,7 @@ static enum finish_epoch drbd_may_finish_epoch(struct drbd_conf *mdev,
29751 rv = FE_DESTROYED;
29752 } else {
29753 epoch->flags = 0;
29754 - atomic_set(&epoch->epoch_size, 0);
29755 + atomic_set_unchecked(&epoch->epoch_size, 0);
29756 /* atomic_set(&epoch->active, 0); is already zero */
29757 if (rv == FE_STILL_LIVE)
29758 rv = FE_RECYCLED;
29759 @@ -1210,14 +1210,14 @@ static int receive_Barrier(struct drbd_conf *mdev, enum drbd_packets cmd, unsign
29760 drbd_wait_ee_list_empty(mdev, &mdev->active_ee);
29761 drbd_flush(mdev);
29762
29763 - if (atomic_read(&mdev->current_epoch->epoch_size)) {
29764 + if (atomic_read_unchecked(&mdev->current_epoch->epoch_size)) {
29765 epoch = kmalloc(sizeof(struct drbd_epoch), GFP_NOIO);
29766 if (epoch)
29767 break;
29768 }
29769
29770 epoch = mdev->current_epoch;
29771 - wait_event(mdev->ee_wait, atomic_read(&epoch->epoch_size) == 0);
29772 + wait_event(mdev->ee_wait, atomic_read_unchecked(&epoch->epoch_size) == 0);
29773
29774 D_ASSERT(atomic_read(&epoch->active) == 0);
29775 D_ASSERT(epoch->flags == 0);
29776 @@ -1229,11 +1229,11 @@ static int receive_Barrier(struct drbd_conf *mdev, enum drbd_packets cmd, unsign
29777 }
29778
29779 epoch->flags = 0;
29780 - atomic_set(&epoch->epoch_size, 0);
29781 + atomic_set_unchecked(&epoch->epoch_size, 0);
29782 atomic_set(&epoch->active, 0);
29783
29784 spin_lock(&mdev->epoch_lock);
29785 - if (atomic_read(&mdev->current_epoch->epoch_size)) {
29786 + if (atomic_read_unchecked(&mdev->current_epoch->epoch_size)) {
29787 list_add(&epoch->list, &mdev->current_epoch->list);
29788 mdev->current_epoch = epoch;
29789 mdev->epochs++;
29790 @@ -1702,7 +1702,7 @@ static int receive_Data(struct drbd_conf *mdev, enum drbd_packets cmd, unsigned
29791 spin_unlock(&mdev->peer_seq_lock);
29792
29793 drbd_send_ack_dp(mdev, P_NEG_ACK, p, data_size);
29794 - atomic_inc(&mdev->current_epoch->epoch_size);
29795 + atomic_inc_unchecked(&mdev->current_epoch->epoch_size);
29796 return drbd_drain_block(mdev, data_size);
29797 }
29798
29799 @@ -1732,7 +1732,7 @@ static int receive_Data(struct drbd_conf *mdev, enum drbd_packets cmd, unsigned
29800
29801 spin_lock(&mdev->epoch_lock);
29802 e->epoch = mdev->current_epoch;
29803 - atomic_inc(&e->epoch->epoch_size);
29804 + atomic_inc_unchecked(&e->epoch->epoch_size);
29805 atomic_inc(&e->epoch->active);
29806 spin_unlock(&mdev->epoch_lock);
29807
29808 @@ -3954,7 +3954,7 @@ static void drbd_disconnect(struct drbd_conf *mdev)
29809 D_ASSERT(list_empty(&mdev->done_ee));
29810
29811 /* ok, no more ee's on the fly, it is safe to reset the epoch_size */
29812 - atomic_set(&mdev->current_epoch->epoch_size, 0);
29813 + atomic_set_unchecked(&mdev->current_epoch->epoch_size, 0);
29814 D_ASSERT(list_empty(&mdev->current_epoch->list));
29815 }
29816
29817 diff --git a/drivers/block/loop.c b/drivers/block/loop.c
29818 index 3bba655..6151b66 100644
29819 --- a/drivers/block/loop.c
29820 +++ b/drivers/block/loop.c
29821 @@ -226,7 +226,7 @@ static int __do_lo_send_write(struct file *file,
29822 mm_segment_t old_fs = get_fs();
29823
29824 set_fs(get_ds());
29825 - bw = file->f_op->write(file, buf, len, &pos);
29826 + bw = file->f_op->write(file, (const char __force_user *)buf, len, &pos);
29827 set_fs(old_fs);
29828 if (likely(bw == len))
29829 return 0;
29830 diff --git a/drivers/char/Kconfig b/drivers/char/Kconfig
29831 index ea6f632..eafb192 100644
29832 --- a/drivers/char/Kconfig
29833 +++ b/drivers/char/Kconfig
29834 @@ -8,7 +8,8 @@ source "drivers/tty/Kconfig"
29835
29836 config DEVKMEM
29837 bool "/dev/kmem virtual device support"
29838 - default y
29839 + default n
29840 + depends on !GRKERNSEC_KMEM
29841 help
29842 Say Y here if you want to support the /dev/kmem device. The
29843 /dev/kmem device is rarely used, but can be used for certain
29844 @@ -581,6 +582,7 @@ config DEVPORT
29845 bool
29846 depends on !M68K
29847 depends on ISA || PCI
29848 + depends on !GRKERNSEC_KMEM
29849 default y
29850
29851 source "drivers/s390/char/Kconfig"
29852 diff --git a/drivers/char/agp/frontend.c b/drivers/char/agp/frontend.c
29853 index 2e04433..22afc64 100644
29854 --- a/drivers/char/agp/frontend.c
29855 +++ b/drivers/char/agp/frontend.c
29856 @@ -817,7 +817,7 @@ static int agpioc_reserve_wrap(struct agp_file_private *priv, void __user *arg)
29857 if (copy_from_user(&reserve, arg, sizeof(struct agp_region)))
29858 return -EFAULT;
29859
29860 - if ((unsigned) reserve.seg_count >= ~0U/sizeof(struct agp_segment))
29861 + if ((unsigned) reserve.seg_count >= ~0U/sizeof(struct agp_segment_priv))
29862 return -EFAULT;
29863
29864 client = agp_find_client_by_pid(reserve.pid);
29865 diff --git a/drivers/char/genrtc.c b/drivers/char/genrtc.c
29866 index 21cb980..f15107c 100644
29867 --- a/drivers/char/genrtc.c
29868 +++ b/drivers/char/genrtc.c
29869 @@ -272,6 +272,7 @@ static int gen_rtc_ioctl(struct file *file,
29870 switch (cmd) {
29871
29872 case RTC_PLL_GET:
29873 + memset(&pll, 0, sizeof(pll));
29874 if (get_rtc_pll(&pll))
29875 return -EINVAL;
29876 else
29877 diff --git a/drivers/char/hpet.c b/drivers/char/hpet.c
29878 index dfd7876..c0b0885 100644
29879 --- a/drivers/char/hpet.c
29880 +++ b/drivers/char/hpet.c
29881 @@ -571,7 +571,7 @@ static inline unsigned long hpet_time_div(struct hpets *hpets,
29882 }
29883
29884 static int
29885 -hpet_ioctl_common(struct hpet_dev *devp, int cmd, unsigned long arg,
29886 +hpet_ioctl_common(struct hpet_dev *devp, unsigned int cmd, unsigned long arg,
29887 struct hpet_info *info)
29888 {
29889 struct hpet_timer __iomem *timer;
29890 diff --git a/drivers/char/ipmi/ipmi_msghandler.c b/drivers/char/ipmi/ipmi_msghandler.c
29891 index 2c29942..604c5ba 100644
29892 --- a/drivers/char/ipmi/ipmi_msghandler.c
29893 +++ b/drivers/char/ipmi/ipmi_msghandler.c
29894 @@ -420,7 +420,7 @@ struct ipmi_smi {
29895 struct proc_dir_entry *proc_dir;
29896 char proc_dir_name[10];
29897
29898 - atomic_t stats[IPMI_NUM_STATS];
29899 + atomic_unchecked_t stats[IPMI_NUM_STATS];
29900
29901 /*
29902 * run_to_completion duplicate of smb_info, smi_info
29903 @@ -453,9 +453,9 @@ static DEFINE_MUTEX(smi_watchers_mutex);
29904
29905
29906 #define ipmi_inc_stat(intf, stat) \
29907 - atomic_inc(&(intf)->stats[IPMI_STAT_ ## stat])
29908 + atomic_inc_unchecked(&(intf)->stats[IPMI_STAT_ ## stat])
29909 #define ipmi_get_stat(intf, stat) \
29910 - ((unsigned int) atomic_read(&(intf)->stats[IPMI_STAT_ ## stat]))
29911 + ((unsigned int) atomic_read_unchecked(&(intf)->stats[IPMI_STAT_ ## stat]))
29912
29913 static int is_lan_addr(struct ipmi_addr *addr)
29914 {
29915 @@ -2884,7 +2884,7 @@ int ipmi_register_smi(struct ipmi_smi_handlers *handlers,
29916 INIT_LIST_HEAD(&intf->cmd_rcvrs);
29917 init_waitqueue_head(&intf->waitq);
29918 for (i = 0; i < IPMI_NUM_STATS; i++)
29919 - atomic_set(&intf->stats[i], 0);
29920 + atomic_set_unchecked(&intf->stats[i], 0);
29921
29922 intf->proc_dir = NULL;
29923
29924 diff --git a/drivers/char/ipmi/ipmi_si_intf.c b/drivers/char/ipmi/ipmi_si_intf.c
29925 index 83f85cf..279e63f 100644
29926 --- a/drivers/char/ipmi/ipmi_si_intf.c
29927 +++ b/drivers/char/ipmi/ipmi_si_intf.c
29928 @@ -275,7 +275,7 @@ struct smi_info {
29929 unsigned char slave_addr;
29930
29931 /* Counters and things for the proc filesystem. */
29932 - atomic_t stats[SI_NUM_STATS];
29933 + atomic_unchecked_t stats[SI_NUM_STATS];
29934
29935 struct task_struct *thread;
29936
29937 @@ -284,9 +284,9 @@ struct smi_info {
29938 };
29939
29940 #define smi_inc_stat(smi, stat) \
29941 - atomic_inc(&(smi)->stats[SI_STAT_ ## stat])
29942 + atomic_inc_unchecked(&(smi)->stats[SI_STAT_ ## stat])
29943 #define smi_get_stat(smi, stat) \
29944 - ((unsigned int) atomic_read(&(smi)->stats[SI_STAT_ ## stat]))
29945 + ((unsigned int) atomic_read_unchecked(&(smi)->stats[SI_STAT_ ## stat]))
29946
29947 #define SI_MAX_PARMS 4
29948
29949 @@ -3193,7 +3193,7 @@ static int try_smi_init(struct smi_info *new_smi)
29950 atomic_set(&new_smi->req_events, 0);
29951 new_smi->run_to_completion = 0;
29952 for (i = 0; i < SI_NUM_STATS; i++)
29953 - atomic_set(&new_smi->stats[i], 0);
29954 + atomic_set_unchecked(&new_smi->stats[i], 0);
29955
29956 new_smi->interrupt_disabled = 1;
29957 atomic_set(&new_smi->stop_operation, 0);
29958 diff --git a/drivers/char/mbcs.c b/drivers/char/mbcs.c
29959 index 47ff7e4..0c7d340 100644
29960 --- a/drivers/char/mbcs.c
29961 +++ b/drivers/char/mbcs.c
29962 @@ -799,7 +799,7 @@ static int mbcs_remove(struct cx_dev *dev)
29963 return 0;
29964 }
29965
29966 -static const struct cx_device_id __devinitdata mbcs_id_table[] = {
29967 +static const struct cx_device_id __devinitconst mbcs_id_table[] = {
29968 {
29969 .part_num = MBCS_PART_NUM,
29970 .mfg_num = MBCS_MFG_NUM,
29971 diff --git a/drivers/char/mem.c b/drivers/char/mem.c
29972 index e5eedfa..fcab50ea 100644
29973 --- a/drivers/char/mem.c
29974 +++ b/drivers/char/mem.c
29975 @@ -18,6 +18,7 @@
29976 #include <linux/raw.h>
29977 #include <linux/tty.h>
29978 #include <linux/capability.h>
29979 +#include <linux/security.h>
29980 #include <linux/ptrace.h>
29981 #include <linux/device.h>
29982 #include <linux/highmem.h>
29983 @@ -37,6 +38,10 @@
29984
29985 #define DEVPORT_MINOR 4
29986
29987 +#if defined(CONFIG_GRKERNSEC) && !defined(CONFIG_GRKERNSEC_NO_RBAC)
29988 +extern const struct file_operations grsec_fops;
29989 +#endif
29990 +
29991 static inline unsigned long size_inside_page(unsigned long start,
29992 unsigned long size)
29993 {
29994 @@ -68,9 +73,13 @@ static inline int range_is_allowed(unsigned long pfn, unsigned long size)
29995
29996 while (cursor < to) {
29997 if (!devmem_is_allowed(pfn)) {
29998 +#ifdef CONFIG_GRKERNSEC_KMEM
29999 + gr_handle_mem_readwrite(from, to);
30000 +#else
30001 printk(KERN_INFO
30002 "Program %s tried to access /dev/mem between %Lx->%Lx.\n",
30003 current->comm, from, to);
30004 +#endif
30005 return 0;
30006 }
30007 cursor += PAGE_SIZE;
30008 @@ -78,6 +87,11 @@ static inline int range_is_allowed(unsigned long pfn, unsigned long size)
30009 }
30010 return 1;
30011 }
30012 +#elif defined(CONFIG_GRKERNSEC_KMEM)
30013 +static inline int range_is_allowed(unsigned long pfn, unsigned long size)
30014 +{
30015 + return 0;
30016 +}
30017 #else
30018 static inline int range_is_allowed(unsigned long pfn, unsigned long size)
30019 {
30020 @@ -120,6 +134,7 @@ static ssize_t read_mem(struct file *file, char __user *buf,
30021
30022 while (count > 0) {
30023 unsigned long remaining;
30024 + char *temp;
30025
30026 sz = size_inside_page(p, count);
30027
30028 @@ -135,7 +150,23 @@ static ssize_t read_mem(struct file *file, char __user *buf,
30029 if (!ptr)
30030 return -EFAULT;
30031
30032 - remaining = copy_to_user(buf, ptr, sz);
30033 +#ifdef CONFIG_PAX_USERCOPY
30034 + temp = kmalloc(sz, GFP_KERNEL|GFP_USERCOPY);
30035 + if (!temp) {
30036 + unxlate_dev_mem_ptr(p, ptr);
30037 + return -ENOMEM;
30038 + }
30039 + memcpy(temp, ptr, sz);
30040 +#else
30041 + temp = ptr;
30042 +#endif
30043 +
30044 + remaining = copy_to_user(buf, temp, sz);
30045 +
30046 +#ifdef CONFIG_PAX_USERCOPY
30047 + kfree(temp);
30048 +#endif
30049 +
30050 unxlate_dev_mem_ptr(p, ptr);
30051 if (remaining)
30052 return -EFAULT;
30053 @@ -398,9 +429,8 @@ static ssize_t read_kmem(struct file *file, char __user *buf,
30054 size_t count, loff_t *ppos)
30055 {
30056 unsigned long p = *ppos;
30057 - ssize_t low_count, read, sz;
30058 + ssize_t low_count, read, sz, err = 0;
30059 char * kbuf; /* k-addr because vread() takes vmlist_lock rwlock */
30060 - int err = 0;
30061
30062 read = 0;
30063 if (p < (unsigned long) high_memory) {
30064 @@ -422,6 +452,8 @@ static ssize_t read_kmem(struct file *file, char __user *buf,
30065 }
30066 #endif
30067 while (low_count > 0) {
30068 + char *temp;
30069 +
30070 sz = size_inside_page(p, low_count);
30071
30072 /*
30073 @@ -431,7 +463,22 @@ static ssize_t read_kmem(struct file *file, char __user *buf,
30074 */
30075 kbuf = xlate_dev_kmem_ptr((char *)p);
30076
30077 - if (copy_to_user(buf, kbuf, sz))
30078 +#ifdef CONFIG_PAX_USERCOPY
30079 + temp = kmalloc(sz, GFP_KERNEL|GFP_USERCOPY);
30080 + if (!temp)
30081 + return -ENOMEM;
30082 + memcpy(temp, kbuf, sz);
30083 +#else
30084 + temp = kbuf;
30085 +#endif
30086 +
30087 + err = copy_to_user(buf, temp, sz);
30088 +
30089 +#ifdef CONFIG_PAX_USERCOPY
30090 + kfree(temp);
30091 +#endif
30092 +
30093 + if (err)
30094 return -EFAULT;
30095 buf += sz;
30096 p += sz;
30097 @@ -833,6 +880,9 @@ static const struct memdev {
30098 #ifdef CONFIG_CRASH_DUMP
30099 [12] = { "oldmem", 0, &oldmem_fops, NULL },
30100 #endif
30101 +#if defined(CONFIG_GRKERNSEC) && !defined(CONFIG_GRKERNSEC_NO_RBAC)
30102 + [13] = { "grsec",S_IRUSR | S_IWUGO, &grsec_fops, NULL },
30103 +#endif
30104 };
30105
30106 static int memory_open(struct inode *inode, struct file *filp)
30107 diff --git a/drivers/char/nvram.c b/drivers/char/nvram.c
30108 index 9df78e2..01ba9ae 100644
30109 --- a/drivers/char/nvram.c
30110 +++ b/drivers/char/nvram.c
30111 @@ -247,7 +247,7 @@ static ssize_t nvram_read(struct file *file, char __user *buf,
30112
30113 spin_unlock_irq(&rtc_lock);
30114
30115 - if (copy_to_user(buf, contents, tmp - contents))
30116 + if (tmp - contents > sizeof(contents) || copy_to_user(buf, contents, tmp - contents))
30117 return -EFAULT;
30118
30119 *ppos = i;
30120 diff --git a/drivers/char/pcmcia/synclink_cs.c b/drivers/char/pcmcia/synclink_cs.c
30121 index 0a484b4..f48ccd1 100644
30122 --- a/drivers/char/pcmcia/synclink_cs.c
30123 +++ b/drivers/char/pcmcia/synclink_cs.c
30124 @@ -2340,9 +2340,9 @@ static void mgslpc_close(struct tty_struct *tty, struct file * filp)
30125
30126 if (debug_level >= DEBUG_LEVEL_INFO)
30127 printk("%s(%d):mgslpc_close(%s) entry, count=%d\n",
30128 - __FILE__,__LINE__, info->device_name, port->count);
30129 + __FILE__,__LINE__, info->device_name, atomic_read(&port->count));
30130
30131 - WARN_ON(!port->count);
30132 + WARN_ON(!atomic_read(&port->count));
30133
30134 if (tty_port_close_start(port, tty, filp) == 0)
30135 goto cleanup;
30136 @@ -2360,7 +2360,7 @@ static void mgslpc_close(struct tty_struct *tty, struct file * filp)
30137 cleanup:
30138 if (debug_level >= DEBUG_LEVEL_INFO)
30139 printk("%s(%d):mgslpc_close(%s) exit, count=%d\n", __FILE__,__LINE__,
30140 - tty->driver->name, port->count);
30141 + tty->driver->name, atomic_read(&port->count));
30142 }
30143
30144 /* Wait until the transmitter is empty.
30145 @@ -2502,7 +2502,7 @@ static int mgslpc_open(struct tty_struct *tty, struct file * filp)
30146
30147 if (debug_level >= DEBUG_LEVEL_INFO)
30148 printk("%s(%d):mgslpc_open(%s), old ref count = %d\n",
30149 - __FILE__,__LINE__,tty->driver->name, port->count);
30150 + __FILE__,__LINE__,tty->driver->name, atomic_read(&port->count));
30151
30152 /* If port is closing, signal caller to try again */
30153 if (tty_hung_up_p(filp) || port->flags & ASYNC_CLOSING){
30154 @@ -2522,11 +2522,11 @@ static int mgslpc_open(struct tty_struct *tty, struct file * filp)
30155 goto cleanup;
30156 }
30157 spin_lock(&port->lock);
30158 - port->count++;
30159 + atomic_inc(&port->count);
30160 spin_unlock(&port->lock);
30161 spin_unlock_irqrestore(&info->netlock, flags);
30162
30163 - if (port->count == 1) {
30164 + if (atomic_read(&port->count) == 1) {
30165 /* 1st open on this device, init hardware */
30166 retval = startup(info, tty);
30167 if (retval < 0)
30168 @@ -3891,7 +3891,7 @@ static int hdlcdev_attach(struct net_device *dev, unsigned short encoding,
30169 unsigned short new_crctype;
30170
30171 /* return error if TTY interface open */
30172 - if (info->port.count)
30173 + if (atomic_read(&info->port.count))
30174 return -EBUSY;
30175
30176 switch (encoding)
30177 @@ -3994,7 +3994,7 @@ static int hdlcdev_open(struct net_device *dev)
30178
30179 /* arbitrate between network and tty opens */
30180 spin_lock_irqsave(&info->netlock, flags);
30181 - if (info->port.count != 0 || info->netcount != 0) {
30182 + if (atomic_read(&info->port.count) != 0 || info->netcount != 0) {
30183 printk(KERN_WARNING "%s: hdlc_open returning busy\n", dev->name);
30184 spin_unlock_irqrestore(&info->netlock, flags);
30185 return -EBUSY;
30186 @@ -4083,7 +4083,7 @@ static int hdlcdev_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)
30187 printk("%s:hdlcdev_ioctl(%s)\n",__FILE__,dev->name);
30188
30189 /* return error if TTY interface open */
30190 - if (info->port.count)
30191 + if (atomic_read(&info->port.count))
30192 return -EBUSY;
30193
30194 if (cmd != SIOCWANDEV)
30195 diff --git a/drivers/char/random.c b/drivers/char/random.c
30196 index b86eae9..4192a7a 100644
30197 --- a/drivers/char/random.c
30198 +++ b/drivers/char/random.c
30199 @@ -272,8 +272,13 @@
30200 /*
30201 * Configuration information
30202 */
30203 +#ifdef CONFIG_GRKERNSEC_RANDNET
30204 +#define INPUT_POOL_WORDS 512
30205 +#define OUTPUT_POOL_WORDS 128
30206 +#else
30207 #define INPUT_POOL_WORDS 128
30208 #define OUTPUT_POOL_WORDS 32
30209 +#endif
30210 #define SEC_XFER_SIZE 512
30211 #define EXTRACT_SIZE 10
30212
30213 @@ -313,10 +318,17 @@ static struct poolinfo {
30214 int poolwords;
30215 int tap1, tap2, tap3, tap4, tap5;
30216 } poolinfo_table[] = {
30217 +#ifdef CONFIG_GRKERNSEC_RANDNET
30218 + /* x^512 + x^411 + x^308 + x^208 +x^104 + x + 1 -- 225 */
30219 + { 512, 411, 308, 208, 104, 1 },
30220 + /* x^128 + x^103 + x^76 + x^51 + x^25 + x + 1 -- 105 */
30221 + { 128, 103, 76, 51, 25, 1 },
30222 +#else
30223 /* x^128 + x^103 + x^76 + x^51 +x^25 + x + 1 -- 105 */
30224 { 128, 103, 76, 51, 25, 1 },
30225 /* x^32 + x^26 + x^20 + x^14 + x^7 + x + 1 -- 15 */
30226 { 32, 26, 20, 14, 7, 1 },
30227 +#endif
30228 #if 0
30229 /* x^2048 + x^1638 + x^1231 + x^819 + x^411 + x + 1 -- 115 */
30230 { 2048, 1638, 1231, 819, 411, 1 },
30231 @@ -527,8 +539,8 @@ static void _mix_pool_bytes(struct entropy_store *r, const void *in,
30232 input_rotate += i ? 7 : 14;
30233 }
30234
30235 - ACCESS_ONCE(r->input_rotate) = input_rotate;
30236 - ACCESS_ONCE(r->add_ptr) = i;
30237 + ACCESS_ONCE_RW(r->input_rotate) = input_rotate;
30238 + ACCESS_ONCE_RW(r->add_ptr) = i;
30239 smp_wmb();
30240
30241 if (out)
30242 @@ -799,6 +811,17 @@ void add_disk_randomness(struct gendisk *disk)
30243 }
30244 #endif
30245
30246 +#ifdef CONFIG_PAX_LATENT_ENTROPY
30247 +u64 latent_entropy;
30248 +
30249 +__init void transfer_latent_entropy(void)
30250 +{
30251 + mix_pool_bytes(&input_pool, &latent_entropy, sizeof(latent_entropy), NULL);
30252 + mix_pool_bytes(&nonblocking_pool, &latent_entropy, sizeof(latent_entropy), NULL);
30253 +// printk(KERN_INFO "PAX: transferring latent entropy: %16llx\n", latent_entropy);
30254 +}
30255 +#endif
30256 +
30257 /*********************************************************************
30258 *
30259 * Entropy extraction routines
30260 @@ -1008,7 +1031,7 @@ static ssize_t extract_entropy_user(struct entropy_store *r, void __user *buf,
30261
30262 extract_buf(r, tmp);
30263 i = min_t(int, nbytes, EXTRACT_SIZE);
30264 - if (copy_to_user(buf, tmp, i)) {
30265 + if (i > sizeof(tmp) || copy_to_user(buf, tmp, i)) {
30266 ret = -EFAULT;
30267 break;
30268 }
30269 @@ -1342,7 +1365,7 @@ EXPORT_SYMBOL(generate_random_uuid);
30270 #include <linux/sysctl.h>
30271
30272 static int min_read_thresh = 8, min_write_thresh;
30273 -static int max_read_thresh = INPUT_POOL_WORDS * 32;
30274 +static int max_read_thresh = OUTPUT_POOL_WORDS * 32;
30275 static int max_write_thresh = INPUT_POOL_WORDS * 32;
30276 static char sysctl_bootid[16];
30277
30278 diff --git a/drivers/char/sonypi.c b/drivers/char/sonypi.c
30279 index f877805..403375a 100644
30280 --- a/drivers/char/sonypi.c
30281 +++ b/drivers/char/sonypi.c
30282 @@ -54,6 +54,7 @@
30283
30284 #include <asm/uaccess.h>
30285 #include <asm/io.h>
30286 +#include <asm/local.h>
30287
30288 #include <linux/sonypi.h>
30289
30290 @@ -490,7 +491,7 @@ static struct sonypi_device {
30291 spinlock_t fifo_lock;
30292 wait_queue_head_t fifo_proc_list;
30293 struct fasync_struct *fifo_async;
30294 - int open_count;
30295 + local_t open_count;
30296 int model;
30297 struct input_dev *input_jog_dev;
30298 struct input_dev *input_key_dev;
30299 @@ -897,7 +898,7 @@ static int sonypi_misc_fasync(int fd, struct file *filp, int on)
30300 static int sonypi_misc_release(struct inode *inode, struct file *file)
30301 {
30302 mutex_lock(&sonypi_device.lock);
30303 - sonypi_device.open_count--;
30304 + local_dec(&sonypi_device.open_count);
30305 mutex_unlock(&sonypi_device.lock);
30306 return 0;
30307 }
30308 @@ -906,9 +907,9 @@ static int sonypi_misc_open(struct inode *inode, struct file *file)
30309 {
30310 mutex_lock(&sonypi_device.lock);
30311 /* Flush input queue on first open */
30312 - if (!sonypi_device.open_count)
30313 + if (!local_read(&sonypi_device.open_count))
30314 kfifo_reset(&sonypi_device.fifo);
30315 - sonypi_device.open_count++;
30316 + local_inc(&sonypi_device.open_count);
30317 mutex_unlock(&sonypi_device.lock);
30318
30319 return 0;
30320 diff --git a/drivers/char/tpm/tpm.c b/drivers/char/tpm/tpm.c
30321 index 4dc8024..90108d1 100644
30322 --- a/drivers/char/tpm/tpm.c
30323 +++ b/drivers/char/tpm/tpm.c
30324 @@ -415,7 +415,7 @@ static ssize_t tpm_transmit(struct tpm_chip *chip, const char *buf,
30325 chip->vendor.req_complete_val)
30326 goto out_recv;
30327
30328 - if ((status == chip->vendor.req_canceled)) {
30329 + if (status == chip->vendor.req_canceled) {
30330 dev_err(chip->dev, "Operation Canceled\n");
30331 rc = -ECANCELED;
30332 goto out;
30333 diff --git a/drivers/char/tpm/tpm_bios.c b/drivers/char/tpm/tpm_bios.c
30334 index 0636520..169c1d0 100644
30335 --- a/drivers/char/tpm/tpm_bios.c
30336 +++ b/drivers/char/tpm/tpm_bios.c
30337 @@ -173,7 +173,7 @@ static void *tpm_bios_measurements_start(struct seq_file *m, loff_t *pos)
30338 event = addr;
30339
30340 if ((event->event_type == 0 && event->event_size == 0) ||
30341 - ((addr + sizeof(struct tcpa_event) + event->event_size) >= limit))
30342 + (event->event_size >= limit - addr - sizeof(struct tcpa_event)))
30343 return NULL;
30344
30345 return addr;
30346 @@ -198,7 +198,7 @@ static void *tpm_bios_measurements_next(struct seq_file *m, void *v,
30347 return NULL;
30348
30349 if ((event->event_type == 0 && event->event_size == 0) ||
30350 - ((v + sizeof(struct tcpa_event) + event->event_size) >= limit))
30351 + (event->event_size >= limit - v - sizeof(struct tcpa_event)))
30352 return NULL;
30353
30354 (*pos)++;
30355 @@ -291,7 +291,8 @@ static int tpm_binary_bios_measurements_show(struct seq_file *m, void *v)
30356 int i;
30357
30358 for (i = 0; i < sizeof(struct tcpa_event) + event->event_size; i++)
30359 - seq_putc(m, data[i]);
30360 + if (!seq_putc(m, data[i]))
30361 + return -EFAULT;
30362
30363 return 0;
30364 }
30365 @@ -410,8 +411,13 @@ static int read_log(struct tpm_bios_log *log)
30366 log->bios_event_log_end = log->bios_event_log + len;
30367
30368 virt = acpi_os_map_memory(start, len);
30369 + if (!virt) {
30370 + kfree(log->bios_event_log);
30371 + log->bios_event_log = NULL;
30372 + return -EFAULT;
30373 + }
30374
30375 - memcpy(log->bios_event_log, virt, len);
30376 + memcpy(log->bios_event_log, (const char __force_kernel *)virt, len);
30377
30378 acpi_os_unmap_memory(virt, len);
30379 return 0;
30380 diff --git a/drivers/char/virtio_console.c b/drivers/char/virtio_console.c
30381 index cdf2f54..e55c197 100644
30382 --- a/drivers/char/virtio_console.c
30383 +++ b/drivers/char/virtio_console.c
30384 @@ -563,7 +563,7 @@ static ssize_t fill_readbuf(struct port *port, char *out_buf, size_t out_count,
30385 if (to_user) {
30386 ssize_t ret;
30387
30388 - ret = copy_to_user(out_buf, buf->buf + buf->offset, out_count);
30389 + ret = copy_to_user((char __force_user *)out_buf, buf->buf + buf->offset, out_count);
30390 if (ret)
30391 return -EFAULT;
30392 } else {
30393 @@ -662,7 +662,7 @@ static ssize_t port_fops_read(struct file *filp, char __user *ubuf,
30394 if (!port_has_data(port) && !port->host_connected)
30395 return 0;
30396
30397 - return fill_readbuf(port, ubuf, count, true);
30398 + return fill_readbuf(port, (char __force_kernel *)ubuf, count, true);
30399 }
30400
30401 static ssize_t port_fops_write(struct file *filp, const char __user *ubuf,
30402 diff --git a/drivers/edac/edac_pci_sysfs.c b/drivers/edac/edac_pci_sysfs.c
30403 index e164c55..3aabb50 100644
30404 --- a/drivers/edac/edac_pci_sysfs.c
30405 +++ b/drivers/edac/edac_pci_sysfs.c
30406 @@ -26,8 +26,8 @@ static int edac_pci_log_pe = 1; /* log PCI parity errors */
30407 static int edac_pci_log_npe = 1; /* log PCI non-parity error errors */
30408 static int edac_pci_poll_msec = 1000; /* one second workq period */
30409
30410 -static atomic_t pci_parity_count = ATOMIC_INIT(0);
30411 -static atomic_t pci_nonparity_count = ATOMIC_INIT(0);
30412 +static atomic_unchecked_t pci_parity_count = ATOMIC_INIT(0);
30413 +static atomic_unchecked_t pci_nonparity_count = ATOMIC_INIT(0);
30414
30415 static struct kobject *edac_pci_top_main_kobj;
30416 static atomic_t edac_pci_sysfs_refcount = ATOMIC_INIT(0);
30417 @@ -579,7 +579,7 @@ static void edac_pci_dev_parity_test(struct pci_dev *dev)
30418 edac_printk(KERN_CRIT, EDAC_PCI,
30419 "Signaled System Error on %s\n",
30420 pci_name(dev));
30421 - atomic_inc(&pci_nonparity_count);
30422 + atomic_inc_unchecked(&pci_nonparity_count);
30423 }
30424
30425 if (status & (PCI_STATUS_PARITY)) {
30426 @@ -587,7 +587,7 @@ static void edac_pci_dev_parity_test(struct pci_dev *dev)
30427 "Master Data Parity Error on %s\n",
30428 pci_name(dev));
30429
30430 - atomic_inc(&pci_parity_count);
30431 + atomic_inc_unchecked(&pci_parity_count);
30432 }
30433
30434 if (status & (PCI_STATUS_DETECTED_PARITY)) {
30435 @@ -595,7 +595,7 @@ static void edac_pci_dev_parity_test(struct pci_dev *dev)
30436 "Detected Parity Error on %s\n",
30437 pci_name(dev));
30438
30439 - atomic_inc(&pci_parity_count);
30440 + atomic_inc_unchecked(&pci_parity_count);
30441 }
30442 }
30443
30444 @@ -618,7 +618,7 @@ static void edac_pci_dev_parity_test(struct pci_dev *dev)
30445 edac_printk(KERN_CRIT, EDAC_PCI, "Bridge "
30446 "Signaled System Error on %s\n",
30447 pci_name(dev));
30448 - atomic_inc(&pci_nonparity_count);
30449 + atomic_inc_unchecked(&pci_nonparity_count);
30450 }
30451
30452 if (status & (PCI_STATUS_PARITY)) {
30453 @@ -626,7 +626,7 @@ static void edac_pci_dev_parity_test(struct pci_dev *dev)
30454 "Master Data Parity Error on "
30455 "%s\n", pci_name(dev));
30456
30457 - atomic_inc(&pci_parity_count);
30458 + atomic_inc_unchecked(&pci_parity_count);
30459 }
30460
30461 if (status & (PCI_STATUS_DETECTED_PARITY)) {
30462 @@ -634,7 +634,7 @@ static void edac_pci_dev_parity_test(struct pci_dev *dev)
30463 "Detected Parity Error on %s\n",
30464 pci_name(dev));
30465
30466 - atomic_inc(&pci_parity_count);
30467 + atomic_inc_unchecked(&pci_parity_count);
30468 }
30469 }
30470 }
30471 @@ -676,7 +676,7 @@ void edac_pci_do_parity_check(void)
30472 if (!check_pci_errors)
30473 return;
30474
30475 - before_count = atomic_read(&pci_parity_count);
30476 + before_count = atomic_read_unchecked(&pci_parity_count);
30477
30478 /* scan all PCI devices looking for a Parity Error on devices and
30479 * bridges.
30480 @@ -688,7 +688,7 @@ void edac_pci_do_parity_check(void)
30481 /* Only if operator has selected panic on PCI Error */
30482 if (edac_pci_get_panic_on_pe()) {
30483 /* If the count is different 'after' from 'before' */
30484 - if (before_count != atomic_read(&pci_parity_count))
30485 + if (before_count != atomic_read_unchecked(&pci_parity_count))
30486 panic("EDAC: PCI Parity Error");
30487 }
30488 }
30489 diff --git a/drivers/edac/mce_amd.h b/drivers/edac/mce_amd.h
30490 index 8c87a5e..a19cbd7 100644
30491 --- a/drivers/edac/mce_amd.h
30492 +++ b/drivers/edac/mce_amd.h
30493 @@ -80,7 +80,7 @@ extern const char * const ii_msgs[];
30494 struct amd_decoder_ops {
30495 bool (*dc_mce)(u16, u8);
30496 bool (*ic_mce)(u16, u8);
30497 -};
30498 +} __no_const;
30499
30500 void amd_report_gart_errors(bool);
30501 void amd_register_ecc_decoder(void (*f)(int, struct mce *));
30502 diff --git a/drivers/firewire/core-card.c b/drivers/firewire/core-card.c
30503 index 57ea7f4..789e3c3 100644
30504 --- a/drivers/firewire/core-card.c
30505 +++ b/drivers/firewire/core-card.c
30506 @@ -680,7 +680,7 @@ EXPORT_SYMBOL_GPL(fw_card_release);
30507
30508 void fw_core_remove_card(struct fw_card *card)
30509 {
30510 - struct fw_card_driver dummy_driver = dummy_driver_template;
30511 + fw_card_driver_no_const dummy_driver = dummy_driver_template;
30512
30513 card->driver->update_phy_reg(card, 4,
30514 PHY_LINK_ACTIVE | PHY_CONTENDER, 0);
30515 diff --git a/drivers/firewire/core-cdev.c b/drivers/firewire/core-cdev.c
30516 index f8d2287..5aaf4db 100644
30517 --- a/drivers/firewire/core-cdev.c
30518 +++ b/drivers/firewire/core-cdev.c
30519 @@ -1365,8 +1365,7 @@ static int init_iso_resource(struct client *client,
30520 int ret;
30521
30522 if ((request->channels == 0 && request->bandwidth == 0) ||
30523 - request->bandwidth > BANDWIDTH_AVAILABLE_INITIAL ||
30524 - request->bandwidth < 0)
30525 + request->bandwidth > BANDWIDTH_AVAILABLE_INITIAL)
30526 return -EINVAL;
30527
30528 r = kmalloc(sizeof(*r), GFP_KERNEL);
30529 diff --git a/drivers/firewire/core-transaction.c b/drivers/firewire/core-transaction.c
30530 index 87d6f2d..5bf9d90 100644
30531 --- a/drivers/firewire/core-transaction.c
30532 +++ b/drivers/firewire/core-transaction.c
30533 @@ -37,6 +37,7 @@
30534 #include <linux/timer.h>
30535 #include <linux/types.h>
30536 #include <linux/workqueue.h>
30537 +#include <linux/sched.h>
30538
30539 #include <asm/byteorder.h>
30540
30541 diff --git a/drivers/firewire/core.h b/drivers/firewire/core.h
30542 index 515a42c..5ecf3ba 100644
30543 --- a/drivers/firewire/core.h
30544 +++ b/drivers/firewire/core.h
30545 @@ -111,6 +111,7 @@ struct fw_card_driver {
30546
30547 int (*stop_iso)(struct fw_iso_context *ctx);
30548 };
30549 +typedef struct fw_card_driver __no_const fw_card_driver_no_const;
30550
30551 void fw_card_initialize(struct fw_card *card,
30552 const struct fw_card_driver *driver, struct device *device);
30553 diff --git a/drivers/firmware/dmi_scan.c b/drivers/firmware/dmi_scan.c
30554 index b298158..7ed8432 100644
30555 --- a/drivers/firmware/dmi_scan.c
30556 +++ b/drivers/firmware/dmi_scan.c
30557 @@ -452,11 +452,6 @@ void __init dmi_scan_machine(void)
30558 }
30559 }
30560 else {
30561 - /*
30562 - * no iounmap() for that ioremap(); it would be a no-op, but
30563 - * it's so early in setup that sucker gets confused into doing
30564 - * what it shouldn't if we actually call it.
30565 - */
30566 p = dmi_ioremap(0xF0000, 0x10000);
30567 if (p == NULL)
30568 goto error;
30569 @@ -726,7 +721,7 @@ int dmi_walk(void (*decode)(const struct dmi_header *, void *),
30570 if (buf == NULL)
30571 return -1;
30572
30573 - dmi_table(buf, dmi_len, dmi_num, decode, private_data);
30574 + dmi_table((char __force_kernel *)buf, dmi_len, dmi_num, decode, private_data);
30575
30576 iounmap(buf);
30577 return 0;
30578 diff --git a/drivers/gpio/gpio-vr41xx.c b/drivers/gpio/gpio-vr41xx.c
30579 index 82d5c20..44a7177 100644
30580 --- a/drivers/gpio/gpio-vr41xx.c
30581 +++ b/drivers/gpio/gpio-vr41xx.c
30582 @@ -204,7 +204,7 @@ static int giu_get_irq(unsigned int irq)
30583 printk(KERN_ERR "spurious GIU interrupt: %04x(%04x),%04x(%04x)\n",
30584 maskl, pendl, maskh, pendh);
30585
30586 - atomic_inc(&irq_err_count);
30587 + atomic_inc_unchecked(&irq_err_count);
30588
30589 return -EINVAL;
30590 }
30591 diff --git a/drivers/gpu/drm/drm_crtc_helper.c b/drivers/gpu/drm/drm_crtc_helper.c
30592 index 3252e70..b5314ace 100644
30593 --- a/drivers/gpu/drm/drm_crtc_helper.c
30594 +++ b/drivers/gpu/drm/drm_crtc_helper.c
30595 @@ -286,7 +286,7 @@ static bool drm_encoder_crtc_ok(struct drm_encoder *encoder,
30596 struct drm_crtc *tmp;
30597 int crtc_mask = 1;
30598
30599 - WARN(!crtc, "checking null crtc?\n");
30600 + BUG_ON(!crtc);
30601
30602 dev = crtc->dev;
30603
30604 diff --git a/drivers/gpu/drm/drm_drv.c b/drivers/gpu/drm/drm_drv.c
30605 index 9238de4..a27c72a 100644
30606 --- a/drivers/gpu/drm/drm_drv.c
30607 +++ b/drivers/gpu/drm/drm_drv.c
30608 @@ -307,7 +307,7 @@ module_exit(drm_core_exit);
30609 /**
30610 * Copy and IOCTL return string to user space
30611 */
30612 -static int drm_copy_field(char *buf, size_t *buf_len, const char *value)
30613 +static int drm_copy_field(char __user *buf, size_t *buf_len, const char *value)
30614 {
30615 int len;
30616
30617 @@ -390,7 +390,7 @@ long drm_ioctl(struct file *filp,
30618 return -ENODEV;
30619
30620 atomic_inc(&dev->ioctl_count);
30621 - atomic_inc(&dev->counts[_DRM_STAT_IOCTLS]);
30622 + atomic_inc_unchecked(&dev->counts[_DRM_STAT_IOCTLS]);
30623 ++file_priv->ioctl_count;
30624
30625 DRM_DEBUG("pid=%d, cmd=0x%02x, nr=0x%02x, dev 0x%lx, auth=%d\n",
30626 diff --git a/drivers/gpu/drm/drm_fops.c b/drivers/gpu/drm/drm_fops.c
30627 index 7aff5c7..bee6c27 100644
30628 --- a/drivers/gpu/drm/drm_fops.c
30629 +++ b/drivers/gpu/drm/drm_fops.c
30630 @@ -71,7 +71,7 @@ static int drm_setup(struct drm_device * dev)
30631 }
30632
30633 for (i = 0; i < ARRAY_SIZE(dev->counts); i++)
30634 - atomic_set(&dev->counts[i], 0);
30635 + atomic_set_unchecked(&dev->counts[i], 0);
30636
30637 dev->sigdata.lock = NULL;
30638
30639 @@ -134,7 +134,7 @@ int drm_open(struct inode *inode, struct file *filp)
30640 if (drm_device_is_unplugged(dev))
30641 return -ENODEV;
30642
30643 - if (!dev->open_count++)
30644 + if (local_inc_return(&dev->open_count) == 1)
30645 need_setup = 1;
30646 mutex_lock(&dev->struct_mutex);
30647 old_mapping = dev->dev_mapping;
30648 @@ -149,7 +149,7 @@ int drm_open(struct inode *inode, struct file *filp)
30649 retcode = drm_open_helper(inode, filp, dev);
30650 if (retcode)
30651 goto err_undo;
30652 - atomic_inc(&dev->counts[_DRM_STAT_OPENS]);
30653 + atomic_inc_unchecked(&dev->counts[_DRM_STAT_OPENS]);
30654 if (need_setup) {
30655 retcode = drm_setup(dev);
30656 if (retcode)
30657 @@ -164,7 +164,7 @@ err_undo:
30658 iput(container_of(dev->dev_mapping, struct inode, i_data));
30659 dev->dev_mapping = old_mapping;
30660 mutex_unlock(&dev->struct_mutex);
30661 - dev->open_count--;
30662 + local_dec(&dev->open_count);
30663 return retcode;
30664 }
30665 EXPORT_SYMBOL(drm_open);
30666 @@ -438,7 +438,7 @@ int drm_release(struct inode *inode, struct file *filp)
30667
30668 mutex_lock(&drm_global_mutex);
30669
30670 - DRM_DEBUG("open_count = %d\n", dev->open_count);
30671 + DRM_DEBUG("open_count = %ld\n", local_read(&dev->open_count));
30672
30673 if (dev->driver->preclose)
30674 dev->driver->preclose(dev, file_priv);
30675 @@ -447,10 +447,10 @@ int drm_release(struct inode *inode, struct file *filp)
30676 * Begin inline drm_release
30677 */
30678
30679 - DRM_DEBUG("pid = %d, device = 0x%lx, open_count = %d\n",
30680 + DRM_DEBUG("pid = %d, device = 0x%lx, open_count = %ld\n",
30681 task_pid_nr(current),
30682 (long)old_encode_dev(file_priv->minor->device),
30683 - dev->open_count);
30684 + local_read(&dev->open_count));
30685
30686 /* Release any auth tokens that might point to this file_priv,
30687 (do that under the drm_global_mutex) */
30688 @@ -546,8 +546,8 @@ int drm_release(struct inode *inode, struct file *filp)
30689 * End inline drm_release
30690 */
30691
30692 - atomic_inc(&dev->counts[_DRM_STAT_CLOSES]);
30693 - if (!--dev->open_count) {
30694 + atomic_inc_unchecked(&dev->counts[_DRM_STAT_CLOSES]);
30695 + if (local_dec_and_test(&dev->open_count)) {
30696 if (atomic_read(&dev->ioctl_count)) {
30697 DRM_ERROR("Device busy: %d\n",
30698 atomic_read(&dev->ioctl_count));
30699 diff --git a/drivers/gpu/drm/drm_global.c b/drivers/gpu/drm/drm_global.c
30700 index c87dc96..326055d 100644
30701 --- a/drivers/gpu/drm/drm_global.c
30702 +++ b/drivers/gpu/drm/drm_global.c
30703 @@ -36,7 +36,7 @@
30704 struct drm_global_item {
30705 struct mutex mutex;
30706 void *object;
30707 - int refcount;
30708 + atomic_t refcount;
30709 };
30710
30711 static struct drm_global_item glob[DRM_GLOBAL_NUM];
30712 @@ -49,7 +49,7 @@ void drm_global_init(void)
30713 struct drm_global_item *item = &glob[i];
30714 mutex_init(&item->mutex);
30715 item->object = NULL;
30716 - item->refcount = 0;
30717 + atomic_set(&item->refcount, 0);
30718 }
30719 }
30720
30721 @@ -59,7 +59,7 @@ void drm_global_release(void)
30722 for (i = 0; i < DRM_GLOBAL_NUM; ++i) {
30723 struct drm_global_item *item = &glob[i];
30724 BUG_ON(item->object != NULL);
30725 - BUG_ON(item->refcount != 0);
30726 + BUG_ON(atomic_read(&item->refcount) != 0);
30727 }
30728 }
30729
30730 @@ -70,7 +70,7 @@ int drm_global_item_ref(struct drm_global_reference *ref)
30731 void *object;
30732
30733 mutex_lock(&item->mutex);
30734 - if (item->refcount == 0) {
30735 + if (atomic_read(&item->refcount) == 0) {
30736 item->object = kzalloc(ref->size, GFP_KERNEL);
30737 if (unlikely(item->object == NULL)) {
30738 ret = -ENOMEM;
30739 @@ -83,7 +83,7 @@ int drm_global_item_ref(struct drm_global_reference *ref)
30740 goto out_err;
30741
30742 }
30743 - ++item->refcount;
30744 + atomic_inc(&item->refcount);
30745 ref->object = item->object;
30746 object = item->object;
30747 mutex_unlock(&item->mutex);
30748 @@ -100,9 +100,9 @@ void drm_global_item_unref(struct drm_global_reference *ref)
30749 struct drm_global_item *item = &glob[ref->global_type];
30750
30751 mutex_lock(&item->mutex);
30752 - BUG_ON(item->refcount == 0);
30753 + BUG_ON(atomic_read(&item->refcount) == 0);
30754 BUG_ON(ref->object != item->object);
30755 - if (--item->refcount == 0) {
30756 + if (atomic_dec_and_test(&item->refcount)) {
30757 ref->release(ref);
30758 item->object = NULL;
30759 }
30760 diff --git a/drivers/gpu/drm/drm_info.c b/drivers/gpu/drm/drm_info.c
30761 index 8928edb..0c79258 100644
30762 --- a/drivers/gpu/drm/drm_info.c
30763 +++ b/drivers/gpu/drm/drm_info.c
30764 @@ -75,10 +75,14 @@ int drm_vm_info(struct seq_file *m, void *data)
30765 struct drm_local_map *map;
30766 struct drm_map_list *r_list;
30767
30768 - /* Hardcoded from _DRM_FRAME_BUFFER,
30769 - _DRM_REGISTERS, _DRM_SHM, _DRM_AGP, and
30770 - _DRM_SCATTER_GATHER and _DRM_CONSISTENT */
30771 - const char *types[] = { "FB", "REG", "SHM", "AGP", "SG", "PCI" };
30772 + static const char * const types[] = {
30773 + [_DRM_FRAME_BUFFER] = "FB",
30774 + [_DRM_REGISTERS] = "REG",
30775 + [_DRM_SHM] = "SHM",
30776 + [_DRM_AGP] = "AGP",
30777 + [_DRM_SCATTER_GATHER] = "SG",
30778 + [_DRM_CONSISTENT] = "PCI",
30779 + [_DRM_GEM] = "GEM" };
30780 const char *type;
30781 int i;
30782
30783 @@ -89,7 +93,7 @@ int drm_vm_info(struct seq_file *m, void *data)
30784 map = r_list->map;
30785 if (!map)
30786 continue;
30787 - if (map->type < 0 || map->type > 5)
30788 + if (map->type >= ARRAY_SIZE(types))
30789 type = "??";
30790 else
30791 type = types[map->type];
30792 @@ -254,7 +258,11 @@ int drm_vma_info(struct seq_file *m, void *data)
30793 vma->vm_flags & VM_MAYSHARE ? 's' : 'p',
30794 vma->vm_flags & VM_LOCKED ? 'l' : '-',
30795 vma->vm_flags & VM_IO ? 'i' : '-',
30796 +#ifdef CONFIG_GRKERNSEC_HIDESYM
30797 + 0);
30798 +#else
30799 vma->vm_pgoff);
30800 +#endif
30801
30802 #if defined(__i386__)
30803 pgprot = pgprot_val(vma->vm_page_prot);
30804 diff --git a/drivers/gpu/drm/drm_ioc32.c b/drivers/gpu/drm/drm_ioc32.c
30805 index 637fcc3..e890b33 100644
30806 --- a/drivers/gpu/drm/drm_ioc32.c
30807 +++ b/drivers/gpu/drm/drm_ioc32.c
30808 @@ -457,7 +457,7 @@ static int compat_drm_infobufs(struct file *file, unsigned int cmd,
30809 request = compat_alloc_user_space(nbytes);
30810 if (!access_ok(VERIFY_WRITE, request, nbytes))
30811 return -EFAULT;
30812 - list = (struct drm_buf_desc *) (request + 1);
30813 + list = (struct drm_buf_desc __user *) (request + 1);
30814
30815 if (__put_user(count, &request->count)
30816 || __put_user(list, &request->list))
30817 @@ -518,7 +518,7 @@ static int compat_drm_mapbufs(struct file *file, unsigned int cmd,
30818 request = compat_alloc_user_space(nbytes);
30819 if (!access_ok(VERIFY_WRITE, request, nbytes))
30820 return -EFAULT;
30821 - list = (struct drm_buf_pub *) (request + 1);
30822 + list = (struct drm_buf_pub __user *) (request + 1);
30823
30824 if (__put_user(count, &request->count)
30825 || __put_user(list, &request->list))
30826 diff --git a/drivers/gpu/drm/drm_ioctl.c b/drivers/gpu/drm/drm_ioctl.c
30827 index 64a62c6..ceab35e 100644
30828 --- a/drivers/gpu/drm/drm_ioctl.c
30829 +++ b/drivers/gpu/drm/drm_ioctl.c
30830 @@ -252,7 +252,7 @@ int drm_getstats(struct drm_device *dev, void *data,
30831 stats->data[i].value =
30832 (file_priv->master->lock.hw_lock ? file_priv->master->lock.hw_lock->lock : 0);
30833 else
30834 - stats->data[i].value = atomic_read(&dev->counts[i]);
30835 + stats->data[i].value = atomic_read_unchecked(&dev->counts[i]);
30836 stats->data[i].type = dev->types[i];
30837 }
30838
30839 diff --git a/drivers/gpu/drm/drm_lock.c b/drivers/gpu/drm/drm_lock.c
30840 index 3203955..c8090af 100644
30841 --- a/drivers/gpu/drm/drm_lock.c
30842 +++ b/drivers/gpu/drm/drm_lock.c
30843 @@ -86,7 +86,7 @@ int drm_lock(struct drm_device *dev, void *data, struct drm_file *file_priv)
30844 if (drm_lock_take(&master->lock, lock->context)) {
30845 master->lock.file_priv = file_priv;
30846 master->lock.lock_time = jiffies;
30847 - atomic_inc(&dev->counts[_DRM_STAT_LOCKS]);
30848 + atomic_inc_unchecked(&dev->counts[_DRM_STAT_LOCKS]);
30849 break; /* Got lock */
30850 }
30851
30852 @@ -157,7 +157,7 @@ int drm_unlock(struct drm_device *dev, void *data, struct drm_file *file_priv)
30853 return -EINVAL;
30854 }
30855
30856 - atomic_inc(&dev->counts[_DRM_STAT_UNLOCKS]);
30857 + atomic_inc_unchecked(&dev->counts[_DRM_STAT_UNLOCKS]);
30858
30859 if (drm_lock_free(&master->lock, lock->context)) {
30860 /* FIXME: Should really bail out here. */
30861 diff --git a/drivers/gpu/drm/drm_stub.c b/drivers/gpu/drm/drm_stub.c
30862 index 21bcd4a..8e074e0 100644
30863 --- a/drivers/gpu/drm/drm_stub.c
30864 +++ b/drivers/gpu/drm/drm_stub.c
30865 @@ -511,7 +511,7 @@ void drm_unplug_dev(struct drm_device *dev)
30866
30867 drm_device_set_unplugged(dev);
30868
30869 - if (dev->open_count == 0) {
30870 + if (local_read(&dev->open_count) == 0) {
30871 drm_put_dev(dev);
30872 }
30873 mutex_unlock(&drm_global_mutex);
30874 diff --git a/drivers/gpu/drm/i810/i810_dma.c b/drivers/gpu/drm/i810/i810_dma.c
30875 index 463ec68..f5bd2b5 100644
30876 --- a/drivers/gpu/drm/i810/i810_dma.c
30877 +++ b/drivers/gpu/drm/i810/i810_dma.c
30878 @@ -946,8 +946,8 @@ static int i810_dma_vertex(struct drm_device *dev, void *data,
30879 dma->buflist[vertex->idx],
30880 vertex->discard, vertex->used);
30881
30882 - atomic_add(vertex->used, &dev->counts[_DRM_STAT_SECONDARY]);
30883 - atomic_inc(&dev->counts[_DRM_STAT_DMA]);
30884 + atomic_add_unchecked(vertex->used, &dev->counts[_DRM_STAT_SECONDARY]);
30885 + atomic_inc_unchecked(&dev->counts[_DRM_STAT_DMA]);
30886 sarea_priv->last_enqueue = dev_priv->counter - 1;
30887 sarea_priv->last_dispatch = (int)hw_status[5];
30888
30889 @@ -1107,8 +1107,8 @@ static int i810_dma_mc(struct drm_device *dev, void *data,
30890 i810_dma_dispatch_mc(dev, dma->buflist[mc->idx], mc->used,
30891 mc->last_render);
30892
30893 - atomic_add(mc->used, &dev->counts[_DRM_STAT_SECONDARY]);
30894 - atomic_inc(&dev->counts[_DRM_STAT_DMA]);
30895 + atomic_add_unchecked(mc->used, &dev->counts[_DRM_STAT_SECONDARY]);
30896 + atomic_inc_unchecked(&dev->counts[_DRM_STAT_DMA]);
30897 sarea_priv->last_enqueue = dev_priv->counter - 1;
30898 sarea_priv->last_dispatch = (int)hw_status[5];
30899
30900 diff --git a/drivers/gpu/drm/i810/i810_drv.h b/drivers/gpu/drm/i810/i810_drv.h
30901 index 6e0acad..93c8289 100644
30902 --- a/drivers/gpu/drm/i810/i810_drv.h
30903 +++ b/drivers/gpu/drm/i810/i810_drv.h
30904 @@ -108,8 +108,8 @@ typedef struct drm_i810_private {
30905 int page_flipping;
30906
30907 wait_queue_head_t irq_queue;
30908 - atomic_t irq_received;
30909 - atomic_t irq_emitted;
30910 + atomic_unchecked_t irq_received;
30911 + atomic_unchecked_t irq_emitted;
30912
30913 int front_offset;
30914 } drm_i810_private_t;
30915 diff --git a/drivers/gpu/drm/i915/i915_debugfs.c b/drivers/gpu/drm/i915/i915_debugfs.c
30916 index 359f6e8..ada68fd 100644
30917 --- a/drivers/gpu/drm/i915/i915_debugfs.c
30918 +++ b/drivers/gpu/drm/i915/i915_debugfs.c
30919 @@ -518,7 +518,7 @@ static int i915_interrupt_info(struct seq_file *m, void *data)
30920 I915_READ(GTIMR));
30921 }
30922 seq_printf(m, "Interrupts received: %d\n",
30923 - atomic_read(&dev_priv->irq_received));
30924 + atomic_read_unchecked(&dev_priv->irq_received));
30925 for (i = 0; i < I915_NUM_RINGS; i++) {
30926 if (IS_GEN6(dev) || IS_GEN7(dev)) {
30927 seq_printf(m, "Graphics Interrupt mask (%s): %08x\n",
30928 diff --git a/drivers/gpu/drm/i915/i915_dma.c b/drivers/gpu/drm/i915/i915_dma.c
30929 index 0969a7c..b9ffa45 100644
30930 --- a/drivers/gpu/drm/i915/i915_dma.c
30931 +++ b/drivers/gpu/drm/i915/i915_dma.c
30932 @@ -1269,7 +1269,7 @@ static bool i915_switcheroo_can_switch(struct pci_dev *pdev)
30933 bool can_switch;
30934
30935 spin_lock(&dev->count_lock);
30936 - can_switch = (dev->open_count == 0);
30937 + can_switch = (local_read(&dev->open_count) == 0);
30938 spin_unlock(&dev->count_lock);
30939 return can_switch;
30940 }
30941 diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h
30942 index 627fe35..c9a7346 100644
30943 --- a/drivers/gpu/drm/i915/i915_drv.h
30944 +++ b/drivers/gpu/drm/i915/i915_drv.h
30945 @@ -272,12 +272,12 @@ struct drm_i915_display_funcs {
30946 /* render clock increase/decrease */
30947 /* display clock increase/decrease */
30948 /* pll clock increase/decrease */
30949 -};
30950 +} __no_const;
30951
30952 struct drm_i915_gt_funcs {
30953 void (*force_wake_get)(struct drm_i915_private *dev_priv);
30954 void (*force_wake_put)(struct drm_i915_private *dev_priv);
30955 -};
30956 +} __no_const;
30957
30958 struct intel_device_info {
30959 u8 gen;
30960 @@ -408,7 +408,7 @@ typedef struct drm_i915_private {
30961 int current_page;
30962 int page_flipping;
30963
30964 - atomic_t irq_received;
30965 + atomic_unchecked_t irq_received;
30966
30967 /* protects the irq masks */
30968 spinlock_t irq_lock;
30969 @@ -1014,7 +1014,7 @@ struct drm_i915_gem_object {
30970 * will be page flipped away on the next vblank. When it
30971 * reaches 0, dev_priv->pending_flip_queue will be woken up.
30972 */
30973 - atomic_t pending_flip;
30974 + atomic_unchecked_t pending_flip;
30975 };
30976
30977 #define to_intel_bo(x) container_of(x, struct drm_i915_gem_object, base)
30978 @@ -1482,7 +1482,7 @@ extern struct i2c_adapter *intel_gmbus_get_adapter(
30979 struct drm_i915_private *dev_priv, unsigned port);
30980 extern void intel_gmbus_set_speed(struct i2c_adapter *adapter, int speed);
30981 extern void intel_gmbus_force_bit(struct i2c_adapter *adapter, bool force_bit);
30982 -extern inline bool intel_gmbus_is_forced_bit(struct i2c_adapter *adapter)
30983 +static inline bool intel_gmbus_is_forced_bit(struct i2c_adapter *adapter)
30984 {
30985 return container_of(adapter, struct intel_gmbus, adapter)->force_bit;
30986 }
30987 diff --git a/drivers/gpu/drm/i915/i915_gem_execbuffer.c b/drivers/gpu/drm/i915/i915_gem_execbuffer.c
30988 index cdf46b5..e785624 100644
30989 --- a/drivers/gpu/drm/i915/i915_gem_execbuffer.c
30990 +++ b/drivers/gpu/drm/i915/i915_gem_execbuffer.c
30991 @@ -189,7 +189,7 @@ i915_gem_object_set_to_gpu_domain(struct drm_i915_gem_object *obj,
30992 i915_gem_clflush_object(obj);
30993
30994 if (obj->base.pending_write_domain)
30995 - cd->flips |= atomic_read(&obj->pending_flip);
30996 + cd->flips |= atomic_read_unchecked(&obj->pending_flip);
30997
30998 /* The actual obj->write_domain will be updated with
30999 * pending_write_domain after we emit the accumulated flush for all
31000 @@ -907,9 +907,9 @@ i915_gem_check_execbuffer(struct drm_i915_gem_execbuffer2 *exec)
31001
31002 static int
31003 validate_exec_list(struct drm_i915_gem_exec_object2 *exec,
31004 - int count)
31005 + unsigned int count)
31006 {
31007 - int i;
31008 + unsigned int i;
31009
31010 for (i = 0; i < count; i++) {
31011 char __user *ptr = (char __user *)(uintptr_t)exec[i].relocs_ptr;
31012 diff --git a/drivers/gpu/drm/i915/i915_irq.c b/drivers/gpu/drm/i915/i915_irq.c
31013 index 73fa3e1..ab2e9b9 100644
31014 --- a/drivers/gpu/drm/i915/i915_irq.c
31015 +++ b/drivers/gpu/drm/i915/i915_irq.c
31016 @@ -514,7 +514,7 @@ static irqreturn_t valleyview_irq_handler(DRM_IRQ_ARGS)
31017 u32 pipe_stats[I915_MAX_PIPES];
31018 bool blc_event;
31019
31020 - atomic_inc(&dev_priv->irq_received);
31021 + atomic_inc_unchecked(&dev_priv->irq_received);
31022
31023 while (true) {
31024 iir = I915_READ(VLV_IIR);
31025 @@ -661,7 +661,7 @@ static irqreturn_t ivybridge_irq_handler(DRM_IRQ_ARGS)
31026 irqreturn_t ret = IRQ_NONE;
31027 int i;
31028
31029 - atomic_inc(&dev_priv->irq_received);
31030 + atomic_inc_unchecked(&dev_priv->irq_received);
31031
31032 /* disable master interrupt before clearing iir */
31033 de_ier = I915_READ(DEIER);
31034 @@ -736,7 +736,7 @@ static irqreturn_t ironlake_irq_handler(DRM_IRQ_ARGS)
31035 u32 de_iir, gt_iir, de_ier, pch_iir, pm_iir;
31036 u32 hotplug_mask;
31037
31038 - atomic_inc(&dev_priv->irq_received);
31039 + atomic_inc_unchecked(&dev_priv->irq_received);
31040
31041 /* disable master interrupt before clearing iir */
31042 de_ier = I915_READ(DEIER);
31043 @@ -1717,7 +1717,7 @@ static void ironlake_irq_preinstall(struct drm_device *dev)
31044 {
31045 drm_i915_private_t *dev_priv = (drm_i915_private_t *) dev->dev_private;
31046
31047 - atomic_set(&dev_priv->irq_received, 0);
31048 + atomic_set_unchecked(&dev_priv->irq_received, 0);
31049
31050 I915_WRITE(HWSTAM, 0xeffe);
31051
31052 @@ -1743,7 +1743,7 @@ static void valleyview_irq_preinstall(struct drm_device *dev)
31053 drm_i915_private_t *dev_priv = (drm_i915_private_t *) dev->dev_private;
31054 int pipe;
31055
31056 - atomic_set(&dev_priv->irq_received, 0);
31057 + atomic_set_unchecked(&dev_priv->irq_received, 0);
31058
31059 /* VLV magic */
31060 I915_WRITE(VLV_IMR, 0);
31061 @@ -2048,7 +2048,7 @@ static void i8xx_irq_preinstall(struct drm_device * dev)
31062 drm_i915_private_t *dev_priv = (drm_i915_private_t *) dev->dev_private;
31063 int pipe;
31064
31065 - atomic_set(&dev_priv->irq_received, 0);
31066 + atomic_set_unchecked(&dev_priv->irq_received, 0);
31067
31068 for_each_pipe(pipe)
31069 I915_WRITE(PIPESTAT(pipe), 0);
31070 @@ -2099,7 +2099,7 @@ static irqreturn_t i8xx_irq_handler(DRM_IRQ_ARGS)
31071 I915_DISPLAY_PLANE_A_FLIP_PENDING_INTERRUPT |
31072 I915_DISPLAY_PLANE_B_FLIP_PENDING_INTERRUPT;
31073
31074 - atomic_inc(&dev_priv->irq_received);
31075 + atomic_inc_unchecked(&dev_priv->irq_received);
31076
31077 iir = I915_READ16(IIR);
31078 if (iir == 0)
31079 @@ -2184,7 +2184,7 @@ static void i915_irq_preinstall(struct drm_device * dev)
31080 drm_i915_private_t *dev_priv = (drm_i915_private_t *) dev->dev_private;
31081 int pipe;
31082
31083 - atomic_set(&dev_priv->irq_received, 0);
31084 + atomic_set_unchecked(&dev_priv->irq_received, 0);
31085
31086 if (I915_HAS_HOTPLUG(dev)) {
31087 I915_WRITE(PORT_HOTPLUG_EN, 0);
31088 @@ -2279,7 +2279,7 @@ static irqreturn_t i915_irq_handler(DRM_IRQ_ARGS)
31089 };
31090 int pipe, ret = IRQ_NONE;
31091
31092 - atomic_inc(&dev_priv->irq_received);
31093 + atomic_inc_unchecked(&dev_priv->irq_received);
31094
31095 iir = I915_READ(IIR);
31096 do {
31097 @@ -2405,7 +2405,7 @@ static void i965_irq_preinstall(struct drm_device * dev)
31098 drm_i915_private_t *dev_priv = (drm_i915_private_t *) dev->dev_private;
31099 int pipe;
31100
31101 - atomic_set(&dev_priv->irq_received, 0);
31102 + atomic_set_unchecked(&dev_priv->irq_received, 0);
31103
31104 I915_WRITE(PORT_HOTPLUG_EN, 0);
31105 I915_WRITE(PORT_HOTPLUG_STAT, I915_READ(PORT_HOTPLUG_STAT));
31106 @@ -2512,7 +2512,7 @@ static irqreturn_t i965_irq_handler(DRM_IRQ_ARGS)
31107 int irq_received;
31108 int ret = IRQ_NONE, pipe;
31109
31110 - atomic_inc(&dev_priv->irq_received);
31111 + atomic_inc_unchecked(&dev_priv->irq_received);
31112
31113 iir = I915_READ(IIR);
31114
31115 diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
31116 index b634f6f..43c62f5 100644
31117 --- a/drivers/gpu/drm/i915/intel_display.c
31118 +++ b/drivers/gpu/drm/i915/intel_display.c
31119 @@ -2182,7 +2182,7 @@ intel_finish_fb(struct drm_framebuffer *old_fb)
31120
31121 wait_event(dev_priv->pending_flip_queue,
31122 atomic_read(&dev_priv->mm.wedged) ||
31123 - atomic_read(&obj->pending_flip) == 0);
31124 + atomic_read_unchecked(&obj->pending_flip) == 0);
31125
31126 /* Big Hammer, we also need to ensure that any pending
31127 * MI_WAIT_FOR_EVENT inside a user batch buffer on the
31128 @@ -6168,8 +6168,7 @@ static void do_intel_finish_page_flip(struct drm_device *dev,
31129
31130 obj = work->old_fb_obj;
31131
31132 - atomic_clear_mask(1 << intel_crtc->plane,
31133 - &obj->pending_flip.counter);
31134 + atomic_clear_mask_unchecked(1 << intel_crtc->plane, &obj->pending_flip);
31135
31136 wake_up(&dev_priv->pending_flip_queue);
31137 schedule_work(&work->work);
31138 @@ -6515,7 +6514,7 @@ static int intel_crtc_page_flip(struct drm_crtc *crtc,
31139 /* Block clients from rendering to the new back buffer until
31140 * the flip occurs and the object is no longer visible.
31141 */
31142 - atomic_add(1 << intel_crtc->plane, &work->old_fb_obj->pending_flip);
31143 + atomic_add_unchecked(1 << intel_crtc->plane, &work->old_fb_obj->pending_flip);
31144
31145 ret = dev_priv->display.queue_flip(dev, crtc, fb, obj);
31146 if (ret)
31147 @@ -6530,7 +6529,7 @@ static int intel_crtc_page_flip(struct drm_crtc *crtc,
31148 return 0;
31149
31150 cleanup_pending:
31151 - atomic_sub(1 << intel_crtc->plane, &work->old_fb_obj->pending_flip);
31152 + atomic_sub_unchecked(1 << intel_crtc->plane, &work->old_fb_obj->pending_flip);
31153 drm_gem_object_unreference(&work->old_fb_obj->base);
31154 drm_gem_object_unreference(&obj->base);
31155 mutex_unlock(&dev->struct_mutex);
31156 diff --git a/drivers/gpu/drm/mga/mga_drv.h b/drivers/gpu/drm/mga/mga_drv.h
31157 index 54558a0..2d97005 100644
31158 --- a/drivers/gpu/drm/mga/mga_drv.h
31159 +++ b/drivers/gpu/drm/mga/mga_drv.h
31160 @@ -120,9 +120,9 @@ typedef struct drm_mga_private {
31161 u32 clear_cmd;
31162 u32 maccess;
31163
31164 - atomic_t vbl_received; /**< Number of vblanks received. */
31165 + atomic_unchecked_t vbl_received; /**< Number of vblanks received. */
31166 wait_queue_head_t fence_queue;
31167 - atomic_t last_fence_retired;
31168 + atomic_unchecked_t last_fence_retired;
31169 u32 next_fence_to_post;
31170
31171 unsigned int fb_cpp;
31172 diff --git a/drivers/gpu/drm/mga/mga_irq.c b/drivers/gpu/drm/mga/mga_irq.c
31173 index 2581202..f230a8d9 100644
31174 --- a/drivers/gpu/drm/mga/mga_irq.c
31175 +++ b/drivers/gpu/drm/mga/mga_irq.c
31176 @@ -44,7 +44,7 @@ u32 mga_get_vblank_counter(struct drm_device *dev, int crtc)
31177 if (crtc != 0)
31178 return 0;
31179
31180 - return atomic_read(&dev_priv->vbl_received);
31181 + return atomic_read_unchecked(&dev_priv->vbl_received);
31182 }
31183
31184
31185 @@ -60,7 +60,7 @@ irqreturn_t mga_driver_irq_handler(DRM_IRQ_ARGS)
31186 /* VBLANK interrupt */
31187 if (status & MGA_VLINEPEN) {
31188 MGA_WRITE(MGA_ICLEAR, MGA_VLINEICLR);
31189 - atomic_inc(&dev_priv->vbl_received);
31190 + atomic_inc_unchecked(&dev_priv->vbl_received);
31191 drm_handle_vblank(dev, 0);
31192 handled = 1;
31193 }
31194 @@ -79,7 +79,7 @@ irqreturn_t mga_driver_irq_handler(DRM_IRQ_ARGS)
31195 if ((prim_start & ~0x03) != (prim_end & ~0x03))
31196 MGA_WRITE(MGA_PRIMEND, prim_end);
31197
31198 - atomic_inc(&dev_priv->last_fence_retired);
31199 + atomic_inc_unchecked(&dev_priv->last_fence_retired);
31200 DRM_WAKEUP(&dev_priv->fence_queue);
31201 handled = 1;
31202 }
31203 @@ -130,7 +130,7 @@ int mga_driver_fence_wait(struct drm_device *dev, unsigned int *sequence)
31204 * using fences.
31205 */
31206 DRM_WAIT_ON(ret, dev_priv->fence_queue, 3 * DRM_HZ,
31207 - (((cur_fence = atomic_read(&dev_priv->last_fence_retired))
31208 + (((cur_fence = atomic_read_unchecked(&dev_priv->last_fence_retired))
31209 - *sequence) <= (1 << 23)));
31210
31211 *sequence = cur_fence;
31212 diff --git a/drivers/gpu/drm/nouveau/nouveau_bios.c b/drivers/gpu/drm/nouveau/nouveau_bios.c
31213 index a0a3fe3..209bf10 100644
31214 --- a/drivers/gpu/drm/nouveau/nouveau_bios.c
31215 +++ b/drivers/gpu/drm/nouveau/nouveau_bios.c
31216 @@ -5340,7 +5340,7 @@ parse_bit_U_tbl_entry(struct drm_device *dev, struct nvbios *bios,
31217 struct bit_table {
31218 const char id;
31219 int (* const parse_fn)(struct drm_device *, struct nvbios *, struct bit_entry *);
31220 -};
31221 +} __no_const;
31222
31223 #define BIT_TABLE(id, funcid) ((struct bit_table){ id, parse_bit_##funcid##_tbl_entry })
31224
31225 diff --git a/drivers/gpu/drm/nouveau/nouveau_drv.h b/drivers/gpu/drm/nouveau/nouveau_drv.h
31226 index 4f2cc95..9c6c510 100644
31227 --- a/drivers/gpu/drm/nouveau/nouveau_drv.h
31228 +++ b/drivers/gpu/drm/nouveau/nouveau_drv.h
31229 @@ -302,7 +302,7 @@ struct nouveau_exec_engine {
31230 u32 handle, u16 class);
31231 void (*set_tile_region)(struct drm_device *dev, int i);
31232 void (*tlb_flush)(struct drm_device *, int engine);
31233 -};
31234 +} __no_const;
31235
31236 struct nouveau_instmem_engine {
31237 void *priv;
31238 @@ -324,13 +324,13 @@ struct nouveau_instmem_engine {
31239 struct nouveau_mc_engine {
31240 int (*init)(struct drm_device *dev);
31241 void (*takedown)(struct drm_device *dev);
31242 -};
31243 +} __no_const;
31244
31245 struct nouveau_timer_engine {
31246 int (*init)(struct drm_device *dev);
31247 void (*takedown)(struct drm_device *dev);
31248 uint64_t (*read)(struct drm_device *dev);
31249 -};
31250 +} __no_const;
31251
31252 struct nouveau_fb_engine {
31253 int num_tiles;
31254 @@ -547,7 +547,7 @@ struct nouveau_vram_engine {
31255 void (*put)(struct drm_device *, struct nouveau_mem **);
31256
31257 bool (*flags_valid)(struct drm_device *, u32 tile_flags);
31258 -};
31259 +} __no_const;
31260
31261 struct nouveau_engine {
31262 struct nouveau_instmem_engine instmem;
31263 @@ -693,7 +693,7 @@ struct drm_nouveau_private {
31264 struct drm_global_reference mem_global_ref;
31265 struct ttm_bo_global_ref bo_global_ref;
31266 struct ttm_bo_device bdev;
31267 - atomic_t validate_sequence;
31268 + atomic_unchecked_t validate_sequence;
31269 int (*move)(struct nouveau_channel *,
31270 struct ttm_buffer_object *,
31271 struct ttm_mem_reg *, struct ttm_mem_reg *);
31272 diff --git a/drivers/gpu/drm/nouveau/nouveau_gem.c b/drivers/gpu/drm/nouveau/nouveau_gem.c
31273 index af7cfb8..aadc2a3 100644
31274 --- a/drivers/gpu/drm/nouveau/nouveau_gem.c
31275 +++ b/drivers/gpu/drm/nouveau/nouveau_gem.c
31276 @@ -318,7 +318,7 @@ validate_init(struct nouveau_channel *chan, struct drm_file *file_priv,
31277 int trycnt = 0;
31278 int ret, i;
31279
31280 - sequence = atomic_add_return(1, &dev_priv->ttm.validate_sequence);
31281 + sequence = atomic_add_return_unchecked(1, &dev_priv->ttm.validate_sequence);
31282 retry:
31283 if (++trycnt > 100000) {
31284 NV_ERROR(dev, "%s failed and gave up.\n", __func__);
31285 diff --git a/drivers/gpu/drm/nouveau/nouveau_state.c b/drivers/gpu/drm/nouveau/nouveau_state.c
31286 index f5e9584..05934ba 100644
31287 --- a/drivers/gpu/drm/nouveau/nouveau_state.c
31288 +++ b/drivers/gpu/drm/nouveau/nouveau_state.c
31289 @@ -492,7 +492,7 @@ static bool nouveau_switcheroo_can_switch(struct pci_dev *pdev)
31290 bool can_switch;
31291
31292 spin_lock(&dev->count_lock);
31293 - can_switch = (dev->open_count == 0);
31294 + can_switch = (local_read(&dev->open_count) == 0);
31295 spin_unlock(&dev->count_lock);
31296 return can_switch;
31297 }
31298 diff --git a/drivers/gpu/drm/nouveau/nv50_sor.c b/drivers/gpu/drm/nouveau/nv50_sor.c
31299 index 93240bd..c490f60 100644
31300 --- a/drivers/gpu/drm/nouveau/nv50_sor.c
31301 +++ b/drivers/gpu/drm/nouveau/nv50_sor.c
31302 @@ -304,7 +304,7 @@ nv50_sor_dpms(struct drm_encoder *encoder, int mode)
31303 }
31304
31305 if (nv_encoder->dcb->type == OUTPUT_DP) {
31306 - struct dp_train_func func = {
31307 + static struct dp_train_func func = {
31308 .link_set = nv50_sor_dp_link_set,
31309 .train_set = nv50_sor_dp_train_set,
31310 .train_adj = nv50_sor_dp_train_adj
31311 diff --git a/drivers/gpu/drm/nouveau/nvd0_display.c b/drivers/gpu/drm/nouveau/nvd0_display.c
31312 index 8a2fc89..3a5cf40 100644
31313 --- a/drivers/gpu/drm/nouveau/nvd0_display.c
31314 +++ b/drivers/gpu/drm/nouveau/nvd0_display.c
31315 @@ -1367,7 +1367,7 @@ nvd0_sor_dpms(struct drm_encoder *encoder, int mode)
31316 nv_wait(dev, 0x61c030 + (or * 0x0800), 0x10000000, 0x00000000);
31317
31318 if (nv_encoder->dcb->type == OUTPUT_DP) {
31319 - struct dp_train_func func = {
31320 + static struct dp_train_func func = {
31321 .link_set = nvd0_sor_dp_link_set,
31322 .train_set = nvd0_sor_dp_train_set,
31323 .train_adj = nvd0_sor_dp_train_adj
31324 diff --git a/drivers/gpu/drm/r128/r128_cce.c b/drivers/gpu/drm/r128/r128_cce.c
31325 index bcac90b..53bfc76 100644
31326 --- a/drivers/gpu/drm/r128/r128_cce.c
31327 +++ b/drivers/gpu/drm/r128/r128_cce.c
31328 @@ -378,7 +378,7 @@ static int r128_do_init_cce(struct drm_device *dev, drm_r128_init_t *init)
31329
31330 /* GH: Simple idle check.
31331 */
31332 - atomic_set(&dev_priv->idle_count, 0);
31333 + atomic_set_unchecked(&dev_priv->idle_count, 0);
31334
31335 /* We don't support anything other than bus-mastering ring mode,
31336 * but the ring can be in either AGP or PCI space for the ring
31337 diff --git a/drivers/gpu/drm/r128/r128_drv.h b/drivers/gpu/drm/r128/r128_drv.h
31338 index 930c71b..499aded 100644
31339 --- a/drivers/gpu/drm/r128/r128_drv.h
31340 +++ b/drivers/gpu/drm/r128/r128_drv.h
31341 @@ -90,14 +90,14 @@ typedef struct drm_r128_private {
31342 int is_pci;
31343 unsigned long cce_buffers_offset;
31344
31345 - atomic_t idle_count;
31346 + atomic_unchecked_t idle_count;
31347
31348 int page_flipping;
31349 int current_page;
31350 u32 crtc_offset;
31351 u32 crtc_offset_cntl;
31352
31353 - atomic_t vbl_received;
31354 + atomic_unchecked_t vbl_received;
31355
31356 u32 color_fmt;
31357 unsigned int front_offset;
31358 diff --git a/drivers/gpu/drm/r128/r128_irq.c b/drivers/gpu/drm/r128/r128_irq.c
31359 index 429d5a0..7e899ed 100644
31360 --- a/drivers/gpu/drm/r128/r128_irq.c
31361 +++ b/drivers/gpu/drm/r128/r128_irq.c
31362 @@ -42,7 +42,7 @@ u32 r128_get_vblank_counter(struct drm_device *dev, int crtc)
31363 if (crtc != 0)
31364 return 0;
31365
31366 - return atomic_read(&dev_priv->vbl_received);
31367 + return atomic_read_unchecked(&dev_priv->vbl_received);
31368 }
31369
31370 irqreturn_t r128_driver_irq_handler(DRM_IRQ_ARGS)
31371 @@ -56,7 +56,7 @@ irqreturn_t r128_driver_irq_handler(DRM_IRQ_ARGS)
31372 /* VBLANK interrupt */
31373 if (status & R128_CRTC_VBLANK_INT) {
31374 R128_WRITE(R128_GEN_INT_STATUS, R128_CRTC_VBLANK_INT_AK);
31375 - atomic_inc(&dev_priv->vbl_received);
31376 + atomic_inc_unchecked(&dev_priv->vbl_received);
31377 drm_handle_vblank(dev, 0);
31378 return IRQ_HANDLED;
31379 }
31380 diff --git a/drivers/gpu/drm/r128/r128_state.c b/drivers/gpu/drm/r128/r128_state.c
31381 index a9e33ce..09edd4b 100644
31382 --- a/drivers/gpu/drm/r128/r128_state.c
31383 +++ b/drivers/gpu/drm/r128/r128_state.c
31384 @@ -321,10 +321,10 @@ static void r128_clear_box(drm_r128_private_t *dev_priv,
31385
31386 static void r128_cce_performance_boxes(drm_r128_private_t *dev_priv)
31387 {
31388 - if (atomic_read(&dev_priv->idle_count) == 0)
31389 + if (atomic_read_unchecked(&dev_priv->idle_count) == 0)
31390 r128_clear_box(dev_priv, 64, 4, 8, 8, 0, 255, 0);
31391 else
31392 - atomic_set(&dev_priv->idle_count, 0);
31393 + atomic_set_unchecked(&dev_priv->idle_count, 0);
31394 }
31395
31396 #endif
31397 diff --git a/drivers/gpu/drm/radeon/mkregtable.c b/drivers/gpu/drm/radeon/mkregtable.c
31398 index 5a82b6b..9e69c73 100644
31399 --- a/drivers/gpu/drm/radeon/mkregtable.c
31400 +++ b/drivers/gpu/drm/radeon/mkregtable.c
31401 @@ -637,14 +637,14 @@ static int parser_auth(struct table *t, const char *filename)
31402 regex_t mask_rex;
31403 regmatch_t match[4];
31404 char buf[1024];
31405 - size_t end;
31406 + long end;
31407 int len;
31408 int done = 0;
31409 int r;
31410 unsigned o;
31411 struct offset *offset;
31412 char last_reg_s[10];
31413 - int last_reg;
31414 + unsigned long last_reg;
31415
31416 if (regcomp
31417 (&mask_rex, "(0x[0-9a-fA-F]*) *([_a-zA-Z0-9]*)", REG_EXTENDED)) {
31418 diff --git a/drivers/gpu/drm/radeon/radeon.h b/drivers/gpu/drm/radeon/radeon.h
31419 index 59a1531..3bab49b 100644
31420 --- a/drivers/gpu/drm/radeon/radeon.h
31421 +++ b/drivers/gpu/drm/radeon/radeon.h
31422 @@ -711,7 +711,7 @@ struct r600_blit_cp_primitives {
31423 int x2, int y2);
31424 void (*draw_auto)(struct radeon_device *rdev);
31425 void (*set_default_state)(struct radeon_device *rdev);
31426 -};
31427 +} __no_const;
31428
31429 struct r600_blit {
31430 struct radeon_bo *shader_obj;
31431 @@ -1216,7 +1216,7 @@ struct radeon_asic {
31432 u32 (*page_flip)(struct radeon_device *rdev, int crtc, u64 crtc_base);
31433 void (*post_page_flip)(struct radeon_device *rdev, int crtc);
31434 } pflip;
31435 -};
31436 +} __no_const;
31437
31438 /*
31439 * Asic structures
31440 diff --git a/drivers/gpu/drm/radeon/radeon_device.c b/drivers/gpu/drm/radeon/radeon_device.c
31441 index 7a3daeb..5016171 100644
31442 --- a/drivers/gpu/drm/radeon/radeon_device.c
31443 +++ b/drivers/gpu/drm/radeon/radeon_device.c
31444 @@ -952,7 +952,7 @@ static bool radeon_switcheroo_can_switch(struct pci_dev *pdev)
31445 bool can_switch;
31446
31447 spin_lock(&dev->count_lock);
31448 - can_switch = (dev->open_count == 0);
31449 + can_switch = (local_read(&dev->open_count) == 0);
31450 spin_unlock(&dev->count_lock);
31451 return can_switch;
31452 }
31453 diff --git a/drivers/gpu/drm/radeon/radeon_drv.h b/drivers/gpu/drm/radeon/radeon_drv.h
31454 index a1b59ca..86f2d44 100644
31455 --- a/drivers/gpu/drm/radeon/radeon_drv.h
31456 +++ b/drivers/gpu/drm/radeon/radeon_drv.h
31457 @@ -255,7 +255,7 @@ typedef struct drm_radeon_private {
31458
31459 /* SW interrupt */
31460 wait_queue_head_t swi_queue;
31461 - atomic_t swi_emitted;
31462 + atomic_unchecked_t swi_emitted;
31463 int vblank_crtc;
31464 uint32_t irq_enable_reg;
31465 uint32_t r500_disp_irq_reg;
31466 diff --git a/drivers/gpu/drm/radeon/radeon_ioc32.c b/drivers/gpu/drm/radeon/radeon_ioc32.c
31467 index 48b7cea..342236f 100644
31468 --- a/drivers/gpu/drm/radeon/radeon_ioc32.c
31469 +++ b/drivers/gpu/drm/radeon/radeon_ioc32.c
31470 @@ -359,7 +359,7 @@ static int compat_radeon_cp_setparam(struct file *file, unsigned int cmd,
31471 request = compat_alloc_user_space(sizeof(*request));
31472 if (!access_ok(VERIFY_WRITE, request, sizeof(*request))
31473 || __put_user(req32.param, &request->param)
31474 - || __put_user((void __user *)(unsigned long)req32.value,
31475 + || __put_user((unsigned long)req32.value,
31476 &request->value))
31477 return -EFAULT;
31478
31479 diff --git a/drivers/gpu/drm/radeon/radeon_irq.c b/drivers/gpu/drm/radeon/radeon_irq.c
31480 index 00da384..32f972d 100644
31481 --- a/drivers/gpu/drm/radeon/radeon_irq.c
31482 +++ b/drivers/gpu/drm/radeon/radeon_irq.c
31483 @@ -225,8 +225,8 @@ static int radeon_emit_irq(struct drm_device * dev)
31484 unsigned int ret;
31485 RING_LOCALS;
31486
31487 - atomic_inc(&dev_priv->swi_emitted);
31488 - ret = atomic_read(&dev_priv->swi_emitted);
31489 + atomic_inc_unchecked(&dev_priv->swi_emitted);
31490 + ret = atomic_read_unchecked(&dev_priv->swi_emitted);
31491
31492 BEGIN_RING(4);
31493 OUT_RING_REG(RADEON_LAST_SWI_REG, ret);
31494 @@ -352,7 +352,7 @@ int radeon_driver_irq_postinstall(struct drm_device *dev)
31495 drm_radeon_private_t *dev_priv =
31496 (drm_radeon_private_t *) dev->dev_private;
31497
31498 - atomic_set(&dev_priv->swi_emitted, 0);
31499 + atomic_set_unchecked(&dev_priv->swi_emitted, 0);
31500 DRM_INIT_WAITQUEUE(&dev_priv->swi_queue);
31501
31502 dev->max_vblank_count = 0x001fffff;
31503 diff --git a/drivers/gpu/drm/radeon/radeon_state.c b/drivers/gpu/drm/radeon/radeon_state.c
31504 index e8422ae..d22d4a8 100644
31505 --- a/drivers/gpu/drm/radeon/radeon_state.c
31506 +++ b/drivers/gpu/drm/radeon/radeon_state.c
31507 @@ -2168,7 +2168,7 @@ static int radeon_cp_clear(struct drm_device *dev, void *data, struct drm_file *
31508 if (sarea_priv->nbox > RADEON_NR_SAREA_CLIPRECTS)
31509 sarea_priv->nbox = RADEON_NR_SAREA_CLIPRECTS;
31510
31511 - if (DRM_COPY_FROM_USER(&depth_boxes, clear->depth_boxes,
31512 + if (sarea_priv->nbox > RADEON_NR_SAREA_CLIPRECTS || DRM_COPY_FROM_USER(&depth_boxes, clear->depth_boxes,
31513 sarea_priv->nbox * sizeof(depth_boxes[0])))
31514 return -EFAULT;
31515
31516 @@ -3031,7 +3031,7 @@ static int radeon_cp_getparam(struct drm_device *dev, void *data, struct drm_fil
31517 {
31518 drm_radeon_private_t *dev_priv = dev->dev_private;
31519 drm_radeon_getparam_t *param = data;
31520 - int value;
31521 + int value = 0;
31522
31523 DRM_DEBUG("pid=%d\n", DRM_CURRENTPID);
31524
31525 diff --git a/drivers/gpu/drm/radeon/radeon_ttm.c b/drivers/gpu/drm/radeon/radeon_ttm.c
31526 index 5b71c71..650f9e4 100644
31527 --- a/drivers/gpu/drm/radeon/radeon_ttm.c
31528 +++ b/drivers/gpu/drm/radeon/radeon_ttm.c
31529 @@ -822,8 +822,10 @@ int radeon_mmap(struct file *filp, struct vm_area_struct *vma)
31530 }
31531 if (unlikely(ttm_vm_ops == NULL)) {
31532 ttm_vm_ops = vma->vm_ops;
31533 - radeon_ttm_vm_ops = *ttm_vm_ops;
31534 - radeon_ttm_vm_ops.fault = &radeon_ttm_fault;
31535 + pax_open_kernel();
31536 + memcpy((void *)&radeon_ttm_vm_ops, ttm_vm_ops, sizeof(radeon_ttm_vm_ops));
31537 + *(void **)&radeon_ttm_vm_ops.fault = &radeon_ttm_fault;
31538 + pax_close_kernel();
31539 }
31540 vma->vm_ops = &radeon_ttm_vm_ops;
31541 return 0;
31542 diff --git a/drivers/gpu/drm/radeon/rs690.c b/drivers/gpu/drm/radeon/rs690.c
31543 index 3b663fc..57850f4 100644
31544 --- a/drivers/gpu/drm/radeon/rs690.c
31545 +++ b/drivers/gpu/drm/radeon/rs690.c
31546 @@ -304,9 +304,11 @@ void rs690_crtc_bandwidth_compute(struct radeon_device *rdev,
31547 if (rdev->pm.max_bandwidth.full > rdev->pm.sideport_bandwidth.full &&
31548 rdev->pm.sideport_bandwidth.full)
31549 rdev->pm.max_bandwidth = rdev->pm.sideport_bandwidth;
31550 - read_delay_latency.full = dfixed_const(370 * 800 * 1000);
31551 + read_delay_latency.full = dfixed_const(800 * 1000);
31552 read_delay_latency.full = dfixed_div(read_delay_latency,
31553 rdev->pm.igp_sideport_mclk);
31554 + a.full = dfixed_const(370);
31555 + read_delay_latency.full = dfixed_mul(read_delay_latency, a);
31556 } else {
31557 if (rdev->pm.max_bandwidth.full > rdev->pm.k8_bandwidth.full &&
31558 rdev->pm.k8_bandwidth.full)
31559 diff --git a/drivers/gpu/drm/ttm/ttm_page_alloc.c b/drivers/gpu/drm/ttm/ttm_page_alloc.c
31560 index 578207e..1073f25 100644
31561 --- a/drivers/gpu/drm/ttm/ttm_page_alloc.c
31562 +++ b/drivers/gpu/drm/ttm/ttm_page_alloc.c
31563 @@ -394,9 +394,9 @@ static int ttm_pool_get_num_unused_pages(void)
31564 static int ttm_pool_mm_shrink(struct shrinker *shrink,
31565 struct shrink_control *sc)
31566 {
31567 - static atomic_t start_pool = ATOMIC_INIT(0);
31568 + static atomic_unchecked_t start_pool = ATOMIC_INIT(0);
31569 unsigned i;
31570 - unsigned pool_offset = atomic_add_return(1, &start_pool);
31571 + unsigned pool_offset = atomic_add_return_unchecked(1, &start_pool);
31572 struct ttm_page_pool *pool;
31573 int shrink_pages = sc->nr_to_scan;
31574
31575 diff --git a/drivers/gpu/drm/via/via_drv.h b/drivers/gpu/drm/via/via_drv.h
31576 index 88edacc..1e5412b 100644
31577 --- a/drivers/gpu/drm/via/via_drv.h
31578 +++ b/drivers/gpu/drm/via/via_drv.h
31579 @@ -51,7 +51,7 @@ typedef struct drm_via_ring_buffer {
31580 typedef uint32_t maskarray_t[5];
31581
31582 typedef struct drm_via_irq {
31583 - atomic_t irq_received;
31584 + atomic_unchecked_t irq_received;
31585 uint32_t pending_mask;
31586 uint32_t enable_mask;
31587 wait_queue_head_t irq_queue;
31588 @@ -75,7 +75,7 @@ typedef struct drm_via_private {
31589 struct timeval last_vblank;
31590 int last_vblank_valid;
31591 unsigned usec_per_vblank;
31592 - atomic_t vbl_received;
31593 + atomic_unchecked_t vbl_received;
31594 drm_via_state_t hc_state;
31595 char pci_buf[VIA_PCI_BUF_SIZE];
31596 const uint32_t *fire_offsets[VIA_FIRE_BUF_SIZE];
31597 diff --git a/drivers/gpu/drm/via/via_irq.c b/drivers/gpu/drm/via/via_irq.c
31598 index d391f48..10c8ca3 100644
31599 --- a/drivers/gpu/drm/via/via_irq.c
31600 +++ b/drivers/gpu/drm/via/via_irq.c
31601 @@ -102,7 +102,7 @@ u32 via_get_vblank_counter(struct drm_device *dev, int crtc)
31602 if (crtc != 0)
31603 return 0;
31604
31605 - return atomic_read(&dev_priv->vbl_received);
31606 + return atomic_read_unchecked(&dev_priv->vbl_received);
31607 }
31608
31609 irqreturn_t via_driver_irq_handler(DRM_IRQ_ARGS)
31610 @@ -117,8 +117,8 @@ irqreturn_t via_driver_irq_handler(DRM_IRQ_ARGS)
31611
31612 status = VIA_READ(VIA_REG_INTERRUPT);
31613 if (status & VIA_IRQ_VBLANK_PENDING) {
31614 - atomic_inc(&dev_priv->vbl_received);
31615 - if (!(atomic_read(&dev_priv->vbl_received) & 0x0F)) {
31616 + atomic_inc_unchecked(&dev_priv->vbl_received);
31617 + if (!(atomic_read_unchecked(&dev_priv->vbl_received) & 0x0F)) {
31618 do_gettimeofday(&cur_vblank);
31619 if (dev_priv->last_vblank_valid) {
31620 dev_priv->usec_per_vblank =
31621 @@ -128,7 +128,7 @@ irqreturn_t via_driver_irq_handler(DRM_IRQ_ARGS)
31622 dev_priv->last_vblank = cur_vblank;
31623 dev_priv->last_vblank_valid = 1;
31624 }
31625 - if (!(atomic_read(&dev_priv->vbl_received) & 0xFF)) {
31626 + if (!(atomic_read_unchecked(&dev_priv->vbl_received) & 0xFF)) {
31627 DRM_DEBUG("US per vblank is: %u\n",
31628 dev_priv->usec_per_vblank);
31629 }
31630 @@ -138,7 +138,7 @@ irqreturn_t via_driver_irq_handler(DRM_IRQ_ARGS)
31631
31632 for (i = 0; i < dev_priv->num_irqs; ++i) {
31633 if (status & cur_irq->pending_mask) {
31634 - atomic_inc(&cur_irq->irq_received);
31635 + atomic_inc_unchecked(&cur_irq->irq_received);
31636 DRM_WAKEUP(&cur_irq->irq_queue);
31637 handled = 1;
31638 if (dev_priv->irq_map[drm_via_irq_dma0_td] == i)
31639 @@ -243,11 +243,11 @@ via_driver_irq_wait(struct drm_device *dev, unsigned int irq, int force_sequence
31640 DRM_WAIT_ON(ret, cur_irq->irq_queue, 3 * DRM_HZ,
31641 ((VIA_READ(masks[irq][2]) & masks[irq][3]) ==
31642 masks[irq][4]));
31643 - cur_irq_sequence = atomic_read(&cur_irq->irq_received);
31644 + cur_irq_sequence = atomic_read_unchecked(&cur_irq->irq_received);
31645 } else {
31646 DRM_WAIT_ON(ret, cur_irq->irq_queue, 3 * DRM_HZ,
31647 (((cur_irq_sequence =
31648 - atomic_read(&cur_irq->irq_received)) -
31649 + atomic_read_unchecked(&cur_irq->irq_received)) -
31650 *sequence) <= (1 << 23)));
31651 }
31652 *sequence = cur_irq_sequence;
31653 @@ -285,7 +285,7 @@ void via_driver_irq_preinstall(struct drm_device *dev)
31654 }
31655
31656 for (i = 0; i < dev_priv->num_irqs; ++i) {
31657 - atomic_set(&cur_irq->irq_received, 0);
31658 + atomic_set_unchecked(&cur_irq->irq_received, 0);
31659 cur_irq->enable_mask = dev_priv->irq_masks[i][0];
31660 cur_irq->pending_mask = dev_priv->irq_masks[i][1];
31661 DRM_INIT_WAITQUEUE(&cur_irq->irq_queue);
31662 @@ -367,7 +367,7 @@ int via_wait_irq(struct drm_device *dev, void *data, struct drm_file *file_priv)
31663 switch (irqwait->request.type & ~VIA_IRQ_FLAGS_MASK) {
31664 case VIA_IRQ_RELATIVE:
31665 irqwait->request.sequence +=
31666 - atomic_read(&cur_irq->irq_received);
31667 + atomic_read_unchecked(&cur_irq->irq_received);
31668 irqwait->request.type &= ~_DRM_VBLANK_RELATIVE;
31669 case VIA_IRQ_ABSOLUTE:
31670 break;
31671 diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_drv.h b/drivers/gpu/drm/vmwgfx/vmwgfx_drv.h
31672 index 29c984f..4084f1a 100644
31673 --- a/drivers/gpu/drm/vmwgfx/vmwgfx_drv.h
31674 +++ b/drivers/gpu/drm/vmwgfx/vmwgfx_drv.h
31675 @@ -263,7 +263,7 @@ struct vmw_private {
31676 * Fencing and IRQs.
31677 */
31678
31679 - atomic_t marker_seq;
31680 + atomic_unchecked_t marker_seq;
31681 wait_queue_head_t fence_queue;
31682 wait_queue_head_t fifo_queue;
31683 int fence_queue_waiters; /* Protected by hw_mutex */
31684 diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_fifo.c b/drivers/gpu/drm/vmwgfx/vmwgfx_fifo.c
31685 index a0c2f12..68ae6cb 100644
31686 --- a/drivers/gpu/drm/vmwgfx/vmwgfx_fifo.c
31687 +++ b/drivers/gpu/drm/vmwgfx/vmwgfx_fifo.c
31688 @@ -137,7 +137,7 @@ int vmw_fifo_init(struct vmw_private *dev_priv, struct vmw_fifo_state *fifo)
31689 (unsigned int) min,
31690 (unsigned int) fifo->capabilities);
31691
31692 - atomic_set(&dev_priv->marker_seq, dev_priv->last_read_seqno);
31693 + atomic_set_unchecked(&dev_priv->marker_seq, dev_priv->last_read_seqno);
31694 iowrite32(dev_priv->last_read_seqno, fifo_mem + SVGA_FIFO_FENCE);
31695 vmw_marker_queue_init(&fifo->marker_queue);
31696 return vmw_fifo_send_fence(dev_priv, &dummy);
31697 @@ -355,7 +355,7 @@ void *vmw_fifo_reserve(struct vmw_private *dev_priv, uint32_t bytes)
31698 if (reserveable)
31699 iowrite32(bytes, fifo_mem +
31700 SVGA_FIFO_RESERVED);
31701 - return fifo_mem + (next_cmd >> 2);
31702 + return (__le32 __force_kernel *)fifo_mem + (next_cmd >> 2);
31703 } else {
31704 need_bounce = true;
31705 }
31706 @@ -475,7 +475,7 @@ int vmw_fifo_send_fence(struct vmw_private *dev_priv, uint32_t *seqno)
31707
31708 fm = vmw_fifo_reserve(dev_priv, bytes);
31709 if (unlikely(fm == NULL)) {
31710 - *seqno = atomic_read(&dev_priv->marker_seq);
31711 + *seqno = atomic_read_unchecked(&dev_priv->marker_seq);
31712 ret = -ENOMEM;
31713 (void)vmw_fallback_wait(dev_priv, false, true, *seqno,
31714 false, 3*HZ);
31715 @@ -483,7 +483,7 @@ int vmw_fifo_send_fence(struct vmw_private *dev_priv, uint32_t *seqno)
31716 }
31717
31718 do {
31719 - *seqno = atomic_add_return(1, &dev_priv->marker_seq);
31720 + *seqno = atomic_add_return_unchecked(1, &dev_priv->marker_seq);
31721 } while (*seqno == 0);
31722
31723 if (!(fifo_state->capabilities & SVGA_FIFO_CAP_FENCE)) {
31724 diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_irq.c b/drivers/gpu/drm/vmwgfx/vmwgfx_irq.c
31725 index cabc95f..14b3d77 100644
31726 --- a/drivers/gpu/drm/vmwgfx/vmwgfx_irq.c
31727 +++ b/drivers/gpu/drm/vmwgfx/vmwgfx_irq.c
31728 @@ -107,7 +107,7 @@ bool vmw_seqno_passed(struct vmw_private *dev_priv,
31729 * emitted. Then the fence is stale and signaled.
31730 */
31731
31732 - ret = ((atomic_read(&dev_priv->marker_seq) - seqno)
31733 + ret = ((atomic_read_unchecked(&dev_priv->marker_seq) - seqno)
31734 > VMW_FENCE_WRAP);
31735
31736 return ret;
31737 @@ -138,7 +138,7 @@ int vmw_fallback_wait(struct vmw_private *dev_priv,
31738
31739 if (fifo_idle)
31740 down_read(&fifo_state->rwsem);
31741 - signal_seq = atomic_read(&dev_priv->marker_seq);
31742 + signal_seq = atomic_read_unchecked(&dev_priv->marker_seq);
31743 ret = 0;
31744
31745 for (;;) {
31746 diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_marker.c b/drivers/gpu/drm/vmwgfx/vmwgfx_marker.c
31747 index 8a8725c..afed796 100644
31748 --- a/drivers/gpu/drm/vmwgfx/vmwgfx_marker.c
31749 +++ b/drivers/gpu/drm/vmwgfx/vmwgfx_marker.c
31750 @@ -151,7 +151,7 @@ int vmw_wait_lag(struct vmw_private *dev_priv,
31751 while (!vmw_lag_lt(queue, us)) {
31752 spin_lock(&queue->lock);
31753 if (list_empty(&queue->head))
31754 - seqno = atomic_read(&dev_priv->marker_seq);
31755 + seqno = atomic_read_unchecked(&dev_priv->marker_seq);
31756 else {
31757 marker = list_first_entry(&queue->head,
31758 struct vmw_marker, head);
31759 diff --git a/drivers/hid/hid-core.c b/drivers/hid/hid-core.c
31760 index 5de3bb3..08e5063 100644
31761 --- a/drivers/hid/hid-core.c
31762 +++ b/drivers/hid/hid-core.c
31763 @@ -2177,7 +2177,7 @@ static bool hid_ignore(struct hid_device *hdev)
31764
31765 int hid_add_device(struct hid_device *hdev)
31766 {
31767 - static atomic_t id = ATOMIC_INIT(0);
31768 + static atomic_unchecked_t id = ATOMIC_INIT(0);
31769 int ret;
31770
31771 if (WARN_ON(hdev->status & HID_STAT_ADDED))
31772 @@ -2212,7 +2212,7 @@ int hid_add_device(struct hid_device *hdev)
31773 /* XXX hack, any other cleaner solution after the driver core
31774 * is converted to allow more than 20 bytes as the device name? */
31775 dev_set_name(&hdev->dev, "%04X:%04X:%04X.%04X", hdev->bus,
31776 - hdev->vendor, hdev->product, atomic_inc_return(&id));
31777 + hdev->vendor, hdev->product, atomic_inc_return_unchecked(&id));
31778
31779 hid_debug_register(hdev, dev_name(&hdev->dev));
31780 ret = device_add(&hdev->dev);
31781 diff --git a/drivers/hid/hid-wiimote-debug.c b/drivers/hid/hid-wiimote-debug.c
31782 index eec3291..8ed706b 100644
31783 --- a/drivers/hid/hid-wiimote-debug.c
31784 +++ b/drivers/hid/hid-wiimote-debug.c
31785 @@ -66,7 +66,7 @@ static ssize_t wiidebug_eeprom_read(struct file *f, char __user *u, size_t s,
31786 else if (size == 0)
31787 return -EIO;
31788
31789 - if (copy_to_user(u, buf, size))
31790 + if (size > sizeof(buf) || copy_to_user(u, buf, size))
31791 return -EFAULT;
31792
31793 *off += size;
31794 diff --git a/drivers/hid/usbhid/hiddev.c b/drivers/hid/usbhid/hiddev.c
31795 index 14599e2..711c965 100644
31796 --- a/drivers/hid/usbhid/hiddev.c
31797 +++ b/drivers/hid/usbhid/hiddev.c
31798 @@ -625,7 +625,7 @@ static long hiddev_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
31799 break;
31800
31801 case HIDIOCAPPLICATION:
31802 - if (arg < 0 || arg >= hid->maxapplication)
31803 + if (arg >= hid->maxapplication)
31804 break;
31805
31806 for (i = 0; i < hid->maxcollection; i++)
31807 diff --git a/drivers/hv/channel.c b/drivers/hv/channel.c
31808 index f4c3d28..82f45a9 100644
31809 --- a/drivers/hv/channel.c
31810 +++ b/drivers/hv/channel.c
31811 @@ -402,8 +402,8 @@ int vmbus_establish_gpadl(struct vmbus_channel *channel, void *kbuffer,
31812 int ret = 0;
31813 int t;
31814
31815 - next_gpadl_handle = atomic_read(&vmbus_connection.next_gpadl_handle);
31816 - atomic_inc(&vmbus_connection.next_gpadl_handle);
31817 + next_gpadl_handle = atomic_read_unchecked(&vmbus_connection.next_gpadl_handle);
31818 + atomic_inc_unchecked(&vmbus_connection.next_gpadl_handle);
31819
31820 ret = create_gpadl_header(kbuffer, size, &msginfo, &msgcount);
31821 if (ret)
31822 diff --git a/drivers/hv/hv.c b/drivers/hv/hv.c
31823 index 86f8885..ab9cb2b 100644
31824 --- a/drivers/hv/hv.c
31825 +++ b/drivers/hv/hv.c
31826 @@ -132,7 +132,7 @@ static u64 do_hypercall(u64 control, void *input, void *output)
31827 u64 output_address = (output) ? virt_to_phys(output) : 0;
31828 u32 output_address_hi = output_address >> 32;
31829 u32 output_address_lo = output_address & 0xFFFFFFFF;
31830 - void *hypercall_page = hv_context.hypercall_page;
31831 + void *hypercall_page = ktva_ktla(hv_context.hypercall_page);
31832
31833 __asm__ __volatile__ ("call *%8" : "=d"(hv_status_hi),
31834 "=a"(hv_status_lo) : "d" (control_hi),
31835 diff --git a/drivers/hv/hyperv_vmbus.h b/drivers/hv/hyperv_vmbus.h
31836 index 0614ff3..f0b2b5c 100644
31837 --- a/drivers/hv/hyperv_vmbus.h
31838 +++ b/drivers/hv/hyperv_vmbus.h
31839 @@ -555,7 +555,7 @@ enum vmbus_connect_state {
31840 struct vmbus_connection {
31841 enum vmbus_connect_state conn_state;
31842
31843 - atomic_t next_gpadl_handle;
31844 + atomic_unchecked_t next_gpadl_handle;
31845
31846 /*
31847 * Represents channel interrupts. Each bit position represents a
31848 diff --git a/drivers/hv/vmbus_drv.c b/drivers/hv/vmbus_drv.c
31849 index 4748086..3abf845 100644
31850 --- a/drivers/hv/vmbus_drv.c
31851 +++ b/drivers/hv/vmbus_drv.c
31852 @@ -662,10 +662,10 @@ int vmbus_device_register(struct hv_device *child_device_obj)
31853 {
31854 int ret = 0;
31855
31856 - static atomic_t device_num = ATOMIC_INIT(0);
31857 + static atomic_unchecked_t device_num = ATOMIC_INIT(0);
31858
31859 dev_set_name(&child_device_obj->device, "vmbus_0_%d",
31860 - atomic_inc_return(&device_num));
31861 + atomic_inc_return_unchecked(&device_num));
31862
31863 child_device_obj->device.bus = &hv_bus;
31864 child_device_obj->device.parent = &hv_acpi_dev->dev;
31865 diff --git a/drivers/hwmon/sht15.c b/drivers/hwmon/sht15.c
31866 index 8b011d0..3de24a1 100644
31867 --- a/drivers/hwmon/sht15.c
31868 +++ b/drivers/hwmon/sht15.c
31869 @@ -166,7 +166,7 @@ struct sht15_data {
31870 int supply_uV;
31871 bool supply_uV_valid;
31872 struct work_struct update_supply_work;
31873 - atomic_t interrupt_handled;
31874 + atomic_unchecked_t interrupt_handled;
31875 };
31876
31877 /**
31878 @@ -509,13 +509,13 @@ static int sht15_measurement(struct sht15_data *data,
31879 return ret;
31880
31881 gpio_direction_input(data->pdata->gpio_data);
31882 - atomic_set(&data->interrupt_handled, 0);
31883 + atomic_set_unchecked(&data->interrupt_handled, 0);
31884
31885 enable_irq(gpio_to_irq(data->pdata->gpio_data));
31886 if (gpio_get_value(data->pdata->gpio_data) == 0) {
31887 disable_irq_nosync(gpio_to_irq(data->pdata->gpio_data));
31888 /* Only relevant if the interrupt hasn't occurred. */
31889 - if (!atomic_read(&data->interrupt_handled))
31890 + if (!atomic_read_unchecked(&data->interrupt_handled))
31891 schedule_work(&data->read_work);
31892 }
31893 ret = wait_event_timeout(data->wait_queue,
31894 @@ -782,7 +782,7 @@ static irqreturn_t sht15_interrupt_fired(int irq, void *d)
31895
31896 /* First disable the interrupt */
31897 disable_irq_nosync(irq);
31898 - atomic_inc(&data->interrupt_handled);
31899 + atomic_inc_unchecked(&data->interrupt_handled);
31900 /* Then schedule a reading work struct */
31901 if (data->state != SHT15_READING_NOTHING)
31902 schedule_work(&data->read_work);
31903 @@ -804,11 +804,11 @@ static void sht15_bh_read_data(struct work_struct *work_s)
31904 * If not, then start the interrupt again - care here as could
31905 * have gone low in meantime so verify it hasn't!
31906 */
31907 - atomic_set(&data->interrupt_handled, 0);
31908 + atomic_set_unchecked(&data->interrupt_handled, 0);
31909 enable_irq(gpio_to_irq(data->pdata->gpio_data));
31910 /* If still not occurred or another handler was scheduled */
31911 if (gpio_get_value(data->pdata->gpio_data)
31912 - || atomic_read(&data->interrupt_handled))
31913 + || atomic_read_unchecked(&data->interrupt_handled))
31914 return;
31915 }
31916
31917 diff --git a/drivers/i2c/busses/i2c-amd756-s4882.c b/drivers/i2c/busses/i2c-amd756-s4882.c
31918 index 378fcb5..5e91fa8 100644
31919 --- a/drivers/i2c/busses/i2c-amd756-s4882.c
31920 +++ b/drivers/i2c/busses/i2c-amd756-s4882.c
31921 @@ -43,7 +43,7 @@
31922 extern struct i2c_adapter amd756_smbus;
31923
31924 static struct i2c_adapter *s4882_adapter;
31925 -static struct i2c_algorithm *s4882_algo;
31926 +static i2c_algorithm_no_const *s4882_algo;
31927
31928 /* Wrapper access functions for multiplexed SMBus */
31929 static DEFINE_MUTEX(amd756_lock);
31930 diff --git a/drivers/i2c/busses/i2c-nforce2-s4985.c b/drivers/i2c/busses/i2c-nforce2-s4985.c
31931 index 29015eb..af2d8e9 100644
31932 --- a/drivers/i2c/busses/i2c-nforce2-s4985.c
31933 +++ b/drivers/i2c/busses/i2c-nforce2-s4985.c
31934 @@ -41,7 +41,7 @@
31935 extern struct i2c_adapter *nforce2_smbus;
31936
31937 static struct i2c_adapter *s4985_adapter;
31938 -static struct i2c_algorithm *s4985_algo;
31939 +static i2c_algorithm_no_const *s4985_algo;
31940
31941 /* Wrapper access functions for multiplexed SMBus */
31942 static DEFINE_MUTEX(nforce2_lock);
31943 diff --git a/drivers/i2c/i2c-mux.c b/drivers/i2c/i2c-mux.c
31944 index 1038c38..eb92f51 100644
31945 --- a/drivers/i2c/i2c-mux.c
31946 +++ b/drivers/i2c/i2c-mux.c
31947 @@ -30,7 +30,7 @@
31948 /* multiplexer per channel data */
31949 struct i2c_mux_priv {
31950 struct i2c_adapter adap;
31951 - struct i2c_algorithm algo;
31952 + i2c_algorithm_no_const algo;
31953
31954 struct i2c_adapter *parent;
31955 void *mux_priv; /* the mux chip/device */
31956 diff --git a/drivers/ide/aec62xx.c b/drivers/ide/aec62xx.c
31957 index 57d00ca..0145194 100644
31958 --- a/drivers/ide/aec62xx.c
31959 +++ b/drivers/ide/aec62xx.c
31960 @@ -181,7 +181,7 @@ static const struct ide_port_ops atp86x_port_ops = {
31961 .cable_detect = atp86x_cable_detect,
31962 };
31963
31964 -static const struct ide_port_info aec62xx_chipsets[] __devinitdata = {
31965 +static const struct ide_port_info aec62xx_chipsets[] __devinitconst = {
31966 { /* 0: AEC6210 */
31967 .name = DRV_NAME,
31968 .init_chipset = init_chipset_aec62xx,
31969 diff --git a/drivers/ide/alim15x3.c b/drivers/ide/alim15x3.c
31970 index 2c8016a..911a27c 100644
31971 --- a/drivers/ide/alim15x3.c
31972 +++ b/drivers/ide/alim15x3.c
31973 @@ -512,7 +512,7 @@ static const struct ide_dma_ops ali_dma_ops = {
31974 .dma_sff_read_status = ide_dma_sff_read_status,
31975 };
31976
31977 -static const struct ide_port_info ali15x3_chipset __devinitdata = {
31978 +static const struct ide_port_info ali15x3_chipset __devinitconst = {
31979 .name = DRV_NAME,
31980 .init_chipset = init_chipset_ali15x3,
31981 .init_hwif = init_hwif_ali15x3,
31982 diff --git a/drivers/ide/amd74xx.c b/drivers/ide/amd74xx.c
31983 index 3747b25..56fc995 100644
31984 --- a/drivers/ide/amd74xx.c
31985 +++ b/drivers/ide/amd74xx.c
31986 @@ -223,7 +223,7 @@ static const struct ide_port_ops amd_port_ops = {
31987 .udma_mask = udma, \
31988 }
31989
31990 -static const struct ide_port_info amd74xx_chipsets[] __devinitdata = {
31991 +static const struct ide_port_info amd74xx_chipsets[] __devinitconst = {
31992 /* 0: AMD7401 */ DECLARE_AMD_DEV(0x00, ATA_UDMA2),
31993 /* 1: AMD7409 */ DECLARE_AMD_DEV(ATA_SWDMA2, ATA_UDMA4),
31994 /* 2: AMD7411/7441 */ DECLARE_AMD_DEV(ATA_SWDMA2, ATA_UDMA5),
31995 diff --git a/drivers/ide/atiixp.c b/drivers/ide/atiixp.c
31996 index 15f0ead..cb43480 100644
31997 --- a/drivers/ide/atiixp.c
31998 +++ b/drivers/ide/atiixp.c
31999 @@ -139,7 +139,7 @@ static const struct ide_port_ops atiixp_port_ops = {
32000 .cable_detect = atiixp_cable_detect,
32001 };
32002
32003 -static const struct ide_port_info atiixp_pci_info[] __devinitdata = {
32004 +static const struct ide_port_info atiixp_pci_info[] __devinitconst = {
32005 { /* 0: IXP200/300/400/700 */
32006 .name = DRV_NAME,
32007 .enablebits = {{0x48,0x01,0x00}, {0x48,0x08,0x00}},
32008 diff --git a/drivers/ide/cmd64x.c b/drivers/ide/cmd64x.c
32009 index 5f80312..d1fc438 100644
32010 --- a/drivers/ide/cmd64x.c
32011 +++ b/drivers/ide/cmd64x.c
32012 @@ -327,7 +327,7 @@ static const struct ide_dma_ops cmd646_rev1_dma_ops = {
32013 .dma_sff_read_status = ide_dma_sff_read_status,
32014 };
32015
32016 -static const struct ide_port_info cmd64x_chipsets[] __devinitdata = {
32017 +static const struct ide_port_info cmd64x_chipsets[] __devinitconst = {
32018 { /* 0: CMD643 */
32019 .name = DRV_NAME,
32020 .init_chipset = init_chipset_cmd64x,
32021 diff --git a/drivers/ide/cs5520.c b/drivers/ide/cs5520.c
32022 index 2c1e5f7..1444762 100644
32023 --- a/drivers/ide/cs5520.c
32024 +++ b/drivers/ide/cs5520.c
32025 @@ -94,7 +94,7 @@ static const struct ide_port_ops cs5520_port_ops = {
32026 .set_dma_mode = cs5520_set_dma_mode,
32027 };
32028
32029 -static const struct ide_port_info cyrix_chipset __devinitdata = {
32030 +static const struct ide_port_info cyrix_chipset __devinitconst = {
32031 .name = DRV_NAME,
32032 .enablebits = { { 0x60, 0x01, 0x01 }, { 0x60, 0x02, 0x02 } },
32033 .port_ops = &cs5520_port_ops,
32034 diff --git a/drivers/ide/cs5530.c b/drivers/ide/cs5530.c
32035 index 4dc4eb9..49b40ad 100644
32036 --- a/drivers/ide/cs5530.c
32037 +++ b/drivers/ide/cs5530.c
32038 @@ -245,7 +245,7 @@ static const struct ide_port_ops cs5530_port_ops = {
32039 .udma_filter = cs5530_udma_filter,
32040 };
32041
32042 -static const struct ide_port_info cs5530_chipset __devinitdata = {
32043 +static const struct ide_port_info cs5530_chipset __devinitconst = {
32044 .name = DRV_NAME,
32045 .init_chipset = init_chipset_cs5530,
32046 .init_hwif = init_hwif_cs5530,
32047 diff --git a/drivers/ide/cs5535.c b/drivers/ide/cs5535.c
32048 index 5059faf..18d4c85 100644
32049 --- a/drivers/ide/cs5535.c
32050 +++ b/drivers/ide/cs5535.c
32051 @@ -170,7 +170,7 @@ static const struct ide_port_ops cs5535_port_ops = {
32052 .cable_detect = cs5535_cable_detect,
32053 };
32054
32055 -static const struct ide_port_info cs5535_chipset __devinitdata = {
32056 +static const struct ide_port_info cs5535_chipset __devinitconst = {
32057 .name = DRV_NAME,
32058 .port_ops = &cs5535_port_ops,
32059 .host_flags = IDE_HFLAG_SINGLE | IDE_HFLAG_POST_SET_MODE,
32060 diff --git a/drivers/ide/cy82c693.c b/drivers/ide/cy82c693.c
32061 index 847553f..3ffb49d 100644
32062 --- a/drivers/ide/cy82c693.c
32063 +++ b/drivers/ide/cy82c693.c
32064 @@ -163,7 +163,7 @@ static const struct ide_port_ops cy82c693_port_ops = {
32065 .set_dma_mode = cy82c693_set_dma_mode,
32066 };
32067
32068 -static const struct ide_port_info cy82c693_chipset __devinitdata = {
32069 +static const struct ide_port_info cy82c693_chipset __devinitconst = {
32070 .name = DRV_NAME,
32071 .init_iops = init_iops_cy82c693,
32072 .port_ops = &cy82c693_port_ops,
32073 diff --git a/drivers/ide/hpt366.c b/drivers/ide/hpt366.c
32074 index 58c51cd..4aec3b8 100644
32075 --- a/drivers/ide/hpt366.c
32076 +++ b/drivers/ide/hpt366.c
32077 @@ -443,7 +443,7 @@ static struct hpt_timings hpt37x_timings = {
32078 }
32079 };
32080
32081 -static const struct hpt_info hpt36x __devinitdata = {
32082 +static const struct hpt_info hpt36x __devinitconst = {
32083 .chip_name = "HPT36x",
32084 .chip_type = HPT36x,
32085 .udma_mask = HPT366_ALLOW_ATA66_3 ? (HPT366_ALLOW_ATA66_4 ? ATA_UDMA4 : ATA_UDMA3) : ATA_UDMA2,
32086 @@ -451,7 +451,7 @@ static const struct hpt_info hpt36x __devinitdata = {
32087 .timings = &hpt36x_timings
32088 };
32089
32090 -static const struct hpt_info hpt370 __devinitdata = {
32091 +static const struct hpt_info hpt370 __devinitconst = {
32092 .chip_name = "HPT370",
32093 .chip_type = HPT370,
32094 .udma_mask = HPT370_ALLOW_ATA100_5 ? ATA_UDMA5 : ATA_UDMA4,
32095 @@ -459,7 +459,7 @@ static const struct hpt_info hpt370 __devinitdata = {
32096 .timings = &hpt37x_timings
32097 };
32098
32099 -static const struct hpt_info hpt370a __devinitdata = {
32100 +static const struct hpt_info hpt370a __devinitconst = {
32101 .chip_name = "HPT370A",
32102 .chip_type = HPT370A,
32103 .udma_mask = HPT370_ALLOW_ATA100_5 ? ATA_UDMA5 : ATA_UDMA4,
32104 @@ -467,7 +467,7 @@ static const struct hpt_info hpt370a __devinitdata = {
32105 .timings = &hpt37x_timings
32106 };
32107
32108 -static const struct hpt_info hpt374 __devinitdata = {
32109 +static const struct hpt_info hpt374 __devinitconst = {
32110 .chip_name = "HPT374",
32111 .chip_type = HPT374,
32112 .udma_mask = ATA_UDMA5,
32113 @@ -475,7 +475,7 @@ static const struct hpt_info hpt374 __devinitdata = {
32114 .timings = &hpt37x_timings
32115 };
32116
32117 -static const struct hpt_info hpt372 __devinitdata = {
32118 +static const struct hpt_info hpt372 __devinitconst = {
32119 .chip_name = "HPT372",
32120 .chip_type = HPT372,
32121 .udma_mask = HPT372_ALLOW_ATA133_6 ? ATA_UDMA6 : ATA_UDMA5,
32122 @@ -483,7 +483,7 @@ static const struct hpt_info hpt372 __devinitdata = {
32123 .timings = &hpt37x_timings
32124 };
32125
32126 -static const struct hpt_info hpt372a __devinitdata = {
32127 +static const struct hpt_info hpt372a __devinitconst = {
32128 .chip_name = "HPT372A",
32129 .chip_type = HPT372A,
32130 .udma_mask = HPT372_ALLOW_ATA133_6 ? ATA_UDMA6 : ATA_UDMA5,
32131 @@ -491,7 +491,7 @@ static const struct hpt_info hpt372a __devinitdata = {
32132 .timings = &hpt37x_timings
32133 };
32134
32135 -static const struct hpt_info hpt302 __devinitdata = {
32136 +static const struct hpt_info hpt302 __devinitconst = {
32137 .chip_name = "HPT302",
32138 .chip_type = HPT302,
32139 .udma_mask = HPT302_ALLOW_ATA133_6 ? ATA_UDMA6 : ATA_UDMA5,
32140 @@ -499,7 +499,7 @@ static const struct hpt_info hpt302 __devinitdata = {
32141 .timings = &hpt37x_timings
32142 };
32143
32144 -static const struct hpt_info hpt371 __devinitdata = {
32145 +static const struct hpt_info hpt371 __devinitconst = {
32146 .chip_name = "HPT371",
32147 .chip_type = HPT371,
32148 .udma_mask = HPT371_ALLOW_ATA133_6 ? ATA_UDMA6 : ATA_UDMA5,
32149 @@ -507,7 +507,7 @@ static const struct hpt_info hpt371 __devinitdata = {
32150 .timings = &hpt37x_timings
32151 };
32152
32153 -static const struct hpt_info hpt372n __devinitdata = {
32154 +static const struct hpt_info hpt372n __devinitconst = {
32155 .chip_name = "HPT372N",
32156 .chip_type = HPT372N,
32157 .udma_mask = HPT372_ALLOW_ATA133_6 ? ATA_UDMA6 : ATA_UDMA5,
32158 @@ -515,7 +515,7 @@ static const struct hpt_info hpt372n __devinitdata = {
32159 .timings = &hpt37x_timings
32160 };
32161
32162 -static const struct hpt_info hpt302n __devinitdata = {
32163 +static const struct hpt_info hpt302n __devinitconst = {
32164 .chip_name = "HPT302N",
32165 .chip_type = HPT302N,
32166 .udma_mask = HPT302_ALLOW_ATA133_6 ? ATA_UDMA6 : ATA_UDMA5,
32167 @@ -523,7 +523,7 @@ static const struct hpt_info hpt302n __devinitdata = {
32168 .timings = &hpt37x_timings
32169 };
32170
32171 -static const struct hpt_info hpt371n __devinitdata = {
32172 +static const struct hpt_info hpt371n __devinitconst = {
32173 .chip_name = "HPT371N",
32174 .chip_type = HPT371N,
32175 .udma_mask = HPT371_ALLOW_ATA133_6 ? ATA_UDMA6 : ATA_UDMA5,
32176 @@ -1361,7 +1361,7 @@ static const struct ide_dma_ops hpt36x_dma_ops = {
32177 .dma_sff_read_status = ide_dma_sff_read_status,
32178 };
32179
32180 -static const struct ide_port_info hpt366_chipsets[] __devinitdata = {
32181 +static const struct ide_port_info hpt366_chipsets[] __devinitconst = {
32182 { /* 0: HPT36x */
32183 .name = DRV_NAME,
32184 .init_chipset = init_chipset_hpt366,
32185 diff --git a/drivers/ide/ide-cd.c b/drivers/ide/ide-cd.c
32186 index 8126824..55a2798 100644
32187 --- a/drivers/ide/ide-cd.c
32188 +++ b/drivers/ide/ide-cd.c
32189 @@ -768,7 +768,7 @@ static void cdrom_do_block_pc(ide_drive_t *drive, struct request *rq)
32190 alignment = queue_dma_alignment(q) | q->dma_pad_mask;
32191 if ((unsigned long)buf & alignment
32192 || blk_rq_bytes(rq) & q->dma_pad_mask
32193 - || object_is_on_stack(buf))
32194 + || object_starts_on_stack(buf))
32195 drive->dma = 0;
32196 }
32197 }
32198 diff --git a/drivers/ide/ide-pci-generic.c b/drivers/ide/ide-pci-generic.c
32199 index 7f56b73..dab5b67 100644
32200 --- a/drivers/ide/ide-pci-generic.c
32201 +++ b/drivers/ide/ide-pci-generic.c
32202 @@ -53,7 +53,7 @@ static const struct ide_port_ops netcell_port_ops = {
32203 .udma_mask = ATA_UDMA6, \
32204 }
32205
32206 -static const struct ide_port_info generic_chipsets[] __devinitdata = {
32207 +static const struct ide_port_info generic_chipsets[] __devinitconst = {
32208 /* 0: Unknown */
32209 DECLARE_GENERIC_PCI_DEV(0),
32210
32211 diff --git a/drivers/ide/it8172.c b/drivers/ide/it8172.c
32212 index 560e66d..d5dd180 100644
32213 --- a/drivers/ide/it8172.c
32214 +++ b/drivers/ide/it8172.c
32215 @@ -115,7 +115,7 @@ static const struct ide_port_ops it8172_port_ops = {
32216 .set_dma_mode = it8172_set_dma_mode,
32217 };
32218
32219 -static const struct ide_port_info it8172_port_info __devinitdata = {
32220 +static const struct ide_port_info it8172_port_info __devinitconst = {
32221 .name = DRV_NAME,
32222 .port_ops = &it8172_port_ops,
32223 .enablebits = { {0x41, 0x80, 0x80}, {0x00, 0x00, 0x00} },
32224 diff --git a/drivers/ide/it8213.c b/drivers/ide/it8213.c
32225 index 46816ba..1847aeb 100644
32226 --- a/drivers/ide/it8213.c
32227 +++ b/drivers/ide/it8213.c
32228 @@ -156,7 +156,7 @@ static const struct ide_port_ops it8213_port_ops = {
32229 .cable_detect = it8213_cable_detect,
32230 };
32231
32232 -static const struct ide_port_info it8213_chipset __devinitdata = {
32233 +static const struct ide_port_info it8213_chipset __devinitconst = {
32234 .name = DRV_NAME,
32235 .enablebits = { {0x41, 0x80, 0x80} },
32236 .port_ops = &it8213_port_ops,
32237 diff --git a/drivers/ide/it821x.c b/drivers/ide/it821x.c
32238 index 2e3169f..c5611db 100644
32239 --- a/drivers/ide/it821x.c
32240 +++ b/drivers/ide/it821x.c
32241 @@ -630,7 +630,7 @@ static const struct ide_port_ops it821x_port_ops = {
32242 .cable_detect = it821x_cable_detect,
32243 };
32244
32245 -static const struct ide_port_info it821x_chipset __devinitdata = {
32246 +static const struct ide_port_info it821x_chipset __devinitconst = {
32247 .name = DRV_NAME,
32248 .init_chipset = init_chipset_it821x,
32249 .init_hwif = init_hwif_it821x,
32250 diff --git a/drivers/ide/jmicron.c b/drivers/ide/jmicron.c
32251 index 74c2c4a..efddd7d 100644
32252 --- a/drivers/ide/jmicron.c
32253 +++ b/drivers/ide/jmicron.c
32254 @@ -102,7 +102,7 @@ static const struct ide_port_ops jmicron_port_ops = {
32255 .cable_detect = jmicron_cable_detect,
32256 };
32257
32258 -static const struct ide_port_info jmicron_chipset __devinitdata = {
32259 +static const struct ide_port_info jmicron_chipset __devinitconst = {
32260 .name = DRV_NAME,
32261 .enablebits = { { 0x40, 0x01, 0x01 }, { 0x40, 0x10, 0x10 } },
32262 .port_ops = &jmicron_port_ops,
32263 diff --git a/drivers/ide/ns87415.c b/drivers/ide/ns87415.c
32264 index 95327a2..73f78d8 100644
32265 --- a/drivers/ide/ns87415.c
32266 +++ b/drivers/ide/ns87415.c
32267 @@ -293,7 +293,7 @@ static const struct ide_dma_ops ns87415_dma_ops = {
32268 .dma_sff_read_status = superio_dma_sff_read_status,
32269 };
32270
32271 -static const struct ide_port_info ns87415_chipset __devinitdata = {
32272 +static const struct ide_port_info ns87415_chipset __devinitconst = {
32273 .name = DRV_NAME,
32274 .init_hwif = init_hwif_ns87415,
32275 .tp_ops = &ns87415_tp_ops,
32276 diff --git a/drivers/ide/opti621.c b/drivers/ide/opti621.c
32277 index 1a53a4c..39edc66 100644
32278 --- a/drivers/ide/opti621.c
32279 +++ b/drivers/ide/opti621.c
32280 @@ -131,7 +131,7 @@ static const struct ide_port_ops opti621_port_ops = {
32281 .set_pio_mode = opti621_set_pio_mode,
32282 };
32283
32284 -static const struct ide_port_info opti621_chipset __devinitdata = {
32285 +static const struct ide_port_info opti621_chipset __devinitconst = {
32286 .name = DRV_NAME,
32287 .enablebits = { {0x45, 0x80, 0x00}, {0x40, 0x08, 0x00} },
32288 .port_ops = &opti621_port_ops,
32289 diff --git a/drivers/ide/pdc202xx_new.c b/drivers/ide/pdc202xx_new.c
32290 index 9546fe2..2e5ceb6 100644
32291 --- a/drivers/ide/pdc202xx_new.c
32292 +++ b/drivers/ide/pdc202xx_new.c
32293 @@ -465,7 +465,7 @@ static const struct ide_port_ops pdcnew_port_ops = {
32294 .udma_mask = udma, \
32295 }
32296
32297 -static const struct ide_port_info pdcnew_chipsets[] __devinitdata = {
32298 +static const struct ide_port_info pdcnew_chipsets[] __devinitconst = {
32299 /* 0: PDC202{68,70} */ DECLARE_PDCNEW_DEV(ATA_UDMA5),
32300 /* 1: PDC202{69,71,75,76,77} */ DECLARE_PDCNEW_DEV(ATA_UDMA6),
32301 };
32302 diff --git a/drivers/ide/pdc202xx_old.c b/drivers/ide/pdc202xx_old.c
32303 index 3a35ec6..5634510 100644
32304 --- a/drivers/ide/pdc202xx_old.c
32305 +++ b/drivers/ide/pdc202xx_old.c
32306 @@ -270,7 +270,7 @@ static const struct ide_dma_ops pdc2026x_dma_ops = {
32307 .max_sectors = sectors, \
32308 }
32309
32310 -static const struct ide_port_info pdc202xx_chipsets[] __devinitdata = {
32311 +static const struct ide_port_info pdc202xx_chipsets[] __devinitconst = {
32312 { /* 0: PDC20246 */
32313 .name = DRV_NAME,
32314 .init_chipset = init_chipset_pdc202xx,
32315 diff --git a/drivers/ide/piix.c b/drivers/ide/piix.c
32316 index 1892e81..fe0fd60 100644
32317 --- a/drivers/ide/piix.c
32318 +++ b/drivers/ide/piix.c
32319 @@ -344,7 +344,7 @@ static const struct ide_port_ops ich_port_ops = {
32320 .udma_mask = udma, \
32321 }
32322
32323 -static const struct ide_port_info piix_pci_info[] __devinitdata = {
32324 +static const struct ide_port_info piix_pci_info[] __devinitconst = {
32325 /* 0: MPIIX */
32326 { /*
32327 * MPIIX actually has only a single IDE channel mapped to
32328 diff --git a/drivers/ide/rz1000.c b/drivers/ide/rz1000.c
32329 index a6414a8..c04173e 100644
32330 --- a/drivers/ide/rz1000.c
32331 +++ b/drivers/ide/rz1000.c
32332 @@ -38,7 +38,7 @@ static int __devinit rz1000_disable_readahead(struct pci_dev *dev)
32333 }
32334 }
32335
32336 -static const struct ide_port_info rz1000_chipset __devinitdata = {
32337 +static const struct ide_port_info rz1000_chipset __devinitconst = {
32338 .name = DRV_NAME,
32339 .host_flags = IDE_HFLAG_NO_DMA,
32340 };
32341 diff --git a/drivers/ide/sc1200.c b/drivers/ide/sc1200.c
32342 index 356b9b5..d4758eb 100644
32343 --- a/drivers/ide/sc1200.c
32344 +++ b/drivers/ide/sc1200.c
32345 @@ -291,7 +291,7 @@ static const struct ide_dma_ops sc1200_dma_ops = {
32346 .dma_sff_read_status = ide_dma_sff_read_status,
32347 };
32348
32349 -static const struct ide_port_info sc1200_chipset __devinitdata = {
32350 +static const struct ide_port_info sc1200_chipset __devinitconst = {
32351 .name = DRV_NAME,
32352 .port_ops = &sc1200_port_ops,
32353 .dma_ops = &sc1200_dma_ops,
32354 diff --git a/drivers/ide/scc_pata.c b/drivers/ide/scc_pata.c
32355 index b7f5b0c..9701038 100644
32356 --- a/drivers/ide/scc_pata.c
32357 +++ b/drivers/ide/scc_pata.c
32358 @@ -811,7 +811,7 @@ static const struct ide_dma_ops scc_dma_ops = {
32359 .dma_sff_read_status = scc_dma_sff_read_status,
32360 };
32361
32362 -static const struct ide_port_info scc_chipset __devinitdata = {
32363 +static const struct ide_port_info scc_chipset __devinitconst = {
32364 .name = "sccIDE",
32365 .init_iops = init_iops_scc,
32366 .init_dma = scc_init_dma,
32367 diff --git a/drivers/ide/serverworks.c b/drivers/ide/serverworks.c
32368 index 35fb8da..24d72ef 100644
32369 --- a/drivers/ide/serverworks.c
32370 +++ b/drivers/ide/serverworks.c
32371 @@ -337,7 +337,7 @@ static const struct ide_port_ops svwks_port_ops = {
32372 .cable_detect = svwks_cable_detect,
32373 };
32374
32375 -static const struct ide_port_info serverworks_chipsets[] __devinitdata = {
32376 +static const struct ide_port_info serverworks_chipsets[] __devinitconst = {
32377 { /* 0: OSB4 */
32378 .name = DRV_NAME,
32379 .init_chipset = init_chipset_svwks,
32380 diff --git a/drivers/ide/siimage.c b/drivers/ide/siimage.c
32381 index ddeda44..46f7e30 100644
32382 --- a/drivers/ide/siimage.c
32383 +++ b/drivers/ide/siimage.c
32384 @@ -719,7 +719,7 @@ static const struct ide_dma_ops sil_dma_ops = {
32385 .udma_mask = ATA_UDMA6, \
32386 }
32387
32388 -static const struct ide_port_info siimage_chipsets[] __devinitdata = {
32389 +static const struct ide_port_info siimage_chipsets[] __devinitconst = {
32390 /* 0: SiI680 */ DECLARE_SII_DEV(&sil_pata_port_ops),
32391 /* 1: SiI3112 */ DECLARE_SII_DEV(&sil_sata_port_ops)
32392 };
32393 diff --git a/drivers/ide/sis5513.c b/drivers/ide/sis5513.c
32394 index 4a00225..09e61b4 100644
32395 --- a/drivers/ide/sis5513.c
32396 +++ b/drivers/ide/sis5513.c
32397 @@ -563,7 +563,7 @@ static const struct ide_port_ops sis_ata133_port_ops = {
32398 .cable_detect = sis_cable_detect,
32399 };
32400
32401 -static const struct ide_port_info sis5513_chipset __devinitdata = {
32402 +static const struct ide_port_info sis5513_chipset __devinitconst = {
32403 .name = DRV_NAME,
32404 .init_chipset = init_chipset_sis5513,
32405 .enablebits = { {0x4a, 0x02, 0x02}, {0x4a, 0x04, 0x04} },
32406 diff --git a/drivers/ide/sl82c105.c b/drivers/ide/sl82c105.c
32407 index f21dc2a..d051cd2 100644
32408 --- a/drivers/ide/sl82c105.c
32409 +++ b/drivers/ide/sl82c105.c
32410 @@ -299,7 +299,7 @@ static const struct ide_dma_ops sl82c105_dma_ops = {
32411 .dma_sff_read_status = ide_dma_sff_read_status,
32412 };
32413
32414 -static const struct ide_port_info sl82c105_chipset __devinitdata = {
32415 +static const struct ide_port_info sl82c105_chipset __devinitconst = {
32416 .name = DRV_NAME,
32417 .init_chipset = init_chipset_sl82c105,
32418 .enablebits = {{0x40,0x01,0x01}, {0x40,0x10,0x10}},
32419 diff --git a/drivers/ide/slc90e66.c b/drivers/ide/slc90e66.c
32420 index 864ffe0..863a5e9 100644
32421 --- a/drivers/ide/slc90e66.c
32422 +++ b/drivers/ide/slc90e66.c
32423 @@ -132,7 +132,7 @@ static const struct ide_port_ops slc90e66_port_ops = {
32424 .cable_detect = slc90e66_cable_detect,
32425 };
32426
32427 -static const struct ide_port_info slc90e66_chipset __devinitdata = {
32428 +static const struct ide_port_info slc90e66_chipset __devinitconst = {
32429 .name = DRV_NAME,
32430 .enablebits = { {0x41, 0x80, 0x80}, {0x43, 0x80, 0x80} },
32431 .port_ops = &slc90e66_port_ops,
32432 diff --git a/drivers/ide/tc86c001.c b/drivers/ide/tc86c001.c
32433 index 4799d5c..1794678 100644
32434 --- a/drivers/ide/tc86c001.c
32435 +++ b/drivers/ide/tc86c001.c
32436 @@ -192,7 +192,7 @@ static const struct ide_dma_ops tc86c001_dma_ops = {
32437 .dma_sff_read_status = ide_dma_sff_read_status,
32438 };
32439
32440 -static const struct ide_port_info tc86c001_chipset __devinitdata = {
32441 +static const struct ide_port_info tc86c001_chipset __devinitconst = {
32442 .name = DRV_NAME,
32443 .init_hwif = init_hwif_tc86c001,
32444 .port_ops = &tc86c001_port_ops,
32445 diff --git a/drivers/ide/triflex.c b/drivers/ide/triflex.c
32446 index 281c914..55ce1b8 100644
32447 --- a/drivers/ide/triflex.c
32448 +++ b/drivers/ide/triflex.c
32449 @@ -92,7 +92,7 @@ static const struct ide_port_ops triflex_port_ops = {
32450 .set_dma_mode = triflex_set_mode,
32451 };
32452
32453 -static const struct ide_port_info triflex_device __devinitdata = {
32454 +static const struct ide_port_info triflex_device __devinitconst = {
32455 .name = DRV_NAME,
32456 .enablebits = {{0x80, 0x01, 0x01}, {0x80, 0x02, 0x02}},
32457 .port_ops = &triflex_port_ops,
32458 diff --git a/drivers/ide/trm290.c b/drivers/ide/trm290.c
32459 index 4b42ca0..e494a98 100644
32460 --- a/drivers/ide/trm290.c
32461 +++ b/drivers/ide/trm290.c
32462 @@ -324,7 +324,7 @@ static struct ide_dma_ops trm290_dma_ops = {
32463 .dma_check = trm290_dma_check,
32464 };
32465
32466 -static const struct ide_port_info trm290_chipset __devinitdata = {
32467 +static const struct ide_port_info trm290_chipset __devinitconst = {
32468 .name = DRV_NAME,
32469 .init_hwif = init_hwif_trm290,
32470 .tp_ops = &trm290_tp_ops,
32471 diff --git a/drivers/ide/via82cxxx.c b/drivers/ide/via82cxxx.c
32472 index f46f49c..eb77678 100644
32473 --- a/drivers/ide/via82cxxx.c
32474 +++ b/drivers/ide/via82cxxx.c
32475 @@ -403,7 +403,7 @@ static const struct ide_port_ops via_port_ops = {
32476 .cable_detect = via82cxxx_cable_detect,
32477 };
32478
32479 -static const struct ide_port_info via82cxxx_chipset __devinitdata = {
32480 +static const struct ide_port_info via82cxxx_chipset __devinitconst = {
32481 .name = DRV_NAME,
32482 .init_chipset = init_chipset_via82cxxx,
32483 .enablebits = { { 0x40, 0x02, 0x02 }, { 0x40, 0x01, 0x01 } },
32484 diff --git a/drivers/ieee802154/fakehard.c b/drivers/ieee802154/fakehard.c
32485 index 73d4531..c90cd2d 100644
32486 --- a/drivers/ieee802154/fakehard.c
32487 +++ b/drivers/ieee802154/fakehard.c
32488 @@ -386,7 +386,7 @@ static int __devinit ieee802154fake_probe(struct platform_device *pdev)
32489 phy->transmit_power = 0xbf;
32490
32491 dev->netdev_ops = &fake_ops;
32492 - dev->ml_priv = &fake_mlme;
32493 + dev->ml_priv = (void *)&fake_mlme;
32494
32495 priv = netdev_priv(dev);
32496 priv->phy = phy;
32497 diff --git a/drivers/infiniband/core/cm.c b/drivers/infiniband/core/cm.c
32498 index d67999f..4c5d083 100644
32499 --- a/drivers/infiniband/core/cm.c
32500 +++ b/drivers/infiniband/core/cm.c
32501 @@ -114,7 +114,7 @@ static char const counter_group_names[CM_COUNTER_GROUPS]
32502
32503 struct cm_counter_group {
32504 struct kobject obj;
32505 - atomic_long_t counter[CM_ATTR_COUNT];
32506 + atomic_long_unchecked_t counter[CM_ATTR_COUNT];
32507 };
32508
32509 struct cm_counter_attribute {
32510 @@ -1394,7 +1394,7 @@ static void cm_dup_req_handler(struct cm_work *work,
32511 struct ib_mad_send_buf *msg = NULL;
32512 int ret;
32513
32514 - atomic_long_inc(&work->port->counter_group[CM_RECV_DUPLICATES].
32515 + atomic_long_inc_unchecked(&work->port->counter_group[CM_RECV_DUPLICATES].
32516 counter[CM_REQ_COUNTER]);
32517
32518 /* Quick state check to discard duplicate REQs. */
32519 @@ -1778,7 +1778,7 @@ static void cm_dup_rep_handler(struct cm_work *work)
32520 if (!cm_id_priv)
32521 return;
32522
32523 - atomic_long_inc(&work->port->counter_group[CM_RECV_DUPLICATES].
32524 + atomic_long_inc_unchecked(&work->port->counter_group[CM_RECV_DUPLICATES].
32525 counter[CM_REP_COUNTER]);
32526 ret = cm_alloc_response_msg(work->port, work->mad_recv_wc, &msg);
32527 if (ret)
32528 @@ -1945,7 +1945,7 @@ static int cm_rtu_handler(struct cm_work *work)
32529 if (cm_id_priv->id.state != IB_CM_REP_SENT &&
32530 cm_id_priv->id.state != IB_CM_MRA_REP_RCVD) {
32531 spin_unlock_irq(&cm_id_priv->lock);
32532 - atomic_long_inc(&work->port->counter_group[CM_RECV_DUPLICATES].
32533 + atomic_long_inc_unchecked(&work->port->counter_group[CM_RECV_DUPLICATES].
32534 counter[CM_RTU_COUNTER]);
32535 goto out;
32536 }
32537 @@ -2128,7 +2128,7 @@ static int cm_dreq_handler(struct cm_work *work)
32538 cm_id_priv = cm_acquire_id(dreq_msg->remote_comm_id,
32539 dreq_msg->local_comm_id);
32540 if (!cm_id_priv) {
32541 - atomic_long_inc(&work->port->counter_group[CM_RECV_DUPLICATES].
32542 + atomic_long_inc_unchecked(&work->port->counter_group[CM_RECV_DUPLICATES].
32543 counter[CM_DREQ_COUNTER]);
32544 cm_issue_drep(work->port, work->mad_recv_wc);
32545 return -EINVAL;
32546 @@ -2153,7 +2153,7 @@ static int cm_dreq_handler(struct cm_work *work)
32547 case IB_CM_MRA_REP_RCVD:
32548 break;
32549 case IB_CM_TIMEWAIT:
32550 - atomic_long_inc(&work->port->counter_group[CM_RECV_DUPLICATES].
32551 + atomic_long_inc_unchecked(&work->port->counter_group[CM_RECV_DUPLICATES].
32552 counter[CM_DREQ_COUNTER]);
32553 if (cm_alloc_response_msg(work->port, work->mad_recv_wc, &msg))
32554 goto unlock;
32555 @@ -2167,7 +2167,7 @@ static int cm_dreq_handler(struct cm_work *work)
32556 cm_free_msg(msg);
32557 goto deref;
32558 case IB_CM_DREQ_RCVD:
32559 - atomic_long_inc(&work->port->counter_group[CM_RECV_DUPLICATES].
32560 + atomic_long_inc_unchecked(&work->port->counter_group[CM_RECV_DUPLICATES].
32561 counter[CM_DREQ_COUNTER]);
32562 goto unlock;
32563 default:
32564 @@ -2534,7 +2534,7 @@ static int cm_mra_handler(struct cm_work *work)
32565 ib_modify_mad(cm_id_priv->av.port->mad_agent,
32566 cm_id_priv->msg, timeout)) {
32567 if (cm_id_priv->id.lap_state == IB_CM_MRA_LAP_RCVD)
32568 - atomic_long_inc(&work->port->
32569 + atomic_long_inc_unchecked(&work->port->
32570 counter_group[CM_RECV_DUPLICATES].
32571 counter[CM_MRA_COUNTER]);
32572 goto out;
32573 @@ -2543,7 +2543,7 @@ static int cm_mra_handler(struct cm_work *work)
32574 break;
32575 case IB_CM_MRA_REQ_RCVD:
32576 case IB_CM_MRA_REP_RCVD:
32577 - atomic_long_inc(&work->port->counter_group[CM_RECV_DUPLICATES].
32578 + atomic_long_inc_unchecked(&work->port->counter_group[CM_RECV_DUPLICATES].
32579 counter[CM_MRA_COUNTER]);
32580 /* fall through */
32581 default:
32582 @@ -2705,7 +2705,7 @@ static int cm_lap_handler(struct cm_work *work)
32583 case IB_CM_LAP_IDLE:
32584 break;
32585 case IB_CM_MRA_LAP_SENT:
32586 - atomic_long_inc(&work->port->counter_group[CM_RECV_DUPLICATES].
32587 + atomic_long_inc_unchecked(&work->port->counter_group[CM_RECV_DUPLICATES].
32588 counter[CM_LAP_COUNTER]);
32589 if (cm_alloc_response_msg(work->port, work->mad_recv_wc, &msg))
32590 goto unlock;
32591 @@ -2721,7 +2721,7 @@ static int cm_lap_handler(struct cm_work *work)
32592 cm_free_msg(msg);
32593 goto deref;
32594 case IB_CM_LAP_RCVD:
32595 - atomic_long_inc(&work->port->counter_group[CM_RECV_DUPLICATES].
32596 + atomic_long_inc_unchecked(&work->port->counter_group[CM_RECV_DUPLICATES].
32597 counter[CM_LAP_COUNTER]);
32598 goto unlock;
32599 default:
32600 @@ -3005,7 +3005,7 @@ static int cm_sidr_req_handler(struct cm_work *work)
32601 cur_cm_id_priv = cm_insert_remote_sidr(cm_id_priv);
32602 if (cur_cm_id_priv) {
32603 spin_unlock_irq(&cm.lock);
32604 - atomic_long_inc(&work->port->counter_group[CM_RECV_DUPLICATES].
32605 + atomic_long_inc_unchecked(&work->port->counter_group[CM_RECV_DUPLICATES].
32606 counter[CM_SIDR_REQ_COUNTER]);
32607 goto out; /* Duplicate message. */
32608 }
32609 @@ -3217,10 +3217,10 @@ static void cm_send_handler(struct ib_mad_agent *mad_agent,
32610 if (!msg->context[0] && (attr_index != CM_REJ_COUNTER))
32611 msg->retries = 1;
32612
32613 - atomic_long_add(1 + msg->retries,
32614 + atomic_long_add_unchecked(1 + msg->retries,
32615 &port->counter_group[CM_XMIT].counter[attr_index]);
32616 if (msg->retries)
32617 - atomic_long_add(msg->retries,
32618 + atomic_long_add_unchecked(msg->retries,
32619 &port->counter_group[CM_XMIT_RETRIES].
32620 counter[attr_index]);
32621
32622 @@ -3430,7 +3430,7 @@ static void cm_recv_handler(struct ib_mad_agent *mad_agent,
32623 }
32624
32625 attr_id = be16_to_cpu(mad_recv_wc->recv_buf.mad->mad_hdr.attr_id);
32626 - atomic_long_inc(&port->counter_group[CM_RECV].
32627 + atomic_long_inc_unchecked(&port->counter_group[CM_RECV].
32628 counter[attr_id - CM_ATTR_ID_OFFSET]);
32629
32630 work = kmalloc(sizeof *work + sizeof(struct ib_sa_path_rec) * paths,
32631 @@ -3635,7 +3635,7 @@ static ssize_t cm_show_counter(struct kobject *obj, struct attribute *attr,
32632 cm_attr = container_of(attr, struct cm_counter_attribute, attr);
32633
32634 return sprintf(buf, "%ld\n",
32635 - atomic_long_read(&group->counter[cm_attr->index]));
32636 + atomic_long_read_unchecked(&group->counter[cm_attr->index]));
32637 }
32638
32639 static const struct sysfs_ops cm_counter_ops = {
32640 diff --git a/drivers/infiniband/core/fmr_pool.c b/drivers/infiniband/core/fmr_pool.c
32641 index 176c8f9..2627b62 100644
32642 --- a/drivers/infiniband/core/fmr_pool.c
32643 +++ b/drivers/infiniband/core/fmr_pool.c
32644 @@ -98,8 +98,8 @@ struct ib_fmr_pool {
32645
32646 struct task_struct *thread;
32647
32648 - atomic_t req_ser;
32649 - atomic_t flush_ser;
32650 + atomic_unchecked_t req_ser;
32651 + atomic_unchecked_t flush_ser;
32652
32653 wait_queue_head_t force_wait;
32654 };
32655 @@ -180,10 +180,10 @@ static int ib_fmr_cleanup_thread(void *pool_ptr)
32656 struct ib_fmr_pool *pool = pool_ptr;
32657
32658 do {
32659 - if (atomic_read(&pool->flush_ser) - atomic_read(&pool->req_ser) < 0) {
32660 + if (atomic_read_unchecked(&pool->flush_ser) - atomic_read_unchecked(&pool->req_ser) < 0) {
32661 ib_fmr_batch_release(pool);
32662
32663 - atomic_inc(&pool->flush_ser);
32664 + atomic_inc_unchecked(&pool->flush_ser);
32665 wake_up_interruptible(&pool->force_wait);
32666
32667 if (pool->flush_function)
32668 @@ -191,7 +191,7 @@ static int ib_fmr_cleanup_thread(void *pool_ptr)
32669 }
32670
32671 set_current_state(TASK_INTERRUPTIBLE);
32672 - if (atomic_read(&pool->flush_ser) - atomic_read(&pool->req_ser) >= 0 &&
32673 + if (atomic_read_unchecked(&pool->flush_ser) - atomic_read_unchecked(&pool->req_ser) >= 0 &&
32674 !kthread_should_stop())
32675 schedule();
32676 __set_current_state(TASK_RUNNING);
32677 @@ -283,8 +283,8 @@ struct ib_fmr_pool *ib_create_fmr_pool(struct ib_pd *pd,
32678 pool->dirty_watermark = params->dirty_watermark;
32679 pool->dirty_len = 0;
32680 spin_lock_init(&pool->pool_lock);
32681 - atomic_set(&pool->req_ser, 0);
32682 - atomic_set(&pool->flush_ser, 0);
32683 + atomic_set_unchecked(&pool->req_ser, 0);
32684 + atomic_set_unchecked(&pool->flush_ser, 0);
32685 init_waitqueue_head(&pool->force_wait);
32686
32687 pool->thread = kthread_run(ib_fmr_cleanup_thread,
32688 @@ -412,11 +412,11 @@ int ib_flush_fmr_pool(struct ib_fmr_pool *pool)
32689 }
32690 spin_unlock_irq(&pool->pool_lock);
32691
32692 - serial = atomic_inc_return(&pool->req_ser);
32693 + serial = atomic_inc_return_unchecked(&pool->req_ser);
32694 wake_up_process(pool->thread);
32695
32696 if (wait_event_interruptible(pool->force_wait,
32697 - atomic_read(&pool->flush_ser) - serial >= 0))
32698 + atomic_read_unchecked(&pool->flush_ser) - serial >= 0))
32699 return -EINTR;
32700
32701 return 0;
32702 @@ -526,7 +526,7 @@ int ib_fmr_pool_unmap(struct ib_pool_fmr *fmr)
32703 } else {
32704 list_add_tail(&fmr->list, &pool->dirty_list);
32705 if (++pool->dirty_len >= pool->dirty_watermark) {
32706 - atomic_inc(&pool->req_ser);
32707 + atomic_inc_unchecked(&pool->req_ser);
32708 wake_up_process(pool->thread);
32709 }
32710 }
32711 diff --git a/drivers/infiniband/hw/cxgb4/mem.c b/drivers/infiniband/hw/cxgb4/mem.c
32712 index 57e07c6..56d09d4 100644
32713 --- a/drivers/infiniband/hw/cxgb4/mem.c
32714 +++ b/drivers/infiniband/hw/cxgb4/mem.c
32715 @@ -122,7 +122,7 @@ static int write_tpt_entry(struct c4iw_rdev *rdev, u32 reset_tpt_entry,
32716 int err;
32717 struct fw_ri_tpte tpt;
32718 u32 stag_idx;
32719 - static atomic_t key;
32720 + static atomic_unchecked_t key;
32721
32722 if (c4iw_fatal_error(rdev))
32723 return -EIO;
32724 @@ -139,7 +139,7 @@ static int write_tpt_entry(struct c4iw_rdev *rdev, u32 reset_tpt_entry,
32725 if (rdev->stats.stag.cur > rdev->stats.stag.max)
32726 rdev->stats.stag.max = rdev->stats.stag.cur;
32727 mutex_unlock(&rdev->stats.lock);
32728 - *stag = (stag_idx << 8) | (atomic_inc_return(&key) & 0xff);
32729 + *stag = (stag_idx << 8) | (atomic_inc_return_unchecked(&key) & 0xff);
32730 }
32731 PDBG("%s stag_state 0x%0x type 0x%0x pdid 0x%0x, stag_idx 0x%x\n",
32732 __func__, stag_state, type, pdid, stag_idx);
32733 diff --git a/drivers/infiniband/hw/ipath/ipath_rc.c b/drivers/infiniband/hw/ipath/ipath_rc.c
32734 index 79b3dbc..96e5fcc 100644
32735 --- a/drivers/infiniband/hw/ipath/ipath_rc.c
32736 +++ b/drivers/infiniband/hw/ipath/ipath_rc.c
32737 @@ -1868,7 +1868,7 @@ void ipath_rc_rcv(struct ipath_ibdev *dev, struct ipath_ib_header *hdr,
32738 struct ib_atomic_eth *ateth;
32739 struct ipath_ack_entry *e;
32740 u64 vaddr;
32741 - atomic64_t *maddr;
32742 + atomic64_unchecked_t *maddr;
32743 u64 sdata;
32744 u32 rkey;
32745 u8 next;
32746 @@ -1903,11 +1903,11 @@ void ipath_rc_rcv(struct ipath_ibdev *dev, struct ipath_ib_header *hdr,
32747 IB_ACCESS_REMOTE_ATOMIC)))
32748 goto nack_acc_unlck;
32749 /* Perform atomic OP and save result. */
32750 - maddr = (atomic64_t *) qp->r_sge.sge.vaddr;
32751 + maddr = (atomic64_unchecked_t *) qp->r_sge.sge.vaddr;
32752 sdata = be64_to_cpu(ateth->swap_data);
32753 e = &qp->s_ack_queue[qp->r_head_ack_queue];
32754 e->atomic_data = (opcode == OP(FETCH_ADD)) ?
32755 - (u64) atomic64_add_return(sdata, maddr) - sdata :
32756 + (u64) atomic64_add_return_unchecked(sdata, maddr) - sdata :
32757 (u64) cmpxchg((u64 *) qp->r_sge.sge.vaddr,
32758 be64_to_cpu(ateth->compare_data),
32759 sdata);
32760 diff --git a/drivers/infiniband/hw/ipath/ipath_ruc.c b/drivers/infiniband/hw/ipath/ipath_ruc.c
32761 index 1f95bba..9530f87 100644
32762 --- a/drivers/infiniband/hw/ipath/ipath_ruc.c
32763 +++ b/drivers/infiniband/hw/ipath/ipath_ruc.c
32764 @@ -266,7 +266,7 @@ static void ipath_ruc_loopback(struct ipath_qp *sqp)
32765 unsigned long flags;
32766 struct ib_wc wc;
32767 u64 sdata;
32768 - atomic64_t *maddr;
32769 + atomic64_unchecked_t *maddr;
32770 enum ib_wc_status send_status;
32771
32772 /*
32773 @@ -382,11 +382,11 @@ again:
32774 IB_ACCESS_REMOTE_ATOMIC)))
32775 goto acc_err;
32776 /* Perform atomic OP and save result. */
32777 - maddr = (atomic64_t *) qp->r_sge.sge.vaddr;
32778 + maddr = (atomic64_unchecked_t *) qp->r_sge.sge.vaddr;
32779 sdata = wqe->wr.wr.atomic.compare_add;
32780 *(u64 *) sqp->s_sge.sge.vaddr =
32781 (wqe->wr.opcode == IB_WR_ATOMIC_FETCH_AND_ADD) ?
32782 - (u64) atomic64_add_return(sdata, maddr) - sdata :
32783 + (u64) atomic64_add_return_unchecked(sdata, maddr) - sdata :
32784 (u64) cmpxchg((u64 *) qp->r_sge.sge.vaddr,
32785 sdata, wqe->wr.wr.atomic.swap);
32786 goto send_comp;
32787 diff --git a/drivers/infiniband/hw/nes/nes.c b/drivers/infiniband/hw/nes/nes.c
32788 index 7140199..da60063 100644
32789 --- a/drivers/infiniband/hw/nes/nes.c
32790 +++ b/drivers/infiniband/hw/nes/nes.c
32791 @@ -103,7 +103,7 @@ MODULE_PARM_DESC(limit_maxrdreqsz, "Limit max read request size to 256 Bytes");
32792 LIST_HEAD(nes_adapter_list);
32793 static LIST_HEAD(nes_dev_list);
32794
32795 -atomic_t qps_destroyed;
32796 +atomic_unchecked_t qps_destroyed;
32797
32798 static unsigned int ee_flsh_adapter;
32799 static unsigned int sysfs_nonidx_addr;
32800 @@ -272,7 +272,7 @@ static void nes_cqp_rem_ref_callback(struct nes_device *nesdev, struct nes_cqp_r
32801 struct nes_qp *nesqp = cqp_request->cqp_callback_pointer;
32802 struct nes_adapter *nesadapter = nesdev->nesadapter;
32803
32804 - atomic_inc(&qps_destroyed);
32805 + atomic_inc_unchecked(&qps_destroyed);
32806
32807 /* Free the control structures */
32808
32809 diff --git a/drivers/infiniband/hw/nes/nes.h b/drivers/infiniband/hw/nes/nes.h
32810 index c438e46..ca30356 100644
32811 --- a/drivers/infiniband/hw/nes/nes.h
32812 +++ b/drivers/infiniband/hw/nes/nes.h
32813 @@ -178,17 +178,17 @@ extern unsigned int nes_debug_level;
32814 extern unsigned int wqm_quanta;
32815 extern struct list_head nes_adapter_list;
32816
32817 -extern atomic_t cm_connects;
32818 -extern atomic_t cm_accepts;
32819 -extern atomic_t cm_disconnects;
32820 -extern atomic_t cm_closes;
32821 -extern atomic_t cm_connecteds;
32822 -extern atomic_t cm_connect_reqs;
32823 -extern atomic_t cm_rejects;
32824 -extern atomic_t mod_qp_timouts;
32825 -extern atomic_t qps_created;
32826 -extern atomic_t qps_destroyed;
32827 -extern atomic_t sw_qps_destroyed;
32828 +extern atomic_unchecked_t cm_connects;
32829 +extern atomic_unchecked_t cm_accepts;
32830 +extern atomic_unchecked_t cm_disconnects;
32831 +extern atomic_unchecked_t cm_closes;
32832 +extern atomic_unchecked_t cm_connecteds;
32833 +extern atomic_unchecked_t cm_connect_reqs;
32834 +extern atomic_unchecked_t cm_rejects;
32835 +extern atomic_unchecked_t mod_qp_timouts;
32836 +extern atomic_unchecked_t qps_created;
32837 +extern atomic_unchecked_t qps_destroyed;
32838 +extern atomic_unchecked_t sw_qps_destroyed;
32839 extern u32 mh_detected;
32840 extern u32 mh_pauses_sent;
32841 extern u32 cm_packets_sent;
32842 @@ -197,16 +197,16 @@ extern u32 cm_packets_created;
32843 extern u32 cm_packets_received;
32844 extern u32 cm_packets_dropped;
32845 extern u32 cm_packets_retrans;
32846 -extern atomic_t cm_listens_created;
32847 -extern atomic_t cm_listens_destroyed;
32848 +extern atomic_unchecked_t cm_listens_created;
32849 +extern atomic_unchecked_t cm_listens_destroyed;
32850 extern u32 cm_backlog_drops;
32851 -extern atomic_t cm_loopbacks;
32852 -extern atomic_t cm_nodes_created;
32853 -extern atomic_t cm_nodes_destroyed;
32854 -extern atomic_t cm_accel_dropped_pkts;
32855 -extern atomic_t cm_resets_recvd;
32856 -extern atomic_t pau_qps_created;
32857 -extern atomic_t pau_qps_destroyed;
32858 +extern atomic_unchecked_t cm_loopbacks;
32859 +extern atomic_unchecked_t cm_nodes_created;
32860 +extern atomic_unchecked_t cm_nodes_destroyed;
32861 +extern atomic_unchecked_t cm_accel_dropped_pkts;
32862 +extern atomic_unchecked_t cm_resets_recvd;
32863 +extern atomic_unchecked_t pau_qps_created;
32864 +extern atomic_unchecked_t pau_qps_destroyed;
32865
32866 extern u32 int_mod_timer_init;
32867 extern u32 int_mod_cq_depth_256;
32868 diff --git a/drivers/infiniband/hw/nes/nes_cm.c b/drivers/infiniband/hw/nes/nes_cm.c
32869 index 020e95c..fbb3450 100644
32870 --- a/drivers/infiniband/hw/nes/nes_cm.c
32871 +++ b/drivers/infiniband/hw/nes/nes_cm.c
32872 @@ -68,14 +68,14 @@ u32 cm_packets_dropped;
32873 u32 cm_packets_retrans;
32874 u32 cm_packets_created;
32875 u32 cm_packets_received;
32876 -atomic_t cm_listens_created;
32877 -atomic_t cm_listens_destroyed;
32878 +atomic_unchecked_t cm_listens_created;
32879 +atomic_unchecked_t cm_listens_destroyed;
32880 u32 cm_backlog_drops;
32881 -atomic_t cm_loopbacks;
32882 -atomic_t cm_nodes_created;
32883 -atomic_t cm_nodes_destroyed;
32884 -atomic_t cm_accel_dropped_pkts;
32885 -atomic_t cm_resets_recvd;
32886 +atomic_unchecked_t cm_loopbacks;
32887 +atomic_unchecked_t cm_nodes_created;
32888 +atomic_unchecked_t cm_nodes_destroyed;
32889 +atomic_unchecked_t cm_accel_dropped_pkts;
32890 +atomic_unchecked_t cm_resets_recvd;
32891
32892 static inline int mini_cm_accelerated(struct nes_cm_core *, struct nes_cm_node *);
32893 static struct nes_cm_listener *mini_cm_listen(struct nes_cm_core *, struct nes_vnic *, struct nes_cm_info *);
32894 @@ -148,13 +148,13 @@ static struct nes_cm_ops nes_cm_api = {
32895
32896 static struct nes_cm_core *g_cm_core;
32897
32898 -atomic_t cm_connects;
32899 -atomic_t cm_accepts;
32900 -atomic_t cm_disconnects;
32901 -atomic_t cm_closes;
32902 -atomic_t cm_connecteds;
32903 -atomic_t cm_connect_reqs;
32904 -atomic_t cm_rejects;
32905 +atomic_unchecked_t cm_connects;
32906 +atomic_unchecked_t cm_accepts;
32907 +atomic_unchecked_t cm_disconnects;
32908 +atomic_unchecked_t cm_closes;
32909 +atomic_unchecked_t cm_connecteds;
32910 +atomic_unchecked_t cm_connect_reqs;
32911 +atomic_unchecked_t cm_rejects;
32912
32913 int nes_add_ref_cm_node(struct nes_cm_node *cm_node)
32914 {
32915 @@ -1279,7 +1279,7 @@ static int mini_cm_dec_refcnt_listen(struct nes_cm_core *cm_core,
32916 kfree(listener);
32917 listener = NULL;
32918 ret = 0;
32919 - atomic_inc(&cm_listens_destroyed);
32920 + atomic_inc_unchecked(&cm_listens_destroyed);
32921 } else {
32922 spin_unlock_irqrestore(&cm_core->listen_list_lock, flags);
32923 }
32924 @@ -1482,7 +1482,7 @@ static struct nes_cm_node *make_cm_node(struct nes_cm_core *cm_core,
32925 cm_node->rem_mac);
32926
32927 add_hte_node(cm_core, cm_node);
32928 - atomic_inc(&cm_nodes_created);
32929 + atomic_inc_unchecked(&cm_nodes_created);
32930
32931 return cm_node;
32932 }
32933 @@ -1540,7 +1540,7 @@ static int rem_ref_cm_node(struct nes_cm_core *cm_core,
32934 }
32935
32936 atomic_dec(&cm_core->node_cnt);
32937 - atomic_inc(&cm_nodes_destroyed);
32938 + atomic_inc_unchecked(&cm_nodes_destroyed);
32939 nesqp = cm_node->nesqp;
32940 if (nesqp) {
32941 nesqp->cm_node = NULL;
32942 @@ -1604,7 +1604,7 @@ static int process_options(struct nes_cm_node *cm_node, u8 *optionsloc,
32943
32944 static void drop_packet(struct sk_buff *skb)
32945 {
32946 - atomic_inc(&cm_accel_dropped_pkts);
32947 + atomic_inc_unchecked(&cm_accel_dropped_pkts);
32948 dev_kfree_skb_any(skb);
32949 }
32950
32951 @@ -1667,7 +1667,7 @@ static void handle_rst_pkt(struct nes_cm_node *cm_node, struct sk_buff *skb,
32952 {
32953
32954 int reset = 0; /* whether to send reset in case of err.. */
32955 - atomic_inc(&cm_resets_recvd);
32956 + atomic_inc_unchecked(&cm_resets_recvd);
32957 nes_debug(NES_DBG_CM, "Received Reset, cm_node = %p, state = %u."
32958 " refcnt=%d\n", cm_node, cm_node->state,
32959 atomic_read(&cm_node->ref_count));
32960 @@ -2308,7 +2308,7 @@ static struct nes_cm_node *mini_cm_connect(struct nes_cm_core *cm_core,
32961 rem_ref_cm_node(cm_node->cm_core, cm_node);
32962 return NULL;
32963 }
32964 - atomic_inc(&cm_loopbacks);
32965 + atomic_inc_unchecked(&cm_loopbacks);
32966 loopbackremotenode->loopbackpartner = cm_node;
32967 loopbackremotenode->tcp_cntxt.rcv_wscale =
32968 NES_CM_DEFAULT_RCV_WND_SCALE;
32969 @@ -2583,7 +2583,7 @@ static int mini_cm_recv_pkt(struct nes_cm_core *cm_core,
32970 nes_queue_mgt_skbs(skb, nesvnic, cm_node->nesqp);
32971 else {
32972 rem_ref_cm_node(cm_core, cm_node);
32973 - atomic_inc(&cm_accel_dropped_pkts);
32974 + atomic_inc_unchecked(&cm_accel_dropped_pkts);
32975 dev_kfree_skb_any(skb);
32976 }
32977 break;
32978 @@ -2891,7 +2891,7 @@ static int nes_cm_disconn_true(struct nes_qp *nesqp)
32979
32980 if ((cm_id) && (cm_id->event_handler)) {
32981 if (issue_disconn) {
32982 - atomic_inc(&cm_disconnects);
32983 + atomic_inc_unchecked(&cm_disconnects);
32984 cm_event.event = IW_CM_EVENT_DISCONNECT;
32985 cm_event.status = disconn_status;
32986 cm_event.local_addr = cm_id->local_addr;
32987 @@ -2913,7 +2913,7 @@ static int nes_cm_disconn_true(struct nes_qp *nesqp)
32988 }
32989
32990 if (issue_close) {
32991 - atomic_inc(&cm_closes);
32992 + atomic_inc_unchecked(&cm_closes);
32993 nes_disconnect(nesqp, 1);
32994
32995 cm_id->provider_data = nesqp;
32996 @@ -3049,7 +3049,7 @@ int nes_accept(struct iw_cm_id *cm_id, struct iw_cm_conn_param *conn_param)
32997
32998 nes_debug(NES_DBG_CM, "QP%u, cm_node=%p, jiffies = %lu listener = %p\n",
32999 nesqp->hwqp.qp_id, cm_node, jiffies, cm_node->listener);
33000 - atomic_inc(&cm_accepts);
33001 + atomic_inc_unchecked(&cm_accepts);
33002
33003 nes_debug(NES_DBG_CM, "netdev refcnt = %u.\n",
33004 netdev_refcnt_read(nesvnic->netdev));
33005 @@ -3251,7 +3251,7 @@ int nes_reject(struct iw_cm_id *cm_id, const void *pdata, u8 pdata_len)
33006 struct nes_cm_core *cm_core;
33007 u8 *start_buff;
33008
33009 - atomic_inc(&cm_rejects);
33010 + atomic_inc_unchecked(&cm_rejects);
33011 cm_node = (struct nes_cm_node *)cm_id->provider_data;
33012 loopback = cm_node->loopbackpartner;
33013 cm_core = cm_node->cm_core;
33014 @@ -3311,7 +3311,7 @@ int nes_connect(struct iw_cm_id *cm_id, struct iw_cm_conn_param *conn_param)
33015 ntohl(cm_id->local_addr.sin_addr.s_addr),
33016 ntohs(cm_id->local_addr.sin_port));
33017
33018 - atomic_inc(&cm_connects);
33019 + atomic_inc_unchecked(&cm_connects);
33020 nesqp->active_conn = 1;
33021
33022 /* cache the cm_id in the qp */
33023 @@ -3421,7 +3421,7 @@ int nes_create_listen(struct iw_cm_id *cm_id, int backlog)
33024 g_cm_core->api->stop_listener(g_cm_core, (void *)cm_node);
33025 return err;
33026 }
33027 - atomic_inc(&cm_listens_created);
33028 + atomic_inc_unchecked(&cm_listens_created);
33029 }
33030
33031 cm_id->add_ref(cm_id);
33032 @@ -3522,7 +3522,7 @@ static void cm_event_connected(struct nes_cm_event *event)
33033
33034 if (nesqp->destroyed)
33035 return;
33036 - atomic_inc(&cm_connecteds);
33037 + atomic_inc_unchecked(&cm_connecteds);
33038 nes_debug(NES_DBG_CM, "QP%u attempting to connect to 0x%08X:0x%04X on"
33039 " local port 0x%04X. jiffies = %lu.\n",
33040 nesqp->hwqp.qp_id,
33041 @@ -3709,7 +3709,7 @@ static void cm_event_reset(struct nes_cm_event *event)
33042
33043 cm_id->add_ref(cm_id);
33044 ret = cm_id->event_handler(cm_id, &cm_event);
33045 - atomic_inc(&cm_closes);
33046 + atomic_inc_unchecked(&cm_closes);
33047 cm_event.event = IW_CM_EVENT_CLOSE;
33048 cm_event.status = 0;
33049 cm_event.provider_data = cm_id->provider_data;
33050 @@ -3745,7 +3745,7 @@ static void cm_event_mpa_req(struct nes_cm_event *event)
33051 return;
33052 cm_id = cm_node->cm_id;
33053
33054 - atomic_inc(&cm_connect_reqs);
33055 + atomic_inc_unchecked(&cm_connect_reqs);
33056 nes_debug(NES_DBG_CM, "cm_node = %p - cm_id = %p, jiffies = %lu\n",
33057 cm_node, cm_id, jiffies);
33058
33059 @@ -3785,7 +3785,7 @@ static void cm_event_mpa_reject(struct nes_cm_event *event)
33060 return;
33061 cm_id = cm_node->cm_id;
33062
33063 - atomic_inc(&cm_connect_reqs);
33064 + atomic_inc_unchecked(&cm_connect_reqs);
33065 nes_debug(NES_DBG_CM, "cm_node = %p - cm_id = %p, jiffies = %lu\n",
33066 cm_node, cm_id, jiffies);
33067
33068 diff --git a/drivers/infiniband/hw/nes/nes_mgt.c b/drivers/infiniband/hw/nes/nes_mgt.c
33069 index 3ba7be3..c81f6ff 100644
33070 --- a/drivers/infiniband/hw/nes/nes_mgt.c
33071 +++ b/drivers/infiniband/hw/nes/nes_mgt.c
33072 @@ -40,8 +40,8 @@
33073 #include "nes.h"
33074 #include "nes_mgt.h"
33075
33076 -atomic_t pau_qps_created;
33077 -atomic_t pau_qps_destroyed;
33078 +atomic_unchecked_t pau_qps_created;
33079 +atomic_unchecked_t pau_qps_destroyed;
33080
33081 static void nes_replenish_mgt_rq(struct nes_vnic_mgt *mgtvnic)
33082 {
33083 @@ -621,7 +621,7 @@ void nes_destroy_pau_qp(struct nes_device *nesdev, struct nes_qp *nesqp)
33084 {
33085 struct sk_buff *skb;
33086 unsigned long flags;
33087 - atomic_inc(&pau_qps_destroyed);
33088 + atomic_inc_unchecked(&pau_qps_destroyed);
33089
33090 /* Free packets that have not yet been forwarded */
33091 /* Lock is acquired by skb_dequeue when removing the skb */
33092 @@ -812,7 +812,7 @@ static void nes_mgt_ce_handler(struct nes_device *nesdev, struct nes_hw_nic_cq *
33093 cq->cq_vbase[head].cqe_words[NES_NIC_CQE_HASH_RCVNXT]);
33094 skb_queue_head_init(&nesqp->pau_list);
33095 spin_lock_init(&nesqp->pau_lock);
33096 - atomic_inc(&pau_qps_created);
33097 + atomic_inc_unchecked(&pau_qps_created);
33098 nes_change_quad_hash(nesdev, mgtvnic->nesvnic, nesqp);
33099 }
33100
33101 diff --git a/drivers/infiniband/hw/nes/nes_nic.c b/drivers/infiniband/hw/nes/nes_nic.c
33102 index f3a3ecf..57d311d 100644
33103 --- a/drivers/infiniband/hw/nes/nes_nic.c
33104 +++ b/drivers/infiniband/hw/nes/nes_nic.c
33105 @@ -1277,39 +1277,39 @@ static void nes_netdev_get_ethtool_stats(struct net_device *netdev,
33106 target_stat_values[++index] = mh_detected;
33107 target_stat_values[++index] = mh_pauses_sent;
33108 target_stat_values[++index] = nesvnic->endnode_ipv4_tcp_retransmits;
33109 - target_stat_values[++index] = atomic_read(&cm_connects);
33110 - target_stat_values[++index] = atomic_read(&cm_accepts);
33111 - target_stat_values[++index] = atomic_read(&cm_disconnects);
33112 - target_stat_values[++index] = atomic_read(&cm_connecteds);
33113 - target_stat_values[++index] = atomic_read(&cm_connect_reqs);
33114 - target_stat_values[++index] = atomic_read(&cm_rejects);
33115 - target_stat_values[++index] = atomic_read(&mod_qp_timouts);
33116 - target_stat_values[++index] = atomic_read(&qps_created);
33117 - target_stat_values[++index] = atomic_read(&sw_qps_destroyed);
33118 - target_stat_values[++index] = atomic_read(&qps_destroyed);
33119 - target_stat_values[++index] = atomic_read(&cm_closes);
33120 + target_stat_values[++index] = atomic_read_unchecked(&cm_connects);
33121 + target_stat_values[++index] = atomic_read_unchecked(&cm_accepts);
33122 + target_stat_values[++index] = atomic_read_unchecked(&cm_disconnects);
33123 + target_stat_values[++index] = atomic_read_unchecked(&cm_connecteds);
33124 + target_stat_values[++index] = atomic_read_unchecked(&cm_connect_reqs);
33125 + target_stat_values[++index] = atomic_read_unchecked(&cm_rejects);
33126 + target_stat_values[++index] = atomic_read_unchecked(&mod_qp_timouts);
33127 + target_stat_values[++index] = atomic_read_unchecked(&qps_created);
33128 + target_stat_values[++index] = atomic_read_unchecked(&sw_qps_destroyed);
33129 + target_stat_values[++index] = atomic_read_unchecked(&qps_destroyed);
33130 + target_stat_values[++index] = atomic_read_unchecked(&cm_closes);
33131 target_stat_values[++index] = cm_packets_sent;
33132 target_stat_values[++index] = cm_packets_bounced;
33133 target_stat_values[++index] = cm_packets_created;
33134 target_stat_values[++index] = cm_packets_received;
33135 target_stat_values[++index] = cm_packets_dropped;
33136 target_stat_values[++index] = cm_packets_retrans;
33137 - target_stat_values[++index] = atomic_read(&cm_listens_created);
33138 - target_stat_values[++index] = atomic_read(&cm_listens_destroyed);
33139 + target_stat_values[++index] = atomic_read_unchecked(&cm_listens_created);
33140 + target_stat_values[++index] = atomic_read_unchecked(&cm_listens_destroyed);
33141 target_stat_values[++index] = cm_backlog_drops;
33142 - target_stat_values[++index] = atomic_read(&cm_loopbacks);
33143 - target_stat_values[++index] = atomic_read(&cm_nodes_created);
33144 - target_stat_values[++index] = atomic_read(&cm_nodes_destroyed);
33145 - target_stat_values[++index] = atomic_read(&cm_accel_dropped_pkts);
33146 - target_stat_values[++index] = atomic_read(&cm_resets_recvd);
33147 + target_stat_values[++index] = atomic_read_unchecked(&cm_loopbacks);
33148 + target_stat_values[++index] = atomic_read_unchecked(&cm_nodes_created);
33149 + target_stat_values[++index] = atomic_read_unchecked(&cm_nodes_destroyed);
33150 + target_stat_values[++index] = atomic_read_unchecked(&cm_accel_dropped_pkts);
33151 + target_stat_values[++index] = atomic_read_unchecked(&cm_resets_recvd);
33152 target_stat_values[++index] = nesadapter->free_4kpbl;
33153 target_stat_values[++index] = nesadapter->free_256pbl;
33154 target_stat_values[++index] = int_mod_timer_init;
33155 target_stat_values[++index] = nesvnic->lro_mgr.stats.aggregated;
33156 target_stat_values[++index] = nesvnic->lro_mgr.stats.flushed;
33157 target_stat_values[++index] = nesvnic->lro_mgr.stats.no_desc;
33158 - target_stat_values[++index] = atomic_read(&pau_qps_created);
33159 - target_stat_values[++index] = atomic_read(&pau_qps_destroyed);
33160 + target_stat_values[++index] = atomic_read_unchecked(&pau_qps_created);
33161 + target_stat_values[++index] = atomic_read_unchecked(&pau_qps_destroyed);
33162 }
33163
33164 /**
33165 diff --git a/drivers/infiniband/hw/nes/nes_verbs.c b/drivers/infiniband/hw/nes/nes_verbs.c
33166 index 8b8812d..a5e1133 100644
33167 --- a/drivers/infiniband/hw/nes/nes_verbs.c
33168 +++ b/drivers/infiniband/hw/nes/nes_verbs.c
33169 @@ -46,9 +46,9 @@
33170
33171 #include <rdma/ib_umem.h>
33172
33173 -atomic_t mod_qp_timouts;
33174 -atomic_t qps_created;
33175 -atomic_t sw_qps_destroyed;
33176 +atomic_unchecked_t mod_qp_timouts;
33177 +atomic_unchecked_t qps_created;
33178 +atomic_unchecked_t sw_qps_destroyed;
33179
33180 static void nes_unregister_ofa_device(struct nes_ib_device *nesibdev);
33181
33182 @@ -1131,7 +1131,7 @@ static struct ib_qp *nes_create_qp(struct ib_pd *ibpd,
33183 if (init_attr->create_flags)
33184 return ERR_PTR(-EINVAL);
33185
33186 - atomic_inc(&qps_created);
33187 + atomic_inc_unchecked(&qps_created);
33188 switch (init_attr->qp_type) {
33189 case IB_QPT_RC:
33190 if (nes_drv_opt & NES_DRV_OPT_NO_INLINE_DATA) {
33191 @@ -1460,7 +1460,7 @@ static int nes_destroy_qp(struct ib_qp *ibqp)
33192 struct iw_cm_event cm_event;
33193 int ret = 0;
33194
33195 - atomic_inc(&sw_qps_destroyed);
33196 + atomic_inc_unchecked(&sw_qps_destroyed);
33197 nesqp->destroyed = 1;
33198
33199 /* Blow away the connection if it exists. */
33200 diff --git a/drivers/infiniband/hw/qib/qib.h b/drivers/infiniband/hw/qib/qib.h
33201 index 7b1b8669..4b69f85 100644
33202 --- a/drivers/infiniband/hw/qib/qib.h
33203 +++ b/drivers/infiniband/hw/qib/qib.h
33204 @@ -51,6 +51,7 @@
33205 #include <linux/completion.h>
33206 #include <linux/kref.h>
33207 #include <linux/sched.h>
33208 +#include <linux/slab.h>
33209
33210 #include "qib_common.h"
33211 #include "qib_verbs.h"
33212 diff --git a/drivers/input/gameport/gameport.c b/drivers/input/gameport/gameport.c
33213 index da739d9..da1c7f4 100644
33214 --- a/drivers/input/gameport/gameport.c
33215 +++ b/drivers/input/gameport/gameport.c
33216 @@ -487,14 +487,14 @@ EXPORT_SYMBOL(gameport_set_phys);
33217 */
33218 static void gameport_init_port(struct gameport *gameport)
33219 {
33220 - static atomic_t gameport_no = ATOMIC_INIT(0);
33221 + static atomic_unchecked_t gameport_no = ATOMIC_INIT(0);
33222
33223 __module_get(THIS_MODULE);
33224
33225 mutex_init(&gameport->drv_mutex);
33226 device_initialize(&gameport->dev);
33227 dev_set_name(&gameport->dev, "gameport%lu",
33228 - (unsigned long)atomic_inc_return(&gameport_no) - 1);
33229 + (unsigned long)atomic_inc_return_unchecked(&gameport_no) - 1);
33230 gameport->dev.bus = &gameport_bus;
33231 gameport->dev.release = gameport_release_port;
33232 if (gameport->parent)
33233 diff --git a/drivers/input/input.c b/drivers/input/input.c
33234 index 8921c61..f5cd63d 100644
33235 --- a/drivers/input/input.c
33236 +++ b/drivers/input/input.c
33237 @@ -1814,7 +1814,7 @@ static void input_cleanse_bitmasks(struct input_dev *dev)
33238 */
33239 int input_register_device(struct input_dev *dev)
33240 {
33241 - static atomic_t input_no = ATOMIC_INIT(0);
33242 + static atomic_unchecked_t input_no = ATOMIC_INIT(0);
33243 struct input_handler *handler;
33244 const char *path;
33245 int error;
33246 @@ -1851,7 +1851,7 @@ int input_register_device(struct input_dev *dev)
33247 dev->setkeycode = input_default_setkeycode;
33248
33249 dev_set_name(&dev->dev, "input%ld",
33250 - (unsigned long) atomic_inc_return(&input_no) - 1);
33251 + (unsigned long) atomic_inc_return_unchecked(&input_no) - 1);
33252
33253 error = device_add(&dev->dev);
33254 if (error)
33255 diff --git a/drivers/input/joystick/sidewinder.c b/drivers/input/joystick/sidewinder.c
33256 index 04c69af..5f92d00 100644
33257 --- a/drivers/input/joystick/sidewinder.c
33258 +++ b/drivers/input/joystick/sidewinder.c
33259 @@ -30,6 +30,7 @@
33260 #include <linux/kernel.h>
33261 #include <linux/module.h>
33262 #include <linux/slab.h>
33263 +#include <linux/sched.h>
33264 #include <linux/init.h>
33265 #include <linux/input.h>
33266 #include <linux/gameport.h>
33267 diff --git a/drivers/input/joystick/xpad.c b/drivers/input/joystick/xpad.c
33268 index 83811e4..0822b90 100644
33269 --- a/drivers/input/joystick/xpad.c
33270 +++ b/drivers/input/joystick/xpad.c
33271 @@ -726,7 +726,7 @@ static void xpad_led_set(struct led_classdev *led_cdev,
33272
33273 static int xpad_led_probe(struct usb_xpad *xpad)
33274 {
33275 - static atomic_t led_seq = ATOMIC_INIT(0);
33276 + static atomic_unchecked_t led_seq = ATOMIC_INIT(0);
33277 long led_no;
33278 struct xpad_led *led;
33279 struct led_classdev *led_cdev;
33280 @@ -739,7 +739,7 @@ static int xpad_led_probe(struct usb_xpad *xpad)
33281 if (!led)
33282 return -ENOMEM;
33283
33284 - led_no = (long)atomic_inc_return(&led_seq) - 1;
33285 + led_no = (long)atomic_inc_return_unchecked(&led_seq) - 1;
33286
33287 snprintf(led->name, sizeof(led->name), "xpad%ld", led_no);
33288 led->xpad = xpad;
33289 diff --git a/drivers/input/mousedev.c b/drivers/input/mousedev.c
33290 index 0110b5a..d3ad144 100644
33291 --- a/drivers/input/mousedev.c
33292 +++ b/drivers/input/mousedev.c
33293 @@ -763,7 +763,7 @@ static ssize_t mousedev_read(struct file *file, char __user *buffer,
33294
33295 spin_unlock_irq(&client->packet_lock);
33296
33297 - if (copy_to_user(buffer, data, count))
33298 + if (count > sizeof(data) || copy_to_user(buffer, data, count))
33299 return -EFAULT;
33300
33301 return count;
33302 diff --git a/drivers/input/serio/serio.c b/drivers/input/serio/serio.c
33303 index d0f7533..fb8215b 100644
33304 --- a/drivers/input/serio/serio.c
33305 +++ b/drivers/input/serio/serio.c
33306 @@ -496,7 +496,7 @@ static void serio_release_port(struct device *dev)
33307 */
33308 static void serio_init_port(struct serio *serio)
33309 {
33310 - static atomic_t serio_no = ATOMIC_INIT(0);
33311 + static atomic_unchecked_t serio_no = ATOMIC_INIT(0);
33312
33313 __module_get(THIS_MODULE);
33314
33315 @@ -507,7 +507,7 @@ static void serio_init_port(struct serio *serio)
33316 mutex_init(&serio->drv_mutex);
33317 device_initialize(&serio->dev);
33318 dev_set_name(&serio->dev, "serio%ld",
33319 - (long)atomic_inc_return(&serio_no) - 1);
33320 + (long)atomic_inc_return_unchecked(&serio_no) - 1);
33321 serio->dev.bus = &serio_bus;
33322 serio->dev.release = serio_release_port;
33323 serio->dev.groups = serio_device_attr_groups;
33324 diff --git a/drivers/isdn/capi/capi.c b/drivers/isdn/capi/capi.c
33325 index 38c4bd8..58965d9 100644
33326 --- a/drivers/isdn/capi/capi.c
33327 +++ b/drivers/isdn/capi/capi.c
33328 @@ -83,8 +83,8 @@ struct capiminor {
33329
33330 struct capi20_appl *ap;
33331 u32 ncci;
33332 - atomic_t datahandle;
33333 - atomic_t msgid;
33334 + atomic_unchecked_t datahandle;
33335 + atomic_unchecked_t msgid;
33336
33337 struct tty_port port;
33338 int ttyinstop;
33339 @@ -392,7 +392,7 @@ gen_data_b3_resp_for(struct capiminor *mp, struct sk_buff *skb)
33340 capimsg_setu16(s, 2, mp->ap->applid);
33341 capimsg_setu8 (s, 4, CAPI_DATA_B3);
33342 capimsg_setu8 (s, 5, CAPI_RESP);
33343 - capimsg_setu16(s, 6, atomic_inc_return(&mp->msgid));
33344 + capimsg_setu16(s, 6, atomic_inc_return_unchecked(&mp->msgid));
33345 capimsg_setu32(s, 8, mp->ncci);
33346 capimsg_setu16(s, 12, datahandle);
33347 }
33348 @@ -513,14 +513,14 @@ static void handle_minor_send(struct capiminor *mp)
33349 mp->outbytes -= len;
33350 spin_unlock_bh(&mp->outlock);
33351
33352 - datahandle = atomic_inc_return(&mp->datahandle);
33353 + datahandle = atomic_inc_return_unchecked(&mp->datahandle);
33354 skb_push(skb, CAPI_DATA_B3_REQ_LEN);
33355 memset(skb->data, 0, CAPI_DATA_B3_REQ_LEN);
33356 capimsg_setu16(skb->data, 0, CAPI_DATA_B3_REQ_LEN);
33357 capimsg_setu16(skb->data, 2, mp->ap->applid);
33358 capimsg_setu8 (skb->data, 4, CAPI_DATA_B3);
33359 capimsg_setu8 (skb->data, 5, CAPI_REQ);
33360 - capimsg_setu16(skb->data, 6, atomic_inc_return(&mp->msgid));
33361 + capimsg_setu16(skb->data, 6, atomic_inc_return_unchecked(&mp->msgid));
33362 capimsg_setu32(skb->data, 8, mp->ncci); /* NCCI */
33363 capimsg_setu32(skb->data, 12, (u32)(long)skb->data);/* Data32 */
33364 capimsg_setu16(skb->data, 16, len); /* Data length */
33365 diff --git a/drivers/isdn/gigaset/interface.c b/drivers/isdn/gigaset/interface.c
33366 index a6d9fd2..afdb8a3 100644
33367 --- a/drivers/isdn/gigaset/interface.c
33368 +++ b/drivers/isdn/gigaset/interface.c
33369 @@ -160,9 +160,9 @@ static int if_open(struct tty_struct *tty, struct file *filp)
33370 }
33371 tty->driver_data = cs;
33372
33373 - ++cs->port.count;
33374 + atomic_inc(&cs->port.count);
33375
33376 - if (cs->port.count == 1) {
33377 + if (atomic_read(&cs->port.count) == 1) {
33378 tty_port_tty_set(&cs->port, tty);
33379 tty->low_latency = 1;
33380 }
33381 @@ -186,9 +186,9 @@ static void if_close(struct tty_struct *tty, struct file *filp)
33382
33383 if (!cs->connected)
33384 gig_dbg(DEBUG_IF, "not connected"); /* nothing to do */
33385 - else if (!cs->port.count)
33386 + else if (!atomic_read(&cs->port.count))
33387 dev_warn(cs->dev, "%s: device not opened\n", __func__);
33388 - else if (!--cs->port.count)
33389 + else if (!atomic_dec_return(&cs->port.count))
33390 tty_port_tty_set(&cs->port, NULL);
33391
33392 mutex_unlock(&cs->mutex);
33393 diff --git a/drivers/isdn/hardware/avm/b1.c b/drivers/isdn/hardware/avm/b1.c
33394 index 821f7ac..28d4030 100644
33395 --- a/drivers/isdn/hardware/avm/b1.c
33396 +++ b/drivers/isdn/hardware/avm/b1.c
33397 @@ -176,7 +176,7 @@ int b1_load_t4file(avmcard *card, capiloaddatapart *t4file)
33398 }
33399 if (left) {
33400 if (t4file->user) {
33401 - if (copy_from_user(buf, dp, left))
33402 + if (left > sizeof buf || copy_from_user(buf, dp, left))
33403 return -EFAULT;
33404 } else {
33405 memcpy(buf, dp, left);
33406 @@ -224,7 +224,7 @@ int b1_load_config(avmcard *card, capiloaddatapart *config)
33407 }
33408 if (left) {
33409 if (config->user) {
33410 - if (copy_from_user(buf, dp, left))
33411 + if (left > sizeof buf || copy_from_user(buf, dp, left))
33412 return -EFAULT;
33413 } else {
33414 memcpy(buf, dp, left);
33415 diff --git a/drivers/isdn/hardware/eicon/divasync.h b/drivers/isdn/hardware/eicon/divasync.h
33416 index dd6b53a..19d9ee6 100644
33417 --- a/drivers/isdn/hardware/eicon/divasync.h
33418 +++ b/drivers/isdn/hardware/eicon/divasync.h
33419 @@ -146,7 +146,7 @@ typedef struct _diva_didd_add_adapter {
33420 } diva_didd_add_adapter_t;
33421 typedef struct _diva_didd_remove_adapter {
33422 IDI_CALL p_request;
33423 -} diva_didd_remove_adapter_t;
33424 +} __no_const diva_didd_remove_adapter_t;
33425 typedef struct _diva_didd_read_adapter_array {
33426 void *buffer;
33427 dword length;
33428 diff --git a/drivers/isdn/hardware/eicon/xdi_adapter.h b/drivers/isdn/hardware/eicon/xdi_adapter.h
33429 index d303e65..28bcb7b 100644
33430 --- a/drivers/isdn/hardware/eicon/xdi_adapter.h
33431 +++ b/drivers/isdn/hardware/eicon/xdi_adapter.h
33432 @@ -44,7 +44,7 @@ typedef struct _xdi_mbox_t {
33433 typedef struct _diva_os_idi_adapter_interface {
33434 diva_init_card_proc_t cleanup_adapter_proc;
33435 diva_cmd_card_proc_t cmd_proc;
33436 -} diva_os_idi_adapter_interface_t;
33437 +} __no_const diva_os_idi_adapter_interface_t;
33438
33439 typedef struct _diva_os_xdi_adapter {
33440 struct list_head link;
33441 diff --git a/drivers/isdn/i4l/isdn_tty.c b/drivers/isdn/i4l/isdn_tty.c
33442 index 7bc5067..fd36232 100644
33443 --- a/drivers/isdn/i4l/isdn_tty.c
33444 +++ b/drivers/isdn/i4l/isdn_tty.c
33445 @@ -1505,9 +1505,9 @@ isdn_tty_open(struct tty_struct *tty, struct file *filp)
33446 port = &info->port;
33447 #ifdef ISDN_DEBUG_MODEM_OPEN
33448 printk(KERN_DEBUG "isdn_tty_open %s, count = %d\n", tty->name,
33449 - port->count);
33450 + atomic_read(&port->count))
33451 #endif
33452 - port->count++;
33453 + atomic_inc(&port->count);
33454 tty->driver_data = info;
33455 port->tty = tty;
33456 tty->port = port;
33457 @@ -1553,7 +1553,7 @@ isdn_tty_close(struct tty_struct *tty, struct file *filp)
33458 #endif
33459 return;
33460 }
33461 - if ((tty->count == 1) && (port->count != 1)) {
33462 + if ((tty->count == 1) && (atomic_read(&port->count) != 1)) {
33463 /*
33464 * Uh, oh. tty->count is 1, which means that the tty
33465 * structure will be freed. Info->count should always
33466 @@ -1562,15 +1562,15 @@ isdn_tty_close(struct tty_struct *tty, struct file *filp)
33467 * serial port won't be shutdown.
33468 */
33469 printk(KERN_ERR "isdn_tty_close: bad port count; tty->count is 1, "
33470 - "info->count is %d\n", port->count);
33471 - port->count = 1;
33472 + "info->count is %d\n", atomic_read(&port->count));
33473 + atomic_set(&port->count, 1);
33474 }
33475 - if (--port->count < 0) {
33476 + if (atomic_dec_return(&port->count) < 0) {
33477 printk(KERN_ERR "isdn_tty_close: bad port count for ttyi%d: %d\n",
33478 - info->line, port->count);
33479 - port->count = 0;
33480 + info->line, atomic_read(&port->count));
33481 + atomic_set(&port->count, 0);
33482 }
33483 - if (port->count) {
33484 + if (atomic_read(&port->count)) {
33485 #ifdef ISDN_DEBUG_MODEM_OPEN
33486 printk(KERN_DEBUG "isdn_tty_close after info->count != 0\n");
33487 #endif
33488 @@ -1624,7 +1624,7 @@ isdn_tty_hangup(struct tty_struct *tty)
33489 if (isdn_tty_paranoia_check(info, tty->name, "isdn_tty_hangup"))
33490 return;
33491 isdn_tty_shutdown(info);
33492 - port->count = 0;
33493 + atomic_set(&port->count, 0);
33494 port->flags &= ~ASYNC_NORMAL_ACTIVE;
33495 port->tty = NULL;
33496 wake_up_interruptible(&port->open_wait);
33497 @@ -1964,7 +1964,7 @@ isdn_tty_find_icall(int di, int ch, setup_parm *setup)
33498 for (i = 0; i < ISDN_MAX_CHANNELS; i++) {
33499 modem_info *info = &dev->mdm.info[i];
33500
33501 - if (info->port.count == 0)
33502 + if (atomic_read(&info->port.count) == 0)
33503 continue;
33504 if ((info->emu.mdmreg[REG_SI1] & si2bit[si1]) && /* SI1 is matching */
33505 (info->emu.mdmreg[REG_SI2] == si2)) { /* SI2 is matching */
33506 diff --git a/drivers/isdn/icn/icn.c b/drivers/isdn/icn/icn.c
33507 index e74df7c..03a03ba 100644
33508 --- a/drivers/isdn/icn/icn.c
33509 +++ b/drivers/isdn/icn/icn.c
33510 @@ -1045,7 +1045,7 @@ icn_writecmd(const u_char *buf, int len, int user, icn_card *card)
33511 if (count > len)
33512 count = len;
33513 if (user) {
33514 - if (copy_from_user(msg, buf, count))
33515 + if (count > sizeof msg || copy_from_user(msg, buf, count))
33516 return -EFAULT;
33517 } else
33518 memcpy(msg, buf, count);
33519 diff --git a/drivers/lguest/core.c b/drivers/lguest/core.c
33520 index b5fdcb7..5b6c59f 100644
33521 --- a/drivers/lguest/core.c
33522 +++ b/drivers/lguest/core.c
33523 @@ -92,9 +92,17 @@ static __init int map_switcher(void)
33524 * it's worked so far. The end address needs +1 because __get_vm_area
33525 * allocates an extra guard page, so we need space for that.
33526 */
33527 +
33528 +#if defined(CONFIG_MODULES) && defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
33529 + switcher_vma = __get_vm_area(TOTAL_SWITCHER_PAGES * PAGE_SIZE,
33530 + VM_ALLOC | VM_KERNEXEC, SWITCHER_ADDR, SWITCHER_ADDR
33531 + + (TOTAL_SWITCHER_PAGES+1) * PAGE_SIZE);
33532 +#else
33533 switcher_vma = __get_vm_area(TOTAL_SWITCHER_PAGES * PAGE_SIZE,
33534 VM_ALLOC, SWITCHER_ADDR, SWITCHER_ADDR
33535 + (TOTAL_SWITCHER_PAGES+1) * PAGE_SIZE);
33536 +#endif
33537 +
33538 if (!switcher_vma) {
33539 err = -ENOMEM;
33540 printk("lguest: could not map switcher pages high\n");
33541 @@ -119,7 +127,7 @@ static __init int map_switcher(void)
33542 * Now the Switcher is mapped at the right address, we can't fail!
33543 * Copy in the compiled-in Switcher code (from x86/switcher_32.S).
33544 */
33545 - memcpy(switcher_vma->addr, start_switcher_text,
33546 + memcpy(switcher_vma->addr, ktla_ktva(start_switcher_text),
33547 end_switcher_text - start_switcher_text);
33548
33549 printk(KERN_INFO "lguest: mapped switcher at %p\n",
33550 diff --git a/drivers/lguest/x86/core.c b/drivers/lguest/x86/core.c
33551 index 39809035..ce25c5e 100644
33552 --- a/drivers/lguest/x86/core.c
33553 +++ b/drivers/lguest/x86/core.c
33554 @@ -59,7 +59,7 @@ static struct {
33555 /* Offset from where switcher.S was compiled to where we've copied it */
33556 static unsigned long switcher_offset(void)
33557 {
33558 - return SWITCHER_ADDR - (unsigned long)start_switcher_text;
33559 + return SWITCHER_ADDR - (unsigned long)ktla_ktva(start_switcher_text);
33560 }
33561
33562 /* This cpu's struct lguest_pages. */
33563 @@ -100,7 +100,13 @@ static void copy_in_guest_info(struct lg_cpu *cpu, struct lguest_pages *pages)
33564 * These copies are pretty cheap, so we do them unconditionally: */
33565 /* Save the current Host top-level page directory.
33566 */
33567 +
33568 +#ifdef CONFIG_PAX_PER_CPU_PGD
33569 + pages->state.host_cr3 = read_cr3();
33570 +#else
33571 pages->state.host_cr3 = __pa(current->mm->pgd);
33572 +#endif
33573 +
33574 /*
33575 * Set up the Guest's page tables to see this CPU's pages (and no
33576 * other CPU's pages).
33577 @@ -472,7 +478,7 @@ void __init lguest_arch_host_init(void)
33578 * compiled-in switcher code and the high-mapped copy we just made.
33579 */
33580 for (i = 0; i < IDT_ENTRIES; i++)
33581 - default_idt_entries[i] += switcher_offset();
33582 + default_idt_entries[i] = ktla_ktva(default_idt_entries[i]) + switcher_offset();
33583
33584 /*
33585 * Set up the Switcher's per-cpu areas.
33586 @@ -555,7 +561,7 @@ void __init lguest_arch_host_init(void)
33587 * it will be undisturbed when we switch. To change %cs and jump we
33588 * need this structure to feed to Intel's "lcall" instruction.
33589 */
33590 - lguest_entry.offset = (long)switch_to_guest + switcher_offset();
33591 + lguest_entry.offset = (long)ktla_ktva(switch_to_guest) + switcher_offset();
33592 lguest_entry.segment = LGUEST_CS;
33593
33594 /*
33595 diff --git a/drivers/lguest/x86/switcher_32.S b/drivers/lguest/x86/switcher_32.S
33596 index 40634b0..4f5855e 100644
33597 --- a/drivers/lguest/x86/switcher_32.S
33598 +++ b/drivers/lguest/x86/switcher_32.S
33599 @@ -87,6 +87,7 @@
33600 #include <asm/page.h>
33601 #include <asm/segment.h>
33602 #include <asm/lguest.h>
33603 +#include <asm/processor-flags.h>
33604
33605 // We mark the start of the code to copy
33606 // It's placed in .text tho it's never run here
33607 @@ -149,6 +150,13 @@ ENTRY(switch_to_guest)
33608 // Changes type when we load it: damn Intel!
33609 // For after we switch over our page tables
33610 // That entry will be read-only: we'd crash.
33611 +
33612 +#ifdef CONFIG_PAX_KERNEXEC
33613 + mov %cr0, %edx
33614 + xor $X86_CR0_WP, %edx
33615 + mov %edx, %cr0
33616 +#endif
33617 +
33618 movl $(GDT_ENTRY_TSS*8), %edx
33619 ltr %dx
33620
33621 @@ -157,9 +165,15 @@ ENTRY(switch_to_guest)
33622 // Let's clear it again for our return.
33623 // The GDT descriptor of the Host
33624 // Points to the table after two "size" bytes
33625 - movl (LGUEST_PAGES_host_gdt_desc+2)(%eax), %edx
33626 + movl (LGUEST_PAGES_host_gdt_desc+2)(%eax), %eax
33627 // Clear "used" from type field (byte 5, bit 2)
33628 - andb $0xFD, (GDT_ENTRY_TSS*8 + 5)(%edx)
33629 + andb $0xFD, (GDT_ENTRY_TSS*8 + 5)(%eax)
33630 +
33631 +#ifdef CONFIG_PAX_KERNEXEC
33632 + mov %cr0, %eax
33633 + xor $X86_CR0_WP, %eax
33634 + mov %eax, %cr0
33635 +#endif
33636
33637 // Once our page table's switched, the Guest is live!
33638 // The Host fades as we run this final step.
33639 @@ -295,13 +309,12 @@ deliver_to_host:
33640 // I consulted gcc, and it gave
33641 // These instructions, which I gladly credit:
33642 leal (%edx,%ebx,8), %eax
33643 - movzwl (%eax),%edx
33644 - movl 4(%eax), %eax
33645 - xorw %ax, %ax
33646 - orl %eax, %edx
33647 + movl 4(%eax), %edx
33648 + movw (%eax), %dx
33649 // Now the address of the handler's in %edx
33650 // We call it now: its "iret" drops us home.
33651 - jmp *%edx
33652 + ljmp $__KERNEL_CS, $1f
33653 +1: jmp *%edx
33654
33655 // Every interrupt can come to us here
33656 // But we must truly tell each apart.
33657 diff --git a/drivers/macintosh/macio_asic.c b/drivers/macintosh/macio_asic.c
33658 index 20e5c2c..9e849a9 100644
33659 --- a/drivers/macintosh/macio_asic.c
33660 +++ b/drivers/macintosh/macio_asic.c
33661 @@ -748,7 +748,7 @@ static void __devexit macio_pci_remove(struct pci_dev* pdev)
33662 * MacIO is matched against any Apple ID, it's probe() function
33663 * will then decide wether it applies or not
33664 */
33665 -static const struct pci_device_id __devinitdata pci_ids [] = { {
33666 +static const struct pci_device_id __devinitconst pci_ids [] = { {
33667 .vendor = PCI_VENDOR_ID_APPLE,
33668 .device = PCI_ANY_ID,
33669 .subvendor = PCI_ANY_ID,
33670 diff --git a/drivers/md/bitmap.c b/drivers/md/bitmap.c
33671 index 94e7f6b..2f4a0d8 100644
33672 --- a/drivers/md/bitmap.c
33673 +++ b/drivers/md/bitmap.c
33674 @@ -1786,7 +1786,7 @@ void bitmap_status(struct seq_file *seq, struct bitmap *bitmap)
33675 chunk_kb ? "KB" : "B");
33676 if (bitmap->storage.file) {
33677 seq_printf(seq, ", file: ");
33678 - seq_path(seq, &bitmap->storage.file->f_path, " \t\n");
33679 + seq_path(seq, &bitmap->storage.file->f_path, " \t\n\\");
33680 }
33681
33682 seq_printf(seq, "\n");
33683 diff --git a/drivers/md/dm-ioctl.c b/drivers/md/dm-ioctl.c
33684 index afd9598..528d8f9 100644
33685 --- a/drivers/md/dm-ioctl.c
33686 +++ b/drivers/md/dm-ioctl.c
33687 @@ -1593,7 +1593,7 @@ static int validate_params(uint cmd, struct dm_ioctl *param)
33688 cmd == DM_LIST_VERSIONS_CMD)
33689 return 0;
33690
33691 - if ((cmd == DM_DEV_CREATE_CMD)) {
33692 + if (cmd == DM_DEV_CREATE_CMD) {
33693 if (!*param->name) {
33694 DMWARN("name not supplied when creating device");
33695 return -EINVAL;
33696 diff --git a/drivers/md/dm-raid1.c b/drivers/md/dm-raid1.c
33697 index bc5ddba8..b961159 100644
33698 --- a/drivers/md/dm-raid1.c
33699 +++ b/drivers/md/dm-raid1.c
33700 @@ -40,7 +40,7 @@ enum dm_raid1_error {
33701
33702 struct mirror {
33703 struct mirror_set *ms;
33704 - atomic_t error_count;
33705 + atomic_unchecked_t error_count;
33706 unsigned long error_type;
33707 struct dm_dev *dev;
33708 sector_t offset;
33709 @@ -185,7 +185,7 @@ static struct mirror *get_valid_mirror(struct mirror_set *ms)
33710 struct mirror *m;
33711
33712 for (m = ms->mirror; m < ms->mirror + ms->nr_mirrors; m++)
33713 - if (!atomic_read(&m->error_count))
33714 + if (!atomic_read_unchecked(&m->error_count))
33715 return m;
33716
33717 return NULL;
33718 @@ -217,7 +217,7 @@ static void fail_mirror(struct mirror *m, enum dm_raid1_error error_type)
33719 * simple way to tell if a device has encountered
33720 * errors.
33721 */
33722 - atomic_inc(&m->error_count);
33723 + atomic_inc_unchecked(&m->error_count);
33724
33725 if (test_and_set_bit(error_type, &m->error_type))
33726 return;
33727 @@ -408,7 +408,7 @@ static struct mirror *choose_mirror(struct mirror_set *ms, sector_t sector)
33728 struct mirror *m = get_default_mirror(ms);
33729
33730 do {
33731 - if (likely(!atomic_read(&m->error_count)))
33732 + if (likely(!atomic_read_unchecked(&m->error_count)))
33733 return m;
33734
33735 if (m-- == ms->mirror)
33736 @@ -422,7 +422,7 @@ static int default_ok(struct mirror *m)
33737 {
33738 struct mirror *default_mirror = get_default_mirror(m->ms);
33739
33740 - return !atomic_read(&default_mirror->error_count);
33741 + return !atomic_read_unchecked(&default_mirror->error_count);
33742 }
33743
33744 static int mirror_available(struct mirror_set *ms, struct bio *bio)
33745 @@ -559,7 +559,7 @@ static void do_reads(struct mirror_set *ms, struct bio_list *reads)
33746 */
33747 if (likely(region_in_sync(ms, region, 1)))
33748 m = choose_mirror(ms, bio->bi_sector);
33749 - else if (m && atomic_read(&m->error_count))
33750 + else if (m && atomic_read_unchecked(&m->error_count))
33751 m = NULL;
33752
33753 if (likely(m))
33754 @@ -938,7 +938,7 @@ static int get_mirror(struct mirror_set *ms, struct dm_target *ti,
33755 }
33756
33757 ms->mirror[mirror].ms = ms;
33758 - atomic_set(&(ms->mirror[mirror].error_count), 0);
33759 + atomic_set_unchecked(&(ms->mirror[mirror].error_count), 0);
33760 ms->mirror[mirror].error_type = 0;
33761 ms->mirror[mirror].offset = offset;
33762
33763 @@ -1356,7 +1356,7 @@ static void mirror_resume(struct dm_target *ti)
33764 */
33765 static char device_status_char(struct mirror *m)
33766 {
33767 - if (!atomic_read(&(m->error_count)))
33768 + if (!atomic_read_unchecked(&(m->error_count)))
33769 return 'A';
33770
33771 return (test_bit(DM_RAID1_FLUSH_ERROR, &(m->error_type))) ? 'F' :
33772 diff --git a/drivers/md/dm-stripe.c b/drivers/md/dm-stripe.c
33773 index a087bf2..4c94786 100644
33774 --- a/drivers/md/dm-stripe.c
33775 +++ b/drivers/md/dm-stripe.c
33776 @@ -20,7 +20,7 @@ struct stripe {
33777 struct dm_dev *dev;
33778 sector_t physical_start;
33779
33780 - atomic_t error_count;
33781 + atomic_unchecked_t error_count;
33782 };
33783
33784 struct stripe_c {
33785 @@ -183,7 +183,7 @@ static int stripe_ctr(struct dm_target *ti, unsigned int argc, char **argv)
33786 kfree(sc);
33787 return r;
33788 }
33789 - atomic_set(&(sc->stripe[i].error_count), 0);
33790 + atomic_set_unchecked(&(sc->stripe[i].error_count), 0);
33791 }
33792
33793 ti->private = sc;
33794 @@ -324,7 +324,7 @@ static int stripe_status(struct dm_target *ti, status_type_t type,
33795 DMEMIT("%d ", sc->stripes);
33796 for (i = 0; i < sc->stripes; i++) {
33797 DMEMIT("%s ", sc->stripe[i].dev->name);
33798 - buffer[i] = atomic_read(&(sc->stripe[i].error_count)) ?
33799 + buffer[i] = atomic_read_unchecked(&(sc->stripe[i].error_count)) ?
33800 'D' : 'A';
33801 }
33802 buffer[i] = '\0';
33803 @@ -371,8 +371,8 @@ static int stripe_end_io(struct dm_target *ti, struct bio *bio,
33804 */
33805 for (i = 0; i < sc->stripes; i++)
33806 if (!strcmp(sc->stripe[i].dev->name, major_minor)) {
33807 - atomic_inc(&(sc->stripe[i].error_count));
33808 - if (atomic_read(&(sc->stripe[i].error_count)) <
33809 + atomic_inc_unchecked(&(sc->stripe[i].error_count));
33810 + if (atomic_read_unchecked(&(sc->stripe[i].error_count)) <
33811 DM_IO_ERROR_THRESHOLD)
33812 schedule_work(&sc->trigger_event);
33813 }
33814 diff --git a/drivers/md/dm-table.c b/drivers/md/dm-table.c
33815 index 100368e..64262ce 100644
33816 --- a/drivers/md/dm-table.c
33817 +++ b/drivers/md/dm-table.c
33818 @@ -390,7 +390,7 @@ static int device_area_is_invalid(struct dm_target *ti, struct dm_dev *dev,
33819 if (!dev_size)
33820 return 0;
33821
33822 - if ((start >= dev_size) || (start + len > dev_size)) {
33823 + if ((start >= dev_size) || (len > dev_size - start)) {
33824 DMWARN("%s: %s too small for target: "
33825 "start=%llu, len=%llu, dev_size=%llu",
33826 dm_device_name(ti->table->md), bdevname(bdev, b),
33827 diff --git a/drivers/md/dm-thin-metadata.c b/drivers/md/dm-thin-metadata.c
33828 index 693e149..b7e0fde 100644
33829 --- a/drivers/md/dm-thin-metadata.c
33830 +++ b/drivers/md/dm-thin-metadata.c
33831 @@ -397,7 +397,7 @@ static void __setup_btree_details(struct dm_pool_metadata *pmd)
33832 {
33833 pmd->info.tm = pmd->tm;
33834 pmd->info.levels = 2;
33835 - pmd->info.value_type.context = pmd->data_sm;
33836 + pmd->info.value_type.context = (dm_space_map_no_const *)pmd->data_sm;
33837 pmd->info.value_type.size = sizeof(__le64);
33838 pmd->info.value_type.inc = data_block_inc;
33839 pmd->info.value_type.dec = data_block_dec;
33840 @@ -416,7 +416,7 @@ static void __setup_btree_details(struct dm_pool_metadata *pmd)
33841
33842 pmd->bl_info.tm = pmd->tm;
33843 pmd->bl_info.levels = 1;
33844 - pmd->bl_info.value_type.context = pmd->data_sm;
33845 + pmd->bl_info.value_type.context = (dm_space_map_no_const *)pmd->data_sm;
33846 pmd->bl_info.value_type.size = sizeof(__le64);
33847 pmd->bl_info.value_type.inc = data_block_inc;
33848 pmd->bl_info.value_type.dec = data_block_dec;
33849 diff --git a/drivers/md/dm.c b/drivers/md/dm.c
33850 index 67ffa39..cb3b1dd 100644
33851 --- a/drivers/md/dm.c
33852 +++ b/drivers/md/dm.c
33853 @@ -176,9 +176,9 @@ struct mapped_device {
33854 /*
33855 * Event handling.
33856 */
33857 - atomic_t event_nr;
33858 + atomic_unchecked_t event_nr;
33859 wait_queue_head_t eventq;
33860 - atomic_t uevent_seq;
33861 + atomic_unchecked_t uevent_seq;
33862 struct list_head uevent_list;
33863 spinlock_t uevent_lock; /* Protect access to uevent_list */
33864
33865 @@ -1887,8 +1887,8 @@ static struct mapped_device *alloc_dev(int minor)
33866 rwlock_init(&md->map_lock);
33867 atomic_set(&md->holders, 1);
33868 atomic_set(&md->open_count, 0);
33869 - atomic_set(&md->event_nr, 0);
33870 - atomic_set(&md->uevent_seq, 0);
33871 + atomic_set_unchecked(&md->event_nr, 0);
33872 + atomic_set_unchecked(&md->uevent_seq, 0);
33873 INIT_LIST_HEAD(&md->uevent_list);
33874 spin_lock_init(&md->uevent_lock);
33875
33876 @@ -2022,7 +2022,7 @@ static void event_callback(void *context)
33877
33878 dm_send_uevents(&uevents, &disk_to_dev(md->disk)->kobj);
33879
33880 - atomic_inc(&md->event_nr);
33881 + atomic_inc_unchecked(&md->event_nr);
33882 wake_up(&md->eventq);
33883 }
33884
33885 @@ -2677,18 +2677,18 @@ int dm_kobject_uevent(struct mapped_device *md, enum kobject_action action,
33886
33887 uint32_t dm_next_uevent_seq(struct mapped_device *md)
33888 {
33889 - return atomic_add_return(1, &md->uevent_seq);
33890 + return atomic_add_return_unchecked(1, &md->uevent_seq);
33891 }
33892
33893 uint32_t dm_get_event_nr(struct mapped_device *md)
33894 {
33895 - return atomic_read(&md->event_nr);
33896 + return atomic_read_unchecked(&md->event_nr);
33897 }
33898
33899 int dm_wait_event(struct mapped_device *md, int event_nr)
33900 {
33901 return wait_event_interruptible(md->eventq,
33902 - (event_nr != atomic_read(&md->event_nr)));
33903 + (event_nr != atomic_read_unchecked(&md->event_nr)));
33904 }
33905
33906 void dm_uevent_add(struct mapped_device *md, struct list_head *elist)
33907 diff --git a/drivers/md/md.c b/drivers/md/md.c
33908 index 308e87b..7f365d6 100644
33909 --- a/drivers/md/md.c
33910 +++ b/drivers/md/md.c
33911 @@ -277,10 +277,10 @@ EXPORT_SYMBOL_GPL(md_trim_bio);
33912 * start build, activate spare
33913 */
33914 static DECLARE_WAIT_QUEUE_HEAD(md_event_waiters);
33915 -static atomic_t md_event_count;
33916 +static atomic_unchecked_t md_event_count;
33917 void md_new_event(struct mddev *mddev)
33918 {
33919 - atomic_inc(&md_event_count);
33920 + atomic_inc_unchecked(&md_event_count);
33921 wake_up(&md_event_waiters);
33922 }
33923 EXPORT_SYMBOL_GPL(md_new_event);
33924 @@ -290,7 +290,7 @@ EXPORT_SYMBOL_GPL(md_new_event);
33925 */
33926 static void md_new_event_inintr(struct mddev *mddev)
33927 {
33928 - atomic_inc(&md_event_count);
33929 + atomic_inc_unchecked(&md_event_count);
33930 wake_up(&md_event_waiters);
33931 }
33932
33933 @@ -1519,7 +1519,7 @@ static int super_1_load(struct md_rdev *rdev, struct md_rdev *refdev, int minor_
33934 if ((le32_to_cpu(sb->feature_map) & MD_FEATURE_RESHAPE_ACTIVE) &&
33935 (le32_to_cpu(sb->feature_map) & MD_FEATURE_NEW_OFFSET))
33936 rdev->new_data_offset += (s32)le32_to_cpu(sb->new_offset);
33937 - atomic_set(&rdev->corrected_errors, le32_to_cpu(sb->cnt_corrected_read));
33938 + atomic_set_unchecked(&rdev->corrected_errors, le32_to_cpu(sb->cnt_corrected_read));
33939
33940 rdev->sb_size = le32_to_cpu(sb->max_dev) * 2 + 256;
33941 bmask = queue_logical_block_size(rdev->bdev->bd_disk->queue)-1;
33942 @@ -1763,7 +1763,7 @@ static void super_1_sync(struct mddev *mddev, struct md_rdev *rdev)
33943 else
33944 sb->resync_offset = cpu_to_le64(0);
33945
33946 - sb->cnt_corrected_read = cpu_to_le32(atomic_read(&rdev->corrected_errors));
33947 + sb->cnt_corrected_read = cpu_to_le32(atomic_read_unchecked(&rdev->corrected_errors));
33948
33949 sb->raid_disks = cpu_to_le32(mddev->raid_disks);
33950 sb->size = cpu_to_le64(mddev->dev_sectors);
33951 @@ -2757,7 +2757,7 @@ __ATTR(state, S_IRUGO|S_IWUSR, state_show, state_store);
33952 static ssize_t
33953 errors_show(struct md_rdev *rdev, char *page)
33954 {
33955 - return sprintf(page, "%d\n", atomic_read(&rdev->corrected_errors));
33956 + return sprintf(page, "%d\n", atomic_read_unchecked(&rdev->corrected_errors));
33957 }
33958
33959 static ssize_t
33960 @@ -2766,7 +2766,7 @@ errors_store(struct md_rdev *rdev, const char *buf, size_t len)
33961 char *e;
33962 unsigned long n = simple_strtoul(buf, &e, 10);
33963 if (*buf && (*e == 0 || *e == '\n')) {
33964 - atomic_set(&rdev->corrected_errors, n);
33965 + atomic_set_unchecked(&rdev->corrected_errors, n);
33966 return len;
33967 }
33968 return -EINVAL;
33969 @@ -3213,8 +3213,8 @@ int md_rdev_init(struct md_rdev *rdev)
33970 rdev->sb_loaded = 0;
33971 rdev->bb_page = NULL;
33972 atomic_set(&rdev->nr_pending, 0);
33973 - atomic_set(&rdev->read_errors, 0);
33974 - atomic_set(&rdev->corrected_errors, 0);
33975 + atomic_set_unchecked(&rdev->read_errors, 0);
33976 + atomic_set_unchecked(&rdev->corrected_errors, 0);
33977
33978 INIT_LIST_HEAD(&rdev->same_set);
33979 init_waitqueue_head(&rdev->blocked_wait);
33980 @@ -6947,7 +6947,7 @@ static int md_seq_show(struct seq_file *seq, void *v)
33981
33982 spin_unlock(&pers_lock);
33983 seq_printf(seq, "\n");
33984 - seq->poll_event = atomic_read(&md_event_count);
33985 + seq->poll_event = atomic_read_unchecked(&md_event_count);
33986 return 0;
33987 }
33988 if (v == (void*)2) {
33989 @@ -7050,7 +7050,7 @@ static int md_seq_open(struct inode *inode, struct file *file)
33990 return error;
33991
33992 seq = file->private_data;
33993 - seq->poll_event = atomic_read(&md_event_count);
33994 + seq->poll_event = atomic_read_unchecked(&md_event_count);
33995 return error;
33996 }
33997
33998 @@ -7064,7 +7064,7 @@ static unsigned int mdstat_poll(struct file *filp, poll_table *wait)
33999 /* always allow read */
34000 mask = POLLIN | POLLRDNORM;
34001
34002 - if (seq->poll_event != atomic_read(&md_event_count))
34003 + if (seq->poll_event != atomic_read_unchecked(&md_event_count))
34004 mask |= POLLERR | POLLPRI;
34005 return mask;
34006 }
34007 @@ -7108,7 +7108,7 @@ static int is_mddev_idle(struct mddev *mddev, int init)
34008 struct gendisk *disk = rdev->bdev->bd_contains->bd_disk;
34009 curr_events = (int)part_stat_read(&disk->part0, sectors[0]) +
34010 (int)part_stat_read(&disk->part0, sectors[1]) -
34011 - atomic_read(&disk->sync_io);
34012 + atomic_read_unchecked(&disk->sync_io);
34013 /* sync IO will cause sync_io to increase before the disk_stats
34014 * as sync_io is counted when a request starts, and
34015 * disk_stats is counted when it completes.
34016 diff --git a/drivers/md/md.h b/drivers/md/md.h
34017 index f385b03..b600be8 100644
34018 --- a/drivers/md/md.h
34019 +++ b/drivers/md/md.h
34020 @@ -94,13 +94,13 @@ struct md_rdev {
34021 * only maintained for arrays that
34022 * support hot removal
34023 */
34024 - atomic_t read_errors; /* number of consecutive read errors that
34025 + atomic_unchecked_t read_errors; /* number of consecutive read errors that
34026 * we have tried to ignore.
34027 */
34028 struct timespec last_read_error; /* monotonic time since our
34029 * last read error
34030 */
34031 - atomic_t corrected_errors; /* number of corrected read errors,
34032 + atomic_unchecked_t corrected_errors; /* number of corrected read errors,
34033 * for reporting to userspace and storing
34034 * in superblock.
34035 */
34036 @@ -432,7 +432,7 @@ static inline void rdev_dec_pending(struct md_rdev *rdev, struct mddev *mddev)
34037
34038 static inline void md_sync_acct(struct block_device *bdev, unsigned long nr_sectors)
34039 {
34040 - atomic_add(nr_sectors, &bdev->bd_contains->bd_disk->sync_io);
34041 + atomic_add_unchecked(nr_sectors, &bdev->bd_contains->bd_disk->sync_io);
34042 }
34043
34044 struct md_personality
34045 diff --git a/drivers/md/persistent-data/dm-space-map-disk.c b/drivers/md/persistent-data/dm-space-map-disk.c
34046 index f6d29e6..7917f5e 100644
34047 --- a/drivers/md/persistent-data/dm-space-map-disk.c
34048 +++ b/drivers/md/persistent-data/dm-space-map-disk.c
34049 @@ -22,7 +22,7 @@
34050 * Space map interface.
34051 */
34052 struct sm_disk {
34053 - struct dm_space_map sm;
34054 + dm_space_map_no_const sm;
34055
34056 struct ll_disk ll;
34057 struct ll_disk old_ll;
34058 diff --git a/drivers/md/persistent-data/dm-space-map-metadata.c b/drivers/md/persistent-data/dm-space-map-metadata.c
34059 index e89ae5e..062e4c2 100644
34060 --- a/drivers/md/persistent-data/dm-space-map-metadata.c
34061 +++ b/drivers/md/persistent-data/dm-space-map-metadata.c
34062 @@ -43,7 +43,7 @@ struct block_op {
34063 };
34064
34065 struct sm_metadata {
34066 - struct dm_space_map sm;
34067 + dm_space_map_no_const sm;
34068
34069 struct ll_disk ll;
34070 struct ll_disk old_ll;
34071 diff --git a/drivers/md/persistent-data/dm-space-map.h b/drivers/md/persistent-data/dm-space-map.h
34072 index 1cbfc6b..56e1dbb 100644
34073 --- a/drivers/md/persistent-data/dm-space-map.h
34074 +++ b/drivers/md/persistent-data/dm-space-map.h
34075 @@ -60,6 +60,7 @@ struct dm_space_map {
34076 int (*root_size)(struct dm_space_map *sm, size_t *result);
34077 int (*copy_root)(struct dm_space_map *sm, void *copy_to_here_le, size_t len);
34078 };
34079 +typedef struct dm_space_map __no_const dm_space_map_no_const;
34080
34081 /*----------------------------------------------------------------*/
34082
34083 diff --git a/drivers/md/raid1.c b/drivers/md/raid1.c
34084 index 05bb49e..84d7ce6 100644
34085 --- a/drivers/md/raid1.c
34086 +++ b/drivers/md/raid1.c
34087 @@ -1810,7 +1810,7 @@ static int fix_sync_read_error(struct r1bio *r1_bio)
34088 if (r1_sync_page_io(rdev, sect, s,
34089 bio->bi_io_vec[idx].bv_page,
34090 READ) != 0)
34091 - atomic_add(s, &rdev->corrected_errors);
34092 + atomic_add_unchecked(s, &rdev->corrected_errors);
34093 }
34094 sectors -= s;
34095 sect += s;
34096 @@ -2032,7 +2032,7 @@ static void fix_read_error(struct r1conf *conf, int read_disk,
34097 test_bit(In_sync, &rdev->flags)) {
34098 if (r1_sync_page_io(rdev, sect, s,
34099 conf->tmppage, READ)) {
34100 - atomic_add(s, &rdev->corrected_errors);
34101 + atomic_add_unchecked(s, &rdev->corrected_errors);
34102 printk(KERN_INFO
34103 "md/raid1:%s: read error corrected "
34104 "(%d sectors at %llu on %s)\n",
34105 diff --git a/drivers/md/raid10.c b/drivers/md/raid10.c
34106 index a48c215..6bda6f4 100644
34107 --- a/drivers/md/raid10.c
34108 +++ b/drivers/md/raid10.c
34109 @@ -1810,7 +1810,7 @@ static void end_sync_read(struct bio *bio, int error)
34110 /* The write handler will notice the lack of
34111 * R10BIO_Uptodate and record any errors etc
34112 */
34113 - atomic_add(r10_bio->sectors,
34114 + atomic_add_unchecked(r10_bio->sectors,
34115 &conf->mirrors[d].rdev->corrected_errors);
34116
34117 /* for reconstruct, we always reschedule after a read.
34118 @@ -2159,7 +2159,7 @@ static void check_decay_read_errors(struct mddev *mddev, struct md_rdev *rdev)
34119 {
34120 struct timespec cur_time_mon;
34121 unsigned long hours_since_last;
34122 - unsigned int read_errors = atomic_read(&rdev->read_errors);
34123 + unsigned int read_errors = atomic_read_unchecked(&rdev->read_errors);
34124
34125 ktime_get_ts(&cur_time_mon);
34126
34127 @@ -2181,9 +2181,9 @@ static void check_decay_read_errors(struct mddev *mddev, struct md_rdev *rdev)
34128 * overflowing the shift of read_errors by hours_since_last.
34129 */
34130 if (hours_since_last >= 8 * sizeof(read_errors))
34131 - atomic_set(&rdev->read_errors, 0);
34132 + atomic_set_unchecked(&rdev->read_errors, 0);
34133 else
34134 - atomic_set(&rdev->read_errors, read_errors >> hours_since_last);
34135 + atomic_set_unchecked(&rdev->read_errors, read_errors >> hours_since_last);
34136 }
34137
34138 static int r10_sync_page_io(struct md_rdev *rdev, sector_t sector,
34139 @@ -2237,8 +2237,8 @@ static void fix_read_error(struct r10conf *conf, struct mddev *mddev, struct r10
34140 return;
34141
34142 check_decay_read_errors(mddev, rdev);
34143 - atomic_inc(&rdev->read_errors);
34144 - if (atomic_read(&rdev->read_errors) > max_read_errors) {
34145 + atomic_inc_unchecked(&rdev->read_errors);
34146 + if (atomic_read_unchecked(&rdev->read_errors) > max_read_errors) {
34147 char b[BDEVNAME_SIZE];
34148 bdevname(rdev->bdev, b);
34149
34150 @@ -2246,7 +2246,7 @@ static void fix_read_error(struct r10conf *conf, struct mddev *mddev, struct r10
34151 "md/raid10:%s: %s: Raid device exceeded "
34152 "read_error threshold [cur %d:max %d]\n",
34153 mdname(mddev), b,
34154 - atomic_read(&rdev->read_errors), max_read_errors);
34155 + atomic_read_unchecked(&rdev->read_errors), max_read_errors);
34156 printk(KERN_NOTICE
34157 "md/raid10:%s: %s: Failing raid device\n",
34158 mdname(mddev), b);
34159 @@ -2401,7 +2401,7 @@ static void fix_read_error(struct r10conf *conf, struct mddev *mddev, struct r10
34160 sect +
34161 choose_data_offset(r10_bio, rdev)),
34162 bdevname(rdev->bdev, b));
34163 - atomic_add(s, &rdev->corrected_errors);
34164 + atomic_add_unchecked(s, &rdev->corrected_errors);
34165 }
34166
34167 rdev_dec_pending(rdev, mddev);
34168 diff --git a/drivers/md/raid5.c b/drivers/md/raid5.c
34169 index 0689173..35df76c 100644
34170 --- a/drivers/md/raid5.c
34171 +++ b/drivers/md/raid5.c
34172 @@ -1756,21 +1756,21 @@ static void raid5_end_read_request(struct bio * bi, int error)
34173 mdname(conf->mddev), STRIPE_SECTORS,
34174 (unsigned long long)s,
34175 bdevname(rdev->bdev, b));
34176 - atomic_add(STRIPE_SECTORS, &rdev->corrected_errors);
34177 + atomic_add_unchecked(STRIPE_SECTORS, &rdev->corrected_errors);
34178 clear_bit(R5_ReadError, &sh->dev[i].flags);
34179 clear_bit(R5_ReWrite, &sh->dev[i].flags);
34180 } else if (test_bit(R5_ReadNoMerge, &sh->dev[i].flags))
34181 clear_bit(R5_ReadNoMerge, &sh->dev[i].flags);
34182
34183 - if (atomic_read(&rdev->read_errors))
34184 - atomic_set(&rdev->read_errors, 0);
34185 + if (atomic_read_unchecked(&rdev->read_errors))
34186 + atomic_set_unchecked(&rdev->read_errors, 0);
34187 } else {
34188 const char *bdn = bdevname(rdev->bdev, b);
34189 int retry = 0;
34190 int set_bad = 0;
34191
34192 clear_bit(R5_UPTODATE, &sh->dev[i].flags);
34193 - atomic_inc(&rdev->read_errors);
34194 + atomic_inc_unchecked(&rdev->read_errors);
34195 if (test_bit(R5_ReadRepl, &sh->dev[i].flags))
34196 printk_ratelimited(
34197 KERN_WARNING
34198 @@ -1798,7 +1798,7 @@ static void raid5_end_read_request(struct bio * bi, int error)
34199 mdname(conf->mddev),
34200 (unsigned long long)s,
34201 bdn);
34202 - } else if (atomic_read(&rdev->read_errors)
34203 + } else if (atomic_read_unchecked(&rdev->read_errors)
34204 > conf->max_nr_stripes)
34205 printk(KERN_WARNING
34206 "md/raid:%s: Too many read errors, failing device %s.\n",
34207 diff --git a/drivers/media/dvb/ddbridge/ddbridge-core.c b/drivers/media/dvb/ddbridge/ddbridge-core.c
34208 index ebf3f05..b1f3e77 100644
34209 --- a/drivers/media/dvb/ddbridge/ddbridge-core.c
34210 +++ b/drivers/media/dvb/ddbridge/ddbridge-core.c
34211 @@ -1679,7 +1679,7 @@ static struct ddb_info ddb_v6 = {
34212 .subvendor = _subvend, .subdevice = _subdev, \
34213 .driver_data = (unsigned long)&_driverdata }
34214
34215 -static const struct pci_device_id ddb_id_tbl[] __devinitdata = {
34216 +static const struct pci_device_id ddb_id_tbl[] __devinitconst = {
34217 DDB_ID(DDVID, 0x0002, DDVID, 0x0001, ddb_octopus),
34218 DDB_ID(DDVID, 0x0003, DDVID, 0x0001, ddb_octopus),
34219 DDB_ID(DDVID, 0x0003, DDVID, 0x0002, ddb_octopus_le),
34220 diff --git a/drivers/media/dvb/dvb-core/dvb_demux.h b/drivers/media/dvb/dvb-core/dvb_demux.h
34221 index fa7188a..04a045e 100644
34222 --- a/drivers/media/dvb/dvb-core/dvb_demux.h
34223 +++ b/drivers/media/dvb/dvb-core/dvb_demux.h
34224 @@ -73,7 +73,7 @@ struct dvb_demux_feed {
34225 union {
34226 dmx_ts_cb ts;
34227 dmx_section_cb sec;
34228 - } cb;
34229 + } __no_const cb;
34230
34231 struct dvb_demux *demux;
34232 void *priv;
34233 diff --git a/drivers/media/dvb/dvb-core/dvbdev.c b/drivers/media/dvb/dvb-core/dvbdev.c
34234 index 39eab73..60033e7 100644
34235 --- a/drivers/media/dvb/dvb-core/dvbdev.c
34236 +++ b/drivers/media/dvb/dvb-core/dvbdev.c
34237 @@ -192,7 +192,7 @@ int dvb_register_device(struct dvb_adapter *adap, struct dvb_device **pdvbdev,
34238 const struct dvb_device *template, void *priv, int type)
34239 {
34240 struct dvb_device *dvbdev;
34241 - struct file_operations *dvbdevfops;
34242 + file_operations_no_const *dvbdevfops;
34243 struct device *clsdev;
34244 int minor;
34245 int id;
34246 diff --git a/drivers/media/dvb/dvb-usb/cxusb.c b/drivers/media/dvb/dvb-usb/cxusb.c
34247 index 3940bb0..fb3952a 100644
34248 --- a/drivers/media/dvb/dvb-usb/cxusb.c
34249 +++ b/drivers/media/dvb/dvb-usb/cxusb.c
34250 @@ -1068,7 +1068,7 @@ static struct dib0070_config dib7070p_dib0070_config = {
34251
34252 struct dib0700_adapter_state {
34253 int (*set_param_save) (struct dvb_frontend *);
34254 -};
34255 +} __no_const;
34256
34257 static int dib7070_set_param_override(struct dvb_frontend *fe)
34258 {
34259 diff --git a/drivers/media/dvb/dvb-usb/dw2102.c b/drivers/media/dvb/dvb-usb/dw2102.c
34260 index 9382895..ac8093c 100644
34261 --- a/drivers/media/dvb/dvb-usb/dw2102.c
34262 +++ b/drivers/media/dvb/dvb-usb/dw2102.c
34263 @@ -95,7 +95,7 @@ struct su3000_state {
34264
34265 struct s6x0_state {
34266 int (*old_set_voltage)(struct dvb_frontend *f, fe_sec_voltage_t v);
34267 -};
34268 +} __no_const;
34269
34270 /* debug */
34271 static int dvb_usb_dw2102_debug;
34272 diff --git a/drivers/media/dvb/frontends/dib3000.h b/drivers/media/dvb/frontends/dib3000.h
34273 index 404f63a..4796533 100644
34274 --- a/drivers/media/dvb/frontends/dib3000.h
34275 +++ b/drivers/media/dvb/frontends/dib3000.h
34276 @@ -39,7 +39,7 @@ struct dib_fe_xfer_ops
34277 int (*fifo_ctrl)(struct dvb_frontend *fe, int onoff);
34278 int (*pid_ctrl)(struct dvb_frontend *fe, int index, int pid, int onoff);
34279 int (*tuner_pass_ctrl)(struct dvb_frontend *fe, int onoff, u8 pll_ctrl);
34280 -};
34281 +} __no_const;
34282
34283 #if defined(CONFIG_DVB_DIB3000MB) || (defined(CONFIG_DVB_DIB3000MB_MODULE) && defined(MODULE))
34284 extern struct dvb_frontend* dib3000mb_attach(const struct dib3000_config* config,
34285 diff --git a/drivers/media/dvb/ngene/ngene-cards.c b/drivers/media/dvb/ngene/ngene-cards.c
34286 index 72ee8de..eae0c80 100644
34287 --- a/drivers/media/dvb/ngene/ngene-cards.c
34288 +++ b/drivers/media/dvb/ngene/ngene-cards.c
34289 @@ -479,7 +479,7 @@ static struct ngene_info ngene_info_m780 = {
34290
34291 /****************************************************************************/
34292
34293 -static const struct pci_device_id ngene_id_tbl[] __devinitdata = {
34294 +static const struct pci_device_id ngene_id_tbl[] __devinitconst = {
34295 NGENE_ID(0x18c3, 0xabc3, ngene_info_cineS2),
34296 NGENE_ID(0x18c3, 0xabc4, ngene_info_cineS2),
34297 NGENE_ID(0x18c3, 0xdb01, ngene_info_satixS2),
34298 diff --git a/drivers/media/radio/radio-cadet.c b/drivers/media/radio/radio-cadet.c
34299 index 697a421..16c5a5f 100644
34300 --- a/drivers/media/radio/radio-cadet.c
34301 +++ b/drivers/media/radio/radio-cadet.c
34302 @@ -302,6 +302,8 @@ static ssize_t cadet_read(struct file *file, char __user *data, size_t count, lo
34303 unsigned char readbuf[RDS_BUFFER];
34304 int i = 0;
34305
34306 + if (count > RDS_BUFFER)
34307 + return -EFAULT;
34308 mutex_lock(&dev->lock);
34309 if (dev->rdsstat == 0)
34310 cadet_start_rds(dev);
34311 @@ -317,7 +319,7 @@ static ssize_t cadet_read(struct file *file, char __user *data, size_t count, lo
34312 while (i < count && dev->rdsin != dev->rdsout)
34313 readbuf[i++] = dev->rdsbuf[dev->rdsout++];
34314
34315 - if (i && copy_to_user(data, readbuf, i))
34316 + if (i > sizeof(readbuf) || copy_to_user(data, readbuf, i))
34317 i = -EFAULT;
34318 unlock:
34319 mutex_unlock(&dev->lock);
34320 diff --git a/drivers/media/radio/radio-tea5777.h b/drivers/media/radio/radio-tea5777.h
34321 index 55cbd78..428b0da 100644
34322 --- a/drivers/media/radio/radio-tea5777.h
34323 +++ b/drivers/media/radio/radio-tea5777.h
34324 @@ -63,7 +63,7 @@ struct radio_tea5777_ops {
34325
34326 struct radio_tea5777 {
34327 struct v4l2_device *v4l2_dev;
34328 - struct v4l2_file_operations fops;
34329 + v4l2_file_operations_no_const fops;
34330 struct video_device vd; /* video device */
34331 bool has_am; /* Device can tune to AM freqs */
34332 bool write_before_read; /* must write before read quirk */
34333 diff --git a/drivers/media/video/au0828/au0828.h b/drivers/media/video/au0828/au0828.h
34334 index 9cde353..8c6a1c3 100644
34335 --- a/drivers/media/video/au0828/au0828.h
34336 +++ b/drivers/media/video/au0828/au0828.h
34337 @@ -191,7 +191,7 @@ struct au0828_dev {
34338
34339 /* I2C */
34340 struct i2c_adapter i2c_adap;
34341 - struct i2c_algorithm i2c_algo;
34342 + i2c_algorithm_no_const i2c_algo;
34343 struct i2c_client i2c_client;
34344 u32 i2c_rc;
34345
34346 diff --git a/drivers/media/video/cx88/cx88-alsa.c b/drivers/media/video/cx88/cx88-alsa.c
34347 index dfac6e3..c26de31 100644
34348 --- a/drivers/media/video/cx88/cx88-alsa.c
34349 +++ b/drivers/media/video/cx88/cx88-alsa.c
34350 @@ -749,7 +749,7 @@ static struct snd_kcontrol_new snd_cx88_alc_switch = {
34351 * Only boards with eeprom and byte 1 at eeprom=1 have it
34352 */
34353
34354 -static const struct pci_device_id const cx88_audio_pci_tbl[] __devinitdata = {
34355 +static const struct pci_device_id const cx88_audio_pci_tbl[] __devinitconst = {
34356 {0x14f1,0x8801,PCI_ANY_ID,PCI_ANY_ID,0,0,0},
34357 {0x14f1,0x8811,PCI_ANY_ID,PCI_ANY_ID,0,0,0},
34358 {0, }
34359 diff --git a/drivers/media/video/omap/omap_vout.c b/drivers/media/video/omap/omap_vout.c
34360 index 88cf9d9..bbc4b2c 100644
34361 --- a/drivers/media/video/omap/omap_vout.c
34362 +++ b/drivers/media/video/omap/omap_vout.c
34363 @@ -64,7 +64,6 @@ enum omap_vout_channels {
34364 OMAP_VIDEO2,
34365 };
34366
34367 -static struct videobuf_queue_ops video_vbq_ops;
34368 /* Variables configurable through module params*/
34369 static u32 video1_numbuffers = 3;
34370 static u32 video2_numbuffers = 3;
34371 @@ -1000,6 +999,12 @@ static int omap_vout_open(struct file *file)
34372 {
34373 struct videobuf_queue *q;
34374 struct omap_vout_device *vout = NULL;
34375 + static struct videobuf_queue_ops video_vbq_ops = {
34376 + .buf_setup = omap_vout_buffer_setup,
34377 + .buf_prepare = omap_vout_buffer_prepare,
34378 + .buf_release = omap_vout_buffer_release,
34379 + .buf_queue = omap_vout_buffer_queue,
34380 + };
34381
34382 vout = video_drvdata(file);
34383 v4l2_dbg(1, debug, &vout->vid_dev->v4l2_dev, "Entering %s\n", __func__);
34384 @@ -1017,10 +1022,6 @@ static int omap_vout_open(struct file *file)
34385 vout->type = V4L2_BUF_TYPE_VIDEO_OUTPUT;
34386
34387 q = &vout->vbq;
34388 - video_vbq_ops.buf_setup = omap_vout_buffer_setup;
34389 - video_vbq_ops.buf_prepare = omap_vout_buffer_prepare;
34390 - video_vbq_ops.buf_release = omap_vout_buffer_release;
34391 - video_vbq_ops.buf_queue = omap_vout_buffer_queue;
34392 spin_lock_init(&vout->vbq_lock);
34393
34394 videobuf_queue_dma_contig_init(q, &video_vbq_ops, q->dev,
34395 diff --git a/drivers/media/video/pvrusb2/pvrusb2-hdw-internal.h b/drivers/media/video/pvrusb2/pvrusb2-hdw-internal.h
34396 index 036952f..80d356d 100644
34397 --- a/drivers/media/video/pvrusb2/pvrusb2-hdw-internal.h
34398 +++ b/drivers/media/video/pvrusb2/pvrusb2-hdw-internal.h
34399 @@ -196,7 +196,7 @@ struct pvr2_hdw {
34400
34401 /* I2C stuff */
34402 struct i2c_adapter i2c_adap;
34403 - struct i2c_algorithm i2c_algo;
34404 + i2c_algorithm_no_const i2c_algo;
34405 pvr2_i2c_func i2c_func[PVR2_I2C_FUNC_CNT];
34406 int i2c_cx25840_hack_state;
34407 int i2c_linked;
34408 diff --git a/drivers/media/video/timblogiw.c b/drivers/media/video/timblogiw.c
34409 index 02194c0..091733b 100644
34410 --- a/drivers/media/video/timblogiw.c
34411 +++ b/drivers/media/video/timblogiw.c
34412 @@ -745,7 +745,7 @@ static int timblogiw_mmap(struct file *file, struct vm_area_struct *vma)
34413
34414 /* Platform device functions */
34415
34416 -static __devinitconst struct v4l2_ioctl_ops timblogiw_ioctl_ops = {
34417 +static __devinitconst v4l2_ioctl_ops_no_const timblogiw_ioctl_ops = {
34418 .vidioc_querycap = timblogiw_querycap,
34419 .vidioc_enum_fmt_vid_cap = timblogiw_enum_fmt,
34420 .vidioc_g_fmt_vid_cap = timblogiw_g_fmt,
34421 @@ -767,7 +767,7 @@ static __devinitconst struct v4l2_ioctl_ops timblogiw_ioctl_ops = {
34422 .vidioc_enum_framesizes = timblogiw_enum_framesizes,
34423 };
34424
34425 -static __devinitconst struct v4l2_file_operations timblogiw_fops = {
34426 +static __devinitconst v4l2_file_operations_no_const timblogiw_fops = {
34427 .owner = THIS_MODULE,
34428 .open = timblogiw_open,
34429 .release = timblogiw_close,
34430 diff --git a/drivers/message/fusion/mptbase.c b/drivers/message/fusion/mptbase.c
34431 index d99db56..a16b959 100644
34432 --- a/drivers/message/fusion/mptbase.c
34433 +++ b/drivers/message/fusion/mptbase.c
34434 @@ -6751,8 +6751,13 @@ static int mpt_iocinfo_proc_show(struct seq_file *m, void *v)
34435 seq_printf(m, " MaxChainDepth = 0x%02x frames\n", ioc->facts.MaxChainDepth);
34436 seq_printf(m, " MinBlockSize = 0x%02x bytes\n", 4*ioc->facts.BlockSize);
34437
34438 +#ifdef CONFIG_GRKERNSEC_HIDESYM
34439 + seq_printf(m, " RequestFrames @ 0x%p (Dma @ 0x%p)\n", NULL, NULL);
34440 +#else
34441 seq_printf(m, " RequestFrames @ 0x%p (Dma @ 0x%p)\n",
34442 (void *)ioc->req_frames, (void *)(ulong)ioc->req_frames_dma);
34443 +#endif
34444 +
34445 /*
34446 * Rounding UP to nearest 4-kB boundary here...
34447 */
34448 diff --git a/drivers/message/fusion/mptsas.c b/drivers/message/fusion/mptsas.c
34449 index 551262e..7551198 100644
34450 --- a/drivers/message/fusion/mptsas.c
34451 +++ b/drivers/message/fusion/mptsas.c
34452 @@ -446,6 +446,23 @@ mptsas_is_end_device(struct mptsas_devinfo * attached)
34453 return 0;
34454 }
34455
34456 +static inline void
34457 +mptsas_set_rphy(MPT_ADAPTER *ioc, struct mptsas_phyinfo *phy_info, struct sas_rphy *rphy)
34458 +{
34459 + if (phy_info->port_details) {
34460 + phy_info->port_details->rphy = rphy;
34461 + dsaswideprintk(ioc, printk(MYIOC_s_DEBUG_FMT "sas_rphy_add: rphy=%p\n",
34462 + ioc->name, rphy));
34463 + }
34464 +
34465 + if (rphy) {
34466 + dsaswideprintk(ioc, dev_printk(KERN_DEBUG,
34467 + &rphy->dev, MYIOC_s_FMT "add:", ioc->name));
34468 + dsaswideprintk(ioc, printk(MYIOC_s_DEBUG_FMT "rphy=%p release=%p\n",
34469 + ioc->name, rphy, rphy->dev.release));
34470 + }
34471 +}
34472 +
34473 /* no mutex */
34474 static void
34475 mptsas_port_delete(MPT_ADAPTER *ioc, struct mptsas_portinfo_details * port_details)
34476 @@ -484,23 +501,6 @@ mptsas_get_rphy(struct mptsas_phyinfo *phy_info)
34477 return NULL;
34478 }
34479
34480 -static inline void
34481 -mptsas_set_rphy(MPT_ADAPTER *ioc, struct mptsas_phyinfo *phy_info, struct sas_rphy *rphy)
34482 -{
34483 - if (phy_info->port_details) {
34484 - phy_info->port_details->rphy = rphy;
34485 - dsaswideprintk(ioc, printk(MYIOC_s_DEBUG_FMT "sas_rphy_add: rphy=%p\n",
34486 - ioc->name, rphy));
34487 - }
34488 -
34489 - if (rphy) {
34490 - dsaswideprintk(ioc, dev_printk(KERN_DEBUG,
34491 - &rphy->dev, MYIOC_s_FMT "add:", ioc->name));
34492 - dsaswideprintk(ioc, printk(MYIOC_s_DEBUG_FMT "rphy=%p release=%p\n",
34493 - ioc->name, rphy, rphy->dev.release));
34494 - }
34495 -}
34496 -
34497 static inline struct sas_port *
34498 mptsas_get_port(struct mptsas_phyinfo *phy_info)
34499 {
34500 diff --git a/drivers/message/fusion/mptscsih.c b/drivers/message/fusion/mptscsih.c
34501 index 0c3ced7..1fe34ec 100644
34502 --- a/drivers/message/fusion/mptscsih.c
34503 +++ b/drivers/message/fusion/mptscsih.c
34504 @@ -1270,15 +1270,16 @@ mptscsih_info(struct Scsi_Host *SChost)
34505
34506 h = shost_priv(SChost);
34507
34508 - if (h) {
34509 - if (h->info_kbuf == NULL)
34510 - if ((h->info_kbuf = kmalloc(0x1000 /* 4Kb */, GFP_KERNEL)) == NULL)
34511 - return h->info_kbuf;
34512 - h->info_kbuf[0] = '\0';
34513 + if (!h)
34514 + return NULL;
34515
34516 - mpt_print_ioc_summary(h->ioc, h->info_kbuf, &size, 0, 0);
34517 - h->info_kbuf[size-1] = '\0';
34518 - }
34519 + if (h->info_kbuf == NULL)
34520 + if ((h->info_kbuf = kmalloc(0x1000 /* 4Kb */, GFP_KERNEL)) == NULL)
34521 + return h->info_kbuf;
34522 + h->info_kbuf[0] = '\0';
34523 +
34524 + mpt_print_ioc_summary(h->ioc, h->info_kbuf, &size, 0, 0);
34525 + h->info_kbuf[size-1] = '\0';
34526
34527 return h->info_kbuf;
34528 }
34529 diff --git a/drivers/message/i2o/i2o_proc.c b/drivers/message/i2o/i2o_proc.c
34530 index 8001aa6..b137580 100644
34531 --- a/drivers/message/i2o/i2o_proc.c
34532 +++ b/drivers/message/i2o/i2o_proc.c
34533 @@ -255,12 +255,6 @@ static char *scsi_devices[] = {
34534 "Array Controller Device"
34535 };
34536
34537 -static char *chtostr(char *tmp, u8 *chars, int n)
34538 -{
34539 - tmp[0] = 0;
34540 - return strncat(tmp, (char *)chars, n);
34541 -}
34542 -
34543 static int i2o_report_query_status(struct seq_file *seq, int block_status,
34544 char *group)
34545 {
34546 @@ -790,7 +784,6 @@ static int i2o_seq_show_ddm_table(struct seq_file *seq, void *v)
34547 } *result;
34548
34549 i2o_exec_execute_ddm_table ddm_table;
34550 - char tmp[28 + 1];
34551
34552 result = kmalloc(sizeof(*result), GFP_KERNEL);
34553 if (!result)
34554 @@ -825,8 +818,7 @@ static int i2o_seq_show_ddm_table(struct seq_file *seq, void *v)
34555
34556 seq_printf(seq, "%-#7x", ddm_table.i2o_vendor_id);
34557 seq_printf(seq, "%-#8x", ddm_table.module_id);
34558 - seq_printf(seq, "%-29s",
34559 - chtostr(tmp, ddm_table.module_name_version, 28));
34560 + seq_printf(seq, "%-.28s", ddm_table.module_name_version);
34561 seq_printf(seq, "%9d ", ddm_table.data_size);
34562 seq_printf(seq, "%8d", ddm_table.code_size);
34563
34564 @@ -893,7 +885,6 @@ static int i2o_seq_show_drivers_stored(struct seq_file *seq, void *v)
34565
34566 i2o_driver_result_table *result;
34567 i2o_driver_store_table *dst;
34568 - char tmp[28 + 1];
34569
34570 result = kmalloc(sizeof(i2o_driver_result_table), GFP_KERNEL);
34571 if (result == NULL)
34572 @@ -928,9 +919,8 @@ static int i2o_seq_show_drivers_stored(struct seq_file *seq, void *v)
34573
34574 seq_printf(seq, "%-#7x", dst->i2o_vendor_id);
34575 seq_printf(seq, "%-#8x", dst->module_id);
34576 - seq_printf(seq, "%-29s",
34577 - chtostr(tmp, dst->module_name_version, 28));
34578 - seq_printf(seq, "%-9s", chtostr(tmp, dst->date, 8));
34579 + seq_printf(seq, "%-.28s", dst->module_name_version);
34580 + seq_printf(seq, "%-.8s", dst->date);
34581 seq_printf(seq, "%8d ", dst->module_size);
34582 seq_printf(seq, "%8d ", dst->mpb_size);
34583 seq_printf(seq, "0x%04x", dst->module_flags);
34584 @@ -1250,7 +1240,6 @@ static int i2o_seq_show_dev_identity(struct seq_file *seq, void *v)
34585 // == (allow) 512d bytes (max)
34586 static u16 *work16 = (u16 *) work32;
34587 int token;
34588 - char tmp[16 + 1];
34589
34590 token = i2o_parm_field_get(d, 0xF100, -1, &work32, sizeof(work32));
34591
34592 @@ -1262,14 +1251,10 @@ static int i2o_seq_show_dev_identity(struct seq_file *seq, void *v)
34593 seq_printf(seq, "Device Class : %s\n", i2o_get_class_name(work16[0]));
34594 seq_printf(seq, "Owner TID : %0#5x\n", work16[2]);
34595 seq_printf(seq, "Parent TID : %0#5x\n", work16[3]);
34596 - seq_printf(seq, "Vendor info : %s\n",
34597 - chtostr(tmp, (u8 *) (work32 + 2), 16));
34598 - seq_printf(seq, "Product info : %s\n",
34599 - chtostr(tmp, (u8 *) (work32 + 6), 16));
34600 - seq_printf(seq, "Description : %s\n",
34601 - chtostr(tmp, (u8 *) (work32 + 10), 16));
34602 - seq_printf(seq, "Product rev. : %s\n",
34603 - chtostr(tmp, (u8 *) (work32 + 14), 8));
34604 + seq_printf(seq, "Vendor info : %.16s\n", (u8 *) (work32 + 2));
34605 + seq_printf(seq, "Product info : %.16s\n", (u8 *) (work32 + 6));
34606 + seq_printf(seq, "Description : %.16s\n", (u8 *) (work32 + 10));
34607 + seq_printf(seq, "Product rev. : %.8s\n", (u8 *) (work32 + 14));
34608
34609 seq_printf(seq, "Serial number : ");
34610 print_serial_number(seq, (u8 *) (work32 + 16),
34611 @@ -1306,8 +1291,6 @@ static int i2o_seq_show_ddm_identity(struct seq_file *seq, void *v)
34612 u8 pad[256]; // allow up to 256 byte (max) serial number
34613 } result;
34614
34615 - char tmp[24 + 1];
34616 -
34617 token = i2o_parm_field_get(d, 0xF101, -1, &result, sizeof(result));
34618
34619 if (token < 0) {
34620 @@ -1316,10 +1299,8 @@ static int i2o_seq_show_ddm_identity(struct seq_file *seq, void *v)
34621 }
34622
34623 seq_printf(seq, "Registering DDM TID : 0x%03x\n", result.ddm_tid);
34624 - seq_printf(seq, "Module name : %s\n",
34625 - chtostr(tmp, result.module_name, 24));
34626 - seq_printf(seq, "Module revision : %s\n",
34627 - chtostr(tmp, result.module_rev, 8));
34628 + seq_printf(seq, "Module name : %.24s\n", result.module_name);
34629 + seq_printf(seq, "Module revision : %.8s\n", result.module_rev);
34630
34631 seq_printf(seq, "Serial number : ");
34632 print_serial_number(seq, result.serial_number, sizeof(result) - 36);
34633 @@ -1343,8 +1324,6 @@ static int i2o_seq_show_uinfo(struct seq_file *seq, void *v)
34634 u8 instance_number[4];
34635 } result;
34636
34637 - char tmp[64 + 1];
34638 -
34639 token = i2o_parm_field_get(d, 0xF102, -1, &result, sizeof(result));
34640
34641 if (token < 0) {
34642 @@ -1352,14 +1331,10 @@ static int i2o_seq_show_uinfo(struct seq_file *seq, void *v)
34643 return 0;
34644 }
34645
34646 - seq_printf(seq, "Device name : %s\n",
34647 - chtostr(tmp, result.device_name, 64));
34648 - seq_printf(seq, "Service name : %s\n",
34649 - chtostr(tmp, result.service_name, 64));
34650 - seq_printf(seq, "Physical name : %s\n",
34651 - chtostr(tmp, result.physical_location, 64));
34652 - seq_printf(seq, "Instance number : %s\n",
34653 - chtostr(tmp, result.instance_number, 4));
34654 + seq_printf(seq, "Device name : %.64s\n", result.device_name);
34655 + seq_printf(seq, "Service name : %.64s\n", result.service_name);
34656 + seq_printf(seq, "Physical name : %.64s\n", result.physical_location);
34657 + seq_printf(seq, "Instance number : %.4s\n", result.instance_number);
34658
34659 return 0;
34660 }
34661 diff --git a/drivers/message/i2o/iop.c b/drivers/message/i2o/iop.c
34662 index a8c08f3..155fe3d 100644
34663 --- a/drivers/message/i2o/iop.c
34664 +++ b/drivers/message/i2o/iop.c
34665 @@ -111,10 +111,10 @@ u32 i2o_cntxt_list_add(struct i2o_controller * c, void *ptr)
34666
34667 spin_lock_irqsave(&c->context_list_lock, flags);
34668
34669 - if (unlikely(atomic_inc_and_test(&c->context_list_counter)))
34670 - atomic_inc(&c->context_list_counter);
34671 + if (unlikely(atomic_inc_and_test_unchecked(&c->context_list_counter)))
34672 + atomic_inc_unchecked(&c->context_list_counter);
34673
34674 - entry->context = atomic_read(&c->context_list_counter);
34675 + entry->context = atomic_read_unchecked(&c->context_list_counter);
34676
34677 list_add(&entry->list, &c->context_list);
34678
34679 @@ -1077,7 +1077,7 @@ struct i2o_controller *i2o_iop_alloc(void)
34680
34681 #if BITS_PER_LONG == 64
34682 spin_lock_init(&c->context_list_lock);
34683 - atomic_set(&c->context_list_counter, 0);
34684 + atomic_set_unchecked(&c->context_list_counter, 0);
34685 INIT_LIST_HEAD(&c->context_list);
34686 #endif
34687
34688 diff --git a/drivers/mfd/abx500-core.c b/drivers/mfd/abx500-core.c
34689 index 7ce65f4..e66e9bc 100644
34690 --- a/drivers/mfd/abx500-core.c
34691 +++ b/drivers/mfd/abx500-core.c
34692 @@ -15,7 +15,7 @@ static LIST_HEAD(abx500_list);
34693
34694 struct abx500_device_entry {
34695 struct list_head list;
34696 - struct abx500_ops ops;
34697 + abx500_ops_no_const ops;
34698 struct device *dev;
34699 };
34700
34701 diff --git a/drivers/mfd/janz-cmodio.c b/drivers/mfd/janz-cmodio.c
34702 index 965c480..71f2db9 100644
34703 --- a/drivers/mfd/janz-cmodio.c
34704 +++ b/drivers/mfd/janz-cmodio.c
34705 @@ -13,6 +13,7 @@
34706
34707 #include <linux/kernel.h>
34708 #include <linux/module.h>
34709 +#include <linux/slab.h>
34710 #include <linux/init.h>
34711 #include <linux/pci.h>
34712 #include <linux/interrupt.h>
34713 diff --git a/drivers/misc/lis3lv02d/lis3lv02d.c b/drivers/misc/lis3lv02d/lis3lv02d.c
34714 index a981e2a..5ca0c8b 100644
34715 --- a/drivers/misc/lis3lv02d/lis3lv02d.c
34716 +++ b/drivers/misc/lis3lv02d/lis3lv02d.c
34717 @@ -466,7 +466,7 @@ static irqreturn_t lis302dl_interrupt(int irq, void *data)
34718 * the lid is closed. This leads to interrupts as soon as a little move
34719 * is done.
34720 */
34721 - atomic_inc(&lis3->count);
34722 + atomic_inc_unchecked(&lis3->count);
34723
34724 wake_up_interruptible(&lis3->misc_wait);
34725 kill_fasync(&lis3->async_queue, SIGIO, POLL_IN);
34726 @@ -552,7 +552,7 @@ static int lis3lv02d_misc_open(struct inode *inode, struct file *file)
34727 if (lis3->pm_dev)
34728 pm_runtime_get_sync(lis3->pm_dev);
34729
34730 - atomic_set(&lis3->count, 0);
34731 + atomic_set_unchecked(&lis3->count, 0);
34732 return 0;
34733 }
34734
34735 @@ -585,7 +585,7 @@ static ssize_t lis3lv02d_misc_read(struct file *file, char __user *buf,
34736 add_wait_queue(&lis3->misc_wait, &wait);
34737 while (true) {
34738 set_current_state(TASK_INTERRUPTIBLE);
34739 - data = atomic_xchg(&lis3->count, 0);
34740 + data = atomic_xchg_unchecked(&lis3->count, 0);
34741 if (data)
34742 break;
34743
34744 @@ -626,7 +626,7 @@ static unsigned int lis3lv02d_misc_poll(struct file *file, poll_table *wait)
34745 struct lis3lv02d, miscdev);
34746
34747 poll_wait(file, &lis3->misc_wait, wait);
34748 - if (atomic_read(&lis3->count))
34749 + if (atomic_read_unchecked(&lis3->count))
34750 return POLLIN | POLLRDNORM;
34751 return 0;
34752 }
34753 diff --git a/drivers/misc/lis3lv02d/lis3lv02d.h b/drivers/misc/lis3lv02d/lis3lv02d.h
34754 index 2b1482a..5d33616 100644
34755 --- a/drivers/misc/lis3lv02d/lis3lv02d.h
34756 +++ b/drivers/misc/lis3lv02d/lis3lv02d.h
34757 @@ -266,7 +266,7 @@ struct lis3lv02d {
34758 struct input_polled_dev *idev; /* input device */
34759 struct platform_device *pdev; /* platform device */
34760 struct regulator_bulk_data regulators[2];
34761 - atomic_t count; /* interrupt count after last read */
34762 + atomic_unchecked_t count; /* interrupt count after last read */
34763 union axis_conversion ac; /* hw -> logical axis */
34764 int mapped_btns[3];
34765
34766 diff --git a/drivers/misc/sgi-gru/gruhandles.c b/drivers/misc/sgi-gru/gruhandles.c
34767 index 2f30bad..c4c13d0 100644
34768 --- a/drivers/misc/sgi-gru/gruhandles.c
34769 +++ b/drivers/misc/sgi-gru/gruhandles.c
34770 @@ -44,8 +44,8 @@ static void update_mcs_stats(enum mcs_op op, unsigned long clks)
34771 unsigned long nsec;
34772
34773 nsec = CLKS2NSEC(clks);
34774 - atomic_long_inc(&mcs_op_statistics[op].count);
34775 - atomic_long_add(nsec, &mcs_op_statistics[op].total);
34776 + atomic_long_inc_unchecked(&mcs_op_statistics[op].count);
34777 + atomic_long_add_unchecked(nsec, &mcs_op_statistics[op].total);
34778 if (mcs_op_statistics[op].max < nsec)
34779 mcs_op_statistics[op].max = nsec;
34780 }
34781 diff --git a/drivers/misc/sgi-gru/gruprocfs.c b/drivers/misc/sgi-gru/gruprocfs.c
34782 index 950dbe9..eeef0f8 100644
34783 --- a/drivers/misc/sgi-gru/gruprocfs.c
34784 +++ b/drivers/misc/sgi-gru/gruprocfs.c
34785 @@ -32,9 +32,9 @@
34786
34787 #define printstat(s, f) printstat_val(s, &gru_stats.f, #f)
34788
34789 -static void printstat_val(struct seq_file *s, atomic_long_t *v, char *id)
34790 +static void printstat_val(struct seq_file *s, atomic_long_unchecked_t *v, char *id)
34791 {
34792 - unsigned long val = atomic_long_read(v);
34793 + unsigned long val = atomic_long_read_unchecked(v);
34794
34795 seq_printf(s, "%16lu %s\n", val, id);
34796 }
34797 @@ -134,8 +134,8 @@ static int mcs_statistics_show(struct seq_file *s, void *p)
34798
34799 seq_printf(s, "%-20s%12s%12s%12s\n", "#id", "count", "aver-clks", "max-clks");
34800 for (op = 0; op < mcsop_last; op++) {
34801 - count = atomic_long_read(&mcs_op_statistics[op].count);
34802 - total = atomic_long_read(&mcs_op_statistics[op].total);
34803 + count = atomic_long_read_unchecked(&mcs_op_statistics[op].count);
34804 + total = atomic_long_read_unchecked(&mcs_op_statistics[op].total);
34805 max = mcs_op_statistics[op].max;
34806 seq_printf(s, "%-20s%12ld%12ld%12ld\n", id[op], count,
34807 count ? total / count : 0, max);
34808 diff --git a/drivers/misc/sgi-gru/grutables.h b/drivers/misc/sgi-gru/grutables.h
34809 index 5c3ce24..4915ccb 100644
34810 --- a/drivers/misc/sgi-gru/grutables.h
34811 +++ b/drivers/misc/sgi-gru/grutables.h
34812 @@ -167,82 +167,82 @@ extern unsigned int gru_max_gids;
34813 * GRU statistics.
34814 */
34815 struct gru_stats_s {
34816 - atomic_long_t vdata_alloc;
34817 - atomic_long_t vdata_free;
34818 - atomic_long_t gts_alloc;
34819 - atomic_long_t gts_free;
34820 - atomic_long_t gms_alloc;
34821 - atomic_long_t gms_free;
34822 - atomic_long_t gts_double_allocate;
34823 - atomic_long_t assign_context;
34824 - atomic_long_t assign_context_failed;
34825 - atomic_long_t free_context;
34826 - atomic_long_t load_user_context;
34827 - atomic_long_t load_kernel_context;
34828 - atomic_long_t lock_kernel_context;
34829 - atomic_long_t unlock_kernel_context;
34830 - atomic_long_t steal_user_context;
34831 - atomic_long_t steal_kernel_context;
34832 - atomic_long_t steal_context_failed;
34833 - atomic_long_t nopfn;
34834 - atomic_long_t asid_new;
34835 - atomic_long_t asid_next;
34836 - atomic_long_t asid_wrap;
34837 - atomic_long_t asid_reuse;
34838 - atomic_long_t intr;
34839 - atomic_long_t intr_cbr;
34840 - atomic_long_t intr_tfh;
34841 - atomic_long_t intr_spurious;
34842 - atomic_long_t intr_mm_lock_failed;
34843 - atomic_long_t call_os;
34844 - atomic_long_t call_os_wait_queue;
34845 - atomic_long_t user_flush_tlb;
34846 - atomic_long_t user_unload_context;
34847 - atomic_long_t user_exception;
34848 - atomic_long_t set_context_option;
34849 - atomic_long_t check_context_retarget_intr;
34850 - atomic_long_t check_context_unload;
34851 - atomic_long_t tlb_dropin;
34852 - atomic_long_t tlb_preload_page;
34853 - atomic_long_t tlb_dropin_fail_no_asid;
34854 - atomic_long_t tlb_dropin_fail_upm;
34855 - atomic_long_t tlb_dropin_fail_invalid;
34856 - atomic_long_t tlb_dropin_fail_range_active;
34857 - atomic_long_t tlb_dropin_fail_idle;
34858 - atomic_long_t tlb_dropin_fail_fmm;
34859 - atomic_long_t tlb_dropin_fail_no_exception;
34860 - atomic_long_t tfh_stale_on_fault;
34861 - atomic_long_t mmu_invalidate_range;
34862 - atomic_long_t mmu_invalidate_page;
34863 - atomic_long_t flush_tlb;
34864 - atomic_long_t flush_tlb_gru;
34865 - atomic_long_t flush_tlb_gru_tgh;
34866 - atomic_long_t flush_tlb_gru_zero_asid;
34867 + atomic_long_unchecked_t vdata_alloc;
34868 + atomic_long_unchecked_t vdata_free;
34869 + atomic_long_unchecked_t gts_alloc;
34870 + atomic_long_unchecked_t gts_free;
34871 + atomic_long_unchecked_t gms_alloc;
34872 + atomic_long_unchecked_t gms_free;
34873 + atomic_long_unchecked_t gts_double_allocate;
34874 + atomic_long_unchecked_t assign_context;
34875 + atomic_long_unchecked_t assign_context_failed;
34876 + atomic_long_unchecked_t free_context;
34877 + atomic_long_unchecked_t load_user_context;
34878 + atomic_long_unchecked_t load_kernel_context;
34879 + atomic_long_unchecked_t lock_kernel_context;
34880 + atomic_long_unchecked_t unlock_kernel_context;
34881 + atomic_long_unchecked_t steal_user_context;
34882 + atomic_long_unchecked_t steal_kernel_context;
34883 + atomic_long_unchecked_t steal_context_failed;
34884 + atomic_long_unchecked_t nopfn;
34885 + atomic_long_unchecked_t asid_new;
34886 + atomic_long_unchecked_t asid_next;
34887 + atomic_long_unchecked_t asid_wrap;
34888 + atomic_long_unchecked_t asid_reuse;
34889 + atomic_long_unchecked_t intr;
34890 + atomic_long_unchecked_t intr_cbr;
34891 + atomic_long_unchecked_t intr_tfh;
34892 + atomic_long_unchecked_t intr_spurious;
34893 + atomic_long_unchecked_t intr_mm_lock_failed;
34894 + atomic_long_unchecked_t call_os;
34895 + atomic_long_unchecked_t call_os_wait_queue;
34896 + atomic_long_unchecked_t user_flush_tlb;
34897 + atomic_long_unchecked_t user_unload_context;
34898 + atomic_long_unchecked_t user_exception;
34899 + atomic_long_unchecked_t set_context_option;
34900 + atomic_long_unchecked_t check_context_retarget_intr;
34901 + atomic_long_unchecked_t check_context_unload;
34902 + atomic_long_unchecked_t tlb_dropin;
34903 + atomic_long_unchecked_t tlb_preload_page;
34904 + atomic_long_unchecked_t tlb_dropin_fail_no_asid;
34905 + atomic_long_unchecked_t tlb_dropin_fail_upm;
34906 + atomic_long_unchecked_t tlb_dropin_fail_invalid;
34907 + atomic_long_unchecked_t tlb_dropin_fail_range_active;
34908 + atomic_long_unchecked_t tlb_dropin_fail_idle;
34909 + atomic_long_unchecked_t tlb_dropin_fail_fmm;
34910 + atomic_long_unchecked_t tlb_dropin_fail_no_exception;
34911 + atomic_long_unchecked_t tfh_stale_on_fault;
34912 + atomic_long_unchecked_t mmu_invalidate_range;
34913 + atomic_long_unchecked_t mmu_invalidate_page;
34914 + atomic_long_unchecked_t flush_tlb;
34915 + atomic_long_unchecked_t flush_tlb_gru;
34916 + atomic_long_unchecked_t flush_tlb_gru_tgh;
34917 + atomic_long_unchecked_t flush_tlb_gru_zero_asid;
34918
34919 - atomic_long_t copy_gpa;
34920 - atomic_long_t read_gpa;
34921 + atomic_long_unchecked_t copy_gpa;
34922 + atomic_long_unchecked_t read_gpa;
34923
34924 - atomic_long_t mesq_receive;
34925 - atomic_long_t mesq_receive_none;
34926 - atomic_long_t mesq_send;
34927 - atomic_long_t mesq_send_failed;
34928 - atomic_long_t mesq_noop;
34929 - atomic_long_t mesq_send_unexpected_error;
34930 - atomic_long_t mesq_send_lb_overflow;
34931 - atomic_long_t mesq_send_qlimit_reached;
34932 - atomic_long_t mesq_send_amo_nacked;
34933 - atomic_long_t mesq_send_put_nacked;
34934 - atomic_long_t mesq_page_overflow;
34935 - atomic_long_t mesq_qf_locked;
34936 - atomic_long_t mesq_qf_noop_not_full;
34937 - atomic_long_t mesq_qf_switch_head_failed;
34938 - atomic_long_t mesq_qf_unexpected_error;
34939 - atomic_long_t mesq_noop_unexpected_error;
34940 - atomic_long_t mesq_noop_lb_overflow;
34941 - atomic_long_t mesq_noop_qlimit_reached;
34942 - atomic_long_t mesq_noop_amo_nacked;
34943 - atomic_long_t mesq_noop_put_nacked;
34944 - atomic_long_t mesq_noop_page_overflow;
34945 + atomic_long_unchecked_t mesq_receive;
34946 + atomic_long_unchecked_t mesq_receive_none;
34947 + atomic_long_unchecked_t mesq_send;
34948 + atomic_long_unchecked_t mesq_send_failed;
34949 + atomic_long_unchecked_t mesq_noop;
34950 + atomic_long_unchecked_t mesq_send_unexpected_error;
34951 + atomic_long_unchecked_t mesq_send_lb_overflow;
34952 + atomic_long_unchecked_t mesq_send_qlimit_reached;
34953 + atomic_long_unchecked_t mesq_send_amo_nacked;
34954 + atomic_long_unchecked_t mesq_send_put_nacked;
34955 + atomic_long_unchecked_t mesq_page_overflow;
34956 + atomic_long_unchecked_t mesq_qf_locked;
34957 + atomic_long_unchecked_t mesq_qf_noop_not_full;
34958 + atomic_long_unchecked_t mesq_qf_switch_head_failed;
34959 + atomic_long_unchecked_t mesq_qf_unexpected_error;
34960 + atomic_long_unchecked_t mesq_noop_unexpected_error;
34961 + atomic_long_unchecked_t mesq_noop_lb_overflow;
34962 + atomic_long_unchecked_t mesq_noop_qlimit_reached;
34963 + atomic_long_unchecked_t mesq_noop_amo_nacked;
34964 + atomic_long_unchecked_t mesq_noop_put_nacked;
34965 + atomic_long_unchecked_t mesq_noop_page_overflow;
34966
34967 };
34968
34969 @@ -251,8 +251,8 @@ enum mcs_op {cchop_allocate, cchop_start, cchop_interrupt, cchop_interrupt_sync,
34970 tghop_invalidate, mcsop_last};
34971
34972 struct mcs_op_statistic {
34973 - atomic_long_t count;
34974 - atomic_long_t total;
34975 + atomic_long_unchecked_t count;
34976 + atomic_long_unchecked_t total;
34977 unsigned long max;
34978 };
34979
34980 @@ -275,7 +275,7 @@ extern struct mcs_op_statistic mcs_op_statistics[mcsop_last];
34981
34982 #define STAT(id) do { \
34983 if (gru_options & OPT_STATS) \
34984 - atomic_long_inc(&gru_stats.id); \
34985 + atomic_long_inc_unchecked(&gru_stats.id); \
34986 } while (0)
34987
34988 #ifdef CONFIG_SGI_GRU_DEBUG
34989 diff --git a/drivers/misc/sgi-xp/xp.h b/drivers/misc/sgi-xp/xp.h
34990 index c862cd4..0d176fe 100644
34991 --- a/drivers/misc/sgi-xp/xp.h
34992 +++ b/drivers/misc/sgi-xp/xp.h
34993 @@ -288,7 +288,7 @@ struct xpc_interface {
34994 xpc_notify_func, void *);
34995 void (*received) (short, int, void *);
34996 enum xp_retval (*partid_to_nasids) (short, void *);
34997 -};
34998 +} __no_const;
34999
35000 extern struct xpc_interface xpc_interface;
35001
35002 diff --git a/drivers/misc/sgi-xp/xpc.h b/drivers/misc/sgi-xp/xpc.h
35003 index b94d5f7..7f494c5 100644
35004 --- a/drivers/misc/sgi-xp/xpc.h
35005 +++ b/drivers/misc/sgi-xp/xpc.h
35006 @@ -835,6 +835,7 @@ struct xpc_arch_operations {
35007 void (*received_payload) (struct xpc_channel *, void *);
35008 void (*notify_senders_of_disconnect) (struct xpc_channel *);
35009 };
35010 +typedef struct xpc_arch_operations __no_const xpc_arch_operations_no_const;
35011
35012 /* struct xpc_partition act_state values (for XPC HB) */
35013
35014 @@ -876,7 +877,7 @@ extern struct xpc_registration xpc_registrations[];
35015 /* found in xpc_main.c */
35016 extern struct device *xpc_part;
35017 extern struct device *xpc_chan;
35018 -extern struct xpc_arch_operations xpc_arch_ops;
35019 +extern xpc_arch_operations_no_const xpc_arch_ops;
35020 extern int xpc_disengage_timelimit;
35021 extern int xpc_disengage_timedout;
35022 extern int xpc_activate_IRQ_rcvd;
35023 diff --git a/drivers/misc/sgi-xp/xpc_main.c b/drivers/misc/sgi-xp/xpc_main.c
35024 index 8d082b4..aa749ae 100644
35025 --- a/drivers/misc/sgi-xp/xpc_main.c
35026 +++ b/drivers/misc/sgi-xp/xpc_main.c
35027 @@ -162,7 +162,7 @@ static struct notifier_block xpc_die_notifier = {
35028 .notifier_call = xpc_system_die,
35029 };
35030
35031 -struct xpc_arch_operations xpc_arch_ops;
35032 +xpc_arch_operations_no_const xpc_arch_ops;
35033
35034 /*
35035 * Timer function to enforce the timelimit on the partition disengage.
35036 diff --git a/drivers/mmc/host/sdhci-pci.c b/drivers/mmc/host/sdhci-pci.c
35037 index 504da71..9722d43 100644
35038 --- a/drivers/mmc/host/sdhci-pci.c
35039 +++ b/drivers/mmc/host/sdhci-pci.c
35040 @@ -653,7 +653,7 @@ static const struct sdhci_pci_fixes sdhci_via = {
35041 .probe = via_probe,
35042 };
35043
35044 -static const struct pci_device_id pci_ids[] __devinitdata = {
35045 +static const struct pci_device_id pci_ids[] __devinitconst = {
35046 {
35047 .vendor = PCI_VENDOR_ID_RICOH,
35048 .device = PCI_DEVICE_ID_RICOH_R5C822,
35049 diff --git a/drivers/mtd/devices/doc2000.c b/drivers/mtd/devices/doc2000.c
35050 index a4eb8b5..8c0628f 100644
35051 --- a/drivers/mtd/devices/doc2000.c
35052 +++ b/drivers/mtd/devices/doc2000.c
35053 @@ -753,7 +753,7 @@ static int doc_write(struct mtd_info *mtd, loff_t to, size_t len,
35054
35055 /* The ECC will not be calculated correctly if less than 512 is written */
35056 /* DBB-
35057 - if (len != 0x200 && eccbuf)
35058 + if (len != 0x200)
35059 printk(KERN_WARNING
35060 "ECC needs a full sector write (adr: %lx size %lx)\n",
35061 (long) to, (long) len);
35062 diff --git a/drivers/mtd/nand/denali.c b/drivers/mtd/nand/denali.c
35063 index 0650aaf..7718762 100644
35064 --- a/drivers/mtd/nand/denali.c
35065 +++ b/drivers/mtd/nand/denali.c
35066 @@ -26,6 +26,7 @@
35067 #include <linux/pci.h>
35068 #include <linux/mtd/mtd.h>
35069 #include <linux/module.h>
35070 +#include <linux/slab.h>
35071
35072 #include "denali.h"
35073
35074 diff --git a/drivers/mtd/nftlmount.c b/drivers/mtd/nftlmount.c
35075 index 51b9d6a..52af9a7 100644
35076 --- a/drivers/mtd/nftlmount.c
35077 +++ b/drivers/mtd/nftlmount.c
35078 @@ -24,6 +24,7 @@
35079 #include <asm/errno.h>
35080 #include <linux/delay.h>
35081 #include <linux/slab.h>
35082 +#include <linux/sched.h>
35083 #include <linux/mtd/mtd.h>
35084 #include <linux/mtd/nand.h>
35085 #include <linux/mtd/nftl.h>
35086 diff --git a/drivers/net/bonding/bond_sysfs.c b/drivers/net/bonding/bond_sysfs.c
35087 index dc15d24..ef8d2a0 100644
35088 --- a/drivers/net/bonding/bond_sysfs.c
35089 +++ b/drivers/net/bonding/bond_sysfs.c
35090 @@ -1060,7 +1060,7 @@ static ssize_t bonding_store_primary(struct device *d,
35091 goto out;
35092 }
35093
35094 - sscanf(buf, "%16s", ifname); /* IFNAMSIZ */
35095 + sscanf(buf, "%15s", ifname); /* IFNAMSIZ */
35096
35097 /* check to see if we are clearing primary */
35098 if (!strlen(ifname) || buf[0] == '\n') {
35099 @@ -1237,7 +1237,7 @@ static ssize_t bonding_store_active_slave(struct device *d,
35100 goto out;
35101 }
35102
35103 - sscanf(buf, "%16s", ifname); /* IFNAMSIZ */
35104 + sscanf(buf, "%15s", ifname); /* IFNAMSIZ */
35105
35106 /* check to see if we are clearing active */
35107 if (!strlen(ifname) || buf[0] == '\n') {
35108 diff --git a/drivers/net/ethernet/atheros/atlx/atl2.c b/drivers/net/ethernet/atheros/atlx/atl2.c
35109 index 57d64b8..623dd86 100644
35110 --- a/drivers/net/ethernet/atheros/atlx/atl2.c
35111 +++ b/drivers/net/ethernet/atheros/atlx/atl2.c
35112 @@ -2845,7 +2845,7 @@ static void atl2_force_ps(struct atl2_hw *hw)
35113 */
35114
35115 #define ATL2_PARAM(X, desc) \
35116 - static const int __devinitdata X[ATL2_MAX_NIC + 1] = ATL2_PARAM_INIT; \
35117 + static const int __devinitconst X[ATL2_MAX_NIC + 1] = ATL2_PARAM_INIT; \
35118 MODULE_PARM(X, "1-" __MODULE_STRING(ATL2_MAX_NIC) "i"); \
35119 MODULE_PARM_DESC(X, desc);
35120 #else
35121 diff --git a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c
35122 index 0875ecf..794cdf3 100644
35123 --- a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c
35124 +++ b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c
35125 @@ -3051,9 +3051,8 @@ static void bnx2x_drv_info_ether_stat(struct bnx2x *bp)
35126 struct eth_stats_info *ether_stat =
35127 &bp->slowpath->drv_info_to_mcp.ether_stat;
35128
35129 - /* leave last char as NULL */
35130 - memcpy(ether_stat->version, DRV_MODULE_VERSION,
35131 - ETH_STAT_INFO_VERSION_LEN - 1);
35132 + strlcpy(ether_stat->version, DRV_MODULE_VERSION,
35133 + ETH_STAT_INFO_VERSION_LEN);
35134
35135 bp->sp_objs[0].mac_obj.get_n_elements(bp, &bp->sp_objs[0].mac_obj,
35136 DRV_INFO_ETH_STAT_NUM_MACS_REQUIRED,
35137 diff --git a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_sp.h b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_sp.h
35138 index f83e033..8b4f43a 100644
35139 --- a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_sp.h
35140 +++ b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_sp.h
35141 @@ -486,7 +486,7 @@ struct bnx2x_rx_mode_obj {
35142
35143 int (*wait_comp)(struct bnx2x *bp,
35144 struct bnx2x_rx_mode_ramrod_params *p);
35145 -};
35146 +} __no_const;
35147
35148 /********************** Set multicast group ***********************************/
35149
35150 diff --git a/drivers/net/ethernet/broadcom/tg3.h b/drivers/net/ethernet/broadcom/tg3.h
35151 index 6d52cb2..bc95640 100644
35152 --- a/drivers/net/ethernet/broadcom/tg3.h
35153 +++ b/drivers/net/ethernet/broadcom/tg3.h
35154 @@ -140,6 +140,7 @@
35155 #define CHIPREV_ID_5750_A0 0x4000
35156 #define CHIPREV_ID_5750_A1 0x4001
35157 #define CHIPREV_ID_5750_A3 0x4003
35158 +#define CHIPREV_ID_5750_C1 0x4201
35159 #define CHIPREV_ID_5750_C2 0x4202
35160 #define CHIPREV_ID_5752_A0_HW 0x5000
35161 #define CHIPREV_ID_5752_A0 0x6000
35162 diff --git a/drivers/net/ethernet/chelsio/cxgb3/l2t.h b/drivers/net/ethernet/chelsio/cxgb3/l2t.h
35163 index 8cffcdf..aadf043 100644
35164 --- a/drivers/net/ethernet/chelsio/cxgb3/l2t.h
35165 +++ b/drivers/net/ethernet/chelsio/cxgb3/l2t.h
35166 @@ -87,7 +87,7 @@ typedef void (*arp_failure_handler_func)(struct t3cdev * dev,
35167 */
35168 struct l2t_skb_cb {
35169 arp_failure_handler_func arp_failure_handler;
35170 -};
35171 +} __no_const;
35172
35173 #define L2T_SKB_CB(skb) ((struct l2t_skb_cb *)(skb)->cb)
35174
35175 diff --git a/drivers/net/ethernet/dec/tulip/de4x5.c b/drivers/net/ethernet/dec/tulip/de4x5.c
35176 index f879e92..726f20f 100644
35177 --- a/drivers/net/ethernet/dec/tulip/de4x5.c
35178 +++ b/drivers/net/ethernet/dec/tulip/de4x5.c
35179 @@ -5388,7 +5388,7 @@ de4x5_ioctl(struct net_device *dev, struct ifreq *rq, int cmd)
35180 for (i=0; i<ETH_ALEN; i++) {
35181 tmp.addr[i] = dev->dev_addr[i];
35182 }
35183 - if (copy_to_user(ioc->data, tmp.addr, ioc->len)) return -EFAULT;
35184 + if (ioc->len > sizeof tmp.addr || copy_to_user(ioc->data, tmp.addr, ioc->len)) return -EFAULT;
35185 break;
35186
35187 case DE4X5_SET_HWADDR: /* Set the hardware address */
35188 @@ -5428,7 +5428,7 @@ de4x5_ioctl(struct net_device *dev, struct ifreq *rq, int cmd)
35189 spin_lock_irqsave(&lp->lock, flags);
35190 memcpy(&statbuf, &lp->pktStats, ioc->len);
35191 spin_unlock_irqrestore(&lp->lock, flags);
35192 - if (copy_to_user(ioc->data, &statbuf, ioc->len))
35193 + if (ioc->len > sizeof statbuf || copy_to_user(ioc->data, &statbuf, ioc->len))
35194 return -EFAULT;
35195 break;
35196 }
35197 diff --git a/drivers/net/ethernet/dec/tulip/eeprom.c b/drivers/net/ethernet/dec/tulip/eeprom.c
35198 index ed7d1dc..d426748 100644
35199 --- a/drivers/net/ethernet/dec/tulip/eeprom.c
35200 +++ b/drivers/net/ethernet/dec/tulip/eeprom.c
35201 @@ -79,7 +79,7 @@ static struct eeprom_fixup eeprom_fixups[] __devinitdata = {
35202 {NULL}};
35203
35204
35205 -static const char *block_name[] __devinitdata = {
35206 +static const char *block_name[] __devinitconst = {
35207 "21140 non-MII",
35208 "21140 MII PHY",
35209 "21142 Serial PHY",
35210 diff --git a/drivers/net/ethernet/dec/tulip/uli526x.c b/drivers/net/ethernet/dec/tulip/uli526x.c
35211 index 75d45f8..3d9c55b 100644
35212 --- a/drivers/net/ethernet/dec/tulip/uli526x.c
35213 +++ b/drivers/net/ethernet/dec/tulip/uli526x.c
35214 @@ -129,7 +129,7 @@ struct uli526x_board_info {
35215 struct uli_phy_ops {
35216 void (*write)(struct uli526x_board_info *, u8, u8, u16);
35217 u16 (*read)(struct uli526x_board_info *, u8, u8);
35218 - } phy;
35219 + } __no_const phy;
35220 struct net_device *next_dev; /* next device */
35221 struct pci_dev *pdev; /* PCI device */
35222 spinlock_t lock;
35223 diff --git a/drivers/net/ethernet/dec/tulip/winbond-840.c b/drivers/net/ethernet/dec/tulip/winbond-840.c
35224 index 4d1ffca..7c1ec4d 100644
35225 --- a/drivers/net/ethernet/dec/tulip/winbond-840.c
35226 +++ b/drivers/net/ethernet/dec/tulip/winbond-840.c
35227 @@ -236,7 +236,7 @@ struct pci_id_info {
35228 int drv_flags; /* Driver use, intended as capability flags. */
35229 };
35230
35231 -static const struct pci_id_info pci_id_tbl[] __devinitdata = {
35232 +static const struct pci_id_info pci_id_tbl[] __devinitconst = {
35233 { /* Sometime a Level-One switch card. */
35234 "Winbond W89c840", CanHaveMII | HasBrokenTx | FDXOnNoMII},
35235 { "Winbond W89c840", CanHaveMII | HasBrokenTx},
35236 diff --git a/drivers/net/ethernet/dlink/sundance.c b/drivers/net/ethernet/dlink/sundance.c
35237 index d7bb52a..3b83588 100644
35238 --- a/drivers/net/ethernet/dlink/sundance.c
35239 +++ b/drivers/net/ethernet/dlink/sundance.c
35240 @@ -218,7 +218,7 @@ enum {
35241 struct pci_id_info {
35242 const char *name;
35243 };
35244 -static const struct pci_id_info pci_id_tbl[] __devinitdata = {
35245 +static const struct pci_id_info pci_id_tbl[] __devinitconst = {
35246 {"D-Link DFE-550TX FAST Ethernet Adapter"},
35247 {"D-Link DFE-550FX 100Mbps Fiber-optics Adapter"},
35248 {"D-Link DFE-580TX 4 port Server Adapter"},
35249 diff --git a/drivers/net/ethernet/emulex/benet/be_main.c b/drivers/net/ethernet/emulex/benet/be_main.c
35250 index 78b8aa8..dd6323a 100644
35251 --- a/drivers/net/ethernet/emulex/benet/be_main.c
35252 +++ b/drivers/net/ethernet/emulex/benet/be_main.c
35253 @@ -403,7 +403,7 @@ static void accumulate_16bit_val(u32 *acc, u16 val)
35254
35255 if (wrapped)
35256 newacc += 65536;
35257 - ACCESS_ONCE(*acc) = newacc;
35258 + ACCESS_ONCE_RW(*acc) = newacc;
35259 }
35260
35261 void be_parse_stats(struct be_adapter *adapter)
35262 diff --git a/drivers/net/ethernet/faraday/ftgmac100.c b/drivers/net/ethernet/faraday/ftgmac100.c
35263 index 74d749e..eefb1bd 100644
35264 --- a/drivers/net/ethernet/faraday/ftgmac100.c
35265 +++ b/drivers/net/ethernet/faraday/ftgmac100.c
35266 @@ -31,6 +31,8 @@
35267 #include <linux/netdevice.h>
35268 #include <linux/phy.h>
35269 #include <linux/platform_device.h>
35270 +#include <linux/interrupt.h>
35271 +#include <linux/irqreturn.h>
35272 #include <net/ip.h>
35273
35274 #include "ftgmac100.h"
35275 diff --git a/drivers/net/ethernet/faraday/ftmac100.c b/drivers/net/ethernet/faraday/ftmac100.c
35276 index b901a01..1ff32ee 100644
35277 --- a/drivers/net/ethernet/faraday/ftmac100.c
35278 +++ b/drivers/net/ethernet/faraday/ftmac100.c
35279 @@ -31,6 +31,8 @@
35280 #include <linux/module.h>
35281 #include <linux/netdevice.h>
35282 #include <linux/platform_device.h>
35283 +#include <linux/interrupt.h>
35284 +#include <linux/irqreturn.h>
35285
35286 #include "ftmac100.h"
35287
35288 diff --git a/drivers/net/ethernet/fealnx.c b/drivers/net/ethernet/fealnx.c
35289 index 9d71c9c..0e4a0ac 100644
35290 --- a/drivers/net/ethernet/fealnx.c
35291 +++ b/drivers/net/ethernet/fealnx.c
35292 @@ -150,7 +150,7 @@ struct chip_info {
35293 int flags;
35294 };
35295
35296 -static const struct chip_info skel_netdrv_tbl[] __devinitdata = {
35297 +static const struct chip_info skel_netdrv_tbl[] __devinitconst = {
35298 { "100/10M Ethernet PCI Adapter", HAS_MII_XCVR },
35299 { "100/10M Ethernet PCI Adapter", HAS_CHIP_XCVR },
35300 { "1000/100/10M Ethernet PCI Adapter", HAS_MII_XCVR },
35301 diff --git a/drivers/net/ethernet/intel/e1000e/hw.h b/drivers/net/ethernet/intel/e1000e/hw.h
35302 index ed5b409..ec37828 100644
35303 --- a/drivers/net/ethernet/intel/e1000e/hw.h
35304 +++ b/drivers/net/ethernet/intel/e1000e/hw.h
35305 @@ -797,6 +797,7 @@ struct e1000_mac_operations {
35306 void (*rar_set)(struct e1000_hw *, u8 *, u32);
35307 s32 (*read_mac_addr)(struct e1000_hw *);
35308 };
35309 +typedef struct e1000_mac_operations __no_const e1000_mac_operations_no_const;
35310
35311 /*
35312 * When to use various PHY register access functions:
35313 @@ -837,6 +838,7 @@ struct e1000_phy_operations {
35314 void (*power_up)(struct e1000_hw *);
35315 void (*power_down)(struct e1000_hw *);
35316 };
35317 +typedef struct e1000_phy_operations __no_const e1000_phy_operations_no_const;
35318
35319 /* Function pointers for the NVM. */
35320 struct e1000_nvm_operations {
35321 @@ -849,9 +851,10 @@ struct e1000_nvm_operations {
35322 s32 (*validate)(struct e1000_hw *);
35323 s32 (*write)(struct e1000_hw *, u16, u16, u16 *);
35324 };
35325 +typedef struct e1000_nvm_operations __no_const e1000_nvm_operations_no_const;
35326
35327 struct e1000_mac_info {
35328 - struct e1000_mac_operations ops;
35329 + e1000_mac_operations_no_const ops;
35330 u8 addr[ETH_ALEN];
35331 u8 perm_addr[ETH_ALEN];
35332
35333 @@ -892,7 +895,7 @@ struct e1000_mac_info {
35334 };
35335
35336 struct e1000_phy_info {
35337 - struct e1000_phy_operations ops;
35338 + e1000_phy_operations_no_const ops;
35339
35340 enum e1000_phy_type type;
35341
35342 @@ -926,7 +929,7 @@ struct e1000_phy_info {
35343 };
35344
35345 struct e1000_nvm_info {
35346 - struct e1000_nvm_operations ops;
35347 + e1000_nvm_operations_no_const ops;
35348
35349 enum e1000_nvm_type type;
35350 enum e1000_nvm_override override;
35351 diff --git a/drivers/net/ethernet/intel/igb/e1000_hw.h b/drivers/net/ethernet/intel/igb/e1000_hw.h
35352 index c2a51dc..c2bd262 100644
35353 --- a/drivers/net/ethernet/intel/igb/e1000_hw.h
35354 +++ b/drivers/net/ethernet/intel/igb/e1000_hw.h
35355 @@ -327,6 +327,7 @@ struct e1000_mac_operations {
35356 void (*release_swfw_sync)(struct e1000_hw *, u16);
35357
35358 };
35359 +typedef struct e1000_mac_operations __no_const e1000_mac_operations_no_const;
35360
35361 struct e1000_phy_operations {
35362 s32 (*acquire)(struct e1000_hw *);
35363 @@ -343,6 +344,7 @@ struct e1000_phy_operations {
35364 s32 (*set_d3_lplu_state)(struct e1000_hw *, bool);
35365 s32 (*write_reg)(struct e1000_hw *, u32, u16);
35366 };
35367 +typedef struct e1000_phy_operations __no_const e1000_phy_operations_no_const;
35368
35369 struct e1000_nvm_operations {
35370 s32 (*acquire)(struct e1000_hw *);
35371 @@ -353,6 +355,7 @@ struct e1000_nvm_operations {
35372 s32 (*validate)(struct e1000_hw *);
35373 s32 (*valid_led_default)(struct e1000_hw *, u16 *);
35374 };
35375 +typedef struct e1000_nvm_operations __no_const e1000_nvm_operations_no_const;
35376
35377 struct e1000_info {
35378 s32 (*get_invariants)(struct e1000_hw *);
35379 @@ -364,7 +367,7 @@ struct e1000_info {
35380 extern const struct e1000_info e1000_82575_info;
35381
35382 struct e1000_mac_info {
35383 - struct e1000_mac_operations ops;
35384 + e1000_mac_operations_no_const ops;
35385
35386 u8 addr[6];
35387 u8 perm_addr[6];
35388 @@ -402,7 +405,7 @@ struct e1000_mac_info {
35389 };
35390
35391 struct e1000_phy_info {
35392 - struct e1000_phy_operations ops;
35393 + e1000_phy_operations_no_const ops;
35394
35395 enum e1000_phy_type type;
35396
35397 @@ -437,7 +440,7 @@ struct e1000_phy_info {
35398 };
35399
35400 struct e1000_nvm_info {
35401 - struct e1000_nvm_operations ops;
35402 + e1000_nvm_operations_no_const ops;
35403 enum e1000_nvm_type type;
35404 enum e1000_nvm_override override;
35405
35406 @@ -482,6 +485,7 @@ struct e1000_mbx_operations {
35407 s32 (*check_for_ack)(struct e1000_hw *, u16);
35408 s32 (*check_for_rst)(struct e1000_hw *, u16);
35409 };
35410 +typedef struct e1000_mbx_operations __no_const e1000_mbx_operations_no_const;
35411
35412 struct e1000_mbx_stats {
35413 u32 msgs_tx;
35414 @@ -493,7 +497,7 @@ struct e1000_mbx_stats {
35415 };
35416
35417 struct e1000_mbx_info {
35418 - struct e1000_mbx_operations ops;
35419 + e1000_mbx_operations_no_const ops;
35420 struct e1000_mbx_stats stats;
35421 u32 timeout;
35422 u32 usec_delay;
35423 diff --git a/drivers/net/ethernet/intel/igbvf/vf.h b/drivers/net/ethernet/intel/igbvf/vf.h
35424 index 57db3c6..aa825fc 100644
35425 --- a/drivers/net/ethernet/intel/igbvf/vf.h
35426 +++ b/drivers/net/ethernet/intel/igbvf/vf.h
35427 @@ -189,9 +189,10 @@ struct e1000_mac_operations {
35428 s32 (*read_mac_addr)(struct e1000_hw *);
35429 s32 (*set_vfta)(struct e1000_hw *, u16, bool);
35430 };
35431 +typedef struct e1000_mac_operations __no_const e1000_mac_operations_no_const;
35432
35433 struct e1000_mac_info {
35434 - struct e1000_mac_operations ops;
35435 + e1000_mac_operations_no_const ops;
35436 u8 addr[6];
35437 u8 perm_addr[6];
35438
35439 @@ -213,6 +214,7 @@ struct e1000_mbx_operations {
35440 s32 (*check_for_ack)(struct e1000_hw *);
35441 s32 (*check_for_rst)(struct e1000_hw *);
35442 };
35443 +typedef struct e1000_mbx_operations __no_const e1000_mbx_operations_no_const;
35444
35445 struct e1000_mbx_stats {
35446 u32 msgs_tx;
35447 @@ -224,7 +226,7 @@ struct e1000_mbx_stats {
35448 };
35449
35450 struct e1000_mbx_info {
35451 - struct e1000_mbx_operations ops;
35452 + e1000_mbx_operations_no_const ops;
35453 struct e1000_mbx_stats stats;
35454 u32 timeout;
35455 u32 usec_delay;
35456 diff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_ptp.c b/drivers/net/ethernet/intel/ixgbe/ixgbe_ptp.c
35457 index 3456d56..b688d81 100644
35458 --- a/drivers/net/ethernet/intel/ixgbe/ixgbe_ptp.c
35459 +++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_ptp.c
35460 @@ -884,7 +884,7 @@ void ixgbe_ptp_start_cyclecounter(struct ixgbe_adapter *adapter)
35461 /* store the new cycle speed */
35462 adapter->cycle_speed = cycle_speed;
35463
35464 - ACCESS_ONCE(adapter->base_incval) = incval;
35465 + ACCESS_ONCE_RW(adapter->base_incval) = incval;
35466 smp_mb();
35467
35468 /* grab the ptp lock */
35469 diff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_type.h b/drivers/net/ethernet/intel/ixgbe/ixgbe_type.h
35470 index 400f86a..7f2e062 100644
35471 --- a/drivers/net/ethernet/intel/ixgbe/ixgbe_type.h
35472 +++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_type.h
35473 @@ -2799,6 +2799,7 @@ struct ixgbe_eeprom_operations {
35474 s32 (*update_checksum)(struct ixgbe_hw *);
35475 u16 (*calc_checksum)(struct ixgbe_hw *);
35476 };
35477 +typedef struct ixgbe_eeprom_operations __no_const ixgbe_eeprom_operations_no_const;
35478
35479 struct ixgbe_mac_operations {
35480 s32 (*init_hw)(struct ixgbe_hw *);
35481 @@ -2865,6 +2866,7 @@ struct ixgbe_mac_operations {
35482 s32 (*get_thermal_sensor_data)(struct ixgbe_hw *);
35483 s32 (*init_thermal_sensor_thresh)(struct ixgbe_hw *hw);
35484 };
35485 +typedef struct ixgbe_mac_operations __no_const ixgbe_mac_operations_no_const;
35486
35487 struct ixgbe_phy_operations {
35488 s32 (*identify)(struct ixgbe_hw *);
35489 @@ -2884,9 +2886,10 @@ struct ixgbe_phy_operations {
35490 s32 (*write_i2c_eeprom)(struct ixgbe_hw *, u8, u8);
35491 s32 (*check_overtemp)(struct ixgbe_hw *);
35492 };
35493 +typedef struct ixgbe_phy_operations __no_const ixgbe_phy_operations_no_const;
35494
35495 struct ixgbe_eeprom_info {
35496 - struct ixgbe_eeprom_operations ops;
35497 + ixgbe_eeprom_operations_no_const ops;
35498 enum ixgbe_eeprom_type type;
35499 u32 semaphore_delay;
35500 u16 word_size;
35501 @@ -2896,7 +2899,7 @@ struct ixgbe_eeprom_info {
35502
35503 #define IXGBE_FLAGS_DOUBLE_RESET_REQUIRED 0x01
35504 struct ixgbe_mac_info {
35505 - struct ixgbe_mac_operations ops;
35506 + ixgbe_mac_operations_no_const ops;
35507 enum ixgbe_mac_type type;
35508 u8 addr[ETH_ALEN];
35509 u8 perm_addr[ETH_ALEN];
35510 @@ -2926,7 +2929,7 @@ struct ixgbe_mac_info {
35511 };
35512
35513 struct ixgbe_phy_info {
35514 - struct ixgbe_phy_operations ops;
35515 + ixgbe_phy_operations_no_const ops;
35516 struct mdio_if_info mdio;
35517 enum ixgbe_phy_type type;
35518 u32 id;
35519 @@ -2954,6 +2957,7 @@ struct ixgbe_mbx_operations {
35520 s32 (*check_for_ack)(struct ixgbe_hw *, u16);
35521 s32 (*check_for_rst)(struct ixgbe_hw *, u16);
35522 };
35523 +typedef struct ixgbe_mbx_operations __no_const ixgbe_mbx_operations_no_const;
35524
35525 struct ixgbe_mbx_stats {
35526 u32 msgs_tx;
35527 @@ -2965,7 +2969,7 @@ struct ixgbe_mbx_stats {
35528 };
35529
35530 struct ixgbe_mbx_info {
35531 - struct ixgbe_mbx_operations ops;
35532 + ixgbe_mbx_operations_no_const ops;
35533 struct ixgbe_mbx_stats stats;
35534 u32 timeout;
35535 u32 usec_delay;
35536 diff --git a/drivers/net/ethernet/intel/ixgbevf/vf.h b/drivers/net/ethernet/intel/ixgbevf/vf.h
35537 index 25c951d..cc7cf33 100644
35538 --- a/drivers/net/ethernet/intel/ixgbevf/vf.h
35539 +++ b/drivers/net/ethernet/intel/ixgbevf/vf.h
35540 @@ -70,6 +70,7 @@ struct ixgbe_mac_operations {
35541 s32 (*clear_vfta)(struct ixgbe_hw *);
35542 s32 (*set_vfta)(struct ixgbe_hw *, u32, u32, bool);
35543 };
35544 +typedef struct ixgbe_mac_operations __no_const ixgbe_mac_operations_no_const;
35545
35546 enum ixgbe_mac_type {
35547 ixgbe_mac_unknown = 0,
35548 @@ -79,7 +80,7 @@ enum ixgbe_mac_type {
35549 };
35550
35551 struct ixgbe_mac_info {
35552 - struct ixgbe_mac_operations ops;
35553 + ixgbe_mac_operations_no_const ops;
35554 u8 addr[6];
35555 u8 perm_addr[6];
35556
35557 @@ -103,6 +104,7 @@ struct ixgbe_mbx_operations {
35558 s32 (*check_for_ack)(struct ixgbe_hw *);
35559 s32 (*check_for_rst)(struct ixgbe_hw *);
35560 };
35561 +typedef struct ixgbe_mbx_operations __no_const ixgbe_mbx_operations_no_const;
35562
35563 struct ixgbe_mbx_stats {
35564 u32 msgs_tx;
35565 @@ -114,7 +116,7 @@ struct ixgbe_mbx_stats {
35566 };
35567
35568 struct ixgbe_mbx_info {
35569 - struct ixgbe_mbx_operations ops;
35570 + ixgbe_mbx_operations_no_const ops;
35571 struct ixgbe_mbx_stats stats;
35572 u32 timeout;
35573 u32 udelay;
35574 diff --git a/drivers/net/ethernet/neterion/vxge/vxge-config.h b/drivers/net/ethernet/neterion/vxge/vxge-config.h
35575 index 9e0c1ee..8471f77 100644
35576 --- a/drivers/net/ethernet/neterion/vxge/vxge-config.h
35577 +++ b/drivers/net/ethernet/neterion/vxge/vxge-config.h
35578 @@ -514,7 +514,7 @@ struct vxge_hw_uld_cbs {
35579 void (*link_down)(struct __vxge_hw_device *devh);
35580 void (*crit_err)(struct __vxge_hw_device *devh,
35581 enum vxge_hw_event type, u64 ext_data);
35582 -};
35583 +} __no_const;
35584
35585 /*
35586 * struct __vxge_hw_blockpool_entry - Block private data structure
35587 diff --git a/drivers/net/ethernet/neterion/vxge/vxge-traffic.h b/drivers/net/ethernet/neterion/vxge/vxge-traffic.h
35588 index 4a518a3..936b334 100644
35589 --- a/drivers/net/ethernet/neterion/vxge/vxge-traffic.h
35590 +++ b/drivers/net/ethernet/neterion/vxge/vxge-traffic.h
35591 @@ -2088,7 +2088,7 @@ struct vxge_hw_mempool_cbs {
35592 struct vxge_hw_mempool_dma *dma_object,
35593 u32 index,
35594 u32 is_last);
35595 -};
35596 +} __no_const;
35597
35598 #define VXGE_HW_VIRTUAL_PATH_HANDLE(vpath) \
35599 ((struct __vxge_hw_vpath_handle *)(vpath)->vpath_handles.next)
35600 diff --git a/drivers/net/ethernet/realtek/r8169.c b/drivers/net/ethernet/realtek/r8169.c
35601 index df7bbba..162f850 100644
35602 --- a/drivers/net/ethernet/realtek/r8169.c
35603 +++ b/drivers/net/ethernet/realtek/r8169.c
35604 @@ -745,22 +745,22 @@ struct rtl8169_private {
35605 struct mdio_ops {
35606 void (*write)(struct rtl8169_private *, int, int);
35607 int (*read)(struct rtl8169_private *, int);
35608 - } mdio_ops;
35609 + } __no_const mdio_ops;
35610
35611 struct pll_power_ops {
35612 void (*down)(struct rtl8169_private *);
35613 void (*up)(struct rtl8169_private *);
35614 - } pll_power_ops;
35615 + } __no_const pll_power_ops;
35616
35617 struct jumbo_ops {
35618 void (*enable)(struct rtl8169_private *);
35619 void (*disable)(struct rtl8169_private *);
35620 - } jumbo_ops;
35621 + } __no_const jumbo_ops;
35622
35623 struct csi_ops {
35624 void (*write)(struct rtl8169_private *, int, int);
35625 u32 (*read)(struct rtl8169_private *, int);
35626 - } csi_ops;
35627 + } __no_const csi_ops;
35628
35629 int (*set_speed)(struct net_device *, u8 aneg, u16 sp, u8 dpx, u32 adv);
35630 int (*get_settings)(struct net_device *, struct ethtool_cmd *);
35631 diff --git a/drivers/net/ethernet/sis/sis190.c b/drivers/net/ethernet/sis/sis190.c
35632 index 4613591..d816601 100644
35633 --- a/drivers/net/ethernet/sis/sis190.c
35634 +++ b/drivers/net/ethernet/sis/sis190.c
35635 @@ -1618,7 +1618,7 @@ static int __devinit sis190_get_mac_addr_from_eeprom(struct pci_dev *pdev,
35636 static int __devinit sis190_get_mac_addr_from_apc(struct pci_dev *pdev,
35637 struct net_device *dev)
35638 {
35639 - static const u16 __devinitdata ids[] = { 0x0965, 0x0966, 0x0968 };
35640 + static const u16 __devinitconst ids[] = { 0x0965, 0x0966, 0x0968 };
35641 struct sis190_private *tp = netdev_priv(dev);
35642 struct pci_dev *isa_bridge;
35643 u8 reg, tmp8;
35644 diff --git a/drivers/net/ethernet/stmicro/stmmac/mmc_core.c b/drivers/net/ethernet/stmicro/stmmac/mmc_core.c
35645 index 0c74a70..3bc6f68 100644
35646 --- a/drivers/net/ethernet/stmicro/stmmac/mmc_core.c
35647 +++ b/drivers/net/ethernet/stmicro/stmmac/mmc_core.c
35648 @@ -140,8 +140,8 @@ void dwmac_mmc_ctrl(void __iomem *ioaddr, unsigned int mode)
35649
35650 writel(value, ioaddr + MMC_CNTRL);
35651
35652 - pr_debug("stmmac: MMC ctrl register (offset 0x%x): 0x%08x\n",
35653 - MMC_CNTRL, value);
35654 +// pr_debug("stmmac: MMC ctrl register (offset 0x%x): 0x%08x\n",
35655 +// MMC_CNTRL, value);
35656 }
35657
35658 /* To mask all all interrupts.*/
35659 diff --git a/drivers/net/hyperv/hyperv_net.h b/drivers/net/hyperv/hyperv_net.h
35660 index 95ceb35..318fc12 100644
35661 --- a/drivers/net/hyperv/hyperv_net.h
35662 +++ b/drivers/net/hyperv/hyperv_net.h
35663 @@ -99,7 +99,7 @@ struct rndis_device {
35664
35665 enum rndis_device_state state;
35666 bool link_state;
35667 - atomic_t new_req_id;
35668 + atomic_unchecked_t new_req_id;
35669
35670 spinlock_t request_lock;
35671 struct list_head req_list;
35672 diff --git a/drivers/net/hyperv/rndis_filter.c b/drivers/net/hyperv/rndis_filter.c
35673 index 1e88a10..1b01736 100644
35674 --- a/drivers/net/hyperv/rndis_filter.c
35675 +++ b/drivers/net/hyperv/rndis_filter.c
35676 @@ -99,7 +99,7 @@ static struct rndis_request *get_rndis_request(struct rndis_device *dev,
35677 * template
35678 */
35679 set = &rndis_msg->msg.set_req;
35680 - set->req_id = atomic_inc_return(&dev->new_req_id);
35681 + set->req_id = atomic_inc_return_unchecked(&dev->new_req_id);
35682
35683 /* Add to the request list */
35684 spin_lock_irqsave(&dev->request_lock, flags);
35685 @@ -730,7 +730,7 @@ static void rndis_filter_halt_device(struct rndis_device *dev)
35686
35687 /* Setup the rndis set */
35688 halt = &request->request_msg.msg.halt_req;
35689 - halt->req_id = atomic_inc_return(&dev->new_req_id);
35690 + halt->req_id = atomic_inc_return_unchecked(&dev->new_req_id);
35691
35692 /* Ignore return since this msg is optional. */
35693 rndis_filter_send_request(dev, request);
35694 diff --git a/drivers/net/phy/mdio-bitbang.c b/drivers/net/phy/mdio-bitbang.c
35695 index daec9b0..6428fcb 100644
35696 --- a/drivers/net/phy/mdio-bitbang.c
35697 +++ b/drivers/net/phy/mdio-bitbang.c
35698 @@ -234,6 +234,7 @@ void free_mdio_bitbang(struct mii_bus *bus)
35699 struct mdiobb_ctrl *ctrl = bus->priv;
35700
35701 module_put(ctrl->ops->owner);
35702 + mdiobus_unregister(bus);
35703 mdiobus_free(bus);
35704 }
35705 EXPORT_SYMBOL(free_mdio_bitbang);
35706 diff --git a/drivers/net/ppp/ppp_generic.c b/drivers/net/ppp/ppp_generic.c
35707 index 5c05572..389610b 100644
35708 --- a/drivers/net/ppp/ppp_generic.c
35709 +++ b/drivers/net/ppp/ppp_generic.c
35710 @@ -986,7 +986,6 @@ ppp_net_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)
35711 void __user *addr = (void __user *) ifr->ifr_ifru.ifru_data;
35712 struct ppp_stats stats;
35713 struct ppp_comp_stats cstats;
35714 - char *vers;
35715
35716 switch (cmd) {
35717 case SIOCGPPPSTATS:
35718 @@ -1008,8 +1007,7 @@ ppp_net_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)
35719 break;
35720
35721 case SIOCGPPPVER:
35722 - vers = PPP_VERSION;
35723 - if (copy_to_user(addr, vers, strlen(vers) + 1))
35724 + if (copy_to_user(addr, PPP_VERSION, sizeof(PPP_VERSION)))
35725 break;
35726 err = 0;
35727 break;
35728 diff --git a/drivers/net/tun.c b/drivers/net/tun.c
35729 index 3a16d4f..a311cec 100644
35730 --- a/drivers/net/tun.c
35731 +++ b/drivers/net/tun.c
35732 @@ -1367,7 +1367,7 @@ static int set_offload(struct tun_struct *tun, unsigned long arg)
35733 }
35734
35735 static long __tun_chr_ioctl(struct file *file, unsigned int cmd,
35736 - unsigned long arg, int ifreq_len)
35737 + unsigned long arg, size_t ifreq_len)
35738 {
35739 struct tun_file *tfile = file->private_data;
35740 struct tun_struct *tun;
35741 @@ -1378,6 +1378,9 @@ static long __tun_chr_ioctl(struct file *file, unsigned int cmd,
35742 int vnet_hdr_sz;
35743 int ret;
35744
35745 + if (ifreq_len > sizeof ifr)
35746 + return -EFAULT;
35747 +
35748 if (cmd == TUNSETIFF || _IOC_TYPE(cmd) == 0x89) {
35749 if (copy_from_user(&ifr, argp, ifreq_len))
35750 return -EFAULT;
35751 diff --git a/drivers/net/usb/hso.c b/drivers/net/usb/hso.c
35752 index 62f30b4..ff99dfd 100644
35753 --- a/drivers/net/usb/hso.c
35754 +++ b/drivers/net/usb/hso.c
35755 @@ -71,7 +71,7 @@
35756 #include <asm/byteorder.h>
35757 #include <linux/serial_core.h>
35758 #include <linux/serial.h>
35759 -
35760 +#include <asm/local.h>
35761
35762 #define MOD_AUTHOR "Option Wireless"
35763 #define MOD_DESCRIPTION "USB High Speed Option driver"
35764 @@ -1182,7 +1182,7 @@ static void put_rxbuf_data_and_resubmit_ctrl_urb(struct hso_serial *serial)
35765 struct urb *urb;
35766
35767 urb = serial->rx_urb[0];
35768 - if (serial->port.count > 0) {
35769 + if (atomic_read(&serial->port.count) > 0) {
35770 count = put_rxbuf_data(urb, serial);
35771 if (count == -1)
35772 return;
35773 @@ -1218,7 +1218,7 @@ static void hso_std_serial_read_bulk_callback(struct urb *urb)
35774 DUMP1(urb->transfer_buffer, urb->actual_length);
35775
35776 /* Anyone listening? */
35777 - if (serial->port.count == 0)
35778 + if (atomic_read(&serial->port.count) == 0)
35779 return;
35780
35781 if (status == 0) {
35782 @@ -1300,8 +1300,7 @@ static int hso_serial_open(struct tty_struct *tty, struct file *filp)
35783 tty_port_tty_set(&serial->port, tty);
35784
35785 /* check for port already opened, if not set the termios */
35786 - serial->port.count++;
35787 - if (serial->port.count == 1) {
35788 + if (atomic_inc_return(&serial->port.count) == 1) {
35789 serial->rx_state = RX_IDLE;
35790 /* Force default termio settings */
35791 _hso_serial_set_termios(tty, NULL);
35792 @@ -1313,7 +1312,7 @@ static int hso_serial_open(struct tty_struct *tty, struct file *filp)
35793 result = hso_start_serial_device(serial->parent, GFP_KERNEL);
35794 if (result) {
35795 hso_stop_serial_device(serial->parent);
35796 - serial->port.count--;
35797 + atomic_dec(&serial->port.count);
35798 kref_put(&serial->parent->ref, hso_serial_ref_free);
35799 }
35800 } else {
35801 @@ -1350,10 +1349,10 @@ static void hso_serial_close(struct tty_struct *tty, struct file *filp)
35802
35803 /* reset the rts and dtr */
35804 /* do the actual close */
35805 - serial->port.count--;
35806 + atomic_dec(&serial->port.count);
35807
35808 - if (serial->port.count <= 0) {
35809 - serial->port.count = 0;
35810 + if (atomic_read(&serial->port.count) <= 0) {
35811 + atomic_set(&serial->port.count, 0);
35812 tty_port_tty_set(&serial->port, NULL);
35813 if (!usb_gone)
35814 hso_stop_serial_device(serial->parent);
35815 @@ -1429,7 +1428,7 @@ static void hso_serial_set_termios(struct tty_struct *tty, struct ktermios *old)
35816
35817 /* the actual setup */
35818 spin_lock_irqsave(&serial->serial_lock, flags);
35819 - if (serial->port.count)
35820 + if (atomic_read(&serial->port.count))
35821 _hso_serial_set_termios(tty, old);
35822 else
35823 tty->termios = old;
35824 @@ -1888,7 +1887,7 @@ static void intr_callback(struct urb *urb)
35825 D1("Pending read interrupt on port %d\n", i);
35826 spin_lock(&serial->serial_lock);
35827 if (serial->rx_state == RX_IDLE &&
35828 - serial->port.count > 0) {
35829 + atomic_read(&serial->port.count) > 0) {
35830 /* Setup and send a ctrl req read on
35831 * port i */
35832 if (!serial->rx_urb_filled[0]) {
35833 @@ -3079,7 +3078,7 @@ static int hso_resume(struct usb_interface *iface)
35834 /* Start all serial ports */
35835 for (i = 0; i < HSO_SERIAL_TTY_MINORS; i++) {
35836 if (serial_table[i] && (serial_table[i]->interface == iface)) {
35837 - if (dev2ser(serial_table[i])->port.count) {
35838 + if (atomic_read(&dev2ser(serial_table[i])->port.count)) {
35839 result =
35840 hso_start_serial_device(serial_table[i], GFP_NOIO);
35841 hso_kick_transmit(dev2ser(serial_table[i]));
35842 diff --git a/drivers/net/wireless/ath/ath.h b/drivers/net/wireless/ath/ath.h
35843 index 6169fbd..40e8422 100644
35844 --- a/drivers/net/wireless/ath/ath.h
35845 +++ b/drivers/net/wireless/ath/ath.h
35846 @@ -119,6 +119,7 @@ struct ath_ops {
35847 void (*write_flush) (void *);
35848 u32 (*rmw)(void *, u32 reg_offset, u32 set, u32 clr);
35849 };
35850 +typedef struct ath_ops __no_const ath_ops_no_const;
35851
35852 struct ath_common;
35853 struct ath_bus_ops;
35854 diff --git a/drivers/net/wireless/ath/ath5k/base.c b/drivers/net/wireless/ath/ath5k/base.c
35855 index 2aab20e..b761ef8 100644
35856 --- a/drivers/net/wireless/ath/ath5k/base.c
35857 +++ b/drivers/net/wireless/ath/ath5k/base.c
35858 @@ -1803,7 +1803,7 @@ ath5k_beacon_update(struct ieee80211_hw *hw, struct ieee80211_vif *vif)
35859 {
35860 int ret;
35861 struct ath5k_hw *ah = hw->priv;
35862 - struct ath5k_vif *avf = (void *)vif->drv_priv;
35863 + struct ath5k_vif *avf;
35864 struct sk_buff *skb;
35865
35866 if (WARN_ON(!vif)) {
35867 @@ -1818,6 +1818,7 @@ ath5k_beacon_update(struct ieee80211_hw *hw, struct ieee80211_vif *vif)
35868 goto out;
35869 }
35870
35871 + avf = (void *)vif->drv_priv;
35872 ath5k_txbuf_free_skb(ah, avf->bbuf);
35873 avf->bbuf->skb = skb;
35874 ret = ath5k_beacon_setup(ah, avf->bbuf);
35875 diff --git a/drivers/net/wireless/ath/ath9k/ar9002_mac.c b/drivers/net/wireless/ath/ath9k/ar9002_mac.c
35876 index 8d78253..bebbb68 100644
35877 --- a/drivers/net/wireless/ath/ath9k/ar9002_mac.c
35878 +++ b/drivers/net/wireless/ath/ath9k/ar9002_mac.c
35879 @@ -184,8 +184,8 @@ ar9002_set_txdesc(struct ath_hw *ah, void *ds, struct ath_tx_info *i)
35880 ads->ds_txstatus6 = ads->ds_txstatus7 = 0;
35881 ads->ds_txstatus8 = ads->ds_txstatus9 = 0;
35882
35883 - ACCESS_ONCE(ads->ds_link) = i->link;
35884 - ACCESS_ONCE(ads->ds_data) = i->buf_addr[0];
35885 + ACCESS_ONCE_RW(ads->ds_link) = i->link;
35886 + ACCESS_ONCE_RW(ads->ds_data) = i->buf_addr[0];
35887
35888 ctl1 = i->buf_len[0] | (i->is_last ? 0 : AR_TxMore);
35889 ctl6 = SM(i->keytype, AR_EncrType);
35890 @@ -199,26 +199,26 @@ ar9002_set_txdesc(struct ath_hw *ah, void *ds, struct ath_tx_info *i)
35891
35892 if ((i->is_first || i->is_last) &&
35893 i->aggr != AGGR_BUF_MIDDLE && i->aggr != AGGR_BUF_LAST) {
35894 - ACCESS_ONCE(ads->ds_ctl2) = set11nTries(i->rates, 0)
35895 + ACCESS_ONCE_RW(ads->ds_ctl2) = set11nTries(i->rates, 0)
35896 | set11nTries(i->rates, 1)
35897 | set11nTries(i->rates, 2)
35898 | set11nTries(i->rates, 3)
35899 | (i->dur_update ? AR_DurUpdateEna : 0)
35900 | SM(0, AR_BurstDur);
35901
35902 - ACCESS_ONCE(ads->ds_ctl3) = set11nRate(i->rates, 0)
35903 + ACCESS_ONCE_RW(ads->ds_ctl3) = set11nRate(i->rates, 0)
35904 | set11nRate(i->rates, 1)
35905 | set11nRate(i->rates, 2)
35906 | set11nRate(i->rates, 3);
35907 } else {
35908 - ACCESS_ONCE(ads->ds_ctl2) = 0;
35909 - ACCESS_ONCE(ads->ds_ctl3) = 0;
35910 + ACCESS_ONCE_RW(ads->ds_ctl2) = 0;
35911 + ACCESS_ONCE_RW(ads->ds_ctl3) = 0;
35912 }
35913
35914 if (!i->is_first) {
35915 - ACCESS_ONCE(ads->ds_ctl0) = 0;
35916 - ACCESS_ONCE(ads->ds_ctl1) = ctl1;
35917 - ACCESS_ONCE(ads->ds_ctl6) = ctl6;
35918 + ACCESS_ONCE_RW(ads->ds_ctl0) = 0;
35919 + ACCESS_ONCE_RW(ads->ds_ctl1) = ctl1;
35920 + ACCESS_ONCE_RW(ads->ds_ctl6) = ctl6;
35921 return;
35922 }
35923
35924 @@ -243,7 +243,7 @@ ar9002_set_txdesc(struct ath_hw *ah, void *ds, struct ath_tx_info *i)
35925 break;
35926 }
35927
35928 - ACCESS_ONCE(ads->ds_ctl0) = (i->pkt_len & AR_FrameLen)
35929 + ACCESS_ONCE_RW(ads->ds_ctl0) = (i->pkt_len & AR_FrameLen)
35930 | (i->flags & ATH9K_TXDESC_VMF ? AR_VirtMoreFrag : 0)
35931 | SM(i->txpower, AR_XmitPower)
35932 | (i->flags & ATH9K_TXDESC_VEOL ? AR_VEOL : 0)
35933 @@ -253,19 +253,19 @@ ar9002_set_txdesc(struct ath_hw *ah, void *ds, struct ath_tx_info *i)
35934 | (i->flags & ATH9K_TXDESC_RTSENA ? AR_RTSEnable :
35935 (i->flags & ATH9K_TXDESC_CTSENA ? AR_CTSEnable : 0));
35936
35937 - ACCESS_ONCE(ads->ds_ctl1) = ctl1;
35938 - ACCESS_ONCE(ads->ds_ctl6) = ctl6;
35939 + ACCESS_ONCE_RW(ads->ds_ctl1) = ctl1;
35940 + ACCESS_ONCE_RW(ads->ds_ctl6) = ctl6;
35941
35942 if (i->aggr == AGGR_BUF_MIDDLE || i->aggr == AGGR_BUF_LAST)
35943 return;
35944
35945 - ACCESS_ONCE(ads->ds_ctl4) = set11nPktDurRTSCTS(i->rates, 0)
35946 + ACCESS_ONCE_RW(ads->ds_ctl4) = set11nPktDurRTSCTS(i->rates, 0)
35947 | set11nPktDurRTSCTS(i->rates, 1);
35948
35949 - ACCESS_ONCE(ads->ds_ctl5) = set11nPktDurRTSCTS(i->rates, 2)
35950 + ACCESS_ONCE_RW(ads->ds_ctl5) = set11nPktDurRTSCTS(i->rates, 2)
35951 | set11nPktDurRTSCTS(i->rates, 3);
35952
35953 - ACCESS_ONCE(ads->ds_ctl7) = set11nRateFlags(i->rates, 0)
35954 + ACCESS_ONCE_RW(ads->ds_ctl7) = set11nRateFlags(i->rates, 0)
35955 | set11nRateFlags(i->rates, 1)
35956 | set11nRateFlags(i->rates, 2)
35957 | set11nRateFlags(i->rates, 3)
35958 diff --git a/drivers/net/wireless/ath/ath9k/ar9003_mac.c b/drivers/net/wireless/ath/ath9k/ar9003_mac.c
35959 index 78816b8..1fcdfae 100644
35960 --- a/drivers/net/wireless/ath/ath9k/ar9003_mac.c
35961 +++ b/drivers/net/wireless/ath/ath9k/ar9003_mac.c
35962 @@ -39,47 +39,47 @@ ar9003_set_txdesc(struct ath_hw *ah, void *ds, struct ath_tx_info *i)
35963 (i->qcu << AR_TxQcuNum_S) | desc_len;
35964
35965 checksum += val;
35966 - ACCESS_ONCE(ads->info) = val;
35967 + ACCESS_ONCE_RW(ads->info) = val;
35968
35969 checksum += i->link;
35970 - ACCESS_ONCE(ads->link) = i->link;
35971 + ACCESS_ONCE_RW(ads->link) = i->link;
35972
35973 checksum += i->buf_addr[0];
35974 - ACCESS_ONCE(ads->data0) = i->buf_addr[0];
35975 + ACCESS_ONCE_RW(ads->data0) = i->buf_addr[0];
35976 checksum += i->buf_addr[1];
35977 - ACCESS_ONCE(ads->data1) = i->buf_addr[1];
35978 + ACCESS_ONCE_RW(ads->data1) = i->buf_addr[1];
35979 checksum += i->buf_addr[2];
35980 - ACCESS_ONCE(ads->data2) = i->buf_addr[2];
35981 + ACCESS_ONCE_RW(ads->data2) = i->buf_addr[2];
35982 checksum += i->buf_addr[3];
35983 - ACCESS_ONCE(ads->data3) = i->buf_addr[3];
35984 + ACCESS_ONCE_RW(ads->data3) = i->buf_addr[3];
35985
35986 checksum += (val = (i->buf_len[0] << AR_BufLen_S) & AR_BufLen);
35987 - ACCESS_ONCE(ads->ctl3) = val;
35988 + ACCESS_ONCE_RW(ads->ctl3) = val;
35989 checksum += (val = (i->buf_len[1] << AR_BufLen_S) & AR_BufLen);
35990 - ACCESS_ONCE(ads->ctl5) = val;
35991 + ACCESS_ONCE_RW(ads->ctl5) = val;
35992 checksum += (val = (i->buf_len[2] << AR_BufLen_S) & AR_BufLen);
35993 - ACCESS_ONCE(ads->ctl7) = val;
35994 + ACCESS_ONCE_RW(ads->ctl7) = val;
35995 checksum += (val = (i->buf_len[3] << AR_BufLen_S) & AR_BufLen);
35996 - ACCESS_ONCE(ads->ctl9) = val;
35997 + ACCESS_ONCE_RW(ads->ctl9) = val;
35998
35999 checksum = (u16) (((checksum & 0xffff) + (checksum >> 16)) & 0xffff);
36000 - ACCESS_ONCE(ads->ctl10) = checksum;
36001 + ACCESS_ONCE_RW(ads->ctl10) = checksum;
36002
36003 if (i->is_first || i->is_last) {
36004 - ACCESS_ONCE(ads->ctl13) = set11nTries(i->rates, 0)
36005 + ACCESS_ONCE_RW(ads->ctl13) = set11nTries(i->rates, 0)
36006 | set11nTries(i->rates, 1)
36007 | set11nTries(i->rates, 2)
36008 | set11nTries(i->rates, 3)
36009 | (i->dur_update ? AR_DurUpdateEna : 0)
36010 | SM(0, AR_BurstDur);
36011
36012 - ACCESS_ONCE(ads->ctl14) = set11nRate(i->rates, 0)
36013 + ACCESS_ONCE_RW(ads->ctl14) = set11nRate(i->rates, 0)
36014 | set11nRate(i->rates, 1)
36015 | set11nRate(i->rates, 2)
36016 | set11nRate(i->rates, 3);
36017 } else {
36018 - ACCESS_ONCE(ads->ctl13) = 0;
36019 - ACCESS_ONCE(ads->ctl14) = 0;
36020 + ACCESS_ONCE_RW(ads->ctl13) = 0;
36021 + ACCESS_ONCE_RW(ads->ctl14) = 0;
36022 }
36023
36024 ads->ctl20 = 0;
36025 @@ -89,17 +89,17 @@ ar9003_set_txdesc(struct ath_hw *ah, void *ds, struct ath_tx_info *i)
36026
36027 ctl17 = SM(i->keytype, AR_EncrType);
36028 if (!i->is_first) {
36029 - ACCESS_ONCE(ads->ctl11) = 0;
36030 - ACCESS_ONCE(ads->ctl12) = i->is_last ? 0 : AR_TxMore;
36031 - ACCESS_ONCE(ads->ctl15) = 0;
36032 - ACCESS_ONCE(ads->ctl16) = 0;
36033 - ACCESS_ONCE(ads->ctl17) = ctl17;
36034 - ACCESS_ONCE(ads->ctl18) = 0;
36035 - ACCESS_ONCE(ads->ctl19) = 0;
36036 + ACCESS_ONCE_RW(ads->ctl11) = 0;
36037 + ACCESS_ONCE_RW(ads->ctl12) = i->is_last ? 0 : AR_TxMore;
36038 + ACCESS_ONCE_RW(ads->ctl15) = 0;
36039 + ACCESS_ONCE_RW(ads->ctl16) = 0;
36040 + ACCESS_ONCE_RW(ads->ctl17) = ctl17;
36041 + ACCESS_ONCE_RW(ads->ctl18) = 0;
36042 + ACCESS_ONCE_RW(ads->ctl19) = 0;
36043 return;
36044 }
36045
36046 - ACCESS_ONCE(ads->ctl11) = (i->pkt_len & AR_FrameLen)
36047 + ACCESS_ONCE_RW(ads->ctl11) = (i->pkt_len & AR_FrameLen)
36048 | (i->flags & ATH9K_TXDESC_VMF ? AR_VirtMoreFrag : 0)
36049 | SM(i->txpower, AR_XmitPower)
36050 | (i->flags & ATH9K_TXDESC_VEOL ? AR_VEOL : 0)
36051 @@ -135,22 +135,22 @@ ar9003_set_txdesc(struct ath_hw *ah, void *ds, struct ath_tx_info *i)
36052 val = (i->flags & ATH9K_TXDESC_PAPRD) >> ATH9K_TXDESC_PAPRD_S;
36053 ctl12 |= SM(val, AR_PAPRDChainMask);
36054
36055 - ACCESS_ONCE(ads->ctl12) = ctl12;
36056 - ACCESS_ONCE(ads->ctl17) = ctl17;
36057 + ACCESS_ONCE_RW(ads->ctl12) = ctl12;
36058 + ACCESS_ONCE_RW(ads->ctl17) = ctl17;
36059
36060 - ACCESS_ONCE(ads->ctl15) = set11nPktDurRTSCTS(i->rates, 0)
36061 + ACCESS_ONCE_RW(ads->ctl15) = set11nPktDurRTSCTS(i->rates, 0)
36062 | set11nPktDurRTSCTS(i->rates, 1);
36063
36064 - ACCESS_ONCE(ads->ctl16) = set11nPktDurRTSCTS(i->rates, 2)
36065 + ACCESS_ONCE_RW(ads->ctl16) = set11nPktDurRTSCTS(i->rates, 2)
36066 | set11nPktDurRTSCTS(i->rates, 3);
36067
36068 - ACCESS_ONCE(ads->ctl18) = set11nRateFlags(i->rates, 0)
36069 + ACCESS_ONCE_RW(ads->ctl18) = set11nRateFlags(i->rates, 0)
36070 | set11nRateFlags(i->rates, 1)
36071 | set11nRateFlags(i->rates, 2)
36072 | set11nRateFlags(i->rates, 3)
36073 | SM(i->rtscts_rate, AR_RTSCTSRate);
36074
36075 - ACCESS_ONCE(ads->ctl19) = AR_Not_Sounding;
36076 + ACCESS_ONCE_RW(ads->ctl19) = AR_Not_Sounding;
36077 }
36078
36079 static u16 ar9003_calc_ptr_chksum(struct ar9003_txc *ads)
36080 diff --git a/drivers/net/wireless/ath/ath9k/hw.h b/drivers/net/wireless/ath/ath9k/hw.h
36081 index de6968f..29ac4c1 100644
36082 --- a/drivers/net/wireless/ath/ath9k/hw.h
36083 +++ b/drivers/net/wireless/ath/ath9k/hw.h
36084 @@ -656,7 +656,7 @@ struct ath_hw_private_ops {
36085
36086 /* ANI */
36087 void (*ani_cache_ini_regs)(struct ath_hw *ah);
36088 -};
36089 +} __no_const;
36090
36091 /**
36092 * struct ath_hw_ops - callbacks used by hardware code and driver code
36093 @@ -686,7 +686,7 @@ struct ath_hw_ops {
36094 void (*antdiv_comb_conf_set)(struct ath_hw *ah,
36095 struct ath_hw_antcomb_conf *antconf);
36096
36097 -};
36098 +} __no_const;
36099
36100 struct ath_nf_limits {
36101 s16 max;
36102 @@ -706,7 +706,7 @@ enum ath_cal_list {
36103 #define AH_FASTCC 0x4
36104
36105 struct ath_hw {
36106 - struct ath_ops reg_ops;
36107 + ath_ops_no_const reg_ops;
36108
36109 struct ieee80211_hw *hw;
36110 struct ath_common common;
36111 diff --git a/drivers/net/wireless/brcm80211/brcmsmac/phy/phy_int.h b/drivers/net/wireless/brcm80211/brcmsmac/phy/phy_int.h
36112 index af00e2c..ab04d34 100644
36113 --- a/drivers/net/wireless/brcm80211/brcmsmac/phy/phy_int.h
36114 +++ b/drivers/net/wireless/brcm80211/brcmsmac/phy/phy_int.h
36115 @@ -545,7 +545,7 @@ struct phy_func_ptr {
36116 void (*carrsuppr)(struct brcms_phy *);
36117 s32 (*rxsigpwr)(struct brcms_phy *, s32);
36118 void (*detach)(struct brcms_phy *);
36119 -};
36120 +} __no_const;
36121
36122 struct brcms_phy {
36123 struct brcms_phy_pub pubpi_ro;
36124 diff --git a/drivers/net/wireless/iwlegacy/3945-mac.c b/drivers/net/wireless/iwlegacy/3945-mac.c
36125 index faec404..a5277f1 100644
36126 --- a/drivers/net/wireless/iwlegacy/3945-mac.c
36127 +++ b/drivers/net/wireless/iwlegacy/3945-mac.c
36128 @@ -3611,7 +3611,9 @@ il3945_pci_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
36129 */
36130 if (il3945_mod_params.disable_hw_scan) {
36131 D_INFO("Disabling hw_scan\n");
36132 - il3945_mac_ops.hw_scan = NULL;
36133 + pax_open_kernel();
36134 + *(void **)&il3945_mac_ops.hw_scan = NULL;
36135 + pax_close_kernel();
36136 }
36137
36138 D_INFO("*** LOAD DRIVER ***\n");
36139 diff --git a/drivers/net/wireless/iwlwifi/dvm/debugfs.c b/drivers/net/wireless/iwlwifi/dvm/debugfs.c
36140 index a47b306..297daf2 100644
36141 --- a/drivers/net/wireless/iwlwifi/dvm/debugfs.c
36142 +++ b/drivers/net/wireless/iwlwifi/dvm/debugfs.c
36143 @@ -203,7 +203,7 @@ static ssize_t iwl_dbgfs_sram_write(struct file *file,
36144 {
36145 struct iwl_priv *priv = file->private_data;
36146 char buf[64];
36147 - int buf_size;
36148 + size_t buf_size;
36149 u32 offset, len;
36150
36151 memset(buf, 0, sizeof(buf));
36152 @@ -473,7 +473,7 @@ static ssize_t iwl_dbgfs_rx_handlers_write(struct file *file,
36153 struct iwl_priv *priv = file->private_data;
36154
36155 char buf[8];
36156 - int buf_size;
36157 + size_t buf_size;
36158 u32 reset_flag;
36159
36160 memset(buf, 0, sizeof(buf));
36161 @@ -554,7 +554,7 @@ static ssize_t iwl_dbgfs_disable_ht40_write(struct file *file,
36162 {
36163 struct iwl_priv *priv = file->private_data;
36164 char buf[8];
36165 - int buf_size;
36166 + size_t buf_size;
36167 int ht40;
36168
36169 memset(buf, 0, sizeof(buf));
36170 @@ -606,7 +606,7 @@ static ssize_t iwl_dbgfs_sleep_level_override_write(struct file *file,
36171 {
36172 struct iwl_priv *priv = file->private_data;
36173 char buf[8];
36174 - int buf_size;
36175 + size_t buf_size;
36176 int value;
36177
36178 memset(buf, 0, sizeof(buf));
36179 @@ -1871,7 +1871,7 @@ static ssize_t iwl_dbgfs_clear_ucode_statistics_write(struct file *file,
36180 {
36181 struct iwl_priv *priv = file->private_data;
36182 char buf[8];
36183 - int buf_size;
36184 + size_t buf_size;
36185 int clear;
36186
36187 memset(buf, 0, sizeof(buf));
36188 @@ -1916,7 +1916,7 @@ static ssize_t iwl_dbgfs_ucode_tracing_write(struct file *file,
36189 {
36190 struct iwl_priv *priv = file->private_data;
36191 char buf[8];
36192 - int buf_size;
36193 + size_t buf_size;
36194 int trace;
36195
36196 memset(buf, 0, sizeof(buf));
36197 @@ -1987,7 +1987,7 @@ static ssize_t iwl_dbgfs_missed_beacon_write(struct file *file,
36198 {
36199 struct iwl_priv *priv = file->private_data;
36200 char buf[8];
36201 - int buf_size;
36202 + size_t buf_size;
36203 int missed;
36204
36205 memset(buf, 0, sizeof(buf));
36206 @@ -2028,7 +2028,7 @@ static ssize_t iwl_dbgfs_plcp_delta_write(struct file *file,
36207
36208 struct iwl_priv *priv = file->private_data;
36209 char buf[8];
36210 - int buf_size;
36211 + size_t buf_size;
36212 int plcp;
36213
36214 memset(buf, 0, sizeof(buf));
36215 @@ -2088,7 +2088,7 @@ static ssize_t iwl_dbgfs_txfifo_flush_write(struct file *file,
36216
36217 struct iwl_priv *priv = file->private_data;
36218 char buf[8];
36219 - int buf_size;
36220 + size_t buf_size;
36221 int flush;
36222
36223 memset(buf, 0, sizeof(buf));
36224 @@ -2178,7 +2178,7 @@ static ssize_t iwl_dbgfs_protection_mode_write(struct file *file,
36225
36226 struct iwl_priv *priv = file->private_data;
36227 char buf[8];
36228 - int buf_size;
36229 + size_t buf_size;
36230 int rts;
36231
36232 if (!priv->cfg->ht_params)
36233 @@ -2220,7 +2220,7 @@ static ssize_t iwl_dbgfs_echo_test_write(struct file *file,
36234 {
36235 struct iwl_priv *priv = file->private_data;
36236 char buf[8];
36237 - int buf_size;
36238 + size_t buf_size;
36239
36240 memset(buf, 0, sizeof(buf));
36241 buf_size = min(count, sizeof(buf) - 1);
36242 @@ -2256,7 +2256,7 @@ static ssize_t iwl_dbgfs_log_event_write(struct file *file,
36243 struct iwl_priv *priv = file->private_data;
36244 u32 event_log_flag;
36245 char buf[8];
36246 - int buf_size;
36247 + size_t buf_size;
36248
36249 /* check that the interface is up */
36250 if (!iwl_is_ready(priv))
36251 @@ -2310,7 +2310,7 @@ static ssize_t iwl_dbgfs_calib_disabled_write(struct file *file,
36252 struct iwl_priv *priv = file->private_data;
36253 char buf[8];
36254 u32 calib_disabled;
36255 - int buf_size;
36256 + size_t buf_size;
36257
36258 memset(buf, 0, sizeof(buf));
36259 buf_size = min(count, sizeof(buf) - 1);
36260 diff --git a/drivers/net/wireless/iwlwifi/pcie/trans.c b/drivers/net/wireless/iwlwifi/pcie/trans.c
36261 index dbeebef..b45a152 100644
36262 --- a/drivers/net/wireless/iwlwifi/pcie/trans.c
36263 +++ b/drivers/net/wireless/iwlwifi/pcie/trans.c
36264 @@ -1944,7 +1944,7 @@ static ssize_t iwl_dbgfs_interrupt_write(struct file *file,
36265 struct isr_statistics *isr_stats = &trans_pcie->isr_stats;
36266
36267 char buf[8];
36268 - int buf_size;
36269 + size_t buf_size;
36270 u32 reset_flag;
36271
36272 memset(buf, 0, sizeof(buf));
36273 @@ -1965,7 +1965,7 @@ static ssize_t iwl_dbgfs_csr_write(struct file *file,
36274 {
36275 struct iwl_trans *trans = file->private_data;
36276 char buf[8];
36277 - int buf_size;
36278 + size_t buf_size;
36279 int csr;
36280
36281 memset(buf, 0, sizeof(buf));
36282 diff --git a/drivers/net/wireless/mac80211_hwsim.c b/drivers/net/wireless/mac80211_hwsim.c
36283 index 0083839..fcb7225 100644
36284 --- a/drivers/net/wireless/mac80211_hwsim.c
36285 +++ b/drivers/net/wireless/mac80211_hwsim.c
36286 @@ -1748,9 +1748,11 @@ static int __init init_mac80211_hwsim(void)
36287 return -EINVAL;
36288
36289 if (fake_hw_scan) {
36290 - mac80211_hwsim_ops.hw_scan = mac80211_hwsim_hw_scan;
36291 - mac80211_hwsim_ops.sw_scan_start = NULL;
36292 - mac80211_hwsim_ops.sw_scan_complete = NULL;
36293 + pax_open_kernel();
36294 + *(void **)&mac80211_hwsim_ops.hw_scan = mac80211_hwsim_hw_scan;
36295 + *(void **)&mac80211_hwsim_ops.sw_scan_start = NULL;
36296 + *(void **)&mac80211_hwsim_ops.sw_scan_complete = NULL;
36297 + pax_close_kernel();
36298 }
36299
36300 spin_lock_init(&hwsim_radio_lock);
36301 diff --git a/drivers/net/wireless/mwifiex/main.h b/drivers/net/wireless/mwifiex/main.h
36302 index e7c2a82..582e228 100644
36303 --- a/drivers/net/wireless/mwifiex/main.h
36304 +++ b/drivers/net/wireless/mwifiex/main.h
36305 @@ -571,7 +571,7 @@ struct mwifiex_if_ops {
36306 int (*event_complete) (struct mwifiex_adapter *, struct sk_buff *);
36307 int (*data_complete) (struct mwifiex_adapter *, struct sk_buff *);
36308 int (*dnld_fw) (struct mwifiex_adapter *, struct mwifiex_fw_image *);
36309 -};
36310 +} __no_const;
36311
36312 struct mwifiex_adapter {
36313 u8 iface_type;
36314 diff --git a/drivers/net/wireless/rndis_wlan.c b/drivers/net/wireless/rndis_wlan.c
36315 index 7a4ae9e..56e00bd 100644
36316 --- a/drivers/net/wireless/rndis_wlan.c
36317 +++ b/drivers/net/wireless/rndis_wlan.c
36318 @@ -1235,7 +1235,7 @@ static int set_rts_threshold(struct usbnet *usbdev, u32 rts_threshold)
36319
36320 netdev_dbg(usbdev->net, "%s(): %i\n", __func__, rts_threshold);
36321
36322 - if (rts_threshold < 0 || rts_threshold > 2347)
36323 + if (rts_threshold > 2347)
36324 rts_threshold = 2347;
36325
36326 tmp = cpu_to_le32(rts_threshold);
36327 diff --git a/drivers/net/wireless/rt2x00/rt2x00.h b/drivers/net/wireless/rt2x00/rt2x00.h
36328 index 8afb546..0c0dc5c 100644
36329 --- a/drivers/net/wireless/rt2x00/rt2x00.h
36330 +++ b/drivers/net/wireless/rt2x00/rt2x00.h
36331 @@ -397,7 +397,7 @@ struct rt2x00_intf {
36332 * for hardware which doesn't support hardware
36333 * sequence counting.
36334 */
36335 - atomic_t seqno;
36336 + atomic_unchecked_t seqno;
36337 };
36338
36339 static inline struct rt2x00_intf* vif_to_intf(struct ieee80211_vif *vif)
36340 diff --git a/drivers/net/wireless/rt2x00/rt2x00queue.c b/drivers/net/wireless/rt2x00/rt2x00queue.c
36341 index f7e74a0..da71431 100644
36342 --- a/drivers/net/wireless/rt2x00/rt2x00queue.c
36343 +++ b/drivers/net/wireless/rt2x00/rt2x00queue.c
36344 @@ -240,9 +240,9 @@ static void rt2x00queue_create_tx_descriptor_seq(struct rt2x00_dev *rt2x00dev,
36345 * sequence counter given by mac80211.
36346 */
36347 if (test_bit(ENTRY_TXD_FIRST_FRAGMENT, &txdesc->flags))
36348 - seqno = atomic_add_return(0x10, &intf->seqno);
36349 + seqno = atomic_add_return_unchecked(0x10, &intf->seqno);
36350 else
36351 - seqno = atomic_read(&intf->seqno);
36352 + seqno = atomic_read_unchecked(&intf->seqno);
36353
36354 hdr->seq_ctrl &= cpu_to_le16(IEEE80211_SCTL_FRAG);
36355 hdr->seq_ctrl |= cpu_to_le16(seqno);
36356 diff --git a/drivers/net/wireless/ti/wl1251/wl1251.h b/drivers/net/wireless/ti/wl1251/wl1251.h
36357 index fd02060..74ee481 100644
36358 --- a/drivers/net/wireless/ti/wl1251/wl1251.h
36359 +++ b/drivers/net/wireless/ti/wl1251/wl1251.h
36360 @@ -266,7 +266,7 @@ struct wl1251_if_operations {
36361 void (*reset)(struct wl1251 *wl);
36362 void (*enable_irq)(struct wl1251 *wl);
36363 void (*disable_irq)(struct wl1251 *wl);
36364 -};
36365 +} __no_const;
36366
36367 struct wl1251 {
36368 struct ieee80211_hw *hw;
36369 diff --git a/drivers/net/wireless/ti/wlcore/wlcore.h b/drivers/net/wireless/ti/wlcore/wlcore.h
36370 index 0ce7a8e..56a0ccf 100644
36371 --- a/drivers/net/wireless/ti/wlcore/wlcore.h
36372 +++ b/drivers/net/wireless/ti/wlcore/wlcore.h
36373 @@ -81,7 +81,7 @@ struct wlcore_ops {
36374 struct ieee80211_sta *sta,
36375 struct ieee80211_key_conf *key_conf);
36376 u32 (*pre_pkt_send)(struct wl1271 *wl, u32 buf_offset, u32 last_len);
36377 -};
36378 +} __no_const;
36379
36380 enum wlcore_partitions {
36381 PART_DOWN,
36382 diff --git a/drivers/oprofile/buffer_sync.c b/drivers/oprofile/buffer_sync.c
36383 index f34b5b2..b5abb9f 100644
36384 --- a/drivers/oprofile/buffer_sync.c
36385 +++ b/drivers/oprofile/buffer_sync.c
36386 @@ -343,7 +343,7 @@ static void add_data(struct op_entry *entry, struct mm_struct *mm)
36387 if (cookie == NO_COOKIE)
36388 offset = pc;
36389 if (cookie == INVALID_COOKIE) {
36390 - atomic_inc(&oprofile_stats.sample_lost_no_mapping);
36391 + atomic_inc_unchecked(&oprofile_stats.sample_lost_no_mapping);
36392 offset = pc;
36393 }
36394 if (cookie != last_cookie) {
36395 @@ -387,14 +387,14 @@ add_sample(struct mm_struct *mm, struct op_sample *s, int in_kernel)
36396 /* add userspace sample */
36397
36398 if (!mm) {
36399 - atomic_inc(&oprofile_stats.sample_lost_no_mm);
36400 + atomic_inc_unchecked(&oprofile_stats.sample_lost_no_mm);
36401 return 0;
36402 }
36403
36404 cookie = lookup_dcookie(mm, s->eip, &offset);
36405
36406 if (cookie == INVALID_COOKIE) {
36407 - atomic_inc(&oprofile_stats.sample_lost_no_mapping);
36408 + atomic_inc_unchecked(&oprofile_stats.sample_lost_no_mapping);
36409 return 0;
36410 }
36411
36412 @@ -563,7 +563,7 @@ void sync_buffer(int cpu)
36413 /* ignore backtraces if failed to add a sample */
36414 if (state == sb_bt_start) {
36415 state = sb_bt_ignore;
36416 - atomic_inc(&oprofile_stats.bt_lost_no_mapping);
36417 + atomic_inc_unchecked(&oprofile_stats.bt_lost_no_mapping);
36418 }
36419 }
36420 release_mm(mm);
36421 diff --git a/drivers/oprofile/event_buffer.c b/drivers/oprofile/event_buffer.c
36422 index c0cc4e7..44d4e54 100644
36423 --- a/drivers/oprofile/event_buffer.c
36424 +++ b/drivers/oprofile/event_buffer.c
36425 @@ -53,7 +53,7 @@ void add_event_entry(unsigned long value)
36426 }
36427
36428 if (buffer_pos == buffer_size) {
36429 - atomic_inc(&oprofile_stats.event_lost_overflow);
36430 + atomic_inc_unchecked(&oprofile_stats.event_lost_overflow);
36431 return;
36432 }
36433
36434 diff --git a/drivers/oprofile/oprof.c b/drivers/oprofile/oprof.c
36435 index ed2c3ec..deda85a 100644
36436 --- a/drivers/oprofile/oprof.c
36437 +++ b/drivers/oprofile/oprof.c
36438 @@ -110,7 +110,7 @@ static void switch_worker(struct work_struct *work)
36439 if (oprofile_ops.switch_events())
36440 return;
36441
36442 - atomic_inc(&oprofile_stats.multiplex_counter);
36443 + atomic_inc_unchecked(&oprofile_stats.multiplex_counter);
36444 start_switch_worker();
36445 }
36446
36447 diff --git a/drivers/oprofile/oprofile_stats.c b/drivers/oprofile/oprofile_stats.c
36448 index 917d28e..d62d981 100644
36449 --- a/drivers/oprofile/oprofile_stats.c
36450 +++ b/drivers/oprofile/oprofile_stats.c
36451 @@ -30,11 +30,11 @@ void oprofile_reset_stats(void)
36452 cpu_buf->sample_invalid_eip = 0;
36453 }
36454
36455 - atomic_set(&oprofile_stats.sample_lost_no_mm, 0);
36456 - atomic_set(&oprofile_stats.sample_lost_no_mapping, 0);
36457 - atomic_set(&oprofile_stats.event_lost_overflow, 0);
36458 - atomic_set(&oprofile_stats.bt_lost_no_mapping, 0);
36459 - atomic_set(&oprofile_stats.multiplex_counter, 0);
36460 + atomic_set_unchecked(&oprofile_stats.sample_lost_no_mm, 0);
36461 + atomic_set_unchecked(&oprofile_stats.sample_lost_no_mapping, 0);
36462 + atomic_set_unchecked(&oprofile_stats.event_lost_overflow, 0);
36463 + atomic_set_unchecked(&oprofile_stats.bt_lost_no_mapping, 0);
36464 + atomic_set_unchecked(&oprofile_stats.multiplex_counter, 0);
36465 }
36466
36467
36468 diff --git a/drivers/oprofile/oprofile_stats.h b/drivers/oprofile/oprofile_stats.h
36469 index 38b6fc0..b5cbfce 100644
36470 --- a/drivers/oprofile/oprofile_stats.h
36471 +++ b/drivers/oprofile/oprofile_stats.h
36472 @@ -13,11 +13,11 @@
36473 #include <linux/atomic.h>
36474
36475 struct oprofile_stat_struct {
36476 - atomic_t sample_lost_no_mm;
36477 - atomic_t sample_lost_no_mapping;
36478 - atomic_t bt_lost_no_mapping;
36479 - atomic_t event_lost_overflow;
36480 - atomic_t multiplex_counter;
36481 + atomic_unchecked_t sample_lost_no_mm;
36482 + atomic_unchecked_t sample_lost_no_mapping;
36483 + atomic_unchecked_t bt_lost_no_mapping;
36484 + atomic_unchecked_t event_lost_overflow;
36485 + atomic_unchecked_t multiplex_counter;
36486 };
36487
36488 extern struct oprofile_stat_struct oprofile_stats;
36489 diff --git a/drivers/oprofile/oprofilefs.c b/drivers/oprofile/oprofilefs.c
36490 index 849357c..b83c1e0 100644
36491 --- a/drivers/oprofile/oprofilefs.c
36492 +++ b/drivers/oprofile/oprofilefs.c
36493 @@ -185,7 +185,7 @@ static const struct file_operations atomic_ro_fops = {
36494
36495
36496 int oprofilefs_create_ro_atomic(struct super_block *sb, struct dentry *root,
36497 - char const *name, atomic_t *val)
36498 + char const *name, atomic_unchecked_t *val)
36499 {
36500 return __oprofilefs_create_file(sb, root, name,
36501 &atomic_ro_fops, 0444, val);
36502 diff --git a/drivers/parport/procfs.c b/drivers/parport/procfs.c
36503 index 3f56bc0..707d642 100644
36504 --- a/drivers/parport/procfs.c
36505 +++ b/drivers/parport/procfs.c
36506 @@ -64,7 +64,7 @@ static int do_active_device(ctl_table *table, int write,
36507
36508 *ppos += len;
36509
36510 - return copy_to_user(result, buffer, len) ? -EFAULT : 0;
36511 + return (len > sizeof buffer || copy_to_user(result, buffer, len)) ? -EFAULT : 0;
36512 }
36513
36514 #ifdef CONFIG_PARPORT_1284
36515 @@ -106,7 +106,7 @@ static int do_autoprobe(ctl_table *table, int write,
36516
36517 *ppos += len;
36518
36519 - return copy_to_user (result, buffer, len) ? -EFAULT : 0;
36520 + return (len > sizeof buffer || copy_to_user (result, buffer, len)) ? -EFAULT : 0;
36521 }
36522 #endif /* IEEE1284.3 support. */
36523
36524 diff --git a/drivers/pci/hotplug/cpci_hotplug.h b/drivers/pci/hotplug/cpci_hotplug.h
36525 index 9fff878..ad0ad53 100644
36526 --- a/drivers/pci/hotplug/cpci_hotplug.h
36527 +++ b/drivers/pci/hotplug/cpci_hotplug.h
36528 @@ -59,7 +59,7 @@ struct cpci_hp_controller_ops {
36529 int (*hardware_test) (struct slot* slot, u32 value);
36530 u8 (*get_power) (struct slot* slot);
36531 int (*set_power) (struct slot* slot, int value);
36532 -};
36533 +} __no_const;
36534
36535 struct cpci_hp_controller {
36536 unsigned int irq;
36537 diff --git a/drivers/pci/hotplug/cpqphp_nvram.c b/drivers/pci/hotplug/cpqphp_nvram.c
36538 index 76ba8a1..20ca857 100644
36539 --- a/drivers/pci/hotplug/cpqphp_nvram.c
36540 +++ b/drivers/pci/hotplug/cpqphp_nvram.c
36541 @@ -428,9 +428,13 @@ static u32 store_HRT (void __iomem *rom_start)
36542
36543 void compaq_nvram_init (void __iomem *rom_start)
36544 {
36545 +
36546 +#ifndef CONFIG_PAX_KERNEXEC
36547 if (rom_start) {
36548 compaq_int15_entry_point = (rom_start + ROM_INT15_PHY_ADDR - ROM_PHY_ADDR);
36549 }
36550 +#endif
36551 +
36552 dbg("int15 entry = %p\n", compaq_int15_entry_point);
36553
36554 /* initialize our int15 lock */
36555 diff --git a/drivers/pci/pcie/aspm.c b/drivers/pci/pcie/aspm.c
36556 index b500840..d7159d3 100644
36557 --- a/drivers/pci/pcie/aspm.c
36558 +++ b/drivers/pci/pcie/aspm.c
36559 @@ -27,9 +27,9 @@
36560 #define MODULE_PARAM_PREFIX "pcie_aspm."
36561
36562 /* Note: those are not register definitions */
36563 -#define ASPM_STATE_L0S_UP (1) /* Upstream direction L0s state */
36564 -#define ASPM_STATE_L0S_DW (2) /* Downstream direction L0s state */
36565 -#define ASPM_STATE_L1 (4) /* L1 state */
36566 +#define ASPM_STATE_L0S_UP (1U) /* Upstream direction L0s state */
36567 +#define ASPM_STATE_L0S_DW (2U) /* Downstream direction L0s state */
36568 +#define ASPM_STATE_L1 (4U) /* L1 state */
36569 #define ASPM_STATE_L0S (ASPM_STATE_L0S_UP | ASPM_STATE_L0S_DW)
36570 #define ASPM_STATE_ALL (ASPM_STATE_L0S | ASPM_STATE_L1)
36571
36572 diff --git a/drivers/pci/probe.c b/drivers/pci/probe.c
36573 index 61859d0..124539e 100644
36574 --- a/drivers/pci/probe.c
36575 +++ b/drivers/pci/probe.c
36576 @@ -173,7 +173,7 @@ int __pci_read_base(struct pci_dev *dev, enum pci_bar_type type,
36577 struct pci_bus_region region;
36578 bool bar_too_big = false, bar_disabled = false;
36579
36580 - mask = type ? PCI_ROM_ADDRESS_MASK : ~0;
36581 + mask = type ? (u32)PCI_ROM_ADDRESS_MASK : ~0;
36582
36583 /* No printks while decoding is disabled! */
36584 if (!dev->mmio_always_on) {
36585 diff --git a/drivers/pci/proc.c b/drivers/pci/proc.c
36586 index af028c7..654cdfc 100644
36587 --- a/drivers/pci/proc.c
36588 +++ b/drivers/pci/proc.c
36589 @@ -484,7 +484,16 @@ static const struct file_operations proc_bus_pci_dev_operations = {
36590 static int __init pci_proc_init(void)
36591 {
36592 struct pci_dev *dev = NULL;
36593 +
36594 +#ifdef CONFIG_GRKERNSEC_PROC_ADD
36595 +#ifdef CONFIG_GRKERNSEC_PROC_USER
36596 + proc_bus_pci_dir = proc_mkdir_mode("bus/pci", S_IRUSR | S_IXUSR, NULL);
36597 +#elif defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
36598 + proc_bus_pci_dir = proc_mkdir_mode("bus/pci", S_IRUSR | S_IXUSR | S_IRGRP | S_IXGRP, NULL);
36599 +#endif
36600 +#else
36601 proc_bus_pci_dir = proc_mkdir("bus/pci", NULL);
36602 +#endif
36603 proc_create("devices", 0, proc_bus_pci_dir,
36604 &proc_bus_pci_dev_operations);
36605 proc_initialized = 1;
36606 diff --git a/drivers/platform/x86/thinkpad_acpi.c b/drivers/platform/x86/thinkpad_acpi.c
36607 index 52daaa8..d6b81eb 100644
36608 --- a/drivers/platform/x86/thinkpad_acpi.c
36609 +++ b/drivers/platform/x86/thinkpad_acpi.c
36610 @@ -2097,7 +2097,7 @@ static int hotkey_mask_get(void)
36611 return 0;
36612 }
36613
36614 -void static hotkey_mask_warn_incomplete_mask(void)
36615 +static void hotkey_mask_warn_incomplete_mask(void)
36616 {
36617 /* log only what the user can fix... */
36618 const u32 wantedmask = hotkey_driver_mask &
36619 @@ -2328,11 +2328,6 @@ static void hotkey_read_nvram(struct tp_nvram_state *n, const u32 m)
36620 }
36621 }
36622
36623 -static void hotkey_compare_and_issue_event(struct tp_nvram_state *oldn,
36624 - struct tp_nvram_state *newn,
36625 - const u32 event_mask)
36626 -{
36627 -
36628 #define TPACPI_COMPARE_KEY(__scancode, __member) \
36629 do { \
36630 if ((event_mask & (1 << __scancode)) && \
36631 @@ -2346,36 +2341,42 @@ static void hotkey_compare_and_issue_event(struct tp_nvram_state *oldn,
36632 tpacpi_hotkey_send_key(__scancode); \
36633 } while (0)
36634
36635 - void issue_volchange(const unsigned int oldvol,
36636 - const unsigned int newvol)
36637 - {
36638 - unsigned int i = oldvol;
36639 +static void issue_volchange(const unsigned int oldvol,
36640 + const unsigned int newvol,
36641 + const u32 event_mask)
36642 +{
36643 + unsigned int i = oldvol;
36644
36645 - while (i > newvol) {
36646 - TPACPI_MAY_SEND_KEY(TP_ACPI_HOTKEYSCAN_VOLUMEDOWN);
36647 - i--;
36648 - }
36649 - while (i < newvol) {
36650 - TPACPI_MAY_SEND_KEY(TP_ACPI_HOTKEYSCAN_VOLUMEUP);
36651 - i++;
36652 - }
36653 + while (i > newvol) {
36654 + TPACPI_MAY_SEND_KEY(TP_ACPI_HOTKEYSCAN_VOLUMEDOWN);
36655 + i--;
36656 }
36657 + while (i < newvol) {
36658 + TPACPI_MAY_SEND_KEY(TP_ACPI_HOTKEYSCAN_VOLUMEUP);
36659 + i++;
36660 + }
36661 +}
36662
36663 - void issue_brightnesschange(const unsigned int oldbrt,
36664 - const unsigned int newbrt)
36665 - {
36666 - unsigned int i = oldbrt;
36667 +static void issue_brightnesschange(const unsigned int oldbrt,
36668 + const unsigned int newbrt,
36669 + const u32 event_mask)
36670 +{
36671 + unsigned int i = oldbrt;
36672
36673 - while (i > newbrt) {
36674 - TPACPI_MAY_SEND_KEY(TP_ACPI_HOTKEYSCAN_FNEND);
36675 - i--;
36676 - }
36677 - while (i < newbrt) {
36678 - TPACPI_MAY_SEND_KEY(TP_ACPI_HOTKEYSCAN_FNHOME);
36679 - i++;
36680 - }
36681 + while (i > newbrt) {
36682 + TPACPI_MAY_SEND_KEY(TP_ACPI_HOTKEYSCAN_FNEND);
36683 + i--;
36684 + }
36685 + while (i < newbrt) {
36686 + TPACPI_MAY_SEND_KEY(TP_ACPI_HOTKEYSCAN_FNHOME);
36687 + i++;
36688 }
36689 +}
36690
36691 +static void hotkey_compare_and_issue_event(struct tp_nvram_state *oldn,
36692 + struct tp_nvram_state *newn,
36693 + const u32 event_mask)
36694 +{
36695 TPACPI_COMPARE_KEY(TP_ACPI_HOTKEYSCAN_THINKPAD, thinkpad_toggle);
36696 TPACPI_COMPARE_KEY(TP_ACPI_HOTKEYSCAN_FNSPACE, zoom_toggle);
36697 TPACPI_COMPARE_KEY(TP_ACPI_HOTKEYSCAN_FNF7, display_toggle);
36698 @@ -2409,7 +2410,7 @@ static void hotkey_compare_and_issue_event(struct tp_nvram_state *oldn,
36699 oldn->volume_level != newn->volume_level) {
36700 /* recently muted, or repeated mute keypress, or
36701 * multiple presses ending in mute */
36702 - issue_volchange(oldn->volume_level, newn->volume_level);
36703 + issue_volchange(oldn->volume_level, newn->volume_level, event_mask);
36704 TPACPI_MAY_SEND_KEY(TP_ACPI_HOTKEYSCAN_MUTE);
36705 }
36706 } else {
36707 @@ -2419,7 +2420,7 @@ static void hotkey_compare_and_issue_event(struct tp_nvram_state *oldn,
36708 TPACPI_MAY_SEND_KEY(TP_ACPI_HOTKEYSCAN_VOLUMEUP);
36709 }
36710 if (oldn->volume_level != newn->volume_level) {
36711 - issue_volchange(oldn->volume_level, newn->volume_level);
36712 + issue_volchange(oldn->volume_level, newn->volume_level, event_mask);
36713 } else if (oldn->volume_toggle != newn->volume_toggle) {
36714 /* repeated vol up/down keypress at end of scale ? */
36715 if (newn->volume_level == 0)
36716 @@ -2432,7 +2433,8 @@ static void hotkey_compare_and_issue_event(struct tp_nvram_state *oldn,
36717 /* handle brightness */
36718 if (oldn->brightness_level != newn->brightness_level) {
36719 issue_brightnesschange(oldn->brightness_level,
36720 - newn->brightness_level);
36721 + newn->brightness_level,
36722 + event_mask);
36723 } else if (oldn->brightness_toggle != newn->brightness_toggle) {
36724 /* repeated key presses that didn't change state */
36725 if (newn->brightness_level == 0)
36726 @@ -2441,10 +2443,10 @@ static void hotkey_compare_and_issue_event(struct tp_nvram_state *oldn,
36727 && !tp_features.bright_unkfw)
36728 TPACPI_MAY_SEND_KEY(TP_ACPI_HOTKEYSCAN_FNHOME);
36729 }
36730 +}
36731
36732 #undef TPACPI_COMPARE_KEY
36733 #undef TPACPI_MAY_SEND_KEY
36734 -}
36735
36736 /*
36737 * Polling driver
36738 diff --git a/drivers/pnp/pnpbios/bioscalls.c b/drivers/pnp/pnpbios/bioscalls.c
36739 index 769d265..a3a05ca 100644
36740 --- a/drivers/pnp/pnpbios/bioscalls.c
36741 +++ b/drivers/pnp/pnpbios/bioscalls.c
36742 @@ -58,7 +58,7 @@ do { \
36743 set_desc_limit(&gdt[(selname) >> 3], (size) - 1); \
36744 } while(0)
36745
36746 -static struct desc_struct bad_bios_desc = GDT_ENTRY_INIT(0x4092,
36747 +static const struct desc_struct bad_bios_desc = GDT_ENTRY_INIT(0x4093,
36748 (unsigned long)__va(0x400UL), PAGE_SIZE - 0x400 - 1);
36749
36750 /*
36751 @@ -95,7 +95,10 @@ static inline u16 call_pnp_bios(u16 func, u16 arg1, u16 arg2, u16 arg3,
36752
36753 cpu = get_cpu();
36754 save_desc_40 = get_cpu_gdt_table(cpu)[0x40 / 8];
36755 +
36756 + pax_open_kernel();
36757 get_cpu_gdt_table(cpu)[0x40 / 8] = bad_bios_desc;
36758 + pax_close_kernel();
36759
36760 /* On some boxes IRQ's during PnP BIOS calls are deadly. */
36761 spin_lock_irqsave(&pnp_bios_lock, flags);
36762 @@ -133,7 +136,10 @@ static inline u16 call_pnp_bios(u16 func, u16 arg1, u16 arg2, u16 arg3,
36763 :"memory");
36764 spin_unlock_irqrestore(&pnp_bios_lock, flags);
36765
36766 + pax_open_kernel();
36767 get_cpu_gdt_table(cpu)[0x40 / 8] = save_desc_40;
36768 + pax_close_kernel();
36769 +
36770 put_cpu();
36771
36772 /* If we get here and this is set then the PnP BIOS faulted on us. */
36773 @@ -467,7 +473,7 @@ int pnp_bios_read_escd(char *data, u32 nvram_base)
36774 return status;
36775 }
36776
36777 -void pnpbios_calls_init(union pnp_bios_install_struct *header)
36778 +void __init pnpbios_calls_init(union pnp_bios_install_struct *header)
36779 {
36780 int i;
36781
36782 @@ -475,6 +481,8 @@ void pnpbios_calls_init(union pnp_bios_install_struct *header)
36783 pnp_bios_callpoint.offset = header->fields.pm16offset;
36784 pnp_bios_callpoint.segment = PNP_CS16;
36785
36786 + pax_open_kernel();
36787 +
36788 for_each_possible_cpu(i) {
36789 struct desc_struct *gdt = get_cpu_gdt_table(i);
36790 if (!gdt)
36791 @@ -486,4 +494,6 @@ void pnpbios_calls_init(union pnp_bios_install_struct *header)
36792 set_desc_base(&gdt[GDT_ENTRY_PNPBIOS_DS],
36793 (unsigned long)__va(header->fields.pm16dseg));
36794 }
36795 +
36796 + pax_close_kernel();
36797 }
36798 diff --git a/drivers/pnp/resource.c b/drivers/pnp/resource.c
36799 index b0ecacb..7c9da2e 100644
36800 --- a/drivers/pnp/resource.c
36801 +++ b/drivers/pnp/resource.c
36802 @@ -360,7 +360,7 @@ int pnp_check_irq(struct pnp_dev *dev, struct resource *res)
36803 return 1;
36804
36805 /* check if the resource is valid */
36806 - if (*irq < 0 || *irq > 15)
36807 + if (*irq > 15)
36808 return 0;
36809
36810 /* check if the resource is reserved */
36811 @@ -424,7 +424,7 @@ int pnp_check_dma(struct pnp_dev *dev, struct resource *res)
36812 return 1;
36813
36814 /* check if the resource is valid */
36815 - if (*dma < 0 || *dma == 4 || *dma > 7)
36816 + if (*dma == 4 || *dma > 7)
36817 return 0;
36818
36819 /* check if the resource is reserved */
36820 diff --git a/drivers/power/bq27x00_battery.c b/drivers/power/bq27x00_battery.c
36821 index 181ddec..774b6da 100644
36822 --- a/drivers/power/bq27x00_battery.c
36823 +++ b/drivers/power/bq27x00_battery.c
36824 @@ -80,7 +80,7 @@
36825 struct bq27x00_device_info;
36826 struct bq27x00_access_methods {
36827 int (*read)(struct bq27x00_device_info *di, u8 reg, bool single);
36828 -};
36829 +} __no_const;
36830
36831 enum bq27x00_chip { BQ27000, BQ27500, BQ27425};
36832
36833 diff --git a/drivers/regulator/max8660.c b/drivers/regulator/max8660.c
36834 index 8d53174..04c65de 100644
36835 --- a/drivers/regulator/max8660.c
36836 +++ b/drivers/regulator/max8660.c
36837 @@ -333,8 +333,10 @@ static int __devinit max8660_probe(struct i2c_client *client,
36838 max8660->shadow_regs[MAX8660_OVER1] = 5;
36839 } else {
36840 /* Otherwise devices can be toggled via software */
36841 - max8660_dcdc_ops.enable = max8660_dcdc_enable;
36842 - max8660_dcdc_ops.disable = max8660_dcdc_disable;
36843 + pax_open_kernel();
36844 + *(void **)&max8660_dcdc_ops.enable = max8660_dcdc_enable;
36845 + *(void **)&max8660_dcdc_ops.disable = max8660_dcdc_disable;
36846 + pax_close_kernel();
36847 }
36848
36849 /*
36850 diff --git a/drivers/regulator/mc13892-regulator.c b/drivers/regulator/mc13892-regulator.c
36851 index b388b74..ed82573 100644
36852 --- a/drivers/regulator/mc13892-regulator.c
36853 +++ b/drivers/regulator/mc13892-regulator.c
36854 @@ -565,10 +565,12 @@ static int __devinit mc13892_regulator_probe(struct platform_device *pdev)
36855 }
36856 mc13xxx_unlock(mc13892);
36857
36858 - mc13892_regulators[MC13892_VCAM].desc.ops->set_mode
36859 + pax_open_kernel();
36860 + *(void **)&mc13892_regulators[MC13892_VCAM].desc.ops->set_mode
36861 = mc13892_vcam_set_mode;
36862 - mc13892_regulators[MC13892_VCAM].desc.ops->get_mode
36863 + *(void **)&mc13892_regulators[MC13892_VCAM].desc.ops->get_mode
36864 = mc13892_vcam_get_mode;
36865 + pax_close_kernel();
36866
36867 mc13xxx_data = mc13xxx_parse_regulators_dt(pdev, mc13892_regulators,
36868 ARRAY_SIZE(mc13892_regulators));
36869 diff --git a/drivers/rtc/rtc-dev.c b/drivers/rtc/rtc-dev.c
36870 index cace6d3..f623fda 100644
36871 --- a/drivers/rtc/rtc-dev.c
36872 +++ b/drivers/rtc/rtc-dev.c
36873 @@ -14,6 +14,7 @@
36874 #include <linux/module.h>
36875 #include <linux/rtc.h>
36876 #include <linux/sched.h>
36877 +#include <linux/grsecurity.h>
36878 #include "rtc-core.h"
36879
36880 static dev_t rtc_devt;
36881 @@ -345,6 +346,8 @@ static long rtc_dev_ioctl(struct file *file,
36882 if (copy_from_user(&tm, uarg, sizeof(tm)))
36883 return -EFAULT;
36884
36885 + gr_log_timechange();
36886 +
36887 return rtc_set_time(rtc, &tm);
36888
36889 case RTC_PIE_ON:
36890 diff --git a/drivers/scsi/aacraid/aacraid.h b/drivers/scsi/aacraid/aacraid.h
36891 index 9e933a8..4f969f7 100644
36892 --- a/drivers/scsi/aacraid/aacraid.h
36893 +++ b/drivers/scsi/aacraid/aacraid.h
36894 @@ -503,7 +503,7 @@ struct adapter_ops
36895 int (*adapter_scsi)(struct fib * fib, struct scsi_cmnd * cmd);
36896 /* Administrative operations */
36897 int (*adapter_comm)(struct aac_dev * dev, int comm);
36898 -};
36899 +} __no_const;
36900
36901 /*
36902 * Define which interrupt handler needs to be installed
36903 diff --git a/drivers/scsi/aacraid/linit.c b/drivers/scsi/aacraid/linit.c
36904 index 7199534..cb7f158 100644
36905 --- a/drivers/scsi/aacraid/linit.c
36906 +++ b/drivers/scsi/aacraid/linit.c
36907 @@ -93,7 +93,7 @@ static DECLARE_PCI_DEVICE_TABLE(aac_pci_tbl) = {
36908 #elif defined(__devinitconst)
36909 static const struct pci_device_id aac_pci_tbl[] __devinitconst = {
36910 #else
36911 -static const struct pci_device_id aac_pci_tbl[] __devinitdata = {
36912 +static const struct pci_device_id aac_pci_tbl[] __devinitconst = {
36913 #endif
36914 { 0x1028, 0x0001, 0x1028, 0x0001, 0, 0, 0 }, /* PERC 2/Si (Iguana/PERC2Si) */
36915 { 0x1028, 0x0002, 0x1028, 0x0002, 0, 0, 1 }, /* PERC 3/Di (Opal/PERC3Di) */
36916 diff --git a/drivers/scsi/aic94xx/aic94xx_init.c b/drivers/scsi/aic94xx/aic94xx_init.c
36917 index ff80552..1c4120c 100644
36918 --- a/drivers/scsi/aic94xx/aic94xx_init.c
36919 +++ b/drivers/scsi/aic94xx/aic94xx_init.c
36920 @@ -1012,7 +1012,7 @@ static struct sas_domain_function_template aic94xx_transport_functions = {
36921 .lldd_ata_set_dmamode = asd_set_dmamode,
36922 };
36923
36924 -static const struct pci_device_id aic94xx_pci_table[] __devinitdata = {
36925 +static const struct pci_device_id aic94xx_pci_table[] __devinitconst = {
36926 {PCI_DEVICE(PCI_VENDOR_ID_ADAPTEC2, 0x410),0, 0, 1},
36927 {PCI_DEVICE(PCI_VENDOR_ID_ADAPTEC2, 0x412),0, 0, 1},
36928 {PCI_DEVICE(PCI_VENDOR_ID_ADAPTEC2, 0x416),0, 0, 1},
36929 diff --git a/drivers/scsi/bfa/bfa.h b/drivers/scsi/bfa/bfa.h
36930 index 4ad7e36..d004679 100644
36931 --- a/drivers/scsi/bfa/bfa.h
36932 +++ b/drivers/scsi/bfa/bfa.h
36933 @@ -196,7 +196,7 @@ struct bfa_hwif_s {
36934 u32 *end);
36935 int cpe_vec_q0;
36936 int rme_vec_q0;
36937 -};
36938 +} __no_const;
36939 typedef void (*bfa_cb_iocfc_t) (void *cbarg, enum bfa_status status);
36940
36941 struct bfa_faa_cbfn_s {
36942 diff --git a/drivers/scsi/bfa/bfa_fcpim.c b/drivers/scsi/bfa/bfa_fcpim.c
36943 index f0f80e2..8ec946b 100644
36944 --- a/drivers/scsi/bfa/bfa_fcpim.c
36945 +++ b/drivers/scsi/bfa/bfa_fcpim.c
36946 @@ -3715,7 +3715,7 @@ bfa_fcp_attach(struct bfa_s *bfa, void *bfad, struct bfa_iocfc_cfg_s *cfg,
36947
36948 bfa_iotag_attach(fcp);
36949
36950 - fcp->itn_arr = (struct bfa_itn_s *) bfa_mem_kva_curp(fcp);
36951 + fcp->itn_arr = (bfa_itn_s_no_const *) bfa_mem_kva_curp(fcp);
36952 bfa_mem_kva_curp(fcp) = (u8 *)fcp->itn_arr +
36953 (fcp->num_itns * sizeof(struct bfa_itn_s));
36954 memset(fcp->itn_arr, 0,
36955 @@ -3773,7 +3773,7 @@ bfa_itn_create(struct bfa_s *bfa, struct bfa_rport_s *rport,
36956 void (*isr)(struct bfa_s *bfa, struct bfi_msg_s *m))
36957 {
36958 struct bfa_fcp_mod_s *fcp = BFA_FCP_MOD(bfa);
36959 - struct bfa_itn_s *itn;
36960 + bfa_itn_s_no_const *itn;
36961
36962 itn = BFA_ITN_FROM_TAG(fcp, rport->rport_tag);
36963 itn->isr = isr;
36964 diff --git a/drivers/scsi/bfa/bfa_fcpim.h b/drivers/scsi/bfa/bfa_fcpim.h
36965 index 36f26da..38a34a8 100644
36966 --- a/drivers/scsi/bfa/bfa_fcpim.h
36967 +++ b/drivers/scsi/bfa/bfa_fcpim.h
36968 @@ -37,6 +37,7 @@ struct bfa_iotag_s {
36969 struct bfa_itn_s {
36970 bfa_isr_func_t isr;
36971 };
36972 +typedef struct bfa_itn_s __no_const bfa_itn_s_no_const;
36973
36974 void bfa_itn_create(struct bfa_s *bfa, struct bfa_rport_s *rport,
36975 void (*isr)(struct bfa_s *bfa, struct bfi_msg_s *m));
36976 @@ -147,7 +148,7 @@ struct bfa_fcp_mod_s {
36977 struct list_head iotag_tio_free_q; /* free IO resources */
36978 struct list_head iotag_unused_q; /* unused IO resources*/
36979 struct bfa_iotag_s *iotag_arr;
36980 - struct bfa_itn_s *itn_arr;
36981 + bfa_itn_s_no_const *itn_arr;
36982 int num_ioim_reqs;
36983 int num_fwtio_reqs;
36984 int num_itns;
36985 diff --git a/drivers/scsi/bfa/bfa_ioc.h b/drivers/scsi/bfa/bfa_ioc.h
36986 index 1a99d4b..e85d64b 100644
36987 --- a/drivers/scsi/bfa/bfa_ioc.h
36988 +++ b/drivers/scsi/bfa/bfa_ioc.h
36989 @@ -258,7 +258,7 @@ struct bfa_ioc_cbfn_s {
36990 bfa_ioc_disable_cbfn_t disable_cbfn;
36991 bfa_ioc_hbfail_cbfn_t hbfail_cbfn;
36992 bfa_ioc_reset_cbfn_t reset_cbfn;
36993 -};
36994 +} __no_const;
36995
36996 /*
36997 * IOC event notification mechanism.
36998 @@ -346,7 +346,7 @@ struct bfa_ioc_hwif_s {
36999 void (*ioc_sync_ack) (struct bfa_ioc_s *ioc);
37000 bfa_boolean_t (*ioc_sync_complete) (struct bfa_ioc_s *ioc);
37001 bfa_boolean_t (*ioc_lpu_read_stat) (struct bfa_ioc_s *ioc);
37002 -};
37003 +} __no_const;
37004
37005 /*
37006 * Queue element to wait for room in request queue. FIFO order is
37007 diff --git a/drivers/scsi/hosts.c b/drivers/scsi/hosts.c
37008 index 593085a..47aa999 100644
37009 --- a/drivers/scsi/hosts.c
37010 +++ b/drivers/scsi/hosts.c
37011 @@ -42,7 +42,7 @@
37012 #include "scsi_logging.h"
37013
37014
37015 -static atomic_t scsi_host_next_hn = ATOMIC_INIT(0); /* host_no for next new host */
37016 +static atomic_unchecked_t scsi_host_next_hn = ATOMIC_INIT(0); /* host_no for next new host */
37017
37018
37019 static void scsi_host_cls_release(struct device *dev)
37020 @@ -361,7 +361,7 @@ struct Scsi_Host *scsi_host_alloc(struct scsi_host_template *sht, int privsize)
37021 * subtract one because we increment first then return, but we need to
37022 * know what the next host number was before increment
37023 */
37024 - shost->host_no = atomic_inc_return(&scsi_host_next_hn) - 1;
37025 + shost->host_no = atomic_inc_return_unchecked(&scsi_host_next_hn) - 1;
37026 shost->dma_channel = 0xff;
37027
37028 /* These three are default values which can be overridden */
37029 diff --git a/drivers/scsi/hpsa.c b/drivers/scsi/hpsa.c
37030 index f9823f2..7bc3e81 100644
37031 --- a/drivers/scsi/hpsa.c
37032 +++ b/drivers/scsi/hpsa.c
37033 @@ -536,7 +536,7 @@ static inline u32 next_command(struct ctlr_info *h, u8 q)
37034 unsigned long flags;
37035
37036 if (unlikely(!(h->transMethod & CFGTBL_Trans_Performant)))
37037 - return h->access.command_completed(h, q);
37038 + return h->access->command_completed(h, q);
37039
37040 if ((rq->head[rq->current_entry] & 1) == rq->wraparound) {
37041 a = rq->head[rq->current_entry];
37042 @@ -3355,7 +3355,7 @@ static void start_io(struct ctlr_info *h)
37043 while (!list_empty(&h->reqQ)) {
37044 c = list_entry(h->reqQ.next, struct CommandList, list);
37045 /* can't do anything if fifo is full */
37046 - if ((h->access.fifo_full(h))) {
37047 + if ((h->access->fifo_full(h))) {
37048 dev_warn(&h->pdev->dev, "fifo full\n");
37049 break;
37050 }
37051 @@ -3377,7 +3377,7 @@ static void start_io(struct ctlr_info *h)
37052
37053 /* Tell the controller execute command */
37054 spin_unlock_irqrestore(&h->lock, flags);
37055 - h->access.submit_command(h, c);
37056 + h->access->submit_command(h, c);
37057 spin_lock_irqsave(&h->lock, flags);
37058 }
37059 spin_unlock_irqrestore(&h->lock, flags);
37060 @@ -3385,17 +3385,17 @@ static void start_io(struct ctlr_info *h)
37061
37062 static inline unsigned long get_next_completion(struct ctlr_info *h, u8 q)
37063 {
37064 - return h->access.command_completed(h, q);
37065 + return h->access->command_completed(h, q);
37066 }
37067
37068 static inline bool interrupt_pending(struct ctlr_info *h)
37069 {
37070 - return h->access.intr_pending(h);
37071 + return h->access->intr_pending(h);
37072 }
37073
37074 static inline long interrupt_not_for_us(struct ctlr_info *h)
37075 {
37076 - return (h->access.intr_pending(h) == 0) ||
37077 + return (h->access->intr_pending(h) == 0) ||
37078 (h->interrupts_enabled == 0);
37079 }
37080
37081 @@ -4299,7 +4299,7 @@ static int __devinit hpsa_pci_init(struct ctlr_info *h)
37082 if (prod_index < 0)
37083 return -ENODEV;
37084 h->product_name = products[prod_index].product_name;
37085 - h->access = *(products[prod_index].access);
37086 + h->access = products[prod_index].access;
37087
37088 pci_disable_link_state(h->pdev, PCIE_LINK_STATE_L0S |
37089 PCIE_LINK_STATE_L1 | PCIE_LINK_STATE_CLKPM);
37090 @@ -4581,7 +4581,7 @@ static void controller_lockup_detected(struct ctlr_info *h)
37091
37092 assert_spin_locked(&lockup_detector_lock);
37093 remove_ctlr_from_lockup_detector_list(h);
37094 - h->access.set_intr_mask(h, HPSA_INTR_OFF);
37095 + h->access->set_intr_mask(h, HPSA_INTR_OFF);
37096 spin_lock_irqsave(&h->lock, flags);
37097 h->lockup_detected = readl(h->vaddr + SA5_SCRATCHPAD_OFFSET);
37098 spin_unlock_irqrestore(&h->lock, flags);
37099 @@ -4759,7 +4759,7 @@ reinit_after_soft_reset:
37100 }
37101
37102 /* make sure the board interrupts are off */
37103 - h->access.set_intr_mask(h, HPSA_INTR_OFF);
37104 + h->access->set_intr_mask(h, HPSA_INTR_OFF);
37105
37106 if (hpsa_request_irq(h, do_hpsa_intr_msi, do_hpsa_intr_intx))
37107 goto clean2;
37108 @@ -4793,7 +4793,7 @@ reinit_after_soft_reset:
37109 * fake ones to scoop up any residual completions.
37110 */
37111 spin_lock_irqsave(&h->lock, flags);
37112 - h->access.set_intr_mask(h, HPSA_INTR_OFF);
37113 + h->access->set_intr_mask(h, HPSA_INTR_OFF);
37114 spin_unlock_irqrestore(&h->lock, flags);
37115 free_irqs(h);
37116 rc = hpsa_request_irq(h, hpsa_msix_discard_completions,
37117 @@ -4812,9 +4812,9 @@ reinit_after_soft_reset:
37118 dev_info(&h->pdev->dev, "Board READY.\n");
37119 dev_info(&h->pdev->dev,
37120 "Waiting for stale completions to drain.\n");
37121 - h->access.set_intr_mask(h, HPSA_INTR_ON);
37122 + h->access->set_intr_mask(h, HPSA_INTR_ON);
37123 msleep(10000);
37124 - h->access.set_intr_mask(h, HPSA_INTR_OFF);
37125 + h->access->set_intr_mask(h, HPSA_INTR_OFF);
37126
37127 rc = controller_reset_failed(h->cfgtable);
37128 if (rc)
37129 @@ -4835,7 +4835,7 @@ reinit_after_soft_reset:
37130 }
37131
37132 /* Turn the interrupts on so we can service requests */
37133 - h->access.set_intr_mask(h, HPSA_INTR_ON);
37134 + h->access->set_intr_mask(h, HPSA_INTR_ON);
37135
37136 hpsa_hba_inquiry(h);
37137 hpsa_register_scsi(h); /* hook ourselves into SCSI subsystem */
37138 @@ -4887,7 +4887,7 @@ static void hpsa_shutdown(struct pci_dev *pdev)
37139 * To write all data in the battery backed cache to disks
37140 */
37141 hpsa_flush_cache(h);
37142 - h->access.set_intr_mask(h, HPSA_INTR_OFF);
37143 + h->access->set_intr_mask(h, HPSA_INTR_OFF);
37144 hpsa_free_irqs_and_disable_msix(h);
37145 }
37146
37147 @@ -5056,7 +5056,7 @@ static __devinit void hpsa_enter_performant_mode(struct ctlr_info *h,
37148 return;
37149 }
37150 /* Change the access methods to the performant access methods */
37151 - h->access = SA5_performant_access;
37152 + h->access = &SA5_performant_access;
37153 h->transMethod = CFGTBL_Trans_Performant;
37154 }
37155
37156 diff --git a/drivers/scsi/hpsa.h b/drivers/scsi/hpsa.h
37157 index 9816479..c5d4e97 100644
37158 --- a/drivers/scsi/hpsa.h
37159 +++ b/drivers/scsi/hpsa.h
37160 @@ -79,7 +79,7 @@ struct ctlr_info {
37161 unsigned int msix_vector;
37162 unsigned int msi_vector;
37163 int intr_mode; /* either PERF_MODE_INT or SIMPLE_MODE_INT */
37164 - struct access_method access;
37165 + struct access_method *access;
37166
37167 /* queue and queue Info */
37168 struct list_head reqQ;
37169 diff --git a/drivers/scsi/ips.h b/drivers/scsi/ips.h
37170 index f2df059..a3a9930 100644
37171 --- a/drivers/scsi/ips.h
37172 +++ b/drivers/scsi/ips.h
37173 @@ -1027,7 +1027,7 @@ typedef struct {
37174 int (*intr)(struct ips_ha *);
37175 void (*enableint)(struct ips_ha *);
37176 uint32_t (*statupd)(struct ips_ha *);
37177 -} ips_hw_func_t;
37178 +} __no_const ips_hw_func_t;
37179
37180 typedef struct ips_ha {
37181 uint8_t ha_id[IPS_MAX_CHANNELS+1];
37182 diff --git a/drivers/scsi/libfc/fc_exch.c b/drivers/scsi/libfc/fc_exch.c
37183 index c772d8d..35c362c 100644
37184 --- a/drivers/scsi/libfc/fc_exch.c
37185 +++ b/drivers/scsi/libfc/fc_exch.c
37186 @@ -100,12 +100,12 @@ struct fc_exch_mgr {
37187 u16 pool_max_index;
37188
37189 struct {
37190 - atomic_t no_free_exch;
37191 - atomic_t no_free_exch_xid;
37192 - atomic_t xid_not_found;
37193 - atomic_t xid_busy;
37194 - atomic_t seq_not_found;
37195 - atomic_t non_bls_resp;
37196 + atomic_unchecked_t no_free_exch;
37197 + atomic_unchecked_t no_free_exch_xid;
37198 + atomic_unchecked_t xid_not_found;
37199 + atomic_unchecked_t xid_busy;
37200 + atomic_unchecked_t seq_not_found;
37201 + atomic_unchecked_t non_bls_resp;
37202 } stats;
37203 };
37204
37205 @@ -725,7 +725,7 @@ static struct fc_exch *fc_exch_em_alloc(struct fc_lport *lport,
37206 /* allocate memory for exchange */
37207 ep = mempool_alloc(mp->ep_pool, GFP_ATOMIC);
37208 if (!ep) {
37209 - atomic_inc(&mp->stats.no_free_exch);
37210 + atomic_inc_unchecked(&mp->stats.no_free_exch);
37211 goto out;
37212 }
37213 memset(ep, 0, sizeof(*ep));
37214 @@ -786,7 +786,7 @@ out:
37215 return ep;
37216 err:
37217 spin_unlock_bh(&pool->lock);
37218 - atomic_inc(&mp->stats.no_free_exch_xid);
37219 + atomic_inc_unchecked(&mp->stats.no_free_exch_xid);
37220 mempool_free(ep, mp->ep_pool);
37221 return NULL;
37222 }
37223 @@ -929,7 +929,7 @@ static enum fc_pf_rjt_reason fc_seq_lookup_recip(struct fc_lport *lport,
37224 xid = ntohs(fh->fh_ox_id); /* we originated exch */
37225 ep = fc_exch_find(mp, xid);
37226 if (!ep) {
37227 - atomic_inc(&mp->stats.xid_not_found);
37228 + atomic_inc_unchecked(&mp->stats.xid_not_found);
37229 reject = FC_RJT_OX_ID;
37230 goto out;
37231 }
37232 @@ -959,7 +959,7 @@ static enum fc_pf_rjt_reason fc_seq_lookup_recip(struct fc_lport *lport,
37233 ep = fc_exch_find(mp, xid);
37234 if ((f_ctl & FC_FC_FIRST_SEQ) && fc_sof_is_init(fr_sof(fp))) {
37235 if (ep) {
37236 - atomic_inc(&mp->stats.xid_busy);
37237 + atomic_inc_unchecked(&mp->stats.xid_busy);
37238 reject = FC_RJT_RX_ID;
37239 goto rel;
37240 }
37241 @@ -970,7 +970,7 @@ static enum fc_pf_rjt_reason fc_seq_lookup_recip(struct fc_lport *lport,
37242 }
37243 xid = ep->xid; /* get our XID */
37244 } else if (!ep) {
37245 - atomic_inc(&mp->stats.xid_not_found);
37246 + atomic_inc_unchecked(&mp->stats.xid_not_found);
37247 reject = FC_RJT_RX_ID; /* XID not found */
37248 goto out;
37249 }
37250 @@ -987,7 +987,7 @@ static enum fc_pf_rjt_reason fc_seq_lookup_recip(struct fc_lport *lport,
37251 } else {
37252 sp = &ep->seq;
37253 if (sp->id != fh->fh_seq_id) {
37254 - atomic_inc(&mp->stats.seq_not_found);
37255 + atomic_inc_unchecked(&mp->stats.seq_not_found);
37256 if (f_ctl & FC_FC_END_SEQ) {
37257 /*
37258 * Update sequence_id based on incoming last
37259 @@ -1437,22 +1437,22 @@ static void fc_exch_recv_seq_resp(struct fc_exch_mgr *mp, struct fc_frame *fp)
37260
37261 ep = fc_exch_find(mp, ntohs(fh->fh_ox_id));
37262 if (!ep) {
37263 - atomic_inc(&mp->stats.xid_not_found);
37264 + atomic_inc_unchecked(&mp->stats.xid_not_found);
37265 goto out;
37266 }
37267 if (ep->esb_stat & ESB_ST_COMPLETE) {
37268 - atomic_inc(&mp->stats.xid_not_found);
37269 + atomic_inc_unchecked(&mp->stats.xid_not_found);
37270 goto rel;
37271 }
37272 if (ep->rxid == FC_XID_UNKNOWN)
37273 ep->rxid = ntohs(fh->fh_rx_id);
37274 if (ep->sid != 0 && ep->sid != ntoh24(fh->fh_d_id)) {
37275 - atomic_inc(&mp->stats.xid_not_found);
37276 + atomic_inc_unchecked(&mp->stats.xid_not_found);
37277 goto rel;
37278 }
37279 if (ep->did != ntoh24(fh->fh_s_id) &&
37280 ep->did != FC_FID_FLOGI) {
37281 - atomic_inc(&mp->stats.xid_not_found);
37282 + atomic_inc_unchecked(&mp->stats.xid_not_found);
37283 goto rel;
37284 }
37285 sof = fr_sof(fp);
37286 @@ -1461,7 +1461,7 @@ static void fc_exch_recv_seq_resp(struct fc_exch_mgr *mp, struct fc_frame *fp)
37287 sp->ssb_stat |= SSB_ST_RESP;
37288 sp->id = fh->fh_seq_id;
37289 } else if (sp->id != fh->fh_seq_id) {
37290 - atomic_inc(&mp->stats.seq_not_found);
37291 + atomic_inc_unchecked(&mp->stats.seq_not_found);
37292 goto rel;
37293 }
37294
37295 @@ -1525,9 +1525,9 @@ static void fc_exch_recv_resp(struct fc_exch_mgr *mp, struct fc_frame *fp)
37296 sp = fc_seq_lookup_orig(mp, fp); /* doesn't hold sequence */
37297
37298 if (!sp)
37299 - atomic_inc(&mp->stats.xid_not_found);
37300 + atomic_inc_unchecked(&mp->stats.xid_not_found);
37301 else
37302 - atomic_inc(&mp->stats.non_bls_resp);
37303 + atomic_inc_unchecked(&mp->stats.non_bls_resp);
37304
37305 fc_frame_free(fp);
37306 }
37307 @@ -2174,13 +2174,13 @@ void fc_exch_update_stats(struct fc_lport *lport)
37308
37309 list_for_each_entry(ema, &lport->ema_list, ema_list) {
37310 mp = ema->mp;
37311 - st->fc_no_free_exch += atomic_read(&mp->stats.no_free_exch);
37312 + st->fc_no_free_exch += atomic_read_unchecked(&mp->stats.no_free_exch);
37313 st->fc_no_free_exch_xid +=
37314 - atomic_read(&mp->stats.no_free_exch_xid);
37315 - st->fc_xid_not_found += atomic_read(&mp->stats.xid_not_found);
37316 - st->fc_xid_busy += atomic_read(&mp->stats.xid_busy);
37317 - st->fc_seq_not_found += atomic_read(&mp->stats.seq_not_found);
37318 - st->fc_non_bls_resp += atomic_read(&mp->stats.non_bls_resp);
37319 + atomic_read_unchecked(&mp->stats.no_free_exch_xid);
37320 + st->fc_xid_not_found += atomic_read_unchecked(&mp->stats.xid_not_found);
37321 + st->fc_xid_busy += atomic_read_unchecked(&mp->stats.xid_busy);
37322 + st->fc_seq_not_found += atomic_read_unchecked(&mp->stats.seq_not_found);
37323 + st->fc_non_bls_resp += atomic_read_unchecked(&mp->stats.non_bls_resp);
37324 }
37325 }
37326 EXPORT_SYMBOL(fc_exch_update_stats);
37327 diff --git a/drivers/scsi/libsas/sas_ata.c b/drivers/scsi/libsas/sas_ata.c
37328 index a59fcdc..abe55f3 100644
37329 --- a/drivers/scsi/libsas/sas_ata.c
37330 +++ b/drivers/scsi/libsas/sas_ata.c
37331 @@ -554,7 +554,7 @@ static struct ata_port_operations sas_sata_ops = {
37332 .postreset = ata_std_postreset,
37333 .error_handler = ata_std_error_handler,
37334 .post_internal_cmd = sas_ata_post_internal,
37335 - .qc_defer = ata_std_qc_defer,
37336 + .qc_defer = ata_std_qc_defer,
37337 .qc_prep = ata_noop_qc_prep,
37338 .qc_issue = sas_ata_qc_issue,
37339 .qc_fill_rtf = sas_ata_qc_fill_rtf,
37340 diff --git a/drivers/scsi/lpfc/lpfc.h b/drivers/scsi/lpfc/lpfc.h
37341 index a65c05a..a39e402 100644
37342 --- a/drivers/scsi/lpfc/lpfc.h
37343 +++ b/drivers/scsi/lpfc/lpfc.h
37344 @@ -420,7 +420,7 @@ struct lpfc_vport {
37345 struct dentry *debug_nodelist;
37346 struct dentry *vport_debugfs_root;
37347 struct lpfc_debugfs_trc *disc_trc;
37348 - atomic_t disc_trc_cnt;
37349 + atomic_unchecked_t disc_trc_cnt;
37350 #endif
37351 uint8_t stat_data_enabled;
37352 uint8_t stat_data_blocked;
37353 @@ -834,8 +834,8 @@ struct lpfc_hba {
37354 struct timer_list fabric_block_timer;
37355 unsigned long bit_flags;
37356 #define FABRIC_COMANDS_BLOCKED 0
37357 - atomic_t num_rsrc_err;
37358 - atomic_t num_cmd_success;
37359 + atomic_unchecked_t num_rsrc_err;
37360 + atomic_unchecked_t num_cmd_success;
37361 unsigned long last_rsrc_error_time;
37362 unsigned long last_ramp_down_time;
37363 unsigned long last_ramp_up_time;
37364 @@ -871,7 +871,7 @@ struct lpfc_hba {
37365
37366 struct dentry *debug_slow_ring_trc;
37367 struct lpfc_debugfs_trc *slow_ring_trc;
37368 - atomic_t slow_ring_trc_cnt;
37369 + atomic_unchecked_t slow_ring_trc_cnt;
37370 /* iDiag debugfs sub-directory */
37371 struct dentry *idiag_root;
37372 struct dentry *idiag_pci_cfg;
37373 diff --git a/drivers/scsi/lpfc/lpfc_debugfs.c b/drivers/scsi/lpfc/lpfc_debugfs.c
37374 index 3217d63..c417981 100644
37375 --- a/drivers/scsi/lpfc/lpfc_debugfs.c
37376 +++ b/drivers/scsi/lpfc/lpfc_debugfs.c
37377 @@ -106,7 +106,7 @@ MODULE_PARM_DESC(lpfc_debugfs_mask_disc_trc,
37378
37379 #include <linux/debugfs.h>
37380
37381 -static atomic_t lpfc_debugfs_seq_trc_cnt = ATOMIC_INIT(0);
37382 +static atomic_unchecked_t lpfc_debugfs_seq_trc_cnt = ATOMIC_INIT(0);
37383 static unsigned long lpfc_debugfs_start_time = 0L;
37384
37385 /* iDiag */
37386 @@ -147,7 +147,7 @@ lpfc_debugfs_disc_trc_data(struct lpfc_vport *vport, char *buf, int size)
37387 lpfc_debugfs_enable = 0;
37388
37389 len = 0;
37390 - index = (atomic_read(&vport->disc_trc_cnt) + 1) &
37391 + index = (atomic_read_unchecked(&vport->disc_trc_cnt) + 1) &
37392 (lpfc_debugfs_max_disc_trc - 1);
37393 for (i = index; i < lpfc_debugfs_max_disc_trc; i++) {
37394 dtp = vport->disc_trc + i;
37395 @@ -213,7 +213,7 @@ lpfc_debugfs_slow_ring_trc_data(struct lpfc_hba *phba, char *buf, int size)
37396 lpfc_debugfs_enable = 0;
37397
37398 len = 0;
37399 - index = (atomic_read(&phba->slow_ring_trc_cnt) + 1) &
37400 + index = (atomic_read_unchecked(&phba->slow_ring_trc_cnt) + 1) &
37401 (lpfc_debugfs_max_slow_ring_trc - 1);
37402 for (i = index; i < lpfc_debugfs_max_slow_ring_trc; i++) {
37403 dtp = phba->slow_ring_trc + i;
37404 @@ -636,14 +636,14 @@ lpfc_debugfs_disc_trc(struct lpfc_vport *vport, int mask, char *fmt,
37405 !vport || !vport->disc_trc)
37406 return;
37407
37408 - index = atomic_inc_return(&vport->disc_trc_cnt) &
37409 + index = atomic_inc_return_unchecked(&vport->disc_trc_cnt) &
37410 (lpfc_debugfs_max_disc_trc - 1);
37411 dtp = vport->disc_trc + index;
37412 dtp->fmt = fmt;
37413 dtp->data1 = data1;
37414 dtp->data2 = data2;
37415 dtp->data3 = data3;
37416 - dtp->seq_cnt = atomic_inc_return(&lpfc_debugfs_seq_trc_cnt);
37417 + dtp->seq_cnt = atomic_inc_return_unchecked(&lpfc_debugfs_seq_trc_cnt);
37418 dtp->jif = jiffies;
37419 #endif
37420 return;
37421 @@ -674,14 +674,14 @@ lpfc_debugfs_slow_ring_trc(struct lpfc_hba *phba, char *fmt,
37422 !phba || !phba->slow_ring_trc)
37423 return;
37424
37425 - index = atomic_inc_return(&phba->slow_ring_trc_cnt) &
37426 + index = atomic_inc_return_unchecked(&phba->slow_ring_trc_cnt) &
37427 (lpfc_debugfs_max_slow_ring_trc - 1);
37428 dtp = phba->slow_ring_trc + index;
37429 dtp->fmt = fmt;
37430 dtp->data1 = data1;
37431 dtp->data2 = data2;
37432 dtp->data3 = data3;
37433 - dtp->seq_cnt = atomic_inc_return(&lpfc_debugfs_seq_trc_cnt);
37434 + dtp->seq_cnt = atomic_inc_return_unchecked(&lpfc_debugfs_seq_trc_cnt);
37435 dtp->jif = jiffies;
37436 #endif
37437 return;
37438 @@ -4090,7 +4090,7 @@ lpfc_debugfs_initialize(struct lpfc_vport *vport)
37439 "slow_ring buffer\n");
37440 goto debug_failed;
37441 }
37442 - atomic_set(&phba->slow_ring_trc_cnt, 0);
37443 + atomic_set_unchecked(&phba->slow_ring_trc_cnt, 0);
37444 memset(phba->slow_ring_trc, 0,
37445 (sizeof(struct lpfc_debugfs_trc) *
37446 lpfc_debugfs_max_slow_ring_trc));
37447 @@ -4136,7 +4136,7 @@ lpfc_debugfs_initialize(struct lpfc_vport *vport)
37448 "buffer\n");
37449 goto debug_failed;
37450 }
37451 - atomic_set(&vport->disc_trc_cnt, 0);
37452 + atomic_set_unchecked(&vport->disc_trc_cnt, 0);
37453
37454 snprintf(name, sizeof(name), "discovery_trace");
37455 vport->debug_disc_trc =
37456 diff --git a/drivers/scsi/lpfc/lpfc_init.c b/drivers/scsi/lpfc/lpfc_init.c
37457 index 45c1520..35ba744 100644
37458 --- a/drivers/scsi/lpfc/lpfc_init.c
37459 +++ b/drivers/scsi/lpfc/lpfc_init.c
37460 @@ -10478,8 +10478,10 @@ lpfc_init(void)
37461 "misc_register returned with status %d", error);
37462
37463 if (lpfc_enable_npiv) {
37464 - lpfc_transport_functions.vport_create = lpfc_vport_create;
37465 - lpfc_transport_functions.vport_delete = lpfc_vport_delete;
37466 + pax_open_kernel();
37467 + *(void **)&lpfc_transport_functions.vport_create = lpfc_vport_create;
37468 + *(void **)&lpfc_transport_functions.vport_delete = lpfc_vport_delete;
37469 + pax_close_kernel();
37470 }
37471 lpfc_transport_template =
37472 fc_attach_transport(&lpfc_transport_functions);
37473 diff --git a/drivers/scsi/lpfc/lpfc_scsi.c b/drivers/scsi/lpfc/lpfc_scsi.c
37474 index 925975d..0f1fc07 100644
37475 --- a/drivers/scsi/lpfc/lpfc_scsi.c
37476 +++ b/drivers/scsi/lpfc/lpfc_scsi.c
37477 @@ -311,7 +311,7 @@ lpfc_rampdown_queue_depth(struct lpfc_hba *phba)
37478 uint32_t evt_posted;
37479
37480 spin_lock_irqsave(&phba->hbalock, flags);
37481 - atomic_inc(&phba->num_rsrc_err);
37482 + atomic_inc_unchecked(&phba->num_rsrc_err);
37483 phba->last_rsrc_error_time = jiffies;
37484
37485 if ((phba->last_ramp_down_time + QUEUE_RAMP_DOWN_INTERVAL) > jiffies) {
37486 @@ -352,7 +352,7 @@ lpfc_rampup_queue_depth(struct lpfc_vport *vport,
37487 unsigned long flags;
37488 struct lpfc_hba *phba = vport->phba;
37489 uint32_t evt_posted;
37490 - atomic_inc(&phba->num_cmd_success);
37491 + atomic_inc_unchecked(&phba->num_cmd_success);
37492
37493 if (vport->cfg_lun_queue_depth <= queue_depth)
37494 return;
37495 @@ -396,8 +396,8 @@ lpfc_ramp_down_queue_handler(struct lpfc_hba *phba)
37496 unsigned long num_rsrc_err, num_cmd_success;
37497 int i;
37498
37499 - num_rsrc_err = atomic_read(&phba->num_rsrc_err);
37500 - num_cmd_success = atomic_read(&phba->num_cmd_success);
37501 + num_rsrc_err = atomic_read_unchecked(&phba->num_rsrc_err);
37502 + num_cmd_success = atomic_read_unchecked(&phba->num_cmd_success);
37503
37504 /*
37505 * The error and success command counters are global per
37506 @@ -425,8 +425,8 @@ lpfc_ramp_down_queue_handler(struct lpfc_hba *phba)
37507 }
37508 }
37509 lpfc_destroy_vport_work_array(phba, vports);
37510 - atomic_set(&phba->num_rsrc_err, 0);
37511 - atomic_set(&phba->num_cmd_success, 0);
37512 + atomic_set_unchecked(&phba->num_rsrc_err, 0);
37513 + atomic_set_unchecked(&phba->num_cmd_success, 0);
37514 }
37515
37516 /**
37517 @@ -460,8 +460,8 @@ lpfc_ramp_up_queue_handler(struct lpfc_hba *phba)
37518 }
37519 }
37520 lpfc_destroy_vport_work_array(phba, vports);
37521 - atomic_set(&phba->num_rsrc_err, 0);
37522 - atomic_set(&phba->num_cmd_success, 0);
37523 + atomic_set_unchecked(&phba->num_rsrc_err, 0);
37524 + atomic_set_unchecked(&phba->num_cmd_success, 0);
37525 }
37526
37527 /**
37528 diff --git a/drivers/scsi/pmcraid.c b/drivers/scsi/pmcraid.c
37529 index ea8a0b4..812a124 100644
37530 --- a/drivers/scsi/pmcraid.c
37531 +++ b/drivers/scsi/pmcraid.c
37532 @@ -200,8 +200,8 @@ static int pmcraid_slave_alloc(struct scsi_device *scsi_dev)
37533 res->scsi_dev = scsi_dev;
37534 scsi_dev->hostdata = res;
37535 res->change_detected = 0;
37536 - atomic_set(&res->read_failures, 0);
37537 - atomic_set(&res->write_failures, 0);
37538 + atomic_set_unchecked(&res->read_failures, 0);
37539 + atomic_set_unchecked(&res->write_failures, 0);
37540 rc = 0;
37541 }
37542 spin_unlock_irqrestore(&pinstance->resource_lock, lock_flags);
37543 @@ -2676,9 +2676,9 @@ static int pmcraid_error_handler(struct pmcraid_cmd *cmd)
37544
37545 /* If this was a SCSI read/write command keep count of errors */
37546 if (SCSI_CMD_TYPE(scsi_cmd->cmnd[0]) == SCSI_READ_CMD)
37547 - atomic_inc(&res->read_failures);
37548 + atomic_inc_unchecked(&res->read_failures);
37549 else if (SCSI_CMD_TYPE(scsi_cmd->cmnd[0]) == SCSI_WRITE_CMD)
37550 - atomic_inc(&res->write_failures);
37551 + atomic_inc_unchecked(&res->write_failures);
37552
37553 if (!RES_IS_GSCSI(res->cfg_entry) &&
37554 masked_ioasc != PMCRAID_IOASC_HW_DEVICE_BUS_STATUS_ERROR) {
37555 @@ -3534,7 +3534,7 @@ static int pmcraid_queuecommand_lck(
37556 * block of scsi_cmd which is re-used (e.g. cancel/abort), which uses
37557 * hrrq_id assigned here in queuecommand
37558 */
37559 - ioarcb->hrrq_id = atomic_add_return(1, &(pinstance->last_message_id)) %
37560 + ioarcb->hrrq_id = atomic_add_return_unchecked(1, &(pinstance->last_message_id)) %
37561 pinstance->num_hrrq;
37562 cmd->cmd_done = pmcraid_io_done;
37563
37564 @@ -3859,7 +3859,7 @@ static long pmcraid_ioctl_passthrough(
37565 * block of scsi_cmd which is re-used (e.g. cancel/abort), which uses
37566 * hrrq_id assigned here in queuecommand
37567 */
37568 - ioarcb->hrrq_id = atomic_add_return(1, &(pinstance->last_message_id)) %
37569 + ioarcb->hrrq_id = atomic_add_return_unchecked(1, &(pinstance->last_message_id)) %
37570 pinstance->num_hrrq;
37571
37572 if (request_size) {
37573 @@ -4497,7 +4497,7 @@ static void pmcraid_worker_function(struct work_struct *workp)
37574
37575 pinstance = container_of(workp, struct pmcraid_instance, worker_q);
37576 /* add resources only after host is added into system */
37577 - if (!atomic_read(&pinstance->expose_resources))
37578 + if (!atomic_read_unchecked(&pinstance->expose_resources))
37579 return;
37580
37581 fw_version = be16_to_cpu(pinstance->inq_data->fw_version);
37582 @@ -5331,8 +5331,8 @@ static int __devinit pmcraid_init_instance(
37583 init_waitqueue_head(&pinstance->reset_wait_q);
37584
37585 atomic_set(&pinstance->outstanding_cmds, 0);
37586 - atomic_set(&pinstance->last_message_id, 0);
37587 - atomic_set(&pinstance->expose_resources, 0);
37588 + atomic_set_unchecked(&pinstance->last_message_id, 0);
37589 + atomic_set_unchecked(&pinstance->expose_resources, 0);
37590
37591 INIT_LIST_HEAD(&pinstance->free_res_q);
37592 INIT_LIST_HEAD(&pinstance->used_res_q);
37593 @@ -6047,7 +6047,7 @@ static int __devinit pmcraid_probe(
37594 /* Schedule worker thread to handle CCN and take care of adding and
37595 * removing devices to OS
37596 */
37597 - atomic_set(&pinstance->expose_resources, 1);
37598 + atomic_set_unchecked(&pinstance->expose_resources, 1);
37599 schedule_work(&pinstance->worker_q);
37600 return rc;
37601
37602 diff --git a/drivers/scsi/pmcraid.h b/drivers/scsi/pmcraid.h
37603 index e1d150f..6c6df44 100644
37604 --- a/drivers/scsi/pmcraid.h
37605 +++ b/drivers/scsi/pmcraid.h
37606 @@ -748,7 +748,7 @@ struct pmcraid_instance {
37607 struct pmcraid_isr_param hrrq_vector[PMCRAID_NUM_MSIX_VECTORS];
37608
37609 /* Message id as filled in last fired IOARCB, used to identify HRRQ */
37610 - atomic_t last_message_id;
37611 + atomic_unchecked_t last_message_id;
37612
37613 /* configuration table */
37614 struct pmcraid_config_table *cfg_table;
37615 @@ -777,7 +777,7 @@ struct pmcraid_instance {
37616 atomic_t outstanding_cmds;
37617
37618 /* should add/delete resources to mid-layer now ?*/
37619 - atomic_t expose_resources;
37620 + atomic_unchecked_t expose_resources;
37621
37622
37623
37624 @@ -813,8 +813,8 @@ struct pmcraid_resource_entry {
37625 struct pmcraid_config_table_entry_ext cfg_entry_ext;
37626 };
37627 struct scsi_device *scsi_dev; /* Link scsi_device structure */
37628 - atomic_t read_failures; /* count of failed READ commands */
37629 - atomic_t write_failures; /* count of failed WRITE commands */
37630 + atomic_unchecked_t read_failures; /* count of failed READ commands */
37631 + atomic_unchecked_t write_failures; /* count of failed WRITE commands */
37632
37633 /* To indicate add/delete/modify during CCN */
37634 u8 change_detected;
37635 diff --git a/drivers/scsi/qla2xxx/qla_attr.c b/drivers/scsi/qla2xxx/qla_attr.c
37636 index 5ab9530..2dd80f7 100644
37637 --- a/drivers/scsi/qla2xxx/qla_attr.c
37638 +++ b/drivers/scsi/qla2xxx/qla_attr.c
37639 @@ -1855,7 +1855,7 @@ qla24xx_vport_disable(struct fc_vport *fc_vport, bool disable)
37640 return 0;
37641 }
37642
37643 -struct fc_function_template qla2xxx_transport_functions = {
37644 +fc_function_template_no_const qla2xxx_transport_functions = {
37645
37646 .show_host_node_name = 1,
37647 .show_host_port_name = 1,
37648 @@ -1902,7 +1902,7 @@ struct fc_function_template qla2xxx_transport_functions = {
37649 .bsg_timeout = qla24xx_bsg_timeout,
37650 };
37651
37652 -struct fc_function_template qla2xxx_transport_vport_functions = {
37653 +fc_function_template_no_const qla2xxx_transport_vport_functions = {
37654
37655 .show_host_node_name = 1,
37656 .show_host_port_name = 1,
37657 diff --git a/drivers/scsi/qla2xxx/qla_def.h b/drivers/scsi/qla2xxx/qla_def.h
37658 index 39007f5..7fafc64 100644
37659 --- a/drivers/scsi/qla2xxx/qla_def.h
37660 +++ b/drivers/scsi/qla2xxx/qla_def.h
37661 @@ -2284,7 +2284,7 @@ struct isp_operations {
37662 int (*start_scsi) (srb_t *);
37663 int (*abort_isp) (struct scsi_qla_host *);
37664 int (*iospace_config)(struct qla_hw_data*);
37665 -};
37666 +} __no_const;
37667
37668 /* MSI-X Support *************************************************************/
37669
37670 diff --git a/drivers/scsi/qla2xxx/qla_gbl.h b/drivers/scsi/qla2xxx/qla_gbl.h
37671 index 9eacd2d..d79629c 100644
37672 --- a/drivers/scsi/qla2xxx/qla_gbl.h
37673 +++ b/drivers/scsi/qla2xxx/qla_gbl.h
37674 @@ -484,8 +484,8 @@ extern void qla2x00_get_sym_node_name(scsi_qla_host_t *, uint8_t *);
37675 struct device_attribute;
37676 extern struct device_attribute *qla2x00_host_attrs[];
37677 struct fc_function_template;
37678 -extern struct fc_function_template qla2xxx_transport_functions;
37679 -extern struct fc_function_template qla2xxx_transport_vport_functions;
37680 +extern fc_function_template_no_const qla2xxx_transport_functions;
37681 +extern fc_function_template_no_const qla2xxx_transport_vport_functions;
37682 extern void qla2x00_alloc_sysfs_attr(scsi_qla_host_t *);
37683 extern void qla2x00_free_sysfs_attr(scsi_qla_host_t *);
37684 extern void qla2x00_init_host_attr(scsi_qla_host_t *);
37685 diff --git a/drivers/scsi/qla4xxx/ql4_def.h b/drivers/scsi/qla4xxx/ql4_def.h
37686 index 7fdba7f..1b4b2c2 100644
37687 --- a/drivers/scsi/qla4xxx/ql4_def.h
37688 +++ b/drivers/scsi/qla4xxx/ql4_def.h
37689 @@ -268,7 +268,7 @@ struct ddb_entry {
37690 * (4000 only) */
37691 atomic_t relogin_timer; /* Max Time to wait for
37692 * relogin to complete */
37693 - atomic_t relogin_retry_count; /* Num of times relogin has been
37694 + atomic_unchecked_t relogin_retry_count; /* Num of times relogin has been
37695 * retried */
37696 uint32_t default_time2wait; /* Default Min time between
37697 * relogins (+aens) */
37698 diff --git a/drivers/scsi/qla4xxx/ql4_os.c b/drivers/scsi/qla4xxx/ql4_os.c
37699 index 9da4266..377b3b6 100644
37700 --- a/drivers/scsi/qla4xxx/ql4_os.c
37701 +++ b/drivers/scsi/qla4xxx/ql4_os.c
37702 @@ -2615,12 +2615,12 @@ static void qla4xxx_check_relogin_flash_ddb(struct iscsi_cls_session *cls_sess)
37703 */
37704 if (!iscsi_is_session_online(cls_sess)) {
37705 /* Reset retry relogin timer */
37706 - atomic_inc(&ddb_entry->relogin_retry_count);
37707 + atomic_inc_unchecked(&ddb_entry->relogin_retry_count);
37708 DEBUG2(ql4_printk(KERN_INFO, ha,
37709 "%s: index[%d] relogin timed out-retrying"
37710 " relogin (%d), retry (%d)\n", __func__,
37711 ddb_entry->fw_ddb_index,
37712 - atomic_read(&ddb_entry->relogin_retry_count),
37713 + atomic_read_unchecked(&ddb_entry->relogin_retry_count),
37714 ddb_entry->default_time2wait + 4));
37715 set_bit(DPC_RELOGIN_DEVICE, &ha->dpc_flags);
37716 atomic_set(&ddb_entry->retry_relogin_timer,
37717 @@ -4635,7 +4635,7 @@ static void qla4xxx_setup_flash_ddb_entry(struct scsi_qla_host *ha,
37718
37719 atomic_set(&ddb_entry->retry_relogin_timer, INVALID_ENTRY);
37720 atomic_set(&ddb_entry->relogin_timer, 0);
37721 - atomic_set(&ddb_entry->relogin_retry_count, 0);
37722 + atomic_set_unchecked(&ddb_entry->relogin_retry_count, 0);
37723 def_timeout = le16_to_cpu(ddb_entry->fw_ddb_entry.def_timeout);
37724 ddb_entry->default_relogin_timeout =
37725 (def_timeout > LOGIN_TOV) && (def_timeout < LOGIN_TOV * 10) ?
37726 diff --git a/drivers/scsi/scsi.c b/drivers/scsi/scsi.c
37727 index 2936b44..546ecdb 100644
37728 --- a/drivers/scsi/scsi.c
37729 +++ b/drivers/scsi/scsi.c
37730 @@ -660,7 +660,7 @@ int scsi_dispatch_cmd(struct scsi_cmnd *cmd)
37731 unsigned long timeout;
37732 int rtn = 0;
37733
37734 - atomic_inc(&cmd->device->iorequest_cnt);
37735 + atomic_inc_unchecked(&cmd->device->iorequest_cnt);
37736
37737 /* check if the device is still usable */
37738 if (unlikely(cmd->device->sdev_state == SDEV_DEL)) {
37739 diff --git a/drivers/scsi/scsi_lib.c b/drivers/scsi/scsi_lib.c
37740 index faa790f..7e351ddd 100644
37741 --- a/drivers/scsi/scsi_lib.c
37742 +++ b/drivers/scsi/scsi_lib.c
37743 @@ -1442,7 +1442,7 @@ static void scsi_kill_request(struct request *req, struct request_queue *q)
37744 shost = sdev->host;
37745 scsi_init_cmd_errh(cmd);
37746 cmd->result = DID_NO_CONNECT << 16;
37747 - atomic_inc(&cmd->device->iorequest_cnt);
37748 + atomic_inc_unchecked(&cmd->device->iorequest_cnt);
37749
37750 /*
37751 * SCSI request completion path will do scsi_device_unbusy(),
37752 @@ -1468,9 +1468,9 @@ static void scsi_softirq_done(struct request *rq)
37753
37754 INIT_LIST_HEAD(&cmd->eh_entry);
37755
37756 - atomic_inc(&cmd->device->iodone_cnt);
37757 + atomic_inc_unchecked(&cmd->device->iodone_cnt);
37758 if (cmd->result)
37759 - atomic_inc(&cmd->device->ioerr_cnt);
37760 + atomic_inc_unchecked(&cmd->device->ioerr_cnt);
37761
37762 disposition = scsi_decide_disposition(cmd);
37763 if (disposition != SUCCESS &&
37764 diff --git a/drivers/scsi/scsi_sysfs.c b/drivers/scsi/scsi_sysfs.c
37765 index ce5224c..8c6d071 100644
37766 --- a/drivers/scsi/scsi_sysfs.c
37767 +++ b/drivers/scsi/scsi_sysfs.c
37768 @@ -661,7 +661,7 @@ show_iostat_##field(struct device *dev, struct device_attribute *attr, \
37769 char *buf) \
37770 { \
37771 struct scsi_device *sdev = to_scsi_device(dev); \
37772 - unsigned long long count = atomic_read(&sdev->field); \
37773 + unsigned long long count = atomic_read_unchecked(&sdev->field); \
37774 return snprintf(buf, 20, "0x%llx\n", count); \
37775 } \
37776 static DEVICE_ATTR(field, S_IRUGO, show_iostat_##field, NULL)
37777 diff --git a/drivers/scsi/scsi_tgt_lib.c b/drivers/scsi/scsi_tgt_lib.c
37778 index 84a1fdf..693b0d6 100644
37779 --- a/drivers/scsi/scsi_tgt_lib.c
37780 +++ b/drivers/scsi/scsi_tgt_lib.c
37781 @@ -362,7 +362,7 @@ static int scsi_map_user_pages(struct scsi_tgt_cmd *tcmd, struct scsi_cmnd *cmd,
37782 int err;
37783
37784 dprintk("%lx %u\n", uaddr, len);
37785 - err = blk_rq_map_user(q, rq, NULL, (void *)uaddr, len, GFP_KERNEL);
37786 + err = blk_rq_map_user(q, rq, NULL, (void __user *)uaddr, len, GFP_KERNEL);
37787 if (err) {
37788 /*
37789 * TODO: need to fixup sg_tablesize, max_segment_size,
37790 diff --git a/drivers/scsi/scsi_transport_fc.c b/drivers/scsi/scsi_transport_fc.c
37791 index e894ca7..de9d7660 100644
37792 --- a/drivers/scsi/scsi_transport_fc.c
37793 +++ b/drivers/scsi/scsi_transport_fc.c
37794 @@ -498,7 +498,7 @@ static DECLARE_TRANSPORT_CLASS(fc_vport_class,
37795 * Netlink Infrastructure
37796 */
37797
37798 -static atomic_t fc_event_seq;
37799 +static atomic_unchecked_t fc_event_seq;
37800
37801 /**
37802 * fc_get_event_number - Obtain the next sequential FC event number
37803 @@ -511,7 +511,7 @@ static atomic_t fc_event_seq;
37804 u32
37805 fc_get_event_number(void)
37806 {
37807 - return atomic_add_return(1, &fc_event_seq);
37808 + return atomic_add_return_unchecked(1, &fc_event_seq);
37809 }
37810 EXPORT_SYMBOL(fc_get_event_number);
37811
37812 @@ -659,7 +659,7 @@ static __init int fc_transport_init(void)
37813 {
37814 int error;
37815
37816 - atomic_set(&fc_event_seq, 0);
37817 + atomic_set_unchecked(&fc_event_seq, 0);
37818
37819 error = transport_class_register(&fc_host_class);
37820 if (error)
37821 @@ -849,7 +849,7 @@ static int fc_str_to_dev_loss(const char *buf, unsigned long *val)
37822 char *cp;
37823
37824 *val = simple_strtoul(buf, &cp, 0);
37825 - if ((*cp && (*cp != '\n')) || (*val < 0))
37826 + if (*cp && (*cp != '\n'))
37827 return -EINVAL;
37828 /*
37829 * Check for overflow; dev_loss_tmo is u32
37830 diff --git a/drivers/scsi/scsi_transport_iscsi.c b/drivers/scsi/scsi_transport_iscsi.c
37831 index fa1dfaa..4bb620c 100644
37832 --- a/drivers/scsi/scsi_transport_iscsi.c
37833 +++ b/drivers/scsi/scsi_transport_iscsi.c
37834 @@ -79,7 +79,7 @@ struct iscsi_internal {
37835 struct transport_container session_cont;
37836 };
37837
37838 -static atomic_t iscsi_session_nr; /* sysfs session id for next new session */
37839 +static atomic_unchecked_t iscsi_session_nr; /* sysfs session id for next new session */
37840 static struct workqueue_struct *iscsi_eh_timer_workq;
37841
37842 static DEFINE_IDA(iscsi_sess_ida);
37843 @@ -1064,7 +1064,7 @@ int iscsi_add_session(struct iscsi_cls_session *session, unsigned int target_id)
37844 int err;
37845
37846 ihost = shost->shost_data;
37847 - session->sid = atomic_add_return(1, &iscsi_session_nr);
37848 + session->sid = atomic_add_return_unchecked(1, &iscsi_session_nr);
37849
37850 if (target_id == ISCSI_MAX_TARGET) {
37851 id = ida_simple_get(&iscsi_sess_ida, 0, 0, GFP_KERNEL);
37852 @@ -2943,7 +2943,7 @@ static __init int iscsi_transport_init(void)
37853 printk(KERN_INFO "Loading iSCSI transport class v%s.\n",
37854 ISCSI_TRANSPORT_VERSION);
37855
37856 - atomic_set(&iscsi_session_nr, 0);
37857 + atomic_set_unchecked(&iscsi_session_nr, 0);
37858
37859 err = class_register(&iscsi_transport_class);
37860 if (err)
37861 diff --git a/drivers/scsi/scsi_transport_srp.c b/drivers/scsi/scsi_transport_srp.c
37862 index 21a045e..ec89e03 100644
37863 --- a/drivers/scsi/scsi_transport_srp.c
37864 +++ b/drivers/scsi/scsi_transport_srp.c
37865 @@ -33,7 +33,7 @@
37866 #include "scsi_transport_srp_internal.h"
37867
37868 struct srp_host_attrs {
37869 - atomic_t next_port_id;
37870 + atomic_unchecked_t next_port_id;
37871 };
37872 #define to_srp_host_attrs(host) ((struct srp_host_attrs *)(host)->shost_data)
37873
37874 @@ -62,7 +62,7 @@ static int srp_host_setup(struct transport_container *tc, struct device *dev,
37875 struct Scsi_Host *shost = dev_to_shost(dev);
37876 struct srp_host_attrs *srp_host = to_srp_host_attrs(shost);
37877
37878 - atomic_set(&srp_host->next_port_id, 0);
37879 + atomic_set_unchecked(&srp_host->next_port_id, 0);
37880 return 0;
37881 }
37882
37883 @@ -211,7 +211,7 @@ struct srp_rport *srp_rport_add(struct Scsi_Host *shost,
37884 memcpy(rport->port_id, ids->port_id, sizeof(rport->port_id));
37885 rport->roles = ids->roles;
37886
37887 - id = atomic_inc_return(&to_srp_host_attrs(shost)->next_port_id);
37888 + id = atomic_inc_return_unchecked(&to_srp_host_attrs(shost)->next_port_id);
37889 dev_set_name(&rport->dev, "port-%d:%d", shost->host_no, id);
37890
37891 transport_setup_device(&rport->dev);
37892 diff --git a/drivers/scsi/sd.c b/drivers/scsi/sd.c
37893 index 4df73e5..b691c58 100644
37894 --- a/drivers/scsi/sd.c
37895 +++ b/drivers/scsi/sd.c
37896 @@ -2709,7 +2709,7 @@ static int sd_probe(struct device *dev)
37897 sdkp->disk = gd;
37898 sdkp->index = index;
37899 atomic_set(&sdkp->openers, 0);
37900 - atomic_set(&sdkp->device->ioerr_cnt, 0);
37901 + atomic_set_unchecked(&sdkp->device->ioerr_cnt, 0);
37902
37903 if (!sdp->request_queue->rq_timeout) {
37904 if (sdp->type != TYPE_MOD)
37905 diff --git a/drivers/scsi/sg.c b/drivers/scsi/sg.c
37906 index 9c5c5f2..8414557 100644
37907 --- a/drivers/scsi/sg.c
37908 +++ b/drivers/scsi/sg.c
37909 @@ -1101,7 +1101,7 @@ sg_ioctl(struct file *filp, unsigned int cmd_in, unsigned long arg)
37910 sdp->disk->disk_name,
37911 MKDEV(SCSI_GENERIC_MAJOR, sdp->index),
37912 NULL,
37913 - (char *)arg);
37914 + (char __user *)arg);
37915 case BLKTRACESTART:
37916 return blk_trace_startstop(sdp->device->request_queue, 1);
37917 case BLKTRACESTOP:
37918 diff --git a/drivers/spi/spi.c b/drivers/spi/spi.c
37919 index 84c2861..ece0a31 100644
37920 --- a/drivers/spi/spi.c
37921 +++ b/drivers/spi/spi.c
37922 @@ -1453,7 +1453,7 @@ int spi_bus_unlock(struct spi_master *master)
37923 EXPORT_SYMBOL_GPL(spi_bus_unlock);
37924
37925 /* portable code must never pass more than 32 bytes */
37926 -#define SPI_BUFSIZ max(32,SMP_CACHE_BYTES)
37927 +#define SPI_BUFSIZ max(32UL,SMP_CACHE_BYTES)
37928
37929 static u8 *buf;
37930
37931 diff --git a/drivers/staging/octeon/ethernet-rx.c b/drivers/staging/octeon/ethernet-rx.c
37932 index 34afc16..ffe44dd 100644
37933 --- a/drivers/staging/octeon/ethernet-rx.c
37934 +++ b/drivers/staging/octeon/ethernet-rx.c
37935 @@ -421,11 +421,11 @@ static int cvm_oct_napi_poll(struct napi_struct *napi, int budget)
37936 /* Increment RX stats for virtual ports */
37937 if (work->ipprt >= CVMX_PIP_NUM_INPUT_PORTS) {
37938 #ifdef CONFIG_64BIT
37939 - atomic64_add(1, (atomic64_t *)&priv->stats.rx_packets);
37940 - atomic64_add(skb->len, (atomic64_t *)&priv->stats.rx_bytes);
37941 + atomic64_add_unchecked(1, (atomic64_unchecked_t *)&priv->stats.rx_packets);
37942 + atomic64_add_unchecked(skb->len, (atomic64_unchecked_t *)&priv->stats.rx_bytes);
37943 #else
37944 - atomic_add(1, (atomic_t *)&priv->stats.rx_packets);
37945 - atomic_add(skb->len, (atomic_t *)&priv->stats.rx_bytes);
37946 + atomic_add_unchecked(1, (atomic_unchecked_t *)&priv->stats.rx_packets);
37947 + atomic_add_unchecked(skb->len, (atomic_unchecked_t *)&priv->stats.rx_bytes);
37948 #endif
37949 }
37950 netif_receive_skb(skb);
37951 @@ -437,9 +437,9 @@ static int cvm_oct_napi_poll(struct napi_struct *napi, int budget)
37952 dev->name);
37953 */
37954 #ifdef CONFIG_64BIT
37955 - atomic64_add(1, (atomic64_t *)&priv->stats.rx_dropped);
37956 + atomic64_unchecked_add(1, (atomic64_unchecked_t *)&priv->stats.rx_dropped);
37957 #else
37958 - atomic_add(1, (atomic_t *)&priv->stats.rx_dropped);
37959 + atomic_add_unchecked(1, (atomic_unchecked_t *)&priv->stats.rx_dropped);
37960 #endif
37961 dev_kfree_skb_irq(skb);
37962 }
37963 diff --git a/drivers/staging/octeon/ethernet.c b/drivers/staging/octeon/ethernet.c
37964 index 683bedc..86dba9a 100644
37965 --- a/drivers/staging/octeon/ethernet.c
37966 +++ b/drivers/staging/octeon/ethernet.c
37967 @@ -252,11 +252,11 @@ static struct net_device_stats *cvm_oct_common_get_stats(struct net_device *dev)
37968 * since the RX tasklet also increments it.
37969 */
37970 #ifdef CONFIG_64BIT
37971 - atomic64_add(rx_status.dropped_packets,
37972 - (atomic64_t *)&priv->stats.rx_dropped);
37973 + atomic64_add_unchecked(rx_status.dropped_packets,
37974 + (atomic64_unchecked_t *)&priv->stats.rx_dropped);
37975 #else
37976 - atomic_add(rx_status.dropped_packets,
37977 - (atomic_t *)&priv->stats.rx_dropped);
37978 + atomic_add_unchecked(rx_status.dropped_packets,
37979 + (atomic_unchecked_t *)&priv->stats.rx_dropped);
37980 #endif
37981 }
37982
37983 diff --git a/drivers/staging/omapdrm/omap_drv.c b/drivers/staging/omapdrm/omap_drv.c
37984 index 4beab94..44149ee 100644
37985 --- a/drivers/staging/omapdrm/omap_drv.c
37986 +++ b/drivers/staging/omapdrm/omap_drv.c
37987 @@ -761,7 +761,6 @@ static struct drm_driver omap_drm_driver = {
37988 .irq_postinstall = dev_irq_postinstall,
37989 .irq_uninstall = dev_irq_uninstall,
37990 .irq_handler = dev_irq_handler,
37991 - .reclaim_buffers = drm_core_reclaim_buffers,
37992 #ifdef CONFIG_DEBUG_FS
37993 .debugfs_init = omap_debugfs_init,
37994 .debugfs_cleanup = omap_debugfs_cleanup,
37995 diff --git a/drivers/staging/rtl8712/rtl871x_io.h b/drivers/staging/rtl8712/rtl871x_io.h
37996 index dc23395..cf7e9b1 100644
37997 --- a/drivers/staging/rtl8712/rtl871x_io.h
37998 +++ b/drivers/staging/rtl8712/rtl871x_io.h
37999 @@ -108,7 +108,7 @@ struct _io_ops {
38000 u8 *pmem);
38001 u32 (*_write_port)(struct intf_hdl *pintfhdl, u32 addr, u32 cnt,
38002 u8 *pmem);
38003 -};
38004 +} __no_const;
38005
38006 struct io_req {
38007 struct list_head list;
38008 diff --git a/drivers/staging/sbe-2t3e3/netdev.c b/drivers/staging/sbe-2t3e3/netdev.c
38009 index c7b5e8b..783d6cb 100644
38010 --- a/drivers/staging/sbe-2t3e3/netdev.c
38011 +++ b/drivers/staging/sbe-2t3e3/netdev.c
38012 @@ -51,7 +51,7 @@ int t3e3_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)
38013 t3e3_if_config(sc, cmd_2t3e3, (char *)&param, &resp, &rlen);
38014
38015 if (rlen)
38016 - if (copy_to_user(data, &resp, rlen))
38017 + if (rlen > sizeof resp || copy_to_user(data, &resp, rlen))
38018 return -EFAULT;
38019
38020 return 0;
38021 diff --git a/drivers/staging/usbip/usbip_common.h b/drivers/staging/usbip/usbip_common.h
38022 index 5d89c0f..9261317 100644
38023 --- a/drivers/staging/usbip/usbip_common.h
38024 +++ b/drivers/staging/usbip/usbip_common.h
38025 @@ -289,7 +289,7 @@ struct usbip_device {
38026 void (*shutdown)(struct usbip_device *);
38027 void (*reset)(struct usbip_device *);
38028 void (*unusable)(struct usbip_device *);
38029 - } eh_ops;
38030 + } __no_const eh_ops;
38031 };
38032
38033 #define kthread_get_run(threadfn, data, namefmt, ...) \
38034 diff --git a/drivers/staging/usbip/vhci.h b/drivers/staging/usbip/vhci.h
38035 index c66b8b3..a4a035b 100644
38036 --- a/drivers/staging/usbip/vhci.h
38037 +++ b/drivers/staging/usbip/vhci.h
38038 @@ -83,7 +83,7 @@ struct vhci_hcd {
38039 unsigned resuming:1;
38040 unsigned long re_timeout;
38041
38042 - atomic_t seqnum;
38043 + atomic_unchecked_t seqnum;
38044
38045 /*
38046 * NOTE:
38047 diff --git a/drivers/staging/usbip/vhci_hcd.c b/drivers/staging/usbip/vhci_hcd.c
38048 index 12a9a5f..afd8295 100644
38049 --- a/drivers/staging/usbip/vhci_hcd.c
38050 +++ b/drivers/staging/usbip/vhci_hcd.c
38051 @@ -471,7 +471,7 @@ static void vhci_tx_urb(struct urb *urb)
38052 return;
38053 }
38054
38055 - priv->seqnum = atomic_inc_return(&the_controller->seqnum);
38056 + priv->seqnum = atomic_inc_return_unchecked(&the_controller->seqnum);
38057 if (priv->seqnum == 0xffff)
38058 dev_info(&urb->dev->dev, "seqnum max\n");
38059
38060 @@ -723,7 +723,7 @@ static int vhci_urb_dequeue(struct usb_hcd *hcd, struct urb *urb, int status)
38061 return -ENOMEM;
38062 }
38063
38064 - unlink->seqnum = atomic_inc_return(&the_controller->seqnum);
38065 + unlink->seqnum = atomic_inc_return_unchecked(&the_controller->seqnum);
38066 if (unlink->seqnum == 0xffff)
38067 pr_info("seqnum max\n");
38068
38069 @@ -911,7 +911,7 @@ static int vhci_start(struct usb_hcd *hcd)
38070 vdev->rhport = rhport;
38071 }
38072
38073 - atomic_set(&vhci->seqnum, 0);
38074 + atomic_set_unchecked(&vhci->seqnum, 0);
38075 spin_lock_init(&vhci->lock);
38076
38077 hcd->power_budget = 0; /* no limit */
38078 diff --git a/drivers/staging/usbip/vhci_rx.c b/drivers/staging/usbip/vhci_rx.c
38079 index f0eaf04..5a82e06 100644
38080 --- a/drivers/staging/usbip/vhci_rx.c
38081 +++ b/drivers/staging/usbip/vhci_rx.c
38082 @@ -77,7 +77,7 @@ static void vhci_recv_ret_submit(struct vhci_device *vdev,
38083 if (!urb) {
38084 pr_err("cannot find a urb of seqnum %u\n", pdu->base.seqnum);
38085 pr_info("max seqnum %d\n",
38086 - atomic_read(&the_controller->seqnum));
38087 + atomic_read_unchecked(&the_controller->seqnum));
38088 usbip_event_add(ud, VDEV_EVENT_ERROR_TCP);
38089 return;
38090 }
38091 diff --git a/drivers/staging/vt6655/hostap.c b/drivers/staging/vt6655/hostap.c
38092 index 6ac6f45..1b208ba 100644
38093 --- a/drivers/staging/vt6655/hostap.c
38094 +++ b/drivers/staging/vt6655/hostap.c
38095 @@ -73,14 +73,13 @@ static int msglevel =MSG_LEVEL_INFO;
38096 *
38097 */
38098
38099 +static net_device_ops_no_const apdev_netdev_ops;
38100 +
38101 static int hostap_enable_hostapd(PSDevice pDevice, int rtnl_locked)
38102 {
38103 PSDevice apdev_priv;
38104 struct net_device *dev = pDevice->dev;
38105 int ret;
38106 - const struct net_device_ops apdev_netdev_ops = {
38107 - .ndo_start_xmit = pDevice->tx_80211,
38108 - };
38109
38110 DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "%s: Enabling hostapd mode\n", dev->name);
38111
38112 @@ -92,6 +91,8 @@ static int hostap_enable_hostapd(PSDevice pDevice, int rtnl_locked)
38113 *apdev_priv = *pDevice;
38114 memcpy(pDevice->apdev->dev_addr, dev->dev_addr, ETH_ALEN);
38115
38116 + /* only half broken now */
38117 + apdev_netdev_ops.ndo_start_xmit = pDevice->tx_80211;
38118 pDevice->apdev->netdev_ops = &apdev_netdev_ops;
38119
38120 pDevice->apdev->type = ARPHRD_IEEE80211;
38121 diff --git a/drivers/staging/vt6656/hostap.c b/drivers/staging/vt6656/hostap.c
38122 index 682002a..35ed5cf 100644
38123 --- a/drivers/staging/vt6656/hostap.c
38124 +++ b/drivers/staging/vt6656/hostap.c
38125 @@ -60,14 +60,13 @@ static int msglevel =MSG_LEVEL_INFO;
38126 *
38127 */
38128
38129 +static net_device_ops_no_const apdev_netdev_ops;
38130 +
38131 static int hostap_enable_hostapd(PSDevice pDevice, int rtnl_locked)
38132 {
38133 PSDevice apdev_priv;
38134 struct net_device *dev = pDevice->dev;
38135 int ret;
38136 - const struct net_device_ops apdev_netdev_ops = {
38137 - .ndo_start_xmit = pDevice->tx_80211,
38138 - };
38139
38140 DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "%s: Enabling hostapd mode\n", dev->name);
38141
38142 @@ -79,6 +78,8 @@ static int hostap_enable_hostapd(PSDevice pDevice, int rtnl_locked)
38143 *apdev_priv = *pDevice;
38144 memcpy(pDevice->apdev->dev_addr, dev->dev_addr, ETH_ALEN);
38145
38146 + /* only half broken now */
38147 + apdev_netdev_ops.ndo_start_xmit = pDevice->tx_80211;
38148 pDevice->apdev->netdev_ops = &apdev_netdev_ops;
38149
38150 pDevice->apdev->type = ARPHRD_IEEE80211;
38151 diff --git a/drivers/staging/wlan-ng/hfa384x_usb.c b/drivers/staging/wlan-ng/hfa384x_usb.c
38152 index 7843dfd..3db105f 100644
38153 --- a/drivers/staging/wlan-ng/hfa384x_usb.c
38154 +++ b/drivers/staging/wlan-ng/hfa384x_usb.c
38155 @@ -204,7 +204,7 @@ static void unlocked_usbctlx_complete(hfa384x_t *hw, hfa384x_usbctlx_t *ctlx);
38156
38157 struct usbctlx_completor {
38158 int (*complete) (struct usbctlx_completor *);
38159 -};
38160 +} __no_const;
38161
38162 static int
38163 hfa384x_usbctlx_complete_sync(hfa384x_t *hw,
38164 diff --git a/drivers/staging/zcache/tmem.c b/drivers/staging/zcache/tmem.c
38165 index eaa9021..43f023b 100644
38166 --- a/drivers/staging/zcache/tmem.c
38167 +++ b/drivers/staging/zcache/tmem.c
38168 @@ -39,7 +39,7 @@
38169 * A tmem host implementation must use this function to register callbacks
38170 * for memory allocation.
38171 */
38172 -static struct tmem_hostops tmem_hostops;
38173 +static tmem_hostops_no_const tmem_hostops;
38174
38175 static void tmem_objnode_tree_init(void);
38176
38177 @@ -53,7 +53,7 @@ void tmem_register_hostops(struct tmem_hostops *m)
38178 * A tmem host implementation must use this function to register
38179 * callbacks for a page-accessible memory (PAM) implementation
38180 */
38181 -static struct tmem_pamops tmem_pamops;
38182 +static tmem_pamops_no_const tmem_pamops;
38183
38184 void tmem_register_pamops(struct tmem_pamops *m)
38185 {
38186 diff --git a/drivers/staging/zcache/tmem.h b/drivers/staging/zcache/tmem.h
38187 index 0d4aa82..f7832d4 100644
38188 --- a/drivers/staging/zcache/tmem.h
38189 +++ b/drivers/staging/zcache/tmem.h
38190 @@ -180,6 +180,7 @@ struct tmem_pamops {
38191 void (*new_obj)(struct tmem_obj *);
38192 int (*replace_in_obj)(void *, struct tmem_obj *);
38193 };
38194 +typedef struct tmem_pamops __no_const tmem_pamops_no_const;
38195 extern void tmem_register_pamops(struct tmem_pamops *m);
38196
38197 /* memory allocation methods provided by the host implementation */
38198 @@ -189,6 +190,7 @@ struct tmem_hostops {
38199 struct tmem_objnode *(*objnode_alloc)(struct tmem_pool *);
38200 void (*objnode_free)(struct tmem_objnode *, struct tmem_pool *);
38201 };
38202 +typedef struct tmem_hostops __no_const tmem_hostops_no_const;
38203 extern void tmem_register_hostops(struct tmem_hostops *m);
38204
38205 /* core tmem accessor functions */
38206 diff --git a/drivers/target/target_core_transport.c b/drivers/target/target_core_transport.c
38207 index 7502660..f214d9f 100644
38208 --- a/drivers/target/target_core_transport.c
38209 +++ b/drivers/target/target_core_transport.c
38210 @@ -1098,7 +1098,7 @@ struct se_device *transport_add_device_to_core_hba(
38211 spin_lock_init(&dev->se_port_lock);
38212 spin_lock_init(&dev->se_tmr_lock);
38213 spin_lock_init(&dev->qf_cmd_lock);
38214 - atomic_set(&dev->dev_ordered_id, 0);
38215 + atomic_set_unchecked(&dev->dev_ordered_id, 0);
38216
38217 se_dev_set_default_attribs(dev, dev_limits);
38218
38219 @@ -1288,7 +1288,7 @@ static int transport_check_alloc_task_attr(struct se_cmd *cmd)
38220 * Used to determine when ORDERED commands should go from
38221 * Dormant to Active status.
38222 */
38223 - cmd->se_ordered_id = atomic_inc_return(&cmd->se_dev->dev_ordered_id);
38224 + cmd->se_ordered_id = atomic_inc_return_unchecked(&cmd->se_dev->dev_ordered_id);
38225 smp_mb__after_atomic_inc();
38226 pr_debug("Allocated se_ordered_id: %u for Task Attr: 0x%02x on %s\n",
38227 cmd->se_ordered_id, cmd->sam_task_attr,
38228 diff --git a/drivers/tty/cyclades.c b/drivers/tty/cyclades.c
38229 index e61cabd..7617d26 100644
38230 --- a/drivers/tty/cyclades.c
38231 +++ b/drivers/tty/cyclades.c
38232 @@ -1589,10 +1589,10 @@ static int cy_open(struct tty_struct *tty, struct file *filp)
38233 printk(KERN_DEBUG "cyc:cy_open ttyC%d, count = %d\n", info->line,
38234 info->port.count);
38235 #endif
38236 - info->port.count++;
38237 + atomic_inc(&info->port.count);
38238 #ifdef CY_DEBUG_COUNT
38239 printk(KERN_DEBUG "cyc:cy_open (%d): incrementing count to %d\n",
38240 - current->pid, info->port.count);
38241 + current->pid, atomic_read(&info->port.count));
38242 #endif
38243
38244 /*
38245 @@ -3987,7 +3987,7 @@ static int cyclades_proc_show(struct seq_file *m, void *v)
38246 for (j = 0; j < cy_card[i].nports; j++) {
38247 info = &cy_card[i].ports[j];
38248
38249 - if (info->port.count) {
38250 + if (atomic_read(&info->port.count)) {
38251 /* XXX is the ldisc num worth this? */
38252 struct tty_struct *tty;
38253 struct tty_ldisc *ld;
38254 diff --git a/drivers/tty/hvc/hvc_console.c b/drivers/tty/hvc/hvc_console.c
38255 index 2d691eb..be02ebd 100644
38256 --- a/drivers/tty/hvc/hvc_console.c
38257 +++ b/drivers/tty/hvc/hvc_console.c
38258 @@ -315,7 +315,7 @@ static int hvc_open(struct tty_struct *tty, struct file * filp)
38259
38260 spin_lock_irqsave(&hp->port.lock, flags);
38261 /* Check and then increment for fast path open. */
38262 - if (hp->port.count++ > 0) {
38263 + if (atomic_inc_return(&hp->port.count) > 1) {
38264 spin_unlock_irqrestore(&hp->port.lock, flags);
38265 hvc_kick();
38266 return 0;
38267 @@ -366,7 +366,7 @@ static void hvc_close(struct tty_struct *tty, struct file * filp)
38268
38269 spin_lock_irqsave(&hp->port.lock, flags);
38270
38271 - if (--hp->port.count == 0) {
38272 + if (atomic_dec_return(&hp->port.count) == 0) {
38273 spin_unlock_irqrestore(&hp->port.lock, flags);
38274 /* We are done with the tty pointer now. */
38275 tty_port_tty_set(&hp->port, NULL);
38276 @@ -384,9 +384,9 @@ static void hvc_close(struct tty_struct *tty, struct file * filp)
38277 */
38278 tty_wait_until_sent_from_close(tty, HVC_CLOSE_WAIT);
38279 } else {
38280 - if (hp->port.count < 0)
38281 + if (atomic_read(&hp->port.count) < 0)
38282 printk(KERN_ERR "hvc_close %X: oops, count is %d\n",
38283 - hp->vtermno, hp->port.count);
38284 + hp->vtermno, atomic_read(&hp->port.count));
38285 spin_unlock_irqrestore(&hp->port.lock, flags);
38286 }
38287
38288 @@ -412,13 +412,13 @@ static void hvc_hangup(struct tty_struct *tty)
38289 * open->hangup case this can be called after the final close so prevent
38290 * that from happening for now.
38291 */
38292 - if (hp->port.count <= 0) {
38293 + if (atomic_read(&hp->port.count) <= 0) {
38294 spin_unlock_irqrestore(&hp->port.lock, flags);
38295 return;
38296 }
38297
38298 - temp_open_count = hp->port.count;
38299 - hp->port.count = 0;
38300 + temp_open_count = atomic_read(&hp->port.count);
38301 + atomic_set(&hp->port.count, 0);
38302 spin_unlock_irqrestore(&hp->port.lock, flags);
38303 tty_port_tty_set(&hp->port, NULL);
38304
38305 @@ -471,7 +471,7 @@ static int hvc_write(struct tty_struct *tty, const unsigned char *buf, int count
38306 return -EPIPE;
38307
38308 /* FIXME what's this (unprotected) check for? */
38309 - if (hp->port.count <= 0)
38310 + if (atomic_read(&hp->port.count) <= 0)
38311 return -EIO;
38312
38313 spin_lock_irqsave(&hp->lock, flags);
38314 diff --git a/drivers/tty/hvc/hvcs.c b/drivers/tty/hvc/hvcs.c
38315 index d56788c..12d8f85 100644
38316 --- a/drivers/tty/hvc/hvcs.c
38317 +++ b/drivers/tty/hvc/hvcs.c
38318 @@ -83,6 +83,7 @@
38319 #include <asm/hvcserver.h>
38320 #include <asm/uaccess.h>
38321 #include <asm/vio.h>
38322 +#include <asm/local.h>
38323
38324 /*
38325 * 1.3.0 -> 1.3.1 In hvcs_open memset(..,0x00,..) instead of memset(..,0x3F,00).
38326 @@ -416,7 +417,7 @@ static ssize_t hvcs_vterm_state_store(struct device *dev, struct device_attribut
38327
38328 spin_lock_irqsave(&hvcsd->lock, flags);
38329
38330 - if (hvcsd->port.count > 0) {
38331 + if (atomic_read(&hvcsd->port.count) > 0) {
38332 spin_unlock_irqrestore(&hvcsd->lock, flags);
38333 printk(KERN_INFO "HVCS: vterm state unchanged. "
38334 "The hvcs device node is still in use.\n");
38335 @@ -1134,7 +1135,7 @@ static int hvcs_open(struct tty_struct *tty, struct file *filp)
38336 if ((retval = hvcs_partner_connect(hvcsd)))
38337 goto error_release;
38338
38339 - hvcsd->port.count = 1;
38340 + atomic_set(&hvcsd->port.count, 1);
38341 hvcsd->port.tty = tty;
38342 tty->driver_data = hvcsd;
38343
38344 @@ -1168,7 +1169,7 @@ fast_open:
38345
38346 spin_lock_irqsave(&hvcsd->lock, flags);
38347 tty_port_get(&hvcsd->port);
38348 - hvcsd->port.count++;
38349 + atomic_inc(&hvcsd->port.count);
38350 hvcsd->todo_mask |= HVCS_SCHED_READ;
38351 spin_unlock_irqrestore(&hvcsd->lock, flags);
38352
38353 @@ -1212,7 +1213,7 @@ static void hvcs_close(struct tty_struct *tty, struct file *filp)
38354 hvcsd = tty->driver_data;
38355
38356 spin_lock_irqsave(&hvcsd->lock, flags);
38357 - if (--hvcsd->port.count == 0) {
38358 + if (atomic_dec_and_test(&hvcsd->port.count)) {
38359
38360 vio_disable_interrupts(hvcsd->vdev);
38361
38362 @@ -1238,10 +1239,10 @@ static void hvcs_close(struct tty_struct *tty, struct file *filp)
38363 free_irq(irq, hvcsd);
38364 tty_port_put(&hvcsd->port);
38365 return;
38366 - } else if (hvcsd->port.count < 0) {
38367 + } else if (atomic_read(&hvcsd->port.count) < 0) {
38368 printk(KERN_ERR "HVCS: vty-server@%X open_count: %d"
38369 " is missmanaged.\n",
38370 - hvcsd->vdev->unit_address, hvcsd->port.count);
38371 + hvcsd->vdev->unit_address, atomic_read(&hvcsd->port.count));
38372 }
38373
38374 spin_unlock_irqrestore(&hvcsd->lock, flags);
38375 @@ -1257,7 +1258,7 @@ static void hvcs_hangup(struct tty_struct * tty)
38376
38377 spin_lock_irqsave(&hvcsd->lock, flags);
38378 /* Preserve this so that we know how many kref refs to put */
38379 - temp_open_count = hvcsd->port.count;
38380 + temp_open_count = atomic_read(&hvcsd->port.count);
38381
38382 /*
38383 * Don't kref put inside the spinlock because the destruction
38384 @@ -1272,7 +1273,7 @@ static void hvcs_hangup(struct tty_struct * tty)
38385 tty->driver_data = NULL;
38386 hvcsd->port.tty = NULL;
38387
38388 - hvcsd->port.count = 0;
38389 + atomic_set(&hvcsd->port.count, 0);
38390
38391 /* This will drop any buffered data on the floor which is OK in a hangup
38392 * scenario. */
38393 @@ -1343,7 +1344,7 @@ static int hvcs_write(struct tty_struct *tty,
38394 * the middle of a write operation? This is a crummy place to do this
38395 * but we want to keep it all in the spinlock.
38396 */
38397 - if (hvcsd->port.count <= 0) {
38398 + if (atomic_read(&hvcsd->port.count) <= 0) {
38399 spin_unlock_irqrestore(&hvcsd->lock, flags);
38400 return -ENODEV;
38401 }
38402 @@ -1417,7 +1418,7 @@ static int hvcs_write_room(struct tty_struct *tty)
38403 {
38404 struct hvcs_struct *hvcsd = tty->driver_data;
38405
38406 - if (!hvcsd || hvcsd->port.count <= 0)
38407 + if (!hvcsd || atomic_read(&hvcsd->port.count) <= 0)
38408 return 0;
38409
38410 return HVCS_BUFF_LEN - hvcsd->chars_in_buffer;
38411 diff --git a/drivers/tty/ipwireless/tty.c b/drivers/tty/ipwireless/tty.c
38412 index f8b5fa0..4ba9f89 100644
38413 --- a/drivers/tty/ipwireless/tty.c
38414 +++ b/drivers/tty/ipwireless/tty.c
38415 @@ -29,6 +29,7 @@
38416 #include <linux/tty_driver.h>
38417 #include <linux/tty_flip.h>
38418 #include <linux/uaccess.h>
38419 +#include <asm/local.h>
38420
38421 #include "tty.h"
38422 #include "network.h"
38423 @@ -99,10 +100,10 @@ static int ipw_open(struct tty_struct *linux_tty, struct file *filp)
38424 mutex_unlock(&tty->ipw_tty_mutex);
38425 return -ENODEV;
38426 }
38427 - if (tty->port.count == 0)
38428 + if (atomic_read(&tty->port.count) == 0)
38429 tty->tx_bytes_queued = 0;
38430
38431 - tty->port.count++;
38432 + atomic_inc(&tty->port.count);
38433
38434 tty->port.tty = linux_tty;
38435 linux_tty->driver_data = tty;
38436 @@ -118,9 +119,7 @@ static int ipw_open(struct tty_struct *linux_tty, struct file *filp)
38437
38438 static void do_ipw_close(struct ipw_tty *tty)
38439 {
38440 - tty->port.count--;
38441 -
38442 - if (tty->port.count == 0) {
38443 + if (atomic_dec_return(&tty->port.count) == 0) {
38444 struct tty_struct *linux_tty = tty->port.tty;
38445
38446 if (linux_tty != NULL) {
38447 @@ -141,7 +140,7 @@ static void ipw_hangup(struct tty_struct *linux_tty)
38448 return;
38449
38450 mutex_lock(&tty->ipw_tty_mutex);
38451 - if (tty->port.count == 0) {
38452 + if (atomic_read(&tty->port.count) == 0) {
38453 mutex_unlock(&tty->ipw_tty_mutex);
38454 return;
38455 }
38456 @@ -170,7 +169,7 @@ void ipwireless_tty_received(struct ipw_tty *tty, unsigned char *data,
38457 return;
38458 }
38459
38460 - if (!tty->port.count) {
38461 + if (!atomic_read(&tty->port.count)) {
38462 mutex_unlock(&tty->ipw_tty_mutex);
38463 return;
38464 }
38465 @@ -212,7 +211,7 @@ static int ipw_write(struct tty_struct *linux_tty,
38466 return -ENODEV;
38467
38468 mutex_lock(&tty->ipw_tty_mutex);
38469 - if (!tty->port.count) {
38470 + if (!atomic_read(&tty->port.count)) {
38471 mutex_unlock(&tty->ipw_tty_mutex);
38472 return -EINVAL;
38473 }
38474 @@ -252,7 +251,7 @@ static int ipw_write_room(struct tty_struct *linux_tty)
38475 if (!tty)
38476 return -ENODEV;
38477
38478 - if (!tty->port.count)
38479 + if (!atomic_read(&tty->port.count))
38480 return -EINVAL;
38481
38482 room = IPWIRELESS_TX_QUEUE_SIZE - tty->tx_bytes_queued;
38483 @@ -294,7 +293,7 @@ static int ipw_chars_in_buffer(struct tty_struct *linux_tty)
38484 if (!tty)
38485 return 0;
38486
38487 - if (!tty->port.count)
38488 + if (!atomic_read(&tty->port.count))
38489 return 0;
38490
38491 return tty->tx_bytes_queued;
38492 @@ -375,7 +374,7 @@ static int ipw_tiocmget(struct tty_struct *linux_tty)
38493 if (!tty)
38494 return -ENODEV;
38495
38496 - if (!tty->port.count)
38497 + if (!atomic_read(&tty->port.count))
38498 return -EINVAL;
38499
38500 return get_control_lines(tty);
38501 @@ -391,7 +390,7 @@ ipw_tiocmset(struct tty_struct *linux_tty,
38502 if (!tty)
38503 return -ENODEV;
38504
38505 - if (!tty->port.count)
38506 + if (!atomic_read(&tty->port.count))
38507 return -EINVAL;
38508
38509 return set_control_lines(tty, set, clear);
38510 @@ -405,7 +404,7 @@ static int ipw_ioctl(struct tty_struct *linux_tty,
38511 if (!tty)
38512 return -ENODEV;
38513
38514 - if (!tty->port.count)
38515 + if (!atomic_read(&tty->port.count))
38516 return -EINVAL;
38517
38518 /* FIXME: Exactly how is the tty object locked here .. */
38519 @@ -561,7 +560,7 @@ void ipwireless_tty_free(struct ipw_tty *tty)
38520 * are gone */
38521 mutex_lock(&ttyj->ipw_tty_mutex);
38522 }
38523 - while (ttyj->port.count)
38524 + while (atomic_read(&ttyj->port.count))
38525 do_ipw_close(ttyj);
38526 ipwireless_disassociate_network_ttys(network,
38527 ttyj->channel_idx);
38528 diff --git a/drivers/tty/moxa.c b/drivers/tty/moxa.c
38529 index 324467d..504cc25 100644
38530 --- a/drivers/tty/moxa.c
38531 +++ b/drivers/tty/moxa.c
38532 @@ -1172,7 +1172,7 @@ static int moxa_open(struct tty_struct *tty, struct file *filp)
38533 }
38534
38535 ch = &brd->ports[port % MAX_PORTS_PER_BOARD];
38536 - ch->port.count++;
38537 + atomic_inc(&ch->port.count);
38538 tty->driver_data = ch;
38539 tty_port_tty_set(&ch->port, tty);
38540 mutex_lock(&ch->port.mutex);
38541 diff --git a/drivers/tty/n_gsm.c b/drivers/tty/n_gsm.c
38542 index 90dff82..08119c3 100644
38543 --- a/drivers/tty/n_gsm.c
38544 +++ b/drivers/tty/n_gsm.c
38545 @@ -1639,7 +1639,7 @@ static struct gsm_dlci *gsm_dlci_alloc(struct gsm_mux *gsm, int addr)
38546 kref_init(&dlci->ref);
38547 mutex_init(&dlci->mutex);
38548 dlci->fifo = &dlci->_fifo;
38549 - if (kfifo_alloc(&dlci->_fifo, 4096, GFP_KERNEL) < 0) {
38550 + if (kfifo_alloc(&dlci->_fifo, 4096, GFP_KERNEL)) {
38551 kfree(dlci);
38552 return NULL;
38553 }
38554 @@ -2909,7 +2909,7 @@ static int gsmtty_open(struct tty_struct *tty, struct file *filp)
38555 if (dlci == NULL)
38556 return -ENOMEM;
38557 port = &dlci->port;
38558 - port->count++;
38559 + atomic_inc(&port->count);
38560 tty->driver_data = dlci;
38561 dlci_get(dlci);
38562 dlci_get(dlci->gsm->dlci[0]);
38563 diff --git a/drivers/tty/n_tty.c b/drivers/tty/n_tty.c
38564 index 26f0d0e..b7c4273 100644
38565 --- a/drivers/tty/n_tty.c
38566 +++ b/drivers/tty/n_tty.c
38567 @@ -2124,6 +2124,7 @@ void n_tty_inherit_ops(struct tty_ldisc_ops *ops)
38568 {
38569 *ops = tty_ldisc_N_TTY;
38570 ops->owner = NULL;
38571 - ops->refcount = ops->flags = 0;
38572 + atomic_set(&ops->refcount, 0);
38573 + ops->flags = 0;
38574 }
38575 EXPORT_SYMBOL_GPL(n_tty_inherit_ops);
38576 diff --git a/drivers/tty/pty.c b/drivers/tty/pty.c
38577 index 5505ffc..7affff9 100644
38578 --- a/drivers/tty/pty.c
38579 +++ b/drivers/tty/pty.c
38580 @@ -718,8 +718,10 @@ static void __init unix98_pty_init(void)
38581 panic("Couldn't register Unix98 pts driver");
38582
38583 /* Now create the /dev/ptmx special device */
38584 + pax_open_kernel();
38585 tty_default_fops(&ptmx_fops);
38586 - ptmx_fops.open = ptmx_open;
38587 + *(void **)&ptmx_fops.open = ptmx_open;
38588 + pax_close_kernel();
38589
38590 cdev_init(&ptmx_cdev, &ptmx_fops);
38591 if (cdev_add(&ptmx_cdev, MKDEV(TTYAUX_MAJOR, 2), 1) ||
38592 diff --git a/drivers/tty/rocket.c b/drivers/tty/rocket.c
38593 index 777d5f9..56d67ca 100644
38594 --- a/drivers/tty/rocket.c
38595 +++ b/drivers/tty/rocket.c
38596 @@ -924,7 +924,7 @@ static int rp_open(struct tty_struct *tty, struct file *filp)
38597 tty->driver_data = info;
38598 tty_port_tty_set(port, tty);
38599
38600 - if (port->count++ == 0) {
38601 + if (atomic_inc_return(&port->count) == 1) {
38602 atomic_inc(&rp_num_ports_open);
38603
38604 #ifdef ROCKET_DEBUG_OPEN
38605 @@ -933,7 +933,7 @@ static int rp_open(struct tty_struct *tty, struct file *filp)
38606 #endif
38607 }
38608 #ifdef ROCKET_DEBUG_OPEN
38609 - printk(KERN_INFO "rp_open ttyR%d, count=%d\n", info->line, info->port.count);
38610 + printk(KERN_INFO "rp_open ttyR%d, count=%d\n", info->line, atomic-read(&info->port.count));
38611 #endif
38612
38613 /*
38614 @@ -1528,7 +1528,7 @@ static void rp_hangup(struct tty_struct *tty)
38615 spin_unlock_irqrestore(&info->port.lock, flags);
38616 return;
38617 }
38618 - if (info->port.count)
38619 + if (atomic_read(&info->port.count))
38620 atomic_dec(&rp_num_ports_open);
38621 clear_bit((info->aiop * 8) + info->chan, (void *) &xmit_flags[info->board]);
38622 spin_unlock_irqrestore(&info->port.lock, flags);
38623 diff --git a/drivers/tty/serial/kgdboc.c b/drivers/tty/serial/kgdboc.c
38624 index 2b42a01..32a2ed3 100644
38625 --- a/drivers/tty/serial/kgdboc.c
38626 +++ b/drivers/tty/serial/kgdboc.c
38627 @@ -24,8 +24,9 @@
38628 #define MAX_CONFIG_LEN 40
38629
38630 static struct kgdb_io kgdboc_io_ops;
38631 +static struct kgdb_io kgdboc_io_ops_console;
38632
38633 -/* -1 = init not run yet, 0 = unconfigured, 1 = configured. */
38634 +/* -1 = init not run yet, 0 = unconfigured, 1/2 = configured. */
38635 static int configured = -1;
38636
38637 static char config[MAX_CONFIG_LEN];
38638 @@ -148,6 +149,8 @@ static void cleanup_kgdboc(void)
38639 kgdboc_unregister_kbd();
38640 if (configured == 1)
38641 kgdb_unregister_io_module(&kgdboc_io_ops);
38642 + else if (configured == 2)
38643 + kgdb_unregister_io_module(&kgdboc_io_ops_console);
38644 }
38645
38646 static int configure_kgdboc(void)
38647 @@ -157,13 +160,13 @@ static int configure_kgdboc(void)
38648 int err;
38649 char *cptr = config;
38650 struct console *cons;
38651 + int is_console = 0;
38652
38653 err = kgdboc_option_setup(config);
38654 if (err || !strlen(config) || isspace(config[0]))
38655 goto noconfig;
38656
38657 err = -ENODEV;
38658 - kgdboc_io_ops.is_console = 0;
38659 kgdb_tty_driver = NULL;
38660
38661 kgdboc_use_kms = 0;
38662 @@ -184,7 +187,7 @@ static int configure_kgdboc(void)
38663 int idx;
38664 if (cons->device && cons->device(cons, &idx) == p &&
38665 idx == tty_line) {
38666 - kgdboc_io_ops.is_console = 1;
38667 + is_console = 1;
38668 break;
38669 }
38670 cons = cons->next;
38671 @@ -194,12 +197,16 @@ static int configure_kgdboc(void)
38672 kgdb_tty_line = tty_line;
38673
38674 do_register:
38675 - err = kgdb_register_io_module(&kgdboc_io_ops);
38676 + if (is_console) {
38677 + err = kgdb_register_io_module(&kgdboc_io_ops_console);
38678 + configured = 2;
38679 + } else {
38680 + err = kgdb_register_io_module(&kgdboc_io_ops);
38681 + configured = 1;
38682 + }
38683 if (err)
38684 goto noconfig;
38685
38686 - configured = 1;
38687 -
38688 return 0;
38689
38690 noconfig:
38691 @@ -213,7 +220,7 @@ noconfig:
38692 static int __init init_kgdboc(void)
38693 {
38694 /* Already configured? */
38695 - if (configured == 1)
38696 + if (configured >= 1)
38697 return 0;
38698
38699 return configure_kgdboc();
38700 @@ -262,7 +269,7 @@ static int param_set_kgdboc_var(const char *kmessage, struct kernel_param *kp)
38701 if (config[len - 1] == '\n')
38702 config[len - 1] = '\0';
38703
38704 - if (configured == 1)
38705 + if (configured >= 1)
38706 cleanup_kgdboc();
38707
38708 /* Go and configure with the new params. */
38709 @@ -302,6 +309,15 @@ static struct kgdb_io kgdboc_io_ops = {
38710 .post_exception = kgdboc_post_exp_handler,
38711 };
38712
38713 +static struct kgdb_io kgdboc_io_ops_console = {
38714 + .name = "kgdboc",
38715 + .read_char = kgdboc_get_char,
38716 + .write_char = kgdboc_put_char,
38717 + .pre_exception = kgdboc_pre_exp_handler,
38718 + .post_exception = kgdboc_post_exp_handler,
38719 + .is_console = 1
38720 +};
38721 +
38722 #ifdef CONFIG_KGDB_SERIAL_CONSOLE
38723 /* This is only available if kgdboc is a built in for early debugging */
38724 static int __init kgdboc_early_init(char *opt)
38725 diff --git a/drivers/tty/serial/serial_core.c b/drivers/tty/serial/serial_core.c
38726 index a21dc8e..fe43e9e 100644
38727 --- a/drivers/tty/serial/serial_core.c
38728 +++ b/drivers/tty/serial/serial_core.c
38729 @@ -1392,7 +1392,7 @@ static void uart_hangup(struct tty_struct *tty)
38730 uart_flush_buffer(tty);
38731 uart_shutdown(tty, state);
38732 spin_lock_irqsave(&port->lock, flags);
38733 - port->count = 0;
38734 + atomic_set(&port->count, 0);
38735 clear_bit(ASYNCB_NORMAL_ACTIVE, &port->flags);
38736 spin_unlock_irqrestore(&port->lock, flags);
38737 tty_port_tty_set(port, NULL);
38738 @@ -1488,7 +1488,7 @@ static int uart_open(struct tty_struct *tty, struct file *filp)
38739 goto end;
38740 }
38741
38742 - port->count++;
38743 + atomic_inc(&port->count);
38744 if (!state->uart_port || state->uart_port->flags & UPF_DEAD) {
38745 retval = -ENXIO;
38746 goto err_dec_count;
38747 @@ -1515,7 +1515,7 @@ static int uart_open(struct tty_struct *tty, struct file *filp)
38748 /*
38749 * Make sure the device is in D0 state.
38750 */
38751 - if (port->count == 1)
38752 + if (atomic_read(&port->count) == 1)
38753 uart_change_pm(state, 0);
38754
38755 /*
38756 @@ -1533,7 +1533,7 @@ static int uart_open(struct tty_struct *tty, struct file *filp)
38757 end:
38758 return retval;
38759 err_dec_count:
38760 - port->count--;
38761 + atomic_inc(&port->count);
38762 mutex_unlock(&port->mutex);
38763 goto end;
38764 }
38765 diff --git a/drivers/tty/synclink.c b/drivers/tty/synclink.c
38766 index 593d40a..bdc61f3 100644
38767 --- a/drivers/tty/synclink.c
38768 +++ b/drivers/tty/synclink.c
38769 @@ -3095,7 +3095,7 @@ static void mgsl_close(struct tty_struct *tty, struct file * filp)
38770
38771 if (debug_level >= DEBUG_LEVEL_INFO)
38772 printk("%s(%d):mgsl_close(%s) entry, count=%d\n",
38773 - __FILE__,__LINE__, info->device_name, info->port.count);
38774 + __FILE__,__LINE__, info->device_name, atomic_read(&info->port.count));
38775
38776 if (tty_port_close_start(&info->port, tty, filp) == 0)
38777 goto cleanup;
38778 @@ -3113,7 +3113,7 @@ static void mgsl_close(struct tty_struct *tty, struct file * filp)
38779 cleanup:
38780 if (debug_level >= DEBUG_LEVEL_INFO)
38781 printk("%s(%d):mgsl_close(%s) exit, count=%d\n", __FILE__,__LINE__,
38782 - tty->driver->name, info->port.count);
38783 + tty->driver->name, atomic_read(&info->port.count));
38784
38785 } /* end of mgsl_close() */
38786
38787 @@ -3212,8 +3212,8 @@ static void mgsl_hangup(struct tty_struct *tty)
38788
38789 mgsl_flush_buffer(tty);
38790 shutdown(info);
38791 -
38792 - info->port.count = 0;
38793 +
38794 + atomic_set(&info->port.count, 0);
38795 info->port.flags &= ~ASYNC_NORMAL_ACTIVE;
38796 info->port.tty = NULL;
38797
38798 @@ -3302,12 +3302,12 @@ static int block_til_ready(struct tty_struct *tty, struct file * filp,
38799
38800 if (debug_level >= DEBUG_LEVEL_INFO)
38801 printk("%s(%d):block_til_ready before block on %s count=%d\n",
38802 - __FILE__,__LINE__, tty->driver->name, port->count );
38803 + __FILE__,__LINE__, tty->driver->name, atomic_read(&port->count));
38804
38805 spin_lock_irqsave(&info->irq_spinlock, flags);
38806 if (!tty_hung_up_p(filp)) {
38807 extra_count = true;
38808 - port->count--;
38809 + atomic_dec(&port->count);
38810 }
38811 spin_unlock_irqrestore(&info->irq_spinlock, flags);
38812 port->blocked_open++;
38813 @@ -3336,7 +3336,7 @@ static int block_til_ready(struct tty_struct *tty, struct file * filp,
38814
38815 if (debug_level >= DEBUG_LEVEL_INFO)
38816 printk("%s(%d):block_til_ready blocking on %s count=%d\n",
38817 - __FILE__,__LINE__, tty->driver->name, port->count );
38818 + __FILE__,__LINE__, tty->driver->name, atomic_read(&port->count));
38819
38820 tty_unlock();
38821 schedule();
38822 @@ -3348,12 +3348,12 @@ static int block_til_ready(struct tty_struct *tty, struct file * filp,
38823
38824 /* FIXME: Racy on hangup during close wait */
38825 if (extra_count)
38826 - port->count++;
38827 + atomic_inc(&port->count);
38828 port->blocked_open--;
38829
38830 if (debug_level >= DEBUG_LEVEL_INFO)
38831 printk("%s(%d):block_til_ready after blocking on %s count=%d\n",
38832 - __FILE__,__LINE__, tty->driver->name, port->count );
38833 + __FILE__,__LINE__, tty->driver->name, atomic_read(&port->count));
38834
38835 if (!retval)
38836 port->flags |= ASYNC_NORMAL_ACTIVE;
38837 @@ -3398,7 +3398,7 @@ static int mgsl_open(struct tty_struct *tty, struct file * filp)
38838
38839 if (debug_level >= DEBUG_LEVEL_INFO)
38840 printk("%s(%d):mgsl_open(%s), old ref count = %d\n",
38841 - __FILE__,__LINE__,tty->driver->name, info->port.count);
38842 + __FILE__,__LINE__,tty->driver->name, atomic_read(&info->port.count));
38843
38844 /* If port is closing, signal caller to try again */
38845 if (tty_hung_up_p(filp) || info->port.flags & ASYNC_CLOSING){
38846 @@ -3417,10 +3417,10 @@ static int mgsl_open(struct tty_struct *tty, struct file * filp)
38847 spin_unlock_irqrestore(&info->netlock, flags);
38848 goto cleanup;
38849 }
38850 - info->port.count++;
38851 + atomic_inc(&info->port.count);
38852 spin_unlock_irqrestore(&info->netlock, flags);
38853
38854 - if (info->port.count == 1) {
38855 + if (atomic_read(&info->port.count) == 1) {
38856 /* 1st open on this device, init hardware */
38857 retval = startup(info);
38858 if (retval < 0)
38859 @@ -3444,8 +3444,8 @@ cleanup:
38860 if (retval) {
38861 if (tty->count == 1)
38862 info->port.tty = NULL; /* tty layer will release tty struct */
38863 - if(info->port.count)
38864 - info->port.count--;
38865 + if (atomic_read(&info->port.count))
38866 + atomic_dec(&info->port.count);
38867 }
38868
38869 return retval;
38870 @@ -7653,7 +7653,7 @@ static int hdlcdev_attach(struct net_device *dev, unsigned short encoding,
38871 unsigned short new_crctype;
38872
38873 /* return error if TTY interface open */
38874 - if (info->port.count)
38875 + if (atomic_read(&info->port.count))
38876 return -EBUSY;
38877
38878 switch (encoding)
38879 @@ -7748,7 +7748,7 @@ static int hdlcdev_open(struct net_device *dev)
38880
38881 /* arbitrate between network and tty opens */
38882 spin_lock_irqsave(&info->netlock, flags);
38883 - if (info->port.count != 0 || info->netcount != 0) {
38884 + if (atomic_read(&info->port.count) != 0 || info->netcount != 0) {
38885 printk(KERN_WARNING "%s: hdlc_open returning busy\n", dev->name);
38886 spin_unlock_irqrestore(&info->netlock, flags);
38887 return -EBUSY;
38888 @@ -7834,7 +7834,7 @@ static int hdlcdev_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)
38889 printk("%s:hdlcdev_ioctl(%s)\n",__FILE__,dev->name);
38890
38891 /* return error if TTY interface open */
38892 - if (info->port.count)
38893 + if (atomic_read(&info->port.count))
38894 return -EBUSY;
38895
38896 if (cmd != SIOCWANDEV)
38897 diff --git a/drivers/tty/synclink_gt.c b/drivers/tty/synclink_gt.c
38898 index aa1debf..9297a16 100644
38899 --- a/drivers/tty/synclink_gt.c
38900 +++ b/drivers/tty/synclink_gt.c
38901 @@ -671,7 +671,7 @@ static int open(struct tty_struct *tty, struct file *filp)
38902 tty->driver_data = info;
38903 info->port.tty = tty;
38904
38905 - DBGINFO(("%s open, old ref count = %d\n", info->device_name, info->port.count));
38906 + DBGINFO(("%s open, old ref count = %d\n", info->device_name, atomic_read(&info->port.count)));
38907
38908 /* If port is closing, signal caller to try again */
38909 if (tty_hung_up_p(filp) || info->port.flags & ASYNC_CLOSING){
38910 @@ -692,10 +692,10 @@ static int open(struct tty_struct *tty, struct file *filp)
38911 mutex_unlock(&info->port.mutex);
38912 goto cleanup;
38913 }
38914 - info->port.count++;
38915 + atomic_inc(&info->port.count);
38916 spin_unlock_irqrestore(&info->netlock, flags);
38917
38918 - if (info->port.count == 1) {
38919 + if (atomic_read(&info->port.count) == 1) {
38920 /* 1st open on this device, init hardware */
38921 retval = startup(info);
38922 if (retval < 0) {
38923 @@ -716,8 +716,8 @@ cleanup:
38924 if (retval) {
38925 if (tty->count == 1)
38926 info->port.tty = NULL; /* tty layer will release tty struct */
38927 - if(info->port.count)
38928 - info->port.count--;
38929 + if(atomic_read(&info->port.count))
38930 + atomic_dec(&info->port.count);
38931 }
38932
38933 DBGINFO(("%s open rc=%d\n", info->device_name, retval));
38934 @@ -730,7 +730,7 @@ static void close(struct tty_struct *tty, struct file *filp)
38935
38936 if (sanity_check(info, tty->name, "close"))
38937 return;
38938 - DBGINFO(("%s close entry, count=%d\n", info->device_name, info->port.count));
38939 + DBGINFO(("%s close entry, count=%d\n", info->device_name, atomic_read(&info->port.count)));
38940
38941 if (tty_port_close_start(&info->port, tty, filp) == 0)
38942 goto cleanup;
38943 @@ -747,7 +747,7 @@ static void close(struct tty_struct *tty, struct file *filp)
38944 tty_port_close_end(&info->port, tty);
38945 info->port.tty = NULL;
38946 cleanup:
38947 - DBGINFO(("%s close exit, count=%d\n", tty->driver->name, info->port.count));
38948 + DBGINFO(("%s close exit, count=%d\n", tty->driver->name, atomic_read(&info->port.count)));
38949 }
38950
38951 static void hangup(struct tty_struct *tty)
38952 @@ -765,7 +765,7 @@ static void hangup(struct tty_struct *tty)
38953 shutdown(info);
38954
38955 spin_lock_irqsave(&info->port.lock, flags);
38956 - info->port.count = 0;
38957 + atomic_set(&info->port.count, 0);
38958 info->port.flags &= ~ASYNC_NORMAL_ACTIVE;
38959 info->port.tty = NULL;
38960 spin_unlock_irqrestore(&info->port.lock, flags);
38961 @@ -1450,7 +1450,7 @@ static int hdlcdev_attach(struct net_device *dev, unsigned short encoding,
38962 unsigned short new_crctype;
38963
38964 /* return error if TTY interface open */
38965 - if (info->port.count)
38966 + if (atomic_read(&info->port.count))
38967 return -EBUSY;
38968
38969 DBGINFO(("%s hdlcdev_attach\n", info->device_name));
38970 @@ -1545,7 +1545,7 @@ static int hdlcdev_open(struct net_device *dev)
38971
38972 /* arbitrate between network and tty opens */
38973 spin_lock_irqsave(&info->netlock, flags);
38974 - if (info->port.count != 0 || info->netcount != 0) {
38975 + if (atomic_read(&info->port.count) != 0 || info->netcount != 0) {
38976 DBGINFO(("%s hdlc_open busy\n", dev->name));
38977 spin_unlock_irqrestore(&info->netlock, flags);
38978 return -EBUSY;
38979 @@ -1630,7 +1630,7 @@ static int hdlcdev_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)
38980 DBGINFO(("%s hdlcdev_ioctl\n", dev->name));
38981
38982 /* return error if TTY interface open */
38983 - if (info->port.count)
38984 + if (atomic_read(&info->port.count))
38985 return -EBUSY;
38986
38987 if (cmd != SIOCWANDEV)
38988 @@ -2419,7 +2419,7 @@ static irqreturn_t slgt_interrupt(int dummy, void *dev_id)
38989 if (port == NULL)
38990 continue;
38991 spin_lock(&port->lock);
38992 - if ((port->port.count || port->netcount) &&
38993 + if ((atomic_read(&port->port.count) || port->netcount) &&
38994 port->pending_bh && !port->bh_running &&
38995 !port->bh_requested) {
38996 DBGISR(("%s bh queued\n", port->device_name));
38997 @@ -3308,7 +3308,7 @@ static int block_til_ready(struct tty_struct *tty, struct file *filp,
38998 spin_lock_irqsave(&info->lock, flags);
38999 if (!tty_hung_up_p(filp)) {
39000 extra_count = true;
39001 - port->count--;
39002 + atomic_dec(&port->count);
39003 }
39004 spin_unlock_irqrestore(&info->lock, flags);
39005 port->blocked_open++;
39006 @@ -3345,7 +3345,7 @@ static int block_til_ready(struct tty_struct *tty, struct file *filp,
39007 remove_wait_queue(&port->open_wait, &wait);
39008
39009 if (extra_count)
39010 - port->count++;
39011 + atomic_inc(&port->count);
39012 port->blocked_open--;
39013
39014 if (!retval)
39015 diff --git a/drivers/tty/synclinkmp.c b/drivers/tty/synclinkmp.c
39016 index a3dddc1..8905ab2 100644
39017 --- a/drivers/tty/synclinkmp.c
39018 +++ b/drivers/tty/synclinkmp.c
39019 @@ -742,7 +742,7 @@ static int open(struct tty_struct *tty, struct file *filp)
39020
39021 if (debug_level >= DEBUG_LEVEL_INFO)
39022 printk("%s(%d):%s open(), old ref count = %d\n",
39023 - __FILE__,__LINE__,tty->driver->name, info->port.count);
39024 + __FILE__,__LINE__,tty->driver->name, atomic_read(&info->port.count));
39025
39026 /* If port is closing, signal caller to try again */
39027 if (tty_hung_up_p(filp) || info->port.flags & ASYNC_CLOSING){
39028 @@ -761,10 +761,10 @@ static int open(struct tty_struct *tty, struct file *filp)
39029 spin_unlock_irqrestore(&info->netlock, flags);
39030 goto cleanup;
39031 }
39032 - info->port.count++;
39033 + atomic_inc(&info->port.count);
39034 spin_unlock_irqrestore(&info->netlock, flags);
39035
39036 - if (info->port.count == 1) {
39037 + if (atomic_read(&info->port.count) == 1) {
39038 /* 1st open on this device, init hardware */
39039 retval = startup(info);
39040 if (retval < 0)
39041 @@ -788,8 +788,8 @@ cleanup:
39042 if (retval) {
39043 if (tty->count == 1)
39044 info->port.tty = NULL; /* tty layer will release tty struct */
39045 - if(info->port.count)
39046 - info->port.count--;
39047 + if(atomic_read(&info->port.count))
39048 + atomic_dec(&info->port.count);
39049 }
39050
39051 return retval;
39052 @@ -807,7 +807,7 @@ static void close(struct tty_struct *tty, struct file *filp)
39053
39054 if (debug_level >= DEBUG_LEVEL_INFO)
39055 printk("%s(%d):%s close() entry, count=%d\n",
39056 - __FILE__,__LINE__, info->device_name, info->port.count);
39057 + __FILE__,__LINE__, info->device_name, atomic_read(&info->port.count));
39058
39059 if (tty_port_close_start(&info->port, tty, filp) == 0)
39060 goto cleanup;
39061 @@ -826,7 +826,7 @@ static void close(struct tty_struct *tty, struct file *filp)
39062 cleanup:
39063 if (debug_level >= DEBUG_LEVEL_INFO)
39064 printk("%s(%d):%s close() exit, count=%d\n", __FILE__,__LINE__,
39065 - tty->driver->name, info->port.count);
39066 + tty->driver->name, atomic_read(&info->port.count));
39067 }
39068
39069 /* Called by tty_hangup() when a hangup is signaled.
39070 @@ -849,7 +849,7 @@ static void hangup(struct tty_struct *tty)
39071 shutdown(info);
39072
39073 spin_lock_irqsave(&info->port.lock, flags);
39074 - info->port.count = 0;
39075 + atomic_set(&info->port.count, 0);
39076 info->port.flags &= ~ASYNC_NORMAL_ACTIVE;
39077 info->port.tty = NULL;
39078 spin_unlock_irqrestore(&info->port.lock, flags);
39079 @@ -1557,7 +1557,7 @@ static int hdlcdev_attach(struct net_device *dev, unsigned short encoding,
39080 unsigned short new_crctype;
39081
39082 /* return error if TTY interface open */
39083 - if (info->port.count)
39084 + if (atomic_read(&info->port.count))
39085 return -EBUSY;
39086
39087 switch (encoding)
39088 @@ -1652,7 +1652,7 @@ static int hdlcdev_open(struct net_device *dev)
39089
39090 /* arbitrate between network and tty opens */
39091 spin_lock_irqsave(&info->netlock, flags);
39092 - if (info->port.count != 0 || info->netcount != 0) {
39093 + if (atomic_read(&info->port.count) != 0 || info->netcount != 0) {
39094 printk(KERN_WARNING "%s: hdlc_open returning busy\n", dev->name);
39095 spin_unlock_irqrestore(&info->netlock, flags);
39096 return -EBUSY;
39097 @@ -1738,7 +1738,7 @@ static int hdlcdev_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)
39098 printk("%s:hdlcdev_ioctl(%s)\n",__FILE__,dev->name);
39099
39100 /* return error if TTY interface open */
39101 - if (info->port.count)
39102 + if (atomic_read(&info->port.count))
39103 return -EBUSY;
39104
39105 if (cmd != SIOCWANDEV)
39106 @@ -2623,7 +2623,7 @@ static irqreturn_t synclinkmp_interrupt(int dummy, void *dev_id)
39107 * do not request bottom half processing if the
39108 * device is not open in a normal mode.
39109 */
39110 - if ( port && (port->port.count || port->netcount) &&
39111 + if ( port && (atomic_read(&port->port.count) || port->netcount) &&
39112 port->pending_bh && !port->bh_running &&
39113 !port->bh_requested ) {
39114 if ( debug_level >= DEBUG_LEVEL_ISR )
39115 @@ -3321,12 +3321,12 @@ static int block_til_ready(struct tty_struct *tty, struct file *filp,
39116
39117 if (debug_level >= DEBUG_LEVEL_INFO)
39118 printk("%s(%d):%s block_til_ready() before block, count=%d\n",
39119 - __FILE__,__LINE__, tty->driver->name, port->count );
39120 + __FILE__,__LINE__, tty->driver->name, atomic_read(&port->count));
39121
39122 spin_lock_irqsave(&info->lock, flags);
39123 if (!tty_hung_up_p(filp)) {
39124 extra_count = true;
39125 - port->count--;
39126 + atomic_dec(&port->count);
39127 }
39128 spin_unlock_irqrestore(&info->lock, flags);
39129 port->blocked_open++;
39130 @@ -3355,7 +3355,7 @@ static int block_til_ready(struct tty_struct *tty, struct file *filp,
39131
39132 if (debug_level >= DEBUG_LEVEL_INFO)
39133 printk("%s(%d):%s block_til_ready() count=%d\n",
39134 - __FILE__,__LINE__, tty->driver->name, port->count );
39135 + __FILE__,__LINE__, tty->driver->name, atomic_read(&port->count));
39136
39137 tty_unlock();
39138 schedule();
39139 @@ -3366,12 +3366,12 @@ static int block_til_ready(struct tty_struct *tty, struct file *filp,
39140 remove_wait_queue(&port->open_wait, &wait);
39141
39142 if (extra_count)
39143 - port->count++;
39144 + atomic_inc(&port->count);
39145 port->blocked_open--;
39146
39147 if (debug_level >= DEBUG_LEVEL_INFO)
39148 printk("%s(%d):%s block_til_ready() after, count=%d\n",
39149 - __FILE__,__LINE__, tty->driver->name, port->count );
39150 + __FILE__,__LINE__, tty->driver->name, atomic_read(&port->count));
39151
39152 if (!retval)
39153 port->flags |= ASYNC_NORMAL_ACTIVE;
39154 diff --git a/drivers/tty/sysrq.c b/drivers/tty/sysrq.c
39155 index 05728894..b9d44c6 100644
39156 --- a/drivers/tty/sysrq.c
39157 +++ b/drivers/tty/sysrq.c
39158 @@ -865,7 +865,7 @@ EXPORT_SYMBOL(unregister_sysrq_key);
39159 static ssize_t write_sysrq_trigger(struct file *file, const char __user *buf,
39160 size_t count, loff_t *ppos)
39161 {
39162 - if (count) {
39163 + if (count && capable(CAP_SYS_ADMIN)) {
39164 char c;
39165
39166 if (get_user(c, buf))
39167 diff --git a/drivers/tty/tty_io.c b/drivers/tty/tty_io.c
39168 index b425c79..08a3f06 100644
39169 --- a/drivers/tty/tty_io.c
39170 +++ b/drivers/tty/tty_io.c
39171 @@ -3283,7 +3283,7 @@ EXPORT_SYMBOL_GPL(get_current_tty);
39172
39173 void tty_default_fops(struct file_operations *fops)
39174 {
39175 - *fops = tty_fops;
39176 + memcpy((void *)fops, &tty_fops, sizeof(tty_fops));
39177 }
39178
39179 /*
39180 diff --git a/drivers/tty/tty_ldisc.c b/drivers/tty/tty_ldisc.c
39181 index 6f99c99..8947bc4 100644
39182 --- a/drivers/tty/tty_ldisc.c
39183 +++ b/drivers/tty/tty_ldisc.c
39184 @@ -56,7 +56,7 @@ static void put_ldisc(struct tty_ldisc *ld)
39185 if (atomic_dec_and_lock(&ld->users, &tty_ldisc_lock)) {
39186 struct tty_ldisc_ops *ldo = ld->ops;
39187
39188 - ldo->refcount--;
39189 + atomic_dec(&ldo->refcount);
39190 module_put(ldo->owner);
39191 spin_unlock_irqrestore(&tty_ldisc_lock, flags);
39192
39193 @@ -91,7 +91,7 @@ int tty_register_ldisc(int disc, struct tty_ldisc_ops *new_ldisc)
39194 spin_lock_irqsave(&tty_ldisc_lock, flags);
39195 tty_ldiscs[disc] = new_ldisc;
39196 new_ldisc->num = disc;
39197 - new_ldisc->refcount = 0;
39198 + atomic_set(&new_ldisc->refcount, 0);
39199 spin_unlock_irqrestore(&tty_ldisc_lock, flags);
39200
39201 return ret;
39202 @@ -119,7 +119,7 @@ int tty_unregister_ldisc(int disc)
39203 return -EINVAL;
39204
39205 spin_lock_irqsave(&tty_ldisc_lock, flags);
39206 - if (tty_ldiscs[disc]->refcount)
39207 + if (atomic_read(&tty_ldiscs[disc]->refcount))
39208 ret = -EBUSY;
39209 else
39210 tty_ldiscs[disc] = NULL;
39211 @@ -140,7 +140,7 @@ static struct tty_ldisc_ops *get_ldops(int disc)
39212 if (ldops) {
39213 ret = ERR_PTR(-EAGAIN);
39214 if (try_module_get(ldops->owner)) {
39215 - ldops->refcount++;
39216 + atomic_inc(&ldops->refcount);
39217 ret = ldops;
39218 }
39219 }
39220 @@ -153,7 +153,7 @@ static void put_ldops(struct tty_ldisc_ops *ldops)
39221 unsigned long flags;
39222
39223 spin_lock_irqsave(&tty_ldisc_lock, flags);
39224 - ldops->refcount--;
39225 + atomic_dec(&ldops->refcount);
39226 module_put(ldops->owner);
39227 spin_unlock_irqrestore(&tty_ldisc_lock, flags);
39228 }
39229 diff --git a/drivers/tty/tty_port.c b/drivers/tty/tty_port.c
39230 index bf6e238..d401c04 100644
39231 --- a/drivers/tty/tty_port.c
39232 +++ b/drivers/tty/tty_port.c
39233 @@ -138,7 +138,7 @@ void tty_port_hangup(struct tty_port *port)
39234 unsigned long flags;
39235
39236 spin_lock_irqsave(&port->lock, flags);
39237 - port->count = 0;
39238 + atomic_set(&port->count, 0);
39239 port->flags &= ~ASYNC_NORMAL_ACTIVE;
39240 if (port->tty) {
39241 set_bit(TTY_IO_ERROR, &port->tty->flags);
39242 @@ -264,7 +264,7 @@ int tty_port_block_til_ready(struct tty_port *port,
39243 /* The port lock protects the port counts */
39244 spin_lock_irqsave(&port->lock, flags);
39245 if (!tty_hung_up_p(filp))
39246 - port->count--;
39247 + atomic_dec(&port->count);
39248 port->blocked_open++;
39249 spin_unlock_irqrestore(&port->lock, flags);
39250
39251 @@ -306,7 +306,7 @@ int tty_port_block_til_ready(struct tty_port *port,
39252 we must not mess that up further */
39253 spin_lock_irqsave(&port->lock, flags);
39254 if (!tty_hung_up_p(filp))
39255 - port->count++;
39256 + atomic_inc(&port->count);
39257 port->blocked_open--;
39258 if (retval == 0)
39259 port->flags |= ASYNC_NORMAL_ACTIVE;
39260 @@ -326,19 +326,19 @@ int tty_port_close_start(struct tty_port *port,
39261 return 0;
39262 }
39263
39264 - if (tty->count == 1 && port->count != 1) {
39265 + if (tty->count == 1 && atomic_read(&port->count) != 1) {
39266 printk(KERN_WARNING
39267 "tty_port_close_start: tty->count = 1 port count = %d.\n",
39268 - port->count);
39269 - port->count = 1;
39270 + atomic_read(&port->count));
39271 + atomic_set(&port->count, 1);
39272 }
39273 - if (--port->count < 0) {
39274 + if (atomic_dec_return(&port->count) < 0) {
39275 printk(KERN_WARNING "tty_port_close_start: count = %d\n",
39276 - port->count);
39277 - port->count = 0;
39278 + atomic_read(&port->count));
39279 + atomic_set(&port->count, 0);
39280 }
39281
39282 - if (port->count) {
39283 + if (atomic_read(&port->count)) {
39284 spin_unlock_irqrestore(&port->lock, flags);
39285 if (port->ops->drop)
39286 port->ops->drop(port);
39287 @@ -418,7 +418,7 @@ int tty_port_open(struct tty_port *port, struct tty_struct *tty,
39288 {
39289 spin_lock_irq(&port->lock);
39290 if (!tty_hung_up_p(filp))
39291 - ++port->count;
39292 + atomic_inc(&port->count);
39293 spin_unlock_irq(&port->lock);
39294 tty_port_tty_set(port, tty);
39295
39296 diff --git a/drivers/tty/vt/keyboard.c b/drivers/tty/vt/keyboard.c
39297 index 770a854..e5d3db3 100644
39298 --- a/drivers/tty/vt/keyboard.c
39299 +++ b/drivers/tty/vt/keyboard.c
39300 @@ -659,6 +659,16 @@ static void k_spec(struct vc_data *vc, unsigned char value, char up_flag)
39301 kbd->kbdmode == VC_OFF) &&
39302 value != KVAL(K_SAK))
39303 return; /* SAK is allowed even in raw mode */
39304 +
39305 +#if defined(CONFIG_GRKERNSEC_PROC) || defined(CONFIG_GRKERNSEC_PROC_MEMMAP)
39306 + {
39307 + void *func = fn_handler[value];
39308 + if (func == fn_show_state || func == fn_show_ptregs ||
39309 + func == fn_show_mem)
39310 + return;
39311 + }
39312 +#endif
39313 +
39314 fn_handler[value](vc);
39315 }
39316
39317 @@ -1805,9 +1815,6 @@ int vt_do_kdsk_ioctl(int cmd, struct kbentry __user *user_kbe, int perm,
39318 if (copy_from_user(&tmp, user_kbe, sizeof(struct kbentry)))
39319 return -EFAULT;
39320
39321 - if (!capable(CAP_SYS_TTY_CONFIG))
39322 - perm = 0;
39323 -
39324 switch (cmd) {
39325 case KDGKBENT:
39326 /* Ensure another thread doesn't free it under us */
39327 @@ -1822,6 +1829,9 @@ int vt_do_kdsk_ioctl(int cmd, struct kbentry __user *user_kbe, int perm,
39328 spin_unlock_irqrestore(&kbd_event_lock, flags);
39329 return put_user(val, &user_kbe->kb_value);
39330 case KDSKBENT:
39331 + if (!capable(CAP_SYS_TTY_CONFIG))
39332 + perm = 0;
39333 +
39334 if (!perm)
39335 return -EPERM;
39336 if (!i && v == K_NOSUCHMAP) {
39337 @@ -1912,9 +1922,6 @@ int vt_do_kdgkb_ioctl(int cmd, struct kbsentry __user *user_kdgkb, int perm)
39338 int i, j, k;
39339 int ret;
39340
39341 - if (!capable(CAP_SYS_TTY_CONFIG))
39342 - perm = 0;
39343 -
39344 kbs = kmalloc(sizeof(*kbs), GFP_KERNEL);
39345 if (!kbs) {
39346 ret = -ENOMEM;
39347 @@ -1948,6 +1955,9 @@ int vt_do_kdgkb_ioctl(int cmd, struct kbsentry __user *user_kdgkb, int perm)
39348 kfree(kbs);
39349 return ((p && *p) ? -EOVERFLOW : 0);
39350 case KDSKBSENT:
39351 + if (!capable(CAP_SYS_TTY_CONFIG))
39352 + perm = 0;
39353 +
39354 if (!perm) {
39355 ret = -EPERM;
39356 goto reterr;
39357 diff --git a/drivers/uio/uio.c b/drivers/uio/uio.c
39358 index a783d53..cb30d94 100644
39359 --- a/drivers/uio/uio.c
39360 +++ b/drivers/uio/uio.c
39361 @@ -25,6 +25,7 @@
39362 #include <linux/kobject.h>
39363 #include <linux/cdev.h>
39364 #include <linux/uio_driver.h>
39365 +#include <asm/local.h>
39366
39367 #define UIO_MAX_DEVICES (1U << MINORBITS)
39368
39369 @@ -32,10 +33,10 @@ struct uio_device {
39370 struct module *owner;
39371 struct device *dev;
39372 int minor;
39373 - atomic_t event;
39374 + atomic_unchecked_t event;
39375 struct fasync_struct *async_queue;
39376 wait_queue_head_t wait;
39377 - int vma_count;
39378 + local_t vma_count;
39379 struct uio_info *info;
39380 struct kobject *map_dir;
39381 struct kobject *portio_dir;
39382 @@ -242,7 +243,7 @@ static ssize_t show_event(struct device *dev,
39383 struct device_attribute *attr, char *buf)
39384 {
39385 struct uio_device *idev = dev_get_drvdata(dev);
39386 - return sprintf(buf, "%u\n", (unsigned int)atomic_read(&idev->event));
39387 + return sprintf(buf, "%u\n", (unsigned int)atomic_read_unchecked(&idev->event));
39388 }
39389
39390 static struct device_attribute uio_class_attributes[] = {
39391 @@ -408,7 +409,7 @@ void uio_event_notify(struct uio_info *info)
39392 {
39393 struct uio_device *idev = info->uio_dev;
39394
39395 - atomic_inc(&idev->event);
39396 + atomic_inc_unchecked(&idev->event);
39397 wake_up_interruptible(&idev->wait);
39398 kill_fasync(&idev->async_queue, SIGIO, POLL_IN);
39399 }
39400 @@ -461,7 +462,7 @@ static int uio_open(struct inode *inode, struct file *filep)
39401 }
39402
39403 listener->dev = idev;
39404 - listener->event_count = atomic_read(&idev->event);
39405 + listener->event_count = atomic_read_unchecked(&idev->event);
39406 filep->private_data = listener;
39407
39408 if (idev->info->open) {
39409 @@ -512,7 +513,7 @@ static unsigned int uio_poll(struct file *filep, poll_table *wait)
39410 return -EIO;
39411
39412 poll_wait(filep, &idev->wait, wait);
39413 - if (listener->event_count != atomic_read(&idev->event))
39414 + if (listener->event_count != atomic_read_unchecked(&idev->event))
39415 return POLLIN | POLLRDNORM;
39416 return 0;
39417 }
39418 @@ -537,7 +538,7 @@ static ssize_t uio_read(struct file *filep, char __user *buf,
39419 do {
39420 set_current_state(TASK_INTERRUPTIBLE);
39421
39422 - event_count = atomic_read(&idev->event);
39423 + event_count = atomic_read_unchecked(&idev->event);
39424 if (event_count != listener->event_count) {
39425 if (copy_to_user(buf, &event_count, count))
39426 retval = -EFAULT;
39427 @@ -606,13 +607,13 @@ static int uio_find_mem_index(struct vm_area_struct *vma)
39428 static void uio_vma_open(struct vm_area_struct *vma)
39429 {
39430 struct uio_device *idev = vma->vm_private_data;
39431 - idev->vma_count++;
39432 + local_inc(&idev->vma_count);
39433 }
39434
39435 static void uio_vma_close(struct vm_area_struct *vma)
39436 {
39437 struct uio_device *idev = vma->vm_private_data;
39438 - idev->vma_count--;
39439 + local_dec(&idev->vma_count);
39440 }
39441
39442 static int uio_vma_fault(struct vm_area_struct *vma, struct vm_fault *vmf)
39443 @@ -821,7 +822,7 @@ int __uio_register_device(struct module *owner,
39444 idev->owner = owner;
39445 idev->info = info;
39446 init_waitqueue_head(&idev->wait);
39447 - atomic_set(&idev->event, 0);
39448 + atomic_set_unchecked(&idev->event, 0);
39449
39450 ret = uio_get_minor(idev);
39451 if (ret)
39452 diff --git a/drivers/usb/atm/cxacru.c b/drivers/usb/atm/cxacru.c
39453 index b7eb86a..36d28af 100644
39454 --- a/drivers/usb/atm/cxacru.c
39455 +++ b/drivers/usb/atm/cxacru.c
39456 @@ -473,7 +473,7 @@ static ssize_t cxacru_sysfs_store_adsl_config(struct device *dev,
39457 ret = sscanf(buf + pos, "%x=%x%n", &index, &value, &tmp);
39458 if (ret < 2)
39459 return -EINVAL;
39460 - if (index < 0 || index > 0x7f)
39461 + if (index > 0x7f)
39462 return -EINVAL;
39463 pos += tmp;
39464
39465 diff --git a/drivers/usb/atm/usbatm.c b/drivers/usb/atm/usbatm.c
39466 index ee62b35..b663594 100644
39467 --- a/drivers/usb/atm/usbatm.c
39468 +++ b/drivers/usb/atm/usbatm.c
39469 @@ -333,7 +333,7 @@ static void usbatm_extract_one_cell(struct usbatm_data *instance, unsigned char
39470 if (printk_ratelimit())
39471 atm_warn(instance, "%s: OAM not supported (vpi %d, vci %d)!\n",
39472 __func__, vpi, vci);
39473 - atomic_inc(&vcc->stats->rx_err);
39474 + atomic_inc_unchecked(&vcc->stats->rx_err);
39475 return;
39476 }
39477
39478 @@ -361,7 +361,7 @@ static void usbatm_extract_one_cell(struct usbatm_data *instance, unsigned char
39479 if (length > ATM_MAX_AAL5_PDU) {
39480 atm_rldbg(instance, "%s: bogus length %u (vcc: 0x%p)!\n",
39481 __func__, length, vcc);
39482 - atomic_inc(&vcc->stats->rx_err);
39483 + atomic_inc_unchecked(&vcc->stats->rx_err);
39484 goto out;
39485 }
39486
39487 @@ -370,14 +370,14 @@ static void usbatm_extract_one_cell(struct usbatm_data *instance, unsigned char
39488 if (sarb->len < pdu_length) {
39489 atm_rldbg(instance, "%s: bogus pdu_length %u (sarb->len: %u, vcc: 0x%p)!\n",
39490 __func__, pdu_length, sarb->len, vcc);
39491 - atomic_inc(&vcc->stats->rx_err);
39492 + atomic_inc_unchecked(&vcc->stats->rx_err);
39493 goto out;
39494 }
39495
39496 if (crc32_be(~0, skb_tail_pointer(sarb) - pdu_length, pdu_length) != 0xc704dd7b) {
39497 atm_rldbg(instance, "%s: packet failed crc check (vcc: 0x%p)!\n",
39498 __func__, vcc);
39499 - atomic_inc(&vcc->stats->rx_err);
39500 + atomic_inc_unchecked(&vcc->stats->rx_err);
39501 goto out;
39502 }
39503
39504 @@ -387,7 +387,7 @@ static void usbatm_extract_one_cell(struct usbatm_data *instance, unsigned char
39505 if (printk_ratelimit())
39506 atm_err(instance, "%s: no memory for skb (length: %u)!\n",
39507 __func__, length);
39508 - atomic_inc(&vcc->stats->rx_drop);
39509 + atomic_inc_unchecked(&vcc->stats->rx_drop);
39510 goto out;
39511 }
39512
39513 @@ -412,7 +412,7 @@ static void usbatm_extract_one_cell(struct usbatm_data *instance, unsigned char
39514
39515 vcc->push(vcc, skb);
39516
39517 - atomic_inc(&vcc->stats->rx);
39518 + atomic_inc_unchecked(&vcc->stats->rx);
39519 out:
39520 skb_trim(sarb, 0);
39521 }
39522 @@ -615,7 +615,7 @@ static void usbatm_tx_process(unsigned long data)
39523 struct atm_vcc *vcc = UDSL_SKB(skb)->atm.vcc;
39524
39525 usbatm_pop(vcc, skb);
39526 - atomic_inc(&vcc->stats->tx);
39527 + atomic_inc_unchecked(&vcc->stats->tx);
39528
39529 skb = skb_dequeue(&instance->sndqueue);
39530 }
39531 @@ -770,11 +770,11 @@ static int usbatm_atm_proc_read(struct atm_dev *atm_dev, loff_t * pos, char *pag
39532 if (!left--)
39533 return sprintf(page,
39534 "AAL5: tx %d ( %d err ), rx %d ( %d err, %d drop )\n",
39535 - atomic_read(&atm_dev->stats.aal5.tx),
39536 - atomic_read(&atm_dev->stats.aal5.tx_err),
39537 - atomic_read(&atm_dev->stats.aal5.rx),
39538 - atomic_read(&atm_dev->stats.aal5.rx_err),
39539 - atomic_read(&atm_dev->stats.aal5.rx_drop));
39540 + atomic_read_unchecked(&atm_dev->stats.aal5.tx),
39541 + atomic_read_unchecked(&atm_dev->stats.aal5.tx_err),
39542 + atomic_read_unchecked(&atm_dev->stats.aal5.rx),
39543 + atomic_read_unchecked(&atm_dev->stats.aal5.rx_err),
39544 + atomic_read_unchecked(&atm_dev->stats.aal5.rx_drop));
39545
39546 if (!left--) {
39547 if (instance->disconnected)
39548 diff --git a/drivers/usb/core/devices.c b/drivers/usb/core/devices.c
39549 index 3440812..2a4ef1f 100644
39550 --- a/drivers/usb/core/devices.c
39551 +++ b/drivers/usb/core/devices.c
39552 @@ -126,7 +126,7 @@ static const char format_endpt[] =
39553 * time it gets called.
39554 */
39555 static struct device_connect_event {
39556 - atomic_t count;
39557 + atomic_unchecked_t count;
39558 wait_queue_head_t wait;
39559 } device_event = {
39560 .count = ATOMIC_INIT(1),
39561 @@ -164,7 +164,7 @@ static const struct class_info clas_info[] = {
39562
39563 void usbfs_conn_disc_event(void)
39564 {
39565 - atomic_add(2, &device_event.count);
39566 + atomic_add_unchecked(2, &device_event.count);
39567 wake_up(&device_event.wait);
39568 }
39569
39570 @@ -648,7 +648,7 @@ static unsigned int usb_device_poll(struct file *file,
39571
39572 poll_wait(file, &device_event.wait, wait);
39573
39574 - event_count = atomic_read(&device_event.count);
39575 + event_count = atomic_read_unchecked(&device_event.count);
39576 if (file->f_version != event_count) {
39577 file->f_version = event_count;
39578 return POLLIN | POLLRDNORM;
39579 diff --git a/drivers/usb/early/ehci-dbgp.c b/drivers/usb/early/ehci-dbgp.c
39580 index 89dcf15..481800b 100644
39581 --- a/drivers/usb/early/ehci-dbgp.c
39582 +++ b/drivers/usb/early/ehci-dbgp.c
39583 @@ -97,7 +97,8 @@ static inline u32 dbgp_len_update(u32 x, u32 len)
39584
39585 #ifdef CONFIG_KGDB
39586 static struct kgdb_io kgdbdbgp_io_ops;
39587 -#define dbgp_kgdb_mode (dbg_io_ops == &kgdbdbgp_io_ops)
39588 +static struct kgdb_io kgdbdbgp_io_ops_console;
39589 +#define dbgp_kgdb_mode (dbg_io_ops == &kgdbdbgp_io_ops || dbg_io_ops == &kgdbdbgp_io_ops_console)
39590 #else
39591 #define dbgp_kgdb_mode (0)
39592 #endif
39593 @@ -1035,6 +1036,13 @@ static struct kgdb_io kgdbdbgp_io_ops = {
39594 .write_char = kgdbdbgp_write_char,
39595 };
39596
39597 +static struct kgdb_io kgdbdbgp_io_ops_console = {
39598 + .name = "kgdbdbgp",
39599 + .read_char = kgdbdbgp_read_char,
39600 + .write_char = kgdbdbgp_write_char,
39601 + .is_console = 1
39602 +};
39603 +
39604 static int kgdbdbgp_wait_time;
39605
39606 static int __init kgdbdbgp_parse_config(char *str)
39607 @@ -1050,8 +1058,10 @@ static int __init kgdbdbgp_parse_config(char *str)
39608 ptr++;
39609 kgdbdbgp_wait_time = simple_strtoul(ptr, &ptr, 10);
39610 }
39611 - kgdb_register_io_module(&kgdbdbgp_io_ops);
39612 - kgdbdbgp_io_ops.is_console = early_dbgp_console.index != -1;
39613 + if (early_dbgp_console.index != -1)
39614 + kgdb_register_io_module(&kgdbdbgp_io_ops_console);
39615 + else
39616 + kgdb_register_io_module(&kgdbdbgp_io_ops);
39617
39618 return 0;
39619 }
39620 diff --git a/drivers/usb/gadget/u_serial.c b/drivers/usb/gadget/u_serial.c
39621 index da6d479..80ed10b 100644
39622 --- a/drivers/usb/gadget/u_serial.c
39623 +++ b/drivers/usb/gadget/u_serial.c
39624 @@ -735,9 +735,9 @@ static int gs_open(struct tty_struct *tty, struct file *file)
39625 spin_lock_irq(&port->port_lock);
39626
39627 /* already open? Great. */
39628 - if (port->port.count) {
39629 + if (atomic_read(&port->port.count)) {
39630 status = 0;
39631 - port->port.count++;
39632 + atomic_inc(&port->port.count);
39633
39634 /* currently opening/closing? wait ... */
39635 } else if (port->openclose) {
39636 @@ -796,7 +796,7 @@ static int gs_open(struct tty_struct *tty, struct file *file)
39637 tty->driver_data = port;
39638 port->port.tty = tty;
39639
39640 - port->port.count = 1;
39641 + atomic_set(&port->port.count, 1);
39642 port->openclose = false;
39643
39644 /* if connected, start the I/O stream */
39645 @@ -838,11 +838,11 @@ static void gs_close(struct tty_struct *tty, struct file *file)
39646
39647 spin_lock_irq(&port->port_lock);
39648
39649 - if (port->port.count != 1) {
39650 - if (port->port.count == 0)
39651 + if (atomic_read(&port->port.count) != 1) {
39652 + if (atomic_read(&port->port.count) == 0)
39653 WARN_ON(1);
39654 else
39655 - --port->port.count;
39656 + atomic_dec(&port->port.count);
39657 goto exit;
39658 }
39659
39660 @@ -852,7 +852,7 @@ static void gs_close(struct tty_struct *tty, struct file *file)
39661 * and sleep if necessary
39662 */
39663 port->openclose = true;
39664 - port->port.count = 0;
39665 + atomic_set(&port->port.count, 0);
39666
39667 gser = port->port_usb;
39668 if (gser && gser->disconnect)
39669 @@ -1156,7 +1156,7 @@ static int gs_closed(struct gs_port *port)
39670 int cond;
39671
39672 spin_lock_irq(&port->port_lock);
39673 - cond = (port->port.count == 0) && !port->openclose;
39674 + cond = (atomic_read(&port->port.count) == 0) && !port->openclose;
39675 spin_unlock_irq(&port->port_lock);
39676 return cond;
39677 }
39678 @@ -1269,7 +1269,7 @@ int gserial_connect(struct gserial *gser, u8 port_num)
39679 /* if it's already open, start I/O ... and notify the serial
39680 * protocol about open/close status (connect/disconnect).
39681 */
39682 - if (port->port.count) {
39683 + if (atomic_read(&port->port.count)) {
39684 pr_debug("gserial_connect: start ttyGS%d\n", port->port_num);
39685 gs_start_io(port);
39686 if (gser->connect)
39687 @@ -1316,7 +1316,7 @@ void gserial_disconnect(struct gserial *gser)
39688
39689 port->port_usb = NULL;
39690 gser->ioport = NULL;
39691 - if (port->port.count > 0 || port->openclose) {
39692 + if (atomic_read(&port->port.count) > 0 || port->openclose) {
39693 wake_up_interruptible(&port->drain_wait);
39694 if (port->port.tty)
39695 tty_hangup(port->port.tty);
39696 @@ -1332,7 +1332,7 @@ void gserial_disconnect(struct gserial *gser)
39697
39698 /* finally, free any unused/unusable I/O buffers */
39699 spin_lock_irqsave(&port->port_lock, flags);
39700 - if (port->port.count == 0 && !port->openclose)
39701 + if (atomic_read(&port->port.count) == 0 && !port->openclose)
39702 gs_buf_free(&port->port_write_buf);
39703 gs_free_requests(gser->out, &port->read_pool, NULL);
39704 gs_free_requests(gser->out, &port->read_queue, NULL);
39705 diff --git a/drivers/usb/serial/console.c b/drivers/usb/serial/console.c
39706 index b9cca6d..75c75df 100644
39707 --- a/drivers/usb/serial/console.c
39708 +++ b/drivers/usb/serial/console.c
39709 @@ -127,7 +127,7 @@ static int usb_console_setup(struct console *co, char *options)
39710
39711 info->port = port;
39712
39713 - ++port->port.count;
39714 + atomic_inc(&port->port.count);
39715 if (!test_bit(ASYNCB_INITIALIZED, &port->port.flags)) {
39716 if (serial->type->set_termios) {
39717 /*
39718 @@ -177,7 +177,7 @@ static int usb_console_setup(struct console *co, char *options)
39719 }
39720 /* Now that any required fake tty operations are completed restore
39721 * the tty port count */
39722 - --port->port.count;
39723 + atomic_dec(&port->port.count);
39724 /* The console is special in terms of closing the device so
39725 * indicate this port is now acting as a system console. */
39726 port->port.console = 1;
39727 @@ -190,7 +190,7 @@ static int usb_console_setup(struct console *co, char *options)
39728 free_tty:
39729 kfree(tty);
39730 reset_open_count:
39731 - port->port.count = 0;
39732 + atomic_set(&port->port.count, 0);
39733 usb_autopm_put_interface(serial->interface);
39734 error_get_interface:
39735 usb_serial_put(serial);
39736 diff --git a/drivers/usb/wusbcore/wa-hc.h b/drivers/usb/wusbcore/wa-hc.h
39737 index d6bea3e..60b250e 100644
39738 --- a/drivers/usb/wusbcore/wa-hc.h
39739 +++ b/drivers/usb/wusbcore/wa-hc.h
39740 @@ -192,7 +192,7 @@ struct wahc {
39741 struct list_head xfer_delayed_list;
39742 spinlock_t xfer_list_lock;
39743 struct work_struct xfer_work;
39744 - atomic_t xfer_id_count;
39745 + atomic_unchecked_t xfer_id_count;
39746 };
39747
39748
39749 @@ -246,7 +246,7 @@ static inline void wa_init(struct wahc *wa)
39750 INIT_LIST_HEAD(&wa->xfer_delayed_list);
39751 spin_lock_init(&wa->xfer_list_lock);
39752 INIT_WORK(&wa->xfer_work, wa_urb_enqueue_run);
39753 - atomic_set(&wa->xfer_id_count, 1);
39754 + atomic_set_unchecked(&wa->xfer_id_count, 1);
39755 }
39756
39757 /**
39758 diff --git a/drivers/usb/wusbcore/wa-xfer.c b/drivers/usb/wusbcore/wa-xfer.c
39759 index 57c01ab..8a05959 100644
39760 --- a/drivers/usb/wusbcore/wa-xfer.c
39761 +++ b/drivers/usb/wusbcore/wa-xfer.c
39762 @@ -296,7 +296,7 @@ out:
39763 */
39764 static void wa_xfer_id_init(struct wa_xfer *xfer)
39765 {
39766 - xfer->id = atomic_add_return(1, &xfer->wa->xfer_id_count);
39767 + xfer->id = atomic_add_return_unchecked(1, &xfer->wa->xfer_id_count);
39768 }
39769
39770 /*
39771 diff --git a/drivers/vhost/vhost.c b/drivers/vhost/vhost.c
39772 index ef82a0d..da8a0b3 100644
39773 --- a/drivers/vhost/vhost.c
39774 +++ b/drivers/vhost/vhost.c
39775 @@ -634,7 +634,7 @@ static long vhost_set_memory(struct vhost_dev *d, struct vhost_memory __user *m)
39776 return 0;
39777 }
39778
39779 -static long vhost_set_vring(struct vhost_dev *d, int ioctl, void __user *argp)
39780 +static long vhost_set_vring(struct vhost_dev *d, unsigned int ioctl, void __user *argp)
39781 {
39782 struct file *eventfp, *filep = NULL,
39783 *pollstart = NULL, *pollstop = NULL;
39784 diff --git a/drivers/video/aty/aty128fb.c b/drivers/video/aty/aty128fb.c
39785 index 747442d..7c0c434 100644
39786 --- a/drivers/video/aty/aty128fb.c
39787 +++ b/drivers/video/aty/aty128fb.c
39788 @@ -149,7 +149,7 @@ enum {
39789 };
39790
39791 /* Must match above enum */
39792 -static const char *r128_family[] __devinitdata = {
39793 +static const char *r128_family[] __devinitconst = {
39794 "AGP",
39795 "PCI",
39796 "PRO AGP",
39797 diff --git a/drivers/video/fbcmap.c b/drivers/video/fbcmap.c
39798 index 5c3960d..15cf8fc 100644
39799 --- a/drivers/video/fbcmap.c
39800 +++ b/drivers/video/fbcmap.c
39801 @@ -285,8 +285,7 @@ int fb_set_user_cmap(struct fb_cmap_user *cmap, struct fb_info *info)
39802 rc = -ENODEV;
39803 goto out;
39804 }
39805 - if (cmap->start < 0 || (!info->fbops->fb_setcolreg &&
39806 - !info->fbops->fb_setcmap)) {
39807 + if (!info->fbops->fb_setcolreg && !info->fbops->fb_setcmap) {
39808 rc = -EINVAL;
39809 goto out1;
39810 }
39811 diff --git a/drivers/video/fbmem.c b/drivers/video/fbmem.c
39812 index 0dff12a..2ef47b3 100644
39813 --- a/drivers/video/fbmem.c
39814 +++ b/drivers/video/fbmem.c
39815 @@ -428,7 +428,7 @@ static void fb_do_show_logo(struct fb_info *info, struct fb_image *image,
39816 image->dx += image->width + 8;
39817 }
39818 } else if (rotate == FB_ROTATE_UD) {
39819 - for (x = 0; x < num && image->dx >= 0; x++) {
39820 + for (x = 0; x < num && (__s32)image->dx >= 0; x++) {
39821 info->fbops->fb_imageblit(info, image);
39822 image->dx -= image->width + 8;
39823 }
39824 @@ -440,7 +440,7 @@ static void fb_do_show_logo(struct fb_info *info, struct fb_image *image,
39825 image->dy += image->height + 8;
39826 }
39827 } else if (rotate == FB_ROTATE_CCW) {
39828 - for (x = 0; x < num && image->dy >= 0; x++) {
39829 + for (x = 0; x < num && (__s32)image->dy >= 0; x++) {
39830 info->fbops->fb_imageblit(info, image);
39831 image->dy -= image->height + 8;
39832 }
39833 @@ -1166,7 +1166,7 @@ static long do_fb_ioctl(struct fb_info *info, unsigned int cmd,
39834 return -EFAULT;
39835 if (con2fb.console < 1 || con2fb.console > MAX_NR_CONSOLES)
39836 return -EINVAL;
39837 - if (con2fb.framebuffer < 0 || con2fb.framebuffer >= FB_MAX)
39838 + if (con2fb.framebuffer >= FB_MAX)
39839 return -EINVAL;
39840 if (!registered_fb[con2fb.framebuffer])
39841 request_module("fb%d", con2fb.framebuffer);
39842 diff --git a/drivers/video/geode/gx1fb_core.c b/drivers/video/geode/gx1fb_core.c
39843 index 5a5d092..265c5ed 100644
39844 --- a/drivers/video/geode/gx1fb_core.c
39845 +++ b/drivers/video/geode/gx1fb_core.c
39846 @@ -29,7 +29,7 @@ static int crt_option = 1;
39847 static char panel_option[32] = "";
39848
39849 /* Modes relevant to the GX1 (taken from modedb.c) */
39850 -static const struct fb_videomode __devinitdata gx1_modedb[] = {
39851 +static const struct fb_videomode __devinitconst gx1_modedb[] = {
39852 /* 640x480-60 VESA */
39853 { NULL, 60, 640, 480, 39682, 48, 16, 33, 10, 96, 2,
39854 0, FB_VMODE_NONINTERLACED, FB_MODE_IS_VESA },
39855 diff --git a/drivers/video/gxt4500.c b/drivers/video/gxt4500.c
39856 index 0fad23f..0e9afa4 100644
39857 --- a/drivers/video/gxt4500.c
39858 +++ b/drivers/video/gxt4500.c
39859 @@ -156,7 +156,7 @@ struct gxt4500_par {
39860 static char *mode_option;
39861
39862 /* default mode: 1280x1024 @ 60 Hz, 8 bpp */
39863 -static const struct fb_videomode defaultmode __devinitdata = {
39864 +static const struct fb_videomode defaultmode __devinitconst = {
39865 .refresh = 60,
39866 .xres = 1280,
39867 .yres = 1024,
39868 @@ -581,7 +581,7 @@ static int gxt4500_blank(int blank, struct fb_info *info)
39869 return 0;
39870 }
39871
39872 -static const struct fb_fix_screeninfo gxt4500_fix __devinitdata = {
39873 +static const struct fb_fix_screeninfo gxt4500_fix __devinitconst = {
39874 .id = "IBM GXT4500P",
39875 .type = FB_TYPE_PACKED_PIXELS,
39876 .visual = FB_VISUAL_PSEUDOCOLOR,
39877 diff --git a/drivers/video/i810/i810_accel.c b/drivers/video/i810/i810_accel.c
39878 index 7672d2e..b56437f 100644
39879 --- a/drivers/video/i810/i810_accel.c
39880 +++ b/drivers/video/i810/i810_accel.c
39881 @@ -73,6 +73,7 @@ static inline int wait_for_space(struct fb_info *info, u32 space)
39882 }
39883 }
39884 printk("ringbuffer lockup!!!\n");
39885 + printk("head:%u tail:%u iring.size:%u space:%u\n", head, tail, par->iring.size, space);
39886 i810_report_error(mmio);
39887 par->dev_flags |= LOCKUP;
39888 info->pixmap.scan_align = 1;
39889 diff --git a/drivers/video/i810/i810_main.c b/drivers/video/i810/i810_main.c
39890 index b83f361..2b05a91 100644
39891 --- a/drivers/video/i810/i810_main.c
39892 +++ b/drivers/video/i810/i810_main.c
39893 @@ -97,7 +97,7 @@ static int i810fb_blank (int blank_mode, struct fb_info *info);
39894 static void i810fb_release_resource (struct fb_info *info, struct i810fb_par *par);
39895
39896 /* PCI */
39897 -static const char *i810_pci_list[] __devinitdata = {
39898 +static const char *i810_pci_list[] __devinitconst = {
39899 "Intel(R) 810 Framebuffer Device" ,
39900 "Intel(R) 810-DC100 Framebuffer Device" ,
39901 "Intel(R) 810E Framebuffer Device" ,
39902 diff --git a/drivers/video/jz4740_fb.c b/drivers/video/jz4740_fb.c
39903 index de36693..3c63fc2 100644
39904 --- a/drivers/video/jz4740_fb.c
39905 +++ b/drivers/video/jz4740_fb.c
39906 @@ -136,7 +136,7 @@ struct jzfb {
39907 uint32_t pseudo_palette[16];
39908 };
39909
39910 -static const struct fb_fix_screeninfo jzfb_fix __devinitdata = {
39911 +static const struct fb_fix_screeninfo jzfb_fix __devinitconst = {
39912 .id = "JZ4740 FB",
39913 .type = FB_TYPE_PACKED_PIXELS,
39914 .visual = FB_VISUAL_TRUECOLOR,
39915 diff --git a/drivers/video/logo/logo_linux_clut224.ppm b/drivers/video/logo/logo_linux_clut224.ppm
39916 index 3c14e43..eafa544 100644
39917 --- a/drivers/video/logo/logo_linux_clut224.ppm
39918 +++ b/drivers/video/logo/logo_linux_clut224.ppm
39919 @@ -1,1604 +1,1123 @@
39920 P3
39921 -# Standard 224-color Linux logo
39922 80 80
39923 255
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 - 0 0 0 0 0 0 0 0 0 0 0 0
39927 - 0 0 0 0 0 0 0 0 0 0 0 0
39928 - 0 0 0 0 0 0 0 0 0 0 0 0
39929 - 0 0 0 0 0 0 0 0 0 0 0 0
39930 - 0 0 0 0 0 0 0 0 0 0 0 0
39931 - 0 0 0 0 0 0 0 0 0 0 0 0
39932 - 0 0 0 0 0 0 0 0 0 0 0 0
39933 - 6 6 6 6 6 6 10 10 10 10 10 10
39934 - 10 10 10 6 6 6 6 6 6 6 6 6
39935 - 0 0 0 0 0 0 0 0 0 0 0 0
39936 - 0 0 0 0 0 0 0 0 0 0 0 0
39937 - 0 0 0 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 - 0 0 0 0 0 0 0 0 0 0 0 0
39947 - 0 0 0 0 0 0 0 0 0 0 0 0
39948 - 0 0 0 0 0 0 0 0 0 0 0 0
39949 - 0 0 0 0 0 0 0 0 0 0 0 0
39950 - 0 0 0 0 0 0 0 0 0 0 0 0
39951 - 0 0 0 0 0 0 0 0 0 0 0 0
39952 - 0 0 0 6 6 6 10 10 10 14 14 14
39953 - 22 22 22 26 26 26 30 30 30 34 34 34
39954 - 30 30 30 30 30 30 26 26 26 18 18 18
39955 - 14 14 14 10 10 10 6 6 6 0 0 0
39956 - 0 0 0 0 0 0 0 0 0 0 0 0
39957 - 0 0 0 0 0 0 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 1 0 0 1 0 0 0
39966 - 0 0 0 0 0 0 0 0 0 0 0 0
39967 - 0 0 0 0 0 0 0 0 0 0 0 0
39968 - 0 0 0 0 0 0 0 0 0 0 0 0
39969 - 0 0 0 0 0 0 0 0 0 0 0 0
39970 - 0 0 0 0 0 0 0 0 0 0 0 0
39971 - 0 0 0 0 0 0 0 0 0 0 0 0
39972 - 6 6 6 14 14 14 26 26 26 42 42 42
39973 - 54 54 54 66 66 66 78 78 78 78 78 78
39974 - 78 78 78 74 74 74 66 66 66 54 54 54
39975 - 42 42 42 26 26 26 18 18 18 10 10 10
39976 - 6 6 6 0 0 0 0 0 0 0 0 0
39977 - 0 0 0 0 0 0 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 1 0 0 0 0 0 0 0 0 0
39986 - 0 0 0 0 0 0 0 0 0 0 0 0
39987 - 0 0 0 0 0 0 0 0 0 0 0 0
39988 - 0 0 0 0 0 0 0 0 0 0 0 0
39989 - 0 0 0 0 0 0 0 0 0 0 0 0
39990 - 0 0 0 0 0 0 0 0 0 0 0 0
39991 - 0 0 0 0 0 0 0 0 0 10 10 10
39992 - 22 22 22 42 42 42 66 66 66 86 86 86
39993 - 66 66 66 38 38 38 38 38 38 22 22 22
39994 - 26 26 26 34 34 34 54 54 54 66 66 66
39995 - 86 86 86 70 70 70 46 46 46 26 26 26
39996 - 14 14 14 6 6 6 0 0 0 0 0 0
39997 - 0 0 0 0 0 0 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 1 0 0 1 0 0 1 0 0 0
40006 - 0 0 0 0 0 0 0 0 0 0 0 0
40007 - 0 0 0 0 0 0 0 0 0 0 0 0
40008 - 0 0 0 0 0 0 0 0 0 0 0 0
40009 - 0 0 0 0 0 0 0 0 0 0 0 0
40010 - 0 0 0 0 0 0 0 0 0 0 0 0
40011 - 0 0 0 0 0 0 10 10 10 26 26 26
40012 - 50 50 50 82 82 82 58 58 58 6 6 6
40013 - 2 2 6 2 2 6 2 2 6 2 2 6
40014 - 2 2 6 2 2 6 2 2 6 2 2 6
40015 - 6 6 6 54 54 54 86 86 86 66 66 66
40016 - 38 38 38 18 18 18 6 6 6 0 0 0
40017 - 0 0 0 0 0 0 0 0 0 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 0 0 0 0 0 0
40026 - 0 0 0 0 0 0 0 0 0 0 0 0
40027 - 0 0 0 0 0 0 0 0 0 0 0 0
40028 - 0 0 0 0 0 0 0 0 0 0 0 0
40029 - 0 0 0 0 0 0 0 0 0 0 0 0
40030 - 0 0 0 0 0 0 0 0 0 0 0 0
40031 - 0 0 0 6 6 6 22 22 22 50 50 50
40032 - 78 78 78 34 34 34 2 2 6 2 2 6
40033 - 2 2 6 2 2 6 2 2 6 2 2 6
40034 - 2 2 6 2 2 6 2 2 6 2 2 6
40035 - 2 2 6 2 2 6 6 6 6 70 70 70
40036 - 78 78 78 46 46 46 22 22 22 6 6 6
40037 - 0 0 0 0 0 0 0 0 0 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 1 0 0 1 0 0 1 0 0 0
40046 - 0 0 0 0 0 0 0 0 0 0 0 0
40047 - 0 0 0 0 0 0 0 0 0 0 0 0
40048 - 0 0 0 0 0 0 0 0 0 0 0 0
40049 - 0 0 0 0 0 0 0 0 0 0 0 0
40050 - 0 0 0 0 0 0 0 0 0 0 0 0
40051 - 6 6 6 18 18 18 42 42 42 82 82 82
40052 - 26 26 26 2 2 6 2 2 6 2 2 6
40053 - 2 2 6 2 2 6 2 2 6 2 2 6
40054 - 2 2 6 2 2 6 2 2 6 14 14 14
40055 - 46 46 46 34 34 34 6 6 6 2 2 6
40056 - 42 42 42 78 78 78 42 42 42 18 18 18
40057 - 6 6 6 0 0 0 0 0 0 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 1 0 0 0 0 0 1 0 0 0
40066 - 0 0 0 0 0 0 0 0 0 0 0 0
40067 - 0 0 0 0 0 0 0 0 0 0 0 0
40068 - 0 0 0 0 0 0 0 0 0 0 0 0
40069 - 0 0 0 0 0 0 0 0 0 0 0 0
40070 - 0 0 0 0 0 0 0 0 0 0 0 0
40071 - 10 10 10 30 30 30 66 66 66 58 58 58
40072 - 2 2 6 2 2 6 2 2 6 2 2 6
40073 - 2 2 6 2 2 6 2 2 6 2 2 6
40074 - 2 2 6 2 2 6 2 2 6 26 26 26
40075 - 86 86 86 101 101 101 46 46 46 10 10 10
40076 - 2 2 6 58 58 58 70 70 70 34 34 34
40077 - 10 10 10 0 0 0 0 0 0 0 0 0
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 1 0 0 1 0 0 1 0 0 0
40086 - 0 0 0 0 0 0 0 0 0 0 0 0
40087 - 0 0 0 0 0 0 0 0 0 0 0 0
40088 - 0 0 0 0 0 0 0 0 0 0 0 0
40089 - 0 0 0 0 0 0 0 0 0 0 0 0
40090 - 0 0 0 0 0 0 0 0 0 0 0 0
40091 - 14 14 14 42 42 42 86 86 86 10 10 10
40092 - 2 2 6 2 2 6 2 2 6 2 2 6
40093 - 2 2 6 2 2 6 2 2 6 2 2 6
40094 - 2 2 6 2 2 6 2 2 6 30 30 30
40095 - 94 94 94 94 94 94 58 58 58 26 26 26
40096 - 2 2 6 6 6 6 78 78 78 54 54 54
40097 - 22 22 22 6 6 6 0 0 0 0 0 0
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 - 0 0 0 0 0 0 0 0 0 0 0 0
40106 - 0 0 0 0 0 0 0 0 0 0 0 0
40107 - 0 0 0 0 0 0 0 0 0 0 0 0
40108 - 0 0 0 0 0 0 0 0 0 0 0 0
40109 - 0 0 0 0 0 0 0 0 0 0 0 0
40110 - 0 0 0 0 0 0 0 0 0 6 6 6
40111 - 22 22 22 62 62 62 62 62 62 2 2 6
40112 - 2 2 6 2 2 6 2 2 6 2 2 6
40113 - 2 2 6 2 2 6 2 2 6 2 2 6
40114 - 2 2 6 2 2 6 2 2 6 26 26 26
40115 - 54 54 54 38 38 38 18 18 18 10 10 10
40116 - 2 2 6 2 2 6 34 34 34 82 82 82
40117 - 38 38 38 14 14 14 0 0 0 0 0 0
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 - 0 0 0 0 0 1 0 0 1 0 0 0
40126 - 0 0 0 0 0 0 0 0 0 0 0 0
40127 - 0 0 0 0 0 0 0 0 0 0 0 0
40128 - 0 0 0 0 0 0 0 0 0 0 0 0
40129 - 0 0 0 0 0 0 0 0 0 0 0 0
40130 - 0 0 0 0 0 0 0 0 0 6 6 6
40131 - 30 30 30 78 78 78 30 30 30 2 2 6
40132 - 2 2 6 2 2 6 2 2 6 2 2 6
40133 - 2 2 6 2 2 6 2 2 6 2 2 6
40134 - 2 2 6 2 2 6 2 2 6 10 10 10
40135 - 10 10 10 2 2 6 2 2 6 2 2 6
40136 - 2 2 6 2 2 6 2 2 6 78 78 78
40137 - 50 50 50 18 18 18 6 6 6 0 0 0
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 0 0 0
40145 - 0 0 1 0 0 0 0 0 0 0 0 0
40146 - 0 0 0 0 0 0 0 0 0 0 0 0
40147 - 0 0 0 0 0 0 0 0 0 0 0 0
40148 - 0 0 0 0 0 0 0 0 0 0 0 0
40149 - 0 0 0 0 0 0 0 0 0 0 0 0
40150 - 0 0 0 0 0 0 0 0 0 10 10 10
40151 - 38 38 38 86 86 86 14 14 14 2 2 6
40152 - 2 2 6 2 2 6 2 2 6 2 2 6
40153 - 2 2 6 2 2 6 2 2 6 2 2 6
40154 - 2 2 6 2 2 6 2 2 6 2 2 6
40155 - 2 2 6 2 2 6 2 2 6 2 2 6
40156 - 2 2 6 2 2 6 2 2 6 54 54 54
40157 - 66 66 66 26 26 26 6 6 6 0 0 0
40158 - 0 0 0 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 0 0 0
40165 - 0 0 0 0 0 1 0 0 1 0 0 0
40166 - 0 0 0 0 0 0 0 0 0 0 0 0
40167 - 0 0 0 0 0 0 0 0 0 0 0 0
40168 - 0 0 0 0 0 0 0 0 0 0 0 0
40169 - 0 0 0 0 0 0 0 0 0 0 0 0
40170 - 0 0 0 0 0 0 0 0 0 14 14 14
40171 - 42 42 42 82 82 82 2 2 6 2 2 6
40172 - 2 2 6 6 6 6 10 10 10 2 2 6
40173 - 2 2 6 2 2 6 2 2 6 2 2 6
40174 - 2 2 6 2 2 6 2 2 6 6 6 6
40175 - 14 14 14 10 10 10 2 2 6 2 2 6
40176 - 2 2 6 2 2 6 2 2 6 18 18 18
40177 - 82 82 82 34 34 34 10 10 10 0 0 0
40178 - 0 0 0 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 0 0 0
40185 - 0 0 1 0 0 0 0 0 0 0 0 0
40186 - 0 0 0 0 0 0 0 0 0 0 0 0
40187 - 0 0 0 0 0 0 0 0 0 0 0 0
40188 - 0 0 0 0 0 0 0 0 0 0 0 0
40189 - 0 0 0 0 0 0 0 0 0 0 0 0
40190 - 0 0 0 0 0 0 0 0 0 14 14 14
40191 - 46 46 46 86 86 86 2 2 6 2 2 6
40192 - 6 6 6 6 6 6 22 22 22 34 34 34
40193 - 6 6 6 2 2 6 2 2 6 2 2 6
40194 - 2 2 6 2 2 6 18 18 18 34 34 34
40195 - 10 10 10 50 50 50 22 22 22 2 2 6
40196 - 2 2 6 2 2 6 2 2 6 10 10 10
40197 - 86 86 86 42 42 42 14 14 14 0 0 0
40198 - 0 0 0 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 0 0 0 0 0 0
40205 - 0 0 1 0 0 1 0 0 1 0 0 0
40206 - 0 0 0 0 0 0 0 0 0 0 0 0
40207 - 0 0 0 0 0 0 0 0 0 0 0 0
40208 - 0 0 0 0 0 0 0 0 0 0 0 0
40209 - 0 0 0 0 0 0 0 0 0 0 0 0
40210 - 0 0 0 0 0 0 0 0 0 14 14 14
40211 - 46 46 46 86 86 86 2 2 6 2 2 6
40212 - 38 38 38 116 116 116 94 94 94 22 22 22
40213 - 22 22 22 2 2 6 2 2 6 2 2 6
40214 - 14 14 14 86 86 86 138 138 138 162 162 162
40215 -154 154 154 38 38 38 26 26 26 6 6 6
40216 - 2 2 6 2 2 6 2 2 6 2 2 6
40217 - 86 86 86 46 46 46 14 14 14 0 0 0
40218 - 0 0 0 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 0 0 0 0 0 0
40225 - 0 0 0 0 0 0 0 0 0 0 0 0
40226 - 0 0 0 0 0 0 0 0 0 0 0 0
40227 - 0 0 0 0 0 0 0 0 0 0 0 0
40228 - 0 0 0 0 0 0 0 0 0 0 0 0
40229 - 0 0 0 0 0 0 0 0 0 0 0 0
40230 - 0 0 0 0 0 0 0 0 0 14 14 14
40231 - 46 46 46 86 86 86 2 2 6 14 14 14
40232 -134 134 134 198 198 198 195 195 195 116 116 116
40233 - 10 10 10 2 2 6 2 2 6 6 6 6
40234 -101 98 89 187 187 187 210 210 210 218 218 218
40235 -214 214 214 134 134 134 14 14 14 6 6 6
40236 - 2 2 6 2 2 6 2 2 6 2 2 6
40237 - 86 86 86 50 50 50 18 18 18 6 6 6
40238 - 0 0 0 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 0 0 1 0 0 0
40245 - 0 0 1 0 0 1 0 0 1 0 0 0
40246 - 0 0 0 0 0 0 0 0 0 0 0 0
40247 - 0 0 0 0 0 0 0 0 0 0 0 0
40248 - 0 0 0 0 0 0 0 0 0 0 0 0
40249 - 0 0 0 0 0 0 0 0 0 0 0 0
40250 - 0 0 0 0 0 0 0 0 0 14 14 14
40251 - 46 46 46 86 86 86 2 2 6 54 54 54
40252 -218 218 218 195 195 195 226 226 226 246 246 246
40253 - 58 58 58 2 2 6 2 2 6 30 30 30
40254 -210 210 210 253 253 253 174 174 174 123 123 123
40255 -221 221 221 234 234 234 74 74 74 2 2 6
40256 - 2 2 6 2 2 6 2 2 6 2 2 6
40257 - 70 70 70 58 58 58 22 22 22 6 6 6
40258 - 0 0 0 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 0 0 0 0 0 0
40265 - 0 0 0 0 0 0 0 0 0 0 0 0
40266 - 0 0 0 0 0 0 0 0 0 0 0 0
40267 - 0 0 0 0 0 0 0 0 0 0 0 0
40268 - 0 0 0 0 0 0 0 0 0 0 0 0
40269 - 0 0 0 0 0 0 0 0 0 0 0 0
40270 - 0 0 0 0 0 0 0 0 0 14 14 14
40271 - 46 46 46 82 82 82 2 2 6 106 106 106
40272 -170 170 170 26 26 26 86 86 86 226 226 226
40273 -123 123 123 10 10 10 14 14 14 46 46 46
40274 -231 231 231 190 190 190 6 6 6 70 70 70
40275 - 90 90 90 238 238 238 158 158 158 2 2 6
40276 - 2 2 6 2 2 6 2 2 6 2 2 6
40277 - 70 70 70 58 58 58 22 22 22 6 6 6
40278 - 0 0 0 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 0 0 0
40284 - 0 0 0 0 0 0 0 0 1 0 0 0
40285 - 0 0 1 0 0 1 0 0 1 0 0 0
40286 - 0 0 0 0 0 0 0 0 0 0 0 0
40287 - 0 0 0 0 0 0 0 0 0 0 0 0
40288 - 0 0 0 0 0 0 0 0 0 0 0 0
40289 - 0 0 0 0 0 0 0 0 0 0 0 0
40290 - 0 0 0 0 0 0 0 0 0 14 14 14
40291 - 42 42 42 86 86 86 6 6 6 116 116 116
40292 -106 106 106 6 6 6 70 70 70 149 149 149
40293 -128 128 128 18 18 18 38 38 38 54 54 54
40294 -221 221 221 106 106 106 2 2 6 14 14 14
40295 - 46 46 46 190 190 190 198 198 198 2 2 6
40296 - 2 2 6 2 2 6 2 2 6 2 2 6
40297 - 74 74 74 62 62 62 22 22 22 6 6 6
40298 - 0 0 0 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 0 0 0 0 0 0 0 0 0
40304 - 0 0 0 0 0 0 0 0 1 0 0 0
40305 - 0 0 1 0 0 0 0 0 1 0 0 0
40306 - 0 0 0 0 0 0 0 0 0 0 0 0
40307 - 0 0 0 0 0 0 0 0 0 0 0 0
40308 - 0 0 0 0 0 0 0 0 0 0 0 0
40309 - 0 0 0 0 0 0 0 0 0 0 0 0
40310 - 0 0 0 0 0 0 0 0 0 14 14 14
40311 - 42 42 42 94 94 94 14 14 14 101 101 101
40312 -128 128 128 2 2 6 18 18 18 116 116 116
40313 -118 98 46 121 92 8 121 92 8 98 78 10
40314 -162 162 162 106 106 106 2 2 6 2 2 6
40315 - 2 2 6 195 195 195 195 195 195 6 6 6
40316 - 2 2 6 2 2 6 2 2 6 2 2 6
40317 - 74 74 74 62 62 62 22 22 22 6 6 6
40318 - 0 0 0 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 - 0 0 0 0 0 0 0 0 0 0 0 0
40324 - 0 0 0 0 0 0 0 0 1 0 0 1
40325 - 0 0 1 0 0 0 0 0 1 0 0 0
40326 - 0 0 0 0 0 0 0 0 0 0 0 0
40327 - 0 0 0 0 0 0 0 0 0 0 0 0
40328 - 0 0 0 0 0 0 0 0 0 0 0 0
40329 - 0 0 0 0 0 0 0 0 0 0 0 0
40330 - 0 0 0 0 0 0 0 0 0 10 10 10
40331 - 38 38 38 90 90 90 14 14 14 58 58 58
40332 -210 210 210 26 26 26 54 38 6 154 114 10
40333 -226 170 11 236 186 11 225 175 15 184 144 12
40334 -215 174 15 175 146 61 37 26 9 2 2 6
40335 - 70 70 70 246 246 246 138 138 138 2 2 6
40336 - 2 2 6 2 2 6 2 2 6 2 2 6
40337 - 70 70 70 66 66 66 26 26 26 6 6 6
40338 - 0 0 0 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 - 0 0 0 0 0 0 0 0 0 0 0 0
40344 - 0 0 0 0 0 0 0 0 0 0 0 0
40345 - 0 0 0 0 0 0 0 0 0 0 0 0
40346 - 0 0 0 0 0 0 0 0 0 0 0 0
40347 - 0 0 0 0 0 0 0 0 0 0 0 0
40348 - 0 0 0 0 0 0 0 0 0 0 0 0
40349 - 0 0 0 0 0 0 0 0 0 0 0 0
40350 - 0 0 0 0 0 0 0 0 0 10 10 10
40351 - 38 38 38 86 86 86 14 14 14 10 10 10
40352 -195 195 195 188 164 115 192 133 9 225 175 15
40353 -239 182 13 234 190 10 232 195 16 232 200 30
40354 -245 207 45 241 208 19 232 195 16 184 144 12
40355 -218 194 134 211 206 186 42 42 42 2 2 6
40356 - 2 2 6 2 2 6 2 2 6 2 2 6
40357 - 50 50 50 74 74 74 30 30 30 6 6 6
40358 - 0 0 0 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 0 0 0
40363 - 0 0 0 0 0 0 0 0 0 0 0 0
40364 - 0 0 0 0 0 0 0 0 0 0 0 0
40365 - 0 0 0 0 0 0 0 0 0 0 0 0
40366 - 0 0 0 0 0 0 0 0 0 0 0 0
40367 - 0 0 0 0 0 0 0 0 0 0 0 0
40368 - 0 0 0 0 0 0 0 0 0 0 0 0
40369 - 0 0 0 0 0 0 0 0 0 0 0 0
40370 - 0 0 0 0 0 0 0 0 0 10 10 10
40371 - 34 34 34 86 86 86 14 14 14 2 2 6
40372 -121 87 25 192 133 9 219 162 10 239 182 13
40373 -236 186 11 232 195 16 241 208 19 244 214 54
40374 -246 218 60 246 218 38 246 215 20 241 208 19
40375 -241 208 19 226 184 13 121 87 25 2 2 6
40376 - 2 2 6 2 2 6 2 2 6 2 2 6
40377 - 50 50 50 82 82 82 34 34 34 10 10 10
40378 - 0 0 0 0 0 0 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 0 0 0
40383 - 0 0 0 0 0 0 0 0 0 0 0 0
40384 - 0 0 0 0 0 0 0 0 0 0 0 0
40385 - 0 0 0 0 0 0 0 0 0 0 0 0
40386 - 0 0 0 0 0 0 0 0 0 0 0 0
40387 - 0 0 0 0 0 0 0 0 0 0 0 0
40388 - 0 0 0 0 0 0 0 0 0 0 0 0
40389 - 0 0 0 0 0 0 0 0 0 0 0 0
40390 - 0 0 0 0 0 0 0 0 0 10 10 10
40391 - 34 34 34 82 82 82 30 30 30 61 42 6
40392 -180 123 7 206 145 10 230 174 11 239 182 13
40393 -234 190 10 238 202 15 241 208 19 246 218 74
40394 -246 218 38 246 215 20 246 215 20 246 215 20
40395 -226 184 13 215 174 15 184 144 12 6 6 6
40396 - 2 2 6 2 2 6 2 2 6 2 2 6
40397 - 26 26 26 94 94 94 42 42 42 14 14 14
40398 - 0 0 0 0 0 0 0 0 0 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 0 0 0
40403 - 0 0 0 0 0 0 0 0 0 0 0 0
40404 - 0 0 0 0 0 0 0 0 0 0 0 0
40405 - 0 0 0 0 0 0 0 0 0 0 0 0
40406 - 0 0 0 0 0 0 0 0 0 0 0 0
40407 - 0 0 0 0 0 0 0 0 0 0 0 0
40408 - 0 0 0 0 0 0 0 0 0 0 0 0
40409 - 0 0 0 0 0 0 0 0 0 0 0 0
40410 - 0 0 0 0 0 0 0 0 0 10 10 10
40411 - 30 30 30 78 78 78 50 50 50 104 69 6
40412 -192 133 9 216 158 10 236 178 12 236 186 11
40413 -232 195 16 241 208 19 244 214 54 245 215 43
40414 -246 215 20 246 215 20 241 208 19 198 155 10
40415 -200 144 11 216 158 10 156 118 10 2 2 6
40416 - 2 2 6 2 2 6 2 2 6 2 2 6
40417 - 6 6 6 90 90 90 54 54 54 18 18 18
40418 - 6 6 6 0 0 0 0 0 0 0 0 0
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 0 0 0
40423 - 0 0 0 0 0 0 0 0 0 0 0 0
40424 - 0 0 0 0 0 0 0 0 0 0 0 0
40425 - 0 0 0 0 0 0 0 0 0 0 0 0
40426 - 0 0 0 0 0 0 0 0 0 0 0 0
40427 - 0 0 0 0 0 0 0 0 0 0 0 0
40428 - 0 0 0 0 0 0 0 0 0 0 0 0
40429 - 0 0 0 0 0 0 0 0 0 0 0 0
40430 - 0 0 0 0 0 0 0 0 0 10 10 10
40431 - 30 30 30 78 78 78 46 46 46 22 22 22
40432 -137 92 6 210 162 10 239 182 13 238 190 10
40433 -238 202 15 241 208 19 246 215 20 246 215 20
40434 -241 208 19 203 166 17 185 133 11 210 150 10
40435 -216 158 10 210 150 10 102 78 10 2 2 6
40436 - 6 6 6 54 54 54 14 14 14 2 2 6
40437 - 2 2 6 62 62 62 74 74 74 30 30 30
40438 - 10 10 10 0 0 0 0 0 0 0 0 0
40439 - 0 0 0 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 0 0 0
40443 - 0 0 0 0 0 0 0 0 0 0 0 0
40444 - 0 0 0 0 0 0 0 0 0 0 0 0
40445 - 0 0 0 0 0 0 0 0 0 0 0 0
40446 - 0 0 0 0 0 0 0 0 0 0 0 0
40447 - 0 0 0 0 0 0 0 0 0 0 0 0
40448 - 0 0 0 0 0 0 0 0 0 0 0 0
40449 - 0 0 0 0 0 0 0 0 0 0 0 0
40450 - 0 0 0 0 0 0 0 0 0 10 10 10
40451 - 34 34 34 78 78 78 50 50 50 6 6 6
40452 - 94 70 30 139 102 15 190 146 13 226 184 13
40453 -232 200 30 232 195 16 215 174 15 190 146 13
40454 -168 122 10 192 133 9 210 150 10 213 154 11
40455 -202 150 34 182 157 106 101 98 89 2 2 6
40456 - 2 2 6 78 78 78 116 116 116 58 58 58
40457 - 2 2 6 22 22 22 90 90 90 46 46 46
40458 - 18 18 18 6 6 6 0 0 0 0 0 0
40459 - 0 0 0 0 0 0 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 0 0 0
40463 - 0 0 0 0 0 0 0 0 0 0 0 0
40464 - 0 0 0 0 0 0 0 0 0 0 0 0
40465 - 0 0 0 0 0 0 0 0 0 0 0 0
40466 - 0 0 0 0 0 0 0 0 0 0 0 0
40467 - 0 0 0 0 0 0 0 0 0 0 0 0
40468 - 0 0 0 0 0 0 0 0 0 0 0 0
40469 - 0 0 0 0 0 0 0 0 0 0 0 0
40470 - 0 0 0 0 0 0 0 0 0 10 10 10
40471 - 38 38 38 86 86 86 50 50 50 6 6 6
40472 -128 128 128 174 154 114 156 107 11 168 122 10
40473 -198 155 10 184 144 12 197 138 11 200 144 11
40474 -206 145 10 206 145 10 197 138 11 188 164 115
40475 -195 195 195 198 198 198 174 174 174 14 14 14
40476 - 2 2 6 22 22 22 116 116 116 116 116 116
40477 - 22 22 22 2 2 6 74 74 74 70 70 70
40478 - 30 30 30 10 10 10 0 0 0 0 0 0
40479 - 0 0 0 0 0 0 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 0 0 0
40483 - 0 0 0 0 0 0 0 0 0 0 0 0
40484 - 0 0 0 0 0 0 0 0 0 0 0 0
40485 - 0 0 0 0 0 0 0 0 0 0 0 0
40486 - 0 0 0 0 0 0 0 0 0 0 0 0
40487 - 0 0 0 0 0 0 0 0 0 0 0 0
40488 - 0 0 0 0 0 0 0 0 0 0 0 0
40489 - 0 0 0 0 0 0 0 0 0 0 0 0
40490 - 0 0 0 0 0 0 6 6 6 18 18 18
40491 - 50 50 50 101 101 101 26 26 26 10 10 10
40492 -138 138 138 190 190 190 174 154 114 156 107 11
40493 -197 138 11 200 144 11 197 138 11 192 133 9
40494 -180 123 7 190 142 34 190 178 144 187 187 187
40495 -202 202 202 221 221 221 214 214 214 66 66 66
40496 - 2 2 6 2 2 6 50 50 50 62 62 62
40497 - 6 6 6 2 2 6 10 10 10 90 90 90
40498 - 50 50 50 18 18 18 6 6 6 0 0 0
40499 - 0 0 0 0 0 0 0 0 0 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 0 0 0
40503 - 0 0 0 0 0 0 0 0 0 0 0 0
40504 - 0 0 0 0 0 0 0 0 0 0 0 0
40505 - 0 0 0 0 0 0 0 0 0 0 0 0
40506 - 0 0 0 0 0 0 0 0 0 0 0 0
40507 - 0 0 0 0 0 0 0 0 0 0 0 0
40508 - 0 0 0 0 0 0 0 0 0 0 0 0
40509 - 0 0 0 0 0 0 0 0 0 0 0 0
40510 - 0 0 0 0 0 0 10 10 10 34 34 34
40511 - 74 74 74 74 74 74 2 2 6 6 6 6
40512 -144 144 144 198 198 198 190 190 190 178 166 146
40513 -154 121 60 156 107 11 156 107 11 168 124 44
40514 -174 154 114 187 187 187 190 190 190 210 210 210
40515 -246 246 246 253 253 253 253 253 253 182 182 182
40516 - 6 6 6 2 2 6 2 2 6 2 2 6
40517 - 2 2 6 2 2 6 2 2 6 62 62 62
40518 - 74 74 74 34 34 34 14 14 14 0 0 0
40519 - 0 0 0 0 0 0 0 0 0 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 0 0 0
40523 - 0 0 0 0 0 0 0 0 0 0 0 0
40524 - 0 0 0 0 0 0 0 0 0 0 0 0
40525 - 0 0 0 0 0 0 0 0 0 0 0 0
40526 - 0 0 0 0 0 0 0 0 0 0 0 0
40527 - 0 0 0 0 0 0 0 0 0 0 0 0
40528 - 0 0 0 0 0 0 0 0 0 0 0 0
40529 - 0 0 0 0 0 0 0 0 0 0 0 0
40530 - 0 0 0 10 10 10 22 22 22 54 54 54
40531 - 94 94 94 18 18 18 2 2 6 46 46 46
40532 -234 234 234 221 221 221 190 190 190 190 190 190
40533 -190 190 190 187 187 187 187 187 187 190 190 190
40534 -190 190 190 195 195 195 214 214 214 242 242 242
40535 -253 253 253 253 253 253 253 253 253 253 253 253
40536 - 82 82 82 2 2 6 2 2 6 2 2 6
40537 - 2 2 6 2 2 6 2 2 6 14 14 14
40538 - 86 86 86 54 54 54 22 22 22 6 6 6
40539 - 0 0 0 0 0 0 0 0 0 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 0 0 0 0 0 0
40543 - 0 0 0 0 0 0 0 0 0 0 0 0
40544 - 0 0 0 0 0 0 0 0 0 0 0 0
40545 - 0 0 0 0 0 0 0 0 0 0 0 0
40546 - 0 0 0 0 0 0 0 0 0 0 0 0
40547 - 0 0 0 0 0 0 0 0 0 0 0 0
40548 - 0 0 0 0 0 0 0 0 0 0 0 0
40549 - 0 0 0 0 0 0 0 0 0 0 0 0
40550 - 6 6 6 18 18 18 46 46 46 90 90 90
40551 - 46 46 46 18 18 18 6 6 6 182 182 182
40552 -253 253 253 246 246 246 206 206 206 190 190 190
40553 -190 190 190 190 190 190 190 190 190 190 190 190
40554 -206 206 206 231 231 231 250 250 250 253 253 253
40555 -253 253 253 253 253 253 253 253 253 253 253 253
40556 -202 202 202 14 14 14 2 2 6 2 2 6
40557 - 2 2 6 2 2 6 2 2 6 2 2 6
40558 - 42 42 42 86 86 86 42 42 42 18 18 18
40559 - 6 6 6 0 0 0 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 0 0 0 0 0 0
40563 - 0 0 0 0 0 0 0 0 0 0 0 0
40564 - 0 0 0 0 0 0 0 0 0 0 0 0
40565 - 0 0 0 0 0 0 0 0 0 0 0 0
40566 - 0 0 0 0 0 0 0 0 0 0 0 0
40567 - 0 0 0 0 0 0 0 0 0 0 0 0
40568 - 0 0 0 0 0 0 0 0 0 0 0 0
40569 - 0 0 0 0 0 0 0 0 0 6 6 6
40570 - 14 14 14 38 38 38 74 74 74 66 66 66
40571 - 2 2 6 6 6 6 90 90 90 250 250 250
40572 -253 253 253 253 253 253 238 238 238 198 198 198
40573 -190 190 190 190 190 190 195 195 195 221 221 221
40574 -246 246 246 253 253 253 253 253 253 253 253 253
40575 -253 253 253 253 253 253 253 253 253 253 253 253
40576 -253 253 253 82 82 82 2 2 6 2 2 6
40577 - 2 2 6 2 2 6 2 2 6 2 2 6
40578 - 2 2 6 78 78 78 70 70 70 34 34 34
40579 - 14 14 14 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 0 0 0 0 0 0
40583 - 0 0 0 0 0 0 0 0 0 0 0 0
40584 - 0 0 0 0 0 0 0 0 0 0 0 0
40585 - 0 0 0 0 0 0 0 0 0 0 0 0
40586 - 0 0 0 0 0 0 0 0 0 0 0 0
40587 - 0 0 0 0 0 0 0 0 0 0 0 0
40588 - 0 0 0 0 0 0 0 0 0 0 0 0
40589 - 0 0 0 0 0 0 0 0 0 14 14 14
40590 - 34 34 34 66 66 66 78 78 78 6 6 6
40591 - 2 2 6 18 18 18 218 218 218 253 253 253
40592 -253 253 253 253 253 253 253 253 253 246 246 246
40593 -226 226 226 231 231 231 246 246 246 253 253 253
40594 -253 253 253 253 253 253 253 253 253 253 253 253
40595 -253 253 253 253 253 253 253 253 253 253 253 253
40596 -253 253 253 178 178 178 2 2 6 2 2 6
40597 - 2 2 6 2 2 6 2 2 6 2 2 6
40598 - 2 2 6 18 18 18 90 90 90 62 62 62
40599 - 30 30 30 10 10 10 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 0 0 0 0 0 0
40603 - 0 0 0 0 0 0 0 0 0 0 0 0
40604 - 0 0 0 0 0 0 0 0 0 0 0 0
40605 - 0 0 0 0 0 0 0 0 0 0 0 0
40606 - 0 0 0 0 0 0 0 0 0 0 0 0
40607 - 0 0 0 0 0 0 0 0 0 0 0 0
40608 - 0 0 0 0 0 0 0 0 0 0 0 0
40609 - 0 0 0 0 0 0 10 10 10 26 26 26
40610 - 58 58 58 90 90 90 18 18 18 2 2 6
40611 - 2 2 6 110 110 110 253 253 253 253 253 253
40612 -253 253 253 253 253 253 253 253 253 253 253 253
40613 -250 250 250 253 253 253 253 253 253 253 253 253
40614 -253 253 253 253 253 253 253 253 253 253 253 253
40615 -253 253 253 253 253 253 253 253 253 253 253 253
40616 -253 253 253 231 231 231 18 18 18 2 2 6
40617 - 2 2 6 2 2 6 2 2 6 2 2 6
40618 - 2 2 6 2 2 6 18 18 18 94 94 94
40619 - 54 54 54 26 26 26 10 10 10 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 0 0 0
40623 - 0 0 0 0 0 0 0 0 0 0 0 0
40624 - 0 0 0 0 0 0 0 0 0 0 0 0
40625 - 0 0 0 0 0 0 0 0 0 0 0 0
40626 - 0 0 0 0 0 0 0 0 0 0 0 0
40627 - 0 0 0 0 0 0 0 0 0 0 0 0
40628 - 0 0 0 0 0 0 0 0 0 0 0 0
40629 - 0 0 0 6 6 6 22 22 22 50 50 50
40630 - 90 90 90 26 26 26 2 2 6 2 2 6
40631 - 14 14 14 195 195 195 250 250 250 253 253 253
40632 -253 253 253 253 253 253 253 253 253 253 253 253
40633 -253 253 253 253 253 253 253 253 253 253 253 253
40634 -253 253 253 253 253 253 253 253 253 253 253 253
40635 -253 253 253 253 253 253 253 253 253 253 253 253
40636 -250 250 250 242 242 242 54 54 54 2 2 6
40637 - 2 2 6 2 2 6 2 2 6 2 2 6
40638 - 2 2 6 2 2 6 2 2 6 38 38 38
40639 - 86 86 86 50 50 50 22 22 22 6 6 6
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 0 0 0
40643 - 0 0 0 0 0 0 0 0 0 0 0 0
40644 - 0 0 0 0 0 0 0 0 0 0 0 0
40645 - 0 0 0 0 0 0 0 0 0 0 0 0
40646 - 0 0 0 0 0 0 0 0 0 0 0 0
40647 - 0 0 0 0 0 0 0 0 0 0 0 0
40648 - 0 0 0 0 0 0 0 0 0 0 0 0
40649 - 6 6 6 14 14 14 38 38 38 82 82 82
40650 - 34 34 34 2 2 6 2 2 6 2 2 6
40651 - 42 42 42 195 195 195 246 246 246 253 253 253
40652 -253 253 253 253 253 253 253 253 253 250 250 250
40653 -242 242 242 242 242 242 250 250 250 253 253 253
40654 -253 253 253 253 253 253 253 253 253 253 253 253
40655 -253 253 253 250 250 250 246 246 246 238 238 238
40656 -226 226 226 231 231 231 101 101 101 6 6 6
40657 - 2 2 6 2 2 6 2 2 6 2 2 6
40658 - 2 2 6 2 2 6 2 2 6 2 2 6
40659 - 38 38 38 82 82 82 42 42 42 14 14 14
40660 - 6 6 6 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 - 0 0 0 0 0 0 0 0 0 0 0 0
40664 - 0 0 0 0 0 0 0 0 0 0 0 0
40665 - 0 0 0 0 0 0 0 0 0 0 0 0
40666 - 0 0 0 0 0 0 0 0 0 0 0 0
40667 - 0 0 0 0 0 0 0 0 0 0 0 0
40668 - 0 0 0 0 0 0 0 0 0 0 0 0
40669 - 10 10 10 26 26 26 62 62 62 66 66 66
40670 - 2 2 6 2 2 6 2 2 6 6 6 6
40671 - 70 70 70 170 170 170 206 206 206 234 234 234
40672 -246 246 246 250 250 250 250 250 250 238 238 238
40673 -226 226 226 231 231 231 238 238 238 250 250 250
40674 -250 250 250 250 250 250 246 246 246 231 231 231
40675 -214 214 214 206 206 206 202 202 202 202 202 202
40676 -198 198 198 202 202 202 182 182 182 18 18 18
40677 - 2 2 6 2 2 6 2 2 6 2 2 6
40678 - 2 2 6 2 2 6 2 2 6 2 2 6
40679 - 2 2 6 62 62 62 66 66 66 30 30 30
40680 - 10 10 10 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 0 0 0 0 0 0
40684 - 0 0 0 0 0 0 0 0 0 0 0 0
40685 - 0 0 0 0 0 0 0 0 0 0 0 0
40686 - 0 0 0 0 0 0 0 0 0 0 0 0
40687 - 0 0 0 0 0 0 0 0 0 0 0 0
40688 - 0 0 0 0 0 0 0 0 0 0 0 0
40689 - 14 14 14 42 42 42 82 82 82 18 18 18
40690 - 2 2 6 2 2 6 2 2 6 10 10 10
40691 - 94 94 94 182 182 182 218 218 218 242 242 242
40692 -250 250 250 253 253 253 253 253 253 250 250 250
40693 -234 234 234 253 253 253 253 253 253 253 253 253
40694 -253 253 253 253 253 253 253 253 253 246 246 246
40695 -238 238 238 226 226 226 210 210 210 202 202 202
40696 -195 195 195 195 195 195 210 210 210 158 158 158
40697 - 6 6 6 14 14 14 50 50 50 14 14 14
40698 - 2 2 6 2 2 6 2 2 6 2 2 6
40699 - 2 2 6 6 6 6 86 86 86 46 46 46
40700 - 18 18 18 6 6 6 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 0 0 0 0 0 0 0 0 0
40705 - 0 0 0 0 0 0 0 0 0 0 0 0
40706 - 0 0 0 0 0 0 0 0 0 0 0 0
40707 - 0 0 0 0 0 0 0 0 0 0 0 0
40708 - 0 0 0 0 0 0 0 0 0 6 6 6
40709 - 22 22 22 54 54 54 70 70 70 2 2 6
40710 - 2 2 6 10 10 10 2 2 6 22 22 22
40711 -166 166 166 231 231 231 250 250 250 253 253 253
40712 -253 253 253 253 253 253 253 253 253 250 250 250
40713 -242 242 242 253 253 253 253 253 253 253 253 253
40714 -253 253 253 253 253 253 253 253 253 253 253 253
40715 -253 253 253 253 253 253 253 253 253 246 246 246
40716 -231 231 231 206 206 206 198 198 198 226 226 226
40717 - 94 94 94 2 2 6 6 6 6 38 38 38
40718 - 30 30 30 2 2 6 2 2 6 2 2 6
40719 - 2 2 6 2 2 6 62 62 62 66 66 66
40720 - 26 26 26 10 10 10 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 0 0 0 0 0 0 0 0 0
40726 - 0 0 0 0 0 0 0 0 0 0 0 0
40727 - 0 0 0 0 0 0 0 0 0 0 0 0
40728 - 0 0 0 0 0 0 0 0 0 10 10 10
40729 - 30 30 30 74 74 74 50 50 50 2 2 6
40730 - 26 26 26 26 26 26 2 2 6 106 106 106
40731 -238 238 238 253 253 253 253 253 253 253 253 253
40732 -253 253 253 253 253 253 253 253 253 253 253 253
40733 -253 253 253 253 253 253 253 253 253 253 253 253
40734 -253 253 253 253 253 253 253 253 253 253 253 253
40735 -253 253 253 253 253 253 253 253 253 253 253 253
40736 -253 253 253 246 246 246 218 218 218 202 202 202
40737 -210 210 210 14 14 14 2 2 6 2 2 6
40738 - 30 30 30 22 22 22 2 2 6 2 2 6
40739 - 2 2 6 2 2 6 18 18 18 86 86 86
40740 - 42 42 42 14 14 14 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 - 0 0 0 0 0 0 0 0 0 0 0 0
40747 - 0 0 0 0 0 0 0 0 0 0 0 0
40748 - 0 0 0 0 0 0 0 0 0 14 14 14
40749 - 42 42 42 90 90 90 22 22 22 2 2 6
40750 - 42 42 42 2 2 6 18 18 18 218 218 218
40751 -253 253 253 253 253 253 253 253 253 253 253 253
40752 -253 253 253 253 253 253 253 253 253 253 253 253
40753 -253 253 253 253 253 253 253 253 253 253 253 253
40754 -253 253 253 253 253 253 253 253 253 253 253 253
40755 -253 253 253 253 253 253 253 253 253 253 253 253
40756 -253 253 253 253 253 253 250 250 250 221 221 221
40757 -218 218 218 101 101 101 2 2 6 14 14 14
40758 - 18 18 18 38 38 38 10 10 10 2 2 6
40759 - 2 2 6 2 2 6 2 2 6 78 78 78
40760 - 58 58 58 22 22 22 6 6 6 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 0 0 0
40767 - 0 0 0 0 0 0 0 0 0 0 0 0
40768 - 0 0 0 0 0 0 6 6 6 18 18 18
40769 - 54 54 54 82 82 82 2 2 6 26 26 26
40770 - 22 22 22 2 2 6 123 123 123 253 253 253
40771 -253 253 253 253 253 253 253 253 253 253 253 253
40772 -253 253 253 253 253 253 253 253 253 253 253 253
40773 -253 253 253 253 253 253 253 253 253 253 253 253
40774 -253 253 253 253 253 253 253 253 253 253 253 253
40775 -253 253 253 253 253 253 253 253 253 253 253 253
40776 -253 253 253 253 253 253 253 253 253 250 250 250
40777 -238 238 238 198 198 198 6 6 6 38 38 38
40778 - 58 58 58 26 26 26 38 38 38 2 2 6
40779 - 2 2 6 2 2 6 2 2 6 46 46 46
40780 - 78 78 78 30 30 30 10 10 10 0 0 0
40781 - 0 0 0 0 0 0 0 0 0 0 0 0
40782 - 0 0 0 0 0 0 0 0 0 0 0 0
40783 - 0 0 0 0 0 0 0 0 0 0 0 0
40784 - 0 0 0 0 0 0 0 0 0 0 0 0
40785 - 0 0 0 0 0 0 0 0 0 0 0 0
40786 - 0 0 0 0 0 0 0 0 0 0 0 0
40787 - 0 0 0 0 0 0 0 0 0 0 0 0
40788 - 0 0 0 0 0 0 10 10 10 30 30 30
40789 - 74 74 74 58 58 58 2 2 6 42 42 42
40790 - 2 2 6 22 22 22 231 231 231 253 253 253
40791 -253 253 253 253 253 253 253 253 253 253 253 253
40792 -253 253 253 253 253 253 253 253 253 250 250 250
40793 -253 253 253 253 253 253 253 253 253 253 253 253
40794 -253 253 253 253 253 253 253 253 253 253 253 253
40795 -253 253 253 253 253 253 253 253 253 253 253 253
40796 -253 253 253 253 253 253 253 253 253 253 253 253
40797 -253 253 253 246 246 246 46 46 46 38 38 38
40798 - 42 42 42 14 14 14 38 38 38 14 14 14
40799 - 2 2 6 2 2 6 2 2 6 6 6 6
40800 - 86 86 86 46 46 46 14 14 14 0 0 0
40801 - 0 0 0 0 0 0 0 0 0 0 0 0
40802 - 0 0 0 0 0 0 0 0 0 0 0 0
40803 - 0 0 0 0 0 0 0 0 0 0 0 0
40804 - 0 0 0 0 0 0 0 0 0 0 0 0
40805 - 0 0 0 0 0 0 0 0 0 0 0 0
40806 - 0 0 0 0 0 0 0 0 0 0 0 0
40807 - 0 0 0 0 0 0 0 0 0 0 0 0
40808 - 0 0 0 6 6 6 14 14 14 42 42 42
40809 - 90 90 90 18 18 18 18 18 18 26 26 26
40810 - 2 2 6 116 116 116 253 253 253 253 253 253
40811 -253 253 253 253 253 253 253 253 253 253 253 253
40812 -253 253 253 253 253 253 250 250 250 238 238 238
40813 -253 253 253 253 253 253 253 253 253 253 253 253
40814 -253 253 253 253 253 253 253 253 253 253 253 253
40815 -253 253 253 253 253 253 253 253 253 253 253 253
40816 -253 253 253 253 253 253 253 253 253 253 253 253
40817 -253 253 253 253 253 253 94 94 94 6 6 6
40818 - 2 2 6 2 2 6 10 10 10 34 34 34
40819 - 2 2 6 2 2 6 2 2 6 2 2 6
40820 - 74 74 74 58 58 58 22 22 22 6 6 6
40821 - 0 0 0 0 0 0 0 0 0 0 0 0
40822 - 0 0 0 0 0 0 0 0 0 0 0 0
40823 - 0 0 0 0 0 0 0 0 0 0 0 0
40824 - 0 0 0 0 0 0 0 0 0 0 0 0
40825 - 0 0 0 0 0 0 0 0 0 0 0 0
40826 - 0 0 0 0 0 0 0 0 0 0 0 0
40827 - 0 0 0 0 0 0 0 0 0 0 0 0
40828 - 0 0 0 10 10 10 26 26 26 66 66 66
40829 - 82 82 82 2 2 6 38 38 38 6 6 6
40830 - 14 14 14 210 210 210 253 253 253 253 253 253
40831 -253 253 253 253 253 253 253 253 253 253 253 253
40832 -253 253 253 253 253 253 246 246 246 242 242 242
40833 -253 253 253 253 253 253 253 253 253 253 253 253
40834 -253 253 253 253 253 253 253 253 253 253 253 253
40835 -253 253 253 253 253 253 253 253 253 253 253 253
40836 -253 253 253 253 253 253 253 253 253 253 253 253
40837 -253 253 253 253 253 253 144 144 144 2 2 6
40838 - 2 2 6 2 2 6 2 2 6 46 46 46
40839 - 2 2 6 2 2 6 2 2 6 2 2 6
40840 - 42 42 42 74 74 74 30 30 30 10 10 10
40841 - 0 0 0 0 0 0 0 0 0 0 0 0
40842 - 0 0 0 0 0 0 0 0 0 0 0 0
40843 - 0 0 0 0 0 0 0 0 0 0 0 0
40844 - 0 0 0 0 0 0 0 0 0 0 0 0
40845 - 0 0 0 0 0 0 0 0 0 0 0 0
40846 - 0 0 0 0 0 0 0 0 0 0 0 0
40847 - 0 0 0 0 0 0 0 0 0 0 0 0
40848 - 6 6 6 14 14 14 42 42 42 90 90 90
40849 - 26 26 26 6 6 6 42 42 42 2 2 6
40850 - 74 74 74 250 250 250 253 253 253 253 253 253
40851 -253 253 253 253 253 253 253 253 253 253 253 253
40852 -253 253 253 253 253 253 242 242 242 242 242 242
40853 -253 253 253 253 253 253 253 253 253 253 253 253
40854 -253 253 253 253 253 253 253 253 253 253 253 253
40855 -253 253 253 253 253 253 253 253 253 253 253 253
40856 -253 253 253 253 253 253 253 253 253 253 253 253
40857 -253 253 253 253 253 253 182 182 182 2 2 6
40858 - 2 2 6 2 2 6 2 2 6 46 46 46
40859 - 2 2 6 2 2 6 2 2 6 2 2 6
40860 - 10 10 10 86 86 86 38 38 38 10 10 10
40861 - 0 0 0 0 0 0 0 0 0 0 0 0
40862 - 0 0 0 0 0 0 0 0 0 0 0 0
40863 - 0 0 0 0 0 0 0 0 0 0 0 0
40864 - 0 0 0 0 0 0 0 0 0 0 0 0
40865 - 0 0 0 0 0 0 0 0 0 0 0 0
40866 - 0 0 0 0 0 0 0 0 0 0 0 0
40867 - 0 0 0 0 0 0 0 0 0 0 0 0
40868 - 10 10 10 26 26 26 66 66 66 82 82 82
40869 - 2 2 6 22 22 22 18 18 18 2 2 6
40870 -149 149 149 253 253 253 253 253 253 253 253 253
40871 -253 253 253 253 253 253 253 253 253 253 253 253
40872 -253 253 253 253 253 253 234 234 234 242 242 242
40873 -253 253 253 253 253 253 253 253 253 253 253 253
40874 -253 253 253 253 253 253 253 253 253 253 253 253
40875 -253 253 253 253 253 253 253 253 253 253 253 253
40876 -253 253 253 253 253 253 253 253 253 253 253 253
40877 -253 253 253 253 253 253 206 206 206 2 2 6
40878 - 2 2 6 2 2 6 2 2 6 38 38 38
40879 - 2 2 6 2 2 6 2 2 6 2 2 6
40880 - 6 6 6 86 86 86 46 46 46 14 14 14
40881 - 0 0 0 0 0 0 0 0 0 0 0 0
40882 - 0 0 0 0 0 0 0 0 0 0 0 0
40883 - 0 0 0 0 0 0 0 0 0 0 0 0
40884 - 0 0 0 0 0 0 0 0 0 0 0 0
40885 - 0 0 0 0 0 0 0 0 0 0 0 0
40886 - 0 0 0 0 0 0 0 0 0 0 0 0
40887 - 0 0 0 0 0 0 0 0 0 6 6 6
40888 - 18 18 18 46 46 46 86 86 86 18 18 18
40889 - 2 2 6 34 34 34 10 10 10 6 6 6
40890 -210 210 210 253 253 253 253 253 253 253 253 253
40891 -253 253 253 253 253 253 253 253 253 253 253 253
40892 -253 253 253 253 253 253 234 234 234 242 242 242
40893 -253 253 253 253 253 253 253 253 253 253 253 253
40894 -253 253 253 253 253 253 253 253 253 253 253 253
40895 -253 253 253 253 253 253 253 253 253 253 253 253
40896 -253 253 253 253 253 253 253 253 253 253 253 253
40897 -253 253 253 253 253 253 221 221 221 6 6 6
40898 - 2 2 6 2 2 6 6 6 6 30 30 30
40899 - 2 2 6 2 2 6 2 2 6 2 2 6
40900 - 2 2 6 82 82 82 54 54 54 18 18 18
40901 - 6 6 6 0 0 0 0 0 0 0 0 0
40902 - 0 0 0 0 0 0 0 0 0 0 0 0
40903 - 0 0 0 0 0 0 0 0 0 0 0 0
40904 - 0 0 0 0 0 0 0 0 0 0 0 0
40905 - 0 0 0 0 0 0 0 0 0 0 0 0
40906 - 0 0 0 0 0 0 0 0 0 0 0 0
40907 - 0 0 0 0 0 0 0 0 0 10 10 10
40908 - 26 26 26 66 66 66 62 62 62 2 2 6
40909 - 2 2 6 38 38 38 10 10 10 26 26 26
40910 -238 238 238 253 253 253 253 253 253 253 253 253
40911 -253 253 253 253 253 253 253 253 253 253 253 253
40912 -253 253 253 253 253 253 231 231 231 238 238 238
40913 -253 253 253 253 253 253 253 253 253 253 253 253
40914 -253 253 253 253 253 253 253 253 253 253 253 253
40915 -253 253 253 253 253 253 253 253 253 253 253 253
40916 -253 253 253 253 253 253 253 253 253 253 253 253
40917 -253 253 253 253 253 253 231 231 231 6 6 6
40918 - 2 2 6 2 2 6 10 10 10 30 30 30
40919 - 2 2 6 2 2 6 2 2 6 2 2 6
40920 - 2 2 6 66 66 66 58 58 58 22 22 22
40921 - 6 6 6 0 0 0 0 0 0 0 0 0
40922 - 0 0 0 0 0 0 0 0 0 0 0 0
40923 - 0 0 0 0 0 0 0 0 0 0 0 0
40924 - 0 0 0 0 0 0 0 0 0 0 0 0
40925 - 0 0 0 0 0 0 0 0 0 0 0 0
40926 - 0 0 0 0 0 0 0 0 0 0 0 0
40927 - 0 0 0 0 0 0 0 0 0 10 10 10
40928 - 38 38 38 78 78 78 6 6 6 2 2 6
40929 - 2 2 6 46 46 46 14 14 14 42 42 42
40930 -246 246 246 253 253 253 253 253 253 253 253 253
40931 -253 253 253 253 253 253 253 253 253 253 253 253
40932 -253 253 253 253 253 253 231 231 231 242 242 242
40933 -253 253 253 253 253 253 253 253 253 253 253 253
40934 -253 253 253 253 253 253 253 253 253 253 253 253
40935 -253 253 253 253 253 253 253 253 253 253 253 253
40936 -253 253 253 253 253 253 253 253 253 253 253 253
40937 -253 253 253 253 253 253 234 234 234 10 10 10
40938 - 2 2 6 2 2 6 22 22 22 14 14 14
40939 - 2 2 6 2 2 6 2 2 6 2 2 6
40940 - 2 2 6 66 66 66 62 62 62 22 22 22
40941 - 6 6 6 0 0 0 0 0 0 0 0 0
40942 - 0 0 0 0 0 0 0 0 0 0 0 0
40943 - 0 0 0 0 0 0 0 0 0 0 0 0
40944 - 0 0 0 0 0 0 0 0 0 0 0 0
40945 - 0 0 0 0 0 0 0 0 0 0 0 0
40946 - 0 0 0 0 0 0 0 0 0 0 0 0
40947 - 0 0 0 0 0 0 6 6 6 18 18 18
40948 - 50 50 50 74 74 74 2 2 6 2 2 6
40949 - 14 14 14 70 70 70 34 34 34 62 62 62
40950 -250 250 250 253 253 253 253 253 253 253 253 253
40951 -253 253 253 253 253 253 253 253 253 253 253 253
40952 -253 253 253 253 253 253 231 231 231 246 246 246
40953 -253 253 253 253 253 253 253 253 253 253 253 253
40954 -253 253 253 253 253 253 253 253 253 253 253 253
40955 -253 253 253 253 253 253 253 253 253 253 253 253
40956 -253 253 253 253 253 253 253 253 253 253 253 253
40957 -253 253 253 253 253 253 234 234 234 14 14 14
40958 - 2 2 6 2 2 6 30 30 30 2 2 6
40959 - 2 2 6 2 2 6 2 2 6 2 2 6
40960 - 2 2 6 66 66 66 62 62 62 22 22 22
40961 - 6 6 6 0 0 0 0 0 0 0 0 0
40962 - 0 0 0 0 0 0 0 0 0 0 0 0
40963 - 0 0 0 0 0 0 0 0 0 0 0 0
40964 - 0 0 0 0 0 0 0 0 0 0 0 0
40965 - 0 0 0 0 0 0 0 0 0 0 0 0
40966 - 0 0 0 0 0 0 0 0 0 0 0 0
40967 - 0 0 0 0 0 0 6 6 6 18 18 18
40968 - 54 54 54 62 62 62 2 2 6 2 2 6
40969 - 2 2 6 30 30 30 46 46 46 70 70 70
40970 -250 250 250 253 253 253 253 253 253 253 253 253
40971 -253 253 253 253 253 253 253 253 253 253 253 253
40972 -253 253 253 253 253 253 231 231 231 246 246 246
40973 -253 253 253 253 253 253 253 253 253 253 253 253
40974 -253 253 253 253 253 253 253 253 253 253 253 253
40975 -253 253 253 253 253 253 253 253 253 253 253 253
40976 -253 253 253 253 253 253 253 253 253 253 253 253
40977 -253 253 253 253 253 253 226 226 226 10 10 10
40978 - 2 2 6 6 6 6 30 30 30 2 2 6
40979 - 2 2 6 2 2 6 2 2 6 2 2 6
40980 - 2 2 6 66 66 66 58 58 58 22 22 22
40981 - 6 6 6 0 0 0 0 0 0 0 0 0
40982 - 0 0 0 0 0 0 0 0 0 0 0 0
40983 - 0 0 0 0 0 0 0 0 0 0 0 0
40984 - 0 0 0 0 0 0 0 0 0 0 0 0
40985 - 0 0 0 0 0 0 0 0 0 0 0 0
40986 - 0 0 0 0 0 0 0 0 0 0 0 0
40987 - 0 0 0 0 0 0 6 6 6 22 22 22
40988 - 58 58 58 62 62 62 2 2 6 2 2 6
40989 - 2 2 6 2 2 6 30 30 30 78 78 78
40990 -250 250 250 253 253 253 253 253 253 253 253 253
40991 -253 253 253 253 253 253 253 253 253 253 253 253
40992 -253 253 253 253 253 253 231 231 231 246 246 246
40993 -253 253 253 253 253 253 253 253 253 253 253 253
40994 -253 253 253 253 253 253 253 253 253 253 253 253
40995 -253 253 253 253 253 253 253 253 253 253 253 253
40996 -253 253 253 253 253 253 253 253 253 253 253 253
40997 -253 253 253 253 253 253 206 206 206 2 2 6
40998 - 22 22 22 34 34 34 18 14 6 22 22 22
40999 - 26 26 26 18 18 18 6 6 6 2 2 6
41000 - 2 2 6 82 82 82 54 54 54 18 18 18
41001 - 6 6 6 0 0 0 0 0 0 0 0 0
41002 - 0 0 0 0 0 0 0 0 0 0 0 0
41003 - 0 0 0 0 0 0 0 0 0 0 0 0
41004 - 0 0 0 0 0 0 0 0 0 0 0 0
41005 - 0 0 0 0 0 0 0 0 0 0 0 0
41006 - 0 0 0 0 0 0 0 0 0 0 0 0
41007 - 0 0 0 0 0 0 6 6 6 26 26 26
41008 - 62 62 62 106 106 106 74 54 14 185 133 11
41009 -210 162 10 121 92 8 6 6 6 62 62 62
41010 -238 238 238 253 253 253 253 253 253 253 253 253
41011 -253 253 253 253 253 253 253 253 253 253 253 253
41012 -253 253 253 253 253 253 231 231 231 246 246 246
41013 -253 253 253 253 253 253 253 253 253 253 253 253
41014 -253 253 253 253 253 253 253 253 253 253 253 253
41015 -253 253 253 253 253 253 253 253 253 253 253 253
41016 -253 253 253 253 253 253 253 253 253 253 253 253
41017 -253 253 253 253 253 253 158 158 158 18 18 18
41018 - 14 14 14 2 2 6 2 2 6 2 2 6
41019 - 6 6 6 18 18 18 66 66 66 38 38 38
41020 - 6 6 6 94 94 94 50 50 50 18 18 18
41021 - 6 6 6 0 0 0 0 0 0 0 0 0
41022 - 0 0 0 0 0 0 0 0 0 0 0 0
41023 - 0 0 0 0 0 0 0 0 0 0 0 0
41024 - 0 0 0 0 0 0 0 0 0 0 0 0
41025 - 0 0 0 0 0 0 0 0 0 0 0 0
41026 - 0 0 0 0 0 0 0 0 0 6 6 6
41027 - 10 10 10 10 10 10 18 18 18 38 38 38
41028 - 78 78 78 142 134 106 216 158 10 242 186 14
41029 -246 190 14 246 190 14 156 118 10 10 10 10
41030 - 90 90 90 238 238 238 253 253 253 253 253 253
41031 -253 253 253 253 253 253 253 253 253 253 253 253
41032 -253 253 253 253 253 253 231 231 231 250 250 250
41033 -253 253 253 253 253 253 253 253 253 253 253 253
41034 -253 253 253 253 253 253 253 253 253 253 253 253
41035 -253 253 253 253 253 253 253 253 253 253 253 253
41036 -253 253 253 253 253 253 253 253 253 246 230 190
41037 -238 204 91 238 204 91 181 142 44 37 26 9
41038 - 2 2 6 2 2 6 2 2 6 2 2 6
41039 - 2 2 6 2 2 6 38 38 38 46 46 46
41040 - 26 26 26 106 106 106 54 54 54 18 18 18
41041 - 6 6 6 0 0 0 0 0 0 0 0 0
41042 - 0 0 0 0 0 0 0 0 0 0 0 0
41043 - 0 0 0 0 0 0 0 0 0 0 0 0
41044 - 0 0 0 0 0 0 0 0 0 0 0 0
41045 - 0 0 0 0 0 0 0 0 0 0 0 0
41046 - 0 0 0 6 6 6 14 14 14 22 22 22
41047 - 30 30 30 38 38 38 50 50 50 70 70 70
41048 -106 106 106 190 142 34 226 170 11 242 186 14
41049 -246 190 14 246 190 14 246 190 14 154 114 10
41050 - 6 6 6 74 74 74 226 226 226 253 253 253
41051 -253 253 253 253 253 253 253 253 253 253 253 253
41052 -253 253 253 253 253 253 231 231 231 250 250 250
41053 -253 253 253 253 253 253 253 253 253 253 253 253
41054 -253 253 253 253 253 253 253 253 253 253 253 253
41055 -253 253 253 253 253 253 253 253 253 253 253 253
41056 -253 253 253 253 253 253 253 253 253 228 184 62
41057 -241 196 14 241 208 19 232 195 16 38 30 10
41058 - 2 2 6 2 2 6 2 2 6 2 2 6
41059 - 2 2 6 6 6 6 30 30 30 26 26 26
41060 -203 166 17 154 142 90 66 66 66 26 26 26
41061 - 6 6 6 0 0 0 0 0 0 0 0 0
41062 - 0 0 0 0 0 0 0 0 0 0 0 0
41063 - 0 0 0 0 0 0 0 0 0 0 0 0
41064 - 0 0 0 0 0 0 0 0 0 0 0 0
41065 - 0 0 0 0 0 0 0 0 0 0 0 0
41066 - 6 6 6 18 18 18 38 38 38 58 58 58
41067 - 78 78 78 86 86 86 101 101 101 123 123 123
41068 -175 146 61 210 150 10 234 174 13 246 186 14
41069 -246 190 14 246 190 14 246 190 14 238 190 10
41070 -102 78 10 2 2 6 46 46 46 198 198 198
41071 -253 253 253 253 253 253 253 253 253 253 253 253
41072 -253 253 253 253 253 253 234 234 234 242 242 242
41073 -253 253 253 253 253 253 253 253 253 253 253 253
41074 -253 253 253 253 253 253 253 253 253 253 253 253
41075 -253 253 253 253 253 253 253 253 253 253 253 253
41076 -253 253 253 253 253 253 253 253 253 224 178 62
41077 -242 186 14 241 196 14 210 166 10 22 18 6
41078 - 2 2 6 2 2 6 2 2 6 2 2 6
41079 - 2 2 6 2 2 6 6 6 6 121 92 8
41080 -238 202 15 232 195 16 82 82 82 34 34 34
41081 - 10 10 10 0 0 0 0 0 0 0 0 0
41082 - 0 0 0 0 0 0 0 0 0 0 0 0
41083 - 0 0 0 0 0 0 0 0 0 0 0 0
41084 - 0 0 0 0 0 0 0 0 0 0 0 0
41085 - 0 0 0 0 0 0 0 0 0 0 0 0
41086 - 14 14 14 38 38 38 70 70 70 154 122 46
41087 -190 142 34 200 144 11 197 138 11 197 138 11
41088 -213 154 11 226 170 11 242 186 14 246 190 14
41089 -246 190 14 246 190 14 246 190 14 246 190 14
41090 -225 175 15 46 32 6 2 2 6 22 22 22
41091 -158 158 158 250 250 250 253 253 253 253 253 253
41092 -253 253 253 253 253 253 253 253 253 253 253 253
41093 -253 253 253 253 253 253 253 253 253 253 253 253
41094 -253 253 253 253 253 253 253 253 253 253 253 253
41095 -253 253 253 253 253 253 253 253 253 253 253 253
41096 -253 253 253 250 250 250 242 242 242 224 178 62
41097 -239 182 13 236 186 11 213 154 11 46 32 6
41098 - 2 2 6 2 2 6 2 2 6 2 2 6
41099 - 2 2 6 2 2 6 61 42 6 225 175 15
41100 -238 190 10 236 186 11 112 100 78 42 42 42
41101 - 14 14 14 0 0 0 0 0 0 0 0 0
41102 - 0 0 0 0 0 0 0 0 0 0 0 0
41103 - 0 0 0 0 0 0 0 0 0 0 0 0
41104 - 0 0 0 0 0 0 0 0 0 0 0 0
41105 - 0 0 0 0 0 0 0 0 0 6 6 6
41106 - 22 22 22 54 54 54 154 122 46 213 154 11
41107 -226 170 11 230 174 11 226 170 11 226 170 11
41108 -236 178 12 242 186 14 246 190 14 246 190 14
41109 -246 190 14 246 190 14 246 190 14 246 190 14
41110 -241 196 14 184 144 12 10 10 10 2 2 6
41111 - 6 6 6 116 116 116 242 242 242 253 253 253
41112 -253 253 253 253 253 253 253 253 253 253 253 253
41113 -253 253 253 253 253 253 253 253 253 253 253 253
41114 -253 253 253 253 253 253 253 253 253 253 253 253
41115 -253 253 253 253 253 253 253 253 253 253 253 253
41116 -253 253 253 231 231 231 198 198 198 214 170 54
41117 -236 178 12 236 178 12 210 150 10 137 92 6
41118 - 18 14 6 2 2 6 2 2 6 2 2 6
41119 - 6 6 6 70 47 6 200 144 11 236 178 12
41120 -239 182 13 239 182 13 124 112 88 58 58 58
41121 - 22 22 22 6 6 6 0 0 0 0 0 0
41122 - 0 0 0 0 0 0 0 0 0 0 0 0
41123 - 0 0 0 0 0 0 0 0 0 0 0 0
41124 - 0 0 0 0 0 0 0 0 0 0 0 0
41125 - 0 0 0 0 0 0 0 0 0 10 10 10
41126 - 30 30 30 70 70 70 180 133 36 226 170 11
41127 -239 182 13 242 186 14 242 186 14 246 186 14
41128 -246 190 14 246 190 14 246 190 14 246 190 14
41129 -246 190 14 246 190 14 246 190 14 246 190 14
41130 -246 190 14 232 195 16 98 70 6 2 2 6
41131 - 2 2 6 2 2 6 66 66 66 221 221 221
41132 -253 253 253 253 253 253 253 253 253 253 253 253
41133 -253 253 253 253 253 253 253 253 253 253 253 253
41134 -253 253 253 253 253 253 253 253 253 253 253 253
41135 -253 253 253 253 253 253 253 253 253 253 253 253
41136 -253 253 253 206 206 206 198 198 198 214 166 58
41137 -230 174 11 230 174 11 216 158 10 192 133 9
41138 -163 110 8 116 81 8 102 78 10 116 81 8
41139 -167 114 7 197 138 11 226 170 11 239 182 13
41140 -242 186 14 242 186 14 162 146 94 78 78 78
41141 - 34 34 34 14 14 14 6 6 6 0 0 0
41142 - 0 0 0 0 0 0 0 0 0 0 0 0
41143 - 0 0 0 0 0 0 0 0 0 0 0 0
41144 - 0 0 0 0 0 0 0 0 0 0 0 0
41145 - 0 0 0 0 0 0 0 0 0 6 6 6
41146 - 30 30 30 78 78 78 190 142 34 226 170 11
41147 -239 182 13 246 190 14 246 190 14 246 190 14
41148 -246 190 14 246 190 14 246 190 14 246 190 14
41149 -246 190 14 246 190 14 246 190 14 246 190 14
41150 -246 190 14 241 196 14 203 166 17 22 18 6
41151 - 2 2 6 2 2 6 2 2 6 38 38 38
41152 -218 218 218 253 253 253 253 253 253 253 253 253
41153 -253 253 253 253 253 253 253 253 253 253 253 253
41154 -253 253 253 253 253 253 253 253 253 253 253 253
41155 -253 253 253 253 253 253 253 253 253 253 253 253
41156 -250 250 250 206 206 206 198 198 198 202 162 69
41157 -226 170 11 236 178 12 224 166 10 210 150 10
41158 -200 144 11 197 138 11 192 133 9 197 138 11
41159 -210 150 10 226 170 11 242 186 14 246 190 14
41160 -246 190 14 246 186 14 225 175 15 124 112 88
41161 - 62 62 62 30 30 30 14 14 14 6 6 6
41162 - 0 0 0 0 0 0 0 0 0 0 0 0
41163 - 0 0 0 0 0 0 0 0 0 0 0 0
41164 - 0 0 0 0 0 0 0 0 0 0 0 0
41165 - 0 0 0 0 0 0 0 0 0 10 10 10
41166 - 30 30 30 78 78 78 174 135 50 224 166 10
41167 -239 182 13 246 190 14 246 190 14 246 190 14
41168 -246 190 14 246 190 14 246 190 14 246 190 14
41169 -246 190 14 246 190 14 246 190 14 246 190 14
41170 -246 190 14 246 190 14 241 196 14 139 102 15
41171 - 2 2 6 2 2 6 2 2 6 2 2 6
41172 - 78 78 78 250 250 250 253 253 253 253 253 253
41173 -253 253 253 253 253 253 253 253 253 253 253 253
41174 -253 253 253 253 253 253 253 253 253 253 253 253
41175 -253 253 253 253 253 253 253 253 253 253 253 253
41176 -250 250 250 214 214 214 198 198 198 190 150 46
41177 -219 162 10 236 178 12 234 174 13 224 166 10
41178 -216 158 10 213 154 11 213 154 11 216 158 10
41179 -226 170 11 239 182 13 246 190 14 246 190 14
41180 -246 190 14 246 190 14 242 186 14 206 162 42
41181 -101 101 101 58 58 58 30 30 30 14 14 14
41182 - 6 6 6 0 0 0 0 0 0 0 0 0
41183 - 0 0 0 0 0 0 0 0 0 0 0 0
41184 - 0 0 0 0 0 0 0 0 0 0 0 0
41185 - 0 0 0 0 0 0 0 0 0 10 10 10
41186 - 30 30 30 74 74 74 174 135 50 216 158 10
41187 -236 178 12 246 190 14 246 190 14 246 190 14
41188 -246 190 14 246 190 14 246 190 14 246 190 14
41189 -246 190 14 246 190 14 246 190 14 246 190 14
41190 -246 190 14 246 190 14 241 196 14 226 184 13
41191 - 61 42 6 2 2 6 2 2 6 2 2 6
41192 - 22 22 22 238 238 238 253 253 253 253 253 253
41193 -253 253 253 253 253 253 253 253 253 253 253 253
41194 -253 253 253 253 253 253 253 253 253 253 253 253
41195 -253 253 253 253 253 253 253 253 253 253 253 253
41196 -253 253 253 226 226 226 187 187 187 180 133 36
41197 -216 158 10 236 178 12 239 182 13 236 178 12
41198 -230 174 11 226 170 11 226 170 11 230 174 11
41199 -236 178 12 242 186 14 246 190 14 246 190 14
41200 -246 190 14 246 190 14 246 186 14 239 182 13
41201 -206 162 42 106 106 106 66 66 66 34 34 34
41202 - 14 14 14 6 6 6 0 0 0 0 0 0
41203 - 0 0 0 0 0 0 0 0 0 0 0 0
41204 - 0 0 0 0 0 0 0 0 0 0 0 0
41205 - 0 0 0 0 0 0 0 0 0 6 6 6
41206 - 26 26 26 70 70 70 163 133 67 213 154 11
41207 -236 178 12 246 190 14 246 190 14 246 190 14
41208 -246 190 14 246 190 14 246 190 14 246 190 14
41209 -246 190 14 246 190 14 246 190 14 246 190 14
41210 -246 190 14 246 190 14 246 190 14 241 196 14
41211 -190 146 13 18 14 6 2 2 6 2 2 6
41212 - 46 46 46 246 246 246 253 253 253 253 253 253
41213 -253 253 253 253 253 253 253 253 253 253 253 253
41214 -253 253 253 253 253 253 253 253 253 253 253 253
41215 -253 253 253 253 253 253 253 253 253 253 253 253
41216 -253 253 253 221 221 221 86 86 86 156 107 11
41217 -216 158 10 236 178 12 242 186 14 246 186 14
41218 -242 186 14 239 182 13 239 182 13 242 186 14
41219 -242 186 14 246 186 14 246 190 14 246 190 14
41220 -246 190 14 246 190 14 246 190 14 246 190 14
41221 -242 186 14 225 175 15 142 122 72 66 66 66
41222 - 30 30 30 10 10 10 0 0 0 0 0 0
41223 - 0 0 0 0 0 0 0 0 0 0 0 0
41224 - 0 0 0 0 0 0 0 0 0 0 0 0
41225 - 0 0 0 0 0 0 0 0 0 6 6 6
41226 - 26 26 26 70 70 70 163 133 67 210 150 10
41227 -236 178 12 246 190 14 246 190 14 246 190 14
41228 -246 190 14 246 190 14 246 190 14 246 190 14
41229 -246 190 14 246 190 14 246 190 14 246 190 14
41230 -246 190 14 246 190 14 246 190 14 246 190 14
41231 -232 195 16 121 92 8 34 34 34 106 106 106
41232 -221 221 221 253 253 253 253 253 253 253 253 253
41233 -253 253 253 253 253 253 253 253 253 253 253 253
41234 -253 253 253 253 253 253 253 253 253 253 253 253
41235 -253 253 253 253 253 253 253 253 253 253 253 253
41236 -242 242 242 82 82 82 18 14 6 163 110 8
41237 -216 158 10 236 178 12 242 186 14 246 190 14
41238 -246 190 14 246 190 14 246 190 14 246 190 14
41239 -246 190 14 246 190 14 246 190 14 246 190 14
41240 -246 190 14 246 190 14 246 190 14 246 190 14
41241 -246 190 14 246 190 14 242 186 14 163 133 67
41242 - 46 46 46 18 18 18 6 6 6 0 0 0
41243 - 0 0 0 0 0 0 0 0 0 0 0 0
41244 - 0 0 0 0 0 0 0 0 0 0 0 0
41245 - 0 0 0 0 0 0 0 0 0 10 10 10
41246 - 30 30 30 78 78 78 163 133 67 210 150 10
41247 -236 178 12 246 186 14 246 190 14 246 190 14
41248 -246 190 14 246 190 14 246 190 14 246 190 14
41249 -246 190 14 246 190 14 246 190 14 246 190 14
41250 -246 190 14 246 190 14 246 190 14 246 190 14
41251 -241 196 14 215 174 15 190 178 144 253 253 253
41252 -253 253 253 253 253 253 253 253 253 253 253 253
41253 -253 253 253 253 253 253 253 253 253 253 253 253
41254 -253 253 253 253 253 253 253 253 253 253 253 253
41255 -253 253 253 253 253 253 253 253 253 218 218 218
41256 - 58 58 58 2 2 6 22 18 6 167 114 7
41257 -216 158 10 236 178 12 246 186 14 246 190 14
41258 -246 190 14 246 190 14 246 190 14 246 190 14
41259 -246 190 14 246 190 14 246 190 14 246 190 14
41260 -246 190 14 246 190 14 246 190 14 246 190 14
41261 -246 190 14 246 186 14 242 186 14 190 150 46
41262 - 54 54 54 22 22 22 6 6 6 0 0 0
41263 - 0 0 0 0 0 0 0 0 0 0 0 0
41264 - 0 0 0 0 0 0 0 0 0 0 0 0
41265 - 0 0 0 0 0 0 0 0 0 14 14 14
41266 - 38 38 38 86 86 86 180 133 36 213 154 11
41267 -236 178 12 246 186 14 246 190 14 246 190 14
41268 -246 190 14 246 190 14 246 190 14 246 190 14
41269 -246 190 14 246 190 14 246 190 14 246 190 14
41270 -246 190 14 246 190 14 246 190 14 246 190 14
41271 -246 190 14 232 195 16 190 146 13 214 214 214
41272 -253 253 253 253 253 253 253 253 253 253 253 253
41273 -253 253 253 253 253 253 253 253 253 253 253 253
41274 -253 253 253 253 253 253 253 253 253 253 253 253
41275 -253 253 253 250 250 250 170 170 170 26 26 26
41276 - 2 2 6 2 2 6 37 26 9 163 110 8
41277 -219 162 10 239 182 13 246 186 14 246 190 14
41278 -246 190 14 246 190 14 246 190 14 246 190 14
41279 -246 190 14 246 190 14 246 190 14 246 190 14
41280 -246 190 14 246 190 14 246 190 14 246 190 14
41281 -246 186 14 236 178 12 224 166 10 142 122 72
41282 - 46 46 46 18 18 18 6 6 6 0 0 0
41283 - 0 0 0 0 0 0 0 0 0 0 0 0
41284 - 0 0 0 0 0 0 0 0 0 0 0 0
41285 - 0 0 0 0 0 0 6 6 6 18 18 18
41286 - 50 50 50 109 106 95 192 133 9 224 166 10
41287 -242 186 14 246 190 14 246 190 14 246 190 14
41288 -246 190 14 246 190 14 246 190 14 246 190 14
41289 -246 190 14 246 190 14 246 190 14 246 190 14
41290 -246 190 14 246 190 14 246 190 14 246 190 14
41291 -242 186 14 226 184 13 210 162 10 142 110 46
41292 -226 226 226 253 253 253 253 253 253 253 253 253
41293 -253 253 253 253 253 253 253 253 253 253 253 253
41294 -253 253 253 253 253 253 253 253 253 253 253 253
41295 -198 198 198 66 66 66 2 2 6 2 2 6
41296 - 2 2 6 2 2 6 50 34 6 156 107 11
41297 -219 162 10 239 182 13 246 186 14 246 190 14
41298 -246 190 14 246 190 14 246 190 14 246 190 14
41299 -246 190 14 246 190 14 246 190 14 246 190 14
41300 -246 190 14 246 190 14 246 190 14 242 186 14
41301 -234 174 13 213 154 11 154 122 46 66 66 66
41302 - 30 30 30 10 10 10 0 0 0 0 0 0
41303 - 0 0 0 0 0 0 0 0 0 0 0 0
41304 - 0 0 0 0 0 0 0 0 0 0 0 0
41305 - 0 0 0 0 0 0 6 6 6 22 22 22
41306 - 58 58 58 154 121 60 206 145 10 234 174 13
41307 -242 186 14 246 186 14 246 190 14 246 190 14
41308 -246 190 14 246 190 14 246 190 14 246 190 14
41309 -246 190 14 246 190 14 246 190 14 246 190 14
41310 -246 190 14 246 190 14 246 190 14 246 190 14
41311 -246 186 14 236 178 12 210 162 10 163 110 8
41312 - 61 42 6 138 138 138 218 218 218 250 250 250
41313 -253 253 253 253 253 253 253 253 253 250 250 250
41314 -242 242 242 210 210 210 144 144 144 66 66 66
41315 - 6 6 6 2 2 6 2 2 6 2 2 6
41316 - 2 2 6 2 2 6 61 42 6 163 110 8
41317 -216 158 10 236 178 12 246 190 14 246 190 14
41318 -246 190 14 246 190 14 246 190 14 246 190 14
41319 -246 190 14 246 190 14 246 190 14 246 190 14
41320 -246 190 14 239 182 13 230 174 11 216 158 10
41321 -190 142 34 124 112 88 70 70 70 38 38 38
41322 - 18 18 18 6 6 6 0 0 0 0 0 0
41323 - 0 0 0 0 0 0 0 0 0 0 0 0
41324 - 0 0 0 0 0 0 0 0 0 0 0 0
41325 - 0 0 0 0 0 0 6 6 6 22 22 22
41326 - 62 62 62 168 124 44 206 145 10 224 166 10
41327 -236 178 12 239 182 13 242 186 14 242 186 14
41328 -246 186 14 246 190 14 246 190 14 246 190 14
41329 -246 190 14 246 190 14 246 190 14 246 190 14
41330 -246 190 14 246 190 14 246 190 14 246 190 14
41331 -246 190 14 236 178 12 216 158 10 175 118 6
41332 - 80 54 7 2 2 6 6 6 6 30 30 30
41333 - 54 54 54 62 62 62 50 50 50 38 38 38
41334 - 14 14 14 2 2 6 2 2 6 2 2 6
41335 - 2 2 6 2 2 6 2 2 6 2 2 6
41336 - 2 2 6 6 6 6 80 54 7 167 114 7
41337 -213 154 11 236 178 12 246 190 14 246 190 14
41338 -246 190 14 246 190 14 246 190 14 246 190 14
41339 -246 190 14 242 186 14 239 182 13 239 182 13
41340 -230 174 11 210 150 10 174 135 50 124 112 88
41341 - 82 82 82 54 54 54 34 34 34 18 18 18
41342 - 6 6 6 0 0 0 0 0 0 0 0 0
41343 - 0 0 0 0 0 0 0 0 0 0 0 0
41344 - 0 0 0 0 0 0 0 0 0 0 0 0
41345 - 0 0 0 0 0 0 6 6 6 18 18 18
41346 - 50 50 50 158 118 36 192 133 9 200 144 11
41347 -216 158 10 219 162 10 224 166 10 226 170 11
41348 -230 174 11 236 178 12 239 182 13 239 182 13
41349 -242 186 14 246 186 14 246 190 14 246 190 14
41350 -246 190 14 246 190 14 246 190 14 246 190 14
41351 -246 186 14 230 174 11 210 150 10 163 110 8
41352 -104 69 6 10 10 10 2 2 6 2 2 6
41353 - 2 2 6 2 2 6 2 2 6 2 2 6
41354 - 2 2 6 2 2 6 2 2 6 2 2 6
41355 - 2 2 6 2 2 6 2 2 6 2 2 6
41356 - 2 2 6 6 6 6 91 60 6 167 114 7
41357 -206 145 10 230 174 11 242 186 14 246 190 14
41358 -246 190 14 246 190 14 246 186 14 242 186 14
41359 -239 182 13 230 174 11 224 166 10 213 154 11
41360 -180 133 36 124 112 88 86 86 86 58 58 58
41361 - 38 38 38 22 22 22 10 10 10 6 6 6
41362 - 0 0 0 0 0 0 0 0 0 0 0 0
41363 - 0 0 0 0 0 0 0 0 0 0 0 0
41364 - 0 0 0 0 0 0 0 0 0 0 0 0
41365 - 0 0 0 0 0 0 0 0 0 14 14 14
41366 - 34 34 34 70 70 70 138 110 50 158 118 36
41367 -167 114 7 180 123 7 192 133 9 197 138 11
41368 -200 144 11 206 145 10 213 154 11 219 162 10
41369 -224 166 10 230 174 11 239 182 13 242 186 14
41370 -246 186 14 246 186 14 246 186 14 246 186 14
41371 -239 182 13 216 158 10 185 133 11 152 99 6
41372 -104 69 6 18 14 6 2 2 6 2 2 6
41373 - 2 2 6 2 2 6 2 2 6 2 2 6
41374 - 2 2 6 2 2 6 2 2 6 2 2 6
41375 - 2 2 6 2 2 6 2 2 6 2 2 6
41376 - 2 2 6 6 6 6 80 54 7 152 99 6
41377 -192 133 9 219 162 10 236 178 12 239 182 13
41378 -246 186 14 242 186 14 239 182 13 236 178 12
41379 -224 166 10 206 145 10 192 133 9 154 121 60
41380 - 94 94 94 62 62 62 42 42 42 22 22 22
41381 - 14 14 14 6 6 6 0 0 0 0 0 0
41382 - 0 0 0 0 0 0 0 0 0 0 0 0
41383 - 0 0 0 0 0 0 0 0 0 0 0 0
41384 - 0 0 0 0 0 0 0 0 0 0 0 0
41385 - 0 0 0 0 0 0 0 0 0 6 6 6
41386 - 18 18 18 34 34 34 58 58 58 78 78 78
41387 -101 98 89 124 112 88 142 110 46 156 107 11
41388 -163 110 8 167 114 7 175 118 6 180 123 7
41389 -185 133 11 197 138 11 210 150 10 219 162 10
41390 -226 170 11 236 178 12 236 178 12 234 174 13
41391 -219 162 10 197 138 11 163 110 8 130 83 6
41392 - 91 60 6 10 10 10 2 2 6 2 2 6
41393 - 18 18 18 38 38 38 38 38 38 38 38 38
41394 - 38 38 38 38 38 38 38 38 38 38 38 38
41395 - 38 38 38 38 38 38 26 26 26 2 2 6
41396 - 2 2 6 6 6 6 70 47 6 137 92 6
41397 -175 118 6 200 144 11 219 162 10 230 174 11
41398 -234 174 13 230 174 11 219 162 10 210 150 10
41399 -192 133 9 163 110 8 124 112 88 82 82 82
41400 - 50 50 50 30 30 30 14 14 14 6 6 6
41401 - 0 0 0 0 0 0 0 0 0 0 0 0
41402 - 0 0 0 0 0 0 0 0 0 0 0 0
41403 - 0 0 0 0 0 0 0 0 0 0 0 0
41404 - 0 0 0 0 0 0 0 0 0 0 0 0
41405 - 0 0 0 0 0 0 0 0 0 0 0 0
41406 - 6 6 6 14 14 14 22 22 22 34 34 34
41407 - 42 42 42 58 58 58 74 74 74 86 86 86
41408 -101 98 89 122 102 70 130 98 46 121 87 25
41409 -137 92 6 152 99 6 163 110 8 180 123 7
41410 -185 133 11 197 138 11 206 145 10 200 144 11
41411 -180 123 7 156 107 11 130 83 6 104 69 6
41412 - 50 34 6 54 54 54 110 110 110 101 98 89
41413 - 86 86 86 82 82 82 78 78 78 78 78 78
41414 - 78 78 78 78 78 78 78 78 78 78 78 78
41415 - 78 78 78 82 82 82 86 86 86 94 94 94
41416 -106 106 106 101 101 101 86 66 34 124 80 6
41417 -156 107 11 180 123 7 192 133 9 200 144 11
41418 -206 145 10 200 144 11 192 133 9 175 118 6
41419 -139 102 15 109 106 95 70 70 70 42 42 42
41420 - 22 22 22 10 10 10 0 0 0 0 0 0
41421 - 0 0 0 0 0 0 0 0 0 0 0 0
41422 - 0 0 0 0 0 0 0 0 0 0 0 0
41423 - 0 0 0 0 0 0 0 0 0 0 0 0
41424 - 0 0 0 0 0 0 0 0 0 0 0 0
41425 - 0 0 0 0 0 0 0 0 0 0 0 0
41426 - 0 0 0 0 0 0 6 6 6 10 10 10
41427 - 14 14 14 22 22 22 30 30 30 38 38 38
41428 - 50 50 50 62 62 62 74 74 74 90 90 90
41429 -101 98 89 112 100 78 121 87 25 124 80 6
41430 -137 92 6 152 99 6 152 99 6 152 99 6
41431 -138 86 6 124 80 6 98 70 6 86 66 30
41432 -101 98 89 82 82 82 58 58 58 46 46 46
41433 - 38 38 38 34 34 34 34 34 34 34 34 34
41434 - 34 34 34 34 34 34 34 34 34 34 34 34
41435 - 34 34 34 34 34 34 38 38 38 42 42 42
41436 - 54 54 54 82 82 82 94 86 76 91 60 6
41437 -134 86 6 156 107 11 167 114 7 175 118 6
41438 -175 118 6 167 114 7 152 99 6 121 87 25
41439 -101 98 89 62 62 62 34 34 34 18 18 18
41440 - 6 6 6 0 0 0 0 0 0 0 0 0
41441 - 0 0 0 0 0 0 0 0 0 0 0 0
41442 - 0 0 0 0 0 0 0 0 0 0 0 0
41443 - 0 0 0 0 0 0 0 0 0 0 0 0
41444 - 0 0 0 0 0 0 0 0 0 0 0 0
41445 - 0 0 0 0 0 0 0 0 0 0 0 0
41446 - 0 0 0 0 0 0 0 0 0 0 0 0
41447 - 0 0 0 6 6 6 6 6 6 10 10 10
41448 - 18 18 18 22 22 22 30 30 30 42 42 42
41449 - 50 50 50 66 66 66 86 86 86 101 98 89
41450 -106 86 58 98 70 6 104 69 6 104 69 6
41451 -104 69 6 91 60 6 82 62 34 90 90 90
41452 - 62 62 62 38 38 38 22 22 22 14 14 14
41453 - 10 10 10 10 10 10 10 10 10 10 10 10
41454 - 10 10 10 10 10 10 6 6 6 10 10 10
41455 - 10 10 10 10 10 10 10 10 10 14 14 14
41456 - 22 22 22 42 42 42 70 70 70 89 81 66
41457 - 80 54 7 104 69 6 124 80 6 137 92 6
41458 -134 86 6 116 81 8 100 82 52 86 86 86
41459 - 58 58 58 30 30 30 14 14 14 6 6 6
41460 - 0 0 0 0 0 0 0 0 0 0 0 0
41461 - 0 0 0 0 0 0 0 0 0 0 0 0
41462 - 0 0 0 0 0 0 0 0 0 0 0 0
41463 - 0 0 0 0 0 0 0 0 0 0 0 0
41464 - 0 0 0 0 0 0 0 0 0 0 0 0
41465 - 0 0 0 0 0 0 0 0 0 0 0 0
41466 - 0 0 0 0 0 0 0 0 0 0 0 0
41467 - 0 0 0 0 0 0 0 0 0 0 0 0
41468 - 0 0 0 6 6 6 10 10 10 14 14 14
41469 - 18 18 18 26 26 26 38 38 38 54 54 54
41470 - 70 70 70 86 86 86 94 86 76 89 81 66
41471 - 89 81 66 86 86 86 74 74 74 50 50 50
41472 - 30 30 30 14 14 14 6 6 6 0 0 0
41473 - 0 0 0 0 0 0 0 0 0 0 0 0
41474 - 0 0 0 0 0 0 0 0 0 0 0 0
41475 - 0 0 0 0 0 0 0 0 0 0 0 0
41476 - 6 6 6 18 18 18 34 34 34 58 58 58
41477 - 82 82 82 89 81 66 89 81 66 89 81 66
41478 - 94 86 66 94 86 76 74 74 74 50 50 50
41479 - 26 26 26 14 14 14 6 6 6 0 0 0
41480 - 0 0 0 0 0 0 0 0 0 0 0 0
41481 - 0 0 0 0 0 0 0 0 0 0 0 0
41482 - 0 0 0 0 0 0 0 0 0 0 0 0
41483 - 0 0 0 0 0 0 0 0 0 0 0 0
41484 - 0 0 0 0 0 0 0 0 0 0 0 0
41485 - 0 0 0 0 0 0 0 0 0 0 0 0
41486 - 0 0 0 0 0 0 0 0 0 0 0 0
41487 - 0 0 0 0 0 0 0 0 0 0 0 0
41488 - 0 0 0 0 0 0 0 0 0 0 0 0
41489 - 6 6 6 6 6 6 14 14 14 18 18 18
41490 - 30 30 30 38 38 38 46 46 46 54 54 54
41491 - 50 50 50 42 42 42 30 30 30 18 18 18
41492 - 10 10 10 0 0 0 0 0 0 0 0 0
41493 - 0 0 0 0 0 0 0 0 0 0 0 0
41494 - 0 0 0 0 0 0 0 0 0 0 0 0
41495 - 0 0 0 0 0 0 0 0 0 0 0 0
41496 - 0 0 0 6 6 6 14 14 14 26 26 26
41497 - 38 38 38 50 50 50 58 58 58 58 58 58
41498 - 54 54 54 42 42 42 30 30 30 18 18 18
41499 - 10 10 10 0 0 0 0 0 0 0 0 0
41500 - 0 0 0 0 0 0 0 0 0 0 0 0
41501 - 0 0 0 0 0 0 0 0 0 0 0 0
41502 - 0 0 0 0 0 0 0 0 0 0 0 0
41503 - 0 0 0 0 0 0 0 0 0 0 0 0
41504 - 0 0 0 0 0 0 0 0 0 0 0 0
41505 - 0 0 0 0 0 0 0 0 0 0 0 0
41506 - 0 0 0 0 0 0 0 0 0 0 0 0
41507 - 0 0 0 0 0 0 0 0 0 0 0 0
41508 - 0 0 0 0 0 0 0 0 0 0 0 0
41509 - 0 0 0 0 0 0 0 0 0 6 6 6
41510 - 6 6 6 10 10 10 14 14 14 18 18 18
41511 - 18 18 18 14 14 14 10 10 10 6 6 6
41512 - 0 0 0 0 0 0 0 0 0 0 0 0
41513 - 0 0 0 0 0 0 0 0 0 0 0 0
41514 - 0 0 0 0 0 0 0 0 0 0 0 0
41515 - 0 0 0 0 0 0 0 0 0 0 0 0
41516 - 0 0 0 0 0 0 0 0 0 6 6 6
41517 - 14 14 14 18 18 18 22 22 22 22 22 22
41518 - 18 18 18 14 14 14 10 10 10 6 6 6
41519 - 0 0 0 0 0 0 0 0 0 0 0 0
41520 - 0 0 0 0 0 0 0 0 0 0 0 0
41521 - 0 0 0 0 0 0 0 0 0 0 0 0
41522 - 0 0 0 0 0 0 0 0 0 0 0 0
41523 - 0 0 0 0 0 0 0 0 0 0 0 0
41524 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41525 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41526 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41527 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41528 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41529 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41530 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41531 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41532 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41533 +4 4 4 4 4 4 4 4 4 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 4 4 4 4 4 4 4 4 4 4 4 4
41537 +4 4 4 4 4 4
41538 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41539 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41540 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41541 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41542 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41543 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41544 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41545 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41546 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41547 +4 4 4 4 4 4 4 4 4 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 4 4 4 4 4 4 4 4 4 4 4 4
41551 +4 4 4 4 4 4
41552 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41553 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41554 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41555 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41556 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41557 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41558 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41559 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41560 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41561 +4 4 4 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 4 4 4 4 4 4 4 4 4 4 4 4
41565 +4 4 4 4 4 4
41566 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41567 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41568 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41569 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41570 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41571 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41572 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41573 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41574 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41575 +4 4 4 4 4 4 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 4 4 4 4 4 4 4 4 4 4 4 4
41579 +4 4 4 4 4 4
41580 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41581 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41582 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41583 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41584 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41585 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41586 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41587 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41588 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41589 +4 4 4 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 4 4 4 4 4 4 4 4 4 4 4 4
41593 +4 4 4 4 4 4
41594 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41595 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41596 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41597 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41598 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41599 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41600 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41601 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41602 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
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 4 4 4 4 4 4 4 4 4 4 4 4
41607 +4 4 4 4 4 4
41608 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41609 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41610 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41611 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41612 +4 4 4 4 4 4 4 4 4 3 3 3 0 0 0 0 0 0
41613 +0 0 0 0 0 0 0 0 0 0 0 0 3 3 3 4 4 4
41614 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41615 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41616 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41617 +4 4 4 4 4 4 4 4 4 4 4 4 1 1 1 0 0 0
41618 +0 0 0 3 3 3 4 4 4 4 4 4 4 4 4 4 4 4
41619 +4 4 4 4 4 4 4 4 4 2 1 0 2 1 0 3 2 2
41620 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41621 +4 4 4 4 4 4
41622 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41623 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41624 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41625 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41626 +4 4 4 4 4 4 2 2 2 0 0 0 3 4 3 26 28 28
41627 +37 38 37 37 38 37 14 17 19 2 2 2 0 0 0 2 2 2
41628 +5 5 5 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41629 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41630 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41631 +4 4 4 4 4 4 3 3 3 0 0 0 1 1 1 6 6 6
41632 +2 2 2 0 0 0 3 3 3 4 4 4 4 4 4 4 4 4
41633 +4 4 5 3 3 3 1 0 0 0 0 0 1 0 0 0 0 0
41634 +1 1 1 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41635 +4 4 4 4 4 4
41636 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41637 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41638 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41639 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41640 +2 2 2 0 0 0 0 0 0 14 17 19 60 74 84 137 136 137
41641 +153 152 153 137 136 137 125 124 125 60 73 81 6 6 6 3 1 0
41642 +0 0 0 3 3 3 4 4 4 4 4 4 4 4 4 4 4 4
41643 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41644 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41645 +4 4 4 4 4 4 0 0 0 4 4 4 41 54 63 125 124 125
41646 +60 73 81 6 6 6 4 0 0 3 3 3 4 4 4 4 4 4
41647 +4 4 4 0 0 0 6 9 11 41 54 63 41 65 82 22 30 35
41648 +2 2 2 2 1 0 4 4 4 4 4 4 4 4 4 4 4 4
41649 +4 4 4 4 4 4
41650 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41651 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41652 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41653 +4 4 4 4 4 4 5 5 5 5 5 5 2 2 2 0 0 0
41654 +4 0 0 6 6 6 41 54 63 137 136 137 174 174 174 167 166 167
41655 +165 164 165 165 164 165 163 162 163 163 162 163 125 124 125 41 54 63
41656 +1 1 1 0 0 0 0 0 0 3 3 3 5 5 5 4 4 4
41657 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41658 +4 4 4 4 4 4 4 4 4 4 4 4 5 5 5 5 5 5
41659 +3 3 3 2 0 0 4 0 0 60 73 81 156 155 156 167 166 167
41660 +163 162 163 85 115 134 5 7 8 0 0 0 4 4 4 5 5 5
41661 +0 0 0 2 5 5 55 98 126 90 154 193 90 154 193 72 125 159
41662 +37 51 59 2 0 0 1 1 1 4 5 5 4 4 4 4 4 4
41663 +4 4 4 4 4 4
41664 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41665 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41666 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41667 +4 4 4 5 5 5 4 4 4 1 1 1 0 0 0 3 3 3
41668 +37 38 37 125 124 125 163 162 163 174 174 174 158 157 158 158 157 158
41669 +156 155 156 156 155 156 158 157 158 165 164 165 174 174 174 166 165 166
41670 +125 124 125 16 19 21 1 0 0 0 0 0 0 0 0 4 4 4
41671 +5 5 5 5 5 5 4 4 4 4 4 4 4 4 4 4 4 4
41672 +4 4 4 4 4 4 4 4 4 5 5 5 5 5 5 1 1 1
41673 +0 0 0 0 0 0 37 38 37 153 152 153 174 174 174 158 157 158
41674 +174 174 174 163 162 163 37 38 37 4 3 3 4 0 0 1 1 1
41675 +0 0 0 22 40 52 101 161 196 101 161 196 90 154 193 101 161 196
41676 +64 123 161 14 17 19 0 0 0 4 4 4 4 4 4 4 4 4
41677 +4 4 4 4 4 4
41678 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41679 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41680 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 5 5 5
41681 +5 5 5 2 2 2 0 0 0 4 0 0 24 26 27 85 115 134
41682 +156 155 156 174 174 174 167 166 167 156 155 156 154 153 154 157 156 157
41683 +156 155 156 156 155 156 155 154 155 153 152 153 158 157 158 167 166 167
41684 +174 174 174 156 155 156 60 74 84 16 19 21 0 0 0 0 0 0
41685 +1 1 1 5 5 5 5 5 5 4 4 4 4 4 4 4 4 4
41686 +4 4 4 5 5 5 6 6 6 3 3 3 0 0 0 4 0 0
41687 +13 16 17 60 73 81 137 136 137 165 164 165 156 155 156 153 152 153
41688 +174 174 174 177 184 187 60 73 81 3 1 0 0 0 0 1 1 2
41689 +22 30 35 64 123 161 136 185 209 90 154 193 90 154 193 90 154 193
41690 +90 154 193 21 29 34 0 0 0 3 2 2 4 4 5 4 4 4
41691 +4 4 4 4 4 4
41692 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41693 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41694 +4 4 4 4 4 4 4 4 4 4 4 4 5 5 5 3 3 3
41695 +0 0 0 0 0 0 10 13 16 60 74 84 157 156 157 174 174 174
41696 +174 174 174 158 157 158 153 152 153 154 153 154 156 155 156 155 154 155
41697 +156 155 156 155 154 155 154 153 154 157 156 157 154 153 154 153 152 153
41698 +163 162 163 174 174 174 177 184 187 137 136 137 60 73 81 13 16 17
41699 +4 0 0 0 0 0 3 3 3 5 5 5 4 4 4 4 4 4
41700 +5 5 5 4 4 4 1 1 1 0 0 0 3 3 3 41 54 63
41701 +131 129 131 174 174 174 174 174 174 174 174 174 167 166 167 174 174 174
41702 +190 197 201 137 136 137 24 26 27 4 0 0 16 21 25 50 82 103
41703 +90 154 193 136 185 209 90 154 193 101 161 196 101 161 196 101 161 196
41704 +31 91 132 3 6 7 0 0 0 4 4 4 4 4 4 4 4 4
41705 +4 4 4 4 4 4
41706 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41707 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41708 +4 4 4 4 4 4 4 4 4 2 2 2 0 0 0 4 0 0
41709 +4 0 0 43 57 68 137 136 137 177 184 187 174 174 174 163 162 163
41710 +155 154 155 155 154 155 156 155 156 155 154 155 158 157 158 165 164 165
41711 +167 166 167 166 165 166 163 162 163 157 156 157 155 154 155 155 154 155
41712 +153 152 153 156 155 156 167 166 167 174 174 174 174 174 174 131 129 131
41713 +41 54 63 5 5 5 0 0 0 0 0 0 3 3 3 4 4 4
41714 +1 1 1 0 0 0 1 0 0 26 28 28 125 124 125 174 174 174
41715 +177 184 187 174 174 174 174 174 174 156 155 156 131 129 131 137 136 137
41716 +125 124 125 24 26 27 4 0 0 41 65 82 90 154 193 136 185 209
41717 +136 185 209 101 161 196 53 118 160 37 112 160 90 154 193 34 86 122
41718 +7 12 15 0 0 0 4 4 4 4 4 4 4 4 4 4 4 4
41719 +4 4 4 4 4 4
41720 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41721 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41722 +4 4 4 3 3 3 0 0 0 0 0 0 5 5 5 37 38 37
41723 +125 124 125 167 166 167 174 174 174 167 166 167 158 157 158 155 154 155
41724 +156 155 156 156 155 156 156 155 156 163 162 163 167 166 167 155 154 155
41725 +137 136 137 153 152 153 156 155 156 165 164 165 163 162 163 156 155 156
41726 +156 155 156 156 155 156 155 154 155 158 157 158 166 165 166 174 174 174
41727 +167 166 167 125 124 125 37 38 37 1 0 0 0 0 0 0 0 0
41728 +0 0 0 24 26 27 60 74 84 158 157 158 174 174 174 174 174 174
41729 +166 165 166 158 157 158 125 124 125 41 54 63 13 16 17 6 6 6
41730 +6 6 6 37 38 37 80 127 157 136 185 209 101 161 196 101 161 196
41731 +90 154 193 28 67 93 6 10 14 13 20 25 13 20 25 6 10 14
41732 +1 1 2 4 3 3 4 4 4 4 4 4 4 4 4 4 4 4
41733 +4 4 4 4 4 4
41734 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41735 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41736 +1 1 1 1 0 0 4 3 3 37 38 37 60 74 84 153 152 153
41737 +167 166 167 167 166 167 158 157 158 154 153 154 155 154 155 156 155 156
41738 +157 156 157 158 157 158 167 166 167 167 166 167 131 129 131 43 57 68
41739 +26 28 28 37 38 37 60 73 81 131 129 131 165 164 165 166 165 166
41740 +158 157 158 155 154 155 156 155 156 156 155 156 156 155 156 158 157 158
41741 +165 164 165 174 174 174 163 162 163 60 74 84 16 19 21 13 16 17
41742 +60 73 81 131 129 131 174 174 174 174 174 174 167 166 167 165 164 165
41743 +137 136 137 60 73 81 24 26 27 4 0 0 4 0 0 16 19 21
41744 +52 104 138 101 161 196 136 185 209 136 185 209 90 154 193 27 99 146
41745 +13 20 25 4 5 7 2 5 5 4 5 7 1 1 2 0 0 0
41746 +4 4 4 4 4 4 3 3 3 2 2 2 2 2 2 4 4 4
41747 +4 4 4 4 4 4
41748 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41749 +4 4 4 4 4 4 4 4 4 4 4 4 3 3 3 0 0 0
41750 +0 0 0 13 16 17 60 73 81 137 136 137 174 174 174 166 165 166
41751 +158 157 158 156 155 156 157 156 157 156 155 156 155 154 155 158 157 158
41752 +167 166 167 174 174 174 153 152 153 60 73 81 16 19 21 4 0 0
41753 +4 0 0 4 0 0 6 6 6 26 28 28 60 74 84 158 157 158
41754 +174 174 174 166 165 166 157 156 157 155 154 155 156 155 156 156 155 156
41755 +155 154 155 158 157 158 167 166 167 167 166 167 131 129 131 125 124 125
41756 +137 136 137 167 166 167 167 166 167 174 174 174 158 157 158 125 124 125
41757 +16 19 21 4 0 0 4 0 0 10 13 16 49 76 92 107 159 188
41758 +136 185 209 136 185 209 90 154 193 26 108 161 22 40 52 6 10 14
41759 +2 3 3 1 1 2 1 1 2 4 4 5 4 4 5 4 4 5
41760 +4 4 5 2 2 1 0 0 0 0 0 0 0 0 0 2 2 2
41761 +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 3 3 3 0 0 0 1 0 0 4 0 0
41764 +37 51 59 131 129 131 167 166 167 167 166 167 163 162 163 157 156 157
41765 +157 156 157 155 154 155 153 152 153 157 156 157 167 166 167 174 174 174
41766 +153 152 153 125 124 125 37 38 37 4 0 0 4 0 0 4 0 0
41767 +4 3 3 4 3 3 4 0 0 6 6 6 4 0 0 37 38 37
41768 +125 124 125 174 174 174 174 174 174 165 164 165 156 155 156 154 153 154
41769 +156 155 156 156 155 156 155 154 155 163 162 163 158 157 158 163 162 163
41770 +174 174 174 174 174 174 174 174 174 125 124 125 37 38 37 0 0 0
41771 +4 0 0 6 9 11 41 54 63 90 154 193 136 185 209 146 190 211
41772 +136 185 209 37 112 160 22 40 52 6 10 14 3 6 7 1 1 2
41773 +1 1 2 3 3 3 1 1 2 3 3 3 4 4 4 4 4 4
41774 +2 2 2 2 0 0 16 19 21 37 38 37 24 26 27 0 0 0
41775 +0 0 0 4 4 4
41776 +4 4 4 4 4 4 4 4 4 4 4 4 5 5 5 5 5 5
41777 +4 4 4 0 0 0 0 0 0 0 0 0 26 28 28 120 125 127
41778 +158 157 158 174 174 174 165 164 165 157 156 157 155 154 155 156 155 156
41779 +153 152 153 153 152 153 167 166 167 174 174 174 174 174 174 125 124 125
41780 +37 38 37 4 0 0 0 0 0 4 0 0 4 3 3 4 4 4
41781 +4 4 4 4 4 4 5 5 5 4 0 0 4 0 0 4 0 0
41782 +4 3 3 43 57 68 137 136 137 174 174 174 174 174 174 165 164 165
41783 +154 153 154 153 152 153 153 152 153 153 152 153 163 162 163 174 174 174
41784 +174 174 174 153 152 153 60 73 81 6 6 6 4 0 0 4 3 3
41785 +32 43 50 80 127 157 136 185 209 146 190 211 146 190 211 90 154 193
41786 +28 67 93 28 67 93 40 71 93 3 6 7 1 1 2 2 5 5
41787 +50 82 103 79 117 143 26 37 45 0 0 0 3 3 3 1 1 1
41788 +0 0 0 41 54 63 137 136 137 174 174 174 153 152 153 60 73 81
41789 +2 0 0 0 0 0
41790 +4 4 4 4 4 4 4 4 4 4 4 4 6 6 6 2 2 2
41791 +0 0 0 2 0 0 24 26 27 60 74 84 153 152 153 174 174 174
41792 +174 174 174 157 156 157 154 153 154 156 155 156 154 153 154 153 152 153
41793 +165 164 165 174 174 174 177 184 187 137 136 137 43 57 68 6 6 6
41794 +4 0 0 2 0 0 3 3 3 5 5 5 5 5 5 4 4 4
41795 +4 4 4 4 4 4 4 4 4 5 5 5 6 6 6 4 3 3
41796 +4 0 0 4 0 0 24 26 27 60 73 81 153 152 153 174 174 174
41797 +174 174 174 158 157 158 158 157 158 174 174 174 174 174 174 158 157 158
41798 +60 74 84 24 26 27 4 0 0 4 0 0 17 23 27 59 113 148
41799 +136 185 209 191 222 234 146 190 211 136 185 209 31 91 132 7 11 13
41800 +22 40 52 101 161 196 90 154 193 6 9 11 3 4 4 43 95 132
41801 +136 185 209 172 205 220 55 98 126 0 0 0 0 0 0 2 0 0
41802 +26 28 28 153 152 153 177 184 187 167 166 167 177 184 187 165 164 165
41803 +37 38 37 0 0 0
41804 +4 4 4 4 4 4 5 5 5 5 5 5 1 1 1 0 0 0
41805 +13 16 17 60 73 81 137 136 137 174 174 174 174 174 174 165 164 165
41806 +153 152 153 153 152 153 155 154 155 154 153 154 158 157 158 174 174 174
41807 +177 184 187 163 162 163 60 73 81 16 19 21 4 0 0 4 0 0
41808 +4 3 3 4 4 4 5 5 5 5 5 5 4 4 4 5 5 5
41809 +5 5 5 5 5 5 5 5 5 4 4 4 4 4 4 5 5 5
41810 +6 6 6 4 0 0 4 0 0 4 0 0 24 26 27 60 74 84
41811 +166 165 166 174 174 174 177 184 187 165 164 165 125 124 125 24 26 27
41812 +4 0 0 4 0 0 5 5 5 50 82 103 136 185 209 172 205 220
41813 +146 190 211 136 185 209 26 108 161 22 40 52 7 12 15 44 81 103
41814 +71 116 144 28 67 93 37 51 59 41 65 82 100 139 164 101 161 196
41815 +90 154 193 90 154 193 28 67 93 0 0 0 0 0 0 26 28 28
41816 +125 124 125 167 166 167 163 162 163 153 152 153 163 162 163 174 174 174
41817 +85 115 134 4 0 0
41818 +4 4 4 5 5 5 4 4 4 1 0 0 4 0 0 34 47 55
41819 +125 124 125 174 174 174 174 174 174 167 166 167 157 156 157 153 152 153
41820 +155 154 155 155 154 155 158 157 158 166 165 166 167 166 167 154 153 154
41821 +125 124 125 26 28 28 4 0 0 4 0 0 4 0 0 5 5 5
41822 +5 5 5 4 4 4 4 4 4 4 4 4 4 4 4 1 1 1
41823 +0 0 0 0 0 0 1 1 1 4 4 4 4 4 4 4 4 4
41824 +5 5 5 5 5 5 4 3 3 4 0 0 4 0 0 6 6 6
41825 +37 38 37 131 129 131 137 136 137 37 38 37 0 0 0 4 0 0
41826 +4 5 5 43 61 72 90 154 193 172 205 220 146 190 211 136 185 209
41827 +90 154 193 28 67 93 13 20 25 43 61 72 71 116 144 44 81 103
41828 +2 5 5 7 11 13 59 113 148 101 161 196 90 154 193 28 67 93
41829 +13 20 25 6 10 14 0 0 0 13 16 17 60 73 81 137 136 137
41830 +166 165 166 158 157 158 156 155 156 154 153 154 167 166 167 174 174 174
41831 +60 73 81 4 0 0
41832 +4 4 4 4 4 4 0 0 0 3 3 3 60 74 84 174 174 174
41833 +174 174 174 167 166 167 163 162 163 155 154 155 157 156 157 155 154 155
41834 +156 155 156 163 162 163 167 166 167 158 157 158 125 124 125 37 38 37
41835 +4 3 3 4 0 0 4 0 0 6 6 6 6 6 6 5 5 5
41836 +4 4 4 4 4 4 4 4 4 1 1 1 0 0 0 2 3 3
41837 +10 13 16 7 11 13 1 0 0 0 0 0 2 2 1 4 4 4
41838 +4 4 4 4 4 4 4 4 4 5 5 5 4 3 3 4 0 0
41839 +4 0 0 7 11 13 13 16 17 4 0 0 3 3 3 34 47 55
41840 +80 127 157 146 190 211 172 205 220 136 185 209 136 185 209 136 185 209
41841 +28 67 93 22 40 52 55 98 126 55 98 126 21 29 34 7 11 13
41842 +50 82 103 101 161 196 101 161 196 35 83 115 13 20 25 2 2 1
41843 +1 1 2 1 1 2 37 51 59 131 129 131 174 174 174 174 174 174
41844 +167 166 167 163 162 163 163 162 163 167 166 167 174 174 174 125 124 125
41845 +16 19 21 4 0 0
41846 +4 4 4 4 0 0 4 0 0 60 74 84 174 174 174 174 174 174
41847 +158 157 158 155 154 155 155 154 155 156 155 156 155 154 155 158 157 158
41848 +167 166 167 165 164 165 131 129 131 60 73 81 13 16 17 4 0 0
41849 +4 0 0 4 3 3 6 6 6 4 3 3 5 5 5 4 4 4
41850 +4 4 4 3 2 2 0 0 0 0 0 0 7 11 13 45 69 86
41851 +80 127 157 71 116 144 43 61 72 7 11 13 0 0 0 1 1 1
41852 +4 3 3 4 4 4 4 4 4 4 4 4 6 6 6 5 5 5
41853 +3 2 2 4 0 0 1 0 0 21 29 34 59 113 148 136 185 209
41854 +146 190 211 136 185 209 136 185 209 136 185 209 136 185 209 136 185 209
41855 +68 124 159 44 81 103 22 40 52 13 16 17 43 61 72 90 154 193
41856 +136 185 209 59 113 148 21 29 34 3 4 3 1 1 1 0 0 0
41857 +24 26 27 125 124 125 163 162 163 174 174 174 166 165 166 165 164 165
41858 +163 162 163 125 124 125 125 124 125 125 124 125 125 124 125 26 28 28
41859 +4 0 0 4 3 3
41860 +3 3 3 0 0 0 24 26 27 153 152 153 177 184 187 158 157 158
41861 +156 155 156 156 155 156 155 154 155 155 154 155 165 164 165 174 174 174
41862 +155 154 155 60 74 84 26 28 28 4 0 0 4 0 0 3 1 0
41863 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 3 3
41864 +2 0 0 0 0 0 0 0 0 32 43 50 72 125 159 101 161 196
41865 +136 185 209 101 161 196 101 161 196 79 117 143 32 43 50 0 0 0
41866 +0 0 0 2 2 2 4 4 4 4 4 4 3 3 3 1 0 0
41867 +0 0 0 4 5 5 49 76 92 101 161 196 146 190 211 146 190 211
41868 +136 185 209 136 185 209 136 185 209 136 185 209 136 185 209 90 154 193
41869 +28 67 93 13 16 17 37 51 59 80 127 157 136 185 209 90 154 193
41870 +22 40 52 6 9 11 3 4 3 2 2 1 16 19 21 60 73 81
41871 +137 136 137 163 162 163 158 157 158 166 165 166 167 166 167 153 152 153
41872 +60 74 84 37 38 37 6 6 6 13 16 17 4 0 0 1 0 0
41873 +3 2 2 4 4 4
41874 +3 2 2 4 0 0 37 38 37 137 136 137 167 166 167 158 157 158
41875 +157 156 157 154 153 154 157 156 157 167 166 167 174 174 174 125 124 125
41876 +37 38 37 4 0 0 4 0 0 4 0 0 4 3 3 4 4 4
41877 +4 4 4 4 4 4 5 5 5 5 5 5 1 1 1 0 0 0
41878 +0 0 0 16 21 25 55 98 126 90 154 193 136 185 209 101 161 196
41879 +101 161 196 101 161 196 136 185 209 136 185 209 101 161 196 55 98 126
41880 +14 17 19 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
41881 +22 40 52 90 154 193 146 190 211 146 190 211 136 185 209 136 185 209
41882 +136 185 209 136 185 209 136 185 209 101 161 196 35 83 115 7 11 13
41883 +17 23 27 59 113 148 136 185 209 101 161 196 34 86 122 7 12 15
41884 +2 5 5 3 4 3 6 6 6 60 73 81 131 129 131 163 162 163
41885 +166 165 166 174 174 174 174 174 174 163 162 163 125 124 125 41 54 63
41886 +13 16 17 4 0 0 4 0 0 4 0 0 1 0 0 2 2 2
41887 +4 4 4 4 4 4
41888 +1 1 1 2 1 0 43 57 68 137 136 137 153 152 153 153 152 153
41889 +163 162 163 156 155 156 165 164 165 167 166 167 60 74 84 6 6 6
41890 +4 0 0 4 0 0 5 5 5 4 4 4 4 4 4 4 4 4
41891 +4 5 5 6 6 6 4 3 3 0 0 0 0 0 0 11 15 18
41892 +40 71 93 100 139 164 101 161 196 101 161 196 101 161 196 101 161 196
41893 +101 161 196 101 161 196 101 161 196 101 161 196 136 185 209 136 185 209
41894 +101 161 196 45 69 86 6 6 6 0 0 0 17 23 27 55 98 126
41895 +136 185 209 146 190 211 136 185 209 136 185 209 136 185 209 136 185 209
41896 +136 185 209 136 185 209 90 154 193 22 40 52 7 11 13 50 82 103
41897 +136 185 209 136 185 209 53 118 160 22 40 52 7 11 13 2 5 5
41898 +3 4 3 37 38 37 125 124 125 157 156 157 166 165 166 167 166 167
41899 +174 174 174 174 174 174 137 136 137 60 73 81 4 0 0 4 0 0
41900 +4 0 0 4 0 0 5 5 5 3 3 3 3 3 3 4 4 4
41901 +4 4 4 4 4 4
41902 +4 0 0 4 0 0 41 54 63 137 136 137 125 124 125 131 129 131
41903 +155 154 155 167 166 167 174 174 174 60 74 84 6 6 6 4 0 0
41904 +4 3 3 6 6 6 4 4 4 4 4 4 4 4 4 5 5 5
41905 +4 4 4 1 1 1 0 0 0 3 6 7 41 65 82 72 125 159
41906 +101 161 196 101 161 196 101 161 196 90 154 193 90 154 193 101 161 196
41907 +101 161 196 101 161 196 101 161 196 101 161 196 101 161 196 136 185 209
41908 +136 185 209 136 185 209 80 127 157 55 98 126 101 161 196 146 190 211
41909 +136 185 209 136 185 209 136 185 209 101 161 196 136 185 209 101 161 196
41910 +136 185 209 101 161 196 35 83 115 22 30 35 101 161 196 172 205 220
41911 +90 154 193 28 67 93 7 11 13 2 5 5 3 4 3 13 16 17
41912 +85 115 134 167 166 167 174 174 174 174 174 174 174 174 174 174 174 174
41913 +167 166 167 60 74 84 13 16 17 4 0 0 4 0 0 4 3 3
41914 +6 6 6 5 5 5 4 4 4 5 5 5 4 4 4 5 5 5
41915 +5 5 5 5 5 5
41916 +1 1 1 4 0 0 41 54 63 137 136 137 137 136 137 125 124 125
41917 +131 129 131 167 166 167 157 156 157 37 38 37 6 6 6 4 0 0
41918 +6 6 6 5 5 5 4 4 4 4 4 4 4 5 5 2 2 1
41919 +0 0 0 0 0 0 26 37 45 58 111 146 101 161 196 101 161 196
41920 +101 161 196 90 154 193 90 154 193 90 154 193 101 161 196 101 161 196
41921 +101 161 196 101 161 196 101 161 196 101 161 196 101 161 196 101 161 196
41922 +101 161 196 136 185 209 136 185 209 136 185 209 146 190 211 136 185 209
41923 +136 185 209 101 161 196 136 185 209 136 185 209 101 161 196 136 185 209
41924 +101 161 196 136 185 209 136 185 209 136 185 209 136 185 209 16 89 141
41925 +7 11 13 2 5 5 2 5 5 13 16 17 60 73 81 154 154 154
41926 +174 174 174 174 174 174 174 174 174 174 174 174 163 162 163 125 124 125
41927 +24 26 27 4 0 0 4 0 0 4 0 0 5 5 5 5 5 5
41928 +4 4 4 4 4 4 4 4 4 5 5 5 5 5 5 5 5 5
41929 +5 5 5 4 4 4
41930 +4 0 0 6 6 6 37 38 37 137 136 137 137 136 137 131 129 131
41931 +131 129 131 153 152 153 131 129 131 26 28 28 4 0 0 4 3 3
41932 +6 6 6 4 4 4 4 4 4 4 4 4 0 0 0 0 0 0
41933 +13 20 25 51 88 114 90 154 193 101 161 196 101 161 196 90 154 193
41934 +90 154 193 90 154 193 90 154 193 90 154 193 90 154 193 101 161 196
41935 +101 161 196 101 161 196 101 161 196 101 161 196 136 185 209 101 161 196
41936 +101 161 196 136 185 209 101 161 196 136 185 209 136 185 209 101 161 196
41937 +136 185 209 101 161 196 136 185 209 101 161 196 101 161 196 101 161 196
41938 +136 185 209 136 185 209 136 185 209 37 112 160 21 29 34 5 7 8
41939 +2 5 5 13 16 17 43 57 68 131 129 131 174 174 174 174 174 174
41940 +174 174 174 167 166 167 157 156 157 125 124 125 37 38 37 4 0 0
41941 +4 0 0 4 0 0 5 5 5 5 5 5 4 4 4 4 4 4
41942 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41943 +4 4 4 4 4 4
41944 +1 1 1 4 0 0 41 54 63 153 152 153 137 136 137 137 136 137
41945 +137 136 137 153 152 153 125 124 125 24 26 27 4 0 0 3 2 2
41946 +4 4 4 4 4 4 4 3 3 4 0 0 3 6 7 43 61 72
41947 +64 123 161 101 161 196 90 154 193 90 154 193 90 154 193 90 154 193
41948 +90 154 193 90 154 193 90 154 193 90 154 193 101 161 196 90 154 193
41949 +101 161 196 101 161 196 101 161 196 101 161 196 101 161 196 101 161 196
41950 +101 161 196 101 161 196 101 161 196 101 161 196 101 161 196 101 161 196
41951 +136 185 209 101 161 196 101 161 196 136 185 209 136 185 209 101 161 196
41952 +101 161 196 90 154 193 28 67 93 13 16 17 7 11 13 3 6 7
41953 +37 51 59 125 124 125 163 162 163 174 174 174 167 166 167 166 165 166
41954 +167 166 167 131 129 131 60 73 81 4 0 0 4 0 0 4 0 0
41955 +3 3 3 5 5 5 6 6 6 4 4 4 4 4 4 4 4 4
41956 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41957 +4 4 4 4 4 4
41958 +4 0 0 4 0 0 41 54 63 137 136 137 153 152 153 137 136 137
41959 +153 152 153 157 156 157 125 124 125 24 26 27 0 0 0 2 2 2
41960 +4 4 4 4 4 4 2 0 0 0 0 0 28 67 93 90 154 193
41961 +90 154 193 90 154 193 90 154 193 90 154 193 64 123 161 90 154 193
41962 +90 154 193 90 154 193 90 154 193 90 154 193 90 154 193 101 161 196
41963 +90 154 193 101 161 196 101 161 196 101 161 196 90 154 193 136 185 209
41964 +101 161 196 101 161 196 136 185 209 101 161 196 136 185 209 101 161 196
41965 +101 161 196 101 161 196 136 185 209 101 161 196 101 161 196 90 154 193
41966 +35 83 115 13 16 17 3 6 7 2 5 5 13 16 17 60 74 84
41967 +154 154 154 166 165 166 165 164 165 158 157 158 163 162 163 157 156 157
41968 +60 74 84 13 16 17 4 0 0 4 0 0 3 2 2 4 4 4
41969 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41970 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41971 +4 4 4 4 4 4
41972 +1 1 1 4 0 0 41 54 63 157 156 157 155 154 155 137 136 137
41973 +153 152 153 158 157 158 137 136 137 26 28 28 2 0 0 2 2 2
41974 +4 4 4 4 4 4 1 0 0 6 10 14 34 86 122 90 154 193
41975 +64 123 161 90 154 193 64 123 161 90 154 193 90 154 193 90 154 193
41976 +64 123 161 90 154 193 90 154 193 90 154 193 90 154 193 90 154 193
41977 +101 161 196 101 161 196 101 161 196 101 161 196 101 161 196 101 161 196
41978 +101 161 196 101 161 196 101 161 196 101 161 196 101 161 196 101 161 196
41979 +136 185 209 101 161 196 136 185 209 90 154 193 26 108 161 22 40 52
41980 +13 16 17 5 7 8 2 5 5 2 5 5 37 38 37 165 164 165
41981 +174 174 174 163 162 163 154 154 154 165 164 165 167 166 167 60 73 81
41982 +6 6 6 4 0 0 4 0 0 4 4 4 4 4 4 4 4 4
41983 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41984 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41985 +4 4 4 4 4 4
41986 +4 0 0 6 6 6 41 54 63 156 155 156 158 157 158 153 152 153
41987 +156 155 156 165 164 165 137 136 137 26 28 28 0 0 0 2 2 2
41988 +4 4 5 4 4 4 2 0 0 7 12 15 31 96 139 64 123 161
41989 +90 154 193 64 123 161 90 154 193 90 154 193 64 123 161 90 154 193
41990 +90 154 193 90 154 193 90 154 193 90 154 193 90 154 193 90 154 193
41991 +90 154 193 90 154 193 90 154 193 101 161 196 101 161 196 101 161 196
41992 +101 161 196 101 161 196 101 161 196 101 161 196 101 161 196 136 185 209
41993 +101 161 196 136 185 209 26 108 161 22 40 52 7 11 13 5 7 8
41994 +2 5 5 2 5 5 2 5 5 2 2 1 37 38 37 158 157 158
41995 +174 174 174 154 154 154 156 155 156 167 166 167 165 164 165 37 38 37
41996 +4 0 0 4 3 3 5 5 5 4 4 4 4 4 4 4 4 4
41997 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41998 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41999 +4 4 4 4 4 4
42000 +3 1 0 4 0 0 60 73 81 157 156 157 163 162 163 153 152 153
42001 +158 157 158 167 166 167 137 136 137 26 28 28 2 0 0 2 2 2
42002 +4 5 5 4 4 4 4 0 0 7 12 15 24 86 132 26 108 161
42003 +37 112 160 64 123 161 90 154 193 64 123 161 90 154 193 90 154 193
42004 +90 154 193 90 154 193 90 154 193 90 154 193 90 154 193 90 154 193
42005 +90 154 193 101 161 196 90 154 193 101 161 196 101 161 196 101 161 196
42006 +101 161 196 101 161 196 101 161 196 136 185 209 101 161 196 136 185 209
42007 +90 154 193 35 83 115 13 16 17 13 16 17 7 11 13 3 6 7
42008 +5 7 8 6 6 6 3 4 3 2 2 1 30 32 34 154 154 154
42009 +167 166 167 154 154 154 154 154 154 174 174 174 165 164 165 37 38 37
42010 +6 6 6 4 0 0 6 6 6 4 4 4 4 4 4 4 4 4
42011 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
42012 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
42013 +4 4 4 4 4 4
42014 +4 0 0 4 0 0 41 54 63 163 162 163 166 165 166 154 154 154
42015 +163 162 163 174 174 174 137 136 137 26 28 28 0 0 0 2 2 2
42016 +4 5 5 4 4 5 1 1 2 6 10 14 28 67 93 18 97 151
42017 +18 97 151 18 97 151 26 108 161 37 112 160 37 112 160 90 154 193
42018 +64 123 161 90 154 193 90 154 193 90 154 193 90 154 193 101 161 196
42019 +90 154 193 101 161 196 101 161 196 90 154 193 101 161 196 101 161 196
42020 +101 161 196 101 161 196 101 161 196 136 185 209 90 154 193 16 89 141
42021 +13 20 25 7 11 13 5 7 8 5 7 8 2 5 5 4 5 5
42022 +3 4 3 4 5 5 3 4 3 0 0 0 37 38 37 158 157 158
42023 +174 174 174 158 157 158 158 157 158 167 166 167 174 174 174 41 54 63
42024 +4 0 0 3 2 2 5 5 5 4 4 4 4 4 4 4 4 4
42025 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
42026 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
42027 +4 4 4 4 4 4
42028 +1 1 1 4 0 0 60 73 81 165 164 165 174 174 174 158 157 158
42029 +167 166 167 174 174 174 153 152 153 26 28 28 2 0 0 2 2 2
42030 +4 5 5 4 4 4 4 0 0 7 12 15 10 87 144 10 87 144
42031 +18 97 151 18 97 151 18 97 151 26 108 161 26 108 161 26 108 161
42032 +26 108 161 37 112 160 53 118 160 90 154 193 90 154 193 90 154 193
42033 +90 154 193 90 154 193 101 161 196 101 161 196 101 161 196 101 161 196
42034 +101 161 196 136 185 209 90 154 193 26 108 161 22 40 52 13 16 17
42035 +7 11 13 3 6 7 5 7 8 5 7 8 2 5 5 4 5 5
42036 +4 5 5 6 6 6 3 4 3 0 0 0 30 32 34 158 157 158
42037 +174 174 174 156 155 156 155 154 155 165 164 165 154 153 154 37 38 37
42038 +4 0 0 4 3 3 5 5 5 4 4 4 4 4 4 4 4 4
42039 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
42040 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
42041 +4 4 4 4 4 4
42042 +4 0 0 4 0 0 60 73 81 167 166 167 174 174 174 163 162 163
42043 +174 174 174 174 174 174 153 152 153 26 28 28 0 0 0 3 3 3
42044 +5 5 5 4 4 4 1 1 2 7 12 15 28 67 93 18 97 151
42045 +18 97 151 18 97 151 18 97 151 18 97 151 18 97 151 26 108 161
42046 +26 108 161 26 108 161 26 108 161 26 108 161 26 108 161 26 108 161
42047 +90 154 193 26 108 161 90 154 193 90 154 193 90 154 193 101 161 196
42048 +101 161 196 26 108 161 22 40 52 13 16 17 7 11 13 2 5 5
42049 +2 5 5 6 6 6 2 5 5 4 5 5 4 5 5 4 5 5
42050 +3 4 3 5 5 5 3 4 3 2 0 0 30 32 34 137 136 137
42051 +153 152 153 137 136 137 131 129 131 137 136 137 131 129 131 37 38 37
42052 +4 0 0 4 3 3 5 5 5 4 4 4 4 4 4 4 4 4
42053 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
42054 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
42055 +4 4 4 4 4 4
42056 +1 1 1 4 0 0 60 73 81 167 166 167 174 174 174 166 165 166
42057 +174 174 174 177 184 187 153 152 153 30 32 34 1 0 0 3 3 3
42058 +5 5 5 4 3 3 4 0 0 7 12 15 10 87 144 10 87 144
42059 +18 97 151 18 97 151 18 97 151 26 108 161 26 108 161 26 108 161
42060 +26 108 161 26 108 161 26 108 161 26 108 161 26 108 161 26 108 161
42061 +26 108 161 26 108 161 26 108 161 90 154 193 90 154 193 26 108 161
42062 +35 83 115 13 16 17 7 11 13 5 7 8 3 6 7 5 7 8
42063 +2 5 5 6 6 6 4 5 5 4 5 5 3 4 3 4 5 5
42064 +3 4 3 6 6 6 3 4 3 0 0 0 26 28 28 125 124 125
42065 +131 129 131 125 124 125 125 124 125 131 129 131 131 129 131 37 38 37
42066 +4 0 0 3 3 3 5 5 5 4 4 4 4 4 4 4 4 4
42067 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
42068 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
42069 +4 4 4 4 4 4
42070 +3 1 0 4 0 0 60 73 81 174 174 174 177 184 187 167 166 167
42071 +174 174 174 177 184 187 153 152 153 30 32 34 0 0 0 3 3 3
42072 +5 5 5 4 4 4 1 1 2 6 10 14 28 67 93 18 97 151
42073 +18 97 151 18 97 151 18 97 151 18 97 151 18 97 151 26 108 161
42074 +26 108 161 26 108 161 26 108 161 26 108 161 26 108 161 26 108 161
42075 +26 108 161 90 154 193 26 108 161 26 108 161 24 86 132 13 20 25
42076 +7 11 13 13 20 25 22 40 52 5 7 8 3 4 3 3 4 3
42077 +4 5 5 3 4 3 4 5 5 3 4 3 4 5 5 3 4 3
42078 +4 4 4 5 5 5 3 3 3 2 0 0 26 28 28 125 124 125
42079 +137 136 137 125 124 125 125 124 125 137 136 137 131 129 131 37 38 37
42080 +0 0 0 3 3 3 5 5 5 4 4 4 4 4 4 4 4 4
42081 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
42082 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
42083 +4 4 4 4 4 4
42084 +1 1 1 4 0 0 60 73 81 174 174 174 177 184 187 174 174 174
42085 +174 174 174 190 197 201 157 156 157 30 32 34 1 0 0 3 3 3
42086 +5 5 5 4 3 3 4 0 0 7 12 15 10 87 144 10 87 144
42087 +18 97 151 19 95 150 19 95 150 18 97 151 18 97 151 26 108 161
42088 +18 97 151 26 108 161 26 108 161 26 108 161 26 108 161 90 154 193
42089 +26 108 161 26 108 161 26 108 161 22 40 52 2 5 5 3 4 3
42090 +28 67 93 37 112 160 34 86 122 2 5 5 3 4 3 3 4 3
42091 +3 4 3 3 4 3 3 4 3 2 2 1 3 4 3 4 4 4
42092 +4 5 5 5 5 5 3 3 3 0 0 0 26 28 28 131 129 131
42093 +137 136 137 125 124 125 125 124 125 137 136 137 131 129 131 37 38 37
42094 +0 0 0 3 3 3 5 5 5 4 4 4 4 4 4 4 4 4
42095 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
42096 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
42097 +4 4 4 4 4 4
42098 +4 0 0 4 0 0 60 73 81 174 174 174 177 184 187 174 174 174
42099 +174 174 174 190 197 201 158 157 158 30 32 34 0 0 0 2 2 2
42100 +5 5 5 4 4 4 1 1 2 6 10 14 28 67 93 18 97 151
42101 +10 87 144 19 95 150 19 95 150 18 97 151 18 97 151 18 97 151
42102 +26 108 161 26 108 161 26 108 161 26 108 161 26 108 161 26 108 161
42103 +18 97 151 22 40 52 2 5 5 2 2 1 22 40 52 26 108 161
42104 +90 154 193 37 112 160 22 40 52 3 4 3 13 20 25 22 30 35
42105 +3 6 7 1 1 1 2 2 2 6 9 11 5 5 5 4 3 3
42106 +4 4 4 5 5 5 3 3 3 2 0 0 26 28 28 131 129 131
42107 +137 136 137 125 124 125 125 124 125 137 136 137 131 129 131 37 38 37
42108 +0 0 0 3 3 3 5 5 5 4 4 4 4 4 4 4 4 4
42109 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
42110 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
42111 +4 4 4 4 4 4
42112 +1 1 1 4 0 0 60 73 81 177 184 187 193 200 203 174 174 174
42113 +177 184 187 193 200 203 163 162 163 30 32 34 4 0 0 2 2 2
42114 +5 5 5 4 3 3 4 0 0 6 10 14 24 86 132 10 87 144
42115 +10 87 144 10 87 144 19 95 150 19 95 150 19 95 150 18 97 151
42116 +26 108 161 26 108 161 26 108 161 90 154 193 26 108 161 28 67 93
42117 +6 10 14 2 5 5 13 20 25 24 86 132 37 112 160 90 154 193
42118 +10 87 144 7 12 15 2 5 5 28 67 93 37 112 160 28 67 93
42119 +2 2 1 7 12 15 35 83 115 28 67 93 3 6 7 1 0 0
42120 +4 4 4 5 5 5 3 3 3 0 0 0 26 28 28 131 129 131
42121 +137 136 137 125 124 125 125 124 125 137 136 137 131 129 131 37 38 37
42122 +0 0 0 3 3 3 5 5 5 4 4 4 4 4 4 4 4 4
42123 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
42124 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
42125 +4 4 4 4 4 4
42126 +4 0 0 4 0 0 60 73 81 174 174 174 190 197 201 174 174 174
42127 +177 184 187 193 200 203 163 162 163 30 32 34 0 0 0 2 2 2
42128 +5 5 5 4 4 4 1 1 2 6 10 14 28 67 93 10 87 144
42129 +10 87 144 16 89 141 19 95 150 10 87 144 26 108 161 26 108 161
42130 +26 108 161 26 108 161 26 108 161 28 67 93 6 10 14 1 1 2
42131 +7 12 15 28 67 93 26 108 161 16 89 141 24 86 132 21 29 34
42132 +3 4 3 21 29 34 37 112 160 37 112 160 27 99 146 21 29 34
42133 +21 29 34 26 108 161 90 154 193 35 83 115 1 1 2 2 0 0
42134 +4 4 4 5 5 5 3 3 3 2 0 0 26 28 28 125 124 125
42135 +137 136 137 125 124 125 125 124 125 137 136 137 131 129 131 37 38 37
42136 +0 0 0 3 3 3 5 5 5 4 4 4 4 4 4 4 4 4
42137 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
42138 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
42139 +4 4 4 4 4 4
42140 +3 1 0 4 0 0 60 73 81 193 200 203 193 200 203 174 174 174
42141 +190 197 201 193 200 203 165 164 165 37 38 37 4 0 0 2 2 2
42142 +5 5 5 4 3 3 4 0 0 6 10 14 24 86 132 10 87 144
42143 +10 87 144 10 87 144 16 89 141 18 97 151 18 97 151 10 87 144
42144 +24 86 132 24 86 132 13 20 25 4 5 7 4 5 7 22 40 52
42145 +18 97 151 37 112 160 26 108 161 7 12 15 1 1 1 0 0 0
42146 +28 67 93 37 112 160 26 108 161 28 67 93 22 40 52 28 67 93
42147 +26 108 161 90 154 193 26 108 161 10 87 144 0 0 0 2 0 0
42148 +4 4 4 5 5 5 3 3 3 0 0 0 26 28 28 131 129 131
42149 +137 136 137 125 124 125 125 124 125 137 136 137 131 129 131 37 38 37
42150 +0 0 0 3 3 3 5 5 5 4 4 4 4 4 4 4 4 4
42151 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
42152 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
42153 +4 4 4 4 4 4
42154 +4 0 0 6 6 6 60 73 81 174 174 174 193 200 203 174 174 174
42155 +190 197 201 193 200 203 165 164 165 30 32 34 0 0 0 2 2 2
42156 +5 5 5 4 4 4 1 1 2 6 10 14 28 67 93 10 87 144
42157 +10 87 144 10 87 144 10 87 144 18 97 151 28 67 93 6 10 14
42158 +0 0 0 1 1 2 4 5 7 13 20 25 16 89 141 26 108 161
42159 +26 108 161 26 108 161 24 86 132 6 9 11 2 3 3 22 40 52
42160 +37 112 160 16 89 141 22 40 52 28 67 93 26 108 161 26 108 161
42161 +90 154 193 26 108 161 26 108 161 28 67 93 1 1 1 4 0 0
42162 +4 4 4 5 5 5 3 3 3 4 0 0 26 28 28 124 126 130
42163 +137 136 137 125 124 125 125 124 125 137 136 137 131 129 131 37 38 37
42164 +0 0 0 3 3 3 5 5 5 4 4 4 4 4 4 4 4 4
42165 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
42166 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
42167 +4 4 4 4 4 4
42168 +4 0 0 4 0 0 60 73 81 193 200 203 193 200 203 174 174 174
42169 +193 200 203 193 200 203 167 166 167 37 38 37 4 0 0 2 2 2
42170 +5 5 5 4 4 4 4 0 0 6 10 14 28 67 93 10 87 144
42171 +10 87 144 10 87 144 18 97 151 10 87 144 13 20 25 4 5 7
42172 +1 1 2 1 1 1 22 40 52 26 108 161 26 108 161 26 108 161
42173 +26 108 161 26 108 161 26 108 161 24 86 132 22 40 52 22 40 52
42174 +22 40 52 22 40 52 10 87 144 26 108 161 26 108 161 26 108 161
42175 +26 108 161 26 108 161 90 154 193 10 87 144 0 0 0 4 0 0
42176 +4 4 4 5 5 5 3 3 3 0 0 0 26 28 28 131 129 131
42177 +137 136 137 125 124 125 125 124 125 137 136 137 131 129 131 37 38 37
42178 +0 0 0 3 3 3 5 5 5 4 4 4 4 4 4 4 4 4
42179 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
42180 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
42181 +4 4 4 4 4 4
42182 +4 0 0 6 6 6 60 73 81 174 174 174 220 221 221 174 174 174
42183 +190 197 201 205 212 215 167 166 167 30 32 34 0 0 0 2 2 2
42184 +5 5 5 4 4 4 1 1 2 6 10 14 28 67 93 10 87 144
42185 +10 87 144 10 87 144 10 87 144 10 87 144 22 40 52 1 1 2
42186 +2 0 0 1 1 2 24 86 132 26 108 161 26 108 161 26 108 161
42187 +26 108 161 19 95 150 16 89 141 10 87 144 22 40 52 22 40 52
42188 +10 87 144 26 108 161 37 112 160 26 108 161 26 108 161 26 108 161
42189 +26 108 161 26 108 161 26 108 161 28 67 93 2 0 0 3 1 0
42190 +4 4 4 5 5 5 3 3 3 2 0 0 26 28 28 131 129 131
42191 +137 136 137 125 124 125 125 124 125 137 136 137 131 129 131 37 38 37
42192 +0 0 0 3 3 3 5 5 5 4 4 4 4 4 4 4 4 4
42193 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
42194 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
42195 +4 4 4 4 4 4
42196 +4 0 0 4 0 0 60 73 81 220 221 221 190 197 201 174 174 174
42197 +193 200 203 193 200 203 174 174 174 37 38 37 4 0 0 2 2 2
42198 +5 5 5 4 4 4 3 2 2 1 1 2 13 20 25 10 87 144
42199 +10 87 144 10 87 144 10 87 144 10 87 144 10 87 144 13 20 25
42200 +13 20 25 22 40 52 10 87 144 18 97 151 18 97 151 26 108 161
42201 +10 87 144 13 20 25 6 10 14 21 29 34 24 86 132 18 97 151
42202 +26 108 161 26 108 161 26 108 161 26 108 161 26 108 161 26 108 161
42203 +26 108 161 90 154 193 18 97 151 13 20 25 0 0 0 4 3 3
42204 +4 4 4 5 5 5 3 3 3 0 0 0 26 28 28 131 129 131
42205 +137 136 137 125 124 125 125 124 125 137 136 137 131 129 131 37 38 37
42206 +0 0 0 3 3 3 5 5 5 4 4 4 4 4 4 4 4 4
42207 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
42208 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
42209 +4 4 4 4 4 4
42210 +4 0 0 6 6 6 60 73 81 174 174 174 220 221 221 174 174 174
42211 +190 197 201 220 221 221 167 166 167 30 32 34 1 0 0 2 2 2
42212 +5 5 5 4 4 4 4 4 5 2 5 5 4 5 7 13 20 25
42213 +28 67 93 10 87 144 10 87 144 10 87 144 10 87 144 10 87 144
42214 +10 87 144 10 87 144 18 97 151 10 87 144 18 97 151 18 97 151
42215 +28 67 93 2 3 3 0 0 0 28 67 93 26 108 161 26 108 161
42216 +26 108 161 26 108 161 26 108 161 26 108 161 26 108 161 26 108 161
42217 +26 108 161 10 87 144 13 20 25 1 1 2 3 2 2 4 4 4
42218 +4 4 4 5 5 5 3 3 3 2 0 0 26 28 28 131 129 131
42219 +137 136 137 125 124 125 125 124 125 137 136 137 131 129 131 37 38 37
42220 +0 0 0 3 3 3 5 5 5 4 4 4 4 4 4 4 4 4
42221 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
42222 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
42223 +4 4 4 4 4 4
42224 +4 0 0 4 0 0 60 73 81 220 221 221 190 197 201 174 174 174
42225 +193 200 203 193 200 203 174 174 174 26 28 28 4 0 0 4 3 3
42226 +5 5 5 4 4 4 4 4 4 4 4 5 1 1 2 2 5 5
42227 +4 5 7 22 40 52 10 87 144 10 87 144 18 97 151 10 87 144
42228 +10 87 144 10 87 144 10 87 144 10 87 144 10 87 144 18 97 151
42229 +10 87 144 28 67 93 22 40 52 10 87 144 26 108 161 18 97 151
42230 +18 97 151 18 97 151 26 108 161 26 108 161 26 108 161 26 108 161
42231 +22 40 52 1 1 2 0 0 0 2 3 3 4 4 4 4 4 4
42232 +4 4 4 5 5 5 4 4 4 0 0 0 26 28 28 131 129 131
42233 +137 136 137 125 124 125 125 124 125 137 136 137 131 129 131 37 38 37
42234 +0 0 0 3 3 3 5 5 5 4 4 4 4 4 4 4 4 4
42235 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
42236 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
42237 +4 4 4 4 4 4
42238 +4 0 0 6 6 6 60 73 81 174 174 174 220 221 221 174 174 174
42239 +190 197 201 220 221 221 190 197 201 41 54 63 4 0 0 2 2 2
42240 +6 6 6 4 4 4 4 4 4 4 4 5 4 4 5 3 3 3
42241 +1 1 2 1 1 2 6 10 14 22 40 52 10 87 144 18 97 151
42242 +18 97 151 10 87 144 10 87 144 10 87 144 18 97 151 10 87 144
42243 +10 87 144 18 97 151 26 108 161 18 97 151 18 97 151 10 87 144
42244 +26 108 161 26 108 161 26 108 161 10 87 144 28 67 93 6 10 14
42245 +1 1 2 1 1 2 4 3 3 4 4 5 4 4 4 4 4 4
42246 +5 5 5 5 5 5 1 1 1 4 0 0 37 51 59 137 136 137
42247 +137 136 137 125 124 125 125 124 125 137 136 137 131 129 131 37 38 37
42248 +0 0 0 3 3 3 5 5 5 4 4 4 4 4 4 4 4 4
42249 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
42250 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
42251 +4 4 4 4 4 4
42252 +4 0 0 4 0 0 60 73 81 220 221 221 193 200 203 174 174 174
42253 +193 200 203 193 200 203 220 221 221 137 136 137 13 16 17 4 0 0
42254 +2 2 2 4 4 4 4 4 4 4 4 4 4 4 4 4 4 5
42255 +4 4 5 4 3 3 1 1 2 4 5 7 13 20 25 28 67 93
42256 +10 87 144 10 87 144 10 87 144 10 87 144 10 87 144 10 87 144
42257 +10 87 144 18 97 151 18 97 151 10 87 144 18 97 151 26 108 161
42258 +26 108 161 18 97 151 28 67 93 6 10 14 0 0 0 0 0 0
42259 +2 3 3 4 5 5 4 4 5 4 4 4 4 4 4 5 5 5
42260 +3 3 3 1 1 1 0 0 0 16 19 21 125 124 125 137 136 137
42261 +131 129 131 125 124 125 125 124 125 137 136 137 131 129 131 37 38 37
42262 +0 0 0 3 3 3 5 5 5 4 4 4 4 4 4 4 4 4
42263 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
42264 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
42265 +4 4 4 4 4 4
42266 +4 0 0 6 6 6 60 73 81 174 174 174 220 221 221 174 174 174
42267 +193 200 203 190 197 201 220 221 221 220 221 221 153 152 153 30 32 34
42268 +0 0 0 0 0 0 2 2 2 4 4 4 4 4 4 4 4 4
42269 +4 4 4 4 5 5 4 5 7 1 1 2 1 1 2 4 5 7
42270 +13 20 25 28 67 93 10 87 144 18 97 151 10 87 144 10 87 144
42271 +10 87 144 10 87 144 10 87 144 18 97 151 26 108 161 18 97 151
42272 +28 67 93 7 12 15 0 0 0 0 0 0 2 2 1 4 4 4
42273 +4 5 5 4 5 5 4 4 4 4 4 4 3 3 3 0 0 0
42274 +0 0 0 0 0 0 37 38 37 125 124 125 158 157 158 131 129 131
42275 +125 124 125 125 124 125 125 124 125 137 136 137 131 129 131 37 38 37
42276 +0 0 0 3 3 3 5 5 5 4 4 4 4 4 4 4 4 4
42277 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
42278 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
42279 +4 4 4 4 4 4
42280 +4 3 3 4 0 0 41 54 63 193 200 203 220 221 221 174 174 174
42281 +193 200 203 193 200 203 193 200 203 220 221 221 244 246 246 193 200 203
42282 +120 125 127 5 5 5 1 0 0 0 0 0 1 1 1 4 4 4
42283 +4 4 4 4 4 4 4 5 5 4 5 5 4 4 5 1 1 2
42284 +4 5 7 4 5 7 22 40 52 10 87 144 10 87 144 10 87 144
42285 +10 87 144 10 87 144 18 97 151 10 87 144 10 87 144 13 20 25
42286 +4 5 7 2 3 3 1 1 2 4 4 4 4 5 5 4 4 4
42287 +4 4 4 4 4 4 4 4 4 1 1 1 0 0 0 1 1 2
42288 +24 26 27 60 74 84 153 152 153 163 162 163 137 136 137 125 124 125
42289 +125 124 125 125 124 125 125 124 125 137 136 137 125 124 125 26 28 28
42290 +0 0 0 3 3 3 5 5 5 4 4 4 4 4 4 4 4 4
42291 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
42292 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
42293 +4 4 4 4 4 4
42294 +4 0 0 6 6 6 26 28 28 156 155 156 220 221 221 220 221 221
42295 +174 174 174 193 200 203 193 200 203 193 200 203 205 212 215 220 221 221
42296 +220 221 221 167 166 167 60 73 81 7 11 13 0 0 0 0 0 0
42297 +3 3 3 4 4 4 4 4 4 4 4 4 4 4 5 4 4 5
42298 +4 4 5 1 1 2 1 1 2 4 5 7 22 40 52 10 87 144
42299 +10 87 144 10 87 144 10 87 144 22 40 52 4 5 7 1 1 2
42300 +1 1 2 4 4 5 4 4 4 4 4 4 4 4 4 4 4 4
42301 +5 5 5 2 2 2 0 0 0 4 0 0 16 19 21 60 73 81
42302 +137 136 137 167 166 167 158 157 158 137 136 137 131 129 131 131 129 131
42303 +125 124 125 125 124 125 131 129 131 155 154 155 60 74 84 5 7 8
42304 +0 0 0 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
42305 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
42306 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
42307 +4 4 4 4 4 4
42308 +5 5 5 4 0 0 4 0 0 60 73 81 193 200 203 220 221 221
42309 +193 200 203 193 200 203 193 200 203 193 200 203 205 212 215 220 221 221
42310 +220 221 221 220 221 221 220 221 221 137 136 137 43 57 68 6 6 6
42311 +4 0 0 1 1 1 4 4 4 4 4 4 4 4 4 4 4 4
42312 +4 4 5 4 4 5 3 2 2 1 1 2 2 5 5 13 20 25
42313 +22 40 52 22 40 52 13 20 25 2 3 3 1 1 2 3 3 3
42314 +4 5 7 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
42315 +1 1 1 0 0 0 2 3 3 41 54 63 131 129 131 166 165 166
42316 +166 165 166 155 154 155 153 152 153 137 136 137 137 136 137 125 124 125
42317 +125 124 125 137 136 137 137 136 137 125 124 125 37 38 37 4 3 3
42318 +4 3 3 5 5 5 4 4 4 4 4 4 4 4 4 4 4 4
42319 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
42320 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
42321 +4 4 4 4 4 4
42322 +4 3 3 6 6 6 6 6 6 13 16 17 60 73 81 167 166 167
42323 +220 221 221 220 221 221 220 221 221 193 200 203 193 200 203 193 200 203
42324 +205 212 215 220 221 221 220 221 221 244 246 246 205 212 215 125 124 125
42325 +24 26 27 0 0 0 0 0 0 2 2 2 5 5 5 5 5 5
42326 +4 4 4 4 4 4 4 4 4 4 4 5 1 1 2 4 5 7
42327 +4 5 7 4 5 7 1 1 2 3 2 2 4 4 5 4 4 4
42328 +4 4 4 4 4 4 5 5 5 4 4 4 0 0 0 0 0 0
42329 +2 0 0 26 28 28 125 124 125 174 174 174 174 174 174 166 165 166
42330 +156 155 156 153 152 153 137 136 137 137 136 137 131 129 131 137 136 137
42331 +137 136 137 137 136 137 60 74 84 30 32 34 4 0 0 4 0 0
42332 +5 5 5 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
42333 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
42334 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
42335 +4 4 4 4 4 4
42336 +5 5 5 6 6 6 4 0 0 4 0 0 6 6 6 26 28 28
42337 +125 124 125 174 174 174 220 221 221 220 221 221 220 221 221 193 200 203
42338 +205 212 215 220 221 221 205 212 215 220 221 221 220 221 221 244 246 246
42339 +193 200 203 60 74 84 13 16 17 4 0 0 0 0 0 3 3 3
42340 +5 5 5 5 5 5 4 4 4 4 4 4 4 4 5 3 3 3
42341 +1 1 2 3 3 3 4 4 5 4 4 5 4 4 4 4 4 4
42342 +5 5 5 5 5 5 2 2 2 0 0 0 0 0 0 13 16 17
42343 +60 74 84 174 174 174 193 200 203 174 174 174 167 166 167 163 162 163
42344 +153 152 153 153 152 153 137 136 137 137 136 137 153 152 153 137 136 137
42345 +125 124 125 41 54 63 24 26 27 4 0 0 4 0 0 5 5 5
42346 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
42347 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
42348 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
42349 +4 4 4 4 4 4
42350 +4 3 3 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6
42351 +6 6 6 37 38 37 131 129 131 220 221 221 220 221 221 220 221 221
42352 +193 200 203 193 200 203 220 221 221 205 212 215 220 221 221 244 246 246
42353 +244 246 246 244 246 246 174 174 174 41 54 63 0 0 0 0 0 0
42354 +0 0 0 4 4 4 5 5 5 5 5 5 4 4 4 4 4 5
42355 +4 4 5 4 4 5 4 4 4 4 4 4 6 6 6 6 6 6
42356 +3 3 3 0 0 0 2 0 0 13 16 17 60 73 81 156 155 156
42357 +220 221 221 193 200 203 174 174 174 165 164 165 163 162 163 154 153 154
42358 +153 152 153 153 152 153 158 157 158 163 162 163 137 136 137 60 73 81
42359 +13 16 17 4 0 0 4 0 0 4 3 3 4 4 4 4 4 4
42360 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
42361 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
42362 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
42363 +4 4 4 4 4 4
42364 +5 5 5 4 3 3 4 3 3 6 6 6 6 6 6 6 6 6
42365 +6 6 6 6 6 6 6 6 6 37 38 37 167 166 167 244 246 246
42366 +244 246 246 220 221 221 205 212 215 205 212 215 220 221 221 193 200 203
42367 +220 221 221 244 246 246 244 246 246 244 246 246 137 136 137 37 38 37
42368 +3 2 2 0 0 0 1 1 1 5 5 5 5 5 5 4 4 4
42369 +4 4 4 4 4 4 4 4 4 5 5 5 4 4 4 1 1 1
42370 +0 0 0 5 5 5 43 57 68 153 152 153 193 200 203 220 221 221
42371 +177 184 187 174 174 174 167 166 167 166 165 166 158 157 158 157 156 157
42372 +158 157 158 166 165 166 156 155 156 85 115 134 13 16 17 4 0 0
42373 +4 0 0 4 0 0 5 5 5 5 5 5 4 4 4 4 4 4
42374 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
42375 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
42376 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
42377 +4 4 4 4 4 4
42378 +5 5 5 4 3 3 6 6 6 6 6 6 4 0 0 6 6 6
42379 +6 6 6 6 6 6 6 6 6 6 6 6 13 16 17 60 73 81
42380 +177 184 187 220 221 221 220 221 221 220 221 221 205 212 215 220 221 221
42381 +220 221 221 205 212 215 220 221 221 244 246 246 244 246 246 205 212 215
42382 +125 124 125 30 32 34 0 0 0 0 0 0 2 2 2 5 5 5
42383 +4 4 4 4 4 4 4 4 4 1 1 1 0 0 0 1 0 0
42384 +37 38 37 131 129 131 205 212 215 220 221 221 193 200 203 174 174 174
42385 +174 174 174 174 174 174 167 166 167 165 164 165 166 165 166 167 166 167
42386 +158 157 158 125 124 125 37 38 37 4 0 0 4 0 0 4 0 0
42387 +4 3 3 5 5 5 4 4 4 4 4 4 4 4 4 4 4 4
42388 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
42389 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
42390 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
42391 +4 4 4 4 4 4
42392 +4 4 4 5 5 5 4 3 3 4 3 3 6 6 6 6 6 6
42393 +4 0 0 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6
42394 +26 28 28 125 124 125 205 212 215 220 221 221 220 221 221 220 221 221
42395 +205 212 215 220 221 221 205 212 215 220 221 221 220 221 221 244 246 246
42396 +244 246 246 190 197 201 60 74 84 16 19 21 4 0 0 0 0 0
42397 +0 0 0 0 0 0 0 0 0 0 0 0 16 19 21 120 125 127
42398 +177 184 187 220 221 221 205 212 215 177 184 187 174 174 174 177 184 187
42399 +174 174 174 174 174 174 167 166 167 174 174 174 166 165 166 137 136 137
42400 +60 73 81 13 16 17 4 0 0 4 0 0 4 3 3 6 6 6
42401 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
42402 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
42403 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
42404 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
42405 +4 4 4 4 4 4
42406 +5 5 5 4 3 3 5 5 5 4 3 3 6 6 6 4 0 0
42407 +6 6 6 6 6 6 4 0 0 6 6 6 4 0 0 6 6 6
42408 +6 6 6 6 6 6 37 38 37 137 136 137 193 200 203 220 221 221
42409 +220 221 221 205 212 215 220 221 221 205 212 215 205 212 215 220 221 221
42410 +220 221 221 220 221 221 244 246 246 166 165 166 43 57 68 2 2 2
42411 +0 0 0 4 0 0 16 19 21 60 73 81 157 156 157 202 210 214
42412 +220 221 221 193 200 203 177 184 187 177 184 187 177 184 187 174 174 174
42413 +174 174 174 174 174 174 174 174 174 157 156 157 60 74 84 24 26 27
42414 +4 0 0 4 0 0 4 0 0 6 6 6 4 4 4 4 4 4
42415 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
42416 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
42417 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
42418 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
42419 +4 4 4 4 4 4
42420 +4 4 4 4 4 4 5 5 5 4 3 3 5 5 5 6 6 6
42421 +6 6 6 4 0 0 6 6 6 6 6 6 6 6 6 4 0 0
42422 +4 0 0 4 0 0 6 6 6 24 26 27 60 73 81 167 166 167
42423 +220 221 221 220 221 221 220 221 221 205 212 215 205 212 215 205 212 215
42424 +205 212 215 220 221 221 220 221 221 220 221 221 205 212 215 137 136 137
42425 +60 74 84 125 124 125 137 136 137 190 197 201 220 221 221 193 200 203
42426 +177 184 187 177 184 187 177 184 187 174 174 174 174 174 174 177 184 187
42427 +190 197 201 174 174 174 125 124 125 37 38 37 6 6 6 4 0 0
42428 +4 0 0 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
42429 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
42430 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
42431 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
42432 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
42433 +4 4 4 4 4 4
42434 +4 4 4 4 4 4 5 5 5 5 5 5 4 3 3 6 6 6
42435 +4 0 0 6 6 6 6 6 6 6 6 6 4 0 0 6 6 6
42436 +6 6 6 6 6 6 4 0 0 4 0 0 6 6 6 6 6 6
42437 +125 124 125 193 200 203 244 246 246 220 221 221 205 212 215 205 212 215
42438 +205 212 215 193 200 203 205 212 215 205 212 215 220 221 221 220 221 221
42439 +193 200 203 193 200 203 205 212 215 193 200 203 193 200 203 177 184 187
42440 +190 197 201 190 197 201 174 174 174 190 197 201 193 200 203 190 197 201
42441 +153 152 153 60 73 81 4 0 0 4 0 0 4 0 0 3 2 2
42442 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
42443 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
42444 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
42445 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
42446 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
42447 +4 4 4 4 4 4
42448 +4 4 4 4 4 4 4 4 4 4 4 4 5 5 5 4 3 3
42449 +6 6 6 4 3 3 4 3 3 4 3 3 6 6 6 6 6 6
42450 +4 0 0 6 6 6 6 6 6 6 6 6 4 0 0 4 0 0
42451 +4 0 0 26 28 28 131 129 131 220 221 221 244 246 246 220 221 221
42452 +205 212 215 193 200 203 205 212 215 193 200 203 193 200 203 205 212 215
42453 +220 221 221 193 200 203 193 200 203 193 200 203 190 197 201 174 174 174
42454 +174 174 174 190 197 201 193 200 203 193 200 203 167 166 167 125 124 125
42455 +6 6 6 4 0 0 4 0 0 4 3 3 4 4 4 4 4 4
42456 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
42457 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
42458 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
42459 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
42460 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
42461 +4 4 4 4 4 4
42462 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 5 5 5
42463 +5 5 5 4 3 3 5 5 5 6 6 6 4 3 3 5 5 5
42464 +6 6 6 6 6 6 4 0 0 6 6 6 6 6 6 6 6 6
42465 +4 0 0 4 0 0 6 6 6 41 54 63 158 157 158 220 221 221
42466 +220 221 221 220 221 221 193 200 203 193 200 203 193 200 203 190 197 201
42467 +190 197 201 190 197 201 190 197 201 190 197 201 174 174 174 193 200 203
42468 +193 200 203 220 221 221 174 174 174 125 124 125 37 38 37 4 0 0
42469 +4 0 0 4 3 3 6 6 6 4 4 4 4 4 4 4 4 4
42470 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
42471 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
42472 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
42473 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
42474 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
42475 +4 4 4 4 4 4
42476 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
42477 +4 4 4 5 5 5 4 3 3 4 3 3 4 3 3 5 5 5
42478 +4 3 3 6 6 6 5 5 5 4 3 3 6 6 6 6 6 6
42479 +6 6 6 6 6 6 4 0 0 4 0 0 13 16 17 60 73 81
42480 +174 174 174 220 221 221 220 221 221 205 212 215 190 197 201 174 174 174
42481 +193 200 203 174 174 174 190 197 201 174 174 174 193 200 203 220 221 221
42482 +193 200 203 131 129 131 37 38 37 6 6 6 4 0 0 4 0 0
42483 +6 6 6 6 6 6 4 3 3 5 5 5 4 4 4 4 4 4
42484 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
42485 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
42486 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
42487 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
42488 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
42489 +4 4 4 4 4 4
42490 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
42491 +4 4 4 4 4 4 4 4 4 5 5 5 5 5 5 5 5 5
42492 +5 5 5 4 3 3 4 3 3 5 5 5 4 3 3 4 3 3
42493 +5 5 5 6 6 6 6 6 6 4 0 0 6 6 6 6 6 6
42494 +6 6 6 125 124 125 174 174 174 220 221 221 220 221 221 193 200 203
42495 +193 200 203 193 200 203 193 200 203 193 200 203 220 221 221 158 157 158
42496 +60 73 81 6 6 6 4 0 0 4 0 0 5 5 5 6 6 6
42497 +5 5 5 5 5 5 4 4 4 4 4 4 4 4 4 4 4 4
42498 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
42499 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
42500 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
42501 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
42502 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
42503 +4 4 4 4 4 4
42504 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
42505 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
42506 +4 4 4 5 5 5 5 5 5 4 3 3 5 5 5 4 3 3
42507 +5 5 5 5 5 5 6 6 6 6 6 6 4 0 0 4 0 0
42508 +4 0 0 4 0 0 26 28 28 125 124 125 174 174 174 193 200 203
42509 +193 200 203 174 174 174 193 200 203 167 166 167 125 124 125 6 6 6
42510 +6 6 6 6 6 6 4 0 0 6 6 6 6 6 6 5 5 5
42511 +4 3 3 5 5 5 4 4 4 4 4 4 4 4 4 4 4 4
42512 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
42513 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
42514 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
42515 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
42516 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
42517 +4 4 4 4 4 4
42518 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
42519 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
42520 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 5 5 5
42521 +4 3 3 6 6 6 4 0 0 6 6 6 6 6 6 6 6 6
42522 +6 6 6 4 0 0 4 0 0 6 6 6 37 38 37 125 124 125
42523 +153 152 153 131 129 131 125 124 125 37 38 37 6 6 6 6 6 6
42524 +6 6 6 4 0 0 6 6 6 6 6 6 4 3 3 5 5 5
42525 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
42526 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
42527 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
42528 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
42529 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
42530 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
42531 +4 4 4 4 4 4
42532 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
42533 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
42534 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
42535 +4 4 4 5 5 5 5 5 5 4 3 3 5 5 5 4 3 3
42536 +6 6 6 6 6 6 4 0 0 4 0 0 6 6 6 6 6 6
42537 +24 26 27 24 26 27 6 6 6 6 6 6 6 6 6 4 0 0
42538 +6 6 6 6 6 6 4 0 0 6 6 6 5 5 5 4 3 3
42539 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
42540 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
42541 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
42542 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
42543 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
42544 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
42545 +4 4 4 4 4 4
42546 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
42547 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
42548 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
42549 +4 4 4 4 4 4 5 5 5 4 3 3 5 5 5 6 6 6
42550 +4 0 0 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6
42551 +6 6 6 6 6 6 6 6 6 4 0 0 6 6 6 6 6 6
42552 +4 0 0 6 6 6 6 6 6 4 3 3 5 5 5 4 4 4
42553 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
42554 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
42555 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
42556 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
42557 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
42558 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
42559 +4 4 4 4 4 4
42560 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
42561 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
42562 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
42563 +4 4 4 4 4 4 4 4 4 5 5 5 4 3 3 5 5 5
42564 +5 5 5 5 5 5 4 0 0 6 6 6 4 0 0 6 6 6
42565 +6 6 6 6 6 6 6 6 6 4 0 0 6 6 6 4 0 0
42566 +6 6 6 4 3 3 5 5 5 4 3 3 5 5 5 4 4 4
42567 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
42568 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
42569 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
42570 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
42571 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
42572 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
42573 +4 4 4 4 4 4
42574 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
42575 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
42576 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
42577 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 5 5 5
42578 +4 3 3 6 6 6 4 3 3 6 6 6 6 6 6 6 6 6
42579 +4 0 0 6 6 6 4 0 0 6 6 6 6 6 6 6 6 6
42580 +6 6 6 4 3 3 5 5 5 4 4 4 4 4 4 4 4 4
42581 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
42582 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
42583 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
42584 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
42585 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
42586 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
42587 +4 4 4 4 4 4
42588 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
42589 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
42590 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
42591 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
42592 +4 4 4 5 5 5 4 3 3 5 5 5 4 0 0 6 6 6
42593 +6 6 6 4 0 0 6 6 6 6 6 6 4 0 0 6 6 6
42594 +4 3 3 5 5 5 5 5 5 4 4 4 4 4 4 4 4 4
42595 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
42596 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
42597 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
42598 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
42599 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
42600 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
42601 +4 4 4 4 4 4
42602 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
42603 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
42604 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
42605 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
42606 +4 4 4 5 5 5 4 3 3 5 5 5 6 6 6 4 3 3
42607 +4 3 3 6 6 6 6 6 6 4 3 3 6 6 6 4 3 3
42608 +5 5 5 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
42609 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
42610 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
42611 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
42612 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
42613 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
42614 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
42615 +4 4 4 4 4 4
42616 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
42617 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
42618 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
42619 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
42620 +4 4 4 4 4 4 4 4 4 5 5 5 4 3 3 6 6 6
42621 +5 5 5 4 3 3 4 3 3 4 3 3 5 5 5 5 5 5
42622 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
42623 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
42624 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
42625 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
42626 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
42627 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
42628 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
42629 +4 4 4 4 4 4
42630 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
42631 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
42632 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
42633 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
42634 +4 4 4 4 4 4 4 4 4 4 4 4 5 5 5 4 3 3
42635 +5 5 5 4 3 3 5 5 5 5 5 5 4 4 4 4 4 4
42636 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
42637 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
42638 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
42639 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
42640 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
42641 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
42642 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
42643 +4 4 4 4 4 4
42644 diff --git a/drivers/video/udlfb.c b/drivers/video/udlfb.c
42645 index 38fcfff..0072dcd 100644
42646 --- a/drivers/video/udlfb.c
42647 +++ b/drivers/video/udlfb.c
42648 @@ -620,11 +620,11 @@ int dlfb_handle_damage(struct dlfb_data *dev, int x, int y,
42649 dlfb_urb_completion(urb);
42650
42651 error:
42652 - atomic_add(bytes_sent, &dev->bytes_sent);
42653 - atomic_add(bytes_identical, &dev->bytes_identical);
42654 - atomic_add(width*height*2, &dev->bytes_rendered);
42655 + atomic_add_unchecked(bytes_sent, &dev->bytes_sent);
42656 + atomic_add_unchecked(bytes_identical, &dev->bytes_identical);
42657 + atomic_add_unchecked(width*height*2, &dev->bytes_rendered);
42658 end_cycles = get_cycles();
42659 - atomic_add(((unsigned int) ((end_cycles - start_cycles)
42660 + atomic_add_unchecked(((unsigned int) ((end_cycles - start_cycles)
42661 >> 10)), /* Kcycles */
42662 &dev->cpu_kcycles_used);
42663
42664 @@ -745,11 +745,11 @@ static void dlfb_dpy_deferred_io(struct fb_info *info,
42665 dlfb_urb_completion(urb);
42666
42667 error:
42668 - atomic_add(bytes_sent, &dev->bytes_sent);
42669 - atomic_add(bytes_identical, &dev->bytes_identical);
42670 - atomic_add(bytes_rendered, &dev->bytes_rendered);
42671 + atomic_add_unchecked(bytes_sent, &dev->bytes_sent);
42672 + atomic_add_unchecked(bytes_identical, &dev->bytes_identical);
42673 + atomic_add_unchecked(bytes_rendered, &dev->bytes_rendered);
42674 end_cycles = get_cycles();
42675 - atomic_add(((unsigned int) ((end_cycles - start_cycles)
42676 + atomic_add_unchecked(((unsigned int) ((end_cycles - start_cycles)
42677 >> 10)), /* Kcycles */
42678 &dev->cpu_kcycles_used);
42679 }
42680 @@ -1373,7 +1373,7 @@ static ssize_t metrics_bytes_rendered_show(struct device *fbdev,
42681 struct fb_info *fb_info = dev_get_drvdata(fbdev);
42682 struct dlfb_data *dev = fb_info->par;
42683 return snprintf(buf, PAGE_SIZE, "%u\n",
42684 - atomic_read(&dev->bytes_rendered));
42685 + atomic_read_unchecked(&dev->bytes_rendered));
42686 }
42687
42688 static ssize_t metrics_bytes_identical_show(struct device *fbdev,
42689 @@ -1381,7 +1381,7 @@ static ssize_t metrics_bytes_identical_show(struct device *fbdev,
42690 struct fb_info *fb_info = dev_get_drvdata(fbdev);
42691 struct dlfb_data *dev = fb_info->par;
42692 return snprintf(buf, PAGE_SIZE, "%u\n",
42693 - atomic_read(&dev->bytes_identical));
42694 + atomic_read_unchecked(&dev->bytes_identical));
42695 }
42696
42697 static ssize_t metrics_bytes_sent_show(struct device *fbdev,
42698 @@ -1389,7 +1389,7 @@ static ssize_t metrics_bytes_sent_show(struct device *fbdev,
42699 struct fb_info *fb_info = dev_get_drvdata(fbdev);
42700 struct dlfb_data *dev = fb_info->par;
42701 return snprintf(buf, PAGE_SIZE, "%u\n",
42702 - atomic_read(&dev->bytes_sent));
42703 + atomic_read_unchecked(&dev->bytes_sent));
42704 }
42705
42706 static ssize_t metrics_cpu_kcycles_used_show(struct device *fbdev,
42707 @@ -1397,7 +1397,7 @@ static ssize_t metrics_cpu_kcycles_used_show(struct device *fbdev,
42708 struct fb_info *fb_info = dev_get_drvdata(fbdev);
42709 struct dlfb_data *dev = fb_info->par;
42710 return snprintf(buf, PAGE_SIZE, "%u\n",
42711 - atomic_read(&dev->cpu_kcycles_used));
42712 + atomic_read_unchecked(&dev->cpu_kcycles_used));
42713 }
42714
42715 static ssize_t edid_show(
42716 @@ -1457,10 +1457,10 @@ static ssize_t metrics_reset_store(struct device *fbdev,
42717 struct fb_info *fb_info = dev_get_drvdata(fbdev);
42718 struct dlfb_data *dev = fb_info->par;
42719
42720 - atomic_set(&dev->bytes_rendered, 0);
42721 - atomic_set(&dev->bytes_identical, 0);
42722 - atomic_set(&dev->bytes_sent, 0);
42723 - atomic_set(&dev->cpu_kcycles_used, 0);
42724 + atomic_set_unchecked(&dev->bytes_rendered, 0);
42725 + atomic_set_unchecked(&dev->bytes_identical, 0);
42726 + atomic_set_unchecked(&dev->bytes_sent, 0);
42727 + atomic_set_unchecked(&dev->cpu_kcycles_used, 0);
42728
42729 return count;
42730 }
42731 diff --git a/drivers/video/uvesafb.c b/drivers/video/uvesafb.c
42732 index b0e2a42..e2df3ad 100644
42733 --- a/drivers/video/uvesafb.c
42734 +++ b/drivers/video/uvesafb.c
42735 @@ -19,6 +19,7 @@
42736 #include <linux/io.h>
42737 #include <linux/mutex.h>
42738 #include <linux/slab.h>
42739 +#include <linux/moduleloader.h>
42740 #include <video/edid.h>
42741 #include <video/uvesafb.h>
42742 #ifdef CONFIG_X86
42743 @@ -569,10 +570,32 @@ static int __devinit uvesafb_vbe_getpmi(struct uvesafb_ktask *task,
42744 if ((task->t.regs.eax & 0xffff) != 0x4f || task->t.regs.es < 0xc000) {
42745 par->pmi_setpal = par->ypan = 0;
42746 } else {
42747 +
42748 +#ifdef CONFIG_PAX_KERNEXEC
42749 +#ifdef CONFIG_MODULES
42750 + par->pmi_code = module_alloc_exec((u16)task->t.regs.ecx);
42751 +#endif
42752 + if (!par->pmi_code) {
42753 + par->pmi_setpal = par->ypan = 0;
42754 + return 0;
42755 + }
42756 +#endif
42757 +
42758 par->pmi_base = (u16 *)phys_to_virt(((u32)task->t.regs.es << 4)
42759 + task->t.regs.edi);
42760 +
42761 +#if defined(CONFIG_MODULES) && defined(CONFIG_PAX_KERNEXEC)
42762 + pax_open_kernel();
42763 + memcpy(par->pmi_code, par->pmi_base, (u16)task->t.regs.ecx);
42764 + pax_close_kernel();
42765 +
42766 + par->pmi_start = ktva_ktla(par->pmi_code + par->pmi_base[1]);
42767 + par->pmi_pal = ktva_ktla(par->pmi_code + par->pmi_base[2]);
42768 +#else
42769 par->pmi_start = (u8 *)par->pmi_base + par->pmi_base[1];
42770 par->pmi_pal = (u8 *)par->pmi_base + par->pmi_base[2];
42771 +#endif
42772 +
42773 printk(KERN_INFO "uvesafb: protected mode interface info at "
42774 "%04x:%04x\n",
42775 (u16)task->t.regs.es, (u16)task->t.regs.edi);
42776 @@ -816,13 +839,14 @@ static int __devinit uvesafb_vbe_init(struct fb_info *info)
42777 par->ypan = ypan;
42778
42779 if (par->pmi_setpal || par->ypan) {
42780 +#if !defined(CONFIG_MODULES) || !defined(CONFIG_PAX_KERNEXEC)
42781 if (__supported_pte_mask & _PAGE_NX) {
42782 par->pmi_setpal = par->ypan = 0;
42783 printk(KERN_WARNING "uvesafb: NX protection is actively."
42784 "We have better not to use the PMI.\n");
42785 - } else {
42786 + } else
42787 +#endif
42788 uvesafb_vbe_getpmi(task, par);
42789 - }
42790 }
42791 #else
42792 /* The protected mode interface is not available on non-x86. */
42793 @@ -1836,6 +1860,11 @@ out:
42794 if (par->vbe_modes)
42795 kfree(par->vbe_modes);
42796
42797 +#if defined(CONFIG_MODULES) && defined(CONFIG_PAX_KERNEXEC)
42798 + if (par->pmi_code)
42799 + module_free_exec(NULL, par->pmi_code);
42800 +#endif
42801 +
42802 framebuffer_release(info);
42803 return err;
42804 }
42805 @@ -1862,6 +1891,12 @@ static int uvesafb_remove(struct platform_device *dev)
42806 kfree(par->vbe_state_orig);
42807 if (par->vbe_state_saved)
42808 kfree(par->vbe_state_saved);
42809 +
42810 +#if defined(CONFIG_MODULES) && defined(CONFIG_PAX_KERNEXEC)
42811 + if (par->pmi_code)
42812 + module_free_exec(NULL, par->pmi_code);
42813 +#endif
42814 +
42815 }
42816
42817 framebuffer_release(info);
42818 diff --git a/drivers/video/vesafb.c b/drivers/video/vesafb.c
42819 index 501b340..86bd4cf 100644
42820 --- a/drivers/video/vesafb.c
42821 +++ b/drivers/video/vesafb.c
42822 @@ -9,6 +9,7 @@
42823 */
42824
42825 #include <linux/module.h>
42826 +#include <linux/moduleloader.h>
42827 #include <linux/kernel.h>
42828 #include <linux/errno.h>
42829 #include <linux/string.h>
42830 @@ -52,8 +53,8 @@ static int vram_remap __initdata; /* Set amount of memory to be used */
42831 static int vram_total __initdata; /* Set total amount of memory */
42832 static int pmi_setpal __read_mostly = 1; /* pmi for palette changes ??? */
42833 static int ypan __read_mostly; /* 0..nothing, 1..ypan, 2..ywrap */
42834 -static void (*pmi_start)(void) __read_mostly;
42835 -static void (*pmi_pal) (void) __read_mostly;
42836 +static void (*pmi_start)(void) __read_only;
42837 +static void (*pmi_pal) (void) __read_only;
42838 static int depth __read_mostly;
42839 static int vga_compat __read_mostly;
42840 /* --------------------------------------------------------------------- */
42841 @@ -233,6 +234,7 @@ static int __init vesafb_probe(struct platform_device *dev)
42842 unsigned int size_vmode;
42843 unsigned int size_remap;
42844 unsigned int size_total;
42845 + void *pmi_code = NULL;
42846
42847 if (screen_info.orig_video_isVGA != VIDEO_TYPE_VLFB)
42848 return -ENODEV;
42849 @@ -275,10 +277,6 @@ static int __init vesafb_probe(struct platform_device *dev)
42850 size_remap = size_total;
42851 vesafb_fix.smem_len = size_remap;
42852
42853 -#ifndef __i386__
42854 - screen_info.vesapm_seg = 0;
42855 -#endif
42856 -
42857 if (!request_mem_region(vesafb_fix.smem_start, size_total, "vesafb")) {
42858 printk(KERN_WARNING
42859 "vesafb: cannot reserve video memory at 0x%lx\n",
42860 @@ -307,9 +305,21 @@ static int __init vesafb_probe(struct platform_device *dev)
42861 printk(KERN_INFO "vesafb: mode is %dx%dx%d, linelength=%d, pages=%d\n",
42862 vesafb_defined.xres, vesafb_defined.yres, vesafb_defined.bits_per_pixel, vesafb_fix.line_length, screen_info.pages);
42863
42864 +#ifdef __i386__
42865 +
42866 +#if defined(CONFIG_MODULES) && defined(CONFIG_PAX_KERNEXEC)
42867 + pmi_code = module_alloc_exec(screen_info.vesapm_size);
42868 + if (!pmi_code)
42869 +#elif !defined(CONFIG_PAX_KERNEXEC)
42870 + if (0)
42871 +#endif
42872 +
42873 +#endif
42874 + screen_info.vesapm_seg = 0;
42875 +
42876 if (screen_info.vesapm_seg) {
42877 - printk(KERN_INFO "vesafb: protected mode interface info at %04x:%04x\n",
42878 - screen_info.vesapm_seg,screen_info.vesapm_off);
42879 + printk(KERN_INFO "vesafb: protected mode interface info at %04x:%04x %04x bytes\n",
42880 + screen_info.vesapm_seg,screen_info.vesapm_off,screen_info.vesapm_size);
42881 }
42882
42883 if (screen_info.vesapm_seg < 0xc000)
42884 @@ -317,9 +327,25 @@ static int __init vesafb_probe(struct platform_device *dev)
42885
42886 if (ypan || pmi_setpal) {
42887 unsigned short *pmi_base;
42888 +
42889 pmi_base = (unsigned short*)phys_to_virt(((unsigned long)screen_info.vesapm_seg << 4) + screen_info.vesapm_off);
42890 - pmi_start = (void*)((char*)pmi_base + pmi_base[1]);
42891 - pmi_pal = (void*)((char*)pmi_base + pmi_base[2]);
42892 +
42893 +#if defined(CONFIG_MODULES) && defined(CONFIG_PAX_KERNEXEC)
42894 + pax_open_kernel();
42895 + memcpy(pmi_code, pmi_base, screen_info.vesapm_size);
42896 +#else
42897 + pmi_code = pmi_base;
42898 +#endif
42899 +
42900 + pmi_start = (void*)((char*)pmi_code + pmi_base[1]);
42901 + pmi_pal = (void*)((char*)pmi_code + pmi_base[2]);
42902 +
42903 +#if defined(CONFIG_MODULES) && defined(CONFIG_PAX_KERNEXEC)
42904 + pmi_start = ktva_ktla(pmi_start);
42905 + pmi_pal = ktva_ktla(pmi_pal);
42906 + pax_close_kernel();
42907 +#endif
42908 +
42909 printk(KERN_INFO "vesafb: pmi: set display start = %p, set palette = %p\n",pmi_start,pmi_pal);
42910 if (pmi_base[3]) {
42911 printk(KERN_INFO "vesafb: pmi: ports = ");
42912 @@ -488,6 +514,11 @@ static int __init vesafb_probe(struct platform_device *dev)
42913 info->node, info->fix.id);
42914 return 0;
42915 err:
42916 +
42917 +#if defined(__i386__) && defined(CONFIG_MODULES) && defined(CONFIG_PAX_KERNEXEC)
42918 + module_free_exec(NULL, pmi_code);
42919 +#endif
42920 +
42921 if (info->screen_base)
42922 iounmap(info->screen_base);
42923 framebuffer_release(info);
42924 diff --git a/drivers/video/via/via_clock.h b/drivers/video/via/via_clock.h
42925 index 88714ae..16c2e11 100644
42926 --- a/drivers/video/via/via_clock.h
42927 +++ b/drivers/video/via/via_clock.h
42928 @@ -56,7 +56,7 @@ struct via_clock {
42929
42930 void (*set_engine_pll_state)(u8 state);
42931 void (*set_engine_pll)(struct via_pll_config config);
42932 -};
42933 +} __no_const;
42934
42935
42936 static inline u32 get_pll_internal_frequency(u32 ref_freq,
42937 diff --git a/drivers/virtio/virtio_mmio.c b/drivers/virtio/virtio_mmio.c
42938 index 453db0c..604973e 100644
42939 --- a/drivers/virtio/virtio_mmio.c
42940 +++ b/drivers/virtio/virtio_mmio.c
42941 @@ -521,7 +521,7 @@ static int vm_cmdline_set(const char *device,
42942
42943 resources[0].end = memparse(device, &str) - 1;
42944
42945 - processed = sscanf(str, "@%lli:%u%n:%d%n",
42946 + processed = sscanf(str, "@%lli:%llu%n:%d%n",
42947 &base, &resources[1].start, &consumed,
42948 &vm_cmdline_id, &consumed);
42949
42950 diff --git a/drivers/xen/xen-pciback/conf_space.h b/drivers/xen/xen-pciback/conf_space.h
42951 index e56c934..fc22f4b 100644
42952 --- a/drivers/xen/xen-pciback/conf_space.h
42953 +++ b/drivers/xen/xen-pciback/conf_space.h
42954 @@ -44,15 +44,15 @@ struct config_field {
42955 struct {
42956 conf_dword_write write;
42957 conf_dword_read read;
42958 - } dw;
42959 + } __no_const dw;
42960 struct {
42961 conf_word_write write;
42962 conf_word_read read;
42963 - } w;
42964 + } __no_const w;
42965 struct {
42966 conf_byte_write write;
42967 conf_byte_read read;
42968 - } b;
42969 + } __no_const b;
42970 } u;
42971 struct list_head list;
42972 };
42973 diff --git a/drivers/xen/xenbus/xenbus_dev_frontend.c b/drivers/xen/xenbus/xenbus_dev_frontend.c
42974 index 89f7625..ac72702 100644
42975 --- a/drivers/xen/xenbus/xenbus_dev_frontend.c
42976 +++ b/drivers/xen/xenbus/xenbus_dev_frontend.c
42977 @@ -458,7 +458,7 @@ static ssize_t xenbus_file_write(struct file *filp,
42978 goto out;
42979
42980 /* Can't write a xenbus message larger we can buffer */
42981 - if ((len + u->len) > sizeof(u->u.buffer)) {
42982 + if (len > sizeof(u->u.buffer) - u->len) {
42983 /* On error, dump existing buffer */
42984 u->len = 0;
42985 rc = -EINVAL;
42986 diff --git a/drivers/xen/xenfs/xenstored.c b/drivers/xen/xenfs/xenstored.c
42987 index fef20db..d28b1ab 100644
42988 --- a/drivers/xen/xenfs/xenstored.c
42989 +++ b/drivers/xen/xenfs/xenstored.c
42990 @@ -24,7 +24,12 @@ static int xsd_release(struct inode *inode, struct file *file)
42991 static int xsd_kva_open(struct inode *inode, struct file *file)
42992 {
42993 file->private_data = (void *)kasprintf(GFP_KERNEL, "0x%p",
42994 +#ifdef CONFIG_GRKERNSEC_HIDESYM
42995 + NULL);
42996 +#else
42997 xen_store_interface);
42998 +#endif
42999 +
43000 if (!file->private_data)
43001 return -ENOMEM;
43002 return 0;
43003 diff --git a/fs/9p/vfs_inode.c b/fs/9p/vfs_inode.c
43004 index cbf9dbb..35c3af7 100644
43005 --- a/fs/9p/vfs_inode.c
43006 +++ b/fs/9p/vfs_inode.c
43007 @@ -1329,7 +1329,7 @@ static void *v9fs_vfs_follow_link(struct dentry *dentry, struct nameidata *nd)
43008 void
43009 v9fs_vfs_put_link(struct dentry *dentry, struct nameidata *nd, void *p)
43010 {
43011 - char *s = nd_get_link(nd);
43012 + const char *s = nd_get_link(nd);
43013
43014 p9_debug(P9_DEBUG_VFS, " %s %s\n",
43015 dentry->d_name.name, IS_ERR(s) ? "<error>" : s);
43016 diff --git a/fs/Kconfig.binfmt b/fs/Kconfig.binfmt
43017 index 0225742..1cd4732 100644
43018 --- a/fs/Kconfig.binfmt
43019 +++ b/fs/Kconfig.binfmt
43020 @@ -89,7 +89,7 @@ config HAVE_AOUT
43021
43022 config BINFMT_AOUT
43023 tristate "Kernel support for a.out and ECOFF binaries"
43024 - depends on HAVE_AOUT
43025 + depends on HAVE_AOUT && BROKEN
43026 ---help---
43027 A.out (Assembler.OUTput) is a set of formats for libraries and
43028 executables used in the earliest versions of UNIX. Linux used
43029 diff --git a/fs/aio.c b/fs/aio.c
43030 index 71f613c..9d01f1f 100644
43031 --- a/fs/aio.c
43032 +++ b/fs/aio.c
43033 @@ -111,7 +111,7 @@ static int aio_setup_ring(struct kioctx *ctx)
43034 size += sizeof(struct io_event) * nr_events;
43035 nr_pages = (size + PAGE_SIZE-1) >> PAGE_SHIFT;
43036
43037 - if (nr_pages < 0)
43038 + if (nr_pages <= 0)
43039 return -EINVAL;
43040
43041 nr_events = (PAGE_SIZE * nr_pages - sizeof(struct aio_ring)) / sizeof(struct io_event);
43042 @@ -1373,18 +1373,19 @@ static ssize_t aio_fsync(struct kiocb *iocb)
43043 static ssize_t aio_setup_vectored_rw(int type, struct kiocb *kiocb, bool compat)
43044 {
43045 ssize_t ret;
43046 + struct iovec iovstack;
43047
43048 #ifdef CONFIG_COMPAT
43049 if (compat)
43050 ret = compat_rw_copy_check_uvector(type,
43051 (struct compat_iovec __user *)kiocb->ki_buf,
43052 - kiocb->ki_nbytes, 1, &kiocb->ki_inline_vec,
43053 + kiocb->ki_nbytes, 1, &iovstack,
43054 &kiocb->ki_iovec);
43055 else
43056 #endif
43057 ret = rw_copy_check_uvector(type,
43058 (struct iovec __user *)kiocb->ki_buf,
43059 - kiocb->ki_nbytes, 1, &kiocb->ki_inline_vec,
43060 + kiocb->ki_nbytes, 1, &iovstack,
43061 &kiocb->ki_iovec);
43062 if (ret < 0)
43063 goto out;
43064 @@ -1393,6 +1394,10 @@ static ssize_t aio_setup_vectored_rw(int type, struct kiocb *kiocb, bool compat)
43065 if (ret < 0)
43066 goto out;
43067
43068 + if (kiocb->ki_iovec == &iovstack) {
43069 + kiocb->ki_inline_vec = iovstack;
43070 + kiocb->ki_iovec = &kiocb->ki_inline_vec;
43071 + }
43072 kiocb->ki_nr_segs = kiocb->ki_nbytes;
43073 kiocb->ki_cur_seg = 0;
43074 /* ki_nbytes/left now reflect bytes instead of segs */
43075 diff --git a/fs/attr.c b/fs/attr.c
43076 index 29e38a1..2bc037b 100644
43077 --- a/fs/attr.c
43078 +++ b/fs/attr.c
43079 @@ -99,6 +99,7 @@ int inode_newsize_ok(const struct inode *inode, loff_t offset)
43080 unsigned long limit;
43081
43082 limit = rlimit(RLIMIT_FSIZE);
43083 + gr_learn_resource(current, RLIMIT_FSIZE, (unsigned long)offset, 1);
43084 if (limit != RLIM_INFINITY && offset > limit)
43085 goto out_sig;
43086 if (offset > inode->i_sb->s_maxbytes)
43087 diff --git a/fs/autofs4/waitq.c b/fs/autofs4/waitq.c
43088 index da8876d..4456166 100644
43089 --- a/fs/autofs4/waitq.c
43090 +++ b/fs/autofs4/waitq.c
43091 @@ -61,7 +61,7 @@ static int autofs4_write(struct autofs_sb_info *sbi,
43092 {
43093 unsigned long sigpipe, flags;
43094 mm_segment_t fs;
43095 - const char *data = (const char *)addr;
43096 + const char __user *data = (const char __force_user *)addr;
43097 ssize_t wr = 0;
43098
43099 sigpipe = sigismember(&current->pending.signal, SIGPIPE);
43100 @@ -348,6 +348,10 @@ static int validate_request(struct autofs_wait_queue **wait,
43101 return 1;
43102 }
43103
43104 +#ifdef CONFIG_GRKERNSEC_HIDESYM
43105 +static atomic_unchecked_t autofs_dummy_name_id = ATOMIC_INIT(0);
43106 +#endif
43107 +
43108 int autofs4_wait(struct autofs_sb_info *sbi, struct dentry *dentry,
43109 enum autofs_notify notify)
43110 {
43111 @@ -381,7 +385,12 @@ int autofs4_wait(struct autofs_sb_info *sbi, struct dentry *dentry,
43112
43113 /* If this is a direct mount request create a dummy name */
43114 if (IS_ROOT(dentry) && autofs_type_trigger(sbi->type))
43115 +#ifdef CONFIG_GRKERNSEC_HIDESYM
43116 + /* this name does get written to userland via autofs4_write() */
43117 + qstr.len = sprintf(name, "%08lx", atomic_inc_return_unchecked(&autofs_dummy_name_id));
43118 +#else
43119 qstr.len = sprintf(name, "%p", dentry);
43120 +#endif
43121 else {
43122 qstr.len = autofs4_getpath(sbi, dentry, &name);
43123 if (!qstr.len) {
43124 diff --git a/fs/befs/linuxvfs.c b/fs/befs/linuxvfs.c
43125 index cf7f3c6..f61080d 100644
43126 --- a/fs/befs/linuxvfs.c
43127 +++ b/fs/befs/linuxvfs.c
43128 @@ -502,7 +502,7 @@ static void befs_put_link(struct dentry *dentry, struct nameidata *nd, void *p)
43129 {
43130 befs_inode_info *befs_ino = BEFS_I(dentry->d_inode);
43131 if (befs_ino->i_flags & BEFS_LONG_SYMLINK) {
43132 - char *link = nd_get_link(nd);
43133 + const char *link = nd_get_link(nd);
43134 if (!IS_ERR(link))
43135 kfree(link);
43136 }
43137 diff --git a/fs/binfmt_aout.c b/fs/binfmt_aout.c
43138 index d146e18..12d1bd1 100644
43139 --- a/fs/binfmt_aout.c
43140 +++ b/fs/binfmt_aout.c
43141 @@ -16,6 +16,7 @@
43142 #include <linux/string.h>
43143 #include <linux/fs.h>
43144 #include <linux/file.h>
43145 +#include <linux/security.h>
43146 #include <linux/stat.h>
43147 #include <linux/fcntl.h>
43148 #include <linux/ptrace.h>
43149 @@ -83,6 +84,8 @@ static int aout_core_dump(struct coredump_params *cprm)
43150 #endif
43151 # define START_STACK(u) ((void __user *)u.start_stack)
43152
43153 + memset(&dump, 0, sizeof(dump));
43154 +
43155 fs = get_fs();
43156 set_fs(KERNEL_DS);
43157 has_dumped = 1;
43158 @@ -94,10 +97,12 @@ static int aout_core_dump(struct coredump_params *cprm)
43159
43160 /* If the size of the dump file exceeds the rlimit, then see what would happen
43161 if we wrote the stack, but not the data area. */
43162 + gr_learn_resource(current, RLIMIT_CORE, (dump.u_dsize + dump.u_ssize+1) * PAGE_SIZE, 1);
43163 if ((dump.u_dsize + dump.u_ssize+1) * PAGE_SIZE > cprm->limit)
43164 dump.u_dsize = 0;
43165
43166 /* Make sure we have enough room to write the stack and data areas. */
43167 + gr_learn_resource(current, RLIMIT_CORE, (dump.u_ssize + 1) * PAGE_SIZE, 1);
43168 if ((dump.u_ssize + 1) * PAGE_SIZE > cprm->limit)
43169 dump.u_ssize = 0;
43170
43171 @@ -231,6 +236,8 @@ static int load_aout_binary(struct linux_binprm * bprm, struct pt_regs * regs)
43172 rlim = rlimit(RLIMIT_DATA);
43173 if (rlim >= RLIM_INFINITY)
43174 rlim = ~0;
43175 +
43176 + gr_learn_resource(current, RLIMIT_DATA, ex.a_data + ex.a_bss, 1);
43177 if (ex.a_data + ex.a_bss > rlim)
43178 return -ENOMEM;
43179
43180 @@ -265,6 +272,27 @@ static int load_aout_binary(struct linux_binprm * bprm, struct pt_regs * regs)
43181
43182 install_exec_creds(bprm);
43183
43184 +#if defined(CONFIG_PAX_NOEXEC) || defined(CONFIG_PAX_ASLR)
43185 + current->mm->pax_flags = 0UL;
43186 +#endif
43187 +
43188 +#ifdef CONFIG_PAX_PAGEEXEC
43189 + if (!(N_FLAGS(ex) & F_PAX_PAGEEXEC)) {
43190 + current->mm->pax_flags |= MF_PAX_PAGEEXEC;
43191 +
43192 +#ifdef CONFIG_PAX_EMUTRAMP
43193 + if (N_FLAGS(ex) & F_PAX_EMUTRAMP)
43194 + current->mm->pax_flags |= MF_PAX_EMUTRAMP;
43195 +#endif
43196 +
43197 +#ifdef CONFIG_PAX_MPROTECT
43198 + if (!(N_FLAGS(ex) & F_PAX_MPROTECT))
43199 + current->mm->pax_flags |= MF_PAX_MPROTECT;
43200 +#endif
43201 +
43202 + }
43203 +#endif
43204 +
43205 if (N_MAGIC(ex) == OMAGIC) {
43206 unsigned long text_addr, map_size;
43207 loff_t pos;
43208 @@ -330,7 +358,7 @@ static int load_aout_binary(struct linux_binprm * bprm, struct pt_regs * regs)
43209 }
43210
43211 error = vm_mmap(bprm->file, N_DATADDR(ex), ex.a_data,
43212 - PROT_READ | PROT_WRITE | PROT_EXEC,
43213 + PROT_READ | PROT_WRITE,
43214 MAP_FIXED | MAP_PRIVATE | MAP_DENYWRITE | MAP_EXECUTABLE,
43215 fd_offset + ex.a_text);
43216 if (error != N_DATADDR(ex)) {
43217 diff --git a/fs/binfmt_elf.c b/fs/binfmt_elf.c
43218 index 0225fdd..0c0d35d 100644
43219 --- a/fs/binfmt_elf.c
43220 +++ b/fs/binfmt_elf.c
43221 @@ -32,6 +32,7 @@
43222 #include <linux/elf.h>
43223 #include <linux/utsname.h>
43224 #include <linux/coredump.h>
43225 +#include <linux/xattr.h>
43226 #include <asm/uaccess.h>
43227 #include <asm/param.h>
43228 #include <asm/page.h>
43229 @@ -52,6 +53,10 @@ static int elf_core_dump(struct coredump_params *cprm);
43230 #define elf_core_dump NULL
43231 #endif
43232
43233 +#ifdef CONFIG_PAX_MPROTECT
43234 +static void elf_handle_mprotect(struct vm_area_struct *vma, unsigned long newflags);
43235 +#endif
43236 +
43237 #if ELF_EXEC_PAGESIZE > PAGE_SIZE
43238 #define ELF_MIN_ALIGN ELF_EXEC_PAGESIZE
43239 #else
43240 @@ -71,6 +76,11 @@ static struct linux_binfmt elf_format = {
43241 .load_binary = load_elf_binary,
43242 .load_shlib = load_elf_library,
43243 .core_dump = elf_core_dump,
43244 +
43245 +#ifdef CONFIG_PAX_MPROTECT
43246 + .handle_mprotect= elf_handle_mprotect,
43247 +#endif
43248 +
43249 .min_coredump = ELF_EXEC_PAGESIZE,
43250 };
43251
43252 @@ -78,6 +88,8 @@ static struct linux_binfmt elf_format = {
43253
43254 static int set_brk(unsigned long start, unsigned long end)
43255 {
43256 + unsigned long e = end;
43257 +
43258 start = ELF_PAGEALIGN(start);
43259 end = ELF_PAGEALIGN(end);
43260 if (end > start) {
43261 @@ -86,7 +98,7 @@ static int set_brk(unsigned long start, unsigned long end)
43262 if (BAD_ADDR(addr))
43263 return addr;
43264 }
43265 - current->mm->start_brk = current->mm->brk = end;
43266 + current->mm->start_brk = current->mm->brk = e;
43267 return 0;
43268 }
43269
43270 @@ -147,12 +159,13 @@ create_elf_tables(struct linux_binprm *bprm, struct elfhdr *exec,
43271 elf_addr_t __user *u_rand_bytes;
43272 const char *k_platform = ELF_PLATFORM;
43273 const char *k_base_platform = ELF_BASE_PLATFORM;
43274 - unsigned char k_rand_bytes[16];
43275 + u32 k_rand_bytes[4];
43276 int items;
43277 elf_addr_t *elf_info;
43278 int ei_index = 0;
43279 const struct cred *cred = current_cred();
43280 struct vm_area_struct *vma;
43281 + unsigned long saved_auxv[AT_VECTOR_SIZE];
43282
43283 /*
43284 * In some cases (e.g. Hyper-Threading), we want to avoid L1
43285 @@ -194,8 +207,12 @@ create_elf_tables(struct linux_binprm *bprm, struct elfhdr *exec,
43286 * Generate 16 random bytes for userspace PRNG seeding.
43287 */
43288 get_random_bytes(k_rand_bytes, sizeof(k_rand_bytes));
43289 - u_rand_bytes = (elf_addr_t __user *)
43290 - STACK_ALLOC(p, sizeof(k_rand_bytes));
43291 + srandom32(k_rand_bytes[0] ^ random32());
43292 + srandom32(k_rand_bytes[1] ^ random32());
43293 + srandom32(k_rand_bytes[2] ^ random32());
43294 + srandom32(k_rand_bytes[3] ^ random32());
43295 + p = STACK_ROUND(p, sizeof(k_rand_bytes));
43296 + u_rand_bytes = (elf_addr_t __user *) p;
43297 if (__copy_to_user(u_rand_bytes, k_rand_bytes, sizeof(k_rand_bytes)))
43298 return -EFAULT;
43299
43300 @@ -307,9 +324,11 @@ create_elf_tables(struct linux_binprm *bprm, struct elfhdr *exec,
43301 return -EFAULT;
43302 current->mm->env_end = p;
43303
43304 + memcpy(saved_auxv, elf_info, ei_index * sizeof(elf_addr_t));
43305 +
43306 /* Put the elf_info on the stack in the right place. */
43307 sp = (elf_addr_t __user *)envp + 1;
43308 - if (copy_to_user(sp, elf_info, ei_index * sizeof(elf_addr_t)))
43309 + if (copy_to_user(sp, saved_auxv, ei_index * sizeof(elf_addr_t)))
43310 return -EFAULT;
43311 return 0;
43312 }
43313 @@ -373,15 +392,14 @@ static unsigned long total_mapping_size(struct elf_phdr *cmds, int nr)
43314 an ELF header */
43315
43316 static unsigned long load_elf_interp(struct elfhdr *interp_elf_ex,
43317 - struct file *interpreter, unsigned long *interp_map_addr,
43318 - unsigned long no_base)
43319 + struct file *interpreter, unsigned long no_base)
43320 {
43321 struct elf_phdr *elf_phdata;
43322 struct elf_phdr *eppnt;
43323 - unsigned long load_addr = 0;
43324 + unsigned long load_addr = 0, pax_task_size = TASK_SIZE;
43325 int load_addr_set = 0;
43326 unsigned long last_bss = 0, elf_bss = 0;
43327 - unsigned long error = ~0UL;
43328 + unsigned long error = -EINVAL;
43329 unsigned long total_size;
43330 int retval, i, size;
43331
43332 @@ -427,6 +445,11 @@ static unsigned long load_elf_interp(struct elfhdr *interp_elf_ex,
43333 goto out_close;
43334 }
43335
43336 +#ifdef CONFIG_PAX_SEGMEXEC
43337 + if (current->mm->pax_flags & MF_PAX_SEGMEXEC)
43338 + pax_task_size = SEGMEXEC_TASK_SIZE;
43339 +#endif
43340 +
43341 eppnt = elf_phdata;
43342 for (i = 0; i < interp_elf_ex->e_phnum; i++, eppnt++) {
43343 if (eppnt->p_type == PT_LOAD) {
43344 @@ -450,8 +473,6 @@ static unsigned long load_elf_interp(struct elfhdr *interp_elf_ex,
43345 map_addr = elf_map(interpreter, load_addr + vaddr,
43346 eppnt, elf_prot, elf_type, total_size);
43347 total_size = 0;
43348 - if (!*interp_map_addr)
43349 - *interp_map_addr = map_addr;
43350 error = map_addr;
43351 if (BAD_ADDR(map_addr))
43352 goto out_close;
43353 @@ -470,8 +491,8 @@ static unsigned long load_elf_interp(struct elfhdr *interp_elf_ex,
43354 k = load_addr + eppnt->p_vaddr;
43355 if (BAD_ADDR(k) ||
43356 eppnt->p_filesz > eppnt->p_memsz ||
43357 - eppnt->p_memsz > TASK_SIZE ||
43358 - TASK_SIZE - eppnt->p_memsz < k) {
43359 + eppnt->p_memsz > pax_task_size ||
43360 + pax_task_size - eppnt->p_memsz < k) {
43361 error = -ENOMEM;
43362 goto out_close;
43363 }
43364 @@ -523,6 +544,315 @@ out:
43365 return error;
43366 }
43367
43368 +#ifdef CONFIG_PAX_PT_PAX_FLAGS
43369 +#ifdef CONFIG_PAX_SOFTMODE
43370 +static unsigned long pax_parse_pt_pax_softmode(const struct elf_phdr * const elf_phdata)
43371 +{
43372 + unsigned long pax_flags = 0UL;
43373 +
43374 +#ifdef CONFIG_PAX_PAGEEXEC
43375 + if (elf_phdata->p_flags & PF_PAGEEXEC)
43376 + pax_flags |= MF_PAX_PAGEEXEC;
43377 +#endif
43378 +
43379 +#ifdef CONFIG_PAX_SEGMEXEC
43380 + if (elf_phdata->p_flags & PF_SEGMEXEC)
43381 + pax_flags |= MF_PAX_SEGMEXEC;
43382 +#endif
43383 +
43384 +#ifdef CONFIG_PAX_EMUTRAMP
43385 + if ((elf_phdata->p_flags & PF_EMUTRAMP) && (pax_flags & (MF_PAX_PAGEEXEC | MF_PAX_SEGMEXEC)))
43386 + pax_flags |= MF_PAX_EMUTRAMP;
43387 +#endif
43388 +
43389 +#ifdef CONFIG_PAX_MPROTECT
43390 + if (elf_phdata->p_flags & PF_MPROTECT)
43391 + pax_flags |= MF_PAX_MPROTECT;
43392 +#endif
43393 +
43394 +#if defined(CONFIG_PAX_RANDMMAP) || defined(CONFIG_PAX_RANDUSTACK)
43395 + if (randomize_va_space && (elf_phdata->p_flags & PF_RANDMMAP))
43396 + pax_flags |= MF_PAX_RANDMMAP;
43397 +#endif
43398 +
43399 + return pax_flags;
43400 +}
43401 +#endif
43402 +
43403 +static unsigned long pax_parse_pt_pax_hardmode(const struct elf_phdr * const elf_phdata)
43404 +{
43405 + unsigned long pax_flags = 0UL;
43406 +
43407 +#ifdef CONFIG_PAX_PAGEEXEC
43408 + if (!(elf_phdata->p_flags & PF_NOPAGEEXEC))
43409 + pax_flags |= MF_PAX_PAGEEXEC;
43410 +#endif
43411 +
43412 +#ifdef CONFIG_PAX_SEGMEXEC
43413 + if (!(elf_phdata->p_flags & PF_NOSEGMEXEC))
43414 + pax_flags |= MF_PAX_SEGMEXEC;
43415 +#endif
43416 +
43417 +#ifdef CONFIG_PAX_EMUTRAMP
43418 + if (!(elf_phdata->p_flags & PF_NOEMUTRAMP))
43419 + pax_flags |= MF_PAX_EMUTRAMP;
43420 +#endif
43421 +
43422 +#ifdef CONFIG_PAX_MPROTECT
43423 + if (!(elf_phdata->p_flags & PF_NOMPROTECT))
43424 + pax_flags |= MF_PAX_MPROTECT;
43425 +#endif
43426 +
43427 +#if defined(CONFIG_PAX_RANDMMAP) || defined(CONFIG_PAX_RANDUSTACK)
43428 + if (randomize_va_space && !(elf_phdata->p_flags & PF_NORANDMMAP))
43429 + pax_flags |= MF_PAX_RANDMMAP;
43430 +#endif
43431 +
43432 + return pax_flags;
43433 +}
43434 +#endif
43435 +
43436 +#ifdef CONFIG_PAX_XATTR_PAX_FLAGS
43437 +#ifdef CONFIG_PAX_SOFTMODE
43438 +static unsigned long pax_parse_xattr_pax_softmode(unsigned long pax_flags_softmode)
43439 +{
43440 + unsigned long pax_flags = 0UL;
43441 +
43442 +#ifdef CONFIG_PAX_PAGEEXEC
43443 + if (pax_flags_softmode & MF_PAX_PAGEEXEC)
43444 + pax_flags |= MF_PAX_PAGEEXEC;
43445 +#endif
43446 +
43447 +#ifdef CONFIG_PAX_SEGMEXEC
43448 + if (pax_flags_softmode & MF_PAX_SEGMEXEC)
43449 + pax_flags |= MF_PAX_SEGMEXEC;
43450 +#endif
43451 +
43452 +#ifdef CONFIG_PAX_EMUTRAMP
43453 + if (pax_flags_softmode & MF_PAX_EMUTRAMP)
43454 + pax_flags |= MF_PAX_EMUTRAMP;
43455 +#endif
43456 +
43457 +#ifdef CONFIG_PAX_MPROTECT
43458 + if (pax_flags_softmode & MF_PAX_MPROTECT)
43459 + pax_flags |= MF_PAX_MPROTECT;
43460 +#endif
43461 +
43462 +#if defined(CONFIG_PAX_RANDMMAP) || defined(CONFIG_PAX_RANDUSTACK)
43463 + if (randomize_va_space && (pax_flags_softmode & MF_PAX_RANDMMAP))
43464 + pax_flags |= MF_PAX_RANDMMAP;
43465 +#endif
43466 +
43467 + return pax_flags;
43468 +}
43469 +#endif
43470 +
43471 +static unsigned long pax_parse_xattr_pax_hardmode(unsigned long pax_flags_hardmode)
43472 +{
43473 + unsigned long pax_flags = 0UL;
43474 +
43475 +#ifdef CONFIG_PAX_PAGEEXEC
43476 + if (!(pax_flags_hardmode & MF_PAX_PAGEEXEC))
43477 + pax_flags |= MF_PAX_PAGEEXEC;
43478 +#endif
43479 +
43480 +#ifdef CONFIG_PAX_SEGMEXEC
43481 + if (!(pax_flags_hardmode & MF_PAX_SEGMEXEC))
43482 + pax_flags |= MF_PAX_SEGMEXEC;
43483 +#endif
43484 +
43485 +#ifdef CONFIG_PAX_EMUTRAMP
43486 + if (!(pax_flags_hardmode & MF_PAX_EMUTRAMP))
43487 + pax_flags |= MF_PAX_EMUTRAMP;
43488 +#endif
43489 +
43490 +#ifdef CONFIG_PAX_MPROTECT
43491 + if (!(pax_flags_hardmode & MF_PAX_MPROTECT))
43492 + pax_flags |= MF_PAX_MPROTECT;
43493 +#endif
43494 +
43495 +#if defined(CONFIG_PAX_RANDMMAP) || defined(CONFIG_PAX_RANDUSTACK)
43496 + if (randomize_va_space && !(pax_flags_hardmode & MF_PAX_RANDMMAP))
43497 + pax_flags |= MF_PAX_RANDMMAP;
43498 +#endif
43499 +
43500 + return pax_flags;
43501 +}
43502 +#endif
43503 +
43504 +#if defined(CONFIG_PAX_NOEXEC) || defined(CONFIG_PAX_ASLR)
43505 +static unsigned long pax_parse_ei_pax(const struct elfhdr * const elf_ex)
43506 +{
43507 + unsigned long pax_flags = 0UL;
43508 +
43509 +#ifdef CONFIG_PAX_EI_PAX
43510 +
43511 +#ifdef CONFIG_PAX_PAGEEXEC
43512 + if (!(elf_ex->e_ident[EI_PAX] & EF_PAX_PAGEEXEC))
43513 + pax_flags |= MF_PAX_PAGEEXEC;
43514 +#endif
43515 +
43516 +#ifdef CONFIG_PAX_SEGMEXEC
43517 + if (!(elf_ex->e_ident[EI_PAX] & EF_PAX_SEGMEXEC))
43518 + pax_flags |= MF_PAX_SEGMEXEC;
43519 +#endif
43520 +
43521 +#ifdef CONFIG_PAX_EMUTRAMP
43522 + if ((pax_flags & (MF_PAX_PAGEEXEC | MF_PAX_SEGMEXEC)) && (elf_ex->e_ident[EI_PAX] & EF_PAX_EMUTRAMP))
43523 + pax_flags |= MF_PAX_EMUTRAMP;
43524 +#endif
43525 +
43526 +#ifdef CONFIG_PAX_MPROTECT
43527 + if ((pax_flags & (MF_PAX_PAGEEXEC | MF_PAX_SEGMEXEC)) && !(elf_ex->e_ident[EI_PAX] & EF_PAX_MPROTECT))
43528 + pax_flags |= MF_PAX_MPROTECT;
43529 +#endif
43530 +
43531 +#ifdef CONFIG_PAX_ASLR
43532 + if (randomize_va_space && !(elf_ex->e_ident[EI_PAX] & EF_PAX_RANDMMAP))
43533 + pax_flags |= MF_PAX_RANDMMAP;
43534 +#endif
43535 +
43536 +#else
43537 +
43538 +#ifdef CONFIG_PAX_PAGEEXEC
43539 + pax_flags |= MF_PAX_PAGEEXEC;
43540 +#endif
43541 +
43542 +#ifdef CONFIG_PAX_SEGMEXEC
43543 + pax_flags |= MF_PAX_SEGMEXEC;
43544 +#endif
43545 +
43546 +#ifdef CONFIG_PAX_MPROTECT
43547 + pax_flags |= MF_PAX_MPROTECT;
43548 +#endif
43549 +
43550 +#ifdef CONFIG_PAX_RANDMMAP
43551 + if (randomize_va_space)
43552 + pax_flags |= MF_PAX_RANDMMAP;
43553 +#endif
43554 +
43555 +#endif
43556 +
43557 + return pax_flags;
43558 +}
43559 +
43560 +static unsigned long pax_parse_pt_pax(const struct elfhdr * const elf_ex, const struct elf_phdr * const elf_phdata)
43561 +{
43562 +
43563 +#ifdef CONFIG_PAX_PT_PAX_FLAGS
43564 + unsigned long i;
43565 +
43566 + for (i = 0UL; i < elf_ex->e_phnum; i++)
43567 + if (elf_phdata[i].p_type == PT_PAX_FLAGS) {
43568 + if (((elf_phdata[i].p_flags & PF_PAGEEXEC) && (elf_phdata[i].p_flags & PF_NOPAGEEXEC)) ||
43569 + ((elf_phdata[i].p_flags & PF_SEGMEXEC) && (elf_phdata[i].p_flags & PF_NOSEGMEXEC)) ||
43570 + ((elf_phdata[i].p_flags & PF_EMUTRAMP) && (elf_phdata[i].p_flags & PF_NOEMUTRAMP)) ||
43571 + ((elf_phdata[i].p_flags & PF_MPROTECT) && (elf_phdata[i].p_flags & PF_NOMPROTECT)) ||
43572 + ((elf_phdata[i].p_flags & PF_RANDMMAP) && (elf_phdata[i].p_flags & PF_NORANDMMAP)))
43573 + return ~0UL;
43574 +
43575 +#ifdef CONFIG_PAX_SOFTMODE
43576 + if (pax_softmode)
43577 + return pax_parse_pt_pax_softmode(&elf_phdata[i]);
43578 + else
43579 +#endif
43580 +
43581 + return pax_parse_pt_pax_hardmode(&elf_phdata[i]);
43582 + break;
43583 + }
43584 +#endif
43585 +
43586 + return ~0UL;
43587 +}
43588 +
43589 +static unsigned long pax_parse_xattr_pax(struct file * const file)
43590 +{
43591 +
43592 +#ifdef CONFIG_PAX_XATTR_PAX_FLAGS
43593 + ssize_t xattr_size, i;
43594 + unsigned char xattr_value[5];
43595 + unsigned long pax_flags_hardmode = 0UL, pax_flags_softmode = 0UL;
43596 +
43597 + xattr_size = vfs_getxattr(file->f_path.dentry, XATTR_NAME_PAX_FLAGS, xattr_value, sizeof xattr_value);
43598 + if (xattr_size <= 0 || xattr_size > 5)
43599 + return ~0UL;
43600 +
43601 + for (i = 0; i < xattr_size; i++)
43602 + switch (xattr_value[i]) {
43603 + default:
43604 + return ~0UL;
43605 +
43606 +#define parse_flag(option1, option2, flag) \
43607 + case option1: \
43608 + if (pax_flags_hardmode & MF_PAX_##flag) \
43609 + return ~0UL; \
43610 + pax_flags_hardmode |= MF_PAX_##flag; \
43611 + break; \
43612 + case option2: \
43613 + if (pax_flags_softmode & MF_PAX_##flag) \
43614 + return ~0UL; \
43615 + pax_flags_softmode |= MF_PAX_##flag; \
43616 + break;
43617 +
43618 + parse_flag('p', 'P', PAGEEXEC);
43619 + parse_flag('e', 'E', EMUTRAMP);
43620 + parse_flag('m', 'M', MPROTECT);
43621 + parse_flag('r', 'R', RANDMMAP);
43622 + parse_flag('s', 'S', SEGMEXEC);
43623 +
43624 +#undef parse_flag
43625 + }
43626 +
43627 + if (pax_flags_hardmode & pax_flags_softmode)
43628 + return ~0UL;
43629 +
43630 +#ifdef CONFIG_PAX_SOFTMODE
43631 + if (pax_softmode)
43632 + return pax_parse_xattr_pax_softmode(pax_flags_softmode);
43633 + else
43634 +#endif
43635 +
43636 + return pax_parse_xattr_pax_hardmode(pax_flags_hardmode);
43637 +#else
43638 + return ~0UL;
43639 +#endif
43640 +
43641 +}
43642 +
43643 +static long pax_parse_pax_flags(const struct elfhdr * const elf_ex, const struct elf_phdr * const elf_phdata, struct file * const file)
43644 +{
43645 + unsigned long pax_flags, pt_pax_flags, xattr_pax_flags;
43646 +
43647 + pax_flags = pax_parse_ei_pax(elf_ex);
43648 + pt_pax_flags = pax_parse_pt_pax(elf_ex, elf_phdata);
43649 + xattr_pax_flags = pax_parse_xattr_pax(file);
43650 +
43651 + if (pt_pax_flags == ~0UL)
43652 + pt_pax_flags = xattr_pax_flags;
43653 + else if (xattr_pax_flags == ~0UL)
43654 + xattr_pax_flags = pt_pax_flags;
43655 + if (pt_pax_flags != xattr_pax_flags)
43656 + return -EINVAL;
43657 + if (pt_pax_flags != ~0UL)
43658 + pax_flags = pt_pax_flags;
43659 +
43660 +#if defined(CONFIG_PAX_PAGEEXEC) && defined(CONFIG_PAX_SEGMEXEC)
43661 + if ((pax_flags & (MF_PAX_PAGEEXEC | MF_PAX_SEGMEXEC)) == (MF_PAX_PAGEEXEC | MF_PAX_SEGMEXEC)) {
43662 + if ((__supported_pte_mask & _PAGE_NX))
43663 + pax_flags &= ~MF_PAX_SEGMEXEC;
43664 + else
43665 + pax_flags &= ~MF_PAX_PAGEEXEC;
43666 + }
43667 +#endif
43668 +
43669 + if (0 > pax_check_flags(&pax_flags))
43670 + return -EINVAL;
43671 +
43672 + current->mm->pax_flags = pax_flags;
43673 + return 0;
43674 +}
43675 +#endif
43676 +
43677 /*
43678 * These are the functions used to load ELF style executables and shared
43679 * libraries. There is no binary dependent code anywhere else.
43680 @@ -539,6 +869,11 @@ static unsigned long randomize_stack_top(unsigned long stack_top)
43681 {
43682 unsigned int random_variable = 0;
43683
43684 +#ifdef CONFIG_PAX_RANDUSTACK
43685 + if (randomize_va_space)
43686 + return stack_top - current->mm->delta_stack;
43687 +#endif
43688 +
43689 if ((current->flags & PF_RANDOMIZE) &&
43690 !(current->personality & ADDR_NO_RANDOMIZE)) {
43691 random_variable = get_random_int() & STACK_RND_MASK;
43692 @@ -557,7 +892,7 @@ static int load_elf_binary(struct linux_binprm *bprm, struct pt_regs *regs)
43693 unsigned long load_addr = 0, load_bias = 0;
43694 int load_addr_set = 0;
43695 char * elf_interpreter = NULL;
43696 - unsigned long error;
43697 + unsigned long error = 0;
43698 struct elf_phdr *elf_ppnt, *elf_phdata;
43699 unsigned long elf_bss, elf_brk;
43700 int retval, i;
43701 @@ -567,11 +902,11 @@ static int load_elf_binary(struct linux_binprm *bprm, struct pt_regs *regs)
43702 unsigned long start_code, end_code, start_data, end_data;
43703 unsigned long reloc_func_desc __maybe_unused = 0;
43704 int executable_stack = EXSTACK_DEFAULT;
43705 - unsigned long def_flags = 0;
43706 struct {
43707 struct elfhdr elf_ex;
43708 struct elfhdr interp_elf_ex;
43709 } *loc;
43710 + unsigned long pax_task_size = TASK_SIZE;
43711
43712 loc = kmalloc(sizeof(*loc), GFP_KERNEL);
43713 if (!loc) {
43714 @@ -707,11 +1042,81 @@ static int load_elf_binary(struct linux_binprm *bprm, struct pt_regs *regs)
43715 goto out_free_dentry;
43716
43717 /* OK, This is the point of no return */
43718 - current->mm->def_flags = def_flags;
43719 +
43720 +#if defined(CONFIG_PAX_NOEXEC) || defined(CONFIG_PAX_ASLR)
43721 + current->mm->pax_flags = 0UL;
43722 +#endif
43723 +
43724 +#ifdef CONFIG_PAX_DLRESOLVE
43725 + current->mm->call_dl_resolve = 0UL;
43726 +#endif
43727 +
43728 +#if defined(CONFIG_PPC32) && defined(CONFIG_PAX_EMUSIGRT)
43729 + current->mm->call_syscall = 0UL;
43730 +#endif
43731 +
43732 +#ifdef CONFIG_PAX_ASLR
43733 + current->mm->delta_mmap = 0UL;
43734 + current->mm->delta_stack = 0UL;
43735 +#endif
43736 +
43737 + current->mm->def_flags = 0;
43738 +
43739 +#if defined(CONFIG_PAX_NOEXEC) || defined(CONFIG_PAX_ASLR)
43740 + if (0 > pax_parse_pax_flags(&loc->elf_ex, elf_phdata, bprm->file)) {
43741 + send_sig(SIGKILL, current, 0);
43742 + goto out_free_dentry;
43743 + }
43744 +#endif
43745 +
43746 +#ifdef CONFIG_PAX_HAVE_ACL_FLAGS
43747 + pax_set_initial_flags(bprm);
43748 +#elif defined(CONFIG_PAX_HOOK_ACL_FLAGS)
43749 + if (pax_set_initial_flags_func)
43750 + (pax_set_initial_flags_func)(bprm);
43751 +#endif
43752 +
43753 +#ifdef CONFIG_ARCH_TRACK_EXEC_LIMIT
43754 + if ((current->mm->pax_flags & MF_PAX_PAGEEXEC) && !(__supported_pte_mask & _PAGE_NX)) {
43755 + current->mm->context.user_cs_limit = PAGE_SIZE;
43756 + current->mm->def_flags |= VM_PAGEEXEC;
43757 + }
43758 +#endif
43759 +
43760 +#ifdef CONFIG_PAX_SEGMEXEC
43761 + if (current->mm->pax_flags & MF_PAX_SEGMEXEC) {
43762 + current->mm->context.user_cs_base = SEGMEXEC_TASK_SIZE;
43763 + current->mm->context.user_cs_limit = TASK_SIZE-SEGMEXEC_TASK_SIZE;
43764 + pax_task_size = SEGMEXEC_TASK_SIZE;
43765 + current->mm->def_flags |= VM_NOHUGEPAGE;
43766 + }
43767 +#endif
43768 +
43769 +#if defined(CONFIG_ARCH_TRACK_EXEC_LIMIT) || defined(CONFIG_PAX_SEGMEXEC)
43770 + if (current->mm->pax_flags & (MF_PAX_PAGEEXEC | MF_PAX_SEGMEXEC)) {
43771 + set_user_cs(current->mm->context.user_cs_base, current->mm->context.user_cs_limit, get_cpu());
43772 + put_cpu();
43773 + }
43774 +#endif
43775
43776 /* Do this immediately, since STACK_TOP as used in setup_arg_pages
43777 may depend on the personality. */
43778 SET_PERSONALITY(loc->elf_ex);
43779 +
43780 +#ifdef CONFIG_PAX_ASLR
43781 + if (current->mm->pax_flags & MF_PAX_RANDMMAP) {
43782 + current->mm->delta_mmap = (pax_get_random_long() & ((1UL << PAX_DELTA_MMAP_LEN)-1)) << PAGE_SHIFT;
43783 + current->mm->delta_stack = (pax_get_random_long() & ((1UL << PAX_DELTA_STACK_LEN)-1)) << PAGE_SHIFT;
43784 + }
43785 +#endif
43786 +
43787 +#if defined(CONFIG_PAX_PAGEEXEC) || defined(CONFIG_PAX_SEGMEXEC)
43788 + if (current->mm->pax_flags & (MF_PAX_PAGEEXEC | MF_PAX_SEGMEXEC)) {
43789 + executable_stack = EXSTACK_DISABLE_X;
43790 + current->personality &= ~READ_IMPLIES_EXEC;
43791 + } else
43792 +#endif
43793 +
43794 if (elf_read_implies_exec(loc->elf_ex, executable_stack))
43795 current->personality |= READ_IMPLIES_EXEC;
43796
43797 @@ -802,6 +1207,20 @@ static int load_elf_binary(struct linux_binprm *bprm, struct pt_regs *regs)
43798 #else
43799 load_bias = ELF_PAGESTART(ELF_ET_DYN_BASE - vaddr);
43800 #endif
43801 +
43802 +#ifdef CONFIG_PAX_RANDMMAP
43803 + /* PaX: randomize base address at the default exe base if requested */
43804 + if ((current->mm->pax_flags & MF_PAX_RANDMMAP) && elf_interpreter) {
43805 +#ifdef CONFIG_SPARC64
43806 + load_bias = (pax_get_random_long() & ((1UL << PAX_DELTA_MMAP_LEN) - 1)) << (PAGE_SHIFT+1);
43807 +#else
43808 + load_bias = (pax_get_random_long() & ((1UL << PAX_DELTA_MMAP_LEN) - 1)) << PAGE_SHIFT;
43809 +#endif
43810 + load_bias = ELF_PAGESTART(PAX_ELF_ET_DYN_BASE - vaddr + load_bias);
43811 + elf_flags |= MAP_FIXED;
43812 + }
43813 +#endif
43814 +
43815 }
43816
43817 error = elf_map(bprm->file, load_bias + vaddr, elf_ppnt,
43818 @@ -834,9 +1253,9 @@ static int load_elf_binary(struct linux_binprm *bprm, struct pt_regs *regs)
43819 * allowed task size. Note that p_filesz must always be
43820 * <= p_memsz so it is only necessary to check p_memsz.
43821 */
43822 - if (BAD_ADDR(k) || elf_ppnt->p_filesz > elf_ppnt->p_memsz ||
43823 - elf_ppnt->p_memsz > TASK_SIZE ||
43824 - TASK_SIZE - elf_ppnt->p_memsz < k) {
43825 + if (k >= pax_task_size || elf_ppnt->p_filesz > elf_ppnt->p_memsz ||
43826 + elf_ppnt->p_memsz > pax_task_size ||
43827 + pax_task_size - elf_ppnt->p_memsz < k) {
43828 /* set_brk can never work. Avoid overflows. */
43829 send_sig(SIGKILL, current, 0);
43830 retval = -EINVAL;
43831 @@ -875,17 +1294,44 @@ static int load_elf_binary(struct linux_binprm *bprm, struct pt_regs *regs)
43832 goto out_free_dentry;
43833 }
43834 if (likely(elf_bss != elf_brk) && unlikely(padzero(elf_bss))) {
43835 - send_sig(SIGSEGV, current, 0);
43836 - retval = -EFAULT; /* Nobody gets to see this, but.. */
43837 - goto out_free_dentry;
43838 + /*
43839 + * This bss-zeroing can fail if the ELF
43840 + * file specifies odd protections. So
43841 + * we don't check the return value
43842 + */
43843 }
43844
43845 +#ifdef CONFIG_PAX_RANDMMAP
43846 + if (current->mm->pax_flags & MF_PAX_RANDMMAP) {
43847 + unsigned long start, size;
43848 +
43849 + start = ELF_PAGEALIGN(elf_brk);
43850 + size = PAGE_SIZE + ((pax_get_random_long() & ((1UL << 22) - 1UL)) << 4);
43851 + down_read(&current->mm->mmap_sem);
43852 + retval = -ENOMEM;
43853 + if (!find_vma_intersection(current->mm, start, start + size + PAGE_SIZE)) {
43854 + unsigned long prot = PROT_NONE;
43855 +
43856 + up_read(&current->mm->mmap_sem);
43857 + current->mm->brk_gap = PAGE_ALIGN(size) >> PAGE_SHIFT;
43858 +// if (current->personality & ADDR_NO_RANDOMIZE)
43859 +// prot = PROT_READ;
43860 + start = vm_mmap(NULL, start, size, prot, MAP_ANONYMOUS | MAP_FIXED | MAP_PRIVATE, 0);
43861 + retval = IS_ERR_VALUE(start) ? start : 0;
43862 + } else
43863 + up_read(&current->mm->mmap_sem);
43864 + if (retval == 0)
43865 + retval = set_brk(start + size, start + size + PAGE_SIZE);
43866 + if (retval < 0) {
43867 + send_sig(SIGKILL, current, 0);
43868 + goto out_free_dentry;
43869 + }
43870 + }
43871 +#endif
43872 +
43873 if (elf_interpreter) {
43874 - unsigned long uninitialized_var(interp_map_addr);
43875 -
43876 elf_entry = load_elf_interp(&loc->interp_elf_ex,
43877 interpreter,
43878 - &interp_map_addr,
43879 load_bias);
43880 if (!IS_ERR((void *)elf_entry)) {
43881 /*
43882 @@ -1107,7 +1553,7 @@ static bool always_dump_vma(struct vm_area_struct *vma)
43883 * Decide what to dump of a segment, part, all or none.
43884 */
43885 static unsigned long vma_dump_size(struct vm_area_struct *vma,
43886 - unsigned long mm_flags)
43887 + unsigned long mm_flags, long signr)
43888 {
43889 #define FILTER(type) (mm_flags & (1UL << MMF_DUMP_##type))
43890
43891 @@ -1144,7 +1590,7 @@ static unsigned long vma_dump_size(struct vm_area_struct *vma,
43892 if (vma->vm_file == NULL)
43893 return 0;
43894
43895 - if (FILTER(MAPPED_PRIVATE))
43896 + if (signr == SIGKILL || FILTER(MAPPED_PRIVATE))
43897 goto whole;
43898
43899 /*
43900 @@ -1366,9 +1812,9 @@ static void fill_auxv_note(struct memelfnote *note, struct mm_struct *mm)
43901 {
43902 elf_addr_t *auxv = (elf_addr_t *) mm->saved_auxv;
43903 int i = 0;
43904 - do
43905 + do {
43906 i += 2;
43907 - while (auxv[i - 2] != AT_NULL);
43908 + } while (auxv[i - 2] != AT_NULL);
43909 fill_note(note, "CORE", NT_AUXV, i * sizeof(elf_addr_t), auxv);
43910 }
43911
43912 @@ -1879,14 +2325,14 @@ static void fill_extnum_info(struct elfhdr *elf, struct elf_shdr *shdr4extnum,
43913 }
43914
43915 static size_t elf_core_vma_data_size(struct vm_area_struct *gate_vma,
43916 - unsigned long mm_flags)
43917 + struct coredump_params *cprm)
43918 {
43919 struct vm_area_struct *vma;
43920 size_t size = 0;
43921
43922 for (vma = first_vma(current, gate_vma); vma != NULL;
43923 vma = next_vma(vma, gate_vma))
43924 - size += vma_dump_size(vma, mm_flags);
43925 + size += vma_dump_size(vma, cprm->mm_flags, cprm->signr);
43926 return size;
43927 }
43928
43929 @@ -1980,7 +2426,7 @@ static int elf_core_dump(struct coredump_params *cprm)
43930
43931 dataoff = offset = roundup(offset, ELF_EXEC_PAGESIZE);
43932
43933 - offset += elf_core_vma_data_size(gate_vma, cprm->mm_flags);
43934 + offset += elf_core_vma_data_size(gate_vma, cprm);
43935 offset += elf_core_extra_data_size();
43936 e_shoff = offset;
43937
43938 @@ -1994,10 +2440,12 @@ static int elf_core_dump(struct coredump_params *cprm)
43939 offset = dataoff;
43940
43941 size += sizeof(*elf);
43942 + gr_learn_resource(current, RLIMIT_CORE, size, 1);
43943 if (size > cprm->limit || !dump_write(cprm->file, elf, sizeof(*elf)))
43944 goto end_coredump;
43945
43946 size += sizeof(*phdr4note);
43947 + gr_learn_resource(current, RLIMIT_CORE, size, 1);
43948 if (size > cprm->limit
43949 || !dump_write(cprm->file, phdr4note, sizeof(*phdr4note)))
43950 goto end_coredump;
43951 @@ -2011,7 +2459,7 @@ static int elf_core_dump(struct coredump_params *cprm)
43952 phdr.p_offset = offset;
43953 phdr.p_vaddr = vma->vm_start;
43954 phdr.p_paddr = 0;
43955 - phdr.p_filesz = vma_dump_size(vma, cprm->mm_flags);
43956 + phdr.p_filesz = vma_dump_size(vma, cprm->mm_flags, cprm->signr);
43957 phdr.p_memsz = vma->vm_end - vma->vm_start;
43958 offset += phdr.p_filesz;
43959 phdr.p_flags = vma->vm_flags & VM_READ ? PF_R : 0;
43960 @@ -2022,6 +2470,7 @@ static int elf_core_dump(struct coredump_params *cprm)
43961 phdr.p_align = ELF_EXEC_PAGESIZE;
43962
43963 size += sizeof(phdr);
43964 + gr_learn_resource(current, RLIMIT_CORE, size, 1);
43965 if (size > cprm->limit
43966 || !dump_write(cprm->file, &phdr, sizeof(phdr)))
43967 goto end_coredump;
43968 @@ -2046,7 +2495,7 @@ static int elf_core_dump(struct coredump_params *cprm)
43969 unsigned long addr;
43970 unsigned long end;
43971
43972 - end = vma->vm_start + vma_dump_size(vma, cprm->mm_flags);
43973 + end = vma->vm_start + vma_dump_size(vma, cprm->mm_flags, cprm->signr);
43974
43975 for (addr = vma->vm_start; addr < end; addr += PAGE_SIZE) {
43976 struct page *page;
43977 @@ -2055,6 +2504,7 @@ static int elf_core_dump(struct coredump_params *cprm)
43978 page = get_dump_page(addr);
43979 if (page) {
43980 void *kaddr = kmap(page);
43981 + gr_learn_resource(current, RLIMIT_CORE, size + PAGE_SIZE, 1);
43982 stop = ((size += PAGE_SIZE) > cprm->limit) ||
43983 !dump_write(cprm->file, kaddr,
43984 PAGE_SIZE);
43985 @@ -2072,6 +2522,7 @@ static int elf_core_dump(struct coredump_params *cprm)
43986
43987 if (e_phnum == PN_XNUM) {
43988 size += sizeof(*shdr4extnum);
43989 + gr_learn_resource(current, RLIMIT_CORE, size, 1);
43990 if (size > cprm->limit
43991 || !dump_write(cprm->file, shdr4extnum,
43992 sizeof(*shdr4extnum)))
43993 @@ -2092,6 +2543,97 @@ out:
43994
43995 #endif /* CONFIG_ELF_CORE */
43996
43997 +#ifdef CONFIG_PAX_MPROTECT
43998 +/* PaX: non-PIC ELF libraries need relocations on their executable segments
43999 + * therefore we'll grant them VM_MAYWRITE once during their life. Similarly
44000 + * we'll remove VM_MAYWRITE for good on RELRO segments.
44001 + *
44002 + * The checks favour ld-linux.so behaviour which operates on a per ELF segment
44003 + * basis because we want to allow the common case and not the special ones.
44004 + */
44005 +static void elf_handle_mprotect(struct vm_area_struct *vma, unsigned long newflags)
44006 +{
44007 + struct elfhdr elf_h;
44008 + struct elf_phdr elf_p;
44009 + unsigned long i;
44010 + unsigned long oldflags;
44011 + bool is_textrel_rw, is_textrel_rx, is_relro;
44012 +
44013 + if (!(vma->vm_mm->pax_flags & MF_PAX_MPROTECT))
44014 + return;
44015 +
44016 + oldflags = vma->vm_flags & (VM_MAYEXEC | VM_MAYWRITE | VM_MAYREAD | VM_EXEC | VM_WRITE | VM_READ);
44017 + newflags &= VM_MAYEXEC | VM_MAYWRITE | VM_MAYREAD | VM_EXEC | VM_WRITE | VM_READ;
44018 +
44019 +#ifdef CONFIG_PAX_ELFRELOCS
44020 + /* possible TEXTREL */
44021 + is_textrel_rw = vma->vm_file && !vma->anon_vma && oldflags == (VM_MAYEXEC | VM_MAYREAD | VM_EXEC | VM_READ) && newflags == (VM_WRITE | VM_READ);
44022 + 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);
44023 +#else
44024 + is_textrel_rw = false;
44025 + is_textrel_rx = false;
44026 +#endif
44027 +
44028 + /* possible RELRO */
44029 + is_relro = vma->vm_file && vma->anon_vma && oldflags == (VM_MAYWRITE | VM_MAYREAD | VM_READ) && newflags == (VM_MAYWRITE | VM_MAYREAD | VM_READ);
44030 +
44031 + if (!is_textrel_rw && !is_textrel_rx && !is_relro)
44032 + return;
44033 +
44034 + if (sizeof(elf_h) != kernel_read(vma->vm_file, 0UL, (char *)&elf_h, sizeof(elf_h)) ||
44035 + memcmp(elf_h.e_ident, ELFMAG, SELFMAG) ||
44036 +
44037 +#ifdef CONFIG_PAX_ETEXECRELOCS
44038 + ((is_textrel_rw || is_textrel_rx) && (elf_h.e_type != ET_DYN && elf_h.e_type != ET_EXEC)) ||
44039 +#else
44040 + ((is_textrel_rw || is_textrel_rx) && elf_h.e_type != ET_DYN) ||
44041 +#endif
44042 +
44043 + (is_relro && (elf_h.e_type != ET_DYN && elf_h.e_type != ET_EXEC)) ||
44044 + !elf_check_arch(&elf_h) ||
44045 + elf_h.e_phentsize != sizeof(struct elf_phdr) ||
44046 + elf_h.e_phnum > 65536UL / sizeof(struct elf_phdr))
44047 + return;
44048 +
44049 + for (i = 0UL; i < elf_h.e_phnum; i++) {
44050 + if (sizeof(elf_p) != kernel_read(vma->vm_file, elf_h.e_phoff + i*sizeof(elf_p), (char *)&elf_p, sizeof(elf_p)))
44051 + return;
44052 + switch (elf_p.p_type) {
44053 + case PT_DYNAMIC:
44054 + if (!is_textrel_rw && !is_textrel_rx)
44055 + continue;
44056 + i = 0UL;
44057 + while ((i+1) * sizeof(elf_dyn) <= elf_p.p_filesz) {
44058 + elf_dyn dyn;
44059 +
44060 + if (sizeof(dyn) != kernel_read(vma->vm_file, elf_p.p_offset + i*sizeof(dyn), (char *)&dyn, sizeof(dyn)))
44061 + return;
44062 + if (dyn.d_tag == DT_NULL)
44063 + return;
44064 + if (dyn.d_tag == DT_TEXTREL || (dyn.d_tag == DT_FLAGS && (dyn.d_un.d_val & DF_TEXTREL))) {
44065 + gr_log_textrel(vma);
44066 + if (is_textrel_rw)
44067 + vma->vm_flags |= VM_MAYWRITE;
44068 + else
44069 + /* PaX: disallow write access after relocs are done, hopefully noone else needs it... */
44070 + vma->vm_flags &= ~VM_MAYWRITE;
44071 + return;
44072 + }
44073 + i++;
44074 + }
44075 + return;
44076 +
44077 + case PT_GNU_RELRO:
44078 + if (!is_relro)
44079 + continue;
44080 + if ((elf_p.p_offset >> PAGE_SHIFT) == vma->vm_pgoff && ELF_PAGEALIGN(elf_p.p_memsz) == vma->vm_end - vma->vm_start)
44081 + vma->vm_flags &= ~VM_MAYWRITE;
44082 + return;
44083 + }
44084 + }
44085 +}
44086 +#endif
44087 +
44088 static int __init init_elf_binfmt(void)
44089 {
44090 register_binfmt(&elf_format);
44091 diff --git a/fs/binfmt_flat.c b/fs/binfmt_flat.c
44092 index 178cb70..8972997 100644
44093 --- a/fs/binfmt_flat.c
44094 +++ b/fs/binfmt_flat.c
44095 @@ -562,7 +562,9 @@ static int load_flat_file(struct linux_binprm * bprm,
44096 realdatastart = (unsigned long) -ENOMEM;
44097 printk("Unable to allocate RAM for process data, errno %d\n",
44098 (int)-realdatastart);
44099 + down_write(&current->mm->mmap_sem);
44100 vm_munmap(textpos, text_len);
44101 + up_write(&current->mm->mmap_sem);
44102 ret = realdatastart;
44103 goto err;
44104 }
44105 @@ -586,8 +588,10 @@ static int load_flat_file(struct linux_binprm * bprm,
44106 }
44107 if (IS_ERR_VALUE(result)) {
44108 printk("Unable to read data+bss, errno %d\n", (int)-result);
44109 + down_write(&current->mm->mmap_sem);
44110 vm_munmap(textpos, text_len);
44111 vm_munmap(realdatastart, len);
44112 + up_write(&current->mm->mmap_sem);
44113 ret = result;
44114 goto err;
44115 }
44116 @@ -654,8 +658,10 @@ static int load_flat_file(struct linux_binprm * bprm,
44117 }
44118 if (IS_ERR_VALUE(result)) {
44119 printk("Unable to read code+data+bss, errno %d\n",(int)-result);
44120 + down_write(&current->mm->mmap_sem);
44121 vm_munmap(textpos, text_len + data_len + extra +
44122 MAX_SHARED_LIBS * sizeof(unsigned long));
44123 + up_write(&current->mm->mmap_sem);
44124 ret = result;
44125 goto err;
44126 }
44127 diff --git a/fs/bio.c b/fs/bio.c
44128 index 71072ab..439851b 100644
44129 --- a/fs/bio.c
44130 +++ b/fs/bio.c
44131 @@ -842,7 +842,7 @@ struct bio *bio_copy_user_iov(struct request_queue *q,
44132 /*
44133 * Overflow, abort
44134 */
44135 - if (end < start)
44136 + if (end < start || end - start > INT_MAX - nr_pages)
44137 return ERR_PTR(-EINVAL);
44138
44139 nr_pages += end - start;
44140 @@ -976,7 +976,7 @@ static struct bio *__bio_map_user_iov(struct request_queue *q,
44141 /*
44142 * Overflow, abort
44143 */
44144 - if (end < start)
44145 + if (end < start || end - start > INT_MAX - nr_pages)
44146 return ERR_PTR(-EINVAL);
44147
44148 nr_pages += end - start;
44149 @@ -1238,7 +1238,7 @@ static void bio_copy_kern_endio(struct bio *bio, int err)
44150 const int read = bio_data_dir(bio) == READ;
44151 struct bio_map_data *bmd = bio->bi_private;
44152 int i;
44153 - char *p = bmd->sgvecs[0].iov_base;
44154 + char *p = (char __force_kernel *)bmd->sgvecs[0].iov_base;
44155
44156 __bio_for_each_segment(bvec, bio, i, 0) {
44157 char *addr = page_address(bvec->bv_page);
44158 diff --git a/fs/block_dev.c b/fs/block_dev.c
44159 index 38e721b..7a9c5bc 100644
44160 --- a/fs/block_dev.c
44161 +++ b/fs/block_dev.c
44162 @@ -704,7 +704,7 @@ static bool bd_may_claim(struct block_device *bdev, struct block_device *whole,
44163 else if (bdev->bd_contains == bdev)
44164 return true; /* is a whole device which isn't held */
44165
44166 - else if (whole->bd_holder == bd_may_claim)
44167 + else if (whole->bd_holder == (void *)bd_may_claim)
44168 return true; /* is a partition of a device that is being partitioned */
44169 else if (whole->bd_holder != NULL)
44170 return false; /* is a partition of a held device */
44171 diff --git a/fs/btrfs/check-integrity.c b/fs/btrfs/check-integrity.c
44172 index 9197e2e..7f731f8 100644
44173 --- a/fs/btrfs/check-integrity.c
44174 +++ b/fs/btrfs/check-integrity.c
44175 @@ -155,7 +155,7 @@ struct btrfsic_block {
44176 union {
44177 bio_end_io_t *bio;
44178 bh_end_io_t *bh;
44179 - } orig_bio_bh_end_io;
44180 + } __no_const orig_bio_bh_end_io;
44181 int submit_bio_bh_rw;
44182 u64 flush_gen; /* only valid if !never_written */
44183 };
44184 diff --git a/fs/btrfs/ctree.c b/fs/btrfs/ctree.c
44185 index 6d183f6..f47cc7a 100644
44186 --- a/fs/btrfs/ctree.c
44187 +++ b/fs/btrfs/ctree.c
44188 @@ -1037,9 +1037,12 @@ static noinline int __btrfs_cow_block(struct btrfs_trans_handle *trans,
44189 free_extent_buffer(buf);
44190 add_root_to_dirty_list(root);
44191 } else {
44192 - if (root->root_key.objectid == BTRFS_TREE_RELOC_OBJECTID)
44193 - parent_start = parent->start;
44194 - else
44195 + if (root->root_key.objectid == BTRFS_TREE_RELOC_OBJECTID) {
44196 + if (parent)
44197 + parent_start = parent->start;
44198 + else
44199 + parent_start = 0;
44200 + } else
44201 parent_start = 0;
44202
44203 WARN_ON(trans->transid != btrfs_header_generation(parent));
44204 diff --git a/fs/btrfs/inode.c b/fs/btrfs/inode.c
44205 index ec154f9..bf617a7 100644
44206 --- a/fs/btrfs/inode.c
44207 +++ b/fs/btrfs/inode.c
44208 @@ -7126,7 +7126,7 @@ fail:
44209 return -ENOMEM;
44210 }
44211
44212 -static int btrfs_getattr(struct vfsmount *mnt,
44213 +int btrfs_getattr(struct vfsmount *mnt,
44214 struct dentry *dentry, struct kstat *stat)
44215 {
44216 struct inode *inode = dentry->d_inode;
44217 @@ -7140,6 +7140,14 @@ static int btrfs_getattr(struct vfsmount *mnt,
44218 return 0;
44219 }
44220
44221 +EXPORT_SYMBOL(btrfs_getattr);
44222 +
44223 +dev_t get_btrfs_dev_from_inode(struct inode *inode)
44224 +{
44225 + return BTRFS_I(inode)->root->anon_dev;
44226 +}
44227 +EXPORT_SYMBOL(get_btrfs_dev_from_inode);
44228 +
44229 /*
44230 * If a file is moved, it will inherit the cow and compression flags of the new
44231 * directory.
44232 diff --git a/fs/btrfs/ioctl.c b/fs/btrfs/ioctl.c
44233 index 9df50fa..6cd20d0 100644
44234 --- a/fs/btrfs/ioctl.c
44235 +++ b/fs/btrfs/ioctl.c
44236 @@ -2942,9 +2942,12 @@ long btrfs_ioctl_space_info(struct btrfs_root *root, void __user *arg)
44237 for (i = 0; i < num_types; i++) {
44238 struct btrfs_space_info *tmp;
44239
44240 + /* Don't copy in more than we allocated */
44241 if (!slot_count)
44242 break;
44243
44244 + slot_count--;
44245 +
44246 info = NULL;
44247 rcu_read_lock();
44248 list_for_each_entry_rcu(tmp, &root->fs_info->space_info,
44249 @@ -2966,10 +2969,7 @@ long btrfs_ioctl_space_info(struct btrfs_root *root, void __user *arg)
44250 memcpy(dest, &space, sizeof(space));
44251 dest++;
44252 space_args.total_spaces++;
44253 - slot_count--;
44254 }
44255 - if (!slot_count)
44256 - break;
44257 }
44258 up_read(&info->groups_sem);
44259 }
44260 diff --git a/fs/btrfs/relocation.c b/fs/btrfs/relocation.c
44261 index 4da0865..01c4778 100644
44262 --- a/fs/btrfs/relocation.c
44263 +++ b/fs/btrfs/relocation.c
44264 @@ -1269,7 +1269,7 @@ static int __update_reloc_root(struct btrfs_root *root, int del)
44265 }
44266 spin_unlock(&rc->reloc_root_tree.lock);
44267
44268 - BUG_ON((struct btrfs_root *)node->data != root);
44269 + BUG_ON(!node || (struct btrfs_root *)node->data != root);
44270
44271 if (!del) {
44272 spin_lock(&rc->reloc_root_tree.lock);
44273 diff --git a/fs/cachefiles/bind.c b/fs/cachefiles/bind.c
44274 index 622f469..e8d2d55 100644
44275 --- a/fs/cachefiles/bind.c
44276 +++ b/fs/cachefiles/bind.c
44277 @@ -39,13 +39,11 @@ int cachefiles_daemon_bind(struct cachefiles_cache *cache, char *args)
44278 args);
44279
44280 /* start by checking things over */
44281 - ASSERT(cache->fstop_percent >= 0 &&
44282 - cache->fstop_percent < cache->fcull_percent &&
44283 + ASSERT(cache->fstop_percent < cache->fcull_percent &&
44284 cache->fcull_percent < cache->frun_percent &&
44285 cache->frun_percent < 100);
44286
44287 - ASSERT(cache->bstop_percent >= 0 &&
44288 - cache->bstop_percent < cache->bcull_percent &&
44289 + ASSERT(cache->bstop_percent < cache->bcull_percent &&
44290 cache->bcull_percent < cache->brun_percent &&
44291 cache->brun_percent < 100);
44292
44293 diff --git a/fs/cachefiles/daemon.c b/fs/cachefiles/daemon.c
44294 index 0a1467b..6a53245 100644
44295 --- a/fs/cachefiles/daemon.c
44296 +++ b/fs/cachefiles/daemon.c
44297 @@ -196,7 +196,7 @@ static ssize_t cachefiles_daemon_read(struct file *file, char __user *_buffer,
44298 if (n > buflen)
44299 return -EMSGSIZE;
44300
44301 - if (copy_to_user(_buffer, buffer, n) != 0)
44302 + if (n > sizeof(buffer) || copy_to_user(_buffer, buffer, n) != 0)
44303 return -EFAULT;
44304
44305 return n;
44306 @@ -222,7 +222,7 @@ static ssize_t cachefiles_daemon_write(struct file *file,
44307 if (test_bit(CACHEFILES_DEAD, &cache->flags))
44308 return -EIO;
44309
44310 - if (datalen < 0 || datalen > PAGE_SIZE - 1)
44311 + if (datalen > PAGE_SIZE - 1)
44312 return -EOPNOTSUPP;
44313
44314 /* drag the command string into the kernel so we can parse it */
44315 @@ -386,7 +386,7 @@ static int cachefiles_daemon_fstop(struct cachefiles_cache *cache, char *args)
44316 if (args[0] != '%' || args[1] != '\0')
44317 return -EINVAL;
44318
44319 - if (fstop < 0 || fstop >= cache->fcull_percent)
44320 + if (fstop >= cache->fcull_percent)
44321 return cachefiles_daemon_range_error(cache, args);
44322
44323 cache->fstop_percent = fstop;
44324 @@ -458,7 +458,7 @@ static int cachefiles_daemon_bstop(struct cachefiles_cache *cache, char *args)
44325 if (args[0] != '%' || args[1] != '\0')
44326 return -EINVAL;
44327
44328 - if (bstop < 0 || bstop >= cache->bcull_percent)
44329 + if (bstop >= cache->bcull_percent)
44330 return cachefiles_daemon_range_error(cache, args);
44331
44332 cache->bstop_percent = bstop;
44333 diff --git a/fs/cachefiles/internal.h b/fs/cachefiles/internal.h
44334 index bd6bc1b..b627b53 100644
44335 --- a/fs/cachefiles/internal.h
44336 +++ b/fs/cachefiles/internal.h
44337 @@ -57,7 +57,7 @@ struct cachefiles_cache {
44338 wait_queue_head_t daemon_pollwq; /* poll waitqueue for daemon */
44339 struct rb_root active_nodes; /* active nodes (can't be culled) */
44340 rwlock_t active_lock; /* lock for active_nodes */
44341 - atomic_t gravecounter; /* graveyard uniquifier */
44342 + atomic_unchecked_t gravecounter; /* graveyard uniquifier */
44343 unsigned frun_percent; /* when to stop culling (% files) */
44344 unsigned fcull_percent; /* when to start culling (% files) */
44345 unsigned fstop_percent; /* when to stop allocating (% files) */
44346 @@ -169,19 +169,19 @@ extern int cachefiles_check_in_use(struct cachefiles_cache *cache,
44347 * proc.c
44348 */
44349 #ifdef CONFIG_CACHEFILES_HISTOGRAM
44350 -extern atomic_t cachefiles_lookup_histogram[HZ];
44351 -extern atomic_t cachefiles_mkdir_histogram[HZ];
44352 -extern atomic_t cachefiles_create_histogram[HZ];
44353 +extern atomic_unchecked_t cachefiles_lookup_histogram[HZ];
44354 +extern atomic_unchecked_t cachefiles_mkdir_histogram[HZ];
44355 +extern atomic_unchecked_t cachefiles_create_histogram[HZ];
44356
44357 extern int __init cachefiles_proc_init(void);
44358 extern void cachefiles_proc_cleanup(void);
44359 static inline
44360 -void cachefiles_hist(atomic_t histogram[], unsigned long start_jif)
44361 +void cachefiles_hist(atomic_unchecked_t histogram[], unsigned long start_jif)
44362 {
44363 unsigned long jif = jiffies - start_jif;
44364 if (jif >= HZ)
44365 jif = HZ - 1;
44366 - atomic_inc(&histogram[jif]);
44367 + atomic_inc_unchecked(&histogram[jif]);
44368 }
44369
44370 #else
44371 diff --git a/fs/cachefiles/namei.c b/fs/cachefiles/namei.c
44372 index b0b5f7c..039bb26 100644
44373 --- a/fs/cachefiles/namei.c
44374 +++ b/fs/cachefiles/namei.c
44375 @@ -318,7 +318,7 @@ try_again:
44376 /* first step is to make up a grave dentry in the graveyard */
44377 sprintf(nbuffer, "%08x%08x",
44378 (uint32_t) get_seconds(),
44379 - (uint32_t) atomic_inc_return(&cache->gravecounter));
44380 + (uint32_t) atomic_inc_return_unchecked(&cache->gravecounter));
44381
44382 /* do the multiway lock magic */
44383 trap = lock_rename(cache->graveyard, dir);
44384 diff --git a/fs/cachefiles/proc.c b/fs/cachefiles/proc.c
44385 index eccd339..4c1d995 100644
44386 --- a/fs/cachefiles/proc.c
44387 +++ b/fs/cachefiles/proc.c
44388 @@ -14,9 +14,9 @@
44389 #include <linux/seq_file.h>
44390 #include "internal.h"
44391
44392 -atomic_t cachefiles_lookup_histogram[HZ];
44393 -atomic_t cachefiles_mkdir_histogram[HZ];
44394 -atomic_t cachefiles_create_histogram[HZ];
44395 +atomic_unchecked_t cachefiles_lookup_histogram[HZ];
44396 +atomic_unchecked_t cachefiles_mkdir_histogram[HZ];
44397 +atomic_unchecked_t cachefiles_create_histogram[HZ];
44398
44399 /*
44400 * display the latency histogram
44401 @@ -35,9 +35,9 @@ static int cachefiles_histogram_show(struct seq_file *m, void *v)
44402 return 0;
44403 default:
44404 index = (unsigned long) v - 3;
44405 - x = atomic_read(&cachefiles_lookup_histogram[index]);
44406 - y = atomic_read(&cachefiles_mkdir_histogram[index]);
44407 - z = atomic_read(&cachefiles_create_histogram[index]);
44408 + x = atomic_read_unchecked(&cachefiles_lookup_histogram[index]);
44409 + y = atomic_read_unchecked(&cachefiles_mkdir_histogram[index]);
44410 + z = atomic_read_unchecked(&cachefiles_create_histogram[index]);
44411 if (x == 0 && y == 0 && z == 0)
44412 return 0;
44413
44414 diff --git a/fs/cachefiles/rdwr.c b/fs/cachefiles/rdwr.c
44415 index c994691..2a1537f 100644
44416 --- a/fs/cachefiles/rdwr.c
44417 +++ b/fs/cachefiles/rdwr.c
44418 @@ -945,7 +945,7 @@ int cachefiles_write_page(struct fscache_storage *op, struct page *page)
44419 old_fs = get_fs();
44420 set_fs(KERNEL_DS);
44421 ret = file->f_op->write(
44422 - file, (const void __user *) data, len, &pos);
44423 + file, (const void __force_user *) data, len, &pos);
44424 set_fs(old_fs);
44425 kunmap(page);
44426 if (ret != len)
44427 diff --git a/fs/ceph/dir.c b/fs/ceph/dir.c
44428 index e5b7731..b9c59fb 100644
44429 --- a/fs/ceph/dir.c
44430 +++ b/fs/ceph/dir.c
44431 @@ -243,7 +243,7 @@ static int ceph_readdir(struct file *filp, void *dirent, filldir_t filldir)
44432 struct ceph_fs_client *fsc = ceph_inode_to_client(inode);
44433 struct ceph_mds_client *mdsc = fsc->mdsc;
44434 unsigned frag = fpos_frag(filp->f_pos);
44435 - int off = fpos_off(filp->f_pos);
44436 + unsigned int off = fpos_off(filp->f_pos);
44437 int err;
44438 u32 ftype;
44439 struct ceph_mds_reply_info_parsed *rinfo;
44440 diff --git a/fs/cifs/cifs_debug.c b/fs/cifs/cifs_debug.c
44441 index d9ea6ed..1e6c8ac 100644
44442 --- a/fs/cifs/cifs_debug.c
44443 +++ b/fs/cifs/cifs_debug.c
44444 @@ -267,8 +267,8 @@ static ssize_t cifs_stats_proc_write(struct file *file,
44445
44446 if (c == '1' || c == 'y' || c == 'Y' || c == '0') {
44447 #ifdef CONFIG_CIFS_STATS2
44448 - atomic_set(&totBufAllocCount, 0);
44449 - atomic_set(&totSmBufAllocCount, 0);
44450 + atomic_set_unchecked(&totBufAllocCount, 0);
44451 + atomic_set_unchecked(&totSmBufAllocCount, 0);
44452 #endif /* CONFIG_CIFS_STATS2 */
44453 spin_lock(&cifs_tcp_ses_lock);
44454 list_for_each(tmp1, &cifs_tcp_ses_list) {
44455 @@ -281,7 +281,7 @@ static ssize_t cifs_stats_proc_write(struct file *file,
44456 tcon = list_entry(tmp3,
44457 struct cifs_tcon,
44458 tcon_list);
44459 - atomic_set(&tcon->num_smbs_sent, 0);
44460 + atomic_set_unchecked(&tcon->num_smbs_sent, 0);
44461 if (server->ops->clear_stats)
44462 server->ops->clear_stats(tcon);
44463 }
44464 @@ -313,8 +313,8 @@ static int cifs_stats_proc_show(struct seq_file *m, void *v)
44465 smBufAllocCount.counter, cifs_min_small);
44466 #ifdef CONFIG_CIFS_STATS2
44467 seq_printf(m, "Total Large %d Small %d Allocations\n",
44468 - atomic_read(&totBufAllocCount),
44469 - atomic_read(&totSmBufAllocCount));
44470 + atomic_read_unchecked(&totBufAllocCount),
44471 + atomic_read_unchecked(&totSmBufAllocCount));
44472 #endif /* CONFIG_CIFS_STATS2 */
44473
44474 seq_printf(m, "Operations (MIDs): %d\n", atomic_read(&midCount));
44475 @@ -343,7 +343,7 @@ static int cifs_stats_proc_show(struct seq_file *m, void *v)
44476 if (tcon->need_reconnect)
44477 seq_puts(m, "\tDISCONNECTED ");
44478 seq_printf(m, "\nSMBs: %d",
44479 - atomic_read(&tcon->num_smbs_sent));
44480 + atomic_read_unchecked(&tcon->num_smbs_sent));
44481 if (server->ops->print_stats)
44482 server->ops->print_stats(m, tcon);
44483 }
44484 diff --git a/fs/cifs/cifsfs.c b/fs/cifs/cifsfs.c
44485 index db8a404..c712e2e 100644
44486 --- a/fs/cifs/cifsfs.c
44487 +++ b/fs/cifs/cifsfs.c
44488 @@ -1003,7 +1003,7 @@ cifs_init_request_bufs(void)
44489 /* cERROR(1, "CIFSMaxBufSize %d 0x%x",CIFSMaxBufSize,CIFSMaxBufSize); */
44490 cifs_req_cachep = kmem_cache_create("cifs_request",
44491 CIFSMaxBufSize + max_hdr_size, 0,
44492 - SLAB_HWCACHE_ALIGN, NULL);
44493 + SLAB_HWCACHE_ALIGN | SLAB_USERCOPY, NULL);
44494 if (cifs_req_cachep == NULL)
44495 return -ENOMEM;
44496
44497 @@ -1030,7 +1030,7 @@ cifs_init_request_bufs(void)
44498 efficient to alloc 1 per page off the slab compared to 17K (5page)
44499 alloc of large cifs buffers even when page debugging is on */
44500 cifs_sm_req_cachep = kmem_cache_create("cifs_small_rq",
44501 - MAX_CIFS_SMALL_BUFFER_SIZE, 0, SLAB_HWCACHE_ALIGN,
44502 + MAX_CIFS_SMALL_BUFFER_SIZE, 0, SLAB_HWCACHE_ALIGN | SLAB_USERCOPY,
44503 NULL);
44504 if (cifs_sm_req_cachep == NULL) {
44505 mempool_destroy(cifs_req_poolp);
44506 @@ -1115,8 +1115,8 @@ init_cifs(void)
44507 atomic_set(&bufAllocCount, 0);
44508 atomic_set(&smBufAllocCount, 0);
44509 #ifdef CONFIG_CIFS_STATS2
44510 - atomic_set(&totBufAllocCount, 0);
44511 - atomic_set(&totSmBufAllocCount, 0);
44512 + atomic_set_unchecked(&totBufAllocCount, 0);
44513 + atomic_set_unchecked(&totSmBufAllocCount, 0);
44514 #endif /* CONFIG_CIFS_STATS2 */
44515
44516 atomic_set(&midCount, 0);
44517 diff --git a/fs/cifs/cifsglob.h b/fs/cifs/cifsglob.h
44518 index 977dc0e..ba48ab9 100644
44519 --- a/fs/cifs/cifsglob.h
44520 +++ b/fs/cifs/cifsglob.h
44521 @@ -590,35 +590,35 @@ struct cifs_tcon {
44522 __u16 Flags; /* optional support bits */
44523 enum statusEnum tidStatus;
44524 #ifdef CONFIG_CIFS_STATS
44525 - atomic_t num_smbs_sent;
44526 + atomic_unchecked_t num_smbs_sent;
44527 union {
44528 struct {
44529 - atomic_t num_writes;
44530 - atomic_t num_reads;
44531 - atomic_t num_flushes;
44532 - atomic_t num_oplock_brks;
44533 - atomic_t num_opens;
44534 - atomic_t num_closes;
44535 - atomic_t num_deletes;
44536 - atomic_t num_mkdirs;
44537 - atomic_t num_posixopens;
44538 - atomic_t num_posixmkdirs;
44539 - atomic_t num_rmdirs;
44540 - atomic_t num_renames;
44541 - atomic_t num_t2renames;
44542 - atomic_t num_ffirst;
44543 - atomic_t num_fnext;
44544 - atomic_t num_fclose;
44545 - atomic_t num_hardlinks;
44546 - atomic_t num_symlinks;
44547 - atomic_t num_locks;
44548 - atomic_t num_acl_get;
44549 - atomic_t num_acl_set;
44550 + atomic_unchecked_t num_writes;
44551 + atomic_unchecked_t num_reads;
44552 + atomic_unchecked_t num_flushes;
44553 + atomic_unchecked_t num_oplock_brks;
44554 + atomic_unchecked_t num_opens;
44555 + atomic_unchecked_t num_closes;
44556 + atomic_unchecked_t num_deletes;
44557 + atomic_unchecked_t num_mkdirs;
44558 + atomic_unchecked_t num_posixopens;
44559 + atomic_unchecked_t num_posixmkdirs;
44560 + atomic_unchecked_t num_rmdirs;
44561 + atomic_unchecked_t num_renames;
44562 + atomic_unchecked_t num_t2renames;
44563 + atomic_unchecked_t num_ffirst;
44564 + atomic_unchecked_t num_fnext;
44565 + atomic_unchecked_t num_fclose;
44566 + atomic_unchecked_t num_hardlinks;
44567 + atomic_unchecked_t num_symlinks;
44568 + atomic_unchecked_t num_locks;
44569 + atomic_unchecked_t num_acl_get;
44570 + atomic_unchecked_t num_acl_set;
44571 } cifs_stats;
44572 #ifdef CONFIG_CIFS_SMB2
44573 struct {
44574 - atomic_t smb2_com_sent[NUMBER_OF_SMB2_COMMANDS];
44575 - atomic_t smb2_com_failed[NUMBER_OF_SMB2_COMMANDS];
44576 + atomic_unchecked_t smb2_com_sent[NUMBER_OF_SMB2_COMMANDS];
44577 + atomic_unchecked_t smb2_com_failed[NUMBER_OF_SMB2_COMMANDS];
44578 } smb2_stats;
44579 #endif /* CONFIG_CIFS_SMB2 */
44580 } stats;
44581 @@ -862,7 +862,7 @@ build_path_to_root(struct smb_vol *vol, struct cifs_sb_info *cifs_sb,
44582 }
44583
44584 #ifdef CONFIG_CIFS_STATS
44585 -#define cifs_stats_inc atomic_inc
44586 +#define cifs_stats_inc atomic_inc_unchecked
44587
44588 static inline void cifs_stats_bytes_written(struct cifs_tcon *tcon,
44589 unsigned int bytes)
44590 @@ -1227,8 +1227,8 @@ GLOBAL_EXTERN atomic_t tconInfoReconnectCount;
44591 /* Various Debug counters */
44592 GLOBAL_EXTERN atomic_t bufAllocCount; /* current number allocated */
44593 #ifdef CONFIG_CIFS_STATS2
44594 -GLOBAL_EXTERN atomic_t totBufAllocCount; /* total allocated over all time */
44595 -GLOBAL_EXTERN atomic_t totSmBufAllocCount;
44596 +GLOBAL_EXTERN atomic_unchecked_t totBufAllocCount; /* total allocated over all time */
44597 +GLOBAL_EXTERN atomic_unchecked_t totSmBufAllocCount;
44598 #endif
44599 GLOBAL_EXTERN atomic_t smBufAllocCount;
44600 GLOBAL_EXTERN atomic_t midCount;
44601 diff --git a/fs/cifs/link.c b/fs/cifs/link.c
44602 index e6ce3b1..adc21fd 100644
44603 --- a/fs/cifs/link.c
44604 +++ b/fs/cifs/link.c
44605 @@ -602,7 +602,7 @@ symlink_exit:
44606
44607 void cifs_put_link(struct dentry *direntry, struct nameidata *nd, void *cookie)
44608 {
44609 - char *p = nd_get_link(nd);
44610 + const char *p = nd_get_link(nd);
44611 if (!IS_ERR(p))
44612 kfree(p);
44613 }
44614 diff --git a/fs/cifs/misc.c b/fs/cifs/misc.c
44615 index ce41fee..ac0d27a 100644
44616 --- a/fs/cifs/misc.c
44617 +++ b/fs/cifs/misc.c
44618 @@ -169,7 +169,7 @@ cifs_buf_get(void)
44619 memset(ret_buf, 0, buf_size + 3);
44620 atomic_inc(&bufAllocCount);
44621 #ifdef CONFIG_CIFS_STATS2
44622 - atomic_inc(&totBufAllocCount);
44623 + atomic_inc_unchecked(&totBufAllocCount);
44624 #endif /* CONFIG_CIFS_STATS2 */
44625 }
44626
44627 @@ -204,7 +204,7 @@ cifs_small_buf_get(void)
44628 /* memset(ret_buf, 0, sizeof(struct smb_hdr) + 27);*/
44629 atomic_inc(&smBufAllocCount);
44630 #ifdef CONFIG_CIFS_STATS2
44631 - atomic_inc(&totSmBufAllocCount);
44632 + atomic_inc_unchecked(&totSmBufAllocCount);
44633 #endif /* CONFIG_CIFS_STATS2 */
44634
44635 }
44636 diff --git a/fs/cifs/smb1ops.c b/fs/cifs/smb1ops.c
44637 index 3129ac7..cc4a948 100644
44638 --- a/fs/cifs/smb1ops.c
44639 +++ b/fs/cifs/smb1ops.c
44640 @@ -524,27 +524,27 @@ static void
44641 cifs_clear_stats(struct cifs_tcon *tcon)
44642 {
44643 #ifdef CONFIG_CIFS_STATS
44644 - atomic_set(&tcon->stats.cifs_stats.num_writes, 0);
44645 - atomic_set(&tcon->stats.cifs_stats.num_reads, 0);
44646 - atomic_set(&tcon->stats.cifs_stats.num_flushes, 0);
44647 - atomic_set(&tcon->stats.cifs_stats.num_oplock_brks, 0);
44648 - atomic_set(&tcon->stats.cifs_stats.num_opens, 0);
44649 - atomic_set(&tcon->stats.cifs_stats.num_posixopens, 0);
44650 - atomic_set(&tcon->stats.cifs_stats.num_posixmkdirs, 0);
44651 - atomic_set(&tcon->stats.cifs_stats.num_closes, 0);
44652 - atomic_set(&tcon->stats.cifs_stats.num_deletes, 0);
44653 - atomic_set(&tcon->stats.cifs_stats.num_mkdirs, 0);
44654 - atomic_set(&tcon->stats.cifs_stats.num_rmdirs, 0);
44655 - atomic_set(&tcon->stats.cifs_stats.num_renames, 0);
44656 - atomic_set(&tcon->stats.cifs_stats.num_t2renames, 0);
44657 - atomic_set(&tcon->stats.cifs_stats.num_ffirst, 0);
44658 - atomic_set(&tcon->stats.cifs_stats.num_fnext, 0);
44659 - atomic_set(&tcon->stats.cifs_stats.num_fclose, 0);
44660 - atomic_set(&tcon->stats.cifs_stats.num_hardlinks, 0);
44661 - atomic_set(&tcon->stats.cifs_stats.num_symlinks, 0);
44662 - atomic_set(&tcon->stats.cifs_stats.num_locks, 0);
44663 - atomic_set(&tcon->stats.cifs_stats.num_acl_get, 0);
44664 - atomic_set(&tcon->stats.cifs_stats.num_acl_set, 0);
44665 + atomic_set_unchecked(&tcon->stats.cifs_stats.num_writes, 0);
44666 + atomic_set_unchecked(&tcon->stats.cifs_stats.num_reads, 0);
44667 + atomic_set_unchecked(&tcon->stats.cifs_stats.num_flushes, 0);
44668 + atomic_set_unchecked(&tcon->stats.cifs_stats.num_oplock_brks, 0);
44669 + atomic_set_unchecked(&tcon->stats.cifs_stats.num_opens, 0);
44670 + atomic_set_unchecked(&tcon->stats.cifs_stats.num_posixopens, 0);
44671 + atomic_set_unchecked(&tcon->stats.cifs_stats.num_posixmkdirs, 0);
44672 + atomic_set_unchecked(&tcon->stats.cifs_stats.num_closes, 0);
44673 + atomic_set_unchecked(&tcon->stats.cifs_stats.num_deletes, 0);
44674 + atomic_set_unchecked(&tcon->stats.cifs_stats.num_mkdirs, 0);
44675 + atomic_set_unchecked(&tcon->stats.cifs_stats.num_rmdirs, 0);
44676 + atomic_set_unchecked(&tcon->stats.cifs_stats.num_renames, 0);
44677 + atomic_set_unchecked(&tcon->stats.cifs_stats.num_t2renames, 0);
44678 + atomic_set_unchecked(&tcon->stats.cifs_stats.num_ffirst, 0);
44679 + atomic_set_unchecked(&tcon->stats.cifs_stats.num_fnext, 0);
44680 + atomic_set_unchecked(&tcon->stats.cifs_stats.num_fclose, 0);
44681 + atomic_set_unchecked(&tcon->stats.cifs_stats.num_hardlinks, 0);
44682 + atomic_set_unchecked(&tcon->stats.cifs_stats.num_symlinks, 0);
44683 + atomic_set_unchecked(&tcon->stats.cifs_stats.num_locks, 0);
44684 + atomic_set_unchecked(&tcon->stats.cifs_stats.num_acl_get, 0);
44685 + atomic_set_unchecked(&tcon->stats.cifs_stats.num_acl_set, 0);
44686 #endif
44687 }
44688
44689 @@ -553,36 +553,36 @@ cifs_print_stats(struct seq_file *m, struct cifs_tcon *tcon)
44690 {
44691 #ifdef CONFIG_CIFS_STATS
44692 seq_printf(m, " Oplocks breaks: %d",
44693 - atomic_read(&tcon->stats.cifs_stats.num_oplock_brks));
44694 + atomic_read_unchecked(&tcon->stats.cifs_stats.num_oplock_brks));
44695 seq_printf(m, "\nReads: %d Bytes: %llu",
44696 - atomic_read(&tcon->stats.cifs_stats.num_reads),
44697 + atomic_read_unchecked(&tcon->stats.cifs_stats.num_reads),
44698 (long long)(tcon->bytes_read));
44699 seq_printf(m, "\nWrites: %d Bytes: %llu",
44700 - atomic_read(&tcon->stats.cifs_stats.num_writes),
44701 + atomic_read_unchecked(&tcon->stats.cifs_stats.num_writes),
44702 (long long)(tcon->bytes_written));
44703 seq_printf(m, "\nFlushes: %d",
44704 - atomic_read(&tcon->stats.cifs_stats.num_flushes));
44705 + atomic_read_unchecked(&tcon->stats.cifs_stats.num_flushes));
44706 seq_printf(m, "\nLocks: %d HardLinks: %d Symlinks: %d",
44707 - atomic_read(&tcon->stats.cifs_stats.num_locks),
44708 - atomic_read(&tcon->stats.cifs_stats.num_hardlinks),
44709 - atomic_read(&tcon->stats.cifs_stats.num_symlinks));
44710 + atomic_read_unchecked(&tcon->stats.cifs_stats.num_locks),
44711 + atomic_read_unchecked(&tcon->stats.cifs_stats.num_hardlinks),
44712 + atomic_read_unchecked(&tcon->stats.cifs_stats.num_symlinks));
44713 seq_printf(m, "\nOpens: %d Closes: %d Deletes: %d",
44714 - atomic_read(&tcon->stats.cifs_stats.num_opens),
44715 - atomic_read(&tcon->stats.cifs_stats.num_closes),
44716 - atomic_read(&tcon->stats.cifs_stats.num_deletes));
44717 + atomic_read_unchecked(&tcon->stats.cifs_stats.num_opens),
44718 + atomic_read_unchecked(&tcon->stats.cifs_stats.num_closes),
44719 + atomic_read_unchecked(&tcon->stats.cifs_stats.num_deletes));
44720 seq_printf(m, "\nPosix Opens: %d Posix Mkdirs: %d",
44721 - atomic_read(&tcon->stats.cifs_stats.num_posixopens),
44722 - atomic_read(&tcon->stats.cifs_stats.num_posixmkdirs));
44723 + atomic_read_unchecked(&tcon->stats.cifs_stats.num_posixopens),
44724 + atomic_read_unchecked(&tcon->stats.cifs_stats.num_posixmkdirs));
44725 seq_printf(m, "\nMkdirs: %d Rmdirs: %d",
44726 - atomic_read(&tcon->stats.cifs_stats.num_mkdirs),
44727 - atomic_read(&tcon->stats.cifs_stats.num_rmdirs));
44728 + atomic_read_unchecked(&tcon->stats.cifs_stats.num_mkdirs),
44729 + atomic_read_unchecked(&tcon->stats.cifs_stats.num_rmdirs));
44730 seq_printf(m, "\nRenames: %d T2 Renames %d",
44731 - atomic_read(&tcon->stats.cifs_stats.num_renames),
44732 - atomic_read(&tcon->stats.cifs_stats.num_t2renames));
44733 + atomic_read_unchecked(&tcon->stats.cifs_stats.num_renames),
44734 + atomic_read_unchecked(&tcon->stats.cifs_stats.num_t2renames));
44735 seq_printf(m, "\nFindFirst: %d FNext %d FClose %d",
44736 - atomic_read(&tcon->stats.cifs_stats.num_ffirst),
44737 - atomic_read(&tcon->stats.cifs_stats.num_fnext),
44738 - atomic_read(&tcon->stats.cifs_stats.num_fclose));
44739 + atomic_read_unchecked(&tcon->stats.cifs_stats.num_ffirst),
44740 + atomic_read_unchecked(&tcon->stats.cifs_stats.num_fnext),
44741 + atomic_read_unchecked(&tcon->stats.cifs_stats.num_fclose));
44742 #endif
44743 }
44744
44745 diff --git a/fs/cifs/smb2ops.c b/fs/cifs/smb2ops.c
44746 index 826209b..fa460f4 100644
44747 --- a/fs/cifs/smb2ops.c
44748 +++ b/fs/cifs/smb2ops.c
44749 @@ -219,8 +219,8 @@ smb2_clear_stats(struct cifs_tcon *tcon)
44750 #ifdef CONFIG_CIFS_STATS
44751 int i;
44752 for (i = 0; i < NUMBER_OF_SMB2_COMMANDS; i++) {
44753 - atomic_set(&tcon->stats.smb2_stats.smb2_com_sent[i], 0);
44754 - atomic_set(&tcon->stats.smb2_stats.smb2_com_failed[i], 0);
44755 + atomic_set_unchecked(&tcon->stats.smb2_stats.smb2_com_sent[i], 0);
44756 + atomic_set_unchecked(&tcon->stats.smb2_stats.smb2_com_failed[i], 0);
44757 }
44758 #endif
44759 }
44760 @@ -229,66 +229,66 @@ static void
44761 smb2_print_stats(struct seq_file *m, struct cifs_tcon *tcon)
44762 {
44763 #ifdef CONFIG_CIFS_STATS
44764 - atomic_t *sent = tcon->stats.smb2_stats.smb2_com_sent;
44765 - atomic_t *failed = tcon->stats.smb2_stats.smb2_com_failed;
44766 + atomic_unchecked_t *sent = tcon->stats.smb2_stats.smb2_com_sent;
44767 + atomic_unchecked_t *failed = tcon->stats.smb2_stats.smb2_com_failed;
44768 seq_printf(m, "\nNegotiates: %d sent %d failed",
44769 - atomic_read(&sent[SMB2_NEGOTIATE_HE]),
44770 - atomic_read(&failed[SMB2_NEGOTIATE_HE]));
44771 + atomic_read_unchecked(&sent[SMB2_NEGOTIATE_HE]),
44772 + atomic_read_unchecked(&failed[SMB2_NEGOTIATE_HE]));
44773 seq_printf(m, "\nSessionSetups: %d sent %d failed",
44774 - atomic_read(&sent[SMB2_SESSION_SETUP_HE]),
44775 - atomic_read(&failed[SMB2_SESSION_SETUP_HE]));
44776 + atomic_read_unchecked(&sent[SMB2_SESSION_SETUP_HE]),
44777 + atomic_read_unchecked(&failed[SMB2_SESSION_SETUP_HE]));
44778 #define SMB2LOGOFF 0x0002 /* trivial request/resp */
44779 seq_printf(m, "\nLogoffs: %d sent %d failed",
44780 - atomic_read(&sent[SMB2_LOGOFF_HE]),
44781 - atomic_read(&failed[SMB2_LOGOFF_HE]));
44782 + atomic_read_unchecked(&sent[SMB2_LOGOFF_HE]),
44783 + atomic_read_unchecked(&failed[SMB2_LOGOFF_HE]));
44784 seq_printf(m, "\nTreeConnects: %d sent %d failed",
44785 - atomic_read(&sent[SMB2_TREE_CONNECT_HE]),
44786 - atomic_read(&failed[SMB2_TREE_CONNECT_HE]));
44787 + atomic_read_unchecked(&sent[SMB2_TREE_CONNECT_HE]),
44788 + atomic_read_unchecked(&failed[SMB2_TREE_CONNECT_HE]));
44789 seq_printf(m, "\nTreeDisconnects: %d sent %d failed",
44790 - atomic_read(&sent[SMB2_TREE_DISCONNECT_HE]),
44791 - atomic_read(&failed[SMB2_TREE_DISCONNECT_HE]));
44792 + atomic_read_unchecked(&sent[SMB2_TREE_DISCONNECT_HE]),
44793 + atomic_read_unchecked(&failed[SMB2_TREE_DISCONNECT_HE]));
44794 seq_printf(m, "\nCreates: %d sent %d failed",
44795 - atomic_read(&sent[SMB2_CREATE_HE]),
44796 - atomic_read(&failed[SMB2_CREATE_HE]));
44797 + atomic_read_unchecked(&sent[SMB2_CREATE_HE]),
44798 + atomic_read_unchecked(&failed[SMB2_CREATE_HE]));
44799 seq_printf(m, "\nCloses: %d sent %d failed",
44800 - atomic_read(&sent[SMB2_CLOSE_HE]),
44801 - atomic_read(&failed[SMB2_CLOSE_HE]));
44802 + atomic_read_unchecked(&sent[SMB2_CLOSE_HE]),
44803 + atomic_read_unchecked(&failed[SMB2_CLOSE_HE]));
44804 seq_printf(m, "\nFlushes: %d sent %d failed",
44805 - atomic_read(&sent[SMB2_FLUSH_HE]),
44806 - atomic_read(&failed[SMB2_FLUSH_HE]));
44807 + atomic_read_unchecked(&sent[SMB2_FLUSH_HE]),
44808 + atomic_read_unchecked(&failed[SMB2_FLUSH_HE]));
44809 seq_printf(m, "\nReads: %d sent %d failed",
44810 - atomic_read(&sent[SMB2_READ_HE]),
44811 - atomic_read(&failed[SMB2_READ_HE]));
44812 + atomic_read_unchecked(&sent[SMB2_READ_HE]),
44813 + atomic_read_unchecked(&failed[SMB2_READ_HE]));
44814 seq_printf(m, "\nWrites: %d sent %d failed",
44815 - atomic_read(&sent[SMB2_WRITE_HE]),
44816 - atomic_read(&failed[SMB2_WRITE_HE]));
44817 + atomic_read_unchecked(&sent[SMB2_WRITE_HE]),
44818 + atomic_read_unchecked(&failed[SMB2_WRITE_HE]));
44819 seq_printf(m, "\nLocks: %d sent %d failed",
44820 - atomic_read(&sent[SMB2_LOCK_HE]),
44821 - atomic_read(&failed[SMB2_LOCK_HE]));
44822 + atomic_read_unchecked(&sent[SMB2_LOCK_HE]),
44823 + atomic_read_unchecked(&failed[SMB2_LOCK_HE]));
44824 seq_printf(m, "\nIOCTLs: %d sent %d failed",
44825 - atomic_read(&sent[SMB2_IOCTL_HE]),
44826 - atomic_read(&failed[SMB2_IOCTL_HE]));
44827 + atomic_read_unchecked(&sent[SMB2_IOCTL_HE]),
44828 + atomic_read_unchecked(&failed[SMB2_IOCTL_HE]));
44829 seq_printf(m, "\nCancels: %d sent %d failed",
44830 - atomic_read(&sent[SMB2_CANCEL_HE]),
44831 - atomic_read(&failed[SMB2_CANCEL_HE]));
44832 + atomic_read_unchecked(&sent[SMB2_CANCEL_HE]),
44833 + atomic_read_unchecked(&failed[SMB2_CANCEL_HE]));
44834 seq_printf(m, "\nEchos: %d sent %d failed",
44835 - atomic_read(&sent[SMB2_ECHO_HE]),
44836 - atomic_read(&failed[SMB2_ECHO_HE]));
44837 + atomic_read_unchecked(&sent[SMB2_ECHO_HE]),
44838 + atomic_read_unchecked(&failed[SMB2_ECHO_HE]));
44839 seq_printf(m, "\nQueryDirectories: %d sent %d failed",
44840 - atomic_read(&sent[SMB2_QUERY_DIRECTORY_HE]),
44841 - atomic_read(&failed[SMB2_QUERY_DIRECTORY_HE]));
44842 + atomic_read_unchecked(&sent[SMB2_QUERY_DIRECTORY_HE]),
44843 + atomic_read_unchecked(&failed[SMB2_QUERY_DIRECTORY_HE]));
44844 seq_printf(m, "\nChangeNotifies: %d sent %d failed",
44845 - atomic_read(&sent[SMB2_CHANGE_NOTIFY_HE]),
44846 - atomic_read(&failed[SMB2_CHANGE_NOTIFY_HE]));
44847 + atomic_read_unchecked(&sent[SMB2_CHANGE_NOTIFY_HE]),
44848 + atomic_read_unchecked(&failed[SMB2_CHANGE_NOTIFY_HE]));
44849 seq_printf(m, "\nQueryInfos: %d sent %d failed",
44850 - atomic_read(&sent[SMB2_QUERY_INFO_HE]),
44851 - atomic_read(&failed[SMB2_QUERY_INFO_HE]));
44852 + atomic_read_unchecked(&sent[SMB2_QUERY_INFO_HE]),
44853 + atomic_read_unchecked(&failed[SMB2_QUERY_INFO_HE]));
44854 seq_printf(m, "\nSetInfos: %d sent %d failed",
44855 - atomic_read(&sent[SMB2_SET_INFO_HE]),
44856 - atomic_read(&failed[SMB2_SET_INFO_HE]));
44857 + atomic_read_unchecked(&sent[SMB2_SET_INFO_HE]),
44858 + atomic_read_unchecked(&failed[SMB2_SET_INFO_HE]));
44859 seq_printf(m, "\nOplockBreaks: %d sent %d failed",
44860 - atomic_read(&sent[SMB2_OPLOCK_BREAK_HE]),
44861 - atomic_read(&failed[SMB2_OPLOCK_BREAK_HE]));
44862 + atomic_read_unchecked(&sent[SMB2_OPLOCK_BREAK_HE]),
44863 + atomic_read_unchecked(&failed[SMB2_OPLOCK_BREAK_HE]));
44864 #endif
44865 }
44866
44867 diff --git a/fs/coda/cache.c b/fs/coda/cache.c
44868 index 958ae0e..505c9d0 100644
44869 --- a/fs/coda/cache.c
44870 +++ b/fs/coda/cache.c
44871 @@ -24,7 +24,7 @@
44872 #include "coda_linux.h"
44873 #include "coda_cache.h"
44874
44875 -static atomic_t permission_epoch = ATOMIC_INIT(0);
44876 +static atomic_unchecked_t permission_epoch = ATOMIC_INIT(0);
44877
44878 /* replace or extend an acl cache hit */
44879 void coda_cache_enter(struct inode *inode, int mask)
44880 @@ -32,7 +32,7 @@ void coda_cache_enter(struct inode *inode, int mask)
44881 struct coda_inode_info *cii = ITOC(inode);
44882
44883 spin_lock(&cii->c_lock);
44884 - cii->c_cached_epoch = atomic_read(&permission_epoch);
44885 + cii->c_cached_epoch = atomic_read_unchecked(&permission_epoch);
44886 if (cii->c_uid != current_fsuid()) {
44887 cii->c_uid = current_fsuid();
44888 cii->c_cached_perm = mask;
44889 @@ -46,14 +46,14 @@ void coda_cache_clear_inode(struct inode *inode)
44890 {
44891 struct coda_inode_info *cii = ITOC(inode);
44892 spin_lock(&cii->c_lock);
44893 - cii->c_cached_epoch = atomic_read(&permission_epoch) - 1;
44894 + cii->c_cached_epoch = atomic_read_unchecked(&permission_epoch) - 1;
44895 spin_unlock(&cii->c_lock);
44896 }
44897
44898 /* remove all acl caches */
44899 void coda_cache_clear_all(struct super_block *sb)
44900 {
44901 - atomic_inc(&permission_epoch);
44902 + atomic_inc_unchecked(&permission_epoch);
44903 }
44904
44905
44906 @@ -66,7 +66,7 @@ int coda_cache_check(struct inode *inode, int mask)
44907 spin_lock(&cii->c_lock);
44908 hit = (mask & cii->c_cached_perm) == mask &&
44909 cii->c_uid == current_fsuid() &&
44910 - cii->c_cached_epoch == atomic_read(&permission_epoch);
44911 + cii->c_cached_epoch == atomic_read_unchecked(&permission_epoch);
44912 spin_unlock(&cii->c_lock);
44913
44914 return hit;
44915 diff --git a/fs/compat.c b/fs/compat.c
44916 index 1bdb350..9f28287 100644
44917 --- a/fs/compat.c
44918 +++ b/fs/compat.c
44919 @@ -490,7 +490,7 @@ compat_sys_io_setup(unsigned nr_reqs, u32 __user *ctx32p)
44920
44921 set_fs(KERNEL_DS);
44922 /* The __user pointer cast is valid because of the set_fs() */
44923 - ret = sys_io_setup(nr_reqs, (aio_context_t __user *) &ctx64);
44924 + ret = sys_io_setup(nr_reqs, (aio_context_t __force_user *) &ctx64);
44925 set_fs(oldfs);
44926 /* truncating is ok because it's a user address */
44927 if (!ret)
44928 @@ -548,7 +548,7 @@ ssize_t compat_rw_copy_check_uvector(int type,
44929 goto out;
44930
44931 ret = -EINVAL;
44932 - if (nr_segs > UIO_MAXIOV || nr_segs < 0)
44933 + if (nr_segs > UIO_MAXIOV)
44934 goto out;
44935 if (nr_segs > fast_segs) {
44936 ret = -ENOMEM;
44937 @@ -831,6 +831,7 @@ struct compat_old_linux_dirent {
44938
44939 struct compat_readdir_callback {
44940 struct compat_old_linux_dirent __user *dirent;
44941 + struct file * file;
44942 int result;
44943 };
44944
44945 @@ -848,6 +849,10 @@ static int compat_fillonedir(void *__buf, const char *name, int namlen,
44946 buf->result = -EOVERFLOW;
44947 return -EOVERFLOW;
44948 }
44949 +
44950 + if (!gr_acl_handle_filldir(buf->file, name, namlen, ino))
44951 + return 0;
44952 +
44953 buf->result++;
44954 dirent = buf->dirent;
44955 if (!access_ok(VERIFY_WRITE, dirent,
44956 @@ -880,6 +885,7 @@ asmlinkage long compat_sys_old_readdir(unsigned int fd,
44957
44958 buf.result = 0;
44959 buf.dirent = dirent;
44960 + buf.file = file;
44961
44962 error = vfs_readdir(file, compat_fillonedir, &buf);
44963 if (buf.result)
44964 @@ -899,6 +905,7 @@ struct compat_linux_dirent {
44965 struct compat_getdents_callback {
44966 struct compat_linux_dirent __user *current_dir;
44967 struct compat_linux_dirent __user *previous;
44968 + struct file * file;
44969 int count;
44970 int error;
44971 };
44972 @@ -920,6 +927,10 @@ static int compat_filldir(void *__buf, const char *name, int namlen,
44973 buf->error = -EOVERFLOW;
44974 return -EOVERFLOW;
44975 }
44976 +
44977 + if (!gr_acl_handle_filldir(buf->file, name, namlen, ino))
44978 + return 0;
44979 +
44980 dirent = buf->previous;
44981 if (dirent) {
44982 if (__put_user(offset, &dirent->d_off))
44983 @@ -966,6 +977,7 @@ asmlinkage long compat_sys_getdents(unsigned int fd,
44984 buf.previous = NULL;
44985 buf.count = count;
44986 buf.error = 0;
44987 + buf.file = file;
44988
44989 error = vfs_readdir(file, compat_filldir, &buf);
44990 if (error >= 0)
44991 @@ -986,6 +998,7 @@ asmlinkage long compat_sys_getdents(unsigned int fd,
44992 struct compat_getdents_callback64 {
44993 struct linux_dirent64 __user *current_dir;
44994 struct linux_dirent64 __user *previous;
44995 + struct file * file;
44996 int count;
44997 int error;
44998 };
44999 @@ -1002,6 +1015,10 @@ static int compat_filldir64(void * __buf, const char * name, int namlen, loff_t
45000 buf->error = -EINVAL; /* only used if we fail.. */
45001 if (reclen > buf->count)
45002 return -EINVAL;
45003 +
45004 + if (!gr_acl_handle_filldir(buf->file, name, namlen, ino))
45005 + return 0;
45006 +
45007 dirent = buf->previous;
45008
45009 if (dirent) {
45010 @@ -1052,13 +1069,14 @@ asmlinkage long compat_sys_getdents64(unsigned int fd,
45011 buf.previous = NULL;
45012 buf.count = count;
45013 buf.error = 0;
45014 + buf.file = file;
45015
45016 error = vfs_readdir(file, compat_filldir64, &buf);
45017 if (error >= 0)
45018 error = buf.error;
45019 lastdirent = buf.previous;
45020 if (lastdirent) {
45021 - typeof(lastdirent->d_off) d_off = file->f_pos;
45022 + typeof(((struct linux_dirent64 *)0)->d_off) d_off = file->f_pos;
45023 if (__put_user_unaligned(d_off, &lastdirent->d_off))
45024 error = -EFAULT;
45025 else
45026 diff --git a/fs/compat_binfmt_elf.c b/fs/compat_binfmt_elf.c
45027 index 112e45a..b59845b 100644
45028 --- a/fs/compat_binfmt_elf.c
45029 +++ b/fs/compat_binfmt_elf.c
45030 @@ -30,11 +30,13 @@
45031 #undef elf_phdr
45032 #undef elf_shdr
45033 #undef elf_note
45034 +#undef elf_dyn
45035 #undef elf_addr_t
45036 #define elfhdr elf32_hdr
45037 #define elf_phdr elf32_phdr
45038 #define elf_shdr elf32_shdr
45039 #define elf_note elf32_note
45040 +#define elf_dyn Elf32_Dyn
45041 #define elf_addr_t Elf32_Addr
45042
45043 /*
45044 diff --git a/fs/compat_ioctl.c b/fs/compat_ioctl.c
45045 index 5d2069f..75d31d4 100644
45046 --- a/fs/compat_ioctl.c
45047 +++ b/fs/compat_ioctl.c
45048 @@ -623,7 +623,7 @@ static int serial_struct_ioctl(unsigned fd, unsigned cmd,
45049 return -EFAULT;
45050 if (__get_user(udata, &ss32->iomem_base))
45051 return -EFAULT;
45052 - ss.iomem_base = compat_ptr(udata);
45053 + ss.iomem_base = (unsigned char __force_kernel *)compat_ptr(udata);
45054 if (__get_user(ss.iomem_reg_shift, &ss32->iomem_reg_shift) ||
45055 __get_user(ss.port_high, &ss32->port_high))
45056 return -EFAULT;
45057 @@ -798,7 +798,7 @@ static int compat_ioctl_preallocate(struct file *file,
45058 copy_in_user(&p->l_len, &p32->l_len, sizeof(s64)) ||
45059 copy_in_user(&p->l_sysid, &p32->l_sysid, sizeof(s32)) ||
45060 copy_in_user(&p->l_pid, &p32->l_pid, sizeof(u32)) ||
45061 - copy_in_user(&p->l_pad, &p32->l_pad, 4*sizeof(u32)))
45062 + copy_in_user(p->l_pad, &p32->l_pad, 4*sizeof(u32)))
45063 return -EFAULT;
45064
45065 return ioctl_preallocate(file, p);
45066 @@ -1612,8 +1612,8 @@ asmlinkage long compat_sys_ioctl(unsigned int fd, unsigned int cmd,
45067 static int __init init_sys32_ioctl_cmp(const void *p, const void *q)
45068 {
45069 unsigned int a, b;
45070 - a = *(unsigned int *)p;
45071 - b = *(unsigned int *)q;
45072 + a = *(const unsigned int *)p;
45073 + b = *(const unsigned int *)q;
45074 if (a > b)
45075 return 1;
45076 if (a < b)
45077 diff --git a/fs/configfs/dir.c b/fs/configfs/dir.c
45078 index 7414ae2..d98ad6d 100644
45079 --- a/fs/configfs/dir.c
45080 +++ b/fs/configfs/dir.c
45081 @@ -1564,7 +1564,8 @@ static int configfs_readdir(struct file * filp, void * dirent, filldir_t filldir
45082 }
45083 for (p=q->next; p!= &parent_sd->s_children; p=p->next) {
45084 struct configfs_dirent *next;
45085 - const char * name;
45086 + const unsigned char * name;
45087 + char d_name[sizeof(next->s_dentry->d_iname)];
45088 int len;
45089 struct inode *inode = NULL;
45090
45091 @@ -1574,7 +1575,12 @@ static int configfs_readdir(struct file * filp, void * dirent, filldir_t filldir
45092 continue;
45093
45094 name = configfs_get_name(next);
45095 - len = strlen(name);
45096 + if (next->s_dentry && name == next->s_dentry->d_iname) {
45097 + len = next->s_dentry->d_name.len;
45098 + memcpy(d_name, name, len);
45099 + name = d_name;
45100 + } else
45101 + len = strlen(name);
45102
45103 /*
45104 * We'll have a dentry and an inode for
45105 diff --git a/fs/dcache.c b/fs/dcache.c
45106 index 693f95b..95f1223 100644
45107 --- a/fs/dcache.c
45108 +++ b/fs/dcache.c
45109 @@ -3164,7 +3164,7 @@ void __init vfs_caches_init(unsigned long mempages)
45110 mempages -= reserve;
45111
45112 names_cachep = kmem_cache_create("names_cache", PATH_MAX, 0,
45113 - SLAB_HWCACHE_ALIGN|SLAB_PANIC, NULL);
45114 + SLAB_HWCACHE_ALIGN|SLAB_PANIC|SLAB_USERCOPY, NULL);
45115
45116 dcache_init();
45117 inode_init();
45118 diff --git a/fs/debugfs/inode.c b/fs/debugfs/inode.c
45119 index 4733eab..71ef6fa 100644
45120 --- a/fs/debugfs/inode.c
45121 +++ b/fs/debugfs/inode.c
45122 @@ -406,7 +406,11 @@ EXPORT_SYMBOL_GPL(debugfs_create_file);
45123 */
45124 struct dentry *debugfs_create_dir(const char *name, struct dentry *parent)
45125 {
45126 +#ifdef CONFIG_GRKERNSEC_SYSFS_RESTRICT
45127 + return __create_file(name, S_IFDIR | S_IRWXU,
45128 +#else
45129 return __create_file(name, S_IFDIR | S_IRWXU | S_IRUGO | S_IXUGO,
45130 +#endif
45131 parent, NULL, NULL);
45132 }
45133 EXPORT_SYMBOL_GPL(debugfs_create_dir);
45134 diff --git a/fs/ecryptfs/inode.c b/fs/ecryptfs/inode.c
45135 index cc7709e..7e7211f 100644
45136 --- a/fs/ecryptfs/inode.c
45137 +++ b/fs/ecryptfs/inode.c
45138 @@ -674,7 +674,7 @@ static int ecryptfs_readlink_lower(struct dentry *dentry, char **buf,
45139 old_fs = get_fs();
45140 set_fs(get_ds());
45141 rc = lower_dentry->d_inode->i_op->readlink(lower_dentry,
45142 - (char __user *)lower_buf,
45143 + (char __force_user *)lower_buf,
45144 PATH_MAX);
45145 set_fs(old_fs);
45146 if (rc < 0)
45147 @@ -706,7 +706,7 @@ out:
45148 static void
45149 ecryptfs_put_link(struct dentry *dentry, struct nameidata *nd, void *ptr)
45150 {
45151 - char *buf = nd_get_link(nd);
45152 + const char *buf = nd_get_link(nd);
45153 if (!IS_ERR(buf)) {
45154 /* Free the char* */
45155 kfree(buf);
45156 diff --git a/fs/ecryptfs/miscdev.c b/fs/ecryptfs/miscdev.c
45157 index 412e6ed..4292d22 100644
45158 --- a/fs/ecryptfs/miscdev.c
45159 +++ b/fs/ecryptfs/miscdev.c
45160 @@ -315,7 +315,7 @@ check_list:
45161 goto out_unlock_msg_ctx;
45162 i = PKT_TYPE_SIZE + PKT_CTR_SIZE;
45163 if (msg_ctx->msg) {
45164 - if (copy_to_user(&buf[i], packet_length, packet_length_size))
45165 + if (packet_length_size > sizeof(packet_length) || copy_to_user(&buf[i], packet_length, packet_length_size))
45166 goto out_unlock_msg_ctx;
45167 i += packet_length_size;
45168 if (copy_to_user(&buf[i], msg_ctx->msg, msg_ctx->msg_size))
45169 diff --git a/fs/ecryptfs/read_write.c b/fs/ecryptfs/read_write.c
45170 index b2a34a1..162fa69 100644
45171 --- a/fs/ecryptfs/read_write.c
45172 +++ b/fs/ecryptfs/read_write.c
45173 @@ -48,7 +48,7 @@ int ecryptfs_write_lower(struct inode *ecryptfs_inode, char *data,
45174 return -EIO;
45175 fs_save = get_fs();
45176 set_fs(get_ds());
45177 - rc = vfs_write(lower_file, data, size, &offset);
45178 + rc = vfs_write(lower_file, (const char __force_user *)data, size, &offset);
45179 set_fs(fs_save);
45180 mark_inode_dirty_sync(ecryptfs_inode);
45181 return rc;
45182 @@ -244,7 +244,7 @@ int ecryptfs_read_lower(char *data, loff_t offset, size_t size,
45183 return -EIO;
45184 fs_save = get_fs();
45185 set_fs(get_ds());
45186 - rc = vfs_read(lower_file, data, size, &offset);
45187 + rc = vfs_read(lower_file, (char __force_user *)data, size, &offset);
45188 set_fs(fs_save);
45189 return rc;
45190 }
45191 diff --git a/fs/exec.c b/fs/exec.c
45192 index fab2c6d..6a13dff 100644
45193 --- a/fs/exec.c
45194 +++ b/fs/exec.c
45195 @@ -55,6 +55,15 @@
45196 #include <linux/pipe_fs_i.h>
45197 #include <linux/oom.h>
45198 #include <linux/compat.h>
45199 +#include <linux/random.h>
45200 +#include <linux/seq_file.h>
45201 +
45202 +#ifdef CONFIG_PAX_REFCOUNT
45203 +#include <linux/kallsyms.h>
45204 +#include <linux/kdebug.h>
45205 +#endif
45206 +
45207 +#include <trace/events/fs.h>
45208
45209 #include <asm/uaccess.h>
45210 #include <asm/mmu_context.h>
45211 @@ -66,6 +75,18 @@
45212
45213 #include <trace/events/sched.h>
45214
45215 +#ifdef CONFIG_PAX_HAVE_ACL_FLAGS
45216 +void __weak pax_set_initial_flags(struct linux_binprm *bprm)
45217 +{
45218 + pr_warn_once("PAX: PAX_HAVE_ACL_FLAGS was enabled without providing the pax_set_initial_flags callback, this is probably not what you wanted.\n");
45219 +}
45220 +#endif
45221 +
45222 +#ifdef CONFIG_PAX_HOOK_ACL_FLAGS
45223 +void (*pax_set_initial_flags_func)(struct linux_binprm *bprm);
45224 +EXPORT_SYMBOL(pax_set_initial_flags_func);
45225 +#endif
45226 +
45227 int core_uses_pid;
45228 char core_pattern[CORENAME_MAX_SIZE] = "core";
45229 unsigned int core_pipe_limit;
45230 @@ -75,7 +96,7 @@ struct core_name {
45231 char *corename;
45232 int used, size;
45233 };
45234 -static atomic_t call_count = ATOMIC_INIT(1);
45235 +static atomic_unchecked_t call_count = ATOMIC_INIT(1);
45236
45237 /* The maximal length of core_pattern is also specified in sysctl.c */
45238
45239 @@ -191,18 +212,10 @@ static struct page *get_arg_page(struct linux_binprm *bprm, unsigned long pos,
45240 int write)
45241 {
45242 struct page *page;
45243 - int ret;
45244
45245 -#ifdef CONFIG_STACK_GROWSUP
45246 - if (write) {
45247 - ret = expand_downwards(bprm->vma, pos);
45248 - if (ret < 0)
45249 - return NULL;
45250 - }
45251 -#endif
45252 - ret = get_user_pages(current, bprm->mm, pos,
45253 - 1, write, 1, &page, NULL);
45254 - if (ret <= 0)
45255 + if (0 > expand_downwards(bprm->vma, pos))
45256 + return NULL;
45257 + if (0 >= get_user_pages(current, bprm->mm, pos, 1, write, 1, &page, NULL))
45258 return NULL;
45259
45260 if (write) {
45261 @@ -218,6 +231,17 @@ static struct page *get_arg_page(struct linux_binprm *bprm, unsigned long pos,
45262 if (size <= ARG_MAX)
45263 return page;
45264
45265 +#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
45266 + // only allow 512KB for argv+env on suid/sgid binaries
45267 + // to prevent easy ASLR exhaustion
45268 + if (((bprm->cred->euid != current_euid()) ||
45269 + (bprm->cred->egid != current_egid())) &&
45270 + (size > (512 * 1024))) {
45271 + put_page(page);
45272 + return NULL;
45273 + }
45274 +#endif
45275 +
45276 /*
45277 * Limit to 1/4-th the stack size for the argv+env strings.
45278 * This ensures that:
45279 @@ -277,6 +301,11 @@ static int __bprm_mm_init(struct linux_binprm *bprm)
45280 vma->vm_end = STACK_TOP_MAX;
45281 vma->vm_start = vma->vm_end - PAGE_SIZE;
45282 vma->vm_flags = VM_STACK_FLAGS | VM_STACK_INCOMPLETE_SETUP;
45283 +
45284 +#ifdef CONFIG_PAX_SEGMEXEC
45285 + vma->vm_flags &= ~(VM_EXEC | VM_MAYEXEC);
45286 +#endif
45287 +
45288 vma->vm_page_prot = vm_get_page_prot(vma->vm_flags);
45289 INIT_LIST_HEAD(&vma->anon_vma_chain);
45290
45291 @@ -287,6 +316,12 @@ static int __bprm_mm_init(struct linux_binprm *bprm)
45292 mm->stack_vm = mm->total_vm = 1;
45293 up_write(&mm->mmap_sem);
45294 bprm->p = vma->vm_end - sizeof(void *);
45295 +
45296 +#ifdef CONFIG_PAX_RANDUSTACK
45297 + if (randomize_va_space)
45298 + bprm->p ^= random32() & ~PAGE_MASK;
45299 +#endif
45300 +
45301 return 0;
45302 err:
45303 up_write(&mm->mmap_sem);
45304 @@ -395,19 +430,7 @@ err:
45305 return err;
45306 }
45307
45308 -struct user_arg_ptr {
45309 -#ifdef CONFIG_COMPAT
45310 - bool is_compat;
45311 -#endif
45312 - union {
45313 - const char __user *const __user *native;
45314 -#ifdef CONFIG_COMPAT
45315 - compat_uptr_t __user *compat;
45316 -#endif
45317 - } ptr;
45318 -};
45319 -
45320 -static const char __user *get_user_arg_ptr(struct user_arg_ptr argv, int nr)
45321 +const char __user *get_user_arg_ptr(struct user_arg_ptr argv, int nr)
45322 {
45323 const char __user *native;
45324
45325 @@ -416,14 +439,14 @@ static const char __user *get_user_arg_ptr(struct user_arg_ptr argv, int nr)
45326 compat_uptr_t compat;
45327
45328 if (get_user(compat, argv.ptr.compat + nr))
45329 - return ERR_PTR(-EFAULT);
45330 + return (const char __force_user *)ERR_PTR(-EFAULT);
45331
45332 return compat_ptr(compat);
45333 }
45334 #endif
45335
45336 if (get_user(native, argv.ptr.native + nr))
45337 - return ERR_PTR(-EFAULT);
45338 + return (const char __force_user *)ERR_PTR(-EFAULT);
45339
45340 return native;
45341 }
45342 @@ -442,7 +465,7 @@ static int count(struct user_arg_ptr argv, int max)
45343 if (!p)
45344 break;
45345
45346 - if (IS_ERR(p))
45347 + if (IS_ERR((const char __force_kernel *)p))
45348 return -EFAULT;
45349
45350 if (i++ >= max)
45351 @@ -476,7 +499,7 @@ static int copy_strings(int argc, struct user_arg_ptr argv,
45352
45353 ret = -EFAULT;
45354 str = get_user_arg_ptr(argv, argc);
45355 - if (IS_ERR(str))
45356 + if (IS_ERR((const char __force_kernel *)str))
45357 goto out;
45358
45359 len = strnlen_user(str, MAX_ARG_STRLEN);
45360 @@ -558,7 +581,7 @@ int copy_strings_kernel(int argc, const char *const *__argv,
45361 int r;
45362 mm_segment_t oldfs = get_fs();
45363 struct user_arg_ptr argv = {
45364 - .ptr.native = (const char __user *const __user *)__argv,
45365 + .ptr.native = (const char __force_user *const __force_user *)__argv,
45366 };
45367
45368 set_fs(KERNEL_DS);
45369 @@ -593,7 +616,8 @@ static int shift_arg_pages(struct vm_area_struct *vma, unsigned long shift)
45370 unsigned long new_end = old_end - shift;
45371 struct mmu_gather tlb;
45372
45373 - BUG_ON(new_start > new_end);
45374 + if (new_start >= new_end || new_start < mmap_min_addr)
45375 + return -ENOMEM;
45376
45377 /*
45378 * ensure there are no vmas between where we want to go
45379 @@ -602,6 +626,10 @@ static int shift_arg_pages(struct vm_area_struct *vma, unsigned long shift)
45380 if (vma != find_vma(mm, new_start))
45381 return -EFAULT;
45382
45383 +#ifdef CONFIG_PAX_SEGMEXEC
45384 + BUG_ON(pax_find_mirror_vma(vma));
45385 +#endif
45386 +
45387 /*
45388 * cover the whole range: [new_start, old_end)
45389 */
45390 @@ -682,10 +710,6 @@ int setup_arg_pages(struct linux_binprm *bprm,
45391 stack_top = arch_align_stack(stack_top);
45392 stack_top = PAGE_ALIGN(stack_top);
45393
45394 - if (unlikely(stack_top < mmap_min_addr) ||
45395 - unlikely(vma->vm_end - vma->vm_start >= stack_top - mmap_min_addr))
45396 - return -ENOMEM;
45397 -
45398 stack_shift = vma->vm_end - stack_top;
45399
45400 bprm->p -= stack_shift;
45401 @@ -697,8 +721,28 @@ int setup_arg_pages(struct linux_binprm *bprm,
45402 bprm->exec -= stack_shift;
45403
45404 down_write(&mm->mmap_sem);
45405 +
45406 + /* Move stack pages down in memory. */
45407 + if (stack_shift) {
45408 + ret = shift_arg_pages(vma, stack_shift);
45409 + if (ret)
45410 + goto out_unlock;
45411 + }
45412 +
45413 vm_flags = VM_STACK_FLAGS;
45414
45415 +#if defined(CONFIG_PAX_PAGEEXEC) || defined(CONFIG_PAX_SEGMEXEC)
45416 + if (mm->pax_flags & (MF_PAX_PAGEEXEC | MF_PAX_SEGMEXEC)) {
45417 + vm_flags &= ~VM_EXEC;
45418 +
45419 +#ifdef CONFIG_PAX_MPROTECT
45420 + if (mm->pax_flags & MF_PAX_MPROTECT)
45421 + vm_flags &= ~VM_MAYEXEC;
45422 +#endif
45423 +
45424 + }
45425 +#endif
45426 +
45427 /*
45428 * Adjust stack execute permissions; explicitly enable for
45429 * EXSTACK_ENABLE_X, disable for EXSTACK_DISABLE_X and leave alone
45430 @@ -717,13 +761,6 @@ int setup_arg_pages(struct linux_binprm *bprm,
45431 goto out_unlock;
45432 BUG_ON(prev != vma);
45433
45434 - /* Move stack pages down in memory. */
45435 - if (stack_shift) {
45436 - ret = shift_arg_pages(vma, stack_shift);
45437 - if (ret)
45438 - goto out_unlock;
45439 - }
45440 -
45441 /* mprotect_fixup is overkill to remove the temporary stack flags */
45442 vma->vm_flags &= ~VM_STACK_INCOMPLETE_SETUP;
45443
45444 @@ -781,6 +818,8 @@ struct file *open_exec(const char *name)
45445
45446 fsnotify_open(file);
45447
45448 + trace_open_exec(name);
45449 +
45450 err = deny_write_access(file);
45451 if (err)
45452 goto exit;
45453 @@ -804,7 +843,7 @@ int kernel_read(struct file *file, loff_t offset,
45454 old_fs = get_fs();
45455 set_fs(get_ds());
45456 /* The cast to a user pointer is valid due to the set_fs() */
45457 - result = vfs_read(file, (void __user *)addr, count, &pos);
45458 + result = vfs_read(file, (void __force_user *)addr, count, &pos);
45459 set_fs(old_fs);
45460 return result;
45461 }
45462 @@ -1258,7 +1297,7 @@ static int check_unsafe_exec(struct linux_binprm *bprm)
45463 }
45464 rcu_read_unlock();
45465
45466 - if (p->fs->users > n_fs) {
45467 + if (atomic_read(&p->fs->users) > n_fs) {
45468 bprm->unsafe |= LSM_UNSAFE_SHARE;
45469 } else {
45470 res = -EAGAIN;
45471 @@ -1461,6 +1500,28 @@ int search_binary_handler(struct linux_binprm *bprm,struct pt_regs *regs)
45472
45473 EXPORT_SYMBOL(search_binary_handler);
45474
45475 +#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
45476 +static DEFINE_PER_CPU(u64, exec_counter);
45477 +static int __init init_exec_counters(void)
45478 +{
45479 + unsigned int cpu;
45480 +
45481 + for_each_possible_cpu(cpu) {
45482 + per_cpu(exec_counter, cpu) = (u64)cpu;
45483 + }
45484 +
45485 + return 0;
45486 +}
45487 +early_initcall(init_exec_counters);
45488 +static inline void increment_exec_counter(void)
45489 +{
45490 + BUILD_BUG_ON(NR_CPUS > (1 << 16));
45491 + current->exec_id = this_cpu_add_return(exec_counter, 1 << 16);
45492 +}
45493 +#else
45494 +static inline void increment_exec_counter(void) {}
45495 +#endif
45496 +
45497 /*
45498 * sys_execve() executes a new program.
45499 */
45500 @@ -1469,6 +1530,11 @@ static int do_execve_common(const char *filename,
45501 struct user_arg_ptr envp,
45502 struct pt_regs *regs)
45503 {
45504 +#ifdef CONFIG_GRKERNSEC
45505 + struct file *old_exec_file;
45506 + struct acl_subject_label *old_acl;
45507 + struct rlimit old_rlim[RLIM_NLIMITS];
45508 +#endif
45509 struct linux_binprm *bprm;
45510 struct file *file;
45511 struct files_struct *displaced;
45512 @@ -1476,6 +1542,8 @@ static int do_execve_common(const char *filename,
45513 int retval;
45514 const struct cred *cred = current_cred();
45515
45516 + gr_learn_resource(current, RLIMIT_NPROC, atomic_read(&current->cred->user->processes), 1);
45517 +
45518 /*
45519 * We move the actual failure in case of RLIMIT_NPROC excess from
45520 * set*uid() to execve() because too many poorly written programs
45521 @@ -1516,12 +1584,27 @@ static int do_execve_common(const char *filename,
45522 if (IS_ERR(file))
45523 goto out_unmark;
45524
45525 + if (gr_ptrace_readexec(file, bprm->unsafe)) {
45526 + retval = -EPERM;
45527 + goto out_file;
45528 + }
45529 +
45530 sched_exec();
45531
45532 bprm->file = file;
45533 bprm->filename = filename;
45534 bprm->interp = filename;
45535
45536 + if (gr_process_user_ban()) {
45537 + retval = -EPERM;
45538 + goto out_file;
45539 + }
45540 +
45541 + if (!gr_acl_handle_execve(file->f_dentry, file->f_vfsmnt)) {
45542 + retval = -EACCES;
45543 + goto out_file;
45544 + }
45545 +
45546 retval = bprm_mm_init(bprm);
45547 if (retval)
45548 goto out_file;
45549 @@ -1538,24 +1621,65 @@ static int do_execve_common(const char *filename,
45550 if (retval < 0)
45551 goto out;
45552
45553 +#ifdef CONFIG_GRKERNSEC
45554 + old_acl = current->acl;
45555 + memcpy(old_rlim, current->signal->rlim, sizeof(old_rlim));
45556 + old_exec_file = current->exec_file;
45557 + get_file(file);
45558 + current->exec_file = file;
45559 +#endif
45560 +#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
45561 + /* limit suid stack to 8MB
45562 + we saved the old limits above and will restore them if this exec fails
45563 + */
45564 + if (((bprm->cred->euid != current_euid()) || (bprm->cred->egid != current_egid())) &&
45565 + (old_rlim[RLIMIT_STACK].rlim_cur > (8 * 1024 * 1024)))
45566 + current->signal->rlim[RLIMIT_STACK].rlim_cur = 8 * 1024 * 1024;
45567 +#endif
45568 +
45569 + if (!gr_tpe_allow(file)) {
45570 + retval = -EACCES;
45571 + goto out_fail;
45572 + }
45573 +
45574 + if (gr_check_crash_exec(file)) {
45575 + retval = -EACCES;
45576 + goto out_fail;
45577 + }
45578 +
45579 + retval = gr_set_proc_label(file->f_dentry, file->f_vfsmnt,
45580 + bprm->unsafe);
45581 + if (retval < 0)
45582 + goto out_fail;
45583 +
45584 retval = copy_strings_kernel(1, &bprm->filename, bprm);
45585 if (retval < 0)
45586 - goto out;
45587 + goto out_fail;
45588
45589 bprm->exec = bprm->p;
45590 retval = copy_strings(bprm->envc, envp, bprm);
45591 if (retval < 0)
45592 - goto out;
45593 + goto out_fail;
45594
45595 retval = copy_strings(bprm->argc, argv, bprm);
45596 if (retval < 0)
45597 - goto out;
45598 + goto out_fail;
45599 +
45600 + gr_log_chroot_exec(file->f_dentry, file->f_vfsmnt);
45601 +
45602 + gr_handle_exec_args(bprm, argv);
45603
45604 retval = search_binary_handler(bprm,regs);
45605 if (retval < 0)
45606 - goto out;
45607 + goto out_fail;
45608 +#ifdef CONFIG_GRKERNSEC
45609 + if (old_exec_file)
45610 + fput(old_exec_file);
45611 +#endif
45612
45613 /* execve succeeded */
45614 +
45615 + increment_exec_counter();
45616 current->fs->in_exec = 0;
45617 current->in_execve = 0;
45618 acct_update_integrals(current);
45619 @@ -1564,6 +1688,14 @@ static int do_execve_common(const char *filename,
45620 put_files_struct(displaced);
45621 return retval;
45622
45623 +out_fail:
45624 +#ifdef CONFIG_GRKERNSEC
45625 + current->acl = old_acl;
45626 + memcpy(current->signal->rlim, old_rlim, sizeof(old_rlim));
45627 + fput(current->exec_file);
45628 + current->exec_file = old_exec_file;
45629 +#endif
45630 +
45631 out:
45632 if (bprm->mm) {
45633 acct_arg_size(bprm, 0);
45634 @@ -1637,7 +1769,7 @@ static int expand_corename(struct core_name *cn)
45635 {
45636 char *old_corename = cn->corename;
45637
45638 - cn->size = CORENAME_MAX_SIZE * atomic_inc_return(&call_count);
45639 + cn->size = CORENAME_MAX_SIZE * atomic_inc_return_unchecked(&call_count);
45640 cn->corename = krealloc(old_corename, cn->size, GFP_KERNEL);
45641
45642 if (!cn->corename) {
45643 @@ -1734,7 +1866,7 @@ static int format_corename(struct core_name *cn, long signr)
45644 int pid_in_pattern = 0;
45645 int err = 0;
45646
45647 - cn->size = CORENAME_MAX_SIZE * atomic_read(&call_count);
45648 + cn->size = CORENAME_MAX_SIZE * atomic_read_unchecked(&call_count);
45649 cn->corename = kmalloc(cn->size, GFP_KERNEL);
45650 cn->used = 0;
45651
45652 @@ -1831,6 +1963,250 @@ out:
45653 return ispipe;
45654 }
45655
45656 +int pax_check_flags(unsigned long *flags)
45657 +{
45658 + int retval = 0;
45659 +
45660 +#if !defined(CONFIG_X86_32) || !defined(CONFIG_PAX_SEGMEXEC)
45661 + if (*flags & MF_PAX_SEGMEXEC)
45662 + {
45663 + *flags &= ~MF_PAX_SEGMEXEC;
45664 + retval = -EINVAL;
45665 + }
45666 +#endif
45667 +
45668 + if ((*flags & MF_PAX_PAGEEXEC)
45669 +
45670 +#ifdef CONFIG_PAX_PAGEEXEC
45671 + && (*flags & MF_PAX_SEGMEXEC)
45672 +#endif
45673 +
45674 + )
45675 + {
45676 + *flags &= ~MF_PAX_PAGEEXEC;
45677 + retval = -EINVAL;
45678 + }
45679 +
45680 + if ((*flags & MF_PAX_MPROTECT)
45681 +
45682 +#ifdef CONFIG_PAX_MPROTECT
45683 + && !(*flags & (MF_PAX_PAGEEXEC | MF_PAX_SEGMEXEC))
45684 +#endif
45685 +
45686 + )
45687 + {
45688 + *flags &= ~MF_PAX_MPROTECT;
45689 + retval = -EINVAL;
45690 + }
45691 +
45692 + if ((*flags & MF_PAX_EMUTRAMP)
45693 +
45694 +#ifdef CONFIG_PAX_EMUTRAMP
45695 + && !(*flags & (MF_PAX_PAGEEXEC | MF_PAX_SEGMEXEC))
45696 +#endif
45697 +
45698 + )
45699 + {
45700 + *flags &= ~MF_PAX_EMUTRAMP;
45701 + retval = -EINVAL;
45702 + }
45703 +
45704 + return retval;
45705 +}
45706 +
45707 +EXPORT_SYMBOL(pax_check_flags);
45708 +
45709 +#if defined(CONFIG_PAX_PAGEEXEC) || defined(CONFIG_PAX_SEGMEXEC)
45710 +void pax_report_fault(struct pt_regs *regs, void *pc, void *sp)
45711 +{
45712 + struct task_struct *tsk = current;
45713 + struct mm_struct *mm = current->mm;
45714 + char *buffer_exec = (char *)__get_free_page(GFP_KERNEL);
45715 + char *buffer_fault = (char *)__get_free_page(GFP_KERNEL);
45716 + char *path_exec = NULL;
45717 + char *path_fault = NULL;
45718 + unsigned long start = 0UL, end = 0UL, offset = 0UL;
45719 +
45720 + if (buffer_exec && buffer_fault) {
45721 + struct vm_area_struct *vma, *vma_exec = NULL, *vma_fault = NULL;
45722 +
45723 + down_read(&mm->mmap_sem);
45724 + vma = mm->mmap;
45725 + while (vma && (!vma_exec || !vma_fault)) {
45726 + if ((vma->vm_flags & VM_EXECUTABLE) && vma->vm_file)
45727 + vma_exec = vma;
45728 + if (vma->vm_start <= (unsigned long)pc && (unsigned long)pc < vma->vm_end)
45729 + vma_fault = vma;
45730 + vma = vma->vm_next;
45731 + }
45732 + if (vma_exec) {
45733 + path_exec = d_path(&vma_exec->vm_file->f_path, buffer_exec, PAGE_SIZE);
45734 + if (IS_ERR(path_exec))
45735 + path_exec = "<path too long>";
45736 + else {
45737 + path_exec = mangle_path(buffer_exec, path_exec, "\t\n\\");
45738 + if (path_exec) {
45739 + *path_exec = 0;
45740 + path_exec = buffer_exec;
45741 + } else
45742 + path_exec = "<path too long>";
45743 + }
45744 + }
45745 + if (vma_fault) {
45746 + start = vma_fault->vm_start;
45747 + end = vma_fault->vm_end;
45748 + offset = vma_fault->vm_pgoff << PAGE_SHIFT;
45749 + if (vma_fault->vm_file) {
45750 + path_fault = d_path(&vma_fault->vm_file->f_path, buffer_fault, PAGE_SIZE);
45751 + if (IS_ERR(path_fault))
45752 + path_fault = "<path too long>";
45753 + else {
45754 + path_fault = mangle_path(buffer_fault, path_fault, "\t\n\\");
45755 + if (path_fault) {
45756 + *path_fault = 0;
45757 + path_fault = buffer_fault;
45758 + } else
45759 + path_fault = "<path too long>";
45760 + }
45761 + } else
45762 + path_fault = "<anonymous mapping>";
45763 + }
45764 + up_read(&mm->mmap_sem);
45765 + }
45766 + if (tsk->signal->curr_ip)
45767 + printk(KERN_ERR "PAX: From %pI4: execution attempt in: %s, %08lx-%08lx %08lx\n", &tsk->signal->curr_ip, path_fault, start, end, offset);
45768 + else
45769 + printk(KERN_ERR "PAX: execution attempt in: %s, %08lx-%08lx %08lx\n", path_fault, start, end, offset);
45770 + printk(KERN_ERR "PAX: terminating task: %s(%s):%d, uid/euid: %u/%u, "
45771 + "PC: %p, SP: %p\n", path_exec, tsk->comm, task_pid_nr(tsk),
45772 + task_uid(tsk), task_euid(tsk), pc, sp);
45773 + free_page((unsigned long)buffer_exec);
45774 + free_page((unsigned long)buffer_fault);
45775 + pax_report_insns(regs, pc, sp);
45776 + do_coredump(SIGKILL, SIGKILL, regs);
45777 +}
45778 +#endif
45779 +
45780 +#ifdef CONFIG_PAX_REFCOUNT
45781 +void pax_report_refcount_overflow(struct pt_regs *regs)
45782 +{
45783 + if (current->signal->curr_ip)
45784 + printk(KERN_ERR "PAX: From %pI4: refcount overflow detected in: %s:%d, uid/euid: %u/%u\n",
45785 + &current->signal->curr_ip, current->comm, task_pid_nr(current), current_uid(), current_euid());
45786 + else
45787 + printk(KERN_ERR "PAX: refcount overflow detected in: %s:%d, uid/euid: %u/%u\n",
45788 + current->comm, task_pid_nr(current), current_uid(), current_euid());
45789 + print_symbol(KERN_ERR "PAX: refcount overflow occured at: %s\n", instruction_pointer(regs));
45790 + show_regs(regs);
45791 + force_sig_info(SIGKILL, SEND_SIG_FORCED, current);
45792 +}
45793 +#endif
45794 +
45795 +#ifdef CONFIG_PAX_USERCOPY
45796 +/* 0: not at all, 1: fully, 2: fully inside frame, -1: partially (implies an error) */
45797 +static noinline int check_stack_object(const void *obj, unsigned long len)
45798 +{
45799 + const void * const stack = task_stack_page(current);
45800 + const void * const stackend = stack + THREAD_SIZE;
45801 +
45802 +#if defined(CONFIG_FRAME_POINTER) && defined(CONFIG_X86)
45803 + const void *frame = NULL;
45804 + const void *oldframe;
45805 +#endif
45806 +
45807 + if (obj + len < obj)
45808 + return -1;
45809 +
45810 + if (obj + len <= stack || stackend <= obj)
45811 + return 0;
45812 +
45813 + if (obj < stack || stackend < obj + len)
45814 + return -1;
45815 +
45816 +#if defined(CONFIG_FRAME_POINTER) && defined(CONFIG_X86)
45817 + oldframe = __builtin_frame_address(1);
45818 + if (oldframe)
45819 + frame = __builtin_frame_address(2);
45820 + /*
45821 + low ----------------------------------------------> high
45822 + [saved bp][saved ip][args][local vars][saved bp][saved ip]
45823 + ^----------------^
45824 + allow copies only within here
45825 + */
45826 + while (stack <= frame && frame < stackend) {
45827 + /* if obj + len extends past the last frame, this
45828 + check won't pass and the next frame will be 0,
45829 + causing us to bail out and correctly report
45830 + the copy as invalid
45831 + */
45832 + if (obj + len <= frame)
45833 + return obj >= oldframe + 2 * sizeof(void *) ? 2 : -1;
45834 + oldframe = frame;
45835 + frame = *(const void * const *)frame;
45836 + }
45837 + return -1;
45838 +#else
45839 + return 1;
45840 +#endif
45841 +}
45842 +
45843 +static __noreturn void pax_report_usercopy(const void *ptr, unsigned long len, bool to, const char *type)
45844 +{
45845 + if (current->signal->curr_ip)
45846 + printk(KERN_ERR "PAX: From %pI4: kernel memory %s attempt detected %s %p (%s) (%lu bytes)\n",
45847 + &current->signal->curr_ip, to ? "leak" : "overwrite", to ? "from" : "to", ptr, type ? : "unknown", len);
45848 + else
45849 + printk(KERN_ERR "PAX: kernel memory %s attempt detected %s %p (%s) (%lu bytes)\n",
45850 + to ? "leak" : "overwrite", to ? "from" : "to", ptr, type ? : "unknown", len);
45851 + dump_stack();
45852 + gr_handle_kernel_exploit();
45853 + do_group_exit(SIGKILL);
45854 +}
45855 +#endif
45856 +
45857 +void check_object_size(const void *ptr, unsigned long n, bool to)
45858 +{
45859 +
45860 +#ifdef CONFIG_PAX_USERCOPY
45861 + const char *type;
45862 +
45863 + if (!n)
45864 + return;
45865 +
45866 + type = check_heap_object(ptr, n, to);
45867 + if (!type) {
45868 + if (check_stack_object(ptr, n) != -1)
45869 + return;
45870 + type = "<process stack>";
45871 + }
45872 +
45873 + pax_report_usercopy(ptr, n, to, type);
45874 +#endif
45875 +
45876 +}
45877 +EXPORT_SYMBOL(check_object_size);
45878 +
45879 +#ifdef CONFIG_PAX_MEMORY_STACKLEAK
45880 +void pax_track_stack(void)
45881 +{
45882 + unsigned long sp = (unsigned long)&sp;
45883 + if (sp < current_thread_info()->lowest_stack &&
45884 + sp > (unsigned long)task_stack_page(current))
45885 + current_thread_info()->lowest_stack = sp;
45886 +}
45887 +EXPORT_SYMBOL(pax_track_stack);
45888 +#endif
45889 +
45890 +#ifdef CONFIG_PAX_SIZE_OVERFLOW
45891 +void report_size_overflow(const char *file, unsigned int line, const char *func, const char *ssa_name)
45892 +{
45893 + printk(KERN_ERR "PAX: size overflow detected in function %s %s:%u %s", func, file, line, ssa_name);
45894 + dump_stack();
45895 + do_group_exit(SIGKILL);
45896 +}
45897 +EXPORT_SYMBOL(report_size_overflow);
45898 +#endif
45899 +
45900 static int zap_process(struct task_struct *start, int exit_code)
45901 {
45902 struct task_struct *t;
45903 @@ -2041,17 +2417,17 @@ static void wait_for_dump_helpers(struct file *file)
45904 pipe = file->f_path.dentry->d_inode->i_pipe;
45905
45906 pipe_lock(pipe);
45907 - pipe->readers++;
45908 - pipe->writers--;
45909 + atomic_inc(&pipe->readers);
45910 + atomic_dec(&pipe->writers);
45911
45912 - while ((pipe->readers > 1) && (!signal_pending(current))) {
45913 + while ((atomic_read(&pipe->readers) > 1) && (!signal_pending(current))) {
45914 wake_up_interruptible_sync(&pipe->wait);
45915 kill_fasync(&pipe->fasync_readers, SIGIO, POLL_IN);
45916 pipe_wait(pipe);
45917 }
45918
45919 - pipe->readers--;
45920 - pipe->writers++;
45921 + atomic_dec(&pipe->readers);
45922 + atomic_inc(&pipe->writers);
45923 pipe_unlock(pipe);
45924
45925 }
45926 @@ -2106,7 +2482,7 @@ void do_coredump(long signr, int exit_code, struct pt_regs *regs)
45927 int flag = 0;
45928 int ispipe;
45929 bool need_nonrelative = false;
45930 - static atomic_t core_dump_count = ATOMIC_INIT(0);
45931 + static atomic_unchecked_t core_dump_count = ATOMIC_INIT(0);
45932 struct coredump_params cprm = {
45933 .signr = signr,
45934 .regs = regs,
45935 @@ -2121,6 +2497,9 @@ void do_coredump(long signr, int exit_code, struct pt_regs *regs)
45936
45937 audit_core_dumps(signr);
45938
45939 + if (signr == SIGSEGV || signr == SIGBUS || signr == SIGKILL || signr == SIGILL)
45940 + gr_handle_brute_attach(current, cprm.mm_flags);
45941 +
45942 binfmt = mm->binfmt;
45943 if (!binfmt || !binfmt->core_dump)
45944 goto fail;
45945 @@ -2191,7 +2570,7 @@ void do_coredump(long signr, int exit_code, struct pt_regs *regs)
45946 }
45947 cprm.limit = RLIM_INFINITY;
45948
45949 - dump_count = atomic_inc_return(&core_dump_count);
45950 + dump_count = atomic_inc_return_unchecked(&core_dump_count);
45951 if (core_pipe_limit && (core_pipe_limit < dump_count)) {
45952 printk(KERN_WARNING "Pid %d(%s) over core_pipe_limit\n",
45953 task_tgid_vnr(current), current->comm);
45954 @@ -2218,6 +2597,8 @@ void do_coredump(long signr, int exit_code, struct pt_regs *regs)
45955 } else {
45956 struct inode *inode;
45957
45958 + gr_learn_resource(current, RLIMIT_CORE, binfmt->min_coredump, 1);
45959 +
45960 if (cprm.limit < binfmt->min_coredump)
45961 goto fail_unlock;
45962
45963 @@ -2269,7 +2650,7 @@ close_fail:
45964 filp_close(cprm.file, NULL);
45965 fail_dropcount:
45966 if (ispipe)
45967 - atomic_dec(&core_dump_count);
45968 + atomic_dec_unchecked(&core_dump_count);
45969 fail_unlock:
45970 kfree(cn.corename);
45971 fail_corename:
45972 @@ -2288,7 +2669,7 @@ fail:
45973 */
45974 int dump_write(struct file *file, const void *addr, int nr)
45975 {
45976 - return access_ok(VERIFY_READ, addr, nr) && file->f_op->write(file, addr, nr, &file->f_pos) == nr;
45977 + return access_ok(VERIFY_READ, addr, nr) && file->f_op->write(file, (const char __force_user *)addr, nr, &file->f_pos) == nr;
45978 }
45979 EXPORT_SYMBOL(dump_write);
45980
45981 diff --git a/fs/ext2/balloc.c b/fs/ext2/balloc.c
45982 index 376aa77..59a129c 100644
45983 --- a/fs/ext2/balloc.c
45984 +++ b/fs/ext2/balloc.c
45985 @@ -1190,10 +1190,10 @@ static int ext2_has_free_blocks(struct ext2_sb_info *sbi)
45986
45987 free_blocks = percpu_counter_read_positive(&sbi->s_freeblocks_counter);
45988 root_blocks = le32_to_cpu(sbi->s_es->s_r_blocks_count);
45989 - if (free_blocks < root_blocks + 1 && !capable(CAP_SYS_RESOURCE) &&
45990 + if (free_blocks < root_blocks + 1 &&
45991 !uid_eq(sbi->s_resuid, current_fsuid()) &&
45992 (gid_eq(sbi->s_resgid, GLOBAL_ROOT_GID) ||
45993 - !in_group_p (sbi->s_resgid))) {
45994 + !in_group_p (sbi->s_resgid)) && !capable_nolog(CAP_SYS_RESOURCE)) {
45995 return 0;
45996 }
45997 return 1;
45998 diff --git a/fs/ext3/balloc.c b/fs/ext3/balloc.c
45999 index 90d901f..159975f 100644
46000 --- a/fs/ext3/balloc.c
46001 +++ b/fs/ext3/balloc.c
46002 @@ -1438,10 +1438,10 @@ static int ext3_has_free_blocks(struct ext3_sb_info *sbi, int use_reservation)
46003
46004 free_blocks = percpu_counter_read_positive(&sbi->s_freeblocks_counter);
46005 root_blocks = le32_to_cpu(sbi->s_es->s_r_blocks_count);
46006 - if (free_blocks < root_blocks + 1 && !capable(CAP_SYS_RESOURCE) &&
46007 + if (free_blocks < root_blocks + 1 &&
46008 !use_reservation && !uid_eq(sbi->s_resuid, current_fsuid()) &&
46009 (gid_eq(sbi->s_resgid, GLOBAL_ROOT_GID) ||
46010 - !in_group_p (sbi->s_resgid))) {
46011 + !in_group_p (sbi->s_resgid)) && !capable_nolog(CAP_SYS_RESOURCE)) {
46012 return 0;
46013 }
46014 return 1;
46015 diff --git a/fs/ext4/balloc.c b/fs/ext4/balloc.c
46016 index cf18217..8f6b9c3 100644
46017 --- a/fs/ext4/balloc.c
46018 +++ b/fs/ext4/balloc.c
46019 @@ -498,8 +498,8 @@ static int ext4_has_free_clusters(struct ext4_sb_info *sbi,
46020 /* Hm, nope. Are (enough) root reserved clusters available? */
46021 if (uid_eq(sbi->s_resuid, current_fsuid()) ||
46022 (!gid_eq(sbi->s_resgid, GLOBAL_ROOT_GID) && in_group_p(sbi->s_resgid)) ||
46023 - capable(CAP_SYS_RESOURCE) ||
46024 - (flags & EXT4_MB_USE_ROOT_BLOCKS)) {
46025 + (flags & EXT4_MB_USE_ROOT_BLOCKS) ||
46026 + capable_nolog(CAP_SYS_RESOURCE)) {
46027
46028 if (free_clusters >= (nclusters + dirty_clusters))
46029 return 1;
46030 diff --git a/fs/ext4/ext4.h b/fs/ext4/ext4.h
46031 index b686b43..4b46d01 100644
46032 --- a/fs/ext4/ext4.h
46033 +++ b/fs/ext4/ext4.h
46034 @@ -1248,19 +1248,19 @@ struct ext4_sb_info {
46035 unsigned long s_mb_last_start;
46036
46037 /* stats for buddy allocator */
46038 - atomic_t s_bal_reqs; /* number of reqs with len > 1 */
46039 - atomic_t s_bal_success; /* we found long enough chunks */
46040 - atomic_t s_bal_allocated; /* in blocks */
46041 - atomic_t s_bal_ex_scanned; /* total extents scanned */
46042 - atomic_t s_bal_goals; /* goal hits */
46043 - atomic_t s_bal_breaks; /* too long searches */
46044 - atomic_t s_bal_2orders; /* 2^order hits */
46045 + atomic_unchecked_t s_bal_reqs; /* number of reqs with len > 1 */
46046 + atomic_unchecked_t s_bal_success; /* we found long enough chunks */
46047 + atomic_unchecked_t s_bal_allocated; /* in blocks */
46048 + atomic_unchecked_t s_bal_ex_scanned; /* total extents scanned */
46049 + atomic_unchecked_t s_bal_goals; /* goal hits */
46050 + atomic_unchecked_t s_bal_breaks; /* too long searches */
46051 + atomic_unchecked_t s_bal_2orders; /* 2^order hits */
46052 spinlock_t s_bal_lock;
46053 unsigned long s_mb_buddies_generated;
46054 unsigned long long s_mb_generation_time;
46055 - atomic_t s_mb_lost_chunks;
46056 - atomic_t s_mb_preallocated;
46057 - atomic_t s_mb_discarded;
46058 + atomic_unchecked_t s_mb_lost_chunks;
46059 + atomic_unchecked_t s_mb_preallocated;
46060 + atomic_unchecked_t s_mb_discarded;
46061 atomic_t s_lock_busy;
46062
46063 /* locality groups */
46064 diff --git a/fs/ext4/mballoc.c b/fs/ext4/mballoc.c
46065 index b26410c..7383d90 100644
46066 --- a/fs/ext4/mballoc.c
46067 +++ b/fs/ext4/mballoc.c
46068 @@ -1746,7 +1746,7 @@ void ext4_mb_simple_scan_group(struct ext4_allocation_context *ac,
46069 BUG_ON(ac->ac_b_ex.fe_len != ac->ac_g_ex.fe_len);
46070
46071 if (EXT4_SB(sb)->s_mb_stats)
46072 - atomic_inc(&EXT4_SB(sb)->s_bal_2orders);
46073 + atomic_inc_unchecked(&EXT4_SB(sb)->s_bal_2orders);
46074
46075 break;
46076 }
46077 @@ -2040,7 +2040,7 @@ repeat:
46078 ac->ac_status = AC_STATUS_CONTINUE;
46079 ac->ac_flags |= EXT4_MB_HINT_FIRST;
46080 cr = 3;
46081 - atomic_inc(&sbi->s_mb_lost_chunks);
46082 + atomic_inc_unchecked(&sbi->s_mb_lost_chunks);
46083 goto repeat;
46084 }
46085 }
46086 @@ -2551,25 +2551,25 @@ int ext4_mb_release(struct super_block *sb)
46087 if (sbi->s_mb_stats) {
46088 ext4_msg(sb, KERN_INFO,
46089 "mballoc: %u blocks %u reqs (%u success)",
46090 - atomic_read(&sbi->s_bal_allocated),
46091 - atomic_read(&sbi->s_bal_reqs),
46092 - atomic_read(&sbi->s_bal_success));
46093 + atomic_read_unchecked(&sbi->s_bal_allocated),
46094 + atomic_read_unchecked(&sbi->s_bal_reqs),
46095 + atomic_read_unchecked(&sbi->s_bal_success));
46096 ext4_msg(sb, KERN_INFO,
46097 "mballoc: %u extents scanned, %u goal hits, "
46098 "%u 2^N hits, %u breaks, %u lost",
46099 - atomic_read(&sbi->s_bal_ex_scanned),
46100 - atomic_read(&sbi->s_bal_goals),
46101 - atomic_read(&sbi->s_bal_2orders),
46102 - atomic_read(&sbi->s_bal_breaks),
46103 - atomic_read(&sbi->s_mb_lost_chunks));
46104 + atomic_read_unchecked(&sbi->s_bal_ex_scanned),
46105 + atomic_read_unchecked(&sbi->s_bal_goals),
46106 + atomic_read_unchecked(&sbi->s_bal_2orders),
46107 + atomic_read_unchecked(&sbi->s_bal_breaks),
46108 + atomic_read_unchecked(&sbi->s_mb_lost_chunks));
46109 ext4_msg(sb, KERN_INFO,
46110 "mballoc: %lu generated and it took %Lu",
46111 sbi->s_mb_buddies_generated,
46112 sbi->s_mb_generation_time);
46113 ext4_msg(sb, KERN_INFO,
46114 "mballoc: %u preallocated, %u discarded",
46115 - atomic_read(&sbi->s_mb_preallocated),
46116 - atomic_read(&sbi->s_mb_discarded));
46117 + atomic_read_unchecked(&sbi->s_mb_preallocated),
46118 + atomic_read_unchecked(&sbi->s_mb_discarded));
46119 }
46120
46121 free_percpu(sbi->s_locality_groups);
46122 @@ -3051,16 +3051,16 @@ static void ext4_mb_collect_stats(struct ext4_allocation_context *ac)
46123 struct ext4_sb_info *sbi = EXT4_SB(ac->ac_sb);
46124
46125 if (sbi->s_mb_stats && ac->ac_g_ex.fe_len > 1) {
46126 - atomic_inc(&sbi->s_bal_reqs);
46127 - atomic_add(ac->ac_b_ex.fe_len, &sbi->s_bal_allocated);
46128 + atomic_inc_unchecked(&sbi->s_bal_reqs);
46129 + atomic_add_unchecked(ac->ac_b_ex.fe_len, &sbi->s_bal_allocated);
46130 if (ac->ac_b_ex.fe_len >= ac->ac_o_ex.fe_len)
46131 - atomic_inc(&sbi->s_bal_success);
46132 - atomic_add(ac->ac_found, &sbi->s_bal_ex_scanned);
46133 + atomic_inc_unchecked(&sbi->s_bal_success);
46134 + atomic_add_unchecked(ac->ac_found, &sbi->s_bal_ex_scanned);
46135 if (ac->ac_g_ex.fe_start == ac->ac_b_ex.fe_start &&
46136 ac->ac_g_ex.fe_group == ac->ac_b_ex.fe_group)
46137 - atomic_inc(&sbi->s_bal_goals);
46138 + atomic_inc_unchecked(&sbi->s_bal_goals);
46139 if (ac->ac_found > sbi->s_mb_max_to_scan)
46140 - atomic_inc(&sbi->s_bal_breaks);
46141 + atomic_inc_unchecked(&sbi->s_bal_breaks);
46142 }
46143
46144 if (ac->ac_op == EXT4_MB_HISTORY_ALLOC)
46145 @@ -3460,7 +3460,7 @@ ext4_mb_new_inode_pa(struct ext4_allocation_context *ac)
46146 trace_ext4_mb_new_inode_pa(ac, pa);
46147
46148 ext4_mb_use_inode_pa(ac, pa);
46149 - atomic_add(pa->pa_free, &sbi->s_mb_preallocated);
46150 + atomic_add_unchecked(pa->pa_free, &sbi->s_mb_preallocated);
46151
46152 ei = EXT4_I(ac->ac_inode);
46153 grp = ext4_get_group_info(sb, ac->ac_b_ex.fe_group);
46154 @@ -3520,7 +3520,7 @@ ext4_mb_new_group_pa(struct ext4_allocation_context *ac)
46155 trace_ext4_mb_new_group_pa(ac, pa);
46156
46157 ext4_mb_use_group_pa(ac, pa);
46158 - atomic_add(pa->pa_free, &EXT4_SB(sb)->s_mb_preallocated);
46159 + atomic_add_unchecked(pa->pa_free, &EXT4_SB(sb)->s_mb_preallocated);
46160
46161 grp = ext4_get_group_info(sb, ac->ac_b_ex.fe_group);
46162 lg = ac->ac_lg;
46163 @@ -3609,7 +3609,7 @@ ext4_mb_release_inode_pa(struct ext4_buddy *e4b, struct buffer_head *bitmap_bh,
46164 * from the bitmap and continue.
46165 */
46166 }
46167 - atomic_add(free, &sbi->s_mb_discarded);
46168 + atomic_add_unchecked(free, &sbi->s_mb_discarded);
46169
46170 return err;
46171 }
46172 @@ -3627,7 +3627,7 @@ ext4_mb_release_group_pa(struct ext4_buddy *e4b,
46173 ext4_get_group_no_and_offset(sb, pa->pa_pstart, &group, &bit);
46174 BUG_ON(group != e4b->bd_group && pa->pa_len != 0);
46175 mb_free_blocks(pa->pa_inode, e4b, bit, pa->pa_len);
46176 - atomic_add(pa->pa_len, &EXT4_SB(sb)->s_mb_discarded);
46177 + atomic_add_unchecked(pa->pa_len, &EXT4_SB(sb)->s_mb_discarded);
46178 trace_ext4_mballoc_discard(sb, NULL, group, bit, pa->pa_len);
46179
46180 return 0;
46181 diff --git a/fs/fcntl.c b/fs/fcntl.c
46182 index 887b5ba..0e3f2c3 100644
46183 --- a/fs/fcntl.c
46184 +++ b/fs/fcntl.c
46185 @@ -225,6 +225,11 @@ int __f_setown(struct file *filp, struct pid *pid, enum pid_type type,
46186 if (err)
46187 return err;
46188
46189 + if (gr_handle_chroot_fowner(pid, type))
46190 + return -ENOENT;
46191 + if (gr_check_protected_task_fowner(pid, type))
46192 + return -EACCES;
46193 +
46194 f_modown(filp, pid, type, force);
46195 return 0;
46196 }
46197 @@ -267,7 +272,7 @@ pid_t f_getown(struct file *filp)
46198
46199 static int f_setown_ex(struct file *filp, unsigned long arg)
46200 {
46201 - struct f_owner_ex * __user owner_p = (void * __user)arg;
46202 + struct f_owner_ex __user *owner_p = (void __user *)arg;
46203 struct f_owner_ex owner;
46204 struct pid *pid;
46205 int type;
46206 @@ -307,7 +312,7 @@ static int f_setown_ex(struct file *filp, unsigned long arg)
46207
46208 static int f_getown_ex(struct file *filp, unsigned long arg)
46209 {
46210 - struct f_owner_ex * __user owner_p = (void * __user)arg;
46211 + struct f_owner_ex __user *owner_p = (void __user *)arg;
46212 struct f_owner_ex owner;
46213 int ret = 0;
46214
46215 @@ -374,6 +379,7 @@ static long do_fcntl(int fd, unsigned int cmd, unsigned long arg,
46216 switch (cmd) {
46217 case F_DUPFD:
46218 case F_DUPFD_CLOEXEC:
46219 + gr_learn_resource(current, RLIMIT_NOFILE, arg, 0);
46220 if (arg >= rlimit(RLIMIT_NOFILE))
46221 break;
46222 err = alloc_fd(arg, cmd == F_DUPFD_CLOEXEC ? O_CLOEXEC : 0);
46223 diff --git a/fs/fifo.c b/fs/fifo.c
46224 index cf6f434..3d7942c 100644
46225 --- a/fs/fifo.c
46226 +++ b/fs/fifo.c
46227 @@ -59,10 +59,10 @@ static int fifo_open(struct inode *inode, struct file *filp)
46228 */
46229 filp->f_op = &read_pipefifo_fops;
46230 pipe->r_counter++;
46231 - if (pipe->readers++ == 0)
46232 + if (atomic_inc_return(&pipe->readers) == 1)
46233 wake_up_partner(inode);
46234
46235 - if (!pipe->writers) {
46236 + if (!atomic_read(&pipe->writers)) {
46237 if ((filp->f_flags & O_NONBLOCK)) {
46238 /* suppress POLLHUP until we have
46239 * seen a writer */
46240 @@ -81,15 +81,15 @@ static int fifo_open(struct inode *inode, struct file *filp)
46241 * errno=ENXIO when there is no process reading the FIFO.
46242 */
46243 ret = -ENXIO;
46244 - if ((filp->f_flags & O_NONBLOCK) && !pipe->readers)
46245 + if ((filp->f_flags & O_NONBLOCK) && !atomic_read(&pipe->readers))
46246 goto err;
46247
46248 filp->f_op = &write_pipefifo_fops;
46249 pipe->w_counter++;
46250 - if (!pipe->writers++)
46251 + if (atomic_inc_return(&pipe->writers) == 1)
46252 wake_up_partner(inode);
46253
46254 - if (!pipe->readers) {
46255 + if (!atomic_read(&pipe->readers)) {
46256 if (wait_for_partner(inode, &pipe->r_counter))
46257 goto err_wr;
46258 }
46259 @@ -104,11 +104,11 @@ static int fifo_open(struct inode *inode, struct file *filp)
46260 */
46261 filp->f_op = &rdwr_pipefifo_fops;
46262
46263 - pipe->readers++;
46264 - pipe->writers++;
46265 + atomic_inc(&pipe->readers);
46266 + atomic_inc(&pipe->writers);
46267 pipe->r_counter++;
46268 pipe->w_counter++;
46269 - if (pipe->readers == 1 || pipe->writers == 1)
46270 + if (atomic_read(&pipe->readers) == 1 || atomic_read(&pipe->writers) == 1)
46271 wake_up_partner(inode);
46272 break;
46273
46274 @@ -122,19 +122,19 @@ static int fifo_open(struct inode *inode, struct file *filp)
46275 return 0;
46276
46277 err_rd:
46278 - if (!--pipe->readers)
46279 + if (atomic_dec_and_test(&pipe->readers))
46280 wake_up_interruptible(&pipe->wait);
46281 ret = -ERESTARTSYS;
46282 goto err;
46283
46284 err_wr:
46285 - if (!--pipe->writers)
46286 + if (atomic_dec_and_test(&pipe->writers))
46287 wake_up_interruptible(&pipe->wait);
46288 ret = -ERESTARTSYS;
46289 goto err;
46290
46291 err:
46292 - if (!pipe->readers && !pipe->writers)
46293 + if (!atomic_read(&pipe->readers) && !atomic_read(&pipe->writers))
46294 free_pipe_info(inode);
46295
46296 err_nocleanup:
46297 diff --git a/fs/file.c b/fs/file.c
46298 index ba3f605..fade102 100644
46299 --- a/fs/file.c
46300 +++ b/fs/file.c
46301 @@ -15,6 +15,7 @@
46302 #include <linux/slab.h>
46303 #include <linux/vmalloc.h>
46304 #include <linux/file.h>
46305 +#include <linux/security.h>
46306 #include <linux/fdtable.h>
46307 #include <linux/bitops.h>
46308 #include <linux/interrupt.h>
46309 @@ -255,6 +256,7 @@ int expand_files(struct files_struct *files, int nr)
46310 * N.B. For clone tasks sharing a files structure, this test
46311 * will limit the total number of files that can be opened.
46312 */
46313 + gr_learn_resource(current, RLIMIT_NOFILE, nr, 0);
46314 if (nr >= rlimit(RLIMIT_NOFILE))
46315 return -EMFILE;
46316
46317 diff --git a/fs/filesystems.c b/fs/filesystems.c
46318 index 96f2428..f5eeb8e 100644
46319 --- a/fs/filesystems.c
46320 +++ b/fs/filesystems.c
46321 @@ -273,7 +273,12 @@ struct file_system_type *get_fs_type(const char *name)
46322 int len = dot ? dot - name : strlen(name);
46323
46324 fs = __get_fs_type(name, len);
46325 +
46326 +#ifdef CONFIG_GRKERNSEC_MODHARDEN
46327 + if (!fs && (___request_module(true, "grsec_modharden_fs", "%.*s", len, name) == 0))
46328 +#else
46329 if (!fs && (request_module("%.*s", len, name) == 0))
46330 +#endif
46331 fs = __get_fs_type(name, len);
46332
46333 if (dot && fs && !(fs->fs_flags & FS_HAS_SUBTYPE)) {
46334 diff --git a/fs/fs_struct.c b/fs/fs_struct.c
46335 index 5df4775..f656176 100644
46336 --- a/fs/fs_struct.c
46337 +++ b/fs/fs_struct.c
46338 @@ -4,6 +4,7 @@
46339 #include <linux/path.h>
46340 #include <linux/slab.h>
46341 #include <linux/fs_struct.h>
46342 +#include <linux/grsecurity.h>
46343 #include "internal.h"
46344
46345 /*
46346 @@ -19,6 +20,7 @@ void set_fs_root(struct fs_struct *fs, struct path *path)
46347 write_seqcount_begin(&fs->seq);
46348 old_root = fs->root;
46349 fs->root = *path;
46350 + gr_set_chroot_entries(current, path);
46351 write_seqcount_end(&fs->seq);
46352 spin_unlock(&fs->lock);
46353 if (old_root.dentry)
46354 @@ -53,6 +55,21 @@ static inline int replace_path(struct path *p, const struct path *old, const str
46355 return 1;
46356 }
46357
46358 +static inline int replace_root_path(struct task_struct *task, struct path *p, const struct path *old, struct path *new)
46359 +{
46360 + if (likely(p->dentry != old->dentry || p->mnt != old->mnt))
46361 + return 0;
46362 + *p = *new;
46363 +
46364 + /* This function is only called from pivot_root(). Leave our
46365 + gr_chroot_dentry and is_chrooted flags as-is, so that a
46366 + pivoted root isn't treated as a chroot
46367 + */
46368 + //gr_set_chroot_entries(task, new);
46369 +
46370 + return 1;
46371 +}
46372 +
46373 void chroot_fs_refs(struct path *old_root, struct path *new_root)
46374 {
46375 struct task_struct *g, *p;
46376 @@ -67,7 +84,7 @@ void chroot_fs_refs(struct path *old_root, struct path *new_root)
46377 int hits = 0;
46378 spin_lock(&fs->lock);
46379 write_seqcount_begin(&fs->seq);
46380 - hits += replace_path(&fs->root, old_root, new_root);
46381 + hits += replace_root_path(p, &fs->root, old_root, new_root);
46382 hits += replace_path(&fs->pwd, old_root, new_root);
46383 write_seqcount_end(&fs->seq);
46384 while (hits--) {
46385 @@ -94,12 +111,15 @@ void exit_fs(struct task_struct *tsk)
46386 {
46387 struct fs_struct *fs = tsk->fs;
46388
46389 + gr_put_exec_file(tsk);
46390 +
46391 if (fs) {
46392 int kill;
46393 task_lock(tsk);
46394 spin_lock(&fs->lock);
46395 tsk->fs = NULL;
46396 - kill = !--fs->users;
46397 + gr_clear_chroot_entries(tsk);
46398 + kill = !atomic_dec_return(&fs->users);
46399 spin_unlock(&fs->lock);
46400 task_unlock(tsk);
46401 if (kill)
46402 @@ -112,7 +132,7 @@ struct fs_struct *copy_fs_struct(struct fs_struct *old)
46403 struct fs_struct *fs = kmem_cache_alloc(fs_cachep, GFP_KERNEL);
46404 /* We don't need to lock fs - think why ;-) */
46405 if (fs) {
46406 - fs->users = 1;
46407 + atomic_set(&fs->users, 1);
46408 fs->in_exec = 0;
46409 spin_lock_init(&fs->lock);
46410 seqcount_init(&fs->seq);
46411 @@ -121,6 +141,9 @@ struct fs_struct *copy_fs_struct(struct fs_struct *old)
46412 spin_lock(&old->lock);
46413 fs->root = old->root;
46414 path_get(&fs->root);
46415 + /* instead of calling gr_set_chroot_entries here,
46416 + we call it from every caller of this function
46417 + */
46418 fs->pwd = old->pwd;
46419 path_get(&fs->pwd);
46420 spin_unlock(&old->lock);
46421 @@ -139,8 +162,9 @@ int unshare_fs_struct(void)
46422
46423 task_lock(current);
46424 spin_lock(&fs->lock);
46425 - kill = !--fs->users;
46426 + kill = !atomic_dec_return(&fs->users);
46427 current->fs = new_fs;
46428 + gr_set_chroot_entries(current, &new_fs->root);
46429 spin_unlock(&fs->lock);
46430 task_unlock(current);
46431
46432 @@ -153,13 +177,13 @@ EXPORT_SYMBOL_GPL(unshare_fs_struct);
46433
46434 int current_umask(void)
46435 {
46436 - return current->fs->umask;
46437 + return current->fs->umask | gr_acl_umask();
46438 }
46439 EXPORT_SYMBOL(current_umask);
46440
46441 /* to be mentioned only in INIT_TASK */
46442 struct fs_struct init_fs = {
46443 - .users = 1,
46444 + .users = ATOMIC_INIT(1),
46445 .lock = __SPIN_LOCK_UNLOCKED(init_fs.lock),
46446 .seq = SEQCNT_ZERO,
46447 .umask = 0022,
46448 @@ -169,18 +193,21 @@ void daemonize_fs_struct(void)
46449 {
46450 struct fs_struct *fs = current->fs;
46451
46452 + gr_put_exec_file(current);
46453 +
46454 if (fs) {
46455 int kill;
46456
46457 task_lock(current);
46458
46459 spin_lock(&init_fs.lock);
46460 - init_fs.users++;
46461 + atomic_inc(&init_fs.users);
46462 spin_unlock(&init_fs.lock);
46463
46464 spin_lock(&fs->lock);
46465 current->fs = &init_fs;
46466 - kill = !--fs->users;
46467 + gr_set_chroot_entries(current, &current->fs->root);
46468 + kill = !atomic_dec_return(&fs->users);
46469 spin_unlock(&fs->lock);
46470
46471 task_unlock(current);
46472 diff --git a/fs/fscache/cookie.c b/fs/fscache/cookie.c
46473 index 9905350..02eaec4 100644
46474 --- a/fs/fscache/cookie.c
46475 +++ b/fs/fscache/cookie.c
46476 @@ -68,11 +68,11 @@ struct fscache_cookie *__fscache_acquire_cookie(
46477 parent ? (char *) parent->def->name : "<no-parent>",
46478 def->name, netfs_data);
46479
46480 - fscache_stat(&fscache_n_acquires);
46481 + fscache_stat_unchecked(&fscache_n_acquires);
46482
46483 /* if there's no parent cookie, then we don't create one here either */
46484 if (!parent) {
46485 - fscache_stat(&fscache_n_acquires_null);
46486 + fscache_stat_unchecked(&fscache_n_acquires_null);
46487 _leave(" [no parent]");
46488 return NULL;
46489 }
46490 @@ -87,7 +87,7 @@ struct fscache_cookie *__fscache_acquire_cookie(
46491 /* allocate and initialise a cookie */
46492 cookie = kmem_cache_alloc(fscache_cookie_jar, GFP_KERNEL);
46493 if (!cookie) {
46494 - fscache_stat(&fscache_n_acquires_oom);
46495 + fscache_stat_unchecked(&fscache_n_acquires_oom);
46496 _leave(" [ENOMEM]");
46497 return NULL;
46498 }
46499 @@ -109,13 +109,13 @@ struct fscache_cookie *__fscache_acquire_cookie(
46500
46501 switch (cookie->def->type) {
46502 case FSCACHE_COOKIE_TYPE_INDEX:
46503 - fscache_stat(&fscache_n_cookie_index);
46504 + fscache_stat_unchecked(&fscache_n_cookie_index);
46505 break;
46506 case FSCACHE_COOKIE_TYPE_DATAFILE:
46507 - fscache_stat(&fscache_n_cookie_data);
46508 + fscache_stat_unchecked(&fscache_n_cookie_data);
46509 break;
46510 default:
46511 - fscache_stat(&fscache_n_cookie_special);
46512 + fscache_stat_unchecked(&fscache_n_cookie_special);
46513 break;
46514 }
46515
46516 @@ -126,13 +126,13 @@ struct fscache_cookie *__fscache_acquire_cookie(
46517 if (fscache_acquire_non_index_cookie(cookie) < 0) {
46518 atomic_dec(&parent->n_children);
46519 __fscache_cookie_put(cookie);
46520 - fscache_stat(&fscache_n_acquires_nobufs);
46521 + fscache_stat_unchecked(&fscache_n_acquires_nobufs);
46522 _leave(" = NULL");
46523 return NULL;
46524 }
46525 }
46526
46527 - fscache_stat(&fscache_n_acquires_ok);
46528 + fscache_stat_unchecked(&fscache_n_acquires_ok);
46529 _leave(" = %p", cookie);
46530 return cookie;
46531 }
46532 @@ -168,7 +168,7 @@ static int fscache_acquire_non_index_cookie(struct fscache_cookie *cookie)
46533 cache = fscache_select_cache_for_object(cookie->parent);
46534 if (!cache) {
46535 up_read(&fscache_addremove_sem);
46536 - fscache_stat(&fscache_n_acquires_no_cache);
46537 + fscache_stat_unchecked(&fscache_n_acquires_no_cache);
46538 _leave(" = -ENOMEDIUM [no cache]");
46539 return -ENOMEDIUM;
46540 }
46541 @@ -256,12 +256,12 @@ static int fscache_alloc_object(struct fscache_cache *cache,
46542 object = cache->ops->alloc_object(cache, cookie);
46543 fscache_stat_d(&fscache_n_cop_alloc_object);
46544 if (IS_ERR(object)) {
46545 - fscache_stat(&fscache_n_object_no_alloc);
46546 + fscache_stat_unchecked(&fscache_n_object_no_alloc);
46547 ret = PTR_ERR(object);
46548 goto error;
46549 }
46550
46551 - fscache_stat(&fscache_n_object_alloc);
46552 + fscache_stat_unchecked(&fscache_n_object_alloc);
46553
46554 object->debug_id = atomic_inc_return(&fscache_object_debug_id);
46555
46556 @@ -377,10 +377,10 @@ void __fscache_update_cookie(struct fscache_cookie *cookie)
46557 struct fscache_object *object;
46558 struct hlist_node *_p;
46559
46560 - fscache_stat(&fscache_n_updates);
46561 + fscache_stat_unchecked(&fscache_n_updates);
46562
46563 if (!cookie) {
46564 - fscache_stat(&fscache_n_updates_null);
46565 + fscache_stat_unchecked(&fscache_n_updates_null);
46566 _leave(" [no cookie]");
46567 return;
46568 }
46569 @@ -414,12 +414,12 @@ void __fscache_relinquish_cookie(struct fscache_cookie *cookie, int retire)
46570 struct fscache_object *object;
46571 unsigned long event;
46572
46573 - fscache_stat(&fscache_n_relinquishes);
46574 + fscache_stat_unchecked(&fscache_n_relinquishes);
46575 if (retire)
46576 - fscache_stat(&fscache_n_relinquishes_retire);
46577 + fscache_stat_unchecked(&fscache_n_relinquishes_retire);
46578
46579 if (!cookie) {
46580 - fscache_stat(&fscache_n_relinquishes_null);
46581 + fscache_stat_unchecked(&fscache_n_relinquishes_null);
46582 _leave(" [no cookie]");
46583 return;
46584 }
46585 @@ -435,7 +435,7 @@ void __fscache_relinquish_cookie(struct fscache_cookie *cookie, int retire)
46586
46587 /* wait for the cookie to finish being instantiated (or to fail) */
46588 if (test_bit(FSCACHE_COOKIE_CREATING, &cookie->flags)) {
46589 - fscache_stat(&fscache_n_relinquishes_waitcrt);
46590 + fscache_stat_unchecked(&fscache_n_relinquishes_waitcrt);
46591 wait_on_bit(&cookie->flags, FSCACHE_COOKIE_CREATING,
46592 fscache_wait_bit, TASK_UNINTERRUPTIBLE);
46593 }
46594 diff --git a/fs/fscache/internal.h b/fs/fscache/internal.h
46595 index f6aad48..88dcf26 100644
46596 --- a/fs/fscache/internal.h
46597 +++ b/fs/fscache/internal.h
46598 @@ -144,94 +144,94 @@ extern void fscache_proc_cleanup(void);
46599 extern atomic_t fscache_n_ops_processed[FSCACHE_MAX_THREADS];
46600 extern atomic_t fscache_n_objs_processed[FSCACHE_MAX_THREADS];
46601
46602 -extern atomic_t fscache_n_op_pend;
46603 -extern atomic_t fscache_n_op_run;
46604 -extern atomic_t fscache_n_op_enqueue;
46605 -extern atomic_t fscache_n_op_deferred_release;
46606 -extern atomic_t fscache_n_op_release;
46607 -extern atomic_t fscache_n_op_gc;
46608 -extern atomic_t fscache_n_op_cancelled;
46609 -extern atomic_t fscache_n_op_rejected;
46610 +extern atomic_unchecked_t fscache_n_op_pend;
46611 +extern atomic_unchecked_t fscache_n_op_run;
46612 +extern atomic_unchecked_t fscache_n_op_enqueue;
46613 +extern atomic_unchecked_t fscache_n_op_deferred_release;
46614 +extern atomic_unchecked_t fscache_n_op_release;
46615 +extern atomic_unchecked_t fscache_n_op_gc;
46616 +extern atomic_unchecked_t fscache_n_op_cancelled;
46617 +extern atomic_unchecked_t fscache_n_op_rejected;
46618
46619 -extern atomic_t fscache_n_attr_changed;
46620 -extern atomic_t fscache_n_attr_changed_ok;
46621 -extern atomic_t fscache_n_attr_changed_nobufs;
46622 -extern atomic_t fscache_n_attr_changed_nomem;
46623 -extern atomic_t fscache_n_attr_changed_calls;
46624 +extern atomic_unchecked_t fscache_n_attr_changed;
46625 +extern atomic_unchecked_t fscache_n_attr_changed_ok;
46626 +extern atomic_unchecked_t fscache_n_attr_changed_nobufs;
46627 +extern atomic_unchecked_t fscache_n_attr_changed_nomem;
46628 +extern atomic_unchecked_t fscache_n_attr_changed_calls;
46629
46630 -extern atomic_t fscache_n_allocs;
46631 -extern atomic_t fscache_n_allocs_ok;
46632 -extern atomic_t fscache_n_allocs_wait;
46633 -extern atomic_t fscache_n_allocs_nobufs;
46634 -extern atomic_t fscache_n_allocs_intr;
46635 -extern atomic_t fscache_n_allocs_object_dead;
46636 -extern atomic_t fscache_n_alloc_ops;
46637 -extern atomic_t fscache_n_alloc_op_waits;
46638 +extern atomic_unchecked_t fscache_n_allocs;
46639 +extern atomic_unchecked_t fscache_n_allocs_ok;
46640 +extern atomic_unchecked_t fscache_n_allocs_wait;
46641 +extern atomic_unchecked_t fscache_n_allocs_nobufs;
46642 +extern atomic_unchecked_t fscache_n_allocs_intr;
46643 +extern atomic_unchecked_t fscache_n_allocs_object_dead;
46644 +extern atomic_unchecked_t fscache_n_alloc_ops;
46645 +extern atomic_unchecked_t fscache_n_alloc_op_waits;
46646
46647 -extern atomic_t fscache_n_retrievals;
46648 -extern atomic_t fscache_n_retrievals_ok;
46649 -extern atomic_t fscache_n_retrievals_wait;
46650 -extern atomic_t fscache_n_retrievals_nodata;
46651 -extern atomic_t fscache_n_retrievals_nobufs;
46652 -extern atomic_t fscache_n_retrievals_intr;
46653 -extern atomic_t fscache_n_retrievals_nomem;
46654 -extern atomic_t fscache_n_retrievals_object_dead;
46655 -extern atomic_t fscache_n_retrieval_ops;
46656 -extern atomic_t fscache_n_retrieval_op_waits;
46657 +extern atomic_unchecked_t fscache_n_retrievals;
46658 +extern atomic_unchecked_t fscache_n_retrievals_ok;
46659 +extern atomic_unchecked_t fscache_n_retrievals_wait;
46660 +extern atomic_unchecked_t fscache_n_retrievals_nodata;
46661 +extern atomic_unchecked_t fscache_n_retrievals_nobufs;
46662 +extern atomic_unchecked_t fscache_n_retrievals_intr;
46663 +extern atomic_unchecked_t fscache_n_retrievals_nomem;
46664 +extern atomic_unchecked_t fscache_n_retrievals_object_dead;
46665 +extern atomic_unchecked_t fscache_n_retrieval_ops;
46666 +extern atomic_unchecked_t fscache_n_retrieval_op_waits;
46667
46668 -extern atomic_t fscache_n_stores;
46669 -extern atomic_t fscache_n_stores_ok;
46670 -extern atomic_t fscache_n_stores_again;
46671 -extern atomic_t fscache_n_stores_nobufs;
46672 -extern atomic_t fscache_n_stores_oom;
46673 -extern atomic_t fscache_n_store_ops;
46674 -extern atomic_t fscache_n_store_calls;
46675 -extern atomic_t fscache_n_store_pages;
46676 -extern atomic_t fscache_n_store_radix_deletes;
46677 -extern atomic_t fscache_n_store_pages_over_limit;
46678 +extern atomic_unchecked_t fscache_n_stores;
46679 +extern atomic_unchecked_t fscache_n_stores_ok;
46680 +extern atomic_unchecked_t fscache_n_stores_again;
46681 +extern atomic_unchecked_t fscache_n_stores_nobufs;
46682 +extern atomic_unchecked_t fscache_n_stores_oom;
46683 +extern atomic_unchecked_t fscache_n_store_ops;
46684 +extern atomic_unchecked_t fscache_n_store_calls;
46685 +extern atomic_unchecked_t fscache_n_store_pages;
46686 +extern atomic_unchecked_t fscache_n_store_radix_deletes;
46687 +extern atomic_unchecked_t fscache_n_store_pages_over_limit;
46688
46689 -extern atomic_t fscache_n_store_vmscan_not_storing;
46690 -extern atomic_t fscache_n_store_vmscan_gone;
46691 -extern atomic_t fscache_n_store_vmscan_busy;
46692 -extern atomic_t fscache_n_store_vmscan_cancelled;
46693 +extern atomic_unchecked_t fscache_n_store_vmscan_not_storing;
46694 +extern atomic_unchecked_t fscache_n_store_vmscan_gone;
46695 +extern atomic_unchecked_t fscache_n_store_vmscan_busy;
46696 +extern atomic_unchecked_t fscache_n_store_vmscan_cancelled;
46697
46698 -extern atomic_t fscache_n_marks;
46699 -extern atomic_t fscache_n_uncaches;
46700 +extern atomic_unchecked_t fscache_n_marks;
46701 +extern atomic_unchecked_t fscache_n_uncaches;
46702
46703 -extern atomic_t fscache_n_acquires;
46704 -extern atomic_t fscache_n_acquires_null;
46705 -extern atomic_t fscache_n_acquires_no_cache;
46706 -extern atomic_t fscache_n_acquires_ok;
46707 -extern atomic_t fscache_n_acquires_nobufs;
46708 -extern atomic_t fscache_n_acquires_oom;
46709 +extern atomic_unchecked_t fscache_n_acquires;
46710 +extern atomic_unchecked_t fscache_n_acquires_null;
46711 +extern atomic_unchecked_t fscache_n_acquires_no_cache;
46712 +extern atomic_unchecked_t fscache_n_acquires_ok;
46713 +extern atomic_unchecked_t fscache_n_acquires_nobufs;
46714 +extern atomic_unchecked_t fscache_n_acquires_oom;
46715
46716 -extern atomic_t fscache_n_updates;
46717 -extern atomic_t fscache_n_updates_null;
46718 -extern atomic_t fscache_n_updates_run;
46719 +extern atomic_unchecked_t fscache_n_updates;
46720 +extern atomic_unchecked_t fscache_n_updates_null;
46721 +extern atomic_unchecked_t fscache_n_updates_run;
46722
46723 -extern atomic_t fscache_n_relinquishes;
46724 -extern atomic_t fscache_n_relinquishes_null;
46725 -extern atomic_t fscache_n_relinquishes_waitcrt;
46726 -extern atomic_t fscache_n_relinquishes_retire;
46727 +extern atomic_unchecked_t fscache_n_relinquishes;
46728 +extern atomic_unchecked_t fscache_n_relinquishes_null;
46729 +extern atomic_unchecked_t fscache_n_relinquishes_waitcrt;
46730 +extern atomic_unchecked_t fscache_n_relinquishes_retire;
46731
46732 -extern atomic_t fscache_n_cookie_index;
46733 -extern atomic_t fscache_n_cookie_data;
46734 -extern atomic_t fscache_n_cookie_special;
46735 +extern atomic_unchecked_t fscache_n_cookie_index;
46736 +extern atomic_unchecked_t fscache_n_cookie_data;
46737 +extern atomic_unchecked_t fscache_n_cookie_special;
46738
46739 -extern atomic_t fscache_n_object_alloc;
46740 -extern atomic_t fscache_n_object_no_alloc;
46741 -extern atomic_t fscache_n_object_lookups;
46742 -extern atomic_t fscache_n_object_lookups_negative;
46743 -extern atomic_t fscache_n_object_lookups_positive;
46744 -extern atomic_t fscache_n_object_lookups_timed_out;
46745 -extern atomic_t fscache_n_object_created;
46746 -extern atomic_t fscache_n_object_avail;
46747 -extern atomic_t fscache_n_object_dead;
46748 +extern atomic_unchecked_t fscache_n_object_alloc;
46749 +extern atomic_unchecked_t fscache_n_object_no_alloc;
46750 +extern atomic_unchecked_t fscache_n_object_lookups;
46751 +extern atomic_unchecked_t fscache_n_object_lookups_negative;
46752 +extern atomic_unchecked_t fscache_n_object_lookups_positive;
46753 +extern atomic_unchecked_t fscache_n_object_lookups_timed_out;
46754 +extern atomic_unchecked_t fscache_n_object_created;
46755 +extern atomic_unchecked_t fscache_n_object_avail;
46756 +extern atomic_unchecked_t fscache_n_object_dead;
46757
46758 -extern atomic_t fscache_n_checkaux_none;
46759 -extern atomic_t fscache_n_checkaux_okay;
46760 -extern atomic_t fscache_n_checkaux_update;
46761 -extern atomic_t fscache_n_checkaux_obsolete;
46762 +extern atomic_unchecked_t fscache_n_checkaux_none;
46763 +extern atomic_unchecked_t fscache_n_checkaux_okay;
46764 +extern atomic_unchecked_t fscache_n_checkaux_update;
46765 +extern atomic_unchecked_t fscache_n_checkaux_obsolete;
46766
46767 extern atomic_t fscache_n_cop_alloc_object;
46768 extern atomic_t fscache_n_cop_lookup_object;
46769 @@ -255,6 +255,11 @@ static inline void fscache_stat(atomic_t *stat)
46770 atomic_inc(stat);
46771 }
46772
46773 +static inline void fscache_stat_unchecked(atomic_unchecked_t *stat)
46774 +{
46775 + atomic_inc_unchecked(stat);
46776 +}
46777 +
46778 static inline void fscache_stat_d(atomic_t *stat)
46779 {
46780 atomic_dec(stat);
46781 @@ -267,6 +272,7 @@ extern const struct file_operations fscache_stats_fops;
46782
46783 #define __fscache_stat(stat) (NULL)
46784 #define fscache_stat(stat) do {} while (0)
46785 +#define fscache_stat_unchecked(stat) do {} while (0)
46786 #define fscache_stat_d(stat) do {} while (0)
46787 #endif
46788
46789 diff --git a/fs/fscache/object.c b/fs/fscache/object.c
46790 index b6b897c..0ffff9c 100644
46791 --- a/fs/fscache/object.c
46792 +++ b/fs/fscache/object.c
46793 @@ -128,7 +128,7 @@ static void fscache_object_state_machine(struct fscache_object *object)
46794 /* update the object metadata on disk */
46795 case FSCACHE_OBJECT_UPDATING:
46796 clear_bit(FSCACHE_OBJECT_EV_UPDATE, &object->events);
46797 - fscache_stat(&fscache_n_updates_run);
46798 + fscache_stat_unchecked(&fscache_n_updates_run);
46799 fscache_stat(&fscache_n_cop_update_object);
46800 object->cache->ops->update_object(object);
46801 fscache_stat_d(&fscache_n_cop_update_object);
46802 @@ -217,7 +217,7 @@ static void fscache_object_state_machine(struct fscache_object *object)
46803 spin_lock(&object->lock);
46804 object->state = FSCACHE_OBJECT_DEAD;
46805 spin_unlock(&object->lock);
46806 - fscache_stat(&fscache_n_object_dead);
46807 + fscache_stat_unchecked(&fscache_n_object_dead);
46808 goto terminal_transit;
46809
46810 /* handle the parent cache of this object being withdrawn from
46811 @@ -232,7 +232,7 @@ static void fscache_object_state_machine(struct fscache_object *object)
46812 spin_lock(&object->lock);
46813 object->state = FSCACHE_OBJECT_DEAD;
46814 spin_unlock(&object->lock);
46815 - fscache_stat(&fscache_n_object_dead);
46816 + fscache_stat_unchecked(&fscache_n_object_dead);
46817 goto terminal_transit;
46818
46819 /* complain about the object being woken up once it is
46820 @@ -461,7 +461,7 @@ static void fscache_lookup_object(struct fscache_object *object)
46821 parent->cookie->def->name, cookie->def->name,
46822 object->cache->tag->name);
46823
46824 - fscache_stat(&fscache_n_object_lookups);
46825 + fscache_stat_unchecked(&fscache_n_object_lookups);
46826 fscache_stat(&fscache_n_cop_lookup_object);
46827 ret = object->cache->ops->lookup_object(object);
46828 fscache_stat_d(&fscache_n_cop_lookup_object);
46829 @@ -472,7 +472,7 @@ static void fscache_lookup_object(struct fscache_object *object)
46830 if (ret == -ETIMEDOUT) {
46831 /* probably stuck behind another object, so move this one to
46832 * the back of the queue */
46833 - fscache_stat(&fscache_n_object_lookups_timed_out);
46834 + fscache_stat_unchecked(&fscache_n_object_lookups_timed_out);
46835 set_bit(FSCACHE_OBJECT_EV_REQUEUE, &object->events);
46836 }
46837
46838 @@ -495,7 +495,7 @@ void fscache_object_lookup_negative(struct fscache_object *object)
46839
46840 spin_lock(&object->lock);
46841 if (object->state == FSCACHE_OBJECT_LOOKING_UP) {
46842 - fscache_stat(&fscache_n_object_lookups_negative);
46843 + fscache_stat_unchecked(&fscache_n_object_lookups_negative);
46844
46845 /* transit here to allow write requests to begin stacking up
46846 * and read requests to begin returning ENODATA */
46847 @@ -541,7 +541,7 @@ void fscache_obtained_object(struct fscache_object *object)
46848 * result, in which case there may be data available */
46849 spin_lock(&object->lock);
46850 if (object->state == FSCACHE_OBJECT_LOOKING_UP) {
46851 - fscache_stat(&fscache_n_object_lookups_positive);
46852 + fscache_stat_unchecked(&fscache_n_object_lookups_positive);
46853
46854 clear_bit(FSCACHE_COOKIE_NO_DATA_YET, &cookie->flags);
46855
46856 @@ -555,7 +555,7 @@ void fscache_obtained_object(struct fscache_object *object)
46857 set_bit(FSCACHE_OBJECT_EV_REQUEUE, &object->events);
46858 } else {
46859 ASSERTCMP(object->state, ==, FSCACHE_OBJECT_CREATING);
46860 - fscache_stat(&fscache_n_object_created);
46861 + fscache_stat_unchecked(&fscache_n_object_created);
46862
46863 object->state = FSCACHE_OBJECT_AVAILABLE;
46864 spin_unlock(&object->lock);
46865 @@ -602,7 +602,7 @@ static void fscache_object_available(struct fscache_object *object)
46866 fscache_enqueue_dependents(object);
46867
46868 fscache_hist(fscache_obj_instantiate_histogram, object->lookup_jif);
46869 - fscache_stat(&fscache_n_object_avail);
46870 + fscache_stat_unchecked(&fscache_n_object_avail);
46871
46872 _leave("");
46873 }
46874 @@ -861,7 +861,7 @@ enum fscache_checkaux fscache_check_aux(struct fscache_object *object,
46875 enum fscache_checkaux result;
46876
46877 if (!object->cookie->def->check_aux) {
46878 - fscache_stat(&fscache_n_checkaux_none);
46879 + fscache_stat_unchecked(&fscache_n_checkaux_none);
46880 return FSCACHE_CHECKAUX_OKAY;
46881 }
46882
46883 @@ -870,17 +870,17 @@ enum fscache_checkaux fscache_check_aux(struct fscache_object *object,
46884 switch (result) {
46885 /* entry okay as is */
46886 case FSCACHE_CHECKAUX_OKAY:
46887 - fscache_stat(&fscache_n_checkaux_okay);
46888 + fscache_stat_unchecked(&fscache_n_checkaux_okay);
46889 break;
46890
46891 /* entry requires update */
46892 case FSCACHE_CHECKAUX_NEEDS_UPDATE:
46893 - fscache_stat(&fscache_n_checkaux_update);
46894 + fscache_stat_unchecked(&fscache_n_checkaux_update);
46895 break;
46896
46897 /* entry requires deletion */
46898 case FSCACHE_CHECKAUX_OBSOLETE:
46899 - fscache_stat(&fscache_n_checkaux_obsolete);
46900 + fscache_stat_unchecked(&fscache_n_checkaux_obsolete);
46901 break;
46902
46903 default:
46904 diff --git a/fs/fscache/operation.c b/fs/fscache/operation.c
46905 index 30afdfa..2256596 100644
46906 --- a/fs/fscache/operation.c
46907 +++ b/fs/fscache/operation.c
46908 @@ -17,7 +17,7 @@
46909 #include <linux/slab.h>
46910 #include "internal.h"
46911
46912 -atomic_t fscache_op_debug_id;
46913 +atomic_unchecked_t fscache_op_debug_id;
46914 EXPORT_SYMBOL(fscache_op_debug_id);
46915
46916 /**
46917 @@ -38,7 +38,7 @@ void fscache_enqueue_operation(struct fscache_operation *op)
46918 ASSERTCMP(op->object->state, >=, FSCACHE_OBJECT_AVAILABLE);
46919 ASSERTCMP(atomic_read(&op->usage), >, 0);
46920
46921 - fscache_stat(&fscache_n_op_enqueue);
46922 + fscache_stat_unchecked(&fscache_n_op_enqueue);
46923 switch (op->flags & FSCACHE_OP_TYPE) {
46924 case FSCACHE_OP_ASYNC:
46925 _debug("queue async");
46926 @@ -69,7 +69,7 @@ static void fscache_run_op(struct fscache_object *object,
46927 wake_up_bit(&op->flags, FSCACHE_OP_WAITING);
46928 if (op->processor)
46929 fscache_enqueue_operation(op);
46930 - fscache_stat(&fscache_n_op_run);
46931 + fscache_stat_unchecked(&fscache_n_op_run);
46932 }
46933
46934 /*
46935 @@ -98,11 +98,11 @@ int fscache_submit_exclusive_op(struct fscache_object *object,
46936 if (object->n_ops > 1) {
46937 atomic_inc(&op->usage);
46938 list_add_tail(&op->pend_link, &object->pending_ops);
46939 - fscache_stat(&fscache_n_op_pend);
46940 + fscache_stat_unchecked(&fscache_n_op_pend);
46941 } else if (!list_empty(&object->pending_ops)) {
46942 atomic_inc(&op->usage);
46943 list_add_tail(&op->pend_link, &object->pending_ops);
46944 - fscache_stat(&fscache_n_op_pend);
46945 + fscache_stat_unchecked(&fscache_n_op_pend);
46946 fscache_start_operations(object);
46947 } else {
46948 ASSERTCMP(object->n_in_progress, ==, 0);
46949 @@ -118,7 +118,7 @@ int fscache_submit_exclusive_op(struct fscache_object *object,
46950 object->n_exclusive++; /* reads and writes must wait */
46951 atomic_inc(&op->usage);
46952 list_add_tail(&op->pend_link, &object->pending_ops);
46953 - fscache_stat(&fscache_n_op_pend);
46954 + fscache_stat_unchecked(&fscache_n_op_pend);
46955 ret = 0;
46956 } else {
46957 /* not allowed to submit ops in any other state */
46958 @@ -203,11 +203,11 @@ int fscache_submit_op(struct fscache_object *object,
46959 if (object->n_exclusive > 0) {
46960 atomic_inc(&op->usage);
46961 list_add_tail(&op->pend_link, &object->pending_ops);
46962 - fscache_stat(&fscache_n_op_pend);
46963 + fscache_stat_unchecked(&fscache_n_op_pend);
46964 } else if (!list_empty(&object->pending_ops)) {
46965 atomic_inc(&op->usage);
46966 list_add_tail(&op->pend_link, &object->pending_ops);
46967 - fscache_stat(&fscache_n_op_pend);
46968 + fscache_stat_unchecked(&fscache_n_op_pend);
46969 fscache_start_operations(object);
46970 } else {
46971 ASSERTCMP(object->n_exclusive, ==, 0);
46972 @@ -219,12 +219,12 @@ int fscache_submit_op(struct fscache_object *object,
46973 object->n_ops++;
46974 atomic_inc(&op->usage);
46975 list_add_tail(&op->pend_link, &object->pending_ops);
46976 - fscache_stat(&fscache_n_op_pend);
46977 + fscache_stat_unchecked(&fscache_n_op_pend);
46978 ret = 0;
46979 } else if (object->state == FSCACHE_OBJECT_DYING ||
46980 object->state == FSCACHE_OBJECT_LC_DYING ||
46981 object->state == FSCACHE_OBJECT_WITHDRAWING) {
46982 - fscache_stat(&fscache_n_op_rejected);
46983 + fscache_stat_unchecked(&fscache_n_op_rejected);
46984 ret = -ENOBUFS;
46985 } else if (!test_bit(FSCACHE_IOERROR, &object->cache->flags)) {
46986 fscache_report_unexpected_submission(object, op, ostate);
46987 @@ -294,7 +294,7 @@ int fscache_cancel_op(struct fscache_operation *op)
46988
46989 ret = -EBUSY;
46990 if (!list_empty(&op->pend_link)) {
46991 - fscache_stat(&fscache_n_op_cancelled);
46992 + fscache_stat_unchecked(&fscache_n_op_cancelled);
46993 list_del_init(&op->pend_link);
46994 object->n_ops--;
46995 if (test_bit(FSCACHE_OP_EXCLUSIVE, &op->flags))
46996 @@ -331,7 +331,7 @@ void fscache_put_operation(struct fscache_operation *op)
46997 if (test_and_set_bit(FSCACHE_OP_DEAD, &op->flags))
46998 BUG();
46999
47000 - fscache_stat(&fscache_n_op_release);
47001 + fscache_stat_unchecked(&fscache_n_op_release);
47002
47003 if (op->release) {
47004 op->release(op);
47005 @@ -348,7 +348,7 @@ void fscache_put_operation(struct fscache_operation *op)
47006 * lock, and defer it otherwise */
47007 if (!spin_trylock(&object->lock)) {
47008 _debug("defer put");
47009 - fscache_stat(&fscache_n_op_deferred_release);
47010 + fscache_stat_unchecked(&fscache_n_op_deferred_release);
47011
47012 cache = object->cache;
47013 spin_lock(&cache->op_gc_list_lock);
47014 @@ -410,7 +410,7 @@ void fscache_operation_gc(struct work_struct *work)
47015
47016 _debug("GC DEFERRED REL OBJ%x OP%x",
47017 object->debug_id, op->debug_id);
47018 - fscache_stat(&fscache_n_op_gc);
47019 + fscache_stat_unchecked(&fscache_n_op_gc);
47020
47021 ASSERTCMP(atomic_read(&op->usage), ==, 0);
47022
47023 diff --git a/fs/fscache/page.c b/fs/fscache/page.c
47024 index 3f7a59b..cf196cc 100644
47025 --- a/fs/fscache/page.c
47026 +++ b/fs/fscache/page.c
47027 @@ -60,7 +60,7 @@ bool __fscache_maybe_release_page(struct fscache_cookie *cookie,
47028 val = radix_tree_lookup(&cookie->stores, page->index);
47029 if (!val) {
47030 rcu_read_unlock();
47031 - fscache_stat(&fscache_n_store_vmscan_not_storing);
47032 + fscache_stat_unchecked(&fscache_n_store_vmscan_not_storing);
47033 __fscache_uncache_page(cookie, page);
47034 return true;
47035 }
47036 @@ -90,11 +90,11 @@ bool __fscache_maybe_release_page(struct fscache_cookie *cookie,
47037 spin_unlock(&cookie->stores_lock);
47038
47039 if (xpage) {
47040 - fscache_stat(&fscache_n_store_vmscan_cancelled);
47041 - fscache_stat(&fscache_n_store_radix_deletes);
47042 + fscache_stat_unchecked(&fscache_n_store_vmscan_cancelled);
47043 + fscache_stat_unchecked(&fscache_n_store_radix_deletes);
47044 ASSERTCMP(xpage, ==, page);
47045 } else {
47046 - fscache_stat(&fscache_n_store_vmscan_gone);
47047 + fscache_stat_unchecked(&fscache_n_store_vmscan_gone);
47048 }
47049
47050 wake_up_bit(&cookie->flags, 0);
47051 @@ -107,7 +107,7 @@ page_busy:
47052 /* we might want to wait here, but that could deadlock the allocator as
47053 * the work threads writing to the cache may all end up sleeping
47054 * on memory allocation */
47055 - fscache_stat(&fscache_n_store_vmscan_busy);
47056 + fscache_stat_unchecked(&fscache_n_store_vmscan_busy);
47057 return false;
47058 }
47059 EXPORT_SYMBOL(__fscache_maybe_release_page);
47060 @@ -131,7 +131,7 @@ static void fscache_end_page_write(struct fscache_object *object,
47061 FSCACHE_COOKIE_STORING_TAG);
47062 if (!radix_tree_tag_get(&cookie->stores, page->index,
47063 FSCACHE_COOKIE_PENDING_TAG)) {
47064 - fscache_stat(&fscache_n_store_radix_deletes);
47065 + fscache_stat_unchecked(&fscache_n_store_radix_deletes);
47066 xpage = radix_tree_delete(&cookie->stores, page->index);
47067 }
47068 spin_unlock(&cookie->stores_lock);
47069 @@ -152,7 +152,7 @@ static void fscache_attr_changed_op(struct fscache_operation *op)
47070
47071 _enter("{OBJ%x OP%x}", object->debug_id, op->debug_id);
47072
47073 - fscache_stat(&fscache_n_attr_changed_calls);
47074 + fscache_stat_unchecked(&fscache_n_attr_changed_calls);
47075
47076 if (fscache_object_is_active(object)) {
47077 fscache_stat(&fscache_n_cop_attr_changed);
47078 @@ -177,11 +177,11 @@ int __fscache_attr_changed(struct fscache_cookie *cookie)
47079
47080 ASSERTCMP(cookie->def->type, !=, FSCACHE_COOKIE_TYPE_INDEX);
47081
47082 - fscache_stat(&fscache_n_attr_changed);
47083 + fscache_stat_unchecked(&fscache_n_attr_changed);
47084
47085 op = kzalloc(sizeof(*op), GFP_KERNEL);
47086 if (!op) {
47087 - fscache_stat(&fscache_n_attr_changed_nomem);
47088 + fscache_stat_unchecked(&fscache_n_attr_changed_nomem);
47089 _leave(" = -ENOMEM");
47090 return -ENOMEM;
47091 }
47092 @@ -199,7 +199,7 @@ int __fscache_attr_changed(struct fscache_cookie *cookie)
47093 if (fscache_submit_exclusive_op(object, op) < 0)
47094 goto nobufs;
47095 spin_unlock(&cookie->lock);
47096 - fscache_stat(&fscache_n_attr_changed_ok);
47097 + fscache_stat_unchecked(&fscache_n_attr_changed_ok);
47098 fscache_put_operation(op);
47099 _leave(" = 0");
47100 return 0;
47101 @@ -207,7 +207,7 @@ int __fscache_attr_changed(struct fscache_cookie *cookie)
47102 nobufs:
47103 spin_unlock(&cookie->lock);
47104 kfree(op);
47105 - fscache_stat(&fscache_n_attr_changed_nobufs);
47106 + fscache_stat_unchecked(&fscache_n_attr_changed_nobufs);
47107 _leave(" = %d", -ENOBUFS);
47108 return -ENOBUFS;
47109 }
47110 @@ -243,7 +243,7 @@ static struct fscache_retrieval *fscache_alloc_retrieval(
47111 /* allocate a retrieval operation and attempt to submit it */
47112 op = kzalloc(sizeof(*op), GFP_NOIO);
47113 if (!op) {
47114 - fscache_stat(&fscache_n_retrievals_nomem);
47115 + fscache_stat_unchecked(&fscache_n_retrievals_nomem);
47116 return NULL;
47117 }
47118
47119 @@ -271,13 +271,13 @@ static int fscache_wait_for_deferred_lookup(struct fscache_cookie *cookie)
47120 return 0;
47121 }
47122
47123 - fscache_stat(&fscache_n_retrievals_wait);
47124 + fscache_stat_unchecked(&fscache_n_retrievals_wait);
47125
47126 jif = jiffies;
47127 if (wait_on_bit(&cookie->flags, FSCACHE_COOKIE_LOOKING_UP,
47128 fscache_wait_bit_interruptible,
47129 TASK_INTERRUPTIBLE) != 0) {
47130 - fscache_stat(&fscache_n_retrievals_intr);
47131 + fscache_stat_unchecked(&fscache_n_retrievals_intr);
47132 _leave(" = -ERESTARTSYS");
47133 return -ERESTARTSYS;
47134 }
47135 @@ -295,8 +295,8 @@ static int fscache_wait_for_deferred_lookup(struct fscache_cookie *cookie)
47136 */
47137 static int fscache_wait_for_retrieval_activation(struct fscache_object *object,
47138 struct fscache_retrieval *op,
47139 - atomic_t *stat_op_waits,
47140 - atomic_t *stat_object_dead)
47141 + atomic_unchecked_t *stat_op_waits,
47142 + atomic_unchecked_t *stat_object_dead)
47143 {
47144 int ret;
47145
47146 @@ -304,7 +304,7 @@ static int fscache_wait_for_retrieval_activation(struct fscache_object *object,
47147 goto check_if_dead;
47148
47149 _debug(">>> WT");
47150 - fscache_stat(stat_op_waits);
47151 + fscache_stat_unchecked(stat_op_waits);
47152 if (wait_on_bit(&op->op.flags, FSCACHE_OP_WAITING,
47153 fscache_wait_bit_interruptible,
47154 TASK_INTERRUPTIBLE) < 0) {
47155 @@ -321,7 +321,7 @@ static int fscache_wait_for_retrieval_activation(struct fscache_object *object,
47156
47157 check_if_dead:
47158 if (unlikely(fscache_object_is_dead(object))) {
47159 - fscache_stat(stat_object_dead);
47160 + fscache_stat_unchecked(stat_object_dead);
47161 return -ENOBUFS;
47162 }
47163 return 0;
47164 @@ -348,7 +348,7 @@ int __fscache_read_or_alloc_page(struct fscache_cookie *cookie,
47165
47166 _enter("%p,%p,,,", cookie, page);
47167
47168 - fscache_stat(&fscache_n_retrievals);
47169 + fscache_stat_unchecked(&fscache_n_retrievals);
47170
47171 if (hlist_empty(&cookie->backing_objects))
47172 goto nobufs;
47173 @@ -381,7 +381,7 @@ int __fscache_read_or_alloc_page(struct fscache_cookie *cookie,
47174 goto nobufs_unlock;
47175 spin_unlock(&cookie->lock);
47176
47177 - fscache_stat(&fscache_n_retrieval_ops);
47178 + fscache_stat_unchecked(&fscache_n_retrieval_ops);
47179
47180 /* pin the netfs read context in case we need to do the actual netfs
47181 * read because we've encountered a cache read failure */
47182 @@ -411,15 +411,15 @@ int __fscache_read_or_alloc_page(struct fscache_cookie *cookie,
47183
47184 error:
47185 if (ret == -ENOMEM)
47186 - fscache_stat(&fscache_n_retrievals_nomem);
47187 + fscache_stat_unchecked(&fscache_n_retrievals_nomem);
47188 else if (ret == -ERESTARTSYS)
47189 - fscache_stat(&fscache_n_retrievals_intr);
47190 + fscache_stat_unchecked(&fscache_n_retrievals_intr);
47191 else if (ret == -ENODATA)
47192 - fscache_stat(&fscache_n_retrievals_nodata);
47193 + fscache_stat_unchecked(&fscache_n_retrievals_nodata);
47194 else if (ret < 0)
47195 - fscache_stat(&fscache_n_retrievals_nobufs);
47196 + fscache_stat_unchecked(&fscache_n_retrievals_nobufs);
47197 else
47198 - fscache_stat(&fscache_n_retrievals_ok);
47199 + fscache_stat_unchecked(&fscache_n_retrievals_ok);
47200
47201 fscache_put_retrieval(op);
47202 _leave(" = %d", ret);
47203 @@ -429,7 +429,7 @@ nobufs_unlock:
47204 spin_unlock(&cookie->lock);
47205 kfree(op);
47206 nobufs:
47207 - fscache_stat(&fscache_n_retrievals_nobufs);
47208 + fscache_stat_unchecked(&fscache_n_retrievals_nobufs);
47209 _leave(" = -ENOBUFS");
47210 return -ENOBUFS;
47211 }
47212 @@ -467,7 +467,7 @@ int __fscache_read_or_alloc_pages(struct fscache_cookie *cookie,
47213
47214 _enter("%p,,%d,,,", cookie, *nr_pages);
47215
47216 - fscache_stat(&fscache_n_retrievals);
47217 + fscache_stat_unchecked(&fscache_n_retrievals);
47218
47219 if (hlist_empty(&cookie->backing_objects))
47220 goto nobufs;
47221 @@ -497,7 +497,7 @@ int __fscache_read_or_alloc_pages(struct fscache_cookie *cookie,
47222 goto nobufs_unlock;
47223 spin_unlock(&cookie->lock);
47224
47225 - fscache_stat(&fscache_n_retrieval_ops);
47226 + fscache_stat_unchecked(&fscache_n_retrieval_ops);
47227
47228 /* pin the netfs read context in case we need to do the actual netfs
47229 * read because we've encountered a cache read failure */
47230 @@ -527,15 +527,15 @@ int __fscache_read_or_alloc_pages(struct fscache_cookie *cookie,
47231
47232 error:
47233 if (ret == -ENOMEM)
47234 - fscache_stat(&fscache_n_retrievals_nomem);
47235 + fscache_stat_unchecked(&fscache_n_retrievals_nomem);
47236 else if (ret == -ERESTARTSYS)
47237 - fscache_stat(&fscache_n_retrievals_intr);
47238 + fscache_stat_unchecked(&fscache_n_retrievals_intr);
47239 else if (ret == -ENODATA)
47240 - fscache_stat(&fscache_n_retrievals_nodata);
47241 + fscache_stat_unchecked(&fscache_n_retrievals_nodata);
47242 else if (ret < 0)
47243 - fscache_stat(&fscache_n_retrievals_nobufs);
47244 + fscache_stat_unchecked(&fscache_n_retrievals_nobufs);
47245 else
47246 - fscache_stat(&fscache_n_retrievals_ok);
47247 + fscache_stat_unchecked(&fscache_n_retrievals_ok);
47248
47249 fscache_put_retrieval(op);
47250 _leave(" = %d", ret);
47251 @@ -545,7 +545,7 @@ nobufs_unlock:
47252 spin_unlock(&cookie->lock);
47253 kfree(op);
47254 nobufs:
47255 - fscache_stat(&fscache_n_retrievals_nobufs);
47256 + fscache_stat_unchecked(&fscache_n_retrievals_nobufs);
47257 _leave(" = -ENOBUFS");
47258 return -ENOBUFS;
47259 }
47260 @@ -569,7 +569,7 @@ int __fscache_alloc_page(struct fscache_cookie *cookie,
47261
47262 _enter("%p,%p,,,", cookie, page);
47263
47264 - fscache_stat(&fscache_n_allocs);
47265 + fscache_stat_unchecked(&fscache_n_allocs);
47266
47267 if (hlist_empty(&cookie->backing_objects))
47268 goto nobufs;
47269 @@ -595,7 +595,7 @@ int __fscache_alloc_page(struct fscache_cookie *cookie,
47270 goto nobufs_unlock;
47271 spin_unlock(&cookie->lock);
47272
47273 - fscache_stat(&fscache_n_alloc_ops);
47274 + fscache_stat_unchecked(&fscache_n_alloc_ops);
47275
47276 ret = fscache_wait_for_retrieval_activation(
47277 object, op,
47278 @@ -611,11 +611,11 @@ int __fscache_alloc_page(struct fscache_cookie *cookie,
47279
47280 error:
47281 if (ret == -ERESTARTSYS)
47282 - fscache_stat(&fscache_n_allocs_intr);
47283 + fscache_stat_unchecked(&fscache_n_allocs_intr);
47284 else if (ret < 0)
47285 - fscache_stat(&fscache_n_allocs_nobufs);
47286 + fscache_stat_unchecked(&fscache_n_allocs_nobufs);
47287 else
47288 - fscache_stat(&fscache_n_allocs_ok);
47289 + fscache_stat_unchecked(&fscache_n_allocs_ok);
47290
47291 fscache_put_retrieval(op);
47292 _leave(" = %d", ret);
47293 @@ -625,7 +625,7 @@ nobufs_unlock:
47294 spin_unlock(&cookie->lock);
47295 kfree(op);
47296 nobufs:
47297 - fscache_stat(&fscache_n_allocs_nobufs);
47298 + fscache_stat_unchecked(&fscache_n_allocs_nobufs);
47299 _leave(" = -ENOBUFS");
47300 return -ENOBUFS;
47301 }
47302 @@ -666,7 +666,7 @@ static void fscache_write_op(struct fscache_operation *_op)
47303
47304 spin_lock(&cookie->stores_lock);
47305
47306 - fscache_stat(&fscache_n_store_calls);
47307 + fscache_stat_unchecked(&fscache_n_store_calls);
47308
47309 /* find a page to store */
47310 page = NULL;
47311 @@ -677,7 +677,7 @@ static void fscache_write_op(struct fscache_operation *_op)
47312 page = results[0];
47313 _debug("gang %d [%lx]", n, page->index);
47314 if (page->index > op->store_limit) {
47315 - fscache_stat(&fscache_n_store_pages_over_limit);
47316 + fscache_stat_unchecked(&fscache_n_store_pages_over_limit);
47317 goto superseded;
47318 }
47319
47320 @@ -689,7 +689,7 @@ static void fscache_write_op(struct fscache_operation *_op)
47321 spin_unlock(&cookie->stores_lock);
47322 spin_unlock(&object->lock);
47323
47324 - fscache_stat(&fscache_n_store_pages);
47325 + fscache_stat_unchecked(&fscache_n_store_pages);
47326 fscache_stat(&fscache_n_cop_write_page);
47327 ret = object->cache->ops->write_page(op, page);
47328 fscache_stat_d(&fscache_n_cop_write_page);
47329 @@ -757,7 +757,7 @@ int __fscache_write_page(struct fscache_cookie *cookie,
47330 ASSERTCMP(cookie->def->type, !=, FSCACHE_COOKIE_TYPE_INDEX);
47331 ASSERT(PageFsCache(page));
47332
47333 - fscache_stat(&fscache_n_stores);
47334 + fscache_stat_unchecked(&fscache_n_stores);
47335
47336 op = kzalloc(sizeof(*op), GFP_NOIO);
47337 if (!op)
47338 @@ -808,7 +808,7 @@ int __fscache_write_page(struct fscache_cookie *cookie,
47339 spin_unlock(&cookie->stores_lock);
47340 spin_unlock(&object->lock);
47341
47342 - op->op.debug_id = atomic_inc_return(&fscache_op_debug_id);
47343 + op->op.debug_id = atomic_inc_return_unchecked(&fscache_op_debug_id);
47344 op->store_limit = object->store_limit;
47345
47346 if (fscache_submit_op(object, &op->op) < 0)
47347 @@ -816,8 +816,8 @@ int __fscache_write_page(struct fscache_cookie *cookie,
47348
47349 spin_unlock(&cookie->lock);
47350 radix_tree_preload_end();
47351 - fscache_stat(&fscache_n_store_ops);
47352 - fscache_stat(&fscache_n_stores_ok);
47353 + fscache_stat_unchecked(&fscache_n_store_ops);
47354 + fscache_stat_unchecked(&fscache_n_stores_ok);
47355
47356 /* the work queue now carries its own ref on the object */
47357 fscache_put_operation(&op->op);
47358 @@ -825,14 +825,14 @@ int __fscache_write_page(struct fscache_cookie *cookie,
47359 return 0;
47360
47361 already_queued:
47362 - fscache_stat(&fscache_n_stores_again);
47363 + fscache_stat_unchecked(&fscache_n_stores_again);
47364 already_pending:
47365 spin_unlock(&cookie->stores_lock);
47366 spin_unlock(&object->lock);
47367 spin_unlock(&cookie->lock);
47368 radix_tree_preload_end();
47369 kfree(op);
47370 - fscache_stat(&fscache_n_stores_ok);
47371 + fscache_stat_unchecked(&fscache_n_stores_ok);
47372 _leave(" = 0");
47373 return 0;
47374
47375 @@ -851,14 +851,14 @@ nobufs:
47376 spin_unlock(&cookie->lock);
47377 radix_tree_preload_end();
47378 kfree(op);
47379 - fscache_stat(&fscache_n_stores_nobufs);
47380 + fscache_stat_unchecked(&fscache_n_stores_nobufs);
47381 _leave(" = -ENOBUFS");
47382 return -ENOBUFS;
47383
47384 nomem_free:
47385 kfree(op);
47386 nomem:
47387 - fscache_stat(&fscache_n_stores_oom);
47388 + fscache_stat_unchecked(&fscache_n_stores_oom);
47389 _leave(" = -ENOMEM");
47390 return -ENOMEM;
47391 }
47392 @@ -876,7 +876,7 @@ void __fscache_uncache_page(struct fscache_cookie *cookie, struct page *page)
47393 ASSERTCMP(cookie->def->type, !=, FSCACHE_COOKIE_TYPE_INDEX);
47394 ASSERTCMP(page, !=, NULL);
47395
47396 - fscache_stat(&fscache_n_uncaches);
47397 + fscache_stat_unchecked(&fscache_n_uncaches);
47398
47399 /* cache withdrawal may beat us to it */
47400 if (!PageFsCache(page))
47401 @@ -929,7 +929,7 @@ void fscache_mark_pages_cached(struct fscache_retrieval *op,
47402 unsigned long loop;
47403
47404 #ifdef CONFIG_FSCACHE_STATS
47405 - atomic_add(pagevec->nr, &fscache_n_marks);
47406 + atomic_add_unchecked(pagevec->nr, &fscache_n_marks);
47407 #endif
47408
47409 for (loop = 0; loop < pagevec->nr; loop++) {
47410 diff --git a/fs/fscache/stats.c b/fs/fscache/stats.c
47411 index 4765190..2a067f2 100644
47412 --- a/fs/fscache/stats.c
47413 +++ b/fs/fscache/stats.c
47414 @@ -18,95 +18,95 @@
47415 /*
47416 * operation counters
47417 */
47418 -atomic_t fscache_n_op_pend;
47419 -atomic_t fscache_n_op_run;
47420 -atomic_t fscache_n_op_enqueue;
47421 -atomic_t fscache_n_op_requeue;
47422 -atomic_t fscache_n_op_deferred_release;
47423 -atomic_t fscache_n_op_release;
47424 -atomic_t fscache_n_op_gc;
47425 -atomic_t fscache_n_op_cancelled;
47426 -atomic_t fscache_n_op_rejected;
47427 +atomic_unchecked_t fscache_n_op_pend;
47428 +atomic_unchecked_t fscache_n_op_run;
47429 +atomic_unchecked_t fscache_n_op_enqueue;
47430 +atomic_unchecked_t fscache_n_op_requeue;
47431 +atomic_unchecked_t fscache_n_op_deferred_release;
47432 +atomic_unchecked_t fscache_n_op_release;
47433 +atomic_unchecked_t fscache_n_op_gc;
47434 +atomic_unchecked_t fscache_n_op_cancelled;
47435 +atomic_unchecked_t fscache_n_op_rejected;
47436
47437 -atomic_t fscache_n_attr_changed;
47438 -atomic_t fscache_n_attr_changed_ok;
47439 -atomic_t fscache_n_attr_changed_nobufs;
47440 -atomic_t fscache_n_attr_changed_nomem;
47441 -atomic_t fscache_n_attr_changed_calls;
47442 +atomic_unchecked_t fscache_n_attr_changed;
47443 +atomic_unchecked_t fscache_n_attr_changed_ok;
47444 +atomic_unchecked_t fscache_n_attr_changed_nobufs;
47445 +atomic_unchecked_t fscache_n_attr_changed_nomem;
47446 +atomic_unchecked_t fscache_n_attr_changed_calls;
47447
47448 -atomic_t fscache_n_allocs;
47449 -atomic_t fscache_n_allocs_ok;
47450 -atomic_t fscache_n_allocs_wait;
47451 -atomic_t fscache_n_allocs_nobufs;
47452 -atomic_t fscache_n_allocs_intr;
47453 -atomic_t fscache_n_allocs_object_dead;
47454 -atomic_t fscache_n_alloc_ops;
47455 -atomic_t fscache_n_alloc_op_waits;
47456 +atomic_unchecked_t fscache_n_allocs;
47457 +atomic_unchecked_t fscache_n_allocs_ok;
47458 +atomic_unchecked_t fscache_n_allocs_wait;
47459 +atomic_unchecked_t fscache_n_allocs_nobufs;
47460 +atomic_unchecked_t fscache_n_allocs_intr;
47461 +atomic_unchecked_t fscache_n_allocs_object_dead;
47462 +atomic_unchecked_t fscache_n_alloc_ops;
47463 +atomic_unchecked_t fscache_n_alloc_op_waits;
47464
47465 -atomic_t fscache_n_retrievals;
47466 -atomic_t fscache_n_retrievals_ok;
47467 -atomic_t fscache_n_retrievals_wait;
47468 -atomic_t fscache_n_retrievals_nodata;
47469 -atomic_t fscache_n_retrievals_nobufs;
47470 -atomic_t fscache_n_retrievals_intr;
47471 -atomic_t fscache_n_retrievals_nomem;
47472 -atomic_t fscache_n_retrievals_object_dead;
47473 -atomic_t fscache_n_retrieval_ops;
47474 -atomic_t fscache_n_retrieval_op_waits;
47475 +atomic_unchecked_t fscache_n_retrievals;
47476 +atomic_unchecked_t fscache_n_retrievals_ok;
47477 +atomic_unchecked_t fscache_n_retrievals_wait;
47478 +atomic_unchecked_t fscache_n_retrievals_nodata;
47479 +atomic_unchecked_t fscache_n_retrievals_nobufs;
47480 +atomic_unchecked_t fscache_n_retrievals_intr;
47481 +atomic_unchecked_t fscache_n_retrievals_nomem;
47482 +atomic_unchecked_t fscache_n_retrievals_object_dead;
47483 +atomic_unchecked_t fscache_n_retrieval_ops;
47484 +atomic_unchecked_t fscache_n_retrieval_op_waits;
47485
47486 -atomic_t fscache_n_stores;
47487 -atomic_t fscache_n_stores_ok;
47488 -atomic_t fscache_n_stores_again;
47489 -atomic_t fscache_n_stores_nobufs;
47490 -atomic_t fscache_n_stores_oom;
47491 -atomic_t fscache_n_store_ops;
47492 -atomic_t fscache_n_store_calls;
47493 -atomic_t fscache_n_store_pages;
47494 -atomic_t fscache_n_store_radix_deletes;
47495 -atomic_t fscache_n_store_pages_over_limit;
47496 +atomic_unchecked_t fscache_n_stores;
47497 +atomic_unchecked_t fscache_n_stores_ok;
47498 +atomic_unchecked_t fscache_n_stores_again;
47499 +atomic_unchecked_t fscache_n_stores_nobufs;
47500 +atomic_unchecked_t fscache_n_stores_oom;
47501 +atomic_unchecked_t fscache_n_store_ops;
47502 +atomic_unchecked_t fscache_n_store_calls;
47503 +atomic_unchecked_t fscache_n_store_pages;
47504 +atomic_unchecked_t fscache_n_store_radix_deletes;
47505 +atomic_unchecked_t fscache_n_store_pages_over_limit;
47506
47507 -atomic_t fscache_n_store_vmscan_not_storing;
47508 -atomic_t fscache_n_store_vmscan_gone;
47509 -atomic_t fscache_n_store_vmscan_busy;
47510 -atomic_t fscache_n_store_vmscan_cancelled;
47511 +atomic_unchecked_t fscache_n_store_vmscan_not_storing;
47512 +atomic_unchecked_t fscache_n_store_vmscan_gone;
47513 +atomic_unchecked_t fscache_n_store_vmscan_busy;
47514 +atomic_unchecked_t fscache_n_store_vmscan_cancelled;
47515
47516 -atomic_t fscache_n_marks;
47517 -atomic_t fscache_n_uncaches;
47518 +atomic_unchecked_t fscache_n_marks;
47519 +atomic_unchecked_t fscache_n_uncaches;
47520
47521 -atomic_t fscache_n_acquires;
47522 -atomic_t fscache_n_acquires_null;
47523 -atomic_t fscache_n_acquires_no_cache;
47524 -atomic_t fscache_n_acquires_ok;
47525 -atomic_t fscache_n_acquires_nobufs;
47526 -atomic_t fscache_n_acquires_oom;
47527 +atomic_unchecked_t fscache_n_acquires;
47528 +atomic_unchecked_t fscache_n_acquires_null;
47529 +atomic_unchecked_t fscache_n_acquires_no_cache;
47530 +atomic_unchecked_t fscache_n_acquires_ok;
47531 +atomic_unchecked_t fscache_n_acquires_nobufs;
47532 +atomic_unchecked_t fscache_n_acquires_oom;
47533
47534 -atomic_t fscache_n_updates;
47535 -atomic_t fscache_n_updates_null;
47536 -atomic_t fscache_n_updates_run;
47537 +atomic_unchecked_t fscache_n_updates;
47538 +atomic_unchecked_t fscache_n_updates_null;
47539 +atomic_unchecked_t fscache_n_updates_run;
47540
47541 -atomic_t fscache_n_relinquishes;
47542 -atomic_t fscache_n_relinquishes_null;
47543 -atomic_t fscache_n_relinquishes_waitcrt;
47544 -atomic_t fscache_n_relinquishes_retire;
47545 +atomic_unchecked_t fscache_n_relinquishes;
47546 +atomic_unchecked_t fscache_n_relinquishes_null;
47547 +atomic_unchecked_t fscache_n_relinquishes_waitcrt;
47548 +atomic_unchecked_t fscache_n_relinquishes_retire;
47549
47550 -atomic_t fscache_n_cookie_index;
47551 -atomic_t fscache_n_cookie_data;
47552 -atomic_t fscache_n_cookie_special;
47553 +atomic_unchecked_t fscache_n_cookie_index;
47554 +atomic_unchecked_t fscache_n_cookie_data;
47555 +atomic_unchecked_t fscache_n_cookie_special;
47556
47557 -atomic_t fscache_n_object_alloc;
47558 -atomic_t fscache_n_object_no_alloc;
47559 -atomic_t fscache_n_object_lookups;
47560 -atomic_t fscache_n_object_lookups_negative;
47561 -atomic_t fscache_n_object_lookups_positive;
47562 -atomic_t fscache_n_object_lookups_timed_out;
47563 -atomic_t fscache_n_object_created;
47564 -atomic_t fscache_n_object_avail;
47565 -atomic_t fscache_n_object_dead;
47566 +atomic_unchecked_t fscache_n_object_alloc;
47567 +atomic_unchecked_t fscache_n_object_no_alloc;
47568 +atomic_unchecked_t fscache_n_object_lookups;
47569 +atomic_unchecked_t fscache_n_object_lookups_negative;
47570 +atomic_unchecked_t fscache_n_object_lookups_positive;
47571 +atomic_unchecked_t fscache_n_object_lookups_timed_out;
47572 +atomic_unchecked_t fscache_n_object_created;
47573 +atomic_unchecked_t fscache_n_object_avail;
47574 +atomic_unchecked_t fscache_n_object_dead;
47575
47576 -atomic_t fscache_n_checkaux_none;
47577 -atomic_t fscache_n_checkaux_okay;
47578 -atomic_t fscache_n_checkaux_update;
47579 -atomic_t fscache_n_checkaux_obsolete;
47580 +atomic_unchecked_t fscache_n_checkaux_none;
47581 +atomic_unchecked_t fscache_n_checkaux_okay;
47582 +atomic_unchecked_t fscache_n_checkaux_update;
47583 +atomic_unchecked_t fscache_n_checkaux_obsolete;
47584
47585 atomic_t fscache_n_cop_alloc_object;
47586 atomic_t fscache_n_cop_lookup_object;
47587 @@ -133,113 +133,113 @@ static int fscache_stats_show(struct seq_file *m, void *v)
47588 seq_puts(m, "FS-Cache statistics\n");
47589
47590 seq_printf(m, "Cookies: idx=%u dat=%u spc=%u\n",
47591 - atomic_read(&fscache_n_cookie_index),
47592 - atomic_read(&fscache_n_cookie_data),
47593 - atomic_read(&fscache_n_cookie_special));
47594 + atomic_read_unchecked(&fscache_n_cookie_index),
47595 + atomic_read_unchecked(&fscache_n_cookie_data),
47596 + atomic_read_unchecked(&fscache_n_cookie_special));
47597
47598 seq_printf(m, "Objects: alc=%u nal=%u avl=%u ded=%u\n",
47599 - atomic_read(&fscache_n_object_alloc),
47600 - atomic_read(&fscache_n_object_no_alloc),
47601 - atomic_read(&fscache_n_object_avail),
47602 - atomic_read(&fscache_n_object_dead));
47603 + atomic_read_unchecked(&fscache_n_object_alloc),
47604 + atomic_read_unchecked(&fscache_n_object_no_alloc),
47605 + atomic_read_unchecked(&fscache_n_object_avail),
47606 + atomic_read_unchecked(&fscache_n_object_dead));
47607 seq_printf(m, "ChkAux : non=%u ok=%u upd=%u obs=%u\n",
47608 - atomic_read(&fscache_n_checkaux_none),
47609 - atomic_read(&fscache_n_checkaux_okay),
47610 - atomic_read(&fscache_n_checkaux_update),
47611 - atomic_read(&fscache_n_checkaux_obsolete));
47612 + atomic_read_unchecked(&fscache_n_checkaux_none),
47613 + atomic_read_unchecked(&fscache_n_checkaux_okay),
47614 + atomic_read_unchecked(&fscache_n_checkaux_update),
47615 + atomic_read_unchecked(&fscache_n_checkaux_obsolete));
47616
47617 seq_printf(m, "Pages : mrk=%u unc=%u\n",
47618 - atomic_read(&fscache_n_marks),
47619 - atomic_read(&fscache_n_uncaches));
47620 + atomic_read_unchecked(&fscache_n_marks),
47621 + atomic_read_unchecked(&fscache_n_uncaches));
47622
47623 seq_printf(m, "Acquire: n=%u nul=%u noc=%u ok=%u nbf=%u"
47624 " oom=%u\n",
47625 - atomic_read(&fscache_n_acquires),
47626 - atomic_read(&fscache_n_acquires_null),
47627 - atomic_read(&fscache_n_acquires_no_cache),
47628 - atomic_read(&fscache_n_acquires_ok),
47629 - atomic_read(&fscache_n_acquires_nobufs),
47630 - atomic_read(&fscache_n_acquires_oom));
47631 + atomic_read_unchecked(&fscache_n_acquires),
47632 + atomic_read_unchecked(&fscache_n_acquires_null),
47633 + atomic_read_unchecked(&fscache_n_acquires_no_cache),
47634 + atomic_read_unchecked(&fscache_n_acquires_ok),
47635 + atomic_read_unchecked(&fscache_n_acquires_nobufs),
47636 + atomic_read_unchecked(&fscache_n_acquires_oom));
47637
47638 seq_printf(m, "Lookups: n=%u neg=%u pos=%u crt=%u tmo=%u\n",
47639 - atomic_read(&fscache_n_object_lookups),
47640 - atomic_read(&fscache_n_object_lookups_negative),
47641 - atomic_read(&fscache_n_object_lookups_positive),
47642 - atomic_read(&fscache_n_object_created),
47643 - atomic_read(&fscache_n_object_lookups_timed_out));
47644 + atomic_read_unchecked(&fscache_n_object_lookups),
47645 + atomic_read_unchecked(&fscache_n_object_lookups_negative),
47646 + atomic_read_unchecked(&fscache_n_object_lookups_positive),
47647 + atomic_read_unchecked(&fscache_n_object_created),
47648 + atomic_read_unchecked(&fscache_n_object_lookups_timed_out));
47649
47650 seq_printf(m, "Updates: n=%u nul=%u run=%u\n",
47651 - atomic_read(&fscache_n_updates),
47652 - atomic_read(&fscache_n_updates_null),
47653 - atomic_read(&fscache_n_updates_run));
47654 + atomic_read_unchecked(&fscache_n_updates),
47655 + atomic_read_unchecked(&fscache_n_updates_null),
47656 + atomic_read_unchecked(&fscache_n_updates_run));
47657
47658 seq_printf(m, "Relinqs: n=%u nul=%u wcr=%u rtr=%u\n",
47659 - atomic_read(&fscache_n_relinquishes),
47660 - atomic_read(&fscache_n_relinquishes_null),
47661 - atomic_read(&fscache_n_relinquishes_waitcrt),
47662 - atomic_read(&fscache_n_relinquishes_retire));
47663 + atomic_read_unchecked(&fscache_n_relinquishes),
47664 + atomic_read_unchecked(&fscache_n_relinquishes_null),
47665 + atomic_read_unchecked(&fscache_n_relinquishes_waitcrt),
47666 + atomic_read_unchecked(&fscache_n_relinquishes_retire));
47667
47668 seq_printf(m, "AttrChg: n=%u ok=%u nbf=%u oom=%u run=%u\n",
47669 - atomic_read(&fscache_n_attr_changed),
47670 - atomic_read(&fscache_n_attr_changed_ok),
47671 - atomic_read(&fscache_n_attr_changed_nobufs),
47672 - atomic_read(&fscache_n_attr_changed_nomem),
47673 - atomic_read(&fscache_n_attr_changed_calls));
47674 + atomic_read_unchecked(&fscache_n_attr_changed),
47675 + atomic_read_unchecked(&fscache_n_attr_changed_ok),
47676 + atomic_read_unchecked(&fscache_n_attr_changed_nobufs),
47677 + atomic_read_unchecked(&fscache_n_attr_changed_nomem),
47678 + atomic_read_unchecked(&fscache_n_attr_changed_calls));
47679
47680 seq_printf(m, "Allocs : n=%u ok=%u wt=%u nbf=%u int=%u\n",
47681 - atomic_read(&fscache_n_allocs),
47682 - atomic_read(&fscache_n_allocs_ok),
47683 - atomic_read(&fscache_n_allocs_wait),
47684 - atomic_read(&fscache_n_allocs_nobufs),
47685 - atomic_read(&fscache_n_allocs_intr));
47686 + atomic_read_unchecked(&fscache_n_allocs),
47687 + atomic_read_unchecked(&fscache_n_allocs_ok),
47688 + atomic_read_unchecked(&fscache_n_allocs_wait),
47689 + atomic_read_unchecked(&fscache_n_allocs_nobufs),
47690 + atomic_read_unchecked(&fscache_n_allocs_intr));
47691 seq_printf(m, "Allocs : ops=%u owt=%u abt=%u\n",
47692 - atomic_read(&fscache_n_alloc_ops),
47693 - atomic_read(&fscache_n_alloc_op_waits),
47694 - atomic_read(&fscache_n_allocs_object_dead));
47695 + atomic_read_unchecked(&fscache_n_alloc_ops),
47696 + atomic_read_unchecked(&fscache_n_alloc_op_waits),
47697 + atomic_read_unchecked(&fscache_n_allocs_object_dead));
47698
47699 seq_printf(m, "Retrvls: n=%u ok=%u wt=%u nod=%u nbf=%u"
47700 " int=%u oom=%u\n",
47701 - atomic_read(&fscache_n_retrievals),
47702 - atomic_read(&fscache_n_retrievals_ok),
47703 - atomic_read(&fscache_n_retrievals_wait),
47704 - atomic_read(&fscache_n_retrievals_nodata),
47705 - atomic_read(&fscache_n_retrievals_nobufs),
47706 - atomic_read(&fscache_n_retrievals_intr),
47707 - atomic_read(&fscache_n_retrievals_nomem));
47708 + atomic_read_unchecked(&fscache_n_retrievals),
47709 + atomic_read_unchecked(&fscache_n_retrievals_ok),
47710 + atomic_read_unchecked(&fscache_n_retrievals_wait),
47711 + atomic_read_unchecked(&fscache_n_retrievals_nodata),
47712 + atomic_read_unchecked(&fscache_n_retrievals_nobufs),
47713 + atomic_read_unchecked(&fscache_n_retrievals_intr),
47714 + atomic_read_unchecked(&fscache_n_retrievals_nomem));
47715 seq_printf(m, "Retrvls: ops=%u owt=%u abt=%u\n",
47716 - atomic_read(&fscache_n_retrieval_ops),
47717 - atomic_read(&fscache_n_retrieval_op_waits),
47718 - atomic_read(&fscache_n_retrievals_object_dead));
47719 + atomic_read_unchecked(&fscache_n_retrieval_ops),
47720 + atomic_read_unchecked(&fscache_n_retrieval_op_waits),
47721 + atomic_read_unchecked(&fscache_n_retrievals_object_dead));
47722
47723 seq_printf(m, "Stores : n=%u ok=%u agn=%u nbf=%u oom=%u\n",
47724 - atomic_read(&fscache_n_stores),
47725 - atomic_read(&fscache_n_stores_ok),
47726 - atomic_read(&fscache_n_stores_again),
47727 - atomic_read(&fscache_n_stores_nobufs),
47728 - atomic_read(&fscache_n_stores_oom));
47729 + atomic_read_unchecked(&fscache_n_stores),
47730 + atomic_read_unchecked(&fscache_n_stores_ok),
47731 + atomic_read_unchecked(&fscache_n_stores_again),
47732 + atomic_read_unchecked(&fscache_n_stores_nobufs),
47733 + atomic_read_unchecked(&fscache_n_stores_oom));
47734 seq_printf(m, "Stores : ops=%u run=%u pgs=%u rxd=%u olm=%u\n",
47735 - atomic_read(&fscache_n_store_ops),
47736 - atomic_read(&fscache_n_store_calls),
47737 - atomic_read(&fscache_n_store_pages),
47738 - atomic_read(&fscache_n_store_radix_deletes),
47739 - atomic_read(&fscache_n_store_pages_over_limit));
47740 + atomic_read_unchecked(&fscache_n_store_ops),
47741 + atomic_read_unchecked(&fscache_n_store_calls),
47742 + atomic_read_unchecked(&fscache_n_store_pages),
47743 + atomic_read_unchecked(&fscache_n_store_radix_deletes),
47744 + atomic_read_unchecked(&fscache_n_store_pages_over_limit));
47745
47746 seq_printf(m, "VmScan : nos=%u gon=%u bsy=%u can=%u\n",
47747 - atomic_read(&fscache_n_store_vmscan_not_storing),
47748 - atomic_read(&fscache_n_store_vmscan_gone),
47749 - atomic_read(&fscache_n_store_vmscan_busy),
47750 - atomic_read(&fscache_n_store_vmscan_cancelled));
47751 + atomic_read_unchecked(&fscache_n_store_vmscan_not_storing),
47752 + atomic_read_unchecked(&fscache_n_store_vmscan_gone),
47753 + atomic_read_unchecked(&fscache_n_store_vmscan_busy),
47754 + atomic_read_unchecked(&fscache_n_store_vmscan_cancelled));
47755
47756 seq_printf(m, "Ops : pend=%u run=%u enq=%u can=%u rej=%u\n",
47757 - atomic_read(&fscache_n_op_pend),
47758 - atomic_read(&fscache_n_op_run),
47759 - atomic_read(&fscache_n_op_enqueue),
47760 - atomic_read(&fscache_n_op_cancelled),
47761 - atomic_read(&fscache_n_op_rejected));
47762 + atomic_read_unchecked(&fscache_n_op_pend),
47763 + atomic_read_unchecked(&fscache_n_op_run),
47764 + atomic_read_unchecked(&fscache_n_op_enqueue),
47765 + atomic_read_unchecked(&fscache_n_op_cancelled),
47766 + atomic_read_unchecked(&fscache_n_op_rejected));
47767 seq_printf(m, "Ops : dfr=%u rel=%u gc=%u\n",
47768 - atomic_read(&fscache_n_op_deferred_release),
47769 - atomic_read(&fscache_n_op_release),
47770 - atomic_read(&fscache_n_op_gc));
47771 + atomic_read_unchecked(&fscache_n_op_deferred_release),
47772 + atomic_read_unchecked(&fscache_n_op_release),
47773 + atomic_read_unchecked(&fscache_n_op_gc));
47774
47775 seq_printf(m, "CacheOp: alo=%d luo=%d luc=%d gro=%d\n",
47776 atomic_read(&fscache_n_cop_alloc_object),
47777 diff --git a/fs/fuse/cuse.c b/fs/fuse/cuse.c
47778 index ee8d550..7189d8c 100644
47779 --- a/fs/fuse/cuse.c
47780 +++ b/fs/fuse/cuse.c
47781 @@ -585,10 +585,12 @@ static int __init cuse_init(void)
47782 INIT_LIST_HEAD(&cuse_conntbl[i]);
47783
47784 /* inherit and extend fuse_dev_operations */
47785 - cuse_channel_fops = fuse_dev_operations;
47786 - cuse_channel_fops.owner = THIS_MODULE;
47787 - cuse_channel_fops.open = cuse_channel_open;
47788 - cuse_channel_fops.release = cuse_channel_release;
47789 + pax_open_kernel();
47790 + memcpy((void *)&cuse_channel_fops, &fuse_dev_operations, sizeof(fuse_dev_operations));
47791 + *(void **)&cuse_channel_fops.owner = THIS_MODULE;
47792 + *(void **)&cuse_channel_fops.open = cuse_channel_open;
47793 + *(void **)&cuse_channel_fops.release = cuse_channel_release;
47794 + pax_close_kernel();
47795
47796 cuse_class = class_create(THIS_MODULE, "cuse");
47797 if (IS_ERR(cuse_class))
47798 diff --git a/fs/fuse/dev.c b/fs/fuse/dev.c
47799 index f4246cf..b4aed1d 100644
47800 --- a/fs/fuse/dev.c
47801 +++ b/fs/fuse/dev.c
47802 @@ -1242,7 +1242,7 @@ static ssize_t fuse_dev_splice_read(struct file *in, loff_t *ppos,
47803 ret = 0;
47804 pipe_lock(pipe);
47805
47806 - if (!pipe->readers) {
47807 + if (!atomic_read(&pipe->readers)) {
47808 send_sig(SIGPIPE, current, 0);
47809 if (!ret)
47810 ret = -EPIPE;
47811 diff --git a/fs/fuse/dir.c b/fs/fuse/dir.c
47812 index 324bc08..4fdd56e 100644
47813 --- a/fs/fuse/dir.c
47814 +++ b/fs/fuse/dir.c
47815 @@ -1226,7 +1226,7 @@ static char *read_link(struct dentry *dentry)
47816 return link;
47817 }
47818
47819 -static void free_link(char *link)
47820 +static void free_link(const char *link)
47821 {
47822 if (!IS_ERR(link))
47823 free_page((unsigned long) link);
47824 diff --git a/fs/gfs2/inode.c b/fs/gfs2/inode.c
47825 index 753af3d..f7b021a 100644
47826 --- a/fs/gfs2/inode.c
47827 +++ b/fs/gfs2/inode.c
47828 @@ -1498,7 +1498,7 @@ out:
47829
47830 static void gfs2_put_link(struct dentry *dentry, struct nameidata *nd, void *p)
47831 {
47832 - char *s = nd_get_link(nd);
47833 + const char *s = nd_get_link(nd);
47834 if (!IS_ERR(s))
47835 kfree(s);
47836 }
47837 diff --git a/fs/gfs2/quota.c b/fs/gfs2/quota.c
47838 index a3bde91..2524579 100644
47839 --- a/fs/gfs2/quota.c
47840 +++ b/fs/gfs2/quota.c
47841 @@ -497,8 +497,11 @@ int gfs2_quota_hold(struct gfs2_inode *ip, u32 uid, u32 gid)
47842 struct gfs2_quota_data **qd;
47843 int error;
47844
47845 - if (ip->i_res == NULL)
47846 - gfs2_rs_alloc(ip);
47847 + if (ip->i_res == NULL) {
47848 + error = gfs2_rs_alloc(ip);
47849 + if (error)
47850 + return error;
47851 + }
47852
47853 qd = ip->i_res->rs_qa_qd;
47854
47855 diff --git a/fs/gfs2/rgrp.c b/fs/gfs2/rgrp.c
47856 index c9ed814..4a45d5f 100644
47857 --- a/fs/gfs2/rgrp.c
47858 +++ b/fs/gfs2/rgrp.c
47859 @@ -477,7 +477,6 @@ void gfs2_free_clones(struct gfs2_rgrpd *rgd)
47860 */
47861 int gfs2_rs_alloc(struct gfs2_inode *ip)
47862 {
47863 - int error = 0;
47864 struct gfs2_blkreserv *res;
47865
47866 if (ip->i_res)
47867 @@ -485,7 +484,7 @@ int gfs2_rs_alloc(struct gfs2_inode *ip)
47868
47869 res = kmem_cache_zalloc(gfs2_rsrv_cachep, GFP_NOFS);
47870 if (!res)
47871 - error = -ENOMEM;
47872 + return -ENOMEM;
47873
47874 down_write(&ip->i_rw_mutex);
47875 if (ip->i_res)
47876 @@ -493,7 +492,7 @@ int gfs2_rs_alloc(struct gfs2_inode *ip)
47877 else
47878 ip->i_res = res;
47879 up_write(&ip->i_rw_mutex);
47880 - return error;
47881 + return 0;
47882 }
47883
47884 static void dump_rs(struct seq_file *seq, struct gfs2_blkreserv *rs)
47885 diff --git a/fs/hugetlbfs/inode.c b/fs/hugetlbfs/inode.c
47886 index 8349a89..51a0254 100644
47887 --- a/fs/hugetlbfs/inode.c
47888 +++ b/fs/hugetlbfs/inode.c
47889 @@ -920,7 +920,7 @@ static struct file_system_type hugetlbfs_fs_type = {
47890 .kill_sb = kill_litter_super,
47891 };
47892
47893 -static struct vfsmount *hugetlbfs_vfsmount;
47894 +struct vfsmount *hugetlbfs_vfsmount;
47895
47896 static int can_do_hugetlb_shm(void)
47897 {
47898 diff --git a/fs/inode.c b/fs/inode.c
47899 index ac8d904..9f45d40 100644
47900 --- a/fs/inode.c
47901 +++ b/fs/inode.c
47902 @@ -867,8 +867,8 @@ unsigned int get_next_ino(void)
47903
47904 #ifdef CONFIG_SMP
47905 if (unlikely((res & (LAST_INO_BATCH-1)) == 0)) {
47906 - static atomic_t shared_last_ino;
47907 - int next = atomic_add_return(LAST_INO_BATCH, &shared_last_ino);
47908 + static atomic_unchecked_t shared_last_ino;
47909 + int next = atomic_add_return_unchecked(LAST_INO_BATCH, &shared_last_ino);
47910
47911 res = next - LAST_INO_BATCH;
47912 }
47913 diff --git a/fs/jffs2/erase.c b/fs/jffs2/erase.c
47914 index 4a6cf28..d3a29d3 100644
47915 --- a/fs/jffs2/erase.c
47916 +++ b/fs/jffs2/erase.c
47917 @@ -452,7 +452,8 @@ static void jffs2_mark_erased_block(struct jffs2_sb_info *c, struct jffs2_eraseb
47918 struct jffs2_unknown_node marker = {
47919 .magic = cpu_to_je16(JFFS2_MAGIC_BITMASK),
47920 .nodetype = cpu_to_je16(JFFS2_NODETYPE_CLEANMARKER),
47921 - .totlen = cpu_to_je32(c->cleanmarker_size)
47922 + .totlen = cpu_to_je32(c->cleanmarker_size),
47923 + .hdr_crc = cpu_to_je32(0)
47924 };
47925
47926 jffs2_prealloc_raw_node_refs(c, jeb, 1);
47927 diff --git a/fs/jffs2/wbuf.c b/fs/jffs2/wbuf.c
47928 index a6597d6..41b30ec 100644
47929 --- a/fs/jffs2/wbuf.c
47930 +++ b/fs/jffs2/wbuf.c
47931 @@ -1023,7 +1023,8 @@ static const struct jffs2_unknown_node oob_cleanmarker =
47932 {
47933 .magic = constant_cpu_to_je16(JFFS2_MAGIC_BITMASK),
47934 .nodetype = constant_cpu_to_je16(JFFS2_NODETYPE_CLEANMARKER),
47935 - .totlen = constant_cpu_to_je32(8)
47936 + .totlen = constant_cpu_to_je32(8),
47937 + .hdr_crc = constant_cpu_to_je32(0)
47938 };
47939
47940 /*
47941 diff --git a/fs/jfs/super.c b/fs/jfs/super.c
47942 index c55c745..f67ee56 100644
47943 --- a/fs/jfs/super.c
47944 +++ b/fs/jfs/super.c
47945 @@ -806,7 +806,7 @@ static int __init init_jfs_fs(void)
47946
47947 jfs_inode_cachep =
47948 kmem_cache_create("jfs_ip", sizeof(struct jfs_inode_info), 0,
47949 - SLAB_RECLAIM_ACCOUNT|SLAB_MEM_SPREAD,
47950 + SLAB_RECLAIM_ACCOUNT|SLAB_MEM_SPREAD|SLAB_USERCOPY,
47951 init_once);
47952 if (jfs_inode_cachep == NULL)
47953 return -ENOMEM;
47954 diff --git a/fs/libfs.c b/fs/libfs.c
47955 index a74cb17..37fcbe4 100644
47956 --- a/fs/libfs.c
47957 +++ b/fs/libfs.c
47958 @@ -165,6 +165,9 @@ int dcache_readdir(struct file * filp, void * dirent, filldir_t filldir)
47959
47960 for (p=q->next; p != &dentry->d_subdirs; p=p->next) {
47961 struct dentry *next;
47962 + char d_name[sizeof(next->d_iname)];
47963 + const unsigned char *name;
47964 +
47965 next = list_entry(p, struct dentry, d_u.d_child);
47966 spin_lock_nested(&next->d_lock, DENTRY_D_LOCK_NESTED);
47967 if (!simple_positive(next)) {
47968 @@ -174,7 +177,12 @@ int dcache_readdir(struct file * filp, void * dirent, filldir_t filldir)
47969
47970 spin_unlock(&next->d_lock);
47971 spin_unlock(&dentry->d_lock);
47972 - if (filldir(dirent, next->d_name.name,
47973 + name = next->d_name.name;
47974 + if (name == next->d_iname) {
47975 + memcpy(d_name, name, next->d_name.len);
47976 + name = d_name;
47977 + }
47978 + if (filldir(dirent, name,
47979 next->d_name.len, filp->f_pos,
47980 next->d_inode->i_ino,
47981 dt_type(next->d_inode)) < 0)
47982 diff --git a/fs/lockd/clntproc.c b/fs/lockd/clntproc.c
47983 index 05d2912..760abfa 100644
47984 --- a/fs/lockd/clntproc.c
47985 +++ b/fs/lockd/clntproc.c
47986 @@ -36,11 +36,11 @@ static const struct rpc_call_ops nlmclnt_cancel_ops;
47987 /*
47988 * Cookie counter for NLM requests
47989 */
47990 -static atomic_t nlm_cookie = ATOMIC_INIT(0x1234);
47991 +static atomic_unchecked_t nlm_cookie = ATOMIC_INIT(0x1234);
47992
47993 void nlmclnt_next_cookie(struct nlm_cookie *c)
47994 {
47995 - u32 cookie = atomic_inc_return(&nlm_cookie);
47996 + u32 cookie = atomic_inc_return_unchecked(&nlm_cookie);
47997
47998 memcpy(c->data, &cookie, 4);
47999 c->len=4;
48000 diff --git a/fs/locks.c b/fs/locks.c
48001 index 7e81bfc..c3649aa 100644
48002 --- a/fs/locks.c
48003 +++ b/fs/locks.c
48004 @@ -2066,16 +2066,16 @@ void locks_remove_flock(struct file *filp)
48005 return;
48006
48007 if (filp->f_op && filp->f_op->flock) {
48008 - struct file_lock fl = {
48009 + struct file_lock flock = {
48010 .fl_pid = current->tgid,
48011 .fl_file = filp,
48012 .fl_flags = FL_FLOCK,
48013 .fl_type = F_UNLCK,
48014 .fl_end = OFFSET_MAX,
48015 };
48016 - filp->f_op->flock(filp, F_SETLKW, &fl);
48017 - if (fl.fl_ops && fl.fl_ops->fl_release_private)
48018 - fl.fl_ops->fl_release_private(&fl);
48019 + filp->f_op->flock(filp, F_SETLKW, &flock);
48020 + if (flock.fl_ops && flock.fl_ops->fl_release_private)
48021 + flock.fl_ops->fl_release_private(&flock);
48022 }
48023
48024 lock_flocks();
48025 diff --git a/fs/namei.c b/fs/namei.c
48026 index 091c4b7..fbcb268 100644
48027 --- a/fs/namei.c
48028 +++ b/fs/namei.c
48029 @@ -265,16 +265,32 @@ int generic_permission(struct inode *inode, int mask)
48030 if (ret != -EACCES)
48031 return ret;
48032
48033 +#ifdef CONFIG_GRKERNSEC
48034 + /* we'll block if we have to log due to a denied capability use */
48035 + if (mask & MAY_NOT_BLOCK)
48036 + return -ECHILD;
48037 +#endif
48038 +
48039 if (S_ISDIR(inode->i_mode)) {
48040 /* DACs are overridable for directories */
48041 - if (inode_capable(inode, CAP_DAC_OVERRIDE))
48042 - return 0;
48043 if (!(mask & MAY_WRITE))
48044 - if (inode_capable(inode, CAP_DAC_READ_SEARCH))
48045 + if (inode_capable_nolog(inode, CAP_DAC_OVERRIDE) ||
48046 + inode_capable(inode, CAP_DAC_READ_SEARCH))
48047 return 0;
48048 + if (inode_capable(inode, CAP_DAC_OVERRIDE))
48049 + return 0;
48050 return -EACCES;
48051 }
48052 /*
48053 + * Searching includes executable on directories, else just read.
48054 + */
48055 + mask &= MAY_READ | MAY_WRITE | MAY_EXEC;
48056 + if (mask == MAY_READ)
48057 + if (inode_capable_nolog(inode, CAP_DAC_OVERRIDE) ||
48058 + inode_capable(inode, CAP_DAC_READ_SEARCH))
48059 + return 0;
48060 +
48061 + /*
48062 * Read/write DACs are always overridable.
48063 * Executable DACs are overridable when there is
48064 * at least one exec bit set.
48065 @@ -283,14 +299,6 @@ int generic_permission(struct inode *inode, int mask)
48066 if (inode_capable(inode, CAP_DAC_OVERRIDE))
48067 return 0;
48068
48069 - /*
48070 - * Searching includes executable on directories, else just read.
48071 - */
48072 - mask &= MAY_READ | MAY_WRITE | MAY_EXEC;
48073 - if (mask == MAY_READ)
48074 - if (inode_capable(inode, CAP_DAC_READ_SEARCH))
48075 - return 0;
48076 -
48077 return -EACCES;
48078 }
48079
48080 @@ -772,7 +780,7 @@ follow_link(struct path *link, struct nameidata *nd, void **p)
48081 {
48082 struct dentry *dentry = link->dentry;
48083 int error;
48084 - char *s;
48085 + const char *s;
48086
48087 BUG_ON(nd->flags & LOOKUP_RCU);
48088
48089 @@ -793,6 +801,12 @@ follow_link(struct path *link, struct nameidata *nd, void **p)
48090 if (error)
48091 goto out_put_nd_path;
48092
48093 + if (gr_handle_follow_link(dentry->d_parent->d_inode,
48094 + dentry->d_inode, dentry, nd->path.mnt)) {
48095 + error = -EACCES;
48096 + goto out_put_nd_path;
48097 + }
48098 +
48099 nd->last_type = LAST_BIND;
48100 *p = dentry->d_inode->i_op->follow_link(dentry, nd);
48101 error = PTR_ERR(*p);
48102 @@ -1550,6 +1564,8 @@ static inline int nested_symlink(struct path *path, struct nameidata *nd)
48103 break;
48104 res = walk_component(nd, path, &nd->last,
48105 nd->last_type, LOOKUP_FOLLOW);
48106 + if (res >= 0 && gr_handle_symlink_owner(&link, nd->inode))
48107 + res = -EACCES;
48108 put_link(nd, &link, cookie);
48109 } while (res > 0);
48110
48111 @@ -1648,7 +1664,7 @@ EXPORT_SYMBOL(full_name_hash);
48112 static inline unsigned long hash_name(const char *name, unsigned int *hashp)
48113 {
48114 unsigned long a, b, adata, bdata, mask, hash, len;
48115 - const struct word_at_a_time constants = WORD_AT_A_TIME_CONSTANTS;
48116 + static const struct word_at_a_time constants = WORD_AT_A_TIME_CONSTANTS;
48117
48118 hash = a = 0;
48119 len = -sizeof(unsigned long);
48120 @@ -1943,6 +1959,8 @@ static int path_lookupat(int dfd, const char *name,
48121 if (err)
48122 break;
48123 err = lookup_last(nd, &path);
48124 + if (!err && gr_handle_symlink_owner(&link, nd->inode))
48125 + err = -EACCES;
48126 put_link(nd, &link, cookie);
48127 }
48128 }
48129 @@ -1950,6 +1968,21 @@ static int path_lookupat(int dfd, const char *name,
48130 if (!err)
48131 err = complete_walk(nd);
48132
48133 + if (!(nd->flags & LOOKUP_PARENT)) {
48134 +#ifdef CONFIG_GRKERNSEC
48135 + if (flags & LOOKUP_RCU) {
48136 + if (!err)
48137 + path_put(&nd->path);
48138 + err = -ECHILD;
48139 + } else
48140 +#endif
48141 + if (!gr_acl_handle_hidden_file(nd->path.dentry, nd->path.mnt)) {
48142 + if (!err)
48143 + path_put(&nd->path);
48144 + err = -ENOENT;
48145 + }
48146 + }
48147 +
48148 if (!err && nd->flags & LOOKUP_DIRECTORY) {
48149 if (!nd->inode->i_op->lookup) {
48150 path_put(&nd->path);
48151 @@ -1977,6 +2010,15 @@ static int do_path_lookup(int dfd, const char *name,
48152 retval = path_lookupat(dfd, name, flags | LOOKUP_REVAL, nd);
48153
48154 if (likely(!retval)) {
48155 + if (*name != '/' && nd->path.dentry && nd->inode) {
48156 +#ifdef CONFIG_GRKERNSEC
48157 + if (flags & LOOKUP_RCU)
48158 + return -ECHILD;
48159 +#endif
48160 + if (!gr_chroot_fchdir(nd->path.dentry, nd->path.mnt))
48161 + return -ENOENT;
48162 + }
48163 +
48164 if (unlikely(!audit_dummy_context())) {
48165 if (nd->path.dentry && nd->inode)
48166 audit_inode(name, nd->path.dentry);
48167 @@ -2336,6 +2378,13 @@ static int may_open(struct path *path, int acc_mode, int flag)
48168 if (flag & O_NOATIME && !inode_owner_or_capable(inode))
48169 return -EPERM;
48170
48171 + if (gr_handle_rofs_blockwrite(dentry, path->mnt, acc_mode))
48172 + return -EPERM;
48173 + if (gr_handle_rawio(inode))
48174 + return -EPERM;
48175 + if (!gr_acl_handle_open(dentry, path->mnt, acc_mode))
48176 + return -EACCES;
48177 +
48178 return 0;
48179 }
48180
48181 @@ -2557,7 +2606,7 @@ looked_up:
48182 * cleared otherwise prior to returning.
48183 */
48184 static int lookup_open(struct nameidata *nd, struct path *path,
48185 - struct file *file,
48186 + struct path *link, struct file *file,
48187 const struct open_flags *op,
48188 bool got_write, int *opened)
48189 {
48190 @@ -2592,6 +2641,17 @@ static int lookup_open(struct nameidata *nd, struct path *path,
48191 /* Negative dentry, just create the file */
48192 if (!dentry->d_inode && (op->open_flag & O_CREAT)) {
48193 umode_t mode = op->mode;
48194 +
48195 + if (link && gr_handle_symlink_owner(link, dir->d_inode)) {
48196 + error = -EACCES;
48197 + goto out_dput;
48198 + }
48199 +
48200 + if (!gr_acl_handle_creat(dentry, dir, nd->path.mnt, op->open_flag, op->acc_mode, mode)) {
48201 + error = -EACCES;
48202 + goto out_dput;
48203 + }
48204 +
48205 if (!IS_POSIXACL(dir->d_inode))
48206 mode &= ~current_umask();
48207 /*
48208 @@ -2613,6 +2673,8 @@ static int lookup_open(struct nameidata *nd, struct path *path,
48209 nd->flags & LOOKUP_EXCL);
48210 if (error)
48211 goto out_dput;
48212 + else
48213 + gr_handle_create(dentry, nd->path.mnt);
48214 }
48215 out_no_open:
48216 path->dentry = dentry;
48217 @@ -2627,7 +2689,7 @@ out_dput:
48218 /*
48219 * Handle the last step of open()
48220 */
48221 -static int do_last(struct nameidata *nd, struct path *path,
48222 +static int do_last(struct nameidata *nd, struct path *path, struct path *link,
48223 struct file *file, const struct open_flags *op,
48224 int *opened, const char *pathname)
48225 {
48226 @@ -2656,16 +2718,44 @@ static int do_last(struct nameidata *nd, struct path *path,
48227 error = complete_walk(nd);
48228 if (error)
48229 return error;
48230 +#ifdef CONFIG_GRKERNSEC
48231 + if (nd->flags & LOOKUP_RCU) {
48232 + error = -ECHILD;
48233 + goto out;
48234 + }
48235 +#endif
48236 + if (!gr_acl_handle_hidden_file(nd->path.dentry, nd->path.mnt)) {
48237 + error = -ENOENT;
48238 + goto out;
48239 + }
48240 audit_inode(pathname, nd->path.dentry);
48241 if (open_flag & O_CREAT) {
48242 error = -EISDIR;
48243 goto out;
48244 }
48245 + if (link && gr_handle_symlink_owner(link, nd->inode)) {
48246 + error = -EACCES;
48247 + goto out;
48248 + }
48249 goto finish_open;
48250 case LAST_BIND:
48251 error = complete_walk(nd);
48252 if (error)
48253 return error;
48254 +#ifdef CONFIG_GRKERNSEC
48255 + if (nd->flags & LOOKUP_RCU) {
48256 + error = -ECHILD;
48257 + goto out;
48258 + }
48259 +#endif
48260 + if (!gr_acl_handle_hidden_file(dir, nd->path.mnt)) {
48261 + error = -ENOENT;
48262 + goto out;
48263 + }
48264 + if (link && gr_handle_symlink_owner(link, nd->inode)) {
48265 + error = -EACCES;
48266 + goto out;
48267 + }
48268 audit_inode(pathname, dir);
48269 goto finish_open;
48270 }
48271 @@ -2714,7 +2804,7 @@ retry_lookup:
48272 */
48273 }
48274 mutex_lock(&dir->d_inode->i_mutex);
48275 - error = lookup_open(nd, path, file, op, got_write, opened);
48276 + error = lookup_open(nd, path, link, file, op, got_write, opened);
48277 mutex_unlock(&dir->d_inode->i_mutex);
48278
48279 if (error <= 0) {
48280 @@ -2738,11 +2828,28 @@ retry_lookup:
48281 goto finish_open_created;
48282 }
48283
48284 + if (!gr_acl_handle_hidden_file(path->dentry, nd->path.mnt)) {
48285 + error = -ENOENT;
48286 + goto exit_dput;
48287 + }
48288 + if (link && gr_handle_symlink_owner(link, path->dentry->d_inode)) {
48289 + error = -EACCES;
48290 + goto exit_dput;
48291 + }
48292 +
48293 /*
48294 * create/update audit record if it already exists.
48295 */
48296 - if (path->dentry->d_inode)
48297 + if (path->dentry->d_inode) {
48298 + /* only check if O_CREAT is specified, all other checks need to go
48299 + into may_open */
48300 + if (gr_handle_fifo(path->dentry, path->mnt, dir, open_flag, acc_mode)) {
48301 + error = -EACCES;
48302 + goto exit_dput;
48303 + }
48304 +
48305 audit_inode(pathname, path->dentry);
48306 + }
48307
48308 /*
48309 * If atomic_open() acquired write access it is dropped now due to
48310 @@ -2783,6 +2890,11 @@ finish_lookup:
48311 }
48312 }
48313 BUG_ON(inode != path->dentry->d_inode);
48314 + /* if we're resolving a symlink to another symlink */
48315 + if (link && gr_handle_symlink_owner(link, inode)) {
48316 + error = -EACCES;
48317 + goto out;
48318 + }
48319 return 1;
48320 }
48321
48322 @@ -2792,7 +2904,6 @@ finish_lookup:
48323 save_parent.dentry = nd->path.dentry;
48324 save_parent.mnt = mntget(path->mnt);
48325 nd->path.dentry = path->dentry;
48326 -
48327 }
48328 nd->inode = inode;
48329 /* Why this, you ask? _Now_ we might have grown LOOKUP_JUMPED... */
48330 @@ -2801,6 +2912,22 @@ finish_lookup:
48331 path_put(&save_parent);
48332 return error;
48333 }
48334 +
48335 +#ifdef CONFIG_GRKERNSEC
48336 + if (nd->flags & LOOKUP_RCU) {
48337 + error = -ECHILD;
48338 + goto out;
48339 + }
48340 +#endif
48341 + if (!gr_acl_handle_hidden_file(nd->path.dentry, nd->path.mnt)) {
48342 + error = -ENOENT;
48343 + goto out;
48344 + }
48345 + if (link && gr_handle_symlink_owner(link, nd->inode)) {
48346 + error = -EACCES;
48347 + goto out;
48348 + }
48349 +
48350 error = -EISDIR;
48351 if ((open_flag & O_CREAT) && S_ISDIR(nd->inode->i_mode))
48352 goto out;
48353 @@ -2899,7 +3026,7 @@ static struct file *path_openat(int dfd, const char *pathname,
48354 if (unlikely(error))
48355 goto out;
48356
48357 - error = do_last(nd, &path, file, op, &opened, pathname);
48358 + error = do_last(nd, &path, NULL, file, op, &opened, pathname);
48359 while (unlikely(error > 0)) { /* trailing symlink */
48360 struct path link = path;
48361 void *cookie;
48362 @@ -2917,7 +3044,7 @@ static struct file *path_openat(int dfd, const char *pathname,
48363 error = follow_link(&link, nd, &cookie);
48364 if (unlikely(error))
48365 break;
48366 - error = do_last(nd, &path, file, op, &opened, pathname);
48367 + error = do_last(nd, &path, &link, file, op, &opened, pathname);
48368 put_link(nd, &link, cookie);
48369 }
48370 out:
48371 @@ -3006,8 +3133,12 @@ struct dentry *kern_path_create(int dfd, const char *pathname, struct path *path
48372 goto unlock;
48373
48374 error = -EEXIST;
48375 - if (dentry->d_inode)
48376 + if (dentry->d_inode) {
48377 + if (!gr_acl_handle_hidden_file(dentry, nd.path.mnt)) {
48378 + error = -ENOENT;
48379 + }
48380 goto fail;
48381 + }
48382 /*
48383 * Special case - lookup gave negative, but... we had foo/bar/
48384 * From the vfs_mknod() POV we just have a negative dentry -
48385 @@ -3058,6 +3189,20 @@ struct dentry *user_path_create(int dfd, const char __user *pathname, struct pat
48386 }
48387 EXPORT_SYMBOL(user_path_create);
48388
48389 +static struct dentry *user_path_create_with_name(int dfd, const char __user *pathname, struct path *path, char **to, int is_dir)
48390 +{
48391 + char *tmp = getname(pathname);
48392 + struct dentry *res;
48393 + if (IS_ERR(tmp))
48394 + return ERR_CAST(tmp);
48395 + res = kern_path_create(dfd, tmp, path, is_dir);
48396 + if (IS_ERR(res))
48397 + putname(tmp);
48398 + else
48399 + *to = tmp;
48400 + return res;
48401 +}
48402 +
48403 int vfs_mknod(struct inode *dir, struct dentry *dentry, umode_t mode, dev_t dev)
48404 {
48405 int error = may_create(dir, dentry);
48406 @@ -3119,6 +3264,17 @@ SYSCALL_DEFINE4(mknodat, int, dfd, const char __user *, filename, umode_t, mode,
48407
48408 if (!IS_POSIXACL(path.dentry->d_inode))
48409 mode &= ~current_umask();
48410 +
48411 + if (gr_handle_chroot_mknod(dentry, path.mnt, mode)) {
48412 + error = -EPERM;
48413 + goto out;
48414 + }
48415 +
48416 + if (!gr_acl_handle_mknod(dentry, path.dentry, path.mnt, mode)) {
48417 + error = -EACCES;
48418 + goto out;
48419 + }
48420 +
48421 error = security_path_mknod(&path, dentry, mode, dev);
48422 if (error)
48423 goto out;
48424 @@ -3135,6 +3291,8 @@ SYSCALL_DEFINE4(mknodat, int, dfd, const char __user *, filename, umode_t, mode,
48425 break;
48426 }
48427 out:
48428 + if (!error)
48429 + gr_handle_create(dentry, path.mnt);
48430 done_path_create(&path, dentry);
48431 return error;
48432 }
48433 @@ -3181,9 +3339,18 @@ SYSCALL_DEFINE3(mkdirat, int, dfd, const char __user *, pathname, umode_t, mode)
48434
48435 if (!IS_POSIXACL(path.dentry->d_inode))
48436 mode &= ~current_umask();
48437 +
48438 + if (!gr_acl_handle_mkdir(dentry, path.dentry, path.mnt)) {
48439 + error = -EACCES;
48440 + goto out;
48441 + }
48442 +
48443 error = security_path_mkdir(&path, dentry, mode);
48444 if (!error)
48445 error = vfs_mkdir(path.dentry->d_inode, dentry, mode);
48446 + if (!error)
48447 + gr_handle_create(dentry, path.mnt);
48448 +out:
48449 done_path_create(&path, dentry);
48450 return error;
48451 }
48452 @@ -3260,6 +3427,8 @@ static long do_rmdir(int dfd, const char __user *pathname)
48453 char * name;
48454 struct dentry *dentry;
48455 struct nameidata nd;
48456 + ino_t saved_ino = 0;
48457 + dev_t saved_dev = 0;
48458
48459 error = user_path_parent(dfd, pathname, &nd, &name);
48460 if (error)
48461 @@ -3291,10 +3460,21 @@ static long do_rmdir(int dfd, const char __user *pathname)
48462 error = -ENOENT;
48463 goto exit3;
48464 }
48465 +
48466 + saved_ino = dentry->d_inode->i_ino;
48467 + saved_dev = gr_get_dev_from_dentry(dentry);
48468 +
48469 + if (!gr_acl_handle_rmdir(dentry, nd.path.mnt)) {
48470 + error = -EACCES;
48471 + goto exit3;
48472 + }
48473 +
48474 error = security_path_rmdir(&nd.path, dentry);
48475 if (error)
48476 goto exit3;
48477 error = vfs_rmdir(nd.path.dentry->d_inode, dentry);
48478 + if (!error && (saved_dev || saved_ino))
48479 + gr_handle_delete(saved_ino, saved_dev);
48480 exit3:
48481 dput(dentry);
48482 exit2:
48483 @@ -3356,6 +3536,8 @@ static long do_unlinkat(int dfd, const char __user *pathname)
48484 struct dentry *dentry;
48485 struct nameidata nd;
48486 struct inode *inode = NULL;
48487 + ino_t saved_ino = 0;
48488 + dev_t saved_dev = 0;
48489
48490 error = user_path_parent(dfd, pathname, &nd, &name);
48491 if (error)
48492 @@ -3381,10 +3563,22 @@ static long do_unlinkat(int dfd, const char __user *pathname)
48493 if (!inode)
48494 goto slashes;
48495 ihold(inode);
48496 +
48497 + if (inode->i_nlink <= 1) {
48498 + saved_ino = inode->i_ino;
48499 + saved_dev = gr_get_dev_from_dentry(dentry);
48500 + }
48501 + if (!gr_acl_handle_unlink(dentry, nd.path.mnt)) {
48502 + error = -EACCES;
48503 + goto exit2;
48504 + }
48505 +
48506 error = security_path_unlink(&nd.path, dentry);
48507 if (error)
48508 goto exit2;
48509 error = vfs_unlink(nd.path.dentry->d_inode, dentry);
48510 + if (!error && (saved_ino || saved_dev))
48511 + gr_handle_delete(saved_ino, saved_dev);
48512 exit2:
48513 dput(dentry);
48514 }
48515 @@ -3456,9 +3650,17 @@ SYSCALL_DEFINE3(symlinkat, const char __user *, oldname,
48516 if (IS_ERR(dentry))
48517 goto out_putname;
48518
48519 + if (!gr_acl_handle_symlink(dentry, path.dentry, path.mnt, from)) {
48520 + error = -EACCES;
48521 + goto out;
48522 + }
48523 +
48524 error = security_path_symlink(&path, dentry, from);
48525 if (!error)
48526 error = vfs_symlink(path.dentry->d_inode, dentry, from);
48527 + if (!error)
48528 + gr_handle_create(dentry, path.mnt);
48529 +out:
48530 done_path_create(&path, dentry);
48531 out_putname:
48532 putname(from);
48533 @@ -3528,6 +3730,7 @@ SYSCALL_DEFINE5(linkat, int, olddfd, const char __user *, oldname,
48534 {
48535 struct dentry *new_dentry;
48536 struct path old_path, new_path;
48537 + char *to = NULL;
48538 int how = 0;
48539 int error;
48540
48541 @@ -3551,7 +3754,7 @@ SYSCALL_DEFINE5(linkat, int, olddfd, const char __user *, oldname,
48542 if (error)
48543 return error;
48544
48545 - new_dentry = user_path_create(newdfd, newname, &new_path, 0);
48546 + new_dentry = user_path_create_with_name(newdfd, newname, &new_path, &to, 0);
48547 error = PTR_ERR(new_dentry);
48548 if (IS_ERR(new_dentry))
48549 goto out;
48550 @@ -3562,11 +3765,28 @@ SYSCALL_DEFINE5(linkat, int, olddfd, const char __user *, oldname,
48551 error = may_linkat(&old_path);
48552 if (unlikely(error))
48553 goto out_dput;
48554 +
48555 + if (gr_handle_hardlink(old_path.dentry, old_path.mnt,
48556 + old_path.dentry->d_inode,
48557 + old_path.dentry->d_inode->i_mode, to)) {
48558 + error = -EACCES;
48559 + goto out_dput;
48560 + }
48561 +
48562 + if (!gr_acl_handle_link(new_dentry, new_path.dentry, new_path.mnt,
48563 + old_path.dentry, old_path.mnt, to)) {
48564 + error = -EACCES;
48565 + goto out_dput;
48566 + }
48567 +
48568 error = security_path_link(old_path.dentry, &new_path, new_dentry);
48569 if (error)
48570 goto out_dput;
48571 error = vfs_link(old_path.dentry, new_path.dentry->d_inode, new_dentry);
48572 + if (!error)
48573 + gr_handle_create(new_dentry, new_path.mnt);
48574 out_dput:
48575 + putname(to);
48576 done_path_create(&new_path, new_dentry);
48577 out:
48578 path_put(&old_path);
48579 @@ -3802,12 +4022,21 @@ SYSCALL_DEFINE4(renameat, int, olddfd, const char __user *, oldname,
48580 if (new_dentry == trap)
48581 goto exit5;
48582
48583 + error = gr_acl_handle_rename(new_dentry, new_dir, newnd.path.mnt,
48584 + old_dentry, old_dir->d_inode, oldnd.path.mnt,
48585 + to);
48586 + if (error)
48587 + goto exit5;
48588 +
48589 error = security_path_rename(&oldnd.path, old_dentry,
48590 &newnd.path, new_dentry);
48591 if (error)
48592 goto exit5;
48593 error = vfs_rename(old_dir->d_inode, old_dentry,
48594 new_dir->d_inode, new_dentry);
48595 + if (!error)
48596 + gr_handle_rename(old_dir->d_inode, new_dir->d_inode, old_dentry,
48597 + new_dentry, oldnd.path.mnt, new_dentry->d_inode ? 1 : 0);
48598 exit5:
48599 dput(new_dentry);
48600 exit4:
48601 @@ -3832,6 +4061,8 @@ SYSCALL_DEFINE2(rename, const char __user *, oldname, const char __user *, newna
48602
48603 int vfs_readlink(struct dentry *dentry, char __user *buffer, int buflen, const char *link)
48604 {
48605 + char tmpbuf[64];
48606 + const char *newlink;
48607 int len;
48608
48609 len = PTR_ERR(link);
48610 @@ -3841,7 +4072,14 @@ int vfs_readlink(struct dentry *dentry, char __user *buffer, int buflen, const c
48611 len = strlen(link);
48612 if (len > (unsigned) buflen)
48613 len = buflen;
48614 - if (copy_to_user(buffer, link, len))
48615 +
48616 + if (len < sizeof(tmpbuf)) {
48617 + memcpy(tmpbuf, link, len);
48618 + newlink = tmpbuf;
48619 + } else
48620 + newlink = link;
48621 +
48622 + if (copy_to_user(buffer, newlink, len))
48623 len = -EFAULT;
48624 out:
48625 return len;
48626 diff --git a/fs/namespace.c b/fs/namespace.c
48627 index 7bdf790..eb79c4b 100644
48628 --- a/fs/namespace.c
48629 +++ b/fs/namespace.c
48630 @@ -1212,6 +1212,9 @@ static int do_umount(struct mount *mnt, int flags)
48631 if (!(sb->s_flags & MS_RDONLY))
48632 retval = do_remount_sb(sb, MS_RDONLY, NULL, 0);
48633 up_write(&sb->s_umount);
48634 +
48635 + gr_log_remount(mnt->mnt_devname, retval);
48636 +
48637 return retval;
48638 }
48639
48640 @@ -1231,6 +1234,9 @@ static int do_umount(struct mount *mnt, int flags)
48641 br_write_unlock(&vfsmount_lock);
48642 up_write(&namespace_sem);
48643 release_mounts(&umount_list);
48644 +
48645 + gr_log_unmount(mnt->mnt_devname, retval);
48646 +
48647 return retval;
48648 }
48649
48650 @@ -2244,6 +2250,16 @@ long do_mount(char *dev_name, char *dir_name, char *type_page,
48651 MS_NOATIME | MS_NODIRATIME | MS_RELATIME| MS_KERNMOUNT |
48652 MS_STRICTATIME);
48653
48654 + if (gr_handle_rofs_mount(path.dentry, path.mnt, mnt_flags)) {
48655 + retval = -EPERM;
48656 + goto dput_out;
48657 + }
48658 +
48659 + if (gr_handle_chroot_mount(path.dentry, path.mnt, dev_name)) {
48660 + retval = -EPERM;
48661 + goto dput_out;
48662 + }
48663 +
48664 if (flags & MS_REMOUNT)
48665 retval = do_remount(&path, flags & ~MS_REMOUNT, mnt_flags,
48666 data_page);
48667 @@ -2258,6 +2274,9 @@ long do_mount(char *dev_name, char *dir_name, char *type_page,
48668 dev_name, data_page);
48669 dput_out:
48670 path_put(&path);
48671 +
48672 + gr_log_mount(dev_name, dir_name, retval);
48673 +
48674 return retval;
48675 }
48676
48677 @@ -2516,6 +2535,11 @@ SYSCALL_DEFINE2(pivot_root, const char __user *, new_root,
48678 if (error)
48679 goto out2;
48680
48681 + if (gr_handle_chroot_pivot()) {
48682 + error = -EPERM;
48683 + goto out2;
48684 + }
48685 +
48686 get_fs_root(current->fs, &root);
48687 error = lock_mount(&old);
48688 if (error)
48689 diff --git a/fs/nfs/inode.c b/fs/nfs/inode.c
48690 index 9b47610..066975e 100644
48691 --- a/fs/nfs/inode.c
48692 +++ b/fs/nfs/inode.c
48693 @@ -1026,16 +1026,16 @@ static int nfs_size_need_update(const struct inode *inode, const struct nfs_fatt
48694 return nfs_size_to_loff_t(fattr->size) > i_size_read(inode);
48695 }
48696
48697 -static atomic_long_t nfs_attr_generation_counter;
48698 +static atomic_long_unchecked_t nfs_attr_generation_counter;
48699
48700 static unsigned long nfs_read_attr_generation_counter(void)
48701 {
48702 - return atomic_long_read(&nfs_attr_generation_counter);
48703 + return atomic_long_read_unchecked(&nfs_attr_generation_counter);
48704 }
48705
48706 unsigned long nfs_inc_attr_generation_counter(void)
48707 {
48708 - return atomic_long_inc_return(&nfs_attr_generation_counter);
48709 + return atomic_long_inc_return_unchecked(&nfs_attr_generation_counter);
48710 }
48711
48712 void nfs_fattr_init(struct nfs_fattr *fattr)
48713 diff --git a/fs/nfsd/vfs.c b/fs/nfsd/vfs.c
48714 index a9269f1..5490437 100644
48715 --- a/fs/nfsd/vfs.c
48716 +++ b/fs/nfsd/vfs.c
48717 @@ -941,7 +941,7 @@ nfsd_vfs_read(struct svc_rqst *rqstp, struct svc_fh *fhp, struct file *file,
48718 } else {
48719 oldfs = get_fs();
48720 set_fs(KERNEL_DS);
48721 - host_err = vfs_readv(file, (struct iovec __user *)vec, vlen, &offset);
48722 + host_err = vfs_readv(file, (struct iovec __force_user *)vec, vlen, &offset);
48723 set_fs(oldfs);
48724 }
48725
48726 @@ -1045,7 +1045,7 @@ nfsd_vfs_write(struct svc_rqst *rqstp, struct svc_fh *fhp, struct file *file,
48727
48728 /* Write the data. */
48729 oldfs = get_fs(); set_fs(KERNEL_DS);
48730 - host_err = vfs_writev(file, (struct iovec __user *)vec, vlen, &offset);
48731 + host_err = vfs_writev(file, (struct iovec __force_user *)vec, vlen, &offset);
48732 set_fs(oldfs);
48733 if (host_err < 0)
48734 goto out_nfserr;
48735 @@ -1581,7 +1581,7 @@ nfsd_readlink(struct svc_rqst *rqstp, struct svc_fh *fhp, char *buf, int *lenp)
48736 */
48737
48738 oldfs = get_fs(); set_fs(KERNEL_DS);
48739 - host_err = inode->i_op->readlink(path.dentry, buf, *lenp);
48740 + host_err = inode->i_op->readlink(path.dentry, (char __force_user *)buf, *lenp);
48741 set_fs(oldfs);
48742
48743 if (host_err < 0)
48744 diff --git a/fs/notify/fanotify/fanotify_user.c b/fs/notify/fanotify/fanotify_user.c
48745 index d438036..0ecadde 100644
48746 --- a/fs/notify/fanotify/fanotify_user.c
48747 +++ b/fs/notify/fanotify/fanotify_user.c
48748 @@ -274,7 +274,8 @@ static ssize_t copy_event_to_user(struct fsnotify_group *group,
48749 goto out_close_fd;
48750
48751 ret = -EFAULT;
48752 - if (copy_to_user(buf, &fanotify_event_metadata,
48753 + if (fanotify_event_metadata.event_len > sizeof fanotify_event_metadata ||
48754 + copy_to_user(buf, &fanotify_event_metadata,
48755 fanotify_event_metadata.event_len))
48756 goto out_kill_access_response;
48757
48758 diff --git a/fs/notify/notification.c b/fs/notify/notification.c
48759 index c887b13..0fdf472 100644
48760 --- a/fs/notify/notification.c
48761 +++ b/fs/notify/notification.c
48762 @@ -57,7 +57,7 @@ static struct kmem_cache *fsnotify_event_holder_cachep;
48763 * get set to 0 so it will never get 'freed'
48764 */
48765 static struct fsnotify_event *q_overflow_event;
48766 -static atomic_t fsnotify_sync_cookie = ATOMIC_INIT(0);
48767 +static atomic_unchecked_t fsnotify_sync_cookie = ATOMIC_INIT(0);
48768
48769 /**
48770 * fsnotify_get_cookie - return a unique cookie for use in synchronizing events.
48771 @@ -65,7 +65,7 @@ static atomic_t fsnotify_sync_cookie = ATOMIC_INIT(0);
48772 */
48773 u32 fsnotify_get_cookie(void)
48774 {
48775 - return atomic_inc_return(&fsnotify_sync_cookie);
48776 + return atomic_inc_return_unchecked(&fsnotify_sync_cookie);
48777 }
48778 EXPORT_SYMBOL_GPL(fsnotify_get_cookie);
48779
48780 diff --git a/fs/ntfs/dir.c b/fs/ntfs/dir.c
48781 index 99e3610..02c1068 100644
48782 --- a/fs/ntfs/dir.c
48783 +++ b/fs/ntfs/dir.c
48784 @@ -1329,7 +1329,7 @@ find_next_index_buffer:
48785 ia = (INDEX_ALLOCATION*)(kaddr + (ia_pos & ~PAGE_CACHE_MASK &
48786 ~(s64)(ndir->itype.index.block_size - 1)));
48787 /* Bounds checks. */
48788 - if (unlikely((u8*)ia < kaddr || (u8*)ia > kaddr + PAGE_CACHE_SIZE)) {
48789 + if (unlikely(!kaddr || (u8*)ia < kaddr || (u8*)ia > kaddr + PAGE_CACHE_SIZE)) {
48790 ntfs_error(sb, "Out of bounds check failed. Corrupt directory "
48791 "inode 0x%lx or driver bug.", vdir->i_ino);
48792 goto err_out;
48793 diff --git a/fs/ntfs/file.c b/fs/ntfs/file.c
48794 index 1ecf464..e1ff8bf 100644
48795 --- a/fs/ntfs/file.c
48796 +++ b/fs/ntfs/file.c
48797 @@ -2232,6 +2232,6 @@ const struct inode_operations ntfs_file_inode_ops = {
48798 #endif /* NTFS_RW */
48799 };
48800
48801 -const struct file_operations ntfs_empty_file_ops = {};
48802 +const struct file_operations ntfs_empty_file_ops __read_only;
48803
48804 -const struct inode_operations ntfs_empty_inode_ops = {};
48805 +const struct inode_operations ntfs_empty_inode_ops __read_only;
48806 diff --git a/fs/ocfs2/localalloc.c b/fs/ocfs2/localalloc.c
48807 index a9f78c7..ed8a381 100644
48808 --- a/fs/ocfs2/localalloc.c
48809 +++ b/fs/ocfs2/localalloc.c
48810 @@ -1279,7 +1279,7 @@ static int ocfs2_local_alloc_slide_window(struct ocfs2_super *osb,
48811 goto bail;
48812 }
48813
48814 - atomic_inc(&osb->alloc_stats.moves);
48815 + atomic_inc_unchecked(&osb->alloc_stats.moves);
48816
48817 bail:
48818 if (handle)
48819 diff --git a/fs/ocfs2/ocfs2.h b/fs/ocfs2/ocfs2.h
48820 index d355e6e..578d905 100644
48821 --- a/fs/ocfs2/ocfs2.h
48822 +++ b/fs/ocfs2/ocfs2.h
48823 @@ -235,11 +235,11 @@ enum ocfs2_vol_state
48824
48825 struct ocfs2_alloc_stats
48826 {
48827 - atomic_t moves;
48828 - atomic_t local_data;
48829 - atomic_t bitmap_data;
48830 - atomic_t bg_allocs;
48831 - atomic_t bg_extends;
48832 + atomic_unchecked_t moves;
48833 + atomic_unchecked_t local_data;
48834 + atomic_unchecked_t bitmap_data;
48835 + atomic_unchecked_t bg_allocs;
48836 + atomic_unchecked_t bg_extends;
48837 };
48838
48839 enum ocfs2_local_alloc_state
48840 diff --git a/fs/ocfs2/suballoc.c b/fs/ocfs2/suballoc.c
48841 index f169da4..9112253 100644
48842 --- a/fs/ocfs2/suballoc.c
48843 +++ b/fs/ocfs2/suballoc.c
48844 @@ -872,7 +872,7 @@ static int ocfs2_reserve_suballoc_bits(struct ocfs2_super *osb,
48845 mlog_errno(status);
48846 goto bail;
48847 }
48848 - atomic_inc(&osb->alloc_stats.bg_extends);
48849 + atomic_inc_unchecked(&osb->alloc_stats.bg_extends);
48850
48851 /* You should never ask for this much metadata */
48852 BUG_ON(bits_wanted >
48853 @@ -2008,7 +2008,7 @@ int ocfs2_claim_metadata(handle_t *handle,
48854 mlog_errno(status);
48855 goto bail;
48856 }
48857 - atomic_inc(&OCFS2_SB(ac->ac_inode->i_sb)->alloc_stats.bg_allocs);
48858 + atomic_inc_unchecked(&OCFS2_SB(ac->ac_inode->i_sb)->alloc_stats.bg_allocs);
48859
48860 *suballoc_loc = res.sr_bg_blkno;
48861 *suballoc_bit_start = res.sr_bit_offset;
48862 @@ -2172,7 +2172,7 @@ int ocfs2_claim_new_inode_at_loc(handle_t *handle,
48863 trace_ocfs2_claim_new_inode_at_loc((unsigned long long)di_blkno,
48864 res->sr_bits);
48865
48866 - atomic_inc(&OCFS2_SB(ac->ac_inode->i_sb)->alloc_stats.bg_allocs);
48867 + atomic_inc_unchecked(&OCFS2_SB(ac->ac_inode->i_sb)->alloc_stats.bg_allocs);
48868
48869 BUG_ON(res->sr_bits != 1);
48870
48871 @@ -2214,7 +2214,7 @@ int ocfs2_claim_new_inode(handle_t *handle,
48872 mlog_errno(status);
48873 goto bail;
48874 }
48875 - atomic_inc(&OCFS2_SB(ac->ac_inode->i_sb)->alloc_stats.bg_allocs);
48876 + atomic_inc_unchecked(&OCFS2_SB(ac->ac_inode->i_sb)->alloc_stats.bg_allocs);
48877
48878 BUG_ON(res.sr_bits != 1);
48879
48880 @@ -2318,7 +2318,7 @@ int __ocfs2_claim_clusters(handle_t *handle,
48881 cluster_start,
48882 num_clusters);
48883 if (!status)
48884 - atomic_inc(&osb->alloc_stats.local_data);
48885 + atomic_inc_unchecked(&osb->alloc_stats.local_data);
48886 } else {
48887 if (min_clusters > (osb->bitmap_cpg - 1)) {
48888 /* The only paths asking for contiguousness
48889 @@ -2344,7 +2344,7 @@ int __ocfs2_claim_clusters(handle_t *handle,
48890 ocfs2_desc_bitmap_to_cluster_off(ac->ac_inode,
48891 res.sr_bg_blkno,
48892 res.sr_bit_offset);
48893 - atomic_inc(&osb->alloc_stats.bitmap_data);
48894 + atomic_inc_unchecked(&osb->alloc_stats.bitmap_data);
48895 *num_clusters = res.sr_bits;
48896 }
48897 }
48898 diff --git a/fs/ocfs2/super.c b/fs/ocfs2/super.c
48899 index 68f4541..89cfe6a 100644
48900 --- a/fs/ocfs2/super.c
48901 +++ b/fs/ocfs2/super.c
48902 @@ -301,11 +301,11 @@ static int ocfs2_osb_dump(struct ocfs2_super *osb, char *buf, int len)
48903 "%10s => GlobalAllocs: %d LocalAllocs: %d "
48904 "SubAllocs: %d LAWinMoves: %d SAExtends: %d\n",
48905 "Stats",
48906 - atomic_read(&osb->alloc_stats.bitmap_data),
48907 - atomic_read(&osb->alloc_stats.local_data),
48908 - atomic_read(&osb->alloc_stats.bg_allocs),
48909 - atomic_read(&osb->alloc_stats.moves),
48910 - atomic_read(&osb->alloc_stats.bg_extends));
48911 + atomic_read_unchecked(&osb->alloc_stats.bitmap_data),
48912 + atomic_read_unchecked(&osb->alloc_stats.local_data),
48913 + atomic_read_unchecked(&osb->alloc_stats.bg_allocs),
48914 + atomic_read_unchecked(&osb->alloc_stats.moves),
48915 + atomic_read_unchecked(&osb->alloc_stats.bg_extends));
48916
48917 out += snprintf(buf + out, len - out,
48918 "%10s => State: %u Descriptor: %llu Size: %u bits "
48919 @@ -2116,11 +2116,11 @@ static int ocfs2_initialize_super(struct super_block *sb,
48920 spin_lock_init(&osb->osb_xattr_lock);
48921 ocfs2_init_steal_slots(osb);
48922
48923 - atomic_set(&osb->alloc_stats.moves, 0);
48924 - atomic_set(&osb->alloc_stats.local_data, 0);
48925 - atomic_set(&osb->alloc_stats.bitmap_data, 0);
48926 - atomic_set(&osb->alloc_stats.bg_allocs, 0);
48927 - atomic_set(&osb->alloc_stats.bg_extends, 0);
48928 + atomic_set_unchecked(&osb->alloc_stats.moves, 0);
48929 + atomic_set_unchecked(&osb->alloc_stats.local_data, 0);
48930 + atomic_set_unchecked(&osb->alloc_stats.bitmap_data, 0);
48931 + atomic_set_unchecked(&osb->alloc_stats.bg_allocs, 0);
48932 + atomic_set_unchecked(&osb->alloc_stats.bg_extends, 0);
48933
48934 /* Copy the blockcheck stats from the superblock probe */
48935 osb->osb_ecc_stats = *stats;
48936 diff --git a/fs/open.c b/fs/open.c
48937 index e1f2cdb..3bd5f39 100644
48938 --- a/fs/open.c
48939 +++ b/fs/open.c
48940 @@ -31,6 +31,8 @@
48941 #include <linux/ima.h>
48942 #include <linux/dnotify.h>
48943
48944 +#define CREATE_TRACE_POINTS
48945 +#include <trace/events/fs.h>
48946 #include "internal.h"
48947
48948 int do_truncate(struct dentry *dentry, loff_t length, unsigned int time_attrs,
48949 @@ -112,6 +114,10 @@ static long do_sys_truncate(const char __user *pathname, loff_t length)
48950 error = locks_verify_truncate(inode, NULL, length);
48951 if (!error)
48952 error = security_path_truncate(&path);
48953 +
48954 + if (!error && !gr_acl_handle_truncate(path.dentry, path.mnt))
48955 + error = -EACCES;
48956 +
48957 if (!error)
48958 error = do_truncate(path.dentry, length, 0, NULL);
48959
48960 @@ -364,6 +370,9 @@ SYSCALL_DEFINE3(faccessat, int, dfd, const char __user *, filename, int, mode)
48961 if (__mnt_is_readonly(path.mnt))
48962 res = -EROFS;
48963
48964 + if (!res && !gr_acl_handle_access(path.dentry, path.mnt, mode))
48965 + res = -EACCES;
48966 +
48967 out_path_release:
48968 path_put(&path);
48969 out:
48970 @@ -390,6 +399,8 @@ SYSCALL_DEFINE1(chdir, const char __user *, filename)
48971 if (error)
48972 goto dput_and_out;
48973
48974 + gr_log_chdir(path.dentry, path.mnt);
48975 +
48976 set_fs_pwd(current->fs, &path);
48977
48978 dput_and_out:
48979 @@ -416,6 +427,13 @@ SYSCALL_DEFINE1(fchdir, unsigned int, fd)
48980 goto out_putf;
48981
48982 error = inode_permission(inode, MAY_EXEC | MAY_CHDIR);
48983 +
48984 + if (!error && !gr_chroot_fchdir(file->f_path.dentry, file->f_path.mnt))
48985 + error = -EPERM;
48986 +
48987 + if (!error)
48988 + gr_log_chdir(file->f_path.dentry, file->f_path.mnt);
48989 +
48990 if (!error)
48991 set_fs_pwd(current->fs, &file->f_path);
48992 out_putf:
48993 @@ -444,7 +462,13 @@ SYSCALL_DEFINE1(chroot, const char __user *, filename)
48994 if (error)
48995 goto dput_and_out;
48996
48997 + if (gr_handle_chroot_chroot(path.dentry, path.mnt))
48998 + goto dput_and_out;
48999 +
49000 set_fs_root(current->fs, &path);
49001 +
49002 + gr_handle_chroot_chdir(&path);
49003 +
49004 error = 0;
49005 dput_and_out:
49006 path_put(&path);
49007 @@ -462,6 +486,16 @@ static int chmod_common(struct path *path, umode_t mode)
49008 if (error)
49009 return error;
49010 mutex_lock(&inode->i_mutex);
49011 +
49012 + if (!gr_acl_handle_chmod(path->dentry, path->mnt, &mode)) {
49013 + error = -EACCES;
49014 + goto out_unlock;
49015 + }
49016 + if (gr_handle_chroot_chmod(path->dentry, path->mnt, mode)) {
49017 + error = -EACCES;
49018 + goto out_unlock;
49019 + }
49020 +
49021 error = security_path_chmod(path, mode);
49022 if (error)
49023 goto out_unlock;
49024 @@ -517,6 +551,9 @@ static int chown_common(struct path *path, uid_t user, gid_t group)
49025 uid = make_kuid(current_user_ns(), user);
49026 gid = make_kgid(current_user_ns(), group);
49027
49028 + if (!gr_acl_handle_chown(path->dentry, path->mnt))
49029 + return -EACCES;
49030 +
49031 newattrs.ia_valid = ATTR_CTIME;
49032 if (user != (uid_t) -1) {
49033 if (!uid_valid(uid))
49034 @@ -958,6 +995,7 @@ long do_sys_open(int dfd, const char __user *filename, int flags, umode_t mode)
49035 } else {
49036 fsnotify_open(f);
49037 fd_install(fd, f);
49038 + trace_do_sys_open(tmp, flags, mode);
49039 }
49040 }
49041 putname(tmp);
49042 diff --git a/fs/pipe.c b/fs/pipe.c
49043 index 8d85d70..581036b 100644
49044 --- a/fs/pipe.c
49045 +++ b/fs/pipe.c
49046 @@ -438,9 +438,9 @@ redo:
49047 }
49048 if (bufs) /* More to do? */
49049 continue;
49050 - if (!pipe->writers)
49051 + if (!atomic_read(&pipe->writers))
49052 break;
49053 - if (!pipe->waiting_writers) {
49054 + if (!atomic_read(&pipe->waiting_writers)) {
49055 /* syscall merging: Usually we must not sleep
49056 * if O_NONBLOCK is set, or if we got some data.
49057 * But if a writer sleeps in kernel space, then
49058 @@ -504,7 +504,7 @@ pipe_write(struct kiocb *iocb, const struct iovec *_iov,
49059 mutex_lock(&inode->i_mutex);
49060 pipe = inode->i_pipe;
49061
49062 - if (!pipe->readers) {
49063 + if (!atomic_read(&pipe->readers)) {
49064 send_sig(SIGPIPE, current, 0);
49065 ret = -EPIPE;
49066 goto out;
49067 @@ -553,7 +553,7 @@ redo1:
49068 for (;;) {
49069 int bufs;
49070
49071 - if (!pipe->readers) {
49072 + if (!atomic_read(&pipe->readers)) {
49073 send_sig(SIGPIPE, current, 0);
49074 if (!ret)
49075 ret = -EPIPE;
49076 @@ -644,9 +644,9 @@ redo2:
49077 kill_fasync(&pipe->fasync_readers, SIGIO, POLL_IN);
49078 do_wakeup = 0;
49079 }
49080 - pipe->waiting_writers++;
49081 + atomic_inc(&pipe->waiting_writers);
49082 pipe_wait(pipe);
49083 - pipe->waiting_writers--;
49084 + atomic_dec(&pipe->waiting_writers);
49085 }
49086 out:
49087 mutex_unlock(&inode->i_mutex);
49088 @@ -716,7 +716,7 @@ pipe_poll(struct file *filp, poll_table *wait)
49089 mask = 0;
49090 if (filp->f_mode & FMODE_READ) {
49091 mask = (nrbufs > 0) ? POLLIN | POLLRDNORM : 0;
49092 - if (!pipe->writers && filp->f_version != pipe->w_counter)
49093 + if (!atomic_read(&pipe->writers) && filp->f_version != pipe->w_counter)
49094 mask |= POLLHUP;
49095 }
49096
49097 @@ -726,7 +726,7 @@ pipe_poll(struct file *filp, poll_table *wait)
49098 * Most Unices do not set POLLERR for FIFOs but on Linux they
49099 * behave exactly like pipes for poll().
49100 */
49101 - if (!pipe->readers)
49102 + if (!atomic_read(&pipe->readers))
49103 mask |= POLLERR;
49104 }
49105
49106 @@ -740,10 +740,10 @@ pipe_release(struct inode *inode, int decr, int decw)
49107
49108 mutex_lock(&inode->i_mutex);
49109 pipe = inode->i_pipe;
49110 - pipe->readers -= decr;
49111 - pipe->writers -= decw;
49112 + atomic_sub(decr, &pipe->readers);
49113 + atomic_sub(decw, &pipe->writers);
49114
49115 - if (!pipe->readers && !pipe->writers) {
49116 + if (!atomic_read(&pipe->readers) && !atomic_read(&pipe->writers)) {
49117 free_pipe_info(inode);
49118 } else {
49119 wake_up_interruptible_sync_poll(&pipe->wait, POLLIN | POLLOUT | POLLRDNORM | POLLWRNORM | POLLERR | POLLHUP);
49120 @@ -833,7 +833,7 @@ pipe_read_open(struct inode *inode, struct file *filp)
49121
49122 if (inode->i_pipe) {
49123 ret = 0;
49124 - inode->i_pipe->readers++;
49125 + atomic_inc(&inode->i_pipe->readers);
49126 }
49127
49128 mutex_unlock(&inode->i_mutex);
49129 @@ -850,7 +850,7 @@ pipe_write_open(struct inode *inode, struct file *filp)
49130
49131 if (inode->i_pipe) {
49132 ret = 0;
49133 - inode->i_pipe->writers++;
49134 + atomic_inc(&inode->i_pipe->writers);
49135 }
49136
49137 mutex_unlock(&inode->i_mutex);
49138 @@ -868,9 +868,9 @@ pipe_rdwr_open(struct inode *inode, struct file *filp)
49139 if (inode->i_pipe) {
49140 ret = 0;
49141 if (filp->f_mode & FMODE_READ)
49142 - inode->i_pipe->readers++;
49143 + atomic_inc(&inode->i_pipe->readers);
49144 if (filp->f_mode & FMODE_WRITE)
49145 - inode->i_pipe->writers++;
49146 + atomic_inc(&inode->i_pipe->writers);
49147 }
49148
49149 mutex_unlock(&inode->i_mutex);
49150 @@ -962,7 +962,7 @@ void free_pipe_info(struct inode *inode)
49151 inode->i_pipe = NULL;
49152 }
49153
49154 -static struct vfsmount *pipe_mnt __read_mostly;
49155 +struct vfsmount *pipe_mnt __read_mostly;
49156
49157 /*
49158 * pipefs_dname() is called from d_path().
49159 @@ -992,7 +992,8 @@ static struct inode * get_pipe_inode(void)
49160 goto fail_iput;
49161 inode->i_pipe = pipe;
49162
49163 - pipe->readers = pipe->writers = 1;
49164 + atomic_set(&pipe->readers, 1);
49165 + atomic_set(&pipe->writers, 1);
49166 inode->i_fop = &rdwr_pipefifo_fops;
49167
49168 /*
49169 diff --git a/fs/proc/Kconfig b/fs/proc/Kconfig
49170 index 15af622..0e9f4467 100644
49171 --- a/fs/proc/Kconfig
49172 +++ b/fs/proc/Kconfig
49173 @@ -30,12 +30,12 @@ config PROC_FS
49174
49175 config PROC_KCORE
49176 bool "/proc/kcore support" if !ARM
49177 - depends on PROC_FS && MMU
49178 + depends on PROC_FS && MMU && !GRKERNSEC_PROC_ADD
49179
49180 config PROC_VMCORE
49181 bool "/proc/vmcore support"
49182 - depends on PROC_FS && CRASH_DUMP
49183 - default y
49184 + depends on PROC_FS && CRASH_DUMP && !GRKERNSEC
49185 + default n
49186 help
49187 Exports the dump image of crashed kernel in ELF format.
49188
49189 @@ -59,8 +59,8 @@ config PROC_SYSCTL
49190 limited in memory.
49191
49192 config PROC_PAGE_MONITOR
49193 - default y
49194 - depends on PROC_FS && MMU
49195 + default n
49196 + depends on PROC_FS && MMU && !GRKERNSEC
49197 bool "Enable /proc page monitoring" if EXPERT
49198 help
49199 Various /proc files exist to monitor process memory utilization:
49200 diff --git a/fs/proc/array.c b/fs/proc/array.c
49201 index c1c207c..01ce725 100644
49202 --- a/fs/proc/array.c
49203 +++ b/fs/proc/array.c
49204 @@ -60,6 +60,7 @@
49205 #include <linux/tty.h>
49206 #include <linux/string.h>
49207 #include <linux/mman.h>
49208 +#include <linux/grsecurity.h>
49209 #include <linux/proc_fs.h>
49210 #include <linux/ioport.h>
49211 #include <linux/uaccess.h>
49212 @@ -346,6 +347,21 @@ static void task_cpus_allowed(struct seq_file *m, struct task_struct *task)
49213 seq_putc(m, '\n');
49214 }
49215
49216 +#if defined(CONFIG_PAX_NOEXEC) || defined(CONFIG_PAX_ASLR)
49217 +static inline void task_pax(struct seq_file *m, struct task_struct *p)
49218 +{
49219 + if (p->mm)
49220 + seq_printf(m, "PaX:\t%c%c%c%c%c\n",
49221 + p->mm->pax_flags & MF_PAX_PAGEEXEC ? 'P' : 'p',
49222 + p->mm->pax_flags & MF_PAX_EMUTRAMP ? 'E' : 'e',
49223 + p->mm->pax_flags & MF_PAX_MPROTECT ? 'M' : 'm',
49224 + p->mm->pax_flags & MF_PAX_RANDMMAP ? 'R' : 'r',
49225 + p->mm->pax_flags & MF_PAX_SEGMEXEC ? 'S' : 's');
49226 + else
49227 + seq_printf(m, "PaX:\t-----\n");
49228 +}
49229 +#endif
49230 +
49231 int proc_pid_status(struct seq_file *m, struct pid_namespace *ns,
49232 struct pid *pid, struct task_struct *task)
49233 {
49234 @@ -363,9 +379,24 @@ int proc_pid_status(struct seq_file *m, struct pid_namespace *ns,
49235 task_cpus_allowed(m, task);
49236 cpuset_task_status_allowed(m, task);
49237 task_context_switch_counts(m, task);
49238 +
49239 +#if defined(CONFIG_PAX_NOEXEC) || defined(CONFIG_PAX_ASLR)
49240 + task_pax(m, task);
49241 +#endif
49242 +
49243 +#if defined(CONFIG_GRKERNSEC) && !defined(CONFIG_GRKERNSEC_NO_RBAC)
49244 + task_grsec_rbac(m, task);
49245 +#endif
49246 +
49247 return 0;
49248 }
49249
49250 +#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
49251 +#define PAX_RAND_FLAGS(_mm) (_mm != NULL && _mm != current->mm && \
49252 + (_mm->pax_flags & MF_PAX_RANDMMAP || \
49253 + _mm->pax_flags & MF_PAX_SEGMEXEC))
49254 +#endif
49255 +
49256 static int do_task_stat(struct seq_file *m, struct pid_namespace *ns,
49257 struct pid *pid, struct task_struct *task, int whole)
49258 {
49259 @@ -387,6 +418,13 @@ static int do_task_stat(struct seq_file *m, struct pid_namespace *ns,
49260 char tcomm[sizeof(task->comm)];
49261 unsigned long flags;
49262
49263 +#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
49264 + if (current->exec_id != m->exec_id) {
49265 + gr_log_badprocpid("stat");
49266 + return 0;
49267 + }
49268 +#endif
49269 +
49270 state = *get_task_state(task);
49271 vsize = eip = esp = 0;
49272 permitted = ptrace_may_access(task, PTRACE_MODE_READ | PTRACE_MODE_NOAUDIT);
49273 @@ -458,6 +496,19 @@ static int do_task_stat(struct seq_file *m, struct pid_namespace *ns,
49274 gtime = task->gtime;
49275 }
49276
49277 +#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
49278 + if (PAX_RAND_FLAGS(mm)) {
49279 + eip = 0;
49280 + esp = 0;
49281 + wchan = 0;
49282 + }
49283 +#endif
49284 +#ifdef CONFIG_GRKERNSEC_HIDESYM
49285 + wchan = 0;
49286 + eip =0;
49287 + esp =0;
49288 +#endif
49289 +
49290 /* scale priority and nice values from timeslices to -20..20 */
49291 /* to make it look like a "normal" Unix priority/nice value */
49292 priority = task_prio(task);
49293 @@ -494,9 +545,15 @@ static int do_task_stat(struct seq_file *m, struct pid_namespace *ns,
49294 seq_put_decimal_ull(m, ' ', vsize);
49295 seq_put_decimal_ull(m, ' ', mm ? get_mm_rss(mm) : 0);
49296 seq_put_decimal_ull(m, ' ', rsslim);
49297 +#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
49298 + seq_put_decimal_ull(m, ' ', PAX_RAND_FLAGS(mm) ? 1 : (mm ? (permitted ? mm->start_code : 1) : 0));
49299 + seq_put_decimal_ull(m, ' ', PAX_RAND_FLAGS(mm) ? 1 : (mm ? (permitted ? mm->end_code : 1) : 0));
49300 + seq_put_decimal_ull(m, ' ', PAX_RAND_FLAGS(mm) ? 0 : ((permitted && mm) ? mm->start_stack : 0));
49301 +#else
49302 seq_put_decimal_ull(m, ' ', mm ? (permitted ? mm->start_code : 1) : 0);
49303 seq_put_decimal_ull(m, ' ', mm ? (permitted ? mm->end_code : 1) : 0);
49304 seq_put_decimal_ull(m, ' ', (permitted && mm) ? mm->start_stack : 0);
49305 +#endif
49306 seq_put_decimal_ull(m, ' ', esp);
49307 seq_put_decimal_ull(m, ' ', eip);
49308 /* The signal information here is obsolete.
49309 @@ -518,7 +575,11 @@ static int do_task_stat(struct seq_file *m, struct pid_namespace *ns,
49310 seq_put_decimal_ull(m, ' ', cputime_to_clock_t(gtime));
49311 seq_put_decimal_ll(m, ' ', cputime_to_clock_t(cgtime));
49312
49313 - if (mm && permitted) {
49314 + if (mm && permitted
49315 +#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
49316 + && !PAX_RAND_FLAGS(mm)
49317 +#endif
49318 + ) {
49319 seq_put_decimal_ull(m, ' ', mm->start_data);
49320 seq_put_decimal_ull(m, ' ', mm->end_data);
49321 seq_put_decimal_ull(m, ' ', mm->start_brk);
49322 @@ -556,8 +617,15 @@ int proc_pid_statm(struct seq_file *m, struct pid_namespace *ns,
49323 struct pid *pid, struct task_struct *task)
49324 {
49325 unsigned long size = 0, resident = 0, shared = 0, text = 0, data = 0;
49326 - struct mm_struct *mm = get_task_mm(task);
49327 + struct mm_struct *mm;
49328
49329 +#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
49330 + if (current->exec_id != m->exec_id) {
49331 + gr_log_badprocpid("statm");
49332 + return 0;
49333 + }
49334 +#endif
49335 + mm = get_task_mm(task);
49336 if (mm) {
49337 size = task_statm(mm, &shared, &text, &data, &resident);
49338 mmput(mm);
49339 @@ -580,6 +648,13 @@ int proc_pid_statm(struct seq_file *m, struct pid_namespace *ns,
49340 return 0;
49341 }
49342
49343 +#ifdef CONFIG_GRKERNSEC_PROC_IPADDR
49344 +int proc_pid_ipaddr(struct task_struct *task, char *buffer)
49345 +{
49346 + return sprintf(buffer, "%pI4\n", &task->signal->curr_ip);
49347 +}
49348 +#endif
49349 +
49350 #ifdef CONFIG_CHECKPOINT_RESTORE
49351 static struct pid *
49352 get_children_pid(struct inode *inode, struct pid *pid_prev, loff_t pos)
49353 diff --git a/fs/proc/base.c b/fs/proc/base.c
49354 index 1b6c84c..66b738b 100644
49355 --- a/fs/proc/base.c
49356 +++ b/fs/proc/base.c
49357 @@ -110,6 +110,14 @@ struct pid_entry {
49358 union proc_op op;
49359 };
49360
49361 +struct getdents_callback {
49362 + struct linux_dirent __user * current_dir;
49363 + struct linux_dirent __user * previous;
49364 + struct file * file;
49365 + int count;
49366 + int error;
49367 +};
49368 +
49369 #define NOD(NAME, MODE, IOP, FOP, OP) { \
49370 .name = (NAME), \
49371 .len = sizeof(NAME) - 1, \
49372 @@ -209,6 +217,9 @@ static int proc_pid_cmdline(struct task_struct *task, char * buffer)
49373 if (!mm->arg_end)
49374 goto out_mm; /* Shh! No looking before we're done */
49375
49376 + if (gr_acl_handle_procpidmem(task))
49377 + goto out_mm;
49378 +
49379 len = mm->arg_end - mm->arg_start;
49380
49381 if (len > PAGE_SIZE)
49382 @@ -236,12 +247,28 @@ out:
49383 return res;
49384 }
49385
49386 +#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
49387 +#define PAX_RAND_FLAGS(_mm) (_mm != NULL && _mm != current->mm && \
49388 + (_mm->pax_flags & MF_PAX_RANDMMAP || \
49389 + _mm->pax_flags & MF_PAX_SEGMEXEC))
49390 +#endif
49391 +
49392 static int proc_pid_auxv(struct task_struct *task, char *buffer)
49393 {
49394 struct mm_struct *mm = mm_access(task, PTRACE_MODE_READ);
49395 int res = PTR_ERR(mm);
49396 if (mm && !IS_ERR(mm)) {
49397 unsigned int nwords = 0;
49398 +
49399 +#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
49400 + /* allow if we're currently ptracing this task */
49401 + if (PAX_RAND_FLAGS(mm) &&
49402 + (!(task->ptrace & PT_PTRACED) || (task->parent != current))) {
49403 + mmput(mm);
49404 + return 0;
49405 + }
49406 +#endif
49407 +
49408 do {
49409 nwords += 2;
49410 } while (mm->saved_auxv[nwords - 2] != 0); /* AT_NULL */
49411 @@ -255,7 +282,7 @@ static int proc_pid_auxv(struct task_struct *task, char *buffer)
49412 }
49413
49414
49415 -#ifdef CONFIG_KALLSYMS
49416 +#if defined(CONFIG_KALLSYMS) && !defined(CONFIG_GRKERNSEC_HIDESYM)
49417 /*
49418 * Provides a wchan file via kallsyms in a proper one-value-per-file format.
49419 * Returns the resolved symbol. If that fails, simply return the address.
49420 @@ -294,7 +321,7 @@ static void unlock_trace(struct task_struct *task)
49421 mutex_unlock(&task->signal->cred_guard_mutex);
49422 }
49423
49424 -#ifdef CONFIG_STACKTRACE
49425 +#if defined(CONFIG_STACKTRACE) && !defined(CONFIG_GRKERNSEC_HIDESYM)
49426
49427 #define MAX_STACK_TRACE_DEPTH 64
49428
49429 @@ -486,7 +513,7 @@ static int proc_pid_limits(struct task_struct *task, char *buffer)
49430 return count;
49431 }
49432
49433 -#ifdef CONFIG_HAVE_ARCH_TRACEHOOK
49434 +#if defined(CONFIG_HAVE_ARCH_TRACEHOOK) && !defined(CONFIG_GRKERNSEC_PROC_MEMMAP)
49435 static int proc_pid_syscall(struct task_struct *task, char *buffer)
49436 {
49437 long nr;
49438 @@ -515,7 +542,7 @@ static int proc_pid_syscall(struct task_struct *task, char *buffer)
49439 /************************************************************************/
49440
49441 /* permission checks */
49442 -static int proc_fd_access_allowed(struct inode *inode)
49443 +static int proc_fd_access_allowed(struct inode *inode, unsigned int log)
49444 {
49445 struct task_struct *task;
49446 int allowed = 0;
49447 @@ -525,7 +552,10 @@ static int proc_fd_access_allowed(struct inode *inode)
49448 */
49449 task = get_proc_task(inode);
49450 if (task) {
49451 - allowed = ptrace_may_access(task, PTRACE_MODE_READ);
49452 + if (log)
49453 + allowed = ptrace_may_access(task, PTRACE_MODE_READ);
49454 + else
49455 + allowed = ptrace_may_access(task, PTRACE_MODE_READ | PTRACE_MODE_NOAUDIT);
49456 put_task_struct(task);
49457 }
49458 return allowed;
49459 @@ -563,10 +593,35 @@ static bool has_pid_permissions(struct pid_namespace *pid,
49460 struct task_struct *task,
49461 int hide_pid_min)
49462 {
49463 + if (gr_pid_is_chrooted(task) || gr_check_hidden_task(task))
49464 + return false;
49465 +
49466 +#if defined(CONFIG_GRKERNSEC_PROC_USER) || defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
49467 + rcu_read_lock();
49468 + {
49469 + const struct cred *tmpcred = current_cred();
49470 + const struct cred *cred = __task_cred(task);
49471 +
49472 + if (!tmpcred->uid || (tmpcred->uid == cred->uid)
49473 +#ifdef CONFIG_GRKERNSEC_PROC_USERGROUP
49474 + || in_group_p(grsec_proc_gid)
49475 +#endif
49476 + ) {
49477 + rcu_read_unlock();
49478 + return true;
49479 + }
49480 + }
49481 + rcu_read_unlock();
49482 +
49483 + if (!pid->hide_pid)
49484 + return false;
49485 +#endif
49486 +
49487 if (pid->hide_pid < hide_pid_min)
49488 return true;
49489 if (in_group_p(pid->pid_gid))
49490 return true;
49491 +
49492 return ptrace_may_access(task, PTRACE_MODE_READ);
49493 }
49494
49495 @@ -584,7 +639,11 @@ static int proc_pid_permission(struct inode *inode, int mask)
49496 put_task_struct(task);
49497
49498 if (!has_perms) {
49499 +#if defined(CONFIG_GRKERNSEC_PROC_USER) || defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
49500 + {
49501 +#else
49502 if (pid->hide_pid == 2) {
49503 +#endif
49504 /*
49505 * Let's make getdents(), stat(), and open()
49506 * consistent with each other. If a process
49507 @@ -682,6 +741,11 @@ static int __mem_open(struct inode *inode, struct file *file, unsigned int mode)
49508 if (!task)
49509 return -ESRCH;
49510
49511 + if (gr_acl_handle_procpidmem(task)) {
49512 + put_task_struct(task);
49513 + return -EPERM;
49514 + }
49515 +
49516 mm = mm_access(task, mode);
49517 put_task_struct(task);
49518
49519 @@ -697,6 +761,10 @@ static int __mem_open(struct inode *inode, struct file *file, unsigned int mode)
49520
49521 file->private_data = mm;
49522
49523 +#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
49524 + file->f_version = current->exec_id;
49525 +#endif
49526 +
49527 return 0;
49528 }
49529
49530 @@ -718,6 +786,17 @@ static ssize_t mem_rw(struct file *file, char __user *buf,
49531 ssize_t copied;
49532 char *page;
49533
49534 +#ifdef CONFIG_GRKERNSEC
49535 + if (write)
49536 + return -EPERM;
49537 +#endif
49538 +#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
49539 + if (file->f_version != current->exec_id) {
49540 + gr_log_badprocpid("mem");
49541 + return 0;
49542 + }
49543 +#endif
49544 +
49545 if (!mm)
49546 return 0;
49547
49548 @@ -822,6 +901,13 @@ static ssize_t environ_read(struct file *file, char __user *buf,
49549 if (!mm)
49550 return 0;
49551
49552 +#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
49553 + if (file->f_version != current->exec_id) {
49554 + gr_log_badprocpid("environ");
49555 + return 0;
49556 + }
49557 +#endif
49558 +
49559 page = (char *)__get_free_page(GFP_TEMPORARY);
49560 if (!page)
49561 return -ENOMEM;
49562 @@ -1435,7 +1521,7 @@ static void *proc_pid_follow_link(struct dentry *dentry, struct nameidata *nd)
49563 int error = -EACCES;
49564
49565 /* Are we allowed to snoop on the tasks file descriptors? */
49566 - if (!proc_fd_access_allowed(inode))
49567 + if (!proc_fd_access_allowed(inode, 0))
49568 goto out;
49569
49570 error = PROC_I(inode)->op.proc_get_link(dentry, &path);
49571 @@ -1479,8 +1565,18 @@ static int proc_pid_readlink(struct dentry * dentry, char __user * buffer, int b
49572 struct path path;
49573
49574 /* Are we allowed to snoop on the tasks file descriptors? */
49575 - if (!proc_fd_access_allowed(inode))
49576 - goto out;
49577 + /* logging this is needed for learning on chromium to work properly,
49578 + but we don't want to flood the logs from 'ps' which does a readlink
49579 + on /proc/fd/2 of tasks in the listing, nor do we want 'ps' to learn
49580 + CAP_SYS_PTRACE as it's not necessary for its basic functionality
49581 + */
49582 + if (dentry->d_name.name[0] == '2' && dentry->d_name.name[1] == '\0') {
49583 + if (!proc_fd_access_allowed(inode,0))
49584 + goto out;
49585 + } else {
49586 + if (!proc_fd_access_allowed(inode,1))
49587 + goto out;
49588 + }
49589
49590 error = PROC_I(inode)->op.proc_get_link(dentry, &path);
49591 if (error)
49592 @@ -1545,7 +1641,11 @@ struct inode *proc_pid_make_inode(struct super_block * sb, struct task_struct *t
49593 rcu_read_lock();
49594 cred = __task_cred(task);
49595 inode->i_uid = cred->euid;
49596 +#ifdef CONFIG_GRKERNSEC_PROC_USERGROUP
49597 + inode->i_gid = grsec_proc_gid;
49598 +#else
49599 inode->i_gid = cred->egid;
49600 +#endif
49601 rcu_read_unlock();
49602 }
49603 security_task_to_inode(task, inode);
49604 @@ -1581,10 +1681,19 @@ int pid_getattr(struct vfsmount *mnt, struct dentry *dentry, struct kstat *stat)
49605 return -ENOENT;
49606 }
49607 if ((inode->i_mode == (S_IFDIR|S_IRUGO|S_IXUGO)) ||
49608 +#ifdef CONFIG_GRKERNSEC_PROC_USER
49609 + (inode->i_mode == (S_IFDIR|S_IRUSR|S_IXUSR)) ||
49610 +#elif defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
49611 + (inode->i_mode == (S_IFDIR|S_IRUSR|S_IRGRP|S_IXUSR|S_IXGRP)) ||
49612 +#endif
49613 task_dumpable(task)) {
49614 cred = __task_cred(task);
49615 stat->uid = cred->euid;
49616 +#ifdef CONFIG_GRKERNSEC_PROC_USERGROUP
49617 + stat->gid = grsec_proc_gid;
49618 +#else
49619 stat->gid = cred->egid;
49620 +#endif
49621 }
49622 }
49623 rcu_read_unlock();
49624 @@ -1622,11 +1731,20 @@ int pid_revalidate(struct dentry *dentry, unsigned int flags)
49625
49626 if (task) {
49627 if ((inode->i_mode == (S_IFDIR|S_IRUGO|S_IXUGO)) ||
49628 +#ifdef CONFIG_GRKERNSEC_PROC_USER
49629 + (inode->i_mode == (S_IFDIR|S_IRUSR|S_IXUSR)) ||
49630 +#elif defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
49631 + (inode->i_mode == (S_IFDIR|S_IRUSR|S_IRGRP|S_IXUSR|S_IXGRP)) ||
49632 +#endif
49633 task_dumpable(task)) {
49634 rcu_read_lock();
49635 cred = __task_cred(task);
49636 inode->i_uid = cred->euid;
49637 +#ifdef CONFIG_GRKERNSEC_PROC_USERGROUP
49638 + inode->i_gid = grsec_proc_gid;
49639 +#else
49640 inode->i_gid = cred->egid;
49641 +#endif
49642 rcu_read_unlock();
49643 } else {
49644 inode->i_uid = GLOBAL_ROOT_UID;
49645 @@ -1744,7 +1862,8 @@ static int proc_fd_info(struct inode *inode, struct path *path, char *info)
49646 int fd = proc_fd(inode);
49647
49648 if (task) {
49649 - files = get_files_struct(task);
49650 + if (!gr_acl_handle_procpidmem(task))
49651 + files = get_files_struct(task);
49652 put_task_struct(task);
49653 }
49654 if (files) {
49655 @@ -2343,11 +2462,21 @@ static const struct file_operations proc_map_files_operations = {
49656 */
49657 static int proc_fd_permission(struct inode *inode, int mask)
49658 {
49659 + struct task_struct *task;
49660 int rv = generic_permission(inode, mask);
49661 - if (rv == 0)
49662 - return 0;
49663 +
49664 if (task_pid(current) == proc_pid(inode))
49665 rv = 0;
49666 +
49667 + task = get_proc_task(inode);
49668 + if (task == NULL)
49669 + return rv;
49670 +
49671 + if (gr_acl_handle_procpidmem(task))
49672 + rv = -EACCES;
49673 +
49674 + put_task_struct(task);
49675 +
49676 return rv;
49677 }
49678
49679 @@ -2457,6 +2586,9 @@ static struct dentry *proc_pident_lookup(struct inode *dir,
49680 if (!task)
49681 goto out_no_task;
49682
49683 + if (gr_pid_is_chrooted(task) || gr_check_hidden_task(task))
49684 + goto out;
49685 +
49686 /*
49687 * Yes, it does not scale. And it should not. Don't add
49688 * new entries into /proc/<tgid>/ without very good reasons.
49689 @@ -2501,6 +2633,9 @@ static int proc_pident_readdir(struct file *filp,
49690 if (!task)
49691 goto out_no_task;
49692
49693 + if (gr_pid_is_chrooted(task) || gr_check_hidden_task(task))
49694 + goto out;
49695 +
49696 ret = 0;
49697 i = filp->f_pos;
49698 switch (i) {
49699 @@ -2771,7 +2906,7 @@ static void *proc_self_follow_link(struct dentry *dentry, struct nameidata *nd)
49700 static void proc_self_put_link(struct dentry *dentry, struct nameidata *nd,
49701 void *cookie)
49702 {
49703 - char *s = nd_get_link(nd);
49704 + const char *s = nd_get_link(nd);
49705 if (!IS_ERR(s))
49706 __putname(s);
49707 }
49708 @@ -3040,7 +3175,7 @@ static const struct pid_entry tgid_base_stuff[] = {
49709 REG("autogroup", S_IRUGO|S_IWUSR, proc_pid_sched_autogroup_operations),
49710 #endif
49711 REG("comm", S_IRUGO|S_IWUSR, proc_pid_set_comm_operations),
49712 -#ifdef CONFIG_HAVE_ARCH_TRACEHOOK
49713 +#if defined(CONFIG_HAVE_ARCH_TRACEHOOK) && !defined(CONFIG_GRKERNSEC_PROC_MEMMAP)
49714 INF("syscall", S_IRUGO, proc_pid_syscall),
49715 #endif
49716 INF("cmdline", S_IRUGO, proc_pid_cmdline),
49717 @@ -3065,10 +3200,10 @@ static const struct pid_entry tgid_base_stuff[] = {
49718 #ifdef CONFIG_SECURITY
49719 DIR("attr", S_IRUGO|S_IXUGO, proc_attr_dir_inode_operations, proc_attr_dir_operations),
49720 #endif
49721 -#ifdef CONFIG_KALLSYMS
49722 +#if defined(CONFIG_KALLSYMS) && !defined(CONFIG_GRKERNSEC_HIDESYM)
49723 INF("wchan", S_IRUGO, proc_pid_wchan),
49724 #endif
49725 -#ifdef CONFIG_STACKTRACE
49726 +#if defined(CONFIG_STACKTRACE) && !defined(CONFIG_GRKERNSEC_HIDESYM)
49727 ONE("stack", S_IRUGO, proc_pid_stack),
49728 #endif
49729 #ifdef CONFIG_SCHEDSTATS
49730 @@ -3102,6 +3237,9 @@ static const struct pid_entry tgid_base_stuff[] = {
49731 #ifdef CONFIG_HARDWALL
49732 INF("hardwall", S_IRUGO, proc_pid_hardwall),
49733 #endif
49734 +#ifdef CONFIG_GRKERNSEC_PROC_IPADDR
49735 + INF("ipaddr", S_IRUSR, proc_pid_ipaddr),
49736 +#endif
49737 #ifdef CONFIG_USER_NS
49738 REG("uid_map", S_IRUGO|S_IWUSR, proc_uid_map_operations),
49739 REG("gid_map", S_IRUGO|S_IWUSR, proc_gid_map_operations),
49740 @@ -3233,7 +3371,14 @@ static struct dentry *proc_pid_instantiate(struct inode *dir,
49741 if (!inode)
49742 goto out;
49743
49744 +#ifdef CONFIG_GRKERNSEC_PROC_USER
49745 + inode->i_mode = S_IFDIR|S_IRUSR|S_IXUSR;
49746 +#elif defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
49747 + inode->i_gid = grsec_proc_gid;
49748 + inode->i_mode = S_IFDIR|S_IRUSR|S_IRGRP|S_IXUSR|S_IXGRP;
49749 +#else
49750 inode->i_mode = S_IFDIR|S_IRUGO|S_IXUGO;
49751 +#endif
49752 inode->i_op = &proc_tgid_base_inode_operations;
49753 inode->i_fop = &proc_tgid_base_operations;
49754 inode->i_flags|=S_IMMUTABLE;
49755 @@ -3275,7 +3420,11 @@ struct dentry *proc_pid_lookup(struct inode *dir, struct dentry * dentry, unsign
49756 if (!task)
49757 goto out;
49758
49759 + if (gr_pid_is_chrooted(task) || gr_check_hidden_task(task))
49760 + goto out_put_task;
49761 +
49762 result = proc_pid_instantiate(dir, dentry, task, NULL);
49763 +out_put_task:
49764 put_task_struct(task);
49765 out:
49766 return result;
49767 @@ -3338,6 +3487,8 @@ static int proc_pid_fill_cache(struct file *filp, void *dirent, filldir_t filldi
49768 static int fake_filldir(void *buf, const char *name, int namelen,
49769 loff_t offset, u64 ino, unsigned d_type)
49770 {
49771 + struct getdents_callback * __buf = (struct getdents_callback *) buf;
49772 + __buf->error = -EINVAL;
49773 return 0;
49774 }
49775
49776 @@ -3404,7 +3555,7 @@ static const struct pid_entry tid_base_stuff[] = {
49777 REG("sched", S_IRUGO|S_IWUSR, proc_pid_sched_operations),
49778 #endif
49779 REG("comm", S_IRUGO|S_IWUSR, proc_pid_set_comm_operations),
49780 -#ifdef CONFIG_HAVE_ARCH_TRACEHOOK
49781 +#if defined(CONFIG_HAVE_ARCH_TRACEHOOK) && !defined(CONFIG_GRKERNSEC_PROC_MEMMAP)
49782 INF("syscall", S_IRUGO, proc_pid_syscall),
49783 #endif
49784 INF("cmdline", S_IRUGO, proc_pid_cmdline),
49785 @@ -3431,10 +3582,10 @@ static const struct pid_entry tid_base_stuff[] = {
49786 #ifdef CONFIG_SECURITY
49787 DIR("attr", S_IRUGO|S_IXUGO, proc_attr_dir_inode_operations, proc_attr_dir_operations),
49788 #endif
49789 -#ifdef CONFIG_KALLSYMS
49790 +#if defined(CONFIG_KALLSYMS) && !defined(CONFIG_GRKERNSEC_HIDESYM)
49791 INF("wchan", S_IRUGO, proc_pid_wchan),
49792 #endif
49793 -#ifdef CONFIG_STACKTRACE
49794 +#if defined(CONFIG_STACKTRACE) && !defined(CONFIG_GRKERNSEC_HIDESYM)
49795 ONE("stack", S_IRUGO, proc_pid_stack),
49796 #endif
49797 #ifdef CONFIG_SCHEDSTATS
49798 diff --git a/fs/proc/cmdline.c b/fs/proc/cmdline.c
49799 index 82676e3..5f8518a 100644
49800 --- a/fs/proc/cmdline.c
49801 +++ b/fs/proc/cmdline.c
49802 @@ -23,7 +23,11 @@ static const struct file_operations cmdline_proc_fops = {
49803
49804 static int __init proc_cmdline_init(void)
49805 {
49806 +#ifdef CONFIG_GRKERNSEC_PROC_ADD
49807 + proc_create_grsec("cmdline", 0, NULL, &cmdline_proc_fops);
49808 +#else
49809 proc_create("cmdline", 0, NULL, &cmdline_proc_fops);
49810 +#endif
49811 return 0;
49812 }
49813 module_init(proc_cmdline_init);
49814 diff --git a/fs/proc/devices.c b/fs/proc/devices.c
49815 index b143471..bb105e5 100644
49816 --- a/fs/proc/devices.c
49817 +++ b/fs/proc/devices.c
49818 @@ -64,7 +64,11 @@ static const struct file_operations proc_devinfo_operations = {
49819
49820 static int __init proc_devices_init(void)
49821 {
49822 +#ifdef CONFIG_GRKERNSEC_PROC_ADD
49823 + proc_create_grsec("devices", 0, NULL, &proc_devinfo_operations);
49824 +#else
49825 proc_create("devices", 0, NULL, &proc_devinfo_operations);
49826 +#endif
49827 return 0;
49828 }
49829 module_init(proc_devices_init);
49830 diff --git a/fs/proc/inode.c b/fs/proc/inode.c
49831 index 7ac817b..c5c9eb0 100644
49832 --- a/fs/proc/inode.c
49833 +++ b/fs/proc/inode.c
49834 @@ -21,11 +21,17 @@
49835 #include <linux/seq_file.h>
49836 #include <linux/slab.h>
49837 #include <linux/mount.h>
49838 +#include <linux/grsecurity.h>
49839
49840 #include <asm/uaccess.h>
49841
49842 #include "internal.h"
49843
49844 +#ifdef CONFIG_PROC_SYSCTL
49845 +extern const struct inode_operations proc_sys_inode_operations;
49846 +extern const struct inode_operations proc_sys_dir_operations;
49847 +#endif
49848 +
49849 static void proc_evict_inode(struct inode *inode)
49850 {
49851 struct proc_dir_entry *de;
49852 @@ -51,6 +57,13 @@ static void proc_evict_inode(struct inode *inode)
49853 ns_ops = PROC_I(inode)->ns_ops;
49854 if (ns_ops && ns_ops->put)
49855 ns_ops->put(PROC_I(inode)->ns);
49856 +
49857 +#ifdef CONFIG_PROC_SYSCTL
49858 + if (inode->i_op == &proc_sys_inode_operations ||
49859 + inode->i_op == &proc_sys_dir_operations)
49860 + gr_handle_delete(inode->i_ino, inode->i_sb->s_dev);
49861 +#endif
49862 +
49863 }
49864
49865 static struct kmem_cache * proc_inode_cachep;
49866 @@ -456,7 +469,11 @@ struct inode *proc_get_inode(struct super_block *sb, struct proc_dir_entry *de)
49867 if (de->mode) {
49868 inode->i_mode = de->mode;
49869 inode->i_uid = de->uid;
49870 +#ifdef CONFIG_GRKERNSEC_PROC_USERGROUP
49871 + inode->i_gid = grsec_proc_gid;
49872 +#else
49873 inode->i_gid = de->gid;
49874 +#endif
49875 }
49876 if (de->size)
49877 inode->i_size = de->size;
49878 diff --git a/fs/proc/internal.h b/fs/proc/internal.h
49879 index e1167a1..bd24f20 100644
49880 --- a/fs/proc/internal.h
49881 +++ b/fs/proc/internal.h
49882 @@ -52,6 +52,9 @@ extern int proc_pid_status(struct seq_file *m, struct pid_namespace *ns,
49883 struct pid *pid, struct task_struct *task);
49884 extern int proc_pid_statm(struct seq_file *m, struct pid_namespace *ns,
49885 struct pid *pid, struct task_struct *task);
49886 +#ifdef CONFIG_GRKERNSEC_PROC_IPADDR
49887 +extern int proc_pid_ipaddr(struct task_struct *task, char *buffer);
49888 +#endif
49889 extern loff_t mem_lseek(struct file *file, loff_t offset, int orig);
49890
49891 extern const struct file_operations proc_tid_children_operations;
49892 diff --git a/fs/proc/kcore.c b/fs/proc/kcore.c
49893 index 86c67ee..cdca321 100644
49894 --- a/fs/proc/kcore.c
49895 +++ b/fs/proc/kcore.c
49896 @@ -480,9 +480,10 @@ read_kcore(struct file *file, char __user *buffer, size_t buflen, loff_t *fpos)
49897 * the addresses in the elf_phdr on our list.
49898 */
49899 start = kc_offset_to_vaddr(*fpos - elf_buflen);
49900 - if ((tsz = (PAGE_SIZE - (start & ~PAGE_MASK))) > buflen)
49901 + tsz = PAGE_SIZE - (start & ~PAGE_MASK);
49902 + if (tsz > buflen)
49903 tsz = buflen;
49904 -
49905 +
49906 while (buflen) {
49907 struct kcore_list *m;
49908
49909 @@ -511,20 +512,23 @@ read_kcore(struct file *file, char __user *buffer, size_t buflen, loff_t *fpos)
49910 kfree(elf_buf);
49911 } else {
49912 if (kern_addr_valid(start)) {
49913 - unsigned long n;
49914 + char *elf_buf;
49915 + mm_segment_t oldfs;
49916
49917 - n = copy_to_user(buffer, (char *)start, tsz);
49918 - /*
49919 - * We cannot distinguish between fault on source
49920 - * and fault on destination. When this happens
49921 - * we clear too and hope it will trigger the
49922 - * EFAULT again.
49923 - */
49924 - if (n) {
49925 - if (clear_user(buffer + tsz - n,
49926 - n))
49927 + elf_buf = kmalloc(tsz, GFP_KERNEL);
49928 + if (!elf_buf)
49929 + return -ENOMEM;
49930 + oldfs = get_fs();
49931 + set_fs(KERNEL_DS);
49932 + if (!__copy_from_user(elf_buf, (const void __user *)start, tsz)) {
49933 + set_fs(oldfs);
49934 + if (copy_to_user(buffer, elf_buf, tsz)) {
49935 + kfree(elf_buf);
49936 return -EFAULT;
49937 + }
49938 }
49939 + set_fs(oldfs);
49940 + kfree(elf_buf);
49941 } else {
49942 if (clear_user(buffer, tsz))
49943 return -EFAULT;
49944 @@ -544,6 +548,9 @@ read_kcore(struct file *file, char __user *buffer, size_t buflen, loff_t *fpos)
49945
49946 static int open_kcore(struct inode *inode, struct file *filp)
49947 {
49948 +#if defined(CONFIG_GRKERNSEC_PROC_ADD) || defined(CONFIG_GRKERNSEC_HIDESYM)
49949 + return -EPERM;
49950 +#endif
49951 if (!capable(CAP_SYS_RAWIO))
49952 return -EPERM;
49953 if (kcore_need_update)
49954 diff --git a/fs/proc/meminfo.c b/fs/proc/meminfo.c
49955 index 80e4645..53e5fcf 100644
49956 --- a/fs/proc/meminfo.c
49957 +++ b/fs/proc/meminfo.c
49958 @@ -158,7 +158,7 @@ static int meminfo_proc_show(struct seq_file *m, void *v)
49959 vmi.used >> 10,
49960 vmi.largest_chunk >> 10
49961 #ifdef CONFIG_MEMORY_FAILURE
49962 - ,atomic_long_read(&mce_bad_pages) << (PAGE_SHIFT - 10)
49963 + ,atomic_long_read_unchecked(&mce_bad_pages) << (PAGE_SHIFT - 10)
49964 #endif
49965 #ifdef CONFIG_TRANSPARENT_HUGEPAGE
49966 ,K(global_page_state(NR_ANON_TRANSPARENT_HUGEPAGES) *
49967 diff --git a/fs/proc/nommu.c b/fs/proc/nommu.c
49968 index b1822dd..df622cb 100644
49969 --- a/fs/proc/nommu.c
49970 +++ b/fs/proc/nommu.c
49971 @@ -66,7 +66,7 @@ static int nommu_region_show(struct seq_file *m, struct vm_region *region)
49972 if (len < 1)
49973 len = 1;
49974 seq_printf(m, "%*c", len, ' ');
49975 - seq_path(m, &file->f_path, "");
49976 + seq_path(m, &file->f_path, "\n\\");
49977 }
49978
49979 seq_putc(m, '\n');
49980 diff --git a/fs/proc/proc_net.c b/fs/proc/proc_net.c
49981 index fe72cd0..cb9b67d 100644
49982 --- a/fs/proc/proc_net.c
49983 +++ b/fs/proc/proc_net.c
49984 @@ -23,6 +23,7 @@
49985 #include <linux/nsproxy.h>
49986 #include <net/net_namespace.h>
49987 #include <linux/seq_file.h>
49988 +#include <linux/grsecurity.h>
49989
49990 #include "internal.h"
49991
49992 @@ -105,6 +106,17 @@ static struct net *get_proc_task_net(struct inode *dir)
49993 struct task_struct *task;
49994 struct nsproxy *ns;
49995 struct net *net = NULL;
49996 +#if defined(CONFIG_GRKERNSEC_PROC_USER) || defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
49997 + const struct cred *cred = current_cred();
49998 +#endif
49999 +
50000 +#ifdef CONFIG_GRKERNSEC_PROC_USER
50001 + if (cred->fsuid)
50002 + return net;
50003 +#elif defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
50004 + if (cred->fsuid && !in_group_p(grsec_proc_gid))
50005 + return net;
50006 +#endif
50007
50008 rcu_read_lock();
50009 task = pid_task(proc_pid(dir), PIDTYPE_PID);
50010 diff --git a/fs/proc/proc_sysctl.c b/fs/proc/proc_sysctl.c
50011 index eb7cc91..7327a46 100644
50012 --- a/fs/proc/proc_sysctl.c
50013 +++ b/fs/proc/proc_sysctl.c
50014 @@ -12,11 +12,15 @@
50015 #include <linux/module.h>
50016 #include "internal.h"
50017
50018 +extern int gr_handle_chroot_sysctl(const int op);
50019 +extern int gr_handle_sysctl_mod(const char *dirname, const char *name,
50020 + const int op);
50021 +
50022 static const struct dentry_operations proc_sys_dentry_operations;
50023 static const struct file_operations proc_sys_file_operations;
50024 -static const struct inode_operations proc_sys_inode_operations;
50025 +const struct inode_operations proc_sys_inode_operations;
50026 static const struct file_operations proc_sys_dir_file_operations;
50027 -static const struct inode_operations proc_sys_dir_operations;
50028 +const struct inode_operations proc_sys_dir_operations;
50029
50030 void proc_sys_poll_notify(struct ctl_table_poll *poll)
50031 {
50032 @@ -467,6 +471,9 @@ static struct dentry *proc_sys_lookup(struct inode *dir, struct dentry *dentry,
50033
50034 err = NULL;
50035 d_set_d_op(dentry, &proc_sys_dentry_operations);
50036 +
50037 + gr_handle_proc_create(dentry, inode);
50038 +
50039 d_add(dentry, inode);
50040
50041 out:
50042 @@ -482,18 +489,20 @@ static ssize_t proc_sys_call_handler(struct file *filp, void __user *buf,
50043 struct inode *inode = filp->f_path.dentry->d_inode;
50044 struct ctl_table_header *head = grab_header(inode);
50045 struct ctl_table *table = PROC_I(inode)->sysctl_entry;
50046 + int op = write ? MAY_WRITE : MAY_READ;
50047 ssize_t error;
50048 size_t res;
50049
50050 if (IS_ERR(head))
50051 return PTR_ERR(head);
50052
50053 +
50054 /*
50055 * At this point we know that the sysctl was not unregistered
50056 * and won't be until we finish.
50057 */
50058 error = -EPERM;
50059 - if (sysctl_perm(head->root, table, write ? MAY_WRITE : MAY_READ))
50060 + if (sysctl_perm(head->root, table, op))
50061 goto out;
50062
50063 /* if that can happen at all, it should be -EINVAL, not -EISDIR */
50064 @@ -501,6 +510,22 @@ static ssize_t proc_sys_call_handler(struct file *filp, void __user *buf,
50065 if (!table->proc_handler)
50066 goto out;
50067
50068 +#ifdef CONFIG_GRKERNSEC
50069 + error = -EPERM;
50070 + if (gr_handle_chroot_sysctl(op))
50071 + goto out;
50072 + dget(filp->f_path.dentry);
50073 + if (gr_handle_sysctl_mod(filp->f_path.dentry->d_parent->d_name.name, table->procname, op)) {
50074 + dput(filp->f_path.dentry);
50075 + goto out;
50076 + }
50077 + dput(filp->f_path.dentry);
50078 + if (!gr_acl_handle_open(filp->f_path.dentry, filp->f_path.mnt, op))
50079 + goto out;
50080 + if (write && !capable(CAP_SYS_ADMIN))
50081 + goto out;
50082 +#endif
50083 +
50084 /* careful: calling conventions are nasty here */
50085 res = count;
50086 error = table->proc_handler(table, write, buf, &res, ppos);
50087 @@ -598,6 +623,9 @@ static int proc_sys_fill_cache(struct file *filp, void *dirent,
50088 return -ENOMEM;
50089 } else {
50090 d_set_d_op(child, &proc_sys_dentry_operations);
50091 +
50092 + gr_handle_proc_create(child, inode);
50093 +
50094 d_add(child, inode);
50095 }
50096 } else {
50097 @@ -641,6 +669,9 @@ static int scan(struct ctl_table_header *head, ctl_table *table,
50098 if ((*pos)++ < file->f_pos)
50099 return 0;
50100
50101 + if (!gr_acl_handle_hidden_file(file->f_path.dentry, file->f_path.mnt))
50102 + return 0;
50103 +
50104 if (unlikely(S_ISLNK(table->mode)))
50105 res = proc_sys_link_fill_cache(file, dirent, filldir, head, table);
50106 else
50107 @@ -758,6 +789,9 @@ static int proc_sys_getattr(struct vfsmount *mnt, struct dentry *dentry, struct
50108 if (IS_ERR(head))
50109 return PTR_ERR(head);
50110
50111 + if (table && !gr_acl_handle_hidden_file(dentry, mnt))
50112 + return -ENOENT;
50113 +
50114 generic_fillattr(inode, stat);
50115 if (table)
50116 stat->mode = (stat->mode & S_IFMT) | table->mode;
50117 @@ -780,13 +814,13 @@ static const struct file_operations proc_sys_dir_file_operations = {
50118 .llseek = generic_file_llseek,
50119 };
50120
50121 -static const struct inode_operations proc_sys_inode_operations = {
50122 +const struct inode_operations proc_sys_inode_operations = {
50123 .permission = proc_sys_permission,
50124 .setattr = proc_sys_setattr,
50125 .getattr = proc_sys_getattr,
50126 };
50127
50128 -static const struct inode_operations proc_sys_dir_operations = {
50129 +const struct inode_operations proc_sys_dir_operations = {
50130 .lookup = proc_sys_lookup,
50131 .permission = proc_sys_permission,
50132 .setattr = proc_sys_setattr,
50133 diff --git a/fs/proc/root.c b/fs/proc/root.c
50134 index 9a2d9fd..ddfc92a 100644
50135 --- a/fs/proc/root.c
50136 +++ b/fs/proc/root.c
50137 @@ -187,7 +187,15 @@ void __init proc_root_init(void)
50138 #ifdef CONFIG_PROC_DEVICETREE
50139 proc_device_tree_init();
50140 #endif
50141 +#ifdef CONFIG_GRKERNSEC_PROC_ADD
50142 +#ifdef CONFIG_GRKERNSEC_PROC_USER
50143 + proc_mkdir_mode("bus", S_IRUSR | S_IXUSR, NULL);
50144 +#elif defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
50145 + proc_mkdir_mode("bus", S_IRUSR | S_IXUSR | S_IRGRP | S_IXGRP, NULL);
50146 +#endif
50147 +#else
50148 proc_mkdir("bus", NULL);
50149 +#endif
50150 proc_sys_init();
50151 }
50152
50153 diff --git a/fs/proc/task_mmu.c b/fs/proc/task_mmu.c
50154 index 4540b8f..1b9772f 100644
50155 --- a/fs/proc/task_mmu.c
50156 +++ b/fs/proc/task_mmu.c
50157 @@ -11,12 +11,19 @@
50158 #include <linux/rmap.h>
50159 #include <linux/swap.h>
50160 #include <linux/swapops.h>
50161 +#include <linux/grsecurity.h>
50162
50163 #include <asm/elf.h>
50164 #include <asm/uaccess.h>
50165 #include <asm/tlbflush.h>
50166 #include "internal.h"
50167
50168 +#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
50169 +#define PAX_RAND_FLAGS(_mm) (_mm != NULL && _mm != current->mm && \
50170 + (_mm->pax_flags & MF_PAX_RANDMMAP || \
50171 + _mm->pax_flags & MF_PAX_SEGMEXEC))
50172 +#endif
50173 +
50174 void task_mem(struct seq_file *m, struct mm_struct *mm)
50175 {
50176 unsigned long data, text, lib, swap;
50177 @@ -52,8 +59,13 @@ void task_mem(struct seq_file *m, struct mm_struct *mm)
50178 "VmExe:\t%8lu kB\n"
50179 "VmLib:\t%8lu kB\n"
50180 "VmPTE:\t%8lu kB\n"
50181 - "VmSwap:\t%8lu kB\n",
50182 - hiwater_vm << (PAGE_SHIFT-10),
50183 + "VmSwap:\t%8lu kB\n"
50184 +
50185 +#ifdef CONFIG_ARCH_TRACK_EXEC_LIMIT
50186 + "CsBase:\t%8lx\nCsLim:\t%8lx\n"
50187 +#endif
50188 +
50189 + ,hiwater_vm << (PAGE_SHIFT-10),
50190 (total_vm - mm->reserved_vm) << (PAGE_SHIFT-10),
50191 mm->locked_vm << (PAGE_SHIFT-10),
50192 mm->pinned_vm << (PAGE_SHIFT-10),
50193 @@ -62,7 +74,19 @@ void task_mem(struct seq_file *m, struct mm_struct *mm)
50194 data << (PAGE_SHIFT-10),
50195 mm->stack_vm << (PAGE_SHIFT-10), text, lib,
50196 (PTRS_PER_PTE*sizeof(pte_t)*mm->nr_ptes) >> 10,
50197 - swap << (PAGE_SHIFT-10));
50198 + swap << (PAGE_SHIFT-10)
50199 +
50200 +#ifdef CONFIG_ARCH_TRACK_EXEC_LIMIT
50201 +#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
50202 + , PAX_RAND_FLAGS(mm) ? 0 : mm->context.user_cs_base
50203 + , PAX_RAND_FLAGS(mm) ? 0 : mm->context.user_cs_limit
50204 +#else
50205 + , mm->context.user_cs_base
50206 + , mm->context.user_cs_limit
50207 +#endif
50208 +#endif
50209 +
50210 + );
50211 }
50212
50213 unsigned long task_vsize(struct mm_struct *mm)
50214 @@ -231,13 +255,13 @@ show_map_vma(struct seq_file *m, struct vm_area_struct *vma, int is_pid)
50215 pgoff = ((loff_t)vma->vm_pgoff) << PAGE_SHIFT;
50216 }
50217
50218 - /* We don't show the stack guard page in /proc/maps */
50219 +#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
50220 + start = PAX_RAND_FLAGS(mm) ? 0UL : vma->vm_start;
50221 + end = PAX_RAND_FLAGS(mm) ? 0UL : vma->vm_end;
50222 +#else
50223 start = vma->vm_start;
50224 - if (stack_guard_page_start(vma, start))
50225 - start += PAGE_SIZE;
50226 end = vma->vm_end;
50227 - if (stack_guard_page_end(vma, end))
50228 - end -= PAGE_SIZE;
50229 +#endif
50230
50231 seq_printf(m, "%08lx-%08lx %c%c%c%c %08llx %02x:%02x %lu %n",
50232 start,
50233 @@ -246,7 +270,11 @@ show_map_vma(struct seq_file *m, struct vm_area_struct *vma, int is_pid)
50234 flags & VM_WRITE ? 'w' : '-',
50235 flags & VM_EXEC ? 'x' : '-',
50236 flags & VM_MAYSHARE ? 's' : 'p',
50237 +#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
50238 + PAX_RAND_FLAGS(mm) ? 0UL : pgoff,
50239 +#else
50240 pgoff,
50241 +#endif
50242 MAJOR(dev), MINOR(dev), ino, &len);
50243
50244 /*
50245 @@ -255,7 +283,7 @@ show_map_vma(struct seq_file *m, struct vm_area_struct *vma, int is_pid)
50246 */
50247 if (file) {
50248 pad_len_spaces(m, len);
50249 - seq_path(m, &file->f_path, "\n");
50250 + seq_path(m, &file->f_path, "\n\\");
50251 goto done;
50252 }
50253
50254 @@ -281,8 +309,9 @@ show_map_vma(struct seq_file *m, struct vm_area_struct *vma, int is_pid)
50255 * Thread stack in /proc/PID/task/TID/maps or
50256 * the main process stack.
50257 */
50258 - if (!is_pid || (vma->vm_start <= mm->start_stack &&
50259 - vma->vm_end >= mm->start_stack)) {
50260 + if (!is_pid || (vma->vm_flags & (VM_GROWSDOWN | VM_GROWSUP)) ||
50261 + (vma->vm_start <= mm->start_stack &&
50262 + vma->vm_end >= mm->start_stack)) {
50263 name = "[stack]";
50264 } else {
50265 /* Thread stack in /proc/PID/maps */
50266 @@ -306,6 +335,13 @@ static int show_map(struct seq_file *m, void *v, int is_pid)
50267 struct proc_maps_private *priv = m->private;
50268 struct task_struct *task = priv->task;
50269
50270 +#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
50271 + if (current->exec_id != m->exec_id) {
50272 + gr_log_badprocpid("maps");
50273 + return 0;
50274 + }
50275 +#endif
50276 +
50277 show_map_vma(m, vma, is_pid);
50278
50279 if (m->count < m->size) /* vma is copied successfully */
50280 @@ -492,12 +528,23 @@ static int show_smap(struct seq_file *m, void *v, int is_pid)
50281 .private = &mss,
50282 };
50283
50284 +#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
50285 + if (current->exec_id != m->exec_id) {
50286 + gr_log_badprocpid("smaps");
50287 + return 0;
50288 + }
50289 +#endif
50290 memset(&mss, 0, sizeof mss);
50291 - mss.vma = vma;
50292 - /* mmap_sem is held in m_start */
50293 - if (vma->vm_mm && !is_vm_hugetlb_page(vma))
50294 - walk_page_range(vma->vm_start, vma->vm_end, &smaps_walk);
50295 -
50296 +#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
50297 + if (!PAX_RAND_FLAGS(vma->vm_mm)) {
50298 +#endif
50299 + mss.vma = vma;
50300 + /* mmap_sem is held in m_start */
50301 + if (vma->vm_mm && !is_vm_hugetlb_page(vma))
50302 + walk_page_range(vma->vm_start, vma->vm_end, &smaps_walk);
50303 +#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
50304 + }
50305 +#endif
50306 show_map_vma(m, vma, is_pid);
50307
50308 seq_printf(m,
50309 @@ -515,7 +562,11 @@ static int show_smap(struct seq_file *m, void *v, int is_pid)
50310 "KernelPageSize: %8lu kB\n"
50311 "MMUPageSize: %8lu kB\n"
50312 "Locked: %8lu kB\n",
50313 +#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
50314 + PAX_RAND_FLAGS(vma->vm_mm) ? 0UL : (vma->vm_end - vma->vm_start) >> 10,
50315 +#else
50316 (vma->vm_end - vma->vm_start) >> 10,
50317 +#endif
50318 mss.resident >> 10,
50319 (unsigned long)(mss.pss >> (10 + PSS_SHIFT)),
50320 mss.shared_clean >> 10,
50321 @@ -1164,6 +1215,13 @@ static int show_numa_map(struct seq_file *m, void *v, int is_pid)
50322 int n;
50323 char buffer[50];
50324
50325 +#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
50326 + if (current->exec_id != m->exec_id) {
50327 + gr_log_badprocpid("numa_maps");
50328 + return 0;
50329 + }
50330 +#endif
50331 +
50332 if (!mm)
50333 return 0;
50334
50335 @@ -1181,11 +1239,15 @@ static int show_numa_map(struct seq_file *m, void *v, int is_pid)
50336 mpol_to_str(buffer, sizeof(buffer), pol, 0);
50337 mpol_cond_put(pol);
50338
50339 +#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
50340 + seq_printf(m, "%08lx %s", PAX_RAND_FLAGS(vma->vm_mm) ? 0UL : vma->vm_start, buffer);
50341 +#else
50342 seq_printf(m, "%08lx %s", vma->vm_start, buffer);
50343 +#endif
50344
50345 if (file) {
50346 seq_printf(m, " file=");
50347 - seq_path(m, &file->f_path, "\n\t= ");
50348 + seq_path(m, &file->f_path, "\n\t\\= ");
50349 } else if (vma->vm_start <= mm->brk && vma->vm_end >= mm->start_brk) {
50350 seq_printf(m, " heap");
50351 } else {
50352 diff --git a/fs/proc/task_nommu.c b/fs/proc/task_nommu.c
50353 index 1ccfa53..0848f95 100644
50354 --- a/fs/proc/task_nommu.c
50355 +++ b/fs/proc/task_nommu.c
50356 @@ -51,7 +51,7 @@ void task_mem(struct seq_file *m, struct mm_struct *mm)
50357 else
50358 bytes += kobjsize(mm);
50359
50360 - if (current->fs && current->fs->users > 1)
50361 + if (current->fs && atomic_read(&current->fs->users) > 1)
50362 sbytes += kobjsize(current->fs);
50363 else
50364 bytes += kobjsize(current->fs);
50365 @@ -168,7 +168,7 @@ static int nommu_vma_show(struct seq_file *m, struct vm_area_struct *vma,
50366
50367 if (file) {
50368 pad_len_spaces(m, len);
50369 - seq_path(m, &file->f_path, "");
50370 + seq_path(m, &file->f_path, "\n\\");
50371 } else if (mm) {
50372 pid_t tid = vm_is_stack(priv->task, vma, is_pid);
50373
50374 diff --git a/fs/quota/netlink.c b/fs/quota/netlink.c
50375 index d67908b..d13f6a6 100644
50376 --- a/fs/quota/netlink.c
50377 +++ b/fs/quota/netlink.c
50378 @@ -33,7 +33,7 @@ static struct genl_family quota_genl_family = {
50379 void quota_send_warning(short type, unsigned int id, dev_t dev,
50380 const char warntype)
50381 {
50382 - static atomic_t seq;
50383 + static atomic_unchecked_t seq;
50384 struct sk_buff *skb;
50385 void *msg_head;
50386 int ret;
50387 @@ -49,7 +49,7 @@ void quota_send_warning(short type, unsigned int id, dev_t dev,
50388 "VFS: Not enough memory to send quota warning.\n");
50389 return;
50390 }
50391 - msg_head = genlmsg_put(skb, 0, atomic_add_return(1, &seq),
50392 + msg_head = genlmsg_put(skb, 0, atomic_add_return_unchecked(1, &seq),
50393 &quota_genl_family, 0, QUOTA_NL_C_WARNING);
50394 if (!msg_head) {
50395 printk(KERN_ERR
50396 diff --git a/fs/readdir.c b/fs/readdir.c
50397 index 39e3370..20d446d 100644
50398 --- a/fs/readdir.c
50399 +++ b/fs/readdir.c
50400 @@ -17,6 +17,7 @@
50401 #include <linux/security.h>
50402 #include <linux/syscalls.h>
50403 #include <linux/unistd.h>
50404 +#include <linux/namei.h>
50405
50406 #include <asm/uaccess.h>
50407
50408 @@ -67,6 +68,7 @@ struct old_linux_dirent {
50409
50410 struct readdir_callback {
50411 struct old_linux_dirent __user * dirent;
50412 + struct file * file;
50413 int result;
50414 };
50415
50416 @@ -84,6 +86,10 @@ static int fillonedir(void * __buf, const char * name, int namlen, loff_t offset
50417 buf->result = -EOVERFLOW;
50418 return -EOVERFLOW;
50419 }
50420 +
50421 + if (!gr_acl_handle_filldir(buf->file, name, namlen, ino))
50422 + return 0;
50423 +
50424 buf->result++;
50425 dirent = buf->dirent;
50426 if (!access_ok(VERIFY_WRITE, dirent,
50427 @@ -116,6 +122,7 @@ SYSCALL_DEFINE3(old_readdir, unsigned int, fd,
50428
50429 buf.result = 0;
50430 buf.dirent = dirent;
50431 + buf.file = file;
50432
50433 error = vfs_readdir(file, fillonedir, &buf);
50434 if (buf.result)
50435 @@ -141,6 +148,7 @@ struct linux_dirent {
50436 struct getdents_callback {
50437 struct linux_dirent __user * current_dir;
50438 struct linux_dirent __user * previous;
50439 + struct file * file;
50440 int count;
50441 int error;
50442 };
50443 @@ -162,6 +170,10 @@ static int filldir(void * __buf, const char * name, int namlen, loff_t offset,
50444 buf->error = -EOVERFLOW;
50445 return -EOVERFLOW;
50446 }
50447 +
50448 + if (!gr_acl_handle_filldir(buf->file, name, namlen, ino))
50449 + return 0;
50450 +
50451 dirent = buf->previous;
50452 if (dirent) {
50453 if (__put_user(offset, &dirent->d_off))
50454 @@ -208,6 +220,7 @@ SYSCALL_DEFINE3(getdents, unsigned int, fd,
50455 buf.previous = NULL;
50456 buf.count = count;
50457 buf.error = 0;
50458 + buf.file = file;
50459
50460 error = vfs_readdir(file, filldir, &buf);
50461 if (error >= 0)
50462 @@ -226,6 +239,7 @@ SYSCALL_DEFINE3(getdents, unsigned int, fd,
50463 struct getdents_callback64 {
50464 struct linux_dirent64 __user * current_dir;
50465 struct linux_dirent64 __user * previous;
50466 + struct file *file;
50467 int count;
50468 int error;
50469 };
50470 @@ -241,6 +255,10 @@ static int filldir64(void * __buf, const char * name, int namlen, loff_t offset,
50471 buf->error = -EINVAL; /* only used if we fail.. */
50472 if (reclen > buf->count)
50473 return -EINVAL;
50474 +
50475 + if (!gr_acl_handle_filldir(buf->file, name, namlen, ino))
50476 + return 0;
50477 +
50478 dirent = buf->previous;
50479 if (dirent) {
50480 if (__put_user(offset, &dirent->d_off))
50481 @@ -287,6 +305,7 @@ SYSCALL_DEFINE3(getdents64, unsigned int, fd,
50482
50483 buf.current_dir = dirent;
50484 buf.previous = NULL;
50485 + buf.file = file;
50486 buf.count = count;
50487 buf.error = 0;
50488
50489 @@ -295,7 +314,7 @@ SYSCALL_DEFINE3(getdents64, unsigned int, fd,
50490 error = buf.error;
50491 lastdirent = buf.previous;
50492 if (lastdirent) {
50493 - typeof(lastdirent->d_off) d_off = file->f_pos;
50494 + typeof(((struct linux_dirent64 *)0)->d_off) d_off = file->f_pos;
50495 if (__put_user(d_off, &lastdirent->d_off))
50496 error = -EFAULT;
50497 else
50498 diff --git a/fs/reiserfs/do_balan.c b/fs/reiserfs/do_balan.c
50499 index 2b7882b..1c5ef48 100644
50500 --- a/fs/reiserfs/do_balan.c
50501 +++ b/fs/reiserfs/do_balan.c
50502 @@ -2051,7 +2051,7 @@ void do_balance(struct tree_balance *tb, /* tree_balance structure */
50503 return;
50504 }
50505
50506 - atomic_inc(&(fs_generation(tb->tb_sb)));
50507 + atomic_inc_unchecked(&(fs_generation(tb->tb_sb)));
50508 do_balance_starts(tb);
50509
50510 /* balance leaf returns 0 except if combining L R and S into
50511 diff --git a/fs/reiserfs/procfs.c b/fs/reiserfs/procfs.c
50512 index e60e870..f40ac16 100644
50513 --- a/fs/reiserfs/procfs.c
50514 +++ b/fs/reiserfs/procfs.c
50515 @@ -112,7 +112,7 @@ static int show_super(struct seq_file *m, struct super_block *sb)
50516 "SMALL_TAILS " : "NO_TAILS ",
50517 replay_only(sb) ? "REPLAY_ONLY " : "",
50518 convert_reiserfs(sb) ? "CONV " : "",
50519 - atomic_read(&r->s_generation_counter),
50520 + atomic_read_unchecked(&r->s_generation_counter),
50521 SF(s_disk_reads), SF(s_disk_writes), SF(s_fix_nodes),
50522 SF(s_do_balance), SF(s_unneeded_left_neighbor),
50523 SF(s_good_search_by_key_reada), SF(s_bmaps),
50524 diff --git a/fs/reiserfs/reiserfs.h b/fs/reiserfs/reiserfs.h
50525 index 33215f5..c5d427a 100644
50526 --- a/fs/reiserfs/reiserfs.h
50527 +++ b/fs/reiserfs/reiserfs.h
50528 @@ -453,7 +453,7 @@ struct reiserfs_sb_info {
50529 /* Comment? -Hans */
50530 wait_queue_head_t s_wait;
50531 /* To be obsoleted soon by per buffer seals.. -Hans */
50532 - atomic_t s_generation_counter; // increased by one every time the
50533 + atomic_unchecked_t s_generation_counter; // increased by one every time the
50534 // tree gets re-balanced
50535 unsigned long s_properties; /* File system properties. Currently holds
50536 on-disk FS format */
50537 @@ -1978,7 +1978,7 @@ static inline loff_t max_reiserfs_offset(struct inode *inode)
50538 #define REISERFS_USER_MEM 1 /* reiserfs user memory mode */
50539
50540 #define fs_generation(s) (REISERFS_SB(s)->s_generation_counter)
50541 -#define get_generation(s) atomic_read (&fs_generation(s))
50542 +#define get_generation(s) atomic_read_unchecked (&fs_generation(s))
50543 #define FILESYSTEM_CHANGED_TB(tb) (get_generation((tb)->tb_sb) != (tb)->fs_gen)
50544 #define __fs_changed(gen,s) (gen != get_generation (s))
50545 #define fs_changed(gen,s) \
50546 diff --git a/fs/select.c b/fs/select.c
50547 index db14c78..3aae1bd 100644
50548 --- a/fs/select.c
50549 +++ b/fs/select.c
50550 @@ -20,6 +20,7 @@
50551 #include <linux/export.h>
50552 #include <linux/slab.h>
50553 #include <linux/poll.h>
50554 +#include <linux/security.h>
50555 #include <linux/personality.h> /* for STICKY_TIMEOUTS */
50556 #include <linux/file.h>
50557 #include <linux/fdtable.h>
50558 @@ -831,6 +832,7 @@ int do_sys_poll(struct pollfd __user *ufds, unsigned int nfds,
50559 struct poll_list *walk = head;
50560 unsigned long todo = nfds;
50561
50562 + gr_learn_resource(current, RLIMIT_NOFILE, nfds, 1);
50563 if (nfds > rlimit(RLIMIT_NOFILE))
50564 return -EINVAL;
50565
50566 diff --git a/fs/seq_file.c b/fs/seq_file.c
50567 index 14cf9de..adc4d5b 100644
50568 --- a/fs/seq_file.c
50569 +++ b/fs/seq_file.c
50570 @@ -9,6 +9,7 @@
50571 #include <linux/export.h>
50572 #include <linux/seq_file.h>
50573 #include <linux/slab.h>
50574 +#include <linux/sched.h>
50575
50576 #include <asm/uaccess.h>
50577 #include <asm/page.h>
50578 @@ -56,6 +57,9 @@ int seq_open(struct file *file, const struct seq_operations *op)
50579 memset(p, 0, sizeof(*p));
50580 mutex_init(&p->lock);
50581 p->op = op;
50582 +#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
50583 + p->exec_id = current->exec_id;
50584 +#endif
50585
50586 /*
50587 * Wrappers around seq_open(e.g. swaps_open) need to be
50588 @@ -92,7 +96,7 @@ static int traverse(struct seq_file *m, loff_t offset)
50589 return 0;
50590 }
50591 if (!m->buf) {
50592 - m->buf = kmalloc(m->size = PAGE_SIZE, GFP_KERNEL);
50593 + m->buf = kmalloc(m->size = PAGE_SIZE, GFP_KERNEL | GFP_USERCOPY);
50594 if (!m->buf)
50595 return -ENOMEM;
50596 }
50597 @@ -132,7 +136,7 @@ static int traverse(struct seq_file *m, loff_t offset)
50598 Eoverflow:
50599 m->op->stop(m, p);
50600 kfree(m->buf);
50601 - m->buf = kmalloc(m->size <<= 1, GFP_KERNEL);
50602 + m->buf = kmalloc(m->size <<= 1, GFP_KERNEL | GFP_USERCOPY);
50603 return !m->buf ? -ENOMEM : -EAGAIN;
50604 }
50605
50606 @@ -187,7 +191,7 @@ ssize_t seq_read(struct file *file, char __user *buf, size_t size, loff_t *ppos)
50607
50608 /* grab buffer if we didn't have one */
50609 if (!m->buf) {
50610 - m->buf = kmalloc(m->size = PAGE_SIZE, GFP_KERNEL);
50611 + m->buf = kmalloc(m->size = PAGE_SIZE, GFP_KERNEL | GFP_USERCOPY);
50612 if (!m->buf)
50613 goto Enomem;
50614 }
50615 @@ -228,7 +232,7 @@ ssize_t seq_read(struct file *file, char __user *buf, size_t size, loff_t *ppos)
50616 goto Fill;
50617 m->op->stop(m, p);
50618 kfree(m->buf);
50619 - m->buf = kmalloc(m->size <<= 1, GFP_KERNEL);
50620 + m->buf = kmalloc(m->size <<= 1, GFP_KERNEL | GFP_USERCOPY);
50621 if (!m->buf)
50622 goto Enomem;
50623 m->count = 0;
50624 @@ -577,7 +581,7 @@ static void single_stop(struct seq_file *p, void *v)
50625 int single_open(struct file *file, int (*show)(struct seq_file *, void *),
50626 void *data)
50627 {
50628 - struct seq_operations *op = kmalloc(sizeof(*op), GFP_KERNEL);
50629 + seq_operations_no_const *op = kmalloc(sizeof(*op), GFP_KERNEL);
50630 int res = -ENOMEM;
50631
50632 if (op) {
50633 diff --git a/fs/splice.c b/fs/splice.c
50634 index 41514dd..6564a93 100644
50635 --- a/fs/splice.c
50636 +++ b/fs/splice.c
50637 @@ -194,7 +194,7 @@ ssize_t splice_to_pipe(struct pipe_inode_info *pipe,
50638 pipe_lock(pipe);
50639
50640 for (;;) {
50641 - if (!pipe->readers) {
50642 + if (!atomic_read(&pipe->readers)) {
50643 send_sig(SIGPIPE, current, 0);
50644 if (!ret)
50645 ret = -EPIPE;
50646 @@ -248,9 +248,9 @@ ssize_t splice_to_pipe(struct pipe_inode_info *pipe,
50647 do_wakeup = 0;
50648 }
50649
50650 - pipe->waiting_writers++;
50651 + atomic_inc(&pipe->waiting_writers);
50652 pipe_wait(pipe);
50653 - pipe->waiting_writers--;
50654 + atomic_dec(&pipe->waiting_writers);
50655 }
50656
50657 pipe_unlock(pipe);
50658 @@ -563,7 +563,7 @@ static ssize_t kernel_readv(struct file *file, const struct iovec *vec,
50659 old_fs = get_fs();
50660 set_fs(get_ds());
50661 /* The cast to a user pointer is valid due to the set_fs() */
50662 - res = vfs_readv(file, (const struct iovec __user *)vec, vlen, &pos);
50663 + res = vfs_readv(file, (const struct iovec __force_user *)vec, vlen, &pos);
50664 set_fs(old_fs);
50665
50666 return res;
50667 @@ -578,7 +578,7 @@ static ssize_t kernel_write(struct file *file, const char *buf, size_t count,
50668 old_fs = get_fs();
50669 set_fs(get_ds());
50670 /* The cast to a user pointer is valid due to the set_fs() */
50671 - res = vfs_write(file, (const char __user *)buf, count, &pos);
50672 + res = vfs_write(file, (const char __force_user *)buf, count, &pos);
50673 set_fs(old_fs);
50674
50675 return res;
50676 @@ -630,7 +630,7 @@ ssize_t default_file_splice_read(struct file *in, loff_t *ppos,
50677 goto err;
50678
50679 this_len = min_t(size_t, len, PAGE_CACHE_SIZE - offset);
50680 - vec[i].iov_base = (void __user *) page_address(page);
50681 + vec[i].iov_base = (void __force_user *) page_address(page);
50682 vec[i].iov_len = this_len;
50683 spd.pages[i] = page;
50684 spd.nr_pages++;
50685 @@ -849,10 +849,10 @@ EXPORT_SYMBOL(splice_from_pipe_feed);
50686 int splice_from_pipe_next(struct pipe_inode_info *pipe, struct splice_desc *sd)
50687 {
50688 while (!pipe->nrbufs) {
50689 - if (!pipe->writers)
50690 + if (!atomic_read(&pipe->writers))
50691 return 0;
50692
50693 - if (!pipe->waiting_writers && sd->num_spliced)
50694 + if (!atomic_read(&pipe->waiting_writers) && sd->num_spliced)
50695 return 0;
50696
50697 if (sd->flags & SPLICE_F_NONBLOCK)
50698 @@ -1190,7 +1190,7 @@ ssize_t splice_direct_to_actor(struct file *in, struct splice_desc *sd,
50699 * out of the pipe right after the splice_to_pipe(). So set
50700 * PIPE_READERS appropriately.
50701 */
50702 - pipe->readers = 1;
50703 + atomic_set(&pipe->readers, 1);
50704
50705 current->splice_pipe = pipe;
50706 }
50707 @@ -1743,9 +1743,9 @@ static int ipipe_prep(struct pipe_inode_info *pipe, unsigned int flags)
50708 ret = -ERESTARTSYS;
50709 break;
50710 }
50711 - if (!pipe->writers)
50712 + if (!atomic_read(&pipe->writers))
50713 break;
50714 - if (!pipe->waiting_writers) {
50715 + if (!atomic_read(&pipe->waiting_writers)) {
50716 if (flags & SPLICE_F_NONBLOCK) {
50717 ret = -EAGAIN;
50718 break;
50719 @@ -1777,7 +1777,7 @@ static int opipe_prep(struct pipe_inode_info *pipe, unsigned int flags)
50720 pipe_lock(pipe);
50721
50722 while (pipe->nrbufs >= pipe->buffers) {
50723 - if (!pipe->readers) {
50724 + if (!atomic_read(&pipe->readers)) {
50725 send_sig(SIGPIPE, current, 0);
50726 ret = -EPIPE;
50727 break;
50728 @@ -1790,9 +1790,9 @@ static int opipe_prep(struct pipe_inode_info *pipe, unsigned int flags)
50729 ret = -ERESTARTSYS;
50730 break;
50731 }
50732 - pipe->waiting_writers++;
50733 + atomic_inc(&pipe->waiting_writers);
50734 pipe_wait(pipe);
50735 - pipe->waiting_writers--;
50736 + atomic_dec(&pipe->waiting_writers);
50737 }
50738
50739 pipe_unlock(pipe);
50740 @@ -1828,14 +1828,14 @@ retry:
50741 pipe_double_lock(ipipe, opipe);
50742
50743 do {
50744 - if (!opipe->readers) {
50745 + if (!atomic_read(&opipe->readers)) {
50746 send_sig(SIGPIPE, current, 0);
50747 if (!ret)
50748 ret = -EPIPE;
50749 break;
50750 }
50751
50752 - if (!ipipe->nrbufs && !ipipe->writers)
50753 + if (!ipipe->nrbufs && !atomic_read(&ipipe->writers))
50754 break;
50755
50756 /*
50757 @@ -1932,7 +1932,7 @@ static int link_pipe(struct pipe_inode_info *ipipe,
50758 pipe_double_lock(ipipe, opipe);
50759
50760 do {
50761 - if (!opipe->readers) {
50762 + if (!atomic_read(&opipe->readers)) {
50763 send_sig(SIGPIPE, current, 0);
50764 if (!ret)
50765 ret = -EPIPE;
50766 @@ -1977,7 +1977,7 @@ static int link_pipe(struct pipe_inode_info *ipipe,
50767 * return EAGAIN if we have the potential of some data in the
50768 * future, otherwise just return 0
50769 */
50770 - if (!ret && ipipe->waiting_writers && (flags & SPLICE_F_NONBLOCK))
50771 + if (!ret && atomic_read(&ipipe->waiting_writers) && (flags & SPLICE_F_NONBLOCK))
50772 ret = -EAGAIN;
50773
50774 pipe_unlock(ipipe);
50775 diff --git a/fs/sysfs/dir.c b/fs/sysfs/dir.c
50776 index 2fbdff6..5530a61 100644
50777 --- a/fs/sysfs/dir.c
50778 +++ b/fs/sysfs/dir.c
50779 @@ -685,6 +685,18 @@ static int create_dir(struct kobject *kobj, struct sysfs_dirent *parent_sd,
50780 struct sysfs_dirent *sd;
50781 int rc;
50782
50783 +#ifdef CONFIG_GRKERNSEC_SYSFS_RESTRICT
50784 + const char *parent_name = parent_sd->s_name;
50785 +
50786 + mode = S_IFDIR | S_IRWXU;
50787 +
50788 + if ((!strcmp(parent_name, "") && (!strcmp(name, "devices") || !strcmp(name, "fs"))) ||
50789 + (!strcmp(parent_name, "devices") && !strcmp(name, "system")) ||
50790 + (!strcmp(parent_name, "fs") && (!strcmp(name, "selinux") || !strcmp(name, "fuse"))) ||
50791 + (!strcmp(parent_name, "system") && !strcmp(name, "cpu")))
50792 + mode = S_IFDIR | S_IRWXU | S_IRUGO | S_IXUGO;
50793 +#endif
50794 +
50795 /* allocate */
50796 sd = sysfs_new_dirent(name, mode, SYSFS_DIR);
50797 if (!sd)
50798 diff --git a/fs/sysfs/file.c b/fs/sysfs/file.c
50799 index 00012e3..8392349 100644
50800 --- a/fs/sysfs/file.c
50801 +++ b/fs/sysfs/file.c
50802 @@ -37,7 +37,7 @@ static DEFINE_SPINLOCK(sysfs_open_dirent_lock);
50803
50804 struct sysfs_open_dirent {
50805 atomic_t refcnt;
50806 - atomic_t event;
50807 + atomic_unchecked_t event;
50808 wait_queue_head_t poll;
50809 struct list_head buffers; /* goes through sysfs_buffer.list */
50810 };
50811 @@ -81,7 +81,7 @@ static int fill_read_buffer(struct dentry * dentry, struct sysfs_buffer * buffer
50812 if (!sysfs_get_active(attr_sd))
50813 return -ENODEV;
50814
50815 - buffer->event = atomic_read(&attr_sd->s_attr.open->event);
50816 + buffer->event = atomic_read_unchecked(&attr_sd->s_attr.open->event);
50817 count = ops->show(kobj, attr_sd->s_attr.attr, buffer->page);
50818
50819 sysfs_put_active(attr_sd);
50820 @@ -287,7 +287,7 @@ static int sysfs_get_open_dirent(struct sysfs_dirent *sd,
50821 return -ENOMEM;
50822
50823 atomic_set(&new_od->refcnt, 0);
50824 - atomic_set(&new_od->event, 1);
50825 + atomic_set_unchecked(&new_od->event, 1);
50826 init_waitqueue_head(&new_od->poll);
50827 INIT_LIST_HEAD(&new_od->buffers);
50828 goto retry;
50829 @@ -432,7 +432,7 @@ static unsigned int sysfs_poll(struct file *filp, poll_table *wait)
50830
50831 sysfs_put_active(attr_sd);
50832
50833 - if (buffer->event != atomic_read(&od->event))
50834 + if (buffer->event != atomic_read_unchecked(&od->event))
50835 goto trigger;
50836
50837 return DEFAULT_POLLMASK;
50838 @@ -451,7 +451,7 @@ void sysfs_notify_dirent(struct sysfs_dirent *sd)
50839
50840 od = sd->s_attr.open;
50841 if (od) {
50842 - atomic_inc(&od->event);
50843 + atomic_inc_unchecked(&od->event);
50844 wake_up_interruptible(&od->poll);
50845 }
50846
50847 diff --git a/fs/sysfs/symlink.c b/fs/sysfs/symlink.c
50848 index a7ac78f..02158e1 100644
50849 --- a/fs/sysfs/symlink.c
50850 +++ b/fs/sysfs/symlink.c
50851 @@ -286,7 +286,7 @@ static void *sysfs_follow_link(struct dentry *dentry, struct nameidata *nd)
50852
50853 static void sysfs_put_link(struct dentry *dentry, struct nameidata *nd, void *cookie)
50854 {
50855 - char *page = nd_get_link(nd);
50856 + const char *page = nd_get_link(nd);
50857 if (!IS_ERR(page))
50858 free_page((unsigned long)page);
50859 }
50860 diff --git a/fs/udf/misc.c b/fs/udf/misc.c
50861 index c175b4d..8f36a16 100644
50862 --- a/fs/udf/misc.c
50863 +++ b/fs/udf/misc.c
50864 @@ -289,7 +289,7 @@ void udf_new_tag(char *data, uint16_t ident, uint16_t version, uint16_t snum,
50865
50866 u8 udf_tag_checksum(const struct tag *t)
50867 {
50868 - u8 *data = (u8 *)t;
50869 + const u8 *data = (const u8 *)t;
50870 u8 checksum = 0;
50871 int i;
50872 for (i = 0; i < sizeof(struct tag); ++i)
50873 diff --git a/fs/utimes.c b/fs/utimes.c
50874 index fa4dbe4..e12d1b9 100644
50875 --- a/fs/utimes.c
50876 +++ b/fs/utimes.c
50877 @@ -1,6 +1,7 @@
50878 #include <linux/compiler.h>
50879 #include <linux/file.h>
50880 #include <linux/fs.h>
50881 +#include <linux/security.h>
50882 #include <linux/linkage.h>
50883 #include <linux/mount.h>
50884 #include <linux/namei.h>
50885 @@ -101,6 +102,12 @@ static int utimes_common(struct path *path, struct timespec *times)
50886 goto mnt_drop_write_and_out;
50887 }
50888 }
50889 +
50890 + if (!gr_acl_handle_utime(path->dentry, path->mnt)) {
50891 + error = -EACCES;
50892 + goto mnt_drop_write_and_out;
50893 + }
50894 +
50895 mutex_lock(&inode->i_mutex);
50896 error = notify_change(path->dentry, &newattrs);
50897 mutex_unlock(&inode->i_mutex);
50898 diff --git a/fs/xattr.c b/fs/xattr.c
50899 index 4d45b71..2ec08e10 100644
50900 --- a/fs/xattr.c
50901 +++ b/fs/xattr.c
50902 @@ -316,7 +316,7 @@ EXPORT_SYMBOL_GPL(vfs_removexattr);
50903 * Extended attribute SET operations
50904 */
50905 static long
50906 -setxattr(struct dentry *d, const char __user *name, const void __user *value,
50907 +setxattr(struct path *path, const char __user *name, const void __user *value,
50908 size_t size, int flags)
50909 {
50910 int error;
50911 @@ -349,7 +349,12 @@ setxattr(struct dentry *d, const char __user *name, const void __user *value,
50912 }
50913 }
50914
50915 - error = vfs_setxattr(d, kname, kvalue, size, flags);
50916 + if (!gr_acl_handle_setxattr(path->dentry, path->mnt)) {
50917 + error = -EACCES;
50918 + goto out;
50919 + }
50920 +
50921 + error = vfs_setxattr(path->dentry, kname, kvalue, size, flags);
50922 out:
50923 if (vvalue)
50924 vfree(vvalue);
50925 @@ -370,7 +375,7 @@ SYSCALL_DEFINE5(setxattr, const char __user *, pathname,
50926 return error;
50927 error = mnt_want_write(path.mnt);
50928 if (!error) {
50929 - error = setxattr(path.dentry, name, value, size, flags);
50930 + error = setxattr(&path, name, value, size, flags);
50931 mnt_drop_write(path.mnt);
50932 }
50933 path_put(&path);
50934 @@ -389,7 +394,7 @@ SYSCALL_DEFINE5(lsetxattr, const char __user *, pathname,
50935 return error;
50936 error = mnt_want_write(path.mnt);
50937 if (!error) {
50938 - error = setxattr(path.dentry, name, value, size, flags);
50939 + error = setxattr(&path, name, value, size, flags);
50940 mnt_drop_write(path.mnt);
50941 }
50942 path_put(&path);
50943 @@ -401,17 +406,15 @@ SYSCALL_DEFINE5(fsetxattr, int, fd, const char __user *, name,
50944 {
50945 int fput_needed;
50946 struct file *f;
50947 - struct dentry *dentry;
50948 int error = -EBADF;
50949
50950 f = fget_light(fd, &fput_needed);
50951 if (!f)
50952 return error;
50953 - dentry = f->f_path.dentry;
50954 - audit_inode(NULL, dentry);
50955 + audit_inode(NULL, f->f_path.dentry);
50956 error = mnt_want_write_file(f);
50957 if (!error) {
50958 - error = setxattr(dentry, name, value, size, flags);
50959 + error = setxattr(&f->f_path, name, value, size, flags);
50960 mnt_drop_write_file(f);
50961 }
50962 fput_light(f, fput_needed);
50963 diff --git a/fs/xattr_acl.c b/fs/xattr_acl.c
50964 index 69d06b0..c0996e5 100644
50965 --- a/fs/xattr_acl.c
50966 +++ b/fs/xattr_acl.c
50967 @@ -17,8 +17,8 @@
50968 struct posix_acl *
50969 posix_acl_from_xattr(const void *value, size_t size)
50970 {
50971 - posix_acl_xattr_header *header = (posix_acl_xattr_header *)value;
50972 - posix_acl_xattr_entry *entry = (posix_acl_xattr_entry *)(header+1), *end;
50973 + const posix_acl_xattr_header *header = (const posix_acl_xattr_header *)value;
50974 + const posix_acl_xattr_entry *entry = (const posix_acl_xattr_entry *)(header+1), *end;
50975 int count;
50976 struct posix_acl *acl;
50977 struct posix_acl_entry *acl_e;
50978 diff --git a/fs/xfs/xfs_bmap.c b/fs/xfs/xfs_bmap.c
50979 index 848ffa7..1f249bf 100644
50980 --- a/fs/xfs/xfs_bmap.c
50981 +++ b/fs/xfs/xfs_bmap.c
50982 @@ -189,7 +189,7 @@ xfs_bmap_validate_ret(
50983 int nmap,
50984 int ret_nmap);
50985 #else
50986 -#define xfs_bmap_validate_ret(bno,len,flags,mval,onmap,nmap)
50987 +#define xfs_bmap_validate_ret(bno,len,flags,mval,onmap,nmap) do {} while (0)
50988 #endif /* DEBUG */
50989
50990 STATIC int
50991 diff --git a/fs/xfs/xfs_dir2_sf.c b/fs/xfs/xfs_dir2_sf.c
50992 index 1b9fc3e..e1bdde0 100644
50993 --- a/fs/xfs/xfs_dir2_sf.c
50994 +++ b/fs/xfs/xfs_dir2_sf.c
50995 @@ -851,7 +851,15 @@ xfs_dir2_sf_getdents(
50996 }
50997
50998 ino = xfs_dir2_sfe_get_ino(sfp, sfep);
50999 - if (filldir(dirent, (char *)sfep->name, sfep->namelen,
51000 + if (dp->i_df.if_u1.if_data == dp->i_df.if_u2.if_inline_data) {
51001 + char name[sfep->namelen];
51002 + memcpy(name, sfep->name, sfep->namelen);
51003 + if (filldir(dirent, name, sfep->namelen,
51004 + off & 0x7fffffff, ino, DT_UNKNOWN)) {
51005 + *offset = off & 0x7fffffff;
51006 + return 0;
51007 + }
51008 + } else if (filldir(dirent, (char *)sfep->name, sfep->namelen,
51009 off & 0x7fffffff, ino, DT_UNKNOWN)) {
51010 *offset = off & 0x7fffffff;
51011 return 0;
51012 diff --git a/fs/xfs/xfs_ioctl.c b/fs/xfs/xfs_ioctl.c
51013 index 0e0232c..fa5c3fe 100644
51014 --- a/fs/xfs/xfs_ioctl.c
51015 +++ b/fs/xfs/xfs_ioctl.c
51016 @@ -126,7 +126,7 @@ xfs_find_handle(
51017 }
51018
51019 error = -EFAULT;
51020 - if (copy_to_user(hreq->ohandle, &handle, hsize) ||
51021 + if (hsize > sizeof handle || copy_to_user(hreq->ohandle, &handle, hsize) ||
51022 copy_to_user(hreq->ohandlen, &hsize, sizeof(__s32)))
51023 goto out_put;
51024
51025 diff --git a/fs/xfs/xfs_iops.c b/fs/xfs/xfs_iops.c
51026 index 4e00cf0..3374374 100644
51027 --- a/fs/xfs/xfs_iops.c
51028 +++ b/fs/xfs/xfs_iops.c
51029 @@ -394,7 +394,7 @@ xfs_vn_put_link(
51030 struct nameidata *nd,
51031 void *p)
51032 {
51033 - char *s = nd_get_link(nd);
51034 + const char *s = nd_get_link(nd);
51035
51036 if (!IS_ERR(s))
51037 kfree(s);
51038 diff --git a/grsecurity/Kconfig b/grsecurity/Kconfig
51039 new file mode 100644
51040 index 0000000..10c36fb
51041 --- /dev/null
51042 +++ b/grsecurity/Kconfig
51043 @@ -0,0 +1,964 @@
51044 +#
51045 +# grecurity configuration
51046 +#
51047 +menu "Memory Protections"
51048 +depends on GRKERNSEC
51049 +
51050 +config GRKERNSEC_KMEM
51051 + bool "Deny reading/writing to /dev/kmem, /dev/mem, and /dev/port"
51052 + default y if GRKERNSEC_CONFIG_AUTO
51053 + select STRICT_DEVMEM if (X86 || ARM || TILE || S390)
51054 + help
51055 + If you say Y here, /dev/kmem and /dev/mem won't be allowed to
51056 + be written to or read from to modify or leak the contents of the running
51057 + kernel. /dev/port will also not be allowed to be opened. If you have module
51058 + support disabled, enabling this will close up four ways that are
51059 + currently used to insert malicious code into the running kernel.
51060 + Even with all these features enabled, we still highly recommend that
51061 + you use the RBAC system, as it is still possible for an attacker to
51062 + modify the running kernel through privileged I/O granted by ioperm/iopl.
51063 + If you are not using XFree86, you may be able to stop this additional
51064 + case by enabling the 'Disable privileged I/O' option. Though nothing
51065 + legitimately writes to /dev/kmem, XFree86 does need to write to /dev/mem,
51066 + but only to video memory, which is the only writing we allow in this
51067 + case. If /dev/kmem or /dev/mem are mmaped without PROT_WRITE, they will
51068 + not be allowed to mprotect it with PROT_WRITE later.
51069 + It is highly recommended that you say Y here if you meet all the
51070 + conditions above.
51071 +
51072 +config GRKERNSEC_VM86
51073 + bool "Restrict VM86 mode"
51074 + default y if (GRKERNSEC_CONFIG_AUTO && GRKERNSEC_CONFIG_SERVER)
51075 + depends on X86_32
51076 +
51077 + help
51078 + If you say Y here, only processes with CAP_SYS_RAWIO will be able to
51079 + make use of a special execution mode on 32bit x86 processors called
51080 + Virtual 8086 (VM86) mode. XFree86 may need vm86 mode for certain
51081 + video cards and will still work with this option enabled. The purpose
51082 + of the option is to prevent exploitation of emulation errors in
51083 + virtualization of vm86 mode like the one discovered in VMWare in 2009.
51084 + Nearly all users should be able to enable this option.
51085 +
51086 +config GRKERNSEC_IO
51087 + bool "Disable privileged I/O"
51088 + default y if (GRKERNSEC_CONFIG_AUTO && GRKERNSEC_CONFIG_SERVER)
51089 + depends on X86
51090 + select RTC_CLASS
51091 + select RTC_INTF_DEV
51092 + select RTC_DRV_CMOS
51093 +
51094 + help
51095 + If you say Y here, all ioperm and iopl calls will return an error.
51096 + Ioperm and iopl can be used to modify the running kernel.
51097 + Unfortunately, some programs need this access to operate properly,
51098 + the most notable of which are XFree86 and hwclock. hwclock can be
51099 + remedied by having RTC support in the kernel, so real-time
51100 + clock support is enabled if this option is enabled, to ensure
51101 + that hwclock operates correctly. XFree86 still will not
51102 + operate correctly with this option enabled, so DO NOT CHOOSE Y
51103 + IF YOU USE XFree86. If you use XFree86 and you still want to
51104 + protect your kernel against modification, use the RBAC system.
51105 +
51106 +config GRKERNSEC_JIT_HARDEN
51107 + bool "Harden BPF JIT against spray attacks"
51108 + default y if GRKERNSEC_CONFIG_AUTO
51109 + depends on BPF_JIT
51110 + help
51111 + If you say Y here, the native code generated by the kernel's Berkeley
51112 + Packet Filter (BPF) JIT engine will be hardened against JIT-spraying
51113 + attacks that attempt to fit attacker-beneficial instructions in
51114 + 32bit immediate fields of JIT-generated native instructions. The
51115 + attacker will generally aim to cause an unintended instruction sequence
51116 + of JIT-generated native code to execute by jumping into the middle of
51117 + a generated instruction. This feature effectively randomizes the 32bit
51118 + immediate constants present in the generated code to thwart such attacks.
51119 +
51120 + If you're using KERNEXEC, it's recommended that you enable this option
51121 + to supplement the hardening of the kernel.
51122 +
51123 +config GRKERNSEC_PROC_MEMMAP
51124 + bool "Harden ASLR against information leaks and entropy reduction"
51125 + default y if (GRKERNSEC_CONFIG_AUTO || PAX_NOEXEC || PAX_ASLR)
51126 + depends on PAX_NOEXEC || PAX_ASLR
51127 + help
51128 + If you say Y here, the /proc/<pid>/maps and /proc/<pid>/stat files will
51129 + give no information about the addresses of its mappings if
51130 + PaX features that rely on random addresses are enabled on the task.
51131 + In addition to sanitizing this information and disabling other
51132 + dangerous sources of information, this option causes reads of sensitive
51133 + /proc/<pid> entries where the file descriptor was opened in a different
51134 + task than the one performing the read. Such attempts are logged.
51135 + This option also limits argv/env strings for suid/sgid binaries
51136 + to 512KB to prevent a complete exhaustion of the stack entropy provided
51137 + by ASLR. Finally, it places an 8MB stack resource limit on suid/sgid
51138 + binaries to prevent alternative mmap layouts from being abused.
51139 +
51140 + If you use PaX it is essential that you say Y here as it closes up
51141 + several holes that make full ASLR useless locally.
51142 +
51143 +config GRKERNSEC_BRUTE
51144 + bool "Deter exploit bruteforcing"
51145 + default y if GRKERNSEC_CONFIG_AUTO
51146 + help
51147 + If you say Y here, attempts to bruteforce exploits against forking
51148 + daemons such as apache or sshd, as well as against suid/sgid binaries
51149 + will be deterred. When a child of a forking daemon is killed by PaX
51150 + or crashes due to an illegal instruction or other suspicious signal,
51151 + the parent process will be delayed 30 seconds upon every subsequent
51152 + fork until the administrator is able to assess the situation and
51153 + restart the daemon.
51154 + In the suid/sgid case, the attempt is logged, the user has all their
51155 + processes terminated, and they are prevented from executing any further
51156 + processes for 15 minutes.
51157 + It is recommended that you also enable signal logging in the auditing
51158 + section so that logs are generated when a process triggers a suspicious
51159 + signal.
51160 + If the sysctl option is enabled, a sysctl option with name
51161 + "deter_bruteforce" is created.
51162 +
51163 +
51164 +config GRKERNSEC_MODHARDEN
51165 + bool "Harden module auto-loading"
51166 + default y if GRKERNSEC_CONFIG_AUTO
51167 + depends on MODULES
51168 + help
51169 + If you say Y here, module auto-loading in response to use of some
51170 + feature implemented by an unloaded module will be restricted to
51171 + root users. Enabling this option helps defend against attacks
51172 + by unprivileged users who abuse the auto-loading behavior to
51173 + cause a vulnerable module to load that is then exploited.
51174 +
51175 + If this option prevents a legitimate use of auto-loading for a
51176 + non-root user, the administrator can execute modprobe manually
51177 + with the exact name of the module mentioned in the alert log.
51178 + Alternatively, the administrator can add the module to the list
51179 + of modules loaded at boot by modifying init scripts.
51180 +
51181 + Modification of init scripts will most likely be needed on
51182 + Ubuntu servers with encrypted home directory support enabled,
51183 + as the first non-root user logging in will cause the ecb(aes),
51184 + ecb(aes)-all, cbc(aes), and cbc(aes)-all modules to be loaded.
51185 +
51186 +config GRKERNSEC_HIDESYM
51187 + bool "Hide kernel symbols"
51188 + default y if GRKERNSEC_CONFIG_AUTO
51189 + select PAX_USERCOPY_SLABS
51190 + help
51191 + If you say Y here, getting information on loaded modules, and
51192 + displaying all kernel symbols through a syscall will be restricted
51193 + to users with CAP_SYS_MODULE. For software compatibility reasons,
51194 + /proc/kallsyms will be restricted to the root user. The RBAC
51195 + system can hide that entry even from root.
51196 +
51197 + This option also prevents leaking of kernel addresses through
51198 + several /proc entries.
51199 +
51200 + Note that this option is only effective provided the following
51201 + conditions are met:
51202 + 1) The kernel using grsecurity is not precompiled by some distribution
51203 + 2) You have also enabled GRKERNSEC_DMESG
51204 + 3) You are using the RBAC system and hiding other files such as your
51205 + kernel image and System.map. Alternatively, enabling this option
51206 + causes the permissions on /boot, /lib/modules, and the kernel
51207 + source directory to change at compile time to prevent
51208 + reading by non-root users.
51209 + If the above conditions are met, this option will aid in providing a
51210 + useful protection against local kernel exploitation of overflows
51211 + and arbitrary read/write vulnerabilities.
51212 +
51213 +config GRKERNSEC_KERN_LOCKOUT
51214 + bool "Active kernel exploit response"
51215 + default y if GRKERNSEC_CONFIG_AUTO
51216 + depends on X86 || ARM || PPC || SPARC
51217 + help
51218 + If you say Y here, when a PaX alert is triggered due to suspicious
51219 + activity in the kernel (from KERNEXEC/UDEREF/USERCOPY)
51220 + or an OOPS occurs due to bad memory accesses, instead of just
51221 + terminating the offending process (and potentially allowing
51222 + a subsequent exploit from the same user), we will take one of two
51223 + actions:
51224 + If the user was root, we will panic the system
51225 + If the user was non-root, we will log the attempt, terminate
51226 + all processes owned by the user, then prevent them from creating
51227 + any new processes until the system is restarted
51228 + This deters repeated kernel exploitation/bruteforcing attempts
51229 + and is useful for later forensics.
51230 +
51231 +endmenu
51232 +menu "Role Based Access Control Options"
51233 +depends on GRKERNSEC
51234 +
51235 +config GRKERNSEC_RBAC_DEBUG
51236 + bool
51237 +
51238 +config GRKERNSEC_NO_RBAC
51239 + bool "Disable RBAC system"
51240 + help
51241 + If you say Y here, the /dev/grsec device will be removed from the kernel,
51242 + preventing the RBAC system from being enabled. You should only say Y
51243 + here if you have no intention of using the RBAC system, so as to prevent
51244 + an attacker with root access from misusing the RBAC system to hide files
51245 + and processes when loadable module support and /dev/[k]mem have been
51246 + locked down.
51247 +
51248 +config GRKERNSEC_ACL_HIDEKERN
51249 + bool "Hide kernel processes"
51250 + help
51251 + If you say Y here, all kernel threads will be hidden to all
51252 + processes but those whose subject has the "view hidden processes"
51253 + flag.
51254 +
51255 +config GRKERNSEC_ACL_MAXTRIES
51256 + int "Maximum tries before password lockout"
51257 + default 3
51258 + help
51259 + This option enforces the maximum number of times a user can attempt
51260 + to authorize themselves with the grsecurity RBAC system before being
51261 + denied the ability to attempt authorization again for a specified time.
51262 + The lower the number, the harder it will be to brute-force a password.
51263 +
51264 +config GRKERNSEC_ACL_TIMEOUT
51265 + int "Time to wait after max password tries, in seconds"
51266 + default 30
51267 + help
51268 + This option specifies the time the user must wait after attempting to
51269 + authorize to the RBAC system with the maximum number of invalid
51270 + passwords. The higher the number, the harder it will be to brute-force
51271 + a password.
51272 +
51273 +endmenu
51274 +menu "Filesystem Protections"
51275 +depends on GRKERNSEC
51276 +
51277 +config GRKERNSEC_PROC
51278 + bool "Proc restrictions"
51279 + default y if GRKERNSEC_CONFIG_AUTO
51280 + help
51281 + If you say Y here, the permissions of the /proc filesystem
51282 + will be altered to enhance system security and privacy. You MUST
51283 + choose either a user only restriction or a user and group restriction.
51284 + Depending upon the option you choose, you can either restrict users to
51285 + see only the processes they themselves run, or choose a group that can
51286 + view all processes and files normally restricted to root if you choose
51287 + the "restrict to user only" option. NOTE: If you're running identd or
51288 + ntpd as a non-root user, you will have to run it as the group you
51289 + specify here.
51290 +
51291 +config GRKERNSEC_PROC_USER
51292 + bool "Restrict /proc to user only"
51293 + depends on GRKERNSEC_PROC
51294 + help
51295 + If you say Y here, non-root users will only be able to view their own
51296 + processes, and restricts them from viewing network-related information,
51297 + and viewing kernel symbol and module information.
51298 +
51299 +config GRKERNSEC_PROC_USERGROUP
51300 + bool "Allow special group"
51301 + default y if GRKERNSEC_CONFIG_AUTO
51302 + depends on GRKERNSEC_PROC && !GRKERNSEC_PROC_USER
51303 + help
51304 + If you say Y here, you will be able to select a group that will be
51305 + able to view all processes and network-related information. If you've
51306 + enabled GRKERNSEC_HIDESYM, kernel and symbol information may still
51307 + remain hidden. This option is useful if you want to run identd as
51308 + a non-root user. The group you select may also be chosen at boot time
51309 + via "grsec_proc_gid=" on the kernel commandline.
51310 +
51311 +config GRKERNSEC_PROC_GID
51312 + int "GID for special group"
51313 + depends on GRKERNSEC_PROC_USERGROUP
51314 + default 1001
51315 +
51316 +config GRKERNSEC_PROC_ADD
51317 + bool "Additional restrictions"
51318 + default y if GRKERNSEC_CONFIG_AUTO
51319 + depends on GRKERNSEC_PROC_USER || GRKERNSEC_PROC_USERGROUP
51320 + help
51321 + If you say Y here, additional restrictions will be placed on
51322 + /proc that keep normal users from viewing device information and
51323 + slabinfo information that could be useful for exploits.
51324 +
51325 +config GRKERNSEC_LINK
51326 + bool "Linking restrictions"
51327 + default y if GRKERNSEC_CONFIG_AUTO
51328 + help
51329 + If you say Y here, /tmp race exploits will be prevented, since users
51330 + will no longer be able to follow symlinks owned by other users in
51331 + world-writable +t directories (e.g. /tmp), unless the owner of the
51332 + symlink is the owner of the directory. users will also not be
51333 + able to hardlink to files they do not own. If the sysctl option is
51334 + enabled, a sysctl option with name "linking_restrictions" is created.
51335 +
51336 +config GRKERNSEC_SYMLINKOWN
51337 + bool "Kernel-enforced SymlinksIfOwnerMatch"
51338 + default y if GRKERNSEC_CONFIG_AUTO && GRKERNSEC_CONFIG_SERVER
51339 + help
51340 + Apache's SymlinksIfOwnerMatch option has an inherent race condition
51341 + that prevents it from being used as a security feature. As Apache
51342 + verifies the symlink by performing a stat() against the target of
51343 + the symlink before it is followed, an attacker can setup a symlink
51344 + to point to a same-owned file, then replace the symlink with one
51345 + that targets another user's file just after Apache "validates" the
51346 + symlink -- a classic TOCTOU race. If you say Y here, a complete,
51347 + race-free replacement for Apache's "SymlinksIfOwnerMatch" option
51348 + will be in place for the group you specify. If the sysctl option
51349 + is enabled, a sysctl option with name "enforce_symlinksifowner" is
51350 + created.
51351 +
51352 +config GRKERNSEC_SYMLINKOWN_GID
51353 + int "GID for users with kernel-enforced SymlinksIfOwnerMatch"
51354 + depends on GRKERNSEC_SYMLINKOWN
51355 + default 1006
51356 + help
51357 + Setting this GID determines what group kernel-enforced
51358 + SymlinksIfOwnerMatch will be enabled for. If the sysctl option
51359 + is enabled, a sysctl option with name "symlinkown_gid" is created.
51360 +
51361 +config GRKERNSEC_FIFO
51362 + bool "FIFO restrictions"
51363 + default y if GRKERNSEC_CONFIG_AUTO
51364 + help
51365 + If you say Y here, users will not be able to write to FIFOs they don't
51366 + own in world-writable +t directories (e.g. /tmp), unless the owner of
51367 + the FIFO is the same owner of the directory it's held in. If the sysctl
51368 + option is enabled, a sysctl option with name "fifo_restrictions" is
51369 + created.
51370 +
51371 +config GRKERNSEC_SYSFS_RESTRICT
51372 + bool "Sysfs/debugfs restriction"
51373 + default y if (GRKERNSEC_CONFIG_AUTO && GRKERNSEC_CONFIG_SERVER)
51374 + depends on SYSFS
51375 + help
51376 + If you say Y here, sysfs (the pseudo-filesystem mounted at /sys) and
51377 + any filesystem normally mounted under it (e.g. debugfs) will be
51378 + mostly accessible only by root. These filesystems generally provide access
51379 + to hardware and debug information that isn't appropriate for unprivileged
51380 + users of the system. Sysfs and debugfs have also become a large source
51381 + of new vulnerabilities, ranging from infoleaks to local compromise.
51382 + There has been very little oversight with an eye toward security involved
51383 + in adding new exporters of information to these filesystems, so their
51384 + use is discouraged.
51385 + For reasons of compatibility, a few directories have been whitelisted
51386 + for access by non-root users:
51387 + /sys/fs/selinux
51388 + /sys/fs/fuse
51389 + /sys/devices/system/cpu
51390 +
51391 +config GRKERNSEC_ROFS
51392 + bool "Runtime read-only mount protection"
51393 + help
51394 + If you say Y here, a sysctl option with name "romount_protect" will
51395 + be created. By setting this option to 1 at runtime, filesystems
51396 + will be protected in the following ways:
51397 + * No new writable mounts will be allowed
51398 + * Existing read-only mounts won't be able to be remounted read/write
51399 + * Write operations will be denied on all block devices
51400 + This option acts independently of grsec_lock: once it is set to 1,
51401 + it cannot be turned off. Therefore, please be mindful of the resulting
51402 + behavior if this option is enabled in an init script on a read-only
51403 + filesystem. This feature is mainly intended for secure embedded systems.
51404 +
51405 +config GRKERNSEC_CHROOT
51406 + bool "Chroot jail restrictions"
51407 + default y if GRKERNSEC_CONFIG_AUTO
51408 + help
51409 + If you say Y here, you will be able to choose several options that will
51410 + make breaking out of a chrooted jail much more difficult. If you
51411 + encounter no software incompatibilities with the following options, it
51412 + is recommended that you enable each one.
51413 +
51414 +config GRKERNSEC_CHROOT_MOUNT
51415 + bool "Deny mounts"
51416 + default y if GRKERNSEC_CONFIG_AUTO
51417 + depends on GRKERNSEC_CHROOT
51418 + help
51419 + If you say Y here, processes inside a chroot will not be able to
51420 + mount or remount filesystems. If the sysctl option is enabled, a
51421 + sysctl option with name "chroot_deny_mount" is created.
51422 +
51423 +config GRKERNSEC_CHROOT_DOUBLE
51424 + bool "Deny double-chroots"
51425 + default y if GRKERNSEC_CONFIG_AUTO
51426 + depends on GRKERNSEC_CHROOT
51427 + help
51428 + If you say Y here, processes inside a chroot will not be able to chroot
51429 + again outside the chroot. This is a widely used method of breaking
51430 + out of a chroot jail and should not be allowed. If the sysctl
51431 + option is enabled, a sysctl option with name
51432 + "chroot_deny_chroot" is created.
51433 +
51434 +config GRKERNSEC_CHROOT_PIVOT
51435 + bool "Deny pivot_root in chroot"
51436 + default y if GRKERNSEC_CONFIG_AUTO
51437 + depends on GRKERNSEC_CHROOT
51438 + help
51439 + If you say Y here, processes inside a chroot will not be able to use
51440 + a function called pivot_root() that was introduced in Linux 2.3.41. It
51441 + works similar to chroot in that it changes the root filesystem. This
51442 + function could be misused in a chrooted process to attempt to break out
51443 + of the chroot, and therefore should not be allowed. If the sysctl
51444 + option is enabled, a sysctl option with name "chroot_deny_pivot" is
51445 + created.
51446 +
51447 +config GRKERNSEC_CHROOT_CHDIR
51448 + bool "Enforce chdir(\"/\") on all chroots"
51449 + default y if GRKERNSEC_CONFIG_AUTO
51450 + depends on GRKERNSEC_CHROOT
51451 + help
51452 + If you say Y here, the current working directory of all newly-chrooted
51453 + applications will be set to the the root directory of the chroot.
51454 + The man page on chroot(2) states:
51455 + Note that this call does not change the current working
51456 + directory, so that `.' can be outside the tree rooted at
51457 + `/'. In particular, the super-user can escape from a
51458 + `chroot jail' by doing `mkdir foo; chroot foo; cd ..'.
51459 +
51460 + It is recommended that you say Y here, since it's not known to break
51461 + any software. If the sysctl option is enabled, a sysctl option with
51462 + name "chroot_enforce_chdir" is created.
51463 +
51464 +config GRKERNSEC_CHROOT_CHMOD
51465 + bool "Deny (f)chmod +s"
51466 + default y if GRKERNSEC_CONFIG_AUTO
51467 + depends on GRKERNSEC_CHROOT
51468 + help
51469 + If you say Y here, processes inside a chroot will not be able to chmod
51470 + or fchmod files to make them have suid or sgid bits. This protects
51471 + against another published method of breaking a chroot. If the sysctl
51472 + option is enabled, a sysctl option with name "chroot_deny_chmod" is
51473 + created.
51474 +
51475 +config GRKERNSEC_CHROOT_FCHDIR
51476 + bool "Deny fchdir out of chroot"
51477 + default y if GRKERNSEC_CONFIG_AUTO
51478 + depends on GRKERNSEC_CHROOT
51479 + help
51480 + If you say Y here, a well-known method of breaking chroots by fchdir'ing
51481 + to a file descriptor of the chrooting process that points to a directory
51482 + outside the filesystem will be stopped. If the sysctl option
51483 + is enabled, a sysctl option with name "chroot_deny_fchdir" is created.
51484 +
51485 +config GRKERNSEC_CHROOT_MKNOD
51486 + bool "Deny mknod"
51487 + default y if GRKERNSEC_CONFIG_AUTO
51488 + depends on GRKERNSEC_CHROOT
51489 + help
51490 + If you say Y here, processes inside a chroot will not be allowed to
51491 + mknod. The problem with using mknod inside a chroot is that it
51492 + would allow an attacker to create a device entry that is the same
51493 + as one on the physical root of your system, which could range from
51494 + anything from the console device to a device for your harddrive (which
51495 + they could then use to wipe the drive or steal data). It is recommended
51496 + that you say Y here, unless you run into software incompatibilities.
51497 + If the sysctl option is enabled, a sysctl option with name
51498 + "chroot_deny_mknod" is created.
51499 +
51500 +config GRKERNSEC_CHROOT_SHMAT
51501 + bool "Deny shmat() out of chroot"
51502 + default y if GRKERNSEC_CONFIG_AUTO
51503 + depends on GRKERNSEC_CHROOT
51504 + help
51505 + If you say Y here, processes inside a chroot will not be able to attach
51506 + to shared memory segments that were created outside of the chroot jail.
51507 + It is recommended that you say Y here. If the sysctl option is enabled,
51508 + a sysctl option with name "chroot_deny_shmat" is created.
51509 +
51510 +config GRKERNSEC_CHROOT_UNIX
51511 + bool "Deny access to abstract AF_UNIX sockets out of chroot"
51512 + default y if GRKERNSEC_CONFIG_AUTO
51513 + depends on GRKERNSEC_CHROOT
51514 + help
51515 + If you say Y here, processes inside a chroot will not be able to
51516 + connect to abstract (meaning not belonging to a filesystem) Unix
51517 + domain sockets that were bound outside of a chroot. It is recommended
51518 + that you say Y here. If the sysctl option is enabled, a sysctl option
51519 + with name "chroot_deny_unix" is created.
51520 +
51521 +config GRKERNSEC_CHROOT_FINDTASK
51522 + bool "Protect outside processes"
51523 + default y if GRKERNSEC_CONFIG_AUTO
51524 + depends on GRKERNSEC_CHROOT
51525 + help
51526 + If you say Y here, processes inside a chroot will not be able to
51527 + kill, send signals with fcntl, ptrace, capget, getpgid, setpgid,
51528 + getsid, or view any process outside of the chroot. If the sysctl
51529 + option is enabled, a sysctl option with name "chroot_findtask" is
51530 + created.
51531 +
51532 +config GRKERNSEC_CHROOT_NICE
51533 + bool "Restrict priority changes"
51534 + default y if GRKERNSEC_CONFIG_AUTO
51535 + depends on GRKERNSEC_CHROOT
51536 + help
51537 + If you say Y here, processes inside a chroot will not be able to raise
51538 + the priority of processes in the chroot, or alter the priority of
51539 + processes outside the chroot. This provides more security than simply
51540 + removing CAP_SYS_NICE from the process' capability set. If the
51541 + sysctl option is enabled, a sysctl option with name "chroot_restrict_nice"
51542 + is created.
51543 +
51544 +config GRKERNSEC_CHROOT_SYSCTL
51545 + bool "Deny sysctl writes"
51546 + default y if GRKERNSEC_CONFIG_AUTO
51547 + depends on GRKERNSEC_CHROOT
51548 + help
51549 + If you say Y here, an attacker in a chroot will not be able to
51550 + write to sysctl entries, either by sysctl(2) or through a /proc
51551 + interface. It is strongly recommended that you say Y here. If the
51552 + sysctl option is enabled, a sysctl option with name
51553 + "chroot_deny_sysctl" is created.
51554 +
51555 +config GRKERNSEC_CHROOT_CAPS
51556 + bool "Capability restrictions"
51557 + default y if GRKERNSEC_CONFIG_AUTO
51558 + depends on GRKERNSEC_CHROOT
51559 + help
51560 + If you say Y here, the capabilities on all processes within a
51561 + chroot jail will be lowered to stop module insertion, raw i/o,
51562 + system and net admin tasks, rebooting the system, modifying immutable
51563 + files, modifying IPC owned by another, and changing the system time.
51564 + This is left an option because it can break some apps. Disable this
51565 + if your chrooted apps are having problems performing those kinds of
51566 + tasks. If the sysctl option is enabled, a sysctl option with
51567 + name "chroot_caps" is created.
51568 +
51569 +endmenu
51570 +menu "Kernel Auditing"
51571 +depends on GRKERNSEC
51572 +
51573 +config GRKERNSEC_AUDIT_GROUP
51574 + bool "Single group for auditing"
51575 + help
51576 + If you say Y here, the exec, chdir, and (un)mount logging features
51577 + will only operate on a group you specify. This option is recommended
51578 + if you only want to watch certain users instead of having a large
51579 + amount of logs from the entire system. If the sysctl option is enabled,
51580 + a sysctl option with name "audit_group" is created.
51581 +
51582 +config GRKERNSEC_AUDIT_GID
51583 + int "GID for auditing"
51584 + depends on GRKERNSEC_AUDIT_GROUP
51585 + default 1007
51586 +
51587 +config GRKERNSEC_EXECLOG
51588 + bool "Exec logging"
51589 + help
51590 + If you say Y here, all execve() calls will be logged (since the
51591 + other exec*() calls are frontends to execve(), all execution
51592 + will be logged). Useful for shell-servers that like to keep track
51593 + of their users. If the sysctl option is enabled, a sysctl option with
51594 + name "exec_logging" is created.
51595 + WARNING: This option when enabled will produce a LOT of logs, especially
51596 + on an active system.
51597 +
51598 +config GRKERNSEC_RESLOG
51599 + bool "Resource logging"
51600 + default y if GRKERNSEC_CONFIG_AUTO
51601 + help
51602 + If you say Y here, all attempts to overstep resource limits will
51603 + be logged with the resource name, the requested size, and the current
51604 + limit. It is highly recommended that you say Y here. If the sysctl
51605 + option is enabled, a sysctl option with name "resource_logging" is
51606 + created. If the RBAC system is enabled, the sysctl value is ignored.
51607 +
51608 +config GRKERNSEC_CHROOT_EXECLOG
51609 + bool "Log execs within chroot"
51610 + help
51611 + If you say Y here, all executions inside a chroot jail will be logged
51612 + to syslog. This can cause a large amount of logs if certain
51613 + applications (eg. djb's daemontools) are installed on the system, and
51614 + is therefore left as an option. If the sysctl option is enabled, a
51615 + sysctl option with name "chroot_execlog" is created.
51616 +
51617 +config GRKERNSEC_AUDIT_PTRACE
51618 + bool "Ptrace logging"
51619 + help
51620 + If you say Y here, all attempts to attach to a process via ptrace
51621 + will be logged. If the sysctl option is enabled, a sysctl option
51622 + with name "audit_ptrace" is created.
51623 +
51624 +config GRKERNSEC_AUDIT_CHDIR
51625 + bool "Chdir logging"
51626 + help
51627 + If you say Y here, all chdir() calls will be logged. If the sysctl
51628 + option is enabled, a sysctl option with name "audit_chdir" is created.
51629 +
51630 +config GRKERNSEC_AUDIT_MOUNT
51631 + bool "(Un)Mount logging"
51632 + help
51633 + If you say Y here, all mounts and unmounts will be logged. If the
51634 + sysctl option is enabled, a sysctl option with name "audit_mount" is
51635 + created.
51636 +
51637 +config GRKERNSEC_SIGNAL
51638 + bool "Signal logging"
51639 + default y if GRKERNSEC_CONFIG_AUTO
51640 + help
51641 + If you say Y here, certain important signals will be logged, such as
51642 + SIGSEGV, which will as a result inform you of when a error in a program
51643 + occurred, which in some cases could mean a possible exploit attempt.
51644 + If the sysctl option is enabled, a sysctl option with name
51645 + "signal_logging" is created.
51646 +
51647 +config GRKERNSEC_FORKFAIL
51648 + bool "Fork failure logging"
51649 + help
51650 + If you say Y here, all failed fork() attempts will be logged.
51651 + This could suggest a fork bomb, or someone attempting to overstep
51652 + their process limit. If the sysctl option is enabled, a sysctl option
51653 + with name "forkfail_logging" is created.
51654 +
51655 +config GRKERNSEC_TIME
51656 + bool "Time change logging"
51657 + default y if GRKERNSEC_CONFIG_AUTO
51658 + help
51659 + If you say Y here, any changes of the system clock will be logged.
51660 + If the sysctl option is enabled, a sysctl option with name
51661 + "timechange_logging" is created.
51662 +
51663 +config GRKERNSEC_PROC_IPADDR
51664 + bool "/proc/<pid>/ipaddr support"
51665 + default y if GRKERNSEC_CONFIG_AUTO
51666 + help
51667 + If you say Y here, a new entry will be added to each /proc/<pid>
51668 + directory that contains the IP address of the person using the task.
51669 + The IP is carried across local TCP and AF_UNIX stream sockets.
51670 + This information can be useful for IDS/IPSes to perform remote response
51671 + to a local attack. The entry is readable by only the owner of the
51672 + process (and root if he has CAP_DAC_OVERRIDE, which can be removed via
51673 + the RBAC system), and thus does not create privacy concerns.
51674 +
51675 +config GRKERNSEC_RWXMAP_LOG
51676 + bool 'Denied RWX mmap/mprotect logging'
51677 + default y if GRKERNSEC_CONFIG_AUTO
51678 + depends on PAX_MPROTECT && !PAX_EMUPLT && !PAX_EMUSIGRT
51679 + help
51680 + If you say Y here, calls to mmap() and mprotect() with explicit
51681 + usage of PROT_WRITE and PROT_EXEC together will be logged when
51682 + denied by the PAX_MPROTECT feature. If the sysctl option is
51683 + enabled, a sysctl option with name "rwxmap_logging" is created.
51684 +
51685 +config GRKERNSEC_AUDIT_TEXTREL
51686 + bool 'ELF text relocations logging (READ HELP)'
51687 + depends on PAX_MPROTECT
51688 + help
51689 + If you say Y here, text relocations will be logged with the filename
51690 + of the offending library or binary. The purpose of the feature is
51691 + to help Linux distribution developers get rid of libraries and
51692 + binaries that need text relocations which hinder the future progress
51693 + of PaX. Only Linux distribution developers should say Y here, and
51694 + never on a production machine, as this option creates an information
51695 + leak that could aid an attacker in defeating the randomization of
51696 + a single memory region. If the sysctl option is enabled, a sysctl
51697 + option with name "audit_textrel" is created.
51698 +
51699 +endmenu
51700 +
51701 +menu "Executable Protections"
51702 +depends on GRKERNSEC
51703 +
51704 +config GRKERNSEC_DMESG
51705 + bool "Dmesg(8) restriction"
51706 + default y if GRKERNSEC_CONFIG_AUTO
51707 + help
51708 + If you say Y here, non-root users will not be able to use dmesg(8)
51709 + to view up to the last 4kb of messages in the kernel's log buffer.
51710 + The kernel's log buffer often contains kernel addresses and other
51711 + identifying information useful to an attacker in fingerprinting a
51712 + system for a targeted exploit.
51713 + If the sysctl option is enabled, a sysctl option with name "dmesg" is
51714 + created.
51715 +
51716 +config GRKERNSEC_HARDEN_PTRACE
51717 + bool "Deter ptrace-based process snooping"
51718 + default y if GRKERNSEC_CONFIG_AUTO
51719 + help
51720 + If you say Y here, TTY sniffers and other malicious monitoring
51721 + programs implemented through ptrace will be defeated. If you
51722 + have been using the RBAC system, this option has already been
51723 + enabled for several years for all users, with the ability to make
51724 + fine-grained exceptions.
51725 +
51726 + This option only affects the ability of non-root users to ptrace
51727 + processes that are not a descendent of the ptracing process.
51728 + This means that strace ./binary and gdb ./binary will still work,
51729 + but attaching to arbitrary processes will not. If the sysctl
51730 + option is enabled, a sysctl option with name "harden_ptrace" is
51731 + created.
51732 +
51733 +config GRKERNSEC_PTRACE_READEXEC
51734 + bool "Require read access to ptrace sensitive binaries"
51735 + default y if GRKERNSEC_CONFIG_AUTO
51736 + help
51737 + If you say Y here, unprivileged users will not be able to ptrace unreadable
51738 + binaries. This option is useful in environments that
51739 + remove the read bits (e.g. file mode 4711) from suid binaries to
51740 + prevent infoleaking of their contents. This option adds
51741 + consistency to the use of that file mode, as the binary could normally
51742 + be read out when run without privileges while ptracing.
51743 +
51744 + If the sysctl option is enabled, a sysctl option with name "ptrace_readexec"
51745 + is created.
51746 +
51747 +config GRKERNSEC_SETXID
51748 + bool "Enforce consistent multithreaded privileges"
51749 + default y if GRKERNSEC_CONFIG_AUTO
51750 + depends on (X86 || SPARC64 || PPC || ARM || MIPS)
51751 + help
51752 + If you say Y here, a change from a root uid to a non-root uid
51753 + in a multithreaded application will cause the resulting uids,
51754 + gids, supplementary groups, and capabilities in that thread
51755 + to be propagated to the other threads of the process. In most
51756 + cases this is unnecessary, as glibc will emulate this behavior
51757 + on behalf of the application. Other libcs do not act in the
51758 + same way, allowing the other threads of the process to continue
51759 + running with root privileges. If the sysctl option is enabled,
51760 + a sysctl option with name "consistent_setxid" is created.
51761 +
51762 +config GRKERNSEC_TPE
51763 + bool "Trusted Path Execution (TPE)"
51764 + default y if GRKERNSEC_CONFIG_AUTO && GRKERNSEC_CONFIG_SERVER
51765 + help
51766 + If you say Y here, you will be able to choose a gid to add to the
51767 + supplementary groups of users you want to mark as "untrusted."
51768 + These users will not be able to execute any files that are not in
51769 + root-owned directories writable only by root. If the sysctl option
51770 + is enabled, a sysctl option with name "tpe" is created.
51771 +
51772 +config GRKERNSEC_TPE_ALL
51773 + bool "Partially restrict all non-root users"
51774 + depends on GRKERNSEC_TPE
51775 + help
51776 + If you say Y here, all non-root users will be covered under
51777 + a weaker TPE restriction. This is separate from, and in addition to,
51778 + the main TPE options that you have selected elsewhere. Thus, if a
51779 + "trusted" GID is chosen, this restriction applies to even that GID.
51780 + Under this restriction, all non-root users will only be allowed to
51781 + execute files in directories they own that are not group or
51782 + world-writable, or in directories owned by root and writable only by
51783 + root. If the sysctl option is enabled, a sysctl option with name
51784 + "tpe_restrict_all" is created.
51785 +
51786 +config GRKERNSEC_TPE_INVERT
51787 + bool "Invert GID option"
51788 + depends on GRKERNSEC_TPE
51789 + help
51790 + If you say Y here, the group you specify in the TPE configuration will
51791 + decide what group TPE restrictions will be *disabled* for. This
51792 + option is useful if you want TPE restrictions to be applied to most
51793 + users on the system. If the sysctl option is enabled, a sysctl option
51794 + with name "tpe_invert" is created. Unlike other sysctl options, this
51795 + entry will default to on for backward-compatibility.
51796 +
51797 +config GRKERNSEC_TPE_GID
51798 + int
51799 + default GRKERNSEC_TPE_UNTRUSTED_GID if (GRKERNSEC_TPE && !GRKERNSEC_TPE_INVERT)
51800 + default GRKERNSEC_TPE_TRUSTED_GID if (GRKERNSEC_TPE && GRKERNSEC_TPE_INVERT)
51801 +
51802 +config GRKERNSEC_TPE_UNTRUSTED_GID
51803 + int "GID for TPE-untrusted users"
51804 + depends on GRKERNSEC_TPE && !GRKERNSEC_TPE_INVERT
51805 + default 1005
51806 + help
51807 + Setting this GID determines what group TPE restrictions will be
51808 + *enabled* for. If the sysctl option is enabled, a sysctl option
51809 + with name "tpe_gid" is created.
51810 +
51811 +config GRKERNSEC_TPE_TRUSTED_GID
51812 + int "GID for TPE-trusted users"
51813 + depends on GRKERNSEC_TPE && GRKERNSEC_TPE_INVERT
51814 + default 1005
51815 + help
51816 + Setting this GID determines what group TPE restrictions will be
51817 + *disabled* for. If the sysctl option is enabled, a sysctl option
51818 + with name "tpe_gid" is created.
51819 +
51820 +endmenu
51821 +menu "Network Protections"
51822 +depends on GRKERNSEC
51823 +
51824 +config GRKERNSEC_RANDNET
51825 + bool "Larger entropy pools"
51826 + default y if GRKERNSEC_CONFIG_AUTO
51827 + help
51828 + If you say Y here, the entropy pools used for many features of Linux
51829 + and grsecurity will be doubled in size. Since several grsecurity
51830 + features use additional randomness, it is recommended that you say Y
51831 + here. Saying Y here has a similar effect as modifying
51832 + /proc/sys/kernel/random/poolsize.
51833 +
51834 +config GRKERNSEC_BLACKHOLE
51835 + bool "TCP/UDP blackhole and LAST_ACK DoS prevention"
51836 + default y if GRKERNSEC_CONFIG_AUTO
51837 + depends on NET
51838 + help
51839 + If you say Y here, neither TCP resets nor ICMP
51840 + destination-unreachable packets will be sent in response to packets
51841 + sent to ports for which no associated listening process exists.
51842 + This feature supports both IPV4 and IPV6 and exempts the
51843 + loopback interface from blackholing. Enabling this feature
51844 + makes a host more resilient to DoS attacks and reduces network
51845 + visibility against scanners.
51846 +
51847 + The blackhole feature as-implemented is equivalent to the FreeBSD
51848 + blackhole feature, as it prevents RST responses to all packets, not
51849 + just SYNs. Under most application behavior this causes no
51850 + problems, but applications (like haproxy) may not close certain
51851 + connections in a way that cleanly terminates them on the remote
51852 + end, leaving the remote host in LAST_ACK state. Because of this
51853 + side-effect and to prevent intentional LAST_ACK DoSes, this
51854 + feature also adds automatic mitigation against such attacks.
51855 + The mitigation drastically reduces the amount of time a socket
51856 + can spend in LAST_ACK state. If you're using haproxy and not
51857 + all servers it connects to have this option enabled, consider
51858 + disabling this feature on the haproxy host.
51859 +
51860 + If the sysctl option is enabled, two sysctl options with names
51861 + "ip_blackhole" and "lastack_retries" will be created.
51862 + While "ip_blackhole" takes the standard zero/non-zero on/off
51863 + toggle, "lastack_retries" uses the same kinds of values as
51864 + "tcp_retries1" and "tcp_retries2". The default value of 4
51865 + prevents a socket from lasting more than 45 seconds in LAST_ACK
51866 + state.
51867 +
51868 +config GRKERNSEC_SOCKET
51869 + bool "Socket restrictions"
51870 + depends on NET
51871 + help
51872 + If you say Y here, you will be able to choose from several options.
51873 + If you assign a GID on your system and add it to the supplementary
51874 + groups of users you want to restrict socket access to, this patch
51875 + will perform up to three things, based on the option(s) you choose.
51876 +
51877 +config GRKERNSEC_SOCKET_ALL
51878 + bool "Deny any sockets to group"
51879 + depends on GRKERNSEC_SOCKET
51880 + help
51881 + If you say Y here, you will be able to choose a GID of whose users will
51882 + be unable to connect to other hosts from your machine or run server
51883 + applications from your machine. If the sysctl option is enabled, a
51884 + sysctl option with name "socket_all" is created.
51885 +
51886 +config GRKERNSEC_SOCKET_ALL_GID
51887 + int "GID to deny all sockets for"
51888 + depends on GRKERNSEC_SOCKET_ALL
51889 + default 1004
51890 + help
51891 + Here you can choose the GID to disable socket access for. Remember to
51892 + add the users you want socket access disabled for to the GID
51893 + specified here. If the sysctl option is enabled, a sysctl option
51894 + with name "socket_all_gid" is created.
51895 +
51896 +config GRKERNSEC_SOCKET_CLIENT
51897 + bool "Deny client sockets to group"
51898 + depends on GRKERNSEC_SOCKET
51899 + help
51900 + If you say Y here, you will be able to choose a GID of whose users will
51901 + be unable to connect to other hosts from your machine, but will be
51902 + able to run servers. If this option is enabled, all users in the group
51903 + you specify will have to use passive mode when initiating ftp transfers
51904 + from the shell on your machine. If the sysctl option is enabled, a
51905 + sysctl option with name "socket_client" is created.
51906 +
51907 +config GRKERNSEC_SOCKET_CLIENT_GID
51908 + int "GID to deny client sockets for"
51909 + depends on GRKERNSEC_SOCKET_CLIENT
51910 + default 1003
51911 + help
51912 + Here you can choose the GID to disable client socket access for.
51913 + Remember to add the users you want client socket access disabled for to
51914 + the GID specified here. If the sysctl option is enabled, a sysctl
51915 + option with name "socket_client_gid" is created.
51916 +
51917 +config GRKERNSEC_SOCKET_SERVER
51918 + bool "Deny server sockets to group"
51919 + depends on GRKERNSEC_SOCKET
51920 + help
51921 + If you say Y here, you will be able to choose a GID of whose users will
51922 + be unable to run server applications from your machine. If the sysctl
51923 + option is enabled, a sysctl option with name "socket_server" is created.
51924 +
51925 +config GRKERNSEC_SOCKET_SERVER_GID
51926 + int "GID to deny server sockets for"
51927 + depends on GRKERNSEC_SOCKET_SERVER
51928 + default 1002
51929 + help
51930 + Here you can choose the GID to disable server socket access for.
51931 + Remember to add the users you want server socket access disabled for to
51932 + the GID specified here. If the sysctl option is enabled, a sysctl
51933 + option with name "socket_server_gid" is created.
51934 +
51935 +endmenu
51936 +menu "Sysctl Support"
51937 +depends on GRKERNSEC && SYSCTL
51938 +
51939 +config GRKERNSEC_SYSCTL
51940 + bool "Sysctl support"
51941 + default y if GRKERNSEC_CONFIG_AUTO
51942 + help
51943 + If you say Y here, you will be able to change the options that
51944 + grsecurity runs with at bootup, without having to recompile your
51945 + kernel. You can echo values to files in /proc/sys/kernel/grsecurity
51946 + to enable (1) or disable (0) various features. All the sysctl entries
51947 + are mutable until the "grsec_lock" entry is set to a non-zero value.
51948 + All features enabled in the kernel configuration are disabled at boot
51949 + if you do not say Y to the "Turn on features by default" option.
51950 + All options should be set at startup, and the grsec_lock entry should
51951 + be set to a non-zero value after all the options are set.
51952 + *THIS IS EXTREMELY IMPORTANT*
51953 +
51954 +config GRKERNSEC_SYSCTL_DISTRO
51955 + bool "Extra sysctl support for distro makers (READ HELP)"
51956 + depends on GRKERNSEC_SYSCTL && GRKERNSEC_IO
51957 + help
51958 + If you say Y here, additional sysctl options will be created
51959 + for features that affect processes running as root. Therefore,
51960 + it is critical when using this option that the grsec_lock entry be
51961 + enabled after boot. Only distros with prebuilt kernel packages
51962 + with this option enabled that can ensure grsec_lock is enabled
51963 + after boot should use this option.
51964 + *Failure to set grsec_lock after boot makes all grsec features
51965 + this option covers useless*
51966 +
51967 + Currently this option creates the following sysctl entries:
51968 + "Disable Privileged I/O": "disable_priv_io"
51969 +
51970 +config GRKERNSEC_SYSCTL_ON
51971 + bool "Turn on features by default"
51972 + default y if GRKERNSEC_CONFIG_AUTO
51973 + depends on GRKERNSEC_SYSCTL
51974 + help
51975 + If you say Y here, instead of having all features enabled in the
51976 + kernel configuration disabled at boot time, the features will be
51977 + enabled at boot time. It is recommended you say Y here unless
51978 + there is some reason you would want all sysctl-tunable features to
51979 + be disabled by default. As mentioned elsewhere, it is important
51980 + to enable the grsec_lock entry once you have finished modifying
51981 + the sysctl entries.
51982 +
51983 +endmenu
51984 +menu "Logging Options"
51985 +depends on GRKERNSEC
51986 +
51987 +config GRKERNSEC_FLOODTIME
51988 + int "Seconds in between log messages (minimum)"
51989 + default 10
51990 + help
51991 + This option allows you to enforce the number of seconds between
51992 + grsecurity log messages. The default should be suitable for most
51993 + people, however, if you choose to change it, choose a value small enough
51994 + to allow informative logs to be produced, but large enough to
51995 + prevent flooding.
51996 +
51997 +config GRKERNSEC_FLOODBURST
51998 + int "Number of messages in a burst (maximum)"
51999 + default 6
52000 + help
52001 + This option allows you to choose the maximum number of messages allowed
52002 + within the flood time interval you chose in a separate option. The
52003 + default should be suitable for most people, however if you find that
52004 + many of your logs are being interpreted as flooding, you may want to
52005 + raise this value.
52006 +
52007 +endmenu
52008 diff --git a/grsecurity/Makefile b/grsecurity/Makefile
52009 new file mode 100644
52010 index 0000000..1b9afa9
52011 --- /dev/null
52012 +++ b/grsecurity/Makefile
52013 @@ -0,0 +1,38 @@
52014 +# grsecurity's ACL system was originally written in 2001 by Michael Dalton
52015 +# during 2001-2009 it has been completely redesigned by Brad Spengler
52016 +# into an RBAC system
52017 +#
52018 +# All code in this directory and various hooks inserted throughout the kernel
52019 +# are copyright Brad Spengler - Open Source Security, Inc., and released
52020 +# under the GPL v2 or higher
52021 +
52022 +KBUILD_CFLAGS += -Werror
52023 +
52024 +obj-y = grsec_chdir.o grsec_chroot.o grsec_exec.o grsec_fifo.o grsec_fork.o \
52025 + grsec_mount.o grsec_sig.o grsec_sysctl.o \
52026 + grsec_time.o grsec_tpe.o grsec_link.o grsec_pax.o grsec_ptrace.o
52027 +
52028 +obj-$(CONFIG_GRKERNSEC) += grsec_init.o grsum.o gracl.o gracl_segv.o \
52029 + gracl_cap.o gracl_alloc.o gracl_shm.o grsec_mem.o gracl_fs.o \
52030 + gracl_learn.o grsec_log.o
52031 +obj-$(CONFIG_GRKERNSEC_RESLOG) += gracl_res.o
52032 +
52033 +ifdef CONFIG_NET
52034 +obj-y += grsec_sock.o
52035 +obj-$(CONFIG_GRKERNSEC) += gracl_ip.o
52036 +endif
52037 +
52038 +ifndef CONFIG_GRKERNSEC
52039 +obj-y += grsec_disabled.o
52040 +endif
52041 +
52042 +ifdef CONFIG_GRKERNSEC_HIDESYM
52043 +extra-y := grsec_hidesym.o
52044 +$(obj)/grsec_hidesym.o:
52045 + @-chmod -f 500 /boot
52046 + @-chmod -f 500 /lib/modules
52047 + @-chmod -f 500 /lib64/modules
52048 + @-chmod -f 500 /lib32/modules
52049 + @-chmod -f 700 .
52050 + @echo ' grsec: protected kernel image paths'
52051 +endif
52052 diff --git a/grsecurity/gracl.c b/grsecurity/gracl.c
52053 new file mode 100644
52054 index 0000000..4428c82
52055 --- /dev/null
52056 +++ b/grsecurity/gracl.c
52057 @@ -0,0 +1,4056 @@
52058 +#include <linux/kernel.h>
52059 +#include <linux/module.h>
52060 +#include <linux/sched.h>
52061 +#include <linux/mm.h>
52062 +#include <linux/file.h>
52063 +#include <linux/fs.h>
52064 +#include <linux/namei.h>
52065 +#include <linux/mount.h>
52066 +#include <linux/tty.h>
52067 +#include <linux/proc_fs.h>
52068 +#include <linux/lglock.h>
52069 +#include <linux/slab.h>
52070 +#include <linux/vmalloc.h>
52071 +#include <linux/types.h>
52072 +#include <linux/sysctl.h>
52073 +#include <linux/netdevice.h>
52074 +#include <linux/ptrace.h>
52075 +#include <linux/gracl.h>
52076 +#include <linux/gralloc.h>
52077 +#include <linux/security.h>
52078 +#include <linux/grinternal.h>
52079 +#include <linux/pid_namespace.h>
52080 +#include <linux/stop_machine.h>
52081 +#include <linux/fdtable.h>
52082 +#include <linux/percpu.h>
52083 +#include <linux/lglock.h>
52084 +#include "../fs/mount.h"
52085 +
52086 +#include <asm/uaccess.h>
52087 +#include <asm/errno.h>
52088 +#include <asm/mman.h>
52089 +
52090 +extern struct lglock vfsmount_lock;
52091 +
52092 +static struct acl_role_db acl_role_set;
52093 +static struct name_db name_set;
52094 +static struct inodev_db inodev_set;
52095 +
52096 +/* for keeping track of userspace pointers used for subjects, so we
52097 + can share references in the kernel as well
52098 +*/
52099 +
52100 +static struct path real_root;
52101 +
52102 +static struct acl_subj_map_db subj_map_set;
52103 +
52104 +static struct acl_role_label *default_role;
52105 +
52106 +static struct acl_role_label *role_list;
52107 +
52108 +static u16 acl_sp_role_value;
52109 +
52110 +extern char *gr_shared_page[4];
52111 +static DEFINE_MUTEX(gr_dev_mutex);
52112 +DEFINE_RWLOCK(gr_inode_lock);
52113 +
52114 +struct gr_arg *gr_usermode;
52115 +
52116 +static unsigned int gr_status __read_only = GR_STATUS_INIT;
52117 +
52118 +extern int chkpw(struct gr_arg *entry, unsigned char *salt, unsigned char *sum);
52119 +extern void gr_clear_learn_entries(void);
52120 +
52121 +#ifdef CONFIG_GRKERNSEC_RESLOG
52122 +extern void gr_log_resource(const struct task_struct *task,
52123 + const int res, const unsigned long wanted, const int gt);
52124 +#endif
52125 +
52126 +unsigned char *gr_system_salt;
52127 +unsigned char *gr_system_sum;
52128 +
52129 +static struct sprole_pw **acl_special_roles = NULL;
52130 +static __u16 num_sprole_pws = 0;
52131 +
52132 +static struct acl_role_label *kernel_role = NULL;
52133 +
52134 +static unsigned int gr_auth_attempts = 0;
52135 +static unsigned long gr_auth_expires = 0UL;
52136 +
52137 +#ifdef CONFIG_NET
52138 +extern struct vfsmount *sock_mnt;
52139 +#endif
52140 +
52141 +extern struct vfsmount *pipe_mnt;
52142 +extern struct vfsmount *shm_mnt;
52143 +#ifdef CONFIG_HUGETLBFS
52144 +extern struct vfsmount *hugetlbfs_vfsmount;
52145 +#endif
52146 +
52147 +static struct acl_object_label *fakefs_obj_rw;
52148 +static struct acl_object_label *fakefs_obj_rwx;
52149 +
52150 +extern int gr_init_uidset(void);
52151 +extern void gr_free_uidset(void);
52152 +extern void gr_remove_uid(uid_t uid);
52153 +extern int gr_find_uid(uid_t uid);
52154 +
52155 +__inline__ int
52156 +gr_acl_is_enabled(void)
52157 +{
52158 + return (gr_status & GR_READY);
52159 +}
52160 +
52161 +#ifdef CONFIG_BTRFS_FS
52162 +extern dev_t get_btrfs_dev_from_inode(struct inode *inode);
52163 +extern int btrfs_getattr(struct vfsmount *mnt, struct dentry *dentry, struct kstat *stat);
52164 +#endif
52165 +
52166 +static inline dev_t __get_dev(const struct dentry *dentry)
52167 +{
52168 +#ifdef CONFIG_BTRFS_FS
52169 + if (dentry->d_inode->i_op && dentry->d_inode->i_op->getattr == &btrfs_getattr)
52170 + return get_btrfs_dev_from_inode(dentry->d_inode);
52171 + else
52172 +#endif
52173 + return dentry->d_inode->i_sb->s_dev;
52174 +}
52175 +
52176 +dev_t gr_get_dev_from_dentry(struct dentry *dentry)
52177 +{
52178 + return __get_dev(dentry);
52179 +}
52180 +
52181 +static char gr_task_roletype_to_char(struct task_struct *task)
52182 +{
52183 + switch (task->role->roletype &
52184 + (GR_ROLE_DEFAULT | GR_ROLE_USER | GR_ROLE_GROUP |
52185 + GR_ROLE_SPECIAL)) {
52186 + case GR_ROLE_DEFAULT:
52187 + return 'D';
52188 + case GR_ROLE_USER:
52189 + return 'U';
52190 + case GR_ROLE_GROUP:
52191 + return 'G';
52192 + case GR_ROLE_SPECIAL:
52193 + return 'S';
52194 + }
52195 +
52196 + return 'X';
52197 +}
52198 +
52199 +char gr_roletype_to_char(void)
52200 +{
52201 + return gr_task_roletype_to_char(current);
52202 +}
52203 +
52204 +__inline__ int
52205 +gr_acl_tpe_check(void)
52206 +{
52207 + if (unlikely(!(gr_status & GR_READY)))
52208 + return 0;
52209 + if (current->role->roletype & GR_ROLE_TPE)
52210 + return 1;
52211 + else
52212 + return 0;
52213 +}
52214 +
52215 +int
52216 +gr_handle_rawio(const struct inode *inode)
52217 +{
52218 +#ifdef CONFIG_GRKERNSEC_CHROOT_CAPS
52219 + if (inode && S_ISBLK(inode->i_mode) &&
52220 + grsec_enable_chroot_caps && proc_is_chrooted(current) &&
52221 + !capable(CAP_SYS_RAWIO))
52222 + return 1;
52223 +#endif
52224 + return 0;
52225 +}
52226 +
52227 +static int
52228 +gr_streq(const char *a, const char *b, const unsigned int lena, const unsigned int lenb)
52229 +{
52230 + if (likely(lena != lenb))
52231 + return 0;
52232 +
52233 + return !memcmp(a, b, lena);
52234 +}
52235 +
52236 +static int prepend(char **buffer, int *buflen, const char *str, int namelen)
52237 +{
52238 + *buflen -= namelen;
52239 + if (*buflen < 0)
52240 + return -ENAMETOOLONG;
52241 + *buffer -= namelen;
52242 + memcpy(*buffer, str, namelen);
52243 + return 0;
52244 +}
52245 +
52246 +static int prepend_name(char **buffer, int *buflen, struct qstr *name)
52247 +{
52248 + return prepend(buffer, buflen, name->name, name->len);
52249 +}
52250 +
52251 +static int prepend_path(const struct path *path, struct path *root,
52252 + char **buffer, int *buflen)
52253 +{
52254 + struct dentry *dentry = path->dentry;
52255 + struct vfsmount *vfsmnt = path->mnt;
52256 + struct mount *mnt = real_mount(vfsmnt);
52257 + bool slash = false;
52258 + int error = 0;
52259 +
52260 + while (dentry != root->dentry || vfsmnt != root->mnt) {
52261 + struct dentry * parent;
52262 +
52263 + if (dentry == vfsmnt->mnt_root || IS_ROOT(dentry)) {
52264 + /* Global root? */
52265 + if (!mnt_has_parent(mnt)) {
52266 + goto out;
52267 + }
52268 + dentry = mnt->mnt_mountpoint;
52269 + mnt = mnt->mnt_parent;
52270 + vfsmnt = &mnt->mnt;
52271 + continue;
52272 + }
52273 + parent = dentry->d_parent;
52274 + prefetch(parent);
52275 + spin_lock(&dentry->d_lock);
52276 + error = prepend_name(buffer, buflen, &dentry->d_name);
52277 + spin_unlock(&dentry->d_lock);
52278 + if (!error)
52279 + error = prepend(buffer, buflen, "/", 1);
52280 + if (error)
52281 + break;
52282 +
52283 + slash = true;
52284 + dentry = parent;
52285 + }
52286 +
52287 +out:
52288 + if (!error && !slash)
52289 + error = prepend(buffer, buflen, "/", 1);
52290 +
52291 + return error;
52292 +}
52293 +
52294 +/* this must be called with vfsmount_lock and rename_lock held */
52295 +
52296 +static char *__our_d_path(const struct path *path, struct path *root,
52297 + char *buf, int buflen)
52298 +{
52299 + char *res = buf + buflen;
52300 + int error;
52301 +
52302 + prepend(&res, &buflen, "\0", 1);
52303 + error = prepend_path(path, root, &res, &buflen);
52304 + if (error)
52305 + return ERR_PTR(error);
52306 +
52307 + return res;
52308 +}
52309 +
52310 +static char *
52311 +gen_full_path(struct path *path, struct path *root, char *buf, int buflen)
52312 +{
52313 + char *retval;
52314 +
52315 + retval = __our_d_path(path, root, buf, buflen);
52316 + if (unlikely(IS_ERR(retval)))
52317 + retval = strcpy(buf, "<path too long>");
52318 + else if (unlikely(retval[1] == '/' && retval[2] == '\0'))
52319 + retval[1] = '\0';
52320 +
52321 + return retval;
52322 +}
52323 +
52324 +static char *
52325 +__d_real_path(const struct dentry *dentry, const struct vfsmount *vfsmnt,
52326 + char *buf, int buflen)
52327 +{
52328 + struct path path;
52329 + char *res;
52330 +
52331 + path.dentry = (struct dentry *)dentry;
52332 + path.mnt = (struct vfsmount *)vfsmnt;
52333 +
52334 + /* we can use real_root.dentry, real_root.mnt, because this is only called
52335 + by the RBAC system */
52336 + res = gen_full_path(&path, &real_root, buf, buflen);
52337 +
52338 + return res;
52339 +}
52340 +
52341 +static char *
52342 +d_real_path(const struct dentry *dentry, const struct vfsmount *vfsmnt,
52343 + char *buf, int buflen)
52344 +{
52345 + char *res;
52346 + struct path path;
52347 + struct path root;
52348 + struct task_struct *reaper = init_pid_ns.child_reaper;
52349 +
52350 + path.dentry = (struct dentry *)dentry;
52351 + path.mnt = (struct vfsmount *)vfsmnt;
52352 +
52353 + /* we can't use real_root.dentry, real_root.mnt, because they belong only to the RBAC system */
52354 + get_fs_root(reaper->fs, &root);
52355 +
52356 + write_seqlock(&rename_lock);
52357 + br_read_lock(&vfsmount_lock);
52358 + res = gen_full_path(&path, &root, buf, buflen);
52359 + br_read_unlock(&vfsmount_lock);
52360 + write_sequnlock(&rename_lock);
52361 +
52362 + path_put(&root);
52363 + return res;
52364 +}
52365 +
52366 +static char *
52367 +gr_to_filename_rbac(const struct dentry *dentry, const struct vfsmount *mnt)
52368 +{
52369 + char *ret;
52370 + write_seqlock(&rename_lock);
52371 + br_read_lock(&vfsmount_lock);
52372 + ret = __d_real_path(dentry, mnt, per_cpu_ptr(gr_shared_page[0],smp_processor_id()),
52373 + PAGE_SIZE);
52374 + br_read_unlock(&vfsmount_lock);
52375 + write_sequnlock(&rename_lock);
52376 + return ret;
52377 +}
52378 +
52379 +static char *
52380 +gr_to_proc_filename_rbac(const struct dentry *dentry, const struct vfsmount *mnt)
52381 +{
52382 + char *ret;
52383 + char *buf;
52384 + int buflen;
52385 +
52386 + write_seqlock(&rename_lock);
52387 + br_read_lock(&vfsmount_lock);
52388 + buf = per_cpu_ptr(gr_shared_page[0], smp_processor_id());
52389 + ret = __d_real_path(dentry, mnt, buf, PAGE_SIZE - 6);
52390 + buflen = (int)(ret - buf);
52391 + if (buflen >= 5)
52392 + prepend(&ret, &buflen, "/proc", 5);
52393 + else
52394 + ret = strcpy(buf, "<path too long>");
52395 + br_read_unlock(&vfsmount_lock);
52396 + write_sequnlock(&rename_lock);
52397 + return ret;
52398 +}
52399 +
52400 +char *
52401 +gr_to_filename_nolock(const struct dentry *dentry, const struct vfsmount *mnt)
52402 +{
52403 + return __d_real_path(dentry, mnt, per_cpu_ptr(gr_shared_page[0],smp_processor_id()),
52404 + PAGE_SIZE);
52405 +}
52406 +
52407 +char *
52408 +gr_to_filename(const struct dentry *dentry, const struct vfsmount *mnt)
52409 +{
52410 + return d_real_path(dentry, mnt, per_cpu_ptr(gr_shared_page[0], smp_processor_id()),
52411 + PAGE_SIZE);
52412 +}
52413 +
52414 +char *
52415 +gr_to_filename1(const struct dentry *dentry, const struct vfsmount *mnt)
52416 +{
52417 + return d_real_path(dentry, mnt, per_cpu_ptr(gr_shared_page[1], smp_processor_id()),
52418 + PAGE_SIZE);
52419 +}
52420 +
52421 +char *
52422 +gr_to_filename2(const struct dentry *dentry, const struct vfsmount *mnt)
52423 +{
52424 + return d_real_path(dentry, mnt, per_cpu_ptr(gr_shared_page[2], smp_processor_id()),
52425 + PAGE_SIZE);
52426 +}
52427 +
52428 +char *
52429 +gr_to_filename3(const struct dentry *dentry, const struct vfsmount *mnt)
52430 +{
52431 + return d_real_path(dentry, mnt, per_cpu_ptr(gr_shared_page[3], smp_processor_id()),
52432 + PAGE_SIZE);
52433 +}
52434 +
52435 +__inline__ __u32
52436 +to_gr_audit(const __u32 reqmode)
52437 +{
52438 + /* masks off auditable permission flags, then shifts them to create
52439 + auditing flags, and adds the special case of append auditing if
52440 + we're requesting write */
52441 + return (((reqmode & ~GR_AUDITS) << 10) | ((reqmode & GR_WRITE) ? GR_AUDIT_APPEND : 0));
52442 +}
52443 +
52444 +struct acl_subject_label *
52445 +lookup_subject_map(const struct acl_subject_label *userp)
52446 +{
52447 + unsigned int index = shash(userp, subj_map_set.s_size);
52448 + struct subject_map *match;
52449 +
52450 + match = subj_map_set.s_hash[index];
52451 +
52452 + while (match && match->user != userp)
52453 + match = match->next;
52454 +
52455 + if (match != NULL)
52456 + return match->kernel;
52457 + else
52458 + return NULL;
52459 +}
52460 +
52461 +static void
52462 +insert_subj_map_entry(struct subject_map *subjmap)
52463 +{
52464 + unsigned int index = shash(subjmap->user, subj_map_set.s_size);
52465 + struct subject_map **curr;
52466 +
52467 + subjmap->prev = NULL;
52468 +
52469 + curr = &subj_map_set.s_hash[index];
52470 + if (*curr != NULL)
52471 + (*curr)->prev = subjmap;
52472 +
52473 + subjmap->next = *curr;
52474 + *curr = subjmap;
52475 +
52476 + return;
52477 +}
52478 +
52479 +static struct acl_role_label *
52480 +lookup_acl_role_label(const struct task_struct *task, const uid_t uid,
52481 + const gid_t gid)
52482 +{
52483 + unsigned int index = rhash(uid, GR_ROLE_USER, acl_role_set.r_size);
52484 + struct acl_role_label *match;
52485 + struct role_allowed_ip *ipp;
52486 + unsigned int x;
52487 + u32 curr_ip = task->signal->curr_ip;
52488 +
52489 + task->signal->saved_ip = curr_ip;
52490 +
52491 + match = acl_role_set.r_hash[index];
52492 +
52493 + while (match) {
52494 + if ((match->roletype & (GR_ROLE_DOMAIN | GR_ROLE_USER)) == (GR_ROLE_DOMAIN | GR_ROLE_USER)) {
52495 + for (x = 0; x < match->domain_child_num; x++) {
52496 + if (match->domain_children[x] == uid)
52497 + goto found;
52498 + }
52499 + } else if (match->uidgid == uid && match->roletype & GR_ROLE_USER)
52500 + break;
52501 + match = match->next;
52502 + }
52503 +found:
52504 + if (match == NULL) {
52505 + try_group:
52506 + index = rhash(gid, GR_ROLE_GROUP, acl_role_set.r_size);
52507 + match = acl_role_set.r_hash[index];
52508 +
52509 + while (match) {
52510 + if ((match->roletype & (GR_ROLE_DOMAIN | GR_ROLE_GROUP)) == (GR_ROLE_DOMAIN | GR_ROLE_GROUP)) {
52511 + for (x = 0; x < match->domain_child_num; x++) {
52512 + if (match->domain_children[x] == gid)
52513 + goto found2;
52514 + }
52515 + } else if (match->uidgid == gid && match->roletype & GR_ROLE_GROUP)
52516 + break;
52517 + match = match->next;
52518 + }
52519 +found2:
52520 + if (match == NULL)
52521 + match = default_role;
52522 + if (match->allowed_ips == NULL)
52523 + return match;
52524 + else {
52525 + for (ipp = match->allowed_ips; ipp; ipp = ipp->next) {
52526 + if (likely
52527 + ((ntohl(curr_ip) & ipp->netmask) ==
52528 + (ntohl(ipp->addr) & ipp->netmask)))
52529 + return match;
52530 + }
52531 + match = default_role;
52532 + }
52533 + } else if (match->allowed_ips == NULL) {
52534 + return match;
52535 + } else {
52536 + for (ipp = match->allowed_ips; ipp; ipp = ipp->next) {
52537 + if (likely
52538 + ((ntohl(curr_ip) & ipp->netmask) ==
52539 + (ntohl(ipp->addr) & ipp->netmask)))
52540 + return match;
52541 + }
52542 + goto try_group;
52543 + }
52544 +
52545 + return match;
52546 +}
52547 +
52548 +struct acl_subject_label *
52549 +lookup_acl_subj_label(const ino_t ino, const dev_t dev,
52550 + const struct acl_role_label *role)
52551 +{
52552 + unsigned int index = fhash(ino, dev, role->subj_hash_size);
52553 + struct acl_subject_label *match;
52554 +
52555 + match = role->subj_hash[index];
52556 +
52557 + while (match && (match->inode != ino || match->device != dev ||
52558 + (match->mode & GR_DELETED))) {
52559 + match = match->next;
52560 + }
52561 +
52562 + if (match && !(match->mode & GR_DELETED))
52563 + return match;
52564 + else
52565 + return NULL;
52566 +}
52567 +
52568 +struct acl_subject_label *
52569 +lookup_acl_subj_label_deleted(const ino_t ino, const dev_t dev,
52570 + const struct acl_role_label *role)
52571 +{
52572 + unsigned int index = fhash(ino, dev, role->subj_hash_size);
52573 + struct acl_subject_label *match;
52574 +
52575 + match = role->subj_hash[index];
52576 +
52577 + while (match && (match->inode != ino || match->device != dev ||
52578 + !(match->mode & GR_DELETED))) {
52579 + match = match->next;
52580 + }
52581 +
52582 + if (match && (match->mode & GR_DELETED))
52583 + return match;
52584 + else
52585 + return NULL;
52586 +}
52587 +
52588 +static struct acl_object_label *
52589 +lookup_acl_obj_label(const ino_t ino, const dev_t dev,
52590 + const struct acl_subject_label *subj)
52591 +{
52592 + unsigned int index = fhash(ino, dev, subj->obj_hash_size);
52593 + struct acl_object_label *match;
52594 +
52595 + match = subj->obj_hash[index];
52596 +
52597 + while (match && (match->inode != ino || match->device != dev ||
52598 + (match->mode & GR_DELETED))) {
52599 + match = match->next;
52600 + }
52601 +
52602 + if (match && !(match->mode & GR_DELETED))
52603 + return match;
52604 + else
52605 + return NULL;
52606 +}
52607 +
52608 +static struct acl_object_label *
52609 +lookup_acl_obj_label_create(const ino_t ino, const dev_t dev,
52610 + const struct acl_subject_label *subj)
52611 +{
52612 + unsigned int index = fhash(ino, dev, subj->obj_hash_size);
52613 + struct acl_object_label *match;
52614 +
52615 + match = subj->obj_hash[index];
52616 +
52617 + while (match && (match->inode != ino || match->device != dev ||
52618 + !(match->mode & GR_DELETED))) {
52619 + match = match->next;
52620 + }
52621 +
52622 + if (match && (match->mode & GR_DELETED))
52623 + return match;
52624 +
52625 + match = subj->obj_hash[index];
52626 +
52627 + while (match && (match->inode != ino || match->device != dev ||
52628 + (match->mode & GR_DELETED))) {
52629 + match = match->next;
52630 + }
52631 +
52632 + if (match && !(match->mode & GR_DELETED))
52633 + return match;
52634 + else
52635 + return NULL;
52636 +}
52637 +
52638 +static struct name_entry *
52639 +lookup_name_entry(const char *name)
52640 +{
52641 + unsigned int len = strlen(name);
52642 + unsigned int key = full_name_hash(name, len);
52643 + unsigned int index = key % name_set.n_size;
52644 + struct name_entry *match;
52645 +
52646 + match = name_set.n_hash[index];
52647 +
52648 + while (match && (match->key != key || !gr_streq(match->name, name, match->len, len)))
52649 + match = match->next;
52650 +
52651 + return match;
52652 +}
52653 +
52654 +static struct name_entry *
52655 +lookup_name_entry_create(const char *name)
52656 +{
52657 + unsigned int len = strlen(name);
52658 + unsigned int key = full_name_hash(name, len);
52659 + unsigned int index = key % name_set.n_size;
52660 + struct name_entry *match;
52661 +
52662 + match = name_set.n_hash[index];
52663 +
52664 + while (match && (match->key != key || !gr_streq(match->name, name, match->len, len) ||
52665 + !match->deleted))
52666 + match = match->next;
52667 +
52668 + if (match && match->deleted)
52669 + return match;
52670 +
52671 + match = name_set.n_hash[index];
52672 +
52673 + while (match && (match->key != key || !gr_streq(match->name, name, match->len, len) ||
52674 + match->deleted))
52675 + match = match->next;
52676 +
52677 + if (match && !match->deleted)
52678 + return match;
52679 + else
52680 + return NULL;
52681 +}
52682 +
52683 +static struct inodev_entry *
52684 +lookup_inodev_entry(const ino_t ino, const dev_t dev)
52685 +{
52686 + unsigned int index = fhash(ino, dev, inodev_set.i_size);
52687 + struct inodev_entry *match;
52688 +
52689 + match = inodev_set.i_hash[index];
52690 +
52691 + while (match && (match->nentry->inode != ino || match->nentry->device != dev))
52692 + match = match->next;
52693 +
52694 + return match;
52695 +}
52696 +
52697 +static void
52698 +insert_inodev_entry(struct inodev_entry *entry)
52699 +{
52700 + unsigned int index = fhash(entry->nentry->inode, entry->nentry->device,
52701 + inodev_set.i_size);
52702 + struct inodev_entry **curr;
52703 +
52704 + entry->prev = NULL;
52705 +
52706 + curr = &inodev_set.i_hash[index];
52707 + if (*curr != NULL)
52708 + (*curr)->prev = entry;
52709 +
52710 + entry->next = *curr;
52711 + *curr = entry;
52712 +
52713 + return;
52714 +}
52715 +
52716 +static void
52717 +__insert_acl_role_label(struct acl_role_label *role, uid_t uidgid)
52718 +{
52719 + unsigned int index =
52720 + rhash(uidgid, role->roletype & (GR_ROLE_USER | GR_ROLE_GROUP), acl_role_set.r_size);
52721 + struct acl_role_label **curr;
52722 + struct acl_role_label *tmp, *tmp2;
52723 +
52724 + curr = &acl_role_set.r_hash[index];
52725 +
52726 + /* simple case, slot is empty, just set it to our role */
52727 + if (*curr == NULL) {
52728 + *curr = role;
52729 + } else {
52730 + /* example:
52731 + 1 -> 2 -> 3 (adding 2 -> 3 to here)
52732 + 2 -> 3
52733 + */
52734 + /* first check to see if we can already be reached via this slot */
52735 + tmp = *curr;
52736 + while (tmp && tmp != role)
52737 + tmp = tmp->next;
52738 + if (tmp == role) {
52739 + /* we don't need to add ourselves to this slot's chain */
52740 + return;
52741 + }
52742 + /* we need to add ourselves to this chain, two cases */
52743 + if (role->next == NULL) {
52744 + /* simple case, append the current chain to our role */
52745 + role->next = *curr;
52746 + *curr = role;
52747 + } else {
52748 + /* 1 -> 2 -> 3 -> 4
52749 + 2 -> 3 -> 4
52750 + 3 -> 4 (adding 1 -> 2 -> 3 -> 4 to here)
52751 + */
52752 + /* trickier case: walk our role's chain until we find
52753 + the role for the start of the current slot's chain */
52754 + tmp = role;
52755 + tmp2 = *curr;
52756 + while (tmp->next && tmp->next != tmp2)
52757 + tmp = tmp->next;
52758 + if (tmp->next == tmp2) {
52759 + /* from example above, we found 3, so just
52760 + replace this slot's chain with ours */
52761 + *curr = role;
52762 + } else {
52763 + /* we didn't find a subset of our role's chain
52764 + in the current slot's chain, so append their
52765 + chain to ours, and set us as the first role in
52766 + the slot's chain
52767 +
52768 + we could fold this case with the case above,
52769 + but making it explicit for clarity
52770 + */
52771 + tmp->next = tmp2;
52772 + *curr = role;
52773 + }
52774 + }
52775 + }
52776 +
52777 + return;
52778 +}
52779 +
52780 +static void
52781 +insert_acl_role_label(struct acl_role_label *role)
52782 +{
52783 + int i;
52784 +
52785 + if (role_list == NULL) {
52786 + role_list = role;
52787 + role->prev = NULL;
52788 + } else {
52789 + role->prev = role_list;
52790 + role_list = role;
52791 + }
52792 +
52793 + /* used for hash chains */
52794 + role->next = NULL;
52795 +
52796 + if (role->roletype & GR_ROLE_DOMAIN) {
52797 + for (i = 0; i < role->domain_child_num; i++)
52798 + __insert_acl_role_label(role, role->domain_children[i]);
52799 + } else
52800 + __insert_acl_role_label(role, role->uidgid);
52801 +}
52802 +
52803 +static int
52804 +insert_name_entry(char *name, const ino_t inode, const dev_t device, __u8 deleted)
52805 +{
52806 + struct name_entry **curr, *nentry;
52807 + struct inodev_entry *ientry;
52808 + unsigned int len = strlen(name);
52809 + unsigned int key = full_name_hash(name, len);
52810 + unsigned int index = key % name_set.n_size;
52811 +
52812 + curr = &name_set.n_hash[index];
52813 +
52814 + while (*curr && ((*curr)->key != key || !gr_streq((*curr)->name, name, (*curr)->len, len)))
52815 + curr = &((*curr)->next);
52816 +
52817 + if (*curr != NULL)
52818 + return 1;
52819 +
52820 + nentry = acl_alloc(sizeof (struct name_entry));
52821 + if (nentry == NULL)
52822 + return 0;
52823 + ientry = acl_alloc(sizeof (struct inodev_entry));
52824 + if (ientry == NULL)
52825 + return 0;
52826 + ientry->nentry = nentry;
52827 +
52828 + nentry->key = key;
52829 + nentry->name = name;
52830 + nentry->inode = inode;
52831 + nentry->device = device;
52832 + nentry->len = len;
52833 + nentry->deleted = deleted;
52834 +
52835 + nentry->prev = NULL;
52836 + curr = &name_set.n_hash[index];
52837 + if (*curr != NULL)
52838 + (*curr)->prev = nentry;
52839 + nentry->next = *curr;
52840 + *curr = nentry;
52841 +
52842 + /* insert us into the table searchable by inode/dev */
52843 + insert_inodev_entry(ientry);
52844 +
52845 + return 1;
52846 +}
52847 +
52848 +static void
52849 +insert_acl_obj_label(struct acl_object_label *obj,
52850 + struct acl_subject_label *subj)
52851 +{
52852 + unsigned int index =
52853 + fhash(obj->inode, obj->device, subj->obj_hash_size);
52854 + struct acl_object_label **curr;
52855 +
52856 +
52857 + obj->prev = NULL;
52858 +
52859 + curr = &subj->obj_hash[index];
52860 + if (*curr != NULL)
52861 + (*curr)->prev = obj;
52862 +
52863 + obj->next = *curr;
52864 + *curr = obj;
52865 +
52866 + return;
52867 +}
52868 +
52869 +static void
52870 +insert_acl_subj_label(struct acl_subject_label *obj,
52871 + struct acl_role_label *role)
52872 +{
52873 + unsigned int index = fhash(obj->inode, obj->device, role->subj_hash_size);
52874 + struct acl_subject_label **curr;
52875 +
52876 + obj->prev = NULL;
52877 +
52878 + curr = &role->subj_hash[index];
52879 + if (*curr != NULL)
52880 + (*curr)->prev = obj;
52881 +
52882 + obj->next = *curr;
52883 + *curr = obj;
52884 +
52885 + return;
52886 +}
52887 +
52888 +/* allocating chained hash tables, so optimal size is where lambda ~ 1 */
52889 +
52890 +static void *
52891 +create_table(__u32 * len, int elementsize)
52892 +{
52893 + unsigned int table_sizes[] = {
52894 + 7, 13, 31, 61, 127, 251, 509, 1021, 2039, 4093, 8191, 16381,
52895 + 32749, 65521, 131071, 262139, 524287, 1048573, 2097143,
52896 + 4194301, 8388593, 16777213, 33554393, 67108859
52897 + };
52898 + void *newtable = NULL;
52899 + unsigned int pwr = 0;
52900 +
52901 + while ((pwr < ((sizeof (table_sizes) / sizeof (table_sizes[0])) - 1)) &&
52902 + table_sizes[pwr] <= *len)
52903 + pwr++;
52904 +
52905 + if (table_sizes[pwr] <= *len || (table_sizes[pwr] > ULONG_MAX / elementsize))
52906 + return newtable;
52907 +
52908 + if ((table_sizes[pwr] * elementsize) <= PAGE_SIZE)
52909 + newtable =
52910 + kmalloc(table_sizes[pwr] * elementsize, GFP_KERNEL);
52911 + else
52912 + newtable = vmalloc(table_sizes[pwr] * elementsize);
52913 +
52914 + *len = table_sizes[pwr];
52915 +
52916 + return newtable;
52917 +}
52918 +
52919 +static int
52920 +init_variables(const struct gr_arg *arg)
52921 +{
52922 + struct task_struct *reaper = init_pid_ns.child_reaper;
52923 + unsigned int stacksize;
52924 +
52925 + subj_map_set.s_size = arg->role_db.num_subjects;
52926 + acl_role_set.r_size = arg->role_db.num_roles + arg->role_db.num_domain_children;
52927 + name_set.n_size = arg->role_db.num_objects;
52928 + inodev_set.i_size = arg->role_db.num_objects;
52929 +
52930 + if (!subj_map_set.s_size || !acl_role_set.r_size ||
52931 + !name_set.n_size || !inodev_set.i_size)
52932 + return 1;
52933 +
52934 + if (!gr_init_uidset())
52935 + return 1;
52936 +
52937 + /* set up the stack that holds allocation info */
52938 +
52939 + stacksize = arg->role_db.num_pointers + 5;
52940 +
52941 + if (!acl_alloc_stack_init(stacksize))
52942 + return 1;
52943 +
52944 + /* grab reference for the real root dentry and vfsmount */
52945 + get_fs_root(reaper->fs, &real_root);
52946 +
52947 +#ifdef CONFIG_GRKERNSEC_RBAC_DEBUG
52948 + printk(KERN_ALERT "Obtained real root device=%d, inode=%lu\n", __get_dev(real_root.dentry), real_root.dentry->d_inode->i_ino);
52949 +#endif
52950 +
52951 + fakefs_obj_rw = acl_alloc(sizeof(struct acl_object_label));
52952 + if (fakefs_obj_rw == NULL)
52953 + return 1;
52954 + fakefs_obj_rw->mode = GR_FIND | GR_READ | GR_WRITE;
52955 +
52956 + fakefs_obj_rwx = acl_alloc(sizeof(struct acl_object_label));
52957 + if (fakefs_obj_rwx == NULL)
52958 + return 1;
52959 + fakefs_obj_rwx->mode = GR_FIND | GR_READ | GR_WRITE | GR_EXEC;
52960 +
52961 + subj_map_set.s_hash =
52962 + (struct subject_map **) create_table(&subj_map_set.s_size, sizeof(void *));
52963 + acl_role_set.r_hash =
52964 + (struct acl_role_label **) create_table(&acl_role_set.r_size, sizeof(void *));
52965 + name_set.n_hash = (struct name_entry **) create_table(&name_set.n_size, sizeof(void *));
52966 + inodev_set.i_hash =
52967 + (struct inodev_entry **) create_table(&inodev_set.i_size, sizeof(void *));
52968 +
52969 + if (!subj_map_set.s_hash || !acl_role_set.r_hash ||
52970 + !name_set.n_hash || !inodev_set.i_hash)
52971 + return 1;
52972 +
52973 + memset(subj_map_set.s_hash, 0,
52974 + sizeof(struct subject_map *) * subj_map_set.s_size);
52975 + memset(acl_role_set.r_hash, 0,
52976 + sizeof (struct acl_role_label *) * acl_role_set.r_size);
52977 + memset(name_set.n_hash, 0,
52978 + sizeof (struct name_entry *) * name_set.n_size);
52979 + memset(inodev_set.i_hash, 0,
52980 + sizeof (struct inodev_entry *) * inodev_set.i_size);
52981 +
52982 + return 0;
52983 +}
52984 +
52985 +/* free information not needed after startup
52986 + currently contains user->kernel pointer mappings for subjects
52987 +*/
52988 +
52989 +static void
52990 +free_init_variables(void)
52991 +{
52992 + __u32 i;
52993 +
52994 + if (subj_map_set.s_hash) {
52995 + for (i = 0; i < subj_map_set.s_size; i++) {
52996 + if (subj_map_set.s_hash[i]) {
52997 + kfree(subj_map_set.s_hash[i]);
52998 + subj_map_set.s_hash[i] = NULL;
52999 + }
53000 + }
53001 +
53002 + if ((subj_map_set.s_size * sizeof (struct subject_map *)) <=
53003 + PAGE_SIZE)
53004 + kfree(subj_map_set.s_hash);
53005 + else
53006 + vfree(subj_map_set.s_hash);
53007 + }
53008 +
53009 + return;
53010 +}
53011 +
53012 +static void
53013 +free_variables(void)
53014 +{
53015 + struct acl_subject_label *s;
53016 + struct acl_role_label *r;
53017 + struct task_struct *task, *task2;
53018 + unsigned int x;
53019 +
53020 + gr_clear_learn_entries();
53021 +
53022 + read_lock(&tasklist_lock);
53023 + do_each_thread(task2, task) {
53024 + task->acl_sp_role = 0;
53025 + task->acl_role_id = 0;
53026 + task->acl = NULL;
53027 + task->role = NULL;
53028 + } while_each_thread(task2, task);
53029 + read_unlock(&tasklist_lock);
53030 +
53031 + /* release the reference to the real root dentry and vfsmount */
53032 + path_put(&real_root);
53033 + memset(&real_root, 0, sizeof(real_root));
53034 +
53035 + /* free all object hash tables */
53036 +
53037 + FOR_EACH_ROLE_START(r)
53038 + if (r->subj_hash == NULL)
53039 + goto next_role;
53040 + FOR_EACH_SUBJECT_START(r, s, x)
53041 + if (s->obj_hash == NULL)
53042 + break;
53043 + if ((s->obj_hash_size * sizeof (struct acl_object_label *)) <= PAGE_SIZE)
53044 + kfree(s->obj_hash);
53045 + else
53046 + vfree(s->obj_hash);
53047 + FOR_EACH_SUBJECT_END(s, x)
53048 + FOR_EACH_NESTED_SUBJECT_START(r, s)
53049 + if (s->obj_hash == NULL)
53050 + break;
53051 + if ((s->obj_hash_size * sizeof (struct acl_object_label *)) <= PAGE_SIZE)
53052 + kfree(s->obj_hash);
53053 + else
53054 + vfree(s->obj_hash);
53055 + FOR_EACH_NESTED_SUBJECT_END(s)
53056 + if ((r->subj_hash_size * sizeof (struct acl_subject_label *)) <= PAGE_SIZE)
53057 + kfree(r->subj_hash);
53058 + else
53059 + vfree(r->subj_hash);
53060 + r->subj_hash = NULL;
53061 +next_role:
53062 + FOR_EACH_ROLE_END(r)
53063 +
53064 + acl_free_all();
53065 +
53066 + if (acl_role_set.r_hash) {
53067 + if ((acl_role_set.r_size * sizeof (struct acl_role_label *)) <=
53068 + PAGE_SIZE)
53069 + kfree(acl_role_set.r_hash);
53070 + else
53071 + vfree(acl_role_set.r_hash);
53072 + }
53073 + if (name_set.n_hash) {
53074 + if ((name_set.n_size * sizeof (struct name_entry *)) <=
53075 + PAGE_SIZE)
53076 + kfree(name_set.n_hash);
53077 + else
53078 + vfree(name_set.n_hash);
53079 + }
53080 +
53081 + if (inodev_set.i_hash) {
53082 + if ((inodev_set.i_size * sizeof (struct inodev_entry *)) <=
53083 + PAGE_SIZE)
53084 + kfree(inodev_set.i_hash);
53085 + else
53086 + vfree(inodev_set.i_hash);
53087 + }
53088 +
53089 + gr_free_uidset();
53090 +
53091 + memset(&name_set, 0, sizeof (struct name_db));
53092 + memset(&inodev_set, 0, sizeof (struct inodev_db));
53093 + memset(&acl_role_set, 0, sizeof (struct acl_role_db));
53094 + memset(&subj_map_set, 0, sizeof (struct acl_subj_map_db));
53095 +
53096 + default_role = NULL;
53097 + kernel_role = NULL;
53098 + role_list = NULL;
53099 +
53100 + return;
53101 +}
53102 +
53103 +static __u32
53104 +count_user_objs(struct acl_object_label *userp)
53105 +{
53106 + struct acl_object_label o_tmp;
53107 + __u32 num = 0;
53108 +
53109 + while (userp) {
53110 + if (copy_from_user(&o_tmp, userp,
53111 + sizeof (struct acl_object_label)))
53112 + break;
53113 +
53114 + userp = o_tmp.prev;
53115 + num++;
53116 + }
53117 +
53118 + return num;
53119 +}
53120 +
53121 +static struct acl_subject_label *
53122 +do_copy_user_subj(struct acl_subject_label *userp, struct acl_role_label *role, int *already_copied);
53123 +
53124 +static int
53125 +copy_user_glob(struct acl_object_label *obj)
53126 +{
53127 + struct acl_object_label *g_tmp, **guser;
53128 + unsigned int len;
53129 + char *tmp;
53130 +
53131 + if (obj->globbed == NULL)
53132 + return 0;
53133 +
53134 + guser = &obj->globbed;
53135 + while (*guser) {
53136 + g_tmp = (struct acl_object_label *)
53137 + acl_alloc(sizeof (struct acl_object_label));
53138 + if (g_tmp == NULL)
53139 + return -ENOMEM;
53140 +
53141 + if (copy_from_user(g_tmp, *guser,
53142 + sizeof (struct acl_object_label)))
53143 + return -EFAULT;
53144 +
53145 + len = strnlen_user(g_tmp->filename, PATH_MAX);
53146 +
53147 + if (!len || len >= PATH_MAX)
53148 + return -EINVAL;
53149 +
53150 + if ((tmp = (char *) acl_alloc(len)) == NULL)
53151 + return -ENOMEM;
53152 +
53153 + if (copy_from_user(tmp, g_tmp->filename, len))
53154 + return -EFAULT;
53155 + tmp[len-1] = '\0';
53156 + g_tmp->filename = tmp;
53157 +
53158 + *guser = g_tmp;
53159 + guser = &(g_tmp->next);
53160 + }
53161 +
53162 + return 0;
53163 +}
53164 +
53165 +static int
53166 +copy_user_objs(struct acl_object_label *userp, struct acl_subject_label *subj,
53167 + struct acl_role_label *role)
53168 +{
53169 + struct acl_object_label *o_tmp;
53170 + unsigned int len;
53171 + int ret;
53172 + char *tmp;
53173 +
53174 + while (userp) {
53175 + if ((o_tmp = (struct acl_object_label *)
53176 + acl_alloc(sizeof (struct acl_object_label))) == NULL)
53177 + return -ENOMEM;
53178 +
53179 + if (copy_from_user(o_tmp, userp,
53180 + sizeof (struct acl_object_label)))
53181 + return -EFAULT;
53182 +
53183 + userp = o_tmp->prev;
53184 +
53185 + len = strnlen_user(o_tmp->filename, PATH_MAX);
53186 +
53187 + if (!len || len >= PATH_MAX)
53188 + return -EINVAL;
53189 +
53190 + if ((tmp = (char *) acl_alloc(len)) == NULL)
53191 + return -ENOMEM;
53192 +
53193 + if (copy_from_user(tmp, o_tmp->filename, len))
53194 + return -EFAULT;
53195 + tmp[len-1] = '\0';
53196 + o_tmp->filename = tmp;
53197 +
53198 + insert_acl_obj_label(o_tmp, subj);
53199 + if (!insert_name_entry(o_tmp->filename, o_tmp->inode,
53200 + o_tmp->device, (o_tmp->mode & GR_DELETED) ? 1 : 0))
53201 + return -ENOMEM;
53202 +
53203 + ret = copy_user_glob(o_tmp);
53204 + if (ret)
53205 + return ret;
53206 +
53207 + if (o_tmp->nested) {
53208 + int already_copied;
53209 +
53210 + o_tmp->nested = do_copy_user_subj(o_tmp->nested, role, &already_copied);
53211 + if (IS_ERR(o_tmp->nested))
53212 + return PTR_ERR(o_tmp->nested);
53213 +
53214 + /* insert into nested subject list if we haven't copied this one yet
53215 + to prevent duplicate entries */
53216 + if (!already_copied) {
53217 + o_tmp->nested->next = role->hash->first;
53218 + role->hash->first = o_tmp->nested;
53219 + }
53220 + }
53221 + }
53222 +
53223 + return 0;
53224 +}
53225 +
53226 +static __u32
53227 +count_user_subjs(struct acl_subject_label *userp)
53228 +{
53229 + struct acl_subject_label s_tmp;
53230 + __u32 num = 0;
53231 +
53232 + while (userp) {
53233 + if (copy_from_user(&s_tmp, userp,
53234 + sizeof (struct acl_subject_label)))
53235 + break;
53236 +
53237 + userp = s_tmp.prev;
53238 + /* do not count nested subjects against this count, since
53239 + they are not included in the hash table, but are
53240 + attached to objects. We have already counted
53241 + the subjects in userspace for the allocation
53242 + stack
53243 + */
53244 + if (!(s_tmp.mode & GR_NESTED))
53245 + num++;
53246 + }
53247 +
53248 + return num;
53249 +}
53250 +
53251 +static int
53252 +copy_user_allowedips(struct acl_role_label *rolep)
53253 +{
53254 + struct role_allowed_ip *ruserip, *rtmp = NULL, *rlast;
53255 +
53256 + ruserip = rolep->allowed_ips;
53257 +
53258 + while (ruserip) {
53259 + rlast = rtmp;
53260 +
53261 + if ((rtmp = (struct role_allowed_ip *)
53262 + acl_alloc(sizeof (struct role_allowed_ip))) == NULL)
53263 + return -ENOMEM;
53264 +
53265 + if (copy_from_user(rtmp, ruserip,
53266 + sizeof (struct role_allowed_ip)))
53267 + return -EFAULT;
53268 +
53269 + ruserip = rtmp->prev;
53270 +
53271 + if (!rlast) {
53272 + rtmp->prev = NULL;
53273 + rolep->allowed_ips = rtmp;
53274 + } else {
53275 + rlast->next = rtmp;
53276 + rtmp->prev = rlast;
53277 + }
53278 +
53279 + if (!ruserip)
53280 + rtmp->next = NULL;
53281 + }
53282 +
53283 + return 0;
53284 +}
53285 +
53286 +static int
53287 +copy_user_transitions(struct acl_role_label *rolep)
53288 +{
53289 + struct role_transition *rusertp, *rtmp = NULL, *rlast;
53290 +
53291 + unsigned int len;
53292 + char *tmp;
53293 +
53294 + rusertp = rolep->transitions;
53295 +
53296 + while (rusertp) {
53297 + rlast = rtmp;
53298 +
53299 + if ((rtmp = (struct role_transition *)
53300 + acl_alloc(sizeof (struct role_transition))) == NULL)
53301 + return -ENOMEM;
53302 +
53303 + if (copy_from_user(rtmp, rusertp,
53304 + sizeof (struct role_transition)))
53305 + return -EFAULT;
53306 +
53307 + rusertp = rtmp->prev;
53308 +
53309 + len = strnlen_user(rtmp->rolename, GR_SPROLE_LEN);
53310 +
53311 + if (!len || len >= GR_SPROLE_LEN)
53312 + return -EINVAL;
53313 +
53314 + if ((tmp = (char *) acl_alloc(len)) == NULL)
53315 + return -ENOMEM;
53316 +
53317 + if (copy_from_user(tmp, rtmp->rolename, len))
53318 + return -EFAULT;
53319 + tmp[len-1] = '\0';
53320 + rtmp->rolename = tmp;
53321 +
53322 + if (!rlast) {
53323 + rtmp->prev = NULL;
53324 + rolep->transitions = rtmp;
53325 + } else {
53326 + rlast->next = rtmp;
53327 + rtmp->prev = rlast;
53328 + }
53329 +
53330 + if (!rusertp)
53331 + rtmp->next = NULL;
53332 + }
53333 +
53334 + return 0;
53335 +}
53336 +
53337 +static struct acl_subject_label *
53338 +do_copy_user_subj(struct acl_subject_label *userp, struct acl_role_label *role, int *already_copied)
53339 +{
53340 + struct acl_subject_label *s_tmp = NULL, *s_tmp2;
53341 + unsigned int len;
53342 + char *tmp;
53343 + __u32 num_objs;
53344 + struct acl_ip_label **i_tmp, *i_utmp2;
53345 + struct gr_hash_struct ghash;
53346 + struct subject_map *subjmap;
53347 + unsigned int i_num;
53348 + int err;
53349 +
53350 + if (already_copied != NULL)
53351 + *already_copied = 0;
53352 +
53353 + s_tmp = lookup_subject_map(userp);
53354 +
53355 + /* we've already copied this subject into the kernel, just return
53356 + the reference to it, and don't copy it over again
53357 + */
53358 + if (s_tmp) {
53359 + if (already_copied != NULL)
53360 + *already_copied = 1;
53361 + return(s_tmp);
53362 + }
53363 +
53364 + if ((s_tmp = (struct acl_subject_label *)
53365 + acl_alloc(sizeof (struct acl_subject_label))) == NULL)
53366 + return ERR_PTR(-ENOMEM);
53367 +
53368 + subjmap = (struct subject_map *)kmalloc(sizeof (struct subject_map), GFP_KERNEL);
53369 + if (subjmap == NULL)
53370 + return ERR_PTR(-ENOMEM);
53371 +
53372 + subjmap->user = userp;
53373 + subjmap->kernel = s_tmp;
53374 + insert_subj_map_entry(subjmap);
53375 +
53376 + if (copy_from_user(s_tmp, userp,
53377 + sizeof (struct acl_subject_label)))
53378 + return ERR_PTR(-EFAULT);
53379 +
53380 + len = strnlen_user(s_tmp->filename, PATH_MAX);
53381 +
53382 + if (!len || len >= PATH_MAX)
53383 + return ERR_PTR(-EINVAL);
53384 +
53385 + if ((tmp = (char *) acl_alloc(len)) == NULL)
53386 + return ERR_PTR(-ENOMEM);
53387 +
53388 + if (copy_from_user(tmp, s_tmp->filename, len))
53389 + return ERR_PTR(-EFAULT);
53390 + tmp[len-1] = '\0';
53391 + s_tmp->filename = tmp;
53392 +
53393 + if (!strcmp(s_tmp->filename, "/"))
53394 + role->root_label = s_tmp;
53395 +
53396 + if (copy_from_user(&ghash, s_tmp->hash, sizeof(struct gr_hash_struct)))
53397 + return ERR_PTR(-EFAULT);
53398 +
53399 + /* copy user and group transition tables */
53400 +
53401 + if (s_tmp->user_trans_num) {
53402 + uid_t *uidlist;
53403 +
53404 + uidlist = (uid_t *)acl_alloc_num(s_tmp->user_trans_num, sizeof(uid_t));
53405 + if (uidlist == NULL)
53406 + return ERR_PTR(-ENOMEM);
53407 + if (copy_from_user(uidlist, s_tmp->user_transitions, s_tmp->user_trans_num * sizeof(uid_t)))
53408 + return ERR_PTR(-EFAULT);
53409 +
53410 + s_tmp->user_transitions = uidlist;
53411 + }
53412 +
53413 + if (s_tmp->group_trans_num) {
53414 + gid_t *gidlist;
53415 +
53416 + gidlist = (gid_t *)acl_alloc_num(s_tmp->group_trans_num, sizeof(gid_t));
53417 + if (gidlist == NULL)
53418 + return ERR_PTR(-ENOMEM);
53419 + if (copy_from_user(gidlist, s_tmp->group_transitions, s_tmp->group_trans_num * sizeof(gid_t)))
53420 + return ERR_PTR(-EFAULT);
53421 +
53422 + s_tmp->group_transitions = gidlist;
53423 + }
53424 +
53425 + /* set up object hash table */
53426 + num_objs = count_user_objs(ghash.first);
53427 +
53428 + s_tmp->obj_hash_size = num_objs;
53429 + s_tmp->obj_hash =
53430 + (struct acl_object_label **)
53431 + create_table(&(s_tmp->obj_hash_size), sizeof(void *));
53432 +
53433 + if (!s_tmp->obj_hash)
53434 + return ERR_PTR(-ENOMEM);
53435 +
53436 + memset(s_tmp->obj_hash, 0,
53437 + s_tmp->obj_hash_size *
53438 + sizeof (struct acl_object_label *));
53439 +
53440 + /* add in objects */
53441 + err = copy_user_objs(ghash.first, s_tmp, role);
53442 +
53443 + if (err)
53444 + return ERR_PTR(err);
53445 +
53446 + /* set pointer for parent subject */
53447 + if (s_tmp->parent_subject) {
53448 + s_tmp2 = do_copy_user_subj(s_tmp->parent_subject, role, NULL);
53449 +
53450 + if (IS_ERR(s_tmp2))
53451 + return s_tmp2;
53452 +
53453 + s_tmp->parent_subject = s_tmp2;
53454 + }
53455 +
53456 + /* add in ip acls */
53457 +
53458 + if (!s_tmp->ip_num) {
53459 + s_tmp->ips = NULL;
53460 + goto insert;
53461 + }
53462 +
53463 + i_tmp =
53464 + (struct acl_ip_label **) acl_alloc_num(s_tmp->ip_num,
53465 + sizeof (struct acl_ip_label *));
53466 +
53467 + if (!i_tmp)
53468 + return ERR_PTR(-ENOMEM);
53469 +
53470 + for (i_num = 0; i_num < s_tmp->ip_num; i_num++) {
53471 + *(i_tmp + i_num) =
53472 + (struct acl_ip_label *)
53473 + acl_alloc(sizeof (struct acl_ip_label));
53474 + if (!*(i_tmp + i_num))
53475 + return ERR_PTR(-ENOMEM);
53476 +
53477 + if (copy_from_user
53478 + (&i_utmp2, s_tmp->ips + i_num,
53479 + sizeof (struct acl_ip_label *)))
53480 + return ERR_PTR(-EFAULT);
53481 +
53482 + if (copy_from_user
53483 + (*(i_tmp + i_num), i_utmp2,
53484 + sizeof (struct acl_ip_label)))
53485 + return ERR_PTR(-EFAULT);
53486 +
53487 + if ((*(i_tmp + i_num))->iface == NULL)
53488 + continue;
53489 +
53490 + len = strnlen_user((*(i_tmp + i_num))->iface, IFNAMSIZ);
53491 + if (!len || len >= IFNAMSIZ)
53492 + return ERR_PTR(-EINVAL);
53493 + tmp = acl_alloc(len);
53494 + if (tmp == NULL)
53495 + return ERR_PTR(-ENOMEM);
53496 + if (copy_from_user(tmp, (*(i_tmp + i_num))->iface, len))
53497 + return ERR_PTR(-EFAULT);
53498 + (*(i_tmp + i_num))->iface = tmp;
53499 + }
53500 +
53501 + s_tmp->ips = i_tmp;
53502 +
53503 +insert:
53504 + if (!insert_name_entry(s_tmp->filename, s_tmp->inode,
53505 + s_tmp->device, (s_tmp->mode & GR_DELETED) ? 1 : 0))
53506 + return ERR_PTR(-ENOMEM);
53507 +
53508 + return s_tmp;
53509 +}
53510 +
53511 +static int
53512 +copy_user_subjs(struct acl_subject_label *userp, struct acl_role_label *role)
53513 +{
53514 + struct acl_subject_label s_pre;
53515 + struct acl_subject_label * ret;
53516 + int err;
53517 +
53518 + while (userp) {
53519 + if (copy_from_user(&s_pre, userp,
53520 + sizeof (struct acl_subject_label)))
53521 + return -EFAULT;
53522 +
53523 + /* do not add nested subjects here, add
53524 + while parsing objects
53525 + */
53526 +
53527 + if (s_pre.mode & GR_NESTED) {
53528 + userp = s_pre.prev;
53529 + continue;
53530 + }
53531 +
53532 + ret = do_copy_user_subj(userp, role, NULL);
53533 +
53534 + err = PTR_ERR(ret);
53535 + if (IS_ERR(ret))
53536 + return err;
53537 +
53538 + insert_acl_subj_label(ret, role);
53539 +
53540 + userp = s_pre.prev;
53541 + }
53542 +
53543 + return 0;
53544 +}
53545 +
53546 +static int
53547 +copy_user_acl(struct gr_arg *arg)
53548 +{
53549 + struct acl_role_label *r_tmp = NULL, **r_utmp, *r_utmp2;
53550 + struct acl_subject_label *subj_list;
53551 + struct sprole_pw *sptmp;
53552 + struct gr_hash_struct *ghash;
53553 + uid_t *domainlist;
53554 + unsigned int r_num;
53555 + unsigned int len;
53556 + char *tmp;
53557 + int err = 0;
53558 + __u16 i;
53559 + __u32 num_subjs;
53560 +
53561 + /* we need a default and kernel role */
53562 + if (arg->role_db.num_roles < 2)
53563 + return -EINVAL;
53564 +
53565 + /* copy special role authentication info from userspace */
53566 +
53567 + num_sprole_pws = arg->num_sprole_pws;
53568 + acl_special_roles = (struct sprole_pw **) acl_alloc_num(num_sprole_pws, sizeof(struct sprole_pw *));
53569 +
53570 + if (!acl_special_roles && num_sprole_pws)
53571 + return -ENOMEM;
53572 +
53573 + for (i = 0; i < num_sprole_pws; i++) {
53574 + sptmp = (struct sprole_pw *) acl_alloc(sizeof(struct sprole_pw));
53575 + if (!sptmp)
53576 + return -ENOMEM;
53577 + if (copy_from_user(sptmp, arg->sprole_pws + i,
53578 + sizeof (struct sprole_pw)))
53579 + return -EFAULT;
53580 +
53581 + len = strnlen_user(sptmp->rolename, GR_SPROLE_LEN);
53582 +
53583 + if (!len || len >= GR_SPROLE_LEN)
53584 + return -EINVAL;
53585 +
53586 + if ((tmp = (char *) acl_alloc(len)) == NULL)
53587 + return -ENOMEM;
53588 +
53589 + if (copy_from_user(tmp, sptmp->rolename, len))
53590 + return -EFAULT;
53591 +
53592 + tmp[len-1] = '\0';
53593 +#ifdef CONFIG_GRKERNSEC_RBAC_DEBUG
53594 + printk(KERN_ALERT "Copying special role %s\n", tmp);
53595 +#endif
53596 + sptmp->rolename = tmp;
53597 + acl_special_roles[i] = sptmp;
53598 + }
53599 +
53600 + r_utmp = (struct acl_role_label **) arg->role_db.r_table;
53601 +
53602 + for (r_num = 0; r_num < arg->role_db.num_roles; r_num++) {
53603 + r_tmp = acl_alloc(sizeof (struct acl_role_label));
53604 +
53605 + if (!r_tmp)
53606 + return -ENOMEM;
53607 +
53608 + if (copy_from_user(&r_utmp2, r_utmp + r_num,
53609 + sizeof (struct acl_role_label *)))
53610 + return -EFAULT;
53611 +
53612 + if (copy_from_user(r_tmp, r_utmp2,
53613 + sizeof (struct acl_role_label)))
53614 + return -EFAULT;
53615 +
53616 + len = strnlen_user(r_tmp->rolename, GR_SPROLE_LEN);
53617 +
53618 + if (!len || len >= PATH_MAX)
53619 + return -EINVAL;
53620 +
53621 + if ((tmp = (char *) acl_alloc(len)) == NULL)
53622 + return -ENOMEM;
53623 +
53624 + if (copy_from_user(tmp, r_tmp->rolename, len))
53625 + return -EFAULT;
53626 +
53627 + tmp[len-1] = '\0';
53628 + r_tmp->rolename = tmp;
53629 +
53630 + if (!strcmp(r_tmp->rolename, "default")
53631 + && (r_tmp->roletype & GR_ROLE_DEFAULT)) {
53632 + default_role = r_tmp;
53633 + } else if (!strcmp(r_tmp->rolename, ":::kernel:::")) {
53634 + kernel_role = r_tmp;
53635 + }
53636 +
53637 + if ((ghash = (struct gr_hash_struct *) acl_alloc(sizeof(struct gr_hash_struct))) == NULL)
53638 + return -ENOMEM;
53639 +
53640 + if (copy_from_user(ghash, r_tmp->hash, sizeof(struct gr_hash_struct)))
53641 + return -EFAULT;
53642 +
53643 + r_tmp->hash = ghash;
53644 +
53645 + num_subjs = count_user_subjs(r_tmp->hash->first);
53646 +
53647 + r_tmp->subj_hash_size = num_subjs;
53648 + r_tmp->subj_hash =
53649 + (struct acl_subject_label **)
53650 + create_table(&(r_tmp->subj_hash_size), sizeof(void *));
53651 +
53652 + if (!r_tmp->subj_hash)
53653 + return -ENOMEM;
53654 +
53655 + err = copy_user_allowedips(r_tmp);
53656 + if (err)
53657 + return err;
53658 +
53659 + /* copy domain info */
53660 + if (r_tmp->domain_children != NULL) {
53661 + domainlist = acl_alloc_num(r_tmp->domain_child_num, sizeof(uid_t));
53662 + if (domainlist == NULL)
53663 + return -ENOMEM;
53664 +
53665 + if (copy_from_user(domainlist, r_tmp->domain_children, r_tmp->domain_child_num * sizeof(uid_t)))
53666 + return -EFAULT;
53667 +
53668 + r_tmp->domain_children = domainlist;
53669 + }
53670 +
53671 + err = copy_user_transitions(r_tmp);
53672 + if (err)
53673 + return err;
53674 +
53675 + memset(r_tmp->subj_hash, 0,
53676 + r_tmp->subj_hash_size *
53677 + sizeof (struct acl_subject_label *));
53678 +
53679 + /* acquire the list of subjects, then NULL out
53680 + the list prior to parsing the subjects for this role,
53681 + as during this parsing the list is replaced with a list
53682 + of *nested* subjects for the role
53683 + */
53684 + subj_list = r_tmp->hash->first;
53685 +
53686 + /* set nested subject list to null */
53687 + r_tmp->hash->first = NULL;
53688 +
53689 + err = copy_user_subjs(subj_list, r_tmp);
53690 +
53691 + if (err)
53692 + return err;
53693 +
53694 + insert_acl_role_label(r_tmp);
53695 + }
53696 +
53697 + if (default_role == NULL || kernel_role == NULL)
53698 + return -EINVAL;
53699 +
53700 + return err;
53701 +}
53702 +
53703 +static int
53704 +gracl_init(struct gr_arg *args)
53705 +{
53706 + int error = 0;
53707 +
53708 + memcpy(gr_system_salt, args->salt, GR_SALT_LEN);
53709 + memcpy(gr_system_sum, args->sum, GR_SHA_LEN);
53710 +
53711 + if (init_variables(args)) {
53712 + gr_log_str(GR_DONT_AUDIT_GOOD, GR_INITF_ACL_MSG, GR_VERSION);
53713 + error = -ENOMEM;
53714 + free_variables();
53715 + goto out;
53716 + }
53717 +
53718 + error = copy_user_acl(args);
53719 + free_init_variables();
53720 + if (error) {
53721 + free_variables();
53722 + goto out;
53723 + }
53724 +
53725 + if ((error = gr_set_acls(0))) {
53726 + free_variables();
53727 + goto out;
53728 + }
53729 +
53730 + pax_open_kernel();
53731 + gr_status |= GR_READY;
53732 + pax_close_kernel();
53733 +
53734 + out:
53735 + return error;
53736 +}
53737 +
53738 +/* derived from glibc fnmatch() 0: match, 1: no match*/
53739 +
53740 +static int
53741 +glob_match(const char *p, const char *n)
53742 +{
53743 + char c;
53744 +
53745 + while ((c = *p++) != '\0') {
53746 + switch (c) {
53747 + case '?':
53748 + if (*n == '\0')
53749 + return 1;
53750 + else if (*n == '/')
53751 + return 1;
53752 + break;
53753 + case '\\':
53754 + if (*n != c)
53755 + return 1;
53756 + break;
53757 + case '*':
53758 + for (c = *p++; c == '?' || c == '*'; c = *p++) {
53759 + if (*n == '/')
53760 + return 1;
53761 + else if (c == '?') {
53762 + if (*n == '\0')
53763 + return 1;
53764 + else
53765 + ++n;
53766 + }
53767 + }
53768 + if (c == '\0') {
53769 + return 0;
53770 + } else {
53771 + const char *endp;
53772 +
53773 + if ((endp = strchr(n, '/')) == NULL)
53774 + endp = n + strlen(n);
53775 +
53776 + if (c == '[') {
53777 + for (--p; n < endp; ++n)
53778 + if (!glob_match(p, n))
53779 + return 0;
53780 + } else if (c == '/') {
53781 + while (*n != '\0' && *n != '/')
53782 + ++n;
53783 + if (*n == '/' && !glob_match(p, n + 1))
53784 + return 0;
53785 + } else {
53786 + for (--p; n < endp; ++n)
53787 + if (*n == c && !glob_match(p, n))
53788 + return 0;
53789 + }
53790 +
53791 + return 1;
53792 + }
53793 + case '[':
53794 + {
53795 + int not;
53796 + char cold;
53797 +
53798 + if (*n == '\0' || *n == '/')
53799 + return 1;
53800 +
53801 + not = (*p == '!' || *p == '^');
53802 + if (not)
53803 + ++p;
53804 +
53805 + c = *p++;
53806 + for (;;) {
53807 + unsigned char fn = (unsigned char)*n;
53808 +
53809 + if (c == '\0')
53810 + return 1;
53811 + else {
53812 + if (c == fn)
53813 + goto matched;
53814 + cold = c;
53815 + c = *p++;
53816 +
53817 + if (c == '-' && *p != ']') {
53818 + unsigned char cend = *p++;
53819 +
53820 + if (cend == '\0')
53821 + return 1;
53822 +
53823 + if (cold <= fn && fn <= cend)
53824 + goto matched;
53825 +
53826 + c = *p++;
53827 + }
53828 + }
53829 +
53830 + if (c == ']')
53831 + break;
53832 + }
53833 + if (!not)
53834 + return 1;
53835 + break;
53836 + matched:
53837 + while (c != ']') {
53838 + if (c == '\0')
53839 + return 1;
53840 +
53841 + c = *p++;
53842 + }
53843 + if (not)
53844 + return 1;
53845 + }
53846 + break;
53847 + default:
53848 + if (c != *n)
53849 + return 1;
53850 + }
53851 +
53852 + ++n;
53853 + }
53854 +
53855 + if (*n == '\0')
53856 + return 0;
53857 +
53858 + if (*n == '/')
53859 + return 0;
53860 +
53861 + return 1;
53862 +}
53863 +
53864 +static struct acl_object_label *
53865 +chk_glob_label(struct acl_object_label *globbed,
53866 + const struct dentry *dentry, const struct vfsmount *mnt, char **path)
53867 +{
53868 + struct acl_object_label *tmp;
53869 +
53870 + if (*path == NULL)
53871 + *path = gr_to_filename_nolock(dentry, mnt);
53872 +
53873 + tmp = globbed;
53874 +
53875 + while (tmp) {
53876 + if (!glob_match(tmp->filename, *path))
53877 + return tmp;
53878 + tmp = tmp->next;
53879 + }
53880 +
53881 + return NULL;
53882 +}
53883 +
53884 +static struct acl_object_label *
53885 +__full_lookup(const struct dentry *orig_dentry, const struct vfsmount *orig_mnt,
53886 + const ino_t curr_ino, const dev_t curr_dev,
53887 + const struct acl_subject_label *subj, char **path, const int checkglob)
53888 +{
53889 + struct acl_subject_label *tmpsubj;
53890 + struct acl_object_label *retval;
53891 + struct acl_object_label *retval2;
53892 +
53893 + tmpsubj = (struct acl_subject_label *) subj;
53894 + read_lock(&gr_inode_lock);
53895 + do {
53896 + retval = lookup_acl_obj_label(curr_ino, curr_dev, tmpsubj);
53897 + if (retval) {
53898 + if (checkglob && retval->globbed) {
53899 + retval2 = chk_glob_label(retval->globbed, orig_dentry, orig_mnt, path);
53900 + if (retval2)
53901 + retval = retval2;
53902 + }
53903 + break;
53904 + }
53905 + } while ((tmpsubj = tmpsubj->parent_subject));
53906 + read_unlock(&gr_inode_lock);
53907 +
53908 + return retval;
53909 +}
53910 +
53911 +static __inline__ struct acl_object_label *
53912 +full_lookup(const struct dentry *orig_dentry, const struct vfsmount *orig_mnt,
53913 + struct dentry *curr_dentry,
53914 + const struct acl_subject_label *subj, char **path, const int checkglob)
53915 +{
53916 + int newglob = checkglob;
53917 + ino_t inode;
53918 + dev_t device;
53919 +
53920 + /* if we aren't checking a subdirectory of the original path yet, don't do glob checking
53921 + as we don't want a / * rule to match instead of the / object
53922 + don't do this for create lookups that call this function though, since they're looking up
53923 + on the parent and thus need globbing checks on all paths
53924 + */
53925 + if (orig_dentry == curr_dentry && newglob != GR_CREATE_GLOB)
53926 + newglob = GR_NO_GLOB;
53927 +
53928 + spin_lock(&curr_dentry->d_lock);
53929 + inode = curr_dentry->d_inode->i_ino;
53930 + device = __get_dev(curr_dentry);
53931 + spin_unlock(&curr_dentry->d_lock);
53932 +
53933 + return __full_lookup(orig_dentry, orig_mnt, inode, device, subj, path, newglob);
53934 +}
53935 +
53936 +static struct acl_object_label *
53937 +__chk_obj_label(const struct dentry *l_dentry, const struct vfsmount *l_mnt,
53938 + const struct acl_subject_label *subj, char *path, const int checkglob)
53939 +{
53940 + struct dentry *dentry = (struct dentry *) l_dentry;
53941 + struct vfsmount *mnt = (struct vfsmount *) l_mnt;
53942 + struct mount *real_mnt = real_mount(mnt);
53943 + struct acl_object_label *retval;
53944 + struct dentry *parent;
53945 +
53946 + write_seqlock(&rename_lock);
53947 + br_read_lock(&vfsmount_lock);
53948 +
53949 + if (unlikely((mnt == shm_mnt && dentry->d_inode->i_nlink == 0) || mnt == pipe_mnt ||
53950 +#ifdef CONFIG_NET
53951 + mnt == sock_mnt ||
53952 +#endif
53953 +#ifdef CONFIG_HUGETLBFS
53954 + (mnt == hugetlbfs_vfsmount && dentry->d_inode->i_nlink == 0) ||
53955 +#endif
53956 + /* ignore Eric Biederman */
53957 + IS_PRIVATE(l_dentry->d_inode))) {
53958 + retval = (subj->mode & GR_SHMEXEC) ? fakefs_obj_rwx : fakefs_obj_rw;
53959 + goto out;
53960 + }
53961 +
53962 + for (;;) {
53963 + if (dentry == real_root.dentry && mnt == real_root.mnt)
53964 + break;
53965 +
53966 + if (dentry == mnt->mnt_root || IS_ROOT(dentry)) {
53967 + if (!mnt_has_parent(real_mnt))
53968 + break;
53969 +
53970 + retval = full_lookup(l_dentry, l_mnt, dentry, subj, &path, checkglob);
53971 + if (retval != NULL)
53972 + goto out;
53973 +
53974 + dentry = real_mnt->mnt_mountpoint;
53975 + real_mnt = real_mnt->mnt_parent;
53976 + mnt = &real_mnt->mnt;
53977 + continue;
53978 + }
53979 +
53980 + parent = dentry->d_parent;
53981 + retval = full_lookup(l_dentry, l_mnt, dentry, subj, &path, checkglob);
53982 + if (retval != NULL)
53983 + goto out;
53984 +
53985 + dentry = parent;
53986 + }
53987 +
53988 + retval = full_lookup(l_dentry, l_mnt, dentry, subj, &path, checkglob);
53989 +
53990 + /* real_root is pinned so we don't have to hold a reference */
53991 + if (retval == NULL)
53992 + retval = full_lookup(l_dentry, l_mnt, real_root.dentry, subj, &path, checkglob);
53993 +out:
53994 + br_read_unlock(&vfsmount_lock);
53995 + write_sequnlock(&rename_lock);
53996 +
53997 + BUG_ON(retval == NULL);
53998 +
53999 + return retval;
54000 +}
54001 +
54002 +static __inline__ struct acl_object_label *
54003 +chk_obj_label(const struct dentry *l_dentry, const struct vfsmount *l_mnt,
54004 + const struct acl_subject_label *subj)
54005 +{
54006 + char *path = NULL;
54007 + return __chk_obj_label(l_dentry, l_mnt, subj, path, GR_REG_GLOB);
54008 +}
54009 +
54010 +static __inline__ struct acl_object_label *
54011 +chk_obj_label_noglob(const struct dentry *l_dentry, const struct vfsmount *l_mnt,
54012 + const struct acl_subject_label *subj)
54013 +{
54014 + char *path = NULL;
54015 + return __chk_obj_label(l_dentry, l_mnt, subj, path, GR_NO_GLOB);
54016 +}
54017 +
54018 +static __inline__ struct acl_object_label *
54019 +chk_obj_create_label(const struct dentry *l_dentry, const struct vfsmount *l_mnt,
54020 + const struct acl_subject_label *subj, char *path)
54021 +{
54022 + return __chk_obj_label(l_dentry, l_mnt, subj, path, GR_CREATE_GLOB);
54023 +}
54024 +
54025 +static struct acl_subject_label *
54026 +chk_subj_label(const struct dentry *l_dentry, const struct vfsmount *l_mnt,
54027 + const struct acl_role_label *role)
54028 +{
54029 + struct dentry *dentry = (struct dentry *) l_dentry;
54030 + struct vfsmount *mnt = (struct vfsmount *) l_mnt;
54031 + struct mount *real_mnt = real_mount(mnt);
54032 + struct acl_subject_label *retval;
54033 + struct dentry *parent;
54034 +
54035 + write_seqlock(&rename_lock);
54036 + br_read_lock(&vfsmount_lock);
54037 +
54038 + for (;;) {
54039 + if (dentry == real_root.dentry && mnt == real_root.mnt)
54040 + break;
54041 + if (dentry == mnt->mnt_root || IS_ROOT(dentry)) {
54042 + if (!mnt_has_parent(real_mnt))
54043 + break;
54044 +
54045 + spin_lock(&dentry->d_lock);
54046 + read_lock(&gr_inode_lock);
54047 + retval =
54048 + lookup_acl_subj_label(dentry->d_inode->i_ino,
54049 + __get_dev(dentry), role);
54050 + read_unlock(&gr_inode_lock);
54051 + spin_unlock(&dentry->d_lock);
54052 + if (retval != NULL)
54053 + goto out;
54054 +
54055 + dentry = real_mnt->mnt_mountpoint;
54056 + real_mnt = real_mnt->mnt_parent;
54057 + mnt = &real_mnt->mnt;
54058 + continue;
54059 + }
54060 +
54061 + spin_lock(&dentry->d_lock);
54062 + read_lock(&gr_inode_lock);
54063 + retval = lookup_acl_subj_label(dentry->d_inode->i_ino,
54064 + __get_dev(dentry), role);
54065 + read_unlock(&gr_inode_lock);
54066 + parent = dentry->d_parent;
54067 + spin_unlock(&dentry->d_lock);
54068 +
54069 + if (retval != NULL)
54070 + goto out;
54071 +
54072 + dentry = parent;
54073 + }
54074 +
54075 + spin_lock(&dentry->d_lock);
54076 + read_lock(&gr_inode_lock);
54077 + retval = lookup_acl_subj_label(dentry->d_inode->i_ino,
54078 + __get_dev(dentry), role);
54079 + read_unlock(&gr_inode_lock);
54080 + spin_unlock(&dentry->d_lock);
54081 +
54082 + if (unlikely(retval == NULL)) {
54083 + /* real_root is pinned, we don't need to hold a reference */
54084 + read_lock(&gr_inode_lock);
54085 + retval = lookup_acl_subj_label(real_root.dentry->d_inode->i_ino,
54086 + __get_dev(real_root.dentry), role);
54087 + read_unlock(&gr_inode_lock);
54088 + }
54089 +out:
54090 + br_read_unlock(&vfsmount_lock);
54091 + write_sequnlock(&rename_lock);
54092 +
54093 + BUG_ON(retval == NULL);
54094 +
54095 + return retval;
54096 +}
54097 +
54098 +static void
54099 +gr_log_learn(const struct dentry *dentry, const struct vfsmount *mnt, const __u32 mode)
54100 +{
54101 + struct task_struct *task = current;
54102 + const struct cred *cred = current_cred();
54103 +
54104 + security_learn(GR_LEARN_AUDIT_MSG, task->role->rolename, task->role->roletype,
54105 + cred->uid, cred->gid, task->exec_file ? gr_to_filename1(task->exec_file->f_path.dentry,
54106 + task->exec_file->f_path.mnt) : task->acl->filename, task->acl->filename,
54107 + 1UL, 1UL, gr_to_filename(dentry, mnt), (unsigned long) mode, &task->signal->saved_ip);
54108 +
54109 + return;
54110 +}
54111 +
54112 +static void
54113 +gr_log_learn_id_change(const char type, const unsigned int real,
54114 + const unsigned int effective, const unsigned int fs)
54115 +{
54116 + struct task_struct *task = current;
54117 + const struct cred *cred = current_cred();
54118 +
54119 + security_learn(GR_ID_LEARN_MSG, task->role->rolename, task->role->roletype,
54120 + cred->uid, cred->gid, task->exec_file ? gr_to_filename1(task->exec_file->f_path.dentry,
54121 + task->exec_file->f_path.mnt) : task->acl->filename, task->acl->filename,
54122 + type, real, effective, fs, &task->signal->saved_ip);
54123 +
54124 + return;
54125 +}
54126 +
54127 +__u32
54128 +gr_search_file(const struct dentry * dentry, const __u32 mode,
54129 + const struct vfsmount * mnt)
54130 +{
54131 + __u32 retval = mode;
54132 + struct acl_subject_label *curracl;
54133 + struct acl_object_label *currobj;
54134 +
54135 + if (unlikely(!(gr_status & GR_READY)))
54136 + return (mode & ~GR_AUDITS);
54137 +
54138 + curracl = current->acl;
54139 +
54140 + currobj = chk_obj_label(dentry, mnt, curracl);
54141 + retval = currobj->mode & mode;
54142 +
54143 + /* if we're opening a specified transfer file for writing
54144 + (e.g. /dev/initctl), then transfer our role to init
54145 + */
54146 + if (unlikely(currobj->mode & GR_INIT_TRANSFER && retval & GR_WRITE &&
54147 + current->role->roletype & GR_ROLE_PERSIST)) {
54148 + struct task_struct *task = init_pid_ns.child_reaper;
54149 +
54150 + if (task->role != current->role) {
54151 + task->acl_sp_role = 0;
54152 + task->acl_role_id = current->acl_role_id;
54153 + task->role = current->role;
54154 + rcu_read_lock();
54155 + read_lock(&grsec_exec_file_lock);
54156 + gr_apply_subject_to_task(task);
54157 + read_unlock(&grsec_exec_file_lock);
54158 + rcu_read_unlock();
54159 + gr_log_noargs(GR_DONT_AUDIT_GOOD, GR_INIT_TRANSFER_MSG);
54160 + }
54161 + }
54162 +
54163 + if (unlikely
54164 + ((curracl->mode & (GR_LEARN | GR_INHERITLEARN)) && !(mode & GR_NOPTRACE)
54165 + && (retval != (mode & ~(GR_AUDITS | GR_SUPPRESS))))) {
54166 + __u32 new_mode = mode;
54167 +
54168 + new_mode &= ~(GR_AUDITS | GR_SUPPRESS);
54169 +
54170 + retval = new_mode;
54171 +
54172 + if (new_mode & GR_EXEC && curracl->mode & GR_INHERITLEARN)
54173 + new_mode |= GR_INHERIT;
54174 +
54175 + if (!(mode & GR_NOLEARN))
54176 + gr_log_learn(dentry, mnt, new_mode);
54177 + }
54178 +
54179 + return retval;
54180 +}
54181 +
54182 +struct acl_object_label *gr_get_create_object(const struct dentry *new_dentry,
54183 + const struct dentry *parent,
54184 + const struct vfsmount *mnt)
54185 +{
54186 + struct name_entry *match;
54187 + struct acl_object_label *matchpo;
54188 + struct acl_subject_label *curracl;
54189 + char *path;
54190 +
54191 + if (unlikely(!(gr_status & GR_READY)))
54192 + return NULL;
54193 +
54194 + preempt_disable();
54195 + path = gr_to_filename_rbac(new_dentry, mnt);
54196 + match = lookup_name_entry_create(path);
54197 +
54198 + curracl = current->acl;
54199 +
54200 + if (match) {
54201 + read_lock(&gr_inode_lock);
54202 + matchpo = lookup_acl_obj_label_create(match->inode, match->device, curracl);
54203 + read_unlock(&gr_inode_lock);
54204 +
54205 + if (matchpo) {
54206 + preempt_enable();
54207 + return matchpo;
54208 + }
54209 + }
54210 +
54211 + // lookup parent
54212 +
54213 + matchpo = chk_obj_create_label(parent, mnt, curracl, path);
54214 +
54215 + preempt_enable();
54216 + return matchpo;
54217 +}
54218 +
54219 +__u32
54220 +gr_check_create(const struct dentry * new_dentry, const struct dentry * parent,
54221 + const struct vfsmount * mnt, const __u32 mode)
54222 +{
54223 + struct acl_object_label *matchpo;
54224 + __u32 retval;
54225 +
54226 + if (unlikely(!(gr_status & GR_READY)))
54227 + return (mode & ~GR_AUDITS);
54228 +
54229 + matchpo = gr_get_create_object(new_dentry, parent, mnt);
54230 +
54231 + retval = matchpo->mode & mode;
54232 +
54233 + if ((retval != (mode & ~(GR_AUDITS | GR_SUPPRESS)))
54234 + && (current->acl->mode & (GR_LEARN | GR_INHERITLEARN))) {
54235 + __u32 new_mode = mode;
54236 +
54237 + new_mode &= ~(GR_AUDITS | GR_SUPPRESS);
54238 +
54239 + gr_log_learn(new_dentry, mnt, new_mode);
54240 + return new_mode;
54241 + }
54242 +
54243 + return retval;
54244 +}
54245 +
54246 +__u32
54247 +gr_check_link(const struct dentry * new_dentry,
54248 + const struct dentry * parent_dentry,
54249 + const struct vfsmount * parent_mnt,
54250 + const struct dentry * old_dentry, const struct vfsmount * old_mnt)
54251 +{
54252 + struct acl_object_label *obj;
54253 + __u32 oldmode, newmode;
54254 + __u32 needmode;
54255 + __u32 checkmodes = GR_FIND | GR_APPEND | GR_WRITE | GR_EXEC | GR_SETID | GR_READ |
54256 + GR_DELETE | GR_INHERIT;
54257 +
54258 + if (unlikely(!(gr_status & GR_READY)))
54259 + return (GR_CREATE | GR_LINK);
54260 +
54261 + obj = chk_obj_label(old_dentry, old_mnt, current->acl);
54262 + oldmode = obj->mode;
54263 +
54264 + obj = gr_get_create_object(new_dentry, parent_dentry, parent_mnt);
54265 + newmode = obj->mode;
54266 +
54267 + needmode = newmode & checkmodes;
54268 +
54269 + // old name for hardlink must have at least the permissions of the new name
54270 + if ((oldmode & needmode) != needmode)
54271 + goto bad;
54272 +
54273 + // if old name had restrictions/auditing, make sure the new name does as well
54274 + needmode = oldmode & (GR_NOPTRACE | GR_PTRACERD | GR_INHERIT | GR_AUDITS);
54275 +
54276 + // don't allow hardlinking of suid/sgid/fcapped files without permission
54277 + if (is_privileged_binary(old_dentry))
54278 + needmode |= GR_SETID;
54279 +
54280 + if ((newmode & needmode) != needmode)
54281 + goto bad;
54282 +
54283 + // enforce minimum permissions
54284 + if ((newmode & (GR_CREATE | GR_LINK)) == (GR_CREATE | GR_LINK))
54285 + return newmode;
54286 +bad:
54287 + needmode = oldmode;
54288 + if (is_privileged_binary(old_dentry))
54289 + needmode |= GR_SETID;
54290 +
54291 + if (current->acl->mode & (GR_LEARN | GR_INHERITLEARN)) {
54292 + gr_log_learn(old_dentry, old_mnt, needmode | GR_CREATE | GR_LINK);
54293 + return (GR_CREATE | GR_LINK);
54294 + } else if (newmode & GR_SUPPRESS)
54295 + return GR_SUPPRESS;
54296 + else
54297 + return 0;
54298 +}
54299 +
54300 +int
54301 +gr_check_hidden_task(const struct task_struct *task)
54302 +{
54303 + if (unlikely(!(gr_status & GR_READY)))
54304 + return 0;
54305 +
54306 + if (!(task->acl->mode & GR_PROCFIND) && !(current->acl->mode & GR_VIEW))
54307 + return 1;
54308 +
54309 + return 0;
54310 +}
54311 +
54312 +int
54313 +gr_check_protected_task(const struct task_struct *task)
54314 +{
54315 + if (unlikely(!(gr_status & GR_READY) || !task))
54316 + return 0;
54317 +
54318 + if ((task->acl->mode & GR_PROTECTED) && !(current->acl->mode & GR_KILL) &&
54319 + task->acl != current->acl)
54320 + return 1;
54321 +
54322 + return 0;
54323 +}
54324 +
54325 +int
54326 +gr_check_protected_task_fowner(struct pid *pid, enum pid_type type)
54327 +{
54328 + struct task_struct *p;
54329 + int ret = 0;
54330 +
54331 + if (unlikely(!(gr_status & GR_READY) || !pid))
54332 + return ret;
54333 +
54334 + read_lock(&tasklist_lock);
54335 + do_each_pid_task(pid, type, p) {
54336 + if ((p->acl->mode & GR_PROTECTED) && !(current->acl->mode & GR_KILL) &&
54337 + p->acl != current->acl) {
54338 + ret = 1;
54339 + goto out;
54340 + }
54341 + } while_each_pid_task(pid, type, p);
54342 +out:
54343 + read_unlock(&tasklist_lock);
54344 +
54345 + return ret;
54346 +}
54347 +
54348 +void
54349 +gr_copy_label(struct task_struct *tsk)
54350 +{
54351 + tsk->signal->used_accept = 0;
54352 + tsk->acl_sp_role = 0;
54353 + tsk->acl_role_id = current->acl_role_id;
54354 + tsk->acl = current->acl;
54355 + tsk->role = current->role;
54356 + tsk->signal->curr_ip = current->signal->curr_ip;
54357 + tsk->signal->saved_ip = current->signal->saved_ip;
54358 + if (current->exec_file)
54359 + get_file(current->exec_file);
54360 + tsk->exec_file = current->exec_file;
54361 + tsk->is_writable = current->is_writable;
54362 + if (unlikely(current->signal->used_accept)) {
54363 + current->signal->curr_ip = 0;
54364 + current->signal->saved_ip = 0;
54365 + }
54366 +
54367 + return;
54368 +}
54369 +
54370 +static void
54371 +gr_set_proc_res(struct task_struct *task)
54372 +{
54373 + struct acl_subject_label *proc;
54374 + unsigned short i;
54375 +
54376 + proc = task->acl;
54377 +
54378 + if (proc->mode & (GR_LEARN | GR_INHERITLEARN))
54379 + return;
54380 +
54381 + for (i = 0; i < RLIM_NLIMITS; i++) {
54382 + if (!(proc->resmask & (1 << i)))
54383 + continue;
54384 +
54385 + task->signal->rlim[i].rlim_cur = proc->res[i].rlim_cur;
54386 + task->signal->rlim[i].rlim_max = proc->res[i].rlim_max;
54387 + }
54388 +
54389 + return;
54390 +}
54391 +
54392 +extern int __gr_process_user_ban(struct user_struct *user);
54393 +
54394 +int
54395 +gr_check_user_change(int real, int effective, int fs)
54396 +{
54397 + unsigned int i;
54398 + __u16 num;
54399 + uid_t *uidlist;
54400 + int curuid;
54401 + int realok = 0;
54402 + int effectiveok = 0;
54403 + int fsok = 0;
54404 +
54405 +#if defined(CONFIG_GRKERNSEC_KERN_LOCKOUT) || defined(CONFIG_GRKERNSEC_BRUTE)
54406 + struct user_struct *user;
54407 +
54408 + if (real == -1)
54409 + goto skipit;
54410 +
54411 + user = find_user(real);
54412 + if (user == NULL)
54413 + goto skipit;
54414 +
54415 + if (__gr_process_user_ban(user)) {
54416 + /* for find_user */
54417 + free_uid(user);
54418 + return 1;
54419 + }
54420 +
54421 + /* for find_user */
54422 + free_uid(user);
54423 +
54424 +skipit:
54425 +#endif
54426 +
54427 + if (unlikely(!(gr_status & GR_READY)))
54428 + return 0;
54429 +
54430 + if (current->acl->mode & (GR_LEARN | GR_INHERITLEARN))
54431 + gr_log_learn_id_change('u', real, effective, fs);
54432 +
54433 + num = current->acl->user_trans_num;
54434 + uidlist = current->acl->user_transitions;
54435 +
54436 + if (uidlist == NULL)
54437 + return 0;
54438 +
54439 + if (real == -1)
54440 + realok = 1;
54441 + if (effective == -1)
54442 + effectiveok = 1;
54443 + if (fs == -1)
54444 + fsok = 1;
54445 +
54446 + if (current->acl->user_trans_type & GR_ID_ALLOW) {
54447 + for (i = 0; i < num; i++) {
54448 + curuid = (int)uidlist[i];
54449 + if (real == curuid)
54450 + realok = 1;
54451 + if (effective == curuid)
54452 + effectiveok = 1;
54453 + if (fs == curuid)
54454 + fsok = 1;
54455 + }
54456 + } else if (current->acl->user_trans_type & GR_ID_DENY) {
54457 + for (i = 0; i < num; i++) {
54458 + curuid = (int)uidlist[i];
54459 + if (real == curuid)
54460 + break;
54461 + if (effective == curuid)
54462 + break;
54463 + if (fs == curuid)
54464 + break;
54465 + }
54466 + /* not in deny list */
54467 + if (i == num) {
54468 + realok = 1;
54469 + effectiveok = 1;
54470 + fsok = 1;
54471 + }
54472 + }
54473 +
54474 + if (realok && effectiveok && fsok)
54475 + return 0;
54476 + else {
54477 + gr_log_int(GR_DONT_AUDIT, GR_USRCHANGE_ACL_MSG, realok ? (effectiveok ? (fsok ? 0 : fs) : effective) : real);
54478 + return 1;
54479 + }
54480 +}
54481 +
54482 +int
54483 +gr_check_group_change(int real, int effective, int fs)
54484 +{
54485 + unsigned int i;
54486 + __u16 num;
54487 + gid_t *gidlist;
54488 + int curgid;
54489 + int realok = 0;
54490 + int effectiveok = 0;
54491 + int fsok = 0;
54492 +
54493 + if (unlikely(!(gr_status & GR_READY)))
54494 + return 0;
54495 +
54496 + if (current->acl->mode & (GR_LEARN | GR_INHERITLEARN))
54497 + gr_log_learn_id_change('g', real, effective, fs);
54498 +
54499 + num = current->acl->group_trans_num;
54500 + gidlist = current->acl->group_transitions;
54501 +
54502 + if (gidlist == NULL)
54503 + return 0;
54504 +
54505 + if (real == -1)
54506 + realok = 1;
54507 + if (effective == -1)
54508 + effectiveok = 1;
54509 + if (fs == -1)
54510 + fsok = 1;
54511 +
54512 + if (current->acl->group_trans_type & GR_ID_ALLOW) {
54513 + for (i = 0; i < num; i++) {
54514 + curgid = (int)gidlist[i];
54515 + if (real == curgid)
54516 + realok = 1;
54517 + if (effective == curgid)
54518 + effectiveok = 1;
54519 + if (fs == curgid)
54520 + fsok = 1;
54521 + }
54522 + } else if (current->acl->group_trans_type & GR_ID_DENY) {
54523 + for (i = 0; i < num; i++) {
54524 + curgid = (int)gidlist[i];
54525 + if (real == curgid)
54526 + break;
54527 + if (effective == curgid)
54528 + break;
54529 + if (fs == curgid)
54530 + break;
54531 + }
54532 + /* not in deny list */
54533 + if (i == num) {
54534 + realok = 1;
54535 + effectiveok = 1;
54536 + fsok = 1;
54537 + }
54538 + }
54539 +
54540 + if (realok && effectiveok && fsok)
54541 + return 0;
54542 + else {
54543 + gr_log_int(GR_DONT_AUDIT, GR_GRPCHANGE_ACL_MSG, realok ? (effectiveok ? (fsok ? 0 : fs) : effective) : real);
54544 + return 1;
54545 + }
54546 +}
54547 +
54548 +extern int gr_acl_is_capable(const int cap);
54549 +
54550 +void
54551 +gr_set_role_label(struct task_struct *task, const uid_t uid, const uid_t gid)
54552 +{
54553 + struct acl_role_label *role = task->role;
54554 + struct acl_subject_label *subj = NULL;
54555 + struct acl_object_label *obj;
54556 + struct file *filp;
54557 +
54558 + if (unlikely(!(gr_status & GR_READY)))
54559 + return;
54560 +
54561 + filp = task->exec_file;
54562 +
54563 + /* kernel process, we'll give them the kernel role */
54564 + if (unlikely(!filp)) {
54565 + task->role = kernel_role;
54566 + task->acl = kernel_role->root_label;
54567 + return;
54568 + } else if (!task->role || !(task->role->roletype & GR_ROLE_SPECIAL))
54569 + role = lookup_acl_role_label(task, uid, gid);
54570 +
54571 + /* don't change the role if we're not a privileged process */
54572 + if (role && task->role != role &&
54573 + (((role->roletype & GR_ROLE_USER) && !gr_acl_is_capable(CAP_SETUID)) ||
54574 + ((role->roletype & GR_ROLE_GROUP) && !gr_acl_is_capable(CAP_SETGID))))
54575 + return;
54576 +
54577 + /* perform subject lookup in possibly new role
54578 + we can use this result below in the case where role == task->role
54579 + */
54580 + subj = chk_subj_label(filp->f_path.dentry, filp->f_path.mnt, role);
54581 +
54582 + /* if we changed uid/gid, but result in the same role
54583 + and are using inheritance, don't lose the inherited subject
54584 + if current subject is other than what normal lookup
54585 + would result in, we arrived via inheritance, don't
54586 + lose subject
54587 + */
54588 + if (role != task->role || (!(task->acl->mode & GR_INHERITLEARN) &&
54589 + (subj == task->acl)))
54590 + task->acl = subj;
54591 +
54592 + task->role = role;
54593 +
54594 + task->is_writable = 0;
54595 +
54596 + /* ignore additional mmap checks for processes that are writable
54597 + by the default ACL */
54598 + obj = chk_obj_label(filp->f_path.dentry, filp->f_path.mnt, default_role->root_label);
54599 + if (unlikely(obj->mode & GR_WRITE))
54600 + task->is_writable = 1;
54601 + obj = chk_obj_label(filp->f_path.dentry, filp->f_path.mnt, task->role->root_label);
54602 + if (unlikely(obj->mode & GR_WRITE))
54603 + task->is_writable = 1;
54604 +
54605 +#ifdef CONFIG_GRKERNSEC_RBAC_DEBUG
54606 + printk(KERN_ALERT "Set role label for (%s:%d): role:%s, subject:%s\n", task->comm, task->pid, task->role->rolename, task->acl->filename);
54607 +#endif
54608 +
54609 + gr_set_proc_res(task);
54610 +
54611 + return;
54612 +}
54613 +
54614 +int
54615 +gr_set_proc_label(const struct dentry *dentry, const struct vfsmount *mnt,
54616 + const int unsafe_flags)
54617 +{
54618 + struct task_struct *task = current;
54619 + struct acl_subject_label *newacl;
54620 + struct acl_object_label *obj;
54621 + __u32 retmode;
54622 +
54623 + if (unlikely(!(gr_status & GR_READY)))
54624 + return 0;
54625 +
54626 + newacl = chk_subj_label(dentry, mnt, task->role);
54627 +
54628 + /* special handling for if we did an strace -f -p <pid> from an admin role, where pid then
54629 + did an exec
54630 + */
54631 + rcu_read_lock();
54632 + read_lock(&tasklist_lock);
54633 + if (task->ptrace && task->parent && ((task->parent->role->roletype & GR_ROLE_GOD) ||
54634 + (task->parent->acl->mode & GR_POVERRIDE))) {
54635 + read_unlock(&tasklist_lock);
54636 + rcu_read_unlock();
54637 + goto skip_check;
54638 + }
54639 + read_unlock(&tasklist_lock);
54640 + rcu_read_unlock();
54641 +
54642 + if (unsafe_flags && !(task->acl->mode & GR_POVERRIDE) && (task->acl != newacl) &&
54643 + !(task->role->roletype & GR_ROLE_GOD) &&
54644 + !gr_search_file(dentry, GR_PTRACERD, mnt) &&
54645 + !(task->acl->mode & (GR_LEARN | GR_INHERITLEARN))) {
54646 + if (unsafe_flags & LSM_UNSAFE_SHARE)
54647 + gr_log_fs_generic(GR_DONT_AUDIT, GR_UNSAFESHARE_EXEC_ACL_MSG, dentry, mnt);
54648 + else
54649 + gr_log_fs_generic(GR_DONT_AUDIT, GR_PTRACE_EXEC_ACL_MSG, dentry, mnt);
54650 + return -EACCES;
54651 + }
54652 +
54653 +skip_check:
54654 +
54655 + obj = chk_obj_label(dentry, mnt, task->acl);
54656 + retmode = obj->mode & (GR_INHERIT | GR_AUDIT_INHERIT);
54657 +
54658 + if (!(task->acl->mode & GR_INHERITLEARN) &&
54659 + ((newacl->mode & GR_LEARN) || !(retmode & GR_INHERIT))) {
54660 + if (obj->nested)
54661 + task->acl = obj->nested;
54662 + else
54663 + task->acl = newacl;
54664 + } else if (retmode & GR_INHERIT && retmode & GR_AUDIT_INHERIT)
54665 + gr_log_str_fs(GR_DO_AUDIT, GR_INHERIT_ACL_MSG, task->acl->filename, dentry, mnt);
54666 +
54667 + task->is_writable = 0;
54668 +
54669 + /* ignore additional mmap checks for processes that are writable
54670 + by the default ACL */
54671 + obj = chk_obj_label(dentry, mnt, default_role->root_label);
54672 + if (unlikely(obj->mode & GR_WRITE))
54673 + task->is_writable = 1;
54674 + obj = chk_obj_label(dentry, mnt, task->role->root_label);
54675 + if (unlikely(obj->mode & GR_WRITE))
54676 + task->is_writable = 1;
54677 +
54678 + gr_set_proc_res(task);
54679 +
54680 +#ifdef CONFIG_GRKERNSEC_RBAC_DEBUG
54681 + printk(KERN_ALERT "Set subject label for (%s:%d): role:%s, subject:%s\n", task->comm, task->pid, task->role->rolename, task->acl->filename);
54682 +#endif
54683 + return 0;
54684 +}
54685 +
54686 +/* always called with valid inodev ptr */
54687 +static void
54688 +do_handle_delete(struct inodev_entry *inodev, const ino_t ino, const dev_t dev)
54689 +{
54690 + struct acl_object_label *matchpo;
54691 + struct acl_subject_label *matchps;
54692 + struct acl_subject_label *subj;
54693 + struct acl_role_label *role;
54694 + unsigned int x;
54695 +
54696 + FOR_EACH_ROLE_START(role)
54697 + FOR_EACH_SUBJECT_START(role, subj, x)
54698 + if ((matchpo = lookup_acl_obj_label(ino, dev, subj)) != NULL)
54699 + matchpo->mode |= GR_DELETED;
54700 + FOR_EACH_SUBJECT_END(subj,x)
54701 + FOR_EACH_NESTED_SUBJECT_START(role, subj)
54702 + /* nested subjects aren't in the role's subj_hash table */
54703 + if ((matchpo = lookup_acl_obj_label(ino, dev, subj)) != NULL)
54704 + matchpo->mode |= GR_DELETED;
54705 + FOR_EACH_NESTED_SUBJECT_END(subj)
54706 + if ((matchps = lookup_acl_subj_label(ino, dev, role)) != NULL)
54707 + matchps->mode |= GR_DELETED;
54708 + FOR_EACH_ROLE_END(role)
54709 +
54710 + inodev->nentry->deleted = 1;
54711 +
54712 + return;
54713 +}
54714 +
54715 +void
54716 +gr_handle_delete(const ino_t ino, const dev_t dev)
54717 +{
54718 + struct inodev_entry *inodev;
54719 +
54720 + if (unlikely(!(gr_status & GR_READY)))
54721 + return;
54722 +
54723 + write_lock(&gr_inode_lock);
54724 + inodev = lookup_inodev_entry(ino, dev);
54725 + if (inodev != NULL)
54726 + do_handle_delete(inodev, ino, dev);
54727 + write_unlock(&gr_inode_lock);
54728 +
54729 + return;
54730 +}
54731 +
54732 +static void
54733 +update_acl_obj_label(const ino_t oldinode, const dev_t olddevice,
54734 + const ino_t newinode, const dev_t newdevice,
54735 + struct acl_subject_label *subj)
54736 +{
54737 + unsigned int index = fhash(oldinode, olddevice, subj->obj_hash_size);
54738 + struct acl_object_label *match;
54739 +
54740 + match = subj->obj_hash[index];
54741 +
54742 + while (match && (match->inode != oldinode ||
54743 + match->device != olddevice ||
54744 + !(match->mode & GR_DELETED)))
54745 + match = match->next;
54746 +
54747 + if (match && (match->inode == oldinode)
54748 + && (match->device == olddevice)
54749 + && (match->mode & GR_DELETED)) {
54750 + if (match->prev == NULL) {
54751 + subj->obj_hash[index] = match->next;
54752 + if (match->next != NULL)
54753 + match->next->prev = NULL;
54754 + } else {
54755 + match->prev->next = match->next;
54756 + if (match->next != NULL)
54757 + match->next->prev = match->prev;
54758 + }
54759 + match->prev = NULL;
54760 + match->next = NULL;
54761 + match->inode = newinode;
54762 + match->device = newdevice;
54763 + match->mode &= ~GR_DELETED;
54764 +
54765 + insert_acl_obj_label(match, subj);
54766 + }
54767 +
54768 + return;
54769 +}
54770 +
54771 +static void
54772 +update_acl_subj_label(const ino_t oldinode, const dev_t olddevice,
54773 + const ino_t newinode, const dev_t newdevice,
54774 + struct acl_role_label *role)
54775 +{
54776 + unsigned int index = fhash(oldinode, olddevice, role->subj_hash_size);
54777 + struct acl_subject_label *match;
54778 +
54779 + match = role->subj_hash[index];
54780 +
54781 + while (match && (match->inode != oldinode ||
54782 + match->device != olddevice ||
54783 + !(match->mode & GR_DELETED)))
54784 + match = match->next;
54785 +
54786 + if (match && (match->inode == oldinode)
54787 + && (match->device == olddevice)
54788 + && (match->mode & GR_DELETED)) {
54789 + if (match->prev == NULL) {
54790 + role->subj_hash[index] = match->next;
54791 + if (match->next != NULL)
54792 + match->next->prev = NULL;
54793 + } else {
54794 + match->prev->next = match->next;
54795 + if (match->next != NULL)
54796 + match->next->prev = match->prev;
54797 + }
54798 + match->prev = NULL;
54799 + match->next = NULL;
54800 + match->inode = newinode;
54801 + match->device = newdevice;
54802 + match->mode &= ~GR_DELETED;
54803 +
54804 + insert_acl_subj_label(match, role);
54805 + }
54806 +
54807 + return;
54808 +}
54809 +
54810 +static void
54811 +update_inodev_entry(const ino_t oldinode, const dev_t olddevice,
54812 + const ino_t newinode, const dev_t newdevice)
54813 +{
54814 + unsigned int index = fhash(oldinode, olddevice, inodev_set.i_size);
54815 + struct inodev_entry *match;
54816 +
54817 + match = inodev_set.i_hash[index];
54818 +
54819 + while (match && (match->nentry->inode != oldinode ||
54820 + match->nentry->device != olddevice || !match->nentry->deleted))
54821 + match = match->next;
54822 +
54823 + if (match && (match->nentry->inode == oldinode)
54824 + && (match->nentry->device == olddevice) &&
54825 + match->nentry->deleted) {
54826 + if (match->prev == NULL) {
54827 + inodev_set.i_hash[index] = match->next;
54828 + if (match->next != NULL)
54829 + match->next->prev = NULL;
54830 + } else {
54831 + match->prev->next = match->next;
54832 + if (match->next != NULL)
54833 + match->next->prev = match->prev;
54834 + }
54835 + match->prev = NULL;
54836 + match->next = NULL;
54837 + match->nentry->inode = newinode;
54838 + match->nentry->device = newdevice;
54839 + match->nentry->deleted = 0;
54840 +
54841 + insert_inodev_entry(match);
54842 + }
54843 +
54844 + return;
54845 +}
54846 +
54847 +static void
54848 +__do_handle_create(const struct name_entry *matchn, ino_t ino, dev_t dev)
54849 +{
54850 + struct acl_subject_label *subj;
54851 + struct acl_role_label *role;
54852 + unsigned int x;
54853 +
54854 + FOR_EACH_ROLE_START(role)
54855 + update_acl_subj_label(matchn->inode, matchn->device, ino, dev, role);
54856 +
54857 + FOR_EACH_NESTED_SUBJECT_START(role, subj)
54858 + if ((subj->inode == ino) && (subj->device == dev)) {
54859 + subj->inode = ino;
54860 + subj->device = dev;
54861 + }
54862 + /* nested subjects aren't in the role's subj_hash table */
54863 + update_acl_obj_label(matchn->inode, matchn->device,
54864 + ino, dev, subj);
54865 + FOR_EACH_NESTED_SUBJECT_END(subj)
54866 + FOR_EACH_SUBJECT_START(role, subj, x)
54867 + update_acl_obj_label(matchn->inode, matchn->device,
54868 + ino, dev, subj);
54869 + FOR_EACH_SUBJECT_END(subj,x)
54870 + FOR_EACH_ROLE_END(role)
54871 +
54872 + update_inodev_entry(matchn->inode, matchn->device, ino, dev);
54873 +
54874 + return;
54875 +}
54876 +
54877 +static void
54878 +do_handle_create(const struct name_entry *matchn, const struct dentry *dentry,
54879 + const struct vfsmount *mnt)
54880 +{
54881 + ino_t ino = dentry->d_inode->i_ino;
54882 + dev_t dev = __get_dev(dentry);
54883 +
54884 + __do_handle_create(matchn, ino, dev);
54885 +
54886 + return;
54887 +}
54888 +
54889 +void
54890 +gr_handle_create(const struct dentry *dentry, const struct vfsmount *mnt)
54891 +{
54892 + struct name_entry *matchn;
54893 +
54894 + if (unlikely(!(gr_status & GR_READY)))
54895 + return;
54896 +
54897 + preempt_disable();
54898 + matchn = lookup_name_entry(gr_to_filename_rbac(dentry, mnt));
54899 +
54900 + if (unlikely((unsigned long)matchn)) {
54901 + write_lock(&gr_inode_lock);
54902 + do_handle_create(matchn, dentry, mnt);
54903 + write_unlock(&gr_inode_lock);
54904 + }
54905 + preempt_enable();
54906 +
54907 + return;
54908 +}
54909 +
54910 +void
54911 +gr_handle_proc_create(const struct dentry *dentry, const struct inode *inode)
54912 +{
54913 + struct name_entry *matchn;
54914 +
54915 + if (unlikely(!(gr_status & GR_READY)))
54916 + return;
54917 +
54918 + preempt_disable();
54919 + matchn = lookup_name_entry(gr_to_proc_filename_rbac(dentry, init_pid_ns.proc_mnt));
54920 +
54921 + if (unlikely((unsigned long)matchn)) {
54922 + write_lock(&gr_inode_lock);
54923 + __do_handle_create(matchn, inode->i_ino, inode->i_sb->s_dev);
54924 + write_unlock(&gr_inode_lock);
54925 + }
54926 + preempt_enable();
54927 +
54928 + return;
54929 +}
54930 +
54931 +void
54932 +gr_handle_rename(struct inode *old_dir, struct inode *new_dir,
54933 + struct dentry *old_dentry,
54934 + struct dentry *new_dentry,
54935 + struct vfsmount *mnt, const __u8 replace)
54936 +{
54937 + struct name_entry *matchn;
54938 + struct inodev_entry *inodev;
54939 + struct inode *inode = new_dentry->d_inode;
54940 + ino_t old_ino = old_dentry->d_inode->i_ino;
54941 + dev_t old_dev = __get_dev(old_dentry);
54942 +
54943 + /* vfs_rename swaps the name and parent link for old_dentry and
54944 + new_dentry
54945 + at this point, old_dentry has the new name, parent link, and inode
54946 + for the renamed file
54947 + if a file is being replaced by a rename, new_dentry has the inode
54948 + and name for the replaced file
54949 + */
54950 +
54951 + if (unlikely(!(gr_status & GR_READY)))
54952 + return;
54953 +
54954 + preempt_disable();
54955 + matchn = lookup_name_entry(gr_to_filename_rbac(old_dentry, mnt));
54956 +
54957 + /* we wouldn't have to check d_inode if it weren't for
54958 + NFS silly-renaming
54959 + */
54960 +
54961 + write_lock(&gr_inode_lock);
54962 + if (unlikely(replace && inode)) {
54963 + ino_t new_ino = inode->i_ino;
54964 + dev_t new_dev = __get_dev(new_dentry);
54965 +
54966 + inodev = lookup_inodev_entry(new_ino, new_dev);
54967 + if (inodev != NULL && ((inode->i_nlink <= 1) || S_ISDIR(inode->i_mode)))
54968 + do_handle_delete(inodev, new_ino, new_dev);
54969 + }
54970 +
54971 + inodev = lookup_inodev_entry(old_ino, old_dev);
54972 + if (inodev != NULL && ((old_dentry->d_inode->i_nlink <= 1) || S_ISDIR(old_dentry->d_inode->i_mode)))
54973 + do_handle_delete(inodev, old_ino, old_dev);
54974 +
54975 + if (unlikely((unsigned long)matchn))
54976 + do_handle_create(matchn, old_dentry, mnt);
54977 +
54978 + write_unlock(&gr_inode_lock);
54979 + preempt_enable();
54980 +
54981 + return;
54982 +}
54983 +
54984 +static int
54985 +lookup_special_role_auth(__u16 mode, const char *rolename, unsigned char **salt,
54986 + unsigned char **sum)
54987 +{
54988 + struct acl_role_label *r;
54989 + struct role_allowed_ip *ipp;
54990 + struct role_transition *trans;
54991 + unsigned int i;
54992 + int found = 0;
54993 + u32 curr_ip = current->signal->curr_ip;
54994 +
54995 + current->signal->saved_ip = curr_ip;
54996 +
54997 + /* check transition table */
54998 +
54999 + for (trans = current->role->transitions; trans; trans = trans->next) {
55000 + if (!strcmp(rolename, trans->rolename)) {
55001 + found = 1;
55002 + break;
55003 + }
55004 + }
55005 +
55006 + if (!found)
55007 + return 0;
55008 +
55009 + /* handle special roles that do not require authentication
55010 + and check ip */
55011 +
55012 + FOR_EACH_ROLE_START(r)
55013 + if (!strcmp(rolename, r->rolename) &&
55014 + (r->roletype & GR_ROLE_SPECIAL)) {
55015 + found = 0;
55016 + if (r->allowed_ips != NULL) {
55017 + for (ipp = r->allowed_ips; ipp; ipp = ipp->next) {
55018 + if ((ntohl(curr_ip) & ipp->netmask) ==
55019 + (ntohl(ipp->addr) & ipp->netmask))
55020 + found = 1;
55021 + }
55022 + } else
55023 + found = 2;
55024 + if (!found)
55025 + return 0;
55026 +
55027 + if (((mode == GR_SPROLE) && (r->roletype & GR_ROLE_NOPW)) ||
55028 + ((mode == GR_SPROLEPAM) && (r->roletype & GR_ROLE_PAM))) {
55029 + *salt = NULL;
55030 + *sum = NULL;
55031 + return 1;
55032 + }
55033 + }
55034 + FOR_EACH_ROLE_END(r)
55035 +
55036 + for (i = 0; i < num_sprole_pws; i++) {
55037 + if (!strcmp(rolename, acl_special_roles[i]->rolename)) {
55038 + *salt = acl_special_roles[i]->salt;
55039 + *sum = acl_special_roles[i]->sum;
55040 + return 1;
55041 + }
55042 + }
55043 +
55044 + return 0;
55045 +}
55046 +
55047 +static void
55048 +assign_special_role(char *rolename)
55049 +{
55050 + struct acl_object_label *obj;
55051 + struct acl_role_label *r;
55052 + struct acl_role_label *assigned = NULL;
55053 + struct task_struct *tsk;
55054 + struct file *filp;
55055 +
55056 + FOR_EACH_ROLE_START(r)
55057 + if (!strcmp(rolename, r->rolename) &&
55058 + (r->roletype & GR_ROLE_SPECIAL)) {
55059 + assigned = r;
55060 + break;
55061 + }
55062 + FOR_EACH_ROLE_END(r)
55063 +
55064 + if (!assigned)
55065 + return;
55066 +
55067 + read_lock(&tasklist_lock);
55068 + read_lock(&grsec_exec_file_lock);
55069 +
55070 + tsk = current->real_parent;
55071 + if (tsk == NULL)
55072 + goto out_unlock;
55073 +
55074 + filp = tsk->exec_file;
55075 + if (filp == NULL)
55076 + goto out_unlock;
55077 +
55078 + tsk->is_writable = 0;
55079 +
55080 + tsk->acl_sp_role = 1;
55081 + tsk->acl_role_id = ++acl_sp_role_value;
55082 + tsk->role = assigned;
55083 + tsk->acl = chk_subj_label(filp->f_path.dentry, filp->f_path.mnt, tsk->role);
55084 +
55085 + /* ignore additional mmap checks for processes that are writable
55086 + by the default ACL */
55087 + obj = chk_obj_label(filp->f_path.dentry, filp->f_path.mnt, default_role->root_label);
55088 + if (unlikely(obj->mode & GR_WRITE))
55089 + tsk->is_writable = 1;
55090 + obj = chk_obj_label(filp->f_path.dentry, filp->f_path.mnt, tsk->role->root_label);
55091 + if (unlikely(obj->mode & GR_WRITE))
55092 + tsk->is_writable = 1;
55093 +
55094 +#ifdef CONFIG_GRKERNSEC_RBAC_DEBUG
55095 + printk(KERN_ALERT "Assigning special role:%s subject:%s to process (%s:%d)\n", tsk->role->rolename, tsk->acl->filename, tsk->comm, tsk->pid);
55096 +#endif
55097 +
55098 +out_unlock:
55099 + read_unlock(&grsec_exec_file_lock);
55100 + read_unlock(&tasklist_lock);
55101 + return;
55102 +}
55103 +
55104 +int gr_check_secure_terminal(struct task_struct *task)
55105 +{
55106 + struct task_struct *p, *p2, *p3;
55107 + struct files_struct *files;
55108 + struct fdtable *fdt;
55109 + struct file *our_file = NULL, *file;
55110 + int i;
55111 +
55112 + if (task->signal->tty == NULL)
55113 + return 1;
55114 +
55115 + files = get_files_struct(task);
55116 + if (files != NULL) {
55117 + rcu_read_lock();
55118 + fdt = files_fdtable(files);
55119 + for (i=0; i < fdt->max_fds; i++) {
55120 + file = fcheck_files(files, i);
55121 + if (file && (our_file == NULL) && (file->private_data == task->signal->tty)) {
55122 + get_file(file);
55123 + our_file = file;
55124 + }
55125 + }
55126 + rcu_read_unlock();
55127 + put_files_struct(files);
55128 + }
55129 +
55130 + if (our_file == NULL)
55131 + return 1;
55132 +
55133 + read_lock(&tasklist_lock);
55134 + do_each_thread(p2, p) {
55135 + files = get_files_struct(p);
55136 + if (files == NULL ||
55137 + (p->signal && p->signal->tty == task->signal->tty)) {
55138 + if (files != NULL)
55139 + put_files_struct(files);
55140 + continue;
55141 + }
55142 + rcu_read_lock();
55143 + fdt = files_fdtable(files);
55144 + for (i=0; i < fdt->max_fds; i++) {
55145 + file = fcheck_files(files, i);
55146 + if (file && S_ISCHR(file->f_path.dentry->d_inode->i_mode) &&
55147 + file->f_path.dentry->d_inode->i_rdev == our_file->f_path.dentry->d_inode->i_rdev) {
55148 + p3 = task;
55149 + while (p3->pid > 0) {
55150 + if (p3 == p)
55151 + break;
55152 + p3 = p3->real_parent;
55153 + }
55154 + if (p3 == p)
55155 + break;
55156 + gr_log_ttysniff(GR_DONT_AUDIT_GOOD, GR_TTYSNIFF_ACL_MSG, p);
55157 + gr_handle_alertkill(p);
55158 + rcu_read_unlock();
55159 + put_files_struct(files);
55160 + read_unlock(&tasklist_lock);
55161 + fput(our_file);
55162 + return 0;
55163 + }
55164 + }
55165 + rcu_read_unlock();
55166 + put_files_struct(files);
55167 + } while_each_thread(p2, p);
55168 + read_unlock(&tasklist_lock);
55169 +
55170 + fput(our_file);
55171 + return 1;
55172 +}
55173 +
55174 +static int gr_rbac_disable(void *unused)
55175 +{
55176 + pax_open_kernel();
55177 + gr_status &= ~GR_READY;
55178 + pax_close_kernel();
55179 +
55180 + return 0;
55181 +}
55182 +
55183 +ssize_t
55184 +write_grsec_handler(struct file *file, const char * buf, size_t count, loff_t *ppos)
55185 +{
55186 + struct gr_arg_wrapper uwrap;
55187 + unsigned char *sprole_salt = NULL;
55188 + unsigned char *sprole_sum = NULL;
55189 + int error = sizeof (struct gr_arg_wrapper);
55190 + int error2 = 0;
55191 +
55192 + mutex_lock(&gr_dev_mutex);
55193 +
55194 + if ((gr_status & GR_READY) && !(current->acl->mode & GR_KERNELAUTH)) {
55195 + error = -EPERM;
55196 + goto out;
55197 + }
55198 +
55199 + if (count != sizeof (struct gr_arg_wrapper)) {
55200 + gr_log_int_int(GR_DONT_AUDIT_GOOD, GR_DEV_ACL_MSG, (int)count, (int)sizeof(struct gr_arg_wrapper));
55201 + error = -EINVAL;
55202 + goto out;
55203 + }
55204 +
55205 +
55206 + if (gr_auth_expires && time_after_eq(get_seconds(), gr_auth_expires)) {
55207 + gr_auth_expires = 0;
55208 + gr_auth_attempts = 0;
55209 + }
55210 +
55211 + if (copy_from_user(&uwrap, buf, sizeof (struct gr_arg_wrapper))) {
55212 + error = -EFAULT;
55213 + goto out;
55214 + }
55215 +
55216 + if ((uwrap.version != GRSECURITY_VERSION) || (uwrap.size != sizeof(struct gr_arg))) {
55217 + error = -EINVAL;
55218 + goto out;
55219 + }
55220 +
55221 + if (copy_from_user(gr_usermode, uwrap.arg, sizeof (struct gr_arg))) {
55222 + error = -EFAULT;
55223 + goto out;
55224 + }
55225 +
55226 + if (gr_usermode->mode != GR_SPROLE && gr_usermode->mode != GR_SPROLEPAM &&
55227 + gr_auth_attempts >= CONFIG_GRKERNSEC_ACL_MAXTRIES &&
55228 + time_after(gr_auth_expires, get_seconds())) {
55229 + error = -EBUSY;
55230 + goto out;
55231 + }
55232 +
55233 + /* if non-root trying to do anything other than use a special role,
55234 + do not attempt authentication, do not count towards authentication
55235 + locking
55236 + */
55237 +
55238 + if (gr_usermode->mode != GR_SPROLE && gr_usermode->mode != GR_STATUS &&
55239 + gr_usermode->mode != GR_UNSPROLE && gr_usermode->mode != GR_SPROLEPAM &&
55240 + !uid_eq(current_uid(), GLOBAL_ROOT_UID)) {
55241 + error = -EPERM;
55242 + goto out;
55243 + }
55244 +
55245 + /* ensure pw and special role name are null terminated */
55246 +
55247 + gr_usermode->pw[GR_PW_LEN - 1] = '\0';
55248 + gr_usermode->sp_role[GR_SPROLE_LEN - 1] = '\0';
55249 +
55250 + /* Okay.
55251 + * We have our enough of the argument structure..(we have yet
55252 + * to copy_from_user the tables themselves) . Copy the tables
55253 + * only if we need them, i.e. for loading operations. */
55254 +
55255 + switch (gr_usermode->mode) {
55256 + case GR_STATUS:
55257 + if (gr_status & GR_READY) {
55258 + error = 1;
55259 + if (!gr_check_secure_terminal(current))
55260 + error = 3;
55261 + } else
55262 + error = 2;
55263 + goto out;
55264 + case GR_SHUTDOWN:
55265 + if ((gr_status & GR_READY)
55266 + && !(chkpw(gr_usermode, gr_system_salt, gr_system_sum))) {
55267 + stop_machine(gr_rbac_disable, NULL, NULL);
55268 + free_variables();
55269 + memset(gr_usermode, 0, sizeof (struct gr_arg));
55270 + memset(gr_system_salt, 0, GR_SALT_LEN);
55271 + memset(gr_system_sum, 0, GR_SHA_LEN);
55272 + gr_log_noargs(GR_DONT_AUDIT_GOOD, GR_SHUTS_ACL_MSG);
55273 + } else if (gr_status & GR_READY) {
55274 + gr_log_noargs(GR_DONT_AUDIT, GR_SHUTF_ACL_MSG);
55275 + error = -EPERM;
55276 + } else {
55277 + gr_log_noargs(GR_DONT_AUDIT_GOOD, GR_SHUTI_ACL_MSG);
55278 + error = -EAGAIN;
55279 + }
55280 + break;
55281 + case GR_ENABLE:
55282 + if (!(gr_status & GR_READY) && !(error2 = gracl_init(gr_usermode)))
55283 + gr_log_str(GR_DONT_AUDIT_GOOD, GR_ENABLE_ACL_MSG, GR_VERSION);
55284 + else {
55285 + if (gr_status & GR_READY)
55286 + error = -EAGAIN;
55287 + else
55288 + error = error2;
55289 + gr_log_str(GR_DONT_AUDIT, GR_ENABLEF_ACL_MSG, GR_VERSION);
55290 + }
55291 + break;
55292 + case GR_RELOAD:
55293 + if (!(gr_status & GR_READY)) {
55294 + gr_log_str(GR_DONT_AUDIT_GOOD, GR_RELOADI_ACL_MSG, GR_VERSION);
55295 + error = -EAGAIN;
55296 + } else if (!(chkpw(gr_usermode, gr_system_salt, gr_system_sum))) {
55297 + stop_machine(gr_rbac_disable, NULL, NULL);
55298 + free_variables();
55299 + error2 = gracl_init(gr_usermode);
55300 + if (!error2)
55301 + gr_log_str(GR_DONT_AUDIT_GOOD, GR_RELOAD_ACL_MSG, GR_VERSION);
55302 + else {
55303 + gr_log_str(GR_DONT_AUDIT, GR_RELOADF_ACL_MSG, GR_VERSION);
55304 + error = error2;
55305 + }
55306 + } else {
55307 + gr_log_str(GR_DONT_AUDIT, GR_RELOADF_ACL_MSG, GR_VERSION);
55308 + error = -EPERM;
55309 + }
55310 + break;
55311 + case GR_SEGVMOD:
55312 + if (unlikely(!(gr_status & GR_READY))) {
55313 + gr_log_noargs(GR_DONT_AUDIT_GOOD, GR_SEGVMODI_ACL_MSG);
55314 + error = -EAGAIN;
55315 + break;
55316 + }
55317 +
55318 + if (!(chkpw(gr_usermode, gr_system_salt, gr_system_sum))) {
55319 + gr_log_noargs(GR_DONT_AUDIT_GOOD, GR_SEGVMODS_ACL_MSG);
55320 + if (gr_usermode->segv_device && gr_usermode->segv_inode) {
55321 + struct acl_subject_label *segvacl;
55322 + segvacl =
55323 + lookup_acl_subj_label(gr_usermode->segv_inode,
55324 + gr_usermode->segv_device,
55325 + current->role);
55326 + if (segvacl) {
55327 + segvacl->crashes = 0;
55328 + segvacl->expires = 0;
55329 + }
55330 + } else if (gr_find_uid(gr_usermode->segv_uid) >= 0) {
55331 + gr_remove_uid(gr_usermode->segv_uid);
55332 + }
55333 + } else {
55334 + gr_log_noargs(GR_DONT_AUDIT, GR_SEGVMODF_ACL_MSG);
55335 + error = -EPERM;
55336 + }
55337 + break;
55338 + case GR_SPROLE:
55339 + case GR_SPROLEPAM:
55340 + if (unlikely(!(gr_status & GR_READY))) {
55341 + gr_log_noargs(GR_DONT_AUDIT_GOOD, GR_SPROLEI_ACL_MSG);
55342 + error = -EAGAIN;
55343 + break;
55344 + }
55345 +
55346 + if (current->role->expires && time_after_eq(get_seconds(), current->role->expires)) {
55347 + current->role->expires = 0;
55348 + current->role->auth_attempts = 0;
55349 + }
55350 +
55351 + if (current->role->auth_attempts >= CONFIG_GRKERNSEC_ACL_MAXTRIES &&
55352 + time_after(current->role->expires, get_seconds())) {
55353 + error = -EBUSY;
55354 + goto out;
55355 + }
55356 +
55357 + if (lookup_special_role_auth
55358 + (gr_usermode->mode, gr_usermode->sp_role, &sprole_salt, &sprole_sum)
55359 + && ((!sprole_salt && !sprole_sum)
55360 + || !(chkpw(gr_usermode, sprole_salt, sprole_sum)))) {
55361 + char *p = "";
55362 + assign_special_role(gr_usermode->sp_role);
55363 + read_lock(&tasklist_lock);
55364 + if (current->real_parent)
55365 + p = current->real_parent->role->rolename;
55366 + read_unlock(&tasklist_lock);
55367 + gr_log_str_int(GR_DONT_AUDIT_GOOD, GR_SPROLES_ACL_MSG,
55368 + p, acl_sp_role_value);
55369 + } else {
55370 + gr_log_str(GR_DONT_AUDIT, GR_SPROLEF_ACL_MSG, gr_usermode->sp_role);
55371 + error = -EPERM;
55372 + if(!(current->role->auth_attempts++))
55373 + current->role->expires = get_seconds() + CONFIG_GRKERNSEC_ACL_TIMEOUT;
55374 +
55375 + goto out;
55376 + }
55377 + break;
55378 + case GR_UNSPROLE:
55379 + if (unlikely(!(gr_status & GR_READY))) {
55380 + gr_log_noargs(GR_DONT_AUDIT_GOOD, GR_UNSPROLEI_ACL_MSG);
55381 + error = -EAGAIN;
55382 + break;
55383 + }
55384 +
55385 + if (current->role->roletype & GR_ROLE_SPECIAL) {
55386 + char *p = "";
55387 + int i = 0;
55388 +
55389 + read_lock(&tasklist_lock);
55390 + if (current->real_parent) {
55391 + p = current->real_parent->role->rolename;
55392 + i = current->real_parent->acl_role_id;
55393 + }
55394 + read_unlock(&tasklist_lock);
55395 +
55396 + gr_log_str_int(GR_DONT_AUDIT_GOOD, GR_UNSPROLES_ACL_MSG, p, i);
55397 + gr_set_acls(1);
55398 + } else {
55399 + error = -EPERM;
55400 + goto out;
55401 + }
55402 + break;
55403 + default:
55404 + gr_log_int(GR_DONT_AUDIT, GR_INVMODE_ACL_MSG, gr_usermode->mode);
55405 + error = -EINVAL;
55406 + break;
55407 + }
55408 +
55409 + if (error != -EPERM)
55410 + goto out;
55411 +
55412 + if(!(gr_auth_attempts++))
55413 + gr_auth_expires = get_seconds() + CONFIG_GRKERNSEC_ACL_TIMEOUT;
55414 +
55415 + out:
55416 + mutex_unlock(&gr_dev_mutex);
55417 + return error;
55418 +}
55419 +
55420 +/* must be called with
55421 + rcu_read_lock();
55422 + read_lock(&tasklist_lock);
55423 + read_lock(&grsec_exec_file_lock);
55424 +*/
55425 +int gr_apply_subject_to_task(struct task_struct *task)
55426 +{
55427 + struct acl_object_label *obj;
55428 + char *tmpname;
55429 + struct acl_subject_label *tmpsubj;
55430 + struct file *filp;
55431 + struct name_entry *nmatch;
55432 +
55433 + filp = task->exec_file;
55434 + if (filp == NULL)
55435 + return 0;
55436 +
55437 + /* the following is to apply the correct subject
55438 + on binaries running when the RBAC system
55439 + is enabled, when the binaries have been
55440 + replaced or deleted since their execution
55441 + -----
55442 + when the RBAC system starts, the inode/dev
55443 + from exec_file will be one the RBAC system
55444 + is unaware of. It only knows the inode/dev
55445 + of the present file on disk, or the absence
55446 + of it.
55447 + */
55448 + preempt_disable();
55449 + tmpname = gr_to_filename_rbac(filp->f_path.dentry, filp->f_path.mnt);
55450 +
55451 + nmatch = lookup_name_entry(tmpname);
55452 + preempt_enable();
55453 + tmpsubj = NULL;
55454 + if (nmatch) {
55455 + if (nmatch->deleted)
55456 + tmpsubj = lookup_acl_subj_label_deleted(nmatch->inode, nmatch->device, task->role);
55457 + else
55458 + tmpsubj = lookup_acl_subj_label(nmatch->inode, nmatch->device, task->role);
55459 + if (tmpsubj != NULL)
55460 + task->acl = tmpsubj;
55461 + }
55462 + if (tmpsubj == NULL)
55463 + task->acl = chk_subj_label(filp->f_path.dentry, filp->f_path.mnt,
55464 + task->role);
55465 + if (task->acl) {
55466 + task->is_writable = 0;
55467 + /* ignore additional mmap checks for processes that are writable
55468 + by the default ACL */
55469 + obj = chk_obj_label(filp->f_path.dentry, filp->f_path.mnt, default_role->root_label);
55470 + if (unlikely(obj->mode & GR_WRITE))
55471 + task->is_writable = 1;
55472 + obj = chk_obj_label(filp->f_path.dentry, filp->f_path.mnt, task->role->root_label);
55473 + if (unlikely(obj->mode & GR_WRITE))
55474 + task->is_writable = 1;
55475 +
55476 + gr_set_proc_res(task);
55477 +
55478 +#ifdef CONFIG_GRKERNSEC_RBAC_DEBUG
55479 + printk(KERN_ALERT "gr_set_acls for (%s:%d): role:%s, subject:%s\n", task->comm, task->pid, task->role->rolename, task->acl->filename);
55480 +#endif
55481 + } else {
55482 + return 1;
55483 + }
55484 +
55485 + return 0;
55486 +}
55487 +
55488 +int
55489 +gr_set_acls(const int type)
55490 +{
55491 + struct task_struct *task, *task2;
55492 + struct acl_role_label *role = current->role;
55493 + __u16 acl_role_id = current->acl_role_id;
55494 + const struct cred *cred;
55495 + int ret;
55496 +
55497 + rcu_read_lock();
55498 + read_lock(&tasklist_lock);
55499 + read_lock(&grsec_exec_file_lock);
55500 + do_each_thread(task2, task) {
55501 + /* check to see if we're called from the exit handler,
55502 + if so, only replace ACLs that have inherited the admin
55503 + ACL */
55504 +
55505 + if (type && (task->role != role ||
55506 + task->acl_role_id != acl_role_id))
55507 + continue;
55508 +
55509 + task->acl_role_id = 0;
55510 + task->acl_sp_role = 0;
55511 +
55512 + if (task->exec_file) {
55513 + cred = __task_cred(task);
55514 + task->role = lookup_acl_role_label(task, cred->uid, cred->gid);
55515 + ret = gr_apply_subject_to_task(task);
55516 + if (ret) {
55517 + read_unlock(&grsec_exec_file_lock);
55518 + read_unlock(&tasklist_lock);
55519 + rcu_read_unlock();
55520 + gr_log_str_int(GR_DONT_AUDIT_GOOD, GR_DEFACL_MSG, task->comm, task->pid);
55521 + return ret;
55522 + }
55523 + } else {
55524 + // it's a kernel process
55525 + task->role = kernel_role;
55526 + task->acl = kernel_role->root_label;
55527 +#ifdef CONFIG_GRKERNSEC_ACL_HIDEKERN
55528 + task->acl->mode &= ~GR_PROCFIND;
55529 +#endif
55530 + }
55531 + } while_each_thread(task2, task);
55532 + read_unlock(&grsec_exec_file_lock);
55533 + read_unlock(&tasklist_lock);
55534 + rcu_read_unlock();
55535 +
55536 + return 0;
55537 +}
55538 +
55539 +void
55540 +gr_learn_resource(const struct task_struct *task,
55541 + const int res, const unsigned long wanted, const int gt)
55542 +{
55543 + struct acl_subject_label *acl;
55544 + const struct cred *cred;
55545 +
55546 + if (unlikely((gr_status & GR_READY) &&
55547 + task->acl && (task->acl->mode & (GR_LEARN | GR_INHERITLEARN))))
55548 + goto skip_reslog;
55549 +
55550 +#ifdef CONFIG_GRKERNSEC_RESLOG
55551 + gr_log_resource(task, res, wanted, gt);
55552 +#endif
55553 + skip_reslog:
55554 +
55555 + if (unlikely(!(gr_status & GR_READY) || !wanted || res >= GR_NLIMITS))
55556 + return;
55557 +
55558 + acl = task->acl;
55559 +
55560 + if (likely(!acl || !(acl->mode & (GR_LEARN | GR_INHERITLEARN)) ||
55561 + !(acl->resmask & (1 << (unsigned short) res))))
55562 + return;
55563 +
55564 + if (wanted >= acl->res[res].rlim_cur) {
55565 + unsigned long res_add;
55566 +
55567 + res_add = wanted;
55568 + switch (res) {
55569 + case RLIMIT_CPU:
55570 + res_add += GR_RLIM_CPU_BUMP;
55571 + break;
55572 + case RLIMIT_FSIZE:
55573 + res_add += GR_RLIM_FSIZE_BUMP;
55574 + break;
55575 + case RLIMIT_DATA:
55576 + res_add += GR_RLIM_DATA_BUMP;
55577 + break;
55578 + case RLIMIT_STACK:
55579 + res_add += GR_RLIM_STACK_BUMP;
55580 + break;
55581 + case RLIMIT_CORE:
55582 + res_add += GR_RLIM_CORE_BUMP;
55583 + break;
55584 + case RLIMIT_RSS:
55585 + res_add += GR_RLIM_RSS_BUMP;
55586 + break;
55587 + case RLIMIT_NPROC:
55588 + res_add += GR_RLIM_NPROC_BUMP;
55589 + break;
55590 + case RLIMIT_NOFILE:
55591 + res_add += GR_RLIM_NOFILE_BUMP;
55592 + break;
55593 + case RLIMIT_MEMLOCK:
55594 + res_add += GR_RLIM_MEMLOCK_BUMP;
55595 + break;
55596 + case RLIMIT_AS:
55597 + res_add += GR_RLIM_AS_BUMP;
55598 + break;
55599 + case RLIMIT_LOCKS:
55600 + res_add += GR_RLIM_LOCKS_BUMP;
55601 + break;
55602 + case RLIMIT_SIGPENDING:
55603 + res_add += GR_RLIM_SIGPENDING_BUMP;
55604 + break;
55605 + case RLIMIT_MSGQUEUE:
55606 + res_add += GR_RLIM_MSGQUEUE_BUMP;
55607 + break;
55608 + case RLIMIT_NICE:
55609 + res_add += GR_RLIM_NICE_BUMP;
55610 + break;
55611 + case RLIMIT_RTPRIO:
55612 + res_add += GR_RLIM_RTPRIO_BUMP;
55613 + break;
55614 + case RLIMIT_RTTIME:
55615 + res_add += GR_RLIM_RTTIME_BUMP;
55616 + break;
55617 + }
55618 +
55619 + acl->res[res].rlim_cur = res_add;
55620 +
55621 + if (wanted > acl->res[res].rlim_max)
55622 + acl->res[res].rlim_max = res_add;
55623 +
55624 + /* only log the subject filename, since resource logging is supported for
55625 + single-subject learning only */
55626 + rcu_read_lock();
55627 + cred = __task_cred(task);
55628 + security_learn(GR_LEARN_AUDIT_MSG, task->role->rolename,
55629 + task->role->roletype, cred->uid, cred->gid, acl->filename,
55630 + acl->filename, acl->res[res].rlim_cur, acl->res[res].rlim_max,
55631 + "", (unsigned long) res, &task->signal->saved_ip);
55632 + rcu_read_unlock();
55633 + }
55634 +
55635 + return;
55636 +}
55637 +
55638 +#if defined(CONFIG_PAX_HAVE_ACL_FLAGS) && (defined(CONFIG_PAX_NOEXEC) || defined(CONFIG_PAX_ASLR))
55639 +void
55640 +pax_set_initial_flags(struct linux_binprm *bprm)
55641 +{
55642 + struct task_struct *task = current;
55643 + struct acl_subject_label *proc;
55644 + unsigned long flags;
55645 +
55646 + if (unlikely(!(gr_status & GR_READY)))
55647 + return;
55648 +
55649 + flags = pax_get_flags(task);
55650 +
55651 + proc = task->acl;
55652 +
55653 + if (proc->pax_flags & GR_PAX_DISABLE_PAGEEXEC)
55654 + flags &= ~MF_PAX_PAGEEXEC;
55655 + if (proc->pax_flags & GR_PAX_DISABLE_SEGMEXEC)
55656 + flags &= ~MF_PAX_SEGMEXEC;
55657 + if (proc->pax_flags & GR_PAX_DISABLE_RANDMMAP)
55658 + flags &= ~MF_PAX_RANDMMAP;
55659 + if (proc->pax_flags & GR_PAX_DISABLE_EMUTRAMP)
55660 + flags &= ~MF_PAX_EMUTRAMP;
55661 + if (proc->pax_flags & GR_PAX_DISABLE_MPROTECT)
55662 + flags &= ~MF_PAX_MPROTECT;
55663 +
55664 + if (proc->pax_flags & GR_PAX_ENABLE_PAGEEXEC)
55665 + flags |= MF_PAX_PAGEEXEC;
55666 + if (proc->pax_flags & GR_PAX_ENABLE_SEGMEXEC)
55667 + flags |= MF_PAX_SEGMEXEC;
55668 + if (proc->pax_flags & GR_PAX_ENABLE_RANDMMAP)
55669 + flags |= MF_PAX_RANDMMAP;
55670 + if (proc->pax_flags & GR_PAX_ENABLE_EMUTRAMP)
55671 + flags |= MF_PAX_EMUTRAMP;
55672 + if (proc->pax_flags & GR_PAX_ENABLE_MPROTECT)
55673 + flags |= MF_PAX_MPROTECT;
55674 +
55675 + pax_set_flags(task, flags);
55676 +
55677 + return;
55678 +}
55679 +#endif
55680 +
55681 +int
55682 +gr_handle_proc_ptrace(struct task_struct *task)
55683 +{
55684 + struct file *filp;
55685 + struct task_struct *tmp = task;
55686 + struct task_struct *curtemp = current;
55687 + __u32 retmode;
55688 +
55689 +#ifndef CONFIG_GRKERNSEC_HARDEN_PTRACE
55690 + if (unlikely(!(gr_status & GR_READY)))
55691 + return 0;
55692 +#endif
55693 +
55694 + read_lock(&tasklist_lock);
55695 + read_lock(&grsec_exec_file_lock);
55696 + filp = task->exec_file;
55697 +
55698 + while (tmp->pid > 0) {
55699 + if (tmp == curtemp)
55700 + break;
55701 + tmp = tmp->real_parent;
55702 + }
55703 +
55704 + if (!filp || (tmp->pid == 0 && ((grsec_enable_harden_ptrace && !uid_eq(current_uid(), GLOBAL_ROOT_UID) && !(gr_status & GR_READY)) ||
55705 + ((gr_status & GR_READY) && !(current->acl->mode & GR_RELAXPTRACE))))) {
55706 + read_unlock(&grsec_exec_file_lock);
55707 + read_unlock(&tasklist_lock);
55708 + return 1;
55709 + }
55710 +
55711 +#ifdef CONFIG_GRKERNSEC_HARDEN_PTRACE
55712 + if (!(gr_status & GR_READY)) {
55713 + read_unlock(&grsec_exec_file_lock);
55714 + read_unlock(&tasklist_lock);
55715 + return 0;
55716 + }
55717 +#endif
55718 +
55719 + retmode = gr_search_file(filp->f_path.dentry, GR_NOPTRACE, filp->f_path.mnt);
55720 + read_unlock(&grsec_exec_file_lock);
55721 + read_unlock(&tasklist_lock);
55722 +
55723 + if (retmode & GR_NOPTRACE)
55724 + return 1;
55725 +
55726 + if (!(current->acl->mode & GR_POVERRIDE) && !(current->role->roletype & GR_ROLE_GOD)
55727 + && (current->acl != task->acl || (current->acl != current->role->root_label
55728 + && current->pid != task->pid)))
55729 + return 1;
55730 +
55731 + return 0;
55732 +}
55733 +
55734 +void task_grsec_rbac(struct seq_file *m, struct task_struct *p)
55735 +{
55736 + if (unlikely(!(gr_status & GR_READY)))
55737 + return;
55738 +
55739 + if (!(current->role->roletype & GR_ROLE_GOD))
55740 + return;
55741 +
55742 + seq_printf(m, "RBAC:\t%.64s:%c:%.950s\n",
55743 + p->role->rolename, gr_task_roletype_to_char(p),
55744 + p->acl->filename);
55745 +}
55746 +
55747 +int
55748 +gr_handle_ptrace(struct task_struct *task, const long request)
55749 +{
55750 + struct task_struct *tmp = task;
55751 + struct task_struct *curtemp = current;
55752 + __u32 retmode;
55753 +
55754 +#ifndef CONFIG_GRKERNSEC_HARDEN_PTRACE
55755 + if (unlikely(!(gr_status & GR_READY)))
55756 + return 0;
55757 +#endif
55758 + if (request == PTRACE_ATTACH || request == PTRACE_SEIZE) {
55759 + read_lock(&tasklist_lock);
55760 + while (tmp->pid > 0) {
55761 + if (tmp == curtemp)
55762 + break;
55763 + tmp = tmp->real_parent;
55764 + }
55765 +
55766 + if (tmp->pid == 0 && ((grsec_enable_harden_ptrace && !uid_eq(current_uid(), GLOBAL_ROOT_UID) && !(gr_status & GR_READY)) ||
55767 + ((gr_status & GR_READY) && !(current->acl->mode & GR_RELAXPTRACE)))) {
55768 + read_unlock(&tasklist_lock);
55769 + gr_log_ptrace(GR_DONT_AUDIT, GR_PTRACE_ACL_MSG, task);
55770 + return 1;
55771 + }
55772 + read_unlock(&tasklist_lock);
55773 + }
55774 +
55775 +#ifdef CONFIG_GRKERNSEC_HARDEN_PTRACE
55776 + if (!(gr_status & GR_READY))
55777 + return 0;
55778 +#endif
55779 +
55780 + read_lock(&grsec_exec_file_lock);
55781 + if (unlikely(!task->exec_file)) {
55782 + read_unlock(&grsec_exec_file_lock);
55783 + return 0;
55784 + }
55785 +
55786 + retmode = gr_search_file(task->exec_file->f_path.dentry, GR_PTRACERD | GR_NOPTRACE, task->exec_file->f_path.mnt);
55787 + read_unlock(&grsec_exec_file_lock);
55788 +
55789 + if (retmode & GR_NOPTRACE) {
55790 + gr_log_ptrace(GR_DONT_AUDIT, GR_PTRACE_ACL_MSG, task);
55791 + return 1;
55792 + }
55793 +
55794 + if (retmode & GR_PTRACERD) {
55795 + switch (request) {
55796 + case PTRACE_SEIZE:
55797 + case PTRACE_POKETEXT:
55798 + case PTRACE_POKEDATA:
55799 + case PTRACE_POKEUSR:
55800 +#if !defined(CONFIG_PPC32) && !defined(CONFIG_PPC64) && !defined(CONFIG_PARISC) && !defined(CONFIG_ALPHA) && !defined(CONFIG_IA64)
55801 + case PTRACE_SETREGS:
55802 + case PTRACE_SETFPREGS:
55803 +#endif
55804 +#ifdef CONFIG_X86
55805 + case PTRACE_SETFPXREGS:
55806 +#endif
55807 +#ifdef CONFIG_ALTIVEC
55808 + case PTRACE_SETVRREGS:
55809 +#endif
55810 + return 1;
55811 + default:
55812 + return 0;
55813 + }
55814 + } else if (!(current->acl->mode & GR_POVERRIDE) &&
55815 + !(current->role->roletype & GR_ROLE_GOD) &&
55816 + (current->acl != task->acl)) {
55817 + gr_log_ptrace(GR_DONT_AUDIT, GR_PTRACE_ACL_MSG, task);
55818 + return 1;
55819 + }
55820 +
55821 + return 0;
55822 +}
55823 +
55824 +static int is_writable_mmap(const struct file *filp)
55825 +{
55826 + struct task_struct *task = current;
55827 + struct acl_object_label *obj, *obj2;
55828 +
55829 + if (gr_status & GR_READY && !(task->acl->mode & GR_OVERRIDE) &&
55830 + !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))) {
55831 + obj = chk_obj_label(filp->f_path.dentry, filp->f_path.mnt, default_role->root_label);
55832 + obj2 = chk_obj_label(filp->f_path.dentry, filp->f_path.mnt,
55833 + task->role->root_label);
55834 + if (unlikely((obj->mode & GR_WRITE) || (obj2->mode & GR_WRITE))) {
55835 + gr_log_fs_generic(GR_DONT_AUDIT, GR_WRITLIB_ACL_MSG, filp->f_path.dentry, filp->f_path.mnt);
55836 + return 1;
55837 + }
55838 + }
55839 + return 0;
55840 +}
55841 +
55842 +int
55843 +gr_acl_handle_mmap(const struct file *file, const unsigned long prot)
55844 +{
55845 + __u32 mode;
55846 +
55847 + if (unlikely(!file || !(prot & PROT_EXEC)))
55848 + return 1;
55849 +
55850 + if (is_writable_mmap(file))
55851 + return 0;
55852 +
55853 + mode =
55854 + gr_search_file(file->f_path.dentry,
55855 + GR_EXEC | GR_AUDIT_EXEC | GR_SUPPRESS,
55856 + file->f_path.mnt);
55857 +
55858 + if (!gr_tpe_allow(file))
55859 + return 0;
55860 +
55861 + if (unlikely(!(mode & GR_EXEC) && !(mode & GR_SUPPRESS))) {
55862 + gr_log_fs_rbac_generic(GR_DONT_AUDIT, GR_MMAP_ACL_MSG, file->f_path.dentry, file->f_path.mnt);
55863 + return 0;
55864 + } else if (unlikely(!(mode & GR_EXEC))) {
55865 + return 0;
55866 + } else if (unlikely(mode & GR_EXEC && mode & GR_AUDIT_EXEC)) {
55867 + gr_log_fs_rbac_generic(GR_DO_AUDIT, GR_MMAP_ACL_MSG, file->f_path.dentry, file->f_path.mnt);
55868 + return 1;
55869 + }
55870 +
55871 + return 1;
55872 +}
55873 +
55874 +int
55875 +gr_acl_handle_mprotect(const struct file *file, const unsigned long prot)
55876 +{
55877 + __u32 mode;
55878 +
55879 + if (unlikely(!file || !(prot & PROT_EXEC)))
55880 + return 1;
55881 +
55882 + if (is_writable_mmap(file))
55883 + return 0;
55884 +
55885 + mode =
55886 + gr_search_file(file->f_path.dentry,
55887 + GR_EXEC | GR_AUDIT_EXEC | GR_SUPPRESS,
55888 + file->f_path.mnt);
55889 +
55890 + if (!gr_tpe_allow(file))
55891 + return 0;
55892 +
55893 + if (unlikely(!(mode & GR_EXEC) && !(mode & GR_SUPPRESS))) {
55894 + gr_log_fs_rbac_generic(GR_DONT_AUDIT, GR_MPROTECT_ACL_MSG, file->f_path.dentry, file->f_path.mnt);
55895 + return 0;
55896 + } else if (unlikely(!(mode & GR_EXEC))) {
55897 + return 0;
55898 + } else if (unlikely(mode & GR_EXEC && mode & GR_AUDIT_EXEC)) {
55899 + gr_log_fs_rbac_generic(GR_DO_AUDIT, GR_MPROTECT_ACL_MSG, file->f_path.dentry, file->f_path.mnt);
55900 + return 1;
55901 + }
55902 +
55903 + return 1;
55904 +}
55905 +
55906 +void
55907 +gr_acl_handle_psacct(struct task_struct *task, const long code)
55908 +{
55909 + unsigned long runtime;
55910 + unsigned long cputime;
55911 + unsigned int wday, cday;
55912 + __u8 whr, chr;
55913 + __u8 wmin, cmin;
55914 + __u8 wsec, csec;
55915 + struct timespec timeval;
55916 +
55917 + if (unlikely(!(gr_status & GR_READY) || !task->acl ||
55918 + !(task->acl->mode & GR_PROCACCT)))
55919 + return;
55920 +
55921 + do_posix_clock_monotonic_gettime(&timeval);
55922 + runtime = timeval.tv_sec - task->start_time.tv_sec;
55923 + wday = runtime / (3600 * 24);
55924 + runtime -= wday * (3600 * 24);
55925 + whr = runtime / 3600;
55926 + runtime -= whr * 3600;
55927 + wmin = runtime / 60;
55928 + runtime -= wmin * 60;
55929 + wsec = runtime;
55930 +
55931 + cputime = (task->utime + task->stime) / HZ;
55932 + cday = cputime / (3600 * 24);
55933 + cputime -= cday * (3600 * 24);
55934 + chr = cputime / 3600;
55935 + cputime -= chr * 3600;
55936 + cmin = cputime / 60;
55937 + cputime -= cmin * 60;
55938 + csec = cputime;
55939 +
55940 + gr_log_procacct(GR_DO_AUDIT, GR_ACL_PROCACCT_MSG, task, wday, whr, wmin, wsec, cday, chr, cmin, csec, code);
55941 +
55942 + return;
55943 +}
55944 +
55945 +void gr_set_kernel_label(struct task_struct *task)
55946 +{
55947 + if (gr_status & GR_READY) {
55948 + task->role = kernel_role;
55949 + task->acl = kernel_role->root_label;
55950 + }
55951 + return;
55952 +}
55953 +
55954 +#ifdef CONFIG_TASKSTATS
55955 +int gr_is_taskstats_denied(int pid)
55956 +{
55957 + struct task_struct *task;
55958 +#if defined(CONFIG_GRKERNSEC_PROC_USER) || defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
55959 + const struct cred *cred;
55960 +#endif
55961 + int ret = 0;
55962 +
55963 + /* restrict taskstats viewing to un-chrooted root users
55964 + who have the 'view' subject flag if the RBAC system is enabled
55965 + */
55966 +
55967 + rcu_read_lock();
55968 + read_lock(&tasklist_lock);
55969 + task = find_task_by_vpid(pid);
55970 + if (task) {
55971 +#ifdef CONFIG_GRKERNSEC_CHROOT
55972 + if (proc_is_chrooted(task))
55973 + ret = -EACCES;
55974 +#endif
55975 +#if defined(CONFIG_GRKERNSEC_PROC_USER) || defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
55976 + cred = __task_cred(task);
55977 +#ifdef CONFIG_GRKERNSEC_PROC_USER
55978 + if (!uid_eq(cred->uid, GLOBAL_ROOT_UID))
55979 + ret = -EACCES;
55980 +#elif defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
55981 + if (!uid_eq(cred->uid, GLOBAL_ROOT_UID) && !groups_search(cred->group_info, grsec_proc_gid))
55982 + ret = -EACCES;
55983 +#endif
55984 +#endif
55985 + if (gr_status & GR_READY) {
55986 + if (!(task->acl->mode & GR_VIEW))
55987 + ret = -EACCES;
55988 + }
55989 + } else
55990 + ret = -ENOENT;
55991 +
55992 + read_unlock(&tasklist_lock);
55993 + rcu_read_unlock();
55994 +
55995 + return ret;
55996 +}
55997 +#endif
55998 +
55999 +/* AUXV entries are filled via a descendant of search_binary_handler
56000 + after we've already applied the subject for the target
56001 +*/
56002 +int gr_acl_enable_at_secure(void)
56003 +{
56004 + if (unlikely(!(gr_status & GR_READY)))
56005 + return 0;
56006 +
56007 + if (current->acl->mode & GR_ATSECURE)
56008 + return 1;
56009 +
56010 + return 0;
56011 +}
56012 +
56013 +int gr_acl_handle_filldir(const struct file *file, const char *name, const unsigned int namelen, const ino_t ino)
56014 +{
56015 + struct task_struct *task = current;
56016 + struct dentry *dentry = file->f_path.dentry;
56017 + struct vfsmount *mnt = file->f_path.mnt;
56018 + struct acl_object_label *obj, *tmp;
56019 + struct acl_subject_label *subj;
56020 + unsigned int bufsize;
56021 + int is_not_root;
56022 + char *path;
56023 + dev_t dev = __get_dev(dentry);
56024 +
56025 + if (unlikely(!(gr_status & GR_READY)))
56026 + return 1;
56027 +
56028 + if (task->acl->mode & (GR_LEARN | GR_INHERITLEARN))
56029 + return 1;
56030 +
56031 + /* ignore Eric Biederman */
56032 + if (IS_PRIVATE(dentry->d_inode))
56033 + return 1;
56034 +
56035 + subj = task->acl;
56036 + read_lock(&gr_inode_lock);
56037 + do {
56038 + obj = lookup_acl_obj_label(ino, dev, subj);
56039 + if (obj != NULL) {
56040 + read_unlock(&gr_inode_lock);
56041 + return (obj->mode & GR_FIND) ? 1 : 0;
56042 + }
56043 + } while ((subj = subj->parent_subject));
56044 + read_unlock(&gr_inode_lock);
56045 +
56046 + /* this is purely an optimization since we're looking for an object
56047 + for the directory we're doing a readdir on
56048 + if it's possible for any globbed object to match the entry we're
56049 + filling into the directory, then the object we find here will be
56050 + an anchor point with attached globbed objects
56051 + */
56052 + obj = chk_obj_label_noglob(dentry, mnt, task->acl);
56053 + if (obj->globbed == NULL)
56054 + return (obj->mode & GR_FIND) ? 1 : 0;
56055 +
56056 + is_not_root = ((obj->filename[0] == '/') &&
56057 + (obj->filename[1] == '\0')) ? 0 : 1;
56058 + bufsize = PAGE_SIZE - namelen - is_not_root;
56059 +
56060 + /* check bufsize > PAGE_SIZE || bufsize == 0 */
56061 + if (unlikely((bufsize - 1) > (PAGE_SIZE - 1)))
56062 + return 1;
56063 +
56064 + preempt_disable();
56065 + path = d_real_path(dentry, mnt, per_cpu_ptr(gr_shared_page[0], smp_processor_id()),
56066 + bufsize);
56067 +
56068 + bufsize = strlen(path);
56069 +
56070 + /* if base is "/", don't append an additional slash */
56071 + if (is_not_root)
56072 + *(path + bufsize) = '/';
56073 + memcpy(path + bufsize + is_not_root, name, namelen);
56074 + *(path + bufsize + namelen + is_not_root) = '\0';
56075 +
56076 + tmp = obj->globbed;
56077 + while (tmp) {
56078 + if (!glob_match(tmp->filename, path)) {
56079 + preempt_enable();
56080 + return (tmp->mode & GR_FIND) ? 1 : 0;
56081 + }
56082 + tmp = tmp->next;
56083 + }
56084 + preempt_enable();
56085 + return (obj->mode & GR_FIND) ? 1 : 0;
56086 +}
56087 +
56088 +void gr_put_exec_file(struct task_struct *task)
56089 +{
56090 + struct file *filp;
56091 +
56092 + write_lock(&grsec_exec_file_lock);
56093 + filp = task->exec_file;
56094 + task->exec_file = NULL;
56095 + write_unlock(&grsec_exec_file_lock);
56096 +
56097 + if (filp)
56098 + fput(filp);
56099 +
56100 + return;
56101 +}
56102 +
56103 +
56104 +#ifdef CONFIG_NETFILTER_XT_MATCH_GRADM_MODULE
56105 +EXPORT_SYMBOL(gr_acl_is_enabled);
56106 +#endif
56107 +EXPORT_SYMBOL(gr_learn_resource);
56108 +EXPORT_SYMBOL(gr_set_kernel_label);
56109 +#ifdef CONFIG_SECURITY
56110 +EXPORT_SYMBOL(gr_check_user_change);
56111 +EXPORT_SYMBOL(gr_check_group_change);
56112 +#endif
56113 +
56114 diff --git a/grsecurity/gracl_alloc.c b/grsecurity/gracl_alloc.c
56115 new file mode 100644
56116 index 0000000..34fefda
56117 --- /dev/null
56118 +++ b/grsecurity/gracl_alloc.c
56119 @@ -0,0 +1,105 @@
56120 +#include <linux/kernel.h>
56121 +#include <linux/mm.h>
56122 +#include <linux/slab.h>
56123 +#include <linux/vmalloc.h>
56124 +#include <linux/gracl.h>
56125 +#include <linux/grsecurity.h>
56126 +
56127 +static unsigned long alloc_stack_next = 1;
56128 +static unsigned long alloc_stack_size = 1;
56129 +static void **alloc_stack;
56130 +
56131 +static __inline__ int
56132 +alloc_pop(void)
56133 +{
56134 + if (alloc_stack_next == 1)
56135 + return 0;
56136 +
56137 + kfree(alloc_stack[alloc_stack_next - 2]);
56138 +
56139 + alloc_stack_next--;
56140 +
56141 + return 1;
56142 +}
56143 +
56144 +static __inline__ int
56145 +alloc_push(void *buf)
56146 +{
56147 + if (alloc_stack_next >= alloc_stack_size)
56148 + return 1;
56149 +
56150 + alloc_stack[alloc_stack_next - 1] = buf;
56151 +
56152 + alloc_stack_next++;
56153 +
56154 + return 0;
56155 +}
56156 +
56157 +void *
56158 +acl_alloc(unsigned long len)
56159 +{
56160 + void *ret = NULL;
56161 +
56162 + if (!len || len > PAGE_SIZE)
56163 + goto out;
56164 +
56165 + ret = kmalloc(len, GFP_KERNEL);
56166 +
56167 + if (ret) {
56168 + if (alloc_push(ret)) {
56169 + kfree(ret);
56170 + ret = NULL;
56171 + }
56172 + }
56173 +
56174 +out:
56175 + return ret;
56176 +}
56177 +
56178 +void *
56179 +acl_alloc_num(unsigned long num, unsigned long len)
56180 +{
56181 + if (!len || (num > (PAGE_SIZE / len)))
56182 + return NULL;
56183 +
56184 + return acl_alloc(num * len);
56185 +}
56186 +
56187 +void
56188 +acl_free_all(void)
56189 +{
56190 + if (gr_acl_is_enabled() || !alloc_stack)
56191 + return;
56192 +
56193 + while (alloc_pop()) ;
56194 +
56195 + if (alloc_stack) {
56196 + if ((alloc_stack_size * sizeof (void *)) <= PAGE_SIZE)
56197 + kfree(alloc_stack);
56198 + else
56199 + vfree(alloc_stack);
56200 + }
56201 +
56202 + alloc_stack = NULL;
56203 + alloc_stack_size = 1;
56204 + alloc_stack_next = 1;
56205 +
56206 + return;
56207 +}
56208 +
56209 +int
56210 +acl_alloc_stack_init(unsigned long size)
56211 +{
56212 + if ((size * sizeof (void *)) <= PAGE_SIZE)
56213 + alloc_stack =
56214 + (void **) kmalloc(size * sizeof (void *), GFP_KERNEL);
56215 + else
56216 + alloc_stack = (void **) vmalloc(size * sizeof (void *));
56217 +
56218 + alloc_stack_size = size;
56219 +
56220 + if (!alloc_stack)
56221 + return 0;
56222 + else
56223 + return 1;
56224 +}
56225 diff --git a/grsecurity/gracl_cap.c b/grsecurity/gracl_cap.c
56226 new file mode 100644
56227 index 0000000..6d21049
56228 --- /dev/null
56229 +++ b/grsecurity/gracl_cap.c
56230 @@ -0,0 +1,110 @@
56231 +#include <linux/kernel.h>
56232 +#include <linux/module.h>
56233 +#include <linux/sched.h>
56234 +#include <linux/gracl.h>
56235 +#include <linux/grsecurity.h>
56236 +#include <linux/grinternal.h>
56237 +
56238 +extern const char *captab_log[];
56239 +extern int captab_log_entries;
56240 +
56241 +int gr_task_acl_is_capable(const struct task_struct *task, const struct cred *cred, const int cap)
56242 +{
56243 + struct acl_subject_label *curracl;
56244 + kernel_cap_t cap_drop = __cap_empty_set, cap_mask = __cap_empty_set;
56245 + kernel_cap_t cap_audit = __cap_empty_set;
56246 +
56247 + if (!gr_acl_is_enabled())
56248 + return 1;
56249 +
56250 + curracl = task->acl;
56251 +
56252 + cap_drop = curracl->cap_lower;
56253 + cap_mask = curracl->cap_mask;
56254 + cap_audit = curracl->cap_invert_audit;
56255 +
56256 + while ((curracl = curracl->parent_subject)) {
56257 + /* if the cap isn't specified in the current computed mask but is specified in the
56258 + current level subject, and is lowered in the current level subject, then add
56259 + it to the set of dropped capabilities
56260 + otherwise, add the current level subject's mask to the current computed mask
56261 + */
56262 + if (!cap_raised(cap_mask, cap) && cap_raised(curracl->cap_mask, cap)) {
56263 + cap_raise(cap_mask, cap);
56264 + if (cap_raised(curracl->cap_lower, cap))
56265 + cap_raise(cap_drop, cap);
56266 + if (cap_raised(curracl->cap_invert_audit, cap))
56267 + cap_raise(cap_audit, cap);
56268 + }
56269 + }
56270 +
56271 + if (!cap_raised(cap_drop, cap)) {
56272 + if (cap_raised(cap_audit, cap))
56273 + gr_log_cap(GR_DO_AUDIT, GR_CAP_ACL_MSG2, task, captab_log[cap]);
56274 + return 1;
56275 + }
56276 +
56277 + curracl = task->acl;
56278 +
56279 + if ((curracl->mode & (GR_LEARN | GR_INHERITLEARN))
56280 + && cap_raised(cred->cap_effective, cap)) {
56281 + security_learn(GR_LEARN_AUDIT_MSG, task->role->rolename,
56282 + task->role->roletype, cred->uid,
56283 + cred->gid, task->exec_file ?
56284 + gr_to_filename(task->exec_file->f_path.dentry,
56285 + task->exec_file->f_path.mnt) : curracl->filename,
56286 + curracl->filename, 0UL,
56287 + 0UL, "", (unsigned long) cap, &task->signal->saved_ip);
56288 + return 1;
56289 + }
56290 +
56291 + if ((cap >= 0) && (cap < captab_log_entries) && cap_raised(cred->cap_effective, cap) && !cap_raised(cap_audit, cap))
56292 + gr_log_cap(GR_DONT_AUDIT, GR_CAP_ACL_MSG, task, captab_log[cap]);
56293 +
56294 + return 0;
56295 +}
56296 +
56297 +int
56298 +gr_acl_is_capable(const int cap)
56299 +{
56300 + return gr_task_acl_is_capable(current, current_cred(), cap);
56301 +}
56302 +
56303 +int gr_task_acl_is_capable_nolog(const struct task_struct *task, const int cap)
56304 +{
56305 + struct acl_subject_label *curracl;
56306 + kernel_cap_t cap_drop = __cap_empty_set, cap_mask = __cap_empty_set;
56307 +
56308 + if (!gr_acl_is_enabled())
56309 + return 1;
56310 +
56311 + curracl = task->acl;
56312 +
56313 + cap_drop = curracl->cap_lower;
56314 + cap_mask = curracl->cap_mask;
56315 +
56316 + while ((curracl = curracl->parent_subject)) {
56317 + /* if the cap isn't specified in the current computed mask but is specified in the
56318 + current level subject, and is lowered in the current level subject, then add
56319 + it to the set of dropped capabilities
56320 + otherwise, add the current level subject's mask to the current computed mask
56321 + */
56322 + if (!cap_raised(cap_mask, cap) && cap_raised(curracl->cap_mask, cap)) {
56323 + cap_raise(cap_mask, cap);
56324 + if (cap_raised(curracl->cap_lower, cap))
56325 + cap_raise(cap_drop, cap);
56326 + }
56327 + }
56328 +
56329 + if (!cap_raised(cap_drop, cap))
56330 + return 1;
56331 +
56332 + return 0;
56333 +}
56334 +
56335 +int
56336 +gr_acl_is_capable_nolog(const int cap)
56337 +{
56338 + return gr_task_acl_is_capable_nolog(current, cap);
56339 +}
56340 +
56341 diff --git a/grsecurity/gracl_fs.c b/grsecurity/gracl_fs.c
56342 new file mode 100644
56343 index 0000000..d28e241
56344 --- /dev/null
56345 +++ b/grsecurity/gracl_fs.c
56346 @@ -0,0 +1,437 @@
56347 +#include <linux/kernel.h>
56348 +#include <linux/sched.h>
56349 +#include <linux/types.h>
56350 +#include <linux/fs.h>
56351 +#include <linux/file.h>
56352 +#include <linux/stat.h>
56353 +#include <linux/grsecurity.h>
56354 +#include <linux/grinternal.h>
56355 +#include <linux/gracl.h>
56356 +
56357 +umode_t
56358 +gr_acl_umask(void)
56359 +{
56360 + if (unlikely(!gr_acl_is_enabled()))
56361 + return 0;
56362 +
56363 + return current->role->umask;
56364 +}
56365 +
56366 +__u32
56367 +gr_acl_handle_hidden_file(const struct dentry * dentry,
56368 + const struct vfsmount * mnt)
56369 +{
56370 + __u32 mode;
56371 +
56372 + if (unlikely(!dentry->d_inode))
56373 + return GR_FIND;
56374 +
56375 + mode =
56376 + gr_search_file(dentry, GR_FIND | GR_AUDIT_FIND | GR_SUPPRESS, mnt);
56377 +
56378 + if (unlikely(mode & GR_FIND && mode & GR_AUDIT_FIND)) {
56379 + gr_log_fs_rbac_generic(GR_DO_AUDIT, GR_HIDDEN_ACL_MSG, dentry, mnt);
56380 + return mode;
56381 + } else if (unlikely(!(mode & GR_FIND) && !(mode & GR_SUPPRESS))) {
56382 + gr_log_fs_rbac_generic(GR_DONT_AUDIT, GR_HIDDEN_ACL_MSG, dentry, mnt);
56383 + return 0;
56384 + } else if (unlikely(!(mode & GR_FIND)))
56385 + return 0;
56386 +
56387 + return GR_FIND;
56388 +}
56389 +
56390 +__u32
56391 +gr_acl_handle_open(const struct dentry * dentry, const struct vfsmount * mnt,
56392 + int acc_mode)
56393 +{
56394 + __u32 reqmode = GR_FIND;
56395 + __u32 mode;
56396 +
56397 + if (unlikely(!dentry->d_inode))
56398 + return reqmode;
56399 +
56400 + if (acc_mode & MAY_APPEND)
56401 + reqmode |= GR_APPEND;
56402 + else if (acc_mode & MAY_WRITE)
56403 + reqmode |= GR_WRITE;
56404 + if ((acc_mode & MAY_READ) && !S_ISDIR(dentry->d_inode->i_mode))
56405 + reqmode |= GR_READ;
56406 +
56407 + mode =
56408 + gr_search_file(dentry, reqmode | to_gr_audit(reqmode) | GR_SUPPRESS,
56409 + mnt);
56410 +
56411 + if (unlikely(((mode & reqmode) == reqmode) && mode & GR_AUDITS)) {
56412 + gr_log_fs_rbac_mode2(GR_DO_AUDIT, GR_OPEN_ACL_MSG, dentry, mnt,
56413 + reqmode & GR_READ ? " reading" : "",
56414 + reqmode & GR_WRITE ? " writing" : reqmode &
56415 + GR_APPEND ? " appending" : "");
56416 + return reqmode;
56417 + } else
56418 + if (unlikely((mode & reqmode) != reqmode && !(mode & GR_SUPPRESS)))
56419 + {
56420 + gr_log_fs_rbac_mode2(GR_DONT_AUDIT, GR_OPEN_ACL_MSG, dentry, mnt,
56421 + reqmode & GR_READ ? " reading" : "",
56422 + reqmode & GR_WRITE ? " writing" : reqmode &
56423 + GR_APPEND ? " appending" : "");
56424 + return 0;
56425 + } else if (unlikely((mode & reqmode) != reqmode))
56426 + return 0;
56427 +
56428 + return reqmode;
56429 +}
56430 +
56431 +__u32
56432 +gr_acl_handle_creat(const struct dentry * dentry,
56433 + const struct dentry * p_dentry,
56434 + const struct vfsmount * p_mnt, int open_flags, int acc_mode,
56435 + const int imode)
56436 +{
56437 + __u32 reqmode = GR_WRITE | GR_CREATE;
56438 + __u32 mode;
56439 +
56440 + if (acc_mode & MAY_APPEND)
56441 + reqmode |= GR_APPEND;
56442 + // if a directory was required or the directory already exists, then
56443 + // don't count this open as a read
56444 + if ((acc_mode & MAY_READ) &&
56445 + !((open_flags & O_DIRECTORY) || (dentry->d_inode && S_ISDIR(dentry->d_inode->i_mode))))
56446 + reqmode |= GR_READ;
56447 + if ((open_flags & O_CREAT) &&
56448 + ((imode & S_ISUID) || ((imode & (S_ISGID | S_IXGRP)) == (S_ISGID | S_IXGRP))))
56449 + reqmode |= GR_SETID;
56450 +
56451 + mode =
56452 + gr_check_create(dentry, p_dentry, p_mnt,
56453 + reqmode | to_gr_audit(reqmode) | GR_SUPPRESS);
56454 +
56455 + if (unlikely(((mode & reqmode) == reqmode) && mode & GR_AUDITS)) {
56456 + gr_log_fs_rbac_mode2(GR_DO_AUDIT, GR_CREATE_ACL_MSG, dentry, p_mnt,
56457 + reqmode & GR_READ ? " reading" : "",
56458 + reqmode & GR_WRITE ? " writing" : reqmode &
56459 + GR_APPEND ? " appending" : "");
56460 + return reqmode;
56461 + } else
56462 + if (unlikely((mode & reqmode) != reqmode && !(mode & GR_SUPPRESS)))
56463 + {
56464 + gr_log_fs_rbac_mode2(GR_DONT_AUDIT, GR_CREATE_ACL_MSG, dentry, p_mnt,
56465 + reqmode & GR_READ ? " reading" : "",
56466 + reqmode & GR_WRITE ? " writing" : reqmode &
56467 + GR_APPEND ? " appending" : "");
56468 + return 0;
56469 + } else if (unlikely((mode & reqmode) != reqmode))
56470 + return 0;
56471 +
56472 + return reqmode;
56473 +}
56474 +
56475 +__u32
56476 +gr_acl_handle_access(const struct dentry * dentry, const struct vfsmount * mnt,
56477 + const int fmode)
56478 +{
56479 + __u32 mode, reqmode = GR_FIND;
56480 +
56481 + if ((fmode & S_IXOTH) && !S_ISDIR(dentry->d_inode->i_mode))
56482 + reqmode |= GR_EXEC;
56483 + if (fmode & S_IWOTH)
56484 + reqmode |= GR_WRITE;
56485 + if (fmode & S_IROTH)
56486 + reqmode |= GR_READ;
56487 +
56488 + mode =
56489 + gr_search_file(dentry, reqmode | to_gr_audit(reqmode) | GR_SUPPRESS,
56490 + mnt);
56491 +
56492 + if (unlikely(((mode & reqmode) == reqmode) && mode & GR_AUDITS)) {
56493 + gr_log_fs_rbac_mode3(GR_DO_AUDIT, GR_ACCESS_ACL_MSG, dentry, mnt,
56494 + reqmode & GR_READ ? " reading" : "",
56495 + reqmode & GR_WRITE ? " writing" : "",
56496 + reqmode & GR_EXEC ? " executing" : "");
56497 + return reqmode;
56498 + } else
56499 + if (unlikely((mode & reqmode) != reqmode && !(mode & GR_SUPPRESS)))
56500 + {
56501 + gr_log_fs_rbac_mode3(GR_DONT_AUDIT, GR_ACCESS_ACL_MSG, dentry, mnt,
56502 + reqmode & GR_READ ? " reading" : "",
56503 + reqmode & GR_WRITE ? " writing" : "",
56504 + reqmode & GR_EXEC ? " executing" : "");
56505 + return 0;
56506 + } else if (unlikely((mode & reqmode) != reqmode))
56507 + return 0;
56508 +
56509 + return reqmode;
56510 +}
56511 +
56512 +static __u32 generic_fs_handler(const struct dentry *dentry, const struct vfsmount *mnt, __u32 reqmode, const char *fmt)
56513 +{
56514 + __u32 mode;
56515 +
56516 + mode = gr_search_file(dentry, reqmode | to_gr_audit(reqmode) | GR_SUPPRESS, mnt);
56517 +
56518 + if (unlikely(((mode & (reqmode)) == (reqmode)) && mode & GR_AUDITS)) {
56519 + gr_log_fs_rbac_generic(GR_DO_AUDIT, fmt, dentry, mnt);
56520 + return mode;
56521 + } else if (unlikely((mode & (reqmode)) != (reqmode) && !(mode & GR_SUPPRESS))) {
56522 + gr_log_fs_rbac_generic(GR_DONT_AUDIT, fmt, dentry, mnt);
56523 + return 0;
56524 + } else if (unlikely((mode & (reqmode)) != (reqmode)))
56525 + return 0;
56526 +
56527 + return (reqmode);
56528 +}
56529 +
56530 +__u32
56531 +gr_acl_handle_rmdir(const struct dentry * dentry, const struct vfsmount * mnt)
56532 +{
56533 + return generic_fs_handler(dentry, mnt, GR_WRITE | GR_DELETE , GR_RMDIR_ACL_MSG);
56534 +}
56535 +
56536 +__u32
56537 +gr_acl_handle_unlink(const struct dentry *dentry, const struct vfsmount *mnt)
56538 +{
56539 + return generic_fs_handler(dentry, mnt, GR_WRITE | GR_DELETE , GR_UNLINK_ACL_MSG);
56540 +}
56541 +
56542 +__u32
56543 +gr_acl_handle_truncate(const struct dentry *dentry, const struct vfsmount *mnt)
56544 +{
56545 + return generic_fs_handler(dentry, mnt, GR_WRITE, GR_TRUNCATE_ACL_MSG);
56546 +}
56547 +
56548 +__u32
56549 +gr_acl_handle_utime(const struct dentry *dentry, const struct vfsmount *mnt)
56550 +{
56551 + return generic_fs_handler(dentry, mnt, GR_WRITE, GR_ATIME_ACL_MSG);
56552 +}
56553 +
56554 +__u32
56555 +gr_acl_handle_chmod(const struct dentry *dentry, const struct vfsmount *mnt,
56556 + umode_t *modeptr)
56557 +{
56558 + umode_t mode;
56559 +
56560 + *modeptr &= ~gr_acl_umask();
56561 + mode = *modeptr;
56562 +
56563 + if (unlikely(dentry->d_inode && S_ISSOCK(dentry->d_inode->i_mode)))
56564 + return 1;
56565 +
56566 + if (unlikely(dentry->d_inode && !S_ISDIR(dentry->d_inode->i_mode) &&
56567 + ((mode & S_ISUID) || ((mode & (S_ISGID | S_IXGRP)) == (S_ISGID | S_IXGRP))))) {
56568 + return generic_fs_handler(dentry, mnt, GR_WRITE | GR_SETID,
56569 + GR_CHMOD_ACL_MSG);
56570 + } else {
56571 + return generic_fs_handler(dentry, mnt, GR_WRITE, GR_CHMOD_ACL_MSG);
56572 + }
56573 +}
56574 +
56575 +__u32
56576 +gr_acl_handle_chown(const struct dentry *dentry, const struct vfsmount *mnt)
56577 +{
56578 + return generic_fs_handler(dentry, mnt, GR_WRITE, GR_CHOWN_ACL_MSG);
56579 +}
56580 +
56581 +__u32
56582 +gr_acl_handle_setxattr(const struct dentry *dentry, const struct vfsmount *mnt)
56583 +{
56584 + return generic_fs_handler(dentry, mnt, GR_WRITE, GR_SETXATTR_ACL_MSG);
56585 +}
56586 +
56587 +__u32
56588 +gr_acl_handle_execve(const struct dentry *dentry, const struct vfsmount *mnt)
56589 +{
56590 + return generic_fs_handler(dentry, mnt, GR_EXEC, GR_EXEC_ACL_MSG);
56591 +}
56592 +
56593 +__u32
56594 +gr_acl_handle_unix(const struct dentry *dentry, const struct vfsmount *mnt)
56595 +{
56596 + return generic_fs_handler(dentry, mnt, GR_READ | GR_WRITE,
56597 + GR_UNIXCONNECT_ACL_MSG);
56598 +}
56599 +
56600 +/* hardlinks require at minimum create and link permission,
56601 + any additional privilege required is based on the
56602 + privilege of the file being linked to
56603 +*/
56604 +__u32
56605 +gr_acl_handle_link(const struct dentry * new_dentry,
56606 + const struct dentry * parent_dentry,
56607 + const struct vfsmount * parent_mnt,
56608 + const struct dentry * old_dentry,
56609 + const struct vfsmount * old_mnt, const char *to)
56610 +{
56611 + __u32 mode;
56612 + __u32 needmode = GR_CREATE | GR_LINK;
56613 + __u32 needaudit = GR_AUDIT_CREATE | GR_AUDIT_LINK;
56614 +
56615 + mode =
56616 + gr_check_link(new_dentry, parent_dentry, parent_mnt, old_dentry,
56617 + old_mnt);
56618 +
56619 + if (unlikely(((mode & needmode) == needmode) && (mode & needaudit))) {
56620 + gr_log_fs_rbac_str(GR_DO_AUDIT, GR_LINK_ACL_MSG, old_dentry, old_mnt, to);
56621 + return mode;
56622 + } else if (unlikely(((mode & needmode) != needmode) && !(mode & GR_SUPPRESS))) {
56623 + gr_log_fs_rbac_str(GR_DONT_AUDIT, GR_LINK_ACL_MSG, old_dentry, old_mnt, to);
56624 + return 0;
56625 + } else if (unlikely((mode & needmode) != needmode))
56626 + return 0;
56627 +
56628 + return 1;
56629 +}
56630 +
56631 +__u32
56632 +gr_acl_handle_symlink(const struct dentry * new_dentry,
56633 + const struct dentry * parent_dentry,
56634 + const struct vfsmount * parent_mnt, const char *from)
56635 +{
56636 + __u32 needmode = GR_WRITE | GR_CREATE;
56637 + __u32 mode;
56638 +
56639 + mode =
56640 + gr_check_create(new_dentry, parent_dentry, parent_mnt,
56641 + GR_CREATE | GR_AUDIT_CREATE |
56642 + GR_WRITE | GR_AUDIT_WRITE | GR_SUPPRESS);
56643 +
56644 + if (unlikely(mode & GR_WRITE && mode & GR_AUDITS)) {
56645 + gr_log_fs_str_rbac(GR_DO_AUDIT, GR_SYMLINK_ACL_MSG, from, new_dentry, parent_mnt);
56646 + return mode;
56647 + } else if (unlikely(((mode & needmode) != needmode) && !(mode & GR_SUPPRESS))) {
56648 + gr_log_fs_str_rbac(GR_DONT_AUDIT, GR_SYMLINK_ACL_MSG, from, new_dentry, parent_mnt);
56649 + return 0;
56650 + } else if (unlikely((mode & needmode) != needmode))
56651 + return 0;
56652 +
56653 + return (GR_WRITE | GR_CREATE);
56654 +}
56655 +
56656 +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)
56657 +{
56658 + __u32 mode;
56659 +
56660 + mode = gr_check_create(new_dentry, parent_dentry, parent_mnt, reqmode | to_gr_audit(reqmode) | GR_SUPPRESS);
56661 +
56662 + if (unlikely(((mode & (reqmode)) == (reqmode)) && mode & GR_AUDITS)) {
56663 + gr_log_fs_rbac_generic(GR_DO_AUDIT, fmt, new_dentry, parent_mnt);
56664 + return mode;
56665 + } else if (unlikely((mode & (reqmode)) != (reqmode) && !(mode & GR_SUPPRESS))) {
56666 + gr_log_fs_rbac_generic(GR_DONT_AUDIT, fmt, new_dentry, parent_mnt);
56667 + return 0;
56668 + } else if (unlikely((mode & (reqmode)) != (reqmode)))
56669 + return 0;
56670 +
56671 + return (reqmode);
56672 +}
56673 +
56674 +__u32
56675 +gr_acl_handle_mknod(const struct dentry * new_dentry,
56676 + const struct dentry * parent_dentry,
56677 + const struct vfsmount * parent_mnt,
56678 + const int mode)
56679 +{
56680 + __u32 reqmode = GR_WRITE | GR_CREATE;
56681 + if (unlikely((mode & S_ISUID) || ((mode & (S_ISGID | S_IXGRP)) == (S_ISGID | S_IXGRP))))
56682 + reqmode |= GR_SETID;
56683 +
56684 + return generic_fs_create_handler(new_dentry, parent_dentry, parent_mnt,
56685 + reqmode, GR_MKNOD_ACL_MSG);
56686 +}
56687 +
56688 +__u32
56689 +gr_acl_handle_mkdir(const struct dentry *new_dentry,
56690 + const struct dentry *parent_dentry,
56691 + const struct vfsmount *parent_mnt)
56692 +{
56693 + return generic_fs_create_handler(new_dentry, parent_dentry, parent_mnt,
56694 + GR_WRITE | GR_CREATE, GR_MKDIR_ACL_MSG);
56695 +}
56696 +
56697 +#define RENAME_CHECK_SUCCESS(old, new) \
56698 + (((old & (GR_WRITE | GR_READ)) == (GR_WRITE | GR_READ)) && \
56699 + ((new & (GR_WRITE | GR_READ)) == (GR_WRITE | GR_READ)))
56700 +
56701 +int
56702 +gr_acl_handle_rename(struct dentry *new_dentry,
56703 + struct dentry *parent_dentry,
56704 + const struct vfsmount *parent_mnt,
56705 + struct dentry *old_dentry,
56706 + struct inode *old_parent_inode,
56707 + struct vfsmount *old_mnt, const char *newname)
56708 +{
56709 + __u32 comp1, comp2;
56710 + int error = 0;
56711 +
56712 + if (unlikely(!gr_acl_is_enabled()))
56713 + return 0;
56714 +
56715 + if (!new_dentry->d_inode) {
56716 + comp1 = gr_check_create(new_dentry, parent_dentry, parent_mnt,
56717 + GR_READ | GR_WRITE | GR_CREATE | GR_AUDIT_READ |
56718 + GR_AUDIT_WRITE | GR_AUDIT_CREATE | GR_SUPPRESS);
56719 + comp2 = gr_search_file(old_dentry, GR_READ | GR_WRITE |
56720 + GR_DELETE | GR_AUDIT_DELETE |
56721 + GR_AUDIT_READ | GR_AUDIT_WRITE |
56722 + GR_SUPPRESS, old_mnt);
56723 + } else {
56724 + comp1 = gr_search_file(new_dentry, GR_READ | GR_WRITE |
56725 + GR_CREATE | GR_DELETE |
56726 + GR_AUDIT_CREATE | GR_AUDIT_DELETE |
56727 + GR_AUDIT_READ | GR_AUDIT_WRITE |
56728 + GR_SUPPRESS, parent_mnt);
56729 + comp2 =
56730 + gr_search_file(old_dentry,
56731 + GR_READ | GR_WRITE | GR_AUDIT_READ |
56732 + GR_DELETE | GR_AUDIT_DELETE |
56733 + GR_AUDIT_WRITE | GR_SUPPRESS, old_mnt);
56734 + }
56735 +
56736 + if (RENAME_CHECK_SUCCESS(comp1, comp2) &&
56737 + ((comp1 & GR_AUDITS) || (comp2 & GR_AUDITS)))
56738 + gr_log_fs_rbac_str(GR_DO_AUDIT, GR_RENAME_ACL_MSG, old_dentry, old_mnt, newname);
56739 + else if (!RENAME_CHECK_SUCCESS(comp1, comp2) && !(comp1 & GR_SUPPRESS)
56740 + && !(comp2 & GR_SUPPRESS)) {
56741 + gr_log_fs_rbac_str(GR_DONT_AUDIT, GR_RENAME_ACL_MSG, old_dentry, old_mnt, newname);
56742 + error = -EACCES;
56743 + } else if (unlikely(!RENAME_CHECK_SUCCESS(comp1, comp2)))
56744 + error = -EACCES;
56745 +
56746 + return error;
56747 +}
56748 +
56749 +void
56750 +gr_acl_handle_exit(void)
56751 +{
56752 + u16 id;
56753 + char *rolename;
56754 + struct file *exec_file;
56755 +
56756 + if (unlikely(current->acl_sp_role && gr_acl_is_enabled() &&
56757 + !(current->role->roletype & GR_ROLE_PERSIST))) {
56758 + id = current->acl_role_id;
56759 + rolename = current->role->rolename;
56760 + gr_set_acls(1);
56761 + gr_log_str_int(GR_DONT_AUDIT_GOOD, GR_SPROLEL_ACL_MSG, rolename, id);
56762 + }
56763 +
56764 + write_lock(&grsec_exec_file_lock);
56765 + exec_file = current->exec_file;
56766 + current->exec_file = NULL;
56767 + write_unlock(&grsec_exec_file_lock);
56768 +
56769 + if (exec_file)
56770 + fput(exec_file);
56771 +}
56772 +
56773 +int
56774 +gr_acl_handle_procpidmem(const struct task_struct *task)
56775 +{
56776 + if (unlikely(!gr_acl_is_enabled()))
56777 + return 0;
56778 +
56779 + if (task != current && task->acl->mode & GR_PROTPROCFD)
56780 + return -EACCES;
56781 +
56782 + return 0;
56783 +}
56784 diff --git a/grsecurity/gracl_ip.c b/grsecurity/gracl_ip.c
56785 new file mode 100644
56786 index 0000000..58800a7
56787 --- /dev/null
56788 +++ b/grsecurity/gracl_ip.c
56789 @@ -0,0 +1,384 @@
56790 +#include <linux/kernel.h>
56791 +#include <asm/uaccess.h>
56792 +#include <asm/errno.h>
56793 +#include <net/sock.h>
56794 +#include <linux/file.h>
56795 +#include <linux/fs.h>
56796 +#include <linux/net.h>
56797 +#include <linux/in.h>
56798 +#include <linux/skbuff.h>
56799 +#include <linux/ip.h>
56800 +#include <linux/udp.h>
56801 +#include <linux/types.h>
56802 +#include <linux/sched.h>
56803 +#include <linux/netdevice.h>
56804 +#include <linux/inetdevice.h>
56805 +#include <linux/gracl.h>
56806 +#include <linux/grsecurity.h>
56807 +#include <linux/grinternal.h>
56808 +
56809 +#define GR_BIND 0x01
56810 +#define GR_CONNECT 0x02
56811 +#define GR_INVERT 0x04
56812 +#define GR_BINDOVERRIDE 0x08
56813 +#define GR_CONNECTOVERRIDE 0x10
56814 +#define GR_SOCK_FAMILY 0x20
56815 +
56816 +static const char * gr_protocols[IPPROTO_MAX] = {
56817 + "ip", "icmp", "igmp", "ggp", "ipencap", "st", "tcp", "cbt",
56818 + "egp", "igp", "bbn-rcc", "nvp", "pup", "argus", "emcon", "xnet",
56819 + "chaos", "udp", "mux", "dcn", "hmp", "prm", "xns-idp", "trunk-1",
56820 + "trunk-2", "leaf-1", "leaf-2", "rdp", "irtp", "iso-tp4", "netblt", "mfe-nsp",
56821 + "merit-inp", "sep", "3pc", "idpr", "xtp", "ddp", "idpr-cmtp", "tp++",
56822 + "il", "ipv6", "sdrp", "ipv6-route", "ipv6-frag", "idrp", "rsvp", "gre",
56823 + "mhrp", "bna", "ipv6-crypt", "ipv6-auth", "i-nlsp", "swipe", "narp", "mobile",
56824 + "tlsp", "skip", "ipv6-icmp", "ipv6-nonxt", "ipv6-opts", "unknown:61", "cftp", "unknown:63",
56825 + "sat-expak", "kryptolan", "rvd", "ippc", "unknown:68", "sat-mon", "visa", "ipcv",
56826 + "cpnx", "cphb", "wsn", "pvp", "br-sat-mon", "sun-nd", "wb-mon", "wb-expak",
56827 + "iso-ip", "vmtp", "secure-vmtp", "vines", "ttp", "nfsnet-igp", "dgp", "tcf",
56828 + "eigrp", "ospf", "sprite-rpc", "larp", "mtp", "ax.25", "ipip", "micp",
56829 + "scc-sp", "etherip", "encap", "unknown:99", "gmtp", "ifmp", "pnni", "pim",
56830 + "aris", "scps", "qnx", "a/n", "ipcomp", "snp", "compaq-peer", "ipx-in-ip",
56831 + "vrrp", "pgm", "unknown:114", "l2tp", "ddx", "iatp", "stp", "srp",
56832 + "uti", "smp", "sm", "ptp", "isis", "fire", "crtp", "crdup",
56833 + "sscopmce", "iplt", "sps", "pipe", "sctp", "fc", "unkown:134", "unknown:135",
56834 + "unknown:136", "unknown:137", "unknown:138", "unknown:139", "unknown:140", "unknown:141", "unknown:142", "unknown:143",
56835 + "unknown:144", "unknown:145", "unknown:146", "unknown:147", "unknown:148", "unknown:149", "unknown:150", "unknown:151",
56836 + "unknown:152", "unknown:153", "unknown:154", "unknown:155", "unknown:156", "unknown:157", "unknown:158", "unknown:159",
56837 + "unknown:160", "unknown:161", "unknown:162", "unknown:163", "unknown:164", "unknown:165", "unknown:166", "unknown:167",
56838 + "unknown:168", "unknown:169", "unknown:170", "unknown:171", "unknown:172", "unknown:173", "unknown:174", "unknown:175",
56839 + "unknown:176", "unknown:177", "unknown:178", "unknown:179", "unknown:180", "unknown:181", "unknown:182", "unknown:183",
56840 + "unknown:184", "unknown:185", "unknown:186", "unknown:187", "unknown:188", "unknown:189", "unknown:190", "unknown:191",
56841 + "unknown:192", "unknown:193", "unknown:194", "unknown:195", "unknown:196", "unknown:197", "unknown:198", "unknown:199",
56842 + "unknown:200", "unknown:201", "unknown:202", "unknown:203", "unknown:204", "unknown:205", "unknown:206", "unknown:207",
56843 + "unknown:208", "unknown:209", "unknown:210", "unknown:211", "unknown:212", "unknown:213", "unknown:214", "unknown:215",
56844 + "unknown:216", "unknown:217", "unknown:218", "unknown:219", "unknown:220", "unknown:221", "unknown:222", "unknown:223",
56845 + "unknown:224", "unknown:225", "unknown:226", "unknown:227", "unknown:228", "unknown:229", "unknown:230", "unknown:231",
56846 + "unknown:232", "unknown:233", "unknown:234", "unknown:235", "unknown:236", "unknown:237", "unknown:238", "unknown:239",
56847 + "unknown:240", "unknown:241", "unknown:242", "unknown:243", "unknown:244", "unknown:245", "unknown:246", "unknown:247",
56848 + "unknown:248", "unknown:249", "unknown:250", "unknown:251", "unknown:252", "unknown:253", "unknown:254", "unknown:255",
56849 + };
56850 +
56851 +static const char * gr_socktypes[SOCK_MAX] = {
56852 + "unknown:0", "stream", "dgram", "raw", "rdm", "seqpacket", "unknown:6",
56853 + "unknown:7", "unknown:8", "unknown:9", "packet"
56854 + };
56855 +
56856 +static const char * gr_sockfamilies[AF_MAX+1] = {
56857 + "unspec", "unix", "inet", "ax25", "ipx", "appletalk", "netrom", "bridge", "atmpvc", "x25",
56858 + "inet6", "rose", "decnet", "netbeui", "security", "key", "netlink", "packet", "ash",
56859 + "econet", "atmsvc", "rds", "sna", "irda", "ppox", "wanpipe", "llc", "fam_27", "fam_28",
56860 + "tipc", "bluetooth", "iucv", "rxrpc", "isdn", "phonet", "ieee802154", "ciaf"
56861 + };
56862 +
56863 +const char *
56864 +gr_proto_to_name(unsigned char proto)
56865 +{
56866 + return gr_protocols[proto];
56867 +}
56868 +
56869 +const char *
56870 +gr_socktype_to_name(unsigned char type)
56871 +{
56872 + return gr_socktypes[type];
56873 +}
56874 +
56875 +const char *
56876 +gr_sockfamily_to_name(unsigned char family)
56877 +{
56878 + return gr_sockfamilies[family];
56879 +}
56880 +
56881 +int
56882 +gr_search_socket(const int domain, const int type, const int protocol)
56883 +{
56884 + struct acl_subject_label *curr;
56885 + const struct cred *cred = current_cred();
56886 +
56887 + if (unlikely(!gr_acl_is_enabled()))
56888 + goto exit;
56889 +
56890 + if ((domain < 0) || (type < 0) || (protocol < 0) ||
56891 + (domain >= AF_MAX) || (type >= SOCK_MAX) || (protocol >= IPPROTO_MAX))
56892 + goto exit; // let the kernel handle it
56893 +
56894 + curr = current->acl;
56895 +
56896 + if (curr->sock_families[domain / 32] & (1 << (domain % 32))) {
56897 + /* the family is allowed, if this is PF_INET allow it only if
56898 + the extra sock type/protocol checks pass */
56899 + if (domain == PF_INET)
56900 + goto inet_check;
56901 + goto exit;
56902 + } else {
56903 + if (curr->mode & (GR_LEARN | GR_INHERITLEARN)) {
56904 + __u32 fakeip = 0;
56905 + security_learn(GR_IP_LEARN_MSG, current->role->rolename,
56906 + current->role->roletype, cred->uid,
56907 + cred->gid, current->exec_file ?
56908 + gr_to_filename(current->exec_file->f_path.dentry,
56909 + current->exec_file->f_path.mnt) :
56910 + curr->filename, curr->filename,
56911 + &fakeip, domain, 0, 0, GR_SOCK_FAMILY,
56912 + &current->signal->saved_ip);
56913 + goto exit;
56914 + }
56915 + goto exit_fail;
56916 + }
56917 +
56918 +inet_check:
56919 + /* the rest of this checking is for IPv4 only */
56920 + if (!curr->ips)
56921 + goto exit;
56922 +
56923 + if ((curr->ip_type & (1 << type)) &&
56924 + (curr->ip_proto[protocol / 32] & (1 << (protocol % 32))))
56925 + goto exit;
56926 +
56927 + if (curr->mode & (GR_LEARN | GR_INHERITLEARN)) {
56928 + /* we don't place acls on raw sockets , and sometimes
56929 + dgram/ip sockets are opened for ioctl and not
56930 + bind/connect, so we'll fake a bind learn log */
56931 + if (type == SOCK_RAW || type == SOCK_PACKET) {
56932 + __u32 fakeip = 0;
56933 + security_learn(GR_IP_LEARN_MSG, current->role->rolename,
56934 + current->role->roletype, cred->uid,
56935 + cred->gid, current->exec_file ?
56936 + gr_to_filename(current->exec_file->f_path.dentry,
56937 + current->exec_file->f_path.mnt) :
56938 + curr->filename, curr->filename,
56939 + &fakeip, 0, type,
56940 + protocol, GR_CONNECT, &current->signal->saved_ip);
56941 + } else if ((type == SOCK_DGRAM) && (protocol == IPPROTO_IP)) {
56942 + __u32 fakeip = 0;
56943 + security_learn(GR_IP_LEARN_MSG, current->role->rolename,
56944 + current->role->roletype, cred->uid,
56945 + cred->gid, current->exec_file ?
56946 + gr_to_filename(current->exec_file->f_path.dentry,
56947 + current->exec_file->f_path.mnt) :
56948 + curr->filename, curr->filename,
56949 + &fakeip, 0, type,
56950 + protocol, GR_BIND, &current->signal->saved_ip);
56951 + }
56952 + /* we'll log when they use connect or bind */
56953 + goto exit;
56954 + }
56955 +
56956 +exit_fail:
56957 + if (domain == PF_INET)
56958 + gr_log_str3(GR_DONT_AUDIT, GR_SOCK_MSG, gr_sockfamily_to_name(domain),
56959 + gr_socktype_to_name(type), gr_proto_to_name(protocol));
56960 + else
56961 + gr_log_str2_int(GR_DONT_AUDIT, GR_SOCK_NOINET_MSG, gr_sockfamily_to_name(domain),
56962 + gr_socktype_to_name(type), protocol);
56963 +
56964 + return 0;
56965 +exit:
56966 + return 1;
56967 +}
56968 +
56969 +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)
56970 +{
56971 + if ((ip->mode & mode) &&
56972 + (ip_port >= ip->low) &&
56973 + (ip_port <= ip->high) &&
56974 + ((ntohl(ip_addr) & our_netmask) ==
56975 + (ntohl(our_addr) & our_netmask))
56976 + && (ip->proto[protocol / 32] & (1 << (protocol % 32)))
56977 + && (ip->type & (1 << type))) {
56978 + if (ip->mode & GR_INVERT)
56979 + return 2; // specifically denied
56980 + else
56981 + return 1; // allowed
56982 + }
56983 +
56984 + return 0; // not specifically allowed, may continue parsing
56985 +}
56986 +
56987 +static int
56988 +gr_search_connectbind(const int full_mode, struct sock *sk,
56989 + struct sockaddr_in *addr, const int type)
56990 +{
56991 + char iface[IFNAMSIZ] = {0};
56992 + struct acl_subject_label *curr;
56993 + struct acl_ip_label *ip;
56994 + struct inet_sock *isk;
56995 + struct net_device *dev;
56996 + struct in_device *idev;
56997 + unsigned long i;
56998 + int ret;
56999 + int mode = full_mode & (GR_BIND | GR_CONNECT);
57000 + __u32 ip_addr = 0;
57001 + __u32 our_addr;
57002 + __u32 our_netmask;
57003 + char *p;
57004 + __u16 ip_port = 0;
57005 + const struct cred *cred = current_cred();
57006 +
57007 + if (unlikely(!gr_acl_is_enabled() || sk->sk_family != PF_INET))
57008 + return 0;
57009 +
57010 + curr = current->acl;
57011 + isk = inet_sk(sk);
57012 +
57013 + /* INADDR_ANY overriding for binds, inaddr_any_override is already in network order */
57014 + if ((full_mode & GR_BINDOVERRIDE) && addr->sin_addr.s_addr == htonl(INADDR_ANY) && curr->inaddr_any_override != 0)
57015 + addr->sin_addr.s_addr = curr->inaddr_any_override;
57016 + if ((full_mode & GR_CONNECT) && isk->inet_saddr == htonl(INADDR_ANY) && curr->inaddr_any_override != 0) {
57017 + struct sockaddr_in saddr;
57018 + int err;
57019 +
57020 + saddr.sin_family = AF_INET;
57021 + saddr.sin_addr.s_addr = curr->inaddr_any_override;
57022 + saddr.sin_port = isk->inet_sport;
57023 +
57024 + err = security_socket_bind(sk->sk_socket, (struct sockaddr *)&saddr, sizeof(struct sockaddr_in));
57025 + if (err)
57026 + return err;
57027 +
57028 + err = sk->sk_socket->ops->bind(sk->sk_socket, (struct sockaddr *)&saddr, sizeof(struct sockaddr_in));
57029 + if (err)
57030 + return err;
57031 + }
57032 +
57033 + if (!curr->ips)
57034 + return 0;
57035 +
57036 + ip_addr = addr->sin_addr.s_addr;
57037 + ip_port = ntohs(addr->sin_port);
57038 +
57039 + if (curr->mode & (GR_LEARN | GR_INHERITLEARN)) {
57040 + security_learn(GR_IP_LEARN_MSG, current->role->rolename,
57041 + current->role->roletype, cred->uid,
57042 + cred->gid, current->exec_file ?
57043 + gr_to_filename(current->exec_file->f_path.dentry,
57044 + current->exec_file->f_path.mnt) :
57045 + curr->filename, curr->filename,
57046 + &ip_addr, ip_port, type,
57047 + sk->sk_protocol, mode, &current->signal->saved_ip);
57048 + return 0;
57049 + }
57050 +
57051 + for (i = 0; i < curr->ip_num; i++) {
57052 + ip = *(curr->ips + i);
57053 + if (ip->iface != NULL) {
57054 + strncpy(iface, ip->iface, IFNAMSIZ - 1);
57055 + p = strchr(iface, ':');
57056 + if (p != NULL)
57057 + *p = '\0';
57058 + dev = dev_get_by_name(sock_net(sk), iface);
57059 + if (dev == NULL)
57060 + continue;
57061 + idev = in_dev_get(dev);
57062 + if (idev == NULL) {
57063 + dev_put(dev);
57064 + continue;
57065 + }
57066 + rcu_read_lock();
57067 + for_ifa(idev) {
57068 + if (!strcmp(ip->iface, ifa->ifa_label)) {
57069 + our_addr = ifa->ifa_address;
57070 + our_netmask = 0xffffffff;
57071 + ret = check_ip_policy(ip, ip_addr, ip_port, sk->sk_protocol, mode, type, our_addr, our_netmask);
57072 + if (ret == 1) {
57073 + rcu_read_unlock();
57074 + in_dev_put(idev);
57075 + dev_put(dev);
57076 + return 0;
57077 + } else if (ret == 2) {
57078 + rcu_read_unlock();
57079 + in_dev_put(idev);
57080 + dev_put(dev);
57081 + goto denied;
57082 + }
57083 + }
57084 + } endfor_ifa(idev);
57085 + rcu_read_unlock();
57086 + in_dev_put(idev);
57087 + dev_put(dev);
57088 + } else {
57089 + our_addr = ip->addr;
57090 + our_netmask = ip->netmask;
57091 + ret = check_ip_policy(ip, ip_addr, ip_port, sk->sk_protocol, mode, type, our_addr, our_netmask);
57092 + if (ret == 1)
57093 + return 0;
57094 + else if (ret == 2)
57095 + goto denied;
57096 + }
57097 + }
57098 +
57099 +denied:
57100 + if (mode == GR_BIND)
57101 + 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));
57102 + else if (mode == GR_CONNECT)
57103 + 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));
57104 +
57105 + return -EACCES;
57106 +}
57107 +
57108 +int
57109 +gr_search_connect(struct socket *sock, struct sockaddr_in *addr)
57110 +{
57111 + /* always allow disconnection of dgram sockets with connect */
57112 + if (addr->sin_family == AF_UNSPEC)
57113 + return 0;
57114 + return gr_search_connectbind(GR_CONNECT | GR_CONNECTOVERRIDE, sock->sk, addr, sock->type);
57115 +}
57116 +
57117 +int
57118 +gr_search_bind(struct socket *sock, struct sockaddr_in *addr)
57119 +{
57120 + return gr_search_connectbind(GR_BIND | GR_BINDOVERRIDE, sock->sk, addr, sock->type);
57121 +}
57122 +
57123 +int gr_search_listen(struct socket *sock)
57124 +{
57125 + struct sock *sk = sock->sk;
57126 + struct sockaddr_in addr;
57127 +
57128 + addr.sin_addr.s_addr = inet_sk(sk)->inet_saddr;
57129 + addr.sin_port = inet_sk(sk)->inet_sport;
57130 +
57131 + return gr_search_connectbind(GR_BIND | GR_CONNECTOVERRIDE, sock->sk, &addr, sock->type);
57132 +}
57133 +
57134 +int gr_search_accept(struct socket *sock)
57135 +{
57136 + struct sock *sk = sock->sk;
57137 + struct sockaddr_in addr;
57138 +
57139 + addr.sin_addr.s_addr = inet_sk(sk)->inet_saddr;
57140 + addr.sin_port = inet_sk(sk)->inet_sport;
57141 +
57142 + return gr_search_connectbind(GR_BIND | GR_CONNECTOVERRIDE, sock->sk, &addr, sock->type);
57143 +}
57144 +
57145 +int
57146 +gr_search_udp_sendmsg(struct sock *sk, struct sockaddr_in *addr)
57147 +{
57148 + if (addr)
57149 + return gr_search_connectbind(GR_CONNECT, sk, addr, SOCK_DGRAM);
57150 + else {
57151 + struct sockaddr_in sin;
57152 + const struct inet_sock *inet = inet_sk(sk);
57153 +
57154 + sin.sin_addr.s_addr = inet->inet_daddr;
57155 + sin.sin_port = inet->inet_dport;
57156 +
57157 + return gr_search_connectbind(GR_CONNECT | GR_CONNECTOVERRIDE, sk, &sin, SOCK_DGRAM);
57158 + }
57159 +}
57160 +
57161 +int
57162 +gr_search_udp_recvmsg(struct sock *sk, const struct sk_buff *skb)
57163 +{
57164 + struct sockaddr_in sin;
57165 +
57166 + if (unlikely(skb->len < sizeof (struct udphdr)))
57167 + return 0; // skip this packet
57168 +
57169 + sin.sin_addr.s_addr = ip_hdr(skb)->saddr;
57170 + sin.sin_port = udp_hdr(skb)->source;
57171 +
57172 + return gr_search_connectbind(GR_CONNECT | GR_CONNECTOVERRIDE, sk, &sin, SOCK_DGRAM);
57173 +}
57174 diff --git a/grsecurity/gracl_learn.c b/grsecurity/gracl_learn.c
57175 new file mode 100644
57176 index 0000000..25f54ef
57177 --- /dev/null
57178 +++ b/grsecurity/gracl_learn.c
57179 @@ -0,0 +1,207 @@
57180 +#include <linux/kernel.h>
57181 +#include <linux/mm.h>
57182 +#include <linux/sched.h>
57183 +#include <linux/poll.h>
57184 +#include <linux/string.h>
57185 +#include <linux/file.h>
57186 +#include <linux/types.h>
57187 +#include <linux/vmalloc.h>
57188 +#include <linux/grinternal.h>
57189 +
57190 +extern ssize_t write_grsec_handler(struct file * file, const char __user * buf,
57191 + size_t count, loff_t *ppos);
57192 +extern int gr_acl_is_enabled(void);
57193 +
57194 +static DECLARE_WAIT_QUEUE_HEAD(learn_wait);
57195 +static int gr_learn_attached;
57196 +
57197 +/* use a 512k buffer */
57198 +#define LEARN_BUFFER_SIZE (512 * 1024)
57199 +
57200 +static DEFINE_SPINLOCK(gr_learn_lock);
57201 +static DEFINE_MUTEX(gr_learn_user_mutex);
57202 +
57203 +/* we need to maintain two buffers, so that the kernel context of grlearn
57204 + uses a semaphore around the userspace copying, and the other kernel contexts
57205 + use a spinlock when copying into the buffer, since they cannot sleep
57206 +*/
57207 +static char *learn_buffer;
57208 +static char *learn_buffer_user;
57209 +static int learn_buffer_len;
57210 +static int learn_buffer_user_len;
57211 +
57212 +static ssize_t
57213 +read_learn(struct file *file, char __user * buf, size_t count, loff_t * ppos)
57214 +{
57215 + DECLARE_WAITQUEUE(wait, current);
57216 + ssize_t retval = 0;
57217 +
57218 + add_wait_queue(&learn_wait, &wait);
57219 + set_current_state(TASK_INTERRUPTIBLE);
57220 + do {
57221 + mutex_lock(&gr_learn_user_mutex);
57222 + spin_lock(&gr_learn_lock);
57223 + if (learn_buffer_len)
57224 + break;
57225 + spin_unlock(&gr_learn_lock);
57226 + mutex_unlock(&gr_learn_user_mutex);
57227 + if (file->f_flags & O_NONBLOCK) {
57228 + retval = -EAGAIN;
57229 + goto out;
57230 + }
57231 + if (signal_pending(current)) {
57232 + retval = -ERESTARTSYS;
57233 + goto out;
57234 + }
57235 +
57236 + schedule();
57237 + } while (1);
57238 +
57239 + memcpy(learn_buffer_user, learn_buffer, learn_buffer_len);
57240 + learn_buffer_user_len = learn_buffer_len;
57241 + retval = learn_buffer_len;
57242 + learn_buffer_len = 0;
57243 +
57244 + spin_unlock(&gr_learn_lock);
57245 +
57246 + if (copy_to_user(buf, learn_buffer_user, learn_buffer_user_len))
57247 + retval = -EFAULT;
57248 +
57249 + mutex_unlock(&gr_learn_user_mutex);
57250 +out:
57251 + set_current_state(TASK_RUNNING);
57252 + remove_wait_queue(&learn_wait, &wait);
57253 + return retval;
57254 +}
57255 +
57256 +static unsigned int
57257 +poll_learn(struct file * file, poll_table * wait)
57258 +{
57259 + poll_wait(file, &learn_wait, wait);
57260 +
57261 + if (learn_buffer_len)
57262 + return (POLLIN | POLLRDNORM);
57263 +
57264 + return 0;
57265 +}
57266 +
57267 +void
57268 +gr_clear_learn_entries(void)
57269 +{
57270 + char *tmp;
57271 +
57272 + mutex_lock(&gr_learn_user_mutex);
57273 + spin_lock(&gr_learn_lock);
57274 + tmp = learn_buffer;
57275 + learn_buffer = NULL;
57276 + spin_unlock(&gr_learn_lock);
57277 + if (tmp)
57278 + vfree(tmp);
57279 + if (learn_buffer_user != NULL) {
57280 + vfree(learn_buffer_user);
57281 + learn_buffer_user = NULL;
57282 + }
57283 + learn_buffer_len = 0;
57284 + mutex_unlock(&gr_learn_user_mutex);
57285 +
57286 + return;
57287 +}
57288 +
57289 +void
57290 +gr_add_learn_entry(const char *fmt, ...)
57291 +{
57292 + va_list args;
57293 + unsigned int len;
57294 +
57295 + if (!gr_learn_attached)
57296 + return;
57297 +
57298 + spin_lock(&gr_learn_lock);
57299 +
57300 + /* leave a gap at the end so we know when it's "full" but don't have to
57301 + compute the exact length of the string we're trying to append
57302 + */
57303 + if (learn_buffer_len > LEARN_BUFFER_SIZE - 16384) {
57304 + spin_unlock(&gr_learn_lock);
57305 + wake_up_interruptible(&learn_wait);
57306 + return;
57307 + }
57308 + if (learn_buffer == NULL) {
57309 + spin_unlock(&gr_learn_lock);
57310 + return;
57311 + }
57312 +
57313 + va_start(args, fmt);
57314 + len = vsnprintf(learn_buffer + learn_buffer_len, LEARN_BUFFER_SIZE - learn_buffer_len, fmt, args);
57315 + va_end(args);
57316 +
57317 + learn_buffer_len += len + 1;
57318 +
57319 + spin_unlock(&gr_learn_lock);
57320 + wake_up_interruptible(&learn_wait);
57321 +
57322 + return;
57323 +}
57324 +
57325 +static int
57326 +open_learn(struct inode *inode, struct file *file)
57327 +{
57328 + if (file->f_mode & FMODE_READ && gr_learn_attached)
57329 + return -EBUSY;
57330 + if (file->f_mode & FMODE_READ) {
57331 + int retval = 0;
57332 + mutex_lock(&gr_learn_user_mutex);
57333 + if (learn_buffer == NULL)
57334 + learn_buffer = vmalloc(LEARN_BUFFER_SIZE);
57335 + if (learn_buffer_user == NULL)
57336 + learn_buffer_user = vmalloc(LEARN_BUFFER_SIZE);
57337 + if (learn_buffer == NULL) {
57338 + retval = -ENOMEM;
57339 + goto out_error;
57340 + }
57341 + if (learn_buffer_user == NULL) {
57342 + retval = -ENOMEM;
57343 + goto out_error;
57344 + }
57345 + learn_buffer_len = 0;
57346 + learn_buffer_user_len = 0;
57347 + gr_learn_attached = 1;
57348 +out_error:
57349 + mutex_unlock(&gr_learn_user_mutex);
57350 + return retval;
57351 + }
57352 + return 0;
57353 +}
57354 +
57355 +static int
57356 +close_learn(struct inode *inode, struct file *file)
57357 +{
57358 + if (file->f_mode & FMODE_READ) {
57359 + char *tmp = NULL;
57360 + mutex_lock(&gr_learn_user_mutex);
57361 + spin_lock(&gr_learn_lock);
57362 + tmp = learn_buffer;
57363 + learn_buffer = NULL;
57364 + spin_unlock(&gr_learn_lock);
57365 + if (tmp)
57366 + vfree(tmp);
57367 + if (learn_buffer_user != NULL) {
57368 + vfree(learn_buffer_user);
57369 + learn_buffer_user = NULL;
57370 + }
57371 + learn_buffer_len = 0;
57372 + learn_buffer_user_len = 0;
57373 + gr_learn_attached = 0;
57374 + mutex_unlock(&gr_learn_user_mutex);
57375 + }
57376 +
57377 + return 0;
57378 +}
57379 +
57380 +const struct file_operations grsec_fops = {
57381 + .read = read_learn,
57382 + .write = write_grsec_handler,
57383 + .open = open_learn,
57384 + .release = close_learn,
57385 + .poll = poll_learn,
57386 +};
57387 diff --git a/grsecurity/gracl_res.c b/grsecurity/gracl_res.c
57388 new file mode 100644
57389 index 0000000..39645c9
57390 --- /dev/null
57391 +++ b/grsecurity/gracl_res.c
57392 @@ -0,0 +1,68 @@
57393 +#include <linux/kernel.h>
57394 +#include <linux/sched.h>
57395 +#include <linux/gracl.h>
57396 +#include <linux/grinternal.h>
57397 +
57398 +static const char *restab_log[] = {
57399 + [RLIMIT_CPU] = "RLIMIT_CPU",
57400 + [RLIMIT_FSIZE] = "RLIMIT_FSIZE",
57401 + [RLIMIT_DATA] = "RLIMIT_DATA",
57402 + [RLIMIT_STACK] = "RLIMIT_STACK",
57403 + [RLIMIT_CORE] = "RLIMIT_CORE",
57404 + [RLIMIT_RSS] = "RLIMIT_RSS",
57405 + [RLIMIT_NPROC] = "RLIMIT_NPROC",
57406 + [RLIMIT_NOFILE] = "RLIMIT_NOFILE",
57407 + [RLIMIT_MEMLOCK] = "RLIMIT_MEMLOCK",
57408 + [RLIMIT_AS] = "RLIMIT_AS",
57409 + [RLIMIT_LOCKS] = "RLIMIT_LOCKS",
57410 + [RLIMIT_SIGPENDING] = "RLIMIT_SIGPENDING",
57411 + [RLIMIT_MSGQUEUE] = "RLIMIT_MSGQUEUE",
57412 + [RLIMIT_NICE] = "RLIMIT_NICE",
57413 + [RLIMIT_RTPRIO] = "RLIMIT_RTPRIO",
57414 + [RLIMIT_RTTIME] = "RLIMIT_RTTIME",
57415 + [GR_CRASH_RES] = "RLIMIT_CRASH"
57416 +};
57417 +
57418 +void
57419 +gr_log_resource(const struct task_struct *task,
57420 + const int res, const unsigned long wanted, const int gt)
57421 +{
57422 + const struct cred *cred;
57423 + unsigned long rlim;
57424 +
57425 + if (!gr_acl_is_enabled() && !grsec_resource_logging)
57426 + return;
57427 +
57428 + // not yet supported resource
57429 + if (unlikely(!restab_log[res]))
57430 + return;
57431 +
57432 + if (res == RLIMIT_CPU || res == RLIMIT_RTTIME)
57433 + rlim = task_rlimit_max(task, res);
57434 + else
57435 + rlim = task_rlimit(task, res);
57436 +
57437 + if (likely((rlim == RLIM_INFINITY) || (gt && wanted <= rlim) || (!gt && wanted < rlim)))
57438 + return;
57439 +
57440 + rcu_read_lock();
57441 + cred = __task_cred(task);
57442 +
57443 + if (res == RLIMIT_NPROC &&
57444 + (cap_raised(cred->cap_effective, CAP_SYS_ADMIN) ||
57445 + cap_raised(cred->cap_effective, CAP_SYS_RESOURCE)))
57446 + goto out_rcu_unlock;
57447 + else if (res == RLIMIT_MEMLOCK &&
57448 + cap_raised(cred->cap_effective, CAP_IPC_LOCK))
57449 + goto out_rcu_unlock;
57450 + else if (res == RLIMIT_NICE && cap_raised(cred->cap_effective, CAP_SYS_NICE))
57451 + goto out_rcu_unlock;
57452 + rcu_read_unlock();
57453 +
57454 + gr_log_res_ulong2_str(GR_DONT_AUDIT, GR_RESOURCE_MSG, task, wanted, restab_log[res], rlim);
57455 +
57456 + return;
57457 +out_rcu_unlock:
57458 + rcu_read_unlock();
57459 + return;
57460 +}
57461 diff --git a/grsecurity/gracl_segv.c b/grsecurity/gracl_segv.c
57462 new file mode 100644
57463 index 0000000..25197e9
57464 --- /dev/null
57465 +++ b/grsecurity/gracl_segv.c
57466 @@ -0,0 +1,299 @@
57467 +#include <linux/kernel.h>
57468 +#include <linux/mm.h>
57469 +#include <asm/uaccess.h>
57470 +#include <asm/errno.h>
57471 +#include <asm/mman.h>
57472 +#include <net/sock.h>
57473 +#include <linux/file.h>
57474 +#include <linux/fs.h>
57475 +#include <linux/net.h>
57476 +#include <linux/in.h>
57477 +#include <linux/slab.h>
57478 +#include <linux/types.h>
57479 +#include <linux/sched.h>
57480 +#include <linux/timer.h>
57481 +#include <linux/gracl.h>
57482 +#include <linux/grsecurity.h>
57483 +#include <linux/grinternal.h>
57484 +
57485 +static struct crash_uid *uid_set;
57486 +static unsigned short uid_used;
57487 +static DEFINE_SPINLOCK(gr_uid_lock);
57488 +extern rwlock_t gr_inode_lock;
57489 +extern struct acl_subject_label *
57490 + lookup_acl_subj_label(const ino_t inode, const dev_t dev,
57491 + struct acl_role_label *role);
57492 +
57493 +#ifdef CONFIG_BTRFS_FS
57494 +extern dev_t get_btrfs_dev_from_inode(struct inode *inode);
57495 +extern int btrfs_getattr(struct vfsmount *mnt, struct dentry *dentry, struct kstat *stat);
57496 +#endif
57497 +
57498 +static inline dev_t __get_dev(const struct dentry *dentry)
57499 +{
57500 +#ifdef CONFIG_BTRFS_FS
57501 + if (dentry->d_inode->i_op && dentry->d_inode->i_op->getattr == &btrfs_getattr)
57502 + return get_btrfs_dev_from_inode(dentry->d_inode);
57503 + else
57504 +#endif
57505 + return dentry->d_inode->i_sb->s_dev;
57506 +}
57507 +
57508 +int
57509 +gr_init_uidset(void)
57510 +{
57511 + uid_set =
57512 + kmalloc(GR_UIDTABLE_MAX * sizeof (struct crash_uid), GFP_KERNEL);
57513 + uid_used = 0;
57514 +
57515 + return uid_set ? 1 : 0;
57516 +}
57517 +
57518 +void
57519 +gr_free_uidset(void)
57520 +{
57521 + if (uid_set)
57522 + kfree(uid_set);
57523 +
57524 + return;
57525 +}
57526 +
57527 +int
57528 +gr_find_uid(const uid_t uid)
57529 +{
57530 + struct crash_uid *tmp = uid_set;
57531 + uid_t buid;
57532 + int low = 0, high = uid_used - 1, mid;
57533 +
57534 + while (high >= low) {
57535 + mid = (low + high) >> 1;
57536 + buid = tmp[mid].uid;
57537 + if (buid == uid)
57538 + return mid;
57539 + if (buid > uid)
57540 + high = mid - 1;
57541 + if (buid < uid)
57542 + low = mid + 1;
57543 + }
57544 +
57545 + return -1;
57546 +}
57547 +
57548 +static __inline__ void
57549 +gr_insertsort(void)
57550 +{
57551 + unsigned short i, j;
57552 + struct crash_uid index;
57553 +
57554 + for (i = 1; i < uid_used; i++) {
57555 + index = uid_set[i];
57556 + j = i;
57557 + while ((j > 0) && uid_set[j - 1].uid > index.uid) {
57558 + uid_set[j] = uid_set[j - 1];
57559 + j--;
57560 + }
57561 + uid_set[j] = index;
57562 + }
57563 +
57564 + return;
57565 +}
57566 +
57567 +static __inline__ void
57568 +gr_insert_uid(const uid_t uid, const unsigned long expires)
57569 +{
57570 + int loc;
57571 +
57572 + if (uid_used == GR_UIDTABLE_MAX)
57573 + return;
57574 +
57575 + loc = gr_find_uid(uid);
57576 +
57577 + if (loc >= 0) {
57578 + uid_set[loc].expires = expires;
57579 + return;
57580 + }
57581 +
57582 + uid_set[uid_used].uid = uid;
57583 + uid_set[uid_used].expires = expires;
57584 + uid_used++;
57585 +
57586 + gr_insertsort();
57587 +
57588 + return;
57589 +}
57590 +
57591 +void
57592 +gr_remove_uid(const unsigned short loc)
57593 +{
57594 + unsigned short i;
57595 +
57596 + for (i = loc + 1; i < uid_used; i++)
57597 + uid_set[i - 1] = uid_set[i];
57598 +
57599 + uid_used--;
57600 +
57601 + return;
57602 +}
57603 +
57604 +int
57605 +gr_check_crash_uid(const uid_t uid)
57606 +{
57607 + int loc;
57608 + int ret = 0;
57609 +
57610 + if (unlikely(!gr_acl_is_enabled()))
57611 + return 0;
57612 +
57613 + spin_lock(&gr_uid_lock);
57614 + loc = gr_find_uid(uid);
57615 +
57616 + if (loc < 0)
57617 + goto out_unlock;
57618 +
57619 + if (time_before_eq(uid_set[loc].expires, get_seconds()))
57620 + gr_remove_uid(loc);
57621 + else
57622 + ret = 1;
57623 +
57624 +out_unlock:
57625 + spin_unlock(&gr_uid_lock);
57626 + return ret;
57627 +}
57628 +
57629 +static __inline__ int
57630 +proc_is_setxid(const struct cred *cred)
57631 +{
57632 + if (!uid_eq(cred->uid, cred->euid) || !uid_eq(cred->uid, cred->suid) ||
57633 + !uid_eq(cred->uid, cred->fsuid))
57634 + return 1;
57635 + if (!uid_eq(cred->gid, cred->egid) || !uid_eq(cred->gid, cred->sgid) ||
57636 + !uid_eq(cred->gid, cred->fsgid))
57637 + return 1;
57638 +
57639 + return 0;
57640 +}
57641 +
57642 +extern int gr_fake_force_sig(int sig, struct task_struct *t);
57643 +
57644 +void
57645 +gr_handle_crash(struct task_struct *task, const int sig)
57646 +{
57647 + struct acl_subject_label *curr;
57648 + struct task_struct *tsk, *tsk2;
57649 + const struct cred *cred;
57650 + const struct cred *cred2;
57651 +
57652 + if (sig != SIGSEGV && sig != SIGKILL && sig != SIGBUS && sig != SIGILL)
57653 + return;
57654 +
57655 + if (unlikely(!gr_acl_is_enabled()))
57656 + return;
57657 +
57658 + curr = task->acl;
57659 +
57660 + if (!(curr->resmask & (1 << GR_CRASH_RES)))
57661 + return;
57662 +
57663 + if (time_before_eq(curr->expires, get_seconds())) {
57664 + curr->expires = 0;
57665 + curr->crashes = 0;
57666 + }
57667 +
57668 + curr->crashes++;
57669 +
57670 + if (!curr->expires)
57671 + curr->expires = get_seconds() + curr->res[GR_CRASH_RES].rlim_max;
57672 +
57673 + if ((curr->crashes >= curr->res[GR_CRASH_RES].rlim_cur) &&
57674 + time_after(curr->expires, get_seconds())) {
57675 + rcu_read_lock();
57676 + cred = __task_cred(task);
57677 + if (!uid_eq(cred->uid, GLOBAL_ROOT_UID) && proc_is_setxid(cred)) {
57678 + gr_log_crash1(GR_DONT_AUDIT, GR_SEGVSTART_ACL_MSG, task, curr->res[GR_CRASH_RES].rlim_max);
57679 + spin_lock(&gr_uid_lock);
57680 + gr_insert_uid(cred->uid, curr->expires);
57681 + spin_unlock(&gr_uid_lock);
57682 + curr->expires = 0;
57683 + curr->crashes = 0;
57684 + read_lock(&tasklist_lock);
57685 + do_each_thread(tsk2, tsk) {
57686 + cred2 = __task_cred(tsk);
57687 + if (tsk != task && uid_eq(cred2->uid, cred->uid))
57688 + gr_fake_force_sig(SIGKILL, tsk);
57689 + } while_each_thread(tsk2, tsk);
57690 + read_unlock(&tasklist_lock);
57691 + } else {
57692 + gr_log_crash2(GR_DONT_AUDIT, GR_SEGVNOSUID_ACL_MSG, task, curr->res[GR_CRASH_RES].rlim_max);
57693 + read_lock(&tasklist_lock);
57694 + read_lock(&grsec_exec_file_lock);
57695 + do_each_thread(tsk2, tsk) {
57696 + if (likely(tsk != task)) {
57697 + // if this thread has the same subject as the one that triggered
57698 + // RES_CRASH and it's the same binary, kill it
57699 + if (tsk->acl == task->acl && tsk->exec_file == task->exec_file)
57700 + gr_fake_force_sig(SIGKILL, tsk);
57701 + }
57702 + } while_each_thread(tsk2, tsk);
57703 + read_unlock(&grsec_exec_file_lock);
57704 + read_unlock(&tasklist_lock);
57705 + }
57706 + rcu_read_unlock();
57707 + }
57708 +
57709 + return;
57710 +}
57711 +
57712 +int
57713 +gr_check_crash_exec(const struct file *filp)
57714 +{
57715 + struct acl_subject_label *curr;
57716 +
57717 + if (unlikely(!gr_acl_is_enabled()))
57718 + return 0;
57719 +
57720 + read_lock(&gr_inode_lock);
57721 + curr = lookup_acl_subj_label(filp->f_path.dentry->d_inode->i_ino,
57722 + __get_dev(filp->f_path.dentry),
57723 + current->role);
57724 + read_unlock(&gr_inode_lock);
57725 +
57726 + if (!curr || !(curr->resmask & (1 << GR_CRASH_RES)) ||
57727 + (!curr->crashes && !curr->expires))
57728 + return 0;
57729 +
57730 + if ((curr->crashes >= curr->res[GR_CRASH_RES].rlim_cur) &&
57731 + time_after(curr->expires, get_seconds()))
57732 + return 1;
57733 + else if (time_before_eq(curr->expires, get_seconds())) {
57734 + curr->crashes = 0;
57735 + curr->expires = 0;
57736 + }
57737 +
57738 + return 0;
57739 +}
57740 +
57741 +void
57742 +gr_handle_alertkill(struct task_struct *task)
57743 +{
57744 + struct acl_subject_label *curracl;
57745 + __u32 curr_ip;
57746 + struct task_struct *p, *p2;
57747 +
57748 + if (unlikely(!gr_acl_is_enabled()))
57749 + return;
57750 +
57751 + curracl = task->acl;
57752 + curr_ip = task->signal->curr_ip;
57753 +
57754 + if ((curracl->mode & GR_KILLIPPROC) && curr_ip) {
57755 + read_lock(&tasklist_lock);
57756 + do_each_thread(p2, p) {
57757 + if (p->signal->curr_ip == curr_ip)
57758 + gr_fake_force_sig(SIGKILL, p);
57759 + } while_each_thread(p2, p);
57760 + read_unlock(&tasklist_lock);
57761 + } else if (curracl->mode & GR_KILLPROC)
57762 + gr_fake_force_sig(SIGKILL, task);
57763 +
57764 + return;
57765 +}
57766 diff --git a/grsecurity/gracl_shm.c b/grsecurity/gracl_shm.c
57767 new file mode 100644
57768 index 0000000..9d83a69
57769 --- /dev/null
57770 +++ b/grsecurity/gracl_shm.c
57771 @@ -0,0 +1,40 @@
57772 +#include <linux/kernel.h>
57773 +#include <linux/mm.h>
57774 +#include <linux/sched.h>
57775 +#include <linux/file.h>
57776 +#include <linux/ipc.h>
57777 +#include <linux/gracl.h>
57778 +#include <linux/grsecurity.h>
57779 +#include <linux/grinternal.h>
57780 +
57781 +int
57782 +gr_handle_shmat(const pid_t shm_cprid, const pid_t shm_lapid,
57783 + const time_t shm_createtime, const uid_t cuid, const int shmid)
57784 +{
57785 + struct task_struct *task;
57786 +
57787 + if (!gr_acl_is_enabled())
57788 + return 1;
57789 +
57790 + rcu_read_lock();
57791 + read_lock(&tasklist_lock);
57792 +
57793 + task = find_task_by_vpid(shm_cprid);
57794 +
57795 + if (unlikely(!task))
57796 + task = find_task_by_vpid(shm_lapid);
57797 +
57798 + if (unlikely(task && (time_before_eq((unsigned long)task->start_time.tv_sec, (unsigned long)shm_createtime) ||
57799 + (task->pid == shm_lapid)) &&
57800 + (task->acl->mode & GR_PROTSHM) &&
57801 + (task->acl != current->acl))) {
57802 + read_unlock(&tasklist_lock);
57803 + rcu_read_unlock();
57804 + gr_log_int3(GR_DONT_AUDIT, GR_SHMAT_ACL_MSG, cuid, shm_cprid, shmid);
57805 + return 0;
57806 + }
57807 + read_unlock(&tasklist_lock);
57808 + rcu_read_unlock();
57809 +
57810 + return 1;
57811 +}
57812 diff --git a/grsecurity/grsec_chdir.c b/grsecurity/grsec_chdir.c
57813 new file mode 100644
57814 index 0000000..bc0be01
57815 --- /dev/null
57816 +++ b/grsecurity/grsec_chdir.c
57817 @@ -0,0 +1,19 @@
57818 +#include <linux/kernel.h>
57819 +#include <linux/sched.h>
57820 +#include <linux/fs.h>
57821 +#include <linux/file.h>
57822 +#include <linux/grsecurity.h>
57823 +#include <linux/grinternal.h>
57824 +
57825 +void
57826 +gr_log_chdir(const struct dentry *dentry, const struct vfsmount *mnt)
57827 +{
57828 +#ifdef CONFIG_GRKERNSEC_AUDIT_CHDIR
57829 + if ((grsec_enable_chdir && grsec_enable_group &&
57830 + in_group_p(grsec_audit_gid)) || (grsec_enable_chdir &&
57831 + !grsec_enable_group)) {
57832 + gr_log_fs_generic(GR_DO_AUDIT, GR_CHDIR_AUDIT_MSG, dentry, mnt);
57833 + }
57834 +#endif
57835 + return;
57836 +}
57837 diff --git a/grsecurity/grsec_chroot.c b/grsecurity/grsec_chroot.c
57838 new file mode 100644
57839 index 0000000..9807ee2
57840 --- /dev/null
57841 +++ b/grsecurity/grsec_chroot.c
57842 @@ -0,0 +1,368 @@
57843 +#include <linux/kernel.h>
57844 +#include <linux/module.h>
57845 +#include <linux/sched.h>
57846 +#include <linux/file.h>
57847 +#include <linux/fs.h>
57848 +#include <linux/mount.h>
57849 +#include <linux/types.h>
57850 +#include "../fs/mount.h"
57851 +#include <linux/grsecurity.h>
57852 +#include <linux/grinternal.h>
57853 +
57854 +void gr_set_chroot_entries(struct task_struct *task, struct path *path)
57855 +{
57856 +#ifdef CONFIG_GRKERNSEC
57857 + if (task->pid > 1 && path->dentry != init_task.fs->root.dentry &&
57858 + path->dentry != task->nsproxy->mnt_ns->root->mnt.mnt_root)
57859 + task->gr_is_chrooted = 1;
57860 + else
57861 + task->gr_is_chrooted = 0;
57862 +
57863 + task->gr_chroot_dentry = path->dentry;
57864 +#endif
57865 + return;
57866 +}
57867 +
57868 +void gr_clear_chroot_entries(struct task_struct *task)
57869 +{
57870 +#ifdef CONFIG_GRKERNSEC
57871 + task->gr_is_chrooted = 0;
57872 + task->gr_chroot_dentry = NULL;
57873 +#endif
57874 + return;
57875 +}
57876 +
57877 +int
57878 +gr_handle_chroot_unix(const pid_t pid)
57879 +{
57880 +#ifdef CONFIG_GRKERNSEC_CHROOT_UNIX
57881 + struct task_struct *p;
57882 +
57883 + if (unlikely(!grsec_enable_chroot_unix))
57884 + return 1;
57885 +
57886 + if (likely(!proc_is_chrooted(current)))
57887 + return 1;
57888 +
57889 + rcu_read_lock();
57890 + read_lock(&tasklist_lock);
57891 + p = find_task_by_vpid_unrestricted(pid);
57892 + if (unlikely(p && !have_same_root(current, p))) {
57893 + read_unlock(&tasklist_lock);
57894 + rcu_read_unlock();
57895 + gr_log_noargs(GR_DONT_AUDIT, GR_UNIX_CHROOT_MSG);
57896 + return 0;
57897 + }
57898 + read_unlock(&tasklist_lock);
57899 + rcu_read_unlock();
57900 +#endif
57901 + return 1;
57902 +}
57903 +
57904 +int
57905 +gr_handle_chroot_nice(void)
57906 +{
57907 +#ifdef CONFIG_GRKERNSEC_CHROOT_NICE
57908 + if (grsec_enable_chroot_nice && proc_is_chrooted(current)) {
57909 + gr_log_noargs(GR_DONT_AUDIT, GR_NICE_CHROOT_MSG);
57910 + return -EPERM;
57911 + }
57912 +#endif
57913 + return 0;
57914 +}
57915 +
57916 +int
57917 +gr_handle_chroot_setpriority(struct task_struct *p, const int niceval)
57918 +{
57919 +#ifdef CONFIG_GRKERNSEC_CHROOT_NICE
57920 + if (grsec_enable_chroot_nice && (niceval < task_nice(p))
57921 + && proc_is_chrooted(current)) {
57922 + gr_log_str_int(GR_DONT_AUDIT, GR_PRIORITY_CHROOT_MSG, p->comm, p->pid);
57923 + return -EACCES;
57924 + }
57925 +#endif
57926 + return 0;
57927 +}
57928 +
57929 +int
57930 +gr_handle_chroot_rawio(const struct inode *inode)
57931 +{
57932 +#ifdef CONFIG_GRKERNSEC_CHROOT_CAPS
57933 + if (grsec_enable_chroot_caps && proc_is_chrooted(current) &&
57934 + inode && S_ISBLK(inode->i_mode) && !capable(CAP_SYS_RAWIO))
57935 + return 1;
57936 +#endif
57937 + return 0;
57938 +}
57939 +
57940 +int
57941 +gr_handle_chroot_fowner(struct pid *pid, enum pid_type type)
57942 +{
57943 +#ifdef CONFIG_GRKERNSEC_CHROOT_FINDTASK
57944 + struct task_struct *p;
57945 + int ret = 0;
57946 + if (!grsec_enable_chroot_findtask || !proc_is_chrooted(current) || !pid)
57947 + return ret;
57948 +
57949 + read_lock(&tasklist_lock);
57950 + do_each_pid_task(pid, type, p) {
57951 + if (!have_same_root(current, p)) {
57952 + ret = 1;
57953 + goto out;
57954 + }
57955 + } while_each_pid_task(pid, type, p);
57956 +out:
57957 + read_unlock(&tasklist_lock);
57958 + return ret;
57959 +#endif
57960 + return 0;
57961 +}
57962 +
57963 +int
57964 +gr_pid_is_chrooted(struct task_struct *p)
57965 +{
57966 +#ifdef CONFIG_GRKERNSEC_CHROOT_FINDTASK
57967 + if (!grsec_enable_chroot_findtask || !proc_is_chrooted(current) || p == NULL)
57968 + return 0;
57969 +
57970 + if ((p->exit_state & (EXIT_ZOMBIE | EXIT_DEAD)) ||
57971 + !have_same_root(current, p)) {
57972 + return 1;
57973 + }
57974 +#endif
57975 + return 0;
57976 +}
57977 +
57978 +EXPORT_SYMBOL(gr_pid_is_chrooted);
57979 +
57980 +#if defined(CONFIG_GRKERNSEC_CHROOT_DOUBLE) || defined(CONFIG_GRKERNSEC_CHROOT_FCHDIR)
57981 +int gr_is_outside_chroot(const struct dentry *u_dentry, const struct vfsmount *u_mnt)
57982 +{
57983 + struct path path, currentroot;
57984 + int ret = 0;
57985 +
57986 + path.dentry = (struct dentry *)u_dentry;
57987 + path.mnt = (struct vfsmount *)u_mnt;
57988 + get_fs_root(current->fs, &currentroot);
57989 + if (path_is_under(&path, &currentroot))
57990 + ret = 1;
57991 + path_put(&currentroot);
57992 +
57993 + return ret;
57994 +}
57995 +#endif
57996 +
57997 +int
57998 +gr_chroot_fchdir(struct dentry *u_dentry, struct vfsmount *u_mnt)
57999 +{
58000 +#ifdef CONFIG_GRKERNSEC_CHROOT_FCHDIR
58001 + if (!grsec_enable_chroot_fchdir)
58002 + return 1;
58003 +
58004 + if (!proc_is_chrooted(current))
58005 + return 1;
58006 + else if (!gr_is_outside_chroot(u_dentry, u_mnt)) {
58007 + gr_log_fs_generic(GR_DONT_AUDIT, GR_CHROOT_FCHDIR_MSG, u_dentry, u_mnt);
58008 + return 0;
58009 + }
58010 +#endif
58011 + return 1;
58012 +}
58013 +
58014 +int
58015 +gr_chroot_shmat(const pid_t shm_cprid, const pid_t shm_lapid,
58016 + const time_t shm_createtime)
58017 +{
58018 +#ifdef CONFIG_GRKERNSEC_CHROOT_SHMAT
58019 + struct task_struct *p;
58020 + time_t starttime;
58021 +
58022 + if (unlikely(!grsec_enable_chroot_shmat))
58023 + return 1;
58024 +
58025 + if (likely(!proc_is_chrooted(current)))
58026 + return 1;
58027 +
58028 + rcu_read_lock();
58029 + read_lock(&tasklist_lock);
58030 +
58031 + if ((p = find_task_by_vpid_unrestricted(shm_cprid))) {
58032 + starttime = p->start_time.tv_sec;
58033 + if (time_before_eq((unsigned long)starttime, (unsigned long)shm_createtime)) {
58034 + if (have_same_root(current, p)) {
58035 + goto allow;
58036 + } else {
58037 + read_unlock(&tasklist_lock);
58038 + rcu_read_unlock();
58039 + gr_log_noargs(GR_DONT_AUDIT, GR_SHMAT_CHROOT_MSG);
58040 + return 0;
58041 + }
58042 + }
58043 + /* creator exited, pid reuse, fall through to next check */
58044 + }
58045 + if ((p = find_task_by_vpid_unrestricted(shm_lapid))) {
58046 + if (unlikely(!have_same_root(current, p))) {
58047 + read_unlock(&tasklist_lock);
58048 + rcu_read_unlock();
58049 + gr_log_noargs(GR_DONT_AUDIT, GR_SHMAT_CHROOT_MSG);
58050 + return 0;
58051 + }
58052 + }
58053 +
58054 +allow:
58055 + read_unlock(&tasklist_lock);
58056 + rcu_read_unlock();
58057 +#endif
58058 + return 1;
58059 +}
58060 +
58061 +void
58062 +gr_log_chroot_exec(const struct dentry *dentry, const struct vfsmount *mnt)
58063 +{
58064 +#ifdef CONFIG_GRKERNSEC_CHROOT_EXECLOG
58065 + if (grsec_enable_chroot_execlog && proc_is_chrooted(current))
58066 + gr_log_fs_generic(GR_DO_AUDIT, GR_EXEC_CHROOT_MSG, dentry, mnt);
58067 +#endif
58068 + return;
58069 +}
58070 +
58071 +int
58072 +gr_handle_chroot_mknod(const struct dentry *dentry,
58073 + const struct vfsmount *mnt, const int mode)
58074 +{
58075 +#ifdef CONFIG_GRKERNSEC_CHROOT_MKNOD
58076 + if (grsec_enable_chroot_mknod && !S_ISFIFO(mode) && !S_ISREG(mode) &&
58077 + proc_is_chrooted(current)) {
58078 + gr_log_fs_generic(GR_DONT_AUDIT, GR_MKNOD_CHROOT_MSG, dentry, mnt);
58079 + return -EPERM;
58080 + }
58081 +#endif
58082 + return 0;
58083 +}
58084 +
58085 +int
58086 +gr_handle_chroot_mount(const struct dentry *dentry,
58087 + const struct vfsmount *mnt, const char *dev_name)
58088 +{
58089 +#ifdef CONFIG_GRKERNSEC_CHROOT_MOUNT
58090 + if (grsec_enable_chroot_mount && proc_is_chrooted(current)) {
58091 + gr_log_str_fs(GR_DONT_AUDIT, GR_MOUNT_CHROOT_MSG, dev_name ? dev_name : "none", dentry, mnt);
58092 + return -EPERM;
58093 + }
58094 +#endif
58095 + return 0;
58096 +}
58097 +
58098 +int
58099 +gr_handle_chroot_pivot(void)
58100 +{
58101 +#ifdef CONFIG_GRKERNSEC_CHROOT_PIVOT
58102 + if (grsec_enable_chroot_pivot && proc_is_chrooted(current)) {
58103 + gr_log_noargs(GR_DONT_AUDIT, GR_PIVOT_CHROOT_MSG);
58104 + return -EPERM;
58105 + }
58106 +#endif
58107 + return 0;
58108 +}
58109 +
58110 +int
58111 +gr_handle_chroot_chroot(const struct dentry *dentry, const struct vfsmount *mnt)
58112 +{
58113 +#ifdef CONFIG_GRKERNSEC_CHROOT_DOUBLE
58114 + if (grsec_enable_chroot_double && proc_is_chrooted(current) &&
58115 + !gr_is_outside_chroot(dentry, mnt)) {
58116 + gr_log_fs_generic(GR_DONT_AUDIT, GR_CHROOT_CHROOT_MSG, dentry, mnt);
58117 + return -EPERM;
58118 + }
58119 +#endif
58120 + return 0;
58121 +}
58122 +
58123 +extern const char *captab_log[];
58124 +extern int captab_log_entries;
58125 +
58126 +int
58127 +gr_task_chroot_is_capable(const struct task_struct *task, const struct cred *cred, const int cap)
58128 +{
58129 +#ifdef CONFIG_GRKERNSEC_CHROOT_CAPS
58130 + if (grsec_enable_chroot_caps && proc_is_chrooted(task)) {
58131 + kernel_cap_t chroot_caps = GR_CHROOT_CAPS;
58132 + if (cap_raised(chroot_caps, cap)) {
58133 + if (cap_raised(cred->cap_effective, cap) && cap < captab_log_entries) {
58134 + gr_log_cap(GR_DONT_AUDIT, GR_CAP_CHROOT_MSG, task, captab_log[cap]);
58135 + }
58136 + return 0;
58137 + }
58138 + }
58139 +#endif
58140 + return 1;
58141 +}
58142 +
58143 +int
58144 +gr_chroot_is_capable(const int cap)
58145 +{
58146 +#ifdef CONFIG_GRKERNSEC_CHROOT_CAPS
58147 + return gr_task_chroot_is_capable(current, current_cred(), cap);
58148 +#endif
58149 + return 1;
58150 +}
58151 +
58152 +int
58153 +gr_task_chroot_is_capable_nolog(const struct task_struct *task, const int cap)
58154 +{
58155 +#ifdef CONFIG_GRKERNSEC_CHROOT_CAPS
58156 + if (grsec_enable_chroot_caps && proc_is_chrooted(task)) {
58157 + kernel_cap_t chroot_caps = GR_CHROOT_CAPS;
58158 + if (cap_raised(chroot_caps, cap)) {
58159 + return 0;
58160 + }
58161 + }
58162 +#endif
58163 + return 1;
58164 +}
58165 +
58166 +int
58167 +gr_chroot_is_capable_nolog(const int cap)
58168 +{
58169 +#ifdef CONFIG_GRKERNSEC_CHROOT_CAPS
58170 + return gr_task_chroot_is_capable_nolog(current, cap);
58171 +#endif
58172 + return 1;
58173 +}
58174 +
58175 +int
58176 +gr_handle_chroot_sysctl(const int op)
58177 +{
58178 +#ifdef CONFIG_GRKERNSEC_CHROOT_SYSCTL
58179 + if (grsec_enable_chroot_sysctl && (op & MAY_WRITE) &&
58180 + proc_is_chrooted(current))
58181 + return -EACCES;
58182 +#endif
58183 + return 0;
58184 +}
58185 +
58186 +void
58187 +gr_handle_chroot_chdir(struct path *path)
58188 +{
58189 +#ifdef CONFIG_GRKERNSEC_CHROOT_CHDIR
58190 + if (grsec_enable_chroot_chdir)
58191 + set_fs_pwd(current->fs, path);
58192 +#endif
58193 + return;
58194 +}
58195 +
58196 +int
58197 +gr_handle_chroot_chmod(const struct dentry *dentry,
58198 + const struct vfsmount *mnt, const int mode)
58199 +{
58200 +#ifdef CONFIG_GRKERNSEC_CHROOT_CHMOD
58201 + /* allow chmod +s on directories, but not files */
58202 + if (grsec_enable_chroot_chmod && !S_ISDIR(dentry->d_inode->i_mode) &&
58203 + ((mode & S_ISUID) || ((mode & (S_ISGID | S_IXGRP)) == (S_ISGID | S_IXGRP))) &&
58204 + proc_is_chrooted(current)) {
58205 + gr_log_fs_generic(GR_DONT_AUDIT, GR_CHMOD_CHROOT_MSG, dentry, mnt);
58206 + return -EPERM;
58207 + }
58208 +#endif
58209 + return 0;
58210 +}
58211 diff --git a/grsecurity/grsec_disabled.c b/grsecurity/grsec_disabled.c
58212 new file mode 100644
58213 index 0000000..b79fe50
58214 --- /dev/null
58215 +++ b/grsecurity/grsec_disabled.c
58216 @@ -0,0 +1,442 @@
58217 +#include <linux/kernel.h>
58218 +#include <linux/module.h>
58219 +#include <linux/sched.h>
58220 +#include <linux/file.h>
58221 +#include <linux/fs.h>
58222 +#include <linux/kdev_t.h>
58223 +#include <linux/net.h>
58224 +#include <linux/in.h>
58225 +#include <linux/ip.h>
58226 +#include <linux/skbuff.h>
58227 +#include <linux/sysctl.h>
58228 +
58229 +#ifdef CONFIG_PAX_HAVE_ACL_FLAGS
58230 +void
58231 +pax_set_initial_flags(struct linux_binprm *bprm)
58232 +{
58233 + return;
58234 +}
58235 +#endif
58236 +
58237 +#ifdef CONFIG_SYSCTL
58238 +__u32
58239 +gr_handle_sysctl(const struct ctl_table * table, const int op)
58240 +{
58241 + return 0;
58242 +}
58243 +#endif
58244 +
58245 +#ifdef CONFIG_TASKSTATS
58246 +int gr_is_taskstats_denied(int pid)
58247 +{
58248 + return 0;
58249 +}
58250 +#endif
58251 +
58252 +int
58253 +gr_acl_is_enabled(void)
58254 +{
58255 + return 0;
58256 +}
58257 +
58258 +void
58259 +gr_handle_proc_create(const struct dentry *dentry, const struct inode *inode)
58260 +{
58261 + return;
58262 +}
58263 +
58264 +int
58265 +gr_handle_rawio(const struct inode *inode)
58266 +{
58267 + return 0;
58268 +}
58269 +
58270 +void
58271 +gr_acl_handle_psacct(struct task_struct *task, const long code)
58272 +{
58273 + return;
58274 +}
58275 +
58276 +int
58277 +gr_handle_ptrace(struct task_struct *task, const long request)
58278 +{
58279 + return 0;
58280 +}
58281 +
58282 +int
58283 +gr_handle_proc_ptrace(struct task_struct *task)
58284 +{
58285 + return 0;
58286 +}
58287 +
58288 +void
58289 +gr_learn_resource(const struct task_struct *task,
58290 + const int res, const unsigned long wanted, const int gt)
58291 +{
58292 + return;
58293 +}
58294 +
58295 +int
58296 +gr_set_acls(const int type)
58297 +{
58298 + return 0;
58299 +}
58300 +
58301 +int
58302 +gr_check_hidden_task(const struct task_struct *tsk)
58303 +{
58304 + return 0;
58305 +}
58306 +
58307 +int
58308 +gr_check_protected_task(const struct task_struct *task)
58309 +{
58310 + return 0;
58311 +}
58312 +
58313 +int
58314 +gr_check_protected_task_fowner(struct pid *pid, enum pid_type type)
58315 +{
58316 + return 0;
58317 +}
58318 +
58319 +void
58320 +gr_copy_label(struct task_struct *tsk)
58321 +{
58322 + return;
58323 +}
58324 +
58325 +void
58326 +gr_set_pax_flags(struct task_struct *task)
58327 +{
58328 + return;
58329 +}
58330 +
58331 +int
58332 +gr_set_proc_label(const struct dentry *dentry, const struct vfsmount *mnt,
58333 + const int unsafe_share)
58334 +{
58335 + return 0;
58336 +}
58337 +
58338 +void
58339 +gr_handle_delete(const ino_t ino, const dev_t dev)
58340 +{
58341 + return;
58342 +}
58343 +
58344 +void
58345 +gr_handle_create(const struct dentry *dentry, const struct vfsmount *mnt)
58346 +{
58347 + return;
58348 +}
58349 +
58350 +void
58351 +gr_handle_crash(struct task_struct *task, const int sig)
58352 +{
58353 + return;
58354 +}
58355 +
58356 +int
58357 +gr_check_crash_exec(const struct file *filp)
58358 +{
58359 + return 0;
58360 +}
58361 +
58362 +int
58363 +gr_check_crash_uid(const uid_t uid)
58364 +{
58365 + return 0;
58366 +}
58367 +
58368 +void
58369 +gr_handle_rename(struct inode *old_dir, struct inode *new_dir,
58370 + struct dentry *old_dentry,
58371 + struct dentry *new_dentry,
58372 + struct vfsmount *mnt, const __u8 replace)
58373 +{
58374 + return;
58375 +}
58376 +
58377 +int
58378 +gr_search_socket(const int family, const int type, const int protocol)
58379 +{
58380 + return 1;
58381 +}
58382 +
58383 +int
58384 +gr_search_connectbind(const int mode, const struct socket *sock,
58385 + const struct sockaddr_in *addr)
58386 +{
58387 + return 0;
58388 +}
58389 +
58390 +void
58391 +gr_handle_alertkill(struct task_struct *task)
58392 +{
58393 + return;
58394 +}
58395 +
58396 +__u32
58397 +gr_acl_handle_execve(const struct dentry * dentry, const struct vfsmount * mnt)
58398 +{
58399 + return 1;
58400 +}
58401 +
58402 +__u32
58403 +gr_acl_handle_hidden_file(const struct dentry * dentry,
58404 + const struct vfsmount * mnt)
58405 +{
58406 + return 1;
58407 +}
58408 +
58409 +__u32
58410 +gr_acl_handle_open(const struct dentry * dentry, const struct vfsmount * mnt,
58411 + int acc_mode)
58412 +{
58413 + return 1;
58414 +}
58415 +
58416 +__u32
58417 +gr_acl_handle_rmdir(const struct dentry * dentry, const struct vfsmount * mnt)
58418 +{
58419 + return 1;
58420 +}
58421 +
58422 +__u32
58423 +gr_acl_handle_unlink(const struct dentry * dentry, const struct vfsmount * mnt)
58424 +{
58425 + return 1;
58426 +}
58427 +
58428 +int
58429 +gr_acl_handle_mmap(const struct file *file, const unsigned long prot,
58430 + unsigned int *vm_flags)
58431 +{
58432 + return 1;
58433 +}
58434 +
58435 +__u32
58436 +gr_acl_handle_truncate(const struct dentry * dentry,
58437 + const struct vfsmount * mnt)
58438 +{
58439 + return 1;
58440 +}
58441 +
58442 +__u32
58443 +gr_acl_handle_utime(const struct dentry * dentry, const struct vfsmount * mnt)
58444 +{
58445 + return 1;
58446 +}
58447 +
58448 +__u32
58449 +gr_acl_handle_access(const struct dentry * dentry,
58450 + const struct vfsmount * mnt, const int fmode)
58451 +{
58452 + return 1;
58453 +}
58454 +
58455 +__u32
58456 +gr_acl_handle_chmod(const struct dentry * dentry, const struct vfsmount * mnt,
58457 + umode_t *mode)
58458 +{
58459 + return 1;
58460 +}
58461 +
58462 +__u32
58463 +gr_acl_handle_chown(const struct dentry * dentry, const struct vfsmount * mnt)
58464 +{
58465 + return 1;
58466 +}
58467 +
58468 +__u32
58469 +gr_acl_handle_setxattr(const struct dentry * dentry, const struct vfsmount * mnt)
58470 +{
58471 + return 1;
58472 +}
58473 +
58474 +void
58475 +grsecurity_init(void)
58476 +{
58477 + return;
58478 +}
58479 +
58480 +umode_t gr_acl_umask(void)
58481 +{
58482 + return 0;
58483 +}
58484 +
58485 +__u32
58486 +gr_acl_handle_mknod(const struct dentry * new_dentry,
58487 + const struct dentry * parent_dentry,
58488 + const struct vfsmount * parent_mnt,
58489 + const int mode)
58490 +{
58491 + return 1;
58492 +}
58493 +
58494 +__u32
58495 +gr_acl_handle_mkdir(const struct dentry * new_dentry,
58496 + const struct dentry * parent_dentry,
58497 + const struct vfsmount * parent_mnt)
58498 +{
58499 + return 1;
58500 +}
58501 +
58502 +__u32
58503 +gr_acl_handle_symlink(const struct dentry * new_dentry,
58504 + const struct dentry * parent_dentry,
58505 + const struct vfsmount * parent_mnt, const char *from)
58506 +{
58507 + return 1;
58508 +}
58509 +
58510 +__u32
58511 +gr_acl_handle_link(const struct dentry * new_dentry,
58512 + const struct dentry * parent_dentry,
58513 + const struct vfsmount * parent_mnt,
58514 + const struct dentry * old_dentry,
58515 + const struct vfsmount * old_mnt, const char *to)
58516 +{
58517 + return 1;
58518 +}
58519 +
58520 +int
58521 +gr_acl_handle_rename(const struct dentry *new_dentry,
58522 + const struct dentry *parent_dentry,
58523 + const struct vfsmount *parent_mnt,
58524 + const struct dentry *old_dentry,
58525 + const struct inode *old_parent_inode,
58526 + const struct vfsmount *old_mnt, const char *newname)
58527 +{
58528 + return 0;
58529 +}
58530 +
58531 +int
58532 +gr_acl_handle_filldir(const struct file *file, const char *name,
58533 + const int namelen, const ino_t ino)
58534 +{
58535 + return 1;
58536 +}
58537 +
58538 +int
58539 +gr_handle_shmat(const pid_t shm_cprid, const pid_t shm_lapid,
58540 + const time_t shm_createtime, const uid_t cuid, const int shmid)
58541 +{
58542 + return 1;
58543 +}
58544 +
58545 +int
58546 +gr_search_bind(const struct socket *sock, const struct sockaddr_in *addr)
58547 +{
58548 + return 0;
58549 +}
58550 +
58551 +int
58552 +gr_search_accept(const struct socket *sock)
58553 +{
58554 + return 0;
58555 +}
58556 +
58557 +int
58558 +gr_search_listen(const struct socket *sock)
58559 +{
58560 + return 0;
58561 +}
58562 +
58563 +int
58564 +gr_search_connect(const struct socket *sock, const struct sockaddr_in *addr)
58565 +{
58566 + return 0;
58567 +}
58568 +
58569 +__u32
58570 +gr_acl_handle_unix(const struct dentry * dentry, const struct vfsmount * mnt)
58571 +{
58572 + return 1;
58573 +}
58574 +
58575 +__u32
58576 +gr_acl_handle_creat(const struct dentry * dentry,
58577 + const struct dentry * p_dentry,
58578 + const struct vfsmount * p_mnt, int open_flags, int acc_mode,
58579 + const int imode)
58580 +{
58581 + return 1;
58582 +}
58583 +
58584 +void
58585 +gr_acl_handle_exit(void)
58586 +{
58587 + return;
58588 +}
58589 +
58590 +int
58591 +gr_acl_handle_mprotect(const struct file *file, const unsigned long prot)
58592 +{
58593 + return 1;
58594 +}
58595 +
58596 +void
58597 +gr_set_role_label(const uid_t uid, const gid_t gid)
58598 +{
58599 + return;
58600 +}
58601 +
58602 +int
58603 +gr_acl_handle_procpidmem(const struct task_struct *task)
58604 +{
58605 + return 0;
58606 +}
58607 +
58608 +int
58609 +gr_search_udp_recvmsg(const struct sock *sk, const struct sk_buff *skb)
58610 +{
58611 + return 0;
58612 +}
58613 +
58614 +int
58615 +gr_search_udp_sendmsg(const struct sock *sk, const struct sockaddr_in *addr)
58616 +{
58617 + return 0;
58618 +}
58619 +
58620 +void
58621 +gr_set_kernel_label(struct task_struct *task)
58622 +{
58623 + return;
58624 +}
58625 +
58626 +int
58627 +gr_check_user_change(int real, int effective, int fs)
58628 +{
58629 + return 0;
58630 +}
58631 +
58632 +int
58633 +gr_check_group_change(int real, int effective, int fs)
58634 +{
58635 + return 0;
58636 +}
58637 +
58638 +int gr_acl_enable_at_secure(void)
58639 +{
58640 + return 0;
58641 +}
58642 +
58643 +dev_t gr_get_dev_from_dentry(struct dentry *dentry)
58644 +{
58645 + return dentry->d_inode->i_sb->s_dev;
58646 +}
58647 +
58648 +void gr_put_exec_file(struct task_struct *task)
58649 +{
58650 + return;
58651 +}
58652 +
58653 +EXPORT_SYMBOL(gr_learn_resource);
58654 +EXPORT_SYMBOL(gr_set_kernel_label);
58655 +#ifdef CONFIG_SECURITY
58656 +EXPORT_SYMBOL(gr_check_user_change);
58657 +EXPORT_SYMBOL(gr_check_group_change);
58658 +#endif
58659 diff --git a/grsecurity/grsec_exec.c b/grsecurity/grsec_exec.c
58660 new file mode 100644
58661 index 0000000..abfa971
58662 --- /dev/null
58663 +++ b/grsecurity/grsec_exec.c
58664 @@ -0,0 +1,174 @@
58665 +#include <linux/kernel.h>
58666 +#include <linux/sched.h>
58667 +#include <linux/file.h>
58668 +#include <linux/binfmts.h>
58669 +#include <linux/fs.h>
58670 +#include <linux/types.h>
58671 +#include <linux/grdefs.h>
58672 +#include <linux/grsecurity.h>
58673 +#include <linux/grinternal.h>
58674 +#include <linux/capability.h>
58675 +#include <linux/module.h>
58676 +
58677 +#include <asm/uaccess.h>
58678 +
58679 +#ifdef CONFIG_GRKERNSEC_EXECLOG
58680 +static char gr_exec_arg_buf[132];
58681 +static DEFINE_MUTEX(gr_exec_arg_mutex);
58682 +#endif
58683 +
58684 +extern const char __user *get_user_arg_ptr(struct user_arg_ptr argv, int nr);
58685 +
58686 +void
58687 +gr_handle_exec_args(struct linux_binprm *bprm, struct user_arg_ptr argv)
58688 +{
58689 +#ifdef CONFIG_GRKERNSEC_EXECLOG
58690 + char *grarg = gr_exec_arg_buf;
58691 + unsigned int i, x, execlen = 0;
58692 + char c;
58693 +
58694 + if (!((grsec_enable_execlog && grsec_enable_group &&
58695 + in_group_p(grsec_audit_gid))
58696 + || (grsec_enable_execlog && !grsec_enable_group)))
58697 + return;
58698 +
58699 + mutex_lock(&gr_exec_arg_mutex);
58700 + memset(grarg, 0, sizeof(gr_exec_arg_buf));
58701 +
58702 + for (i = 0; i < bprm->argc && execlen < 128; i++) {
58703 + const char __user *p;
58704 + unsigned int len;
58705 +
58706 + p = get_user_arg_ptr(argv, i);
58707 + if (IS_ERR(p))
58708 + goto log;
58709 +
58710 + len = strnlen_user(p, 128 - execlen);
58711 + if (len > 128 - execlen)
58712 + len = 128 - execlen;
58713 + else if (len > 0)
58714 + len--;
58715 + if (copy_from_user(grarg + execlen, p, len))
58716 + goto log;
58717 +
58718 + /* rewrite unprintable characters */
58719 + for (x = 0; x < len; x++) {
58720 + c = *(grarg + execlen + x);
58721 + if (c < 32 || c > 126)
58722 + *(grarg + execlen + x) = ' ';
58723 + }
58724 +
58725 + execlen += len;
58726 + *(grarg + execlen) = ' ';
58727 + *(grarg + execlen + 1) = '\0';
58728 + execlen++;
58729 + }
58730 +
58731 + log:
58732 + gr_log_fs_str(GR_DO_AUDIT, GR_EXEC_AUDIT_MSG, bprm->file->f_path.dentry,
58733 + bprm->file->f_path.mnt, grarg);
58734 + mutex_unlock(&gr_exec_arg_mutex);
58735 +#endif
58736 + return;
58737 +}
58738 +
58739 +#ifdef CONFIG_GRKERNSEC
58740 +extern int gr_acl_is_capable(const int cap);
58741 +extern int gr_acl_is_capable_nolog(const int cap);
58742 +extern int gr_task_acl_is_capable(const struct task_struct *task, const struct cred *cred, const int cap);
58743 +extern int gr_task_acl_is_capable_nolog(const struct task_struct *task, const int cap);
58744 +extern int gr_chroot_is_capable(const int cap);
58745 +extern int gr_chroot_is_capable_nolog(const int cap);
58746 +extern int gr_task_chroot_is_capable(const struct task_struct *task, const struct cred *cred, const int cap);
58747 +extern int gr_task_chroot_is_capable_nolog(const struct task_struct *task, const int cap);
58748 +#endif
58749 +
58750 +const char *captab_log[] = {
58751 + "CAP_CHOWN",
58752 + "CAP_DAC_OVERRIDE",
58753 + "CAP_DAC_READ_SEARCH",
58754 + "CAP_FOWNER",
58755 + "CAP_FSETID",
58756 + "CAP_KILL",
58757 + "CAP_SETGID",
58758 + "CAP_SETUID",
58759 + "CAP_SETPCAP",
58760 + "CAP_LINUX_IMMUTABLE",
58761 + "CAP_NET_BIND_SERVICE",
58762 + "CAP_NET_BROADCAST",
58763 + "CAP_NET_ADMIN",
58764 + "CAP_NET_RAW",
58765 + "CAP_IPC_LOCK",
58766 + "CAP_IPC_OWNER",
58767 + "CAP_SYS_MODULE",
58768 + "CAP_SYS_RAWIO",
58769 + "CAP_SYS_CHROOT",
58770 + "CAP_SYS_PTRACE",
58771 + "CAP_SYS_PACCT",
58772 + "CAP_SYS_ADMIN",
58773 + "CAP_SYS_BOOT",
58774 + "CAP_SYS_NICE",
58775 + "CAP_SYS_RESOURCE",
58776 + "CAP_SYS_TIME",
58777 + "CAP_SYS_TTY_CONFIG",
58778 + "CAP_MKNOD",
58779 + "CAP_LEASE",
58780 + "CAP_AUDIT_WRITE",
58781 + "CAP_AUDIT_CONTROL",
58782 + "CAP_SETFCAP",
58783 + "CAP_MAC_OVERRIDE",
58784 + "CAP_MAC_ADMIN",
58785 + "CAP_SYSLOG",
58786 + "CAP_WAKE_ALARM"
58787 +};
58788 +
58789 +int captab_log_entries = sizeof(captab_log)/sizeof(captab_log[0]);
58790 +
58791 +int gr_is_capable(const int cap)
58792 +{
58793 +#ifdef CONFIG_GRKERNSEC
58794 + if (gr_acl_is_capable(cap) && gr_chroot_is_capable(cap))
58795 + return 1;
58796 + return 0;
58797 +#else
58798 + return 1;
58799 +#endif
58800 +}
58801 +
58802 +int gr_task_is_capable(const struct task_struct *task, const struct cred *cred, const int cap)
58803 +{
58804 +#ifdef CONFIG_GRKERNSEC
58805 + if (gr_task_acl_is_capable(task, cred, cap) && gr_task_chroot_is_capable(task, cred, cap))
58806 + return 1;
58807 + return 0;
58808 +#else
58809 + return 1;
58810 +#endif
58811 +}
58812 +
58813 +int gr_is_capable_nolog(const int cap)
58814 +{
58815 +#ifdef CONFIG_GRKERNSEC
58816 + if (gr_acl_is_capable_nolog(cap) && gr_chroot_is_capable_nolog(cap))
58817 + return 1;
58818 + return 0;
58819 +#else
58820 + return 1;
58821 +#endif
58822 +}
58823 +
58824 +int gr_task_is_capable_nolog(const struct task_struct *task, const int cap)
58825 +{
58826 +#ifdef CONFIG_GRKERNSEC
58827 + if (gr_task_acl_is_capable_nolog(task, cap) && gr_task_chroot_is_capable_nolog(task, cap))
58828 + return 1;
58829 + return 0;
58830 +#else
58831 + return 1;
58832 +#endif
58833 +}
58834 +
58835 +EXPORT_SYMBOL(gr_is_capable);
58836 +EXPORT_SYMBOL(gr_is_capable_nolog);
58837 +EXPORT_SYMBOL(gr_task_is_capable);
58838 +EXPORT_SYMBOL(gr_task_is_capable_nolog);
58839 diff --git a/grsecurity/grsec_fifo.c b/grsecurity/grsec_fifo.c
58840 new file mode 100644
58841 index 0000000..d3ee748
58842 --- /dev/null
58843 +++ b/grsecurity/grsec_fifo.c
58844 @@ -0,0 +1,24 @@
58845 +#include <linux/kernel.h>
58846 +#include <linux/sched.h>
58847 +#include <linux/fs.h>
58848 +#include <linux/file.h>
58849 +#include <linux/grinternal.h>
58850 +
58851 +int
58852 +gr_handle_fifo(const struct dentry *dentry, const struct vfsmount *mnt,
58853 + const struct dentry *dir, const int flag, const int acc_mode)
58854 +{
58855 +#ifdef CONFIG_GRKERNSEC_FIFO
58856 + const struct cred *cred = current_cred();
58857 +
58858 + if (grsec_enable_fifo && S_ISFIFO(dentry->d_inode->i_mode) &&
58859 + !(flag & O_EXCL) && (dir->d_inode->i_mode & S_ISVTX) &&
58860 + (dentry->d_inode->i_uid != dir->d_inode->i_uid) &&
58861 + (cred->fsuid != dentry->d_inode->i_uid)) {
58862 + if (!inode_permission(dentry->d_inode, acc_mode))
58863 + gr_log_fs_int2(GR_DONT_AUDIT, GR_FIFO_MSG, dentry, mnt, dentry->d_inode->i_uid, dentry->d_inode->i_gid);
58864 + return -EACCES;
58865 + }
58866 +#endif
58867 + return 0;
58868 +}
58869 diff --git a/grsecurity/grsec_fork.c b/grsecurity/grsec_fork.c
58870 new file mode 100644
58871 index 0000000..8ca18bf
58872 --- /dev/null
58873 +++ b/grsecurity/grsec_fork.c
58874 @@ -0,0 +1,23 @@
58875 +#include <linux/kernel.h>
58876 +#include <linux/sched.h>
58877 +#include <linux/grsecurity.h>
58878 +#include <linux/grinternal.h>
58879 +#include <linux/errno.h>
58880 +
58881 +void
58882 +gr_log_forkfail(const int retval)
58883 +{
58884 +#ifdef CONFIG_GRKERNSEC_FORKFAIL
58885 + if (grsec_enable_forkfail && (retval == -EAGAIN || retval == -ENOMEM)) {
58886 + switch (retval) {
58887 + case -EAGAIN:
58888 + gr_log_str(GR_DONT_AUDIT, GR_FAILFORK_MSG, "EAGAIN");
58889 + break;
58890 + case -ENOMEM:
58891 + gr_log_str(GR_DONT_AUDIT, GR_FAILFORK_MSG, "ENOMEM");
58892 + break;
58893 + }
58894 + }
58895 +#endif
58896 + return;
58897 +}
58898 diff --git a/grsecurity/grsec_init.c b/grsecurity/grsec_init.c
58899 new file mode 100644
58900 index 0000000..05a6015
58901 --- /dev/null
58902 +++ b/grsecurity/grsec_init.c
58903 @@ -0,0 +1,283 @@
58904 +#include <linux/kernel.h>
58905 +#include <linux/sched.h>
58906 +#include <linux/mm.h>
58907 +#include <linux/gracl.h>
58908 +#include <linux/slab.h>
58909 +#include <linux/vmalloc.h>
58910 +#include <linux/percpu.h>
58911 +#include <linux/module.h>
58912 +
58913 +int grsec_enable_ptrace_readexec;
58914 +int grsec_enable_setxid;
58915 +int grsec_enable_symlinkown;
58916 +int grsec_symlinkown_gid;
58917 +int grsec_enable_brute;
58918 +int grsec_enable_link;
58919 +int grsec_enable_dmesg;
58920 +int grsec_enable_harden_ptrace;
58921 +int grsec_enable_fifo;
58922 +int grsec_enable_execlog;
58923 +int grsec_enable_signal;
58924 +int grsec_enable_forkfail;
58925 +int grsec_enable_audit_ptrace;
58926 +int grsec_enable_time;
58927 +int grsec_enable_audit_textrel;
58928 +int grsec_enable_group;
58929 +int grsec_audit_gid;
58930 +int grsec_enable_chdir;
58931 +int grsec_enable_mount;
58932 +int grsec_enable_rofs;
58933 +int grsec_enable_chroot_findtask;
58934 +int grsec_enable_chroot_mount;
58935 +int grsec_enable_chroot_shmat;
58936 +int grsec_enable_chroot_fchdir;
58937 +int grsec_enable_chroot_double;
58938 +int grsec_enable_chroot_pivot;
58939 +int grsec_enable_chroot_chdir;
58940 +int grsec_enable_chroot_chmod;
58941 +int grsec_enable_chroot_mknod;
58942 +int grsec_enable_chroot_nice;
58943 +int grsec_enable_chroot_execlog;
58944 +int grsec_enable_chroot_caps;
58945 +int grsec_enable_chroot_sysctl;
58946 +int grsec_enable_chroot_unix;
58947 +int grsec_enable_tpe;
58948 +int grsec_tpe_gid;
58949 +int grsec_enable_blackhole;
58950 +#ifdef CONFIG_IPV6_MODULE
58951 +EXPORT_SYMBOL(grsec_enable_blackhole);
58952 +#endif
58953 +int grsec_lastack_retries;
58954 +int grsec_enable_tpe_all;
58955 +int grsec_enable_tpe_invert;
58956 +int grsec_enable_socket_all;
58957 +int grsec_socket_all_gid;
58958 +int grsec_enable_socket_client;
58959 +int grsec_socket_client_gid;
58960 +int grsec_enable_socket_server;
58961 +int grsec_socket_server_gid;
58962 +int grsec_resource_logging;
58963 +int grsec_disable_privio;
58964 +int grsec_enable_log_rwxmaps;
58965 +int grsec_lock;
58966 +
58967 +DEFINE_SPINLOCK(grsec_alert_lock);
58968 +unsigned long grsec_alert_wtime = 0;
58969 +unsigned long grsec_alert_fyet = 0;
58970 +
58971 +DEFINE_SPINLOCK(grsec_audit_lock);
58972 +
58973 +DEFINE_RWLOCK(grsec_exec_file_lock);
58974 +
58975 +char *gr_shared_page[4];
58976 +
58977 +char *gr_alert_log_fmt;
58978 +char *gr_audit_log_fmt;
58979 +char *gr_alert_log_buf;
58980 +char *gr_audit_log_buf;
58981 +
58982 +extern struct gr_arg *gr_usermode;
58983 +extern unsigned char *gr_system_salt;
58984 +extern unsigned char *gr_system_sum;
58985 +
58986 +void __init
58987 +grsecurity_init(void)
58988 +{
58989 + int j;
58990 + /* create the per-cpu shared pages */
58991 +
58992 +#ifdef CONFIG_X86
58993 + memset((char *)(0x41a + PAGE_OFFSET), 0, 36);
58994 +#endif
58995 +
58996 + for (j = 0; j < 4; j++) {
58997 + gr_shared_page[j] = (char *)__alloc_percpu(PAGE_SIZE, __alignof__(unsigned long long));
58998 + if (gr_shared_page[j] == NULL) {
58999 + panic("Unable to allocate grsecurity shared page");
59000 + return;
59001 + }
59002 + }
59003 +
59004 + /* allocate log buffers */
59005 + gr_alert_log_fmt = kmalloc(512, GFP_KERNEL);
59006 + if (!gr_alert_log_fmt) {
59007 + panic("Unable to allocate grsecurity alert log format buffer");
59008 + return;
59009 + }
59010 + gr_audit_log_fmt = kmalloc(512, GFP_KERNEL);
59011 + if (!gr_audit_log_fmt) {
59012 + panic("Unable to allocate grsecurity audit log format buffer");
59013 + return;
59014 + }
59015 + gr_alert_log_buf = (char *) get_zeroed_page(GFP_KERNEL);
59016 + if (!gr_alert_log_buf) {
59017 + panic("Unable to allocate grsecurity alert log buffer");
59018 + return;
59019 + }
59020 + gr_audit_log_buf = (char *) get_zeroed_page(GFP_KERNEL);
59021 + if (!gr_audit_log_buf) {
59022 + panic("Unable to allocate grsecurity audit log buffer");
59023 + return;
59024 + }
59025 +
59026 + /* allocate memory for authentication structure */
59027 + gr_usermode = kmalloc(sizeof(struct gr_arg), GFP_KERNEL);
59028 + gr_system_salt = kmalloc(GR_SALT_LEN, GFP_KERNEL);
59029 + gr_system_sum = kmalloc(GR_SHA_LEN, GFP_KERNEL);
59030 +
59031 + if (!gr_usermode || !gr_system_salt || !gr_system_sum) {
59032 + panic("Unable to allocate grsecurity authentication structure");
59033 + return;
59034 + }
59035 +
59036 +
59037 +#ifdef CONFIG_GRKERNSEC_IO
59038 +#if !defined(CONFIG_GRKERNSEC_SYSCTL_DISTRO)
59039 + grsec_disable_privio = 1;
59040 +#elif defined(CONFIG_GRKERNSEC_SYSCTL_ON)
59041 + grsec_disable_privio = 1;
59042 +#else
59043 + grsec_disable_privio = 0;
59044 +#endif
59045 +#endif
59046 +
59047 +#ifdef CONFIG_GRKERNSEC_TPE_INVERT
59048 + /* for backward compatibility, tpe_invert always defaults to on if
59049 + enabled in the kernel
59050 + */
59051 + grsec_enable_tpe_invert = 1;
59052 +#endif
59053 +
59054 +#if !defined(CONFIG_GRKERNSEC_SYSCTL) || defined(CONFIG_GRKERNSEC_SYSCTL_ON)
59055 +#ifndef CONFIG_GRKERNSEC_SYSCTL
59056 + grsec_lock = 1;
59057 +#endif
59058 +
59059 +#ifdef CONFIG_GRKERNSEC_AUDIT_TEXTREL
59060 + grsec_enable_audit_textrel = 1;
59061 +#endif
59062 +#ifdef CONFIG_GRKERNSEC_RWXMAP_LOG
59063 + grsec_enable_log_rwxmaps = 1;
59064 +#endif
59065 +#ifdef CONFIG_GRKERNSEC_AUDIT_GROUP
59066 + grsec_enable_group = 1;
59067 + grsec_audit_gid = CONFIG_GRKERNSEC_AUDIT_GID;
59068 +#endif
59069 +#ifdef CONFIG_GRKERNSEC_PTRACE_READEXEC
59070 + grsec_enable_ptrace_readexec = 1;
59071 +#endif
59072 +#ifdef CONFIG_GRKERNSEC_AUDIT_CHDIR
59073 + grsec_enable_chdir = 1;
59074 +#endif
59075 +#ifdef CONFIG_GRKERNSEC_HARDEN_PTRACE
59076 + grsec_enable_harden_ptrace = 1;
59077 +#endif
59078 +#ifdef CONFIG_GRKERNSEC_AUDIT_MOUNT
59079 + grsec_enable_mount = 1;
59080 +#endif
59081 +#ifdef CONFIG_GRKERNSEC_LINK
59082 + grsec_enable_link = 1;
59083 +#endif
59084 +#ifdef CONFIG_GRKERNSEC_BRUTE
59085 + grsec_enable_brute = 1;
59086 +#endif
59087 +#ifdef CONFIG_GRKERNSEC_DMESG
59088 + grsec_enable_dmesg = 1;
59089 +#endif
59090 +#ifdef CONFIG_GRKERNSEC_BLACKHOLE
59091 + grsec_enable_blackhole = 1;
59092 + grsec_lastack_retries = 4;
59093 +#endif
59094 +#ifdef CONFIG_GRKERNSEC_FIFO
59095 + grsec_enable_fifo = 1;
59096 +#endif
59097 +#ifdef CONFIG_GRKERNSEC_EXECLOG
59098 + grsec_enable_execlog = 1;
59099 +#endif
59100 +#ifdef CONFIG_GRKERNSEC_SETXID
59101 + grsec_enable_setxid = 1;
59102 +#endif
59103 +#ifdef CONFIG_GRKERNSEC_SIGNAL
59104 + grsec_enable_signal = 1;
59105 +#endif
59106 +#ifdef CONFIG_GRKERNSEC_FORKFAIL
59107 + grsec_enable_forkfail = 1;
59108 +#endif
59109 +#ifdef CONFIG_GRKERNSEC_TIME
59110 + grsec_enable_time = 1;
59111 +#endif
59112 +#ifdef CONFIG_GRKERNSEC_RESLOG
59113 + grsec_resource_logging = 1;
59114 +#endif
59115 +#ifdef CONFIG_GRKERNSEC_CHROOT_FINDTASK
59116 + grsec_enable_chroot_findtask = 1;
59117 +#endif
59118 +#ifdef CONFIG_GRKERNSEC_CHROOT_UNIX
59119 + grsec_enable_chroot_unix = 1;
59120 +#endif
59121 +#ifdef CONFIG_GRKERNSEC_CHROOT_MOUNT
59122 + grsec_enable_chroot_mount = 1;
59123 +#endif
59124 +#ifdef CONFIG_GRKERNSEC_CHROOT_FCHDIR
59125 + grsec_enable_chroot_fchdir = 1;
59126 +#endif
59127 +#ifdef CONFIG_GRKERNSEC_CHROOT_SHMAT
59128 + grsec_enable_chroot_shmat = 1;
59129 +#endif
59130 +#ifdef CONFIG_GRKERNSEC_AUDIT_PTRACE
59131 + grsec_enable_audit_ptrace = 1;
59132 +#endif
59133 +#ifdef CONFIG_GRKERNSEC_CHROOT_DOUBLE
59134 + grsec_enable_chroot_double = 1;
59135 +#endif
59136 +#ifdef CONFIG_GRKERNSEC_CHROOT_PIVOT
59137 + grsec_enable_chroot_pivot = 1;
59138 +#endif
59139 +#ifdef CONFIG_GRKERNSEC_CHROOT_CHDIR
59140 + grsec_enable_chroot_chdir = 1;
59141 +#endif
59142 +#ifdef CONFIG_GRKERNSEC_CHROOT_CHMOD
59143 + grsec_enable_chroot_chmod = 1;
59144 +#endif
59145 +#ifdef CONFIG_GRKERNSEC_CHROOT_MKNOD
59146 + grsec_enable_chroot_mknod = 1;
59147 +#endif
59148 +#ifdef CONFIG_GRKERNSEC_CHROOT_NICE
59149 + grsec_enable_chroot_nice = 1;
59150 +#endif
59151 +#ifdef CONFIG_GRKERNSEC_CHROOT_EXECLOG
59152 + grsec_enable_chroot_execlog = 1;
59153 +#endif
59154 +#ifdef CONFIG_GRKERNSEC_CHROOT_CAPS
59155 + grsec_enable_chroot_caps = 1;
59156 +#endif
59157 +#ifdef CONFIG_GRKERNSEC_CHROOT_SYSCTL
59158 + grsec_enable_chroot_sysctl = 1;
59159 +#endif
59160 +#ifdef CONFIG_GRKERNSEC_SYMLINKOWN
59161 + grsec_enable_symlinkown = 1;
59162 + grsec_symlinkown_gid = CONFIG_GRKERNSEC_SYMLINKOWN_GID;
59163 +#endif
59164 +#ifdef CONFIG_GRKERNSEC_TPE
59165 + grsec_enable_tpe = 1;
59166 + grsec_tpe_gid = CONFIG_GRKERNSEC_TPE_GID;
59167 +#ifdef CONFIG_GRKERNSEC_TPE_ALL
59168 + grsec_enable_tpe_all = 1;
59169 +#endif
59170 +#endif
59171 +#ifdef CONFIG_GRKERNSEC_SOCKET_ALL
59172 + grsec_enable_socket_all = 1;
59173 + grsec_socket_all_gid = CONFIG_GRKERNSEC_SOCKET_ALL_GID;
59174 +#endif
59175 +#ifdef CONFIG_GRKERNSEC_SOCKET_CLIENT
59176 + grsec_enable_socket_client = 1;
59177 + grsec_socket_client_gid = CONFIG_GRKERNSEC_SOCKET_CLIENT_GID;
59178 +#endif
59179 +#ifdef CONFIG_GRKERNSEC_SOCKET_SERVER
59180 + grsec_enable_socket_server = 1;
59181 + grsec_socket_server_gid = CONFIG_GRKERNSEC_SOCKET_SERVER_GID;
59182 +#endif
59183 +#endif
59184 +
59185 + return;
59186 +}
59187 diff --git a/grsecurity/grsec_link.c b/grsecurity/grsec_link.c
59188 new file mode 100644
59189 index 0000000..589481f
59190 --- /dev/null
59191 +++ b/grsecurity/grsec_link.c
59192 @@ -0,0 +1,58 @@
59193 +#include <linux/kernel.h>
59194 +#include <linux/sched.h>
59195 +#include <linux/fs.h>
59196 +#include <linux/file.h>
59197 +#include <linux/grinternal.h>
59198 +
59199 +int gr_handle_symlink_owner(const struct path *link, const struct inode *target)
59200 +{
59201 +#ifdef CONFIG_GRKERNSEC_SYMLINKOWN
59202 + const struct inode *link_inode = link->dentry->d_inode;
59203 +
59204 + if (grsec_enable_symlinkown && in_group_p(grsec_symlinkown_gid) &&
59205 + /* ignore root-owned links, e.g. /proc/self */
59206 + !uid_eq(link_inode->i_uid, GLOBAL_ROOT_UID) && target &&
59207 + !uid_eq(link_inode->i_uid, target->i_uid)) {
59208 + gr_log_fs_int2(GR_DONT_AUDIT, GR_SYMLINKOWNER_MSG, link->dentry, link->mnt, link_inode->i_uid, target->i_uid);
59209 + return 1;
59210 + }
59211 +#endif
59212 + return 0;
59213 +}
59214 +
59215 +int
59216 +gr_handle_follow_link(const struct inode *parent,
59217 + const struct inode *inode,
59218 + const struct dentry *dentry, const struct vfsmount *mnt)
59219 +{
59220 +#ifdef CONFIG_GRKERNSEC_LINK
59221 + const struct cred *cred = current_cred();
59222 +
59223 + if (grsec_enable_link && S_ISLNK(inode->i_mode) &&
59224 + (parent->i_mode & S_ISVTX) && !uid_eq(parent->i_uid, inode->i_uid) &&
59225 + (parent->i_mode & S_IWOTH) && !uid_eq(cred->fsuid, inode->i_uid)) {
59226 + gr_log_fs_int2(GR_DONT_AUDIT, GR_SYMLINK_MSG, dentry, mnt, inode->i_uid, inode->i_gid);
59227 + return -EACCES;
59228 + }
59229 +#endif
59230 + return 0;
59231 +}
59232 +
59233 +int
59234 +gr_handle_hardlink(const struct dentry *dentry,
59235 + const struct vfsmount *mnt,
59236 + struct inode *inode, const int mode, const char *to)
59237 +{
59238 +#ifdef CONFIG_GRKERNSEC_LINK
59239 + const struct cred *cred = current_cred();
59240 +
59241 + if (grsec_enable_link && !uid_eq(cred->fsuid, inode->i_uid) &&
59242 + (!S_ISREG(mode) || is_privileged_binary(dentry) ||
59243 + (inode_permission(inode, MAY_READ | MAY_WRITE))) &&
59244 + !capable(CAP_FOWNER) && !uid_eq(cred->uid, GLOBAL_ROOT_UID)) {
59245 + gr_log_fs_int2_str(GR_DONT_AUDIT, GR_HARDLINK_MSG, dentry, mnt, inode->i_uid, inode->i_gid, to);
59246 + return -EPERM;
59247 + }
59248 +#endif
59249 + return 0;
59250 +}
59251 diff --git a/grsecurity/grsec_log.c b/grsecurity/grsec_log.c
59252 new file mode 100644
59253 index 0000000..a45d2e9
59254 --- /dev/null
59255 +++ b/grsecurity/grsec_log.c
59256 @@ -0,0 +1,322 @@
59257 +#include <linux/kernel.h>
59258 +#include <linux/sched.h>
59259 +#include <linux/file.h>
59260 +#include <linux/tty.h>
59261 +#include <linux/fs.h>
59262 +#include <linux/grinternal.h>
59263 +
59264 +#ifdef CONFIG_TREE_PREEMPT_RCU
59265 +#define DISABLE_PREEMPT() preempt_disable()
59266 +#define ENABLE_PREEMPT() preempt_enable()
59267 +#else
59268 +#define DISABLE_PREEMPT()
59269 +#define ENABLE_PREEMPT()
59270 +#endif
59271 +
59272 +#define BEGIN_LOCKS(x) \
59273 + DISABLE_PREEMPT(); \
59274 + rcu_read_lock(); \
59275 + read_lock(&tasklist_lock); \
59276 + read_lock(&grsec_exec_file_lock); \
59277 + if (x != GR_DO_AUDIT) \
59278 + spin_lock(&grsec_alert_lock); \
59279 + else \
59280 + spin_lock(&grsec_audit_lock)
59281 +
59282 +#define END_LOCKS(x) \
59283 + if (x != GR_DO_AUDIT) \
59284 + spin_unlock(&grsec_alert_lock); \
59285 + else \
59286 + spin_unlock(&grsec_audit_lock); \
59287 + read_unlock(&grsec_exec_file_lock); \
59288 + read_unlock(&tasklist_lock); \
59289 + rcu_read_unlock(); \
59290 + ENABLE_PREEMPT(); \
59291 + if (x == GR_DONT_AUDIT) \
59292 + gr_handle_alertkill(current)
59293 +
59294 +enum {
59295 + FLOODING,
59296 + NO_FLOODING
59297 +};
59298 +
59299 +extern char *gr_alert_log_fmt;
59300 +extern char *gr_audit_log_fmt;
59301 +extern char *gr_alert_log_buf;
59302 +extern char *gr_audit_log_buf;
59303 +
59304 +static int gr_log_start(int audit)
59305 +{
59306 + char *loglevel = (audit == GR_DO_AUDIT) ? KERN_INFO : KERN_ALERT;
59307 + char *fmt = (audit == GR_DO_AUDIT) ? gr_audit_log_fmt : gr_alert_log_fmt;
59308 + char *buf = (audit == GR_DO_AUDIT) ? gr_audit_log_buf : gr_alert_log_buf;
59309 +#if (CONFIG_GRKERNSEC_FLOODTIME > 0 && CONFIG_GRKERNSEC_FLOODBURST > 0)
59310 + unsigned long curr_secs = get_seconds();
59311 +
59312 + if (audit == GR_DO_AUDIT)
59313 + goto set_fmt;
59314 +
59315 + if (!grsec_alert_wtime || time_after(curr_secs, grsec_alert_wtime + CONFIG_GRKERNSEC_FLOODTIME)) {
59316 + grsec_alert_wtime = curr_secs;
59317 + grsec_alert_fyet = 0;
59318 + } else if (time_before_eq(curr_secs, grsec_alert_wtime + CONFIG_GRKERNSEC_FLOODTIME)
59319 + && (grsec_alert_fyet < CONFIG_GRKERNSEC_FLOODBURST)) {
59320 + grsec_alert_fyet++;
59321 + } else if (grsec_alert_fyet == CONFIG_GRKERNSEC_FLOODBURST) {
59322 + grsec_alert_wtime = curr_secs;
59323 + grsec_alert_fyet++;
59324 + printk(KERN_ALERT "grsec: more alerts, logging disabled for %d seconds\n", CONFIG_GRKERNSEC_FLOODTIME);
59325 + return FLOODING;
59326 + }
59327 + else return FLOODING;
59328 +
59329 +set_fmt:
59330 +#endif
59331 + memset(buf, 0, PAGE_SIZE);
59332 + if (current->signal->curr_ip && gr_acl_is_enabled()) {
59333 + sprintf(fmt, "%s%s", loglevel, "grsec: From %pI4: (%.64s:%c:%.950s) ");
59334 + snprintf(buf, PAGE_SIZE - 1, fmt, &current->signal->curr_ip, current->role->rolename, gr_roletype_to_char(), current->acl->filename);
59335 + } else if (current->signal->curr_ip) {
59336 + sprintf(fmt, "%s%s", loglevel, "grsec: From %pI4: ");
59337 + snprintf(buf, PAGE_SIZE - 1, fmt, &current->signal->curr_ip);
59338 + } else if (gr_acl_is_enabled()) {
59339 + sprintf(fmt, "%s%s", loglevel, "grsec: (%.64s:%c:%.950s) ");
59340 + snprintf(buf, PAGE_SIZE - 1, fmt, current->role->rolename, gr_roletype_to_char(), current->acl->filename);
59341 + } else {
59342 + sprintf(fmt, "%s%s", loglevel, "grsec: ");
59343 + strcpy(buf, fmt);
59344 + }
59345 +
59346 + return NO_FLOODING;
59347 +}
59348 +
59349 +static void gr_log_middle(int audit, const char *msg, va_list ap)
59350 + __attribute__ ((format (printf, 2, 0)));
59351 +
59352 +static void gr_log_middle(int audit, const char *msg, va_list ap)
59353 +{
59354 + char *buf = (audit == GR_DO_AUDIT) ? gr_audit_log_buf : gr_alert_log_buf;
59355 + unsigned int len = strlen(buf);
59356 +
59357 + vsnprintf(buf + len, PAGE_SIZE - len - 1, msg, ap);
59358 +
59359 + return;
59360 +}
59361 +
59362 +static void gr_log_middle_varargs(int audit, const char *msg, ...)
59363 + __attribute__ ((format (printf, 2, 3)));
59364 +
59365 +static void gr_log_middle_varargs(int audit, const char *msg, ...)
59366 +{
59367 + char *buf = (audit == GR_DO_AUDIT) ? gr_audit_log_buf : gr_alert_log_buf;
59368 + unsigned int len = strlen(buf);
59369 + va_list ap;
59370 +
59371 + va_start(ap, msg);
59372 + vsnprintf(buf + len, PAGE_SIZE - len - 1, msg, ap);
59373 + va_end(ap);
59374 +
59375 + return;
59376 +}
59377 +
59378 +static void gr_log_end(int audit, int append_default)
59379 +{
59380 + char *buf = (audit == GR_DO_AUDIT) ? gr_audit_log_buf : gr_alert_log_buf;
59381 +
59382 + if (append_default) {
59383 + unsigned int len = strlen(buf);
59384 + snprintf(buf + len, PAGE_SIZE - len - 1, DEFAULTSECMSG, DEFAULTSECARGS(current, current_cred(), __task_cred(current->real_parent)));
59385 + }
59386 +
59387 + printk("%s\n", buf);
59388 +
59389 + return;
59390 +}
59391 +
59392 +void gr_log_varargs(int audit, const char *msg, int argtypes, ...)
59393 +{
59394 + int logtype;
59395 + char *result = (audit == GR_DO_AUDIT) ? "successful" : "denied";
59396 + char *str1 = NULL, *str2 = NULL, *str3 = NULL;
59397 + void *voidptr = NULL;
59398 + int num1 = 0, num2 = 0;
59399 + unsigned long ulong1 = 0, ulong2 = 0;
59400 + struct dentry *dentry = NULL;
59401 + struct vfsmount *mnt = NULL;
59402 + struct file *file = NULL;
59403 + struct task_struct *task = NULL;
59404 + const struct cred *cred, *pcred;
59405 + va_list ap;
59406 +
59407 + BEGIN_LOCKS(audit);
59408 + logtype = gr_log_start(audit);
59409 + if (logtype == FLOODING) {
59410 + END_LOCKS(audit);
59411 + return;
59412 + }
59413 + va_start(ap, argtypes);
59414 + switch (argtypes) {
59415 + case GR_TTYSNIFF:
59416 + task = va_arg(ap, struct task_struct *);
59417 + 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);
59418 + break;
59419 + case GR_SYSCTL_HIDDEN:
59420 + str1 = va_arg(ap, char *);
59421 + gr_log_middle_varargs(audit, msg, result, str1);
59422 + break;
59423 + case GR_RBAC:
59424 + dentry = va_arg(ap, struct dentry *);
59425 + mnt = va_arg(ap, struct vfsmount *);
59426 + gr_log_middle_varargs(audit, msg, result, gr_to_filename(dentry, mnt));
59427 + break;
59428 + case GR_RBAC_STR:
59429 + dentry = va_arg(ap, struct dentry *);
59430 + mnt = va_arg(ap, struct vfsmount *);
59431 + str1 = va_arg(ap, char *);
59432 + gr_log_middle_varargs(audit, msg, result, gr_to_filename(dentry, mnt), str1);
59433 + break;
59434 + case GR_STR_RBAC:
59435 + str1 = va_arg(ap, char *);
59436 + dentry = va_arg(ap, struct dentry *);
59437 + mnt = va_arg(ap, struct vfsmount *);
59438 + gr_log_middle_varargs(audit, msg, result, str1, gr_to_filename(dentry, mnt));
59439 + break;
59440 + case GR_RBAC_MODE2:
59441 + dentry = va_arg(ap, struct dentry *);
59442 + mnt = va_arg(ap, struct vfsmount *);
59443 + str1 = va_arg(ap, char *);
59444 + str2 = va_arg(ap, char *);
59445 + gr_log_middle_varargs(audit, msg, result, gr_to_filename(dentry, mnt), str1, str2);
59446 + break;
59447 + case GR_RBAC_MODE3:
59448 + dentry = va_arg(ap, struct dentry *);
59449 + mnt = va_arg(ap, struct vfsmount *);
59450 + str1 = va_arg(ap, char *);
59451 + str2 = va_arg(ap, char *);
59452 + str3 = va_arg(ap, char *);
59453 + gr_log_middle_varargs(audit, msg, result, gr_to_filename(dentry, mnt), str1, str2, str3);
59454 + break;
59455 + case GR_FILENAME:
59456 + dentry = va_arg(ap, struct dentry *);
59457 + mnt = va_arg(ap, struct vfsmount *);
59458 + gr_log_middle_varargs(audit, msg, gr_to_filename(dentry, mnt));
59459 + break;
59460 + case GR_STR_FILENAME:
59461 + str1 = va_arg(ap, char *);
59462 + dentry = va_arg(ap, struct dentry *);
59463 + mnt = va_arg(ap, struct vfsmount *);
59464 + gr_log_middle_varargs(audit, msg, str1, gr_to_filename(dentry, mnt));
59465 + break;
59466 + case GR_FILENAME_STR:
59467 + dentry = va_arg(ap, struct dentry *);
59468 + mnt = va_arg(ap, struct vfsmount *);
59469 + str1 = va_arg(ap, char *);
59470 + gr_log_middle_varargs(audit, msg, gr_to_filename(dentry, mnt), str1);
59471 + break;
59472 + case GR_FILENAME_TWO_INT:
59473 + dentry = va_arg(ap, struct dentry *);
59474 + mnt = va_arg(ap, struct vfsmount *);
59475 + num1 = va_arg(ap, int);
59476 + num2 = va_arg(ap, int);
59477 + gr_log_middle_varargs(audit, msg, gr_to_filename(dentry, mnt), num1, num2);
59478 + break;
59479 + case GR_FILENAME_TWO_INT_STR:
59480 + dentry = va_arg(ap, struct dentry *);
59481 + mnt = va_arg(ap, struct vfsmount *);
59482 + num1 = va_arg(ap, int);
59483 + num2 = va_arg(ap, int);
59484 + str1 = va_arg(ap, char *);
59485 + gr_log_middle_varargs(audit, msg, gr_to_filename(dentry, mnt), num1, num2, str1);
59486 + break;
59487 + case GR_TEXTREL:
59488 + file = va_arg(ap, struct file *);
59489 + ulong1 = va_arg(ap, unsigned long);
59490 + ulong2 = va_arg(ap, unsigned long);
59491 + gr_log_middle_varargs(audit, msg, file ? gr_to_filename(file->f_path.dentry, file->f_path.mnt) : "<anonymous mapping>", ulong1, ulong2);
59492 + break;
59493 + case GR_PTRACE:
59494 + task = va_arg(ap, struct task_struct *);
59495 + 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);
59496 + break;
59497 + case GR_RESOURCE:
59498 + task = va_arg(ap, struct task_struct *);
59499 + cred = __task_cred(task);
59500 + pcred = __task_cred(task->real_parent);
59501 + ulong1 = va_arg(ap, unsigned long);
59502 + str1 = va_arg(ap, char *);
59503 + ulong2 = va_arg(ap, unsigned long);
59504 + 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);
59505 + break;
59506 + case GR_CAP:
59507 + task = va_arg(ap, struct task_struct *);
59508 + cred = __task_cred(task);
59509 + pcred = __task_cred(task->real_parent);
59510 + str1 = va_arg(ap, char *);
59511 + 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);
59512 + break;
59513 + case GR_SIG:
59514 + str1 = va_arg(ap, char *);
59515 + voidptr = va_arg(ap, void *);
59516 + gr_log_middle_varargs(audit, msg, str1, voidptr);
59517 + break;
59518 + case GR_SIG2:
59519 + task = va_arg(ap, struct task_struct *);
59520 + cred = __task_cred(task);
59521 + pcred = __task_cred(task->real_parent);
59522 + num1 = va_arg(ap, int);
59523 + 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);
59524 + break;
59525 + case GR_CRASH1:
59526 + task = va_arg(ap, struct task_struct *);
59527 + cred = __task_cred(task);
59528 + pcred = __task_cred(task->real_parent);
59529 + ulong1 = va_arg(ap, unsigned long);
59530 + 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);
59531 + break;
59532 + case GR_CRASH2:
59533 + task = va_arg(ap, struct task_struct *);
59534 + cred = __task_cred(task);
59535 + pcred = __task_cred(task->real_parent);
59536 + ulong1 = va_arg(ap, unsigned long);
59537 + 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);
59538 + break;
59539 + case GR_RWXMAP:
59540 + file = va_arg(ap, struct file *);
59541 + gr_log_middle_varargs(audit, msg, file ? gr_to_filename(file->f_path.dentry, file->f_path.mnt) : "<anonymous mapping>");
59542 + break;
59543 + case GR_PSACCT:
59544 + {
59545 + unsigned int wday, cday;
59546 + __u8 whr, chr;
59547 + __u8 wmin, cmin;
59548 + __u8 wsec, csec;
59549 + char cur_tty[64] = { 0 };
59550 + char parent_tty[64] = { 0 };
59551 +
59552 + task = va_arg(ap, struct task_struct *);
59553 + wday = va_arg(ap, unsigned int);
59554 + cday = va_arg(ap, unsigned int);
59555 + whr = va_arg(ap, int);
59556 + chr = va_arg(ap, int);
59557 + wmin = va_arg(ap, int);
59558 + cmin = va_arg(ap, int);
59559 + wsec = va_arg(ap, int);
59560 + csec = va_arg(ap, int);
59561 + ulong1 = va_arg(ap, unsigned long);
59562 + cred = __task_cred(task);
59563 + pcred = __task_cred(task->real_parent);
59564 +
59565 + 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);
59566 + }
59567 + break;
59568 + default:
59569 + gr_log_middle(audit, msg, ap);
59570 + }
59571 + va_end(ap);
59572 + // these don't need DEFAULTSECARGS printed on the end
59573 + if (argtypes == GR_CRASH1 || argtypes == GR_CRASH2)
59574 + gr_log_end(audit, 0);
59575 + else
59576 + gr_log_end(audit, 1);
59577 + END_LOCKS(audit);
59578 +}
59579 diff --git a/grsecurity/grsec_mem.c b/grsecurity/grsec_mem.c
59580 new file mode 100644
59581 index 0000000..f536303
59582 --- /dev/null
59583 +++ b/grsecurity/grsec_mem.c
59584 @@ -0,0 +1,40 @@
59585 +#include <linux/kernel.h>
59586 +#include <linux/sched.h>
59587 +#include <linux/mm.h>
59588 +#include <linux/mman.h>
59589 +#include <linux/grinternal.h>
59590 +
59591 +void
59592 +gr_handle_ioperm(void)
59593 +{
59594 + gr_log_noargs(GR_DONT_AUDIT, GR_IOPERM_MSG);
59595 + return;
59596 +}
59597 +
59598 +void
59599 +gr_handle_iopl(void)
59600 +{
59601 + gr_log_noargs(GR_DONT_AUDIT, GR_IOPL_MSG);
59602 + return;
59603 +}
59604 +
59605 +void
59606 +gr_handle_mem_readwrite(u64 from, u64 to)
59607 +{
59608 + gr_log_two_u64(GR_DONT_AUDIT, GR_MEM_READWRITE_MSG, from, to);
59609 + return;
59610 +}
59611 +
59612 +void
59613 +gr_handle_vm86(void)
59614 +{
59615 + gr_log_noargs(GR_DONT_AUDIT, GR_VM86_MSG);
59616 + return;
59617 +}
59618 +
59619 +void
59620 +gr_log_badprocpid(const char *entry)
59621 +{
59622 + gr_log_str(GR_DONT_AUDIT, GR_BADPROCPID_MSG, entry);
59623 + return;
59624 +}
59625 diff --git a/grsecurity/grsec_mount.c b/grsecurity/grsec_mount.c
59626 new file mode 100644
59627 index 0000000..2131422
59628 --- /dev/null
59629 +++ b/grsecurity/grsec_mount.c
59630 @@ -0,0 +1,62 @@
59631 +#include <linux/kernel.h>
59632 +#include <linux/sched.h>
59633 +#include <linux/mount.h>
59634 +#include <linux/grsecurity.h>
59635 +#include <linux/grinternal.h>
59636 +
59637 +void
59638 +gr_log_remount(const char *devname, const int retval)
59639 +{
59640 +#ifdef CONFIG_GRKERNSEC_AUDIT_MOUNT
59641 + if (grsec_enable_mount && (retval >= 0))
59642 + gr_log_str(GR_DO_AUDIT, GR_REMOUNT_AUDIT_MSG, devname ? devname : "none");
59643 +#endif
59644 + return;
59645 +}
59646 +
59647 +void
59648 +gr_log_unmount(const char *devname, const int retval)
59649 +{
59650 +#ifdef CONFIG_GRKERNSEC_AUDIT_MOUNT
59651 + if (grsec_enable_mount && (retval >= 0))
59652 + gr_log_str(GR_DO_AUDIT, GR_UNMOUNT_AUDIT_MSG, devname ? devname : "none");
59653 +#endif
59654 + return;
59655 +}
59656 +
59657 +void
59658 +gr_log_mount(const char *from, const char *to, const int retval)
59659 +{
59660 +#ifdef CONFIG_GRKERNSEC_AUDIT_MOUNT
59661 + if (grsec_enable_mount && (retval >= 0))
59662 + gr_log_str_str(GR_DO_AUDIT, GR_MOUNT_AUDIT_MSG, from ? from : "none", to);
59663 +#endif
59664 + return;
59665 +}
59666 +
59667 +int
59668 +gr_handle_rofs_mount(struct dentry *dentry, struct vfsmount *mnt, int mnt_flags)
59669 +{
59670 +#ifdef CONFIG_GRKERNSEC_ROFS
59671 + if (grsec_enable_rofs && !(mnt_flags & MNT_READONLY)) {
59672 + gr_log_fs_generic(GR_DO_AUDIT, GR_ROFS_MOUNT_MSG, dentry, mnt);
59673 + return -EPERM;
59674 + } else
59675 + return 0;
59676 +#endif
59677 + return 0;
59678 +}
59679 +
59680 +int
59681 +gr_handle_rofs_blockwrite(struct dentry *dentry, struct vfsmount *mnt, int acc_mode)
59682 +{
59683 +#ifdef CONFIG_GRKERNSEC_ROFS
59684 + if (grsec_enable_rofs && (acc_mode & MAY_WRITE) &&
59685 + dentry->d_inode && S_ISBLK(dentry->d_inode->i_mode)) {
59686 + gr_log_fs_generic(GR_DO_AUDIT, GR_ROFS_BLOCKWRITE_MSG, dentry, mnt);
59687 + return -EPERM;
59688 + } else
59689 + return 0;
59690 +#endif
59691 + return 0;
59692 +}
59693 diff --git a/grsecurity/grsec_pax.c b/grsecurity/grsec_pax.c
59694 new file mode 100644
59695 index 0000000..a3b12a0
59696 --- /dev/null
59697 +++ b/grsecurity/grsec_pax.c
59698 @@ -0,0 +1,36 @@
59699 +#include <linux/kernel.h>
59700 +#include <linux/sched.h>
59701 +#include <linux/mm.h>
59702 +#include <linux/file.h>
59703 +#include <linux/grinternal.h>
59704 +#include <linux/grsecurity.h>
59705 +
59706 +void
59707 +gr_log_textrel(struct vm_area_struct * vma)
59708 +{
59709 +#ifdef CONFIG_GRKERNSEC_AUDIT_TEXTREL
59710 + if (grsec_enable_audit_textrel)
59711 + gr_log_textrel_ulong_ulong(GR_DO_AUDIT, GR_TEXTREL_AUDIT_MSG, vma->vm_file, vma->vm_start, vma->vm_pgoff);
59712 +#endif
59713 + return;
59714 +}
59715 +
59716 +void
59717 +gr_log_rwxmmap(struct file *file)
59718 +{
59719 +#ifdef CONFIG_GRKERNSEC_RWXMAP_LOG
59720 + if (grsec_enable_log_rwxmaps)
59721 + gr_log_rwxmap(GR_DONT_AUDIT, GR_RWXMMAP_MSG, file);
59722 +#endif
59723 + return;
59724 +}
59725 +
59726 +void
59727 +gr_log_rwxmprotect(struct file *file)
59728 +{
59729 +#ifdef CONFIG_GRKERNSEC_RWXMAP_LOG
59730 + if (grsec_enable_log_rwxmaps)
59731 + gr_log_rwxmap(GR_DONT_AUDIT, GR_RWXMPROTECT_MSG, file);
59732 +#endif
59733 + return;
59734 +}
59735 diff --git a/grsecurity/grsec_ptrace.c b/grsecurity/grsec_ptrace.c
59736 new file mode 100644
59737 index 0000000..f7f29aa
59738 --- /dev/null
59739 +++ b/grsecurity/grsec_ptrace.c
59740 @@ -0,0 +1,30 @@
59741 +#include <linux/kernel.h>
59742 +#include <linux/sched.h>
59743 +#include <linux/grinternal.h>
59744 +#include <linux/security.h>
59745 +
59746 +void
59747 +gr_audit_ptrace(struct task_struct *task)
59748 +{
59749 +#ifdef CONFIG_GRKERNSEC_AUDIT_PTRACE
59750 + if (grsec_enable_audit_ptrace)
59751 + gr_log_ptrace(GR_DO_AUDIT, GR_PTRACE_AUDIT_MSG, task);
59752 +#endif
59753 + return;
59754 +}
59755 +
59756 +int
59757 +gr_ptrace_readexec(struct file *file, int unsafe_flags)
59758 +{
59759 +#ifdef CONFIG_GRKERNSEC_PTRACE_READEXEC
59760 + const struct dentry *dentry = file->f_path.dentry;
59761 + const struct vfsmount *mnt = file->f_path.mnt;
59762 +
59763 + if (grsec_enable_ptrace_readexec && (unsafe_flags & LSM_UNSAFE_PTRACE) &&
59764 + (inode_permission(dentry->d_inode, MAY_READ) || !gr_acl_handle_open(dentry, mnt, MAY_READ))) {
59765 + gr_log_fs_generic(GR_DONT_AUDIT, GR_PTRACE_READEXEC_MSG, dentry, mnt);
59766 + return -EACCES;
59767 + }
59768 +#endif
59769 + return 0;
59770 +}
59771 diff --git a/grsecurity/grsec_sig.c b/grsecurity/grsec_sig.c
59772 new file mode 100644
59773 index 0000000..b4ac94c
59774 --- /dev/null
59775 +++ b/grsecurity/grsec_sig.c
59776 @@ -0,0 +1,209 @@
59777 +#include <linux/kernel.h>
59778 +#include <linux/sched.h>
59779 +#include <linux/delay.h>
59780 +#include <linux/grsecurity.h>
59781 +#include <linux/grinternal.h>
59782 +#include <linux/hardirq.h>
59783 +
59784 +char *signames[] = {
59785 + [SIGSEGV] = "Segmentation fault",
59786 + [SIGILL] = "Illegal instruction",
59787 + [SIGABRT] = "Abort",
59788 + [SIGBUS] = "Invalid alignment/Bus error"
59789 +};
59790 +
59791 +void
59792 +gr_log_signal(const int sig, const void *addr, const struct task_struct *t)
59793 +{
59794 +#ifdef CONFIG_GRKERNSEC_SIGNAL
59795 + if (grsec_enable_signal && ((sig == SIGSEGV) || (sig == SIGILL) ||
59796 + (sig == SIGABRT) || (sig == SIGBUS))) {
59797 + if (t->pid == current->pid) {
59798 + gr_log_sig_addr(GR_DONT_AUDIT_GOOD, GR_UNISIGLOG_MSG, signames[sig], addr);
59799 + } else {
59800 + gr_log_sig_task(GR_DONT_AUDIT_GOOD, GR_DUALSIGLOG_MSG, t, sig);
59801 + }
59802 + }
59803 +#endif
59804 + return;
59805 +}
59806 +
59807 +int
59808 +gr_handle_signal(const struct task_struct *p, const int sig)
59809 +{
59810 +#ifdef CONFIG_GRKERNSEC
59811 + /* ignore the 0 signal for protected task checks */
59812 + if (current->pid > 1 && sig && gr_check_protected_task(p)) {
59813 + gr_log_sig_task(GR_DONT_AUDIT, GR_SIG_ACL_MSG, p, sig);
59814 + return -EPERM;
59815 + } else if (gr_pid_is_chrooted((struct task_struct *)p)) {
59816 + return -EPERM;
59817 + }
59818 +#endif
59819 + return 0;
59820 +}
59821 +
59822 +#ifdef CONFIG_GRKERNSEC
59823 +extern int specific_send_sig_info(int sig, struct siginfo *info, struct task_struct *t);
59824 +
59825 +int gr_fake_force_sig(int sig, struct task_struct *t)
59826 +{
59827 + unsigned long int flags;
59828 + int ret, blocked, ignored;
59829 + struct k_sigaction *action;
59830 +
59831 + spin_lock_irqsave(&t->sighand->siglock, flags);
59832 + action = &t->sighand->action[sig-1];
59833 + ignored = action->sa.sa_handler == SIG_IGN;
59834 + blocked = sigismember(&t->blocked, sig);
59835 + if (blocked || ignored) {
59836 + action->sa.sa_handler = SIG_DFL;
59837 + if (blocked) {
59838 + sigdelset(&t->blocked, sig);
59839 + recalc_sigpending_and_wake(t);
59840 + }
59841 + }
59842 + if (action->sa.sa_handler == SIG_DFL)
59843 + t->signal->flags &= ~SIGNAL_UNKILLABLE;
59844 + ret = specific_send_sig_info(sig, SEND_SIG_PRIV, t);
59845 +
59846 + spin_unlock_irqrestore(&t->sighand->siglock, flags);
59847 +
59848 + return ret;
59849 +}
59850 +#endif
59851 +
59852 +#ifdef CONFIG_GRKERNSEC_BRUTE
59853 +#define GR_USER_BAN_TIME (15 * 60)
59854 +
59855 +static int __get_dumpable(unsigned long mm_flags)
59856 +{
59857 + int ret;
59858 +
59859 + ret = mm_flags & MMF_DUMPABLE_MASK;
59860 + return (ret >= 2) ? 2 : ret;
59861 +}
59862 +#endif
59863 +
59864 +void gr_handle_brute_attach(struct task_struct *p, unsigned long mm_flags)
59865 +{
59866 +#ifdef CONFIG_GRKERNSEC_BRUTE
59867 + kuid_t uid = GLOBAL_ROOT_UID;
59868 +
59869 + if (!grsec_enable_brute)
59870 + return;
59871 +
59872 + rcu_read_lock();
59873 + read_lock(&tasklist_lock);
59874 + read_lock(&grsec_exec_file_lock);
59875 + if (p->real_parent && p->real_parent->exec_file == p->exec_file)
59876 + p->real_parent->brute = 1;
59877 + else {
59878 + const struct cred *cred = __task_cred(p), *cred2;
59879 + struct task_struct *tsk, *tsk2;
59880 +
59881 + if (!__get_dumpable(mm_flags) && !uid_eq(cred->uid, GLOBAL_ROOT_UID)) {
59882 + struct user_struct *user;
59883 +
59884 + uid = cred->uid;
59885 +
59886 + /* this is put upon execution past expiration */
59887 + user = find_user(uid);
59888 + if (user == NULL)
59889 + goto unlock;
59890 + user->banned = 1;
59891 + user->ban_expires = get_seconds() + GR_USER_BAN_TIME;
59892 + if (user->ban_expires == ~0UL)
59893 + user->ban_expires--;
59894 +
59895 + do_each_thread(tsk2, tsk) {
59896 + cred2 = __task_cred(tsk);
59897 + if (tsk != p && uid_eq(cred2->uid, uid))
59898 + gr_fake_force_sig(SIGKILL, tsk);
59899 + } while_each_thread(tsk2, tsk);
59900 + }
59901 + }
59902 +unlock:
59903 + read_unlock(&grsec_exec_file_lock);
59904 + read_unlock(&tasklist_lock);
59905 + rcu_read_unlock();
59906 +
59907 + if (!uid_eq(uid, GLOBAL_ROOT_UID))
59908 + printk(KERN_ALERT "grsec: bruteforce prevention initiated against uid %u, banning for %d minutes\n",
59909 + from_kuid_munged(&init_user_ns, uid), GR_USER_BAN_TIME / 60);
59910 +
59911 +#endif
59912 + return;
59913 +}
59914 +
59915 +void gr_handle_brute_check(void)
59916 +{
59917 +#ifdef CONFIG_GRKERNSEC_BRUTE
59918 + if (current->brute)
59919 + msleep(30 * 1000);
59920 +#endif
59921 + return;
59922 +}
59923 +
59924 +void gr_handle_kernel_exploit(void)
59925 +{
59926 +#ifdef CONFIG_GRKERNSEC_KERN_LOCKOUT
59927 + const struct cred *cred;
59928 + struct task_struct *tsk, *tsk2;
59929 + struct user_struct *user;
59930 + kuid_t uid;
59931 +
59932 + if (in_irq() || in_serving_softirq() || in_nmi())
59933 + panic("grsec: halting the system due to suspicious kernel crash caused in interrupt context");
59934 +
59935 + uid = current_uid();
59936 +
59937 + if (uid_eq(uid, GLOBAL_ROOT_UID))
59938 + panic("grsec: halting the system due to suspicious kernel crash caused by root");
59939 + else {
59940 + /* kill all the processes of this user, hold a reference
59941 + to their creds struct, and prevent them from creating
59942 + another process until system reset
59943 + */
59944 + printk(KERN_ALERT "grsec: banning user with uid %u until system restart for suspicious kernel crash\n",
59945 + from_kuid_munged(&init_user_ns, uid));
59946 + /* we intentionally leak this ref */
59947 + user = get_uid(current->cred->user);
59948 + if (user) {
59949 + user->banned = 1;
59950 + user->ban_expires = ~0UL;
59951 + }
59952 +
59953 + read_lock(&tasklist_lock);
59954 + do_each_thread(tsk2, tsk) {
59955 + cred = __task_cred(tsk);
59956 + if (uid_eq(cred->uid, uid))
59957 + gr_fake_force_sig(SIGKILL, tsk);
59958 + } while_each_thread(tsk2, tsk);
59959 + read_unlock(&tasklist_lock);
59960 + }
59961 +#endif
59962 +}
59963 +
59964 +int __gr_process_user_ban(struct user_struct *user)
59965 +{
59966 +#if defined(CONFIG_GRKERNSEC_KERN_LOCKOUT) || defined(CONFIG_GRKERNSEC_BRUTE)
59967 + if (unlikely(user->banned)) {
59968 + if (user->ban_expires != ~0UL && time_after_eq(get_seconds(), user->ban_expires)) {
59969 + user->banned = 0;
59970 + user->ban_expires = 0;
59971 + free_uid(user);
59972 + } else
59973 + return -EPERM;
59974 + }
59975 +#endif
59976 + return 0;
59977 +}
59978 +
59979 +int gr_process_user_ban(void)
59980 +{
59981 +#if defined(CONFIG_GRKERNSEC_KERN_LOCKOUT) || defined(CONFIG_GRKERNSEC_BRUTE)
59982 + return __gr_process_user_ban(current->cred->user);
59983 +#endif
59984 + return 0;
59985 +}
59986 diff --git a/grsecurity/grsec_sock.c b/grsecurity/grsec_sock.c
59987 new file mode 100644
59988 index 0000000..4030d57
59989 --- /dev/null
59990 +++ b/grsecurity/grsec_sock.c
59991 @@ -0,0 +1,244 @@
59992 +#include <linux/kernel.h>
59993 +#include <linux/module.h>
59994 +#include <linux/sched.h>
59995 +#include <linux/file.h>
59996 +#include <linux/net.h>
59997 +#include <linux/in.h>
59998 +#include <linux/ip.h>
59999 +#include <net/sock.h>
60000 +#include <net/inet_sock.h>
60001 +#include <linux/grsecurity.h>
60002 +#include <linux/grinternal.h>
60003 +#include <linux/gracl.h>
60004 +
60005 +extern int gr_search_udp_recvmsg(const struct sock *sk, const struct sk_buff *skb);
60006 +extern int gr_search_udp_sendmsg(const struct sock *sk, const struct sockaddr_in *addr);
60007 +
60008 +EXPORT_SYMBOL(gr_search_udp_recvmsg);
60009 +EXPORT_SYMBOL(gr_search_udp_sendmsg);
60010 +
60011 +#ifdef CONFIG_UNIX_MODULE
60012 +EXPORT_SYMBOL(gr_acl_handle_unix);
60013 +EXPORT_SYMBOL(gr_acl_handle_mknod);
60014 +EXPORT_SYMBOL(gr_handle_chroot_unix);
60015 +EXPORT_SYMBOL(gr_handle_create);
60016 +#endif
60017 +
60018 +#ifdef CONFIG_GRKERNSEC
60019 +#define gr_conn_table_size 32749
60020 +struct conn_table_entry {
60021 + struct conn_table_entry *next;
60022 + struct signal_struct *sig;
60023 +};
60024 +
60025 +struct conn_table_entry *gr_conn_table[gr_conn_table_size];
60026 +DEFINE_SPINLOCK(gr_conn_table_lock);
60027 +
60028 +extern const char * gr_socktype_to_name(unsigned char type);
60029 +extern const char * gr_proto_to_name(unsigned char proto);
60030 +extern const char * gr_sockfamily_to_name(unsigned char family);
60031 +
60032 +static __inline__ int
60033 +conn_hash(__u32 saddr, __u32 daddr, __u16 sport, __u16 dport, unsigned int size)
60034 +{
60035 + return ((daddr + saddr + (sport << 8) + (dport << 16)) % size);
60036 +}
60037 +
60038 +static __inline__ int
60039 +conn_match(const struct signal_struct *sig, __u32 saddr, __u32 daddr,
60040 + __u16 sport, __u16 dport)
60041 +{
60042 + if (unlikely(sig->gr_saddr == saddr && sig->gr_daddr == daddr &&
60043 + sig->gr_sport == sport && sig->gr_dport == dport))
60044 + return 1;
60045 + else
60046 + return 0;
60047 +}
60048 +
60049 +static void gr_add_to_task_ip_table_nolock(struct signal_struct *sig, struct conn_table_entry *newent)
60050 +{
60051 + struct conn_table_entry **match;
60052 + unsigned int index;
60053 +
60054 + index = conn_hash(sig->gr_saddr, sig->gr_daddr,
60055 + sig->gr_sport, sig->gr_dport,
60056 + gr_conn_table_size);
60057 +
60058 + newent->sig = sig;
60059 +
60060 + match = &gr_conn_table[index];
60061 + newent->next = *match;
60062 + *match = newent;
60063 +
60064 + return;
60065 +}
60066 +
60067 +static void gr_del_task_from_ip_table_nolock(struct signal_struct *sig)
60068 +{
60069 + struct conn_table_entry *match, *last = NULL;
60070 + unsigned int index;
60071 +
60072 + index = conn_hash(sig->gr_saddr, sig->gr_daddr,
60073 + sig->gr_sport, sig->gr_dport,
60074 + gr_conn_table_size);
60075 +
60076 + match = gr_conn_table[index];
60077 + while (match && !conn_match(match->sig,
60078 + sig->gr_saddr, sig->gr_daddr, sig->gr_sport,
60079 + sig->gr_dport)) {
60080 + last = match;
60081 + match = match->next;
60082 + }
60083 +
60084 + if (match) {
60085 + if (last)
60086 + last->next = match->next;
60087 + else
60088 + gr_conn_table[index] = NULL;
60089 + kfree(match);
60090 + }
60091 +
60092 + return;
60093 +}
60094 +
60095 +static struct signal_struct * gr_lookup_task_ip_table(__u32 saddr, __u32 daddr,
60096 + __u16 sport, __u16 dport)
60097 +{
60098 + struct conn_table_entry *match;
60099 + unsigned int index;
60100 +
60101 + index = conn_hash(saddr, daddr, sport, dport, gr_conn_table_size);
60102 +
60103 + match = gr_conn_table[index];
60104 + while (match && !conn_match(match->sig, saddr, daddr, sport, dport))
60105 + match = match->next;
60106 +
60107 + if (match)
60108 + return match->sig;
60109 + else
60110 + return NULL;
60111 +}
60112 +
60113 +#endif
60114 +
60115 +void gr_update_task_in_ip_table(struct task_struct *task, const struct inet_sock *inet)
60116 +{
60117 +#ifdef CONFIG_GRKERNSEC
60118 + struct signal_struct *sig = task->signal;
60119 + struct conn_table_entry *newent;
60120 +
60121 + newent = kmalloc(sizeof(struct conn_table_entry), GFP_ATOMIC);
60122 + if (newent == NULL)
60123 + return;
60124 + /* no bh lock needed since we are called with bh disabled */
60125 + spin_lock(&gr_conn_table_lock);
60126 + gr_del_task_from_ip_table_nolock(sig);
60127 + sig->gr_saddr = inet->inet_rcv_saddr;
60128 + sig->gr_daddr = inet->inet_daddr;
60129 + sig->gr_sport = inet->inet_sport;
60130 + sig->gr_dport = inet->inet_dport;
60131 + gr_add_to_task_ip_table_nolock(sig, newent);
60132 + spin_unlock(&gr_conn_table_lock);
60133 +#endif
60134 + return;
60135 +}
60136 +
60137 +void gr_del_task_from_ip_table(struct task_struct *task)
60138 +{
60139 +#ifdef CONFIG_GRKERNSEC
60140 + spin_lock_bh(&gr_conn_table_lock);
60141 + gr_del_task_from_ip_table_nolock(task->signal);
60142 + spin_unlock_bh(&gr_conn_table_lock);
60143 +#endif
60144 + return;
60145 +}
60146 +
60147 +void
60148 +gr_attach_curr_ip(const struct sock *sk)
60149 +{
60150 +#ifdef CONFIG_GRKERNSEC
60151 + struct signal_struct *p, *set;
60152 + const struct inet_sock *inet = inet_sk(sk);
60153 +
60154 + if (unlikely(sk->sk_protocol != IPPROTO_TCP))
60155 + return;
60156 +
60157 + set = current->signal;
60158 +
60159 + spin_lock_bh(&gr_conn_table_lock);
60160 + p = gr_lookup_task_ip_table(inet->inet_daddr, inet->inet_rcv_saddr,
60161 + inet->inet_dport, inet->inet_sport);
60162 + if (unlikely(p != NULL)) {
60163 + set->curr_ip = p->curr_ip;
60164 + set->used_accept = 1;
60165 + gr_del_task_from_ip_table_nolock(p);
60166 + spin_unlock_bh(&gr_conn_table_lock);
60167 + return;
60168 + }
60169 + spin_unlock_bh(&gr_conn_table_lock);
60170 +
60171 + set->curr_ip = inet->inet_daddr;
60172 + set->used_accept = 1;
60173 +#endif
60174 + return;
60175 +}
60176 +
60177 +int
60178 +gr_handle_sock_all(const int family, const int type, const int protocol)
60179 +{
60180 +#ifdef CONFIG_GRKERNSEC_SOCKET_ALL
60181 + if (grsec_enable_socket_all && in_group_p(grsec_socket_all_gid) &&
60182 + (family != AF_UNIX)) {
60183 + if (family == AF_INET)
60184 + gr_log_str3(GR_DONT_AUDIT, GR_SOCK_MSG, gr_sockfamily_to_name(family), gr_socktype_to_name(type), gr_proto_to_name(protocol));
60185 + else
60186 + gr_log_str2_int(GR_DONT_AUDIT, GR_SOCK_NOINET_MSG, gr_sockfamily_to_name(family), gr_socktype_to_name(type), protocol);
60187 + return -EACCES;
60188 + }
60189 +#endif
60190 + return 0;
60191 +}
60192 +
60193 +int
60194 +gr_handle_sock_server(const struct sockaddr *sck)
60195 +{
60196 +#ifdef CONFIG_GRKERNSEC_SOCKET_SERVER
60197 + if (grsec_enable_socket_server &&
60198 + in_group_p(grsec_socket_server_gid) &&
60199 + sck && (sck->sa_family != AF_UNIX) &&
60200 + (sck->sa_family != AF_LOCAL)) {
60201 + gr_log_noargs(GR_DONT_AUDIT, GR_BIND_MSG);
60202 + return -EACCES;
60203 + }
60204 +#endif
60205 + return 0;
60206 +}
60207 +
60208 +int
60209 +gr_handle_sock_server_other(const struct sock *sck)
60210 +{
60211 +#ifdef CONFIG_GRKERNSEC_SOCKET_SERVER
60212 + if (grsec_enable_socket_server &&
60213 + in_group_p(grsec_socket_server_gid) &&
60214 + sck && (sck->sk_family != AF_UNIX) &&
60215 + (sck->sk_family != AF_LOCAL)) {
60216 + gr_log_noargs(GR_DONT_AUDIT, GR_BIND_MSG);
60217 + return -EACCES;
60218 + }
60219 +#endif
60220 + return 0;
60221 +}
60222 +
60223 +int
60224 +gr_handle_sock_client(const struct sockaddr *sck)
60225 +{
60226 +#ifdef CONFIG_GRKERNSEC_SOCKET_CLIENT
60227 + if (grsec_enable_socket_client && in_group_p(grsec_socket_client_gid) &&
60228 + sck && (sck->sa_family != AF_UNIX) &&
60229 + (sck->sa_family != AF_LOCAL)) {
60230 + gr_log_noargs(GR_DONT_AUDIT, GR_CONNECT_MSG);
60231 + return -EACCES;
60232 + }
60233 +#endif
60234 + return 0;
60235 +}
60236 diff --git a/grsecurity/grsec_sysctl.c b/grsecurity/grsec_sysctl.c
60237 new file mode 100644
60238 index 0000000..f55ef0f
60239 --- /dev/null
60240 +++ b/grsecurity/grsec_sysctl.c
60241 @@ -0,0 +1,469 @@
60242 +#include <linux/kernel.h>
60243 +#include <linux/sched.h>
60244 +#include <linux/sysctl.h>
60245 +#include <linux/grsecurity.h>
60246 +#include <linux/grinternal.h>
60247 +
60248 +int
60249 +gr_handle_sysctl_mod(const char *dirname, const char *name, const int op)
60250 +{
60251 +#ifdef CONFIG_GRKERNSEC_SYSCTL
60252 + if (dirname == NULL || name == NULL)
60253 + return 0;
60254 + if (!strcmp(dirname, "grsecurity") && grsec_lock && (op & MAY_WRITE)) {
60255 + gr_log_str(GR_DONT_AUDIT, GR_SYSCTL_MSG, name);
60256 + return -EACCES;
60257 + }
60258 +#endif
60259 + return 0;
60260 +}
60261 +
60262 +#ifdef CONFIG_GRKERNSEC_ROFS
60263 +static int __maybe_unused one = 1;
60264 +#endif
60265 +
60266 +#if defined(CONFIG_GRKERNSEC_SYSCTL) || defined(CONFIG_GRKERNSEC_ROFS)
60267 +struct ctl_table grsecurity_table[] = {
60268 +#ifdef CONFIG_GRKERNSEC_SYSCTL
60269 +#ifdef CONFIG_GRKERNSEC_SYSCTL_DISTRO
60270 +#ifdef CONFIG_GRKERNSEC_IO
60271 + {
60272 + .procname = "disable_priv_io",
60273 + .data = &grsec_disable_privio,
60274 + .maxlen = sizeof(int),
60275 + .mode = 0600,
60276 + .proc_handler = &proc_dointvec,
60277 + },
60278 +#endif
60279 +#endif
60280 +#ifdef CONFIG_GRKERNSEC_LINK
60281 + {
60282 + .procname = "linking_restrictions",
60283 + .data = &grsec_enable_link,
60284 + .maxlen = sizeof(int),
60285 + .mode = 0600,
60286 + .proc_handler = &proc_dointvec,
60287 + },
60288 +#endif
60289 +#ifdef CONFIG_GRKERNSEC_SYMLINKOWN
60290 + {
60291 + .procname = "enforce_symlinksifowner",
60292 + .data = &grsec_enable_symlinkown,
60293 + .maxlen = sizeof(int),
60294 + .mode = 0600,
60295 + .proc_handler = &proc_dointvec,
60296 + },
60297 + {
60298 + .procname = "symlinkown_gid",
60299 + .data = &grsec_symlinkown_gid,
60300 + .maxlen = sizeof(int),
60301 + .mode = 0600,
60302 + .proc_handler = &proc_dointvec,
60303 + },
60304 +#endif
60305 +#ifdef CONFIG_GRKERNSEC_BRUTE
60306 + {
60307 + .procname = "deter_bruteforce",
60308 + .data = &grsec_enable_brute,
60309 + .maxlen = sizeof(int),
60310 + .mode = 0600,
60311 + .proc_handler = &proc_dointvec,
60312 + },
60313 +#endif
60314 +#ifdef CONFIG_GRKERNSEC_FIFO
60315 + {
60316 + .procname = "fifo_restrictions",
60317 + .data = &grsec_enable_fifo,
60318 + .maxlen = sizeof(int),
60319 + .mode = 0600,
60320 + .proc_handler = &proc_dointvec,
60321 + },
60322 +#endif
60323 +#ifdef CONFIG_GRKERNSEC_PTRACE_READEXEC
60324 + {
60325 + .procname = "ptrace_readexec",
60326 + .data = &grsec_enable_ptrace_readexec,
60327 + .maxlen = sizeof(int),
60328 + .mode = 0600,
60329 + .proc_handler = &proc_dointvec,
60330 + },
60331 +#endif
60332 +#ifdef CONFIG_GRKERNSEC_SETXID
60333 + {
60334 + .procname = "consistent_setxid",
60335 + .data = &grsec_enable_setxid,
60336 + .maxlen = sizeof(int),
60337 + .mode = 0600,
60338 + .proc_handler = &proc_dointvec,
60339 + },
60340 +#endif
60341 +#ifdef CONFIG_GRKERNSEC_BLACKHOLE
60342 + {
60343 + .procname = "ip_blackhole",
60344 + .data = &grsec_enable_blackhole,
60345 + .maxlen = sizeof(int),
60346 + .mode = 0600,
60347 + .proc_handler = &proc_dointvec,
60348 + },
60349 + {
60350 + .procname = "lastack_retries",
60351 + .data = &grsec_lastack_retries,
60352 + .maxlen = sizeof(int),
60353 + .mode = 0600,
60354 + .proc_handler = &proc_dointvec,
60355 + },
60356 +#endif
60357 +#ifdef CONFIG_GRKERNSEC_EXECLOG
60358 + {
60359 + .procname = "exec_logging",
60360 + .data = &grsec_enable_execlog,
60361 + .maxlen = sizeof(int),
60362 + .mode = 0600,
60363 + .proc_handler = &proc_dointvec,
60364 + },
60365 +#endif
60366 +#ifdef CONFIG_GRKERNSEC_RWXMAP_LOG
60367 + {
60368 + .procname = "rwxmap_logging",
60369 + .data = &grsec_enable_log_rwxmaps,
60370 + .maxlen = sizeof(int),
60371 + .mode = 0600,
60372 + .proc_handler = &proc_dointvec,
60373 + },
60374 +#endif
60375 +#ifdef CONFIG_GRKERNSEC_SIGNAL
60376 + {
60377 + .procname = "signal_logging",
60378 + .data = &grsec_enable_signal,
60379 + .maxlen = sizeof(int),
60380 + .mode = 0600,
60381 + .proc_handler = &proc_dointvec,
60382 + },
60383 +#endif
60384 +#ifdef CONFIG_GRKERNSEC_FORKFAIL
60385 + {
60386 + .procname = "forkfail_logging",
60387 + .data = &grsec_enable_forkfail,
60388 + .maxlen = sizeof(int),
60389 + .mode = 0600,
60390 + .proc_handler = &proc_dointvec,
60391 + },
60392 +#endif
60393 +#ifdef CONFIG_GRKERNSEC_TIME
60394 + {
60395 + .procname = "timechange_logging",
60396 + .data = &grsec_enable_time,
60397 + .maxlen = sizeof(int),
60398 + .mode = 0600,
60399 + .proc_handler = &proc_dointvec,
60400 + },
60401 +#endif
60402 +#ifdef CONFIG_GRKERNSEC_CHROOT_SHMAT
60403 + {
60404 + .procname = "chroot_deny_shmat",
60405 + .data = &grsec_enable_chroot_shmat,
60406 + .maxlen = sizeof(int),
60407 + .mode = 0600,
60408 + .proc_handler = &proc_dointvec,
60409 + },
60410 +#endif
60411 +#ifdef CONFIG_GRKERNSEC_CHROOT_UNIX
60412 + {
60413 + .procname = "chroot_deny_unix",
60414 + .data = &grsec_enable_chroot_unix,
60415 + .maxlen = sizeof(int),
60416 + .mode = 0600,
60417 + .proc_handler = &proc_dointvec,
60418 + },
60419 +#endif
60420 +#ifdef CONFIG_GRKERNSEC_CHROOT_MOUNT
60421 + {
60422 + .procname = "chroot_deny_mount",
60423 + .data = &grsec_enable_chroot_mount,
60424 + .maxlen = sizeof(int),
60425 + .mode = 0600,
60426 + .proc_handler = &proc_dointvec,
60427 + },
60428 +#endif
60429 +#ifdef CONFIG_GRKERNSEC_CHROOT_FCHDIR
60430 + {
60431 + .procname = "chroot_deny_fchdir",
60432 + .data = &grsec_enable_chroot_fchdir,
60433 + .maxlen = sizeof(int),
60434 + .mode = 0600,
60435 + .proc_handler = &proc_dointvec,
60436 + },
60437 +#endif
60438 +#ifdef CONFIG_GRKERNSEC_CHROOT_DOUBLE
60439 + {
60440 + .procname = "chroot_deny_chroot",
60441 + .data = &grsec_enable_chroot_double,
60442 + .maxlen = sizeof(int),
60443 + .mode = 0600,
60444 + .proc_handler = &proc_dointvec,
60445 + },
60446 +#endif
60447 +#ifdef CONFIG_GRKERNSEC_CHROOT_PIVOT
60448 + {
60449 + .procname = "chroot_deny_pivot",
60450 + .data = &grsec_enable_chroot_pivot,
60451 + .maxlen = sizeof(int),
60452 + .mode = 0600,
60453 + .proc_handler = &proc_dointvec,
60454 + },
60455 +#endif
60456 +#ifdef CONFIG_GRKERNSEC_CHROOT_CHDIR
60457 + {
60458 + .procname = "chroot_enforce_chdir",
60459 + .data = &grsec_enable_chroot_chdir,
60460 + .maxlen = sizeof(int),
60461 + .mode = 0600,
60462 + .proc_handler = &proc_dointvec,
60463 + },
60464 +#endif
60465 +#ifdef CONFIG_GRKERNSEC_CHROOT_CHMOD
60466 + {
60467 + .procname = "chroot_deny_chmod",
60468 + .data = &grsec_enable_chroot_chmod,
60469 + .maxlen = sizeof(int),
60470 + .mode = 0600,
60471 + .proc_handler = &proc_dointvec,
60472 + },
60473 +#endif
60474 +#ifdef CONFIG_GRKERNSEC_CHROOT_MKNOD
60475 + {
60476 + .procname = "chroot_deny_mknod",
60477 + .data = &grsec_enable_chroot_mknod,
60478 + .maxlen = sizeof(int),
60479 + .mode = 0600,
60480 + .proc_handler = &proc_dointvec,
60481 + },
60482 +#endif
60483 +#ifdef CONFIG_GRKERNSEC_CHROOT_NICE
60484 + {
60485 + .procname = "chroot_restrict_nice",
60486 + .data = &grsec_enable_chroot_nice,
60487 + .maxlen = sizeof(int),
60488 + .mode = 0600,
60489 + .proc_handler = &proc_dointvec,
60490 + },
60491 +#endif
60492 +#ifdef CONFIG_GRKERNSEC_CHROOT_EXECLOG
60493 + {
60494 + .procname = "chroot_execlog",
60495 + .data = &grsec_enable_chroot_execlog,
60496 + .maxlen = sizeof(int),
60497 + .mode = 0600,
60498 + .proc_handler = &proc_dointvec,
60499 + },
60500 +#endif
60501 +#ifdef CONFIG_GRKERNSEC_CHROOT_CAPS
60502 + {
60503 + .procname = "chroot_caps",
60504 + .data = &grsec_enable_chroot_caps,
60505 + .maxlen = sizeof(int),
60506 + .mode = 0600,
60507 + .proc_handler = &proc_dointvec,
60508 + },
60509 +#endif
60510 +#ifdef CONFIG_GRKERNSEC_CHROOT_SYSCTL
60511 + {
60512 + .procname = "chroot_deny_sysctl",
60513 + .data = &grsec_enable_chroot_sysctl,
60514 + .maxlen = sizeof(int),
60515 + .mode = 0600,
60516 + .proc_handler = &proc_dointvec,
60517 + },
60518 +#endif
60519 +#ifdef CONFIG_GRKERNSEC_TPE
60520 + {
60521 + .procname = "tpe",
60522 + .data = &grsec_enable_tpe,
60523 + .maxlen = sizeof(int),
60524 + .mode = 0600,
60525 + .proc_handler = &proc_dointvec,
60526 + },
60527 + {
60528 + .procname = "tpe_gid",
60529 + .data = &grsec_tpe_gid,
60530 + .maxlen = sizeof(int),
60531 + .mode = 0600,
60532 + .proc_handler = &proc_dointvec,
60533 + },
60534 +#endif
60535 +#ifdef CONFIG_GRKERNSEC_TPE_INVERT
60536 + {
60537 + .procname = "tpe_invert",
60538 + .data = &grsec_enable_tpe_invert,
60539 + .maxlen = sizeof(int),
60540 + .mode = 0600,
60541 + .proc_handler = &proc_dointvec,
60542 + },
60543 +#endif
60544 +#ifdef CONFIG_GRKERNSEC_TPE_ALL
60545 + {
60546 + .procname = "tpe_restrict_all",
60547 + .data = &grsec_enable_tpe_all,
60548 + .maxlen = sizeof(int),
60549 + .mode = 0600,
60550 + .proc_handler = &proc_dointvec,
60551 + },
60552 +#endif
60553 +#ifdef CONFIG_GRKERNSEC_SOCKET_ALL
60554 + {
60555 + .procname = "socket_all",
60556 + .data = &grsec_enable_socket_all,
60557 + .maxlen = sizeof(int),
60558 + .mode = 0600,
60559 + .proc_handler = &proc_dointvec,
60560 + },
60561 + {
60562 + .procname = "socket_all_gid",
60563 + .data = &grsec_socket_all_gid,
60564 + .maxlen = sizeof(int),
60565 + .mode = 0600,
60566 + .proc_handler = &proc_dointvec,
60567 + },
60568 +#endif
60569 +#ifdef CONFIG_GRKERNSEC_SOCKET_CLIENT
60570 + {
60571 + .procname = "socket_client",
60572 + .data = &grsec_enable_socket_client,
60573 + .maxlen = sizeof(int),
60574 + .mode = 0600,
60575 + .proc_handler = &proc_dointvec,
60576 + },
60577 + {
60578 + .procname = "socket_client_gid",
60579 + .data = &grsec_socket_client_gid,
60580 + .maxlen = sizeof(int),
60581 + .mode = 0600,
60582 + .proc_handler = &proc_dointvec,
60583 + },
60584 +#endif
60585 +#ifdef CONFIG_GRKERNSEC_SOCKET_SERVER
60586 + {
60587 + .procname = "socket_server",
60588 + .data = &grsec_enable_socket_server,
60589 + .maxlen = sizeof(int),
60590 + .mode = 0600,
60591 + .proc_handler = &proc_dointvec,
60592 + },
60593 + {
60594 + .procname = "socket_server_gid",
60595 + .data = &grsec_socket_server_gid,
60596 + .maxlen = sizeof(int),
60597 + .mode = 0600,
60598 + .proc_handler = &proc_dointvec,
60599 + },
60600 +#endif
60601 +#ifdef CONFIG_GRKERNSEC_AUDIT_GROUP
60602 + {
60603 + .procname = "audit_group",
60604 + .data = &grsec_enable_group,
60605 + .maxlen = sizeof(int),
60606 + .mode = 0600,
60607 + .proc_handler = &proc_dointvec,
60608 + },
60609 + {
60610 + .procname = "audit_gid",
60611 + .data = &grsec_audit_gid,
60612 + .maxlen = sizeof(int),
60613 + .mode = 0600,
60614 + .proc_handler = &proc_dointvec,
60615 + },
60616 +#endif
60617 +#ifdef CONFIG_GRKERNSEC_AUDIT_CHDIR
60618 + {
60619 + .procname = "audit_chdir",
60620 + .data = &grsec_enable_chdir,
60621 + .maxlen = sizeof(int),
60622 + .mode = 0600,
60623 + .proc_handler = &proc_dointvec,
60624 + },
60625 +#endif
60626 +#ifdef CONFIG_GRKERNSEC_AUDIT_MOUNT
60627 + {
60628 + .procname = "audit_mount",
60629 + .data = &grsec_enable_mount,
60630 + .maxlen = sizeof(int),
60631 + .mode = 0600,
60632 + .proc_handler = &proc_dointvec,
60633 + },
60634 +#endif
60635 +#ifdef CONFIG_GRKERNSEC_AUDIT_TEXTREL
60636 + {
60637 + .procname = "audit_textrel",
60638 + .data = &grsec_enable_audit_textrel,
60639 + .maxlen = sizeof(int),
60640 + .mode = 0600,
60641 + .proc_handler = &proc_dointvec,
60642 + },
60643 +#endif
60644 +#ifdef CONFIG_GRKERNSEC_DMESG
60645 + {
60646 + .procname = "dmesg",
60647 + .data = &grsec_enable_dmesg,
60648 + .maxlen = sizeof(int),
60649 + .mode = 0600,
60650 + .proc_handler = &proc_dointvec,
60651 + },
60652 +#endif
60653 +#ifdef CONFIG_GRKERNSEC_CHROOT_FINDTASK
60654 + {
60655 + .procname = "chroot_findtask",
60656 + .data = &grsec_enable_chroot_findtask,
60657 + .maxlen = sizeof(int),
60658 + .mode = 0600,
60659 + .proc_handler = &proc_dointvec,
60660 + },
60661 +#endif
60662 +#ifdef CONFIG_GRKERNSEC_RESLOG
60663 + {
60664 + .procname = "resource_logging",
60665 + .data = &grsec_resource_logging,
60666 + .maxlen = sizeof(int),
60667 + .mode = 0600,
60668 + .proc_handler = &proc_dointvec,
60669 + },
60670 +#endif
60671 +#ifdef CONFIG_GRKERNSEC_AUDIT_PTRACE
60672 + {
60673 + .procname = "audit_ptrace",
60674 + .data = &grsec_enable_audit_ptrace,
60675 + .maxlen = sizeof(int),
60676 + .mode = 0600,
60677 + .proc_handler = &proc_dointvec,
60678 + },
60679 +#endif
60680 +#ifdef CONFIG_GRKERNSEC_HARDEN_PTRACE
60681 + {
60682 + .procname = "harden_ptrace",
60683 + .data = &grsec_enable_harden_ptrace,
60684 + .maxlen = sizeof(int),
60685 + .mode = 0600,
60686 + .proc_handler = &proc_dointvec,
60687 + },
60688 +#endif
60689 + {
60690 + .procname = "grsec_lock",
60691 + .data = &grsec_lock,
60692 + .maxlen = sizeof(int),
60693 + .mode = 0600,
60694 + .proc_handler = &proc_dointvec,
60695 + },
60696 +#endif
60697 +#ifdef CONFIG_GRKERNSEC_ROFS
60698 + {
60699 + .procname = "romount_protect",
60700 + .data = &grsec_enable_rofs,
60701 + .maxlen = sizeof(int),
60702 + .mode = 0600,
60703 + .proc_handler = &proc_dointvec_minmax,
60704 + .extra1 = &one,
60705 + .extra2 = &one,
60706 + },
60707 +#endif
60708 + { }
60709 +};
60710 +#endif
60711 diff --git a/grsecurity/grsec_time.c b/grsecurity/grsec_time.c
60712 new file mode 100644
60713 index 0000000..0dc13c3
60714 --- /dev/null
60715 +++ b/grsecurity/grsec_time.c
60716 @@ -0,0 +1,16 @@
60717 +#include <linux/kernel.h>
60718 +#include <linux/sched.h>
60719 +#include <linux/grinternal.h>
60720 +#include <linux/module.h>
60721 +
60722 +void
60723 +gr_log_timechange(void)
60724 +{
60725 +#ifdef CONFIG_GRKERNSEC_TIME
60726 + if (grsec_enable_time)
60727 + gr_log_noargs(GR_DONT_AUDIT_GOOD, GR_TIME_MSG);
60728 +#endif
60729 + return;
60730 +}
60731 +
60732 +EXPORT_SYMBOL(gr_log_timechange);
60733 diff --git a/grsecurity/grsec_tpe.c b/grsecurity/grsec_tpe.c
60734 new file mode 100644
60735 index 0000000..07e0dc0
60736 --- /dev/null
60737 +++ b/grsecurity/grsec_tpe.c
60738 @@ -0,0 +1,73 @@
60739 +#include <linux/kernel.h>
60740 +#include <linux/sched.h>
60741 +#include <linux/file.h>
60742 +#include <linux/fs.h>
60743 +#include <linux/grinternal.h>
60744 +
60745 +extern int gr_acl_tpe_check(void);
60746 +
60747 +int
60748 +gr_tpe_allow(const struct file *file)
60749 +{
60750 +#ifdef CONFIG_GRKERNSEC
60751 + struct inode *inode = file->f_path.dentry->d_parent->d_inode;
60752 + const struct cred *cred = current_cred();
60753 + char *msg = NULL;
60754 + char *msg2 = NULL;
60755 +
60756 + // never restrict root
60757 + if (!cred->uid)
60758 + return 1;
60759 +
60760 + if (grsec_enable_tpe) {
60761 +#ifdef CONFIG_GRKERNSEC_TPE_INVERT
60762 + if (grsec_enable_tpe_invert && !in_group_p(grsec_tpe_gid))
60763 + msg = "not being in trusted group";
60764 + else if (!grsec_enable_tpe_invert && in_group_p(grsec_tpe_gid))
60765 + msg = "being in untrusted group";
60766 +#else
60767 + if (in_group_p(grsec_tpe_gid))
60768 + msg = "being in untrusted group";
60769 +#endif
60770 + }
60771 + if (!msg && gr_acl_tpe_check())
60772 + msg = "being in untrusted role";
60773 +
60774 + // not in any affected group/role
60775 + if (!msg)
60776 + goto next_check;
60777 +
60778 + if (inode->i_uid)
60779 + msg2 = "file in non-root-owned directory";
60780 + else if (inode->i_mode & S_IWOTH)
60781 + msg2 = "file in world-writable directory";
60782 + else if (inode->i_mode & S_IWGRP)
60783 + msg2 = "file in group-writable directory";
60784 +
60785 + if (msg && msg2) {
60786 + char fullmsg[70] = {0};
60787 + snprintf(fullmsg, sizeof(fullmsg)-1, "%s and %s", msg, msg2);
60788 + gr_log_str_fs(GR_DONT_AUDIT, GR_EXEC_TPE_MSG, fullmsg, file->f_path.dentry, file->f_path.mnt);
60789 + return 0;
60790 + }
60791 + msg = NULL;
60792 +next_check:
60793 +#ifdef CONFIG_GRKERNSEC_TPE_ALL
60794 + if (!grsec_enable_tpe || !grsec_enable_tpe_all)
60795 + return 1;
60796 +
60797 + if (inode->i_uid && (inode->i_uid != cred->uid))
60798 + msg = "directory not owned by user";
60799 + else if (inode->i_mode & S_IWOTH)
60800 + msg = "file in world-writable directory";
60801 + else if (inode->i_mode & S_IWGRP)
60802 + msg = "file in group-writable directory";
60803 +
60804 + if (msg) {
60805 + gr_log_str_fs(GR_DONT_AUDIT, GR_EXEC_TPE_MSG, msg, file->f_path.dentry, file->f_path.mnt);
60806 + return 0;
60807 + }
60808 +#endif
60809 +#endif
60810 + return 1;
60811 +}
60812 diff --git a/grsecurity/grsum.c b/grsecurity/grsum.c
60813 new file mode 100644
60814 index 0000000..9f7b1ac
60815 --- /dev/null
60816 +++ b/grsecurity/grsum.c
60817 @@ -0,0 +1,61 @@
60818 +#include <linux/err.h>
60819 +#include <linux/kernel.h>
60820 +#include <linux/sched.h>
60821 +#include <linux/mm.h>
60822 +#include <linux/scatterlist.h>
60823 +#include <linux/crypto.h>
60824 +#include <linux/gracl.h>
60825 +
60826 +
60827 +#if !defined(CONFIG_CRYPTO) || defined(CONFIG_CRYPTO_MODULE) || !defined(CONFIG_CRYPTO_SHA256) || defined(CONFIG_CRYPTO_SHA256_MODULE)
60828 +#error "crypto and sha256 must be built into the kernel"
60829 +#endif
60830 +
60831 +int
60832 +chkpw(struct gr_arg *entry, unsigned char *salt, unsigned char *sum)
60833 +{
60834 + char *p;
60835 + struct crypto_hash *tfm;
60836 + struct hash_desc desc;
60837 + struct scatterlist sg;
60838 + unsigned char temp_sum[GR_SHA_LEN];
60839 + volatile int retval = 0;
60840 + volatile int dummy = 0;
60841 + unsigned int i;
60842 +
60843 + sg_init_table(&sg, 1);
60844 +
60845 + tfm = crypto_alloc_hash("sha256", 0, CRYPTO_ALG_ASYNC);
60846 + if (IS_ERR(tfm)) {
60847 + /* should never happen, since sha256 should be built in */
60848 + return 1;
60849 + }
60850 +
60851 + desc.tfm = tfm;
60852 + desc.flags = 0;
60853 +
60854 + crypto_hash_init(&desc);
60855 +
60856 + p = salt;
60857 + sg_set_buf(&sg, p, GR_SALT_LEN);
60858 + crypto_hash_update(&desc, &sg, sg.length);
60859 +
60860 + p = entry->pw;
60861 + sg_set_buf(&sg, p, strlen(p));
60862 +
60863 + crypto_hash_update(&desc, &sg, sg.length);
60864 +
60865 + crypto_hash_final(&desc, temp_sum);
60866 +
60867 + memset(entry->pw, 0, GR_PW_LEN);
60868 +
60869 + for (i = 0; i < GR_SHA_LEN; i++)
60870 + if (sum[i] != temp_sum[i])
60871 + retval = 1;
60872 + else
60873 + dummy = 1; // waste a cycle
60874 +
60875 + crypto_free_hash(tfm);
60876 +
60877 + return retval;
60878 +}
60879 diff --git a/include/acpi/acpi_bus.h b/include/acpi/acpi_bus.h
60880 index bde976e..a1cc32a 100644
60881 --- a/include/acpi/acpi_bus.h
60882 +++ b/include/acpi/acpi_bus.h
60883 @@ -136,7 +136,7 @@ struct acpi_device_ops {
60884 acpi_op_bind bind;
60885 acpi_op_unbind unbind;
60886 acpi_op_notify notify;
60887 -};
60888 +} __no_const;
60889
60890 #define ACPI_DRIVER_ALL_NOTIFY_EVENTS 0x1 /* system AND device events */
60891
60892 diff --git a/include/asm-generic/4level-fixup.h b/include/asm-generic/4level-fixup.h
60893 index 77ff547..181834f 100644
60894 --- a/include/asm-generic/4level-fixup.h
60895 +++ b/include/asm-generic/4level-fixup.h
60896 @@ -13,8 +13,10 @@
60897 #define pmd_alloc(mm, pud, address) \
60898 ((unlikely(pgd_none(*(pud))) && __pmd_alloc(mm, pud, address))? \
60899 NULL: pmd_offset(pud, address))
60900 +#define pmd_alloc_kernel(mm, pud, address) pmd_alloc((mm), (pud), (address))
60901
60902 #define pud_alloc(mm, pgd, address) (pgd)
60903 +#define pud_alloc_kernel(mm, pgd, address) pud_alloc((mm), (pgd), (address))
60904 #define pud_offset(pgd, start) (pgd)
60905 #define pud_none(pud) 0
60906 #define pud_bad(pud) 0
60907 diff --git a/include/asm-generic/atomic-long.h b/include/asm-generic/atomic-long.h
60908 index b7babf0..3ba8aee 100644
60909 --- a/include/asm-generic/atomic-long.h
60910 +++ b/include/asm-generic/atomic-long.h
60911 @@ -22,6 +22,12 @@
60912
60913 typedef atomic64_t atomic_long_t;
60914
60915 +#ifdef CONFIG_PAX_REFCOUNT
60916 +typedef atomic64_unchecked_t atomic_long_unchecked_t;
60917 +#else
60918 +typedef atomic64_t atomic_long_unchecked_t;
60919 +#endif
60920 +
60921 #define ATOMIC_LONG_INIT(i) ATOMIC64_INIT(i)
60922
60923 static inline long atomic_long_read(atomic_long_t *l)
60924 @@ -31,6 +37,15 @@ static inline long atomic_long_read(atomic_long_t *l)
60925 return (long)atomic64_read(v);
60926 }
60927
60928 +#ifdef CONFIG_PAX_REFCOUNT
60929 +static inline long atomic_long_read_unchecked(atomic_long_unchecked_t *l)
60930 +{
60931 + atomic64_unchecked_t *v = (atomic64_unchecked_t *)l;
60932 +
60933 + return (long)atomic64_read_unchecked(v);
60934 +}
60935 +#endif
60936 +
60937 static inline void atomic_long_set(atomic_long_t *l, long i)
60938 {
60939 atomic64_t *v = (atomic64_t *)l;
60940 @@ -38,6 +53,15 @@ static inline void atomic_long_set(atomic_long_t *l, long i)
60941 atomic64_set(v, i);
60942 }
60943
60944 +#ifdef CONFIG_PAX_REFCOUNT
60945 +static inline void atomic_long_set_unchecked(atomic_long_unchecked_t *l, long i)
60946 +{
60947 + atomic64_unchecked_t *v = (atomic64_unchecked_t *)l;
60948 +
60949 + atomic64_set_unchecked(v, i);
60950 +}
60951 +#endif
60952 +
60953 static inline void atomic_long_inc(atomic_long_t *l)
60954 {
60955 atomic64_t *v = (atomic64_t *)l;
60956 @@ -45,6 +69,15 @@ static inline void atomic_long_inc(atomic_long_t *l)
60957 atomic64_inc(v);
60958 }
60959
60960 +#ifdef CONFIG_PAX_REFCOUNT
60961 +static inline void atomic_long_inc_unchecked(atomic_long_unchecked_t *l)
60962 +{
60963 + atomic64_unchecked_t *v = (atomic64_unchecked_t *)l;
60964 +
60965 + atomic64_inc_unchecked(v);
60966 +}
60967 +#endif
60968 +
60969 static inline void atomic_long_dec(atomic_long_t *l)
60970 {
60971 atomic64_t *v = (atomic64_t *)l;
60972 @@ -52,6 +85,15 @@ static inline void atomic_long_dec(atomic_long_t *l)
60973 atomic64_dec(v);
60974 }
60975
60976 +#ifdef CONFIG_PAX_REFCOUNT
60977 +static inline void atomic_long_dec_unchecked(atomic_long_unchecked_t *l)
60978 +{
60979 + atomic64_unchecked_t *v = (atomic64_unchecked_t *)l;
60980 +
60981 + atomic64_dec_unchecked(v);
60982 +}
60983 +#endif
60984 +
60985 static inline void atomic_long_add(long i, atomic_long_t *l)
60986 {
60987 atomic64_t *v = (atomic64_t *)l;
60988 @@ -59,6 +101,15 @@ static inline void atomic_long_add(long i, atomic_long_t *l)
60989 atomic64_add(i, v);
60990 }
60991
60992 +#ifdef CONFIG_PAX_REFCOUNT
60993 +static inline void atomic_long_add_unchecked(long i, atomic_long_unchecked_t *l)
60994 +{
60995 + atomic64_unchecked_t *v = (atomic64_unchecked_t *)l;
60996 +
60997 + atomic64_add_unchecked(i, v);
60998 +}
60999 +#endif
61000 +
61001 static inline void atomic_long_sub(long i, atomic_long_t *l)
61002 {
61003 atomic64_t *v = (atomic64_t *)l;
61004 @@ -66,6 +117,15 @@ static inline void atomic_long_sub(long i, atomic_long_t *l)
61005 atomic64_sub(i, v);
61006 }
61007
61008 +#ifdef CONFIG_PAX_REFCOUNT
61009 +static inline void atomic_long_sub_unchecked(long i, atomic_long_unchecked_t *l)
61010 +{
61011 + atomic64_unchecked_t *v = (atomic64_unchecked_t *)l;
61012 +
61013 + atomic64_sub_unchecked(i, v);
61014 +}
61015 +#endif
61016 +
61017 static inline int atomic_long_sub_and_test(long i, atomic_long_t *l)
61018 {
61019 atomic64_t *v = (atomic64_t *)l;
61020 @@ -115,6 +175,15 @@ static inline long atomic_long_inc_return(atomic_long_t *l)
61021 return (long)atomic64_inc_return(v);
61022 }
61023
61024 +#ifdef CONFIG_PAX_REFCOUNT
61025 +static inline long atomic_long_inc_return_unchecked(atomic_long_unchecked_t *l)
61026 +{
61027 + atomic64_unchecked_t *v = (atomic64_unchecked_t *)l;
61028 +
61029 + return (long)atomic64_inc_return_unchecked(v);
61030 +}
61031 +#endif
61032 +
61033 static inline long atomic_long_dec_return(atomic_long_t *l)
61034 {
61035 atomic64_t *v = (atomic64_t *)l;
61036 @@ -140,6 +209,12 @@ static inline long atomic_long_add_unless(atomic_long_t *l, long a, long u)
61037
61038 typedef atomic_t atomic_long_t;
61039
61040 +#ifdef CONFIG_PAX_REFCOUNT
61041 +typedef atomic_unchecked_t atomic_long_unchecked_t;
61042 +#else
61043 +typedef atomic_t atomic_long_unchecked_t;
61044 +#endif
61045 +
61046 #define ATOMIC_LONG_INIT(i) ATOMIC_INIT(i)
61047 static inline long atomic_long_read(atomic_long_t *l)
61048 {
61049 @@ -148,6 +223,15 @@ static inline long atomic_long_read(atomic_long_t *l)
61050 return (long)atomic_read(v);
61051 }
61052
61053 +#ifdef CONFIG_PAX_REFCOUNT
61054 +static inline long atomic_long_read_unchecked(atomic_long_unchecked_t *l)
61055 +{
61056 + atomic_unchecked_t *v = (atomic_unchecked_t *)l;
61057 +
61058 + return (long)atomic_read_unchecked(v);
61059 +}
61060 +#endif
61061 +
61062 static inline void atomic_long_set(atomic_long_t *l, long i)
61063 {
61064 atomic_t *v = (atomic_t *)l;
61065 @@ -155,6 +239,15 @@ static inline void atomic_long_set(atomic_long_t *l, long i)
61066 atomic_set(v, i);
61067 }
61068
61069 +#ifdef CONFIG_PAX_REFCOUNT
61070 +static inline void atomic_long_set_unchecked(atomic_long_unchecked_t *l, long i)
61071 +{
61072 + atomic_unchecked_t *v = (atomic_unchecked_t *)l;
61073 +
61074 + atomic_set_unchecked(v, i);
61075 +}
61076 +#endif
61077 +
61078 static inline void atomic_long_inc(atomic_long_t *l)
61079 {
61080 atomic_t *v = (atomic_t *)l;
61081 @@ -162,6 +255,15 @@ static inline void atomic_long_inc(atomic_long_t *l)
61082 atomic_inc(v);
61083 }
61084
61085 +#ifdef CONFIG_PAX_REFCOUNT
61086 +static inline void atomic_long_inc_unchecked(atomic_long_unchecked_t *l)
61087 +{
61088 + atomic_unchecked_t *v = (atomic_unchecked_t *)l;
61089 +
61090 + atomic_inc_unchecked(v);
61091 +}
61092 +#endif
61093 +
61094 static inline void atomic_long_dec(atomic_long_t *l)
61095 {
61096 atomic_t *v = (atomic_t *)l;
61097 @@ -169,6 +271,15 @@ static inline void atomic_long_dec(atomic_long_t *l)
61098 atomic_dec(v);
61099 }
61100
61101 +#ifdef CONFIG_PAX_REFCOUNT
61102 +static inline void atomic_long_dec_unchecked(atomic_long_unchecked_t *l)
61103 +{
61104 + atomic_unchecked_t *v = (atomic_unchecked_t *)l;
61105 +
61106 + atomic_dec_unchecked(v);
61107 +}
61108 +#endif
61109 +
61110 static inline void atomic_long_add(long i, atomic_long_t *l)
61111 {
61112 atomic_t *v = (atomic_t *)l;
61113 @@ -176,6 +287,15 @@ static inline void atomic_long_add(long i, atomic_long_t *l)
61114 atomic_add(i, v);
61115 }
61116
61117 +#ifdef CONFIG_PAX_REFCOUNT
61118 +static inline void atomic_long_add_unchecked(long i, atomic_long_unchecked_t *l)
61119 +{
61120 + atomic_unchecked_t *v = (atomic_unchecked_t *)l;
61121 +
61122 + atomic_add_unchecked(i, v);
61123 +}
61124 +#endif
61125 +
61126 static inline void atomic_long_sub(long i, atomic_long_t *l)
61127 {
61128 atomic_t *v = (atomic_t *)l;
61129 @@ -183,6 +303,15 @@ static inline void atomic_long_sub(long i, atomic_long_t *l)
61130 atomic_sub(i, v);
61131 }
61132
61133 +#ifdef CONFIG_PAX_REFCOUNT
61134 +static inline void atomic_long_sub_unchecked(long i, atomic_long_unchecked_t *l)
61135 +{
61136 + atomic_unchecked_t *v = (atomic_unchecked_t *)l;
61137 +
61138 + atomic_sub_unchecked(i, v);
61139 +}
61140 +#endif
61141 +
61142 static inline int atomic_long_sub_and_test(long i, atomic_long_t *l)
61143 {
61144 atomic_t *v = (atomic_t *)l;
61145 @@ -232,6 +361,15 @@ static inline long atomic_long_inc_return(atomic_long_t *l)
61146 return (long)atomic_inc_return(v);
61147 }
61148
61149 +#ifdef CONFIG_PAX_REFCOUNT
61150 +static inline long atomic_long_inc_return_unchecked(atomic_long_unchecked_t *l)
61151 +{
61152 + atomic_unchecked_t *v = (atomic_unchecked_t *)l;
61153 +
61154 + return (long)atomic_inc_return_unchecked(v);
61155 +}
61156 +#endif
61157 +
61158 static inline long atomic_long_dec_return(atomic_long_t *l)
61159 {
61160 atomic_t *v = (atomic_t *)l;
61161 @@ -255,4 +393,55 @@ static inline long atomic_long_add_unless(atomic_long_t *l, long a, long u)
61162
61163 #endif /* BITS_PER_LONG == 64 */
61164
61165 +#ifdef CONFIG_PAX_REFCOUNT
61166 +static inline void pax_refcount_needs_these_functions(void)
61167 +{
61168 + atomic_read_unchecked((atomic_unchecked_t *)NULL);
61169 + atomic_set_unchecked((atomic_unchecked_t *)NULL, 0);
61170 + atomic_add_unchecked(0, (atomic_unchecked_t *)NULL);
61171 + atomic_sub_unchecked(0, (atomic_unchecked_t *)NULL);
61172 + atomic_inc_unchecked((atomic_unchecked_t *)NULL);
61173 + (void)atomic_inc_and_test_unchecked((atomic_unchecked_t *)NULL);
61174 + atomic_inc_return_unchecked((atomic_unchecked_t *)NULL);
61175 + atomic_add_return_unchecked(0, (atomic_unchecked_t *)NULL);
61176 + atomic_dec_unchecked((atomic_unchecked_t *)NULL);
61177 + atomic_cmpxchg_unchecked((atomic_unchecked_t *)NULL, 0, 0);
61178 + (void)atomic_xchg_unchecked((atomic_unchecked_t *)NULL, 0);
61179 +#ifdef CONFIG_X86
61180 + atomic_clear_mask_unchecked(0, NULL);
61181 + atomic_set_mask_unchecked(0, NULL);
61182 +#endif
61183 +
61184 + atomic_long_read_unchecked((atomic_long_unchecked_t *)NULL);
61185 + atomic_long_set_unchecked((atomic_long_unchecked_t *)NULL, 0);
61186 + atomic_long_add_unchecked(0, (atomic_long_unchecked_t *)NULL);
61187 + atomic_long_sub_unchecked(0, (atomic_long_unchecked_t *)NULL);
61188 + atomic_long_inc_unchecked((atomic_long_unchecked_t *)NULL);
61189 + atomic_long_inc_return_unchecked((atomic_long_unchecked_t *)NULL);
61190 + atomic_long_dec_unchecked((atomic_long_unchecked_t *)NULL);
61191 +}
61192 +#else
61193 +#define atomic_read_unchecked(v) atomic_read(v)
61194 +#define atomic_set_unchecked(v, i) atomic_set((v), (i))
61195 +#define atomic_add_unchecked(i, v) atomic_add((i), (v))
61196 +#define atomic_sub_unchecked(i, v) atomic_sub((i), (v))
61197 +#define atomic_inc_unchecked(v) atomic_inc(v)
61198 +#define atomic_inc_and_test_unchecked(v) atomic_inc_and_test(v)
61199 +#define atomic_inc_return_unchecked(v) atomic_inc_return(v)
61200 +#define atomic_add_return_unchecked(i, v) atomic_add_return((i), (v))
61201 +#define atomic_dec_unchecked(v) atomic_dec(v)
61202 +#define atomic_cmpxchg_unchecked(v, o, n) atomic_cmpxchg((v), (o), (n))
61203 +#define atomic_xchg_unchecked(v, i) atomic_xchg((v), (i))
61204 +#define atomic_clear_mask_unchecked(mask, v) atomic_clear_mask((mask), (v))
61205 +#define atomic_set_mask_unchecked(mask, v) atomic_set_mask((mask), (v))
61206 +
61207 +#define atomic_long_read_unchecked(v) atomic_long_read(v)
61208 +#define atomic_long_set_unchecked(v, i) atomic_long_set((v), (i))
61209 +#define atomic_long_add_unchecked(i, v) atomic_long_add((i), (v))
61210 +#define atomic_long_sub_unchecked(i, v) atomic_long_sub((i), (v))
61211 +#define atomic_long_inc_unchecked(v) atomic_long_inc(v)
61212 +#define atomic_long_inc_return_unchecked(v) atomic_long_inc_return(v)
61213 +#define atomic_long_dec_unchecked(v) atomic_long_dec(v)
61214 +#endif
61215 +
61216 #endif /* _ASM_GENERIC_ATOMIC_LONG_H */
61217 diff --git a/include/asm-generic/atomic.h b/include/asm-generic/atomic.h
61218 index 1ced641..c896ee8 100644
61219 --- a/include/asm-generic/atomic.h
61220 +++ b/include/asm-generic/atomic.h
61221 @@ -159,7 +159,7 @@ static inline int __atomic_add_unless(atomic_t *v, int a, int u)
61222 * Atomically clears the bits set in @mask from @v
61223 */
61224 #ifndef atomic_clear_mask
61225 -static inline void atomic_clear_mask(unsigned long mask, atomic_t *v)
61226 +static inline void atomic_clear_mask(unsigned int mask, atomic_t *v)
61227 {
61228 unsigned long flags;
61229
61230 diff --git a/include/asm-generic/atomic64.h b/include/asm-generic/atomic64.h
61231 index b18ce4f..2ee2843 100644
61232 --- a/include/asm-generic/atomic64.h
61233 +++ b/include/asm-generic/atomic64.h
61234 @@ -16,6 +16,8 @@ typedef struct {
61235 long long counter;
61236 } atomic64_t;
61237
61238 +typedef atomic64_t atomic64_unchecked_t;
61239 +
61240 #define ATOMIC64_INIT(i) { (i) }
61241
61242 extern long long atomic64_read(const atomic64_t *v);
61243 @@ -39,4 +41,14 @@ extern int atomic64_add_unless(atomic64_t *v, long long a, long long u);
61244 #define atomic64_dec_and_test(v) (atomic64_dec_return((v)) == 0)
61245 #define atomic64_inc_not_zero(v) atomic64_add_unless((v), 1LL, 0LL)
61246
61247 +#define atomic64_read_unchecked(v) atomic64_read(v)
61248 +#define atomic64_set_unchecked(v, i) atomic64_set((v), (i))
61249 +#define atomic64_add_unchecked(a, v) atomic64_add((a), (v))
61250 +#define atomic64_add_return_unchecked(a, v) atomic64_add_return((a), (v))
61251 +#define atomic64_sub_unchecked(a, v) atomic64_sub((a), (v))
61252 +#define atomic64_inc_unchecked(v) atomic64_inc(v)
61253 +#define atomic64_inc_return_unchecked(v) atomic64_inc_return(v)
61254 +#define atomic64_dec_unchecked(v) atomic64_dec(v)
61255 +#define atomic64_cmpxchg_unchecked(v, o, n) atomic64_cmpxchg((v), (o), (n))
61256 +
61257 #endif /* _ASM_GENERIC_ATOMIC64_H */
61258 diff --git a/include/asm-generic/cache.h b/include/asm-generic/cache.h
61259 index 1bfcfe5..e04c5c9 100644
61260 --- a/include/asm-generic/cache.h
61261 +++ b/include/asm-generic/cache.h
61262 @@ -6,7 +6,7 @@
61263 * cache lines need to provide their own cache.h.
61264 */
61265
61266 -#define L1_CACHE_SHIFT 5
61267 -#define L1_CACHE_BYTES (1 << L1_CACHE_SHIFT)
61268 +#define L1_CACHE_SHIFT 5UL
61269 +#define L1_CACHE_BYTES (1UL << L1_CACHE_SHIFT)
61270
61271 #endif /* __ASM_GENERIC_CACHE_H */
61272 diff --git a/include/asm-generic/emergency-restart.h b/include/asm-generic/emergency-restart.h
61273 index 0d68a1e..b74a761 100644
61274 --- a/include/asm-generic/emergency-restart.h
61275 +++ b/include/asm-generic/emergency-restart.h
61276 @@ -1,7 +1,7 @@
61277 #ifndef _ASM_GENERIC_EMERGENCY_RESTART_H
61278 #define _ASM_GENERIC_EMERGENCY_RESTART_H
61279
61280 -static inline void machine_emergency_restart(void)
61281 +static inline __noreturn void machine_emergency_restart(void)
61282 {
61283 machine_restart(NULL);
61284 }
61285 diff --git a/include/asm-generic/kmap_types.h b/include/asm-generic/kmap_types.h
61286 index 90f99c7..00ce236 100644
61287 --- a/include/asm-generic/kmap_types.h
61288 +++ b/include/asm-generic/kmap_types.h
61289 @@ -2,9 +2,9 @@
61290 #define _ASM_GENERIC_KMAP_TYPES_H
61291
61292 #ifdef __WITH_KM_FENCE
61293 -# define KM_TYPE_NR 41
61294 +# define KM_TYPE_NR 42
61295 #else
61296 -# define KM_TYPE_NR 20
61297 +# define KM_TYPE_NR 21
61298 #endif
61299
61300 #endif
61301 diff --git a/include/asm-generic/local.h b/include/asm-generic/local.h
61302 index 9ceb03b..2efbcbd 100644
61303 --- a/include/asm-generic/local.h
61304 +++ b/include/asm-generic/local.h
61305 @@ -39,6 +39,7 @@ typedef struct
61306 #define local_add_return(i, l) atomic_long_add_return((i), (&(l)->a))
61307 #define local_sub_return(i, l) atomic_long_sub_return((i), (&(l)->a))
61308 #define local_inc_return(l) atomic_long_inc_return(&(l)->a)
61309 +#define local_dec_return(l) atomic_long_dec_return(&(l)->a)
61310
61311 #define local_cmpxchg(l, o, n) atomic_long_cmpxchg((&(l)->a), (o), (n))
61312 #define local_xchg(l, n) atomic_long_xchg((&(l)->a), (n))
61313 diff --git a/include/asm-generic/pgtable-nopmd.h b/include/asm-generic/pgtable-nopmd.h
61314 index 725612b..9cc513a 100644
61315 --- a/include/asm-generic/pgtable-nopmd.h
61316 +++ b/include/asm-generic/pgtable-nopmd.h
61317 @@ -1,14 +1,19 @@
61318 #ifndef _PGTABLE_NOPMD_H
61319 #define _PGTABLE_NOPMD_H
61320
61321 -#ifndef __ASSEMBLY__
61322 -
61323 #include <asm-generic/pgtable-nopud.h>
61324
61325 -struct mm_struct;
61326 -
61327 #define __PAGETABLE_PMD_FOLDED
61328
61329 +#define PMD_SHIFT PUD_SHIFT
61330 +#define PTRS_PER_PMD 1
61331 +#define PMD_SIZE (_AC(1,UL) << PMD_SHIFT)
61332 +#define PMD_MASK (~(PMD_SIZE-1))
61333 +
61334 +#ifndef __ASSEMBLY__
61335 +
61336 +struct mm_struct;
61337 +
61338 /*
61339 * Having the pmd type consist of a pud gets the size right, and allows
61340 * us to conceptually access the pud entry that this pmd is folded into
61341 @@ -16,11 +21,6 @@ struct mm_struct;
61342 */
61343 typedef struct { pud_t pud; } pmd_t;
61344
61345 -#define PMD_SHIFT PUD_SHIFT
61346 -#define PTRS_PER_PMD 1
61347 -#define PMD_SIZE (1UL << PMD_SHIFT)
61348 -#define PMD_MASK (~(PMD_SIZE-1))
61349 -
61350 /*
61351 * The "pud_xxx()" functions here are trivial for a folded two-level
61352 * setup: the pmd is never bad, and a pmd always exists (as it's folded
61353 diff --git a/include/asm-generic/pgtable-nopud.h b/include/asm-generic/pgtable-nopud.h
61354 index 810431d..0ec4804f 100644
61355 --- a/include/asm-generic/pgtable-nopud.h
61356 +++ b/include/asm-generic/pgtable-nopud.h
61357 @@ -1,10 +1,15 @@
61358 #ifndef _PGTABLE_NOPUD_H
61359 #define _PGTABLE_NOPUD_H
61360
61361 -#ifndef __ASSEMBLY__
61362 -
61363 #define __PAGETABLE_PUD_FOLDED
61364
61365 +#define PUD_SHIFT PGDIR_SHIFT
61366 +#define PTRS_PER_PUD 1
61367 +#define PUD_SIZE (_AC(1,UL) << PUD_SHIFT)
61368 +#define PUD_MASK (~(PUD_SIZE-1))
61369 +
61370 +#ifndef __ASSEMBLY__
61371 +
61372 /*
61373 * Having the pud type consist of a pgd gets the size right, and allows
61374 * us to conceptually access the pgd entry that this pud is folded into
61375 @@ -12,11 +17,6 @@
61376 */
61377 typedef struct { pgd_t pgd; } pud_t;
61378
61379 -#define PUD_SHIFT PGDIR_SHIFT
61380 -#define PTRS_PER_PUD 1
61381 -#define PUD_SIZE (1UL << PUD_SHIFT)
61382 -#define PUD_MASK (~(PUD_SIZE-1))
61383 -
61384 /*
61385 * The "pgd_xxx()" functions here are trivial for a folded two-level
61386 * setup: the pud is never bad, and a pud always exists (as it's folded
61387 @@ -29,6 +29,7 @@ static inline void pgd_clear(pgd_t *pgd) { }
61388 #define pud_ERROR(pud) (pgd_ERROR((pud).pgd))
61389
61390 #define pgd_populate(mm, pgd, pud) do { } while (0)
61391 +#define pgd_populate_kernel(mm, pgd, pud) do { } while (0)
61392 /*
61393 * (puds are folded into pgds so this doesn't get actually called,
61394 * but the define is needed for a generic inline function.)
61395 diff --git a/include/asm-generic/pgtable.h b/include/asm-generic/pgtable.h
61396 index ff4947b..f48183f 100644
61397 --- a/include/asm-generic/pgtable.h
61398 +++ b/include/asm-generic/pgtable.h
61399 @@ -530,6 +530,14 @@ static inline int pmd_trans_unstable(pmd_t *pmd)
61400 #endif
61401 }
61402
61403 +#ifndef __HAVE_ARCH_PAX_OPEN_KERNEL
61404 +static inline unsigned long pax_open_kernel(void) { return 0; }
61405 +#endif
61406 +
61407 +#ifndef __HAVE_ARCH_PAX_CLOSE_KERNEL
61408 +static inline unsigned long pax_close_kernel(void) { return 0; }
61409 +#endif
61410 +
61411 #endif /* CONFIG_MMU */
61412
61413 #endif /* !__ASSEMBLY__ */
61414 diff --git a/include/asm-generic/vmlinux.lds.h b/include/asm-generic/vmlinux.lds.h
61415 index 4e2e1cc..12c266b 100644
61416 --- a/include/asm-generic/vmlinux.lds.h
61417 +++ b/include/asm-generic/vmlinux.lds.h
61418 @@ -218,6 +218,7 @@
61419 .rodata : AT(ADDR(.rodata) - LOAD_OFFSET) { \
61420 VMLINUX_SYMBOL(__start_rodata) = .; \
61421 *(.rodata) *(.rodata.*) \
61422 + *(.data..read_only) \
61423 *(__vermagic) /* Kernel version magic */ \
61424 . = ALIGN(8); \
61425 VMLINUX_SYMBOL(__start___tracepoints_ptrs) = .; \
61426 @@ -716,17 +717,18 @@
61427 * section in the linker script will go there too. @phdr should have
61428 * a leading colon.
61429 *
61430 - * Note that this macros defines __per_cpu_load as an absolute symbol.
61431 + * Note that this macros defines per_cpu_load as an absolute symbol.
61432 * If there is no need to put the percpu section at a predetermined
61433 * address, use PERCPU_SECTION.
61434 */
61435 #define PERCPU_VADDR(cacheline, vaddr, phdr) \
61436 - VMLINUX_SYMBOL(__per_cpu_load) = .; \
61437 - .data..percpu vaddr : AT(VMLINUX_SYMBOL(__per_cpu_load) \
61438 + per_cpu_load = .; \
61439 + .data..percpu vaddr : AT(VMLINUX_SYMBOL(per_cpu_load) \
61440 - LOAD_OFFSET) { \
61441 + VMLINUX_SYMBOL(__per_cpu_load) = . + per_cpu_load; \
61442 PERCPU_INPUT(cacheline) \
61443 } phdr \
61444 - . = VMLINUX_SYMBOL(__per_cpu_load) + SIZEOF(.data..percpu);
61445 + . = VMLINUX_SYMBOL(per_cpu_load) + SIZEOF(.data..percpu);
61446
61447 /**
61448 * PERCPU_SECTION - define output section for percpu area, simple version
61449 diff --git a/include/drm/drmP.h b/include/drm/drmP.h
61450 index d6b67bb..a272c29 100644
61451 --- a/include/drm/drmP.h
61452 +++ b/include/drm/drmP.h
61453 @@ -72,6 +72,7 @@
61454 #include <linux/workqueue.h>
61455 #include <linux/poll.h>
61456 #include <asm/pgalloc.h>
61457 +#include <asm/local.h>
61458 #include "drm.h"
61459
61460 #include <linux/idr.h>
61461 @@ -1067,7 +1068,7 @@ struct drm_device {
61462
61463 /** \name Usage Counters */
61464 /*@{ */
61465 - int open_count; /**< Outstanding files open */
61466 + local_t open_count; /**< Outstanding files open */
61467 atomic_t ioctl_count; /**< Outstanding IOCTLs pending */
61468 atomic_t vma_count; /**< Outstanding vma areas open */
61469 int buf_use; /**< Buffers in use -- cannot alloc */
61470 @@ -1078,7 +1079,7 @@ struct drm_device {
61471 /*@{ */
61472 unsigned long counters;
61473 enum drm_stat_type types[15];
61474 - atomic_t counts[15];
61475 + atomic_unchecked_t counts[15];
61476 /*@} */
61477
61478 struct list_head filelist;
61479 diff --git a/include/drm/drm_crtc_helper.h b/include/drm/drm_crtc_helper.h
61480 index e01cc80..319855d 100644
61481 --- a/include/drm/drm_crtc_helper.h
61482 +++ b/include/drm/drm_crtc_helper.h
61483 @@ -81,7 +81,7 @@ struct drm_crtc_helper_funcs {
61484
61485 /* disable crtc when not in use - more explicit than dpms off */
61486 void (*disable)(struct drm_crtc *crtc);
61487 -};
61488 +} __no_const;
61489
61490 /**
61491 * drm_encoder_helper_funcs - helper operations for encoders
61492 @@ -109,7 +109,7 @@ struct drm_encoder_helper_funcs {
61493 struct drm_connector *connector);
61494 /* disable encoder when not in use - more explicit than dpms off */
61495 void (*disable)(struct drm_encoder *encoder);
61496 -};
61497 +} __no_const;
61498
61499 /**
61500 * drm_connector_helper_funcs - helper operations for connectors
61501 diff --git a/include/drm/ttm/ttm_memory.h b/include/drm/ttm/ttm_memory.h
61502 index d6d1da4..fdd1ac5 100644
61503 --- a/include/drm/ttm/ttm_memory.h
61504 +++ b/include/drm/ttm/ttm_memory.h
61505 @@ -48,7 +48,7 @@
61506
61507 struct ttm_mem_shrink {
61508 int (*do_shrink) (struct ttm_mem_shrink *);
61509 -};
61510 +} __no_const;
61511
61512 /**
61513 * struct ttm_mem_global - Global memory accounting structure.
61514 diff --git a/include/linux/a.out.h b/include/linux/a.out.h
61515 index e86dfca..40cc55f 100644
61516 --- a/include/linux/a.out.h
61517 +++ b/include/linux/a.out.h
61518 @@ -39,6 +39,14 @@ enum machine_type {
61519 M_MIPS2 = 152 /* MIPS R6000/R4000 binary */
61520 };
61521
61522 +/* Constants for the N_FLAGS field */
61523 +#define F_PAX_PAGEEXEC 1 /* Paging based non-executable pages */
61524 +#define F_PAX_EMUTRAMP 2 /* Emulate trampolines */
61525 +#define F_PAX_MPROTECT 4 /* Restrict mprotect() */
61526 +#define F_PAX_RANDMMAP 8 /* Randomize mmap() base */
61527 +/*#define F_PAX_RANDEXEC 16*/ /* Randomize ET_EXEC base */
61528 +#define F_PAX_SEGMEXEC 32 /* Segmentation based non-executable pages */
61529 +
61530 #if !defined (N_MAGIC)
61531 #define N_MAGIC(exec) ((exec).a_info & 0xffff)
61532 #endif
61533 diff --git a/include/linux/atmdev.h b/include/linux/atmdev.h
61534 index 06fd4bb..1caec0d 100644
61535 --- a/include/linux/atmdev.h
61536 +++ b/include/linux/atmdev.h
61537 @@ -237,7 +237,7 @@ struct compat_atm_iobuf {
61538 #endif
61539
61540 struct k_atm_aal_stats {
61541 -#define __HANDLE_ITEM(i) atomic_t i
61542 +#define __HANDLE_ITEM(i) atomic_unchecked_t i
61543 __AAL_STAT_ITEMS
61544 #undef __HANDLE_ITEM
61545 };
61546 diff --git a/include/linux/binfmts.h b/include/linux/binfmts.h
61547 index 366422b..1fa7f84 100644
61548 --- a/include/linux/binfmts.h
61549 +++ b/include/linux/binfmts.h
61550 @@ -89,6 +89,7 @@ struct linux_binfmt {
61551 int (*load_binary)(struct linux_binprm *, struct pt_regs * regs);
61552 int (*load_shlib)(struct file *);
61553 int (*core_dump)(struct coredump_params *cprm);
61554 + void (*handle_mprotect)(struct vm_area_struct *vma, unsigned long newflags);
61555 unsigned long min_coredump; /* minimal dump size */
61556 };
61557
61558 diff --git a/include/linux/blkdev.h b/include/linux/blkdev.h
61559 index 4a2ab7c..a2de7a8 100644
61560 --- a/include/linux/blkdev.h
61561 +++ b/include/linux/blkdev.h
61562 @@ -1420,7 +1420,7 @@ struct block_device_operations {
61563 /* this callback is with swap_lock and sometimes page table lock held */
61564 void (*swap_slot_free_notify) (struct block_device *, unsigned long);
61565 struct module *owner;
61566 -};
61567 +} __do_const;
61568
61569 extern int __blkdev_driver_ioctl(struct block_device *, fmode_t, unsigned int,
61570 unsigned long);
61571 diff --git a/include/linux/blktrace_api.h b/include/linux/blktrace_api.h
61572 index 4d1a074..88f929a 100644
61573 --- a/include/linux/blktrace_api.h
61574 +++ b/include/linux/blktrace_api.h
61575 @@ -162,7 +162,7 @@ struct blk_trace {
61576 struct dentry *dir;
61577 struct dentry *dropped_file;
61578 struct dentry *msg_file;
61579 - atomic_t dropped;
61580 + atomic_unchecked_t dropped;
61581 };
61582
61583 extern int blk_trace_ioctl(struct block_device *, unsigned, char __user *);
61584 diff --git a/include/linux/byteorder/little_endian.h b/include/linux/byteorder/little_endian.h
61585 index 83195fb..0b0f77d 100644
61586 --- a/include/linux/byteorder/little_endian.h
61587 +++ b/include/linux/byteorder/little_endian.h
61588 @@ -42,51 +42,51 @@
61589
61590 static inline __le64 __cpu_to_le64p(const __u64 *p)
61591 {
61592 - return (__force __le64)*p;
61593 + return (__force const __le64)*p;
61594 }
61595 static inline __u64 __le64_to_cpup(const __le64 *p)
61596 {
61597 - return (__force __u64)*p;
61598 + return (__force const __u64)*p;
61599 }
61600 static inline __le32 __cpu_to_le32p(const __u32 *p)
61601 {
61602 - return (__force __le32)*p;
61603 + return (__force const __le32)*p;
61604 }
61605 static inline __u32 __le32_to_cpup(const __le32 *p)
61606 {
61607 - return (__force __u32)*p;
61608 + return (__force const __u32)*p;
61609 }
61610 static inline __le16 __cpu_to_le16p(const __u16 *p)
61611 {
61612 - return (__force __le16)*p;
61613 + return (__force const __le16)*p;
61614 }
61615 static inline __u16 __le16_to_cpup(const __le16 *p)
61616 {
61617 - return (__force __u16)*p;
61618 + return (__force const __u16)*p;
61619 }
61620 static inline __be64 __cpu_to_be64p(const __u64 *p)
61621 {
61622 - return (__force __be64)__swab64p(p);
61623 + return (__force const __be64)__swab64p(p);
61624 }
61625 static inline __u64 __be64_to_cpup(const __be64 *p)
61626 {
61627 - return __swab64p((__u64 *)p);
61628 + return __swab64p((const __u64 *)p);
61629 }
61630 static inline __be32 __cpu_to_be32p(const __u32 *p)
61631 {
61632 - return (__force __be32)__swab32p(p);
61633 + return (__force const __be32)__swab32p(p);
61634 }
61635 static inline __u32 __be32_to_cpup(const __be32 *p)
61636 {
61637 - return __swab32p((__u32 *)p);
61638 + return __swab32p((const __u32 *)p);
61639 }
61640 static inline __be16 __cpu_to_be16p(const __u16 *p)
61641 {
61642 - return (__force __be16)__swab16p(p);
61643 + return (__force const __be16)__swab16p(p);
61644 }
61645 static inline __u16 __be16_to_cpup(const __be16 *p)
61646 {
61647 - return __swab16p((__u16 *)p);
61648 + return __swab16p((const __u16 *)p);
61649 }
61650 #define __cpu_to_le64s(x) do { (void)(x); } while (0)
61651 #define __le64_to_cpus(x) do { (void)(x); } while (0)
61652 diff --git a/include/linux/cache.h b/include/linux/cache.h
61653 index 4c57065..4307975 100644
61654 --- a/include/linux/cache.h
61655 +++ b/include/linux/cache.h
61656 @@ -16,6 +16,10 @@
61657 #define __read_mostly
61658 #endif
61659
61660 +#ifndef __read_only
61661 +#define __read_only __read_mostly
61662 +#endif
61663 +
61664 #ifndef ____cacheline_aligned
61665 #define ____cacheline_aligned __attribute__((__aligned__(SMP_CACHE_BYTES)))
61666 #endif
61667 diff --git a/include/linux/capability.h b/include/linux/capability.h
61668 index d10b7ed..0288b79 100644
61669 --- a/include/linux/capability.h
61670 +++ b/include/linux/capability.h
61671 @@ -553,10 +553,15 @@ extern bool capable(int cap);
61672 extern bool ns_capable(struct user_namespace *ns, int cap);
61673 extern bool nsown_capable(int cap);
61674 extern bool inode_capable(const struct inode *inode, int cap);
61675 +extern bool capable_nolog(int cap);
61676 +extern bool ns_capable_nolog(struct user_namespace *ns, int cap);
61677 +extern bool inode_capable_nolog(const struct inode *inode, int cap);
61678
61679 /* audit system wants to get cap info from files as well */
61680 extern int get_vfs_caps_from_disk(const struct dentry *dentry, struct cpu_vfs_cap_data *cpu_caps);
61681
61682 +extern int is_privileged_binary(const struct dentry *dentry);
61683 +
61684 #endif /* __KERNEL__ */
61685
61686 #endif /* !_LINUX_CAPABILITY_H */
61687 diff --git a/include/linux/cleancache.h b/include/linux/cleancache.h
61688 index 42e55de..1cd0e66 100644
61689 --- a/include/linux/cleancache.h
61690 +++ b/include/linux/cleancache.h
61691 @@ -31,7 +31,7 @@ struct cleancache_ops {
61692 void (*invalidate_page)(int, struct cleancache_filekey, pgoff_t);
61693 void (*invalidate_inode)(int, struct cleancache_filekey);
61694 void (*invalidate_fs)(int);
61695 -};
61696 +} __no_const;
61697
61698 extern struct cleancache_ops
61699 cleancache_register_ops(struct cleancache_ops *ops);
61700 diff --git a/include/linux/clk-provider.h b/include/linux/clk-provider.h
61701 index 77335fa..6cbe7dd 100644
61702 --- a/include/linux/clk-provider.h
61703 +++ b/include/linux/clk-provider.h
61704 @@ -111,6 +111,7 @@ struct clk_ops {
61705 unsigned long);
61706 void (*init)(struct clk_hw *hw);
61707 };
61708 +typedef struct clk_ops __no_const clk_ops_no_const;
61709
61710 /**
61711 * struct clk_init_data - holds init data that's common to all clocks and is
61712 diff --git a/include/linux/compiler-gcc4.h b/include/linux/compiler-gcc4.h
61713 index 934bc34..1b47129 100644
61714 --- a/include/linux/compiler-gcc4.h
61715 +++ b/include/linux/compiler-gcc4.h
61716 @@ -32,6 +32,21 @@
61717 #define __linktime_error(message) __attribute__((__error__(message)))
61718
61719 #if __GNUC_MINOR__ >= 5
61720 +
61721 +#ifdef CONSTIFY_PLUGIN
61722 +#define __no_const __attribute__((no_const))
61723 +#define __do_const __attribute__((do_const))
61724 +#endif
61725 +
61726 +#ifdef SIZE_OVERFLOW_PLUGIN
61727 +#define __size_overflow(...) __attribute__((size_overflow(__VA_ARGS__)))
61728 +#define __intentional_overflow(...) __attribute__((intentional_overflow(__VA_ARGS__)))
61729 +#endif
61730 +
61731 +#ifdef LATENT_ENTROPY_PLUGIN
61732 +#define __latent_entropy __attribute__((latent_entropy))
61733 +#endif
61734 +
61735 /*
61736 * Mark a position in code as unreachable. This can be used to
61737 * suppress control flow warnings after asm blocks that transfer
61738 @@ -47,6 +62,11 @@
61739 #define __noclone __attribute__((__noclone__))
61740
61741 #endif
61742 +
61743 +#define __alloc_size(...) __attribute((alloc_size(__VA_ARGS__)))
61744 +#define __bos(ptr, arg) __builtin_object_size((ptr), (arg))
61745 +#define __bos0(ptr) __bos((ptr), 0)
61746 +#define __bos1(ptr) __bos((ptr), 1)
61747 #endif
61748
61749 #if __GNUC_MINOR__ >= 6
61750 diff --git a/include/linux/compiler.h b/include/linux/compiler.h
61751 index f430e41..38be90f 100644
61752 --- a/include/linux/compiler.h
61753 +++ b/include/linux/compiler.h
61754 @@ -5,31 +5,62 @@
61755
61756 #ifdef __CHECKER__
61757 # define __user __attribute__((noderef, address_space(1)))
61758 +# define __force_user __force __user
61759 # define __kernel __attribute__((address_space(0)))
61760 +# define __force_kernel __force __kernel
61761 # define __safe __attribute__((safe))
61762 # define __force __attribute__((force))
61763 # define __nocast __attribute__((nocast))
61764 # define __iomem __attribute__((noderef, address_space(2)))
61765 +# define __force_iomem __force __iomem
61766 # define __acquires(x) __attribute__((context(x,0,1)))
61767 # define __releases(x) __attribute__((context(x,1,0)))
61768 # define __acquire(x) __context__(x,1)
61769 # define __release(x) __context__(x,-1)
61770 # define __cond_lock(x,c) ((c) ? ({ __acquire(x); 1; }) : 0)
61771 # define __percpu __attribute__((noderef, address_space(3)))
61772 +# define __force_percpu __force __percpu
61773 #ifdef CONFIG_SPARSE_RCU_POINTER
61774 # define __rcu __attribute__((noderef, address_space(4)))
61775 +# define __force_rcu __force __rcu
61776 #else
61777 # define __rcu
61778 +# define __force_rcu
61779 #endif
61780 extern void __chk_user_ptr(const volatile void __user *);
61781 extern void __chk_io_ptr(const volatile void __iomem *);
61782 +#elif defined(CHECKER_PLUGIN)
61783 +//# define __user
61784 +//# define __force_user
61785 +//# define __kernel
61786 +//# define __force_kernel
61787 +# define __safe
61788 +# define __force
61789 +# define __nocast
61790 +# define __iomem
61791 +# define __force_iomem
61792 +# define __chk_user_ptr(x) (void)0
61793 +# define __chk_io_ptr(x) (void)0
61794 +# define __builtin_warning(x, y...) (1)
61795 +# define __acquires(x)
61796 +# define __releases(x)
61797 +# define __acquire(x) (void)0
61798 +# define __release(x) (void)0
61799 +# define __cond_lock(x,c) (c)
61800 +# define __percpu
61801 +# define __force_percpu
61802 +# define __rcu
61803 +# define __force_rcu
61804 #else
61805 # define __user
61806 +# define __force_user
61807 # define __kernel
61808 +# define __force_kernel
61809 # define __safe
61810 # define __force
61811 # define __nocast
61812 # define __iomem
61813 +# define __force_iomem
61814 # define __chk_user_ptr(x) (void)0
61815 # define __chk_io_ptr(x) (void)0
61816 # define __builtin_warning(x, y...) (1)
61817 @@ -39,7 +70,9 @@ extern void __chk_io_ptr(const volatile void __iomem *);
61818 # define __release(x) (void)0
61819 # define __cond_lock(x,c) (c)
61820 # define __percpu
61821 +# define __force_percpu
61822 # define __rcu
61823 +# define __force_rcu
61824 #endif
61825
61826 #ifdef __KERNEL__
61827 @@ -264,6 +297,26 @@ void ftrace_likely_update(struct ftrace_branch_data *f, int val, int expect);
61828 # define __attribute_const__ /* unimplemented */
61829 #endif
61830
61831 +#ifndef __no_const
61832 +# define __no_const
61833 +#endif
61834 +
61835 +#ifndef __do_const
61836 +# define __do_const
61837 +#endif
61838 +
61839 +#ifndef __size_overflow
61840 +# define __size_overflow(...)
61841 +#endif
61842 +
61843 +#ifndef __intentional_overflow
61844 +# define __intentional_overflow(...)
61845 +#endif
61846 +
61847 +#ifndef __latent_entropy
61848 +# define __latent_entropy
61849 +#endif
61850 +
61851 /*
61852 * Tell gcc if a function is cold. The compiler will assume any path
61853 * directly leading to the call is unlikely.
61854 @@ -273,6 +326,22 @@ void ftrace_likely_update(struct ftrace_branch_data *f, int val, int expect);
61855 #define __cold
61856 #endif
61857
61858 +#ifndef __alloc_size
61859 +#define __alloc_size(...)
61860 +#endif
61861 +
61862 +#ifndef __bos
61863 +#define __bos(ptr, arg)
61864 +#endif
61865 +
61866 +#ifndef __bos0
61867 +#define __bos0(ptr)
61868 +#endif
61869 +
61870 +#ifndef __bos1
61871 +#define __bos1(ptr)
61872 +#endif
61873 +
61874 /* Simple shorthand for a section definition */
61875 #ifndef __section
61876 # define __section(S) __attribute__ ((__section__(#S)))
61877 @@ -312,6 +381,7 @@ void ftrace_likely_update(struct ftrace_branch_data *f, int val, int expect);
61878 * use is to mediate communication between process-level code and irq/NMI
61879 * handlers, all running on the same CPU.
61880 */
61881 -#define ACCESS_ONCE(x) (*(volatile typeof(x) *)&(x))
61882 +#define ACCESS_ONCE(x) (*(volatile const typeof(x) *)&(x))
61883 +#define ACCESS_ONCE_RW(x) (*(volatile typeof(x) *)&(x))
61884
61885 #endif /* __LINUX_COMPILER_H */
61886 diff --git a/include/linux/cred.h b/include/linux/cred.h
61887 index ebbed2c..908cc2c 100644
61888 --- a/include/linux/cred.h
61889 +++ b/include/linux/cred.h
61890 @@ -208,6 +208,9 @@ static inline void validate_creds_for_do_exit(struct task_struct *tsk)
61891 static inline void validate_process_creds(void)
61892 {
61893 }
61894 +static inline void validate_task_creds(struct task_struct *task)
61895 +{
61896 +}
61897 #endif
61898
61899 /**
61900 diff --git a/include/linux/crypto.h b/include/linux/crypto.h
61901 index b92eadf..b4ecdc1 100644
61902 --- a/include/linux/crypto.h
61903 +++ b/include/linux/crypto.h
61904 @@ -373,7 +373,7 @@ struct cipher_tfm {
61905 const u8 *key, unsigned int keylen);
61906 void (*cit_encrypt_one)(struct crypto_tfm *tfm, u8 *dst, const u8 *src);
61907 void (*cit_decrypt_one)(struct crypto_tfm *tfm, u8 *dst, const u8 *src);
61908 -};
61909 +} __no_const;
61910
61911 struct hash_tfm {
61912 int (*init)(struct hash_desc *desc);
61913 @@ -394,13 +394,13 @@ struct compress_tfm {
61914 int (*cot_decompress)(struct crypto_tfm *tfm,
61915 const u8 *src, unsigned int slen,
61916 u8 *dst, unsigned int *dlen);
61917 -};
61918 +} __no_const;
61919
61920 struct rng_tfm {
61921 int (*rng_gen_random)(struct crypto_rng *tfm, u8 *rdata,
61922 unsigned int dlen);
61923 int (*rng_reset)(struct crypto_rng *tfm, u8 *seed, unsigned int slen);
61924 -};
61925 +} __no_const;
61926
61927 #define crt_ablkcipher crt_u.ablkcipher
61928 #define crt_aead crt_u.aead
61929 diff --git a/include/linux/decompress/mm.h b/include/linux/decompress/mm.h
61930 index 7925bf0..d5143d2 100644
61931 --- a/include/linux/decompress/mm.h
61932 +++ b/include/linux/decompress/mm.h
61933 @@ -77,7 +77,7 @@ static void free(void *where)
61934 * warnings when not needed (indeed large_malloc / large_free are not
61935 * needed by inflate */
61936
61937 -#define malloc(a) kmalloc(a, GFP_KERNEL)
61938 +#define malloc(a) kmalloc((a), GFP_KERNEL)
61939 #define free(a) kfree(a)
61940
61941 #define large_malloc(a) vmalloc(a)
61942 diff --git a/include/linux/dma-mapping.h b/include/linux/dma-mapping.h
61943 index 94af418..b1ca7a2 100644
61944 --- a/include/linux/dma-mapping.h
61945 +++ b/include/linux/dma-mapping.h
61946 @@ -54,7 +54,7 @@ struct dma_map_ops {
61947 u64 (*get_required_mask)(struct device *dev);
61948 #endif
61949 int is_phys;
61950 -};
61951 +} __do_const;
61952
61953 #define DMA_BIT_MASK(n) (((n) == 64) ? ~0ULL : ((1ULL<<(n))-1))
61954
61955 diff --git a/include/linux/dmaengine.h b/include/linux/dmaengine.h
61956 index 9c02a45..89fdd73 100644
61957 --- a/include/linux/dmaengine.h
61958 +++ b/include/linux/dmaengine.h
61959 @@ -1017,9 +1017,9 @@ struct dma_pinned_list {
61960 struct dma_pinned_list *dma_pin_iovec_pages(struct iovec *iov, size_t len);
61961 void dma_unpin_iovec_pages(struct dma_pinned_list* pinned_list);
61962
61963 -dma_cookie_t dma_memcpy_to_iovec(struct dma_chan *chan, struct iovec *iov,
61964 +dma_cookie_t __intentional_overflow(0) dma_memcpy_to_iovec(struct dma_chan *chan, struct iovec *iov,
61965 struct dma_pinned_list *pinned_list, unsigned char *kdata, size_t len);
61966 -dma_cookie_t dma_memcpy_pg_to_iovec(struct dma_chan *chan, struct iovec *iov,
61967 +dma_cookie_t __intentional_overflow(0) dma_memcpy_pg_to_iovec(struct dma_chan *chan, struct iovec *iov,
61968 struct dma_pinned_list *pinned_list, struct page *page,
61969 unsigned int offset, size_t len);
61970
61971 diff --git a/include/linux/efi.h b/include/linux/efi.h
61972 index 5782114..e9b1ba1 100644
61973 --- a/include/linux/efi.h
61974 +++ b/include/linux/efi.h
61975 @@ -640,7 +640,7 @@ struct efivar_operations {
61976 efi_get_variable_t *get_variable;
61977 efi_get_next_variable_t *get_next_variable;
61978 efi_set_variable_t *set_variable;
61979 -};
61980 +} __no_const;
61981
61982 struct efivars {
61983 /*
61984 diff --git a/include/linux/elf.h b/include/linux/elf.h
61985 index 999b4f5..57753b4 100644
61986 --- a/include/linux/elf.h
61987 +++ b/include/linux/elf.h
61988 @@ -40,6 +40,17 @@ typedef __s64 Elf64_Sxword;
61989 #define PT_GNU_EH_FRAME 0x6474e550
61990
61991 #define PT_GNU_STACK (PT_LOOS + 0x474e551)
61992 +#define PT_GNU_RELRO (PT_LOOS + 0x474e552)
61993 +
61994 +#define PT_PAX_FLAGS (PT_LOOS + 0x5041580)
61995 +
61996 +/* Constants for the e_flags field */
61997 +#define EF_PAX_PAGEEXEC 1 /* Paging based non-executable pages */
61998 +#define EF_PAX_EMUTRAMP 2 /* Emulate trampolines */
61999 +#define EF_PAX_MPROTECT 4 /* Restrict mprotect() */
62000 +#define EF_PAX_RANDMMAP 8 /* Randomize mmap() base */
62001 +/*#define EF_PAX_RANDEXEC 16*/ /* Randomize ET_EXEC base */
62002 +#define EF_PAX_SEGMEXEC 32 /* Segmentation based non-executable pages */
62003
62004 /*
62005 * Extended Numbering
62006 @@ -97,6 +108,8 @@ typedef __s64 Elf64_Sxword;
62007 #define DT_DEBUG 21
62008 #define DT_TEXTREL 22
62009 #define DT_JMPREL 23
62010 +#define DT_FLAGS 30
62011 + #define DF_TEXTREL 0x00000004
62012 #define DT_ENCODING 32
62013 #define OLD_DT_LOOS 0x60000000
62014 #define DT_LOOS 0x6000000d
62015 @@ -243,6 +256,19 @@ typedef struct elf64_hdr {
62016 #define PF_W 0x2
62017 #define PF_X 0x1
62018
62019 +#define PF_PAGEEXEC (1U << 4) /* Enable PAGEEXEC */
62020 +#define PF_NOPAGEEXEC (1U << 5) /* Disable PAGEEXEC */
62021 +#define PF_SEGMEXEC (1U << 6) /* Enable SEGMEXEC */
62022 +#define PF_NOSEGMEXEC (1U << 7) /* Disable SEGMEXEC */
62023 +#define PF_MPROTECT (1U << 8) /* Enable MPROTECT */
62024 +#define PF_NOMPROTECT (1U << 9) /* Disable MPROTECT */
62025 +/*#define PF_RANDEXEC (1U << 10)*/ /* Enable RANDEXEC */
62026 +/*#define PF_NORANDEXEC (1U << 11)*/ /* Disable RANDEXEC */
62027 +#define PF_EMUTRAMP (1U << 12) /* Enable EMUTRAMP */
62028 +#define PF_NOEMUTRAMP (1U << 13) /* Disable EMUTRAMP */
62029 +#define PF_RANDMMAP (1U << 14) /* Enable RANDMMAP */
62030 +#define PF_NORANDMMAP (1U << 15) /* Disable RANDMMAP */
62031 +
62032 typedef struct elf32_phdr{
62033 Elf32_Word p_type;
62034 Elf32_Off p_offset;
62035 @@ -335,6 +361,8 @@ typedef struct elf64_shdr {
62036 #define EI_OSABI 7
62037 #define EI_PAD 8
62038
62039 +#define EI_PAX 14
62040 +
62041 #define ELFMAG0 0x7f /* EI_MAG */
62042 #define ELFMAG1 'E'
62043 #define ELFMAG2 'L'
62044 @@ -421,6 +449,7 @@ extern Elf32_Dyn _DYNAMIC [];
62045 #define elf_note elf32_note
62046 #define elf_addr_t Elf32_Off
62047 #define Elf_Half Elf32_Half
62048 +#define elf_dyn Elf32_Dyn
62049
62050 #else
62051
62052 @@ -431,6 +460,7 @@ extern Elf64_Dyn _DYNAMIC [];
62053 #define elf_note elf64_note
62054 #define elf_addr_t Elf64_Off
62055 #define Elf_Half Elf64_Half
62056 +#define elf_dyn Elf64_Dyn
62057
62058 #endif
62059
62060 diff --git a/include/linux/filter.h b/include/linux/filter.h
62061 index 82b0135..917914d 100644
62062 --- a/include/linux/filter.h
62063 +++ b/include/linux/filter.h
62064 @@ -146,6 +146,7 @@ struct compat_sock_fprog {
62065
62066 struct sk_buff;
62067 struct sock;
62068 +struct bpf_jit_work;
62069
62070 struct sk_filter
62071 {
62072 @@ -153,6 +154,9 @@ struct sk_filter
62073 unsigned int len; /* Number of filter blocks */
62074 unsigned int (*bpf_func)(const struct sk_buff *skb,
62075 const struct sock_filter *filter);
62076 +#ifdef CONFIG_BPF_JIT
62077 + struct bpf_jit_work *work;
62078 +#endif
62079 struct rcu_head rcu;
62080 struct sock_filter insns[0];
62081 };
62082 diff --git a/include/linux/firewire.h b/include/linux/firewire.h
62083 index db04ec5..f6ed627 100644
62084 --- a/include/linux/firewire.h
62085 +++ b/include/linux/firewire.h
62086 @@ -430,7 +430,7 @@ struct fw_iso_context {
62087 union {
62088 fw_iso_callback_t sc;
62089 fw_iso_mc_callback_t mc;
62090 - } callback;
62091 + } __no_const callback;
62092 void *callback_data;
62093 };
62094
62095 diff --git a/include/linux/frontswap.h b/include/linux/frontswap.h
62096 index 0e4e2ee..4ff4312 100644
62097 --- a/include/linux/frontswap.h
62098 +++ b/include/linux/frontswap.h
62099 @@ -11,7 +11,7 @@ struct frontswap_ops {
62100 int (*load)(unsigned, pgoff_t, struct page *);
62101 void (*invalidate_page)(unsigned, pgoff_t);
62102 void (*invalidate_area)(unsigned);
62103 -};
62104 +} __no_const;
62105
62106 extern bool frontswap_enabled;
62107 extern struct frontswap_ops
62108 diff --git a/include/linux/fs.h b/include/linux/fs.h
62109 index aa11047..7d046d0 100644
62110 --- a/include/linux/fs.h
62111 +++ b/include/linux/fs.h
62112 @@ -1802,7 +1802,8 @@ struct file_operations {
62113 int (*setlease)(struct file *, long, struct file_lock **);
62114 long (*fallocate)(struct file *file, int mode, loff_t offset,
62115 loff_t len);
62116 -};
62117 +} __do_const;
62118 +typedef struct file_operations __no_const file_operations_no_const;
62119
62120 struct inode_operations {
62121 struct dentry * (*lookup) (struct inode *,struct dentry *, unsigned int);
62122 diff --git a/include/linux/fs_struct.h b/include/linux/fs_struct.h
62123 index 003dc0f..3c4ea97 100644
62124 --- a/include/linux/fs_struct.h
62125 +++ b/include/linux/fs_struct.h
62126 @@ -6,7 +6,7 @@
62127 #include <linux/seqlock.h>
62128
62129 struct fs_struct {
62130 - int users;
62131 + atomic_t users;
62132 spinlock_t lock;
62133 seqcount_t seq;
62134 int umask;
62135 diff --git a/include/linux/fscache-cache.h b/include/linux/fscache-cache.h
62136 index ce31408..b1ad003 100644
62137 --- a/include/linux/fscache-cache.h
62138 +++ b/include/linux/fscache-cache.h
62139 @@ -102,7 +102,7 @@ struct fscache_operation {
62140 fscache_operation_release_t release;
62141 };
62142
62143 -extern atomic_t fscache_op_debug_id;
62144 +extern atomic_unchecked_t fscache_op_debug_id;
62145 extern void fscache_op_work_func(struct work_struct *work);
62146
62147 extern void fscache_enqueue_operation(struct fscache_operation *);
62148 @@ -122,7 +122,7 @@ static inline void fscache_operation_init(struct fscache_operation *op,
62149 {
62150 INIT_WORK(&op->work, fscache_op_work_func);
62151 atomic_set(&op->usage, 1);
62152 - op->debug_id = atomic_inc_return(&fscache_op_debug_id);
62153 + op->debug_id = atomic_inc_return_unchecked(&fscache_op_debug_id);
62154 op->processor = processor;
62155 op->release = release;
62156 INIT_LIST_HEAD(&op->pend_link);
62157 diff --git a/include/linux/fsnotify.h b/include/linux/fsnotify.h
62158 index a6dfe69..569586df 100644
62159 --- a/include/linux/fsnotify.h
62160 +++ b/include/linux/fsnotify.h
62161 @@ -315,7 +315,7 @@ static inline void fsnotify_change(struct dentry *dentry, unsigned int ia_valid)
62162 */
62163 static inline const unsigned char *fsnotify_oldname_init(const unsigned char *name)
62164 {
62165 - return kstrdup(name, GFP_KERNEL);
62166 + return (const unsigned char *)kstrdup((const char *)name, GFP_KERNEL);
62167 }
62168
62169 /*
62170 diff --git a/include/linux/fsnotify_backend.h b/include/linux/fsnotify_backend.h
62171 index 63d966d..cdcb717 100644
62172 --- a/include/linux/fsnotify_backend.h
62173 +++ b/include/linux/fsnotify_backend.h
62174 @@ -105,6 +105,7 @@ struct fsnotify_ops {
62175 void (*freeing_mark)(struct fsnotify_mark *mark, struct fsnotify_group *group);
62176 void (*free_event_priv)(struct fsnotify_event_private_data *priv);
62177 };
62178 +typedef struct fsnotify_ops __no_const fsnotify_ops_no_const;
62179
62180 /*
62181 * A group is a "thing" that wants to receive notification about filesystem
62182 diff --git a/include/linux/ftrace_event.h b/include/linux/ftrace_event.h
62183 index 642928c..e6c83a7 100644
62184 --- a/include/linux/ftrace_event.h
62185 +++ b/include/linux/ftrace_event.h
62186 @@ -97,7 +97,7 @@ struct trace_event_functions {
62187 trace_print_func raw;
62188 trace_print_func hex;
62189 trace_print_func binary;
62190 -};
62191 +} __no_const;
62192
62193 struct trace_event {
62194 struct hlist_node node;
62195 @@ -266,7 +266,7 @@ extern int trace_define_field(struct ftrace_event_call *call, const char *type,
62196 extern int trace_add_event_call(struct ftrace_event_call *call);
62197 extern void trace_remove_event_call(struct ftrace_event_call *call);
62198
62199 -#define is_signed_type(type) (((type)(-1)) < 0)
62200 +#define is_signed_type(type) (((type)(-1)) < (type)1)
62201
62202 int trace_set_clr_event(const char *system, const char *event, int set);
62203
62204 diff --git a/include/linux/genhd.h b/include/linux/genhd.h
62205 index 4f440b3..342233a 100644
62206 --- a/include/linux/genhd.h
62207 +++ b/include/linux/genhd.h
62208 @@ -190,7 +190,7 @@ struct gendisk {
62209 struct kobject *slave_dir;
62210
62211 struct timer_rand_state *random;
62212 - atomic_t sync_io; /* RAID */
62213 + atomic_unchecked_t sync_io; /* RAID */
62214 struct disk_events *ev;
62215 #ifdef CONFIG_BLK_DEV_INTEGRITY
62216 struct blk_integrity *integrity;
62217 diff --git a/include/linux/gfp.h b/include/linux/gfp.h
62218 index 4883f39..26688a8 100644
62219 --- a/include/linux/gfp.h
62220 +++ b/include/linux/gfp.h
62221 @@ -39,6 +39,12 @@ struct vm_area_struct;
62222 #define ___GFP_OTHER_NODE 0x800000u
62223 #define ___GFP_WRITE 0x1000000u
62224
62225 +#ifdef CONFIG_PAX_USERCOPY_SLABS
62226 +#define ___GFP_USERCOPY 0x2000000u
62227 +#else
62228 +#define ___GFP_USERCOPY 0
62229 +#endif
62230 +
62231 /*
62232 * GFP bitmasks..
62233 *
62234 @@ -93,6 +99,7 @@ struct vm_area_struct;
62235 #define __GFP_NO_KSWAPD ((__force gfp_t)___GFP_NO_KSWAPD)
62236 #define __GFP_OTHER_NODE ((__force gfp_t)___GFP_OTHER_NODE) /* On behalf of other node */
62237 #define __GFP_WRITE ((__force gfp_t)___GFP_WRITE) /* Allocator intends to dirty page */
62238 +#define __GFP_USERCOPY ((__force gfp_t)___GFP_USERCOPY)/* Allocator intends to copy page to/from userland */
62239
62240 /*
62241 * This may seem redundant, but it's a way of annotating false positives vs.
62242 @@ -100,7 +107,7 @@ struct vm_area_struct;
62243 */
62244 #define __GFP_NOTRACK_FALSE_POSITIVE (__GFP_NOTRACK)
62245
62246 -#define __GFP_BITS_SHIFT 25 /* Room for N __GFP_FOO bits */
62247 +#define __GFP_BITS_SHIFT 26 /* Room for N __GFP_FOO bits */
62248 #define __GFP_BITS_MASK ((__force gfp_t)((1 << __GFP_BITS_SHIFT) - 1))
62249
62250 /* This equals 0, but use constants in case they ever change */
62251 @@ -154,6 +161,8 @@ struct vm_area_struct;
62252 /* 4GB DMA on some platforms */
62253 #define GFP_DMA32 __GFP_DMA32
62254
62255 +#define GFP_USERCOPY __GFP_USERCOPY
62256 +
62257 /* Convert GFP flags to their corresponding migrate type */
62258 static inline int allocflags_to_migratetype(gfp_t gfp_flags)
62259 {
62260 diff --git a/include/linux/gracl.h b/include/linux/gracl.h
62261 new file mode 100644
62262 index 0000000..c938b1f
62263 --- /dev/null
62264 +++ b/include/linux/gracl.h
62265 @@ -0,0 +1,319 @@
62266 +#ifndef GR_ACL_H
62267 +#define GR_ACL_H
62268 +
62269 +#include <linux/grdefs.h>
62270 +#include <linux/resource.h>
62271 +#include <linux/capability.h>
62272 +#include <linux/dcache.h>
62273 +#include <asm/resource.h>
62274 +
62275 +/* Major status information */
62276 +
62277 +#define GR_VERSION "grsecurity 2.9.1"
62278 +#define GRSECURITY_VERSION 0x2901
62279 +
62280 +enum {
62281 + GR_SHUTDOWN = 0,
62282 + GR_ENABLE = 1,
62283 + GR_SPROLE = 2,
62284 + GR_RELOAD = 3,
62285 + GR_SEGVMOD = 4,
62286 + GR_STATUS = 5,
62287 + GR_UNSPROLE = 6,
62288 + GR_PASSSET = 7,
62289 + GR_SPROLEPAM = 8,
62290 +};
62291 +
62292 +/* Password setup definitions
62293 + * kernel/grhash.c */
62294 +enum {
62295 + GR_PW_LEN = 128,
62296 + GR_SALT_LEN = 16,
62297 + GR_SHA_LEN = 32,
62298 +};
62299 +
62300 +enum {
62301 + GR_SPROLE_LEN = 64,
62302 +};
62303 +
62304 +enum {
62305 + GR_NO_GLOB = 0,
62306 + GR_REG_GLOB,
62307 + GR_CREATE_GLOB
62308 +};
62309 +
62310 +#define GR_NLIMITS 32
62311 +
62312 +/* Begin Data Structures */
62313 +
62314 +struct sprole_pw {
62315 + unsigned char *rolename;
62316 + unsigned char salt[GR_SALT_LEN];
62317 + unsigned char sum[GR_SHA_LEN]; /* 256-bit SHA hash of the password */
62318 +};
62319 +
62320 +struct name_entry {
62321 + __u32 key;
62322 + ino_t inode;
62323 + dev_t device;
62324 + char *name;
62325 + __u16 len;
62326 + __u8 deleted;
62327 + struct name_entry *prev;
62328 + struct name_entry *next;
62329 +};
62330 +
62331 +struct inodev_entry {
62332 + struct name_entry *nentry;
62333 + struct inodev_entry *prev;
62334 + struct inodev_entry *next;
62335 +};
62336 +
62337 +struct acl_role_db {
62338 + struct acl_role_label **r_hash;
62339 + __u32 r_size;
62340 +};
62341 +
62342 +struct inodev_db {
62343 + struct inodev_entry **i_hash;
62344 + __u32 i_size;
62345 +};
62346 +
62347 +struct name_db {
62348 + struct name_entry **n_hash;
62349 + __u32 n_size;
62350 +};
62351 +
62352 +struct crash_uid {
62353 + uid_t uid;
62354 + unsigned long expires;
62355 +};
62356 +
62357 +struct gr_hash_struct {
62358 + void **table;
62359 + void **nametable;
62360 + void *first;
62361 + __u32 table_size;
62362 + __u32 used_size;
62363 + int type;
62364 +};
62365 +
62366 +/* Userspace Grsecurity ACL data structures */
62367 +
62368 +struct acl_subject_label {
62369 + char *filename;
62370 + ino_t inode;
62371 + dev_t device;
62372 + __u32 mode;
62373 + kernel_cap_t cap_mask;
62374 + kernel_cap_t cap_lower;
62375 + kernel_cap_t cap_invert_audit;
62376 +
62377 + struct rlimit res[GR_NLIMITS];
62378 + __u32 resmask;
62379 +
62380 + __u8 user_trans_type;
62381 + __u8 group_trans_type;
62382 + uid_t *user_transitions;
62383 + gid_t *group_transitions;
62384 + __u16 user_trans_num;
62385 + __u16 group_trans_num;
62386 +
62387 + __u32 sock_families[2];
62388 + __u32 ip_proto[8];
62389 + __u32 ip_type;
62390 + struct acl_ip_label **ips;
62391 + __u32 ip_num;
62392 + __u32 inaddr_any_override;
62393 +
62394 + __u32 crashes;
62395 + unsigned long expires;
62396 +
62397 + struct acl_subject_label *parent_subject;
62398 + struct gr_hash_struct *hash;
62399 + struct acl_subject_label *prev;
62400 + struct acl_subject_label *next;
62401 +
62402 + struct acl_object_label **obj_hash;
62403 + __u32 obj_hash_size;
62404 + __u16 pax_flags;
62405 +};
62406 +
62407 +struct role_allowed_ip {
62408 + __u32 addr;
62409 + __u32 netmask;
62410 +
62411 + struct role_allowed_ip *prev;
62412 + struct role_allowed_ip *next;
62413 +};
62414 +
62415 +struct role_transition {
62416 + char *rolename;
62417 +
62418 + struct role_transition *prev;
62419 + struct role_transition *next;
62420 +};
62421 +
62422 +struct acl_role_label {
62423 + char *rolename;
62424 + uid_t uidgid;
62425 + __u16 roletype;
62426 +
62427 + __u16 auth_attempts;
62428 + unsigned long expires;
62429 +
62430 + struct acl_subject_label *root_label;
62431 + struct gr_hash_struct *hash;
62432 +
62433 + struct acl_role_label *prev;
62434 + struct acl_role_label *next;
62435 +
62436 + struct role_transition *transitions;
62437 + struct role_allowed_ip *allowed_ips;
62438 + uid_t *domain_children;
62439 + __u16 domain_child_num;
62440 +
62441 + umode_t umask;
62442 +
62443 + struct acl_subject_label **subj_hash;
62444 + __u32 subj_hash_size;
62445 +};
62446 +
62447 +struct user_acl_role_db {
62448 + struct acl_role_label **r_table;
62449 + __u32 num_pointers; /* Number of allocations to track */
62450 + __u32 num_roles; /* Number of roles */
62451 + __u32 num_domain_children; /* Number of domain children */
62452 + __u32 num_subjects; /* Number of subjects */
62453 + __u32 num_objects; /* Number of objects */
62454 +};
62455 +
62456 +struct acl_object_label {
62457 + char *filename;
62458 + ino_t inode;
62459 + dev_t device;
62460 + __u32 mode;
62461 +
62462 + struct acl_subject_label *nested;
62463 + struct acl_object_label *globbed;
62464 +
62465 + /* next two structures not used */
62466 +
62467 + struct acl_object_label *prev;
62468 + struct acl_object_label *next;
62469 +};
62470 +
62471 +struct acl_ip_label {
62472 + char *iface;
62473 + __u32 addr;
62474 + __u32 netmask;
62475 + __u16 low, high;
62476 + __u8 mode;
62477 + __u32 type;
62478 + __u32 proto[8];
62479 +
62480 + /* next two structures not used */
62481 +
62482 + struct acl_ip_label *prev;
62483 + struct acl_ip_label *next;
62484 +};
62485 +
62486 +struct gr_arg {
62487 + struct user_acl_role_db role_db;
62488 + unsigned char pw[GR_PW_LEN];
62489 + unsigned char salt[GR_SALT_LEN];
62490 + unsigned char sum[GR_SHA_LEN];
62491 + unsigned char sp_role[GR_SPROLE_LEN];
62492 + struct sprole_pw *sprole_pws;
62493 + dev_t segv_device;
62494 + ino_t segv_inode;
62495 + uid_t segv_uid;
62496 + __u16 num_sprole_pws;
62497 + __u16 mode;
62498 +};
62499 +
62500 +struct gr_arg_wrapper {
62501 + struct gr_arg *arg;
62502 + __u32 version;
62503 + __u32 size;
62504 +};
62505 +
62506 +struct subject_map {
62507 + struct acl_subject_label *user;
62508 + struct acl_subject_label *kernel;
62509 + struct subject_map *prev;
62510 + struct subject_map *next;
62511 +};
62512 +
62513 +struct acl_subj_map_db {
62514 + struct subject_map **s_hash;
62515 + __u32 s_size;
62516 +};
62517 +
62518 +/* End Data Structures Section */
62519 +
62520 +/* Hash functions generated by empirical testing by Brad Spengler
62521 + Makes good use of the low bits of the inode. Generally 0-1 times
62522 + in loop for successful match. 0-3 for unsuccessful match.
62523 + Shift/add algorithm with modulus of table size and an XOR*/
62524 +
62525 +static __inline__ unsigned int
62526 +rhash(const uid_t uid, const __u16 type, const unsigned int sz)
62527 +{
62528 + return ((((uid + type) << (16 + type)) ^ uid) % sz);
62529 +}
62530 +
62531 + static __inline__ unsigned int
62532 +shash(const struct acl_subject_label *userp, const unsigned int sz)
62533 +{
62534 + return ((const unsigned long)userp % sz);
62535 +}
62536 +
62537 +static __inline__ unsigned int
62538 +fhash(const ino_t ino, const dev_t dev, const unsigned int sz)
62539 +{
62540 + return (((ino + dev) ^ ((ino << 13) + (ino << 23) + (dev << 9))) % sz);
62541 +}
62542 +
62543 +static __inline__ unsigned int
62544 +nhash(const char *name, const __u16 len, const unsigned int sz)
62545 +{
62546 + return full_name_hash((const unsigned char *)name, len) % sz;
62547 +}
62548 +
62549 +#define FOR_EACH_ROLE_START(role) \
62550 + role = role_list; \
62551 + while (role) {
62552 +
62553 +#define FOR_EACH_ROLE_END(role) \
62554 + role = role->prev; \
62555 + }
62556 +
62557 +#define FOR_EACH_SUBJECT_START(role,subj,iter) \
62558 + subj = NULL; \
62559 + iter = 0; \
62560 + while (iter < role->subj_hash_size) { \
62561 + if (subj == NULL) \
62562 + subj = role->subj_hash[iter]; \
62563 + if (subj == NULL) { \
62564 + iter++; \
62565 + continue; \
62566 + }
62567 +
62568 +#define FOR_EACH_SUBJECT_END(subj,iter) \
62569 + subj = subj->next; \
62570 + if (subj == NULL) \
62571 + iter++; \
62572 + }
62573 +
62574 +
62575 +#define FOR_EACH_NESTED_SUBJECT_START(role,subj) \
62576 + subj = role->hash->first; \
62577 + while (subj != NULL) {
62578 +
62579 +#define FOR_EACH_NESTED_SUBJECT_END(subj) \
62580 + subj = subj->next; \
62581 + }
62582 +
62583 +#endif
62584 +
62585 diff --git a/include/linux/gralloc.h b/include/linux/gralloc.h
62586 new file mode 100644
62587 index 0000000..323ecf2
62588 --- /dev/null
62589 +++ b/include/linux/gralloc.h
62590 @@ -0,0 +1,9 @@
62591 +#ifndef __GRALLOC_H
62592 +#define __GRALLOC_H
62593 +
62594 +void acl_free_all(void);
62595 +int acl_alloc_stack_init(unsigned long size);
62596 +void *acl_alloc(unsigned long len);
62597 +void *acl_alloc_num(unsigned long num, unsigned long len);
62598 +
62599 +#endif
62600 diff --git a/include/linux/grdefs.h b/include/linux/grdefs.h
62601 new file mode 100644
62602 index 0000000..b30e9bc
62603 --- /dev/null
62604 +++ b/include/linux/grdefs.h
62605 @@ -0,0 +1,140 @@
62606 +#ifndef GRDEFS_H
62607 +#define GRDEFS_H
62608 +
62609 +/* Begin grsecurity status declarations */
62610 +
62611 +enum {
62612 + GR_READY = 0x01,
62613 + GR_STATUS_INIT = 0x00 // disabled state
62614 +};
62615 +
62616 +/* Begin ACL declarations */
62617 +
62618 +/* Role flags */
62619 +
62620 +enum {
62621 + GR_ROLE_USER = 0x0001,
62622 + GR_ROLE_GROUP = 0x0002,
62623 + GR_ROLE_DEFAULT = 0x0004,
62624 + GR_ROLE_SPECIAL = 0x0008,
62625 + GR_ROLE_AUTH = 0x0010,
62626 + GR_ROLE_NOPW = 0x0020,
62627 + GR_ROLE_GOD = 0x0040,
62628 + GR_ROLE_LEARN = 0x0080,
62629 + GR_ROLE_TPE = 0x0100,
62630 + GR_ROLE_DOMAIN = 0x0200,
62631 + GR_ROLE_PAM = 0x0400,
62632 + GR_ROLE_PERSIST = 0x0800
62633 +};
62634 +
62635 +/* ACL Subject and Object mode flags */
62636 +enum {
62637 + GR_DELETED = 0x80000000
62638 +};
62639 +
62640 +/* ACL Object-only mode flags */
62641 +enum {
62642 + GR_READ = 0x00000001,
62643 + GR_APPEND = 0x00000002,
62644 + GR_WRITE = 0x00000004,
62645 + GR_EXEC = 0x00000008,
62646 + GR_FIND = 0x00000010,
62647 + GR_INHERIT = 0x00000020,
62648 + GR_SETID = 0x00000040,
62649 + GR_CREATE = 0x00000080,
62650 + GR_DELETE = 0x00000100,
62651 + GR_LINK = 0x00000200,
62652 + GR_AUDIT_READ = 0x00000400,
62653 + GR_AUDIT_APPEND = 0x00000800,
62654 + GR_AUDIT_WRITE = 0x00001000,
62655 + GR_AUDIT_EXEC = 0x00002000,
62656 + GR_AUDIT_FIND = 0x00004000,
62657 + GR_AUDIT_INHERIT= 0x00008000,
62658 + GR_AUDIT_SETID = 0x00010000,
62659 + GR_AUDIT_CREATE = 0x00020000,
62660 + GR_AUDIT_DELETE = 0x00040000,
62661 + GR_AUDIT_LINK = 0x00080000,
62662 + GR_PTRACERD = 0x00100000,
62663 + GR_NOPTRACE = 0x00200000,
62664 + GR_SUPPRESS = 0x00400000,
62665 + GR_NOLEARN = 0x00800000,
62666 + GR_INIT_TRANSFER= 0x01000000
62667 +};
62668 +
62669 +#define GR_AUDITS (GR_AUDIT_READ | GR_AUDIT_WRITE | GR_AUDIT_APPEND | GR_AUDIT_EXEC | \
62670 + GR_AUDIT_FIND | GR_AUDIT_INHERIT | GR_AUDIT_SETID | \
62671 + GR_AUDIT_CREATE | GR_AUDIT_DELETE | GR_AUDIT_LINK)
62672 +
62673 +/* ACL subject-only mode flags */
62674 +enum {
62675 + GR_KILL = 0x00000001,
62676 + GR_VIEW = 0x00000002,
62677 + GR_PROTECTED = 0x00000004,
62678 + GR_LEARN = 0x00000008,
62679 + GR_OVERRIDE = 0x00000010,
62680 + /* just a placeholder, this mode is only used in userspace */
62681 + GR_DUMMY = 0x00000020,
62682 + GR_PROTSHM = 0x00000040,
62683 + GR_KILLPROC = 0x00000080,
62684 + GR_KILLIPPROC = 0x00000100,
62685 + /* just a placeholder, this mode is only used in userspace */
62686 + GR_NOTROJAN = 0x00000200,
62687 + GR_PROTPROCFD = 0x00000400,
62688 + GR_PROCACCT = 0x00000800,
62689 + GR_RELAXPTRACE = 0x00001000,
62690 + GR_NESTED = 0x00002000,
62691 + GR_INHERITLEARN = 0x00004000,
62692 + GR_PROCFIND = 0x00008000,
62693 + GR_POVERRIDE = 0x00010000,
62694 + GR_KERNELAUTH = 0x00020000,
62695 + GR_ATSECURE = 0x00040000,
62696 + GR_SHMEXEC = 0x00080000
62697 +};
62698 +
62699 +enum {
62700 + GR_PAX_ENABLE_SEGMEXEC = 0x0001,
62701 + GR_PAX_ENABLE_PAGEEXEC = 0x0002,
62702 + GR_PAX_ENABLE_MPROTECT = 0x0004,
62703 + GR_PAX_ENABLE_RANDMMAP = 0x0008,
62704 + GR_PAX_ENABLE_EMUTRAMP = 0x0010,
62705 + GR_PAX_DISABLE_SEGMEXEC = 0x0100,
62706 + GR_PAX_DISABLE_PAGEEXEC = 0x0200,
62707 + GR_PAX_DISABLE_MPROTECT = 0x0400,
62708 + GR_PAX_DISABLE_RANDMMAP = 0x0800,
62709 + GR_PAX_DISABLE_EMUTRAMP = 0x1000,
62710 +};
62711 +
62712 +enum {
62713 + GR_ID_USER = 0x01,
62714 + GR_ID_GROUP = 0x02,
62715 +};
62716 +
62717 +enum {
62718 + GR_ID_ALLOW = 0x01,
62719 + GR_ID_DENY = 0x02,
62720 +};
62721 +
62722 +#define GR_CRASH_RES 31
62723 +#define GR_UIDTABLE_MAX 500
62724 +
62725 +/* begin resource learning section */
62726 +enum {
62727 + GR_RLIM_CPU_BUMP = 60,
62728 + GR_RLIM_FSIZE_BUMP = 50000,
62729 + GR_RLIM_DATA_BUMP = 10000,
62730 + GR_RLIM_STACK_BUMP = 1000,
62731 + GR_RLIM_CORE_BUMP = 10000,
62732 + GR_RLIM_RSS_BUMP = 500000,
62733 + GR_RLIM_NPROC_BUMP = 1,
62734 + GR_RLIM_NOFILE_BUMP = 5,
62735 + GR_RLIM_MEMLOCK_BUMP = 50000,
62736 + GR_RLIM_AS_BUMP = 500000,
62737 + GR_RLIM_LOCKS_BUMP = 2,
62738 + GR_RLIM_SIGPENDING_BUMP = 5,
62739 + GR_RLIM_MSGQUEUE_BUMP = 10000,
62740 + GR_RLIM_NICE_BUMP = 1,
62741 + GR_RLIM_RTPRIO_BUMP = 1,
62742 + GR_RLIM_RTTIME_BUMP = 1000000
62743 +};
62744 +
62745 +#endif
62746 diff --git a/include/linux/grinternal.h b/include/linux/grinternal.h
62747 new file mode 100644
62748 index 0000000..c9292f7
62749 --- /dev/null
62750 +++ b/include/linux/grinternal.h
62751 @@ -0,0 +1,223 @@
62752 +#ifndef __GRINTERNAL_H
62753 +#define __GRINTERNAL_H
62754 +
62755 +#ifdef CONFIG_GRKERNSEC
62756 +
62757 +#include <linux/fs.h>
62758 +#include <linux/mnt_namespace.h>
62759 +#include <linux/nsproxy.h>
62760 +#include <linux/gracl.h>
62761 +#include <linux/grdefs.h>
62762 +#include <linux/grmsg.h>
62763 +
62764 +void gr_add_learn_entry(const char *fmt, ...)
62765 + __attribute__ ((format (printf, 1, 2)));
62766 +__u32 gr_search_file(const struct dentry *dentry, const __u32 mode,
62767 + const struct vfsmount *mnt);
62768 +__u32 gr_check_create(const struct dentry *new_dentry,
62769 + const struct dentry *parent,
62770 + const struct vfsmount *mnt, const __u32 mode);
62771 +int gr_check_protected_task(const struct task_struct *task);
62772 +__u32 to_gr_audit(const __u32 reqmode);
62773 +int gr_set_acls(const int type);
62774 +int gr_apply_subject_to_task(struct task_struct *task);
62775 +int gr_acl_is_enabled(void);
62776 +char gr_roletype_to_char(void);
62777 +
62778 +void gr_handle_alertkill(struct task_struct *task);
62779 +char *gr_to_filename(const struct dentry *dentry,
62780 + const struct vfsmount *mnt);
62781 +char *gr_to_filename1(const struct dentry *dentry,
62782 + const struct vfsmount *mnt);
62783 +char *gr_to_filename2(const struct dentry *dentry,
62784 + const struct vfsmount *mnt);
62785 +char *gr_to_filename3(const struct dentry *dentry,
62786 + const struct vfsmount *mnt);
62787 +
62788 +extern int grsec_enable_ptrace_readexec;
62789 +extern int grsec_enable_harden_ptrace;
62790 +extern int grsec_enable_link;
62791 +extern int grsec_enable_fifo;
62792 +extern int grsec_enable_execve;
62793 +extern int grsec_enable_shm;
62794 +extern int grsec_enable_execlog;
62795 +extern int grsec_enable_signal;
62796 +extern int grsec_enable_audit_ptrace;
62797 +extern int grsec_enable_forkfail;
62798 +extern int grsec_enable_time;
62799 +extern int grsec_enable_rofs;
62800 +extern int grsec_enable_chroot_shmat;
62801 +extern int grsec_enable_chroot_mount;
62802 +extern int grsec_enable_chroot_double;
62803 +extern int grsec_enable_chroot_pivot;
62804 +extern int grsec_enable_chroot_chdir;
62805 +extern int grsec_enable_chroot_chmod;
62806 +extern int grsec_enable_chroot_mknod;
62807 +extern int grsec_enable_chroot_fchdir;
62808 +extern int grsec_enable_chroot_nice;
62809 +extern int grsec_enable_chroot_execlog;
62810 +extern int grsec_enable_chroot_caps;
62811 +extern int grsec_enable_chroot_sysctl;
62812 +extern int grsec_enable_chroot_unix;
62813 +extern int grsec_enable_symlinkown;
62814 +extern int grsec_symlinkown_gid;
62815 +extern int grsec_enable_tpe;
62816 +extern int grsec_tpe_gid;
62817 +extern int grsec_enable_tpe_all;
62818 +extern int grsec_enable_tpe_invert;
62819 +extern int grsec_enable_socket_all;
62820 +extern int grsec_socket_all_gid;
62821 +extern int grsec_enable_socket_client;
62822 +extern int grsec_socket_client_gid;
62823 +extern int grsec_enable_socket_server;
62824 +extern int grsec_socket_server_gid;
62825 +extern int grsec_audit_gid;
62826 +extern int grsec_enable_group;
62827 +extern int grsec_enable_audit_textrel;
62828 +extern int grsec_enable_log_rwxmaps;
62829 +extern int grsec_enable_mount;
62830 +extern int grsec_enable_chdir;
62831 +extern int grsec_resource_logging;
62832 +extern int grsec_enable_blackhole;
62833 +extern int grsec_lastack_retries;
62834 +extern int grsec_enable_brute;
62835 +extern int grsec_lock;
62836 +
62837 +extern spinlock_t grsec_alert_lock;
62838 +extern unsigned long grsec_alert_wtime;
62839 +extern unsigned long grsec_alert_fyet;
62840 +
62841 +extern spinlock_t grsec_audit_lock;
62842 +
62843 +extern rwlock_t grsec_exec_file_lock;
62844 +
62845 +#define gr_task_fullpath(tsk) ((tsk)->exec_file ? \
62846 + gr_to_filename2((tsk)->exec_file->f_path.dentry, \
62847 + (tsk)->exec_file->f_vfsmnt) : "/")
62848 +
62849 +#define gr_parent_task_fullpath(tsk) ((tsk)->real_parent->exec_file ? \
62850 + gr_to_filename3((tsk)->real_parent->exec_file->f_path.dentry, \
62851 + (tsk)->real_parent->exec_file->f_vfsmnt) : "/")
62852 +
62853 +#define gr_task_fullpath0(tsk) ((tsk)->exec_file ? \
62854 + gr_to_filename((tsk)->exec_file->f_path.dentry, \
62855 + (tsk)->exec_file->f_vfsmnt) : "/")
62856 +
62857 +#define gr_parent_task_fullpath0(tsk) ((tsk)->real_parent->exec_file ? \
62858 + gr_to_filename1((tsk)->real_parent->exec_file->f_path.dentry, \
62859 + (tsk)->real_parent->exec_file->f_vfsmnt) : "/")
62860 +
62861 +#define proc_is_chrooted(tsk_a) ((tsk_a)->gr_is_chrooted)
62862 +
62863 +#define have_same_root(tsk_a,tsk_b) ((tsk_a)->gr_chroot_dentry == (tsk_b)->gr_chroot_dentry)
62864 +
62865 +#define DEFAULTSECARGS(task, cred, pcred) gr_task_fullpath(task), (task)->comm, \
62866 + (task)->pid, (cred)->uid, \
62867 + (cred)->euid, (cred)->gid, (cred)->egid, \
62868 + gr_parent_task_fullpath(task), \
62869 + (task)->real_parent->comm, (task)->real_parent->pid, \
62870 + (pcred)->uid, (pcred)->euid, \
62871 + (pcred)->gid, (pcred)->egid
62872 +
62873 +#define GR_CHROOT_CAPS {{ \
62874 + CAP_TO_MASK(CAP_LINUX_IMMUTABLE) | CAP_TO_MASK(CAP_NET_ADMIN) | \
62875 + CAP_TO_MASK(CAP_SYS_MODULE) | CAP_TO_MASK(CAP_SYS_RAWIO) | \
62876 + CAP_TO_MASK(CAP_SYS_PACCT) | CAP_TO_MASK(CAP_SYS_ADMIN) | \
62877 + CAP_TO_MASK(CAP_SYS_BOOT) | CAP_TO_MASK(CAP_SYS_TIME) | \
62878 + CAP_TO_MASK(CAP_NET_RAW) | CAP_TO_MASK(CAP_SYS_TTY_CONFIG) | \
62879 + CAP_TO_MASK(CAP_IPC_OWNER) | CAP_TO_MASK(CAP_SETFCAP), \
62880 + CAP_TO_MASK(CAP_SYSLOG) | CAP_TO_MASK(CAP_MAC_ADMIN) }}
62881 +
62882 +#define security_learn(normal_msg,args...) \
62883 +({ \
62884 + read_lock(&grsec_exec_file_lock); \
62885 + gr_add_learn_entry(normal_msg "\n", ## args); \
62886 + read_unlock(&grsec_exec_file_lock); \
62887 +})
62888 +
62889 +enum {
62890 + GR_DO_AUDIT,
62891 + GR_DONT_AUDIT,
62892 + /* used for non-audit messages that we shouldn't kill the task on */
62893 + GR_DONT_AUDIT_GOOD
62894 +};
62895 +
62896 +enum {
62897 + GR_TTYSNIFF,
62898 + GR_RBAC,
62899 + GR_RBAC_STR,
62900 + GR_STR_RBAC,
62901 + GR_RBAC_MODE2,
62902 + GR_RBAC_MODE3,
62903 + GR_FILENAME,
62904 + GR_SYSCTL_HIDDEN,
62905 + GR_NOARGS,
62906 + GR_ONE_INT,
62907 + GR_ONE_INT_TWO_STR,
62908 + GR_ONE_STR,
62909 + GR_STR_INT,
62910 + GR_TWO_STR_INT,
62911 + GR_TWO_INT,
62912 + GR_TWO_U64,
62913 + GR_THREE_INT,
62914 + GR_FIVE_INT_TWO_STR,
62915 + GR_TWO_STR,
62916 + GR_THREE_STR,
62917 + GR_FOUR_STR,
62918 + GR_STR_FILENAME,
62919 + GR_FILENAME_STR,
62920 + GR_FILENAME_TWO_INT,
62921 + GR_FILENAME_TWO_INT_STR,
62922 + GR_TEXTREL,
62923 + GR_PTRACE,
62924 + GR_RESOURCE,
62925 + GR_CAP,
62926 + GR_SIG,
62927 + GR_SIG2,
62928 + GR_CRASH1,
62929 + GR_CRASH2,
62930 + GR_PSACCT,
62931 + GR_RWXMAP
62932 +};
62933 +
62934 +#define gr_log_hidden_sysctl(audit, msg, str) gr_log_varargs(audit, msg, GR_SYSCTL_HIDDEN, str)
62935 +#define gr_log_ttysniff(audit, msg, task) gr_log_varargs(audit, msg, GR_TTYSNIFF, task)
62936 +#define gr_log_fs_rbac_generic(audit, msg, dentry, mnt) gr_log_varargs(audit, msg, GR_RBAC, dentry, mnt)
62937 +#define gr_log_fs_rbac_str(audit, msg, dentry, mnt, str) gr_log_varargs(audit, msg, GR_RBAC_STR, dentry, mnt, str)
62938 +#define gr_log_fs_str_rbac(audit, msg, str, dentry, mnt) gr_log_varargs(audit, msg, GR_STR_RBAC, str, dentry, mnt)
62939 +#define gr_log_fs_rbac_mode2(audit, msg, dentry, mnt, str1, str2) gr_log_varargs(audit, msg, GR_RBAC_MODE2, dentry, mnt, str1, str2)
62940 +#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)
62941 +#define gr_log_fs_generic(audit, msg, dentry, mnt) gr_log_varargs(audit, msg, GR_FILENAME, dentry, mnt)
62942 +#define gr_log_noargs(audit, msg) gr_log_varargs(audit, msg, GR_NOARGS)
62943 +#define gr_log_int(audit, msg, num) gr_log_varargs(audit, msg, GR_ONE_INT, num)
62944 +#define gr_log_int_str2(audit, msg, num, str1, str2) gr_log_varargs(audit, msg, GR_ONE_INT_TWO_STR, num, str1, str2)
62945 +#define gr_log_str(audit, msg, str) gr_log_varargs(audit, msg, GR_ONE_STR, str)
62946 +#define gr_log_str_int(audit, msg, str, num) gr_log_varargs(audit, msg, GR_STR_INT, str, num)
62947 +#define gr_log_int_int(audit, msg, num1, num2) gr_log_varargs(audit, msg, GR_TWO_INT, num1, num2)
62948 +#define gr_log_two_u64(audit, msg, num1, num2) gr_log_varargs(audit, msg, GR_TWO_U64, num1, num2)
62949 +#define gr_log_int3(audit, msg, num1, num2, num3) gr_log_varargs(audit, msg, GR_THREE_INT, num1, num2, num3)
62950 +#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)
62951 +#define gr_log_str_str(audit, msg, str1, str2) gr_log_varargs(audit, msg, GR_TWO_STR, str1, str2)
62952 +#define gr_log_str2_int(audit, msg, str1, str2, num) gr_log_varargs(audit, msg, GR_TWO_STR_INT, str1, str2, num)
62953 +#define gr_log_str3(audit, msg, str1, str2, str3) gr_log_varargs(audit, msg, GR_THREE_STR, str1, str2, str3)
62954 +#define gr_log_str4(audit, msg, str1, str2, str3, str4) gr_log_varargs(audit, msg, GR_FOUR_STR, str1, str2, str3, str4)
62955 +#define gr_log_str_fs(audit, msg, str, dentry, mnt) gr_log_varargs(audit, msg, GR_STR_FILENAME, str, dentry, mnt)
62956 +#define gr_log_fs_str(audit, msg, dentry, mnt, str) gr_log_varargs(audit, msg, GR_FILENAME_STR, dentry, mnt, str)
62957 +#define gr_log_fs_int2(audit, msg, dentry, mnt, num1, num2) gr_log_varargs(audit, msg, GR_FILENAME_TWO_INT, dentry, mnt, num1, num2)
62958 +#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)
62959 +#define gr_log_textrel_ulong_ulong(audit, msg, file, ulong1, ulong2) gr_log_varargs(audit, msg, GR_TEXTREL, file, ulong1, ulong2)
62960 +#define gr_log_ptrace(audit, msg, task) gr_log_varargs(audit, msg, GR_PTRACE, task)
62961 +#define gr_log_res_ulong2_str(audit, msg, task, ulong1, str, ulong2) gr_log_varargs(audit, msg, GR_RESOURCE, task, ulong1, str, ulong2)
62962 +#define gr_log_cap(audit, msg, task, str) gr_log_varargs(audit, msg, GR_CAP, task, str)
62963 +#define gr_log_sig_addr(audit, msg, str, addr) gr_log_varargs(audit, msg, GR_SIG, str, addr)
62964 +#define gr_log_sig_task(audit, msg, task, num) gr_log_varargs(audit, msg, GR_SIG2, task, num)
62965 +#define gr_log_crash1(audit, msg, task, ulong) gr_log_varargs(audit, msg, GR_CRASH1, task, ulong)
62966 +#define gr_log_crash2(audit, msg, task, ulong1) gr_log_varargs(audit, msg, GR_CRASH2, task, ulong1)
62967 +#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)
62968 +#define gr_log_rwxmap(audit, msg, str) gr_log_varargs(audit, msg, GR_RWXMAP, str)
62969 +
62970 +void gr_log_varargs(int audit, const char *msg, int argtypes, ...);
62971 +
62972 +#endif
62973 +
62974 +#endif
62975 diff --git a/include/linux/grmsg.h b/include/linux/grmsg.h
62976 new file mode 100644
62977 index 0000000..54f4e85
62978 --- /dev/null
62979 +++ b/include/linux/grmsg.h
62980 @@ -0,0 +1,110 @@
62981 +#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"
62982 +#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"
62983 +#define GR_PTRACE_ACL_MSG "denied ptrace of %.950s(%.16s:%d) by "
62984 +#define GR_STOPMOD_MSG "denied modification of module state by "
62985 +#define GR_ROFS_BLOCKWRITE_MSG "denied write to block device %.950s by "
62986 +#define GR_ROFS_MOUNT_MSG "denied writable mount of %.950s by "
62987 +#define GR_IOPERM_MSG "denied use of ioperm() by "
62988 +#define GR_IOPL_MSG "denied use of iopl() by "
62989 +#define GR_SHMAT_ACL_MSG "denied attach of shared memory of UID %u, PID %d, ID %u by "
62990 +#define GR_UNIX_CHROOT_MSG "denied connect() to abstract AF_UNIX socket outside of chroot by "
62991 +#define GR_SHMAT_CHROOT_MSG "denied attach of shared memory outside of chroot by "
62992 +#define GR_MEM_READWRITE_MSG "denied access of range %Lx -> %Lx in /dev/mem by "
62993 +#define GR_SYMLINK_MSG "not following symlink %.950s owned by %d.%d by "
62994 +#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"
62995 +#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"
62996 +#define GR_HIDDEN_ACL_MSG "%s access to hidden file %.950s by "
62997 +#define GR_OPEN_ACL_MSG "%s open of %.950s for%s%s by "
62998 +#define GR_CREATE_ACL_MSG "%s create of %.950s for%s%s by "
62999 +#define GR_FIFO_MSG "denied writing FIFO %.950s of %d.%d by "
63000 +#define GR_MKNOD_CHROOT_MSG "denied mknod of %.950s from chroot by "
63001 +#define GR_MKNOD_ACL_MSG "%s mknod of %.950s by "
63002 +#define GR_UNIXCONNECT_ACL_MSG "%s connect() to the unix domain socket %.950s by "
63003 +#define GR_TTYSNIFF_ACL_MSG "terminal being sniffed by IP:%pI4 %.480s[%.16s:%d], parent %.480s[%.16s:%d] against "
63004 +#define GR_MKDIR_ACL_MSG "%s mkdir of %.950s by "
63005 +#define GR_RMDIR_ACL_MSG "%s rmdir of %.950s by "
63006 +#define GR_UNLINK_ACL_MSG "%s unlink of %.950s by "
63007 +#define GR_SYMLINK_ACL_MSG "%s symlink from %.480s to %.480s by "
63008 +#define GR_HARDLINK_MSG "denied hardlink of %.930s (owned by %d.%d) to %.30s for "
63009 +#define GR_LINK_ACL_MSG "%s link of %.480s to %.480s by "
63010 +#define GR_INHERIT_ACL_MSG "successful inherit of %.480s's ACL for %.480s by "
63011 +#define GR_RENAME_ACL_MSG "%s rename of %.480s to %.480s by "
63012 +#define GR_UNSAFESHARE_EXEC_ACL_MSG "denied exec with cloned fs of %.950s by "
63013 +#define GR_PTRACE_EXEC_ACL_MSG "denied ptrace of %.950s by "
63014 +#define GR_EXEC_ACL_MSG "%s execution of %.950s by "
63015 +#define GR_EXEC_TPE_MSG "denied untrusted exec (due to %.70s) of %.950s by "
63016 +#define GR_SEGVSTART_ACL_MSG "possible exploit bruteforcing on " DEFAULTSECMSG " banning uid %u from login for %lu seconds"
63017 +#define GR_SEGVNOSUID_ACL_MSG "possible exploit bruteforcing on " DEFAULTSECMSG " banning execution for %lu seconds"
63018 +#define GR_MOUNT_CHROOT_MSG "denied mount of %.256s as %.930s from chroot by "
63019 +#define GR_PIVOT_CHROOT_MSG "denied pivot_root from chroot by "
63020 +#define GR_TRUNCATE_ACL_MSG "%s truncate of %.950s by "
63021 +#define GR_ATIME_ACL_MSG "%s access time change of %.950s by "
63022 +#define GR_ACCESS_ACL_MSG "%s access of %.950s for%s%s%s by "
63023 +#define GR_CHROOT_CHROOT_MSG "denied double chroot to %.950s by "
63024 +#define GR_CHMOD_CHROOT_MSG "denied chmod +s of %.950s by "
63025 +#define GR_CHMOD_ACL_MSG "%s chmod of %.950s by "
63026 +#define GR_CHROOT_FCHDIR_MSG "denied fchdir outside of chroot to %.950s by "
63027 +#define GR_CHOWN_ACL_MSG "%s chown of %.950s by "
63028 +#define GR_SETXATTR_ACL_MSG "%s setting extended attributes of %.950s by "
63029 +#define GR_WRITLIB_ACL_MSG "denied load of writable library %.950s by "
63030 +#define GR_INITF_ACL_MSG "init_variables() failed %s by "
63031 +#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"
63032 +#define GR_DEV_ACL_MSG "/dev/grsec: %d bytes sent %d required, being fed garbage by "
63033 +#define GR_SHUTS_ACL_MSG "shutdown auth success for "
63034 +#define GR_SHUTF_ACL_MSG "shutdown auth failure for "
63035 +#define GR_SHUTI_ACL_MSG "ignoring shutdown for disabled RBAC system for "
63036 +#define GR_SEGVMODS_ACL_MSG "segvmod auth success for "
63037 +#define GR_SEGVMODF_ACL_MSG "segvmod auth failure for "
63038 +#define GR_SEGVMODI_ACL_MSG "ignoring segvmod for disabled RBAC system for "
63039 +#define GR_ENABLE_ACL_MSG "%s RBAC system loaded by "
63040 +#define GR_ENABLEF_ACL_MSG "unable to load %s for "
63041 +#define GR_RELOADI_ACL_MSG "ignoring reload request for disabled RBAC system"
63042 +#define GR_RELOAD_ACL_MSG "%s RBAC system reloaded by "
63043 +#define GR_RELOADF_ACL_MSG "failed reload of %s for "
63044 +#define GR_SPROLEI_ACL_MSG "ignoring change to special role for disabled RBAC system for "
63045 +#define GR_SPROLES_ACL_MSG "successful change to special role %s (id %d) by "
63046 +#define GR_SPROLEL_ACL_MSG "special role %s (id %d) exited by "
63047 +#define GR_SPROLEF_ACL_MSG "special role %s failure for "
63048 +#define GR_UNSPROLEI_ACL_MSG "ignoring unauth of special role for disabled RBAC system for "
63049 +#define GR_UNSPROLES_ACL_MSG "successful unauth of special role %s (id %d) by "
63050 +#define GR_INVMODE_ACL_MSG "invalid mode %d by "
63051 +#define GR_PRIORITY_CHROOT_MSG "denied priority change of process (%.16s:%d) by "
63052 +#define GR_FAILFORK_MSG "failed fork with errno %s by "
63053 +#define GR_NICE_CHROOT_MSG "denied priority change by "
63054 +#define GR_UNISIGLOG_MSG "%.32s occurred at %p in "
63055 +#define GR_DUALSIGLOG_MSG "signal %d sent to " DEFAULTSECMSG " by "
63056 +#define GR_SIG_ACL_MSG "denied send of signal %d to protected task " DEFAULTSECMSG " by "
63057 +#define GR_SYSCTL_MSG "denied modification of grsecurity sysctl value : %.32s by "
63058 +#define GR_SYSCTL_ACL_MSG "%s sysctl of %.950s for%s%s by "
63059 +#define GR_TIME_MSG "time set by "
63060 +#define GR_DEFACL_MSG "fatal: unable to find subject for (%.16s:%d), loaded by "
63061 +#define GR_MMAP_ACL_MSG "%s executable mmap of %.950s by "
63062 +#define GR_MPROTECT_ACL_MSG "%s executable mprotect of %.950s by "
63063 +#define GR_SOCK_MSG "denied socket(%.16s,%.16s,%.16s) by "
63064 +#define GR_SOCK_NOINET_MSG "denied socket(%.16s,%.16s,%d) by "
63065 +#define GR_BIND_MSG "denied bind() by "
63066 +#define GR_CONNECT_MSG "denied connect() by "
63067 +#define GR_BIND_ACL_MSG "denied bind() to %pI4 port %u sock type %.16s protocol %.16s by "
63068 +#define GR_CONNECT_ACL_MSG "denied connect() to %pI4 port %u sock type %.16s protocol %.16s by "
63069 +#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"
63070 +#define GR_EXEC_CHROOT_MSG "exec of %.980s within chroot by process "
63071 +#define GR_CAP_ACL_MSG "use of %s denied for "
63072 +#define GR_CAP_CHROOT_MSG "use of %s in chroot denied for "
63073 +#define GR_CAP_ACL_MSG2 "use of %s permitted for "
63074 +#define GR_USRCHANGE_ACL_MSG "change to uid %u denied for "
63075 +#define GR_GRPCHANGE_ACL_MSG "change to gid %u denied for "
63076 +#define GR_REMOUNT_AUDIT_MSG "remount of %.256s by "
63077 +#define GR_UNMOUNT_AUDIT_MSG "unmount of %.256s by "
63078 +#define GR_MOUNT_AUDIT_MSG "mount of %.256s to %.256s by "
63079 +#define GR_CHDIR_AUDIT_MSG "chdir to %.980s by "
63080 +#define GR_EXEC_AUDIT_MSG "exec of %.930s (%.128s) by "
63081 +#define GR_RESOURCE_MSG "denied resource overstep by requesting %lu for %.16s against limit %lu for "
63082 +#define GR_RWXMMAP_MSG "denied RWX mmap of %.950s by "
63083 +#define GR_RWXMPROTECT_MSG "denied RWX mprotect of %.950s by "
63084 +#define GR_TEXTREL_AUDIT_MSG "text relocation in %s, VMA:0x%08lx 0x%08lx by "
63085 +#define GR_VM86_MSG "denied use of vm86 by "
63086 +#define GR_PTRACE_AUDIT_MSG "process %.950s(%.16s:%d) attached to via ptrace by "
63087 +#define GR_PTRACE_READEXEC_MSG "denied ptrace of unreadable binary %.950s by "
63088 +#define GR_INIT_TRANSFER_MSG "persistent special role transferred privilege to init by "
63089 +#define GR_BADPROCPID_MSG "denied read of sensitive /proc/pid/%s entry via fd passed across exec by "
63090 +#define GR_SYMLINKOWNER_MSG "denied following symlink %.950s since symlink owner %u does not match target owner %u, by "
63091 diff --git a/include/linux/grsecurity.h b/include/linux/grsecurity.h
63092 new file mode 100644
63093 index 0000000..187b3ed
63094 --- /dev/null
63095 +++ b/include/linux/grsecurity.h
63096 @@ -0,0 +1,239 @@
63097 +#ifndef GR_SECURITY_H
63098 +#define GR_SECURITY_H
63099 +#include <linux/fs.h>
63100 +#include <linux/fs_struct.h>
63101 +#include <linux/binfmts.h>
63102 +#include <linux/gracl.h>
63103 +
63104 +/* notify of brain-dead configs */
63105 +#if defined(CONFIG_GRKERNSEC_PROC_USER) && defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
63106 +#error "CONFIG_GRKERNSEC_PROC_USER and CONFIG_GRKERNSEC_PROC_USERGROUP cannot both be enabled."
63107 +#endif
63108 +#if defined(CONFIG_PAX_NOEXEC) && !defined(CONFIG_PAX_PAGEEXEC) && !defined(CONFIG_PAX_SEGMEXEC) && !defined(CONFIG_PAX_KERNEXEC)
63109 +#error "CONFIG_PAX_NOEXEC enabled, but PAGEEXEC, SEGMEXEC, and KERNEXEC are disabled."
63110 +#endif
63111 +#if defined(CONFIG_PAX_ASLR) && !defined(CONFIG_PAX_RANDKSTACK) && !defined(CONFIG_PAX_RANDUSTACK) && !defined(CONFIG_PAX_RANDMMAP)
63112 +#error "CONFIG_PAX_ASLR enabled, but RANDKSTACK, RANDUSTACK, and RANDMMAP are disabled."
63113 +#endif
63114 +#if defined(CONFIG_PAX) && !defined(CONFIG_PAX_NOEXEC) && !defined(CONFIG_PAX_ASLR)
63115 +#error "CONFIG_PAX enabled, but no PaX options are enabled."
63116 +#endif
63117 +
63118 +#include <linux/compat.h>
63119 +
63120 +struct user_arg_ptr {
63121 +#ifdef CONFIG_COMPAT
63122 + bool is_compat;
63123 +#endif
63124 + union {
63125 + const char __user *const __user *native;
63126 +#ifdef CONFIG_COMPAT
63127 + compat_uptr_t __user *compat;
63128 +#endif
63129 + } ptr;
63130 +};
63131 +
63132 +void gr_handle_brute_attach(struct task_struct *p, unsigned long mm_flags);
63133 +void gr_handle_brute_check(void);
63134 +void gr_handle_kernel_exploit(void);
63135 +int gr_process_user_ban(void);
63136 +
63137 +char gr_roletype_to_char(void);
63138 +
63139 +int gr_acl_enable_at_secure(void);
63140 +
63141 +int gr_check_user_change(int real, int effective, int fs);
63142 +int gr_check_group_change(int real, int effective, int fs);
63143 +
63144 +void gr_del_task_from_ip_table(struct task_struct *p);
63145 +
63146 +int gr_pid_is_chrooted(struct task_struct *p);
63147 +int gr_handle_chroot_fowner(struct pid *pid, enum pid_type type);
63148 +int gr_handle_chroot_nice(void);
63149 +int gr_handle_chroot_sysctl(const int op);
63150 +int gr_handle_chroot_setpriority(struct task_struct *p,
63151 + const int niceval);
63152 +int gr_chroot_fchdir(struct dentry *u_dentry, struct vfsmount *u_mnt);
63153 +int gr_handle_chroot_chroot(const struct dentry *dentry,
63154 + const struct vfsmount *mnt);
63155 +void gr_handle_chroot_chdir(struct path *path);
63156 +int gr_handle_chroot_chmod(const struct dentry *dentry,
63157 + const struct vfsmount *mnt, const int mode);
63158 +int gr_handle_chroot_mknod(const struct dentry *dentry,
63159 + const struct vfsmount *mnt, const int mode);
63160 +int gr_handle_chroot_mount(const struct dentry *dentry,
63161 + const struct vfsmount *mnt,
63162 + const char *dev_name);
63163 +int gr_handle_chroot_pivot(void);
63164 +int gr_handle_chroot_unix(const pid_t pid);
63165 +
63166 +int gr_handle_rawio(const struct inode *inode);
63167 +
63168 +void gr_handle_ioperm(void);
63169 +void gr_handle_iopl(void);
63170 +
63171 +umode_t gr_acl_umask(void);
63172 +
63173 +int gr_tpe_allow(const struct file *file);
63174 +
63175 +void gr_set_chroot_entries(struct task_struct *task, struct path *path);
63176 +void gr_clear_chroot_entries(struct task_struct *task);
63177 +
63178 +void gr_log_forkfail(const int retval);
63179 +void gr_log_timechange(void);
63180 +void gr_log_signal(const int sig, const void *addr, const struct task_struct *t);
63181 +void gr_log_chdir(const struct dentry *dentry,
63182 + const struct vfsmount *mnt);
63183 +void gr_log_chroot_exec(const struct dentry *dentry,
63184 + const struct vfsmount *mnt);
63185 +void gr_handle_exec_args(struct linux_binprm *bprm, struct user_arg_ptr argv);
63186 +void gr_log_remount(const char *devname, const int retval);
63187 +void gr_log_unmount(const char *devname, const int retval);
63188 +void gr_log_mount(const char *from, const char *to, const int retval);
63189 +void gr_log_textrel(struct vm_area_struct *vma);
63190 +void gr_log_rwxmmap(struct file *file);
63191 +void gr_log_rwxmprotect(struct file *file);
63192 +
63193 +int gr_handle_follow_link(const struct inode *parent,
63194 + const struct inode *inode,
63195 + const struct dentry *dentry,
63196 + const struct vfsmount *mnt);
63197 +int gr_handle_fifo(const struct dentry *dentry,
63198 + const struct vfsmount *mnt,
63199 + const struct dentry *dir, const int flag,
63200 + const int acc_mode);
63201 +int gr_handle_hardlink(const struct dentry *dentry,
63202 + const struct vfsmount *mnt,
63203 + struct inode *inode,
63204 + const int mode, const char *to);
63205 +
63206 +int gr_is_capable(const int cap);
63207 +int gr_is_capable_nolog(const int cap);
63208 +int gr_task_is_capable(const struct task_struct *task, const struct cred *cred, const int cap);
63209 +int gr_task_is_capable_nolog(const struct task_struct *task, const int cap);
63210 +
63211 +void gr_learn_resource(const struct task_struct *task, const int limit,
63212 + const unsigned long wanted, const int gt);
63213 +void gr_copy_label(struct task_struct *tsk);
63214 +void gr_handle_crash(struct task_struct *task, const int sig);
63215 +int gr_handle_signal(const struct task_struct *p, const int sig);
63216 +int gr_check_crash_uid(const uid_t uid);
63217 +int gr_check_protected_task(const struct task_struct *task);
63218 +int gr_check_protected_task_fowner(struct pid *pid, enum pid_type type);
63219 +int gr_acl_handle_mmap(const struct file *file,
63220 + const unsigned long prot);
63221 +int gr_acl_handle_mprotect(const struct file *file,
63222 + const unsigned long prot);
63223 +int gr_check_hidden_task(const struct task_struct *tsk);
63224 +__u32 gr_acl_handle_truncate(const struct dentry *dentry,
63225 + const struct vfsmount *mnt);
63226 +__u32 gr_acl_handle_utime(const struct dentry *dentry,
63227 + const struct vfsmount *mnt);
63228 +__u32 gr_acl_handle_access(const struct dentry *dentry,
63229 + const struct vfsmount *mnt, const int fmode);
63230 +__u32 gr_acl_handle_chmod(const struct dentry *dentry,
63231 + const struct vfsmount *mnt, umode_t *mode);
63232 +__u32 gr_acl_handle_chown(const struct dentry *dentry,
63233 + const struct vfsmount *mnt);
63234 +__u32 gr_acl_handle_setxattr(const struct dentry *dentry,
63235 + const struct vfsmount *mnt);
63236 +int gr_handle_ptrace(struct task_struct *task, const long request);
63237 +int gr_handle_proc_ptrace(struct task_struct *task);
63238 +__u32 gr_acl_handle_execve(const struct dentry *dentry,
63239 + const struct vfsmount *mnt);
63240 +int gr_check_crash_exec(const struct file *filp);
63241 +int gr_acl_is_enabled(void);
63242 +void gr_set_kernel_label(struct task_struct *task);
63243 +void gr_set_role_label(struct task_struct *task, const uid_t uid,
63244 + const gid_t gid);
63245 +int gr_set_proc_label(const struct dentry *dentry,
63246 + const struct vfsmount *mnt,
63247 + const int unsafe_flags);
63248 +__u32 gr_acl_handle_hidden_file(const struct dentry *dentry,
63249 + const struct vfsmount *mnt);
63250 +__u32 gr_acl_handle_open(const struct dentry *dentry,
63251 + const struct vfsmount *mnt, int acc_mode);
63252 +__u32 gr_acl_handle_creat(const struct dentry *dentry,
63253 + const struct dentry *p_dentry,
63254 + const struct vfsmount *p_mnt,
63255 + int open_flags, int acc_mode, const int imode);
63256 +void gr_handle_create(const struct dentry *dentry,
63257 + const struct vfsmount *mnt);
63258 +void gr_handle_proc_create(const struct dentry *dentry,
63259 + const struct inode *inode);
63260 +__u32 gr_acl_handle_mknod(const struct dentry *new_dentry,
63261 + const struct dentry *parent_dentry,
63262 + const struct vfsmount *parent_mnt,
63263 + const int mode);
63264 +__u32 gr_acl_handle_mkdir(const struct dentry *new_dentry,
63265 + const struct dentry *parent_dentry,
63266 + const struct vfsmount *parent_mnt);
63267 +__u32 gr_acl_handle_rmdir(const struct dentry *dentry,
63268 + const struct vfsmount *mnt);
63269 +void gr_handle_delete(const ino_t ino, const dev_t dev);
63270 +__u32 gr_acl_handle_unlink(const struct dentry *dentry,
63271 + const struct vfsmount *mnt);
63272 +__u32 gr_acl_handle_symlink(const struct dentry *new_dentry,
63273 + const struct dentry *parent_dentry,
63274 + const struct vfsmount *parent_mnt,
63275 + const char *from);
63276 +__u32 gr_acl_handle_link(const struct dentry *new_dentry,
63277 + const struct dentry *parent_dentry,
63278 + const struct vfsmount *parent_mnt,
63279 + const struct dentry *old_dentry,
63280 + const struct vfsmount *old_mnt, const char *to);
63281 +int gr_handle_symlink_owner(const struct path *link, const struct inode *target);
63282 +int gr_acl_handle_rename(struct dentry *new_dentry,
63283 + struct dentry *parent_dentry,
63284 + const struct vfsmount *parent_mnt,
63285 + struct dentry *old_dentry,
63286 + struct inode *old_parent_inode,
63287 + struct vfsmount *old_mnt, const char *newname);
63288 +void gr_handle_rename(struct inode *old_dir, struct inode *new_dir,
63289 + struct dentry *old_dentry,
63290 + struct dentry *new_dentry,
63291 + struct vfsmount *mnt, const __u8 replace);
63292 +__u32 gr_check_link(const struct dentry *new_dentry,
63293 + const struct dentry *parent_dentry,
63294 + const struct vfsmount *parent_mnt,
63295 + const struct dentry *old_dentry,
63296 + const struct vfsmount *old_mnt);
63297 +int gr_acl_handle_filldir(const struct file *file, const char *name,
63298 + const unsigned int namelen, const ino_t ino);
63299 +
63300 +__u32 gr_acl_handle_unix(const struct dentry *dentry,
63301 + const struct vfsmount *mnt);
63302 +void gr_acl_handle_exit(void);
63303 +void gr_acl_handle_psacct(struct task_struct *task, const long code);
63304 +int gr_acl_handle_procpidmem(const struct task_struct *task);
63305 +int gr_handle_rofs_mount(struct dentry *dentry, struct vfsmount *mnt, int mnt_flags);
63306 +int gr_handle_rofs_blockwrite(struct dentry *dentry, struct vfsmount *mnt, int acc_mode);
63307 +void gr_audit_ptrace(struct task_struct *task);
63308 +dev_t gr_get_dev_from_dentry(struct dentry *dentry);
63309 +void gr_put_exec_file(struct task_struct *task);
63310 +
63311 +int gr_ptrace_readexec(struct file *file, int unsafe_flags);
63312 +
63313 +#ifdef CONFIG_GRKERNSEC
63314 +void task_grsec_rbac(struct seq_file *m, struct task_struct *p);
63315 +void gr_handle_vm86(void);
63316 +void gr_handle_mem_readwrite(u64 from, u64 to);
63317 +
63318 +void gr_log_badprocpid(const char *entry);
63319 +
63320 +extern int grsec_enable_dmesg;
63321 +extern int grsec_disable_privio;
63322 +
63323 +#ifdef CONFIG_GRKERNSEC_PROC_USERGROUP
63324 +extern int grsec_proc_gid;
63325 +#endif
63326 +
63327 +#ifdef CONFIG_GRKERNSEC_CHROOT_FINDTASK
63328 +extern int grsec_enable_chroot_findtask;
63329 +#endif
63330 +#ifdef CONFIG_GRKERNSEC_SETXID
63331 +extern int grsec_enable_setxid;
63332 +#endif
63333 +#endif
63334 +
63335 +#endif
63336 diff --git a/include/linux/grsock.h b/include/linux/grsock.h
63337 new file mode 100644
63338 index 0000000..e7ffaaf
63339 --- /dev/null
63340 +++ b/include/linux/grsock.h
63341 @@ -0,0 +1,19 @@
63342 +#ifndef __GRSOCK_H
63343 +#define __GRSOCK_H
63344 +
63345 +extern void gr_attach_curr_ip(const struct sock *sk);
63346 +extern int gr_handle_sock_all(const int family, const int type,
63347 + const int protocol);
63348 +extern int gr_handle_sock_server(const struct sockaddr *sck);
63349 +extern int gr_handle_sock_server_other(const struct sock *sck);
63350 +extern int gr_handle_sock_client(const struct sockaddr *sck);
63351 +extern int gr_search_connect(struct socket * sock,
63352 + struct sockaddr_in * addr);
63353 +extern int gr_search_bind(struct socket * sock,
63354 + struct sockaddr_in * addr);
63355 +extern int gr_search_listen(struct socket * sock);
63356 +extern int gr_search_accept(struct socket * sock);
63357 +extern int gr_search_socket(const int domain, const int type,
63358 + const int protocol);
63359 +
63360 +#endif
63361 diff --git a/include/linux/hid.h b/include/linux/hid.h
63362 index 42970de..5db3c92 100644
63363 --- a/include/linux/hid.h
63364 +++ b/include/linux/hid.h
63365 @@ -705,7 +705,7 @@ struct hid_ll_driver {
63366 unsigned int code, int value);
63367
63368 int (*parse)(struct hid_device *hdev);
63369 -};
63370 +} __no_const;
63371
63372 #define PM_HINT_FULLON 1<<5
63373 #define PM_HINT_NORMAL 1<<1
63374 diff --git a/include/linux/highmem.h b/include/linux/highmem.h
63375 index ef788b5..ac41b7b 100644
63376 --- a/include/linux/highmem.h
63377 +++ b/include/linux/highmem.h
63378 @@ -189,6 +189,18 @@ static inline void clear_highpage(struct page *page)
63379 kunmap_atomic(kaddr);
63380 }
63381
63382 +static inline void sanitize_highpage(struct page *page)
63383 +{
63384 + void *kaddr;
63385 + unsigned long flags;
63386 +
63387 + local_irq_save(flags);
63388 + kaddr = kmap_atomic(page);
63389 + clear_page(kaddr);
63390 + kunmap_atomic(kaddr);
63391 + local_irq_restore(flags);
63392 +}
63393 +
63394 static inline void zero_user_segments(struct page *page,
63395 unsigned start1, unsigned end1,
63396 unsigned start2, unsigned end2)
63397 diff --git a/include/linux/i2c.h b/include/linux/i2c.h
63398 index 5970266..1c48c3b 100644
63399 --- a/include/linux/i2c.h
63400 +++ b/include/linux/i2c.h
63401 @@ -369,6 +369,7 @@ struct i2c_algorithm {
63402 /* To determine what the adapter supports */
63403 u32 (*functionality) (struct i2c_adapter *);
63404 };
63405 +typedef struct i2c_algorithm __no_const i2c_algorithm_no_const;
63406
63407 /*
63408 * i2c_adapter is the structure used to identify a physical i2c bus along
63409 diff --git a/include/linux/i2o.h b/include/linux/i2o.h
63410 index d23c3c2..eb63c81 100644
63411 --- a/include/linux/i2o.h
63412 +++ b/include/linux/i2o.h
63413 @@ -565,7 +565,7 @@ struct i2o_controller {
63414 struct i2o_device *exec; /* Executive */
63415 #if BITS_PER_LONG == 64
63416 spinlock_t context_list_lock; /* lock for context_list */
63417 - atomic_t context_list_counter; /* needed for unique contexts */
63418 + atomic_unchecked_t context_list_counter; /* needed for unique contexts */
63419 struct list_head context_list; /* list of context id's
63420 and pointers */
63421 #endif
63422 diff --git a/include/linux/if_team.h b/include/linux/if_team.h
63423 index aa2e167..84024ce 100644
63424 --- a/include/linux/if_team.h
63425 +++ b/include/linux/if_team.h
63426 @@ -109,6 +109,7 @@ struct team_mode_ops {
63427 void (*port_enabled)(struct team *team, struct team_port *port);
63428 void (*port_disabled)(struct team *team, struct team_port *port);
63429 };
63430 +typedef struct team_mode_ops __no_const team_mode_ops_no_const;
63431
63432 enum team_option_type {
63433 TEAM_OPTION_TYPE_U32,
63434 @@ -181,7 +182,7 @@ struct team {
63435 struct list_head option_inst_list; /* list of option instances */
63436
63437 const struct team_mode *mode;
63438 - struct team_mode_ops ops;
63439 + team_mode_ops_no_const ops;
63440 long mode_priv[TEAM_MODE_PRIV_LONGS];
63441 };
63442
63443 diff --git a/include/linux/init.h b/include/linux/init.h
63444 index 5e664f6..ba694f0 100644
63445 --- a/include/linux/init.h
63446 +++ b/include/linux/init.h
63447 @@ -39,9 +39,36 @@
63448 * Also note, that this data cannot be "const".
63449 */
63450
63451 +#ifdef MODULE
63452 +#define add_init_latent_entropy
63453 +#define add_devinit_latent_entropy
63454 +#define add_cpuinit_latent_entropy
63455 +#define add_meminit_latent_entropy
63456 +#else
63457 +#define add_init_latent_entropy __latent_entropy
63458 +
63459 +#ifdef CONFIG_HOTPLUG
63460 +#define add_devinit_latent_entropy
63461 +#else
63462 +#define add_devinit_latent_entropy __latent_entropy
63463 +#endif
63464 +
63465 +#ifdef CONFIG_HOTPLUG_CPU
63466 +#define add_cpuinit_latent_entropy
63467 +#else
63468 +#define add_cpuinit_latent_entropy __latent_entropy
63469 +#endif
63470 +
63471 +#ifdef CONFIG_MEMORY_HOTPLUG
63472 +#define add_meminit_latent_entropy
63473 +#else
63474 +#define add_meminit_latent_entropy __latent_entropy
63475 +#endif
63476 +#endif
63477 +
63478 /* These are for everybody (although not all archs will actually
63479 discard it in modules) */
63480 -#define __init __section(.init.text) __cold notrace
63481 +#define __init __section(.init.text) __cold notrace add_init_latent_entropy
63482 #define __initdata __section(.init.data)
63483 #define __initconst __section(.init.rodata)
63484 #define __exitdata __section(.exit.data)
63485 @@ -83,7 +110,7 @@
63486 #define __exit __section(.exit.text) __exitused __cold notrace
63487
63488 /* Used for HOTPLUG */
63489 -#define __devinit __section(.devinit.text) __cold notrace
63490 +#define __devinit __section(.devinit.text) __cold notrace add_devinit_latent_entropy
63491 #define __devinitdata __section(.devinit.data)
63492 #define __devinitconst __section(.devinit.rodata)
63493 #define __devexit __section(.devexit.text) __exitused __cold notrace
63494 @@ -91,7 +118,7 @@
63495 #define __devexitconst __section(.devexit.rodata)
63496
63497 /* Used for HOTPLUG_CPU */
63498 -#define __cpuinit __section(.cpuinit.text) __cold notrace
63499 +#define __cpuinit __section(.cpuinit.text) __cold notrace add_cpuinit_latent_entropy
63500 #define __cpuinitdata __section(.cpuinit.data)
63501 #define __cpuinitconst __section(.cpuinit.rodata)
63502 #define __cpuexit __section(.cpuexit.text) __exitused __cold notrace
63503 @@ -99,7 +126,7 @@
63504 #define __cpuexitconst __section(.cpuexit.rodata)
63505
63506 /* Used for MEMORY_HOTPLUG */
63507 -#define __meminit __section(.meminit.text) __cold notrace
63508 +#define __meminit __section(.meminit.text) __cold notrace add_meminit_latent_entropy
63509 #define __meminitdata __section(.meminit.data)
63510 #define __meminitconst __section(.meminit.rodata)
63511 #define __memexit __section(.memexit.text) __exitused __cold notrace
63512 diff --git a/include/linux/init_task.h b/include/linux/init_task.h
63513 index 89f1cb1..7986c0f 100644
63514 --- a/include/linux/init_task.h
63515 +++ b/include/linux/init_task.h
63516 @@ -143,6 +143,12 @@ extern struct task_group root_task_group;
63517
63518 #define INIT_TASK_COMM "swapper"
63519
63520 +#ifdef CONFIG_X86
63521 +#define INIT_TASK_THREAD_INFO .tinfo = INIT_THREAD_INFO,
63522 +#else
63523 +#define INIT_TASK_THREAD_INFO
63524 +#endif
63525 +
63526 /*
63527 * INIT_TASK is used to set up the first task table, touch at
63528 * your own risk!. Base=0, limit=0x1fffff (=2MB)
63529 @@ -182,6 +188,7 @@ extern struct task_group root_task_group;
63530 RCU_POINTER_INITIALIZER(cred, &init_cred), \
63531 .comm = INIT_TASK_COMM, \
63532 .thread = INIT_THREAD, \
63533 + INIT_TASK_THREAD_INFO \
63534 .fs = &init_fs, \
63535 .files = &init_files, \
63536 .signal = &init_signals, \
63537 diff --git a/include/linux/intel-iommu.h b/include/linux/intel-iommu.h
63538 index 78e2ada..745564d 100644
63539 --- a/include/linux/intel-iommu.h
63540 +++ b/include/linux/intel-iommu.h
63541 @@ -296,7 +296,7 @@ struct iommu_flush {
63542 u8 fm, u64 type);
63543 void (*flush_iotlb)(struct intel_iommu *iommu, u16 did, u64 addr,
63544 unsigned int size_order, u64 type);
63545 -};
63546 +} __no_const;
63547
63548 enum {
63549 SR_DMAR_FECTL_REG,
63550 diff --git a/include/linux/interrupt.h b/include/linux/interrupt.h
63551 index c5f856a..d29c117 100644
63552 --- a/include/linux/interrupt.h
63553 +++ b/include/linux/interrupt.h
63554 @@ -433,7 +433,7 @@ enum
63555 /* map softirq index to softirq name. update 'softirq_to_name' in
63556 * kernel/softirq.c when adding a new softirq.
63557 */
63558 -extern char *softirq_to_name[NR_SOFTIRQS];
63559 +extern const char * const softirq_to_name[NR_SOFTIRQS];
63560
63561 /* softirq mask and active fields moved to irq_cpustat_t in
63562 * asm/hardirq.h to get better cache usage. KAO
63563 @@ -441,12 +441,12 @@ extern char *softirq_to_name[NR_SOFTIRQS];
63564
63565 struct softirq_action
63566 {
63567 - void (*action)(struct softirq_action *);
63568 + void (*action)(void);
63569 };
63570
63571 asmlinkage void do_softirq(void);
63572 asmlinkage void __do_softirq(void);
63573 -extern void open_softirq(int nr, void (*action)(struct softirq_action *));
63574 +extern void open_softirq(int nr, void (*action)(void));
63575 extern void softirq_init(void);
63576 extern void __raise_softirq_irqoff(unsigned int nr);
63577
63578 diff --git a/include/linux/kallsyms.h b/include/linux/kallsyms.h
63579 index 6883e19..06992b1 100644
63580 --- a/include/linux/kallsyms.h
63581 +++ b/include/linux/kallsyms.h
63582 @@ -15,7 +15,8 @@
63583
63584 struct module;
63585
63586 -#ifdef CONFIG_KALLSYMS
63587 +#if !defined(__INCLUDED_BY_HIDESYM) || !defined(CONFIG_KALLSYMS)
63588 +#if defined(CONFIG_KALLSYMS) && !defined(CONFIG_GRKERNSEC_HIDESYM)
63589 /* Lookup the address for a symbol. Returns 0 if not found. */
63590 unsigned long kallsyms_lookup_name(const char *name);
63591
63592 @@ -106,6 +107,17 @@ static inline int lookup_symbol_attrs(unsigned long addr, unsigned long *size, u
63593 /* Stupid that this does nothing, but I didn't create this mess. */
63594 #define __print_symbol(fmt, addr)
63595 #endif /*CONFIG_KALLSYMS*/
63596 +#else /* when included by kallsyms.c, vsnprintf.c, or
63597 + arch/x86/kernel/dumpstack.c, with HIDESYM enabled */
63598 +extern void __print_symbol(const char *fmt, unsigned long address);
63599 +extern int sprint_backtrace(char *buffer, unsigned long address);
63600 +extern int sprint_symbol(char *buffer, unsigned long address);
63601 +extern int sprint_symbol_no_offset(char *buffer, unsigned long address);
63602 +const char *kallsyms_lookup(unsigned long addr,
63603 + unsigned long *symbolsize,
63604 + unsigned long *offset,
63605 + char **modname, char *namebuf);
63606 +#endif
63607
63608 /* This macro allows us to keep printk typechecking */
63609 static __printf(1, 2)
63610 diff --git a/include/linux/kgdb.h b/include/linux/kgdb.h
63611 index c4d2fc1..5df9c19 100644
63612 --- a/include/linux/kgdb.h
63613 +++ b/include/linux/kgdb.h
63614 @@ -53,7 +53,7 @@ extern int kgdb_connected;
63615 extern int kgdb_io_module_registered;
63616
63617 extern atomic_t kgdb_setting_breakpoint;
63618 -extern atomic_t kgdb_cpu_doing_single_step;
63619 +extern atomic_unchecked_t kgdb_cpu_doing_single_step;
63620
63621 extern struct task_struct *kgdb_usethread;
63622 extern struct task_struct *kgdb_contthread;
63623 @@ -252,7 +252,7 @@ struct kgdb_arch {
63624 void (*disable_hw_break)(struct pt_regs *regs);
63625 void (*remove_all_hw_break)(void);
63626 void (*correct_hw_break)(void);
63627 -};
63628 +} __do_const;
63629
63630 /**
63631 * struct kgdb_io - Describe the interface for an I/O driver to talk with KGDB.
63632 @@ -277,7 +277,7 @@ struct kgdb_io {
63633 void (*pre_exception) (void);
63634 void (*post_exception) (void);
63635 int is_console;
63636 -};
63637 +} __do_const;
63638
63639 extern struct kgdb_arch arch_kgdb_ops;
63640
63641 diff --git a/include/linux/kmod.h b/include/linux/kmod.h
63642 index 5398d58..5883a34 100644
63643 --- a/include/linux/kmod.h
63644 +++ b/include/linux/kmod.h
63645 @@ -34,6 +34,8 @@ extern char modprobe_path[]; /* for sysctl */
63646 * usually useless though. */
63647 extern __printf(2, 3)
63648 int __request_module(bool wait, const char *name, ...);
63649 +extern __printf(3, 4)
63650 +int ___request_module(bool wait, char *param_name, const char *name, ...);
63651 #define request_module(mod...) __request_module(true, mod)
63652 #define request_module_nowait(mod...) __request_module(false, mod)
63653 #define try_then_request_module(x, mod...) \
63654 diff --git a/include/linux/kref.h b/include/linux/kref.h
63655 index 65af688..0592677 100644
63656 --- a/include/linux/kref.h
63657 +++ b/include/linux/kref.h
63658 @@ -64,7 +64,7 @@ static inline void kref_get(struct kref *kref)
63659 static inline int kref_sub(struct kref *kref, unsigned int count,
63660 void (*release)(struct kref *kref))
63661 {
63662 - WARN_ON(release == NULL);
63663 + BUG_ON(release == NULL);
63664
63665 if (atomic_sub_and_test((int) count, &kref->refcount)) {
63666 release(kref);
63667 diff --git a/include/linux/kvm_host.h b/include/linux/kvm_host.h
63668 index b70b48b..0d7153b 100644
63669 --- a/include/linux/kvm_host.h
63670 +++ b/include/linux/kvm_host.h
63671 @@ -351,7 +351,7 @@ void kvm_vcpu_uninit(struct kvm_vcpu *vcpu);
63672 void vcpu_load(struct kvm_vcpu *vcpu);
63673 void vcpu_put(struct kvm_vcpu *vcpu);
63674
63675 -int kvm_init(void *opaque, unsigned vcpu_size, unsigned vcpu_align,
63676 +int kvm_init(const void *opaque, unsigned vcpu_size, unsigned vcpu_align,
63677 struct module *module);
63678 void kvm_exit(void);
63679
63680 @@ -517,7 +517,7 @@ int kvm_arch_vcpu_ioctl_set_guest_debug(struct kvm_vcpu *vcpu,
63681 struct kvm_guest_debug *dbg);
63682 int kvm_arch_vcpu_ioctl_run(struct kvm_vcpu *vcpu, struct kvm_run *kvm_run);
63683
63684 -int kvm_arch_init(void *opaque);
63685 +int kvm_arch_init(const void *opaque);
63686 void kvm_arch_exit(void);
63687
63688 int kvm_arch_vcpu_init(struct kvm_vcpu *vcpu);
63689 diff --git a/include/linux/libata.h b/include/linux/libata.h
63690 index 64f90e1..32b945b 100644
63691 --- a/include/linux/libata.h
63692 +++ b/include/linux/libata.h
63693 @@ -909,7 +909,7 @@ struct ata_port_operations {
63694 * fields must be pointers.
63695 */
63696 const struct ata_port_operations *inherits;
63697 -};
63698 +} __do_const;
63699
63700 struct ata_port_info {
63701 unsigned long flags;
63702 diff --git a/include/linux/memory.h b/include/linux/memory.h
63703 index ff9a9f8..c715deb 100644
63704 --- a/include/linux/memory.h
63705 +++ b/include/linux/memory.h
63706 @@ -143,7 +143,7 @@ struct memory_accessor {
63707 size_t count);
63708 ssize_t (*write)(struct memory_accessor *, const char *buf,
63709 off_t offset, size_t count);
63710 -};
63711 +} __no_const;
63712
63713 /*
63714 * Kernel text modification mutex, used for code patching. Users of this lock
63715 diff --git a/include/linux/mfd/abx500.h b/include/linux/mfd/abx500.h
63716 index 1318ca6..7521340 100644
63717 --- a/include/linux/mfd/abx500.h
63718 +++ b/include/linux/mfd/abx500.h
63719 @@ -452,6 +452,7 @@ struct abx500_ops {
63720 int (*event_registers_startup_state_get) (struct device *, u8 *);
63721 int (*startup_irq_enabled) (struct device *, unsigned int);
63722 };
63723 +typedef struct abx500_ops __no_const abx500_ops_no_const;
63724
63725 int abx500_register_ops(struct device *core_dev, struct abx500_ops *ops);
63726 void abx500_remove_ops(struct device *dev);
63727 diff --git a/include/linux/mfd/abx500/ux500_chargalg.h b/include/linux/mfd/abx500/ux500_chargalg.h
63728 index 9b07725..3d55001 100644
63729 --- a/include/linux/mfd/abx500/ux500_chargalg.h
63730 +++ b/include/linux/mfd/abx500/ux500_chargalg.h
63731 @@ -19,7 +19,7 @@ struct ux500_charger_ops {
63732 int (*enable) (struct ux500_charger *, int, int, int);
63733 int (*kick_wd) (struct ux500_charger *);
63734 int (*update_curr) (struct ux500_charger *, int);
63735 -};
63736 +} __no_const;
63737
63738 /**
63739 * struct ux500_charger - power supply ux500 charger sub class
63740 diff --git a/include/linux/mm.h b/include/linux/mm.h
63741 index 311be90..5f1638c 100644
63742 --- a/include/linux/mm.h
63743 +++ b/include/linux/mm.h
63744 @@ -116,7 +116,14 @@ extern unsigned int kobjsize(const void *objp);
63745
63746 #define VM_CAN_NONLINEAR 0x08000000 /* Has ->fault & does nonlinear pages */
63747 #define VM_MIXEDMAP 0x10000000 /* Can contain "struct page" and pure PFN pages */
63748 +
63749 +#if defined(CONFIG_PAX_PAGEEXEC) && defined(CONFIG_X86_32)
63750 +#define VM_SAO 0x00000000 /* Strong Access Ordering (powerpc) */
63751 +#define VM_PAGEEXEC 0x20000000 /* vma->vm_page_prot needs special handling */
63752 +#else
63753 #define VM_SAO 0x20000000 /* Strong Access Ordering (powerpc) */
63754 +#endif
63755 +
63756 #define VM_PFN_AT_MMAP 0x40000000 /* PFNMAP vma that is fully mapped at mmap time */
63757 #define VM_MERGEABLE 0x80000000 /* KSM may merge identical pages */
63758
63759 @@ -1038,34 +1045,6 @@ int set_page_dirty(struct page *page);
63760 int set_page_dirty_lock(struct page *page);
63761 int clear_page_dirty_for_io(struct page *page);
63762
63763 -/* Is the vma a continuation of the stack vma above it? */
63764 -static inline int vma_growsdown(struct vm_area_struct *vma, unsigned long addr)
63765 -{
63766 - return vma && (vma->vm_end == addr) && (vma->vm_flags & VM_GROWSDOWN);
63767 -}
63768 -
63769 -static inline int stack_guard_page_start(struct vm_area_struct *vma,
63770 - unsigned long addr)
63771 -{
63772 - return (vma->vm_flags & VM_GROWSDOWN) &&
63773 - (vma->vm_start == addr) &&
63774 - !vma_growsdown(vma->vm_prev, addr);
63775 -}
63776 -
63777 -/* Is the vma a continuation of the stack vma below it? */
63778 -static inline int vma_growsup(struct vm_area_struct *vma, unsigned long addr)
63779 -{
63780 - return vma && (vma->vm_start == addr) && (vma->vm_flags & VM_GROWSUP);
63781 -}
63782 -
63783 -static inline int stack_guard_page_end(struct vm_area_struct *vma,
63784 - unsigned long addr)
63785 -{
63786 - return (vma->vm_flags & VM_GROWSUP) &&
63787 - (vma->vm_end == addr) &&
63788 - !vma_growsup(vma->vm_next, addr);
63789 -}
63790 -
63791 extern pid_t
63792 vm_is_stack(struct task_struct *task, struct vm_area_struct *vma, int in_group);
63793
63794 @@ -1164,6 +1143,15 @@ static inline void sync_mm_rss(struct mm_struct *mm)
63795 }
63796 #endif
63797
63798 +#ifdef CONFIG_MMU
63799 +pgprot_t vm_get_page_prot(vm_flags_t vm_flags);
63800 +#else
63801 +static inline pgprot_t vm_get_page_prot(vm_flags_t vm_flags)
63802 +{
63803 + return __pgprot(0);
63804 +}
63805 +#endif
63806 +
63807 int vma_wants_writenotify(struct vm_area_struct *vma);
63808
63809 extern pte_t *__get_locked_pte(struct mm_struct *mm, unsigned long addr,
63810 @@ -1182,8 +1170,15 @@ static inline int __pud_alloc(struct mm_struct *mm, pgd_t *pgd,
63811 {
63812 return 0;
63813 }
63814 +
63815 +static inline int __pud_alloc_kernel(struct mm_struct *mm, pgd_t *pgd,
63816 + unsigned long address)
63817 +{
63818 + return 0;
63819 +}
63820 #else
63821 int __pud_alloc(struct mm_struct *mm, pgd_t *pgd, unsigned long address);
63822 +int __pud_alloc_kernel(struct mm_struct *mm, pgd_t *pgd, unsigned long address);
63823 #endif
63824
63825 #ifdef __PAGETABLE_PMD_FOLDED
63826 @@ -1192,8 +1187,15 @@ static inline int __pmd_alloc(struct mm_struct *mm, pud_t *pud,
63827 {
63828 return 0;
63829 }
63830 +
63831 +static inline int __pmd_alloc_kernel(struct mm_struct *mm, pud_t *pud,
63832 + unsigned long address)
63833 +{
63834 + return 0;
63835 +}
63836 #else
63837 int __pmd_alloc(struct mm_struct *mm, pud_t *pud, unsigned long address);
63838 +int __pmd_alloc_kernel(struct mm_struct *mm, pud_t *pud, unsigned long address);
63839 #endif
63840
63841 int __pte_alloc(struct mm_struct *mm, struct vm_area_struct *vma,
63842 @@ -1211,11 +1213,23 @@ static inline pud_t *pud_alloc(struct mm_struct *mm, pgd_t *pgd, unsigned long a
63843 NULL: pud_offset(pgd, address);
63844 }
63845
63846 +static inline pud_t *pud_alloc_kernel(struct mm_struct *mm, pgd_t *pgd, unsigned long address)
63847 +{
63848 + return (unlikely(pgd_none(*pgd)) && __pud_alloc_kernel(mm, pgd, address))?
63849 + NULL: pud_offset(pgd, address);
63850 +}
63851 +
63852 static inline pmd_t *pmd_alloc(struct mm_struct *mm, pud_t *pud, unsigned long address)
63853 {
63854 return (unlikely(pud_none(*pud)) && __pmd_alloc(mm, pud, address))?
63855 NULL: pmd_offset(pud, address);
63856 }
63857 +
63858 +static inline pmd_t *pmd_alloc_kernel(struct mm_struct *mm, pud_t *pud, unsigned long address)
63859 +{
63860 + return (unlikely(pud_none(*pud)) && __pmd_alloc_kernel(mm, pud, address))?
63861 + NULL: pmd_offset(pud, address);
63862 +}
63863 #endif /* CONFIG_MMU && !__ARCH_HAS_4LEVEL_HACK */
63864
63865 #if USE_SPLIT_PTLOCKS
63866 @@ -1426,6 +1440,7 @@ extern unsigned long do_mmap_pgoff(struct file *, unsigned long,
63867 unsigned long, unsigned long,
63868 unsigned long, unsigned long);
63869 extern int do_munmap(struct mm_struct *, unsigned long, size_t);
63870 +extern int __do_munmap(struct mm_struct *, unsigned long, size_t);
63871
63872 /* These take the mm semaphore themselves */
63873 extern unsigned long vm_brk(unsigned long, unsigned long);
63874 @@ -1489,6 +1504,10 @@ extern struct vm_area_struct * find_vma(struct mm_struct * mm, unsigned long add
63875 extern struct vm_area_struct * find_vma_prev(struct mm_struct * mm, unsigned long addr,
63876 struct vm_area_struct **pprev);
63877
63878 +extern struct vm_area_struct *pax_find_mirror_vma(struct vm_area_struct *vma);
63879 +extern __must_check long pax_mirror_vma(struct vm_area_struct *vma_m, struct vm_area_struct *vma);
63880 +extern void pax_mirror_file_pte(struct vm_area_struct *vma, unsigned long address, struct page *page_m, spinlock_t *ptl);
63881 +
63882 /* Look up the first VMA which intersects the interval start_addr..end_addr-1,
63883 NULL if none. Assume start_addr < end_addr. */
63884 static inline struct vm_area_struct * find_vma_intersection(struct mm_struct * mm, unsigned long start_addr, unsigned long end_addr)
63885 @@ -1517,15 +1536,6 @@ static inline struct vm_area_struct *find_exact_vma(struct mm_struct *mm,
63886 return vma;
63887 }
63888
63889 -#ifdef CONFIG_MMU
63890 -pgprot_t vm_get_page_prot(unsigned long vm_flags);
63891 -#else
63892 -static inline pgprot_t vm_get_page_prot(unsigned long vm_flags)
63893 -{
63894 - return __pgprot(0);
63895 -}
63896 -#endif
63897 -
63898 struct vm_area_struct *find_extend_vma(struct mm_struct *, unsigned long addr);
63899 int remap_pfn_range(struct vm_area_struct *, unsigned long addr,
63900 unsigned long pfn, unsigned long size, pgprot_t);
63901 @@ -1631,7 +1641,7 @@ extern int unpoison_memory(unsigned long pfn);
63902 extern int sysctl_memory_failure_early_kill;
63903 extern int sysctl_memory_failure_recovery;
63904 extern void shake_page(struct page *p, int access);
63905 -extern atomic_long_t mce_bad_pages;
63906 +extern atomic_long_unchecked_t mce_bad_pages;
63907 extern int soft_offline_page(struct page *page, int flags);
63908
63909 extern void dump_page(struct page *page);
63910 @@ -1662,5 +1672,11 @@ static inline unsigned int debug_guardpage_minorder(void) { return 0; }
63911 static inline bool page_is_guard(struct page *page) { return false; }
63912 #endif /* CONFIG_DEBUG_PAGEALLOC */
63913
63914 +#ifdef CONFIG_ARCH_TRACK_EXEC_LIMIT
63915 +extern void track_exec_limit(struct mm_struct *mm, unsigned long start, unsigned long end, unsigned long prot);
63916 +#else
63917 +static inline void track_exec_limit(struct mm_struct *mm, unsigned long start, unsigned long end, unsigned long prot) {}
63918 +#endif
63919 +
63920 #endif /* __KERNEL__ */
63921 #endif /* _LINUX_MM_H */
63922 diff --git a/include/linux/mm_types.h b/include/linux/mm_types.h
63923 index bf78672..debc693 100644
63924 --- a/include/linux/mm_types.h
63925 +++ b/include/linux/mm_types.h
63926 @@ -279,6 +279,8 @@ struct vm_area_struct {
63927 #ifdef CONFIG_NUMA
63928 struct mempolicy *vm_policy; /* NUMA policy for the VMA */
63929 #endif
63930 +
63931 + struct vm_area_struct *vm_mirror;/* PaX: mirror vma or NULL */
63932 };
63933
63934 struct core_thread {
63935 @@ -353,7 +355,7 @@ struct mm_struct {
63936 unsigned long def_flags;
63937 unsigned long nr_ptes; /* Page table pages */
63938 unsigned long start_code, end_code, start_data, end_data;
63939 - unsigned long start_brk, brk, start_stack;
63940 + unsigned long brk_gap, start_brk, brk, start_stack;
63941 unsigned long arg_start, arg_end, env_start, env_end;
63942
63943 unsigned long saved_auxv[AT_VECTOR_SIZE]; /* for /proc/PID/auxv */
63944 @@ -405,6 +407,24 @@ struct mm_struct {
63945 struct cpumask cpumask_allocation;
63946 #endif
63947 struct uprobes_state uprobes_state;
63948 +
63949 +#if defined(CONFIG_PAX_NOEXEC) || defined(CONFIG_PAX_ASLR)
63950 + unsigned long pax_flags;
63951 +#endif
63952 +
63953 +#ifdef CONFIG_PAX_DLRESOLVE
63954 + unsigned long call_dl_resolve;
63955 +#endif
63956 +
63957 +#if defined(CONFIG_PPC32) && defined(CONFIG_PAX_EMUSIGRT)
63958 + unsigned long call_syscall;
63959 +#endif
63960 +
63961 +#ifdef CONFIG_PAX_ASLR
63962 + unsigned long delta_mmap; /* randomized offset */
63963 + unsigned long delta_stack; /* randomized offset */
63964 +#endif
63965 +
63966 };
63967
63968 static inline void mm_init_cpumask(struct mm_struct *mm)
63969 diff --git a/include/linux/mmu_notifier.h b/include/linux/mmu_notifier.h
63970 index 1d1b1e1..2a13c78 100644
63971 --- a/include/linux/mmu_notifier.h
63972 +++ b/include/linux/mmu_notifier.h
63973 @@ -255,12 +255,12 @@ static inline void mmu_notifier_mm_destroy(struct mm_struct *mm)
63974 */
63975 #define ptep_clear_flush_notify(__vma, __address, __ptep) \
63976 ({ \
63977 - pte_t __pte; \
63978 + pte_t ___pte; \
63979 struct vm_area_struct *___vma = __vma; \
63980 unsigned long ___address = __address; \
63981 - __pte = ptep_clear_flush(___vma, ___address, __ptep); \
63982 + ___pte = ptep_clear_flush(___vma, ___address, __ptep); \
63983 mmu_notifier_invalidate_page(___vma->vm_mm, ___address); \
63984 - __pte; \
63985 + ___pte; \
63986 })
63987
63988 #define pmdp_clear_flush_notify(__vma, __address, __pmdp) \
63989 diff --git a/include/linux/mmzone.h b/include/linux/mmzone.h
63990 index a16d929..860ae00 100644
63991 --- a/include/linux/mmzone.h
63992 +++ b/include/linux/mmzone.h
63993 @@ -414,7 +414,7 @@ struct zone {
63994 unsigned long flags; /* zone flags, see below */
63995
63996 /* Zone statistics */
63997 - atomic_long_t vm_stat[NR_VM_ZONE_STAT_ITEMS];
63998 + atomic_long_unchecked_t vm_stat[NR_VM_ZONE_STAT_ITEMS];
63999
64000 /*
64001 * The target ratio of ACTIVE_ANON to INACTIVE_ANON pages on
64002 diff --git a/include/linux/mod_devicetable.h b/include/linux/mod_devicetable.h
64003 index 6955045..ebdb7cd 100644
64004 --- a/include/linux/mod_devicetable.h
64005 +++ b/include/linux/mod_devicetable.h
64006 @@ -12,7 +12,7 @@
64007 typedef unsigned long kernel_ulong_t;
64008 #endif
64009
64010 -#define PCI_ANY_ID (~0)
64011 +#define PCI_ANY_ID ((__u16)~0)
64012
64013 struct pci_device_id {
64014 __u32 vendor, device; /* Vendor and device ID or PCI_ANY_ID*/
64015 @@ -139,7 +139,7 @@ struct usb_device_id {
64016 #define USB_DEVICE_ID_MATCH_INT_PROTOCOL 0x0200
64017 #define USB_DEVICE_ID_MATCH_INT_NUMBER 0x0400
64018
64019 -#define HID_ANY_ID (~0)
64020 +#define HID_ANY_ID (~0U)
64021 #define HID_BUS_ANY 0xffff
64022 #define HID_GROUP_ANY 0x0000
64023
64024 diff --git a/include/linux/module.h b/include/linux/module.h
64025 index fbcafe2..e5d9587 100644
64026 --- a/include/linux/module.h
64027 +++ b/include/linux/module.h
64028 @@ -17,6 +17,7 @@
64029 #include <linux/moduleparam.h>
64030 #include <linux/tracepoint.h>
64031 #include <linux/export.h>
64032 +#include <linux/fs.h>
64033
64034 #include <linux/percpu.h>
64035 #include <asm/module.h>
64036 @@ -273,19 +274,16 @@ struct module
64037 int (*init)(void);
64038
64039 /* If this is non-NULL, vfree after init() returns */
64040 - void *module_init;
64041 + void *module_init_rx, *module_init_rw;
64042
64043 /* Here is the actual code + data, vfree'd on unload. */
64044 - void *module_core;
64045 + void *module_core_rx, *module_core_rw;
64046
64047 /* Here are the sizes of the init and core sections */
64048 - unsigned int init_size, core_size;
64049 + unsigned int init_size_rw, core_size_rw;
64050
64051 /* The size of the executable code in each section. */
64052 - unsigned int init_text_size, core_text_size;
64053 -
64054 - /* Size of RO sections of the module (text+rodata) */
64055 - unsigned int init_ro_size, core_ro_size;
64056 + unsigned int init_size_rx, core_size_rx;
64057
64058 /* Arch-specific module values */
64059 struct mod_arch_specific arch;
64060 @@ -341,6 +339,10 @@ struct module
64061 #ifdef CONFIG_EVENT_TRACING
64062 struct ftrace_event_call **trace_events;
64063 unsigned int num_trace_events;
64064 + struct file_operations trace_id;
64065 + struct file_operations trace_enable;
64066 + struct file_operations trace_format;
64067 + struct file_operations trace_filter;
64068 #endif
64069 #ifdef CONFIG_FTRACE_MCOUNT_RECORD
64070 unsigned int num_ftrace_callsites;
64071 @@ -388,16 +390,46 @@ bool is_module_address(unsigned long addr);
64072 bool is_module_percpu_address(unsigned long addr);
64073 bool is_module_text_address(unsigned long addr);
64074
64075 +static inline int within_module_range(unsigned long addr, void *start, unsigned long size)
64076 +{
64077 +
64078 +#ifdef CONFIG_PAX_KERNEXEC
64079 + if (ktla_ktva(addr) >= (unsigned long)start &&
64080 + ktla_ktva(addr) < (unsigned long)start + size)
64081 + return 1;
64082 +#endif
64083 +
64084 + return ((void *)addr >= start && (void *)addr < start + size);
64085 +}
64086 +
64087 +static inline int within_module_core_rx(unsigned long addr, struct module *mod)
64088 +{
64089 + return within_module_range(addr, mod->module_core_rx, mod->core_size_rx);
64090 +}
64091 +
64092 +static inline int within_module_core_rw(unsigned long addr, struct module *mod)
64093 +{
64094 + return within_module_range(addr, mod->module_core_rw, mod->core_size_rw);
64095 +}
64096 +
64097 +static inline int within_module_init_rx(unsigned long addr, struct module *mod)
64098 +{
64099 + return within_module_range(addr, mod->module_init_rx, mod->init_size_rx);
64100 +}
64101 +
64102 +static inline int within_module_init_rw(unsigned long addr, struct module *mod)
64103 +{
64104 + return within_module_range(addr, mod->module_init_rw, mod->init_size_rw);
64105 +}
64106 +
64107 static inline int within_module_core(unsigned long addr, struct module *mod)
64108 {
64109 - return (unsigned long)mod->module_core <= addr &&
64110 - addr < (unsigned long)mod->module_core + mod->core_size;
64111 + return within_module_core_rx(addr, mod) || within_module_core_rw(addr, mod);
64112 }
64113
64114 static inline int within_module_init(unsigned long addr, struct module *mod)
64115 {
64116 - return (unsigned long)mod->module_init <= addr &&
64117 - addr < (unsigned long)mod->module_init + mod->init_size;
64118 + return within_module_init_rx(addr, mod) || within_module_init_rw(addr, mod);
64119 }
64120
64121 /* Search for module by name: must hold module_mutex. */
64122 diff --git a/include/linux/moduleloader.h b/include/linux/moduleloader.h
64123 index b2be02e..72d2f78 100644
64124 --- a/include/linux/moduleloader.h
64125 +++ b/include/linux/moduleloader.h
64126 @@ -23,11 +23,23 @@ unsigned int arch_mod_section_prepend(struct module *mod, unsigned int section);
64127
64128 /* Allocator used for allocating struct module, core sections and init
64129 sections. Returns NULL on failure. */
64130 -void *module_alloc(unsigned long size);
64131 +void *module_alloc(unsigned long size) __size_overflow(1);
64132 +
64133 +#ifdef CONFIG_PAX_KERNEXEC
64134 +void *module_alloc_exec(unsigned long size) __size_overflow(1);
64135 +#else
64136 +#define module_alloc_exec(x) module_alloc(x)
64137 +#endif
64138
64139 /* Free memory returned from module_alloc. */
64140 void module_free(struct module *mod, void *module_region);
64141
64142 +#ifdef CONFIG_PAX_KERNEXEC
64143 +void module_free_exec(struct module *mod, void *module_region);
64144 +#else
64145 +#define module_free_exec(x, y) module_free((x), (y))
64146 +#endif
64147 +
64148 /* Apply the given relocation to the (simplified) ELF. Return -error
64149 or 0. */
64150 int apply_relocate(Elf_Shdr *sechdrs,
64151 diff --git a/include/linux/moduleparam.h b/include/linux/moduleparam.h
64152 index d6a5806..7c13347 100644
64153 --- a/include/linux/moduleparam.h
64154 +++ b/include/linux/moduleparam.h
64155 @@ -286,7 +286,7 @@ static inline void __kernel_param_unlock(void)
64156 * @len is usually just sizeof(string).
64157 */
64158 #define module_param_string(name, string, len, perm) \
64159 - static const struct kparam_string __param_string_##name \
64160 + static const struct kparam_string __param_string_##name __used \
64161 = { len, string }; \
64162 __module_param_call(MODULE_PARAM_PREFIX, name, \
64163 &param_ops_string, \
64164 @@ -425,7 +425,7 @@ extern int param_set_bint(const char *val, const struct kernel_param *kp);
64165 */
64166 #define module_param_array_named(name, array, type, nump, perm) \
64167 param_check_##type(name, &(array)[0]); \
64168 - static const struct kparam_array __param_arr_##name \
64169 + static const struct kparam_array __param_arr_##name __used \
64170 = { .max = ARRAY_SIZE(array), .num = nump, \
64171 .ops = &param_ops_##type, \
64172 .elemsize = sizeof(array[0]), .elem = array }; \
64173 diff --git a/include/linux/namei.h b/include/linux/namei.h
64174 index 4bf19d8..5268cea 100644
64175 --- a/include/linux/namei.h
64176 +++ b/include/linux/namei.h
64177 @@ -18,7 +18,7 @@ struct nameidata {
64178 unsigned seq;
64179 int last_type;
64180 unsigned depth;
64181 - char *saved_names[MAX_NESTED_LINKS + 1];
64182 + const char *saved_names[MAX_NESTED_LINKS + 1];
64183 };
64184
64185 /*
64186 @@ -83,12 +83,12 @@ extern void unlock_rename(struct dentry *, struct dentry *);
64187
64188 extern void nd_jump_link(struct nameidata *nd, struct path *path);
64189
64190 -static inline void nd_set_link(struct nameidata *nd, char *path)
64191 +static inline void nd_set_link(struct nameidata *nd, const char *path)
64192 {
64193 nd->saved_names[nd->depth] = path;
64194 }
64195
64196 -static inline char *nd_get_link(struct nameidata *nd)
64197 +static inline const char *nd_get_link(const struct nameidata *nd)
64198 {
64199 return nd->saved_names[nd->depth];
64200 }
64201 diff --git a/include/linux/netdevice.h b/include/linux/netdevice.h
64202 index 59dc05f3..c905a34 100644
64203 --- a/include/linux/netdevice.h
64204 +++ b/include/linux/netdevice.h
64205 @@ -1027,6 +1027,7 @@ struct net_device_ops {
64206 struct net_device *dev,
64207 int idx);
64208 };
64209 +typedef struct net_device_ops __no_const net_device_ops_no_const;
64210
64211 /*
64212 * The DEVICE structure.
64213 @@ -1087,7 +1088,7 @@ struct net_device {
64214 int iflink;
64215
64216 struct net_device_stats stats;
64217 - atomic_long_t rx_dropped; /* dropped packets by core network
64218 + atomic_long_unchecked_t rx_dropped; /* dropped packets by core network
64219 * Do not use this in drivers.
64220 */
64221
64222 diff --git a/include/linux/netfilter/xt_gradm.h b/include/linux/netfilter/xt_gradm.h
64223 new file mode 100644
64224 index 0000000..33f4af8
64225 --- /dev/null
64226 +++ b/include/linux/netfilter/xt_gradm.h
64227 @@ -0,0 +1,9 @@
64228 +#ifndef _LINUX_NETFILTER_XT_GRADM_H
64229 +#define _LINUX_NETFILTER_XT_GRADM_H 1
64230 +
64231 +struct xt_gradm_mtinfo {
64232 + __u16 flags;
64233 + __u16 invflags;
64234 +};
64235 +
64236 +#endif
64237 diff --git a/include/linux/of_pdt.h b/include/linux/of_pdt.h
64238 index c65a18a..0c05f3a 100644
64239 --- a/include/linux/of_pdt.h
64240 +++ b/include/linux/of_pdt.h
64241 @@ -32,7 +32,7 @@ struct of_pdt_ops {
64242
64243 /* return 0 on success; fill in 'len' with number of bytes in path */
64244 int (*pkg2path)(phandle node, char *buf, const int buflen, int *len);
64245 -};
64246 +} __no_const;
64247
64248 extern void *prom_early_alloc(unsigned long size);
64249
64250 diff --git a/include/linux/oprofile.h b/include/linux/oprofile.h
64251 index a4c5624..79d6d88 100644
64252 --- a/include/linux/oprofile.h
64253 +++ b/include/linux/oprofile.h
64254 @@ -139,9 +139,9 @@ int oprofilefs_create_ulong(struct super_block * sb, struct dentry * root,
64255 int oprofilefs_create_ro_ulong(struct super_block * sb, struct dentry * root,
64256 char const * name, ulong * val);
64257
64258 -/** Create a file for read-only access to an atomic_t. */
64259 +/** Create a file for read-only access to an atomic_unchecked_t. */
64260 int oprofilefs_create_ro_atomic(struct super_block * sb, struct dentry * root,
64261 - char const * name, atomic_t * val);
64262 + char const * name, atomic_unchecked_t * val);
64263
64264 /** create a directory */
64265 struct dentry * oprofilefs_mkdir(struct super_block * sb, struct dentry * root,
64266 diff --git a/include/linux/perf_event.h b/include/linux/perf_event.h
64267 index bdb4161..f373d41 100644
64268 --- a/include/linux/perf_event.h
64269 +++ b/include/linux/perf_event.h
64270 @@ -882,8 +882,8 @@ struct perf_event {
64271
64272 enum perf_event_active_state state;
64273 unsigned int attach_state;
64274 - local64_t count;
64275 - atomic64_t child_count;
64276 + local64_t count; /* PaX: fix it one day */
64277 + atomic64_unchecked_t child_count;
64278
64279 /*
64280 * These are the total time in nanoseconds that the event
64281 @@ -934,8 +934,8 @@ struct perf_event {
64282 * These accumulate total time (in nanoseconds) that children
64283 * events have been enabled and running, respectively.
64284 */
64285 - atomic64_t child_total_time_enabled;
64286 - atomic64_t child_total_time_running;
64287 + atomic64_unchecked_t child_total_time_enabled;
64288 + atomic64_unchecked_t child_total_time_running;
64289
64290 /*
64291 * Protect attach/detach and child_list:
64292 diff --git a/include/linux/personality.h b/include/linux/personality.h
64293 index 8fc7dd1a..c19d89e 100644
64294 --- a/include/linux/personality.h
64295 +++ b/include/linux/personality.h
64296 @@ -44,6 +44,7 @@ enum {
64297 #define PER_CLEAR_ON_SETID (READ_IMPLIES_EXEC | \
64298 ADDR_NO_RANDOMIZE | \
64299 ADDR_COMPAT_LAYOUT | \
64300 + ADDR_LIMIT_3GB | \
64301 MMAP_PAGE_ZERO)
64302
64303 /*
64304 diff --git a/include/linux/pipe_fs_i.h b/include/linux/pipe_fs_i.h
64305 index ad1a427..6419649 100644
64306 --- a/include/linux/pipe_fs_i.h
64307 +++ b/include/linux/pipe_fs_i.h
64308 @@ -45,9 +45,9 @@ struct pipe_buffer {
64309 struct pipe_inode_info {
64310 wait_queue_head_t wait;
64311 unsigned int nrbufs, curbuf, buffers;
64312 - unsigned int readers;
64313 - unsigned int writers;
64314 - unsigned int waiting_writers;
64315 + atomic_t readers;
64316 + atomic_t writers;
64317 + atomic_t waiting_writers;
64318 unsigned int r_counter;
64319 unsigned int w_counter;
64320 struct page *tmp_page;
64321 diff --git a/include/linux/pm_runtime.h b/include/linux/pm_runtime.h
64322 index f271860..6b3bec5 100644
64323 --- a/include/linux/pm_runtime.h
64324 +++ b/include/linux/pm_runtime.h
64325 @@ -97,7 +97,7 @@ static inline bool pm_runtime_callbacks_present(struct device *dev)
64326
64327 static inline void pm_runtime_mark_last_busy(struct device *dev)
64328 {
64329 - ACCESS_ONCE(dev->power.last_busy) = jiffies;
64330 + ACCESS_ONCE_RW(dev->power.last_busy) = jiffies;
64331 }
64332
64333 #else /* !CONFIG_PM_RUNTIME */
64334 diff --git a/include/linux/poison.h b/include/linux/poison.h
64335 index 2110a81..13a11bb 100644
64336 --- a/include/linux/poison.h
64337 +++ b/include/linux/poison.h
64338 @@ -19,8 +19,8 @@
64339 * under normal circumstances, used to verify that nobody uses
64340 * non-initialized list entries.
64341 */
64342 -#define LIST_POISON1 ((void *) 0x00100100 + POISON_POINTER_DELTA)
64343 -#define LIST_POISON2 ((void *) 0x00200200 + POISON_POINTER_DELTA)
64344 +#define LIST_POISON1 ((void *) (long)0xFFFFFF01)
64345 +#define LIST_POISON2 ((void *) (long)0xFFFFFF02)
64346
64347 /********** include/linux/timer.h **********/
64348 /*
64349 diff --git a/include/linux/preempt.h b/include/linux/preempt.h
64350 index 5a710b9..0b0dab9 100644
64351 --- a/include/linux/preempt.h
64352 +++ b/include/linux/preempt.h
64353 @@ -126,7 +126,7 @@ struct preempt_ops {
64354 void (*sched_in)(struct preempt_notifier *notifier, int cpu);
64355 void (*sched_out)(struct preempt_notifier *notifier,
64356 struct task_struct *next);
64357 -};
64358 +} __no_const;
64359
64360 /**
64361 * preempt_notifier - key for installing preemption notifiers
64362 diff --git a/include/linux/printk.h b/include/linux/printk.h
64363 index 9afc01e..92c32e8 100644
64364 --- a/include/linux/printk.h
64365 +++ b/include/linux/printk.h
64366 @@ -101,6 +101,8 @@ void early_printk(const char *fmt, ...);
64367 extern int printk_needs_cpu(int cpu);
64368 extern void printk_tick(void);
64369
64370 +extern int kptr_restrict;
64371 +
64372 #ifdef CONFIG_PRINTK
64373 asmlinkage __printf(5, 0)
64374 int vprintk_emit(int facility, int level,
64375 @@ -135,7 +137,6 @@ extern bool printk_timed_ratelimit(unsigned long *caller_jiffies,
64376
64377 extern int printk_delay_msec;
64378 extern int dmesg_restrict;
64379 -extern int kptr_restrict;
64380
64381 void log_buf_kexec_setup(void);
64382 void __init setup_log_buf(int early);
64383 diff --git a/include/linux/proc_fs.h b/include/linux/proc_fs.h
64384 index 3fd2e87..d93a721 100644
64385 --- a/include/linux/proc_fs.h
64386 +++ b/include/linux/proc_fs.h
64387 @@ -155,6 +155,18 @@ static inline struct proc_dir_entry *proc_create(const char *name, umode_t mode,
64388 return proc_create_data(name, mode, parent, proc_fops, NULL);
64389 }
64390
64391 +static inline struct proc_dir_entry *proc_create_grsec(const char *name, umode_t mode,
64392 + struct proc_dir_entry *parent, const struct file_operations *proc_fops)
64393 +{
64394 +#ifdef CONFIG_GRKERNSEC_PROC_USER
64395 + return proc_create_data(name, S_IRUSR, parent, proc_fops, NULL);
64396 +#elif defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
64397 + return proc_create_data(name, S_IRUSR | S_IRGRP, parent, proc_fops, NULL);
64398 +#else
64399 + return proc_create_data(name, mode, parent, proc_fops, NULL);
64400 +#endif
64401 +}
64402 +
64403 static inline struct proc_dir_entry *create_proc_read_entry(const char *name,
64404 umode_t mode, struct proc_dir_entry *base,
64405 read_proc_t *read_proc, void * data)
64406 @@ -258,7 +270,7 @@ union proc_op {
64407 int (*proc_show)(struct seq_file *m,
64408 struct pid_namespace *ns, struct pid *pid,
64409 struct task_struct *task);
64410 -};
64411 +} __no_const;
64412
64413 struct ctl_table_header;
64414 struct ctl_table;
64415 diff --git a/include/linux/random.h b/include/linux/random.h
64416 index ac621ce..c1215f3 100644
64417 --- a/include/linux/random.h
64418 +++ b/include/linux/random.h
64419 @@ -53,6 +53,10 @@ extern void add_input_randomness(unsigned int type, unsigned int code,
64420 unsigned int value);
64421 extern void add_interrupt_randomness(int irq, int irq_flags);
64422
64423 +#ifdef CONFIG_PAX_LATENT_ENTROPY
64424 +extern void transfer_latent_entropy(void);
64425 +#endif
64426 +
64427 extern void get_random_bytes(void *buf, int nbytes);
64428 extern void get_random_bytes_arch(void *buf, int nbytes);
64429 void generate_random_uuid(unsigned char uuid_out[16]);
64430 @@ -69,12 +73,17 @@ void srandom32(u32 seed);
64431
64432 u32 prandom32(struct rnd_state *);
64433
64434 +static inline unsigned long pax_get_random_long(void)
64435 +{
64436 + return random32() + (sizeof(long) > 4 ? (unsigned long)random32() << 32 : 0);
64437 +}
64438 +
64439 /*
64440 * Handle minimum values for seeds
64441 */
64442 static inline u32 __seed(u32 x, u32 m)
64443 {
64444 - return (x < m) ? x + m : x;
64445 + return (x <= m) ? x + m + 1 : x;
64446 }
64447
64448 /**
64449 diff --git a/include/linux/reboot.h b/include/linux/reboot.h
64450 index e0879a7..a12f962 100644
64451 --- a/include/linux/reboot.h
64452 +++ b/include/linux/reboot.h
64453 @@ -52,9 +52,9 @@ extern int unregister_reboot_notifier(struct notifier_block *);
64454 * Architecture-specific implementations of sys_reboot commands.
64455 */
64456
64457 -extern void machine_restart(char *cmd);
64458 -extern void machine_halt(void);
64459 -extern void machine_power_off(void);
64460 +extern void machine_restart(char *cmd) __noreturn;
64461 +extern void machine_halt(void) __noreturn;
64462 +extern void machine_power_off(void) __noreturn;
64463
64464 extern void machine_shutdown(void);
64465 struct pt_regs;
64466 @@ -65,9 +65,9 @@ extern void machine_crash_shutdown(struct pt_regs *);
64467 */
64468
64469 extern void kernel_restart_prepare(char *cmd);
64470 -extern void kernel_restart(char *cmd);
64471 -extern void kernel_halt(void);
64472 -extern void kernel_power_off(void);
64473 +extern void kernel_restart(char *cmd) __noreturn;
64474 +extern void kernel_halt(void) __noreturn;
64475 +extern void kernel_power_off(void) __noreturn;
64476
64477 extern int C_A_D; /* for sysctl */
64478 void ctrl_alt_del(void);
64479 @@ -81,7 +81,7 @@ extern int orderly_poweroff(bool force);
64480 * Emergency restart, callable from an interrupt handler.
64481 */
64482
64483 -extern void emergency_restart(void);
64484 +extern void emergency_restart(void) __noreturn;
64485 #include <asm/emergency-restart.h>
64486
64487 #endif
64488 diff --git a/include/linux/relay.h b/include/linux/relay.h
64489 index 91cacc3..b55ff74 100644
64490 --- a/include/linux/relay.h
64491 +++ b/include/linux/relay.h
64492 @@ -160,7 +160,7 @@ struct rchan_callbacks
64493 * The callback should return 0 if successful, negative if not.
64494 */
64495 int (*remove_buf_file)(struct dentry *dentry);
64496 -};
64497 +} __no_const;
64498
64499 /*
64500 * CONFIG_RELAY kernel API, kernel/relay.c
64501 diff --git a/include/linux/rfkill.h b/include/linux/rfkill.h
64502 index 6fdf027..ff72610 100644
64503 --- a/include/linux/rfkill.h
64504 +++ b/include/linux/rfkill.h
64505 @@ -147,6 +147,7 @@ struct rfkill_ops {
64506 void (*query)(struct rfkill *rfkill, void *data);
64507 int (*set_block)(void *data, bool blocked);
64508 };
64509 +typedef struct rfkill_ops __no_const rfkill_ops_no_const;
64510
64511 #if defined(CONFIG_RFKILL) || defined(CONFIG_RFKILL_MODULE)
64512 /**
64513 diff --git a/include/linux/rio.h b/include/linux/rio.h
64514 index a90ebad..fd87b5d 100644
64515 --- a/include/linux/rio.h
64516 +++ b/include/linux/rio.h
64517 @@ -321,7 +321,7 @@ struct rio_ops {
64518 int mbox, void *buffer, size_t len);
64519 int (*add_inb_buffer)(struct rio_mport *mport, int mbox, void *buf);
64520 void *(*get_inb_message)(struct rio_mport *mport, int mbox);
64521 -};
64522 +} __no_const;
64523
64524 #define RIO_RESOURCE_MEM 0x00000100
64525 #define RIO_RESOURCE_DOORBELL 0x00000200
64526 diff --git a/include/linux/rmap.h b/include/linux/rmap.h
64527 index 3fce545..b4fed6e 100644
64528 --- a/include/linux/rmap.h
64529 +++ b/include/linux/rmap.h
64530 @@ -119,9 +119,9 @@ static inline void anon_vma_unlock(struct anon_vma *anon_vma)
64531 void anon_vma_init(void); /* create anon_vma_cachep */
64532 int anon_vma_prepare(struct vm_area_struct *);
64533 void unlink_anon_vmas(struct vm_area_struct *);
64534 -int anon_vma_clone(struct vm_area_struct *, struct vm_area_struct *);
64535 +int anon_vma_clone(struct vm_area_struct *, const struct vm_area_struct *);
64536 void anon_vma_moveto_tail(struct vm_area_struct *);
64537 -int anon_vma_fork(struct vm_area_struct *, struct vm_area_struct *);
64538 +int anon_vma_fork(struct vm_area_struct *, const struct vm_area_struct *);
64539
64540 static inline void anon_vma_merge(struct vm_area_struct *vma,
64541 struct vm_area_struct *next)
64542 diff --git a/include/linux/sched.h b/include/linux/sched.h
64543 index 23bddac..5976055 100644
64544 --- a/include/linux/sched.h
64545 +++ b/include/linux/sched.h
64546 @@ -101,6 +101,7 @@ struct bio_list;
64547 struct fs_struct;
64548 struct perf_event_context;
64549 struct blk_plug;
64550 +struct linux_binprm;
64551
64552 /*
64553 * List of flags we want to share for kernel threads,
64554 @@ -384,10 +385,13 @@ struct user_namespace;
64555 #define DEFAULT_MAX_MAP_COUNT (USHRT_MAX - MAPCOUNT_ELF_CORE_MARGIN)
64556
64557 extern int sysctl_max_map_count;
64558 +extern unsigned long sysctl_heap_stack_gap;
64559
64560 #include <linux/aio.h>
64561
64562 #ifdef CONFIG_MMU
64563 +extern bool check_heap_stack_gap(const struct vm_area_struct *vma, unsigned long addr, unsigned long len);
64564 +extern unsigned long skip_heap_stack_gap(const struct vm_area_struct *vma, unsigned long len);
64565 extern void arch_pick_mmap_layout(struct mm_struct *mm);
64566 extern unsigned long
64567 arch_get_unmapped_area(struct file *, unsigned long, unsigned long,
64568 @@ -651,6 +655,17 @@ struct signal_struct {
64569 #ifdef CONFIG_TASKSTATS
64570 struct taskstats *stats;
64571 #endif
64572 +
64573 +#ifdef CONFIG_GRKERNSEC
64574 + u32 curr_ip;
64575 + u32 saved_ip;
64576 + u32 gr_saddr;
64577 + u32 gr_daddr;
64578 + u16 gr_sport;
64579 + u16 gr_dport;
64580 + u8 used_accept:1;
64581 +#endif
64582 +
64583 #ifdef CONFIG_AUDIT
64584 unsigned audit_tty;
64585 struct tty_audit_buf *tty_audit_buf;
64586 @@ -734,6 +749,11 @@ struct user_struct {
64587 struct key *session_keyring; /* UID's default session keyring */
64588 #endif
64589
64590 +#if defined(CONFIG_GRKERNSEC_KERN_LOCKOUT) || defined(CONFIG_GRKERNSEC_BRUTE)
64591 + unsigned int banned;
64592 + unsigned long ban_expires;
64593 +#endif
64594 +
64595 /* Hash table maintenance information */
64596 struct hlist_node uidhash_node;
64597 kuid_t uid;
64598 @@ -1356,8 +1376,8 @@ struct task_struct {
64599 struct list_head thread_group;
64600
64601 struct completion *vfork_done; /* for vfork() */
64602 - int __user *set_child_tid; /* CLONE_CHILD_SETTID */
64603 - int __user *clear_child_tid; /* CLONE_CHILD_CLEARTID */
64604 + pid_t __user *set_child_tid; /* CLONE_CHILD_SETTID */
64605 + pid_t __user *clear_child_tid; /* CLONE_CHILD_CLEARTID */
64606
64607 cputime_t utime, stime, utimescaled, stimescaled;
64608 cputime_t gtime;
64609 @@ -1373,11 +1393,6 @@ struct task_struct {
64610 struct task_cputime cputime_expires;
64611 struct list_head cpu_timers[3];
64612
64613 -/* process credentials */
64614 - const struct cred __rcu *real_cred; /* objective and real subjective task
64615 - * credentials (COW) */
64616 - const struct cred __rcu *cred; /* effective (overridable) subjective task
64617 - * credentials (COW) */
64618 char comm[TASK_COMM_LEN]; /* executable name excluding path
64619 - access with [gs]et_task_comm (which lock
64620 it with task_lock())
64621 @@ -1394,6 +1409,10 @@ struct task_struct {
64622 #endif
64623 /* CPU-specific state of this task */
64624 struct thread_struct thread;
64625 +/* thread_info moved to task_struct */
64626 +#ifdef CONFIG_X86
64627 + struct thread_info tinfo;
64628 +#endif
64629 /* filesystem information */
64630 struct fs_struct *fs;
64631 /* open file information */
64632 @@ -1467,6 +1486,10 @@ struct task_struct {
64633 gfp_t lockdep_reclaim_gfp;
64634 #endif
64635
64636 +/* process credentials */
64637 + const struct cred __rcu *real_cred; /* objective and real subjective task
64638 + * credentials (COW) */
64639 +
64640 /* journalling filesystem info */
64641 void *journal_info;
64642
64643 @@ -1505,6 +1528,10 @@ struct task_struct {
64644 /* cg_list protected by css_set_lock and tsk->alloc_lock */
64645 struct list_head cg_list;
64646 #endif
64647 +
64648 + const struct cred __rcu *cred; /* effective (overridable) subjective task
64649 + * credentials (COW) */
64650 +
64651 #ifdef CONFIG_FUTEX
64652 struct robust_list_head __user *robust_list;
64653 #ifdef CONFIG_COMPAT
64654 @@ -1589,8 +1616,74 @@ struct task_struct {
64655 #ifdef CONFIG_UPROBES
64656 struct uprobe_task *utask;
64657 #endif
64658 +
64659 +#ifdef CONFIG_GRKERNSEC
64660 + /* grsecurity */
64661 +#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
64662 + u64 exec_id;
64663 +#endif
64664 +#ifdef CONFIG_GRKERNSEC_SETXID
64665 + const struct cred *delayed_cred;
64666 +#endif
64667 + struct dentry *gr_chroot_dentry;
64668 + struct acl_subject_label *acl;
64669 + struct acl_role_label *role;
64670 + struct file *exec_file;
64671 + u16 acl_role_id;
64672 + /* is this the task that authenticated to the special role */
64673 + u8 acl_sp_role;
64674 + u8 is_writable;
64675 + u8 brute;
64676 + u8 gr_is_chrooted;
64677 +#endif
64678 +
64679 };
64680
64681 +#define MF_PAX_PAGEEXEC 0x01000000 /* Paging based non-executable pages */
64682 +#define MF_PAX_EMUTRAMP 0x02000000 /* Emulate trampolines */
64683 +#define MF_PAX_MPROTECT 0x04000000 /* Restrict mprotect() */
64684 +#define MF_PAX_RANDMMAP 0x08000000 /* Randomize mmap() base */
64685 +/*#define MF_PAX_RANDEXEC 0x10000000*/ /* Randomize ET_EXEC base */
64686 +#define MF_PAX_SEGMEXEC 0x20000000 /* Segmentation based non-executable pages */
64687 +
64688 +#ifdef CONFIG_PAX_SOFTMODE
64689 +extern int pax_softmode;
64690 +#endif
64691 +
64692 +extern int pax_check_flags(unsigned long *);
64693 +
64694 +/* if tsk != current then task_lock must be held on it */
64695 +#if defined(CONFIG_PAX_NOEXEC) || defined(CONFIG_PAX_ASLR)
64696 +static inline unsigned long pax_get_flags(struct task_struct *tsk)
64697 +{
64698 + if (likely(tsk->mm))
64699 + return tsk->mm->pax_flags;
64700 + else
64701 + return 0UL;
64702 +}
64703 +
64704 +/* if tsk != current then task_lock must be held on it */
64705 +static inline long pax_set_flags(struct task_struct *tsk, unsigned long flags)
64706 +{
64707 + if (likely(tsk->mm)) {
64708 + tsk->mm->pax_flags = flags;
64709 + return 0;
64710 + }
64711 + return -EINVAL;
64712 +}
64713 +#endif
64714 +
64715 +#ifdef CONFIG_PAX_HAVE_ACL_FLAGS
64716 +extern void pax_set_initial_flags(struct linux_binprm *bprm);
64717 +#elif defined(CONFIG_PAX_HOOK_ACL_FLAGS)
64718 +extern void (*pax_set_initial_flags_func)(struct linux_binprm *bprm);
64719 +#endif
64720 +
64721 +extern void pax_report_fault(struct pt_regs *regs, void *pc, void *sp);
64722 +extern void pax_report_insns(struct pt_regs *regs, void *pc, void *sp);
64723 +extern void pax_report_refcount_overflow(struct pt_regs *regs);
64724 +extern void check_object_size(const void *ptr, unsigned long n, bool to);
64725 +
64726 /* Future-safe accessor for struct task_struct's cpus_allowed. */
64727 #define tsk_cpus_allowed(tsk) (&(tsk)->cpus_allowed)
64728
64729 @@ -2125,7 +2218,9 @@ void yield(void);
64730 extern struct exec_domain default_exec_domain;
64731
64732 union thread_union {
64733 +#ifndef CONFIG_X86
64734 struct thread_info thread_info;
64735 +#endif
64736 unsigned long stack[THREAD_SIZE/sizeof(long)];
64737 };
64738
64739 @@ -2158,6 +2253,7 @@ extern struct pid_namespace init_pid_ns;
64740 */
64741
64742 extern struct task_struct *find_task_by_vpid(pid_t nr);
64743 +extern struct task_struct *find_task_by_vpid_unrestricted(pid_t nr);
64744 extern struct task_struct *find_task_by_pid_ns(pid_t nr,
64745 struct pid_namespace *ns);
64746
64747 @@ -2314,7 +2410,7 @@ extern void __cleanup_sighand(struct sighand_struct *);
64748 extern void exit_itimers(struct signal_struct *);
64749 extern void flush_itimer_signals(void);
64750
64751 -extern void do_group_exit(int);
64752 +extern __noreturn void do_group_exit(int);
64753
64754 extern void daemonize(const char *, ...);
64755 extern int allow_signal(int);
64756 @@ -2515,9 +2611,9 @@ static inline unsigned long *end_of_stack(struct task_struct *p)
64757
64758 #endif
64759
64760 -static inline int object_is_on_stack(void *obj)
64761 +static inline int object_starts_on_stack(void *obj)
64762 {
64763 - void *stack = task_stack_page(current);
64764 + const void *stack = task_stack_page(current);
64765
64766 return (obj >= stack) && (obj < (stack + THREAD_SIZE));
64767 }
64768 diff --git a/include/linux/screen_info.h b/include/linux/screen_info.h
64769 index 899fbb4..1cb4138 100644
64770 --- a/include/linux/screen_info.h
64771 +++ b/include/linux/screen_info.h
64772 @@ -43,7 +43,8 @@ struct screen_info {
64773 __u16 pages; /* 0x32 */
64774 __u16 vesa_attributes; /* 0x34 */
64775 __u32 capabilities; /* 0x36 */
64776 - __u8 _reserved[6]; /* 0x3a */
64777 + __u16 vesapm_size; /* 0x3a */
64778 + __u8 _reserved[4]; /* 0x3c */
64779 } __attribute__((packed));
64780
64781 #define VIDEO_TYPE_MDA 0x10 /* Monochrome Text Display */
64782 diff --git a/include/linux/security.h b/include/linux/security.h
64783 index d143b8e..9f27b95 100644
64784 --- a/include/linux/security.h
64785 +++ b/include/linux/security.h
64786 @@ -26,6 +26,7 @@
64787 #include <linux/capability.h>
64788 #include <linux/slab.h>
64789 #include <linux/err.h>
64790 +#include <linux/grsecurity.h>
64791
64792 struct linux_binprm;
64793 struct cred;
64794 diff --git a/include/linux/seq_file.h b/include/linux/seq_file.h
64795 index 83c44ee..e8a9eba 100644
64796 --- a/include/linux/seq_file.h
64797 +++ b/include/linux/seq_file.h
64798 @@ -25,6 +25,9 @@ struct seq_file {
64799 struct mutex lock;
64800 const struct seq_operations *op;
64801 int poll_event;
64802 +#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
64803 + u64 exec_id;
64804 +#endif
64805 void *private;
64806 };
64807
64808 @@ -34,6 +37,7 @@ struct seq_operations {
64809 void * (*next) (struct seq_file *m, void *v, loff_t *pos);
64810 int (*show) (struct seq_file *m, void *v);
64811 };
64812 +typedef struct seq_operations __no_const seq_operations_no_const;
64813
64814 #define SEQ_SKIP 1
64815
64816 diff --git a/include/linux/shm.h b/include/linux/shm.h
64817 index edd0868..f98feee 100644
64818 --- a/include/linux/shm.h
64819 +++ b/include/linux/shm.h
64820 @@ -98,6 +98,10 @@ struct shmid_kernel /* private to the kernel */
64821
64822 /* The task created the shm object. NULL if the task is dead. */
64823 struct task_struct *shm_creator;
64824 +#ifdef CONFIG_GRKERNSEC
64825 + time_t shm_createtime;
64826 + pid_t shm_lapid;
64827 +#endif
64828 };
64829
64830 /* shm_mode upper byte flags */
64831 diff --git a/include/linux/skbuff.h b/include/linux/skbuff.h
64832 index f3165d2..2cb3cb7 100644
64833 --- a/include/linux/skbuff.h
64834 +++ b/include/linux/skbuff.h
64835 @@ -577,7 +577,7 @@ extern bool skb_try_coalesce(struct sk_buff *to, struct sk_buff *from,
64836 extern struct sk_buff *__alloc_skb(unsigned int size,
64837 gfp_t priority, int flags, int node);
64838 extern struct sk_buff *build_skb(void *data, unsigned int frag_size);
64839 -static inline struct sk_buff *alloc_skb(unsigned int size,
64840 +static inline struct sk_buff * __intentional_overflow(0) alloc_skb(unsigned int size,
64841 gfp_t priority)
64842 {
64843 return __alloc_skb(size, priority, 0, NUMA_NO_NODE);
64844 @@ -687,7 +687,7 @@ static inline struct skb_shared_hwtstamps *skb_hwtstamps(struct sk_buff *skb)
64845 */
64846 static inline int skb_queue_empty(const struct sk_buff_head *list)
64847 {
64848 - return list->next == (struct sk_buff *)list;
64849 + return list->next == (const struct sk_buff *)list;
64850 }
64851
64852 /**
64853 @@ -700,7 +700,7 @@ static inline int skb_queue_empty(const struct sk_buff_head *list)
64854 static inline bool skb_queue_is_last(const struct sk_buff_head *list,
64855 const struct sk_buff *skb)
64856 {
64857 - return skb->next == (struct sk_buff *)list;
64858 + return skb->next == (const struct sk_buff *)list;
64859 }
64860
64861 /**
64862 @@ -713,7 +713,7 @@ static inline bool skb_queue_is_last(const struct sk_buff_head *list,
64863 static inline bool skb_queue_is_first(const struct sk_buff_head *list,
64864 const struct sk_buff *skb)
64865 {
64866 - return skb->prev == (struct sk_buff *)list;
64867 + return skb->prev == (const struct sk_buff *)list;
64868 }
64869
64870 /**
64871 @@ -1623,7 +1623,7 @@ static inline int pskb_network_may_pull(struct sk_buff *skb, unsigned int len)
64872 * NET_IP_ALIGN(2) + ethernet_header(14) + IP_header(20/40) + ports(8)
64873 */
64874 #ifndef NET_SKB_PAD
64875 -#define NET_SKB_PAD max(32, L1_CACHE_BYTES)
64876 +#define NET_SKB_PAD max(_AC(32,UL), L1_CACHE_BYTES)
64877 #endif
64878
64879 extern int ___pskb_trim(struct sk_buff *skb, unsigned int len);
64880 @@ -2201,7 +2201,7 @@ extern struct sk_buff *skb_recv_datagram(struct sock *sk, unsigned flags,
64881 int noblock, int *err);
64882 extern unsigned int datagram_poll(struct file *file, struct socket *sock,
64883 struct poll_table_struct *wait);
64884 -extern int skb_copy_datagram_iovec(const struct sk_buff *from,
64885 +extern int __intentional_overflow(0) skb_copy_datagram_iovec(const struct sk_buff *from,
64886 int offset, struct iovec *to,
64887 int size);
64888 extern int skb_copy_and_csum_datagram_iovec(struct sk_buff *skb,
64889 diff --git a/include/linux/slab.h b/include/linux/slab.h
64890 index 0dd2dfa..2b8677c 100644
64891 --- a/include/linux/slab.h
64892 +++ b/include/linux/slab.h
64893 @@ -11,12 +11,20 @@
64894
64895 #include <linux/gfp.h>
64896 #include <linux/types.h>
64897 +#include <linux/err.h>
64898
64899 /*
64900 * Flags to pass to kmem_cache_create().
64901 * The ones marked DEBUG are only valid if CONFIG_SLAB_DEBUG is set.
64902 */
64903 #define SLAB_DEBUG_FREE 0x00000100UL /* DEBUG: Perform (expensive) checks on free */
64904 +
64905 +#ifdef CONFIG_PAX_USERCOPY_SLABS
64906 +#define SLAB_USERCOPY 0x00000200UL /* PaX: Allow copying objs to/from userland */
64907 +#else
64908 +#define SLAB_USERCOPY 0x00000000UL
64909 +#endif
64910 +
64911 #define SLAB_RED_ZONE 0x00000400UL /* DEBUG: Red zone objs in a cache */
64912 #define SLAB_POISON 0x00000800UL /* DEBUG: Poison objects */
64913 #define SLAB_HWCACHE_ALIGN 0x00002000UL /* Align objs on cache lines */
64914 @@ -87,10 +95,13 @@
64915 * ZERO_SIZE_PTR can be passed to kfree though in the same way that NULL can.
64916 * Both make kfree a no-op.
64917 */
64918 -#define ZERO_SIZE_PTR ((void *)16)
64919 +#define ZERO_SIZE_PTR \
64920 +({ \
64921 + BUILD_BUG_ON(!(MAX_ERRNO & ~PAGE_MASK));\
64922 + (void *)(-MAX_ERRNO-1L); \
64923 +})
64924
64925 -#define ZERO_OR_NULL_PTR(x) ((unsigned long)(x) <= \
64926 - (unsigned long)ZERO_SIZE_PTR)
64927 +#define ZERO_OR_NULL_PTR(x) ((unsigned long)(x) - 1 >= (unsigned long)ZERO_SIZE_PTR - 1)
64928
64929 /*
64930 * Common fields provided in kmem_cache by all slab allocators
64931 @@ -185,6 +196,8 @@ void * __must_check krealloc(const void *, size_t, gfp_t);
64932 void kfree(const void *);
64933 void kzfree(const void *);
64934 size_t ksize(const void *);
64935 +const char *check_heap_object(const void *ptr, unsigned long n, bool to);
64936 +bool is_usercopy_object(const void *ptr);
64937
64938 /*
64939 * Allocator specific definitions. These are mainly used to establish optimized
64940 @@ -322,7 +335,7 @@ static inline void *kmem_cache_alloc_node(struct kmem_cache *cachep,
64941 */
64942 #if defined(CONFIG_DEBUG_SLAB) || defined(CONFIG_SLUB) || \
64943 (defined(CONFIG_SLAB) && defined(CONFIG_TRACING))
64944 -extern void *__kmalloc_track_caller(size_t, gfp_t, unsigned long);
64945 +extern void *__kmalloc_track_caller(size_t, gfp_t, unsigned long) __size_overflow(1);
64946 #define kmalloc_track_caller(size, flags) \
64947 __kmalloc_track_caller(size, flags, _RET_IP_)
64948 #else
64949 @@ -341,7 +354,7 @@ extern void *__kmalloc_track_caller(size_t, gfp_t, unsigned long);
64950 */
64951 #if defined(CONFIG_DEBUG_SLAB) || defined(CONFIG_SLUB) || \
64952 (defined(CONFIG_SLAB) && defined(CONFIG_TRACING))
64953 -extern void *__kmalloc_node_track_caller(size_t, gfp_t, int, unsigned long);
64954 +extern void *__kmalloc_node_track_caller(size_t, gfp_t, int, unsigned long) __size_overflow(1);
64955 #define kmalloc_node_track_caller(size, flags, node) \
64956 __kmalloc_node_track_caller(size, flags, node, \
64957 _RET_IP_)
64958 diff --git a/include/linux/slab_def.h b/include/linux/slab_def.h
64959 index 0c634fa..8616300 100644
64960 --- a/include/linux/slab_def.h
64961 +++ b/include/linux/slab_def.h
64962 @@ -69,10 +69,10 @@ struct kmem_cache {
64963 unsigned long node_allocs;
64964 unsigned long node_frees;
64965 unsigned long node_overflow;
64966 - atomic_t allochit;
64967 - atomic_t allocmiss;
64968 - atomic_t freehit;
64969 - atomic_t freemiss;
64970 + atomic_unchecked_t allochit;
64971 + atomic_unchecked_t allocmiss;
64972 + atomic_unchecked_t freehit;
64973 + atomic_unchecked_t freemiss;
64974
64975 /*
64976 * If debugging is enabled, then the allocator can add additional
64977 @@ -105,11 +105,16 @@ struct cache_sizes {
64978 #ifdef CONFIG_ZONE_DMA
64979 struct kmem_cache *cs_dmacachep;
64980 #endif
64981 +
64982 +#ifdef CONFIG_PAX_USERCOPY_SLABS
64983 + struct kmem_cache *cs_usercopycachep;
64984 +#endif
64985 +
64986 };
64987 extern struct cache_sizes malloc_sizes[];
64988
64989 void *kmem_cache_alloc(struct kmem_cache *, gfp_t);
64990 -void *__kmalloc(size_t size, gfp_t flags);
64991 +void *__kmalloc(size_t size, gfp_t flags) __size_overflow(1);
64992
64993 #ifdef CONFIG_TRACING
64994 extern void *kmem_cache_alloc_trace(size_t size,
64995 @@ -152,6 +157,13 @@ found:
64996 cachep = malloc_sizes[i].cs_dmacachep;
64997 else
64998 #endif
64999 +
65000 +#ifdef CONFIG_PAX_USERCOPY_SLABS
65001 + if (flags & GFP_USERCOPY)
65002 + cachep = malloc_sizes[i].cs_usercopycachep;
65003 + else
65004 +#endif
65005 +
65006 cachep = malloc_sizes[i].cs_cachep;
65007
65008 ret = kmem_cache_alloc_trace(size, cachep, flags);
65009 @@ -162,7 +174,7 @@ found:
65010 }
65011
65012 #ifdef CONFIG_NUMA
65013 -extern void *__kmalloc_node(size_t size, gfp_t flags, int node);
65014 +extern void *__kmalloc_node(size_t size, gfp_t flags, int node) __size_overflow(1);
65015 extern void *kmem_cache_alloc_node(struct kmem_cache *, gfp_t flags, int node);
65016
65017 #ifdef CONFIG_TRACING
65018 @@ -205,6 +217,13 @@ found:
65019 cachep = malloc_sizes[i].cs_dmacachep;
65020 else
65021 #endif
65022 +
65023 +#ifdef CONFIG_PAX_USERCOPY_SLABS
65024 + if (flags & GFP_USERCOPY)
65025 + cachep = malloc_sizes[i].cs_usercopycachep;
65026 + else
65027 +#endif
65028 +
65029 cachep = malloc_sizes[i].cs_cachep;
65030
65031 return kmem_cache_alloc_node_trace(size, cachep, flags, node);
65032 diff --git a/include/linux/slob_def.h b/include/linux/slob_def.h
65033 index 0ec00b3..22b4715 100644
65034 --- a/include/linux/slob_def.h
65035 +++ b/include/linux/slob_def.h
65036 @@ -9,7 +9,7 @@ static __always_inline void *kmem_cache_alloc(struct kmem_cache *cachep,
65037 return kmem_cache_alloc_node(cachep, flags, -1);
65038 }
65039
65040 -void *__kmalloc_node(size_t size, gfp_t flags, int node);
65041 +void *__kmalloc_node(size_t size, gfp_t flags, int node) __size_overflow(1);
65042
65043 static __always_inline void *kmalloc_node(size_t size, gfp_t flags, int node)
65044 {
65045 @@ -29,7 +29,7 @@ static __always_inline void *kmalloc(size_t size, gfp_t flags)
65046 return __kmalloc_node(size, flags, -1);
65047 }
65048
65049 -static __always_inline void *__kmalloc(size_t size, gfp_t flags)
65050 +static __always_inline __size_overflow(1) void *__kmalloc(size_t size, gfp_t flags)
65051 {
65052 return kmalloc(size, flags);
65053 }
65054 diff --git a/include/linux/slub_def.h b/include/linux/slub_def.h
65055 index df448ad..b99e7f6 100644
65056 --- a/include/linux/slub_def.h
65057 +++ b/include/linux/slub_def.h
65058 @@ -91,7 +91,7 @@ struct kmem_cache {
65059 struct kmem_cache_order_objects max;
65060 struct kmem_cache_order_objects min;
65061 gfp_t allocflags; /* gfp flags to use on each alloc */
65062 - int refcount; /* Refcount for slab cache destroy */
65063 + atomic_t refcount; /* Refcount for slab cache destroy */
65064 void (*ctor)(void *);
65065 int inuse; /* Offset to metadata */
65066 int align; /* Alignment */
65067 @@ -152,7 +152,7 @@ extern struct kmem_cache *kmalloc_caches[SLUB_PAGE_SHIFT];
65068 * Sorry that the following has to be that ugly but some versions of GCC
65069 * have trouble with constant propagation and loops.
65070 */
65071 -static __always_inline int kmalloc_index(size_t size)
65072 +static __always_inline __size_overflow(1) int kmalloc_index(size_t size)
65073 {
65074 if (!size)
65075 return 0;
65076 @@ -217,7 +217,7 @@ static __always_inline struct kmem_cache *kmalloc_slab(size_t size)
65077 }
65078
65079 void *kmem_cache_alloc(struct kmem_cache *, gfp_t);
65080 -void *__kmalloc(size_t size, gfp_t flags);
65081 +void *__kmalloc(size_t size, gfp_t flags) __alloc_size(1) __size_overflow(1);
65082
65083 static __always_inline void *
65084 kmalloc_order(size_t size, gfp_t flags, unsigned int order)
65085 @@ -258,7 +258,7 @@ kmalloc_order_trace(size_t size, gfp_t flags, unsigned int order)
65086 }
65087 #endif
65088
65089 -static __always_inline void *kmalloc_large(size_t size, gfp_t flags)
65090 +static __always_inline __size_overflow(1) void *kmalloc_large(size_t size, gfp_t flags)
65091 {
65092 unsigned int order = get_order(size);
65093 return kmalloc_order_trace(size, flags, order);
65094 @@ -283,7 +283,7 @@ static __always_inline void *kmalloc(size_t size, gfp_t flags)
65095 }
65096
65097 #ifdef CONFIG_NUMA
65098 -void *__kmalloc_node(size_t size, gfp_t flags, int node);
65099 +void *__kmalloc_node(size_t size, gfp_t flags, int node) __size_overflow(1);
65100 void *kmem_cache_alloc_node(struct kmem_cache *, gfp_t flags, int node);
65101
65102 #ifdef CONFIG_TRACING
65103 diff --git a/include/linux/sonet.h b/include/linux/sonet.h
65104 index de8832d..0147b46 100644
65105 --- a/include/linux/sonet.h
65106 +++ b/include/linux/sonet.h
65107 @@ -61,7 +61,7 @@ struct sonet_stats {
65108 #include <linux/atomic.h>
65109
65110 struct k_sonet_stats {
65111 -#define __HANDLE_ITEM(i) atomic_t i
65112 +#define __HANDLE_ITEM(i) atomic_unchecked_t i
65113 __SONET_ITEMS
65114 #undef __HANDLE_ITEM
65115 };
65116 diff --git a/include/linux/sunrpc/clnt.h b/include/linux/sunrpc/clnt.h
65117 index 523547e..2cb7140 100644
65118 --- a/include/linux/sunrpc/clnt.h
65119 +++ b/include/linux/sunrpc/clnt.h
65120 @@ -174,9 +174,9 @@ static inline unsigned short rpc_get_port(const struct sockaddr *sap)
65121 {
65122 switch (sap->sa_family) {
65123 case AF_INET:
65124 - return ntohs(((struct sockaddr_in *)sap)->sin_port);
65125 + return ntohs(((const struct sockaddr_in *)sap)->sin_port);
65126 case AF_INET6:
65127 - return ntohs(((struct sockaddr_in6 *)sap)->sin6_port);
65128 + return ntohs(((const struct sockaddr_in6 *)sap)->sin6_port);
65129 }
65130 return 0;
65131 }
65132 @@ -209,7 +209,7 @@ static inline bool __rpc_cmp_addr4(const struct sockaddr *sap1,
65133 static inline bool __rpc_copy_addr4(struct sockaddr *dst,
65134 const struct sockaddr *src)
65135 {
65136 - const struct sockaddr_in *ssin = (struct sockaddr_in *) src;
65137 + const struct sockaddr_in *ssin = (const struct sockaddr_in *) src;
65138 struct sockaddr_in *dsin = (struct sockaddr_in *) dst;
65139
65140 dsin->sin_family = ssin->sin_family;
65141 @@ -312,7 +312,7 @@ static inline u32 rpc_get_scope_id(const struct sockaddr *sa)
65142 if (sa->sa_family != AF_INET6)
65143 return 0;
65144
65145 - return ((struct sockaddr_in6 *) sa)->sin6_scope_id;
65146 + return ((const struct sockaddr_in6 *) sa)->sin6_scope_id;
65147 }
65148
65149 #endif /* __KERNEL__ */
65150 diff --git a/include/linux/sunrpc/sched.h b/include/linux/sunrpc/sched.h
65151 index dc0c3cc..8503fb6 100644
65152 --- a/include/linux/sunrpc/sched.h
65153 +++ b/include/linux/sunrpc/sched.h
65154 @@ -106,6 +106,7 @@ struct rpc_call_ops {
65155 void (*rpc_count_stats)(struct rpc_task *, void *);
65156 void (*rpc_release)(void *);
65157 };
65158 +typedef struct rpc_call_ops __no_const rpc_call_ops_no_const;
65159
65160 struct rpc_task_setup {
65161 struct rpc_task *task;
65162 diff --git a/include/linux/sunrpc/svc_rdma.h b/include/linux/sunrpc/svc_rdma.h
65163 index 0b8e3e6..33e0a01 100644
65164 --- a/include/linux/sunrpc/svc_rdma.h
65165 +++ b/include/linux/sunrpc/svc_rdma.h
65166 @@ -53,15 +53,15 @@ extern unsigned int svcrdma_ord;
65167 extern unsigned int svcrdma_max_requests;
65168 extern unsigned int svcrdma_max_req_size;
65169
65170 -extern atomic_t rdma_stat_recv;
65171 -extern atomic_t rdma_stat_read;
65172 -extern atomic_t rdma_stat_write;
65173 -extern atomic_t rdma_stat_sq_starve;
65174 -extern atomic_t rdma_stat_rq_starve;
65175 -extern atomic_t rdma_stat_rq_poll;
65176 -extern atomic_t rdma_stat_rq_prod;
65177 -extern atomic_t rdma_stat_sq_poll;
65178 -extern atomic_t rdma_stat_sq_prod;
65179 +extern atomic_unchecked_t rdma_stat_recv;
65180 +extern atomic_unchecked_t rdma_stat_read;
65181 +extern atomic_unchecked_t rdma_stat_write;
65182 +extern atomic_unchecked_t rdma_stat_sq_starve;
65183 +extern atomic_unchecked_t rdma_stat_rq_starve;
65184 +extern atomic_unchecked_t rdma_stat_rq_poll;
65185 +extern atomic_unchecked_t rdma_stat_rq_prod;
65186 +extern atomic_unchecked_t rdma_stat_sq_poll;
65187 +extern atomic_unchecked_t rdma_stat_sq_prod;
65188
65189 #define RPCRDMA_VERSION 1
65190
65191 diff --git a/include/linux/sysctl.h b/include/linux/sysctl.h
65192 index c34b4c8..a65b67d 100644
65193 --- a/include/linux/sysctl.h
65194 +++ b/include/linux/sysctl.h
65195 @@ -155,7 +155,11 @@ enum
65196 KERN_PANIC_ON_NMI=76, /* int: whether we will panic on an unrecovered */
65197 };
65198
65199 -
65200 +#ifdef CONFIG_PAX_SOFTMODE
65201 +enum {
65202 + PAX_SOFTMODE=1 /* PaX: disable/enable soft mode */
65203 +};
65204 +#endif
65205
65206 /* CTL_VM names: */
65207 enum
65208 @@ -948,6 +952,8 @@ typedef int proc_handler (struct ctl_table *ctl, int write,
65209
65210 extern int proc_dostring(struct ctl_table *, int,
65211 void __user *, size_t *, loff_t *);
65212 +extern int proc_dostring_modpriv(struct ctl_table *, int,
65213 + void __user *, size_t *, loff_t *);
65214 extern int proc_dointvec(struct ctl_table *, int,
65215 void __user *, size_t *, loff_t *);
65216 extern int proc_dointvec_minmax(struct ctl_table *, int,
65217 diff --git a/include/linux/tty.h b/include/linux/tty.h
65218 index 9f47ab5..73da944 100644
65219 --- a/include/linux/tty.h
65220 +++ b/include/linux/tty.h
65221 @@ -225,7 +225,7 @@ struct tty_port {
65222 const struct tty_port_operations *ops; /* Port operations */
65223 spinlock_t lock; /* Lock protecting tty field */
65224 int blocked_open; /* Waiting to open */
65225 - int count; /* Usage count */
65226 + atomic_t count; /* Usage count */
65227 wait_queue_head_t open_wait; /* Open waiters */
65228 wait_queue_head_t close_wait; /* Close waiters */
65229 wait_queue_head_t delta_msr_wait; /* Modem status change */
65230 @@ -525,7 +525,7 @@ extern int tty_port_open(struct tty_port *port,
65231 struct tty_struct *tty, struct file *filp);
65232 static inline int tty_port_users(struct tty_port *port)
65233 {
65234 - return port->count + port->blocked_open;
65235 + return atomic_read(&port->count) + port->blocked_open;
65236 }
65237
65238 extern int tty_register_ldisc(int disc, struct tty_ldisc_ops *new_ldisc);
65239 diff --git a/include/linux/tty_ldisc.h b/include/linux/tty_ldisc.h
65240 index fb79dd8d..07d4773 100644
65241 --- a/include/linux/tty_ldisc.h
65242 +++ b/include/linux/tty_ldisc.h
65243 @@ -149,7 +149,7 @@ struct tty_ldisc_ops {
65244
65245 struct module *owner;
65246
65247 - int refcount;
65248 + atomic_t refcount;
65249 };
65250
65251 struct tty_ldisc {
65252 diff --git a/include/linux/types.h b/include/linux/types.h
65253 index bf0dd75..a1f23aaa 100644
65254 --- a/include/linux/types.h
65255 +++ b/include/linux/types.h
65256 @@ -220,10 +220,26 @@ typedef struct {
65257 int counter;
65258 } atomic_t;
65259
65260 +#ifdef CONFIG_PAX_REFCOUNT
65261 +typedef struct {
65262 + int counter;
65263 +} atomic_unchecked_t;
65264 +#else
65265 +typedef atomic_t atomic_unchecked_t;
65266 +#endif
65267 +
65268 #ifdef CONFIG_64BIT
65269 typedef struct {
65270 long counter;
65271 } atomic64_t;
65272 +
65273 +#ifdef CONFIG_PAX_REFCOUNT
65274 +typedef struct {
65275 + long counter;
65276 +} atomic64_unchecked_t;
65277 +#else
65278 +typedef atomic64_t atomic64_unchecked_t;
65279 +#endif
65280 #endif
65281
65282 struct list_head {
65283 diff --git a/include/linux/uaccess.h b/include/linux/uaccess.h
65284 index 5ca0951..ab496a5 100644
65285 --- a/include/linux/uaccess.h
65286 +++ b/include/linux/uaccess.h
65287 @@ -76,11 +76,11 @@ static inline unsigned long __copy_from_user_nocache(void *to,
65288 long ret; \
65289 mm_segment_t old_fs = get_fs(); \
65290 \
65291 - set_fs(KERNEL_DS); \
65292 pagefault_disable(); \
65293 - ret = __copy_from_user_inatomic(&(retval), (__force typeof(retval) __user *)(addr), sizeof(retval)); \
65294 - pagefault_enable(); \
65295 + set_fs(KERNEL_DS); \
65296 + ret = __copy_from_user_inatomic(&(retval), (typeof(retval) __force_user *)(addr), sizeof(retval)); \
65297 set_fs(old_fs); \
65298 + pagefault_enable(); \
65299 ret; \
65300 })
65301
65302 diff --git a/include/linux/unaligned/access_ok.h b/include/linux/unaligned/access_ok.h
65303 index 99c1b4d..bb94261 100644
65304 --- a/include/linux/unaligned/access_ok.h
65305 +++ b/include/linux/unaligned/access_ok.h
65306 @@ -6,32 +6,32 @@
65307
65308 static inline u16 get_unaligned_le16(const void *p)
65309 {
65310 - return le16_to_cpup((__le16 *)p);
65311 + return le16_to_cpup((const __le16 *)p);
65312 }
65313
65314 static inline u32 get_unaligned_le32(const void *p)
65315 {
65316 - return le32_to_cpup((__le32 *)p);
65317 + return le32_to_cpup((const __le32 *)p);
65318 }
65319
65320 static inline u64 get_unaligned_le64(const void *p)
65321 {
65322 - return le64_to_cpup((__le64 *)p);
65323 + return le64_to_cpup((const __le64 *)p);
65324 }
65325
65326 static inline u16 get_unaligned_be16(const void *p)
65327 {
65328 - return be16_to_cpup((__be16 *)p);
65329 + return be16_to_cpup((const __be16 *)p);
65330 }
65331
65332 static inline u32 get_unaligned_be32(const void *p)
65333 {
65334 - return be32_to_cpup((__be32 *)p);
65335 + return be32_to_cpup((const __be32 *)p);
65336 }
65337
65338 static inline u64 get_unaligned_be64(const void *p)
65339 {
65340 - return be64_to_cpup((__be64 *)p);
65341 + return be64_to_cpup((const __be64 *)p);
65342 }
65343
65344 static inline void put_unaligned_le16(u16 val, void *p)
65345 diff --git a/include/linux/usb/renesas_usbhs.h b/include/linux/usb/renesas_usbhs.h
65346 index c5d36c6..8478c90 100644
65347 --- a/include/linux/usb/renesas_usbhs.h
65348 +++ b/include/linux/usb/renesas_usbhs.h
65349 @@ -39,7 +39,7 @@ enum {
65350 */
65351 struct renesas_usbhs_driver_callback {
65352 int (*notify_hotplug)(struct platform_device *pdev);
65353 -};
65354 +} __no_const;
65355
65356 /*
65357 * callback functions for platform
65358 @@ -97,7 +97,7 @@ struct renesas_usbhs_platform_callback {
65359 * VBUS control is needed for Host
65360 */
65361 int (*set_vbus)(struct platform_device *pdev, int enable);
65362 -};
65363 +} __no_const;
65364
65365 /*
65366 * parameters for renesas usbhs
65367 diff --git a/include/linux/vermagic.h b/include/linux/vermagic.h
65368 index 6f8fbcf..8259001 100644
65369 --- a/include/linux/vermagic.h
65370 +++ b/include/linux/vermagic.h
65371 @@ -25,9 +25,35 @@
65372 #define MODULE_ARCH_VERMAGIC ""
65373 #endif
65374
65375 +#ifdef CONFIG_PAX_REFCOUNT
65376 +#define MODULE_PAX_REFCOUNT "REFCOUNT "
65377 +#else
65378 +#define MODULE_PAX_REFCOUNT ""
65379 +#endif
65380 +
65381 +#ifdef CONSTIFY_PLUGIN
65382 +#define MODULE_CONSTIFY_PLUGIN "CONSTIFY_PLUGIN "
65383 +#else
65384 +#define MODULE_CONSTIFY_PLUGIN ""
65385 +#endif
65386 +
65387 +#ifdef STACKLEAK_PLUGIN
65388 +#define MODULE_STACKLEAK_PLUGIN "STACKLEAK_PLUGIN "
65389 +#else
65390 +#define MODULE_STACKLEAK_PLUGIN ""
65391 +#endif
65392 +
65393 +#ifdef CONFIG_GRKERNSEC
65394 +#define MODULE_GRSEC "GRSEC "
65395 +#else
65396 +#define MODULE_GRSEC ""
65397 +#endif
65398 +
65399 #define VERMAGIC_STRING \
65400 UTS_RELEASE " " \
65401 MODULE_VERMAGIC_SMP MODULE_VERMAGIC_PREEMPT \
65402 MODULE_VERMAGIC_MODULE_UNLOAD MODULE_VERMAGIC_MODVERSIONS \
65403 - MODULE_ARCH_VERMAGIC
65404 + MODULE_ARCH_VERMAGIC \
65405 + MODULE_PAX_REFCOUNT MODULE_CONSTIFY_PLUGIN MODULE_STACKLEAK_PLUGIN \
65406 + MODULE_GRSEC
65407
65408 diff --git a/include/linux/vmalloc.h b/include/linux/vmalloc.h
65409 index 6071e91..ca6a489 100644
65410 --- a/include/linux/vmalloc.h
65411 +++ b/include/linux/vmalloc.h
65412 @@ -14,6 +14,11 @@ struct vm_area_struct; /* vma defining user mapping in mm_types.h */
65413 #define VM_USERMAP 0x00000008 /* suitable for remap_vmalloc_range */
65414 #define VM_VPAGES 0x00000010 /* buffer for pages was vmalloc'ed */
65415 #define VM_UNLIST 0x00000020 /* vm_struct is not listed in vmlist */
65416 +
65417 +#if defined(CONFIG_MODULES) && defined(CONFIG_X86) && defined(CONFIG_PAX_KERNEXEC)
65418 +#define VM_KERNEXEC 0x00000040 /* allocate from executable kernel memory range */
65419 +#endif
65420 +
65421 /* bits [20..32] reserved for arch specific ioremap internals */
65422
65423 /*
65424 @@ -62,7 +67,7 @@ extern void *vmalloc_32_user(unsigned long size);
65425 extern void *__vmalloc(unsigned long size, gfp_t gfp_mask, pgprot_t prot);
65426 extern void *__vmalloc_node_range(unsigned long size, unsigned long align,
65427 unsigned long start, unsigned long end, gfp_t gfp_mask,
65428 - pgprot_t prot, int node, const void *caller);
65429 + pgprot_t prot, int node, const void *caller) __size_overflow(1);
65430 extern void vfree(const void *addr);
65431
65432 extern void *vmap(struct page **pages, unsigned int count,
65433 @@ -124,8 +129,8 @@ extern struct vm_struct *alloc_vm_area(size_t size, pte_t **ptes);
65434 extern void free_vm_area(struct vm_struct *area);
65435
65436 /* for /dev/kmem */
65437 -extern long vread(char *buf, char *addr, unsigned long count);
65438 -extern long vwrite(char *buf, char *addr, unsigned long count);
65439 +extern long vread(char *buf, char *addr, unsigned long count) __size_overflow(3);
65440 +extern long vwrite(char *buf, char *addr, unsigned long count) __size_overflow(3);
65441
65442 /*
65443 * Internals. Dont't use..
65444 diff --git a/include/linux/vmstat.h b/include/linux/vmstat.h
65445 index ad2cfd5..74c94ad 100644
65446 --- a/include/linux/vmstat.h
65447 +++ b/include/linux/vmstat.h
65448 @@ -87,18 +87,18 @@ static inline void vm_events_fold_cpu(int cpu)
65449 /*
65450 * Zone based page accounting with per cpu differentials.
65451 */
65452 -extern atomic_long_t vm_stat[NR_VM_ZONE_STAT_ITEMS];
65453 +extern atomic_long_unchecked_t vm_stat[NR_VM_ZONE_STAT_ITEMS];
65454
65455 static inline void zone_page_state_add(long x, struct zone *zone,
65456 enum zone_stat_item item)
65457 {
65458 - atomic_long_add(x, &zone->vm_stat[item]);
65459 - atomic_long_add(x, &vm_stat[item]);
65460 + atomic_long_add_unchecked(x, &zone->vm_stat[item]);
65461 + atomic_long_add_unchecked(x, &vm_stat[item]);
65462 }
65463
65464 static inline unsigned long global_page_state(enum zone_stat_item item)
65465 {
65466 - long x = atomic_long_read(&vm_stat[item]);
65467 + long x = atomic_long_read_unchecked(&vm_stat[item]);
65468 #ifdef CONFIG_SMP
65469 if (x < 0)
65470 x = 0;
65471 @@ -109,7 +109,7 @@ static inline unsigned long global_page_state(enum zone_stat_item item)
65472 static inline unsigned long zone_page_state(struct zone *zone,
65473 enum zone_stat_item item)
65474 {
65475 - long x = atomic_long_read(&zone->vm_stat[item]);
65476 + long x = atomic_long_read_unchecked(&zone->vm_stat[item]);
65477 #ifdef CONFIG_SMP
65478 if (x < 0)
65479 x = 0;
65480 @@ -126,7 +126,7 @@ static inline unsigned long zone_page_state(struct zone *zone,
65481 static inline unsigned long zone_page_state_snapshot(struct zone *zone,
65482 enum zone_stat_item item)
65483 {
65484 - long x = atomic_long_read(&zone->vm_stat[item]);
65485 + long x = atomic_long_read_unchecked(&zone->vm_stat[item]);
65486
65487 #ifdef CONFIG_SMP
65488 int cpu;
65489 @@ -216,8 +216,8 @@ static inline void __mod_zone_page_state(struct zone *zone,
65490
65491 static inline void __inc_zone_state(struct zone *zone, enum zone_stat_item item)
65492 {
65493 - atomic_long_inc(&zone->vm_stat[item]);
65494 - atomic_long_inc(&vm_stat[item]);
65495 + atomic_long_inc_unchecked(&zone->vm_stat[item]);
65496 + atomic_long_inc_unchecked(&vm_stat[item]);
65497 }
65498
65499 static inline void __inc_zone_page_state(struct page *page,
65500 @@ -228,8 +228,8 @@ static inline void __inc_zone_page_state(struct page *page,
65501
65502 static inline void __dec_zone_state(struct zone *zone, enum zone_stat_item item)
65503 {
65504 - atomic_long_dec(&zone->vm_stat[item]);
65505 - atomic_long_dec(&vm_stat[item]);
65506 + atomic_long_dec_unchecked(&zone->vm_stat[item]);
65507 + atomic_long_dec_unchecked(&vm_stat[item]);
65508 }
65509
65510 static inline void __dec_zone_page_state(struct page *page,
65511 diff --git a/include/linux/xattr.h b/include/linux/xattr.h
65512 index e5d1220..ef6e406 100644
65513 --- a/include/linux/xattr.h
65514 +++ b/include/linux/xattr.h
65515 @@ -57,6 +57,11 @@
65516 #define XATTR_POSIX_ACL_DEFAULT "posix_acl_default"
65517 #define XATTR_NAME_POSIX_ACL_DEFAULT XATTR_SYSTEM_PREFIX XATTR_POSIX_ACL_DEFAULT
65518
65519 +/* User namespace */
65520 +#define XATTR_PAX_PREFIX XATTR_USER_PREFIX "pax."
65521 +#define XATTR_PAX_FLAGS_SUFFIX "flags"
65522 +#define XATTR_NAME_PAX_FLAGS XATTR_PAX_PREFIX XATTR_PAX_FLAGS_SUFFIX
65523 +
65524 #ifdef __KERNEL__
65525
65526 #include <linux/types.h>
65527 diff --git a/include/media/saa7146_vv.h b/include/media/saa7146_vv.h
65528 index 944ecdf..a3994fc 100644
65529 --- a/include/media/saa7146_vv.h
65530 +++ b/include/media/saa7146_vv.h
65531 @@ -161,8 +161,8 @@ struct saa7146_ext_vv
65532 int (*std_callback)(struct saa7146_dev*, struct saa7146_standard *);
65533
65534 /* the extension can override this */
65535 - struct v4l2_ioctl_ops vid_ops;
65536 - struct v4l2_ioctl_ops vbi_ops;
65537 + v4l2_ioctl_ops_no_const vid_ops;
65538 + v4l2_ioctl_ops_no_const vbi_ops;
65539 /* pointer to the saa7146 core ops */
65540 const struct v4l2_ioctl_ops *core_ops;
65541
65542 diff --git a/include/media/v4l2-dev.h b/include/media/v4l2-dev.h
65543 index 5c416cd..20021aa 100644
65544 --- a/include/media/v4l2-dev.h
65545 +++ b/include/media/v4l2-dev.h
65546 @@ -73,7 +73,8 @@ struct v4l2_file_operations {
65547 int (*mmap) (struct file *, struct vm_area_struct *);
65548 int (*open) (struct file *);
65549 int (*release) (struct file *);
65550 -};
65551 +} __do_const;
65552 +typedef struct v4l2_file_operations __no_const v4l2_file_operations_no_const;
65553
65554 /*
65555 * Newer version of video_device, handled by videodev2.c
65556 diff --git a/include/media/v4l2-ioctl.h b/include/media/v4l2-ioctl.h
65557 index e614c9c..20602b7 100644
65558 --- a/include/media/v4l2-ioctl.h
65559 +++ b/include/media/v4l2-ioctl.h
65560 @@ -289,7 +289,7 @@ struct v4l2_ioctl_ops {
65561 long (*vidioc_default) (struct file *file, void *fh,
65562 bool valid_prio, int cmd, void *arg);
65563 };
65564 -
65565 +typedef struct v4l2_ioctl_ops __no_const v4l2_ioctl_ops_no_const;
65566
65567 /* v4l debugging and diagnostics */
65568
65569 diff --git a/include/net/caif/caif_hsi.h b/include/net/caif/caif_hsi.h
65570 index bcb9cc3..f4ec722e 100644
65571 --- a/include/net/caif/caif_hsi.h
65572 +++ b/include/net/caif/caif_hsi.h
65573 @@ -98,7 +98,7 @@ struct cfhsi_cb_ops {
65574 void (*rx_done_cb) (struct cfhsi_cb_ops *drv);
65575 void (*wake_up_cb) (struct cfhsi_cb_ops *drv);
65576 void (*wake_down_cb) (struct cfhsi_cb_ops *drv);
65577 -};
65578 +} __no_const;
65579
65580 /* Structure implemented by HSI device. */
65581 struct cfhsi_ops {
65582 diff --git a/include/net/caif/cfctrl.h b/include/net/caif/cfctrl.h
65583 index 9e5425b..8136ffc 100644
65584 --- a/include/net/caif/cfctrl.h
65585 +++ b/include/net/caif/cfctrl.h
65586 @@ -52,7 +52,7 @@ struct cfctrl_rsp {
65587 void (*radioset_rsp)(void);
65588 void (*reject_rsp)(struct cflayer *layer, u8 linkid,
65589 struct cflayer *client_layer);
65590 -};
65591 +} __no_const;
65592
65593 /* Link Setup Parameters for CAIF-Links. */
65594 struct cfctrl_link_param {
65595 @@ -101,8 +101,8 @@ struct cfctrl_request_info {
65596 struct cfctrl {
65597 struct cfsrvl serv;
65598 struct cfctrl_rsp res;
65599 - atomic_t req_seq_no;
65600 - atomic_t rsp_seq_no;
65601 + atomic_unchecked_t req_seq_no;
65602 + atomic_unchecked_t rsp_seq_no;
65603 struct list_head list;
65604 /* Protects from simultaneous access to first_req list */
65605 spinlock_t info_list_lock;
65606 diff --git a/include/net/flow.h b/include/net/flow.h
65607 index 628e11b..4c475df 100644
65608 --- a/include/net/flow.h
65609 +++ b/include/net/flow.h
65610 @@ -221,6 +221,6 @@ extern struct flow_cache_object *flow_cache_lookup(
65611
65612 extern void flow_cache_flush(void);
65613 extern void flow_cache_flush_deferred(void);
65614 -extern atomic_t flow_cache_genid;
65615 +extern atomic_unchecked_t flow_cache_genid;
65616
65617 #endif
65618 diff --git a/include/net/inetpeer.h b/include/net/inetpeer.h
65619 index 53f464d..ba76aaa 100644
65620 --- a/include/net/inetpeer.h
65621 +++ b/include/net/inetpeer.h
65622 @@ -47,8 +47,8 @@ struct inet_peer {
65623 */
65624 union {
65625 struct {
65626 - atomic_t rid; /* Frag reception counter */
65627 - atomic_t ip_id_count; /* IP ID for the next packet */
65628 + atomic_unchecked_t rid; /* Frag reception counter */
65629 + atomic_unchecked_t ip_id_count; /* IP ID for the next packet */
65630 };
65631 struct rcu_head rcu;
65632 struct inet_peer *gc_next;
65633 @@ -182,11 +182,11 @@ static inline int inet_getid(struct inet_peer *p, int more)
65634 more++;
65635 inet_peer_refcheck(p);
65636 do {
65637 - old = atomic_read(&p->ip_id_count);
65638 + old = atomic_read_unchecked(&p->ip_id_count);
65639 new = old + more;
65640 if (!new)
65641 new = 1;
65642 - } while (atomic_cmpxchg(&p->ip_id_count, old, new) != old);
65643 + } while (atomic_cmpxchg_unchecked(&p->ip_id_count, old, new) != old);
65644 return new;
65645 }
65646
65647 diff --git a/include/net/ip_fib.h b/include/net/ip_fib.h
65648 index 9497be1..5a4fafe 100644
65649 --- a/include/net/ip_fib.h
65650 +++ b/include/net/ip_fib.h
65651 @@ -169,7 +169,7 @@ extern __be32 fib_info_update_nh_saddr(struct net *net, struct fib_nh *nh);
65652
65653 #define FIB_RES_SADDR(net, res) \
65654 ((FIB_RES_NH(res).nh_saddr_genid == \
65655 - atomic_read(&(net)->ipv4.dev_addr_genid)) ? \
65656 + atomic_read_unchecked(&(net)->ipv4.dev_addr_genid)) ? \
65657 FIB_RES_NH(res).nh_saddr : \
65658 fib_info_update_nh_saddr((net), &FIB_RES_NH(res)))
65659 #define FIB_RES_GW(res) (FIB_RES_NH(res).nh_gw)
65660 diff --git a/include/net/ip_vs.h b/include/net/ip_vs.h
65661 index 95374d1..2300e36 100644
65662 --- a/include/net/ip_vs.h
65663 +++ b/include/net/ip_vs.h
65664 @@ -510,7 +510,7 @@ struct ip_vs_conn {
65665 struct ip_vs_conn *control; /* Master control connection */
65666 atomic_t n_control; /* Number of controlled ones */
65667 struct ip_vs_dest *dest; /* real server */
65668 - atomic_t in_pkts; /* incoming packet counter */
65669 + atomic_unchecked_t in_pkts; /* incoming packet counter */
65670
65671 /* packet transmitter for different forwarding methods. If it
65672 mangles the packet, it must return NF_DROP or better NF_STOLEN,
65673 @@ -648,7 +648,7 @@ struct ip_vs_dest {
65674 __be16 port; /* port number of the server */
65675 union nf_inet_addr addr; /* IP address of the server */
65676 volatile unsigned int flags; /* dest status flags */
65677 - atomic_t conn_flags; /* flags to copy to conn */
65678 + atomic_unchecked_t conn_flags; /* flags to copy to conn */
65679 atomic_t weight; /* server weight */
65680
65681 atomic_t refcnt; /* reference counter */
65682 diff --git a/include/net/irda/ircomm_core.h b/include/net/irda/ircomm_core.h
65683 index 69b610a..fe3962c 100644
65684 --- a/include/net/irda/ircomm_core.h
65685 +++ b/include/net/irda/ircomm_core.h
65686 @@ -51,7 +51,7 @@ typedef struct {
65687 int (*connect_response)(struct ircomm_cb *, struct sk_buff *);
65688 int (*disconnect_request)(struct ircomm_cb *, struct sk_buff *,
65689 struct ircomm_info *);
65690 -} call_t;
65691 +} __no_const call_t;
65692
65693 struct ircomm_cb {
65694 irda_queue_t queue;
65695 diff --git a/include/net/irda/ircomm_tty.h b/include/net/irda/ircomm_tty.h
65696 index 59ba38bc..d515662 100644
65697 --- a/include/net/irda/ircomm_tty.h
65698 +++ b/include/net/irda/ircomm_tty.h
65699 @@ -35,6 +35,7 @@
65700 #include <linux/termios.h>
65701 #include <linux/timer.h>
65702 #include <linux/tty.h> /* struct tty_struct */
65703 +#include <asm/local.h>
65704
65705 #include <net/irda/irias_object.h>
65706 #include <net/irda/ircomm_core.h>
65707 @@ -105,8 +106,8 @@ struct ircomm_tty_cb {
65708 unsigned short close_delay;
65709 unsigned short closing_wait; /* time to wait before closing */
65710
65711 - int open_count;
65712 - int blocked_open; /* # of blocked opens */
65713 + local_t open_count;
65714 + local_t blocked_open; /* # of blocked opens */
65715
65716 /* Protect concurent access to :
65717 * o self->open_count
65718 diff --git a/include/net/iucv/af_iucv.h b/include/net/iucv/af_iucv.h
65719 index cc7c197..9f2da2a 100644
65720 --- a/include/net/iucv/af_iucv.h
65721 +++ b/include/net/iucv/af_iucv.h
65722 @@ -141,7 +141,7 @@ struct iucv_sock {
65723 struct iucv_sock_list {
65724 struct hlist_head head;
65725 rwlock_t lock;
65726 - atomic_t autobind_name;
65727 + atomic_unchecked_t autobind_name;
65728 };
65729
65730 unsigned int iucv_sock_poll(struct file *file, struct socket *sock,
65731 diff --git a/include/net/neighbour.h b/include/net/neighbour.h
65732 index 344d898..2ae1302 100644
65733 --- a/include/net/neighbour.h
65734 +++ b/include/net/neighbour.h
65735 @@ -123,7 +123,7 @@ struct neigh_ops {
65736 void (*error_report)(struct neighbour *, struct sk_buff *);
65737 int (*output)(struct neighbour *, struct sk_buff *);
65738 int (*connected_output)(struct neighbour *, struct sk_buff *);
65739 -};
65740 +} __do_const;
65741
65742 struct pneigh_entry {
65743 struct pneigh_entry *next;
65744 diff --git a/include/net/net_namespace.h b/include/net/net_namespace.h
65745 index fd87963..312a11f 100644
65746 --- a/include/net/net_namespace.h
65747 +++ b/include/net/net_namespace.h
65748 @@ -102,7 +102,7 @@ struct net {
65749 #endif
65750 struct netns_ipvs *ipvs;
65751 struct sock *diag_nlsk;
65752 - atomic_t rt_genid;
65753 + atomic_unchecked_t rt_genid;
65754 };
65755
65756
65757 @@ -303,12 +303,12 @@ static inline void unregister_net_sysctl_table(struct ctl_table_header *header)
65758
65759 static inline int rt_genid(struct net *net)
65760 {
65761 - return atomic_read(&net->rt_genid);
65762 + return atomic_read_unchecked(&net->rt_genid);
65763 }
65764
65765 static inline void rt_genid_bump(struct net *net)
65766 {
65767 - atomic_inc(&net->rt_genid);
65768 + atomic_inc_unchecked(&net->rt_genid);
65769 }
65770
65771 #endif /* __NET_NET_NAMESPACE_H */
65772 diff --git a/include/net/netdma.h b/include/net/netdma.h
65773 index 8ba8ce2..99b7fff 100644
65774 --- a/include/net/netdma.h
65775 +++ b/include/net/netdma.h
65776 @@ -24,7 +24,7 @@
65777 #include <linux/dmaengine.h>
65778 #include <linux/skbuff.h>
65779
65780 -int dma_skb_copy_datagram_iovec(struct dma_chan* chan,
65781 +int __intentional_overflow(3,5) dma_skb_copy_datagram_iovec(struct dma_chan* chan,
65782 struct sk_buff *skb, int offset, struct iovec *to,
65783 size_t len, struct dma_pinned_list *pinned_list);
65784
65785 diff --git a/include/net/netlink.h b/include/net/netlink.h
65786 index 785f37a..c81dc0c 100644
65787 --- a/include/net/netlink.h
65788 +++ b/include/net/netlink.h
65789 @@ -520,7 +520,7 @@ static inline void *nlmsg_get_pos(struct sk_buff *skb)
65790 static inline void nlmsg_trim(struct sk_buff *skb, const void *mark)
65791 {
65792 if (mark)
65793 - skb_trim(skb, (unsigned char *) mark - skb->data);
65794 + skb_trim(skb, (const unsigned char *) mark - skb->data);
65795 }
65796
65797 /**
65798 diff --git a/include/net/netns/ipv4.h b/include/net/netns/ipv4.h
65799 index eb24dbc..567d6ed 100644
65800 --- a/include/net/netns/ipv4.h
65801 +++ b/include/net/netns/ipv4.h
65802 @@ -65,7 +65,7 @@ struct netns_ipv4 {
65803 unsigned int sysctl_ping_group_range[2];
65804 long sysctl_tcp_mem[3];
65805
65806 - atomic_t dev_addr_genid;
65807 + atomic_unchecked_t dev_addr_genid;
65808
65809 #ifdef CONFIG_IP_MROUTE
65810 #ifndef CONFIG_IP_MROUTE_MULTIPLE_TABLES
65811 diff --git a/include/net/sctp/sctp.h b/include/net/sctp/sctp.h
65812 index ff49964..1411fee 100644
65813 --- a/include/net/sctp/sctp.h
65814 +++ b/include/net/sctp/sctp.h
65815 @@ -320,9 +320,9 @@ do { \
65816
65817 #else /* SCTP_DEBUG */
65818
65819 -#define SCTP_DEBUG_PRINTK(whatever...)
65820 -#define SCTP_DEBUG_PRINTK_CONT(fmt, args...)
65821 -#define SCTP_DEBUG_PRINTK_IPADDR(whatever...)
65822 +#define SCTP_DEBUG_PRINTK(whatever...) do {} while (0)
65823 +#define SCTP_DEBUG_PRINTK_CONT(fmt, args...) do {} while (0)
65824 +#define SCTP_DEBUG_PRINTK_IPADDR(whatever...) do {} while (0)
65825 #define SCTP_ENABLE_DEBUG
65826 #define SCTP_DISABLE_DEBUG
65827 #define SCTP_ASSERT(expr, str, func)
65828 diff --git a/include/net/sock.h b/include/net/sock.h
65829 index adb7da2..1100002 100644
65830 --- a/include/net/sock.h
65831 +++ b/include/net/sock.h
65832 @@ -305,7 +305,7 @@ struct sock {
65833 #ifdef CONFIG_RPS
65834 __u32 sk_rxhash;
65835 #endif
65836 - atomic_t sk_drops;
65837 + atomic_unchecked_t sk_drops;
65838 int sk_rcvbuf;
65839
65840 struct sk_filter __rcu *sk_filter;
65841 @@ -1764,7 +1764,7 @@ static inline void sk_nocaps_add(struct sock *sk, netdev_features_t flags)
65842 }
65843
65844 static inline int skb_do_copy_data_nocache(struct sock *sk, struct sk_buff *skb,
65845 - char __user *from, char *to,
65846 + char __user *from, unsigned char *to,
65847 int copy, int offset)
65848 {
65849 if (skb->ip_summed == CHECKSUM_NONE) {
65850 @@ -2023,7 +2023,7 @@ static inline void sk_stream_moderate_sndbuf(struct sock *sk)
65851 }
65852 }
65853
65854 -struct sk_buff *sk_stream_alloc_skb(struct sock *sk, int size, gfp_t gfp);
65855 +struct sk_buff * __intentional_overflow(0) sk_stream_alloc_skb(struct sock *sk, int size, gfp_t gfp);
65856
65857 static inline struct page *sk_stream_alloc_page(struct sock *sk)
65858 {
65859 diff --git a/include/net/tcp.h b/include/net/tcp.h
65860 index 1f000ff..e5a8dfb 100644
65861 --- a/include/net/tcp.h
65862 +++ b/include/net/tcp.h
65863 @@ -508,7 +508,7 @@ extern void tcp_retransmit_timer(struct sock *sk);
65864 extern void tcp_xmit_retransmit_queue(struct sock *);
65865 extern void tcp_simple_retransmit(struct sock *);
65866 extern int tcp_trim_head(struct sock *, struct sk_buff *, u32);
65867 -extern int tcp_fragment(struct sock *, struct sk_buff *, u32, unsigned int);
65868 +extern int __intentional_overflow(3) tcp_fragment(struct sock *, struct sk_buff *, u32, unsigned int);
65869
65870 extern void tcp_send_probe0(struct sock *);
65871 extern void tcp_send_partial(struct sock *);
65872 @@ -677,8 +677,8 @@ struct tcp_skb_cb {
65873 struct inet6_skb_parm h6;
65874 #endif
65875 } header; /* For incoming frames */
65876 - __u32 seq; /* Starting sequence number */
65877 - __u32 end_seq; /* SEQ + FIN + SYN + datalen */
65878 + __u32 seq __intentional_overflow(0); /* Starting sequence number */
65879 + __u32 end_seq __intentional_overflow(0); /* SEQ + FIN + SYN + datalen */
65880 __u32 when; /* used to compute rtt's */
65881 __u8 tcp_flags; /* TCP header flags. (tcp[13]) */
65882
65883 @@ -692,7 +692,7 @@ struct tcp_skb_cb {
65884
65885 __u8 ip_dsfield; /* IPv4 tos or IPv6 dsfield */
65886 /* 1 byte hole */
65887 - __u32 ack_seq; /* Sequence number ACK'd */
65888 + __u32 ack_seq __intentional_overflow(0); /* Sequence number ACK'd */
65889 };
65890
65891 #define TCP_SKB_CB(__skb) ((struct tcp_skb_cb *)&((__skb)->cb[0]))
65892 @@ -1502,7 +1502,7 @@ struct tcp_seq_afinfo {
65893 char *name;
65894 sa_family_t family;
65895 const struct file_operations *seq_fops;
65896 - struct seq_operations seq_ops;
65897 + seq_operations_no_const seq_ops;
65898 };
65899
65900 struct tcp_iter_state {
65901 diff --git a/include/net/udp.h b/include/net/udp.h
65902 index 065f379..b661b40 100644
65903 --- a/include/net/udp.h
65904 +++ b/include/net/udp.h
65905 @@ -244,7 +244,7 @@ struct udp_seq_afinfo {
65906 sa_family_t family;
65907 struct udp_table *udp_table;
65908 const struct file_operations *seq_fops;
65909 - struct seq_operations seq_ops;
65910 + seq_operations_no_const seq_ops;
65911 };
65912
65913 struct udp_iter_state {
65914 diff --git a/include/net/xfrm.h b/include/net/xfrm.h
65915 index 639dd13..15b206c 100644
65916 --- a/include/net/xfrm.h
65917 +++ b/include/net/xfrm.h
65918 @@ -514,7 +514,7 @@ struct xfrm_policy {
65919 struct timer_list timer;
65920
65921 struct flow_cache_object flo;
65922 - atomic_t genid;
65923 + atomic_unchecked_t genid;
65924 u32 priority;
65925 u32 index;
65926 struct xfrm_mark mark;
65927 diff --git a/include/rdma/iw_cm.h b/include/rdma/iw_cm.h
65928 index 1a046b1..ee0bef0 100644
65929 --- a/include/rdma/iw_cm.h
65930 +++ b/include/rdma/iw_cm.h
65931 @@ -122,7 +122,7 @@ struct iw_cm_verbs {
65932 int backlog);
65933
65934 int (*destroy_listen)(struct iw_cm_id *cm_id);
65935 -};
65936 +} __no_const;
65937
65938 /**
65939 * iw_create_cm_id - Create an IW CM identifier.
65940 diff --git a/include/scsi/libfc.h b/include/scsi/libfc.h
65941 index 399162b..b337f1a 100644
65942 --- a/include/scsi/libfc.h
65943 +++ b/include/scsi/libfc.h
65944 @@ -762,6 +762,7 @@ struct libfc_function_template {
65945 */
65946 void (*disc_stop_final) (struct fc_lport *);
65947 };
65948 +typedef struct libfc_function_template __no_const libfc_function_template_no_const;
65949
65950 /**
65951 * struct fc_disc - Discovery context
65952 @@ -866,7 +867,7 @@ struct fc_lport {
65953 struct fc_vport *vport;
65954
65955 /* Operational Information */
65956 - struct libfc_function_template tt;
65957 + libfc_function_template_no_const tt;
65958 u8 link_up;
65959 u8 qfull;
65960 enum fc_lport_state state;
65961 diff --git a/include/scsi/scsi_device.h b/include/scsi/scsi_device.h
65962 index 9895f69..f1418f0 100644
65963 --- a/include/scsi/scsi_device.h
65964 +++ b/include/scsi/scsi_device.h
65965 @@ -166,9 +166,9 @@ struct scsi_device {
65966 unsigned int max_device_blocked; /* what device_blocked counts down from */
65967 #define SCSI_DEFAULT_DEVICE_BLOCKED 3
65968
65969 - atomic_t iorequest_cnt;
65970 - atomic_t iodone_cnt;
65971 - atomic_t ioerr_cnt;
65972 + atomic_unchecked_t iorequest_cnt;
65973 + atomic_unchecked_t iodone_cnt;
65974 + atomic_unchecked_t ioerr_cnt;
65975
65976 struct device sdev_gendev,
65977 sdev_dev;
65978 diff --git a/include/scsi/scsi_transport_fc.h b/include/scsi/scsi_transport_fc.h
65979 index b797e8f..8e2c3aa 100644
65980 --- a/include/scsi/scsi_transport_fc.h
65981 +++ b/include/scsi/scsi_transport_fc.h
65982 @@ -751,7 +751,8 @@ struct fc_function_template {
65983 unsigned long show_host_system_hostname:1;
65984
65985 unsigned long disable_target_scan:1;
65986 -};
65987 +} __do_const;
65988 +typedef struct fc_function_template __no_const fc_function_template_no_const;
65989
65990
65991 /**
65992 diff --git a/include/sound/ak4xxx-adda.h b/include/sound/ak4xxx-adda.h
65993 index 030b87c..98a6954 100644
65994 --- a/include/sound/ak4xxx-adda.h
65995 +++ b/include/sound/ak4xxx-adda.h
65996 @@ -35,7 +35,7 @@ struct snd_ak4xxx_ops {
65997 void (*write)(struct snd_akm4xxx *ak, int chip, unsigned char reg,
65998 unsigned char val);
65999 void (*set_rate_val)(struct snd_akm4xxx *ak, unsigned int rate);
66000 -};
66001 +} __no_const;
66002
66003 #define AK4XXX_IMAGE_SIZE (AK4XXX_MAX_CHIPS * 16) /* 64 bytes */
66004
66005 diff --git a/include/sound/hwdep.h b/include/sound/hwdep.h
66006 index 8c05e47..2b5df97 100644
66007 --- a/include/sound/hwdep.h
66008 +++ b/include/sound/hwdep.h
66009 @@ -49,7 +49,7 @@ struct snd_hwdep_ops {
66010 struct snd_hwdep_dsp_status *status);
66011 int (*dsp_load)(struct snd_hwdep *hw,
66012 struct snd_hwdep_dsp_image *image);
66013 -};
66014 +} __no_const;
66015
66016 struct snd_hwdep {
66017 struct snd_card *card;
66018 diff --git a/include/sound/info.h b/include/sound/info.h
66019 index 9ca1a49..aba1728 100644
66020 --- a/include/sound/info.h
66021 +++ b/include/sound/info.h
66022 @@ -44,7 +44,7 @@ struct snd_info_entry_text {
66023 struct snd_info_buffer *buffer);
66024 void (*write)(struct snd_info_entry *entry,
66025 struct snd_info_buffer *buffer);
66026 -};
66027 +} __no_const;
66028
66029 struct snd_info_entry_ops {
66030 int (*open)(struct snd_info_entry *entry,
66031 diff --git a/include/sound/pcm.h b/include/sound/pcm.h
66032 index cdca2ab..10bbe05 100644
66033 --- a/include/sound/pcm.h
66034 +++ b/include/sound/pcm.h
66035 @@ -81,6 +81,7 @@ struct snd_pcm_ops {
66036 int (*mmap)(struct snd_pcm_substream *substream, struct vm_area_struct *vma);
66037 int (*ack)(struct snd_pcm_substream *substream);
66038 };
66039 +typedef struct snd_pcm_ops __no_const snd_pcm_ops_no_const;
66040
66041 /*
66042 *
66043 diff --git a/include/sound/sb16_csp.h b/include/sound/sb16_csp.h
66044 index af1b49e..a5d55a5 100644
66045 --- a/include/sound/sb16_csp.h
66046 +++ b/include/sound/sb16_csp.h
66047 @@ -146,7 +146,7 @@ struct snd_sb_csp_ops {
66048 int (*csp_start) (struct snd_sb_csp * p, int sample_width, int channels);
66049 int (*csp_stop) (struct snd_sb_csp * p);
66050 int (*csp_qsound_transfer) (struct snd_sb_csp * p);
66051 -};
66052 +} __no_const;
66053
66054 /*
66055 * CSP private data
66056 diff --git a/include/sound/soc.h b/include/sound/soc.h
66057 index e063380..e8077d5 100644
66058 --- a/include/sound/soc.h
66059 +++ b/include/sound/soc.h
66060 @@ -801,7 +801,7 @@ struct snd_soc_platform_driver {
66061 unsigned int (*read)(struct snd_soc_platform *, unsigned int);
66062 int (*write)(struct snd_soc_platform *, unsigned int, unsigned int);
66063 int (*bespoke_trigger)(struct snd_pcm_substream *, int);
66064 -};
66065 +} __do_const;
66066
66067 struct snd_soc_platform {
66068 const char *name;
66069 @@ -1016,7 +1016,7 @@ struct snd_soc_pcm_runtime {
66070 struct snd_soc_dai_link *dai_link;
66071 struct mutex pcm_mutex;
66072 enum snd_soc_pcm_subclass pcm_subclass;
66073 - struct snd_pcm_ops ops;
66074 + snd_pcm_ops_no_const ops;
66075
66076 unsigned int dev_registered:1;
66077
66078 diff --git a/include/sound/tea575x-tuner.h b/include/sound/tea575x-tuner.h
66079 index fe8590c..aaed363 100644
66080 --- a/include/sound/tea575x-tuner.h
66081 +++ b/include/sound/tea575x-tuner.h
66082 @@ -48,7 +48,7 @@ struct snd_tea575x_ops {
66083
66084 struct snd_tea575x {
66085 struct v4l2_device *v4l2_dev;
66086 - struct v4l2_file_operations fops;
66087 + v4l2_file_operations_no_const fops;
66088 struct video_device vd; /* video device */
66089 int radio_nr; /* radio_nr */
66090 bool tea5759; /* 5759 chip is present */
66091 diff --git a/include/target/target_core_base.h b/include/target/target_core_base.h
66092 index 5be8937..a8e46e9 100644
66093 --- a/include/target/target_core_base.h
66094 +++ b/include/target/target_core_base.h
66095 @@ -434,7 +434,7 @@ struct t10_reservation_ops {
66096 int (*t10_seq_non_holder)(struct se_cmd *, unsigned char *, u32);
66097 int (*t10_pr_register)(struct se_cmd *);
66098 int (*t10_pr_clear)(struct se_cmd *);
66099 -};
66100 +} __no_const;
66101
66102 struct t10_reservation {
66103 /* Reservation effects all target ports */
66104 @@ -758,7 +758,7 @@ struct se_device {
66105 spinlock_t stats_lock;
66106 /* Active commands on this virtual SE device */
66107 atomic_t simple_cmds;
66108 - atomic_t dev_ordered_id;
66109 + atomic_unchecked_t dev_ordered_id;
66110 atomic_t dev_ordered_sync;
66111 atomic_t dev_qf_count;
66112 struct se_obj dev_obj;
66113 diff --git a/include/trace/events/fs.h b/include/trace/events/fs.h
66114 new file mode 100644
66115 index 0000000..2efe49d
66116 --- /dev/null
66117 +++ b/include/trace/events/fs.h
66118 @@ -0,0 +1,53 @@
66119 +#undef TRACE_SYSTEM
66120 +#define TRACE_SYSTEM fs
66121 +
66122 +#if !defined(_TRACE_FS_H) || defined(TRACE_HEADER_MULTI_READ)
66123 +#define _TRACE_FS_H
66124 +
66125 +#include <linux/fs.h>
66126 +#include <linux/tracepoint.h>
66127 +
66128 +TRACE_EVENT(do_sys_open,
66129 +
66130 + TP_PROTO(char *filename, int flags, int mode),
66131 +
66132 + TP_ARGS(filename, flags, mode),
66133 +
66134 + TP_STRUCT__entry(
66135 + __string( filename, filename )
66136 + __field( int, flags )
66137 + __field( int, mode )
66138 + ),
66139 +
66140 + TP_fast_assign(
66141 + __assign_str(filename, filename);
66142 + __entry->flags = flags;
66143 + __entry->mode = mode;
66144 + ),
66145 +
66146 + TP_printk("\"%s\" %x %o",
66147 + __get_str(filename), __entry->flags, __entry->mode)
66148 +);
66149 +
66150 +TRACE_EVENT(open_exec,
66151 +
66152 + TP_PROTO(const char *filename),
66153 +
66154 + TP_ARGS(filename),
66155 +
66156 + TP_STRUCT__entry(
66157 + __string( filename, filename )
66158 + ),
66159 +
66160 + TP_fast_assign(
66161 + __assign_str(filename, filename);
66162 + ),
66163 +
66164 + TP_printk("\"%s\"",
66165 + __get_str(filename))
66166 +);
66167 +
66168 +#endif /* _TRACE_FS_H */
66169 +
66170 +/* This part must be outside protection */
66171 +#include <trace/define_trace.h>
66172 diff --git a/include/trace/events/irq.h b/include/trace/events/irq.h
66173 index 1c09820..7f5ec79 100644
66174 --- a/include/trace/events/irq.h
66175 +++ b/include/trace/events/irq.h
66176 @@ -36,7 +36,7 @@ struct softirq_action;
66177 */
66178 TRACE_EVENT(irq_handler_entry,
66179
66180 - TP_PROTO(int irq, struct irqaction *action),
66181 + TP_PROTO(int irq, const struct irqaction *action),
66182
66183 TP_ARGS(irq, action),
66184
66185 @@ -66,7 +66,7 @@ TRACE_EVENT(irq_handler_entry,
66186 */
66187 TRACE_EVENT(irq_handler_exit,
66188
66189 - TP_PROTO(int irq, struct irqaction *action, int ret),
66190 + TP_PROTO(int irq, const struct irqaction *action, int ret),
66191
66192 TP_ARGS(irq, action, ret),
66193
66194 diff --git a/include/video/udlfb.h b/include/video/udlfb.h
66195 index f9466fa..f4e2b81 100644
66196 --- a/include/video/udlfb.h
66197 +++ b/include/video/udlfb.h
66198 @@ -53,10 +53,10 @@ struct dlfb_data {
66199 u32 pseudo_palette[256];
66200 int blank_mode; /*one of FB_BLANK_ */
66201 /* blit-only rendering path metrics, exposed through sysfs */
66202 - atomic_t bytes_rendered; /* raw pixel-bytes driver asked to render */
66203 - atomic_t bytes_identical; /* saved effort with backbuffer comparison */
66204 - atomic_t bytes_sent; /* to usb, after compression including overhead */
66205 - atomic_t cpu_kcycles_used; /* transpired during pixel processing */
66206 + atomic_unchecked_t bytes_rendered; /* raw pixel-bytes driver asked to render */
66207 + atomic_unchecked_t bytes_identical; /* saved effort with backbuffer comparison */
66208 + atomic_unchecked_t bytes_sent; /* to usb, after compression including overhead */
66209 + atomic_unchecked_t cpu_kcycles_used; /* transpired during pixel processing */
66210 };
66211
66212 #define NR_USB_REQUEST_I2C_SUB_IO 0x02
66213 diff --git a/include/video/uvesafb.h b/include/video/uvesafb.h
66214 index 0993a22..32ba2fe 100644
66215 --- a/include/video/uvesafb.h
66216 +++ b/include/video/uvesafb.h
66217 @@ -177,6 +177,7 @@ struct uvesafb_par {
66218 u8 ypan; /* 0 - nothing, 1 - ypan, 2 - ywrap */
66219 u8 pmi_setpal; /* PMI for palette changes */
66220 u16 *pmi_base; /* protected mode interface location */
66221 + u8 *pmi_code; /* protected mode code location */
66222 void *pmi_start;
66223 void *pmi_pal;
66224 u8 *vbe_state_orig; /*
66225 diff --git a/init/Kconfig b/init/Kconfig
66226 index af6c7f8..5c188f8 100644
66227 --- a/init/Kconfig
66228 +++ b/init/Kconfig
66229 @@ -850,6 +850,7 @@ endif # CGROUPS
66230
66231 config CHECKPOINT_RESTORE
66232 bool "Checkpoint/restore support" if EXPERT
66233 + depends on !GRKERNSEC
66234 default n
66235 help
66236 Enables additional kernel features in a sake of checkpoint/restore.
66237 @@ -1029,6 +1030,7 @@ config UIDGID_CONVERTED
66238 # Security modules
66239 depends on SECURITY_TOMOYO = n
66240 depends on SECURITY_APPARMOR = n
66241 + depends on GRKERNSEC = n
66242
66243 config UIDGID_STRICT_TYPE_CHECKS
66244 bool "Require conversions between uid/gids and their internal representation"
66245 @@ -1416,7 +1418,7 @@ config SLUB_DEBUG
66246
66247 config COMPAT_BRK
66248 bool "Disable heap randomization"
66249 - default y
66250 + default n
66251 help
66252 Randomizing heap placement makes heap exploits harder, but it
66253 also breaks ancient binaries (including anything libc5 based).
66254 @@ -1599,7 +1601,7 @@ config INIT_ALL_POSSIBLE
66255 config STOP_MACHINE
66256 bool
66257 default y
66258 - depends on (SMP && MODULE_UNLOAD) || HOTPLUG_CPU
66259 + depends on (SMP && MODULE_UNLOAD) || HOTPLUG_CPU || GRKERNSEC
66260 help
66261 Need stop_machine() primitive.
66262
66263 diff --git a/init/Makefile b/init/Makefile
66264 index 7bc47ee..6da2dc7 100644
66265 --- a/init/Makefile
66266 +++ b/init/Makefile
66267 @@ -2,6 +2,9 @@
66268 # Makefile for the linux kernel.
66269 #
66270
66271 +ccflags-y := $(GCC_PLUGINS_CFLAGS)
66272 +asflags-y := $(GCC_PLUGINS_AFLAGS)
66273 +
66274 obj-y := main.o version.o mounts.o
66275 ifneq ($(CONFIG_BLK_DEV_INITRD),y)
66276 obj-y += noinitramfs.o
66277 diff --git a/init/do_mounts.c b/init/do_mounts.c
66278 index d3f0aee..c9322f5 100644
66279 --- a/init/do_mounts.c
66280 +++ b/init/do_mounts.c
66281 @@ -336,11 +336,11 @@ static void __init get_fs_names(char *page)
66282 static int __init do_mount_root(char *name, char *fs, int flags, void *data)
66283 {
66284 struct super_block *s;
66285 - int err = sys_mount(name, "/root", fs, flags, data);
66286 + int err = sys_mount((char __force_user *)name, (char __force_user *)"/root", (char __force_user *)fs, flags, (void __force_user *)data);
66287 if (err)
66288 return err;
66289
66290 - sys_chdir("/root");
66291 + sys_chdir((const char __force_user *)"/root");
66292 s = current->fs->pwd.dentry->d_sb;
66293 ROOT_DEV = s->s_dev;
66294 printk(KERN_INFO
66295 @@ -460,18 +460,18 @@ void __init change_floppy(char *fmt, ...)
66296 va_start(args, fmt);
66297 vsprintf(buf, fmt, args);
66298 va_end(args);
66299 - fd = sys_open("/dev/root", O_RDWR | O_NDELAY, 0);
66300 + fd = sys_open((char __user *)"/dev/root", O_RDWR | O_NDELAY, 0);
66301 if (fd >= 0) {
66302 sys_ioctl(fd, FDEJECT, 0);
66303 sys_close(fd);
66304 }
66305 printk(KERN_NOTICE "VFS: Insert %s and press ENTER\n", buf);
66306 - fd = sys_open("/dev/console", O_RDWR, 0);
66307 + fd = sys_open((__force const char __user *)"/dev/console", O_RDWR, 0);
66308 if (fd >= 0) {
66309 sys_ioctl(fd, TCGETS, (long)&termios);
66310 termios.c_lflag &= ~ICANON;
66311 sys_ioctl(fd, TCSETSF, (long)&termios);
66312 - sys_read(fd, &c, 1);
66313 + sys_read(fd, (char __user *)&c, 1);
66314 termios.c_lflag |= ICANON;
66315 sys_ioctl(fd, TCSETSF, (long)&termios);
66316 sys_close(fd);
66317 @@ -565,6 +565,6 @@ void __init prepare_namespace(void)
66318 mount_root();
66319 out:
66320 devtmpfs_mount("dev");
66321 - sys_mount(".", "/", NULL, MS_MOVE, NULL);
66322 - sys_chroot(".");
66323 + sys_mount((char __force_user *)".", (char __force_user *)"/", NULL, MS_MOVE, NULL);
66324 + sys_chroot((const char __force_user *)".");
66325 }
66326 diff --git a/init/do_mounts.h b/init/do_mounts.h
66327 index f5b978a..69dbfe8 100644
66328 --- a/init/do_mounts.h
66329 +++ b/init/do_mounts.h
66330 @@ -15,15 +15,15 @@ extern int root_mountflags;
66331
66332 static inline int create_dev(char *name, dev_t dev)
66333 {
66334 - sys_unlink(name);
66335 - return sys_mknod(name, S_IFBLK|0600, new_encode_dev(dev));
66336 + sys_unlink((char __force_user *)name);
66337 + return sys_mknod((char __force_user *)name, S_IFBLK|0600, new_encode_dev(dev));
66338 }
66339
66340 #if BITS_PER_LONG == 32
66341 static inline u32 bstat(char *name)
66342 {
66343 struct stat64 stat;
66344 - if (sys_stat64(name, &stat) != 0)
66345 + if (sys_stat64((char __force_user *)name, (struct stat64 __force_user *)&stat) != 0)
66346 return 0;
66347 if (!S_ISBLK(stat.st_mode))
66348 return 0;
66349 @@ -35,7 +35,7 @@ static inline u32 bstat(char *name)
66350 static inline u32 bstat(char *name)
66351 {
66352 struct stat stat;
66353 - if (sys_newstat(name, &stat) != 0)
66354 + if (sys_newstat((const char __force_user *)name, (struct stat __force_user *)&stat) != 0)
66355 return 0;
66356 if (!S_ISBLK(stat.st_mode))
66357 return 0;
66358 diff --git a/init/do_mounts_initrd.c b/init/do_mounts_initrd.c
66359 index 135959a2..28a3f43 100644
66360 --- a/init/do_mounts_initrd.c
66361 +++ b/init/do_mounts_initrd.c
66362 @@ -53,13 +53,13 @@ static void __init handle_initrd(void)
66363 create_dev("/dev/root.old", Root_RAM0);
66364 /* mount initrd on rootfs' /root */
66365 mount_block_root("/dev/root.old", root_mountflags & ~MS_RDONLY);
66366 - sys_mkdir("/old", 0700);
66367 - root_fd = sys_open("/", 0, 0);
66368 - old_fd = sys_open("/old", 0, 0);
66369 + sys_mkdir((const char __force_user *)"/old", 0700);
66370 + root_fd = sys_open((const char __force_user *)"/", 0, 0);
66371 + old_fd = sys_open((const char __force_user *)"/old", 0, 0);
66372 /* move initrd over / and chdir/chroot in initrd root */
66373 - sys_chdir("/root");
66374 - sys_mount(".", "/", NULL, MS_MOVE, NULL);
66375 - sys_chroot(".");
66376 + sys_chdir((const char __force_user *)"/root");
66377 + sys_mount((char __force_user *)".", (char __force_user *)"/", NULL, MS_MOVE, NULL);
66378 + sys_chroot((const char __force_user *)".");
66379
66380 /*
66381 * In case that a resume from disk is carried out by linuxrc or one of
66382 @@ -76,15 +76,15 @@ static void __init handle_initrd(void)
66383
66384 /* move initrd to rootfs' /old */
66385 sys_fchdir(old_fd);
66386 - sys_mount("/", ".", NULL, MS_MOVE, NULL);
66387 + sys_mount((char __force_user *)"/", (char __force_user *)".", NULL, MS_MOVE, NULL);
66388 /* switch root and cwd back to / of rootfs */
66389 sys_fchdir(root_fd);
66390 - sys_chroot(".");
66391 + sys_chroot((const char __force_user *)".");
66392 sys_close(old_fd);
66393 sys_close(root_fd);
66394
66395 if (new_decode_dev(real_root_dev) == Root_RAM0) {
66396 - sys_chdir("/old");
66397 + sys_chdir((const char __force_user *)"/old");
66398 return;
66399 }
66400
66401 @@ -92,17 +92,17 @@ static void __init handle_initrd(void)
66402 mount_root();
66403
66404 printk(KERN_NOTICE "Trying to move old root to /initrd ... ");
66405 - error = sys_mount("/old", "/root/initrd", NULL, MS_MOVE, NULL);
66406 + error = sys_mount((char __force_user *)"/old", (char __force_user *)"/root/initrd", NULL, MS_MOVE, NULL);
66407 if (!error)
66408 printk("okay\n");
66409 else {
66410 - int fd = sys_open("/dev/root.old", O_RDWR, 0);
66411 + int fd = sys_open((const char __force_user *)"/dev/root.old", O_RDWR, 0);
66412 if (error == -ENOENT)
66413 printk("/initrd does not exist. Ignored.\n");
66414 else
66415 printk("failed\n");
66416 printk(KERN_NOTICE "Unmounting old root\n");
66417 - sys_umount("/old", MNT_DETACH);
66418 + sys_umount((char __force_user *)"/old", MNT_DETACH);
66419 printk(KERN_NOTICE "Trying to free ramdisk memory ... ");
66420 if (fd < 0) {
66421 error = fd;
66422 @@ -125,11 +125,11 @@ int __init initrd_load(void)
66423 * mounted in the normal path.
66424 */
66425 if (rd_load_image("/initrd.image") && ROOT_DEV != Root_RAM0) {
66426 - sys_unlink("/initrd.image");
66427 + sys_unlink((const char __force_user *)"/initrd.image");
66428 handle_initrd();
66429 return 1;
66430 }
66431 }
66432 - sys_unlink("/initrd.image");
66433 + sys_unlink((const char __force_user *)"/initrd.image");
66434 return 0;
66435 }
66436 diff --git a/init/do_mounts_md.c b/init/do_mounts_md.c
66437 index 8cb6db5..d729f50 100644
66438 --- a/init/do_mounts_md.c
66439 +++ b/init/do_mounts_md.c
66440 @@ -180,7 +180,7 @@ static void __init md_setup_drive(void)
66441 partitioned ? "_d" : "", minor,
66442 md_setup_args[ent].device_names);
66443
66444 - fd = sys_open(name, 0, 0);
66445 + fd = sys_open((char __force_user *)name, 0, 0);
66446 if (fd < 0) {
66447 printk(KERN_ERR "md: open failed - cannot start "
66448 "array %s\n", name);
66449 @@ -243,7 +243,7 @@ static void __init md_setup_drive(void)
66450 * array without it
66451 */
66452 sys_close(fd);
66453 - fd = sys_open(name, 0, 0);
66454 + fd = sys_open((char __force_user *)name, 0, 0);
66455 sys_ioctl(fd, BLKRRPART, 0);
66456 }
66457 sys_close(fd);
66458 @@ -293,7 +293,7 @@ static void __init autodetect_raid(void)
66459
66460 wait_for_device_probe();
66461
66462 - fd = sys_open("/dev/md0", 0, 0);
66463 + fd = sys_open((const char __force_user *) "/dev/md0", 0, 0);
66464 if (fd >= 0) {
66465 sys_ioctl(fd, RAID_AUTORUN, raid_autopart);
66466 sys_close(fd);
66467 diff --git a/init/init_task.c b/init/init_task.c
66468 index 8b2f399..f0797c9 100644
66469 --- a/init/init_task.c
66470 +++ b/init/init_task.c
66471 @@ -20,5 +20,9 @@ EXPORT_SYMBOL(init_task);
66472 * Initial thread structure. Alignment of this is handled by a special
66473 * linker map entry.
66474 */
66475 +#ifdef CONFIG_X86
66476 +union thread_union init_thread_union __init_task_data;
66477 +#else
66478 union thread_union init_thread_union __init_task_data =
66479 { INIT_THREAD_INFO(init_task) };
66480 +#endif
66481 diff --git a/init/initramfs.c b/init/initramfs.c
66482 index 84c6bf1..8899338 100644
66483 --- a/init/initramfs.c
66484 +++ b/init/initramfs.c
66485 @@ -84,7 +84,7 @@ static void __init free_hash(void)
66486 }
66487 }
66488
66489 -static long __init do_utime(char *filename, time_t mtime)
66490 +static long __init do_utime(char __force_user *filename, time_t mtime)
66491 {
66492 struct timespec t[2];
66493
66494 @@ -119,7 +119,7 @@ static void __init dir_utime(void)
66495 struct dir_entry *de, *tmp;
66496 list_for_each_entry_safe(de, tmp, &dir_list, list) {
66497 list_del(&de->list);
66498 - do_utime(de->name, de->mtime);
66499 + do_utime((char __force_user *)de->name, de->mtime);
66500 kfree(de->name);
66501 kfree(de);
66502 }
66503 @@ -281,7 +281,7 @@ static int __init maybe_link(void)
66504 if (nlink >= 2) {
66505 char *old = find_link(major, minor, ino, mode, collected);
66506 if (old)
66507 - return (sys_link(old, collected) < 0) ? -1 : 1;
66508 + return (sys_link((char __force_user *)old, (char __force_user *)collected) < 0) ? -1 : 1;
66509 }
66510 return 0;
66511 }
66512 @@ -290,11 +290,11 @@ static void __init clean_path(char *path, umode_t mode)
66513 {
66514 struct stat st;
66515
66516 - if (!sys_newlstat(path, &st) && (st.st_mode^mode) & S_IFMT) {
66517 + if (!sys_newlstat((char __force_user *)path, (struct stat __force_user *)&st) && (st.st_mode^mode) & S_IFMT) {
66518 if (S_ISDIR(st.st_mode))
66519 - sys_rmdir(path);
66520 + sys_rmdir((char __force_user *)path);
66521 else
66522 - sys_unlink(path);
66523 + sys_unlink((char __force_user *)path);
66524 }
66525 }
66526
66527 @@ -315,7 +315,7 @@ static int __init do_name(void)
66528 int openflags = O_WRONLY|O_CREAT;
66529 if (ml != 1)
66530 openflags |= O_TRUNC;
66531 - wfd = sys_open(collected, openflags, mode);
66532 + wfd = sys_open((char __force_user *)collected, openflags, mode);
66533
66534 if (wfd >= 0) {
66535 sys_fchown(wfd, uid, gid);
66536 @@ -327,17 +327,17 @@ static int __init do_name(void)
66537 }
66538 }
66539 } else if (S_ISDIR(mode)) {
66540 - sys_mkdir(collected, mode);
66541 - sys_chown(collected, uid, gid);
66542 - sys_chmod(collected, mode);
66543 + sys_mkdir((char __force_user *)collected, mode);
66544 + sys_chown((char __force_user *)collected, uid, gid);
66545 + sys_chmod((char __force_user *)collected, mode);
66546 dir_add(collected, mtime);
66547 } else if (S_ISBLK(mode) || S_ISCHR(mode) ||
66548 S_ISFIFO(mode) || S_ISSOCK(mode)) {
66549 if (maybe_link() == 0) {
66550 - sys_mknod(collected, mode, rdev);
66551 - sys_chown(collected, uid, gid);
66552 - sys_chmod(collected, mode);
66553 - do_utime(collected, mtime);
66554 + sys_mknod((char __force_user *)collected, mode, rdev);
66555 + sys_chown((char __force_user *)collected, uid, gid);
66556 + sys_chmod((char __force_user *)collected, mode);
66557 + do_utime((char __force_user *)collected, mtime);
66558 }
66559 }
66560 return 0;
66561 @@ -346,15 +346,15 @@ static int __init do_name(void)
66562 static int __init do_copy(void)
66563 {
66564 if (count >= body_len) {
66565 - sys_write(wfd, victim, body_len);
66566 + sys_write(wfd, (char __force_user *)victim, body_len);
66567 sys_close(wfd);
66568 - do_utime(vcollected, mtime);
66569 + do_utime((char __force_user *)vcollected, mtime);
66570 kfree(vcollected);
66571 eat(body_len);
66572 state = SkipIt;
66573 return 0;
66574 } else {
66575 - sys_write(wfd, victim, count);
66576 + sys_write(wfd, (char __force_user *)victim, count);
66577 body_len -= count;
66578 eat(count);
66579 return 1;
66580 @@ -365,9 +365,9 @@ static int __init do_symlink(void)
66581 {
66582 collected[N_ALIGN(name_len) + body_len] = '\0';
66583 clean_path(collected, 0);
66584 - sys_symlink(collected + N_ALIGN(name_len), collected);
66585 - sys_lchown(collected, uid, gid);
66586 - do_utime(collected, mtime);
66587 + sys_symlink((char __force_user *)collected + N_ALIGN(name_len), (char __force_user *)collected);
66588 + sys_lchown((char __force_user *)collected, uid, gid);
66589 + do_utime((char __force_user *)collected, mtime);
66590 state = SkipIt;
66591 next_state = Reset;
66592 return 0;
66593 diff --git a/init/main.c b/init/main.c
66594 index d61ec54..bd3144f 100644
66595 --- a/init/main.c
66596 +++ b/init/main.c
66597 @@ -96,6 +96,8 @@ static inline void mark_rodata_ro(void) { }
66598 extern void tc_init(void);
66599 #endif
66600
66601 +extern void grsecurity_init(void);
66602 +
66603 /*
66604 * Debug helper: via this flag we know that we are in 'early bootup code'
66605 * where only the boot processor is running with IRQ disabled. This means
66606 @@ -149,6 +151,61 @@ static int __init set_reset_devices(char *str)
66607
66608 __setup("reset_devices", set_reset_devices);
66609
66610 +#ifdef CONFIG_GRKERNSEC_PROC_USERGROUP
66611 +int grsec_proc_gid = CONFIG_GRKERNSEC_PROC_GID;
66612 +static int __init setup_grsec_proc_gid(char *str)
66613 +{
66614 + grsec_proc_gid = (int)simple_strtol(str, NULL, 0);
66615 + return 1;
66616 +}
66617 +__setup("grsec_proc_gid=", setup_grsec_proc_gid);
66618 +#endif
66619 +
66620 +#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
66621 +extern char pax_enter_kernel_user[];
66622 +extern char pax_exit_kernel_user[];
66623 +extern pgdval_t clone_pgd_mask;
66624 +#endif
66625 +
66626 +#if defined(CONFIG_X86) && defined(CONFIG_PAX_MEMORY_UDEREF)
66627 +static int __init setup_pax_nouderef(char *str)
66628 +{
66629 +#ifdef CONFIG_X86_32
66630 + unsigned int cpu;
66631 + struct desc_struct *gdt;
66632 +
66633 + for (cpu = 0; cpu < nr_cpu_ids; cpu++) {
66634 + gdt = get_cpu_gdt_table(cpu);
66635 + gdt[GDT_ENTRY_KERNEL_DS].type = 3;
66636 + gdt[GDT_ENTRY_KERNEL_DS].limit = 0xf;
66637 + gdt[GDT_ENTRY_DEFAULT_USER_CS].limit = 0xf;
66638 + gdt[GDT_ENTRY_DEFAULT_USER_DS].limit = 0xf;
66639 + }
66640 + loadsegment(ds, __KERNEL_DS);
66641 + loadsegment(es, __KERNEL_DS);
66642 + loadsegment(ss, __KERNEL_DS);
66643 +#else
66644 + memcpy(pax_enter_kernel_user, (unsigned char []){0xc3}, 1);
66645 + memcpy(pax_exit_kernel_user, (unsigned char []){0xc3}, 1);
66646 + clone_pgd_mask = ~(pgdval_t)0UL;
66647 +#endif
66648 +
66649 + return 0;
66650 +}
66651 +early_param("pax_nouderef", setup_pax_nouderef);
66652 +#endif
66653 +
66654 +#ifdef CONFIG_PAX_SOFTMODE
66655 +int pax_softmode;
66656 +
66657 +static int __init setup_pax_softmode(char *str)
66658 +{
66659 + get_option(&str, &pax_softmode);
66660 + return 1;
66661 +}
66662 +__setup("pax_softmode=", setup_pax_softmode);
66663 +#endif
66664 +
66665 static const char * argv_init[MAX_INIT_ARGS+2] = { "init", NULL, };
66666 const char * envp_init[MAX_INIT_ENVS+2] = { "HOME=/", "TERM=linux", NULL, };
66667 static const char *panic_later, *panic_param;
66668 @@ -678,6 +735,7 @@ int __init_or_module do_one_initcall(initcall_t fn)
66669 {
66670 int count = preempt_count();
66671 int ret;
66672 + const char *msg1 = "", *msg2 = "";
66673
66674 if (initcall_debug)
66675 ret = do_one_initcall_debug(fn);
66676 @@ -690,15 +748,15 @@ int __init_or_module do_one_initcall(initcall_t fn)
66677 sprintf(msgbuf, "error code %d ", ret);
66678
66679 if (preempt_count() != count) {
66680 - strlcat(msgbuf, "preemption imbalance ", sizeof(msgbuf));
66681 + msg1 = " preemption imbalance";
66682 preempt_count() = count;
66683 }
66684 if (irqs_disabled()) {
66685 - strlcat(msgbuf, "disabled interrupts ", sizeof(msgbuf));
66686 + msg2 = " disabled interrupts";
66687 local_irq_enable();
66688 }
66689 - if (msgbuf[0]) {
66690 - printk("initcall %pF returned with %s\n", fn, msgbuf);
66691 + if (msgbuf[0] || *msg1 || *msg2) {
66692 + printk("initcall %pF returned with %s%s%s\n", fn, msgbuf, msg1, msg2);
66693 }
66694
66695 return ret;
66696 @@ -752,8 +810,14 @@ static void __init do_initcall_level(int level)
66697 level, level,
66698 &repair_env_string);
66699
66700 - for (fn = initcall_levels[level]; fn < initcall_levels[level+1]; fn++)
66701 + for (fn = initcall_levels[level]; fn < initcall_levels[level+1]; fn++) {
66702 do_one_initcall(*fn);
66703 +
66704 +#ifdef CONFIG_PAX_LATENT_ENTROPY
66705 + transfer_latent_entropy();
66706 +#endif
66707 +
66708 + }
66709 }
66710
66711 static void __init do_initcalls(void)
66712 @@ -787,8 +851,14 @@ static void __init do_pre_smp_initcalls(void)
66713 {
66714 initcall_t *fn;
66715
66716 - for (fn = __initcall_start; fn < __initcall0_start; fn++)
66717 + for (fn = __initcall_start; fn < __initcall0_start; fn++) {
66718 do_one_initcall(*fn);
66719 +
66720 +#ifdef CONFIG_PAX_LATENT_ENTROPY
66721 + transfer_latent_entropy();
66722 +#endif
66723 +
66724 + }
66725 }
66726
66727 static void run_init_process(const char *init_filename)
66728 @@ -870,7 +940,7 @@ static int __init kernel_init(void * unused)
66729 do_basic_setup();
66730
66731 /* Open the /dev/console on the rootfs, this should never fail */
66732 - if (sys_open((const char __user *) "/dev/console", O_RDWR, 0) < 0)
66733 + if (sys_open((const char __force_user *) "/dev/console", O_RDWR, 0) < 0)
66734 printk(KERN_WARNING "Warning: unable to open an initial console.\n");
66735
66736 (void) sys_dup(0);
66737 @@ -883,11 +953,13 @@ static int __init kernel_init(void * unused)
66738 if (!ramdisk_execute_command)
66739 ramdisk_execute_command = "/init";
66740
66741 - if (sys_access((const char __user *) ramdisk_execute_command, 0) != 0) {
66742 + if (sys_access((const char __force_user *) ramdisk_execute_command, 0) != 0) {
66743 ramdisk_execute_command = NULL;
66744 prepare_namespace();
66745 }
66746
66747 + grsecurity_init();
66748 +
66749 /*
66750 * Ok, we have completed the initial bootup, and
66751 * we're essentially up and running. Get rid of the
66752 diff --git a/ipc/mqueue.c b/ipc/mqueue.c
66753 index 9a08acc..e65ebe7 100644
66754 --- a/ipc/mqueue.c
66755 +++ b/ipc/mqueue.c
66756 @@ -279,6 +279,7 @@ static struct inode *mqueue_get_inode(struct super_block *sb,
66757 mq_bytes = mq_treesize + (info->attr.mq_maxmsg *
66758 info->attr.mq_msgsize);
66759
66760 + gr_learn_resource(current, RLIMIT_MSGQUEUE, u->mq_bytes + mq_bytes, 1);
66761 spin_lock(&mq_lock);
66762 if (u->mq_bytes + mq_bytes < u->mq_bytes ||
66763 u->mq_bytes + mq_bytes > rlimit(RLIMIT_MSGQUEUE)) {
66764 diff --git a/ipc/msg.c b/ipc/msg.c
66765 index 7385de2..a8180e08 100644
66766 --- a/ipc/msg.c
66767 +++ b/ipc/msg.c
66768 @@ -309,18 +309,19 @@ static inline int msg_security(struct kern_ipc_perm *ipcp, int msgflg)
66769 return security_msg_queue_associate(msq, msgflg);
66770 }
66771
66772 +static struct ipc_ops msg_ops = {
66773 + .getnew = newque,
66774 + .associate = msg_security,
66775 + .more_checks = NULL
66776 +};
66777 +
66778 SYSCALL_DEFINE2(msgget, key_t, key, int, msgflg)
66779 {
66780 struct ipc_namespace *ns;
66781 - struct ipc_ops msg_ops;
66782 struct ipc_params msg_params;
66783
66784 ns = current->nsproxy->ipc_ns;
66785
66786 - msg_ops.getnew = newque;
66787 - msg_ops.associate = msg_security;
66788 - msg_ops.more_checks = NULL;
66789 -
66790 msg_params.key = key;
66791 msg_params.flg = msgflg;
66792
66793 diff --git a/ipc/sem.c b/ipc/sem.c
66794 index 5215a81..cfc0cac 100644
66795 --- a/ipc/sem.c
66796 +++ b/ipc/sem.c
66797 @@ -364,10 +364,15 @@ static inline int sem_more_checks(struct kern_ipc_perm *ipcp,
66798 return 0;
66799 }
66800
66801 +static struct ipc_ops sem_ops = {
66802 + .getnew = newary,
66803 + .associate = sem_security,
66804 + .more_checks = sem_more_checks
66805 +};
66806 +
66807 SYSCALL_DEFINE3(semget, key_t, key, int, nsems, int, semflg)
66808 {
66809 struct ipc_namespace *ns;
66810 - struct ipc_ops sem_ops;
66811 struct ipc_params sem_params;
66812
66813 ns = current->nsproxy->ipc_ns;
66814 @@ -375,10 +380,6 @@ SYSCALL_DEFINE3(semget, key_t, key, int, nsems, int, semflg)
66815 if (nsems < 0 || nsems > ns->sc_semmsl)
66816 return -EINVAL;
66817
66818 - sem_ops.getnew = newary;
66819 - sem_ops.associate = sem_security;
66820 - sem_ops.more_checks = sem_more_checks;
66821 -
66822 sem_params.key = key;
66823 sem_params.flg = semflg;
66824 sem_params.u.nsems = nsems;
66825 diff --git a/ipc/shm.c b/ipc/shm.c
66826 index 00faa05..7040960 100644
66827 --- a/ipc/shm.c
66828 +++ b/ipc/shm.c
66829 @@ -69,6 +69,14 @@ static void shm_destroy (struct ipc_namespace *ns, struct shmid_kernel *shp);
66830 static int sysvipc_shm_proc_show(struct seq_file *s, void *it);
66831 #endif
66832
66833 +#ifdef CONFIG_GRKERNSEC
66834 +extern int gr_handle_shmat(const pid_t shm_cprid, const pid_t shm_lapid,
66835 + const time_t shm_createtime, const uid_t cuid,
66836 + const int shmid);
66837 +extern int gr_chroot_shmat(const pid_t shm_cprid, const pid_t shm_lapid,
66838 + const time_t shm_createtime);
66839 +#endif
66840 +
66841 void shm_init_ns(struct ipc_namespace *ns)
66842 {
66843 ns->shm_ctlmax = SHMMAX;
66844 @@ -520,6 +528,14 @@ static int newseg(struct ipc_namespace *ns, struct ipc_params *params)
66845 shp->shm_lprid = 0;
66846 shp->shm_atim = shp->shm_dtim = 0;
66847 shp->shm_ctim = get_seconds();
66848 +#ifdef CONFIG_GRKERNSEC
66849 + {
66850 + struct timespec timeval;
66851 + do_posix_clock_monotonic_gettime(&timeval);
66852 +
66853 + shp->shm_createtime = timeval.tv_sec;
66854 + }
66855 +#endif
66856 shp->shm_segsz = size;
66857 shp->shm_nattch = 0;
66858 shp->shm_file = file;
66859 @@ -571,18 +587,19 @@ static inline int shm_more_checks(struct kern_ipc_perm *ipcp,
66860 return 0;
66861 }
66862
66863 +static struct ipc_ops shm_ops = {
66864 + .getnew = newseg,
66865 + .associate = shm_security,
66866 + .more_checks = shm_more_checks
66867 +};
66868 +
66869 SYSCALL_DEFINE3(shmget, key_t, key, size_t, size, int, shmflg)
66870 {
66871 struct ipc_namespace *ns;
66872 - struct ipc_ops shm_ops;
66873 struct ipc_params shm_params;
66874
66875 ns = current->nsproxy->ipc_ns;
66876
66877 - shm_ops.getnew = newseg;
66878 - shm_ops.associate = shm_security;
66879 - shm_ops.more_checks = shm_more_checks;
66880 -
66881 shm_params.key = key;
66882 shm_params.flg = shmflg;
66883 shm_params.u.size = size;
66884 @@ -1001,6 +1018,12 @@ long do_shmat(int shmid, char __user *shmaddr, int shmflg, ulong *raddr,
66885 f_mode = FMODE_READ | FMODE_WRITE;
66886 }
66887 if (shmflg & SHM_EXEC) {
66888 +
66889 +#ifdef CONFIG_PAX_MPROTECT
66890 + if (current->mm->pax_flags & MF_PAX_MPROTECT)
66891 + goto out;
66892 +#endif
66893 +
66894 prot |= PROT_EXEC;
66895 acc_mode |= S_IXUGO;
66896 }
66897 @@ -1024,9 +1047,21 @@ long do_shmat(int shmid, char __user *shmaddr, int shmflg, ulong *raddr,
66898 if (err)
66899 goto out_unlock;
66900
66901 +#ifdef CONFIG_GRKERNSEC
66902 + if (!gr_handle_shmat(shp->shm_cprid, shp->shm_lapid, shp->shm_createtime,
66903 + shp->shm_perm.cuid, shmid) ||
66904 + !gr_chroot_shmat(shp->shm_cprid, shp->shm_lapid, shp->shm_createtime)) {
66905 + err = -EACCES;
66906 + goto out_unlock;
66907 + }
66908 +#endif
66909 +
66910 path = shp->shm_file->f_path;
66911 path_get(&path);
66912 shp->shm_nattch++;
66913 +#ifdef CONFIG_GRKERNSEC
66914 + shp->shm_lapid = current->pid;
66915 +#endif
66916 size = i_size_read(path.dentry->d_inode);
66917 shm_unlock(shp);
66918
66919 diff --git a/kernel/acct.c b/kernel/acct.c
66920 index 02e6167..54824f7 100644
66921 --- a/kernel/acct.c
66922 +++ b/kernel/acct.c
66923 @@ -550,7 +550,7 @@ static void do_acct_process(struct bsd_acct_struct *acct,
66924 */
66925 flim = current->signal->rlim[RLIMIT_FSIZE].rlim_cur;
66926 current->signal->rlim[RLIMIT_FSIZE].rlim_cur = RLIM_INFINITY;
66927 - file->f_op->write(file, (char *)&ac,
66928 + file->f_op->write(file, (char __force_user *)&ac,
66929 sizeof(acct_t), &file->f_pos);
66930 current->signal->rlim[RLIMIT_FSIZE].rlim_cur = flim;
66931 set_fs(fs);
66932 diff --git a/kernel/audit.c b/kernel/audit.c
66933 index a8c84be..8bd034c 100644
66934 --- a/kernel/audit.c
66935 +++ b/kernel/audit.c
66936 @@ -115,7 +115,7 @@ u32 audit_sig_sid = 0;
66937 3) suppressed due to audit_rate_limit
66938 4) suppressed due to audit_backlog_limit
66939 */
66940 -static atomic_t audit_lost = ATOMIC_INIT(0);
66941 +static atomic_unchecked_t audit_lost = ATOMIC_INIT(0);
66942
66943 /* The netlink socket. */
66944 static struct sock *audit_sock;
66945 @@ -237,7 +237,7 @@ void audit_log_lost(const char *message)
66946 unsigned long now;
66947 int print;
66948
66949 - atomic_inc(&audit_lost);
66950 + atomic_inc_unchecked(&audit_lost);
66951
66952 print = (audit_failure == AUDIT_FAIL_PANIC || !audit_rate_limit);
66953
66954 @@ -256,7 +256,7 @@ void audit_log_lost(const char *message)
66955 printk(KERN_WARNING
66956 "audit: audit_lost=%d audit_rate_limit=%d "
66957 "audit_backlog_limit=%d\n",
66958 - atomic_read(&audit_lost),
66959 + atomic_read_unchecked(&audit_lost),
66960 audit_rate_limit,
66961 audit_backlog_limit);
66962 audit_panic(message);
66963 @@ -690,7 +690,7 @@ static int audit_receive_msg(struct sk_buff *skb, struct nlmsghdr *nlh)
66964 status_set.pid = audit_pid;
66965 status_set.rate_limit = audit_rate_limit;
66966 status_set.backlog_limit = audit_backlog_limit;
66967 - status_set.lost = atomic_read(&audit_lost);
66968 + status_set.lost = atomic_read_unchecked(&audit_lost);
66969 status_set.backlog = skb_queue_len(&audit_skb_queue);
66970 audit_send_reply(NETLINK_CB(skb).pid, seq, AUDIT_GET, 0, 0,
66971 &status_set, sizeof(status_set));
66972 diff --git a/kernel/auditsc.c b/kernel/auditsc.c
66973 index 4b96415..d8c16ee 100644
66974 --- a/kernel/auditsc.c
66975 +++ b/kernel/auditsc.c
66976 @@ -2289,7 +2289,7 @@ int auditsc_get_stamp(struct audit_context *ctx,
66977 }
66978
66979 /* global counter which is incremented every time something logs in */
66980 -static atomic_t session_id = ATOMIC_INIT(0);
66981 +static atomic_unchecked_t session_id = ATOMIC_INIT(0);
66982
66983 /**
66984 * audit_set_loginuid - set current task's audit_context loginuid
66985 @@ -2313,7 +2313,7 @@ int audit_set_loginuid(uid_t loginuid)
66986 return -EPERM;
66987 #endif /* CONFIG_AUDIT_LOGINUID_IMMUTABLE */
66988
66989 - sessionid = atomic_inc_return(&session_id);
66990 + sessionid = atomic_inc_return_unchecked(&session_id);
66991 if (context && context->in_syscall) {
66992 struct audit_buffer *ab;
66993
66994 diff --git a/kernel/capability.c b/kernel/capability.c
66995 index 493d972..ea17248 100644
66996 --- a/kernel/capability.c
66997 +++ b/kernel/capability.c
66998 @@ -202,6 +202,9 @@ SYSCALL_DEFINE2(capget, cap_user_header_t, header, cap_user_data_t, dataptr)
66999 * before modification is attempted and the application
67000 * fails.
67001 */
67002 + if (tocopy > ARRAY_SIZE(kdata))
67003 + return -EFAULT;
67004 +
67005 if (copy_to_user(dataptr, kdata, tocopy
67006 * sizeof(struct __user_cap_data_struct))) {
67007 return -EFAULT;
67008 @@ -303,10 +306,11 @@ bool has_ns_capability(struct task_struct *t,
67009 int ret;
67010
67011 rcu_read_lock();
67012 - ret = security_capable(__task_cred(t), ns, cap);
67013 + ret = security_capable(__task_cred(t), ns, cap) == 0 &&
67014 + gr_task_is_capable(t, __task_cred(t), cap);
67015 rcu_read_unlock();
67016
67017 - return (ret == 0);
67018 + return ret;
67019 }
67020
67021 /**
67022 @@ -343,10 +347,10 @@ bool has_ns_capability_noaudit(struct task_struct *t,
67023 int ret;
67024
67025 rcu_read_lock();
67026 - ret = security_capable_noaudit(__task_cred(t), ns, cap);
67027 + ret = security_capable_noaudit(__task_cred(t), ns, cap) == 0 && gr_task_is_capable_nolog(t, cap);
67028 rcu_read_unlock();
67029
67030 - return (ret == 0);
67031 + return ret;
67032 }
67033
67034 /**
67035 @@ -384,7 +388,7 @@ bool ns_capable(struct user_namespace *ns, int cap)
67036 BUG();
67037 }
67038
67039 - if (security_capable(current_cred(), ns, cap) == 0) {
67040 + if (security_capable(current_cred(), ns, cap) == 0 && gr_is_capable(cap)) {
67041 current->flags |= PF_SUPERPRIV;
67042 return true;
67043 }
67044 @@ -392,6 +396,21 @@ bool ns_capable(struct user_namespace *ns, int cap)
67045 }
67046 EXPORT_SYMBOL(ns_capable);
67047
67048 +bool ns_capable_nolog(struct user_namespace *ns, int cap)
67049 +{
67050 + if (unlikely(!cap_valid(cap))) {
67051 + printk(KERN_CRIT "capable() called with invalid cap=%u\n", cap);
67052 + BUG();
67053 + }
67054 +
67055 + if (security_capable(current_cred(), ns, cap) == 0 && gr_is_capable_nolog(cap)) {
67056 + current->flags |= PF_SUPERPRIV;
67057 + return true;
67058 + }
67059 + return false;
67060 +}
67061 +EXPORT_SYMBOL(ns_capable_nolog);
67062 +
67063 /**
67064 * capable - Determine if the current task has a superior capability in effect
67065 * @cap: The capability to be tested for
67066 @@ -408,6 +427,12 @@ bool capable(int cap)
67067 }
67068 EXPORT_SYMBOL(capable);
67069
67070 +bool capable_nolog(int cap)
67071 +{
67072 + return ns_capable_nolog(&init_user_ns, cap);
67073 +}
67074 +EXPORT_SYMBOL(capable_nolog);
67075 +
67076 /**
67077 * nsown_capable - Check superior capability to one's own user_ns
67078 * @cap: The capability in question
67079 @@ -440,3 +465,10 @@ bool inode_capable(const struct inode *inode, int cap)
67080
67081 return ns_capable(ns, cap) && kuid_has_mapping(ns, inode->i_uid);
67082 }
67083 +
67084 +bool inode_capable_nolog(const struct inode *inode, int cap)
67085 +{
67086 + struct user_namespace *ns = current_user_ns();
67087 +
67088 + return ns_capable_nolog(ns, cap) && kuid_has_mapping(ns, inode->i_uid);
67089 +}
67090 diff --git a/kernel/cgroup.c b/kernel/cgroup.c
67091 index ff2bce5..a41e8f9 100644
67092 --- a/kernel/cgroup.c
67093 +++ b/kernel/cgroup.c
67094 @@ -5390,7 +5390,7 @@ static int cgroup_css_links_read(struct cgroup *cont,
67095 struct css_set *cg = link->cg;
67096 struct task_struct *task;
67097 int count = 0;
67098 - seq_printf(seq, "css_set %p\n", cg);
67099 + seq_printf(seq, "css_set %pK\n", cg);
67100 list_for_each_entry(task, &cg->tasks, cg_list) {
67101 if (count++ > MAX_TASKS_SHOWN_PER_CSS) {
67102 seq_puts(seq, " ...\n");
67103 diff --git a/kernel/compat.c b/kernel/compat.c
67104 index c28a306..b4d0cf3 100644
67105 --- a/kernel/compat.c
67106 +++ b/kernel/compat.c
67107 @@ -13,6 +13,7 @@
67108
67109 #include <linux/linkage.h>
67110 #include <linux/compat.h>
67111 +#include <linux/module.h>
67112 #include <linux/errno.h>
67113 #include <linux/time.h>
67114 #include <linux/signal.h>
67115 @@ -220,7 +221,7 @@ static long compat_nanosleep_restart(struct restart_block *restart)
67116 mm_segment_t oldfs;
67117 long ret;
67118
67119 - restart->nanosleep.rmtp = (struct timespec __user *) &rmt;
67120 + restart->nanosleep.rmtp = (struct timespec __force_user *) &rmt;
67121 oldfs = get_fs();
67122 set_fs(KERNEL_DS);
67123 ret = hrtimer_nanosleep_restart(restart);
67124 @@ -252,7 +253,7 @@ asmlinkage long compat_sys_nanosleep(struct compat_timespec __user *rqtp,
67125 oldfs = get_fs();
67126 set_fs(KERNEL_DS);
67127 ret = hrtimer_nanosleep(&tu,
67128 - rmtp ? (struct timespec __user *)&rmt : NULL,
67129 + rmtp ? (struct timespec __force_user *)&rmt : NULL,
67130 HRTIMER_MODE_REL, CLOCK_MONOTONIC);
67131 set_fs(oldfs);
67132
67133 @@ -361,7 +362,7 @@ asmlinkage long compat_sys_sigpending(compat_old_sigset_t __user *set)
67134 mm_segment_t old_fs = get_fs();
67135
67136 set_fs(KERNEL_DS);
67137 - ret = sys_sigpending((old_sigset_t __user *) &s);
67138 + ret = sys_sigpending((old_sigset_t __force_user *) &s);
67139 set_fs(old_fs);
67140 if (ret == 0)
67141 ret = put_user(s, set);
67142 @@ -451,7 +452,7 @@ asmlinkage long compat_sys_old_getrlimit(unsigned int resource,
67143 mm_segment_t old_fs = get_fs();
67144
67145 set_fs(KERNEL_DS);
67146 - ret = sys_old_getrlimit(resource, &r);
67147 + ret = sys_old_getrlimit(resource, (struct rlimit __force_user *)&r);
67148 set_fs(old_fs);
67149
67150 if (!ret) {
67151 @@ -523,7 +524,7 @@ asmlinkage long compat_sys_getrusage(int who, struct compat_rusage __user *ru)
67152 mm_segment_t old_fs = get_fs();
67153
67154 set_fs(KERNEL_DS);
67155 - ret = sys_getrusage(who, (struct rusage __user *) &r);
67156 + ret = sys_getrusage(who, (struct rusage __force_user *) &r);
67157 set_fs(old_fs);
67158
67159 if (ret)
67160 @@ -550,8 +551,8 @@ compat_sys_wait4(compat_pid_t pid, compat_uint_t __user *stat_addr, int options,
67161 set_fs (KERNEL_DS);
67162 ret = sys_wait4(pid,
67163 (stat_addr ?
67164 - (unsigned int __user *) &status : NULL),
67165 - options, (struct rusage __user *) &r);
67166 + (unsigned int __force_user *) &status : NULL),
67167 + options, (struct rusage __force_user *) &r);
67168 set_fs (old_fs);
67169
67170 if (ret > 0) {
67171 @@ -576,8 +577,8 @@ asmlinkage long compat_sys_waitid(int which, compat_pid_t pid,
67172 memset(&info, 0, sizeof(info));
67173
67174 set_fs(KERNEL_DS);
67175 - ret = sys_waitid(which, pid, (siginfo_t __user *)&info, options,
67176 - uru ? (struct rusage __user *)&ru : NULL);
67177 + ret = sys_waitid(which, pid, (siginfo_t __force_user *)&info, options,
67178 + uru ? (struct rusage __force_user *)&ru : NULL);
67179 set_fs(old_fs);
67180
67181 if ((ret < 0) || (info.si_signo == 0))
67182 @@ -707,8 +708,8 @@ long compat_sys_timer_settime(timer_t timer_id, int flags,
67183 oldfs = get_fs();
67184 set_fs(KERNEL_DS);
67185 err = sys_timer_settime(timer_id, flags,
67186 - (struct itimerspec __user *) &newts,
67187 - (struct itimerspec __user *) &oldts);
67188 + (struct itimerspec __force_user *) &newts,
67189 + (struct itimerspec __force_user *) &oldts);
67190 set_fs(oldfs);
67191 if (!err && old && put_compat_itimerspec(old, &oldts))
67192 return -EFAULT;
67193 @@ -725,7 +726,7 @@ long compat_sys_timer_gettime(timer_t timer_id,
67194 oldfs = get_fs();
67195 set_fs(KERNEL_DS);
67196 err = sys_timer_gettime(timer_id,
67197 - (struct itimerspec __user *) &ts);
67198 + (struct itimerspec __force_user *) &ts);
67199 set_fs(oldfs);
67200 if (!err && put_compat_itimerspec(setting, &ts))
67201 return -EFAULT;
67202 @@ -744,7 +745,7 @@ long compat_sys_clock_settime(clockid_t which_clock,
67203 oldfs = get_fs();
67204 set_fs(KERNEL_DS);
67205 err = sys_clock_settime(which_clock,
67206 - (struct timespec __user *) &ts);
67207 + (struct timespec __force_user *) &ts);
67208 set_fs(oldfs);
67209 return err;
67210 }
67211 @@ -759,7 +760,7 @@ long compat_sys_clock_gettime(clockid_t which_clock,
67212 oldfs = get_fs();
67213 set_fs(KERNEL_DS);
67214 err = sys_clock_gettime(which_clock,
67215 - (struct timespec __user *) &ts);
67216 + (struct timespec __force_user *) &ts);
67217 set_fs(oldfs);
67218 if (!err && put_compat_timespec(&ts, tp))
67219 return -EFAULT;
67220 @@ -779,7 +780,7 @@ long compat_sys_clock_adjtime(clockid_t which_clock,
67221
67222 oldfs = get_fs();
67223 set_fs(KERNEL_DS);
67224 - ret = sys_clock_adjtime(which_clock, (struct timex __user *) &txc);
67225 + ret = sys_clock_adjtime(which_clock, (struct timex __force_user *) &txc);
67226 set_fs(oldfs);
67227
67228 err = compat_put_timex(utp, &txc);
67229 @@ -799,7 +800,7 @@ long compat_sys_clock_getres(clockid_t which_clock,
67230 oldfs = get_fs();
67231 set_fs(KERNEL_DS);
67232 err = sys_clock_getres(which_clock,
67233 - (struct timespec __user *) &ts);
67234 + (struct timespec __force_user *) &ts);
67235 set_fs(oldfs);
67236 if (!err && tp && put_compat_timespec(&ts, tp))
67237 return -EFAULT;
67238 @@ -811,9 +812,9 @@ static long compat_clock_nanosleep_restart(struct restart_block *restart)
67239 long err;
67240 mm_segment_t oldfs;
67241 struct timespec tu;
67242 - struct compat_timespec *rmtp = restart->nanosleep.compat_rmtp;
67243 + struct compat_timespec __user *rmtp = restart->nanosleep.compat_rmtp;
67244
67245 - restart->nanosleep.rmtp = (struct timespec __user *) &tu;
67246 + restart->nanosleep.rmtp = (struct timespec __force_user *) &tu;
67247 oldfs = get_fs();
67248 set_fs(KERNEL_DS);
67249 err = clock_nanosleep_restart(restart);
67250 @@ -845,8 +846,8 @@ long compat_sys_clock_nanosleep(clockid_t which_clock, int flags,
67251 oldfs = get_fs();
67252 set_fs(KERNEL_DS);
67253 err = sys_clock_nanosleep(which_clock, flags,
67254 - (struct timespec __user *) &in,
67255 - (struct timespec __user *) &out);
67256 + (struct timespec __force_user *) &in,
67257 + (struct timespec __force_user *) &out);
67258 set_fs(oldfs);
67259
67260 if ((err == -ERESTART_RESTARTBLOCK) && rmtp &&
67261 diff --git a/kernel/configs.c b/kernel/configs.c
67262 index 42e8fa0..9e7406b 100644
67263 --- a/kernel/configs.c
67264 +++ b/kernel/configs.c
67265 @@ -74,8 +74,19 @@ static int __init ikconfig_init(void)
67266 struct proc_dir_entry *entry;
67267
67268 /* create the current config file */
67269 +#if defined(CONFIG_GRKERNSEC_PROC_ADD) || defined(CONFIG_GRKERNSEC_HIDESYM)
67270 +#if defined(CONFIG_GRKERNSEC_PROC_USER) || defined(CONFIG_GRKERNSEC_HIDESYM)
67271 + entry = proc_create("config.gz", S_IFREG | S_IRUSR, NULL,
67272 + &ikconfig_file_ops);
67273 +#elif defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
67274 + entry = proc_create("config.gz", S_IFREG | S_IRUSR | S_IRGRP, NULL,
67275 + &ikconfig_file_ops);
67276 +#endif
67277 +#else
67278 entry = proc_create("config.gz", S_IFREG | S_IRUGO, NULL,
67279 &ikconfig_file_ops);
67280 +#endif
67281 +
67282 if (!entry)
67283 return -ENOMEM;
67284
67285 diff --git a/kernel/cred.c b/kernel/cred.c
67286 index de728ac..e3c267c 100644
67287 --- a/kernel/cred.c
67288 +++ b/kernel/cred.c
67289 @@ -207,6 +207,16 @@ void exit_creds(struct task_struct *tsk)
67290 validate_creds(cred);
67291 alter_cred_subscribers(cred, -1);
67292 put_cred(cred);
67293 +
67294 +#ifdef CONFIG_GRKERNSEC_SETXID
67295 + cred = (struct cred *) tsk->delayed_cred;
67296 + if (cred != NULL) {
67297 + tsk->delayed_cred = NULL;
67298 + validate_creds(cred);
67299 + alter_cred_subscribers(cred, -1);
67300 + put_cred(cred);
67301 + }
67302 +#endif
67303 }
67304
67305 /**
67306 @@ -469,7 +479,7 @@ error_put:
67307 * Always returns 0 thus allowing this function to be tail-called at the end
67308 * of, say, sys_setgid().
67309 */
67310 -int commit_creds(struct cred *new)
67311 +static int __commit_creds(struct cred *new)
67312 {
67313 struct task_struct *task = current;
67314 const struct cred *old = task->real_cred;
67315 @@ -488,6 +498,8 @@ int commit_creds(struct cred *new)
67316
67317 get_cred(new); /* we will require a ref for the subj creds too */
67318
67319 + gr_set_role_label(task, new->uid, new->gid);
67320 +
67321 /* dumpability changes */
67322 if (!uid_eq(old->euid, new->euid) ||
67323 !gid_eq(old->egid, new->egid) ||
67324 @@ -537,6 +549,101 @@ int commit_creds(struct cred *new)
67325 put_cred(old);
67326 return 0;
67327 }
67328 +#ifdef CONFIG_GRKERNSEC_SETXID
67329 +extern int set_user(struct cred *new);
67330 +
67331 +void gr_delayed_cred_worker(void)
67332 +{
67333 + const struct cred *new = current->delayed_cred;
67334 + struct cred *ncred;
67335 +
67336 + current->delayed_cred = NULL;
67337 +
67338 + if (current_uid() && new != NULL) {
67339 + // from doing get_cred on it when queueing this
67340 + put_cred(new);
67341 + return;
67342 + } else if (new == NULL)
67343 + return;
67344 +
67345 + ncred = prepare_creds();
67346 + if (!ncred)
67347 + goto die;
67348 + // uids
67349 + ncred->uid = new->uid;
67350 + ncred->euid = new->euid;
67351 + ncred->suid = new->suid;
67352 + ncred->fsuid = new->fsuid;
67353 + // gids
67354 + ncred->gid = new->gid;
67355 + ncred->egid = new->egid;
67356 + ncred->sgid = new->sgid;
67357 + ncred->fsgid = new->fsgid;
67358 + // groups
67359 + if (set_groups(ncred, new->group_info) < 0) {
67360 + abort_creds(ncred);
67361 + goto die;
67362 + }
67363 + // caps
67364 + ncred->securebits = new->securebits;
67365 + ncred->cap_inheritable = new->cap_inheritable;
67366 + ncred->cap_permitted = new->cap_permitted;
67367 + ncred->cap_effective = new->cap_effective;
67368 + ncred->cap_bset = new->cap_bset;
67369 +
67370 + if (set_user(ncred)) {
67371 + abort_creds(ncred);
67372 + goto die;
67373 + }
67374 +
67375 + // from doing get_cred on it when queueing this
67376 + put_cred(new);
67377 +
67378 + __commit_creds(ncred);
67379 + return;
67380 +die:
67381 + // from doing get_cred on it when queueing this
67382 + put_cred(new);
67383 + do_group_exit(SIGKILL);
67384 +}
67385 +#endif
67386 +
67387 +int commit_creds(struct cred *new)
67388 +{
67389 +#ifdef CONFIG_GRKERNSEC_SETXID
67390 + int ret;
67391 + int schedule_it = 0;
67392 + struct task_struct *t;
67393 +
67394 + /* we won't get called with tasklist_lock held for writing
67395 + and interrupts disabled as the cred struct in that case is
67396 + init_cred
67397 + */
67398 + if (grsec_enable_setxid && !current_is_single_threaded() &&
67399 + !current_uid() && new->uid) {
67400 + schedule_it = 1;
67401 + }
67402 + ret = __commit_creds(new);
67403 + if (schedule_it) {
67404 + rcu_read_lock();
67405 + read_lock(&tasklist_lock);
67406 + for (t = next_thread(current); t != current;
67407 + t = next_thread(t)) {
67408 + if (t->delayed_cred == NULL) {
67409 + t->delayed_cred = get_cred(new);
67410 + set_tsk_thread_flag(t, TIF_GRSEC_SETXID);
67411 + set_tsk_need_resched(t);
67412 + }
67413 + }
67414 + read_unlock(&tasklist_lock);
67415 + rcu_read_unlock();
67416 + }
67417 + return ret;
67418 +#else
67419 + return __commit_creds(new);
67420 +#endif
67421 +}
67422 +
67423 EXPORT_SYMBOL(commit_creds);
67424
67425 /**
67426 diff --git a/kernel/debug/debug_core.c b/kernel/debug/debug_core.c
67427 index 0557f24..1a00d9a 100644
67428 --- a/kernel/debug/debug_core.c
67429 +++ b/kernel/debug/debug_core.c
67430 @@ -122,7 +122,7 @@ static DEFINE_RAW_SPINLOCK(dbg_slave_lock);
67431 */
67432 static atomic_t masters_in_kgdb;
67433 static atomic_t slaves_in_kgdb;
67434 -static atomic_t kgdb_break_tasklet_var;
67435 +static atomic_unchecked_t kgdb_break_tasklet_var;
67436 atomic_t kgdb_setting_breakpoint;
67437
67438 struct task_struct *kgdb_usethread;
67439 @@ -132,7 +132,7 @@ int kgdb_single_step;
67440 static pid_t kgdb_sstep_pid;
67441
67442 /* to keep track of the CPU which is doing the single stepping*/
67443 -atomic_t kgdb_cpu_doing_single_step = ATOMIC_INIT(-1);
67444 +atomic_unchecked_t kgdb_cpu_doing_single_step = ATOMIC_INIT(-1);
67445
67446 /*
67447 * If you are debugging a problem where roundup (the collection of
67448 @@ -540,7 +540,7 @@ return_normal:
67449 * kernel will only try for the value of sstep_tries before
67450 * giving up and continuing on.
67451 */
67452 - if (atomic_read(&kgdb_cpu_doing_single_step) != -1 &&
67453 + if (atomic_read_unchecked(&kgdb_cpu_doing_single_step) != -1 &&
67454 (kgdb_info[cpu].task &&
67455 kgdb_info[cpu].task->pid != kgdb_sstep_pid) && --sstep_tries) {
67456 atomic_set(&kgdb_active, -1);
67457 @@ -634,8 +634,8 @@ cpu_master_loop:
67458 }
67459
67460 kgdb_restore:
67461 - if (atomic_read(&kgdb_cpu_doing_single_step) != -1) {
67462 - int sstep_cpu = atomic_read(&kgdb_cpu_doing_single_step);
67463 + if (atomic_read_unchecked(&kgdb_cpu_doing_single_step) != -1) {
67464 + int sstep_cpu = atomic_read_unchecked(&kgdb_cpu_doing_single_step);
67465 if (kgdb_info[sstep_cpu].task)
67466 kgdb_sstep_pid = kgdb_info[sstep_cpu].task->pid;
67467 else
67468 @@ -861,18 +861,18 @@ static void kgdb_unregister_callbacks(void)
67469 static void kgdb_tasklet_bpt(unsigned long ing)
67470 {
67471 kgdb_breakpoint();
67472 - atomic_set(&kgdb_break_tasklet_var, 0);
67473 + atomic_set_unchecked(&kgdb_break_tasklet_var, 0);
67474 }
67475
67476 static DECLARE_TASKLET(kgdb_tasklet_breakpoint, kgdb_tasklet_bpt, 0);
67477
67478 void kgdb_schedule_breakpoint(void)
67479 {
67480 - if (atomic_read(&kgdb_break_tasklet_var) ||
67481 + if (atomic_read_unchecked(&kgdb_break_tasklet_var) ||
67482 atomic_read(&kgdb_active) != -1 ||
67483 atomic_read(&kgdb_setting_breakpoint))
67484 return;
67485 - atomic_inc(&kgdb_break_tasklet_var);
67486 + atomic_inc_unchecked(&kgdb_break_tasklet_var);
67487 tasklet_schedule(&kgdb_tasklet_breakpoint);
67488 }
67489 EXPORT_SYMBOL_GPL(kgdb_schedule_breakpoint);
67490 diff --git a/kernel/debug/kdb/kdb_main.c b/kernel/debug/kdb/kdb_main.c
67491 index 31df170..bc98840 100644
67492 --- a/kernel/debug/kdb/kdb_main.c
67493 +++ b/kernel/debug/kdb/kdb_main.c
67494 @@ -1971,7 +1971,7 @@ static int kdb_lsmod(int argc, const char **argv)
67495 list_for_each_entry(mod, kdb_modules, list) {
67496
67497 kdb_printf("%-20s%8u 0x%p ", mod->name,
67498 - mod->core_size, (void *)mod);
67499 + mod->core_size_rx + mod->core_size_rw, (void *)mod);
67500 #ifdef CONFIG_MODULE_UNLOAD
67501 kdb_printf("%4ld ", module_refcount(mod));
67502 #endif
67503 @@ -1981,7 +1981,7 @@ static int kdb_lsmod(int argc, const char **argv)
67504 kdb_printf(" (Loading)");
67505 else
67506 kdb_printf(" (Live)");
67507 - kdb_printf(" 0x%p", mod->module_core);
67508 + kdb_printf(" 0x%p 0x%p", mod->module_core_rx, mod->module_core_rw);
67509
67510 #ifdef CONFIG_MODULE_UNLOAD
67511 {
67512 diff --git a/kernel/events/core.c b/kernel/events/core.c
67513 index 7fee567..8affa2c 100644
67514 --- a/kernel/events/core.c
67515 +++ b/kernel/events/core.c
67516 @@ -181,7 +181,7 @@ int perf_proc_update_handler(struct ctl_table *table, int write,
67517 return 0;
67518 }
67519
67520 -static atomic64_t perf_event_id;
67521 +static atomic64_unchecked_t perf_event_id;
67522
67523 static void cpu_ctx_sched_out(struct perf_cpu_context *cpuctx,
67524 enum event_type_t event_type);
67525 @@ -2665,7 +2665,7 @@ static void __perf_event_read(void *info)
67526
67527 static inline u64 perf_event_count(struct perf_event *event)
67528 {
67529 - return local64_read(&event->count) + atomic64_read(&event->child_count);
67530 + return local64_read(&event->count) + atomic64_read_unchecked(&event->child_count);
67531 }
67532
67533 static u64 perf_event_read(struct perf_event *event)
67534 @@ -2995,9 +2995,9 @@ u64 perf_event_read_value(struct perf_event *event, u64 *enabled, u64 *running)
67535 mutex_lock(&event->child_mutex);
67536 total += perf_event_read(event);
67537 *enabled += event->total_time_enabled +
67538 - atomic64_read(&event->child_total_time_enabled);
67539 + atomic64_read_unchecked(&event->child_total_time_enabled);
67540 *running += event->total_time_running +
67541 - atomic64_read(&event->child_total_time_running);
67542 + atomic64_read_unchecked(&event->child_total_time_running);
67543
67544 list_for_each_entry(child, &event->child_list, child_list) {
67545 total += perf_event_read(child);
67546 @@ -3406,10 +3406,10 @@ void perf_event_update_userpage(struct perf_event *event)
67547 userpg->offset -= local64_read(&event->hw.prev_count);
67548
67549 userpg->time_enabled = enabled +
67550 - atomic64_read(&event->child_total_time_enabled);
67551 + atomic64_read_unchecked(&event->child_total_time_enabled);
67552
67553 userpg->time_running = running +
67554 - atomic64_read(&event->child_total_time_running);
67555 + atomic64_read_unchecked(&event->child_total_time_running);
67556
67557 arch_perf_update_userpage(userpg, now);
67558
67559 @@ -3842,11 +3842,11 @@ static void perf_output_read_one(struct perf_output_handle *handle,
67560 values[n++] = perf_event_count(event);
67561 if (read_format & PERF_FORMAT_TOTAL_TIME_ENABLED) {
67562 values[n++] = enabled +
67563 - atomic64_read(&event->child_total_time_enabled);
67564 + atomic64_read_unchecked(&event->child_total_time_enabled);
67565 }
67566 if (read_format & PERF_FORMAT_TOTAL_TIME_RUNNING) {
67567 values[n++] = running +
67568 - atomic64_read(&event->child_total_time_running);
67569 + atomic64_read_unchecked(&event->child_total_time_running);
67570 }
67571 if (read_format & PERF_FORMAT_ID)
67572 values[n++] = primary_event_id(event);
67573 @@ -4524,12 +4524,12 @@ static void perf_event_mmap_event(struct perf_mmap_event *mmap_event)
67574 * need to add enough zero bytes after the string to handle
67575 * the 64bit alignment we do later.
67576 */
67577 - buf = kzalloc(PATH_MAX + sizeof(u64), GFP_KERNEL);
67578 + buf = kzalloc(PATH_MAX, GFP_KERNEL);
67579 if (!buf) {
67580 name = strncpy(tmp, "//enomem", sizeof(tmp));
67581 goto got_name;
67582 }
67583 - name = d_path(&file->f_path, buf, PATH_MAX);
67584 + name = d_path(&file->f_path, buf, PATH_MAX - sizeof(u64));
67585 if (IS_ERR(name)) {
67586 name = strncpy(tmp, "//toolong", sizeof(tmp));
67587 goto got_name;
67588 @@ -5968,7 +5968,7 @@ perf_event_alloc(struct perf_event_attr *attr, int cpu,
67589 event->parent = parent_event;
67590
67591 event->ns = get_pid_ns(current->nsproxy->pid_ns);
67592 - event->id = atomic64_inc_return(&perf_event_id);
67593 + event->id = atomic64_inc_return_unchecked(&perf_event_id);
67594
67595 event->state = PERF_EVENT_STATE_INACTIVE;
67596
67597 @@ -6567,10 +6567,10 @@ static void sync_child_event(struct perf_event *child_event,
67598 /*
67599 * Add back the child's count to the parent's count:
67600 */
67601 - atomic64_add(child_val, &parent_event->child_count);
67602 - atomic64_add(child_event->total_time_enabled,
67603 + atomic64_add_unchecked(child_val, &parent_event->child_count);
67604 + atomic64_add_unchecked(child_event->total_time_enabled,
67605 &parent_event->child_total_time_enabled);
67606 - atomic64_add(child_event->total_time_running,
67607 + atomic64_add_unchecked(child_event->total_time_running,
67608 &parent_event->child_total_time_running);
67609
67610 /*
67611 diff --git a/kernel/exit.c b/kernel/exit.c
67612 index f65345f9..1423231 100644
67613 --- a/kernel/exit.c
67614 +++ b/kernel/exit.c
67615 @@ -182,6 +182,10 @@ void release_task(struct task_struct * p)
67616 struct task_struct *leader;
67617 int zap_leader;
67618 repeat:
67619 +#ifdef CONFIG_NET
67620 + gr_del_task_from_ip_table(p);
67621 +#endif
67622 +
67623 /* don't need to get the RCU readlock here - the process is dead and
67624 * can't be modifying its own credentials. But shut RCU-lockdep up */
67625 rcu_read_lock();
67626 @@ -394,7 +398,7 @@ int allow_signal(int sig)
67627 * know it'll be handled, so that they don't get converted to
67628 * SIGKILL or just silently dropped.
67629 */
67630 - current->sighand->action[(sig)-1].sa.sa_handler = (void __user *)2;
67631 + current->sighand->action[(sig)-1].sa.sa_handler = (__force void __user *)2;
67632 recalc_sigpending();
67633 spin_unlock_irq(&current->sighand->siglock);
67634 return 0;
67635 @@ -430,6 +434,8 @@ void daemonize(const char *name, ...)
67636 vsnprintf(current->comm, sizeof(current->comm), name, args);
67637 va_end(args);
67638
67639 + gr_set_kernel_label(current);
67640 +
67641 /*
67642 * If we were started as result of loading a module, close all of the
67643 * user space pages. We don't need them, and if we didn't close them
67644 @@ -907,6 +913,8 @@ void do_exit(long code)
67645 struct task_struct *tsk = current;
67646 int group_dead;
67647
67648 + set_fs(USER_DS);
67649 +
67650 profile_task_exit(tsk);
67651
67652 WARN_ON(blk_needs_flush_plug(tsk));
67653 @@ -923,7 +931,6 @@ void do_exit(long code)
67654 * mm_release()->clear_child_tid() from writing to a user-controlled
67655 * kernel address.
67656 */
67657 - set_fs(USER_DS);
67658
67659 ptrace_event(PTRACE_EVENT_EXIT, code);
67660
67661 @@ -982,6 +989,9 @@ void do_exit(long code)
67662 tsk->exit_code = code;
67663 taskstats_exit(tsk, group_dead);
67664
67665 + gr_acl_handle_psacct(tsk, code);
67666 + gr_acl_handle_exit();
67667 +
67668 exit_mm(tsk);
67669
67670 if (group_dead)
67671 @@ -1099,7 +1109,7 @@ SYSCALL_DEFINE1(exit, int, error_code)
67672 * Take down every thread in the group. This is called by fatal signals
67673 * as well as by sys_exit_group (below).
67674 */
67675 -void
67676 +__noreturn void
67677 do_group_exit(int exit_code)
67678 {
67679 struct signal_struct *sig = current->signal;
67680 diff --git a/kernel/fork.c b/kernel/fork.c
67681 index 2c8857e..288c9c7 100644
67682 --- a/kernel/fork.c
67683 +++ b/kernel/fork.c
67684 @@ -318,7 +318,7 @@ static struct task_struct *dup_task_struct(struct task_struct *orig)
67685 *stackend = STACK_END_MAGIC; /* for overflow detection */
67686
67687 #ifdef CONFIG_CC_STACKPROTECTOR
67688 - tsk->stack_canary = get_random_int();
67689 + tsk->stack_canary = pax_get_random_long();
67690 #endif
67691
67692 /*
67693 @@ -343,13 +343,78 @@ free_tsk:
67694 }
67695
67696 #ifdef CONFIG_MMU
67697 +static struct vm_area_struct *dup_vma(struct mm_struct *mm, struct mm_struct *oldmm, struct vm_area_struct *mpnt)
67698 +{
67699 + struct vm_area_struct *tmp;
67700 + unsigned long charge;
67701 + struct mempolicy *pol;
67702 + struct file *file;
67703 +
67704 + charge = 0;
67705 + if (mpnt->vm_flags & VM_ACCOUNT) {
67706 + unsigned long len = vma_pages(mpnt);
67707 +
67708 + if (security_vm_enough_memory_mm(oldmm, len)) /* sic */
67709 + goto fail_nomem;
67710 + charge = len;
67711 + }
67712 + tmp = kmem_cache_alloc(vm_area_cachep, GFP_KERNEL);
67713 + if (!tmp)
67714 + goto fail_nomem;
67715 + *tmp = *mpnt;
67716 + tmp->vm_mm = mm;
67717 + INIT_LIST_HEAD(&tmp->anon_vma_chain);
67718 + pol = mpol_dup(vma_policy(mpnt));
67719 + if (IS_ERR(pol))
67720 + goto fail_nomem_policy;
67721 + vma_set_policy(tmp, pol);
67722 + if (anon_vma_fork(tmp, mpnt))
67723 + goto fail_nomem_anon_vma_fork;
67724 + tmp->vm_flags &= ~VM_LOCKED;
67725 + tmp->vm_next = tmp->vm_prev = NULL;
67726 + tmp->vm_mirror = NULL;
67727 + file = tmp->vm_file;
67728 + if (file) {
67729 + struct inode *inode = file->f_path.dentry->d_inode;
67730 + struct address_space *mapping = file->f_mapping;
67731 +
67732 + get_file(file);
67733 + if (tmp->vm_flags & VM_DENYWRITE)
67734 + atomic_dec(&inode->i_writecount);
67735 + mutex_lock(&mapping->i_mmap_mutex);
67736 + if (tmp->vm_flags & VM_SHARED)
67737 + mapping->i_mmap_writable++;
67738 + flush_dcache_mmap_lock(mapping);
67739 + /* insert tmp into the share list, just after mpnt */
67740 + vma_prio_tree_add(tmp, mpnt);
67741 + flush_dcache_mmap_unlock(mapping);
67742 + mutex_unlock(&mapping->i_mmap_mutex);
67743 + }
67744 +
67745 + /*
67746 + * Clear hugetlb-related page reserves for children. This only
67747 + * affects MAP_PRIVATE mappings. Faults generated by the child
67748 + * are not guaranteed to succeed, even if read-only
67749 + */
67750 + if (is_vm_hugetlb_page(tmp))
67751 + reset_vma_resv_huge_pages(tmp);
67752 +
67753 + return tmp;
67754 +
67755 +fail_nomem_anon_vma_fork:
67756 + mpol_put(pol);
67757 +fail_nomem_policy:
67758 + kmem_cache_free(vm_area_cachep, tmp);
67759 +fail_nomem:
67760 + vm_unacct_memory(charge);
67761 + return NULL;
67762 +}
67763 +
67764 static int dup_mmap(struct mm_struct *mm, struct mm_struct *oldmm)
67765 {
67766 struct vm_area_struct *mpnt, *tmp, *prev, **pprev;
67767 struct rb_node **rb_link, *rb_parent;
67768 int retval;
67769 - unsigned long charge;
67770 - struct mempolicy *pol;
67771
67772 down_write(&oldmm->mmap_sem);
67773 flush_cache_dup_mm(oldmm);
67774 @@ -361,8 +426,8 @@ static int dup_mmap(struct mm_struct *mm, struct mm_struct *oldmm)
67775 mm->locked_vm = 0;
67776 mm->mmap = NULL;
67777 mm->mmap_cache = NULL;
67778 - mm->free_area_cache = oldmm->mmap_base;
67779 - mm->cached_hole_size = ~0UL;
67780 + mm->free_area_cache = oldmm->free_area_cache;
67781 + mm->cached_hole_size = oldmm->cached_hole_size;
67782 mm->map_count = 0;
67783 cpumask_clear(mm_cpumask(mm));
67784 mm->mm_rb = RB_ROOT;
67785 @@ -378,52 +443,15 @@ static int dup_mmap(struct mm_struct *mm, struct mm_struct *oldmm)
67786
67787 prev = NULL;
67788 for (mpnt = oldmm->mmap; mpnt; mpnt = mpnt->vm_next) {
67789 - struct file *file;
67790 -
67791 if (mpnt->vm_flags & VM_DONTCOPY) {
67792 vm_stat_account(mm, mpnt->vm_flags, mpnt->vm_file,
67793 -vma_pages(mpnt));
67794 continue;
67795 }
67796 - charge = 0;
67797 - if (mpnt->vm_flags & VM_ACCOUNT) {
67798 - unsigned long len = vma_pages(mpnt);
67799 -
67800 - if (security_vm_enough_memory_mm(oldmm, len)) /* sic */
67801 - goto fail_nomem;
67802 - charge = len;
67803 - }
67804 - tmp = kmem_cache_alloc(vm_area_cachep, GFP_KERNEL);
67805 - if (!tmp)
67806 - goto fail_nomem;
67807 - *tmp = *mpnt;
67808 - INIT_LIST_HEAD(&tmp->anon_vma_chain);
67809 - pol = mpol_dup(vma_policy(mpnt));
67810 - retval = PTR_ERR(pol);
67811 - if (IS_ERR(pol))
67812 - goto fail_nomem_policy;
67813 - vma_set_policy(tmp, pol);
67814 - tmp->vm_mm = mm;
67815 - if (anon_vma_fork(tmp, mpnt))
67816 - goto fail_nomem_anon_vma_fork;
67817 - tmp->vm_flags &= ~VM_LOCKED;
67818 - tmp->vm_next = tmp->vm_prev = NULL;
67819 - file = tmp->vm_file;
67820 - if (file) {
67821 - struct inode *inode = file->f_path.dentry->d_inode;
67822 - struct address_space *mapping = file->f_mapping;
67823 -
67824 - get_file(file);
67825 - if (tmp->vm_flags & VM_DENYWRITE)
67826 - atomic_dec(&inode->i_writecount);
67827 - mutex_lock(&mapping->i_mmap_mutex);
67828 - if (tmp->vm_flags & VM_SHARED)
67829 - mapping->i_mmap_writable++;
67830 - flush_dcache_mmap_lock(mapping);
67831 - /* insert tmp into the share list, just after mpnt */
67832 - vma_prio_tree_add(tmp, mpnt);
67833 - flush_dcache_mmap_unlock(mapping);
67834 - mutex_unlock(&mapping->i_mmap_mutex);
67835 + tmp = dup_vma(mm, oldmm, mpnt);
67836 + if (!tmp) {
67837 + retval = -ENOMEM;
67838 + goto out;
67839 }
67840
67841 /*
67842 @@ -455,9 +483,34 @@ static int dup_mmap(struct mm_struct *mm, struct mm_struct *oldmm)
67843 if (retval)
67844 goto out;
67845
67846 - if (file)
67847 + if (tmp->vm_file)
67848 uprobe_mmap(tmp);
67849 }
67850 +
67851 +#ifdef CONFIG_PAX_SEGMEXEC
67852 + if (oldmm->pax_flags & MF_PAX_SEGMEXEC) {
67853 + struct vm_area_struct *mpnt_m;
67854 +
67855 + for (mpnt = oldmm->mmap, mpnt_m = mm->mmap; mpnt; mpnt = mpnt->vm_next, mpnt_m = mpnt_m->vm_next) {
67856 + BUG_ON(!mpnt_m || mpnt_m->vm_mirror || mpnt->vm_mm != oldmm || mpnt_m->vm_mm != mm);
67857 +
67858 + if (!mpnt->vm_mirror)
67859 + continue;
67860 +
67861 + if (mpnt->vm_end <= SEGMEXEC_TASK_SIZE) {
67862 + BUG_ON(mpnt->vm_mirror->vm_mirror != mpnt);
67863 + mpnt->vm_mirror = mpnt_m;
67864 + } else {
67865 + BUG_ON(mpnt->vm_mirror->vm_mirror == mpnt || mpnt->vm_mirror->vm_mirror->vm_mm != mm);
67866 + mpnt_m->vm_mirror = mpnt->vm_mirror->vm_mirror;
67867 + mpnt_m->vm_mirror->vm_mirror = mpnt_m;
67868 + mpnt->vm_mirror->vm_mirror = mpnt;
67869 + }
67870 + }
67871 + BUG_ON(mpnt_m);
67872 + }
67873 +#endif
67874 +
67875 /* a new mm has just been created */
67876 arch_dup_mmap(oldmm, mm);
67877 retval = 0;
67878 @@ -466,14 +519,6 @@ out:
67879 flush_tlb_mm(oldmm);
67880 up_write(&oldmm->mmap_sem);
67881 return retval;
67882 -fail_nomem_anon_vma_fork:
67883 - mpol_put(pol);
67884 -fail_nomem_policy:
67885 - kmem_cache_free(vm_area_cachep, tmp);
67886 -fail_nomem:
67887 - retval = -ENOMEM;
67888 - vm_unacct_memory(charge);
67889 - goto out;
67890 }
67891
67892 static inline int mm_alloc_pgd(struct mm_struct *mm)
67893 @@ -710,8 +755,8 @@ struct mm_struct *mm_access(struct task_struct *task, unsigned int mode)
67894 return ERR_PTR(err);
67895
67896 mm = get_task_mm(task);
67897 - if (mm && mm != current->mm &&
67898 - !ptrace_may_access(task, mode)) {
67899 + if (mm && ((mm != current->mm && !ptrace_may_access(task, mode)) ||
67900 + (mode == PTRACE_MODE_ATTACH && (gr_handle_proc_ptrace(task) || gr_acl_handle_procpidmem(task))))) {
67901 mmput(mm);
67902 mm = ERR_PTR(-EACCES);
67903 }
67904 @@ -932,13 +977,20 @@ static int copy_fs(unsigned long clone_flags, struct task_struct *tsk)
67905 spin_unlock(&fs->lock);
67906 return -EAGAIN;
67907 }
67908 - fs->users++;
67909 + atomic_inc(&fs->users);
67910 spin_unlock(&fs->lock);
67911 return 0;
67912 }
67913 tsk->fs = copy_fs_struct(fs);
67914 if (!tsk->fs)
67915 return -ENOMEM;
67916 + /* Carry through gr_chroot_dentry and is_chrooted instead
67917 + of recomputing it here. Already copied when the task struct
67918 + is duplicated. This allows pivot_root to not be treated as
67919 + a chroot
67920 + */
67921 + //gr_set_chroot_entries(tsk, &tsk->fs->root);
67922 +
67923 return 0;
67924 }
67925
67926 @@ -1205,6 +1257,9 @@ static struct task_struct *copy_process(unsigned long clone_flags,
67927 DEBUG_LOCKS_WARN_ON(!p->softirqs_enabled);
67928 #endif
67929 retval = -EAGAIN;
67930 +
67931 + gr_learn_resource(p, RLIMIT_NPROC, atomic_read(&p->real_cred->user->processes), 0);
67932 +
67933 if (atomic_read(&p->real_cred->user->processes) >=
67934 task_rlimit(p, RLIMIT_NPROC)) {
67935 if (!capable(CAP_SYS_ADMIN) && !capable(CAP_SYS_RESOURCE) &&
67936 @@ -1427,6 +1482,9 @@ static struct task_struct *copy_process(unsigned long clone_flags,
67937 /* Need tasklist lock for parent etc handling! */
67938 write_lock_irq(&tasklist_lock);
67939
67940 + /* synchronizes with gr_set_acls() */
67941 + gr_copy_label(p);
67942 +
67943 /* CLONE_PARENT re-uses the old parent */
67944 if (clone_flags & (CLONE_PARENT|CLONE_THREAD)) {
67945 p->real_parent = current->real_parent;
67946 @@ -1537,6 +1595,8 @@ bad_fork_cleanup_count:
67947 bad_fork_free:
67948 free_task(p);
67949 fork_out:
67950 + gr_log_forkfail(retval);
67951 +
67952 return ERR_PTR(retval);
67953 }
67954
67955 @@ -1637,6 +1697,8 @@ long do_fork(unsigned long clone_flags,
67956 if (clone_flags & CLONE_PARENT_SETTID)
67957 put_user(nr, parent_tidptr);
67958
67959 + gr_handle_brute_check();
67960 +
67961 if (clone_flags & CLONE_VFORK) {
67962 p->vfork_done = &vfork;
67963 init_completion(&vfork);
67964 @@ -1735,7 +1797,7 @@ static int unshare_fs(unsigned long unshare_flags, struct fs_struct **new_fsp)
67965 return 0;
67966
67967 /* don't need lock here; in the worst case we'll do useless copy */
67968 - if (fs->users == 1)
67969 + if (atomic_read(&fs->users) == 1)
67970 return 0;
67971
67972 *new_fsp = copy_fs_struct(fs);
67973 @@ -1824,7 +1886,8 @@ SYSCALL_DEFINE1(unshare, unsigned long, unshare_flags)
67974 fs = current->fs;
67975 spin_lock(&fs->lock);
67976 current->fs = new_fs;
67977 - if (--fs->users)
67978 + gr_set_chroot_entries(current, &current->fs->root);
67979 + if (atomic_dec_return(&fs->users))
67980 new_fs = NULL;
67981 else
67982 new_fs = fs;
67983 diff --git a/kernel/futex.c b/kernel/futex.c
67984 index 20ef219..b8c65ea 100644
67985 --- a/kernel/futex.c
67986 +++ b/kernel/futex.c
67987 @@ -54,6 +54,7 @@
67988 #include <linux/mount.h>
67989 #include <linux/pagemap.h>
67990 #include <linux/syscalls.h>
67991 +#include <linux/ptrace.h>
67992 #include <linux/signal.h>
67993 #include <linux/export.h>
67994 #include <linux/magic.h>
67995 @@ -239,6 +240,11 @@ get_futex_key(u32 __user *uaddr, int fshared, union futex_key *key, int rw)
67996 struct page *page, *page_head;
67997 int err, ro = 0;
67998
67999 +#ifdef CONFIG_PAX_SEGMEXEC
68000 + if ((mm->pax_flags & MF_PAX_SEGMEXEC) && address >= SEGMEXEC_TASK_SIZE)
68001 + return -EFAULT;
68002 +#endif
68003 +
68004 /*
68005 * The futex address must be "naturally" aligned.
68006 */
68007 @@ -843,6 +849,9 @@ static void wake_futex(struct futex_q *q)
68008 {
68009 struct task_struct *p = q->task;
68010
68011 + if (WARN(q->pi_state || q->rt_waiter, "refusing to wake PI futex\n"))
68012 + return;
68013 +
68014 /*
68015 * We set q->lock_ptr = NULL _before_ we wake up the task. If
68016 * a non-futex wake up happens on another CPU then the task
68017 @@ -1078,6 +1087,10 @@ retry_private:
68018
68019 plist_for_each_entry_safe(this, next, head, list) {
68020 if (match_futex (&this->key, &key1)) {
68021 + if (this->pi_state || this->rt_waiter) {
68022 + ret = -EINVAL;
68023 + goto out_unlock;
68024 + }
68025 wake_futex(this);
68026 if (++ret >= nr_wake)
68027 break;
68028 @@ -1090,6 +1103,10 @@ retry_private:
68029 op_ret = 0;
68030 plist_for_each_entry_safe(this, next, head, list) {
68031 if (match_futex (&this->key, &key2)) {
68032 + if (this->pi_state || this->rt_waiter) {
68033 + ret = -EINVAL;
68034 + goto out_unlock;
68035 + }
68036 wake_futex(this);
68037 if (++op_ret >= nr_wake2)
68038 break;
68039 @@ -1098,6 +1115,7 @@ retry_private:
68040 ret += op_ret;
68041 }
68042
68043 +out_unlock:
68044 double_unlock_hb(hb1, hb2);
68045 out_put_keys:
68046 put_futex_key(&key2);
68047 @@ -1387,9 +1405,13 @@ retry_private:
68048 /*
68049 * FUTEX_WAIT_REQEUE_PI and FUTEX_CMP_REQUEUE_PI should always
68050 * be paired with each other and no other futex ops.
68051 + *
68052 + * We should never be requeueing a futex_q with a pi_state,
68053 + * which is awaiting a futex_unlock_pi().
68054 */
68055 if ((requeue_pi && !this->rt_waiter) ||
68056 - (!requeue_pi && this->rt_waiter)) {
68057 + (!requeue_pi && this->rt_waiter) ||
68058 + this->pi_state) {
68059 ret = -EINVAL;
68060 break;
68061 }
68062 @@ -2717,6 +2739,7 @@ static int __init futex_init(void)
68063 {
68064 u32 curval;
68065 int i;
68066 + mm_segment_t oldfs;
68067
68068 /*
68069 * This will fail and we want it. Some arch implementations do
68070 @@ -2728,8 +2751,11 @@ static int __init futex_init(void)
68071 * implementation, the non-functional ones will return
68072 * -ENOSYS.
68073 */
68074 + oldfs = get_fs();
68075 + set_fs(USER_DS);
68076 if (cmpxchg_futex_value_locked(&curval, NULL, 0, 0) == -EFAULT)
68077 futex_cmpxchg_enabled = 1;
68078 + set_fs(oldfs);
68079
68080 for (i = 0; i < ARRAY_SIZE(futex_queues); i++) {
68081 plist_head_init(&futex_queues[i].chain);
68082 diff --git a/kernel/gcov/base.c b/kernel/gcov/base.c
68083 index 9b22d03..6295b62 100644
68084 --- a/kernel/gcov/base.c
68085 +++ b/kernel/gcov/base.c
68086 @@ -102,11 +102,6 @@ void gcov_enable_events(void)
68087 }
68088
68089 #ifdef CONFIG_MODULES
68090 -static inline int within(void *addr, void *start, unsigned long size)
68091 -{
68092 - return ((addr >= start) && (addr < start + size));
68093 -}
68094 -
68095 /* Update list and generate events when modules are unloaded. */
68096 static int gcov_module_notifier(struct notifier_block *nb, unsigned long event,
68097 void *data)
68098 @@ -121,7 +116,7 @@ static int gcov_module_notifier(struct notifier_block *nb, unsigned long event,
68099 prev = NULL;
68100 /* Remove entries located in module from linked list. */
68101 for (info = gcov_info_head; info; info = info->next) {
68102 - if (within(info, mod->module_core, mod->core_size)) {
68103 + if (within_module_core_rw((unsigned long)info, mod)) {
68104 if (prev)
68105 prev->next = info->next;
68106 else
68107 diff --git a/kernel/hrtimer.c b/kernel/hrtimer.c
68108 index 6db7a5e..25b6648 100644
68109 --- a/kernel/hrtimer.c
68110 +++ b/kernel/hrtimer.c
68111 @@ -1407,7 +1407,7 @@ void hrtimer_peek_ahead_timers(void)
68112 local_irq_restore(flags);
68113 }
68114
68115 -static void run_hrtimer_softirq(struct softirq_action *h)
68116 +static void run_hrtimer_softirq(void)
68117 {
68118 struct hrtimer_cpu_base *cpu_base = &__get_cpu_var(hrtimer_bases);
68119
68120 diff --git a/kernel/jump_label.c b/kernel/jump_label.c
68121 index 4304919..408c4c0 100644
68122 --- a/kernel/jump_label.c
68123 +++ b/kernel/jump_label.c
68124 @@ -13,6 +13,7 @@
68125 #include <linux/sort.h>
68126 #include <linux/err.h>
68127 #include <linux/static_key.h>
68128 +#include <linux/mm.h>
68129
68130 #ifdef HAVE_JUMP_LABEL
68131
68132 @@ -50,7 +51,9 @@ jump_label_sort_entries(struct jump_entry *start, struct jump_entry *stop)
68133
68134 size = (((unsigned long)stop - (unsigned long)start)
68135 / sizeof(struct jump_entry));
68136 + pax_open_kernel();
68137 sort(start, size, sizeof(struct jump_entry), jump_label_cmp, NULL);
68138 + pax_close_kernel();
68139 }
68140
68141 static void jump_label_update(struct static_key *key, int enable);
68142 @@ -356,10 +359,12 @@ static void jump_label_invalidate_module_init(struct module *mod)
68143 struct jump_entry *iter_stop = iter_start + mod->num_jump_entries;
68144 struct jump_entry *iter;
68145
68146 + pax_open_kernel();
68147 for (iter = iter_start; iter < iter_stop; iter++) {
68148 if (within_module_init(iter->code, mod))
68149 iter->code = 0;
68150 }
68151 + pax_close_kernel();
68152 }
68153
68154 static int
68155 diff --git a/kernel/kallsyms.c b/kernel/kallsyms.c
68156 index 2169fee..45c017a 100644
68157 --- a/kernel/kallsyms.c
68158 +++ b/kernel/kallsyms.c
68159 @@ -11,6 +11,9 @@
68160 * Changed the compression method from stem compression to "table lookup"
68161 * compression (see scripts/kallsyms.c for a more complete description)
68162 */
68163 +#ifdef CONFIG_GRKERNSEC_HIDESYM
68164 +#define __INCLUDED_BY_HIDESYM 1
68165 +#endif
68166 #include <linux/kallsyms.h>
68167 #include <linux/module.h>
68168 #include <linux/init.h>
68169 @@ -53,12 +56,33 @@ extern const unsigned long kallsyms_markers[] __attribute__((weak));
68170
68171 static inline int is_kernel_inittext(unsigned long addr)
68172 {
68173 + if (system_state != SYSTEM_BOOTING)
68174 + return 0;
68175 +
68176 if (addr >= (unsigned long)_sinittext
68177 && addr <= (unsigned long)_einittext)
68178 return 1;
68179 return 0;
68180 }
68181
68182 +#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
68183 +#ifdef CONFIG_MODULES
68184 +static inline int is_module_text(unsigned long addr)
68185 +{
68186 + if ((unsigned long)MODULES_EXEC_VADDR <= addr && addr <= (unsigned long)MODULES_EXEC_END)
68187 + return 1;
68188 +
68189 + addr = ktla_ktva(addr);
68190 + return (unsigned long)MODULES_EXEC_VADDR <= addr && addr <= (unsigned long)MODULES_EXEC_END;
68191 +}
68192 +#else
68193 +static inline int is_module_text(unsigned long addr)
68194 +{
68195 + return 0;
68196 +}
68197 +#endif
68198 +#endif
68199 +
68200 static inline int is_kernel_text(unsigned long addr)
68201 {
68202 if ((addr >= (unsigned long)_stext && addr <= (unsigned long)_etext) ||
68203 @@ -69,13 +93,28 @@ static inline int is_kernel_text(unsigned long addr)
68204
68205 static inline int is_kernel(unsigned long addr)
68206 {
68207 +
68208 +#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
68209 + if (is_kernel_text(addr) || is_kernel_inittext(addr))
68210 + return 1;
68211 +
68212 + if (ktla_ktva((unsigned long)_text) <= addr && addr < (unsigned long)_end)
68213 +#else
68214 if (addr >= (unsigned long)_stext && addr <= (unsigned long)_end)
68215 +#endif
68216 +
68217 return 1;
68218 return in_gate_area_no_mm(addr);
68219 }
68220
68221 static int is_ksym_addr(unsigned long addr)
68222 {
68223 +
68224 +#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
68225 + if (is_module_text(addr))
68226 + return 0;
68227 +#endif
68228 +
68229 if (all_var)
68230 return is_kernel(addr);
68231
68232 @@ -470,7 +509,6 @@ static unsigned long get_ksymbol_core(struct kallsym_iter *iter)
68233
68234 static void reset_iter(struct kallsym_iter *iter, loff_t new_pos)
68235 {
68236 - iter->name[0] = '\0';
68237 iter->nameoff = get_symbol_offset(new_pos);
68238 iter->pos = new_pos;
68239 }
68240 @@ -518,6 +556,11 @@ static int s_show(struct seq_file *m, void *p)
68241 {
68242 struct kallsym_iter *iter = m->private;
68243
68244 +#ifdef CONFIG_GRKERNSEC_HIDESYM
68245 + if (current_uid())
68246 + return 0;
68247 +#endif
68248 +
68249 /* Some debugging symbols have no name. Ignore them. */
68250 if (!iter->name[0])
68251 return 0;
68252 @@ -531,6 +574,7 @@ static int s_show(struct seq_file *m, void *p)
68253 */
68254 type = iter->exported ? toupper(iter->type) :
68255 tolower(iter->type);
68256 +
68257 seq_printf(m, "%pK %c %s\t[%s]\n", (void *)iter->value,
68258 type, iter->name, iter->module_name);
68259 } else
68260 @@ -556,7 +600,7 @@ static int kallsyms_open(struct inode *inode, struct file *file)
68261 struct kallsym_iter *iter;
68262 int ret;
68263
68264 - iter = kmalloc(sizeof(*iter), GFP_KERNEL);
68265 + iter = kzalloc(sizeof(*iter), GFP_KERNEL);
68266 if (!iter)
68267 return -ENOMEM;
68268 reset_iter(iter, 0);
68269 diff --git a/kernel/kcmp.c b/kernel/kcmp.c
68270 index 30b7b22..c726387 100644
68271 --- a/kernel/kcmp.c
68272 +++ b/kernel/kcmp.c
68273 @@ -98,6 +98,10 @@ SYSCALL_DEFINE5(kcmp, pid_t, pid1, pid_t, pid2, int, type,
68274 struct task_struct *task1, *task2;
68275 int ret;
68276
68277 +#ifdef CONFIG_GRKERNSEC
68278 + return -ENOSYS;
68279 +#endif
68280 +
68281 rcu_read_lock();
68282
68283 /*
68284 diff --git a/kernel/kexec.c b/kernel/kexec.c
68285 index 0668d58..591b6fc 100644
68286 --- a/kernel/kexec.c
68287 +++ b/kernel/kexec.c
68288 @@ -1046,7 +1046,8 @@ asmlinkage long compat_sys_kexec_load(unsigned long entry,
68289 unsigned long flags)
68290 {
68291 struct compat_kexec_segment in;
68292 - struct kexec_segment out, __user *ksegments;
68293 + struct kexec_segment out;
68294 + struct kexec_segment __user *ksegments;
68295 unsigned long i, result;
68296
68297 /* Don't allow clients that don't understand the native
68298 diff --git a/kernel/kmod.c b/kernel/kmod.c
68299 index 6f99aea..eb6e3a0 100644
68300 --- a/kernel/kmod.c
68301 +++ b/kernel/kmod.c
68302 @@ -73,7 +73,7 @@ static void free_modprobe_argv(struct subprocess_info *info)
68303 kfree(info->argv);
68304 }
68305
68306 -static int call_modprobe(char *module_name, int wait)
68307 +static int call_modprobe(char *module_name, char *module_param, int wait)
68308 {
68309 static char *envp[] = {
68310 "HOME=/",
68311 @@ -82,7 +82,7 @@ static int call_modprobe(char *module_name, int wait)
68312 NULL
68313 };
68314
68315 - char **argv = kmalloc(sizeof(char *[5]), GFP_KERNEL);
68316 + char **argv = kmalloc(sizeof(char *[6]), GFP_KERNEL);
68317 if (!argv)
68318 goto out;
68319
68320 @@ -94,7 +94,8 @@ static int call_modprobe(char *module_name, int wait)
68321 argv[1] = "-q";
68322 argv[2] = "--";
68323 argv[3] = module_name; /* check free_modprobe_argv() */
68324 - argv[4] = NULL;
68325 + argv[4] = module_param;
68326 + argv[5] = NULL;
68327
68328 return call_usermodehelper_fns(modprobe_path, argv, envp,
68329 wait | UMH_KILLABLE, NULL, free_modprobe_argv, NULL);
68330 @@ -119,9 +120,8 @@ out:
68331 * If module auto-loading support is disabled then this function
68332 * becomes a no-operation.
68333 */
68334 -int __request_module(bool wait, const char *fmt, ...)
68335 +static int ____request_module(bool wait, char *module_param, const char *fmt, va_list ap)
68336 {
68337 - va_list args;
68338 char module_name[MODULE_NAME_LEN];
68339 unsigned int max_modprobes;
68340 int ret;
68341 @@ -129,9 +129,7 @@ int __request_module(bool wait, const char *fmt, ...)
68342 #define MAX_KMOD_CONCURRENT 50 /* Completely arbitrary value - KAO */
68343 static int kmod_loop_msg;
68344
68345 - va_start(args, fmt);
68346 - ret = vsnprintf(module_name, MODULE_NAME_LEN, fmt, args);
68347 - va_end(args);
68348 + ret = vsnprintf(module_name, MODULE_NAME_LEN, fmt, ap);
68349 if (ret >= MODULE_NAME_LEN)
68350 return -ENAMETOOLONG;
68351
68352 @@ -139,6 +137,20 @@ int __request_module(bool wait, const char *fmt, ...)
68353 if (ret)
68354 return ret;
68355
68356 +#ifdef CONFIG_GRKERNSEC_MODHARDEN
68357 + if (!current_uid()) {
68358 + /* hack to workaround consolekit/udisks stupidity */
68359 + read_lock(&tasklist_lock);
68360 + if (!strcmp(current->comm, "mount") &&
68361 + current->real_parent && !strncmp(current->real_parent->comm, "udisk", 5)) {
68362 + read_unlock(&tasklist_lock);
68363 + printk(KERN_ALERT "grsec: denied attempt to auto-load fs module %.64s by udisks\n", module_name);
68364 + return -EPERM;
68365 + }
68366 + read_unlock(&tasklist_lock);
68367 + }
68368 +#endif
68369 +
68370 /* If modprobe needs a service that is in a module, we get a recursive
68371 * loop. Limit the number of running kmod threads to max_threads/2 or
68372 * MAX_KMOD_CONCURRENT, whichever is the smaller. A cleaner method
68373 @@ -167,11 +179,52 @@ int __request_module(bool wait, const char *fmt, ...)
68374
68375 trace_module_request(module_name, wait, _RET_IP_);
68376
68377 - ret = call_modprobe(module_name, wait ? UMH_WAIT_PROC : UMH_WAIT_EXEC);
68378 + ret = call_modprobe(module_name, module_param, wait ? UMH_WAIT_PROC : UMH_WAIT_EXEC);
68379
68380 atomic_dec(&kmod_concurrent);
68381 return ret;
68382 }
68383 +
68384 +int ___request_module(bool wait, char *module_param, const char *fmt, ...)
68385 +{
68386 + va_list args;
68387 + int ret;
68388 +
68389 + va_start(args, fmt);
68390 + ret = ____request_module(wait, module_param, fmt, args);
68391 + va_end(args);
68392 +
68393 + return ret;
68394 +}
68395 +
68396 +int __request_module(bool wait, const char *fmt, ...)
68397 +{
68398 + va_list args;
68399 + int ret;
68400 +
68401 +#ifdef CONFIG_GRKERNSEC_MODHARDEN
68402 + if (current_uid()) {
68403 + char module_param[MODULE_NAME_LEN];
68404 +
68405 + memset(module_param, 0, sizeof(module_param));
68406 +
68407 + snprintf(module_param, sizeof(module_param) - 1, "grsec_modharden_normal%u_", current_uid());
68408 +
68409 + va_start(args, fmt);
68410 + ret = ____request_module(wait, module_param, fmt, args);
68411 + va_end(args);
68412 +
68413 + return ret;
68414 + }
68415 +#endif
68416 +
68417 + va_start(args, fmt);
68418 + ret = ____request_module(wait, NULL, fmt, args);
68419 + va_end(args);
68420 +
68421 + return ret;
68422 +}
68423 +
68424 EXPORT_SYMBOL(__request_module);
68425 #endif /* CONFIG_MODULES */
68426
68427 @@ -280,7 +333,7 @@ static int wait_for_helper(void *data)
68428 *
68429 * Thus the __user pointer cast is valid here.
68430 */
68431 - sys_wait4(pid, (int __user *)&ret, 0, NULL);
68432 + sys_wait4(pid, (int __force_user *)&ret, 0, NULL);
68433
68434 /*
68435 * If ret is 0, either ____call_usermodehelper failed and the
68436 diff --git a/kernel/kprobes.c b/kernel/kprobes.c
68437 index c62b854..6fc810d 100644
68438 --- a/kernel/kprobes.c
68439 +++ b/kernel/kprobes.c
68440 @@ -185,7 +185,7 @@ static kprobe_opcode_t __kprobes *__get_insn_slot(struct kprobe_insn_cache *c)
68441 * kernel image and loaded module images reside. This is required
68442 * so x86_64 can correctly handle the %rip-relative fixups.
68443 */
68444 - kip->insns = module_alloc(PAGE_SIZE);
68445 + kip->insns = module_alloc_exec(PAGE_SIZE);
68446 if (!kip->insns) {
68447 kfree(kip);
68448 return NULL;
68449 @@ -225,7 +225,7 @@ static int __kprobes collect_one_slot(struct kprobe_insn_page *kip, int idx)
68450 */
68451 if (!list_is_singular(&kip->list)) {
68452 list_del(&kip->list);
68453 - module_free(NULL, kip->insns);
68454 + module_free_exec(NULL, kip->insns);
68455 kfree(kip);
68456 }
68457 return 1;
68458 @@ -1955,7 +1955,7 @@ static int __init init_kprobes(void)
68459 {
68460 int i, err = 0;
68461 unsigned long offset = 0, size = 0;
68462 - char *modname, namebuf[128];
68463 + char *modname, namebuf[KSYM_NAME_LEN];
68464 const char *symbol_name;
68465 void *addr;
68466 struct kprobe_blackpoint *kb;
68467 @@ -2040,11 +2040,11 @@ static void __kprobes report_probe(struct seq_file *pi, struct kprobe *p,
68468 kprobe_type = "k";
68469
68470 if (sym)
68471 - seq_printf(pi, "%p %s %s+0x%x %s ",
68472 + seq_printf(pi, "%pK %s %s+0x%x %s ",
68473 p->addr, kprobe_type, sym, offset,
68474 (modname ? modname : " "));
68475 else
68476 - seq_printf(pi, "%p %s %p ",
68477 + seq_printf(pi, "%pK %s %pK ",
68478 p->addr, kprobe_type, p->addr);
68479
68480 if (!pp)
68481 @@ -2081,7 +2081,7 @@ static int __kprobes show_kprobe_addr(struct seq_file *pi, void *v)
68482 const char *sym = NULL;
68483 unsigned int i = *(loff_t *) v;
68484 unsigned long offset = 0;
68485 - char *modname, namebuf[128];
68486 + char *modname, namebuf[KSYM_NAME_LEN];
68487
68488 head = &kprobe_table[i];
68489 preempt_disable();
68490 diff --git a/kernel/ksysfs.c b/kernel/ksysfs.c
68491 index 4e316e1..5501eef 100644
68492 --- a/kernel/ksysfs.c
68493 +++ b/kernel/ksysfs.c
68494 @@ -47,6 +47,8 @@ static ssize_t uevent_helper_store(struct kobject *kobj,
68495 {
68496 if (count+1 > UEVENT_HELPER_PATH_LEN)
68497 return -ENOENT;
68498 + if (!capable(CAP_SYS_ADMIN))
68499 + return -EPERM;
68500 memcpy(uevent_helper, buf, count);
68501 uevent_helper[count] = '\0';
68502 if (count && uevent_helper[count-1] == '\n')
68503 diff --git a/kernel/lockdep.c b/kernel/lockdep.c
68504 index ea9ee45..67ebc8f 100644
68505 --- a/kernel/lockdep.c
68506 +++ b/kernel/lockdep.c
68507 @@ -590,6 +590,10 @@ static int static_obj(void *obj)
68508 end = (unsigned long) &_end,
68509 addr = (unsigned long) obj;
68510
68511 +#ifdef CONFIG_PAX_KERNEXEC
68512 + start = ktla_ktva(start);
68513 +#endif
68514 +
68515 /*
68516 * static variable?
68517 */
68518 @@ -730,6 +734,7 @@ register_lock_class(struct lockdep_map *lock, unsigned int subclass, int force)
68519 if (!static_obj(lock->key)) {
68520 debug_locks_off();
68521 printk("INFO: trying to register non-static key.\n");
68522 + printk("lock:%pS key:%pS.\n", lock, lock->key);
68523 printk("the code is fine but needs lockdep annotation.\n");
68524 printk("turning off the locking correctness validator.\n");
68525 dump_stack();
68526 @@ -3042,7 +3047,7 @@ static int __lock_acquire(struct lockdep_map *lock, unsigned int subclass,
68527 if (!class)
68528 return 0;
68529 }
68530 - atomic_inc((atomic_t *)&class->ops);
68531 + atomic_inc_unchecked((atomic_unchecked_t *)&class->ops);
68532 if (very_verbose(class)) {
68533 printk("\nacquire class [%p] %s", class->key, class->name);
68534 if (class->name_version > 1)
68535 diff --git a/kernel/lockdep_proc.c b/kernel/lockdep_proc.c
68536 index 91c32a0..7b88d63 100644
68537 --- a/kernel/lockdep_proc.c
68538 +++ b/kernel/lockdep_proc.c
68539 @@ -39,7 +39,7 @@ static void l_stop(struct seq_file *m, void *v)
68540
68541 static void print_name(struct seq_file *m, struct lock_class *class)
68542 {
68543 - char str[128];
68544 + char str[KSYM_NAME_LEN];
68545 const char *name = class->name;
68546
68547 if (!name) {
68548 @@ -65,7 +65,7 @@ static int l_show(struct seq_file *m, void *v)
68549 return 0;
68550 }
68551
68552 - seq_printf(m, "%p", class->key);
68553 + seq_printf(m, "%pK", class->key);
68554 #ifdef CONFIG_DEBUG_LOCKDEP
68555 seq_printf(m, " OPS:%8ld", class->ops);
68556 #endif
68557 @@ -83,7 +83,7 @@ static int l_show(struct seq_file *m, void *v)
68558
68559 list_for_each_entry(entry, &class->locks_after, entry) {
68560 if (entry->distance == 1) {
68561 - seq_printf(m, " -> [%p] ", entry->class->key);
68562 + seq_printf(m, " -> [%pK] ", entry->class->key);
68563 print_name(m, entry->class);
68564 seq_puts(m, "\n");
68565 }
68566 @@ -152,7 +152,7 @@ static int lc_show(struct seq_file *m, void *v)
68567 if (!class->key)
68568 continue;
68569
68570 - seq_printf(m, "[%p] ", class->key);
68571 + seq_printf(m, "[%pK] ", class->key);
68572 print_name(m, class);
68573 seq_puts(m, "\n");
68574 }
68575 @@ -495,7 +495,7 @@ static void seq_stats(struct seq_file *m, struct lock_stat_data *data)
68576 if (!i)
68577 seq_line(m, '-', 40-namelen, namelen);
68578
68579 - snprintf(ip, sizeof(ip), "[<%p>]",
68580 + snprintf(ip, sizeof(ip), "[<%pK>]",
68581 (void *)class->contention_point[i]);
68582 seq_printf(m, "%40s %14lu %29s %pS\n",
68583 name, stats->contention_point[i],
68584 @@ -510,7 +510,7 @@ static void seq_stats(struct seq_file *m, struct lock_stat_data *data)
68585 if (!i)
68586 seq_line(m, '-', 40-namelen, namelen);
68587
68588 - snprintf(ip, sizeof(ip), "[<%p>]",
68589 + snprintf(ip, sizeof(ip), "[<%pK>]",
68590 (void *)class->contending_point[i]);
68591 seq_printf(m, "%40s %14lu %29s %pS\n",
68592 name, stats->contending_point[i],
68593 diff --git a/kernel/module.c b/kernel/module.c
68594 index 2a15c59..731c128 100644
68595 --- a/kernel/module.c
68596 +++ b/kernel/module.c
68597 @@ -58,6 +58,7 @@
68598 #include <linux/jump_label.h>
68599 #include <linux/pfn.h>
68600 #include <linux/bsearch.h>
68601 +#include <linux/grsecurity.h>
68602
68603 #define CREATE_TRACE_POINTS
68604 #include <trace/events/module.h>
68605 @@ -114,7 +115,8 @@ static BLOCKING_NOTIFIER_HEAD(module_notify_list);
68606
68607 /* Bounds of module allocation, for speeding __module_address.
68608 * Protected by module_mutex. */
68609 -static unsigned long module_addr_min = -1UL, module_addr_max = 0;
68610 +static unsigned long module_addr_min_rw = -1UL, module_addr_max_rw = 0;
68611 +static unsigned long module_addr_min_rx = -1UL, module_addr_max_rx = 0;
68612
68613 int register_module_notifier(struct notifier_block * nb)
68614 {
68615 @@ -278,7 +280,7 @@ bool each_symbol_section(bool (*fn)(const struct symsearch *arr,
68616 return true;
68617
68618 list_for_each_entry_rcu(mod, &modules, list) {
68619 - struct symsearch arr[] = {
68620 + struct symsearch modarr[] = {
68621 { mod->syms, mod->syms + mod->num_syms, mod->crcs,
68622 NOT_GPL_ONLY, false },
68623 { mod->gpl_syms, mod->gpl_syms + mod->num_gpl_syms,
68624 @@ -300,7 +302,7 @@ bool each_symbol_section(bool (*fn)(const struct symsearch *arr,
68625 #endif
68626 };
68627
68628 - if (each_symbol_in_section(arr, ARRAY_SIZE(arr), mod, fn, data))
68629 + if (each_symbol_in_section(modarr, ARRAY_SIZE(modarr), mod, fn, data))
68630 return true;
68631 }
68632 return false;
68633 @@ -432,7 +434,7 @@ static inline void __percpu *mod_percpu(struct module *mod)
68634 static int percpu_modalloc(struct module *mod,
68635 unsigned long size, unsigned long align)
68636 {
68637 - if (align > PAGE_SIZE) {
68638 + if (align-1 >= PAGE_SIZE) {
68639 printk(KERN_WARNING "%s: per-cpu alignment %li > %li\n",
68640 mod->name, align, PAGE_SIZE);
68641 align = PAGE_SIZE;
68642 @@ -1032,7 +1034,7 @@ struct module_attribute module_uevent =
68643 static ssize_t show_coresize(struct module_attribute *mattr,
68644 struct module_kobject *mk, char *buffer)
68645 {
68646 - return sprintf(buffer, "%u\n", mk->mod->core_size);
68647 + return sprintf(buffer, "%u\n", mk->mod->core_size_rx + mk->mod->core_size_rw);
68648 }
68649
68650 static struct module_attribute modinfo_coresize =
68651 @@ -1041,7 +1043,7 @@ static struct module_attribute modinfo_coresize =
68652 static ssize_t show_initsize(struct module_attribute *mattr,
68653 struct module_kobject *mk, char *buffer)
68654 {
68655 - return sprintf(buffer, "%u\n", mk->mod->init_size);
68656 + return sprintf(buffer, "%u\n", mk->mod->init_size_rx + mk->mod->init_size_rw);
68657 }
68658
68659 static struct module_attribute modinfo_initsize =
68660 @@ -1255,7 +1257,7 @@ resolve_symbol_wait(struct module *mod,
68661 */
68662 #ifdef CONFIG_SYSFS
68663
68664 -#ifdef CONFIG_KALLSYMS
68665 +#if defined(CONFIG_KALLSYMS) && !defined(CONFIG_GRKERNSEC_HIDESYM)
68666 static inline bool sect_empty(const Elf_Shdr *sect)
68667 {
68668 return !(sect->sh_flags & SHF_ALLOC) || sect->sh_size == 0;
68669 @@ -1721,21 +1723,21 @@ static void set_section_ro_nx(void *base,
68670
68671 static void unset_module_core_ro_nx(struct module *mod)
68672 {
68673 - set_page_attributes(mod->module_core + mod->core_text_size,
68674 - mod->module_core + mod->core_size,
68675 + set_page_attributes(mod->module_core_rw,
68676 + mod->module_core_rw + mod->core_size_rw,
68677 set_memory_x);
68678 - set_page_attributes(mod->module_core,
68679 - mod->module_core + mod->core_ro_size,
68680 + set_page_attributes(mod->module_core_rx,
68681 + mod->module_core_rx + mod->core_size_rx,
68682 set_memory_rw);
68683 }
68684
68685 static void unset_module_init_ro_nx(struct module *mod)
68686 {
68687 - set_page_attributes(mod->module_init + mod->init_text_size,
68688 - mod->module_init + mod->init_size,
68689 + set_page_attributes(mod->module_init_rw,
68690 + mod->module_init_rw + mod->init_size_rw,
68691 set_memory_x);
68692 - set_page_attributes(mod->module_init,
68693 - mod->module_init + mod->init_ro_size,
68694 + set_page_attributes(mod->module_init_rx,
68695 + mod->module_init_rx + mod->init_size_rx,
68696 set_memory_rw);
68697 }
68698
68699 @@ -1746,14 +1748,14 @@ void set_all_modules_text_rw(void)
68700
68701 mutex_lock(&module_mutex);
68702 list_for_each_entry_rcu(mod, &modules, list) {
68703 - if ((mod->module_core) && (mod->core_text_size)) {
68704 - set_page_attributes(mod->module_core,
68705 - mod->module_core + mod->core_text_size,
68706 + if ((mod->module_core_rx) && (mod->core_size_rx)) {
68707 + set_page_attributes(mod->module_core_rx,
68708 + mod->module_core_rx + mod->core_size_rx,
68709 set_memory_rw);
68710 }
68711 - if ((mod->module_init) && (mod->init_text_size)) {
68712 - set_page_attributes(mod->module_init,
68713 - mod->module_init + mod->init_text_size,
68714 + if ((mod->module_init_rx) && (mod->init_size_rx)) {
68715 + set_page_attributes(mod->module_init_rx,
68716 + mod->module_init_rx + mod->init_size_rx,
68717 set_memory_rw);
68718 }
68719 }
68720 @@ -1767,14 +1769,14 @@ void set_all_modules_text_ro(void)
68721
68722 mutex_lock(&module_mutex);
68723 list_for_each_entry_rcu(mod, &modules, list) {
68724 - if ((mod->module_core) && (mod->core_text_size)) {
68725 - set_page_attributes(mod->module_core,
68726 - mod->module_core + mod->core_text_size,
68727 + if ((mod->module_core_rx) && (mod->core_size_rx)) {
68728 + set_page_attributes(mod->module_core_rx,
68729 + mod->module_core_rx + mod->core_size_rx,
68730 set_memory_ro);
68731 }
68732 - if ((mod->module_init) && (mod->init_text_size)) {
68733 - set_page_attributes(mod->module_init,
68734 - mod->module_init + mod->init_text_size,
68735 + if ((mod->module_init_rx) && (mod->init_size_rx)) {
68736 + set_page_attributes(mod->module_init_rx,
68737 + mod->module_init_rx + mod->init_size_rx,
68738 set_memory_ro);
68739 }
68740 }
68741 @@ -1820,16 +1822,19 @@ static void free_module(struct module *mod)
68742
68743 /* This may be NULL, but that's OK */
68744 unset_module_init_ro_nx(mod);
68745 - module_free(mod, mod->module_init);
68746 + module_free(mod, mod->module_init_rw);
68747 + module_free_exec(mod, mod->module_init_rx);
68748 kfree(mod->args);
68749 percpu_modfree(mod);
68750
68751 /* Free lock-classes: */
68752 - lockdep_free_key_range(mod->module_core, mod->core_size);
68753 + lockdep_free_key_range(mod->module_core_rx, mod->core_size_rx);
68754 + lockdep_free_key_range(mod->module_core_rw, mod->core_size_rw);
68755
68756 /* Finally, free the core (containing the module structure) */
68757 unset_module_core_ro_nx(mod);
68758 - module_free(mod, mod->module_core);
68759 + module_free_exec(mod, mod->module_core_rx);
68760 + module_free(mod, mod->module_core_rw);
68761
68762 #ifdef CONFIG_MPU
68763 update_protections(current->mm);
68764 @@ -1899,9 +1904,31 @@ static int simplify_symbols(struct module *mod, const struct load_info *info)
68765 int ret = 0;
68766 const struct kernel_symbol *ksym;
68767
68768 +#ifdef CONFIG_GRKERNSEC_MODHARDEN
68769 + int is_fs_load = 0;
68770 + int register_filesystem_found = 0;
68771 + char *p;
68772 +
68773 + p = strstr(mod->args, "grsec_modharden_fs");
68774 + if (p) {
68775 + char *endptr = p + sizeof("grsec_modharden_fs") - 1;
68776 + /* copy \0 as well */
68777 + memmove(p, endptr, strlen(mod->args) - (unsigned int)(endptr - mod->args) + 1);
68778 + is_fs_load = 1;
68779 + }
68780 +#endif
68781 +
68782 for (i = 1; i < symsec->sh_size / sizeof(Elf_Sym); i++) {
68783 const char *name = info->strtab + sym[i].st_name;
68784
68785 +#ifdef CONFIG_GRKERNSEC_MODHARDEN
68786 + /* it's a real shame this will never get ripped and copied
68787 + upstream! ;(
68788 + */
68789 + if (is_fs_load && !strcmp(name, "register_filesystem"))
68790 + register_filesystem_found = 1;
68791 +#endif
68792 +
68793 switch (sym[i].st_shndx) {
68794 case SHN_COMMON:
68795 /* We compiled with -fno-common. These are not
68796 @@ -1922,7 +1949,9 @@ static int simplify_symbols(struct module *mod, const struct load_info *info)
68797 ksym = resolve_symbol_wait(mod, info, name);
68798 /* Ok if resolved. */
68799 if (ksym && !IS_ERR(ksym)) {
68800 + pax_open_kernel();
68801 sym[i].st_value = ksym->value;
68802 + pax_close_kernel();
68803 break;
68804 }
68805
68806 @@ -1941,11 +1970,20 @@ static int simplify_symbols(struct module *mod, const struct load_info *info)
68807 secbase = (unsigned long)mod_percpu(mod);
68808 else
68809 secbase = info->sechdrs[sym[i].st_shndx].sh_addr;
68810 + pax_open_kernel();
68811 sym[i].st_value += secbase;
68812 + pax_close_kernel();
68813 break;
68814 }
68815 }
68816
68817 +#ifdef CONFIG_GRKERNSEC_MODHARDEN
68818 + if (is_fs_load && !register_filesystem_found) {
68819 + printk(KERN_ALERT "grsec: Denied attempt to load non-fs module %.64s through mount\n", mod->name);
68820 + ret = -EPERM;
68821 + }
68822 +#endif
68823 +
68824 return ret;
68825 }
68826
68827 @@ -2049,22 +2087,12 @@ static void layout_sections(struct module *mod, struct load_info *info)
68828 || s->sh_entsize != ~0UL
68829 || strstarts(sname, ".init"))
68830 continue;
68831 - s->sh_entsize = get_offset(mod, &mod->core_size, s, i);
68832 + if ((s->sh_flags & SHF_WRITE) || !(s->sh_flags & SHF_ALLOC))
68833 + s->sh_entsize = get_offset(mod, &mod->core_size_rw, s, i);
68834 + else
68835 + s->sh_entsize = get_offset(mod, &mod->core_size_rx, s, i);
68836 pr_debug("\t%s\n", sname);
68837 }
68838 - switch (m) {
68839 - case 0: /* executable */
68840 - mod->core_size = debug_align(mod->core_size);
68841 - mod->core_text_size = mod->core_size;
68842 - break;
68843 - case 1: /* RO: text and ro-data */
68844 - mod->core_size = debug_align(mod->core_size);
68845 - mod->core_ro_size = mod->core_size;
68846 - break;
68847 - case 3: /* whole core */
68848 - mod->core_size = debug_align(mod->core_size);
68849 - break;
68850 - }
68851 }
68852
68853 pr_debug("Init section allocation order:\n");
68854 @@ -2078,23 +2106,13 @@ static void layout_sections(struct module *mod, struct load_info *info)
68855 || s->sh_entsize != ~0UL
68856 || !strstarts(sname, ".init"))
68857 continue;
68858 - s->sh_entsize = (get_offset(mod, &mod->init_size, s, i)
68859 - | INIT_OFFSET_MASK);
68860 + if ((s->sh_flags & SHF_WRITE) || !(s->sh_flags & SHF_ALLOC))
68861 + s->sh_entsize = get_offset(mod, &mod->init_size_rw, s, i);
68862 + else
68863 + s->sh_entsize = get_offset(mod, &mod->init_size_rx, s, i);
68864 + s->sh_entsize |= INIT_OFFSET_MASK;
68865 pr_debug("\t%s\n", sname);
68866 }
68867 - switch (m) {
68868 - case 0: /* executable */
68869 - mod->init_size = debug_align(mod->init_size);
68870 - mod->init_text_size = mod->init_size;
68871 - break;
68872 - case 1: /* RO: text and ro-data */
68873 - mod->init_size = debug_align(mod->init_size);
68874 - mod->init_ro_size = mod->init_size;
68875 - break;
68876 - case 3: /* whole init */
68877 - mod->init_size = debug_align(mod->init_size);
68878 - break;
68879 - }
68880 }
68881 }
68882
68883 @@ -2266,7 +2284,7 @@ static void layout_symtab(struct module *mod, struct load_info *info)
68884
68885 /* Put symbol section at end of init part of module. */
68886 symsect->sh_flags |= SHF_ALLOC;
68887 - symsect->sh_entsize = get_offset(mod, &mod->init_size, symsect,
68888 + symsect->sh_entsize = get_offset(mod, &mod->init_size_rx, symsect,
68889 info->index.sym) | INIT_OFFSET_MASK;
68890 pr_debug("\t%s\n", info->secstrings + symsect->sh_name);
68891
68892 @@ -2286,13 +2304,13 @@ static void layout_symtab(struct module *mod, struct load_info *info)
68893 }
68894
68895 /* Append room for core symbols at end of core part. */
68896 - info->symoffs = ALIGN(mod->core_size, symsect->sh_addralign ?: 1);
68897 - info->stroffs = mod->core_size = info->symoffs + ndst * sizeof(Elf_Sym);
68898 - mod->core_size += strtab_size;
68899 + info->symoffs = ALIGN(mod->core_size_rx, symsect->sh_addralign ?: 1);
68900 + info->stroffs = mod->core_size_rx = info->symoffs + ndst * sizeof(Elf_Sym);
68901 + mod->core_size_rx += strtab_size;
68902
68903 /* Put string table section at end of init part of module. */
68904 strsect->sh_flags |= SHF_ALLOC;
68905 - strsect->sh_entsize = get_offset(mod, &mod->init_size, strsect,
68906 + strsect->sh_entsize = get_offset(mod, &mod->init_size_rx, strsect,
68907 info->index.str) | INIT_OFFSET_MASK;
68908 pr_debug("\t%s\n", info->secstrings + strsect->sh_name);
68909 }
68910 @@ -2310,12 +2328,14 @@ static void add_kallsyms(struct module *mod, const struct load_info *info)
68911 /* Make sure we get permanent strtab: don't use info->strtab. */
68912 mod->strtab = (void *)info->sechdrs[info->index.str].sh_addr;
68913
68914 + pax_open_kernel();
68915 +
68916 /* Set types up while we still have access to sections. */
68917 for (i = 0; i < mod->num_symtab; i++)
68918 mod->symtab[i].st_info = elf_type(&mod->symtab[i], info);
68919
68920 - mod->core_symtab = dst = mod->module_core + info->symoffs;
68921 - mod->core_strtab = s = mod->module_core + info->stroffs;
68922 + mod->core_symtab = dst = mod->module_core_rx + info->symoffs;
68923 + mod->core_strtab = s = mod->module_core_rx + info->stroffs;
68924 src = mod->symtab;
68925 *s++ = 0;
68926 for (ndst = i = 0; i < mod->num_symtab; i++) {
68927 @@ -2328,6 +2348,8 @@ static void add_kallsyms(struct module *mod, const struct load_info *info)
68928 }
68929 }
68930 mod->core_num_syms = ndst;
68931 +
68932 + pax_close_kernel();
68933 }
68934 #else
68935 static inline void layout_symtab(struct module *mod, struct load_info *info)
68936 @@ -2361,17 +2383,33 @@ void * __weak module_alloc(unsigned long size)
68937 return size == 0 ? NULL : vmalloc_exec(size);
68938 }
68939
68940 -static void *module_alloc_update_bounds(unsigned long size)
68941 +static void *module_alloc_update_bounds_rw(unsigned long size)
68942 {
68943 void *ret = module_alloc(size);
68944
68945 if (ret) {
68946 mutex_lock(&module_mutex);
68947 /* Update module bounds. */
68948 - if ((unsigned long)ret < module_addr_min)
68949 - module_addr_min = (unsigned long)ret;
68950 - if ((unsigned long)ret + size > module_addr_max)
68951 - module_addr_max = (unsigned long)ret + size;
68952 + if ((unsigned long)ret < module_addr_min_rw)
68953 + module_addr_min_rw = (unsigned long)ret;
68954 + if ((unsigned long)ret + size > module_addr_max_rw)
68955 + module_addr_max_rw = (unsigned long)ret + size;
68956 + mutex_unlock(&module_mutex);
68957 + }
68958 + return ret;
68959 +}
68960 +
68961 +static void *module_alloc_update_bounds_rx(unsigned long size)
68962 +{
68963 + void *ret = module_alloc_exec(size);
68964 +
68965 + if (ret) {
68966 + mutex_lock(&module_mutex);
68967 + /* Update module bounds. */
68968 + if ((unsigned long)ret < module_addr_min_rx)
68969 + module_addr_min_rx = (unsigned long)ret;
68970 + if ((unsigned long)ret + size > module_addr_max_rx)
68971 + module_addr_max_rx = (unsigned long)ret + size;
68972 mutex_unlock(&module_mutex);
68973 }
68974 return ret;
68975 @@ -2549,8 +2587,14 @@ static struct module *setup_load_info(struct load_info *info)
68976 static int check_modinfo(struct module *mod, struct load_info *info)
68977 {
68978 const char *modmagic = get_modinfo(info, "vermagic");
68979 + const char *license = get_modinfo(info, "license");
68980 int err;
68981
68982 +#ifdef CONFIG_PAX_KERNEXEC_PLUGIN_METHOD_OR
68983 + if (!license || !license_is_gpl_compatible(license))
68984 + return -ENOEXEC;
68985 +#endif
68986 +
68987 /* This is allowed: modprobe --force will invalidate it. */
68988 if (!modmagic) {
68989 err = try_to_force_load(mod, "bad vermagic");
68990 @@ -2573,7 +2617,7 @@ static int check_modinfo(struct module *mod, struct load_info *info)
68991 }
68992
68993 /* Set up license info based on the info section */
68994 - set_license(mod, get_modinfo(info, "license"));
68995 + set_license(mod, license);
68996
68997 return 0;
68998 }
68999 @@ -2667,7 +2711,7 @@ static int move_module(struct module *mod, struct load_info *info)
69000 void *ptr;
69001
69002 /* Do the allocs. */
69003 - ptr = module_alloc_update_bounds(mod->core_size);
69004 + ptr = module_alloc_update_bounds_rw(mod->core_size_rw);
69005 /*
69006 * The pointer to this block is stored in the module structure
69007 * which is inside the block. Just mark it as not being a
69008 @@ -2677,23 +2721,50 @@ static int move_module(struct module *mod, struct load_info *info)
69009 if (!ptr)
69010 return -ENOMEM;
69011
69012 - memset(ptr, 0, mod->core_size);
69013 - mod->module_core = ptr;
69014 + memset(ptr, 0, mod->core_size_rw);
69015 + mod->module_core_rw = ptr;
69016
69017 - ptr = module_alloc_update_bounds(mod->init_size);
69018 + ptr = module_alloc_update_bounds_rw(mod->init_size_rw);
69019 /*
69020 * The pointer to this block is stored in the module structure
69021 * which is inside the block. This block doesn't need to be
69022 * scanned as it contains data and code that will be freed
69023 * after the module is initialized.
69024 */
69025 - kmemleak_ignore(ptr);
69026 - if (!ptr && mod->init_size) {
69027 - module_free(mod, mod->module_core);
69028 + kmemleak_not_leak(ptr);
69029 + if (!ptr && mod->init_size_rw) {
69030 + module_free(mod, mod->module_core_rw);
69031 return -ENOMEM;
69032 }
69033 - memset(ptr, 0, mod->init_size);
69034 - mod->module_init = ptr;
69035 + memset(ptr, 0, mod->init_size_rw);
69036 + mod->module_init_rw = ptr;
69037 +
69038 + ptr = module_alloc_update_bounds_rx(mod->core_size_rx);
69039 + kmemleak_not_leak(ptr);
69040 + if (!ptr) {
69041 + module_free(mod, mod->module_init_rw);
69042 + module_free(mod, mod->module_core_rw);
69043 + return -ENOMEM;
69044 + }
69045 +
69046 + pax_open_kernel();
69047 + memset(ptr, 0, mod->core_size_rx);
69048 + pax_close_kernel();
69049 + mod->module_core_rx = ptr;
69050 +
69051 + ptr = module_alloc_update_bounds_rx(mod->init_size_rx);
69052 + kmemleak_not_leak(ptr);
69053 + if (!ptr && mod->init_size_rx) {
69054 + module_free_exec(mod, mod->module_core_rx);
69055 + module_free(mod, mod->module_init_rw);
69056 + module_free(mod, mod->module_core_rw);
69057 + return -ENOMEM;
69058 + }
69059 +
69060 + pax_open_kernel();
69061 + memset(ptr, 0, mod->init_size_rx);
69062 + pax_close_kernel();
69063 + mod->module_init_rx = ptr;
69064
69065 /* Transfer each section which specifies SHF_ALLOC */
69066 pr_debug("final section addresses:\n");
69067 @@ -2704,16 +2775,45 @@ static int move_module(struct module *mod, struct load_info *info)
69068 if (!(shdr->sh_flags & SHF_ALLOC))
69069 continue;
69070
69071 - if (shdr->sh_entsize & INIT_OFFSET_MASK)
69072 - dest = mod->module_init
69073 - + (shdr->sh_entsize & ~INIT_OFFSET_MASK);
69074 - else
69075 - dest = mod->module_core + shdr->sh_entsize;
69076 + if (shdr->sh_entsize & INIT_OFFSET_MASK) {
69077 + if ((shdr->sh_flags & SHF_WRITE) || !(shdr->sh_flags & SHF_ALLOC))
69078 + dest = mod->module_init_rw
69079 + + (shdr->sh_entsize & ~INIT_OFFSET_MASK);
69080 + else
69081 + dest = mod->module_init_rx
69082 + + (shdr->sh_entsize & ~INIT_OFFSET_MASK);
69083 + } else {
69084 + if ((shdr->sh_flags & SHF_WRITE) || !(shdr->sh_flags & SHF_ALLOC))
69085 + dest = mod->module_core_rw + shdr->sh_entsize;
69086 + else
69087 + dest = mod->module_core_rx + shdr->sh_entsize;
69088 + }
69089 +
69090 + if (shdr->sh_type != SHT_NOBITS) {
69091 +
69092 +#ifdef CONFIG_PAX_KERNEXEC
69093 +#ifdef CONFIG_X86_64
69094 + if ((shdr->sh_flags & SHF_WRITE) && (shdr->sh_flags & SHF_EXECINSTR))
69095 + set_memory_x((unsigned long)dest, (shdr->sh_size + PAGE_SIZE) >> PAGE_SHIFT);
69096 +#endif
69097 + if (!(shdr->sh_flags & SHF_WRITE) && (shdr->sh_flags & SHF_ALLOC)) {
69098 + pax_open_kernel();
69099 + memcpy(dest, (void *)shdr->sh_addr, shdr->sh_size);
69100 + pax_close_kernel();
69101 + } else
69102 +#endif
69103
69104 - if (shdr->sh_type != SHT_NOBITS)
69105 memcpy(dest, (void *)shdr->sh_addr, shdr->sh_size);
69106 + }
69107 /* Update sh_addr to point to copy in image. */
69108 - shdr->sh_addr = (unsigned long)dest;
69109 +
69110 +#ifdef CONFIG_PAX_KERNEXEC
69111 + if (shdr->sh_flags & SHF_EXECINSTR)
69112 + shdr->sh_addr = ktva_ktla((unsigned long)dest);
69113 + else
69114 +#endif
69115 +
69116 + shdr->sh_addr = (unsigned long)dest;
69117 pr_debug("\t0x%lx %s\n",
69118 (long)shdr->sh_addr, info->secstrings + shdr->sh_name);
69119 }
69120 @@ -2768,12 +2868,12 @@ static void flush_module_icache(const struct module *mod)
69121 * Do it before processing of module parameters, so the module
69122 * can provide parameter accessor functions of its own.
69123 */
69124 - if (mod->module_init)
69125 - flush_icache_range((unsigned long)mod->module_init,
69126 - (unsigned long)mod->module_init
69127 - + mod->init_size);
69128 - flush_icache_range((unsigned long)mod->module_core,
69129 - (unsigned long)mod->module_core + mod->core_size);
69130 + if (mod->module_init_rx)
69131 + flush_icache_range((unsigned long)mod->module_init_rx,
69132 + (unsigned long)mod->module_init_rx
69133 + + mod->init_size_rx);
69134 + flush_icache_range((unsigned long)mod->module_core_rx,
69135 + (unsigned long)mod->module_core_rx + mod->core_size_rx);
69136
69137 set_fs(old_fs);
69138 }
69139 @@ -2843,8 +2943,10 @@ out:
69140 static void module_deallocate(struct module *mod, struct load_info *info)
69141 {
69142 percpu_modfree(mod);
69143 - module_free(mod, mod->module_init);
69144 - module_free(mod, mod->module_core);
69145 + module_free_exec(mod, mod->module_init_rx);
69146 + module_free_exec(mod, mod->module_core_rx);
69147 + module_free(mod, mod->module_init_rw);
69148 + module_free(mod, mod->module_core_rw);
69149 }
69150
69151 int __weak module_finalize(const Elf_Ehdr *hdr,
69152 @@ -2857,7 +2959,9 @@ int __weak module_finalize(const Elf_Ehdr *hdr,
69153 static int post_relocation(struct module *mod, const struct load_info *info)
69154 {
69155 /* Sort exception table now relocations are done. */
69156 + pax_open_kernel();
69157 sort_extable(mod->extable, mod->extable + mod->num_exentries);
69158 + pax_close_kernel();
69159
69160 /* Copy relocated percpu area over. */
69161 percpu_modcopy(mod, (void *)info->sechdrs[info->index.pcpu].sh_addr,
69162 @@ -2908,9 +3012,38 @@ static struct module *load_module(void __user *umod,
69163 if (err)
69164 goto free_unload;
69165
69166 + /* Now copy in args */
69167 + mod->args = strndup_user(uargs, ~0UL >> 1);
69168 + if (IS_ERR(mod->args)) {
69169 + err = PTR_ERR(mod->args);
69170 + goto free_unload;
69171 + }
69172 +
69173 /* Set up MODINFO_ATTR fields */
69174 setup_modinfo(mod, &info);
69175
69176 +#ifdef CONFIG_GRKERNSEC_MODHARDEN
69177 + {
69178 + char *p, *p2;
69179 +
69180 + if (strstr(mod->args, "grsec_modharden_netdev")) {
69181 + 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);
69182 + err = -EPERM;
69183 + goto free_modinfo;
69184 + } else if ((p = strstr(mod->args, "grsec_modharden_normal"))) {
69185 + p += sizeof("grsec_modharden_normal") - 1;
69186 + p2 = strstr(p, "_");
69187 + if (p2) {
69188 + *p2 = '\0';
69189 + printk(KERN_ALERT "grsec: denied kernel module auto-load of %.64s by uid %.9s\n", mod->name, p);
69190 + *p2 = '_';
69191 + }
69192 + err = -EPERM;
69193 + goto free_modinfo;
69194 + }
69195 + }
69196 +#endif
69197 +
69198 /* Fix up syms, so that st_value is a pointer to location. */
69199 err = simplify_symbols(mod, &info);
69200 if (err < 0)
69201 @@ -2926,13 +3059,6 @@ static struct module *load_module(void __user *umod,
69202
69203 flush_module_icache(mod);
69204
69205 - /* Now copy in args */
69206 - mod->args = strndup_user(uargs, ~0UL >> 1);
69207 - if (IS_ERR(mod->args)) {
69208 - err = PTR_ERR(mod->args);
69209 - goto free_arch_cleanup;
69210 - }
69211 -
69212 /* Mark state as coming so strong_try_module_get() ignores us. */
69213 mod->state = MODULE_STATE_COMING;
69214
69215 @@ -2990,11 +3116,10 @@ static struct module *load_module(void __user *umod,
69216 unlock:
69217 mutex_unlock(&module_mutex);
69218 synchronize_sched();
69219 - kfree(mod->args);
69220 - free_arch_cleanup:
69221 module_arch_cleanup(mod);
69222 free_modinfo:
69223 free_modinfo(mod);
69224 + kfree(mod->args);
69225 free_unload:
69226 module_unload_free(mod);
69227 free_module:
69228 @@ -3035,16 +3160,16 @@ SYSCALL_DEFINE3(init_module, void __user *, umod,
69229 MODULE_STATE_COMING, mod);
69230
69231 /* Set RO and NX regions for core */
69232 - set_section_ro_nx(mod->module_core,
69233 - mod->core_text_size,
69234 - mod->core_ro_size,
69235 - mod->core_size);
69236 + set_section_ro_nx(mod->module_core_rx,
69237 + mod->core_size_rx,
69238 + mod->core_size_rx,
69239 + mod->core_size_rx);
69240
69241 /* Set RO and NX regions for init */
69242 - set_section_ro_nx(mod->module_init,
69243 - mod->init_text_size,
69244 - mod->init_ro_size,
69245 - mod->init_size);
69246 + set_section_ro_nx(mod->module_init_rx,
69247 + mod->init_size_rx,
69248 + mod->init_size_rx,
69249 + mod->init_size_rx);
69250
69251 do_mod_ctors(mod);
69252 /* Start the module */
69253 @@ -3090,11 +3215,12 @@ SYSCALL_DEFINE3(init_module, void __user *, umod,
69254 mod->strtab = mod->core_strtab;
69255 #endif
69256 unset_module_init_ro_nx(mod);
69257 - module_free(mod, mod->module_init);
69258 - mod->module_init = NULL;
69259 - mod->init_size = 0;
69260 - mod->init_ro_size = 0;
69261 - mod->init_text_size = 0;
69262 + module_free(mod, mod->module_init_rw);
69263 + module_free_exec(mod, mod->module_init_rx);
69264 + mod->module_init_rw = NULL;
69265 + mod->module_init_rx = NULL;
69266 + mod->init_size_rw = 0;
69267 + mod->init_size_rx = 0;
69268 mutex_unlock(&module_mutex);
69269
69270 return 0;
69271 @@ -3125,10 +3251,16 @@ static const char *get_ksymbol(struct module *mod,
69272 unsigned long nextval;
69273
69274 /* At worse, next value is at end of module */
69275 - if (within_module_init(addr, mod))
69276 - nextval = (unsigned long)mod->module_init+mod->init_text_size;
69277 + if (within_module_init_rx(addr, mod))
69278 + nextval = (unsigned long)mod->module_init_rx+mod->init_size_rx;
69279 + else if (within_module_init_rw(addr, mod))
69280 + nextval = (unsigned long)mod->module_init_rw+mod->init_size_rw;
69281 + else if (within_module_core_rx(addr, mod))
69282 + nextval = (unsigned long)mod->module_core_rx+mod->core_size_rx;
69283 + else if (within_module_core_rw(addr, mod))
69284 + nextval = (unsigned long)mod->module_core_rw+mod->core_size_rw;
69285 else
69286 - nextval = (unsigned long)mod->module_core+mod->core_text_size;
69287 + return NULL;
69288
69289 /* Scan for closest preceding symbol, and next symbol. (ELF
69290 starts real symbols at 1). */
69291 @@ -3363,7 +3495,7 @@ static int m_show(struct seq_file *m, void *p)
69292 char buf[8];
69293
69294 seq_printf(m, "%s %u",
69295 - mod->name, mod->init_size + mod->core_size);
69296 + mod->name, mod->init_size_rx + mod->init_size_rw + mod->core_size_rx + mod->core_size_rw);
69297 print_unload_info(m, mod);
69298
69299 /* Informative for users. */
69300 @@ -3372,7 +3504,7 @@ static int m_show(struct seq_file *m, void *p)
69301 mod->state == MODULE_STATE_COMING ? "Loading":
69302 "Live");
69303 /* Used by oprofile and other similar tools. */
69304 - seq_printf(m, " 0x%pK", mod->module_core);
69305 + seq_printf(m, " 0x%pK 0x%pK", mod->module_core_rx, mod->module_core_rw);
69306
69307 /* Taints info */
69308 if (mod->taints)
69309 @@ -3408,7 +3540,17 @@ static const struct file_operations proc_modules_operations = {
69310
69311 static int __init proc_modules_init(void)
69312 {
69313 +#ifndef CONFIG_GRKERNSEC_HIDESYM
69314 +#ifdef CONFIG_GRKERNSEC_PROC_USER
69315 + proc_create("modules", S_IRUSR, NULL, &proc_modules_operations);
69316 +#elif defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
69317 + proc_create("modules", S_IRUSR | S_IRGRP, NULL, &proc_modules_operations);
69318 +#else
69319 proc_create("modules", 0, NULL, &proc_modules_operations);
69320 +#endif
69321 +#else
69322 + proc_create("modules", S_IRUSR, NULL, &proc_modules_operations);
69323 +#endif
69324 return 0;
69325 }
69326 module_init(proc_modules_init);
69327 @@ -3467,12 +3609,12 @@ struct module *__module_address(unsigned long addr)
69328 {
69329 struct module *mod;
69330
69331 - if (addr < module_addr_min || addr > module_addr_max)
69332 + if ((addr < module_addr_min_rx || addr > module_addr_max_rx) &&
69333 + (addr < module_addr_min_rw || addr > module_addr_max_rw))
69334 return NULL;
69335
69336 list_for_each_entry_rcu(mod, &modules, list)
69337 - if (within_module_core(addr, mod)
69338 - || within_module_init(addr, mod))
69339 + if (within_module_init(addr, mod) || within_module_core(addr, mod))
69340 return mod;
69341 return NULL;
69342 }
69343 @@ -3506,11 +3648,20 @@ bool is_module_text_address(unsigned long addr)
69344 */
69345 struct module *__module_text_address(unsigned long addr)
69346 {
69347 - struct module *mod = __module_address(addr);
69348 + struct module *mod;
69349 +
69350 +#ifdef CONFIG_X86_32
69351 + addr = ktla_ktva(addr);
69352 +#endif
69353 +
69354 + if (addr < module_addr_min_rx || addr > module_addr_max_rx)
69355 + return NULL;
69356 +
69357 + mod = __module_address(addr);
69358 +
69359 if (mod) {
69360 /* Make sure it's within the text section. */
69361 - if (!within(addr, mod->module_init, mod->init_text_size)
69362 - && !within(addr, mod->module_core, mod->core_text_size))
69363 + if (!within_module_init_rx(addr, mod) && !within_module_core_rx(addr, mod))
69364 mod = NULL;
69365 }
69366 return mod;
69367 diff --git a/kernel/mutex-debug.c b/kernel/mutex-debug.c
69368 index 7e3443f..b2a1e6b 100644
69369 --- a/kernel/mutex-debug.c
69370 +++ b/kernel/mutex-debug.c
69371 @@ -49,21 +49,21 @@ void debug_mutex_free_waiter(struct mutex_waiter *waiter)
69372 }
69373
69374 void debug_mutex_add_waiter(struct mutex *lock, struct mutex_waiter *waiter,
69375 - struct thread_info *ti)
69376 + struct task_struct *task)
69377 {
69378 SMP_DEBUG_LOCKS_WARN_ON(!spin_is_locked(&lock->wait_lock));
69379
69380 /* Mark the current thread as blocked on the lock: */
69381 - ti->task->blocked_on = waiter;
69382 + task->blocked_on = waiter;
69383 }
69384
69385 void mutex_remove_waiter(struct mutex *lock, struct mutex_waiter *waiter,
69386 - struct thread_info *ti)
69387 + struct task_struct *task)
69388 {
69389 DEBUG_LOCKS_WARN_ON(list_empty(&waiter->list));
69390 - DEBUG_LOCKS_WARN_ON(waiter->task != ti->task);
69391 - DEBUG_LOCKS_WARN_ON(ti->task->blocked_on != waiter);
69392 - ti->task->blocked_on = NULL;
69393 + DEBUG_LOCKS_WARN_ON(waiter->task != task);
69394 + DEBUG_LOCKS_WARN_ON(task->blocked_on != waiter);
69395 + task->blocked_on = NULL;
69396
69397 list_del_init(&waiter->list);
69398 waiter->task = NULL;
69399 diff --git a/kernel/mutex-debug.h b/kernel/mutex-debug.h
69400 index 0799fd3..d06ae3b 100644
69401 --- a/kernel/mutex-debug.h
69402 +++ b/kernel/mutex-debug.h
69403 @@ -20,9 +20,9 @@ extern void debug_mutex_wake_waiter(struct mutex *lock,
69404 extern void debug_mutex_free_waiter(struct mutex_waiter *waiter);
69405 extern void debug_mutex_add_waiter(struct mutex *lock,
69406 struct mutex_waiter *waiter,
69407 - struct thread_info *ti);
69408 + struct task_struct *task);
69409 extern void mutex_remove_waiter(struct mutex *lock, struct mutex_waiter *waiter,
69410 - struct thread_info *ti);
69411 + struct task_struct *task);
69412 extern void debug_mutex_unlock(struct mutex *lock);
69413 extern void debug_mutex_init(struct mutex *lock, const char *name,
69414 struct lock_class_key *key);
69415 diff --git a/kernel/mutex.c b/kernel/mutex.c
69416 index a307cc9..27fd2e9 100644
69417 --- a/kernel/mutex.c
69418 +++ b/kernel/mutex.c
69419 @@ -198,7 +198,7 @@ __mutex_lock_common(struct mutex *lock, long state, unsigned int subclass,
69420 spin_lock_mutex(&lock->wait_lock, flags);
69421
69422 debug_mutex_lock_common(lock, &waiter);
69423 - debug_mutex_add_waiter(lock, &waiter, task_thread_info(task));
69424 + debug_mutex_add_waiter(lock, &waiter, task);
69425
69426 /* add waiting tasks to the end of the waitqueue (FIFO): */
69427 list_add_tail(&waiter.list, &lock->wait_list);
69428 @@ -227,8 +227,7 @@ __mutex_lock_common(struct mutex *lock, long state, unsigned int subclass,
69429 * TASK_UNINTERRUPTIBLE case.)
69430 */
69431 if (unlikely(signal_pending_state(state, task))) {
69432 - mutex_remove_waiter(lock, &waiter,
69433 - task_thread_info(task));
69434 + mutex_remove_waiter(lock, &waiter, task);
69435 mutex_release(&lock->dep_map, 1, ip);
69436 spin_unlock_mutex(&lock->wait_lock, flags);
69437
69438 @@ -247,7 +246,7 @@ __mutex_lock_common(struct mutex *lock, long state, unsigned int subclass,
69439 done:
69440 lock_acquired(&lock->dep_map, ip);
69441 /* got the lock - rejoice! */
69442 - mutex_remove_waiter(lock, &waiter, current_thread_info());
69443 + mutex_remove_waiter(lock, &waiter, task);
69444 mutex_set_owner(lock);
69445
69446 /* set it to 0 if there are no waiters left: */
69447 diff --git a/kernel/panic.c b/kernel/panic.c
69448 index e1b2822..5edc1d9 100644
69449 --- a/kernel/panic.c
69450 +++ b/kernel/panic.c
69451 @@ -410,7 +410,7 @@ static void warn_slowpath_common(const char *file, int line, void *caller,
69452 const char *board;
69453
69454 printk(KERN_WARNING "------------[ cut here ]------------\n");
69455 - printk(KERN_WARNING "WARNING: at %s:%d %pS()\n", file, line, caller);
69456 + printk(KERN_WARNING "WARNING: at %s:%d %pA()\n", file, line, caller);
69457 board = dmi_get_system_info(DMI_PRODUCT_NAME);
69458 if (board)
69459 printk(KERN_WARNING "Hardware name: %s\n", board);
69460 @@ -465,7 +465,8 @@ EXPORT_SYMBOL(warn_slowpath_null);
69461 */
69462 void __stack_chk_fail(void)
69463 {
69464 - panic("stack-protector: Kernel stack is corrupted in: %p\n",
69465 + dump_stack();
69466 + panic("stack-protector: Kernel stack is corrupted in: %pA\n",
69467 __builtin_return_address(0));
69468 }
69469 EXPORT_SYMBOL(__stack_chk_fail);
69470 diff --git a/kernel/pid.c b/kernel/pid.c
69471 index e86b291a..e8b0fb5 100644
69472 --- a/kernel/pid.c
69473 +++ b/kernel/pid.c
69474 @@ -33,6 +33,7 @@
69475 #include <linux/rculist.h>
69476 #include <linux/bootmem.h>
69477 #include <linux/hash.h>
69478 +#include <linux/security.h>
69479 #include <linux/pid_namespace.h>
69480 #include <linux/init_task.h>
69481 #include <linux/syscalls.h>
69482 @@ -45,7 +46,7 @@ struct pid init_struct_pid = INIT_STRUCT_PID;
69483
69484 int pid_max = PID_MAX_DEFAULT;
69485
69486 -#define RESERVED_PIDS 300
69487 +#define RESERVED_PIDS 500
69488
69489 int pid_max_min = RESERVED_PIDS + 1;
69490 int pid_max_max = PID_MAX_LIMIT;
69491 @@ -420,10 +421,18 @@ EXPORT_SYMBOL(pid_task);
69492 */
69493 struct task_struct *find_task_by_pid_ns(pid_t nr, struct pid_namespace *ns)
69494 {
69495 + struct task_struct *task;
69496 +
69497 rcu_lockdep_assert(rcu_read_lock_held(),
69498 "find_task_by_pid_ns() needs rcu_read_lock()"
69499 " protection");
69500 - return pid_task(find_pid_ns(nr, ns), PIDTYPE_PID);
69501 +
69502 + task = pid_task(find_pid_ns(nr, ns), PIDTYPE_PID);
69503 +
69504 + if (gr_pid_is_chrooted(task))
69505 + return NULL;
69506 +
69507 + return task;
69508 }
69509
69510 struct task_struct *find_task_by_vpid(pid_t vnr)
69511 @@ -431,6 +440,14 @@ struct task_struct *find_task_by_vpid(pid_t vnr)
69512 return find_task_by_pid_ns(vnr, current->nsproxy->pid_ns);
69513 }
69514
69515 +struct task_struct *find_task_by_vpid_unrestricted(pid_t vnr)
69516 +{
69517 + rcu_lockdep_assert(rcu_read_lock_held(),
69518 + "find_task_by_pid_ns() needs rcu_read_lock()"
69519 + " protection");
69520 + return pid_task(find_pid_ns(vnr, current->nsproxy->pid_ns), PIDTYPE_PID);
69521 +}
69522 +
69523 struct pid *get_task_pid(struct task_struct *task, enum pid_type type)
69524 {
69525 struct pid *pid;
69526 diff --git a/kernel/posix-cpu-timers.c b/kernel/posix-cpu-timers.c
69527 index 125cb67..a4d1c30 100644
69528 --- a/kernel/posix-cpu-timers.c
69529 +++ b/kernel/posix-cpu-timers.c
69530 @@ -6,6 +6,7 @@
69531 #include <linux/posix-timers.h>
69532 #include <linux/errno.h>
69533 #include <linux/math64.h>
69534 +#include <linux/security.h>
69535 #include <asm/uaccess.h>
69536 #include <linux/kernel_stat.h>
69537 #include <trace/events/timer.h>
69538 @@ -1578,14 +1579,14 @@ struct k_clock clock_posix_cpu = {
69539
69540 static __init int init_posix_cpu_timers(void)
69541 {
69542 - struct k_clock process = {
69543 + static struct k_clock process = {
69544 .clock_getres = process_cpu_clock_getres,
69545 .clock_get = process_cpu_clock_get,
69546 .timer_create = process_cpu_timer_create,
69547 .nsleep = process_cpu_nsleep,
69548 .nsleep_restart = process_cpu_nsleep_restart,
69549 };
69550 - struct k_clock thread = {
69551 + static struct k_clock thread = {
69552 .clock_getres = thread_cpu_clock_getres,
69553 .clock_get = thread_cpu_clock_get,
69554 .timer_create = thread_cpu_timer_create,
69555 diff --git a/kernel/posix-timers.c b/kernel/posix-timers.c
69556 index 69185ae..cc2847a 100644
69557 --- a/kernel/posix-timers.c
69558 +++ b/kernel/posix-timers.c
69559 @@ -43,6 +43,7 @@
69560 #include <linux/idr.h>
69561 #include <linux/posix-clock.h>
69562 #include <linux/posix-timers.h>
69563 +#include <linux/grsecurity.h>
69564 #include <linux/syscalls.h>
69565 #include <linux/wait.h>
69566 #include <linux/workqueue.h>
69567 @@ -129,7 +130,7 @@ static DEFINE_SPINLOCK(idr_lock);
69568 * which we beg off on and pass to do_sys_settimeofday().
69569 */
69570
69571 -static struct k_clock posix_clocks[MAX_CLOCKS];
69572 +static struct k_clock *posix_clocks[MAX_CLOCKS];
69573
69574 /*
69575 * These ones are defined below.
69576 @@ -227,7 +228,7 @@ static int posix_get_boottime(const clockid_t which_clock, struct timespec *tp)
69577 */
69578 static __init int init_posix_timers(void)
69579 {
69580 - struct k_clock clock_realtime = {
69581 + static struct k_clock clock_realtime = {
69582 .clock_getres = hrtimer_get_res,
69583 .clock_get = posix_clock_realtime_get,
69584 .clock_set = posix_clock_realtime_set,
69585 @@ -239,7 +240,7 @@ static __init int init_posix_timers(void)
69586 .timer_get = common_timer_get,
69587 .timer_del = common_timer_del,
69588 };
69589 - struct k_clock clock_monotonic = {
69590 + static struct k_clock clock_monotonic = {
69591 .clock_getres = hrtimer_get_res,
69592 .clock_get = posix_ktime_get_ts,
69593 .nsleep = common_nsleep,
69594 @@ -249,19 +250,19 @@ static __init int init_posix_timers(void)
69595 .timer_get = common_timer_get,
69596 .timer_del = common_timer_del,
69597 };
69598 - struct k_clock clock_monotonic_raw = {
69599 + static struct k_clock clock_monotonic_raw = {
69600 .clock_getres = hrtimer_get_res,
69601 .clock_get = posix_get_monotonic_raw,
69602 };
69603 - struct k_clock clock_realtime_coarse = {
69604 + static struct k_clock clock_realtime_coarse = {
69605 .clock_getres = posix_get_coarse_res,
69606 .clock_get = posix_get_realtime_coarse,
69607 };
69608 - struct k_clock clock_monotonic_coarse = {
69609 + static struct k_clock clock_monotonic_coarse = {
69610 .clock_getres = posix_get_coarse_res,
69611 .clock_get = posix_get_monotonic_coarse,
69612 };
69613 - struct k_clock clock_boottime = {
69614 + static struct k_clock clock_boottime = {
69615 .clock_getres = hrtimer_get_res,
69616 .clock_get = posix_get_boottime,
69617 .nsleep = common_nsleep,
69618 @@ -473,7 +474,7 @@ void posix_timers_register_clock(const clockid_t clock_id,
69619 return;
69620 }
69621
69622 - posix_clocks[clock_id] = *new_clock;
69623 + posix_clocks[clock_id] = new_clock;
69624 }
69625 EXPORT_SYMBOL_GPL(posix_timers_register_clock);
69626
69627 @@ -519,9 +520,9 @@ static struct k_clock *clockid_to_kclock(const clockid_t id)
69628 return (id & CLOCKFD_MASK) == CLOCKFD ?
69629 &clock_posix_dynamic : &clock_posix_cpu;
69630
69631 - if (id >= MAX_CLOCKS || !posix_clocks[id].clock_getres)
69632 + if (id >= MAX_CLOCKS || !posix_clocks[id] || !posix_clocks[id]->clock_getres)
69633 return NULL;
69634 - return &posix_clocks[id];
69635 + return posix_clocks[id];
69636 }
69637
69638 static int common_timer_create(struct k_itimer *new_timer)
69639 @@ -959,6 +960,13 @@ SYSCALL_DEFINE2(clock_settime, const clockid_t, which_clock,
69640 if (copy_from_user(&new_tp, tp, sizeof (*tp)))
69641 return -EFAULT;
69642
69643 + /* only the CLOCK_REALTIME clock can be set, all other clocks
69644 + have their clock_set fptr set to a nosettime dummy function
69645 + CLOCK_REALTIME has a NULL clock_set fptr which causes it to
69646 + call common_clock_set, which calls do_sys_settimeofday, which
69647 + we hook
69648 + */
69649 +
69650 return kc->clock_set(which_clock, &new_tp);
69651 }
69652
69653 diff --git a/kernel/power/poweroff.c b/kernel/power/poweroff.c
69654 index d523593..68197a4 100644
69655 --- a/kernel/power/poweroff.c
69656 +++ b/kernel/power/poweroff.c
69657 @@ -37,7 +37,7 @@ static struct sysrq_key_op sysrq_poweroff_op = {
69658 .enable_mask = SYSRQ_ENABLE_BOOT,
69659 };
69660
69661 -static int pm_sysrq_init(void)
69662 +static int __init pm_sysrq_init(void)
69663 {
69664 register_sysrq_key('o', &sysrq_poweroff_op);
69665 return 0;
69666 diff --git a/kernel/power/process.c b/kernel/power/process.c
69667 index 19db29f..33b52b6 100644
69668 --- a/kernel/power/process.c
69669 +++ b/kernel/power/process.c
69670 @@ -33,6 +33,7 @@ static int try_to_freeze_tasks(bool user_only)
69671 u64 elapsed_csecs64;
69672 unsigned int elapsed_csecs;
69673 bool wakeup = false;
69674 + bool timedout = false;
69675
69676 do_gettimeofday(&start);
69677
69678 @@ -43,6 +44,8 @@ static int try_to_freeze_tasks(bool user_only)
69679
69680 while (true) {
69681 todo = 0;
69682 + if (time_after(jiffies, end_time))
69683 + timedout = true;
69684 read_lock(&tasklist_lock);
69685 do_each_thread(g, p) {
69686 if (p == current || !freeze_task(p))
69687 @@ -58,9 +61,13 @@ static int try_to_freeze_tasks(bool user_only)
69688 * guaranteed that TASK_STOPPED/TRACED -> TASK_RUNNING
69689 * transition can't race with task state testing here.
69690 */
69691 - if (!task_is_stopped_or_traced(p) &&
69692 - !freezer_should_skip(p))
69693 + if (!task_is_stopped_or_traced(p) && !freezer_should_skip(p)) {
69694 todo++;
69695 + if (timedout) {
69696 + printk(KERN_ERR "Task refusing to freeze:\n");
69697 + sched_show_task(p);
69698 + }
69699 + }
69700 } while_each_thread(g, p);
69701 read_unlock(&tasklist_lock);
69702
69703 @@ -69,7 +76,7 @@ static int try_to_freeze_tasks(bool user_only)
69704 todo += wq_busy;
69705 }
69706
69707 - if (!todo || time_after(jiffies, end_time))
69708 + if (!todo || timedout)
69709 break;
69710
69711 if (pm_wakeup_pending()) {
69712 diff --git a/kernel/printk.c b/kernel/printk.c
69713 index 66a2ea3..10f3a01 100644
69714 --- a/kernel/printk.c
69715 +++ b/kernel/printk.c
69716 @@ -817,6 +817,11 @@ static int check_syslog_permissions(int type, bool from_file)
69717 if (from_file && type != SYSLOG_ACTION_OPEN)
69718 return 0;
69719
69720 +#ifdef CONFIG_GRKERNSEC_DMESG
69721 + if (grsec_enable_dmesg && !capable(CAP_SYSLOG) && !capable_nolog(CAP_SYS_ADMIN))
69722 + return -EPERM;
69723 +#endif
69724 +
69725 if (syslog_action_restricted(type)) {
69726 if (capable(CAP_SYSLOG))
69727 return 0;
69728 diff --git a/kernel/profile.c b/kernel/profile.c
69729 index 76b8e77..a2930e8 100644
69730 --- a/kernel/profile.c
69731 +++ b/kernel/profile.c
69732 @@ -39,7 +39,7 @@ struct profile_hit {
69733 /* Oprofile timer tick hook */
69734 static int (*timer_hook)(struct pt_regs *) __read_mostly;
69735
69736 -static atomic_t *prof_buffer;
69737 +static atomic_unchecked_t *prof_buffer;
69738 static unsigned long prof_len, prof_shift;
69739
69740 int prof_on __read_mostly;
69741 @@ -281,7 +281,7 @@ static void profile_flip_buffers(void)
69742 hits[i].pc = 0;
69743 continue;
69744 }
69745 - atomic_add(hits[i].hits, &prof_buffer[hits[i].pc]);
69746 + atomic_add_unchecked(hits[i].hits, &prof_buffer[hits[i].pc]);
69747 hits[i].hits = hits[i].pc = 0;
69748 }
69749 }
69750 @@ -342,9 +342,9 @@ static void do_profile_hits(int type, void *__pc, unsigned int nr_hits)
69751 * Add the current hit(s) and flush the write-queue out
69752 * to the global buffer:
69753 */
69754 - atomic_add(nr_hits, &prof_buffer[pc]);
69755 + atomic_add_unchecked(nr_hits, &prof_buffer[pc]);
69756 for (i = 0; i < NR_PROFILE_HIT; ++i) {
69757 - atomic_add(hits[i].hits, &prof_buffer[hits[i].pc]);
69758 + atomic_add_unchecked(hits[i].hits, &prof_buffer[hits[i].pc]);
69759 hits[i].pc = hits[i].hits = 0;
69760 }
69761 out:
69762 @@ -419,7 +419,7 @@ static void do_profile_hits(int type, void *__pc, unsigned int nr_hits)
69763 {
69764 unsigned long pc;
69765 pc = ((unsigned long)__pc - (unsigned long)_stext) >> prof_shift;
69766 - atomic_add(nr_hits, &prof_buffer[min(pc, prof_len - 1)]);
69767 + atomic_add_unchecked(nr_hits, &prof_buffer[min(pc, prof_len - 1)]);
69768 }
69769 #endif /* !CONFIG_SMP */
69770
69771 @@ -517,7 +517,7 @@ read_profile(struct file *file, char __user *buf, size_t count, loff_t *ppos)
69772 return -EFAULT;
69773 buf++; p++; count--; read++;
69774 }
69775 - pnt = (char *)prof_buffer + p - sizeof(atomic_t);
69776 + pnt = (char *)prof_buffer + p - sizeof(atomic_unchecked_t);
69777 if (copy_to_user(buf, (void *)pnt, count))
69778 return -EFAULT;
69779 read += count;
69780 @@ -548,7 +548,7 @@ static ssize_t write_profile(struct file *file, const char __user *buf,
69781 }
69782 #endif
69783 profile_discard_flip_buffers();
69784 - memset(prof_buffer, 0, prof_len * sizeof(atomic_t));
69785 + memset(prof_buffer, 0, prof_len * sizeof(atomic_unchecked_t));
69786 return count;
69787 }
69788
69789 diff --git a/kernel/ptrace.c b/kernel/ptrace.c
69790 index a232bb5..2a65ef9 100644
69791 --- a/kernel/ptrace.c
69792 +++ b/kernel/ptrace.c
69793 @@ -279,7 +279,7 @@ static int ptrace_attach(struct task_struct *task, long request,
69794
69795 if (seize)
69796 flags |= PT_SEIZED;
69797 - if (ns_capable(task_user_ns(task), CAP_SYS_PTRACE))
69798 + if (ns_capable_nolog(task_user_ns(task), CAP_SYS_PTRACE))
69799 flags |= PT_PTRACE_CAP;
69800 task->ptrace = flags;
69801
69802 @@ -486,7 +486,7 @@ int ptrace_readdata(struct task_struct *tsk, unsigned long src, char __user *dst
69803 break;
69804 return -EIO;
69805 }
69806 - if (copy_to_user(dst, buf, retval))
69807 + if (retval > sizeof(buf) || copy_to_user(dst, buf, retval))
69808 return -EFAULT;
69809 copied += retval;
69810 src += retval;
69811 @@ -671,7 +671,7 @@ int ptrace_request(struct task_struct *child, long request,
69812 bool seized = child->ptrace & PT_SEIZED;
69813 int ret = -EIO;
69814 siginfo_t siginfo, *si;
69815 - void __user *datavp = (void __user *) data;
69816 + void __user *datavp = (__force void __user *) data;
69817 unsigned long __user *datalp = datavp;
69818 unsigned long flags;
69819
69820 @@ -873,14 +873,21 @@ SYSCALL_DEFINE4(ptrace, long, request, long, pid, unsigned long, addr,
69821 goto out;
69822 }
69823
69824 + if (gr_handle_ptrace(child, request)) {
69825 + ret = -EPERM;
69826 + goto out_put_task_struct;
69827 + }
69828 +
69829 if (request == PTRACE_ATTACH || request == PTRACE_SEIZE) {
69830 ret = ptrace_attach(child, request, addr, data);
69831 /*
69832 * Some architectures need to do book-keeping after
69833 * a ptrace attach.
69834 */
69835 - if (!ret)
69836 + if (!ret) {
69837 arch_ptrace_attach(child);
69838 + gr_audit_ptrace(child);
69839 + }
69840 goto out_put_task_struct;
69841 }
69842
69843 @@ -906,7 +913,7 @@ int generic_ptrace_peekdata(struct task_struct *tsk, unsigned long addr,
69844 copied = access_process_vm(tsk, addr, &tmp, sizeof(tmp), 0);
69845 if (copied != sizeof(tmp))
69846 return -EIO;
69847 - return put_user(tmp, (unsigned long __user *)data);
69848 + return put_user(tmp, (__force unsigned long __user *)data);
69849 }
69850
69851 int generic_ptrace_pokedata(struct task_struct *tsk, unsigned long addr,
69852 @@ -1016,14 +1023,21 @@ asmlinkage long compat_sys_ptrace(compat_long_t request, compat_long_t pid,
69853 goto out;
69854 }
69855
69856 + if (gr_handle_ptrace(child, request)) {
69857 + ret = -EPERM;
69858 + goto out_put_task_struct;
69859 + }
69860 +
69861 if (request == PTRACE_ATTACH || request == PTRACE_SEIZE) {
69862 ret = ptrace_attach(child, request, addr, data);
69863 /*
69864 * Some architectures need to do book-keeping after
69865 * a ptrace attach.
69866 */
69867 - if (!ret)
69868 + if (!ret) {
69869 arch_ptrace_attach(child);
69870 + gr_audit_ptrace(child);
69871 + }
69872 goto out_put_task_struct;
69873 }
69874
69875 diff --git a/kernel/rcutiny.c b/kernel/rcutiny.c
69876 index 547b1fe..65e874e 100644
69877 --- a/kernel/rcutiny.c
69878 +++ b/kernel/rcutiny.c
69879 @@ -46,7 +46,7 @@
69880 struct rcu_ctrlblk;
69881 static void invoke_rcu_callbacks(void);
69882 static void __rcu_process_callbacks(struct rcu_ctrlblk *rcp);
69883 -static void rcu_process_callbacks(struct softirq_action *unused);
69884 +static void rcu_process_callbacks(void);
69885 static void __call_rcu(struct rcu_head *head,
69886 void (*func)(struct rcu_head *rcu),
69887 struct rcu_ctrlblk *rcp);
69888 @@ -307,7 +307,7 @@ static void __rcu_process_callbacks(struct rcu_ctrlblk *rcp)
69889 rcu_is_callbacks_kthread()));
69890 }
69891
69892 -static void rcu_process_callbacks(struct softirq_action *unused)
69893 +static void rcu_process_callbacks(void)
69894 {
69895 __rcu_process_callbacks(&rcu_sched_ctrlblk);
69896 __rcu_process_callbacks(&rcu_bh_ctrlblk);
69897 diff --git a/kernel/rcutiny_plugin.h b/kernel/rcutiny_plugin.h
69898 index 918fd1e..85089bb 100644
69899 --- a/kernel/rcutiny_plugin.h
69900 +++ b/kernel/rcutiny_plugin.h
69901 @@ -893,7 +893,7 @@ static int rcu_kthread(void *arg)
69902 have_rcu_kthread_work = morework;
69903 local_irq_restore(flags);
69904 if (work)
69905 - rcu_process_callbacks(NULL);
69906 + rcu_process_callbacks();
69907 schedule_timeout_interruptible(1); /* Leave CPU for others. */
69908 }
69909
69910 diff --git a/kernel/rcutorture.c b/kernel/rcutorture.c
69911 index 25b1503..1988a74 100644
69912 --- a/kernel/rcutorture.c
69913 +++ b/kernel/rcutorture.c
69914 @@ -162,12 +162,12 @@ static DEFINE_PER_CPU(long [RCU_TORTURE_PIPE_LEN + 1], rcu_torture_count) =
69915 { 0 };
69916 static DEFINE_PER_CPU(long [RCU_TORTURE_PIPE_LEN + 1], rcu_torture_batch) =
69917 { 0 };
69918 -static atomic_t rcu_torture_wcount[RCU_TORTURE_PIPE_LEN + 1];
69919 -static atomic_t n_rcu_torture_alloc;
69920 -static atomic_t n_rcu_torture_alloc_fail;
69921 -static atomic_t n_rcu_torture_free;
69922 -static atomic_t n_rcu_torture_mberror;
69923 -static atomic_t n_rcu_torture_error;
69924 +static atomic_unchecked_t rcu_torture_wcount[RCU_TORTURE_PIPE_LEN + 1];
69925 +static atomic_unchecked_t n_rcu_torture_alloc;
69926 +static atomic_unchecked_t n_rcu_torture_alloc_fail;
69927 +static atomic_unchecked_t n_rcu_torture_free;
69928 +static atomic_unchecked_t n_rcu_torture_mberror;
69929 +static atomic_unchecked_t n_rcu_torture_error;
69930 static long n_rcu_torture_barrier_error;
69931 static long n_rcu_torture_boost_ktrerror;
69932 static long n_rcu_torture_boost_rterror;
69933 @@ -265,11 +265,11 @@ rcu_torture_alloc(void)
69934
69935 spin_lock_bh(&rcu_torture_lock);
69936 if (list_empty(&rcu_torture_freelist)) {
69937 - atomic_inc(&n_rcu_torture_alloc_fail);
69938 + atomic_inc_unchecked(&n_rcu_torture_alloc_fail);
69939 spin_unlock_bh(&rcu_torture_lock);
69940 return NULL;
69941 }
69942 - atomic_inc(&n_rcu_torture_alloc);
69943 + atomic_inc_unchecked(&n_rcu_torture_alloc);
69944 p = rcu_torture_freelist.next;
69945 list_del_init(p);
69946 spin_unlock_bh(&rcu_torture_lock);
69947 @@ -282,7 +282,7 @@ rcu_torture_alloc(void)
69948 static void
69949 rcu_torture_free(struct rcu_torture *p)
69950 {
69951 - atomic_inc(&n_rcu_torture_free);
69952 + atomic_inc_unchecked(&n_rcu_torture_free);
69953 spin_lock_bh(&rcu_torture_lock);
69954 list_add_tail(&p->rtort_free, &rcu_torture_freelist);
69955 spin_unlock_bh(&rcu_torture_lock);
69956 @@ -403,7 +403,7 @@ rcu_torture_cb(struct rcu_head *p)
69957 i = rp->rtort_pipe_count;
69958 if (i > RCU_TORTURE_PIPE_LEN)
69959 i = RCU_TORTURE_PIPE_LEN;
69960 - atomic_inc(&rcu_torture_wcount[i]);
69961 + atomic_inc_unchecked(&rcu_torture_wcount[i]);
69962 if (++rp->rtort_pipe_count >= RCU_TORTURE_PIPE_LEN) {
69963 rp->rtort_mbtest = 0;
69964 rcu_torture_free(rp);
69965 @@ -452,7 +452,7 @@ static void rcu_sync_torture_deferred_free(struct rcu_torture *p)
69966 i = rp->rtort_pipe_count;
69967 if (i > RCU_TORTURE_PIPE_LEN)
69968 i = RCU_TORTURE_PIPE_LEN;
69969 - atomic_inc(&rcu_torture_wcount[i]);
69970 + atomic_inc_unchecked(&rcu_torture_wcount[i]);
69971 if (++rp->rtort_pipe_count >= RCU_TORTURE_PIPE_LEN) {
69972 rp->rtort_mbtest = 0;
69973 list_del(&rp->rtort_free);
69974 @@ -995,7 +995,7 @@ rcu_torture_writer(void *arg)
69975 i = old_rp->rtort_pipe_count;
69976 if (i > RCU_TORTURE_PIPE_LEN)
69977 i = RCU_TORTURE_PIPE_LEN;
69978 - atomic_inc(&rcu_torture_wcount[i]);
69979 + atomic_inc_unchecked(&rcu_torture_wcount[i]);
69980 old_rp->rtort_pipe_count++;
69981 cur_ops->deferred_free(old_rp);
69982 }
69983 @@ -1080,7 +1080,7 @@ static void rcu_torture_timer(unsigned long unused)
69984 }
69985 do_trace_rcu_torture_read(cur_ops->name, &p->rtort_rcu);
69986 if (p->rtort_mbtest == 0)
69987 - atomic_inc(&n_rcu_torture_mberror);
69988 + atomic_inc_unchecked(&n_rcu_torture_mberror);
69989 spin_lock(&rand_lock);
69990 cur_ops->read_delay(&rand);
69991 n_rcu_torture_timers++;
69992 @@ -1144,7 +1144,7 @@ rcu_torture_reader(void *arg)
69993 }
69994 do_trace_rcu_torture_read(cur_ops->name, &p->rtort_rcu);
69995 if (p->rtort_mbtest == 0)
69996 - atomic_inc(&n_rcu_torture_mberror);
69997 + atomic_inc_unchecked(&n_rcu_torture_mberror);
69998 cur_ops->read_delay(&rand);
69999 preempt_disable();
70000 pipe_count = p->rtort_pipe_count;
70001 @@ -1203,11 +1203,11 @@ rcu_torture_printk(char *page)
70002 rcu_torture_current,
70003 rcu_torture_current_version,
70004 list_empty(&rcu_torture_freelist),
70005 - atomic_read(&n_rcu_torture_alloc),
70006 - atomic_read(&n_rcu_torture_alloc_fail),
70007 - atomic_read(&n_rcu_torture_free));
70008 + atomic_read_unchecked(&n_rcu_torture_alloc),
70009 + atomic_read_unchecked(&n_rcu_torture_alloc_fail),
70010 + atomic_read_unchecked(&n_rcu_torture_free));
70011 cnt += sprintf(&page[cnt], "rtmbe: %d rtbke: %ld rtbre: %ld ",
70012 - atomic_read(&n_rcu_torture_mberror),
70013 + atomic_read_unchecked(&n_rcu_torture_mberror),
70014 n_rcu_torture_boost_ktrerror,
70015 n_rcu_torture_boost_rterror);
70016 cnt += sprintf(&page[cnt], "rtbf: %ld rtb: %ld nt: %ld ",
70017 @@ -1224,14 +1224,14 @@ rcu_torture_printk(char *page)
70018 n_barrier_attempts,
70019 n_rcu_torture_barrier_error);
70020 cnt += sprintf(&page[cnt], "\n%s%s ", torture_type, TORTURE_FLAG);
70021 - if (atomic_read(&n_rcu_torture_mberror) != 0 ||
70022 + if (atomic_read_unchecked(&n_rcu_torture_mberror) != 0 ||
70023 n_rcu_torture_barrier_error != 0 ||
70024 n_rcu_torture_boost_ktrerror != 0 ||
70025 n_rcu_torture_boost_rterror != 0 ||
70026 n_rcu_torture_boost_failure != 0 ||
70027 i > 1) {
70028 cnt += sprintf(&page[cnt], "!!! ");
70029 - atomic_inc(&n_rcu_torture_error);
70030 + atomic_inc_unchecked(&n_rcu_torture_error);
70031 WARN_ON_ONCE(1);
70032 }
70033 cnt += sprintf(&page[cnt], "Reader Pipe: ");
70034 @@ -1245,7 +1245,7 @@ rcu_torture_printk(char *page)
70035 cnt += sprintf(&page[cnt], "Free-Block Circulation: ");
70036 for (i = 0; i < RCU_TORTURE_PIPE_LEN + 1; i++) {
70037 cnt += sprintf(&page[cnt], " %d",
70038 - atomic_read(&rcu_torture_wcount[i]));
70039 + atomic_read_unchecked(&rcu_torture_wcount[i]));
70040 }
70041 cnt += sprintf(&page[cnt], "\n");
70042 if (cur_ops->stats)
70043 @@ -1905,7 +1905,7 @@ rcu_torture_cleanup(void)
70044
70045 if (cur_ops->cleanup)
70046 cur_ops->cleanup();
70047 - if (atomic_read(&n_rcu_torture_error) || n_rcu_torture_barrier_error)
70048 + if (atomic_read_unchecked(&n_rcu_torture_error) || n_rcu_torture_barrier_error)
70049 rcu_torture_print_module_parms(cur_ops, "End of test: FAILURE");
70050 else if (n_online_successes != n_online_attempts ||
70051 n_offline_successes != n_offline_attempts)
70052 @@ -1974,18 +1974,18 @@ rcu_torture_init(void)
70053
70054 rcu_torture_current = NULL;
70055 rcu_torture_current_version = 0;
70056 - atomic_set(&n_rcu_torture_alloc, 0);
70057 - atomic_set(&n_rcu_torture_alloc_fail, 0);
70058 - atomic_set(&n_rcu_torture_free, 0);
70059 - atomic_set(&n_rcu_torture_mberror, 0);
70060 - atomic_set(&n_rcu_torture_error, 0);
70061 + atomic_set_unchecked(&n_rcu_torture_alloc, 0);
70062 + atomic_set_unchecked(&n_rcu_torture_alloc_fail, 0);
70063 + atomic_set_unchecked(&n_rcu_torture_free, 0);
70064 + atomic_set_unchecked(&n_rcu_torture_mberror, 0);
70065 + atomic_set_unchecked(&n_rcu_torture_error, 0);
70066 n_rcu_torture_barrier_error = 0;
70067 n_rcu_torture_boost_ktrerror = 0;
70068 n_rcu_torture_boost_rterror = 0;
70069 n_rcu_torture_boost_failure = 0;
70070 n_rcu_torture_boosts = 0;
70071 for (i = 0; i < RCU_TORTURE_PIPE_LEN + 1; i++)
70072 - atomic_set(&rcu_torture_wcount[i], 0);
70073 + atomic_set_unchecked(&rcu_torture_wcount[i], 0);
70074 for_each_possible_cpu(cpu) {
70075 for (i = 0; i < RCU_TORTURE_PIPE_LEN + 1; i++) {
70076 per_cpu(rcu_torture_count, cpu)[i] = 0;
70077 diff --git a/kernel/rcutree.c b/kernel/rcutree.c
70078 index f7bcd9e..8973e14 100644
70079 --- a/kernel/rcutree.c
70080 +++ b/kernel/rcutree.c
70081 @@ -369,9 +369,9 @@ static void rcu_idle_enter_common(struct rcu_dynticks *rdtp, long long oldval)
70082 rcu_prepare_for_idle(smp_processor_id());
70083 /* CPUs seeing atomic_inc() must see prior RCU read-side crit sects */
70084 smp_mb__before_atomic_inc(); /* See above. */
70085 - atomic_inc(&rdtp->dynticks);
70086 + atomic_inc_unchecked(&rdtp->dynticks);
70087 smp_mb__after_atomic_inc(); /* Force ordering with next sojourn. */
70088 - WARN_ON_ONCE(atomic_read(&rdtp->dynticks) & 0x1);
70089 + WARN_ON_ONCE(atomic_read_unchecked(&rdtp->dynticks) & 0x1);
70090
70091 /*
70092 * The idle task is not permitted to enter the idle loop while
70093 @@ -460,10 +460,10 @@ void rcu_irq_exit(void)
70094 static void rcu_idle_exit_common(struct rcu_dynticks *rdtp, long long oldval)
70095 {
70096 smp_mb__before_atomic_inc(); /* Force ordering w/previous sojourn. */
70097 - atomic_inc(&rdtp->dynticks);
70098 + atomic_inc_unchecked(&rdtp->dynticks);
70099 /* CPUs seeing atomic_inc() must see later RCU read-side crit sects */
70100 smp_mb__after_atomic_inc(); /* See above. */
70101 - WARN_ON_ONCE(!(atomic_read(&rdtp->dynticks) & 0x1));
70102 + WARN_ON_ONCE(!(atomic_read_unchecked(&rdtp->dynticks) & 0x1));
70103 rcu_cleanup_after_idle(smp_processor_id());
70104 trace_rcu_dyntick("End", oldval, rdtp->dynticks_nesting);
70105 if (!is_idle_task(current)) {
70106 @@ -557,14 +557,14 @@ void rcu_nmi_enter(void)
70107 struct rcu_dynticks *rdtp = &__get_cpu_var(rcu_dynticks);
70108
70109 if (rdtp->dynticks_nmi_nesting == 0 &&
70110 - (atomic_read(&rdtp->dynticks) & 0x1))
70111 + (atomic_read_unchecked(&rdtp->dynticks) & 0x1))
70112 return;
70113 rdtp->dynticks_nmi_nesting++;
70114 smp_mb__before_atomic_inc(); /* Force delay from prior write. */
70115 - atomic_inc(&rdtp->dynticks);
70116 + atomic_inc_unchecked(&rdtp->dynticks);
70117 /* CPUs seeing atomic_inc() must see later RCU read-side crit sects */
70118 smp_mb__after_atomic_inc(); /* See above. */
70119 - WARN_ON_ONCE(!(atomic_read(&rdtp->dynticks) & 0x1));
70120 + WARN_ON_ONCE(!(atomic_read_unchecked(&rdtp->dynticks) & 0x1));
70121 }
70122
70123 /**
70124 @@ -583,9 +583,9 @@ void rcu_nmi_exit(void)
70125 return;
70126 /* CPUs seeing atomic_inc() must see prior RCU read-side crit sects */
70127 smp_mb__before_atomic_inc(); /* See above. */
70128 - atomic_inc(&rdtp->dynticks);
70129 + atomic_inc_unchecked(&rdtp->dynticks);
70130 smp_mb__after_atomic_inc(); /* Force delay to next write. */
70131 - WARN_ON_ONCE(atomic_read(&rdtp->dynticks) & 0x1);
70132 + WARN_ON_ONCE(atomic_read_unchecked(&rdtp->dynticks) & 0x1);
70133 }
70134
70135 /**
70136 @@ -599,7 +599,7 @@ int rcu_is_cpu_idle(void)
70137 int ret;
70138
70139 preempt_disable();
70140 - ret = (atomic_read(&__get_cpu_var(rcu_dynticks).dynticks) & 0x1) == 0;
70141 + ret = (atomic_read_unchecked(&__get_cpu_var(rcu_dynticks).dynticks) & 0x1) == 0;
70142 preempt_enable();
70143 return ret;
70144 }
70145 @@ -667,7 +667,7 @@ int rcu_is_cpu_rrupt_from_idle(void)
70146 */
70147 static int dyntick_save_progress_counter(struct rcu_data *rdp)
70148 {
70149 - rdp->dynticks_snap = atomic_add_return(0, &rdp->dynticks->dynticks);
70150 + rdp->dynticks_snap = atomic_add_return_unchecked(0, &rdp->dynticks->dynticks);
70151 return (rdp->dynticks_snap & 0x1) == 0;
70152 }
70153
70154 @@ -682,7 +682,7 @@ static int rcu_implicit_dynticks_qs(struct rcu_data *rdp)
70155 unsigned int curr;
70156 unsigned int snap;
70157
70158 - curr = (unsigned int)atomic_add_return(0, &rdp->dynticks->dynticks);
70159 + curr = (unsigned int)atomic_add_return_unchecked(0, &rdp->dynticks->dynticks);
70160 snap = (unsigned int)rdp->dynticks_snap;
70161
70162 /*
70163 @@ -712,10 +712,10 @@ static int jiffies_till_stall_check(void)
70164 * for CONFIG_RCU_CPU_STALL_TIMEOUT.
70165 */
70166 if (till_stall_check < 3) {
70167 - ACCESS_ONCE(rcu_cpu_stall_timeout) = 3;
70168 + ACCESS_ONCE_RW(rcu_cpu_stall_timeout) = 3;
70169 till_stall_check = 3;
70170 } else if (till_stall_check > 300) {
70171 - ACCESS_ONCE(rcu_cpu_stall_timeout) = 300;
70172 + ACCESS_ONCE_RW(rcu_cpu_stall_timeout) = 300;
70173 till_stall_check = 300;
70174 }
70175 return till_stall_check * HZ + RCU_STALL_DELAY_DELTA;
70176 @@ -1351,7 +1351,7 @@ rcu_send_cbs_to_orphanage(int cpu, struct rcu_state *rsp,
70177 rsp->qlen += rdp->qlen;
70178 rdp->n_cbs_orphaned += rdp->qlen;
70179 rdp->qlen_lazy = 0;
70180 - ACCESS_ONCE(rdp->qlen) = 0;
70181 + ACCESS_ONCE_RW(rdp->qlen) = 0;
70182 }
70183
70184 /*
70185 @@ -1604,7 +1604,7 @@ static void rcu_do_batch(struct rcu_state *rsp, struct rcu_data *rdp)
70186 }
70187 smp_mb(); /* List handling before counting for rcu_barrier(). */
70188 rdp->qlen_lazy -= count_lazy;
70189 - ACCESS_ONCE(rdp->qlen) -= count;
70190 + ACCESS_ONCE_RW(rdp->qlen) -= count;
70191 rdp->n_cbs_invoked += count;
70192
70193 /* Reinstate batch limit if we have worked down the excess. */
70194 @@ -1836,7 +1836,7 @@ __rcu_process_callbacks(struct rcu_state *rsp)
70195 /*
70196 * Do RCU core processing for the current CPU.
70197 */
70198 -static void rcu_process_callbacks(struct softirq_action *unused)
70199 +static void rcu_process_callbacks(void)
70200 {
70201 struct rcu_state *rsp;
70202
70203 @@ -1943,7 +1943,7 @@ __call_rcu(struct rcu_head *head, void (*func)(struct rcu_head *rcu),
70204 rdp = this_cpu_ptr(rsp->rda);
70205
70206 /* Add the callback to our list. */
70207 - ACCESS_ONCE(rdp->qlen)++;
70208 + ACCESS_ONCE_RW(rdp->qlen)++;
70209 if (lazy)
70210 rdp->qlen_lazy++;
70211 else
70212 @@ -2057,8 +2057,8 @@ void synchronize_rcu_bh(void)
70213 }
70214 EXPORT_SYMBOL_GPL(synchronize_rcu_bh);
70215
70216 -static atomic_t sync_sched_expedited_started = ATOMIC_INIT(0);
70217 -static atomic_t sync_sched_expedited_done = ATOMIC_INIT(0);
70218 +static atomic_unchecked_t sync_sched_expedited_started = ATOMIC_INIT(0);
70219 +static atomic_unchecked_t sync_sched_expedited_done = ATOMIC_INIT(0);
70220
70221 static int synchronize_sched_expedited_cpu_stop(void *data)
70222 {
70223 @@ -2119,7 +2119,7 @@ void synchronize_sched_expedited(void)
70224 int firstsnap, s, snap, trycount = 0;
70225
70226 /* Note that atomic_inc_return() implies full memory barrier. */
70227 - firstsnap = snap = atomic_inc_return(&sync_sched_expedited_started);
70228 + firstsnap = snap = atomic_inc_return_unchecked(&sync_sched_expedited_started);
70229 get_online_cpus();
70230 WARN_ON_ONCE(cpu_is_offline(raw_smp_processor_id()));
70231
70232 @@ -2141,7 +2141,7 @@ void synchronize_sched_expedited(void)
70233 }
70234
70235 /* Check to see if someone else did our work for us. */
70236 - s = atomic_read(&sync_sched_expedited_done);
70237 + s = atomic_read_unchecked(&sync_sched_expedited_done);
70238 if (UINT_CMP_GE((unsigned)s, (unsigned)firstsnap)) {
70239 smp_mb(); /* ensure test happens before caller kfree */
70240 return;
70241 @@ -2156,7 +2156,7 @@ void synchronize_sched_expedited(void)
70242 * grace period works for us.
70243 */
70244 get_online_cpus();
70245 - snap = atomic_read(&sync_sched_expedited_started);
70246 + snap = atomic_read_unchecked(&sync_sched_expedited_started);
70247 smp_mb(); /* ensure read is before try_stop_cpus(). */
70248 }
70249
70250 @@ -2167,12 +2167,12 @@ void synchronize_sched_expedited(void)
70251 * than we did beat us to the punch.
70252 */
70253 do {
70254 - s = atomic_read(&sync_sched_expedited_done);
70255 + s = atomic_read_unchecked(&sync_sched_expedited_done);
70256 if (UINT_CMP_GE((unsigned)s, (unsigned)snap)) {
70257 smp_mb(); /* ensure test happens before caller kfree */
70258 break;
70259 }
70260 - } while (atomic_cmpxchg(&sync_sched_expedited_done, s, snap) != s);
70261 + } while (atomic_cmpxchg_unchecked(&sync_sched_expedited_done, s, snap) != s);
70262
70263 put_online_cpus();
70264 }
70265 @@ -2366,7 +2366,7 @@ static void _rcu_barrier(struct rcu_state *rsp)
70266 * ACCESS_ONCE() to prevent the compiler from speculating
70267 * the increment to precede the early-exit check.
70268 */
70269 - ACCESS_ONCE(rsp->n_barrier_done)++;
70270 + ACCESS_ONCE_RW(rsp->n_barrier_done)++;
70271 WARN_ON_ONCE((rsp->n_barrier_done & 0x1) != 1);
70272 _rcu_barrier_trace(rsp, "Inc1", -1, rsp->n_barrier_done);
70273 smp_mb(); /* Order ->n_barrier_done increment with below mechanism. */
70274 @@ -2448,7 +2448,7 @@ static void _rcu_barrier(struct rcu_state *rsp)
70275
70276 /* Increment ->n_barrier_done to prevent duplicate work. */
70277 smp_mb(); /* Keep increment after above mechanism. */
70278 - ACCESS_ONCE(rsp->n_barrier_done)++;
70279 + ACCESS_ONCE_RW(rsp->n_barrier_done)++;
70280 WARN_ON_ONCE((rsp->n_barrier_done & 0x1) != 0);
70281 _rcu_barrier_trace(rsp, "Inc2", -1, rsp->n_barrier_done);
70282 smp_mb(); /* Keep increment before caller's subsequent code. */
70283 @@ -2495,10 +2495,10 @@ rcu_boot_init_percpu_data(int cpu, struct rcu_state *rsp)
70284 rdp->grpmask = 1UL << (cpu - rdp->mynode->grplo);
70285 init_callback_list(rdp);
70286 rdp->qlen_lazy = 0;
70287 - ACCESS_ONCE(rdp->qlen) = 0;
70288 + ACCESS_ONCE_RW(rdp->qlen) = 0;
70289 rdp->dynticks = &per_cpu(rcu_dynticks, cpu);
70290 WARN_ON_ONCE(rdp->dynticks->dynticks_nesting != DYNTICK_TASK_EXIT_IDLE);
70291 - WARN_ON_ONCE(atomic_read(&rdp->dynticks->dynticks) != 1);
70292 + WARN_ON_ONCE(atomic_read_unchecked(&rdp->dynticks->dynticks) != 1);
70293 rdp->cpu = cpu;
70294 rdp->rsp = rsp;
70295 raw_spin_unlock_irqrestore(&rnp->lock, flags);
70296 @@ -2526,8 +2526,8 @@ rcu_init_percpu_data(int cpu, struct rcu_state *rsp, int preemptible)
70297 rdp->n_force_qs_snap = rsp->n_force_qs;
70298 rdp->blimit = blimit;
70299 rdp->dynticks->dynticks_nesting = DYNTICK_TASK_EXIT_IDLE;
70300 - atomic_set(&rdp->dynticks->dynticks,
70301 - (atomic_read(&rdp->dynticks->dynticks) & ~0x1) + 1);
70302 + atomic_set_unchecked(&rdp->dynticks->dynticks,
70303 + (atomic_read_unchecked(&rdp->dynticks->dynticks) & ~0x1) + 1);
70304 rcu_prepare_for_idle_init(cpu);
70305 raw_spin_unlock(&rnp->lock); /* irqs remain disabled. */
70306
70307 diff --git a/kernel/rcutree.h b/kernel/rcutree.h
70308 index 4d29169..d104a3c 100644
70309 --- a/kernel/rcutree.h
70310 +++ b/kernel/rcutree.h
70311 @@ -86,7 +86,7 @@ struct rcu_dynticks {
70312 long long dynticks_nesting; /* Track irq/process nesting level. */
70313 /* Process level is worth LLONG_MAX/2. */
70314 int dynticks_nmi_nesting; /* Track NMI nesting level. */
70315 - atomic_t dynticks; /* Even value for idle, else odd. */
70316 + atomic_unchecked_t dynticks;/* Even value for idle, else odd. */
70317 #ifdef CONFIG_RCU_FAST_NO_HZ
70318 int dyntick_drain; /* Prepare-for-idle state variable. */
70319 unsigned long dyntick_holdoff;
70320 diff --git a/kernel/rcutree_plugin.h b/kernel/rcutree_plugin.h
70321 index 7f3244c..417d606 100644
70322 --- a/kernel/rcutree_plugin.h
70323 +++ b/kernel/rcutree_plugin.h
70324 @@ -843,7 +843,7 @@ void synchronize_rcu_expedited(void)
70325
70326 /* Clean up and exit. */
70327 smp_mb(); /* ensure expedited GP seen before counter increment. */
70328 - ACCESS_ONCE(sync_rcu_preempt_exp_count)++;
70329 + ACCESS_ONCE_RW(sync_rcu_preempt_exp_count)++;
70330 unlock_mb_ret:
70331 mutex_unlock(&sync_rcu_preempt_exp_mutex);
70332 mb_ret:
70333 diff --git a/kernel/rcutree_trace.c b/kernel/rcutree_trace.c
70334 index abffb48..cbfa6d3 100644
70335 --- a/kernel/rcutree_trace.c
70336 +++ b/kernel/rcutree_trace.c
70337 @@ -93,7 +93,7 @@ static void print_one_rcu_data(struct seq_file *m, struct rcu_data *rdp)
70338 rdp->passed_quiesce, rdp->passed_quiesce_gpnum,
70339 rdp->qs_pending);
70340 seq_printf(m, " dt=%d/%llx/%d df=%lu",
70341 - atomic_read(&rdp->dynticks->dynticks),
70342 + atomic_read_unchecked(&rdp->dynticks->dynticks),
70343 rdp->dynticks->dynticks_nesting,
70344 rdp->dynticks->dynticks_nmi_nesting,
70345 rdp->dynticks_fqs);
70346 @@ -157,7 +157,7 @@ static void print_one_rcu_data_csv(struct seq_file *m, struct rcu_data *rdp)
70347 rdp->passed_quiesce, rdp->passed_quiesce_gpnum,
70348 rdp->qs_pending);
70349 seq_printf(m, ",%d,%llx,%d,%lu",
70350 - atomic_read(&rdp->dynticks->dynticks),
70351 + atomic_read_unchecked(&rdp->dynticks->dynticks),
70352 rdp->dynticks->dynticks_nesting,
70353 rdp->dynticks->dynticks_nmi_nesting,
70354 rdp->dynticks_fqs);
70355 diff --git a/kernel/resource.c b/kernel/resource.c
70356 index 34d4588..10baa6a 100644
70357 --- a/kernel/resource.c
70358 +++ b/kernel/resource.c
70359 @@ -143,8 +143,18 @@ static const struct file_operations proc_iomem_operations = {
70360
70361 static int __init ioresources_init(void)
70362 {
70363 +#ifdef CONFIG_GRKERNSEC_PROC_ADD
70364 +#ifdef CONFIG_GRKERNSEC_PROC_USER
70365 + proc_create("ioports", S_IRUSR, NULL, &proc_ioports_operations);
70366 + proc_create("iomem", S_IRUSR, NULL, &proc_iomem_operations);
70367 +#elif defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
70368 + proc_create("ioports", S_IRUSR | S_IRGRP, NULL, &proc_ioports_operations);
70369 + proc_create("iomem", S_IRUSR | S_IRGRP, NULL, &proc_iomem_operations);
70370 +#endif
70371 +#else
70372 proc_create("ioports", 0, NULL, &proc_ioports_operations);
70373 proc_create("iomem", 0, NULL, &proc_iomem_operations);
70374 +#endif
70375 return 0;
70376 }
70377 __initcall(ioresources_init);
70378 diff --git a/kernel/rtmutex-tester.c b/kernel/rtmutex-tester.c
70379 index 98ec494..4241d6d 100644
70380 --- a/kernel/rtmutex-tester.c
70381 +++ b/kernel/rtmutex-tester.c
70382 @@ -20,7 +20,7 @@
70383 #define MAX_RT_TEST_MUTEXES 8
70384
70385 static spinlock_t rttest_lock;
70386 -static atomic_t rttest_event;
70387 +static atomic_unchecked_t rttest_event;
70388
70389 struct test_thread_data {
70390 int opcode;
70391 @@ -61,7 +61,7 @@ static int handle_op(struct test_thread_data *td, int lockwakeup)
70392
70393 case RTTEST_LOCKCONT:
70394 td->mutexes[td->opdata] = 1;
70395 - td->event = atomic_add_return(1, &rttest_event);
70396 + td->event = atomic_add_return_unchecked(1, &rttest_event);
70397 return 0;
70398
70399 case RTTEST_RESET:
70400 @@ -74,7 +74,7 @@ static int handle_op(struct test_thread_data *td, int lockwakeup)
70401 return 0;
70402
70403 case RTTEST_RESETEVENT:
70404 - atomic_set(&rttest_event, 0);
70405 + atomic_set_unchecked(&rttest_event, 0);
70406 return 0;
70407
70408 default:
70409 @@ -91,9 +91,9 @@ static int handle_op(struct test_thread_data *td, int lockwakeup)
70410 return ret;
70411
70412 td->mutexes[id] = 1;
70413 - td->event = atomic_add_return(1, &rttest_event);
70414 + td->event = atomic_add_return_unchecked(1, &rttest_event);
70415 rt_mutex_lock(&mutexes[id]);
70416 - td->event = atomic_add_return(1, &rttest_event);
70417 + td->event = atomic_add_return_unchecked(1, &rttest_event);
70418 td->mutexes[id] = 4;
70419 return 0;
70420
70421 @@ -104,9 +104,9 @@ static int handle_op(struct test_thread_data *td, int lockwakeup)
70422 return ret;
70423
70424 td->mutexes[id] = 1;
70425 - td->event = atomic_add_return(1, &rttest_event);
70426 + td->event = atomic_add_return_unchecked(1, &rttest_event);
70427 ret = rt_mutex_lock_interruptible(&mutexes[id], 0);
70428 - td->event = atomic_add_return(1, &rttest_event);
70429 + td->event = atomic_add_return_unchecked(1, &rttest_event);
70430 td->mutexes[id] = ret ? 0 : 4;
70431 return ret ? -EINTR : 0;
70432
70433 @@ -115,9 +115,9 @@ static int handle_op(struct test_thread_data *td, int lockwakeup)
70434 if (id < 0 || id >= MAX_RT_TEST_MUTEXES || td->mutexes[id] != 4)
70435 return ret;
70436
70437 - td->event = atomic_add_return(1, &rttest_event);
70438 + td->event = atomic_add_return_unchecked(1, &rttest_event);
70439 rt_mutex_unlock(&mutexes[id]);
70440 - td->event = atomic_add_return(1, &rttest_event);
70441 + td->event = atomic_add_return_unchecked(1, &rttest_event);
70442 td->mutexes[id] = 0;
70443 return 0;
70444
70445 @@ -164,7 +164,7 @@ void schedule_rt_mutex_test(struct rt_mutex *mutex)
70446 break;
70447
70448 td->mutexes[dat] = 2;
70449 - td->event = atomic_add_return(1, &rttest_event);
70450 + td->event = atomic_add_return_unchecked(1, &rttest_event);
70451 break;
70452
70453 default:
70454 @@ -184,7 +184,7 @@ void schedule_rt_mutex_test(struct rt_mutex *mutex)
70455 return;
70456
70457 td->mutexes[dat] = 3;
70458 - td->event = atomic_add_return(1, &rttest_event);
70459 + td->event = atomic_add_return_unchecked(1, &rttest_event);
70460 break;
70461
70462 case RTTEST_LOCKNOWAIT:
70463 @@ -196,7 +196,7 @@ void schedule_rt_mutex_test(struct rt_mutex *mutex)
70464 return;
70465
70466 td->mutexes[dat] = 1;
70467 - td->event = atomic_add_return(1, &rttest_event);
70468 + td->event = atomic_add_return_unchecked(1, &rttest_event);
70469 return;
70470
70471 default:
70472 diff --git a/kernel/sched/auto_group.c b/kernel/sched/auto_group.c
70473 index 0984a21..939f183 100644
70474 --- a/kernel/sched/auto_group.c
70475 +++ b/kernel/sched/auto_group.c
70476 @@ -11,7 +11,7 @@
70477
70478 unsigned int __read_mostly sysctl_sched_autogroup_enabled = 1;
70479 static struct autogroup autogroup_default;
70480 -static atomic_t autogroup_seq_nr;
70481 +static atomic_unchecked_t autogroup_seq_nr;
70482
70483 void __init autogroup_init(struct task_struct *init_task)
70484 {
70485 @@ -78,7 +78,7 @@ static inline struct autogroup *autogroup_create(void)
70486
70487 kref_init(&ag->kref);
70488 init_rwsem(&ag->lock);
70489 - ag->id = atomic_inc_return(&autogroup_seq_nr);
70490 + ag->id = atomic_inc_return_unchecked(&autogroup_seq_nr);
70491 ag->tg = tg;
70492 #ifdef CONFIG_RT_GROUP_SCHED
70493 /*
70494 diff --git a/kernel/sched/core.c b/kernel/sched/core.c
70495 index 1a48cdb..d3949ff 100644
70496 --- a/kernel/sched/core.c
70497 +++ b/kernel/sched/core.c
70498 @@ -4103,6 +4103,8 @@ int can_nice(const struct task_struct *p, const int nice)
70499 /* convert nice value [19,-20] to rlimit style value [1,40] */
70500 int nice_rlim = 20 - nice;
70501
70502 + gr_learn_resource(p, RLIMIT_NICE, nice_rlim, 1);
70503 +
70504 return (nice_rlim <= task_rlimit(p, RLIMIT_NICE) ||
70505 capable(CAP_SYS_NICE));
70506 }
70507 @@ -4136,7 +4138,8 @@ SYSCALL_DEFINE1(nice, int, increment)
70508 if (nice > 19)
70509 nice = 19;
70510
70511 - if (increment < 0 && !can_nice(current, nice))
70512 + if (increment < 0 && (!can_nice(current, nice) ||
70513 + gr_handle_chroot_nice()))
70514 return -EPERM;
70515
70516 retval = security_task_setnice(current, nice);
70517 @@ -4290,6 +4293,7 @@ recheck:
70518 unsigned long rlim_rtprio =
70519 task_rlimit(p, RLIMIT_RTPRIO);
70520
70521 + gr_learn_resource(p, RLIMIT_RTPRIO, param->sched_priority, 1);
70522 /* can't set/change the rt policy */
70523 if (policy != p->policy && !rlim_rtprio)
70524 return -EPERM;
70525 diff --git a/kernel/sched/fair.c b/kernel/sched/fair.c
70526 index 96e2b18..bb31eec 100644
70527 --- a/kernel/sched/fair.c
70528 +++ b/kernel/sched/fair.c
70529 @@ -4923,7 +4923,7 @@ static void nohz_idle_balance(int this_cpu, enum cpu_idle_type idle) { }
70530 * run_rebalance_domains is triggered when needed from the scheduler tick.
70531 * Also triggered for nohz idle balancing (with nohz_balancing_kick set).
70532 */
70533 -static void run_rebalance_domains(struct softirq_action *h)
70534 +static void run_rebalance_domains(void)
70535 {
70536 int this_cpu = smp_processor_id();
70537 struct rq *this_rq = cpu_rq(this_cpu);
70538 diff --git a/kernel/signal.c b/kernel/signal.c
70539 index be4f856..453401c 100644
70540 --- a/kernel/signal.c
70541 +++ b/kernel/signal.c
70542 @@ -48,12 +48,12 @@ static struct kmem_cache *sigqueue_cachep;
70543
70544 int print_fatal_signals __read_mostly;
70545
70546 -static void __user *sig_handler(struct task_struct *t, int sig)
70547 +static __sighandler_t sig_handler(struct task_struct *t, int sig)
70548 {
70549 return t->sighand->action[sig - 1].sa.sa_handler;
70550 }
70551
70552 -static int sig_handler_ignored(void __user *handler, int sig)
70553 +static int sig_handler_ignored(__sighandler_t handler, int sig)
70554 {
70555 /* Is it explicitly or implicitly ignored? */
70556 return handler == SIG_IGN ||
70557 @@ -62,7 +62,7 @@ static int sig_handler_ignored(void __user *handler, int sig)
70558
70559 static int sig_task_ignored(struct task_struct *t, int sig, bool force)
70560 {
70561 - void __user *handler;
70562 + __sighandler_t handler;
70563
70564 handler = sig_handler(t, sig);
70565
70566 @@ -366,6 +366,9 @@ __sigqueue_alloc(int sig, struct task_struct *t, gfp_t flags, int override_rlimi
70567 atomic_inc(&user->sigpending);
70568 rcu_read_unlock();
70569
70570 + if (!override_rlimit)
70571 + gr_learn_resource(t, RLIMIT_SIGPENDING, atomic_read(&user->sigpending), 1);
70572 +
70573 if (override_rlimit ||
70574 atomic_read(&user->sigpending) <=
70575 task_rlimit(t, RLIMIT_SIGPENDING)) {
70576 @@ -490,7 +493,7 @@ flush_signal_handlers(struct task_struct *t, int force_default)
70577
70578 int unhandled_signal(struct task_struct *tsk, int sig)
70579 {
70580 - void __user *handler = tsk->sighand->action[sig-1].sa.sa_handler;
70581 + __sighandler_t handler = tsk->sighand->action[sig-1].sa.sa_handler;
70582 if (is_global_init(tsk))
70583 return 1;
70584 if (handler != SIG_IGN && handler != SIG_DFL)
70585 @@ -816,6 +819,13 @@ static int check_kill_permission(int sig, struct siginfo *info,
70586 }
70587 }
70588
70589 + /* allow glibc communication via tgkill to other threads in our
70590 + thread group */
70591 + if ((info == SEND_SIG_NOINFO || info->si_code != SI_TKILL ||
70592 + sig != (SIGRTMIN+1) || task_tgid_vnr(t) != info->si_pid)
70593 + && gr_handle_signal(t, sig))
70594 + return -EPERM;
70595 +
70596 return security_task_kill(t, info, sig, 0);
70597 }
70598
70599 @@ -1197,7 +1207,7 @@ __group_send_sig_info(int sig, struct siginfo *info, struct task_struct *p)
70600 return send_signal(sig, info, p, 1);
70601 }
70602
70603 -static int
70604 +int
70605 specific_send_sig_info(int sig, struct siginfo *info, struct task_struct *t)
70606 {
70607 return send_signal(sig, info, t, 0);
70608 @@ -1234,6 +1244,7 @@ force_sig_info(int sig, struct siginfo *info, struct task_struct *t)
70609 unsigned long int flags;
70610 int ret, blocked, ignored;
70611 struct k_sigaction *action;
70612 + int is_unhandled = 0;
70613
70614 spin_lock_irqsave(&t->sighand->siglock, flags);
70615 action = &t->sighand->action[sig-1];
70616 @@ -1248,9 +1259,18 @@ force_sig_info(int sig, struct siginfo *info, struct task_struct *t)
70617 }
70618 if (action->sa.sa_handler == SIG_DFL)
70619 t->signal->flags &= ~SIGNAL_UNKILLABLE;
70620 + if (action->sa.sa_handler == SIG_IGN || action->sa.sa_handler == SIG_DFL)
70621 + is_unhandled = 1;
70622 ret = specific_send_sig_info(sig, info, t);
70623 spin_unlock_irqrestore(&t->sighand->siglock, flags);
70624
70625 + /* only deal with unhandled signals, java etc trigger SIGSEGV during
70626 + normal operation */
70627 + if (is_unhandled) {
70628 + gr_log_signal(sig, !is_si_special(info) ? info->si_addr : NULL, t);
70629 + gr_handle_crash(t, sig);
70630 + }
70631 +
70632 return ret;
70633 }
70634
70635 @@ -1317,8 +1337,11 @@ int group_send_sig_info(int sig, struct siginfo *info, struct task_struct *p)
70636 ret = check_kill_permission(sig, info, p);
70637 rcu_read_unlock();
70638
70639 - if (!ret && sig)
70640 + if (!ret && sig) {
70641 ret = do_send_sig_info(sig, info, p, true);
70642 + if (!ret)
70643 + gr_log_signal(sig, !is_si_special(info) ? info->si_addr : NULL, p);
70644 + }
70645
70646 return ret;
70647 }
70648 @@ -2873,7 +2896,15 @@ do_send_specific(pid_t tgid, pid_t pid, int sig, struct siginfo *info)
70649 int error = -ESRCH;
70650
70651 rcu_read_lock();
70652 - p = find_task_by_vpid(pid);
70653 +#ifdef CONFIG_GRKERNSEC_CHROOT_FINDTASK
70654 + /* allow glibc communication via tgkill to other threads in our
70655 + thread group */
70656 + if (grsec_enable_chroot_findtask && info->si_code == SI_TKILL &&
70657 + sig == (SIGRTMIN+1) && tgid == info->si_pid)
70658 + p = find_task_by_vpid_unrestricted(pid);
70659 + else
70660 +#endif
70661 + p = find_task_by_vpid(pid);
70662 if (p && (tgid <= 0 || task_tgid_vnr(p) == tgid)) {
70663 error = check_kill_permission(sig, info, p);
70664 /*
70665 diff --git a/kernel/softirq.c b/kernel/softirq.c
70666 index b73e681..645ab62 100644
70667 --- a/kernel/softirq.c
70668 +++ b/kernel/softirq.c
70669 @@ -56,7 +56,7 @@ static struct softirq_action softirq_vec[NR_SOFTIRQS] __cacheline_aligned_in_smp
70670
70671 DEFINE_PER_CPU(struct task_struct *, ksoftirqd);
70672
70673 -char *softirq_to_name[NR_SOFTIRQS] = {
70674 +const char * const softirq_to_name[NR_SOFTIRQS] = {
70675 "HI", "TIMER", "NET_TX", "NET_RX", "BLOCK", "BLOCK_IOPOLL",
70676 "TASKLET", "SCHED", "HRTIMER", "RCU"
70677 };
70678 @@ -243,7 +243,7 @@ restart:
70679 kstat_incr_softirqs_this_cpu(vec_nr);
70680
70681 trace_softirq_entry(vec_nr);
70682 - h->action(h);
70683 + h->action();
70684 trace_softirq_exit(vec_nr);
70685 if (unlikely(prev_count != preempt_count())) {
70686 printk(KERN_ERR "huh, entered softirq %u %s %p"
70687 @@ -390,9 +390,11 @@ void __raise_softirq_irqoff(unsigned int nr)
70688 or_softirq_pending(1UL << nr);
70689 }
70690
70691 -void open_softirq(int nr, void (*action)(struct softirq_action *))
70692 +void open_softirq(int nr, void (*action)(void))
70693 {
70694 - softirq_vec[nr].action = action;
70695 + pax_open_kernel();
70696 + *(void **)&softirq_vec[nr].action = action;
70697 + pax_close_kernel();
70698 }
70699
70700 /*
70701 @@ -446,7 +448,7 @@ void __tasklet_hi_schedule_first(struct tasklet_struct *t)
70702
70703 EXPORT_SYMBOL(__tasklet_hi_schedule_first);
70704
70705 -static void tasklet_action(struct softirq_action *a)
70706 +static void tasklet_action(void)
70707 {
70708 struct tasklet_struct *list;
70709
70710 @@ -481,7 +483,7 @@ static void tasklet_action(struct softirq_action *a)
70711 }
70712 }
70713
70714 -static void tasklet_hi_action(struct softirq_action *a)
70715 +static void tasklet_hi_action(void)
70716 {
70717 struct tasklet_struct *list;
70718
70719 diff --git a/kernel/srcu.c b/kernel/srcu.c
70720 index 2095be3..9a5b89d 100644
70721 --- a/kernel/srcu.c
70722 +++ b/kernel/srcu.c
70723 @@ -302,9 +302,9 @@ int __srcu_read_lock(struct srcu_struct *sp)
70724 preempt_disable();
70725 idx = rcu_dereference_index_check(sp->completed,
70726 rcu_read_lock_sched_held()) & 0x1;
70727 - ACCESS_ONCE(this_cpu_ptr(sp->per_cpu_ref)->c[idx]) += 1;
70728 + ACCESS_ONCE_RW(this_cpu_ptr(sp->per_cpu_ref)->c[idx]) += 1;
70729 smp_mb(); /* B */ /* Avoid leaking the critical section. */
70730 - ACCESS_ONCE(this_cpu_ptr(sp->per_cpu_ref)->seq[idx]) += 1;
70731 + ACCESS_ONCE_RW(this_cpu_ptr(sp->per_cpu_ref)->seq[idx]) += 1;
70732 preempt_enable();
70733 return idx;
70734 }
70735 @@ -320,7 +320,7 @@ void __srcu_read_unlock(struct srcu_struct *sp, int idx)
70736 {
70737 preempt_disable();
70738 smp_mb(); /* C */ /* Avoid leaking the critical section. */
70739 - ACCESS_ONCE(this_cpu_ptr(sp->per_cpu_ref)->c[idx]) -= 1;
70740 + ACCESS_ONCE_RW(this_cpu_ptr(sp->per_cpu_ref)->c[idx]) -= 1;
70741 preempt_enable();
70742 }
70743 EXPORT_SYMBOL_GPL(__srcu_read_unlock);
70744 diff --git a/kernel/sys.c b/kernel/sys.c
70745 index 909148a..cd51acf 100644
70746 --- a/kernel/sys.c
70747 +++ b/kernel/sys.c
70748 @@ -157,6 +157,12 @@ static int set_one_prio(struct task_struct *p, int niceval, int error)
70749 error = -EACCES;
70750 goto out;
70751 }
70752 +
70753 + if (gr_handle_chroot_setpriority(p, niceval)) {
70754 + error = -EACCES;
70755 + goto out;
70756 + }
70757 +
70758 no_nice = security_task_setnice(p, niceval);
70759 if (no_nice) {
70760 error = no_nice;
70761 @@ -595,6 +601,9 @@ SYSCALL_DEFINE2(setregid, gid_t, rgid, gid_t, egid)
70762 goto error;
70763 }
70764
70765 + if (gr_check_group_change(new->gid, new->egid, -1))
70766 + goto error;
70767 +
70768 if (rgid != (gid_t) -1 ||
70769 (egid != (gid_t) -1 && !gid_eq(kegid, old->gid)))
70770 new->sgid = new->egid;
70771 @@ -630,6 +639,10 @@ SYSCALL_DEFINE1(setgid, gid_t, gid)
70772 old = current_cred();
70773
70774 retval = -EPERM;
70775 +
70776 + if (gr_check_group_change(kgid, kgid, kgid))
70777 + goto error;
70778 +
70779 if (nsown_capable(CAP_SETGID))
70780 new->gid = new->egid = new->sgid = new->fsgid = kgid;
70781 else if (gid_eq(kgid, old->gid) || gid_eq(kgid, old->sgid))
70782 @@ -647,7 +660,7 @@ error:
70783 /*
70784 * change the user struct in a credentials set to match the new UID
70785 */
70786 -static int set_user(struct cred *new)
70787 +int set_user(struct cred *new)
70788 {
70789 struct user_struct *new_user;
70790
70791 @@ -727,6 +740,9 @@ SYSCALL_DEFINE2(setreuid, uid_t, ruid, uid_t, euid)
70792 goto error;
70793 }
70794
70795 + if (gr_check_user_change(new->uid, new->euid, -1))
70796 + goto error;
70797 +
70798 if (!uid_eq(new->uid, old->uid)) {
70799 retval = set_user(new);
70800 if (retval < 0)
70801 @@ -777,6 +793,12 @@ SYSCALL_DEFINE1(setuid, uid_t, uid)
70802 old = current_cred();
70803
70804 retval = -EPERM;
70805 +
70806 + if (gr_check_crash_uid(kuid))
70807 + goto error;
70808 + if (gr_check_user_change(kuid, kuid, kuid))
70809 + goto error;
70810 +
70811 if (nsown_capable(CAP_SETUID)) {
70812 new->suid = new->uid = kuid;
70813 if (!uid_eq(kuid, old->uid)) {
70814 @@ -846,6 +868,9 @@ SYSCALL_DEFINE3(setresuid, uid_t, ruid, uid_t, euid, uid_t, suid)
70815 goto error;
70816 }
70817
70818 + if (gr_check_user_change(kruid, keuid, -1))
70819 + goto error;
70820 +
70821 if (ruid != (uid_t) -1) {
70822 new->uid = kruid;
70823 if (!uid_eq(kruid, old->uid)) {
70824 @@ -928,6 +953,9 @@ SYSCALL_DEFINE3(setresgid, gid_t, rgid, gid_t, egid, gid_t, sgid)
70825 goto error;
70826 }
70827
70828 + if (gr_check_group_change(krgid, kegid, -1))
70829 + goto error;
70830 +
70831 if (rgid != (gid_t) -1)
70832 new->gid = krgid;
70833 if (egid != (gid_t) -1)
70834 @@ -981,6 +1009,9 @@ SYSCALL_DEFINE1(setfsuid, uid_t, uid)
70835 if (!uid_valid(kuid))
70836 return old_fsuid;
70837
70838 + if (gr_check_user_change(-1, -1, kuid))
70839 + goto error;
70840 +
70841 new = prepare_creds();
70842 if (!new)
70843 return old_fsuid;
70844 @@ -995,6 +1026,7 @@ SYSCALL_DEFINE1(setfsuid, uid_t, uid)
70845 }
70846 }
70847
70848 +error:
70849 abort_creds(new);
70850 return old_fsuid;
70851
70852 @@ -1027,12 +1059,16 @@ SYSCALL_DEFINE1(setfsgid, gid_t, gid)
70853 if (gid_eq(kgid, old->gid) || gid_eq(kgid, old->egid) ||
70854 gid_eq(kgid, old->sgid) || gid_eq(kgid, old->fsgid) ||
70855 nsown_capable(CAP_SETGID)) {
70856 + if (gr_check_group_change(-1, -1, kgid))
70857 + goto error;
70858 +
70859 if (!gid_eq(kgid, old->fsgid)) {
70860 new->fsgid = kgid;
70861 goto change_okay;
70862 }
70863 }
70864
70865 +error:
70866 abort_creds(new);
70867 return old_fsgid;
70868
70869 @@ -1340,19 +1376,19 @@ SYSCALL_DEFINE1(olduname, struct oldold_utsname __user *, name)
70870 return -EFAULT;
70871
70872 down_read(&uts_sem);
70873 - error = __copy_to_user(&name->sysname, &utsname()->sysname,
70874 + error = __copy_to_user(name->sysname, &utsname()->sysname,
70875 __OLD_UTS_LEN);
70876 error |= __put_user(0, name->sysname + __OLD_UTS_LEN);
70877 - error |= __copy_to_user(&name->nodename, &utsname()->nodename,
70878 + error |= __copy_to_user(name->nodename, &utsname()->nodename,
70879 __OLD_UTS_LEN);
70880 error |= __put_user(0, name->nodename + __OLD_UTS_LEN);
70881 - error |= __copy_to_user(&name->release, &utsname()->release,
70882 + error |= __copy_to_user(name->release, &utsname()->release,
70883 __OLD_UTS_LEN);
70884 error |= __put_user(0, name->release + __OLD_UTS_LEN);
70885 - error |= __copy_to_user(&name->version, &utsname()->version,
70886 + error |= __copy_to_user(name->version, &utsname()->version,
70887 __OLD_UTS_LEN);
70888 error |= __put_user(0, name->version + __OLD_UTS_LEN);
70889 - error |= __copy_to_user(&name->machine, &utsname()->machine,
70890 + error |= __copy_to_user(name->machine, &utsname()->machine,
70891 __OLD_UTS_LEN);
70892 error |= __put_user(0, name->machine + __OLD_UTS_LEN);
70893 up_read(&uts_sem);
70894 @@ -2026,7 +2062,7 @@ SYSCALL_DEFINE5(prctl, int, option, unsigned long, arg2, unsigned long, arg3,
70895 error = get_dumpable(me->mm);
70896 break;
70897 case PR_SET_DUMPABLE:
70898 - if (arg2 < 0 || arg2 > 1) {
70899 + if (arg2 > 1) {
70900 error = -EINVAL;
70901 break;
70902 }
70903 diff --git a/kernel/sysctl.c b/kernel/sysctl.c
70904 index 87174ef..68cbb82 100644
70905 --- a/kernel/sysctl.c
70906 +++ b/kernel/sysctl.c
70907 @@ -92,7 +92,6 @@
70908
70909
70910 #if defined(CONFIG_SYSCTL)
70911 -
70912 /* External variables not in a header file. */
70913 extern int sysctl_overcommit_memory;
70914 extern int sysctl_overcommit_ratio;
70915 @@ -170,10 +169,8 @@ static int proc_taint(struct ctl_table *table, int write,
70916 void __user *buffer, size_t *lenp, loff_t *ppos);
70917 #endif
70918
70919 -#ifdef CONFIG_PRINTK
70920 static int proc_dointvec_minmax_sysadmin(struct ctl_table *table, int write,
70921 void __user *buffer, size_t *lenp, loff_t *ppos);
70922 -#endif
70923
70924 static int proc_dointvec_minmax_coredump(struct ctl_table *table, int write,
70925 void __user *buffer, size_t *lenp, loff_t *ppos);
70926 @@ -202,6 +199,8 @@ static int sysrq_sysctl_handler(ctl_table *table, int write,
70927
70928 #endif
70929
70930 +extern struct ctl_table grsecurity_table[];
70931 +
70932 static struct ctl_table kern_table[];
70933 static struct ctl_table vm_table[];
70934 static struct ctl_table fs_table[];
70935 @@ -216,6 +215,20 @@ extern struct ctl_table epoll_table[];
70936 int sysctl_legacy_va_layout;
70937 #endif
70938
70939 +#ifdef CONFIG_PAX_SOFTMODE
70940 +static ctl_table pax_table[] = {
70941 + {
70942 + .procname = "softmode",
70943 + .data = &pax_softmode,
70944 + .maxlen = sizeof(unsigned int),
70945 + .mode = 0600,
70946 + .proc_handler = &proc_dointvec,
70947 + },
70948 +
70949 + { }
70950 +};
70951 +#endif
70952 +
70953 /* The default sysctl tables: */
70954
70955 static struct ctl_table sysctl_base_table[] = {
70956 @@ -262,6 +275,22 @@ static int max_extfrag_threshold = 1000;
70957 #endif
70958
70959 static struct ctl_table kern_table[] = {
70960 +#if defined(CONFIG_GRKERNSEC_SYSCTL) || defined(CONFIG_GRKERNSEC_ROFS)
70961 + {
70962 + .procname = "grsecurity",
70963 + .mode = 0500,
70964 + .child = grsecurity_table,
70965 + },
70966 +#endif
70967 +
70968 +#ifdef CONFIG_PAX_SOFTMODE
70969 + {
70970 + .procname = "pax",
70971 + .mode = 0500,
70972 + .child = pax_table,
70973 + },
70974 +#endif
70975 +
70976 {
70977 .procname = "sched_child_runs_first",
70978 .data = &sysctl_sched_child_runs_first,
70979 @@ -546,7 +575,7 @@ static struct ctl_table kern_table[] = {
70980 .data = &modprobe_path,
70981 .maxlen = KMOD_PATH_LEN,
70982 .mode = 0644,
70983 - .proc_handler = proc_dostring,
70984 + .proc_handler = proc_dostring_modpriv,
70985 },
70986 {
70987 .procname = "modules_disabled",
70988 @@ -713,16 +742,20 @@ static struct ctl_table kern_table[] = {
70989 .extra1 = &zero,
70990 .extra2 = &one,
70991 },
70992 +#endif
70993 {
70994 .procname = "kptr_restrict",
70995 .data = &kptr_restrict,
70996 .maxlen = sizeof(int),
70997 .mode = 0644,
70998 .proc_handler = proc_dointvec_minmax_sysadmin,
70999 +#ifdef CONFIG_GRKERNSEC_HIDESYM
71000 + .extra1 = &two,
71001 +#else
71002 .extra1 = &zero,
71003 +#endif
71004 .extra2 = &two,
71005 },
71006 -#endif
71007 {
71008 .procname = "ngroups_max",
71009 .data = &ngroups_max,
71010 @@ -1219,6 +1252,13 @@ static struct ctl_table vm_table[] = {
71011 .proc_handler = proc_dointvec_minmax,
71012 .extra1 = &zero,
71013 },
71014 + {
71015 + .procname = "heap_stack_gap",
71016 + .data = &sysctl_heap_stack_gap,
71017 + .maxlen = sizeof(sysctl_heap_stack_gap),
71018 + .mode = 0644,
71019 + .proc_handler = proc_doulongvec_minmax,
71020 + },
71021 #else
71022 {
71023 .procname = "nr_trim_pages",
71024 @@ -1670,6 +1710,16 @@ int proc_dostring(struct ctl_table *table, int write,
71025 buffer, lenp, ppos);
71026 }
71027
71028 +int proc_dostring_modpriv(struct ctl_table *table, int write,
71029 + void __user *buffer, size_t *lenp, loff_t *ppos)
71030 +{
71031 + if (write && !capable(CAP_SYS_MODULE))
71032 + return -EPERM;
71033 +
71034 + return _proc_do_string(table->data, table->maxlen, write,
71035 + buffer, lenp, ppos);
71036 +}
71037 +
71038 static size_t proc_skip_spaces(char **buf)
71039 {
71040 size_t ret;
71041 @@ -1775,6 +1825,8 @@ static int proc_put_long(void __user **buf, size_t *size, unsigned long val,
71042 len = strlen(tmp);
71043 if (len > *size)
71044 len = *size;
71045 + if (len > sizeof(tmp))
71046 + len = sizeof(tmp);
71047 if (copy_to_user(*buf, tmp, len))
71048 return -EFAULT;
71049 *size -= len;
71050 @@ -1967,7 +2019,6 @@ static int proc_taint(struct ctl_table *table, int write,
71051 return err;
71052 }
71053
71054 -#ifdef CONFIG_PRINTK
71055 static int proc_dointvec_minmax_sysadmin(struct ctl_table *table, int write,
71056 void __user *buffer, size_t *lenp, loff_t *ppos)
71057 {
71058 @@ -1976,7 +2027,6 @@ static int proc_dointvec_minmax_sysadmin(struct ctl_table *table, int write,
71059
71060 return proc_dointvec_minmax(table, write, buffer, lenp, ppos);
71061 }
71062 -#endif
71063
71064 struct do_proc_dointvec_minmax_conv_param {
71065 int *min;
71066 @@ -2119,8 +2169,11 @@ static int __do_proc_doulongvec_minmax(void *data, struct ctl_table *table, int
71067 *i = val;
71068 } else {
71069 val = convdiv * (*i) / convmul;
71070 - if (!first)
71071 + if (!first) {
71072 err = proc_put_char(&buffer, &left, '\t');
71073 + if (err)
71074 + break;
71075 + }
71076 err = proc_put_long(&buffer, &left, val, false);
71077 if (err)
71078 break;
71079 @@ -2512,6 +2565,12 @@ int proc_dostring(struct ctl_table *table, int write,
71080 return -ENOSYS;
71081 }
71082
71083 +int proc_dostring_modpriv(struct ctl_table *table, int write,
71084 + void __user *buffer, size_t *lenp, loff_t *ppos)
71085 +{
71086 + return -ENOSYS;
71087 +}
71088 +
71089 int proc_dointvec(struct ctl_table *table, int write,
71090 void __user *buffer, size_t *lenp, loff_t *ppos)
71091 {
71092 @@ -2568,5 +2627,6 @@ EXPORT_SYMBOL(proc_dointvec_minmax);
71093 EXPORT_SYMBOL(proc_dointvec_userhz_jiffies);
71094 EXPORT_SYMBOL(proc_dointvec_ms_jiffies);
71095 EXPORT_SYMBOL(proc_dostring);
71096 +EXPORT_SYMBOL(proc_dostring_modpriv);
71097 EXPORT_SYMBOL(proc_doulongvec_minmax);
71098 EXPORT_SYMBOL(proc_doulongvec_ms_jiffies_minmax);
71099 diff --git a/kernel/sysctl_binary.c b/kernel/sysctl_binary.c
71100 index 65bdcf1..21eb831 100644
71101 --- a/kernel/sysctl_binary.c
71102 +++ b/kernel/sysctl_binary.c
71103 @@ -989,7 +989,7 @@ static ssize_t bin_intvec(struct file *file,
71104 int i;
71105
71106 set_fs(KERNEL_DS);
71107 - result = vfs_read(file, buffer, BUFSZ - 1, &pos);
71108 + result = vfs_read(file, (char __force_user *)buffer, BUFSZ - 1, &pos);
71109 set_fs(old_fs);
71110 if (result < 0)
71111 goto out_kfree;
71112 @@ -1034,7 +1034,7 @@ static ssize_t bin_intvec(struct file *file,
71113 }
71114
71115 set_fs(KERNEL_DS);
71116 - result = vfs_write(file, buffer, str - buffer, &pos);
71117 + result = vfs_write(file, (const char __force_user *)buffer, str - buffer, &pos);
71118 set_fs(old_fs);
71119 if (result < 0)
71120 goto out_kfree;
71121 @@ -1067,7 +1067,7 @@ static ssize_t bin_ulongvec(struct file *file,
71122 int i;
71123
71124 set_fs(KERNEL_DS);
71125 - result = vfs_read(file, buffer, BUFSZ - 1, &pos);
71126 + result = vfs_read(file, (char __force_user *)buffer, BUFSZ - 1, &pos);
71127 set_fs(old_fs);
71128 if (result < 0)
71129 goto out_kfree;
71130 @@ -1112,7 +1112,7 @@ static ssize_t bin_ulongvec(struct file *file,
71131 }
71132
71133 set_fs(KERNEL_DS);
71134 - result = vfs_write(file, buffer, str - buffer, &pos);
71135 + result = vfs_write(file, (const char __force_user *)buffer, str - buffer, &pos);
71136 set_fs(old_fs);
71137 if (result < 0)
71138 goto out_kfree;
71139 @@ -1138,7 +1138,7 @@ static ssize_t bin_uuid(struct file *file,
71140 int i;
71141
71142 set_fs(KERNEL_DS);
71143 - result = vfs_read(file, buf, sizeof(buf) - 1, &pos);
71144 + result = vfs_read(file, (char __force_user *)buf, sizeof(buf) - 1, &pos);
71145 set_fs(old_fs);
71146 if (result < 0)
71147 goto out;
71148 @@ -1185,7 +1185,7 @@ static ssize_t bin_dn_node_address(struct file *file,
71149 __le16 dnaddr;
71150
71151 set_fs(KERNEL_DS);
71152 - result = vfs_read(file, buf, sizeof(buf) - 1, &pos);
71153 + result = vfs_read(file, (char __force_user *)buf, sizeof(buf) - 1, &pos);
71154 set_fs(old_fs);
71155 if (result < 0)
71156 goto out;
71157 @@ -1233,7 +1233,7 @@ static ssize_t bin_dn_node_address(struct file *file,
71158 le16_to_cpu(dnaddr) & 0x3ff);
71159
71160 set_fs(KERNEL_DS);
71161 - result = vfs_write(file, buf, len, &pos);
71162 + result = vfs_write(file, (const char __force_user *)buf, len, &pos);
71163 set_fs(old_fs);
71164 if (result < 0)
71165 goto out;
71166 diff --git a/kernel/taskstats.c b/kernel/taskstats.c
71167 index d0a3279..db0ad99 100644
71168 --- a/kernel/taskstats.c
71169 +++ b/kernel/taskstats.c
71170 @@ -27,9 +27,12 @@
71171 #include <linux/cgroup.h>
71172 #include <linux/fs.h>
71173 #include <linux/file.h>
71174 +#include <linux/grsecurity.h>
71175 #include <net/genetlink.h>
71176 #include <linux/atomic.h>
71177
71178 +extern int gr_is_taskstats_denied(int pid);
71179 +
71180 /*
71181 * Maximum length of a cpumask that can be specified in
71182 * the TASKSTATS_CMD_ATTR_REGISTER/DEREGISTER_CPUMASK attribute
71183 @@ -561,6 +564,9 @@ err:
71184
71185 static int taskstats_user_cmd(struct sk_buff *skb, struct genl_info *info)
71186 {
71187 + if (gr_is_taskstats_denied(current->pid))
71188 + return -EACCES;
71189 +
71190 if (info->attrs[TASKSTATS_CMD_ATTR_REGISTER_CPUMASK])
71191 return cmd_attr_register_cpumask(info);
71192 else if (info->attrs[TASKSTATS_CMD_ATTR_DEREGISTER_CPUMASK])
71193 diff --git a/kernel/time.c b/kernel/time.c
71194 index ba744cf..267b7c5 100644
71195 --- a/kernel/time.c
71196 +++ b/kernel/time.c
71197 @@ -163,6 +163,11 @@ int do_sys_settimeofday(const struct timespec *tv, const struct timezone *tz)
71198 return error;
71199
71200 if (tz) {
71201 + /* we log in do_settimeofday called below, so don't log twice
71202 + */
71203 + if (!tv)
71204 + gr_log_timechange();
71205 +
71206 sys_tz = *tz;
71207 update_vsyscall_tz();
71208 if (firsttime) {
71209 diff --git a/kernel/time/alarmtimer.c b/kernel/time/alarmtimer.c
71210 index aa27d39..34d221c 100644
71211 --- a/kernel/time/alarmtimer.c
71212 +++ b/kernel/time/alarmtimer.c
71213 @@ -779,7 +779,7 @@ static int __init alarmtimer_init(void)
71214 struct platform_device *pdev;
71215 int error = 0;
71216 int i;
71217 - struct k_clock alarm_clock = {
71218 + static struct k_clock alarm_clock = {
71219 .clock_getres = alarm_clock_getres,
71220 .clock_get = alarm_clock_get,
71221 .timer_create = alarm_timer_create,
71222 diff --git a/kernel/time/tick-broadcast.c b/kernel/time/tick-broadcast.c
71223 index f113755..ec24223 100644
71224 --- a/kernel/time/tick-broadcast.c
71225 +++ b/kernel/time/tick-broadcast.c
71226 @@ -115,7 +115,7 @@ int tick_device_uses_broadcast(struct clock_event_device *dev, int cpu)
71227 * then clear the broadcast bit.
71228 */
71229 if (!(dev->features & CLOCK_EVT_FEAT_C3STOP)) {
71230 - int cpu = smp_processor_id();
71231 + cpu = smp_processor_id();
71232
71233 cpumask_clear_cpu(cpu, tick_get_broadcast_mask());
71234 tick_broadcast_clear_oneshot(cpu);
71235 diff --git a/kernel/time/timekeeping.c b/kernel/time/timekeeping.c
71236 index f791637..00051de 100644
71237 --- a/kernel/time/timekeeping.c
71238 +++ b/kernel/time/timekeeping.c
71239 @@ -14,6 +14,7 @@
71240 #include <linux/init.h>
71241 #include <linux/mm.h>
71242 #include <linux/sched.h>
71243 +#include <linux/grsecurity.h>
71244 #include <linux/syscore_ops.h>
71245 #include <linux/clocksource.h>
71246 #include <linux/jiffies.h>
71247 @@ -434,6 +435,8 @@ int do_settimeofday(const struct timespec *tv)
71248 if (!timespec_valid_strict(tv))
71249 return -EINVAL;
71250
71251 + gr_log_timechange();
71252 +
71253 write_seqlock_irqsave(&tk->lock, flags);
71254
71255 timekeeping_forward_now(tk);
71256 diff --git a/kernel/time/timer_list.c b/kernel/time/timer_list.c
71257 index af5a7e9..715611a 100644
71258 --- a/kernel/time/timer_list.c
71259 +++ b/kernel/time/timer_list.c
71260 @@ -38,12 +38,16 @@ DECLARE_PER_CPU(struct hrtimer_cpu_base, hrtimer_bases);
71261
71262 static void print_name_offset(struct seq_file *m, void *sym)
71263 {
71264 +#ifdef CONFIG_GRKERNSEC_HIDESYM
71265 + SEQ_printf(m, "<%p>", NULL);
71266 +#else
71267 char symname[KSYM_NAME_LEN];
71268
71269 if (lookup_symbol_name((unsigned long)sym, symname) < 0)
71270 SEQ_printf(m, "<%pK>", sym);
71271 else
71272 SEQ_printf(m, "%s", symname);
71273 +#endif
71274 }
71275
71276 static void
71277 @@ -112,7 +116,11 @@ next_one:
71278 static void
71279 print_base(struct seq_file *m, struct hrtimer_clock_base *base, u64 now)
71280 {
71281 +#ifdef CONFIG_GRKERNSEC_HIDESYM
71282 + SEQ_printf(m, " .base: %p\n", NULL);
71283 +#else
71284 SEQ_printf(m, " .base: %pK\n", base);
71285 +#endif
71286 SEQ_printf(m, " .index: %d\n",
71287 base->index);
71288 SEQ_printf(m, " .resolution: %Lu nsecs\n",
71289 @@ -293,7 +301,11 @@ static int __init init_timer_list_procfs(void)
71290 {
71291 struct proc_dir_entry *pe;
71292
71293 +#ifdef CONFIG_GRKERNSEC_PROC_ADD
71294 + pe = proc_create("timer_list", 0400, NULL, &timer_list_fops);
71295 +#else
71296 pe = proc_create("timer_list", 0444, NULL, &timer_list_fops);
71297 +#endif
71298 if (!pe)
71299 return -ENOMEM;
71300 return 0;
71301 diff --git a/kernel/time/timer_stats.c b/kernel/time/timer_stats.c
71302 index 0b537f2..40d6c20 100644
71303 --- a/kernel/time/timer_stats.c
71304 +++ b/kernel/time/timer_stats.c
71305 @@ -116,7 +116,7 @@ static ktime_t time_start, time_stop;
71306 static unsigned long nr_entries;
71307 static struct entry entries[MAX_ENTRIES];
71308
71309 -static atomic_t overflow_count;
71310 +static atomic_unchecked_t overflow_count;
71311
71312 /*
71313 * The entries are in a hash-table, for fast lookup:
71314 @@ -140,7 +140,7 @@ static void reset_entries(void)
71315 nr_entries = 0;
71316 memset(entries, 0, sizeof(entries));
71317 memset(tstat_hash_table, 0, sizeof(tstat_hash_table));
71318 - atomic_set(&overflow_count, 0);
71319 + atomic_set_unchecked(&overflow_count, 0);
71320 }
71321
71322 static struct entry *alloc_entry(void)
71323 @@ -261,7 +261,7 @@ void timer_stats_update_stats(void *timer, pid_t pid, void *startf,
71324 if (likely(entry))
71325 entry->count++;
71326 else
71327 - atomic_inc(&overflow_count);
71328 + atomic_inc_unchecked(&overflow_count);
71329
71330 out_unlock:
71331 raw_spin_unlock_irqrestore(lock, flags);
71332 @@ -269,12 +269,16 @@ void timer_stats_update_stats(void *timer, pid_t pid, void *startf,
71333
71334 static void print_name_offset(struct seq_file *m, unsigned long addr)
71335 {
71336 +#ifdef CONFIG_GRKERNSEC_HIDESYM
71337 + seq_printf(m, "<%p>", NULL);
71338 +#else
71339 char symname[KSYM_NAME_LEN];
71340
71341 if (lookup_symbol_name(addr, symname) < 0)
71342 - seq_printf(m, "<%p>", (void *)addr);
71343 + seq_printf(m, "<%pK>", (void *)addr);
71344 else
71345 seq_printf(m, "%s", symname);
71346 +#endif
71347 }
71348
71349 static int tstats_show(struct seq_file *m, void *v)
71350 @@ -300,9 +304,9 @@ static int tstats_show(struct seq_file *m, void *v)
71351
71352 seq_puts(m, "Timer Stats Version: v0.2\n");
71353 seq_printf(m, "Sample period: %ld.%03ld s\n", period.tv_sec, ms);
71354 - if (atomic_read(&overflow_count))
71355 + if (atomic_read_unchecked(&overflow_count))
71356 seq_printf(m, "Overflow: %d entries\n",
71357 - atomic_read(&overflow_count));
71358 + atomic_read_unchecked(&overflow_count));
71359
71360 for (i = 0; i < nr_entries; i++) {
71361 entry = entries + i;
71362 @@ -417,7 +421,11 @@ static int __init init_tstats_procfs(void)
71363 {
71364 struct proc_dir_entry *pe;
71365
71366 +#ifdef CONFIG_GRKERNSEC_PROC_ADD
71367 + pe = proc_create("timer_stats", 0600, NULL, &tstats_fops);
71368 +#else
71369 pe = proc_create("timer_stats", 0644, NULL, &tstats_fops);
71370 +#endif
71371 if (!pe)
71372 return -ENOMEM;
71373 return 0;
71374 diff --git a/kernel/timer.c b/kernel/timer.c
71375 index 46ef2b1..ad081f144 100644
71376 --- a/kernel/timer.c
71377 +++ b/kernel/timer.c
71378 @@ -1377,7 +1377,7 @@ void update_process_times(int user_tick)
71379 /*
71380 * This function runs timers and the timer-tq in bottom half context.
71381 */
71382 -static void run_timer_softirq(struct softirq_action *h)
71383 +static void run_timer_softirq(void)
71384 {
71385 struct tvec_base *base = __this_cpu_read(tvec_bases);
71386
71387 diff --git a/kernel/trace/blktrace.c b/kernel/trace/blktrace.c
71388 index c0bd030..62a1927 100644
71389 --- a/kernel/trace/blktrace.c
71390 +++ b/kernel/trace/blktrace.c
71391 @@ -317,7 +317,7 @@ static ssize_t blk_dropped_read(struct file *filp, char __user *buffer,
71392 struct blk_trace *bt = filp->private_data;
71393 char buf[16];
71394
71395 - snprintf(buf, sizeof(buf), "%u\n", atomic_read(&bt->dropped));
71396 + snprintf(buf, sizeof(buf), "%u\n", atomic_read_unchecked(&bt->dropped));
71397
71398 return simple_read_from_buffer(buffer, count, ppos, buf, strlen(buf));
71399 }
71400 @@ -375,7 +375,7 @@ static int blk_subbuf_start_callback(struct rchan_buf *buf, void *subbuf,
71401 return 1;
71402
71403 bt = buf->chan->private_data;
71404 - atomic_inc(&bt->dropped);
71405 + atomic_inc_unchecked(&bt->dropped);
71406 return 0;
71407 }
71408
71409 @@ -476,7 +476,7 @@ int do_blk_trace_setup(struct request_queue *q, char *name, dev_t dev,
71410
71411 bt->dir = dir;
71412 bt->dev = dev;
71413 - atomic_set(&bt->dropped, 0);
71414 + atomic_set_unchecked(&bt->dropped, 0);
71415
71416 ret = -EIO;
71417 bt->dropped_file = debugfs_create_file("dropped", 0444, dir, bt,
71418 diff --git a/kernel/trace/ftrace.c b/kernel/trace/ftrace.c
71419 index b4f20fb..483c5fa 100644
71420 --- a/kernel/trace/ftrace.c
71421 +++ b/kernel/trace/ftrace.c
71422 @@ -1785,12 +1785,17 @@ ftrace_code_disable(struct module *mod, struct dyn_ftrace *rec)
71423 if (unlikely(ftrace_disabled))
71424 return 0;
71425
71426 + ret = ftrace_arch_code_modify_prepare();
71427 + FTRACE_WARN_ON(ret);
71428 + if (ret)
71429 + return 0;
71430 +
71431 ret = ftrace_make_nop(mod, rec, MCOUNT_ADDR);
71432 + FTRACE_WARN_ON(ftrace_arch_code_modify_post_process());
71433 if (ret) {
71434 ftrace_bug(ret, ip);
71435 - return 0;
71436 }
71437 - return 1;
71438 + return ret ? 0 : 1;
71439 }
71440
71441 /*
71442 @@ -2885,7 +2890,7 @@ static void ftrace_free_entry_rcu(struct rcu_head *rhp)
71443
71444 int
71445 register_ftrace_function_probe(char *glob, struct ftrace_probe_ops *ops,
71446 - void *data)
71447 + void *data)
71448 {
71449 struct ftrace_func_probe *entry;
71450 struct ftrace_page *pg;
71451 @@ -3697,8 +3702,10 @@ static int ftrace_process_locs(struct module *mod,
71452 if (!count)
71453 return 0;
71454
71455 + pax_open_kernel();
71456 sort(start, count, sizeof(*start),
71457 ftrace_cmp_ips, ftrace_swap_ips);
71458 + pax_close_kernel();
71459
71460 start_pg = ftrace_allocate_pages(count);
71461 if (!start_pg)
71462 diff --git a/kernel/trace/trace.c b/kernel/trace/trace.c
71463 index 5c38c81..88012af 100644
71464 --- a/kernel/trace/trace.c
71465 +++ b/kernel/trace/trace.c
71466 @@ -4437,10 +4437,9 @@ static const struct file_operations tracing_dyn_info_fops = {
71467 };
71468 #endif
71469
71470 -static struct dentry *d_tracer;
71471 -
71472 struct dentry *tracing_init_dentry(void)
71473 {
71474 + static struct dentry *d_tracer;
71475 static int once;
71476
71477 if (d_tracer)
71478 @@ -4460,10 +4459,9 @@ struct dentry *tracing_init_dentry(void)
71479 return d_tracer;
71480 }
71481
71482 -static struct dentry *d_percpu;
71483 -
71484 struct dentry *tracing_dentry_percpu(void)
71485 {
71486 + static struct dentry *d_percpu;
71487 static int once;
71488 struct dentry *d_tracer;
71489
71490 diff --git a/kernel/trace/trace_events.c b/kernel/trace/trace_events.c
71491 index 29111da..d190fe2 100644
71492 --- a/kernel/trace/trace_events.c
71493 +++ b/kernel/trace/trace_events.c
71494 @@ -1308,10 +1308,6 @@ static LIST_HEAD(ftrace_module_file_list);
71495 struct ftrace_module_file_ops {
71496 struct list_head list;
71497 struct module *mod;
71498 - struct file_operations id;
71499 - struct file_operations enable;
71500 - struct file_operations format;
71501 - struct file_operations filter;
71502 };
71503
71504 static struct ftrace_module_file_ops *
71505 @@ -1332,17 +1328,12 @@ trace_create_file_ops(struct module *mod)
71506
71507 file_ops->mod = mod;
71508
71509 - file_ops->id = ftrace_event_id_fops;
71510 - file_ops->id.owner = mod;
71511 -
71512 - file_ops->enable = ftrace_enable_fops;
71513 - file_ops->enable.owner = mod;
71514 -
71515 - file_ops->filter = ftrace_event_filter_fops;
71516 - file_ops->filter.owner = mod;
71517 -
71518 - file_ops->format = ftrace_event_format_fops;
71519 - file_ops->format.owner = mod;
71520 + pax_open_kernel();
71521 + *(void **)&mod->trace_id.owner = mod;
71522 + *(void **)&mod->trace_enable.owner = mod;
71523 + *(void **)&mod->trace_filter.owner = mod;
71524 + *(void **)&mod->trace_format.owner = mod;
71525 + pax_close_kernel();
71526
71527 list_add(&file_ops->list, &ftrace_module_file_list);
71528
71529 @@ -1366,8 +1357,8 @@ static void trace_module_add_events(struct module *mod)
71530
71531 for_each_event(call, start, end) {
71532 __trace_add_event_call(*call, mod,
71533 - &file_ops->id, &file_ops->enable,
71534 - &file_ops->filter, &file_ops->format);
71535 + &mod->trace_id, &mod->trace_enable,
71536 + &mod->trace_filter, &mod->trace_format);
71537 }
71538 }
71539
71540 diff --git a/kernel/trace/trace_mmiotrace.c b/kernel/trace/trace_mmiotrace.c
71541 index fd3c8aa..5f324a6 100644
71542 --- a/kernel/trace/trace_mmiotrace.c
71543 +++ b/kernel/trace/trace_mmiotrace.c
71544 @@ -24,7 +24,7 @@ struct header_iter {
71545 static struct trace_array *mmio_trace_array;
71546 static bool overrun_detected;
71547 static unsigned long prev_overruns;
71548 -static atomic_t dropped_count;
71549 +static atomic_unchecked_t dropped_count;
71550
71551 static void mmio_reset_data(struct trace_array *tr)
71552 {
71553 @@ -127,7 +127,7 @@ static void mmio_close(struct trace_iterator *iter)
71554
71555 static unsigned long count_overruns(struct trace_iterator *iter)
71556 {
71557 - unsigned long cnt = atomic_xchg(&dropped_count, 0);
71558 + unsigned long cnt = atomic_xchg_unchecked(&dropped_count, 0);
71559 unsigned long over = ring_buffer_overruns(iter->tr->buffer);
71560
71561 if (over > prev_overruns)
71562 @@ -317,7 +317,7 @@ static void __trace_mmiotrace_rw(struct trace_array *tr,
71563 event = trace_buffer_lock_reserve(buffer, TRACE_MMIO_RW,
71564 sizeof(*entry), 0, pc);
71565 if (!event) {
71566 - atomic_inc(&dropped_count);
71567 + atomic_inc_unchecked(&dropped_count);
71568 return;
71569 }
71570 entry = ring_buffer_event_data(event);
71571 @@ -347,7 +347,7 @@ static void __trace_mmiotrace_map(struct trace_array *tr,
71572 event = trace_buffer_lock_reserve(buffer, TRACE_MMIO_MAP,
71573 sizeof(*entry), 0, pc);
71574 if (!event) {
71575 - atomic_inc(&dropped_count);
71576 + atomic_inc_unchecked(&dropped_count);
71577 return;
71578 }
71579 entry = ring_buffer_event_data(event);
71580 diff --git a/kernel/trace/trace_output.c b/kernel/trace/trace_output.c
71581 index 123b189..97b81f5 100644
71582 --- a/kernel/trace/trace_output.c
71583 +++ b/kernel/trace/trace_output.c
71584 @@ -278,7 +278,7 @@ int trace_seq_path(struct trace_seq *s, const struct path *path)
71585
71586 p = d_path(path, s->buffer + s->len, PAGE_SIZE - s->len);
71587 if (!IS_ERR(p)) {
71588 - p = mangle_path(s->buffer + s->len, p, "\n");
71589 + p = mangle_path(s->buffer + s->len, p, "\n\\");
71590 if (p) {
71591 s->len = p - s->buffer;
71592 return 1;
71593 diff --git a/kernel/trace/trace_stack.c b/kernel/trace/trace_stack.c
71594 index d4545f4..a9010a1 100644
71595 --- a/kernel/trace/trace_stack.c
71596 +++ b/kernel/trace/trace_stack.c
71597 @@ -53,7 +53,7 @@ static inline void check_stack(void)
71598 return;
71599
71600 /* we do not handle interrupt stacks yet */
71601 - if (!object_is_on_stack(&this_size))
71602 + if (!object_starts_on_stack(&this_size))
71603 return;
71604
71605 local_irq_save(flags);
71606 diff --git a/kernel/workqueue.c b/kernel/workqueue.c
71607 index 872bd6d..31601a2 100644
71608 --- a/kernel/workqueue.c
71609 +++ b/kernel/workqueue.c
71610 @@ -1422,7 +1422,7 @@ retry:
71611 /* morph UNBOUND to REBIND atomically */
71612 worker_flags &= ~WORKER_UNBOUND;
71613 worker_flags |= WORKER_REBIND;
71614 - ACCESS_ONCE(worker->flags) = worker_flags;
71615 + ACCESS_ONCE_RW(worker->flags) = worker_flags;
71616
71617 idle_rebind.cnt++;
71618 worker->idle_rebind = &idle_rebind;
71619 @@ -1448,7 +1448,7 @@ retry:
71620 /* morph UNBOUND to REBIND atomically */
71621 worker_flags &= ~WORKER_UNBOUND;
71622 worker_flags |= WORKER_REBIND;
71623 - ACCESS_ONCE(worker->flags) = worker_flags;
71624 + ACCESS_ONCE_RW(worker->flags) = worker_flags;
71625
71626 if (test_and_set_bit(WORK_STRUCT_PENDING_BIT,
71627 work_data_bits(rebind_work)))
71628 diff --git a/lib/Kconfig.debug b/lib/Kconfig.debug
71629 index 2403a63..5c4be4c 100644
71630 --- a/lib/Kconfig.debug
71631 +++ b/lib/Kconfig.debug
71632 @@ -1252,6 +1252,7 @@ config LATENCYTOP
71633 depends on DEBUG_KERNEL
71634 depends on STACKTRACE_SUPPORT
71635 depends on PROC_FS
71636 + depends on !GRKERNSEC_HIDESYM
71637 select FRAME_POINTER if !MIPS && !PPC && !S390 && !MICROBLAZE && !ARM_UNWIND
71638 select KALLSYMS
71639 select KALLSYMS_ALL
71640 @@ -1267,7 +1268,7 @@ source kernel/trace/Kconfig
71641
71642 config PROVIDE_OHCI1394_DMA_INIT
71643 bool "Remote debugging over FireWire early on boot"
71644 - depends on PCI && X86
71645 + depends on PCI && X86 && !GRKERNSEC
71646 help
71647 If you want to debug problems which hang or crash the kernel early
71648 on boot and the crashing machine has a FireWire port, you can use
71649 @@ -1296,7 +1297,7 @@ config PROVIDE_OHCI1394_DMA_INIT
71650
71651 config FIREWIRE_OHCI_REMOTE_DMA
71652 bool "Remote debugging over FireWire with firewire-ohci"
71653 - depends on FIREWIRE_OHCI
71654 + depends on FIREWIRE_OHCI && !GRKERNSEC
71655 help
71656 This option lets you use the FireWire bus for remote debugging
71657 with help of the firewire-ohci driver. It enables unfiltered
71658 diff --git a/lib/bitmap.c b/lib/bitmap.c
71659 index 06fdfa1..97c5c7d 100644
71660 --- a/lib/bitmap.c
71661 +++ b/lib/bitmap.c
71662 @@ -422,7 +422,7 @@ int __bitmap_parse(const char *buf, unsigned int buflen,
71663 {
71664 int c, old_c, totaldigits, ndigits, nchunks, nbits;
71665 u32 chunk;
71666 - const char __user __force *ubuf = (const char __user __force *)buf;
71667 + const char __user *ubuf = (const char __force_user *)buf;
71668
71669 bitmap_zero(maskp, nmaskbits);
71670
71671 @@ -507,7 +507,7 @@ int bitmap_parse_user(const char __user *ubuf,
71672 {
71673 if (!access_ok(VERIFY_READ, ubuf, ulen))
71674 return -EFAULT;
71675 - return __bitmap_parse((const char __force *)ubuf,
71676 + return __bitmap_parse((const char __force_kernel *)ubuf,
71677 ulen, 1, maskp, nmaskbits);
71678
71679 }
71680 @@ -598,7 +598,7 @@ static int __bitmap_parselist(const char *buf, unsigned int buflen,
71681 {
71682 unsigned a, b;
71683 int c, old_c, totaldigits;
71684 - const char __user __force *ubuf = (const char __user __force *)buf;
71685 + const char __user *ubuf = (const char __force_user *)buf;
71686 int exp_digit, in_range;
71687
71688 totaldigits = c = 0;
71689 @@ -698,7 +698,7 @@ int bitmap_parselist_user(const char __user *ubuf,
71690 {
71691 if (!access_ok(VERIFY_READ, ubuf, ulen))
71692 return -EFAULT;
71693 - return __bitmap_parselist((const char __force *)ubuf,
71694 + return __bitmap_parselist((const char __force_kernel *)ubuf,
71695 ulen, 1, maskp, nmaskbits);
71696 }
71697 EXPORT_SYMBOL(bitmap_parselist_user);
71698 diff --git a/lib/bug.c b/lib/bug.c
71699 index a28c141..2bd3d95 100644
71700 --- a/lib/bug.c
71701 +++ b/lib/bug.c
71702 @@ -133,6 +133,8 @@ enum bug_trap_type report_bug(unsigned long bugaddr, struct pt_regs *regs)
71703 return BUG_TRAP_TYPE_NONE;
71704
71705 bug = find_bug(bugaddr);
71706 + if (!bug)
71707 + return BUG_TRAP_TYPE_NONE;
71708
71709 file = NULL;
71710 line = 0;
71711 diff --git a/lib/debugobjects.c b/lib/debugobjects.c
71712 index d11808c..dc2d6f8 100644
71713 --- a/lib/debugobjects.c
71714 +++ b/lib/debugobjects.c
71715 @@ -287,7 +287,7 @@ static void debug_object_is_on_stack(void *addr, int onstack)
71716 if (limit > 4)
71717 return;
71718
71719 - is_on_stack = object_is_on_stack(addr);
71720 + is_on_stack = object_starts_on_stack(addr);
71721 if (is_on_stack == onstack)
71722 return;
71723
71724 diff --git a/lib/devres.c b/lib/devres.c
71725 index 80b9c76..9e32279 100644
71726 --- a/lib/devres.c
71727 +++ b/lib/devres.c
71728 @@ -80,7 +80,7 @@ EXPORT_SYMBOL(devm_ioremap_nocache);
71729 void devm_iounmap(struct device *dev, void __iomem *addr)
71730 {
71731 WARN_ON(devres_destroy(dev, devm_ioremap_release, devm_ioremap_match,
71732 - (void *)addr));
71733 + (void __force *)addr));
71734 iounmap(addr);
71735 }
71736 EXPORT_SYMBOL(devm_iounmap);
71737 @@ -192,7 +192,7 @@ void devm_ioport_unmap(struct device *dev, void __iomem *addr)
71738 {
71739 ioport_unmap(addr);
71740 WARN_ON(devres_destroy(dev, devm_ioport_map_release,
71741 - devm_ioport_map_match, (void *)addr));
71742 + devm_ioport_map_match, (void __force *)addr));
71743 }
71744 EXPORT_SYMBOL(devm_ioport_unmap);
71745
71746 diff --git a/lib/dma-debug.c b/lib/dma-debug.c
71747 index 66ce414..6f0a0dd 100644
71748 --- a/lib/dma-debug.c
71749 +++ b/lib/dma-debug.c
71750 @@ -924,7 +924,7 @@ out:
71751
71752 static void check_for_stack(struct device *dev, void *addr)
71753 {
71754 - if (object_is_on_stack(addr))
71755 + if (object_starts_on_stack(addr))
71756 err_printk(dev, NULL, "DMA-API: device driver maps memory from"
71757 "stack [addr=%p]\n", addr);
71758 }
71759 diff --git a/lib/inflate.c b/lib/inflate.c
71760 index 013a761..c28f3fc 100644
71761 --- a/lib/inflate.c
71762 +++ b/lib/inflate.c
71763 @@ -269,7 +269,7 @@ static void free(void *where)
71764 malloc_ptr = free_mem_ptr;
71765 }
71766 #else
71767 -#define malloc(a) kmalloc(a, GFP_KERNEL)
71768 +#define malloc(a) kmalloc((a), GFP_KERNEL)
71769 #define free(a) kfree(a)
71770 #endif
71771
71772 diff --git a/lib/ioremap.c b/lib/ioremap.c
71773 index 0c9216c..863bd89 100644
71774 --- a/lib/ioremap.c
71775 +++ b/lib/ioremap.c
71776 @@ -38,7 +38,7 @@ static inline int ioremap_pmd_range(pud_t *pud, unsigned long addr,
71777 unsigned long next;
71778
71779 phys_addr -= addr;
71780 - pmd = pmd_alloc(&init_mm, pud, addr);
71781 + pmd = pmd_alloc_kernel(&init_mm, pud, addr);
71782 if (!pmd)
71783 return -ENOMEM;
71784 do {
71785 @@ -56,7 +56,7 @@ static inline int ioremap_pud_range(pgd_t *pgd, unsigned long addr,
71786 unsigned long next;
71787
71788 phys_addr -= addr;
71789 - pud = pud_alloc(&init_mm, pgd, addr);
71790 + pud = pud_alloc_kernel(&init_mm, pgd, addr);
71791 if (!pud)
71792 return -ENOMEM;
71793 do {
71794 diff --git a/lib/is_single_threaded.c b/lib/is_single_threaded.c
71795 index bd2bea9..6b3c95e 100644
71796 --- a/lib/is_single_threaded.c
71797 +++ b/lib/is_single_threaded.c
71798 @@ -22,6 +22,9 @@ bool current_is_single_threaded(void)
71799 struct task_struct *p, *t;
71800 bool ret;
71801
71802 + if (!mm)
71803 + return true;
71804 +
71805 if (atomic_read(&task->signal->live) != 1)
71806 return false;
71807
71808 diff --git a/lib/list_debug.c b/lib/list_debug.c
71809 index c24c2f7..bef49ee 100644
71810 --- a/lib/list_debug.c
71811 +++ b/lib/list_debug.c
71812 @@ -23,17 +23,19 @@ void __list_add(struct list_head *new,
71813 struct list_head *prev,
71814 struct list_head *next)
71815 {
71816 - WARN(next->prev != prev,
71817 + if (WARN(next->prev != prev,
71818 "list_add corruption. next->prev should be "
71819 "prev (%p), but was %p. (next=%p).\n",
71820 - prev, next->prev, next);
71821 - WARN(prev->next != next,
71822 + prev, next->prev, next) ||
71823 + WARN(prev->next != next,
71824 "list_add corruption. prev->next should be "
71825 "next (%p), but was %p. (prev=%p).\n",
71826 - next, prev->next, prev);
71827 - WARN(new == prev || new == next,
71828 + next, prev->next, prev) ||
71829 + WARN(new == prev || new == next,
71830 "list_add double add: new=%p, prev=%p, next=%p.\n",
71831 - new, prev, next);
71832 + new, prev, next))
71833 + return;
71834 +
71835 next->prev = new;
71836 new->next = next;
71837 new->prev = prev;
71838 @@ -86,12 +88,14 @@ EXPORT_SYMBOL(list_del);
71839 void __list_add_rcu(struct list_head *new,
71840 struct list_head *prev, struct list_head *next)
71841 {
71842 - WARN(next->prev != prev,
71843 + if (WARN(next->prev != prev,
71844 "list_add_rcu corruption. next->prev should be prev (%p), but was %p. (next=%p).\n",
71845 - prev, next->prev, next);
71846 - WARN(prev->next != next,
71847 + prev, next->prev, next) ||
71848 + WARN(prev->next != next,
71849 "list_add_rcu corruption. prev->next should be next (%p), but was %p. (prev=%p).\n",
71850 - next, prev->next, prev);
71851 + next, prev->next, prev))
71852 + return;
71853 +
71854 new->next = next;
71855 new->prev = prev;
71856 rcu_assign_pointer(list_next_rcu(prev), new);
71857 diff --git a/lib/radix-tree.c b/lib/radix-tree.c
71858 index e796429..6e38f9f 100644
71859 --- a/lib/radix-tree.c
71860 +++ b/lib/radix-tree.c
71861 @@ -92,7 +92,7 @@ struct radix_tree_preload {
71862 int nr;
71863 struct radix_tree_node *nodes[RADIX_TREE_PRELOAD_SIZE];
71864 };
71865 -static DEFINE_PER_CPU(struct radix_tree_preload, radix_tree_preloads) = { 0, };
71866 +static DEFINE_PER_CPU(struct radix_tree_preload, radix_tree_preloads);
71867
71868 static inline void *ptr_to_indirect(void *ptr)
71869 {
71870 diff --git a/lib/strncpy_from_user.c b/lib/strncpy_from_user.c
71871 index bb2b201..46abaf9 100644
71872 --- a/lib/strncpy_from_user.c
71873 +++ b/lib/strncpy_from_user.c
71874 @@ -21,7 +21,7 @@
71875 */
71876 static inline long do_strncpy_from_user(char *dst, const char __user *src, long count, unsigned long max)
71877 {
71878 - const struct word_at_a_time constants = WORD_AT_A_TIME_CONSTANTS;
71879 + static const struct word_at_a_time constants = WORD_AT_A_TIME_CONSTANTS;
71880 long res = 0;
71881
71882 /*
71883 diff --git a/lib/strnlen_user.c b/lib/strnlen_user.c
71884 index a28df52..3d55877 100644
71885 --- a/lib/strnlen_user.c
71886 +++ b/lib/strnlen_user.c
71887 @@ -26,7 +26,7 @@
71888 */
71889 static inline long do_strnlen_user(const char __user *src, unsigned long count, unsigned long max)
71890 {
71891 - const struct word_at_a_time constants = WORD_AT_A_TIME_CONSTANTS;
71892 + static const struct word_at_a_time constants = WORD_AT_A_TIME_CONSTANTS;
71893 long align, res = 0;
71894 unsigned long c;
71895
71896 diff --git a/lib/vsprintf.c b/lib/vsprintf.c
71897 index 0e33754..50a0e63 100644
71898 --- a/lib/vsprintf.c
71899 +++ b/lib/vsprintf.c
71900 @@ -16,6 +16,9 @@
71901 * - scnprintf and vscnprintf
71902 */
71903
71904 +#ifdef CONFIG_GRKERNSEC_HIDESYM
71905 +#define __INCLUDED_BY_HIDESYM 1
71906 +#endif
71907 #include <stdarg.h>
71908 #include <linux/module.h> /* for KSYM_SYMBOL_LEN */
71909 #include <linux/types.h>
71910 @@ -536,7 +539,7 @@ char *symbol_string(char *buf, char *end, void *ptr,
71911 char sym[KSYM_SYMBOL_LEN];
71912 if (ext == 'B')
71913 sprint_backtrace(sym, value);
71914 - else if (ext != 'f' && ext != 's')
71915 + else if (ext != 'f' && ext != 's' && ext != 'a')
71916 sprint_symbol(sym, value);
71917 else
71918 sprint_symbol_no_offset(sym, value);
71919 @@ -969,7 +972,11 @@ char *netdev_feature_string(char *buf, char *end, const u8 *addr,
71920 return number(buf, end, *(const netdev_features_t *)addr, spec);
71921 }
71922
71923 +#ifdef CONFIG_GRKERNSEC_HIDESYM
71924 +int kptr_restrict __read_mostly = 2;
71925 +#else
71926 int kptr_restrict __read_mostly;
71927 +#endif
71928
71929 /*
71930 * Show a '%p' thing. A kernel extension is that the '%p' is followed
71931 @@ -983,6 +990,8 @@ int kptr_restrict __read_mostly;
71932 * - 'S' For symbolic direct pointers with offset
71933 * - 's' For symbolic direct pointers without offset
71934 * - 'B' For backtraced symbolic direct pointers with offset
71935 + * - 'A' For symbolic direct pointers with offset approved for use with GRKERNSEC_HIDESYM
71936 + * - 'a' For symbolic direct pointers without offset approved for use with GRKERNSEC_HIDESYM
71937 * - 'R' For decoded struct resource, e.g., [mem 0x0-0x1f 64bit pref]
71938 * - 'r' For raw struct resource, e.g., [mem 0x0-0x1f flags 0x201]
71939 * - 'M' For a 6-byte MAC address, it prints the address in the
71940 @@ -1038,12 +1047,12 @@ char *pointer(const char *fmt, char *buf, char *end, void *ptr,
71941
71942 if (!ptr && *fmt != 'K') {
71943 /*
71944 - * Print (null) with the same width as a pointer so it makes
71945 + * Print (nil) with the same width as a pointer so it makes
71946 * tabular output look nice.
71947 */
71948 if (spec.field_width == -1)
71949 spec.field_width = default_width;
71950 - return string(buf, end, "(null)", spec);
71951 + return string(buf, end, "(nil)", spec);
71952 }
71953
71954 switch (*fmt) {
71955 @@ -1053,6 +1062,13 @@ char *pointer(const char *fmt, char *buf, char *end, void *ptr,
71956 /* Fallthrough */
71957 case 'S':
71958 case 's':
71959 +#ifdef CONFIG_GRKERNSEC_HIDESYM
71960 + break;
71961 +#else
71962 + return symbol_string(buf, end, ptr, spec, *fmt);
71963 +#endif
71964 + case 'A':
71965 + case 'a':
71966 case 'B':
71967 return symbol_string(buf, end, ptr, spec, *fmt);
71968 case 'R':
71969 @@ -1093,6 +1109,8 @@ char *pointer(const char *fmt, char *buf, char *end, void *ptr,
71970 va_end(va);
71971 return buf;
71972 }
71973 + case 'P':
71974 + break;
71975 case 'K':
71976 /*
71977 * %pK cannot be used in IRQ context because its test
71978 @@ -1116,6 +1134,21 @@ char *pointer(const char *fmt, char *buf, char *end, void *ptr,
71979 }
71980 break;
71981 }
71982 +
71983 +#ifdef CONFIG_GRKERNSEC_HIDESYM
71984 + /* 'P' = approved pointers to copy to userland,
71985 + as in the /proc/kallsyms case, as we make it display nothing
71986 + for non-root users, and the real contents for root users
71987 + Also ignore 'K' pointers, since we force their NULLing for non-root users
71988 + above
71989 + */
71990 + if (ptr > TASK_SIZE && *fmt != 'P' && *fmt != 'K' && is_usercopy_object(buf)) {
71991 + printk(KERN_ALERT "grsec: kernel infoleak detected! Please report this log to spender@grsecurity.net.\n");
71992 + dump_stack();
71993 + ptr = NULL;
71994 + }
71995 +#endif
71996 +
71997 spec.flags |= SMALL;
71998 if (spec.field_width == -1) {
71999 spec.field_width = default_width;
72000 @@ -1831,11 +1864,11 @@ int bstr_printf(char *buf, size_t size, const char *fmt, const u32 *bin_buf)
72001 typeof(type) value; \
72002 if (sizeof(type) == 8) { \
72003 args = PTR_ALIGN(args, sizeof(u32)); \
72004 - *(u32 *)&value = *(u32 *)args; \
72005 - *((u32 *)&value + 1) = *(u32 *)(args + 4); \
72006 + *(u32 *)&value = *(const u32 *)args; \
72007 + *((u32 *)&value + 1) = *(const u32 *)(args + 4); \
72008 } else { \
72009 args = PTR_ALIGN(args, sizeof(type)); \
72010 - value = *(typeof(type) *)args; \
72011 + value = *(const typeof(type) *)args; \
72012 } \
72013 args += sizeof(type); \
72014 value; \
72015 @@ -1898,7 +1931,7 @@ int bstr_printf(char *buf, size_t size, const char *fmt, const u32 *bin_buf)
72016 case FORMAT_TYPE_STR: {
72017 const char *str_arg = args;
72018 args += strlen(str_arg) + 1;
72019 - str = string(str, end, (char *)str_arg, spec);
72020 + str = string(str, end, str_arg, spec);
72021 break;
72022 }
72023
72024 diff --git a/localversion-grsec b/localversion-grsec
72025 new file mode 100644
72026 index 0000000..7cd6065
72027 --- /dev/null
72028 +++ b/localversion-grsec
72029 @@ -0,0 +1 @@
72030 +-grsec
72031 diff --git a/mm/Kconfig b/mm/Kconfig
72032 index d5c8019..f513038 100644
72033 --- a/mm/Kconfig
72034 +++ b/mm/Kconfig
72035 @@ -251,10 +251,10 @@ config KSM
72036 root has set /sys/kernel/mm/ksm/run to 1 (if CONFIG_SYSFS is set).
72037
72038 config DEFAULT_MMAP_MIN_ADDR
72039 - int "Low address space to protect from user allocation"
72040 + int "Low address space to protect from user allocation"
72041 depends on MMU
72042 - default 4096
72043 - help
72044 + default 65536
72045 + help
72046 This is the portion of low virtual memory which should be protected
72047 from userspace allocation. Keeping a user from writing to low pages
72048 can help reduce the impact of kernel NULL pointer bugs.
72049 @@ -285,7 +285,7 @@ config MEMORY_FAILURE
72050
72051 config HWPOISON_INJECT
72052 tristate "HWPoison pages injector"
72053 - depends on MEMORY_FAILURE && DEBUG_KERNEL && PROC_FS
72054 + depends on MEMORY_FAILURE && DEBUG_KERNEL && PROC_FS && !GRKERNSEC
72055 select PROC_PAGE_MONITOR
72056
72057 config NOMMU_INITIAL_TRIM_EXCESS
72058 diff --git a/mm/filemap.c b/mm/filemap.c
72059 index 3843445..4fe6833 100644
72060 --- a/mm/filemap.c
72061 +++ b/mm/filemap.c
72062 @@ -1746,7 +1746,7 @@ int generic_file_mmap(struct file * file, struct vm_area_struct * vma)
72063 struct address_space *mapping = file->f_mapping;
72064
72065 if (!mapping->a_ops->readpage)
72066 - return -ENOEXEC;
72067 + return -ENODEV;
72068 file_accessed(file);
72069 vma->vm_ops = &generic_file_vm_ops;
72070 vma->vm_flags |= VM_CAN_NONLINEAR;
72071 @@ -2087,6 +2087,7 @@ inline int generic_write_checks(struct file *file, loff_t *pos, size_t *count, i
72072 *pos = i_size_read(inode);
72073
72074 if (limit != RLIM_INFINITY) {
72075 + gr_learn_resource(current, RLIMIT_FSIZE,*pos, 0);
72076 if (*pos >= limit) {
72077 send_sig(SIGXFSZ, current, 0);
72078 return -EFBIG;
72079 diff --git a/mm/fremap.c b/mm/fremap.c
72080 index 9ed4fd4..c42648d 100644
72081 --- a/mm/fremap.c
72082 +++ b/mm/fremap.c
72083 @@ -155,6 +155,11 @@ SYSCALL_DEFINE5(remap_file_pages, unsigned long, start, unsigned long, size,
72084 retry:
72085 vma = find_vma(mm, start);
72086
72087 +#ifdef CONFIG_PAX_SEGMEXEC
72088 + if (vma && (mm->pax_flags & MF_PAX_SEGMEXEC) && (vma->vm_flags & VM_MAYEXEC))
72089 + goto out;
72090 +#endif
72091 +
72092 /*
72093 * Make sure the vma is shared, that it supports prefaulting,
72094 * and that the remapped range is valid and fully within
72095 diff --git a/mm/highmem.c b/mm/highmem.c
72096 index d517cd1..9568fec 100644
72097 --- a/mm/highmem.c
72098 +++ b/mm/highmem.c
72099 @@ -98,7 +98,7 @@ struct page *kmap_to_page(void *vaddr)
72100 {
72101 unsigned long addr = (unsigned long)vaddr;
72102
72103 - if (addr >= PKMAP_ADDR(0) && addr <= PKMAP_ADDR(LAST_PKMAP)) {
72104 + if (addr >= PKMAP_ADDR(0) && addr < PKMAP_ADDR(LAST_PKMAP)) {
72105 int i = (addr - PKMAP_ADDR(0)) >> PAGE_SHIFT;
72106 return pte_page(pkmap_page_table[i]);
72107 }
72108 @@ -137,9 +137,10 @@ static void flush_all_zero_pkmaps(void)
72109 * So no dangers, even with speculative execution.
72110 */
72111 page = pte_page(pkmap_page_table[i]);
72112 + pax_open_kernel();
72113 pte_clear(&init_mm, (unsigned long)page_address(page),
72114 &pkmap_page_table[i]);
72115 -
72116 + pax_close_kernel();
72117 set_page_address(page, NULL);
72118 need_flush = 1;
72119 }
72120 @@ -198,9 +199,11 @@ start:
72121 }
72122 }
72123 vaddr = PKMAP_ADDR(last_pkmap_nr);
72124 +
72125 + pax_open_kernel();
72126 set_pte_at(&init_mm, vaddr,
72127 &(pkmap_page_table[last_pkmap_nr]), mk_pte(page, kmap_prot));
72128 -
72129 + pax_close_kernel();
72130 pkmap_count[last_pkmap_nr] = 1;
72131 set_page_address(page, (void *)vaddr);
72132
72133 diff --git a/mm/huge_memory.c b/mm/huge_memory.c
72134 index 141dbb6..ebff057 100644
72135 --- a/mm/huge_memory.c
72136 +++ b/mm/huge_memory.c
72137 @@ -735,7 +735,7 @@ out:
72138 * run pte_offset_map on the pmd, if an huge pmd could
72139 * materialize from under us from a different thread.
72140 */
72141 - if (unlikely(__pte_alloc(mm, vma, pmd, address)))
72142 + if (unlikely(pmd_none(*pmd) && __pte_alloc(mm, vma, pmd, address)))
72143 return VM_FAULT_OOM;
72144 /* if an huge pmd materialized from under us just retry later */
72145 if (unlikely(pmd_trans_huge(*pmd)))
72146 diff --git a/mm/hugetlb.c b/mm/hugetlb.c
72147 index 3adceaf..dccfea3 100644
72148 --- a/mm/hugetlb.c
72149 +++ b/mm/hugetlb.c
72150 @@ -2512,6 +2512,27 @@ static int unmap_ref_private(struct mm_struct *mm, struct vm_area_struct *vma,
72151 return 1;
72152 }
72153
72154 +#ifdef CONFIG_PAX_SEGMEXEC
72155 +static void pax_mirror_huge_pte(struct vm_area_struct *vma, unsigned long address, struct page *page_m)
72156 +{
72157 + struct mm_struct *mm = vma->vm_mm;
72158 + struct vm_area_struct *vma_m;
72159 + unsigned long address_m;
72160 + pte_t *ptep_m;
72161 +
72162 + vma_m = pax_find_mirror_vma(vma);
72163 + if (!vma_m)
72164 + return;
72165 +
72166 + BUG_ON(address >= SEGMEXEC_TASK_SIZE);
72167 + address_m = address + SEGMEXEC_TASK_SIZE;
72168 + ptep_m = huge_pte_offset(mm, address_m & HPAGE_MASK);
72169 + get_page(page_m);
72170 + hugepage_add_anon_rmap(page_m, vma_m, address_m);
72171 + set_huge_pte_at(mm, address_m, ptep_m, make_huge_pte(vma_m, page_m, 0));
72172 +}
72173 +#endif
72174 +
72175 /*
72176 * Hugetlb_cow() should be called with page lock of the original hugepage held.
72177 * Called with hugetlb_instantiation_mutex held and pte_page locked so we
72178 @@ -2628,6 +2649,11 @@ retry_avoidcopy:
72179 make_huge_pte(vma, new_page, 1));
72180 page_remove_rmap(old_page);
72181 hugepage_add_new_anon_rmap(new_page, vma, address);
72182 +
72183 +#ifdef CONFIG_PAX_SEGMEXEC
72184 + pax_mirror_huge_pte(vma, address, new_page);
72185 +#endif
72186 +
72187 /* Make the old page be freed below */
72188 new_page = old_page;
72189 mmu_notifier_invalidate_range_end(mm,
72190 @@ -2786,6 +2812,10 @@ retry:
72191 && (vma->vm_flags & VM_SHARED)));
72192 set_huge_pte_at(mm, address, ptep, new_pte);
72193
72194 +#ifdef CONFIG_PAX_SEGMEXEC
72195 + pax_mirror_huge_pte(vma, address, page);
72196 +#endif
72197 +
72198 if ((flags & FAULT_FLAG_WRITE) && !(vma->vm_flags & VM_SHARED)) {
72199 /* Optimization, do the COW without a second fault */
72200 ret = hugetlb_cow(mm, vma, address, ptep, new_pte, page);
72201 @@ -2815,6 +2845,10 @@ int hugetlb_fault(struct mm_struct *mm, struct vm_area_struct *vma,
72202 static DEFINE_MUTEX(hugetlb_instantiation_mutex);
72203 struct hstate *h = hstate_vma(vma);
72204
72205 +#ifdef CONFIG_PAX_SEGMEXEC
72206 + struct vm_area_struct *vma_m;
72207 +#endif
72208 +
72209 address &= huge_page_mask(h);
72210
72211 ptep = huge_pte_offset(mm, address);
72212 @@ -2828,6 +2862,26 @@ int hugetlb_fault(struct mm_struct *mm, struct vm_area_struct *vma,
72213 VM_FAULT_SET_HINDEX(hstate_index(h));
72214 }
72215
72216 +#ifdef CONFIG_PAX_SEGMEXEC
72217 + vma_m = pax_find_mirror_vma(vma);
72218 + if (vma_m) {
72219 + unsigned long address_m;
72220 +
72221 + if (vma->vm_start > vma_m->vm_start) {
72222 + address_m = address;
72223 + address -= SEGMEXEC_TASK_SIZE;
72224 + vma = vma_m;
72225 + h = hstate_vma(vma);
72226 + } else
72227 + address_m = address + SEGMEXEC_TASK_SIZE;
72228 +
72229 + if (!huge_pte_alloc(mm, address_m, huge_page_size(h)))
72230 + return VM_FAULT_OOM;
72231 + address_m &= HPAGE_MASK;
72232 + unmap_hugepage_range(vma, address_m, address_m + HPAGE_SIZE, NULL);
72233 + }
72234 +#endif
72235 +
72236 ptep = huge_pte_alloc(mm, address, huge_page_size(h));
72237 if (!ptep)
72238 return VM_FAULT_OOM;
72239 diff --git a/mm/internal.h b/mm/internal.h
72240 index b8c91b3..93e95a3 100644
72241 --- a/mm/internal.h
72242 +++ b/mm/internal.h
72243 @@ -95,6 +95,7 @@ extern void putback_lru_page(struct page *page);
72244 * in mm/page_alloc.c
72245 */
72246 extern void __free_pages_bootmem(struct page *page, unsigned int order);
72247 +extern void free_compound_page(struct page *page);
72248 extern void prep_compound_page(struct page *page, unsigned long order);
72249 #ifdef CONFIG_MEMORY_FAILURE
72250 extern bool is_free_buddy_page(struct page *page);
72251 diff --git a/mm/kmemleak.c b/mm/kmemleak.c
72252 index 45eb621..6ccd8ea 100644
72253 --- a/mm/kmemleak.c
72254 +++ b/mm/kmemleak.c
72255 @@ -363,7 +363,7 @@ static void print_unreferenced(struct seq_file *seq,
72256
72257 for (i = 0; i < object->trace_len; i++) {
72258 void *ptr = (void *)object->trace[i];
72259 - seq_printf(seq, " [<%p>] %pS\n", ptr, ptr);
72260 + seq_printf(seq, " [<%p>] %pA\n", ptr, ptr);
72261 }
72262 }
72263
72264 diff --git a/mm/maccess.c b/mm/maccess.c
72265 index d53adf9..03a24bf 100644
72266 --- a/mm/maccess.c
72267 +++ b/mm/maccess.c
72268 @@ -26,7 +26,7 @@ long __probe_kernel_read(void *dst, const void *src, size_t size)
72269 set_fs(KERNEL_DS);
72270 pagefault_disable();
72271 ret = __copy_from_user_inatomic(dst,
72272 - (__force const void __user *)src, size);
72273 + (const void __force_user *)src, size);
72274 pagefault_enable();
72275 set_fs(old_fs);
72276
72277 @@ -53,7 +53,7 @@ long __probe_kernel_write(void *dst, const void *src, size_t size)
72278
72279 set_fs(KERNEL_DS);
72280 pagefault_disable();
72281 - ret = __copy_to_user_inatomic((__force void __user *)dst, src, size);
72282 + ret = __copy_to_user_inatomic((void __force_user *)dst, src, size);
72283 pagefault_enable();
72284 set_fs(old_fs);
72285
72286 diff --git a/mm/madvise.c b/mm/madvise.c
72287 index 14d260f..b2a80fd 100644
72288 --- a/mm/madvise.c
72289 +++ b/mm/madvise.c
72290 @@ -48,6 +48,10 @@ static long madvise_behavior(struct vm_area_struct * vma,
72291 pgoff_t pgoff;
72292 unsigned long new_flags = vma->vm_flags;
72293
72294 +#ifdef CONFIG_PAX_SEGMEXEC
72295 + struct vm_area_struct *vma_m;
72296 +#endif
72297 +
72298 switch (behavior) {
72299 case MADV_NORMAL:
72300 new_flags = new_flags & ~VM_RAND_READ & ~VM_SEQ_READ;
72301 @@ -119,6 +123,13 @@ success:
72302 /*
72303 * vm_flags is protected by the mmap_sem held in write mode.
72304 */
72305 +
72306 +#ifdef CONFIG_PAX_SEGMEXEC
72307 + vma_m = pax_find_mirror_vma(vma);
72308 + if (vma_m)
72309 + vma_m->vm_flags = new_flags & ~(VM_WRITE | VM_MAYWRITE | VM_ACCOUNT);
72310 +#endif
72311 +
72312 vma->vm_flags = new_flags;
72313
72314 out:
72315 @@ -177,6 +188,11 @@ static long madvise_dontneed(struct vm_area_struct * vma,
72316 struct vm_area_struct ** prev,
72317 unsigned long start, unsigned long end)
72318 {
72319 +
72320 +#ifdef CONFIG_PAX_SEGMEXEC
72321 + struct vm_area_struct *vma_m;
72322 +#endif
72323 +
72324 *prev = vma;
72325 if (vma->vm_flags & (VM_LOCKED|VM_HUGETLB|VM_PFNMAP))
72326 return -EINVAL;
72327 @@ -189,6 +205,21 @@ static long madvise_dontneed(struct vm_area_struct * vma,
72328 zap_page_range(vma, start, end - start, &details);
72329 } else
72330 zap_page_range(vma, start, end - start, NULL);
72331 +
72332 +#ifdef CONFIG_PAX_SEGMEXEC
72333 + vma_m = pax_find_mirror_vma(vma);
72334 + if (vma_m) {
72335 + if (unlikely(vma->vm_flags & VM_NONLINEAR)) {
72336 + struct zap_details details = {
72337 + .nonlinear_vma = vma_m,
72338 + .last_index = ULONG_MAX,
72339 + };
72340 + zap_page_range(vma, start + SEGMEXEC_TASK_SIZE, end - start, &details);
72341 + } else
72342 + zap_page_range(vma, start + SEGMEXEC_TASK_SIZE, end - start, NULL);
72343 + }
72344 +#endif
72345 +
72346 return 0;
72347 }
72348
72349 @@ -393,6 +424,16 @@ SYSCALL_DEFINE3(madvise, unsigned long, start, size_t, len_in, int, behavior)
72350 if (end < start)
72351 goto out;
72352
72353 +#ifdef CONFIG_PAX_SEGMEXEC
72354 + if (current->mm->pax_flags & MF_PAX_SEGMEXEC) {
72355 + if (end > SEGMEXEC_TASK_SIZE)
72356 + goto out;
72357 + } else
72358 +#endif
72359 +
72360 + if (end > TASK_SIZE)
72361 + goto out;
72362 +
72363 error = 0;
72364 if (end == start)
72365 goto out;
72366 diff --git a/mm/memory-failure.c b/mm/memory-failure.c
72367 index a6e2141..eaf5aad 100644
72368 --- a/mm/memory-failure.c
72369 +++ b/mm/memory-failure.c
72370 @@ -61,7 +61,7 @@ int sysctl_memory_failure_early_kill __read_mostly = 0;
72371
72372 int sysctl_memory_failure_recovery __read_mostly = 1;
72373
72374 -atomic_long_t mce_bad_pages __read_mostly = ATOMIC_LONG_INIT(0);
72375 +atomic_long_unchecked_t mce_bad_pages __read_mostly = ATOMIC_LONG_INIT(0);
72376
72377 #if defined(CONFIG_HWPOISON_INJECT) || defined(CONFIG_HWPOISON_INJECT_MODULE)
72378
72379 @@ -202,7 +202,7 @@ static int kill_proc(struct task_struct *t, unsigned long addr, int trapno,
72380 pfn, t->comm, t->pid);
72381 si.si_signo = SIGBUS;
72382 si.si_errno = 0;
72383 - si.si_addr = (void *)addr;
72384 + si.si_addr = (void __user *)addr;
72385 #ifdef __ARCH_SI_TRAPNO
72386 si.si_trapno = trapno;
72387 #endif
72388 @@ -1038,7 +1038,7 @@ int memory_failure(unsigned long pfn, int trapno, int flags)
72389 }
72390
72391 nr_pages = 1 << compound_trans_order(hpage);
72392 - atomic_long_add(nr_pages, &mce_bad_pages);
72393 + atomic_long_add_unchecked(nr_pages, &mce_bad_pages);
72394
72395 /*
72396 * We need/can do nothing about count=0 pages.
72397 @@ -1068,7 +1068,7 @@ int memory_failure(unsigned long pfn, int trapno, int flags)
72398 if (!PageHWPoison(hpage)
72399 || (hwpoison_filter(p) && TestClearPageHWPoison(p))
72400 || (p != hpage && TestSetPageHWPoison(hpage))) {
72401 - atomic_long_sub(nr_pages, &mce_bad_pages);
72402 + atomic_long_sub_unchecked(nr_pages, &mce_bad_pages);
72403 return 0;
72404 }
72405 set_page_hwpoison_huge_page(hpage);
72406 @@ -1126,7 +1126,7 @@ int memory_failure(unsigned long pfn, int trapno, int flags)
72407 }
72408 if (hwpoison_filter(p)) {
72409 if (TestClearPageHWPoison(p))
72410 - atomic_long_sub(nr_pages, &mce_bad_pages);
72411 + atomic_long_sub_unchecked(nr_pages, &mce_bad_pages);
72412 unlock_page(hpage);
72413 put_page(hpage);
72414 return 0;
72415 @@ -1321,7 +1321,7 @@ int unpoison_memory(unsigned long pfn)
72416 return 0;
72417 }
72418 if (TestClearPageHWPoison(p))
72419 - atomic_long_sub(nr_pages, &mce_bad_pages);
72420 + atomic_long_sub_unchecked(nr_pages, &mce_bad_pages);
72421 pr_info("MCE: Software-unpoisoned free page %#lx\n", pfn);
72422 return 0;
72423 }
72424 @@ -1335,7 +1335,7 @@ int unpoison_memory(unsigned long pfn)
72425 */
72426 if (TestClearPageHWPoison(page)) {
72427 pr_info("MCE: Software-unpoisoned page %#lx\n", pfn);
72428 - atomic_long_sub(nr_pages, &mce_bad_pages);
72429 + atomic_long_sub_unchecked(nr_pages, &mce_bad_pages);
72430 freeit = 1;
72431 if (PageHuge(page))
72432 clear_page_hwpoison_huge_page(page);
72433 @@ -1440,7 +1440,7 @@ static int soft_offline_huge_page(struct page *page, int flags)
72434 }
72435 done:
72436 if (!PageHWPoison(hpage))
72437 - atomic_long_add(1 << compound_trans_order(hpage),
72438 + atomic_long_add_unchecked(1 << compound_trans_order(hpage),
72439 &mce_bad_pages);
72440 set_page_hwpoison_huge_page(hpage);
72441 dequeue_hwpoisoned_huge_page(hpage);
72442 @@ -1572,7 +1572,7 @@ int soft_offline_page(struct page *page, int flags)
72443 return ret;
72444
72445 done:
72446 - atomic_long_add(1, &mce_bad_pages);
72447 + atomic_long_add_unchecked(1, &mce_bad_pages);
72448 SetPageHWPoison(page);
72449 /* keep elevated page count for bad page */
72450 return ret;
72451 diff --git a/mm/memory.c b/mm/memory.c
72452 index 5736170..8e04800 100644
72453 --- a/mm/memory.c
72454 +++ b/mm/memory.c
72455 @@ -426,6 +426,7 @@ static inline void free_pmd_range(struct mmu_gather *tlb, pud_t *pud,
72456 free_pte_range(tlb, pmd, addr);
72457 } while (pmd++, addr = next, addr != end);
72458
72459 +#if !defined(CONFIG_X86_32) || !defined(CONFIG_PAX_PER_CPU_PGD)
72460 start &= PUD_MASK;
72461 if (start < floor)
72462 return;
72463 @@ -440,6 +441,8 @@ static inline void free_pmd_range(struct mmu_gather *tlb, pud_t *pud,
72464 pmd = pmd_offset(pud, start);
72465 pud_clear(pud);
72466 pmd_free_tlb(tlb, pmd, start);
72467 +#endif
72468 +
72469 }
72470
72471 static inline void free_pud_range(struct mmu_gather *tlb, pgd_t *pgd,
72472 @@ -459,6 +462,7 @@ static inline void free_pud_range(struct mmu_gather *tlb, pgd_t *pgd,
72473 free_pmd_range(tlb, pud, addr, next, floor, ceiling);
72474 } while (pud++, addr = next, addr != end);
72475
72476 +#if !defined(CONFIG_X86_64) || !defined(CONFIG_PAX_PER_CPU_PGD)
72477 start &= PGDIR_MASK;
72478 if (start < floor)
72479 return;
72480 @@ -473,6 +477,8 @@ static inline void free_pud_range(struct mmu_gather *tlb, pgd_t *pgd,
72481 pud = pud_offset(pgd, start);
72482 pgd_clear(pgd);
72483 pud_free_tlb(tlb, pud, start);
72484 +#endif
72485 +
72486 }
72487
72488 /*
72489 @@ -1614,12 +1620,6 @@ no_page_table:
72490 return page;
72491 }
72492
72493 -static inline int stack_guard_page(struct vm_area_struct *vma, unsigned long addr)
72494 -{
72495 - return stack_guard_page_start(vma, addr) ||
72496 - stack_guard_page_end(vma, addr+PAGE_SIZE);
72497 -}
72498 -
72499 /**
72500 * __get_user_pages() - pin user pages in memory
72501 * @tsk: task_struct of target task
72502 @@ -1692,10 +1692,10 @@ int __get_user_pages(struct task_struct *tsk, struct mm_struct *mm,
72503 (VM_MAYREAD | VM_MAYWRITE) : (VM_READ | VM_WRITE);
72504 i = 0;
72505
72506 - do {
72507 + while (nr_pages) {
72508 struct vm_area_struct *vma;
72509
72510 - vma = find_extend_vma(mm, start);
72511 + vma = find_vma(mm, start);
72512 if (!vma && in_gate_area(mm, start)) {
72513 unsigned long pg = start & PAGE_MASK;
72514 pgd_t *pgd;
72515 @@ -1743,7 +1743,7 @@ int __get_user_pages(struct task_struct *tsk, struct mm_struct *mm,
72516 goto next_page;
72517 }
72518
72519 - if (!vma ||
72520 + if (!vma || start < vma->vm_start ||
72521 (vma->vm_flags & (VM_IO | VM_PFNMAP)) ||
72522 !(vm_flags & vma->vm_flags))
72523 return i ? : -EFAULT;
72524 @@ -1770,11 +1770,6 @@ int __get_user_pages(struct task_struct *tsk, struct mm_struct *mm,
72525 int ret;
72526 unsigned int fault_flags = 0;
72527
72528 - /* For mlock, just skip the stack guard page. */
72529 - if (foll_flags & FOLL_MLOCK) {
72530 - if (stack_guard_page(vma, start))
72531 - goto next_page;
72532 - }
72533 if (foll_flags & FOLL_WRITE)
72534 fault_flags |= FAULT_FLAG_WRITE;
72535 if (nonblocking)
72536 @@ -1848,7 +1843,7 @@ next_page:
72537 start += PAGE_SIZE;
72538 nr_pages--;
72539 } while (nr_pages && start < vma->vm_end);
72540 - } while (nr_pages);
72541 + }
72542 return i;
72543 }
72544 EXPORT_SYMBOL(__get_user_pages);
72545 @@ -2055,6 +2050,10 @@ static int insert_page(struct vm_area_struct *vma, unsigned long addr,
72546 page_add_file_rmap(page);
72547 set_pte_at(mm, addr, pte, mk_pte(page, prot));
72548
72549 +#ifdef CONFIG_PAX_SEGMEXEC
72550 + pax_mirror_file_pte(vma, addr, page, ptl);
72551 +#endif
72552 +
72553 retval = 0;
72554 pte_unmap_unlock(pte, ptl);
72555 return retval;
72556 @@ -2089,10 +2088,22 @@ out:
72557 int vm_insert_page(struct vm_area_struct *vma, unsigned long addr,
72558 struct page *page)
72559 {
72560 +
72561 +#ifdef CONFIG_PAX_SEGMEXEC
72562 + struct vm_area_struct *vma_m;
72563 +#endif
72564 +
72565 if (addr < vma->vm_start || addr >= vma->vm_end)
72566 return -EFAULT;
72567 if (!page_count(page))
72568 return -EINVAL;
72569 +
72570 +#ifdef CONFIG_PAX_SEGMEXEC
72571 + vma_m = pax_find_mirror_vma(vma);
72572 + if (vma_m)
72573 + vma_m->vm_flags |= VM_INSERTPAGE;
72574 +#endif
72575 +
72576 vma->vm_flags |= VM_INSERTPAGE;
72577 return insert_page(vma, addr, page, vma->vm_page_prot);
72578 }
72579 @@ -2178,6 +2189,7 @@ int vm_insert_mixed(struct vm_area_struct *vma, unsigned long addr,
72580 unsigned long pfn)
72581 {
72582 BUG_ON(!(vma->vm_flags & VM_MIXEDMAP));
72583 + BUG_ON(vma->vm_mirror);
72584
72585 if (addr < vma->vm_start || addr >= vma->vm_end)
72586 return -EFAULT;
72587 @@ -2385,7 +2397,9 @@ static int apply_to_pmd_range(struct mm_struct *mm, pud_t *pud,
72588
72589 BUG_ON(pud_huge(*pud));
72590
72591 - pmd = pmd_alloc(mm, pud, addr);
72592 + pmd = (mm == &init_mm) ?
72593 + pmd_alloc_kernel(mm, pud, addr) :
72594 + pmd_alloc(mm, pud, addr);
72595 if (!pmd)
72596 return -ENOMEM;
72597 do {
72598 @@ -2405,7 +2419,9 @@ static int apply_to_pud_range(struct mm_struct *mm, pgd_t *pgd,
72599 unsigned long next;
72600 int err;
72601
72602 - pud = pud_alloc(mm, pgd, addr);
72603 + pud = (mm == &init_mm) ?
72604 + pud_alloc_kernel(mm, pgd, addr) :
72605 + pud_alloc(mm, pgd, addr);
72606 if (!pud)
72607 return -ENOMEM;
72608 do {
72609 @@ -2493,6 +2509,186 @@ static inline void cow_user_page(struct page *dst, struct page *src, unsigned lo
72610 copy_user_highpage(dst, src, va, vma);
72611 }
72612
72613 +#ifdef CONFIG_PAX_SEGMEXEC
72614 +static void pax_unmap_mirror_pte(struct vm_area_struct *vma, unsigned long address, pmd_t *pmd)
72615 +{
72616 + struct mm_struct *mm = vma->vm_mm;
72617 + spinlock_t *ptl;
72618 + pte_t *pte, entry;
72619 +
72620 + pte = pte_offset_map_lock(mm, pmd, address, &ptl);
72621 + entry = *pte;
72622 + if (!pte_present(entry)) {
72623 + if (!pte_none(entry)) {
72624 + BUG_ON(pte_file(entry));
72625 + free_swap_and_cache(pte_to_swp_entry(entry));
72626 + pte_clear_not_present_full(mm, address, pte, 0);
72627 + }
72628 + } else {
72629 + struct page *page;
72630 +
72631 + flush_cache_page(vma, address, pte_pfn(entry));
72632 + entry = ptep_clear_flush(vma, address, pte);
72633 + BUG_ON(pte_dirty(entry));
72634 + page = vm_normal_page(vma, address, entry);
72635 + if (page) {
72636 + update_hiwater_rss(mm);
72637 + if (PageAnon(page))
72638 + dec_mm_counter_fast(mm, MM_ANONPAGES);
72639 + else
72640 + dec_mm_counter_fast(mm, MM_FILEPAGES);
72641 + page_remove_rmap(page);
72642 + page_cache_release(page);
72643 + }
72644 + }
72645 + pte_unmap_unlock(pte, ptl);
72646 +}
72647 +
72648 +/* PaX: if vma is mirrored, synchronize the mirror's PTE
72649 + *
72650 + * the ptl of the lower mapped page is held on entry and is not released on exit
72651 + * or inside to ensure atomic changes to the PTE states (swapout, mremap, munmap, etc)
72652 + */
72653 +static void pax_mirror_anon_pte(struct vm_area_struct *vma, unsigned long address, struct page *page_m, spinlock_t *ptl)
72654 +{
72655 + struct mm_struct *mm = vma->vm_mm;
72656 + unsigned long address_m;
72657 + spinlock_t *ptl_m;
72658 + struct vm_area_struct *vma_m;
72659 + pmd_t *pmd_m;
72660 + pte_t *pte_m, entry_m;
72661 +
72662 + BUG_ON(!page_m || !PageAnon(page_m));
72663 +
72664 + vma_m = pax_find_mirror_vma(vma);
72665 + if (!vma_m)
72666 + return;
72667 +
72668 + BUG_ON(!PageLocked(page_m));
72669 + BUG_ON(address >= SEGMEXEC_TASK_SIZE);
72670 + address_m = address + SEGMEXEC_TASK_SIZE;
72671 + pmd_m = pmd_offset(pud_offset(pgd_offset(mm, address_m), address_m), address_m);
72672 + pte_m = pte_offset_map(pmd_m, address_m);
72673 + ptl_m = pte_lockptr(mm, pmd_m);
72674 + if (ptl != ptl_m) {
72675 + spin_lock_nested(ptl_m, SINGLE_DEPTH_NESTING);
72676 + if (!pte_none(*pte_m))
72677 + goto out;
72678 + }
72679 +
72680 + entry_m = pfn_pte(page_to_pfn(page_m), vma_m->vm_page_prot);
72681 + page_cache_get(page_m);
72682 + page_add_anon_rmap(page_m, vma_m, address_m);
72683 + inc_mm_counter_fast(mm, MM_ANONPAGES);
72684 + set_pte_at(mm, address_m, pte_m, entry_m);
72685 + update_mmu_cache(vma_m, address_m, entry_m);
72686 +out:
72687 + if (ptl != ptl_m)
72688 + spin_unlock(ptl_m);
72689 + pte_unmap(pte_m);
72690 + unlock_page(page_m);
72691 +}
72692 +
72693 +void pax_mirror_file_pte(struct vm_area_struct *vma, unsigned long address, struct page *page_m, spinlock_t *ptl)
72694 +{
72695 + struct mm_struct *mm = vma->vm_mm;
72696 + unsigned long address_m;
72697 + spinlock_t *ptl_m;
72698 + struct vm_area_struct *vma_m;
72699 + pmd_t *pmd_m;
72700 + pte_t *pte_m, entry_m;
72701 +
72702 + BUG_ON(!page_m || PageAnon(page_m));
72703 +
72704 + vma_m = pax_find_mirror_vma(vma);
72705 + if (!vma_m)
72706 + return;
72707 +
72708 + BUG_ON(address >= SEGMEXEC_TASK_SIZE);
72709 + address_m = address + SEGMEXEC_TASK_SIZE;
72710 + pmd_m = pmd_offset(pud_offset(pgd_offset(mm, address_m), address_m), address_m);
72711 + pte_m = pte_offset_map(pmd_m, address_m);
72712 + ptl_m = pte_lockptr(mm, pmd_m);
72713 + if (ptl != ptl_m) {
72714 + spin_lock_nested(ptl_m, SINGLE_DEPTH_NESTING);
72715 + if (!pte_none(*pte_m))
72716 + goto out;
72717 + }
72718 +
72719 + entry_m = pfn_pte(page_to_pfn(page_m), vma_m->vm_page_prot);
72720 + page_cache_get(page_m);
72721 + page_add_file_rmap(page_m);
72722 + inc_mm_counter_fast(mm, MM_FILEPAGES);
72723 + set_pte_at(mm, address_m, pte_m, entry_m);
72724 + update_mmu_cache(vma_m, address_m, entry_m);
72725 +out:
72726 + if (ptl != ptl_m)
72727 + spin_unlock(ptl_m);
72728 + pte_unmap(pte_m);
72729 +}
72730 +
72731 +static void pax_mirror_pfn_pte(struct vm_area_struct *vma, unsigned long address, unsigned long pfn_m, spinlock_t *ptl)
72732 +{
72733 + struct mm_struct *mm = vma->vm_mm;
72734 + unsigned long address_m;
72735 + spinlock_t *ptl_m;
72736 + struct vm_area_struct *vma_m;
72737 + pmd_t *pmd_m;
72738 + pte_t *pte_m, entry_m;
72739 +
72740 + vma_m = pax_find_mirror_vma(vma);
72741 + if (!vma_m)
72742 + return;
72743 +
72744 + BUG_ON(address >= SEGMEXEC_TASK_SIZE);
72745 + address_m = address + SEGMEXEC_TASK_SIZE;
72746 + pmd_m = pmd_offset(pud_offset(pgd_offset(mm, address_m), address_m), address_m);
72747 + pte_m = pte_offset_map(pmd_m, address_m);
72748 + ptl_m = pte_lockptr(mm, pmd_m);
72749 + if (ptl != ptl_m) {
72750 + spin_lock_nested(ptl_m, SINGLE_DEPTH_NESTING);
72751 + if (!pte_none(*pte_m))
72752 + goto out;
72753 + }
72754 +
72755 + entry_m = pfn_pte(pfn_m, vma_m->vm_page_prot);
72756 + set_pte_at(mm, address_m, pte_m, entry_m);
72757 +out:
72758 + if (ptl != ptl_m)
72759 + spin_unlock(ptl_m);
72760 + pte_unmap(pte_m);
72761 +}
72762 +
72763 +static void pax_mirror_pte(struct vm_area_struct *vma, unsigned long address, pte_t *pte, pmd_t *pmd, spinlock_t *ptl)
72764 +{
72765 + struct page *page_m;
72766 + pte_t entry;
72767 +
72768 + if (!(vma->vm_mm->pax_flags & MF_PAX_SEGMEXEC))
72769 + goto out;
72770 +
72771 + entry = *pte;
72772 + page_m = vm_normal_page(vma, address, entry);
72773 + if (!page_m)
72774 + pax_mirror_pfn_pte(vma, address, pte_pfn(entry), ptl);
72775 + else if (PageAnon(page_m)) {
72776 + if (pax_find_mirror_vma(vma)) {
72777 + pte_unmap_unlock(pte, ptl);
72778 + lock_page(page_m);
72779 + pte = pte_offset_map_lock(vma->vm_mm, pmd, address, &ptl);
72780 + if (pte_same(entry, *pte))
72781 + pax_mirror_anon_pte(vma, address, page_m, ptl);
72782 + else
72783 + unlock_page(page_m);
72784 + }
72785 + } else
72786 + pax_mirror_file_pte(vma, address, page_m, ptl);
72787 +
72788 +out:
72789 + pte_unmap_unlock(pte, ptl);
72790 +}
72791 +#endif
72792 +
72793 /*
72794 * This routine handles present pages, when users try to write
72795 * to a shared page. It is done by copying the page to a new address
72796 @@ -2703,6 +2899,12 @@ gotten:
72797 */
72798 page_table = pte_offset_map_lock(mm, pmd, address, &ptl);
72799 if (likely(pte_same(*page_table, orig_pte))) {
72800 +
72801 +#ifdef CONFIG_PAX_SEGMEXEC
72802 + if (pax_find_mirror_vma(vma))
72803 + BUG_ON(!trylock_page(new_page));
72804 +#endif
72805 +
72806 if (old_page) {
72807 if (!PageAnon(old_page)) {
72808 dec_mm_counter_fast(mm, MM_FILEPAGES);
72809 @@ -2754,6 +2956,10 @@ gotten:
72810 page_remove_rmap(old_page);
72811 }
72812
72813 +#ifdef CONFIG_PAX_SEGMEXEC
72814 + pax_mirror_anon_pte(vma, address, new_page, ptl);
72815 +#endif
72816 +
72817 /* Free the old page.. */
72818 new_page = old_page;
72819 ret |= VM_FAULT_WRITE;
72820 @@ -3033,6 +3239,11 @@ static int do_swap_page(struct mm_struct *mm, struct vm_area_struct *vma,
72821 swap_free(entry);
72822 if (vm_swap_full() || (vma->vm_flags & VM_LOCKED) || PageMlocked(page))
72823 try_to_free_swap(page);
72824 +
72825 +#ifdef CONFIG_PAX_SEGMEXEC
72826 + if ((flags & FAULT_FLAG_WRITE) || !pax_find_mirror_vma(vma))
72827 +#endif
72828 +
72829 unlock_page(page);
72830 if (swapcache) {
72831 /*
72832 @@ -3056,6 +3267,11 @@ static int do_swap_page(struct mm_struct *mm, struct vm_area_struct *vma,
72833
72834 /* No need to invalidate - it was non-present before */
72835 update_mmu_cache(vma, address, page_table);
72836 +
72837 +#ifdef CONFIG_PAX_SEGMEXEC
72838 + pax_mirror_anon_pte(vma, address, page, ptl);
72839 +#endif
72840 +
72841 unlock:
72842 pte_unmap_unlock(page_table, ptl);
72843 out:
72844 @@ -3075,40 +3291,6 @@ out_release:
72845 }
72846
72847 /*
72848 - * This is like a special single-page "expand_{down|up}wards()",
72849 - * except we must first make sure that 'address{-|+}PAGE_SIZE'
72850 - * doesn't hit another vma.
72851 - */
72852 -static inline int check_stack_guard_page(struct vm_area_struct *vma, unsigned long address)
72853 -{
72854 - address &= PAGE_MASK;
72855 - if ((vma->vm_flags & VM_GROWSDOWN) && address == vma->vm_start) {
72856 - struct vm_area_struct *prev = vma->vm_prev;
72857 -
72858 - /*
72859 - * Is there a mapping abutting this one below?
72860 - *
72861 - * That's only ok if it's the same stack mapping
72862 - * that has gotten split..
72863 - */
72864 - if (prev && prev->vm_end == address)
72865 - return prev->vm_flags & VM_GROWSDOWN ? 0 : -ENOMEM;
72866 -
72867 - expand_downwards(vma, address - PAGE_SIZE);
72868 - }
72869 - if ((vma->vm_flags & VM_GROWSUP) && address + PAGE_SIZE == vma->vm_end) {
72870 - struct vm_area_struct *next = vma->vm_next;
72871 -
72872 - /* As VM_GROWSDOWN but s/below/above/ */
72873 - if (next && next->vm_start == address + PAGE_SIZE)
72874 - return next->vm_flags & VM_GROWSUP ? 0 : -ENOMEM;
72875 -
72876 - expand_upwards(vma, address + PAGE_SIZE);
72877 - }
72878 - return 0;
72879 -}
72880 -
72881 -/*
72882 * We enter with non-exclusive mmap_sem (to exclude vma changes,
72883 * but allow concurrent faults), and pte mapped but not yet locked.
72884 * We return with mmap_sem still held, but pte unmapped and unlocked.
72885 @@ -3117,27 +3299,23 @@ static int do_anonymous_page(struct mm_struct *mm, struct vm_area_struct *vma,
72886 unsigned long address, pte_t *page_table, pmd_t *pmd,
72887 unsigned int flags)
72888 {
72889 - struct page *page;
72890 + struct page *page = NULL;
72891 spinlock_t *ptl;
72892 pte_t entry;
72893
72894 - pte_unmap(page_table);
72895 -
72896 - /* Check if we need to add a guard page to the stack */
72897 - if (check_stack_guard_page(vma, address) < 0)
72898 - return VM_FAULT_SIGBUS;
72899 -
72900 - /* Use the zero-page for reads */
72901 if (!(flags & FAULT_FLAG_WRITE)) {
72902 entry = pte_mkspecial(pfn_pte(my_zero_pfn(address),
72903 vma->vm_page_prot));
72904 - page_table = pte_offset_map_lock(mm, pmd, address, &ptl);
72905 + ptl = pte_lockptr(mm, pmd);
72906 + spin_lock(ptl);
72907 if (!pte_none(*page_table))
72908 goto unlock;
72909 goto setpte;
72910 }
72911
72912 /* Allocate our own private page. */
72913 + pte_unmap(page_table);
72914 +
72915 if (unlikely(anon_vma_prepare(vma)))
72916 goto oom;
72917 page = alloc_zeroed_user_highpage_movable(vma, address);
72918 @@ -3156,6 +3334,11 @@ static int do_anonymous_page(struct mm_struct *mm, struct vm_area_struct *vma,
72919 if (!pte_none(*page_table))
72920 goto release;
72921
72922 +#ifdef CONFIG_PAX_SEGMEXEC
72923 + if (pax_find_mirror_vma(vma))
72924 + BUG_ON(!trylock_page(page));
72925 +#endif
72926 +
72927 inc_mm_counter_fast(mm, MM_ANONPAGES);
72928 page_add_new_anon_rmap(page, vma, address);
72929 setpte:
72930 @@ -3163,6 +3346,12 @@ setpte:
72931
72932 /* No need to invalidate - it was non-present before */
72933 update_mmu_cache(vma, address, page_table);
72934 +
72935 +#ifdef CONFIG_PAX_SEGMEXEC
72936 + if (page)
72937 + pax_mirror_anon_pte(vma, address, page, ptl);
72938 +#endif
72939 +
72940 unlock:
72941 pte_unmap_unlock(page_table, ptl);
72942 return 0;
72943 @@ -3306,6 +3495,12 @@ static int __do_fault(struct mm_struct *mm, struct vm_area_struct *vma,
72944 */
72945 /* Only go through if we didn't race with anybody else... */
72946 if (likely(pte_same(*page_table, orig_pte))) {
72947 +
72948 +#ifdef CONFIG_PAX_SEGMEXEC
72949 + if (anon && pax_find_mirror_vma(vma))
72950 + BUG_ON(!trylock_page(page));
72951 +#endif
72952 +
72953 flush_icache_page(vma, page);
72954 entry = mk_pte(page, vma->vm_page_prot);
72955 if (flags & FAULT_FLAG_WRITE)
72956 @@ -3325,6 +3520,14 @@ static int __do_fault(struct mm_struct *mm, struct vm_area_struct *vma,
72957
72958 /* no need to invalidate: a not-present page won't be cached */
72959 update_mmu_cache(vma, address, page_table);
72960 +
72961 +#ifdef CONFIG_PAX_SEGMEXEC
72962 + if (anon)
72963 + pax_mirror_anon_pte(vma, address, page, ptl);
72964 + else
72965 + pax_mirror_file_pte(vma, address, page, ptl);
72966 +#endif
72967 +
72968 } else {
72969 if (cow_page)
72970 mem_cgroup_uncharge_page(cow_page);
72971 @@ -3479,6 +3682,12 @@ int handle_pte_fault(struct mm_struct *mm,
72972 if (flags & FAULT_FLAG_WRITE)
72973 flush_tlb_fix_spurious_fault(vma, address);
72974 }
72975 +
72976 +#ifdef CONFIG_PAX_SEGMEXEC
72977 + pax_mirror_pte(vma, address, pte, pmd, ptl);
72978 + return 0;
72979 +#endif
72980 +
72981 unlock:
72982 pte_unmap_unlock(pte, ptl);
72983 return 0;
72984 @@ -3495,6 +3704,10 @@ int handle_mm_fault(struct mm_struct *mm, struct vm_area_struct *vma,
72985 pmd_t *pmd;
72986 pte_t *pte;
72987
72988 +#ifdef CONFIG_PAX_SEGMEXEC
72989 + struct vm_area_struct *vma_m;
72990 +#endif
72991 +
72992 __set_current_state(TASK_RUNNING);
72993
72994 count_vm_event(PGFAULT);
72995 @@ -3506,6 +3719,34 @@ int handle_mm_fault(struct mm_struct *mm, struct vm_area_struct *vma,
72996 if (unlikely(is_vm_hugetlb_page(vma)))
72997 return hugetlb_fault(mm, vma, address, flags);
72998
72999 +#ifdef CONFIG_PAX_SEGMEXEC
73000 + vma_m = pax_find_mirror_vma(vma);
73001 + if (vma_m) {
73002 + unsigned long address_m;
73003 + pgd_t *pgd_m;
73004 + pud_t *pud_m;
73005 + pmd_t *pmd_m;
73006 +
73007 + if (vma->vm_start > vma_m->vm_start) {
73008 + address_m = address;
73009 + address -= SEGMEXEC_TASK_SIZE;
73010 + vma = vma_m;
73011 + } else
73012 + address_m = address + SEGMEXEC_TASK_SIZE;
73013 +
73014 + pgd_m = pgd_offset(mm, address_m);
73015 + pud_m = pud_alloc(mm, pgd_m, address_m);
73016 + if (!pud_m)
73017 + return VM_FAULT_OOM;
73018 + pmd_m = pmd_alloc(mm, pud_m, address_m);
73019 + if (!pmd_m)
73020 + return VM_FAULT_OOM;
73021 + if (!pmd_present(*pmd_m) && __pte_alloc(mm, vma_m, pmd_m, address_m))
73022 + return VM_FAULT_OOM;
73023 + pax_unmap_mirror_pte(vma_m, address_m, pmd_m);
73024 + }
73025 +#endif
73026 +
73027 retry:
73028 pgd = pgd_offset(mm, address);
73029 pud = pud_alloc(mm, pgd, address);
73030 @@ -3547,7 +3788,7 @@ retry:
73031 * run pte_offset_map on the pmd, if an huge pmd could
73032 * materialize from under us from a different thread.
73033 */
73034 - if (unlikely(pmd_none(*pmd)) && __pte_alloc(mm, vma, pmd, address))
73035 + if (unlikely(pmd_none(*pmd) && __pte_alloc(mm, vma, pmd, address)))
73036 return VM_FAULT_OOM;
73037 /* if an huge pmd materialized from under us just retry later */
73038 if (unlikely(pmd_trans_huge(*pmd)))
73039 @@ -3584,6 +3825,23 @@ int __pud_alloc(struct mm_struct *mm, pgd_t *pgd, unsigned long address)
73040 spin_unlock(&mm->page_table_lock);
73041 return 0;
73042 }
73043 +
73044 +int __pud_alloc_kernel(struct mm_struct *mm, pgd_t *pgd, unsigned long address)
73045 +{
73046 + pud_t *new = pud_alloc_one(mm, address);
73047 + if (!new)
73048 + return -ENOMEM;
73049 +
73050 + smp_wmb(); /* See comment in __pte_alloc */
73051 +
73052 + spin_lock(&mm->page_table_lock);
73053 + if (pgd_present(*pgd)) /* Another has populated it */
73054 + pud_free(mm, new);
73055 + else
73056 + pgd_populate_kernel(mm, pgd, new);
73057 + spin_unlock(&mm->page_table_lock);
73058 + return 0;
73059 +}
73060 #endif /* __PAGETABLE_PUD_FOLDED */
73061
73062 #ifndef __PAGETABLE_PMD_FOLDED
73063 @@ -3614,6 +3872,30 @@ int __pmd_alloc(struct mm_struct *mm, pud_t *pud, unsigned long address)
73064 spin_unlock(&mm->page_table_lock);
73065 return 0;
73066 }
73067 +
73068 +int __pmd_alloc_kernel(struct mm_struct *mm, pud_t *pud, unsigned long address)
73069 +{
73070 + pmd_t *new = pmd_alloc_one(mm, address);
73071 + if (!new)
73072 + return -ENOMEM;
73073 +
73074 + smp_wmb(); /* See comment in __pte_alloc */
73075 +
73076 + spin_lock(&mm->page_table_lock);
73077 +#ifndef __ARCH_HAS_4LEVEL_HACK
73078 + if (pud_present(*pud)) /* Another has populated it */
73079 + pmd_free(mm, new);
73080 + else
73081 + pud_populate_kernel(mm, pud, new);
73082 +#else
73083 + if (pgd_present(*pud)) /* Another has populated it */
73084 + pmd_free(mm, new);
73085 + else
73086 + pgd_populate_kernel(mm, pud, new);
73087 +#endif /* __ARCH_HAS_4LEVEL_HACK */
73088 + spin_unlock(&mm->page_table_lock);
73089 + return 0;
73090 +}
73091 #endif /* __PAGETABLE_PMD_FOLDED */
73092
73093 int make_pages_present(unsigned long addr, unsigned long end)
73094 @@ -3651,7 +3933,7 @@ static int __init gate_vma_init(void)
73095 gate_vma.vm_start = FIXADDR_USER_START;
73096 gate_vma.vm_end = FIXADDR_USER_END;
73097 gate_vma.vm_flags = VM_READ | VM_MAYREAD | VM_EXEC | VM_MAYEXEC;
73098 - gate_vma.vm_page_prot = __P101;
73099 + gate_vma.vm_page_prot = vm_get_page_prot(gate_vma.vm_flags);
73100
73101 return 0;
73102 }
73103 diff --git a/mm/mempolicy.c b/mm/mempolicy.c
73104 index 3d64b36..c6ab69c 100644
73105 --- a/mm/mempolicy.c
73106 +++ b/mm/mempolicy.c
73107 @@ -655,6 +655,10 @@ static int mbind_range(struct mm_struct *mm, unsigned long start,
73108 unsigned long vmstart;
73109 unsigned long vmend;
73110
73111 +#ifdef CONFIG_PAX_SEGMEXEC
73112 + struct vm_area_struct *vma_m;
73113 +#endif
73114 +
73115 vma = find_vma(mm, start);
73116 if (!vma || vma->vm_start > start)
73117 return -EFAULT;
73118 @@ -691,9 +695,20 @@ static int mbind_range(struct mm_struct *mm, unsigned long start,
73119 if (err)
73120 goto out;
73121 }
73122 +
73123 err = vma_replace_policy(vma, new_pol);
73124 if (err)
73125 goto out;
73126 +
73127 +#ifdef CONFIG_PAX_SEGMEXEC
73128 + vma_m = pax_find_mirror_vma(vma);
73129 + if (vma_m) {
73130 + err = vma_replace_policy(vma_m, new_pol);
73131 + if (err)
73132 + goto out;
73133 + }
73134 +#endif
73135 +
73136 }
73137
73138 out:
73139 @@ -1147,6 +1162,17 @@ static long do_mbind(unsigned long start, unsigned long len,
73140
73141 if (end < start)
73142 return -EINVAL;
73143 +
73144 +#ifdef CONFIG_PAX_SEGMEXEC
73145 + if (mm->pax_flags & MF_PAX_SEGMEXEC) {
73146 + if (end > SEGMEXEC_TASK_SIZE)
73147 + return -EINVAL;
73148 + } else
73149 +#endif
73150 +
73151 + if (end > TASK_SIZE)
73152 + return -EINVAL;
73153 +
73154 if (end == start)
73155 return 0;
73156
73157 @@ -1370,8 +1396,7 @@ SYSCALL_DEFINE4(migrate_pages, pid_t, pid, unsigned long, maxnode,
73158 */
73159 tcred = __task_cred(task);
73160 if (!uid_eq(cred->euid, tcred->suid) && !uid_eq(cred->euid, tcred->uid) &&
73161 - !uid_eq(cred->uid, tcred->suid) && !uid_eq(cred->uid, tcred->uid) &&
73162 - !capable(CAP_SYS_NICE)) {
73163 + !uid_eq(cred->uid, tcred->suid) && !capable(CAP_SYS_NICE)) {
73164 rcu_read_unlock();
73165 err = -EPERM;
73166 goto out_put;
73167 @@ -1402,6 +1427,15 @@ SYSCALL_DEFINE4(migrate_pages, pid_t, pid, unsigned long, maxnode,
73168 goto out;
73169 }
73170
73171 +#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
73172 + if (mm != current->mm &&
73173 + (mm->pax_flags & MF_PAX_RANDMMAP || mm->pax_flags & MF_PAX_SEGMEXEC)) {
73174 + mmput(mm);
73175 + err = -EPERM;
73176 + goto out;
73177 + }
73178 +#endif
73179 +
73180 err = do_migrate_pages(mm, old, new,
73181 capable(CAP_SYS_NICE) ? MPOL_MF_MOVE_ALL : MPOL_MF_MOVE);
73182
73183 diff --git a/mm/migrate.c b/mm/migrate.c
73184 index 77ed2d7..317d528 100644
73185 --- a/mm/migrate.c
73186 +++ b/mm/migrate.c
73187 @@ -1350,8 +1350,7 @@ SYSCALL_DEFINE6(move_pages, pid_t, pid, unsigned long, nr_pages,
73188 */
73189 tcred = __task_cred(task);
73190 if (!uid_eq(cred->euid, tcred->suid) && !uid_eq(cred->euid, tcred->uid) &&
73191 - !uid_eq(cred->uid, tcred->suid) && !uid_eq(cred->uid, tcred->uid) &&
73192 - !capable(CAP_SYS_NICE)) {
73193 + !uid_eq(cred->uid, tcred->suid) && !capable(CAP_SYS_NICE)) {
73194 rcu_read_unlock();
73195 err = -EPERM;
73196 goto out;
73197 diff --git a/mm/mlock.c b/mm/mlock.c
73198 index ef726e8..cd7f1ec 100644
73199 --- a/mm/mlock.c
73200 +++ b/mm/mlock.c
73201 @@ -13,6 +13,7 @@
73202 #include <linux/pagemap.h>
73203 #include <linux/mempolicy.h>
73204 #include <linux/syscalls.h>
73205 +#include <linux/security.h>
73206 #include <linux/sched.h>
73207 #include <linux/export.h>
73208 #include <linux/rmap.h>
73209 @@ -376,7 +377,7 @@ static int do_mlock(unsigned long start, size_t len, int on)
73210 {
73211 unsigned long nstart, end, tmp;
73212 struct vm_area_struct * vma, * prev;
73213 - int error;
73214 + int error = 0;
73215
73216 VM_BUG_ON(start & ~PAGE_MASK);
73217 VM_BUG_ON(len != PAGE_ALIGN(len));
73218 @@ -385,6 +386,9 @@ static int do_mlock(unsigned long start, size_t len, int on)
73219 return -EINVAL;
73220 if (end == start)
73221 return 0;
73222 + if (end > TASK_SIZE)
73223 + return -EINVAL;
73224 +
73225 vma = find_vma(current->mm, start);
73226 if (!vma || vma->vm_start > start)
73227 return -ENOMEM;
73228 @@ -396,6 +400,11 @@ static int do_mlock(unsigned long start, size_t len, int on)
73229 for (nstart = start ; ; ) {
73230 vm_flags_t newflags;
73231
73232 +#ifdef CONFIG_PAX_SEGMEXEC
73233 + if ((current->mm->pax_flags & MF_PAX_SEGMEXEC) && (vma->vm_start >= SEGMEXEC_TASK_SIZE))
73234 + break;
73235 +#endif
73236 +
73237 /* Here we know that vma->vm_start <= nstart < vma->vm_end. */
73238
73239 newflags = vma->vm_flags | VM_LOCKED;
73240 @@ -501,6 +510,7 @@ SYSCALL_DEFINE2(mlock, unsigned long, start, size_t, len)
73241 lock_limit >>= PAGE_SHIFT;
73242
73243 /* check against resource limits */
73244 + gr_learn_resource(current, RLIMIT_MEMLOCK, (current->mm->locked_vm << PAGE_SHIFT) + len, 1);
73245 if ((locked <= lock_limit) || capable(CAP_IPC_LOCK))
73246 error = do_mlock(start, len, 1);
73247 up_write(&current->mm->mmap_sem);
73248 @@ -524,17 +534,23 @@ SYSCALL_DEFINE2(munlock, unsigned long, start, size_t, len)
73249 static int do_mlockall(int flags)
73250 {
73251 struct vm_area_struct * vma, * prev = NULL;
73252 - unsigned int def_flags = 0;
73253
73254 if (flags & MCL_FUTURE)
73255 - def_flags = VM_LOCKED;
73256 - current->mm->def_flags = def_flags;
73257 + current->mm->def_flags |= VM_LOCKED;
73258 + else
73259 + current->mm->def_flags &= ~VM_LOCKED;
73260 if (flags == MCL_FUTURE)
73261 goto out;
73262
73263 for (vma = current->mm->mmap; vma ; vma = prev->vm_next) {
73264 vm_flags_t newflags;
73265
73266 +#ifdef CONFIG_PAX_SEGMEXEC
73267 + if ((current->mm->pax_flags & MF_PAX_SEGMEXEC) && (vma->vm_start >= SEGMEXEC_TASK_SIZE))
73268 + break;
73269 +#endif
73270 +
73271 + BUG_ON(vma->vm_end > TASK_SIZE);
73272 newflags = vma->vm_flags | VM_LOCKED;
73273 if (!(flags & MCL_CURRENT))
73274 newflags &= ~VM_LOCKED;
73275 @@ -567,6 +583,7 @@ SYSCALL_DEFINE1(mlockall, int, flags)
73276 lock_limit >>= PAGE_SHIFT;
73277
73278 ret = -ENOMEM;
73279 + gr_learn_resource(current, RLIMIT_MEMLOCK, current->mm->total_vm << PAGE_SHIFT, 1);
73280 if (!(flags & MCL_CURRENT) || (current->mm->total_vm <= lock_limit) ||
73281 capable(CAP_IPC_LOCK))
73282 ret = do_mlockall(flags);
73283 diff --git a/mm/mmap.c b/mm/mmap.c
73284 index ae18a48..86cf99e 100644
73285 --- a/mm/mmap.c
73286 +++ b/mm/mmap.c
73287 @@ -47,6 +47,16 @@
73288 #define arch_rebalance_pgtables(addr, len) (addr)
73289 #endif
73290
73291 +static inline void verify_mm_writelocked(struct mm_struct *mm)
73292 +{
73293 +#if defined(CONFIG_DEBUG_VM) || defined(CONFIG_PAX)
73294 + if (unlikely(down_read_trylock(&mm->mmap_sem))) {
73295 + up_read(&mm->mmap_sem);
73296 + BUG();
73297 + }
73298 +#endif
73299 +}
73300 +
73301 static void unmap_region(struct mm_struct *mm,
73302 struct vm_area_struct *vma, struct vm_area_struct *prev,
73303 unsigned long start, unsigned long end);
73304 @@ -72,22 +82,32 @@ static void unmap_region(struct mm_struct *mm,
73305 * x: (no) no x: (no) yes x: (no) yes x: (yes) yes
73306 *
73307 */
73308 -pgprot_t protection_map[16] = {
73309 +pgprot_t protection_map[16] __read_only = {
73310 __P000, __P001, __P010, __P011, __P100, __P101, __P110, __P111,
73311 __S000, __S001, __S010, __S011, __S100, __S101, __S110, __S111
73312 };
73313
73314 -pgprot_t vm_get_page_prot(unsigned long vm_flags)
73315 +pgprot_t vm_get_page_prot(vm_flags_t vm_flags)
73316 {
73317 - return __pgprot(pgprot_val(protection_map[vm_flags &
73318 + pgprot_t prot = __pgprot(pgprot_val(protection_map[vm_flags &
73319 (VM_READ|VM_WRITE|VM_EXEC|VM_SHARED)]) |
73320 pgprot_val(arch_vm_get_page_prot(vm_flags)));
73321 +
73322 +#if defined(CONFIG_PAX_PAGEEXEC) && defined(CONFIG_X86_32)
73323 + if (!(__supported_pte_mask & _PAGE_NX) &&
73324 + (vm_flags & (VM_PAGEEXEC | VM_EXEC)) == VM_PAGEEXEC &&
73325 + (vm_flags & (VM_READ | VM_WRITE)))
73326 + prot = __pgprot(pte_val(pte_exprotect(__pte(pgprot_val(prot)))));
73327 +#endif
73328 +
73329 + return prot;
73330 }
73331 EXPORT_SYMBOL(vm_get_page_prot);
73332
73333 int sysctl_overcommit_memory __read_mostly = OVERCOMMIT_GUESS; /* heuristic overcommit */
73334 int sysctl_overcommit_ratio __read_mostly = 50; /* default is 50% */
73335 int sysctl_max_map_count __read_mostly = DEFAULT_MAX_MAP_COUNT;
73336 +unsigned long sysctl_heap_stack_gap __read_mostly = 64*1024;
73337 /*
73338 * Make sure vm_committed_as in one cacheline and not cacheline shared with
73339 * other variables. It can be updated by several CPUs frequently.
73340 @@ -229,6 +249,7 @@ static struct vm_area_struct *remove_vma(struct vm_area_struct *vma)
73341 struct vm_area_struct *next = vma->vm_next;
73342
73343 might_sleep();
73344 + BUG_ON(vma->vm_mirror);
73345 if (vma->vm_ops && vma->vm_ops->close)
73346 vma->vm_ops->close(vma);
73347 if (vma->vm_file) {
73348 @@ -275,6 +296,7 @@ SYSCALL_DEFINE1(brk, unsigned long, brk)
73349 * not page aligned -Ram Gupta
73350 */
73351 rlim = rlimit(RLIMIT_DATA);
73352 + gr_learn_resource(current, RLIMIT_DATA, (brk - mm->start_brk) + (mm->end_data - mm->start_data), 1);
73353 if (rlim < RLIM_INFINITY && (brk - mm->start_brk) +
73354 (mm->end_data - mm->start_data) > rlim)
73355 goto out;
73356 @@ -708,6 +730,12 @@ static int
73357 can_vma_merge_before(struct vm_area_struct *vma, unsigned long vm_flags,
73358 struct anon_vma *anon_vma, struct file *file, pgoff_t vm_pgoff)
73359 {
73360 +
73361 +#ifdef CONFIG_PAX_SEGMEXEC
73362 + if ((vma->vm_mm->pax_flags & MF_PAX_SEGMEXEC) && vma->vm_start == SEGMEXEC_TASK_SIZE)
73363 + return 0;
73364 +#endif
73365 +
73366 if (is_mergeable_vma(vma, file, vm_flags) &&
73367 is_mergeable_anon_vma(anon_vma, vma->anon_vma, vma)) {
73368 if (vma->vm_pgoff == vm_pgoff)
73369 @@ -727,6 +755,12 @@ static int
73370 can_vma_merge_after(struct vm_area_struct *vma, unsigned long vm_flags,
73371 struct anon_vma *anon_vma, struct file *file, pgoff_t vm_pgoff)
73372 {
73373 +
73374 +#ifdef CONFIG_PAX_SEGMEXEC
73375 + if ((vma->vm_mm->pax_flags & MF_PAX_SEGMEXEC) && vma->vm_end == SEGMEXEC_TASK_SIZE)
73376 + return 0;
73377 +#endif
73378 +
73379 if (is_mergeable_vma(vma, file, vm_flags) &&
73380 is_mergeable_anon_vma(anon_vma, vma->anon_vma, vma)) {
73381 pgoff_t vm_pglen;
73382 @@ -769,13 +803,20 @@ can_vma_merge_after(struct vm_area_struct *vma, unsigned long vm_flags,
73383 struct vm_area_struct *vma_merge(struct mm_struct *mm,
73384 struct vm_area_struct *prev, unsigned long addr,
73385 unsigned long end, unsigned long vm_flags,
73386 - struct anon_vma *anon_vma, struct file *file,
73387 + struct anon_vma *anon_vma, struct file *file,
73388 pgoff_t pgoff, struct mempolicy *policy)
73389 {
73390 pgoff_t pglen = (end - addr) >> PAGE_SHIFT;
73391 struct vm_area_struct *area, *next;
73392 int err;
73393
73394 +#ifdef CONFIG_PAX_SEGMEXEC
73395 + unsigned long addr_m = addr + SEGMEXEC_TASK_SIZE, end_m = end + SEGMEXEC_TASK_SIZE;
73396 + struct vm_area_struct *area_m = NULL, *next_m = NULL, *prev_m = NULL;
73397 +
73398 + BUG_ON((mm->pax_flags & MF_PAX_SEGMEXEC) && SEGMEXEC_TASK_SIZE < end);
73399 +#endif
73400 +
73401 /*
73402 * We later require that vma->vm_flags == vm_flags,
73403 * so this tests vma->vm_flags & VM_SPECIAL, too.
73404 @@ -791,6 +832,15 @@ struct vm_area_struct *vma_merge(struct mm_struct *mm,
73405 if (next && next->vm_end == end) /* cases 6, 7, 8 */
73406 next = next->vm_next;
73407
73408 +#ifdef CONFIG_PAX_SEGMEXEC
73409 + if (prev)
73410 + prev_m = pax_find_mirror_vma(prev);
73411 + if (area)
73412 + area_m = pax_find_mirror_vma(area);
73413 + if (next)
73414 + next_m = pax_find_mirror_vma(next);
73415 +#endif
73416 +
73417 /*
73418 * Can it merge with the predecessor?
73419 */
73420 @@ -810,9 +860,24 @@ struct vm_area_struct *vma_merge(struct mm_struct *mm,
73421 /* cases 1, 6 */
73422 err = vma_adjust(prev, prev->vm_start,
73423 next->vm_end, prev->vm_pgoff, NULL);
73424 - } else /* cases 2, 5, 7 */
73425 +
73426 +#ifdef CONFIG_PAX_SEGMEXEC
73427 + if (!err && prev_m)
73428 + err = vma_adjust(prev_m, prev_m->vm_start,
73429 + next_m->vm_end, prev_m->vm_pgoff, NULL);
73430 +#endif
73431 +
73432 + } else { /* cases 2, 5, 7 */
73433 err = vma_adjust(prev, prev->vm_start,
73434 end, prev->vm_pgoff, NULL);
73435 +
73436 +#ifdef CONFIG_PAX_SEGMEXEC
73437 + if (!err && prev_m)
73438 + err = vma_adjust(prev_m, prev_m->vm_start,
73439 + end_m, prev_m->vm_pgoff, NULL);
73440 +#endif
73441 +
73442 + }
73443 if (err)
73444 return NULL;
73445 khugepaged_enter_vma_merge(prev);
73446 @@ -826,12 +891,27 @@ struct vm_area_struct *vma_merge(struct mm_struct *mm,
73447 mpol_equal(policy, vma_policy(next)) &&
73448 can_vma_merge_before(next, vm_flags,
73449 anon_vma, file, pgoff+pglen)) {
73450 - if (prev && addr < prev->vm_end) /* case 4 */
73451 + if (prev && addr < prev->vm_end) { /* case 4 */
73452 err = vma_adjust(prev, prev->vm_start,
73453 addr, prev->vm_pgoff, NULL);
73454 - else /* cases 3, 8 */
73455 +
73456 +#ifdef CONFIG_PAX_SEGMEXEC
73457 + if (!err && prev_m)
73458 + err = vma_adjust(prev_m, prev_m->vm_start,
73459 + addr_m, prev_m->vm_pgoff, NULL);
73460 +#endif
73461 +
73462 + } else { /* cases 3, 8 */
73463 err = vma_adjust(area, addr, next->vm_end,
73464 next->vm_pgoff - pglen, NULL);
73465 +
73466 +#ifdef CONFIG_PAX_SEGMEXEC
73467 + if (!err && area_m)
73468 + err = vma_adjust(area_m, addr_m, next_m->vm_end,
73469 + next_m->vm_pgoff - pglen, NULL);
73470 +#endif
73471 +
73472 + }
73473 if (err)
73474 return NULL;
73475 khugepaged_enter_vma_merge(area);
73476 @@ -940,16 +1020,13 @@ none:
73477 void vm_stat_account(struct mm_struct *mm, unsigned long flags,
73478 struct file *file, long pages)
73479 {
73480 - const unsigned long stack_flags
73481 - = VM_STACK_FLAGS & (VM_GROWSUP|VM_GROWSDOWN);
73482 -
73483 mm->total_vm += pages;
73484
73485 if (file) {
73486 mm->shared_vm += pages;
73487 if ((flags & (VM_EXEC|VM_WRITE)) == VM_EXEC)
73488 mm->exec_vm += pages;
73489 - } else if (flags & stack_flags)
73490 + } else if (flags & (VM_GROWSUP|VM_GROWSDOWN))
73491 mm->stack_vm += pages;
73492 if (flags & (VM_RESERVED|VM_IO))
73493 mm->reserved_vm += pages;
73494 @@ -987,7 +1064,7 @@ unsigned long do_mmap_pgoff(struct file *file, unsigned long addr,
73495 * (the exception is when the underlying filesystem is noexec
73496 * mounted, in which case we dont add PROT_EXEC.)
73497 */
73498 - if ((prot & PROT_READ) && (current->personality & READ_IMPLIES_EXEC))
73499 + if ((prot & (PROT_READ | PROT_WRITE)) && (current->personality & READ_IMPLIES_EXEC))
73500 if (!(file && (file->f_path.mnt->mnt_flags & MNT_NOEXEC)))
73501 prot |= PROT_EXEC;
73502
73503 @@ -1013,7 +1090,7 @@ unsigned long do_mmap_pgoff(struct file *file, unsigned long addr,
73504 /* Obtain the address to map to. we verify (or select) it and ensure
73505 * that it represents a valid section of the address space.
73506 */
73507 - addr = get_unmapped_area(file, addr, len, pgoff, flags);
73508 + addr = get_unmapped_area(file, addr, len, pgoff, flags | ((prot & PROT_EXEC) ? MAP_EXECUTABLE : 0));
73509 if (addr & ~PAGE_MASK)
73510 return addr;
73511
73512 @@ -1024,6 +1101,36 @@ unsigned long do_mmap_pgoff(struct file *file, unsigned long addr,
73513 vm_flags = calc_vm_prot_bits(prot) | calc_vm_flag_bits(flags) |
73514 mm->def_flags | VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC;
73515
73516 +#ifdef CONFIG_PAX_MPROTECT
73517 + if (mm->pax_flags & MF_PAX_MPROTECT) {
73518 +#ifndef CONFIG_PAX_MPROTECT_COMPAT
73519 + if ((vm_flags & (VM_WRITE | VM_EXEC)) == (VM_WRITE | VM_EXEC)) {
73520 + gr_log_rwxmmap(file);
73521 +
73522 +#ifdef CONFIG_PAX_EMUPLT
73523 + vm_flags &= ~VM_EXEC;
73524 +#else
73525 + return -EPERM;
73526 +#endif
73527 +
73528 + }
73529 +
73530 + if (!(vm_flags & VM_EXEC))
73531 + vm_flags &= ~VM_MAYEXEC;
73532 +#else
73533 + if ((vm_flags & (VM_WRITE | VM_EXEC)) != VM_EXEC)
73534 + vm_flags &= ~(VM_EXEC | VM_MAYEXEC);
73535 +#endif
73536 + else
73537 + vm_flags &= ~VM_MAYWRITE;
73538 + }
73539 +#endif
73540 +
73541 +#if defined(CONFIG_PAX_PAGEEXEC) && defined(CONFIG_X86_32)
73542 + if ((mm->pax_flags & MF_PAX_PAGEEXEC) && file)
73543 + vm_flags &= ~VM_PAGEEXEC;
73544 +#endif
73545 +
73546 if (flags & MAP_LOCKED)
73547 if (!can_do_mlock())
73548 return -EPERM;
73549 @@ -1035,6 +1142,7 @@ unsigned long do_mmap_pgoff(struct file *file, unsigned long addr,
73550 locked += mm->locked_vm;
73551 lock_limit = rlimit(RLIMIT_MEMLOCK);
73552 lock_limit >>= PAGE_SHIFT;
73553 + gr_learn_resource(current, RLIMIT_MEMLOCK, locked << PAGE_SHIFT, 1);
73554 if (locked > lock_limit && !capable(CAP_IPC_LOCK))
73555 return -EAGAIN;
73556 }
73557 @@ -1101,6 +1209,9 @@ unsigned long do_mmap_pgoff(struct file *file, unsigned long addr,
73558 }
73559 }
73560
73561 + if (!gr_acl_handle_mmap(file, prot))
73562 + return -EACCES;
73563 +
73564 return mmap_region(file, addr, len, flags, vm_flags, pgoff);
73565 }
73566
73567 @@ -1177,7 +1288,7 @@ int vma_wants_writenotify(struct vm_area_struct *vma)
73568 vm_flags_t vm_flags = vma->vm_flags;
73569
73570 /* If it was private or non-writable, the write bit is already clear */
73571 - if ((vm_flags & (VM_WRITE|VM_SHARED)) != ((VM_WRITE|VM_SHARED)))
73572 + if ((vm_flags & (VM_WRITE|VM_SHARED)) != (VM_WRITE|VM_SHARED))
73573 return 0;
73574
73575 /* The backer wishes to know when pages are first written to? */
73576 @@ -1226,14 +1337,24 @@ unsigned long mmap_region(struct file *file, unsigned long addr,
73577 unsigned long charged = 0;
73578 struct inode *inode = file ? file->f_path.dentry->d_inode : NULL;
73579
73580 +#ifdef CONFIG_PAX_SEGMEXEC
73581 + struct vm_area_struct *vma_m = NULL;
73582 +#endif
73583 +
73584 + /*
73585 + * mm->mmap_sem is required to protect against another thread
73586 + * changing the mappings in case we sleep.
73587 + */
73588 + verify_mm_writelocked(mm);
73589 +
73590 /* Clear old maps */
73591 error = -ENOMEM;
73592 -munmap_back:
73593 vma = find_vma_prepare(mm, addr, &prev, &rb_link, &rb_parent);
73594 if (vma && vma->vm_start < addr + len) {
73595 if (do_munmap(mm, addr, len))
73596 return -ENOMEM;
73597 - goto munmap_back;
73598 + vma = find_vma_prepare(mm, addr, &prev, &rb_link, &rb_parent);
73599 + BUG_ON(vma && vma->vm_start < addr + len);
73600 }
73601
73602 /* Check against address space limit. */
73603 @@ -1282,6 +1403,16 @@ munmap_back:
73604 goto unacct_error;
73605 }
73606
73607 +#ifdef CONFIG_PAX_SEGMEXEC
73608 + if ((mm->pax_flags & MF_PAX_SEGMEXEC) && (vm_flags & VM_EXEC)) {
73609 + vma_m = kmem_cache_zalloc(vm_area_cachep, GFP_KERNEL);
73610 + if (!vma_m) {
73611 + error = -ENOMEM;
73612 + goto free_vma;
73613 + }
73614 + }
73615 +#endif
73616 +
73617 vma->vm_mm = mm;
73618 vma->vm_start = addr;
73619 vma->vm_end = addr + len;
73620 @@ -1306,6 +1437,19 @@ munmap_back:
73621 error = file->f_op->mmap(file, vma);
73622 if (error)
73623 goto unmap_and_free_vma;
73624 +
73625 +#ifdef CONFIG_PAX_SEGMEXEC
73626 + if (vma_m && (vm_flags & VM_EXECUTABLE))
73627 + added_exe_file_vma(mm);
73628 +#endif
73629 +
73630 +#if defined(CONFIG_PAX_PAGEEXEC) && defined(CONFIG_X86_32)
73631 + if ((mm->pax_flags & MF_PAX_PAGEEXEC) && !(vma->vm_flags & VM_SPECIAL)) {
73632 + vma->vm_flags |= VM_PAGEEXEC;
73633 + vma->vm_page_prot = vm_get_page_prot(vma->vm_flags);
73634 + }
73635 +#endif
73636 +
73637 if (vm_flags & VM_EXECUTABLE)
73638 added_exe_file_vma(mm);
73639
73640 @@ -1343,6 +1487,11 @@ munmap_back:
73641 vma_link(mm, vma, prev, rb_link, rb_parent);
73642 file = vma->vm_file;
73643
73644 +#ifdef CONFIG_PAX_SEGMEXEC
73645 + if (vma_m)
73646 + BUG_ON(pax_mirror_vma(vma_m, vma));
73647 +#endif
73648 +
73649 /* Once vma denies write, undo our temporary denial count */
73650 if (correct_wcount)
73651 atomic_inc(&inode->i_writecount);
73652 @@ -1350,6 +1499,7 @@ out:
73653 perf_event_mmap(vma);
73654
73655 vm_stat_account(mm, vm_flags, file, len >> PAGE_SHIFT);
73656 + track_exec_limit(mm, addr, addr + len, vm_flags);
73657 if (vm_flags & VM_LOCKED) {
73658 if (!mlock_vma_pages_range(vma, addr, addr + len))
73659 mm->locked_vm += (len >> PAGE_SHIFT);
73660 @@ -1371,6 +1521,12 @@ unmap_and_free_vma:
73661 unmap_region(mm, vma, prev, vma->vm_start, vma->vm_end);
73662 charged = 0;
73663 free_vma:
73664 +
73665 +#ifdef CONFIG_PAX_SEGMEXEC
73666 + if (vma_m)
73667 + kmem_cache_free(vm_area_cachep, vma_m);
73668 +#endif
73669 +
73670 kmem_cache_free(vm_area_cachep, vma);
73671 unacct_error:
73672 if (charged)
73673 @@ -1378,6 +1534,44 @@ unacct_error:
73674 return error;
73675 }
73676
73677 +bool check_heap_stack_gap(const struct vm_area_struct *vma, unsigned long addr, unsigned long len)
73678 +{
73679 + if (!vma) {
73680 +#ifdef CONFIG_STACK_GROWSUP
73681 + if (addr > sysctl_heap_stack_gap)
73682 + vma = find_vma(current->mm, addr - sysctl_heap_stack_gap);
73683 + else
73684 + vma = find_vma(current->mm, 0);
73685 + if (vma && (vma->vm_flags & VM_GROWSUP))
73686 + return false;
73687 +#endif
73688 + return true;
73689 + }
73690 +
73691 + if (addr + len > vma->vm_start)
73692 + return false;
73693 +
73694 + if (vma->vm_flags & VM_GROWSDOWN)
73695 + return sysctl_heap_stack_gap <= vma->vm_start - addr - len;
73696 +#ifdef CONFIG_STACK_GROWSUP
73697 + else if (vma->vm_prev && (vma->vm_prev->vm_flags & VM_GROWSUP))
73698 + return addr - vma->vm_prev->vm_end <= sysctl_heap_stack_gap;
73699 +#endif
73700 +
73701 + return true;
73702 +}
73703 +
73704 +unsigned long skip_heap_stack_gap(const struct vm_area_struct *vma, unsigned long len)
73705 +{
73706 + if (vma->vm_start < len)
73707 + return -ENOMEM;
73708 + if (!(vma->vm_flags & VM_GROWSDOWN))
73709 + return vma->vm_start - len;
73710 + if (sysctl_heap_stack_gap <= vma->vm_start - len)
73711 + return vma->vm_start - len - sysctl_heap_stack_gap;
73712 + return -ENOMEM;
73713 +}
73714 +
73715 /* Get an address range which is currently unmapped.
73716 * For shmat() with addr=0.
73717 *
73718 @@ -1404,18 +1598,23 @@ arch_get_unmapped_area(struct file *filp, unsigned long addr,
73719 if (flags & MAP_FIXED)
73720 return addr;
73721
73722 +#ifdef CONFIG_PAX_RANDMMAP
73723 + if (!(mm->pax_flags & MF_PAX_RANDMMAP))
73724 +#endif
73725 +
73726 if (addr) {
73727 addr = PAGE_ALIGN(addr);
73728 - vma = find_vma(mm, addr);
73729 - if (TASK_SIZE - len >= addr &&
73730 - (!vma || addr + len <= vma->vm_start))
73731 - return addr;
73732 + if (TASK_SIZE - len >= addr) {
73733 + vma = find_vma(mm, addr);
73734 + if (check_heap_stack_gap(vma, addr, len))
73735 + return addr;
73736 + }
73737 }
73738 if (len > mm->cached_hole_size) {
73739 - start_addr = addr = mm->free_area_cache;
73740 + start_addr = addr = mm->free_area_cache;
73741 } else {
73742 - start_addr = addr = TASK_UNMAPPED_BASE;
73743 - mm->cached_hole_size = 0;
73744 + start_addr = addr = mm->mmap_base;
73745 + mm->cached_hole_size = 0;
73746 }
73747
73748 full_search:
73749 @@ -1426,34 +1625,40 @@ full_search:
73750 * Start a new search - just in case we missed
73751 * some holes.
73752 */
73753 - if (start_addr != TASK_UNMAPPED_BASE) {
73754 - addr = TASK_UNMAPPED_BASE;
73755 - start_addr = addr;
73756 + if (start_addr != mm->mmap_base) {
73757 + start_addr = addr = mm->mmap_base;
73758 mm->cached_hole_size = 0;
73759 goto full_search;
73760 }
73761 return -ENOMEM;
73762 }
73763 - if (!vma || addr + len <= vma->vm_start) {
73764 - /*
73765 - * Remember the place where we stopped the search:
73766 - */
73767 - mm->free_area_cache = addr + len;
73768 - return addr;
73769 - }
73770 + if (check_heap_stack_gap(vma, addr, len))
73771 + break;
73772 if (addr + mm->cached_hole_size < vma->vm_start)
73773 mm->cached_hole_size = vma->vm_start - addr;
73774 addr = vma->vm_end;
73775 }
73776 +
73777 + /*
73778 + * Remember the place where we stopped the search:
73779 + */
73780 + mm->free_area_cache = addr + len;
73781 + return addr;
73782 }
73783 #endif
73784
73785 void arch_unmap_area(struct mm_struct *mm, unsigned long addr)
73786 {
73787 +
73788 +#ifdef CONFIG_PAX_SEGMEXEC
73789 + if ((mm->pax_flags & MF_PAX_SEGMEXEC) && SEGMEXEC_TASK_SIZE <= addr)
73790 + return;
73791 +#endif
73792 +
73793 /*
73794 * Is this a new hole at the lowest possible address?
73795 */
73796 - if (addr >= TASK_UNMAPPED_BASE && addr < mm->free_area_cache)
73797 + if (addr >= mm->mmap_base && addr < mm->free_area_cache)
73798 mm->free_area_cache = addr;
73799 }
73800
73801 @@ -1469,7 +1674,7 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
73802 {
73803 struct vm_area_struct *vma;
73804 struct mm_struct *mm = current->mm;
73805 - unsigned long addr = addr0, start_addr;
73806 + unsigned long base = mm->mmap_base, addr = addr0, start_addr;
73807
73808 /* requested length too big for entire address space */
73809 if (len > TASK_SIZE)
73810 @@ -1478,13 +1683,18 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
73811 if (flags & MAP_FIXED)
73812 return addr;
73813
73814 +#ifdef CONFIG_PAX_RANDMMAP
73815 + if (!(mm->pax_flags & MF_PAX_RANDMMAP))
73816 +#endif
73817 +
73818 /* requesting a specific address */
73819 if (addr) {
73820 addr = PAGE_ALIGN(addr);
73821 - vma = find_vma(mm, addr);
73822 - if (TASK_SIZE - len >= addr &&
73823 - (!vma || addr + len <= vma->vm_start))
73824 - return addr;
73825 + if (TASK_SIZE - len >= addr) {
73826 + vma = find_vma(mm, addr);
73827 + if (check_heap_stack_gap(vma, addr, len))
73828 + return addr;
73829 + }
73830 }
73831
73832 /* check if free_area_cache is useful for us */
73833 @@ -1508,7 +1718,7 @@ try_again:
73834 * return with success:
73835 */
73836 vma = find_vma(mm, addr);
73837 - if (!vma || addr+len <= vma->vm_start)
73838 + if (check_heap_stack_gap(vma, addr, len))
73839 /* remember the address as a hint for next time */
73840 return (mm->free_area_cache = addr);
73841
73842 @@ -1517,8 +1727,8 @@ try_again:
73843 mm->cached_hole_size = vma->vm_start - addr;
73844
73845 /* try just below the current vma->vm_start */
73846 - addr = vma->vm_start-len;
73847 - } while (len < vma->vm_start);
73848 + addr = skip_heap_stack_gap(vma, len);
73849 + } while (!IS_ERR_VALUE(addr));
73850
73851 fail:
73852 /*
73853 @@ -1541,13 +1751,21 @@ fail:
73854 * can happen with large stack limits and large mmap()
73855 * allocations.
73856 */
73857 + mm->mmap_base = TASK_UNMAPPED_BASE;
73858 +
73859 +#ifdef CONFIG_PAX_RANDMMAP
73860 + if (mm->pax_flags & MF_PAX_RANDMMAP)
73861 + mm->mmap_base += mm->delta_mmap;
73862 +#endif
73863 +
73864 + mm->free_area_cache = mm->mmap_base;
73865 mm->cached_hole_size = ~0UL;
73866 - mm->free_area_cache = TASK_UNMAPPED_BASE;
73867 addr = arch_get_unmapped_area(filp, addr0, len, pgoff, flags);
73868 /*
73869 * Restore the topdown base:
73870 */
73871 - mm->free_area_cache = mm->mmap_base;
73872 + mm->mmap_base = base;
73873 + mm->free_area_cache = base;
73874 mm->cached_hole_size = ~0UL;
73875
73876 return addr;
73877 @@ -1556,6 +1774,12 @@ fail:
73878
73879 void arch_unmap_area_topdown(struct mm_struct *mm, unsigned long addr)
73880 {
73881 +
73882 +#ifdef CONFIG_PAX_SEGMEXEC
73883 + if ((mm->pax_flags & MF_PAX_SEGMEXEC) && SEGMEXEC_TASK_SIZE <= addr)
73884 + return;
73885 +#endif
73886 +
73887 /*
73888 * Is this a new hole at the highest possible address?
73889 */
73890 @@ -1563,8 +1787,10 @@ void arch_unmap_area_topdown(struct mm_struct *mm, unsigned long addr)
73891 mm->free_area_cache = addr;
73892
73893 /* dont allow allocations above current base */
73894 - if (mm->free_area_cache > mm->mmap_base)
73895 + if (mm->free_area_cache > mm->mmap_base) {
73896 mm->free_area_cache = mm->mmap_base;
73897 + mm->cached_hole_size = ~0UL;
73898 + }
73899 }
73900
73901 unsigned long
73902 @@ -1663,6 +1889,28 @@ find_vma_prev(struct mm_struct *mm, unsigned long addr,
73903 return vma;
73904 }
73905
73906 +#ifdef CONFIG_PAX_SEGMEXEC
73907 +struct vm_area_struct *pax_find_mirror_vma(struct vm_area_struct *vma)
73908 +{
73909 + struct vm_area_struct *vma_m;
73910 +
73911 + BUG_ON(!vma || vma->vm_start >= vma->vm_end);
73912 + if (!(vma->vm_mm->pax_flags & MF_PAX_SEGMEXEC) || !(vma->vm_flags & VM_EXEC)) {
73913 + BUG_ON(vma->vm_mirror);
73914 + return NULL;
73915 + }
73916 + BUG_ON(vma->vm_start < SEGMEXEC_TASK_SIZE && SEGMEXEC_TASK_SIZE < vma->vm_end);
73917 + vma_m = vma->vm_mirror;
73918 + BUG_ON(!vma_m || vma_m->vm_mirror != vma);
73919 + BUG_ON(vma->vm_file != vma_m->vm_file);
73920 + BUG_ON(vma->vm_end - vma->vm_start != vma_m->vm_end - vma_m->vm_start);
73921 + BUG_ON(vma->vm_pgoff != vma_m->vm_pgoff);
73922 + BUG_ON(vma->anon_vma != vma_m->anon_vma && vma->anon_vma->root != vma_m->anon_vma->root);
73923 + BUG_ON((vma->vm_flags ^ vma_m->vm_flags) & ~(VM_WRITE | VM_MAYWRITE | VM_ACCOUNT | VM_LOCKED | VM_RESERVED));
73924 + return vma_m;
73925 +}
73926 +#endif
73927 +
73928 /*
73929 * Verify that the stack growth is acceptable and
73930 * update accounting. This is shared with both the
73931 @@ -1679,6 +1927,7 @@ static int acct_stack_growth(struct vm_area_struct *vma, unsigned long size, uns
73932 return -ENOMEM;
73933
73934 /* Stack limit test */
73935 + gr_learn_resource(current, RLIMIT_STACK, size, 1);
73936 if (size > ACCESS_ONCE(rlim[RLIMIT_STACK].rlim_cur))
73937 return -ENOMEM;
73938
73939 @@ -1689,6 +1938,7 @@ static int acct_stack_growth(struct vm_area_struct *vma, unsigned long size, uns
73940 locked = mm->locked_vm + grow;
73941 limit = ACCESS_ONCE(rlim[RLIMIT_MEMLOCK].rlim_cur);
73942 limit >>= PAGE_SHIFT;
73943 + gr_learn_resource(current, RLIMIT_MEMLOCK, locked << PAGE_SHIFT, 1);
73944 if (locked > limit && !capable(CAP_IPC_LOCK))
73945 return -ENOMEM;
73946 }
73947 @@ -1718,37 +1968,48 @@ static int acct_stack_growth(struct vm_area_struct *vma, unsigned long size, uns
73948 * PA-RISC uses this for its stack; IA64 for its Register Backing Store.
73949 * vma is the last one with address > vma->vm_end. Have to extend vma.
73950 */
73951 +#ifndef CONFIG_IA64
73952 +static
73953 +#endif
73954 int expand_upwards(struct vm_area_struct *vma, unsigned long address)
73955 {
73956 int error;
73957 + bool locknext;
73958
73959 if (!(vma->vm_flags & VM_GROWSUP))
73960 return -EFAULT;
73961
73962 + /* Also guard against wrapping around to address 0. */
73963 + if (address < PAGE_ALIGN(address+1))
73964 + address = PAGE_ALIGN(address+1);
73965 + else
73966 + return -ENOMEM;
73967 +
73968 /*
73969 * We must make sure the anon_vma is allocated
73970 * so that the anon_vma locking is not a noop.
73971 */
73972 if (unlikely(anon_vma_prepare(vma)))
73973 return -ENOMEM;
73974 + locknext = vma->vm_next && (vma->vm_next->vm_flags & VM_GROWSDOWN);
73975 + if (locknext && anon_vma_prepare(vma->vm_next))
73976 + return -ENOMEM;
73977 vma_lock_anon_vma(vma);
73978 + if (locknext)
73979 + vma_lock_anon_vma(vma->vm_next);
73980
73981 /*
73982 * vma->vm_start/vm_end cannot change under us because the caller
73983 * is required to hold the mmap_sem in read mode. We need the
73984 - * anon_vma lock to serialize against concurrent expand_stacks.
73985 - * Also guard against wrapping around to address 0.
73986 + * anon_vma locks to serialize against concurrent expand_stacks
73987 + * and expand_upwards.
73988 */
73989 - if (address < PAGE_ALIGN(address+4))
73990 - address = PAGE_ALIGN(address+4);
73991 - else {
73992 - vma_unlock_anon_vma(vma);
73993 - return -ENOMEM;
73994 - }
73995 error = 0;
73996
73997 /* Somebody else might have raced and expanded it already */
73998 - if (address > vma->vm_end) {
73999 + 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)
74000 + error = -ENOMEM;
74001 + else if (address > vma->vm_end && (!locknext || vma->vm_next->vm_start >= address)) {
74002 unsigned long size, grow;
74003
74004 size = address - vma->vm_start;
74005 @@ -1763,6 +2024,8 @@ int expand_upwards(struct vm_area_struct *vma, unsigned long address)
74006 }
74007 }
74008 }
74009 + if (locknext)
74010 + vma_unlock_anon_vma(vma->vm_next);
74011 vma_unlock_anon_vma(vma);
74012 khugepaged_enter_vma_merge(vma);
74013 return error;
74014 @@ -1776,6 +2039,8 @@ int expand_downwards(struct vm_area_struct *vma,
74015 unsigned long address)
74016 {
74017 int error;
74018 + bool lockprev = false;
74019 + struct vm_area_struct *prev;
74020
74021 /*
74022 * We must make sure the anon_vma is allocated
74023 @@ -1789,6 +2054,15 @@ int expand_downwards(struct vm_area_struct *vma,
74024 if (error)
74025 return error;
74026
74027 + prev = vma->vm_prev;
74028 +#if defined(CONFIG_STACK_GROWSUP) || defined(CONFIG_IA64)
74029 + lockprev = prev && (prev->vm_flags & VM_GROWSUP);
74030 +#endif
74031 + if (lockprev && anon_vma_prepare(prev))
74032 + return -ENOMEM;
74033 + if (lockprev)
74034 + vma_lock_anon_vma(prev);
74035 +
74036 vma_lock_anon_vma(vma);
74037
74038 /*
74039 @@ -1798,9 +2072,17 @@ int expand_downwards(struct vm_area_struct *vma,
74040 */
74041
74042 /* Somebody else might have raced and expanded it already */
74043 - if (address < vma->vm_start) {
74044 + if (prev && (prev->vm_flags & (VM_READ | VM_WRITE | VM_EXEC)) && address - prev->vm_end < sysctl_heap_stack_gap)
74045 + error = -ENOMEM;
74046 + else if (address < vma->vm_start && (!lockprev || prev->vm_end <= address)) {
74047 unsigned long size, grow;
74048
74049 +#ifdef CONFIG_PAX_SEGMEXEC
74050 + struct vm_area_struct *vma_m;
74051 +
74052 + vma_m = pax_find_mirror_vma(vma);
74053 +#endif
74054 +
74055 size = vma->vm_end - address;
74056 grow = (vma->vm_start - address) >> PAGE_SHIFT;
74057
74058 @@ -1810,11 +2092,22 @@ int expand_downwards(struct vm_area_struct *vma,
74059 if (!error) {
74060 vma->vm_start = address;
74061 vma->vm_pgoff -= grow;
74062 + track_exec_limit(vma->vm_mm, vma->vm_start, vma->vm_end, vma->vm_flags);
74063 +
74064 +#ifdef CONFIG_PAX_SEGMEXEC
74065 + if (vma_m) {
74066 + vma_m->vm_start -= grow << PAGE_SHIFT;
74067 + vma_m->vm_pgoff -= grow;
74068 + }
74069 +#endif
74070 +
74071 perf_event_mmap(vma);
74072 }
74073 }
74074 }
74075 vma_unlock_anon_vma(vma);
74076 + if (lockprev)
74077 + vma_unlock_anon_vma(prev);
74078 khugepaged_enter_vma_merge(vma);
74079 return error;
74080 }
74081 @@ -1886,6 +2179,13 @@ static void remove_vma_list(struct mm_struct *mm, struct vm_area_struct *vma)
74082 do {
74083 long nrpages = vma_pages(vma);
74084
74085 +#ifdef CONFIG_PAX_SEGMEXEC
74086 + if ((mm->pax_flags & MF_PAX_SEGMEXEC) && (vma->vm_start >= SEGMEXEC_TASK_SIZE)) {
74087 + vma = remove_vma(vma);
74088 + continue;
74089 + }
74090 +#endif
74091 +
74092 if (vma->vm_flags & VM_ACCOUNT)
74093 nr_accounted += nrpages;
74094 vm_stat_account(mm, vma->vm_flags, vma->vm_file, -nrpages);
74095 @@ -1931,6 +2231,16 @@ detach_vmas_to_be_unmapped(struct mm_struct *mm, struct vm_area_struct *vma,
74096 insertion_point = (prev ? &prev->vm_next : &mm->mmap);
74097 vma->vm_prev = NULL;
74098 do {
74099 +
74100 +#ifdef CONFIG_PAX_SEGMEXEC
74101 + if (vma->vm_mirror) {
74102 + BUG_ON(!vma->vm_mirror->vm_mirror || vma->vm_mirror->vm_mirror != vma);
74103 + vma->vm_mirror->vm_mirror = NULL;
74104 + vma->vm_mirror->vm_flags &= ~VM_EXEC;
74105 + vma->vm_mirror = NULL;
74106 + }
74107 +#endif
74108 +
74109 rb_erase(&vma->vm_rb, &mm->mm_rb);
74110 mm->map_count--;
74111 tail_vma = vma;
74112 @@ -1959,14 +2269,33 @@ static int __split_vma(struct mm_struct * mm, struct vm_area_struct * vma,
74113 struct vm_area_struct *new;
74114 int err = -ENOMEM;
74115
74116 +#ifdef CONFIG_PAX_SEGMEXEC
74117 + struct vm_area_struct *vma_m, *new_m = NULL;
74118 + unsigned long addr_m = addr + SEGMEXEC_TASK_SIZE;
74119 +#endif
74120 +
74121 if (is_vm_hugetlb_page(vma) && (addr &
74122 ~(huge_page_mask(hstate_vma(vma)))))
74123 return -EINVAL;
74124
74125 +#ifdef CONFIG_PAX_SEGMEXEC
74126 + vma_m = pax_find_mirror_vma(vma);
74127 +#endif
74128 +
74129 new = kmem_cache_alloc(vm_area_cachep, GFP_KERNEL);
74130 if (!new)
74131 goto out_err;
74132
74133 +#ifdef CONFIG_PAX_SEGMEXEC
74134 + if (vma_m) {
74135 + new_m = kmem_cache_alloc(vm_area_cachep, GFP_KERNEL);
74136 + if (!new_m) {
74137 + kmem_cache_free(vm_area_cachep, new);
74138 + goto out_err;
74139 + }
74140 + }
74141 +#endif
74142 +
74143 /* most fields are the same, copy all, and then fixup */
74144 *new = *vma;
74145
74146 @@ -1979,6 +2308,22 @@ static int __split_vma(struct mm_struct * mm, struct vm_area_struct * vma,
74147 new->vm_pgoff += ((addr - vma->vm_start) >> PAGE_SHIFT);
74148 }
74149
74150 +#ifdef CONFIG_PAX_SEGMEXEC
74151 + if (vma_m) {
74152 + *new_m = *vma_m;
74153 + INIT_LIST_HEAD(&new_m->anon_vma_chain);
74154 + new_m->vm_mirror = new;
74155 + new->vm_mirror = new_m;
74156 +
74157 + if (new_below)
74158 + new_m->vm_end = addr_m;
74159 + else {
74160 + new_m->vm_start = addr_m;
74161 + new_m->vm_pgoff += ((addr_m - vma_m->vm_start) >> PAGE_SHIFT);
74162 + }
74163 + }
74164 +#endif
74165 +
74166 pol = mpol_dup(vma_policy(vma));
74167 if (IS_ERR(pol)) {
74168 err = PTR_ERR(pol);
74169 @@ -2004,6 +2349,42 @@ static int __split_vma(struct mm_struct * mm, struct vm_area_struct * vma,
74170 else
74171 err = vma_adjust(vma, vma->vm_start, addr, vma->vm_pgoff, new);
74172
74173 +#ifdef CONFIG_PAX_SEGMEXEC
74174 + if (!err && vma_m) {
74175 + if (anon_vma_clone(new_m, vma_m))
74176 + goto out_free_mpol;
74177 +
74178 + mpol_get(pol);
74179 + vma_set_policy(new_m, pol);
74180 +
74181 + if (new_m->vm_file) {
74182 + get_file(new_m->vm_file);
74183 + if (vma_m->vm_flags & VM_EXECUTABLE)
74184 + added_exe_file_vma(mm);
74185 + }
74186 +
74187 + if (new_m->vm_ops && new_m->vm_ops->open)
74188 + new_m->vm_ops->open(new_m);
74189 +
74190 + if (new_below)
74191 + err = vma_adjust(vma_m, addr_m, vma_m->vm_end, vma_m->vm_pgoff +
74192 + ((addr_m - new_m->vm_start) >> PAGE_SHIFT), new_m);
74193 + else
74194 + err = vma_adjust(vma_m, vma_m->vm_start, addr_m, vma_m->vm_pgoff, new_m);
74195 +
74196 + if (err) {
74197 + if (new_m->vm_ops && new_m->vm_ops->close)
74198 + new_m->vm_ops->close(new_m);
74199 + if (new_m->vm_file) {
74200 + if (vma_m->vm_flags & VM_EXECUTABLE)
74201 + removed_exe_file_vma(mm);
74202 + fput(new_m->vm_file);
74203 + }
74204 + mpol_put(pol);
74205 + }
74206 + }
74207 +#endif
74208 +
74209 /* Success. */
74210 if (!err)
74211 return 0;
74212 @@ -2016,10 +2397,18 @@ static int __split_vma(struct mm_struct * mm, struct vm_area_struct * vma,
74213 removed_exe_file_vma(mm);
74214 fput(new->vm_file);
74215 }
74216 - unlink_anon_vmas(new);
74217 out_free_mpol:
74218 mpol_put(pol);
74219 out_free_vma:
74220 +
74221 +#ifdef CONFIG_PAX_SEGMEXEC
74222 + if (new_m) {
74223 + unlink_anon_vmas(new_m);
74224 + kmem_cache_free(vm_area_cachep, new_m);
74225 + }
74226 +#endif
74227 +
74228 + unlink_anon_vmas(new);
74229 kmem_cache_free(vm_area_cachep, new);
74230 out_err:
74231 return err;
74232 @@ -2032,6 +2421,15 @@ static int __split_vma(struct mm_struct * mm, struct vm_area_struct * vma,
74233 int split_vma(struct mm_struct *mm, struct vm_area_struct *vma,
74234 unsigned long addr, int new_below)
74235 {
74236 +
74237 +#ifdef CONFIG_PAX_SEGMEXEC
74238 + if (mm->pax_flags & MF_PAX_SEGMEXEC) {
74239 + BUG_ON(vma->vm_end > SEGMEXEC_TASK_SIZE);
74240 + if (mm->map_count >= sysctl_max_map_count-1)
74241 + return -ENOMEM;
74242 + } else
74243 +#endif
74244 +
74245 if (mm->map_count >= sysctl_max_map_count)
74246 return -ENOMEM;
74247
74248 @@ -2043,11 +2441,30 @@ int split_vma(struct mm_struct *mm, struct vm_area_struct *vma,
74249 * work. This now handles partial unmappings.
74250 * Jeremy Fitzhardinge <jeremy@goop.org>
74251 */
74252 +#ifdef CONFIG_PAX_SEGMEXEC
74253 int do_munmap(struct mm_struct *mm, unsigned long start, size_t len)
74254 {
74255 + int ret = __do_munmap(mm, start, len);
74256 + if (ret || !(mm->pax_flags & MF_PAX_SEGMEXEC))
74257 + return ret;
74258 +
74259 + return __do_munmap(mm, start + SEGMEXEC_TASK_SIZE, len);
74260 +}
74261 +
74262 +int __do_munmap(struct mm_struct *mm, unsigned long start, size_t len)
74263 +#else
74264 +int do_munmap(struct mm_struct *mm, unsigned long start, size_t len)
74265 +#endif
74266 +{
74267 unsigned long end;
74268 struct vm_area_struct *vma, *prev, *last;
74269
74270 + /*
74271 + * mm->mmap_sem is required to protect against another thread
74272 + * changing the mappings in case we sleep.
74273 + */
74274 + verify_mm_writelocked(mm);
74275 +
74276 if ((start & ~PAGE_MASK) || start > TASK_SIZE || len > TASK_SIZE-start)
74277 return -EINVAL;
74278
74279 @@ -2122,6 +2539,8 @@ int do_munmap(struct mm_struct *mm, unsigned long start, size_t len)
74280 /* Fix up all other VM information */
74281 remove_vma_list(mm, vma);
74282
74283 + track_exec_limit(mm, start, end, 0UL);
74284 +
74285 return 0;
74286 }
74287
74288 @@ -2130,6 +2549,13 @@ int vm_munmap(unsigned long start, size_t len)
74289 int ret;
74290 struct mm_struct *mm = current->mm;
74291
74292 +
74293 +#ifdef CONFIG_PAX_SEGMEXEC
74294 + if ((mm->pax_flags & MF_PAX_SEGMEXEC) &&
74295 + (len > SEGMEXEC_TASK_SIZE || start > SEGMEXEC_TASK_SIZE-len))
74296 + return -EINVAL;
74297 +#endif
74298 +
74299 down_write(&mm->mmap_sem);
74300 ret = do_munmap(mm, start, len);
74301 up_write(&mm->mmap_sem);
74302 @@ -2143,16 +2569,6 @@ SYSCALL_DEFINE2(munmap, unsigned long, addr, size_t, len)
74303 return vm_munmap(addr, len);
74304 }
74305
74306 -static inline void verify_mm_writelocked(struct mm_struct *mm)
74307 -{
74308 -#ifdef CONFIG_DEBUG_VM
74309 - if (unlikely(down_read_trylock(&mm->mmap_sem))) {
74310 - WARN_ON(1);
74311 - up_read(&mm->mmap_sem);
74312 - }
74313 -#endif
74314 -}
74315 -
74316 /*
74317 * this is really a simplified "do_mmap". it only handles
74318 * anonymous maps. eventually we may be able to do some
74319 @@ -2166,6 +2582,7 @@ static unsigned long do_brk(unsigned long addr, unsigned long len)
74320 struct rb_node ** rb_link, * rb_parent;
74321 pgoff_t pgoff = addr >> PAGE_SHIFT;
74322 int error;
74323 + unsigned long charged;
74324
74325 len = PAGE_ALIGN(len);
74326 if (!len)
74327 @@ -2173,16 +2590,30 @@ static unsigned long do_brk(unsigned long addr, unsigned long len)
74328
74329 flags = VM_DATA_DEFAULT_FLAGS | VM_ACCOUNT | mm->def_flags;
74330
74331 +#if defined(CONFIG_PAX_PAGEEXEC) || defined(CONFIG_PAX_SEGMEXEC)
74332 + if (mm->pax_flags & (MF_PAX_PAGEEXEC | MF_PAX_SEGMEXEC)) {
74333 + flags &= ~VM_EXEC;
74334 +
74335 +#ifdef CONFIG_PAX_MPROTECT
74336 + if (mm->pax_flags & MF_PAX_MPROTECT)
74337 + flags &= ~VM_MAYEXEC;
74338 +#endif
74339 +
74340 + }
74341 +#endif
74342 +
74343 error = get_unmapped_area(NULL, addr, len, 0, MAP_FIXED);
74344 if (error & ~PAGE_MASK)
74345 return error;
74346
74347 + charged = len >> PAGE_SHIFT;
74348 +
74349 /*
74350 * mlock MCL_FUTURE?
74351 */
74352 if (mm->def_flags & VM_LOCKED) {
74353 unsigned long locked, lock_limit;
74354 - locked = len >> PAGE_SHIFT;
74355 + locked = charged;
74356 locked += mm->locked_vm;
74357 lock_limit = rlimit(RLIMIT_MEMLOCK);
74358 lock_limit >>= PAGE_SHIFT;
74359 @@ -2199,22 +2630,22 @@ static unsigned long do_brk(unsigned long addr, unsigned long len)
74360 /*
74361 * Clear old maps. this also does some error checking for us
74362 */
74363 - munmap_back:
74364 vma = find_vma_prepare(mm, addr, &prev, &rb_link, &rb_parent);
74365 if (vma && vma->vm_start < addr + len) {
74366 if (do_munmap(mm, addr, len))
74367 return -ENOMEM;
74368 - goto munmap_back;
74369 - }
74370 + vma = find_vma_prepare(mm, addr, &prev, &rb_link, &rb_parent);
74371 + BUG_ON(vma && vma->vm_start < addr + len);
74372 + }
74373
74374 /* Check against address space limits *after* clearing old maps... */
74375 - if (!may_expand_vm(mm, len >> PAGE_SHIFT))
74376 + if (!may_expand_vm(mm, charged))
74377 return -ENOMEM;
74378
74379 if (mm->map_count > sysctl_max_map_count)
74380 return -ENOMEM;
74381
74382 - if (security_vm_enough_memory_mm(mm, len >> PAGE_SHIFT))
74383 + if (security_vm_enough_memory_mm(mm, charged))
74384 return -ENOMEM;
74385
74386 /* Can we just expand an old private anonymous mapping? */
74387 @@ -2228,7 +2659,7 @@ static unsigned long do_brk(unsigned long addr, unsigned long len)
74388 */
74389 vma = kmem_cache_zalloc(vm_area_cachep, GFP_KERNEL);
74390 if (!vma) {
74391 - vm_unacct_memory(len >> PAGE_SHIFT);
74392 + vm_unacct_memory(charged);
74393 return -ENOMEM;
74394 }
74395
74396 @@ -2242,11 +2673,12 @@ static unsigned long do_brk(unsigned long addr, unsigned long len)
74397 vma_link(mm, vma, prev, rb_link, rb_parent);
74398 out:
74399 perf_event_mmap(vma);
74400 - mm->total_vm += len >> PAGE_SHIFT;
74401 + mm->total_vm += charged;
74402 if (flags & VM_LOCKED) {
74403 if (!mlock_vma_pages_range(vma, addr, addr + len))
74404 - mm->locked_vm += (len >> PAGE_SHIFT);
74405 + mm->locked_vm += charged;
74406 }
74407 + track_exec_limit(mm, addr, addr + len, flags);
74408 return addr;
74409 }
74410
74411 @@ -2304,6 +2736,7 @@ void exit_mmap(struct mm_struct *mm)
74412 while (vma) {
74413 if (vma->vm_flags & VM_ACCOUNT)
74414 nr_accounted += vma_pages(vma);
74415 + vma->vm_mirror = NULL;
74416 vma = remove_vma(vma);
74417 }
74418 vm_unacct_memory(nr_accounted);
74419 @@ -2320,6 +2753,13 @@ int insert_vm_struct(struct mm_struct * mm, struct vm_area_struct * vma)
74420 struct vm_area_struct * __vma, * prev;
74421 struct rb_node ** rb_link, * rb_parent;
74422
74423 +#ifdef CONFIG_PAX_SEGMEXEC
74424 + struct vm_area_struct *vma_m = NULL;
74425 +#endif
74426 +
74427 + if (security_mmap_addr(vma->vm_start))
74428 + return -EPERM;
74429 +
74430 /*
74431 * The vm_pgoff of a purely anonymous vma should be irrelevant
74432 * until its first write fault, when page's anon_vma and index
74433 @@ -2343,7 +2783,21 @@ int insert_vm_struct(struct mm_struct * mm, struct vm_area_struct * vma)
74434 security_vm_enough_memory_mm(mm, vma_pages(vma)))
74435 return -ENOMEM;
74436
74437 +#ifdef CONFIG_PAX_SEGMEXEC
74438 + if ((mm->pax_flags & MF_PAX_SEGMEXEC) && (vma->vm_flags & VM_EXEC)) {
74439 + vma_m = kmem_cache_zalloc(vm_area_cachep, GFP_KERNEL);
74440 + if (!vma_m)
74441 + return -ENOMEM;
74442 + }
74443 +#endif
74444 +
74445 vma_link(mm, vma, prev, rb_link, rb_parent);
74446 +
74447 +#ifdef CONFIG_PAX_SEGMEXEC
74448 + if (vma_m)
74449 + BUG_ON(pax_mirror_vma(vma_m, vma));
74450 +#endif
74451 +
74452 return 0;
74453 }
74454
74455 @@ -2362,6 +2816,8 @@ struct vm_area_struct *copy_vma(struct vm_area_struct **vmap,
74456 struct mempolicy *pol;
74457 bool faulted_in_anon_vma = true;
74458
74459 + BUG_ON(vma->vm_mirror);
74460 +
74461 /*
74462 * If anonymous vma has not yet been faulted, update new pgoff
74463 * to match new location, to increase its chance of merging.
74464 @@ -2430,6 +2886,39 @@ struct vm_area_struct *copy_vma(struct vm_area_struct **vmap,
74465 return NULL;
74466 }
74467
74468 +#ifdef CONFIG_PAX_SEGMEXEC
74469 +long pax_mirror_vma(struct vm_area_struct *vma_m, struct vm_area_struct *vma)
74470 +{
74471 + struct vm_area_struct *prev_m;
74472 + struct rb_node **rb_link_m, *rb_parent_m;
74473 + struct mempolicy *pol_m;
74474 +
74475 + BUG_ON(!(vma->vm_mm->pax_flags & MF_PAX_SEGMEXEC) || !(vma->vm_flags & VM_EXEC));
74476 + BUG_ON(vma->vm_mirror || vma_m->vm_mirror);
74477 + BUG_ON(!mpol_equal(vma_policy(vma), vma_policy(vma_m)));
74478 + *vma_m = *vma;
74479 + INIT_LIST_HEAD(&vma_m->anon_vma_chain);
74480 + if (anon_vma_clone(vma_m, vma))
74481 + return -ENOMEM;
74482 + pol_m = vma_policy(vma_m);
74483 + mpol_get(pol_m);
74484 + vma_set_policy(vma_m, pol_m);
74485 + vma_m->vm_start += SEGMEXEC_TASK_SIZE;
74486 + vma_m->vm_end += SEGMEXEC_TASK_SIZE;
74487 + vma_m->vm_flags &= ~(VM_WRITE | VM_MAYWRITE | VM_ACCOUNT | VM_LOCKED);
74488 + vma_m->vm_page_prot = vm_get_page_prot(vma_m->vm_flags);
74489 + if (vma_m->vm_file)
74490 + get_file(vma_m->vm_file);
74491 + if (vma_m->vm_ops && vma_m->vm_ops->open)
74492 + vma_m->vm_ops->open(vma_m);
74493 + find_vma_prepare(vma->vm_mm, vma_m->vm_start, &prev_m, &rb_link_m, &rb_parent_m);
74494 + vma_link(vma->vm_mm, vma_m, prev_m, rb_link_m, rb_parent_m);
74495 + vma_m->vm_mirror = vma;
74496 + vma->vm_mirror = vma_m;
74497 + return 0;
74498 +}
74499 +#endif
74500 +
74501 /*
74502 * Return true if the calling process may expand its vm space by the passed
74503 * number of pages
74504 @@ -2441,6 +2930,12 @@ int may_expand_vm(struct mm_struct *mm, unsigned long npages)
74505
74506 lim = rlimit(RLIMIT_AS) >> PAGE_SHIFT;
74507
74508 +#ifdef CONFIG_PAX_RANDMMAP
74509 + if (mm->pax_flags & MF_PAX_RANDMMAP)
74510 + cur -= mm->brk_gap;
74511 +#endif
74512 +
74513 + gr_learn_resource(current, RLIMIT_AS, (cur + npages) << PAGE_SHIFT, 1);
74514 if (cur + npages > lim)
74515 return 0;
74516 return 1;
74517 @@ -2511,6 +3006,22 @@ int install_special_mapping(struct mm_struct *mm,
74518 vma->vm_start = addr;
74519 vma->vm_end = addr + len;
74520
74521 +#ifdef CONFIG_PAX_MPROTECT
74522 + if (mm->pax_flags & MF_PAX_MPROTECT) {
74523 +#ifndef CONFIG_PAX_MPROTECT_COMPAT
74524 + if ((vm_flags & (VM_WRITE | VM_EXEC)) == (VM_WRITE | VM_EXEC))
74525 + return -EPERM;
74526 + if (!(vm_flags & VM_EXEC))
74527 + vm_flags &= ~VM_MAYEXEC;
74528 +#else
74529 + if ((vm_flags & (VM_WRITE | VM_EXEC)) != VM_EXEC)
74530 + vm_flags &= ~(VM_EXEC | VM_MAYEXEC);
74531 +#endif
74532 + else
74533 + vm_flags &= ~VM_MAYWRITE;
74534 + }
74535 +#endif
74536 +
74537 vma->vm_flags = vm_flags | mm->def_flags | VM_DONTEXPAND;
74538 vma->vm_page_prot = vm_get_page_prot(vma->vm_flags);
74539
74540 diff --git a/mm/mprotect.c b/mm/mprotect.c
74541 index a409926..8b32e6d 100644
74542 --- a/mm/mprotect.c
74543 +++ b/mm/mprotect.c
74544 @@ -23,10 +23,17 @@
74545 #include <linux/mmu_notifier.h>
74546 #include <linux/migrate.h>
74547 #include <linux/perf_event.h>
74548 +
74549 +#ifdef CONFIG_PAX_MPROTECT
74550 +#include <linux/elf.h>
74551 +#include <linux/binfmts.h>
74552 +#endif
74553 +
74554 #include <asm/uaccess.h>
74555 #include <asm/pgtable.h>
74556 #include <asm/cacheflush.h>
74557 #include <asm/tlbflush.h>
74558 +#include <asm/mmu_context.h>
74559
74560 #ifndef pgprot_modify
74561 static inline pgprot_t pgprot_modify(pgprot_t oldprot, pgprot_t newprot)
74562 @@ -141,6 +148,48 @@ static void change_protection(struct vm_area_struct *vma,
74563 flush_tlb_range(vma, start, end);
74564 }
74565
74566 +#ifdef CONFIG_ARCH_TRACK_EXEC_LIMIT
74567 +/* called while holding the mmap semaphor for writing except stack expansion */
74568 +void track_exec_limit(struct mm_struct *mm, unsigned long start, unsigned long end, unsigned long prot)
74569 +{
74570 + unsigned long oldlimit, newlimit = 0UL;
74571 +
74572 + if (!(mm->pax_flags & MF_PAX_PAGEEXEC) || (__supported_pte_mask & _PAGE_NX))
74573 + return;
74574 +
74575 + spin_lock(&mm->page_table_lock);
74576 + oldlimit = mm->context.user_cs_limit;
74577 + if ((prot & VM_EXEC) && oldlimit < end)
74578 + /* USER_CS limit moved up */
74579 + newlimit = end;
74580 + else if (!(prot & VM_EXEC) && start < oldlimit && oldlimit <= end)
74581 + /* USER_CS limit moved down */
74582 + newlimit = start;
74583 +
74584 + if (newlimit) {
74585 + mm->context.user_cs_limit = newlimit;
74586 +
74587 +#ifdef CONFIG_SMP
74588 + wmb();
74589 + cpus_clear(mm->context.cpu_user_cs_mask);
74590 + cpu_set(smp_processor_id(), mm->context.cpu_user_cs_mask);
74591 +#endif
74592 +
74593 + set_user_cs(mm->context.user_cs_base, mm->context.user_cs_limit, smp_processor_id());
74594 + }
74595 + spin_unlock(&mm->page_table_lock);
74596 + if (newlimit == end) {
74597 + struct vm_area_struct *vma = find_vma(mm, oldlimit);
74598 +
74599 + for (; vma && vma->vm_start < end; vma = vma->vm_next)
74600 + if (is_vm_hugetlb_page(vma))
74601 + hugetlb_change_protection(vma, vma->vm_start, vma->vm_end, vma->vm_page_prot);
74602 + else
74603 + change_protection(vma, vma->vm_start, vma->vm_end, vma->vm_page_prot, vma_wants_writenotify(vma));
74604 + }
74605 +}
74606 +#endif
74607 +
74608 int
74609 mprotect_fixup(struct vm_area_struct *vma, struct vm_area_struct **pprev,
74610 unsigned long start, unsigned long end, unsigned long newflags)
74611 @@ -153,11 +202,29 @@ mprotect_fixup(struct vm_area_struct *vma, struct vm_area_struct **pprev,
74612 int error;
74613 int dirty_accountable = 0;
74614
74615 +#ifdef CONFIG_PAX_SEGMEXEC
74616 + struct vm_area_struct *vma_m = NULL;
74617 + unsigned long start_m, end_m;
74618 +
74619 + start_m = start + SEGMEXEC_TASK_SIZE;
74620 + end_m = end + SEGMEXEC_TASK_SIZE;
74621 +#endif
74622 +
74623 if (newflags == oldflags) {
74624 *pprev = vma;
74625 return 0;
74626 }
74627
74628 + if (newflags & (VM_READ | VM_WRITE | VM_EXEC)) {
74629 + struct vm_area_struct *prev = vma->vm_prev, *next = vma->vm_next;
74630 +
74631 + if (next && (next->vm_flags & VM_GROWSDOWN) && sysctl_heap_stack_gap > next->vm_start - end)
74632 + return -ENOMEM;
74633 +
74634 + if (prev && (prev->vm_flags & VM_GROWSUP) && sysctl_heap_stack_gap > start - prev->vm_end)
74635 + return -ENOMEM;
74636 + }
74637 +
74638 /*
74639 * If we make a private mapping writable we increase our commit;
74640 * but (without finer accounting) cannot reduce our commit if we
74641 @@ -174,6 +241,42 @@ mprotect_fixup(struct vm_area_struct *vma, struct vm_area_struct **pprev,
74642 }
74643 }
74644
74645 +#ifdef CONFIG_PAX_SEGMEXEC
74646 + if ((mm->pax_flags & MF_PAX_SEGMEXEC) && ((oldflags ^ newflags) & VM_EXEC)) {
74647 + if (start != vma->vm_start) {
74648 + error = split_vma(mm, vma, start, 1);
74649 + if (error)
74650 + goto fail;
74651 + BUG_ON(!*pprev || (*pprev)->vm_next == vma);
74652 + *pprev = (*pprev)->vm_next;
74653 + }
74654 +
74655 + if (end != vma->vm_end) {
74656 + error = split_vma(mm, vma, end, 0);
74657 + if (error)
74658 + goto fail;
74659 + }
74660 +
74661 + if (pax_find_mirror_vma(vma)) {
74662 + error = __do_munmap(mm, start_m, end_m - start_m);
74663 + if (error)
74664 + goto fail;
74665 + } else {
74666 + vma_m = kmem_cache_zalloc(vm_area_cachep, GFP_KERNEL);
74667 + if (!vma_m) {
74668 + error = -ENOMEM;
74669 + goto fail;
74670 + }
74671 + vma->vm_flags = newflags;
74672 + error = pax_mirror_vma(vma_m, vma);
74673 + if (error) {
74674 + vma->vm_flags = oldflags;
74675 + goto fail;
74676 + }
74677 + }
74678 + }
74679 +#endif
74680 +
74681 /*
74682 * First try to merge with previous and/or next vma.
74683 */
74684 @@ -204,9 +307,21 @@ success:
74685 * vm_flags and vm_page_prot are protected by the mmap_sem
74686 * held in write mode.
74687 */
74688 +
74689 +#ifdef CONFIG_PAX_SEGMEXEC
74690 + if ((mm->pax_flags & MF_PAX_SEGMEXEC) && (newflags & VM_EXEC) && ((vma->vm_flags ^ newflags) & VM_READ))
74691 + pax_find_mirror_vma(vma)->vm_flags ^= VM_READ;
74692 +#endif
74693 +
74694 vma->vm_flags = newflags;
74695 +
74696 +#ifdef CONFIG_PAX_MPROTECT
74697 + if (mm->binfmt && mm->binfmt->handle_mprotect)
74698 + mm->binfmt->handle_mprotect(vma, newflags);
74699 +#endif
74700 +
74701 vma->vm_page_prot = pgprot_modify(vma->vm_page_prot,
74702 - vm_get_page_prot(newflags));
74703 + vm_get_page_prot(vma->vm_flags));
74704
74705 if (vma_wants_writenotify(vma)) {
74706 vma->vm_page_prot = vm_get_page_prot(newflags & ~VM_SHARED);
74707 @@ -248,6 +363,17 @@ SYSCALL_DEFINE3(mprotect, unsigned long, start, size_t, len,
74708 end = start + len;
74709 if (end <= start)
74710 return -ENOMEM;
74711 +
74712 +#ifdef CONFIG_PAX_SEGMEXEC
74713 + if (current->mm->pax_flags & MF_PAX_SEGMEXEC) {
74714 + if (end > SEGMEXEC_TASK_SIZE)
74715 + return -EINVAL;
74716 + } else
74717 +#endif
74718 +
74719 + if (end > TASK_SIZE)
74720 + return -EINVAL;
74721 +
74722 if (!arch_validate_prot(prot))
74723 return -EINVAL;
74724
74725 @@ -255,7 +381,7 @@ SYSCALL_DEFINE3(mprotect, unsigned long, start, size_t, len,
74726 /*
74727 * Does the application expect PROT_READ to imply PROT_EXEC:
74728 */
74729 - if ((prot & PROT_READ) && (current->personality & READ_IMPLIES_EXEC))
74730 + if ((prot & (PROT_READ | PROT_WRITE)) && (current->personality & READ_IMPLIES_EXEC))
74731 prot |= PROT_EXEC;
74732
74733 vm_flags = calc_vm_prot_bits(prot);
74734 @@ -288,6 +414,11 @@ SYSCALL_DEFINE3(mprotect, unsigned long, start, size_t, len,
74735 if (start > vma->vm_start)
74736 prev = vma;
74737
74738 +#ifdef CONFIG_PAX_MPROTECT
74739 + if (current->mm->binfmt && current->mm->binfmt->handle_mprotect)
74740 + current->mm->binfmt->handle_mprotect(vma, vm_flags);
74741 +#endif
74742 +
74743 for (nstart = start ; ; ) {
74744 unsigned long newflags;
74745
74746 @@ -297,6 +428,14 @@ SYSCALL_DEFINE3(mprotect, unsigned long, start, size_t, len,
74747
74748 /* newflags >> 4 shift VM_MAY% in place of VM_% */
74749 if ((newflags & ~(newflags >> 4)) & (VM_READ | VM_WRITE | VM_EXEC)) {
74750 + if (prot & (PROT_WRITE | PROT_EXEC))
74751 + gr_log_rwxmprotect(vma->vm_file);
74752 +
74753 + error = -EACCES;
74754 + goto out;
74755 + }
74756 +
74757 + if (!gr_acl_handle_mprotect(vma->vm_file, prot)) {
74758 error = -EACCES;
74759 goto out;
74760 }
74761 @@ -311,6 +450,9 @@ SYSCALL_DEFINE3(mprotect, unsigned long, start, size_t, len,
74762 error = mprotect_fixup(vma, &prev, nstart, tmp, newflags);
74763 if (error)
74764 goto out;
74765 +
74766 + track_exec_limit(current->mm, nstart, tmp, vm_flags);
74767 +
74768 nstart = tmp;
74769
74770 if (nstart < prev->vm_end)
74771 diff --git a/mm/mremap.c b/mm/mremap.c
74772 index cc06d0e..40b5d18 100644
74773 --- a/mm/mremap.c
74774 +++ b/mm/mremap.c
74775 @@ -106,6 +106,12 @@ static void move_ptes(struct vm_area_struct *vma, pmd_t *old_pmd,
74776 continue;
74777 pte = ptep_get_and_clear(mm, old_addr, old_pte);
74778 pte = move_pte(pte, new_vma->vm_page_prot, old_addr, new_addr);
74779 +
74780 +#ifdef CONFIG_ARCH_TRACK_EXEC_LIMIT
74781 + if (!(__supported_pte_mask & _PAGE_NX) && (new_vma->vm_flags & (VM_PAGEEXEC | VM_EXEC)) == VM_PAGEEXEC)
74782 + pte = pte_exprotect(pte);
74783 +#endif
74784 +
74785 set_pte_at(mm, new_addr, new_pte, pte);
74786 }
74787
74788 @@ -298,6 +304,11 @@ static struct vm_area_struct *vma_to_resize(unsigned long addr,
74789 if (is_vm_hugetlb_page(vma))
74790 goto Einval;
74791
74792 +#ifdef CONFIG_PAX_SEGMEXEC
74793 + if (pax_find_mirror_vma(vma))
74794 + goto Einval;
74795 +#endif
74796 +
74797 /* We can't remap across vm area boundaries */
74798 if (old_len > vma->vm_end - addr)
74799 goto Efault;
74800 @@ -354,20 +365,25 @@ static unsigned long mremap_to(unsigned long addr,
74801 unsigned long ret = -EINVAL;
74802 unsigned long charged = 0;
74803 unsigned long map_flags;
74804 + unsigned long pax_task_size = TASK_SIZE;
74805
74806 if (new_addr & ~PAGE_MASK)
74807 goto out;
74808
74809 - if (new_len > TASK_SIZE || new_addr > TASK_SIZE - new_len)
74810 +#ifdef CONFIG_PAX_SEGMEXEC
74811 + if (mm->pax_flags & MF_PAX_SEGMEXEC)
74812 + pax_task_size = SEGMEXEC_TASK_SIZE;
74813 +#endif
74814 +
74815 + pax_task_size -= PAGE_SIZE;
74816 +
74817 + if (new_len > TASK_SIZE || new_addr > pax_task_size - new_len)
74818 goto out;
74819
74820 /* Check if the location we're moving into overlaps the
74821 * old location at all, and fail if it does.
74822 */
74823 - if ((new_addr <= addr) && (new_addr+new_len) > addr)
74824 - goto out;
74825 -
74826 - if ((addr <= new_addr) && (addr+old_len) > new_addr)
74827 + if (addr + old_len > new_addr && new_addr + new_len > addr)
74828 goto out;
74829
74830 ret = do_munmap(mm, new_addr, new_len);
74831 @@ -435,6 +451,7 @@ SYSCALL_DEFINE5(mremap, unsigned long, addr, unsigned long, old_len,
74832 struct vm_area_struct *vma;
74833 unsigned long ret = -EINVAL;
74834 unsigned long charged = 0;
74835 + unsigned long pax_task_size = TASK_SIZE;
74836
74837 down_write(&current->mm->mmap_sem);
74838
74839 @@ -455,6 +472,17 @@ SYSCALL_DEFINE5(mremap, unsigned long, addr, unsigned long, old_len,
74840 if (!new_len)
74841 goto out;
74842
74843 +#ifdef CONFIG_PAX_SEGMEXEC
74844 + if (mm->pax_flags & MF_PAX_SEGMEXEC)
74845 + pax_task_size = SEGMEXEC_TASK_SIZE;
74846 +#endif
74847 +
74848 + pax_task_size -= PAGE_SIZE;
74849 +
74850 + if (new_len > pax_task_size || addr > pax_task_size-new_len ||
74851 + old_len > pax_task_size || addr > pax_task_size-old_len)
74852 + goto out;
74853 +
74854 if (flags & MREMAP_FIXED) {
74855 if (flags & MREMAP_MAYMOVE)
74856 ret = mremap_to(addr, old_len, new_addr, new_len);
74857 @@ -503,6 +531,7 @@ SYSCALL_DEFINE5(mremap, unsigned long, addr, unsigned long, old_len,
74858 addr + new_len);
74859 }
74860 ret = addr;
74861 + track_exec_limit(vma->vm_mm, vma->vm_start, addr + new_len, vma->vm_flags);
74862 goto out;
74863 }
74864 }
74865 @@ -526,7 +555,12 @@ SYSCALL_DEFINE5(mremap, unsigned long, addr, unsigned long, old_len,
74866 goto out;
74867 }
74868
74869 + map_flags = vma->vm_flags;
74870 ret = move_vma(vma, addr, old_len, new_len, new_addr);
74871 + if (!(ret & ~PAGE_MASK)) {
74872 + track_exec_limit(current->mm, addr, addr + old_len, 0UL);
74873 + track_exec_limit(current->mm, new_addr, new_addr + new_len, map_flags);
74874 + }
74875 }
74876 out:
74877 if (ret & ~PAGE_MASK)
74878 diff --git a/mm/nommu.c b/mm/nommu.c
74879 index d4b0c10..ed421b5 100644
74880 --- a/mm/nommu.c
74881 +++ b/mm/nommu.c
74882 @@ -62,7 +62,6 @@ int sysctl_overcommit_memory = OVERCOMMIT_GUESS; /* heuristic overcommit */
74883 int sysctl_overcommit_ratio = 50; /* default is 50% */
74884 int sysctl_max_map_count = DEFAULT_MAX_MAP_COUNT;
74885 int sysctl_nr_trim_pages = CONFIG_NOMMU_INITIAL_TRIM_EXCESS;
74886 -int heap_stack_gap = 0;
74887
74888 atomic_long_t mmap_pages_allocated;
74889
74890 @@ -827,15 +826,6 @@ struct vm_area_struct *find_vma(struct mm_struct *mm, unsigned long addr)
74891 EXPORT_SYMBOL(find_vma);
74892
74893 /*
74894 - * find a VMA
74895 - * - we don't extend stack VMAs under NOMMU conditions
74896 - */
74897 -struct vm_area_struct *find_extend_vma(struct mm_struct *mm, unsigned long addr)
74898 -{
74899 - return find_vma(mm, addr);
74900 -}
74901 -
74902 -/*
74903 * expand a stack to a given address
74904 * - not supported under NOMMU conditions
74905 */
74906 @@ -1551,6 +1541,7 @@ int split_vma(struct mm_struct *mm, struct vm_area_struct *vma,
74907
74908 /* most fields are the same, copy all, and then fixup */
74909 *new = *vma;
74910 + INIT_LIST_HEAD(&new->anon_vma_chain);
74911 *region = *vma->vm_region;
74912 new->vm_region = region;
74913
74914 diff --git a/mm/page_alloc.c b/mm/page_alloc.c
74915 index d2d8f54..be2a87c 100644
74916 --- a/mm/page_alloc.c
74917 +++ b/mm/page_alloc.c
74918 @@ -340,7 +340,7 @@ out:
74919 * This usage means that zero-order pages may not be compound.
74920 */
74921
74922 -static void free_compound_page(struct page *page)
74923 +void free_compound_page(struct page *page)
74924 {
74925 __free_pages_ok(page, compound_order(page));
74926 }
74927 @@ -697,6 +697,10 @@ static bool free_pages_prepare(struct page *page, unsigned int order)
74928 int i;
74929 int bad = 0;
74930
74931 +#ifdef CONFIG_PAX_MEMORY_SANITIZE
74932 + unsigned long index = 1UL << order;
74933 +#endif
74934 +
74935 trace_mm_page_free(page, order);
74936 kmemcheck_free_shadow(page, order);
74937
74938 @@ -712,6 +716,12 @@ static bool free_pages_prepare(struct page *page, unsigned int order)
74939 debug_check_no_obj_freed(page_address(page),
74940 PAGE_SIZE << order);
74941 }
74942 +
74943 +#ifdef CONFIG_PAX_MEMORY_SANITIZE
74944 + for (; index; --index)
74945 + sanitize_highpage(page + index - 1);
74946 +#endif
74947 +
74948 arch_free_page(page, order);
74949 kernel_map_pages(page, 1 << order, 0);
74950
74951 @@ -853,8 +863,10 @@ static int prep_new_page(struct page *page, int order, gfp_t gfp_flags)
74952 arch_alloc_page(page, order);
74953 kernel_map_pages(page, 1 << order, 1);
74954
74955 +#ifndef CONFIG_PAX_MEMORY_SANITIZE
74956 if (gfp_flags & __GFP_ZERO)
74957 prep_zero_page(page, order, gfp_flags);
74958 +#endif
74959
74960 if (order && (gfp_flags & __GFP_COMP))
74961 prep_compound_page(page, order);
74962 @@ -3648,7 +3660,13 @@ static int pageblock_is_reserved(unsigned long start_pfn, unsigned long end_pfn)
74963 unsigned long pfn;
74964
74965 for (pfn = start_pfn; pfn < end_pfn; pfn++) {
74966 +#ifdef CONFIG_X86_32
74967 + /* boot failures in VMware 8 on 32bit vanilla since
74968 + this change */
74969 + if (!pfn_valid(pfn) || PageReserved(pfn_to_page(pfn)))
74970 +#else
74971 if (!pfn_valid_within(pfn) || PageReserved(pfn_to_page(pfn)))
74972 +#endif
74973 return 1;
74974 }
74975 return 0;
74976 diff --git a/mm/percpu.c b/mm/percpu.c
74977 index bb4be74..a43ea85 100644
74978 --- a/mm/percpu.c
74979 +++ b/mm/percpu.c
74980 @@ -122,7 +122,7 @@ static unsigned int pcpu_low_unit_cpu __read_mostly;
74981 static unsigned int pcpu_high_unit_cpu __read_mostly;
74982
74983 /* the address of the first chunk which starts with the kernel static area */
74984 -void *pcpu_base_addr __read_mostly;
74985 +void *pcpu_base_addr __read_only;
74986 EXPORT_SYMBOL_GPL(pcpu_base_addr);
74987
74988 static const int *pcpu_unit_map __read_mostly; /* cpu -> unit */
74989 diff --git a/mm/process_vm_access.c b/mm/process_vm_access.c
74990 index 926b466..b23df53 100644
74991 --- a/mm/process_vm_access.c
74992 +++ b/mm/process_vm_access.c
74993 @@ -13,6 +13,7 @@
74994 #include <linux/uio.h>
74995 #include <linux/sched.h>
74996 #include <linux/highmem.h>
74997 +#include <linux/security.h>
74998 #include <linux/ptrace.h>
74999 #include <linux/slab.h>
75000 #include <linux/syscalls.h>
75001 @@ -258,19 +259,19 @@ static ssize_t process_vm_rw_core(pid_t pid, const struct iovec *lvec,
75002 size_t iov_l_curr_offset = 0;
75003 ssize_t iov_len;
75004
75005 + return -ENOSYS; // PaX: until properly audited
75006 +
75007 /*
75008 * Work out how many pages of struct pages we're going to need
75009 * when eventually calling get_user_pages
75010 */
75011 for (i = 0; i < riovcnt; i++) {
75012 iov_len = rvec[i].iov_len;
75013 - if (iov_len > 0) {
75014 - nr_pages_iov = ((unsigned long)rvec[i].iov_base
75015 - + iov_len)
75016 - / PAGE_SIZE - (unsigned long)rvec[i].iov_base
75017 - / PAGE_SIZE + 1;
75018 - nr_pages = max(nr_pages, nr_pages_iov);
75019 - }
75020 + if (iov_len <= 0)
75021 + continue;
75022 + nr_pages_iov = ((unsigned long)rvec[i].iov_base + iov_len) / PAGE_SIZE -
75023 + (unsigned long)rvec[i].iov_base / PAGE_SIZE + 1;
75024 + nr_pages = max(nr_pages, nr_pages_iov);
75025 }
75026
75027 if (nr_pages == 0)
75028 @@ -298,6 +299,11 @@ static ssize_t process_vm_rw_core(pid_t pid, const struct iovec *lvec,
75029 goto free_proc_pages;
75030 }
75031
75032 + if (gr_handle_ptrace(task, vm_write ? PTRACE_POKETEXT : PTRACE_ATTACH)) {
75033 + rc = -EPERM;
75034 + goto put_task_struct;
75035 + }
75036 +
75037 mm = mm_access(task, PTRACE_MODE_ATTACH);
75038 if (!mm || IS_ERR(mm)) {
75039 rc = IS_ERR(mm) ? PTR_ERR(mm) : -ESRCH;
75040 diff --git a/mm/rmap.c b/mm/rmap.c
75041 index aa95e59..b681a63 100644
75042 --- a/mm/rmap.c
75043 +++ b/mm/rmap.c
75044 @@ -168,6 +168,10 @@ int anon_vma_prepare(struct vm_area_struct *vma)
75045 struct anon_vma *anon_vma = vma->anon_vma;
75046 struct anon_vma_chain *avc;
75047
75048 +#ifdef CONFIG_PAX_SEGMEXEC
75049 + struct anon_vma_chain *avc_m = NULL;
75050 +#endif
75051 +
75052 might_sleep();
75053 if (unlikely(!anon_vma)) {
75054 struct mm_struct *mm = vma->vm_mm;
75055 @@ -177,6 +181,12 @@ int anon_vma_prepare(struct vm_area_struct *vma)
75056 if (!avc)
75057 goto out_enomem;
75058
75059 +#ifdef CONFIG_PAX_SEGMEXEC
75060 + avc_m = anon_vma_chain_alloc(GFP_KERNEL);
75061 + if (!avc_m)
75062 + goto out_enomem_free_avc;
75063 +#endif
75064 +
75065 anon_vma = find_mergeable_anon_vma(vma);
75066 allocated = NULL;
75067 if (!anon_vma) {
75068 @@ -190,6 +200,18 @@ int anon_vma_prepare(struct vm_area_struct *vma)
75069 /* page_table_lock to protect against threads */
75070 spin_lock(&mm->page_table_lock);
75071 if (likely(!vma->anon_vma)) {
75072 +
75073 +#ifdef CONFIG_PAX_SEGMEXEC
75074 + struct vm_area_struct *vma_m = pax_find_mirror_vma(vma);
75075 +
75076 + if (vma_m) {
75077 + BUG_ON(vma_m->anon_vma);
75078 + vma_m->anon_vma = anon_vma;
75079 + anon_vma_chain_link(vma_m, avc_m, anon_vma);
75080 + avc_m = NULL;
75081 + }
75082 +#endif
75083 +
75084 vma->anon_vma = anon_vma;
75085 anon_vma_chain_link(vma, avc, anon_vma);
75086 allocated = NULL;
75087 @@ -200,12 +222,24 @@ int anon_vma_prepare(struct vm_area_struct *vma)
75088
75089 if (unlikely(allocated))
75090 put_anon_vma(allocated);
75091 +
75092 +#ifdef CONFIG_PAX_SEGMEXEC
75093 + if (unlikely(avc_m))
75094 + anon_vma_chain_free(avc_m);
75095 +#endif
75096 +
75097 if (unlikely(avc))
75098 anon_vma_chain_free(avc);
75099 }
75100 return 0;
75101
75102 out_enomem_free_avc:
75103 +
75104 +#ifdef CONFIG_PAX_SEGMEXEC
75105 + if (avc_m)
75106 + anon_vma_chain_free(avc_m);
75107 +#endif
75108 +
75109 anon_vma_chain_free(avc);
75110 out_enomem:
75111 return -ENOMEM;
75112 @@ -241,7 +275,7 @@ static inline void unlock_anon_vma_root(struct anon_vma *root)
75113 * Attach the anon_vmas from src to dst.
75114 * Returns 0 on success, -ENOMEM on failure.
75115 */
75116 -int anon_vma_clone(struct vm_area_struct *dst, struct vm_area_struct *src)
75117 +int anon_vma_clone(struct vm_area_struct *dst, const struct vm_area_struct *src)
75118 {
75119 struct anon_vma_chain *avc, *pavc;
75120 struct anon_vma *root = NULL;
75121 @@ -319,7 +353,7 @@ void anon_vma_moveto_tail(struct vm_area_struct *dst)
75122 * the corresponding VMA in the parent process is attached to.
75123 * Returns 0 on success, non-zero on failure.
75124 */
75125 -int anon_vma_fork(struct vm_area_struct *vma, struct vm_area_struct *pvma)
75126 +int anon_vma_fork(struct vm_area_struct *vma, const struct vm_area_struct *pvma)
75127 {
75128 struct anon_vma_chain *avc;
75129 struct anon_vma *anon_vma;
75130 diff --git a/mm/shmem.c b/mm/shmem.c
75131 index 31e1506..dbf3647 100644
75132 --- a/mm/shmem.c
75133 +++ b/mm/shmem.c
75134 @@ -31,7 +31,7 @@
75135 #include <linux/export.h>
75136 #include <linux/swap.h>
75137
75138 -static struct vfsmount *shm_mnt;
75139 +struct vfsmount *shm_mnt;
75140
75141 #ifdef CONFIG_SHMEM
75142 /*
75143 @@ -75,7 +75,7 @@ static struct vfsmount *shm_mnt;
75144 #define BOGO_DIRENT_SIZE 20
75145
75146 /* Symlink up to this size is kmalloc'ed instead of using a swappable page */
75147 -#define SHORT_SYMLINK_LEN 128
75148 +#define SHORT_SYMLINK_LEN 64
75149
75150 struct shmem_xattr {
75151 struct list_head list; /* anchored by shmem_inode_info->xattr_list */
75152 @@ -2219,6 +2219,11 @@ static const struct xattr_handler *shmem_xattr_handlers[] = {
75153 static int shmem_xattr_validate(const char *name)
75154 {
75155 struct { const char *prefix; size_t len; } arr[] = {
75156 +
75157 +#ifdef CONFIG_PAX_XATTR_PAX_FLAGS
75158 + { XATTR_USER_PREFIX, XATTR_USER_PREFIX_LEN},
75159 +#endif
75160 +
75161 { XATTR_SECURITY_PREFIX, XATTR_SECURITY_PREFIX_LEN },
75162 { XATTR_TRUSTED_PREFIX, XATTR_TRUSTED_PREFIX_LEN }
75163 };
75164 @@ -2272,6 +2277,15 @@ static int shmem_setxattr(struct dentry *dentry, const char *name,
75165 if (err)
75166 return err;
75167
75168 +#ifdef CONFIG_PAX_XATTR_PAX_FLAGS
75169 + if (!strncmp(name, XATTR_USER_PREFIX, XATTR_USER_PREFIX_LEN)) {
75170 + if (strcmp(name, XATTR_NAME_PAX_FLAGS))
75171 + return -EOPNOTSUPP;
75172 + if (size > 8)
75173 + return -EINVAL;
75174 + }
75175 +#endif
75176 +
75177 if (size == 0)
75178 value = ""; /* empty EA, do not remove */
75179
75180 @@ -2606,8 +2620,7 @@ int shmem_fill_super(struct super_block *sb, void *data, int silent)
75181 int err = -ENOMEM;
75182
75183 /* Round up to L1_CACHE_BYTES to resist false sharing */
75184 - sbinfo = kzalloc(max((int)sizeof(struct shmem_sb_info),
75185 - L1_CACHE_BYTES), GFP_KERNEL);
75186 + sbinfo = kzalloc(max(sizeof(struct shmem_sb_info), L1_CACHE_BYTES), GFP_KERNEL);
75187 if (!sbinfo)
75188 return -ENOMEM;
75189
75190 diff --git a/mm/slab.c b/mm/slab.c
75191 index d066037..5bb78d9 100644
75192 --- a/mm/slab.c
75193 +++ b/mm/slab.c
75194 @@ -164,7 +164,7 @@ static bool pfmemalloc_active __read_mostly;
75195
75196 /* Legal flag mask for kmem_cache_create(). */
75197 #if DEBUG
75198 -# define CREATE_MASK (SLAB_RED_ZONE | \
75199 +# define CREATE_MASK (SLAB_USERCOPY | SLAB_RED_ZONE | \
75200 SLAB_POISON | SLAB_HWCACHE_ALIGN | \
75201 SLAB_CACHE_DMA | \
75202 SLAB_STORE_USER | \
75203 @@ -172,7 +172,7 @@ static bool pfmemalloc_active __read_mostly;
75204 SLAB_DESTROY_BY_RCU | SLAB_MEM_SPREAD | \
75205 SLAB_DEBUG_OBJECTS | SLAB_NOLEAKTRACE | SLAB_NOTRACK)
75206 #else
75207 -# define CREATE_MASK (SLAB_HWCACHE_ALIGN | \
75208 +# define CREATE_MASK (SLAB_USERCOPY | SLAB_HWCACHE_ALIGN | \
75209 SLAB_CACHE_DMA | \
75210 SLAB_RECLAIM_ACCOUNT | SLAB_PANIC | \
75211 SLAB_DESTROY_BY_RCU | SLAB_MEM_SPREAD | \
75212 @@ -322,7 +322,7 @@ struct kmem_list3 {
75213 * Need this for bootstrapping a per node allocator.
75214 */
75215 #define NUM_INIT_LISTS (3 * MAX_NUMNODES)
75216 -static struct kmem_list3 __initdata initkmem_list3[NUM_INIT_LISTS];
75217 +static struct kmem_list3 initkmem_list3[NUM_INIT_LISTS];
75218 #define CACHE_CACHE 0
75219 #define SIZE_AC MAX_NUMNODES
75220 #define SIZE_L3 (2 * MAX_NUMNODES)
75221 @@ -423,10 +423,10 @@ static void kmem_list3_init(struct kmem_list3 *parent)
75222 if ((x)->max_freeable < i) \
75223 (x)->max_freeable = i; \
75224 } while (0)
75225 -#define STATS_INC_ALLOCHIT(x) atomic_inc(&(x)->allochit)
75226 -#define STATS_INC_ALLOCMISS(x) atomic_inc(&(x)->allocmiss)
75227 -#define STATS_INC_FREEHIT(x) atomic_inc(&(x)->freehit)
75228 -#define STATS_INC_FREEMISS(x) atomic_inc(&(x)->freemiss)
75229 +#define STATS_INC_ALLOCHIT(x) atomic_inc_unchecked(&(x)->allochit)
75230 +#define STATS_INC_ALLOCMISS(x) atomic_inc_unchecked(&(x)->allocmiss)
75231 +#define STATS_INC_FREEHIT(x) atomic_inc_unchecked(&(x)->freehit)
75232 +#define STATS_INC_FREEMISS(x) atomic_inc_unchecked(&(x)->freemiss)
75233 #else
75234 #define STATS_INC_ACTIVE(x) do { } while (0)
75235 #define STATS_DEC_ACTIVE(x) do { } while (0)
75236 @@ -549,7 +549,7 @@ static inline void *index_to_obj(struct kmem_cache *cache, struct slab *slab,
75237 * reciprocal_divide(offset, cache->reciprocal_buffer_size)
75238 */
75239 static inline unsigned int obj_to_index(const struct kmem_cache *cache,
75240 - const struct slab *slab, void *obj)
75241 + const struct slab *slab, const void *obj)
75242 {
75243 u32 offset = (obj - slab->s_mem);
75244 return reciprocal_divide(offset, cache->reciprocal_buffer_size);
75245 @@ -570,12 +570,13 @@ EXPORT_SYMBOL(malloc_sizes);
75246 struct cache_names {
75247 char *name;
75248 char *name_dma;
75249 + char *name_usercopy;
75250 };
75251
75252 static struct cache_names __initdata cache_names[] = {
75253 -#define CACHE(x) { .name = "size-" #x, .name_dma = "size-" #x "(DMA)" },
75254 +#define CACHE(x) { .name = "size-" #x, .name_dma = "size-" #x "(DMA)", .name_usercopy = "size-" #x "(USERCOPY)" },
75255 #include <linux/kmalloc_sizes.h>
75256 - {NULL,}
75257 + {NULL}
75258 #undef CACHE
75259 };
75260
75261 @@ -736,6 +737,12 @@ static inline struct kmem_cache *__find_general_cachep(size_t size,
75262 if (unlikely(gfpflags & GFP_DMA))
75263 return csizep->cs_dmacachep;
75264 #endif
75265 +
75266 +#ifdef CONFIG_PAX_USERCOPY_SLABS
75267 + if (unlikely(gfpflags & GFP_USERCOPY))
75268 + return csizep->cs_usercopycachep;
75269 +#endif
75270 +
75271 return csizep->cs_cachep;
75272 }
75273
75274 @@ -1684,7 +1691,7 @@ void __init kmem_cache_init(void)
75275 sizes[INDEX_AC].cs_cachep = __kmem_cache_create(names[INDEX_AC].name,
75276 sizes[INDEX_AC].cs_size,
75277 ARCH_KMALLOC_MINALIGN,
75278 - ARCH_KMALLOC_FLAGS|SLAB_PANIC,
75279 + ARCH_KMALLOC_FLAGS|SLAB_PANIC|SLAB_USERCOPY,
75280 NULL);
75281
75282 if (INDEX_AC != INDEX_L3) {
75283 @@ -1692,7 +1699,7 @@ void __init kmem_cache_init(void)
75284 __kmem_cache_create(names[INDEX_L3].name,
75285 sizes[INDEX_L3].cs_size,
75286 ARCH_KMALLOC_MINALIGN,
75287 - ARCH_KMALLOC_FLAGS|SLAB_PANIC,
75288 + ARCH_KMALLOC_FLAGS|SLAB_PANIC|SLAB_USERCOPY,
75289 NULL);
75290 }
75291
75292 @@ -1710,7 +1717,7 @@ void __init kmem_cache_init(void)
75293 sizes->cs_cachep = __kmem_cache_create(names->name,
75294 sizes->cs_size,
75295 ARCH_KMALLOC_MINALIGN,
75296 - ARCH_KMALLOC_FLAGS|SLAB_PANIC,
75297 + ARCH_KMALLOC_FLAGS|SLAB_PANIC|SLAB_USERCOPY,
75298 NULL);
75299 }
75300 #ifdef CONFIG_ZONE_DMA
75301 @@ -1722,6 +1729,16 @@ void __init kmem_cache_init(void)
75302 SLAB_PANIC,
75303 NULL);
75304 #endif
75305 +
75306 +#ifdef CONFIG_PAX_USERCOPY_SLABS
75307 + sizes->cs_usercopycachep = kmem_cache_create(
75308 + names->name_usercopy,
75309 + sizes->cs_size,
75310 + ARCH_KMALLOC_MINALIGN,
75311 + ARCH_KMALLOC_FLAGS|SLAB_PANIC|SLAB_USERCOPY,
75312 + NULL);
75313 +#endif
75314 +
75315 sizes++;
75316 names++;
75317 }
75318 @@ -4467,10 +4484,10 @@ static int s_show(struct seq_file *m, void *p)
75319 }
75320 /* cpu stats */
75321 {
75322 - unsigned long allochit = atomic_read(&cachep->allochit);
75323 - unsigned long allocmiss = atomic_read(&cachep->allocmiss);
75324 - unsigned long freehit = atomic_read(&cachep->freehit);
75325 - unsigned long freemiss = atomic_read(&cachep->freemiss);
75326 + unsigned long allochit = atomic_read_unchecked(&cachep->allochit);
75327 + unsigned long allocmiss = atomic_read_unchecked(&cachep->allocmiss);
75328 + unsigned long freehit = atomic_read_unchecked(&cachep->freehit);
75329 + unsigned long freemiss = atomic_read_unchecked(&cachep->freemiss);
75330
75331 seq_printf(m, " : cpustat %6lu %6lu %6lu %6lu",
75332 allochit, allocmiss, freehit, freemiss);
75333 @@ -4729,13 +4746,71 @@ static int __init slab_proc_init(void)
75334 {
75335 proc_create("slabinfo",S_IWUSR|S_IRUSR,NULL,&proc_slabinfo_operations);
75336 #ifdef CONFIG_DEBUG_SLAB_LEAK
75337 - proc_create("slab_allocators", 0, NULL, &proc_slabstats_operations);
75338 + proc_create("slab_allocators", S_IRUSR, NULL, &proc_slabstats_operations);
75339 #endif
75340 return 0;
75341 }
75342 module_init(slab_proc_init);
75343 #endif
75344
75345 +bool is_usercopy_object(const void *ptr)
75346 +{
75347 + struct page *page;
75348 + struct kmem_cache *cachep;
75349 +
75350 + if (ZERO_OR_NULL_PTR(ptr))
75351 + return false;
75352 +
75353 + if (!slab_is_available())
75354 + return false;
75355 +
75356 + if (!virt_addr_valid(ptr))
75357 + return false;
75358 +
75359 + page = virt_to_head_page(ptr);
75360 +
75361 + if (!PageSlab(page))
75362 + return false;
75363 +
75364 + cachep = page_get_cache(page);
75365 + return cachep->flags & SLAB_USERCOPY;
75366 +}
75367 +
75368 +#ifdef CONFIG_PAX_USERCOPY
75369 +const char *check_heap_object(const void *ptr, unsigned long n, bool to)
75370 +{
75371 + struct page *page;
75372 + struct kmem_cache *cachep;
75373 + struct slab *slabp;
75374 + unsigned int objnr;
75375 + unsigned long offset;
75376 +
75377 + if (ZERO_OR_NULL_PTR(ptr))
75378 + return "<null>";
75379 +
75380 + if (!virt_addr_valid(ptr))
75381 + return NULL;
75382 +
75383 + page = virt_to_head_page(ptr);
75384 +
75385 + if (!PageSlab(page))
75386 + return NULL;
75387 +
75388 + cachep = page_get_cache(page);
75389 + if (!(cachep->flags & SLAB_USERCOPY))
75390 + return cachep->name;
75391 +
75392 + slabp = page->slab_page;
75393 + objnr = obj_to_index(cachep, slabp, ptr);
75394 + BUG_ON(objnr >= cachep->num);
75395 + offset = ptr - index_to_obj(cachep, slabp, objnr) - obj_offset(cachep);
75396 + if (offset <= cachep->object_size && n <= cachep->object_size - offset)
75397 + return NULL;
75398 +
75399 + return cachep->name;
75400 +}
75401 +#endif
75402 +
75403 /**
75404 * ksize - get the actual amount of memory allocated for a given object
75405 * @objp: Pointer to the object
75406 diff --git a/mm/slob.c b/mm/slob.c
75407 index 45d4ca7..88943c1 100644
75408 --- a/mm/slob.c
75409 +++ b/mm/slob.c
75410 @@ -159,7 +159,7 @@ static void set_slob(slob_t *s, slobidx_t size, slob_t *next)
75411 /*
75412 * Return the size of a slob block.
75413 */
75414 -static slobidx_t slob_units(slob_t *s)
75415 +static slobidx_t slob_units(const slob_t *s)
75416 {
75417 if (s->units > 0)
75418 return s->units;
75419 @@ -169,7 +169,7 @@ static slobidx_t slob_units(slob_t *s)
75420 /*
75421 * Return the next free slob block pointer after this one.
75422 */
75423 -static slob_t *slob_next(slob_t *s)
75424 +static slob_t *slob_next(const slob_t *s)
75425 {
75426 slob_t *base = (slob_t *)((unsigned long)s & PAGE_MASK);
75427 slobidx_t next;
75428 @@ -184,14 +184,14 @@ static slob_t *slob_next(slob_t *s)
75429 /*
75430 * Returns true if s is the last free block in its page.
75431 */
75432 -static int slob_last(slob_t *s)
75433 +static int slob_last(const slob_t *s)
75434 {
75435 return !((unsigned long)slob_next(s) & ~PAGE_MASK);
75436 }
75437
75438 -static void *slob_new_pages(gfp_t gfp, int order, int node)
75439 +static struct page *slob_new_pages(gfp_t gfp, unsigned int order, int node)
75440 {
75441 - void *page;
75442 + struct page *page;
75443
75444 #ifdef CONFIG_NUMA
75445 if (node != -1)
75446 @@ -203,14 +203,18 @@ static void *slob_new_pages(gfp_t gfp, int order, int node)
75447 if (!page)
75448 return NULL;
75449
75450 - return page_address(page);
75451 + __SetPageSlab(page);
75452 + return page;
75453 }
75454
75455 -static void slob_free_pages(void *b, int order)
75456 +static void slob_free_pages(struct page *sp, int order)
75457 {
75458 if (current->reclaim_state)
75459 current->reclaim_state->reclaimed_slab += 1 << order;
75460 - free_pages((unsigned long)b, order);
75461 + __ClearPageSlab(sp);
75462 + reset_page_mapcount(sp);
75463 + sp->private = 0;
75464 + __free_pages(sp, order);
75465 }
75466
75467 /*
75468 @@ -315,15 +319,15 @@ static void *slob_alloc(size_t size, gfp_t gfp, int align, int node)
75469
75470 /* Not enough space: must allocate a new page */
75471 if (!b) {
75472 - b = slob_new_pages(gfp & ~__GFP_ZERO, 0, node);
75473 - if (!b)
75474 + sp = slob_new_pages(gfp & ~__GFP_ZERO, 0, node);
75475 + if (!sp)
75476 return NULL;
75477 - sp = virt_to_page(b);
75478 - __SetPageSlab(sp);
75479 + b = page_address(sp);
75480
75481 spin_lock_irqsave(&slob_lock, flags);
75482 sp->units = SLOB_UNITS(PAGE_SIZE);
75483 sp->freelist = b;
75484 + sp->private = 0;
75485 INIT_LIST_HEAD(&sp->list);
75486 set_slob(b, SLOB_UNITS(PAGE_SIZE), b + SLOB_UNITS(PAGE_SIZE));
75487 set_slob_page_free(sp, slob_list);
75488 @@ -361,9 +365,7 @@ static void slob_free(void *block, int size)
75489 if (slob_page_free(sp))
75490 clear_slob_page_free(sp);
75491 spin_unlock_irqrestore(&slob_lock, flags);
75492 - __ClearPageSlab(sp);
75493 - reset_page_mapcount(sp);
75494 - slob_free_pages(b, 0);
75495 + slob_free_pages(sp, 0);
75496 return;
75497 }
75498
75499 @@ -425,11 +427,10 @@ out:
75500 * End of slob allocator proper. Begin kmem_cache_alloc and kmalloc frontend.
75501 */
75502
75503 -void *__kmalloc_node(size_t size, gfp_t gfp, int node)
75504 +static void *__kmalloc_node_align(size_t size, gfp_t gfp, int node, int align)
75505 {
75506 - unsigned int *m;
75507 - int align = max(ARCH_KMALLOC_MINALIGN, ARCH_SLAB_MINALIGN);
75508 - void *ret;
75509 + slob_t *m;
75510 + void *ret = NULL;
75511
75512 gfp &= gfp_allowed_mask;
75513
75514 @@ -443,20 +444,23 @@ void *__kmalloc_node(size_t size, gfp_t gfp, int node)
75515
75516 if (!m)
75517 return NULL;
75518 - *m = size;
75519 + BUILD_BUG_ON(ARCH_KMALLOC_MINALIGN < 2 * SLOB_UNIT);
75520 + BUILD_BUG_ON(ARCH_SLAB_MINALIGN < 2 * SLOB_UNIT);
75521 + m[0].units = size;
75522 + m[1].units = align;
75523 ret = (void *)m + align;
75524
75525 trace_kmalloc_node(_RET_IP_, ret,
75526 size, size + align, gfp, node);
75527 } else {
75528 unsigned int order = get_order(size);
75529 + struct page *page;
75530
75531 if (likely(order))
75532 gfp |= __GFP_COMP;
75533 - ret = slob_new_pages(gfp, order, node);
75534 - if (ret) {
75535 - struct page *page;
75536 - page = virt_to_page(ret);
75537 + page = slob_new_pages(gfp, order, node);
75538 + if (page) {
75539 + ret = page_address(page);
75540 page->private = size;
75541 }
75542
75543 @@ -464,7 +468,16 @@ void *__kmalloc_node(size_t size, gfp_t gfp, int node)
75544 size, PAGE_SIZE << order, gfp, node);
75545 }
75546
75547 - kmemleak_alloc(ret, size, 1, gfp);
75548 + return ret;
75549 +}
75550 +
75551 +void *__kmalloc_node(size_t size, gfp_t gfp, int node)
75552 +{
75553 + int align = max(ARCH_KMALLOC_MINALIGN, ARCH_SLAB_MINALIGN);
75554 + void *ret = __kmalloc_node_align(size, gfp, node, align);
75555 +
75556 + if (!ZERO_OR_NULL_PTR(ret))
75557 + kmemleak_alloc(ret, size, 1, gfp);
75558 return ret;
75559 }
75560 EXPORT_SYMBOL(__kmalloc_node);
75561 @@ -480,15 +493,91 @@ void kfree(const void *block)
75562 kmemleak_free(block);
75563
75564 sp = virt_to_page(block);
75565 - if (PageSlab(sp)) {
75566 + VM_BUG_ON(!PageSlab(sp));
75567 + if (!sp->private) {
75568 int align = max(ARCH_KMALLOC_MINALIGN, ARCH_SLAB_MINALIGN);
75569 - unsigned int *m = (unsigned int *)(block - align);
75570 - slob_free(m, *m + align);
75571 - } else
75572 + slob_t *m = (slob_t *)(block - align);
75573 + slob_free(m, m[0].units + align);
75574 + } else {
75575 + __ClearPageSlab(sp);
75576 + reset_page_mapcount(sp);
75577 + sp->private = 0;
75578 put_page(sp);
75579 + }
75580 }
75581 EXPORT_SYMBOL(kfree);
75582
75583 +bool is_usercopy_object(const void *ptr)
75584 +{
75585 + if (!slab_is_available())
75586 + return false;
75587 +
75588 + // PAX: TODO
75589 +
75590 + return false;
75591 +}
75592 +
75593 +#ifdef CONFIG_PAX_USERCOPY
75594 +const char *check_heap_object(const void *ptr, unsigned long n, bool to)
75595 +{
75596 + struct page *page;
75597 + const slob_t *free;
75598 + const void *base;
75599 + unsigned long flags;
75600 +
75601 + if (ZERO_OR_NULL_PTR(ptr))
75602 + return "<null>";
75603 +
75604 + if (!virt_addr_valid(ptr))
75605 + return NULL;
75606 +
75607 + page = virt_to_head_page(ptr);
75608 + if (!PageSlab(page))
75609 + return NULL;
75610 +
75611 + if (page->private) {
75612 + base = page;
75613 + if (base <= ptr && n <= page->private - (ptr - base))
75614 + return NULL;
75615 + return "<slob>";
75616 + }
75617 +
75618 + /* some tricky double walking to find the chunk */
75619 + spin_lock_irqsave(&slob_lock, flags);
75620 + base = (void *)((unsigned long)ptr & PAGE_MASK);
75621 + free = page->freelist;
75622 +
75623 + while (!slob_last(free) && (void *)free <= ptr) {
75624 + base = free + slob_units(free);
75625 + free = slob_next(free);
75626 + }
75627 +
75628 + while (base < (void *)free) {
75629 + slobidx_t m = ((slob_t *)base)[0].units, align = ((slob_t *)base)[1].units;
75630 + int size = SLOB_UNIT * SLOB_UNITS(m + align);
75631 + int offset;
75632 +
75633 + if (ptr < base + align)
75634 + break;
75635 +
75636 + offset = ptr - base - align;
75637 + if (offset >= m) {
75638 + base += size;
75639 + continue;
75640 + }
75641 +
75642 + if (n > m - offset)
75643 + break;
75644 +
75645 + spin_unlock_irqrestore(&slob_lock, flags);
75646 + return NULL;
75647 + }
75648 +
75649 + spin_unlock_irqrestore(&slob_lock, flags);
75650 + return "<slob>";
75651 +}
75652 +#endif
75653 +
75654 /* can't use ksize for kmem_cache_alloc memory, only kmalloc */
75655 size_t ksize(const void *block)
75656 {
75657 @@ -499,10 +588,11 @@ size_t ksize(const void *block)
75658 return 0;
75659
75660 sp = virt_to_page(block);
75661 - if (PageSlab(sp)) {
75662 + VM_BUG_ON(!PageSlab(sp));
75663 + if (!sp->private) {
75664 int align = max(ARCH_KMALLOC_MINALIGN, ARCH_SLAB_MINALIGN);
75665 - unsigned int *m = (unsigned int *)(block - align);
75666 - return SLOB_UNITS(*m) * SLOB_UNIT;
75667 + slob_t *m = (slob_t *)(block - align);
75668 + return SLOB_UNITS(m[0].units) * SLOB_UNIT;
75669 } else
75670 return sp->private;
75671 }
75672 @@ -513,8 +603,13 @@ struct kmem_cache *__kmem_cache_create(const char *name, size_t size,
75673 {
75674 struct kmem_cache *c;
75675
75676 +#ifdef CONFIG_PAX_USERCOPY_SLABS
75677 + c = __kmalloc_node_align(sizeof(struct kmem_cache),
75678 + GFP_KERNEL, -1, ARCH_KMALLOC_MINALIGN);
75679 +#else
75680 c = slob_alloc(sizeof(struct kmem_cache),
75681 GFP_KERNEL, ARCH_KMALLOC_MINALIGN, -1);
75682 +#endif
75683
75684 if (c) {
75685 c->name = name;
75686 @@ -549,23 +644,33 @@ EXPORT_SYMBOL(kmem_cache_destroy);
75687
75688 void *kmem_cache_alloc_node(struct kmem_cache *c, gfp_t flags, int node)
75689 {
75690 - void *b;
75691 + void *b = NULL;
75692
75693 flags &= gfp_allowed_mask;
75694
75695 lockdep_trace_alloc(flags);
75696
75697 +#ifdef CONFIG_PAX_USERCOPY_SLABS
75698 + b = __kmalloc_node_align(c->size, flags, node, c->align);
75699 +#else
75700 if (c->size < PAGE_SIZE) {
75701 b = slob_alloc(c->size, flags, c->align, node);
75702 trace_kmem_cache_alloc_node(_RET_IP_, b, c->size,
75703 SLOB_UNITS(c->size) * SLOB_UNIT,
75704 flags, node);
75705 } else {
75706 - b = slob_new_pages(flags, get_order(c->size), node);
75707 + struct page *sp;
75708 +
75709 + sp = slob_new_pages(flags, get_order(c->size), node);
75710 + if (sp) {
75711 + b = page_address(sp);
75712 + sp->private = c->size;
75713 + }
75714 trace_kmem_cache_alloc_node(_RET_IP_, b, c->size,
75715 PAGE_SIZE << get_order(c->size),
75716 flags, node);
75717 }
75718 +#endif
75719
75720 if (c->ctor)
75721 c->ctor(b);
75722 @@ -577,10 +682,14 @@ EXPORT_SYMBOL(kmem_cache_alloc_node);
75723
75724 static void __kmem_cache_free(void *b, int size)
75725 {
75726 - if (size < PAGE_SIZE)
75727 + struct page *sp;
75728 +
75729 + sp = virt_to_page(b);
75730 + BUG_ON(!PageSlab(sp));
75731 + if (!sp->private)
75732 slob_free(b, size);
75733 else
75734 - slob_free_pages(b, get_order(size));
75735 + slob_free_pages(sp, get_order(size));
75736 }
75737
75738 static void kmem_rcu_free(struct rcu_head *head)
75739 @@ -593,17 +702,31 @@ static void kmem_rcu_free(struct rcu_head *head)
75740
75741 void kmem_cache_free(struct kmem_cache *c, void *b)
75742 {
75743 + int size = c->size;
75744 +
75745 +#ifdef CONFIG_PAX_USERCOPY_SLABS
75746 + if (size + c->align < PAGE_SIZE) {
75747 + size += c->align;
75748 + b -= c->align;
75749 + }
75750 +#endif
75751 +
75752 kmemleak_free_recursive(b, c->flags);
75753 if (unlikely(c->flags & SLAB_DESTROY_BY_RCU)) {
75754 struct slob_rcu *slob_rcu;
75755 - slob_rcu = b + (c->size - sizeof(struct slob_rcu));
75756 - slob_rcu->size = c->size;
75757 + slob_rcu = b + (size - sizeof(struct slob_rcu));
75758 + slob_rcu->size = size;
75759 call_rcu(&slob_rcu->head, kmem_rcu_free);
75760 } else {
75761 - __kmem_cache_free(b, c->size);
75762 + __kmem_cache_free(b, size);
75763 }
75764
75765 +#ifdef CONFIG_PAX_USERCOPY_SLABS
75766 + trace_kfree(_RET_IP_, b);
75767 +#else
75768 trace_kmem_cache_free(_RET_IP_, b);
75769 +#endif
75770 +
75771 }
75772 EXPORT_SYMBOL(kmem_cache_free);
75773
75774 diff --git a/mm/slub.c b/mm/slub.c
75775 index 2fdd96f..1e2f893 100644
75776 --- a/mm/slub.c
75777 +++ b/mm/slub.c
75778 @@ -201,7 +201,7 @@ struct track {
75779
75780 enum track_item { TRACK_ALLOC, TRACK_FREE };
75781
75782 -#ifdef CONFIG_SYSFS
75783 +#if defined(CONFIG_SYSFS) && !defined(CONFIG_GRKERNSEC_PROC_ADD)
75784 static int sysfs_slab_add(struct kmem_cache *);
75785 static int sysfs_slab_alias(struct kmem_cache *, const char *);
75786 static void sysfs_slab_remove(struct kmem_cache *);
75787 @@ -525,7 +525,7 @@ static void print_track(const char *s, struct track *t)
75788 if (!t->addr)
75789 return;
75790
75791 - printk(KERN_ERR "INFO: %s in %pS age=%lu cpu=%u pid=%d\n",
75792 + printk(KERN_ERR "INFO: %s in %pA age=%lu cpu=%u pid=%d\n",
75793 s, (void *)t->addr, jiffies - t->when, t->cpu, t->pid);
75794 #ifdef CONFIG_STACKTRACE
75795 {
75796 @@ -2612,6 +2612,8 @@ void kmem_cache_free(struct kmem_cache *s, void *x)
75797
75798 page = virt_to_head_page(x);
75799
75800 + BUG_ON(!PageSlab(page));
75801 +
75802 slab_free(s, page, x, _RET_IP_);
75803
75804 trace_kmem_cache_free(_RET_IP_, x);
75805 @@ -2645,7 +2647,7 @@ static int slub_min_objects;
75806 * Merge control. If this is set then no merging of slab caches will occur.
75807 * (Could be removed. This was introduced to pacify the merge skeptics.)
75808 */
75809 -static int slub_nomerge;
75810 +static int slub_nomerge = 1;
75811
75812 /*
75813 * Calculate the order of allocation given an slab object size.
75814 @@ -3098,7 +3100,7 @@ static int kmem_cache_open(struct kmem_cache *s,
75815 else
75816 s->cpu_partial = 30;
75817
75818 - s->refcount = 1;
75819 + atomic_set(&s->refcount, 1);
75820 #ifdef CONFIG_NUMA
75821 s->remote_node_defrag_ratio = 1000;
75822 #endif
75823 @@ -3202,8 +3204,7 @@ static inline int kmem_cache_close(struct kmem_cache *s)
75824 void kmem_cache_destroy(struct kmem_cache *s)
75825 {
75826 mutex_lock(&slab_mutex);
75827 - s->refcount--;
75828 - if (!s->refcount) {
75829 + if (atomic_dec_and_test(&s->refcount)) {
75830 list_del(&s->list);
75831 mutex_unlock(&slab_mutex);
75832 if (kmem_cache_close(s)) {
75833 @@ -3232,6 +3233,10 @@ static struct kmem_cache *kmem_cache;
75834 static struct kmem_cache *kmalloc_dma_caches[SLUB_PAGE_SHIFT];
75835 #endif
75836
75837 +#ifdef CONFIG_PAX_USERCOPY_SLABS
75838 +static struct kmem_cache *kmalloc_usercopy_caches[SLUB_PAGE_SHIFT];
75839 +#endif
75840 +
75841 static int __init setup_slub_min_order(char *str)
75842 {
75843 get_option(&str, &slub_min_order);
75844 @@ -3346,6 +3351,13 @@ static struct kmem_cache *get_slab(size_t size, gfp_t flags)
75845 return kmalloc_dma_caches[index];
75846
75847 #endif
75848 +
75849 +#ifdef CONFIG_PAX_USERCOPY_SLABS
75850 + if (flags & SLAB_USERCOPY)
75851 + return kmalloc_usercopy_caches[index];
75852 +
75853 +#endif
75854 +
75855 return kmalloc_caches[index];
75856 }
75857
75858 @@ -3414,6 +3426,59 @@ void *__kmalloc_node(size_t size, gfp_t flags, int node)
75859 EXPORT_SYMBOL(__kmalloc_node);
75860 #endif
75861
75862 +bool is_usercopy_object(const void *ptr)
75863 +{
75864 + struct page *page;
75865 + struct kmem_cache *s;
75866 +
75867 + if (ZERO_OR_NULL_PTR(ptr))
75868 + return false;
75869 +
75870 + if (!slab_is_available())
75871 + return false;
75872 +
75873 + if (!virt_addr_valid(ptr))
75874 + return false;
75875 +
75876 + page = virt_to_head_page(ptr);
75877 +
75878 + if (!PageSlab(page))
75879 + return false;
75880 +
75881 + s = page->slab;
75882 + return s->flags & SLAB_USERCOPY;
75883 +}
75884 +
75885 +#ifdef CONFIG_PAX_USERCOPY
75886 +const char *check_heap_object(const void *ptr, unsigned long n, bool to)
75887 +{
75888 + struct page *page;
75889 + struct kmem_cache *s;
75890 + unsigned long offset;
75891 +
75892 + if (ZERO_OR_NULL_PTR(ptr))
75893 + return "<null>";
75894 +
75895 + if (!virt_addr_valid(ptr))
75896 + return NULL;
75897 +
75898 + page = virt_to_head_page(ptr);
75899 +
75900 + if (!PageSlab(page))
75901 + return NULL;
75902 +
75903 + s = page->slab;
75904 + if (!(s->flags & SLAB_USERCOPY))
75905 + return s->name;
75906 +
75907 + offset = (ptr - page_address(page)) % s->size;
75908 + if (offset <= s->object_size && n <= s->object_size - offset)
75909 + return NULL;
75910 +
75911 + return s->name;
75912 +}
75913 +#endif
75914 +
75915 size_t ksize(const void *object)
75916 {
75917 struct page *page;
75918 @@ -3688,7 +3753,7 @@ static void __init kmem_cache_bootstrap_fixup(struct kmem_cache *s)
75919 int node;
75920
75921 list_add(&s->list, &slab_caches);
75922 - s->refcount = -1;
75923 + atomic_set(&s->refcount, -1);
75924
75925 for_each_node_state(node, N_NORMAL_MEMORY) {
75926 struct kmem_cache_node *n = get_node(s, node);
75927 @@ -3808,17 +3873,17 @@ void __init kmem_cache_init(void)
75928
75929 /* Caches that are not of the two-to-the-power-of size */
75930 if (KMALLOC_MIN_SIZE <= 32) {
75931 - kmalloc_caches[1] = create_kmalloc_cache("kmalloc-96", 96, 0);
75932 + kmalloc_caches[1] = create_kmalloc_cache("kmalloc-96", 96, SLAB_USERCOPY);
75933 caches++;
75934 }
75935
75936 if (KMALLOC_MIN_SIZE <= 64) {
75937 - kmalloc_caches[2] = create_kmalloc_cache("kmalloc-192", 192, 0);
75938 + kmalloc_caches[2] = create_kmalloc_cache("kmalloc-192", 192, SLAB_USERCOPY);
75939 caches++;
75940 }
75941
75942 for (i = KMALLOC_SHIFT_LOW; i < SLUB_PAGE_SHIFT; i++) {
75943 - kmalloc_caches[i] = create_kmalloc_cache("kmalloc", 1 << i, 0);
75944 + kmalloc_caches[i] = create_kmalloc_cache("kmalloc", 1 << i, SLAB_USERCOPY);
75945 caches++;
75946 }
75947
75948 @@ -3860,6 +3925,22 @@ void __init kmem_cache_init(void)
75949 }
75950 }
75951 #endif
75952 +
75953 +#ifdef CONFIG_PAX_USERCOPY_SLABS
75954 + for (i = 0; i < SLUB_PAGE_SHIFT; i++) {
75955 + struct kmem_cache *s = kmalloc_caches[i];
75956 +
75957 + if (s && s->size) {
75958 + char *name = kasprintf(GFP_NOWAIT,
75959 + "usercopy-kmalloc-%d", s->object_size);
75960 +
75961 + BUG_ON(!name);
75962 + kmalloc_usercopy_caches[i] = create_kmalloc_cache(name,
75963 + s->object_size, SLAB_USERCOPY);
75964 + }
75965 + }
75966 +#endif
75967 +
75968 printk(KERN_INFO
75969 "SLUB: Genslabs=%d, HWalign=%d, Order=%d-%d, MinObjects=%d,"
75970 " CPUs=%d, Nodes=%d\n",
75971 @@ -3886,7 +3967,7 @@ static int slab_unmergeable(struct kmem_cache *s)
75972 /*
75973 * We may have set a slab to be unmergeable during bootstrap.
75974 */
75975 - if (s->refcount < 0)
75976 + if (atomic_read(&s->refcount) < 0)
75977 return 1;
75978
75979 return 0;
75980 @@ -3941,7 +4022,7 @@ struct kmem_cache *__kmem_cache_create(const char *name, size_t size,
75981
75982 s = find_mergeable(size, align, flags, name, ctor);
75983 if (s) {
75984 - s->refcount++;
75985 + atomic_inc(&s->refcount);
75986 /*
75987 * Adjust the object sizes so that we clear
75988 * the complete object on kzalloc.
75989 @@ -3950,7 +4031,7 @@ struct kmem_cache *__kmem_cache_create(const char *name, size_t size,
75990 s->inuse = max_t(int, s->inuse, ALIGN(size, sizeof(void *)));
75991
75992 if (sysfs_slab_alias(s, name)) {
75993 - s->refcount--;
75994 + atomic_dec(&s->refcount);
75995 return NULL;
75996 }
75997 return s;
75998 @@ -4072,7 +4153,7 @@ void *__kmalloc_node_track_caller(size_t size, gfp_t gfpflags,
75999 }
76000 #endif
76001
76002 -#ifdef CONFIG_SYSFS
76003 +#if defined(CONFIG_SYSFS) && !defined(CONFIG_GRKERNSEC_PROC_ADD)
76004 static int count_inuse(struct page *page)
76005 {
76006 return page->inuse;
76007 @@ -4459,12 +4540,12 @@ static void resiliency_test(void)
76008 validate_slab_cache(kmalloc_caches[9]);
76009 }
76010 #else
76011 -#ifdef CONFIG_SYSFS
76012 +#if defined(CONFIG_SYSFS) && !defined(CONFIG_GRKERNSEC_PROC_ADD)
76013 static void resiliency_test(void) {};
76014 #endif
76015 #endif
76016
76017 -#ifdef CONFIG_SYSFS
76018 +#if defined(CONFIG_SYSFS) && !defined(CONFIG_GRKERNSEC_PROC_ADD)
76019 enum slab_stat_type {
76020 SL_ALL, /* All slabs */
76021 SL_PARTIAL, /* Only partially allocated slabs */
76022 @@ -4708,7 +4789,7 @@ SLAB_ATTR_RO(ctor);
76023
76024 static ssize_t aliases_show(struct kmem_cache *s, char *buf)
76025 {
76026 - return sprintf(buf, "%d\n", s->refcount - 1);
76027 + return sprintf(buf, "%d\n", atomic_read(&s->refcount) - 1);
76028 }
76029 SLAB_ATTR_RO(aliases);
76030
76031 @@ -5279,6 +5360,7 @@ static char *create_unique_id(struct kmem_cache *s)
76032 return name;
76033 }
76034
76035 +#if defined(CONFIG_SYSFS) && !defined(CONFIG_GRKERNSEC_PROC_ADD)
76036 static int sysfs_slab_add(struct kmem_cache *s)
76037 {
76038 int err;
76039 @@ -5341,6 +5423,7 @@ static void sysfs_slab_remove(struct kmem_cache *s)
76040 kobject_del(&s->kobj);
76041 kobject_put(&s->kobj);
76042 }
76043 +#endif
76044
76045 /*
76046 * Need to buffer aliases during bootup until sysfs becomes
76047 @@ -5354,6 +5437,7 @@ struct saved_alias {
76048
76049 static struct saved_alias *alias_list;
76050
76051 +#if defined(CONFIG_SYSFS) && !defined(CONFIG_GRKERNSEC_PROC_ADD)
76052 static int sysfs_slab_alias(struct kmem_cache *s, const char *name)
76053 {
76054 struct saved_alias *al;
76055 @@ -5376,6 +5460,7 @@ static int sysfs_slab_alias(struct kmem_cache *s, const char *name)
76056 alias_list = al;
76057 return 0;
76058 }
76059 +#endif
76060
76061 static int __init slab_sysfs_init(void)
76062 {
76063 diff --git a/mm/sparse-vmemmap.c b/mm/sparse-vmemmap.c
76064 index 1b7e22a..3fcd4f3 100644
76065 --- a/mm/sparse-vmemmap.c
76066 +++ b/mm/sparse-vmemmap.c
76067 @@ -128,7 +128,7 @@ pud_t * __meminit vmemmap_pud_populate(pgd_t *pgd, unsigned long addr, int node)
76068 void *p = vmemmap_alloc_block(PAGE_SIZE, node);
76069 if (!p)
76070 return NULL;
76071 - pud_populate(&init_mm, pud, p);
76072 + pud_populate_kernel(&init_mm, pud, p);
76073 }
76074 return pud;
76075 }
76076 @@ -140,7 +140,7 @@ pgd_t * __meminit vmemmap_pgd_populate(unsigned long addr, int node)
76077 void *p = vmemmap_alloc_block(PAGE_SIZE, node);
76078 if (!p)
76079 return NULL;
76080 - pgd_populate(&init_mm, pgd, p);
76081 + pgd_populate_kernel(&init_mm, pgd, p);
76082 }
76083 return pgd;
76084 }
76085 diff --git a/mm/swap.c b/mm/swap.c
76086 index 7782588..228c784 100644
76087 --- a/mm/swap.c
76088 +++ b/mm/swap.c
76089 @@ -30,6 +30,7 @@
76090 #include <linux/backing-dev.h>
76091 #include <linux/memcontrol.h>
76092 #include <linux/gfp.h>
76093 +#include <linux/hugetlb.h>
76094
76095 #include "internal.h"
76096
76097 @@ -72,6 +73,8 @@ static void __put_compound_page(struct page *page)
76098
76099 __page_cache_release(page);
76100 dtor = get_compound_page_dtor(page);
76101 + if (!PageHuge(page))
76102 + BUG_ON(dtor != free_compound_page);
76103 (*dtor)(page);
76104 }
76105
76106 diff --git a/mm/swapfile.c b/mm/swapfile.c
76107 index 14e254c..a6af32c 100644
76108 --- a/mm/swapfile.c
76109 +++ b/mm/swapfile.c
76110 @@ -64,7 +64,7 @@ static DEFINE_MUTEX(swapon_mutex);
76111
76112 static DECLARE_WAIT_QUEUE_HEAD(proc_poll_wait);
76113 /* Activity counter to indicate that a swapon or swapoff has occurred */
76114 -static atomic_t proc_poll_event = ATOMIC_INIT(0);
76115 +static atomic_unchecked_t proc_poll_event = ATOMIC_INIT(0);
76116
76117 static inline unsigned char swap_count(unsigned char ent)
76118 {
76119 @@ -1603,7 +1603,7 @@ SYSCALL_DEFINE1(swapoff, const char __user *, specialfile)
76120 }
76121 filp_close(swap_file, NULL);
76122 err = 0;
76123 - atomic_inc(&proc_poll_event);
76124 + atomic_inc_unchecked(&proc_poll_event);
76125 wake_up_interruptible(&proc_poll_wait);
76126
76127 out_dput:
76128 @@ -1619,8 +1619,8 @@ static unsigned swaps_poll(struct file *file, poll_table *wait)
76129
76130 poll_wait(file, &proc_poll_wait, wait);
76131
76132 - if (seq->poll_event != atomic_read(&proc_poll_event)) {
76133 - seq->poll_event = atomic_read(&proc_poll_event);
76134 + if (seq->poll_event != atomic_read_unchecked(&proc_poll_event)) {
76135 + seq->poll_event = atomic_read_unchecked(&proc_poll_event);
76136 return POLLIN | POLLRDNORM | POLLERR | POLLPRI;
76137 }
76138
76139 @@ -1718,7 +1718,7 @@ static int swaps_open(struct inode *inode, struct file *file)
76140 return ret;
76141
76142 seq = file->private_data;
76143 - seq->poll_event = atomic_read(&proc_poll_event);
76144 + seq->poll_event = atomic_read_unchecked(&proc_poll_event);
76145 return 0;
76146 }
76147
76148 @@ -2060,7 +2060,7 @@ SYSCALL_DEFINE2(swapon, const char __user *, specialfile, int, swap_flags)
76149 (frontswap_map) ? "FS" : "");
76150
76151 mutex_unlock(&swapon_mutex);
76152 - atomic_inc(&proc_poll_event);
76153 + atomic_inc_unchecked(&proc_poll_event);
76154 wake_up_interruptible(&proc_poll_wait);
76155
76156 if (S_ISREG(inode->i_mode))
76157 diff --git a/mm/util.c b/mm/util.c
76158 index 8c7265a..c96d884 100644
76159 --- a/mm/util.c
76160 +++ b/mm/util.c
76161 @@ -285,6 +285,12 @@ done:
76162 void arch_pick_mmap_layout(struct mm_struct *mm)
76163 {
76164 mm->mmap_base = TASK_UNMAPPED_BASE;
76165 +
76166 +#ifdef CONFIG_PAX_RANDMMAP
76167 + if (mm->pax_flags & MF_PAX_RANDMMAP)
76168 + mm->mmap_base += mm->delta_mmap;
76169 +#endif
76170 +
76171 mm->get_unmapped_area = arch_get_unmapped_area;
76172 mm->unmap_area = arch_unmap_area;
76173 }
76174 diff --git a/mm/vmalloc.c b/mm/vmalloc.c
76175 index 2bb90b1..3795e47 100644
76176 --- a/mm/vmalloc.c
76177 +++ b/mm/vmalloc.c
76178 @@ -39,8 +39,19 @@ static void vunmap_pte_range(pmd_t *pmd, unsigned long addr, unsigned long end)
76179
76180 pte = pte_offset_kernel(pmd, addr);
76181 do {
76182 - pte_t ptent = ptep_get_and_clear(&init_mm, addr, pte);
76183 - WARN_ON(!pte_none(ptent) && !pte_present(ptent));
76184 +
76185 +#if defined(CONFIG_MODULES) && defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
76186 + if ((unsigned long)MODULES_EXEC_VADDR <= addr && addr < (unsigned long)MODULES_EXEC_END) {
76187 + BUG_ON(!pte_exec(*pte));
76188 + set_pte_at(&init_mm, addr, pte, pfn_pte(__pa(addr) >> PAGE_SHIFT, PAGE_KERNEL_EXEC));
76189 + continue;
76190 + }
76191 +#endif
76192 +
76193 + {
76194 + pte_t ptent = ptep_get_and_clear(&init_mm, addr, pte);
76195 + WARN_ON(!pte_none(ptent) && !pte_present(ptent));
76196 + }
76197 } while (pte++, addr += PAGE_SIZE, addr != end);
76198 }
76199
76200 @@ -100,16 +111,29 @@ static int vmap_pte_range(pmd_t *pmd, unsigned long addr,
76201 pte = pte_alloc_kernel(pmd, addr);
76202 if (!pte)
76203 return -ENOMEM;
76204 +
76205 + pax_open_kernel();
76206 do {
76207 struct page *page = pages[*nr];
76208
76209 - if (WARN_ON(!pte_none(*pte)))
76210 +#if defined(CONFIG_MODULES) && defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
76211 + if (pgprot_val(prot) & _PAGE_NX)
76212 +#endif
76213 +
76214 + if (!pte_none(*pte)) {
76215 + pax_close_kernel();
76216 + WARN_ON(1);
76217 return -EBUSY;
76218 - if (WARN_ON(!page))
76219 + }
76220 + if (!page) {
76221 + pax_close_kernel();
76222 + WARN_ON(1);
76223 return -ENOMEM;
76224 + }
76225 set_pte_at(&init_mm, addr, pte, mk_pte(page, prot));
76226 (*nr)++;
76227 } while (pte++, addr += PAGE_SIZE, addr != end);
76228 + pax_close_kernel();
76229 return 0;
76230 }
76231
76232 @@ -119,7 +143,7 @@ static int vmap_pmd_range(pud_t *pud, unsigned long addr,
76233 pmd_t *pmd;
76234 unsigned long next;
76235
76236 - pmd = pmd_alloc(&init_mm, pud, addr);
76237 + pmd = pmd_alloc_kernel(&init_mm, pud, addr);
76238 if (!pmd)
76239 return -ENOMEM;
76240 do {
76241 @@ -136,7 +160,7 @@ static int vmap_pud_range(pgd_t *pgd, unsigned long addr,
76242 pud_t *pud;
76243 unsigned long next;
76244
76245 - pud = pud_alloc(&init_mm, pgd, addr);
76246 + pud = pud_alloc_kernel(&init_mm, pgd, addr);
76247 if (!pud)
76248 return -ENOMEM;
76249 do {
76250 @@ -191,11 +215,20 @@ int is_vmalloc_or_module_addr(const void *x)
76251 * and fall back on vmalloc() if that fails. Others
76252 * just put it in the vmalloc space.
76253 */
76254 -#if defined(CONFIG_MODULES) && defined(MODULES_VADDR)
76255 +#ifdef CONFIG_MODULES
76256 +#ifdef MODULES_VADDR
76257 unsigned long addr = (unsigned long)x;
76258 if (addr >= MODULES_VADDR && addr < MODULES_END)
76259 return 1;
76260 #endif
76261 +
76262 +#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
76263 + if (x >= (const void *)MODULES_EXEC_VADDR && x < (const void *)MODULES_EXEC_END)
76264 + return 1;
76265 +#endif
76266 +
76267 +#endif
76268 +
76269 return is_vmalloc_addr(x);
76270 }
76271
76272 @@ -216,8 +249,14 @@ struct page *vmalloc_to_page(const void *vmalloc_addr)
76273
76274 if (!pgd_none(*pgd)) {
76275 pud_t *pud = pud_offset(pgd, addr);
76276 +#ifdef CONFIG_X86
76277 + if (!pud_large(*pud))
76278 +#endif
76279 if (!pud_none(*pud)) {
76280 pmd_t *pmd = pmd_offset(pud, addr);
76281 +#ifdef CONFIG_X86
76282 + if (!pmd_large(*pmd))
76283 +#endif
76284 if (!pmd_none(*pmd)) {
76285 pte_t *ptep, pte;
76286
76287 @@ -329,7 +368,7 @@ static void purge_vmap_area_lazy(void);
76288 * Allocate a region of KVA of the specified size and alignment, within the
76289 * vstart and vend.
76290 */
76291 -static struct vmap_area *alloc_vmap_area(unsigned long size,
76292 +static __size_overflow(1) struct vmap_area *alloc_vmap_area(unsigned long size,
76293 unsigned long align,
76294 unsigned long vstart, unsigned long vend,
76295 int node, gfp_t gfp_mask)
76296 @@ -1328,6 +1367,16 @@ static struct vm_struct *__get_vm_area_node(unsigned long size,
76297 struct vm_struct *area;
76298
76299 BUG_ON(in_interrupt());
76300 +
76301 +#if defined(CONFIG_MODULES) && defined(CONFIG_X86) && defined(CONFIG_PAX_KERNEXEC)
76302 + if (flags & VM_KERNEXEC) {
76303 + if (start != VMALLOC_START || end != VMALLOC_END)
76304 + return NULL;
76305 + start = (unsigned long)MODULES_EXEC_VADDR;
76306 + end = (unsigned long)MODULES_EXEC_END;
76307 + }
76308 +#endif
76309 +
76310 if (flags & VM_IOREMAP) {
76311 int bit = fls(size);
76312
76313 @@ -1568,6 +1617,11 @@ void *vmap(struct page **pages, unsigned int count,
76314 if (count > totalram_pages)
76315 return NULL;
76316
76317 +#if defined(CONFIG_MODULES) && defined(CONFIG_X86) && defined(CONFIG_PAX_KERNEXEC)
76318 + if (!(pgprot_val(prot) & _PAGE_NX))
76319 + flags |= VM_KERNEXEC;
76320 +#endif
76321 +
76322 area = get_vm_area_caller((count << PAGE_SHIFT), flags,
76323 __builtin_return_address(0));
76324 if (!area)
76325 @@ -1669,6 +1723,13 @@ void *__vmalloc_node_range(unsigned long size, unsigned long align,
76326 if (!size || (size >> PAGE_SHIFT) > totalram_pages)
76327 goto fail;
76328
76329 +#if defined(CONFIG_MODULES) && defined(CONFIG_X86) && defined(CONFIG_PAX_KERNEXEC)
76330 + if (!(pgprot_val(prot) & _PAGE_NX))
76331 + area = __get_vm_area_node(size, align, VM_ALLOC | VM_UNLIST | VM_KERNEXEC,
76332 + VMALLOC_START, VMALLOC_END, node, gfp_mask, caller);
76333 + else
76334 +#endif
76335 +
76336 area = __get_vm_area_node(size, align, VM_ALLOC | VM_UNLIST,
76337 start, end, node, gfp_mask, caller);
76338 if (!area)
76339 @@ -1842,10 +1903,9 @@ EXPORT_SYMBOL(vzalloc_node);
76340 * For tight control over page level allocator and protection flags
76341 * use __vmalloc() instead.
76342 */
76343 -
76344 void *vmalloc_exec(unsigned long size)
76345 {
76346 - return __vmalloc_node(size, 1, GFP_KERNEL | __GFP_HIGHMEM, PAGE_KERNEL_EXEC,
76347 + return __vmalloc_node(size, 1, GFP_KERNEL | __GFP_HIGHMEM | __GFP_ZERO, PAGE_KERNEL_EXEC,
76348 -1, __builtin_return_address(0));
76349 }
76350
76351 @@ -2136,6 +2196,8 @@ int remap_vmalloc_range(struct vm_area_struct *vma, void *addr,
76352 unsigned long uaddr = vma->vm_start;
76353 unsigned long usize = vma->vm_end - vma->vm_start;
76354
76355 + BUG_ON(vma->vm_mirror);
76356 +
76357 if ((PAGE_SIZE-1) & (unsigned long)addr)
76358 return -EINVAL;
76359
76360 @@ -2572,7 +2634,7 @@ static int s_show(struct seq_file *m, void *p)
76361 {
76362 struct vm_struct *v = p;
76363
76364 - seq_printf(m, "0x%p-0x%p %7ld",
76365 + seq_printf(m, "0x%pK-0x%pK %7ld",
76366 v->addr, v->addr + v->size, v->size);
76367
76368 if (v->caller)
76369 diff --git a/mm/vmstat.c b/mm/vmstat.c
76370 index df7a674..8b4a4f3 100644
76371 --- a/mm/vmstat.c
76372 +++ b/mm/vmstat.c
76373 @@ -78,7 +78,7 @@ void vm_events_fold_cpu(int cpu)
76374 *
76375 * vm_stat contains the global counters
76376 */
76377 -atomic_long_t vm_stat[NR_VM_ZONE_STAT_ITEMS] __cacheline_aligned_in_smp;
76378 +atomic_long_unchecked_t vm_stat[NR_VM_ZONE_STAT_ITEMS] __cacheline_aligned_in_smp;
76379 EXPORT_SYMBOL(vm_stat);
76380
76381 #ifdef CONFIG_SMP
76382 @@ -454,7 +454,7 @@ void refresh_cpu_vm_stats(int cpu)
76383 v = p->vm_stat_diff[i];
76384 p->vm_stat_diff[i] = 0;
76385 local_irq_restore(flags);
76386 - atomic_long_add(v, &zone->vm_stat[i]);
76387 + atomic_long_add_unchecked(v, &zone->vm_stat[i]);
76388 global_diff[i] += v;
76389 #ifdef CONFIG_NUMA
76390 /* 3 seconds idle till flush */
76391 @@ -492,7 +492,7 @@ void refresh_cpu_vm_stats(int cpu)
76392
76393 for (i = 0; i < NR_VM_ZONE_STAT_ITEMS; i++)
76394 if (global_diff[i])
76395 - atomic_long_add(global_diff[i], &vm_stat[i]);
76396 + atomic_long_add_unchecked(global_diff[i], &vm_stat[i]);
76397 }
76398
76399 #endif
76400 @@ -1212,10 +1212,20 @@ static int __init setup_vmstat(void)
76401 start_cpu_timer(cpu);
76402 #endif
76403 #ifdef CONFIG_PROC_FS
76404 - proc_create("buddyinfo", S_IRUGO, NULL, &fragmentation_file_operations);
76405 - proc_create("pagetypeinfo", S_IRUGO, NULL, &pagetypeinfo_file_ops);
76406 - proc_create("vmstat", S_IRUGO, NULL, &proc_vmstat_file_operations);
76407 - proc_create("zoneinfo", S_IRUGO, NULL, &proc_zoneinfo_file_operations);
76408 + {
76409 + mode_t gr_mode = S_IRUGO;
76410 +#ifdef CONFIG_GRKERNSEC_PROC_ADD
76411 + gr_mode = S_IRUSR;
76412 +#endif
76413 + proc_create("buddyinfo", gr_mode, NULL, &fragmentation_file_operations);
76414 + proc_create("pagetypeinfo", gr_mode, NULL, &pagetypeinfo_file_ops);
76415 +#ifdef CONFIG_GRKERNSEC_PROC_USERGROUP
76416 + proc_create("vmstat", gr_mode | S_IRGRP, NULL, &proc_vmstat_file_operations);
76417 +#else
76418 + proc_create("vmstat", gr_mode, NULL, &proc_vmstat_file_operations);
76419 +#endif
76420 + proc_create("zoneinfo", gr_mode, NULL, &proc_zoneinfo_file_operations);
76421 + }
76422 #endif
76423 return 0;
76424 }
76425 diff --git a/net/8021q/vlan.c b/net/8021q/vlan.c
76426 index 9096bcb..43ed7bb 100644
76427 --- a/net/8021q/vlan.c
76428 +++ b/net/8021q/vlan.c
76429 @@ -557,8 +557,7 @@ static int vlan_ioctl_handler(struct net *net, void __user *arg)
76430 err = -EPERM;
76431 if (!capable(CAP_NET_ADMIN))
76432 break;
76433 - if ((args.u.name_type >= 0) &&
76434 - (args.u.name_type < VLAN_NAME_TYPE_HIGHEST)) {
76435 + if (args.u.name_type < VLAN_NAME_TYPE_HIGHEST) {
76436 struct vlan_net *vn;
76437
76438 vn = net_generic(net, vlan_net_id);
76439 diff --git a/net/9p/trans_fd.c b/net/9p/trans_fd.c
76440 index 6449bae..8c1f454 100644
76441 --- a/net/9p/trans_fd.c
76442 +++ b/net/9p/trans_fd.c
76443 @@ -425,7 +425,7 @@ static int p9_fd_write(struct p9_client *client, void *v, int len)
76444 oldfs = get_fs();
76445 set_fs(get_ds());
76446 /* The cast to a user pointer is valid due to the set_fs() */
76447 - ret = vfs_write(ts->wr, (__force void __user *)v, len, &ts->wr->f_pos);
76448 + ret = vfs_write(ts->wr, (void __force_user *)v, len, &ts->wr->f_pos);
76449 set_fs(oldfs);
76450
76451 if (ret <= 0 && ret != -ERESTARTSYS && ret != -EAGAIN)
76452 diff --git a/net/atm/atm_misc.c b/net/atm/atm_misc.c
76453 index 876fbe8..8bbea9f 100644
76454 --- a/net/atm/atm_misc.c
76455 +++ b/net/atm/atm_misc.c
76456 @@ -17,7 +17,7 @@ int atm_charge(struct atm_vcc *vcc, int truesize)
76457 if (atomic_read(&sk_atm(vcc)->sk_rmem_alloc) <= sk_atm(vcc)->sk_rcvbuf)
76458 return 1;
76459 atm_return(vcc, truesize);
76460 - atomic_inc(&vcc->stats->rx_drop);
76461 + atomic_inc_unchecked(&vcc->stats->rx_drop);
76462 return 0;
76463 }
76464 EXPORT_SYMBOL(atm_charge);
76465 @@ -39,7 +39,7 @@ struct sk_buff *atm_alloc_charge(struct atm_vcc *vcc, int pdu_size,
76466 }
76467 }
76468 atm_return(vcc, guess);
76469 - atomic_inc(&vcc->stats->rx_drop);
76470 + atomic_inc_unchecked(&vcc->stats->rx_drop);
76471 return NULL;
76472 }
76473 EXPORT_SYMBOL(atm_alloc_charge);
76474 @@ -86,7 +86,7 @@ EXPORT_SYMBOL(atm_pcr_goal);
76475
76476 void sonet_copy_stats(struct k_sonet_stats *from, struct sonet_stats *to)
76477 {
76478 -#define __HANDLE_ITEM(i) to->i = atomic_read(&from->i)
76479 +#define __HANDLE_ITEM(i) to->i = atomic_read_unchecked(&from->i)
76480 __SONET_ITEMS
76481 #undef __HANDLE_ITEM
76482 }
76483 @@ -94,7 +94,7 @@ EXPORT_SYMBOL(sonet_copy_stats);
76484
76485 void sonet_subtract_stats(struct k_sonet_stats *from, struct sonet_stats *to)
76486 {
76487 -#define __HANDLE_ITEM(i) atomic_sub(to->i, &from->i)
76488 +#define __HANDLE_ITEM(i) atomic_sub_unchecked(to->i,&from->i)
76489 __SONET_ITEMS
76490 #undef __HANDLE_ITEM
76491 }
76492 diff --git a/net/atm/lec.h b/net/atm/lec.h
76493 index a86aff9..3a0d6f6 100644
76494 --- a/net/atm/lec.h
76495 +++ b/net/atm/lec.h
76496 @@ -48,7 +48,7 @@ struct lane2_ops {
76497 const u8 *tlvs, u32 sizeoftlvs);
76498 void (*associate_indicator) (struct net_device *dev, const u8 *mac_addr,
76499 const u8 *tlvs, u32 sizeoftlvs);
76500 -};
76501 +} __no_const;
76502
76503 /*
76504 * ATM LAN Emulation supports both LLC & Dix Ethernet EtherType
76505 diff --git a/net/atm/mpc.h b/net/atm/mpc.h
76506 index 0919a88..a23d54e 100644
76507 --- a/net/atm/mpc.h
76508 +++ b/net/atm/mpc.h
76509 @@ -33,7 +33,7 @@ struct mpoa_client {
76510 struct mpc_parameters parameters; /* parameters for this client */
76511
76512 const struct net_device_ops *old_ops;
76513 - struct net_device_ops new_ops;
76514 + net_device_ops_no_const new_ops;
76515 };
76516
76517
76518 diff --git a/net/atm/proc.c b/net/atm/proc.c
76519 index 0d020de..011c7bb 100644
76520 --- a/net/atm/proc.c
76521 +++ b/net/atm/proc.c
76522 @@ -45,9 +45,9 @@ static void add_stats(struct seq_file *seq, const char *aal,
76523 const struct k_atm_aal_stats *stats)
76524 {
76525 seq_printf(seq, "%s ( %d %d %d %d %d )", aal,
76526 - atomic_read(&stats->tx), atomic_read(&stats->tx_err),
76527 - atomic_read(&stats->rx), atomic_read(&stats->rx_err),
76528 - atomic_read(&stats->rx_drop));
76529 + atomic_read_unchecked(&stats->tx),atomic_read_unchecked(&stats->tx_err),
76530 + atomic_read_unchecked(&stats->rx),atomic_read_unchecked(&stats->rx_err),
76531 + atomic_read_unchecked(&stats->rx_drop));
76532 }
76533
76534 static void atm_dev_info(struct seq_file *seq, const struct atm_dev *dev)
76535 diff --git a/net/atm/resources.c b/net/atm/resources.c
76536 index 23f45ce..c748f1a 100644
76537 --- a/net/atm/resources.c
76538 +++ b/net/atm/resources.c
76539 @@ -160,7 +160,7 @@ EXPORT_SYMBOL(atm_dev_deregister);
76540 static void copy_aal_stats(struct k_atm_aal_stats *from,
76541 struct atm_aal_stats *to)
76542 {
76543 -#define __HANDLE_ITEM(i) to->i = atomic_read(&from->i)
76544 +#define __HANDLE_ITEM(i) to->i = atomic_read_unchecked(&from->i)
76545 __AAL_STAT_ITEMS
76546 #undef __HANDLE_ITEM
76547 }
76548 @@ -168,7 +168,7 @@ static void copy_aal_stats(struct k_atm_aal_stats *from,
76549 static void subtract_aal_stats(struct k_atm_aal_stats *from,
76550 struct atm_aal_stats *to)
76551 {
76552 -#define __HANDLE_ITEM(i) atomic_sub(to->i, &from->i)
76553 +#define __HANDLE_ITEM(i) atomic_sub_unchecked(to->i, &from->i)
76554 __AAL_STAT_ITEMS
76555 #undef __HANDLE_ITEM
76556 }
76557 diff --git a/net/batman-adv/bat_iv_ogm.c b/net/batman-adv/bat_iv_ogm.c
76558 index 469daab..262851c 100644
76559 --- a/net/batman-adv/bat_iv_ogm.c
76560 +++ b/net/batman-adv/bat_iv_ogm.c
76561 @@ -62,7 +62,7 @@ static int batadv_iv_ogm_iface_enable(struct batadv_hard_iface *hard_iface)
76562
76563 /* randomize initial seqno to avoid collision */
76564 get_random_bytes(&random_seqno, sizeof(random_seqno));
76565 - atomic_set(&hard_iface->seqno, random_seqno);
76566 + atomic_set_unchecked(&hard_iface->seqno, random_seqno);
76567
76568 hard_iface->packet_len = BATADV_OGM_HLEN;
76569 hard_iface->packet_buff = kmalloc(hard_iface->packet_len, GFP_ATOMIC);
76570 @@ -600,8 +600,8 @@ static void batadv_iv_ogm_schedule(struct batadv_hard_iface *hard_iface)
76571
76572 /* change sequence number to network order */
76573 batadv_ogm_packet->seqno =
76574 - htonl((uint32_t)atomic_read(&hard_iface->seqno));
76575 - atomic_inc(&hard_iface->seqno);
76576 + htonl((uint32_t)atomic_read_unchecked(&hard_iface->seqno));
76577 + atomic_inc_unchecked(&hard_iface->seqno);
76578
76579 batadv_ogm_packet->ttvn = atomic_read(&bat_priv->ttvn);
76580 batadv_ogm_packet->tt_crc = htons(bat_priv->tt_crc);
76581 @@ -1001,7 +1001,7 @@ static void batadv_iv_ogm_process(const struct ethhdr *ethhdr,
76582 return;
76583
76584 /* could be changed by schedule_own_packet() */
76585 - if_incoming_seqno = atomic_read(&if_incoming->seqno);
76586 + if_incoming_seqno = atomic_read_unchecked(&if_incoming->seqno);
76587
76588 if (batadv_ogm_packet->flags & BATADV_DIRECTLINK)
76589 has_directlink_flag = 1;
76590 diff --git a/net/batman-adv/hard-interface.c b/net/batman-adv/hard-interface.c
76591 index 282bf6e..4b2603d 100644
76592 --- a/net/batman-adv/hard-interface.c
76593 +++ b/net/batman-adv/hard-interface.c
76594 @@ -320,7 +320,7 @@ int batadv_hardif_enable_interface(struct batadv_hard_iface *hard_iface,
76595 hard_iface->batman_adv_ptype.dev = hard_iface->net_dev;
76596 dev_add_pack(&hard_iface->batman_adv_ptype);
76597
76598 - atomic_set(&hard_iface->frag_seqno, 1);
76599 + atomic_set_unchecked(&hard_iface->frag_seqno, 1);
76600 batadv_info(hard_iface->soft_iface, "Adding interface: %s\n",
76601 hard_iface->net_dev->name);
76602
76603 @@ -443,7 +443,7 @@ batadv_hardif_add_interface(struct net_device *net_dev)
76604 /* This can't be called via a bat_priv callback because
76605 * we have no bat_priv yet.
76606 */
76607 - atomic_set(&hard_iface->seqno, 1);
76608 + atomic_set_unchecked(&hard_iface->seqno, 1);
76609 hard_iface->packet_buff = NULL;
76610
76611 return hard_iface;
76612 diff --git a/net/batman-adv/soft-interface.c b/net/batman-adv/soft-interface.c
76613 index 21c5357..768be1a 100644
76614 --- a/net/batman-adv/soft-interface.c
76615 +++ b/net/batman-adv/soft-interface.c
76616 @@ -227,7 +227,7 @@ static int batadv_interface_tx(struct sk_buff *skb,
76617
76618 /* set broadcast sequence number */
76619 bcast_packet->seqno =
76620 - htonl(atomic_inc_return(&bat_priv->bcast_seqno));
76621 + htonl(atomic_inc_return_unchecked(&bat_priv->bcast_seqno));
76622
76623 batadv_add_bcast_packet_to_list(bat_priv, skb, 1);
76624
76625 @@ -407,7 +407,7 @@ struct net_device *batadv_softif_create(const char *name)
76626 atomic_set(&bat_priv->batman_queue_left, BATADV_BATMAN_QUEUE_LEN);
76627
76628 atomic_set(&bat_priv->mesh_state, BATADV_MESH_INACTIVE);
76629 - atomic_set(&bat_priv->bcast_seqno, 1);
76630 + atomic_set_unchecked(&bat_priv->bcast_seqno, 1);
76631 atomic_set(&bat_priv->ttvn, 0);
76632 atomic_set(&bat_priv->tt_local_changes, 0);
76633 atomic_set(&bat_priv->tt_ogm_append_cnt, 0);
76634 diff --git a/net/batman-adv/types.h b/net/batman-adv/types.h
76635 index 12635fd..d99d837 100644
76636 --- a/net/batman-adv/types.h
76637 +++ b/net/batman-adv/types.h
76638 @@ -33,8 +33,8 @@ struct batadv_hard_iface {
76639 int16_t if_num;
76640 char if_status;
76641 struct net_device *net_dev;
76642 - atomic_t seqno;
76643 - atomic_t frag_seqno;
76644 + atomic_unchecked_t seqno;
76645 + atomic_unchecked_t frag_seqno;
76646 unsigned char *packet_buff;
76647 int packet_len;
76648 struct kobject *hardif_obj;
76649 @@ -176,7 +176,7 @@ struct batadv_priv {
76650 atomic_t orig_interval; /* uint */
76651 atomic_t hop_penalty; /* uint */
76652 atomic_t log_level; /* uint */
76653 - atomic_t bcast_seqno;
76654 + atomic_unchecked_t bcast_seqno;
76655 atomic_t bcast_queue_left;
76656 atomic_t batman_queue_left;
76657 atomic_t ttvn; /* translation table version number */
76658 diff --git a/net/batman-adv/unicast.c b/net/batman-adv/unicast.c
76659 index 0016464..0ef3e53 100644
76660 --- a/net/batman-adv/unicast.c
76661 +++ b/net/batman-adv/unicast.c
76662 @@ -269,7 +269,7 @@ int batadv_frag_send_skb(struct sk_buff *skb, struct batadv_priv *bat_priv,
76663 frag1->flags = BATADV_UNI_FRAG_HEAD | large_tail;
76664 frag2->flags = large_tail;
76665
76666 - seqno = atomic_add_return(2, &hard_iface->frag_seqno);
76667 + seqno = atomic_add_return_unchecked(2, &hard_iface->frag_seqno);
76668 frag1->seqno = htons(seqno - 1);
76669 frag2->seqno = htons(seqno);
76670
76671 diff --git a/net/bluetooth/hci_sock.c b/net/bluetooth/hci_sock.c
76672 index d5ace1e..231c4bf 100644
76673 --- a/net/bluetooth/hci_sock.c
76674 +++ b/net/bluetooth/hci_sock.c
76675 @@ -934,7 +934,7 @@ static int hci_sock_setsockopt(struct socket *sock, int level, int optname,
76676 uf.event_mask[1] = *((u32 *) f->event_mask + 1);
76677 }
76678
76679 - len = min_t(unsigned int, len, sizeof(uf));
76680 + len = min((size_t)len, sizeof(uf));
76681 if (copy_from_user(&uf, optval, len)) {
76682 err = -EFAULT;
76683 break;
76684 diff --git a/net/bluetooth/l2cap_core.c b/net/bluetooth/l2cap_core.c
76685 index 38c00f1..e9d566e 100644
76686 --- a/net/bluetooth/l2cap_core.c
76687 +++ b/net/bluetooth/l2cap_core.c
76688 @@ -3165,8 +3165,10 @@ static int l2cap_parse_conf_rsp(struct l2cap_chan *chan, void *rsp, int len, voi
76689 break;
76690
76691 case L2CAP_CONF_RFC:
76692 - if (olen == sizeof(rfc))
76693 - memcpy(&rfc, (void *)val, olen);
76694 + if (olen != sizeof(rfc))
76695 + break;
76696 +
76697 + memcpy(&rfc, (void *)val, olen);
76698
76699 if (test_bit(CONF_STATE2_DEVICE, &chan->conf_state) &&
76700 rfc.mode != chan->mode)
76701 diff --git a/net/bluetooth/l2cap_sock.c b/net/bluetooth/l2cap_sock.c
76702 index 34bbe1c..451c19b 100644
76703 --- a/net/bluetooth/l2cap_sock.c
76704 +++ b/net/bluetooth/l2cap_sock.c
76705 @@ -467,7 +467,8 @@ static int l2cap_sock_setsockopt_old(struct socket *sock, int optname, char __us
76706 struct sock *sk = sock->sk;
76707 struct l2cap_chan *chan = l2cap_pi(sk)->chan;
76708 struct l2cap_options opts;
76709 - int len, err = 0;
76710 + int err = 0;
76711 + size_t len = optlen;
76712 u32 opt;
76713
76714 BT_DBG("sk %p", sk);
76715 @@ -489,7 +490,7 @@ static int l2cap_sock_setsockopt_old(struct socket *sock, int optname, char __us
76716 opts.max_tx = chan->max_tx;
76717 opts.txwin_size = chan->tx_win;
76718
76719 - len = min_t(unsigned int, sizeof(opts), optlen);
76720 + len = min(sizeof(opts), len);
76721 if (copy_from_user((char *) &opts, optval, len)) {
76722 err = -EFAULT;
76723 break;
76724 @@ -567,7 +568,8 @@ static int l2cap_sock_setsockopt(struct socket *sock, int level, int optname, ch
76725 struct bt_security sec;
76726 struct bt_power pwr;
76727 struct l2cap_conn *conn;
76728 - int len, err = 0;
76729 + int err = 0;
76730 + size_t len = optlen;
76731 u32 opt;
76732
76733 BT_DBG("sk %p", sk);
76734 @@ -590,7 +592,7 @@ static int l2cap_sock_setsockopt(struct socket *sock, int level, int optname, ch
76735
76736 sec.level = BT_SECURITY_LOW;
76737
76738 - len = min_t(unsigned int, sizeof(sec), optlen);
76739 + len = min(sizeof(sec), len);
76740 if (copy_from_user((char *) &sec, optval, len)) {
76741 err = -EFAULT;
76742 break;
76743 @@ -687,7 +689,7 @@ static int l2cap_sock_setsockopt(struct socket *sock, int level, int optname, ch
76744
76745 pwr.force_active = BT_POWER_FORCE_ACTIVE_ON;
76746
76747 - len = min_t(unsigned int, sizeof(pwr), optlen);
76748 + len = min(sizeof(pwr), len);
76749 if (copy_from_user((char *) &pwr, optval, len)) {
76750 err = -EFAULT;
76751 break;
76752 diff --git a/net/bluetooth/rfcomm/sock.c b/net/bluetooth/rfcomm/sock.c
76753 index 1a17850..65a3129 100644
76754 --- a/net/bluetooth/rfcomm/sock.c
76755 +++ b/net/bluetooth/rfcomm/sock.c
76756 @@ -667,7 +667,7 @@ static int rfcomm_sock_setsockopt(struct socket *sock, int level, int optname, c
76757 struct sock *sk = sock->sk;
76758 struct bt_security sec;
76759 int err = 0;
76760 - size_t len;
76761 + size_t len = optlen;
76762 u32 opt;
76763
76764 BT_DBG("sk %p", sk);
76765 @@ -689,7 +689,7 @@ static int rfcomm_sock_setsockopt(struct socket *sock, int level, int optname, c
76766
76767 sec.level = BT_SECURITY_LOW;
76768
76769 - len = min_t(unsigned int, sizeof(sec), optlen);
76770 + len = min(sizeof(sec), len);
76771 if (copy_from_user((char *) &sec, optval, len)) {
76772 err = -EFAULT;
76773 break;
76774 diff --git a/net/bluetooth/rfcomm/tty.c b/net/bluetooth/rfcomm/tty.c
76775 index 56f1823..da44330 100644
76776 --- a/net/bluetooth/rfcomm/tty.c
76777 +++ b/net/bluetooth/rfcomm/tty.c
76778 @@ -309,7 +309,7 @@ static void rfcomm_dev_del(struct rfcomm_dev *dev)
76779 BUG_ON(test_and_set_bit(RFCOMM_TTY_RELEASED, &dev->flags));
76780
76781 spin_lock_irqsave(&dev->port.lock, flags);
76782 - if (dev->port.count > 0) {
76783 + if (atomic_read(&dev->port.count) > 0) {
76784 spin_unlock_irqrestore(&dev->port.lock, flags);
76785 return;
76786 }
76787 @@ -664,10 +664,10 @@ static int rfcomm_tty_open(struct tty_struct *tty, struct file *filp)
76788 return -ENODEV;
76789
76790 BT_DBG("dev %p dst %s channel %d opened %d", dev, batostr(&dev->dst),
76791 - dev->channel, dev->port.count);
76792 + dev->channel, atomic_read(&dev->port.count));
76793
76794 spin_lock_irqsave(&dev->port.lock, flags);
76795 - if (++dev->port.count > 1) {
76796 + if (atomic_inc_return(&dev->port.count) > 1) {
76797 spin_unlock_irqrestore(&dev->port.lock, flags);
76798 return 0;
76799 }
76800 @@ -732,10 +732,10 @@ static void rfcomm_tty_close(struct tty_struct *tty, struct file *filp)
76801 return;
76802
76803 BT_DBG("tty %p dev %p dlc %p opened %d", tty, dev, dev->dlc,
76804 - dev->port.count);
76805 + atomic_read(&dev->port.count));
76806
76807 spin_lock_irqsave(&dev->port.lock, flags);
76808 - if (!--dev->port.count) {
76809 + if (!atomic_dec_return(&dev->port.count)) {
76810 spin_unlock_irqrestore(&dev->port.lock, flags);
76811 if (dev->tty_dev->parent)
76812 device_move(dev->tty_dev, NULL, DPM_ORDER_DEV_LAST);
76813 diff --git a/net/bridge/netfilter/ebtables.c b/net/bridge/netfilter/ebtables.c
76814 index 5fe2ff3..121d696 100644
76815 --- a/net/bridge/netfilter/ebtables.c
76816 +++ b/net/bridge/netfilter/ebtables.c
76817 @@ -1523,7 +1523,7 @@ static int do_ebt_get_ctl(struct sock *sk, int cmd, void __user *user, int *len)
76818 tmp.valid_hooks = t->table->valid_hooks;
76819 }
76820 mutex_unlock(&ebt_mutex);
76821 - if (copy_to_user(user, &tmp, *len) != 0){
76822 + if (*len > sizeof(tmp) || copy_to_user(user, &tmp, *len) != 0){
76823 BUGPRINT("c2u Didn't work\n");
76824 ret = -EFAULT;
76825 break;
76826 @@ -2327,7 +2327,7 @@ static int compat_do_ebt_get_ctl(struct sock *sk, int cmd,
76827 goto out;
76828 tmp.valid_hooks = t->valid_hooks;
76829
76830 - if (copy_to_user(user, &tmp, *len) != 0) {
76831 + if (*len > sizeof(tmp) || copy_to_user(user, &tmp, *len) != 0) {
76832 ret = -EFAULT;
76833 break;
76834 }
76835 @@ -2338,7 +2338,7 @@ static int compat_do_ebt_get_ctl(struct sock *sk, int cmd,
76836 tmp.entries_size = t->table->entries_size;
76837 tmp.valid_hooks = t->table->valid_hooks;
76838
76839 - if (copy_to_user(user, &tmp, *len) != 0) {
76840 + if (*len > sizeof(tmp) || copy_to_user(user, &tmp, *len) != 0) {
76841 ret = -EFAULT;
76842 break;
76843 }
76844 diff --git a/net/caif/cfctrl.c b/net/caif/cfctrl.c
76845 index 44f270f..1f5602d 100644
76846 --- a/net/caif/cfctrl.c
76847 +++ b/net/caif/cfctrl.c
76848 @@ -10,6 +10,7 @@
76849 #include <linux/spinlock.h>
76850 #include <linux/slab.h>
76851 #include <linux/pkt_sched.h>
76852 +#include <linux/sched.h>
76853 #include <net/caif/caif_layer.h>
76854 #include <net/caif/cfpkt.h>
76855 #include <net/caif/cfctrl.h>
76856 @@ -43,8 +44,8 @@ struct cflayer *cfctrl_create(void)
76857 memset(&dev_info, 0, sizeof(dev_info));
76858 dev_info.id = 0xff;
76859 cfsrvl_init(&this->serv, 0, &dev_info, false);
76860 - atomic_set(&this->req_seq_no, 1);
76861 - atomic_set(&this->rsp_seq_no, 1);
76862 + atomic_set_unchecked(&this->req_seq_no, 1);
76863 + atomic_set_unchecked(&this->rsp_seq_no, 1);
76864 this->serv.layer.receive = cfctrl_recv;
76865 sprintf(this->serv.layer.name, "ctrl");
76866 this->serv.layer.ctrlcmd = cfctrl_ctrlcmd;
76867 @@ -130,8 +131,8 @@ static void cfctrl_insert_req(struct cfctrl *ctrl,
76868 struct cfctrl_request_info *req)
76869 {
76870 spin_lock_bh(&ctrl->info_list_lock);
76871 - atomic_inc(&ctrl->req_seq_no);
76872 - req->sequence_no = atomic_read(&ctrl->req_seq_no);
76873 + atomic_inc_unchecked(&ctrl->req_seq_no);
76874 + req->sequence_no = atomic_read_unchecked(&ctrl->req_seq_no);
76875 list_add_tail(&req->list, &ctrl->list);
76876 spin_unlock_bh(&ctrl->info_list_lock);
76877 }
76878 @@ -149,7 +150,7 @@ static struct cfctrl_request_info *cfctrl_remove_req(struct cfctrl *ctrl,
76879 if (p != first)
76880 pr_warn("Requests are not received in order\n");
76881
76882 - atomic_set(&ctrl->rsp_seq_no,
76883 + atomic_set_unchecked(&ctrl->rsp_seq_no,
76884 p->sequence_no);
76885 list_del(&p->list);
76886 goto out;
76887 diff --git a/net/can/gw.c b/net/can/gw.c
76888 index b54d5e6..91c3b25 100644
76889 --- a/net/can/gw.c
76890 +++ b/net/can/gw.c
76891 @@ -96,7 +96,7 @@ struct cf_mod {
76892 struct {
76893 void (*xor)(struct can_frame *cf, struct cgw_csum_xor *xor);
76894 void (*crc8)(struct can_frame *cf, struct cgw_csum_crc8 *crc8);
76895 - } csumfunc;
76896 + } __no_const csumfunc;
76897 };
76898
76899
76900 diff --git a/net/compat.c b/net/compat.c
76901 index 74ed1d7..3695bd9 100644
76902 --- a/net/compat.c
76903 +++ b/net/compat.c
76904 @@ -71,9 +71,9 @@ int get_compat_msghdr(struct msghdr *kmsg, struct compat_msghdr __user *umsg)
76905 __get_user(kmsg->msg_controllen, &umsg->msg_controllen) ||
76906 __get_user(kmsg->msg_flags, &umsg->msg_flags))
76907 return -EFAULT;
76908 - kmsg->msg_name = compat_ptr(tmp1);
76909 - kmsg->msg_iov = compat_ptr(tmp2);
76910 - kmsg->msg_control = compat_ptr(tmp3);
76911 + kmsg->msg_name = (void __force_kernel *)compat_ptr(tmp1);
76912 + kmsg->msg_iov = (void __force_kernel *)compat_ptr(tmp2);
76913 + kmsg->msg_control = (void __force_kernel *)compat_ptr(tmp3);
76914 return 0;
76915 }
76916
76917 @@ -85,7 +85,7 @@ int verify_compat_iovec(struct msghdr *kern_msg, struct iovec *kern_iov,
76918
76919 if (kern_msg->msg_namelen) {
76920 if (mode == VERIFY_READ) {
76921 - int err = move_addr_to_kernel(kern_msg->msg_name,
76922 + int err = move_addr_to_kernel((void __force_user *)kern_msg->msg_name,
76923 kern_msg->msg_namelen,
76924 kern_address);
76925 if (err < 0)
76926 @@ -96,7 +96,7 @@ int verify_compat_iovec(struct msghdr *kern_msg, struct iovec *kern_iov,
76927 kern_msg->msg_name = NULL;
76928
76929 tot_len = iov_from_user_compat_to_kern(kern_iov,
76930 - (struct compat_iovec __user *)kern_msg->msg_iov,
76931 + (struct compat_iovec __force_user *)kern_msg->msg_iov,
76932 kern_msg->msg_iovlen);
76933 if (tot_len >= 0)
76934 kern_msg->msg_iov = kern_iov;
76935 @@ -116,20 +116,20 @@ int verify_compat_iovec(struct msghdr *kern_msg, struct iovec *kern_iov,
76936
76937 #define CMSG_COMPAT_FIRSTHDR(msg) \
76938 (((msg)->msg_controllen) >= sizeof(struct compat_cmsghdr) ? \
76939 - (struct compat_cmsghdr __user *)((msg)->msg_control) : \
76940 + (struct compat_cmsghdr __force_user *)((msg)->msg_control) : \
76941 (struct compat_cmsghdr __user *)NULL)
76942
76943 #define CMSG_COMPAT_OK(ucmlen, ucmsg, mhdr) \
76944 ((ucmlen) >= sizeof(struct compat_cmsghdr) && \
76945 (ucmlen) <= (unsigned long) \
76946 ((mhdr)->msg_controllen - \
76947 - ((char *)(ucmsg) - (char *)(mhdr)->msg_control)))
76948 + ((char __force_kernel *)(ucmsg) - (char *)(mhdr)->msg_control)))
76949
76950 static inline struct compat_cmsghdr __user *cmsg_compat_nxthdr(struct msghdr *msg,
76951 struct compat_cmsghdr __user *cmsg, int cmsg_len)
76952 {
76953 char __user *ptr = (char __user *)cmsg + CMSG_COMPAT_ALIGN(cmsg_len);
76954 - if ((unsigned long)(ptr + 1 - (char __user *)msg->msg_control) >
76955 + if ((unsigned long)(ptr + 1 - (char __force_user *)msg->msg_control) >
76956 msg->msg_controllen)
76957 return NULL;
76958 return (struct compat_cmsghdr __user *)ptr;
76959 @@ -219,7 +219,7 @@ Efault:
76960
76961 int put_cmsg_compat(struct msghdr *kmsg, int level, int type, int len, void *data)
76962 {
76963 - struct compat_cmsghdr __user *cm = (struct compat_cmsghdr __user *) kmsg->msg_control;
76964 + struct compat_cmsghdr __user *cm = (struct compat_cmsghdr __force_user *) kmsg->msg_control;
76965 struct compat_cmsghdr cmhdr;
76966 struct compat_timeval ctv;
76967 struct compat_timespec cts[3];
76968 @@ -275,7 +275,7 @@ int put_cmsg_compat(struct msghdr *kmsg, int level, int type, int len, void *dat
76969
76970 void scm_detach_fds_compat(struct msghdr *kmsg, struct scm_cookie *scm)
76971 {
76972 - struct compat_cmsghdr __user *cm = (struct compat_cmsghdr __user *) kmsg->msg_control;
76973 + struct compat_cmsghdr __user *cm = (struct compat_cmsghdr __force_user *) kmsg->msg_control;
76974 int fdmax = (kmsg->msg_controllen - sizeof(struct compat_cmsghdr)) / sizeof(int);
76975 int fdnum = scm->fp->count;
76976 struct file **fp = scm->fp->fp;
76977 @@ -364,7 +364,7 @@ static int do_set_sock_timeout(struct socket *sock, int level,
76978 return -EFAULT;
76979 old_fs = get_fs();
76980 set_fs(KERNEL_DS);
76981 - err = sock_setsockopt(sock, level, optname, (char *)&ktime, sizeof(ktime));
76982 + err = sock_setsockopt(sock, level, optname, (char __force_user *)&ktime, sizeof(ktime));
76983 set_fs(old_fs);
76984
76985 return err;
76986 @@ -425,7 +425,7 @@ static int do_get_sock_timeout(struct socket *sock, int level, int optname,
76987 len = sizeof(ktime);
76988 old_fs = get_fs();
76989 set_fs(KERNEL_DS);
76990 - err = sock_getsockopt(sock, level, optname, (char *) &ktime, &len);
76991 + err = sock_getsockopt(sock, level, optname, (char __force_user *) &ktime, (int __force_user *)&len);
76992 set_fs(old_fs);
76993
76994 if (!err) {
76995 @@ -568,7 +568,7 @@ int compat_mc_setsockopt(struct sock *sock, int level, int optname,
76996 case MCAST_JOIN_GROUP:
76997 case MCAST_LEAVE_GROUP:
76998 {
76999 - struct compat_group_req __user *gr32 = (void *)optval;
77000 + struct compat_group_req __user *gr32 = (void __user *)optval;
77001 struct group_req __user *kgr =
77002 compat_alloc_user_space(sizeof(struct group_req));
77003 u32 interface;
77004 @@ -589,7 +589,7 @@ int compat_mc_setsockopt(struct sock *sock, int level, int optname,
77005 case MCAST_BLOCK_SOURCE:
77006 case MCAST_UNBLOCK_SOURCE:
77007 {
77008 - struct compat_group_source_req __user *gsr32 = (void *)optval;
77009 + struct compat_group_source_req __user *gsr32 = (void __user *)optval;
77010 struct group_source_req __user *kgsr = compat_alloc_user_space(
77011 sizeof(struct group_source_req));
77012 u32 interface;
77013 @@ -610,7 +610,7 @@ int compat_mc_setsockopt(struct sock *sock, int level, int optname,
77014 }
77015 case MCAST_MSFILTER:
77016 {
77017 - struct compat_group_filter __user *gf32 = (void *)optval;
77018 + struct compat_group_filter __user *gf32 = (void __user *)optval;
77019 struct group_filter __user *kgf;
77020 u32 interface, fmode, numsrc;
77021
77022 @@ -648,7 +648,7 @@ int compat_mc_getsockopt(struct sock *sock, int level, int optname,
77023 char __user *optval, int __user *optlen,
77024 int (*getsockopt)(struct sock *, int, int, char __user *, int __user *))
77025 {
77026 - struct compat_group_filter __user *gf32 = (void *)optval;
77027 + struct compat_group_filter __user *gf32 = (void __user *)optval;
77028 struct group_filter __user *kgf;
77029 int __user *koptlen;
77030 u32 interface, fmode, numsrc;
77031 @@ -797,7 +797,7 @@ asmlinkage long compat_sys_socketcall(int call, u32 __user *args)
77032
77033 if (call < SYS_SOCKET || call > SYS_SENDMMSG)
77034 return -EINVAL;
77035 - if (copy_from_user(a, args, nas[call]))
77036 + if (nas[call] > sizeof a || copy_from_user(a, args, nas[call]))
77037 return -EFAULT;
77038 a0 = a[0];
77039 a1 = a[1];
77040 diff --git a/net/core/datagram.c b/net/core/datagram.c
77041 index 0337e2b..47914a0 100644
77042 --- a/net/core/datagram.c
77043 +++ b/net/core/datagram.c
77044 @@ -289,7 +289,7 @@ int skb_kill_datagram(struct sock *sk, struct sk_buff *skb, unsigned int flags)
77045 }
77046
77047 kfree_skb(skb);
77048 - atomic_inc(&sk->sk_drops);
77049 + atomic_inc_unchecked(&sk->sk_drops);
77050 sk_mem_reclaim_partial(sk);
77051
77052 return err;
77053 diff --git a/net/core/dev.c b/net/core/dev.c
77054 index 1dce5b5..363a522 100644
77055 --- a/net/core/dev.c
77056 +++ b/net/core/dev.c
77057 @@ -1138,9 +1138,13 @@ void dev_load(struct net *net, const char *name)
77058 if (no_module && capable(CAP_NET_ADMIN))
77059 no_module = request_module("netdev-%s", name);
77060 if (no_module && capable(CAP_SYS_MODULE)) {
77061 +#ifdef CONFIG_GRKERNSEC_MODHARDEN
77062 + ___request_module(true, "grsec_modharden_netdev", "%s", name);
77063 +#else
77064 if (!request_module("%s", name))
77065 pr_warn("Loading kernel module for a network device with CAP_SYS_MODULE (deprecated). Use CAP_NET_ADMIN and alias netdev-%s instead.\n",
77066 name);
77067 +#endif
77068 }
77069 }
77070 EXPORT_SYMBOL(dev_load);
77071 @@ -1605,7 +1609,7 @@ int dev_forward_skb(struct net_device *dev, struct sk_buff *skb)
77072 {
77073 if (skb_shinfo(skb)->tx_flags & SKBTX_DEV_ZEROCOPY) {
77074 if (skb_copy_ubufs(skb, GFP_ATOMIC)) {
77075 - atomic_long_inc(&dev->rx_dropped);
77076 + atomic_long_inc_unchecked(&dev->rx_dropped);
77077 kfree_skb(skb);
77078 return NET_RX_DROP;
77079 }
77080 @@ -1615,7 +1619,7 @@ int dev_forward_skb(struct net_device *dev, struct sk_buff *skb)
77081 nf_reset(skb);
77082
77083 if (unlikely(!is_skb_forwardable(dev, skb))) {
77084 - atomic_long_inc(&dev->rx_dropped);
77085 + atomic_long_inc_unchecked(&dev->rx_dropped);
77086 kfree_skb(skb);
77087 return NET_RX_DROP;
77088 }
77089 @@ -2071,7 +2075,7 @@ static int illegal_highdma(struct net_device *dev, struct sk_buff *skb)
77090
77091 struct dev_gso_cb {
77092 void (*destructor)(struct sk_buff *skb);
77093 -};
77094 +} __no_const;
77095
77096 #define DEV_GSO_CB(skb) ((struct dev_gso_cb *)(skb)->cb)
77097
77098 @@ -2930,7 +2934,7 @@ enqueue:
77099
77100 local_irq_restore(flags);
77101
77102 - atomic_long_inc(&skb->dev->rx_dropped);
77103 + atomic_long_inc_unchecked(&skb->dev->rx_dropped);
77104 kfree_skb(skb);
77105 return NET_RX_DROP;
77106 }
77107 @@ -3002,7 +3006,7 @@ int netif_rx_ni(struct sk_buff *skb)
77108 }
77109 EXPORT_SYMBOL(netif_rx_ni);
77110
77111 -static void net_tx_action(struct softirq_action *h)
77112 +static void net_tx_action(void)
77113 {
77114 struct softnet_data *sd = &__get_cpu_var(softnet_data);
77115
77116 @@ -3333,7 +3337,7 @@ ncls:
77117 ret = pt_prev->func(skb, skb->dev, pt_prev, orig_dev);
77118 } else {
77119 drop:
77120 - atomic_long_inc(&skb->dev->rx_dropped);
77121 + atomic_long_inc_unchecked(&skb->dev->rx_dropped);
77122 kfree_skb(skb);
77123 /* Jamal, now you will not able to escape explaining
77124 * me how you were going to use this. :-)
77125 @@ -3900,7 +3904,7 @@ void netif_napi_del(struct napi_struct *napi)
77126 }
77127 EXPORT_SYMBOL(netif_napi_del);
77128
77129 -static void net_rx_action(struct softirq_action *h)
77130 +static void net_rx_action(void)
77131 {
77132 struct softnet_data *sd = &__get_cpu_var(softnet_data);
77133 unsigned long time_limit = jiffies + 2;
77134 @@ -4370,8 +4374,13 @@ static int ptype_seq_show(struct seq_file *seq, void *v)
77135 else
77136 seq_printf(seq, "%04x", ntohs(pt->type));
77137
77138 +#ifdef CONFIG_GRKERNSEC_HIDESYM
77139 + seq_printf(seq, " %-8s %p\n",
77140 + pt->dev ? pt->dev->name : "", NULL);
77141 +#else
77142 seq_printf(seq, " %-8s %pF\n",
77143 pt->dev ? pt->dev->name : "", pt->func);
77144 +#endif
77145 }
77146
77147 return 0;
77148 @@ -5924,7 +5933,7 @@ struct rtnl_link_stats64 *dev_get_stats(struct net_device *dev,
77149 } else {
77150 netdev_stats_to_stats64(storage, &dev->stats);
77151 }
77152 - storage->rx_dropped += atomic_long_read(&dev->rx_dropped);
77153 + storage->rx_dropped += atomic_long_read_unchecked(&dev->rx_dropped);
77154 return storage;
77155 }
77156 EXPORT_SYMBOL(dev_get_stats);
77157 diff --git a/net/core/flow.c b/net/core/flow.c
77158 index e318c7e..168b1d0 100644
77159 --- a/net/core/flow.c
77160 +++ b/net/core/flow.c
77161 @@ -61,7 +61,7 @@ struct flow_cache {
77162 struct timer_list rnd_timer;
77163 };
77164
77165 -atomic_t flow_cache_genid = ATOMIC_INIT(0);
77166 +atomic_unchecked_t flow_cache_genid = ATOMIC_INIT(0);
77167 EXPORT_SYMBOL(flow_cache_genid);
77168 static struct flow_cache flow_cache_global;
77169 static struct kmem_cache *flow_cachep __read_mostly;
77170 @@ -86,7 +86,7 @@ static void flow_cache_new_hashrnd(unsigned long arg)
77171
77172 static int flow_entry_valid(struct flow_cache_entry *fle)
77173 {
77174 - if (atomic_read(&flow_cache_genid) != fle->genid)
77175 + if (atomic_read_unchecked(&flow_cache_genid) != fle->genid)
77176 return 0;
77177 if (fle->object && !fle->object->ops->check(fle->object))
77178 return 0;
77179 @@ -259,7 +259,7 @@ flow_cache_lookup(struct net *net, const struct flowi *key, u16 family, u8 dir,
77180 hlist_add_head(&fle->u.hlist, &fcp->hash_table[hash]);
77181 fcp->hash_count++;
77182 }
77183 - } else if (likely(fle->genid == atomic_read(&flow_cache_genid))) {
77184 + } else if (likely(fle->genid == atomic_read_unchecked(&flow_cache_genid))) {
77185 flo = fle->object;
77186 if (!flo)
77187 goto ret_object;
77188 @@ -280,7 +280,7 @@ nocache:
77189 }
77190 flo = resolver(net, key, family, dir, flo, ctx);
77191 if (fle) {
77192 - fle->genid = atomic_read(&flow_cache_genid);
77193 + fle->genid = atomic_read_unchecked(&flow_cache_genid);
77194 if (!IS_ERR(flo))
77195 fle->object = flo;
77196 else
77197 diff --git a/net/core/iovec.c b/net/core/iovec.c
77198 index 7e7aeb0..2a998cb 100644
77199 --- a/net/core/iovec.c
77200 +++ b/net/core/iovec.c
77201 @@ -42,7 +42,7 @@ int verify_iovec(struct msghdr *m, struct iovec *iov, struct sockaddr_storage *a
77202 if (m->msg_namelen) {
77203 if (mode == VERIFY_READ) {
77204 void __user *namep;
77205 - namep = (void __user __force *) m->msg_name;
77206 + namep = (void __force_user *) m->msg_name;
77207 err = move_addr_to_kernel(namep, m->msg_namelen,
77208 address);
77209 if (err < 0)
77210 @@ -54,7 +54,7 @@ int verify_iovec(struct msghdr *m, struct iovec *iov, struct sockaddr_storage *a
77211 }
77212
77213 size = m->msg_iovlen * sizeof(struct iovec);
77214 - if (copy_from_user(iov, (void __user __force *) m->msg_iov, size))
77215 + if (copy_from_user(iov, (void __force_user *) m->msg_iov, size))
77216 return -EFAULT;
77217
77218 m->msg_iov = iov;
77219 diff --git a/net/core/rtnetlink.c b/net/core/rtnetlink.c
77220 index 2c5a0a0..a45f90c 100644
77221 --- a/net/core/rtnetlink.c
77222 +++ b/net/core/rtnetlink.c
77223 @@ -58,7 +58,7 @@ struct rtnl_link {
77224 rtnl_doit_func doit;
77225 rtnl_dumpit_func dumpit;
77226 rtnl_calcit_func calcit;
77227 -};
77228 +} __no_const;
77229
77230 static DEFINE_MUTEX(rtnl_mutex);
77231
77232 diff --git a/net/core/scm.c b/net/core/scm.c
77233 index 040cebe..5b1e312 100644
77234 --- a/net/core/scm.c
77235 +++ b/net/core/scm.c
77236 @@ -203,7 +203,7 @@ EXPORT_SYMBOL(__scm_send);
77237 int put_cmsg(struct msghdr * msg, int level, int type, int len, void *data)
77238 {
77239 struct cmsghdr __user *cm
77240 - = (__force struct cmsghdr __user *)msg->msg_control;
77241 + = (struct cmsghdr __force_user *)msg->msg_control;
77242 struct cmsghdr cmhdr;
77243 int cmlen = CMSG_LEN(len);
77244 int err;
77245 @@ -226,7 +226,7 @@ int put_cmsg(struct msghdr * msg, int level, int type, int len, void *data)
77246 err = -EFAULT;
77247 if (copy_to_user(cm, &cmhdr, sizeof cmhdr))
77248 goto out;
77249 - if (copy_to_user(CMSG_DATA(cm), data, cmlen - sizeof(struct cmsghdr)))
77250 + if (copy_to_user((void __force_user *)CMSG_DATA((void __force_kernel *)cm), data, cmlen - sizeof(struct cmsghdr)))
77251 goto out;
77252 cmlen = CMSG_SPACE(len);
77253 if (msg->msg_controllen < cmlen)
77254 @@ -242,7 +242,7 @@ EXPORT_SYMBOL(put_cmsg);
77255 void scm_detach_fds(struct msghdr *msg, struct scm_cookie *scm)
77256 {
77257 struct cmsghdr __user *cm
77258 - = (__force struct cmsghdr __user*)msg->msg_control;
77259 + = (struct cmsghdr __force_user *)msg->msg_control;
77260
77261 int fdmax = 0;
77262 int fdnum = scm->fp->count;
77263 @@ -262,7 +262,7 @@ void scm_detach_fds(struct msghdr *msg, struct scm_cookie *scm)
77264 if (fdnum < fdmax)
77265 fdmax = fdnum;
77266
77267 - for (i=0, cmfptr=(__force int __user *)CMSG_DATA(cm); i<fdmax;
77268 + for (i=0, cmfptr=(int __force_user *)CMSG_DATA((void __force_kernel *)cm); i<fdmax;
77269 i++, cmfptr++)
77270 {
77271 struct socket *sock;
77272 diff --git a/net/core/sock.c b/net/core/sock.c
77273 index a6000fb..d4aee72 100644
77274 --- a/net/core/sock.c
77275 +++ b/net/core/sock.c
77276 @@ -399,7 +399,7 @@ int sock_queue_rcv_skb(struct sock *sk, struct sk_buff *skb)
77277 struct sk_buff_head *list = &sk->sk_receive_queue;
77278
77279 if (atomic_read(&sk->sk_rmem_alloc) >= sk->sk_rcvbuf) {
77280 - atomic_inc(&sk->sk_drops);
77281 + atomic_inc_unchecked(&sk->sk_drops);
77282 trace_sock_rcvqueue_full(sk, skb);
77283 return -ENOMEM;
77284 }
77285 @@ -409,7 +409,7 @@ int sock_queue_rcv_skb(struct sock *sk, struct sk_buff *skb)
77286 return err;
77287
77288 if (!sk_rmem_schedule(sk, skb, skb->truesize)) {
77289 - atomic_inc(&sk->sk_drops);
77290 + atomic_inc_unchecked(&sk->sk_drops);
77291 return -ENOBUFS;
77292 }
77293
77294 @@ -429,7 +429,7 @@ int sock_queue_rcv_skb(struct sock *sk, struct sk_buff *skb)
77295 skb_dst_force(skb);
77296
77297 spin_lock_irqsave(&list->lock, flags);
77298 - skb->dropcount = atomic_read(&sk->sk_drops);
77299 + skb->dropcount = atomic_read_unchecked(&sk->sk_drops);
77300 __skb_queue_tail(list, skb);
77301 spin_unlock_irqrestore(&list->lock, flags);
77302
77303 @@ -449,7 +449,7 @@ int sk_receive_skb(struct sock *sk, struct sk_buff *skb, const int nested)
77304 skb->dev = NULL;
77305
77306 if (sk_rcvqueues_full(sk, skb, sk->sk_rcvbuf)) {
77307 - atomic_inc(&sk->sk_drops);
77308 + atomic_inc_unchecked(&sk->sk_drops);
77309 goto discard_and_relse;
77310 }
77311 if (nested)
77312 @@ -467,7 +467,7 @@ int sk_receive_skb(struct sock *sk, struct sk_buff *skb, const int nested)
77313 mutex_release(&sk->sk_lock.dep_map, 1, _RET_IP_);
77314 } else if (sk_add_backlog(sk, skb, sk->sk_rcvbuf)) {
77315 bh_unlock_sock(sk);
77316 - atomic_inc(&sk->sk_drops);
77317 + atomic_inc_unchecked(&sk->sk_drops);
77318 goto discard_and_relse;
77319 }
77320
77321 @@ -886,12 +886,12 @@ int sock_getsockopt(struct socket *sock, int level, int optname,
77322 struct timeval tm;
77323 } v;
77324
77325 - int lv = sizeof(int);
77326 - int len;
77327 + unsigned int lv = sizeof(int);
77328 + unsigned int len;
77329
77330 if (get_user(len, optlen))
77331 return -EFAULT;
77332 - if (len < 0)
77333 + if (len > INT_MAX)
77334 return -EINVAL;
77335
77336 memset(&v, 0, sizeof(v));
77337 @@ -1039,11 +1039,11 @@ int sock_getsockopt(struct socket *sock, int level, int optname,
77338
77339 case SO_PEERNAME:
77340 {
77341 - char address[128];
77342 + char address[_K_SS_MAXSIZE];
77343
77344 if (sock->ops->getname(sock, (struct sockaddr *)address, &lv, 2))
77345 return -ENOTCONN;
77346 - if (lv < len)
77347 + if (lv < len || sizeof address < len)
77348 return -EINVAL;
77349 if (copy_to_user(optval, address, len))
77350 return -EFAULT;
77351 @@ -1091,7 +1091,7 @@ int sock_getsockopt(struct socket *sock, int level, int optname,
77352
77353 if (len > lv)
77354 len = lv;
77355 - if (copy_to_user(optval, &v, len))
77356 + if (len > sizeof(v) || copy_to_user(optval, &v, len))
77357 return -EFAULT;
77358 lenout:
77359 if (put_user(len, optlen))
77360 @@ -2193,7 +2193,7 @@ void sock_init_data(struct socket *sock, struct sock *sk)
77361 */
77362 smp_wmb();
77363 atomic_set(&sk->sk_refcnt, 1);
77364 - atomic_set(&sk->sk_drops, 0);
77365 + atomic_set_unchecked(&sk->sk_drops, 0);
77366 }
77367 EXPORT_SYMBOL(sock_init_data);
77368
77369 diff --git a/net/core/sock_diag.c b/net/core/sock_diag.c
77370 index 9d8755e..26de8bc 100644
77371 --- a/net/core/sock_diag.c
77372 +++ b/net/core/sock_diag.c
77373 @@ -15,20 +15,27 @@ static DEFINE_MUTEX(sock_diag_table_mutex);
77374
77375 int sock_diag_check_cookie(void *sk, __u32 *cookie)
77376 {
77377 +#ifndef CONFIG_GRKERNSEC_HIDESYM
77378 if ((cookie[0] != INET_DIAG_NOCOOKIE ||
77379 cookie[1] != INET_DIAG_NOCOOKIE) &&
77380 ((u32)(unsigned long)sk != cookie[0] ||
77381 (u32)((((unsigned long)sk) >> 31) >> 1) != cookie[1]))
77382 return -ESTALE;
77383 else
77384 +#endif
77385 return 0;
77386 }
77387 EXPORT_SYMBOL_GPL(sock_diag_check_cookie);
77388
77389 void sock_diag_save_cookie(void *sk, __u32 *cookie)
77390 {
77391 +#ifdef CONFIG_GRKERNSEC_HIDESYM
77392 + cookie[0] = 0;
77393 + cookie[1] = 0;
77394 +#else
77395 cookie[0] = (u32)(unsigned long)sk;
77396 cookie[1] = (u32)(((unsigned long)sk >> 31) >> 1);
77397 +#endif
77398 }
77399 EXPORT_SYMBOL_GPL(sock_diag_save_cookie);
77400
77401 diff --git a/net/decnet/sysctl_net_decnet.c b/net/decnet/sysctl_net_decnet.c
77402 index a55eecc..dd8428c 100644
77403 --- a/net/decnet/sysctl_net_decnet.c
77404 +++ b/net/decnet/sysctl_net_decnet.c
77405 @@ -174,7 +174,7 @@ static int dn_node_address_handler(ctl_table *table, int write,
77406
77407 if (len > *lenp) len = *lenp;
77408
77409 - if (copy_to_user(buffer, addr, len))
77410 + if (len > sizeof addr || copy_to_user(buffer, addr, len))
77411 return -EFAULT;
77412
77413 *lenp = len;
77414 @@ -237,7 +237,7 @@ static int dn_def_dev_handler(ctl_table *table, int write,
77415
77416 if (len > *lenp) len = *lenp;
77417
77418 - if (copy_to_user(buffer, devname, len))
77419 + if (len > sizeof devname || copy_to_user(buffer, devname, len))
77420 return -EFAULT;
77421
77422 *lenp = len;
77423 diff --git a/net/ipv4/fib_frontend.c b/net/ipv4/fib_frontend.c
77424 index f444ac7..b7bdda9 100644
77425 --- a/net/ipv4/fib_frontend.c
77426 +++ b/net/ipv4/fib_frontend.c
77427 @@ -1020,12 +1020,12 @@ static int fib_inetaddr_event(struct notifier_block *this, unsigned long event,
77428 #ifdef CONFIG_IP_ROUTE_MULTIPATH
77429 fib_sync_up(dev);
77430 #endif
77431 - atomic_inc(&net->ipv4.dev_addr_genid);
77432 + atomic_inc_unchecked(&net->ipv4.dev_addr_genid);
77433 rt_cache_flush(dev_net(dev));
77434 break;
77435 case NETDEV_DOWN:
77436 fib_del_ifaddr(ifa, NULL);
77437 - atomic_inc(&net->ipv4.dev_addr_genid);
77438 + atomic_inc_unchecked(&net->ipv4.dev_addr_genid);
77439 if (ifa->ifa_dev->ifa_list == NULL) {
77440 /* Last address was deleted from this interface.
77441 * Disable IP.
77442 @@ -1062,7 +1062,7 @@ static int fib_netdev_event(struct notifier_block *this, unsigned long event, vo
77443 #ifdef CONFIG_IP_ROUTE_MULTIPATH
77444 fib_sync_up(dev);
77445 #endif
77446 - atomic_inc(&net->ipv4.dev_addr_genid);
77447 + atomic_inc_unchecked(&net->ipv4.dev_addr_genid);
77448 rt_cache_flush(dev_net(dev));
77449 break;
77450 case NETDEV_DOWN:
77451 diff --git a/net/ipv4/fib_semantics.c b/net/ipv4/fib_semantics.c
77452 index 9633661..4e0bc08 100644
77453 --- a/net/ipv4/fib_semantics.c
77454 +++ b/net/ipv4/fib_semantics.c
77455 @@ -767,7 +767,7 @@ __be32 fib_info_update_nh_saddr(struct net *net, struct fib_nh *nh)
77456 nh->nh_saddr = inet_select_addr(nh->nh_dev,
77457 nh->nh_gw,
77458 nh->nh_parent->fib_scope);
77459 - nh->nh_saddr_genid = atomic_read(&net->ipv4.dev_addr_genid);
77460 + nh->nh_saddr_genid = atomic_read_unchecked(&net->ipv4.dev_addr_genid);
77461
77462 return nh->nh_saddr;
77463 }
77464 diff --git a/net/ipv4/inet_hashtables.c b/net/ipv4/inet_hashtables.c
77465 index 7880af9..70f92a3 100644
77466 --- a/net/ipv4/inet_hashtables.c
77467 +++ b/net/ipv4/inet_hashtables.c
77468 @@ -18,12 +18,15 @@
77469 #include <linux/sched.h>
77470 #include <linux/slab.h>
77471 #include <linux/wait.h>
77472 +#include <linux/security.h>
77473
77474 #include <net/inet_connection_sock.h>
77475 #include <net/inet_hashtables.h>
77476 #include <net/secure_seq.h>
77477 #include <net/ip.h>
77478
77479 +extern void gr_update_task_in_ip_table(struct task_struct *task, const struct inet_sock *inet);
77480 +
77481 /*
77482 * Allocate and initialize a new local port bind bucket.
77483 * The bindhash mutex for snum's hash chain must be held here.
77484 @@ -530,6 +533,8 @@ ok:
77485 twrefcnt += inet_twsk_bind_unhash(tw, hinfo);
77486 spin_unlock(&head->lock);
77487
77488 + gr_update_task_in_ip_table(current, inet_sk(sk));
77489 +
77490 if (tw) {
77491 inet_twsk_deschedule(tw, death_row);
77492 while (twrefcnt) {
77493 diff --git a/net/ipv4/inetpeer.c b/net/ipv4/inetpeer.c
77494 index c7527f6..d8bba61 100644
77495 --- a/net/ipv4/inetpeer.c
77496 +++ b/net/ipv4/inetpeer.c
77497 @@ -503,8 +503,8 @@ relookup:
77498 if (p) {
77499 p->daddr = *daddr;
77500 atomic_set(&p->refcnt, 1);
77501 - atomic_set(&p->rid, 0);
77502 - atomic_set(&p->ip_id_count,
77503 + atomic_set_unchecked(&p->rid, 0);
77504 + atomic_set_unchecked(&p->ip_id_count,
77505 (daddr->family == AF_INET) ?
77506 secure_ip_id(daddr->addr.a4) :
77507 secure_ipv6_id(daddr->addr.a6));
77508 diff --git a/net/ipv4/ip_fragment.c b/net/ipv4/ip_fragment.c
77509 index 8d07c97..d0812ef 100644
77510 --- a/net/ipv4/ip_fragment.c
77511 +++ b/net/ipv4/ip_fragment.c
77512 @@ -322,7 +322,7 @@ static inline int ip_frag_too_far(struct ipq *qp)
77513 return 0;
77514
77515 start = qp->rid;
77516 - end = atomic_inc_return(&peer->rid);
77517 + end = atomic_inc_return_unchecked(&peer->rid);
77518 qp->rid = end;
77519
77520 rc = qp->q.fragments && (end - start) > max;
77521 diff --git a/net/ipv4/ip_sockglue.c b/net/ipv4/ip_sockglue.c
77522 index 14bbfcf..644f472 100644
77523 --- a/net/ipv4/ip_sockglue.c
77524 +++ b/net/ipv4/ip_sockglue.c
77525 @@ -1151,7 +1151,8 @@ static int do_ip_getsockopt(struct sock *sk, int level, int optname,
77526 len = min_t(unsigned int, len, opt->optlen);
77527 if (put_user(len, optlen))
77528 return -EFAULT;
77529 - if (copy_to_user(optval, opt->__data, len))
77530 + if ((len > (sizeof(optbuf) - sizeof(struct ip_options))) ||
77531 + copy_to_user(optval, opt->__data, len))
77532 return -EFAULT;
77533 return 0;
77534 }
77535 @@ -1282,7 +1283,7 @@ static int do_ip_getsockopt(struct sock *sk, int level, int optname,
77536 if (sk->sk_type != SOCK_STREAM)
77537 return -ENOPROTOOPT;
77538
77539 - msg.msg_control = optval;
77540 + msg.msg_control = (void __force_kernel *)optval;
77541 msg.msg_controllen = len;
77542 msg.msg_flags = flags;
77543
77544 diff --git a/net/ipv4/ipconfig.c b/net/ipv4/ipconfig.c
77545 index 67e8a6b..386764d 100644
77546 --- a/net/ipv4/ipconfig.c
77547 +++ b/net/ipv4/ipconfig.c
77548 @@ -321,7 +321,7 @@ static int __init ic_devinet_ioctl(unsigned int cmd, struct ifreq *arg)
77549
77550 mm_segment_t oldfs = get_fs();
77551 set_fs(get_ds());
77552 - res = devinet_ioctl(&init_net, cmd, (struct ifreq __user *) arg);
77553 + res = devinet_ioctl(&init_net, cmd, (struct ifreq __force_user *) arg);
77554 set_fs(oldfs);
77555 return res;
77556 }
77557 @@ -332,7 +332,7 @@ static int __init ic_dev_ioctl(unsigned int cmd, struct ifreq *arg)
77558
77559 mm_segment_t oldfs = get_fs();
77560 set_fs(get_ds());
77561 - res = dev_ioctl(&init_net, cmd, (struct ifreq __user *) arg);
77562 + res = dev_ioctl(&init_net, cmd, (struct ifreq __force_user *) arg);
77563 set_fs(oldfs);
77564 return res;
77565 }
77566 @@ -343,7 +343,7 @@ static int __init ic_route_ioctl(unsigned int cmd, struct rtentry *arg)
77567
77568 mm_segment_t oldfs = get_fs();
77569 set_fs(get_ds());
77570 - res = ip_rt_ioctl(&init_net, cmd, (void __user *) arg);
77571 + res = ip_rt_ioctl(&init_net, cmd, (void __force_user *) arg);
77572 set_fs(oldfs);
77573 return res;
77574 }
77575 diff --git a/net/ipv4/netfilter/arp_tables.c b/net/ipv4/netfilter/arp_tables.c
77576 index 97e61ea..cac1bbb 100644
77577 --- a/net/ipv4/netfilter/arp_tables.c
77578 +++ b/net/ipv4/netfilter/arp_tables.c
77579 @@ -879,14 +879,14 @@ static int compat_table_info(const struct xt_table_info *info,
77580 #endif
77581
77582 static int get_info(struct net *net, void __user *user,
77583 - const int *len, int compat)
77584 + int len, int compat)
77585 {
77586 char name[XT_TABLE_MAXNAMELEN];
77587 struct xt_table *t;
77588 int ret;
77589
77590 - if (*len != sizeof(struct arpt_getinfo)) {
77591 - duprintf("length %u != %Zu\n", *len,
77592 + if (len != sizeof(struct arpt_getinfo)) {
77593 + duprintf("length %u != %Zu\n", len,
77594 sizeof(struct arpt_getinfo));
77595 return -EINVAL;
77596 }
77597 @@ -923,7 +923,7 @@ static int get_info(struct net *net, void __user *user,
77598 info.size = private->size;
77599 strcpy(info.name, name);
77600
77601 - if (copy_to_user(user, &info, *len) != 0)
77602 + if (copy_to_user(user, &info, len) != 0)
77603 ret = -EFAULT;
77604 else
77605 ret = 0;
77606 @@ -1682,7 +1682,7 @@ static int compat_do_arpt_get_ctl(struct sock *sk, int cmd, void __user *user,
77607
77608 switch (cmd) {
77609 case ARPT_SO_GET_INFO:
77610 - ret = get_info(sock_net(sk), user, len, 1);
77611 + ret = get_info(sock_net(sk), user, *len, 1);
77612 break;
77613 case ARPT_SO_GET_ENTRIES:
77614 ret = compat_get_entries(sock_net(sk), user, len);
77615 @@ -1727,7 +1727,7 @@ static int do_arpt_get_ctl(struct sock *sk, int cmd, void __user *user, int *len
77616
77617 switch (cmd) {
77618 case ARPT_SO_GET_INFO:
77619 - ret = get_info(sock_net(sk), user, len, 0);
77620 + ret = get_info(sock_net(sk), user, *len, 0);
77621 break;
77622
77623 case ARPT_SO_GET_ENTRIES:
77624 diff --git a/net/ipv4/netfilter/ip_tables.c b/net/ipv4/netfilter/ip_tables.c
77625 index 170b1fd..6105b91 100644
77626 --- a/net/ipv4/netfilter/ip_tables.c
77627 +++ b/net/ipv4/netfilter/ip_tables.c
77628 @@ -1068,14 +1068,14 @@ static int compat_table_info(const struct xt_table_info *info,
77629 #endif
77630
77631 static int get_info(struct net *net, void __user *user,
77632 - const int *len, int compat)
77633 + int len, int compat)
77634 {
77635 char name[XT_TABLE_MAXNAMELEN];
77636 struct xt_table *t;
77637 int ret;
77638
77639 - if (*len != sizeof(struct ipt_getinfo)) {
77640 - duprintf("length %u != %zu\n", *len,
77641 + if (len != sizeof(struct ipt_getinfo)) {
77642 + duprintf("length %u != %zu\n", len,
77643 sizeof(struct ipt_getinfo));
77644 return -EINVAL;
77645 }
77646 @@ -1112,7 +1112,7 @@ static int get_info(struct net *net, void __user *user,
77647 info.size = private->size;
77648 strcpy(info.name, name);
77649
77650 - if (copy_to_user(user, &info, *len) != 0)
77651 + if (copy_to_user(user, &info, len) != 0)
77652 ret = -EFAULT;
77653 else
77654 ret = 0;
77655 @@ -1966,7 +1966,7 @@ compat_do_ipt_get_ctl(struct sock *sk, int cmd, void __user *user, int *len)
77656
77657 switch (cmd) {
77658 case IPT_SO_GET_INFO:
77659 - ret = get_info(sock_net(sk), user, len, 1);
77660 + ret = get_info(sock_net(sk), user, *len, 1);
77661 break;
77662 case IPT_SO_GET_ENTRIES:
77663 ret = compat_get_entries(sock_net(sk), user, len);
77664 @@ -2013,7 +2013,7 @@ do_ipt_get_ctl(struct sock *sk, int cmd, void __user *user, int *len)
77665
77666 switch (cmd) {
77667 case IPT_SO_GET_INFO:
77668 - ret = get_info(sock_net(sk), user, len, 0);
77669 + ret = get_info(sock_net(sk), user, *len, 0);
77670 break;
77671
77672 case IPT_SO_GET_ENTRIES:
77673 diff --git a/net/ipv4/ping.c b/net/ipv4/ping.c
77674 index 6232d47..6b88607 100644
77675 --- a/net/ipv4/ping.c
77676 +++ b/net/ipv4/ping.c
77677 @@ -847,7 +847,7 @@ static void ping_format_sock(struct sock *sp, struct seq_file *f,
77678 sk_rmem_alloc_get(sp),
77679 0, 0L, 0, sock_i_uid(sp), 0, sock_i_ino(sp),
77680 atomic_read(&sp->sk_refcnt), sp,
77681 - atomic_read(&sp->sk_drops), len);
77682 + atomic_read_unchecked(&sp->sk_drops), len);
77683 }
77684
77685 static int ping_seq_show(struct seq_file *seq, void *v)
77686 diff --git a/net/ipv4/raw.c b/net/ipv4/raw.c
77687 index d23c657..cb69cc2 100644
77688 --- a/net/ipv4/raw.c
77689 +++ b/net/ipv4/raw.c
77690 @@ -311,7 +311,7 @@ static int raw_rcv_skb(struct sock *sk, struct sk_buff *skb)
77691 int raw_rcv(struct sock *sk, struct sk_buff *skb)
77692 {
77693 if (!xfrm4_policy_check(sk, XFRM_POLICY_IN, skb)) {
77694 - atomic_inc(&sk->sk_drops);
77695 + atomic_inc_unchecked(&sk->sk_drops);
77696 kfree_skb(skb);
77697 return NET_RX_DROP;
77698 }
77699 @@ -747,16 +747,20 @@ static int raw_init(struct sock *sk)
77700
77701 static int raw_seticmpfilter(struct sock *sk, char __user *optval, int optlen)
77702 {
77703 + struct icmp_filter filter;
77704 +
77705 if (optlen > sizeof(struct icmp_filter))
77706 optlen = sizeof(struct icmp_filter);
77707 - if (copy_from_user(&raw_sk(sk)->filter, optval, optlen))
77708 + if (copy_from_user(&filter, optval, optlen))
77709 return -EFAULT;
77710 + raw_sk(sk)->filter = filter;
77711 return 0;
77712 }
77713
77714 static int raw_geticmpfilter(struct sock *sk, char __user *optval, int __user *optlen)
77715 {
77716 int len, ret = -EFAULT;
77717 + struct icmp_filter filter;
77718
77719 if (get_user(len, optlen))
77720 goto out;
77721 @@ -766,8 +770,8 @@ static int raw_geticmpfilter(struct sock *sk, char __user *optval, int __user *o
77722 if (len > sizeof(struct icmp_filter))
77723 len = sizeof(struct icmp_filter);
77724 ret = -EFAULT;
77725 - if (put_user(len, optlen) ||
77726 - copy_to_user(optval, &raw_sk(sk)->filter, len))
77727 + filter = raw_sk(sk)->filter;
77728 + if (put_user(len, optlen) || len > sizeof filter || copy_to_user(optval, &filter, len))
77729 goto out;
77730 ret = 0;
77731 out: return ret;
77732 @@ -995,7 +999,13 @@ static void raw_sock_seq_show(struct seq_file *seq, struct sock *sp, int i)
77733 sk_wmem_alloc_get(sp),
77734 sk_rmem_alloc_get(sp),
77735 0, 0L, 0, sock_i_uid(sp), 0, sock_i_ino(sp),
77736 - atomic_read(&sp->sk_refcnt), sp, atomic_read(&sp->sk_drops));
77737 + atomic_read(&sp->sk_refcnt),
77738 +#ifdef CONFIG_GRKERNSEC_HIDESYM
77739 + NULL,
77740 +#else
77741 + sp,
77742 +#endif
77743 + atomic_read_unchecked(&sp->sk_drops));
77744 }
77745
77746 static int raw_seq_show(struct seq_file *seq, void *v)
77747 diff --git a/net/ipv4/route.c b/net/ipv4/route.c
77748 index c017cb1..9eb15b7d 100644
77749 --- a/net/ipv4/route.c
77750 +++ b/net/ipv4/route.c
77751 @@ -2526,7 +2526,7 @@ static __net_initdata struct pernet_operations sysctl_route_ops = {
77752
77753 static __net_init int rt_genid_init(struct net *net)
77754 {
77755 - atomic_set(&net->rt_genid, 0);
77756 + atomic_set_unchecked(&net->rt_genid, 0);
77757 get_random_bytes(&net->ipv4.dev_addr_genid,
77758 sizeof(net->ipv4.dev_addr_genid));
77759 return 0;
77760 diff --git a/net/ipv4/tcp_input.c b/net/ipv4/tcp_input.c
77761 index c92c4da..f19e3ec 100644
77762 --- a/net/ipv4/tcp_input.c
77763 +++ b/net/ipv4/tcp_input.c
77764 @@ -4731,7 +4731,7 @@ static struct sk_buff *tcp_collapse_one(struct sock *sk, struct sk_buff *skb,
77765 * simplifies code)
77766 */
77767 static void
77768 -tcp_collapse(struct sock *sk, struct sk_buff_head *list,
77769 +__intentional_overflow(5,6) tcp_collapse(struct sock *sk, struct sk_buff_head *list,
77770 struct sk_buff *head, struct sk_buff *tail,
77771 u32 start, u32 end)
77772 {
77773 diff --git a/net/ipv4/tcp_ipv4.c b/net/ipv4/tcp_ipv4.c
77774 index db7bfad..bfea796 100644
77775 --- a/net/ipv4/tcp_ipv4.c
77776 +++ b/net/ipv4/tcp_ipv4.c
77777 @@ -90,6 +90,10 @@ int sysctl_tcp_low_latency __read_mostly;
77778 EXPORT_SYMBOL(sysctl_tcp_low_latency);
77779
77780
77781 +#ifdef CONFIG_GRKERNSEC_BLACKHOLE
77782 +extern int grsec_enable_blackhole;
77783 +#endif
77784 +
77785 #ifdef CONFIG_TCP_MD5SIG
77786 static int tcp_v4_md5_hash_hdr(char *md5_hash, const struct tcp_md5sig_key *key,
77787 __be32 daddr, __be32 saddr, const struct tcphdr *th);
77788 @@ -1664,6 +1668,9 @@ int tcp_v4_do_rcv(struct sock *sk, struct sk_buff *skb)
77789 return 0;
77790
77791 reset:
77792 +#ifdef CONFIG_GRKERNSEC_BLACKHOLE
77793 + if (!grsec_enable_blackhole)
77794 +#endif
77795 tcp_v4_send_reset(rsk, skb);
77796 discard:
77797 kfree_skb(skb);
77798 @@ -1764,12 +1771,19 @@ int tcp_v4_rcv(struct sk_buff *skb)
77799 TCP_SKB_CB(skb)->sacked = 0;
77800
77801 sk = __inet_lookup_skb(&tcp_hashinfo, skb, th->source, th->dest);
77802 - if (!sk)
77803 + if (!sk) {
77804 +#ifdef CONFIG_GRKERNSEC_BLACKHOLE
77805 + ret = 1;
77806 +#endif
77807 goto no_tcp_socket;
77808 -
77809 + }
77810 process:
77811 - if (sk->sk_state == TCP_TIME_WAIT)
77812 + if (sk->sk_state == TCP_TIME_WAIT) {
77813 +#ifdef CONFIG_GRKERNSEC_BLACKHOLE
77814 + ret = 2;
77815 +#endif
77816 goto do_time_wait;
77817 + }
77818
77819 if (unlikely(iph->ttl < inet_sk(sk)->min_ttl)) {
77820 NET_INC_STATS_BH(net, LINUX_MIB_TCPMINTTLDROP);
77821 @@ -1820,6 +1834,10 @@ no_tcp_socket:
77822 bad_packet:
77823 TCP_INC_STATS_BH(net, TCP_MIB_INERRS);
77824 } else {
77825 +#ifdef CONFIG_GRKERNSEC_BLACKHOLE
77826 + if (!grsec_enable_blackhole || (ret == 1 &&
77827 + (skb->dev->flags & IFF_LOOPBACK)))
77828 +#endif
77829 tcp_v4_send_reset(NULL, skb);
77830 }
77831
77832 @@ -2415,7 +2433,11 @@ static void get_openreq4(const struct sock *sk, const struct request_sock *req,
77833 0, /* non standard timer */
77834 0, /* open_requests have no inode */
77835 atomic_read(&sk->sk_refcnt),
77836 +#ifdef CONFIG_GRKERNSEC_HIDESYM
77837 + NULL,
77838 +#else
77839 req,
77840 +#endif
77841 len);
77842 }
77843
77844 @@ -2465,7 +2487,12 @@ static void get_tcp4_sock(struct sock *sk, struct seq_file *f, int i, int *len)
77845 sock_i_uid(sk),
77846 icsk->icsk_probes_out,
77847 sock_i_ino(sk),
77848 - atomic_read(&sk->sk_refcnt), sk,
77849 + atomic_read(&sk->sk_refcnt),
77850 +#ifdef CONFIG_GRKERNSEC_HIDESYM
77851 + NULL,
77852 +#else
77853 + sk,
77854 +#endif
77855 jiffies_to_clock_t(icsk->icsk_rto),
77856 jiffies_to_clock_t(icsk->icsk_ack.ato),
77857 (icsk->icsk_ack.quick << 1) | icsk->icsk_ack.pingpong,
77858 @@ -2493,7 +2520,13 @@ static void get_timewait4_sock(const struct inet_timewait_sock *tw,
77859 " %02X %08X:%08X %02X:%08lX %08X %5d %8d %d %d %pK%n",
77860 i, src, srcp, dest, destp, tw->tw_substate, 0, 0,
77861 3, jiffies_to_clock_t(ttd), 0, 0, 0, 0,
77862 - atomic_read(&tw->tw_refcnt), tw, len);
77863 + atomic_read(&tw->tw_refcnt),
77864 +#ifdef CONFIG_GRKERNSEC_HIDESYM
77865 + NULL,
77866 +#else
77867 + tw,
77868 +#endif
77869 + len);
77870 }
77871
77872 #define TMPSZ 150
77873 diff --git a/net/ipv4/tcp_minisocks.c b/net/ipv4/tcp_minisocks.c
77874 index 6ff7f10..38de56e 100644
77875 --- a/net/ipv4/tcp_minisocks.c
77876 +++ b/net/ipv4/tcp_minisocks.c
77877 @@ -27,6 +27,10 @@
77878 #include <net/inet_common.h>
77879 #include <net/xfrm.h>
77880
77881 +#ifdef CONFIG_GRKERNSEC_BLACKHOLE
77882 +extern int grsec_enable_blackhole;
77883 +#endif
77884 +
77885 int sysctl_tcp_syncookies __read_mostly = 1;
77886 EXPORT_SYMBOL(sysctl_tcp_syncookies);
77887
77888 @@ -707,6 +711,10 @@ listen_overflow:
77889
77890 embryonic_reset:
77891 NET_INC_STATS_BH(sock_net(sk), LINUX_MIB_EMBRYONICRSTS);
77892 +
77893 +#ifdef CONFIG_GRKERNSEC_BLACKHOLE
77894 + if (!grsec_enable_blackhole)
77895 +#endif
77896 if (!(flg & TCP_FLAG_RST))
77897 req->rsk_ops->send_reset(sk, skb);
77898
77899 diff --git a/net/ipv4/tcp_probe.c b/net/ipv4/tcp_probe.c
77900 index 4526fe6..1a34e43 100644
77901 --- a/net/ipv4/tcp_probe.c
77902 +++ b/net/ipv4/tcp_probe.c
77903 @@ -204,7 +204,7 @@ static ssize_t tcpprobe_read(struct file *file, char __user *buf,
77904 if (cnt + width >= len)
77905 break;
77906
77907 - if (copy_to_user(buf + cnt, tbuf, width))
77908 + if (width > sizeof tbuf || copy_to_user(buf + cnt, tbuf, width))
77909 return -EFAULT;
77910 cnt += width;
77911 }
77912 diff --git a/net/ipv4/tcp_timer.c b/net/ipv4/tcp_timer.c
77913 index b774a03..3873efe 100644
77914 --- a/net/ipv4/tcp_timer.c
77915 +++ b/net/ipv4/tcp_timer.c
77916 @@ -22,6 +22,10 @@
77917 #include <linux/gfp.h>
77918 #include <net/tcp.h>
77919
77920 +#ifdef CONFIG_GRKERNSEC_BLACKHOLE
77921 +extern int grsec_lastack_retries;
77922 +#endif
77923 +
77924 int sysctl_tcp_syn_retries __read_mostly = TCP_SYN_RETRIES;
77925 int sysctl_tcp_synack_retries __read_mostly = TCP_SYNACK_RETRIES;
77926 int sysctl_tcp_keepalive_time __read_mostly = TCP_KEEPALIVE_TIME;
77927 @@ -185,6 +189,13 @@ static int tcp_write_timeout(struct sock *sk)
77928 }
77929 }
77930
77931 +#ifdef CONFIG_GRKERNSEC_BLACKHOLE
77932 + if ((sk->sk_state == TCP_LAST_ACK) &&
77933 + (grsec_lastack_retries > 0) &&
77934 + (grsec_lastack_retries < retry_until))
77935 + retry_until = grsec_lastack_retries;
77936 +#endif
77937 +
77938 if (retransmits_timed_out(sk, retry_until,
77939 syn_set ? 0 : icsk->icsk_user_timeout, syn_set)) {
77940 /* Has it gone just too far? */
77941 diff --git a/net/ipv4/udp.c b/net/ipv4/udp.c
77942 index 2814f66..fa2b223 100644
77943 --- a/net/ipv4/udp.c
77944 +++ b/net/ipv4/udp.c
77945 @@ -87,6 +87,7 @@
77946 #include <linux/types.h>
77947 #include <linux/fcntl.h>
77948 #include <linux/module.h>
77949 +#include <linux/security.h>
77950 #include <linux/socket.h>
77951 #include <linux/sockios.h>
77952 #include <linux/igmp.h>
77953 @@ -111,6 +112,10 @@
77954 #include <trace/events/skb.h>
77955 #include "udp_impl.h"
77956
77957 +#ifdef CONFIG_GRKERNSEC_BLACKHOLE
77958 +extern int grsec_enable_blackhole;
77959 +#endif
77960 +
77961 struct udp_table udp_table __read_mostly;
77962 EXPORT_SYMBOL(udp_table);
77963
77964 @@ -569,6 +574,9 @@ found:
77965 return s;
77966 }
77967
77968 +extern int gr_search_udp_recvmsg(struct sock *sk, const struct sk_buff *skb);
77969 +extern int gr_search_udp_sendmsg(struct sock *sk, struct sockaddr_in *addr);
77970 +
77971 /*
77972 * This routine is called by the ICMP module when it gets some
77973 * sort of error condition. If err < 0 then the socket should
77974 @@ -864,9 +872,18 @@ int udp_sendmsg(struct kiocb *iocb, struct sock *sk, struct msghdr *msg,
77975 dport = usin->sin_port;
77976 if (dport == 0)
77977 return -EINVAL;
77978 +
77979 + err = gr_search_udp_sendmsg(sk, usin);
77980 + if (err)
77981 + return err;
77982 } else {
77983 if (sk->sk_state != TCP_ESTABLISHED)
77984 return -EDESTADDRREQ;
77985 +
77986 + err = gr_search_udp_sendmsg(sk, NULL);
77987 + if (err)
77988 + return err;
77989 +
77990 daddr = inet->inet_daddr;
77991 dport = inet->inet_dport;
77992 /* Open fast path for connected socket.
77993 @@ -1108,7 +1125,7 @@ static unsigned int first_packet_length(struct sock *sk)
77994 udp_lib_checksum_complete(skb)) {
77995 UDP_INC_STATS_BH(sock_net(sk), UDP_MIB_INERRORS,
77996 IS_UDPLITE(sk));
77997 - atomic_inc(&sk->sk_drops);
77998 + atomic_inc_unchecked(&sk->sk_drops);
77999 __skb_unlink(skb, rcvq);
78000 __skb_queue_tail(&list_kill, skb);
78001 }
78002 @@ -1194,6 +1211,10 @@ try_again:
78003 if (!skb)
78004 goto out;
78005
78006 + err = gr_search_udp_recvmsg(sk, skb);
78007 + if (err)
78008 + goto out_free;
78009 +
78010 ulen = skb->len - sizeof(struct udphdr);
78011 copied = len;
78012 if (copied > ulen)
78013 @@ -1227,7 +1248,7 @@ try_again:
78014 if (unlikely(err)) {
78015 trace_kfree_skb(skb, udp_recvmsg);
78016 if (!peeked) {
78017 - atomic_inc(&sk->sk_drops);
78018 + atomic_inc_unchecked(&sk->sk_drops);
78019 UDP_INC_STATS_USER(sock_net(sk),
78020 UDP_MIB_INERRORS, is_udplite);
78021 }
78022 @@ -1510,7 +1531,7 @@ int udp_queue_rcv_skb(struct sock *sk, struct sk_buff *skb)
78023
78024 drop:
78025 UDP_INC_STATS_BH(sock_net(sk), UDP_MIB_INERRORS, is_udplite);
78026 - atomic_inc(&sk->sk_drops);
78027 + atomic_inc_unchecked(&sk->sk_drops);
78028 kfree_skb(skb);
78029 return -1;
78030 }
78031 @@ -1529,7 +1550,7 @@ static void flush_stack(struct sock **stack, unsigned int count,
78032 skb1 = (i == final) ? skb : skb_clone(skb, GFP_ATOMIC);
78033
78034 if (!skb1) {
78035 - atomic_inc(&sk->sk_drops);
78036 + atomic_inc_unchecked(&sk->sk_drops);
78037 UDP_INC_STATS_BH(sock_net(sk), UDP_MIB_RCVBUFERRORS,
78038 IS_UDPLITE(sk));
78039 UDP_INC_STATS_BH(sock_net(sk), UDP_MIB_INERRORS,
78040 @@ -1698,6 +1719,9 @@ int __udp4_lib_rcv(struct sk_buff *skb, struct udp_table *udptable,
78041 goto csum_error;
78042
78043 UDP_INC_STATS_BH(net, UDP_MIB_NOPORTS, proto == IPPROTO_UDPLITE);
78044 +#ifdef CONFIG_GRKERNSEC_BLACKHOLE
78045 + if (!grsec_enable_blackhole || (skb->dev->flags & IFF_LOOPBACK))
78046 +#endif
78047 icmp_send(skb, ICMP_DEST_UNREACH, ICMP_PORT_UNREACH, 0);
78048
78049 /*
78050 @@ -2116,8 +2140,13 @@ static void udp4_format_sock(struct sock *sp, struct seq_file *f,
78051 sk_wmem_alloc_get(sp),
78052 sk_rmem_alloc_get(sp),
78053 0, 0L, 0, sock_i_uid(sp), 0, sock_i_ino(sp),
78054 - atomic_read(&sp->sk_refcnt), sp,
78055 - atomic_read(&sp->sk_drops), len);
78056 + atomic_read(&sp->sk_refcnt),
78057 +#ifdef CONFIG_GRKERNSEC_HIDESYM
78058 + NULL,
78059 +#else
78060 + sp,
78061 +#endif
78062 + atomic_read_unchecked(&sp->sk_drops), len);
78063 }
78064
78065 int udp4_seq_show(struct seq_file *seq, void *v)
78066 diff --git a/net/ipv6/addrconf.c b/net/ipv6/addrconf.c
78067 index b10374d..0baa1f9 100644
78068 --- a/net/ipv6/addrconf.c
78069 +++ b/net/ipv6/addrconf.c
78070 @@ -2144,7 +2144,7 @@ int addrconf_set_dstaddr(struct net *net, void __user *arg)
78071 p.iph.ihl = 5;
78072 p.iph.protocol = IPPROTO_IPV6;
78073 p.iph.ttl = 64;
78074 - ifr.ifr_ifru.ifru_data = (__force void __user *)&p;
78075 + ifr.ifr_ifru.ifru_data = (void __force_user *)&p;
78076
78077 if (ops->ndo_do_ioctl) {
78078 mm_segment_t oldfs = get_fs();
78079 diff --git a/net/ipv6/ipv6_sockglue.c b/net/ipv6/ipv6_sockglue.c
78080 index e02faed..9780f28 100644
78081 --- a/net/ipv6/ipv6_sockglue.c
78082 +++ b/net/ipv6/ipv6_sockglue.c
78083 @@ -990,7 +990,7 @@ static int do_ipv6_getsockopt(struct sock *sk, int level, int optname,
78084 if (sk->sk_type != SOCK_STREAM)
78085 return -ENOPROTOOPT;
78086
78087 - msg.msg_control = optval;
78088 + msg.msg_control = (void __force_kernel *)optval;
78089 msg.msg_controllen = len;
78090 msg.msg_flags = flags;
78091
78092 diff --git a/net/ipv6/netfilter/ip6_tables.c b/net/ipv6/netfilter/ip6_tables.c
78093 index d7cb045..8c0ded6 100644
78094 --- a/net/ipv6/netfilter/ip6_tables.c
78095 +++ b/net/ipv6/netfilter/ip6_tables.c
78096 @@ -1078,14 +1078,14 @@ static int compat_table_info(const struct xt_table_info *info,
78097 #endif
78098
78099 static int get_info(struct net *net, void __user *user,
78100 - const int *len, int compat)
78101 + int len, int compat)
78102 {
78103 char name[XT_TABLE_MAXNAMELEN];
78104 struct xt_table *t;
78105 int ret;
78106
78107 - if (*len != sizeof(struct ip6t_getinfo)) {
78108 - duprintf("length %u != %zu\n", *len,
78109 + if (len != sizeof(struct ip6t_getinfo)) {
78110 + duprintf("length %u != %zu\n", len,
78111 sizeof(struct ip6t_getinfo));
78112 return -EINVAL;
78113 }
78114 @@ -1122,7 +1122,7 @@ static int get_info(struct net *net, void __user *user,
78115 info.size = private->size;
78116 strcpy(info.name, name);
78117
78118 - if (copy_to_user(user, &info, *len) != 0)
78119 + if (copy_to_user(user, &info, len) != 0)
78120 ret = -EFAULT;
78121 else
78122 ret = 0;
78123 @@ -1976,7 +1976,7 @@ compat_do_ip6t_get_ctl(struct sock *sk, int cmd, void __user *user, int *len)
78124
78125 switch (cmd) {
78126 case IP6T_SO_GET_INFO:
78127 - ret = get_info(sock_net(sk), user, len, 1);
78128 + ret = get_info(sock_net(sk), user, *len, 1);
78129 break;
78130 case IP6T_SO_GET_ENTRIES:
78131 ret = compat_get_entries(sock_net(sk), user, len);
78132 @@ -2023,7 +2023,7 @@ do_ip6t_get_ctl(struct sock *sk, int cmd, void __user *user, int *len)
78133
78134 switch (cmd) {
78135 case IP6T_SO_GET_INFO:
78136 - ret = get_info(sock_net(sk), user, len, 0);
78137 + ret = get_info(sock_net(sk), user, *len, 0);
78138 break;
78139
78140 case IP6T_SO_GET_ENTRIES:
78141 diff --git a/net/ipv6/raw.c b/net/ipv6/raw.c
78142 index 4a5f78b..3f22ebe 100644
78143 --- a/net/ipv6/raw.c
78144 +++ b/net/ipv6/raw.c
78145 @@ -379,7 +379,7 @@ static inline int rawv6_rcv_skb(struct sock *sk, struct sk_buff *skb)
78146 {
78147 if ((raw6_sk(sk)->checksum || rcu_access_pointer(sk->sk_filter)) &&
78148 skb_checksum_complete(skb)) {
78149 - atomic_inc(&sk->sk_drops);
78150 + atomic_inc_unchecked(&sk->sk_drops);
78151 kfree_skb(skb);
78152 return NET_RX_DROP;
78153 }
78154 @@ -407,7 +407,7 @@ int rawv6_rcv(struct sock *sk, struct sk_buff *skb)
78155 struct raw6_sock *rp = raw6_sk(sk);
78156
78157 if (!xfrm6_policy_check(sk, XFRM_POLICY_IN, skb)) {
78158 - atomic_inc(&sk->sk_drops);
78159 + atomic_inc_unchecked(&sk->sk_drops);
78160 kfree_skb(skb);
78161 return NET_RX_DROP;
78162 }
78163 @@ -431,7 +431,7 @@ int rawv6_rcv(struct sock *sk, struct sk_buff *skb)
78164
78165 if (inet->hdrincl) {
78166 if (skb_checksum_complete(skb)) {
78167 - atomic_inc(&sk->sk_drops);
78168 + atomic_inc_unchecked(&sk->sk_drops);
78169 kfree_skb(skb);
78170 return NET_RX_DROP;
78171 }
78172 @@ -604,7 +604,7 @@ out:
78173 return err;
78174 }
78175
78176 -static int rawv6_send_hdrinc(struct sock *sk, void *from, int length,
78177 +static int rawv6_send_hdrinc(struct sock *sk, void *from, unsigned int length,
78178 struct flowi6 *fl6, struct dst_entry **dstp,
78179 unsigned int flags)
78180 {
78181 @@ -916,12 +916,15 @@ do_confirm:
78182 static int rawv6_seticmpfilter(struct sock *sk, int level, int optname,
78183 char __user *optval, int optlen)
78184 {
78185 + struct icmp6_filter filter;
78186 +
78187 switch (optname) {
78188 case ICMPV6_FILTER:
78189 if (optlen > sizeof(struct icmp6_filter))
78190 optlen = sizeof(struct icmp6_filter);
78191 - if (copy_from_user(&raw6_sk(sk)->filter, optval, optlen))
78192 + if (copy_from_user(&filter, optval, optlen))
78193 return -EFAULT;
78194 + raw6_sk(sk)->filter = filter;
78195 return 0;
78196 default:
78197 return -ENOPROTOOPT;
78198 @@ -934,6 +937,7 @@ static int rawv6_geticmpfilter(struct sock *sk, int level, int optname,
78199 char __user *optval, int __user *optlen)
78200 {
78201 int len;
78202 + struct icmp6_filter filter;
78203
78204 switch (optname) {
78205 case ICMPV6_FILTER:
78206 @@ -945,7 +949,8 @@ static int rawv6_geticmpfilter(struct sock *sk, int level, int optname,
78207 len = sizeof(struct icmp6_filter);
78208 if (put_user(len, optlen))
78209 return -EFAULT;
78210 - if (copy_to_user(optval, &raw6_sk(sk)->filter, len))
78211 + filter = raw6_sk(sk)->filter;
78212 + if (len > sizeof filter || copy_to_user(optval, &filter, len))
78213 return -EFAULT;
78214 return 0;
78215 default:
78216 @@ -1252,7 +1257,13 @@ static void raw6_sock_seq_show(struct seq_file *seq, struct sock *sp, int i)
78217 0, 0L, 0,
78218 sock_i_uid(sp), 0,
78219 sock_i_ino(sp),
78220 - atomic_read(&sp->sk_refcnt), sp, atomic_read(&sp->sk_drops));
78221 + atomic_read(&sp->sk_refcnt),
78222 +#ifdef CONFIG_GRKERNSEC_HIDESYM
78223 + NULL,
78224 +#else
78225 + sp,
78226 +#endif
78227 + atomic_read_unchecked(&sp->sk_drops));
78228 }
78229
78230 static int raw6_seq_show(struct seq_file *seq, void *v)
78231 diff --git a/net/ipv6/tcp_ipv6.c b/net/ipv6/tcp_ipv6.c
78232 index 7e32d42..5d975ba 100644
78233 --- a/net/ipv6/tcp_ipv6.c
78234 +++ b/net/ipv6/tcp_ipv6.c
78235 @@ -106,6 +106,10 @@ static void inet6_sk_rx_dst_set(struct sock *sk, const struct sk_buff *skb)
78236 inet6_sk(sk)->rx_dst_cookie = rt->rt6i_node->fn_sernum;
78237 }
78238
78239 +#ifdef CONFIG_GRKERNSEC_BLACKHOLE
78240 +extern int grsec_enable_blackhole;
78241 +#endif
78242 +
78243 static void tcp_v6_hash(struct sock *sk)
78244 {
78245 if (sk->sk_state != TCP_CLOSE) {
78246 @@ -1511,6 +1515,9 @@ static int tcp_v6_do_rcv(struct sock *sk, struct sk_buff *skb)
78247 return 0;
78248
78249 reset:
78250 +#ifdef CONFIG_GRKERNSEC_BLACKHOLE
78251 + if (!grsec_enable_blackhole)
78252 +#endif
78253 tcp_v6_send_reset(sk, skb);
78254 discard:
78255 if (opt_skb)
78256 @@ -1592,12 +1599,20 @@ static int tcp_v6_rcv(struct sk_buff *skb)
78257 TCP_SKB_CB(skb)->sacked = 0;
78258
78259 sk = __inet6_lookup_skb(&tcp_hashinfo, skb, th->source, th->dest);
78260 - if (!sk)
78261 + if (!sk) {
78262 +#ifdef CONFIG_GRKERNSEC_BLACKHOLE
78263 + ret = 1;
78264 +#endif
78265 goto no_tcp_socket;
78266 + }
78267
78268 process:
78269 - if (sk->sk_state == TCP_TIME_WAIT)
78270 + if (sk->sk_state == TCP_TIME_WAIT) {
78271 +#ifdef CONFIG_GRKERNSEC_BLACKHOLE
78272 + ret = 2;
78273 +#endif
78274 goto do_time_wait;
78275 + }
78276
78277 if (hdr->hop_limit < inet6_sk(sk)->min_hopcount) {
78278 NET_INC_STATS_BH(net, LINUX_MIB_TCPMINTTLDROP);
78279 @@ -1646,6 +1661,10 @@ no_tcp_socket:
78280 bad_packet:
78281 TCP_INC_STATS_BH(net, TCP_MIB_INERRS);
78282 } else {
78283 +#ifdef CONFIG_GRKERNSEC_BLACKHOLE
78284 + if (!grsec_enable_blackhole || (ret == 1 &&
78285 + (skb->dev->flags & IFF_LOOPBACK)))
78286 +#endif
78287 tcp_v6_send_reset(NULL, skb);
78288 }
78289
78290 @@ -1857,7 +1876,13 @@ static void get_openreq6(struct seq_file *seq,
78291 uid,
78292 0, /* non standard timer */
78293 0, /* open_requests have no inode */
78294 - 0, req);
78295 + 0,
78296 +#ifdef CONFIG_GRKERNSEC_HIDESYM
78297 + NULL
78298 +#else
78299 + req
78300 +#endif
78301 + );
78302 }
78303
78304 static void get_tcp6_sock(struct seq_file *seq, struct sock *sp, int i)
78305 @@ -1907,7 +1932,12 @@ static void get_tcp6_sock(struct seq_file *seq, struct sock *sp, int i)
78306 sock_i_uid(sp),
78307 icsk->icsk_probes_out,
78308 sock_i_ino(sp),
78309 - atomic_read(&sp->sk_refcnt), sp,
78310 + atomic_read(&sp->sk_refcnt),
78311 +#ifdef CONFIG_GRKERNSEC_HIDESYM
78312 + NULL,
78313 +#else
78314 + sp,
78315 +#endif
78316 jiffies_to_clock_t(icsk->icsk_rto),
78317 jiffies_to_clock_t(icsk->icsk_ack.ato),
78318 (icsk->icsk_ack.quick << 1 ) | icsk->icsk_ack.pingpong,
78319 @@ -1942,7 +1972,13 @@ static void get_timewait6_sock(struct seq_file *seq,
78320 dest->s6_addr32[2], dest->s6_addr32[3], destp,
78321 tw->tw_substate, 0, 0,
78322 3, jiffies_to_clock_t(ttd), 0, 0, 0, 0,
78323 - atomic_read(&tw->tw_refcnt), tw);
78324 + atomic_read(&tw->tw_refcnt),
78325 +#ifdef CONFIG_GRKERNSEC_HIDESYM
78326 + NULL
78327 +#else
78328 + tw
78329 +#endif
78330 + );
78331 }
78332
78333 static int tcp6_seq_show(struct seq_file *seq, void *v)
78334 diff --git a/net/ipv6/udp.c b/net/ipv6/udp.c
78335 index 07e2bfe..328dae8 100644
78336 --- a/net/ipv6/udp.c
78337 +++ b/net/ipv6/udp.c
78338 @@ -51,6 +51,10 @@
78339 #include <trace/events/skb.h>
78340 #include "udp_impl.h"
78341
78342 +#ifdef CONFIG_GRKERNSEC_BLACKHOLE
78343 +extern int grsec_enable_blackhole;
78344 +#endif
78345 +
78346 int ipv6_rcv_saddr_equal(const struct sock *sk, const struct sock *sk2)
78347 {
78348 const struct in6_addr *sk_rcv_saddr6 = &inet6_sk(sk)->rcv_saddr;
78349 @@ -395,7 +399,7 @@ try_again:
78350 if (unlikely(err)) {
78351 trace_kfree_skb(skb, udpv6_recvmsg);
78352 if (!peeked) {
78353 - atomic_inc(&sk->sk_drops);
78354 + atomic_inc_unchecked(&sk->sk_drops);
78355 if (is_udp4)
78356 UDP_INC_STATS_USER(sock_net(sk),
78357 UDP_MIB_INERRORS,
78358 @@ -633,7 +637,7 @@ int udpv6_queue_rcv_skb(struct sock *sk, struct sk_buff *skb)
78359 return rc;
78360 drop:
78361 UDP6_INC_STATS_BH(sock_net(sk), UDP_MIB_INERRORS, is_udplite);
78362 - atomic_inc(&sk->sk_drops);
78363 + atomic_inc_unchecked(&sk->sk_drops);
78364 kfree_skb(skb);
78365 return -1;
78366 }
78367 @@ -691,7 +695,7 @@ static void flush_stack(struct sock **stack, unsigned int count,
78368 if (likely(skb1 == NULL))
78369 skb1 = (i == final) ? skb : skb_clone(skb, GFP_ATOMIC);
78370 if (!skb1) {
78371 - atomic_inc(&sk->sk_drops);
78372 + atomic_inc_unchecked(&sk->sk_drops);
78373 UDP6_INC_STATS_BH(sock_net(sk), UDP_MIB_RCVBUFERRORS,
78374 IS_UDPLITE(sk));
78375 UDP6_INC_STATS_BH(sock_net(sk), UDP_MIB_INERRORS,
78376 @@ -862,6 +866,9 @@ int __udp6_lib_rcv(struct sk_buff *skb, struct udp_table *udptable,
78377 goto discard;
78378
78379 UDP6_INC_STATS_BH(net, UDP_MIB_NOPORTS, proto == IPPROTO_UDPLITE);
78380 +#ifdef CONFIG_GRKERNSEC_BLACKHOLE
78381 + if (!grsec_enable_blackhole || (skb->dev->flags & IFF_LOOPBACK))
78382 +#endif
78383 icmpv6_send(skb, ICMPV6_DEST_UNREACH, ICMPV6_PORT_UNREACH, 0);
78384
78385 kfree_skb(skb);
78386 @@ -1471,8 +1478,13 @@ static void udp6_sock_seq_show(struct seq_file *seq, struct sock *sp, int bucket
78387 0, 0L, 0,
78388 sock_i_uid(sp), 0,
78389 sock_i_ino(sp),
78390 - atomic_read(&sp->sk_refcnt), sp,
78391 - atomic_read(&sp->sk_drops));
78392 + atomic_read(&sp->sk_refcnt),
78393 +#ifdef CONFIG_GRKERNSEC_HIDESYM
78394 + NULL,
78395 +#else
78396 + sp,
78397 +#endif
78398 + atomic_read_unchecked(&sp->sk_drops));
78399 }
78400
78401 int udp6_seq_show(struct seq_file *seq, void *v)
78402 diff --git a/net/irda/ircomm/ircomm_tty.c b/net/irda/ircomm/ircomm_tty.c
78403 index 6b9d5a0..4dffaf1 100644
78404 --- a/net/irda/ircomm/ircomm_tty.c
78405 +++ b/net/irda/ircomm/ircomm_tty.c
78406 @@ -281,16 +281,16 @@ static int ircomm_tty_block_til_ready(struct ircomm_tty_cb *self,
78407 add_wait_queue(&self->open_wait, &wait);
78408
78409 IRDA_DEBUG(2, "%s(%d):block_til_ready before block on %s open_count=%d\n",
78410 - __FILE__,__LINE__, tty->driver->name, self->open_count );
78411 + __FILE__,__LINE__, tty->driver->name, local_read(&self->open_count) );
78412
78413 /* As far as I can see, we protect open_count - Jean II */
78414 spin_lock_irqsave(&self->spinlock, flags);
78415 if (!tty_hung_up_p(filp)) {
78416 extra_count = 1;
78417 - self->open_count--;
78418 + local_dec(&self->open_count);
78419 }
78420 spin_unlock_irqrestore(&self->spinlock, flags);
78421 - self->blocked_open++;
78422 + local_inc(&self->blocked_open);
78423
78424 while (1) {
78425 if (tty->termios->c_cflag & CBAUD) {
78426 @@ -330,7 +330,7 @@ static int ircomm_tty_block_til_ready(struct ircomm_tty_cb *self,
78427 }
78428
78429 IRDA_DEBUG(1, "%s(%d):block_til_ready blocking on %s open_count=%d\n",
78430 - __FILE__,__LINE__, tty->driver->name, self->open_count );
78431 + __FILE__,__LINE__, tty->driver->name, local_read(&self->open_count) );
78432
78433 schedule();
78434 }
78435 @@ -341,13 +341,13 @@ static int ircomm_tty_block_til_ready(struct ircomm_tty_cb *self,
78436 if (extra_count) {
78437 /* ++ is not atomic, so this should be protected - Jean II */
78438 spin_lock_irqsave(&self->spinlock, flags);
78439 - self->open_count++;
78440 + local_inc(&self->open_count);
78441 spin_unlock_irqrestore(&self->spinlock, flags);
78442 }
78443 - self->blocked_open--;
78444 + local_dec(&self->blocked_open);
78445
78446 IRDA_DEBUG(1, "%s(%d):block_til_ready after blocking on %s open_count=%d\n",
78447 - __FILE__,__LINE__, tty->driver->name, self->open_count);
78448 + __FILE__,__LINE__, tty->driver->name, local_read(&self->open_count));
78449
78450 if (!retval)
78451 self->flags |= ASYNC_NORMAL_ACTIVE;
78452 @@ -412,14 +412,14 @@ static int ircomm_tty_open(struct tty_struct *tty, struct file *filp)
78453 }
78454 /* ++ is not atomic, so this should be protected - Jean II */
78455 spin_lock_irqsave(&self->spinlock, flags);
78456 - self->open_count++;
78457 + local_inc(&self->open_count);
78458
78459 tty->driver_data = self;
78460 self->tty = tty;
78461 spin_unlock_irqrestore(&self->spinlock, flags);
78462
78463 IRDA_DEBUG(1, "%s(), %s%d, count = %d\n", __func__ , tty->driver->name,
78464 - self->line, self->open_count);
78465 + self->line, local_read(&self->open_count));
78466
78467 /* Not really used by us, but lets do it anyway */
78468 self->tty->low_latency = (self->flags & ASYNC_LOW_LATENCY) ? 1 : 0;
78469 @@ -505,7 +505,7 @@ static void ircomm_tty_close(struct tty_struct *tty, struct file *filp)
78470 return;
78471 }
78472
78473 - if ((tty->count == 1) && (self->open_count != 1)) {
78474 + if ((tty->count == 1) && (local_read(&self->open_count) != 1)) {
78475 /*
78476 * Uh, oh. tty->count is 1, which means that the tty
78477 * structure will be freed. state->count should always
78478 @@ -515,16 +515,16 @@ static void ircomm_tty_close(struct tty_struct *tty, struct file *filp)
78479 */
78480 IRDA_DEBUG(0, "%s(), bad serial port count; "
78481 "tty->count is 1, state->count is %d\n", __func__ ,
78482 - self->open_count);
78483 - self->open_count = 1;
78484 + local_read(&self->open_count));
78485 + local_set(&self->open_count, 1);
78486 }
78487
78488 - if (--self->open_count < 0) {
78489 + if (local_dec_return(&self->open_count) < 0) {
78490 IRDA_ERROR("%s(), bad serial port count for ttys%d: %d\n",
78491 - __func__, self->line, self->open_count);
78492 - self->open_count = 0;
78493 + __func__, self->line, local_read(&self->open_count));
78494 + local_set(&self->open_count, 0);
78495 }
78496 - if (self->open_count) {
78497 + if (local_read(&self->open_count)) {
78498 spin_unlock_irqrestore(&self->spinlock, flags);
78499
78500 IRDA_DEBUG(0, "%s(), open count > 0\n", __func__ );
78501 @@ -556,7 +556,7 @@ static void ircomm_tty_close(struct tty_struct *tty, struct file *filp)
78502 tty->closing = 0;
78503 self->tty = NULL;
78504
78505 - if (self->blocked_open) {
78506 + if (local_read(&self->blocked_open)) {
78507 if (self->close_delay)
78508 schedule_timeout_interruptible(self->close_delay);
78509 wake_up_interruptible(&self->open_wait);
78510 @@ -1008,7 +1008,7 @@ static void ircomm_tty_hangup(struct tty_struct *tty)
78511 spin_lock_irqsave(&self->spinlock, flags);
78512 self->flags &= ~ASYNC_NORMAL_ACTIVE;
78513 self->tty = NULL;
78514 - self->open_count = 0;
78515 + local_set(&self->open_count, 0);
78516 spin_unlock_irqrestore(&self->spinlock, flags);
78517
78518 wake_up_interruptible(&self->open_wait);
78519 @@ -1355,7 +1355,7 @@ static void ircomm_tty_line_info(struct ircomm_tty_cb *self, struct seq_file *m)
78520 seq_putc(m, '\n');
78521
78522 seq_printf(m, "Role: %s\n", self->client ? "client" : "server");
78523 - seq_printf(m, "Open count: %d\n", self->open_count);
78524 + seq_printf(m, "Open count: %d\n", local_read(&self->open_count));
78525 seq_printf(m, "Max data size: %d\n", self->max_data_size);
78526 seq_printf(m, "Max header size: %d\n", self->max_header_size);
78527
78528 diff --git a/net/iucv/af_iucv.c b/net/iucv/af_iucv.c
78529 index cd6f7a9..e63fe89 100644
78530 --- a/net/iucv/af_iucv.c
78531 +++ b/net/iucv/af_iucv.c
78532 @@ -782,10 +782,10 @@ static int iucv_sock_autobind(struct sock *sk)
78533
78534 write_lock_bh(&iucv_sk_list.lock);
78535
78536 - sprintf(name, "%08x", atomic_inc_return(&iucv_sk_list.autobind_name));
78537 + sprintf(name, "%08x", atomic_inc_return_unchecked(&iucv_sk_list.autobind_name));
78538 while (__iucv_get_sock_by_name(name)) {
78539 sprintf(name, "%08x",
78540 - atomic_inc_return(&iucv_sk_list.autobind_name));
78541 + atomic_inc_return_unchecked(&iucv_sk_list.autobind_name));
78542 }
78543
78544 write_unlock_bh(&iucv_sk_list.lock);
78545 diff --git a/net/key/af_key.c b/net/key/af_key.c
78546 index 34e4185..8823368 100644
78547 --- a/net/key/af_key.c
78548 +++ b/net/key/af_key.c
78549 @@ -3016,10 +3016,10 @@ static int pfkey_send_policy_notify(struct xfrm_policy *xp, int dir, const struc
78550 static u32 get_acqseq(void)
78551 {
78552 u32 res;
78553 - static atomic_t acqseq;
78554 + static atomic_unchecked_t acqseq;
78555
78556 do {
78557 - res = atomic_inc_return(&acqseq);
78558 + res = atomic_inc_return_unchecked(&acqseq);
78559 } while (!res);
78560 return res;
78561 }
78562 diff --git a/net/mac80211/ieee80211_i.h b/net/mac80211/ieee80211_i.h
78563 index 642a2a3..9dcc3dd 100644
78564 --- a/net/mac80211/ieee80211_i.h
78565 +++ b/net/mac80211/ieee80211_i.h
78566 @@ -28,6 +28,7 @@
78567 #include <net/ieee80211_radiotap.h>
78568 #include <net/cfg80211.h>
78569 #include <net/mac80211.h>
78570 +#include <asm/local.h>
78571 #include "key.h"
78572 #include "sta_info.h"
78573 #include "debug.h"
78574 @@ -840,7 +841,7 @@ struct ieee80211_local {
78575 /* also used to protect ampdu_ac_queue and amdpu_ac_stop_refcnt */
78576 spinlock_t queue_stop_reason_lock;
78577
78578 - int open_count;
78579 + local_t open_count;
78580 int monitors, cooked_mntrs;
78581 /* number of interfaces with corresponding FIF_ flags */
78582 int fif_fcsfail, fif_plcpfail, fif_control, fif_other_bss, fif_pspoll,
78583 diff --git a/net/mac80211/iface.c b/net/mac80211/iface.c
78584 index c93d395..a305570 100644
78585 --- a/net/mac80211/iface.c
78586 +++ b/net/mac80211/iface.c
78587 @@ -454,7 +454,7 @@ static int ieee80211_do_open(struct net_device *dev, bool coming_up)
78588 break;
78589 }
78590
78591 - if (local->open_count == 0) {
78592 + if (local_read(&local->open_count) == 0) {
78593 res = drv_start(local);
78594 if (res)
78595 goto err_del_bss;
78596 @@ -497,7 +497,7 @@ static int ieee80211_do_open(struct net_device *dev, bool coming_up)
78597 break;
78598 }
78599
78600 - if (local->monitors == 0 && local->open_count == 0) {
78601 + if (local->monitors == 0 && local_read(&local->open_count) == 0) {
78602 res = ieee80211_add_virtual_monitor(local);
78603 if (res)
78604 goto err_stop;
78605 @@ -594,7 +594,7 @@ static int ieee80211_do_open(struct net_device *dev, bool coming_up)
78606 mutex_unlock(&local->mtx);
78607
78608 if (coming_up)
78609 - local->open_count++;
78610 + local_inc(&local->open_count);
78611
78612 if (hw_reconf_flags)
78613 ieee80211_hw_config(local, hw_reconf_flags);
78614 @@ -607,7 +607,7 @@ static int ieee80211_do_open(struct net_device *dev, bool coming_up)
78615 err_del_interface:
78616 drv_remove_interface(local, sdata);
78617 err_stop:
78618 - if (!local->open_count)
78619 + if (!local_read(&local->open_count))
78620 drv_stop(local);
78621 err_del_bss:
78622 sdata->bss = NULL;
78623 @@ -736,7 +736,7 @@ static void ieee80211_do_stop(struct ieee80211_sub_if_data *sdata,
78624 }
78625
78626 if (going_down)
78627 - local->open_count--;
78628 + local_dec(&local->open_count);
78629
78630 switch (sdata->vif.type) {
78631 case NL80211_IFTYPE_AP_VLAN:
78632 @@ -796,7 +796,7 @@ static void ieee80211_do_stop(struct ieee80211_sub_if_data *sdata,
78633
78634 ieee80211_recalc_ps(local, -1);
78635
78636 - if (local->open_count == 0) {
78637 + if (local_read(&local->open_count) == 0) {
78638 if (local->ops->napi_poll)
78639 napi_disable(&local->napi);
78640 ieee80211_clear_tx_pending(local);
78641 @@ -828,7 +828,7 @@ static void ieee80211_do_stop(struct ieee80211_sub_if_data *sdata,
78642 }
78643 spin_unlock_irqrestore(&local->queue_stop_reason_lock, flags);
78644
78645 - if (local->monitors == local->open_count && local->monitors > 0)
78646 + if (local->monitors == local_read(&local->open_count) && local->monitors > 0)
78647 ieee80211_add_virtual_monitor(local);
78648 }
78649
78650 diff --git a/net/mac80211/main.c b/net/mac80211/main.c
78651 index c26e231..8916637 100644
78652 --- a/net/mac80211/main.c
78653 +++ b/net/mac80211/main.c
78654 @@ -166,7 +166,7 @@ int ieee80211_hw_config(struct ieee80211_local *local, u32 changed)
78655 local->hw.conf.power_level = power;
78656 }
78657
78658 - if (changed && local->open_count) {
78659 + if (changed && local_read(&local->open_count)) {
78660 ret = drv_config(local, changed);
78661 /*
78662 * Goal:
78663 diff --git a/net/mac80211/pm.c b/net/mac80211/pm.c
78664 index 5c572e7..ecf75ce 100644
78665 --- a/net/mac80211/pm.c
78666 +++ b/net/mac80211/pm.c
78667 @@ -34,7 +34,7 @@ int __ieee80211_suspend(struct ieee80211_hw *hw, struct cfg80211_wowlan *wowlan)
78668 struct ieee80211_sub_if_data *sdata;
78669 struct sta_info *sta;
78670
78671 - if (!local->open_count)
78672 + if (!local_read(&local->open_count))
78673 goto suspend;
78674
78675 ieee80211_scan_cancel(local);
78676 @@ -72,7 +72,7 @@ int __ieee80211_suspend(struct ieee80211_hw *hw, struct cfg80211_wowlan *wowlan)
78677 cancel_work_sync(&local->dynamic_ps_enable_work);
78678 del_timer_sync(&local->dynamic_ps_timer);
78679
78680 - local->wowlan = wowlan && local->open_count;
78681 + local->wowlan = wowlan && local_read(&local->open_count);
78682 if (local->wowlan) {
78683 int err = drv_suspend(local, wowlan);
78684 if (err < 0) {
78685 @@ -143,7 +143,7 @@ int __ieee80211_suspend(struct ieee80211_hw *hw, struct cfg80211_wowlan *wowlan)
78686 drv_remove_interface(local, sdata);
78687
78688 /* stop hardware - this must stop RX */
78689 - if (local->open_count)
78690 + if (local_read(&local->open_count))
78691 ieee80211_stop_device(local);
78692
78693 suspend:
78694 diff --git a/net/mac80211/rate.c b/net/mac80211/rate.c
78695 index 3313c11..bec9f17 100644
78696 --- a/net/mac80211/rate.c
78697 +++ b/net/mac80211/rate.c
78698 @@ -494,7 +494,7 @@ int ieee80211_init_rate_ctrl_alg(struct ieee80211_local *local,
78699
78700 ASSERT_RTNL();
78701
78702 - if (local->open_count)
78703 + if (local_read(&local->open_count))
78704 return -EBUSY;
78705
78706 if (local->hw.flags & IEEE80211_HW_HAS_RATE_CONTROL) {
78707 diff --git a/net/mac80211/rc80211_pid_debugfs.c b/net/mac80211/rc80211_pid_debugfs.c
78708 index c97a065..ff61928 100644
78709 --- a/net/mac80211/rc80211_pid_debugfs.c
78710 +++ b/net/mac80211/rc80211_pid_debugfs.c
78711 @@ -193,7 +193,7 @@ static ssize_t rate_control_pid_events_read(struct file *file, char __user *buf,
78712
78713 spin_unlock_irqrestore(&events->lock, status);
78714
78715 - if (copy_to_user(buf, pb, p))
78716 + if (p > sizeof(pb) || copy_to_user(buf, pb, p))
78717 return -EFAULT;
78718
78719 return p;
78720 diff --git a/net/mac80211/util.c b/net/mac80211/util.c
78721 index 7883449..17c6a9a 100644
78722 --- a/net/mac80211/util.c
78723 +++ b/net/mac80211/util.c
78724 @@ -1279,7 +1279,7 @@ int ieee80211_reconfig(struct ieee80211_local *local)
78725 }
78726 #endif
78727 /* everything else happens only if HW was up & running */
78728 - if (!local->open_count)
78729 + if (!local_read(&local->open_count))
78730 goto wake_up;
78731
78732 /*
78733 diff --git a/net/netfilter/Kconfig b/net/netfilter/Kconfig
78734 index c19b214..471fad1 100644
78735 --- a/net/netfilter/Kconfig
78736 +++ b/net/netfilter/Kconfig
78737 @@ -872,6 +872,16 @@ config NETFILTER_XT_MATCH_ESP
78738
78739 To compile it as a module, choose M here. If unsure, say N.
78740
78741 +config NETFILTER_XT_MATCH_GRADM
78742 + tristate '"gradm" match support'
78743 + depends on NETFILTER_XTABLES && NETFILTER_ADVANCED
78744 + depends on GRKERNSEC && !GRKERNSEC_NO_RBAC
78745 + ---help---
78746 + The gradm match allows to match on grsecurity RBAC being enabled.
78747 + It is useful when iptables rules are applied early on bootup to
78748 + prevent connections to the machine (except from a trusted host)
78749 + while the RBAC system is disabled.
78750 +
78751 config NETFILTER_XT_MATCH_HASHLIMIT
78752 tristate '"hashlimit" match support'
78753 depends on (IP6_NF_IPTABLES || IP6_NF_IPTABLES=n)
78754 diff --git a/net/netfilter/Makefile b/net/netfilter/Makefile
78755 index 1c5160f..145ae21 100644
78756 --- a/net/netfilter/Makefile
78757 +++ b/net/netfilter/Makefile
78758 @@ -90,6 +90,7 @@ obj-$(CONFIG_NETFILTER_XT_MATCH_DEVGROUP) += xt_devgroup.o
78759 obj-$(CONFIG_NETFILTER_XT_MATCH_DSCP) += xt_dscp.o
78760 obj-$(CONFIG_NETFILTER_XT_MATCH_ECN) += xt_ecn.o
78761 obj-$(CONFIG_NETFILTER_XT_MATCH_ESP) += xt_esp.o
78762 +obj-$(CONFIG_NETFILTER_XT_MATCH_GRADM) += xt_gradm.o
78763 obj-$(CONFIG_NETFILTER_XT_MATCH_HASHLIMIT) += xt_hashlimit.o
78764 obj-$(CONFIG_NETFILTER_XT_MATCH_HELPER) += xt_helper.o
78765 obj-$(CONFIG_NETFILTER_XT_MATCH_HL) += xt_hl.o
78766 diff --git a/net/netfilter/ipvs/ip_vs_conn.c b/net/netfilter/ipvs/ip_vs_conn.c
78767 index 1548df9..98ad9b4 100644
78768 --- a/net/netfilter/ipvs/ip_vs_conn.c
78769 +++ b/net/netfilter/ipvs/ip_vs_conn.c
78770 @@ -557,7 +557,7 @@ ip_vs_bind_dest(struct ip_vs_conn *cp, struct ip_vs_dest *dest)
78771 /* Increase the refcnt counter of the dest */
78772 atomic_inc(&dest->refcnt);
78773
78774 - conn_flags = atomic_read(&dest->conn_flags);
78775 + conn_flags = atomic_read_unchecked(&dest->conn_flags);
78776 if (cp->protocol != IPPROTO_UDP)
78777 conn_flags &= ~IP_VS_CONN_F_ONE_PACKET;
78778 flags = cp->flags;
78779 @@ -902,7 +902,7 @@ ip_vs_conn_new(const struct ip_vs_conn_param *p,
78780 atomic_set(&cp->refcnt, 1);
78781
78782 atomic_set(&cp->n_control, 0);
78783 - atomic_set(&cp->in_pkts, 0);
78784 + atomic_set_unchecked(&cp->in_pkts, 0);
78785
78786 atomic_inc(&ipvs->conn_count);
78787 if (flags & IP_VS_CONN_F_NO_CPORT)
78788 @@ -1183,7 +1183,7 @@ static inline int todrop_entry(struct ip_vs_conn *cp)
78789
78790 /* Don't drop the entry if its number of incoming packets is not
78791 located in [0, 8] */
78792 - i = atomic_read(&cp->in_pkts);
78793 + i = atomic_read_unchecked(&cp->in_pkts);
78794 if (i > 8 || i < 0) return 0;
78795
78796 if (!todrop_rate[i]) return 0;
78797 diff --git a/net/netfilter/ipvs/ip_vs_core.c b/net/netfilter/ipvs/ip_vs_core.c
78798 index b54ecce..fc5f6cf 100644
78799 --- a/net/netfilter/ipvs/ip_vs_core.c
78800 +++ b/net/netfilter/ipvs/ip_vs_core.c
78801 @@ -562,7 +562,7 @@ int ip_vs_leave(struct ip_vs_service *svc, struct sk_buff *skb,
78802 ret = cp->packet_xmit(skb, cp, pd->pp);
78803 /* do not touch skb anymore */
78804
78805 - atomic_inc(&cp->in_pkts);
78806 + atomic_inc_unchecked(&cp->in_pkts);
78807 ip_vs_conn_put(cp);
78808 return ret;
78809 }
78810 @@ -1611,7 +1611,7 @@ ip_vs_in(unsigned int hooknum, struct sk_buff *skb, int af)
78811 if (cp->flags & IP_VS_CONN_F_ONE_PACKET)
78812 pkts = sysctl_sync_threshold(ipvs);
78813 else
78814 - pkts = atomic_add_return(1, &cp->in_pkts);
78815 + pkts = atomic_add_return_unchecked(1, &cp->in_pkts);
78816
78817 if (ipvs->sync_state & IP_VS_STATE_MASTER)
78818 ip_vs_sync_conn(net, cp, pkts);
78819 diff --git a/net/netfilter/ipvs/ip_vs_ctl.c b/net/netfilter/ipvs/ip_vs_ctl.c
78820 index f51013c..c99ee52 100644
78821 --- a/net/netfilter/ipvs/ip_vs_ctl.c
78822 +++ b/net/netfilter/ipvs/ip_vs_ctl.c
78823 @@ -788,7 +788,7 @@ __ip_vs_update_dest(struct ip_vs_service *svc, struct ip_vs_dest *dest,
78824 ip_vs_rs_hash(ipvs, dest);
78825 write_unlock_bh(&ipvs->rs_lock);
78826 }
78827 - atomic_set(&dest->conn_flags, conn_flags);
78828 + atomic_set_unchecked(&dest->conn_flags, conn_flags);
78829
78830 /* bind the service */
78831 if (!dest->svc) {
78832 @@ -2076,7 +2076,7 @@ static int ip_vs_info_seq_show(struct seq_file *seq, void *v)
78833 " %-7s %-6d %-10d %-10d\n",
78834 &dest->addr.in6,
78835 ntohs(dest->port),
78836 - ip_vs_fwd_name(atomic_read(&dest->conn_flags)),
78837 + ip_vs_fwd_name(atomic_read_unchecked(&dest->conn_flags)),
78838 atomic_read(&dest->weight),
78839 atomic_read(&dest->activeconns),
78840 atomic_read(&dest->inactconns));
78841 @@ -2087,7 +2087,7 @@ static int ip_vs_info_seq_show(struct seq_file *seq, void *v)
78842 "%-7s %-6d %-10d %-10d\n",
78843 ntohl(dest->addr.ip),
78844 ntohs(dest->port),
78845 - ip_vs_fwd_name(atomic_read(&dest->conn_flags)),
78846 + ip_vs_fwd_name(atomic_read_unchecked(&dest->conn_flags)),
78847 atomic_read(&dest->weight),
78848 atomic_read(&dest->activeconns),
78849 atomic_read(&dest->inactconns));
78850 @@ -2557,7 +2557,7 @@ __ip_vs_get_dest_entries(struct net *net, const struct ip_vs_get_dests *get,
78851
78852 entry.addr = dest->addr.ip;
78853 entry.port = dest->port;
78854 - entry.conn_flags = atomic_read(&dest->conn_flags);
78855 + entry.conn_flags = atomic_read_unchecked(&dest->conn_flags);
78856 entry.weight = atomic_read(&dest->weight);
78857 entry.u_threshold = dest->u_threshold;
78858 entry.l_threshold = dest->l_threshold;
78859 @@ -3092,7 +3092,7 @@ static int ip_vs_genl_fill_dest(struct sk_buff *skb, struct ip_vs_dest *dest)
78860 if (nla_put(skb, IPVS_DEST_ATTR_ADDR, sizeof(dest->addr), &dest->addr) ||
78861 nla_put_u16(skb, IPVS_DEST_ATTR_PORT, dest->port) ||
78862 nla_put_u32(skb, IPVS_DEST_ATTR_FWD_METHOD,
78863 - (atomic_read(&dest->conn_flags) &
78864 + (atomic_read_unchecked(&dest->conn_flags) &
78865 IP_VS_CONN_F_FWD_MASK)) ||
78866 nla_put_u32(skb, IPVS_DEST_ATTR_WEIGHT,
78867 atomic_read(&dest->weight)) ||
78868 diff --git a/net/netfilter/ipvs/ip_vs_sync.c b/net/netfilter/ipvs/ip_vs_sync.c
78869 index effa10c..9058928 100644
78870 --- a/net/netfilter/ipvs/ip_vs_sync.c
78871 +++ b/net/netfilter/ipvs/ip_vs_sync.c
78872 @@ -596,7 +596,7 @@ static void ip_vs_sync_conn_v0(struct net *net, struct ip_vs_conn *cp,
78873 cp = cp->control;
78874 if (cp) {
78875 if (cp->flags & IP_VS_CONN_F_TEMPLATE)
78876 - pkts = atomic_add_return(1, &cp->in_pkts);
78877 + pkts = atomic_add_return_unchecked(1, &cp->in_pkts);
78878 else
78879 pkts = sysctl_sync_threshold(ipvs);
78880 ip_vs_sync_conn(net, cp->control, pkts);
78881 @@ -758,7 +758,7 @@ control:
78882 if (!cp)
78883 return;
78884 if (cp->flags & IP_VS_CONN_F_TEMPLATE)
78885 - pkts = atomic_add_return(1, &cp->in_pkts);
78886 + pkts = atomic_add_return_unchecked(1, &cp->in_pkts);
78887 else
78888 pkts = sysctl_sync_threshold(ipvs);
78889 goto sloop;
78890 @@ -885,7 +885,7 @@ static void ip_vs_proc_conn(struct net *net, struct ip_vs_conn_param *param,
78891
78892 if (opt)
78893 memcpy(&cp->in_seq, opt, sizeof(*opt));
78894 - atomic_set(&cp->in_pkts, sysctl_sync_threshold(ipvs));
78895 + atomic_set_unchecked(&cp->in_pkts, sysctl_sync_threshold(ipvs));
78896 cp->state = state;
78897 cp->old_state = cp->state;
78898 /*
78899 diff --git a/net/netfilter/ipvs/ip_vs_xmit.c b/net/netfilter/ipvs/ip_vs_xmit.c
78900 index c3c6291..3376d73 100644
78901 --- a/net/netfilter/ipvs/ip_vs_xmit.c
78902 +++ b/net/netfilter/ipvs/ip_vs_xmit.c
78903 @@ -1157,7 +1157,7 @@ ip_vs_icmp_xmit(struct sk_buff *skb, struct ip_vs_conn *cp,
78904 else
78905 rc = NF_ACCEPT;
78906 /* do not touch skb anymore */
78907 - atomic_inc(&cp->in_pkts);
78908 + atomic_inc_unchecked(&cp->in_pkts);
78909 goto out;
78910 }
78911
78912 @@ -1278,7 +1278,7 @@ ip_vs_icmp_xmit_v6(struct sk_buff *skb, struct ip_vs_conn *cp,
78913 else
78914 rc = NF_ACCEPT;
78915 /* do not touch skb anymore */
78916 - atomic_inc(&cp->in_pkts);
78917 + atomic_inc_unchecked(&cp->in_pkts);
78918 goto out;
78919 }
78920
78921 diff --git a/net/netfilter/nf_conntrack_core.c b/net/netfilter/nf_conntrack_core.c
78922 index 2ceec64..a5b8a61 100644
78923 --- a/net/netfilter/nf_conntrack_core.c
78924 +++ b/net/netfilter/nf_conntrack_core.c
78925 @@ -1529,6 +1529,10 @@ err_extend:
78926 #define UNCONFIRMED_NULLS_VAL ((1<<30)+0)
78927 #define DYING_NULLS_VAL ((1<<30)+1)
78928
78929 +#ifdef CONFIG_GRKERNSEC_HIDESYM
78930 +static atomic_unchecked_t conntrack_cache_id = ATOMIC_INIT(0);
78931 +#endif
78932 +
78933 static int nf_conntrack_init_net(struct net *net)
78934 {
78935 int ret;
78936 @@ -1542,7 +1546,11 @@ static int nf_conntrack_init_net(struct net *net)
78937 goto err_stat;
78938 }
78939
78940 +#ifdef CONFIG_GRKERNSEC_HIDESYM
78941 + net->ct.slabname = kasprintf(GFP_KERNEL, "nf_conntrack_%08lx", atomic_inc_return_unchecked(&conntrack_cache_id));
78942 +#else
78943 net->ct.slabname = kasprintf(GFP_KERNEL, "nf_conntrack_%p", net);
78944 +#endif
78945 if (!net->ct.slabname) {
78946 ret = -ENOMEM;
78947 goto err_slabname;
78948 diff --git a/net/netfilter/nfnetlink_log.c b/net/netfilter/nfnetlink_log.c
78949 index 5cfb5be..217c6d8 100644
78950 --- a/net/netfilter/nfnetlink_log.c
78951 +++ b/net/netfilter/nfnetlink_log.c
78952 @@ -70,7 +70,7 @@ struct nfulnl_instance {
78953 };
78954
78955 static DEFINE_SPINLOCK(instances_lock);
78956 -static atomic_t global_seq;
78957 +static atomic_unchecked_t global_seq;
78958
78959 #define INSTANCE_BUCKETS 16
78960 static struct hlist_head instance_table[INSTANCE_BUCKETS];
78961 @@ -523,7 +523,7 @@ __build_packet_message(struct nfulnl_instance *inst,
78962 /* global sequence number */
78963 if ((inst->flags & NFULNL_CFG_F_SEQ_GLOBAL) &&
78964 nla_put_be32(inst->skb, NFULA_SEQ_GLOBAL,
78965 - htonl(atomic_inc_return(&global_seq))))
78966 + htonl(atomic_inc_return_unchecked(&global_seq))))
78967 goto nla_put_failure;
78968
78969 if (data_len) {
78970 diff --git a/net/netfilter/xt_gradm.c b/net/netfilter/xt_gradm.c
78971 new file mode 100644
78972 index 0000000..c566332
78973 --- /dev/null
78974 +++ b/net/netfilter/xt_gradm.c
78975 @@ -0,0 +1,51 @@
78976 +/*
78977 + * gradm match for netfilter
78978 + * Copyright © Zbigniew Krzystolik, 2010
78979 + *
78980 + * This program is free software; you can redistribute it and/or modify
78981 + * it under the terms of the GNU General Public License; either version
78982 + * 2 or 3 as published by the Free Software Foundation.
78983 + */
78984 +#include <linux/module.h>
78985 +#include <linux/moduleparam.h>
78986 +#include <linux/skbuff.h>
78987 +#include <linux/netfilter/x_tables.h>
78988 +#include <linux/grsecurity.h>
78989 +#include <linux/netfilter/xt_gradm.h>
78990 +
78991 +static bool
78992 +gradm_mt(const struct sk_buff *skb, struct xt_action_param *par)
78993 +{
78994 + const struct xt_gradm_mtinfo *info = par->matchinfo;
78995 + bool retval = false;
78996 + if (gr_acl_is_enabled())
78997 + retval = true;
78998 + return retval ^ info->invflags;
78999 +}
79000 +
79001 +static struct xt_match gradm_mt_reg __read_mostly = {
79002 + .name = "gradm",
79003 + .revision = 0,
79004 + .family = NFPROTO_UNSPEC,
79005 + .match = gradm_mt,
79006 + .matchsize = XT_ALIGN(sizeof(struct xt_gradm_mtinfo)),
79007 + .me = THIS_MODULE,
79008 +};
79009 +
79010 +static int __init gradm_mt_init(void)
79011 +{
79012 + return xt_register_match(&gradm_mt_reg);
79013 +}
79014 +
79015 +static void __exit gradm_mt_exit(void)
79016 +{
79017 + xt_unregister_match(&gradm_mt_reg);
79018 +}
79019 +
79020 +module_init(gradm_mt_init);
79021 +module_exit(gradm_mt_exit);
79022 +MODULE_AUTHOR("Zbigniew Krzystolik <zbyniu@destrukcja.pl>");
79023 +MODULE_DESCRIPTION("Xtables: Grsecurity RBAC match");
79024 +MODULE_LICENSE("GPL");
79025 +MODULE_ALIAS("ipt_gradm");
79026 +MODULE_ALIAS("ip6t_gradm");
79027 diff --git a/net/netfilter/xt_statistic.c b/net/netfilter/xt_statistic.c
79028 index 4fe4fb4..87a89e5 100644
79029 --- a/net/netfilter/xt_statistic.c
79030 +++ b/net/netfilter/xt_statistic.c
79031 @@ -19,7 +19,7 @@
79032 #include <linux/module.h>
79033
79034 struct xt_statistic_priv {
79035 - atomic_t count;
79036 + atomic_unchecked_t count;
79037 } ____cacheline_aligned_in_smp;
79038
79039 MODULE_LICENSE("GPL");
79040 @@ -42,9 +42,9 @@ statistic_mt(const struct sk_buff *skb, struct xt_action_param *par)
79041 break;
79042 case XT_STATISTIC_MODE_NTH:
79043 do {
79044 - oval = atomic_read(&info->master->count);
79045 + oval = atomic_read_unchecked(&info->master->count);
79046 nval = (oval == info->u.nth.every) ? 0 : oval + 1;
79047 - } while (atomic_cmpxchg(&info->master->count, oval, nval) != oval);
79048 + } while (atomic_cmpxchg_unchecked(&info->master->count, oval, nval) != oval);
79049 if (nval == 0)
79050 ret = !ret;
79051 break;
79052 @@ -64,7 +64,7 @@ static int statistic_mt_check(const struct xt_mtchk_param *par)
79053 info->master = kzalloc(sizeof(*info->master), GFP_KERNEL);
79054 if (info->master == NULL)
79055 return -ENOMEM;
79056 - atomic_set(&info->master->count, info->u.nth.count);
79057 + atomic_set_unchecked(&info->master->count, info->u.nth.count);
79058
79059 return 0;
79060 }
79061 diff --git a/net/netlink/af_netlink.c b/net/netlink/af_netlink.c
79062 index 0426b67..d6ddaca 100644
79063 --- a/net/netlink/af_netlink.c
79064 +++ b/net/netlink/af_netlink.c
79065 @@ -780,7 +780,7 @@ static void netlink_overrun(struct sock *sk)
79066 sk->sk_error_report(sk);
79067 }
79068 }
79069 - atomic_inc(&sk->sk_drops);
79070 + atomic_inc_unchecked(&sk->sk_drops);
79071 }
79072
79073 static struct sock *netlink_getsockbypid(struct sock *ssk, u32 pid)
79074 @@ -2070,7 +2070,7 @@ static int netlink_seq_show(struct seq_file *seq, void *v)
79075 sk_wmem_alloc_get(s),
79076 nlk->cb,
79077 atomic_read(&s->sk_refcnt),
79078 - atomic_read(&s->sk_drops),
79079 + atomic_read_unchecked(&s->sk_drops),
79080 sock_i_ino(s)
79081 );
79082
79083 diff --git a/net/netrom/af_netrom.c b/net/netrom/af_netrom.c
79084 index 7261eb8..44e8ac6 100644
79085 --- a/net/netrom/af_netrom.c
79086 +++ b/net/netrom/af_netrom.c
79087 @@ -838,6 +838,7 @@ static int nr_getname(struct socket *sock, struct sockaddr *uaddr,
79088 struct sock *sk = sock->sk;
79089 struct nr_sock *nr = nr_sk(sk);
79090
79091 + memset(sax, 0, sizeof(*sax));
79092 lock_sock(sk);
79093 if (peer != 0) {
79094 if (sk->sk_state != TCP_ESTABLISHED) {
79095 @@ -852,7 +853,6 @@ static int nr_getname(struct socket *sock, struct sockaddr *uaddr,
79096 *uaddr_len = sizeof(struct full_sockaddr_ax25);
79097 } else {
79098 sax->fsa_ax25.sax25_family = AF_NETROM;
79099 - sax->fsa_ax25.sax25_ndigis = 0;
79100 sax->fsa_ax25.sax25_call = nr->source_addr;
79101 *uaddr_len = sizeof(struct sockaddr_ax25);
79102 }
79103 diff --git a/net/nfc/llcp/sock.c b/net/nfc/llcp/sock.c
79104 index ddeb9aa..e18fffd 100644
79105 --- a/net/nfc/llcp/sock.c
79106 +++ b/net/nfc/llcp/sock.c
79107 @@ -443,15 +443,11 @@ static int llcp_sock_connect(struct socket *sock, struct sockaddr *_addr,
79108 pr_debug("sock %p sk %p flags 0x%x\n", sock, sk, flags);
79109
79110 if (!addr || len < sizeof(struct sockaddr_nfc) ||
79111 - addr->sa_family != AF_NFC) {
79112 - pr_err("Invalid socket\n");
79113 + addr->sa_family != AF_NFC)
79114 return -EINVAL;
79115 - }
79116
79117 - if (addr->service_name_len == 0 && addr->dsap == 0) {
79118 - pr_err("Missing service name or dsap\n");
79119 + if (addr->service_name_len == 0 && addr->dsap == 0)
79120 return -EINVAL;
79121 - }
79122
79123 pr_debug("addr dev_idx=%u target_idx=%u protocol=%u\n", addr->dev_idx,
79124 addr->target_idx, addr->nfc_protocol);
79125 diff --git a/net/packet/af_packet.c b/net/packet/af_packet.c
79126 index c5c9e2a..4814ab1 100644
79127 --- a/net/packet/af_packet.c
79128 +++ b/net/packet/af_packet.c
79129 @@ -1689,7 +1689,7 @@ static int packet_rcv(struct sk_buff *skb, struct net_device *dev,
79130
79131 spin_lock(&sk->sk_receive_queue.lock);
79132 po->stats.tp_packets++;
79133 - skb->dropcount = atomic_read(&sk->sk_drops);
79134 + skb->dropcount = atomic_read_unchecked(&sk->sk_drops);
79135 __skb_queue_tail(&sk->sk_receive_queue, skb);
79136 spin_unlock(&sk->sk_receive_queue.lock);
79137 sk->sk_data_ready(sk, skb->len);
79138 @@ -1698,7 +1698,7 @@ static int packet_rcv(struct sk_buff *skb, struct net_device *dev,
79139 drop_n_acct:
79140 spin_lock(&sk->sk_receive_queue.lock);
79141 po->stats.tp_drops++;
79142 - atomic_inc(&sk->sk_drops);
79143 + atomic_inc_unchecked(&sk->sk_drops);
79144 spin_unlock(&sk->sk_receive_queue.lock);
79145
79146 drop_n_restore:
79147 @@ -2642,6 +2642,7 @@ out:
79148
79149 static int packet_recv_error(struct sock *sk, struct msghdr *msg, int len)
79150 {
79151 + struct sock_extended_err ee;
79152 struct sock_exterr_skb *serr;
79153 struct sk_buff *skb, *skb2;
79154 int copied, err;
79155 @@ -2663,8 +2664,9 @@ static int packet_recv_error(struct sock *sk, struct msghdr *msg, int len)
79156 sock_recv_timestamp(msg, sk, skb);
79157
79158 serr = SKB_EXT_ERR(skb);
79159 + ee = serr->ee;
79160 put_cmsg(msg, SOL_PACKET, PACKET_TX_TIMESTAMP,
79161 - sizeof(serr->ee), &serr->ee);
79162 + sizeof ee, &ee);
79163
79164 msg->msg_flags |= MSG_ERRQUEUE;
79165 err = copied;
79166 @@ -3276,7 +3278,7 @@ static int packet_getsockopt(struct socket *sock, int level, int optname,
79167 case PACKET_HDRLEN:
79168 if (len > sizeof(int))
79169 len = sizeof(int);
79170 - if (copy_from_user(&val, optval, len))
79171 + if (len > sizeof(val) || copy_from_user(&val, optval, len))
79172 return -EFAULT;
79173 switch (val) {
79174 case TPACKET_V1:
79175 @@ -3315,7 +3317,7 @@ static int packet_getsockopt(struct socket *sock, int level, int optname,
79176 len = lv;
79177 if (put_user(len, optlen))
79178 return -EFAULT;
79179 - if (copy_to_user(optval, data, len))
79180 + if (len > sizeof(st) || copy_to_user(optval, data, len))
79181 return -EFAULT;
79182 return 0;
79183 }
79184 diff --git a/net/phonet/af_phonet.c b/net/phonet/af_phonet.c
79185 index 5a940db..f0b9c12 100644
79186 --- a/net/phonet/af_phonet.c
79187 +++ b/net/phonet/af_phonet.c
79188 @@ -41,7 +41,7 @@ static struct phonet_protocol *phonet_proto_get(unsigned int protocol)
79189 {
79190 struct phonet_protocol *pp;
79191
79192 - if (protocol >= PHONET_NPROTO)
79193 + if (protocol < 0 || protocol >= PHONET_NPROTO)
79194 return NULL;
79195
79196 rcu_read_lock();
79197 @@ -469,7 +469,7 @@ int __init_or_module phonet_proto_register(unsigned int protocol,
79198 {
79199 int err = 0;
79200
79201 - if (protocol >= PHONET_NPROTO)
79202 + if (protocol < 0 || protocol >= PHONET_NPROTO)
79203 return -EINVAL;
79204
79205 err = proto_register(pp->prot, 1);
79206 diff --git a/net/phonet/pep.c b/net/phonet/pep.c
79207 index 576f22c..bc7a71b 100644
79208 --- a/net/phonet/pep.c
79209 +++ b/net/phonet/pep.c
79210 @@ -388,7 +388,7 @@ static int pipe_do_rcv(struct sock *sk, struct sk_buff *skb)
79211
79212 case PNS_PEP_CTRL_REQ:
79213 if (skb_queue_len(&pn->ctrlreq_queue) >= PNPIPE_CTRLREQ_MAX) {
79214 - atomic_inc(&sk->sk_drops);
79215 + atomic_inc_unchecked(&sk->sk_drops);
79216 break;
79217 }
79218 __skb_pull(skb, 4);
79219 @@ -409,7 +409,7 @@ static int pipe_do_rcv(struct sock *sk, struct sk_buff *skb)
79220 }
79221
79222 if (pn->rx_credits == 0) {
79223 - atomic_inc(&sk->sk_drops);
79224 + atomic_inc_unchecked(&sk->sk_drops);
79225 err = -ENOBUFS;
79226 break;
79227 }
79228 @@ -580,7 +580,7 @@ static int pipe_handler_do_rcv(struct sock *sk, struct sk_buff *skb)
79229 }
79230
79231 if (pn->rx_credits == 0) {
79232 - atomic_inc(&sk->sk_drops);
79233 + atomic_inc_unchecked(&sk->sk_drops);
79234 err = NET_RX_DROP;
79235 break;
79236 }
79237 diff --git a/net/phonet/socket.c b/net/phonet/socket.c
79238 index 0acc943..c727611 100644
79239 --- a/net/phonet/socket.c
79240 +++ b/net/phonet/socket.c
79241 @@ -613,8 +613,13 @@ static int pn_sock_seq_show(struct seq_file *seq, void *v)
79242 pn->resource, sk->sk_state,
79243 sk_wmem_alloc_get(sk), sk_rmem_alloc_get(sk),
79244 sock_i_uid(sk), sock_i_ino(sk),
79245 - atomic_read(&sk->sk_refcnt), sk,
79246 - atomic_read(&sk->sk_drops), &len);
79247 + atomic_read(&sk->sk_refcnt),
79248 +#ifdef CONFIG_GRKERNSEC_HIDESYM
79249 + NULL,
79250 +#else
79251 + sk,
79252 +#endif
79253 + atomic_read_unchecked(&sk->sk_drops), &len);
79254 }
79255 seq_printf(seq, "%*s\n", 127 - len, "");
79256 return 0;
79257 diff --git a/net/rds/cong.c b/net/rds/cong.c
79258 index e5b65ac..f3b6fb7 100644
79259 --- a/net/rds/cong.c
79260 +++ b/net/rds/cong.c
79261 @@ -78,7 +78,7 @@
79262 * finds that the saved generation number is smaller than the global generation
79263 * number, it wakes up the process.
79264 */
79265 -static atomic_t rds_cong_generation = ATOMIC_INIT(0);
79266 +static atomic_unchecked_t rds_cong_generation = ATOMIC_INIT(0);
79267
79268 /*
79269 * Congestion monitoring
79270 @@ -233,7 +233,7 @@ void rds_cong_map_updated(struct rds_cong_map *map, uint64_t portmask)
79271 rdsdebug("waking map %p for %pI4\n",
79272 map, &map->m_addr);
79273 rds_stats_inc(s_cong_update_received);
79274 - atomic_inc(&rds_cong_generation);
79275 + atomic_inc_unchecked(&rds_cong_generation);
79276 if (waitqueue_active(&map->m_waitq))
79277 wake_up(&map->m_waitq);
79278 if (waitqueue_active(&rds_poll_waitq))
79279 @@ -259,7 +259,7 @@ EXPORT_SYMBOL_GPL(rds_cong_map_updated);
79280
79281 int rds_cong_updated_since(unsigned long *recent)
79282 {
79283 - unsigned long gen = atomic_read(&rds_cong_generation);
79284 + unsigned long gen = atomic_read_unchecked(&rds_cong_generation);
79285
79286 if (likely(*recent == gen))
79287 return 0;
79288 diff --git a/net/rds/ib.h b/net/rds/ib.h
79289 index 8d2b3d5..227ec5b 100644
79290 --- a/net/rds/ib.h
79291 +++ b/net/rds/ib.h
79292 @@ -128,7 +128,7 @@ struct rds_ib_connection {
79293 /* sending acks */
79294 unsigned long i_ack_flags;
79295 #ifdef KERNEL_HAS_ATOMIC64
79296 - atomic64_t i_ack_next; /* next ACK to send */
79297 + atomic64_unchecked_t i_ack_next; /* next ACK to send */
79298 #else
79299 spinlock_t i_ack_lock; /* protect i_ack_next */
79300 u64 i_ack_next; /* next ACK to send */
79301 diff --git a/net/rds/ib_cm.c b/net/rds/ib_cm.c
79302 index a1e1162..265e129 100644
79303 --- a/net/rds/ib_cm.c
79304 +++ b/net/rds/ib_cm.c
79305 @@ -718,7 +718,7 @@ void rds_ib_conn_shutdown(struct rds_connection *conn)
79306 /* Clear the ACK state */
79307 clear_bit(IB_ACK_IN_FLIGHT, &ic->i_ack_flags);
79308 #ifdef KERNEL_HAS_ATOMIC64
79309 - atomic64_set(&ic->i_ack_next, 0);
79310 + atomic64_set_unchecked(&ic->i_ack_next, 0);
79311 #else
79312 ic->i_ack_next = 0;
79313 #endif
79314 diff --git a/net/rds/ib_recv.c b/net/rds/ib_recv.c
79315 index 8d19491..05a3e65 100644
79316 --- a/net/rds/ib_recv.c
79317 +++ b/net/rds/ib_recv.c
79318 @@ -592,7 +592,7 @@ static u64 rds_ib_get_ack(struct rds_ib_connection *ic)
79319 static void rds_ib_set_ack(struct rds_ib_connection *ic, u64 seq,
79320 int ack_required)
79321 {
79322 - atomic64_set(&ic->i_ack_next, seq);
79323 + atomic64_set_unchecked(&ic->i_ack_next, seq);
79324 if (ack_required) {
79325 smp_mb__before_clear_bit();
79326 set_bit(IB_ACK_REQUESTED, &ic->i_ack_flags);
79327 @@ -604,7 +604,7 @@ static u64 rds_ib_get_ack(struct rds_ib_connection *ic)
79328 clear_bit(IB_ACK_REQUESTED, &ic->i_ack_flags);
79329 smp_mb__after_clear_bit();
79330
79331 - return atomic64_read(&ic->i_ack_next);
79332 + return atomic64_read_unchecked(&ic->i_ack_next);
79333 }
79334 #endif
79335
79336 diff --git a/net/rds/iw.h b/net/rds/iw.h
79337 index 04ce3b1..48119a6 100644
79338 --- a/net/rds/iw.h
79339 +++ b/net/rds/iw.h
79340 @@ -134,7 +134,7 @@ struct rds_iw_connection {
79341 /* sending acks */
79342 unsigned long i_ack_flags;
79343 #ifdef KERNEL_HAS_ATOMIC64
79344 - atomic64_t i_ack_next; /* next ACK to send */
79345 + atomic64_unchecked_t i_ack_next; /* next ACK to send */
79346 #else
79347 spinlock_t i_ack_lock; /* protect i_ack_next */
79348 u64 i_ack_next; /* next ACK to send */
79349 diff --git a/net/rds/iw_cm.c b/net/rds/iw_cm.c
79350 index a91e1db..cf3053f 100644
79351 --- a/net/rds/iw_cm.c
79352 +++ b/net/rds/iw_cm.c
79353 @@ -663,7 +663,7 @@ void rds_iw_conn_shutdown(struct rds_connection *conn)
79354 /* Clear the ACK state */
79355 clear_bit(IB_ACK_IN_FLIGHT, &ic->i_ack_flags);
79356 #ifdef KERNEL_HAS_ATOMIC64
79357 - atomic64_set(&ic->i_ack_next, 0);
79358 + atomic64_set_unchecked(&ic->i_ack_next, 0);
79359 #else
79360 ic->i_ack_next = 0;
79361 #endif
79362 diff --git a/net/rds/iw_recv.c b/net/rds/iw_recv.c
79363 index 4503335..db566b4 100644
79364 --- a/net/rds/iw_recv.c
79365 +++ b/net/rds/iw_recv.c
79366 @@ -427,7 +427,7 @@ static u64 rds_iw_get_ack(struct rds_iw_connection *ic)
79367 static void rds_iw_set_ack(struct rds_iw_connection *ic, u64 seq,
79368 int ack_required)
79369 {
79370 - atomic64_set(&ic->i_ack_next, seq);
79371 + atomic64_set_unchecked(&ic->i_ack_next, seq);
79372 if (ack_required) {
79373 smp_mb__before_clear_bit();
79374 set_bit(IB_ACK_REQUESTED, &ic->i_ack_flags);
79375 @@ -439,7 +439,7 @@ static u64 rds_iw_get_ack(struct rds_iw_connection *ic)
79376 clear_bit(IB_ACK_REQUESTED, &ic->i_ack_flags);
79377 smp_mb__after_clear_bit();
79378
79379 - return atomic64_read(&ic->i_ack_next);
79380 + return atomic64_read_unchecked(&ic->i_ack_next);
79381 }
79382 #endif
79383
79384 diff --git a/net/rds/tcp.c b/net/rds/tcp.c
79385 index edac9ef..16bcb98 100644
79386 --- a/net/rds/tcp.c
79387 +++ b/net/rds/tcp.c
79388 @@ -59,7 +59,7 @@ void rds_tcp_nonagle(struct socket *sock)
79389 int val = 1;
79390
79391 set_fs(KERNEL_DS);
79392 - sock->ops->setsockopt(sock, SOL_TCP, TCP_NODELAY, (char __user *)&val,
79393 + sock->ops->setsockopt(sock, SOL_TCP, TCP_NODELAY, (char __force_user *)&val,
79394 sizeof(val));
79395 set_fs(oldfs);
79396 }
79397 diff --git a/net/rds/tcp_send.c b/net/rds/tcp_send.c
79398 index 1b4fd68..2234175 100644
79399 --- a/net/rds/tcp_send.c
79400 +++ b/net/rds/tcp_send.c
79401 @@ -43,7 +43,7 @@ static void rds_tcp_cork(struct socket *sock, int val)
79402
79403 oldfs = get_fs();
79404 set_fs(KERNEL_DS);
79405 - sock->ops->setsockopt(sock, SOL_TCP, TCP_CORK, (char __user *)&val,
79406 + sock->ops->setsockopt(sock, SOL_TCP, TCP_CORK, (char __force_user *)&val,
79407 sizeof(val));
79408 set_fs(oldfs);
79409 }
79410 diff --git a/net/rxrpc/af_rxrpc.c b/net/rxrpc/af_rxrpc.c
79411 index 05996d0..5a1dfe0 100644
79412 --- a/net/rxrpc/af_rxrpc.c
79413 +++ b/net/rxrpc/af_rxrpc.c
79414 @@ -39,7 +39,7 @@ static const struct proto_ops rxrpc_rpc_ops;
79415 __be32 rxrpc_epoch;
79416
79417 /* current debugging ID */
79418 -atomic_t rxrpc_debug_id;
79419 +atomic_unchecked_t rxrpc_debug_id;
79420
79421 /* count of skbs currently in use */
79422 atomic_t rxrpc_n_skbs;
79423 diff --git a/net/rxrpc/ar-ack.c b/net/rxrpc/ar-ack.c
79424 index e4d9cbc..b229649 100644
79425 --- a/net/rxrpc/ar-ack.c
79426 +++ b/net/rxrpc/ar-ack.c
79427 @@ -175,7 +175,7 @@ static void rxrpc_resend(struct rxrpc_call *call)
79428
79429 _enter("{%d,%d,%d,%d},",
79430 call->acks_hard, call->acks_unacked,
79431 - atomic_read(&call->sequence),
79432 + atomic_read_unchecked(&call->sequence),
79433 CIRC_CNT(call->acks_head, call->acks_tail, call->acks_winsz));
79434
79435 stop = 0;
79436 @@ -199,7 +199,7 @@ static void rxrpc_resend(struct rxrpc_call *call)
79437
79438 /* each Tx packet has a new serial number */
79439 sp->hdr.serial =
79440 - htonl(atomic_inc_return(&call->conn->serial));
79441 + htonl(atomic_inc_return_unchecked(&call->conn->serial));
79442
79443 hdr = (struct rxrpc_header *) txb->head;
79444 hdr->serial = sp->hdr.serial;
79445 @@ -403,7 +403,7 @@ static void rxrpc_rotate_tx_window(struct rxrpc_call *call, u32 hard)
79446 */
79447 static void rxrpc_clear_tx_window(struct rxrpc_call *call)
79448 {
79449 - rxrpc_rotate_tx_window(call, atomic_read(&call->sequence));
79450 + rxrpc_rotate_tx_window(call, atomic_read_unchecked(&call->sequence));
79451 }
79452
79453 /*
79454 @@ -629,7 +629,7 @@ process_further:
79455
79456 latest = ntohl(sp->hdr.serial);
79457 hard = ntohl(ack.firstPacket);
79458 - tx = atomic_read(&call->sequence);
79459 + tx = atomic_read_unchecked(&call->sequence);
79460
79461 _proto("Rx ACK %%%u { m=%hu f=#%u p=#%u s=%%%u r=%s n=%u }",
79462 latest,
79463 @@ -1161,7 +1161,7 @@ void rxrpc_process_call(struct work_struct *work)
79464 goto maybe_reschedule;
79465
79466 send_ACK_with_skew:
79467 - ack.maxSkew = htons(atomic_read(&call->conn->hi_serial) -
79468 + ack.maxSkew = htons(atomic_read_unchecked(&call->conn->hi_serial) -
79469 ntohl(ack.serial));
79470 send_ACK:
79471 mtu = call->conn->trans->peer->if_mtu;
79472 @@ -1173,7 +1173,7 @@ send_ACK:
79473 ackinfo.rxMTU = htonl(5692);
79474 ackinfo.jumbo_max = htonl(4);
79475
79476 - hdr.serial = htonl(atomic_inc_return(&call->conn->serial));
79477 + hdr.serial = htonl(atomic_inc_return_unchecked(&call->conn->serial));
79478 _proto("Tx ACK %%%u { m=%hu f=#%u p=#%u s=%%%u r=%s n=%u }",
79479 ntohl(hdr.serial),
79480 ntohs(ack.maxSkew),
79481 @@ -1191,7 +1191,7 @@ send_ACK:
79482 send_message:
79483 _debug("send message");
79484
79485 - hdr.serial = htonl(atomic_inc_return(&call->conn->serial));
79486 + hdr.serial = htonl(atomic_inc_return_unchecked(&call->conn->serial));
79487 _proto("Tx %s %%%u", rxrpc_pkts[hdr.type], ntohl(hdr.serial));
79488 send_message_2:
79489
79490 diff --git a/net/rxrpc/ar-call.c b/net/rxrpc/ar-call.c
79491 index a3bbb36..3341fb9 100644
79492 --- a/net/rxrpc/ar-call.c
79493 +++ b/net/rxrpc/ar-call.c
79494 @@ -83,7 +83,7 @@ static struct rxrpc_call *rxrpc_alloc_call(gfp_t gfp)
79495 spin_lock_init(&call->lock);
79496 rwlock_init(&call->state_lock);
79497 atomic_set(&call->usage, 1);
79498 - call->debug_id = atomic_inc_return(&rxrpc_debug_id);
79499 + call->debug_id = atomic_inc_return_unchecked(&rxrpc_debug_id);
79500 call->state = RXRPC_CALL_CLIENT_SEND_REQUEST;
79501
79502 memset(&call->sock_node, 0xed, sizeof(call->sock_node));
79503 diff --git a/net/rxrpc/ar-connection.c b/net/rxrpc/ar-connection.c
79504 index 4106ca9..a338d7a 100644
79505 --- a/net/rxrpc/ar-connection.c
79506 +++ b/net/rxrpc/ar-connection.c
79507 @@ -206,7 +206,7 @@ static struct rxrpc_connection *rxrpc_alloc_connection(gfp_t gfp)
79508 rwlock_init(&conn->lock);
79509 spin_lock_init(&conn->state_lock);
79510 atomic_set(&conn->usage, 1);
79511 - conn->debug_id = atomic_inc_return(&rxrpc_debug_id);
79512 + conn->debug_id = atomic_inc_return_unchecked(&rxrpc_debug_id);
79513 conn->avail_calls = RXRPC_MAXCALLS;
79514 conn->size_align = 4;
79515 conn->header_size = sizeof(struct rxrpc_header);
79516 diff --git a/net/rxrpc/ar-connevent.c b/net/rxrpc/ar-connevent.c
79517 index e7ed43a..6afa140 100644
79518 --- a/net/rxrpc/ar-connevent.c
79519 +++ b/net/rxrpc/ar-connevent.c
79520 @@ -109,7 +109,7 @@ static int rxrpc_abort_connection(struct rxrpc_connection *conn,
79521
79522 len = iov[0].iov_len + iov[1].iov_len;
79523
79524 - hdr.serial = htonl(atomic_inc_return(&conn->serial));
79525 + hdr.serial = htonl(atomic_inc_return_unchecked(&conn->serial));
79526 _proto("Tx CONN ABORT %%%u { %d }", ntohl(hdr.serial), abort_code);
79527
79528 ret = kernel_sendmsg(conn->trans->local->socket, &msg, iov, 2, len);
79529 diff --git a/net/rxrpc/ar-input.c b/net/rxrpc/ar-input.c
79530 index 529572f..c758ca7 100644
79531 --- a/net/rxrpc/ar-input.c
79532 +++ b/net/rxrpc/ar-input.c
79533 @@ -340,9 +340,9 @@ void rxrpc_fast_process_packet(struct rxrpc_call *call, struct sk_buff *skb)
79534 /* track the latest serial number on this connection for ACK packet
79535 * information */
79536 serial = ntohl(sp->hdr.serial);
79537 - hi_serial = atomic_read(&call->conn->hi_serial);
79538 + hi_serial = atomic_read_unchecked(&call->conn->hi_serial);
79539 while (serial > hi_serial)
79540 - hi_serial = atomic_cmpxchg(&call->conn->hi_serial, hi_serial,
79541 + hi_serial = atomic_cmpxchg_unchecked(&call->conn->hi_serial, hi_serial,
79542 serial);
79543
79544 /* request ACK generation for any ACK or DATA packet that requests
79545 diff --git a/net/rxrpc/ar-internal.h b/net/rxrpc/ar-internal.h
79546 index a693aca..81e7293 100644
79547 --- a/net/rxrpc/ar-internal.h
79548 +++ b/net/rxrpc/ar-internal.h
79549 @@ -272,8 +272,8 @@ struct rxrpc_connection {
79550 int error; /* error code for local abort */
79551 int debug_id; /* debug ID for printks */
79552 unsigned int call_counter; /* call ID counter */
79553 - atomic_t serial; /* packet serial number counter */
79554 - atomic_t hi_serial; /* highest serial number received */
79555 + atomic_unchecked_t serial; /* packet serial number counter */
79556 + atomic_unchecked_t hi_serial; /* highest serial number received */
79557 u8 avail_calls; /* number of calls available */
79558 u8 size_align; /* data size alignment (for security) */
79559 u8 header_size; /* rxrpc + security header size */
79560 @@ -346,7 +346,7 @@ struct rxrpc_call {
79561 spinlock_t lock;
79562 rwlock_t state_lock; /* lock for state transition */
79563 atomic_t usage;
79564 - atomic_t sequence; /* Tx data packet sequence counter */
79565 + atomic_unchecked_t sequence; /* Tx data packet sequence counter */
79566 u32 abort_code; /* local/remote abort code */
79567 enum { /* current state of call */
79568 RXRPC_CALL_CLIENT_SEND_REQUEST, /* - client sending request phase */
79569 @@ -420,7 +420,7 @@ static inline void rxrpc_abort_call(struct rxrpc_call *call, u32 abort_code)
79570 */
79571 extern atomic_t rxrpc_n_skbs;
79572 extern __be32 rxrpc_epoch;
79573 -extern atomic_t rxrpc_debug_id;
79574 +extern atomic_unchecked_t rxrpc_debug_id;
79575 extern struct workqueue_struct *rxrpc_workqueue;
79576
79577 /*
79578 diff --git a/net/rxrpc/ar-local.c b/net/rxrpc/ar-local.c
79579 index 87f7135..74d3703 100644
79580 --- a/net/rxrpc/ar-local.c
79581 +++ b/net/rxrpc/ar-local.c
79582 @@ -45,7 +45,7 @@ struct rxrpc_local *rxrpc_alloc_local(struct sockaddr_rxrpc *srx)
79583 spin_lock_init(&local->lock);
79584 rwlock_init(&local->services_lock);
79585 atomic_set(&local->usage, 1);
79586 - local->debug_id = atomic_inc_return(&rxrpc_debug_id);
79587 + local->debug_id = atomic_inc_return_unchecked(&rxrpc_debug_id);
79588 memcpy(&local->srx, srx, sizeof(*srx));
79589 }
79590
79591 diff --git a/net/rxrpc/ar-output.c b/net/rxrpc/ar-output.c
79592 index e1ac183..b43e10e 100644
79593 --- a/net/rxrpc/ar-output.c
79594 +++ b/net/rxrpc/ar-output.c
79595 @@ -682,9 +682,9 @@ static int rxrpc_send_data(struct kiocb *iocb,
79596 sp->hdr.cid = call->cid;
79597 sp->hdr.callNumber = call->call_id;
79598 sp->hdr.seq =
79599 - htonl(atomic_inc_return(&call->sequence));
79600 + htonl(atomic_inc_return_unchecked(&call->sequence));
79601 sp->hdr.serial =
79602 - htonl(atomic_inc_return(&conn->serial));
79603 + htonl(atomic_inc_return_unchecked(&conn->serial));
79604 sp->hdr.type = RXRPC_PACKET_TYPE_DATA;
79605 sp->hdr.userStatus = 0;
79606 sp->hdr.securityIndex = conn->security_ix;
79607 diff --git a/net/rxrpc/ar-peer.c b/net/rxrpc/ar-peer.c
79608 index bebaa43..2644591 100644
79609 --- a/net/rxrpc/ar-peer.c
79610 +++ b/net/rxrpc/ar-peer.c
79611 @@ -72,7 +72,7 @@ static struct rxrpc_peer *rxrpc_alloc_peer(struct sockaddr_rxrpc *srx,
79612 INIT_LIST_HEAD(&peer->error_targets);
79613 spin_lock_init(&peer->lock);
79614 atomic_set(&peer->usage, 1);
79615 - peer->debug_id = atomic_inc_return(&rxrpc_debug_id);
79616 + peer->debug_id = atomic_inc_return_unchecked(&rxrpc_debug_id);
79617 memcpy(&peer->srx, srx, sizeof(*srx));
79618
79619 rxrpc_assess_MTU_size(peer);
79620 diff --git a/net/rxrpc/ar-proc.c b/net/rxrpc/ar-proc.c
79621 index 38047f7..9f48511 100644
79622 --- a/net/rxrpc/ar-proc.c
79623 +++ b/net/rxrpc/ar-proc.c
79624 @@ -164,8 +164,8 @@ static int rxrpc_connection_seq_show(struct seq_file *seq, void *v)
79625 atomic_read(&conn->usage),
79626 rxrpc_conn_states[conn->state],
79627 key_serial(conn->key),
79628 - atomic_read(&conn->serial),
79629 - atomic_read(&conn->hi_serial));
79630 + atomic_read_unchecked(&conn->serial),
79631 + atomic_read_unchecked(&conn->hi_serial));
79632
79633 return 0;
79634 }
79635 diff --git a/net/rxrpc/ar-transport.c b/net/rxrpc/ar-transport.c
79636 index 92df566..87ec1bf 100644
79637 --- a/net/rxrpc/ar-transport.c
79638 +++ b/net/rxrpc/ar-transport.c
79639 @@ -47,7 +47,7 @@ static struct rxrpc_transport *rxrpc_alloc_transport(struct rxrpc_local *local,
79640 spin_lock_init(&trans->client_lock);
79641 rwlock_init(&trans->conn_lock);
79642 atomic_set(&trans->usage, 1);
79643 - trans->debug_id = atomic_inc_return(&rxrpc_debug_id);
79644 + trans->debug_id = atomic_inc_return_unchecked(&rxrpc_debug_id);
79645
79646 if (peer->srx.transport.family == AF_INET) {
79647 switch (peer->srx.transport_type) {
79648 diff --git a/net/rxrpc/rxkad.c b/net/rxrpc/rxkad.c
79649 index f226709..0e735a8 100644
79650 --- a/net/rxrpc/rxkad.c
79651 +++ b/net/rxrpc/rxkad.c
79652 @@ -610,7 +610,7 @@ static int rxkad_issue_challenge(struct rxrpc_connection *conn)
79653
79654 len = iov[0].iov_len + iov[1].iov_len;
79655
79656 - hdr.serial = htonl(atomic_inc_return(&conn->serial));
79657 + hdr.serial = htonl(atomic_inc_return_unchecked(&conn->serial));
79658 _proto("Tx CHALLENGE %%%u", ntohl(hdr.serial));
79659
79660 ret = kernel_sendmsg(conn->trans->local->socket, &msg, iov, 2, len);
79661 @@ -660,7 +660,7 @@ static int rxkad_send_response(struct rxrpc_connection *conn,
79662
79663 len = iov[0].iov_len + iov[1].iov_len + iov[2].iov_len;
79664
79665 - hdr->serial = htonl(atomic_inc_return(&conn->serial));
79666 + hdr->serial = htonl(atomic_inc_return_unchecked(&conn->serial));
79667 _proto("Tx RESPONSE %%%u", ntohl(hdr->serial));
79668
79669 ret = kernel_sendmsg(conn->trans->local->socket, &msg, iov, 3, len);
79670 diff --git a/net/sctp/proc.c b/net/sctp/proc.c
79671 index 1e2eee8..ce3967e 100644
79672 --- a/net/sctp/proc.c
79673 +++ b/net/sctp/proc.c
79674 @@ -319,7 +319,8 @@ static int sctp_assocs_seq_show(struct seq_file *seq, void *v)
79675 seq_printf(seq,
79676 "%8pK %8pK %-3d %-3d %-2d %-4d "
79677 "%4d %8d %8d %7d %5lu %-5d %5d ",
79678 - assoc, sk, sctp_sk(sk)->type, sk->sk_state,
79679 + assoc, sk,
79680 + sctp_sk(sk)->type, sk->sk_state,
79681 assoc->state, hash,
79682 assoc->assoc_id,
79683 assoc->sndbuf_used,
79684 diff --git a/net/sctp/socket.c b/net/sctp/socket.c
79685 index 5e25981..dbda919 100644
79686 --- a/net/sctp/socket.c
79687 +++ b/net/sctp/socket.c
79688 @@ -4630,6 +4630,8 @@ static int sctp_getsockopt_peer_addrs(struct sock *sk, int len,
79689 addrlen = sctp_get_af_specific(temp.sa.sa_family)->sockaddr_len;
79690 if (space_left < addrlen)
79691 return -ENOMEM;
79692 + if (addrlen > sizeof(temp) || addrlen < 0)
79693 + return -EFAULT;
79694 if (copy_to_user(to, &temp, addrlen))
79695 return -EFAULT;
79696 to += addrlen;
79697 diff --git a/net/socket.c b/net/socket.c
79698 index edc3c4a..4b4e4a8 100644
79699 --- a/net/socket.c
79700 +++ b/net/socket.c
79701 @@ -88,6 +88,7 @@
79702 #include <linux/nsproxy.h>
79703 #include <linux/magic.h>
79704 #include <linux/slab.h>
79705 +#include <linux/in.h>
79706
79707 #include <asm/uaccess.h>
79708 #include <asm/unistd.h>
79709 @@ -105,6 +106,8 @@
79710 #include <linux/sockios.h>
79711 #include <linux/atalk.h>
79712
79713 +#include <linux/grsock.h>
79714 +
79715 static int sock_no_open(struct inode *irrelevant, struct file *dontcare);
79716 static ssize_t sock_aio_read(struct kiocb *iocb, const struct iovec *iov,
79717 unsigned long nr_segs, loff_t pos);
79718 @@ -321,7 +324,7 @@ static struct dentry *sockfs_mount(struct file_system_type *fs_type,
79719 &sockfs_dentry_operations, SOCKFS_MAGIC);
79720 }
79721
79722 -static struct vfsmount *sock_mnt __read_mostly;
79723 +struct vfsmount *sock_mnt __read_mostly;
79724
79725 static struct file_system_type sock_fs_type = {
79726 .name = "sockfs",
79727 @@ -1209,6 +1212,8 @@ int __sock_create(struct net *net, int family, int type, int protocol,
79728 return -EAFNOSUPPORT;
79729 if (type < 0 || type >= SOCK_MAX)
79730 return -EINVAL;
79731 + if (protocol < 0)
79732 + return -EINVAL;
79733
79734 /* Compatibility.
79735
79736 @@ -1340,6 +1345,16 @@ SYSCALL_DEFINE3(socket, int, family, int, type, int, protocol)
79737 if (SOCK_NONBLOCK != O_NONBLOCK && (flags & SOCK_NONBLOCK))
79738 flags = (flags & ~SOCK_NONBLOCK) | O_NONBLOCK;
79739
79740 + if(!gr_search_socket(family, type, protocol)) {
79741 + retval = -EACCES;
79742 + goto out;
79743 + }
79744 +
79745 + if (gr_handle_sock_all(family, type, protocol)) {
79746 + retval = -EACCES;
79747 + goto out;
79748 + }
79749 +
79750 retval = sock_create(family, type, protocol, &sock);
79751 if (retval < 0)
79752 goto out;
79753 @@ -1452,6 +1467,14 @@ SYSCALL_DEFINE3(bind, int, fd, struct sockaddr __user *, umyaddr, int, addrlen)
79754 if (sock) {
79755 err = move_addr_to_kernel(umyaddr, addrlen, &address);
79756 if (err >= 0) {
79757 + if (gr_handle_sock_server((struct sockaddr *)&address)) {
79758 + err = -EACCES;
79759 + goto error;
79760 + }
79761 + err = gr_search_bind(sock, (struct sockaddr_in *)&address);
79762 + if (err)
79763 + goto error;
79764 +
79765 err = security_socket_bind(sock,
79766 (struct sockaddr *)&address,
79767 addrlen);
79768 @@ -1460,6 +1483,7 @@ SYSCALL_DEFINE3(bind, int, fd, struct sockaddr __user *, umyaddr, int, addrlen)
79769 (struct sockaddr *)
79770 &address, addrlen);
79771 }
79772 +error:
79773 fput_light(sock->file, fput_needed);
79774 }
79775 return err;
79776 @@ -1483,10 +1507,20 @@ SYSCALL_DEFINE2(listen, int, fd, int, backlog)
79777 if ((unsigned int)backlog > somaxconn)
79778 backlog = somaxconn;
79779
79780 + if (gr_handle_sock_server_other(sock->sk)) {
79781 + err = -EPERM;
79782 + goto error;
79783 + }
79784 +
79785 + err = gr_search_listen(sock);
79786 + if (err)
79787 + goto error;
79788 +
79789 err = security_socket_listen(sock, backlog);
79790 if (!err)
79791 err = sock->ops->listen(sock, backlog);
79792
79793 +error:
79794 fput_light(sock->file, fput_needed);
79795 }
79796 return err;
79797 @@ -1530,6 +1564,18 @@ SYSCALL_DEFINE4(accept4, int, fd, struct sockaddr __user *, upeer_sockaddr,
79798 newsock->type = sock->type;
79799 newsock->ops = sock->ops;
79800
79801 + if (gr_handle_sock_server_other(sock->sk)) {
79802 + err = -EPERM;
79803 + sock_release(newsock);
79804 + goto out_put;
79805 + }
79806 +
79807 + err = gr_search_accept(sock);
79808 + if (err) {
79809 + sock_release(newsock);
79810 + goto out_put;
79811 + }
79812 +
79813 /*
79814 * We don't need try_module_get here, as the listening socket (sock)
79815 * has the protocol module (sock->ops->owner) held.
79816 @@ -1568,6 +1614,8 @@ SYSCALL_DEFINE4(accept4, int, fd, struct sockaddr __user *, upeer_sockaddr,
79817 fd_install(newfd, newfile);
79818 err = newfd;
79819
79820 + gr_attach_curr_ip(newsock->sk);
79821 +
79822 out_put:
79823 fput_light(sock->file, fput_needed);
79824 out:
79825 @@ -1600,6 +1648,7 @@ SYSCALL_DEFINE3(connect, int, fd, struct sockaddr __user *, uservaddr,
79826 int, addrlen)
79827 {
79828 struct socket *sock;
79829 + struct sockaddr *sck;
79830 struct sockaddr_storage address;
79831 int err, fput_needed;
79832
79833 @@ -1610,6 +1659,17 @@ SYSCALL_DEFINE3(connect, int, fd, struct sockaddr __user *, uservaddr,
79834 if (err < 0)
79835 goto out_put;
79836
79837 + sck = (struct sockaddr *)&address;
79838 +
79839 + if (gr_handle_sock_client(sck)) {
79840 + err = -EACCES;
79841 + goto out_put;
79842 + }
79843 +
79844 + err = gr_search_connect(sock, (struct sockaddr_in *)sck);
79845 + if (err)
79846 + goto out_put;
79847 +
79848 err =
79849 security_socket_connect(sock, (struct sockaddr *)&address, addrlen);
79850 if (err)
79851 @@ -1964,7 +2024,7 @@ static int __sys_sendmsg(struct socket *sock, struct msghdr __user *msg,
79852 * checking falls down on this.
79853 */
79854 if (copy_from_user(ctl_buf,
79855 - (void __user __force *)msg_sys->msg_control,
79856 + (void __force_user *)msg_sys->msg_control,
79857 ctl_len))
79858 goto out_freectl;
79859 msg_sys->msg_control = ctl_buf;
79860 @@ -2132,7 +2192,7 @@ static int __sys_recvmsg(struct socket *sock, struct msghdr __user *msg,
79861 * kernel msghdr to use the kernel address space)
79862 */
79863
79864 - uaddr = (__force void __user *)msg_sys->msg_name;
79865 + uaddr = (void __force_user *)msg_sys->msg_name;
79866 uaddr_len = COMPAT_NAMELEN(msg);
79867 if (MSG_CMSG_COMPAT & flags) {
79868 err = verify_compat_iovec(msg_sys, iov, &addr, VERIFY_WRITE);
79869 @@ -2761,7 +2821,7 @@ static int ethtool_ioctl(struct net *net, struct compat_ifreq __user *ifr32)
79870 }
79871
79872 ifr = compat_alloc_user_space(buf_size);
79873 - rxnfc = (void *)ifr + ALIGN(sizeof(struct ifreq), 8);
79874 + rxnfc = (void __user *)ifr + ALIGN(sizeof(struct ifreq), 8);
79875
79876 if (copy_in_user(&ifr->ifr_name, &ifr32->ifr_name, IFNAMSIZ))
79877 return -EFAULT;
79878 @@ -2785,12 +2845,12 @@ static int ethtool_ioctl(struct net *net, struct compat_ifreq __user *ifr32)
79879 offsetof(struct ethtool_rxnfc, fs.ring_cookie));
79880
79881 if (copy_in_user(rxnfc, compat_rxnfc,
79882 - (void *)(&rxnfc->fs.m_ext + 1) -
79883 - (void *)rxnfc) ||
79884 + (void __user *)(&rxnfc->fs.m_ext + 1) -
79885 + (void __user *)rxnfc) ||
79886 copy_in_user(&rxnfc->fs.ring_cookie,
79887 &compat_rxnfc->fs.ring_cookie,
79888 - (void *)(&rxnfc->fs.location + 1) -
79889 - (void *)&rxnfc->fs.ring_cookie) ||
79890 + (void __user *)(&rxnfc->fs.location + 1) -
79891 + (void __user *)&rxnfc->fs.ring_cookie) ||
79892 copy_in_user(&rxnfc->rule_cnt, &compat_rxnfc->rule_cnt,
79893 sizeof(rxnfc->rule_cnt)))
79894 return -EFAULT;
79895 @@ -2802,12 +2862,12 @@ static int ethtool_ioctl(struct net *net, struct compat_ifreq __user *ifr32)
79896
79897 if (convert_out) {
79898 if (copy_in_user(compat_rxnfc, rxnfc,
79899 - (const void *)(&rxnfc->fs.m_ext + 1) -
79900 - (const void *)rxnfc) ||
79901 + (const void __user *)(&rxnfc->fs.m_ext + 1) -
79902 + (const void __user *)rxnfc) ||
79903 copy_in_user(&compat_rxnfc->fs.ring_cookie,
79904 &rxnfc->fs.ring_cookie,
79905 - (const void *)(&rxnfc->fs.location + 1) -
79906 - (const void *)&rxnfc->fs.ring_cookie) ||
79907 + (const void __user *)(&rxnfc->fs.location + 1) -
79908 + (const void __user *)&rxnfc->fs.ring_cookie) ||
79909 copy_in_user(&compat_rxnfc->rule_cnt, &rxnfc->rule_cnt,
79910 sizeof(rxnfc->rule_cnt)))
79911 return -EFAULT;
79912 @@ -2877,7 +2937,7 @@ static int bond_ioctl(struct net *net, unsigned int cmd,
79913 old_fs = get_fs();
79914 set_fs(KERNEL_DS);
79915 err = dev_ioctl(net, cmd,
79916 - (struct ifreq __user __force *) &kifr);
79917 + (struct ifreq __force_user *) &kifr);
79918 set_fs(old_fs);
79919
79920 return err;
79921 @@ -2986,7 +3046,7 @@ static int compat_sioc_ifmap(struct net *net, unsigned int cmd,
79922
79923 old_fs = get_fs();
79924 set_fs(KERNEL_DS);
79925 - err = dev_ioctl(net, cmd, (void __user __force *)&ifr);
79926 + err = dev_ioctl(net, cmd, (void __force_user *)&ifr);
79927 set_fs(old_fs);
79928
79929 if (cmd == SIOCGIFMAP && !err) {
79930 @@ -3091,7 +3151,7 @@ static int routing_ioctl(struct net *net, struct socket *sock,
79931 ret |= __get_user(rtdev, &(ur4->rt_dev));
79932 if (rtdev) {
79933 ret |= copy_from_user(devname, compat_ptr(rtdev), 15);
79934 - r4.rt_dev = (char __user __force *)devname;
79935 + r4.rt_dev = (char __force_user *)devname;
79936 devname[15] = 0;
79937 } else
79938 r4.rt_dev = NULL;
79939 @@ -3317,8 +3377,8 @@ int kernel_getsockopt(struct socket *sock, int level, int optname,
79940 int __user *uoptlen;
79941 int err;
79942
79943 - uoptval = (char __user __force *) optval;
79944 - uoptlen = (int __user __force *) optlen;
79945 + uoptval = (char __force_user *) optval;
79946 + uoptlen = (int __force_user *) optlen;
79947
79948 set_fs(KERNEL_DS);
79949 if (level == SOL_SOCKET)
79950 @@ -3338,7 +3398,7 @@ int kernel_setsockopt(struct socket *sock, int level, int optname,
79951 char __user *uoptval;
79952 int err;
79953
79954 - uoptval = (char __user __force *) optval;
79955 + uoptval = (char __force_user *) optval;
79956
79957 set_fs(KERNEL_DS);
79958 if (level == SOL_SOCKET)
79959 diff --git a/net/sunrpc/sched.c b/net/sunrpc/sched.c
79960 index 128494e..775d0e0 100644
79961 --- a/net/sunrpc/sched.c
79962 +++ b/net/sunrpc/sched.c
79963 @@ -240,9 +240,9 @@ static int rpc_wait_bit_killable(void *word)
79964 #ifdef RPC_DEBUG
79965 static void rpc_task_set_debuginfo(struct rpc_task *task)
79966 {
79967 - static atomic_t rpc_pid;
79968 + static atomic_unchecked_t rpc_pid;
79969
79970 - task->tk_pid = atomic_inc_return(&rpc_pid);
79971 + task->tk_pid = atomic_inc_return_unchecked(&rpc_pid);
79972 }
79973 #else
79974 static inline void rpc_task_set_debuginfo(struct rpc_task *task)
79975 diff --git a/net/sunrpc/xprtrdma/svc_rdma.c b/net/sunrpc/xprtrdma/svc_rdma.c
79976 index 8343737..677025e 100644
79977 --- a/net/sunrpc/xprtrdma/svc_rdma.c
79978 +++ b/net/sunrpc/xprtrdma/svc_rdma.c
79979 @@ -62,15 +62,15 @@ unsigned int svcrdma_max_req_size = RPCRDMA_MAX_REQ_SIZE;
79980 static unsigned int min_max_inline = 4096;
79981 static unsigned int max_max_inline = 65536;
79982
79983 -atomic_t rdma_stat_recv;
79984 -atomic_t rdma_stat_read;
79985 -atomic_t rdma_stat_write;
79986 -atomic_t rdma_stat_sq_starve;
79987 -atomic_t rdma_stat_rq_starve;
79988 -atomic_t rdma_stat_rq_poll;
79989 -atomic_t rdma_stat_rq_prod;
79990 -atomic_t rdma_stat_sq_poll;
79991 -atomic_t rdma_stat_sq_prod;
79992 +atomic_unchecked_t rdma_stat_recv;
79993 +atomic_unchecked_t rdma_stat_read;
79994 +atomic_unchecked_t rdma_stat_write;
79995 +atomic_unchecked_t rdma_stat_sq_starve;
79996 +atomic_unchecked_t rdma_stat_rq_starve;
79997 +atomic_unchecked_t rdma_stat_rq_poll;
79998 +atomic_unchecked_t rdma_stat_rq_prod;
79999 +atomic_unchecked_t rdma_stat_sq_poll;
80000 +atomic_unchecked_t rdma_stat_sq_prod;
80001
80002 /* Temporary NFS request map and context caches */
80003 struct kmem_cache *svc_rdma_map_cachep;
80004 @@ -110,7 +110,7 @@ static int read_reset_stat(ctl_table *table, int write,
80005 len -= *ppos;
80006 if (len > *lenp)
80007 len = *lenp;
80008 - if (len && copy_to_user(buffer, str_buf, len))
80009 + if (len > sizeof str_buf || (len && copy_to_user(buffer, str_buf, len)))
80010 return -EFAULT;
80011 *lenp = len;
80012 *ppos += len;
80013 @@ -151,63 +151,63 @@ static ctl_table svcrdma_parm_table[] = {
80014 {
80015 .procname = "rdma_stat_read",
80016 .data = &rdma_stat_read,
80017 - .maxlen = sizeof(atomic_t),
80018 + .maxlen = sizeof(atomic_unchecked_t),
80019 .mode = 0644,
80020 .proc_handler = read_reset_stat,
80021 },
80022 {
80023 .procname = "rdma_stat_recv",
80024 .data = &rdma_stat_recv,
80025 - .maxlen = sizeof(atomic_t),
80026 + .maxlen = sizeof(atomic_unchecked_t),
80027 .mode = 0644,
80028 .proc_handler = read_reset_stat,
80029 },
80030 {
80031 .procname = "rdma_stat_write",
80032 .data = &rdma_stat_write,
80033 - .maxlen = sizeof(atomic_t),
80034 + .maxlen = sizeof(atomic_unchecked_t),
80035 .mode = 0644,
80036 .proc_handler = read_reset_stat,
80037 },
80038 {
80039 .procname = "rdma_stat_sq_starve",
80040 .data = &rdma_stat_sq_starve,
80041 - .maxlen = sizeof(atomic_t),
80042 + .maxlen = sizeof(atomic_unchecked_t),
80043 .mode = 0644,
80044 .proc_handler = read_reset_stat,
80045 },
80046 {
80047 .procname = "rdma_stat_rq_starve",
80048 .data = &rdma_stat_rq_starve,
80049 - .maxlen = sizeof(atomic_t),
80050 + .maxlen = sizeof(atomic_unchecked_t),
80051 .mode = 0644,
80052 .proc_handler = read_reset_stat,
80053 },
80054 {
80055 .procname = "rdma_stat_rq_poll",
80056 .data = &rdma_stat_rq_poll,
80057 - .maxlen = sizeof(atomic_t),
80058 + .maxlen = sizeof(atomic_unchecked_t),
80059 .mode = 0644,
80060 .proc_handler = read_reset_stat,
80061 },
80062 {
80063 .procname = "rdma_stat_rq_prod",
80064 .data = &rdma_stat_rq_prod,
80065 - .maxlen = sizeof(atomic_t),
80066 + .maxlen = sizeof(atomic_unchecked_t),
80067 .mode = 0644,
80068 .proc_handler = read_reset_stat,
80069 },
80070 {
80071 .procname = "rdma_stat_sq_poll",
80072 .data = &rdma_stat_sq_poll,
80073 - .maxlen = sizeof(atomic_t),
80074 + .maxlen = sizeof(atomic_unchecked_t),
80075 .mode = 0644,
80076 .proc_handler = read_reset_stat,
80077 },
80078 {
80079 .procname = "rdma_stat_sq_prod",
80080 .data = &rdma_stat_sq_prod,
80081 - .maxlen = sizeof(atomic_t),
80082 + .maxlen = sizeof(atomic_unchecked_t),
80083 .mode = 0644,
80084 .proc_handler = read_reset_stat,
80085 },
80086 diff --git a/net/sunrpc/xprtrdma/svc_rdma_recvfrom.c b/net/sunrpc/xprtrdma/svc_rdma_recvfrom.c
80087 index 41cb63b..c4a1489 100644
80088 --- a/net/sunrpc/xprtrdma/svc_rdma_recvfrom.c
80089 +++ b/net/sunrpc/xprtrdma/svc_rdma_recvfrom.c
80090 @@ -501,7 +501,7 @@ next_sge:
80091 svc_rdma_put_context(ctxt, 0);
80092 goto out;
80093 }
80094 - atomic_inc(&rdma_stat_read);
80095 + atomic_inc_unchecked(&rdma_stat_read);
80096
80097 if (read_wr.num_sge < chl_map->ch[ch_no].count) {
80098 chl_map->ch[ch_no].count -= read_wr.num_sge;
80099 @@ -611,7 +611,7 @@ int svc_rdma_recvfrom(struct svc_rqst *rqstp)
80100 dto_q);
80101 list_del_init(&ctxt->dto_q);
80102 } else {
80103 - atomic_inc(&rdma_stat_rq_starve);
80104 + atomic_inc_unchecked(&rdma_stat_rq_starve);
80105 clear_bit(XPT_DATA, &xprt->xpt_flags);
80106 ctxt = NULL;
80107 }
80108 @@ -631,7 +631,7 @@ int svc_rdma_recvfrom(struct svc_rqst *rqstp)
80109 dprintk("svcrdma: processing ctxt=%p on xprt=%p, rqstp=%p, status=%d\n",
80110 ctxt, rdma_xprt, rqstp, ctxt->wc_status);
80111 BUG_ON(ctxt->wc_status != IB_WC_SUCCESS);
80112 - atomic_inc(&rdma_stat_recv);
80113 + atomic_inc_unchecked(&rdma_stat_recv);
80114
80115 /* Build up the XDR from the receive buffers. */
80116 rdma_build_arg_xdr(rqstp, ctxt, ctxt->byte_len);
80117 diff --git a/net/sunrpc/xprtrdma/svc_rdma_sendto.c b/net/sunrpc/xprtrdma/svc_rdma_sendto.c
80118 index 42eb7ba..c887c45 100644
80119 --- a/net/sunrpc/xprtrdma/svc_rdma_sendto.c
80120 +++ b/net/sunrpc/xprtrdma/svc_rdma_sendto.c
80121 @@ -362,7 +362,7 @@ static int send_write(struct svcxprt_rdma *xprt, struct svc_rqst *rqstp,
80122 write_wr.wr.rdma.remote_addr = to;
80123
80124 /* Post It */
80125 - atomic_inc(&rdma_stat_write);
80126 + atomic_inc_unchecked(&rdma_stat_write);
80127 if (svc_rdma_send(xprt, &write_wr))
80128 goto err;
80129 return 0;
80130 diff --git a/net/sunrpc/xprtrdma/svc_rdma_transport.c b/net/sunrpc/xprtrdma/svc_rdma_transport.c
80131 index 73b428b..5f3f8f3 100644
80132 --- a/net/sunrpc/xprtrdma/svc_rdma_transport.c
80133 +++ b/net/sunrpc/xprtrdma/svc_rdma_transport.c
80134 @@ -292,7 +292,7 @@ static void rq_cq_reap(struct svcxprt_rdma *xprt)
80135 return;
80136
80137 ib_req_notify_cq(xprt->sc_rq_cq, IB_CQ_NEXT_COMP);
80138 - atomic_inc(&rdma_stat_rq_poll);
80139 + atomic_inc_unchecked(&rdma_stat_rq_poll);
80140
80141 while ((ret = ib_poll_cq(xprt->sc_rq_cq, 1, &wc)) > 0) {
80142 ctxt = (struct svc_rdma_op_ctxt *)(unsigned long)wc.wr_id;
80143 @@ -314,7 +314,7 @@ static void rq_cq_reap(struct svcxprt_rdma *xprt)
80144 }
80145
80146 if (ctxt)
80147 - atomic_inc(&rdma_stat_rq_prod);
80148 + atomic_inc_unchecked(&rdma_stat_rq_prod);
80149
80150 set_bit(XPT_DATA, &xprt->sc_xprt.xpt_flags);
80151 /*
80152 @@ -386,7 +386,7 @@ static void sq_cq_reap(struct svcxprt_rdma *xprt)
80153 return;
80154
80155 ib_req_notify_cq(xprt->sc_sq_cq, IB_CQ_NEXT_COMP);
80156 - atomic_inc(&rdma_stat_sq_poll);
80157 + atomic_inc_unchecked(&rdma_stat_sq_poll);
80158 while ((ret = ib_poll_cq(cq, 1, &wc)) > 0) {
80159 if (wc.status != IB_WC_SUCCESS)
80160 /* Close the transport */
80161 @@ -404,7 +404,7 @@ static void sq_cq_reap(struct svcxprt_rdma *xprt)
80162 }
80163
80164 if (ctxt)
80165 - atomic_inc(&rdma_stat_sq_prod);
80166 + atomic_inc_unchecked(&rdma_stat_sq_prod);
80167 }
80168
80169 static void sq_comp_handler(struct ib_cq *cq, void *cq_context)
80170 @@ -1266,7 +1266,7 @@ int svc_rdma_send(struct svcxprt_rdma *xprt, struct ib_send_wr *wr)
80171 spin_lock_bh(&xprt->sc_lock);
80172 if (xprt->sc_sq_depth < atomic_read(&xprt->sc_sq_count) + wr_count) {
80173 spin_unlock_bh(&xprt->sc_lock);
80174 - atomic_inc(&rdma_stat_sq_starve);
80175 + atomic_inc_unchecked(&rdma_stat_sq_starve);
80176
80177 /* See if we can opportunistically reap SQ WR to make room */
80178 sq_cq_reap(xprt);
80179 diff --git a/net/sysctl_net.c b/net/sysctl_net.c
80180 index e3a6e37..be2ea77 100644
80181 --- a/net/sysctl_net.c
80182 +++ b/net/sysctl_net.c
80183 @@ -43,7 +43,7 @@ static int net_ctl_permissions(struct ctl_table_root *root,
80184 struct ctl_table *table)
80185 {
80186 /* Allow network administrator to have same access as root. */
80187 - if (capable(CAP_NET_ADMIN)) {
80188 + if (capable_nolog(CAP_NET_ADMIN)) {
80189 int mode = (table->mode >> 6) & 7;
80190 return (mode << 6) | (mode << 3) | mode;
80191 }
80192 diff --git a/net/tipc/link.c b/net/tipc/link.c
80193 index 1c1e615..113e0ae 100644
80194 --- a/net/tipc/link.c
80195 +++ b/net/tipc/link.c
80196 @@ -1171,7 +1171,7 @@ static int link_send_sections_long(struct tipc_port *sender,
80197 struct tipc_msg fragm_hdr;
80198 struct sk_buff *buf, *buf_chain, *prev;
80199 u32 fragm_crs, fragm_rest, hsz, sect_rest;
80200 - const unchar *sect_crs;
80201 + const unchar __user *sect_crs;
80202 int curr_sect;
80203 u32 fragm_no;
80204
80205 @@ -1212,7 +1212,7 @@ again:
80206
80207 if (!sect_rest) {
80208 sect_rest = msg_sect[++curr_sect].iov_len;
80209 - sect_crs = (const unchar *)msg_sect[curr_sect].iov_base;
80210 + sect_crs = (const unchar __user *)msg_sect[curr_sect].iov_base;
80211 }
80212
80213 if (sect_rest < fragm_rest)
80214 @@ -1231,7 +1231,7 @@ error:
80215 }
80216 } else
80217 skb_copy_to_linear_data_offset(buf, fragm_crs,
80218 - sect_crs, sz);
80219 + (const void __force_kernel *)sect_crs, sz);
80220 sect_crs += sz;
80221 sect_rest -= sz;
80222 fragm_crs += sz;
80223 diff --git a/net/tipc/msg.c b/net/tipc/msg.c
80224 index f2db8a8..9245aa4 100644
80225 --- a/net/tipc/msg.c
80226 +++ b/net/tipc/msg.c
80227 @@ -98,7 +98,7 @@ int tipc_msg_build(struct tipc_msg *hdr, struct iovec const *msg_sect,
80228 msg_sect[cnt].iov_len);
80229 else
80230 skb_copy_to_linear_data_offset(*buf, pos,
80231 - msg_sect[cnt].iov_base,
80232 + (const void __force_kernel *)msg_sect[cnt].iov_base,
80233 msg_sect[cnt].iov_len);
80234 pos += msg_sect[cnt].iov_len;
80235 }
80236 diff --git a/net/tipc/subscr.c b/net/tipc/subscr.c
80237 index 5ed5965..90abe34 100644
80238 --- a/net/tipc/subscr.c
80239 +++ b/net/tipc/subscr.c
80240 @@ -96,7 +96,7 @@ static void subscr_send_event(struct tipc_subscription *sub,
80241 {
80242 struct iovec msg_sect;
80243
80244 - msg_sect.iov_base = (void *)&sub->evt;
80245 + msg_sect.iov_base = (void __force_user *)&sub->evt;
80246 msg_sect.iov_len = sizeof(struct tipc_event);
80247
80248 sub->evt.event = htohl(event, sub->swap);
80249 diff --git a/net/unix/af_unix.c b/net/unix/af_unix.c
80250 index c5ee4ff..e905948 100644
80251 --- a/net/unix/af_unix.c
80252 +++ b/net/unix/af_unix.c
80253 @@ -789,6 +789,12 @@ static struct sock *unix_find_other(struct net *net,
80254 err = -ECONNREFUSED;
80255 if (!S_ISSOCK(inode->i_mode))
80256 goto put_fail;
80257 +
80258 + if (!gr_acl_handle_unix(path.dentry, path.mnt)) {
80259 + err = -EACCES;
80260 + goto put_fail;
80261 + }
80262 +
80263 u = unix_find_socket_byinode(inode);
80264 if (!u)
80265 goto put_fail;
80266 @@ -809,6 +815,13 @@ static struct sock *unix_find_other(struct net *net,
80267 if (u) {
80268 struct dentry *dentry;
80269 dentry = unix_sk(u)->path.dentry;
80270 +
80271 + if (!gr_handle_chroot_unix(pid_vnr(u->sk_peer_pid))) {
80272 + err = -EPERM;
80273 + sock_put(u);
80274 + goto fail;
80275 + }
80276 +
80277 if (dentry)
80278 touch_atime(&unix_sk(u)->path);
80279 } else
80280 @@ -842,12 +855,18 @@ static int unix_mknod(const char *sun_path, umode_t mode, struct path *res)
80281 */
80282 err = security_path_mknod(&path, dentry, mode, 0);
80283 if (!err) {
80284 + if (!gr_acl_handle_mknod(dentry, path.dentry, path.mnt, mode)) {
80285 + err = -EACCES;
80286 + goto out;
80287 + }
80288 err = vfs_mknod(path.dentry->d_inode, dentry, mode, 0);
80289 if (!err) {
80290 res->mnt = mntget(path.mnt);
80291 res->dentry = dget(dentry);
80292 + gr_handle_create(dentry, path.mnt);
80293 }
80294 }
80295 +out:
80296 done_path_create(&path, dentry);
80297 return err;
80298 }
80299 diff --git a/net/wireless/core.h b/net/wireless/core.h
80300 index bc7430b..35349de 100644
80301 --- a/net/wireless/core.h
80302 +++ b/net/wireless/core.h
80303 @@ -28,7 +28,7 @@ struct cfg80211_registered_device {
80304 struct mutex mtx;
80305
80306 /* rfkill support */
80307 - struct rfkill_ops rfkill_ops;
80308 + rfkill_ops_no_const rfkill_ops;
80309 struct rfkill *rfkill;
80310 struct work_struct rfkill_sync;
80311
80312 diff --git a/net/wireless/wext-core.c b/net/wireless/wext-core.c
80313 index b0eb7aa..7d73e82 100644
80314 --- a/net/wireless/wext-core.c
80315 +++ b/net/wireless/wext-core.c
80316 @@ -748,8 +748,7 @@ static int ioctl_standard_iw_point(struct iw_point *iwp, unsigned int cmd,
80317 */
80318
80319 /* Support for very large requests */
80320 - if ((descr->flags & IW_DESCR_FLAG_NOMAX) &&
80321 - (user_length > descr->max_tokens)) {
80322 + if (user_length > descr->max_tokens) {
80323 /* Allow userspace to GET more than max so
80324 * we can support any size GET requests.
80325 * There is still a limit : -ENOMEM.
80326 @@ -788,22 +787,6 @@ static int ioctl_standard_iw_point(struct iw_point *iwp, unsigned int cmd,
80327 }
80328 }
80329
80330 - if (IW_IS_GET(cmd) && !(descr->flags & IW_DESCR_FLAG_NOMAX)) {
80331 - /*
80332 - * If this is a GET, but not NOMAX, it means that the extra
80333 - * data is not bounded by userspace, but by max_tokens. Thus
80334 - * set the length to max_tokens. This matches the extra data
80335 - * allocation.
80336 - * The driver should fill it with the number of tokens it
80337 - * provided, and it may check iwp->length rather than having
80338 - * knowledge of max_tokens. If the driver doesn't change the
80339 - * iwp->length, this ioctl just copies back max_token tokens
80340 - * filled with zeroes. Hopefully the driver isn't claiming
80341 - * them to be valid data.
80342 - */
80343 - iwp->length = descr->max_tokens;
80344 - }
80345 -
80346 err = handler(dev, info, (union iwreq_data *) iwp, extra);
80347
80348 iwp->length += essid_compat;
80349 diff --git a/net/xfrm/xfrm_policy.c b/net/xfrm/xfrm_policy.c
80350 index 387848e..a6667a2 100644
80351 --- a/net/xfrm/xfrm_policy.c
80352 +++ b/net/xfrm/xfrm_policy.c
80353 @@ -300,7 +300,7 @@ static void xfrm_policy_kill(struct xfrm_policy *policy)
80354 {
80355 policy->walk.dead = 1;
80356
80357 - atomic_inc(&policy->genid);
80358 + atomic_inc_unchecked(&policy->genid);
80359
80360 if (del_timer(&policy->timer))
80361 xfrm_pol_put(policy);
80362 @@ -584,7 +584,7 @@ int xfrm_policy_insert(int dir, struct xfrm_policy *policy, int excl)
80363 hlist_add_head(&policy->bydst, chain);
80364 xfrm_pol_hold(policy);
80365 net->xfrm.policy_count[dir]++;
80366 - atomic_inc(&flow_cache_genid);
80367 + atomic_inc_unchecked(&flow_cache_genid);
80368 rt_genid_bump(net);
80369 if (delpol)
80370 __xfrm_policy_unlink(delpol, dir);
80371 @@ -1533,7 +1533,7 @@ free_dst:
80372 goto out;
80373 }
80374
80375 -static int inline
80376 +static inline int
80377 xfrm_dst_alloc_copy(void **target, const void *src, int size)
80378 {
80379 if (!*target) {
80380 @@ -1545,7 +1545,7 @@ xfrm_dst_alloc_copy(void **target, const void *src, int size)
80381 return 0;
80382 }
80383
80384 -static int inline
80385 +static inline int
80386 xfrm_dst_update_parent(struct dst_entry *dst, const struct xfrm_selector *sel)
80387 {
80388 #ifdef CONFIG_XFRM_SUB_POLICY
80389 @@ -1557,7 +1557,7 @@ xfrm_dst_update_parent(struct dst_entry *dst, const struct xfrm_selector *sel)
80390 #endif
80391 }
80392
80393 -static int inline
80394 +static inline int
80395 xfrm_dst_update_origin(struct dst_entry *dst, const struct flowi *fl)
80396 {
80397 #ifdef CONFIG_XFRM_SUB_POLICY
80398 @@ -1651,7 +1651,7 @@ xfrm_resolve_and_create_bundle(struct xfrm_policy **pols, int num_pols,
80399
80400 xdst->num_pols = num_pols;
80401 memcpy(xdst->pols, pols, sizeof(struct xfrm_policy*) * num_pols);
80402 - xdst->policy_genid = atomic_read(&pols[0]->genid);
80403 + xdst->policy_genid = atomic_read_unchecked(&pols[0]->genid);
80404
80405 return xdst;
80406 }
80407 @@ -2352,7 +2352,7 @@ static int xfrm_bundle_ok(struct xfrm_dst *first)
80408 if (xdst->xfrm_genid != dst->xfrm->genid)
80409 return 0;
80410 if (xdst->num_pols > 0 &&
80411 - xdst->policy_genid != atomic_read(&xdst->pols[0]->genid))
80412 + xdst->policy_genid != atomic_read_unchecked(&xdst->pols[0]->genid))
80413 return 0;
80414
80415 mtu = dst_mtu(dst->child);
80416 @@ -2891,7 +2891,7 @@ static int xfrm_policy_migrate(struct xfrm_policy *pol,
80417 sizeof(pol->xfrm_vec[i].saddr));
80418 pol->xfrm_vec[i].encap_family = mp->new_family;
80419 /* flush bundles */
80420 - atomic_inc(&pol->genid);
80421 + atomic_inc_unchecked(&pol->genid);
80422 }
80423 }
80424
80425 diff --git a/scripts/Makefile.build b/scripts/Makefile.build
80426 index ff1720d..ed8475e 100644
80427 --- a/scripts/Makefile.build
80428 +++ b/scripts/Makefile.build
80429 @@ -111,7 +111,7 @@ endif
80430 endif
80431
80432 # Do not include host rules unless needed
80433 -ifneq ($(hostprogs-y)$(hostprogs-m),)
80434 +ifneq ($(hostprogs-y)$(hostprogs-m)$(hostlibs-y)$(hostlibs-m)$(hostcxxlibs-y)$(hostcxxlibs-m),)
80435 include scripts/Makefile.host
80436 endif
80437
80438 diff --git a/scripts/Makefile.clean b/scripts/Makefile.clean
80439 index 686cb0d..9d653bf 100644
80440 --- a/scripts/Makefile.clean
80441 +++ b/scripts/Makefile.clean
80442 @@ -43,7 +43,8 @@ subdir-ymn := $(addprefix $(obj)/,$(subdir-ymn))
80443 __clean-files := $(extra-y) $(always) \
80444 $(targets) $(clean-files) \
80445 $(host-progs) \
80446 - $(hostprogs-y) $(hostprogs-m) $(hostprogs-)
80447 + $(hostprogs-y) $(hostprogs-m) $(hostprogs-) \
80448 + $(hostlibs-y) $(hostlibs-m) $(hostlibs-)
80449
80450 __clean-files := $(filter-out $(no-clean-files), $(__clean-files))
80451
80452 diff --git a/scripts/Makefile.host b/scripts/Makefile.host
80453 index 1ac414f..38575f7 100644
80454 --- a/scripts/Makefile.host
80455 +++ b/scripts/Makefile.host
80456 @@ -31,6 +31,8 @@
80457 # Note: Shared libraries consisting of C++ files are not supported
80458
80459 __hostprogs := $(sort $(hostprogs-y) $(hostprogs-m))
80460 +__hostlibs := $(sort $(hostlibs-y) $(hostlibs-m))
80461 +__hostcxxlibs := $(sort $(hostcxxlibs-y) $(hostcxxlibs-m))
80462
80463 # C code
80464 # Executables compiled from a single .c file
80465 @@ -54,11 +56,15 @@ host-cxxobjs := $(sort $(foreach m,$(host-cxxmulti),$($(m)-cxxobjs)))
80466 # Shared libaries (only .c supported)
80467 # Shared libraries (.so) - all .so files referenced in "xxx-objs"
80468 host-cshlib := $(sort $(filter %.so, $(host-cobjs)))
80469 +host-cshlib += $(sort $(filter %.so, $(__hostlibs)))
80470 +host-cxxshlib := $(sort $(filter %.so, $(__hostcxxlibs)))
80471 # Remove .so files from "xxx-objs"
80472 host-cobjs := $(filter-out %.so,$(host-cobjs))
80473 +host-cxxobjs := $(filter-out %.so,$(host-cxxobjs))
80474
80475 -#Object (.o) files used by the shared libaries
80476 +# Object (.o) files used by the shared libaries
80477 host-cshobjs := $(sort $(foreach m,$(host-cshlib),$($(m:.so=-objs))))
80478 +host-cxxshobjs := $(sort $(foreach m,$(host-cxxshlib),$($(m:.so=-objs))))
80479
80480 # output directory for programs/.o files
80481 # hostprogs-y := tools/build may have been specified. Retrieve directory
80482 @@ -82,7 +88,9 @@ host-cobjs := $(addprefix $(obj)/,$(host-cobjs))
80483 host-cxxmulti := $(addprefix $(obj)/,$(host-cxxmulti))
80484 host-cxxobjs := $(addprefix $(obj)/,$(host-cxxobjs))
80485 host-cshlib := $(addprefix $(obj)/,$(host-cshlib))
80486 +host-cxxshlib := $(addprefix $(obj)/,$(host-cxxshlib))
80487 host-cshobjs := $(addprefix $(obj)/,$(host-cshobjs))
80488 +host-cxxshobjs := $(addprefix $(obj)/,$(host-cxxshobjs))
80489 host-objdirs := $(addprefix $(obj)/,$(host-objdirs))
80490
80491 obj-dirs += $(host-objdirs)
80492 @@ -156,6 +164,13 @@ quiet_cmd_host-cshobjs = HOSTCC -fPIC $@
80493 $(host-cshobjs): $(obj)/%.o: $(src)/%.c FORCE
80494 $(call if_changed_dep,host-cshobjs)
80495
80496 +# Compile .c file, create position independent .o file
80497 +# host-cxxshobjs -> .o
80498 +quiet_cmd_host-cxxshobjs = HOSTCXX -fPIC $@
80499 + cmd_host-cxxshobjs = $(HOSTCXX) $(hostcxx_flags) -fPIC -c -o $@ $<
80500 +$(host-cxxshobjs): $(obj)/%.o: $(src)/%.c FORCE
80501 + $(call if_changed_dep,host-cxxshobjs)
80502 +
80503 # Link a shared library, based on position independent .o files
80504 # *.o -> .so shared library (host-cshlib)
80505 quiet_cmd_host-cshlib = HOSTLLD -shared $@
80506 @@ -165,6 +180,15 @@ quiet_cmd_host-cshlib = HOSTLLD -shared $@
80507 $(host-cshlib): $(obj)/%: $(host-cshobjs) FORCE
80508 $(call if_changed,host-cshlib)
80509
80510 +# Link a shared library, based on position independent .o files
80511 +# *.o -> .so shared library (host-cxxshlib)
80512 +quiet_cmd_host-cxxshlib = HOSTLLD -shared $@
80513 + cmd_host-cxxshlib = $(HOSTCXX) $(HOSTLDFLAGS) -shared -o $@ \
80514 + $(addprefix $(obj)/,$($(@F:.so=-objs))) \
80515 + $(HOST_LOADLIBES) $(HOSTLOADLIBES_$(@F))
80516 +$(host-cxxshlib): $(obj)/%: $(host-cxxshobjs) FORCE
80517 + $(call if_changed,host-cxxshlib)
80518 +
80519 targets += $(host-csingle) $(host-cmulti) $(host-cobjs)\
80520 - $(host-cxxmulti) $(host-cxxobjs) $(host-cshlib) $(host-cshobjs)
80521 + $(host-cxxmulti) $(host-cxxobjs) $(host-cshlib) $(host-cshobjs) $(host-cxxshlib) $(host-cxxshobjs)
80522
80523 diff --git a/scripts/basic/fixdep.c b/scripts/basic/fixdep.c
80524 index cb1f50c..cef2a7c 100644
80525 --- a/scripts/basic/fixdep.c
80526 +++ b/scripts/basic/fixdep.c
80527 @@ -161,7 +161,7 @@ static unsigned int strhash(const char *str, unsigned int sz)
80528 /*
80529 * Lookup a value in the configuration string.
80530 */
80531 -static int is_defined_config(const char *name, int len, unsigned int hash)
80532 +static int is_defined_config(const char *name, unsigned int len, unsigned int hash)
80533 {
80534 struct item *aux;
80535
80536 @@ -211,10 +211,10 @@ static void clear_config(void)
80537 /*
80538 * Record the use of a CONFIG_* word.
80539 */
80540 -static void use_config(const char *m, int slen)
80541 +static void use_config(const char *m, unsigned int slen)
80542 {
80543 unsigned int hash = strhash(m, slen);
80544 - int c, i;
80545 + unsigned int c, i;
80546
80547 if (is_defined_config(m, slen, hash))
80548 return;
80549 @@ -235,9 +235,9 @@ static void use_config(const char *m, int slen)
80550
80551 static void parse_config_file(const char *map, size_t len)
80552 {
80553 - const int *end = (const int *) (map + len);
80554 + const unsigned int *end = (const unsigned int *) (map + len);
80555 /* start at +1, so that p can never be < map */
80556 - const int *m = (const int *) map + 1;
80557 + const unsigned int *m = (const unsigned int *) map + 1;
80558 const char *p, *q;
80559
80560 for (; m < end; m++) {
80561 @@ -406,7 +406,7 @@ static void print_deps(void)
80562 static void traps(void)
80563 {
80564 static char test[] __attribute__((aligned(sizeof(int)))) = "CONF";
80565 - int *p = (int *)test;
80566 + unsigned int *p = (unsigned int *)test;
80567
80568 if (*p != INT_CONF) {
80569 fprintf(stderr, "fixdep: sizeof(int) != 4 or wrong endianess? %#x\n",
80570 diff --git a/scripts/gcc-plugin.sh b/scripts/gcc-plugin.sh
80571 new file mode 100644
80572 index 0000000..008ac1a
80573 --- /dev/null
80574 +++ b/scripts/gcc-plugin.sh
80575 @@ -0,0 +1,17 @@
80576 +#!/bin/bash
80577 +plugincc=`$1 -x c -shared - -o /dev/null -I\`$3 -print-file-name=plugin\`/include 2>&1 <<EOF
80578 +#include "gcc-plugin.h"
80579 +#include "tree.h"
80580 +#include "tm.h"
80581 +#include "rtl.h"
80582 +#ifdef ENABLE_BUILD_WITH_CXX
80583 +#warning $2
80584 +#else
80585 +#warning $1
80586 +#endif
80587 +EOF`
80588 +if [ $? -eq 0 ]
80589 +then
80590 + [[ "$plugincc" =~ "$1" ]] && echo "$1"
80591 + [[ "$plugincc" =~ "$2" ]] && echo "$2"
80592 +fi
80593 diff --git a/scripts/link-vmlinux.sh b/scripts/link-vmlinux.sh
80594 index b3d907e..a4782ab 100644
80595 --- a/scripts/link-vmlinux.sh
80596 +++ b/scripts/link-vmlinux.sh
80597 @@ -152,7 +152,7 @@ else
80598 fi;
80599
80600 # final build of init/
80601 -${MAKE} -f "${srctree}/scripts/Makefile.build" obj=init
80602 +${MAKE} -f "${srctree}/scripts/Makefile.build" obj=init GCC_PLUGINS_CFLAGS="${GCC_PLUGINS_CFLAGS}" GCC_PLUGINS_AFLAGS="${GCC_PLUGINS_AFLAGS}"
80603
80604 kallsymso=""
80605 kallsyms_vmlinux=""
80606 diff --git a/scripts/mod/file2alias.c b/scripts/mod/file2alias.c
80607 index 7ed6864..b6e90e6 100644
80608 --- a/scripts/mod/file2alias.c
80609 +++ b/scripts/mod/file2alias.c
80610 @@ -128,7 +128,7 @@ static void device_id_check(const char *modname, const char *device_id,
80611 unsigned long size, unsigned long id_size,
80612 void *symval)
80613 {
80614 - int i;
80615 + unsigned int i;
80616
80617 if (size % id_size || size < id_size) {
80618 if (cross_build != 0)
80619 @@ -158,7 +158,7 @@ static void device_id_check(const char *modname, const char *device_id,
80620 /* USB is special because the bcdDevice can be matched against a numeric range */
80621 /* Looks like "usb:vNpNdNdcNdscNdpNicNiscNipNinN" */
80622 static void do_usb_entry(struct usb_device_id *id,
80623 - unsigned int bcdDevice_initial, int bcdDevice_initial_digits,
80624 + unsigned int bcdDevice_initial, unsigned int bcdDevice_initial_digits,
80625 unsigned char range_lo, unsigned char range_hi,
80626 unsigned char max, struct module *mod)
80627 {
80628 @@ -262,7 +262,7 @@ static void do_usb_entry_multi(struct usb_device_id *id, struct module *mod)
80629 {
80630 unsigned int devlo, devhi;
80631 unsigned char chi, clo, max;
80632 - int ndigits;
80633 + unsigned int ndigits;
80634
80635 id->match_flags = TO_NATIVE(id->match_flags);
80636 id->idVendor = TO_NATIVE(id->idVendor);
80637 @@ -507,7 +507,7 @@ static void do_pnp_device_entry(void *symval, unsigned long size,
80638 for (i = 0; i < count; i++) {
80639 const char *id = (char *)devs[i].id;
80640 char acpi_id[sizeof(devs[0].id)];
80641 - int j;
80642 + unsigned int j;
80643
80644 buf_printf(&mod->dev_table_buf,
80645 "MODULE_ALIAS(\"pnp:d%s*\");\n", id);
80646 @@ -537,7 +537,7 @@ static void do_pnp_card_entries(void *symval, unsigned long size,
80647
80648 for (j = 0; j < PNP_MAX_DEVICES; j++) {
80649 const char *id = (char *)card->devs[j].id;
80650 - int i2, j2;
80651 + unsigned int i2, j2;
80652 int dup = 0;
80653
80654 if (!id[0])
80655 @@ -563,7 +563,7 @@ static void do_pnp_card_entries(void *symval, unsigned long size,
80656 /* add an individual alias for every device entry */
80657 if (!dup) {
80658 char acpi_id[sizeof(card->devs[0].id)];
80659 - int k;
80660 + unsigned int k;
80661
80662 buf_printf(&mod->dev_table_buf,
80663 "MODULE_ALIAS(\"pnp:d%s*\");\n", id);
80664 @@ -888,7 +888,7 @@ static void dmi_ascii_filter(char *d, const char *s)
80665 static int do_dmi_entry(const char *filename, struct dmi_system_id *id,
80666 char *alias)
80667 {
80668 - int i, j;
80669 + unsigned int i, j;
80670
80671 sprintf(alias, "dmi*");
80672
80673 diff --git a/scripts/mod/modpost.c b/scripts/mod/modpost.c
80674 index 68e9f5e..ac7759b 100644
80675 --- a/scripts/mod/modpost.c
80676 +++ b/scripts/mod/modpost.c
80677 @@ -930,6 +930,7 @@ enum mismatch {
80678 ANY_INIT_TO_ANY_EXIT,
80679 ANY_EXIT_TO_ANY_INIT,
80680 EXPORT_TO_INIT_EXIT,
80681 + DATA_TO_TEXT
80682 };
80683
80684 struct sectioncheck {
80685 @@ -1044,6 +1045,12 @@ const struct sectioncheck sectioncheck[] = {
80686 .tosec = { INIT_SECTIONS, EXIT_SECTIONS, NULL },
80687 .mismatch = EXPORT_TO_INIT_EXIT,
80688 .symbol_white_list = { DEFAULT_SYMBOL_WHITE_LIST, NULL },
80689 +},
80690 +/* Do not reference code from writable data */
80691 +{
80692 + .fromsec = { DATA_SECTIONS, NULL },
80693 + .tosec = { TEXT_SECTIONS, NULL },
80694 + .mismatch = DATA_TO_TEXT
80695 }
80696 };
80697
80698 @@ -1166,10 +1173,10 @@ static Elf_Sym *find_elf_symbol(struct elf_info *elf, Elf64_Sword addr,
80699 continue;
80700 if (ELF_ST_TYPE(sym->st_info) == STT_SECTION)
80701 continue;
80702 - if (sym->st_value == addr)
80703 - return sym;
80704 /* Find a symbol nearby - addr are maybe negative */
80705 d = sym->st_value - addr;
80706 + if (d == 0)
80707 + return sym;
80708 if (d < 0)
80709 d = addr - sym->st_value;
80710 if (d < distance) {
80711 @@ -1448,6 +1455,14 @@ static void report_sec_mismatch(const char *modname,
80712 tosym, prl_to, prl_to, tosym);
80713 free(prl_to);
80714 break;
80715 + case DATA_TO_TEXT:
80716 +#if 0
80717 + fprintf(stderr,
80718 + "The %s %s:%s references\n"
80719 + "the %s %s:%s%s\n",
80720 + from, fromsec, fromsym, to, tosec, tosym, to_p);
80721 +#endif
80722 + break;
80723 }
80724 fprintf(stderr, "\n");
80725 }
80726 @@ -1682,7 +1697,7 @@ static void section_rel(const char *modname, struct elf_info *elf,
80727 static void check_sec_ref(struct module *mod, const char *modname,
80728 struct elf_info *elf)
80729 {
80730 - int i;
80731 + unsigned int i;
80732 Elf_Shdr *sechdrs = elf->sechdrs;
80733
80734 /* Walk through all sections */
80735 @@ -1780,7 +1795,7 @@ void __attribute__((format(printf, 2, 3))) buf_printf(struct buffer *buf,
80736 va_end(ap);
80737 }
80738
80739 -void buf_write(struct buffer *buf, const char *s, int len)
80740 +void buf_write(struct buffer *buf, const char *s, unsigned int len)
80741 {
80742 if (buf->size - buf->pos < len) {
80743 buf->size += len + SZ;
80744 @@ -1998,7 +2013,7 @@ static void write_if_changed(struct buffer *b, const char *fname)
80745 if (fstat(fileno(file), &st) < 0)
80746 goto close_write;
80747
80748 - if (st.st_size != b->pos)
80749 + if (st.st_size != (off_t)b->pos)
80750 goto close_write;
80751
80752 tmp = NOFAIL(malloc(b->pos));
80753 diff --git a/scripts/mod/modpost.h b/scripts/mod/modpost.h
80754 index 51207e4..f7d603d 100644
80755 --- a/scripts/mod/modpost.h
80756 +++ b/scripts/mod/modpost.h
80757 @@ -92,15 +92,15 @@ void *do_nofail(void *ptr, const char *expr);
80758
80759 struct buffer {
80760 char *p;
80761 - int pos;
80762 - int size;
80763 + unsigned int pos;
80764 + unsigned int size;
80765 };
80766
80767 void __attribute__((format(printf, 2, 3)))
80768 buf_printf(struct buffer *buf, const char *fmt, ...);
80769
80770 void
80771 -buf_write(struct buffer *buf, const char *s, int len);
80772 +buf_write(struct buffer *buf, const char *s, unsigned int len);
80773
80774 struct module {
80775 struct module *next;
80776 diff --git a/scripts/mod/sumversion.c b/scripts/mod/sumversion.c
80777 index 9dfcd6d..099068e 100644
80778 --- a/scripts/mod/sumversion.c
80779 +++ b/scripts/mod/sumversion.c
80780 @@ -470,7 +470,7 @@ static void write_version(const char *filename, const char *sum,
80781 goto out;
80782 }
80783
80784 - if (write(fd, sum, strlen(sum)+1) != strlen(sum)+1) {
80785 + if (write(fd, sum, strlen(sum)+1) != (ssize_t)strlen(sum)+1) {
80786 warn("writing sum in %s failed: %s\n",
80787 filename, strerror(errno));
80788 goto out;
80789 diff --git a/scripts/pnmtologo.c b/scripts/pnmtologo.c
80790 index 5c11312..72742b5 100644
80791 --- a/scripts/pnmtologo.c
80792 +++ b/scripts/pnmtologo.c
80793 @@ -237,14 +237,14 @@ static void write_header(void)
80794 fprintf(out, " * Linux logo %s\n", logoname);
80795 fputs(" */\n\n", out);
80796 fputs("#include <linux/linux_logo.h>\n\n", out);
80797 - fprintf(out, "static unsigned char %s_data[] __initdata = {\n",
80798 + fprintf(out, "static unsigned char %s_data[] = {\n",
80799 logoname);
80800 }
80801
80802 static void write_footer(void)
80803 {
80804 fputs("\n};\n\n", out);
80805 - fprintf(out, "const struct linux_logo %s __initconst = {\n", logoname);
80806 + fprintf(out, "const struct linux_logo %s = {\n", logoname);
80807 fprintf(out, "\t.type\t\t= %s,\n", logo_types[logo_type]);
80808 fprintf(out, "\t.width\t\t= %d,\n", logo_width);
80809 fprintf(out, "\t.height\t\t= %d,\n", logo_height);
80810 @@ -374,7 +374,7 @@ static void write_logo_clut224(void)
80811 fputs("\n};\n\n", out);
80812
80813 /* write logo clut */
80814 - fprintf(out, "static unsigned char %s_clut[] __initdata = {\n",
80815 + fprintf(out, "static unsigned char %s_clut[] = {\n",
80816 logoname);
80817 write_hex_cnt = 0;
80818 for (i = 0; i < logo_clutsize; i++) {
80819 diff --git a/security/Kconfig b/security/Kconfig
80820 index e9c6ac7..e7feb0d 100644
80821 --- a/security/Kconfig
80822 +++ b/security/Kconfig
80823 @@ -4,6 +4,896 @@
80824
80825 menu "Security options"
80826
80827 +menu "Grsecurity"
80828 +
80829 + config ARCH_TRACK_EXEC_LIMIT
80830 + bool
80831 +
80832 + config PAX_KERNEXEC_PLUGIN
80833 + bool
80834 +
80835 + config PAX_PER_CPU_PGD
80836 + bool
80837 +
80838 + config TASK_SIZE_MAX_SHIFT
80839 + int
80840 + depends on X86_64
80841 + default 47 if !PAX_PER_CPU_PGD
80842 + default 42 if PAX_PER_CPU_PGD
80843 +
80844 + config PAX_ENABLE_PAE
80845 + bool
80846 + default y if (X86_32 && (MPENTIUM4 || MK8 || MPSC || MCORE2 || MATOM))
80847 +
80848 + config PAX_USERCOPY_SLABS
80849 + bool
80850 +
80851 +config GRKERNSEC
80852 + bool "Grsecurity"
80853 + select CRYPTO
80854 + select CRYPTO_SHA256
80855 + select PROC_FS
80856 + select STOP_MACHINE
80857 + help
80858 + If you say Y here, you will be able to configure many features
80859 + that will enhance the security of your system. It is highly
80860 + recommended that you say Y here and read through the help
80861 + for each option so that you fully understand the features and
80862 + can evaluate their usefulness for your machine.
80863 +
80864 +choice
80865 + prompt "Configuration Method"
80866 + depends on GRKERNSEC
80867 + default GRKERNSEC_CONFIG_CUSTOM
80868 + help
80869 +
80870 +config GRKERNSEC_CONFIG_AUTO
80871 + bool "Automatic"
80872 + help
80873 + If you choose this configuration method, you'll be able to answer a small
80874 + number of simple questions about how you plan to use this kernel.
80875 + The settings of grsecurity and PaX will be automatically configured for
80876 + the highest commonly-used settings within the provided constraints.
80877 +
80878 + If you require additional configuration, custom changes can still be made
80879 + from the "custom configuration" menu.
80880 +
80881 +config GRKERNSEC_CONFIG_CUSTOM
80882 + bool "Custom"
80883 + help
80884 + If you choose this configuration method, you'll be able to configure all
80885 + grsecurity and PaX settings manually. Via this method, no options are
80886 + automatically enabled.
80887 +
80888 +endchoice
80889 +
80890 +choice
80891 + prompt "Usage Type"
80892 + depends on (GRKERNSEC && GRKERNSEC_CONFIG_AUTO)
80893 + default GRKERNSEC_CONFIG_SERVER
80894 + help
80895 +
80896 +config GRKERNSEC_CONFIG_SERVER
80897 + bool "Server"
80898 + help
80899 + Choose this option if you plan to use this kernel on a server.
80900 +
80901 +config GRKERNSEC_CONFIG_DESKTOP
80902 + bool "Desktop"
80903 + help
80904 + Choose this option if you plan to use this kernel on a desktop.
80905 +
80906 +endchoice
80907 +
80908 +choice
80909 + prompt "Virtualization Type"
80910 + depends on (GRKERNSEC && X86 && GRKERNSEC_CONFIG_AUTO)
80911 + default GRKERNSEC_CONFIG_VIRT_NONE
80912 + help
80913 +
80914 +config GRKERNSEC_CONFIG_VIRT_NONE
80915 + bool "None"
80916 + help
80917 + Choose this option if this kernel will be run on bare metal.
80918 +
80919 +config GRKERNSEC_CONFIG_VIRT_GUEST
80920 + bool "Guest"
80921 + help
80922 + Choose this option if this kernel will be run as a VM guest.
80923 +
80924 +config GRKERNSEC_CONFIG_VIRT_HOST
80925 + bool "Host"
80926 + help
80927 + Choose this option if this kernel will be run as a VM host.
80928 +
80929 +endchoice
80930 +
80931 +choice
80932 + prompt "Virtualization Hardware"
80933 + depends on (GRKERNSEC && X86 && GRKERNSEC_CONFIG_AUTO && (GRKERNSEC_CONFIG_VIRT_GUEST || GRKERNSEC_CONFIG_VIRT_HOST))
80934 + help
80935 +
80936 +config GRKERNSEC_CONFIG_VIRT_EPT
80937 + bool "EPT/RVI Processor Support"
80938 + depends on X86
80939 + help
80940 + Choose this option if your CPU supports the EPT or RVI features of 2nd-gen
80941 + hardware virtualization. This allows for additional kernel hardening protections
80942 + to operate without additional performance impact.
80943 +
80944 + To see if your Intel processor supports EPT, see:
80945 + http://ark.intel.com/Products/VirtualizationTechnology
80946 + (Most Core i3/5/7 support EPT)
80947 +
80948 + To see if your AMD processor supports RVI, see:
80949 + http://support.amd.com/us/kbarticles/Pages/GPU120AMDRVICPUsHyperVWin8.aspx
80950 +
80951 +config GRKERNSEC_CONFIG_VIRT_SOFT
80952 + bool "First-gen/No Hardware Virtualization"
80953 + help
80954 + Choose this option if you use an Atom/Pentium/Core 2 processor that either doesn't
80955 + support hardware virtualization or doesn't support the EPT/RVI extensions.
80956 +
80957 +endchoice
80958 +
80959 +choice
80960 + prompt "Virtualization Software"
80961 + depends on (GRKERNSEC && GRKERNSEC_CONFIG_AUTO && (GRKERNSEC_CONFIG_VIRT_GUEST || GRKERNSEC_CONFIG_VIRT_HOST))
80962 + help
80963 +
80964 +config GRKERNSEC_CONFIG_VIRT_XEN
80965 + bool "Xen"
80966 + help
80967 + Choose this option if this kernel is running as a Xen guest or host.
80968 +
80969 +config GRKERNSEC_CONFIG_VIRT_VMWARE
80970 + bool "VMWare"
80971 + help
80972 + Choose this option if this kernel is running as a VMWare guest or host.
80973 +
80974 +config GRKERNSEC_CONFIG_VIRT_KVM
80975 + bool "KVM"
80976 + help
80977 + Choose this option if this kernel is running as a KVM guest or host.
80978 +
80979 +config GRKERNSEC_CONFIG_VIRT_VIRTUALBOX
80980 + bool "VirtualBox"
80981 + help
80982 + Choose this option if this kernel is running as a VirtualBox guest or host.
80983 +
80984 +endchoice
80985 +
80986 +choice
80987 + prompt "Required Priorities"
80988 + depends on (GRKERNSEC && GRKERNSEC_CONFIG_AUTO)
80989 + default GRKERNSEC_CONFIG_PRIORITY_PERF
80990 + help
80991 +
80992 +config GRKERNSEC_CONFIG_PRIORITY_PERF
80993 + bool "Performance"
80994 + help
80995 + Choose this option if performance is of highest priority for this deployment
80996 + of grsecurity. Features like UDEREF on a 64bit kernel, kernel stack clearing,
80997 + and freed memory sanitizing will be disabled.
80998 +
80999 +config GRKERNSEC_CONFIG_PRIORITY_SECURITY
81000 + bool "Security"
81001 + help
81002 + Choose this option if security is of highest priority for this deployment of
81003 + grsecurity. UDEREF, kernel stack clearing, and freed memory sanitizing will
81004 + be enabled for this kernel. In a worst-case scenario, these features can
81005 + introduce a 20% performance hit (UDEREF on x64 contributing half of this hit).
81006 +
81007 +endchoice
81008 +
81009 +menu "Default Special Groups"
81010 +depends on (GRKERNSEC && GRKERNSEC_CONFIG_AUTO)
81011 +
81012 +config GRKERNSEC_PROC_GID
81013 + int "GID exempted from /proc restrictions"
81014 + default 1001
81015 + help
81016 + Setting this GID determines which group will be exempted from
81017 + grsecurity's /proc restrictions, allowing users of the specified
81018 + group to view network statistics and the existence of other users'
81019 + processes on the system. This GID may also be chosen at boot time
81020 + via "grsec_proc_gid=" on the kernel commandline.
81021 +
81022 +config GRKERNSEC_TPE_UNTRUSTED_GID
81023 + int "GID for TPE-untrusted users"
81024 + depends on GRKERNSEC_CONFIG_SERVER && GRKERNSEC_TPE && !GRKERNSEC_TPE_INVERT
81025 + default 1005
81026 + help
81027 + Setting this GID determines which group untrusted users should
81028 + be added to. These users will be placed under grsecurity's Trusted Path
81029 + Execution mechanism, preventing them from executing their own binaries.
81030 + The users will only be able to execute binaries in directories owned and
81031 + writable only by the root user. If the sysctl option is enabled, a sysctl
81032 + option with name "tpe_gid" is created.
81033 +
81034 +config GRKERNSEC_TPE_TRUSTED_GID
81035 + int "GID for TPE-trusted users"
81036 + depends on GRKERNSEC_CONFIG_SERVER && GRKERNSEC_TPE && GRKERNSEC_TPE_INVERT
81037 + default 1005
81038 + help
81039 + Setting this GID determines what group TPE restrictions will be
81040 + *disabled* for. If the sysctl option is enabled, a sysctl option
81041 + with name "tpe_gid" is created.
81042 +
81043 +config GRKERNSEC_SYMLINKOWN_GID
81044 + int "GID for users with kernel-enforced SymlinksIfOwnerMatch"
81045 + depends on GRKERNSEC_CONFIG_SERVER
81046 + default 1006
81047 + help
81048 + Setting this GID determines what group kernel-enforced
81049 + SymlinksIfOwnerMatch will be enabled for. If the sysctl option
81050 + is enabled, a sysctl option with name "symlinkown_gid" is created.
81051 +
81052 +
81053 +endmenu
81054 +
81055 +menu "Customize Configuration"
81056 +depends on GRKERNSEC
81057 +
81058 +menu "PaX"
81059 +
81060 +config PAX
81061 + bool "Enable various PaX features"
81062 + default y if GRKERNSEC_CONFIG_AUTO
81063 + depends on GRKERNSEC && (ALPHA || ARM || AVR32 || IA64 || MIPS || PARISC || PPC || SPARC || X86)
81064 + help
81065 + This allows you to enable various PaX features. PaX adds
81066 + intrusion prevention mechanisms to the kernel that reduce
81067 + the risks posed by exploitable memory corruption bugs.
81068 +
81069 +menu "PaX Control"
81070 + depends on PAX
81071 +
81072 +config PAX_SOFTMODE
81073 + bool 'Support soft mode'
81074 + help
81075 + Enabling this option will allow you to run PaX in soft mode, that
81076 + is, PaX features will not be enforced by default, only on executables
81077 + marked explicitly. You must also enable PT_PAX_FLAGS or XATTR_PAX_FLAGS
81078 + support as they are the only way to mark executables for soft mode use.
81079 +
81080 + Soft mode can be activated by using the "pax_softmode=1" kernel command
81081 + line option on boot. Furthermore you can control various PaX features
81082 + at runtime via the entries in /proc/sys/kernel/pax.
81083 +
81084 +config PAX_EI_PAX
81085 + bool 'Use legacy ELF header marking'
81086 + default y if GRKERNSEC_CONFIG_AUTO
81087 + help
81088 + Enabling this option will allow you to control PaX features on
81089 + a per executable basis via the 'chpax' utility available at
81090 + http://pax.grsecurity.net/. The control flags will be read from
81091 + an otherwise reserved part of the ELF header. This marking has
81092 + numerous drawbacks (no support for soft-mode, toolchain does not
81093 + know about the non-standard use of the ELF header) therefore it
81094 + has been deprecated in favour of PT_PAX_FLAGS and XATTR_PAX_FLAGS
81095 + support.
81096 +
81097 + Note that if you enable PT_PAX_FLAGS or XATTR_PAX_FLAGS marking
81098 + support as well, they will override the legacy EI_PAX marks.
81099 +
81100 + If you enable none of the marking options then all applications
81101 + will run with PaX enabled on them by default.
81102 +
81103 +config PAX_PT_PAX_FLAGS
81104 + bool 'Use ELF program header marking'
81105 + default y if GRKERNSEC_CONFIG_AUTO
81106 + help
81107 + Enabling this option will allow you to control PaX features on
81108 + a per executable basis via the 'paxctl' utility available at
81109 + http://pax.grsecurity.net/. The control flags will be read from
81110 + a PaX specific ELF program header (PT_PAX_FLAGS). This marking
81111 + has the benefits of supporting both soft mode and being fully
81112 + integrated into the toolchain (the binutils patch is available
81113 + from http://pax.grsecurity.net).
81114 +
81115 + Note that if you enable the legacy EI_PAX marking support as well,
81116 + the EI_PAX marks will be overridden by the PT_PAX_FLAGS marks.
81117 +
81118 + If you enable both PT_PAX_FLAGS and XATTR_PAX_FLAGS support then you
81119 + must make sure that the marks are the same if a binary has both marks.
81120 +
81121 + If you enable none of the marking options then all applications
81122 + will run with PaX enabled on them by default.
81123 +
81124 +config PAX_XATTR_PAX_FLAGS
81125 + bool 'Use filesystem extended attributes marking'
81126 + default y if GRKERNSEC_CONFIG_AUTO
81127 + select CIFS_XATTR if CIFS
81128 + select EXT2_FS_XATTR if EXT2_FS
81129 + select EXT3_FS_XATTR if EXT3_FS
81130 + select EXT4_FS_XATTR if EXT4_FS
81131 + select JFFS2_FS_XATTR if JFFS2_FS
81132 + select REISERFS_FS_XATTR if REISERFS_FS
81133 + select SQUASHFS_XATTR if SQUASHFS
81134 + select TMPFS_XATTR if TMPFS
81135 + select UBIFS_FS_XATTR if UBIFS_FS
81136 + help
81137 + Enabling this option will allow you to control PaX features on
81138 + a per executable basis via the 'setfattr' utility. The control
81139 + flags will be read from the user.pax.flags extended attribute of
81140 + the file. This marking has the benefit of supporting binary-only
81141 + applications that self-check themselves (e.g., skype) and would
81142 + not tolerate chpax/paxctl changes. The main drawback is that
81143 + extended attributes are not supported by some filesystems (e.g.,
81144 + isofs, udf, vfat) so copying files through such filesystems will
81145 + lose the extended attributes and these PaX markings.
81146 +
81147 + Note that if you enable the legacy EI_PAX marking support as well,
81148 + the EI_PAX marks will be overridden by the XATTR_PAX_FLAGS marks.
81149 +
81150 + If you enable both PT_PAX_FLAGS and XATTR_PAX_FLAGS support then you
81151 + must make sure that the marks are the same if a binary has both marks.
81152 +
81153 + If you enable none of the marking options then all applications
81154 + will run with PaX enabled on them by default.
81155 +
81156 +choice
81157 + prompt 'MAC system integration'
81158 + default PAX_HAVE_ACL_FLAGS
81159 + help
81160 + Mandatory Access Control systems have the option of controlling
81161 + PaX flags on a per executable basis, choose the method supported
81162 + by your particular system.
81163 +
81164 + - "none": if your MAC system does not interact with PaX,
81165 + - "direct": if your MAC system defines pax_set_initial_flags() itself,
81166 + - "hook": if your MAC system uses the pax_set_initial_flags_func callback.
81167 +
81168 + NOTE: this option is for developers/integrators only.
81169 +
81170 + config PAX_NO_ACL_FLAGS
81171 + bool 'none'
81172 +
81173 + config PAX_HAVE_ACL_FLAGS
81174 + bool 'direct'
81175 +
81176 + config PAX_HOOK_ACL_FLAGS
81177 + bool 'hook'
81178 +endchoice
81179 +
81180 +endmenu
81181 +
81182 +menu "Non-executable pages"
81183 + depends on PAX
81184 +
81185 +config PAX_NOEXEC
81186 + bool "Enforce non-executable pages"
81187 + default y if GRKERNSEC_CONFIG_AUTO
81188 + depends on ALPHA || (ARM && (CPU_V6 || CPU_V7)) || IA64 || MIPS || PARISC || PPC || S390 || SPARC || X86
81189 + help
81190 + By design some architectures do not allow for protecting memory
81191 + pages against execution or even if they do, Linux does not make
81192 + use of this feature. In practice this means that if a page is
81193 + readable (such as the stack or heap) it is also executable.
81194 +
81195 + There is a well known exploit technique that makes use of this
81196 + fact and a common programming mistake where an attacker can
81197 + introduce code of his choice somewhere in the attacked program's
81198 + memory (typically the stack or the heap) and then execute it.
81199 +
81200 + If the attacked program was running with different (typically
81201 + higher) privileges than that of the attacker, then he can elevate
81202 + his own privilege level (e.g. get a root shell, write to files for
81203 + which he does not have write access to, etc).
81204 +
81205 + Enabling this option will let you choose from various features
81206 + that prevent the injection and execution of 'foreign' code in
81207 + a program.
81208 +
81209 + This will also break programs that rely on the old behaviour and
81210 + expect that dynamically allocated memory via the malloc() family
81211 + of functions is executable (which it is not). Notable examples
81212 + are the XFree86 4.x server, the java runtime and wine.
81213 +
81214 +config PAX_PAGEEXEC
81215 + bool "Paging based non-executable pages"
81216 + default y if GRKERNSEC_CONFIG_AUTO
81217 + 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)
81218 + select S390_SWITCH_AMODE if S390
81219 + select S390_EXEC_PROTECT if S390
81220 + select ARCH_TRACK_EXEC_LIMIT if X86_32
81221 + help
81222 + This implementation is based on the paging feature of the CPU.
81223 + On i386 without hardware non-executable bit support there is a
81224 + variable but usually low performance impact, however on Intel's
81225 + P4 core based CPUs it is very high so you should not enable this
81226 + for kernels meant to be used on such CPUs.
81227 +
81228 + On alpha, avr32, ia64, parisc, sparc, sparc64, x86_64 and i386
81229 + with hardware non-executable bit support there is no performance
81230 + impact, on ppc the impact is negligible.
81231 +
81232 + Note that several architectures require various emulations due to
81233 + badly designed userland ABIs, this will cause a performance impact
81234 + but will disappear as soon as userland is fixed. For example, ppc
81235 + userland MUST have been built with secure-plt by a recent toolchain.
81236 +
81237 +config PAX_SEGMEXEC
81238 + bool "Segmentation based non-executable pages"
81239 + default y if GRKERNSEC_CONFIG_AUTO
81240 + depends on PAX_NOEXEC && X86_32
81241 + help
81242 + This implementation is based on the segmentation feature of the
81243 + CPU and has a very small performance impact, however applications
81244 + will be limited to a 1.5 GB address space instead of the normal
81245 + 3 GB.
81246 +
81247 +config PAX_EMUTRAMP
81248 + bool "Emulate trampolines" if (PAX_PAGEEXEC || PAX_SEGMEXEC) && (PARISC || X86)
81249 + default y if PARISC
81250 + help
81251 + There are some programs and libraries that for one reason or
81252 + another attempt to execute special small code snippets from
81253 + non-executable memory pages. Most notable examples are the
81254 + signal handler return code generated by the kernel itself and
81255 + the GCC trampolines.
81256 +
81257 + If you enabled CONFIG_PAX_PAGEEXEC or CONFIG_PAX_SEGMEXEC then
81258 + such programs will no longer work under your kernel.
81259 +
81260 + As a remedy you can say Y here and use the 'chpax' or 'paxctl'
81261 + utilities to enable trampoline emulation for the affected programs
81262 + yet still have the protection provided by the non-executable pages.
81263 +
81264 + On parisc you MUST enable this option and EMUSIGRT as well, otherwise
81265 + your system will not even boot.
81266 +
81267 + Alternatively you can say N here and use the 'chpax' or 'paxctl'
81268 + utilities to disable CONFIG_PAX_PAGEEXEC and CONFIG_PAX_SEGMEXEC
81269 + for the affected files.
81270 +
81271 + NOTE: enabling this feature *may* open up a loophole in the
81272 + protection provided by non-executable pages that an attacker
81273 + could abuse. Therefore the best solution is to not have any
81274 + files on your system that would require this option. This can
81275 + be achieved by not using libc5 (which relies on the kernel
81276 + signal handler return code) and not using or rewriting programs
81277 + that make use of the nested function implementation of GCC.
81278 + Skilled users can just fix GCC itself so that it implements
81279 + nested function calls in a way that does not interfere with PaX.
81280 +
81281 +config PAX_EMUSIGRT
81282 + bool "Automatically emulate sigreturn trampolines"
81283 + depends on PAX_EMUTRAMP && PARISC
81284 + default y
81285 + help
81286 + Enabling this option will have the kernel automatically detect
81287 + and emulate signal return trampolines executing on the stack
81288 + that would otherwise lead to task termination.
81289 +
81290 + This solution is intended as a temporary one for users with
81291 + legacy versions of libc (libc5, glibc 2.0, uClibc before 0.9.17,
81292 + Modula-3 runtime, etc) or executables linked to such, basically
81293 + everything that does not specify its own SA_RESTORER function in
81294 + normal executable memory like glibc 2.1+ does.
81295 +
81296 + On parisc you MUST enable this option, otherwise your system will
81297 + not even boot.
81298 +
81299 + NOTE: this feature cannot be disabled on a per executable basis
81300 + and since it *does* open up a loophole in the protection provided
81301 + by non-executable pages, the best solution is to not have any
81302 + files on your system that would require this option.
81303 +
81304 +config PAX_MPROTECT
81305 + bool "Restrict mprotect()"
81306 + default y if GRKERNSEC_CONFIG_AUTO
81307 + depends on (PAX_PAGEEXEC || PAX_SEGMEXEC)
81308 + help
81309 + Enabling this option will prevent programs from
81310 + - changing the executable status of memory pages that were
81311 + not originally created as executable,
81312 + - making read-only executable pages writable again,
81313 + - creating executable pages from anonymous memory,
81314 + - making read-only-after-relocations (RELRO) data pages writable again.
81315 +
81316 + You should say Y here to complete the protection provided by
81317 + the enforcement of non-executable pages.
81318 +
81319 + NOTE: you can use the 'chpax' or 'paxctl' utilities to control
81320 + this feature on a per file basis.
81321 +
81322 +config PAX_MPROTECT_COMPAT
81323 + bool "Use legacy/compat protection demoting (read help)"
81324 + default y if (GRKERNSEC_CONFIG_AUTO && GRKERNSEC_CONFIG_DESKTOP)
81325 + depends on PAX_MPROTECT
81326 + help
81327 + The current implementation of PAX_MPROTECT denies RWX allocations/mprotects
81328 + by sending the proper error code to the application. For some broken
81329 + userland, this can cause problems with Python or other applications. The
81330 + current implementation however allows for applications like clamav to
81331 + detect if JIT compilation/execution is allowed and to fall back gracefully
81332 + to an interpreter-based mode if it does not. While we encourage everyone
81333 + to use the current implementation as-is and push upstream to fix broken
81334 + userland (note that the RWX logging option can assist with this), in some
81335 + environments this may not be possible. Having to disable MPROTECT
81336 + completely on certain binaries reduces the security benefit of PaX,
81337 + so this option is provided for those environments to revert to the old
81338 + behavior.
81339 +
81340 +config PAX_ELFRELOCS
81341 + bool "Allow ELF text relocations (read help)"
81342 + depends on PAX_MPROTECT
81343 + default n
81344 + help
81345 + Non-executable pages and mprotect() restrictions are effective
81346 + in preventing the introduction of new executable code into an
81347 + attacked task's address space. There remain only two venues
81348 + for this kind of attack: if the attacker can execute already
81349 + existing code in the attacked task then he can either have it
81350 + create and mmap() a file containing his code or have it mmap()
81351 + an already existing ELF library that does not have position
81352 + independent code in it and use mprotect() on it to make it
81353 + writable and copy his code there. While protecting against
81354 + the former approach is beyond PaX, the latter can be prevented
81355 + by having only PIC ELF libraries on one's system (which do not
81356 + need to relocate their code). If you are sure this is your case,
81357 + as is the case with all modern Linux distributions, then leave
81358 + this option disabled. You should say 'n' here.
81359 +
81360 +config PAX_ETEXECRELOCS
81361 + bool "Allow ELF ET_EXEC text relocations"
81362 + depends on PAX_MPROTECT && (ALPHA || IA64 || PARISC)
81363 + select PAX_ELFRELOCS
81364 + default y
81365 + help
81366 + On some architectures there are incorrectly created applications
81367 + that require text relocations and would not work without enabling
81368 + this option. If you are an alpha, ia64 or parisc user, you should
81369 + enable this option and disable it once you have made sure that
81370 + none of your applications need it.
81371 +
81372 +config PAX_EMUPLT
81373 + bool "Automatically emulate ELF PLT"
81374 + depends on PAX_MPROTECT && (ALPHA || PARISC || SPARC)
81375 + default y
81376 + help
81377 + Enabling this option will have the kernel automatically detect
81378 + and emulate the Procedure Linkage Table entries in ELF files.
81379 + On some architectures such entries are in writable memory, and
81380 + become non-executable leading to task termination. Therefore
81381 + it is mandatory that you enable this option on alpha, parisc,
81382 + sparc and sparc64, otherwise your system would not even boot.
81383 +
81384 + NOTE: this feature *does* open up a loophole in the protection
81385 + provided by the non-executable pages, therefore the proper
81386 + solution is to modify the toolchain to produce a PLT that does
81387 + not need to be writable.
81388 +
81389 +config PAX_DLRESOLVE
81390 + bool 'Emulate old glibc resolver stub'
81391 + depends on PAX_EMUPLT && SPARC
81392 + default n
81393 + help
81394 + This option is needed if userland has an old glibc (before 2.4)
81395 + that puts a 'save' instruction into the runtime generated resolver
81396 + stub that needs special emulation.
81397 +
81398 +config PAX_KERNEXEC
81399 + bool "Enforce non-executable kernel pages"
81400 + 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))
81401 + depends on (PPC || X86) && (!X86_32 || X86_WP_WORKS_OK) && !XEN
81402 + select PAX_PER_CPU_PGD if X86_64 || (X86_32 && X86_PAE)
81403 + select PAX_KERNEXEC_PLUGIN if X86_64
81404 + help
81405 + This is the kernel land equivalent of PAGEEXEC and MPROTECT,
81406 + that is, enabling this option will make it harder to inject
81407 + and execute 'foreign' code in kernel memory itself.
81408 +
81409 +choice
81410 + prompt "Return Address Instrumentation Method"
81411 + default PAX_KERNEXEC_PLUGIN_METHOD_BTS
81412 + depends on PAX_KERNEXEC_PLUGIN
81413 + help
81414 + Select the method used to instrument function pointer dereferences.
81415 + Note that binary modules cannot be instrumented by this approach.
81416 +
81417 + Note that the implementation requires a gcc with plugin support,
81418 + i.e., gcc 4.5 or newer. You may need to install the supporting
81419 + headers explicitly in addition to the normal gcc package.
81420 +
81421 + config PAX_KERNEXEC_PLUGIN_METHOD_BTS
81422 + bool "bts"
81423 + help
81424 + This method is compatible with binary only modules but has
81425 + a higher runtime overhead.
81426 +
81427 + config PAX_KERNEXEC_PLUGIN_METHOD_OR
81428 + bool "or"
81429 + depends on !PARAVIRT
81430 + help
81431 + This method is incompatible with binary only modules but has
81432 + a lower runtime overhead.
81433 +endchoice
81434 +
81435 +config PAX_KERNEXEC_PLUGIN_METHOD
81436 + string
81437 + default "bts" if PAX_KERNEXEC_PLUGIN_METHOD_BTS
81438 + default "or" if PAX_KERNEXEC_PLUGIN_METHOD_OR
81439 + default ""
81440 +
81441 +config PAX_KERNEXEC_MODULE_TEXT
81442 + int "Minimum amount of memory reserved for module code"
81443 + default "4" if (!GRKERNSEC_CONFIG_AUTO || GRKERNSEC_CONFIG_SERVER)
81444 + default "12" if (GRKERNSEC_CONFIG_AUTO && GRKERNSEC_CONFIG_DESKTOP)
81445 + depends on PAX_KERNEXEC && X86_32 && MODULES
81446 + help
81447 + Due to implementation details the kernel must reserve a fixed
81448 + amount of memory for module code at compile time that cannot be
81449 + changed at runtime. Here you can specify the minimum amount
81450 + in MB that will be reserved. Due to the same implementation
81451 + details this size will always be rounded up to the next 2/4 MB
81452 + boundary (depends on PAE) so the actually available memory for
81453 + module code will usually be more than this minimum.
81454 +
81455 + The default 4 MB should be enough for most users but if you have
81456 + an excessive number of modules (e.g., most distribution configs
81457 + compile many drivers as modules) or use huge modules such as
81458 + nvidia's kernel driver, you will need to adjust this amount.
81459 + A good rule of thumb is to look at your currently loaded kernel
81460 + modules and add up their sizes.
81461 +
81462 +endmenu
81463 +
81464 +menu "Address Space Layout Randomization"
81465 + depends on PAX
81466 +
81467 +config PAX_ASLR
81468 + bool "Address Space Layout Randomization"
81469 + default y if GRKERNSEC_CONFIG_AUTO
81470 + help
81471 + Many if not most exploit techniques rely on the knowledge of
81472 + certain addresses in the attacked program. The following options
81473 + will allow the kernel to apply a certain amount of randomization
81474 + to specific parts of the program thereby forcing an attacker to
81475 + guess them in most cases. Any failed guess will most likely crash
81476 + the attacked program which allows the kernel to detect such attempts
81477 + and react on them. PaX itself provides no reaction mechanisms,
81478 + instead it is strongly encouraged that you make use of Nergal's
81479 + segvguard (ftp://ftp.pl.openwall.com/misc/segvguard/) or grsecurity's
81480 + (http://www.grsecurity.net/) built-in crash detection features or
81481 + develop one yourself.
81482 +
81483 + By saying Y here you can choose to randomize the following areas:
81484 + - top of the task's kernel stack
81485 + - top of the task's userland stack
81486 + - base address for mmap() requests that do not specify one
81487 + (this includes all libraries)
81488 + - base address of the main executable
81489 +
81490 + It is strongly recommended to say Y here as address space layout
81491 + randomization has negligible impact on performance yet it provides
81492 + a very effective protection.
81493 +
81494 + NOTE: you can use the 'chpax' or 'paxctl' utilities to control
81495 + this feature on a per file basis.
81496 +
81497 +config PAX_RANDKSTACK
81498 + bool "Randomize kernel stack base"
81499 + default y if GRKERNSEC_CONFIG_AUTO
81500 + depends on X86_TSC && X86
81501 + help
81502 + By saying Y here the kernel will randomize every task's kernel
81503 + stack on every system call. This will not only force an attacker
81504 + to guess it but also prevent him from making use of possible
81505 + leaked information about it.
81506 +
81507 + Since the kernel stack is a rather scarce resource, randomization
81508 + may cause unexpected stack overflows, therefore you should very
81509 + carefully test your system. Note that once enabled in the kernel
81510 + configuration, this feature cannot be disabled on a per file basis.
81511 +
81512 +config PAX_RANDUSTACK
81513 + bool "Randomize user stack base"
81514 + default y if GRKERNSEC_CONFIG_AUTO
81515 + depends on PAX_ASLR
81516 + help
81517 + By saying Y here the kernel will randomize every task's userland
81518 + stack. The randomization is done in two steps where the second
81519 + one may apply a big amount of shift to the top of the stack and
81520 + cause problems for programs that want to use lots of memory (more
81521 + than 2.5 GB if SEGMEXEC is not active, or 1.25 GB when it is).
81522 + For this reason the second step can be controlled by 'chpax' or
81523 + 'paxctl' on a per file basis.
81524 +
81525 +config PAX_RANDMMAP
81526 + bool "Randomize mmap() base"
81527 + default y if GRKERNSEC_CONFIG_AUTO
81528 + depends on PAX_ASLR
81529 + help
81530 + By saying Y here the kernel will use a randomized base address for
81531 + mmap() requests that do not specify one themselves. As a result
81532 + all dynamically loaded libraries will appear at random addresses
81533 + and therefore be harder to exploit by a technique where an attacker
81534 + attempts to execute library code for his purposes (e.g. spawn a
81535 + shell from an exploited program that is running at an elevated
81536 + privilege level).
81537 +
81538 + Furthermore, if a program is relinked as a dynamic ELF file, its
81539 + base address will be randomized as well, completing the full
81540 + randomization of the address space layout. Attacking such programs
81541 + becomes a guess game. You can find an example of doing this at
81542 + http://pax.grsecurity.net/et_dyn.tar.gz and practical samples at
81543 + http://www.grsecurity.net/grsec-gcc-specs.tar.gz .
81544 +
81545 + NOTE: you can use the 'chpax' or 'paxctl' utilities to control this
81546 + feature on a per file basis.
81547 +
81548 +endmenu
81549 +
81550 +menu "Miscellaneous hardening features"
81551 +
81552 +config PAX_MEMORY_SANITIZE
81553 + bool "Sanitize all freed memory"
81554 + default y if (GRKERNSEC_CONFIG_AUTO && GRKERNSEC_CONFIG_PRIORITY_SECURITY)
81555 + depends on !HIBERNATION
81556 + help
81557 + By saying Y here the kernel will erase memory pages as soon as they
81558 + are freed. This in turn reduces the lifetime of data stored in the
81559 + pages, making it less likely that sensitive information such as
81560 + passwords, cryptographic secrets, etc stay in memory for too long.
81561 +
81562 + This is especially useful for programs whose runtime is short, long
81563 + lived processes and the kernel itself benefit from this as long as
81564 + they operate on whole memory pages and ensure timely freeing of pages
81565 + that may hold sensitive information.
81566 +
81567 + The tradeoff is performance impact, on a single CPU system kernel
81568 + compilation sees a 3% slowdown, other systems and workloads may vary
81569 + and you are advised to test this feature on your expected workload
81570 + before deploying it.
81571 +
81572 + Note that this feature does not protect data stored in live pages,
81573 + e.g., process memory swapped to disk may stay there for a long time.
81574 +
81575 +config PAX_MEMORY_STACKLEAK
81576 + bool "Sanitize kernel stack"
81577 + default y if (GRKERNSEC_CONFIG_AUTO && GRKERNSEC_CONFIG_PRIORITY_SECURITY)
81578 + depends on X86
81579 + help
81580 + By saying Y here the kernel will erase the kernel stack before it
81581 + returns from a system call. This in turn reduces the information
81582 + that a kernel stack leak bug can reveal.
81583 +
81584 + Note that such a bug can still leak information that was put on
81585 + the stack by the current system call (the one eventually triggering
81586 + the bug) but traces of earlier system calls on the kernel stack
81587 + cannot leak anymore.
81588 +
81589 + The tradeoff is performance impact: on a single CPU system kernel
81590 + compilation sees a 1% slowdown, other systems and workloads may vary
81591 + and you are advised to test this feature on your expected workload
81592 + before deploying it.
81593 +
81594 + Note that the full feature requires a gcc with plugin support,
81595 + i.e., gcc 4.5 or newer. You may need to install the supporting
81596 + headers explicitly in addition to the normal gcc package. Using
81597 + older gcc versions means that functions with large enough stack
81598 + frames may leave uninitialized memory behind that may be exposed
81599 + to a later syscall leaking the stack.
81600 +
81601 +config PAX_MEMORY_UDEREF
81602 + bool "Prevent invalid userland pointer dereference"
81603 + default y if GRKERNSEC_CONFIG_AUTO && (X86_32 || (X86_64 && GRKERNSEC_CONFIG_PRIORITY_SECURITY)) && (GRKERNSEC_CONFIG_VIRT_NONE || GRKERNSEC_CONFIG_VIRT_EPT)
81604 + depends on X86 && !UML_X86 && !XEN
81605 + select PAX_PER_CPU_PGD if X86_64
81606 + help
81607 + By saying Y here the kernel will be prevented from dereferencing
81608 + userland pointers in contexts where the kernel expects only kernel
81609 + pointers. This is both a useful runtime debugging feature and a
81610 + security measure that prevents exploiting a class of kernel bugs.
81611 +
81612 + The tradeoff is that some virtualization solutions may experience
81613 + a huge slowdown and therefore you should not enable this feature
81614 + for kernels meant to run in such environments. Whether a given VM
81615 + solution is affected or not is best determined by simply trying it
81616 + out, the performance impact will be obvious right on boot as this
81617 + mechanism engages from very early on. A good rule of thumb is that
81618 + VMs running on CPUs without hardware virtualization support (i.e.,
81619 + the majority of IA-32 CPUs) will likely experience the slowdown.
81620 +
81621 +config PAX_REFCOUNT
81622 + bool "Prevent various kernel object reference counter overflows"
81623 + default y if GRKERNSEC_CONFIG_AUTO
81624 + depends on GRKERNSEC && ((ARM && (CPU_32v6 || CPU_32v6K || CPU_32v7)) || SPARC64 || X86)
81625 + help
81626 + By saying Y here the kernel will detect and prevent overflowing
81627 + various (but not all) kinds of object reference counters. Such
81628 + overflows can normally occur due to bugs only and are often, if
81629 + not always, exploitable.
81630 +
81631 + The tradeoff is that data structures protected by an overflowed
81632 + refcount will never be freed and therefore will leak memory. Note
81633 + that this leak also happens even without this protection but in
81634 + that case the overflow can eventually trigger the freeing of the
81635 + data structure while it is still being used elsewhere, resulting
81636 + in the exploitable situation that this feature prevents.
81637 +
81638 + Since this has a negligible performance impact, you should enable
81639 + this feature.
81640 +
81641 +config PAX_USERCOPY
81642 + bool "Harden heap object copies between kernel and userland"
81643 + default y if GRKERNSEC_CONFIG_AUTO
81644 + depends on X86 || PPC || SPARC || ARM
81645 + depends on GRKERNSEC && (SLAB || SLUB || SLOB)
81646 + select PAX_USERCOPY_SLABS
81647 + help
81648 + By saying Y here the kernel will enforce the size of heap objects
81649 + when they are copied in either direction between the kernel and
81650 + userland, even if only a part of the heap object is copied.
81651 +
81652 + Specifically, this checking prevents information leaking from the
81653 + kernel heap during kernel to userland copies (if the kernel heap
81654 + object is otherwise fully initialized) and prevents kernel heap
81655 + overflows during userland to kernel copies.
81656 +
81657 + Note that the current implementation provides the strictest bounds
81658 + checks for the SLUB allocator.
81659 +
81660 + Enabling this option also enables per-slab cache protection against
81661 + data in a given cache being copied into/out of via userland
81662 + accessors. Though the whitelist of regions will be reduced over
81663 + time, it notably protects important data structures like task structs.
81664 +
81665 + If frame pointers are enabled on x86, this option will also restrict
81666 + copies into and out of the kernel stack to local variables within a
81667 + single frame.
81668 +
81669 + Since this has a negligible performance impact, you should enable
81670 + this feature.
81671 +
81672 +config PAX_SIZE_OVERFLOW
81673 + bool "Prevent various integer overflows in function size parameters"
81674 + default y if GRKERNSEC_CONFIG_AUTO
81675 + depends on X86
81676 + help
81677 + By saying Y here the kernel recomputes expressions of function
81678 + arguments marked by a size_overflow attribute with double integer
81679 + precision (DImode/TImode for 32/64 bit integer types).
81680 +
81681 + The recomputed argument is checked against TYPE_MAX and an event
81682 + is logged on overflow and the triggering process is killed.
81683 +
81684 + Homepage: http://www.grsecurity.net/~ephox/overflow_plugin/
81685 +
81686 + Note that the implementation requires a gcc with plugin support,
81687 + i.e., gcc 4.5 or newer. You may need to install the supporting
81688 + headers explicitly in addition to the normal gcc package.
81689 +
81690 +config PAX_LATENT_ENTROPY
81691 + bool "Generate some entropy during boot"
81692 + default y if GRKERNSEC_CONFIG_AUTO
81693 + help
81694 + By saying Y here the kernel will instrument early boot code to
81695 + extract some entropy from both original and artificially created
81696 + program state. This will help especially embedded systems where
81697 + there is little 'natural' source of entropy normally. The cost
81698 + is some slowdown of the boot process.
81699 +
81700 + Note that the implementation requires a gcc with plugin support,
81701 + i.e., gcc 4.5 or newer. You may need to install the supporting
81702 + headers explicitly in addition to the normal gcc package.
81703 +
81704 + Note that entropy extracted this way is not cryptographically
81705 + secure!
81706 +
81707 +endmenu
81708 +
81709 +endmenu
81710 +
81711 +source grsecurity/Kconfig
81712 +
81713 +endmenu
81714 +
81715 +endmenu
81716 +
81717 source security/keys/Kconfig
81718
81719 config SECURITY_DMESG_RESTRICT
81720 @@ -103,7 +993,7 @@ config INTEL_TXT
81721 config LSM_MMAP_MIN_ADDR
81722 int "Low address space for LSM to protect from user allocation"
81723 depends on SECURITY && SECURITY_SELINUX
81724 - default 32768 if ARM
81725 + default 32768 if ALPHA || ARM || PARISC || SPARC32
81726 default 65536
81727 help
81728 This is the portion of low virtual memory which should be protected
81729 diff --git a/security/apparmor/lsm.c b/security/apparmor/lsm.c
81730 index 8ea39aa..8569ac5 100644
81731 --- a/security/apparmor/lsm.c
81732 +++ b/security/apparmor/lsm.c
81733 @@ -614,7 +614,7 @@ static int apparmor_task_setrlimit(struct task_struct *task,
81734 return error;
81735 }
81736
81737 -static struct security_operations apparmor_ops = {
81738 +static struct security_operations apparmor_ops __read_only = {
81739 .name = "apparmor",
81740
81741 .ptrace_access_check = apparmor_ptrace_access_check,
81742 diff --git a/security/commoncap.c b/security/commoncap.c
81743 index 6dbae46..d5611fd 100644
81744 --- a/security/commoncap.c
81745 +++ b/security/commoncap.c
81746 @@ -415,6 +415,32 @@ int get_vfs_caps_from_disk(const struct dentry *dentry, struct cpu_vfs_cap_data
81747 return 0;
81748 }
81749
81750 +/* returns:
81751 + 1 for suid privilege
81752 + 2 for sgid privilege
81753 + 3 for fscap privilege
81754 +*/
81755 +int is_privileged_binary(const struct dentry *dentry)
81756 +{
81757 + struct cpu_vfs_cap_data capdata;
81758 + struct inode *inode = dentry->d_inode;
81759 +
81760 + if (!inode || S_ISDIR(inode->i_mode))
81761 + return 0;
81762 +
81763 + if (inode->i_mode & S_ISUID)
81764 + return 1;
81765 + if ((inode->i_mode & (S_ISGID | S_IXGRP)) == (S_ISGID | S_IXGRP))
81766 + return 2;
81767 +
81768 + if (!get_vfs_caps_from_disk(dentry, &capdata)) {
81769 + if (!cap_isclear(capdata.inheritable) || !cap_isclear(capdata.permitted))
81770 + return 3;
81771 + }
81772 +
81773 + return 0;
81774 +}
81775 +
81776 /*
81777 * Attempt to get the on-exec apply capability sets for an executable file from
81778 * its xattrs and, if present, apply them to the proposed credentials being
81779 @@ -583,6 +609,9 @@ int cap_bprm_secureexec(struct linux_binprm *bprm)
81780 const struct cred *cred = current_cred();
81781 kuid_t root_uid = make_kuid(cred->user_ns, 0);
81782
81783 + if (gr_acl_enable_at_secure())
81784 + return 1;
81785 +
81786 if (!uid_eq(cred->uid, root_uid)) {
81787 if (bprm->cap_effective)
81788 return 1;
81789 diff --git a/security/integrity/ima/ima.h b/security/integrity/ima/ima.h
81790 index e7c99fd..5b2fa24 100644
81791 --- a/security/integrity/ima/ima.h
81792 +++ b/security/integrity/ima/ima.h
81793 @@ -95,8 +95,8 @@ void ima_add_violation(struct inode *inode, const unsigned char *filename,
81794 extern spinlock_t ima_queue_lock;
81795
81796 struct ima_h_table {
81797 - atomic_long_t len; /* number of stored measurements in the list */
81798 - atomic_long_t violations;
81799 + atomic_long_unchecked_t len; /* number of stored measurements in the list */
81800 + atomic_long_unchecked_t violations;
81801 struct hlist_head queue[IMA_MEASURE_HTABLE_SIZE];
81802 };
81803 extern struct ima_h_table ima_htable;
81804 diff --git a/security/integrity/ima/ima_api.c b/security/integrity/ima/ima_api.c
81805 index 032ff03..c428a74 100644
81806 --- a/security/integrity/ima/ima_api.c
81807 +++ b/security/integrity/ima/ima_api.c
81808 @@ -75,7 +75,7 @@ void ima_add_violation(struct inode *inode, const unsigned char *filename,
81809 int result;
81810
81811 /* can overflow, only indicator */
81812 - atomic_long_inc(&ima_htable.violations);
81813 + atomic_long_inc_unchecked(&ima_htable.violations);
81814
81815 entry = kmalloc(sizeof(*entry), GFP_KERNEL);
81816 if (!entry) {
81817 diff --git a/security/integrity/ima/ima_fs.c b/security/integrity/ima/ima_fs.c
81818 index 38477c9..87a60c7 100644
81819 --- a/security/integrity/ima/ima_fs.c
81820 +++ b/security/integrity/ima/ima_fs.c
81821 @@ -28,12 +28,12 @@
81822 static int valid_policy = 1;
81823 #define TMPBUFLEN 12
81824 static ssize_t ima_show_htable_value(char __user *buf, size_t count,
81825 - loff_t *ppos, atomic_long_t *val)
81826 + loff_t *ppos, atomic_long_unchecked_t *val)
81827 {
81828 char tmpbuf[TMPBUFLEN];
81829 ssize_t len;
81830
81831 - len = scnprintf(tmpbuf, TMPBUFLEN, "%li\n", atomic_long_read(val));
81832 + len = scnprintf(tmpbuf, TMPBUFLEN, "%li\n", atomic_long_read_unchecked(val));
81833 return simple_read_from_buffer(buf, count, ppos, tmpbuf, len);
81834 }
81835
81836 diff --git a/security/integrity/ima/ima_queue.c b/security/integrity/ima/ima_queue.c
81837 index 55a6271..ad829c3 100644
81838 --- a/security/integrity/ima/ima_queue.c
81839 +++ b/security/integrity/ima/ima_queue.c
81840 @@ -81,7 +81,7 @@ static int ima_add_digest_entry(struct ima_template_entry *entry)
81841 INIT_LIST_HEAD(&qe->later);
81842 list_add_tail_rcu(&qe->later, &ima_measurements);
81843
81844 - atomic_long_inc(&ima_htable.len);
81845 + atomic_long_inc_unchecked(&ima_htable.len);
81846 key = ima_hash_key(entry->digest);
81847 hlist_add_head_rcu(&qe->hnext, &ima_htable.queue[key]);
81848 return 0;
81849 diff --git a/security/keys/compat.c b/security/keys/compat.c
81850 index 1c26176..64a1ba2 100644
81851 --- a/security/keys/compat.c
81852 +++ b/security/keys/compat.c
81853 @@ -44,7 +44,7 @@ static long compat_keyctl_instantiate_key_iov(
81854 if (ret == 0)
81855 goto no_payload_free;
81856
81857 - ret = keyctl_instantiate_key_common(id, iov, ioc, ret, ringid);
81858 + ret = keyctl_instantiate_key_common(id, (const struct iovec __force_user *)iov, ioc, ret, ringid);
81859
81860 if (iov != iovstack)
81861 kfree(iov);
81862 diff --git a/security/keys/keyctl.c b/security/keys/keyctl.c
81863 index 3364fbf..1f10f31 100644
81864 --- a/security/keys/keyctl.c
81865 +++ b/security/keys/keyctl.c
81866 @@ -966,7 +966,7 @@ static int keyctl_change_reqkey_auth(struct key *key)
81867 /*
81868 * Copy the iovec data from userspace
81869 */
81870 -static long copy_from_user_iovec(void *buffer, const struct iovec *iov,
81871 +static long copy_from_user_iovec(void *buffer, const struct iovec __user *iov,
81872 unsigned ioc)
81873 {
81874 for (; ioc > 0; ioc--) {
81875 @@ -988,7 +988,7 @@ static long copy_from_user_iovec(void *buffer, const struct iovec *iov,
81876 * If successful, 0 will be returned.
81877 */
81878 long keyctl_instantiate_key_common(key_serial_t id,
81879 - const struct iovec *payload_iov,
81880 + const struct iovec __user *payload_iov,
81881 unsigned ioc,
81882 size_t plen,
81883 key_serial_t ringid)
81884 @@ -1083,7 +1083,7 @@ long keyctl_instantiate_key(key_serial_t id,
81885 [0].iov_len = plen
81886 };
81887
81888 - return keyctl_instantiate_key_common(id, iov, 1, plen, ringid);
81889 + return keyctl_instantiate_key_common(id, (const struct iovec __force_user *)iov, 1, plen, ringid);
81890 }
81891
81892 return keyctl_instantiate_key_common(id, NULL, 0, 0, ringid);
81893 @@ -1116,7 +1116,7 @@ long keyctl_instantiate_key_iov(key_serial_t id,
81894 if (ret == 0)
81895 goto no_payload_free;
81896
81897 - ret = keyctl_instantiate_key_common(id, iov, ioc, ret, ringid);
81898 + ret = keyctl_instantiate_key_common(id, (const struct iovec __force_user *)iov, ioc, ret, ringid);
81899
81900 if (iov != iovstack)
81901 kfree(iov);
81902 diff --git a/security/keys/keyring.c b/security/keys/keyring.c
81903 index 81e7852..2b2ecc3 100644
81904 --- a/security/keys/keyring.c
81905 +++ b/security/keys/keyring.c
81906 @@ -227,16 +227,16 @@ static long keyring_read(const struct key *keyring,
81907 ret = -EFAULT;
81908
81909 for (loop = 0; loop < klist->nkeys; loop++) {
81910 + key_serial_t serial;
81911 key = rcu_deref_link_locked(klist, loop,
81912 keyring);
81913 + serial = key->serial;
81914
81915 tmp = sizeof(key_serial_t);
81916 if (tmp > buflen)
81917 tmp = buflen;
81918
81919 - if (copy_to_user(buffer,
81920 - &key->serial,
81921 - tmp) != 0)
81922 + if (copy_to_user(buffer, &serial, tmp))
81923 goto error;
81924
81925 buflen -= tmp;
81926 diff --git a/security/min_addr.c b/security/min_addr.c
81927 index f728728..6457a0c 100644
81928 --- a/security/min_addr.c
81929 +++ b/security/min_addr.c
81930 @@ -14,6 +14,7 @@ unsigned long dac_mmap_min_addr = CONFIG_DEFAULT_MMAP_MIN_ADDR;
81931 */
81932 static void update_mmap_min_addr(void)
81933 {
81934 +#ifndef SPARC
81935 #ifdef CONFIG_LSM_MMAP_MIN_ADDR
81936 if (dac_mmap_min_addr > CONFIG_LSM_MMAP_MIN_ADDR)
81937 mmap_min_addr = dac_mmap_min_addr;
81938 @@ -22,6 +23,7 @@ static void update_mmap_min_addr(void)
81939 #else
81940 mmap_min_addr = dac_mmap_min_addr;
81941 #endif
81942 +#endif
81943 }
81944
81945 /*
81946 diff --git a/security/security.c b/security/security.c
81947 index 860aeb3..45765c0 100644
81948 --- a/security/security.c
81949 +++ b/security/security.c
81950 @@ -20,6 +20,7 @@
81951 #include <linux/ima.h>
81952 #include <linux/evm.h>
81953 #include <linux/fsnotify.h>
81954 +#include <linux/mm.h>
81955 #include <linux/mman.h>
81956 #include <linux/mount.h>
81957 #include <linux/personality.h>
81958 @@ -32,8 +33,8 @@
81959 static __initdata char chosen_lsm[SECURITY_NAME_MAX + 1] =
81960 CONFIG_DEFAULT_SECURITY;
81961
81962 -static struct security_operations *security_ops;
81963 -static struct security_operations default_security_ops = {
81964 +static struct security_operations *security_ops __read_only;
81965 +static struct security_operations default_security_ops __read_only = {
81966 .name = "default",
81967 };
81968
81969 @@ -74,7 +75,9 @@ int __init security_init(void)
81970
81971 void reset_security_ops(void)
81972 {
81973 + pax_open_kernel();
81974 security_ops = &default_security_ops;
81975 + pax_close_kernel();
81976 }
81977
81978 /* Save user chosen LSM */
81979 diff --git a/security/selinux/hooks.c b/security/selinux/hooks.c
81980 index 6c77f63..7496c76 100644
81981 --- a/security/selinux/hooks.c
81982 +++ b/security/selinux/hooks.c
81983 @@ -95,8 +95,6 @@
81984
81985 #define NUM_SEL_MNT_OPTS 5
81986
81987 -extern struct security_operations *security_ops;
81988 -
81989 /* SECMARK reference count */
81990 static atomic_t selinux_secmark_refcount = ATOMIC_INIT(0);
81991
81992 @@ -5511,7 +5509,7 @@ static int selinux_key_getsecurity(struct key *key, char **_buffer)
81993
81994 #endif
81995
81996 -static struct security_operations selinux_ops = {
81997 +static struct security_operations selinux_ops __read_only = {
81998 .name = "selinux",
81999
82000 .ptrace_access_check = selinux_ptrace_access_check,
82001 diff --git a/security/selinux/include/xfrm.h b/security/selinux/include/xfrm.h
82002 index 65f67cb..3f141ef 100644
82003 --- a/security/selinux/include/xfrm.h
82004 +++ b/security/selinux/include/xfrm.h
82005 @@ -50,7 +50,7 @@ int selinux_xfrm_decode_session(struct sk_buff *skb, u32 *sid, int ckall);
82006
82007 static inline void selinux_xfrm_notify_policyload(void)
82008 {
82009 - atomic_inc(&flow_cache_genid);
82010 + atomic_inc_unchecked(&flow_cache_genid);
82011 rt_genid_bump(&init_net);
82012 }
82013 #else
82014 diff --git a/security/smack/smack_lsm.c b/security/smack/smack_lsm.c
82015 index 8221514..5c4775f 100644
82016 --- a/security/smack/smack_lsm.c
82017 +++ b/security/smack/smack_lsm.c
82018 @@ -3429,7 +3429,7 @@ static int smack_inode_getsecctx(struct inode *inode, void **ctx, u32 *ctxlen)
82019 return 0;
82020 }
82021
82022 -struct security_operations smack_ops = {
82023 +struct security_operations smack_ops __read_only = {
82024 .name = "smack",
82025
82026 .ptrace_access_check = smack_ptrace_access_check,
82027 diff --git a/security/tomoyo/tomoyo.c b/security/tomoyo/tomoyo.c
82028 index c2d04a5..e6a1aeb 100644
82029 --- a/security/tomoyo/tomoyo.c
82030 +++ b/security/tomoyo/tomoyo.c
82031 @@ -501,7 +501,7 @@ static int tomoyo_socket_sendmsg(struct socket *sock, struct msghdr *msg,
82032 * tomoyo_security_ops is a "struct security_operations" which is used for
82033 * registering TOMOYO.
82034 */
82035 -static struct security_operations tomoyo_security_ops = {
82036 +static struct security_operations tomoyo_security_ops __read_only = {
82037 .name = "tomoyo",
82038 .cred_alloc_blank = tomoyo_cred_alloc_blank,
82039 .cred_prepare = tomoyo_cred_prepare,
82040 diff --git a/security/yama/Kconfig b/security/yama/Kconfig
82041 index 51d6709..1f3dbe2 100644
82042 --- a/security/yama/Kconfig
82043 +++ b/security/yama/Kconfig
82044 @@ -1,6 +1,6 @@
82045 config SECURITY_YAMA
82046 bool "Yama support"
82047 - depends on SECURITY
82048 + depends on SECURITY && !GRKERNSEC
82049 select SECURITYFS
82050 select SECURITY_PATH
82051 default n
82052 diff --git a/sound/aoa/codecs/onyx.c b/sound/aoa/codecs/onyx.c
82053 index 4cedc69..e59d8a3 100644
82054 --- a/sound/aoa/codecs/onyx.c
82055 +++ b/sound/aoa/codecs/onyx.c
82056 @@ -54,7 +54,7 @@ struct onyx {
82057 spdif_locked:1,
82058 analog_locked:1,
82059 original_mute:2;
82060 - int open_count;
82061 + local_t open_count;
82062 struct codec_info *codec_info;
82063
82064 /* mutex serializes concurrent access to the device
82065 @@ -753,7 +753,7 @@ static int onyx_open(struct codec_info_item *cii,
82066 struct onyx *onyx = cii->codec_data;
82067
82068 mutex_lock(&onyx->mutex);
82069 - onyx->open_count++;
82070 + local_inc(&onyx->open_count);
82071 mutex_unlock(&onyx->mutex);
82072
82073 return 0;
82074 @@ -765,8 +765,7 @@ static int onyx_close(struct codec_info_item *cii,
82075 struct onyx *onyx = cii->codec_data;
82076
82077 mutex_lock(&onyx->mutex);
82078 - onyx->open_count--;
82079 - if (!onyx->open_count)
82080 + if (local_dec_and_test(&onyx->open_count))
82081 onyx->spdif_locked = onyx->analog_locked = 0;
82082 mutex_unlock(&onyx->mutex);
82083
82084 diff --git a/sound/aoa/codecs/onyx.h b/sound/aoa/codecs/onyx.h
82085 index ffd2025..df062c9 100644
82086 --- a/sound/aoa/codecs/onyx.h
82087 +++ b/sound/aoa/codecs/onyx.h
82088 @@ -11,6 +11,7 @@
82089 #include <linux/i2c.h>
82090 #include <asm/pmac_low_i2c.h>
82091 #include <asm/prom.h>
82092 +#include <asm/local.h>
82093
82094 /* PCM3052 register definitions */
82095
82096 diff --git a/sound/core/oss/pcm_oss.c b/sound/core/oss/pcm_oss.c
82097 index 4c1cc51..16040040 100644
82098 --- a/sound/core/oss/pcm_oss.c
82099 +++ b/sound/core/oss/pcm_oss.c
82100 @@ -1189,10 +1189,10 @@ snd_pcm_sframes_t snd_pcm_oss_write3(struct snd_pcm_substream *substream, const
82101 if (in_kernel) {
82102 mm_segment_t fs;
82103 fs = snd_enter_user();
82104 - ret = snd_pcm_lib_write(substream, (void __force __user *)ptr, frames);
82105 + ret = snd_pcm_lib_write(substream, (void __force_user *)ptr, frames);
82106 snd_leave_user(fs);
82107 } else {
82108 - ret = snd_pcm_lib_write(substream, (void __force __user *)ptr, frames);
82109 + ret = snd_pcm_lib_write(substream, (void __force_user *)ptr, frames);
82110 }
82111 if (ret != -EPIPE && ret != -ESTRPIPE)
82112 break;
82113 @@ -1234,10 +1234,10 @@ snd_pcm_sframes_t snd_pcm_oss_read3(struct snd_pcm_substream *substream, char *p
82114 if (in_kernel) {
82115 mm_segment_t fs;
82116 fs = snd_enter_user();
82117 - ret = snd_pcm_lib_read(substream, (void __force __user *)ptr, frames);
82118 + ret = snd_pcm_lib_read(substream, (void __force_user *)ptr, frames);
82119 snd_leave_user(fs);
82120 } else {
82121 - ret = snd_pcm_lib_read(substream, (void __force __user *)ptr, frames);
82122 + ret = snd_pcm_lib_read(substream, (void __force_user *)ptr, frames);
82123 }
82124 if (ret == -EPIPE) {
82125 if (runtime->status->state == SNDRV_PCM_STATE_DRAINING) {
82126 @@ -1337,7 +1337,7 @@ static ssize_t snd_pcm_oss_write2(struct snd_pcm_substream *substream, const cha
82127 struct snd_pcm_plugin_channel *channels;
82128 size_t oss_frame_bytes = (runtime->oss.plugin_first->src_width * runtime->oss.plugin_first->src_format.channels) / 8;
82129 if (!in_kernel) {
82130 - if (copy_from_user(runtime->oss.buffer, (const char __force __user *)buf, bytes))
82131 + if (copy_from_user(runtime->oss.buffer, (const char __force_user *)buf, bytes))
82132 return -EFAULT;
82133 buf = runtime->oss.buffer;
82134 }
82135 @@ -1407,7 +1407,7 @@ static ssize_t snd_pcm_oss_write1(struct snd_pcm_substream *substream, const cha
82136 }
82137 } else {
82138 tmp = snd_pcm_oss_write2(substream,
82139 - (const char __force *)buf,
82140 + (const char __force_kernel *)buf,
82141 runtime->oss.period_bytes, 0);
82142 if (tmp <= 0)
82143 goto err;
82144 @@ -1433,7 +1433,7 @@ static ssize_t snd_pcm_oss_read2(struct snd_pcm_substream *substream, char *buf,
82145 struct snd_pcm_runtime *runtime = substream->runtime;
82146 snd_pcm_sframes_t frames, frames1;
82147 #ifdef CONFIG_SND_PCM_OSS_PLUGINS
82148 - char __user *final_dst = (char __force __user *)buf;
82149 + char __user *final_dst = (char __force_user *)buf;
82150 if (runtime->oss.plugin_first) {
82151 struct snd_pcm_plugin_channel *channels;
82152 size_t oss_frame_bytes = (runtime->oss.plugin_last->dst_width * runtime->oss.plugin_last->dst_format.channels) / 8;
82153 @@ -1495,7 +1495,7 @@ static ssize_t snd_pcm_oss_read1(struct snd_pcm_substream *substream, char __use
82154 xfer += tmp;
82155 runtime->oss.buffer_used -= tmp;
82156 } else {
82157 - tmp = snd_pcm_oss_read2(substream, (char __force *)buf,
82158 + tmp = snd_pcm_oss_read2(substream, (char __force_kernel *)buf,
82159 runtime->oss.period_bytes, 0);
82160 if (tmp <= 0)
82161 goto err;
82162 @@ -1663,7 +1663,7 @@ static int snd_pcm_oss_sync(struct snd_pcm_oss_file *pcm_oss_file)
82163 size1);
82164 size1 /= runtime->channels; /* frames */
82165 fs = snd_enter_user();
82166 - snd_pcm_lib_write(substream, (void __force __user *)runtime->oss.buffer, size1);
82167 + snd_pcm_lib_write(substream, (void __force_user *)runtime->oss.buffer, size1);
82168 snd_leave_user(fs);
82169 }
82170 } else if (runtime->access == SNDRV_PCM_ACCESS_RW_NONINTERLEAVED) {
82171 diff --git a/sound/core/pcm_compat.c b/sound/core/pcm_compat.c
82172 index 91cdf94..4085161 100644
82173 --- a/sound/core/pcm_compat.c
82174 +++ b/sound/core/pcm_compat.c
82175 @@ -31,7 +31,7 @@ static int snd_pcm_ioctl_delay_compat(struct snd_pcm_substream *substream,
82176 int err;
82177
82178 fs = snd_enter_user();
82179 - err = snd_pcm_delay(substream, &delay);
82180 + err = snd_pcm_delay(substream, (snd_pcm_sframes_t __force_user *)&delay);
82181 snd_leave_user(fs);
82182 if (err < 0)
82183 return err;
82184 diff --git a/sound/core/pcm_native.c b/sound/core/pcm_native.c
82185 index bf3bf43..3826cbc 100644
82186 --- a/sound/core/pcm_native.c
82187 +++ b/sound/core/pcm_native.c
82188 @@ -2803,11 +2803,11 @@ int snd_pcm_kernel_ioctl(struct snd_pcm_substream *substream,
82189 switch (substream->stream) {
82190 case SNDRV_PCM_STREAM_PLAYBACK:
82191 result = snd_pcm_playback_ioctl1(NULL, substream, cmd,
82192 - (void __user *)arg);
82193 + (void __force_user *)arg);
82194 break;
82195 case SNDRV_PCM_STREAM_CAPTURE:
82196 result = snd_pcm_capture_ioctl1(NULL, substream, cmd,
82197 - (void __user *)arg);
82198 + (void __force_user *)arg);
82199 break;
82200 default:
82201 result = -EINVAL;
82202 diff --git a/sound/core/seq/seq_device.c b/sound/core/seq/seq_device.c
82203 index 5cf8d65..912a79c 100644
82204 --- a/sound/core/seq/seq_device.c
82205 +++ b/sound/core/seq/seq_device.c
82206 @@ -64,7 +64,7 @@ struct ops_list {
82207 int argsize; /* argument size */
82208
82209 /* operators */
82210 - struct snd_seq_dev_ops ops;
82211 + struct snd_seq_dev_ops *ops;
82212
82213 /* registred devices */
82214 struct list_head dev_list; /* list of devices */
82215 @@ -333,7 +333,7 @@ int snd_seq_device_register_driver(char *id, struct snd_seq_dev_ops *entry,
82216
82217 mutex_lock(&ops->reg_mutex);
82218 /* copy driver operators */
82219 - ops->ops = *entry;
82220 + ops->ops = entry;
82221 ops->driver |= DRIVER_LOADED;
82222 ops->argsize = argsize;
82223
82224 @@ -463,7 +463,7 @@ static int init_device(struct snd_seq_device *dev, struct ops_list *ops)
82225 dev->name, ops->id, ops->argsize, dev->argsize);
82226 return -EINVAL;
82227 }
82228 - if (ops->ops.init_device(dev) >= 0) {
82229 + if (ops->ops->init_device(dev) >= 0) {
82230 dev->status = SNDRV_SEQ_DEVICE_REGISTERED;
82231 ops->num_init_devices++;
82232 } else {
82233 @@ -490,7 +490,7 @@ static int free_device(struct snd_seq_device *dev, struct ops_list *ops)
82234 dev->name, ops->id, ops->argsize, dev->argsize);
82235 return -EINVAL;
82236 }
82237 - if ((result = ops->ops.free_device(dev)) >= 0 || result == -ENXIO) {
82238 + if ((result = ops->ops->free_device(dev)) >= 0 || result == -ENXIO) {
82239 dev->status = SNDRV_SEQ_DEVICE_FREE;
82240 dev->driver_data = NULL;
82241 ops->num_init_devices--;
82242 diff --git a/sound/drivers/mts64.c b/sound/drivers/mts64.c
82243 index 2d5514b..3afae9c 100644
82244 --- a/sound/drivers/mts64.c
82245 +++ b/sound/drivers/mts64.c
82246 @@ -29,6 +29,7 @@
82247 #include <sound/initval.h>
82248 #include <sound/rawmidi.h>
82249 #include <sound/control.h>
82250 +#include <asm/local.h>
82251
82252 #define CARD_NAME "Miditerminal 4140"
82253 #define DRIVER_NAME "MTS64"
82254 @@ -67,7 +68,7 @@ struct mts64 {
82255 struct pardevice *pardev;
82256 int pardev_claimed;
82257
82258 - int open_count;
82259 + local_t open_count;
82260 int current_midi_output_port;
82261 int current_midi_input_port;
82262 u8 mode[MTS64_NUM_INPUT_PORTS];
82263 @@ -697,7 +698,7 @@ static int snd_mts64_rawmidi_open(struct snd_rawmidi_substream *substream)
82264 {
82265 struct mts64 *mts = substream->rmidi->private_data;
82266
82267 - if (mts->open_count == 0) {
82268 + if (local_read(&mts->open_count) == 0) {
82269 /* We don't need a spinlock here, because this is just called
82270 if the device has not been opened before.
82271 So there aren't any IRQs from the device */
82272 @@ -705,7 +706,7 @@ static int snd_mts64_rawmidi_open(struct snd_rawmidi_substream *substream)
82273
82274 msleep(50);
82275 }
82276 - ++(mts->open_count);
82277 + local_inc(&mts->open_count);
82278
82279 return 0;
82280 }
82281 @@ -715,8 +716,7 @@ static int snd_mts64_rawmidi_close(struct snd_rawmidi_substream *substream)
82282 struct mts64 *mts = substream->rmidi->private_data;
82283 unsigned long flags;
82284
82285 - --(mts->open_count);
82286 - if (mts->open_count == 0) {
82287 + if (local_dec_return(&mts->open_count) == 0) {
82288 /* We need the spinlock_irqsave here because we can still
82289 have IRQs at this point */
82290 spin_lock_irqsave(&mts->lock, flags);
82291 @@ -725,8 +725,8 @@ static int snd_mts64_rawmidi_close(struct snd_rawmidi_substream *substream)
82292
82293 msleep(500);
82294
82295 - } else if (mts->open_count < 0)
82296 - mts->open_count = 0;
82297 + } else if (local_read(&mts->open_count) < 0)
82298 + local_set(&mts->open_count, 0);
82299
82300 return 0;
82301 }
82302 diff --git a/sound/drivers/opl4/opl4_lib.c b/sound/drivers/opl4/opl4_lib.c
82303 index b953fb4..1999c01 100644
82304 --- a/sound/drivers/opl4/opl4_lib.c
82305 +++ b/sound/drivers/opl4/opl4_lib.c
82306 @@ -29,7 +29,7 @@ MODULE_AUTHOR("Clemens Ladisch <clemens@ladisch.de>");
82307 MODULE_DESCRIPTION("OPL4 driver");
82308 MODULE_LICENSE("GPL");
82309
82310 -static void inline snd_opl4_wait(struct snd_opl4 *opl4)
82311 +static inline void snd_opl4_wait(struct snd_opl4 *opl4)
82312 {
82313 int timeout = 10;
82314 while ((inb(opl4->fm_port) & OPL4_STATUS_BUSY) && --timeout > 0)
82315 diff --git a/sound/drivers/portman2x4.c b/sound/drivers/portman2x4.c
82316 index 8364855..59f2e2b 100644
82317 --- a/sound/drivers/portman2x4.c
82318 +++ b/sound/drivers/portman2x4.c
82319 @@ -48,6 +48,7 @@
82320 #include <sound/initval.h>
82321 #include <sound/rawmidi.h>
82322 #include <sound/control.h>
82323 +#include <asm/local.h>
82324
82325 #define CARD_NAME "Portman 2x4"
82326 #define DRIVER_NAME "portman"
82327 @@ -85,7 +86,7 @@ struct portman {
82328 struct pardevice *pardev;
82329 int pardev_claimed;
82330
82331 - int open_count;
82332 + local_t open_count;
82333 int mode[PORTMAN_NUM_INPUT_PORTS];
82334 struct snd_rawmidi_substream *midi_input[PORTMAN_NUM_INPUT_PORTS];
82335 };
82336 diff --git a/sound/firewire/amdtp.c b/sound/firewire/amdtp.c
82337 index ea995af..f1bfa37 100644
82338 --- a/sound/firewire/amdtp.c
82339 +++ b/sound/firewire/amdtp.c
82340 @@ -389,7 +389,7 @@ static void queue_out_packet(struct amdtp_out_stream *s, unsigned int cycle)
82341 ptr = s->pcm_buffer_pointer + data_blocks;
82342 if (ptr >= pcm->runtime->buffer_size)
82343 ptr -= pcm->runtime->buffer_size;
82344 - ACCESS_ONCE(s->pcm_buffer_pointer) = ptr;
82345 + ACCESS_ONCE_RW(s->pcm_buffer_pointer) = ptr;
82346
82347 s->pcm_period_pointer += data_blocks;
82348 if (s->pcm_period_pointer >= pcm->runtime->period_size) {
82349 @@ -557,7 +557,7 @@ EXPORT_SYMBOL(amdtp_out_stream_pcm_pointer);
82350 */
82351 void amdtp_out_stream_update(struct amdtp_out_stream *s)
82352 {
82353 - ACCESS_ONCE(s->source_node_id_field) =
82354 + ACCESS_ONCE_RW(s->source_node_id_field) =
82355 (fw_parent_device(s->unit)->card->node_id & 0x3f) << 24;
82356 }
82357 EXPORT_SYMBOL(amdtp_out_stream_update);
82358 diff --git a/sound/firewire/amdtp.h b/sound/firewire/amdtp.h
82359 index b680c5e..061b7a0 100644
82360 --- a/sound/firewire/amdtp.h
82361 +++ b/sound/firewire/amdtp.h
82362 @@ -139,7 +139,7 @@ static inline bool amdtp_out_streaming_error(struct amdtp_out_stream *s)
82363 static inline void amdtp_out_stream_pcm_trigger(struct amdtp_out_stream *s,
82364 struct snd_pcm_substream *pcm)
82365 {
82366 - ACCESS_ONCE(s->pcm) = pcm;
82367 + ACCESS_ONCE_RW(s->pcm) = pcm;
82368 }
82369
82370 static inline bool cip_sfc_is_base_44100(enum cip_sfc sfc)
82371 diff --git a/sound/firewire/isight.c b/sound/firewire/isight.c
82372 index d428ffe..751ef78 100644
82373 --- a/sound/firewire/isight.c
82374 +++ b/sound/firewire/isight.c
82375 @@ -96,7 +96,7 @@ static void isight_update_pointers(struct isight *isight, unsigned int count)
82376 ptr += count;
82377 if (ptr >= runtime->buffer_size)
82378 ptr -= runtime->buffer_size;
82379 - ACCESS_ONCE(isight->buffer_pointer) = ptr;
82380 + ACCESS_ONCE_RW(isight->buffer_pointer) = ptr;
82381
82382 isight->period_counter += count;
82383 if (isight->period_counter >= runtime->period_size) {
82384 @@ -307,7 +307,7 @@ static int isight_hw_params(struct snd_pcm_substream *substream,
82385 if (err < 0)
82386 return err;
82387
82388 - ACCESS_ONCE(isight->pcm_active) = true;
82389 + ACCESS_ONCE_RW(isight->pcm_active) = true;
82390
82391 return 0;
82392 }
82393 @@ -340,7 +340,7 @@ static int isight_hw_free(struct snd_pcm_substream *substream)
82394 {
82395 struct isight *isight = substream->private_data;
82396
82397 - ACCESS_ONCE(isight->pcm_active) = false;
82398 + ACCESS_ONCE_RW(isight->pcm_active) = false;
82399
82400 mutex_lock(&isight->mutex);
82401 isight_stop_streaming(isight);
82402 @@ -433,10 +433,10 @@ static int isight_trigger(struct snd_pcm_substream *substream, int cmd)
82403
82404 switch (cmd) {
82405 case SNDRV_PCM_TRIGGER_START:
82406 - ACCESS_ONCE(isight->pcm_running) = true;
82407 + ACCESS_ONCE_RW(isight->pcm_running) = true;
82408 break;
82409 case SNDRV_PCM_TRIGGER_STOP:
82410 - ACCESS_ONCE(isight->pcm_running) = false;
82411 + ACCESS_ONCE_RW(isight->pcm_running) = false;
82412 break;
82413 default:
82414 return -EINVAL;
82415 diff --git a/sound/isa/cmi8330.c b/sound/isa/cmi8330.c
82416 index 7bd5e33..1fcab12 100644
82417 --- a/sound/isa/cmi8330.c
82418 +++ b/sound/isa/cmi8330.c
82419 @@ -172,7 +172,7 @@ struct snd_cmi8330 {
82420
82421 struct snd_pcm *pcm;
82422 struct snd_cmi8330_stream {
82423 - struct snd_pcm_ops ops;
82424 + snd_pcm_ops_no_const ops;
82425 snd_pcm_open_callback_t open;
82426 void *private_data; /* sb or wss */
82427 } streams[2];
82428 diff --git a/sound/oss/sb_audio.c b/sound/oss/sb_audio.c
82429 index b2b3c01..e1c1e1f 100644
82430 --- a/sound/oss/sb_audio.c
82431 +++ b/sound/oss/sb_audio.c
82432 @@ -903,7 +903,7 @@ sb16_copy_from_user(int dev,
82433 buf16 = (signed short *)(localbuf + localoffs);
82434 while (c)
82435 {
82436 - locallen = (c >= LBUFCOPYSIZE ? LBUFCOPYSIZE : c);
82437 + locallen = ((unsigned)c >= LBUFCOPYSIZE ? LBUFCOPYSIZE : c);
82438 if (copy_from_user(lbuf8,
82439 userbuf+useroffs + p,
82440 locallen))
82441 diff --git a/sound/oss/swarm_cs4297a.c b/sound/oss/swarm_cs4297a.c
82442 index 7d8803a..559f8d0 100644
82443 --- a/sound/oss/swarm_cs4297a.c
82444 +++ b/sound/oss/swarm_cs4297a.c
82445 @@ -2621,7 +2621,6 @@ static int __init cs4297a_init(void)
82446 {
82447 struct cs4297a_state *s;
82448 u32 pwr, id;
82449 - mm_segment_t fs;
82450 int rval;
82451 #ifndef CONFIG_BCM_CS4297A_CSWARM
82452 u64 cfg;
82453 @@ -2711,22 +2710,23 @@ static int __init cs4297a_init(void)
82454 if (!rval) {
82455 char *sb1250_duart_present;
82456
82457 +#if 0
82458 + mm_segment_t fs;
82459 fs = get_fs();
82460 set_fs(KERNEL_DS);
82461 -#if 0
82462 val = SOUND_MASK_LINE;
82463 mixer_ioctl(s, SOUND_MIXER_WRITE_RECSRC, (unsigned long) &val);
82464 for (i = 0; i < ARRAY_SIZE(initvol); i++) {
82465 val = initvol[i].vol;
82466 mixer_ioctl(s, initvol[i].mixch, (unsigned long) &val);
82467 }
82468 + set_fs(fs);
82469 // cs4297a_write_ac97(s, 0x18, 0x0808);
82470 #else
82471 // cs4297a_write_ac97(s, 0x5e, 0x180);
82472 cs4297a_write_ac97(s, 0x02, 0x0808);
82473 cs4297a_write_ac97(s, 0x18, 0x0808);
82474 #endif
82475 - set_fs(fs);
82476
82477 list_add(&s->list, &cs4297a_devs);
82478
82479 diff --git a/sound/pci/hda/hda_codec.h b/sound/pci/hda/hda_codec.h
82480 index e5a7e19..4049063 100644
82481 --- a/sound/pci/hda/hda_codec.h
82482 +++ b/sound/pci/hda/hda_codec.h
82483 @@ -614,7 +614,7 @@ struct hda_bus_ops {
82484 /* notify power-up/down from codec to controller */
82485 void (*pm_notify)(struct hda_bus *bus);
82486 #endif
82487 -};
82488 +} __no_const;
82489
82490 /* template to pass to the bus constructor */
82491 struct hda_bus_template {
82492 @@ -714,6 +714,7 @@ struct hda_codec_ops {
82493 #endif
82494 void (*reboot_notify)(struct hda_codec *codec);
82495 };
82496 +typedef struct hda_codec_ops __no_const hda_codec_ops_no_const;
82497
82498 /* record for amp information cache */
82499 struct hda_cache_head {
82500 @@ -744,7 +745,7 @@ struct hda_pcm_ops {
82501 struct snd_pcm_substream *substream);
82502 int (*cleanup)(struct hda_pcm_stream *info, struct hda_codec *codec,
82503 struct snd_pcm_substream *substream);
82504 -};
82505 +} __no_const;
82506
82507 /* PCM information for each substream */
82508 struct hda_pcm_stream {
82509 @@ -802,7 +803,7 @@ struct hda_codec {
82510 const char *modelname; /* model name for preset */
82511
82512 /* set by patch */
82513 - struct hda_codec_ops patch_ops;
82514 + hda_codec_ops_no_const patch_ops;
82515
82516 /* PCM to create, set by patch_ops.build_pcms callback */
82517 unsigned int num_pcms;
82518 diff --git a/sound/pci/ice1712/ice1712.h b/sound/pci/ice1712/ice1712.h
82519 index 0da778a..bc38b84 100644
82520 --- a/sound/pci/ice1712/ice1712.h
82521 +++ b/sound/pci/ice1712/ice1712.h
82522 @@ -269,7 +269,7 @@ struct snd_ak4xxx_private {
82523 unsigned int mask_flags; /* total mask bits */
82524 struct snd_akm4xxx_ops {
82525 void (*set_rate_val)(struct snd_akm4xxx *ak, unsigned int rate);
82526 - } ops;
82527 + } __no_const ops;
82528 };
82529
82530 struct snd_ice1712_spdif {
82531 @@ -285,7 +285,7 @@ struct snd_ice1712_spdif {
82532 int (*default_put)(struct snd_ice1712 *, struct snd_ctl_elem_value *ucontrol);
82533 void (*stream_get)(struct snd_ice1712 *, struct snd_ctl_elem_value *ucontrol);
82534 int (*stream_put)(struct snd_ice1712 *, struct snd_ctl_elem_value *ucontrol);
82535 - } ops;
82536 + } __no_const ops;
82537 };
82538
82539
82540 diff --git a/sound/pci/ymfpci/ymfpci.h b/sound/pci/ymfpci/ymfpci.h
82541 index bddc405..2c0733c 100644
82542 --- a/sound/pci/ymfpci/ymfpci.h
82543 +++ b/sound/pci/ymfpci/ymfpci.h
82544 @@ -358,7 +358,7 @@ struct snd_ymfpci {
82545 spinlock_t reg_lock;
82546 spinlock_t voice_lock;
82547 wait_queue_head_t interrupt_sleep;
82548 - atomic_t interrupt_sleep_count;
82549 + atomic_unchecked_t interrupt_sleep_count;
82550 struct snd_info_entry *proc_entry;
82551 const struct firmware *dsp_microcode;
82552 const struct firmware *controller_microcode;
82553 diff --git a/sound/pci/ymfpci/ymfpci_main.c b/sound/pci/ymfpci/ymfpci_main.c
82554 index 62b2363..ee77972 100644
82555 --- a/sound/pci/ymfpci/ymfpci_main.c
82556 +++ b/sound/pci/ymfpci/ymfpci_main.c
82557 @@ -203,8 +203,8 @@ static void snd_ymfpci_hw_stop(struct snd_ymfpci *chip)
82558 if ((snd_ymfpci_readl(chip, YDSXGR_STATUS) & 2) == 0)
82559 break;
82560 }
82561 - if (atomic_read(&chip->interrupt_sleep_count)) {
82562 - atomic_set(&chip->interrupt_sleep_count, 0);
82563 + if (atomic_read_unchecked(&chip->interrupt_sleep_count)) {
82564 + atomic_set_unchecked(&chip->interrupt_sleep_count, 0);
82565 wake_up(&chip->interrupt_sleep);
82566 }
82567 __end:
82568 @@ -788,7 +788,7 @@ static void snd_ymfpci_irq_wait(struct snd_ymfpci *chip)
82569 continue;
82570 init_waitqueue_entry(&wait, current);
82571 add_wait_queue(&chip->interrupt_sleep, &wait);
82572 - atomic_inc(&chip->interrupt_sleep_count);
82573 + atomic_inc_unchecked(&chip->interrupt_sleep_count);
82574 schedule_timeout_uninterruptible(msecs_to_jiffies(50));
82575 remove_wait_queue(&chip->interrupt_sleep, &wait);
82576 }
82577 @@ -826,8 +826,8 @@ static irqreturn_t snd_ymfpci_interrupt(int irq, void *dev_id)
82578 snd_ymfpci_writel(chip, YDSXGR_MODE, mode);
82579 spin_unlock(&chip->reg_lock);
82580
82581 - if (atomic_read(&chip->interrupt_sleep_count)) {
82582 - atomic_set(&chip->interrupt_sleep_count, 0);
82583 + if (atomic_read_unchecked(&chip->interrupt_sleep_count)) {
82584 + atomic_set_unchecked(&chip->interrupt_sleep_count, 0);
82585 wake_up(&chip->interrupt_sleep);
82586 }
82587 }
82588 @@ -2402,7 +2402,7 @@ int __devinit snd_ymfpci_create(struct snd_card *card,
82589 spin_lock_init(&chip->reg_lock);
82590 spin_lock_init(&chip->voice_lock);
82591 init_waitqueue_head(&chip->interrupt_sleep);
82592 - atomic_set(&chip->interrupt_sleep_count, 0);
82593 + atomic_set_unchecked(&chip->interrupt_sleep_count, 0);
82594 chip->card = card;
82595 chip->pci = pci;
82596 chip->irq = -1;
82597 diff --git a/tools/gcc/.gitignore b/tools/gcc/.gitignore
82598 new file mode 100644
82599 index 0000000..50f2f2f
82600 --- /dev/null
82601 +++ b/tools/gcc/.gitignore
82602 @@ -0,0 +1 @@
82603 +size_overflow_hash.h
82604 diff --git a/tools/gcc/Makefile b/tools/gcc/Makefile
82605 new file mode 100644
82606 index 0000000..1d09b7e
82607 --- /dev/null
82608 +++ b/tools/gcc/Makefile
82609 @@ -0,0 +1,43 @@
82610 +#CC := gcc
82611 +#PLUGIN_SOURCE_FILES := pax_plugin.c
82612 +#PLUGIN_OBJECT_FILES := $(patsubst %.c,%.o,$(PLUGIN_SOURCE_FILES))
82613 +GCCPLUGINS_DIR := $(shell $(CC) -print-file-name=plugin)
82614 +#CFLAGS += -I$(GCCPLUGINS_DIR)/include -fPIC -O2 -Wall -W -std=gnu99
82615 +
82616 +ifeq ($(PLUGINCC),$(HOSTCC))
82617 +HOSTLIBS := hostlibs
82618 +HOST_EXTRACFLAGS += -I$(GCCPLUGINS_DIR)/include -I$(GCCPLUGINS_DIR)/include/c-family -std=gnu99 -ggdb
82619 +else
82620 +HOSTLIBS := hostcxxlibs
82621 +HOST_EXTRACXXFLAGS += -I$(GCCPLUGINS_DIR)/include -I$(GCCPLUGINS_DIR)/include/c-family -std=gnu++98 -ggdb -Wno-unused-parameter
82622 +endif
82623 +
82624 +$(HOSTLIBS)-y := constify_plugin.so
82625 +$(HOSTLIBS)-$(CONFIG_PAX_MEMORY_STACKLEAK) += stackleak_plugin.so
82626 +$(HOSTLIBS)-$(CONFIG_KALLOCSTAT_PLUGIN) += kallocstat_plugin.so
82627 +$(HOSTLIBS)-$(CONFIG_PAX_KERNEXEC_PLUGIN) += kernexec_plugin.so
82628 +$(HOSTLIBS)-$(CONFIG_CHECKER_PLUGIN) += checker_plugin.so
82629 +$(HOSTLIBS)-y += colorize_plugin.so
82630 +$(HOSTLIBS)-$(CONFIG_PAX_SIZE_OVERFLOW) += size_overflow_plugin.so
82631 +$(HOSTLIBS)-$(CONFIG_PAX_LATENT_ENTROPY) += latent_entropy_plugin.so
82632 +
82633 +always := $($(HOSTLIBS)-y)
82634 +
82635 +constify_plugin-objs := constify_plugin.o
82636 +stackleak_plugin-objs := stackleak_plugin.o
82637 +kallocstat_plugin-objs := kallocstat_plugin.o
82638 +kernexec_plugin-objs := kernexec_plugin.o
82639 +checker_plugin-objs := checker_plugin.o
82640 +colorize_plugin-objs := colorize_plugin.o
82641 +size_overflow_plugin-objs := size_overflow_plugin.o
82642 +latent_entropy_plugin-objs := latent_entropy_plugin.o
82643 +
82644 +$(obj)/size_overflow_plugin.o: $(objtree)/$(obj)/size_overflow_hash.h
82645 +
82646 +quiet_cmd_build_size_overflow_hash = GENHASH $@
82647 + cmd_build_size_overflow_hash = \
82648 + $(CONFIG_SHELL) $(srctree)/$(src)/generate_size_overflow_hash.sh -d $< -o $@
82649 +$(objtree)/$(obj)/size_overflow_hash.h: $(src)/size_overflow_hash.data FORCE
82650 + $(call if_changed,build_size_overflow_hash)
82651 +
82652 +targets += size_overflow_hash.h
82653 diff --git a/tools/gcc/checker_plugin.c b/tools/gcc/checker_plugin.c
82654 new file mode 100644
82655 index 0000000..d41b5af
82656 --- /dev/null
82657 +++ b/tools/gcc/checker_plugin.c
82658 @@ -0,0 +1,171 @@
82659 +/*
82660 + * Copyright 2011 by the PaX Team <pageexec@freemail.hu>
82661 + * Licensed under the GPL v2
82662 + *
82663 + * Note: the choice of the license means that the compilation process is
82664 + * NOT 'eligible' as defined by gcc's library exception to the GPL v3,
82665 + * but for the kernel it doesn't matter since it doesn't link against
82666 + * any of the gcc libraries
82667 + *
82668 + * gcc plugin to implement various sparse (source code checker) features
82669 + *
82670 + * TODO:
82671 + * - define separate __iomem, __percpu and __rcu address spaces (lots of code to patch)
82672 + *
82673 + * BUGS:
82674 + * - none known
82675 + */
82676 +#include "gcc-plugin.h"
82677 +#include "config.h"
82678 +#include "system.h"
82679 +#include "coretypes.h"
82680 +#include "tree.h"
82681 +#include "tree-pass.h"
82682 +#include "flags.h"
82683 +#include "intl.h"
82684 +#include "toplev.h"
82685 +#include "plugin.h"
82686 +//#include "expr.h" where are you...
82687 +#include "diagnostic.h"
82688 +#include "plugin-version.h"
82689 +#include "tm.h"
82690 +#include "function.h"
82691 +#include "basic-block.h"
82692 +#include "gimple.h"
82693 +#include "rtl.h"
82694 +#include "emit-rtl.h"
82695 +#include "tree-flow.h"
82696 +#include "target.h"
82697 +
82698 +extern void c_register_addr_space (const char *str, addr_space_t as);
82699 +extern enum machine_mode default_addr_space_pointer_mode (addr_space_t);
82700 +extern enum machine_mode default_addr_space_address_mode (addr_space_t);
82701 +extern bool default_addr_space_valid_pointer_mode(enum machine_mode mode, addr_space_t as);
82702 +extern bool default_addr_space_legitimate_address_p(enum machine_mode mode, rtx mem, bool strict, addr_space_t as);
82703 +extern rtx default_addr_space_legitimize_address(rtx x, rtx oldx, enum machine_mode mode, addr_space_t as);
82704 +
82705 +extern void print_gimple_stmt(FILE *, gimple, int, int);
82706 +extern rtx emit_move_insn(rtx x, rtx y);
82707 +
82708 +int plugin_is_GPL_compatible;
82709 +
82710 +static struct plugin_info checker_plugin_info = {
82711 + .version = "201111150100",
82712 +};
82713 +
82714 +#define ADDR_SPACE_KERNEL 0
82715 +#define ADDR_SPACE_FORCE_KERNEL 1
82716 +#define ADDR_SPACE_USER 2
82717 +#define ADDR_SPACE_FORCE_USER 3
82718 +#define ADDR_SPACE_IOMEM 0
82719 +#define ADDR_SPACE_FORCE_IOMEM 0
82720 +#define ADDR_SPACE_PERCPU 0
82721 +#define ADDR_SPACE_FORCE_PERCPU 0
82722 +#define ADDR_SPACE_RCU 0
82723 +#define ADDR_SPACE_FORCE_RCU 0
82724 +
82725 +static enum machine_mode checker_addr_space_pointer_mode(addr_space_t addrspace)
82726 +{
82727 + return default_addr_space_pointer_mode(ADDR_SPACE_GENERIC);
82728 +}
82729 +
82730 +static enum machine_mode checker_addr_space_address_mode(addr_space_t addrspace)
82731 +{
82732 + return default_addr_space_address_mode(ADDR_SPACE_GENERIC);
82733 +}
82734 +
82735 +static bool checker_addr_space_valid_pointer_mode(enum machine_mode mode, addr_space_t as)
82736 +{
82737 + return default_addr_space_valid_pointer_mode(mode, as);
82738 +}
82739 +
82740 +static bool checker_addr_space_legitimate_address_p(enum machine_mode mode, rtx mem, bool strict, addr_space_t as)
82741 +{
82742 + return default_addr_space_legitimate_address_p(mode, mem, strict, ADDR_SPACE_GENERIC);
82743 +}
82744 +
82745 +static rtx checker_addr_space_legitimize_address(rtx x, rtx oldx, enum machine_mode mode, addr_space_t as)
82746 +{
82747 + return default_addr_space_legitimize_address(x, oldx, mode, as);
82748 +}
82749 +
82750 +static bool checker_addr_space_subset_p(addr_space_t subset, addr_space_t superset)
82751 +{
82752 + if (subset == ADDR_SPACE_FORCE_KERNEL && superset == ADDR_SPACE_KERNEL)
82753 + return true;
82754 +
82755 + if (subset == ADDR_SPACE_FORCE_USER && superset == ADDR_SPACE_USER)
82756 + return true;
82757 +
82758 + if (subset == ADDR_SPACE_FORCE_IOMEM && superset == ADDR_SPACE_IOMEM)
82759 + return true;
82760 +
82761 + if (subset == ADDR_SPACE_KERNEL && superset == ADDR_SPACE_FORCE_USER)
82762 + return true;
82763 +
82764 + if (subset == ADDR_SPACE_KERNEL && superset == ADDR_SPACE_FORCE_IOMEM)
82765 + return true;
82766 +
82767 + if (subset == ADDR_SPACE_USER && superset == ADDR_SPACE_FORCE_KERNEL)
82768 + return true;
82769 +
82770 + if (subset == ADDR_SPACE_IOMEM && superset == ADDR_SPACE_FORCE_KERNEL)
82771 + return true;
82772 +
82773 + return subset == superset;
82774 +}
82775 +
82776 +static rtx checker_addr_space_convert(rtx op, tree from_type, tree to_type)
82777 +{
82778 +// addr_space_t from_as = TYPE_ADDR_SPACE(TREE_TYPE(from_type));
82779 +// addr_space_t to_as = TYPE_ADDR_SPACE(TREE_TYPE(to_type));
82780 +
82781 + return op;
82782 +}
82783 +
82784 +static void register_checker_address_spaces(void *event_data, void *data)
82785 +{
82786 + c_register_addr_space("__kernel", ADDR_SPACE_KERNEL);
82787 + c_register_addr_space("__force_kernel", ADDR_SPACE_FORCE_KERNEL);
82788 + c_register_addr_space("__user", ADDR_SPACE_USER);
82789 + c_register_addr_space("__force_user", ADDR_SPACE_FORCE_USER);
82790 +// c_register_addr_space("__iomem", ADDR_SPACE_IOMEM);
82791 +// c_register_addr_space("__force_iomem", ADDR_SPACE_FORCE_IOMEM);
82792 +// c_register_addr_space("__percpu", ADDR_SPACE_PERCPU);
82793 +// c_register_addr_space("__force_percpu", ADDR_SPACE_FORCE_PERCPU);
82794 +// c_register_addr_space("__rcu", ADDR_SPACE_RCU);
82795 +// c_register_addr_space("__force_rcu", ADDR_SPACE_FORCE_RCU);
82796 +
82797 + targetm.addr_space.pointer_mode = checker_addr_space_pointer_mode;
82798 + targetm.addr_space.address_mode = checker_addr_space_address_mode;
82799 + targetm.addr_space.valid_pointer_mode = checker_addr_space_valid_pointer_mode;
82800 + targetm.addr_space.legitimate_address_p = checker_addr_space_legitimate_address_p;
82801 +// targetm.addr_space.legitimize_address = checker_addr_space_legitimize_address;
82802 + targetm.addr_space.subset_p = checker_addr_space_subset_p;
82803 + targetm.addr_space.convert = checker_addr_space_convert;
82804 +}
82805 +
82806 +int plugin_init(struct plugin_name_args *plugin_info, struct plugin_gcc_version *version)
82807 +{
82808 + const char * const plugin_name = plugin_info->base_name;
82809 + const int argc = plugin_info->argc;
82810 + const struct plugin_argument * const argv = plugin_info->argv;
82811 + int i;
82812 +
82813 + if (!plugin_default_version_check(version, &gcc_version)) {
82814 + error(G_("incompatible gcc/plugin versions"));
82815 + return 1;
82816 + }
82817 +
82818 + register_callback(plugin_name, PLUGIN_INFO, NULL, &checker_plugin_info);
82819 +
82820 + for (i = 0; i < argc; ++i)
82821 + error(G_("unkown option '-fplugin-arg-%s-%s'"), plugin_name, argv[i].key);
82822 +
82823 + if (TARGET_64BIT == 0)
82824 + return 0;
82825 +
82826 + register_callback(plugin_name, PLUGIN_PRAGMAS, register_checker_address_spaces, NULL);
82827 +
82828 + return 0;
82829 +}
82830 diff --git a/tools/gcc/colorize_plugin.c b/tools/gcc/colorize_plugin.c
82831 new file mode 100644
82832 index 0000000..846aeb0
82833 --- /dev/null
82834 +++ b/tools/gcc/colorize_plugin.c
82835 @@ -0,0 +1,148 @@
82836 +/*
82837 + * Copyright 2012 by PaX Team <pageexec@freemail.hu>
82838 + * Licensed under the GPL v2
82839 + *
82840 + * Note: the choice of the license means that the compilation process is
82841 + * NOT 'eligible' as defined by gcc's library exception to the GPL v3,
82842 + * but for the kernel it doesn't matter since it doesn't link against
82843 + * any of the gcc libraries
82844 + *
82845 + * gcc plugin to colorize diagnostic output
82846 + *
82847 + */
82848 +
82849 +#include "gcc-plugin.h"
82850 +#include "config.h"
82851 +#include "system.h"
82852 +#include "coretypes.h"
82853 +#include "tree.h"
82854 +#include "tree-pass.h"
82855 +#include "flags.h"
82856 +#include "intl.h"
82857 +#include "toplev.h"
82858 +#include "plugin.h"
82859 +#include "diagnostic.h"
82860 +#include "plugin-version.h"
82861 +#include "tm.h"
82862 +
82863 +int plugin_is_GPL_compatible;
82864 +
82865 +static struct plugin_info colorize_plugin_info = {
82866 + .version = "201203092200",
82867 + .help = NULL,
82868 +};
82869 +
82870 +#define GREEN "\033[32m\033[2m"
82871 +#define LIGHTGREEN "\033[32m\033[1m"
82872 +#define YELLOW "\033[33m\033[2m"
82873 +#define LIGHTYELLOW "\033[33m\033[1m"
82874 +#define RED "\033[31m\033[2m"
82875 +#define LIGHTRED "\033[31m\033[1m"
82876 +#define BLUE "\033[34m\033[2m"
82877 +#define LIGHTBLUE "\033[34m\033[1m"
82878 +#define BRIGHT "\033[m\033[1m"
82879 +#define NORMAL "\033[m"
82880 +
82881 +static diagnostic_starter_fn old_starter;
82882 +static diagnostic_finalizer_fn old_finalizer;
82883 +
82884 +static void start_colorize(diagnostic_context *context, diagnostic_info *diagnostic)
82885 +{
82886 + const char *color;
82887 + char *newprefix;
82888 +
82889 + switch (diagnostic->kind) {
82890 + case DK_NOTE:
82891 + color = LIGHTBLUE;
82892 + break;
82893 +
82894 + case DK_PEDWARN:
82895 + case DK_WARNING:
82896 + color = LIGHTYELLOW;
82897 + break;
82898 +
82899 + case DK_ERROR:
82900 + case DK_FATAL:
82901 + case DK_ICE:
82902 + case DK_PERMERROR:
82903 + case DK_SORRY:
82904 + color = LIGHTRED;
82905 + break;
82906 +
82907 + default:
82908 + color = NORMAL;
82909 + }
82910 +
82911 + old_starter(context, diagnostic);
82912 + if (-1 == asprintf(&newprefix, "%s%s" NORMAL, color, context->printer->prefix))
82913 + return;
82914 + pp_destroy_prefix(context->printer);
82915 + pp_set_prefix(context->printer, newprefix);
82916 +}
82917 +
82918 +static void finalize_colorize(diagnostic_context *context, diagnostic_info *diagnostic)
82919 +{
82920 + old_finalizer(context, diagnostic);
82921 +}
82922 +
82923 +static void colorize_arm(void)
82924 +{
82925 + old_starter = diagnostic_starter(global_dc);
82926 + old_finalizer = diagnostic_finalizer(global_dc);
82927 +
82928 + diagnostic_starter(global_dc) = start_colorize;
82929 + diagnostic_finalizer(global_dc) = finalize_colorize;
82930 +}
82931 +
82932 +static unsigned int execute_colorize_rearm(void)
82933 +{
82934 + if (diagnostic_starter(global_dc) == start_colorize)
82935 + return 0;
82936 +
82937 + colorize_arm();
82938 + return 0;
82939 +}
82940 +
82941 +struct simple_ipa_opt_pass pass_ipa_colorize_rearm = {
82942 + .pass = {
82943 + .type = SIMPLE_IPA_PASS,
82944 + .name = "colorize_rearm",
82945 + .gate = NULL,
82946 + .execute = execute_colorize_rearm,
82947 + .sub = NULL,
82948 + .next = NULL,
82949 + .static_pass_number = 0,
82950 + .tv_id = TV_NONE,
82951 + .properties_required = 0,
82952 + .properties_provided = 0,
82953 + .properties_destroyed = 0,
82954 + .todo_flags_start = 0,
82955 + .todo_flags_finish = 0
82956 + }
82957 +};
82958 +
82959 +static void colorize_start_unit(void *gcc_data, void *user_data)
82960 +{
82961 + colorize_arm();
82962 +}
82963 +
82964 +int plugin_init(struct plugin_name_args *plugin_info, struct plugin_gcc_version *version)
82965 +{
82966 + const char * const plugin_name = plugin_info->base_name;
82967 + struct register_pass_info colorize_rearm_pass_info = {
82968 + .pass = &pass_ipa_colorize_rearm.pass,
82969 + .reference_pass_name = "*free_lang_data",
82970 + .ref_pass_instance_number = 1,
82971 + .pos_op = PASS_POS_INSERT_AFTER
82972 + };
82973 +
82974 + if (!plugin_default_version_check(version, &gcc_version)) {
82975 + error(G_("incompatible gcc/plugin versions"));
82976 + return 1;
82977 + }
82978 +
82979 + register_callback(plugin_name, PLUGIN_INFO, NULL, &colorize_plugin_info);
82980 + register_callback(plugin_name, PLUGIN_START_UNIT, &colorize_start_unit, NULL);
82981 + register_callback(plugin_name, PLUGIN_PASS_MANAGER_SETUP, NULL, &colorize_rearm_pass_info);
82982 + return 0;
82983 +}
82984 diff --git a/tools/gcc/constify_plugin.c b/tools/gcc/constify_plugin.c
82985 new file mode 100644
82986 index 0000000..92ed719
82987 --- /dev/null
82988 +++ b/tools/gcc/constify_plugin.c
82989 @@ -0,0 +1,331 @@
82990 +/*
82991 + * Copyright 2011 by Emese Revfy <re.emese@gmail.com>
82992 + * Copyright 2011 by PaX Team <pageexec@freemail.hu>
82993 + * Licensed under the GPL v2, or (at your option) v3
82994 + *
82995 + * This gcc plugin constifies all structures which contain only function pointers or are explicitly marked for constification.
82996 + *
82997 + * Homepage:
82998 + * http://www.grsecurity.net/~ephox/const_plugin/
82999 + *
83000 + * Usage:
83001 + * $ gcc -I`gcc -print-file-name=plugin`/include -fPIC -shared -O2 -o constify_plugin.so constify_plugin.c
83002 + * $ gcc -fplugin=constify_plugin.so test.c -O2
83003 + */
83004 +
83005 +#include "gcc-plugin.h"
83006 +#include "config.h"
83007 +#include "system.h"
83008 +#include "coretypes.h"
83009 +#include "tree.h"
83010 +#include "tree-pass.h"
83011 +#include "flags.h"
83012 +#include "intl.h"
83013 +#include "toplev.h"
83014 +#include "plugin.h"
83015 +#include "diagnostic.h"
83016 +#include "plugin-version.h"
83017 +#include "tm.h"
83018 +#include "function.h"
83019 +#include "basic-block.h"
83020 +#include "gimple.h"
83021 +#include "rtl.h"
83022 +#include "emit-rtl.h"
83023 +#include "tree-flow.h"
83024 +
83025 +#define C_TYPE_FIELDS_READONLY(TYPE) TREE_LANG_FLAG_1(TYPE)
83026 +
83027 +int plugin_is_GPL_compatible;
83028 +
83029 +static struct plugin_info const_plugin_info = {
83030 + .version = "201205300030",
83031 + .help = "no-constify\tturn off constification\n",
83032 +};
83033 +
83034 +static void deconstify_tree(tree node);
83035 +
83036 +static void deconstify_type(tree type)
83037 +{
83038 + tree field;
83039 +
83040 + for (field = TYPE_FIELDS(type); field; field = TREE_CHAIN(field)) {
83041 + tree type = TREE_TYPE(field);
83042 +
83043 + if (TREE_CODE(type) != RECORD_TYPE && TREE_CODE(type) != UNION_TYPE)
83044 + continue;
83045 + if (!TYPE_READONLY(type))
83046 + continue;
83047 +
83048 + deconstify_tree(field);
83049 + }
83050 + TYPE_READONLY(type) = 0;
83051 + C_TYPE_FIELDS_READONLY(type) = 0;
83052 +}
83053 +
83054 +static void deconstify_tree(tree node)
83055 +{
83056 + tree old_type, new_type, field;
83057 +
83058 + old_type = TREE_TYPE(node);
83059 +
83060 + gcc_assert(TYPE_READONLY(old_type) && (TYPE_QUALS(old_type) & TYPE_QUAL_CONST));
83061 +
83062 + new_type = build_qualified_type(old_type, TYPE_QUALS(old_type) & ~TYPE_QUAL_CONST);
83063 + TYPE_FIELDS(new_type) = copy_list(TYPE_FIELDS(new_type));
83064 + for (field = TYPE_FIELDS(new_type); field; field = TREE_CHAIN(field))
83065 + DECL_FIELD_CONTEXT(field) = new_type;
83066 +
83067 + deconstify_type(new_type);
83068 +
83069 + TREE_READONLY(node) = 0;
83070 + TREE_TYPE(node) = new_type;
83071 +}
83072 +
83073 +static tree handle_no_const_attribute(tree *node, tree name, tree args, int flags, bool *no_add_attrs)
83074 +{
83075 + tree type;
83076 +
83077 + *no_add_attrs = true;
83078 + if (TREE_CODE(*node) == FUNCTION_DECL) {
83079 + error("%qE attribute does not apply to functions", name);
83080 + return NULL_TREE;
83081 + }
83082 +
83083 + if (TREE_CODE(*node) == VAR_DECL) {
83084 + error("%qE attribute does not apply to variables", name);
83085 + return NULL_TREE;
83086 + }
83087 +
83088 + if (TYPE_P(*node)) {
83089 + if (TREE_CODE(*node) == RECORD_TYPE || TREE_CODE(*node) == UNION_TYPE)
83090 + *no_add_attrs = false;
83091 + else
83092 + error("%qE attribute applies to struct and union types only", name);
83093 + return NULL_TREE;
83094 + }
83095 +
83096 + type = TREE_TYPE(*node);
83097 +
83098 + if (TREE_CODE(type) != RECORD_TYPE && TREE_CODE(type) != UNION_TYPE) {
83099 + error("%qE attribute applies to struct and union types only", name);
83100 + return NULL_TREE;
83101 + }
83102 +
83103 + if (lookup_attribute(IDENTIFIER_POINTER(name), TYPE_ATTRIBUTES(type))) {
83104 + error("%qE attribute is already applied to the type", name);
83105 + return NULL_TREE;
83106 + }
83107 +
83108 + if (TREE_CODE(*node) == TYPE_DECL && !TYPE_READONLY(type)) {
83109 + error("%qE attribute used on type that is not constified", name);
83110 + return NULL_TREE;
83111 + }
83112 +
83113 + if (TREE_CODE(*node) == TYPE_DECL) {
83114 + deconstify_tree(*node);
83115 + return NULL_TREE;
83116 + }
83117 +
83118 + return NULL_TREE;
83119 +}
83120 +
83121 +static void constify_type(tree type)
83122 +{
83123 + TYPE_READONLY(type) = 1;
83124 + C_TYPE_FIELDS_READONLY(type) = 1;
83125 +}
83126 +
83127 +static tree handle_do_const_attribute(tree *node, tree name, tree args, int flags, bool *no_add_attrs)
83128 +{
83129 + *no_add_attrs = true;
83130 + if (!TYPE_P(*node)) {
83131 + error("%qE attribute applies to types only", name);
83132 + return NULL_TREE;
83133 + }
83134 +
83135 + if (TREE_CODE(*node) != RECORD_TYPE && TREE_CODE(*node) != UNION_TYPE) {
83136 + error("%qE attribute applies to struct and union types only", name);
83137 + return NULL_TREE;
83138 + }
83139 +
83140 + *no_add_attrs = false;
83141 + constify_type(*node);
83142 + return NULL_TREE;
83143 +}
83144 +
83145 +static struct attribute_spec no_const_attr = {
83146 + .name = "no_const",
83147 + .min_length = 0,
83148 + .max_length = 0,
83149 + .decl_required = false,
83150 + .type_required = false,
83151 + .function_type_required = false,
83152 + .handler = handle_no_const_attribute,
83153 +#if BUILDING_GCC_VERSION >= 4007
83154 + .affects_type_identity = true
83155 +#endif
83156 +};
83157 +
83158 +static struct attribute_spec do_const_attr = {
83159 + .name = "do_const",
83160 + .min_length = 0,
83161 + .max_length = 0,
83162 + .decl_required = false,
83163 + .type_required = false,
83164 + .function_type_required = false,
83165 + .handler = handle_do_const_attribute,
83166 +#if BUILDING_GCC_VERSION >= 4007
83167 + .affects_type_identity = true
83168 +#endif
83169 +};
83170 +
83171 +static void register_attributes(void *event_data, void *data)
83172 +{
83173 + register_attribute(&no_const_attr);
83174 + register_attribute(&do_const_attr);
83175 +}
83176 +
83177 +static bool is_fptr(tree field)
83178 +{
83179 + tree ptr = TREE_TYPE(field);
83180 +
83181 + if (TREE_CODE(ptr) != POINTER_TYPE)
83182 + return false;
83183 +
83184 + return TREE_CODE(TREE_TYPE(ptr)) == FUNCTION_TYPE;
83185 +}
83186 +
83187 +static bool walk_struct(tree node)
83188 +{
83189 + tree field;
83190 +
83191 + if (TYPE_FIELDS(node) == NULL_TREE)
83192 + return false;
83193 +
83194 + if (lookup_attribute("no_const", TYPE_ATTRIBUTES(node))) {
83195 + gcc_assert(!TYPE_READONLY(node));
83196 + deconstify_type(node);
83197 + return false;
83198 + }
83199 +
83200 + for (field = TYPE_FIELDS(node); field; field = TREE_CHAIN(field)) {
83201 + tree type = TREE_TYPE(field);
83202 + enum tree_code code = TREE_CODE(type);
83203 +
83204 + if (node == type)
83205 + return false;
83206 + if (code == RECORD_TYPE || code == UNION_TYPE) {
83207 + if (!(walk_struct(type)))
83208 + return false;
83209 + } else if (!is_fptr(field) && !TREE_READONLY(field))
83210 + return false;
83211 + }
83212 + return true;
83213 +}
83214 +
83215 +static void finish_type(void *event_data, void *data)
83216 +{
83217 + tree type = (tree)event_data;
83218 +
83219 + if (type == NULL_TREE || type == error_mark_node)
83220 + return;
83221 +
83222 + if (TYPE_READONLY(type))
83223 + return;
83224 +
83225 + if (walk_struct(type))
83226 + constify_type(type);
83227 +}
83228 +
83229 +static unsigned int check_local_variables(void);
83230 +
83231 +struct gimple_opt_pass pass_local_variable = {
83232 + {
83233 + .type = GIMPLE_PASS,
83234 + .name = "check_local_variables",
83235 + .gate = NULL,
83236 + .execute = check_local_variables,
83237 + .sub = NULL,
83238 + .next = NULL,
83239 + .static_pass_number = 0,
83240 + .tv_id = TV_NONE,
83241 + .properties_required = 0,
83242 + .properties_provided = 0,
83243 + .properties_destroyed = 0,
83244 + .todo_flags_start = 0,
83245 + .todo_flags_finish = 0
83246 + }
83247 +};
83248 +
83249 +static unsigned int check_local_variables(void)
83250 +{
83251 + tree var;
83252 + referenced_var_iterator rvi;
83253 +
83254 +#if BUILDING_GCC_VERSION == 4005
83255 + FOR_EACH_REFERENCED_VAR(var, rvi) {
83256 +#else
83257 + FOR_EACH_REFERENCED_VAR(cfun, var, rvi) {
83258 +#endif
83259 + tree type = TREE_TYPE(var);
83260 +
83261 + if (!DECL_P(var) || TREE_STATIC(var) || DECL_EXTERNAL(var))
83262 + continue;
83263 +
83264 + if (TREE_CODE(type) != RECORD_TYPE && TREE_CODE(type) != UNION_TYPE)
83265 + continue;
83266 +
83267 + if (!TYPE_READONLY(type))
83268 + continue;
83269 +
83270 +// if (lookup_attribute("no_const", DECL_ATTRIBUTES(var)))
83271 +// continue;
83272 +
83273 +// if (lookup_attribute("no_const", TYPE_ATTRIBUTES(type)))
83274 +// continue;
83275 +
83276 + if (walk_struct(type)) {
83277 + error_at(DECL_SOURCE_LOCATION(var), "constified variable %qE cannot be local", var);
83278 + return 1;
83279 + }
83280 + }
83281 + return 0;
83282 +}
83283 +
83284 +int plugin_init(struct plugin_name_args *plugin_info, struct plugin_gcc_version *version)
83285 +{
83286 + const char * const plugin_name = plugin_info->base_name;
83287 + const int argc = plugin_info->argc;
83288 + const struct plugin_argument * const argv = plugin_info->argv;
83289 + int i;
83290 + bool constify = true;
83291 +
83292 + struct register_pass_info local_variable_pass_info = {
83293 + .pass = &pass_local_variable.pass,
83294 + .reference_pass_name = "*referenced_vars",
83295 + .ref_pass_instance_number = 1,
83296 + .pos_op = PASS_POS_INSERT_AFTER
83297 + };
83298 +
83299 + if (!plugin_default_version_check(version, &gcc_version)) {
83300 + error(G_("incompatible gcc/plugin versions"));
83301 + return 1;
83302 + }
83303 +
83304 + for (i = 0; i < argc; ++i) {
83305 + if (!(strcmp(argv[i].key, "no-constify"))) {
83306 + constify = false;
83307 + continue;
83308 + }
83309 + error(G_("unkown option '-fplugin-arg-%s-%s'"), plugin_name, argv[i].key);
83310 + }
83311 +
83312 + register_callback(plugin_name, PLUGIN_INFO, NULL, &const_plugin_info);
83313 + if (constify) {
83314 + register_callback(plugin_name, PLUGIN_FINISH_TYPE, finish_type, NULL);
83315 + register_callback(plugin_name, PLUGIN_PASS_MANAGER_SETUP, NULL, &local_variable_pass_info);
83316 + }
83317 + register_callback(plugin_name, PLUGIN_ATTRIBUTES, register_attributes, NULL);
83318 +
83319 + return 0;
83320 +}
83321 diff --git a/tools/gcc/generate_size_overflow_hash.sh b/tools/gcc/generate_size_overflow_hash.sh
83322 new file mode 100755
83323 index 0000000..02c6bec
83324 --- /dev/null
83325 +++ b/tools/gcc/generate_size_overflow_hash.sh
83326 @@ -0,0 +1,94 @@
83327 +#!/bin/bash
83328 +
83329 +# This script generates the hash table (size_overflow_hash.h) for the size_overflow gcc plugin (size_overflow_plugin.c).
83330 +
83331 +header1="size_overflow_hash.h"
83332 +database="size_overflow_hash.data"
83333 +n=65536
83334 +
83335 +usage() {
83336 +cat <<EOF
83337 +usage: $0 options
83338 +OPTIONS:
83339 + -h|--help help
83340 + -o header file
83341 + -d database file
83342 + -n hash array size
83343 +EOF
83344 + return 0
83345 +}
83346 +
83347 +while true
83348 +do
83349 + case "$1" in
83350 + -h|--help) usage && exit 0;;
83351 + -n) n=$2; shift 2;;
83352 + -o) header1="$2"; shift 2;;
83353 + -d) database="$2"; shift 2;;
83354 + --) shift 1; break ;;
83355 + *) break ;;
83356 + esac
83357 +done
83358 +
83359 +create_defines() {
83360 + for i in `seq 1 32`
83361 + do
83362 + echo -e "#define PARAM"$i" (1U << "$i")" >> "$header1"
83363 + done
83364 + echo >> "$header1"
83365 +}
83366 +
83367 +create_structs () {
83368 + rm -f "$header1"
83369 +
83370 + create_defines
83371 +
83372 + cat "$database" | while read data
83373 + do
83374 + data_array=($data)
83375 + struct_hash_name="${data_array[0]}"
83376 + funcn="${data_array[1]}"
83377 + params="${data_array[2]}"
83378 + next="${data_array[5]}"
83379 +
83380 + echo "const struct size_overflow_hash $struct_hash_name = {" >> "$header1"
83381 +
83382 + echo -e "\t.next\t= $next,\n\t.name\t= \"$funcn\"," >> "$header1"
83383 + echo -en "\t.param\t= " >> "$header1"
83384 + line=
83385 + for param_num in ${params//-/ };
83386 + do
83387 + line="${line}PARAM"$param_num"|"
83388 + done
83389 +
83390 + echo -e "${line%?},\n};\n" >> "$header1"
83391 + done
83392 +}
83393 +
83394 +create_headers () {
83395 + echo "const struct size_overflow_hash * const size_overflow_hash[$n] = {" >> "$header1"
83396 +}
83397 +
83398 +create_array_elements () {
83399 + index=0
83400 + grep -v "nohasharray" $database | sort -n -k 4 | while read data
83401 + do
83402 + data_array=($data)
83403 + i="${data_array[3]}"
83404 + hash="${data_array[4]}"
83405 + while [[ $index -lt $i ]]
83406 + do
83407 + echo -e "\t["$index"]\t= NULL," >> "$header1"
83408 + index=$(($index + 1))
83409 + done
83410 + index=$(($index + 1))
83411 + echo -e "\t["$i"]\t= &"$hash"," >> "$header1"
83412 + done
83413 + echo '};' >> $header1
83414 +}
83415 +
83416 +create_structs
83417 +create_headers
83418 +create_array_elements
83419 +
83420 +exit 0
83421 diff --git a/tools/gcc/kallocstat_plugin.c b/tools/gcc/kallocstat_plugin.c
83422 new file mode 100644
83423 index 0000000..a86e422
83424 --- /dev/null
83425 +++ b/tools/gcc/kallocstat_plugin.c
83426 @@ -0,0 +1,167 @@
83427 +/*
83428 + * Copyright 2011 by the PaX Team <pageexec@freemail.hu>
83429 + * Licensed under the GPL v2
83430 + *
83431 + * Note: the choice of the license means that the compilation process is
83432 + * NOT 'eligible' as defined by gcc's library exception to the GPL v3,
83433 + * but for the kernel it doesn't matter since it doesn't link against
83434 + * any of the gcc libraries
83435 + *
83436 + * gcc plugin to find the distribution of k*alloc sizes
83437 + *
83438 + * TODO:
83439 + *
83440 + * BUGS:
83441 + * - none known
83442 + */
83443 +#include "gcc-plugin.h"
83444 +#include "config.h"
83445 +#include "system.h"
83446 +#include "coretypes.h"
83447 +#include "tree.h"
83448 +#include "tree-pass.h"
83449 +#include "flags.h"
83450 +#include "intl.h"
83451 +#include "toplev.h"
83452 +#include "plugin.h"
83453 +//#include "expr.h" where are you...
83454 +#include "diagnostic.h"
83455 +#include "plugin-version.h"
83456 +#include "tm.h"
83457 +#include "function.h"
83458 +#include "basic-block.h"
83459 +#include "gimple.h"
83460 +#include "rtl.h"
83461 +#include "emit-rtl.h"
83462 +
83463 +extern void print_gimple_stmt(FILE *, gimple, int, int);
83464 +
83465 +int plugin_is_GPL_compatible;
83466 +
83467 +static const char * const kalloc_functions[] = {
83468 + "__kmalloc",
83469 + "kmalloc",
83470 + "kmalloc_large",
83471 + "kmalloc_node",
83472 + "kmalloc_order",
83473 + "kmalloc_order_trace",
83474 + "kmalloc_slab",
83475 + "kzalloc",
83476 + "kzalloc_node",
83477 +};
83478 +
83479 +static struct plugin_info kallocstat_plugin_info = {
83480 + .version = "201111150100",
83481 +};
83482 +
83483 +static unsigned int execute_kallocstat(void);
83484 +
83485 +static struct gimple_opt_pass kallocstat_pass = {
83486 + .pass = {
83487 + .type = GIMPLE_PASS,
83488 + .name = "kallocstat",
83489 + .gate = NULL,
83490 + .execute = execute_kallocstat,
83491 + .sub = NULL,
83492 + .next = NULL,
83493 + .static_pass_number = 0,
83494 + .tv_id = TV_NONE,
83495 + .properties_required = 0,
83496 + .properties_provided = 0,
83497 + .properties_destroyed = 0,
83498 + .todo_flags_start = 0,
83499 + .todo_flags_finish = 0
83500 + }
83501 +};
83502 +
83503 +static bool is_kalloc(const char *fnname)
83504 +{
83505 + size_t i;
83506 +
83507 + for (i = 0; i < ARRAY_SIZE(kalloc_functions); i++)
83508 + if (!strcmp(fnname, kalloc_functions[i]))
83509 + return true;
83510 + return false;
83511 +}
83512 +
83513 +static unsigned int execute_kallocstat(void)
83514 +{
83515 + basic_block bb;
83516 +
83517 + // 1. loop through BBs and GIMPLE statements
83518 + FOR_EACH_BB(bb) {
83519 + gimple_stmt_iterator gsi;
83520 + for (gsi = gsi_start_bb(bb); !gsi_end_p(gsi); gsi_next(&gsi)) {
83521 + // gimple match:
83522 + tree fndecl, size;
83523 + gimple call_stmt;
83524 + const char *fnname;
83525 +
83526 + // is it a call
83527 + call_stmt = gsi_stmt(gsi);
83528 + if (!is_gimple_call(call_stmt))
83529 + continue;
83530 + fndecl = gimple_call_fndecl(call_stmt);
83531 + if (fndecl == NULL_TREE)
83532 + continue;
83533 + if (TREE_CODE(fndecl) != FUNCTION_DECL)
83534 + continue;
83535 +
83536 + // is it a call to k*alloc
83537 + fnname = IDENTIFIER_POINTER(DECL_NAME(fndecl));
83538 + if (!is_kalloc(fnname))
83539 + continue;
83540 +
83541 + // is the size arg the result of a simple const assignment
83542 + size = gimple_call_arg(call_stmt, 0);
83543 + while (true) {
83544 + gimple def_stmt;
83545 + expanded_location xloc;
83546 + size_t size_val;
83547 +
83548 + if (TREE_CODE(size) != SSA_NAME)
83549 + break;
83550 + def_stmt = SSA_NAME_DEF_STMT(size);
83551 + if (!def_stmt || !is_gimple_assign(def_stmt))
83552 + break;
83553 + if (gimple_num_ops(def_stmt) != 2)
83554 + break;
83555 + size = gimple_assign_rhs1(def_stmt);
83556 + if (!TREE_CONSTANT(size))
83557 + continue;
83558 + xloc = expand_location(gimple_location(def_stmt));
83559 + if (!xloc.file)
83560 + xloc = expand_location(DECL_SOURCE_LOCATION(current_function_decl));
83561 + size_val = TREE_INT_CST_LOW(size);
83562 + fprintf(stderr, "kallocsize: %8zu %8zx %s %s:%u\n", size_val, size_val, fnname, xloc.file, xloc.line);
83563 + break;
83564 + }
83565 +//print_gimple_stmt(stderr, call_stmt, 0, TDF_LINENO);
83566 +//debug_tree(gimple_call_fn(call_stmt));
83567 +//print_node(stderr, "pax", fndecl, 4);
83568 + }
83569 + }
83570 +
83571 + return 0;
83572 +}
83573 +
83574 +int plugin_init(struct plugin_name_args *plugin_info, struct plugin_gcc_version *version)
83575 +{
83576 + const char * const plugin_name = plugin_info->base_name;
83577 + struct register_pass_info kallocstat_pass_info = {
83578 + .pass = &kallocstat_pass.pass,
83579 + .reference_pass_name = "ssa",
83580 + .ref_pass_instance_number = 1,
83581 + .pos_op = PASS_POS_INSERT_AFTER
83582 + };
83583 +
83584 + if (!plugin_default_version_check(version, &gcc_version)) {
83585 + error(G_("incompatible gcc/plugin versions"));
83586 + return 1;
83587 + }
83588 +
83589 + register_callback(plugin_name, PLUGIN_INFO, NULL, &kallocstat_plugin_info);
83590 + register_callback(plugin_name, PLUGIN_PASS_MANAGER_SETUP, NULL, &kallocstat_pass_info);
83591 +
83592 + return 0;
83593 +}
83594 diff --git a/tools/gcc/kernexec_plugin.c b/tools/gcc/kernexec_plugin.c
83595 new file mode 100644
83596 index 0000000..8856202
83597 --- /dev/null
83598 +++ b/tools/gcc/kernexec_plugin.c
83599 @@ -0,0 +1,432 @@
83600 +/*
83601 + * Copyright 2011 by the PaX Team <pageexec@freemail.hu>
83602 + * Licensed under the GPL v2
83603 + *
83604 + * Note: the choice of the license means that the compilation process is
83605 + * NOT 'eligible' as defined by gcc's library exception to the GPL v3,
83606 + * but for the kernel it doesn't matter since it doesn't link against
83607 + * any of the gcc libraries
83608 + *
83609 + * gcc plugin to make KERNEXEC/amd64 almost as good as it is on i386
83610 + *
83611 + * TODO:
83612 + *
83613 + * BUGS:
83614 + * - none known
83615 + */
83616 +#include "gcc-plugin.h"
83617 +#include "config.h"
83618 +#include "system.h"
83619 +#include "coretypes.h"
83620 +#include "tree.h"
83621 +#include "tree-pass.h"
83622 +#include "flags.h"
83623 +#include "intl.h"
83624 +#include "toplev.h"
83625 +#include "plugin.h"
83626 +//#include "expr.h" where are you...
83627 +#include "diagnostic.h"
83628 +#include "plugin-version.h"
83629 +#include "tm.h"
83630 +#include "function.h"
83631 +#include "basic-block.h"
83632 +#include "gimple.h"
83633 +#include "rtl.h"
83634 +#include "emit-rtl.h"
83635 +#include "tree-flow.h"
83636 +
83637 +extern void print_gimple_stmt(FILE *, gimple, int, int);
83638 +extern rtx emit_move_insn(rtx x, rtx y);
83639 +
83640 +#if BUILDING_GCC_VERSION <= 4006
83641 +#define ANY_RETURN_P(rtx) (GET_CODE(rtx) == RETURN)
83642 +#endif
83643 +
83644 +int plugin_is_GPL_compatible;
83645 +
83646 +static struct plugin_info kernexec_plugin_info = {
83647 + .version = "201111291120",
83648 + .help = "method=[bts|or]\tinstrumentation method\n"
83649 +};
83650 +
83651 +static unsigned int execute_kernexec_reload(void);
83652 +static unsigned int execute_kernexec_fptr(void);
83653 +static unsigned int execute_kernexec_retaddr(void);
83654 +static bool kernexec_cmodel_check(void);
83655 +
83656 +static void (*kernexec_instrument_fptr)(gimple_stmt_iterator *);
83657 +static void (*kernexec_instrument_retaddr)(rtx);
83658 +
83659 +static struct gimple_opt_pass kernexec_reload_pass = {
83660 + .pass = {
83661 + .type = GIMPLE_PASS,
83662 + .name = "kernexec_reload",
83663 + .gate = kernexec_cmodel_check,
83664 + .execute = execute_kernexec_reload,
83665 + .sub = NULL,
83666 + .next = NULL,
83667 + .static_pass_number = 0,
83668 + .tv_id = TV_NONE,
83669 + .properties_required = 0,
83670 + .properties_provided = 0,
83671 + .properties_destroyed = 0,
83672 + .todo_flags_start = 0,
83673 + .todo_flags_finish = TODO_verify_ssa | TODO_verify_stmts | TODO_dump_func | TODO_remove_unused_locals | TODO_update_ssa_no_phi
83674 + }
83675 +};
83676 +
83677 +static struct gimple_opt_pass kernexec_fptr_pass = {
83678 + .pass = {
83679 + .type = GIMPLE_PASS,
83680 + .name = "kernexec_fptr",
83681 + .gate = kernexec_cmodel_check,
83682 + .execute = execute_kernexec_fptr,
83683 + .sub = NULL,
83684 + .next = NULL,
83685 + .static_pass_number = 0,
83686 + .tv_id = TV_NONE,
83687 + .properties_required = 0,
83688 + .properties_provided = 0,
83689 + .properties_destroyed = 0,
83690 + .todo_flags_start = 0,
83691 + .todo_flags_finish = TODO_verify_ssa | TODO_verify_stmts | TODO_dump_func | TODO_remove_unused_locals | TODO_update_ssa_no_phi
83692 + }
83693 +};
83694 +
83695 +static struct rtl_opt_pass kernexec_retaddr_pass = {
83696 + .pass = {
83697 + .type = RTL_PASS,
83698 + .name = "kernexec_retaddr",
83699 + .gate = kernexec_cmodel_check,
83700 + .execute = execute_kernexec_retaddr,
83701 + .sub = NULL,
83702 + .next = NULL,
83703 + .static_pass_number = 0,
83704 + .tv_id = TV_NONE,
83705 + .properties_required = 0,
83706 + .properties_provided = 0,
83707 + .properties_destroyed = 0,
83708 + .todo_flags_start = 0,
83709 + .todo_flags_finish = TODO_dump_func | TODO_ggc_collect
83710 + }
83711 +};
83712 +
83713 +static bool kernexec_cmodel_check(void)
83714 +{
83715 + tree section;
83716 +
83717 + if (ix86_cmodel != CM_KERNEL)
83718 + return false;
83719 +
83720 + section = lookup_attribute("section", DECL_ATTRIBUTES(current_function_decl));
83721 + if (!section || !TREE_VALUE(section))
83722 + return true;
83723 +
83724 + section = TREE_VALUE(TREE_VALUE(section));
83725 + if (strncmp(TREE_STRING_POINTER(section), ".vsyscall_", 10))
83726 + return true;
83727 +
83728 + return false;
83729 +}
83730 +
83731 +/*
83732 + * add special KERNEXEC instrumentation: reload %r10 after it has been clobbered
83733 + */
83734 +static void kernexec_reload_fptr_mask(gimple_stmt_iterator *gsi)
83735 +{
83736 + gimple asm_movabs_stmt;
83737 +
83738 + // build asm volatile("movabs $0x8000000000000000, %%r10\n\t" : : : );
83739 + asm_movabs_stmt = gimple_build_asm_vec("movabs $0x8000000000000000, %%r10\n\t", NULL, NULL, NULL, NULL);
83740 + gimple_asm_set_volatile(asm_movabs_stmt, true);
83741 + gsi_insert_after(gsi, asm_movabs_stmt, GSI_CONTINUE_LINKING);
83742 + update_stmt(asm_movabs_stmt);
83743 +}
83744 +
83745 +/*
83746 + * find all asm() stmts that clobber r10 and add a reload of r10
83747 + */
83748 +static unsigned int execute_kernexec_reload(void)
83749 +{
83750 + basic_block bb;
83751 +
83752 + // 1. loop through BBs and GIMPLE statements
83753 + FOR_EACH_BB(bb) {
83754 + gimple_stmt_iterator gsi;
83755 +
83756 + for (gsi = gsi_start_bb(bb); !gsi_end_p(gsi); gsi_next(&gsi)) {
83757 + // gimple match: __asm__ ("" : : : "r10");
83758 + gimple asm_stmt;
83759 + size_t nclobbers;
83760 +
83761 + // is it an asm ...
83762 + asm_stmt = gsi_stmt(gsi);
83763 + if (gimple_code(asm_stmt) != GIMPLE_ASM)
83764 + continue;
83765 +
83766 + // ... clobbering r10
83767 + nclobbers = gimple_asm_nclobbers(asm_stmt);
83768 + while (nclobbers--) {
83769 + tree op = gimple_asm_clobber_op(asm_stmt, nclobbers);
83770 + if (strcmp(TREE_STRING_POINTER(TREE_VALUE(op)), "r10"))
83771 + continue;
83772 + kernexec_reload_fptr_mask(&gsi);
83773 +//print_gimple_stmt(stderr, asm_stmt, 0, TDF_LINENO);
83774 + break;
83775 + }
83776 + }
83777 + }
83778 +
83779 + return 0;
83780 +}
83781 +
83782 +/*
83783 + * add special KERNEXEC instrumentation: force MSB of fptr to 1, which will produce
83784 + * a non-canonical address from a userland ptr and will just trigger a GPF on dereference
83785 + */
83786 +static void kernexec_instrument_fptr_bts(gimple_stmt_iterator *gsi)
83787 +{
83788 + gimple assign_intptr, assign_new_fptr, call_stmt;
83789 + tree intptr, old_fptr, new_fptr, kernexec_mask;
83790 +
83791 + call_stmt = gsi_stmt(*gsi);
83792 + old_fptr = gimple_call_fn(call_stmt);
83793 +
83794 + // create temporary unsigned long variable used for bitops and cast fptr to it
83795 + intptr = create_tmp_var(long_unsigned_type_node, "kernexec_bts");
83796 + add_referenced_var(intptr);
83797 + mark_sym_for_renaming(intptr);
83798 + assign_intptr = gimple_build_assign(intptr, fold_convert(long_unsigned_type_node, old_fptr));
83799 + gsi_insert_before(gsi, assign_intptr, GSI_SAME_STMT);
83800 + update_stmt(assign_intptr);
83801 +
83802 + // apply logical or to temporary unsigned long and bitmask
83803 + kernexec_mask = build_int_cstu(long_long_unsigned_type_node, 0x8000000000000000LL);
83804 +// kernexec_mask = build_int_cstu(long_long_unsigned_type_node, 0xffffffff80000000LL);
83805 + assign_intptr = gimple_build_assign(intptr, fold_build2(BIT_IOR_EXPR, long_long_unsigned_type_node, intptr, kernexec_mask));
83806 + gsi_insert_before(gsi, assign_intptr, GSI_SAME_STMT);
83807 + update_stmt(assign_intptr);
83808 +
83809 + // cast temporary unsigned long back to a temporary fptr variable
83810 + new_fptr = create_tmp_var(TREE_TYPE(old_fptr), "kernexec_fptr");
83811 + add_referenced_var(new_fptr);
83812 + mark_sym_for_renaming(new_fptr);
83813 + assign_new_fptr = gimple_build_assign(new_fptr, fold_convert(TREE_TYPE(old_fptr), intptr));
83814 + gsi_insert_before(gsi, assign_new_fptr, GSI_SAME_STMT);
83815 + update_stmt(assign_new_fptr);
83816 +
83817 + // replace call stmt fn with the new fptr
83818 + gimple_call_set_fn(call_stmt, new_fptr);
83819 + update_stmt(call_stmt);
83820 +}
83821 +
83822 +static void kernexec_instrument_fptr_or(gimple_stmt_iterator *gsi)
83823 +{
83824 + gimple asm_or_stmt, call_stmt;
83825 + tree old_fptr, new_fptr, input, output;
83826 + VEC(tree, gc) *inputs = NULL;
83827 + VEC(tree, gc) *outputs = NULL;
83828 +
83829 + call_stmt = gsi_stmt(*gsi);
83830 + old_fptr = gimple_call_fn(call_stmt);
83831 +
83832 + // create temporary fptr variable
83833 + new_fptr = create_tmp_var(TREE_TYPE(old_fptr), "kernexec_or");
83834 + add_referenced_var(new_fptr);
83835 + mark_sym_for_renaming(new_fptr);
83836 +
83837 + // build asm volatile("orq %%r10, %0\n\t" : "=r"(new_fptr) : "0"(old_fptr));
83838 + input = build_tree_list(NULL_TREE, build_string(2, "0"));
83839 + input = chainon(NULL_TREE, build_tree_list(input, old_fptr));
83840 + output = build_tree_list(NULL_TREE, build_string(3, "=r"));
83841 + output = chainon(NULL_TREE, build_tree_list(output, new_fptr));
83842 + VEC_safe_push(tree, gc, inputs, input);
83843 + VEC_safe_push(tree, gc, outputs, output);
83844 + asm_or_stmt = gimple_build_asm_vec("orq %%r10, %0\n\t", inputs, outputs, NULL, NULL);
83845 + gimple_asm_set_volatile(asm_or_stmt, true);
83846 + gsi_insert_before(gsi, asm_or_stmt, GSI_SAME_STMT);
83847 + update_stmt(asm_or_stmt);
83848 +
83849 + // replace call stmt fn with the new fptr
83850 + gimple_call_set_fn(call_stmt, new_fptr);
83851 + update_stmt(call_stmt);
83852 +}
83853 +
83854 +/*
83855 + * find all C level function pointer dereferences and forcibly set the highest bit of the pointer
83856 + */
83857 +static unsigned int execute_kernexec_fptr(void)
83858 +{
83859 + basic_block bb;
83860 +
83861 + // 1. loop through BBs and GIMPLE statements
83862 + FOR_EACH_BB(bb) {
83863 + gimple_stmt_iterator gsi;
83864 +
83865 + for (gsi = gsi_start_bb(bb); !gsi_end_p(gsi); gsi_next(&gsi)) {
83866 + // gimple match: h_1 = get_fptr (); D.2709_3 = h_1 (x_2(D));
83867 + tree fn;
83868 + gimple call_stmt;
83869 +
83870 + // is it a call ...
83871 + call_stmt = gsi_stmt(gsi);
83872 + if (!is_gimple_call(call_stmt))
83873 + continue;
83874 + fn = gimple_call_fn(call_stmt);
83875 + if (TREE_CODE(fn) == ADDR_EXPR)
83876 + continue;
83877 + if (TREE_CODE(fn) != SSA_NAME)
83878 + gcc_unreachable();
83879 +
83880 + // ... through a function pointer
83881 + fn = SSA_NAME_VAR(fn);
83882 + if (TREE_CODE(fn) != VAR_DECL && TREE_CODE(fn) != PARM_DECL)
83883 + continue;
83884 + fn = TREE_TYPE(fn);
83885 + if (TREE_CODE(fn) != POINTER_TYPE)
83886 + continue;
83887 + fn = TREE_TYPE(fn);
83888 + if (TREE_CODE(fn) != FUNCTION_TYPE)
83889 + continue;
83890 +
83891 + kernexec_instrument_fptr(&gsi);
83892 +
83893 +//debug_tree(gimple_call_fn(call_stmt));
83894 +//print_gimple_stmt(stderr, call_stmt, 0, TDF_LINENO);
83895 + }
83896 + }
83897 +
83898 + return 0;
83899 +}
83900 +
83901 +// add special KERNEXEC instrumentation: btsq $63,(%rsp) just before retn
83902 +static void kernexec_instrument_retaddr_bts(rtx insn)
83903 +{
83904 + rtx btsq;
83905 + rtvec argvec, constraintvec, labelvec;
83906 + int line;
83907 +
83908 + // create asm volatile("btsq $63,(%%rsp)":::)
83909 + argvec = rtvec_alloc(0);
83910 + constraintvec = rtvec_alloc(0);
83911 + labelvec = rtvec_alloc(0);
83912 + line = expand_location(RTL_LOCATION(insn)).line;
83913 + btsq = gen_rtx_ASM_OPERANDS(VOIDmode, "btsq $63,(%%rsp)", empty_string, 0, argvec, constraintvec, labelvec, line);
83914 + MEM_VOLATILE_P(btsq) = 1;
83915 +// RTX_FRAME_RELATED_P(btsq) = 1; // not for ASM_OPERANDS
83916 + emit_insn_before(btsq, insn);
83917 +}
83918 +
83919 +// add special KERNEXEC instrumentation: orq %r10,(%rsp) just before retn
83920 +static void kernexec_instrument_retaddr_or(rtx insn)
83921 +{
83922 + rtx orq;
83923 + rtvec argvec, constraintvec, labelvec;
83924 + int line;
83925 +
83926 + // create asm volatile("orq %%r10,(%%rsp)":::)
83927 + argvec = rtvec_alloc(0);
83928 + constraintvec = rtvec_alloc(0);
83929 + labelvec = rtvec_alloc(0);
83930 + line = expand_location(RTL_LOCATION(insn)).line;
83931 + orq = gen_rtx_ASM_OPERANDS(VOIDmode, "orq %%r10,(%%rsp)", empty_string, 0, argvec, constraintvec, labelvec, line);
83932 + MEM_VOLATILE_P(orq) = 1;
83933 +// RTX_FRAME_RELATED_P(orq) = 1; // not for ASM_OPERANDS
83934 + emit_insn_before(orq, insn);
83935 +}
83936 +
83937 +/*
83938 + * find all asm level function returns and forcibly set the highest bit of the return address
83939 + */
83940 +static unsigned int execute_kernexec_retaddr(void)
83941 +{
83942 + rtx insn;
83943 +
83944 + // 1. find function returns
83945 + for (insn = get_insns(); insn; insn = NEXT_INSN(insn)) {
83946 + // rtl match: (jump_insn 41 40 42 2 (return) fptr.c:42 634 {return_internal} (nil))
83947 + // (jump_insn 12 9 11 2 (parallel [ (return) (unspec [ (0) ] UNSPEC_REP) ]) fptr.c:46 635 {return_internal_long} (nil))
83948 + // (jump_insn 97 96 98 6 (simple_return) fptr.c:50 -1 (nil) -> simple_return)
83949 + rtx body;
83950 +
83951 + // is it a retn
83952 + if (!JUMP_P(insn))
83953 + continue;
83954 + body = PATTERN(insn);
83955 + if (GET_CODE(body) == PARALLEL)
83956 + body = XVECEXP(body, 0, 0);
83957 + if (!ANY_RETURN_P(body))
83958 + continue;
83959 + kernexec_instrument_retaddr(insn);
83960 + }
83961 +
83962 +// print_simple_rtl(stderr, get_insns());
83963 +// print_rtl(stderr, get_insns());
83964 +
83965 + return 0;
83966 +}
83967 +
83968 +int plugin_init(struct plugin_name_args *plugin_info, struct plugin_gcc_version *version)
83969 +{
83970 + const char * const plugin_name = plugin_info->base_name;
83971 + const int argc = plugin_info->argc;
83972 + const struct plugin_argument * const argv = plugin_info->argv;
83973 + int i;
83974 + struct register_pass_info kernexec_reload_pass_info = {
83975 + .pass = &kernexec_reload_pass.pass,
83976 + .reference_pass_name = "ssa",
83977 + .ref_pass_instance_number = 1,
83978 + .pos_op = PASS_POS_INSERT_AFTER
83979 + };
83980 + struct register_pass_info kernexec_fptr_pass_info = {
83981 + .pass = &kernexec_fptr_pass.pass,
83982 + .reference_pass_name = "ssa",
83983 + .ref_pass_instance_number = 1,
83984 + .pos_op = PASS_POS_INSERT_AFTER
83985 + };
83986 + struct register_pass_info kernexec_retaddr_pass_info = {
83987 + .pass = &kernexec_retaddr_pass.pass,
83988 + .reference_pass_name = "pro_and_epilogue",
83989 + .ref_pass_instance_number = 1,
83990 + .pos_op = PASS_POS_INSERT_AFTER
83991 + };
83992 +
83993 + if (!plugin_default_version_check(version, &gcc_version)) {
83994 + error(G_("incompatible gcc/plugin versions"));
83995 + return 1;
83996 + }
83997 +
83998 + register_callback(plugin_name, PLUGIN_INFO, NULL, &kernexec_plugin_info);
83999 +
84000 + if (TARGET_64BIT == 0)
84001 + return 0;
84002 +
84003 + for (i = 0; i < argc; ++i) {
84004 + if (!strcmp(argv[i].key, "method")) {
84005 + if (!argv[i].value) {
84006 + error(G_("no value supplied for option '-fplugin-arg-%s-%s'"), plugin_name, argv[i].key);
84007 + continue;
84008 + }
84009 + if (!strcmp(argv[i].value, "bts")) {
84010 + kernexec_instrument_fptr = kernexec_instrument_fptr_bts;
84011 + kernexec_instrument_retaddr = kernexec_instrument_retaddr_bts;
84012 + } else if (!strcmp(argv[i].value, "or")) {
84013 + kernexec_instrument_fptr = kernexec_instrument_fptr_or;
84014 + kernexec_instrument_retaddr = kernexec_instrument_retaddr_or;
84015 + fix_register("r10", 1, 1);
84016 + } else
84017 + error(G_("invalid option argument '-fplugin-arg-%s-%s=%s'"), plugin_name, argv[i].key, argv[i].value);
84018 + continue;
84019 + }
84020 + error(G_("unkown option '-fplugin-arg-%s-%s'"), plugin_name, argv[i].key);
84021 + }
84022 + if (!kernexec_instrument_fptr || !kernexec_instrument_retaddr)
84023 + error(G_("no instrumentation method was selected via '-fplugin-arg-%s-method'"), plugin_name);
84024 +
84025 + if (kernexec_instrument_fptr == kernexec_instrument_fptr_or)
84026 + register_callback(plugin_name, PLUGIN_PASS_MANAGER_SETUP, NULL, &kernexec_reload_pass_info);
84027 + register_callback(plugin_name, PLUGIN_PASS_MANAGER_SETUP, NULL, &kernexec_fptr_pass_info);
84028 + register_callback(plugin_name, PLUGIN_PASS_MANAGER_SETUP, NULL, &kernexec_retaddr_pass_info);
84029 +
84030 + return 0;
84031 +}
84032 diff --git a/tools/gcc/latent_entropy_plugin.c b/tools/gcc/latent_entropy_plugin.c
84033 new file mode 100644
84034 index 0000000..b8008f7
84035 --- /dev/null
84036 +++ b/tools/gcc/latent_entropy_plugin.c
84037 @@ -0,0 +1,295 @@
84038 +/*
84039 + * Copyright 2012 by the PaX Team <pageexec@freemail.hu>
84040 + * Licensed under the GPL v2
84041 + *
84042 + * Note: the choice of the license means that the compilation process is
84043 + * NOT 'eligible' as defined by gcc's library exception to the GPL v3,
84044 + * but for the kernel it doesn't matter since it doesn't link against
84045 + * any of the gcc libraries
84046 + *
84047 + * gcc plugin to help generate a little bit of entropy from program state,
84048 + * used during boot in the kernel
84049 + *
84050 + * TODO:
84051 + * - add ipa pass to identify not explicitly marked candidate functions
84052 + * - mix in more program state (function arguments/return values, loop variables, etc)
84053 + * - more instrumentation control via attribute parameters
84054 + *
84055 + * BUGS:
84056 + * - LTO needs -flto-partition=none for now
84057 + */
84058 +#include "gcc-plugin.h"
84059 +#include "config.h"
84060 +#include "system.h"
84061 +#include "coretypes.h"
84062 +#include "tree.h"
84063 +#include "tree-pass.h"
84064 +#include "flags.h"
84065 +#include "intl.h"
84066 +#include "toplev.h"
84067 +#include "plugin.h"
84068 +//#include "expr.h" where are you...
84069 +#include "diagnostic.h"
84070 +#include "plugin-version.h"
84071 +#include "tm.h"
84072 +#include "function.h"
84073 +#include "basic-block.h"
84074 +#include "gimple.h"
84075 +#include "rtl.h"
84076 +#include "emit-rtl.h"
84077 +#include "tree-flow.h"
84078 +
84079 +int plugin_is_GPL_compatible;
84080 +
84081 +static tree latent_entropy_decl;
84082 +
84083 +static struct plugin_info latent_entropy_plugin_info = {
84084 + .version = "201207271820",
84085 + .help = NULL
84086 +};
84087 +
84088 +static unsigned int execute_latent_entropy(void);
84089 +static bool gate_latent_entropy(void);
84090 +
84091 +static struct gimple_opt_pass latent_entropy_pass = {
84092 + .pass = {
84093 + .type = GIMPLE_PASS,
84094 + .name = "latent_entropy",
84095 + .gate = gate_latent_entropy,
84096 + .execute = execute_latent_entropy,
84097 + .sub = NULL,
84098 + .next = NULL,
84099 + .static_pass_number = 0,
84100 + .tv_id = TV_NONE,
84101 + .properties_required = PROP_gimple_leh | PROP_cfg,
84102 + .properties_provided = 0,
84103 + .properties_destroyed = 0,
84104 + .todo_flags_start = 0, //TODO_verify_ssa | TODO_verify_flow | TODO_verify_stmts,
84105 + .todo_flags_finish = TODO_verify_ssa | TODO_verify_stmts | TODO_dump_func | TODO_update_ssa
84106 + }
84107 +};
84108 +
84109 +static tree handle_latent_entropy_attribute(tree *node, tree name, tree args, int flags, bool *no_add_attrs)
84110 +{
84111 + if (TREE_CODE(*node) != FUNCTION_DECL) {
84112 + *no_add_attrs = true;
84113 + error("%qE attribute only applies to functions", name);
84114 + }
84115 + return NULL_TREE;
84116 +}
84117 +
84118 +static struct attribute_spec latent_entropy_attr = {
84119 + .name = "latent_entropy",
84120 + .min_length = 0,
84121 + .max_length = 0,
84122 + .decl_required = true,
84123 + .type_required = false,
84124 + .function_type_required = false,
84125 + .handler = handle_latent_entropy_attribute,
84126 +#if BUILDING_GCC_VERSION >= 4007
84127 + .affects_type_identity = false
84128 +#endif
84129 +};
84130 +
84131 +static void register_attributes(void *event_data, void *data)
84132 +{
84133 + register_attribute(&latent_entropy_attr);
84134 +}
84135 +
84136 +static bool gate_latent_entropy(void)
84137 +{
84138 + tree latent_entropy_attr;
84139 +
84140 + latent_entropy_attr = lookup_attribute("latent_entropy", DECL_ATTRIBUTES(current_function_decl));
84141 + return latent_entropy_attr != NULL_TREE;
84142 +}
84143 +
84144 +static unsigned HOST_WIDE_INT seed;
84145 +static unsigned HOST_WIDE_INT get_random_const(void)
84146 +{
84147 + seed = (seed >> 1U) ^ (-(seed & 1ULL) & 0xD800000000000000ULL);
84148 + return seed;
84149 +}
84150 +
84151 +static enum tree_code get_op(tree *rhs)
84152 +{
84153 + static enum tree_code op;
84154 + unsigned HOST_WIDE_INT random_const;
84155 +
84156 + random_const = get_random_const();
84157 +
84158 + switch (op) {
84159 + case BIT_XOR_EXPR:
84160 + op = PLUS_EXPR;
84161 + break;
84162 +
84163 + case PLUS_EXPR:
84164 + if (rhs) {
84165 + op = LROTATE_EXPR;
84166 + random_const &= HOST_BITS_PER_WIDE_INT - 1;
84167 + break;
84168 + }
84169 +
84170 + case LROTATE_EXPR:
84171 + default:
84172 + op = BIT_XOR_EXPR;
84173 + break;
84174 + }
84175 + if (rhs)
84176 + *rhs = build_int_cstu(unsigned_intDI_type_node, random_const);
84177 + return op;
84178 +}
84179 +
84180 +static void perturb_local_entropy(basic_block bb, tree local_entropy)
84181 +{
84182 + gimple_stmt_iterator gsi;
84183 + gimple assign;
84184 + tree addxorrol, rhs;
84185 + enum tree_code op;
84186 +
84187 + op = get_op(&rhs);
84188 + addxorrol = fold_build2_loc(UNKNOWN_LOCATION, op, unsigned_intDI_type_node, local_entropy, rhs);
84189 + assign = gimple_build_assign(local_entropy, addxorrol);
84190 + find_referenced_vars_in(assign);
84191 +//debug_bb(bb);
84192 + gsi = gsi_after_labels(bb);
84193 + gsi_insert_before(&gsi, assign, GSI_NEW_STMT);
84194 + update_stmt(assign);
84195 +}
84196 +
84197 +static void perturb_latent_entropy(basic_block bb, tree rhs)
84198 +{
84199 + gimple_stmt_iterator gsi;
84200 + gimple assign;
84201 + tree addxorrol, temp;
84202 +
84203 + // 1. create temporary copy of latent_entropy
84204 + temp = create_tmp_var(unsigned_intDI_type_node, "temp_latent_entropy");
84205 + add_referenced_var(temp);
84206 + mark_sym_for_renaming(temp);
84207 +
84208 + // 2. read...
84209 + assign = gimple_build_assign(temp, latent_entropy_decl);
84210 + find_referenced_vars_in(assign);
84211 + gsi = gsi_after_labels(bb);
84212 + gsi_insert_after(&gsi, assign, GSI_NEW_STMT);
84213 + update_stmt(assign);
84214 +
84215 + // 3. ...modify...
84216 + addxorrol = fold_build2_loc(UNKNOWN_LOCATION, get_op(NULL), unsigned_intDI_type_node, temp, rhs);
84217 + assign = gimple_build_assign(temp, addxorrol);
84218 + find_referenced_vars_in(assign);
84219 + gsi_insert_after(&gsi, assign, GSI_NEW_STMT);
84220 + update_stmt(assign);
84221 +
84222 + // 4. ...write latent_entropy
84223 + assign = gimple_build_assign(latent_entropy_decl, temp);
84224 + find_referenced_vars_in(assign);
84225 + gsi_insert_after(&gsi, assign, GSI_NEW_STMT);
84226 + update_stmt(assign);
84227 +}
84228 +
84229 +static unsigned int execute_latent_entropy(void)
84230 +{
84231 + basic_block bb;
84232 + gimple assign;
84233 + gimple_stmt_iterator gsi;
84234 + tree local_entropy;
84235 +
84236 + if (!latent_entropy_decl) {
84237 + struct varpool_node *node;
84238 +
84239 + for (node = varpool_nodes; node; node = node->next) {
84240 + tree var = node->decl;
84241 + if (strcmp(IDENTIFIER_POINTER(DECL_NAME(var)), "latent_entropy"))
84242 + continue;
84243 + latent_entropy_decl = var;
84244 +// debug_tree(var);
84245 + break;
84246 + }
84247 + if (!latent_entropy_decl) {
84248 +// debug_tree(current_function_decl);
84249 + return 0;
84250 + }
84251 + }
84252 +
84253 +//fprintf(stderr, "latent_entropy: %s\n", IDENTIFIER_POINTER(DECL_NAME(current_function_decl)));
84254 +
84255 + // 1. create local entropy variable
84256 + local_entropy = create_tmp_var(unsigned_intDI_type_node, "local_entropy");
84257 + add_referenced_var(local_entropy);
84258 + mark_sym_for_renaming(local_entropy);
84259 +
84260 + // 2. initialize local entropy variable
84261 + bb = split_block_after_labels(ENTRY_BLOCK_PTR)->dest;
84262 + if (dom_info_available_p(CDI_DOMINATORS))
84263 + set_immediate_dominator(CDI_DOMINATORS, bb, ENTRY_BLOCK_PTR);
84264 + gsi = gsi_start_bb(bb);
84265 +
84266 + assign = gimple_build_assign(local_entropy, build_int_cstu(unsigned_intDI_type_node, get_random_const()));
84267 +// gimple_set_location(assign, loc);
84268 + find_referenced_vars_in(assign);
84269 + gsi_insert_after(&gsi, assign, GSI_NEW_STMT);
84270 + update_stmt(assign);
84271 + bb = bb->next_bb;
84272 +
84273 + // 3. instrument each BB with an operation on the local entropy variable
84274 + while (bb != EXIT_BLOCK_PTR) {
84275 + perturb_local_entropy(bb, local_entropy);
84276 + bb = bb->next_bb;
84277 + };
84278 +
84279 + // 4. mix local entropy into the global entropy variable
84280 + perturb_latent_entropy(EXIT_BLOCK_PTR->prev_bb, local_entropy);
84281 + return 0;
84282 +}
84283 +
84284 +static void start_unit_callback(void *gcc_data, void *user_data)
84285 +{
84286 +#if BUILDING_GCC_VERSION >= 4007
84287 + seed = get_random_seed(false);
84288 +#else
84289 + sscanf(get_random_seed(false), "%" HOST_WIDE_INT_PRINT "x", &seed);
84290 + seed *= seed;
84291 +#endif
84292 +
84293 + if (in_lto_p)
84294 + return;
84295 +
84296 + // extern u64 latent_entropy
84297 + latent_entropy_decl = build_decl(UNKNOWN_LOCATION, VAR_DECL, get_identifier("latent_entropy"), unsigned_intDI_type_node);
84298 +
84299 + TREE_STATIC(latent_entropy_decl) = 1;
84300 + TREE_PUBLIC(latent_entropy_decl) = 1;
84301 + TREE_USED(latent_entropy_decl) = 1;
84302 + TREE_THIS_VOLATILE(latent_entropy_decl) = 1;
84303 + DECL_EXTERNAL(latent_entropy_decl) = 1;
84304 + DECL_ARTIFICIAL(latent_entropy_decl) = 0;
84305 + DECL_INITIAL(latent_entropy_decl) = NULL;
84306 +// DECL_ASSEMBLER_NAME(latent_entropy_decl);
84307 +// varpool_finalize_decl(latent_entropy_decl);
84308 +// varpool_mark_needed_node(latent_entropy_decl);
84309 +}
84310 +
84311 +int plugin_init(struct plugin_name_args *plugin_info, struct plugin_gcc_version *version)
84312 +{
84313 + const char * const plugin_name = plugin_info->base_name;
84314 + struct register_pass_info latent_entropy_pass_info = {
84315 + .pass = &latent_entropy_pass.pass,
84316 + .reference_pass_name = "optimized",
84317 + .ref_pass_instance_number = 1,
84318 + .pos_op = PASS_POS_INSERT_BEFORE
84319 + };
84320 +
84321 + if (!plugin_default_version_check(version, &gcc_version)) {
84322 + error(G_("incompatible gcc/plugin versions"));
84323 + return 1;
84324 + }
84325 +
84326 + register_callback(plugin_name, PLUGIN_INFO, NULL, &latent_entropy_plugin_info);
84327 + register_callback ("start_unit", PLUGIN_START_UNIT, &start_unit_callback, NULL);
84328 + register_callback(plugin_name, PLUGIN_PASS_MANAGER_SETUP, NULL, &latent_entropy_pass_info);
84329 + register_callback(plugin_name, PLUGIN_ATTRIBUTES, register_attributes, NULL);
84330 +
84331 + return 0;
84332 +}
84333 diff --git a/tools/gcc/size_overflow_hash.data b/tools/gcc/size_overflow_hash.data
84334 new file mode 100644
84335 index 0000000..67468e3
84336 --- /dev/null
84337 +++ b/tools/gcc/size_overflow_hash.data
84338 @@ -0,0 +1,3600 @@
84339 +_000001_hash alloc_dr 2 65495 _000001_hash NULL
84340 +_000002_hash __copy_from_user 3 10918 _000002_hash NULL
84341 +_000003_hash copy_from_user 3 17559 _000003_hash NULL
84342 +_000004_hash __copy_from_user_inatomic 3 4365 _000004_hash NULL
84343 +_000005_hash __copy_from_user_nocache 3 39351 _000005_hash NULL
84344 +_000006_hash __copy_to_user_inatomic 3 19214 _000006_hash NULL
84345 +_000007_hash do_xip_mapping_read 5 60297 _000007_hash NULL
84346 +_000008_hash hugetlbfs_read 3 11268 _000008_hash NULL
84347 +_000009_hash kmalloc 1 60432 _003302_hash NULL nohasharray
84348 +_000010_hash kmalloc_array 1-2 9444 _000010_hash NULL
84349 +_000012_hash __kmalloc_reserve 1 17080 _000012_hash NULL
84350 +_000013_hash kmalloc_slab 1 11917 _000013_hash NULL
84351 +_000014_hash kmemdup 2 64015 _000014_hash NULL
84352 +_000015_hash __krealloc 2 14857 _000340_hash NULL nohasharray
84353 +_000016_hash memdup_user 2 59590 _000016_hash NULL
84354 +_000017_hash module_alloc 1 63630 _000017_hash NULL
84355 +_000018_hash read_default_ldt 2 14302 _000018_hash NULL
84356 +_000019_hash read_kcore 3 63488 _000019_hash NULL
84357 +_000020_hash read_ldt 2 47570 _000020_hash NULL
84358 +_000021_hash read_zero 3 19366 _000021_hash NULL
84359 +_000022_hash __vmalloc_node 1 39308 _000022_hash NULL
84360 +_000023_hash aac_convert_sgraw2 4 51598 _000023_hash NULL
84361 +_000024_hash aa_simple_write_to_buffer 4-3 49683 _000024_hash NULL
84362 +_000025_hash ablkcipher_copy_iv 3 64140 _000025_hash NULL
84363 +_000026_hash ablkcipher_next_slow 3-4 47274 _000026_hash NULL
84364 +_000028_hash acpi_battery_write_alarm 3 1240 _000028_hash NULL
84365 +_000029_hash acpi_os_allocate 1 14892 _000029_hash NULL
84366 +_000030_hash acpi_system_write_wakeup_device 3 34853 _000030_hash NULL
84367 +_000031_hash adu_write 3 30487 _000031_hash NULL
84368 +_000032_hash aer_inject_write 3 52399 _000032_hash NULL
84369 +_000033_hash afs_alloc_flat_call 2-3 36399 _000033_hash NULL
84370 +_000035_hash afs_proc_cells_write 3 61139 _000035_hash NULL
84371 +_000036_hash afs_proc_rootcell_write 3 15822 _000036_hash NULL
84372 +_000037_hash agp_3_5_isochronous_node_enable 3 49465 _000037_hash NULL
84373 +_000038_hash agp_alloc_page_array 1 22554 _000038_hash NULL
84374 +_000039_hash ah_alloc_tmp 2-3 54378 _000039_hash NULL
84375 +_000041_hash ahash_setkey_unaligned 3 33521 _000041_hash NULL
84376 +_000042_hash alg_setkey 3 31485 _000042_hash NULL
84377 +_000043_hash aligned_kmalloc 1 3628 _000043_hash NULL
84378 +_000044_hash alloc_context 1 3194 _000044_hash NULL
84379 +_000045_hash alloc_ep_req 2 54860 _000045_hash NULL
84380 +_000046_hash alloc_fdmem 1 27083 _000046_hash NULL
84381 +_000047_hash alloc_flex_gd 1 57259 _000047_hash NULL
84382 +_000048_hash alloc_sglist 1-3-2 22960 _000048_hash NULL
84383 +_000049_hash __alloc_skb 1 23940 _000049_hash NULL
84384 +_000050_hash aoedev_flush 2 44398 _000050_hash NULL
84385 +_000051_hash append_to_buffer 3 63550 _000051_hash NULL
84386 +_000052_hash asix_read_cmd 5 13245 _000052_hash NULL
84387 +_000053_hash asix_write_cmd 5 58192 _000053_hash NULL
84388 +_000054_hash at76_set_card_command 4 4471 _000054_hash NULL
84389 +_000055_hash ath6kl_add_bss_if_needed 6 24317 _000055_hash NULL
84390 +_000056_hash ath6kl_debug_roam_tbl_event 3 5224 _000056_hash NULL
84391 +_000057_hash ath6kl_mgmt_powersave_ap 6 13791 _000057_hash NULL
84392 +_000058_hash ath6kl_send_go_probe_resp 3 21113 _000058_hash NULL
84393 +_000059_hash ath6kl_set_ap_probe_resp_ies 3 50539 _000059_hash NULL
84394 +_000060_hash ath6kl_set_assoc_req_ies 3 43185 _000060_hash NULL
84395 +_000061_hash ath6kl_wmi_bssinfo_event_rx 3 2275 _000061_hash NULL
84396 +_000062_hash ath6kl_wmi_send_action_cmd 7 58860 _000062_hash NULL
84397 +_000063_hash __ath6kl_wmi_send_mgmt_cmd 7 38971 _000063_hash NULL
84398 +_000064_hash attach_hdlc_protocol 3 19986 _000064_hash NULL
84399 +_000065_hash audio_write 4 54261 _001782_hash NULL nohasharray
84400 +_000066_hash audit_unpack_string 3 13748 _000066_hash NULL
84401 +_000067_hash ax25_setsockopt 5 42740 _000067_hash NULL
84402 +_000068_hash b43_debugfs_write 3 34838 _000068_hash NULL
84403 +_000069_hash b43legacy_debugfs_write 3 28556 _000069_hash NULL
84404 +_000070_hash batadv_hash_new 1 40491 _000070_hash NULL
84405 +_000071_hash batadv_orig_node_add_if 2 18433 _000071_hash NULL
84406 +_000072_hash batadv_orig_node_del_if 2 4 _000072_hash NULL
84407 +_000073_hash batadv_tt_changes_fill_buff 4 40323 _000073_hash NULL
84408 +_000074_hash batadv_tt_realloc_packet_buff 4 49960 _000074_hash NULL
84409 +_000075_hash bch_alloc 1 4593 _000075_hash NULL
84410 +_000076_hash befs_nls2utf 3 17163 _000076_hash NULL
84411 +_000077_hash befs_utf2nls 3 25628 _000077_hash NULL
84412 +_000078_hash bfad_debugfs_write_regrd 3 15218 _000078_hash NULL
84413 +_000079_hash bfad_debugfs_write_regwr 3 61841 _000079_hash NULL
84414 +_000080_hash bio_alloc_map_data 1-2 50782 _000080_hash NULL
84415 +_000082_hash bio_kmalloc 2 54672 _000082_hash NULL
84416 +_000083_hash bitmap_storage_alloc 2 55077 _000083_hash NULL
84417 +_000084_hash blkcipher_copy_iv 3 24075 _000084_hash NULL
84418 +_000085_hash blkcipher_next_slow 3-4 52733 _000085_hash NULL
84419 +_000087_hash bl_pipe_downcall 3 34264 _000087_hash NULL
84420 +_000088_hash bnad_debugfs_write_regrd 3 6706 _000088_hash NULL
84421 +_000089_hash bnad_debugfs_write_regwr 3 57500 _000089_hash NULL
84422 +_000090_hash bnx2fc_cmd_mgr_alloc 2-3 24873 _000090_hash NULL
84423 +_000092_hash bnx2fc_process_unsol_compl 2 15576 _000092_hash NULL
84424 +_000093_hash bnx2_nvram_write 2-4 7790 _000093_hash NULL
84425 +_000095_hash btmrvl_gpiogap_write 3 35053 _000095_hash NULL
84426 +_000096_hash btmrvl_hscfgcmd_write 3 27143 _000096_hash NULL
84427 +_000097_hash btmrvl_hscmd_write 3 27089 _000097_hash NULL
84428 +_000098_hash btmrvl_hsmode_write 3 42252 _000098_hash NULL
84429 +_000099_hash btmrvl_pscmd_write 3 29504 _000099_hash NULL
84430 +_000100_hash btmrvl_psmode_write 3 3703 _000100_hash NULL
84431 +_000101_hash btrfs_alloc_delayed_item 1 11678 _000101_hash NULL
84432 +_000102_hash c4iw_id_table_alloc 3 48163 _000102_hash NULL
84433 +_000103_hash cache_do_downcall 3 6926 _000103_hash NULL
84434 +_000104_hash cachefiles_cook_key 2 33274 _000104_hash NULL
84435 +_000105_hash cachefiles_daemon_write 3 43535 _000105_hash NULL
84436 +_000106_hash capi_write 3 35104 _003607_hash NULL nohasharray
84437 +_000107_hash carl9170_debugfs_write 3 50857 _000107_hash NULL
84438 +_000108_hash cciss_allocate_sg_chain_blocks 2-3 5368 _000108_hash NULL
84439 +_000110_hash cciss_proc_write 3 10259 _000110_hash NULL
84440 +_000111_hash cdrom_read_cdda_old 4 27664 _000111_hash NULL
84441 +_000112_hash ceph_alloc_page_vector 1 18710 _000112_hash NULL
84442 +_000113_hash ceph_buffer_new 1 35974 _000113_hash NULL
84443 +_000114_hash ceph_copy_user_to_page_vector 3-4 656 _000114_hash NULL
84444 +_000116_hash ceph_get_direct_page_vector 2 41917 _000116_hash NULL
84445 +_000117_hash ceph_msg_new 2 5846 _000117_hash NULL
84446 +_000118_hash ceph_setxattr 4 18913 _000118_hash NULL
84447 +_000119_hash cfi_read_pri 3 24366 _000119_hash NULL
84448 +_000120_hash cgroup_write_string 5 10900 _000120_hash NULL
84449 +_000121_hash cgroup_write_X64 5 54514 _000121_hash NULL
84450 +_000122_hash change_xattr 5 61390 _000122_hash NULL
84451 +_000123_hash check_load_and_stores 2 2143 _000123_hash NULL
84452 +_000124_hash cifs_idmap_key_instantiate 3 54503 _000124_hash NULL
84453 +_000125_hash cifs_security_flags_proc_write 3 5484 _000125_hash NULL
84454 +_000126_hash cifs_setxattr 4 23957 _000126_hash NULL
84455 +_000127_hash cifs_spnego_key_instantiate 3 23588 _000127_hash NULL
84456 +_000128_hash cld_pipe_downcall 3 15058 _000128_hash NULL
84457 +_000129_hash clear_refs_write 3 61904 _000129_hash NULL
84458 +_000130_hash clusterip_proc_write 3 44729 _000130_hash NULL
84459 +_000131_hash cm4040_write 3 58079 _000131_hash NULL
84460 +_000132_hash cm_copy_private_data 2 3649 _000132_hash NULL
84461 +_000133_hash cmm_write 3 2896 _000133_hash NULL
84462 +_000134_hash cm_write 3 36858 _000134_hash NULL
84463 +_000135_hash coda_psdev_write 3 1711 _000135_hash NULL
84464 +_000136_hash codec_reg_read_file 3 36280 _000136_hash NULL
84465 +_000137_hash command_file_write 3 31318 _000137_hash NULL
84466 +_000138_hash command_write 3 58841 _000138_hash NULL
84467 +_000139_hash comm_write 3 44537 _001714_hash NULL nohasharray
84468 +_000140_hash concat_writev 3 21451 _000140_hash NULL
84469 +_000141_hash copy_and_check 3 19089 _000141_hash NULL
84470 +_000142_hash copy_from_user_toio 3 31966 _000142_hash NULL
84471 +_000143_hash copy_items 6 50140 _000143_hash NULL
84472 +_000144_hash copy_macs 4 45534 _000144_hash NULL
84473 +_000145_hash __copy_to_user 3 17551 _000145_hash NULL
84474 +_000146_hash copy_vm86_regs_from_user 3 45340 _000146_hash NULL
84475 +_000147_hash core_sys_select 1 47494 _000147_hash NULL
84476 +_000148_hash cosa_write 3 1774 _000148_hash NULL
84477 +_000149_hash cp210x_set_config 4 46447 _000149_hash NULL
84478 +_000150_hash create_entry 2 33479 _000150_hash NULL
84479 +_000151_hash create_queues 2-3 9088 _000151_hash NULL
84480 +_000153_hash create_xattr 5 54106 _000153_hash NULL
84481 +_000154_hash create_xattr_datum 5 33356 _003443_hash NULL nohasharray
84482 +_000155_hash csum_partial_copy_fromiovecend 3-4 9957 _000155_hash NULL
84483 +_000157_hash ctrl_out 3-5 8712 _000157_hash NULL
84484 +_000159_hash cxacru_cm_get_array 4 4412 _000159_hash NULL
84485 +_000160_hash cxgbi_alloc_big_mem 1 4707 _000160_hash NULL
84486 +_000161_hash dac960_user_command_proc_write 3 3071 _000161_hash NULL
84487 +_000162_hash datablob_format 2 39571 _002490_hash NULL nohasharray
84488 +_000163_hash dccp_feat_clone_sp_val 3 11942 _000163_hash NULL
84489 +_000164_hash dccp_setsockopt_ccid 4 30701 _000164_hash NULL
84490 +_000165_hash dccp_setsockopt_cscov 2 37766 _000165_hash NULL
84491 +_000166_hash dccp_setsockopt_service 4 65336 _000166_hash NULL
84492 +_000167_hash ddebug_proc_write 3 18055 _000167_hash NULL
84493 +_000168_hash dev_config 3 8506 _000168_hash NULL
84494 +_000169_hash device_write 3 45156 _000169_hash NULL
84495 +_000170_hash devm_kzalloc 2 4966 _000170_hash NULL
84496 +_000171_hash devres_alloc 2 551 _000171_hash NULL
84497 +_000172_hash dfs_file_write 3 41196 _000172_hash NULL
84498 +_000173_hash direct_entry 3 38836 _000173_hash NULL
84499 +_000174_hash dispatch_ioctl 2 32357 _000174_hash NULL
84500 +_000175_hash dispatch_proc_write 3 44320 _000175_hash NULL
84501 +_000176_hash diva_os_copy_from_user 4 7792 _000176_hash NULL
84502 +_000177_hash dlm_alloc_pagevec 1 54296 _000177_hash NULL
84503 +_000178_hash dlmfs_file_read 3 28385 _000178_hash NULL
84504 +_000179_hash dlmfs_file_write 3 6892 _000179_hash NULL
84505 +_000180_hash dm_read 3 15674 _000180_hash NULL
84506 +_000181_hash dm_write 3 2513 _000181_hash NULL
84507 +_000182_hash __dn_setsockopt 5 13060 _000182_hash NULL
84508 +_000183_hash dns_query 3 9676 _000183_hash NULL
84509 +_000184_hash dns_resolver_instantiate 3 63314 _000184_hash NULL
84510 +_000185_hash do_add_counters 3 3992 _000185_hash NULL
84511 +_000186_hash __do_config_autodelink 3 58763 _000186_hash NULL
84512 +_000187_hash do_ip_setsockopt 5 41852 _000187_hash NULL
84513 +_000188_hash do_ipv6_setsockopt 5 18215 _000188_hash NULL
84514 +_000189_hash do_ip_vs_set_ctl 4 48641 _000189_hash NULL
84515 +_000190_hash do_kimage_alloc 3 64827 _000190_hash NULL
84516 +_000191_hash do_register_entry 4 29478 _000191_hash NULL
84517 +_000192_hash do_tty_write 5 44896 _000192_hash NULL
84518 +_000193_hash do_update_counters 4 2259 _000193_hash NULL
84519 +_000194_hash dsp_write 2 46218 _000194_hash NULL
84520 +_000195_hash dup_to_netobj 3 26363 _000195_hash NULL
84521 +_000196_hash dwc3_link_state_write 3 12641 _000196_hash NULL
84522 +_000197_hash dwc3_mode_write 3 51997 _000197_hash NULL
84523 +_000198_hash dwc3_testmode_write 3 30516 _000198_hash NULL
84524 +_000199_hash ecryptfs_copy_filename 4 11868 _000199_hash NULL
84525 +_000200_hash ecryptfs_miscdev_write 3 26847 _000200_hash NULL
84526 +_000201_hash ecryptfs_send_miscdev 2 64816 _000201_hash NULL
84527 +_000202_hash efx_tsoh_heap_alloc 2 58545 _000202_hash NULL
84528 +_000203_hash emi26_writememory 4 57908 _000203_hash NULL
84529 +_000204_hash emi62_writememory 4 29731 _000204_hash NULL
84530 +_000205_hash encrypted_instantiate 3 3168 _000205_hash NULL
84531 +_000206_hash encrypted_update 3 13414 _000206_hash NULL
84532 +_000207_hash ep0_write 3 14536 _001422_hash NULL nohasharray
84533 +_000208_hash ep_read 3 58813 _000208_hash NULL
84534 +_000209_hash ep_write 3 59008 _000209_hash NULL
84535 +_000210_hash erst_dbg_write 3 46715 _000210_hash NULL
84536 +_000211_hash esp_alloc_tmp 2-3 40558 _000211_hash NULL
84537 +_000213_hash evdev_do_ioctl 2 24459 _000213_hash NULL
84538 +_000214_hash exofs_read_lookup_dev_table 3 17733 _000214_hash NULL
84539 +_000215_hash ext4_kvmalloc 1 14796 _000215_hash NULL
84540 +_000216_hash ezusb_writememory 4 45976 _000216_hash NULL
84541 +_000217_hash fanotify_write 3 64623 _000217_hash NULL
84542 +_000218_hash fd_copyin 3 56247 _000218_hash NULL
84543 +_000219_hash ffs_epfile_io 3 64886 _000219_hash NULL
84544 +_000220_hash ffs_prepare_buffer 2 59892 _000220_hash NULL
84545 +_000221_hash f_hidg_write 3 7932 _000221_hash NULL
84546 +_000222_hash file_read_actor 4 1401 _000222_hash NULL
84547 +_000223_hash fill_write_buffer 3 3142 _000223_hash NULL
84548 +_000224_hash __find_xattr 6 2117 _002425_hash NULL nohasharray
84549 +_000225_hash fl_create 5 56435 _000225_hash NULL
84550 +_000226_hash fs_path_ensure_buf 2 59445 _000226_hash NULL
84551 +_000227_hash ftdi_elan_write 3 57309 _000227_hash NULL
84552 +_000228_hash fw_iso_buffer_alloc 2 13704 _000228_hash NULL
84553 +_000229_hash garmin_write_bulk 3 58191 _000229_hash NULL
84554 +_000230_hash garp_attr_create 3 3883 _000230_hash NULL
84555 +_000231_hash get_arg 3 5694 _000231_hash NULL
84556 +_000232_hash getdqbuf 1 62908 _000232_hash NULL
84557 +_000233_hash get_fdb_entries 3 41916 _000233_hash NULL
84558 +_000234_hash get_fd_set 1 3866 _000234_hash NULL
84559 +_000235_hash get_indirect_ea 4 51869 _000235_hash NULL
84560 +_000236_hash get_registers 3 26187 _000236_hash NULL
84561 +_000237_hash get_scq 2 10897 _000237_hash NULL
84562 +_000238_hash get_server_iovec 2 16804 _000238_hash NULL
84563 +_000239_hash get_ucode_user 3 38202 _000239_hash NULL
84564 +_000240_hash get_user_cpu_mask 2 14861 _000240_hash NULL
84565 +_000241_hash gfs2_alloc_sort_buffer 1 18275 _000241_hash NULL
84566 +_000242_hash gfs2_glock_nq_m 1 20347 _000242_hash NULL
84567 +_000243_hash gigaset_initcs 2 43753 _000243_hash NULL
84568 +_000244_hash gigaset_initdriver 2 1060 _000244_hash NULL
84569 +_000245_hash groups_alloc 1 7614 _000245_hash NULL
84570 +_000246_hash gs_alloc_req 2 58883 _000246_hash NULL
84571 +_000247_hash gs_buf_alloc 2 25067 _000247_hash NULL
84572 +_000248_hash gsm_data_alloc 3 42437 _000248_hash NULL
84573 +_000249_hash gss_pipe_downcall 3 23182 _000249_hash NULL
84574 +_000250_hash handle_request 9 10024 _000250_hash NULL
84575 +_000251_hash hashtab_create 3 33769 _000251_hash NULL
84576 +_000252_hash hcd_buffer_alloc 2 27495 _000252_hash NULL
84577 +_000253_hash hci_sock_setsockopt 5 28993 _000253_hash NULL
84578 +_000254_hash heap_init 2 49617 _000254_hash NULL
84579 +_000255_hash hest_ghes_dev_register 1 46766 _000255_hash NULL
84580 +_000256_hash hidg_alloc_ep_req 2 10159 _000256_hash NULL
84581 +_000257_hash hid_parse_report 3 51737 _000257_hash NULL
84582 +_000258_hash hidraw_get_report 3 45609 _000258_hash NULL
84583 +_000259_hash hidraw_report_event 3 20503 _000259_hash NULL
84584 +_000260_hash hidraw_send_report 3 23449 _000260_hash NULL
84585 +_000261_hash hpfs_translate_name 3 41497 _000261_hash NULL
84586 +_000262_hash hysdn_conf_write 3 52145 _000262_hash NULL
84587 +_000263_hash __i2400mu_send_barker 3 23652 _000263_hash NULL
84588 +_000264_hash i2cdev_read 3 1206 _000264_hash NULL
84589 +_000265_hash i2cdev_write 3 23310 _000265_hash NULL
84590 +_000266_hash i2o_parm_field_get 5 34477 _000266_hash NULL
84591 +_000267_hash i2o_parm_table_get 6 61635 _000267_hash NULL
84592 +_000268_hash ib_copy_from_udata 3 59502 _000268_hash NULL
84593 +_000269_hash ib_ucm_alloc_data 3 36885 _000269_hash NULL
84594 +_000270_hash ib_umad_write 3 47993 _000270_hash NULL
84595 +_000271_hash ib_uverbs_unmarshall_recv 5 12251 _000271_hash NULL
84596 +_000272_hash icn_writecmd 2 38629 _000272_hash NULL
84597 +_000273_hash ide_driver_proc_write 3 32493 _000273_hash NULL
84598 +_000274_hash ide_settings_proc_write 3 35110 _000274_hash NULL
84599 +_000275_hash idetape_chrdev_write 3 53976 _000275_hash NULL
84600 +_000276_hash idmap_pipe_downcall 3 14591 _000276_hash NULL
84601 +_000277_hash ieee80211_build_probe_req 7-5 27660 _000277_hash NULL
84602 +_000278_hash ieee80211_if_write 3 34894 _000278_hash NULL
84603 +_000279_hash if_write 3 51756 _000279_hash NULL
84604 +_000280_hash ilo_write 3 64378 _000280_hash NULL
84605 +_000281_hash ima_write_policy 3 40548 _000281_hash NULL
84606 +_000282_hash init_data_container 1 60709 _000282_hash NULL
84607 +_000283_hash init_send_hfcd 1 34586 _000283_hash NULL
84608 +_000284_hash insert_dent 7 65034 _000284_hash NULL
84609 +_000285_hash interpret_user_input 2 19393 _000285_hash NULL
84610 +_000286_hash int_proc_write 3 39542 _000286_hash NULL
84611 +_000287_hash ioctl_private_iw_point 7 1273 _000287_hash NULL
84612 +_000288_hash iov_iter_copy_from_user 4 31942 _000288_hash NULL
84613 +_000289_hash iov_iter_copy_from_user_atomic 4 56368 _000289_hash NULL
84614 +_000290_hash iowarrior_write 3 18604 _000290_hash NULL
84615 +_000291_hash ipc_alloc 1 1192 _000291_hash NULL
84616 +_000292_hash ipc_rcu_alloc 1 21208 _000292_hash NULL
84617 +_000293_hash ip_options_get_from_user 4 64958 _000293_hash NULL
84618 +_000294_hash ipv6_renew_option 3 38813 _000294_hash NULL
84619 +_000295_hash ip_vs_conn_fill_param_sync 6 29771 _001898_hash NULL nohasharray
84620 +_000296_hash ip_vs_create_timeout_table 2 64478 _000296_hash NULL
84621 +_000297_hash ipw_queue_tx_init 3 49161 _000297_hash NULL
84622 +_000298_hash irda_setsockopt 5 19824 _000298_hash NULL
84623 +_000299_hash irias_new_octseq_value 2 13596 _003821_hash NULL nohasharray
84624 +_000300_hash irnet_ctrl_write 3 24139 _000300_hash NULL
84625 +_000301_hash isdn_add_channels 3 40905 _000301_hash NULL
84626 +_000302_hash isdn_ppp_fill_rq 2 41428 _000302_hash NULL
84627 +_000303_hash isdn_ppp_write 4 29109 _000303_hash NULL
84628 +_000304_hash isdn_read 3 50021 _000304_hash NULL
84629 +_000305_hash isdn_v110_open 3 2418 _000305_hash NULL
84630 +_000306_hash isdn_writebuf_stub 4 52383 _000306_hash NULL
84631 +_000307_hash islpci_mgt_transmit 5 34133 _000307_hash NULL
84632 +_000308_hash iso_callback 3 43208 _000308_hash NULL
84633 +_000309_hash iso_packets_buffer_init 3-4 29061 _000309_hash NULL
84634 +_000310_hash it821x_firmware_command 3 8628 _000310_hash NULL
84635 +_000311_hash iwch_alloc_fastreg_pbl 2 40153 _000311_hash NULL
84636 +_000312_hash iwl_calib_set 3 34400 _003754_hash NULL nohasharray
84637 +_000313_hash jbd2_journal_init_revoke_table 1 36336 _000313_hash NULL
84638 +_000314_hash jffs2_alloc_full_dirent 1 60179 _001158_hash NULL nohasharray
84639 +_000315_hash journal_init_revoke_table 1 56331 _000315_hash NULL
84640 +_000316_hash kcalloc 1-2 27770 _000316_hash NULL
84641 +_000318_hash keyctl_instantiate_key_common 4 47889 _000318_hash NULL
84642 +_000319_hash keyctl_update_key 3 26061 _000319_hash NULL
84643 +_000320_hash __kfifo_alloc 2-3 22173 _000320_hash NULL
84644 +_000322_hash kfifo_copy_from_user 3 5091 _000322_hash NULL
84645 +_000323_hash kmalloc_node 1 50163 _003818_hash NULL nohasharray
84646 +_000324_hash kmalloc_parameter 1 65279 _000324_hash NULL
84647 +_000325_hash kmem_alloc 1 31920 _000325_hash NULL
84648 +_000326_hash kobj_map 2-3 9566 _000326_hash NULL
84649 +_000328_hash kone_receive 4 4690 _000328_hash NULL
84650 +_000329_hash kone_send 4 63435 _000329_hash NULL
84651 +_000330_hash krealloc 2 14908 _000330_hash NULL
84652 +_000331_hash kvmalloc 1 32646 _000331_hash NULL
84653 +_000332_hash kvm_read_guest_atomic 4 10765 _000332_hash NULL
84654 +_000333_hash kvm_read_guest_cached 4 39666 _000333_hash NULL
84655 +_000334_hash kvm_read_guest_page 5 18074 _000334_hash NULL
84656 +_000335_hash kzalloc 1 54740 _000335_hash NULL
84657 +_000336_hash l2cap_sock_setsockopt 5 50207 _000336_hash NULL
84658 +_000337_hash l2cap_sock_setsockopt_old 4 29346 _000337_hash NULL
84659 +_000338_hash lane2_associate_req 4 45398 _000338_hash NULL
84660 +_000339_hash lbs_debugfs_write 3 48413 _000339_hash NULL
84661 +_000340_hash lcd_write 3 14857 _000340_hash &_000015_hash
84662 +_000341_hash ldm_frag_add 2 5611 _000341_hash NULL
84663 +_000342_hash __lgread 4 31668 _000342_hash NULL
84664 +_000343_hash libipw_alloc_txb 1-3-2 27579 _000343_hash NULL
84665 +_000344_hash link_send_sections_long 4 46556 _000344_hash NULL
84666 +_000345_hash listxattr 3 12769 _000345_hash NULL
84667 +_000346_hash load_msg 2 95 _000346_hash NULL
84668 +_000347_hash lpfc_debugfs_dif_err_write 3 17424 _000347_hash NULL
84669 +_000348_hash lp_write 3 9511 _000348_hash NULL
84670 +_000349_hash mb_cache_create 2 17307 _000349_hash NULL
84671 +_000350_hash mce_write 3 26201 _000350_hash NULL
84672 +_000351_hash mcs7830_get_reg 3 33308 _000351_hash NULL
84673 +_000352_hash mcs7830_set_reg 3 31413 _000352_hash NULL
84674 +_000353_hash memcpy_fromiovec 3 55247 _000353_hash NULL
84675 +_000354_hash memcpy_fromiovecend 3-4 2707 _000354_hash NULL
84676 +_000356_hash mempool_resize 2 47983 _002039_hash NULL nohasharray
84677 +_000357_hash mem_rw 3 22085 _000357_hash NULL
84678 +_000358_hash mgmt_control 3 7349 _000358_hash NULL
84679 +_000359_hash mgmt_pending_add 5 46976 _000359_hash NULL
84680 +_000360_hash mlx4_ib_alloc_fast_reg_page_list 2 46119 _000360_hash NULL
84681 +_000361_hash mmc_alloc_sg 1 21504 _000361_hash NULL
84682 +_000362_hash mmc_send_bus_test 4 18285 _000362_hash NULL
84683 +_000363_hash mmc_send_cxd_data 5 38655 _000363_hash NULL
84684 +_000364_hash module_alloc_update_bounds 1 47205 _000364_hash NULL
84685 +_000365_hash move_addr_to_kernel 2 32673 _000365_hash NULL
84686 +_000366_hash mpi_alloc_limb_space 1 23190 _000366_hash NULL
84687 +_000367_hash mpi_resize 2 44674 _000367_hash NULL
84688 +_000368_hash mptctl_getiocinfo 2 28545 _000368_hash NULL
84689 +_000369_hash mtdchar_readoob 4 31200 _000369_hash NULL
84690 +_000370_hash mtdchar_write 3 56831 _002122_hash NULL nohasharray
84691 +_000371_hash mtdchar_writeoob 4 3393 _000371_hash NULL
84692 +_000372_hash mtd_device_parse_register 5 5024 _000372_hash NULL
84693 +_000373_hash mtf_test_write 3 18844 _000373_hash NULL
84694 +_000374_hash mthca_alloc_icm_table 3-4 38268 _002459_hash NULL nohasharray
84695 +_000376_hash mthca_alloc_init 2 21754 _000376_hash NULL
84696 +_000377_hash mthca_array_init 2 39987 _000377_hash NULL
84697 +_000378_hash mthca_buf_alloc 2 35861 _000378_hash NULL
84698 +_000379_hash mtrr_write 3 59622 _000379_hash NULL
84699 +_000380_hash musb_test_mode_write 3 33518 _000380_hash NULL
84700 +_000381_hash mwifiex_get_common_rates 3 17131 _000381_hash NULL
84701 +_000382_hash __mxt_write_reg 3 57326 _000382_hash NULL
84702 +_000383_hash nand_bch_init 2-3 16280 _001439_hash NULL nohasharray
84703 +_000385_hash ncp_file_write 3 3813 _000385_hash NULL
84704 +_000386_hash ncp__vol2io 5 4804 _000386_hash NULL
84705 +_000387_hash nes_alloc_fast_reg_page_list 2 33523 _000387_hash NULL
84706 +_000388_hash nfc_targets_found 3 29886 _000388_hash NULL
84707 +_000389_hash __nf_ct_ext_add_length 3 12364 _000389_hash NULL
84708 +_000390_hash nfs4_acl_new 1 49806 _000390_hash NULL
84709 +_000391_hash nfs4_write_cached_acl 4 15070 _000391_hash NULL
84710 +_000392_hash nfsd_symlink 6 63442 _000392_hash NULL
84711 +_000393_hash nfs_idmap_get_desc 2-4 42990 _000393_hash NULL
84712 +_000395_hash nfs_readdir_make_qstr 3 12509 _000395_hash NULL
84713 +_000396_hash note_last_dentry 3 12285 _000396_hash NULL
84714 +_000397_hash ntfs_copy_from_user 3-5 15072 _000397_hash NULL
84715 +_000399_hash __ntfs_copy_from_user_iovec_inatomic 3-4 38153 _000399_hash NULL
84716 +_000401_hash ntfs_ucstonls 3-5 23097 _000401_hash NULL
84717 +_000403_hash nvme_alloc_iod 1 56027 _000403_hash NULL
84718 +_000404_hash nvram_write 3 3894 _000404_hash NULL
84719 +_000405_hash o2hb_debug_create 4 18744 _000405_hash NULL
84720 +_000406_hash o2net_send_message_vec 4 879 _002013_hash NULL nohasharray
84721 +_000407_hash ocfs2_control_cfu 2 37750 _000407_hash NULL
84722 +_000408_hash oom_adjust_write 3 41116 _000408_hash NULL
84723 +_000409_hash oom_score_adj_write 3 42594 _000409_hash NULL
84724 +_000410_hash oprofilefs_ulong_from_user 3 57251 _000410_hash NULL
84725 +_000411_hash opticon_write 4 60775 _000411_hash NULL
84726 +_000412_hash p9_check_zc_errors 4 15534 _000412_hash NULL
84727 +_000413_hash packet_buffer_init 2 1607 _000413_hash NULL
84728 +_000414_hash packet_setsockopt 5 17662 _000414_hash NULL
84729 +_000415_hash parse_command 2 37079 _000415_hash NULL
84730 +_000416_hash pcbit_writecmd 2 12332 _000416_hash NULL
84731 +_000417_hash pcmcia_replace_cis 3 57066 _000417_hash NULL
84732 +_000418_hash pgctrl_write 3 50453 _000418_hash NULL
84733 +_000419_hash pg_write 3 40766 _000419_hash NULL
84734 +_000420_hash pidlist_allocate 1 64404 _000420_hash NULL
84735 +_000421_hash pipe_iov_copy_from_user 3 23102 _000421_hash NULL
84736 +_000422_hash pipe_iov_copy_to_user 3 3447 _000422_hash NULL
84737 +_000423_hash pkt_add 3 39897 _000423_hash NULL
84738 +_000424_hash pktgen_if_write 3 55628 _000424_hash NULL
84739 +_000425_hash platform_device_add_data 3 310 _000425_hash NULL
84740 +_000426_hash platform_device_add_resources 3 13289 _000426_hash NULL
84741 +_000427_hash pmcraid_copy_sglist 3 38431 _000427_hash NULL
84742 +_000428_hash pm_qos_power_write 3 52513 _000428_hash NULL
84743 +_000429_hash pnpbios_proc_write 3 19758 _000429_hash NULL
84744 +_000430_hash pool_allocate 3 42012 _000430_hash NULL
84745 +_000431_hash posix_acl_alloc 1 48063 _000431_hash NULL
84746 +_000432_hash ppp_cp_parse_cr 4 5214 _000432_hash NULL
84747 +_000433_hash ppp_write 3 34034 _000433_hash NULL
84748 +_000434_hash pp_read 3 33210 _000434_hash NULL
84749 +_000435_hash pp_write 3 39554 _000435_hash NULL
84750 +_000436_hash printer_req_alloc 2 62687 _000436_hash NULL
84751 +_000437_hash printer_write 3 60276 _000437_hash NULL
84752 +_000438_hash prism2_info_scanresults 3 59729 _000438_hash NULL
84753 +_000439_hash prism2_set_genericelement 3 29277 _000439_hash NULL
84754 +_000440_hash __probe_kernel_read 3 61119 _000440_hash NULL
84755 +_000441_hash __probe_kernel_write 3 29842 _000441_hash NULL
84756 +_000442_hash proc_coredump_filter_write 3 25625 _000442_hash NULL
84757 +_000443_hash _proc_do_string 2 6376 _000443_hash NULL
84758 +_000444_hash process_vm_rw_pages 5-6 15954 _000444_hash NULL
84759 +_000446_hash proc_loginuid_write 3 63648 _000446_hash NULL
84760 +_000447_hash proc_pid_attr_write 3 63845 _000447_hash NULL
84761 +_000448_hash proc_scsi_devinfo_write 3 32064 _000448_hash NULL
84762 +_000449_hash proc_scsi_write 3 29142 _000449_hash NULL
84763 +_000450_hash proc_scsi_write_proc 3 267 _000450_hash NULL
84764 +_000451_hash pskb_expand_head 2-3 42881 _000451_hash NULL
84765 +_000453_hash pstore_mkfile 5 50830 _000453_hash NULL
84766 +_000454_hash pti_char_write 3 60960 _000454_hash NULL
84767 +_000455_hash ptrace_writedata 4 45021 _000455_hash NULL
84768 +_000456_hash pt_write 3 40159 _000456_hash NULL
84769 +_000457_hash qdisc_class_hash_alloc 1 18262 _000457_hash NULL
84770 +_000458_hash r3964_write 4 57662 _000458_hash NULL
84771 +_000459_hash raw_seticmpfilter 3 6888 _000459_hash NULL
84772 +_000460_hash raw_setsockopt 5 45800 _000460_hash NULL
84773 +_000461_hash rawv6_seticmpfilter 5 12137 _000461_hash NULL
84774 +_000462_hash ray_cs_essid_proc_write 3 17875 _000462_hash NULL
84775 +_000463_hash rbd_add 3 16366 _000463_hash NULL
84776 +_000464_hash rbd_snap_add 4 19678 _000464_hash NULL
84777 +_000465_hash rdma_set_ib_paths 3 45592 _000465_hash NULL
84778 +_000466_hash rds_page_copy_user 4 35691 _000466_hash NULL
84779 +_000467_hash read 3 9397 _000467_hash NULL
84780 +_000468_hash read_buf 2 20469 _000468_hash NULL
84781 +_000469_hash read_cis_cache 4 29735 _000469_hash NULL
84782 +_000470_hash realloc_buffer 2 25816 _000470_hash NULL
84783 +_000471_hash receive_DataRequest 3 9904 _000471_hash NULL
84784 +_000472_hash recent_mt_proc_write 3 8206 _000472_hash NULL
84785 +_000473_hash regmap_access_read_file 3 37223 _000473_hash NULL
84786 +_000474_hash regmap_bulk_write 4 59049 _000474_hash NULL
84787 +_000475_hash regmap_map_read_file 3 37685 _000475_hash NULL
84788 +_000476_hash regset_tls_set 4 18459 _000476_hash NULL
84789 +_000477_hash reiserfs_add_entry 4 23062 _002792_hash NULL nohasharray
84790 +_000478_hash remote_settings_file_write 3 22987 _000478_hash NULL
84791 +_000479_hash request_key_auth_new 3 38092 _000479_hash NULL
84792 +_000480_hash restore_i387_fxsave 2 17528 _000480_hash NULL
84793 +_000481_hash revalidate 2 19043 _000481_hash NULL
84794 +_000482_hash rfcomm_sock_setsockopt 5 18254 _000482_hash NULL
84795 +_000483_hash rndis_add_response 2 58544 _000483_hash NULL
84796 +_000484_hash rndis_set_oid 4 6547 _000484_hash NULL
84797 +_000485_hash rngapi_reset 3 34366 _002137_hash NULL nohasharray
84798 +_000486_hash roccat_common2_receive 4 50369 _000486_hash NULL
84799 +_000487_hash roccat_common2_send 4 2422 _000487_hash NULL
84800 +_000488_hash rpc_malloc 2 43573 _000488_hash NULL
84801 +_000489_hash rt2x00debug_write_bbp 3 8212 _000489_hash NULL
84802 +_000490_hash rt2x00debug_write_csr 3 64753 _000490_hash NULL
84803 +_000491_hash rt2x00debug_write_eeprom 3 23091 _000491_hash NULL
84804 +_000492_hash rt2x00debug_write_rf 3 38195 _000492_hash NULL
84805 +_000493_hash rt2x00debug_write_rfcsr 3 41473 _000493_hash NULL
84806 +_000494_hash rts51x_read_mem 4 26577 _002730_hash NULL nohasharray
84807 +_000495_hash rts51x_read_status 4 11830 _000495_hash NULL
84808 +_000496_hash rts51x_write_mem 4 17598 _000496_hash NULL
84809 +_000497_hash rw_copy_check_uvector 3 45748 _003716_hash NULL nohasharray
84810 +_000498_hash rxrpc_request_key 3 27235 _000498_hash NULL
84811 +_000499_hash rxrpc_server_keyring 3 16431 _000499_hash NULL
84812 +_000500_hash savemem 3 58129 _000500_hash NULL
84813 +_000501_hash sb16_copy_from_user 10-7-6 55836 _000501_hash NULL
84814 +_000504_hash sched_autogroup_write 3 10984 _000504_hash NULL
84815 +_000505_hash scsi_mode_select 6 37330 _000505_hash NULL
84816 +_000506_hash scsi_tgt_copy_sense 3 26933 _000506_hash NULL
84817 +_000507_hash sctp_auth_create_key 1 51641 _000507_hash NULL
84818 +_000508_hash sctp_getsockopt_delayed_ack 2 9232 _000508_hash NULL
84819 +_000509_hash sctp_getsockopt_local_addrs 2 25178 _000509_hash NULL
84820 +_000510_hash sctp_make_abort_user 3 29654 _000510_hash NULL
84821 +_000511_hash sctp_setsockopt_active_key 3 43755 _000511_hash NULL
84822 +_000512_hash sctp_setsockopt_adaptation_layer 3 26935 _003246_hash NULL nohasharray
84823 +_000513_hash sctp_setsockopt_associnfo 3 51684 _000513_hash NULL
84824 +_000514_hash sctp_setsockopt_auth_chunk 3 30843 _000514_hash NULL
84825 +_000515_hash sctp_setsockopt_auth_key 3 3793 _000515_hash NULL
84826 +_000516_hash sctp_setsockopt_autoclose 3 5775 _000516_hash NULL
84827 +_000517_hash sctp_setsockopt_bindx 3 49870 _000517_hash NULL
84828 +_000518_hash __sctp_setsockopt_connectx 3 46949 _000518_hash NULL
84829 +_000519_hash sctp_setsockopt_context 3 31091 _000519_hash NULL
84830 +_000520_hash sctp_setsockopt_default_send_param 3 49578 _000520_hash NULL
84831 +_000521_hash sctp_setsockopt_delayed_ack 3 40129 _000521_hash NULL
84832 +_000522_hash sctp_setsockopt_del_key 3 42304 _002709_hash NULL nohasharray
84833 +_000523_hash sctp_setsockopt_events 3 18862 _000523_hash NULL
84834 +_000524_hash sctp_setsockopt_hmac_ident 3 11687 _000524_hash NULL
84835 +_000525_hash sctp_setsockopt_initmsg 3 1383 _000525_hash NULL
84836 +_000526_hash sctp_setsockopt_maxburst 3 28041 _000526_hash NULL
84837 +_000527_hash sctp_setsockopt_maxseg 3 11829 _000527_hash NULL
84838 +_000528_hash sctp_setsockopt_peer_addr_params 3 734 _000528_hash NULL
84839 +_000529_hash sctp_setsockopt_peer_primary_addr 3 13440 _000529_hash NULL
84840 +_000530_hash sctp_setsockopt_rtoinfo 3 30941 _000530_hash NULL
84841 +_000531_hash security_context_to_sid_core 2 29248 _000531_hash NULL
84842 +_000532_hash sel_commit_bools_write 3 46077 _000532_hash NULL
84843 +_000533_hash sel_write_avc_cache_threshold 3 2256 _000533_hash NULL
84844 +_000534_hash sel_write_bool 3 46996 _000534_hash NULL
84845 +_000535_hash sel_write_checkreqprot 3 60774 _000535_hash NULL
84846 +_000536_hash sel_write_disable 3 10511 _000536_hash NULL
84847 +_000537_hash sel_write_enforce 3 48998 _000537_hash NULL
84848 +_000538_hash sel_write_load 3 63830 _000538_hash NULL
84849 +_000539_hash send_bulk_static_data 3 61932 _000539_hash NULL
84850 +_000540_hash set_aoe_iflist 2 42737 _000540_hash NULL
84851 +_000541_hash setkey_unaligned 3 39474 _000541_hash NULL
84852 +_000542_hash set_registers 3 53582 _000542_hash NULL
84853 +_000543_hash setsockopt 5 54539 _000543_hash NULL
84854 +_000544_hash setup_req 3 5848 _000544_hash NULL
84855 +_000545_hash setxattr 4 37006 _000545_hash NULL
84856 +_000546_hash sfq_alloc 1 2861 _000546_hash NULL
84857 +_000547_hash sg_kmalloc 1 50240 _000547_hash NULL
84858 +_000548_hash sgl_map_user_pages 2 30610 _000548_hash NULL
84859 +_000549_hash shash_setkey_unaligned 3 8620 _000549_hash NULL
84860 +_000550_hash shmem_xattr_alloc 2 61190 _000550_hash NULL
84861 +_000551_hash sierra_setup_urb 5 46029 _000551_hash NULL
84862 +_000552_hash simple_transaction_get 3 50633 _000552_hash NULL
84863 +_000553_hash simple_write_to_buffer 2-5 3122 _000553_hash NULL
84864 +_000555_hash sisusb_send_bulk_msg 3 17864 _000555_hash NULL
84865 +_000556_hash skb_add_data 3 48363 _000556_hash NULL
84866 +_000557_hash skb_do_copy_data_nocache 5 12465 _000557_hash NULL
84867 +_000558_hash sl_alloc_bufs 2 50380 _000558_hash NULL
84868 +_000559_hash sl_realloc_bufs 2 64086 _000559_hash NULL
84869 +_000560_hash smk_set_cipso 3 20379 _000560_hash NULL
84870 +_000561_hash smk_write_ambient 3 45691 _000561_hash NULL
84871 +_000562_hash smk_write_direct 3 46363 _000562_hash NULL
84872 +_000563_hash smk_write_doi 3 49621 _000563_hash NULL
84873 +_000564_hash smk_write_logging 3 2618 _000564_hash NULL
84874 +_000565_hash smk_write_mapped 3 13519 _000565_hash NULL
84875 +_000566_hash smk_write_netlbladdr 3 42525 _000566_hash NULL
84876 +_000567_hash smk_write_onlycap 3 14400 _000567_hash NULL
84877 +_000568_hash smk_write_rules_list 3 18565 _000568_hash NULL
84878 +_000569_hash snd_ctl_elem_user_tlv 3 11695 _000569_hash NULL
84879 +_000570_hash snd_emu10k1_fx8010_read 5 9605 _000570_hash NULL
84880 +_000571_hash snd_emu10k1_synth_copy_from_user 3-5 9061 _000571_hash NULL
84881 +_000573_hash snd_gus_dram_poke 4 18525 _000573_hash NULL
84882 +_000574_hash snd_hdsp_playback_copy 5 20676 _000574_hash NULL
84883 +_000575_hash snd_info_entry_write 3 63474 _000575_hash NULL
84884 +_000576_hash snd_korg1212_copy_from 6 36169 _000576_hash NULL
84885 +_000577_hash snd_mem_proc_write 3 9786 _000577_hash NULL
84886 +_000578_hash snd_midi_channel_init_set 1 30092 _000578_hash NULL
84887 +_000579_hash snd_midi_event_new 1 9893 _000764_hash NULL nohasharray
84888 +_000580_hash snd_opl4_mem_proc_write 5 9670 _000580_hash NULL
84889 +_000581_hash snd_pcm_aio_read 3 13900 _000581_hash NULL
84890 +_000582_hash snd_pcm_aio_write 3 28738 _000582_hash NULL
84891 +_000583_hash snd_pcm_oss_write1 3 10872 _000583_hash NULL
84892 +_000584_hash snd_pcm_oss_write2 3 27332 _000584_hash NULL
84893 +_000585_hash snd_rawmidi_kernel_write1 4 56847 _000585_hash NULL
84894 +_000586_hash snd_rme9652_playback_copy 5 20970 _000586_hash NULL
84895 +_000587_hash snd_sb_csp_load_user 3 45190 _000587_hash NULL
84896 +_000588_hash snd_usb_ctl_msg 8 8436 _000588_hash NULL
84897 +_000589_hash sock_bindtodevice 3 50942 _000589_hash NULL
84898 +_000590_hash sock_kmalloc 2 62205 _000590_hash NULL
84899 +_000591_hash spidev_ioctl 2 12846 _000591_hash NULL
84900 +_000592_hash spidev_write 3 44510 _000592_hash NULL
84901 +_000593_hash squashfs_read_table 3 16945 _000593_hash NULL
84902 +_000594_hash srpt_alloc_ioctx 2-3 51042 _000594_hash NULL
84903 +_000596_hash srpt_alloc_ioctx_ring 2-4-3 49330 _000596_hash NULL
84904 +_000597_hash st5481_setup_isocpipes 6-4 61340 _000597_hash NULL
84905 +_000598_hash sta_agg_status_write 3 45164 _000598_hash NULL
84906 +_000599_hash svc_setsockopt 5 36876 _000599_hash NULL
84907 +_000600_hash sys_add_key 4 61288 _000600_hash NULL
84908 +_000601_hash sys_modify_ldt 3 18824 _000601_hash NULL
84909 +_000602_hash sys_semtimedop 3 4486 _000602_hash NULL
84910 +_000603_hash sys_setdomainname 2 4373 _000603_hash NULL
84911 +_000604_hash sys_sethostname 2 42962 _000604_hash NULL
84912 +_000605_hash tomoyo_write_self 3 45161 _000605_hash NULL
84913 +_000606_hash tower_write 3 8580 _000606_hash NULL
84914 +_000607_hash tpm_write 3 50798 _000607_hash NULL
84915 +_000608_hash trusted_instantiate 3 4710 _000608_hash NULL
84916 +_000609_hash trusted_update 3 12664 _000609_hash NULL
84917 +_000610_hash tty_buffer_alloc 2 45437 _000610_hash NULL
84918 +_000611_hash __tun_chr_ioctl 4 22300 _000611_hash NULL
84919 +_000612_hash ubi_more_leb_change_data 4 63534 _000612_hash NULL
84920 +_000613_hash ubi_more_update_data 4 39189 _000613_hash NULL
84921 +_000614_hash ubi_resize_volume 2 50172 _000614_hash NULL
84922 +_000615_hash udf_alloc_i_data 2 35786 _000615_hash NULL
84923 +_000616_hash uea_idma_write 3 64139 _000616_hash NULL
84924 +_000617_hash uea_request 4 47613 _000617_hash NULL
84925 +_000618_hash uea_send_modem_cmd 3 3888 _000618_hash NULL
84926 +_000619_hash uio_write 3 43202 _000619_hash NULL
84927 +_000620_hash um_idi_write 3 18293 _000620_hash NULL
84928 +_000621_hash us122l_ctl_msg 8 13330 _000621_hash NULL
84929 +_000622_hash usb_alloc_urb 1 43436 _000622_hash NULL
84930 +_000623_hash usblp_new_writeurb 2 22894 _000623_hash NULL
84931 +_000624_hash usblp_write 3 23178 _000624_hash NULL
84932 +_000625_hash usbtest_alloc_urb 3-5 34446 _000625_hash NULL
84933 +_000627_hash usbtmc_write 3 64340 _000627_hash NULL
84934 +_000628_hash user_instantiate 3 26131 _000628_hash NULL
84935 +_000629_hash user_update 3 41332 _000629_hash NULL
84936 +_000630_hash uwb_rc_cmd_done 4 35892 _000630_hash NULL
84937 +_000631_hash uwb_rc_neh_grok_event 3 55799 _000631_hash NULL
84938 +_000632_hash v9fs_alloc_rdir_buf 2 42150 _000632_hash NULL
84939 +_000633_hash vc_do_resize 3-4 48842 _000633_hash NULL
84940 +_000635_hash vcs_write 3 3910 _000635_hash NULL
84941 +_000636_hash vga_arb_write 3 36112 _000636_hash NULL
84942 +_000637_hash vga_switcheroo_debugfs_write 3 33984 _000637_hash NULL
84943 +_000638_hash vhci_get_user 3 45039 _000638_hash NULL
84944 +_000639_hash video_proc_write 3 6724 _000639_hash NULL
84945 +_000640_hash vlsi_alloc_ring 3-4 57003 _000640_hash NULL
84946 +_000642_hash __vmalloc 1 61168 _000642_hash NULL
84947 +_000643_hash vmalloc_32 1 1135 _000643_hash NULL
84948 +_000644_hash vmalloc_32_user 1 37519 _000644_hash NULL
84949 +_000645_hash vmalloc_exec 1 36132 _000645_hash NULL
84950 +_000646_hash vmalloc_node 1 58700 _000646_hash NULL
84951 +_000647_hash __vmalloc_node_flags 1 30352 _000647_hash NULL
84952 +_000648_hash vmalloc_user 1 32308 _000648_hash NULL
84953 +_000649_hash vol_cdev_direct_write 3 20751 _000649_hash NULL
84954 +_000650_hash vp_request_msix_vectors 2 28849 _000650_hash NULL
84955 +_000651_hash vring_add_indirect 3-4 20737 _000651_hash NULL
84956 +_000653_hash vring_new_virtqueue 1 9671 _000653_hash NULL
84957 +_000654_hash vxge_os_dma_malloc 2 46184 _000654_hash NULL
84958 +_000655_hash vxge_os_dma_malloc_async 3 56348 _000655_hash NULL
84959 +_000656_hash wdm_write 3 53735 _000656_hash NULL
84960 +_000657_hash wiimote_hid_send 3 48528 _000657_hash NULL
84961 +_000658_hash wlc_phy_loadsampletable_nphy 3 64367 _000658_hash NULL
84962 +_000659_hash write 3 62671 _000659_hash NULL
84963 +_000660_hash write_flush 3 50803 _000660_hash NULL
84964 +_000661_hash write_rio 3 54837 _000661_hash NULL
84965 +_000662_hash x25_asy_change_mtu 2 26928 _000662_hash NULL
84966 +_000663_hash xdi_copy_from_user 4 8395 _000663_hash NULL
84967 +_000664_hash xfrm_dst_alloc_copy 3 3034 _000664_hash NULL
84968 +_000665_hash xfrm_user_policy 4 62573 _000665_hash NULL
84969 +_000666_hash xfs_attrmulti_attr_set 4 59346 _000666_hash NULL
84970 +_000667_hash xfs_handle_to_dentry 3 12135 _000667_hash NULL
84971 +_000668_hash xip_file_read 3 58592 _000668_hash NULL
84972 +_000669_hash __xip_file_write 3-4 2733 _000669_hash NULL
84973 +_000671_hash xprt_rdma_allocate 2 31372 _000671_hash NULL
84974 +_000672_hash zd_usb_iowrite16v_async 3 23984 _000672_hash NULL
84975 +_000673_hash zd_usb_read_fw 4 22049 _000673_hash NULL
84976 +_000674_hash zerocopy_sg_from_iovec 3 11828 _000674_hash NULL
84977 +_000675_hash __a2mp_build 3 60987 _000675_hash NULL
84978 +_000677_hash acpi_ex_allocate_name_string 2-1 7685 _001169_hash NULL nohasharray
84979 +_000678_hash acpi_os_allocate_zeroed 1 37422 _000678_hash NULL
84980 +_000679_hash acpi_ut_initialize_buffer 2 47143 _002830_hash NULL nohasharray
84981 +_000680_hash ad7879_spi_xfer 3 36311 _000680_hash NULL
84982 +_000681_hash add_new_gdb 3 27643 _000681_hash NULL
84983 +_000682_hash add_numbered_child 5 14273 _000682_hash NULL
84984 +_000683_hash add_res_range 4 21310 _000683_hash NULL
84985 +_000684_hash addtgt 3 54703 _000684_hash NULL
84986 +_000685_hash add_uuid 4 49831 _000685_hash NULL
84987 +_000686_hash afs_cell_alloc 2 24052 _000686_hash NULL
84988 +_000687_hash aggr_recv_addba_req_evt 4 38037 _000687_hash NULL
84989 +_000688_hash agp_create_memory 1 1075 _000688_hash NULL
84990 +_000689_hash agp_create_user_memory 1 62955 _000689_hash NULL
84991 +_000690_hash alg_setsockopt 5 20985 _000690_hash NULL
84992 +_000691_hash alloc_async 1 14208 _000691_hash NULL
84993 +_000692_hash ___alloc_bootmem_nopanic 1 53626 _000692_hash NULL
84994 +_000693_hash alloc_buf 1 34532 _000693_hash NULL
84995 +_000694_hash alloc_chunk 1 49575 _000694_hash NULL
84996 +_000695_hash alloc_context 1 41283 _000695_hash NULL
84997 +_000696_hash alloc_ctrl_packet 1 44667 _000696_hash NULL
84998 +_000697_hash alloc_data_packet 1 46698 _000697_hash NULL
84999 +_000698_hash alloc_dca_provider 2 59670 _000698_hash NULL
85000 +_000699_hash __alloc_dev_table 2 54343 _000699_hash NULL
85001 +_000700_hash alloc_ep 1 17269 _000700_hash NULL
85002 +_000701_hash __alloc_extent_buffer 3 15093 _000701_hash NULL
85003 +_000702_hash alloc_group_attrs 2 9194 _000727_hash NULL nohasharray
85004 +_000703_hash alloc_large_system_hash 2 22391 _000703_hash NULL
85005 +_000704_hash alloc_netdev_mqs 1 30030 _000704_hash NULL
85006 +_000705_hash __alloc_objio_seg 1 7203 _000705_hash NULL
85007 +_000706_hash alloc_ring 2-4 15345 _000706_hash NULL
85008 +_000707_hash alloc_ring 2-4 39151 _000707_hash NULL
85009 +_000710_hash alloc_session 1-2 64171 _000710_hash NULL
85010 +_000714_hash alloc_skb 1 55439 _000714_hash NULL
85011 +_000715_hash alloc_skb_fclone 1 3467 _000715_hash NULL
85012 +_000716_hash alloc_smp_req 1 51337 _000716_hash NULL
85013 +_000717_hash alloc_smp_resp 1 3566 _000717_hash NULL
85014 +_000718_hash alloc_ts_config 1 45775 _000718_hash NULL
85015 +_000719_hash alloc_upcall 2 62186 _000719_hash NULL
85016 +_000720_hash altera_drscan 2 48698 _000720_hash NULL
85017 +_000721_hash altera_irscan 2 62396 _000721_hash NULL
85018 +_000722_hash altera_set_dr_post 2 54291 _000722_hash NULL
85019 +_000723_hash altera_set_dr_pre 2 64862 _000723_hash NULL
85020 +_000724_hash altera_set_ir_post 2 20948 _000724_hash NULL
85021 +_000725_hash altera_set_ir_pre 2 54103 _000725_hash NULL
85022 +_000726_hash altera_swap_dr 2 50090 _000726_hash NULL
85023 +_000727_hash altera_swap_ir 2 9194 _000727_hash &_000702_hash
85024 +_000728_hash amd_create_gatt_pages 1 20537 _000728_hash NULL
85025 +_000729_hash aoechr_write 3 62883 _003674_hash NULL nohasharray
85026 +_000730_hash applesmc_create_nodes 2 49392 _000730_hash NULL
85027 +_000731_hash array_zalloc 1-2 7519 _000731_hash NULL
85028 +_000733_hash arvo_sysfs_read 6 31617 _000733_hash NULL
85029 +_000734_hash arvo_sysfs_write 6 3311 _000734_hash NULL
85030 +_000735_hash asd_store_update_bios 4 10165 _000735_hash NULL
85031 +_000736_hash ata_host_alloc 2 46094 _000736_hash NULL
85032 +_000737_hash atalk_sendmsg 4 21677 _000737_hash NULL
85033 +_000738_hash ath6kl_cfg80211_connect_event 7-9-8 13443 _000738_hash NULL
85034 +_000739_hash ath6kl_mgmt_tx 9 21153 _000739_hash NULL
85035 +_000740_hash ath6kl_wmi_proc_events_vif 5 42549 _003190_hash NULL nohasharray
85036 +_000741_hash ath6kl_wmi_roam_tbl_event_rx 3 43440 _000741_hash NULL
85037 +_000742_hash ath6kl_wmi_send_mgmt_cmd 7 17347 _000742_hash NULL
85038 +_000743_hash ath_descdma_setup 5 12257 _000743_hash NULL
85039 +_000744_hash ath_rx_edma_init 2 65483 _000744_hash NULL
85040 +_000745_hash ati_create_gatt_pages 1 4722 _003275_hash NULL nohasharray
85041 +_000746_hash audit_expand 2 2098 _000746_hash NULL
85042 +_000747_hash audit_init_entry 1 38644 _000747_hash NULL
85043 +_000748_hash ax25_sendmsg 4 62770 _000748_hash NULL
85044 +_000749_hash b1_alloc_card 1 36155 _000749_hash NULL
85045 +_000750_hash b43_nphy_load_samples 3 36481 _000750_hash NULL
85046 +_000751_hash batadv_orig_hash_add_if 2 10033 _000751_hash NULL
85047 +_000752_hash batadv_orig_hash_del_if 2 48972 _000752_hash NULL
85048 +_000753_hash batadv_tt_append_diff 4 20588 _000753_hash NULL
85049 +_000754_hash batadv_tt_commit_changes 4 2008 _000754_hash NULL
85050 +_000755_hash batadv_tt_prepare_packet_buff 4 1280 _000755_hash NULL
85051 +_000756_hash bio_copy_user_iov 4 37660 _000756_hash NULL
85052 +_000757_hash __bio_map_kern 3 47379 _000757_hash NULL
85053 +_000758_hash bitmap_resize 2 33054 _000758_hash NULL
85054 +_000759_hash blk_check_plugged 3 50736 _000759_hash NULL
85055 +_000760_hash blk_register_region 1-2 51424 _000760_hash NULL
85056 +_000762_hash bm_entry_write 3 28338 _000762_hash NULL
85057 +_000763_hash bm_realloc_pages 2 9431 _000763_hash NULL
85058 +_000764_hash bm_register_write 3 9893 _000764_hash &_000579_hash
85059 +_000765_hash bm_status_write 3 12964 _000765_hash NULL
85060 +_000766_hash br_mdb_rehash 2 42643 _000766_hash NULL
85061 +_000767_hash btmrvl_sdio_host_to_card 3 12152 _000767_hash NULL
85062 +_000768_hash btrfs_copy_from_user 1-3 43806 _000768_hash NULL
85063 +_000770_hash btrfs_insert_delayed_dir_index 4 63720 _000770_hash NULL
85064 +_000771_hash __btrfs_map_block 3 49839 _000771_hash NULL
85065 +_000772_hash c4iw_init_resource 2-3 30393 _000772_hash NULL
85066 +_000774_hash cache_downcall 3 13666 _000774_hash NULL
85067 +_000775_hash cache_slow_downcall 2 8570 _000775_hash NULL
85068 +_000776_hash caif_seqpkt_sendmsg 4 22961 _000776_hash NULL
85069 +_000777_hash caif_stream_sendmsg 4 9110 _000777_hash NULL
85070 +_000778_hash carl9170_cmd_buf 3 950 _000778_hash NULL
85071 +_000779_hash cdev_add 2-3 38176 _000779_hash NULL
85072 +_000781_hash cdrom_read_cdda 4 50478 _000781_hash NULL
85073 +_000782_hash ceph_dns_resolve_name 2 62488 _000782_hash NULL
85074 +_000783_hash ceph_msgpool_get 2 54258 _000783_hash NULL
85075 +_000784_hash cfg80211_connect_result 4-6 56515 _000784_hash NULL
85076 +_000786_hash cfg80211_disconnected 4 57 _000786_hash NULL
85077 +_000787_hash cfg80211_inform_bss 8 19332 _000787_hash NULL
85078 +_000788_hash cfg80211_inform_bss_frame 4 41078 _000788_hash NULL
85079 +_000789_hash cfg80211_mlme_register_mgmt 5 19852 _000789_hash NULL
85080 +_000790_hash cfg80211_roamed_bss 4-6 50198 _000790_hash NULL
85081 +_000792_hash cgroup_file_write 3 52417 _000792_hash NULL
85082 +_000793_hash cifs_readdata_alloc 1 26360 _000793_hash NULL
85083 +_000794_hash cifs_readv_from_socket 3 19109 _000794_hash NULL
85084 +_000795_hash cifs_writedata_alloc 1 32880 _003097_hash NULL nohasharray
85085 +_000796_hash cnic_alloc_dma 3 34641 _000796_hash NULL
85086 +_000797_hash cnic_init_id_tbl 2 41354 _000797_hash NULL
85087 +_000798_hash configfs_write_file 3 61621 _000798_hash NULL
85088 +_000799_hash construct_key 3 11329 _000799_hash NULL
85089 +_000800_hash context_alloc 3 24645 _000800_hash NULL
85090 +_000801_hash copy_to_user 3 57835 _000801_hash NULL
85091 +_000802_hash cp210x_get_config 4 56229 _000802_hash NULL
85092 +_000803_hash create_attr_set 1 22861 _000803_hash NULL
85093 +_000804_hash create_bounce_buffer 3 39155 _000804_hash NULL
85094 +_000805_hash create_gpadl_header 2 19064 _000805_hash NULL
85095 +_000806_hash _create_sg_bios 4 31244 _000806_hash NULL
85096 +_000807_hash cryptd_alloc_instance 2-3 18048 _000807_hash NULL
85097 +_000809_hash crypto_ahash_setkey 3 55134 _000809_hash NULL
85098 +_000810_hash crypto_alloc_instance2 3 25277 _000810_hash NULL
85099 +_000811_hash crypto_shash_setkey 3 60483 _000811_hash NULL
85100 +_000812_hash cxgb_alloc_mem 1 24007 _000812_hash NULL
85101 +_000813_hash cxgbi_device_portmap_create 3 25747 _000813_hash NULL
85102 +_000814_hash cxgbi_device_register 1-2 36746 _000814_hash NULL
85103 +_000816_hash __cxio_init_resource_fifo 3 23447 _000816_hash NULL
85104 +_000817_hash dccp_sendmsg 4 56058 _000817_hash NULL
85105 +_000818_hash ddp_make_gl 1 12179 _000818_hash NULL
85106 +_000819_hash depth_write 3 3021 _000819_hash NULL
85107 +_000820_hash dev_irnet_write 3 11398 _000820_hash NULL
85108 +_000821_hash dev_set_alias 3 50084 _000821_hash NULL
85109 +_000822_hash dev_write 3 7708 _000822_hash NULL
85110 +_000823_hash dfs_global_file_write 3 6112 _000823_hash NULL
85111 +_000824_hash dgram_sendmsg 4 45679 _000824_hash NULL
85112 +_000825_hash disconnect 4 32521 _000825_hash NULL
85113 +_000826_hash dma_attach 6-7 50831 _000826_hash NULL
85114 +_000828_hash dma_declare_coherent_memory 4-2 14244 _000828_hash NULL
85115 +_000829_hash dn_sendmsg 4 38390 _000829_hash NULL
85116 +_000830_hash dn_setsockopt 5 314 _000830_hash NULL
85117 +_000831_hash do_arpt_set_ctl 4 51053 _000831_hash NULL
85118 +_000832_hash do_dccp_setsockopt 5 54377 _003195_hash NULL nohasharray
85119 +_000833_hash do_ip6t_set_ctl 4 60040 _000833_hash NULL
85120 +_000834_hash do_ipt_set_ctl 4 56238 _000834_hash NULL
85121 +_000835_hash do_jffs2_setxattr 5 25910 _000835_hash NULL
85122 +_000836_hash do_msgsnd 4 1387 _000836_hash NULL
85123 +_000837_hash do_pselect 1 62061 _000837_hash NULL
85124 +_000838_hash do_raw_setsockopt 5 55215 _000838_hash NULL
85125 +_000839_hash do_readv_writev 4 51849 _000839_hash NULL
85126 +_000840_hash do_sync 1 9604 _000840_hash NULL
85127 +_000841_hash dup_array 3 33551 _000841_hash NULL
85128 +_000842_hash ecryptfs_decode_and_decrypt_filename 5 10379 _000842_hash NULL
85129 +_000843_hash ecryptfs_encrypt_and_encode_filename 6 2109 _000843_hash NULL
85130 +_000844_hash ecryptfs_send_message_locked 2 31801 _000844_hash NULL
85131 +_000845_hash edac_device_alloc_ctl_info 1 5941 _000845_hash NULL
85132 +_000846_hash edac_mc_alloc 4 3611 _000846_hash NULL
85133 +_000847_hash edac_pci_alloc_ctl_info 1 63388 _000847_hash NULL
85134 +_000848_hash efivar_create_sysfs_entry 2 19485 _000848_hash NULL
85135 +_000849_hash enable_write 3 30456 _000849_hash NULL
85136 +_000850_hash enclosure_register 3 57412 _000850_hash NULL
85137 +_000851_hash enlarge_skb 2 44248 _002839_hash NULL nohasharray
85138 +_000852_hash evdev_ioctl_handler 2 21705 _000852_hash NULL
85139 +_000853_hash ext4_kvzalloc 1 47605 _000853_hash NULL
85140 +_000854_hash extend_netdev_table 2 21453 _000854_hash NULL
85141 +_000855_hash fcoe_ctlr_device_add 3 1793 _000855_hash NULL
85142 +_000856_hash fd_do_readv 3 51297 _000856_hash NULL
85143 +_000857_hash fd_do_writev 3 29329 _000857_hash NULL
85144 +_000858_hash __feat_register_sp 6 64712 _000858_hash NULL
85145 +_000859_hash __ffs_ep0_read_events 3 48868 _000859_hash NULL
85146 +_000860_hash ffs_ep0_write 3 9438 _000860_hash NULL
85147 +_000861_hash ffs_epfile_read 3 18775 _000861_hash NULL
85148 +_000862_hash ffs_epfile_write 3 48014 _000862_hash NULL
85149 +_000863_hash fib_info_hash_alloc 1 9075 _000863_hash NULL
85150 +_000864_hash fillonedir 3 41746 _000864_hash NULL
85151 +_000865_hash fs_devrw_entry 3 11924 _000865_hash NULL
85152 +_000866_hash fs_path_prepare_for_add 2 61854 _000866_hash NULL
85153 +_000867_hash fuse_fill_write_pages 4 53682 _000867_hash NULL
85154 +_000868_hash fw_device_op_ioctl 2 11595 _000868_hash NULL
85155 +_000869_hash fw_iso_buffer_init 3 54582 _000869_hash NULL
85156 +_000870_hash fw_node_create 2 9559 _000870_hash NULL
85157 +_000871_hash garmin_read_process 3 27509 _000871_hash NULL
85158 +_000872_hash garp_request_join 4 7471 _000872_hash NULL
85159 +_000873_hash generic_perform_write 3 54832 _000873_hash NULL
85160 +_000874_hash gen_pool_add_virt 4 39913 _000874_hash NULL
85161 +_000875_hash get_derived_key 4 61100 _000875_hash NULL
85162 +_000876_hash get_new_cssid 2 51665 _000876_hash NULL
85163 +_000877_hash getxattr 4 24398 _003758_hash NULL nohasharray
85164 +_000878_hash gsm_control_reply 4 53333 _000878_hash NULL
85165 +_000879_hash hcd_alloc_coherent 5 55862 _000879_hash NULL
85166 +_000880_hash hci_sock_sendmsg 4 37420 _000880_hash NULL
85167 +_000881_hash hidraw_ioctl 2 63658 _000881_hash NULL
85168 +_000882_hash hidraw_write 3 31536 _000882_hash NULL
85169 +_000883_hash hid_register_field 2-3 4874 _000883_hash NULL
85170 +_000885_hash hid_report_raw_event 4 2762 _000885_hash NULL
85171 +_000886_hash hpi_alloc_control_cache 1 35351 _000886_hash NULL
85172 +_000887_hash hugetlbfs_read_actor 2-5-4 34547 _000887_hash NULL
85173 +_000890_hash hvc_alloc 4 12579 _000890_hash NULL
85174 +_000891_hash __hwahc_dev_set_key 5 46328 _000891_hash NULL
85175 +_000892_hash i2400m_zrealloc_2x 3 54166 _001549_hash NULL nohasharray
85176 +_000893_hash ib_alloc_device 1 26483 _000893_hash NULL
85177 +_000894_hash ib_create_send_mad 5 1196 _000894_hash NULL
85178 +_000895_hash ibmasm_new_command 2 25714 _000895_hash NULL
85179 +_000896_hash ib_send_cm_drep 3 50186 _000896_hash NULL
85180 +_000897_hash ib_send_cm_mra 4 60202 _003063_hash NULL nohasharray
85181 +_000898_hash ib_send_cm_rtu 3 63138 _000898_hash NULL
85182 +_000899_hash ide_core_cp_entry 3 22636 _000899_hash NULL
85183 +_000900_hash ieee80211_if_write_smps 3 35550 _000900_hash NULL
85184 +_000901_hash ieee80211_if_write_tkip_mic_test 3 58748 _000901_hash NULL
85185 +_000902_hash ieee80211_if_write_tsf 3 36077 _000902_hash NULL
85186 +_000903_hash ieee80211_if_write_uapsd_max_sp_len 3 14233 _000903_hash NULL
85187 +_000904_hash ieee80211_if_write_uapsd_queues 3 51526 _000904_hash NULL
85188 +_000905_hash ieee80211_key_alloc 3 19065 _000905_hash NULL
85189 +_000906_hash ieee80211_send_probe_req 6-4 6924 _000906_hash NULL
85190 +_000907_hash ieee80211_skb_resize 3 50211 _000907_hash NULL
85191 +_000908_hash if_spi_host_to_card 4 62890 _000908_hash NULL
85192 +_000909_hash if_writecmd 2 815 _000909_hash NULL
85193 +_000910_hash init_bch 1-2 64130 _000910_hash NULL
85194 +_000912_hash init_ipath 1 48187 _000912_hash NULL
85195 +_000913_hash init_list_set 2-3 39188 _000913_hash NULL
85196 +_000915_hash init_q 4 132 _000915_hash NULL
85197 +_000916_hash init_state 2 60165 _000916_hash NULL
85198 +_000917_hash init_tag_map 3 57515 _000917_hash NULL
85199 +_000918_hash input_ff_create 2 21240 _000918_hash NULL
85200 +_000919_hash input_mt_init_slots 2 31183 _000919_hash NULL
85201 +_000920_hash interfaces 2 38859 _000920_hash NULL
85202 +_000921_hash int_hardware_entry 3 36833 _000921_hash NULL
85203 +_000922_hash int_hw_irq_en 3 46776 _000922_hash NULL
85204 +_000923_hash int_tasklet_entry 3 52500 _000923_hash NULL
85205 +_000924_hash ioat2_alloc_ring 2 11172 _000924_hash NULL
85206 +_000925_hash ip_generic_getfrag 3-4 12187 _000925_hash NULL
85207 +_000927_hash ip_options_get_alloc 1 7448 _000927_hash NULL
85208 +_000928_hash ipr_alloc_ucode_buffer 1 40199 _000928_hash NULL
85209 +_000929_hash ip_set_alloc 1 57953 _000929_hash NULL
85210 +_000930_hash ip_setsockopt 5 33487 _000930_hash NULL
85211 +_000931_hash ipv6_flowlabel_opt 3 58135 _001179_hash NULL nohasharray
85212 +_000932_hash ipv6_renew_options 5 28867 _000932_hash NULL
85213 +_000933_hash ipv6_setsockopt 5 29871 _000933_hash NULL
85214 +_000934_hash ipxrtr_route_packet 4 54036 _000934_hash NULL
85215 +_000935_hash irda_sendmsg 4 4388 _000935_hash NULL
85216 +_000936_hash irda_sendmsg_dgram 4 38563 _000936_hash NULL
85217 +_000937_hash irda_sendmsg_ultra 4 42047 _000937_hash NULL
85218 +_000938_hash irias_add_octseq_attrib 4 29983 _000938_hash NULL
85219 +_000939_hash irq_alloc_generic_chip 2 26650 _000939_hash NULL
85220 +_000940_hash iscsi_alloc_session 3 49390 _000940_hash NULL
85221 +_000941_hash iscsi_create_conn 2 50425 _000941_hash NULL
85222 +_000942_hash iscsi_create_endpoint 1 15193 _000942_hash NULL
85223 +_000943_hash iscsi_create_iface 5 38510 _000943_hash NULL
85224 +_000944_hash iscsi_decode_text_input 4 58292 _000944_hash NULL
85225 +_000945_hash iscsi_pool_init 2-4 54913 _000945_hash NULL
85226 +_000947_hash iscsit_dump_data_payload 2 38683 _000947_hash NULL
85227 +_000948_hash isdn_write 3 45863 _000948_hash NULL
85228 +_000949_hash isku_receive 4 54130 _000949_hash NULL
85229 +_000950_hash islpci_mgt_transaction 5 23610 _000950_hash NULL
85230 +_000951_hash iso_alloc_urb 4-5 45206 _000951_hash NULL
85231 +_000952_hash iso_sched_alloc 1 13377 _003325_hash NULL nohasharray
85232 +_000953_hash iwl_trans_txq_alloc 3 36147 _000953_hash NULL
85233 +_000954_hash ixgbe_alloc_q_vector 4-6 24439 _000954_hash NULL
85234 +_000956_hash jbd2_journal_init_revoke 2 51088 _000956_hash NULL
85235 +_000957_hash jffs2_write_dirent 5 37311 _000957_hash NULL
85236 +_000958_hash journal_init_revoke 2 56933 _000958_hash NULL
85237 +_000959_hash keyctl_instantiate_key 3 41855 _000959_hash NULL
85238 +_000960_hash keyctl_instantiate_key_iov 3 16969 _000960_hash NULL
85239 +_000961_hash __kfifo_from_user 3 20399 _000961_hash NULL
85240 +_000962_hash kimage_crash_alloc 3 3233 _000962_hash NULL
85241 +_000963_hash kimage_normal_alloc 3 31140 _000963_hash NULL
85242 +_000964_hash kmem_realloc 2 37489 _000964_hash NULL
85243 +_000965_hash kmem_zalloc 1 11510 _000965_hash NULL
85244 +_000966_hash koneplus_sysfs_read 6 42792 _000966_hash NULL
85245 +_000967_hash kvm_kvzalloc 1 52894 _000967_hash NULL
85246 +_000968_hash kvm_read_guest_page_mmu 6 37611 _000968_hash NULL
85247 +_000969_hash kvm_set_irq_routing 3 48704 _000969_hash NULL
85248 +_000970_hash kvm_write_guest_cached 4 11106 _000970_hash NULL
85249 +_000971_hash kvm_write_guest_page 5 63555 _002812_hash NULL nohasharray
85250 +_000972_hash kzalloc_node 1 24352 _000972_hash NULL
85251 +_000973_hash l2cap_skbuff_fromiovec 3-4 35003 _000973_hash NULL
85252 +_000975_hash l2tp_ip_sendmsg 4 50411 _000975_hash NULL
85253 +_000976_hash l2tp_session_create 1 25286 _000976_hash NULL
85254 +_000977_hash lc_create 3 48662 _000977_hash NULL
85255 +_000978_hash leaf_dealloc 3 29566 _000978_hash NULL
85256 +_000979_hash linear_conf 2 23485 _003837_hash NULL nohasharray
85257 +_000980_hash llc_ui_sendmsg 4 24987 _000980_hash NULL
85258 +_000981_hash load_module 2 60056 _003010_hash NULL nohasharray
85259 +_000982_hash lpfc_sli4_queue_alloc 3 62646 _000982_hash NULL
85260 +_000983_hash mdiobus_alloc_size 1 52259 _000983_hash NULL
85261 +_000984_hash mempool_create_node 1 3191 _000984_hash NULL
85262 +_000985_hash mem_read 3 57631 _000985_hash NULL
85263 +_000986_hash memstick_alloc_host 1 142 _000986_hash NULL
85264 +_000987_hash mem_swapout_entry 3 32586 _000987_hash NULL
85265 +_000988_hash mem_write 3 22232 _000988_hash NULL
85266 +_000989_hash mesh_table_alloc 1 22305 _000989_hash NULL
85267 +_000990_hash mfd_add_devices 4 16668 _000990_hash NULL
85268 +_000991_hash mISDN_sock_sendmsg 4 41035 _000991_hash NULL
85269 +_000992_hash mlx4_init_icm_table 4-5 2151 _000992_hash NULL
85270 +_000994_hash mmc_alloc_host 1 48097 _000994_hash NULL
85271 +_000995_hash mmc_test_alloc_mem 2-3 28102 _000995_hash NULL
85272 +_000997_hash mon_bin_ioctl 3 2771 _000997_hash NULL
85273 +_000998_hash mpi_alloc 1 18094 _000998_hash NULL
85274 +_000999_hash mpihelp_mul_karatsuba_case 5-3 23918 _003061_hash NULL nohasharray
85275 +_001000_hash __mptctl_ioctl 2 15875 _001000_hash NULL
85276 +_001001_hash mtd_concat_create 2 14416 _001001_hash NULL
85277 +_001002_hash mthca_alloc_cq_buf 3 46512 _001002_hash NULL
85278 +_001003_hash mvumi_alloc_mem_resource 3 47750 _001003_hash NULL
85279 +_001004_hash mwifiex_11n_create_rx_reorder_tbl 4 63806 _001004_hash NULL
85280 +_001005_hash mwifiex_alloc_sdio_mpa_buffers 2-3 60961 _001005_hash NULL
85281 +_001007_hash mwl8k_cmd_set_beacon 4 23110 _001007_hash NULL
85282 +_001008_hash neigh_hash_alloc 1 17595 _001008_hash NULL
85283 +_001009_hash __netdev_alloc_skb 2 18595 _001009_hash NULL
85284 +_001010_hash __netlink_change_ngroups 2 46156 _001010_hash NULL
85285 +_001011_hash netlink_sendmsg 4 33708 _001236_hash NULL nohasharray
85286 +_001012_hash netxen_alloc_sds_rings 2 13417 _001012_hash NULL
85287 +_001013_hash new_bind_ctl 2 35324 _001013_hash NULL
85288 +_001014_hash new_dir 3 31919 _001014_hash NULL
85289 +_001015_hash new_tape_buffer 2 32866 _001015_hash NULL
85290 +_001016_hash nfc_llcp_build_tlv 3 19536 _001016_hash NULL
85291 +_001017_hash nfc_llcp_send_i_frame 3 59130 _001017_hash NULL
85292 +_001018_hash nf_ct_ext_create 3 51232 _001018_hash NULL
85293 +_001019_hash nfs4_alloc_pages 1 48426 _001019_hash NULL
85294 +_001020_hash nfs4_alloc_slots 1 2454 _003345_hash NULL nohasharray
85295 +_001021_hash nfsctl_transaction_write 3 64800 _001021_hash NULL
85296 +_001022_hash nfs_fscache_get_super_cookie 3 44355 _001850_hash NULL nohasharray
85297 +_001023_hash nfs_idmap_request_key 3 30208 _001023_hash NULL
85298 +_001024_hash nfs_pgarray_set 2 1085 _001024_hash NULL
85299 +_001025_hash nl_pid_hash_zalloc 1 23314 _001025_hash NULL
85300 +_001026_hash nr_sendmsg 4 53656 _001026_hash NULL
85301 +_001027_hash nsm_create_handle 4 38060 _001027_hash NULL
85302 +_001028_hash ntfs_copy_from_user_iovec 3-6 49829 _001028_hash NULL
85303 +_001030_hash ntfs_file_buffered_write 4-6 41442 _001030_hash NULL
85304 +_001032_hash __ntfs_malloc 1 34022 _001032_hash NULL
85305 +_001033_hash nvme_alloc_queue 3 46865 _001033_hash NULL
85306 +_001034_hash nvme_map_user_pages 3-4 41093 _001639_hash NULL nohasharray
85307 +_001036_hash ocfs2_acl_from_xattr 2 21604 _001036_hash NULL
85308 +_001037_hash ocfs2_control_message 3 19564 _001037_hash NULL
85309 +_001038_hash _ore_get_io_state 3-5-4 2166 _001038_hash NULL
85310 +_001041_hash orinoco_set_key 5-7 17878 _001041_hash NULL
85311 +_001043_hash osdmap_set_max_osd 2 57630 _002267_hash NULL nohasharray
85312 +_001044_hash _osd_realloc_seg 3 54352 _001044_hash NULL
85313 +_001045_hash osst_execute 7-6 17607 _001045_hash NULL
85314 +_001046_hash osst_write 3 31581 _001046_hash NULL
85315 +_001047_hash otp_read 2-5-4 10594 _001047_hash NULL
85316 +_001050_hash ovs_vport_alloc 1 33475 _001050_hash NULL
85317 +_001051_hash p54_parse_rssical 3 64493 _001051_hash NULL
85318 +_001052_hash p9_client_zc_rpc 7 14345 _001052_hash NULL
85319 +_001053_hash packet_sendmsg_spkt 4 28885 _001053_hash NULL
85320 +_001054_hash pair_device 4 61175 _003161_hash NULL nohasharray
85321 +_001055_hash pccard_store_cis 6 18176 _001055_hash NULL
85322 +_001056_hash pci_add_cap_save_buffer 3 3426 _001056_hash NULL
85323 +_001057_hash pcnet32_realloc_rx_ring 3 36598 _001057_hash NULL
85324 +_001058_hash pcnet32_realloc_tx_ring 3 38428 _001058_hash NULL
85325 +_001059_hash pcpu_mem_zalloc 1 22948 _001059_hash NULL
85326 +_001060_hash pep_sendmsg 4 62524 _001060_hash NULL
85327 +_001061_hash pfkey_sendmsg 4 47394 _001061_hash NULL
85328 +_001062_hash pidlist_resize 2 496 _001062_hash NULL
85329 +_001063_hash pin_code_reply 4 46510 _001063_hash NULL
85330 +_001064_hash ping_getfrag 3-4 8360 _001064_hash NULL
85331 +_001066_hash pipe_set_size 2 5204 _001066_hash NULL
85332 +_001067_hash pkt_bio_alloc 1 48284 _001067_hash NULL
85333 +_001068_hash platform_create_bundle 4-6 12785 _001068_hash NULL
85334 +_001070_hash pm8001_store_update_fw 4 55716 _001070_hash NULL
85335 +_001071_hash pmcraid_alloc_sglist 1 9864 _001071_hash NULL
85336 +_001072_hash pn533_dep_link_up 5 22154 _001072_hash NULL
85337 +_001073_hash pn533_init_target_frame 3 65438 _001073_hash NULL
85338 +_001074_hash pnp_alloc 1 24869 _001538_hash NULL nohasharray
85339 +_001075_hash pn_sendmsg 4 12640 _001075_hash NULL
85340 +_001076_hash pppoe_sendmsg 4 48039 _001076_hash NULL
85341 +_001077_hash pppol2tp_sendmsg 4 56420 _001077_hash NULL
85342 +_001078_hash prism2_info_hostscanresults 3 39657 _001078_hash NULL
85343 +_001079_hash process_vm_rw 3-5 47533 _001079_hash NULL
85344 +_001081_hash process_vm_rw_single_vec 1-2 26213 _001081_hash NULL
85345 +_001083_hash proc_write 3 51003 _001083_hash NULL
85346 +_001084_hash profile_load 3 58267 _001084_hash NULL
85347 +_001085_hash profile_remove 3 8556 _001085_hash NULL
85348 +_001086_hash profile_replace 3 14652 _001086_hash NULL
85349 +_001087_hash pscsi_get_bio 1 56103 _001087_hash NULL
85350 +_001088_hash __pskb_copy 2 9038 _001088_hash NULL
85351 +_001089_hash __pskb_pull_tail 2 60287 _001089_hash NULL
85352 +_001090_hash qla4xxx_alloc_work 2 44813 _001090_hash NULL
85353 +_001091_hash qlcnic_alloc_msix_entries 2 46160 _001091_hash NULL
85354 +_001092_hash qlcnic_alloc_sds_rings 2 26795 _001092_hash NULL
85355 +_001093_hash queue_received_packet 5 9657 _001093_hash NULL
85356 +_001094_hash raw_send_hdrinc 4 58803 _001094_hash NULL
85357 +_001095_hash raw_sendmsg 4 23078 _003316_hash NULL nohasharray
85358 +_001096_hash rawsock_sendmsg 4 60010 _001096_hash NULL
85359 +_001097_hash rawv6_send_hdrinc 3 35425 _001097_hash NULL
85360 +_001098_hash rawv6_setsockopt 5 56165 _001098_hash NULL
85361 +_001099_hash rb_alloc 1 3102 _001099_hash NULL
85362 +_001100_hash rbd_alloc_coll 1 33678 _001100_hash NULL
85363 +_001101_hash rbd_create_rw_ops 1 55297 _001101_hash NULL
85364 +_001102_hash rds_ib_inc_copy_to_user 3 55007 _001102_hash NULL
85365 +_001103_hash rds_iw_inc_copy_to_user 3 29214 _001103_hash NULL
85366 +_001104_hash rds_message_alloc 1 10517 _001104_hash NULL
85367 +_001105_hash rds_message_copy_from_user 3 45510 _001105_hash NULL
85368 +_001106_hash rds_message_inc_copy_to_user 3 26540 _001106_hash NULL
85369 +_001107_hash regcache_rbtree_insert_to_block 5 58009 _001107_hash NULL
85370 +_001108_hash _regmap_raw_write 4 42652 _001108_hash NULL
85371 +_001109_hash regmap_register_patch 3 21681 _001109_hash NULL
85372 +_001110_hash relay_alloc_page_array 1 52735 _001110_hash NULL
85373 +_001111_hash remove_uuid 4 64505 _001111_hash NULL
85374 +_001112_hash reshape_ring 2 29147 _001112_hash NULL
85375 +_001113_hash RESIZE_IF_NEEDED 2 56286 _001113_hash NULL
85376 +_001114_hash resize_info_buffer 2 62889 _001114_hash NULL
85377 +_001115_hash resize_stripes 2 61650 _001115_hash NULL
85378 +_001116_hash rfcomm_sock_sendmsg 4 37661 _003661_hash NULL nohasharray
85379 +_001117_hash roccat_common2_send_with_status 4 50343 _001117_hash NULL
85380 +_001118_hash rose_sendmsg 4 20249 _001118_hash NULL
85381 +_001119_hash rsc_mgr_init 3 16299 _001119_hash NULL
85382 +_001120_hash rxrpc_send_data 5 21553 _001120_hash NULL
85383 +_001121_hash rxrpc_setsockopt 5 50286 _001121_hash NULL
85384 +_001122_hash savu_sysfs_read 6 49473 _001122_hash NULL
85385 +_001124_hash sco_send_frame 3 41815 _001124_hash NULL
85386 +_001125_hash scsi_dispatch_cmd_entry 3 49848 _001125_hash NULL
85387 +_001126_hash scsi_host_alloc 2 63041 _001126_hash NULL
85388 +_001127_hash scsi_tgt_kspace_exec 8 9522 _001127_hash NULL
85389 +_001128_hash sctp_sendmsg 4 61919 _001128_hash NULL
85390 +_001129_hash sctp_setsockopt 5 44788 _001129_hash NULL
85391 +_001130_hash sctp_setsockopt_connectx 3 6073 _001130_hash NULL
85392 +_001131_hash sctp_setsockopt_connectx_old 3 22631 _001131_hash NULL
85393 +_001132_hash sctp_tsnmap_grow 2 32784 _001132_hash NULL
85394 +_001133_hash sctp_tsnmap_init 2 36446 _001133_hash NULL
85395 +_001134_hash sctp_user_addto_chunk 2-3 62047 _001134_hash NULL
85396 +_001136_hash security_context_to_sid 2 19839 _001136_hash NULL
85397 +_001137_hash security_context_to_sid_default 2 3492 _003841_hash NULL nohasharray
85398 +_001138_hash security_context_to_sid_force 2 20724 _001138_hash NULL
85399 +_001139_hash self_check_write 5 50856 _001139_hash NULL
85400 +_001140_hash selinux_transaction_write 3 59038 _001140_hash NULL
85401 +_001141_hash sel_write_access 3 51704 _001141_hash NULL
85402 +_001142_hash sel_write_create 3 11353 _001142_hash NULL
85403 +_001143_hash sel_write_member 3 28800 _001143_hash NULL
85404 +_001144_hash sel_write_relabel 3 55195 _001144_hash NULL
85405 +_001145_hash sel_write_user 3 45060 _001145_hash NULL
85406 +_001146_hash __seq_open_private 3 40715 _001146_hash NULL
85407 +_001147_hash serverworks_create_gatt_pages 1 46582 _001147_hash NULL
85408 +_001148_hash set_connectable 4 56458 _001148_hash NULL
85409 +_001149_hash set_dev_class 4 39645 _001921_hash NULL nohasharray
85410 +_001150_hash set_discoverable 4 48141 _001150_hash NULL
85411 +_001151_hash set_fd_set 1 35249 _001151_hash NULL
85412 +_001152_hash setkey 3 14987 _001152_hash NULL
85413 +_001153_hash set_le 4 30581 _001153_hash NULL
85414 +_001154_hash set_link_security 4 4502 _001154_hash NULL
85415 +_001155_hash set_local_name 4 55757 _001155_hash NULL
85416 +_001156_hash set_powered 4 12129 _001156_hash NULL
85417 +_001157_hash set_ssp 4 62411 _001157_hash NULL
85418 +_001158_hash sg_build_sgat 3 60179 _001158_hash &_000314_hash
85419 +_001159_hash sg_read_oxfer 3 51724 _001159_hash NULL
85420 +_001160_hash shmem_xattr_set 4 11843 _001160_hash NULL
85421 +_001161_hash simple_alloc_urb 3 60420 _001161_hash NULL
85422 +_001162_hash sisusb_send_bridge_packet 2 11649 _001162_hash NULL
85423 +_001163_hash sisusb_send_packet 2 20891 _001163_hash NULL
85424 +_001164_hash sisusb_write_mem_bulk 4 29678 _001164_hash NULL
85425 +_001165_hash skb_add_data_nocache 4 4682 _001165_hash NULL
85426 +_001166_hash skb_copy_datagram_from_iovec 2-5-4 52014 _001166_hash NULL
85427 +_001169_hash skb_copy_expand 2-3 7685 _001169_hash &_000677_hash
85428 +_001171_hash skb_copy_to_page_nocache 6 58624 _001171_hash NULL
85429 +_001172_hash __skb_cow 2 39254 _001172_hash NULL
85430 +_001173_hash skb_cow_data 2 11565 _001173_hash NULL
85431 +_001174_hash skb_pad 2 17302 _001174_hash NULL
85432 +_001175_hash skb_realloc_headroom 2 19516 _001175_hash NULL
85433 +_001176_hash sk_chk_filter 2 42095 _001176_hash NULL
85434 +_001177_hash skcipher_sendmsg 4 30290 _001177_hash NULL
85435 +_001178_hash sl_change_mtu 2 7396 _001178_hash NULL
85436 +_001179_hash slhc_init 1-2 58135 _001179_hash &_000931_hash
85437 +_001181_hash sm501_create_subdev 3-4 48668 _001245_hash NULL nohasharray
85438 +_001183_hash smk_user_access 3 24440 _001183_hash NULL
85439 +_001184_hash smk_write_cipso2 3 1021 _001184_hash NULL
85440 +_001185_hash smk_write_cipso 3 17989 _001185_hash NULL
85441 +_001186_hash smk_write_load2 3 52155 _001186_hash NULL
85442 +_001187_hash smk_write_load 3 26829 _001187_hash NULL
85443 +_001188_hash smk_write_load_self2 3 591 _001188_hash NULL
85444 +_001189_hash smk_write_load_self 3 7958 _001189_hash NULL
85445 +_001190_hash snapshot_write 3 28351 _001190_hash NULL
85446 +_001191_hash snd_ac97_pcm_assign 2 30218 _001191_hash NULL
85447 +_001192_hash snd_card_create 4 64418 _001529_hash NULL nohasharray
85448 +_001193_hash snd_emux_create_port 3 42533 _001193_hash NULL
85449 +_001194_hash snd_gus_dram_write 4 38784 _001194_hash NULL
85450 +_001195_hash snd_midi_channel_alloc_set 1 28153 _001195_hash NULL
85451 +_001196_hash _snd_pcm_lib_alloc_vmalloc_buffer 2 17820 _001196_hash NULL
85452 +_001197_hash snd_pcm_oss_sync1 2 45298 _001197_hash NULL
85453 +_001198_hash snd_pcm_oss_write 3 38108 _001198_hash NULL
85454 +_001199_hash snd_pcm_plugin_build 5 25505 _001199_hash NULL
85455 +_001200_hash snd_rawmidi_kernel_write 3 25106 _001200_hash NULL
85456 +_001201_hash snd_rawmidi_write 3 28008 _001201_hash NULL
85457 +_001202_hash snd_rme32_playback_copy 5 43732 _001202_hash NULL
85458 +_001203_hash snd_rme96_playback_copy 5 13111 _001203_hash NULL
85459 +_001204_hash snd_seq_device_new 4 31753 _001204_hash NULL
85460 +_001205_hash snd_seq_oss_readq_new 2 14283 _001205_hash NULL
85461 +_001206_hash snd_vx_create 4 40948 _001206_hash NULL
85462 +_001207_hash sock_setsockopt 5 50088 _001207_hash NULL
85463 +_001208_hash sound_write 3 5102 _001208_hash NULL
85464 +_001209_hash _sp2d_alloc 1-3-2 16944 _001209_hash NULL
85465 +_001212_hash spi_alloc_master 2 45223 _001212_hash NULL
85466 +_001213_hash spidev_message 3 5518 _001213_hash NULL
85467 +_001214_hash spi_register_board_info 2 35651 _001214_hash NULL
85468 +_001215_hash squashfs_cache_init 2 41656 _001215_hash NULL
85469 +_001216_hash squashfs_read_data 6 59440 _001216_hash NULL
85470 +_001217_hash squashfs_read_fragment_index_table 4 2506 _001217_hash NULL
85471 +_001218_hash squashfs_read_id_index_table 4 61961 _001218_hash NULL
85472 +_001219_hash squashfs_read_inode_lookup_table 4 64739 _001219_hash NULL
85473 +_001220_hash srp_alloc_iu 2 44227 _001220_hash NULL
85474 +_001221_hash srp_iu_pool_alloc 2 17920 _001221_hash NULL
85475 +_001222_hash srp_ring_alloc 2 26760 _001222_hash NULL
85476 +_001226_hash start_isoc_chain 2 565 _001226_hash NULL
85477 +_001227_hash st_write 3 16874 _001227_hash NULL
85478 +_001228_hash svc_pool_map_alloc_arrays 2 47181 _001228_hash NULL
85479 +_001229_hash symtab_init 2 61050 _001229_hash NULL
85480 +_001230_hash sys_bind 3 10799 _001230_hash NULL
85481 +_001231_hash sys_connect 3 15291 _003816_hash NULL nohasharray
85482 +_001232_hash sys_flistxattr 3 41407 _001232_hash NULL
85483 +_001233_hash sys_fsetxattr 4 49736 _001233_hash NULL
85484 +_001234_hash sysfs_write_file 3 57116 _001234_hash NULL
85485 +_001235_hash sys_ipc 3 4889 _001235_hash NULL
85486 +_001236_hash sys_keyctl 4 33708 _001236_hash &_001011_hash
85487 +_001237_hash sys_listxattr 3 27833 _001237_hash NULL
85488 +_001238_hash sys_llistxattr 3 4532 _001238_hash NULL
85489 +_001239_hash sys_lsetxattr 4 61177 _001239_hash NULL
85490 +_001240_hash sys_mq_timedsend 3 57661 _001240_hash NULL
85491 +_001241_hash sys_sched_setaffinity 2 32046 _001241_hash NULL
85492 +_001242_hash sys_select 1 38827 _001242_hash NULL
85493 +_001243_hash sys_semop 3 39457 _001243_hash NULL
85494 +_001244_hash sys_sendto 6 20809 _001244_hash NULL
85495 +_001245_hash sys_setgroups 1 48668 _001245_hash &_001181_hash
85496 +_001246_hash sys_setgroups16 1 48882 _001246_hash NULL
85497 +_001247_hash sys_setxattr 4 37880 _001247_hash NULL
85498 +_001248_hash t4_alloc_mem 1 32342 _001248_hash NULL
85499 +_001249_hash tcf_hash_create 4 54360 _001249_hash NULL
85500 +_001250_hash tcp_send_rcvq 3 11316 _001250_hash NULL
85501 +_001251_hash __team_options_register 3 63941 _001251_hash NULL
85502 +_001252_hash test_unaligned_bulk 3 52333 _001252_hash NULL
85503 +_001253_hash tifm_alloc_adapter 1 10903 _001253_hash NULL
85504 +_001254_hash timeout_write 3 50991 _001254_hash NULL
85505 +_001255_hash timeradd_entry 3 49850 _001255_hash NULL
85506 +_001256_hash tipc_link_send_sections_fast 4 37920 _001256_hash NULL
85507 +_001257_hash tipc_subseq_alloc 1 5957 _001257_hash NULL
85508 +_001258_hash tnode_alloc 1 49407 _001258_hash NULL
85509 +_001259_hash tomoyo_commit_ok 2 20167 _001259_hash NULL
85510 +_001260_hash tomoyo_scan_bprm 2-4 15642 _003488_hash NULL nohasharray
85511 +_001262_hash tps6586x_writes 3 58689 _001262_hash NULL
85512 +_001263_hash tty_buffer_find 2 2443 _001263_hash NULL
85513 +_001264_hash tty_write 3 5494 _001264_hash NULL
85514 +_001265_hash ubifs_setxattr 4 59650 _001477_hash NULL nohasharray
85515 +_001266_hash ubi_self_check_all_ff 4 41959 _001266_hash NULL
85516 +_001267_hash udf_sb_alloc_partition_maps 2 62313 _001267_hash NULL
85517 +_001268_hash udplite_getfrag 3-4 14479 _001268_hash NULL
85518 +_001270_hash ulong_write_file 3 26485 _001270_hash NULL
85519 +_001271_hash unix_stream_sendmsg 4 61455 _001271_hash NULL
85520 +_001272_hash unlink_queued 3-4 645 _001272_hash NULL
85521 +_001273_hash update_pmkid 4 2481 _001273_hash NULL
85522 +_001274_hash usb_alloc_coherent 2 65444 _001274_hash NULL
85523 +_001275_hash vc_resize 2-3 3585 _001275_hash NULL
85524 +_001277_hash vhci_write 3 2224 _001277_hash NULL
85525 +_001278_hash __vhost_add_used_n 3 26554 _001278_hash NULL
85526 +_001279_hash virtqueue_add_buf 3-4 59470 _001279_hash NULL
85527 +_001281_hash vmalloc 1 15464 _001281_hash NULL
85528 +_001282_hash vol_cdev_write 3 40915 _001282_hash NULL
85529 +_001283_hash vxge_device_register 4 7752 _001283_hash NULL
85530 +_001284_hash __vxge_hw_blockpool_malloc 2 5786 _001284_hash NULL
85531 +_001285_hash __vxge_hw_channel_allocate 3 55462 _001285_hash NULL
85532 +_001286_hash vzalloc 1 47421 _001286_hash NULL
85533 +_001287_hash vzalloc_node 1 23424 _001287_hash NULL
85534 +_001288_hash wa_nep_queue 2 8858 _001288_hash NULL
85535 +_001289_hash __wa_xfer_setup_segs 2 56725 _001289_hash NULL
85536 +_001290_hash wiphy_new 2 2482 _001290_hash NULL
85537 +_001291_hash wm8350_block_write 3 19727 _001291_hash NULL
85538 +_001292_hash wpan_phy_alloc 1 48056 _001292_hash NULL
85539 +_001293_hash write_flush_pipefs 3 2021 _001293_hash NULL
85540 +_001294_hash write_flush_procfs 3 44011 _001294_hash NULL
85541 +_001295_hash wusb_ccm_mac 7 32199 _001295_hash NULL
85542 +_001296_hash x25_sendmsg 4 12487 _001296_hash NULL
85543 +_001297_hash xfrm_hash_alloc 1 10997 _001297_hash NULL
85544 +_001298_hash _xfs_buf_get_pages 2 46811 _001298_hash NULL
85545 +_001299_hash xfs_da_grow_inode_int 3 21785 _001299_hash NULL
85546 +_001300_hash xfs_dir_cilookup_result 3 64288 _003160_hash NULL nohasharray
85547 +_001301_hash xfs_idata_realloc 2 26199 _001301_hash NULL
85548 +_001302_hash xfs_iext_add_indirect_multi 3 32400 _001302_hash NULL
85549 +_001303_hash xfs_iext_inline_to_direct 2 12384 _001303_hash NULL
85550 +_001304_hash xfs_iformat_local 4 49472 _001304_hash NULL
85551 +_001305_hash xfs_iroot_realloc 2 46826 _001305_hash NULL
85552 +_001306_hash xhci_alloc_stream_info 3 63902 _001306_hash NULL
85553 +_001307_hash xlog_recover_add_to_trans 4 62839 _001307_hash NULL
85554 +_001308_hash xprt_alloc 2 1475 _001308_hash NULL
85555 +_001309_hash xt_alloc_table_info 1 57903 _001309_hash NULL
85556 +_001310_hash _zd_iowrite32v_async_locked 3 39034 _001310_hash NULL
85557 +_001311_hash zd_usb_iowrite16v 3 49744 _001311_hash NULL
85558 +_001312_hash a2mp_send 4 41615 _001312_hash NULL
85559 +_001313_hash acpi_ds_build_internal_package_obj 3 58271 _001313_hash NULL
85560 +_001314_hash acpi_system_read_event 3 55362 _001314_hash NULL
85561 +_001315_hash acpi_ut_create_buffer_object 1 42030 _001315_hash NULL
85562 +_001316_hash acpi_ut_create_package_object 1 17594 _001316_hash NULL
85563 +_001317_hash acpi_ut_create_string_object 1 15360 _001317_hash NULL
85564 +_001318_hash ad7879_spi_multi_read 3 8218 _001318_hash NULL
85565 +_001319_hash add_child 4 45201 _001319_hash NULL
85566 +_001320_hash add_port 2 54941 _001320_hash NULL
85567 +_001321_hash adu_read 3 24177 _001321_hash NULL
85568 +_001322_hash afs_cell_create 2 27346 _001322_hash NULL
85569 +_001323_hash agp_allocate_memory 2 58761 _001323_hash NULL
85570 +_001324_hash agp_generic_alloc_user 1 9470 _001324_hash NULL
85571 +_001325_hash alc_auto_create_extra_outs 2 18975 _001325_hash NULL
85572 +_001326_hash alloc_agpphysmem_i8xx 1 39427 _001326_hash NULL
85573 +_001327_hash allocate_cnodes 1 5329 _001327_hash NULL
85574 +_001328_hash ___alloc_bootmem 1 11410 _001328_hash NULL
85575 +_001329_hash __alloc_bootmem_low_node 2 25726 _001662_hash NULL nohasharray
85576 +_001330_hash __alloc_bootmem_node 2 1992 _001330_hash NULL
85577 +_001331_hash __alloc_bootmem_node_nopanic 2 6432 _001331_hash NULL
85578 +_001332_hash __alloc_bootmem_nopanic 1 65397 _001332_hash NULL
85579 +_001333_hash alloc_candev 1-2 7776 _001333_hash NULL
85580 +_001335_hash _alloc_cdb_cont 2 23609 _001335_hash NULL
85581 +_001336_hash alloc_dummy_extent_buffer 2 56374 _001336_hash NULL
85582 +_001337_hash ____alloc_ei_netdev 1 51475 _001337_hash NULL
85583 +_001338_hash alloc_etherdev_mqs 1 36450 _001338_hash NULL
85584 +_001339_hash alloc_extent_buffer 3 52824 _001339_hash NULL
85585 +_001340_hash alloc_fcdev 1 18780 _001340_hash NULL
85586 +_001341_hash alloc_fddidev 1 15382 _001341_hash NULL
85587 +_001342_hash _alloc_get_attr_desc 2 470 _001342_hash NULL
85588 +_001343_hash alloc_hippi_dev 1 51320 _001343_hash NULL
85589 +_001344_hash alloc_irdadev 1 19140 _001344_hash NULL
85590 +_001345_hash alloc_ldt 2 21972 _001345_hash NULL
85591 +_001346_hash alloc_ltalkdev 1 38071 _001346_hash NULL
85592 +_001347_hash alloc_one_pg_vec_page 1 10747 _001347_hash NULL
85593 +_001348_hash alloc_orinocodev 1 21371 _001348_hash NULL
85594 +_001349_hash alloc_ring 2-4 18278 _001349_hash NULL
85595 +_001351_hash _alloc_set_attr_list 4 48991 _001351_hash NULL
85596 +_001353_hash alloc_tx 2 32143 _001353_hash NULL
85597 +_001354_hash alloc_wr 1-2 24635 _001354_hash NULL
85598 +_001356_hash async_setkey 3 35521 _001356_hash NULL
85599 +_001357_hash ata_host_alloc_pinfo 3 17325 _001357_hash NULL
85600 +_001360_hash ath6kl_connect_event 7-9-8 14267 _001360_hash NULL
85601 +_001361_hash ath6kl_fwlog_block_read 3 49836 _001361_hash NULL
85602 +_001362_hash ath6kl_fwlog_read 3 32101 _001362_hash NULL
85603 +_001363_hash ath9k_wmi_cmd 4 327 _001363_hash NULL
85604 +_001364_hash ath_rx_init 2 43564 _001364_hash NULL
85605 +_001365_hash ath_tx_init 2 60515 _001365_hash NULL
85606 +_001366_hash atm_alloc_charge 2 19517 _001914_hash NULL nohasharray
85607 +_001367_hash atm_get_addr 3 31221 _001367_hash NULL
85608 +_001368_hash audit_log_n_hex 3 45617 _001368_hash NULL
85609 +_001369_hash audit_log_n_string 3 31705 _001369_hash NULL
85610 +_001370_hash ax25_output 2 22736 _001370_hash NULL
85611 +_001371_hash bcsp_prepare_pkt 3 12961 _001371_hash NULL
85612 +_001372_hash bdx_rxdb_create 1 46525 _001372_hash NULL
85613 +_001373_hash bdx_tx_db_init 2 41719 _001373_hash NULL
85614 +_001374_hash bio_map_kern 3 64751 _001374_hash NULL
85615 +_001375_hash bits_to_user 2-3 47733 _001375_hash NULL
85616 +_001377_hash __blk_queue_init_tags 2 9778 _001377_hash NULL
85617 +_001378_hash blk_queue_resize_tags 2 28670 _001378_hash NULL
85618 +_001379_hash blk_rq_map_user_iov 5 16772 _001379_hash NULL
85619 +_001380_hash bm_init 2 13529 _001380_hash NULL
85620 +_001381_hash brcmf_alloc_wdev 1 60347 _001381_hash NULL
85621 +_001382_hash __btrfs_buffered_write 3 35311 _002735_hash NULL nohasharray
85622 +_001383_hash btrfs_insert_dir_item 4 59304 _001383_hash NULL
85623 +_001384_hash btrfs_map_block 3 64379 _001384_hash NULL
85624 +_001385_hash bt_skb_alloc 1 6404 _001385_hash NULL
85625 +_001386_hash c4_add_card 3 54968 _001386_hash NULL
85626 +_001387_hash cache_read 3 24790 _001387_hash NULL
85627 +_001388_hash cache_write 3 13589 _001388_hash NULL
85628 +_001389_hash calc_hmac 3 32010 _001389_hash NULL
85629 +_001390_hash capinc_tty_write 3 28539 _001390_hash NULL
85630 +_001391_hash ccid_getsockopt_builtin_ccids 2 53634 _001391_hash NULL
85631 +_001392_hash ceph_copy_page_vector_to_user 3-4 31270 _001392_hash NULL
85632 +_001394_hash ceph_parse_server_name 2 60318 _001394_hash NULL
85633 +_001395_hash ceph_read_dir 3 17005 _001395_hash NULL
85634 +_001396_hash cfg80211_roamed 5-7 32632 _001396_hash NULL
85635 +_001398_hash cfpkt_add_body 3 44630 _001398_hash NULL
85636 +_001399_hash cfpkt_create_pfx 1-2 23594 _001399_hash NULL
85637 +_001401_hash cmd_complete 6 51629 _001401_hash NULL
85638 +_001402_hash cmtp_add_msgpart 4 9252 _001402_hash NULL
85639 +_001403_hash cmtp_send_interopmsg 7 376 _001403_hash NULL
85640 +_001404_hash coda_psdev_read 3 35029 _001404_hash NULL
85641 +_001405_hash construct_key_and_link 4 8321 _001405_hash NULL
85642 +_001406_hash copy_counters_to_user 5 17027 _001406_hash NULL
85643 +_001407_hash copy_entries_to_user 1 52367 _001407_hash NULL
85644 +_001408_hash copy_from_buf 2-4 27308 _001408_hash NULL
85645 +_001410_hash copy_oldmem_page 3-1 26164 _001410_hash NULL
85646 +_001411_hash copy_to_user_fromio 3 57432 _001411_hash NULL
85647 +_001412_hash cryptd_hash_setkey 3 42781 _001412_hash NULL
85648 +_001413_hash crypto_authenc_esn_setkey 3 6985 _001413_hash NULL
85649 +_001414_hash crypto_authenc_setkey 3 80 _001414_hash NULL
85650 +_001415_hash cxgb3_get_cpl_reply_skb 2 10620 _001415_hash NULL
85651 +_001416_hash cxgbi_ddp_reserve 4 30091 _001416_hash NULL
85652 +_001417_hash cxio_init_resource_fifo 3 28764 _001417_hash NULL
85653 +_001418_hash cxio_init_resource_fifo_random 3 47151 _001418_hash NULL
85654 +_001419_hash datablob_hmac_append 3 40038 _001419_hash NULL
85655 +_001420_hash datablob_hmac_verify 4 24786 _001420_hash NULL
85656 +_001421_hash dataflash_read_fact_otp 3-2 33204 _001421_hash NULL
85657 +_001422_hash dataflash_read_user_otp 3-2 14536 _001422_hash &_000207_hash
85658 +_001423_hash dccp_feat_register_sp 5 17914 _001423_hash NULL
85659 +_001424_hash dccp_setsockopt 5 60367 _001424_hash NULL
85660 +_001425_hash __dev_alloc_skb 1 28681 _001425_hash NULL
85661 +_001426_hash disk_expand_part_tbl 2 30561 _001426_hash NULL
85662 +_001427_hash diva_os_alloc_message_buffer 1 64568 _001427_hash NULL
85663 +_001428_hash diva_os_copy_to_user 4 48508 _001428_hash NULL
85664 +_001429_hash diva_os_malloc 2 16406 _001429_hash NULL
85665 +_001430_hash dmam_declare_coherent_memory 4-2 43679 _001430_hash NULL
85666 +_001431_hash dm_vcalloc 1-2 16814 _001431_hash NULL
85667 +_001433_hash dn_alloc_skb 2 6631 _001433_hash NULL
85668 +_001434_hash do_proc_readlink 3 14096 _001434_hash NULL
85669 +_001435_hash do_readlink 2 43518 _001435_hash NULL
85670 +_001436_hash __do_replace 5 37227 _001436_hash NULL
85671 +_001437_hash do_sigpending 2 9766 _001437_hash NULL
85672 +_001438_hash drbd_bm_resize 2 20522 _001438_hash NULL
85673 +_001439_hash drbd_setsockopt 5 16280 _001439_hash &_000383_hash
85674 +_001440_hash dump_midi 3 51040 _001440_hash NULL
85675 +_001441_hash ecryptfs_filldir 3 6622 _001441_hash NULL
85676 +_001442_hash ecryptfs_send_message 2 18322 _001442_hash NULL
85677 +_001443_hash ep0_read 3 38095 _001443_hash NULL
85678 +_001444_hash evdev_ioctl 2 22371 _001444_hash NULL
85679 +_001445_hash ext4_add_new_descs 3 19509 _001445_hash NULL
85680 +_001446_hash fat_ioctl_filldir 3 36621 _001446_hash NULL
85681 +_001447_hash _fc_frame_alloc 1 43568 _001447_hash NULL
85682 +_001448_hash fc_host_post_vendor_event 3 30903 _001448_hash NULL
85683 +_001449_hash fd_copyout 3 59323 _001449_hash NULL
85684 +_001450_hash f_hidg_read 3 6238 _001450_hash NULL
85685 +_001451_hash filldir 3 55137 _001451_hash NULL
85686 +_001452_hash filldir64 3 46469 _001452_hash NULL
85687 +_001453_hash find_skb 2 20431 _001453_hash NULL
85688 +_001454_hash from_buffer 3 18625 _001454_hash NULL
85689 +_001455_hash fsm_init 2 16134 _001455_hash NULL
85690 +_001456_hash fs_path_add 3 15648 _001456_hash NULL
85691 +_001457_hash fs_path_add_from_extent_buffer 4 27702 _001457_hash NULL
85692 +_001458_hash fuse_perform_write 4 18457 _001458_hash NULL
85693 +_001459_hash gem_alloc_skb 2 51715 _001459_hash NULL
85694 +_001460_hash generic_file_buffered_write 4 25464 _001460_hash NULL
85695 +_001461_hash gen_pool_add 3 21776 _001461_hash NULL
85696 +_001462_hash get_packet 3 41914 _001462_hash NULL
85697 +_001463_hash get_packet 3 5747 _001463_hash NULL
85698 +_001464_hash get_packet_pg 4 28023 _001464_hash NULL
85699 +_001465_hash get_skb 2 63008 _001465_hash NULL
85700 +_001466_hash get_subdir 3 62581 _001466_hash NULL
85701 +_001467_hash gsm_control_message 4 18209 _001467_hash NULL
85702 +_001468_hash gsm_control_modem 3 55303 _001468_hash NULL
85703 +_001469_hash gsm_control_rls 3 3353 _001469_hash NULL
85704 +_001470_hash handle_received_packet 3 22457 _001470_hash NULL
85705 +_001471_hash hash_setkey 3 48310 _001471_hash NULL
85706 +_001472_hash hdlcdrv_register 2 6792 _001472_hash NULL
85707 +_001473_hash hiddev_ioctl 2 36816 _001473_hash NULL
85708 +_001474_hash hid_input_report 4 32458 _001474_hash NULL
85709 +_001475_hash hidp_queue_report 3 1881 _001475_hash NULL
85710 +_001476_hash __hidp_send_ctrl_message 4 28303 _001476_hash NULL
85711 +_001477_hash hidraw_read 3 59650 _001477_hash &_001265_hash
85712 +_001478_hash HiSax_readstatus 2 15752 _001478_hash NULL
85713 +_001480_hash __hwahc_op_set_gtk 4 42038 _001480_hash NULL
85714 +_001481_hash __hwahc_op_set_ptk 5 36510 _001481_hash NULL
85715 +_001482_hash hycapi_rx_capipkt 3 11602 _001482_hash NULL
85716 +_001483_hash i2400m_net_rx 5 27170 _001483_hash NULL
85717 +_001484_hash ib_copy_to_udata 3 27525 _001484_hash NULL
85718 +_001485_hash idetape_chrdev_read 3 2097 _001485_hash NULL
85719 +_001486_hash ieee80211_alloc_hw 1 43829 _001486_hash NULL
85720 +_001487_hash ieee80211_bss_info_update 4 13991 _001487_hash NULL
85721 +_001488_hash igmpv3_newpack 2 35912 _001488_hash NULL
85722 +_001489_hash ilo_read 3 32531 _001489_hash NULL
85723 +_001490_hash init_map_ipmac 3-4 63896 _001490_hash NULL
85724 +_001492_hash init_tid_tabs 2-4-3 13252 _001492_hash NULL
85725 +_001495_hash iowarrior_read 3 53483 _001495_hash NULL
85726 +_001496_hash ip_options_get 4 56538 _001496_hash NULL
85727 +_001497_hash ipv6_getsockopt_sticky 5 56711 _001497_hash NULL
85728 +_001498_hash ipwireless_send_packet 4 8328 _001498_hash NULL
85729 +_001499_hash ipx_sendmsg 4 1362 _001499_hash NULL
85730 +_001500_hash irq_domain_add_linear 2 29236 _001500_hash NULL
85731 +_001501_hash iscsi_conn_setup 2 35159 _001501_hash NULL
85732 +_001502_hash iscsi_create_session 3 51647 _001502_hash NULL
85733 +_001503_hash iscsi_host_alloc 2 36671 _001503_hash NULL
85734 +_001504_hash iscsi_if_send_reply 7 52219 _001504_hash NULL
85735 +_001505_hash iscsi_offload_mesg 5 58425 _001505_hash NULL
85736 +_001506_hash iscsi_ping_comp_event 5 38263 _001506_hash NULL
85737 +_001507_hash iscsi_post_host_event 4 13473 _001507_hash NULL
85738 +_001508_hash iscsi_recv_pdu 4 16755 _001508_hash NULL
85739 +_001509_hash iscsi_session_setup 4-5 196 _001509_hash NULL
85740 +_001511_hash iscsit_find_cmd_from_itt_or_dump 3 17194 _003122_hash NULL nohasharray
85741 +_001512_hash isdn_net_ciscohdlck_alloc_skb 2 55209 _001951_hash NULL nohasharray
85742 +_001513_hash isdn_ppp_ccp_xmit_reset 6 63297 _001513_hash NULL
85743 +_001514_hash isdn_ppp_read 4 50356 _001514_hash NULL
85744 +_001515_hash isdn_ppp_skb_push 2 5236 _001515_hash NULL
85745 +_001516_hash isku_sysfs_read 6 58806 _001516_hash NULL
85746 +_001517_hash isku_sysfs_write 6 49767 _001517_hash NULL
85747 +_001520_hash jbd2_alloc 1 41359 _001520_hash NULL
85748 +_001521_hash jffs2_do_link 6 42048 _001521_hash NULL
85749 +_001522_hash jffs2_do_unlink 4 62020 _001522_hash NULL
85750 +_001523_hash jffs2_security_setxattr 4 62107 _001523_hash NULL
85751 +_001524_hash jffs2_trusted_setxattr 4 17048 _001524_hash NULL
85752 +_001525_hash jffs2_user_setxattr 4 10182 _001525_hash NULL
85753 +_001526_hash joydev_ioctl_common 2 49359 _001526_hash NULL
85754 +_001527_hash kernel_setsockopt 5 35913 _001527_hash NULL
85755 +_001528_hash keyctl_describe_key 3 36853 _001528_hash NULL
85756 +_001529_hash keyctl_get_security 3 64418 _001529_hash &_001192_hash
85757 +_001530_hash keyring_read 3 13438 _001530_hash NULL
85758 +_001531_hash kfifo_copy_to_user 3 20646 _001531_hash NULL
85759 +_001532_hash kmem_zalloc_large 1 56128 _001532_hash NULL
85760 +_001533_hash kmp_init 2 41373 _001533_hash NULL
85761 +_001534_hash koneplus_sysfs_write 6 35993 _001534_hash NULL
85762 +_001535_hash kvm_clear_guest_page 4 2308 _001535_hash NULL
85763 +_001536_hash kvm_read_nested_guest_page 5 13337 _001536_hash NULL
85764 +_001537_hash _l2_alloc_skb 1 11883 _001537_hash NULL
85765 +_001538_hash l2cap_create_basic_pdu 3 24869 _001538_hash &_001074_hash
85766 +_001539_hash l2cap_create_connless_pdu 3 37327 _001539_hash NULL
85767 +_001540_hash l2cap_create_iframe_pdu 3 40055 _001540_hash NULL
85768 +_001541_hash l3_alloc_skb 1 32289 _001541_hash NULL
85769 +_001542_hash __lgwrite 4 57669 _001542_hash NULL
85770 +_001543_hash libfc_host_alloc 2 7917 _001543_hash NULL
85771 +_001544_hash llc_alloc_frame 4 64366 _001544_hash NULL
85772 +_001545_hash llcp_sock_sendmsg 4 1092 _001545_hash NULL
85773 +_001546_hash mac_drv_rx_init 2 48898 _001546_hash NULL
85774 +_001547_hash macvtap_get_user 4 28185 _001547_hash NULL
85775 +_001548_hash mdc800_device_read 3 22896 _001548_hash NULL
85776 +_001549_hash memcpy_toiovec 3 54166 _001549_hash &_000892_hash
85777 +_001550_hash memcpy_toiovecend 3-4 19736 _001550_hash NULL
85778 +_001552_hash mempool_create 1 29437 _001552_hash NULL
85779 +_001553_hash mgmt_event 4 12810 _001553_hash NULL
85780 +_001554_hash mgt_set_varlen 4 60916 _001554_hash NULL
85781 +_001555_hash mI_alloc_skb 1 24770 _001555_hash NULL
85782 +_001556_hash mlx4_en_create_rx_ring 3 62498 _001556_hash NULL
85783 +_001557_hash mlx4_en_create_tx_ring 4 48501 _001557_hash NULL
85784 +_001558_hash mlx4_init_cmpt_table 3 11569 _001558_hash NULL
85785 +_001559_hash mon_bin_get_event 4 52863 _001559_hash NULL
85786 +_001560_hash mousedev_read 3 47123 _001560_hash NULL
85787 +_001561_hash move_addr_to_user 2 2868 _001561_hash NULL
85788 +_001562_hash mpihelp_mul 5-3 27805 _001562_hash NULL
85789 +_001564_hash mpi_set_buffer 3 65294 _001564_hash NULL
85790 +_001565_hash mptctl_ioctl 2 12355 _001565_hash NULL
85791 +_001566_hash msnd_fifo_alloc 2 23179 _001566_hash NULL
85792 +_001567_hash mtdswap_init 2 55719 _001567_hash NULL
85793 +_001568_hash mthca_alloc_resize_buf 3 60394 _001568_hash NULL
85794 +_001569_hash mthca_init_cq 2 60011 _001569_hash NULL
85795 +_001570_hash nci_skb_alloc 2 49757 _001570_hash NULL
85796 +_001571_hash neigh_hash_grow 2 17283 _001571_hash NULL
85797 +_001572_hash netdev_alloc_skb 2 62437 _001572_hash NULL
85798 +_001573_hash __netdev_alloc_skb_ip_align 2 55067 _001573_hash NULL
85799 +_001574_hash netlink_change_ngroups 2 16457 _001574_hash NULL
85800 +_001575_hash new_skb 1 21148 _001575_hash NULL
85801 +_001576_hash nfc_alloc_recv_skb 1 10244 _001576_hash NULL
85802 +_001577_hash nfcwilink_skb_alloc 1 16167 _001577_hash NULL
85803 +_001578_hash __nf_nat_mangle_tcp_packet 5-7 8190 _001578_hash NULL
85804 +_001580_hash nf_nat_mangle_udp_packet 5-7 13321 _001580_hash NULL
85805 +_001582_hash nfqnl_mangle 4-2 36226 _001582_hash NULL
85806 +_001583_hash nfs4_realloc_slot_table 2 22859 _001583_hash NULL
85807 +_001584_hash nfs_idmap_get_key 2 39616 _001584_hash NULL
85808 +_001585_hash nfs_readdata_alloc 2 65015 _001585_hash NULL
85809 +_001586_hash nfs_writedata_alloc 2 12133 _001586_hash NULL
85810 +_001587_hash nfulnl_alloc_skb 2 65207 _001587_hash NULL
85811 +_001588_hash ni65_alloc_mem 3 10664 _001588_hash NULL
85812 +_001589_hash nsm_get_handle 4 52089 _001589_hash NULL
85813 +_001590_hash ntfs_malloc_nofs 1 49572 _001590_hash NULL
85814 +_001591_hash ntfs_malloc_nofs_nofail 1 63631 _001591_hash NULL
85815 +_001592_hash nvme_create_queue 3 170 _001592_hash NULL
85816 +_001593_hash ocfs2_control_write 3 54737 _001593_hash NULL
85817 +_001595_hash orinoco_add_extscan_result 3 18207 _001595_hash NULL
85818 +_001596_hash osd_req_read_sg_kern 5 6378 _001596_hash NULL
85819 +_001597_hash osd_req_write_sg_kern 5 10514 _001597_hash NULL
85820 +_001599_hash override_release 2 52032 _001599_hash NULL
85821 +_001600_hash p9_client_read 5 19750 _001600_hash NULL
85822 +_001601_hash packet_snd 3 13634 _001601_hash NULL
85823 +_001602_hash pcbit_stat 2 27364 _001602_hash NULL
85824 +_001603_hash pcpu_extend_area_map 2 12589 _001603_hash NULL
85825 +_001604_hash pep_alloc_skb 3 46303 _001604_hash NULL
85826 +_001605_hash pg_read 3 17276 _001605_hash NULL
85827 +_001606_hash picolcd_debug_eeprom_read 3 14549 _001606_hash NULL
85828 +_001607_hash pkt_alloc_packet_data 1 37928 _001607_hash NULL
85829 +_001608_hash pmcraid_build_passthrough_ioadls 2 62034 _001608_hash NULL
85830 +_001609_hash pn_raw_send 2 54330 _001609_hash NULL
85831 +_001610_hash posix_clock_register 2 5662 _001610_hash NULL
85832 +_001611_hash printer_read 3 54851 _001611_hash NULL
85833 +_001612_hash __proc_file_read 3 54978 _001612_hash NULL
85834 +_001613_hash pskb_may_pull 2 22546 _001613_hash NULL
85835 +_001614_hash __pskb_pull 2 42602 _001614_hash NULL
85836 +_001615_hash ptp_read 4 63251 _001615_hash NULL
85837 +_001616_hash pt_read 3 49136 _001616_hash NULL
85838 +_001617_hash put_cmsg 4 36589 _001617_hash NULL
85839 +_001618_hash px_raw_event 4 49371 _001618_hash NULL
85840 +_001619_hash qla4xxx_post_aen_work 3 46953 _001619_hash NULL
85841 +_001620_hash qla4xxx_post_ping_evt_work 4 8074 _001819_hash NULL nohasharray
85842 +_001621_hash raid5_resize 2 63306 _001621_hash NULL
85843 +_001622_hash rawv6_sendmsg 4 20080 _001622_hash NULL
85844 +_001623_hash rds_message_map_pages 2 31487 _001623_hash NULL
85845 +_001624_hash rds_sendmsg 4 40976 _001624_hash NULL
85846 +_001625_hash read_flush 3 43851 _001625_hash NULL
85847 +_001626_hash read_profile 3 27859 _001626_hash NULL
85848 +_001627_hash read_vmcore 3 26501 _001627_hash NULL
85849 +_001628_hash redirected_tty_write 3 65297 _001628_hash NULL
85850 +_001629_hash refill_pool 2 19477 _001629_hash NULL
85851 +_001630_hash __register_chrdev 2-3 54223 _001630_hash NULL
85852 +_001632_hash regmap_raw_write 4 53803 _001632_hash NULL
85853 +_001633_hash reiserfs_allocate_list_bitmaps 3 21732 _001633_hash NULL
85854 +_001634_hash reiserfs_resize 2 34377 _001634_hash NULL
85855 +_001635_hash request_key_auth_read 3 24109 _001635_hash NULL
85856 +_001636_hash rfcomm_wmalloc 2 58090 _001636_hash NULL
85857 +_001637_hash rfkill_fop_read 3 54711 _001637_hash NULL
85858 +_001638_hash rng_dev_read 3 41581 _001638_hash NULL
85859 +_001639_hash roccat_read 3 41093 _001639_hash &_001034_hash
85860 +_001640_hash rx 4 57944 _001640_hash NULL
85861 +_001641_hash rxrpc_client_sendmsg 5 23236 _001641_hash NULL
85862 +_001642_hash rxrpc_kernel_send_data 3 60083 _001642_hash NULL
85863 +_001643_hash rxrpc_server_sendmsg 4 37331 _001643_hash NULL
85864 +_001644_hash savu_sysfs_write 6 42273 _001644_hash NULL
85865 +_001645_hash sco_sock_sendmsg 4 62542 _001645_hash NULL
85866 +_001646_hash scsi_nl_send_vendor_msg 5 16394 _001646_hash NULL
85867 +_001647_hash scsi_register 2 49094 _001647_hash NULL
85868 +_001648_hash sctp_datamsg_from_user 4 55342 _001648_hash NULL
85869 +_001649_hash sctp_getsockopt_events 2 3607 _001649_hash NULL
85870 +_001650_hash sctp_getsockopt_maxburst 2 42941 _001650_hash NULL
85871 +_001651_hash sctp_getsockopt_maxseg 2 10737 _001651_hash NULL
85872 +_001652_hash sctp_make_chunk 4 12986 _001652_hash NULL
85873 +_001653_hash sctpprobe_read 3 17741 _001653_hash NULL
85874 +_001654_hash sctp_tsnmap_mark 2 35929 _001654_hash NULL
85875 +_001655_hash sctp_ulpevent_new 1 33377 _001655_hash NULL
85876 +_001656_hash sdhci_alloc_host 2 7509 _001656_hash NULL
85877 +_001657_hash selinux_inode_post_setxattr 4 26037 _001657_hash NULL
85878 +_001658_hash selinux_inode_setsecurity 4 18148 _001658_hash NULL
85879 +_001659_hash selinux_inode_setxattr 4 10708 _001659_hash NULL
85880 +_001660_hash selinux_secctx_to_secid 2 63744 _001660_hash NULL
85881 +_001661_hash selinux_setprocattr 4 55611 _001661_hash NULL
85882 +_001662_hash sel_write_context 3 25726 _001662_hash &_001329_hash
85883 +_001663_hash send_command 4 10832 _001663_hash NULL
85884 +_001664_hash seq_copy_in_user 3 18543 _001664_hash NULL
85885 +_001665_hash seq_open_net 4 8968 _001779_hash NULL nohasharray
85886 +_001666_hash seq_open_private 3 61589 _001666_hash NULL
85887 +_001667_hash set_arg 3 42824 _001667_hash NULL
85888 +_001668_hash sg_read 3 25799 _001668_hash NULL
85889 +_001669_hash shash_async_setkey 3 10720 _003506_hash NULL nohasharray
85890 +_001670_hash shash_compat_setkey 3 12267 _001670_hash NULL
85891 +_001671_hash shmem_setxattr 4 55867 _001671_hash NULL
85892 +_001672_hash simple_read_from_buffer 2-5 55957 _001672_hash NULL
85893 +_001674_hash sisusb_clear_vram 2-3 57466 _001674_hash NULL
85894 +_001676_hash sisusbcon_do_font_op 9 52271 _001676_hash NULL
85895 +_001677_hash sisusb_copy_memory 4 35016 _001677_hash NULL
85896 +_001678_hash sisusb_write 3 44834 _001678_hash NULL
85897 +_001680_hash skb_cow 2 26138 _001680_hash NULL
85898 +_001681_hash skb_cow_head 2 52495 _001681_hash NULL
85899 +_001682_hash skb_make_writable 2 24783 _001682_hash NULL
85900 +_001683_hash skb_padto 2 50759 _001683_hash NULL
85901 +_001684_hash sk_stream_alloc_skb 2 57622 _001684_hash NULL
85902 +_001685_hash smk_write_access2 3 19170 _001685_hash NULL
85903 +_001686_hash smk_write_access 3 49561 _001686_hash NULL
85904 +_001687_hash snd_es1938_capture_copy 5 25930 _001687_hash NULL
85905 +_001688_hash snd_gus_dram_peek 4 9062 _001688_hash NULL
85906 +_001689_hash snd_hdsp_capture_copy 5 4011 _001689_hash NULL
85907 +_001690_hash snd_korg1212_copy_to 6 92 _001690_hash NULL
85908 +_001691_hash snd_opl4_mem_proc_read 5 63774 _001691_hash NULL
85909 +_001692_hash snd_pcm_oss_read1 3 63771 _001692_hash NULL
85910 +_001693_hash snd_pcm_plugin_alloc 2 12580 _001693_hash NULL
85911 +_001694_hash snd_rawmidi_kernel_read1 4 36740 _001694_hash NULL
85912 +_001695_hash snd_rme9652_capture_copy 5 10287 _001695_hash NULL
85913 +_001696_hash sock_alloc_send_pskb 2 21246 _001696_hash NULL
85914 +_001697_hash sock_rmalloc 2 59740 _002491_hash NULL nohasharray
85915 +_001698_hash sock_wmalloc 2 16472 _001698_hash NULL
85916 +_001699_hash solos_param_store 4 34755 _001699_hash NULL
85917 +_001702_hash srp_target_alloc 3 37288 _001702_hash NULL
85918 +_001703_hash store_ifalias 4 35088 _001703_hash NULL
85919 +_001704_hash store_msg 3 56417 _001704_hash NULL
85920 +_001705_hash str_to_user 2 11411 _001705_hash NULL
85921 +_001706_hash subbuf_read_actor 3 2071 _001706_hash NULL
85922 +_001707_hash sys_fgetxattr 4 25166 _001707_hash NULL
85923 +_001708_hash sys_gethostname 2 49698 _001708_hash NULL
85924 +_001709_hash sys_getxattr 4 37418 _001709_hash NULL
85925 +_001710_hash sys_init_module 2 36047 _001710_hash NULL
85926 +_001711_hash sys_kexec_load 2 14222 _001711_hash NULL
85927 +_001712_hash sys_lgetxattr 4 45531 _001712_hash NULL
85928 +_001713_hash syslog_print 2 307 _001713_hash NULL
85929 +_001714_hash sys_msgsnd 3 44537 _001714_hash &_000139_hash
85930 +_001715_hash sys_process_vm_readv 3-5 19090 _003104_hash NULL nohasharray
85931 +_001717_hash sys_process_vm_writev 3-5 4928 _001717_hash NULL
85932 +_001719_hash sys_pselect6 1 57449 _001719_hash NULL
85933 +_001720_hash sys_sched_getaffinity 2 60033 _001720_hash NULL
85934 +_001721_hash sys_setsockopt 5 35320 _001721_hash NULL
85935 +_001722_hash t3_init_l2t 1 8261 _001722_hash NULL
85936 +_001723_hash t4vf_pktgl_to_skb 2 39005 _001723_hash NULL
85937 +_001724_hash tcp_collapse 5-6 63294 _001724_hash NULL
85938 +_001726_hash tcp_sendmsg 4 30296 _001726_hash NULL
85939 +_001727_hash team_options_register 3 20091 _001727_hash NULL
85940 +_001728_hash tipc_buf_acquire 1 60437 _001728_hash NULL
85941 +_001729_hash tipc_cfg_reply_alloc 1 27606 _001729_hash NULL
85942 +_001730_hash tipc_send2name 6 16809 _001730_hash NULL
85943 +_001731_hash tipc_send2port 5 63935 _001731_hash NULL
85944 +_001732_hash tipc_send 4 51238 _001732_hash NULL
85945 +_001733_hash tnode_new 3 44757 _002769_hash NULL nohasharray
85946 +_001734_hash tomoyo_read_self 3 33539 _001734_hash NULL
85947 +_001735_hash tomoyo_update_domain 2 5498 _001735_hash NULL
85948 +_001736_hash tomoyo_update_policy 2 40458 _001736_hash NULL
85949 +_001737_hash tpm_read 3 50344 _001737_hash NULL
85950 +_001738_hash TSS_rawhmac 3 17486 _001738_hash NULL
85951 +_001739_hash __tty_buffer_request_room 2 27700 _001739_hash NULL
85952 +_001740_hash tun_get_user 4 39099 _001740_hash NULL
85953 +_001741_hash ubi_dump_flash 4 46381 _001741_hash NULL
85954 +_001742_hash ubi_io_write 4-5 15870 _003453_hash NULL nohasharray
85955 +_001744_hash udp_setsockopt 5 25985 _001744_hash NULL
85956 +_001745_hash udpv6_setsockopt 5 18487 _001745_hash NULL
85957 +_001746_hash uio_read 3 49300 _001746_hash NULL
85958 +_001747_hash ulog_alloc_skb 1 23427 _001747_hash NULL
85959 +_001748_hash unix_dgram_sendmsg 4 45699 _001748_hash NULL
85960 +_001749_hash unlink1 3 63059 _001749_hash NULL
85961 +_001751_hash usbdev_read 3 45114 _001751_hash NULL
85962 +_001752_hash usblp_ioctl 2 30203 _001752_hash NULL
85963 +_001753_hash usblp_read 3 57342 _003832_hash NULL nohasharray
85964 +_001754_hash usbtmc_read 3 32377 _001754_hash NULL
85965 +_001755_hash _usb_writeN_sync 4 31682 _001755_hash NULL
85966 +_001756_hash user_read 3 51881 _001756_hash NULL
85967 +_001757_hash vcs_read 3 8017 _001757_hash NULL
85968 +_001758_hash vdma_mem_alloc 1 6171 _001758_hash NULL
85969 +_001759_hash venus_create 4 20555 _001759_hash NULL
85970 +_001760_hash venus_link 5 32165 _001760_hash NULL
85971 +_001761_hash venus_lookup 4 8121 _001761_hash NULL
85972 +_001762_hash venus_mkdir 4 8967 _001762_hash NULL
85973 +_001763_hash venus_remove 4 59781 _001763_hash NULL
85974 +_001764_hash venus_rename 4-5 17707 _003784_hash NULL nohasharray
85975 +_001766_hash venus_rmdir 4 45564 _001766_hash NULL
85976 +_001767_hash venus_symlink 4-6 23570 _001767_hash NULL
85977 +_001769_hash vfs_readlink 3 54368 _001769_hash NULL
85978 +_001770_hash vfs_readv 3 38011 _001770_hash NULL
85979 +_001771_hash vfs_writev 3 25278 _001771_hash NULL
85980 +_001772_hash vga_arb_read 3 4886 _001772_hash NULL
85981 +_001773_hash vgacon_adjust_height 2 28124 _001773_hash NULL
85982 +_001774_hash vhci_put_user 4 12604 _001774_hash NULL
85983 +_001775_hash vhost_add_used_n 3 10760 _001775_hash NULL
85984 +_001776_hash virtnet_send_command 5-6 61993 _001776_hash NULL
85985 +_001778_hash vmbus_establish_gpadl 3 4495 _001778_hash NULL
85986 +_001779_hash vol_cdev_read 3 8968 _001779_hash &_001665_hash
85987 +_001780_hash wdm_read 3 6549 _001780_hash NULL
85988 +_001781_hash write_adapter_mem 3 3234 _001781_hash NULL
85989 +_001782_hash wusb_prf 7 54261 _001782_hash &_000065_hash
85990 +_001783_hash xdi_copy_to_user 4 48900 _001783_hash NULL
85991 +_001784_hash xfs_buf_associate_memory 3 17915 _001784_hash NULL
85992 +_001785_hash xfs_buf_get_maps 2 4581 _001785_hash NULL
85993 +_001786_hash xfs_buf_get_uncached 2 51477 _001786_hash NULL
85994 +_001787_hash xfs_buf_item_get_format 2 189 _001787_hash NULL
85995 +_001788_hash xfs_buf_map_from_irec 5 2368 _002641_hash NULL nohasharray
85996 +_001789_hash xfs_dir2_block_to_sf 3 37868 _001789_hash NULL
85997 +_001790_hash xfs_dir2_leaf_getdents 3 23841 _001790_hash NULL
85998 +_001791_hash xfs_dir2_sf_addname_hard 3 54254 _001791_hash NULL
85999 +_001792_hash xfs_efd_init 3 5463 _001792_hash NULL
86000 +_001793_hash xfs_efi_init 2 5476 _001793_hash NULL
86001 +_001794_hash xfs_iext_realloc_direct 2 20521 _001794_hash NULL
86002 +_001795_hash xfs_iext_realloc_indirect 2 59211 _001795_hash NULL
86003 +_001796_hash xfs_inumbers_fmt 3 12817 _001796_hash NULL
86004 +_001797_hash xhci_alloc_streams 5 37586 _001797_hash NULL
86005 +_001798_hash xlog_recover_add_to_cont_trans 4 44102 _001798_hash NULL
86006 +_001799_hash xz_dec_lzma2_create 2 36353 _002713_hash NULL nohasharray
86007 +_001800_hash _zd_iowrite32v_locked 3 44725 _001800_hash NULL
86008 +_001801_hash a2mp_chan_alloc_skb_cb 2 27159 _001801_hash NULL
86009 +_001802_hash aat2870_reg_read_file 3 12221 _001802_hash NULL
86010 +_001803_hash add_partition 2 55588 _001803_hash NULL
86011 +_001804_hash add_sctp_bind_addr 3 12269 _001804_hash NULL
86012 +_001805_hash _add_sg_continuation_descriptor 3 54721 _001805_hash NULL
86013 +_001806_hash afs_cell_lookup 2 8482 _001806_hash NULL
86014 +_001807_hash afs_send_simple_reply 3 63940 _001807_hash NULL
86015 +_001808_hash agp_allocate_memory_wrap 1 16576 _001808_hash NULL
86016 +_001809_hash __alloc_bootmem 1 31498 _001809_hash NULL
86017 +_001810_hash __alloc_bootmem_low 1 43423 _003425_hash NULL nohasharray
86018 +_001811_hash __alloc_bootmem_node_high 2 65076 _001811_hash NULL
86019 +_001812_hash alloc_cc770dev 1 48186 _001812_hash NULL
86020 +_001813_hash __alloc_ei_netdev 1 29338 _001813_hash NULL
86021 +_001814_hash __alloc_eip_netdev 1 51549 _001814_hash NULL
86022 +_001815_hash alloc_libipw 1 22708 _001815_hash NULL
86023 +_001816_hash _alloc_mISDN_skb 3 52232 _001816_hash NULL
86024 +_001817_hash alloc_pg_vec 2 8533 _001817_hash NULL
86025 +_001818_hash alloc_sja1000dev 1 17868 _001818_hash NULL
86026 +_001819_hash alloc_targets 2 8074 _001819_hash &_001620_hash
86027 +_001822_hash ath6kl_disconnect_timeout_read 3 3650 _001822_hash NULL
86028 +_001823_hash ath6kl_endpoint_stats_read 3 41554 _001823_hash NULL
86029 +_001824_hash ath6kl_fwlog_mask_read 3 2050 _001824_hash NULL
86030 +_001825_hash ath6kl_keepalive_read 3 44303 _001825_hash NULL
86031 +_001826_hash ath6kl_listen_int_read 3 10355 _001826_hash NULL
86032 +_001827_hash ath6kl_lrssi_roam_read 3 61022 _001827_hash NULL
86033 +_001828_hash ath6kl_regdump_read 3 14393 _001828_hash NULL
86034 +_001829_hash ath6kl_regread_read 3 25884 _001829_hash NULL
86035 +_001830_hash ath6kl_regwrite_read 3 48747 _001830_hash NULL
86036 +_001831_hash ath6kl_roam_table_read 3 26166 _001831_hash NULL
86037 +_001832_hash ath9k_debugfs_read_buf 3 25316 _001832_hash NULL
86038 +_001833_hash ath9k_multi_regread 4 65056 _001833_hash NULL
86039 +_001834_hash ath_rxbuf_alloc 2 24745 _001834_hash NULL
86040 +_001835_hash atk_debugfs_ggrp_read 3 29522 _001835_hash NULL
86041 +_001836_hash audit_log_n_untrustedstring 3 9548 _001836_hash NULL
86042 +_001837_hash ax25_send_frame 2 19964 _001837_hash NULL
86043 +_001838_hash b43_debugfs_read 3 24425 _001838_hash NULL
86044 +_001839_hash b43legacy_debugfs_read 3 2473 _001839_hash NULL
86045 +_001840_hash batadv_bla_is_backbone_gw 3 58488 _001840_hash NULL
86046 +_001841_hash batadv_check_management_packet 3 52993 _001841_hash NULL
86047 +_001842_hash batadv_check_unicast_packet 2 10866 _001842_hash NULL
86048 +_001843_hash batadv_interface_rx 4 8568 _001843_hash NULL
86049 +_001844_hash batadv_skb_head_push 2 11360 _001844_hash NULL
86050 +_001845_hash bchannel_get_rxbuf 2 37213 _001845_hash NULL
86051 +_001846_hash bcm_recvmsg 4 43992 _001846_hash NULL
86052 +_001847_hash bfad_debugfs_read 3 13119 _001847_hash NULL
86053 +_001848_hash bfad_debugfs_read_regrd 3 57830 _001848_hash NULL
86054 +_001849_hash blk_init_tags 1 30592 _001849_hash NULL
86055 +_001850_hash blk_queue_init_tags 2 44355 _001850_hash &_001022_hash
86056 +_001851_hash blk_rq_map_kern 4 47004 _001851_hash NULL
86057 +_001852_hash bm_entry_read 3 10976 _001852_hash NULL
86058 +_001853_hash bm_status_read 3 19583 _001853_hash NULL
86059 +_001854_hash bnad_debugfs_read 3 50665 _001854_hash NULL
86060 +_001855_hash bnad_debugfs_read_regrd 3 51308 _001855_hash NULL
86061 +_001856_hash bnx2i_send_nl_mesg 4 53353 _001856_hash NULL
86062 +_001857_hash brcmf_debugfs_sdio_counter_read 3 58369 _001857_hash NULL
86063 +_001858_hash brcmf_sdio_assert_info 4 52653 _001858_hash NULL
86064 +_001859_hash brcmf_sdio_dump_console 4 37455 _001859_hash NULL
86065 +_001860_hash brcmf_sdio_trap_info 4 48510 _001860_hash NULL
86066 +_001861_hash btmrvl_curpsmode_read 3 46939 _001861_hash NULL
86067 +_001862_hash btmrvl_gpiogap_read 3 4718 _001862_hash NULL
86068 +_001863_hash btmrvl_hscfgcmd_read 3 56303 _001863_hash NULL
86069 +_001864_hash btmrvl_hscmd_read 3 1614 _001864_hash NULL
86070 +_001865_hash btmrvl_hsmode_read 3 1647 _001865_hash NULL
86071 +_001866_hash btmrvl_hsstate_read 3 920 _001866_hash NULL
86072 +_001867_hash btmrvl_pscmd_read 3 24308 _001867_hash NULL
86073 +_001868_hash btmrvl_psmode_read 3 22395 _001868_hash NULL
86074 +_001869_hash btmrvl_psstate_read 3 50683 _001869_hash NULL
86075 +_001870_hash btmrvl_txdnldready_read 3 413 _001870_hash NULL
86076 +_001871_hash btrfs_add_link 5 9973 _001871_hash NULL
86077 +_001872_hash __btrfs_direct_write 4 22273 _001872_hash NULL
86078 +_001873_hash btrfs_discard_extent 2 38547 _001873_hash NULL
86079 +_001874_hash btrfs_file_aio_write 4 21520 _001874_hash NULL
86080 +_001875_hash btrfs_find_create_tree_block 3 55812 _001875_hash NULL
86081 +_001876_hash btrfsic_map_block 2 56751 _001876_hash NULL
86082 +_001877_hash cache_read_pipefs 3 47615 _001877_hash NULL
86083 +_001878_hash cache_read_procfs 3 52882 _001878_hash NULL
86084 +_001879_hash cache_write_pipefs 3 48270 _001879_hash NULL
86085 +_001880_hash cache_write_procfs 3 22491 _001880_hash NULL
86086 +_001881_hash caif_stream_recvmsg 4 13173 _001881_hash NULL
86087 +_001882_hash carl9170_alloc 1 27 _001882_hash NULL
86088 +_001883_hash carl9170_debugfs_read 3 47738 _001883_hash NULL
86089 +_001884_hash ceph_msgpool_init 4 34599 _001884_hash NULL
86090 +_001885_hash cfpkt_add_trail 3 27260 _001885_hash NULL
86091 +_001886_hash cfpkt_create 1 18197 _001886_hash NULL
86092 +_001887_hash cfpkt_pad_trail 2 55511 _003606_hash NULL nohasharray
86093 +_001888_hash cfpkt_split 2 47541 _001888_hash NULL
86094 +_001889_hash cgroup_read_s64 5 19570 _001889_hash NULL
86095 +_001890_hash cgroup_read_u64 5 45532 _001890_hash NULL
86096 +_001891_hash channel_type_read 3 47308 _001891_hash NULL
86097 +_001892_hash check_header 2 56930 _001892_hash NULL
86098 +_001893_hash codec_list_read_file 3 24910 _001893_hash NULL
86099 +_001894_hash configfs_read_file 3 1683 _001894_hash NULL
86100 +_001895_hash console_store 4 36007 _001895_hash NULL
86101 +_001896_hash cpuset_common_file_read 5 8800 _001896_hash NULL
86102 +_001897_hash create_subvol 4 30836 _001897_hash NULL
86103 +_001898_hash cxio_hal_init_resource 2-7-6 29771 _001898_hash &_000295_hash
86104 +_001901_hash cxio_hal_init_rhdl_resource 1 25104 _001901_hash NULL
86105 +_001902_hash dai_list_read_file 3 25421 _001902_hash NULL
86106 +_001903_hash dapm_bias_read_file 3 64715 _001903_hash NULL
86107 +_001904_hash dapm_widget_power_read_file 3 59950 _001983_hash NULL nohasharray
86108 +_001907_hash dbgfs_frame 3 45917 _001907_hash NULL
86109 +_001908_hash dbgfs_state 3 38894 _001908_hash NULL
86110 +_001909_hash dccp_manip_pkt 2 30229 _001909_hash NULL
86111 +_001910_hash ddp_ppod_write_idata 5 25610 _001910_hash NULL
86112 +_001911_hash debugfs_read 3 62535 _001911_hash NULL
86113 +_001912_hash debug_output 3 18575 _001912_hash NULL
86114 +_001913_hash debug_read 3 19322 _001913_hash NULL
86115 +_001914_hash dev_alloc_skb 1 19517 _001914_hash &_001366_hash
86116 +_001915_hash dfs_file_read 3 18116 _001915_hash NULL
86117 +_001916_hash diva_alloc_dma_map 2 23798 _001916_hash NULL
86118 +_001917_hash diva_xdi_write 4 63975 _001917_hash NULL
86119 +_001918_hash dma_memcpy_pg_to_iovec 6 1725 _001918_hash NULL
86120 +_001919_hash dma_memcpy_to_iovec 5 12173 _001919_hash NULL
86121 +_001920_hash dma_show_regs 3 35266 _001920_hash NULL
86122 +_001921_hash dm_exception_table_init 2 39645 _001921_hash &_001149_hash
86123 +_001922_hash dn_nsp_do_disc 2-6 49474 _001922_hash NULL
86124 +_001924_hash dn_recvmsg 4 17213 _001924_hash NULL
86125 +_001925_hash dns_resolver_read 3 54658 _001925_hash NULL
86126 +_001926_hash do_msgrcv 4 5590 _001926_hash NULL
86127 +_001927_hash do_syslog 3 56807 _001927_hash NULL
86128 +_001928_hash dpcm_state_read_file 3 65489 _001928_hash NULL
86129 +_001929_hash dsp_cmx_send_member 2 15625 _001929_hash NULL
86130 +_001930_hash fallback_on_nodma_alloc 2 35332 _001930_hash NULL
86131 +_001931_hash fc_frame_alloc 2 1596 _001931_hash NULL
86132 +_001932_hash fc_frame_alloc_fill 2 59394 _001932_hash NULL
86133 +_001933_hash filter_read 3 61692 _001933_hash NULL
86134 +_001934_hash __finish_unordered_dir 4 33198 _001934_hash NULL
86135 +_001935_hash format_devstat_counter 3 32550 _001935_hash NULL
86136 +_001936_hash fragmentation_threshold_read 3 61718 _001936_hash NULL
86137 +_001937_hash fuse_conn_limit_read 3 20084 _001937_hash NULL
86138 +_001938_hash fuse_conn_waiting_read 3 49762 _001938_hash NULL
86139 +_001939_hash fuse_file_aio_write 4 46399 _001939_hash NULL
86140 +_001940_hash generic_readlink 3 32654 _001940_hash NULL
86141 +_001941_hash gre_manip_pkt 2 38785 _001941_hash NULL
86142 +_001942_hash handle_eviocgbit 3 44193 _001942_hash NULL
86143 +_001943_hash handle_response 5 55951 _001943_hash NULL
86144 +_001944_hash handle_response_icmp 7 39574 _001944_hash NULL
86145 +_001945_hash hash_recvmsg 4 50924 _001945_hash NULL
86146 +_001946_hash hci_send_cmd 3 43810 _001946_hash NULL
86147 +_001947_hash hci_si_event 3 1404 _001947_hash NULL
86148 +_001948_hash help 4 14971 _001948_hash NULL
86149 +_001949_hash hfcpci_empty_bfifo 4 62323 _001949_hash NULL
86150 +_001950_hash hidp_send_ctrl_message 4 43702 _001950_hash NULL
86151 +_001951_hash ht40allow_map_read 3 55209 _001951_hash &_001512_hash
86152 +_001952_hash hwflags_read 3 52318 _001952_hash NULL
86153 +_001953_hash hysdn_conf_read 3 42324 _001953_hash NULL
86154 +_001954_hash hysdn_sched_rx 3 60533 _001954_hash NULL
86155 +_001955_hash i2400m_rx_stats_read 3 57706 _001955_hash NULL
86156 +_001956_hash i2400m_tx_stats_read 3 28527 _001956_hash NULL
86157 +_001957_hash icmp_manip_pkt 2 48801 _001957_hash NULL
86158 +_001958_hash idmouse_read 3 63374 _001958_hash NULL
86159 +_001959_hash ieee80211_if_read 3 6785 _001959_hash NULL
86160 +_001960_hash ieee80211_rx_bss_info 3 61630 _001960_hash NULL
86161 +_001961_hash ikconfig_read_current 3 1658 _001961_hash NULL
86162 +_001962_hash il3945_sta_dbgfs_stats_table_read 3 48802 _001962_hash NULL
86163 +_001963_hash il3945_ucode_general_stats_read 3 46111 _001963_hash NULL
86164 +_001964_hash il3945_ucode_rx_stats_read 3 3048 _001964_hash NULL
86165 +_001965_hash il3945_ucode_tx_stats_read 3 36016 _001965_hash NULL
86166 +_001966_hash il4965_rs_sta_dbgfs_rate_scale_data_read 3 37792 _001966_hash NULL
86167 +_001967_hash il4965_rs_sta_dbgfs_scale_table_read 3 38564 _001967_hash NULL
86168 +_001968_hash il4965_rs_sta_dbgfs_stats_table_read 3 49206 _001968_hash NULL
86169 +_001969_hash il4965_ucode_general_stats_read 3 56277 _001969_hash NULL
86170 +_001970_hash il4965_ucode_rx_stats_read 3 61948 _001970_hash NULL
86171 +_001971_hash il4965_ucode_tx_stats_read 3 12064 _001971_hash NULL
86172 +_001972_hash il_dbgfs_chain_noise_read 3 38044 _001972_hash NULL
86173 +_001973_hash il_dbgfs_channels_read 3 25005 _001973_hash NULL
86174 +_001974_hash il_dbgfs_disable_ht40_read 3 42386 _001974_hash NULL
86175 +_001975_hash il_dbgfs_fh_reg_read 3 40993 _001975_hash NULL
86176 +_001976_hash il_dbgfs_force_reset_read 3 57517 _001976_hash NULL
86177 +_001977_hash il_dbgfs_interrupt_read 3 3351 _001977_hash NULL
86178 +_001978_hash il_dbgfs_missed_beacon_read 3 59956 _001978_hash NULL
86179 +_001979_hash il_dbgfs_nvm_read 3 12288 _001979_hash NULL
86180 +_001980_hash il_dbgfs_power_save_status_read 3 43165 _001980_hash NULL
86181 +_001981_hash il_dbgfs_qos_read 3 33615 _001981_hash NULL
86182 +_001982_hash il_dbgfs_rxon_filter_flags_read 3 19281 _001982_hash NULL
86183 +_001983_hash il_dbgfs_rxon_flags_read 3 59950 _001983_hash &_001904_hash
86184 +_001984_hash il_dbgfs_rx_queue_read 3 11221 _001984_hash NULL
86185 +_001985_hash il_dbgfs_rx_stats_read 3 15243 _001985_hash NULL
86186 +_001986_hash il_dbgfs_sensitivity_read 3 2370 _001986_hash NULL
86187 +_001987_hash il_dbgfs_sram_read 3 62296 _001987_hash NULL
86188 +_001988_hash il_dbgfs_stations_read 3 21532 _001988_hash NULL
86189 +_001989_hash il_dbgfs_status_read 3 58388 _001989_hash NULL
86190 +_001990_hash il_dbgfs_tx_queue_read 3 55668 _001990_hash NULL
86191 +_001991_hash il_dbgfs_tx_stats_read 3 32913 _001991_hash NULL
86192 +_001992_hash ima_show_htable_value 2 57136 _001992_hash NULL
86193 +_001994_hash intel_fake_agp_alloc_by_type 1 1 _001994_hash NULL
86194 +_001995_hash ip4ip6_err 5 36772 _001995_hash NULL
86195 +_001996_hash ip6_append_data 4-5 36490 _003601_hash NULL nohasharray
86196 +_001997_hash ip6ip6_err 5 18308 _001997_hash NULL
86197 +_001998_hash __ip_append_data 7-8 36191 _001998_hash NULL
86198 +_001999_hash ip_vs_icmp_xmit 4 59624 _001999_hash NULL
86199 +_002000_hash ip_vs_icmp_xmit_v6 4 20464 _002000_hash NULL
86200 +_002001_hash ipw_write 3 59807 _002001_hash NULL
86201 +_002002_hash irda_recvmsg_stream 4 35280 _002002_hash NULL
86202 +_002003_hash irq_domain_add_simple 2 46734 _002003_hash NULL
86203 +_002004_hash __iscsi_complete_pdu 4 10726 _002004_hash NULL
86204 +_002005_hash iscsi_nop_out_rsp 4 51117 _002005_hash NULL
86205 +_002006_hash iscsi_tcp_conn_setup 2 16376 _002006_hash NULL
86206 +_002007_hash iwl_dbgfs_bt_traffic_read 3 35534 _002007_hash NULL
86207 +_002008_hash iwl_dbgfs_calib_disabled_read 3 22649 _002008_hash NULL
86208 +_002009_hash iwl_dbgfs_chain_noise_read 3 46355 _002009_hash NULL
86209 +_002010_hash iwl_dbgfs_channels_read 3 6784 _002010_hash NULL
86210 +_002011_hash iwl_dbgfs_current_sleep_command_read 3 2081 _002011_hash NULL
86211 +_002012_hash iwl_dbgfs_disable_ht40_read 3 35761 _002012_hash NULL
86212 +_002013_hash iwl_dbgfs_fh_reg_read 3 879 _002013_hash &_000406_hash
86213 +_002014_hash iwl_dbgfs_interrupt_read 3 23574 _002014_hash NULL
86214 +_002015_hash iwl_dbgfs_log_event_read 3 2107 _002015_hash NULL
86215 +_002016_hash iwl_dbgfs_missed_beacon_read 3 50584 _002016_hash NULL
86216 +_002017_hash iwl_dbgfs_nvm_read 3 23845 _002017_hash NULL
86217 +_002018_hash iwl_dbgfs_plcp_delta_read 3 55407 _002018_hash NULL
86218 +_002019_hash iwl_dbgfs_power_save_status_read 3 54392 _002019_hash NULL
86219 +_002020_hash iwl_dbgfs_protection_mode_read 3 13943 _002020_hash NULL
86220 +_002021_hash iwl_dbgfs_qos_read 3 11753 _002021_hash NULL
86221 +_002022_hash iwl_dbgfs_reply_tx_error_read 3 19205 _002022_hash NULL
86222 +_002023_hash iwl_dbgfs_rf_reset_read 3 26512 _002023_hash NULL
86223 +_002024_hash iwl_dbgfs_rx_handlers_read 3 18708 _002024_hash NULL
86224 +_002025_hash iwl_dbgfs_rxon_filter_flags_read 3 28832 _002025_hash NULL
86225 +_002026_hash iwl_dbgfs_rxon_flags_read 3 20795 _002026_hash NULL
86226 +_002027_hash iwl_dbgfs_rx_queue_read 3 19943 _002027_hash NULL
86227 +_002028_hash iwl_dbgfs_sensitivity_read 3 63116 _002731_hash NULL nohasharray
86228 +_002029_hash iwl_dbgfs_sleep_level_override_read 3 3038 _002029_hash NULL
86229 +_002030_hash iwl_dbgfs_sram_read 3 44505 _002030_hash NULL
86230 +_002031_hash iwl_dbgfs_stations_read 3 9309 _002031_hash NULL
86231 +_002032_hash iwl_dbgfs_status_read 3 5171 _002032_hash NULL
86232 +_002033_hash iwl_dbgfs_temperature_read 3 29224 _002033_hash NULL
86233 +_002034_hash iwl_dbgfs_thermal_throttling_read 3 38779 _002034_hash NULL
86234 +_002035_hash iwl_dbgfs_tx_queue_read 3 4635 _002035_hash NULL
86235 +_002036_hash iwl_dbgfs_ucode_bt_stats_read 3 42820 _002036_hash NULL
86236 +_002037_hash iwl_dbgfs_ucode_general_stats_read 3 49199 _002037_hash NULL
86237 +_002038_hash iwl_dbgfs_ucode_rx_stats_read 3 58023 _002038_hash NULL
86238 +_002039_hash iwl_dbgfs_ucode_tracing_read 3 47983 _002039_hash &_000356_hash
86239 +_002040_hash iwl_dbgfs_ucode_tx_stats_read 3 31611 _002040_hash NULL
86240 +_002041_hash iwl_dbgfs_wowlan_sram_read 3 540 _002041_hash NULL
86241 +_002042_hash joydev_ioctl 2 33343 _002042_hash NULL
86242 +_002043_hash kernel_readv 3 35617 _002043_hash NULL
86243 +_002044_hash key_algorithm_read 3 57946 _002044_hash NULL
86244 +_002045_hash key_icverrors_read 3 20895 _002045_hash NULL
86245 +_002046_hash key_key_read 3 3241 _002046_hash NULL
86246 +_002047_hash key_replays_read 3 62746 _002047_hash NULL
86247 +_002048_hash key_rx_spec_read 3 12736 _002048_hash NULL
86248 +_002049_hash key_tx_spec_read 3 4862 _002049_hash NULL
86249 +_002050_hash __kfifo_to_user 3 36555 _002568_hash NULL nohasharray
86250 +_002051_hash __kfifo_to_user_r 3 39123 _002051_hash NULL
86251 +_002052_hash kmem_zalloc_greedy 2-3 65268 _002052_hash NULL
86252 +_002054_hash l1oip_socket_recv 6 56537 _002054_hash NULL
86253 +_002055_hash l2cap_build_cmd 4 48676 _002055_hash NULL
86254 +_002056_hash l2cap_chan_send 3 49995 _002056_hash NULL
86255 +_002057_hash l2cap_segment_sdu 4 48772 _002057_hash NULL
86256 +_002058_hash l2down_create 4 21755 _002058_hash NULL
86257 +_002059_hash l2tp_xmit_skb 3 42672 _002059_hash NULL
86258 +_002060_hash l2up_create 3 6430 _002060_hash NULL
86259 +_002061_hash lbs_debugfs_read 3 30721 _002061_hash NULL
86260 +_002062_hash lbs_dev_info 3 51023 _002062_hash NULL
86261 +_002063_hash lbs_host_sleep_read 3 31013 _002063_hash NULL
86262 +_002064_hash lbs_rdbbp_read 3 45805 _002064_hash NULL
86263 +_002065_hash lbs_rdmac_read 3 418 _002065_hash NULL
86264 +_002066_hash lbs_rdrf_read 3 41431 _002066_hash NULL
86265 +_002067_hash lbs_sleepparams_read 3 10840 _002067_hash NULL
86266 +_002068_hash lbs_threshold_read 5 21046 _002068_hash NULL
86267 +_002069_hash ldisc_receive 4 41516 _002069_hash NULL
86268 +_002070_hash libfc_vport_create 2 4415 _002070_hash NULL
86269 +_002073_hash lkdtm_debugfs_read 3 45752 _002073_hash NULL
86270 +_002074_hash llcp_sock_recvmsg 4 13556 _002074_hash NULL
86271 +_002075_hash long_retry_limit_read 3 59766 _002075_hash NULL
86272 +_002076_hash lpfc_debugfs_dif_err_read 3 36303 _002076_hash NULL
86273 +_002077_hash lpfc_debugfs_read 3 16566 _002077_hash NULL
86274 +_002078_hash lpfc_idiag_baracc_read 3 58466 _002972_hash NULL nohasharray
86275 +_002079_hash lpfc_idiag_ctlacc_read 3 33943 _002079_hash NULL
86276 +_002080_hash lpfc_idiag_drbacc_read 3 15948 _002080_hash NULL
86277 +_002081_hash lpfc_idiag_extacc_read 3 48301 _002081_hash NULL
86278 +_002082_hash lpfc_idiag_mbxacc_read 3 28061 _002082_hash NULL
86279 +_002083_hash lpfc_idiag_pcicfg_read 3 50334 _002083_hash NULL
86280 +_002084_hash lpfc_idiag_queacc_read 3 13950 _002084_hash NULL
86281 +_002085_hash lpfc_idiag_queinfo_read 3 55662 _002085_hash NULL
86282 +_002086_hash lro_gen_skb 6 2644 _002086_hash NULL
86283 +_002087_hash mac80211_format_buffer 2 41010 _002087_hash NULL
86284 +_002088_hash macvtap_alloc_skb 2-4-3 50629 _002088_hash NULL
86285 +_002091_hash macvtap_put_user 4 55609 _002091_hash NULL
86286 +_002092_hash macvtap_sendmsg 4 30629 _002092_hash NULL
86287 +_002093_hash mangle_packet 6-8 27864 _002093_hash NULL
86288 +_002095_hash manip_pkt 3 7741 _002095_hash NULL
86289 +_002096_hash mempool_create_kmalloc_pool 1 41650 _002096_hash NULL
86290 +_002097_hash mempool_create_page_pool 1 30189 _002097_hash NULL
86291 +_002098_hash mempool_create_slab_pool 1 62907 _002098_hash NULL
86292 +_002099_hash mgmt_device_found 10 14146 _002099_hash NULL
86293 +_002100_hash minstrel_stats_read 3 17290 _002100_hash NULL
86294 +_002101_hash mmc_ext_csd_read 3 13205 _002101_hash NULL
86295 +_002102_hash mon_bin_read 3 6841 _002102_hash NULL
86296 +_002103_hash mon_stat_read 3 25238 _002103_hash NULL
86297 +_002105_hash mqueue_read_file 3 6228 _002105_hash NULL
86298 +_002106_hash mwifiex_debug_read 3 53074 _002106_hash NULL
86299 +_002107_hash mwifiex_getlog_read 3 54269 _002107_hash NULL
86300 +_002108_hash mwifiex_info_read 3 53447 _002108_hash NULL
86301 +_002109_hash mwifiex_rdeeprom_read 3 51429 _002109_hash NULL
86302 +_002110_hash mwifiex_regrdwr_read 3 34472 _002110_hash NULL
86303 +_002111_hash named_prepare_buf 2 24532 _002111_hash NULL
86304 +_002112_hash nci_send_cmd 3 58206 _002112_hash NULL
86305 +_002113_hash netdev_alloc_skb_ip_align 2 40811 _002113_hash NULL
86306 +_002114_hash netpoll_send_udp 3 58955 _002114_hash NULL
86307 +_002115_hash nfcwilink_send_bts_cmd 3 10802 _002115_hash NULL
86308 +_002116_hash nf_nat_mangle_tcp_packet 5-7 8643 _002116_hash NULL
86309 +_002119_hash nfsd_vfs_read 6 62605 _002616_hash NULL nohasharray
86310 +_002120_hash nfsd_vfs_write 6 54577 _002120_hash NULL
86311 +_002121_hash nfs_idmap_lookup_id 2 10660 _002121_hash NULL
86312 +_002122_hash ntfs_rl_realloc 3 56831 _002122_hash &_000370_hash
86313 +_002123_hash ntfs_rl_realloc_nofail 3 32173 _002123_hash NULL
86314 +_002124_hash o2hb_debug_read 3 37851 _002124_hash NULL
86315 +_002125_hash o2net_debug_read 3 52105 _002125_hash NULL
86316 +_002126_hash ocfs2_control_read 3 56405 _002126_hash NULL
86317 +_002127_hash ocfs2_debug_read 3 14507 _002127_hash NULL
86318 +_002128_hash oom_adjust_read 3 25127 _002128_hash NULL
86319 +_002129_hash oom_score_adj_read 3 39921 _002426_hash NULL nohasharray
86320 +_002130_hash oprofilefs_str_to_user 3 42182 _002130_hash NULL
86321 +_002131_hash oprofilefs_ulong_to_user 3 11582 _002131_hash NULL
86322 +_002132_hash osd_req_add_get_attr_list 3 49278 _002132_hash NULL
86323 +_002133_hash _osd_req_list_objects 6 4204 _002133_hash NULL
86324 +_002134_hash osd_req_read_kern 5 59990 _002134_hash NULL
86325 +_002135_hash osd_req_write_kern 5 53486 _002135_hash NULL
86326 +_002136_hash osst_read 3 40237 _002136_hash NULL
86327 +_002137_hash p54_alloc_skb 3 34366 _002137_hash &_000485_hash
86328 +_002138_hash p54_init_common 1 23850 _002138_hash NULL
86329 +_002139_hash packet_alloc_skb 2-5-4 62602 _002139_hash NULL
86330 +_002142_hash packet_sendmsg 4 24954 _002142_hash NULL
86331 +_002143_hash page_readlink 3 23346 _002143_hash NULL
86332 +_002144_hash pcf50633_write_block 3 2124 _002144_hash NULL
86333 +_002145_hash pcpu_alloc_alloc_info 1-2 45813 _002145_hash NULL
86334 +_002147_hash pep_indicate 5 38611 _002147_hash NULL
86335 +_002148_hash pep_reply 5 50582 _002148_hash NULL
86336 +_002149_hash pipe_handler_request 5 50774 _003582_hash NULL nohasharray
86337 +_002150_hash platform_list_read_file 3 34734 _002150_hash NULL
86338 +_002151_hash pm860x_bulk_write 3 43875 _002151_hash NULL
86339 +_002152_hash pm_qos_power_read 3 55891 _002152_hash NULL
86340 +_002153_hash port_show_regs 3 5904 _002153_hash NULL
86341 +_002154_hash proc_coredump_filter_read 3 39153 _002154_hash NULL
86342 +_002155_hash proc_fdinfo_read 3 62043 _002155_hash NULL
86343 +_002156_hash proc_file_read 3 53905 _002156_hash NULL
86344 +_002157_hash proc_info_read 3 63344 _002157_hash NULL
86345 +_002158_hash proc_loginuid_read 3 15631 _002158_hash NULL
86346 +_002159_hash proc_pid_attr_read 3 10173 _002159_hash NULL
86347 +_002160_hash proc_pid_readlink 3 52186 _002160_hash NULL
86348 +_002161_hash proc_read 3 43614 _002161_hash NULL
86349 +_002162_hash proc_self_readlink 3 38094 _002162_hash NULL
86350 +_002163_hash proc_sessionid_read 3 6911 _002299_hash NULL nohasharray
86351 +_002164_hash provide_user_output 3 41105 _002164_hash NULL
86352 +_002165_hash pskb_network_may_pull 2 35336 _002165_hash NULL
86353 +_002166_hash pskb_pull 2 65005 _002166_hash NULL
86354 +_002167_hash pstore_file_read 3 57288 _002167_hash NULL
86355 +_002168_hash ql_process_mac_rx_page 4 15543 _002168_hash NULL
86356 +_002169_hash ql_process_mac_rx_skb 4 6689 _002169_hash NULL
86357 +_002170_hash queues_read 3 24877 _002170_hash NULL
86358 +_002171_hash raw_recvmsg 4 17277 _002171_hash NULL
86359 +_002172_hash rcname_read 3 25919 _002172_hash NULL
86360 +_002173_hash read_4k_modal_eeprom 3 30212 _002173_hash NULL
86361 +_002174_hash read_9287_modal_eeprom 3 59327 _002174_hash NULL
86362 +_002175_hash reada_find_extent 2 63486 _002175_hash NULL
86363 +_002176_hash read_def_modal_eeprom 3 14041 _002176_hash NULL
86364 +_002177_hash read_enabled_file_bool 3 37744 _002177_hash NULL
86365 +_002178_hash read_file_ani 3 23161 _002178_hash NULL
86366 +_002179_hash read_file_antenna 3 13574 _002179_hash NULL
86367 +_002180_hash read_file_base_eeprom 3 42168 _002180_hash NULL
86368 +_002181_hash read_file_beacon 3 32595 _002181_hash NULL
86369 +_002182_hash read_file_blob 3 57406 _002182_hash NULL
86370 +_002183_hash read_file_bool 3 4180 _002183_hash NULL
86371 +_002184_hash read_file_credit_dist_stats 3 54367 _002184_hash NULL
86372 +_002185_hash read_file_debug 3 58256 _002185_hash NULL
86373 +_002186_hash read_file_disable_ani 3 6536 _002186_hash NULL
86374 +_002187_hash read_file_dma 3 9530 _002187_hash NULL
86375 +_002188_hash read_file_dump_nfcal 3 18766 _002188_hash NULL
86376 +_002189_hash read_file_frameerrors 3 64001 _002189_hash NULL
86377 +_002190_hash read_file_interrupt 3 61742 _002197_hash NULL nohasharray
86378 +_002191_hash read_file_misc 3 9948 _002191_hash NULL
86379 +_002192_hash read_file_modal_eeprom 3 39909 _002192_hash NULL
86380 +_002193_hash read_file_queue 3 40895 _002193_hash NULL
86381 +_002194_hash read_file_rcstat 3 22854 _002194_hash NULL
86382 +_002195_hash read_file_recv 3 48232 _002195_hash NULL
86383 +_002196_hash read_file_regidx 3 33370 _002196_hash NULL
86384 +_002197_hash read_file_regval 3 61742 _002197_hash &_002190_hash
86385 +_002198_hash read_file_reset 3 52310 _002198_hash NULL
86386 +_002199_hash read_file_rx_chainmask 3 41605 _002199_hash NULL
86387 +_002200_hash read_file_slot 3 50111 _002200_hash NULL
86388 +_002201_hash read_file_stations 3 35795 _002201_hash NULL
86389 +_002202_hash read_file_tgt_int_stats 3 20697 _002202_hash NULL
86390 +_002203_hash read_file_tgt_rx_stats 3 33944 _002203_hash NULL
86391 +_002204_hash read_file_tgt_stats 3 8959 _002204_hash NULL
86392 +_002205_hash read_file_tgt_tx_stats 3 51847 _002205_hash NULL
86393 +_002206_hash read_file_tx_chainmask 3 3829 _002206_hash NULL
86394 +_002207_hash read_file_war_stats 3 292 _002207_hash NULL
86395 +_002208_hash read_file_xmit 3 21487 _002208_hash NULL
86396 +_002209_hash read_flush_pipefs 3 20171 _002209_hash NULL
86397 +_002210_hash read_flush_procfs 3 27642 _002210_hash NULL
86398 +_002211_hash read_from_oldmem 2 3337 _002211_hash NULL
86399 +_002212_hash read_oldmem 3 55658 _002212_hash NULL
86400 +_002213_hash receive_packet 2 12367 _002213_hash NULL
86401 +_002214_hash regmap_name_read_file 3 39379 _002214_hash NULL
86402 +_002215_hash repair_io_failure 4 4815 _002215_hash NULL
86403 +_002216_hash request_key_and_link 4 42693 _002216_hash NULL
86404 +_002217_hash res_counter_read 4 33499 _002217_hash NULL
86405 +_002218_hash rfcomm_tty_write 3 51603 _002218_hash NULL
86406 +_002219_hash rs_sta_dbgfs_rate_scale_data_read 3 47165 _002219_hash NULL
86407 +_002220_hash rs_sta_dbgfs_scale_table_read 3 40262 _002220_hash NULL
86408 +_002221_hash rs_sta_dbgfs_stats_table_read 3 56573 _002221_hash NULL
86409 +_002222_hash rts_threshold_read 3 44384 _002222_hash NULL
86410 +_002223_hash rxrpc_sendmsg 4 29049 _002223_hash NULL
86411 +_002224_hash scrub_setup_recheck_block 3-4 56245 _002224_hash NULL
86412 +_002226_hash scsi_adjust_queue_depth 3 12802 _002226_hash NULL
86413 +_002227_hash sctp_make_abort 3 34459 _002227_hash NULL
86414 +_002228_hash sctp_make_asconf 3 4078 _002228_hash NULL
86415 +_002229_hash sctp_make_asconf_ack 3 31726 _002229_hash NULL
86416 +_002230_hash sctp_make_datafrag_empty 3 34737 _002230_hash NULL
86417 +_002231_hash sctp_make_fwdtsn 3 53265 _002231_hash NULL
86418 +_002232_hash sctp_make_heartbeat_ack 4 34411 _002232_hash NULL
86419 +_002233_hash sctp_make_init 4 58401 _002233_hash NULL
86420 +_002234_hash sctp_make_init_ack 4 3335 _002234_hash NULL
86421 +_002235_hash sctp_make_op_error_space 3 5528 _002235_hash NULL
86422 +_002236_hash sctp_manip_pkt 2 40620 _002236_hash NULL
86423 +_002237_hash selinux_inode_notifysecctx 3 36896 _002237_hash NULL
86424 +_002238_hash sel_read_avc_cache_threshold 3 33942 _002238_hash NULL
86425 +_002239_hash sel_read_avc_hash_stats 3 1984 _002239_hash NULL
86426 +_002240_hash sel_read_bool 3 24236 _002240_hash NULL
86427 +_002241_hash sel_read_checkreqprot 3 33068 _002241_hash NULL
86428 +_002242_hash sel_read_class 3 12669 _002960_hash NULL nohasharray
86429 +_002243_hash sel_read_enforce 3 2828 _002243_hash NULL
86430 +_002244_hash sel_read_handle_status 3 56139 _002244_hash NULL
86431 +_002245_hash sel_read_handle_unknown 3 57933 _002245_hash NULL
86432 +_002246_hash sel_read_initcon 3 32362 _002246_hash NULL
86433 +_002247_hash sel_read_mls 3 25369 _002247_hash NULL
86434 +_002248_hash sel_read_perm 3 42302 _002248_hash NULL
86435 +_002249_hash sel_read_policy 3 55947 _002249_hash NULL
86436 +_002250_hash sel_read_policycap 3 28544 _002250_hash NULL
86437 +_002251_hash sel_read_policyvers 3 55 _002827_hash NULL nohasharray
86438 +_002252_hash send_mpa_reject 3 7135 _002252_hash NULL
86439 +_002253_hash send_mpa_reply 3 32372 _002253_hash NULL
86440 +_002254_hash send_msg 4 37323 _002254_hash NULL
86441 +_002255_hash send_packet 4 52960 _002255_hash NULL
86442 +_002256_hash set_rxd_buffer_pointer 8 9950 _002256_hash NULL
86443 +_002257_hash sge_rx 3 50594 _002257_hash NULL
86444 +_002258_hash short_retry_limit_read 3 4687 _002258_hash NULL
86445 +_002259_hash simple_attr_read 3 24738 _002259_hash NULL
86446 +_002260_hash simple_transaction_read 3 17076 _002260_hash NULL
86447 +_002261_hash sisusbcon_bmove 5-7-6 21873 _002261_hash NULL
86448 +_002264_hash sisusbcon_clear 3-5-4 64329 _002264_hash NULL
86449 +_002267_hash sisusbcon_putcs 3 57630 _002267_hash &_001043_hash
86450 +_002268_hash sisusbcon_scroll 5-3-2 31315 _002268_hash NULL
86451 +_002269_hash sisusbcon_scroll_area 3-4 25899 _002269_hash NULL
86452 +_002271_hash skb_copy_datagram_const_iovec 2-5-4 48102 _002271_hash NULL
86453 +_002274_hash skb_copy_datagram_iovec 2-4 5806 _002274_hash NULL
86454 +_002276_hash skb_gro_header_slow 2 34958 _002276_hash NULL
86455 +_002277_hash smk_read_ambient 3 61220 _002277_hash NULL
86456 +_002278_hash smk_read_direct 3 15803 _002278_hash NULL
86457 +_002279_hash smk_read_doi 3 30813 _002279_hash NULL
86458 +_002280_hash smk_read_logging 3 37804 _002280_hash NULL
86459 +_002281_hash smk_read_mapped 3 7562 _002281_hash NULL
86460 +_002282_hash smk_read_onlycap 3 3855 _002282_hash NULL
86461 +_002283_hash smp_build_cmd 3 45853 _002283_hash NULL
86462 +_002284_hash snapshot_read 3 22601 _002284_hash NULL
86463 +_002285_hash snd_cs4281_BA0_read 5 6847 _002285_hash NULL
86464 +_002286_hash snd_cs4281_BA1_read 5 20323 _002286_hash NULL
86465 +_002287_hash snd_cs46xx_io_read 5 45734 _002287_hash NULL
86466 +_002288_hash snd_gus_dram_read 4 56686 _002288_hash NULL
86467 +_002289_hash snd_mixart_BA0_read 5 45069 _002289_hash NULL
86468 +_002290_hash snd_mixart_BA1_read 5 5082 _002290_hash NULL
86469 +_002291_hash snd_pcm_oss_read 3 28317 _002291_hash NULL
86470 +_002292_hash snd_pcm_plug_alloc 2 42339 _002292_hash NULL
86471 +_002293_hash snd_rawmidi_kernel_read 3 4328 _002293_hash NULL
86472 +_002294_hash snd_rawmidi_read 3 56337 _002294_hash NULL
86473 +_002295_hash snd_rme32_capture_copy 5 39653 _002295_hash NULL
86474 +_002296_hash snd_rme96_capture_copy 5 58484 _002296_hash NULL
86475 +_002297_hash snd_soc_hw_bulk_write_raw 4 14245 _002297_hash NULL
86476 +_002298_hash sock_alloc_send_skb 2 23720 _002298_hash NULL
86477 +_002299_hash spi_show_regs 3 6911 _002299_hash &_002163_hash
86478 +_002300_hash sta_agg_status_read 3 14058 _002300_hash NULL
86479 +_002301_hash sta_connected_time_read 3 17435 _002301_hash NULL
86480 +_002302_hash sta_flags_read 3 56710 _002302_hash NULL
86481 +_002303_hash sta_ht_capa_read 3 10366 _002303_hash NULL
86482 +_002304_hash sta_last_seq_ctrl_read 3 19106 _002304_hash NULL
86483 +_002305_hash sta_num_ps_buf_frames_read 3 1488 _002305_hash NULL
86484 +_002306_hash st_read 3 51251 _002306_hash NULL
86485 +_002307_hash supply_map_read_file 3 10608 _002307_hash NULL
86486 +_002308_hash sysfs_read_file 3 42113 _002308_hash NULL
86487 +_002309_hash sys_preadv 3 17100 _002309_hash NULL
86488 +_002310_hash sys_pwritev 3 41722 _002310_hash NULL
86489 +_002311_hash sys_readv 3 50664 _002311_hash NULL
86490 +_002312_hash sys_rt_sigpending 2 24961 _002312_hash NULL
86491 +_002313_hash sys_writev 3 28384 _002313_hash NULL
86492 +_002314_hash tcf_csum_skb_nextlayer 3 64025 _002314_hash NULL
86493 +_002315_hash tcp_fragment 3 20436 _002315_hash NULL
86494 +_002316_hash tcp_manip_pkt 2 14202 _002316_hash NULL
86495 +_002317_hash teiup_create 3 43201 _002317_hash NULL
86496 +_002318_hash test_iso_queue 5 62534 _002318_hash NULL
86497 +_002319_hash tg3_run_loopback 2 30093 _002319_hash NULL
86498 +_002320_hash tipc_msg_build 4 12326 _002320_hash NULL
86499 +_002321_hash TSS_authhmac 3 12839 _002321_hash NULL
86500 +_002322_hash TSS_checkhmac1 5 31429 _002322_hash NULL
86501 +_002323_hash TSS_checkhmac2 5-7 40520 _002323_hash NULL
86502 +_002325_hash tty_audit_log 8 47280 _002325_hash NULL
86503 +_002326_hash tty_buffer_request_room 2 23228 _002326_hash NULL
86504 +_002327_hash tty_insert_flip_string_fixed_flag 4 37428 _002327_hash NULL
86505 +_002328_hash tty_insert_flip_string_flags 4 30969 _002328_hash NULL
86506 +_002329_hash tty_prepare_flip_string 3 39955 _002329_hash NULL
86507 +_002330_hash tty_prepare_flip_string_flags 4 59240 _002330_hash NULL
86508 +_002331_hash tun_alloc_skb 2-4-3 41216 _002331_hash NULL
86509 +_002334_hash tun_sendmsg 4 10337 _002334_hash NULL
86510 +_002335_hash u32_array_read 3 2219 _002335_hash NULL
86511 +_002336_hash ubi_io_write_data 4-5 40305 _002336_hash NULL
86512 +_002338_hash udplite_manip_pkt 2 62433 _002338_hash NULL
86513 +_002339_hash udp_manip_pkt 2 50770 _002339_hash NULL
86514 +_002340_hash uhci_debug_read 3 5911 _002340_hash NULL
86515 +_002341_hash um_idi_read 3 850 _002341_hash NULL
86516 +_002342_hash unix_seqpacket_sendmsg 4 27893 _002342_hash NULL
86517 +_002343_hash unix_stream_recvmsg 4 35210 _002343_hash NULL
86518 +_002344_hash unlink_simple 3 47506 _002344_hash NULL
86519 +_002345_hash use_pool 2 64607 _002345_hash NULL
86520 +_002346_hash v9fs_fid_readn 4 60544 _002346_hash NULL
86521 +_002347_hash v9fs_file_read 3 40858 _002347_hash NULL
86522 +_002348_hash vhci_read 3 47878 _002348_hash NULL
86523 +_002349_hash vhost_add_used_and_signal_n 4 8038 _002349_hash NULL
86524 +_002350_hash vmbus_open 2-3 12154 _002350_hash NULL
86525 +_002352_hash vxge_rx_alloc 3 52024 _002352_hash NULL
86526 +_002353_hash waiters_read 3 40902 _002353_hash NULL
86527 +_002354_hash wm8994_bulk_write 3 13615 _002354_hash NULL
86528 +_002355_hash write_pbl 4 59583 _002355_hash NULL
86529 +_002356_hash wusb_prf_256 7 29203 _002356_hash NULL
86530 +_002357_hash wusb_prf_64 7 51065 _002357_hash NULL
86531 +_002358_hash _xfs_buf_alloc 3 38058 _002358_hash NULL
86532 +_002359_hash xfs_buf_read_uncached 3 42844 _002359_hash NULL
86533 +_002360_hash xfs_file_buffered_aio_write 4 11492 _002360_hash NULL
86534 +_002361_hash xfs_iext_add 3 41422 _002361_hash NULL
86535 +_002362_hash xfs_iext_remove_direct 3 40744 _002362_hash NULL
86536 +_002363_hash xfs_readdir 3 41200 _002363_hash NULL
86537 +_002364_hash xfs_trans_get_efd 3 51148 _002364_hash NULL
86538 +_002365_hash xfs_trans_get_efi 2 7898 _002365_hash NULL
86539 +_002366_hash xlog_bread_offset 3 60030 _002366_hash NULL
86540 +_002367_hash xlog_get_bp 2 23229 _002367_hash NULL
86541 +_002368_hash xz_dec_init 2 29029 _002368_hash NULL
86542 +_002369_hash aac_change_queue_depth 2 825 _002369_hash NULL
86543 +_002370_hash add_rx_skb 3 8257 _002370_hash NULL
86544 +_002371_hash afs_extract_data 5 50261 _002371_hash NULL
86545 +_002372_hash arcmsr_adjust_disk_queue_depth 2 16756 _002372_hash NULL
86546 +_002373_hash atalk_recvmsg 4 22053 _002373_hash NULL
86547 +_002374_hash ath6kl_buf_alloc 1 57304 _002374_hash NULL
86548 +_002376_hash atomic_read_file 3 16227 _002376_hash NULL
86549 +_002377_hash ax25_recvmsg 4 64441 _002377_hash NULL
86550 +_002378_hash batadv_add_packet 3 12136 _002378_hash NULL
86551 +_002379_hash batadv_iv_ogm_aggregate_new 2 54761 _002379_hash NULL
86552 +_002380_hash batadv_tt_response_fill_table 1 39236 _002380_hash NULL
86553 +_002381_hash beiscsi_process_async_pdu 7 39834 _002381_hash NULL
86554 +_002382_hash bioset_create 1 5580 _002382_hash NULL
86555 +_002383_hash bioset_integrity_create 2 62708 _002383_hash NULL
86556 +_002384_hash biovec_create_pools 2 9575 _002384_hash NULL
86557 +_002385_hash bnx2fc_process_l2_frame_compl 3 65072 _002385_hash NULL
86558 +_002386_hash brcmf_sdbrcm_died_dump 3 15841 _002386_hash NULL
86559 +_002387_hash brcmu_pkt_buf_get_skb 1 5556 _002387_hash NULL
86560 +_002388_hash br_send_bpdu 3 29669 _002388_hash NULL
86561 +_002389_hash btrfs_error_discard_extent 2 50444 _002389_hash NULL
86562 +_002390_hash __btrfs_free_reserved_extent 2 31207 _002390_hash NULL
86563 +_002391_hash btrfsic_cmp_log_and_dev_bytenr 2 49628 _002391_hash NULL
86564 +_002392_hash btrfsic_create_link_to_next_block 4 58246 _002392_hash NULL
86565 +_002393_hash btrfs_init_new_buffer 4 55761 _002393_hash NULL
86566 +_002394_hash btrfs_mksubvol 3 58240 _002394_hash NULL
86567 +_002395_hash bt_skb_send_alloc 2 6581 _002395_hash NULL
86568 +_002396_hash bt_sock_recvmsg 4 12316 _002396_hash NULL
86569 +_002397_hash bt_sock_stream_recvmsg 4 52518 _002397_hash NULL
86570 +_002398_hash c4iw_reject_cr 3 28174 _002398_hash NULL
86571 +_002399_hash caif_seqpkt_recvmsg 4 32241 _002399_hash NULL
86572 +_002400_hash carl9170_rx_copy_data 2 21656 _002400_hash NULL
86573 +_002401_hash cfpkt_append 3 61206 _002401_hash NULL
86574 +_002402_hash cfpkt_setlen 2 49343 _002402_hash NULL
86575 +_002403_hash cgroup_file_read 3 28804 _002403_hash NULL
86576 +_002404_hash cosa_net_setup_rx 2 38594 _002404_hash NULL
86577 +_002405_hash cpu_type_read 3 36540 _002405_hash NULL
86578 +_002406_hash cxgb4_pktgl_to_skb 2 61899 _002406_hash NULL
86579 +_002408_hash dccp_recvmsg 4 16056 _002408_hash NULL
86580 +_002409_hash ddp_clear_map 4 46152 _002409_hash NULL
86581 +_002410_hash ddp_set_map 4 751 _002410_hash NULL
86582 +_002411_hash depth_read 3 31112 _002411_hash NULL
86583 +_002412_hash dfs_global_file_read 3 7787 _002412_hash NULL
86584 +_002413_hash dgram_recvmsg 4 23104 _002413_hash NULL
86585 +_002414_hash diva_init_dma_map 3 58336 _002414_hash NULL
86586 +_002415_hash divas_write 3 63901 _002415_hash NULL
86587 +_002416_hash dma_push_rx 2 39973 _002416_hash NULL
86588 +_002417_hash dma_skb_copy_datagram_iovec 3-5 21516 _002417_hash NULL
86589 +_002419_hash dm_table_create 3 35687 _002419_hash NULL
86590 +_002420_hash dn_alloc_send_pskb 2 4465 _002420_hash NULL
86591 +_002421_hash dn_nsp_return_disc 2 60296 _002421_hash NULL
86592 +_002422_hash dn_nsp_send_disc 2 23469 _002422_hash NULL
86593 +_002423_hash dsp_tone_hw_message 3 17678 _002423_hash NULL
86594 +_002424_hash e1000_check_copybreak 3 62448 _002424_hash NULL
86595 +_002425_hash enable_read 3 2117 _002425_hash &_000224_hash
86596 +_002426_hash exofs_read_kern 6 39921 _002426_hash &_002129_hash
86597 +_002427_hash fast_rx_path 3 59214 _002427_hash NULL
86598 +_002428_hash fc_change_queue_depth 2 36841 _002428_hash NULL
86599 +_002429_hash fc_fcp_frame_alloc 2 12624 _002429_hash NULL
86600 +_002430_hash fcoe_ctlr_send_keep_alive 3 15308 _002430_hash NULL
86601 +_002431_hash frequency_read 3 64031 _003698_hash NULL nohasharray
86602 +_002432_hash ftdi_process_packet 5 45005 _002432_hash NULL
86603 +_002433_hash fuse_conn_congestion_threshold_read 3 51028 _002433_hash NULL
86604 +_002434_hash fuse_conn_max_background_read 3 10855 _002434_hash NULL
86605 +_002435_hash fwnet_incoming_packet 3 40380 _002435_hash NULL
86606 +_002436_hash fwnet_pd_new 4 39947 _003402_hash NULL nohasharray
86607 +_002437_hash get_alua_req 3 4166 _002437_hash NULL
86608 +_002438_hash get_rdac_req 3 45882 _002438_hash NULL
86609 +_002439_hash got_frame 2 16028 _002439_hash NULL
86610 +_002440_hash gsm_mux_rx_netchar 3 33336 _002440_hash NULL
86611 +_002441_hash hci_sock_recvmsg 4 7072 _002441_hash NULL
86612 +_002442_hash hdlcdev_rx 3 997 _002442_hash NULL
86613 +_002443_hash hdlc_empty_fifo 2 18397 _002443_hash NULL
86614 +_002444_hash hfc_empty_fifo 2 57972 _002444_hash NULL
86615 +_002445_hash hfcpci_empty_fifo 4 2427 _002445_hash NULL
86616 +_002446_hash hfcsusb_rx_frame 3 52745 _002446_hash NULL
86617 +_002447_hash hidp_output_raw_report 3 5629 _002447_hash NULL
86618 +_002448_hash hpsa_change_queue_depth 2 15449 _002448_hash NULL
86619 +_002449_hash hptiop_adjust_disk_queue_depth 2 20122 _002449_hash NULL
86620 +_002450_hash hscx_empty_fifo 2 13360 _002450_hash NULL
86621 +_002451_hash hysdn_rx_netpkt 3 16136 _002451_hash NULL
86622 +_002452_hash i2o_pool_alloc 4 55485 _002452_hash NULL
86623 +_002453_hash ide_queue_pc_tail 5 11673 _002453_hash NULL
86624 +_002454_hash ide_raw_taskfile 4 42355 _002454_hash NULL
86625 +_002455_hash idetape_queue_rw_tail 3 29562 _002455_hash NULL
86626 +_002456_hash ieee80211_amsdu_to_8023s 5 15561 _002456_hash NULL
86627 +_002457_hash ieee80211_fragment 4 33112 _002457_hash NULL
86628 +_002458_hash ieee80211_if_read_aid 3 9705 _002458_hash NULL
86629 +_002459_hash ieee80211_if_read_auto_open_plinks 3 38268 _002459_hash &_000374_hash
86630 +_002460_hash ieee80211_if_read_ave_beacon 3 64924 _002460_hash NULL
86631 +_002461_hash ieee80211_if_read_bssid 3 35161 _002461_hash NULL
86632 +_002462_hash ieee80211_if_read_channel_type 3 23884 _002462_hash NULL
86633 +_002463_hash ieee80211_if_read_dot11MeshConfirmTimeout 3 60670 _002463_hash NULL
86634 +_002464_hash ieee80211_if_read_dot11MeshForwarding 3 13940 _002464_hash NULL
86635 +_002465_hash ieee80211_if_read_dot11MeshGateAnnouncementProtocol 3 14486 _002465_hash NULL
86636 +_002466_hash ieee80211_if_read_dot11MeshHoldingTimeout 3 47356 _002466_hash NULL
86637 +_002467_hash ieee80211_if_read_dot11MeshHWMPactivePathTimeout 3 7368 _002467_hash NULL
86638 +_002468_hash ieee80211_if_read_dot11MeshHWMPactivePathToRootTimeout 3 17618 _002468_hash NULL
86639 +_002469_hash ieee80211_if_read_dot11MeshHWMPconfirmationInterval 3 57722 _002469_hash NULL
86640 +_002470_hash ieee80211_if_read_dot11MeshHWMPmaxPREQretries 3 59829 _002470_hash NULL
86641 +_002471_hash ieee80211_if_read_dot11MeshHWMPnetDiameterTraversalTime 3 1589 _002471_hash NULL
86642 +_002472_hash ieee80211_if_read_dot11MeshHWMPperrMinInterval 3 17346 _002472_hash NULL
86643 +_002473_hash ieee80211_if_read_dot11MeshHWMPpreqMinInterval 3 24208 _002473_hash NULL
86644 +_002474_hash ieee80211_if_read_dot11MeshHWMPRannInterval 3 2249 _002474_hash NULL
86645 +_002475_hash ieee80211_if_read_dot11MeshHWMProotInterval 3 27873 _002475_hash NULL
86646 +_002476_hash ieee80211_if_read_dot11MeshHWMPRootMode 3 51441 _002476_hash NULL
86647 +_002477_hash ieee80211_if_read_dot11MeshMaxPeerLinks 3 23878 _002477_hash NULL
86648 +_002478_hash ieee80211_if_read_dot11MeshMaxRetries 3 12756 _002478_hash NULL
86649 +_002479_hash ieee80211_if_read_dot11MeshRetryTimeout 3 52168 _002479_hash NULL
86650 +_002480_hash ieee80211_if_read_dot11MeshTTL 3 58307 _002480_hash NULL
86651 +_002481_hash ieee80211_if_read_dropped_frames_congestion 3 32603 _002481_hash NULL
86652 +_002482_hash ieee80211_if_read_dropped_frames_no_route 3 33383 _002482_hash NULL
86653 +_002483_hash ieee80211_if_read_dropped_frames_ttl 3 44500 _002483_hash NULL
86654 +_002484_hash ieee80211_if_read_drop_unencrypted 3 37053 _002484_hash NULL
86655 +_002485_hash ieee80211_if_read_dtim_count 3 38419 _002485_hash NULL
86656 +_002486_hash ieee80211_if_read_element_ttl 3 18869 _002486_hash NULL
86657 +_002487_hash ieee80211_if_read_estab_plinks 3 32533 _002487_hash NULL
86658 +_002488_hash ieee80211_if_read_flags 3 57470 _002919_hash NULL nohasharray
86659 +_002489_hash ieee80211_if_read_fwded_frames 3 36520 _002489_hash NULL
86660 +_002490_hash ieee80211_if_read_fwded_mcast 3 39571 _002490_hash &_000162_hash
86661 +_002491_hash ieee80211_if_read_fwded_unicast 3 59740 _002491_hash &_001697_hash
86662 +_002492_hash ieee80211_if_read_ht_opmode 3 29044 _002492_hash NULL
86663 +_002493_hash ieee80211_if_read_last_beacon 3 31257 _002493_hash NULL
86664 +_002494_hash ieee80211_if_read_min_discovery_timeout 3 13946 _002494_hash NULL
86665 +_002495_hash ieee80211_if_read_num_buffered_multicast 3 12716 _002495_hash NULL
86666 +_002496_hash ieee80211_if_read_num_mcast_sta 3 12419 _002496_hash NULL
86667 +_002497_hash ieee80211_if_read_num_sta_ps 3 34722 _002497_hash NULL
86668 +_002498_hash ieee80211_if_read_path_refresh_time 3 25545 _002498_hash NULL
86669 +_002499_hash ieee80211_if_read_peer 3 45233 _002499_hash NULL
86670 +_002500_hash ieee80211_if_read_rc_rateidx_mask_2ghz 3 61570 _002500_hash NULL
86671 +_002501_hash ieee80211_if_read_rc_rateidx_mask_5ghz 3 27183 _002501_hash NULL
86672 +_002502_hash ieee80211_if_read_rc_rateidx_mcs_mask_2ghz 3 37675 _002502_hash NULL
86673 +_002503_hash ieee80211_if_read_rc_rateidx_mcs_mask_5ghz 3 44423 _002503_hash NULL
86674 +_002504_hash ieee80211_if_read_rssi_threshold 3 49260 _002504_hash NULL
86675 +_002505_hash ieee80211_if_read_smps 3 27416 _002505_hash NULL
86676 +_002506_hash ieee80211_if_read_state 3 9813 _002707_hash NULL nohasharray
86677 +_002507_hash ieee80211_if_read_tkip_mic_test 3 19565 _002507_hash NULL
86678 +_002508_hash ieee80211_if_read_tsf 3 16420 _002508_hash NULL
86679 +_002509_hash ieee80211_if_read_uapsd_max_sp_len 3 15067 _002509_hash NULL
86680 +_002510_hash ieee80211_if_read_uapsd_queues 3 55150 _002510_hash NULL
86681 +_002511_hash ieee80211_mgmt_tx 9 46860 _002511_hash NULL
86682 +_002512_hash ieee80211_probereq_get 4-6 29069 _002512_hash NULL
86683 +_002514_hash ieee80211_rx_mgmt_beacon 3 24430 _002514_hash NULL
86684 +_002515_hash ieee80211_rx_mgmt_probe_resp 3 6918 _002515_hash NULL
86685 +_002516_hash ieee80211_send_auth 5 24121 _002516_hash NULL
86686 +_002517_hash ieee80211_set_probe_resp 3 10077 _002517_hash NULL
86687 +_002518_hash ieee80211_tdls_mgmt 8 9581 _002518_hash NULL
86688 +_002519_hash ima_show_htable_violations 3 10619 _002519_hash NULL
86689 +_002520_hash ima_show_measurements_count 3 23536 _002520_hash NULL
86690 +_002521_hash insert_one_name 7 61668 _002521_hash NULL
86691 +_002522_hash ip6_ufo_append_data 5-7-6 4780 _002522_hash NULL
86692 +_002525_hash ip_append_data 5-6 16942 _002525_hash NULL
86693 +_002526_hash ip_make_skb 5-6 13129 _002526_hash NULL
86694 +_002527_hash ip_nat_sdp_port 6 52938 _002527_hash NULL
86695 +_002528_hash ip_nat_sip_expect 7 45693 _002528_hash NULL
86696 +_002529_hash ipr_change_queue_depth 2 6431 _002529_hash NULL
86697 +_002530_hash ip_recv_error 3 23109 _002530_hash NULL
86698 +_002531_hash ip_ufo_append_data 6-8-7 12775 _002531_hash NULL
86699 +_002534_hash ipv6_recv_error 3 56347 _002534_hash NULL
86700 +_002535_hash ipv6_recv_rxpmtu 3 7142 _002535_hash NULL
86701 +_002536_hash ipw_packet_received_skb 2 1230 _002536_hash NULL
86702 +_002537_hash ipx_recvmsg 4 44366 _002537_hash NULL
86703 +_002538_hash irda_recvmsg_dgram 4 32631 _002538_hash NULL
86704 +_002539_hash iscsi_change_queue_depth 2 23416 _002539_hash NULL
86705 +_002540_hash iscsi_complete_pdu 4 48372 _002540_hash NULL
86706 +_002541_hash iwch_reject_cr 3 23901 _002541_hash NULL
86707 +_002542_hash ixgb_check_copybreak 3 5847 _002542_hash NULL
86708 +_002543_hash key_conf_hw_key_idx_read 3 25003 _002543_hash NULL
86709 +_002544_hash key_conf_keyidx_read 3 42443 _002544_hash NULL
86710 +_002545_hash key_conf_keylen_read 3 49758 _002545_hash NULL
86711 +_002546_hash key_flags_read 3 25931 _002546_hash NULL
86712 +_002547_hash key_ifindex_read 3 31411 _002547_hash NULL
86713 +_002548_hash key_tx_rx_count_read 3 44742 _002548_hash NULL
86714 +_002549_hash kmsg_read 3 46514 _002549_hash NULL
86715 +_002550_hash l1oip_socket_parse 4 4507 _002550_hash NULL
86716 +_002551_hash l2cap_send_cmd 4 14548 _002551_hash NULL
86717 +_002552_hash l2cap_sock_sendmsg 4 63427 _002552_hash NULL
86718 +_002553_hash l2tp_ip6_recvmsg 4 62874 _002553_hash NULL
86719 +_002554_hash l2tp_ip6_sendmsg 4 7461 _002554_hash NULL
86720 +_002555_hash l2tp_ip_recvmsg 4 22681 _002555_hash NULL
86721 +_002556_hash lbs_bcnmiss_read 3 8678 _002556_hash NULL
86722 +_002557_hash lbs_failcount_read 3 31063 _002557_hash NULL
86723 +_002558_hash lbs_highrssi_read 3 64089 _002558_hash NULL
86724 +_002559_hash lbs_highsnr_read 3 5931 _002559_hash NULL
86725 +_002560_hash lbs_lowrssi_read 3 32242 _002560_hash NULL
86726 +_002561_hash lbs_lowsnr_read 3 29571 _002561_hash NULL
86727 +_002563_hash llc_ui_recvmsg 4 3826 _002563_hash NULL
86728 +_002564_hash lowpan_fragment_xmit 3-4 22095 _002564_hash NULL
86729 +_002566_hash lpfc_change_queue_depth 2 25905 _002566_hash NULL
86730 +_002568_hash macvtap_do_read 4 36555 _002568_hash &_002050_hash
86731 +_002569_hash mangle_sdp_packet 9 36279 _002569_hash NULL
86732 +_002570_hash map_addr 6 4666 _002570_hash NULL
86733 +_002571_hash mcs_unwrap_fir 3 25733 _002571_hash NULL
86734 +_002572_hash mcs_unwrap_mir 3 9455 _002572_hash NULL
86735 +_002573_hash megaraid_change_queue_depth 2 64815 _002573_hash NULL
86736 +_002574_hash megasas_change_queue_depth 2 32747 _002574_hash NULL
86737 +_002575_hash mld_newpack 2 50950 _002575_hash NULL
86738 +_002576_hash mptscsih_change_queue_depth 2 26036 _002576_hash NULL
86739 +_002577_hash named_distribute 4 48544 _002577_hash NULL
86740 +_002578_hash NCR_700_change_queue_depth 2 31742 _002578_hash NULL
86741 +_002579_hash netlink_recvmsg 4 61600 _002579_hash NULL
86742 +_002580_hash nfc_alloc_send_skb 4 3167 _002580_hash NULL
86743 +_002581_hash nf_nat_ftp 5 47948 _002581_hash NULL
86744 +_002582_hash nfsctl_transaction_read 3 48250 _002582_hash NULL
86745 +_002583_hash nfsd_read 5 19568 _002583_hash NULL
86746 +_002584_hash nfsd_read_file 6 62241 _002584_hash NULL
86747 +_002585_hash nfsd_write 6 54809 _002585_hash NULL
86748 +_002586_hash nfs_map_group_to_gid 3 15892 _002586_hash NULL
86749 +_002587_hash nfs_map_name_to_uid 3 51132 _002587_hash NULL
86750 +_002588_hash nr_recvmsg 4 12649 _002588_hash NULL
86751 +_002589_hash ntfs_rl_append 2-4 6037 _002589_hash NULL
86752 +_002591_hash ntfs_rl_insert 2-4 4931 _002591_hash NULL
86753 +_002593_hash ntfs_rl_replace 2-4 14136 _002593_hash NULL
86754 +_002595_hash ntfs_rl_split 2-4 52328 _002595_hash NULL
86755 +_002597_hash osd_req_list_collection_objects 5 36664 _002597_hash NULL
86756 +_002598_hash osd_req_list_partition_objects 5 56464 _002598_hash NULL
86757 +_002599_hash osd_req_read_sg 5 47905 _002599_hash NULL
86758 +_002600_hash osd_req_write_sg 5 50908 _002600_hash NULL
86759 +_002602_hash p54_download_eeprom 4 43842 _002602_hash NULL
86760 +_002604_hash packet_recv_error 3 16669 _002604_hash NULL
86761 +_002605_hash packet_recvmsg 4 47700 _002605_hash NULL
86762 +_002606_hash pep_recvmsg 4 19402 _002606_hash NULL
86763 +_002607_hash pfkey_recvmsg 4 53604 _002607_hash NULL
86764 +_002608_hash ping_recvmsg 4 25597 _002608_hash NULL
86765 +_002609_hash pmcraid_change_queue_depth 2 9116 _002609_hash NULL
86766 +_002610_hash pn_recvmsg 4 30887 _002610_hash NULL
86767 +_002611_hash pointer_size_read 3 51863 _002611_hash NULL
86768 +_002612_hash power_read 3 15939 _002612_hash NULL
86769 +_002613_hash pppoe_recvmsg 4 15073 _002613_hash NULL
86770 +_002614_hash pppol2tp_recvmsg 4 57742 _002993_hash NULL nohasharray
86771 +_002615_hash ppp_tx_cp 5 62044 _002615_hash NULL
86772 +_002616_hash prism2_send_mgmt 4 62605 _002616_hash &_002119_hash
86773 +_002617_hash prism2_sta_send_mgmt 5 43916 _002617_hash NULL
86774 +_002618_hash prison_create 1 43623 _002618_hash NULL
86775 +_002619_hash qla2x00_adjust_sdev_qdepth_up 2 20097 _002619_hash NULL
86776 +_002620_hash qla2x00_change_queue_depth 2 24742 _002620_hash NULL
86777 +_002621_hash _queue_data 4 54983 _002621_hash NULL
86778 +_002622_hash raw_recvmsg 4 52529 _002622_hash NULL
86779 +_002623_hash rawsock_recvmsg 4 12144 _002623_hash NULL
86780 +_002624_hash rawv6_recvmsg 4 30265 _002624_hash NULL
86781 +_002625_hash rds_tcp_data_recv 3 53476 _002625_hash NULL
86782 +_002626_hash reada_add_block 2 54247 _002626_hash NULL
86783 +_002627_hash readahead_tree_block 3 36285 _002627_hash NULL
86784 +_002628_hash reada_tree_block_flagged 3 18402 _002628_hash NULL
86785 +_002629_hash read_dma 3 55086 _002629_hash NULL
86786 +_002630_hash read_fifo 3 826 _002630_hash NULL
86787 +_002631_hash read_tree_block 3 841 _002631_hash NULL
86788 +_002632_hash receive_copy 3 12216 _002632_hash NULL
86789 +_002633_hash recover_peb 6-7 29238 _002633_hash NULL
86790 +_002635_hash recv_msg 4 48709 _002635_hash NULL
86791 +_002636_hash recv_stream 4 30138 _002636_hash NULL
86792 +_002637_hash _req_append_segment 2 41031 _002637_hash NULL
86793 +_002638_hash request_key_async 4 6990 _002638_hash NULL
86794 +_002639_hash request_key_async_with_auxdata 4 46624 _002639_hash NULL
86795 +_002640_hash request_key_with_auxdata 4 24515 _002640_hash NULL
86796 +_002641_hash rose_recvmsg 4 2368 _002641_hash &_001788_hash
86797 +_002642_hash rtl8169_try_rx_copy 3 705 _002642_hash NULL
86798 +_002643_hash _rtl92s_firmware_downloadcode 3 14021 _002643_hash NULL
86799 +_002644_hash rx_data 4 60442 _002644_hash NULL
86800 +_002645_hash rxrpc_recvmsg 4 26233 _002645_hash NULL
86801 +_002646_hash sas_change_queue_depth 2 18555 _002646_hash NULL
86802 +_002647_hash scsi_activate_tcq 2 42640 _002647_hash NULL
86803 +_002648_hash scsi_deactivate_tcq 2 47086 _002648_hash NULL
86804 +_002649_hash scsi_execute 5 33596 _002649_hash NULL
86805 +_002650_hash _scsih_adjust_queue_depth 2 1083 _002650_hash NULL
86806 +_002651_hash scsi_init_shared_tag_map 2 59812 _002651_hash NULL
86807 +_002652_hash scsi_track_queue_full 2 44239 _002652_hash NULL
86808 +_002653_hash sctp_abort_pkt_new 5 55218 _002653_hash NULL
86809 +_002654_hash sctp_make_abort_violation 4 27959 _002654_hash NULL
86810 +_002655_hash sctp_make_op_error 5-6 7057 _002655_hash NULL
86811 +_002657_hash sctp_recvmsg 4 23265 _002657_hash NULL
86812 +_002658_hash send_stream 4 3397 _002658_hash NULL
86813 +_002659_hash sis190_try_rx_copy 3 57069 _002659_hash NULL
86814 +_002664_hash skb_copy_and_csum_datagram_iovec 2 24466 _002664_hash NULL
86815 +_002666_hash skge_rx_get 3 40598 _002666_hash NULL
86816 +_002667_hash smp_send_cmd 3 512 _002667_hash NULL
86817 +_002668_hash snd_gf1_mem_proc_dump 5 16926 _003499_hash NULL nohasharray
86818 +_002669_hash sta_dev_read 3 14782 _002669_hash NULL
86819 +_002670_hash sta_inactive_ms_read 3 25690 _002670_hash NULL
86820 +_002671_hash sta_last_signal_read 3 31818 _002671_hash NULL
86821 +_002672_hash stats_dot11ACKFailureCount_read 3 45558 _002672_hash NULL
86822 +_002673_hash stats_dot11FCSErrorCount_read 3 28154 _002673_hash NULL
86823 +_002674_hash stats_dot11RTSFailureCount_read 3 43948 _002674_hash NULL
86824 +_002675_hash stats_dot11RTSSuccessCount_read 3 33065 _002675_hash NULL
86825 +_002676_hash storvsc_connect_to_vsp 2 22 _002676_hash NULL
86826 +_002677_hash sys_msgrcv 3 959 _002677_hash NULL
86827 +_002678_hash sys_syslog 3 10746 _002678_hash NULL
86828 +_002679_hash tcf_csum_ipv4_icmp 3 9258 _002679_hash NULL
86829 +_002680_hash tcf_csum_ipv4_igmp 3 60446 _002680_hash NULL
86830 +_002681_hash tcf_csum_ipv4_tcp 4 39713 _002681_hash NULL
86831 +_002682_hash tcf_csum_ipv4_udp 4 30777 _002682_hash NULL
86832 +_002683_hash tcf_csum_ipv6_icmp 4 11738 _002683_hash NULL
86833 +_002684_hash tcf_csum_ipv6_tcp 4 54877 _002684_hash NULL
86834 +_002685_hash tcf_csum_ipv6_udp 4 25241 _002685_hash NULL
86835 +_002686_hash tcm_loop_change_queue_depth 2 42454 _002686_hash NULL
86836 +_002687_hash tcp_copy_to_iovec 3 28344 _002687_hash NULL
86837 +_002688_hash tcp_mark_head_lost 2 35895 _002688_hash NULL
86838 +_002689_hash tcp_match_skb_to_sack 4 23568 _002689_hash NULL
86839 +_002690_hash timeout_read 3 47915 _002690_hash NULL
86840 +_002691_hash tipc_multicast 5 49144 _002691_hash NULL
86841 +_002692_hash tipc_port_recv_sections 4 42890 _002692_hash NULL
86842 +_002693_hash tipc_port_reject_sections 5 55229 _002693_hash NULL
86843 +_002694_hash total_ps_buffered_read 3 16365 _002694_hash NULL
86844 +_002695_hash tso_fragment 3 29050 _002695_hash NULL
86845 +_002696_hash tty_insert_flip_string 3 34042 _002696_hash NULL
86846 +_002698_hash tun_put_user 4 59849 _002698_hash NULL
86847 +_002699_hash twa_change_queue_depth 2 48808 _002699_hash NULL
86848 +_002700_hash tw_change_queue_depth 2 11116 _002700_hash NULL
86849 +_002701_hash twl_change_queue_depth 2 41342 _002701_hash NULL
86850 +_002702_hash ubi_eba_atomic_leb_change 5 60379 _002702_hash NULL
86851 +_002703_hash ubi_eba_write_leb 5-6 36029 _002703_hash NULL
86852 +_002705_hash ubi_eba_write_leb_st 5 44343 _002705_hash NULL
86853 +_002706_hash udp_recvmsg 4 42558 _002706_hash NULL
86854 +_002707_hash udpv6_recvmsg 4 9813 _002707_hash &_002506_hash
86855 +_002708_hash udpv6_sendmsg 4 22316 _002708_hash NULL
86856 +_002709_hash ulong_read_file 3 42304 _002709_hash &_000522_hash
86857 +_002710_hash unix_dgram_recvmsg 4 14952 _002710_hash NULL
86858 +_002711_hash user_power_read 3 39414 _002711_hash NULL
86859 +_002712_hash v9fs_direct_read 3 45546 _002712_hash NULL
86860 +_002713_hash v9fs_file_readn 4 36353 _002713_hash &_001799_hash
86861 +_002714_hash vcc_recvmsg 4 37198 _002714_hash NULL
86862 +_002715_hash velocity_rx_copy 2 34583 _002715_hash NULL
86863 +_002716_hash W6692_empty_Bfifo 2 47804 _002716_hash NULL
86864 +_002717_hash wep_iv_read 3 54744 _002717_hash NULL
86865 +_002718_hash x25_recvmsg 4 42777 _002718_hash NULL
86866 +_002719_hash xfs_buf_get_map 3 24522 _002719_hash NULL
86867 +_002720_hash xfs_file_aio_write 4 33234 _002720_hash NULL
86868 +_002721_hash xfs_iext_insert 3 18667 _002741_hash NULL nohasharray
86869 +_002722_hash xfs_iext_remove 3 50909 _002722_hash NULL
86870 +_002723_hash xlog_do_recovery_pass 3 21618 _002723_hash NULL
86871 +_002724_hash xlog_find_verify_log_record 2 18870 _002724_hash NULL
86872 +_002725_hash zd_mac_rx 3 38296 _002725_hash NULL
86873 +_002726_hash aircable_process_packet 5 46639 _002726_hash NULL
86874 +_002727_hash ath6kl_wmi_get_new_buf 1 52304 _002727_hash NULL
86875 +_002728_hash batadv_iv_ogm_queue_add 3 46319 _002728_hash NULL
86876 +_002729_hash batadv_receive_client_update_packet 3 41578 _002729_hash NULL
86877 +_002730_hash batadv_receive_server_sync_packet 3 26577 _002730_hash &_000494_hash
86878 +_002731_hash brcmf_alloc_pkt_and_read 2 63116 _002731_hash &_002028_hash
86879 +_002732_hash brcmf_sdcard_recv_buf 6 38179 _002732_hash NULL
86880 +_002733_hash brcmf_sdcard_rwdata 5 65041 _002733_hash NULL
86881 +_002734_hash brcmf_sdcard_send_buf 6 7713 _002734_hash NULL
86882 +_002735_hash brcmf_sdio_forensic_read 3 35311 _002735_hash &_001382_hash
86883 +_002736_hash btrfs_alloc_free_block 3 8986 _002736_hash NULL
86884 +_002737_hash btrfs_free_and_pin_reserved_extent 2 53016 _002737_hash NULL
86885 +_002738_hash btrfs_free_reserved_extent 2 9867 _002738_hash NULL
86886 +_002739_hash carl9170_handle_mpdu 3 11056 _002739_hash NULL
86887 +_002740_hash do_trimming 3 26952 _002740_hash NULL
86888 +_002741_hash edge_tty_recv 4 18667 _002741_hash &_002721_hash
86889 +_002742_hash fwnet_receive_packet 9 50537 _002742_hash NULL
86890 +_002743_hash gigaset_if_receive 3 4861 _002743_hash NULL
86891 +_002744_hash gsm_dlci_data 3 14155 _002744_hash NULL
86892 +_002745_hash handle_rx_packet 3 58993 _002745_hash NULL
86893 +_002746_hash HDLC_irq 2 8709 _002746_hash NULL
86894 +_002747_hash hdlc_rpr_irq 2 10240 _002747_hash NULL
86895 +_002749_hash ifx_spi_insert_flip_string 3 51752 _002749_hash NULL
86896 +_002753_hash ip_nat_sdp_media 8 23386 _002753_hash NULL
86897 +_002754_hash ip_send_unicast_reply 6 38714 _002754_hash NULL
86898 +_002756_hash ipwireless_network_packet_received 4 51277 _002756_hash NULL
86899 +_002757_hash ipwireless_tty_received 3 49154 _002757_hash NULL
86900 +_002758_hash iscsi_iser_recv 4 41948 _002758_hash NULL
86901 +_002759_hash l2cap_bredr_sig_cmd 3 49065 _002759_hash NULL
86902 +_002760_hash l2cap_sock_alloc_skb_cb 2 33532 _002760_hash NULL
86903 +_002761_hash l2cap_sock_recvmsg 4 59886 _002761_hash NULL
86904 +_002762_hash llcp_allocate_pdu 3 19866 _002762_hash NULL
86905 +_002763_hash macvtap_recvmsg 4 63949 _002763_hash NULL
86906 +_002764_hash osd_req_list_dev_partitions 4 60027 _002764_hash NULL
86907 +_002765_hash osd_req_list_partition_collections 5 38223 _002765_hash NULL
86908 +_002766_hash osst_do_scsi 4 44410 _002766_hash NULL
86909 +_002767_hash ping_sendmsg 4 3782 _002767_hash NULL
86910 +_002768_hash ppp_cp_event 6 2965 _002768_hash NULL
86911 +_002769_hash pty_write 3 44757 _002769_hash &_001733_hash
86912 +_002770_hash push_rx 3 28939 _002770_hash NULL
86913 +_002772_hash qla2x00_handle_queue_full 2 24365 _002772_hash NULL
86914 +_002773_hash qla4xxx_change_queue_depth 2 1268 _002773_hash NULL
86915 +_002774_hash rfcomm_sock_recvmsg 4 22227 _002774_hash NULL
86916 +_002775_hash scsi_execute_req 5 42088 _002775_hash NULL
86917 +_002776_hash _scsih_change_queue_depth 2 26230 _002776_hash NULL
86918 +_002777_hash sctp_sf_abort_violation 6 38380 _002777_hash NULL
86919 +_002778_hash send_to_tty 3 45141 _002778_hash NULL
86920 +_002780_hash sky2_receive 2 13407 _002780_hash NULL
86921 +_002781_hash spi_execute 5 28736 _002781_hash NULL
86922 +_002782_hash submit_inquiry 3 42108 _002782_hash NULL
86923 +_002783_hash tcp_dma_try_early_copy 3 4457 _002783_hash NULL
86924 +_002784_hash tcp_sacktag_walk 6 49703 _002784_hash NULL
86925 +_002785_hash tcp_write_xmit 2 64602 _002785_hash NULL
86926 +_002786_hash ti_recv 4 22027 _002786_hash NULL
86927 +_002787_hash tun_do_read 4 50800 _002787_hash NULL
86928 +_002788_hash ubi_leb_change 4 10289 _002788_hash NULL
86929 +_002789_hash ubi_leb_write 4-5 5478 _002789_hash NULL
86930 +_002791_hash udp_sendmsg 4 4492 _002791_hash NULL
86931 +_002792_hash unix_seqpacket_recvmsg 4 23062 _002792_hash &_000477_hash
86932 +_002793_hash v9fs_cached_file_read 3 2514 _002793_hash NULL
86933 +_002794_hash write_leb 5 36957 _002794_hash NULL
86934 +_002795_hash xfs_buf_read_map 3 40226 _002795_hash NULL
86935 +_002796_hash xfs_trans_get_buf_map 4 2927 _002796_hash NULL
86936 +_002797_hash xlog_do_log_recovery 3 17550 _002797_hash NULL
86937 +_002798_hash ath6kl_wmi_add_wow_pattern_cmd 4 12842 _002798_hash NULL
86938 +_002799_hash ath6kl_wmi_beginscan_cmd 8 25462 _002799_hash NULL
86939 +_002800_hash ath6kl_wmi_send_probe_response_cmd 6 31728 _002800_hash NULL
86940 +_002801_hash ath6kl_wmi_set_appie_cmd 5 39266 _002801_hash NULL
86941 +_002802_hash ath6kl_wmi_set_ie_cmd 6 37260 _002802_hash NULL
86942 +_002803_hash ath6kl_wmi_startscan_cmd 8 33674 _002803_hash NULL
86943 +_002804_hash ath6kl_wmi_test_cmd 3 27312 _002804_hash NULL
86944 +_002805_hash brcmf_sdbrcm_membytes 3-5 37324 _002805_hash NULL
86945 +_002807_hash brcmf_sdbrcm_read_control 3 22721 _002807_hash NULL
86946 +_002808_hash brcmf_tx_frame 3 20978 _002808_hash NULL
86947 +_002809_hash __carl9170_rx 3 56784 _002809_hash NULL
86948 +_002810_hash ch_do_scsi 4 31171 _002810_hash NULL
86949 +_002811_hash dbg_leb_change 4 23555 _002811_hash NULL
86950 +_002812_hash dbg_leb_write 4-5 63555 _002812_hash &_000971_hash
86951 +_002814_hash gluebi_write 3 27905 _002814_hash NULL
86952 +_002815_hash hdlc_irq_one 2 3944 _002815_hash NULL
86953 +_002819_hash iser_rcv_completion 2 8048 _002819_hash NULL
86954 +_002820_hash lock_loop 1 61681 _002820_hash NULL
86955 +_002821_hash process_rcvd_data 3 6679 _002821_hash NULL
86956 +_002822_hash brcmf_sdbrcm_bus_txctl 3 42492 _002822_hash NULL
86957 +_002823_hash carl9170_rx 3 13272 _002823_hash NULL
86958 +_002824_hash carl9170_rx_stream 3 1334 _002824_hash NULL
86959 +_002826_hash mpt_lan_receive_post_turbo 2 13592 _002826_hash NULL
86960 +_002827_hash padzero 1 55 _002827_hash &_002251_hash
86961 +_002828_hash scsi_mode_sense 5 16835 _002828_hash NULL
86962 +_002829_hash scsi_vpd_inquiry 4 30040 _002829_hash NULL
86963 +_002830_hash ses_recv_diag 4 47143 _002830_hash &_000679_hash
86964 +_002831_hash ses_send_diag 4 64527 _002831_hash NULL
86965 +_002832_hash tcp_push_one 2 48816 _002832_hash NULL
86966 +_002833_hash __tcp_push_pending_frames 2 48148 _002833_hash NULL
86967 +_002834_hash trim_bitmaps 3 24158 _002834_hash NULL
86968 +_002835_hash tun_recvmsg 4 48463 _002835_hash NULL
86969 +_002836_hash ubifs_leb_change 4 17789 _002836_hash NULL
86970 +_002837_hash ubifs_leb_write 4-5 22679 _002837_hash NULL
86971 +_002839_hash xfs_buf_readahead_map 3 44248 _002839_hash &_000851_hash
86972 +_002840_hash xfs_trans_read_buf_map 5 37487 _002840_hash NULL
86973 +_002841_hash xlog_do_recover 3 59789 _002841_hash NULL
86974 +_002842_hash btrfs_trim_block_group 3 28963 _002842_hash NULL
86975 +_002843_hash do_write_orph_node 2 64343 _002843_hash NULL
86976 +_002844_hash fix_unclean_leb 3 23188 _002844_hash NULL
86977 +_002845_hash fixup_leb 3 43256 _002845_hash NULL
86978 +_002846_hash recover_head 3 17904 _002846_hash NULL
86979 +_002847_hash scsi_get_vpd_page 4 51951 _002847_hash NULL
86980 +_002848_hash sd_do_mode_sense 5 11507 _002848_hash NULL
86981 +_002849_hash tcp_push 3 10680 _002849_hash NULL
86982 +_002850_hash ubifs_wbuf_write_nolock 3 64946 _002850_hash NULL
86983 +_002851_hash ubifs_write_node 3-5 11258 _002851_hash NULL
86984 +_002852_hash ubifs_recover_leb 3 60639 _002852_hash NULL
86985 +_002853_hash write_head 4 30481 _002853_hash NULL
86986 +_002854_hash write_node 4 33121 _002854_hash NULL
86987 +_002855_hash ubifs_recover_log_leb 3 12079 _002855_hash NULL
86988 +_002856_hash replay_log_leb 3 18704 _002856_hash NULL
86989 +_002857_hash alloc_cpu_rmap 1 65363 _002857_hash NULL
86990 +_002858_hash alloc_ebda_hpc 1-2 50046 _002858_hash NULL
86991 +_002860_hash alloc_sched_domains 1 28972 _002860_hash NULL
86992 +_002861_hash amthi_read 4 45831 _002861_hash NULL
86993 +_002862_hash bcm_char_read 3 31750 _002862_hash NULL
86994 +_002863_hash BcmCopySection 5 2035 _002863_hash NULL
86995 +_002864_hash buffer_from_user 3 51826 _002864_hash NULL
86996 +_002865_hash buffer_to_user 3 35439 _002865_hash NULL
86997 +_002866_hash card_send_command 3 40757 _002866_hash NULL
86998 +_002867_hash chd_dec_fetch_cdata 3 50926 _002867_hash NULL
86999 +_002868_hash copy_nodes_to_user 2 63807 _002868_hash NULL
87000 +_002869_hash create_log 2 8225 _002869_hash NULL
87001 +_002870_hash crystalhd_create_dio_pool 2 3427 _002870_hash NULL
87002 +_002871_hash crystalhd_user_data 3 18407 _002871_hash NULL
87003 +_002872_hash do_pages_stat 2 4437 _002872_hash NULL
87004 +_002873_hash do_read_log_to_user 4 3236 _002873_hash NULL
87005 +_002874_hash do_write_log_from_user 3 39362 _002874_hash NULL
87006 +_002875_hash evm_read_key 3 54674 _002875_hash NULL
87007 +_002876_hash evm_write_key 3 27715 _002876_hash NULL
87008 +_002877_hash fir16_create 3 5574 _002877_hash NULL
87009 +_002878_hash get_nodes 3 39012 _002878_hash NULL
87010 +_002879_hash __iio_allocate_kfifo 2-3 55738 _002879_hash NULL
87011 +_002881_hash __iio_allocate_sw_ring_buffer 3 4843 _002881_hash NULL
87012 +_002882_hash iio_debugfs_read_reg 3 60908 _002882_hash NULL
87013 +_002883_hash iio_debugfs_write_reg 3 22742 _002883_hash NULL
87014 +_002884_hash iio_device_alloc 1 41440 _002884_hash NULL
87015 +_002885_hash iio_event_chrdev_read 3 54757 _002885_hash NULL
87016 +_002886_hash iio_read_first_n_kfifo 2 57910 _002886_hash NULL
87017 +_002887_hash iio_read_first_n_sw_rb 2 51911 _002887_hash NULL
87018 +_002888_hash ioapic_setup_resources 1 35255 _002888_hash NULL
87019 +_002889_hash keymap_store 4 45406 _002889_hash NULL
87020 +_002890_hash line6_alloc_sysex_buffer 4 28225 _002890_hash NULL
87021 +_002891_hash line6_dumpreq_initbuf 3 53123 _002891_hash NULL
87022 +_002892_hash line6_midibuf_init 2 52425 _002892_hash NULL
87023 +_002893_hash _malloc 1 54077 _002893_hash NULL
87024 +_002894_hash mei_read 3 6507 _002894_hash NULL
87025 +_002895_hash mei_write 3 4005 _002895_hash NULL
87026 +_002896_hash msg_set 3 51725 _002896_hash NULL
87027 +_002897_hash newpart 6 47485 _002897_hash NULL
87028 +_002898_hash OS_kmalloc 1 36909 _002898_hash NULL
87029 +_002899_hash OS_mem_token_alloc 1 14276 _002899_hash NULL
87030 +_002900_hash packet_came 3 18072 _002900_hash NULL
87031 +_002901_hash pcpu_alloc_bootmem 2 62074 _002901_hash NULL
87032 +_002902_hash pcpu_build_alloc_info 1-3-2 41443 _002902_hash NULL
87033 +_002905_hash pcpu_get_vm_areas 3 50085 _002905_hash NULL
87034 +_002906_hash resource_from_user 3 30341 _002906_hash NULL
87035 +_002907_hash rtsx_read_cfg_seq 3-5 48139 _002907_hash NULL
87036 +_002909_hash rtsx_write_cfg_seq 3-5 27485 _002909_hash NULL
87037 +_002911_hash sca3000_read_data 4 57064 _002911_hash NULL
87038 +_002912_hash sca3000_read_first_n_hw_rb 2 11479 _002912_hash NULL
87039 +_002913_hash send_midi_async 3 57463 _002913_hash NULL
87040 +_002914_hash sep_create_dcb_dmatables_context 6 37551 _002914_hash NULL
87041 +_002915_hash sep_create_dcb_dmatables_context_kernel 6 49728 _002915_hash NULL
87042 +_002916_hash sep_create_msgarea_context 4 33829 _002916_hash NULL
87043 +_002917_hash sep_lli_table_secure_dma 2-3 64042 _002917_hash NULL
87044 +_002919_hash sep_lock_user_pages 2-3 57470 _002919_hash &_002488_hash
87045 +_002921_hash sep_prepare_input_output_dma_table_in_dcb 4-5-2-3 63087 _002921_hash NULL
87046 +_002923_hash sep_read 3 17161 _002923_hash NULL
87047 +_002924_hash TransmitTcb 4 12989 _002924_hash NULL
87048 +_002925_hash ValidateDSDParamsChecksum 3 63654 _002925_hash NULL
87049 +_002926_hash Wb35Reg_BurstWrite 4 62327 _002926_hash NULL
87050 +_002927_hash alloc_irq_cpu_rmap 1 28459 _002927_hash NULL
87051 +_002928_hash InterfaceTransmitPacket 3 42058 _002928_hash NULL
87052 +_002929_hash line6_dumpreq_init 3 34473 _002929_hash NULL
87053 +_002931_hash pcpu_embed_first_chunk 1-3-2 24224 _002931_hash NULL
87054 +_002933_hash pcpu_fc_alloc 2 11818 _002933_hash NULL
87055 +_002934_hash pcpu_page_first_chunk 1 20712 _002934_hash NULL
87056 +_002935_hash pod_alloc_sysex_buffer 3 31651 _002935_hash NULL
87057 +_002936_hash r8712_usbctrl_vendorreq 6 48489 _002936_hash NULL
87058 +_002937_hash r871x_set_wpa_ie 3 7000 _002937_hash NULL
87059 +_002938_hash sep_prepare_input_dma_table 2-3 2009 _002938_hash NULL
87060 +_002940_hash sep_prepare_input_output_dma_table 2-4-3 63429 _002940_hash NULL
87061 +_002943_hash sys_get_mempolicy 3 30379 _002943_hash NULL
87062 +_002944_hash sys_mbind 5 7990 _002944_hash NULL
87063 +_002945_hash sys_migrate_pages 2 39825 _002945_hash NULL
87064 +_002946_hash sys_move_pages 2 42626 _002946_hash NULL
87065 +_002947_hash sys_set_mempolicy 3 32608 _002947_hash NULL
87066 +_002948_hash variax_alloc_sysex_buffer 3 15237 _002948_hash NULL
87067 +_002949_hash vme_user_read 3 55338 _002949_hash NULL
87068 +_002950_hash vme_user_write 3 15587 _002950_hash NULL
87069 +_002954_hash variax_set_raw2 4 32374 _002954_hash NULL
87070 +_002955_hash copy_in_user 3 57502 _002955_hash NULL
87071 +_002956_hash __earlyonly_bootmem_alloc 2 23824 _002956_hash NULL
87072 +_002957_hash rfc4106_set_key 3 54519 _002957_hash NULL
87073 +_002958_hash sparse_early_usemaps_alloc_pgdat_section 2 62304 _002958_hash NULL
87074 +_002959_hash sparse_early_usemaps_alloc_node 4 9269 _002959_hash NULL
87075 +_002960_hash sparse_mem_maps_populate_node 4 12669 _002960_hash &_002242_hash
87076 +_002961_hash vmemmap_alloc_block 1 43245 _002961_hash NULL
87077 +_002962_hash sparse_early_mem_maps_alloc_node 4 36971 _002962_hash NULL
87078 +_002963_hash vmemmap_alloc_block_buf 1 61126 _002963_hash NULL
87079 +_002964_hash alloc_mr 1 45935 _002964_hash NULL
87080 +_002965_hash atomic_counters_read 3 48827 _002965_hash NULL
87081 +_002966_hash atomic_stats_read 3 36228 _002966_hash NULL
87082 +_002967_hash capabilities_read 3 58457 _002967_hash NULL
87083 +_002968_hash compat_core_sys_select 1 65285 _002968_hash NULL
87084 +_002969_hash compat_dccp_setsockopt 5 51263 _002969_hash NULL
87085 +_002970_hash compat_do_arpt_set_ctl 4 12184 _002970_hash NULL
87086 +_002971_hash compat_do_ip6t_set_ctl 4 3184 _002971_hash NULL
87087 +_002972_hash compat_do_ipt_set_ctl 4 58466 _002972_hash &_002078_hash
87088 +_002973_hash compat_filldir 3 32999 _002973_hash NULL
87089 +_002974_hash compat_filldir64 3 35354 _002974_hash NULL
87090 +_002975_hash compat_fillonedir 3 15620 _002975_hash NULL
87091 +_002976_hash compat_ip_setsockopt 5 13870 _003094_hash NULL nohasharray
87092 +_002977_hash compat_ipv6_setsockopt 5 20468 _002977_hash NULL
87093 +_002978_hash compat_mpctl_ioctl 2 45671 _002978_hash NULL
87094 +_002979_hash compat_raw_setsockopt 5 30634 _002979_hash NULL
87095 +_002980_hash compat_rawv6_setsockopt 5 4967 _002980_hash NULL
87096 +_002981_hash compat_rw_copy_check_uvector 3 22001 _003263_hash NULL nohasharray
87097 +_002982_hash compat_sock_setsockopt 5 23 _002982_hash NULL
87098 +_002983_hash compat_sys_get_mempolicy 3 31109 _002983_hash NULL
87099 +_002984_hash compat_sys_kexec_load 2 35674 _002984_hash NULL
87100 +_002985_hash compat_sys_keyctl 4 9639 _002985_hash NULL
87101 +_002986_hash compat_sys_mbind 5 36256 _002986_hash NULL
87102 +_002987_hash compat_sys_migrate_pages 2 3157 _002987_hash NULL
87103 +_002988_hash compat_sys_move_pages 2 5861 _002988_hash NULL
87104 +_002989_hash compat_sys_mq_timedsend 3 31060 _002989_hash NULL
87105 +_002990_hash compat_sys_msgrcv 2 7482 _002990_hash NULL
87106 +_002991_hash compat_sys_msgsnd 2 10738 _002991_hash NULL
87107 +_002992_hash compat_sys_semtimedop 3 3606 _002992_hash NULL
87108 +_002993_hash compat_sys_set_mempolicy 3 57742 _002993_hash &_002614_hash
87109 +_002994_hash __copy_in_user 3 34790 _002994_hash NULL
87110 +_002995_hash dev_counters_read 3 19216 _002995_hash NULL
87111 +_002996_hash dev_names_read 3 38509 _002996_hash NULL
87112 +_002997_hash driver_names_read 3 60399 _002997_hash NULL
87113 +_002998_hash driver_stats_read 3 8944 _002998_hash NULL
87114 +_002999_hash evdev_ioctl_compat 2 13851 _002999_hash NULL
87115 +_003000_hash evtchn_read 3 3569 _003000_hash NULL
87116 +_003001_hash evtchn_write 3 43278 _003001_hash NULL
87117 +_003002_hash fat_compat_ioctl_filldir 3 36328 _003002_hash NULL
87118 +_003003_hash flash_read 3 57843 _003003_hash NULL
87119 +_003004_hash flash_write 3 62354 _003004_hash NULL
87120 +_003005_hash fw_device_op_compat_ioctl 2 42804 _003005_hash NULL
87121 +_003006_hash gather_array 3 56641 _003006_hash NULL
87122 +_003007_hash ghash_async_setkey 3 60001 _003007_hash NULL
87123 +_003008_hash gntdev_alloc_map 2 35145 _003008_hash NULL
87124 +_003009_hash gnttab_map 2 56439 _003009_hash NULL
87125 +_003010_hash gru_alloc_gts 2-3 60056 _003010_hash &_000981_hash
87126 +_003012_hash hiddev_compat_ioctl 2 41255 _003012_hash NULL
87127 +_003013_hash init_cdev 1 8274 _003013_hash NULL
87128 +_003014_hash init_per_cpu 1 17880 _003014_hash NULL
87129 +_003015_hash ipath_create_cq 2 45586 _003015_hash NULL
87130 +_003016_hash ipath_get_base_info 3 7043 _003016_hash NULL
87131 +_003017_hash ipath_init_qp_table 2 25167 _003017_hash NULL
87132 +_003018_hash ipath_resize_cq 2 712 _003018_hash NULL
87133 +_003019_hash joydev_compat_ioctl 2 8765 _003019_hash NULL
87134 +_003020_hash mon_bin_compat_ioctl 3 50234 _003020_hash NULL
87135 +_003021_hash options_write 3 47243 _003021_hash NULL
87136 +_003022_hash portcntrs_1_read 3 47253 _003022_hash NULL
87137 +_003023_hash portcntrs_2_read 3 56586 _003023_hash NULL
87138 +_003024_hash portnames_read 3 41958 _003024_hash NULL
87139 +_003025_hash ptc_proc_write 3 12076 _003025_hash NULL
87140 +_003026_hash put_cmsg_compat 4 35937 _003026_hash NULL
87141 +_003027_hash qib_alloc_devdata 2 51819 _003027_hash NULL
87142 +_003028_hash qib_alloc_fast_reg_page_list 2 10507 _003028_hash NULL
87143 +_003029_hash qib_cdev_init 1 34778 _003029_hash NULL
87144 +_003030_hash qib_create_cq 2 27497 _003030_hash NULL
87145 +_003031_hash qib_diag_write 3 62133 _003031_hash NULL
87146 +_003032_hash qib_get_base_info 3 11369 _003032_hash NULL
87147 +_003033_hash qib_resize_cq 2 53090 _003033_hash NULL
87148 +_003034_hash qsfp_1_read 3 21915 _003034_hash NULL
87149 +_003035_hash qsfp_2_read 3 31491 _003035_hash NULL
87150 +_003036_hash queue_reply 3 22416 _003036_hash NULL
87151 +_003037_hash spidev_compat_ioctl 2 63778 _003037_hash NULL
87152 +_003038_hash split 2 11691 _003038_hash NULL
87153 +_003039_hash stats_read_ul 3 32751 _003039_hash NULL
87154 +_003040_hash sys32_ipc 3 7238 _003040_hash NULL
87155 +_003041_hash sys32_rt_sigpending 2 25814 _003041_hash NULL
87156 +_003042_hash tunables_read 3 36385 _003042_hash NULL
87157 +_003043_hash tunables_write 3 59563 _003043_hash NULL
87158 +_003044_hash xenbus_file_write 3 6282 _003044_hash NULL
87159 +_003045_hash xlbd_reserve_minors 1-2 18365 _003045_hash NULL
87160 +_003047_hash xpc_kmalloc_cacheline_aligned 1 42895 _003047_hash NULL
87161 +_003048_hash xpc_kzalloc_cacheline_aligned 1 65433 _003048_hash NULL
87162 +_003049_hash xsd_read 3 15653 _003049_hash NULL
87163 +_003050_hash compat_do_readv_writev 4 49102 _003050_hash NULL
87164 +_003051_hash compat_keyctl_instantiate_key_iov 3 57431 _003088_hash NULL nohasharray
87165 +_003052_hash compat_process_vm_rw 3-5 22254 _003052_hash NULL
87166 +_003054_hash compat_sys_select 1 16131 _003054_hash NULL
87167 +_003055_hash compat_sys_setsockopt 5 3326 _003055_hash NULL
87168 +_003056_hash compat_udp_setsockopt 5 38840 _003056_hash NULL
87169 +_003057_hash compat_udpv6_setsockopt 5 42981 _003057_hash NULL
87170 +_003058_hash do_compat_pselect 1 10398 _003058_hash NULL
87171 +_003059_hash gnttab_expand 1 15817 _003059_hash NULL
87172 +_003060_hash ipath_cdev_init 1 37752 _003060_hash NULL
87173 +_003061_hash ipath_reg_phys_mr 3 23918 _003061_hash &_000999_hash
87174 +_003062_hash qib_alloc_fast_reg_mr 2 12526 _003062_hash NULL
87175 +_003063_hash qib_reg_phys_mr 3 60202 _003063_hash &_000897_hash
87176 +_003064_hash compat_readv 3 30273 _003064_hash NULL
87177 +_003065_hash compat_sys_process_vm_readv 3-5 15374 _003065_hash NULL
87178 +_003067_hash compat_sys_process_vm_writev 3-5 41194 _003067_hash NULL
87179 +_003069_hash compat_sys_pselect6 1 14105 _003069_hash NULL
87180 +_003070_hash compat_writev 3 60063 _003070_hash NULL
87181 +_003071_hash get_free_entries 1 46030 _003071_hash NULL
87182 +_003072_hash compat_sys_preadv64 3 24283 _003072_hash NULL
87183 +_003073_hash compat_sys_pwritev64 3 51151 _003073_hash NULL
87184 +_003074_hash compat_sys_readv 3 20911 _003074_hash NULL
87185 +_003075_hash compat_sys_writev 3 5784 _003075_hash NULL
87186 +_003076_hash gnttab_alloc_grant_references 1 18240 _003076_hash NULL
87187 +_003077_hash compat_sys_preadv 3 583 _003077_hash NULL
87188 +_003078_hash compat_sys_pwritev 3 17886 _003078_hash NULL
87189 +_003079_hash aes_decrypt_fail_read 3 54815 _003079_hash NULL
87190 +_003080_hash aes_decrypt_interrupt_read 3 19910 _003080_hash NULL
87191 +_003081_hash aes_decrypt_packets_read 3 10155 _003081_hash NULL
87192 +_003082_hash aes_encrypt_fail_read 3 32562 _003082_hash NULL
87193 +_003083_hash aes_encrypt_interrupt_read 3 39919 _003083_hash NULL
87194 +_003084_hash aes_encrypt_packets_read 3 48666 _003084_hash NULL
87195 +_003085_hash agp_remap 2 30665 _003085_hash NULL
87196 +_003086_hash alloc_apertures 1 56561 _003086_hash NULL
87197 +_003087_hash allocate_probes 1 40204 _003087_hash NULL
87198 +_003088_hash alloc_ftrace_hash 1 57431 _003088_hash &_003051_hash
87199 +_003089_hash alloc_page_cgroup 1 2919 _003089_hash NULL
87200 +_003090_hash __alloc_preds 2 9492 _003090_hash NULL
87201 +_003091_hash __alloc_pred_stack 2 26687 _003091_hash NULL
87202 +_003092_hash alloc_sched_domains 1 47756 _003092_hash NULL
87203 +_003093_hash alloc_trace_probe 6 38720 _003093_hash NULL
87204 +_003094_hash alloc_trace_uprobe 3 13870 _003094_hash &_002976_hash
87205 +_003095_hash ath6kl_sdio_alloc_prep_scat_req 2 51986 _003095_hash NULL
87206 +_003096_hash ath6kl_usb_post_recv_transfers 2 32892 _003096_hash NULL
87207 +_003097_hash ath6kl_usb_submit_ctrl_in 6 32880 _003097_hash &_000795_hash
87208 +_003098_hash ath6kl_usb_submit_ctrl_out 6 9978 _003098_hash NULL
87209 +_003099_hash av7110_ipack_init 2 46655 _003099_hash NULL
87210 +_003100_hash av7110_vbi_write 3 34384 _003100_hash NULL
87211 +_003101_hash bin_uuid 3 28999 _003101_hash NULL
87212 +_003102_hash blk_dropped_read 3 4168 _003102_hash NULL
87213 +_003103_hash blk_msg_write 3 13655 _003103_hash NULL
87214 +_003104_hash brcmf_usbdev_qinit 2 19090 _003104_hash &_001715_hash
87215 +_003105_hash brcmf_usb_dl_cmd 4 53130 _003105_hash NULL
87216 +_003106_hash ci_ll_init 3 12930 _003106_hash NULL
87217 +_003107_hash ci_ll_write 4 3740 _003107_hash NULL
87218 +_003108_hash conf_read 3 55786 _003108_hash NULL
87219 +_003109_hash __copy_from_user_inatomic_nocache 3 49921 _003109_hash NULL
87220 +_003110_hash cx24116_writeregN 4 41975 _003110_hash NULL
87221 +_003111_hash cyttsp_probe 4 1940 _003111_hash NULL
87222 +_003112_hash dccpprobe_read 3 52549 _003112_hash NULL
87223 +_003113_hash ddb_input_read 3 9743 _003113_hash NULL
87224 +_003114_hash ddb_output_write 3 31902 _003114_hash NULL
87225 +_003115_hash __devres_alloc 2 25598 _003115_hash NULL
87226 +_003116_hash dma_rx_errors_read 3 52045 _003116_hash NULL
87227 +_003117_hash dma_rx_requested_read 3 65354 _003117_hash NULL
87228 +_003118_hash dma_tx_errors_read 3 46060 _003118_hash NULL
87229 +_003119_hash dma_tx_requested_read 3 16110 _003203_hash NULL nohasharray
87230 +_003120_hash do_dmabuf_dirty_sou 7 3017 _003120_hash NULL
87231 +_003121_hash do_surface_dirty_sou 7 39678 _003121_hash NULL
87232 +_003122_hash driver_state_read 3 17194 _003122_hash &_001511_hash
87233 +_003123_hash drm_agp_bind_pages 3 56748 _003123_hash NULL
87234 +_003124_hash drm_buffer_alloc 2 44405 _003124_hash NULL
87235 +_003125_hash drm_calloc_large 1-2 65421 _003125_hash NULL
87236 +_003127_hash drm_fb_helper_init 3-4 19044 _003127_hash NULL
87237 +_003129_hash drm_ht_create 2 18853 _003129_hash NULL
87238 +_003130_hash drm_ioctl 2 42813 _003130_hash NULL
87239 +_003131_hash drm_malloc_ab 1-2 16831 _003131_hash NULL
87240 +_003133_hash drm_mode_crtc_set_gamma_size 2 31881 _003133_hash NULL
87241 +_003134_hash drm_plane_init 6 28731 _003134_hash NULL
87242 +_003135_hash drm_property_create 4 51239 _003135_hash NULL
87243 +_003136_hash drm_property_create_blob 2 7414 _003136_hash NULL
87244 +_003137_hash drm_vblank_init 2 11362 _003137_hash NULL
87245 +_003138_hash drm_vmalloc_dma 1 14550 _003138_hash NULL
87246 +_003139_hash dvb_aplay 3 56296 _003139_hash NULL
87247 +_003140_hash dvb_ca_en50221_init 4 45718 _003140_hash NULL
87248 +_003141_hash dvb_ca_en50221_io_write 3 43533 _003141_hash NULL
87249 +_003142_hash dvb_dmxdev_set_buffer_size 2 55643 _003142_hash NULL
87250 +_003143_hash dvbdmx_write 3 19423 _003143_hash NULL
87251 +_003144_hash dvb_dvr_set_buffer_size 2 9840 _003144_hash NULL
87252 +_003145_hash dvb_net_sec 3 37884 _003145_hash NULL
87253 +_003146_hash dvb_play 3 50814 _003146_hash NULL
87254 +_003147_hash dvb_ringbuffer_pkt_read_user 2-5-3 4303 _003147_hash NULL
87255 +_003150_hash dvb_ringbuffer_read_user 3 56702 _003150_hash NULL
87256 +_003151_hash dvb_usercopy 2 14036 _003151_hash NULL
87257 +_003152_hash dw210x_op_rw 6 39915 _003152_hash NULL
87258 +_003153_hash edt_ft5x06_debugfs_raw_data_read 3 28002 _003153_hash NULL
87259 +_003154_hash em_canid_change 3 14150 _003154_hash NULL
87260 +_003155_hash event_calibration_read 3 21083 _003155_hash NULL
87261 +_003156_hash event_enable_read 3 7074 _003156_hash NULL
87262 +_003157_hash event_filter_read 3 23494 _003157_hash NULL
87263 +_003158_hash event_filter_write 3 56609 _003158_hash NULL
87264 +_003159_hash event_heart_beat_read 3 48961 _003159_hash NULL
87265 +_003160_hash event_id_read 3 64288 _003160_hash &_001300_hash
87266 +_003161_hash event_oom_late_read 3 61175 _003161_hash &_001054_hash
87267 +_003162_hash event_phy_transmit_error_read 3 10471 _003162_hash NULL
87268 +_003163_hash event_rx_mem_empty_read 3 40363 _003163_hash NULL
87269 +_003164_hash event_rx_mismatch_read 3 38518 _003164_hash NULL
87270 +_003165_hash event_rx_pool_read 3 25792 _003165_hash NULL
87271 +_003166_hash event_tx_stuck_read 3 19305 _003166_hash NULL
87272 +_003167_hash excessive_retries_read 3 60425 _003167_hash NULL
87273 +_003168_hash flexcop_device_kmalloc 1 54793 _003168_hash NULL
87274 +_003169_hash fm_send_cmd 5 39639 _003169_hash NULL
87275 +_003170_hash __fprog_create 2 41263 _003170_hash NULL
87276 +_003171_hash fq_codel_zalloc 1 15378 _003171_hash NULL
87277 +_003172_hash ftrace_pid_write 3 39710 _003172_hash NULL
87278 +_003173_hash ftrace_profile_read 3 21327 _003173_hash NULL
87279 +_003174_hash fw_stats_raw_read 3 1369 _003174_hash NULL
87280 +_003175_hash get_info 3 55681 _003175_hash NULL
87281 +_003176_hash __get_vm_area_node 1 55305 _003176_hash NULL
87282 +_003177_hash gpio_power_read 3 36059 _003177_hash NULL
87283 +_003178_hash h5_prepare_pkt 4 12085 _003178_hash NULL
87284 +_003179_hash hsc_msg_alloc 1 60990 _003179_hash NULL
87285 +_003180_hash hsc_write 3 55875 _003180_hash NULL
87286 +_003181_hash hsi_alloc_controller 1 41802 _003181_hash NULL
87287 +_003182_hash hsi_register_board_info 2 13820 _003182_hash NULL
87288 +_003183_hash hugetlb_cgroup_read 5 49259 _003183_hash NULL
87289 +_003184_hash i915_cache_sharing_read 3 24775 _003184_hash NULL
87290 +_003185_hash i915_cache_sharing_write 3 57961 _003185_hash NULL
87291 +_003186_hash i915_max_freq_read 3 20581 _003186_hash NULL
87292 +_003187_hash i915_max_freq_write 3 11350 _003187_hash NULL
87293 +_003188_hash i915_min_freq_read 3 38470 _003188_hash NULL
87294 +_003189_hash i915_min_freq_write 3 10981 _003189_hash NULL
87295 +_003190_hash i915_ring_stop_read 3 42549 _003190_hash &_000740_hash
87296 +_003191_hash i915_ring_stop_write 3 59010 _003191_hash NULL
87297 +_003192_hash i915_wedged_read 3 35474 _003192_hash NULL
87298 +_003193_hash i915_wedged_write 3 47771 _003193_hash NULL
87299 +_003194_hash ieee802154_alloc_device 1 13767 _003194_hash NULL
87300 +_003195_hash intel_sdvo_write_cmd 4 54377 _003195_hash &_000832_hash
87301 +_003196_hash isr_cmd_cmplt_read 3 53439 _003196_hash NULL
87302 +_003197_hash isr_commands_read 3 41398 _003197_hash NULL
87303 +_003198_hash isr_decrypt_done_read 3 49490 _003198_hash NULL
87304 +_003199_hash isr_dma0_done_read 3 8574 _003199_hash NULL
87305 +_003200_hash isr_dma1_done_read 3 48159 _003200_hash NULL
87306 +_003201_hash isr_fiqs_read 3 34687 _003201_hash NULL
87307 +_003202_hash isr_host_acknowledges_read 3 54136 _003202_hash NULL
87308 +_003203_hash isr_hw_pm_mode_changes_read 3 16110 _003203_hash &_003119_hash
87309 +_003204_hash isr_irqs_read 3 9181 _003204_hash NULL
87310 +_003205_hash isr_low_rssi_read 3 64789 _003205_hash NULL
87311 +_003206_hash isr_pci_pm_read 3 30271 _003206_hash NULL
87312 +_003207_hash isr_rx_headers_read 3 38325 _003207_hash NULL
87313 +_003208_hash isr_rx_mem_overflow_read 3 43025 _003208_hash NULL
87314 +_003209_hash isr_rx_procs_read 3 31804 _003209_hash NULL
87315 +_003210_hash isr_rx_rdys_read 3 35283 _003210_hash NULL
87316 +_003211_hash isr_tx_exch_complete_read 3 16103 _003211_hash NULL
87317 +_003212_hash isr_tx_procs_read 3 23084 _003212_hash NULL
87318 +_003213_hash isr_wakeups_read 3 49607 _003213_hash NULL
87319 +_003214_hash LoadBitmap 2 19658 _003214_hash NULL
87320 +_003215_hash mem_cgroup_read 5 22461 _003215_hash NULL
87321 +_003216_hash mic_calc_failure_read 3 59700 _003216_hash NULL
87322 +_003217_hash mic_rx_pkts_read 3 27972 _003217_hash NULL
87323 +_003218_hash __module_alloc 1 50004 _003218_hash NULL
87324 +_003219_hash module_alloc_update_bounds_rw 1 63233 _003219_hash NULL
87325 +_003220_hash module_alloc_update_bounds_rx 1 58634 _003220_hash NULL
87326 +_003221_hash mwifiex_usb_submit_rx_urb 2 54558 _003221_hash NULL
87327 +_003222_hash nfc_hci_hcp_message_tx 6 14534 _003222_hash NULL
87328 +_003223_hash nfc_hci_set_param 5 40697 _003223_hash NULL
87329 +_003224_hash nfc_shdlc_alloc_skb 2 12741 _003224_hash NULL
87330 +_003225_hash opera1_xilinx_rw 5 31453 _003225_hash NULL
87331 +_003226_hash persistent_ram_vmap 1-2 709 _003226_hash NULL
87332 +_003228_hash prctl_set_mm 3 64538 _003228_hash NULL
87333 +_003229_hash probe_kernel_write 3 17481 _003229_hash NULL
87334 +_003230_hash proc_fault_inject_read 3 36802 _003230_hash NULL
87335 +_003231_hash proc_fault_inject_write 3 21058 _003231_hash NULL
87336 +_003232_hash ps_pspoll_max_apturn_read 3 6699 _003232_hash NULL
87337 +_003233_hash ps_pspoll_timeouts_read 3 11776 _003233_hash NULL
87338 +_003234_hash ps_pspoll_utilization_read 3 5361 _003234_hash NULL
87339 +_003235_hash ps_upsd_max_apturn_read 3 19918 _003235_hash NULL
87340 +_003236_hash ps_upsd_max_sptime_read 3 63362 _003236_hash NULL
87341 +_003237_hash ps_upsd_timeouts_read 3 28924 _003237_hash NULL
87342 +_003238_hash ps_upsd_utilization_read 3 51669 _003238_hash NULL
87343 +_003239_hash ptp_filter_init 2 36780 _003239_hash NULL
87344 +_003240_hash pwr_disable_ps_read 3 13176 _003240_hash NULL
87345 +_003241_hash pwr_elp_enter_read 3 5324 _003241_hash NULL
87346 +_003242_hash pwr_enable_ps_read 3 17686 _003242_hash NULL
87347 +_003243_hash pwr_fix_tsf_ps_read 3 26627 _003243_hash NULL
87348 +_003244_hash pwr_missing_bcns_read 3 25824 _003244_hash NULL
87349 +_003245_hash pwr_power_save_off_read 3 18355 _003245_hash NULL
87350 +_003246_hash pwr_ps_enter_read 3 26935 _003246_hash &_000512_hash
87351 +_003247_hash pwr_rcvd_awake_beacons_read 3 50505 _003247_hash NULL
87352 +_003248_hash pwr_rcvd_beacons_read 3 52836 _003248_hash NULL
87353 +_003249_hash pwr_tx_without_ps_read 3 48423 _003249_hash NULL
87354 +_003250_hash pwr_tx_with_ps_read 3 60851 _003250_hash NULL
87355 +_003251_hash pwr_wake_on_host_read 3 26321 _003251_hash NULL
87356 +_003252_hash pwr_wake_on_timer_exp_read 3 22640 _003252_hash NULL
87357 +_003253_hash rb_simple_read 3 45972 _003253_hash NULL
87358 +_003254_hash read_file_dfs 3 43145 _003254_hash NULL
87359 +_003255_hash retry_count_read 3 52129 _003255_hash NULL
87360 +_003256_hash rx_dropped_read 3 44799 _003256_hash NULL
87361 +_003257_hash rx_fcs_err_read 3 62844 _003257_hash NULL
87362 +_003258_hash rx_hdr_overflow_read 3 64407 _003258_hash NULL
87363 +_003259_hash rx_hw_stuck_read 3 57179 _003259_hash NULL
87364 +_003260_hash rx_out_of_mem_read 3 10157 _003260_hash NULL
87365 +_003261_hash rx_path_reset_read 3 23801 _003261_hash NULL
87366 +_003262_hash rxpipe_beacon_buffer_thres_host_int_trig_rx_data_read 3 55106 _003262_hash NULL
87367 +_003263_hash rxpipe_descr_host_int_trig_rx_data_read 3 22001 _003263_hash &_002981_hash
87368 +_003264_hash rxpipe_missed_beacon_host_int_trig_rx_data_read 3 63405 _003264_hash NULL
87369 +_003265_hash rxpipe_rx_prep_beacon_drop_read 3 2403 _003265_hash NULL
87370 +_003266_hash rxpipe_tx_xfr_host_int_trig_rx_data_read 3 35538 _003266_hash NULL
87371 +_003267_hash rx_reset_counter_read 3 58001 _003267_hash NULL
87372 +_003268_hash rx_xfr_hint_trig_read 3 40283 _003268_hash NULL
87373 +_003269_hash saa7146_vmalloc_build_pgtable 2 19780 _003269_hash NULL
87374 +_003270_hash sched_feat_write 3 55202 _003270_hash NULL
87375 +_003271_hash sd_alloc_ctl_entry 1 29708 _003271_hash NULL
87376 +_003272_hash shmem_pread_fast 3 34147 _003272_hash NULL
87377 +_003273_hash shmem_pread_slow 3 3198 _003273_hash NULL
87378 +_003274_hash shmem_pwrite_slow 3 31741 _003274_hash NULL
87379 +_003275_hash show_header 3 4722 _003275_hash &_000745_hash
87380 +_003276_hash stack_max_size_read 3 1445 _003276_hash NULL
87381 +_003277_hash subsystem_filter_read 3 62310 _003277_hash NULL
87382 +_003278_hash subsystem_filter_write 3 13022 _003278_hash NULL
87383 +_003279_hash swap_cgroup_swapon 2 13614 _003279_hash NULL
87384 +_003280_hash system_enable_read 3 25815 _003280_hash NULL
87385 +_003281_hash tda10048_writeregbulk 4 11050 _003281_hash NULL
87386 +_003282_hash tlbflush_read_file 3 64661 _003282_hash NULL
87387 +_003283_hash trace_options_core_read 3 47390 _003283_hash NULL
87388 +_003284_hash trace_options_read 3 11419 _003284_hash NULL
87389 +_003285_hash trace_parser_get_init 2 31379 _003285_hash NULL
87390 +_003286_hash traceprobe_probes_write 3 64969 _003286_hash NULL
87391 +_003287_hash trace_seq_to_user 3 65398 _003287_hash NULL
87392 +_003288_hash tracing_buffers_read 3 11124 _003288_hash NULL
87393 +_003289_hash tracing_clock_write 3 27961 _003289_hash NULL
87394 +_003290_hash tracing_cpumask_read 3 7010 _003290_hash NULL
87395 +_003291_hash tracing_ctrl_read 3 46922 _003291_hash NULL
87396 +_003292_hash tracing_entries_read 3 8345 _003292_hash NULL
87397 +_003293_hash tracing_max_lat_read 3 8890 _003293_hash NULL
87398 +_003294_hash tracing_read_dyn_info 3 45468 _003294_hash NULL
87399 +_003295_hash tracing_readme_read 3 16493 _003295_hash NULL
87400 +_003296_hash tracing_saved_cmdlines_read 3 21434 _003296_hash NULL
87401 +_003297_hash tracing_set_trace_read 3 44122 _003297_hash NULL
87402 +_003298_hash tracing_set_trace_write 3 57096 _003298_hash NULL
87403 +_003299_hash tracing_stats_read 3 34537 _003299_hash NULL
87404 +_003300_hash tracing_total_entries_read 3 62817 _003300_hash NULL
87405 +_003301_hash tracing_trace_options_write 3 153 _003301_hash NULL
87406 +_003302_hash tstats_write 3 60432 _003302_hash &_000009_hash
87407 +_003303_hash ttm_bo_fbdev_io 4 9805 _003303_hash NULL
87408 +_003304_hash ttm_bo_io 5 47000 _003304_hash NULL
87409 +_003305_hash ttm_dma_page_pool_free 2 34135 _003305_hash NULL
87410 +_003306_hash ttm_page_pool_free 2 61661 _003306_hash NULL
87411 +_003307_hash ttusb2_msg 4 3100 _003307_hash NULL
87412 +_003308_hash tx_internal_desc_overflow_read 3 47300 _003308_hash NULL
87413 +_003309_hash tx_queue_len_read 3 1463 _003309_hash NULL
87414 +_003310_hash tx_queue_status_read 3 44978 _003310_hash NULL
87415 +_003311_hash u_memcpya 2-3 30139 _003311_hash NULL
87416 +_003313_hash usb_allocate_stream_buffers 3 8964 _003313_hash NULL
87417 +_003314_hash vifs_state_read 3 33762 _003314_hash NULL
87418 +_003315_hash vmalloc_to_sg 2 58354 _003315_hash NULL
87419 +_003316_hash vm_map_ram 2 23078 _003316_hash &_001095_hash
87420 +_003317_hash vmw_execbuf_process 5 22885 _003317_hash NULL
87421 +_003318_hash vmw_fifo_reserve 2 12141 _003318_hash NULL
87422 +_003319_hash vmw_kms_present 9 38130 _003319_hash NULL
87423 +_003320_hash vmw_kms_readback 6 5727 _003320_hash NULL
87424 +_003321_hash wep_addr_key_count_read 3 20174 _003321_hash NULL
87425 +_003322_hash wep_decrypt_fail_read 3 58567 _003322_hash NULL
87426 +_003323_hash wep_default_key_count_read 3 43035 _003323_hash NULL
87427 +_003324_hash wep_interrupt_read 3 41492 _003324_hash NULL
87428 +_003325_hash wep_key_not_found_read 3 13377 _003325_hash &_000952_hash
87429 +_003326_hash wep_packets_read 3 18751 _003326_hash NULL
87430 +_003327_hash wl1251_cmd_template_set 4 6172 _003327_hash NULL
87431 +_003328_hash wl1271_format_buffer 2 20834 _003328_hash NULL
87432 +_003329_hash wl1271_rx_filter_alloc_field 5 46721 _003329_hash NULL
87433 +_003330_hash wl12xx_cmd_build_probe_req 6-8 54946 _003330_hash NULL
87434 +_003332_hash wlcore_alloc_hw 1 7785 _003332_hash NULL
87435 +_003333_hash aggr_size_rx_size_read 3 33526 _003333_hash NULL
87436 +_003334_hash aggr_size_tx_agg_vs_rate_read 3 21438 _003334_hash NULL
87437 +_003335_hash alloc_and_copy_ftrace_hash 1 29368 _003335_hash NULL
87438 +_003336_hash alloc_bulk_urbs_generic 5 12127 _003336_hash NULL
87439 +_003337_hash alloc_ieee80211 1 20063 _003337_hash NULL
87440 +_003338_hash alloc_ieee80211_rsl 1 34564 _003338_hash NULL
87441 +_003339_hash alloc_perm_bits 2 1532 _003339_hash NULL
87442 +_003340_hash alloc_private 2 22399 _003340_hash NULL
87443 +_003341_hash alloc_rtllib 1 51136 _003341_hash NULL
87444 +_003342_hash alloc_rx_desc_ring 2 18016 _003342_hash NULL
87445 +_003343_hash arcfb_write 3 8702 _003343_hash NULL
87446 +_003344_hash ath6kl_usb_bmi_read 3 48745 _003344_hash NULL
87447 +_003345_hash ath6kl_usb_bmi_write 3 2454 _003345_hash &_001020_hash
87448 +_003346_hash ath6kl_usb_ctrl_msg_exchange 4 33327 _003346_hash NULL
87449 +_003347_hash au0828_init_isoc 2-3 61917 _003347_hash NULL
87450 +_003349_hash auok190xfb_write 3 37001 _003349_hash NULL
87451 +_003350_hash beacon_interval_read 3 7091 _003350_hash NULL
87452 +_003351_hash brcmf_usb_attach 1-2 44656 _003351_hash NULL
87453 +_003353_hash broadsheetfb_write 3 39976 _003353_hash NULL
87454 +_003354_hash broadsheet_spiflash_rewrite_sector 2 54864 _003354_hash NULL
87455 +_003355_hash ci13xxx_add_device 3 14456 _003355_hash NULL
87456 +_003356_hash cmpk_message_handle_tx 4 54024 _003356_hash NULL
87457 +_003357_hash comedi_alloc_subdevices 2 29207 _003357_hash NULL
87458 +_003358_hash comedi_buf_alloc 3 24822 _003358_hash NULL
87459 +_003359_hash comedi_read 3 13199 _003359_hash NULL
87460 +_003360_hash comedi_write 3 47926 _003360_hash NULL
87461 +_003361_hash create_trace_probe 1 20175 _003361_hash NULL
87462 +_003362_hash create_trace_uprobe 1 13184 _003362_hash NULL
87463 +_003363_hash cx18_copy_buf_to_user 4 22735 _003363_hash NULL
87464 +_003364_hash cx231xx_init_bulk 2-3 47024 _003364_hash NULL
87465 +_003366_hash cx231xx_init_isoc 2-3 56453 _003366_hash NULL
87466 +_003368_hash cx231xx_init_vbi_isoc 2-3 28053 _003368_hash NULL
87467 +_003370_hash da9052_group_write 3 4534 _003370_hash NULL
87468 +_003371_hash debug_debug1_read 3 8856 _003371_hash NULL
87469 +_003372_hash debug_debug2_read 3 30526 _003372_hash NULL
87470 +_003373_hash debug_debug3_read 3 56894 _003373_hash NULL
87471 +_003374_hash debug_debug4_read 3 61367 _003374_hash NULL
87472 +_003375_hash debug_debug5_read 3 2291 _003375_hash NULL
87473 +_003376_hash debug_debug6_read 3 33168 _003376_hash NULL
87474 +_003377_hash dev_read 3 56369 _003377_hash NULL
87475 +_003378_hash do_dmabuf_dirty_ldu 6 52241 _003378_hash NULL
87476 +_003379_hash drm_compat_ioctl 2 51717 _003379_hash NULL
87477 +_003380_hash drm_mode_create_tv_properties 2 23122 _003380_hash NULL
87478 +_003381_hash drm_property_create_bitmask 5 30195 _003381_hash NULL
87479 +_003382_hash drm_property_create_enum 5 29201 _003382_hash NULL
87480 +_003383_hash dsp_buffer_alloc 2 11684 _003383_hash NULL
87481 +_003384_hash dt3155_alloc_coherent 2 58073 _003384_hash NULL
87482 +_003385_hash dtim_interval_read 3 654 _003385_hash NULL
87483 +_003386_hash dvb_audio_write 3 51275 _003386_hash NULL
87484 +_003387_hash dvb_ca_en50221_io_ioctl 2 26490 _003387_hash NULL
87485 +_003388_hash dvb_ca_write 3 41171 _003388_hash NULL
87486 +_003389_hash dvb_demux_ioctl 2 42733 _003389_hash NULL
87487 +_003390_hash dvb_dmxdev_buffer_read 4 20682 _003390_hash NULL
87488 +_003391_hash dvb_dvr_ioctl 2 49182 _003391_hash NULL
87489 +_003392_hash dvb_generic_ioctl 2 21810 _003392_hash NULL
87490 +_003393_hash dvb_net_ioctl 2 61559 _003393_hash NULL
87491 +_003394_hash dvb_net_sec_callback 2 28786 _003394_hash NULL
87492 +_003396_hash dvb_video_write 3 754 _003396_hash NULL
87493 +_003397_hash dynamic_ps_timeout_read 3 10110 _003397_hash NULL
87494 +_003398_hash easycap_alsa_vmalloc 2 14426 _003398_hash NULL
87495 +_003399_hash em28xx_alloc_isoc 4 46892 _003399_hash NULL
87496 +_003400_hash error_error_bar_retry_read 3 64305 _003400_hash NULL
87497 +_003401_hash error_error_frame_cts_nul_flid_read 3 17262 _003401_hash NULL
87498 +_003402_hash error_error_frame_read 3 39947 _003402_hash &_002436_hash
87499 +_003403_hash error_error_null_Frame_tx_start_read 3 55024 _003403_hash NULL
87500 +_003404_hash error_error_numll_frame_cts_start_read 3 47781 _003404_hash NULL
87501 +_003405_hash ext_sd_execute_read_data 9 48589 _003405_hash NULL
87502 +_003406_hash ext_sd_execute_write_data 9 8175 _003406_hash NULL
87503 +_003407_hash fast_user_write 5 20494 _003407_hash NULL
87504 +_003408_hash f_audio_buffer_alloc 1 41110 _003408_hash NULL
87505 +_003409_hash fb_alloc_cmap_gfp 2 20792 _003409_hash NULL
87506 +_003410_hash fbcon_do_set_font 2-3 4079 _003410_hash NULL
87507 +_003412_hash fb_read 3 33506 _003412_hash NULL
87508 +_003413_hash fb_sys_read 3 13778 _003413_hash NULL
87509 +_003414_hash fb_sys_write 3 33130 _003414_hash NULL
87510 +_003415_hash fb_write 3 46924 _003415_hash NULL
87511 +_003416_hash firmwareUpload 3 32794 _003416_hash NULL
87512 +_003417_hash fmc_send_cmd 5 20435 _003417_hash NULL
87513 +_003418_hash fops_read 3 40672 _003418_hash NULL
87514 +_003419_hash forced_ps_read 3 31685 _003419_hash NULL
87515 +_003420_hash frame_alloc 4 15981 _003420_hash NULL
87516 +_003421_hash framebuffer_alloc 1 59145 _003421_hash NULL
87517 +_003422_hash ftrace_write 3 29551 _003422_hash NULL
87518 +_003423_hash fw_download_code 3 13249 _003423_hash NULL
87519 +_003424_hash fwSendNullPacket 2 54618 _003424_hash NULL
87520 +_003425_hash gdm_wimax_netif_rx 3 43423 _003425_hash &_001810_hash
87521 +_003426_hash get_vm_area 1 18080 _003426_hash NULL
87522 +_003427_hash __get_vm_area 1 61599 _003427_hash NULL
87523 +_003428_hash get_vm_area_caller 1 10527 _003428_hash NULL
87524 +_003429_hash __get_vm_area_caller 1 56416 _003828_hash NULL nohasharray
87525 +_003430_hash gspca_dev_probe2 4 59833 _003430_hash NULL
87526 +_003431_hash hdpvr_read 3 9273 _003431_hash NULL
87527 +_003432_hash hecubafb_write 3 26942 _003432_hash NULL
87528 +_003433_hash i915_compat_ioctl 2 3656 _003433_hash NULL
87529 +_003434_hash i915_gem_execbuffer_relocate_slow 7 25355 _003434_hash NULL
87530 +_003435_hash ieee80211_alloc_txb 1-2 52477 _003435_hash NULL
87531 +_003437_hash ieee80211_authentication_req 3 63973 _003437_hash NULL
87532 +_003438_hash ieee80211_wx_set_gen_ie 3 51399 _003438_hash NULL
87533 +_003439_hash ieee80211_wx_set_gen_ie_rsl 3 3521 _003458_hash NULL nohasharray
87534 +_003440_hash intel_sdvo_set_value 4 2311 _003440_hash NULL
87535 +_003441_hash ir_lirc_transmit_ir 3 64403 _003441_hash NULL
87536 +_003442_hash irq_blk_threshold_read 3 33666 _003442_hash NULL
87537 +_003443_hash irq_pkt_threshold_read 3 33356 _003443_hash &_000154_hash
87538 +_003444_hash irq_timeout_read 3 54653 _003444_hash NULL
87539 +_003445_hash ivtv_buf_copy_from_user 4 25502 _003445_hash NULL
87540 +_003446_hash ivtv_copy_buf_to_user 4 6159 _003446_hash NULL
87541 +_003447_hash ivtvfb_write 3 40023 _003447_hash NULL
87542 +_003448_hash kgdb_hex2mem 3 24755 _003448_hash NULL
87543 +_003449_hash lirc_buffer_init 2-3 53282 _003449_hash NULL
87544 +_003451_hash lirc_write 3 20604 _003451_hash NULL
87545 +_003452_hash mce_request_packet 3 1073 _003452_hash NULL
87546 +_003453_hash media_entity_init 2-4 15870 _003453_hash &_001742_hash
87547 +_003455_hash mem_fw_gen_free_mem_blks_read 3 11413 _003455_hash NULL
87548 +_003456_hash mem_fwlog_free_mem_blks_read 3 59616 _003456_hash NULL
87549 +_003457_hash mem_rx_free_mem_blks_read 3 675 _003457_hash NULL
87550 +_003458_hash mem_tx_free_mem_blks_read 3 3521 _003458_hash &_003439_hash
87551 +_003459_hash metronomefb_write 3 8823 _003459_hash NULL
87552 +_003460_hash mga_compat_ioctl 2 52170 _003460_hash NULL
87553 +_003461_hash mmio_read 4 40348 _003461_hash NULL
87554 +_003462_hash netlink_send 5 38434 _003462_hash NULL
87555 +_003463_hash nfc_hci_execute_cmd 5 43882 _003463_hash NULL
87556 +_003464_hash nfc_hci_send_event 5 21452 _003464_hash NULL
87557 +_003465_hash nfc_hci_send_response 5 56462 _003465_hash NULL
87558 +_003466_hash ni_gpct_device_construct 5 610 _003466_hash NULL
87559 +_003467_hash nouveau_compat_ioctl 2 28305 _003467_hash NULL
87560 +_003468_hash odev_update 2 50169 _003468_hash NULL
87561 +_003469_hash opera1_usb_i2c_msgxfer 4 64521 _003469_hash NULL
87562 +_003470_hash OSDSetBlock 2-4 38986 _003470_hash NULL
87563 +_003472_hash oz_add_farewell 5 20652 _003472_hash NULL
87564 +_003473_hash oz_cdev_read 3 20659 _003473_hash NULL
87565 +_003474_hash oz_cdev_write 3 33852 _003474_hash NULL
87566 +_003475_hash oz_ep_alloc 2 5587 _003475_hash NULL
87567 +_003476_hash oz_events_read 3 47535 _003476_hash NULL
87568 +_003477_hash persistent_ram_buffer_map 1-2 11332 _003477_hash NULL
87569 +_003479_hash pipeline_cs_rx_packet_in_read 3 37089 _003479_hash NULL
87570 +_003480_hash pipeline_cs_rx_packet_out_read 3 58926 _003480_hash NULL
87571 +_003481_hash pipeline_csum_to_rx_xfer_swi_read 3 15403 _003481_hash NULL
87572 +_003482_hash pipeline_dec_packet_in_fifo_full_read 3 33052 _003482_hash NULL
87573 +_003483_hash pipeline_dec_packet_in_read 3 47076 _003483_hash NULL
87574 +_003484_hash pipeline_dec_packet_out_read 3 54052 _003484_hash NULL
87575 +_003485_hash pipeline_defrag_to_csum_swi_read 3 63037 _003485_hash NULL
87576 +_003486_hash pipeline_enc_rx_stat_fifo_int_read 3 7107 _003486_hash NULL
87577 +_003487_hash pipeline_enc_tx_stat_fifo_int_read 3 14680 _003487_hash NULL
87578 +_003488_hash pipeline_hs_tx_stat_fifo_int_read 3 15642 _003488_hash &_001260_hash
87579 +_003489_hash pipeline_pipeline_fifo_full_read 3 34095 _003489_hash NULL
87580 +_003490_hash pipeline_post_proc_swi_read 3 24108 _003490_hash NULL
87581 +_003491_hash pipeline_pre_proc_swi_read 3 3898 _003491_hash NULL
87582 +_003492_hash pipeline_pre_to_defrag_swi_read 3 56321 _003492_hash NULL
87583 +_003493_hash pipeline_rx_complete_stat_fifo_int_read 3 40671 _003493_hash NULL
87584 +_003494_hash pipeline_sec_frag_swi_read 3 30294 _003494_hash NULL
87585 +_003495_hash pipeline_tcp_rx_stat_fifo_int_read 3 26745 _003495_hash NULL
87586 +_003496_hash pipeline_tcp_tx_stat_fifo_int_read 3 32589 _003496_hash NULL
87587 +_003497_hash play_iframe 3 8219 _003497_hash NULL
87588 +_003498_hash probes_write 3 29711 _003498_hash NULL
87589 +_003499_hash psb_unlocked_ioctl 2 16926 _003499_hash &_002668_hash
87590 +_003500_hash ps_poll_ps_poll_max_ap_turn_read 3 53140 _003500_hash NULL
87591 +_003501_hash ps_poll_ps_poll_timeouts_read 3 5934 _003501_hash NULL
87592 +_003502_hash ps_poll_ps_poll_utilization_read 3 39383 _003502_hash NULL
87593 +_003503_hash ps_poll_upsd_max_ap_turn_read 3 42050 _003503_hash NULL
87594 +_003504_hash ps_poll_upsd_timeouts_read 3 36755 _003504_hash NULL
87595 +_003505_hash ps_poll_upsd_utilization_read 3 28519 _003505_hash NULL
87596 +_003506_hash pvr2_ioread_read 3 10720 _003506_hash &_001669_hash
87597 +_003507_hash pvr2_ioread_set_sync_key 3 59882 _003507_hash NULL
87598 +_003508_hash pvr2_stream_buffer_count 2 33719 _003508_hash NULL
87599 +_003509_hash pwr_connection_out_of_sync_read 3 35061 _003509_hash NULL
87600 +_003510_hash pwr_cont_miss_bcns_spread_read 3 39250 _003515_hash NULL nohasharray
87601 +_003511_hash pwr_missing_bcns_cnt_read 3 45113 _003511_hash NULL
87602 +_003512_hash pwr_rcvd_awake_bcns_cnt_read 3 12632 _003512_hash NULL
87603 +_003513_hash pwr_rcvd_bcns_cnt_read 3 4774 _003513_hash NULL
87604 +_003514_hash qc_capture 3 19298 _003514_hash NULL
87605 +_003515_hash r128_compat_ioctl 2 39250 _003515_hash &_003510_hash
87606 +_003516_hash radeon_compat_ioctl 2 59150 _003516_hash NULL
87607 +_003517_hash radeon_kms_compat_ioctl 2 51371 _003517_hash NULL
87608 +_003518_hash Realloc 2 34961 _003518_hash NULL
87609 +_003519_hash redrat3_transmit_ir 3 64244 _003519_hash NULL
87610 +_003520_hash reg_w_buf 3 27724 _003520_hash NULL
87611 +_003521_hash reg_w_ixbuf 4 34736 _003521_hash NULL
87612 +_003522_hash rtllib_alloc_txb 1-2 21687 _003522_hash NULL
87613 +_003524_hash rtllib_authentication_req 3 26713 _003524_hash NULL
87614 +_003525_hash rtllib_wx_set_gen_ie 3 59808 _003525_hash NULL
87615 +_003526_hash rts51x_transfer_data_partial 6 5735 _003526_hash NULL
87616 +_003527_hash rvmalloc 1 46873 _003527_hash NULL
87617 +_003528_hash rx_decrypt_key_not_found_read 3 37820 _003528_hash NULL
87618 +_003529_hash rx_defrag_called_read 3 1897 _003529_hash NULL
87619 +_003530_hash rx_defrag_decrypt_failed_read 3 41411 _003530_hash NULL
87620 +_003531_hash rx_defrag_init_called_read 3 35935 _003531_hash NULL
87621 +_003532_hash rx_defrag_in_process_called_read 3 59338 _003532_hash NULL
87622 +_003533_hash rx_defrag_need_decrypt_read 3 42253 _003533_hash NULL
87623 +_003534_hash rx_defrag_need_defrag_read 3 28117 _003534_hash NULL
87624 +_003535_hash rx_defrag_tkip_called_read 3 21031 _003535_hash NULL
87625 +_003536_hash rx_filter_accum_arp_pend_requests_read 3 11003 _003536_hash NULL
87626 +_003537_hash rx_filter_arp_filter_read 3 61914 _003537_hash NULL
87627 +_003538_hash rx_filter_beacon_filter_read 3 49279 _003538_hash NULL
87628 +_003539_hash rx_filter_data_filter_read 3 30098 _003539_hash NULL
87629 +_003540_hash rx_filter_dup_filter_read 3 37238 _003540_hash NULL
87630 +_003541_hash rx_filter_ibss_filter_read 3 50167 _003541_hash NULL
87631 +_003542_hash rx_filter_max_arp_queue_dep_read 3 5851 _003542_hash NULL
87632 +_003543_hash rx_filter_mc_filter_read 3 25712 _003543_hash NULL
87633 +_003544_hash rx_filter_protection_filter_read 3 39282 _003544_hash NULL
87634 +_003545_hash rx_rate_rx_frames_per_rates_read 3 7282 _003545_hash NULL
87635 +_003546_hash rx_rx_beacon_early_term_read 3 21559 _003546_hash NULL
87636 +_003547_hash rx_rx_checksum_result_read 3 50617 _003547_hash NULL
87637 +_003548_hash rx_rx_cmplt_read 3 14753 _003548_hash NULL
87638 +_003549_hash rx_rx_cmplt_task_read 3 35226 _003549_hash NULL
87639 +_003550_hash rx_rx_defrag_end_read 3 505 _003550_hash NULL
87640 +_003551_hash rx_rx_defrag_read 3 2010 _003551_hash NULL
87641 +_003552_hash rx_rx_done_read 3 65217 _003552_hash NULL
87642 +_003553_hash rx_rx_dropped_frame_read 3 23748 _003553_hash NULL
87643 +_003554_hash rx_rx_frame_checksum_read 3 40140 _003554_hash NULL
87644 +_003555_hash rx_rx_hdr_overflow_read 3 35002 _003555_hash NULL
87645 +_003556_hash rx_rx_out_of_mpdu_nodes_read 3 64668 _003556_hash NULL
87646 +_003557_hash rx_rx_phy_hdr_read 3 20950 _003557_hash NULL
87647 +_003558_hash rx_rx_pre_complt_read 3 41653 _003558_hash NULL
87648 +_003559_hash rx_rx_timeout_read 3 62389 _003559_hash NULL
87649 +_003560_hash rx_rx_timeout_wa_read 3 50204 _003560_hash NULL
87650 +_003561_hash rx_rx_tkip_replays_read 3 60193 _003561_hash NULL
87651 +_003562_hash rx_rx_wa_ba_not_expected_read 3 61341 _003562_hash NULL
87652 +_003563_hash rx_rx_wa_density_dropped_frame_read 3 26095 _003563_hash NULL
87653 +_003564_hash rx_streaming_always_read 3 49401 _003564_hash NULL
87654 +_003565_hash rx_streaming_interval_read 3 55291 _003565_hash NULL
87655 +_003566_hash saa7164_buffer_alloc_user 2 9627 _003566_hash NULL
87656 +_003567_hash send_control_msg 6 48498 _003567_hash NULL
87657 +_003568_hash SendTxCommandPacket 3 42901 _003568_hash NULL
87658 +_003569_hash setup_window 2-7-5-4 59178 _003569_hash NULL
87659 +_003573_hash shmem_pwrite_fast 3 46842 _003573_hash NULL
87660 +_003574_hash sleep_auth_read 3 19159 _003574_hash NULL
87661 +_003575_hash sn9c102_read 3 29305 _003575_hash NULL
87662 +_003576_hash snd_pcm_alloc_vmalloc_buffer 2 44595 _003576_hash NULL
87663 +_003577_hash split_scan_timeout_read 3 20029 _003577_hash NULL
87664 +_003578_hash stk_prepare_sio_buffers 2 57168 _003578_hash NULL
87665 +_003579_hash store_debug_level 3 35652 _003579_hash NULL
87666 +_003580_hash suspend_dtim_interval_read 3 64971 _003580_hash NULL
87667 +_003581_hash sys_prctl 4 8766 _003581_hash NULL
87668 +_003582_hash tm6000_read_write_usb 7 50774 _003582_hash &_002149_hash
87669 +_003583_hash tracing_read_pipe 3 35312 _003583_hash NULL
87670 +_003584_hash ts_read 3 44687 _003584_hash NULL
87671 +_003585_hash ts_write 3 64336 _003585_hash NULL
87672 +_003586_hash tt3650_ci_msg 4 57219 _003586_hash NULL
87673 +_003587_hash ttm_object_device_init 2 10321 _003587_hash NULL
87674 +_003588_hash ttm_object_file_init 2 27804 _003588_hash NULL
87675 +_003589_hash tx_frag_bad_mblk_num_read 3 28064 _003589_hash NULL
87676 +_003590_hash tx_frag_cache_hit_read 3 29639 _003590_hash NULL
87677 +_003591_hash tx_frag_cache_miss_read 3 28394 _003591_hash NULL
87678 +_003592_hash tx_frag_called_read 3 1748 _003592_hash NULL
87679 +_003593_hash tx_frag_failed_read 3 43540 _003593_hash NULL
87680 +_003594_hash tx_frag_init_called_read 3 48377 _003594_hash NULL
87681 +_003595_hash tx_frag_in_process_called_read 3 1290 _003595_hash NULL
87682 +_003596_hash tx_frag_key_not_found_read 3 22971 _003596_hash NULL
87683 +_003597_hash tx_frag_mpdu_alloc_failed_read 3 41167 _003597_hash NULL
87684 +_003598_hash tx_frag_need_fragmentation_read 3 50153 _003598_hash NULL
87685 +_003599_hash tx_frag_tkip_called_read 3 31575 _003599_hash NULL
87686 +_003600_hash tx_tx_burst_programmed_read 3 20320 _003600_hash NULL
87687 +_003601_hash tx_tx_checksum_result_read 3 36490 _003601_hash &_001996_hash
87688 +_003602_hash tx_tx_cmplt_read 3 35854 _003602_hash NULL
87689 +_003603_hash tx_tx_data_prepared_read 3 43497 _003603_hash NULL
87690 +_003604_hash tx_tx_data_programmed_read 3 36871 _003604_hash NULL
87691 +_003605_hash tx_tx_done_data_read 3 6799 _003605_hash NULL
87692 +_003606_hash tx_tx_done_int_template_read 3 55511 _003606_hash &_001887_hash
87693 +_003607_hash tx_tx_done_template_read 3 35104 _003607_hash &_000106_hash
87694 +_003608_hash tx_tx_exch_expiry_read 3 8749 _003608_hash NULL
87695 +_003609_hash tx_tx_exch_pending_read 3 53018 _003609_hash NULL
87696 +_003610_hash tx_tx_exch_read 3 52986 _003610_hash NULL
87697 +_003611_hash tx_tx_frame_checksum_read 3 41553 _003611_hash NULL
87698 +_003612_hash tx_tx_imm_resp_read 3 55964 _003612_hash NULL
87699 +_003613_hash tx_tx_prepared_descs_read 3 9221 _003613_hash NULL
87700 +_003614_hash tx_tx_retry_data_read 3 1926 _003614_hash NULL
87701 +_003615_hash tx_tx_retry_template_read 3 57623 _003615_hash NULL
87702 +_003616_hash tx_tx_start_data_read 3 53219 _003616_hash NULL
87703 +_003617_hash tx_tx_start_fw_gen_read 3 58648 _003617_hash NULL
87704 +_003618_hash tx_tx_start_int_templates_read 3 58324 _003618_hash NULL
87705 +_003619_hash tx_tx_start_null_frame_read 3 6281 _003619_hash NULL
87706 +_003620_hash tx_tx_starts_read 3 3617 _003620_hash NULL
87707 +_003621_hash tx_tx_start_templates_read 3 17164 _003621_hash NULL
87708 +_003622_hash tx_tx_template_prepared_read 3 30424 _003622_hash NULL
87709 +_003623_hash tx_tx_template_programmed_read 3 30461 _003623_hash NULL
87710 +_003624_hash udi_log_event 3 58105 _003624_hash NULL
87711 +_003625_hash udl_prime_create 2 57159 _003625_hash NULL
87712 +_003626_hash uf_create_device_nodes 2 24948 _003626_hash NULL
87713 +_003627_hash uf_sme_queue_message 3 15697 _003627_hash NULL
87714 +_003628_hash ufx_alloc_urb_list 3 10349 _003628_hash NULL
87715 +_003629_hash unifi_net_data_malloc 3 24716 _003629_hash NULL
87716 +_003630_hash unifi_read 3 14899 _003630_hash NULL
87717 +_003631_hash unifi_write 3 65012 _003631_hash NULL
87718 +_003632_hash usb_buffer_alloc 2 36276 _003632_hash NULL
87719 +_003633_hash usbvision_rvmalloc 1 19655 _003633_hash NULL
87720 +_003634_hash usbvision_v4l2_read 3 34386 _003634_hash NULL
87721 +_003635_hash uvc_alloc_buffers 2-3 9656 _003635_hash NULL
87722 +_003637_hash uvc_alloc_entity 3-4 20836 _003637_hash NULL
87723 +_003639_hash uvc_debugfs_stats_read 3 56651 _003639_hash NULL
87724 +_003640_hash uvc_simplify_fraction 3 31303 _003640_hash NULL
87725 +_003641_hash v4l2_ctrl_new 7 24927 _003641_hash NULL
87726 +_003642_hash v4l2_event_subscribe 3 53687 _003642_hash NULL
87727 +_003643_hash v4l_stk_read 3 39672 _003643_hash NULL
87728 +_003644_hash __vb2_perform_fileio 3 63033 _003644_hash NULL
87729 +_003645_hash vfd_write 3 14717 _003645_hash NULL
87730 +_003646_hash vfio_config_do_rw 3 46091 _003646_hash NULL
87731 +_003647_hash vfio_msi_enable 2 20906 _003647_hash NULL
87732 +_003648_hash viafb_dvp0_proc_write 3 23023 _003648_hash NULL
87733 +_003649_hash viafb_dvp1_proc_write 3 48864 _003649_hash NULL
87734 +_003650_hash viafb_vt1636_proc_write 3 16018 _003650_hash NULL
87735 +_003651_hash __videobuf_alloc_vb 1 27062 _003651_hash NULL
87736 +_003652_hash __videobuf_alloc_vb 1 5665 _003652_hash NULL
87737 +_003653_hash __videobuf_copy_to_user 4 15423 _003653_hash NULL
87738 +_003654_hash videobuf_dma_init_kernel 3 6963 _003654_hash NULL
87739 +_003655_hash videobuf_pages_to_sg 2 3708 _003655_hash NULL
87740 +_003656_hash videobuf_vmalloc_to_sg 2 4548 _003656_hash NULL
87741 +_003657_hash video_usercopy 2 62151 _003657_hash NULL
87742 +_003658_hash virtscsi_alloc_tgt 2 6643 _003658_hash NULL
87743 +_003659_hash vmw_cursor_update_image 3-4 16332 _003659_hash NULL
87744 +_003661_hash vmw_framebuffer_dmabuf_dirty 6 37661 _003661_hash &_001116_hash
87745 +_003662_hash vmw_framebuffer_surface_dirty 6 48132 _003662_hash NULL
87746 +_003663_hash vmw_gmr2_bind 3 21305 _003663_hash NULL
87747 +_003664_hash vmw_unlocked_ioctl 2 19212 _003664_hash NULL
87748 +_003665_hash w9966_v4l_read 3 31148 _003665_hash NULL
87749 +_003666_hash wl1273_fm_fops_write 3 60621 _003666_hash NULL
87750 +_003667_hash zoran_write 3 22404 _003667_hash NULL
87751 +_003668_hash alloc_vm_area 1 15989 _003668_hash NULL
87752 +_003669_hash cx18_copy_mdl_to_user 4 45549 _003669_hash NULL
87753 +_003670_hash dlfb_ops_write 3 64150 _003670_hash NULL
87754 +_003671_hash dvb_demux_read 3 13981 _003671_hash NULL
87755 +_003672_hash dvb_dmxdev_read_sec 4 7892 _003672_hash NULL
87756 +_003673_hash dvb_dvr_read 3 17073 _003673_hash NULL
87757 +_003674_hash em28xx_init_isoc 4 62883 _003674_hash &_000729_hash
87758 +_003675_hash fb_alloc_cmap 2 6554 _003675_hash NULL
87759 +_003676_hash gspca_dev_probe 4 2570 _003676_hash NULL
87760 +_003677_hash ieee80211_auth_challenge 3 18810 _003677_hash NULL
87761 +_003678_hash ieee80211_rtl_auth_challenge 3 61897 _003678_hash NULL
87762 +_003679_hash init_pci_cap_msi_perm 2 59033 _003679_hash NULL
87763 +_003680_hash __ioremap_caller 1-2 21800 _003680_hash NULL
87764 +_003682_hash ivtv_read 3 57796 _003682_hash NULL
87765 +_003683_hash ivtv_v4l2_write 3 39226 _003683_hash NULL
87766 +_003684_hash mce_async_out 3 58056 _003684_hash NULL
87767 +_003685_hash mce_flush_rx_buffer 2 14976 _003685_hash NULL
87768 +_003686_hash ms_read_multiple_pages 4-5 8052 _003686_hash NULL
87769 +_003688_hash ms_write_multiple_pages 5-6 10362 _003688_hash NULL
87770 +_003690_hash nfc_hci_send_cmd 5 55714 _003690_hash NULL
87771 +_003691_hash persistent_ram_new 1-2 40501 _003691_hash NULL
87772 +_003693_hash picolcd_fb_write 3 2318 _003693_hash NULL
87773 +_003694_hash process_bulk_data_command 4 38906 _003694_hash NULL
87774 +_003695_hash pvr2_v4l2_read 3 18006 _003695_hash NULL
87775 +_003696_hash qcam_read 3 13977 _003696_hash NULL
87776 +_003697_hash register_unifi_sdio 2 55239 _003697_hash NULL
87777 +_003698_hash resize_async_buffer 4 64031 _003698_hash &_002431_hash
87778 +_003699_hash rtllib_auth_challenge 3 12493 _003699_hash NULL
87779 +_003702_hash stk_allocate_buffers 2 16291 _003702_hash NULL
87780 +_003703_hash subdev_ioctl 2 28417 _003703_hash NULL
87781 +_003704_hash _sys_packet_req 4 46793 _003704_hash NULL
87782 +_003705_hash tm6000_i2c_recv_regs16 5 2949 _003705_hash NULL
87783 +_003706_hash tm6000_i2c_recv_regs 5 46215 _003706_hash NULL
87784 +_003707_hash tm6000_i2c_send_regs 5 20250 _003707_hash NULL
87785 +_003708_hash tt3650_ci_msg_locked 4 8013 _003708_hash NULL
87786 +_003709_hash ufx_ops_write 3 54848 _003709_hash NULL
87787 +_003710_hash update_macheader 7 1775 _003710_hash NULL
87788 +_003711_hash usbdux_attach_common 4 51764 _003750_hash NULL nohasharray
87789 +_003712_hash usbduxfast_attach_common 4 52538 _003712_hash NULL
87790 +_003713_hash usbduxsigma_attach_common 4 40847 _003713_hash NULL
87791 +_003714_hash uvc_v4l2_ioctl 2 8411 _003714_hash NULL
87792 +_003715_hash v4l2_ctrl_new_int_menu 4 41151 _003715_hash NULL
87793 +_003716_hash v4l2_ctrl_new_std 5 45748 _003716_hash &_000497_hash
87794 +_003717_hash v4l2_ctrl_new_std_menu 4 6221 _003717_hash NULL
87795 +_003718_hash vb2_read 3 42703 _003718_hash NULL
87796 +_003719_hash vb2_write 3 31948 _003719_hash NULL
87797 +_003720_hash vfio_pci_set_msi_trigger 3-4 26507 _003720_hash NULL
87798 +_003722_hash viafb_iga1_odev_proc_write 3 36241 _003722_hash NULL
87799 +_003723_hash viafb_iga2_odev_proc_write 3 2363 _003723_hash NULL
87800 +_003724_hash __videobuf_alloc_cached 1 12740 _003724_hash NULL
87801 +_003725_hash __videobuf_alloc_uncached 1 55711 _003725_hash NULL
87802 +_003726_hash __videobuf_copy_stream 4 44769 _003726_hash NULL
87803 +_003727_hash videobuf_read_one 3 31637 _003727_hash NULL
87804 +_003728_hash video_ioctl2 2 21380 _003728_hash NULL
87805 +_003729_hash vmap 2 15025 _003729_hash NULL
87806 +_003730_hash vmw_cursor_update_dmabuf 3-4 32045 _003730_hash NULL
87807 +_003732_hash vmw_gmr_bind 3 44130 _003732_hash NULL
87808 +_003733_hash xd_read_multiple_pages 4-5 11422 _003733_hash NULL
87809 +_003735_hash xd_write_multiple_pages 5-6 53633 _003735_hash NULL
87810 +_003737_hash xenfb_write 3 43412 _003737_hash NULL
87811 +_003738_hash arch_gnttab_map_shared 3 41306 _003738_hash NULL
87812 +_003739_hash arch_gnttab_map_status 3 49812 _003739_hash NULL
87813 +_003740_hash bttv_read 3 11432 _003740_hash NULL
87814 +_003741_hash cx18_read 3 23699 _003741_hash NULL
87815 +_003742_hash cx2341x_ctrl_new_menu 3 49700 _003742_hash NULL
87816 +_003743_hash cx2341x_ctrl_new_std 4 57061 _003743_hash NULL
87817 +_003744_hash cx25821_video_ioctl 2 30188 _003744_hash NULL
87818 +_003745_hash dt3155_read 3 59226 _003745_hash NULL
87819 +_003746_hash ioremap_cache 1-2 47189 _003746_hash NULL
87820 +_003748_hash ioremap_nocache 1-2 2439 _003748_hash NULL
87821 +_003750_hash ioremap_prot 1-2 51764 _003750_hash &_003711_hash
87822 +_003752_hash ioremap_wc 1-2 62695 _003752_hash NULL
87823 +_003754_hash ivtv_read_pos 3 34400 _003754_hash &_000312_hash
87824 +_003755_hash mcam_v4l_read 3 36513 _003755_hash NULL
87825 +_003756_hash ms_rw_multi_sector 3-4 7459 _003756_hash NULL
87826 +_003758_hash pvr2_v4l2_ioctl 2 24398 _003758_hash &_000877_hash
87827 +_003759_hash ramoops_init_prz 5 12134 _003759_hash NULL
87828 +_003761_hash ttm_bo_kmap_ttm 3 5922 _003761_hash NULL
87829 +_003762_hash uf_ap_process_data_pdu 7 25860 _003762_hash NULL
87830 +_003763_hash vb2_fop_read 3 24080 _003763_hash NULL
87831 +_003764_hash vb2_fop_write 3 30420 _003764_hash NULL
87832 +_003765_hash videobuf_read_stream 3 14956 _003765_hash NULL
87833 +_003766_hash video_read 3 28148 _003766_hash NULL
87834 +_003767_hash vmw_du_crtc_cursor_set 4-5 28479 _003767_hash NULL
87835 +_003769_hash xd_rw 3-4 49020 _003769_hash NULL
87836 +_003771_hash zoran_ioctl 2 30465 _003771_hash NULL
87837 +_003772_hash zr364xx_read 3 2354 _003772_hash NULL
87838 +_003773_hash acpi_os_ioremap 1-2 49523 _003773_hash NULL
87839 +_003775_hash au0828_v4l2_read 3 40220 _003775_hash NULL
87840 +_003776_hash ca91cx42_alloc_resource 2 10502 _003776_hash NULL
87841 +_003778_hash cx18_read_pos 3 4683 _003778_hash NULL
87842 +_003779_hash cx18_v4l2_read 3 21196 _003779_hash NULL
87843 +_003780_hash cx231xx_v4l2_read 3 55014 _003780_hash NULL
87844 +_003781_hash devm_ioremap_nocache 2-3 2036 _003781_hash NULL
87845 +_003783_hash do_test 1 15766 _003783_hash NULL
87846 +_003784_hash __einj_error_trigger 1 17707 _003784_hash &_001764_hash
87847 +_003785_hash em28xx_v4l2_read 3 16701 _003785_hash NULL
87848 +_003786_hash init_chip_wc_pat 2 62768 _003786_hash NULL
87849 +_003787_hash intel_render_ring_init_dri 2-3 45446 _003787_hash NULL
87850 +_003789_hash io_mapping_create_wc 1-2 1354 _003789_hash NULL
87851 +_003791_hash iommu_map_mmio_space 1 30919 _003791_hash NULL
87852 +_003792_hash ioremap 1-2 23172 _003792_hash NULL
87853 +_003794_hash ivtv_v4l2_read 3 1964 _003794_hash NULL
87854 +_003795_hash mga_ioremap 1-2 8571 _003795_hash NULL
87855 +_003797_hash mpeg_read 3 6708 _003797_hash NULL
87856 +_003798_hash msix_map_region 3 3411 _003798_hash NULL
87857 +_003799_hash ms_rw 3-4 17220 _003799_hash NULL
87858 +_003801_hash pci_iomap 3 47575 _003801_hash NULL
87859 +_003802_hash pd_video_read 3 24510 _003802_hash NULL
87860 +_003803_hash sfi_map_memory 1-2 5183 _003803_hash NULL
87861 +_003805_hash solo_enc_read 3 33553 _003805_hash NULL
87862 +_003806_hash solo_v4l2_read 3 59247 _003806_hash NULL
87863 +_003807_hash timblogiw_read 3 48305 _003807_hash NULL
87864 +_003808_hash tm6000_read 3 4151 _003808_hash NULL
87865 +_003809_hash tsi148_alloc_resource 2 24563 _003809_hash NULL
87866 +_003810_hash ttm_bo_ioremap 2-3 31082 _003810_hash NULL
87867 +_003812_hash ttm_bo_kmap 3-2 60118 _003812_hash NULL
87868 +_003813_hash vb2_vmalloc_get_userptr 3 31374 _003813_hash NULL
87869 +_003814_hash vbi_read 3 63673 _003814_hash NULL
87870 +_003815_hash viacam_read 3 54526 _003815_hash NULL
87871 +_003816_hash xlate_dev_mem_ptr 1 15291 _003816_hash &_001231_hash
87872 +_003817_hash a4t_cs_init 3 27734 _003817_hash NULL
87873 +_003818_hash aac_nark_ioremap 2 50163 _003818_hash &_000323_hash
87874 +_003819_hash aac_rkt_ioremap 2 3333 _003819_hash NULL
87875 +_003820_hash aac_rx_ioremap 2 52410 _003820_hash NULL
87876 +_003821_hash aac_sa_ioremap 2 13596 _003821_hash &_000299_hash
87877 +_003822_hash aac_src_ioremap 2 41688 _003822_hash NULL
87878 +_003823_hash aac_srcv_ioremap 2 6659 _003823_hash NULL
87879 +_003824_hash acpi_map 1-2 58725 _003824_hash NULL
87880 +_003826_hash acpi_os_read_memory 1-3 54186 _003826_hash NULL
87881 +_003828_hash acpi_os_write_memory 1-3 56416 _003828_hash &_003429_hash
87882 +_003830_hash atyfb_setup_generic 3 49151 _003830_hash NULL
87883 +_003831_hash ca91cx42_master_set 4 23146 _003831_hash NULL
87884 +_003832_hash check_mirror 1-2 57342 _003832_hash &_001753_hash
87885 +_003834_hash cycx_setup 4 47562 _003834_hash NULL
87886 +_003835_hash devm_ioremap 2-3 29235 _003835_hash NULL
87887 +_003837_hash divasa_remap_pci_bar 3-4 23485 _003837_hash &_000979_hash
87888 +_003839_hash doc_probe 1 23285 _003839_hash NULL
87889 +_003840_hash DoC_Probe 1 57534 _003840_hash NULL
87890 +_003841_hash efi_ioremap 1-2 3492 _003841_hash &_001137_hash
87891 +_003843_hash ems_pcmcia_add_card 2 62627 _003843_hash NULL
87892 +_003844_hash isp1760_register 1-2 628 _003844_hash NULL
87893 +_003846_hash mid_get_vbt_data_r0 2 10876 _003846_hash NULL
87894 +_003847_hash mid_get_vbt_data_r10 2 6308 _003847_hash NULL
87895 +_003848_hash mid_get_vbt_data_r1 2 26170 _003848_hash NULL
87896 +_003849_hash mthca_map_reg 2-3 5664 _003849_hash NULL
87897 +_003851_hash mthca_setup_cmd_doorbells 2 53954 _003851_hash NULL
87898 +_003852_hash netxen_nic_map_indirect_address_128M 2 42257 _003852_hash NULL
87899 +_003853_hash pcim_iomap 3 58334 _003853_hash NULL
87900 +_003854_hash persistent_ram_iomap 1-2 47156 _003854_hash NULL
87901 +_003856_hash read_vbt_r0 1 503 _003856_hash NULL
87902 +_003857_hash read_vbt_r10 1 60679 _003857_hash NULL
87903 +_003858_hash register_device 2-3 60015 _003858_hash NULL
87904 +_003860_hash remap_pci_mem 1-2 15966 _003860_hash NULL
87905 +_003862_hash rtl_port_map 1-2 2385 _003862_hash NULL
87906 +_003864_hash sfi_map_table 1 5462 _003864_hash NULL
87907 +_003865_hash sriov_enable_migration 2 14889 _003865_hash NULL
87908 +_003866_hash ssb_bus_scan 2 36578 _003866_hash NULL
87909 +_003867_hash ssb_ioremap 2 5228 _003867_hash NULL
87910 +_003868_hash tpci200_slot_map_space 2 3848 _003868_hash NULL
87911 +_003869_hash tpm_tis_init 2-3 15304 _003869_hash NULL
87912 +_003871_hash tsi148_master_set 4 14685 _003871_hash NULL
87913 +_003872_hash acpi_os_map_memory 1-2 11161 _003872_hash NULL
87914 +_003874_hash com90xx_found 3 13974 _003874_hash NULL
87915 +_003875_hash netxen_nic_hw_read_wx_128M 2 26858 _003875_hash NULL
87916 +_003876_hash netxen_nic_hw_write_wx_128M 2 33488 _003876_hash NULL
87917 +_003877_hash sfi_check_table 1 6772 _003877_hash NULL
87918 +_003878_hash sfi_sysfs_install_table 1 51688 _003878_hash NULL
87919 +_003879_hash sriov_enable 2 59689 _003879_hash NULL
87920 +_003880_hash ssb_bus_register 3 65183 _003880_hash NULL
87921 +_003881_hash acpi_ex_system_memory_space_handler 2 31192 _003881_hash NULL
87922 +_003882_hash acpi_tb_check_xsdt 1 21862 _003882_hash NULL
87923 +_003883_hash acpi_tb_install_table 1 12988 _003883_hash NULL
87924 +_003884_hash acpi_tb_parse_root_table 1 53455 _003884_hash NULL
87925 +_003885_hash check_vendor_extension 1 3254 _003885_hash NULL
87926 +_003886_hash pci_enable_sriov 2 35745 _003886_hash NULL
87927 +_003887_hash ssb_bus_pcmciabus_register 3 56020 _003887_hash NULL
87928 +_003888_hash ssb_bus_ssbbus_register 2 2217 _003888_hash NULL
87929 +_003889_hash lpfc_sli_probe_sriov_nr_virtfn 2 26004 _003889_hash NULL
87930 +_003890_hash alloc_vm_area 1 36149 _003890_hash NULL
87931 +_003891_hash cma_create_area 2 38642 _003891_hash NULL
87932 +_003893_hash fbcon_prepare_logo 5 6246 _003893_hash NULL
87933 +_003894_hash io_mapping_map_wc 2 19284 _003894_hash NULL
87934 +_003895_hash nfs_dns_resolve_name 3 25036 _003895_hash NULL
87935 +_003896_hash nfs_parse_server_name 2 1899 _003896_hash NULL
87936 +_003897_hash acl_alloc 1 35979 _003897_hash NULL
87937 +_003898_hash acl_alloc_stack_init 1 60630 _003898_hash NULL
87938 +_003899_hash create_table 2 16213 _003899_hash NULL
87939 diff --git a/tools/gcc/size_overflow_plugin.c b/tools/gcc/size_overflow_plugin.c
87940 new file mode 100644
87941 index 0000000..1aa0dce
87942 --- /dev/null
87943 +++ b/tools/gcc/size_overflow_plugin.c
87944 @@ -0,0 +1,1865 @@
87945 +/*
87946 + * Copyright 2011, 2012 by Emese Revfy <re.emese@gmail.com>
87947 + * Licensed under the GPL v2, or (at your option) v3
87948 + *
87949 + * Homepage:
87950 + * http://www.grsecurity.net/~ephox/overflow_plugin/
87951 + *
87952 + * This plugin recomputes expressions of function arguments marked by a size_overflow attribute
87953 + * with double integer precision (DImode/TImode for 32/64 bit integer types).
87954 + * The recomputed argument is checked against TYPE_MAX and an event is logged on overflow and the triggering process is killed.
87955 + *
87956 + * Usage:
87957 + * $ 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
87958 + * $ gcc -fplugin=size_overflow_plugin.so test.c -O2
87959 + */
87960 +
87961 +#include "gcc-plugin.h"
87962 +#include "config.h"
87963 +#include "system.h"
87964 +#include "coretypes.h"
87965 +#include "tree.h"
87966 +#include "tree-pass.h"
87967 +#include "intl.h"
87968 +#include "plugin-version.h"
87969 +#include "tm.h"
87970 +#include "toplev.h"
87971 +#include "function.h"
87972 +#include "tree-flow.h"
87973 +#include "plugin.h"
87974 +#include "gimple.h"
87975 +#include "c-common.h"
87976 +#include "diagnostic.h"
87977 +#include "cfgloop.h"
87978 +
87979 +#if BUILDING_GCC_VERSION >= 4007
87980 +#include "c-tree.h"
87981 +#else
87982 +#define C_DECL_IMPLICIT(EXP) DECL_LANG_FLAG_2 (EXP)
87983 +#endif
87984 +
87985 +struct size_overflow_hash {
87986 + const struct size_overflow_hash * const next;
87987 + const char * const name;
87988 + const unsigned int param;
87989 +};
87990 +
87991 +#include "size_overflow_hash.h"
87992 +
87993 +enum marked {
87994 + MARKED_NO, MARKED_YES, MARKED_NOT_INTENTIONAL
87995 +};
87996 +
87997 +#define __unused __attribute__((__unused__))
87998 +#define NAME(node) IDENTIFIER_POINTER(DECL_NAME(node))
87999 +#define NAME_LEN(node) IDENTIFIER_LENGTH(DECL_NAME(node))
88000 +#define BEFORE_STMT true
88001 +#define AFTER_STMT false
88002 +#define CREATE_NEW_VAR NULL_TREE
88003 +#define CODES_LIMIT 32
88004 +#define MAX_PARAM 32
88005 +#define MY_STMT GF_PLF_1
88006 +#define NO_CAST_CHECK GF_PLF_2
88007 +
88008 +#if BUILDING_GCC_VERSION == 4005
88009 +#define DECL_CHAIN(NODE) (TREE_CHAIN(DECL_MINIMAL_CHECK(NODE)))
88010 +#endif
88011 +
88012 +int plugin_is_GPL_compatible;
88013 +void debug_gimple_stmt(gimple gs);
88014 +
88015 +static tree expand(struct pointer_set_t *visited, tree lhs);
88016 +static bool pre_expand(struct pointer_set_t *visited, const_tree lhs);
88017 +static tree report_size_overflow_decl;
88018 +static const_tree const_char_ptr_type_node;
88019 +static unsigned int handle_function(void);
88020 +static void check_size_overflow(gimple stmt, tree size_overflow_type, tree cast_rhs, tree rhs, bool before);
88021 +static tree get_size_overflow_type(gimple stmt, const_tree node);
88022 +static tree dup_assign(struct pointer_set_t *visited, gimple oldstmt, const_tree node, tree rhs1, tree rhs2, tree __unused rhs3);
88023 +
88024 +static struct plugin_info size_overflow_plugin_info = {
88025 + .version = "20121113beta",
88026 + .help = "no-size-overflow\tturn off size overflow checking\n",
88027 +};
88028 +
88029 +static tree handle_size_overflow_attribute(tree *node, tree __unused name, tree args, int __unused flags, bool *no_add_attrs)
88030 +{
88031 + unsigned int arg_count;
88032 + enum tree_code code = TREE_CODE(*node);
88033 +
88034 + switch (code) {
88035 + case FUNCTION_DECL:
88036 + arg_count = type_num_arguments(TREE_TYPE(*node));
88037 + break;
88038 + case FUNCTION_TYPE:
88039 + case METHOD_TYPE:
88040 + arg_count = type_num_arguments(*node);
88041 + break;
88042 + default:
88043 + *no_add_attrs = true;
88044 + error("%s: %qE attribute only applies to functions", __func__, name);
88045 + return NULL_TREE;
88046 + }
88047 +
88048 + for (; args; args = TREE_CHAIN(args)) {
88049 + tree position = TREE_VALUE(args);
88050 + if (TREE_CODE(position) != INTEGER_CST || TREE_INT_CST_HIGH(position) || TREE_INT_CST_LOW(position) < 1 || TREE_INT_CST_LOW(position) > arg_count ) {
88051 + error("%s: parameter %u is outside range.", __func__, (unsigned int)TREE_INT_CST_LOW(position));
88052 + *no_add_attrs = true;
88053 + }
88054 + }
88055 + return NULL_TREE;
88056 +}
88057 +
88058 +static const char* get_asm_name(tree node)
88059 +{
88060 + return IDENTIFIER_POINTER(DECL_ASSEMBLER_NAME(node));
88061 +}
88062 +
88063 +static tree handle_intentional_overflow_attribute(tree *node, tree __unused name, tree args, int __unused flags, bool *no_add_attrs)
88064 +{
88065 + unsigned int arg_count, arg_num;
88066 + enum tree_code code = TREE_CODE(*node);
88067 +
88068 + switch (code) {
88069 + case FUNCTION_DECL:
88070 + arg_count = type_num_arguments(TREE_TYPE(*node));
88071 + break;
88072 + case FUNCTION_TYPE:
88073 + case METHOD_TYPE:
88074 + arg_count = type_num_arguments(*node);
88075 + break;
88076 + case FIELD_DECL:
88077 + arg_num = TREE_INT_CST_LOW(TREE_VALUE(args));
88078 + if (arg_num != 0) {
88079 + *no_add_attrs = true;
88080 + error("%s: %qE attribute parameter can only be 0 in structure fields", __func__, name);
88081 + }
88082 + return NULL_TREE;
88083 + default:
88084 + *no_add_attrs = true;
88085 + error("%qE attribute only applies to functions", name);
88086 + return NULL_TREE;
88087 + }
88088 +
88089 + for (; args; args = TREE_CHAIN(args)) {
88090 + tree position = TREE_VALUE(args);
88091 + if (TREE_CODE(position) != INTEGER_CST || TREE_INT_CST_HIGH(position) || TREE_INT_CST_LOW(position) > arg_count ) {
88092 + error("%s: parameter %u is outside range.", __func__, (unsigned int)TREE_INT_CST_LOW(position));
88093 + *no_add_attrs = true;
88094 + }
88095 + }
88096 + return NULL_TREE;
88097 +}
88098 +
88099 +static struct attribute_spec size_overflow_attr = {
88100 + .name = "size_overflow",
88101 + .min_length = 1,
88102 + .max_length = -1,
88103 + .decl_required = true,
88104 + .type_required = false,
88105 + .function_type_required = false,
88106 + .handler = handle_size_overflow_attribute,
88107 +#if BUILDING_GCC_VERSION >= 4007
88108 + .affects_type_identity = false
88109 +#endif
88110 +};
88111 +
88112 +static struct attribute_spec intentional_overflow_attr = {
88113 + .name = "intentional_overflow",
88114 + .min_length = 1,
88115 + .max_length = -1,
88116 + .decl_required = true,
88117 + .type_required = false,
88118 + .function_type_required = false,
88119 + .handler = handle_intentional_overflow_attribute,
88120 +#if BUILDING_GCC_VERSION >= 4007
88121 + .affects_type_identity = false
88122 +#endif
88123 +};
88124 +
88125 +static void register_attributes(void __unused *event_data, void __unused *data)
88126 +{
88127 + register_attribute(&size_overflow_attr);
88128 + register_attribute(&intentional_overflow_attr);
88129 +}
88130 +
88131 +// http://www.team5150.com/~andrew/noncryptohashzoo2~/CrapWow.html
88132 +static unsigned int CrapWow(const char *key, unsigned int len, unsigned int seed)
88133 +{
88134 +#define cwfold( a, b, lo, hi ) { p = (unsigned int)(a) * (unsigned long long)(b); lo ^= (unsigned int)p; hi ^= (unsigned int)(p >> 32); }
88135 +#define cwmixa( in ) { cwfold( in, m, k, h ); }
88136 +#define cwmixb( in ) { cwfold( in, n, h, k ); }
88137 +
88138 + unsigned int m = 0x57559429;
88139 + unsigned int n = 0x5052acdb;
88140 + const unsigned int *key4 = (const unsigned int *)key;
88141 + unsigned int h = len;
88142 + unsigned int k = len + seed + n;
88143 + unsigned long long p;
88144 +
88145 + while (len >= 8) {
88146 + cwmixb(key4[0]) cwmixa(key4[1]) key4 += 2;
88147 + len -= 8;
88148 + }
88149 + if (len >= 4) {
88150 + cwmixb(key4[0]) key4 += 1;
88151 + len -= 4;
88152 + }
88153 + if (len)
88154 + cwmixa(key4[0] & ((1 << (len * 8)) - 1 ));
88155 + cwmixb(h ^ (k + n));
88156 + return k ^ h;
88157 +
88158 +#undef cwfold
88159 +#undef cwmixa
88160 +#undef cwmixb
88161 +}
88162 +
88163 +static inline unsigned int get_hash_num(const char *fndecl, const char *tree_codes, unsigned int len, unsigned int seed)
88164 +{
88165 + unsigned int fn = CrapWow(fndecl, strlen(fndecl), seed) & 0xffff;
88166 + unsigned int codes = CrapWow(tree_codes, len, seed) & 0xffff;
88167 + return fn ^ codes;
88168 +}
88169 +
88170 +static inline tree get_original_function_decl(tree fndecl)
88171 +{
88172 + if (DECL_ABSTRACT_ORIGIN(fndecl))
88173 + return DECL_ABSTRACT_ORIGIN(fndecl);
88174 + return fndecl;
88175 +}
88176 +
88177 +static inline gimple get_def_stmt(const_tree node)
88178 +{
88179 + gcc_assert(node != NULL_TREE);
88180 + gcc_assert(TREE_CODE(node) == SSA_NAME);
88181 + return SSA_NAME_DEF_STMT(node);
88182 +}
88183 +
88184 +static unsigned char get_tree_code(const_tree type)
88185 +{
88186 + switch (TREE_CODE(type)) {
88187 + case ARRAY_TYPE:
88188 + return 0;
88189 + case BOOLEAN_TYPE:
88190 + return 1;
88191 + case ENUMERAL_TYPE:
88192 + return 2;
88193 + case FUNCTION_TYPE:
88194 + return 3;
88195 + case INTEGER_TYPE:
88196 + return 4;
88197 + case POINTER_TYPE:
88198 + return 5;
88199 + case RECORD_TYPE:
88200 + return 6;
88201 + case UNION_TYPE:
88202 + return 7;
88203 + case VOID_TYPE:
88204 + return 8;
88205 + case REAL_TYPE:
88206 + return 9;
88207 + case VECTOR_TYPE:
88208 + return 10;
88209 + case REFERENCE_TYPE:
88210 + return 11;
88211 + case OFFSET_TYPE:
88212 + return 12;
88213 + case COMPLEX_TYPE:
88214 + return 13;
88215 + default:
88216 + debug_tree((tree)type);
88217 + gcc_unreachable();
88218 + }
88219 +}
88220 +
88221 +static size_t add_type_codes(const_tree type, unsigned char *tree_codes, size_t len)
88222 +{
88223 + gcc_assert(type != NULL_TREE);
88224 +
88225 + while (type && len < CODES_LIMIT) {
88226 + tree_codes[len] = get_tree_code(type);
88227 + len++;
88228 + type = TREE_TYPE(type);
88229 + }
88230 + return len;
88231 +}
88232 +
88233 +static unsigned int get_function_decl(const_tree fndecl, unsigned char *tree_codes)
88234 +{
88235 + const_tree arg, result, arg_field, type = TREE_TYPE(fndecl);
88236 + enum tree_code code = TREE_CODE(type);
88237 + size_t len = 0;
88238 +
88239 + gcc_assert(code == FUNCTION_TYPE || code == METHOD_TYPE);
88240 +
88241 + arg = TYPE_ARG_TYPES(type);
88242 + // skip builtins __builtin_constant_p
88243 + if (!arg && DECL_BUILT_IN(fndecl))
88244 + return 0;
88245 +
88246 + if (TREE_CODE_CLASS(code) == tcc_type)
88247 + result = type;
88248 + else
88249 + result = DECL_RESULT(fndecl);
88250 +
88251 + gcc_assert(result != NULL_TREE);
88252 + len = add_type_codes(TREE_TYPE(result), tree_codes, len);
88253 +
88254 + if (arg == NULL_TREE) {
88255 + gcc_assert(CODE_CONTAINS_STRUCT(TREE_CODE(fndecl), TS_DECL_NON_COMMON));
88256 + arg_field = DECL_ARGUMENT_FLD(fndecl);
88257 + if (arg_field == NULL_TREE)
88258 + return 0;
88259 + arg = TREE_TYPE(arg_field);
88260 + len = add_type_codes(arg, tree_codes, len);
88261 + gcc_assert(len != 0);
88262 + return len;
88263 + }
88264 +
88265 + gcc_assert(arg != NULL_TREE && TREE_CODE(arg) == TREE_LIST);
88266 + while (arg && len < CODES_LIMIT) {
88267 + len = add_type_codes(TREE_VALUE(arg), tree_codes, len);
88268 + arg = TREE_CHAIN(arg);
88269 + }
88270 +
88271 + gcc_assert(len != 0);
88272 + return len;
88273 +}
88274 +
88275 +static const struct size_overflow_hash *get_function_hash(tree fndecl)
88276 +{
88277 + unsigned int hash;
88278 + const struct size_overflow_hash *entry;
88279 + unsigned char tree_codes[CODES_LIMIT];
88280 + size_t len;
88281 + const char *func_name = get_asm_name(fndecl);
88282 +
88283 + len = get_function_decl(fndecl, tree_codes);
88284 + if (len == 0)
88285 + return NULL;
88286 +
88287 + hash = get_hash_num(func_name, (const char*) tree_codes, len, 0);
88288 +
88289 + entry = size_overflow_hash[hash];
88290 + while (entry) {
88291 + if (!strcmp(entry->name, func_name))
88292 + return entry;
88293 + entry = entry->next;
88294 + }
88295 +
88296 + return NULL;
88297 +}
88298 +
88299 +static void check_arg_type(const_tree arg)
88300 +{
88301 + const_tree type = TREE_TYPE(arg);
88302 + enum tree_code code = TREE_CODE(type);
88303 +
88304 + gcc_assert(code == INTEGER_TYPE || code == ENUMERAL_TYPE ||
88305 + (code == POINTER_TYPE && TREE_CODE(TREE_TYPE(type)) == VOID_TYPE) ||
88306 + (code == POINTER_TYPE && TREE_CODE(TREE_TYPE(type)) == INTEGER_TYPE));
88307 +}
88308 +
88309 +static int find_arg_number(const_tree arg, tree func)
88310 +{
88311 + tree var;
88312 + unsigned int argnum = 1;
88313 +
88314 + if (TREE_CODE(arg) == SSA_NAME)
88315 + arg = SSA_NAME_VAR(arg);
88316 +
88317 + for (var = DECL_ARGUMENTS(func); var; var = TREE_CHAIN(var)) {
88318 + if (strcmp(NAME(arg), NAME(var))) {
88319 + argnum++;
88320 + continue;
88321 + }
88322 + check_arg_type(var);
88323 + return argnum;
88324 + }
88325 + gcc_unreachable();
88326 +}
88327 +
88328 +static tree create_new_var(tree type)
88329 +{
88330 + tree new_var = create_tmp_var(type, "cicus");
88331 +
88332 + add_referenced_var(new_var);
88333 + mark_sym_for_renaming(new_var);
88334 + return new_var;
88335 +}
88336 +
88337 +static gimple create_binary_assign(enum tree_code code, gimple stmt, tree rhs1, tree rhs2)
88338 +{
88339 + gimple assign;
88340 + gimple_stmt_iterator gsi = gsi_for_stmt(stmt);
88341 + tree type = TREE_TYPE(rhs1);
88342 + tree lhs = create_new_var(type);
88343 +
88344 + gcc_assert(types_compatible_p(type, TREE_TYPE(rhs2)));
88345 + assign = gimple_build_assign_with_ops(code, lhs, rhs1, rhs2);
88346 + gimple_set_lhs(assign, make_ssa_name(lhs, assign));
88347 +
88348 + gsi_insert_before(&gsi, assign, GSI_NEW_STMT);
88349 + update_stmt(assign);
88350 + gimple_set_plf(assign, MY_STMT, true);
88351 + return assign;
88352 +}
88353 +
88354 +static bool is_bool(const_tree node)
88355 +{
88356 + const_tree type;
88357 +
88358 + if (node == NULL_TREE)
88359 + return false;
88360 +
88361 + type = TREE_TYPE(node);
88362 + if (!INTEGRAL_TYPE_P(type))
88363 + return false;
88364 + if (TREE_CODE(type) == BOOLEAN_TYPE)
88365 + return true;
88366 + if (TYPE_PRECISION(type) == 1)
88367 + return true;
88368 + return false;
88369 +}
88370 +
88371 +static tree cast_a_tree(tree type, tree var)
88372 +{
88373 + gcc_assert(type != NULL_TREE);
88374 + gcc_assert(var != NULL_TREE);
88375 + gcc_assert(fold_convertible_p(type, var));
88376 +
88377 + return fold_convert(type, var);
88378 +}
88379 +
88380 +static gimple build_cast_stmt(tree dst_type, tree rhs, tree lhs, gimple_stmt_iterator *gsi, bool before)
88381 +{
88382 + gimple assign;
88383 +
88384 + gcc_assert(dst_type != NULL_TREE && rhs != NULL_TREE);
88385 + if (gsi_end_p(*gsi) && before == AFTER_STMT)
88386 + gcc_unreachable();
88387 +
88388 + if (lhs == CREATE_NEW_VAR)
88389 + lhs = create_new_var(dst_type);
88390 +
88391 + assign = gimple_build_assign(lhs, cast_a_tree(dst_type, rhs));
88392 +
88393 + if (!gsi_end_p(*gsi)) {
88394 + location_t loc = gimple_location(gsi_stmt(*gsi));
88395 + gimple_set_location(assign, loc);
88396 + }
88397 +
88398 + gimple_set_lhs(assign, make_ssa_name(lhs, assign));
88399 +
88400 + if (before)
88401 + gsi_insert_before(gsi, assign, GSI_NEW_STMT);
88402 + else
88403 + gsi_insert_after(gsi, assign, GSI_NEW_STMT);
88404 + update_stmt(assign);
88405 + gimple_set_plf(assign, MY_STMT, true);
88406 +
88407 + return assign;
88408 +}
88409 +
88410 +static tree cast_to_new_size_overflow_type(gimple stmt, tree rhs, tree size_overflow_type, bool before)
88411 +{
88412 + gimple assign;
88413 + gimple_stmt_iterator gsi;
88414 +
88415 + if (rhs == NULL_TREE)
88416 + return NULL_TREE;
88417 +
88418 + if (types_compatible_p(TREE_TYPE(rhs), size_overflow_type) && gimple_plf(stmt, MY_STMT))
88419 + return rhs;
88420 +
88421 + gsi = gsi_for_stmt(stmt);
88422 + assign = build_cast_stmt(size_overflow_type, rhs, CREATE_NEW_VAR, &gsi, before);
88423 + gimple_set_plf(assign, MY_STMT, true);
88424 + return gimple_get_lhs(assign);
88425 +}
88426 +
88427 +static tree cast_to_TI_type(gimple stmt, tree node)
88428 +{
88429 + gimple_stmt_iterator gsi;
88430 + gimple cast_stmt;
88431 + tree type = TREE_TYPE(node);
88432 +
88433 + if (types_compatible_p(type, intTI_type_node))
88434 + return node;
88435 +
88436 + gsi = gsi_for_stmt(stmt);
88437 + cast_stmt = build_cast_stmt(intTI_type_node, node, CREATE_NEW_VAR, &gsi, BEFORE_STMT);
88438 + gimple_set_plf(cast_stmt, MY_STMT, true);
88439 + return gimple_get_lhs(cast_stmt);
88440 +}
88441 +
88442 +static tree create_assign(struct pointer_set_t *visited, gimple oldstmt, tree rhs1, bool before)
88443 +{
88444 + tree lhs;
88445 + gimple_stmt_iterator gsi;
88446 +
88447 + if (rhs1 == NULL_TREE) {
88448 + debug_gimple_stmt(oldstmt);
88449 + error("%s: rhs1 is NULL_TREE", __func__);
88450 + gcc_unreachable();
88451 + }
88452 +
88453 + if (gimple_code(oldstmt) == GIMPLE_ASM)
88454 + lhs = rhs1;
88455 + else
88456 + lhs = gimple_get_lhs(oldstmt);
88457 +
88458 + gsi = gsi_for_stmt(oldstmt);
88459 + pointer_set_insert(visited, oldstmt);
88460 + if (lookup_stmt_eh_lp(oldstmt) != 0) {
88461 + basic_block next_bb, cur_bb;
88462 + const_edge e;
88463 +
88464 + gcc_assert(before == false);
88465 + gcc_assert(stmt_can_throw_internal(oldstmt));
88466 + gcc_assert(gimple_code(oldstmt) == GIMPLE_CALL);
88467 + gcc_assert(!gsi_end_p(gsi));
88468 +
88469 + cur_bb = gimple_bb(oldstmt);
88470 + next_bb = cur_bb->next_bb;
88471 + e = find_edge(cur_bb, next_bb);
88472 + gcc_assert(e != NULL);
88473 + gcc_assert(e->flags & EDGE_FALLTHRU);
88474 +
88475 + gsi = gsi_after_labels(next_bb);
88476 + gcc_assert(!gsi_end_p(gsi));
88477 +
88478 + before = true;
88479 + oldstmt = gsi_stmt(gsi);
88480 + }
88481 +
88482 + return cast_to_new_size_overflow_type(oldstmt, rhs1, get_size_overflow_type(oldstmt, lhs), before);
88483 +}
88484 +
88485 +static tree dup_assign(struct pointer_set_t *visited, gimple oldstmt, const_tree node, tree rhs1, tree rhs2, tree __unused rhs3)
88486 +{
88487 + gimple stmt;
88488 + gimple_stmt_iterator gsi;
88489 + tree size_overflow_type, new_var, lhs = gimple_get_lhs(oldstmt);
88490 +
88491 + if (gimple_plf(oldstmt, MY_STMT))
88492 + return lhs;
88493 +
88494 + if (gimple_num_ops(oldstmt) != 4 && rhs1 == NULL_TREE) {
88495 + rhs1 = gimple_assign_rhs1(oldstmt);
88496 + rhs1 = create_assign(visited, oldstmt, rhs1, BEFORE_STMT);
88497 + }
88498 + if (gimple_num_ops(oldstmt) == 3 && rhs2 == NULL_TREE) {
88499 + rhs2 = gimple_assign_rhs2(oldstmt);
88500 + rhs2 = create_assign(visited, oldstmt, rhs2, BEFORE_STMT);
88501 + }
88502 +
88503 + stmt = gimple_copy(oldstmt);
88504 + gimple_set_location(stmt, gimple_location(oldstmt));
88505 + gimple_set_plf(stmt, MY_STMT, true);
88506 +
88507 + if (gimple_assign_rhs_code(oldstmt) == WIDEN_MULT_EXPR)
88508 + gimple_assign_set_rhs_code(stmt, MULT_EXPR);
88509 +
88510 + size_overflow_type = get_size_overflow_type(oldstmt, node);
88511 +
88512 + if (is_bool(lhs))
88513 + new_var = SSA_NAME_VAR(lhs);
88514 + else
88515 + new_var = create_new_var(size_overflow_type);
88516 + new_var = make_ssa_name(new_var, stmt);
88517 + gimple_set_lhs(stmt, new_var);
88518 +
88519 + if (rhs1 != NULL_TREE) {
88520 + if (!gimple_assign_cast_p(oldstmt) && TREE_CODE_CLASS(gimple_assign_rhs_code(oldstmt)) != tcc_comparison)
88521 + rhs1 = cast_a_tree(size_overflow_type, rhs1);
88522 + gimple_assign_set_rhs1(stmt, rhs1);
88523 + }
88524 +
88525 + if (rhs2 != NULL_TREE)
88526 + gimple_assign_set_rhs2(stmt, rhs2);
88527 +#if BUILDING_GCC_VERSION >= 4007
88528 + if (rhs3 != NULL_TREE)
88529 + gimple_assign_set_rhs3(stmt, rhs3);
88530 +#endif
88531 + gimple_set_vuse(stmt, gimple_vuse(oldstmt));
88532 + gimple_set_vdef(stmt, gimple_vdef(oldstmt));
88533 +
88534 + gsi = gsi_for_stmt(oldstmt);
88535 + gsi_insert_after(&gsi, stmt, GSI_SAME_STMT);
88536 + update_stmt(stmt);
88537 + pointer_set_insert(visited, oldstmt);
88538 + return gimple_get_lhs(stmt);
88539 +}
88540 +
88541 +static gimple overflow_create_phi_node(gimple oldstmt, tree result)
88542 +{
88543 + basic_block bb;
88544 + gimple phi;
88545 + gimple_stmt_iterator gsi = gsi_for_stmt(oldstmt);
88546 +
88547 + bb = gsi_bb(gsi);
88548 +
88549 + phi = create_phi_node(result, bb);
88550 + gsi = gsi_last(phi_nodes(bb));
88551 + gsi_remove(&gsi, false);
88552 +
88553 + gsi = gsi_for_stmt(oldstmt);
88554 + gsi_insert_after(&gsi, phi, GSI_NEW_STMT);
88555 + gimple_set_bb(phi, bb);
88556 + gimple_set_plf(phi, MY_STMT, true);
88557 + return phi;
88558 +}
88559 +
88560 +static basic_block create_a_first_bb(void)
88561 +{
88562 + basic_block first_bb;
88563 +
88564 + first_bb = split_block_after_labels(ENTRY_BLOCK_PTR)->dest;
88565 + if (dom_info_available_p(CDI_DOMINATORS))
88566 + set_immediate_dominator(CDI_DOMINATORS, first_bb, ENTRY_BLOCK_PTR);
88567 + return first_bb;
88568 +}
88569 +
88570 +static tree cast_old_phi_arg(gimple oldstmt, tree size_overflow_type, tree arg, tree new_var, unsigned int i)
88571 +{
88572 + basic_block bb;
88573 + const_gimple newstmt;
88574 + gimple_stmt_iterator gsi;
88575 + bool before = BEFORE_STMT;
88576 +
88577 + if (TREE_CODE(arg) == SSA_NAME && gimple_code(get_def_stmt(arg)) != GIMPLE_NOP) {
88578 + gsi = gsi_for_stmt(get_def_stmt(arg));
88579 + newstmt = build_cast_stmt(size_overflow_type, arg, new_var, &gsi, AFTER_STMT);
88580 + return gimple_get_lhs(newstmt);
88581 + }
88582 +
88583 + bb = gimple_phi_arg_edge(oldstmt, i)->src;
88584 + gsi = gsi_after_labels(bb);
88585 + if (bb->index == 0) {
88586 + bb = create_a_first_bb();
88587 + gsi = gsi_start_bb(bb);
88588 + }
88589 + newstmt = build_cast_stmt(size_overflow_type, arg, new_var, &gsi, before);
88590 + return gimple_get_lhs(newstmt);
88591 +}
88592 +
88593 +static const_gimple handle_new_phi_arg(const_tree arg, tree new_var, tree new_rhs)
88594 +{
88595 + gimple newstmt;
88596 + gimple_stmt_iterator gsi;
88597 + void (*gsi_insert)(gimple_stmt_iterator *, gimple, enum gsi_iterator_update);
88598 + gimple def_newstmt = get_def_stmt(new_rhs);
88599 +
88600 + gsi_insert = gsi_insert_after;
88601 + gsi = gsi_for_stmt(def_newstmt);
88602 +
88603 + switch (gimple_code(get_def_stmt(arg))) {
88604 + case GIMPLE_PHI:
88605 + newstmt = gimple_build_assign(new_var, new_rhs);
88606 + gsi = gsi_after_labels(gimple_bb(def_newstmt));
88607 + gsi_insert = gsi_insert_before;
88608 + break;
88609 + case GIMPLE_ASM:
88610 + case GIMPLE_CALL:
88611 + newstmt = gimple_build_assign(new_var, new_rhs);
88612 + break;
88613 + case GIMPLE_ASSIGN:
88614 + newstmt = gimple_build_assign(new_var, gimple_get_lhs(def_newstmt));
88615 + break;
88616 + default:
88617 + /* unknown gimple_code (handle_build_new_phi_arg) */
88618 + gcc_unreachable();
88619 + }
88620 +
88621 + gimple_set_lhs(newstmt, make_ssa_name(new_var, newstmt));
88622 + gsi_insert(&gsi, newstmt, GSI_NEW_STMT);
88623 + gimple_set_plf(newstmt, MY_STMT, true);
88624 + update_stmt(newstmt);
88625 + return newstmt;
88626 +}
88627 +
88628 +static tree build_new_phi_arg(struct pointer_set_t *visited, tree size_overflow_type, tree arg, tree new_var)
88629 +{
88630 + const_gimple newstmt;
88631 + gimple def_stmt;
88632 + tree new_rhs;
88633 +
88634 + new_rhs = expand(visited, arg);
88635 + if (new_rhs == NULL_TREE)
88636 + return NULL_TREE;
88637 +
88638 + def_stmt = get_def_stmt(new_rhs);
88639 + if (gimple_code(def_stmt) == GIMPLE_NOP)
88640 + return NULL_TREE;
88641 + new_rhs = cast_to_new_size_overflow_type(def_stmt, new_rhs, size_overflow_type, AFTER_STMT);
88642 +
88643 + newstmt = handle_new_phi_arg(arg, new_var, new_rhs);
88644 + return gimple_get_lhs(newstmt);
88645 +}
88646 +
88647 +static tree build_new_phi(struct pointer_set_t *visited, tree orig_result)
88648 +{
88649 + gimple phi, oldstmt = get_def_stmt(orig_result);
88650 + tree new_result, size_overflow_type;
88651 + unsigned int i;
88652 + unsigned int n = gimple_phi_num_args(oldstmt);
88653 +
88654 + size_overflow_type = get_size_overflow_type(oldstmt, orig_result);
88655 +
88656 + new_result = create_new_var(size_overflow_type);
88657 +
88658 + pointer_set_insert(visited, oldstmt);
88659 + phi = overflow_create_phi_node(oldstmt, new_result);
88660 + for (i = 0; i < n; i++) {
88661 + tree arg, lhs;
88662 +
88663 + arg = gimple_phi_arg_def(oldstmt, i);
88664 + if (is_gimple_constant(arg))
88665 + arg = cast_a_tree(size_overflow_type, arg);
88666 + lhs = build_new_phi_arg(visited, size_overflow_type, arg, new_result);
88667 + if (lhs == NULL_TREE)
88668 + lhs = cast_old_phi_arg(oldstmt, size_overflow_type, arg, new_result, i);
88669 + add_phi_arg(phi, lhs, gimple_phi_arg_edge(oldstmt, i), gimple_location(oldstmt));
88670 + }
88671 +
88672 + update_stmt(phi);
88673 + return gimple_phi_result(phi);
88674 +}
88675 +
88676 +static tree change_assign_rhs(gimple stmt, const_tree orig_rhs, tree new_rhs)
88677 +{
88678 + const_gimple assign;
88679 + gimple_stmt_iterator gsi = gsi_for_stmt(stmt);
88680 + tree origtype = TREE_TYPE(orig_rhs);
88681 +
88682 + gcc_assert(gimple_code(stmt) == GIMPLE_ASSIGN);
88683 +
88684 + assign = build_cast_stmt(origtype, new_rhs, CREATE_NEW_VAR, &gsi, BEFORE_STMT);
88685 + return gimple_get_lhs(assign);
88686 +}
88687 +
88688 +static void change_rhs1(gimple stmt, tree new_rhs1)
88689 +{
88690 + tree assign_rhs;
88691 + const_tree rhs = gimple_assign_rhs1(stmt);
88692 +
88693 + assign_rhs = change_assign_rhs(stmt, rhs, new_rhs1);
88694 + gimple_assign_set_rhs1(stmt, assign_rhs);
88695 + update_stmt(stmt);
88696 +}
88697 +
88698 +static bool check_mode_type(const_gimple stmt)
88699 +{
88700 + const_tree lhs = gimple_get_lhs(stmt);
88701 + const_tree lhs_type = TREE_TYPE(lhs);
88702 + const_tree rhs_type = TREE_TYPE(gimple_assign_rhs1(stmt));
88703 + enum machine_mode lhs_mode = TYPE_MODE(lhs_type);
88704 + enum machine_mode rhs_mode = TYPE_MODE(rhs_type);
88705 +
88706 + if (rhs_mode == lhs_mode && TYPE_UNSIGNED(rhs_type) == TYPE_UNSIGNED(lhs_type))
88707 + return false;
88708 +
88709 + if (rhs_mode == SImode && lhs_mode == DImode && (TYPE_UNSIGNED(rhs_type) || !TYPE_UNSIGNED(lhs_type)))
88710 + return false;
88711 +
88712 + return true;
88713 +}
88714 +
88715 +static bool check_undefined_integer_operation(const_gimple stmt)
88716 +{
88717 + const_gimple def_stmt;
88718 + const_tree lhs = gimple_get_lhs(stmt);
88719 + const_tree rhs1 = gimple_assign_rhs1(stmt);
88720 + const_tree rhs1_type = TREE_TYPE(rhs1);
88721 + const_tree lhs_type = TREE_TYPE(lhs);
88722 +
88723 + if (TYPE_MODE(rhs1_type) != TYPE_MODE(lhs_type) || TYPE_UNSIGNED(rhs1_type) == TYPE_UNSIGNED(lhs_type))
88724 + return false;
88725 +
88726 + def_stmt = get_def_stmt(rhs1);
88727 + if (gimple_code(def_stmt) != GIMPLE_ASSIGN)
88728 + return false;
88729 +
88730 + if (gimple_assign_rhs_code(def_stmt) != MINUS_EXPR)
88731 + return false;
88732 + return true;
88733 +}
88734 +
88735 +static bool is_a_cast_and_const_overflow(const_tree no_const_rhs)
88736 +{
88737 + const_tree rhs1, lhs, rhs1_type, lhs_type;
88738 + enum machine_mode lhs_mode, rhs_mode;
88739 + gimple def_stmt = get_def_stmt(no_const_rhs);
88740 +
88741 + if (!gimple_assign_cast_p(def_stmt))
88742 + return false;
88743 +
88744 + rhs1 = gimple_assign_rhs1(def_stmt);
88745 + lhs = gimple_get_lhs(def_stmt);
88746 + rhs1_type = TREE_TYPE(rhs1);
88747 + lhs_type = TREE_TYPE(lhs);
88748 + rhs_mode = TYPE_MODE(rhs1_type);
88749 + lhs_mode = TYPE_MODE(lhs_type);
88750 + if (TYPE_UNSIGNED(lhs_type) == TYPE_UNSIGNED(rhs1_type) || lhs_mode != rhs_mode)
88751 + return false;
88752 +
88753 + return true;
88754 +}
88755 +
88756 +static tree handle_unary_rhs(struct pointer_set_t *visited, gimple stmt)
88757 +{
88758 + tree size_overflow_type, lhs = gimple_get_lhs(stmt);
88759 + tree new_rhs1, rhs1 = gimple_assign_rhs1(stmt);
88760 + const_tree rhs1_type = TREE_TYPE(rhs1);
88761 + const_tree lhs_type = TREE_TYPE(lhs);
88762 +
88763 + new_rhs1 = expand(visited, rhs1);
88764 +
88765 + if (new_rhs1 == NULL_TREE || TREE_CODE(rhs1_type) == POINTER_TYPE)
88766 + return create_assign(visited, stmt, lhs, AFTER_STMT);
88767 +
88768 + if (gimple_plf(stmt, MY_STMT))
88769 + return lhs;
88770 +
88771 + if (gimple_plf(stmt, NO_CAST_CHECK))
88772 + return dup_assign(visited, stmt, lhs, new_rhs1, NULL_TREE, NULL_TREE);
88773 +
88774 + if (gimple_assign_rhs_code(stmt) == BIT_NOT_EXPR) {
88775 + size_overflow_type = get_size_overflow_type(stmt, rhs1);
88776 + new_rhs1 = cast_to_new_size_overflow_type(stmt, new_rhs1, size_overflow_type, BEFORE_STMT);
88777 + check_size_overflow(stmt, size_overflow_type, new_rhs1, rhs1, BEFORE_STMT);
88778 + return create_assign(visited, stmt, lhs, AFTER_STMT);
88779 + }
88780 +
88781 + if (!gimple_assign_cast_p(stmt) || check_undefined_integer_operation(stmt))
88782 + return dup_assign(visited, stmt, lhs, new_rhs1, NULL_TREE, NULL_TREE);
88783 +
88784 + size_overflow_type = get_size_overflow_type(stmt, rhs1);
88785 + new_rhs1 = cast_to_new_size_overflow_type(stmt, new_rhs1, size_overflow_type, BEFORE_STMT);
88786 +
88787 + change_rhs1(stmt, new_rhs1);
88788 + check_size_overflow(stmt, size_overflow_type, new_rhs1, rhs1, BEFORE_STMT);
88789 +
88790 + rhs1 = gimple_assign_rhs1(stmt);
88791 + rhs1_type = TREE_TYPE(rhs1);
88792 + if (TYPE_UNSIGNED(rhs1_type) != TYPE_UNSIGNED(lhs_type))
88793 + return create_assign(visited, stmt, rhs1, AFTER_STMT);
88794 +
88795 + if (!check_mode_type(stmt))
88796 + return create_assign(visited, stmt, lhs, AFTER_STMT);
88797 +
88798 + size_overflow_type = get_size_overflow_type(stmt, lhs);
88799 + new_rhs1 = cast_to_new_size_overflow_type(stmt, new_rhs1, size_overflow_type, BEFORE_STMT);
88800 +
88801 + check_size_overflow(stmt, size_overflow_type, new_rhs1, lhs, BEFORE_STMT);
88802 +
88803 + return create_assign(visited, stmt, lhs, AFTER_STMT);
88804 +}
88805 +
88806 +static tree handle_unary_ops(struct pointer_set_t *visited, tree lhs)
88807 +{
88808 + gimple def_stmt = get_def_stmt(lhs);
88809 + tree rhs1 = gimple_assign_rhs1(def_stmt);
88810 +
88811 + if (is_gimple_constant(rhs1))
88812 + return create_assign(visited, def_stmt, lhs, AFTER_STMT);
88813 +
88814 + gcc_assert(TREE_CODE(rhs1) != COND_EXPR);
88815 + switch (TREE_CODE(rhs1)) {
88816 + case SSA_NAME:
88817 + return handle_unary_rhs(visited, def_stmt);
88818 + case ARRAY_REF:
88819 + case BIT_FIELD_REF:
88820 + case ADDR_EXPR:
88821 + case COMPONENT_REF:
88822 + case INDIRECT_REF:
88823 +#if BUILDING_GCC_VERSION >= 4006
88824 + case MEM_REF:
88825 +#endif
88826 + case PARM_DECL:
88827 + case TARGET_MEM_REF:
88828 + case VAR_DECL:
88829 + return create_assign(visited, def_stmt, lhs, AFTER_STMT);
88830 +
88831 + default:
88832 + debug_gimple_stmt(def_stmt);
88833 + debug_tree(rhs1);
88834 + gcc_unreachable();
88835 + }
88836 +}
88837 +
88838 +static void insert_cond(basic_block cond_bb, tree arg, enum tree_code cond_code, tree type_value)
88839 +{
88840 + gimple cond_stmt;
88841 + gimple_stmt_iterator gsi = gsi_last_bb(cond_bb);
88842 +
88843 + cond_stmt = gimple_build_cond(cond_code, arg, type_value, NULL_TREE, NULL_TREE);
88844 + gsi_insert_after(&gsi, cond_stmt, GSI_CONTINUE_LINKING);
88845 + update_stmt(cond_stmt);
88846 +}
88847 +
88848 +static tree create_string_param(tree string)
88849 +{
88850 + tree i_type, a_type;
88851 + const int length = TREE_STRING_LENGTH(string);
88852 +
88853 + gcc_assert(length > 0);
88854 +
88855 + i_type = build_index_type(build_int_cst(NULL_TREE, length - 1));
88856 + a_type = build_array_type(char_type_node, i_type);
88857 +
88858 + TREE_TYPE(string) = a_type;
88859 + TREE_CONSTANT(string) = 1;
88860 + TREE_READONLY(string) = 1;
88861 +
88862 + return build1(ADDR_EXPR, ptr_type_node, string);
88863 +}
88864 +
88865 +static void insert_cond_result(basic_block bb_true, const_gimple stmt, const_tree arg, bool min)
88866 +{
88867 + gimple func_stmt;
88868 + const_gimple def_stmt;
88869 + const_tree loc_line;
88870 + tree loc_file, ssa_name, current_func;
88871 + expanded_location xloc;
88872 + char ssa_name_buf[256];
88873 + gimple_stmt_iterator gsi = gsi_start_bb(bb_true);
88874 +
88875 + def_stmt = get_def_stmt(arg);
88876 + xloc = expand_location(gimple_location(def_stmt));
88877 +
88878 + if (!gimple_has_location(def_stmt)) {
88879 + xloc = expand_location(gimple_location(stmt));
88880 + if (!gimple_has_location(stmt))
88881 + xloc = expand_location(DECL_SOURCE_LOCATION(current_function_decl));
88882 + }
88883 +
88884 + loc_line = build_int_cstu(unsigned_type_node, xloc.line);
88885 +
88886 + loc_file = build_string(strlen(xloc.file) + 1, xloc.file);
88887 + loc_file = create_string_param(loc_file);
88888 +
88889 + current_func = build_string(NAME_LEN(current_function_decl) + 1, NAME(current_function_decl));
88890 + current_func = create_string_param(current_func);
88891 +
88892 + snprintf(ssa_name_buf, 256, "%s_%u (%s)\n", NAME(SSA_NAME_VAR(arg)), SSA_NAME_VERSION(arg), min ? "min" : "max");
88893 + ssa_name = build_string(256, ssa_name_buf);
88894 + ssa_name = create_string_param(ssa_name);
88895 +
88896 + // void report_size_overflow(const char *file, unsigned int line, const char *func, const char *ssa_name)
88897 + func_stmt = gimple_build_call(report_size_overflow_decl, 4, loc_file, loc_line, current_func, ssa_name);
88898 +
88899 + gsi_insert_after(&gsi, func_stmt, GSI_CONTINUE_LINKING);
88900 +}
88901 +
88902 +static void __unused print_the_code_insertions(const_gimple stmt)
88903 +{
88904 + location_t loc = gimple_location(stmt);
88905 +
88906 + inform(loc, "Integer size_overflow check applied here.");
88907 +}
88908 +
88909 +static void insert_check_size_overflow(gimple stmt, enum tree_code cond_code, tree arg, tree type_value, bool before, bool min)
88910 +{
88911 + basic_block cond_bb, join_bb, bb_true;
88912 + edge e;
88913 + gimple_stmt_iterator gsi = gsi_for_stmt(stmt);
88914 +
88915 + cond_bb = gimple_bb(stmt);
88916 + if (before)
88917 + gsi_prev(&gsi);
88918 + if (gsi_end_p(gsi))
88919 + e = split_block_after_labels(cond_bb);
88920 + else
88921 + e = split_block(cond_bb, gsi_stmt(gsi));
88922 + cond_bb = e->src;
88923 + join_bb = e->dest;
88924 + e->flags = EDGE_FALSE_VALUE;
88925 + e->probability = REG_BR_PROB_BASE;
88926 +
88927 + bb_true = create_empty_bb(cond_bb);
88928 + make_edge(cond_bb, bb_true, EDGE_TRUE_VALUE);
88929 + make_edge(cond_bb, join_bb, EDGE_FALSE_VALUE);
88930 + make_edge(bb_true, join_bb, EDGE_FALLTHRU);
88931 +
88932 + if (dom_info_available_p(CDI_DOMINATORS)) {
88933 + set_immediate_dominator(CDI_DOMINATORS, bb_true, cond_bb);
88934 + set_immediate_dominator(CDI_DOMINATORS, join_bb, cond_bb);
88935 + }
88936 +
88937 + if (current_loops != NULL) {
88938 + gcc_assert(cond_bb->loop_father == join_bb->loop_father);
88939 + add_bb_to_loop(bb_true, cond_bb->loop_father);
88940 + }
88941 +
88942 + insert_cond(cond_bb, arg, cond_code, type_value);
88943 + insert_cond_result(bb_true, stmt, arg, min);
88944 +
88945 +// print_the_code_insertions(stmt);
88946 +}
88947 +
88948 +static void check_size_overflow(gimple stmt, tree size_overflow_type, tree cast_rhs, tree rhs, bool before)
88949 +{
88950 + const_tree rhs_type = TREE_TYPE(rhs);
88951 + tree cast_rhs_type, type_max_type, type_min_type, type_max, type_min;
88952 +
88953 + gcc_assert(rhs_type != NULL_TREE);
88954 + if (TREE_CODE(rhs_type) == POINTER_TYPE)
88955 + return;
88956 +
88957 + gcc_assert(TREE_CODE(rhs_type) == INTEGER_TYPE || TREE_CODE(rhs_type) == BOOLEAN_TYPE || TREE_CODE(rhs_type) == ENUMERAL_TYPE);
88958 +
88959 + type_max = cast_a_tree(size_overflow_type, TYPE_MAX_VALUE(rhs_type));
88960 + type_min = cast_a_tree(size_overflow_type, TYPE_MIN_VALUE(rhs_type));
88961 +
88962 + gcc_assert(!TREE_OVERFLOW(type_max));
88963 +
88964 + cast_rhs_type = TREE_TYPE(cast_rhs);
88965 + type_max_type = TREE_TYPE(type_max);
88966 + type_min_type = TREE_TYPE(type_min);
88967 + gcc_assert(types_compatible_p(cast_rhs_type, type_max_type));
88968 + gcc_assert(types_compatible_p(type_max_type, type_min_type));
88969 +
88970 + insert_check_size_overflow(stmt, GT_EXPR, cast_rhs, type_max, before, false);
88971 + insert_check_size_overflow(stmt, LT_EXPR, cast_rhs, type_min, before, true);
88972 +}
88973 +
88974 +static tree get_size_overflow_type_for_intentional_overflow(gimple def_stmt, tree change_rhs)
88975 +{
88976 + gimple change_rhs_def_stmt;
88977 + tree lhs = gimple_get_lhs(def_stmt);
88978 + tree lhs_type = TREE_TYPE(lhs);
88979 + tree rhs1_type = TREE_TYPE(gimple_assign_rhs1(def_stmt));
88980 + tree rhs2_type = TREE_TYPE(gimple_assign_rhs2(def_stmt));
88981 +
88982 + if (change_rhs == NULL_TREE)
88983 + return get_size_overflow_type(def_stmt, lhs);
88984 +
88985 + change_rhs_def_stmt = get_def_stmt(change_rhs);
88986 +
88987 + if (TREE_CODE_CLASS(gimple_assign_rhs_code(def_stmt)) == tcc_comparison)
88988 + return get_size_overflow_type(change_rhs_def_stmt, change_rhs);
88989 +
88990 + if (gimple_assign_rhs_code(def_stmt) == LSHIFT_EXPR)
88991 + return get_size_overflow_type(change_rhs_def_stmt, change_rhs);
88992 +
88993 + if (gimple_assign_rhs_code(def_stmt) == RSHIFT_EXPR)
88994 + return get_size_overflow_type(change_rhs_def_stmt, change_rhs);
88995 +
88996 + if (!types_compatible_p(lhs_type, rhs1_type) || !useless_type_conversion_p(rhs1_type, rhs2_type)) {
88997 + debug_gimple_stmt(def_stmt);
88998 + gcc_unreachable();
88999 + }
89000 +
89001 + return get_size_overflow_type(def_stmt, lhs);
89002 +}
89003 +
89004 +static bool is_a_constant_overflow(const_gimple stmt, const_tree rhs)
89005 +{
89006 + if (gimple_assign_rhs_code(stmt) == MIN_EXPR)
89007 + return false;
89008 + if (!is_gimple_constant(rhs))
89009 + return false;
89010 + return true;
89011 +}
89012 +
89013 +static bool is_subtraction_special(const_gimple stmt)
89014 +{
89015 + gimple rhs1_def_stmt, rhs2_def_stmt;
89016 + const_tree rhs1_def_stmt_rhs1, rhs2_def_stmt_rhs1, rhs1_def_stmt_lhs, rhs2_def_stmt_lhs;
89017 + enum machine_mode rhs1_def_stmt_rhs1_mode, rhs2_def_stmt_rhs1_mode, rhs1_def_stmt_lhs_mode, rhs2_def_stmt_lhs_mode;
89018 + const_tree rhs1 = gimple_assign_rhs1(stmt);
89019 + const_tree rhs2 = gimple_assign_rhs2(stmt);
89020 +
89021 + if (is_gimple_constant(rhs1) || is_gimple_constant(rhs2))
89022 + return false;
89023 +
89024 + gcc_assert(TREE_CODE(rhs1) == SSA_NAME && TREE_CODE(rhs2) == SSA_NAME);
89025 +
89026 + if (gimple_assign_rhs_code(stmt) != MINUS_EXPR)
89027 + return false;
89028 +
89029 + rhs1_def_stmt = get_def_stmt(rhs1);
89030 + rhs2_def_stmt = get_def_stmt(rhs2);
89031 + if (!gimple_assign_cast_p(rhs1_def_stmt) || !gimple_assign_cast_p(rhs2_def_stmt))
89032 + return false;
89033 +
89034 + rhs1_def_stmt_rhs1 = gimple_assign_rhs1(rhs1_def_stmt);
89035 + rhs2_def_stmt_rhs1 = gimple_assign_rhs1(rhs2_def_stmt);
89036 + rhs1_def_stmt_lhs = gimple_get_lhs(rhs1_def_stmt);
89037 + rhs2_def_stmt_lhs = gimple_get_lhs(rhs2_def_stmt);
89038 + rhs1_def_stmt_rhs1_mode = TYPE_MODE(TREE_TYPE(rhs1_def_stmt_rhs1));
89039 + rhs2_def_stmt_rhs1_mode = TYPE_MODE(TREE_TYPE(rhs2_def_stmt_rhs1));
89040 + rhs1_def_stmt_lhs_mode = TYPE_MODE(TREE_TYPE(rhs1_def_stmt_lhs));
89041 + rhs2_def_stmt_lhs_mode = TYPE_MODE(TREE_TYPE(rhs2_def_stmt_lhs));
89042 + if (GET_MODE_BITSIZE(rhs1_def_stmt_rhs1_mode) <= GET_MODE_BITSIZE(rhs1_def_stmt_lhs_mode))
89043 + return false;
89044 + if (GET_MODE_BITSIZE(rhs2_def_stmt_rhs1_mode) <= GET_MODE_BITSIZE(rhs2_def_stmt_lhs_mode))
89045 + return false;
89046 +
89047 + gimple_set_plf(rhs1_def_stmt, NO_CAST_CHECK, true);
89048 + gimple_set_plf(rhs2_def_stmt, NO_CAST_CHECK, true);
89049 + return true;
89050 +}
89051 +
89052 +static tree get_def_stmt_rhs(const_tree var)
89053 +{
89054 + tree rhs1, def_stmt_rhs1;
89055 + gimple rhs1_def_stmt, def_stmt_rhs1_def_stmt, def_stmt;
89056 +
89057 + def_stmt = get_def_stmt(var);
89058 + gcc_assert(gimple_code(def_stmt) != GIMPLE_NOP && gimple_plf(def_stmt, MY_STMT) && gimple_assign_cast_p(def_stmt));
89059 +
89060 + rhs1 = gimple_assign_rhs1(def_stmt);
89061 + rhs1_def_stmt = get_def_stmt(rhs1);
89062 + gcc_assert(gimple_code(rhs1_def_stmt) != GIMPLE_NOP);
89063 + if (!gimple_assign_cast_p(rhs1_def_stmt))
89064 + return rhs1;
89065 +
89066 + def_stmt_rhs1 = gimple_assign_rhs1(rhs1_def_stmt);
89067 + def_stmt_rhs1_def_stmt = get_def_stmt(def_stmt_rhs1);
89068 +
89069 + switch (gimple_code(def_stmt_rhs1_def_stmt)) {
89070 + case GIMPLE_CALL:
89071 + case GIMPLE_NOP:
89072 + case GIMPLE_ASM:
89073 + return def_stmt_rhs1;
89074 + case GIMPLE_ASSIGN:
89075 + return rhs1;
89076 + default:
89077 + debug_gimple_stmt(def_stmt_rhs1_def_stmt);
89078 + gcc_unreachable();
89079 + }
89080 +}
89081 +
89082 +static tree handle_integer_truncation(struct pointer_set_t *visited, const_tree lhs)
89083 +{
89084 + tree new_rhs1, new_rhs2;
89085 + tree new_rhs1_def_stmt_rhs1, new_rhs2_def_stmt_rhs1, new_lhs;
89086 + gimple assign, stmt = get_def_stmt(lhs);
89087 + tree rhs1 = gimple_assign_rhs1(stmt);
89088 + tree rhs2 = gimple_assign_rhs2(stmt);
89089 +
89090 + if (!is_subtraction_special(stmt))
89091 + return NULL_TREE;
89092 +
89093 + new_rhs1 = expand(visited, rhs1);
89094 + new_rhs2 = expand(visited, rhs2);
89095 +
89096 + new_rhs1_def_stmt_rhs1 = get_def_stmt_rhs(new_rhs1);
89097 + new_rhs2_def_stmt_rhs1 = get_def_stmt_rhs(new_rhs2);
89098 +
89099 + if (!types_compatible_p(TREE_TYPE(new_rhs1_def_stmt_rhs1), TREE_TYPE(new_rhs2_def_stmt_rhs1))) {
89100 + new_rhs1_def_stmt_rhs1 = cast_to_TI_type(stmt, new_rhs1_def_stmt_rhs1);
89101 + new_rhs2_def_stmt_rhs1 = cast_to_TI_type(stmt, new_rhs2_def_stmt_rhs1);
89102 + }
89103 +
89104 + assign = create_binary_assign(MINUS_EXPR, stmt, new_rhs1_def_stmt_rhs1, new_rhs2_def_stmt_rhs1);
89105 + new_lhs = gimple_get_lhs(assign);
89106 + check_size_overflow(assign, TREE_TYPE(new_lhs), new_lhs, rhs1, AFTER_STMT);
89107 +
89108 + return dup_assign(visited, stmt, lhs, new_rhs1, new_rhs2, NULL_TREE);
89109 +}
89110 +
89111 +static bool is_a_neg_overflow(const_gimple stmt, const_tree rhs)
89112 +{
89113 + const_gimple def_stmt;
89114 +
89115 + if (TREE_CODE(rhs) != SSA_NAME)
89116 + return false;
89117 +
89118 + if (gimple_assign_rhs_code(stmt) != PLUS_EXPR)
89119 + return false;
89120 +
89121 + def_stmt = get_def_stmt(rhs);
89122 + if (gimple_code(def_stmt) != GIMPLE_ASSIGN || gimple_assign_rhs_code(def_stmt) != BIT_NOT_EXPR)
89123 + return false;
89124 +
89125 + return true;
89126 +}
89127 +
89128 +static tree handle_intentional_overflow(struct pointer_set_t *visited, bool check_overflow, gimple stmt, tree change_rhs, tree new_rhs1, tree new_rhs2)
89129 +{
89130 + tree new_rhs, size_overflow_type, orig_rhs;
89131 + void (*gimple_assign_set_rhs)(gimple, tree);
89132 + tree rhs1 = gimple_assign_rhs1(stmt);
89133 + tree rhs2 = gimple_assign_rhs2(stmt);
89134 + tree lhs = gimple_get_lhs(stmt);
89135 +
89136 + if (change_rhs == NULL_TREE)
89137 + return create_assign(visited, stmt, lhs, AFTER_STMT);
89138 +
89139 + if (new_rhs2 == NULL_TREE) {
89140 + size_overflow_type = get_size_overflow_type_for_intentional_overflow(stmt, new_rhs1);
89141 + new_rhs2 = cast_a_tree(size_overflow_type, rhs2);
89142 + orig_rhs = rhs1;
89143 + gimple_assign_set_rhs = &gimple_assign_set_rhs1;
89144 + } else {
89145 + size_overflow_type = get_size_overflow_type_for_intentional_overflow(stmt, new_rhs2);
89146 + new_rhs1 = cast_a_tree(size_overflow_type, rhs1);
89147 + orig_rhs = rhs2;
89148 + gimple_assign_set_rhs = &gimple_assign_set_rhs2;
89149 + }
89150 +
89151 + change_rhs = cast_to_new_size_overflow_type(stmt, change_rhs, size_overflow_type, BEFORE_STMT);
89152 +
89153 + if (check_overflow)
89154 + check_size_overflow(stmt, size_overflow_type, change_rhs, orig_rhs, BEFORE_STMT);
89155 +
89156 + new_rhs = change_assign_rhs(stmt, orig_rhs, change_rhs);
89157 + gimple_assign_set_rhs(stmt, new_rhs);
89158 + update_stmt(stmt);
89159 +
89160 + return create_assign(visited, stmt, lhs, AFTER_STMT);
89161 +}
89162 +
89163 +static tree handle_binary_ops(struct pointer_set_t *visited, tree lhs)
89164 +{
89165 + tree rhs1, rhs2, new_lhs;
89166 + gimple def_stmt = get_def_stmt(lhs);
89167 + tree new_rhs1 = NULL_TREE;
89168 + tree new_rhs2 = NULL_TREE;
89169 +
89170 + rhs1 = gimple_assign_rhs1(def_stmt);
89171 + rhs2 = gimple_assign_rhs2(def_stmt);
89172 +
89173 + /* no DImode/TImode division in the 32/64 bit kernel */
89174 + switch (gimple_assign_rhs_code(def_stmt)) {
89175 + case RDIV_EXPR:
89176 + case TRUNC_DIV_EXPR:
89177 + case CEIL_DIV_EXPR:
89178 + case FLOOR_DIV_EXPR:
89179 + case ROUND_DIV_EXPR:
89180 + case TRUNC_MOD_EXPR:
89181 + case CEIL_MOD_EXPR:
89182 + case FLOOR_MOD_EXPR:
89183 + case ROUND_MOD_EXPR:
89184 + case EXACT_DIV_EXPR:
89185 + case POINTER_PLUS_EXPR:
89186 + case BIT_AND_EXPR:
89187 + return create_assign(visited, def_stmt, lhs, AFTER_STMT);
89188 + default:
89189 + break;
89190 + }
89191 +
89192 + new_lhs = handle_integer_truncation(visited, lhs);
89193 + if (new_lhs != NULL_TREE)
89194 + return new_lhs;
89195 +
89196 + if (TREE_CODE(rhs1) == SSA_NAME)
89197 + new_rhs1 = expand(visited, rhs1);
89198 + if (TREE_CODE(rhs2) == SSA_NAME)
89199 + new_rhs2 = expand(visited, rhs2);
89200 +
89201 + if (is_a_neg_overflow(def_stmt, rhs2))
89202 + return handle_intentional_overflow(visited, true, def_stmt, new_rhs1, new_rhs1, NULL_TREE);
89203 + if (is_a_neg_overflow(def_stmt, rhs1))
89204 + return handle_intentional_overflow(visited, true, def_stmt, new_rhs2, NULL_TREE, new_rhs2);
89205 +
89206 + if (is_a_constant_overflow(def_stmt, rhs2))
89207 + return handle_intentional_overflow(visited, !is_a_cast_and_const_overflow(rhs1), def_stmt, new_rhs1, new_rhs1, NULL_TREE);
89208 + if (is_a_constant_overflow(def_stmt, rhs1))
89209 + return handle_intentional_overflow(visited, !is_a_cast_and_const_overflow(rhs2), def_stmt, new_rhs2, NULL_TREE, new_rhs2);
89210 +
89211 + return dup_assign(visited, def_stmt, lhs, new_rhs1, new_rhs2, NULL_TREE);
89212 +}
89213 +
89214 +#if BUILDING_GCC_VERSION >= 4007
89215 +static tree get_new_rhs(struct pointer_set_t *visited, tree size_overflow_type, tree rhs)
89216 +{
89217 + if (is_gimple_constant(rhs))
89218 + return cast_a_tree(size_overflow_type, rhs);
89219 + if (TREE_CODE(rhs) != SSA_NAME)
89220 + return NULL_TREE;
89221 + return expand(visited, rhs);
89222 +}
89223 +
89224 +static tree handle_ternary_ops(struct pointer_set_t *visited, tree lhs)
89225 +{
89226 + tree rhs1, rhs2, rhs3, new_rhs1, new_rhs2, new_rhs3, size_overflow_type;
89227 + gimple def_stmt = get_def_stmt(lhs);
89228 +
89229 + size_overflow_type = get_size_overflow_type(def_stmt, lhs);
89230 +
89231 + rhs1 = gimple_assign_rhs1(def_stmt);
89232 + rhs2 = gimple_assign_rhs2(def_stmt);
89233 + rhs3 = gimple_assign_rhs3(def_stmt);
89234 + new_rhs1 = get_new_rhs(visited, size_overflow_type, rhs1);
89235 + new_rhs2 = get_new_rhs(visited, size_overflow_type, rhs2);
89236 + new_rhs3 = get_new_rhs(visited, size_overflow_type, rhs3);
89237 +
89238 + return dup_assign(visited, def_stmt, lhs, new_rhs1, new_rhs2, new_rhs3);
89239 +}
89240 +#endif
89241 +
89242 +static tree get_size_overflow_type(gimple stmt, const_tree node)
89243 +{
89244 + const_tree type;
89245 +
89246 + gcc_assert(node != NULL_TREE);
89247 +
89248 + type = TREE_TYPE(node);
89249 +
89250 + if (gimple_plf(stmt, MY_STMT))
89251 + return TREE_TYPE(node);
89252 +
89253 + switch (TYPE_MODE(type)) {
89254 + case QImode:
89255 + return (TYPE_UNSIGNED(type)) ? unsigned_intHI_type_node : intHI_type_node;
89256 + case HImode:
89257 + return (TYPE_UNSIGNED(type)) ? unsigned_intSI_type_node : intSI_type_node;
89258 + case SImode:
89259 + return (TYPE_UNSIGNED(type)) ? unsigned_intDI_type_node : intDI_type_node;
89260 + case DImode:
89261 + if (LONG_TYPE_SIZE == GET_MODE_BITSIZE(SImode))
89262 + return (TYPE_UNSIGNED(type)) ? unsigned_intDI_type_node : intDI_type_node;
89263 + return (TYPE_UNSIGNED(type)) ? unsigned_intTI_type_node : intTI_type_node;
89264 + default:
89265 + debug_tree((tree)node);
89266 + error("%s: unsupported gcc configuration.", __func__);
89267 + gcc_unreachable();
89268 + }
89269 +}
89270 +
89271 +static tree expand_visited(gimple def_stmt)
89272 +{
89273 + const_gimple next_stmt;
89274 + gimple_stmt_iterator gsi = gsi_for_stmt(def_stmt);
89275 +
89276 + gsi_next(&gsi);
89277 + next_stmt = gsi_stmt(gsi);
89278 +
89279 + gcc_assert(gimple_plf((gimple)next_stmt, MY_STMT));
89280 +
89281 + switch (gimple_code(next_stmt)) {
89282 + case GIMPLE_ASSIGN:
89283 + return gimple_get_lhs(next_stmt);
89284 + case GIMPLE_PHI:
89285 + return gimple_phi_result(next_stmt);
89286 + case GIMPLE_CALL:
89287 + return gimple_call_lhs(next_stmt);
89288 + default:
89289 + return NULL_TREE;
89290 + }
89291 +}
89292 +
89293 +static tree expand(struct pointer_set_t *visited, tree lhs)
89294 +{
89295 + gimple def_stmt;
89296 + enum tree_code code = TREE_CODE(TREE_TYPE(lhs));
89297 +
89298 + if (is_gimple_constant(lhs))
89299 + return NULL_TREE;
89300 +
89301 + if (TREE_CODE(lhs) == ADDR_EXPR)
89302 + return NULL_TREE;
89303 +
89304 + if (code == REAL_TYPE)
89305 + return NULL_TREE;
89306 +
89307 + gcc_assert(code == INTEGER_TYPE || code == POINTER_TYPE || code == BOOLEAN_TYPE || code == ENUMERAL_TYPE);
89308 +
89309 +
89310 + def_stmt = get_def_stmt(lhs);
89311 +
89312 + if (!def_stmt)
89313 + return NULL_TREE;
89314 +
89315 + if (gimple_plf(def_stmt, MY_STMT))
89316 + return lhs;
89317 +
89318 + if (pointer_set_contains(visited, def_stmt))
89319 + return expand_visited(def_stmt);
89320 +
89321 + switch (gimple_code(def_stmt)) {
89322 + case GIMPLE_NOP:
89323 + return NULL_TREE;
89324 + case GIMPLE_PHI:
89325 + return build_new_phi(visited, lhs);
89326 + case GIMPLE_CALL:
89327 + case GIMPLE_ASM:
89328 + return create_assign(visited, def_stmt, lhs, AFTER_STMT);
89329 + case GIMPLE_ASSIGN:
89330 + switch (gimple_num_ops(def_stmt)) {
89331 + case 2:
89332 + return handle_unary_ops(visited, lhs);
89333 + case 3:
89334 + return handle_binary_ops(visited, lhs);
89335 +#if BUILDING_GCC_VERSION >= 4007
89336 + case 4:
89337 + return handle_ternary_ops(visited, lhs);
89338 +#endif
89339 + }
89340 + default:
89341 + debug_gimple_stmt(def_stmt);
89342 + error("%s: unknown gimple code", __func__);
89343 + gcc_unreachable();
89344 + }
89345 +}
89346 +
89347 +static void change_function_arg(gimple stmt, const_tree origarg, unsigned int argnum, tree newarg)
89348 +{
89349 + const_gimple assign;
89350 + gimple_stmt_iterator gsi = gsi_for_stmt(stmt);
89351 + tree origtype = TREE_TYPE(origarg);
89352 +
89353 + gcc_assert(gimple_code(stmt) == GIMPLE_CALL);
89354 +
89355 + assign = build_cast_stmt(origtype, newarg, CREATE_NEW_VAR, &gsi, BEFORE_STMT);
89356 +
89357 + gimple_call_set_arg(stmt, argnum, gimple_get_lhs(assign));
89358 + update_stmt(stmt);
89359 +}
89360 +
89361 +static bool get_function_arg(unsigned int* argnum, const_tree fndecl)
89362 +{
89363 + const char *origid;
89364 + tree arg;
89365 + const_tree origarg;
89366 +
89367 + if (!DECL_ABSTRACT_ORIGIN(fndecl))
89368 + return true;
89369 +
89370 + origarg = DECL_ARGUMENTS(DECL_ABSTRACT_ORIGIN(fndecl));
89371 + while (origarg && *argnum) {
89372 + (*argnum)--;
89373 + origarg = TREE_CHAIN(origarg);
89374 + }
89375 +
89376 + gcc_assert(*argnum == 0);
89377 +
89378 + gcc_assert(origarg != NULL_TREE);
89379 + origid = NAME(origarg);
89380 + *argnum = 0;
89381 + for (arg = DECL_ARGUMENTS(fndecl); arg; arg = TREE_CHAIN(arg)) {
89382 + if (!strcmp(origid, NAME(arg)))
89383 + return true;
89384 + (*argnum)++;
89385 + }
89386 + return false;
89387 +}
89388 +
89389 +static bool skip_types(const_tree var)
89390 +{
89391 + switch (TREE_CODE(var)) {
89392 + case ADDR_EXPR:
89393 +#if BUILDING_GCC_VERSION >= 4006
89394 + case MEM_REF:
89395 +#endif
89396 + case ARRAY_REF:
89397 + case BIT_FIELD_REF:
89398 + case INDIRECT_REF:
89399 + case TARGET_MEM_REF:
89400 + case VAR_DECL:
89401 + return true;
89402 + default:
89403 + break;
89404 + }
89405 + return false;
89406 +}
89407 +
89408 +static bool walk_phi(struct pointer_set_t *visited, const_tree result)
89409 +{
89410 + gimple phi = get_def_stmt(result);
89411 + unsigned int i, n = gimple_phi_num_args(phi);
89412 +
89413 + if (!phi)
89414 + return false;
89415 +
89416 + pointer_set_insert(visited, phi);
89417 + for (i = 0; i < n; i++) {
89418 + const_tree arg = gimple_phi_arg_def(phi, i);
89419 + if (pre_expand(visited, arg))
89420 + return true;
89421 + }
89422 + return false;
89423 +}
89424 +
89425 +static bool walk_unary_ops(struct pointer_set_t *visited, const_tree lhs)
89426 +{
89427 + gimple def_stmt = get_def_stmt(lhs);
89428 + const_tree rhs;
89429 +
89430 + if (!def_stmt)
89431 + return false;
89432 +
89433 + rhs = gimple_assign_rhs1(def_stmt);
89434 + if (pre_expand(visited, rhs))
89435 + return true;
89436 + return false;
89437 +}
89438 +
89439 +static bool walk_binary_ops(struct pointer_set_t *visited, const_tree lhs)
89440 +{
89441 + bool rhs1_found, rhs2_found;
89442 + gimple def_stmt = get_def_stmt(lhs);
89443 + const_tree rhs1, rhs2;
89444 +
89445 + if (!def_stmt)
89446 + return false;
89447 +
89448 + rhs1 = gimple_assign_rhs1(def_stmt);
89449 + rhs2 = gimple_assign_rhs2(def_stmt);
89450 + rhs1_found = pre_expand(visited, rhs1);
89451 + rhs2_found = pre_expand(visited, rhs2);
89452 +
89453 + return rhs1_found || rhs2_found;
89454 +}
89455 +
89456 +static const_tree search_field_decl(const_tree comp_ref)
89457 +{
89458 + const_tree field = NULL_TREE;
89459 + unsigned int i, len = TREE_OPERAND_LENGTH(comp_ref);
89460 +
89461 + for (i = 0; i < len; i++) {
89462 + field = TREE_OPERAND(comp_ref, i);
89463 + if (TREE_CODE(field) == FIELD_DECL)
89464 + break;
89465 + }
89466 + gcc_assert(TREE_CODE(field) == FIELD_DECL);
89467 + return field;
89468 +}
89469 +
89470 +static enum marked mark_status(const_tree fndecl, unsigned int argnum)
89471 +{
89472 + const_tree attr, p;
89473 +
89474 + attr = lookup_attribute("intentional_overflow", DECL_ATTRIBUTES(fndecl));
89475 + if (!attr || !TREE_VALUE(attr))
89476 + return MARKED_NO;
89477 +
89478 + p = TREE_VALUE(attr);
89479 + if (!TREE_INT_CST_LOW(TREE_VALUE(p)))
89480 + return MARKED_NOT_INTENTIONAL;
89481 +
89482 + do {
89483 + if (argnum == TREE_INT_CST_LOW(TREE_VALUE(p)))
89484 + return MARKED_YES;
89485 + p = TREE_CHAIN(p);
89486 + } while (p);
89487 +
89488 + return MARKED_NO;
89489 +}
89490 +
89491 +static void print_missing_msg(tree func, unsigned int argnum)
89492 +{
89493 + unsigned int new_hash;
89494 + size_t len;
89495 + unsigned char tree_codes[CODES_LIMIT];
89496 + location_t loc = DECL_SOURCE_LOCATION(func);
89497 + const char *curfunc = get_asm_name(func);
89498 +
89499 + len = get_function_decl(func, tree_codes);
89500 + new_hash = get_hash_num(curfunc, (const char *) tree_codes, len, 0);
89501 + inform(loc, "Function %s is missing from the size_overflow hash table +%s+%u+%u+", curfunc, curfunc, argnum, new_hash);
89502 +}
89503 +
89504 +static unsigned int search_missing_attribute(const_tree arg)
89505 +{
89506 + const_tree type = TREE_TYPE(arg);
89507 + tree func = get_original_function_decl(current_function_decl);
89508 + unsigned int argnum;
89509 + const struct size_overflow_hash *hash;
89510 +
89511 + gcc_assert(TREE_CODE(arg) != COMPONENT_REF);
89512 +
89513 + if (TREE_CODE(type) == POINTER_TYPE)
89514 + return 0;
89515 +
89516 + argnum = find_arg_number(arg, func);
89517 + if (argnum == 0)
89518 + return 0;
89519 +
89520 + if (lookup_attribute("size_overflow", DECL_ATTRIBUTES(func)))
89521 + return argnum;
89522 +
89523 + hash = get_function_hash(func);
89524 + if (!hash || !(hash->param & (1U << argnum))) {
89525 + print_missing_msg(func, argnum);
89526 + return 0;
89527 + }
89528 + return argnum;
89529 +}
89530 +
89531 +static bool is_already_marked(const_tree lhs)
89532 +{
89533 + unsigned int argnum;
89534 + const_tree fndecl;
89535 +
89536 + argnum = search_missing_attribute(lhs);
89537 + fndecl = get_original_function_decl(current_function_decl);
89538 + if (argnum && mark_status(fndecl, argnum) == MARKED_YES)
89539 + return true;
89540 + return false;
89541 +}
89542 +
89543 +static bool pre_expand(struct pointer_set_t *visited, const_tree lhs)
89544 +{
89545 + const_gimple def_stmt;
89546 +
89547 + if (is_gimple_constant(lhs))
89548 + return false;
89549 +
89550 + if (skip_types(lhs))
89551 + return false;
89552 +
89553 + if (TREE_CODE(lhs) == PARM_DECL)
89554 + return is_already_marked(lhs);
89555 +
89556 + if (TREE_CODE(lhs) == COMPONENT_REF) {
89557 + const_tree field, attr;
89558 +
89559 + field = search_field_decl(lhs);
89560 + attr = lookup_attribute("intentional_overflow", DECL_ATTRIBUTES(field));
89561 + if (!attr || !TREE_VALUE(attr))
89562 + return false;
89563 + return true;
89564 + }
89565 +
89566 + def_stmt = get_def_stmt(lhs);
89567 +
89568 + if (!def_stmt)
89569 + return false;
89570 +
89571 + if (pointer_set_contains(visited, def_stmt))
89572 + return false;
89573 +
89574 + switch (gimple_code(def_stmt)) {
89575 + case GIMPLE_NOP:
89576 + if (TREE_CODE(SSA_NAME_VAR(lhs)) == PARM_DECL)
89577 + return is_already_marked(lhs);
89578 + return false;
89579 + case GIMPLE_PHI:
89580 + return walk_phi(visited, lhs);
89581 + case GIMPLE_CALL:
89582 + case GIMPLE_ASM:
89583 + return false;
89584 + case GIMPLE_ASSIGN:
89585 + switch (gimple_num_ops(def_stmt)) {
89586 + case 2:
89587 + return walk_unary_ops(visited, lhs);
89588 + case 3:
89589 + return walk_binary_ops(visited, lhs);
89590 + }
89591 + default:
89592 + debug_gimple_stmt((gimple)def_stmt);
89593 + error("%s: unknown gimple code", __func__);
89594 + gcc_unreachable();
89595 + }
89596 +}
89597 +
89598 +static bool search_attributes(tree fndecl, const_tree arg, unsigned int argnum)
89599 +{
89600 + struct pointer_set_t *visited;
89601 + bool is_found;
89602 + enum marked is_marked;
89603 + location_t loc;
89604 +
89605 + visited = pointer_set_create();
89606 + is_found = pre_expand(visited, arg);
89607 + pointer_set_destroy(visited);
89608 +
89609 + is_marked = mark_status(fndecl, argnum + 1);
89610 + if ((is_found && is_marked == MARKED_YES) || is_marked == MARKED_NOT_INTENTIONAL)
89611 + return true;
89612 +
89613 + if (is_found) {
89614 + loc = DECL_SOURCE_LOCATION(fndecl);
89615 + inform(loc, "The intentional_overflow attribute is missing from +%s+%u+", get_asm_name(fndecl), argnum + 1);
89616 + return true;
89617 + }
89618 + return false;
89619 +}
89620 +
89621 +static void handle_function_arg(gimple stmt, tree fndecl, unsigned int argnum)
89622 +{
89623 + struct pointer_set_t *visited;
89624 + tree arg, newarg;
89625 + bool match;
89626 +
89627 + match = get_function_arg(&argnum, fndecl);
89628 + if (!match)
89629 + return;
89630 + gcc_assert(gimple_call_num_args(stmt) > argnum);
89631 + arg = gimple_call_arg(stmt, argnum);
89632 + if (arg == NULL_TREE)
89633 + return;
89634 +
89635 + if (is_gimple_constant(arg))
89636 + return;
89637 +
89638 + if (search_attributes(fndecl, arg, argnum))
89639 + return;
89640 +
89641 + if (TREE_CODE(arg) != SSA_NAME)
89642 + return;
89643 +
89644 + check_arg_type(arg);
89645 +
89646 + visited = pointer_set_create();
89647 + newarg = expand(visited, arg);
89648 + pointer_set_destroy(visited);
89649 +
89650 + if (newarg == NULL_TREE)
89651 + return;
89652 +
89653 + change_function_arg(stmt, arg, argnum, newarg);
89654 +
89655 + check_size_overflow(stmt, TREE_TYPE(newarg), newarg, arg, BEFORE_STMT);
89656 +}
89657 +
89658 +static void handle_function_by_attribute(gimple stmt, const_tree attr, tree fndecl)
89659 +{
89660 + tree p = TREE_VALUE(attr);
89661 + do {
89662 + handle_function_arg(stmt, fndecl, TREE_INT_CST_LOW(TREE_VALUE(p))-1);
89663 + p = TREE_CHAIN(p);
89664 + } while (p);
89665 +}
89666 +
89667 +static void handle_function_by_hash(gimple stmt, tree fndecl)
89668 +{
89669 + tree orig_fndecl;
89670 + unsigned int num;
89671 + const struct size_overflow_hash *hash;
89672 +
89673 + orig_fndecl = get_original_function_decl(fndecl);
89674 + if (C_DECL_IMPLICIT(orig_fndecl))
89675 + return;
89676 + hash = get_function_hash(orig_fndecl);
89677 + if (!hash)
89678 + return;
89679 +
89680 + for (num = 1; num <= MAX_PARAM; num++)
89681 + if (hash->param & (1U << num))
89682 + handle_function_arg(stmt, fndecl, num - 1);
89683 +}
89684 +
89685 +static void set_plf_false(void)
89686 +{
89687 + basic_block bb;
89688 +
89689 + FOR_ALL_BB(bb) {
89690 + gimple_stmt_iterator si;
89691 +
89692 + for (si = gsi_start_bb(bb); !gsi_end_p(si); gsi_next(&si))
89693 + gimple_set_plf(gsi_stmt(si), MY_STMT, false);
89694 + for (si = gsi_start_phis(bb); !gsi_end_p(si); gsi_next(&si))
89695 + gimple_set_plf(gsi_stmt(si), MY_STMT, false);
89696 + }
89697 +}
89698 +
89699 +static unsigned int handle_function(void)
89700 +{
89701 + basic_block next, bb = ENTRY_BLOCK_PTR->next_bb;
89702 +
89703 + set_plf_false();
89704 +
89705 + do {
89706 + gimple_stmt_iterator gsi;
89707 + next = bb->next_bb;
89708 +
89709 + for (gsi = gsi_start_bb(bb); !gsi_end_p(gsi); gsi_next(&gsi)) {
89710 + tree fndecl, attr;
89711 + gimple stmt = gsi_stmt(gsi);
89712 +
89713 + if (!(is_gimple_call(stmt)))
89714 + continue;
89715 + fndecl = gimple_call_fndecl(stmt);
89716 + if (fndecl == NULL_TREE)
89717 + continue;
89718 + if (gimple_call_num_args(stmt) == 0)
89719 + continue;
89720 + attr = lookup_attribute("size_overflow", DECL_ATTRIBUTES(fndecl));
89721 + if (!attr || !TREE_VALUE(attr))
89722 + handle_function_by_hash(stmt, fndecl);
89723 + else
89724 + handle_function_by_attribute(stmt, attr, fndecl);
89725 + gsi = gsi_for_stmt(stmt);
89726 + next = gimple_bb(stmt)->next_bb;
89727 + }
89728 + bb = next;
89729 + } while (bb);
89730 + return 0;
89731 +}
89732 +
89733 +static struct gimple_opt_pass size_overflow_pass = {
89734 + .pass = {
89735 + .type = GIMPLE_PASS,
89736 + .name = "size_overflow",
89737 + .gate = NULL,
89738 + .execute = handle_function,
89739 + .sub = NULL,
89740 + .next = NULL,
89741 + .static_pass_number = 0,
89742 + .tv_id = TV_NONE,
89743 + .properties_required = PROP_cfg | PROP_referenced_vars,
89744 + .properties_provided = 0,
89745 + .properties_destroyed = 0,
89746 + .todo_flags_start = 0,
89747 + .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
89748 + }
89749 +};
89750 +
89751 +static void start_unit_callback(void __unused *gcc_data, void __unused *user_data)
89752 +{
89753 + tree fntype;
89754 +
89755 + const_char_ptr_type_node = build_pointer_type(build_type_variant(char_type_node, 1, 0));
89756 +
89757 + // void report_size_overflow(const char *loc_file, unsigned int loc_line, const char *current_func, const char *ssa_var)
89758 + fntype = build_function_type_list(void_type_node,
89759 + const_char_ptr_type_node,
89760 + unsigned_type_node,
89761 + const_char_ptr_type_node,
89762 + const_char_ptr_type_node,
89763 + NULL_TREE);
89764 + report_size_overflow_decl = build_fn_decl("report_size_overflow", fntype);
89765 +
89766 + DECL_ASSEMBLER_NAME(report_size_overflow_decl);
89767 + TREE_PUBLIC(report_size_overflow_decl) = 1;
89768 + DECL_EXTERNAL(report_size_overflow_decl) = 1;
89769 + DECL_ARTIFICIAL(report_size_overflow_decl) = 1;
89770 + TREE_THIS_VOLATILE(report_size_overflow_decl) = 1;
89771 +}
89772 +
89773 +int plugin_init(struct plugin_name_args *plugin_info, struct plugin_gcc_version *version)
89774 +{
89775 + int i;
89776 + const char * const plugin_name = plugin_info->base_name;
89777 + const int argc = plugin_info->argc;
89778 + const struct plugin_argument * const argv = plugin_info->argv;
89779 + bool enable = true;
89780 +
89781 + struct register_pass_info size_overflow_pass_info = {
89782 + .pass = &size_overflow_pass.pass,
89783 + .reference_pass_name = "ssa",
89784 + .ref_pass_instance_number = 1,
89785 + .pos_op = PASS_POS_INSERT_AFTER
89786 + };
89787 +
89788 + if (!plugin_default_version_check(version, &gcc_version)) {
89789 + error(G_("incompatible gcc/plugin versions"));
89790 + return 1;
89791 + }
89792 +
89793 + for (i = 0; i < argc; ++i) {
89794 + if (!strcmp(argv[i].key, "no-size-overflow")) {
89795 + enable = false;
89796 + continue;
89797 + }
89798 + error(G_("unkown option '-fplugin-arg-%s-%s'"), plugin_name, argv[i].key);
89799 + }
89800 +
89801 + register_callback(plugin_name, PLUGIN_INFO, NULL, &size_overflow_plugin_info);
89802 + if (enable) {
89803 + register_callback("start_unit", PLUGIN_START_UNIT, &start_unit_callback, NULL);
89804 + register_callback(plugin_name, PLUGIN_PASS_MANAGER_SETUP, NULL, &size_overflow_pass_info);
89805 + }
89806 + register_callback(plugin_name, PLUGIN_ATTRIBUTES, register_attributes, NULL);
89807 +
89808 + return 0;
89809 +}
89810 diff --git a/tools/gcc/stackleak_plugin.c b/tools/gcc/stackleak_plugin.c
89811 new file mode 100644
89812 index 0000000..38d2014
89813 --- /dev/null
89814 +++ b/tools/gcc/stackleak_plugin.c
89815 @@ -0,0 +1,313 @@
89816 +/*
89817 + * Copyright 2011 by the PaX Team <pageexec@freemail.hu>
89818 + * Licensed under the GPL v2
89819 + *
89820 + * Note: the choice of the license means that the compilation process is
89821 + * NOT 'eligible' as defined by gcc's library exception to the GPL v3,
89822 + * but for the kernel it doesn't matter since it doesn't link against
89823 + * any of the gcc libraries
89824 + *
89825 + * gcc plugin to help implement various PaX features
89826 + *
89827 + * - track lowest stack pointer
89828 + *
89829 + * TODO:
89830 + * - initialize all local variables
89831 + *
89832 + * BUGS:
89833 + * - none known
89834 + */
89835 +#include "gcc-plugin.h"
89836 +#include "config.h"
89837 +#include "system.h"
89838 +#include "coretypes.h"
89839 +#include "tree.h"
89840 +#include "tree-pass.h"
89841 +#include "flags.h"
89842 +#include "intl.h"
89843 +#include "toplev.h"
89844 +#include "plugin.h"
89845 +//#include "expr.h" where are you...
89846 +#include "diagnostic.h"
89847 +#include "plugin-version.h"
89848 +#include "tm.h"
89849 +#include "function.h"
89850 +#include "basic-block.h"
89851 +#include "gimple.h"
89852 +#include "rtl.h"
89853 +#include "emit-rtl.h"
89854 +
89855 +extern void print_gimple_stmt(FILE *, gimple, int, int);
89856 +
89857 +int plugin_is_GPL_compatible;
89858 +
89859 +static int track_frame_size = -1;
89860 +static const char track_function[] = "pax_track_stack";
89861 +static const char check_function[] = "pax_check_alloca";
89862 +static bool init_locals;
89863 +
89864 +static struct plugin_info stackleak_plugin_info = {
89865 + .version = "201203140940",
89866 + .help = "track-lowest-sp=nn\ttrack sp in functions whose frame size is at least nn bytes\n"
89867 +// "initialize-locals\t\tforcibly initialize all stack frames\n"
89868 +};
89869 +
89870 +static bool gate_stackleak_track_stack(void);
89871 +static unsigned int execute_stackleak_tree_instrument(void);
89872 +static unsigned int execute_stackleak_final(void);
89873 +
89874 +static struct gimple_opt_pass stackleak_tree_instrument_pass = {
89875 + .pass = {
89876 + .type = GIMPLE_PASS,
89877 + .name = "stackleak_tree_instrument",
89878 + .gate = gate_stackleak_track_stack,
89879 + .execute = execute_stackleak_tree_instrument,
89880 + .sub = NULL,
89881 + .next = NULL,
89882 + .static_pass_number = 0,
89883 + .tv_id = TV_NONE,
89884 + .properties_required = PROP_gimple_leh | PROP_cfg,
89885 + .properties_provided = 0,
89886 + .properties_destroyed = 0,
89887 + .todo_flags_start = 0, //TODO_verify_ssa | TODO_verify_flow | TODO_verify_stmts,
89888 + .todo_flags_finish = TODO_verify_ssa | TODO_verify_stmts | TODO_dump_func | TODO_update_ssa
89889 + }
89890 +};
89891 +
89892 +static struct rtl_opt_pass stackleak_final_rtl_opt_pass = {
89893 + .pass = {
89894 + .type = RTL_PASS,
89895 + .name = "stackleak_final",
89896 + .gate = gate_stackleak_track_stack,
89897 + .execute = execute_stackleak_final,
89898 + .sub = NULL,
89899 + .next = NULL,
89900 + .static_pass_number = 0,
89901 + .tv_id = TV_NONE,
89902 + .properties_required = 0,
89903 + .properties_provided = 0,
89904 + .properties_destroyed = 0,
89905 + .todo_flags_start = 0,
89906 + .todo_flags_finish = TODO_dump_func
89907 + }
89908 +};
89909 +
89910 +static bool gate_stackleak_track_stack(void)
89911 +{
89912 + return track_frame_size >= 0;
89913 +}
89914 +
89915 +static void stackleak_check_alloca(gimple_stmt_iterator *gsi)
89916 +{
89917 + gimple check_alloca;
89918 + tree fntype, fndecl, alloca_size;
89919 +
89920 + fntype = build_function_type_list(void_type_node, long_unsigned_type_node, NULL_TREE);
89921 + fndecl = build_fn_decl(check_function, fntype);
89922 + DECL_ASSEMBLER_NAME(fndecl); // for LTO
89923 +
89924 + // insert call to void pax_check_alloca(unsigned long size)
89925 + alloca_size = gimple_call_arg(gsi_stmt(*gsi), 0);
89926 + check_alloca = gimple_build_call(fndecl, 1, alloca_size);
89927 + gsi_insert_before(gsi, check_alloca, GSI_SAME_STMT);
89928 +}
89929 +
89930 +static void stackleak_add_instrumentation(gimple_stmt_iterator *gsi)
89931 +{
89932 + gimple track_stack;
89933 + tree fntype, fndecl;
89934 +
89935 + fntype = build_function_type_list(void_type_node, NULL_TREE);
89936 + fndecl = build_fn_decl(track_function, fntype);
89937 + DECL_ASSEMBLER_NAME(fndecl); // for LTO
89938 +
89939 + // insert call to void pax_track_stack(void)
89940 + track_stack = gimple_build_call(fndecl, 0);
89941 + gsi_insert_after(gsi, track_stack, GSI_CONTINUE_LINKING);
89942 +}
89943 +
89944 +#if BUILDING_GCC_VERSION == 4005
89945 +static bool gimple_call_builtin_p(gimple stmt, enum built_in_function code)
89946 +{
89947 + tree fndecl;
89948 +
89949 + if (!is_gimple_call(stmt))
89950 + return false;
89951 + fndecl = gimple_call_fndecl(stmt);
89952 + if (!fndecl)
89953 + return false;
89954 + if (DECL_BUILT_IN_CLASS(fndecl) != BUILT_IN_NORMAL)
89955 + return false;
89956 +// print_node(stderr, "pax", fndecl, 4);
89957 + return DECL_FUNCTION_CODE(fndecl) == code;
89958 +}
89959 +#endif
89960 +
89961 +static bool is_alloca(gimple stmt)
89962 +{
89963 + if (gimple_call_builtin_p(stmt, BUILT_IN_ALLOCA))
89964 + return true;
89965 +
89966 +#if BUILDING_GCC_VERSION >= 4007
89967 + if (gimple_call_builtin_p(stmt, BUILT_IN_ALLOCA_WITH_ALIGN))
89968 + return true;
89969 +#endif
89970 +
89971 + return false;
89972 +}
89973 +
89974 +static unsigned int execute_stackleak_tree_instrument(void)
89975 +{
89976 + basic_block bb, entry_bb;
89977 + bool prologue_instrumented = false, is_leaf = true;
89978 +
89979 + entry_bb = ENTRY_BLOCK_PTR_FOR_FUNCTION(cfun)->next_bb;
89980 +
89981 + // 1. loop through BBs and GIMPLE statements
89982 + FOR_EACH_BB(bb) {
89983 + gimple_stmt_iterator gsi;
89984 +
89985 + for (gsi = gsi_start_bb(bb); !gsi_end_p(gsi); gsi_next(&gsi)) {
89986 + gimple stmt;
89987 +
89988 + stmt = gsi_stmt(gsi);
89989 +
89990 + if (is_gimple_call(stmt))
89991 + is_leaf = false;
89992 +
89993 + // gimple match: align 8 built-in BUILT_IN_NORMAL:BUILT_IN_ALLOCA attributes <tree_list 0xb7576450>
89994 + if (!is_alloca(stmt))
89995 + continue;
89996 +
89997 + // 2. insert stack overflow check before each __builtin_alloca call
89998 + stackleak_check_alloca(&gsi);
89999 +
90000 + // 3. insert track call after each __builtin_alloca call
90001 + stackleak_add_instrumentation(&gsi);
90002 + if (bb == entry_bb)
90003 + prologue_instrumented = true;
90004 + }
90005 + }
90006 +
90007 + // special cases for some bad linux code: taking the address of static inline functions will materialize them
90008 + // but we mustn't instrument some of them as the resulting stack alignment required by the function call ABI
90009 + // will break other assumptions regarding the expected (but not otherwise enforced) register clobbering ABI.
90010 + // case in point: native_save_fl on amd64 when optimized for size clobbers rdx if it were instrumented here.
90011 + if (is_leaf && !TREE_PUBLIC(current_function_decl) && DECL_DECLARED_INLINE_P(current_function_decl))
90012 + return 0;
90013 + if (is_leaf && !strncmp(IDENTIFIER_POINTER(DECL_NAME(current_function_decl)), "_paravirt_", 10))
90014 + return 0;
90015 +
90016 + // 4. insert track call at the beginning
90017 + if (!prologue_instrumented) {
90018 + gimple_stmt_iterator gsi;
90019 +
90020 + bb = split_block_after_labels(ENTRY_BLOCK_PTR)->dest;
90021 + if (dom_info_available_p(CDI_DOMINATORS))
90022 + set_immediate_dominator(CDI_DOMINATORS, bb, ENTRY_BLOCK_PTR);
90023 + gsi = gsi_start_bb(bb);
90024 + stackleak_add_instrumentation(&gsi);
90025 + }
90026 +
90027 + return 0;
90028 +}
90029 +
90030 +static unsigned int execute_stackleak_final(void)
90031 +{
90032 + rtx insn;
90033 +
90034 + if (cfun->calls_alloca)
90035 + return 0;
90036 +
90037 + // keep calls only if function frame is big enough
90038 + if (get_frame_size() >= track_frame_size)
90039 + return 0;
90040 +
90041 + // 1. find pax_track_stack calls
90042 + for (insn = get_insns(); insn; insn = NEXT_INSN(insn)) {
90043 + // 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))
90044 + rtx body;
90045 +
90046 + if (!CALL_P(insn))
90047 + continue;
90048 + body = PATTERN(insn);
90049 + if (GET_CODE(body) != CALL)
90050 + continue;
90051 + body = XEXP(body, 0);
90052 + if (GET_CODE(body) != MEM)
90053 + continue;
90054 + body = XEXP(body, 0);
90055 + if (GET_CODE(body) != SYMBOL_REF)
90056 + continue;
90057 + if (strcmp(XSTR(body, 0), track_function))
90058 + continue;
90059 +// warning(0, "track_frame_size: %d %ld %d", cfun->calls_alloca, get_frame_size(), track_frame_size);
90060 + // 2. delete call
90061 + insn = delete_insn_and_edges(insn);
90062 +#if BUILDING_GCC_VERSION >= 4007
90063 + if (GET_CODE(insn) == NOTE && NOTE_KIND(insn) == NOTE_INSN_CALL_ARG_LOCATION)
90064 + insn = delete_insn_and_edges(insn);
90065 +#endif
90066 + }
90067 +
90068 +// print_simple_rtl(stderr, get_insns());
90069 +// print_rtl(stderr, get_insns());
90070 +// warning(0, "track_frame_size: %d %ld %d", cfun->calls_alloca, get_frame_size(), track_frame_size);
90071 +
90072 + return 0;
90073 +}
90074 +
90075 +int plugin_init(struct plugin_name_args *plugin_info, struct plugin_gcc_version *version)
90076 +{
90077 + const char * const plugin_name = plugin_info->base_name;
90078 + const int argc = plugin_info->argc;
90079 + const struct plugin_argument * const argv = plugin_info->argv;
90080 + int i;
90081 + struct register_pass_info stackleak_tree_instrument_pass_info = {
90082 + .pass = &stackleak_tree_instrument_pass.pass,
90083 +// .reference_pass_name = "tree_profile",
90084 + .reference_pass_name = "optimized",
90085 + .ref_pass_instance_number = 1,
90086 + .pos_op = PASS_POS_INSERT_BEFORE
90087 + };
90088 + struct register_pass_info stackleak_final_pass_info = {
90089 + .pass = &stackleak_final_rtl_opt_pass.pass,
90090 + .reference_pass_name = "final",
90091 + .ref_pass_instance_number = 1,
90092 + .pos_op = PASS_POS_INSERT_BEFORE
90093 + };
90094 +
90095 + if (!plugin_default_version_check(version, &gcc_version)) {
90096 + error(G_("incompatible gcc/plugin versions"));
90097 + return 1;
90098 + }
90099 +
90100 + register_callback(plugin_name, PLUGIN_INFO, NULL, &stackleak_plugin_info);
90101 +
90102 + for (i = 0; i < argc; ++i) {
90103 + if (!strcmp(argv[i].key, "track-lowest-sp")) {
90104 + if (!argv[i].value) {
90105 + error(G_("no value supplied for option '-fplugin-arg-%s-%s'"), plugin_name, argv[i].key);
90106 + continue;
90107 + }
90108 + track_frame_size = atoi(argv[i].value);
90109 + if (argv[i].value[0] < '0' || argv[i].value[0] > '9' || track_frame_size < 0)
90110 + error(G_("invalid option argument '-fplugin-arg-%s-%s=%s'"), plugin_name, argv[i].key, argv[i].value);
90111 + continue;
90112 + }
90113 + if (!strcmp(argv[i].key, "initialize-locals")) {
90114 + if (argv[i].value) {
90115 + error(G_("invalid option argument '-fplugin-arg-%s-%s=%s'"), plugin_name, argv[i].key, argv[i].value);
90116 + continue;
90117 + }
90118 + init_locals = true;
90119 + continue;
90120 + }
90121 + error(G_("unkown option '-fplugin-arg-%s-%s'"), plugin_name, argv[i].key);
90122 + }
90123 +
90124 + register_callback(plugin_name, PLUGIN_PASS_MANAGER_SETUP, NULL, &stackleak_tree_instrument_pass_info);
90125 + register_callback(plugin_name, PLUGIN_PASS_MANAGER_SETUP, NULL, &stackleak_final_pass_info);
90126 +
90127 + return 0;
90128 +}
90129 diff --git a/tools/perf/util/include/asm/alternative-asm.h b/tools/perf/util/include/asm/alternative-asm.h
90130 index 6789d78..4afd019e 100644
90131 --- a/tools/perf/util/include/asm/alternative-asm.h
90132 +++ b/tools/perf/util/include/asm/alternative-asm.h
90133 @@ -5,4 +5,7 @@
90134
90135 #define altinstruction_entry #
90136
90137 + .macro pax_force_retaddr rip=0, reload=0
90138 + .endm
90139 +
90140 #endif
90141 diff --git a/virt/kvm/kvm_main.c b/virt/kvm/kvm_main.c
90142 index d617f69..6b445d2 100644
90143 --- a/virt/kvm/kvm_main.c
90144 +++ b/virt/kvm/kvm_main.c
90145 @@ -75,7 +75,7 @@ LIST_HEAD(vm_list);
90146
90147 static cpumask_var_t cpus_hardware_enabled;
90148 static int kvm_usage_count = 0;
90149 -static atomic_t hardware_enable_failed;
90150 +static atomic_unchecked_t hardware_enable_failed;
90151
90152 struct kmem_cache *kvm_vcpu_cache;
90153 EXPORT_SYMBOL_GPL(kvm_vcpu_cache);
90154 @@ -715,7 +715,7 @@ int __kvm_set_memory_region(struct kvm *kvm,
90155 /* We can read the guest memory with __xxx_user() later on. */
90156 if (user_alloc &&
90157 ((mem->userspace_addr & (PAGE_SIZE - 1)) ||
90158 - !access_ok(VERIFY_WRITE,
90159 + !__access_ok(VERIFY_WRITE,
90160 (void __user *)(unsigned long)mem->userspace_addr,
90161 mem->memory_size)))
90162 goto out;
90163 @@ -2304,7 +2304,7 @@ static void hardware_enable_nolock(void *junk)
90164
90165 if (r) {
90166 cpumask_clear_cpu(cpu, cpus_hardware_enabled);
90167 - atomic_inc(&hardware_enable_failed);
90168 + atomic_inc_unchecked(&hardware_enable_failed);
90169 printk(KERN_INFO "kvm: enabling virtualization on "
90170 "CPU%d failed\n", cpu);
90171 }
90172 @@ -2358,10 +2358,10 @@ static int hardware_enable_all(void)
90173
90174 kvm_usage_count++;
90175 if (kvm_usage_count == 1) {
90176 - atomic_set(&hardware_enable_failed, 0);
90177 + atomic_set_unchecked(&hardware_enable_failed, 0);
90178 on_each_cpu(hardware_enable_nolock, NULL, 1);
90179
90180 - if (atomic_read(&hardware_enable_failed)) {
90181 + if (atomic_read_unchecked(&hardware_enable_failed)) {
90182 hardware_disable_all_nolock();
90183 r = -EBUSY;
90184 }
90185 @@ -2722,7 +2722,7 @@ static void kvm_sched_out(struct preempt_notifier *pn,
90186 kvm_arch_vcpu_put(vcpu);
90187 }
90188
90189 -int kvm_init(void *opaque, unsigned vcpu_size, unsigned vcpu_align,
90190 +int kvm_init(const void *opaque, unsigned vcpu_size, unsigned vcpu_align,
90191 struct module *module)
90192 {
90193 int r;
90194 @@ -2785,7 +2785,7 @@ int kvm_init(void *opaque, unsigned vcpu_size, unsigned vcpu_align,
90195 if (!vcpu_align)
90196 vcpu_align = __alignof__(struct kvm_vcpu);
90197 kvm_vcpu_cache = kmem_cache_create("kvm_vcpu", vcpu_size, vcpu_align,
90198 - 0, NULL);
90199 + SLAB_USERCOPY, NULL);
90200 if (!kvm_vcpu_cache) {
90201 r = -ENOMEM;
90202 goto out_free_3;
90203 @@ -2795,9 +2795,11 @@ int kvm_init(void *opaque, unsigned vcpu_size, unsigned vcpu_align,
90204 if (r)
90205 goto out_free;
90206
90207 - kvm_chardev_ops.owner = module;
90208 - kvm_vm_fops.owner = module;
90209 - kvm_vcpu_fops.owner = module;
90210 + pax_open_kernel();
90211 + *(void **)&kvm_chardev_ops.owner = module;
90212 + *(void **)&kvm_vm_fops.owner = module;
90213 + *(void **)&kvm_vcpu_fops.owner = module;
90214 + pax_close_kernel();
90215
90216 r = misc_register(&kvm_dev);
90217 if (r) {
Unofficial grsecurity patch archive (https://github.com/slashbeast/grsecurity-scrape)