]> git.ipfire.org Git - thirdparty/grsecurity-scrape.git/blob - test/grsecurity-2.2.2-2.6.32.54-201201221635.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.2.2-2.6.32.54-201201221635.patch
1 diff --git a/Documentation/dontdiff b/Documentation/dontdiff
2 index e1efc40..47f0daf 100644
3 --- a/Documentation/dontdiff
4 +++ b/Documentation/dontdiff
5 @@ -1,15 +1,19 @@
6 *.a
7 *.aux
8 *.bin
9 +*.cis
10 *.cpio
11 *.csp
12 +*.dbg
13 *.dsp
14 *.dvi
15 *.elf
16 *.eps
17 *.fw
18 +*.gcno
19 *.gen.S
20 *.gif
21 +*.gmo
22 *.grep
23 *.grp
24 *.gz
25 @@ -38,8 +42,10 @@
26 *.tab.h
27 *.tex
28 *.ver
29 +*.vim
30 *.xml
31 *_MODULES
32 +*_reg_safe.h
33 *_vga16.c
34 *~
35 *.9
36 @@ -49,11 +55,16 @@
37 53c700_d.h
38 CVS
39 ChangeSet
40 +GPATH
41 +GRTAGS
42 +GSYMS
43 +GTAGS
44 Image
45 Kerntypes
46 Module.markers
47 Module.symvers
48 PENDING
49 +PERF*
50 SCCS
51 System.map*
52 TAGS
53 @@ -76,7 +87,11 @@ btfixupprep
54 build
55 bvmlinux
56 bzImage*
57 +capability_names.h
58 +capflags.c
59 classlist.h*
60 +clut_vga16.c
61 +common-cmds.h
62 comp*.log
63 compile.h*
64 conf
65 @@ -84,6 +99,8 @@ config
66 config-*
67 config_data.h*
68 config_data.gz*
69 +config.c
70 +config.tmp
71 conmakehash
72 consolemap_deftbl.c*
73 cpustr.h
74 @@ -97,19 +114,23 @@ elfconfig.h*
75 fixdep
76 fore200e_mkfirm
77 fore200e_pca_fw.c*
78 +gate.lds
79 gconf
80 gen-devlist
81 gen_crc32table
82 gen_init_cpio
83 genksyms
84 *_gray256.c
85 +hash
86 +hid-example
87 ihex2fw
88 ikconfig.h*
89 initramfs_data.cpio
90 +initramfs_data.cpio.bz2
91 initramfs_data.cpio.gz
92 initramfs_list
93 kallsyms
94 -kconfig
95 +kern_constants.h
96 keywords.c
97 ksym.c*
98 ksym.h*
99 @@ -127,13 +148,16 @@ machtypes.h
100 map
101 maui_boot.h
102 mconf
103 +mdp
104 miboot*
105 mk_elfconfig
106 mkboot
107 mkbugboot
108 mkcpustr
109 mkdep
110 +mkpiggy
111 mkprep
112 +mkregtable
113 mktables
114 mktree
115 modpost
116 @@ -149,6 +173,7 @@ patches*
117 pca200e.bin
118 pca200e_ecd.bin2
119 piggy.gz
120 +piggy.S
121 piggyback
122 pnmtologo
123 ppc_defs.h*
124 @@ -157,12 +182,15 @@ qconf
125 raid6altivec*.c
126 raid6int*.c
127 raid6tables.c
128 +regdb.c
129 relocs
130 +rlim_names.h
131 series
132 setup
133 setup.bin
134 setup.elf
135 sImage
136 +slabinfo
137 sm_tbl*
138 split-include
139 syscalltab.h
140 @@ -171,6 +199,7 @@ tftpboot.img
141 timeconst.h
142 times.h*
143 trix_boot.h
144 +user_constants.h
145 utsrelease.h*
146 vdso-syms.lds
147 vdso.lds
148 @@ -186,14 +215,20 @@ version.h*
149 vmlinux
150 vmlinux-*
151 vmlinux.aout
152 +vmlinux.bin.all
153 +vmlinux.bin.bz2
154 vmlinux.lds
155 +vmlinux.relocs
156 +voffset.h
157 vsyscall.lds
158 vsyscall_32.lds
159 wanxlfw.inc
160 uImage
161 unifdef
162 +utsrelease.h
163 wakeup.bin
164 wakeup.elf
165 wakeup.lds
166 zImage*
167 zconf.hash.c
168 +zoffset.h
169 diff --git a/Documentation/kernel-parameters.txt b/Documentation/kernel-parameters.txt
170 index c840e7d..f4c451c 100644
171 --- a/Documentation/kernel-parameters.txt
172 +++ b/Documentation/kernel-parameters.txt
173 @@ -1837,6 +1837,13 @@ and is between 256 and 4096 characters. It is defined in the file
174 the specified number of seconds. This is to be used if
175 your oopses keep scrolling off the screen.
176
177 + pax_nouderef [X86] disables UDEREF. Most likely needed under certain
178 + virtualization environments that don't cope well with the
179 + expand down segment used by UDEREF on X86-32 or the frequent
180 + page table updates on X86-64.
181 +
182 + pax_softmode= 0/1 to disable/enable PaX softmode on boot already.
183 +
184 pcbit= [HW,ISDN]
185
186 pcd. [PARIDE]
187 diff --git a/Makefile b/Makefile
188 index e480d8c..c7b2c86 100644
189 --- a/Makefile
190 +++ b/Makefile
191 @@ -221,8 +221,9 @@ CONFIG_SHELL := $(shell if [ -x "$$BASH" ]; then echo $$BASH; \
192
193 HOSTCC = gcc
194 HOSTCXX = g++
195 -HOSTCFLAGS = -Wall -Wmissing-prototypes -Wstrict-prototypes -O2 -fomit-frame-pointer
196 -HOSTCXXFLAGS = -O2
197 +HOSTCFLAGS = -Wall -W -Wmissing-prototypes -Wstrict-prototypes -Wno-unused-parameter -Wno-missing-field-initializers -O2 -fomit-frame-pointer -fno-delete-null-pointer-checks
198 +HOSTCFLAGS += $(call cc-option, -Wno-empty-body)
199 +HOSTCXXFLAGS = -O2 -Wall -W -fno-delete-null-pointer-checks
200
201 # Decide whether to build built-in, modular, or both.
202 # Normally, just do built-in.
203 @@ -376,8 +377,8 @@ export RCS_TAR_IGNORE := --exclude SCCS --exclude BitKeeper --exclude .svn --exc
204 # Rules shared between *config targets and build targets
205
206 # Basic helpers built in scripts/
207 -PHONY += scripts_basic
208 -scripts_basic:
209 +PHONY += scripts_basic gcc-plugins
210 +scripts_basic: gcc-plugins
211 $(Q)$(MAKE) $(build)=scripts/basic
212
213 # To avoid any implicit rule to kick in, define an empty command.
214 @@ -403,7 +404,7 @@ endif
215 # of make so .config is not included in this case either (for *config).
216
217 no-dot-config-targets := clean mrproper distclean \
218 - cscope TAGS tags help %docs check% \
219 + cscope gtags TAGS tags help %docs check% \
220 include/linux/version.h headers_% \
221 kernelrelease kernelversion
222
223 @@ -526,6 +527,46 @@ else
224 KBUILD_CFLAGS += -O2
225 endif
226
227 +ifndef DISABLE_PAX_PLUGINS
228 +ifeq ($(shell $(CONFIG_SHELL) $(srctree)/scripts/gcc-plugin.sh "$(HOSTCC)" "$(CC)"), y)
229 +ifndef DISABLE_PAX_CONSTIFY_PLUGIN
230 +CONSTIFY_PLUGIN := -fplugin=$(objtree)/tools/gcc/constify_plugin.so -DCONSTIFY_PLUGIN
231 +endif
232 +ifdef CONFIG_PAX_MEMORY_STACKLEAK
233 +STACKLEAK_PLUGIN := -fplugin=$(objtree)/tools/gcc/stackleak_plugin.so -DSTACKLEAK_PLUGIN
234 +STACKLEAK_PLUGIN += -fplugin-arg-stackleak_plugin-track-lowest-sp=100
235 +endif
236 +ifdef CONFIG_KALLOCSTAT_PLUGIN
237 +KALLOCSTAT_PLUGIN := -fplugin=$(objtree)/tools/gcc/kallocstat_plugin.so
238 +endif
239 +ifdef CONFIG_PAX_KERNEXEC_PLUGIN
240 +KERNEXEC_PLUGIN := -fplugin=$(objtree)/tools/gcc/kernexec_plugin.so
241 +KERNEXEC_PLUGIN += -fplugin-arg-kernexec_plugin-method=$(CONFIG_PAX_KERNEXEC_PLUGIN_METHOD)
242 +endif
243 +ifdef CONFIG_CHECKER_PLUGIN
244 +ifeq ($(call cc-ifversion, -ge, 0406, y), y)
245 +CHECKER_PLUGIN := -fplugin=$(objtree)/tools/gcc/checker_plugin.so -DCHECKER_PLUGIN
246 +endif
247 +endif
248 +GCC_PLUGINS := $(CONSTIFY_PLUGIN) $(STACKLEAK_PLUGIN) $(KALLOCSTAT_PLUGIN) $(KERNEXEC_PLUGIN) $(CHECKER_PLUGIN)
249 +export CONSTIFY_PLUGIN STACKLEAK_PLUGIN KERNEXEC_PLUGIN CHECKER_PLUGIN
250 +ifeq ($(KBUILD_EXTMOD),)
251 +gcc-plugins:
252 + $(Q)$(MAKE) $(build)=tools/gcc
253 +else
254 +gcc-plugins: ;
255 +endif
256 +else
257 +gcc-plugins:
258 +ifeq ($(call cc-ifversion, -ge, 0405, y), y)
259 + $(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.))
260 +else
261 + $(Q)echo "warning, your gcc version does not support plugins, you should upgrade it to gcc 4.5 at least"
262 +endif
263 + $(Q)echo "PAX_MEMORY_STACKLEAK and constification will be less secure"
264 +endif
265 +endif
266 +
267 include $(srctree)/arch/$(SRCARCH)/Makefile
268
269 ifneq ($(CONFIG_FRAME_WARN),0)
270 @@ -647,7 +688,7 @@ export mod_strip_cmd
271
272
273 ifeq ($(KBUILD_EXTMOD),)
274 -core-y += kernel/ mm/ fs/ ipc/ security/ crypto/ block/
275 +core-y += kernel/ mm/ fs/ ipc/ security/ crypto/ block/ grsecurity/
276
277 vmlinux-dirs := $(patsubst %/,%,$(filter %/, $(init-y) $(init-m) \
278 $(core-y) $(core-m) $(drivers-y) $(drivers-m) \
279 @@ -868,6 +909,7 @@ vmlinux.o: $(modpost-init) $(vmlinux-main) FORCE
280
281 # The actual objects are generated when descending,
282 # make sure no implicit rule kicks in
283 +$(sort $(vmlinux-init) $(vmlinux-main)) $(vmlinux-lds): KBUILD_CFLAGS += $(GCC_PLUGINS)
284 $(sort $(vmlinux-init) $(vmlinux-main)) $(vmlinux-lds): $(vmlinux-dirs) ;
285
286 # Handle descending into subdirectories listed in $(vmlinux-dirs)
287 @@ -877,7 +919,7 @@ $(sort $(vmlinux-init) $(vmlinux-main)) $(vmlinux-lds): $(vmlinux-dirs) ;
288 # Error messages still appears in the original language
289
290 PHONY += $(vmlinux-dirs)
291 -$(vmlinux-dirs): prepare scripts
292 +$(vmlinux-dirs): gcc-plugins prepare scripts
293 $(Q)$(MAKE) $(build)=$@
294
295 # Build the kernel release string
296 @@ -986,6 +1028,7 @@ prepare0: archprepare FORCE
297 $(Q)$(MAKE) $(build)=. missing-syscalls
298
299 # All the preparing..
300 +prepare: KBUILD_CFLAGS := $(filter-out $(GCC_PLUGINS),$(KBUILD_CFLAGS))
301 prepare: prepare0
302
303 # The asm symlink changes when $(ARCH) changes.
304 @@ -1127,6 +1170,7 @@ all: modules
305 # using awk while concatenating to the final file.
306
307 PHONY += modules
308 +modules: KBUILD_CFLAGS += $(GCC_PLUGINS)
309 modules: $(vmlinux-dirs) $(if $(KBUILD_BUILTIN),vmlinux)
310 $(Q)$(AWK) '!x[$$0]++' $(vmlinux-dirs:%=$(objtree)/%/modules.order) > $(objtree)/modules.order
311 @$(kecho) ' Building modules, stage 2.';
312 @@ -1136,7 +1180,7 @@ modules: $(vmlinux-dirs) $(if $(KBUILD_BUILTIN),vmlinux)
313
314 # Target to prepare building external modules
315 PHONY += modules_prepare
316 -modules_prepare: prepare scripts
317 +modules_prepare: gcc-plugins prepare scripts
318
319 # Target to install modules
320 PHONY += modules_install
321 @@ -1201,7 +1245,7 @@ MRPROPER_FILES += .config .config.old include/asm .version .old_version \
322 include/linux/autoconf.h include/linux/version.h \
323 include/linux/utsrelease.h \
324 include/linux/bounds.h include/asm*/asm-offsets.h \
325 - Module.symvers Module.markers tags TAGS cscope*
326 + Module.symvers Module.markers tags TAGS cscope* GPATH GTAGS GRTAGS GSYMS
327
328 # clean - Delete most, but leave enough to build external modules
329 #
330 @@ -1245,7 +1289,7 @@ distclean: mrproper
331 @find $(srctree) $(RCS_FIND_IGNORE) \
332 \( -name '*.orig' -o -name '*.rej' -o -name '*~' \
333 -o -name '*.bak' -o -name '#*#' -o -name '.*.orig' \
334 - -o -name '.*.rej' -o -size 0 \
335 + -o -name '.*.rej' -o -name '*.so' -o -size 0 \
336 -o -name '*%' -o -name '.*.cmd' -o -name 'core' \) \
337 -type f -print | xargs rm -f
338
339 @@ -1292,6 +1336,7 @@ help:
340 @echo ' modules_prepare - Set up for building external modules'
341 @echo ' tags/TAGS - Generate tags file for editors'
342 @echo ' cscope - Generate cscope index'
343 + @echo ' gtags - Generate GNU GLOBAL index'
344 @echo ' kernelrelease - Output the release version string'
345 @echo ' kernelversion - Output the version stored in Makefile'
346 @echo ' headers_install - Install sanitised kernel headers to INSTALL_HDR_PATH'; \
347 @@ -1393,6 +1438,7 @@ PHONY += $(module-dirs) modules
348 $(module-dirs): crmodverdir $(objtree)/Module.symvers
349 $(Q)$(MAKE) $(build)=$(patsubst _module_%,%,$@)
350
351 +modules: KBUILD_CFLAGS += $(GCC_PLUGINS)
352 modules: $(module-dirs)
353 @$(kecho) ' Building modules, stage 2.';
354 $(Q)$(MAKE) -f $(srctree)/scripts/Makefile.modpost
355 @@ -1448,7 +1494,7 @@ endif # KBUILD_EXTMOD
356 quiet_cmd_tags = GEN $@
357 cmd_tags = $(CONFIG_SHELL) $(srctree)/scripts/tags.sh $@
358
359 -tags TAGS cscope: FORCE
360 +tags TAGS cscope gtags: FORCE
361 $(call cmd,tags)
362
363 # Scripts to check various things for consistency
364 @@ -1513,17 +1559,19 @@ else
365 target-dir = $(if $(KBUILD_EXTMOD),$(dir $<),$(dir $@))
366 endif
367
368 -%.s: %.c prepare scripts FORCE
369 +%.s: KBUILD_CFLAGS += $(GCC_PLUGINS)
370 +%.s: %.c gcc-plugins prepare scripts FORCE
371 $(Q)$(MAKE) $(build)=$(build-dir) $(target-dir)$(notdir $@)
372 %.i: %.c prepare scripts FORCE
373 $(Q)$(MAKE) $(build)=$(build-dir) $(target-dir)$(notdir $@)
374 -%.o: %.c prepare scripts FORCE
375 +%.o: KBUILD_CFLAGS += $(GCC_PLUGINS)
376 +%.o: %.c gcc-plugins prepare scripts FORCE
377 $(Q)$(MAKE) $(build)=$(build-dir) $(target-dir)$(notdir $@)
378 %.lst: %.c prepare scripts FORCE
379 $(Q)$(MAKE) $(build)=$(build-dir) $(target-dir)$(notdir $@)
380 -%.s: %.S prepare scripts FORCE
381 +%.s: %.S gcc-plugins prepare scripts FORCE
382 $(Q)$(MAKE) $(build)=$(build-dir) $(target-dir)$(notdir $@)
383 -%.o: %.S prepare scripts FORCE
384 +%.o: %.S gcc-plugins prepare scripts FORCE
385 $(Q)$(MAKE) $(build)=$(build-dir) $(target-dir)$(notdir $@)
386 %.symtypes: %.c prepare scripts FORCE
387 $(Q)$(MAKE) $(build)=$(build-dir) $(target-dir)$(notdir $@)
388 @@ -1533,11 +1581,13 @@ endif
389 $(cmd_crmodverdir)
390 $(Q)$(MAKE) KBUILD_MODULES=$(if $(CONFIG_MODULES),1) \
391 $(build)=$(build-dir)
392 -%/: prepare scripts FORCE
393 +%/: KBUILD_CFLAGS += $(GCC_PLUGINS)
394 +%/: gcc-plugins prepare scripts FORCE
395 $(cmd_crmodverdir)
396 $(Q)$(MAKE) KBUILD_MODULES=$(if $(CONFIG_MODULES),1) \
397 $(build)=$(build-dir)
398 -%.ko: prepare scripts FORCE
399 +%.ko: KBUILD_CFLAGS += $(GCC_PLUGINS)
400 +%.ko: gcc-plugins prepare scripts FORCE
401 $(cmd_crmodverdir)
402 $(Q)$(MAKE) KBUILD_MODULES=$(if $(CONFIG_MODULES),1) \
403 $(build)=$(build-dir) $(@:.ko=.o)
404 diff --git a/arch/alpha/include/asm/elf.h b/arch/alpha/include/asm/elf.h
405 index 5c75c1b..c82f878 100644
406 --- a/arch/alpha/include/asm/elf.h
407 +++ b/arch/alpha/include/asm/elf.h
408 @@ -91,6 +91,13 @@ typedef elf_fpreg_t elf_fpregset_t[ELF_NFPREG];
409
410 #define ELF_ET_DYN_BASE (TASK_UNMAPPED_BASE + 0x1000000)
411
412 +#ifdef CONFIG_PAX_ASLR
413 +#define PAX_ELF_ET_DYN_BASE (current->personality & ADDR_LIMIT_32BIT ? 0x10000 : 0x120000000UL)
414 +
415 +#define PAX_DELTA_MMAP_LEN (current->personality & ADDR_LIMIT_32BIT ? 14 : 28)
416 +#define PAX_DELTA_STACK_LEN (current->personality & ADDR_LIMIT_32BIT ? 14 : 19)
417 +#endif
418 +
419 /* $0 is set by ld.so to a pointer to a function which might be
420 registered using atexit. This provides a mean for the dynamic
421 linker to call DT_FINI functions for shared libraries that have
422 diff --git a/arch/alpha/include/asm/pgtable.h b/arch/alpha/include/asm/pgtable.h
423 index 3f0c59f..cf1e100 100644
424 --- a/arch/alpha/include/asm/pgtable.h
425 +++ b/arch/alpha/include/asm/pgtable.h
426 @@ -101,6 +101,17 @@ struct vm_area_struct;
427 #define PAGE_SHARED __pgprot(_PAGE_VALID | __ACCESS_BITS)
428 #define PAGE_COPY __pgprot(_PAGE_VALID | __ACCESS_BITS | _PAGE_FOW)
429 #define PAGE_READONLY __pgprot(_PAGE_VALID | __ACCESS_BITS | _PAGE_FOW)
430 +
431 +#ifdef CONFIG_PAX_PAGEEXEC
432 +# define PAGE_SHARED_NOEXEC __pgprot(_PAGE_VALID | __ACCESS_BITS | _PAGE_FOE)
433 +# define PAGE_COPY_NOEXEC __pgprot(_PAGE_VALID | __ACCESS_BITS | _PAGE_FOW | _PAGE_FOE)
434 +# define PAGE_READONLY_NOEXEC __pgprot(_PAGE_VALID | __ACCESS_BITS | _PAGE_FOW | _PAGE_FOE)
435 +#else
436 +# define PAGE_SHARED_NOEXEC PAGE_SHARED
437 +# define PAGE_COPY_NOEXEC PAGE_COPY
438 +# define PAGE_READONLY_NOEXEC PAGE_READONLY
439 +#endif
440 +
441 #define PAGE_KERNEL __pgprot(_PAGE_VALID | _PAGE_ASM | _PAGE_KRE | _PAGE_KWE)
442
443 #define _PAGE_NORMAL(x) __pgprot(_PAGE_VALID | __ACCESS_BITS | (x))
444 diff --git a/arch/alpha/kernel/module.c b/arch/alpha/kernel/module.c
445 index ebc3c89..20cfa63 100644
446 --- a/arch/alpha/kernel/module.c
447 +++ b/arch/alpha/kernel/module.c
448 @@ -182,7 +182,7 @@ apply_relocate_add(Elf64_Shdr *sechdrs, const char *strtab,
449
450 /* The small sections were sorted to the end of the segment.
451 The following should definitely cover them. */
452 - gp = (u64)me->module_core + me->core_size - 0x8000;
453 + gp = (u64)me->module_core_rw + me->core_size_rw - 0x8000;
454 got = sechdrs[me->arch.gotsecindex].sh_addr;
455
456 for (i = 0; i < n; i++) {
457 diff --git a/arch/alpha/kernel/osf_sys.c b/arch/alpha/kernel/osf_sys.c
458 index a94e49c..d71dd44 100644
459 --- a/arch/alpha/kernel/osf_sys.c
460 +++ b/arch/alpha/kernel/osf_sys.c
461 @@ -1172,7 +1172,7 @@ arch_get_unmapped_area_1(unsigned long addr, unsigned long len,
462 /* At this point: (!vma || addr < vma->vm_end). */
463 if (limit - len < addr)
464 return -ENOMEM;
465 - if (!vma || addr + len <= vma->vm_start)
466 + if (check_heap_stack_gap(vma, addr, len))
467 return addr;
468 addr = vma->vm_end;
469 vma = vma->vm_next;
470 @@ -1208,6 +1208,10 @@ arch_get_unmapped_area(struct file *filp, unsigned long addr,
471 merely specific addresses, but regions of memory -- perhaps
472 this feature should be incorporated into all ports? */
473
474 +#ifdef CONFIG_PAX_RANDMMAP
475 + if (!(current->mm->pax_flags & MF_PAX_RANDMMAP))
476 +#endif
477 +
478 if (addr) {
479 addr = arch_get_unmapped_area_1 (PAGE_ALIGN(addr), len, limit);
480 if (addr != (unsigned long) -ENOMEM)
481 @@ -1215,8 +1219,8 @@ arch_get_unmapped_area(struct file *filp, unsigned long addr,
482 }
483
484 /* Next, try allocating at TASK_UNMAPPED_BASE. */
485 - addr = arch_get_unmapped_area_1 (PAGE_ALIGN(TASK_UNMAPPED_BASE),
486 - len, limit);
487 + addr = arch_get_unmapped_area_1 (PAGE_ALIGN(current->mm->mmap_base), len, limit);
488 +
489 if (addr != (unsigned long) -ENOMEM)
490 return addr;
491
492 diff --git a/arch/alpha/mm/fault.c b/arch/alpha/mm/fault.c
493 index 00a31de..2ded0f2 100644
494 --- a/arch/alpha/mm/fault.c
495 +++ b/arch/alpha/mm/fault.c
496 @@ -54,6 +54,124 @@ __load_new_mm_context(struct mm_struct *next_mm)
497 __reload_thread(pcb);
498 }
499
500 +#ifdef CONFIG_PAX_PAGEEXEC
501 +/*
502 + * PaX: decide what to do with offenders (regs->pc = fault address)
503 + *
504 + * returns 1 when task should be killed
505 + * 2 when patched PLT trampoline was detected
506 + * 3 when unpatched PLT trampoline was detected
507 + */
508 +static int pax_handle_fetch_fault(struct pt_regs *regs)
509 +{
510 +
511 +#ifdef CONFIG_PAX_EMUPLT
512 + int err;
513 +
514 + do { /* PaX: patched PLT emulation #1 */
515 + unsigned int ldah, ldq, jmp;
516 +
517 + err = get_user(ldah, (unsigned int *)regs->pc);
518 + err |= get_user(ldq, (unsigned int *)(regs->pc+4));
519 + err |= get_user(jmp, (unsigned int *)(regs->pc+8));
520 +
521 + if (err)
522 + break;
523 +
524 + if ((ldah & 0xFFFF0000U) == 0x277B0000U &&
525 + (ldq & 0xFFFF0000U) == 0xA77B0000U &&
526 + jmp == 0x6BFB0000U)
527 + {
528 + unsigned long r27, addr;
529 + unsigned long addrh = (ldah | 0xFFFFFFFFFFFF0000UL) << 16;
530 + unsigned long addrl = ldq | 0xFFFFFFFFFFFF0000UL;
531 +
532 + addr = regs->r27 + ((addrh ^ 0x80000000UL) + 0x80000000UL) + ((addrl ^ 0x8000UL) + 0x8000UL);
533 + err = get_user(r27, (unsigned long *)addr);
534 + if (err)
535 + break;
536 +
537 + regs->r27 = r27;
538 + regs->pc = r27;
539 + return 2;
540 + }
541 + } while (0);
542 +
543 + do { /* PaX: patched PLT emulation #2 */
544 + unsigned int ldah, lda, br;
545 +
546 + err = get_user(ldah, (unsigned int *)regs->pc);
547 + err |= get_user(lda, (unsigned int *)(regs->pc+4));
548 + err |= get_user(br, (unsigned int *)(regs->pc+8));
549 +
550 + if (err)
551 + break;
552 +
553 + if ((ldah & 0xFFFF0000U) == 0x277B0000U &&
554 + (lda & 0xFFFF0000U) == 0xA77B0000U &&
555 + (br & 0xFFE00000U) == 0xC3E00000U)
556 + {
557 + unsigned long addr = br | 0xFFFFFFFFFFE00000UL;
558 + unsigned long addrh = (ldah | 0xFFFFFFFFFFFF0000UL) << 16;
559 + unsigned long addrl = lda | 0xFFFFFFFFFFFF0000UL;
560 +
561 + regs->r27 += ((addrh ^ 0x80000000UL) + 0x80000000UL) + ((addrl ^ 0x8000UL) + 0x8000UL);
562 + regs->pc += 12 + (((addr ^ 0x00100000UL) + 0x00100000UL) << 2);
563 + return 2;
564 + }
565 + } while (0);
566 +
567 + do { /* PaX: unpatched PLT emulation */
568 + unsigned int br;
569 +
570 + err = get_user(br, (unsigned int *)regs->pc);
571 +
572 + if (!err && (br & 0xFFE00000U) == 0xC3800000U) {
573 + unsigned int br2, ldq, nop, jmp;
574 + unsigned long addr = br | 0xFFFFFFFFFFE00000UL, resolver;
575 +
576 + addr = regs->pc + 4 + (((addr ^ 0x00100000UL) + 0x00100000UL) << 2);
577 + err = get_user(br2, (unsigned int *)addr);
578 + err |= get_user(ldq, (unsigned int *)(addr+4));
579 + err |= get_user(nop, (unsigned int *)(addr+8));
580 + err |= get_user(jmp, (unsigned int *)(addr+12));
581 + err |= get_user(resolver, (unsigned long *)(addr+16));
582 +
583 + if (err)
584 + break;
585 +
586 + if (br2 == 0xC3600000U &&
587 + ldq == 0xA77B000CU &&
588 + nop == 0x47FF041FU &&
589 + jmp == 0x6B7B0000U)
590 + {
591 + regs->r28 = regs->pc+4;
592 + regs->r27 = addr+16;
593 + regs->pc = resolver;
594 + return 3;
595 + }
596 + }
597 + } while (0);
598 +#endif
599 +
600 + return 1;
601 +}
602 +
603 +void pax_report_insns(struct pt_regs *regs, void *pc, void *sp)
604 +{
605 + unsigned long i;
606 +
607 + printk(KERN_ERR "PAX: bytes at PC: ");
608 + for (i = 0; i < 5; i++) {
609 + unsigned int c;
610 + if (get_user(c, (unsigned int *)pc+i))
611 + printk(KERN_CONT "???????? ");
612 + else
613 + printk(KERN_CONT "%08x ", c);
614 + }
615 + printk("\n");
616 +}
617 +#endif
618
619 /*
620 * This routine handles page faults. It determines the address,
621 @@ -131,8 +249,29 @@ do_page_fault(unsigned long address, unsigned long mmcsr,
622 good_area:
623 si_code = SEGV_ACCERR;
624 if (cause < 0) {
625 - if (!(vma->vm_flags & VM_EXEC))
626 + if (!(vma->vm_flags & VM_EXEC)) {
627 +
628 +#ifdef CONFIG_PAX_PAGEEXEC
629 + if (!(mm->pax_flags & MF_PAX_PAGEEXEC) || address != regs->pc)
630 + goto bad_area;
631 +
632 + up_read(&mm->mmap_sem);
633 + switch (pax_handle_fetch_fault(regs)) {
634 +
635 +#ifdef CONFIG_PAX_EMUPLT
636 + case 2:
637 + case 3:
638 + return;
639 +#endif
640 +
641 + }
642 + pax_report_fault(regs, (void *)regs->pc, (void *)rdusp());
643 + do_group_exit(SIGKILL);
644 +#else
645 goto bad_area;
646 +#endif
647 +
648 + }
649 } else if (!cause) {
650 /* Allow reads even for write-only mappings */
651 if (!(vma->vm_flags & (VM_READ | VM_WRITE)))
652 diff --git a/arch/arm/include/asm/elf.h b/arch/arm/include/asm/elf.h
653 index 6aac3f5..265536b 100644
654 --- a/arch/arm/include/asm/elf.h
655 +++ b/arch/arm/include/asm/elf.h
656 @@ -109,7 +109,14 @@ int dump_task_regs(struct task_struct *t, elf_gregset_t *elfregs);
657 the loader. We need to make sure that it is out of the way of the program
658 that it will "exec", and that there is sufficient room for the brk. */
659
660 -#define ELF_ET_DYN_BASE (2 * TASK_SIZE / 3)
661 +#define ELF_ET_DYN_BASE (TASK_SIZE / 3 * 2)
662 +
663 +#ifdef CONFIG_PAX_ASLR
664 +#define PAX_ELF_ET_DYN_BASE 0x00008000UL
665 +
666 +#define PAX_DELTA_MMAP_LEN ((current->personality == PER_LINUX_32BIT) ? 16 : 10)
667 +#define PAX_DELTA_STACK_LEN ((current->personality == PER_LINUX_32BIT) ? 16 : 10)
668 +#endif
669
670 /* When the program starts, a1 contains a pointer to a function to be
671 registered with atexit, as per the SVR4 ABI. A value of 0 means we
672 diff --git a/arch/arm/include/asm/kmap_types.h b/arch/arm/include/asm/kmap_types.h
673 index c019949..388fdd1 100644
674 --- a/arch/arm/include/asm/kmap_types.h
675 +++ b/arch/arm/include/asm/kmap_types.h
676 @@ -19,6 +19,7 @@ enum km_type {
677 KM_SOFTIRQ0,
678 KM_SOFTIRQ1,
679 KM_L2_CACHE,
680 + KM_CLEARPAGE,
681 KM_TYPE_NR
682 };
683
684 diff --git a/arch/arm/include/asm/uaccess.h b/arch/arm/include/asm/uaccess.h
685 index 1d6bd40..fba0cb9 100644
686 --- a/arch/arm/include/asm/uaccess.h
687 +++ b/arch/arm/include/asm/uaccess.h
688 @@ -22,6 +22,8 @@
689 #define VERIFY_READ 0
690 #define VERIFY_WRITE 1
691
692 +extern void check_object_size(const void *ptr, unsigned long n, bool to);
693 +
694 /*
695 * The exception table consists of pairs of addresses: the first is the
696 * address of an instruction that is allowed to fault, and the second is
697 @@ -387,8 +389,23 @@ do { \
698
699
700 #ifdef CONFIG_MMU
701 -extern unsigned long __must_check __copy_from_user(void *to, const void __user *from, unsigned long n);
702 -extern unsigned long __must_check __copy_to_user(void __user *to, const void *from, unsigned long n);
703 +extern unsigned long __must_check ___copy_from_user(void *to, const void __user *from, unsigned long n);
704 +extern unsigned long __must_check ___copy_to_user(void __user *to, const void *from, unsigned long n);
705 +
706 +static inline unsigned long __must_check __copy_from_user(void *to, const void __user *from, unsigned long n)
707 +{
708 + if (!__builtin_constant_p(n))
709 + check_object_size(to, n, false);
710 + return ___copy_from_user(to, from, n);
711 +}
712 +
713 +static inline unsigned long __must_check __copy_to_user(void __user *to, const void *from, unsigned long n)
714 +{
715 + if (!__builtin_constant_p(n))
716 + check_object_size(from, n, true);
717 + return ___copy_to_user(to, from, n);
718 +}
719 +
720 extern unsigned long __must_check __copy_to_user_std(void __user *to, const void *from, unsigned long n);
721 extern unsigned long __must_check __clear_user(void __user *addr, unsigned long n);
722 extern unsigned long __must_check __clear_user_std(void __user *addr, unsigned long n);
723 @@ -403,6 +420,9 @@ extern unsigned long __must_check __strnlen_user(const char __user *s, long n);
724
725 static inline unsigned long __must_check copy_from_user(void *to, const void __user *from, unsigned long n)
726 {
727 + if ((long)n < 0)
728 + return n;
729 +
730 if (access_ok(VERIFY_READ, from, n))
731 n = __copy_from_user(to, from, n);
732 else /* security hole - plug it */
733 @@ -412,6 +432,9 @@ static inline unsigned long __must_check copy_from_user(void *to, const void __u
734
735 static inline unsigned long __must_check copy_to_user(void __user *to, const void *from, unsigned long n)
736 {
737 + if ((long)n < 0)
738 + return n;
739 +
740 if (access_ok(VERIFY_WRITE, to, n))
741 n = __copy_to_user(to, from, n);
742 return n;
743 diff --git a/arch/arm/kernel/armksyms.c b/arch/arm/kernel/armksyms.c
744 index 0e62770..e2c2cd6 100644
745 --- a/arch/arm/kernel/armksyms.c
746 +++ b/arch/arm/kernel/armksyms.c
747 @@ -118,8 +118,8 @@ EXPORT_SYMBOL(__strncpy_from_user);
748 #ifdef CONFIG_MMU
749 EXPORT_SYMBOL(copy_page);
750
751 -EXPORT_SYMBOL(__copy_from_user);
752 -EXPORT_SYMBOL(__copy_to_user);
753 +EXPORT_SYMBOL(___copy_from_user);
754 +EXPORT_SYMBOL(___copy_to_user);
755 EXPORT_SYMBOL(__clear_user);
756
757 EXPORT_SYMBOL(__get_user_1);
758 diff --git a/arch/arm/kernel/kgdb.c b/arch/arm/kernel/kgdb.c
759 index ba8ccfe..2dc34dc 100644
760 --- a/arch/arm/kernel/kgdb.c
761 +++ b/arch/arm/kernel/kgdb.c
762 @@ -190,7 +190,7 @@ void kgdb_arch_exit(void)
763 * and we handle the normal undef case within the do_undefinstr
764 * handler.
765 */
766 -struct kgdb_arch arch_kgdb_ops = {
767 +const struct kgdb_arch arch_kgdb_ops = {
768 #ifndef __ARMEB__
769 .gdb_bpt_instr = {0xfe, 0xde, 0xff, 0xe7}
770 #else /* ! __ARMEB__ */
771 diff --git a/arch/arm/kernel/traps.c b/arch/arm/kernel/traps.c
772 index 3f361a7..6e806e1 100644
773 --- a/arch/arm/kernel/traps.c
774 +++ b/arch/arm/kernel/traps.c
775 @@ -247,6 +247,8 @@ static void __die(const char *str, int err, struct thread_info *thread, struct p
776
777 DEFINE_SPINLOCK(die_lock);
778
779 +extern void gr_handle_kernel_exploit(void);
780 +
781 /*
782 * This function is protected against re-entrancy.
783 */
784 @@ -271,6 +273,8 @@ NORET_TYPE void die(const char *str, struct pt_regs *regs, int err)
785 if (panic_on_oops)
786 panic("Fatal exception");
787
788 + gr_handle_kernel_exploit();
789 +
790 do_exit(SIGSEGV);
791 }
792
793 diff --git a/arch/arm/lib/copy_from_user.S b/arch/arm/lib/copy_from_user.S
794 index e4fe124..0fc246b 100644
795 --- a/arch/arm/lib/copy_from_user.S
796 +++ b/arch/arm/lib/copy_from_user.S
797 @@ -16,7 +16,7 @@
798 /*
799 * Prototype:
800 *
801 - * size_t __copy_from_user(void *to, const void *from, size_t n)
802 + * size_t ___copy_from_user(void *to, const void *from, size_t n)
803 *
804 * Purpose:
805 *
806 @@ -84,11 +84,11 @@
807
808 .text
809
810 -ENTRY(__copy_from_user)
811 +ENTRY(___copy_from_user)
812
813 #include "copy_template.S"
814
815 -ENDPROC(__copy_from_user)
816 +ENDPROC(___copy_from_user)
817
818 .section .fixup,"ax"
819 .align 0
820 diff --git a/arch/arm/lib/copy_to_user.S b/arch/arm/lib/copy_to_user.S
821 index 1a71e15..ac7b258 100644
822 --- a/arch/arm/lib/copy_to_user.S
823 +++ b/arch/arm/lib/copy_to_user.S
824 @@ -16,7 +16,7 @@
825 /*
826 * Prototype:
827 *
828 - * size_t __copy_to_user(void *to, const void *from, size_t n)
829 + * size_t ___copy_to_user(void *to, const void *from, size_t n)
830 *
831 * Purpose:
832 *
833 @@ -88,11 +88,11 @@
834 .text
835
836 ENTRY(__copy_to_user_std)
837 -WEAK(__copy_to_user)
838 +WEAK(___copy_to_user)
839
840 #include "copy_template.S"
841
842 -ENDPROC(__copy_to_user)
843 +ENDPROC(___copy_to_user)
844
845 .section .fixup,"ax"
846 .align 0
847 diff --git a/arch/arm/lib/uaccess.S b/arch/arm/lib/uaccess.S
848 index ffdd274..91017b6 100644
849 --- a/arch/arm/lib/uaccess.S
850 +++ b/arch/arm/lib/uaccess.S
851 @@ -19,7 +19,7 @@
852
853 #define PAGE_SHIFT 12
854
855 -/* Prototype: int __copy_to_user(void *to, const char *from, size_t n)
856 +/* Prototype: int ___copy_to_user(void *to, const char *from, size_t n)
857 * Purpose : copy a block to user memory from kernel memory
858 * Params : to - user memory
859 * : from - kernel memory
860 @@ -39,7 +39,7 @@ USER( strgtbt r3, [r0], #1) @ May fault
861 sub r2, r2, ip
862 b .Lc2u_dest_aligned
863
864 -ENTRY(__copy_to_user)
865 +ENTRY(___copy_to_user)
866 stmfd sp!, {r2, r4 - r7, lr}
867 cmp r2, #4
868 blt .Lc2u_not_enough
869 @@ -277,14 +277,14 @@ USER( strgebt r3, [r0], #1) @ May fault
870 ldrgtb r3, [r1], #0
871 USER( strgtbt r3, [r0], #1) @ May fault
872 b .Lc2u_finished
873 -ENDPROC(__copy_to_user)
874 +ENDPROC(___copy_to_user)
875
876 .section .fixup,"ax"
877 .align 0
878 9001: ldmfd sp!, {r0, r4 - r7, pc}
879 .previous
880
881 -/* Prototype: unsigned long __copy_from_user(void *to,const void *from,unsigned long n);
882 +/* Prototype: unsigned long ___copy_from_user(void *to,const void *from,unsigned long n);
883 * Purpose : copy a block from user memory to kernel memory
884 * Params : to - kernel memory
885 * : from - user memory
886 @@ -303,7 +303,7 @@ USER( ldrgtbt r3, [r1], #1) @ May fault
887 sub r2, r2, ip
888 b .Lcfu_dest_aligned
889
890 -ENTRY(__copy_from_user)
891 +ENTRY(___copy_from_user)
892 stmfd sp!, {r0, r2, r4 - r7, lr}
893 cmp r2, #4
894 blt .Lcfu_not_enough
895 @@ -543,7 +543,7 @@ USER( ldrgebt r3, [r1], #1) @ May fault
896 USER( ldrgtbt r3, [r1], #1) @ May fault
897 strgtb r3, [r0], #1
898 b .Lcfu_finished
899 -ENDPROC(__copy_from_user)
900 +ENDPROC(___copy_from_user)
901
902 .section .fixup,"ax"
903 .align 0
904 diff --git a/arch/arm/lib/uaccess_with_memcpy.c b/arch/arm/lib/uaccess_with_memcpy.c
905 index 6b967ff..67d5b2b 100644
906 --- a/arch/arm/lib/uaccess_with_memcpy.c
907 +++ b/arch/arm/lib/uaccess_with_memcpy.c
908 @@ -97,7 +97,7 @@ out:
909 }
910
911 unsigned long
912 -__copy_to_user(void __user *to, const void *from, unsigned long n)
913 +___copy_to_user(void __user *to, const void *from, unsigned long n)
914 {
915 /*
916 * This test is stubbed out of the main function above to keep
917 diff --git a/arch/arm/mach-at91/pm.c b/arch/arm/mach-at91/pm.c
918 index 4028724..beec230 100644
919 --- a/arch/arm/mach-at91/pm.c
920 +++ b/arch/arm/mach-at91/pm.c
921 @@ -348,7 +348,7 @@ static void at91_pm_end(void)
922 }
923
924
925 -static struct platform_suspend_ops at91_pm_ops ={
926 +static const struct platform_suspend_ops at91_pm_ops ={
927 .valid = at91_pm_valid_state,
928 .begin = at91_pm_begin,
929 .enter = at91_pm_enter,
930 diff --git a/arch/arm/mach-omap1/pm.c b/arch/arm/mach-omap1/pm.c
931 index 5218943..0a34552 100644
932 --- a/arch/arm/mach-omap1/pm.c
933 +++ b/arch/arm/mach-omap1/pm.c
934 @@ -647,7 +647,7 @@ static struct irqaction omap_wakeup_irq = {
935
936
937
938 -static struct platform_suspend_ops omap_pm_ops ={
939 +static const struct platform_suspend_ops omap_pm_ops ={
940 .prepare = omap_pm_prepare,
941 .enter = omap_pm_enter,
942 .finish = omap_pm_finish,
943 diff --git a/arch/arm/mach-omap2/pm24xx.c b/arch/arm/mach-omap2/pm24xx.c
944 index bff5c4e..d4c649b 100644
945 --- a/arch/arm/mach-omap2/pm24xx.c
946 +++ b/arch/arm/mach-omap2/pm24xx.c
947 @@ -326,7 +326,7 @@ static void omap2_pm_finish(void)
948 enable_hlt();
949 }
950
951 -static struct platform_suspend_ops omap_pm_ops = {
952 +static const struct platform_suspend_ops omap_pm_ops = {
953 .prepare = omap2_pm_prepare,
954 .enter = omap2_pm_enter,
955 .finish = omap2_pm_finish,
956 diff --git a/arch/arm/mach-omap2/pm34xx.c b/arch/arm/mach-omap2/pm34xx.c
957 index 8946319..7d3e661 100644
958 --- a/arch/arm/mach-omap2/pm34xx.c
959 +++ b/arch/arm/mach-omap2/pm34xx.c
960 @@ -401,7 +401,7 @@ static void omap3_pm_end(void)
961 return;
962 }
963
964 -static struct platform_suspend_ops omap_pm_ops = {
965 +static const struct platform_suspend_ops omap_pm_ops = {
966 .begin = omap3_pm_begin,
967 .end = omap3_pm_end,
968 .prepare = omap3_pm_prepare,
969 diff --git a/arch/arm/mach-pnx4008/pm.c b/arch/arm/mach-pnx4008/pm.c
970 index b3d8d53..6e68ebc 100644
971 --- a/arch/arm/mach-pnx4008/pm.c
972 +++ b/arch/arm/mach-pnx4008/pm.c
973 @@ -116,7 +116,7 @@ static int pnx4008_pm_valid(suspend_state_t state)
974 (state == PM_SUSPEND_MEM);
975 }
976
977 -static struct platform_suspend_ops pnx4008_pm_ops = {
978 +static const struct platform_suspend_ops pnx4008_pm_ops = {
979 .enter = pnx4008_pm_enter,
980 .valid = pnx4008_pm_valid,
981 };
982 diff --git a/arch/arm/mach-pxa/pm.c b/arch/arm/mach-pxa/pm.c
983 index 7693355..9beb00a 100644
984 --- a/arch/arm/mach-pxa/pm.c
985 +++ b/arch/arm/mach-pxa/pm.c
986 @@ -95,7 +95,7 @@ void pxa_pm_finish(void)
987 pxa_cpu_pm_fns->finish();
988 }
989
990 -static struct platform_suspend_ops pxa_pm_ops = {
991 +static const struct platform_suspend_ops pxa_pm_ops = {
992 .valid = pxa_pm_valid,
993 .enter = pxa_pm_enter,
994 .prepare = pxa_pm_prepare,
995 diff --git a/arch/arm/mach-pxa/sharpsl_pm.c b/arch/arm/mach-pxa/sharpsl_pm.c
996 index 629e05d..06be589 100644
997 --- a/arch/arm/mach-pxa/sharpsl_pm.c
998 +++ b/arch/arm/mach-pxa/sharpsl_pm.c
999 @@ -891,7 +891,7 @@ static void sharpsl_apm_get_power_status(struct apm_power_info *info)
1000 }
1001
1002 #ifdef CONFIG_PM
1003 -static struct platform_suspend_ops sharpsl_pm_ops = {
1004 +static const struct platform_suspend_ops sharpsl_pm_ops = {
1005 .prepare = pxa_pm_prepare,
1006 .finish = pxa_pm_finish,
1007 .enter = corgi_pxa_pm_enter,
1008 diff --git a/arch/arm/mach-sa1100/pm.c b/arch/arm/mach-sa1100/pm.c
1009 index c83fdc8..ab9fc44 100644
1010 --- a/arch/arm/mach-sa1100/pm.c
1011 +++ b/arch/arm/mach-sa1100/pm.c
1012 @@ -120,7 +120,7 @@ unsigned long sleep_phys_sp(void *sp)
1013 return virt_to_phys(sp);
1014 }
1015
1016 -static struct platform_suspend_ops sa11x0_pm_ops = {
1017 +static const struct platform_suspend_ops sa11x0_pm_ops = {
1018 .enter = sa11x0_pm_enter,
1019 .valid = suspend_valid_only_mem,
1020 };
1021 diff --git a/arch/arm/mm/fault.c b/arch/arm/mm/fault.c
1022 index 3191cd6..c0739db 100644
1023 --- a/arch/arm/mm/fault.c
1024 +++ b/arch/arm/mm/fault.c
1025 @@ -166,6 +166,13 @@ __do_user_fault(struct task_struct *tsk, unsigned long addr,
1026 }
1027 #endif
1028
1029 +#ifdef CONFIG_PAX_PAGEEXEC
1030 + if (fsr & FSR_LNX_PF) {
1031 + pax_report_fault(regs, (void *)regs->ARM_pc, (void *)regs->ARM_sp);
1032 + do_group_exit(SIGKILL);
1033 + }
1034 +#endif
1035 +
1036 tsk->thread.address = addr;
1037 tsk->thread.error_code = fsr;
1038 tsk->thread.trap_no = 14;
1039 @@ -357,6 +364,33 @@ do_page_fault(unsigned long addr, unsigned int fsr, struct pt_regs *regs)
1040 }
1041 #endif /* CONFIG_MMU */
1042
1043 +#ifdef CONFIG_PAX_PAGEEXEC
1044 +void pax_report_insns(struct pt_regs *regs, void *pc, void *sp)
1045 +{
1046 + long i;
1047 +
1048 + printk(KERN_ERR "PAX: bytes at PC: ");
1049 + for (i = 0; i < 20; i++) {
1050 + unsigned char c;
1051 + if (get_user(c, (__force unsigned char __user *)pc+i))
1052 + printk(KERN_CONT "?? ");
1053 + else
1054 + printk(KERN_CONT "%02x ", c);
1055 + }
1056 + printk("\n");
1057 +
1058 + printk(KERN_ERR "PAX: bytes at SP-4: ");
1059 + for (i = -1; i < 20; i++) {
1060 + unsigned long c;
1061 + if (get_user(c, (__force unsigned long __user *)sp+i))
1062 + printk(KERN_CONT "???????? ");
1063 + else
1064 + printk(KERN_CONT "%08lx ", c);
1065 + }
1066 + printk("\n");
1067 +}
1068 +#endif
1069 +
1070 /*
1071 * First Level Translation Fault Handler
1072 *
1073 diff --git a/arch/arm/mm/mmap.c b/arch/arm/mm/mmap.c
1074 index f5abc51..7ec524c 100644
1075 --- a/arch/arm/mm/mmap.c
1076 +++ b/arch/arm/mm/mmap.c
1077 @@ -63,6 +63,10 @@ arch_get_unmapped_area(struct file *filp, unsigned long addr,
1078 if (len > TASK_SIZE)
1079 return -ENOMEM;
1080
1081 +#ifdef CONFIG_PAX_RANDMMAP
1082 + if (!(mm->pax_flags & MF_PAX_RANDMMAP))
1083 +#endif
1084 +
1085 if (addr) {
1086 if (do_align)
1087 addr = COLOUR_ALIGN(addr, pgoff);
1088 @@ -70,15 +74,14 @@ arch_get_unmapped_area(struct file *filp, unsigned long addr,
1089 addr = PAGE_ALIGN(addr);
1090
1091 vma = find_vma(mm, addr);
1092 - if (TASK_SIZE - len >= addr &&
1093 - (!vma || addr + len <= vma->vm_start))
1094 + if (TASK_SIZE - len >= addr && check_heap_stack_gap(vma, addr, len))
1095 return addr;
1096 }
1097 if (len > mm->cached_hole_size) {
1098 - start_addr = addr = mm->free_area_cache;
1099 + start_addr = addr = mm->free_area_cache;
1100 } else {
1101 - start_addr = addr = TASK_UNMAPPED_BASE;
1102 - mm->cached_hole_size = 0;
1103 + start_addr = addr = mm->mmap_base;
1104 + mm->cached_hole_size = 0;
1105 }
1106
1107 full_search:
1108 @@ -94,14 +97,14 @@ full_search:
1109 * Start a new search - just in case we missed
1110 * some holes.
1111 */
1112 - if (start_addr != TASK_UNMAPPED_BASE) {
1113 - start_addr = addr = TASK_UNMAPPED_BASE;
1114 + if (start_addr != mm->mmap_base) {
1115 + start_addr = addr = mm->mmap_base;
1116 mm->cached_hole_size = 0;
1117 goto full_search;
1118 }
1119 return -ENOMEM;
1120 }
1121 - if (!vma || addr + len <= vma->vm_start) {
1122 + if (check_heap_stack_gap(vma, addr, len)) {
1123 /*
1124 * Remember the place where we stopped the search:
1125 */
1126 diff --git a/arch/arm/plat-s3c/pm.c b/arch/arm/plat-s3c/pm.c
1127 index 8d97db2..b66cfa5 100644
1128 --- a/arch/arm/plat-s3c/pm.c
1129 +++ b/arch/arm/plat-s3c/pm.c
1130 @@ -355,7 +355,7 @@ static void s3c_pm_finish(void)
1131 s3c_pm_check_cleanup();
1132 }
1133
1134 -static struct platform_suspend_ops s3c_pm_ops = {
1135 +static const struct platform_suspend_ops s3c_pm_ops = {
1136 .enter = s3c_pm_enter,
1137 .prepare = s3c_pm_prepare,
1138 .finish = s3c_pm_finish,
1139 diff --git a/arch/avr32/include/asm/elf.h b/arch/avr32/include/asm/elf.h
1140 index d5d1d41..856e2ed 100644
1141 --- a/arch/avr32/include/asm/elf.h
1142 +++ b/arch/avr32/include/asm/elf.h
1143 @@ -85,8 +85,14 @@ typedef struct user_fpu_struct elf_fpregset_t;
1144 the loader. We need to make sure that it is out of the way of the program
1145 that it will "exec", and that there is sufficient room for the brk. */
1146
1147 -#define ELF_ET_DYN_BASE (2 * TASK_SIZE / 3)
1148 +#define ELF_ET_DYN_BASE (TASK_SIZE / 3 * 2)
1149
1150 +#ifdef CONFIG_PAX_ASLR
1151 +#define PAX_ELF_ET_DYN_BASE 0x00001000UL
1152 +
1153 +#define PAX_DELTA_MMAP_LEN 15
1154 +#define PAX_DELTA_STACK_LEN 15
1155 +#endif
1156
1157 /* This yields a mask that user programs can use to figure out what
1158 instruction set this CPU supports. This could be done in user space,
1159 diff --git a/arch/avr32/include/asm/kmap_types.h b/arch/avr32/include/asm/kmap_types.h
1160 index b7f5c68..556135c 100644
1161 --- a/arch/avr32/include/asm/kmap_types.h
1162 +++ b/arch/avr32/include/asm/kmap_types.h
1163 @@ -22,7 +22,8 @@ D(10) KM_IRQ0,
1164 D(11) KM_IRQ1,
1165 D(12) KM_SOFTIRQ0,
1166 D(13) KM_SOFTIRQ1,
1167 -D(14) KM_TYPE_NR
1168 +D(14) KM_CLEARPAGE,
1169 +D(15) KM_TYPE_NR
1170 };
1171
1172 #undef D
1173 diff --git a/arch/avr32/mach-at32ap/pm.c b/arch/avr32/mach-at32ap/pm.c
1174 index f021edf..32d680e 100644
1175 --- a/arch/avr32/mach-at32ap/pm.c
1176 +++ b/arch/avr32/mach-at32ap/pm.c
1177 @@ -176,7 +176,7 @@ out:
1178 return 0;
1179 }
1180
1181 -static struct platform_suspend_ops avr32_pm_ops = {
1182 +static const struct platform_suspend_ops avr32_pm_ops = {
1183 .valid = avr32_pm_valid_state,
1184 .enter = avr32_pm_enter,
1185 };
1186 diff --git a/arch/avr32/mm/fault.c b/arch/avr32/mm/fault.c
1187 index b61d86d..e292c7f 100644
1188 --- a/arch/avr32/mm/fault.c
1189 +++ b/arch/avr32/mm/fault.c
1190 @@ -41,6 +41,23 @@ static inline int notify_page_fault(struct pt_regs *regs, int trap)
1191
1192 int exception_trace = 1;
1193
1194 +#ifdef CONFIG_PAX_PAGEEXEC
1195 +void pax_report_insns(struct pt_regs *regs, void *pc, void *sp)
1196 +{
1197 + unsigned long i;
1198 +
1199 + printk(KERN_ERR "PAX: bytes at PC: ");
1200 + for (i = 0; i < 20; i++) {
1201 + unsigned char c;
1202 + if (get_user(c, (unsigned char *)pc+i))
1203 + printk(KERN_CONT "???????? ");
1204 + else
1205 + printk(KERN_CONT "%02x ", c);
1206 + }
1207 + printk("\n");
1208 +}
1209 +#endif
1210 +
1211 /*
1212 * This routine handles page faults. It determines the address and the
1213 * problem, and then passes it off to one of the appropriate routines.
1214 @@ -157,6 +174,16 @@ bad_area:
1215 up_read(&mm->mmap_sem);
1216
1217 if (user_mode(regs)) {
1218 +
1219 +#ifdef CONFIG_PAX_PAGEEXEC
1220 + if (mm->pax_flags & MF_PAX_PAGEEXEC) {
1221 + if (ecr == ECR_PROTECTION_X || ecr == ECR_TLB_MISS_X) {
1222 + pax_report_fault(regs, (void *)regs->pc, (void *)regs->sp);
1223 + do_group_exit(SIGKILL);
1224 + }
1225 + }
1226 +#endif
1227 +
1228 if (exception_trace && printk_ratelimit())
1229 printk("%s%s[%d]: segfault at %08lx pc %08lx "
1230 "sp %08lx ecr %lu\n",
1231 diff --git a/arch/blackfin/kernel/kgdb.c b/arch/blackfin/kernel/kgdb.c
1232 index cce79d0..c406c85 100644
1233 --- a/arch/blackfin/kernel/kgdb.c
1234 +++ b/arch/blackfin/kernel/kgdb.c
1235 @@ -428,7 +428,7 @@ int kgdb_arch_handle_exception(int vector, int signo,
1236 return -1; /* this means that we do not want to exit from the handler */
1237 }
1238
1239 -struct kgdb_arch arch_kgdb_ops = {
1240 +const struct kgdb_arch arch_kgdb_ops = {
1241 .gdb_bpt_instr = {0xa1},
1242 #ifdef CONFIG_SMP
1243 .flags = KGDB_HW_BREAKPOINT|KGDB_THR_PROC_SWAP,
1244 diff --git a/arch/blackfin/mach-common/pm.c b/arch/blackfin/mach-common/pm.c
1245 index 8837be4..b2fb413 100644
1246 --- a/arch/blackfin/mach-common/pm.c
1247 +++ b/arch/blackfin/mach-common/pm.c
1248 @@ -255,7 +255,7 @@ static int bfin_pm_enter(suspend_state_t state)
1249 return 0;
1250 }
1251
1252 -struct platform_suspend_ops bfin_pm_ops = {
1253 +const struct platform_suspend_ops bfin_pm_ops = {
1254 .enter = bfin_pm_enter,
1255 .valid = bfin_pm_valid,
1256 };
1257 diff --git a/arch/frv/include/asm/kmap_types.h b/arch/frv/include/asm/kmap_types.h
1258 index f8e16b2..c73ff79 100644
1259 --- a/arch/frv/include/asm/kmap_types.h
1260 +++ b/arch/frv/include/asm/kmap_types.h
1261 @@ -23,6 +23,7 @@ enum km_type {
1262 KM_IRQ1,
1263 KM_SOFTIRQ0,
1264 KM_SOFTIRQ1,
1265 + KM_CLEARPAGE,
1266 KM_TYPE_NR
1267 };
1268
1269 diff --git a/arch/frv/mm/elf-fdpic.c b/arch/frv/mm/elf-fdpic.c
1270 index 385fd30..6c3d97e 100644
1271 --- a/arch/frv/mm/elf-fdpic.c
1272 +++ b/arch/frv/mm/elf-fdpic.c
1273 @@ -73,8 +73,7 @@ unsigned long arch_get_unmapped_area(struct file *filp, unsigned long addr, unsi
1274 if (addr) {
1275 addr = PAGE_ALIGN(addr);
1276 vma = find_vma(current->mm, addr);
1277 - if (TASK_SIZE - len >= addr &&
1278 - (!vma || addr + len <= vma->vm_start))
1279 + if (TASK_SIZE - len >= addr && check_heap_stack_gap(vma, addr, len))
1280 goto success;
1281 }
1282
1283 @@ -89,7 +88,7 @@ unsigned long arch_get_unmapped_area(struct file *filp, unsigned long addr, unsi
1284 for (; vma; vma = vma->vm_next) {
1285 if (addr > limit)
1286 break;
1287 - if (addr + len <= vma->vm_start)
1288 + if (check_heap_stack_gap(vma, addr, len))
1289 goto success;
1290 addr = vma->vm_end;
1291 }
1292 @@ -104,7 +103,7 @@ unsigned long arch_get_unmapped_area(struct file *filp, unsigned long addr, unsi
1293 for (; vma; vma = vma->vm_next) {
1294 if (addr > limit)
1295 break;
1296 - if (addr + len <= vma->vm_start)
1297 + if (check_heap_stack_gap(vma, addr, len))
1298 goto success;
1299 addr = vma->vm_end;
1300 }
1301 diff --git a/arch/ia64/hp/common/hwsw_iommu.c b/arch/ia64/hp/common/hwsw_iommu.c
1302 index e4a80d8..11a7ea1 100644
1303 --- a/arch/ia64/hp/common/hwsw_iommu.c
1304 +++ b/arch/ia64/hp/common/hwsw_iommu.c
1305 @@ -17,7 +17,7 @@
1306 #include <linux/swiotlb.h>
1307 #include <asm/machvec.h>
1308
1309 -extern struct dma_map_ops sba_dma_ops, swiotlb_dma_ops;
1310 +extern const struct dma_map_ops sba_dma_ops, swiotlb_dma_ops;
1311
1312 /* swiotlb declarations & definitions: */
1313 extern int swiotlb_late_init_with_default_size (size_t size);
1314 @@ -33,7 +33,7 @@ static inline int use_swiotlb(struct device *dev)
1315 !sba_dma_ops.dma_supported(dev, *dev->dma_mask);
1316 }
1317
1318 -struct dma_map_ops *hwsw_dma_get_ops(struct device *dev)
1319 +const struct dma_map_ops *hwsw_dma_get_ops(struct device *dev)
1320 {
1321 if (use_swiotlb(dev))
1322 return &swiotlb_dma_ops;
1323 diff --git a/arch/ia64/hp/common/sba_iommu.c b/arch/ia64/hp/common/sba_iommu.c
1324 index 01ae69b..35752fd 100644
1325 --- a/arch/ia64/hp/common/sba_iommu.c
1326 +++ b/arch/ia64/hp/common/sba_iommu.c
1327 @@ -2097,7 +2097,7 @@ static struct acpi_driver acpi_sba_ioc_driver = {
1328 },
1329 };
1330
1331 -extern struct dma_map_ops swiotlb_dma_ops;
1332 +extern const struct dma_map_ops swiotlb_dma_ops;
1333
1334 static int __init
1335 sba_init(void)
1336 @@ -2211,7 +2211,7 @@ sba_page_override(char *str)
1337
1338 __setup("sbapagesize=",sba_page_override);
1339
1340 -struct dma_map_ops sba_dma_ops = {
1341 +const struct dma_map_ops sba_dma_ops = {
1342 .alloc_coherent = sba_alloc_coherent,
1343 .free_coherent = sba_free_coherent,
1344 .map_page = sba_map_page,
1345 diff --git a/arch/ia64/ia32/binfmt_elf32.c b/arch/ia64/ia32/binfmt_elf32.c
1346 index c69552b..c7122f4 100644
1347 --- a/arch/ia64/ia32/binfmt_elf32.c
1348 +++ b/arch/ia64/ia32/binfmt_elf32.c
1349 @@ -45,6 +45,13 @@ randomize_stack_top(unsigned long stack_top);
1350
1351 #define elf_read_implies_exec(ex, have_pt_gnu_stack) (!(have_pt_gnu_stack))
1352
1353 +#ifdef CONFIG_PAX_ASLR
1354 +#define PAX_ELF_ET_DYN_BASE (current->personality == PER_LINUX32 ? 0x08048000UL : 0x4000000000000000UL)
1355 +
1356 +#define PAX_DELTA_MMAP_LEN (current->personality == PER_LINUX32 ? 16 : 3*PAGE_SHIFT - 13)
1357 +#define PAX_DELTA_STACK_LEN (current->personality == PER_LINUX32 ? 16 : 3*PAGE_SHIFT - 13)
1358 +#endif
1359 +
1360 /* Ugly but avoids duplication */
1361 #include "../../../fs/binfmt_elf.c"
1362
1363 diff --git a/arch/ia64/ia32/ia32priv.h b/arch/ia64/ia32/ia32priv.h
1364 index 0f15349..26b3429 100644
1365 --- a/arch/ia64/ia32/ia32priv.h
1366 +++ b/arch/ia64/ia32/ia32priv.h
1367 @@ -296,7 +296,14 @@ typedef struct compat_siginfo {
1368 #define ELF_DATA ELFDATA2LSB
1369 #define ELF_ARCH EM_386
1370
1371 -#define IA32_STACK_TOP IA32_PAGE_OFFSET
1372 +#ifdef CONFIG_PAX_RANDUSTACK
1373 +#define __IA32_DELTA_STACK (current->mm->delta_stack)
1374 +#else
1375 +#define __IA32_DELTA_STACK 0UL
1376 +#endif
1377 +
1378 +#define IA32_STACK_TOP (IA32_PAGE_OFFSET - __IA32_DELTA_STACK)
1379 +
1380 #define IA32_GATE_OFFSET IA32_PAGE_OFFSET
1381 #define IA32_GATE_END IA32_PAGE_OFFSET + PAGE_SIZE
1382
1383 diff --git a/arch/ia64/include/asm/dma-mapping.h b/arch/ia64/include/asm/dma-mapping.h
1384 index 8d3c79c..71b3af6 100644
1385 --- a/arch/ia64/include/asm/dma-mapping.h
1386 +++ b/arch/ia64/include/asm/dma-mapping.h
1387 @@ -12,7 +12,7 @@
1388
1389 #define ARCH_HAS_DMA_GET_REQUIRED_MASK
1390
1391 -extern struct dma_map_ops *dma_ops;
1392 +extern const struct dma_map_ops *dma_ops;
1393 extern struct ia64_machine_vector ia64_mv;
1394 extern void set_iommu_machvec(void);
1395
1396 @@ -24,7 +24,7 @@ extern void machvec_dma_sync_sg(struct device *, struct scatterlist *, int,
1397 static inline void *dma_alloc_coherent(struct device *dev, size_t size,
1398 dma_addr_t *daddr, gfp_t gfp)
1399 {
1400 - struct dma_map_ops *ops = platform_dma_get_ops(dev);
1401 + const struct dma_map_ops *ops = platform_dma_get_ops(dev);
1402 void *caddr;
1403
1404 caddr = ops->alloc_coherent(dev, size, daddr, gfp);
1405 @@ -35,7 +35,7 @@ static inline void *dma_alloc_coherent(struct device *dev, size_t size,
1406 static inline void dma_free_coherent(struct device *dev, size_t size,
1407 void *caddr, dma_addr_t daddr)
1408 {
1409 - struct dma_map_ops *ops = platform_dma_get_ops(dev);
1410 + const struct dma_map_ops *ops = platform_dma_get_ops(dev);
1411 debug_dma_free_coherent(dev, size, caddr, daddr);
1412 ops->free_coherent(dev, size, caddr, daddr);
1413 }
1414 @@ -49,13 +49,13 @@ static inline void dma_free_coherent(struct device *dev, size_t size,
1415
1416 static inline int dma_mapping_error(struct device *dev, dma_addr_t daddr)
1417 {
1418 - struct dma_map_ops *ops = platform_dma_get_ops(dev);
1419 + const struct dma_map_ops *ops = platform_dma_get_ops(dev);
1420 return ops->mapping_error(dev, daddr);
1421 }
1422
1423 static inline int dma_supported(struct device *dev, u64 mask)
1424 {
1425 - struct dma_map_ops *ops = platform_dma_get_ops(dev);
1426 + const struct dma_map_ops *ops = platform_dma_get_ops(dev);
1427 return ops->dma_supported(dev, mask);
1428 }
1429
1430 diff --git a/arch/ia64/include/asm/elf.h b/arch/ia64/include/asm/elf.h
1431 index 86eddee..b116bb4 100644
1432 --- a/arch/ia64/include/asm/elf.h
1433 +++ b/arch/ia64/include/asm/elf.h
1434 @@ -43,6 +43,13 @@
1435 */
1436 #define ELF_ET_DYN_BASE (TASK_UNMAPPED_BASE + 0x800000000UL)
1437
1438 +#ifdef CONFIG_PAX_ASLR
1439 +#define PAX_ELF_ET_DYN_BASE (current->personality == PER_LINUX32 ? 0x08048000UL : 0x4000000000000000UL)
1440 +
1441 +#define PAX_DELTA_MMAP_LEN (current->personality == PER_LINUX32 ? 16 : 3*PAGE_SHIFT - 13)
1442 +#define PAX_DELTA_STACK_LEN (current->personality == PER_LINUX32 ? 16 : 3*PAGE_SHIFT - 13)
1443 +#endif
1444 +
1445 #define PT_IA_64_UNWIND 0x70000001
1446
1447 /* IA-64 relocations: */
1448 diff --git a/arch/ia64/include/asm/machvec.h b/arch/ia64/include/asm/machvec.h
1449 index 367d299..9ad4279 100644
1450 --- a/arch/ia64/include/asm/machvec.h
1451 +++ b/arch/ia64/include/asm/machvec.h
1452 @@ -45,7 +45,7 @@ typedef void ia64_mv_kernel_launch_event_t(void);
1453 /* DMA-mapping interface: */
1454 typedef void ia64_mv_dma_init (void);
1455 typedef u64 ia64_mv_dma_get_required_mask (struct device *);
1456 -typedef struct dma_map_ops *ia64_mv_dma_get_ops(struct device *);
1457 +typedef const struct dma_map_ops *ia64_mv_dma_get_ops(struct device *);
1458
1459 /*
1460 * WARNING: The legacy I/O space is _architected_. Platforms are
1461 @@ -251,7 +251,7 @@ extern void machvec_init_from_cmdline(const char *cmdline);
1462 # endif /* CONFIG_IA64_GENERIC */
1463
1464 extern void swiotlb_dma_init(void);
1465 -extern struct dma_map_ops *dma_get_ops(struct device *);
1466 +extern const struct dma_map_ops *dma_get_ops(struct device *);
1467
1468 /*
1469 * Define default versions so we can extend machvec for new platforms without having
1470 diff --git a/arch/ia64/include/asm/pgtable.h b/arch/ia64/include/asm/pgtable.h
1471 index 8840a69..cdb63d9 100644
1472 --- a/arch/ia64/include/asm/pgtable.h
1473 +++ b/arch/ia64/include/asm/pgtable.h
1474 @@ -12,7 +12,7 @@
1475 * David Mosberger-Tang <davidm@hpl.hp.com>
1476 */
1477
1478 -
1479 +#include <linux/const.h>
1480 #include <asm/mman.h>
1481 #include <asm/page.h>
1482 #include <asm/processor.h>
1483 @@ -143,6 +143,17 @@
1484 #define PAGE_READONLY __pgprot(__ACCESS_BITS | _PAGE_PL_3 | _PAGE_AR_R)
1485 #define PAGE_COPY __pgprot(__ACCESS_BITS | _PAGE_PL_3 | _PAGE_AR_R)
1486 #define PAGE_COPY_EXEC __pgprot(__ACCESS_BITS | _PAGE_PL_3 | _PAGE_AR_RX)
1487 +
1488 +#ifdef CONFIG_PAX_PAGEEXEC
1489 +# define PAGE_SHARED_NOEXEC __pgprot(__ACCESS_BITS | _PAGE_PL_3 | _PAGE_AR_RW)
1490 +# define PAGE_READONLY_NOEXEC __pgprot(__ACCESS_BITS | _PAGE_PL_3 | _PAGE_AR_R)
1491 +# define PAGE_COPY_NOEXEC __pgprot(__ACCESS_BITS | _PAGE_PL_3 | _PAGE_AR_R)
1492 +#else
1493 +# define PAGE_SHARED_NOEXEC PAGE_SHARED
1494 +# define PAGE_READONLY_NOEXEC PAGE_READONLY
1495 +# define PAGE_COPY_NOEXEC PAGE_COPY
1496 +#endif
1497 +
1498 #define PAGE_GATE __pgprot(__ACCESS_BITS | _PAGE_PL_0 | _PAGE_AR_X_RX)
1499 #define PAGE_KERNEL __pgprot(__DIRTY_BITS | _PAGE_PL_0 | _PAGE_AR_RWX)
1500 #define PAGE_KERNELRX __pgprot(__ACCESS_BITS | _PAGE_PL_0 | _PAGE_AR_RX)
1501 diff --git a/arch/ia64/include/asm/spinlock.h b/arch/ia64/include/asm/spinlock.h
1502 index 239ecdc..f94170e 100644
1503 --- a/arch/ia64/include/asm/spinlock.h
1504 +++ b/arch/ia64/include/asm/spinlock.h
1505 @@ -72,7 +72,7 @@ static __always_inline void __ticket_spin_unlock(raw_spinlock_t *lock)
1506 unsigned short *p = (unsigned short *)&lock->lock + 1, tmp;
1507
1508 asm volatile ("ld2.bias %0=[%1]" : "=r"(tmp) : "r"(p));
1509 - ACCESS_ONCE(*p) = (tmp + 2) & ~1;
1510 + ACCESS_ONCE_RW(*p) = (tmp + 2) & ~1;
1511 }
1512
1513 static __always_inline void __ticket_spin_unlock_wait(raw_spinlock_t *lock)
1514 diff --git a/arch/ia64/include/asm/uaccess.h b/arch/ia64/include/asm/uaccess.h
1515 index 449c8c0..432a3d2 100644
1516 --- a/arch/ia64/include/asm/uaccess.h
1517 +++ b/arch/ia64/include/asm/uaccess.h
1518 @@ -257,7 +257,7 @@ __copy_from_user (void *to, const void __user *from, unsigned long count)
1519 const void *__cu_from = (from); \
1520 long __cu_len = (n); \
1521 \
1522 - if (__access_ok(__cu_to, __cu_len, get_fs())) \
1523 + if (__cu_len > 0 && __cu_len <= INT_MAX && __access_ok(__cu_to, __cu_len, get_fs())) \
1524 __cu_len = __copy_user(__cu_to, (__force void __user *) __cu_from, __cu_len); \
1525 __cu_len; \
1526 })
1527 @@ -269,7 +269,7 @@ __copy_from_user (void *to, const void __user *from, unsigned long count)
1528 long __cu_len = (n); \
1529 \
1530 __chk_user_ptr(__cu_from); \
1531 - if (__access_ok(__cu_from, __cu_len, get_fs())) \
1532 + if (__cu_len > 0 && __cu_len <= INT_MAX && __access_ok(__cu_from, __cu_len, get_fs())) \
1533 __cu_len = __copy_user((__force void __user *) __cu_to, __cu_from, __cu_len); \
1534 __cu_len; \
1535 })
1536 diff --git a/arch/ia64/kernel/dma-mapping.c b/arch/ia64/kernel/dma-mapping.c
1537 index f2c1600..969398a 100644
1538 --- a/arch/ia64/kernel/dma-mapping.c
1539 +++ b/arch/ia64/kernel/dma-mapping.c
1540 @@ -3,7 +3,7 @@
1541 /* Set this to 1 if there is a HW IOMMU in the system */
1542 int iommu_detected __read_mostly;
1543
1544 -struct dma_map_ops *dma_ops;
1545 +const struct dma_map_ops *dma_ops;
1546 EXPORT_SYMBOL(dma_ops);
1547
1548 #define PREALLOC_DMA_DEBUG_ENTRIES (1 << 16)
1549 @@ -16,7 +16,7 @@ static int __init dma_init(void)
1550 }
1551 fs_initcall(dma_init);
1552
1553 -struct dma_map_ops *dma_get_ops(struct device *dev)
1554 +const struct dma_map_ops *dma_get_ops(struct device *dev)
1555 {
1556 return dma_ops;
1557 }
1558 diff --git a/arch/ia64/kernel/module.c b/arch/ia64/kernel/module.c
1559 index 1481b0a..e7d38ff 100644
1560 --- a/arch/ia64/kernel/module.c
1561 +++ b/arch/ia64/kernel/module.c
1562 @@ -315,8 +315,7 @@ module_alloc (unsigned long size)
1563 void
1564 module_free (struct module *mod, void *module_region)
1565 {
1566 - if (mod && mod->arch.init_unw_table &&
1567 - module_region == mod->module_init) {
1568 + if (mod && mod->arch.init_unw_table && module_region == mod->module_init_rx) {
1569 unw_remove_unwind_table(mod->arch.init_unw_table);
1570 mod->arch.init_unw_table = NULL;
1571 }
1572 @@ -502,15 +501,39 @@ module_frob_arch_sections (Elf_Ehdr *ehdr, Elf_Shdr *sechdrs, char *secstrings,
1573 }
1574
1575 static inline int
1576 +in_init_rx (const struct module *mod, uint64_t addr)
1577 +{
1578 + return addr - (uint64_t) mod->module_init_rx < mod->init_size_rx;
1579 +}
1580 +
1581 +static inline int
1582 +in_init_rw (const struct module *mod, uint64_t addr)
1583 +{
1584 + return addr - (uint64_t) mod->module_init_rw < mod->init_size_rw;
1585 +}
1586 +
1587 +static inline int
1588 in_init (const struct module *mod, uint64_t addr)
1589 {
1590 - return addr - (uint64_t) mod->module_init < mod->init_size;
1591 + return in_init_rx(mod, addr) || in_init_rw(mod, addr);
1592 +}
1593 +
1594 +static inline int
1595 +in_core_rx (const struct module *mod, uint64_t addr)
1596 +{
1597 + return addr - (uint64_t) mod->module_core_rx < mod->core_size_rx;
1598 +}
1599 +
1600 +static inline int
1601 +in_core_rw (const struct module *mod, uint64_t addr)
1602 +{
1603 + return addr - (uint64_t) mod->module_core_rw < mod->core_size_rw;
1604 }
1605
1606 static inline int
1607 in_core (const struct module *mod, uint64_t addr)
1608 {
1609 - return addr - (uint64_t) mod->module_core < mod->core_size;
1610 + return in_core_rx(mod, addr) || in_core_rw(mod, addr);
1611 }
1612
1613 static inline int
1614 @@ -693,7 +716,14 @@ do_reloc (struct module *mod, uint8_t r_type, Elf64_Sym *sym, uint64_t addend,
1615 break;
1616
1617 case RV_BDREL:
1618 - val -= (uint64_t) (in_init(mod, val) ? mod->module_init : mod->module_core);
1619 + if (in_init_rx(mod, val))
1620 + val -= (uint64_t) mod->module_init_rx;
1621 + else if (in_init_rw(mod, val))
1622 + val -= (uint64_t) mod->module_init_rw;
1623 + else if (in_core_rx(mod, val))
1624 + val -= (uint64_t) mod->module_core_rx;
1625 + else if (in_core_rw(mod, val))
1626 + val -= (uint64_t) mod->module_core_rw;
1627 break;
1628
1629 case RV_LTV:
1630 @@ -828,15 +858,15 @@ apply_relocate_add (Elf64_Shdr *sechdrs, const char *strtab, unsigned int symind
1631 * addresses have been selected...
1632 */
1633 uint64_t gp;
1634 - if (mod->core_size > MAX_LTOFF)
1635 + if (mod->core_size_rx + mod->core_size_rw > MAX_LTOFF)
1636 /*
1637 * This takes advantage of fact that SHF_ARCH_SMALL gets allocated
1638 * at the end of the module.
1639 */
1640 - gp = mod->core_size - MAX_LTOFF / 2;
1641 + gp = mod->core_size_rx + mod->core_size_rw - MAX_LTOFF / 2;
1642 else
1643 - gp = mod->core_size / 2;
1644 - gp = (uint64_t) mod->module_core + ((gp + 7) & -8);
1645 + gp = (mod->core_size_rx + mod->core_size_rw) / 2;
1646 + gp = (uint64_t) mod->module_core_rx + ((gp + 7) & -8);
1647 mod->arch.gp = gp;
1648 DEBUGP("%s: placing gp at 0x%lx\n", __func__, gp);
1649 }
1650 diff --git a/arch/ia64/kernel/pci-dma.c b/arch/ia64/kernel/pci-dma.c
1651 index f6b1ff0..de773fb 100644
1652 --- a/arch/ia64/kernel/pci-dma.c
1653 +++ b/arch/ia64/kernel/pci-dma.c
1654 @@ -43,7 +43,7 @@ struct device fallback_dev = {
1655 .dma_mask = &fallback_dev.coherent_dma_mask,
1656 };
1657
1658 -extern struct dma_map_ops intel_dma_ops;
1659 +extern const struct dma_map_ops intel_dma_ops;
1660
1661 static int __init pci_iommu_init(void)
1662 {
1663 @@ -96,15 +96,34 @@ int iommu_dma_supported(struct device *dev, u64 mask)
1664 }
1665 EXPORT_SYMBOL(iommu_dma_supported);
1666
1667 +extern void *intel_alloc_coherent(struct device *hwdev, size_t size, dma_addr_t *dma_handle, gfp_t flags);
1668 +extern void intel_free_coherent(struct device *hwdev, size_t size, void *vaddr, dma_addr_t dma_handle);
1669 +extern int intel_map_sg(struct device *hwdev, struct scatterlist *sglist, int nelems, enum dma_data_direction dir, struct dma_attrs *attrs);
1670 +extern void intel_unmap_sg(struct device *hwdev, struct scatterlist *sglist, int nelems, enum dma_data_direction dir, struct dma_attrs *attrs);
1671 +extern dma_addr_t intel_map_page(struct device *dev, struct page *page, unsigned long offset, size_t size, enum dma_data_direction dir, struct dma_attrs *attrs);
1672 +extern void intel_unmap_page(struct device *dev, dma_addr_t dev_addr, size_t size, enum dma_data_direction dir, struct dma_attrs *attrs);
1673 +extern int intel_mapping_error(struct device *dev, dma_addr_t dma_addr);
1674 +
1675 +static const struct dma_map_ops intel_iommu_dma_ops = {
1676 + /* from drivers/pci/intel-iommu.c:intel_dma_ops */
1677 + .alloc_coherent = intel_alloc_coherent,
1678 + .free_coherent = intel_free_coherent,
1679 + .map_sg = intel_map_sg,
1680 + .unmap_sg = intel_unmap_sg,
1681 + .map_page = intel_map_page,
1682 + .unmap_page = intel_unmap_page,
1683 + .mapping_error = intel_mapping_error,
1684 +
1685 + .sync_single_for_cpu = machvec_dma_sync_single,
1686 + .sync_sg_for_cpu = machvec_dma_sync_sg,
1687 + .sync_single_for_device = machvec_dma_sync_single,
1688 + .sync_sg_for_device = machvec_dma_sync_sg,
1689 + .dma_supported = iommu_dma_supported,
1690 +};
1691 +
1692 void __init pci_iommu_alloc(void)
1693 {
1694 - dma_ops = &intel_dma_ops;
1695 -
1696 - dma_ops->sync_single_for_cpu = machvec_dma_sync_single;
1697 - dma_ops->sync_sg_for_cpu = machvec_dma_sync_sg;
1698 - dma_ops->sync_single_for_device = machvec_dma_sync_single;
1699 - dma_ops->sync_sg_for_device = machvec_dma_sync_sg;
1700 - dma_ops->dma_supported = iommu_dma_supported;
1701 + dma_ops = &intel_iommu_dma_ops;
1702
1703 /*
1704 * The order of these functions is important for
1705 diff --git a/arch/ia64/kernel/pci-swiotlb.c b/arch/ia64/kernel/pci-swiotlb.c
1706 index 285aae8..61dbab6 100644
1707 --- a/arch/ia64/kernel/pci-swiotlb.c
1708 +++ b/arch/ia64/kernel/pci-swiotlb.c
1709 @@ -21,7 +21,7 @@ static void *ia64_swiotlb_alloc_coherent(struct device *dev, size_t size,
1710 return swiotlb_alloc_coherent(dev, size, dma_handle, gfp);
1711 }
1712
1713 -struct dma_map_ops swiotlb_dma_ops = {
1714 +const struct dma_map_ops swiotlb_dma_ops = {
1715 .alloc_coherent = ia64_swiotlb_alloc_coherent,
1716 .free_coherent = swiotlb_free_coherent,
1717 .map_page = swiotlb_map_page,
1718 diff --git a/arch/ia64/kernel/sys_ia64.c b/arch/ia64/kernel/sys_ia64.c
1719 index 609d500..7dde2a8 100644
1720 --- a/arch/ia64/kernel/sys_ia64.c
1721 +++ b/arch/ia64/kernel/sys_ia64.c
1722 @@ -43,6 +43,13 @@ arch_get_unmapped_area (struct file *filp, unsigned long addr, unsigned long len
1723 if (REGION_NUMBER(addr) == RGN_HPAGE)
1724 addr = 0;
1725 #endif
1726 +
1727 +#ifdef CONFIG_PAX_RANDMMAP
1728 + if (mm->pax_flags & MF_PAX_RANDMMAP)
1729 + addr = mm->free_area_cache;
1730 + else
1731 +#endif
1732 +
1733 if (!addr)
1734 addr = mm->free_area_cache;
1735
1736 @@ -61,14 +68,14 @@ arch_get_unmapped_area (struct file *filp, unsigned long addr, unsigned long len
1737 for (vma = find_vma(mm, addr); ; vma = vma->vm_next) {
1738 /* At this point: (!vma || addr < vma->vm_end). */
1739 if (TASK_SIZE - len < addr || RGN_MAP_LIMIT - len < REGION_OFFSET(addr)) {
1740 - if (start_addr != TASK_UNMAPPED_BASE) {
1741 + if (start_addr != mm->mmap_base) {
1742 /* Start a new search --- just in case we missed some holes. */
1743 - addr = TASK_UNMAPPED_BASE;
1744 + addr = mm->mmap_base;
1745 goto full_search;
1746 }
1747 return -ENOMEM;
1748 }
1749 - if (!vma || addr + len <= vma->vm_start) {
1750 + if (check_heap_stack_gap(vma, addr, len)) {
1751 /* Remember the address where we stopped this search: */
1752 mm->free_area_cache = addr + len;
1753 return addr;
1754 diff --git a/arch/ia64/kernel/topology.c b/arch/ia64/kernel/topology.c
1755 index 8f06035..b3a5818 100644
1756 --- a/arch/ia64/kernel/topology.c
1757 +++ b/arch/ia64/kernel/topology.c
1758 @@ -282,7 +282,7 @@ static ssize_t cache_show(struct kobject * kobj, struct attribute * attr, char *
1759 return ret;
1760 }
1761
1762 -static struct sysfs_ops cache_sysfs_ops = {
1763 +static const struct sysfs_ops cache_sysfs_ops = {
1764 .show = cache_show
1765 };
1766
1767 diff --git a/arch/ia64/kernel/vmlinux.lds.S b/arch/ia64/kernel/vmlinux.lds.S
1768 index 0a0c77b..8e55a81 100644
1769 --- a/arch/ia64/kernel/vmlinux.lds.S
1770 +++ b/arch/ia64/kernel/vmlinux.lds.S
1771 @@ -190,7 +190,7 @@ SECTIONS
1772 /* Per-cpu data: */
1773 . = ALIGN(PERCPU_PAGE_SIZE);
1774 PERCPU_VADDR(PERCPU_ADDR, :percpu)
1775 - __phys_per_cpu_start = __per_cpu_load;
1776 + __phys_per_cpu_start = per_cpu_load;
1777 . = __phys_per_cpu_start + PERCPU_PAGE_SIZE; /* ensure percpu data fits
1778 * into percpu page size
1779 */
1780 diff --git a/arch/ia64/mm/fault.c b/arch/ia64/mm/fault.c
1781 index 19261a9..1611b7a 100644
1782 --- a/arch/ia64/mm/fault.c
1783 +++ b/arch/ia64/mm/fault.c
1784 @@ -72,6 +72,23 @@ mapped_kernel_page_is_present (unsigned long address)
1785 return pte_present(pte);
1786 }
1787
1788 +#ifdef CONFIG_PAX_PAGEEXEC
1789 +void pax_report_insns(struct pt_regs *regs, void *pc, void *sp)
1790 +{
1791 + unsigned long i;
1792 +
1793 + printk(KERN_ERR "PAX: bytes at PC: ");
1794 + for (i = 0; i < 8; i++) {
1795 + unsigned int c;
1796 + if (get_user(c, (unsigned int *)pc+i))
1797 + printk(KERN_CONT "???????? ");
1798 + else
1799 + printk(KERN_CONT "%08x ", c);
1800 + }
1801 + printk("\n");
1802 +}
1803 +#endif
1804 +
1805 void __kprobes
1806 ia64_do_page_fault (unsigned long address, unsigned long isr, struct pt_regs *regs)
1807 {
1808 @@ -145,9 +162,23 @@ ia64_do_page_fault (unsigned long address, unsigned long isr, struct pt_regs *re
1809 mask = ( (((isr >> IA64_ISR_X_BIT) & 1UL) << VM_EXEC_BIT)
1810 | (((isr >> IA64_ISR_W_BIT) & 1UL) << VM_WRITE_BIT));
1811
1812 - if ((vma->vm_flags & mask) != mask)
1813 + if ((vma->vm_flags & mask) != mask) {
1814 +
1815 +#ifdef CONFIG_PAX_PAGEEXEC
1816 + if (!(vma->vm_flags & VM_EXEC) && (mask & VM_EXEC)) {
1817 + if (!(mm->pax_flags & MF_PAX_PAGEEXEC) || address != regs->cr_iip)
1818 + goto bad_area;
1819 +
1820 + up_read(&mm->mmap_sem);
1821 + pax_report_fault(regs, (void *)regs->cr_iip, (void *)regs->r12);
1822 + do_group_exit(SIGKILL);
1823 + }
1824 +#endif
1825 +
1826 goto bad_area;
1827
1828 + }
1829 +
1830 survive:
1831 /*
1832 * If for any reason at all we couldn't handle the fault, make
1833 diff --git a/arch/ia64/mm/hugetlbpage.c b/arch/ia64/mm/hugetlbpage.c
1834 index b0f6157..a082bbc 100644
1835 --- a/arch/ia64/mm/hugetlbpage.c
1836 +++ b/arch/ia64/mm/hugetlbpage.c
1837 @@ -172,7 +172,7 @@ unsigned long hugetlb_get_unmapped_area(struct file *file, unsigned long addr, u
1838 /* At this point: (!vmm || addr < vmm->vm_end). */
1839 if (REGION_OFFSET(addr) + len > RGN_MAP_LIMIT)
1840 return -ENOMEM;
1841 - if (!vmm || (addr + len) <= vmm->vm_start)
1842 + if (check_heap_stack_gap(vmm, addr, len))
1843 return addr;
1844 addr = ALIGN(vmm->vm_end, HPAGE_SIZE);
1845 }
1846 diff --git a/arch/ia64/mm/init.c b/arch/ia64/mm/init.c
1847 index 1857766..05cc6a3 100644
1848 --- a/arch/ia64/mm/init.c
1849 +++ b/arch/ia64/mm/init.c
1850 @@ -122,6 +122,19 @@ ia64_init_addr_space (void)
1851 vma->vm_start = current->thread.rbs_bot & PAGE_MASK;
1852 vma->vm_end = vma->vm_start + PAGE_SIZE;
1853 vma->vm_flags = VM_DATA_DEFAULT_FLAGS|VM_GROWSUP|VM_ACCOUNT;
1854 +
1855 +#ifdef CONFIG_PAX_PAGEEXEC
1856 + if (current->mm->pax_flags & MF_PAX_PAGEEXEC) {
1857 + vma->vm_flags &= ~VM_EXEC;
1858 +
1859 +#ifdef CONFIG_PAX_MPROTECT
1860 + if (current->mm->pax_flags & MF_PAX_MPROTECT)
1861 + vma->vm_flags &= ~VM_MAYEXEC;
1862 +#endif
1863 +
1864 + }
1865 +#endif
1866 +
1867 vma->vm_page_prot = vm_get_page_prot(vma->vm_flags);
1868 down_write(&current->mm->mmap_sem);
1869 if (insert_vm_struct(current->mm, vma)) {
1870 diff --git a/arch/ia64/sn/pci/pci_dma.c b/arch/ia64/sn/pci/pci_dma.c
1871 index 98b6849..8046766 100644
1872 --- a/arch/ia64/sn/pci/pci_dma.c
1873 +++ b/arch/ia64/sn/pci/pci_dma.c
1874 @@ -464,7 +464,7 @@ int sn_pci_legacy_write(struct pci_bus *bus, u16 port, u32 val, u8 size)
1875 return ret;
1876 }
1877
1878 -static struct dma_map_ops sn_dma_ops = {
1879 +static const struct dma_map_ops sn_dma_ops = {
1880 .alloc_coherent = sn_dma_alloc_coherent,
1881 .free_coherent = sn_dma_free_coherent,
1882 .map_page = sn_dma_map_page,
1883 diff --git a/arch/m32r/lib/usercopy.c b/arch/m32r/lib/usercopy.c
1884 index 82abd15..d95ae5d 100644
1885 --- a/arch/m32r/lib/usercopy.c
1886 +++ b/arch/m32r/lib/usercopy.c
1887 @@ -14,6 +14,9 @@
1888 unsigned long
1889 __generic_copy_to_user(void __user *to, const void *from, unsigned long n)
1890 {
1891 + if ((long)n < 0)
1892 + return n;
1893 +
1894 prefetch(from);
1895 if (access_ok(VERIFY_WRITE, to, n))
1896 __copy_user(to,from,n);
1897 @@ -23,6 +26,9 @@ __generic_copy_to_user(void __user *to, const void *from, unsigned long n)
1898 unsigned long
1899 __generic_copy_from_user(void *to, const void __user *from, unsigned long n)
1900 {
1901 + if ((long)n < 0)
1902 + return n;
1903 +
1904 prefetchw(to);
1905 if (access_ok(VERIFY_READ, from, n))
1906 __copy_user_zeroing(to,from,n);
1907 diff --git a/arch/mips/Makefile b/arch/mips/Makefile
1908 index 77f5021..2b1db8a 100644
1909 --- a/arch/mips/Makefile
1910 +++ b/arch/mips/Makefile
1911 @@ -51,6 +51,8 @@ endif
1912 cflags-y := -ffunction-sections
1913 cflags-y += $(call cc-option, -mno-check-zero-division)
1914
1915 +cflags-y += -Wno-sign-compare -Wno-extra
1916 +
1917 ifdef CONFIG_32BIT
1918 ld-emul = $(32bit-emul)
1919 vmlinux-32 = vmlinux
1920 diff --git a/arch/mips/alchemy/devboards/pm.c b/arch/mips/alchemy/devboards/pm.c
1921 index 632f986..fd0378d 100644
1922 --- a/arch/mips/alchemy/devboards/pm.c
1923 +++ b/arch/mips/alchemy/devboards/pm.c
1924 @@ -78,7 +78,7 @@ static void db1x_pm_end(void)
1925
1926 }
1927
1928 -static struct platform_suspend_ops db1x_pm_ops = {
1929 +static const struct platform_suspend_ops db1x_pm_ops = {
1930 .valid = suspend_valid_only_mem,
1931 .begin = db1x_pm_begin,
1932 .enter = db1x_pm_enter,
1933 diff --git a/arch/mips/include/asm/elf.h b/arch/mips/include/asm/elf.h
1934 index 7990694..4e93acf 100644
1935 --- a/arch/mips/include/asm/elf.h
1936 +++ b/arch/mips/include/asm/elf.h
1937 @@ -368,4 +368,11 @@ extern int dump_task_fpu(struct task_struct *, elf_fpregset_t *);
1938 #define ELF_ET_DYN_BASE (TASK_SIZE / 3 * 2)
1939 #endif
1940
1941 +#ifdef CONFIG_PAX_ASLR
1942 +#define PAX_ELF_ET_DYN_BASE (test_thread_flag(TIF_32BIT_ADDR) ? 0x00400000UL : 0x00400000UL)
1943 +
1944 +#define PAX_DELTA_MMAP_LEN (test_thread_flag(TIF_32BIT_ADDR) ? 27-PAGE_SHIFT : 36-PAGE_SHIFT)
1945 +#define PAX_DELTA_STACK_LEN (test_thread_flag(TIF_32BIT_ADDR) ? 27-PAGE_SHIFT : 36-PAGE_SHIFT)
1946 +#endif
1947 +
1948 #endif /* _ASM_ELF_H */
1949 diff --git a/arch/mips/include/asm/page.h b/arch/mips/include/asm/page.h
1950 index f266295..627cfff 100644
1951 --- a/arch/mips/include/asm/page.h
1952 +++ b/arch/mips/include/asm/page.h
1953 @@ -93,7 +93,7 @@ extern void copy_user_highpage(struct page *to, struct page *from,
1954 #ifdef CONFIG_CPU_MIPS32
1955 typedef struct { unsigned long pte_low, pte_high; } pte_t;
1956 #define pte_val(x) ((x).pte_low | ((unsigned long long)(x).pte_high << 32))
1957 - #define __pte(x) ({ pte_t __pte = {(x), ((unsigned long long)(x)) >> 32}; __pte; })
1958 + #define __pte(x) ({ pte_t __pte = {(x), (x) >> 32}; __pte; })
1959 #else
1960 typedef struct { unsigned long long pte; } pte_t;
1961 #define pte_val(x) ((x).pte)
1962 diff --git a/arch/mips/include/asm/reboot.h b/arch/mips/include/asm/reboot.h
1963 index e48c0bf..f3acf65 100644
1964 --- a/arch/mips/include/asm/reboot.h
1965 +++ b/arch/mips/include/asm/reboot.h
1966 @@ -9,7 +9,7 @@
1967 #ifndef _ASM_REBOOT_H
1968 #define _ASM_REBOOT_H
1969
1970 -extern void (*_machine_restart)(char *command);
1971 -extern void (*_machine_halt)(void);
1972 +extern void (*__noreturn _machine_restart)(char *command);
1973 +extern void (*__noreturn _machine_halt)(void);
1974
1975 #endif /* _ASM_REBOOT_H */
1976 diff --git a/arch/mips/include/asm/system.h b/arch/mips/include/asm/system.h
1977 index 83b5509..9fa24a23 100644
1978 --- a/arch/mips/include/asm/system.h
1979 +++ b/arch/mips/include/asm/system.h
1980 @@ -230,6 +230,6 @@ extern void per_cpu_trap_init(void);
1981 */
1982 #define __ARCH_WANT_UNLOCKED_CTXSW
1983
1984 -extern unsigned long arch_align_stack(unsigned long sp);
1985 +#define arch_align_stack(x) ((x) & ~0xfUL)
1986
1987 #endif /* _ASM_SYSTEM_H */
1988 diff --git a/arch/mips/kernel/binfmt_elfn32.c b/arch/mips/kernel/binfmt_elfn32.c
1989 index 9fdd8bc..fcf9d68 100644
1990 --- a/arch/mips/kernel/binfmt_elfn32.c
1991 +++ b/arch/mips/kernel/binfmt_elfn32.c
1992 @@ -50,6 +50,13 @@ typedef elf_fpreg_t elf_fpregset_t[ELF_NFPREG];
1993 #undef ELF_ET_DYN_BASE
1994 #define ELF_ET_DYN_BASE (TASK32_SIZE / 3 * 2)
1995
1996 +#ifdef CONFIG_PAX_ASLR
1997 +#define PAX_ELF_ET_DYN_BASE (test_thread_flag(TIF_32BIT_ADDR) ? 0x00400000UL : 0x00400000UL)
1998 +
1999 +#define PAX_DELTA_MMAP_LEN (test_thread_flag(TIF_32BIT_ADDR) ? 27-PAGE_SHIFT : 36-PAGE_SHIFT)
2000 +#define PAX_DELTA_STACK_LEN (test_thread_flag(TIF_32BIT_ADDR) ? 27-PAGE_SHIFT : 36-PAGE_SHIFT)
2001 +#endif
2002 +
2003 #include <asm/processor.h>
2004 #include <linux/module.h>
2005 #include <linux/elfcore.h>
2006 diff --git a/arch/mips/kernel/binfmt_elfo32.c b/arch/mips/kernel/binfmt_elfo32.c
2007 index ff44823..cf0b48a 100644
2008 --- a/arch/mips/kernel/binfmt_elfo32.c
2009 +++ b/arch/mips/kernel/binfmt_elfo32.c
2010 @@ -52,6 +52,13 @@ typedef elf_fpreg_t elf_fpregset_t[ELF_NFPREG];
2011 #undef ELF_ET_DYN_BASE
2012 #define ELF_ET_DYN_BASE (TASK32_SIZE / 3 * 2)
2013
2014 +#ifdef CONFIG_PAX_ASLR
2015 +#define PAX_ELF_ET_DYN_BASE (test_thread_flag(TIF_32BIT_ADDR) ? 0x00400000UL : 0x00400000UL)
2016 +
2017 +#define PAX_DELTA_MMAP_LEN (test_thread_flag(TIF_32BIT_ADDR) ? 27-PAGE_SHIFT : 36-PAGE_SHIFT)
2018 +#define PAX_DELTA_STACK_LEN (test_thread_flag(TIF_32BIT_ADDR) ? 27-PAGE_SHIFT : 36-PAGE_SHIFT)
2019 +#endif
2020 +
2021 #include <asm/processor.h>
2022
2023 /*
2024 diff --git a/arch/mips/kernel/kgdb.c b/arch/mips/kernel/kgdb.c
2025 index 50c9bb8..efdd5f8 100644
2026 --- a/arch/mips/kernel/kgdb.c
2027 +++ b/arch/mips/kernel/kgdb.c
2028 @@ -245,6 +245,7 @@ int kgdb_arch_handle_exception(int vector, int signo, int err_code,
2029 return -1;
2030 }
2031
2032 +/* cannot be const */
2033 struct kgdb_arch arch_kgdb_ops;
2034
2035 /*
2036 diff --git a/arch/mips/kernel/process.c b/arch/mips/kernel/process.c
2037 index f3d73e1..bb3f57a 100644
2038 --- a/arch/mips/kernel/process.c
2039 +++ b/arch/mips/kernel/process.c
2040 @@ -470,15 +470,3 @@ unsigned long get_wchan(struct task_struct *task)
2041 out:
2042 return pc;
2043 }
2044 -
2045 -/*
2046 - * Don't forget that the stack pointer must be aligned on a 8 bytes
2047 - * boundary for 32-bits ABI and 16 bytes for 64-bits ABI.
2048 - */
2049 -unsigned long arch_align_stack(unsigned long sp)
2050 -{
2051 - if (!(current->personality & ADDR_NO_RANDOMIZE) && randomize_va_space)
2052 - sp -= get_random_int() & ~PAGE_MASK;
2053 -
2054 - return sp & ALMASK;
2055 -}
2056 diff --git a/arch/mips/kernel/reset.c b/arch/mips/kernel/reset.c
2057 index 060563a..7fbf310 100644
2058 --- a/arch/mips/kernel/reset.c
2059 +++ b/arch/mips/kernel/reset.c
2060 @@ -19,8 +19,8 @@
2061 * So handle all using function pointers to machine specific
2062 * functions.
2063 */
2064 -void (*_machine_restart)(char *command);
2065 -void (*_machine_halt)(void);
2066 +void (*__noreturn _machine_restart)(char *command);
2067 +void (*__noreturn _machine_halt)(void);
2068 void (*pm_power_off)(void);
2069
2070 EXPORT_SYMBOL(pm_power_off);
2071 @@ -29,16 +29,19 @@ void machine_restart(char *command)
2072 {
2073 if (_machine_restart)
2074 _machine_restart(command);
2075 + BUG();
2076 }
2077
2078 void machine_halt(void)
2079 {
2080 if (_machine_halt)
2081 _machine_halt();
2082 + BUG();
2083 }
2084
2085 void machine_power_off(void)
2086 {
2087 if (pm_power_off)
2088 pm_power_off();
2089 + BUG();
2090 }
2091 diff --git a/arch/mips/kernel/syscall.c b/arch/mips/kernel/syscall.c
2092 index 3f7f466..3abe0b5 100644
2093 --- a/arch/mips/kernel/syscall.c
2094 +++ b/arch/mips/kernel/syscall.c
2095 @@ -102,17 +102,21 @@ unsigned long arch_get_unmapped_area(struct file *filp, unsigned long addr,
2096 do_color_align = 0;
2097 if (filp || (flags & MAP_SHARED))
2098 do_color_align = 1;
2099 +
2100 +#ifdef CONFIG_PAX_RANDMMAP
2101 + if (!(current->mm->pax_flags & MF_PAX_RANDMMAP))
2102 +#endif
2103 +
2104 if (addr) {
2105 if (do_color_align)
2106 addr = COLOUR_ALIGN(addr, pgoff);
2107 else
2108 addr = PAGE_ALIGN(addr);
2109 vmm = find_vma(current->mm, addr);
2110 - if (task_size - len >= addr &&
2111 - (!vmm || addr + len <= vmm->vm_start))
2112 + if (task_size - len >= addr && check_heap_stack_gap(vmm, addr, len))
2113 return addr;
2114 }
2115 - addr = TASK_UNMAPPED_BASE;
2116 + addr = current->mm->mmap_base;
2117 if (do_color_align)
2118 addr = COLOUR_ALIGN(addr, pgoff);
2119 else
2120 @@ -122,7 +126,7 @@ unsigned long arch_get_unmapped_area(struct file *filp, unsigned long addr,
2121 /* At this point: (!vmm || addr < vmm->vm_end). */
2122 if (task_size - len < addr)
2123 return -ENOMEM;
2124 - if (!vmm || addr + len <= vmm->vm_start)
2125 + if (check_heap_stack_gap(vmm, addr, len))
2126 return addr;
2127 addr = vmm->vm_end;
2128 if (do_color_align)
2129 diff --git a/arch/mips/mm/fault.c b/arch/mips/mm/fault.c
2130 index e97a7a2..f18f5b0 100644
2131 --- a/arch/mips/mm/fault.c
2132 +++ b/arch/mips/mm/fault.c
2133 @@ -26,6 +26,23 @@
2134 #include <asm/ptrace.h>
2135 #include <asm/highmem.h> /* For VMALLOC_END */
2136
2137 +#ifdef CONFIG_PAX_PAGEEXEC
2138 +void pax_report_insns(struct pt_regs *regs, void *pc, void *sp)
2139 +{
2140 + unsigned long i;
2141 +
2142 + printk(KERN_ERR "PAX: bytes at PC: ");
2143 + for (i = 0; i < 5; i++) {
2144 + unsigned int c;
2145 + if (get_user(c, (unsigned int *)pc+i))
2146 + printk(KERN_CONT "???????? ");
2147 + else
2148 + printk(KERN_CONT "%08x ", c);
2149 + }
2150 + printk("\n");
2151 +}
2152 +#endif
2153 +
2154 /*
2155 * This routine handles page faults. It determines the address,
2156 * and the problem, and then passes it off to one of the appropriate
2157 diff --git a/arch/parisc/include/asm/elf.h b/arch/parisc/include/asm/elf.h
2158 index 9c802eb..0592e41 100644
2159 --- a/arch/parisc/include/asm/elf.h
2160 +++ b/arch/parisc/include/asm/elf.h
2161 @@ -343,6 +343,13 @@ struct pt_regs; /* forward declaration... */
2162
2163 #define ELF_ET_DYN_BASE (TASK_UNMAPPED_BASE + 0x01000000)
2164
2165 +#ifdef CONFIG_PAX_ASLR
2166 +#define PAX_ELF_ET_DYN_BASE 0x10000UL
2167 +
2168 +#define PAX_DELTA_MMAP_LEN 16
2169 +#define PAX_DELTA_STACK_LEN 16
2170 +#endif
2171 +
2172 /* This yields a mask that user programs can use to figure out what
2173 instruction set this CPU supports. This could be done in user space,
2174 but it's not easy, and we've already done it here. */
2175 diff --git a/arch/parisc/include/asm/pgtable.h b/arch/parisc/include/asm/pgtable.h
2176 index a27d2e2..18fd845 100644
2177 --- a/arch/parisc/include/asm/pgtable.h
2178 +++ b/arch/parisc/include/asm/pgtable.h
2179 @@ -207,6 +207,17 @@
2180 #define PAGE_EXECREAD __pgprot(_PAGE_PRESENT | _PAGE_USER | _PAGE_READ | _PAGE_EXEC |_PAGE_ACCESSED)
2181 #define PAGE_COPY PAGE_EXECREAD
2182 #define PAGE_RWX __pgprot(_PAGE_PRESENT | _PAGE_USER | _PAGE_READ | _PAGE_WRITE | _PAGE_EXEC |_PAGE_ACCESSED)
2183 +
2184 +#ifdef CONFIG_PAX_PAGEEXEC
2185 +# define PAGE_SHARED_NOEXEC __pgprot(_PAGE_PRESENT | _PAGE_USER | _PAGE_READ | _PAGE_WRITE | _PAGE_ACCESSED)
2186 +# define PAGE_COPY_NOEXEC __pgprot(_PAGE_PRESENT | _PAGE_USER | _PAGE_READ | _PAGE_ACCESSED)
2187 +# define PAGE_READONLY_NOEXEC __pgprot(_PAGE_PRESENT | _PAGE_USER | _PAGE_READ | _PAGE_ACCESSED)
2188 +#else
2189 +# define PAGE_SHARED_NOEXEC PAGE_SHARED
2190 +# define PAGE_COPY_NOEXEC PAGE_COPY
2191 +# define PAGE_READONLY_NOEXEC PAGE_READONLY
2192 +#endif
2193 +
2194 #define PAGE_KERNEL __pgprot(_PAGE_KERNEL)
2195 #define PAGE_KERNEL_RO __pgprot(_PAGE_KERNEL & ~_PAGE_WRITE)
2196 #define PAGE_KERNEL_UNC __pgprot(_PAGE_KERNEL | _PAGE_NO_CACHE)
2197 diff --git a/arch/parisc/kernel/module.c b/arch/parisc/kernel/module.c
2198 index 2120746..8d70a5e 100644
2199 --- a/arch/parisc/kernel/module.c
2200 +++ b/arch/parisc/kernel/module.c
2201 @@ -95,16 +95,38 @@
2202
2203 /* three functions to determine where in the module core
2204 * or init pieces the location is */
2205 +static inline int in_init_rx(struct module *me, void *loc)
2206 +{
2207 + return (loc >= me->module_init_rx &&
2208 + loc < (me->module_init_rx + me->init_size_rx));
2209 +}
2210 +
2211 +static inline int in_init_rw(struct module *me, void *loc)
2212 +{
2213 + return (loc >= me->module_init_rw &&
2214 + loc < (me->module_init_rw + me->init_size_rw));
2215 +}
2216 +
2217 static inline int in_init(struct module *me, void *loc)
2218 {
2219 - return (loc >= me->module_init &&
2220 - loc <= (me->module_init + me->init_size));
2221 + return in_init_rx(me, loc) || in_init_rw(me, loc);
2222 +}
2223 +
2224 +static inline int in_core_rx(struct module *me, void *loc)
2225 +{
2226 + return (loc >= me->module_core_rx &&
2227 + loc < (me->module_core_rx + me->core_size_rx));
2228 +}
2229 +
2230 +static inline int in_core_rw(struct module *me, void *loc)
2231 +{
2232 + return (loc >= me->module_core_rw &&
2233 + loc < (me->module_core_rw + me->core_size_rw));
2234 }
2235
2236 static inline int in_core(struct module *me, void *loc)
2237 {
2238 - return (loc >= me->module_core &&
2239 - loc <= (me->module_core + me->core_size));
2240 + return in_core_rx(me, loc) || in_core_rw(me, loc);
2241 }
2242
2243 static inline int in_local(struct module *me, void *loc)
2244 @@ -364,13 +386,13 @@ int module_frob_arch_sections(CONST Elf_Ehdr *hdr,
2245 }
2246
2247 /* align things a bit */
2248 - me->core_size = ALIGN(me->core_size, 16);
2249 - me->arch.got_offset = me->core_size;
2250 - me->core_size += gots * sizeof(struct got_entry);
2251 + me->core_size_rw = ALIGN(me->core_size_rw, 16);
2252 + me->arch.got_offset = me->core_size_rw;
2253 + me->core_size_rw += gots * sizeof(struct got_entry);
2254
2255 - me->core_size = ALIGN(me->core_size, 16);
2256 - me->arch.fdesc_offset = me->core_size;
2257 - me->core_size += fdescs * sizeof(Elf_Fdesc);
2258 + me->core_size_rw = ALIGN(me->core_size_rw, 16);
2259 + me->arch.fdesc_offset = me->core_size_rw;
2260 + me->core_size_rw += fdescs * sizeof(Elf_Fdesc);
2261
2262 me->arch.got_max = gots;
2263 me->arch.fdesc_max = fdescs;
2264 @@ -388,7 +410,7 @@ static Elf64_Word get_got(struct module *me, unsigned long value, long addend)
2265
2266 BUG_ON(value == 0);
2267
2268 - got = me->module_core + me->arch.got_offset;
2269 + got = me->module_core_rw + me->arch.got_offset;
2270 for (i = 0; got[i].addr; i++)
2271 if (got[i].addr == value)
2272 goto out;
2273 @@ -406,7 +428,7 @@ static Elf64_Word get_got(struct module *me, unsigned long value, long addend)
2274 #ifdef CONFIG_64BIT
2275 static Elf_Addr get_fdesc(struct module *me, unsigned long value)
2276 {
2277 - Elf_Fdesc *fdesc = me->module_core + me->arch.fdesc_offset;
2278 + Elf_Fdesc *fdesc = me->module_core_rw + me->arch.fdesc_offset;
2279
2280 if (!value) {
2281 printk(KERN_ERR "%s: zero OPD requested!\n", me->name);
2282 @@ -424,7 +446,7 @@ static Elf_Addr get_fdesc(struct module *me, unsigned long value)
2283
2284 /* Create new one */
2285 fdesc->addr = value;
2286 - fdesc->gp = (Elf_Addr)me->module_core + me->arch.got_offset;
2287 + fdesc->gp = (Elf_Addr)me->module_core_rw + me->arch.got_offset;
2288 return (Elf_Addr)fdesc;
2289 }
2290 #endif /* CONFIG_64BIT */
2291 @@ -848,7 +870,7 @@ register_unwind_table(struct module *me,
2292
2293 table = (unsigned char *)sechdrs[me->arch.unwind_section].sh_addr;
2294 end = table + sechdrs[me->arch.unwind_section].sh_size;
2295 - gp = (Elf_Addr)me->module_core + me->arch.got_offset;
2296 + gp = (Elf_Addr)me->module_core_rw + me->arch.got_offset;
2297
2298 DEBUGP("register_unwind_table(), sect = %d at 0x%p - 0x%p (gp=0x%lx)\n",
2299 me->arch.unwind_section, table, end, gp);
2300 diff --git a/arch/parisc/kernel/sys_parisc.c b/arch/parisc/kernel/sys_parisc.c
2301 index 9147391..f3d949a 100644
2302 --- a/arch/parisc/kernel/sys_parisc.c
2303 +++ b/arch/parisc/kernel/sys_parisc.c
2304 @@ -43,7 +43,7 @@ static unsigned long get_unshared_area(unsigned long addr, unsigned long len)
2305 /* At this point: (!vma || addr < vma->vm_end). */
2306 if (TASK_SIZE - len < addr)
2307 return -ENOMEM;
2308 - if (!vma || addr + len <= vma->vm_start)
2309 + if (check_heap_stack_gap(vma, addr, len))
2310 return addr;
2311 addr = vma->vm_end;
2312 }
2313 @@ -79,7 +79,7 @@ static unsigned long get_shared_area(struct address_space *mapping,
2314 /* At this point: (!vma || addr < vma->vm_end). */
2315 if (TASK_SIZE - len < addr)
2316 return -ENOMEM;
2317 - if (!vma || addr + len <= vma->vm_start)
2318 + if (check_heap_stack_gap(vma, addr, len))
2319 return addr;
2320 addr = DCACHE_ALIGN(vma->vm_end - offset) + offset;
2321 if (addr < vma->vm_end) /* handle wraparound */
2322 @@ -98,7 +98,7 @@ unsigned long arch_get_unmapped_area(struct file *filp, unsigned long addr,
2323 if (flags & MAP_FIXED)
2324 return addr;
2325 if (!addr)
2326 - addr = TASK_UNMAPPED_BASE;
2327 + addr = current->mm->mmap_base;
2328
2329 if (filp) {
2330 addr = get_shared_area(filp->f_mapping, addr, len, pgoff);
2331 diff --git a/arch/parisc/kernel/traps.c b/arch/parisc/kernel/traps.c
2332 index 8b58bf0..7afff03 100644
2333 --- a/arch/parisc/kernel/traps.c
2334 +++ b/arch/parisc/kernel/traps.c
2335 @@ -733,9 +733,7 @@ void notrace handle_interruption(int code, struct pt_regs *regs)
2336
2337 down_read(&current->mm->mmap_sem);
2338 vma = find_vma(current->mm,regs->iaoq[0]);
2339 - if (vma && (regs->iaoq[0] >= vma->vm_start)
2340 - && (vma->vm_flags & VM_EXEC)) {
2341 -
2342 + if (vma && (regs->iaoq[0] >= vma->vm_start)) {
2343 fault_address = regs->iaoq[0];
2344 fault_space = regs->iasq[0];
2345
2346 diff --git a/arch/parisc/mm/fault.c b/arch/parisc/mm/fault.c
2347 index c6afbfc..c5839f6 100644
2348 --- a/arch/parisc/mm/fault.c
2349 +++ b/arch/parisc/mm/fault.c
2350 @@ -15,6 +15,7 @@
2351 #include <linux/sched.h>
2352 #include <linux/interrupt.h>
2353 #include <linux/module.h>
2354 +#include <linux/unistd.h>
2355
2356 #include <asm/uaccess.h>
2357 #include <asm/traps.h>
2358 @@ -52,7 +53,7 @@ DEFINE_PER_CPU(struct exception_data, exception_data);
2359 static unsigned long
2360 parisc_acctyp(unsigned long code, unsigned int inst)
2361 {
2362 - if (code == 6 || code == 16)
2363 + if (code == 6 || code == 7 || code == 16)
2364 return VM_EXEC;
2365
2366 switch (inst & 0xf0000000) {
2367 @@ -138,6 +139,116 @@ parisc_acctyp(unsigned long code, unsigned int inst)
2368 }
2369 #endif
2370
2371 +#ifdef CONFIG_PAX_PAGEEXEC
2372 +/*
2373 + * PaX: decide what to do with offenders (instruction_pointer(regs) = fault address)
2374 + *
2375 + * returns 1 when task should be killed
2376 + * 2 when rt_sigreturn trampoline was detected
2377 + * 3 when unpatched PLT trampoline was detected
2378 + */
2379 +static int pax_handle_fetch_fault(struct pt_regs *regs)
2380 +{
2381 +
2382 +#ifdef CONFIG_PAX_EMUPLT
2383 + int err;
2384 +
2385 + do { /* PaX: unpatched PLT emulation */
2386 + unsigned int bl, depwi;
2387 +
2388 + err = get_user(bl, (unsigned int *)instruction_pointer(regs));
2389 + err |= get_user(depwi, (unsigned int *)(instruction_pointer(regs)+4));
2390 +
2391 + if (err)
2392 + break;
2393 +
2394 + if (bl == 0xEA9F1FDDU && depwi == 0xD6801C1EU) {
2395 + unsigned int ldw, bv, ldw2, addr = instruction_pointer(regs)-12;
2396 +
2397 + err = get_user(ldw, (unsigned int *)addr);
2398 + err |= get_user(bv, (unsigned int *)(addr+4));
2399 + err |= get_user(ldw2, (unsigned int *)(addr+8));
2400 +
2401 + if (err)
2402 + break;
2403 +
2404 + if (ldw == 0x0E801096U &&
2405 + bv == 0xEAC0C000U &&
2406 + ldw2 == 0x0E881095U)
2407 + {
2408 + unsigned int resolver, map;
2409 +
2410 + err = get_user(resolver, (unsigned int *)(instruction_pointer(regs)+8));
2411 + err |= get_user(map, (unsigned int *)(instruction_pointer(regs)+12));
2412 + if (err)
2413 + break;
2414 +
2415 + regs->gr[20] = instruction_pointer(regs)+8;
2416 + regs->gr[21] = map;
2417 + regs->gr[22] = resolver;
2418 + regs->iaoq[0] = resolver | 3UL;
2419 + regs->iaoq[1] = regs->iaoq[0] + 4;
2420 + return 3;
2421 + }
2422 + }
2423 + } while (0);
2424 +#endif
2425 +
2426 +#ifdef CONFIG_PAX_EMUTRAMP
2427 +
2428 +#ifndef CONFIG_PAX_EMUSIGRT
2429 + if (!(current->mm->pax_flags & MF_PAX_EMUTRAMP))
2430 + return 1;
2431 +#endif
2432 +
2433 + do { /* PaX: rt_sigreturn emulation */
2434 + unsigned int ldi1, ldi2, bel, nop;
2435 +
2436 + err = get_user(ldi1, (unsigned int *)instruction_pointer(regs));
2437 + err |= get_user(ldi2, (unsigned int *)(instruction_pointer(regs)+4));
2438 + err |= get_user(bel, (unsigned int *)(instruction_pointer(regs)+8));
2439 + err |= get_user(nop, (unsigned int *)(instruction_pointer(regs)+12));
2440 +
2441 + if (err)
2442 + break;
2443 +
2444 + if ((ldi1 == 0x34190000U || ldi1 == 0x34190002U) &&
2445 + ldi2 == 0x3414015AU &&
2446 + bel == 0xE4008200U &&
2447 + nop == 0x08000240U)
2448 + {
2449 + regs->gr[25] = (ldi1 & 2) >> 1;
2450 + regs->gr[20] = __NR_rt_sigreturn;
2451 + regs->gr[31] = regs->iaoq[1] + 16;
2452 + regs->sr[0] = regs->iasq[1];
2453 + regs->iaoq[0] = 0x100UL;
2454 + regs->iaoq[1] = regs->iaoq[0] + 4;
2455 + regs->iasq[0] = regs->sr[2];
2456 + regs->iasq[1] = regs->sr[2];
2457 + return 2;
2458 + }
2459 + } while (0);
2460 +#endif
2461 +
2462 + return 1;
2463 +}
2464 +
2465 +void pax_report_insns(struct pt_regs *regs, void *pc, void *sp)
2466 +{
2467 + unsigned long i;
2468 +
2469 + printk(KERN_ERR "PAX: bytes at PC: ");
2470 + for (i = 0; i < 5; i++) {
2471 + unsigned int c;
2472 + if (get_user(c, (unsigned int *)pc+i))
2473 + printk(KERN_CONT "???????? ");
2474 + else
2475 + printk(KERN_CONT "%08x ", c);
2476 + }
2477 + printk("\n");
2478 +}
2479 +#endif
2480 +
2481 int fixup_exception(struct pt_regs *regs)
2482 {
2483 const struct exception_table_entry *fix;
2484 @@ -192,8 +303,33 @@ good_area:
2485
2486 acc_type = parisc_acctyp(code,regs->iir);
2487
2488 - if ((vma->vm_flags & acc_type) != acc_type)
2489 + if ((vma->vm_flags & acc_type) != acc_type) {
2490 +
2491 +#ifdef CONFIG_PAX_PAGEEXEC
2492 + if ((mm->pax_flags & MF_PAX_PAGEEXEC) && (acc_type & VM_EXEC) &&
2493 + (address & ~3UL) == instruction_pointer(regs))
2494 + {
2495 + up_read(&mm->mmap_sem);
2496 + switch (pax_handle_fetch_fault(regs)) {
2497 +
2498 +#ifdef CONFIG_PAX_EMUPLT
2499 + case 3:
2500 + return;
2501 +#endif
2502 +
2503 +#ifdef CONFIG_PAX_EMUTRAMP
2504 + case 2:
2505 + return;
2506 +#endif
2507 +
2508 + }
2509 + pax_report_fault(regs, (void *)instruction_pointer(regs), (void *)regs->gr[30]);
2510 + do_group_exit(SIGKILL);
2511 + }
2512 +#endif
2513 +
2514 goto bad_area;
2515 + }
2516
2517 /*
2518 * If for any reason at all we couldn't handle the fault, make
2519 diff --git a/arch/powerpc/Makefile b/arch/powerpc/Makefile
2520 index c107b74..409dc0f 100644
2521 --- a/arch/powerpc/Makefile
2522 +++ b/arch/powerpc/Makefile
2523 @@ -74,6 +74,8 @@ KBUILD_AFLAGS += -Iarch/$(ARCH)
2524 KBUILD_CFLAGS += -msoft-float -pipe -Iarch/$(ARCH) $(CFLAGS-y)
2525 CPP = $(CC) -E $(KBUILD_CFLAGS)
2526
2527 +cflags-y += -Wno-sign-compare -Wno-extra
2528 +
2529 CHECKFLAGS += -m$(CONFIG_WORD_SIZE) -D__powerpc__ -D__powerpc$(CONFIG_WORD_SIZE)__
2530
2531 ifeq ($(CONFIG_PPC64),y)
2532 diff --git a/arch/powerpc/include/asm/device.h b/arch/powerpc/include/asm/device.h
2533 index 6d94d27..50d4cad 100644
2534 --- a/arch/powerpc/include/asm/device.h
2535 +++ b/arch/powerpc/include/asm/device.h
2536 @@ -14,7 +14,7 @@ struct dev_archdata {
2537 struct device_node *of_node;
2538
2539 /* DMA operations on that device */
2540 - struct dma_map_ops *dma_ops;
2541 + const struct dma_map_ops *dma_ops;
2542
2543 /*
2544 * When an iommu is in use, dma_data is used as a ptr to the base of the
2545 diff --git a/arch/powerpc/include/asm/dma-mapping.h b/arch/powerpc/include/asm/dma-mapping.h
2546 index e281dae..2b8a784 100644
2547 --- a/arch/powerpc/include/asm/dma-mapping.h
2548 +++ b/arch/powerpc/include/asm/dma-mapping.h
2549 @@ -69,9 +69,9 @@ static inline unsigned long device_to_mask(struct device *dev)
2550 #ifdef CONFIG_PPC64
2551 extern struct dma_map_ops dma_iommu_ops;
2552 #endif
2553 -extern struct dma_map_ops dma_direct_ops;
2554 +extern const struct dma_map_ops dma_direct_ops;
2555
2556 -static inline struct dma_map_ops *get_dma_ops(struct device *dev)
2557 +static inline const struct dma_map_ops *get_dma_ops(struct device *dev)
2558 {
2559 /* We don't handle the NULL dev case for ISA for now. We could
2560 * do it via an out of line call but it is not needed for now. The
2561 @@ -84,7 +84,7 @@ static inline struct dma_map_ops *get_dma_ops(struct device *dev)
2562 return dev->archdata.dma_ops;
2563 }
2564
2565 -static inline void set_dma_ops(struct device *dev, struct dma_map_ops *ops)
2566 +static inline void set_dma_ops(struct device *dev, const struct dma_map_ops *ops)
2567 {
2568 dev->archdata.dma_ops = ops;
2569 }
2570 @@ -118,7 +118,7 @@ static inline void set_dma_offset(struct device *dev, dma_addr_t off)
2571
2572 static inline int dma_supported(struct device *dev, u64 mask)
2573 {
2574 - struct dma_map_ops *dma_ops = get_dma_ops(dev);
2575 + const struct dma_map_ops *dma_ops = get_dma_ops(dev);
2576
2577 if (unlikely(dma_ops == NULL))
2578 return 0;
2579 @@ -132,7 +132,7 @@ static inline int dma_supported(struct device *dev, u64 mask)
2580
2581 static inline int dma_set_mask(struct device *dev, u64 dma_mask)
2582 {
2583 - struct dma_map_ops *dma_ops = get_dma_ops(dev);
2584 + const struct dma_map_ops *dma_ops = get_dma_ops(dev);
2585
2586 if (unlikely(dma_ops == NULL))
2587 return -EIO;
2588 @@ -147,7 +147,7 @@ static inline int dma_set_mask(struct device *dev, u64 dma_mask)
2589 static inline void *dma_alloc_coherent(struct device *dev, size_t size,
2590 dma_addr_t *dma_handle, gfp_t flag)
2591 {
2592 - struct dma_map_ops *dma_ops = get_dma_ops(dev);
2593 + const struct dma_map_ops *dma_ops = get_dma_ops(dev);
2594 void *cpu_addr;
2595
2596 BUG_ON(!dma_ops);
2597 @@ -162,7 +162,7 @@ static inline void *dma_alloc_coherent(struct device *dev, size_t size,
2598 static inline void dma_free_coherent(struct device *dev, size_t size,
2599 void *cpu_addr, dma_addr_t dma_handle)
2600 {
2601 - struct dma_map_ops *dma_ops = get_dma_ops(dev);
2602 + const struct dma_map_ops *dma_ops = get_dma_ops(dev);
2603
2604 BUG_ON(!dma_ops);
2605
2606 @@ -173,7 +173,7 @@ static inline void dma_free_coherent(struct device *dev, size_t size,
2607
2608 static inline int dma_mapping_error(struct device *dev, dma_addr_t dma_addr)
2609 {
2610 - struct dma_map_ops *dma_ops = get_dma_ops(dev);
2611 + const struct dma_map_ops *dma_ops = get_dma_ops(dev);
2612
2613 if (dma_ops->mapping_error)
2614 return dma_ops->mapping_error(dev, dma_addr);
2615 diff --git a/arch/powerpc/include/asm/elf.h b/arch/powerpc/include/asm/elf.h
2616 index 5698502..5db093c 100644
2617 --- a/arch/powerpc/include/asm/elf.h
2618 +++ b/arch/powerpc/include/asm/elf.h
2619 @@ -179,8 +179,19 @@ typedef elf_fpreg_t elf_vsrreghalf_t32[ELF_NVSRHALFREG];
2620 the loader. We need to make sure that it is out of the way of the program
2621 that it will "exec", and that there is sufficient room for the brk. */
2622
2623 -extern unsigned long randomize_et_dyn(unsigned long base);
2624 -#define ELF_ET_DYN_BASE (randomize_et_dyn(0x20000000))
2625 +#define ELF_ET_DYN_BASE (0x20000000)
2626 +
2627 +#ifdef CONFIG_PAX_ASLR
2628 +#define PAX_ELF_ET_DYN_BASE (0x10000000UL)
2629 +
2630 +#ifdef __powerpc64__
2631 +#define PAX_DELTA_MMAP_LEN (test_thread_flag(TIF_32BIT) ? 16 : 28)
2632 +#define PAX_DELTA_STACK_LEN (test_thread_flag(TIF_32BIT) ? 16 : 28)
2633 +#else
2634 +#define PAX_DELTA_MMAP_LEN 15
2635 +#define PAX_DELTA_STACK_LEN 15
2636 +#endif
2637 +#endif
2638
2639 /*
2640 * Our registers are always unsigned longs, whether we're a 32 bit
2641 @@ -275,9 +286,6 @@ extern int arch_setup_additional_pages(struct linux_binprm *bprm,
2642 (0x7ff >> (PAGE_SHIFT - 12)) : \
2643 (0x3ffff >> (PAGE_SHIFT - 12)))
2644
2645 -extern unsigned long arch_randomize_brk(struct mm_struct *mm);
2646 -#define arch_randomize_brk arch_randomize_brk
2647 -
2648 #endif /* __KERNEL__ */
2649
2650 /*
2651 diff --git a/arch/powerpc/include/asm/iommu.h b/arch/powerpc/include/asm/iommu.h
2652 index edfc980..1766f59 100644
2653 --- a/arch/powerpc/include/asm/iommu.h
2654 +++ b/arch/powerpc/include/asm/iommu.h
2655 @@ -116,6 +116,9 @@ extern void iommu_init_early_iSeries(void);
2656 extern void iommu_init_early_dart(void);
2657 extern void iommu_init_early_pasemi(void);
2658
2659 +/* dma-iommu.c */
2660 +extern int dma_iommu_dma_supported(struct device *dev, u64 mask);
2661 +
2662 #ifdef CONFIG_PCI
2663 extern void pci_iommu_init(void);
2664 extern void pci_direct_iommu_init(void);
2665 diff --git a/arch/powerpc/include/asm/kmap_types.h b/arch/powerpc/include/asm/kmap_types.h
2666 index 9163695..5a00112 100644
2667 --- a/arch/powerpc/include/asm/kmap_types.h
2668 +++ b/arch/powerpc/include/asm/kmap_types.h
2669 @@ -26,6 +26,7 @@ enum km_type {
2670 KM_SOFTIRQ1,
2671 KM_PPC_SYNC_PAGE,
2672 KM_PPC_SYNC_ICACHE,
2673 + KM_CLEARPAGE,
2674 KM_TYPE_NR
2675 };
2676
2677 diff --git a/arch/powerpc/include/asm/page.h b/arch/powerpc/include/asm/page.h
2678 index ff24254..fe45b21 100644
2679 --- a/arch/powerpc/include/asm/page.h
2680 +++ b/arch/powerpc/include/asm/page.h
2681 @@ -116,8 +116,9 @@ extern phys_addr_t kernstart_addr;
2682 * and needs to be executable. This means the whole heap ends
2683 * up being executable.
2684 */
2685 -#define VM_DATA_DEFAULT_FLAGS32 (VM_READ | VM_WRITE | VM_EXEC | \
2686 - VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC)
2687 +#define VM_DATA_DEFAULT_FLAGS32 \
2688 + (((current->personality & READ_IMPLIES_EXEC) ? VM_EXEC : 0) | \
2689 + VM_READ | VM_WRITE | VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC)
2690
2691 #define VM_DATA_DEFAULT_FLAGS64 (VM_READ | VM_WRITE | \
2692 VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC)
2693 @@ -145,6 +146,9 @@ extern phys_addr_t kernstart_addr;
2694 #define is_kernel_addr(x) ((x) >= PAGE_OFFSET)
2695 #endif
2696
2697 +#define ktla_ktva(addr) (addr)
2698 +#define ktva_ktla(addr) (addr)
2699 +
2700 #ifndef __ASSEMBLY__
2701
2702 #undef STRICT_MM_TYPECHECKS
2703 diff --git a/arch/powerpc/include/asm/page_64.h b/arch/powerpc/include/asm/page_64.h
2704 index 3f17b83..1f9e766 100644
2705 --- a/arch/powerpc/include/asm/page_64.h
2706 +++ b/arch/powerpc/include/asm/page_64.h
2707 @@ -180,15 +180,18 @@ do { \
2708 * stack by default, so in the absense of a PT_GNU_STACK program header
2709 * we turn execute permission off.
2710 */
2711 -#define VM_STACK_DEFAULT_FLAGS32 (VM_READ | VM_WRITE | VM_EXEC | \
2712 - VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC)
2713 +#define VM_STACK_DEFAULT_FLAGS32 \
2714 + (((current->personality & READ_IMPLIES_EXEC) ? VM_EXEC : 0) | \
2715 + VM_READ | VM_WRITE | VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC)
2716
2717 #define VM_STACK_DEFAULT_FLAGS64 (VM_READ | VM_WRITE | \
2718 VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC)
2719
2720 +#ifndef CONFIG_PAX_PAGEEXEC
2721 #define VM_STACK_DEFAULT_FLAGS \
2722 (test_thread_flag(TIF_32BIT) ? \
2723 VM_STACK_DEFAULT_FLAGS32 : VM_STACK_DEFAULT_FLAGS64)
2724 +#endif
2725
2726 #include <asm-generic/getorder.h>
2727
2728 diff --git a/arch/powerpc/include/asm/pci.h b/arch/powerpc/include/asm/pci.h
2729 index b5ea626..4030822 100644
2730 --- a/arch/powerpc/include/asm/pci.h
2731 +++ b/arch/powerpc/include/asm/pci.h
2732 @@ -65,8 +65,8 @@ static inline int pci_get_legacy_ide_irq(struct pci_dev *dev, int channel)
2733 }
2734
2735 #ifdef CONFIG_PCI
2736 -extern void set_pci_dma_ops(struct dma_map_ops *dma_ops);
2737 -extern struct dma_map_ops *get_pci_dma_ops(void);
2738 +extern void set_pci_dma_ops(const struct dma_map_ops *dma_ops);
2739 +extern const struct dma_map_ops *get_pci_dma_ops(void);
2740 #else /* CONFIG_PCI */
2741 #define set_pci_dma_ops(d)
2742 #define get_pci_dma_ops() NULL
2743 diff --git a/arch/powerpc/include/asm/pgtable.h b/arch/powerpc/include/asm/pgtable.h
2744 index 2a5da06..d65bea2 100644
2745 --- a/arch/powerpc/include/asm/pgtable.h
2746 +++ b/arch/powerpc/include/asm/pgtable.h
2747 @@ -2,6 +2,7 @@
2748 #define _ASM_POWERPC_PGTABLE_H
2749 #ifdef __KERNEL__
2750
2751 +#include <linux/const.h>
2752 #ifndef __ASSEMBLY__
2753 #include <asm/processor.h> /* For TASK_SIZE */
2754 #include <asm/mmu.h>
2755 diff --git a/arch/powerpc/include/asm/pte-hash32.h b/arch/powerpc/include/asm/pte-hash32.h
2756 index 4aad413..85d86bf 100644
2757 --- a/arch/powerpc/include/asm/pte-hash32.h
2758 +++ b/arch/powerpc/include/asm/pte-hash32.h
2759 @@ -21,6 +21,7 @@
2760 #define _PAGE_FILE 0x004 /* when !present: nonlinear file mapping */
2761 #define _PAGE_USER 0x004 /* usermode access allowed */
2762 #define _PAGE_GUARDED 0x008 /* G: prohibit speculative access */
2763 +#define _PAGE_EXEC _PAGE_GUARDED
2764 #define _PAGE_COHERENT 0x010 /* M: enforce memory coherence (SMP systems) */
2765 #define _PAGE_NO_CACHE 0x020 /* I: cache inhibit */
2766 #define _PAGE_WRITETHRU 0x040 /* W: cache write-through */
2767 diff --git a/arch/powerpc/include/asm/ptrace.h b/arch/powerpc/include/asm/ptrace.h
2768 index 8c34149..78f425a 100644
2769 --- a/arch/powerpc/include/asm/ptrace.h
2770 +++ b/arch/powerpc/include/asm/ptrace.h
2771 @@ -103,7 +103,7 @@ extern unsigned long profile_pc(struct pt_regs *regs);
2772 } while(0)
2773
2774 struct task_struct;
2775 -extern unsigned long ptrace_get_reg(struct task_struct *task, int regno);
2776 +extern unsigned long ptrace_get_reg(struct task_struct *task, unsigned int regno);
2777 extern int ptrace_put_reg(struct task_struct *task, int regno,
2778 unsigned long data);
2779
2780 diff --git a/arch/powerpc/include/asm/reg.h b/arch/powerpc/include/asm/reg.h
2781 index 32a7c30..be3a8bb 100644
2782 --- a/arch/powerpc/include/asm/reg.h
2783 +++ b/arch/powerpc/include/asm/reg.h
2784 @@ -191,6 +191,7 @@
2785 #define SPRN_DBCR 0x136 /* e300 Data Breakpoint Control Reg */
2786 #define SPRN_DSISR 0x012 /* Data Storage Interrupt Status Register */
2787 #define DSISR_NOHPTE 0x40000000 /* no translation found */
2788 +#define DSISR_GUARDED 0x10000000 /* fetch from guarded storage */
2789 #define DSISR_PROTFAULT 0x08000000 /* protection fault */
2790 #define DSISR_ISSTORE 0x02000000 /* access was a store */
2791 #define DSISR_DABRMATCH 0x00400000 /* hit data breakpoint */
2792 diff --git a/arch/powerpc/include/asm/swiotlb.h b/arch/powerpc/include/asm/swiotlb.h
2793 index 8979d4c..d2fd0d3 100644
2794 --- a/arch/powerpc/include/asm/swiotlb.h
2795 +++ b/arch/powerpc/include/asm/swiotlb.h
2796 @@ -13,7 +13,7 @@
2797
2798 #include <linux/swiotlb.h>
2799
2800 -extern struct dma_map_ops swiotlb_dma_ops;
2801 +extern const struct dma_map_ops swiotlb_dma_ops;
2802
2803 static inline void dma_mark_clean(void *addr, size_t size) {}
2804
2805 diff --git a/arch/powerpc/include/asm/system.h b/arch/powerpc/include/asm/system.h
2806 index 094a12a..877a60a 100644
2807 --- a/arch/powerpc/include/asm/system.h
2808 +++ b/arch/powerpc/include/asm/system.h
2809 @@ -531,7 +531,7 @@ __cmpxchg_local(volatile void *ptr, unsigned long old, unsigned long new,
2810 #define cmpxchg64_local(ptr, o, n) __cmpxchg64_local_generic((ptr), (o), (n))
2811 #endif
2812
2813 -extern unsigned long arch_align_stack(unsigned long sp);
2814 +#define arch_align_stack(x) ((x) & ~0xfUL)
2815
2816 /* Used in very early kernel initialization. */
2817 extern unsigned long reloc_offset(void);
2818 diff --git a/arch/powerpc/include/asm/uaccess.h b/arch/powerpc/include/asm/uaccess.h
2819 index bd0fb84..a42a14b 100644
2820 --- a/arch/powerpc/include/asm/uaccess.h
2821 +++ b/arch/powerpc/include/asm/uaccess.h
2822 @@ -13,6 +13,8 @@
2823 #define VERIFY_READ 0
2824 #define VERIFY_WRITE 1
2825
2826 +extern void check_object_size(const void *ptr, unsigned long n, bool to);
2827 +
2828 /*
2829 * The fs value determines whether argument validity checking should be
2830 * performed or not. If get_fs() == USER_DS, checking is performed, with
2831 @@ -327,52 +329,6 @@ do { \
2832 extern unsigned long __copy_tofrom_user(void __user *to,
2833 const void __user *from, unsigned long size);
2834
2835 -#ifndef __powerpc64__
2836 -
2837 -static inline unsigned long copy_from_user(void *to,
2838 - const void __user *from, unsigned long n)
2839 -{
2840 - unsigned long over;
2841 -
2842 - if (access_ok(VERIFY_READ, from, n))
2843 - return __copy_tofrom_user((__force void __user *)to, from, n);
2844 - if ((unsigned long)from < TASK_SIZE) {
2845 - over = (unsigned long)from + n - TASK_SIZE;
2846 - return __copy_tofrom_user((__force void __user *)to, from,
2847 - n - over) + over;
2848 - }
2849 - return n;
2850 -}
2851 -
2852 -static inline unsigned long copy_to_user(void __user *to,
2853 - const void *from, unsigned long n)
2854 -{
2855 - unsigned long over;
2856 -
2857 - if (access_ok(VERIFY_WRITE, to, n))
2858 - return __copy_tofrom_user(to, (__force void __user *)from, n);
2859 - if ((unsigned long)to < TASK_SIZE) {
2860 - over = (unsigned long)to + n - TASK_SIZE;
2861 - return __copy_tofrom_user(to, (__force void __user *)from,
2862 - n - over) + over;
2863 - }
2864 - return n;
2865 -}
2866 -
2867 -#else /* __powerpc64__ */
2868 -
2869 -#define __copy_in_user(to, from, size) \
2870 - __copy_tofrom_user((to), (from), (size))
2871 -
2872 -extern unsigned long copy_from_user(void *to, const void __user *from,
2873 - unsigned long n);
2874 -extern unsigned long copy_to_user(void __user *to, const void *from,
2875 - unsigned long n);
2876 -extern unsigned long copy_in_user(void __user *to, const void __user *from,
2877 - unsigned long n);
2878 -
2879 -#endif /* __powerpc64__ */
2880 -
2881 static inline unsigned long __copy_from_user_inatomic(void *to,
2882 const void __user *from, unsigned long n)
2883 {
2884 @@ -396,6 +352,10 @@ static inline unsigned long __copy_from_user_inatomic(void *to,
2885 if (ret == 0)
2886 return 0;
2887 }
2888 +
2889 + if (!__builtin_constant_p(n))
2890 + check_object_size(to, n, false);
2891 +
2892 return __copy_tofrom_user((__force void __user *)to, from, n);
2893 }
2894
2895 @@ -422,6 +382,10 @@ static inline unsigned long __copy_to_user_inatomic(void __user *to,
2896 if (ret == 0)
2897 return 0;
2898 }
2899 +
2900 + if (!__builtin_constant_p(n))
2901 + check_object_size(from, n, true);
2902 +
2903 return __copy_tofrom_user(to, (__force const void __user *)from, n);
2904 }
2905
2906 @@ -439,6 +403,92 @@ static inline unsigned long __copy_to_user(void __user *to,
2907 return __copy_to_user_inatomic(to, from, size);
2908 }
2909
2910 +#ifndef __powerpc64__
2911 +
2912 +static inline unsigned long __must_check copy_from_user(void *to,
2913 + const void __user *from, unsigned long n)
2914 +{
2915 + unsigned long over;
2916 +
2917 + if ((long)n < 0)
2918 + return n;
2919 +
2920 + if (access_ok(VERIFY_READ, from, n)) {
2921 + if (!__builtin_constant_p(n))
2922 + check_object_size(to, n, false);
2923 + return __copy_tofrom_user((__force void __user *)to, from, n);
2924 + }
2925 + if ((unsigned long)from < TASK_SIZE) {
2926 + over = (unsigned long)from + n - TASK_SIZE;
2927 + if (!__builtin_constant_p(n - over))
2928 + check_object_size(to, n - over, false);
2929 + return __copy_tofrom_user((__force void __user *)to, from,
2930 + n - over) + over;
2931 + }
2932 + return n;
2933 +}
2934 +
2935 +static inline unsigned long __must_check copy_to_user(void __user *to,
2936 + const void *from, unsigned long n)
2937 +{
2938 + unsigned long over;
2939 +
2940 + if ((long)n < 0)
2941 + return n;
2942 +
2943 + if (access_ok(VERIFY_WRITE, to, n)) {
2944 + if (!__builtin_constant_p(n))
2945 + check_object_size(from, n, true);
2946 + return __copy_tofrom_user(to, (__force void __user *)from, n);
2947 + }
2948 + if ((unsigned long)to < TASK_SIZE) {
2949 + over = (unsigned long)to + n - TASK_SIZE;
2950 + if (!__builtin_constant_p(n))
2951 + check_object_size(from, n - over, true);
2952 + return __copy_tofrom_user(to, (__force void __user *)from,
2953 + n - over) + over;
2954 + }
2955 + return n;
2956 +}
2957 +
2958 +#else /* __powerpc64__ */
2959 +
2960 +#define __copy_in_user(to, from, size) \
2961 + __copy_tofrom_user((to), (from), (size))
2962 +
2963 +static inline unsigned long __must_check copy_from_user(void *to, const void __user *from, unsigned long n)
2964 +{
2965 + if ((long)n < 0 || n > INT_MAX)
2966 + return n;
2967 +
2968 + if (!__builtin_constant_p(n))
2969 + check_object_size(to, n, false);
2970 +
2971 + if (likely(access_ok(VERIFY_READ, from, n)))
2972 + n = __copy_from_user(to, from, n);
2973 + else
2974 + memset(to, 0, n);
2975 + return n;
2976 +}
2977 +
2978 +static inline unsigned long __must_check copy_to_user(void __user *to, const void *from, unsigned long n)
2979 +{
2980 + if ((long)n < 0 || n > INT_MAX)
2981 + return n;
2982 +
2983 + if (likely(access_ok(VERIFY_WRITE, to, n))) {
2984 + if (!__builtin_constant_p(n))
2985 + check_object_size(from, n, true);
2986 + n = __copy_to_user(to, from, n);
2987 + }
2988 + return n;
2989 +}
2990 +
2991 +extern unsigned long copy_in_user(void __user *to, const void __user *from,
2992 + unsigned long n);
2993 +
2994 +#endif /* __powerpc64__ */
2995 +
2996 extern unsigned long __clear_user(void __user *addr, unsigned long size);
2997
2998 static inline unsigned long clear_user(void __user *addr, unsigned long size)
2999 diff --git a/arch/powerpc/kernel/cacheinfo.c b/arch/powerpc/kernel/cacheinfo.c
3000 index bb37b1d..01fe9ce 100644
3001 --- a/arch/powerpc/kernel/cacheinfo.c
3002 +++ b/arch/powerpc/kernel/cacheinfo.c
3003 @@ -642,7 +642,7 @@ static struct kobj_attribute *cache_index_opt_attrs[] = {
3004 &cache_assoc_attr,
3005 };
3006
3007 -static struct sysfs_ops cache_index_ops = {
3008 +static const struct sysfs_ops cache_index_ops = {
3009 .show = cache_index_show,
3010 };
3011
3012 diff --git a/arch/powerpc/kernel/dma-iommu.c b/arch/powerpc/kernel/dma-iommu.c
3013 index 37771a5..648530c 100644
3014 --- a/arch/powerpc/kernel/dma-iommu.c
3015 +++ b/arch/powerpc/kernel/dma-iommu.c
3016 @@ -70,7 +70,7 @@ static void dma_iommu_unmap_sg(struct device *dev, struct scatterlist *sglist,
3017 }
3018
3019 /* We support DMA to/from any memory page via the iommu */
3020 -static int dma_iommu_dma_supported(struct device *dev, u64 mask)
3021 +int dma_iommu_dma_supported(struct device *dev, u64 mask)
3022 {
3023 struct iommu_table *tbl = get_iommu_table_base(dev);
3024
3025 diff --git a/arch/powerpc/kernel/dma-swiotlb.c b/arch/powerpc/kernel/dma-swiotlb.c
3026 index e96cbbd..bdd6d41 100644
3027 --- a/arch/powerpc/kernel/dma-swiotlb.c
3028 +++ b/arch/powerpc/kernel/dma-swiotlb.c
3029 @@ -31,7 +31,7 @@ unsigned int ppc_swiotlb_enable;
3030 * map_page, and unmap_page on highmem, use normal dma_ops
3031 * for everything else.
3032 */
3033 -struct dma_map_ops swiotlb_dma_ops = {
3034 +const struct dma_map_ops swiotlb_dma_ops = {
3035 .alloc_coherent = dma_direct_alloc_coherent,
3036 .free_coherent = dma_direct_free_coherent,
3037 .map_sg = swiotlb_map_sg_attrs,
3038 diff --git a/arch/powerpc/kernel/dma.c b/arch/powerpc/kernel/dma.c
3039 index 6215062..ebea59c 100644
3040 --- a/arch/powerpc/kernel/dma.c
3041 +++ b/arch/powerpc/kernel/dma.c
3042 @@ -134,7 +134,7 @@ static inline void dma_direct_sync_single_range(struct device *dev,
3043 }
3044 #endif
3045
3046 -struct dma_map_ops dma_direct_ops = {
3047 +const struct dma_map_ops dma_direct_ops = {
3048 .alloc_coherent = dma_direct_alloc_coherent,
3049 .free_coherent = dma_direct_free_coherent,
3050 .map_sg = dma_direct_map_sg,
3051 diff --git a/arch/powerpc/kernel/exceptions-64e.S b/arch/powerpc/kernel/exceptions-64e.S
3052 index 24dcc0e..a300455 100644
3053 --- a/arch/powerpc/kernel/exceptions-64e.S
3054 +++ b/arch/powerpc/kernel/exceptions-64e.S
3055 @@ -455,6 +455,7 @@ storage_fault_common:
3056 std r14,_DAR(r1)
3057 std r15,_DSISR(r1)
3058 addi r3,r1,STACK_FRAME_OVERHEAD
3059 + bl .save_nvgprs
3060 mr r4,r14
3061 mr r5,r15
3062 ld r14,PACA_EXGEN+EX_R14(r13)
3063 @@ -464,8 +465,7 @@ storage_fault_common:
3064 cmpdi r3,0
3065 bne- 1f
3066 b .ret_from_except_lite
3067 -1: bl .save_nvgprs
3068 - mr r5,r3
3069 +1: mr r5,r3
3070 addi r3,r1,STACK_FRAME_OVERHEAD
3071 ld r4,_DAR(r1)
3072 bl .bad_page_fault
3073 diff --git a/arch/powerpc/kernel/exceptions-64s.S b/arch/powerpc/kernel/exceptions-64s.S
3074 index 1808876..9fd206a 100644
3075 --- a/arch/powerpc/kernel/exceptions-64s.S
3076 +++ b/arch/powerpc/kernel/exceptions-64s.S
3077 @@ -818,10 +818,10 @@ handle_page_fault:
3078 11: ld r4,_DAR(r1)
3079 ld r5,_DSISR(r1)
3080 addi r3,r1,STACK_FRAME_OVERHEAD
3081 + bl .save_nvgprs
3082 bl .do_page_fault
3083 cmpdi r3,0
3084 beq+ 13f
3085 - bl .save_nvgprs
3086 mr r5,r3
3087 addi r3,r1,STACK_FRAME_OVERHEAD
3088 lwz r4,_DAR(r1)
3089 diff --git a/arch/powerpc/kernel/ibmebus.c b/arch/powerpc/kernel/ibmebus.c
3090 index a4c8b38..1b09ad9 100644
3091 --- a/arch/powerpc/kernel/ibmebus.c
3092 +++ b/arch/powerpc/kernel/ibmebus.c
3093 @@ -127,7 +127,7 @@ static int ibmebus_dma_supported(struct device *dev, u64 mask)
3094 return 1;
3095 }
3096
3097 -static struct dma_map_ops ibmebus_dma_ops = {
3098 +static const struct dma_map_ops ibmebus_dma_ops = {
3099 .alloc_coherent = ibmebus_alloc_coherent,
3100 .free_coherent = ibmebus_free_coherent,
3101 .map_sg = ibmebus_map_sg,
3102 diff --git a/arch/powerpc/kernel/kgdb.c b/arch/powerpc/kernel/kgdb.c
3103 index 641c74b..8339ad7 100644
3104 --- a/arch/powerpc/kernel/kgdb.c
3105 +++ b/arch/powerpc/kernel/kgdb.c
3106 @@ -126,7 +126,7 @@ static int kgdb_handle_breakpoint(struct pt_regs *regs)
3107 if (kgdb_handle_exception(0, SIGTRAP, 0, regs) != 0)
3108 return 0;
3109
3110 - if (*(u32 *) (regs->nip) == *(u32 *) (&arch_kgdb_ops.gdb_bpt_instr))
3111 + if (*(u32 *) (regs->nip) == *(const u32 *) (&arch_kgdb_ops.gdb_bpt_instr))
3112 regs->nip += 4;
3113
3114 return 1;
3115 @@ -353,7 +353,7 @@ int kgdb_arch_handle_exception(int vector, int signo, int err_code,
3116 /*
3117 * Global data
3118 */
3119 -struct kgdb_arch arch_kgdb_ops = {
3120 +const struct kgdb_arch arch_kgdb_ops = {
3121 .gdb_bpt_instr = {0x7d, 0x82, 0x10, 0x08},
3122 };
3123
3124 diff --git a/arch/powerpc/kernel/module.c b/arch/powerpc/kernel/module.c
3125 index 477c663..4f50234 100644
3126 --- a/arch/powerpc/kernel/module.c
3127 +++ b/arch/powerpc/kernel/module.c
3128 @@ -31,11 +31,24 @@
3129
3130 LIST_HEAD(module_bug_list);
3131
3132 +#ifdef CONFIG_PAX_KERNEXEC
3133 void *module_alloc(unsigned long size)
3134 {
3135 if (size == 0)
3136 return NULL;
3137
3138 + return vmalloc(size);
3139 +}
3140 +
3141 +void *module_alloc_exec(unsigned long size)
3142 +#else
3143 +void *module_alloc(unsigned long size)
3144 +#endif
3145 +
3146 +{
3147 + if (size == 0)
3148 + return NULL;
3149 +
3150 return vmalloc_exec(size);
3151 }
3152
3153 @@ -45,6 +58,13 @@ void module_free(struct module *mod, void *module_region)
3154 vfree(module_region);
3155 }
3156
3157 +#ifdef CONFIG_PAX_KERNEXEC
3158 +void module_free_exec(struct module *mod, void *module_region)
3159 +{
3160 + module_free(mod, module_region);
3161 +}
3162 +#endif
3163 +
3164 static const Elf_Shdr *find_section(const Elf_Ehdr *hdr,
3165 const Elf_Shdr *sechdrs,
3166 const char *name)
3167 diff --git a/arch/powerpc/kernel/module_32.c b/arch/powerpc/kernel/module_32.c
3168 index f832773..0507238 100644
3169 --- a/arch/powerpc/kernel/module_32.c
3170 +++ b/arch/powerpc/kernel/module_32.c
3171 @@ -162,7 +162,7 @@ int module_frob_arch_sections(Elf32_Ehdr *hdr,
3172 me->arch.core_plt_section = i;
3173 }
3174 if (!me->arch.core_plt_section || !me->arch.init_plt_section) {
3175 - printk("Module doesn't contain .plt or .init.plt sections.\n");
3176 + printk("Module %s doesn't contain .plt or .init.plt sections.\n", me->name);
3177 return -ENOEXEC;
3178 }
3179
3180 @@ -203,11 +203,16 @@ static uint32_t do_plt_call(void *location,
3181
3182 DEBUGP("Doing plt for call to 0x%x at 0x%x\n", val, (unsigned int)location);
3183 /* Init, or core PLT? */
3184 - if (location >= mod->module_core
3185 - && location < mod->module_core + mod->core_size)
3186 + if ((location >= mod->module_core_rx && location < mod->module_core_rx + mod->core_size_rx) ||
3187 + (location >= mod->module_core_rw && location < mod->module_core_rw + mod->core_size_rw))
3188 entry = (void *)sechdrs[mod->arch.core_plt_section].sh_addr;
3189 - else
3190 + else if ((location >= mod->module_init_rx && location < mod->module_init_rx + mod->init_size_rx) ||
3191 + (location >= mod->module_init_rw && location < mod->module_init_rw + mod->init_size_rw))
3192 entry = (void *)sechdrs[mod->arch.init_plt_section].sh_addr;
3193 + else {
3194 + printk(KERN_ERR "%s: invalid R_PPC_REL24 entry found\n", mod->name);
3195 + return ~0UL;
3196 + }
3197
3198 /* Find this entry, or if that fails, the next avail. entry */
3199 while (entry->jump[0]) {
3200 diff --git a/arch/powerpc/kernel/pci-common.c b/arch/powerpc/kernel/pci-common.c
3201 index cadbed6..b9bbb00 100644
3202 --- a/arch/powerpc/kernel/pci-common.c
3203 +++ b/arch/powerpc/kernel/pci-common.c
3204 @@ -50,14 +50,14 @@ resource_size_t isa_mem_base;
3205 unsigned int ppc_pci_flags = 0;
3206
3207
3208 -static struct dma_map_ops *pci_dma_ops = &dma_direct_ops;
3209 +static const struct dma_map_ops *pci_dma_ops = &dma_direct_ops;
3210
3211 -void set_pci_dma_ops(struct dma_map_ops *dma_ops)
3212 +void set_pci_dma_ops(const struct dma_map_ops *dma_ops)
3213 {
3214 pci_dma_ops = dma_ops;
3215 }
3216
3217 -struct dma_map_ops *get_pci_dma_ops(void)
3218 +const struct dma_map_ops *get_pci_dma_ops(void)
3219 {
3220 return pci_dma_ops;
3221 }
3222 diff --git a/arch/powerpc/kernel/process.c b/arch/powerpc/kernel/process.c
3223 index 7b816da..8d5c277 100644
3224 --- a/arch/powerpc/kernel/process.c
3225 +++ b/arch/powerpc/kernel/process.c
3226 @@ -539,8 +539,8 @@ void show_regs(struct pt_regs * regs)
3227 * Lookup NIP late so we have the best change of getting the
3228 * above info out without failing
3229 */
3230 - printk("NIP ["REG"] %pS\n", regs->nip, (void *)regs->nip);
3231 - printk("LR ["REG"] %pS\n", regs->link, (void *)regs->link);
3232 + printk("NIP ["REG"] %pA\n", regs->nip, (void *)regs->nip);
3233 + printk("LR ["REG"] %pA\n", regs->link, (void *)regs->link);
3234 #endif
3235 show_stack(current, (unsigned long *) regs->gpr[1]);
3236 if (!user_mode(regs))
3237 @@ -1034,10 +1034,10 @@ void show_stack(struct task_struct *tsk, unsigned long *stack)
3238 newsp = stack[0];
3239 ip = stack[STACK_FRAME_LR_SAVE];
3240 if (!firstframe || ip != lr) {
3241 - printk("["REG"] ["REG"] %pS", sp, ip, (void *)ip);
3242 + printk("["REG"] ["REG"] %pA", sp, ip, (void *)ip);
3243 #ifdef CONFIG_FUNCTION_GRAPH_TRACER
3244 if ((ip == rth || ip == mrth) && curr_frame >= 0) {
3245 - printk(" (%pS)",
3246 + printk(" (%pA)",
3247 (void *)current->ret_stack[curr_frame].ret);
3248 curr_frame--;
3249 }
3250 @@ -1057,7 +1057,7 @@ void show_stack(struct task_struct *tsk, unsigned long *stack)
3251 struct pt_regs *regs = (struct pt_regs *)
3252 (sp + STACK_FRAME_OVERHEAD);
3253 lr = regs->link;
3254 - printk("--- Exception: %lx at %pS\n LR = %pS\n",
3255 + printk("--- Exception: %lx at %pA\n LR = %pA\n",
3256 regs->trap, (void *)regs->nip, (void *)lr);
3257 firstframe = 1;
3258 }
3259 @@ -1134,58 +1134,3 @@ void thread_info_cache_init(void)
3260 }
3261
3262 #endif /* THREAD_SHIFT < PAGE_SHIFT */
3263 -
3264 -unsigned long arch_align_stack(unsigned long sp)
3265 -{
3266 - if (!(current->personality & ADDR_NO_RANDOMIZE) && randomize_va_space)
3267 - sp -= get_random_int() & ~PAGE_MASK;
3268 - return sp & ~0xf;
3269 -}
3270 -
3271 -static inline unsigned long brk_rnd(void)
3272 -{
3273 - unsigned long rnd = 0;
3274 -
3275 - /* 8MB for 32bit, 1GB for 64bit */
3276 - if (is_32bit_task())
3277 - rnd = (long)(get_random_int() % (1<<(23-PAGE_SHIFT)));
3278 - else
3279 - rnd = (long)(get_random_int() % (1<<(30-PAGE_SHIFT)));
3280 -
3281 - return rnd << PAGE_SHIFT;
3282 -}
3283 -
3284 -unsigned long arch_randomize_brk(struct mm_struct *mm)
3285 -{
3286 - unsigned long base = mm->brk;
3287 - unsigned long ret;
3288 -
3289 -#ifdef CONFIG_PPC_STD_MMU_64
3290 - /*
3291 - * If we are using 1TB segments and we are allowed to randomise
3292 - * the heap, we can put it above 1TB so it is backed by a 1TB
3293 - * segment. Otherwise the heap will be in the bottom 1TB
3294 - * which always uses 256MB segments and this may result in a
3295 - * performance penalty.
3296 - */
3297 - if (!is_32bit_task() && (mmu_highuser_ssize == MMU_SEGSIZE_1T))
3298 - base = max_t(unsigned long, mm->brk, 1UL << SID_SHIFT_1T);
3299 -#endif
3300 -
3301 - ret = PAGE_ALIGN(base + brk_rnd());
3302 -
3303 - if (ret < mm->brk)
3304 - return mm->brk;
3305 -
3306 - return ret;
3307 -}
3308 -
3309 -unsigned long randomize_et_dyn(unsigned long base)
3310 -{
3311 - unsigned long ret = PAGE_ALIGN(base + brk_rnd());
3312 -
3313 - if (ret < base)
3314 - return base;
3315 -
3316 - return ret;
3317 -}
3318 diff --git a/arch/powerpc/kernel/ptrace.c b/arch/powerpc/kernel/ptrace.c
3319 index ef14988..856c4bc 100644
3320 --- a/arch/powerpc/kernel/ptrace.c
3321 +++ b/arch/powerpc/kernel/ptrace.c
3322 @@ -86,7 +86,7 @@ static int set_user_trap(struct task_struct *task, unsigned long trap)
3323 /*
3324 * Get contents of register REGNO in task TASK.
3325 */
3326 -unsigned long ptrace_get_reg(struct task_struct *task, int regno)
3327 +unsigned long ptrace_get_reg(struct task_struct *task, unsigned int regno)
3328 {
3329 if (task->thread.regs == NULL)
3330 return -EIO;
3331 @@ -894,7 +894,7 @@ long arch_ptrace(struct task_struct *child, long request, long addr, long data)
3332
3333 CHECK_FULL_REGS(child->thread.regs);
3334 if (index < PT_FPR0) {
3335 - tmp = ptrace_get_reg(child, (int) index);
3336 + tmp = ptrace_get_reg(child, index);
3337 } else {
3338 flush_fp_to_thread(child);
3339 tmp = ((unsigned long *)child->thread.fpr)
3340 diff --git a/arch/powerpc/kernel/signal_32.c b/arch/powerpc/kernel/signal_32.c
3341 index d670429..2bc59b2 100644
3342 --- a/arch/powerpc/kernel/signal_32.c
3343 +++ b/arch/powerpc/kernel/signal_32.c
3344 @@ -857,7 +857,7 @@ int handle_rt_signal32(unsigned long sig, struct k_sigaction *ka,
3345 /* Save user registers on the stack */
3346 frame = &rt_sf->uc.uc_mcontext;
3347 addr = frame;
3348 - if (vdso32_rt_sigtramp && current->mm->context.vdso_base) {
3349 + if (vdso32_rt_sigtramp && current->mm->context.vdso_base != ~0UL) {
3350 if (save_user_regs(regs, frame, 0, 1))
3351 goto badframe;
3352 regs->link = current->mm->context.vdso_base + vdso32_rt_sigtramp;
3353 diff --git a/arch/powerpc/kernel/signal_64.c b/arch/powerpc/kernel/signal_64.c
3354 index 2fe6fc6..ada0d96 100644
3355 --- a/arch/powerpc/kernel/signal_64.c
3356 +++ b/arch/powerpc/kernel/signal_64.c
3357 @@ -429,7 +429,7 @@ int handle_rt_signal64(int signr, struct k_sigaction *ka, siginfo_t *info,
3358 current->thread.fpscr.val = 0;
3359
3360 /* Set up to return from userspace. */
3361 - if (vdso64_rt_sigtramp && current->mm->context.vdso_base) {
3362 + if (vdso64_rt_sigtramp && current->mm->context.vdso_base != ~0UL) {
3363 regs->link = current->mm->context.vdso_base + vdso64_rt_sigtramp;
3364 } else {
3365 err |= setup_trampoline(__NR_rt_sigreturn, &frame->tramp[0]);
3366 diff --git a/arch/powerpc/kernel/sys_ppc32.c b/arch/powerpc/kernel/sys_ppc32.c
3367 index b97c2d6..dd01a6a 100644
3368 --- a/arch/powerpc/kernel/sys_ppc32.c
3369 +++ b/arch/powerpc/kernel/sys_ppc32.c
3370 @@ -563,10 +563,10 @@ asmlinkage long compat_sys_sysctl(struct __sysctl_args32 __user *args)
3371 if (oldlenp) {
3372 if (!error) {
3373 if (get_user(oldlen, oldlenp) ||
3374 - put_user(oldlen, (compat_size_t __user *)compat_ptr(tmp.oldlenp)))
3375 + put_user(oldlen, (compat_size_t __user *)compat_ptr(tmp.oldlenp)) ||
3376 + copy_to_user(args->__unused, tmp.__unused, sizeof(tmp.__unused)))
3377 error = -EFAULT;
3378 }
3379 - copy_to_user(args->__unused, tmp.__unused, sizeof(tmp.__unused));
3380 }
3381 return error;
3382 }
3383 diff --git a/arch/powerpc/kernel/traps.c b/arch/powerpc/kernel/traps.c
3384 index 6f0ae1a..e4b6a56 100644
3385 --- a/arch/powerpc/kernel/traps.c
3386 +++ b/arch/powerpc/kernel/traps.c
3387 @@ -99,6 +99,8 @@ static void pmac_backlight_unblank(void)
3388 static inline void pmac_backlight_unblank(void) { }
3389 #endif
3390
3391 +extern void gr_handle_kernel_exploit(void);
3392 +
3393 int die(const char *str, struct pt_regs *regs, long err)
3394 {
3395 static struct {
3396 @@ -168,6 +170,8 @@ int die(const char *str, struct pt_regs *regs, long err)
3397 if (panic_on_oops)
3398 panic("Fatal exception");
3399
3400 + gr_handle_kernel_exploit();
3401 +
3402 oops_exit();
3403 do_exit(err);
3404
3405 diff --git a/arch/powerpc/kernel/vdso.c b/arch/powerpc/kernel/vdso.c
3406 index 137dc22..fe57a79 100644
3407 --- a/arch/powerpc/kernel/vdso.c
3408 +++ b/arch/powerpc/kernel/vdso.c
3409 @@ -36,6 +36,7 @@
3410 #include <asm/firmware.h>
3411 #include <asm/vdso.h>
3412 #include <asm/vdso_datapage.h>
3413 +#include <asm/mman.h>
3414
3415 #include "setup.h"
3416
3417 @@ -220,7 +221,7 @@ int arch_setup_additional_pages(struct linux_binprm *bprm, int uses_interp)
3418 vdso_base = VDSO32_MBASE;
3419 #endif
3420
3421 - current->mm->context.vdso_base = 0;
3422 + current->mm->context.vdso_base = ~0UL;
3423
3424 /* vDSO has a problem and was disabled, just don't "enable" it for the
3425 * process
3426 @@ -240,7 +241,7 @@ int arch_setup_additional_pages(struct linux_binprm *bprm, int uses_interp)
3427 vdso_base = get_unmapped_area(NULL, vdso_base,
3428 (vdso_pages << PAGE_SHIFT) +
3429 ((VDSO_ALIGNMENT - 1) & PAGE_MASK),
3430 - 0, 0);
3431 + 0, MAP_PRIVATE | MAP_EXECUTABLE);
3432 if (IS_ERR_VALUE(vdso_base)) {
3433 rc = vdso_base;
3434 goto fail_mmapsem;
3435 diff --git a/arch/powerpc/kernel/vio.c b/arch/powerpc/kernel/vio.c
3436 index 77f6421..829564a 100644
3437 --- a/arch/powerpc/kernel/vio.c
3438 +++ b/arch/powerpc/kernel/vio.c
3439 @@ -601,11 +601,12 @@ static void vio_dma_iommu_unmap_sg(struct device *dev,
3440 vio_cmo_dealloc(viodev, alloc_size);
3441 }
3442
3443 -struct dma_map_ops vio_dma_mapping_ops = {
3444 +static const struct dma_map_ops vio_dma_mapping_ops = {
3445 .alloc_coherent = vio_dma_iommu_alloc_coherent,
3446 .free_coherent = vio_dma_iommu_free_coherent,
3447 .map_sg = vio_dma_iommu_map_sg,
3448 .unmap_sg = vio_dma_iommu_unmap_sg,
3449 + .dma_supported = dma_iommu_dma_supported,
3450 .map_page = vio_dma_iommu_map_page,
3451 .unmap_page = vio_dma_iommu_unmap_page,
3452
3453 @@ -857,7 +858,6 @@ static void vio_cmo_bus_remove(struct vio_dev *viodev)
3454
3455 static void vio_cmo_set_dma_ops(struct vio_dev *viodev)
3456 {
3457 - vio_dma_mapping_ops.dma_supported = dma_iommu_ops.dma_supported;
3458 viodev->dev.archdata.dma_ops = &vio_dma_mapping_ops;
3459 }
3460
3461 diff --git a/arch/powerpc/lib/usercopy_64.c b/arch/powerpc/lib/usercopy_64.c
3462 index 5eea6f3..5d10396 100644
3463 --- a/arch/powerpc/lib/usercopy_64.c
3464 +++ b/arch/powerpc/lib/usercopy_64.c
3465 @@ -9,22 +9,6 @@
3466 #include <linux/module.h>
3467 #include <asm/uaccess.h>
3468
3469 -unsigned long copy_from_user(void *to, const void __user *from, unsigned long n)
3470 -{
3471 - if (likely(access_ok(VERIFY_READ, from, n)))
3472 - n = __copy_from_user(to, from, n);
3473 - else
3474 - memset(to, 0, n);
3475 - return n;
3476 -}
3477 -
3478 -unsigned long copy_to_user(void __user *to, const void *from, unsigned long n)
3479 -{
3480 - if (likely(access_ok(VERIFY_WRITE, to, n)))
3481 - n = __copy_to_user(to, from, n);
3482 - return n;
3483 -}
3484 -
3485 unsigned long copy_in_user(void __user *to, const void __user *from,
3486 unsigned long n)
3487 {
3488 @@ -35,7 +19,5 @@ unsigned long copy_in_user(void __user *to, const void __user *from,
3489 return n;
3490 }
3491
3492 -EXPORT_SYMBOL(copy_from_user);
3493 -EXPORT_SYMBOL(copy_to_user);
3494 EXPORT_SYMBOL(copy_in_user);
3495
3496 diff --git a/arch/powerpc/mm/fault.c b/arch/powerpc/mm/fault.c
3497 index e7dae82..877ce0d 100644
3498 --- a/arch/powerpc/mm/fault.c
3499 +++ b/arch/powerpc/mm/fault.c
3500 @@ -30,6 +30,10 @@
3501 #include <linux/kprobes.h>
3502 #include <linux/kdebug.h>
3503 #include <linux/perf_event.h>
3504 +#include <linux/slab.h>
3505 +#include <linux/pagemap.h>
3506 +#include <linux/compiler.h>
3507 +#include <linux/unistd.h>
3508
3509 #include <asm/firmware.h>
3510 #include <asm/page.h>
3511 @@ -40,6 +44,7 @@
3512 #include <asm/uaccess.h>
3513 #include <asm/tlbflush.h>
3514 #include <asm/siginfo.h>
3515 +#include <asm/ptrace.h>
3516
3517
3518 #ifdef CONFIG_KPROBES
3519 @@ -64,6 +69,33 @@ static inline int notify_page_fault(struct pt_regs *regs)
3520 }
3521 #endif
3522
3523 +#ifdef CONFIG_PAX_PAGEEXEC
3524 +/*
3525 + * PaX: decide what to do with offenders (regs->nip = fault address)
3526 + *
3527 + * returns 1 when task should be killed
3528 + */
3529 +static int pax_handle_fetch_fault(struct pt_regs *regs)
3530 +{
3531 + return 1;
3532 +}
3533 +
3534 +void pax_report_insns(struct pt_regs *regs, void *pc, void *sp)
3535 +{
3536 + unsigned long i;
3537 +
3538 + printk(KERN_ERR "PAX: bytes at PC: ");
3539 + for (i = 0; i < 5; i++) {
3540 + unsigned int c;
3541 + if (get_user(c, (unsigned int __user *)pc+i))
3542 + printk(KERN_CONT "???????? ");
3543 + else
3544 + printk(KERN_CONT "%08x ", c);
3545 + }
3546 + printk("\n");
3547 +}
3548 +#endif
3549 +
3550 /*
3551 * Check whether the instruction at regs->nip is a store using
3552 * an update addressing form which will update r1.
3553 @@ -134,7 +166,7 @@ int __kprobes do_page_fault(struct pt_regs *regs, unsigned long address,
3554 * indicate errors in DSISR but can validly be set in SRR1.
3555 */
3556 if (trap == 0x400)
3557 - error_code &= 0x48200000;
3558 + error_code &= 0x58200000;
3559 else
3560 is_write = error_code & DSISR_ISSTORE;
3561 #else
3562 @@ -250,7 +282,7 @@ good_area:
3563 * "undefined". Of those that can be set, this is the only
3564 * one which seems bad.
3565 */
3566 - if (error_code & 0x10000000)
3567 + if (error_code & DSISR_GUARDED)
3568 /* Guarded storage error. */
3569 goto bad_area;
3570 #endif /* CONFIG_8xx */
3571 @@ -265,7 +297,7 @@ good_area:
3572 * processors use the same I/D cache coherency mechanism
3573 * as embedded.
3574 */
3575 - if (error_code & DSISR_PROTFAULT)
3576 + if (error_code & (DSISR_PROTFAULT | DSISR_GUARDED))
3577 goto bad_area;
3578 #endif /* CONFIG_PPC_STD_MMU */
3579
3580 @@ -335,6 +367,23 @@ bad_area:
3581 bad_area_nosemaphore:
3582 /* User mode accesses cause a SIGSEGV */
3583 if (user_mode(regs)) {
3584 +
3585 +#ifdef CONFIG_PAX_PAGEEXEC
3586 + if (mm->pax_flags & MF_PAX_PAGEEXEC) {
3587 +#ifdef CONFIG_PPC_STD_MMU
3588 + if (is_exec && (error_code & (DSISR_PROTFAULT | DSISR_GUARDED))) {
3589 +#else
3590 + if (is_exec && regs->nip == address) {
3591 +#endif
3592 + switch (pax_handle_fetch_fault(regs)) {
3593 + }
3594 +
3595 + pax_report_fault(regs, (void *)regs->nip, (void *)regs->gpr[PT_R1]);
3596 + do_group_exit(SIGKILL);
3597 + }
3598 + }
3599 +#endif
3600 +
3601 _exception(SIGSEGV, regs, code, address);
3602 return 0;
3603 }
3604 diff --git a/arch/powerpc/mm/mem.c b/arch/powerpc/mm/mem.c
3605 index 5973631..ad617af 100644
3606 --- a/arch/powerpc/mm/mem.c
3607 +++ b/arch/powerpc/mm/mem.c
3608 @@ -250,7 +250,7 @@ static int __init mark_nonram_nosave(void)
3609 {
3610 unsigned long lmb_next_region_start_pfn,
3611 lmb_region_max_pfn;
3612 - int i;
3613 + unsigned int i;
3614
3615 for (i = 0; i < lmb.memory.cnt - 1; i++) {
3616 lmb_region_max_pfn =
3617 diff --git a/arch/powerpc/mm/mmap_64.c b/arch/powerpc/mm/mmap_64.c
3618 index 0d957a4..26d968f 100644
3619 --- a/arch/powerpc/mm/mmap_64.c
3620 +++ b/arch/powerpc/mm/mmap_64.c
3621 @@ -99,10 +99,22 @@ void arch_pick_mmap_layout(struct mm_struct *mm)
3622 */
3623 if (mmap_is_legacy()) {
3624 mm->mmap_base = TASK_UNMAPPED_BASE;
3625 +
3626 +#ifdef CONFIG_PAX_RANDMMAP
3627 + if (mm->pax_flags & MF_PAX_RANDMMAP)
3628 + mm->mmap_base += mm->delta_mmap;
3629 +#endif
3630 +
3631 mm->get_unmapped_area = arch_get_unmapped_area;
3632 mm->unmap_area = arch_unmap_area;
3633 } else {
3634 mm->mmap_base = mmap_base();
3635 +
3636 +#ifdef CONFIG_PAX_RANDMMAP
3637 + if (mm->pax_flags & MF_PAX_RANDMMAP)
3638 + mm->mmap_base -= mm->delta_mmap + mm->delta_stack;
3639 +#endif
3640 +
3641 mm->get_unmapped_area = arch_get_unmapped_area_topdown;
3642 mm->unmap_area = arch_unmap_area_topdown;
3643 }
3644 diff --git a/arch/powerpc/mm/slice.c b/arch/powerpc/mm/slice.c
3645 index ba51948..23009d9 100644
3646 --- a/arch/powerpc/mm/slice.c
3647 +++ b/arch/powerpc/mm/slice.c
3648 @@ -98,7 +98,7 @@ static int slice_area_is_free(struct mm_struct *mm, unsigned long addr,
3649 if ((mm->task_size - len) < addr)
3650 return 0;
3651 vma = find_vma(mm, addr);
3652 - return (!vma || (addr + len) <= vma->vm_start);
3653 + return check_heap_stack_gap(vma, addr, len);
3654 }
3655
3656 static int slice_low_has_vma(struct mm_struct *mm, unsigned long slice)
3657 @@ -256,7 +256,7 @@ full_search:
3658 addr = _ALIGN_UP(addr + 1, 1ul << SLICE_HIGH_SHIFT);
3659 continue;
3660 }
3661 - if (!vma || addr + len <= vma->vm_start) {
3662 + if (check_heap_stack_gap(vma, addr, len)) {
3663 /*
3664 * Remember the place where we stopped the search:
3665 */
3666 @@ -313,10 +313,14 @@ static unsigned long slice_find_area_topdown(struct mm_struct *mm,
3667 }
3668 }
3669
3670 - addr = mm->mmap_base;
3671 - while (addr > len) {
3672 + if (mm->mmap_base < len)
3673 + addr = -ENOMEM;
3674 + else
3675 + addr = mm->mmap_base - len;
3676 +
3677 + while (!IS_ERR_VALUE(addr)) {
3678 /* Go down by chunk size */
3679 - addr = _ALIGN_DOWN(addr - len, 1ul << pshift);
3680 + addr = _ALIGN_DOWN(addr, 1ul << pshift);
3681
3682 /* Check for hit with different page size */
3683 mask = slice_range_to_mask(addr, len);
3684 @@ -336,7 +340,7 @@ static unsigned long slice_find_area_topdown(struct mm_struct *mm,
3685 * return with success:
3686 */
3687 vma = find_vma(mm, addr);
3688 - if (!vma || (addr + len) <= vma->vm_start) {
3689 + if (check_heap_stack_gap(vma, addr, len)) {
3690 /* remember the address as a hint for next time */
3691 if (use_cache)
3692 mm->free_area_cache = addr;
3693 @@ -348,7 +352,7 @@ static unsigned long slice_find_area_topdown(struct mm_struct *mm,
3694 mm->cached_hole_size = vma->vm_start - addr;
3695
3696 /* try just below the current vma->vm_start */
3697 - addr = vma->vm_start;
3698 + addr = skip_heap_stack_gap(vma, len);
3699 }
3700
3701 /*
3702 @@ -426,6 +430,11 @@ unsigned long slice_get_unmapped_area(unsigned long addr, unsigned long len,
3703 if (fixed && addr > (mm->task_size - len))
3704 return -EINVAL;
3705
3706 +#ifdef CONFIG_PAX_RANDMMAP
3707 + if (!fixed && (mm->pax_flags & MF_PAX_RANDMMAP))
3708 + addr = 0;
3709 +#endif
3710 +
3711 /* If hint, make sure it matches our alignment restrictions */
3712 if (!fixed && addr) {
3713 addr = _ALIGN_UP(addr, 1ul << pshift);
3714 diff --git a/arch/powerpc/platforms/52xx/lite5200_pm.c b/arch/powerpc/platforms/52xx/lite5200_pm.c
3715 index b5c753d..8f01abe 100644
3716 --- a/arch/powerpc/platforms/52xx/lite5200_pm.c
3717 +++ b/arch/powerpc/platforms/52xx/lite5200_pm.c
3718 @@ -235,7 +235,7 @@ static void lite5200_pm_end(void)
3719 lite5200_pm_target_state = PM_SUSPEND_ON;
3720 }
3721
3722 -static struct platform_suspend_ops lite5200_pm_ops = {
3723 +static const struct platform_suspend_ops lite5200_pm_ops = {
3724 .valid = lite5200_pm_valid,
3725 .begin = lite5200_pm_begin,
3726 .prepare = lite5200_pm_prepare,
3727 diff --git a/arch/powerpc/platforms/52xx/mpc52xx_pm.c b/arch/powerpc/platforms/52xx/mpc52xx_pm.c
3728 index a55b0b6..478c18e 100644
3729 --- a/arch/powerpc/platforms/52xx/mpc52xx_pm.c
3730 +++ b/arch/powerpc/platforms/52xx/mpc52xx_pm.c
3731 @@ -180,7 +180,7 @@ void mpc52xx_pm_finish(void)
3732 iounmap(mbar);
3733 }
3734
3735 -static struct platform_suspend_ops mpc52xx_pm_ops = {
3736 +static const struct platform_suspend_ops mpc52xx_pm_ops = {
3737 .valid = mpc52xx_pm_valid,
3738 .prepare = mpc52xx_pm_prepare,
3739 .enter = mpc52xx_pm_enter,
3740 diff --git a/arch/powerpc/platforms/83xx/suspend.c b/arch/powerpc/platforms/83xx/suspend.c
3741 index 08e65fc..643d3ac 100644
3742 --- a/arch/powerpc/platforms/83xx/suspend.c
3743 +++ b/arch/powerpc/platforms/83xx/suspend.c
3744 @@ -273,7 +273,7 @@ static int mpc83xx_is_pci_agent(void)
3745 return ret;
3746 }
3747
3748 -static struct platform_suspend_ops mpc83xx_suspend_ops = {
3749 +static const struct platform_suspend_ops mpc83xx_suspend_ops = {
3750 .valid = mpc83xx_suspend_valid,
3751 .begin = mpc83xx_suspend_begin,
3752 .enter = mpc83xx_suspend_enter,
3753 diff --git a/arch/powerpc/platforms/cell/iommu.c b/arch/powerpc/platforms/cell/iommu.c
3754 index ca5bfdf..1602e09 100644
3755 --- a/arch/powerpc/platforms/cell/iommu.c
3756 +++ b/arch/powerpc/platforms/cell/iommu.c
3757 @@ -642,7 +642,7 @@ static int dma_fixed_dma_supported(struct device *dev, u64 mask)
3758
3759 static int dma_set_mask_and_switch(struct device *dev, u64 dma_mask);
3760
3761 -struct dma_map_ops dma_iommu_fixed_ops = {
3762 +const struct dma_map_ops dma_iommu_fixed_ops = {
3763 .alloc_coherent = dma_fixed_alloc_coherent,
3764 .free_coherent = dma_fixed_free_coherent,
3765 .map_sg = dma_fixed_map_sg,
3766 diff --git a/arch/powerpc/platforms/ps3/system-bus.c b/arch/powerpc/platforms/ps3/system-bus.c
3767 index e34b305..20e48ec 100644
3768 --- a/arch/powerpc/platforms/ps3/system-bus.c
3769 +++ b/arch/powerpc/platforms/ps3/system-bus.c
3770 @@ -694,7 +694,7 @@ static int ps3_dma_supported(struct device *_dev, u64 mask)
3771 return mask >= DMA_BIT_MASK(32);
3772 }
3773
3774 -static struct dma_map_ops ps3_sb_dma_ops = {
3775 +static const struct dma_map_ops ps3_sb_dma_ops = {
3776 .alloc_coherent = ps3_alloc_coherent,
3777 .free_coherent = ps3_free_coherent,
3778 .map_sg = ps3_sb_map_sg,
3779 @@ -704,7 +704,7 @@ static struct dma_map_ops ps3_sb_dma_ops = {
3780 .unmap_page = ps3_unmap_page,
3781 };
3782
3783 -static struct dma_map_ops ps3_ioc0_dma_ops = {
3784 +static const struct dma_map_ops ps3_ioc0_dma_ops = {
3785 .alloc_coherent = ps3_alloc_coherent,
3786 .free_coherent = ps3_free_coherent,
3787 .map_sg = ps3_ioc0_map_sg,
3788 diff --git a/arch/powerpc/platforms/pseries/Kconfig b/arch/powerpc/platforms/pseries/Kconfig
3789 index f0e6f28..60d53ed 100644
3790 --- a/arch/powerpc/platforms/pseries/Kconfig
3791 +++ b/arch/powerpc/platforms/pseries/Kconfig
3792 @@ -2,6 +2,8 @@ config PPC_PSERIES
3793 depends on PPC64 && PPC_BOOK3S
3794 bool "IBM pSeries & new (POWER5-based) iSeries"
3795 select MPIC
3796 + select PCI_MSI
3797 + select XICS
3798 select PPC_I8259
3799 select PPC_RTAS
3800 select RTAS_ERROR_LOGGING
3801 diff --git a/arch/s390/Kconfig b/arch/s390/Kconfig
3802 index 43c0aca..42c045b 100644
3803 --- a/arch/s390/Kconfig
3804 +++ b/arch/s390/Kconfig
3805 @@ -194,28 +194,26 @@ config AUDIT_ARCH
3806
3807 config S390_SWITCH_AMODE
3808 bool "Switch kernel/user addressing modes"
3809 + default y
3810 help
3811 This option allows to switch the addressing modes of kernel and user
3812 - space. The kernel parameter switch_amode=on will enable this feature,
3813 - default is disabled. Enabling this (via kernel parameter) on machines
3814 - earlier than IBM System z9-109 EC/BC will reduce system performance.
3815 + space. Enabling this on machines earlier than IBM System z9-109 EC/BC
3816 + will reduce system performance.
3817
3818 Note that this option will also be selected by selecting the execute
3819 - protection option below. Enabling the execute protection via the
3820 - noexec kernel parameter will also switch the addressing modes,
3821 - independent of the switch_amode kernel parameter.
3822 + protection option below. Enabling the execute protection will also
3823 + switch the addressing modes, independent of this option.
3824
3825
3826 config S390_EXEC_PROTECT
3827 bool "Data execute protection"
3828 + default y
3829 select S390_SWITCH_AMODE
3830 help
3831 This option allows to enable a buffer overflow protection for user
3832 space programs and it also selects the addressing mode option above.
3833 - The kernel parameter noexec=on will enable this feature and also
3834 - switch the addressing modes, default is disabled. Enabling this (via
3835 - kernel parameter) on machines earlier than IBM System z9-109 EC/BC
3836 - will reduce system performance.
3837 + Enabling this on machines earlier than IBM System z9-109 EC/BC will
3838 + reduce system performance.
3839
3840 comment "Code generation options"
3841
3842 diff --git a/arch/s390/include/asm/elf.h b/arch/s390/include/asm/elf.h
3843 index e885442..5e6c303 100644
3844 --- a/arch/s390/include/asm/elf.h
3845 +++ b/arch/s390/include/asm/elf.h
3846 @@ -164,6 +164,13 @@ extern unsigned int vdso_enabled;
3847 that it will "exec", and that there is sufficient room for the brk. */
3848 #define ELF_ET_DYN_BASE (STACK_TOP / 3 * 2)
3849
3850 +#ifdef CONFIG_PAX_ASLR
3851 +#define PAX_ELF_ET_DYN_BASE (test_thread_flag(TIF_31BIT) ? 0x10000UL : 0x80000000UL)
3852 +
3853 +#define PAX_DELTA_MMAP_LEN (test_thread_flag(TIF_31BIT) ? 15 : 26 )
3854 +#define PAX_DELTA_STACK_LEN (test_thread_flag(TIF_31BIT) ? 15 : 26 )
3855 +#endif
3856 +
3857 /* This yields a mask that user programs can use to figure out what
3858 instruction set this CPU supports. */
3859
3860 diff --git a/arch/s390/include/asm/setup.h b/arch/s390/include/asm/setup.h
3861 index e37478e..9ce0e9f 100644
3862 --- a/arch/s390/include/asm/setup.h
3863 +++ b/arch/s390/include/asm/setup.h
3864 @@ -50,13 +50,13 @@ extern unsigned long memory_end;
3865 void detect_memory_layout(struct mem_chunk chunk[]);
3866
3867 #ifdef CONFIG_S390_SWITCH_AMODE
3868 -extern unsigned int switch_amode;
3869 +#define switch_amode (1)
3870 #else
3871 #define switch_amode (0)
3872 #endif
3873
3874 #ifdef CONFIG_S390_EXEC_PROTECT
3875 -extern unsigned int s390_noexec;
3876 +#define s390_noexec (1)
3877 #else
3878 #define s390_noexec (0)
3879 #endif
3880 diff --git a/arch/s390/include/asm/uaccess.h b/arch/s390/include/asm/uaccess.h
3881 index 8377e91..e28e6f1 100644
3882 --- a/arch/s390/include/asm/uaccess.h
3883 +++ b/arch/s390/include/asm/uaccess.h
3884 @@ -232,6 +232,10 @@ static inline unsigned long __must_check
3885 copy_to_user(void __user *to, const void *from, unsigned long n)
3886 {
3887 might_fault();
3888 +
3889 + if ((long)n < 0)
3890 + return n;
3891 +
3892 if (access_ok(VERIFY_WRITE, to, n))
3893 n = __copy_to_user(to, from, n);
3894 return n;
3895 @@ -257,6 +261,9 @@ copy_to_user(void __user *to, const void *from, unsigned long n)
3896 static inline unsigned long __must_check
3897 __copy_from_user(void *to, const void __user *from, unsigned long n)
3898 {
3899 + if ((long)n < 0)
3900 + return n;
3901 +
3902 if (__builtin_constant_p(n) && (n <= 256))
3903 return uaccess.copy_from_user_small(n, from, to);
3904 else
3905 @@ -283,6 +290,10 @@ static inline unsigned long __must_check
3906 copy_from_user(void *to, const void __user *from, unsigned long n)
3907 {
3908 might_fault();
3909 +
3910 + if ((long)n < 0)
3911 + return n;
3912 +
3913 if (access_ok(VERIFY_READ, from, n))
3914 n = __copy_from_user(to, from, n);
3915 else
3916 diff --git a/arch/s390/kernel/module.c b/arch/s390/kernel/module.c
3917 index 639380a..72e3c02 100644
3918 --- a/arch/s390/kernel/module.c
3919 +++ b/arch/s390/kernel/module.c
3920 @@ -166,11 +166,11 @@ module_frob_arch_sections(Elf_Ehdr *hdr, Elf_Shdr *sechdrs,
3921
3922 /* Increase core size by size of got & plt and set start
3923 offsets for got and plt. */
3924 - me->core_size = ALIGN(me->core_size, 4);
3925 - me->arch.got_offset = me->core_size;
3926 - me->core_size += me->arch.got_size;
3927 - me->arch.plt_offset = me->core_size;
3928 - me->core_size += me->arch.plt_size;
3929 + me->core_size_rw = ALIGN(me->core_size_rw, 4);
3930 + me->arch.got_offset = me->core_size_rw;
3931 + me->core_size_rw += me->arch.got_size;
3932 + me->arch.plt_offset = me->core_size_rx;
3933 + me->core_size_rx += me->arch.plt_size;
3934 return 0;
3935 }
3936
3937 @@ -256,7 +256,7 @@ apply_rela(Elf_Rela *rela, Elf_Addr base, Elf_Sym *symtab,
3938 if (info->got_initialized == 0) {
3939 Elf_Addr *gotent;
3940
3941 - gotent = me->module_core + me->arch.got_offset +
3942 + gotent = me->module_core_rw + me->arch.got_offset +
3943 info->got_offset;
3944 *gotent = val;
3945 info->got_initialized = 1;
3946 @@ -280,7 +280,7 @@ apply_rela(Elf_Rela *rela, Elf_Addr base, Elf_Sym *symtab,
3947 else if (r_type == R_390_GOTENT ||
3948 r_type == R_390_GOTPLTENT)
3949 *(unsigned int *) loc =
3950 - (val + (Elf_Addr) me->module_core - loc) >> 1;
3951 + (val + (Elf_Addr) me->module_core_rw - loc) >> 1;
3952 else if (r_type == R_390_GOT64 ||
3953 r_type == R_390_GOTPLT64)
3954 *(unsigned long *) loc = val;
3955 @@ -294,7 +294,7 @@ apply_rela(Elf_Rela *rela, Elf_Addr base, Elf_Sym *symtab,
3956 case R_390_PLTOFF64: /* 16 bit offset from GOT to PLT. */
3957 if (info->plt_initialized == 0) {
3958 unsigned int *ip;
3959 - ip = me->module_core + me->arch.plt_offset +
3960 + ip = me->module_core_rx + me->arch.plt_offset +
3961 info->plt_offset;
3962 #ifndef CONFIG_64BIT
3963 ip[0] = 0x0d105810; /* basr 1,0; l 1,6(1); br 1 */
3964 @@ -319,7 +319,7 @@ apply_rela(Elf_Rela *rela, Elf_Addr base, Elf_Sym *symtab,
3965 val - loc + 0xffffUL < 0x1ffffeUL) ||
3966 (r_type == R_390_PLT32DBL &&
3967 val - loc + 0xffffffffULL < 0x1fffffffeULL)))
3968 - val = (Elf_Addr) me->module_core +
3969 + val = (Elf_Addr) me->module_core_rx +
3970 me->arch.plt_offset +
3971 info->plt_offset;
3972 val += rela->r_addend - loc;
3973 @@ -341,7 +341,7 @@ apply_rela(Elf_Rela *rela, Elf_Addr base, Elf_Sym *symtab,
3974 case R_390_GOTOFF32: /* 32 bit offset to GOT. */
3975 case R_390_GOTOFF64: /* 64 bit offset to GOT. */
3976 val = val + rela->r_addend -
3977 - ((Elf_Addr) me->module_core + me->arch.got_offset);
3978 + ((Elf_Addr) me->module_core_rw + me->arch.got_offset);
3979 if (r_type == R_390_GOTOFF16)
3980 *(unsigned short *) loc = val;
3981 else if (r_type == R_390_GOTOFF32)
3982 @@ -351,7 +351,7 @@ apply_rela(Elf_Rela *rela, Elf_Addr base, Elf_Sym *symtab,
3983 break;
3984 case R_390_GOTPC: /* 32 bit PC relative offset to GOT. */
3985 case R_390_GOTPCDBL: /* 32 bit PC rel. off. to GOT shifted by 1. */
3986 - val = (Elf_Addr) me->module_core + me->arch.got_offset +
3987 + val = (Elf_Addr) me->module_core_rw + me->arch.got_offset +
3988 rela->r_addend - loc;
3989 if (r_type == R_390_GOTPC)
3990 *(unsigned int *) loc = val;
3991 diff --git a/arch/s390/kernel/setup.c b/arch/s390/kernel/setup.c
3992 index 061479f..dbfb08c 100644
3993 --- a/arch/s390/kernel/setup.c
3994 +++ b/arch/s390/kernel/setup.c
3995 @@ -306,9 +306,6 @@ static int __init early_parse_mem(char *p)
3996 early_param("mem", early_parse_mem);
3997
3998 #ifdef CONFIG_S390_SWITCH_AMODE
3999 -unsigned int switch_amode = 0;
4000 -EXPORT_SYMBOL_GPL(switch_amode);
4001 -
4002 static int set_amode_and_uaccess(unsigned long user_amode,
4003 unsigned long user32_amode)
4004 {
4005 @@ -334,17 +331,6 @@ static int set_amode_and_uaccess(unsigned long user_amode,
4006 return 0;
4007 }
4008 }
4009 -
4010 -/*
4011 - * Switch kernel/user addressing modes?
4012 - */
4013 -static int __init early_parse_switch_amode(char *p)
4014 -{
4015 - switch_amode = 1;
4016 - return 0;
4017 -}
4018 -early_param("switch_amode", early_parse_switch_amode);
4019 -
4020 #else /* CONFIG_S390_SWITCH_AMODE */
4021 static inline int set_amode_and_uaccess(unsigned long user_amode,
4022 unsigned long user32_amode)
4023 @@ -353,24 +339,6 @@ static inline int set_amode_and_uaccess(unsigned long user_amode,
4024 }
4025 #endif /* CONFIG_S390_SWITCH_AMODE */
4026
4027 -#ifdef CONFIG_S390_EXEC_PROTECT
4028 -unsigned int s390_noexec = 0;
4029 -EXPORT_SYMBOL_GPL(s390_noexec);
4030 -
4031 -/*
4032 - * Enable execute protection?
4033 - */
4034 -static int __init early_parse_noexec(char *p)
4035 -{
4036 - if (!strncmp(p, "off", 3))
4037 - return 0;
4038 - switch_amode = 1;
4039 - s390_noexec = 1;
4040 - return 0;
4041 -}
4042 -early_param("noexec", early_parse_noexec);
4043 -#endif /* CONFIG_S390_EXEC_PROTECT */
4044 -
4045 static void setup_addressing_mode(void)
4046 {
4047 if (s390_noexec) {
4048 diff --git a/arch/s390/mm/mmap.c b/arch/s390/mm/mmap.c
4049 index f4558cc..e461f37 100644
4050 --- a/arch/s390/mm/mmap.c
4051 +++ b/arch/s390/mm/mmap.c
4052 @@ -78,10 +78,22 @@ void arch_pick_mmap_layout(struct mm_struct *mm)
4053 */
4054 if (mmap_is_legacy()) {
4055 mm->mmap_base = TASK_UNMAPPED_BASE;
4056 +
4057 +#ifdef CONFIG_PAX_RANDMMAP
4058 + if (mm->pax_flags & MF_PAX_RANDMMAP)
4059 + mm->mmap_base += mm->delta_mmap;
4060 +#endif
4061 +
4062 mm->get_unmapped_area = arch_get_unmapped_area;
4063 mm->unmap_area = arch_unmap_area;
4064 } else {
4065 mm->mmap_base = mmap_base();
4066 +
4067 +#ifdef CONFIG_PAX_RANDMMAP
4068 + if (mm->pax_flags & MF_PAX_RANDMMAP)
4069 + mm->mmap_base -= mm->delta_mmap + mm->delta_stack;
4070 +#endif
4071 +
4072 mm->get_unmapped_area = arch_get_unmapped_area_topdown;
4073 mm->unmap_area = arch_unmap_area_topdown;
4074 }
4075 @@ -153,10 +165,22 @@ void arch_pick_mmap_layout(struct mm_struct *mm)
4076 */
4077 if (mmap_is_legacy()) {
4078 mm->mmap_base = TASK_UNMAPPED_BASE;
4079 +
4080 +#ifdef CONFIG_PAX_RANDMMAP
4081 + if (mm->pax_flags & MF_PAX_RANDMMAP)
4082 + mm->mmap_base += mm->delta_mmap;
4083 +#endif
4084 +
4085 mm->get_unmapped_area = s390_get_unmapped_area;
4086 mm->unmap_area = arch_unmap_area;
4087 } else {
4088 mm->mmap_base = mmap_base();
4089 +
4090 +#ifdef CONFIG_PAX_RANDMMAP
4091 + if (mm->pax_flags & MF_PAX_RANDMMAP)
4092 + mm->mmap_base -= mm->delta_mmap + mm->delta_stack;
4093 +#endif
4094 +
4095 mm->get_unmapped_area = s390_get_unmapped_area_topdown;
4096 mm->unmap_area = arch_unmap_area_topdown;
4097 }
4098 diff --git a/arch/score/include/asm/system.h b/arch/score/include/asm/system.h
4099 index 589d5c7..669e274 100644
4100 --- a/arch/score/include/asm/system.h
4101 +++ b/arch/score/include/asm/system.h
4102 @@ -17,7 +17,7 @@ do { \
4103 #define finish_arch_switch(prev) do {} while (0)
4104
4105 typedef void (*vi_handler_t)(void);
4106 -extern unsigned long arch_align_stack(unsigned long sp);
4107 +#define arch_align_stack(x) (x)
4108
4109 #define mb() barrier()
4110 #define rmb() barrier()
4111 diff --git a/arch/score/kernel/process.c b/arch/score/kernel/process.c
4112 index 25d0803..d6c8e36 100644
4113 --- a/arch/score/kernel/process.c
4114 +++ b/arch/score/kernel/process.c
4115 @@ -161,8 +161,3 @@ unsigned long get_wchan(struct task_struct *task)
4116
4117 return task_pt_regs(task)->cp0_epc;
4118 }
4119 -
4120 -unsigned long arch_align_stack(unsigned long sp)
4121 -{
4122 - return sp;
4123 -}
4124 diff --git a/arch/sh/boards/mach-hp6xx/pm.c b/arch/sh/boards/mach-hp6xx/pm.c
4125 index d936c1a..304a252 100644
4126 --- a/arch/sh/boards/mach-hp6xx/pm.c
4127 +++ b/arch/sh/boards/mach-hp6xx/pm.c
4128 @@ -143,7 +143,7 @@ static int hp6x0_pm_enter(suspend_state_t state)
4129 return 0;
4130 }
4131
4132 -static struct platform_suspend_ops hp6x0_pm_ops = {
4133 +static const struct platform_suspend_ops hp6x0_pm_ops = {
4134 .enter = hp6x0_pm_enter,
4135 .valid = suspend_valid_only_mem,
4136 };
4137 diff --git a/arch/sh/kernel/cpu/sh4/sq.c b/arch/sh/kernel/cpu/sh4/sq.c
4138 index 8a8a993..7b3079b 100644
4139 --- a/arch/sh/kernel/cpu/sh4/sq.c
4140 +++ b/arch/sh/kernel/cpu/sh4/sq.c
4141 @@ -327,7 +327,7 @@ static struct attribute *sq_sysfs_attrs[] = {
4142 NULL,
4143 };
4144
4145 -static struct sysfs_ops sq_sysfs_ops = {
4146 +static const struct sysfs_ops sq_sysfs_ops = {
4147 .show = sq_sysfs_show,
4148 .store = sq_sysfs_store,
4149 };
4150 diff --git a/arch/sh/kernel/cpu/shmobile/pm.c b/arch/sh/kernel/cpu/shmobile/pm.c
4151 index ee3c2aa..c49cee6 100644
4152 --- a/arch/sh/kernel/cpu/shmobile/pm.c
4153 +++ b/arch/sh/kernel/cpu/shmobile/pm.c
4154 @@ -58,7 +58,7 @@ static int sh_pm_enter(suspend_state_t state)
4155 return 0;
4156 }
4157
4158 -static struct platform_suspend_ops sh_pm_ops = {
4159 +static const struct platform_suspend_ops sh_pm_ops = {
4160 .enter = sh_pm_enter,
4161 .valid = suspend_valid_only_mem,
4162 };
4163 diff --git a/arch/sh/kernel/kgdb.c b/arch/sh/kernel/kgdb.c
4164 index 3e532d0..9faa306 100644
4165 --- a/arch/sh/kernel/kgdb.c
4166 +++ b/arch/sh/kernel/kgdb.c
4167 @@ -271,7 +271,7 @@ void kgdb_arch_exit(void)
4168 {
4169 }
4170
4171 -struct kgdb_arch arch_kgdb_ops = {
4172 +const struct kgdb_arch arch_kgdb_ops = {
4173 /* Breakpoint instruction: trapa #0x3c */
4174 #ifdef CONFIG_CPU_LITTLE_ENDIAN
4175 .gdb_bpt_instr = { 0x3c, 0xc3 },
4176 diff --git a/arch/sh/mm/mmap.c b/arch/sh/mm/mmap.c
4177 index afeb710..d1d1289 100644
4178 --- a/arch/sh/mm/mmap.c
4179 +++ b/arch/sh/mm/mmap.c
4180 @@ -74,8 +74,7 @@ unsigned long arch_get_unmapped_area(struct file *filp, unsigned long addr,
4181 addr = PAGE_ALIGN(addr);
4182
4183 vma = find_vma(mm, addr);
4184 - if (TASK_SIZE - len >= addr &&
4185 - (!vma || addr + len <= vma->vm_start))
4186 + if (TASK_SIZE - len >= addr && check_heap_stack_gap(vma, addr, len))
4187 return addr;
4188 }
4189
4190 @@ -106,7 +105,7 @@ full_search:
4191 }
4192 return -ENOMEM;
4193 }
4194 - if (likely(!vma || addr + len <= vma->vm_start)) {
4195 + if (likely(check_heap_stack_gap(vma, addr, len))) {
4196 /*
4197 * Remember the place where we stopped the search:
4198 */
4199 @@ -157,8 +156,7 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
4200 addr = PAGE_ALIGN(addr);
4201
4202 vma = find_vma(mm, addr);
4203 - if (TASK_SIZE - len >= addr &&
4204 - (!vma || addr + len <= vma->vm_start))
4205 + if (TASK_SIZE - len >= addr && check_heap_stack_gap(vma, addr, len))
4206 return addr;
4207 }
4208
4209 @@ -179,7 +177,7 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
4210 /* make sure it can fit in the remaining address space */
4211 if (likely(addr > len)) {
4212 vma = find_vma(mm, addr-len);
4213 - if (!vma || addr <= vma->vm_start) {
4214 + if (check_heap_stack_gap(vma, addr - len, len)) {
4215 /* remember the address as a hint for next time */
4216 return (mm->free_area_cache = addr-len);
4217 }
4218 @@ -188,18 +186,18 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
4219 if (unlikely(mm->mmap_base < len))
4220 goto bottomup;
4221
4222 - addr = mm->mmap_base-len;
4223 - if (do_colour_align)
4224 - addr = COLOUR_ALIGN_DOWN(addr, pgoff);
4225 + addr = mm->mmap_base - len;
4226
4227 do {
4228 + if (do_colour_align)
4229 + addr = COLOUR_ALIGN_DOWN(addr, pgoff);
4230 /*
4231 * Lookup failure means no vma is above this address,
4232 * else if new region fits below vma->vm_start,
4233 * return with success:
4234 */
4235 vma = find_vma(mm, addr);
4236 - if (likely(!vma || addr+len <= vma->vm_start)) {
4237 + if (likely(check_heap_stack_gap(vma, addr, len))) {
4238 /* remember the address as a hint for next time */
4239 return (mm->free_area_cache = addr);
4240 }
4241 @@ -209,10 +207,8 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
4242 mm->cached_hole_size = vma->vm_start - addr;
4243
4244 /* try just below the current vma->vm_start */
4245 - addr = vma->vm_start-len;
4246 - if (do_colour_align)
4247 - addr = COLOUR_ALIGN_DOWN(addr, pgoff);
4248 - } while (likely(len < vma->vm_start));
4249 + addr = skip_heap_stack_gap(vma, len);
4250 + } while (!IS_ERR_VALUE(addr));
4251
4252 bottomup:
4253 /*
4254 diff --git a/arch/sparc/Makefile b/arch/sparc/Makefile
4255 index 113225b..7fd04e7 100644
4256 --- a/arch/sparc/Makefile
4257 +++ b/arch/sparc/Makefile
4258 @@ -75,7 +75,7 @@ drivers-$(CONFIG_OPROFILE) += arch/sparc/oprofile/
4259 # Export what is needed by arch/sparc/boot/Makefile
4260 export VMLINUX_INIT VMLINUX_MAIN
4261 VMLINUX_INIT := $(head-y) $(init-y)
4262 -VMLINUX_MAIN := $(core-y) kernel/ mm/ fs/ ipc/ security/ crypto/ block/
4263 +VMLINUX_MAIN := $(core-y) kernel/ mm/ fs/ ipc/ security/ crypto/ block/ grsecurity/
4264 VMLINUX_MAIN += $(patsubst %/, %/lib.a, $(libs-y)) $(libs-y)
4265 VMLINUX_MAIN += $(drivers-y) $(net-y)
4266
4267 diff --git a/arch/sparc/include/asm/atomic_64.h b/arch/sparc/include/asm/atomic_64.h
4268 index f5cc06f..f858d47 100644
4269 --- a/arch/sparc/include/asm/atomic_64.h
4270 +++ b/arch/sparc/include/asm/atomic_64.h
4271 @@ -14,18 +14,40 @@
4272 #define ATOMIC64_INIT(i) { (i) }
4273
4274 #define atomic_read(v) ((v)->counter)
4275 +static inline int atomic_read_unchecked(const atomic_unchecked_t *v)
4276 +{
4277 + return v->counter;
4278 +}
4279 #define atomic64_read(v) ((v)->counter)
4280 +static inline long atomic64_read_unchecked(const atomic64_unchecked_t *v)
4281 +{
4282 + return v->counter;
4283 +}
4284
4285 #define atomic_set(v, i) (((v)->counter) = i)
4286 +static inline void atomic_set_unchecked(atomic_unchecked_t *v, int i)
4287 +{
4288 + v->counter = i;
4289 +}
4290 #define atomic64_set(v, i) (((v)->counter) = i)
4291 +static inline void atomic64_set_unchecked(atomic64_unchecked_t *v, long i)
4292 +{
4293 + v->counter = i;
4294 +}
4295
4296 extern void atomic_add(int, atomic_t *);
4297 +extern void atomic_add_unchecked(int, atomic_unchecked_t *);
4298 extern void atomic64_add(long, atomic64_t *);
4299 +extern void atomic64_add_unchecked(long, atomic64_unchecked_t *);
4300 extern void atomic_sub(int, atomic_t *);
4301 +extern void atomic_sub_unchecked(int, atomic_unchecked_t *);
4302 extern void atomic64_sub(long, atomic64_t *);
4303 +extern void atomic64_sub_unchecked(long, atomic64_unchecked_t *);
4304
4305 extern int atomic_add_ret(int, atomic_t *);
4306 +extern int atomic_add_ret_unchecked(int, atomic_unchecked_t *);
4307 extern long atomic64_add_ret(long, atomic64_t *);
4308 +extern long atomic64_add_ret_unchecked(long, atomic64_unchecked_t *);
4309 extern int atomic_sub_ret(int, atomic_t *);
4310 extern long atomic64_sub_ret(long, atomic64_t *);
4311
4312 @@ -33,13 +55,29 @@ extern long atomic64_sub_ret(long, atomic64_t *);
4313 #define atomic64_dec_return(v) atomic64_sub_ret(1, v)
4314
4315 #define atomic_inc_return(v) atomic_add_ret(1, v)
4316 +static inline int atomic_inc_return_unchecked(atomic_unchecked_t *v)
4317 +{
4318 + return atomic_add_ret_unchecked(1, v);
4319 +}
4320 #define atomic64_inc_return(v) atomic64_add_ret(1, v)
4321 +static inline long atomic64_inc_return_unchecked(atomic64_unchecked_t *v)
4322 +{
4323 + return atomic64_add_ret_unchecked(1, v);
4324 +}
4325
4326 #define atomic_sub_return(i, v) atomic_sub_ret(i, v)
4327 #define atomic64_sub_return(i, v) atomic64_sub_ret(i, v)
4328
4329 #define atomic_add_return(i, v) atomic_add_ret(i, v)
4330 +static inline int atomic_add_return_unchecked(int i, atomic_unchecked_t *v)
4331 +{
4332 + return atomic_add_ret_unchecked(i, v);
4333 +}
4334 #define atomic64_add_return(i, v) atomic64_add_ret(i, v)
4335 +static inline long atomic64_add_return_unchecked(long i, atomic64_unchecked_t *v)
4336 +{
4337 + return atomic64_add_ret_unchecked(i, v);
4338 +}
4339
4340 /*
4341 * atomic_inc_and_test - increment and test
4342 @@ -50,6 +88,10 @@ extern long atomic64_sub_ret(long, atomic64_t *);
4343 * other cases.
4344 */
4345 #define atomic_inc_and_test(v) (atomic_inc_return(v) == 0)
4346 +static inline int atomic_inc_and_test_unchecked(atomic_unchecked_t *v)
4347 +{
4348 + return atomic_inc_return_unchecked(v) == 0;
4349 +}
4350 #define atomic64_inc_and_test(v) (atomic64_inc_return(v) == 0)
4351
4352 #define atomic_sub_and_test(i, v) (atomic_sub_ret(i, v) == 0)
4353 @@ -59,30 +101,65 @@ extern long atomic64_sub_ret(long, atomic64_t *);
4354 #define atomic64_dec_and_test(v) (atomic64_sub_ret(1, v) == 0)
4355
4356 #define atomic_inc(v) atomic_add(1, v)
4357 +static inline void atomic_inc_unchecked(atomic_unchecked_t *v)
4358 +{
4359 + atomic_add_unchecked(1, v);
4360 +}
4361 #define atomic64_inc(v) atomic64_add(1, v)
4362 +static inline void atomic64_inc_unchecked(atomic64_unchecked_t *v)
4363 +{
4364 + atomic64_add_unchecked(1, v);
4365 +}
4366
4367 #define atomic_dec(v) atomic_sub(1, v)
4368 +static inline void atomic_dec_unchecked(atomic_unchecked_t *v)
4369 +{
4370 + atomic_sub_unchecked(1, v);
4371 +}
4372 #define atomic64_dec(v) atomic64_sub(1, v)
4373 +static inline void atomic64_dec_unchecked(atomic64_unchecked_t *v)
4374 +{
4375 + atomic64_sub_unchecked(1, v);
4376 +}
4377
4378 #define atomic_add_negative(i, v) (atomic_add_ret(i, v) < 0)
4379 #define atomic64_add_negative(i, v) (atomic64_add_ret(i, v) < 0)
4380
4381 #define atomic_cmpxchg(v, o, n) (cmpxchg(&((v)->counter), (o), (n)))
4382 +static inline int atomic_cmpxchg_unchecked(atomic_unchecked_t *v, int old, int new)
4383 +{
4384 + return cmpxchg(&v->counter, old, new);
4385 +}
4386 #define atomic_xchg(v, new) (xchg(&((v)->counter), new))
4387 +static inline int atomic_xchg_unchecked(atomic_unchecked_t *v, int new)
4388 +{
4389 + return xchg(&v->counter, new);
4390 +}
4391
4392 static inline int atomic_add_unless(atomic_t *v, int a, int u)
4393 {
4394 - int c, old;
4395 + int c, old, new;
4396 c = atomic_read(v);
4397 for (;;) {
4398 - if (unlikely(c == (u)))
4399 + if (unlikely(c == u))
4400 break;
4401 - old = atomic_cmpxchg((v), c, c + (a));
4402 +
4403 + asm volatile("addcc %2, %0, %0\n"
4404 +
4405 +#ifdef CONFIG_PAX_REFCOUNT
4406 + "tvs %%icc, 6\n"
4407 +#endif
4408 +
4409 + : "=r" (new)
4410 + : "0" (c), "ir" (a)
4411 + : "cc");
4412 +
4413 + old = atomic_cmpxchg(v, c, new);
4414 if (likely(old == c))
4415 break;
4416 c = old;
4417 }
4418 - return c != (u);
4419 + return c != u;
4420 }
4421
4422 #define atomic_inc_not_zero(v) atomic_add_unless((v), 1, 0)
4423 @@ -90,20 +167,35 @@ static inline int atomic_add_unless(atomic_t *v, int a, int u)
4424 #define atomic64_cmpxchg(v, o, n) \
4425 ((__typeof__((v)->counter))cmpxchg(&((v)->counter), (o), (n)))
4426 #define atomic64_xchg(v, new) (xchg(&((v)->counter), new))
4427 +static inline long atomic64_xchg_unchecked(atomic64_unchecked_t *v, long new)
4428 +{
4429 + return xchg(&v->counter, new);
4430 +}
4431
4432 static inline long atomic64_add_unless(atomic64_t *v, long a, long u)
4433 {
4434 - long c, old;
4435 + long c, old, new;
4436 c = atomic64_read(v);
4437 for (;;) {
4438 - if (unlikely(c == (u)))
4439 + if (unlikely(c == u))
4440 break;
4441 - old = atomic64_cmpxchg((v), c, c + (a));
4442 +
4443 + asm volatile("addcc %2, %0, %0\n"
4444 +
4445 +#ifdef CONFIG_PAX_REFCOUNT
4446 + "tvs %%xcc, 6\n"
4447 +#endif
4448 +
4449 + : "=r" (new)
4450 + : "0" (c), "ir" (a)
4451 + : "cc");
4452 +
4453 + old = atomic64_cmpxchg(v, c, new);
4454 if (likely(old == c))
4455 break;
4456 c = old;
4457 }
4458 - return c != (u);
4459 + return c != u;
4460 }
4461
4462 #define atomic64_inc_not_zero(v) atomic64_add_unless((v), 1, 0)
4463 diff --git a/arch/sparc/include/asm/cache.h b/arch/sparc/include/asm/cache.h
4464 index 41f85ae..fb54d5e 100644
4465 --- a/arch/sparc/include/asm/cache.h
4466 +++ b/arch/sparc/include/asm/cache.h
4467 @@ -8,7 +8,7 @@
4468 #define _SPARC_CACHE_H
4469
4470 #define L1_CACHE_SHIFT 5
4471 -#define L1_CACHE_BYTES 32
4472 +#define L1_CACHE_BYTES 32UL
4473 #define L1_CACHE_ALIGN(x) ((((x)+(L1_CACHE_BYTES-1))&~(L1_CACHE_BYTES-1)))
4474
4475 #ifdef CONFIG_SPARC32
4476 diff --git a/arch/sparc/include/asm/dma-mapping.h b/arch/sparc/include/asm/dma-mapping.h
4477 index 5a8c308..38def92 100644
4478 --- a/arch/sparc/include/asm/dma-mapping.h
4479 +++ b/arch/sparc/include/asm/dma-mapping.h
4480 @@ -14,10 +14,10 @@ extern int dma_set_mask(struct device *dev, u64 dma_mask);
4481 #define dma_free_noncoherent(d, s, v, h) dma_free_coherent(d, s, v, h)
4482 #define dma_is_consistent(d, h) (1)
4483
4484 -extern struct dma_map_ops *dma_ops, pci32_dma_ops;
4485 +extern const struct dma_map_ops *dma_ops, pci32_dma_ops;
4486 extern struct bus_type pci_bus_type;
4487
4488 -static inline struct dma_map_ops *get_dma_ops(struct device *dev)
4489 +static inline const struct dma_map_ops *get_dma_ops(struct device *dev)
4490 {
4491 #if defined(CONFIG_SPARC32) && defined(CONFIG_PCI)
4492 if (dev->bus == &pci_bus_type)
4493 @@ -31,7 +31,7 @@ static inline struct dma_map_ops *get_dma_ops(struct device *dev)
4494 static inline void *dma_alloc_coherent(struct device *dev, size_t size,
4495 dma_addr_t *dma_handle, gfp_t flag)
4496 {
4497 - struct dma_map_ops *ops = get_dma_ops(dev);
4498 + const struct dma_map_ops *ops = get_dma_ops(dev);
4499 void *cpu_addr;
4500
4501 cpu_addr = ops->alloc_coherent(dev, size, dma_handle, flag);
4502 @@ -42,7 +42,7 @@ static inline void *dma_alloc_coherent(struct device *dev, size_t size,
4503 static inline void dma_free_coherent(struct device *dev, size_t size,
4504 void *cpu_addr, dma_addr_t dma_handle)
4505 {
4506 - struct dma_map_ops *ops = get_dma_ops(dev);
4507 + const struct dma_map_ops *ops = get_dma_ops(dev);
4508
4509 debug_dma_free_coherent(dev, size, cpu_addr, dma_handle);
4510 ops->free_coherent(dev, size, cpu_addr, dma_handle);
4511 diff --git a/arch/sparc/include/asm/elf_32.h b/arch/sparc/include/asm/elf_32.h
4512 index 381a1b5..b97e3ff 100644
4513 --- a/arch/sparc/include/asm/elf_32.h
4514 +++ b/arch/sparc/include/asm/elf_32.h
4515 @@ -116,6 +116,13 @@ typedef struct {
4516
4517 #define ELF_ET_DYN_BASE (TASK_UNMAPPED_BASE)
4518
4519 +#ifdef CONFIG_PAX_ASLR
4520 +#define PAX_ELF_ET_DYN_BASE 0x10000UL
4521 +
4522 +#define PAX_DELTA_MMAP_LEN 16
4523 +#define PAX_DELTA_STACK_LEN 16
4524 +#endif
4525 +
4526 /* This yields a mask that user programs can use to figure out what
4527 instruction set this cpu supports. This can NOT be done in userspace
4528 on Sparc. */
4529 diff --git a/arch/sparc/include/asm/elf_64.h b/arch/sparc/include/asm/elf_64.h
4530 index 9968085..c2106ef 100644
4531 --- a/arch/sparc/include/asm/elf_64.h
4532 +++ b/arch/sparc/include/asm/elf_64.h
4533 @@ -163,6 +163,12 @@ typedef struct {
4534 #define ELF_ET_DYN_BASE 0x0000010000000000UL
4535 #define COMPAT_ELF_ET_DYN_BASE 0x0000000070000000UL
4536
4537 +#ifdef CONFIG_PAX_ASLR
4538 +#define PAX_ELF_ET_DYN_BASE (test_thread_flag(TIF_32BIT) ? 0x10000UL : 0x100000UL)
4539 +
4540 +#define PAX_DELTA_MMAP_LEN (test_thread_flag(TIF_32BIT) ? 14 : 28)
4541 +#define PAX_DELTA_STACK_LEN (test_thread_flag(TIF_32BIT) ? 15 : 29)
4542 +#endif
4543
4544 /* This yields a mask that user programs can use to figure out what
4545 instruction set this cpu supports. */
4546 diff --git a/arch/sparc/include/asm/pgtable_32.h b/arch/sparc/include/asm/pgtable_32.h
4547 index e0cabe7..efd60f1 100644
4548 --- a/arch/sparc/include/asm/pgtable_32.h
4549 +++ b/arch/sparc/include/asm/pgtable_32.h
4550 @@ -43,6 +43,13 @@ BTFIXUPDEF_SIMM13(user_ptrs_per_pgd)
4551 BTFIXUPDEF_INT(page_none)
4552 BTFIXUPDEF_INT(page_copy)
4553 BTFIXUPDEF_INT(page_readonly)
4554 +
4555 +#ifdef CONFIG_PAX_PAGEEXEC
4556 +BTFIXUPDEF_INT(page_shared_noexec)
4557 +BTFIXUPDEF_INT(page_copy_noexec)
4558 +BTFIXUPDEF_INT(page_readonly_noexec)
4559 +#endif
4560 +
4561 BTFIXUPDEF_INT(page_kernel)
4562
4563 #define PMD_SHIFT SUN4C_PMD_SHIFT
4564 @@ -64,6 +71,16 @@ extern pgprot_t PAGE_SHARED;
4565 #define PAGE_COPY __pgprot(BTFIXUP_INT(page_copy))
4566 #define PAGE_READONLY __pgprot(BTFIXUP_INT(page_readonly))
4567
4568 +#ifdef CONFIG_PAX_PAGEEXEC
4569 +extern pgprot_t PAGE_SHARED_NOEXEC;
4570 +# define PAGE_COPY_NOEXEC __pgprot(BTFIXUP_INT(page_copy_noexec))
4571 +# define PAGE_READONLY_NOEXEC __pgprot(BTFIXUP_INT(page_readonly_noexec))
4572 +#else
4573 +# define PAGE_SHARED_NOEXEC PAGE_SHARED
4574 +# define PAGE_COPY_NOEXEC PAGE_COPY
4575 +# define PAGE_READONLY_NOEXEC PAGE_READONLY
4576 +#endif
4577 +
4578 extern unsigned long page_kernel;
4579
4580 #ifdef MODULE
4581 diff --git a/arch/sparc/include/asm/pgtsrmmu.h b/arch/sparc/include/asm/pgtsrmmu.h
4582 index 1407c07..7e10231 100644
4583 --- a/arch/sparc/include/asm/pgtsrmmu.h
4584 +++ b/arch/sparc/include/asm/pgtsrmmu.h
4585 @@ -115,6 +115,13 @@
4586 SRMMU_EXEC | SRMMU_REF)
4587 #define SRMMU_PAGE_RDONLY __pgprot(SRMMU_VALID | SRMMU_CACHE | \
4588 SRMMU_EXEC | SRMMU_REF)
4589 +
4590 +#ifdef CONFIG_PAX_PAGEEXEC
4591 +#define SRMMU_PAGE_SHARED_NOEXEC __pgprot(SRMMU_VALID | SRMMU_CACHE | SRMMU_WRITE | SRMMU_REF)
4592 +#define SRMMU_PAGE_COPY_NOEXEC __pgprot(SRMMU_VALID | SRMMU_CACHE | SRMMU_REF)
4593 +#define SRMMU_PAGE_RDONLY_NOEXEC __pgprot(SRMMU_VALID | SRMMU_CACHE | SRMMU_REF)
4594 +#endif
4595 +
4596 #define SRMMU_PAGE_KERNEL __pgprot(SRMMU_VALID | SRMMU_CACHE | SRMMU_PRIV | \
4597 SRMMU_DIRTY | SRMMU_REF)
4598
4599 diff --git a/arch/sparc/include/asm/spinlock_64.h b/arch/sparc/include/asm/spinlock_64.h
4600 index 43e5147..47622a1 100644
4601 --- a/arch/sparc/include/asm/spinlock_64.h
4602 +++ b/arch/sparc/include/asm/spinlock_64.h
4603 @@ -92,14 +92,19 @@ static inline void __raw_spin_lock_flags(raw_spinlock_t *lock, unsigned long fla
4604
4605 /* Multi-reader locks, these are much saner than the 32-bit Sparc ones... */
4606
4607 -static void inline arch_read_lock(raw_rwlock_t *lock)
4608 +static inline void arch_read_lock(raw_rwlock_t *lock)
4609 {
4610 unsigned long tmp1, tmp2;
4611
4612 __asm__ __volatile__ (
4613 "1: ldsw [%2], %0\n"
4614 " brlz,pn %0, 2f\n"
4615 -"4: add %0, 1, %1\n"
4616 +"4: addcc %0, 1, %1\n"
4617 +
4618 +#ifdef CONFIG_PAX_REFCOUNT
4619 +" tvs %%icc, 6\n"
4620 +#endif
4621 +
4622 " cas [%2], %0, %1\n"
4623 " cmp %0, %1\n"
4624 " bne,pn %%icc, 1b\n"
4625 @@ -112,10 +117,10 @@ static void inline arch_read_lock(raw_rwlock_t *lock)
4626 " .previous"
4627 : "=&r" (tmp1), "=&r" (tmp2)
4628 : "r" (lock)
4629 - : "memory");
4630 + : "memory", "cc");
4631 }
4632
4633 -static int inline arch_read_trylock(raw_rwlock_t *lock)
4634 +static inline int arch_read_trylock(raw_rwlock_t *lock)
4635 {
4636 int tmp1, tmp2;
4637
4638 @@ -123,7 +128,12 @@ static int inline arch_read_trylock(raw_rwlock_t *lock)
4639 "1: ldsw [%2], %0\n"
4640 " brlz,a,pn %0, 2f\n"
4641 " mov 0, %0\n"
4642 -" add %0, 1, %1\n"
4643 +" addcc %0, 1, %1\n"
4644 +
4645 +#ifdef CONFIG_PAX_REFCOUNT
4646 +" tvs %%icc, 6\n"
4647 +#endif
4648 +
4649 " cas [%2], %0, %1\n"
4650 " cmp %0, %1\n"
4651 " bne,pn %%icc, 1b\n"
4652 @@ -136,13 +146,18 @@ static int inline arch_read_trylock(raw_rwlock_t *lock)
4653 return tmp1;
4654 }
4655
4656 -static void inline arch_read_unlock(raw_rwlock_t *lock)
4657 +static inline void arch_read_unlock(raw_rwlock_t *lock)
4658 {
4659 unsigned long tmp1, tmp2;
4660
4661 __asm__ __volatile__(
4662 "1: lduw [%2], %0\n"
4663 -" sub %0, 1, %1\n"
4664 +" subcc %0, 1, %1\n"
4665 +
4666 +#ifdef CONFIG_PAX_REFCOUNT
4667 +" tvs %%icc, 6\n"
4668 +#endif
4669 +
4670 " cas [%2], %0, %1\n"
4671 " cmp %0, %1\n"
4672 " bne,pn %%xcc, 1b\n"
4673 @@ -152,7 +167,7 @@ static void inline arch_read_unlock(raw_rwlock_t *lock)
4674 : "memory");
4675 }
4676
4677 -static void inline arch_write_lock(raw_rwlock_t *lock)
4678 +static inline void arch_write_lock(raw_rwlock_t *lock)
4679 {
4680 unsigned long mask, tmp1, tmp2;
4681
4682 @@ -177,7 +192,7 @@ static void inline arch_write_lock(raw_rwlock_t *lock)
4683 : "memory");
4684 }
4685
4686 -static void inline arch_write_unlock(raw_rwlock_t *lock)
4687 +static inline void arch_write_unlock(raw_rwlock_t *lock)
4688 {
4689 __asm__ __volatile__(
4690 " stw %%g0, [%0]"
4691 @@ -186,7 +201,7 @@ static void inline arch_write_unlock(raw_rwlock_t *lock)
4692 : "memory");
4693 }
4694
4695 -static int inline arch_write_trylock(raw_rwlock_t *lock)
4696 +static inline int arch_write_trylock(raw_rwlock_t *lock)
4697 {
4698 unsigned long mask, tmp1, tmp2, result;
4699
4700 diff --git a/arch/sparc/include/asm/thread_info_32.h b/arch/sparc/include/asm/thread_info_32.h
4701 index 844d73a..f787fb9 100644
4702 --- a/arch/sparc/include/asm/thread_info_32.h
4703 +++ b/arch/sparc/include/asm/thread_info_32.h
4704 @@ -50,6 +50,8 @@ struct thread_info {
4705 unsigned long w_saved;
4706
4707 struct restart_block restart_block;
4708 +
4709 + unsigned long lowest_stack;
4710 };
4711
4712 /*
4713 diff --git a/arch/sparc/include/asm/thread_info_64.h b/arch/sparc/include/asm/thread_info_64.h
4714 index f78ad9a..9f55fc7 100644
4715 --- a/arch/sparc/include/asm/thread_info_64.h
4716 +++ b/arch/sparc/include/asm/thread_info_64.h
4717 @@ -68,6 +68,8 @@ struct thread_info {
4718 struct pt_regs *kern_una_regs;
4719 unsigned int kern_una_insn;
4720
4721 + unsigned long lowest_stack;
4722 +
4723 unsigned long fpregs[0] __attribute__ ((aligned(64)));
4724 };
4725
4726 diff --git a/arch/sparc/include/asm/uaccess.h b/arch/sparc/include/asm/uaccess.h
4727 index e88fbe5..96b0ce5 100644
4728 --- a/arch/sparc/include/asm/uaccess.h
4729 +++ b/arch/sparc/include/asm/uaccess.h
4730 @@ -1,5 +1,13 @@
4731 #ifndef ___ASM_SPARC_UACCESS_H
4732 #define ___ASM_SPARC_UACCESS_H
4733 +
4734 +#ifdef __KERNEL__
4735 +#ifndef __ASSEMBLY__
4736 +#include <linux/types.h>
4737 +extern void check_object_size(const void *ptr, unsigned long n, bool to);
4738 +#endif
4739 +#endif
4740 +
4741 #if defined(__sparc__) && defined(__arch64__)
4742 #include <asm/uaccess_64.h>
4743 #else
4744 diff --git a/arch/sparc/include/asm/uaccess_32.h b/arch/sparc/include/asm/uaccess_32.h
4745 index 8303ac4..07f333d 100644
4746 --- a/arch/sparc/include/asm/uaccess_32.h
4747 +++ b/arch/sparc/include/asm/uaccess_32.h
4748 @@ -249,27 +249,46 @@ extern unsigned long __copy_user(void __user *to, const void __user *from, unsig
4749
4750 static inline unsigned long copy_to_user(void __user *to, const void *from, unsigned long n)
4751 {
4752 - if (n && __access_ok((unsigned long) to, n))
4753 + if ((long)n < 0)
4754 + return n;
4755 +
4756 + if (n && __access_ok((unsigned long) to, n)) {
4757 + if (!__builtin_constant_p(n))
4758 + check_object_size(from, n, true);
4759 return __copy_user(to, (__force void __user *) from, n);
4760 - else
4761 + } else
4762 return n;
4763 }
4764
4765 static inline unsigned long __copy_to_user(void __user *to, const void *from, unsigned long n)
4766 {
4767 + if ((long)n < 0)
4768 + return n;
4769 +
4770 + if (!__builtin_constant_p(n))
4771 + check_object_size(from, n, true);
4772 +
4773 return __copy_user(to, (__force void __user *) from, n);
4774 }
4775
4776 static inline unsigned long copy_from_user(void *to, const void __user *from, unsigned long n)
4777 {
4778 - if (n && __access_ok((unsigned long) from, n))
4779 + if ((long)n < 0)
4780 + return n;
4781 +
4782 + if (n && __access_ok((unsigned long) from, n)) {
4783 + if (!__builtin_constant_p(n))
4784 + check_object_size(to, n, false);
4785 return __copy_user((__force void __user *) to, from, n);
4786 - else
4787 + } else
4788 return n;
4789 }
4790
4791 static inline unsigned long __copy_from_user(void *to, const void __user *from, unsigned long n)
4792 {
4793 + if ((long)n < 0)
4794 + return n;
4795 +
4796 return __copy_user((__force void __user *) to, from, n);
4797 }
4798
4799 diff --git a/arch/sparc/include/asm/uaccess_64.h b/arch/sparc/include/asm/uaccess_64.h
4800 index 9ea271e..7b8a271 100644
4801 --- a/arch/sparc/include/asm/uaccess_64.h
4802 +++ b/arch/sparc/include/asm/uaccess_64.h
4803 @@ -9,6 +9,7 @@
4804 #include <linux/compiler.h>
4805 #include <linux/string.h>
4806 #include <linux/thread_info.h>
4807 +#include <linux/kernel.h>
4808 #include <asm/asi.h>
4809 #include <asm/system.h>
4810 #include <asm/spitfire.h>
4811 @@ -212,8 +213,15 @@ extern unsigned long copy_from_user_fixup(void *to, const void __user *from,
4812 static inline unsigned long __must_check
4813 copy_from_user(void *to, const void __user *from, unsigned long size)
4814 {
4815 - unsigned long ret = ___copy_from_user(to, from, size);
4816 + unsigned long ret;
4817
4818 + if ((long)size < 0 || size > INT_MAX)
4819 + return size;
4820 +
4821 + if (!__builtin_constant_p(size))
4822 + check_object_size(to, size, false);
4823 +
4824 + ret = ___copy_from_user(to, from, size);
4825 if (unlikely(ret))
4826 ret = copy_from_user_fixup(to, from, size);
4827 return ret;
4828 @@ -228,8 +236,15 @@ extern unsigned long copy_to_user_fixup(void __user *to, const void *from,
4829 static inline unsigned long __must_check
4830 copy_to_user(void __user *to, const void *from, unsigned long size)
4831 {
4832 - unsigned long ret = ___copy_to_user(to, from, size);
4833 + unsigned long ret;
4834
4835 + if ((long)size < 0 || size > INT_MAX)
4836 + return size;
4837 +
4838 + if (!__builtin_constant_p(size))
4839 + check_object_size(from, size, true);
4840 +
4841 + ret = ___copy_to_user(to, from, size);
4842 if (unlikely(ret))
4843 ret = copy_to_user_fixup(to, from, size);
4844 return ret;
4845 diff --git a/arch/sparc/kernel/Makefile b/arch/sparc/kernel/Makefile
4846 index 2782681..77ded84 100644
4847 --- a/arch/sparc/kernel/Makefile
4848 +++ b/arch/sparc/kernel/Makefile
4849 @@ -3,7 +3,7 @@
4850 #
4851
4852 asflags-y := -ansi
4853 -ccflags-y := -Werror
4854 +#ccflags-y := -Werror
4855
4856 extra-y := head_$(BITS).o
4857 extra-y += init_task.o
4858 diff --git a/arch/sparc/kernel/iommu.c b/arch/sparc/kernel/iommu.c
4859 index 7690cc2..ece64c9 100644
4860 --- a/arch/sparc/kernel/iommu.c
4861 +++ b/arch/sparc/kernel/iommu.c
4862 @@ -826,7 +826,7 @@ static void dma_4u_sync_sg_for_cpu(struct device *dev,
4863 spin_unlock_irqrestore(&iommu->lock, flags);
4864 }
4865
4866 -static struct dma_map_ops sun4u_dma_ops = {
4867 +static const struct dma_map_ops sun4u_dma_ops = {
4868 .alloc_coherent = dma_4u_alloc_coherent,
4869 .free_coherent = dma_4u_free_coherent,
4870 .map_page = dma_4u_map_page,
4871 @@ -837,7 +837,7 @@ static struct dma_map_ops sun4u_dma_ops = {
4872 .sync_sg_for_cpu = dma_4u_sync_sg_for_cpu,
4873 };
4874
4875 -struct dma_map_ops *dma_ops = &sun4u_dma_ops;
4876 +const struct dma_map_ops *dma_ops = &sun4u_dma_ops;
4877 EXPORT_SYMBOL(dma_ops);
4878
4879 extern int pci64_dma_supported(struct pci_dev *pdev, u64 device_mask);
4880 diff --git a/arch/sparc/kernel/ioport.c b/arch/sparc/kernel/ioport.c
4881 index 9f61fd8..bd048db 100644
4882 --- a/arch/sparc/kernel/ioport.c
4883 +++ b/arch/sparc/kernel/ioport.c
4884 @@ -392,7 +392,7 @@ static void sbus_sync_sg_for_device(struct device *dev, struct scatterlist *sg,
4885 BUG();
4886 }
4887
4888 -struct dma_map_ops sbus_dma_ops = {
4889 +const struct dma_map_ops sbus_dma_ops = {
4890 .alloc_coherent = sbus_alloc_coherent,
4891 .free_coherent = sbus_free_coherent,
4892 .map_page = sbus_map_page,
4893 @@ -403,7 +403,7 @@ struct dma_map_ops sbus_dma_ops = {
4894 .sync_sg_for_device = sbus_sync_sg_for_device,
4895 };
4896
4897 -struct dma_map_ops *dma_ops = &sbus_dma_ops;
4898 +const struct dma_map_ops *dma_ops = &sbus_dma_ops;
4899 EXPORT_SYMBOL(dma_ops);
4900
4901 static int __init sparc_register_ioport(void)
4902 @@ -640,7 +640,7 @@ static void pci32_sync_sg_for_device(struct device *device, struct scatterlist *
4903 }
4904 }
4905
4906 -struct dma_map_ops pci32_dma_ops = {
4907 +const struct dma_map_ops pci32_dma_ops = {
4908 .alloc_coherent = pci32_alloc_coherent,
4909 .free_coherent = pci32_free_coherent,
4910 .map_page = pci32_map_page,
4911 diff --git a/arch/sparc/kernel/kgdb_32.c b/arch/sparc/kernel/kgdb_32.c
4912 index 04df4ed..55c4b6e 100644
4913 --- a/arch/sparc/kernel/kgdb_32.c
4914 +++ b/arch/sparc/kernel/kgdb_32.c
4915 @@ -158,7 +158,7 @@ void kgdb_arch_exit(void)
4916 {
4917 }
4918
4919 -struct kgdb_arch arch_kgdb_ops = {
4920 +const struct kgdb_arch arch_kgdb_ops = {
4921 /* Breakpoint instruction: ta 0x7d */
4922 .gdb_bpt_instr = { 0x91, 0xd0, 0x20, 0x7d },
4923 };
4924 diff --git a/arch/sparc/kernel/kgdb_64.c b/arch/sparc/kernel/kgdb_64.c
4925 index f5a0fd4..d886f71 100644
4926 --- a/arch/sparc/kernel/kgdb_64.c
4927 +++ b/arch/sparc/kernel/kgdb_64.c
4928 @@ -180,7 +180,7 @@ void kgdb_arch_exit(void)
4929 {
4930 }
4931
4932 -struct kgdb_arch arch_kgdb_ops = {
4933 +const struct kgdb_arch arch_kgdb_ops = {
4934 /* Breakpoint instruction: ta 0x72 */
4935 .gdb_bpt_instr = { 0x91, 0xd0, 0x20, 0x72 },
4936 };
4937 diff --git a/arch/sparc/kernel/pci_sun4v.c b/arch/sparc/kernel/pci_sun4v.c
4938 index 23c33ff..d137fbd 100644
4939 --- a/arch/sparc/kernel/pci_sun4v.c
4940 +++ b/arch/sparc/kernel/pci_sun4v.c
4941 @@ -525,7 +525,7 @@ static void dma_4v_unmap_sg(struct device *dev, struct scatterlist *sglist,
4942 spin_unlock_irqrestore(&iommu->lock, flags);
4943 }
4944
4945 -static struct dma_map_ops sun4v_dma_ops = {
4946 +static const struct dma_map_ops sun4v_dma_ops = {
4947 .alloc_coherent = dma_4v_alloc_coherent,
4948 .free_coherent = dma_4v_free_coherent,
4949 .map_page = dma_4v_map_page,
4950 diff --git a/arch/sparc/kernel/process_32.c b/arch/sparc/kernel/process_32.c
4951 index c49865b..b41a81b 100644
4952 --- a/arch/sparc/kernel/process_32.c
4953 +++ b/arch/sparc/kernel/process_32.c
4954 @@ -196,7 +196,7 @@ void __show_backtrace(unsigned long fp)
4955 rw->ins[4], rw->ins[5],
4956 rw->ins[6],
4957 rw->ins[7]);
4958 - printk("%pS\n", (void *) rw->ins[7]);
4959 + printk("%pA\n", (void *) rw->ins[7]);
4960 rw = (struct reg_window32 *) rw->ins[6];
4961 }
4962 spin_unlock_irqrestore(&sparc_backtrace_lock, flags);
4963 @@ -263,14 +263,14 @@ void show_regs(struct pt_regs *r)
4964
4965 printk("PSR: %08lx PC: %08lx NPC: %08lx Y: %08lx %s\n",
4966 r->psr, r->pc, r->npc, r->y, print_tainted());
4967 - printk("PC: <%pS>\n", (void *) r->pc);
4968 + printk("PC: <%pA>\n", (void *) r->pc);
4969 printk("%%G: %08lx %08lx %08lx %08lx %08lx %08lx %08lx %08lx\n",
4970 r->u_regs[0], r->u_regs[1], r->u_regs[2], r->u_regs[3],
4971 r->u_regs[4], r->u_regs[5], r->u_regs[6], r->u_regs[7]);
4972 printk("%%O: %08lx %08lx %08lx %08lx %08lx %08lx %08lx %08lx\n",
4973 r->u_regs[8], r->u_regs[9], r->u_regs[10], r->u_regs[11],
4974 r->u_regs[12], r->u_regs[13], r->u_regs[14], r->u_regs[15]);
4975 - printk("RPC: <%pS>\n", (void *) r->u_regs[15]);
4976 + printk("RPC: <%pA>\n", (void *) r->u_regs[15]);
4977
4978 printk("%%L: %08lx %08lx %08lx %08lx %08lx %08lx %08lx %08lx\n",
4979 rw->locals[0], rw->locals[1], rw->locals[2], rw->locals[3],
4980 @@ -305,7 +305,7 @@ void show_stack(struct task_struct *tsk, unsigned long *_ksp)
4981 rw = (struct reg_window32 *) fp;
4982 pc = rw->ins[7];
4983 printk("[%08lx : ", pc);
4984 - printk("%pS ] ", (void *) pc);
4985 + printk("%pA ] ", (void *) pc);
4986 fp = rw->ins[6];
4987 } while (++count < 16);
4988 printk("\n");
4989 diff --git a/arch/sparc/kernel/process_64.c b/arch/sparc/kernel/process_64.c
4990 index cb70476..3d0c191 100644
4991 --- a/arch/sparc/kernel/process_64.c
4992 +++ b/arch/sparc/kernel/process_64.c
4993 @@ -180,14 +180,14 @@ static void show_regwindow(struct pt_regs *regs)
4994 printk("i4: %016lx i5: %016lx i6: %016lx i7: %016lx\n",
4995 rwk->ins[4], rwk->ins[5], rwk->ins[6], rwk->ins[7]);
4996 if (regs->tstate & TSTATE_PRIV)
4997 - printk("I7: <%pS>\n", (void *) rwk->ins[7]);
4998 + printk("I7: <%pA>\n", (void *) rwk->ins[7]);
4999 }
5000
5001 void show_regs(struct pt_regs *regs)
5002 {
5003 printk("TSTATE: %016lx TPC: %016lx TNPC: %016lx Y: %08x %s\n", regs->tstate,
5004 regs->tpc, regs->tnpc, regs->y, print_tainted());
5005 - printk("TPC: <%pS>\n", (void *) regs->tpc);
5006 + printk("TPC: <%pA>\n", (void *) regs->tpc);
5007 printk("g0: %016lx g1: %016lx g2: %016lx g3: %016lx\n",
5008 regs->u_regs[0], regs->u_regs[1], regs->u_regs[2],
5009 regs->u_regs[3]);
5010 @@ -200,7 +200,7 @@ void show_regs(struct pt_regs *regs)
5011 printk("o4: %016lx o5: %016lx sp: %016lx ret_pc: %016lx\n",
5012 regs->u_regs[12], regs->u_regs[13], regs->u_regs[14],
5013 regs->u_regs[15]);
5014 - printk("RPC: <%pS>\n", (void *) regs->u_regs[15]);
5015 + printk("RPC: <%pA>\n", (void *) regs->u_regs[15]);
5016 show_regwindow(regs);
5017 }
5018
5019 @@ -284,7 +284,7 @@ void arch_trigger_all_cpu_backtrace(void)
5020 ((tp && tp->task) ? tp->task->pid : -1));
5021
5022 if (gp->tstate & TSTATE_PRIV) {
5023 - printk(" TPC[%pS] O7[%pS] I7[%pS] RPC[%pS]\n",
5024 + printk(" TPC[%pA] O7[%pA] I7[%pA] RPC[%pA]\n",
5025 (void *) gp->tpc,
5026 (void *) gp->o7,
5027 (void *) gp->i7,
5028 diff --git a/arch/sparc/kernel/sigutil_64.c b/arch/sparc/kernel/sigutil_64.c
5029 index 6edc4e5..06a69b4 100644
5030 --- a/arch/sparc/kernel/sigutil_64.c
5031 +++ b/arch/sparc/kernel/sigutil_64.c
5032 @@ -2,6 +2,7 @@
5033 #include <linux/types.h>
5034 #include <linux/thread_info.h>
5035 #include <linux/uaccess.h>
5036 +#include <linux/errno.h>
5037
5038 #include <asm/sigcontext.h>
5039 #include <asm/fpumacro.h>
5040 diff --git a/arch/sparc/kernel/sys_sparc_32.c b/arch/sparc/kernel/sys_sparc_32.c
5041 index 3a82e65..ce0a53a 100644
5042 --- a/arch/sparc/kernel/sys_sparc_32.c
5043 +++ b/arch/sparc/kernel/sys_sparc_32.c
5044 @@ -57,7 +57,7 @@ unsigned long arch_get_unmapped_area(struct file *filp, unsigned long addr, unsi
5045 if (ARCH_SUN4C && len > 0x20000000)
5046 return -ENOMEM;
5047 if (!addr)
5048 - addr = TASK_UNMAPPED_BASE;
5049 + addr = current->mm->mmap_base;
5050
5051 if (flags & MAP_SHARED)
5052 addr = COLOUR_ALIGN(addr);
5053 @@ -72,7 +72,7 @@ unsigned long arch_get_unmapped_area(struct file *filp, unsigned long addr, unsi
5054 }
5055 if (TASK_SIZE - PAGE_SIZE - len < addr)
5056 return -ENOMEM;
5057 - if (!vmm || addr + len <= vmm->vm_start)
5058 + if (check_heap_stack_gap(vmm, addr, len))
5059 return addr;
5060 addr = vmm->vm_end;
5061 if (flags & MAP_SHARED)
5062 diff --git a/arch/sparc/kernel/sys_sparc_64.c b/arch/sparc/kernel/sys_sparc_64.c
5063 index cfa0e19..98972ac 100644
5064 --- a/arch/sparc/kernel/sys_sparc_64.c
5065 +++ b/arch/sparc/kernel/sys_sparc_64.c
5066 @@ -125,7 +125,7 @@ unsigned long arch_get_unmapped_area(struct file *filp, unsigned long addr, unsi
5067 /* We do not accept a shared mapping if it would violate
5068 * cache aliasing constraints.
5069 */
5070 - if ((flags & MAP_SHARED) &&
5071 + if ((filp || (flags & MAP_SHARED)) &&
5072 ((addr - (pgoff << PAGE_SHIFT)) & (SHMLBA - 1)))
5073 return -EINVAL;
5074 return addr;
5075 @@ -140,6 +140,10 @@ unsigned long arch_get_unmapped_area(struct file *filp, unsigned long addr, unsi
5076 if (filp || (flags & MAP_SHARED))
5077 do_color_align = 1;
5078
5079 +#ifdef CONFIG_PAX_RANDMMAP
5080 + if (!(mm->pax_flags & MF_PAX_RANDMMAP))
5081 +#endif
5082 +
5083 if (addr) {
5084 if (do_color_align)
5085 addr = COLOUR_ALIGN(addr, pgoff);
5086 @@ -147,15 +151,14 @@ unsigned long arch_get_unmapped_area(struct file *filp, unsigned long addr, unsi
5087 addr = PAGE_ALIGN(addr);
5088
5089 vma = find_vma(mm, addr);
5090 - if (task_size - len >= addr &&
5091 - (!vma || addr + len <= vma->vm_start))
5092 + if (task_size - len >= addr && check_heap_stack_gap(vma, addr, len))
5093 return addr;
5094 }
5095
5096 if (len > mm->cached_hole_size) {
5097 - start_addr = addr = mm->free_area_cache;
5098 + start_addr = addr = mm->free_area_cache;
5099 } else {
5100 - start_addr = addr = TASK_UNMAPPED_BASE;
5101 + start_addr = addr = mm->mmap_base;
5102 mm->cached_hole_size = 0;
5103 }
5104
5105 @@ -175,14 +178,14 @@ full_search:
5106 vma = find_vma(mm, VA_EXCLUDE_END);
5107 }
5108 if (unlikely(task_size < addr)) {
5109 - if (start_addr != TASK_UNMAPPED_BASE) {
5110 - start_addr = addr = TASK_UNMAPPED_BASE;
5111 + if (start_addr != mm->mmap_base) {
5112 + start_addr = addr = mm->mmap_base;
5113 mm->cached_hole_size = 0;
5114 goto full_search;
5115 }
5116 return -ENOMEM;
5117 }
5118 - if (likely(!vma || addr + len <= vma->vm_start)) {
5119 + if (likely(check_heap_stack_gap(vma, addr, len))) {
5120 /*
5121 * Remember the place where we stopped the search:
5122 */
5123 @@ -216,7 +219,7 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
5124 /* We do not accept a shared mapping if it would violate
5125 * cache aliasing constraints.
5126 */
5127 - if ((flags & MAP_SHARED) &&
5128 + if ((filp || (flags & MAP_SHARED)) &&
5129 ((addr - (pgoff << PAGE_SHIFT)) & (SHMLBA - 1)))
5130 return -EINVAL;
5131 return addr;
5132 @@ -237,8 +240,7 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
5133 addr = PAGE_ALIGN(addr);
5134
5135 vma = find_vma(mm, addr);
5136 - if (task_size - len >= addr &&
5137 - (!vma || addr + len <= vma->vm_start))
5138 + if (task_size - len >= addr && check_heap_stack_gap(vma, addr, len))
5139 return addr;
5140 }
5141
5142 @@ -259,7 +261,7 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
5143 /* make sure it can fit in the remaining address space */
5144 if (likely(addr > len)) {
5145 vma = find_vma(mm, addr-len);
5146 - if (!vma || addr <= vma->vm_start) {
5147 + if (check_heap_stack_gap(vma, addr - len, len)) {
5148 /* remember the address as a hint for next time */
5149 return (mm->free_area_cache = addr-len);
5150 }
5151 @@ -268,18 +270,18 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
5152 if (unlikely(mm->mmap_base < len))
5153 goto bottomup;
5154
5155 - addr = mm->mmap_base-len;
5156 - if (do_color_align)
5157 - addr = COLOUR_ALIGN_DOWN(addr, pgoff);
5158 + addr = mm->mmap_base - len;
5159
5160 do {
5161 + if (do_color_align)
5162 + addr = COLOUR_ALIGN_DOWN(addr, pgoff);
5163 /*
5164 * Lookup failure means no vma is above this address,
5165 * else if new region fits below vma->vm_start,
5166 * return with success:
5167 */
5168 vma = find_vma(mm, addr);
5169 - if (likely(!vma || addr+len <= vma->vm_start)) {
5170 + if (likely(check_heap_stack_gap(vma, addr, len))) {
5171 /* remember the address as a hint for next time */
5172 return (mm->free_area_cache = addr);
5173 }
5174 @@ -289,10 +291,8 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
5175 mm->cached_hole_size = vma->vm_start - addr;
5176
5177 /* try just below the current vma->vm_start */
5178 - addr = vma->vm_start-len;
5179 - if (do_color_align)
5180 - addr = COLOUR_ALIGN_DOWN(addr, pgoff);
5181 - } while (likely(len < vma->vm_start));
5182 + addr = skip_heap_stack_gap(vma, len);
5183 + } while (!IS_ERR_VALUE(addr));
5184
5185 bottomup:
5186 /*
5187 @@ -384,6 +384,12 @@ void arch_pick_mmap_layout(struct mm_struct *mm)
5188 current->signal->rlim[RLIMIT_STACK].rlim_cur == RLIM_INFINITY ||
5189 sysctl_legacy_va_layout) {
5190 mm->mmap_base = TASK_UNMAPPED_BASE + random_factor;
5191 +
5192 +#ifdef CONFIG_PAX_RANDMMAP
5193 + if (mm->pax_flags & MF_PAX_RANDMMAP)
5194 + mm->mmap_base += mm->delta_mmap;
5195 +#endif
5196 +
5197 mm->get_unmapped_area = arch_get_unmapped_area;
5198 mm->unmap_area = arch_unmap_area;
5199 } else {
5200 @@ -398,6 +404,12 @@ void arch_pick_mmap_layout(struct mm_struct *mm)
5201 gap = (task_size / 6 * 5);
5202
5203 mm->mmap_base = PAGE_ALIGN(task_size - gap - random_factor);
5204 +
5205 +#ifdef CONFIG_PAX_RANDMMAP
5206 + if (mm->pax_flags & MF_PAX_RANDMMAP)
5207 + mm->mmap_base -= mm->delta_mmap + mm->delta_stack;
5208 +#endif
5209 +
5210 mm->get_unmapped_area = arch_get_unmapped_area_topdown;
5211 mm->unmap_area = arch_unmap_area_topdown;
5212 }
5213 diff --git a/arch/sparc/kernel/traps_32.c b/arch/sparc/kernel/traps_32.c
5214 index c0490c7..84959d1 100644
5215 --- a/arch/sparc/kernel/traps_32.c
5216 +++ b/arch/sparc/kernel/traps_32.c
5217 @@ -44,6 +44,8 @@ static void instruction_dump(unsigned long *pc)
5218 #define __SAVE __asm__ __volatile__("save %sp, -0x40, %sp\n\t")
5219 #define __RESTORE __asm__ __volatile__("restore %g0, %g0, %g0\n\t")
5220
5221 +extern void gr_handle_kernel_exploit(void);
5222 +
5223 void die_if_kernel(char *str, struct pt_regs *regs)
5224 {
5225 static int die_counter;
5226 @@ -76,15 +78,17 @@ void die_if_kernel(char *str, struct pt_regs *regs)
5227 count++ < 30 &&
5228 (((unsigned long) rw) >= PAGE_OFFSET) &&
5229 !(((unsigned long) rw) & 0x7)) {
5230 - printk("Caller[%08lx]: %pS\n", rw->ins[7],
5231 + printk("Caller[%08lx]: %pA\n", rw->ins[7],
5232 (void *) rw->ins[7]);
5233 rw = (struct reg_window32 *)rw->ins[6];
5234 }
5235 }
5236 printk("Instruction DUMP:");
5237 instruction_dump ((unsigned long *) regs->pc);
5238 - if(regs->psr & PSR_PS)
5239 + if(regs->psr & PSR_PS) {
5240 + gr_handle_kernel_exploit();
5241 do_exit(SIGKILL);
5242 + }
5243 do_exit(SIGSEGV);
5244 }
5245
5246 diff --git a/arch/sparc/kernel/traps_64.c b/arch/sparc/kernel/traps_64.c
5247 index 10f7bb9..cdb6793 100644
5248 --- a/arch/sparc/kernel/traps_64.c
5249 +++ b/arch/sparc/kernel/traps_64.c
5250 @@ -73,7 +73,7 @@ static void dump_tl1_traplog(struct tl1_traplog *p)
5251 i + 1,
5252 p->trapstack[i].tstate, p->trapstack[i].tpc,
5253 p->trapstack[i].tnpc, p->trapstack[i].tt);
5254 - printk("TRAPLOG: TPC<%pS>\n", (void *) p->trapstack[i].tpc);
5255 + printk("TRAPLOG: TPC<%pA>\n", (void *) p->trapstack[i].tpc);
5256 }
5257 }
5258
5259 @@ -93,6 +93,12 @@ void bad_trap(struct pt_regs *regs, long lvl)
5260
5261 lvl -= 0x100;
5262 if (regs->tstate & TSTATE_PRIV) {
5263 +
5264 +#ifdef CONFIG_PAX_REFCOUNT
5265 + if (lvl == 6)
5266 + pax_report_refcount_overflow(regs);
5267 +#endif
5268 +
5269 sprintf(buffer, "Kernel bad sw trap %lx", lvl);
5270 die_if_kernel(buffer, regs);
5271 }
5272 @@ -111,11 +117,16 @@ void bad_trap(struct pt_regs *regs, long lvl)
5273 void bad_trap_tl1(struct pt_regs *regs, long lvl)
5274 {
5275 char buffer[32];
5276 -
5277 +
5278 if (notify_die(DIE_TRAP_TL1, "bad trap tl1", regs,
5279 0, lvl, SIGTRAP) == NOTIFY_STOP)
5280 return;
5281
5282 +#ifdef CONFIG_PAX_REFCOUNT
5283 + if (lvl == 6)
5284 + pax_report_refcount_overflow(regs);
5285 +#endif
5286 +
5287 dump_tl1_traplog((struct tl1_traplog *)(regs + 1));
5288
5289 sprintf (buffer, "Bad trap %lx at tl>0", lvl);
5290 @@ -1139,7 +1150,7 @@ static void cheetah_log_errors(struct pt_regs *regs, struct cheetah_err_info *in
5291 regs->tpc, regs->tnpc, regs->u_regs[UREG_I7], regs->tstate);
5292 printk("%s" "ERROR(%d): ",
5293 (recoverable ? KERN_WARNING : KERN_CRIT), smp_processor_id());
5294 - printk("TPC<%pS>\n", (void *) regs->tpc);
5295 + printk("TPC<%pA>\n", (void *) regs->tpc);
5296 printk("%s" "ERROR(%d): M_SYND(%lx), E_SYND(%lx)%s%s\n",
5297 (recoverable ? KERN_WARNING : KERN_CRIT), smp_processor_id(),
5298 (afsr & CHAFSR_M_SYNDROME) >> CHAFSR_M_SYNDROME_SHIFT,
5299 @@ -1746,7 +1757,7 @@ void cheetah_plus_parity_error(int type, struct pt_regs *regs)
5300 smp_processor_id(),
5301 (type & 0x1) ? 'I' : 'D',
5302 regs->tpc);
5303 - printk(KERN_EMERG "TPC<%pS>\n", (void *) regs->tpc);
5304 + printk(KERN_EMERG "TPC<%pA>\n", (void *) regs->tpc);
5305 panic("Irrecoverable Cheetah+ parity error.");
5306 }
5307
5308 @@ -1754,7 +1765,7 @@ void cheetah_plus_parity_error(int type, struct pt_regs *regs)
5309 smp_processor_id(),
5310 (type & 0x1) ? 'I' : 'D',
5311 regs->tpc);
5312 - printk(KERN_WARNING "TPC<%pS>\n", (void *) regs->tpc);
5313 + printk(KERN_WARNING "TPC<%pA>\n", (void *) regs->tpc);
5314 }
5315
5316 struct sun4v_error_entry {
5317 @@ -1961,9 +1972,9 @@ void sun4v_itlb_error_report(struct pt_regs *regs, int tl)
5318
5319 printk(KERN_EMERG "SUN4V-ITLB: Error at TPC[%lx], tl %d\n",
5320 regs->tpc, tl);
5321 - printk(KERN_EMERG "SUN4V-ITLB: TPC<%pS>\n", (void *) regs->tpc);
5322 + printk(KERN_EMERG "SUN4V-ITLB: TPC<%pA>\n", (void *) regs->tpc);
5323 printk(KERN_EMERG "SUN4V-ITLB: O7[%lx]\n", regs->u_regs[UREG_I7]);
5324 - printk(KERN_EMERG "SUN4V-ITLB: O7<%pS>\n",
5325 + printk(KERN_EMERG "SUN4V-ITLB: O7<%pA>\n",
5326 (void *) regs->u_regs[UREG_I7]);
5327 printk(KERN_EMERG "SUN4V-ITLB: vaddr[%lx] ctx[%lx] "
5328 "pte[%lx] error[%lx]\n",
5329 @@ -1985,9 +1996,9 @@ void sun4v_dtlb_error_report(struct pt_regs *regs, int tl)
5330
5331 printk(KERN_EMERG "SUN4V-DTLB: Error at TPC[%lx], tl %d\n",
5332 regs->tpc, tl);
5333 - printk(KERN_EMERG "SUN4V-DTLB: TPC<%pS>\n", (void *) regs->tpc);
5334 + printk(KERN_EMERG "SUN4V-DTLB: TPC<%pA>\n", (void *) regs->tpc);
5335 printk(KERN_EMERG "SUN4V-DTLB: O7[%lx]\n", regs->u_regs[UREG_I7]);
5336 - printk(KERN_EMERG "SUN4V-DTLB: O7<%pS>\n",
5337 + printk(KERN_EMERG "SUN4V-DTLB: O7<%pA>\n",
5338 (void *) regs->u_regs[UREG_I7]);
5339 printk(KERN_EMERG "SUN4V-DTLB: vaddr[%lx] ctx[%lx] "
5340 "pte[%lx] error[%lx]\n",
5341 @@ -2191,7 +2202,7 @@ void show_stack(struct task_struct *tsk, unsigned long *_ksp)
5342 fp = (unsigned long)sf->fp + STACK_BIAS;
5343 }
5344
5345 - printk(" [%016lx] %pS\n", pc, (void *) pc);
5346 + printk(" [%016lx] %pA\n", pc, (void *) pc);
5347 } while (++count < 16);
5348 }
5349
5350 @@ -2233,6 +2244,8 @@ static inline struct reg_window *kernel_stack_up(struct reg_window *rw)
5351 return (struct reg_window *) (fp + STACK_BIAS);
5352 }
5353
5354 +extern void gr_handle_kernel_exploit(void);
5355 +
5356 void die_if_kernel(char *str, struct pt_regs *regs)
5357 {
5358 static int die_counter;
5359 @@ -2260,7 +2273,7 @@ void die_if_kernel(char *str, struct pt_regs *regs)
5360 while (rw &&
5361 count++ < 30&&
5362 is_kernel_stack(current, rw)) {
5363 - printk("Caller[%016lx]: %pS\n", rw->ins[7],
5364 + printk("Caller[%016lx]: %pA\n", rw->ins[7],
5365 (void *) rw->ins[7]);
5366
5367 rw = kernel_stack_up(rw);
5368 @@ -2273,8 +2286,11 @@ void die_if_kernel(char *str, struct pt_regs *regs)
5369 }
5370 user_instruction_dump ((unsigned int __user *) regs->tpc);
5371 }
5372 - if (regs->tstate & TSTATE_PRIV)
5373 + if (regs->tstate & TSTATE_PRIV) {
5374 + gr_handle_kernel_exploit();
5375 do_exit(SIGKILL);
5376 + }
5377 +
5378 do_exit(SIGSEGV);
5379 }
5380 EXPORT_SYMBOL(die_if_kernel);
5381 diff --git a/arch/sparc/kernel/una_asm_64.S b/arch/sparc/kernel/una_asm_64.S
5382 index be183fe..1c8d332 100644
5383 --- a/arch/sparc/kernel/una_asm_64.S
5384 +++ b/arch/sparc/kernel/una_asm_64.S
5385 @@ -127,7 +127,7 @@ do_int_load:
5386 wr %o5, 0x0, %asi
5387 retl
5388 mov 0, %o0
5389 - .size __do_int_load, .-__do_int_load
5390 + .size do_int_load, .-do_int_load
5391
5392 .section __ex_table,"a"
5393 .word 4b, __retl_efault
5394 diff --git a/arch/sparc/kernel/unaligned_64.c b/arch/sparc/kernel/unaligned_64.c
5395 index 3792099..2af17d8 100644
5396 --- a/arch/sparc/kernel/unaligned_64.c
5397 +++ b/arch/sparc/kernel/unaligned_64.c
5398 @@ -288,7 +288,7 @@ static void log_unaligned(struct pt_regs *regs)
5399 if (count < 5) {
5400 last_time = jiffies;
5401 count++;
5402 - printk("Kernel unaligned access at TPC[%lx] %pS\n",
5403 + printk("Kernel unaligned access at TPC[%lx] %pA\n",
5404 regs->tpc, (void *) regs->tpc);
5405 }
5406 }
5407 diff --git a/arch/sparc/lib/Makefile b/arch/sparc/lib/Makefile
5408 index e75faf0..24f12f9 100644
5409 --- a/arch/sparc/lib/Makefile
5410 +++ b/arch/sparc/lib/Makefile
5411 @@ -2,7 +2,7 @@
5412 #
5413
5414 asflags-y := -ansi -DST_DIV0=0x02
5415 -ccflags-y := -Werror
5416 +#ccflags-y := -Werror
5417
5418 lib-$(CONFIG_SPARC32) += mul.o rem.o sdiv.o udiv.o umul.o urem.o ashrdi3.o
5419 lib-$(CONFIG_SPARC32) += memcpy.o memset.o
5420 diff --git a/arch/sparc/lib/atomic_64.S b/arch/sparc/lib/atomic_64.S
5421 index 0268210..f0291ca 100644
5422 --- a/arch/sparc/lib/atomic_64.S
5423 +++ b/arch/sparc/lib/atomic_64.S
5424 @@ -18,7 +18,12 @@
5425 atomic_add: /* %o0 = increment, %o1 = atomic_ptr */
5426 BACKOFF_SETUP(%o2)
5427 1: lduw [%o1], %g1
5428 - add %g1, %o0, %g7
5429 + addcc %g1, %o0, %g7
5430 +
5431 +#ifdef CONFIG_PAX_REFCOUNT
5432 + tvs %icc, 6
5433 +#endif
5434 +
5435 cas [%o1], %g1, %g7
5436 cmp %g1, %g7
5437 bne,pn %icc, 2f
5438 @@ -28,12 +33,32 @@ atomic_add: /* %o0 = increment, %o1 = atomic_ptr */
5439 2: BACKOFF_SPIN(%o2, %o3, 1b)
5440 .size atomic_add, .-atomic_add
5441
5442 + .globl atomic_add_unchecked
5443 + .type atomic_add_unchecked,#function
5444 +atomic_add_unchecked: /* %o0 = increment, %o1 = atomic_ptr */
5445 + BACKOFF_SETUP(%o2)
5446 +1: lduw [%o1], %g1
5447 + add %g1, %o0, %g7
5448 + cas [%o1], %g1, %g7
5449 + cmp %g1, %g7
5450 + bne,pn %icc, 2f
5451 + nop
5452 + retl
5453 + nop
5454 +2: BACKOFF_SPIN(%o2, %o3, 1b)
5455 + .size atomic_add_unchecked, .-atomic_add_unchecked
5456 +
5457 .globl atomic_sub
5458 .type atomic_sub,#function
5459 atomic_sub: /* %o0 = decrement, %o1 = atomic_ptr */
5460 BACKOFF_SETUP(%o2)
5461 1: lduw [%o1], %g1
5462 - sub %g1, %o0, %g7
5463 + subcc %g1, %o0, %g7
5464 +
5465 +#ifdef CONFIG_PAX_REFCOUNT
5466 + tvs %icc, 6
5467 +#endif
5468 +
5469 cas [%o1], %g1, %g7
5470 cmp %g1, %g7
5471 bne,pn %icc, 2f
5472 @@ -43,12 +68,32 @@ atomic_sub: /* %o0 = decrement, %o1 = atomic_ptr */
5473 2: BACKOFF_SPIN(%o2, %o3, 1b)
5474 .size atomic_sub, .-atomic_sub
5475
5476 + .globl atomic_sub_unchecked
5477 + .type atomic_sub_unchecked,#function
5478 +atomic_sub_unchecked: /* %o0 = decrement, %o1 = atomic_ptr */
5479 + BACKOFF_SETUP(%o2)
5480 +1: lduw [%o1], %g1
5481 + sub %g1, %o0, %g7
5482 + cas [%o1], %g1, %g7
5483 + cmp %g1, %g7
5484 + bne,pn %icc, 2f
5485 + nop
5486 + retl
5487 + nop
5488 +2: BACKOFF_SPIN(%o2, %o3, 1b)
5489 + .size atomic_sub_unchecked, .-atomic_sub_unchecked
5490 +
5491 .globl atomic_add_ret
5492 .type atomic_add_ret,#function
5493 atomic_add_ret: /* %o0 = increment, %o1 = atomic_ptr */
5494 BACKOFF_SETUP(%o2)
5495 1: lduw [%o1], %g1
5496 - add %g1, %o0, %g7
5497 + addcc %g1, %o0, %g7
5498 +
5499 +#ifdef CONFIG_PAX_REFCOUNT
5500 + tvs %icc, 6
5501 +#endif
5502 +
5503 cas [%o1], %g1, %g7
5504 cmp %g1, %g7
5505 bne,pn %icc, 2f
5506 @@ -59,12 +104,33 @@ atomic_add_ret: /* %o0 = increment, %o1 = atomic_ptr */
5507 2: BACKOFF_SPIN(%o2, %o3, 1b)
5508 .size atomic_add_ret, .-atomic_add_ret
5509
5510 + .globl atomic_add_ret_unchecked
5511 + .type atomic_add_ret_unchecked,#function
5512 +atomic_add_ret_unchecked: /* %o0 = increment, %o1 = atomic_ptr */
5513 + BACKOFF_SETUP(%o2)
5514 +1: lduw [%o1], %g1
5515 + addcc %g1, %o0, %g7
5516 + cas [%o1], %g1, %g7
5517 + cmp %g1, %g7
5518 + bne,pn %icc, 2f
5519 + add %g7, %o0, %g7
5520 + sra %g7, 0, %o0
5521 + retl
5522 + nop
5523 +2: BACKOFF_SPIN(%o2, %o3, 1b)
5524 + .size atomic_add_ret_unchecked, .-atomic_add_ret_unchecked
5525 +
5526 .globl atomic_sub_ret
5527 .type atomic_sub_ret,#function
5528 atomic_sub_ret: /* %o0 = decrement, %o1 = atomic_ptr */
5529 BACKOFF_SETUP(%o2)
5530 1: lduw [%o1], %g1
5531 - sub %g1, %o0, %g7
5532 + subcc %g1, %o0, %g7
5533 +
5534 +#ifdef CONFIG_PAX_REFCOUNT
5535 + tvs %icc, 6
5536 +#endif
5537 +
5538 cas [%o1], %g1, %g7
5539 cmp %g1, %g7
5540 bne,pn %icc, 2f
5541 @@ -80,7 +146,12 @@ atomic_sub_ret: /* %o0 = decrement, %o1 = atomic_ptr */
5542 atomic64_add: /* %o0 = increment, %o1 = atomic_ptr */
5543 BACKOFF_SETUP(%o2)
5544 1: ldx [%o1], %g1
5545 - add %g1, %o0, %g7
5546 + addcc %g1, %o0, %g7
5547 +
5548 +#ifdef CONFIG_PAX_REFCOUNT
5549 + tvs %xcc, 6
5550 +#endif
5551 +
5552 casx [%o1], %g1, %g7
5553 cmp %g1, %g7
5554 bne,pn %xcc, 2f
5555 @@ -90,12 +161,32 @@ atomic64_add: /* %o0 = increment, %o1 = atomic_ptr */
5556 2: BACKOFF_SPIN(%o2, %o3, 1b)
5557 .size atomic64_add, .-atomic64_add
5558
5559 + .globl atomic64_add_unchecked
5560 + .type atomic64_add_unchecked,#function
5561 +atomic64_add_unchecked: /* %o0 = increment, %o1 = atomic_ptr */
5562 + BACKOFF_SETUP(%o2)
5563 +1: ldx [%o1], %g1
5564 + addcc %g1, %o0, %g7
5565 + casx [%o1], %g1, %g7
5566 + cmp %g1, %g7
5567 + bne,pn %xcc, 2f
5568 + nop
5569 + retl
5570 + nop
5571 +2: BACKOFF_SPIN(%o2, %o3, 1b)
5572 + .size atomic64_add_unchecked, .-atomic64_add_unchecked
5573 +
5574 .globl atomic64_sub
5575 .type atomic64_sub,#function
5576 atomic64_sub: /* %o0 = decrement, %o1 = atomic_ptr */
5577 BACKOFF_SETUP(%o2)
5578 1: ldx [%o1], %g1
5579 - sub %g1, %o0, %g7
5580 + subcc %g1, %o0, %g7
5581 +
5582 +#ifdef CONFIG_PAX_REFCOUNT
5583 + tvs %xcc, 6
5584 +#endif
5585 +
5586 casx [%o1], %g1, %g7
5587 cmp %g1, %g7
5588 bne,pn %xcc, 2f
5589 @@ -105,12 +196,32 @@ atomic64_sub: /* %o0 = decrement, %o1 = atomic_ptr */
5590 2: BACKOFF_SPIN(%o2, %o3, 1b)
5591 .size atomic64_sub, .-atomic64_sub
5592
5593 + .globl atomic64_sub_unchecked
5594 + .type atomic64_sub_unchecked,#function
5595 +atomic64_sub_unchecked: /* %o0 = decrement, %o1 = atomic_ptr */
5596 + BACKOFF_SETUP(%o2)
5597 +1: ldx [%o1], %g1
5598 + subcc %g1, %o0, %g7
5599 + casx [%o1], %g1, %g7
5600 + cmp %g1, %g7
5601 + bne,pn %xcc, 2f
5602 + nop
5603 + retl
5604 + nop
5605 +2: BACKOFF_SPIN(%o2, %o3, 1b)
5606 + .size atomic64_sub_unchecked, .-atomic64_sub_unchecked
5607 +
5608 .globl atomic64_add_ret
5609 .type atomic64_add_ret,#function
5610 atomic64_add_ret: /* %o0 = increment, %o1 = atomic_ptr */
5611 BACKOFF_SETUP(%o2)
5612 1: ldx [%o1], %g1
5613 - add %g1, %o0, %g7
5614 + addcc %g1, %o0, %g7
5615 +
5616 +#ifdef CONFIG_PAX_REFCOUNT
5617 + tvs %xcc, 6
5618 +#endif
5619 +
5620 casx [%o1], %g1, %g7
5621 cmp %g1, %g7
5622 bne,pn %xcc, 2f
5623 @@ -121,12 +232,33 @@ atomic64_add_ret: /* %o0 = increment, %o1 = atomic_ptr */
5624 2: BACKOFF_SPIN(%o2, %o3, 1b)
5625 .size atomic64_add_ret, .-atomic64_add_ret
5626
5627 + .globl atomic64_add_ret_unchecked
5628 + .type atomic64_add_ret_unchecked,#function
5629 +atomic64_add_ret_unchecked: /* %o0 = increment, %o1 = atomic_ptr */
5630 + BACKOFF_SETUP(%o2)
5631 +1: ldx [%o1], %g1
5632 + addcc %g1, %o0, %g7
5633 + casx [%o1], %g1, %g7
5634 + cmp %g1, %g7
5635 + bne,pn %xcc, 2f
5636 + add %g7, %o0, %g7
5637 + mov %g7, %o0
5638 + retl
5639 + nop
5640 +2: BACKOFF_SPIN(%o2, %o3, 1b)
5641 + .size atomic64_add_ret_unchecked, .-atomic64_add_ret_unchecked
5642 +
5643 .globl atomic64_sub_ret
5644 .type atomic64_sub_ret,#function
5645 atomic64_sub_ret: /* %o0 = decrement, %o1 = atomic_ptr */
5646 BACKOFF_SETUP(%o2)
5647 1: ldx [%o1], %g1
5648 - sub %g1, %o0, %g7
5649 + subcc %g1, %o0, %g7
5650 +
5651 +#ifdef CONFIG_PAX_REFCOUNT
5652 + tvs %xcc, 6
5653 +#endif
5654 +
5655 casx [%o1], %g1, %g7
5656 cmp %g1, %g7
5657 bne,pn %xcc, 2f
5658 diff --git a/arch/sparc/lib/ksyms.c b/arch/sparc/lib/ksyms.c
5659 index 704b126..2e79d76 100644
5660 --- a/arch/sparc/lib/ksyms.c
5661 +++ b/arch/sparc/lib/ksyms.c
5662 @@ -144,12 +144,18 @@ EXPORT_SYMBOL(__downgrade_write);
5663
5664 /* Atomic counter implementation. */
5665 EXPORT_SYMBOL(atomic_add);
5666 +EXPORT_SYMBOL(atomic_add_unchecked);
5667 EXPORT_SYMBOL(atomic_add_ret);
5668 +EXPORT_SYMBOL(atomic_add_ret_unchecked);
5669 EXPORT_SYMBOL(atomic_sub);
5670 +EXPORT_SYMBOL(atomic_sub_unchecked);
5671 EXPORT_SYMBOL(atomic_sub_ret);
5672 EXPORT_SYMBOL(atomic64_add);
5673 +EXPORT_SYMBOL(atomic64_add_unchecked);
5674 EXPORT_SYMBOL(atomic64_add_ret);
5675 +EXPORT_SYMBOL(atomic64_add_ret_unchecked);
5676 EXPORT_SYMBOL(atomic64_sub);
5677 +EXPORT_SYMBOL(atomic64_sub_unchecked);
5678 EXPORT_SYMBOL(atomic64_sub_ret);
5679
5680 /* Atomic bit operations. */
5681 diff --git a/arch/sparc/lib/rwsem_64.S b/arch/sparc/lib/rwsem_64.S
5682 index 91a7d29..ce75c29 100644
5683 --- a/arch/sparc/lib/rwsem_64.S
5684 +++ b/arch/sparc/lib/rwsem_64.S
5685 @@ -11,7 +11,12 @@
5686 .globl __down_read
5687 __down_read:
5688 1: lduw [%o0], %g1
5689 - add %g1, 1, %g7
5690 + addcc %g1, 1, %g7
5691 +
5692 +#ifdef CONFIG_PAX_REFCOUNT
5693 + tvs %icc, 6
5694 +#endif
5695 +
5696 cas [%o0], %g1, %g7
5697 cmp %g1, %g7
5698 bne,pn %icc, 1b
5699 @@ -33,7 +38,12 @@ __down_read:
5700 .globl __down_read_trylock
5701 __down_read_trylock:
5702 1: lduw [%o0], %g1
5703 - add %g1, 1, %g7
5704 + addcc %g1, 1, %g7
5705 +
5706 +#ifdef CONFIG_PAX_REFCOUNT
5707 + tvs %icc, 6
5708 +#endif
5709 +
5710 cmp %g7, 0
5711 bl,pn %icc, 2f
5712 mov 0, %o1
5713 @@ -51,7 +61,12 @@ __down_write:
5714 or %g1, %lo(RWSEM_ACTIVE_WRITE_BIAS), %g1
5715 1:
5716 lduw [%o0], %g3
5717 - add %g3, %g1, %g7
5718 + addcc %g3, %g1, %g7
5719 +
5720 +#ifdef CONFIG_PAX_REFCOUNT
5721 + tvs %icc, 6
5722 +#endif
5723 +
5724 cas [%o0], %g3, %g7
5725 cmp %g3, %g7
5726 bne,pn %icc, 1b
5727 @@ -77,7 +92,12 @@ __down_write_trylock:
5728 cmp %g3, 0
5729 bne,pn %icc, 2f
5730 mov 0, %o1
5731 - add %g3, %g1, %g7
5732 + addcc %g3, %g1, %g7
5733 +
5734 +#ifdef CONFIG_PAX_REFCOUNT
5735 + tvs %icc, 6
5736 +#endif
5737 +
5738 cas [%o0], %g3, %g7
5739 cmp %g3, %g7
5740 bne,pn %icc, 1b
5741 @@ -90,7 +110,12 @@ __down_write_trylock:
5742 __up_read:
5743 1:
5744 lduw [%o0], %g1
5745 - sub %g1, 1, %g7
5746 + subcc %g1, 1, %g7
5747 +
5748 +#ifdef CONFIG_PAX_REFCOUNT
5749 + tvs %icc, 6
5750 +#endif
5751 +
5752 cas [%o0], %g1, %g7
5753 cmp %g1, %g7
5754 bne,pn %icc, 1b
5755 @@ -118,7 +143,12 @@ __up_write:
5756 or %g1, %lo(RWSEM_ACTIVE_WRITE_BIAS), %g1
5757 1:
5758 lduw [%o0], %g3
5759 - sub %g3, %g1, %g7
5760 + subcc %g3, %g1, %g7
5761 +
5762 +#ifdef CONFIG_PAX_REFCOUNT
5763 + tvs %icc, 6
5764 +#endif
5765 +
5766 cas [%o0], %g3, %g7
5767 cmp %g3, %g7
5768 bne,pn %icc, 1b
5769 @@ -143,7 +173,12 @@ __downgrade_write:
5770 or %g1, %lo(RWSEM_WAITING_BIAS), %g1
5771 1:
5772 lduw [%o0], %g3
5773 - sub %g3, %g1, %g7
5774 + subcc %g3, %g1, %g7
5775 +
5776 +#ifdef CONFIG_PAX_REFCOUNT
5777 + tvs %icc, 6
5778 +#endif
5779 +
5780 cas [%o0], %g3, %g7
5781 cmp %g3, %g7
5782 bne,pn %icc, 1b
5783 diff --git a/arch/sparc/mm/Makefile b/arch/sparc/mm/Makefile
5784 index 79836a7..62f47a2 100644
5785 --- a/arch/sparc/mm/Makefile
5786 +++ b/arch/sparc/mm/Makefile
5787 @@ -2,7 +2,7 @@
5788 #
5789
5790 asflags-y := -ansi
5791 -ccflags-y := -Werror
5792 +#ccflags-y := -Werror
5793
5794 obj-$(CONFIG_SPARC64) += ultra.o tlb.o tsb.o
5795 obj-y += fault_$(BITS).o
5796 diff --git a/arch/sparc/mm/fault_32.c b/arch/sparc/mm/fault_32.c
5797 index b99f81c..3453e93 100644
5798 --- a/arch/sparc/mm/fault_32.c
5799 +++ b/arch/sparc/mm/fault_32.c
5800 @@ -21,6 +21,9 @@
5801 #include <linux/interrupt.h>
5802 #include <linux/module.h>
5803 #include <linux/kdebug.h>
5804 +#include <linux/slab.h>
5805 +#include <linux/pagemap.h>
5806 +#include <linux/compiler.h>
5807
5808 #include <asm/system.h>
5809 #include <asm/page.h>
5810 @@ -167,6 +170,267 @@ static unsigned long compute_si_addr(struct pt_regs *regs, int text_fault)
5811 return safe_compute_effective_address(regs, insn);
5812 }
5813
5814 +#ifdef CONFIG_PAX_PAGEEXEC
5815 +#ifdef CONFIG_PAX_DLRESOLVE
5816 +static void pax_emuplt_close(struct vm_area_struct *vma)
5817 +{
5818 + vma->vm_mm->call_dl_resolve = 0UL;
5819 +}
5820 +
5821 +static int pax_emuplt_fault(struct vm_area_struct *vma, struct vm_fault *vmf)
5822 +{
5823 + unsigned int *kaddr;
5824 +
5825 + vmf->page = alloc_page(GFP_HIGHUSER);
5826 + if (!vmf->page)
5827 + return VM_FAULT_OOM;
5828 +
5829 + kaddr = kmap(vmf->page);
5830 + memset(kaddr, 0, PAGE_SIZE);
5831 + kaddr[0] = 0x9DE3BFA8U; /* save */
5832 + flush_dcache_page(vmf->page);
5833 + kunmap(vmf->page);
5834 + return VM_FAULT_MAJOR;
5835 +}
5836 +
5837 +static const struct vm_operations_struct pax_vm_ops = {
5838 + .close = pax_emuplt_close,
5839 + .fault = pax_emuplt_fault
5840 +};
5841 +
5842 +static int pax_insert_vma(struct vm_area_struct *vma, unsigned long addr)
5843 +{
5844 + int ret;
5845 +
5846 + vma->vm_mm = current->mm;
5847 + vma->vm_start = addr;
5848 + vma->vm_end = addr + PAGE_SIZE;
5849 + vma->vm_flags = VM_READ | VM_EXEC | VM_MAYREAD | VM_MAYEXEC;
5850 + vma->vm_page_prot = vm_get_page_prot(vma->vm_flags);
5851 + vma->vm_ops = &pax_vm_ops;
5852 +
5853 + ret = insert_vm_struct(current->mm, vma);
5854 + if (ret)
5855 + return ret;
5856 +
5857 + ++current->mm->total_vm;
5858 + return 0;
5859 +}
5860 +#endif
5861 +
5862 +/*
5863 + * PaX: decide what to do with offenders (regs->pc = fault address)
5864 + *
5865 + * returns 1 when task should be killed
5866 + * 2 when patched PLT trampoline was detected
5867 + * 3 when unpatched PLT trampoline was detected
5868 + */
5869 +static int pax_handle_fetch_fault(struct pt_regs *regs)
5870 +{
5871 +
5872 +#ifdef CONFIG_PAX_EMUPLT
5873 + int err;
5874 +
5875 + do { /* PaX: patched PLT emulation #1 */
5876 + unsigned int sethi1, sethi2, jmpl;
5877 +
5878 + err = get_user(sethi1, (unsigned int *)regs->pc);
5879 + err |= get_user(sethi2, (unsigned int *)(regs->pc+4));
5880 + err |= get_user(jmpl, (unsigned int *)(regs->pc+8));
5881 +
5882 + if (err)
5883 + break;
5884 +
5885 + if ((sethi1 & 0xFFC00000U) == 0x03000000U &&
5886 + (sethi2 & 0xFFC00000U) == 0x03000000U &&
5887 + (jmpl & 0xFFFFE000U) == 0x81C06000U)
5888 + {
5889 + unsigned int addr;
5890 +
5891 + regs->u_regs[UREG_G1] = (sethi2 & 0x003FFFFFU) << 10;
5892 + addr = regs->u_regs[UREG_G1];
5893 + addr += (((jmpl | 0xFFFFE000U) ^ 0x00001000U) + 0x00001000U);
5894 + regs->pc = addr;
5895 + regs->npc = addr+4;
5896 + return 2;
5897 + }
5898 + } while (0);
5899 +
5900 + { /* PaX: patched PLT emulation #2 */
5901 + unsigned int ba;
5902 +
5903 + err = get_user(ba, (unsigned int *)regs->pc);
5904 +
5905 + if (!err && (ba & 0xFFC00000U) == 0x30800000U) {
5906 + unsigned int addr;
5907 +
5908 + addr = regs->pc + ((((ba | 0xFFC00000U) ^ 0x00200000U) + 0x00200000U) << 2);
5909 + regs->pc = addr;
5910 + regs->npc = addr+4;
5911 + return 2;
5912 + }
5913 + }
5914 +
5915 + do { /* PaX: patched PLT emulation #3 */
5916 + unsigned int sethi, jmpl, nop;
5917 +
5918 + err = get_user(sethi, (unsigned int *)regs->pc);
5919 + err |= get_user(jmpl, (unsigned int *)(regs->pc+4));
5920 + err |= get_user(nop, (unsigned int *)(regs->pc+8));
5921 +
5922 + if (err)
5923 + break;
5924 +
5925 + if ((sethi & 0xFFC00000U) == 0x03000000U &&
5926 + (jmpl & 0xFFFFE000U) == 0x81C06000U &&
5927 + nop == 0x01000000U)
5928 + {
5929 + unsigned int addr;
5930 +
5931 + addr = (sethi & 0x003FFFFFU) << 10;
5932 + regs->u_regs[UREG_G1] = addr;
5933 + addr += (((jmpl | 0xFFFFE000U) ^ 0x00001000U) + 0x00001000U);
5934 + regs->pc = addr;
5935 + regs->npc = addr+4;
5936 + return 2;
5937 + }
5938 + } while (0);
5939 +
5940 + do { /* PaX: unpatched PLT emulation step 1 */
5941 + unsigned int sethi, ba, nop;
5942 +
5943 + err = get_user(sethi, (unsigned int *)regs->pc);
5944 + err |= get_user(ba, (unsigned int *)(regs->pc+4));
5945 + err |= get_user(nop, (unsigned int *)(regs->pc+8));
5946 +
5947 + if (err)
5948 + break;
5949 +
5950 + if ((sethi & 0xFFC00000U) == 0x03000000U &&
5951 + ((ba & 0xFFC00000U) == 0x30800000U || (ba & 0xFFF80000U) == 0x30680000U) &&
5952 + nop == 0x01000000U)
5953 + {
5954 + unsigned int addr, save, call;
5955 +
5956 + if ((ba & 0xFFC00000U) == 0x30800000U)
5957 + addr = regs->pc + 4 + ((((ba | 0xFFC00000U) ^ 0x00200000U) + 0x00200000U) << 2);
5958 + else
5959 + addr = regs->pc + 4 + ((((ba | 0xFFF80000U) ^ 0x00040000U) + 0x00040000U) << 2);
5960 +
5961 + err = get_user(save, (unsigned int *)addr);
5962 + err |= get_user(call, (unsigned int *)(addr+4));
5963 + err |= get_user(nop, (unsigned int *)(addr+8));
5964 + if (err)
5965 + break;
5966 +
5967 +#ifdef CONFIG_PAX_DLRESOLVE
5968 + if (save == 0x9DE3BFA8U &&
5969 + (call & 0xC0000000U) == 0x40000000U &&
5970 + nop == 0x01000000U)
5971 + {
5972 + struct vm_area_struct *vma;
5973 + unsigned long call_dl_resolve;
5974 +
5975 + down_read(&current->mm->mmap_sem);
5976 + call_dl_resolve = current->mm->call_dl_resolve;
5977 + up_read(&current->mm->mmap_sem);
5978 + if (likely(call_dl_resolve))
5979 + goto emulate;
5980 +
5981 + vma = kmem_cache_zalloc(vm_area_cachep, GFP_KERNEL);
5982 +
5983 + down_write(&current->mm->mmap_sem);
5984 + if (current->mm->call_dl_resolve) {
5985 + call_dl_resolve = current->mm->call_dl_resolve;
5986 + up_write(&current->mm->mmap_sem);
5987 + if (vma)
5988 + kmem_cache_free(vm_area_cachep, vma);
5989 + goto emulate;
5990 + }
5991 +
5992 + call_dl_resolve = get_unmapped_area(NULL, 0UL, PAGE_SIZE, 0UL, MAP_PRIVATE);
5993 + if (!vma || (call_dl_resolve & ~PAGE_MASK)) {
5994 + up_write(&current->mm->mmap_sem);
5995 + if (vma)
5996 + kmem_cache_free(vm_area_cachep, vma);
5997 + return 1;
5998 + }
5999 +
6000 + if (pax_insert_vma(vma, call_dl_resolve)) {
6001 + up_write(&current->mm->mmap_sem);
6002 + kmem_cache_free(vm_area_cachep, vma);
6003 + return 1;
6004 + }
6005 +
6006 + current->mm->call_dl_resolve = call_dl_resolve;
6007 + up_write(&current->mm->mmap_sem);
6008 +
6009 +emulate:
6010 + regs->u_regs[UREG_G1] = (sethi & 0x003FFFFFU) << 10;
6011 + regs->pc = call_dl_resolve;
6012 + regs->npc = addr+4;
6013 + return 3;
6014 + }
6015 +#endif
6016 +
6017 + /* PaX: glibc 2.4+ generates sethi/jmpl instead of save/call */
6018 + if ((save & 0xFFC00000U) == 0x05000000U &&
6019 + (call & 0xFFFFE000U) == 0x85C0A000U &&
6020 + nop == 0x01000000U)
6021 + {
6022 + regs->u_regs[UREG_G1] = (sethi & 0x003FFFFFU) << 10;
6023 + regs->u_regs[UREG_G2] = addr + 4;
6024 + addr = (save & 0x003FFFFFU) << 10;
6025 + addr += (((call | 0xFFFFE000U) ^ 0x00001000U) + 0x00001000U);
6026 + regs->pc = addr;
6027 + regs->npc = addr+4;
6028 + return 3;
6029 + }
6030 + }
6031 + } while (0);
6032 +
6033 + do { /* PaX: unpatched PLT emulation step 2 */
6034 + unsigned int save, call, nop;
6035 +
6036 + err = get_user(save, (unsigned int *)(regs->pc-4));
6037 + err |= get_user(call, (unsigned int *)regs->pc);
6038 + err |= get_user(nop, (unsigned int *)(regs->pc+4));
6039 + if (err)
6040 + break;
6041 +
6042 + if (save == 0x9DE3BFA8U &&
6043 + (call & 0xC0000000U) == 0x40000000U &&
6044 + nop == 0x01000000U)
6045 + {
6046 + unsigned int dl_resolve = regs->pc + ((((call | 0xC0000000U) ^ 0x20000000U) + 0x20000000U) << 2);
6047 +
6048 + regs->u_regs[UREG_RETPC] = regs->pc;
6049 + regs->pc = dl_resolve;
6050 + regs->npc = dl_resolve+4;
6051 + return 3;
6052 + }
6053 + } while (0);
6054 +#endif
6055 +
6056 + return 1;
6057 +}
6058 +
6059 +void pax_report_insns(struct pt_regs *regs, void *pc, void *sp)
6060 +{
6061 + unsigned long i;
6062 +
6063 + printk(KERN_ERR "PAX: bytes at PC: ");
6064 + for (i = 0; i < 8; i++) {
6065 + unsigned int c;
6066 + if (get_user(c, (unsigned int *)pc+i))
6067 + printk(KERN_CONT "???????? ");
6068 + else
6069 + printk(KERN_CONT "%08x ", c);
6070 + }
6071 + printk("\n");
6072 +}
6073 +#endif
6074 +
6075 asmlinkage void do_sparc_fault(struct pt_regs *regs, int text_fault, int write,
6076 unsigned long address)
6077 {
6078 @@ -231,6 +495,24 @@ good_area:
6079 if(!(vma->vm_flags & VM_WRITE))
6080 goto bad_area;
6081 } else {
6082 +
6083 +#ifdef CONFIG_PAX_PAGEEXEC
6084 + if ((mm->pax_flags & MF_PAX_PAGEEXEC) && text_fault && !(vma->vm_flags & VM_EXEC)) {
6085 + up_read(&mm->mmap_sem);
6086 + switch (pax_handle_fetch_fault(regs)) {
6087 +
6088 +#ifdef CONFIG_PAX_EMUPLT
6089 + case 2:
6090 + case 3:
6091 + return;
6092 +#endif
6093 +
6094 + }
6095 + pax_report_fault(regs, (void *)regs->pc, (void *)regs->u_regs[UREG_FP]);
6096 + do_group_exit(SIGKILL);
6097 + }
6098 +#endif
6099 +
6100 /* Allow reads even for write-only mappings */
6101 if(!(vma->vm_flags & (VM_READ | VM_EXEC)))
6102 goto bad_area;
6103 diff --git a/arch/sparc/mm/fault_64.c b/arch/sparc/mm/fault_64.c
6104 index 43b0da9..a0b78f9 100644
6105 --- a/arch/sparc/mm/fault_64.c
6106 +++ b/arch/sparc/mm/fault_64.c
6107 @@ -20,6 +20,9 @@
6108 #include <linux/kprobes.h>
6109 #include <linux/kdebug.h>
6110 #include <linux/percpu.h>
6111 +#include <linux/slab.h>
6112 +#include <linux/pagemap.h>
6113 +#include <linux/compiler.h>
6114
6115 #include <asm/page.h>
6116 #include <asm/pgtable.h>
6117 @@ -78,7 +81,7 @@ static void bad_kernel_pc(struct pt_regs *regs, unsigned long vaddr)
6118 printk(KERN_CRIT "OOPS: Bogus kernel PC [%016lx] in fault handler\n",
6119 regs->tpc);
6120 printk(KERN_CRIT "OOPS: RPC [%016lx]\n", regs->u_regs[15]);
6121 - printk("OOPS: RPC <%pS>\n", (void *) regs->u_regs[15]);
6122 + printk("OOPS: RPC <%pA>\n", (void *) regs->u_regs[15]);
6123 printk(KERN_CRIT "OOPS: Fault was to vaddr[%lx]\n", vaddr);
6124 dump_stack();
6125 unhandled_fault(regs->tpc, current, regs);
6126 @@ -249,6 +252,456 @@ static void noinline bogus_32bit_fault_address(struct pt_regs *regs,
6127 show_regs(regs);
6128 }
6129
6130 +#ifdef CONFIG_PAX_PAGEEXEC
6131 +#ifdef CONFIG_PAX_DLRESOLVE
6132 +static void pax_emuplt_close(struct vm_area_struct *vma)
6133 +{
6134 + vma->vm_mm->call_dl_resolve = 0UL;
6135 +}
6136 +
6137 +static int pax_emuplt_fault(struct vm_area_struct *vma, struct vm_fault *vmf)
6138 +{
6139 + unsigned int *kaddr;
6140 +
6141 + vmf->page = alloc_page(GFP_HIGHUSER);
6142 + if (!vmf->page)
6143 + return VM_FAULT_OOM;
6144 +
6145 + kaddr = kmap(vmf->page);
6146 + memset(kaddr, 0, PAGE_SIZE);
6147 + kaddr[0] = 0x9DE3BFA8U; /* save */
6148 + flush_dcache_page(vmf->page);
6149 + kunmap(vmf->page);
6150 + return VM_FAULT_MAJOR;
6151 +}
6152 +
6153 +static const struct vm_operations_struct pax_vm_ops = {
6154 + .close = pax_emuplt_close,
6155 + .fault = pax_emuplt_fault
6156 +};
6157 +
6158 +static int pax_insert_vma(struct vm_area_struct *vma, unsigned long addr)
6159 +{
6160 + int ret;
6161 +
6162 + vma->vm_mm = current->mm;
6163 + vma->vm_start = addr;
6164 + vma->vm_end = addr + PAGE_SIZE;
6165 + vma->vm_flags = VM_READ | VM_EXEC | VM_MAYREAD | VM_MAYEXEC;
6166 + vma->vm_page_prot = vm_get_page_prot(vma->vm_flags);
6167 + vma->vm_ops = &pax_vm_ops;
6168 +
6169 + ret = insert_vm_struct(current->mm, vma);
6170 + if (ret)
6171 + return ret;
6172 +
6173 + ++current->mm->total_vm;
6174 + return 0;
6175 +}
6176 +#endif
6177 +
6178 +/*
6179 + * PaX: decide what to do with offenders (regs->tpc = fault address)
6180 + *
6181 + * returns 1 when task should be killed
6182 + * 2 when patched PLT trampoline was detected
6183 + * 3 when unpatched PLT trampoline was detected
6184 + */
6185 +static int pax_handle_fetch_fault(struct pt_regs *regs)
6186 +{
6187 +
6188 +#ifdef CONFIG_PAX_EMUPLT
6189 + int err;
6190 +
6191 + do { /* PaX: patched PLT emulation #1 */
6192 + unsigned int sethi1, sethi2, jmpl;
6193 +
6194 + err = get_user(sethi1, (unsigned int *)regs->tpc);
6195 + err |= get_user(sethi2, (unsigned int *)(regs->tpc+4));
6196 + err |= get_user(jmpl, (unsigned int *)(regs->tpc+8));
6197 +
6198 + if (err)
6199 + break;
6200 +
6201 + if ((sethi1 & 0xFFC00000U) == 0x03000000U &&
6202 + (sethi2 & 0xFFC00000U) == 0x03000000U &&
6203 + (jmpl & 0xFFFFE000U) == 0x81C06000U)
6204 + {
6205 + unsigned long addr;
6206 +
6207 + regs->u_regs[UREG_G1] = (sethi2 & 0x003FFFFFU) << 10;
6208 + addr = regs->u_regs[UREG_G1];
6209 + addr += (((jmpl | 0xFFFFFFFFFFFFE000UL) ^ 0x00001000UL) + 0x00001000UL);
6210 +
6211 + if (test_thread_flag(TIF_32BIT))
6212 + addr &= 0xFFFFFFFFUL;
6213 +
6214 + regs->tpc = addr;
6215 + regs->tnpc = addr+4;
6216 + return 2;
6217 + }
6218 + } while (0);
6219 +
6220 + { /* PaX: patched PLT emulation #2 */
6221 + unsigned int ba;
6222 +
6223 + err = get_user(ba, (unsigned int *)regs->tpc);
6224 +
6225 + if (!err && (ba & 0xFFC00000U) == 0x30800000U) {
6226 + unsigned long addr;
6227 +
6228 + addr = regs->tpc + ((((ba | 0xFFFFFFFFFFC00000UL) ^ 0x00200000UL) + 0x00200000UL) << 2);
6229 +
6230 + if (test_thread_flag(TIF_32BIT))
6231 + addr &= 0xFFFFFFFFUL;
6232 +
6233 + regs->tpc = addr;
6234 + regs->tnpc = addr+4;
6235 + return 2;
6236 + }
6237 + }
6238 +
6239 + do { /* PaX: patched PLT emulation #3 */
6240 + unsigned int sethi, jmpl, nop;
6241 +
6242 + err = get_user(sethi, (unsigned int *)regs->tpc);
6243 + err |= get_user(jmpl, (unsigned int *)(regs->tpc+4));
6244 + err |= get_user(nop, (unsigned int *)(regs->tpc+8));
6245 +
6246 + if (err)
6247 + break;
6248 +
6249 + if ((sethi & 0xFFC00000U) == 0x03000000U &&
6250 + (jmpl & 0xFFFFE000U) == 0x81C06000U &&
6251 + nop == 0x01000000U)
6252 + {
6253 + unsigned long addr;
6254 +
6255 + addr = (sethi & 0x003FFFFFU) << 10;
6256 + regs->u_regs[UREG_G1] = addr;
6257 + addr += (((jmpl | 0xFFFFFFFFFFFFE000UL) ^ 0x00001000UL) + 0x00001000UL);
6258 +
6259 + if (test_thread_flag(TIF_32BIT))
6260 + addr &= 0xFFFFFFFFUL;
6261 +
6262 + regs->tpc = addr;
6263 + regs->tnpc = addr+4;
6264 + return 2;
6265 + }
6266 + } while (0);
6267 +
6268 + do { /* PaX: patched PLT emulation #4 */
6269 + unsigned int sethi, mov1, call, mov2;
6270 +
6271 + err = get_user(sethi, (unsigned int *)regs->tpc);
6272 + err |= get_user(mov1, (unsigned int *)(regs->tpc+4));
6273 + err |= get_user(call, (unsigned int *)(regs->tpc+8));
6274 + err |= get_user(mov2, (unsigned int *)(regs->tpc+12));
6275 +
6276 + if (err)
6277 + break;
6278 +
6279 + if ((sethi & 0xFFC00000U) == 0x03000000U &&
6280 + mov1 == 0x8210000FU &&
6281 + (call & 0xC0000000U) == 0x40000000U &&
6282 + mov2 == 0x9E100001U)
6283 + {
6284 + unsigned long addr;
6285 +
6286 + regs->u_regs[UREG_G1] = regs->u_regs[UREG_RETPC];
6287 + addr = regs->tpc + 4 + ((((call | 0xFFFFFFFFC0000000UL) ^ 0x20000000UL) + 0x20000000UL) << 2);
6288 +
6289 + if (test_thread_flag(TIF_32BIT))
6290 + addr &= 0xFFFFFFFFUL;
6291 +
6292 + regs->tpc = addr;
6293 + regs->tnpc = addr+4;
6294 + return 2;
6295 + }
6296 + } while (0);
6297 +
6298 + do { /* PaX: patched PLT emulation #5 */
6299 + unsigned int sethi, sethi1, sethi2, or1, or2, sllx, jmpl, nop;
6300 +
6301 + err = get_user(sethi, (unsigned int *)regs->tpc);
6302 + err |= get_user(sethi1, (unsigned int *)(regs->tpc+4));
6303 + err |= get_user(sethi2, (unsigned int *)(regs->tpc+8));
6304 + err |= get_user(or1, (unsigned int *)(regs->tpc+12));
6305 + err |= get_user(or2, (unsigned int *)(regs->tpc+16));
6306 + err |= get_user(sllx, (unsigned int *)(regs->tpc+20));
6307 + err |= get_user(jmpl, (unsigned int *)(regs->tpc+24));
6308 + err |= get_user(nop, (unsigned int *)(regs->tpc+28));
6309 +
6310 + if (err)
6311 + break;
6312 +
6313 + if ((sethi & 0xFFC00000U) == 0x03000000U &&
6314 + (sethi1 & 0xFFC00000U) == 0x03000000U &&
6315 + (sethi2 & 0xFFC00000U) == 0x0B000000U &&
6316 + (or1 & 0xFFFFE000U) == 0x82106000U &&
6317 + (or2 & 0xFFFFE000U) == 0x8A116000U &&
6318 + sllx == 0x83287020U &&
6319 + jmpl == 0x81C04005U &&
6320 + nop == 0x01000000U)
6321 + {
6322 + unsigned long addr;
6323 +
6324 + regs->u_regs[UREG_G1] = ((sethi1 & 0x003FFFFFU) << 10) | (or1 & 0x000003FFU);
6325 + regs->u_regs[UREG_G1] <<= 32;
6326 + regs->u_regs[UREG_G5] = ((sethi2 & 0x003FFFFFU) << 10) | (or2 & 0x000003FFU);
6327 + addr = regs->u_regs[UREG_G1] + regs->u_regs[UREG_G5];
6328 + regs->tpc = addr;
6329 + regs->tnpc = addr+4;
6330 + return 2;
6331 + }
6332 + } while (0);
6333 +
6334 + do { /* PaX: patched PLT emulation #6 */
6335 + unsigned int sethi, sethi1, sethi2, sllx, or, jmpl, nop;
6336 +
6337 + err = get_user(sethi, (unsigned int *)regs->tpc);
6338 + err |= get_user(sethi1, (unsigned int *)(regs->tpc+4));
6339 + err |= get_user(sethi2, (unsigned int *)(regs->tpc+8));
6340 + err |= get_user(sllx, (unsigned int *)(regs->tpc+12));
6341 + err |= get_user(or, (unsigned int *)(regs->tpc+16));
6342 + err |= get_user(jmpl, (unsigned int *)(regs->tpc+20));
6343 + err |= get_user(nop, (unsigned int *)(regs->tpc+24));
6344 +
6345 + if (err)
6346 + break;
6347 +
6348 + if ((sethi & 0xFFC00000U) == 0x03000000U &&
6349 + (sethi1 & 0xFFC00000U) == 0x03000000U &&
6350 + (sethi2 & 0xFFC00000U) == 0x0B000000U &&
6351 + sllx == 0x83287020U &&
6352 + (or & 0xFFFFE000U) == 0x8A116000U &&
6353 + jmpl == 0x81C04005U &&
6354 + nop == 0x01000000U)
6355 + {
6356 + unsigned long addr;
6357 +
6358 + regs->u_regs[UREG_G1] = (sethi1 & 0x003FFFFFU) << 10;
6359 + regs->u_regs[UREG_G1] <<= 32;
6360 + regs->u_regs[UREG_G5] = ((sethi2 & 0x003FFFFFU) << 10) | (or & 0x3FFU);
6361 + addr = regs->u_regs[UREG_G1] + regs->u_regs[UREG_G5];
6362 + regs->tpc = addr;
6363 + regs->tnpc = addr+4;
6364 + return 2;
6365 + }
6366 + } while (0);
6367 +
6368 + do { /* PaX: unpatched PLT emulation step 1 */
6369 + unsigned int sethi, ba, nop;
6370 +
6371 + err = get_user(sethi, (unsigned int *)regs->tpc);
6372 + err |= get_user(ba, (unsigned int *)(regs->tpc+4));
6373 + err |= get_user(nop, (unsigned int *)(regs->tpc+8));
6374 +
6375 + if (err)
6376 + break;
6377 +
6378 + if ((sethi & 0xFFC00000U) == 0x03000000U &&
6379 + ((ba & 0xFFC00000U) == 0x30800000U || (ba & 0xFFF80000U) == 0x30680000U) &&
6380 + nop == 0x01000000U)
6381 + {
6382 + unsigned long addr;
6383 + unsigned int save, call;
6384 + unsigned int sethi1, sethi2, or1, or2, sllx, add, jmpl;
6385 +
6386 + if ((ba & 0xFFC00000U) == 0x30800000U)
6387 + addr = regs->tpc + 4 + ((((ba | 0xFFFFFFFFFFC00000UL) ^ 0x00200000UL) + 0x00200000UL) << 2);
6388 + else
6389 + addr = regs->tpc + 4 + ((((ba | 0xFFFFFFFFFFF80000UL) ^ 0x00040000UL) + 0x00040000UL) << 2);
6390 +
6391 + if (test_thread_flag(TIF_32BIT))
6392 + addr &= 0xFFFFFFFFUL;
6393 +
6394 + err = get_user(save, (unsigned int *)addr);
6395 + err |= get_user(call, (unsigned int *)(addr+4));
6396 + err |= get_user(nop, (unsigned int *)(addr+8));
6397 + if (err)
6398 + break;
6399 +
6400 +#ifdef CONFIG_PAX_DLRESOLVE
6401 + if (save == 0x9DE3BFA8U &&
6402 + (call & 0xC0000000U) == 0x40000000U &&
6403 + nop == 0x01000000U)
6404 + {
6405 + struct vm_area_struct *vma;
6406 + unsigned long call_dl_resolve;
6407 +
6408 + down_read(&current->mm->mmap_sem);
6409 + call_dl_resolve = current->mm->call_dl_resolve;
6410 + up_read(&current->mm->mmap_sem);
6411 + if (likely(call_dl_resolve))
6412 + goto emulate;
6413 +
6414 + vma = kmem_cache_zalloc(vm_area_cachep, GFP_KERNEL);
6415 +
6416 + down_write(&current->mm->mmap_sem);
6417 + if (current->mm->call_dl_resolve) {
6418 + call_dl_resolve = current->mm->call_dl_resolve;
6419 + up_write(&current->mm->mmap_sem);
6420 + if (vma)
6421 + kmem_cache_free(vm_area_cachep, vma);
6422 + goto emulate;
6423 + }
6424 +
6425 + call_dl_resolve = get_unmapped_area(NULL, 0UL, PAGE_SIZE, 0UL, MAP_PRIVATE);
6426 + if (!vma || (call_dl_resolve & ~PAGE_MASK)) {
6427 + up_write(&current->mm->mmap_sem);
6428 + if (vma)
6429 + kmem_cache_free(vm_area_cachep, vma);
6430 + return 1;
6431 + }
6432 +
6433 + if (pax_insert_vma(vma, call_dl_resolve)) {
6434 + up_write(&current->mm->mmap_sem);
6435 + kmem_cache_free(vm_area_cachep, vma);
6436 + return 1;
6437 + }
6438 +
6439 + current->mm->call_dl_resolve = call_dl_resolve;
6440 + up_write(&current->mm->mmap_sem);
6441 +
6442 +emulate:
6443 + regs->u_regs[UREG_G1] = (sethi & 0x003FFFFFU) << 10;
6444 + regs->tpc = call_dl_resolve;
6445 + regs->tnpc = addr+4;
6446 + return 3;
6447 + }
6448 +#endif
6449 +
6450 + /* PaX: glibc 2.4+ generates sethi/jmpl instead of save/call */
6451 + if ((save & 0xFFC00000U) == 0x05000000U &&
6452 + (call & 0xFFFFE000U) == 0x85C0A000U &&
6453 + nop == 0x01000000U)
6454 + {
6455 + regs->u_regs[UREG_G1] = (sethi & 0x003FFFFFU) << 10;
6456 + regs->u_regs[UREG_G2] = addr + 4;
6457 + addr = (save & 0x003FFFFFU) << 10;
6458 + addr += (((call | 0xFFFFFFFFFFFFE000UL) ^ 0x00001000UL) + 0x00001000UL);
6459 +
6460 + if (test_thread_flag(TIF_32BIT))
6461 + addr &= 0xFFFFFFFFUL;
6462 +
6463 + regs->tpc = addr;
6464 + regs->tnpc = addr+4;
6465 + return 3;
6466 + }
6467 +
6468 + /* PaX: 64-bit PLT stub */
6469 + err = get_user(sethi1, (unsigned int *)addr);
6470 + err |= get_user(sethi2, (unsigned int *)(addr+4));
6471 + err |= get_user(or1, (unsigned int *)(addr+8));
6472 + err |= get_user(or2, (unsigned int *)(addr+12));
6473 + err |= get_user(sllx, (unsigned int *)(addr+16));
6474 + err |= get_user(add, (unsigned int *)(addr+20));
6475 + err |= get_user(jmpl, (unsigned int *)(addr+24));
6476 + err |= get_user(nop, (unsigned int *)(addr+28));
6477 + if (err)
6478 + break;
6479 +
6480 + if ((sethi1 & 0xFFC00000U) == 0x09000000U &&
6481 + (sethi2 & 0xFFC00000U) == 0x0B000000U &&
6482 + (or1 & 0xFFFFE000U) == 0x88112000U &&
6483 + (or2 & 0xFFFFE000U) == 0x8A116000U &&
6484 + sllx == 0x89293020U &&
6485 + add == 0x8A010005U &&
6486 + jmpl == 0x89C14000U &&
6487 + nop == 0x01000000U)
6488 + {
6489 + regs->u_regs[UREG_G1] = (sethi & 0x003FFFFFU) << 10;
6490 + regs->u_regs[UREG_G4] = ((sethi1 & 0x003FFFFFU) << 10) | (or1 & 0x000003FFU);
6491 + regs->u_regs[UREG_G4] <<= 32;
6492 + regs->u_regs[UREG_G5] = ((sethi2 & 0x003FFFFFU) << 10) | (or2 & 0x000003FFU);
6493 + regs->u_regs[UREG_G5] += regs->u_regs[UREG_G4];
6494 + regs->u_regs[UREG_G4] = addr + 24;
6495 + addr = regs->u_regs[UREG_G5];
6496 + regs->tpc = addr;
6497 + regs->tnpc = addr+4;
6498 + return 3;
6499 + }
6500 + }
6501 + } while (0);
6502 +
6503 +#ifdef CONFIG_PAX_DLRESOLVE
6504 + do { /* PaX: unpatched PLT emulation step 2 */
6505 + unsigned int save, call, nop;
6506 +
6507 + err = get_user(save, (unsigned int *)(regs->tpc-4));
6508 + err |= get_user(call, (unsigned int *)regs->tpc);
6509 + err |= get_user(nop, (unsigned int *)(regs->tpc+4));
6510 + if (err)
6511 + break;
6512 +
6513 + if (save == 0x9DE3BFA8U &&
6514 + (call & 0xC0000000U) == 0x40000000U &&
6515 + nop == 0x01000000U)
6516 + {
6517 + unsigned long dl_resolve = regs->tpc + ((((call | 0xFFFFFFFFC0000000UL) ^ 0x20000000UL) + 0x20000000UL) << 2);
6518 +
6519 + if (test_thread_flag(TIF_32BIT))
6520 + dl_resolve &= 0xFFFFFFFFUL;
6521 +
6522 + regs->u_regs[UREG_RETPC] = regs->tpc;
6523 + regs->tpc = dl_resolve;
6524 + regs->tnpc = dl_resolve+4;
6525 + return 3;
6526 + }
6527 + } while (0);
6528 +#endif
6529 +
6530 + do { /* PaX: patched PLT emulation #7, must be AFTER the unpatched PLT emulation */
6531 + unsigned int sethi, ba, nop;
6532 +
6533 + err = get_user(sethi, (unsigned int *)regs->tpc);
6534 + err |= get_user(ba, (unsigned int *)(regs->tpc+4));
6535 + err |= get_user(nop, (unsigned int *)(regs->tpc+8));
6536 +
6537 + if (err)
6538 + break;
6539 +
6540 + if ((sethi & 0xFFC00000U) == 0x03000000U &&
6541 + (ba & 0xFFF00000U) == 0x30600000U &&
6542 + nop == 0x01000000U)
6543 + {
6544 + unsigned long addr;
6545 +
6546 + addr = (sethi & 0x003FFFFFU) << 10;
6547 + regs->u_regs[UREG_G1] = addr;
6548 + addr = regs->tpc + ((((ba | 0xFFFFFFFFFFF80000UL) ^ 0x00040000UL) + 0x00040000UL) << 2);
6549 +
6550 + if (test_thread_flag(TIF_32BIT))
6551 + addr &= 0xFFFFFFFFUL;
6552 +
6553 + regs->tpc = addr;
6554 + regs->tnpc = addr+4;
6555 + return 2;
6556 + }
6557 + } while (0);
6558 +
6559 +#endif
6560 +
6561 + return 1;
6562 +}
6563 +
6564 +void pax_report_insns(struct pt_regs *regs, void *pc, void *sp)
6565 +{
6566 + unsigned long i;
6567 +
6568 + printk(KERN_ERR "PAX: bytes at PC: ");
6569 + for (i = 0; i < 8; i++) {
6570 + unsigned int c;
6571 + if (get_user(c, (unsigned int *)pc+i))
6572 + printk(KERN_CONT "???????? ");
6573 + else
6574 + printk(KERN_CONT "%08x ", c);
6575 + }
6576 + printk("\n");
6577 +}
6578 +#endif
6579 +
6580 asmlinkage void __kprobes do_sparc64_fault(struct pt_regs *regs)
6581 {
6582 struct mm_struct *mm = current->mm;
6583 @@ -315,6 +768,29 @@ asmlinkage void __kprobes do_sparc64_fault(struct pt_regs *regs)
6584 if (!vma)
6585 goto bad_area;
6586
6587 +#ifdef CONFIG_PAX_PAGEEXEC
6588 + /* PaX: detect ITLB misses on non-exec pages */
6589 + if ((mm->pax_flags & MF_PAX_PAGEEXEC) && vma->vm_start <= address &&
6590 + !(vma->vm_flags & VM_EXEC) && (fault_code & FAULT_CODE_ITLB))
6591 + {
6592 + if (address != regs->tpc)
6593 + goto good_area;
6594 +
6595 + up_read(&mm->mmap_sem);
6596 + switch (pax_handle_fetch_fault(regs)) {
6597 +
6598 +#ifdef CONFIG_PAX_EMUPLT
6599 + case 2:
6600 + case 3:
6601 + return;
6602 +#endif
6603 +
6604 + }
6605 + pax_report_fault(regs, (void *)regs->tpc, (void *)(regs->u_regs[UREG_FP] + STACK_BIAS));
6606 + do_group_exit(SIGKILL);
6607 + }
6608 +#endif
6609 +
6610 /* Pure DTLB misses do not tell us whether the fault causing
6611 * load/store/atomic was a write or not, it only says that there
6612 * was no match. So in such a case we (carefully) read the
6613 diff --git a/arch/sparc/mm/hugetlbpage.c b/arch/sparc/mm/hugetlbpage.c
6614 index f27d103..1b06377 100644
6615 --- a/arch/sparc/mm/hugetlbpage.c
6616 +++ b/arch/sparc/mm/hugetlbpage.c
6617 @@ -69,7 +69,7 @@ full_search:
6618 }
6619 return -ENOMEM;
6620 }
6621 - if (likely(!vma || addr + len <= vma->vm_start)) {
6622 + if (likely(check_heap_stack_gap(vma, addr, len))) {
6623 /*
6624 * Remember the place where we stopped the search:
6625 */
6626 @@ -108,7 +108,7 @@ hugetlb_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
6627 /* make sure it can fit in the remaining address space */
6628 if (likely(addr > len)) {
6629 vma = find_vma(mm, addr-len);
6630 - if (!vma || addr <= vma->vm_start) {
6631 + if (check_heap_stack_gap(vma, addr - len, len)) {
6632 /* remember the address as a hint for next time */
6633 return (mm->free_area_cache = addr-len);
6634 }
6635 @@ -117,16 +117,17 @@ hugetlb_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
6636 if (unlikely(mm->mmap_base < len))
6637 goto bottomup;
6638
6639 - addr = (mm->mmap_base-len) & HPAGE_MASK;
6640 + addr = mm->mmap_base - len;
6641
6642 do {
6643 + addr &= HPAGE_MASK;
6644 /*
6645 * Lookup failure means no vma is above this address,
6646 * else if new region fits below vma->vm_start,
6647 * return with success:
6648 */
6649 vma = find_vma(mm, addr);
6650 - if (likely(!vma || addr+len <= vma->vm_start)) {
6651 + if (likely(check_heap_stack_gap(vma, addr, len))) {
6652 /* remember the address as a hint for next time */
6653 return (mm->free_area_cache = addr);
6654 }
6655 @@ -136,8 +137,8 @@ hugetlb_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
6656 mm->cached_hole_size = vma->vm_start - addr;
6657
6658 /* try just below the current vma->vm_start */
6659 - addr = (vma->vm_start-len) & HPAGE_MASK;
6660 - } while (likely(len < vma->vm_start));
6661 + addr = skip_heap_stack_gap(vma, len);
6662 + } while (!IS_ERR_VALUE(addr));
6663
6664 bottomup:
6665 /*
6666 @@ -183,8 +184,7 @@ hugetlb_get_unmapped_area(struct file *file, unsigned long addr,
6667 if (addr) {
6668 addr = ALIGN(addr, HPAGE_SIZE);
6669 vma = find_vma(mm, addr);
6670 - if (task_size - len >= addr &&
6671 - (!vma || addr + len <= vma->vm_start))
6672 + if (task_size - len >= addr && check_heap_stack_gap(vma, addr, len))
6673 return addr;
6674 }
6675 if (mm->get_unmapped_area == arch_get_unmapped_area)
6676 diff --git a/arch/sparc/mm/init_32.c b/arch/sparc/mm/init_32.c
6677 index dc7c3b1..34c0070 100644
6678 --- a/arch/sparc/mm/init_32.c
6679 +++ b/arch/sparc/mm/init_32.c
6680 @@ -317,6 +317,9 @@ extern void device_scan(void);
6681 pgprot_t PAGE_SHARED __read_mostly;
6682 EXPORT_SYMBOL(PAGE_SHARED);
6683
6684 +pgprot_t PAGE_SHARED_NOEXEC __read_mostly;
6685 +EXPORT_SYMBOL(PAGE_SHARED_NOEXEC);
6686 +
6687 void __init paging_init(void)
6688 {
6689 switch(sparc_cpu_model) {
6690 @@ -345,17 +348,17 @@ void __init paging_init(void)
6691
6692 /* Initialize the protection map with non-constant, MMU dependent values. */
6693 protection_map[0] = PAGE_NONE;
6694 - protection_map[1] = PAGE_READONLY;
6695 - protection_map[2] = PAGE_COPY;
6696 - protection_map[3] = PAGE_COPY;
6697 + protection_map[1] = PAGE_READONLY_NOEXEC;
6698 + protection_map[2] = PAGE_COPY_NOEXEC;
6699 + protection_map[3] = PAGE_COPY_NOEXEC;
6700 protection_map[4] = PAGE_READONLY;
6701 protection_map[5] = PAGE_READONLY;
6702 protection_map[6] = PAGE_COPY;
6703 protection_map[7] = PAGE_COPY;
6704 protection_map[8] = PAGE_NONE;
6705 - protection_map[9] = PAGE_READONLY;
6706 - protection_map[10] = PAGE_SHARED;
6707 - protection_map[11] = PAGE_SHARED;
6708 + protection_map[9] = PAGE_READONLY_NOEXEC;
6709 + protection_map[10] = PAGE_SHARED_NOEXEC;
6710 + protection_map[11] = PAGE_SHARED_NOEXEC;
6711 protection_map[12] = PAGE_READONLY;
6712 protection_map[13] = PAGE_READONLY;
6713 protection_map[14] = PAGE_SHARED;
6714 diff --git a/arch/sparc/mm/srmmu.c b/arch/sparc/mm/srmmu.c
6715 index 509b1ff..bfd7118 100644
6716 --- a/arch/sparc/mm/srmmu.c
6717 +++ b/arch/sparc/mm/srmmu.c
6718 @@ -2200,6 +2200,13 @@ void __init ld_mmu_srmmu(void)
6719 PAGE_SHARED = pgprot_val(SRMMU_PAGE_SHARED);
6720 BTFIXUPSET_INT(page_copy, pgprot_val(SRMMU_PAGE_COPY));
6721 BTFIXUPSET_INT(page_readonly, pgprot_val(SRMMU_PAGE_RDONLY));
6722 +
6723 +#ifdef CONFIG_PAX_PAGEEXEC
6724 + PAGE_SHARED_NOEXEC = pgprot_val(SRMMU_PAGE_SHARED_NOEXEC);
6725 + BTFIXUPSET_INT(page_copy_noexec, pgprot_val(SRMMU_PAGE_COPY_NOEXEC));
6726 + BTFIXUPSET_INT(page_readonly_noexec, pgprot_val(SRMMU_PAGE_RDONLY_NOEXEC));
6727 +#endif
6728 +
6729 BTFIXUPSET_INT(page_kernel, pgprot_val(SRMMU_PAGE_KERNEL));
6730 page_kernel = pgprot_val(SRMMU_PAGE_KERNEL);
6731
6732 diff --git a/arch/um/Makefile b/arch/um/Makefile
6733 index fc633db..5e1a1c2 100644
6734 --- a/arch/um/Makefile
6735 +++ b/arch/um/Makefile
6736 @@ -49,6 +49,10 @@ USER_CFLAGS = $(patsubst $(KERNEL_DEFINES),,$(patsubst -D__KERNEL__,,\
6737 $(patsubst -I%,,$(KBUILD_CFLAGS)))) $(ARCH_INCLUDE) $(MODE_INCLUDE) \
6738 $(filter -I%,$(CFLAGS)) -D_FILE_OFFSET_BITS=64
6739
6740 +ifdef CONSTIFY_PLUGIN
6741 +USER_CFLAGS += $(CONSTIFY_PLUGIN) -fplugin-arg-constify_plugin-no-constify
6742 +endif
6743 +
6744 include $(srctree)/$(ARCH_DIR)/Makefile-$(SUBARCH)
6745
6746 #This will adjust *FLAGS accordingly to the platform.
6747 diff --git a/arch/um/include/asm/kmap_types.h b/arch/um/include/asm/kmap_types.h
6748 index 6c03acd..a5e0215 100644
6749 --- a/arch/um/include/asm/kmap_types.h
6750 +++ b/arch/um/include/asm/kmap_types.h
6751 @@ -23,6 +23,7 @@ enum km_type {
6752 KM_IRQ1,
6753 KM_SOFTIRQ0,
6754 KM_SOFTIRQ1,
6755 + KM_CLEARPAGE,
6756 KM_TYPE_NR
6757 };
6758
6759 diff --git a/arch/um/include/asm/page.h b/arch/um/include/asm/page.h
6760 index 4cc9b6c..02e5029 100644
6761 --- a/arch/um/include/asm/page.h
6762 +++ b/arch/um/include/asm/page.h
6763 @@ -14,6 +14,9 @@
6764 #define PAGE_SIZE (_AC(1, UL) << PAGE_SHIFT)
6765 #define PAGE_MASK (~(PAGE_SIZE-1))
6766
6767 +#define ktla_ktva(addr) (addr)
6768 +#define ktva_ktla(addr) (addr)
6769 +
6770 #ifndef __ASSEMBLY__
6771
6772 struct page;
6773 diff --git a/arch/um/kernel/process.c b/arch/um/kernel/process.c
6774 index 4a28a15..654dc2a 100644
6775 --- a/arch/um/kernel/process.c
6776 +++ b/arch/um/kernel/process.c
6777 @@ -393,22 +393,6 @@ int singlestepping(void * t)
6778 return 2;
6779 }
6780
6781 -/*
6782 - * Only x86 and x86_64 have an arch_align_stack().
6783 - * All other arches have "#define arch_align_stack(x) (x)"
6784 - * in their asm/system.h
6785 - * As this is included in UML from asm-um/system-generic.h,
6786 - * we can use it to behave as the subarch does.
6787 - */
6788 -#ifndef arch_align_stack
6789 -unsigned long arch_align_stack(unsigned long sp)
6790 -{
6791 - if (!(current->personality & ADDR_NO_RANDOMIZE) && randomize_va_space)
6792 - sp -= get_random_int() % 8192;
6793 - return sp & ~0xf;
6794 -}
6795 -#endif
6796 -
6797 unsigned long get_wchan(struct task_struct *p)
6798 {
6799 unsigned long stack_page, sp, ip;
6800 diff --git a/arch/um/sys-i386/shared/sysdep/system.h b/arch/um/sys-i386/shared/sysdep/system.h
6801 index d1b93c4..ae1b7fd 100644
6802 --- a/arch/um/sys-i386/shared/sysdep/system.h
6803 +++ b/arch/um/sys-i386/shared/sysdep/system.h
6804 @@ -17,7 +17,7 @@
6805 # define AT_VECTOR_SIZE_ARCH 1
6806 #endif
6807
6808 -extern unsigned long arch_align_stack(unsigned long sp);
6809 +#define arch_align_stack(x) ((x) & ~0xfUL)
6810
6811 void default_idle(void);
6812
6813 diff --git a/arch/um/sys-i386/syscalls.c b/arch/um/sys-i386/syscalls.c
6814 index 857ca0b..9a2669d 100644
6815 --- a/arch/um/sys-i386/syscalls.c
6816 +++ b/arch/um/sys-i386/syscalls.c
6817 @@ -11,6 +11,21 @@
6818 #include "asm/uaccess.h"
6819 #include "asm/unistd.h"
6820
6821 +int i386_mmap_check(unsigned long addr, unsigned long len, unsigned long flags)
6822 +{
6823 + unsigned long pax_task_size = TASK_SIZE;
6824 +
6825 +#ifdef CONFIG_PAX_SEGMEXEC
6826 + if (current->mm->pax_flags & MF_PAX_SEGMEXEC)
6827 + pax_task_size = SEGMEXEC_TASK_SIZE;
6828 +#endif
6829 +
6830 + if (len > pax_task_size || addr > pax_task_size - len)
6831 + return -EINVAL;
6832 +
6833 + return 0;
6834 +}
6835 +
6836 /*
6837 * Perform the select(nd, in, out, ex, tv) and mmap() system
6838 * calls. Linux/i386 didn't use to be able to handle more than
6839 diff --git a/arch/um/sys-x86_64/shared/sysdep/system.h b/arch/um/sys-x86_64/shared/sysdep/system.h
6840 index d1b93c4..ae1b7fd 100644
6841 --- a/arch/um/sys-x86_64/shared/sysdep/system.h
6842 +++ b/arch/um/sys-x86_64/shared/sysdep/system.h
6843 @@ -17,7 +17,7 @@
6844 # define AT_VECTOR_SIZE_ARCH 1
6845 #endif
6846
6847 -extern unsigned long arch_align_stack(unsigned long sp);
6848 +#define arch_align_stack(x) ((x) & ~0xfUL)
6849
6850 void default_idle(void);
6851
6852 diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig
6853 index 73ae02a..f932de5 100644
6854 --- a/arch/x86/Kconfig
6855 +++ b/arch/x86/Kconfig
6856 @@ -223,7 +223,7 @@ config X86_TRAMPOLINE
6857
6858 config X86_32_LAZY_GS
6859 def_bool y
6860 - depends on X86_32 && !CC_STACKPROTECTOR
6861 + depends on X86_32 && !CC_STACKPROTECTOR && !PAX_MEMORY_UDEREF
6862
6863 config KTIME_SCALAR
6864 def_bool X86_32
6865 @@ -1008,7 +1008,7 @@ choice
6866
6867 config NOHIGHMEM
6868 bool "off"
6869 - depends on !X86_NUMAQ
6870 + depends on !X86_NUMAQ && !(PAX_PAGEEXEC && PAX_ENABLE_PAE)
6871 ---help---
6872 Linux can use up to 64 Gigabytes of physical memory on x86 systems.
6873 However, the address space of 32-bit x86 processors is only 4
6874 @@ -1045,7 +1045,7 @@ config NOHIGHMEM
6875
6876 config HIGHMEM4G
6877 bool "4GB"
6878 - depends on !X86_NUMAQ
6879 + depends on !X86_NUMAQ && !(PAX_PAGEEXEC && PAX_ENABLE_PAE)
6880 ---help---
6881 Select this if you have a 32-bit processor and between 1 and 4
6882 gigabytes of physical RAM.
6883 @@ -1099,7 +1099,7 @@ config PAGE_OFFSET
6884 hex
6885 default 0xB0000000 if VMSPLIT_3G_OPT
6886 default 0x80000000 if VMSPLIT_2G
6887 - default 0x78000000 if VMSPLIT_2G_OPT
6888 + default 0x70000000 if VMSPLIT_2G_OPT
6889 default 0x40000000 if VMSPLIT_1G
6890 default 0xC0000000
6891 depends on X86_32
6892 @@ -1460,6 +1460,7 @@ config SECCOMP
6893
6894 config CC_STACKPROTECTOR
6895 bool "Enable -fstack-protector buffer overflow detection (EXPERIMENTAL)"
6896 + depends on X86_64 || !PAX_MEMORY_UDEREF
6897 ---help---
6898 This option turns on the -fstack-protector GCC feature. This
6899 feature puts, at the beginning of functions, a canary value on
6900 @@ -1517,6 +1518,7 @@ config KEXEC_JUMP
6901 config PHYSICAL_START
6902 hex "Physical address where the kernel is loaded" if (EMBEDDED || CRASH_DUMP)
6903 default "0x1000000"
6904 + range 0x400000 0x40000000
6905 ---help---
6906 This gives the physical address where the kernel is loaded.
6907
6908 @@ -1581,6 +1583,7 @@ config PHYSICAL_ALIGN
6909 hex
6910 prompt "Alignment value to which kernel should be aligned" if X86_32
6911 default "0x1000000"
6912 + range 0x400000 0x1000000 if PAX_KERNEXEC
6913 range 0x2000 0x1000000
6914 ---help---
6915 This value puts the alignment restrictions on physical address
6916 @@ -1612,9 +1615,10 @@ config HOTPLUG_CPU
6917 Say N if you want to disable CPU hotplug.
6918
6919 config COMPAT_VDSO
6920 - def_bool y
6921 + def_bool n
6922 prompt "Compat VDSO support"
6923 depends on X86_32 || IA32_EMULATION
6924 + depends on !PAX_NOEXEC && !PAX_MEMORY_UDEREF
6925 ---help---
6926 Map the 32-bit VDSO to the predictable old-style address too.
6927 ---help---
6928 diff --git a/arch/x86/Kconfig.cpu b/arch/x86/Kconfig.cpu
6929 index 0e566103..1a6b57e 100644
6930 --- a/arch/x86/Kconfig.cpu
6931 +++ b/arch/x86/Kconfig.cpu
6932 @@ -340,7 +340,7 @@ config X86_PPRO_FENCE
6933
6934 config X86_F00F_BUG
6935 def_bool y
6936 - depends on M586MMX || M586TSC || M586 || M486 || M386
6937 + depends on (M586MMX || M586TSC || M586 || M486 || M386) && !PAX_KERNEXEC
6938
6939 config X86_WP_WORKS_OK
6940 def_bool y
6941 @@ -360,7 +360,7 @@ config X86_POPAD_OK
6942
6943 config X86_ALIGNMENT_16
6944 def_bool y
6945 - depends on MWINCHIP3D || MWINCHIPC6 || MCYRIXIII || X86_ELAN || MK6 || M586MMX || M586TSC || M586 || M486 || MVIAC3_2 || MGEODEGX1
6946 + depends on MWINCHIP3D || MWINCHIPC6 || MCYRIXIII || X86_ELAN || MK8 || MK7 || MK6 || MCORE2 || MPENTIUM4 || MPENTIUMIII || MPENTIUMII || M686 || M586MMX || M586TSC || M586 || M486 || MVIAC3_2 || MGEODEGX1
6947
6948 config X86_INTEL_USERCOPY
6949 def_bool y
6950 @@ -406,7 +406,7 @@ config X86_CMPXCHG64
6951 # generates cmov.
6952 config X86_CMOV
6953 def_bool y
6954 - depends on (MK8 || MK7 || MCORE2 || MPENTIUM4 || MPENTIUMM || MPENTIUMIII || MPENTIUMII || M686 || MVIAC3_2 || MVIAC7 || MCRUSOE || MEFFICEON || X86_64 || MATOM)
6955 + depends on (MK8 || MK7 || MCORE2 || MPSC || MPENTIUM4 || MPENTIUMM || MPENTIUMIII || MPENTIUMII || M686 || MVIAC3_2 || MVIAC7 || MCRUSOE || MEFFICEON || X86_64 || MATOM)
6956
6957 config X86_MINIMUM_CPU_FAMILY
6958 int
6959 diff --git a/arch/x86/Kconfig.debug b/arch/x86/Kconfig.debug
6960 index d105f29..c928727 100644
6961 --- a/arch/x86/Kconfig.debug
6962 +++ b/arch/x86/Kconfig.debug
6963 @@ -99,7 +99,7 @@ config X86_PTDUMP
6964 config DEBUG_RODATA
6965 bool "Write protect kernel read-only data structures"
6966 default y
6967 - depends on DEBUG_KERNEL
6968 + depends on DEBUG_KERNEL && BROKEN
6969 ---help---
6970 Mark the kernel read-only data as write-protected in the pagetables,
6971 in order to catch accidental (and incorrect) writes to such const
6972 diff --git a/arch/x86/Makefile b/arch/x86/Makefile
6973 index d2d24c9..0f21f8d 100644
6974 --- a/arch/x86/Makefile
6975 +++ b/arch/x86/Makefile
6976 @@ -44,6 +44,7 @@ ifeq ($(CONFIG_X86_32),y)
6977 else
6978 BITS := 64
6979 UTS_MACHINE := x86_64
6980 + biarch := $(call cc-option,-m64)
6981 CHECKFLAGS += -D__x86_64__ -m64
6982
6983 KBUILD_AFLAGS += -m64
6984 @@ -189,3 +190,12 @@ define archhelp
6985 echo ' FDARGS="..." arguments for the booted kernel'
6986 echo ' FDINITRD=file initrd for the booted kernel'
6987 endef
6988 +
6989 +define OLD_LD
6990 +
6991 +*** ${VERSION}.${PATCHLEVEL} PaX kernels no longer build correctly with old versions of binutils.
6992 +*** Please upgrade your binutils to 2.18 or newer
6993 +endef
6994 +
6995 +archprepare:
6996 + $(if $(LDFLAGS_BUILD_ID),,$(error $(OLD_LD)))
6997 diff --git a/arch/x86/boot/Makefile b/arch/x86/boot/Makefile
6998 index ec749c2..bbb5319 100644
6999 --- a/arch/x86/boot/Makefile
7000 +++ b/arch/x86/boot/Makefile
7001 @@ -69,6 +69,9 @@ KBUILD_CFLAGS := $(LINUXINCLUDE) -g -Os -D_SETUP -D__KERNEL__ \
7002 $(call cc-option, -fno-stack-protector) \
7003 $(call cc-option, -mpreferred-stack-boundary=2)
7004 KBUILD_CFLAGS += $(call cc-option, -m32)
7005 +ifdef CONSTIFY_PLUGIN
7006 +KBUILD_CFLAGS += $(CONSTIFY_PLUGIN) -fplugin-arg-constify_plugin-no-constify
7007 +endif
7008 KBUILD_AFLAGS := $(KBUILD_CFLAGS) -D__ASSEMBLY__
7009 GCOV_PROFILE := n
7010
7011 diff --git a/arch/x86/boot/bitops.h b/arch/x86/boot/bitops.h
7012 index 878e4b9..20537ab 100644
7013 --- a/arch/x86/boot/bitops.h
7014 +++ b/arch/x86/boot/bitops.h
7015 @@ -26,7 +26,7 @@ static inline int variable_test_bit(int nr, const void *addr)
7016 u8 v;
7017 const u32 *p = (const u32 *)addr;
7018
7019 - asm("btl %2,%1; setc %0" : "=qm" (v) : "m" (*p), "Ir" (nr));
7020 + asm volatile("btl %2,%1; setc %0" : "=qm" (v) : "m" (*p), "Ir" (nr));
7021 return v;
7022 }
7023
7024 @@ -37,7 +37,7 @@ static inline int variable_test_bit(int nr, const void *addr)
7025
7026 static inline void set_bit(int nr, void *addr)
7027 {
7028 - asm("btsl %1,%0" : "+m" (*(u32 *)addr) : "Ir" (nr));
7029 + asm volatile("btsl %1,%0" : "+m" (*(u32 *)addr) : "Ir" (nr));
7030 }
7031
7032 #endif /* BOOT_BITOPS_H */
7033 diff --git a/arch/x86/boot/boot.h b/arch/x86/boot/boot.h
7034 index 98239d2..f40214c 100644
7035 --- a/arch/x86/boot/boot.h
7036 +++ b/arch/x86/boot/boot.h
7037 @@ -82,7 +82,7 @@ static inline void io_delay(void)
7038 static inline u16 ds(void)
7039 {
7040 u16 seg;
7041 - asm("movw %%ds,%0" : "=rm" (seg));
7042 + asm volatile("movw %%ds,%0" : "=rm" (seg));
7043 return seg;
7044 }
7045
7046 @@ -178,7 +178,7 @@ static inline void wrgs32(u32 v, addr_t addr)
7047 static inline int memcmp(const void *s1, const void *s2, size_t len)
7048 {
7049 u8 diff;
7050 - asm("repe; cmpsb; setnz %0"
7051 + asm volatile("repe; cmpsb; setnz %0"
7052 : "=qm" (diff), "+D" (s1), "+S" (s2), "+c" (len));
7053 return diff;
7054 }
7055 diff --git a/arch/x86/boot/compressed/Makefile b/arch/x86/boot/compressed/Makefile
7056 index f8ed065..5bf5ff3 100644
7057 --- a/arch/x86/boot/compressed/Makefile
7058 +++ b/arch/x86/boot/compressed/Makefile
7059 @@ -13,6 +13,9 @@ cflags-$(CONFIG_X86_64) := -mcmodel=small
7060 KBUILD_CFLAGS += $(cflags-y)
7061 KBUILD_CFLAGS += $(call cc-option,-ffreestanding)
7062 KBUILD_CFLAGS += $(call cc-option,-fno-stack-protector)
7063 +ifdef CONSTIFY_PLUGIN
7064 +KBUILD_CFLAGS += $(CONSTIFY_PLUGIN) -fplugin-arg-constify_plugin-no-constify
7065 +endif
7066
7067 KBUILD_AFLAGS := $(KBUILD_CFLAGS) -D__ASSEMBLY__
7068 GCOV_PROFILE := n
7069 diff --git a/arch/x86/boot/compressed/head_32.S b/arch/x86/boot/compressed/head_32.S
7070 index f543b70..b60fba8 100644
7071 --- a/arch/x86/boot/compressed/head_32.S
7072 +++ b/arch/x86/boot/compressed/head_32.S
7073 @@ -76,7 +76,7 @@ ENTRY(startup_32)
7074 notl %eax
7075 andl %eax, %ebx
7076 #else
7077 - movl $LOAD_PHYSICAL_ADDR, %ebx
7078 + movl $____LOAD_PHYSICAL_ADDR, %ebx
7079 #endif
7080
7081 /* Target address to relocate to for decompression */
7082 @@ -149,7 +149,7 @@ relocated:
7083 * and where it was actually loaded.
7084 */
7085 movl %ebp, %ebx
7086 - subl $LOAD_PHYSICAL_ADDR, %ebx
7087 + subl $____LOAD_PHYSICAL_ADDR, %ebx
7088 jz 2f /* Nothing to be done if loaded at compiled addr. */
7089 /*
7090 * Process relocations.
7091 @@ -157,8 +157,7 @@ relocated:
7092
7093 1: subl $4, %edi
7094 movl (%edi), %ecx
7095 - testl %ecx, %ecx
7096 - jz 2f
7097 + jecxz 2f
7098 addl %ebx, -__PAGE_OFFSET(%ebx, %ecx)
7099 jmp 1b
7100 2:
7101 diff --git a/arch/x86/boot/compressed/head_64.S b/arch/x86/boot/compressed/head_64.S
7102 index 077e1b6..2c6b13b 100644
7103 --- a/arch/x86/boot/compressed/head_64.S
7104 +++ b/arch/x86/boot/compressed/head_64.S
7105 @@ -91,7 +91,7 @@ ENTRY(startup_32)
7106 notl %eax
7107 andl %eax, %ebx
7108 #else
7109 - movl $LOAD_PHYSICAL_ADDR, %ebx
7110 + movl $____LOAD_PHYSICAL_ADDR, %ebx
7111 #endif
7112
7113 /* Target address to relocate to for decompression */
7114 @@ -183,7 +183,7 @@ no_longmode:
7115 hlt
7116 jmp 1b
7117
7118 -#include "../../kernel/verify_cpu_64.S"
7119 +#include "../../kernel/verify_cpu.S"
7120
7121 /*
7122 * Be careful here startup_64 needs to be at a predictable
7123 @@ -234,7 +234,7 @@ ENTRY(startup_64)
7124 notq %rax
7125 andq %rax, %rbp
7126 #else
7127 - movq $LOAD_PHYSICAL_ADDR, %rbp
7128 + movq $____LOAD_PHYSICAL_ADDR, %rbp
7129 #endif
7130
7131 /* Target address to relocate to for decompression */
7132 diff --git a/arch/x86/boot/compressed/misc.c b/arch/x86/boot/compressed/misc.c
7133 index 842b2a3..f00178b 100644
7134 --- a/arch/x86/boot/compressed/misc.c
7135 +++ b/arch/x86/boot/compressed/misc.c
7136 @@ -288,7 +288,7 @@ static void parse_elf(void *output)
7137 case PT_LOAD:
7138 #ifdef CONFIG_RELOCATABLE
7139 dest = output;
7140 - dest += (phdr->p_paddr - LOAD_PHYSICAL_ADDR);
7141 + dest += (phdr->p_paddr - ____LOAD_PHYSICAL_ADDR);
7142 #else
7143 dest = (void *)(phdr->p_paddr);
7144 #endif
7145 @@ -335,7 +335,7 @@ asmlinkage void decompress_kernel(void *rmode, memptr heap,
7146 error("Destination address too large");
7147 #endif
7148 #ifndef CONFIG_RELOCATABLE
7149 - if ((unsigned long)output != LOAD_PHYSICAL_ADDR)
7150 + if ((unsigned long)output != ____LOAD_PHYSICAL_ADDR)
7151 error("Wrong destination address");
7152 #endif
7153
7154 diff --git a/arch/x86/boot/compressed/mkpiggy.c b/arch/x86/boot/compressed/mkpiggy.c
7155 index bcbd36c..b1754af 100644
7156 --- a/arch/x86/boot/compressed/mkpiggy.c
7157 +++ b/arch/x86/boot/compressed/mkpiggy.c
7158 @@ -74,7 +74,7 @@ int main(int argc, char *argv[])
7159
7160 offs = (olen > ilen) ? olen - ilen : 0;
7161 offs += olen >> 12; /* Add 8 bytes for each 32K block */
7162 - offs += 32*1024 + 18; /* Add 32K + 18 bytes slack */
7163 + offs += 64*1024; /* Add 64K bytes slack */
7164 offs = (offs+4095) & ~4095; /* Round to a 4K boundary */
7165
7166 printf(".section \".rodata.compressed\",\"a\",@progbits\n");
7167 diff --git a/arch/x86/boot/compressed/relocs.c b/arch/x86/boot/compressed/relocs.c
7168 index bbeb0c3..f5167ab 100644
7169 --- a/arch/x86/boot/compressed/relocs.c
7170 +++ b/arch/x86/boot/compressed/relocs.c
7171 @@ -10,8 +10,11 @@
7172 #define USE_BSD
7173 #include <endian.h>
7174
7175 +#include "../../../../include/linux/autoconf.h"
7176 +
7177 #define ARRAY_SIZE(x) (sizeof(x) / sizeof((x)[0]))
7178 static Elf32_Ehdr ehdr;
7179 +static Elf32_Phdr *phdr;
7180 static unsigned long reloc_count, reloc_idx;
7181 static unsigned long *relocs;
7182
7183 @@ -37,7 +40,7 @@ static const char* safe_abs_relocs[] = {
7184
7185 static int is_safe_abs_reloc(const char* sym_name)
7186 {
7187 - int i;
7188 + unsigned int i;
7189
7190 for (i = 0; i < ARRAY_SIZE(safe_abs_relocs); i++) {
7191 if (!strcmp(sym_name, safe_abs_relocs[i]))
7192 @@ -245,9 +248,39 @@ static void read_ehdr(FILE *fp)
7193 }
7194 }
7195
7196 +static void read_phdrs(FILE *fp)
7197 +{
7198 + unsigned int i;
7199 +
7200 + phdr = calloc(ehdr.e_phnum, sizeof(Elf32_Phdr));
7201 + if (!phdr) {
7202 + die("Unable to allocate %d program headers\n",
7203 + ehdr.e_phnum);
7204 + }
7205 + if (fseek(fp, ehdr.e_phoff, SEEK_SET) < 0) {
7206 + die("Seek to %d failed: %s\n",
7207 + ehdr.e_phoff, strerror(errno));
7208 + }
7209 + if (fread(phdr, sizeof(*phdr), ehdr.e_phnum, fp) != ehdr.e_phnum) {
7210 + die("Cannot read ELF program headers: %s\n",
7211 + strerror(errno));
7212 + }
7213 + for(i = 0; i < ehdr.e_phnum; i++) {
7214 + phdr[i].p_type = elf32_to_cpu(phdr[i].p_type);
7215 + phdr[i].p_offset = elf32_to_cpu(phdr[i].p_offset);
7216 + phdr[i].p_vaddr = elf32_to_cpu(phdr[i].p_vaddr);
7217 + phdr[i].p_paddr = elf32_to_cpu(phdr[i].p_paddr);
7218 + phdr[i].p_filesz = elf32_to_cpu(phdr[i].p_filesz);
7219 + phdr[i].p_memsz = elf32_to_cpu(phdr[i].p_memsz);
7220 + phdr[i].p_flags = elf32_to_cpu(phdr[i].p_flags);
7221 + phdr[i].p_align = elf32_to_cpu(phdr[i].p_align);
7222 + }
7223 +
7224 +}
7225 +
7226 static void read_shdrs(FILE *fp)
7227 {
7228 - int i;
7229 + unsigned int i;
7230 Elf32_Shdr shdr;
7231
7232 secs = calloc(ehdr.e_shnum, sizeof(struct section));
7233 @@ -282,7 +315,7 @@ static void read_shdrs(FILE *fp)
7234
7235 static void read_strtabs(FILE *fp)
7236 {
7237 - int i;
7238 + unsigned int i;
7239 for (i = 0; i < ehdr.e_shnum; i++) {
7240 struct section *sec = &secs[i];
7241 if (sec->shdr.sh_type != SHT_STRTAB) {
7242 @@ -307,7 +340,7 @@ static void read_strtabs(FILE *fp)
7243
7244 static void read_symtabs(FILE *fp)
7245 {
7246 - int i,j;
7247 + unsigned int i,j;
7248 for (i = 0; i < ehdr.e_shnum; i++) {
7249 struct section *sec = &secs[i];
7250 if (sec->shdr.sh_type != SHT_SYMTAB) {
7251 @@ -340,7 +373,9 @@ static void read_symtabs(FILE *fp)
7252
7253 static void read_relocs(FILE *fp)
7254 {
7255 - int i,j;
7256 + unsigned int i,j;
7257 + uint32_t base;
7258 +
7259 for (i = 0; i < ehdr.e_shnum; i++) {
7260 struct section *sec = &secs[i];
7261 if (sec->shdr.sh_type != SHT_REL) {
7262 @@ -360,9 +395,18 @@ static void read_relocs(FILE *fp)
7263 die("Cannot read symbol table: %s\n",
7264 strerror(errno));
7265 }
7266 + base = 0;
7267 + for (j = 0; j < ehdr.e_phnum; j++) {
7268 + if (phdr[j].p_type != PT_LOAD )
7269 + continue;
7270 + 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)
7271 + continue;
7272 + base = CONFIG_PAGE_OFFSET + phdr[j].p_paddr - phdr[j].p_vaddr;
7273 + break;
7274 + }
7275 for (j = 0; j < sec->shdr.sh_size/sizeof(Elf32_Rel); j++) {
7276 Elf32_Rel *rel = &sec->reltab[j];
7277 - rel->r_offset = elf32_to_cpu(rel->r_offset);
7278 + rel->r_offset = elf32_to_cpu(rel->r_offset) + base;
7279 rel->r_info = elf32_to_cpu(rel->r_info);
7280 }
7281 }
7282 @@ -371,14 +415,14 @@ static void read_relocs(FILE *fp)
7283
7284 static void print_absolute_symbols(void)
7285 {
7286 - int i;
7287 + unsigned int i;
7288 printf("Absolute symbols\n");
7289 printf(" Num: Value Size Type Bind Visibility Name\n");
7290 for (i = 0; i < ehdr.e_shnum; i++) {
7291 struct section *sec = &secs[i];
7292 char *sym_strtab;
7293 Elf32_Sym *sh_symtab;
7294 - int j;
7295 + unsigned int j;
7296
7297 if (sec->shdr.sh_type != SHT_SYMTAB) {
7298 continue;
7299 @@ -406,14 +450,14 @@ static void print_absolute_symbols(void)
7300
7301 static void print_absolute_relocs(void)
7302 {
7303 - int i, printed = 0;
7304 + unsigned int i, printed = 0;
7305
7306 for (i = 0; i < ehdr.e_shnum; i++) {
7307 struct section *sec = &secs[i];
7308 struct section *sec_applies, *sec_symtab;
7309 char *sym_strtab;
7310 Elf32_Sym *sh_symtab;
7311 - int j;
7312 + unsigned int j;
7313 if (sec->shdr.sh_type != SHT_REL) {
7314 continue;
7315 }
7316 @@ -474,13 +518,13 @@ static void print_absolute_relocs(void)
7317
7318 static void walk_relocs(void (*visit)(Elf32_Rel *rel, Elf32_Sym *sym))
7319 {
7320 - int i;
7321 + unsigned int i;
7322 /* Walk through the relocations */
7323 for (i = 0; i < ehdr.e_shnum; i++) {
7324 char *sym_strtab;
7325 Elf32_Sym *sh_symtab;
7326 struct section *sec_applies, *sec_symtab;
7327 - int j;
7328 + unsigned int j;
7329 struct section *sec = &secs[i];
7330
7331 if (sec->shdr.sh_type != SHT_REL) {
7332 @@ -504,6 +548,21 @@ static void walk_relocs(void (*visit)(Elf32_Rel *rel, Elf32_Sym *sym))
7333 if (sym->st_shndx == SHN_ABS) {
7334 continue;
7335 }
7336 + /* Don't relocate actual per-cpu variables, they are absolute indices, not addresses */
7337 + if (!strcmp(sec_name(sym->st_shndx), ".data.percpu") && strcmp(sym_name(sym_strtab, sym), "__per_cpu_load"))
7338 + continue;
7339 +
7340 +#if defined(CONFIG_PAX_KERNEXEC) && defined(CONFIG_X86_32)
7341 + /* Don't relocate actual code, they are relocated implicitly by the base address of KERNEL_CS */
7342 + if (!strcmp(sec_name(sym->st_shndx), ".module.text") && !strcmp(sym_name(sym_strtab, sym), "_etext"))
7343 + continue;
7344 + if (!strcmp(sec_name(sym->st_shndx), ".init.text"))
7345 + continue;
7346 + if (!strcmp(sec_name(sym->st_shndx), ".exit.text"))
7347 + continue;
7348 + if (!strcmp(sec_name(sym->st_shndx), ".text") && strcmp(sym_name(sym_strtab, sym), "__LOAD_PHYSICAL_ADDR"))
7349 + continue;
7350 +#endif
7351 if (r_type == R_386_NONE || r_type == R_386_PC32) {
7352 /*
7353 * NONE can be ignored and and PC relative
7354 @@ -541,7 +600,7 @@ static int cmp_relocs(const void *va, const void *vb)
7355
7356 static void emit_relocs(int as_text)
7357 {
7358 - int i;
7359 + unsigned int i;
7360 /* Count how many relocations I have and allocate space for them. */
7361 reloc_count = 0;
7362 walk_relocs(count_reloc);
7363 @@ -634,6 +693,7 @@ int main(int argc, char **argv)
7364 fname, strerror(errno));
7365 }
7366 read_ehdr(fp);
7367 + read_phdrs(fp);
7368 read_shdrs(fp);
7369 read_strtabs(fp);
7370 read_symtabs(fp);
7371 diff --git a/arch/x86/boot/cpucheck.c b/arch/x86/boot/cpucheck.c
7372 index 4d3ff03..e4972ff 100644
7373 --- a/arch/x86/boot/cpucheck.c
7374 +++ b/arch/x86/boot/cpucheck.c
7375 @@ -74,7 +74,7 @@ static int has_fpu(void)
7376 u16 fcw = -1, fsw = -1;
7377 u32 cr0;
7378
7379 - asm("movl %%cr0,%0" : "=r" (cr0));
7380 + asm volatile("movl %%cr0,%0" : "=r" (cr0));
7381 if (cr0 & (X86_CR0_EM|X86_CR0_TS)) {
7382 cr0 &= ~(X86_CR0_EM|X86_CR0_TS);
7383 asm volatile("movl %0,%%cr0" : : "r" (cr0));
7384 @@ -90,7 +90,7 @@ static int has_eflag(u32 mask)
7385 {
7386 u32 f0, f1;
7387
7388 - asm("pushfl ; "
7389 + asm volatile("pushfl ; "
7390 "pushfl ; "
7391 "popl %0 ; "
7392 "movl %0,%1 ; "
7393 @@ -115,7 +115,7 @@ static void get_flags(void)
7394 set_bit(X86_FEATURE_FPU, cpu.flags);
7395
7396 if (has_eflag(X86_EFLAGS_ID)) {
7397 - asm("cpuid"
7398 + asm volatile("cpuid"
7399 : "=a" (max_intel_level),
7400 "=b" (cpu_vendor[0]),
7401 "=d" (cpu_vendor[1]),
7402 @@ -124,7 +124,7 @@ static void get_flags(void)
7403
7404 if (max_intel_level >= 0x00000001 &&
7405 max_intel_level <= 0x0000ffff) {
7406 - asm("cpuid"
7407 + asm volatile("cpuid"
7408 : "=a" (tfms),
7409 "=c" (cpu.flags[4]),
7410 "=d" (cpu.flags[0])
7411 @@ -136,7 +136,7 @@ static void get_flags(void)
7412 cpu.model += ((tfms >> 16) & 0xf) << 4;
7413 }
7414
7415 - asm("cpuid"
7416 + asm volatile("cpuid"
7417 : "=a" (max_amd_level)
7418 : "a" (0x80000000)
7419 : "ebx", "ecx", "edx");
7420 @@ -144,7 +144,7 @@ static void get_flags(void)
7421 if (max_amd_level >= 0x80000001 &&
7422 max_amd_level <= 0x8000ffff) {
7423 u32 eax = 0x80000001;
7424 - asm("cpuid"
7425 + asm volatile("cpuid"
7426 : "+a" (eax),
7427 "=c" (cpu.flags[6]),
7428 "=d" (cpu.flags[1])
7429 @@ -203,9 +203,9 @@ int check_cpu(int *cpu_level_ptr, int *req_level_ptr, u32 **err_flags_ptr)
7430 u32 ecx = MSR_K7_HWCR;
7431 u32 eax, edx;
7432
7433 - asm("rdmsr" : "=a" (eax), "=d" (edx) : "c" (ecx));
7434 + asm volatile("rdmsr" : "=a" (eax), "=d" (edx) : "c" (ecx));
7435 eax &= ~(1 << 15);
7436 - asm("wrmsr" : : "a" (eax), "d" (edx), "c" (ecx));
7437 + asm volatile("wrmsr" : : "a" (eax), "d" (edx), "c" (ecx));
7438
7439 get_flags(); /* Make sure it really did something */
7440 err = check_flags();
7441 @@ -218,9 +218,9 @@ int check_cpu(int *cpu_level_ptr, int *req_level_ptr, u32 **err_flags_ptr)
7442 u32 ecx = MSR_VIA_FCR;
7443 u32 eax, edx;
7444
7445 - asm("rdmsr" : "=a" (eax), "=d" (edx) : "c" (ecx));
7446 + asm volatile("rdmsr" : "=a" (eax), "=d" (edx) : "c" (ecx));
7447 eax |= (1<<1)|(1<<7);
7448 - asm("wrmsr" : : "a" (eax), "d" (edx), "c" (ecx));
7449 + asm volatile("wrmsr" : : "a" (eax), "d" (edx), "c" (ecx));
7450
7451 set_bit(X86_FEATURE_CX8, cpu.flags);
7452 err = check_flags();
7453 @@ -231,12 +231,12 @@ int check_cpu(int *cpu_level_ptr, int *req_level_ptr, u32 **err_flags_ptr)
7454 u32 eax, edx;
7455 u32 level = 1;
7456
7457 - asm("rdmsr" : "=a" (eax), "=d" (edx) : "c" (ecx));
7458 - asm("wrmsr" : : "a" (~0), "d" (edx), "c" (ecx));
7459 - asm("cpuid"
7460 + asm volatile("rdmsr" : "=a" (eax), "=d" (edx) : "c" (ecx));
7461 + asm volatile("wrmsr" : : "a" (~0), "d" (edx), "c" (ecx));
7462 + asm volatile("cpuid"
7463 : "+a" (level), "=d" (cpu.flags[0])
7464 : : "ecx", "ebx");
7465 - asm("wrmsr" : : "a" (eax), "d" (edx), "c" (ecx));
7466 + asm volatile("wrmsr" : : "a" (eax), "d" (edx), "c" (ecx));
7467
7468 err = check_flags();
7469 }
7470 diff --git a/arch/x86/boot/header.S b/arch/x86/boot/header.S
7471 index b31cc54..8d69237 100644
7472 --- a/arch/x86/boot/header.S
7473 +++ b/arch/x86/boot/header.S
7474 @@ -224,7 +224,7 @@ setup_data: .quad 0 # 64-bit physical pointer to
7475 # single linked list of
7476 # struct setup_data
7477
7478 -pref_address: .quad LOAD_PHYSICAL_ADDR # preferred load addr
7479 +pref_address: .quad ____LOAD_PHYSICAL_ADDR # preferred load addr
7480
7481 #define ZO_INIT_SIZE (ZO__end - ZO_startup_32 + ZO_z_extract_offset)
7482 #define VO_INIT_SIZE (VO__end - VO__text)
7483 diff --git a/arch/x86/boot/memory.c b/arch/x86/boot/memory.c
7484 index cae3feb..ff8ff2a 100644
7485 --- a/arch/x86/boot/memory.c
7486 +++ b/arch/x86/boot/memory.c
7487 @@ -19,7 +19,7 @@
7488
7489 static int detect_memory_e820(void)
7490 {
7491 - int count = 0;
7492 + unsigned int count = 0;
7493 struct biosregs ireg, oreg;
7494 struct e820entry *desc = boot_params.e820_map;
7495 static struct e820entry buf; /* static so it is zeroed */
7496 diff --git a/arch/x86/boot/video-vesa.c b/arch/x86/boot/video-vesa.c
7497 index 11e8c6e..fdbb1ed 100644
7498 --- a/arch/x86/boot/video-vesa.c
7499 +++ b/arch/x86/boot/video-vesa.c
7500 @@ -200,6 +200,7 @@ static void vesa_store_pm_info(void)
7501
7502 boot_params.screen_info.vesapm_seg = oreg.es;
7503 boot_params.screen_info.vesapm_off = oreg.di;
7504 + boot_params.screen_info.vesapm_size = oreg.cx;
7505 }
7506
7507 /*
7508 diff --git a/arch/x86/boot/video.c b/arch/x86/boot/video.c
7509 index d42da38..787cdf3 100644
7510 --- a/arch/x86/boot/video.c
7511 +++ b/arch/x86/boot/video.c
7512 @@ -90,7 +90,7 @@ static void store_mode_params(void)
7513 static unsigned int get_entry(void)
7514 {
7515 char entry_buf[4];
7516 - int i, len = 0;
7517 + unsigned int i, len = 0;
7518 int key;
7519 unsigned int v;
7520
7521 diff --git a/arch/x86/crypto/aes-x86_64-asm_64.S b/arch/x86/crypto/aes-x86_64-asm_64.S
7522 index 5b577d5..3c1fed4 100644
7523 --- a/arch/x86/crypto/aes-x86_64-asm_64.S
7524 +++ b/arch/x86/crypto/aes-x86_64-asm_64.S
7525 @@ -8,6 +8,8 @@
7526 * including this sentence is retained in full.
7527 */
7528
7529 +#include <asm/alternative-asm.h>
7530 +
7531 .extern crypto_ft_tab
7532 .extern crypto_it_tab
7533 .extern crypto_fl_tab
7534 @@ -71,6 +73,8 @@ FUNC: movq r1,r2; \
7535 je B192; \
7536 leaq 32(r9),r9;
7537
7538 +#define ret pax_force_retaddr 0, 1; ret
7539 +
7540 #define epilogue(r1,r2,r3,r4,r5,r6,r7,r8,r9) \
7541 movq r1,r2; \
7542 movq r3,r4; \
7543 diff --git a/arch/x86/crypto/aesni-intel_asm.S b/arch/x86/crypto/aesni-intel_asm.S
7544 index eb0566e..e3ebad8 100644
7545 --- a/arch/x86/crypto/aesni-intel_asm.S
7546 +++ b/arch/x86/crypto/aesni-intel_asm.S
7547 @@ -16,6 +16,7 @@
7548 */
7549
7550 #include <linux/linkage.h>
7551 +#include <asm/alternative-asm.h>
7552
7553 .text
7554
7555 @@ -52,6 +53,7 @@ _key_expansion_256a:
7556 pxor %xmm1, %xmm0
7557 movaps %xmm0, (%rcx)
7558 add $0x10, %rcx
7559 + pax_force_retaddr_bts
7560 ret
7561
7562 _key_expansion_192a:
7563 @@ -75,6 +77,7 @@ _key_expansion_192a:
7564 shufps $0b01001110, %xmm2, %xmm1
7565 movaps %xmm1, 16(%rcx)
7566 add $0x20, %rcx
7567 + pax_force_retaddr_bts
7568 ret
7569
7570 _key_expansion_192b:
7571 @@ -93,6 +96,7 @@ _key_expansion_192b:
7572
7573 movaps %xmm0, (%rcx)
7574 add $0x10, %rcx
7575 + pax_force_retaddr_bts
7576 ret
7577
7578 _key_expansion_256b:
7579 @@ -104,6 +108,7 @@ _key_expansion_256b:
7580 pxor %xmm1, %xmm2
7581 movaps %xmm2, (%rcx)
7582 add $0x10, %rcx
7583 + pax_force_retaddr_bts
7584 ret
7585
7586 /*
7587 @@ -239,7 +244,9 @@ ENTRY(aesni_set_key)
7588 cmp %rcx, %rdi
7589 jb .Ldec_key_loop
7590 xor %rax, %rax
7591 + pax_force_retaddr 0, 1
7592 ret
7593 +ENDPROC(aesni_set_key)
7594
7595 /*
7596 * void aesni_enc(struct crypto_aes_ctx *ctx, u8 *dst, const u8 *src)
7597 @@ -249,7 +256,9 @@ ENTRY(aesni_enc)
7598 movups (INP), STATE # input
7599 call _aesni_enc1
7600 movups STATE, (OUTP) # output
7601 + pax_force_retaddr 0, 1
7602 ret
7603 +ENDPROC(aesni_enc)
7604
7605 /*
7606 * _aesni_enc1: internal ABI
7607 @@ -319,6 +328,7 @@ _aesni_enc1:
7608 movaps 0x70(TKEYP), KEY
7609 # aesenclast KEY, STATE # last round
7610 .byte 0x66, 0x0f, 0x38, 0xdd, 0xc2
7611 + pax_force_retaddr_bts
7612 ret
7613
7614 /*
7615 @@ -482,6 +492,7 @@ _aesni_enc4:
7616 .byte 0x66, 0x0f, 0x38, 0xdd, 0xea
7617 # aesenclast KEY, STATE4
7618 .byte 0x66, 0x0f, 0x38, 0xdd, 0xf2
7619 + pax_force_retaddr_bts
7620 ret
7621
7622 /*
7623 @@ -493,7 +504,9 @@ ENTRY(aesni_dec)
7624 movups (INP), STATE # input
7625 call _aesni_dec1
7626 movups STATE, (OUTP) #output
7627 + pax_force_retaddr 0, 1
7628 ret
7629 +ENDPROC(aesni_dec)
7630
7631 /*
7632 * _aesni_dec1: internal ABI
7633 @@ -563,6 +576,7 @@ _aesni_dec1:
7634 movaps 0x70(TKEYP), KEY
7635 # aesdeclast KEY, STATE # last round
7636 .byte 0x66, 0x0f, 0x38, 0xdf, 0xc2
7637 + pax_force_retaddr_bts
7638 ret
7639
7640 /*
7641 @@ -726,6 +740,7 @@ _aesni_dec4:
7642 .byte 0x66, 0x0f, 0x38, 0xdf, 0xea
7643 # aesdeclast KEY, STATE4
7644 .byte 0x66, 0x0f, 0x38, 0xdf, 0xf2
7645 + pax_force_retaddr_bts
7646 ret
7647
7648 /*
7649 @@ -769,7 +784,9 @@ ENTRY(aesni_ecb_enc)
7650 cmp $16, LEN
7651 jge .Lecb_enc_loop1
7652 .Lecb_enc_ret:
7653 + pax_force_retaddr 0, 1
7654 ret
7655 +ENDPROC(aesni_ecb_enc)
7656
7657 /*
7658 * void aesni_ecb_dec(struct crypto_aes_ctx *ctx, const u8 *dst, u8 *src,
7659 @@ -813,7 +830,9 @@ ENTRY(aesni_ecb_dec)
7660 cmp $16, LEN
7661 jge .Lecb_dec_loop1
7662 .Lecb_dec_ret:
7663 + pax_force_retaddr 0, 1
7664 ret
7665 +ENDPROC(aesni_ecb_dec)
7666
7667 /*
7668 * void aesni_cbc_enc(struct crypto_aes_ctx *ctx, const u8 *dst, u8 *src,
7669 @@ -837,7 +856,9 @@ ENTRY(aesni_cbc_enc)
7670 jge .Lcbc_enc_loop
7671 movups STATE, (IVP)
7672 .Lcbc_enc_ret:
7673 + pax_force_retaddr 0, 1
7674 ret
7675 +ENDPROC(aesni_cbc_enc)
7676
7677 /*
7678 * void aesni_cbc_dec(struct crypto_aes_ctx *ctx, const u8 *dst, u8 *src,
7679 @@ -894,4 +915,6 @@ ENTRY(aesni_cbc_dec)
7680 .Lcbc_dec_ret:
7681 movups IV, (IVP)
7682 .Lcbc_dec_just_ret:
7683 + pax_force_retaddr 0, 1
7684 ret
7685 +ENDPROC(aesni_cbc_dec)
7686 diff --git a/arch/x86/crypto/salsa20-x86_64-asm_64.S b/arch/x86/crypto/salsa20-x86_64-asm_64.S
7687 index 6214a9b..1f4fc9a 100644
7688 --- a/arch/x86/crypto/salsa20-x86_64-asm_64.S
7689 +++ b/arch/x86/crypto/salsa20-x86_64-asm_64.S
7690 @@ -1,3 +1,5 @@
7691 +#include <asm/alternative-asm.h>
7692 +
7693 # enter ECRYPT_encrypt_bytes
7694 .text
7695 .p2align 5
7696 @@ -790,6 +792,7 @@ ECRYPT_encrypt_bytes:
7697 add %r11,%rsp
7698 mov %rdi,%rax
7699 mov %rsi,%rdx
7700 + pax_force_retaddr 0, 1
7701 ret
7702 # bytesatleast65:
7703 ._bytesatleast65:
7704 @@ -891,6 +894,7 @@ ECRYPT_keysetup:
7705 add %r11,%rsp
7706 mov %rdi,%rax
7707 mov %rsi,%rdx
7708 + pax_force_retaddr
7709 ret
7710 # enter ECRYPT_ivsetup
7711 .text
7712 @@ -917,4 +921,5 @@ ECRYPT_ivsetup:
7713 add %r11,%rsp
7714 mov %rdi,%rax
7715 mov %rsi,%rdx
7716 + pax_force_retaddr
7717 ret
7718 diff --git a/arch/x86/crypto/twofish-x86_64-asm_64.S b/arch/x86/crypto/twofish-x86_64-asm_64.S
7719 index 35974a5..5662ae2 100644
7720 --- a/arch/x86/crypto/twofish-x86_64-asm_64.S
7721 +++ b/arch/x86/crypto/twofish-x86_64-asm_64.S
7722 @@ -21,6 +21,7 @@
7723 .text
7724
7725 #include <asm/asm-offsets.h>
7726 +#include <asm/alternative-asm.h>
7727
7728 #define a_offset 0
7729 #define b_offset 4
7730 @@ -269,6 +270,7 @@ twofish_enc_blk:
7731
7732 popq R1
7733 movq $1,%rax
7734 + pax_force_retaddr 0, 1
7735 ret
7736
7737 twofish_dec_blk:
7738 @@ -321,4 +323,5 @@ twofish_dec_blk:
7739
7740 popq R1
7741 movq $1,%rax
7742 + pax_force_retaddr 0, 1
7743 ret
7744 diff --git a/arch/x86/ia32/ia32_aout.c b/arch/x86/ia32/ia32_aout.c
7745 index 14531ab..a89a0c0 100644
7746 --- a/arch/x86/ia32/ia32_aout.c
7747 +++ b/arch/x86/ia32/ia32_aout.c
7748 @@ -169,6 +169,8 @@ static int aout_core_dump(long signr, struct pt_regs *regs, struct file *file,
7749 unsigned long dump_start, dump_size;
7750 struct user32 dump;
7751
7752 + memset(&dump, 0, sizeof(dump));
7753 +
7754 fs = get_fs();
7755 set_fs(KERNEL_DS);
7756 has_dumped = 1;
7757 @@ -218,12 +220,6 @@ static int aout_core_dump(long signr, struct pt_regs *regs, struct file *file,
7758 dump_size = dump.u_ssize << PAGE_SHIFT;
7759 DUMP_WRITE(dump_start, dump_size);
7760 }
7761 - /*
7762 - * Finally dump the task struct. Not be used by gdb, but
7763 - * could be useful
7764 - */
7765 - set_fs(KERNEL_DS);
7766 - DUMP_WRITE(current, sizeof(*current));
7767 end_coredump:
7768 set_fs(fs);
7769 return has_dumped;
7770 diff --git a/arch/x86/ia32/ia32_signal.c b/arch/x86/ia32/ia32_signal.c
7771 index 588a7aa..a3468b0 100644
7772 --- a/arch/x86/ia32/ia32_signal.c
7773 +++ b/arch/x86/ia32/ia32_signal.c
7774 @@ -167,7 +167,7 @@ asmlinkage long sys32_sigaltstack(const stack_ia32_t __user *uss_ptr,
7775 }
7776 seg = get_fs();
7777 set_fs(KERNEL_DS);
7778 - ret = do_sigaltstack(uss_ptr ? &uss : NULL, &uoss, regs->sp);
7779 + ret = do_sigaltstack(uss_ptr ? (const stack_t __force_user *)&uss : NULL, (stack_t __force_user *)&uoss, regs->sp);
7780 set_fs(seg);
7781 if (ret >= 0 && uoss_ptr) {
7782 if (!access_ok(VERIFY_WRITE, uoss_ptr, sizeof(stack_ia32_t)))
7783 @@ -374,7 +374,7 @@ static int ia32_setup_sigcontext(struct sigcontext_ia32 __user *sc,
7784 */
7785 static void __user *get_sigframe(struct k_sigaction *ka, struct pt_regs *regs,
7786 size_t frame_size,
7787 - void **fpstate)
7788 + void __user **fpstate)
7789 {
7790 unsigned long sp;
7791
7792 @@ -395,7 +395,7 @@ static void __user *get_sigframe(struct k_sigaction *ka, struct pt_regs *regs,
7793
7794 if (used_math()) {
7795 sp = sp - sig_xstate_ia32_size;
7796 - *fpstate = (struct _fpstate_ia32 *) sp;
7797 + *fpstate = (struct _fpstate_ia32 __user *) sp;
7798 if (save_i387_xstate_ia32(*fpstate) < 0)
7799 return (void __user *) -1L;
7800 }
7801 @@ -403,7 +403,7 @@ static void __user *get_sigframe(struct k_sigaction *ka, struct pt_regs *regs,
7802 sp -= frame_size;
7803 /* Align the stack pointer according to the i386 ABI,
7804 * i.e. so that on function entry ((sp + 4) & 15) == 0. */
7805 - sp = ((sp + 4) & -16ul) - 4;
7806 + sp = ((sp - 12) & -16ul) - 4;
7807 return (void __user *) sp;
7808 }
7809
7810 @@ -461,7 +461,7 @@ int ia32_setup_frame(int sig, struct k_sigaction *ka,
7811 * These are actually not used anymore, but left because some
7812 * gdb versions depend on them as a marker.
7813 */
7814 - put_user_ex(*((u64 *)&code), (u64 *)frame->retcode);
7815 + put_user_ex(*((const u64 *)&code), (u64 __user *)frame->retcode);
7816 } put_user_catch(err);
7817
7818 if (err)
7819 @@ -503,7 +503,7 @@ int ia32_setup_rt_frame(int sig, struct k_sigaction *ka, siginfo_t *info,
7820 0xb8,
7821 __NR_ia32_rt_sigreturn,
7822 0x80cd,
7823 - 0,
7824 + 0
7825 };
7826
7827 frame = get_sigframe(ka, regs, sizeof(*frame), &fpstate);
7828 @@ -533,16 +533,18 @@ int ia32_setup_rt_frame(int sig, struct k_sigaction *ka, siginfo_t *info,
7829
7830 if (ka->sa.sa_flags & SA_RESTORER)
7831 restorer = ka->sa.sa_restorer;
7832 + else if (current->mm->context.vdso)
7833 + /* Return stub is in 32bit vsyscall page */
7834 + restorer = VDSO32_SYMBOL(current->mm->context.vdso, rt_sigreturn);
7835 else
7836 - restorer = VDSO32_SYMBOL(current->mm->context.vdso,
7837 - rt_sigreturn);
7838 + restorer = &frame->retcode;
7839 put_user_ex(ptr_to_compat(restorer), &frame->pretcode);
7840
7841 /*
7842 * Not actually used anymore, but left because some gdb
7843 * versions need it.
7844 */
7845 - put_user_ex(*((u64 *)&code), (u64 *)frame->retcode);
7846 + put_user_ex(*((const u64 *)&code), (u64 __user *)frame->retcode);
7847 } put_user_catch(err);
7848
7849 if (err)
7850 diff --git a/arch/x86/ia32/ia32entry.S b/arch/x86/ia32/ia32entry.S
7851 index 4edd8eb..29124b4 100644
7852 --- a/arch/x86/ia32/ia32entry.S
7853 +++ b/arch/x86/ia32/ia32entry.S
7854 @@ -13,7 +13,9 @@
7855 #include <asm/thread_info.h>
7856 #include <asm/segment.h>
7857 #include <asm/irqflags.h>
7858 +#include <asm/pgtable.h>
7859 #include <linux/linkage.h>
7860 +#include <asm/alternative-asm.h>
7861
7862 /* Avoid __ASSEMBLER__'ifying <linux/audit.h> just for this. */
7863 #include <linux/elf-em.h>
7864 @@ -93,6 +95,32 @@ ENTRY(native_irq_enable_sysexit)
7865 ENDPROC(native_irq_enable_sysexit)
7866 #endif
7867
7868 + .macro pax_enter_kernel_user
7869 + pax_set_fptr_mask
7870 +#ifdef CONFIG_PAX_MEMORY_UDEREF
7871 + call pax_enter_kernel_user
7872 +#endif
7873 + .endm
7874 +
7875 + .macro pax_exit_kernel_user
7876 +#ifdef CONFIG_PAX_MEMORY_UDEREF
7877 + call pax_exit_kernel_user
7878 +#endif
7879 +#ifdef CONFIG_PAX_RANDKSTACK
7880 + pushq %rax
7881 + pushq %r11
7882 + call pax_randomize_kstack
7883 + popq %r11
7884 + popq %rax
7885 +#endif
7886 + .endm
7887 +
7888 +.macro pax_erase_kstack
7889 +#ifdef CONFIG_PAX_MEMORY_STACKLEAK
7890 + call pax_erase_kstack
7891 +#endif
7892 +.endm
7893 +
7894 /*
7895 * 32bit SYSENTER instruction entry.
7896 *
7897 @@ -119,12 +147,6 @@ ENTRY(ia32_sysenter_target)
7898 CFI_REGISTER rsp,rbp
7899 SWAPGS_UNSAFE_STACK
7900 movq PER_CPU_VAR(kernel_stack), %rsp
7901 - addq $(KERNEL_STACK_OFFSET),%rsp
7902 - /*
7903 - * No need to follow this irqs on/off section: the syscall
7904 - * disabled irqs, here we enable it straight after entry:
7905 - */
7906 - ENABLE_INTERRUPTS(CLBR_NONE)
7907 movl %ebp,%ebp /* zero extension */
7908 pushq $__USER32_DS
7909 CFI_ADJUST_CFA_OFFSET 8
7910 @@ -135,28 +157,42 @@ ENTRY(ia32_sysenter_target)
7911 pushfq
7912 CFI_ADJUST_CFA_OFFSET 8
7913 /*CFI_REL_OFFSET rflags,0*/
7914 - movl 8*3-THREAD_SIZE+TI_sysenter_return(%rsp), %r10d
7915 - CFI_REGISTER rip,r10
7916 + orl $X86_EFLAGS_IF,(%rsp)
7917 + GET_THREAD_INFO(%r11)
7918 + movl TI_sysenter_return(%r11), %r11d
7919 + CFI_REGISTER rip,r11
7920 pushq $__USER32_CS
7921 CFI_ADJUST_CFA_OFFSET 8
7922 /*CFI_REL_OFFSET cs,0*/
7923 movl %eax, %eax
7924 - pushq %r10
7925 + pushq %r11
7926 CFI_ADJUST_CFA_OFFSET 8
7927 CFI_REL_OFFSET rip,0
7928 pushq %rax
7929 CFI_ADJUST_CFA_OFFSET 8
7930 cld
7931 SAVE_ARGS 0,0,1
7932 + pax_enter_kernel_user
7933 + /*
7934 + * No need to follow this irqs on/off section: the syscall
7935 + * disabled irqs, here we enable it straight after entry:
7936 + */
7937 + ENABLE_INTERRUPTS(CLBR_NONE)
7938 /* no need to do an access_ok check here because rbp has been
7939 32bit zero extended */
7940 +
7941 +#ifdef CONFIG_PAX_MEMORY_UDEREF
7942 + mov $PAX_USER_SHADOW_BASE,%r11
7943 + add %r11,%rbp
7944 +#endif
7945 +
7946 1: movl (%rbp),%ebp
7947 .section __ex_table,"a"
7948 .quad 1b,ia32_badarg
7949 .previous
7950 - GET_THREAD_INFO(%r10)
7951 - orl $TS_COMPAT,TI_status(%r10)
7952 - testl $_TIF_WORK_SYSCALL_ENTRY,TI_flags(%r10)
7953 + GET_THREAD_INFO(%r11)
7954 + orl $TS_COMPAT,TI_status(%r11)
7955 + testl $_TIF_WORK_SYSCALL_ENTRY,TI_flags(%r11)
7956 CFI_REMEMBER_STATE
7957 jnz sysenter_tracesys
7958 cmpq $(IA32_NR_syscalls-1),%rax
7959 @@ -166,13 +202,15 @@ sysenter_do_call:
7960 sysenter_dispatch:
7961 call *ia32_sys_call_table(,%rax,8)
7962 movq %rax,RAX-ARGOFFSET(%rsp)
7963 - GET_THREAD_INFO(%r10)
7964 + GET_THREAD_INFO(%r11)
7965 DISABLE_INTERRUPTS(CLBR_NONE)
7966 TRACE_IRQS_OFF
7967 - testl $_TIF_ALLWORK_MASK,TI_flags(%r10)
7968 + testl $_TIF_ALLWORK_MASK,TI_flags(%r11)
7969 jnz sysexit_audit
7970 sysexit_from_sys_call:
7971 - andl $~TS_COMPAT,TI_status(%r10)
7972 + pax_exit_kernel_user
7973 + pax_erase_kstack
7974 + andl $~TS_COMPAT,TI_status(%r11)
7975 /* clear IF, that popfq doesn't enable interrupts early */
7976 andl $~0x200,EFLAGS-R11(%rsp)
7977 movl RIP-R11(%rsp),%edx /* User %eip */
7978 @@ -200,6 +238,9 @@ sysexit_from_sys_call:
7979 movl %eax,%esi /* 2nd arg: syscall number */
7980 movl $AUDIT_ARCH_I386,%edi /* 1st arg: audit arch */
7981 call audit_syscall_entry
7982 +
7983 + pax_erase_kstack
7984 +
7985 movl RAX-ARGOFFSET(%rsp),%eax /* reload syscall number */
7986 cmpq $(IA32_NR_syscalls-1),%rax
7987 ja ia32_badsys
7988 @@ -211,7 +252,7 @@ sysexit_from_sys_call:
7989 .endm
7990
7991 .macro auditsys_exit exit
7992 - testl $(_TIF_ALLWORK_MASK & ~_TIF_SYSCALL_AUDIT),TI_flags(%r10)
7993 + testl $(_TIF_ALLWORK_MASK & ~_TIF_SYSCALL_AUDIT),TI_flags(%r11)
7994 jnz ia32_ret_from_sys_call
7995 TRACE_IRQS_ON
7996 sti
7997 @@ -221,12 +262,12 @@ sysexit_from_sys_call:
7998 movzbl %al,%edi /* zero-extend that into %edi */
7999 inc %edi /* first arg, 0->1(AUDITSC_SUCCESS), 1->2(AUDITSC_FAILURE) */
8000 call audit_syscall_exit
8001 - GET_THREAD_INFO(%r10)
8002 + GET_THREAD_INFO(%r11)
8003 movl RAX-ARGOFFSET(%rsp),%eax /* reload syscall return value */
8004 movl $(_TIF_ALLWORK_MASK & ~_TIF_SYSCALL_AUDIT),%edi
8005 cli
8006 TRACE_IRQS_OFF
8007 - testl %edi,TI_flags(%r10)
8008 + testl %edi,TI_flags(%r11)
8009 jz \exit
8010 CLEAR_RREGS -ARGOFFSET
8011 jmp int_with_check
8012 @@ -244,7 +285,7 @@ sysexit_audit:
8013
8014 sysenter_tracesys:
8015 #ifdef CONFIG_AUDITSYSCALL
8016 - testl $(_TIF_WORK_SYSCALL_ENTRY & ~_TIF_SYSCALL_AUDIT),TI_flags(%r10)
8017 + testl $(_TIF_WORK_SYSCALL_ENTRY & ~_TIF_SYSCALL_AUDIT),TI_flags(%r11)
8018 jz sysenter_auditsys
8019 #endif
8020 SAVE_REST
8021 @@ -252,6 +293,9 @@ sysenter_tracesys:
8022 movq $-ENOSYS,RAX(%rsp)/* ptrace can change this for a bad syscall */
8023 movq %rsp,%rdi /* &pt_regs -> arg1 */
8024 call syscall_trace_enter
8025 +
8026 + pax_erase_kstack
8027 +
8028 LOAD_ARGS32 ARGOFFSET /* reload args from stack in case ptrace changed it */
8029 RESTORE_REST
8030 cmpq $(IA32_NR_syscalls-1),%rax
8031 @@ -283,19 +327,20 @@ ENDPROC(ia32_sysenter_target)
8032 ENTRY(ia32_cstar_target)
8033 CFI_STARTPROC32 simple
8034 CFI_SIGNAL_FRAME
8035 - CFI_DEF_CFA rsp,KERNEL_STACK_OFFSET
8036 + CFI_DEF_CFA rsp,0
8037 CFI_REGISTER rip,rcx
8038 /*CFI_REGISTER rflags,r11*/
8039 SWAPGS_UNSAFE_STACK
8040 movl %esp,%r8d
8041 CFI_REGISTER rsp,r8
8042 movq PER_CPU_VAR(kernel_stack),%rsp
8043 + SAVE_ARGS 8*6,1,1
8044 + pax_enter_kernel_user
8045 /*
8046 * No need to follow this irqs on/off section: the syscall
8047 * disabled irqs and here we enable it straight after entry:
8048 */
8049 ENABLE_INTERRUPTS(CLBR_NONE)
8050 - SAVE_ARGS 8,1,1
8051 movl %eax,%eax /* zero extension */
8052 movq %rax,ORIG_RAX-ARGOFFSET(%rsp)
8053 movq %rcx,RIP-ARGOFFSET(%rsp)
8054 @@ -311,13 +356,19 @@ ENTRY(ia32_cstar_target)
8055 /* no need to do an access_ok check here because r8 has been
8056 32bit zero extended */
8057 /* hardware stack frame is complete now */
8058 +
8059 +#ifdef CONFIG_PAX_MEMORY_UDEREF
8060 + mov $PAX_USER_SHADOW_BASE,%r11
8061 + add %r11,%r8
8062 +#endif
8063 +
8064 1: movl (%r8),%r9d
8065 .section __ex_table,"a"
8066 .quad 1b,ia32_badarg
8067 .previous
8068 - GET_THREAD_INFO(%r10)
8069 - orl $TS_COMPAT,TI_status(%r10)
8070 - testl $_TIF_WORK_SYSCALL_ENTRY,TI_flags(%r10)
8071 + GET_THREAD_INFO(%r11)
8072 + orl $TS_COMPAT,TI_status(%r11)
8073 + testl $_TIF_WORK_SYSCALL_ENTRY,TI_flags(%r11)
8074 CFI_REMEMBER_STATE
8075 jnz cstar_tracesys
8076 cmpq $IA32_NR_syscalls-1,%rax
8077 @@ -327,13 +378,15 @@ cstar_do_call:
8078 cstar_dispatch:
8079 call *ia32_sys_call_table(,%rax,8)
8080 movq %rax,RAX-ARGOFFSET(%rsp)
8081 - GET_THREAD_INFO(%r10)
8082 + GET_THREAD_INFO(%r11)
8083 DISABLE_INTERRUPTS(CLBR_NONE)
8084 TRACE_IRQS_OFF
8085 - testl $_TIF_ALLWORK_MASK,TI_flags(%r10)
8086 + testl $_TIF_ALLWORK_MASK,TI_flags(%r11)
8087 jnz sysretl_audit
8088 sysretl_from_sys_call:
8089 - andl $~TS_COMPAT,TI_status(%r10)
8090 + pax_exit_kernel_user
8091 + pax_erase_kstack
8092 + andl $~TS_COMPAT,TI_status(%r11)
8093 RESTORE_ARGS 1,-ARG_SKIP,1,1,1
8094 movl RIP-ARGOFFSET(%rsp),%ecx
8095 CFI_REGISTER rip,rcx
8096 @@ -361,7 +414,7 @@ sysretl_audit:
8097
8098 cstar_tracesys:
8099 #ifdef CONFIG_AUDITSYSCALL
8100 - testl $(_TIF_WORK_SYSCALL_ENTRY & ~_TIF_SYSCALL_AUDIT),TI_flags(%r10)
8101 + testl $(_TIF_WORK_SYSCALL_ENTRY & ~_TIF_SYSCALL_AUDIT),TI_flags(%r11)
8102 jz cstar_auditsys
8103 #endif
8104 xchgl %r9d,%ebp
8105 @@ -370,6 +423,9 @@ cstar_tracesys:
8106 movq $-ENOSYS,RAX(%rsp) /* ptrace can change this for a bad syscall */
8107 movq %rsp,%rdi /* &pt_regs -> arg1 */
8108 call syscall_trace_enter
8109 +
8110 + pax_erase_kstack
8111 +
8112 LOAD_ARGS32 ARGOFFSET, 1 /* reload args from stack in case ptrace changed it */
8113 RESTORE_REST
8114 xchgl %ebp,%r9d
8115 @@ -415,11 +471,6 @@ ENTRY(ia32_syscall)
8116 CFI_REL_OFFSET rip,RIP-RIP
8117 PARAVIRT_ADJUST_EXCEPTION_FRAME
8118 SWAPGS
8119 - /*
8120 - * No need to follow this irqs on/off section: the syscall
8121 - * disabled irqs and here we enable it straight after entry:
8122 - */
8123 - ENABLE_INTERRUPTS(CLBR_NONE)
8124 movl %eax,%eax
8125 pushq %rax
8126 CFI_ADJUST_CFA_OFFSET 8
8127 @@ -427,9 +478,15 @@ ENTRY(ia32_syscall)
8128 /* note the registers are not zero extended to the sf.
8129 this could be a problem. */
8130 SAVE_ARGS 0,0,1
8131 - GET_THREAD_INFO(%r10)
8132 - orl $TS_COMPAT,TI_status(%r10)
8133 - testl $_TIF_WORK_SYSCALL_ENTRY,TI_flags(%r10)
8134 + pax_enter_kernel_user
8135 + /*
8136 + * No need to follow this irqs on/off section: the syscall
8137 + * disabled irqs and here we enable it straight after entry:
8138 + */
8139 + ENABLE_INTERRUPTS(CLBR_NONE)
8140 + GET_THREAD_INFO(%r11)
8141 + orl $TS_COMPAT,TI_status(%r11)
8142 + testl $_TIF_WORK_SYSCALL_ENTRY,TI_flags(%r11)
8143 jnz ia32_tracesys
8144 cmpq $(IA32_NR_syscalls-1),%rax
8145 ja ia32_badsys
8146 @@ -448,6 +505,9 @@ ia32_tracesys:
8147 movq $-ENOSYS,RAX(%rsp) /* ptrace can change this for a bad syscall */
8148 movq %rsp,%rdi /* &pt_regs -> arg1 */
8149 call syscall_trace_enter
8150 +
8151 + pax_erase_kstack
8152 +
8153 LOAD_ARGS32 ARGOFFSET /* reload args from stack in case ptrace changed it */
8154 RESTORE_REST
8155 cmpq $(IA32_NR_syscalls-1),%rax
8156 @@ -462,6 +522,7 @@ ia32_badsys:
8157
8158 quiet_ni_syscall:
8159 movq $-ENOSYS,%rax
8160 + pax_force_retaddr
8161 ret
8162 CFI_ENDPROC
8163
8164 diff --git a/arch/x86/ia32/sys_ia32.c b/arch/x86/ia32/sys_ia32.c
8165 index 016218c..47ccbdd 100644
8166 --- a/arch/x86/ia32/sys_ia32.c
8167 +++ b/arch/x86/ia32/sys_ia32.c
8168 @@ -69,8 +69,8 @@ asmlinkage long sys32_ftruncate64(unsigned int fd, unsigned long offset_low,
8169 */
8170 static int cp_stat64(struct stat64 __user *ubuf, struct kstat *stat)
8171 {
8172 - typeof(ubuf->st_uid) uid = 0;
8173 - typeof(ubuf->st_gid) gid = 0;
8174 + typeof(((struct stat64 *)0)->st_uid) uid = 0;
8175 + typeof(((struct stat64 *)0)->st_gid) gid = 0;
8176 SET_UID(uid, stat->uid);
8177 SET_GID(gid, stat->gid);
8178 if (!access_ok(VERIFY_WRITE, ubuf, sizeof(struct stat64)) ||
8179 @@ -308,8 +308,8 @@ asmlinkage long sys32_rt_sigprocmask(int how, compat_sigset_t __user *set,
8180 }
8181 set_fs(KERNEL_DS);
8182 ret = sys_rt_sigprocmask(how,
8183 - set ? (sigset_t __user *)&s : NULL,
8184 - oset ? (sigset_t __user *)&s : NULL,
8185 + set ? (sigset_t __force_user *)&s : NULL,
8186 + oset ? (sigset_t __force_user *)&s : NULL,
8187 sigsetsize);
8188 set_fs(old_fs);
8189 if (ret)
8190 @@ -371,7 +371,7 @@ asmlinkage long sys32_sched_rr_get_interval(compat_pid_t pid,
8191 mm_segment_t old_fs = get_fs();
8192
8193 set_fs(KERNEL_DS);
8194 - ret = sys_sched_rr_get_interval(pid, (struct timespec __user *)&t);
8195 + ret = sys_sched_rr_get_interval(pid, (struct timespec __force_user *)&t);
8196 set_fs(old_fs);
8197 if (put_compat_timespec(&t, interval))
8198 return -EFAULT;
8199 @@ -387,7 +387,7 @@ asmlinkage long sys32_rt_sigpending(compat_sigset_t __user *set,
8200 mm_segment_t old_fs = get_fs();
8201
8202 set_fs(KERNEL_DS);
8203 - ret = sys_rt_sigpending((sigset_t __user *)&s, sigsetsize);
8204 + ret = sys_rt_sigpending((sigset_t __force_user *)&s, sigsetsize);
8205 set_fs(old_fs);
8206 if (!ret) {
8207 switch (_NSIG_WORDS) {
8208 @@ -412,7 +412,7 @@ asmlinkage long sys32_rt_sigqueueinfo(int pid, int sig,
8209 if (copy_siginfo_from_user32(&info, uinfo))
8210 return -EFAULT;
8211 set_fs(KERNEL_DS);
8212 - ret = sys_rt_sigqueueinfo(pid, sig, (siginfo_t __user *)&info);
8213 + ret = sys_rt_sigqueueinfo(pid, sig, (siginfo_t __force_user *)&info);
8214 set_fs(old_fs);
8215 return ret;
8216 }
8217 @@ -513,7 +513,7 @@ asmlinkage long sys32_sendfile(int out_fd, int in_fd,
8218 return -EFAULT;
8219
8220 set_fs(KERNEL_DS);
8221 - ret = sys_sendfile(out_fd, in_fd, offset ? (off_t __user *)&of : NULL,
8222 + ret = sys_sendfile(out_fd, in_fd, offset ? (off_t __force_user *)&of : NULL,
8223 count);
8224 set_fs(old_fs);
8225
8226 diff --git a/arch/x86/include/asm/alternative-asm.h b/arch/x86/include/asm/alternative-asm.h
8227 index e2077d3..b7a8919 100644
8228 --- a/arch/x86/include/asm/alternative-asm.h
8229 +++ b/arch/x86/include/asm/alternative-asm.h
8230 @@ -8,10 +8,10 @@
8231
8232 #ifdef CONFIG_SMP
8233 .macro LOCK_PREFIX
8234 -1: lock
8235 +672: lock
8236 .section .smp_locks,"a"
8237 .align 4
8238 - X86_ALIGN 1b
8239 + X86_ALIGN 672b
8240 .previous
8241 .endm
8242 #else
8243 @@ -19,4 +19,43 @@
8244 .endm
8245 #endif
8246
8247 +#ifdef CONFIG_PAX_KERNEXEC_PLUGIN
8248 + .macro pax_force_retaddr_bts rip=0
8249 + btsq $63,\rip(%rsp)
8250 + .endm
8251 +#ifdef CONFIG_PAX_KERNEXEC_PLUGIN_METHOD_BTS
8252 + .macro pax_force_retaddr rip=0, reload=0
8253 + btsq $63,\rip(%rsp)
8254 + .endm
8255 + .macro pax_force_fptr ptr
8256 + btsq $63,\ptr
8257 + .endm
8258 + .macro pax_set_fptr_mask
8259 + .endm
8260 +#endif
8261 +#ifdef CONFIG_PAX_KERNEXEC_PLUGIN_METHOD_OR
8262 + .macro pax_force_retaddr rip=0, reload=0
8263 + .if \reload
8264 + pax_set_fptr_mask
8265 + .endif
8266 + orq %r10,\rip(%rsp)
8267 + .endm
8268 + .macro pax_force_fptr ptr
8269 + orq %r10,\ptr
8270 + .endm
8271 + .macro pax_set_fptr_mask
8272 + movabs $0x8000000000000000,%r10
8273 + .endm
8274 +#endif
8275 +#else
8276 + .macro pax_force_retaddr rip=0, reload=0
8277 + .endm
8278 + .macro pax_force_fptr ptr
8279 + .endm
8280 + .macro pax_force_retaddr_bts rip=0
8281 + .endm
8282 + .macro pax_set_fptr_mask
8283 + .endm
8284 +#endif
8285 +
8286 #endif /* __ASSEMBLY__ */
8287 diff --git a/arch/x86/include/asm/alternative.h b/arch/x86/include/asm/alternative.h
8288 index c240efc..fdfadf3 100644
8289 --- a/arch/x86/include/asm/alternative.h
8290 +++ b/arch/x86/include/asm/alternative.h
8291 @@ -85,7 +85,7 @@ static inline void alternatives_smp_switch(int smp) {}
8292 " .byte 662b-661b\n" /* sourcelen */ \
8293 " .byte 664f-663f\n" /* replacementlen */ \
8294 ".previous\n" \
8295 - ".section .altinstr_replacement, \"ax\"\n" \
8296 + ".section .altinstr_replacement, \"a\"\n" \
8297 "663:\n\t" newinstr "\n664:\n" /* replacement */ \
8298 ".previous"
8299
8300 diff --git a/arch/x86/include/asm/apic.h b/arch/x86/include/asm/apic.h
8301 index 474d80d..1f97d58 100644
8302 --- a/arch/x86/include/asm/apic.h
8303 +++ b/arch/x86/include/asm/apic.h
8304 @@ -46,7 +46,7 @@ static inline void generic_apic_probe(void)
8305
8306 #ifdef CONFIG_X86_LOCAL_APIC
8307
8308 -extern unsigned int apic_verbosity;
8309 +extern int apic_verbosity;
8310 extern int local_apic_timer_c2_ok;
8311
8312 extern int disable_apic;
8313 diff --git a/arch/x86/include/asm/apm.h b/arch/x86/include/asm/apm.h
8314 index 20370c6..a2eb9b0 100644
8315 --- a/arch/x86/include/asm/apm.h
8316 +++ b/arch/x86/include/asm/apm.h
8317 @@ -34,7 +34,7 @@ static inline void apm_bios_call_asm(u32 func, u32 ebx_in, u32 ecx_in,
8318 __asm__ __volatile__(APM_DO_ZERO_SEGS
8319 "pushl %%edi\n\t"
8320 "pushl %%ebp\n\t"
8321 - "lcall *%%cs:apm_bios_entry\n\t"
8322 + "lcall *%%ss:apm_bios_entry\n\t"
8323 "setc %%al\n\t"
8324 "popl %%ebp\n\t"
8325 "popl %%edi\n\t"
8326 @@ -58,7 +58,7 @@ static inline u8 apm_bios_call_simple_asm(u32 func, u32 ebx_in,
8327 __asm__ __volatile__(APM_DO_ZERO_SEGS
8328 "pushl %%edi\n\t"
8329 "pushl %%ebp\n\t"
8330 - "lcall *%%cs:apm_bios_entry\n\t"
8331 + "lcall *%%ss:apm_bios_entry\n\t"
8332 "setc %%bl\n\t"
8333 "popl %%ebp\n\t"
8334 "popl %%edi\n\t"
8335 diff --git a/arch/x86/include/asm/atomic_32.h b/arch/x86/include/asm/atomic_32.h
8336 index dc5a667..939040c 100644
8337 --- a/arch/x86/include/asm/atomic_32.h
8338 +++ b/arch/x86/include/asm/atomic_32.h
8339 @@ -25,6 +25,17 @@ static inline int atomic_read(const atomic_t *v)
8340 }
8341
8342 /**
8343 + * atomic_read_unchecked - read atomic variable
8344 + * @v: pointer of type atomic_unchecked_t
8345 + *
8346 + * Atomically reads the value of @v.
8347 + */
8348 +static inline int atomic_read_unchecked(const atomic_unchecked_t *v)
8349 +{
8350 + return v->counter;
8351 +}
8352 +
8353 +/**
8354 * atomic_set - set atomic variable
8355 * @v: pointer of type atomic_t
8356 * @i: required value
8357 @@ -37,6 +48,18 @@ static inline void atomic_set(atomic_t *v, int i)
8358 }
8359
8360 /**
8361 + * atomic_set_unchecked - set atomic variable
8362 + * @v: pointer of type atomic_unchecked_t
8363 + * @i: required value
8364 + *
8365 + * Atomically sets the value of @v to @i.
8366 + */
8367 +static inline void atomic_set_unchecked(atomic_unchecked_t *v, int i)
8368 +{
8369 + v->counter = i;
8370 +}
8371 +
8372 +/**
8373 * atomic_add - add integer to atomic variable
8374 * @i: integer value to add
8375 * @v: pointer of type atomic_t
8376 @@ -45,7 +68,29 @@ static inline void atomic_set(atomic_t *v, int i)
8377 */
8378 static inline void atomic_add(int i, atomic_t *v)
8379 {
8380 - asm volatile(LOCK_PREFIX "addl %1,%0"
8381 + asm volatile(LOCK_PREFIX "addl %1,%0\n"
8382 +
8383 +#ifdef CONFIG_PAX_REFCOUNT
8384 + "jno 0f\n"
8385 + LOCK_PREFIX "subl %1,%0\n"
8386 + "int $4\n0:\n"
8387 + _ASM_EXTABLE(0b, 0b)
8388 +#endif
8389 +
8390 + : "+m" (v->counter)
8391 + : "ir" (i));
8392 +}
8393 +
8394 +/**
8395 + * atomic_add_unchecked - add integer to atomic variable
8396 + * @i: integer value to add
8397 + * @v: pointer of type atomic_unchecked_t
8398 + *
8399 + * Atomically adds @i to @v.
8400 + */
8401 +static inline void atomic_add_unchecked(int i, atomic_unchecked_t *v)
8402 +{
8403 + asm volatile(LOCK_PREFIX "addl %1,%0\n"
8404 : "+m" (v->counter)
8405 : "ir" (i));
8406 }
8407 @@ -59,7 +104,29 @@ static inline void atomic_add(int i, atomic_t *v)
8408 */
8409 static inline void atomic_sub(int i, atomic_t *v)
8410 {
8411 - asm volatile(LOCK_PREFIX "subl %1,%0"
8412 + asm volatile(LOCK_PREFIX "subl %1,%0\n"
8413 +
8414 +#ifdef CONFIG_PAX_REFCOUNT
8415 + "jno 0f\n"
8416 + LOCK_PREFIX "addl %1,%0\n"
8417 + "int $4\n0:\n"
8418 + _ASM_EXTABLE(0b, 0b)
8419 +#endif
8420 +
8421 + : "+m" (v->counter)
8422 + : "ir" (i));
8423 +}
8424 +
8425 +/**
8426 + * atomic_sub_unchecked - subtract integer from atomic variable
8427 + * @i: integer value to subtract
8428 + * @v: pointer of type atomic_unchecked_t
8429 + *
8430 + * Atomically subtracts @i from @v.
8431 + */
8432 +static inline void atomic_sub_unchecked(int i, atomic_unchecked_t *v)
8433 +{
8434 + asm volatile(LOCK_PREFIX "subl %1,%0\n"
8435 : "+m" (v->counter)
8436 : "ir" (i));
8437 }
8438 @@ -77,7 +144,16 @@ static inline int atomic_sub_and_test(int i, atomic_t *v)
8439 {
8440 unsigned char c;
8441
8442 - asm volatile(LOCK_PREFIX "subl %2,%0; sete %1"
8443 + asm volatile(LOCK_PREFIX "subl %2,%0\n"
8444 +
8445 +#ifdef CONFIG_PAX_REFCOUNT
8446 + "jno 0f\n"
8447 + LOCK_PREFIX "addl %2,%0\n"
8448 + "int $4\n0:\n"
8449 + _ASM_EXTABLE(0b, 0b)
8450 +#endif
8451 +
8452 + "sete %1\n"
8453 : "+m" (v->counter), "=qm" (c)
8454 : "ir" (i) : "memory");
8455 return c;
8456 @@ -91,7 +167,27 @@ static inline int atomic_sub_and_test(int i, atomic_t *v)
8457 */
8458 static inline void atomic_inc(atomic_t *v)
8459 {
8460 - asm volatile(LOCK_PREFIX "incl %0"
8461 + asm volatile(LOCK_PREFIX "incl %0\n"
8462 +
8463 +#ifdef CONFIG_PAX_REFCOUNT
8464 + "jno 0f\n"
8465 + LOCK_PREFIX "decl %0\n"
8466 + "int $4\n0:\n"
8467 + _ASM_EXTABLE(0b, 0b)
8468 +#endif
8469 +
8470 + : "+m" (v->counter));
8471 +}
8472 +
8473 +/**
8474 + * atomic_inc_unchecked - increment atomic variable
8475 + * @v: pointer of type atomic_unchecked_t
8476 + *
8477 + * Atomically increments @v by 1.
8478 + */
8479 +static inline void atomic_inc_unchecked(atomic_unchecked_t *v)
8480 +{
8481 + asm volatile(LOCK_PREFIX "incl %0\n"
8482 : "+m" (v->counter));
8483 }
8484
8485 @@ -103,7 +199,27 @@ static inline void atomic_inc(atomic_t *v)
8486 */
8487 static inline void atomic_dec(atomic_t *v)
8488 {
8489 - asm volatile(LOCK_PREFIX "decl %0"
8490 + asm volatile(LOCK_PREFIX "decl %0\n"
8491 +
8492 +#ifdef CONFIG_PAX_REFCOUNT
8493 + "jno 0f\n"
8494 + LOCK_PREFIX "incl %0\n"
8495 + "int $4\n0:\n"
8496 + _ASM_EXTABLE(0b, 0b)
8497 +#endif
8498 +
8499 + : "+m" (v->counter));
8500 +}
8501 +
8502 +/**
8503 + * atomic_dec_unchecked - decrement atomic variable
8504 + * @v: pointer of type atomic_unchecked_t
8505 + *
8506 + * Atomically decrements @v by 1.
8507 + */
8508 +static inline void atomic_dec_unchecked(atomic_unchecked_t *v)
8509 +{
8510 + asm volatile(LOCK_PREFIX "decl %0\n"
8511 : "+m" (v->counter));
8512 }
8513
8514 @@ -119,7 +235,16 @@ static inline int atomic_dec_and_test(atomic_t *v)
8515 {
8516 unsigned char c;
8517
8518 - asm volatile(LOCK_PREFIX "decl %0; sete %1"
8519 + asm volatile(LOCK_PREFIX "decl %0\n"
8520 +
8521 +#ifdef CONFIG_PAX_REFCOUNT
8522 + "jno 0f\n"
8523 + LOCK_PREFIX "incl %0\n"
8524 + "int $4\n0:\n"
8525 + _ASM_EXTABLE(0b, 0b)
8526 +#endif
8527 +
8528 + "sete %1\n"
8529 : "+m" (v->counter), "=qm" (c)
8530 : : "memory");
8531 return c != 0;
8532 @@ -137,7 +262,35 @@ static inline int atomic_inc_and_test(atomic_t *v)
8533 {
8534 unsigned char c;
8535
8536 - asm volatile(LOCK_PREFIX "incl %0; sete %1"
8537 + asm volatile(LOCK_PREFIX "incl %0\n"
8538 +
8539 +#ifdef CONFIG_PAX_REFCOUNT
8540 + "jno 0f\n"
8541 + LOCK_PREFIX "decl %0\n"
8542 + "into\n0:\n"
8543 + _ASM_EXTABLE(0b, 0b)
8544 +#endif
8545 +
8546 + "sete %1\n"
8547 + : "+m" (v->counter), "=qm" (c)
8548 + : : "memory");
8549 + return c != 0;
8550 +}
8551 +
8552 +/**
8553 + * atomic_inc_and_test_unchecked - increment and test
8554 + * @v: pointer of type atomic_unchecked_t
8555 + *
8556 + * Atomically increments @v by 1
8557 + * and returns true if the result is zero, or false for all
8558 + * other cases.
8559 + */
8560 +static inline int atomic_inc_and_test_unchecked(atomic_unchecked_t *v)
8561 +{
8562 + unsigned char c;
8563 +
8564 + asm volatile(LOCK_PREFIX "incl %0\n"
8565 + "sete %1\n"
8566 : "+m" (v->counter), "=qm" (c)
8567 : : "memory");
8568 return c != 0;
8569 @@ -156,7 +309,16 @@ static inline int atomic_add_negative(int i, atomic_t *v)
8570 {
8571 unsigned char c;
8572
8573 - asm volatile(LOCK_PREFIX "addl %2,%0; sets %1"
8574 + asm volatile(LOCK_PREFIX "addl %2,%0\n"
8575 +
8576 +#ifdef CONFIG_PAX_REFCOUNT
8577 + "jno 0f\n"
8578 + LOCK_PREFIX "subl %2,%0\n"
8579 + "int $4\n0:\n"
8580 + _ASM_EXTABLE(0b, 0b)
8581 +#endif
8582 +
8583 + "sets %1\n"
8584 : "+m" (v->counter), "=qm" (c)
8585 : "ir" (i) : "memory");
8586 return c;
8587 @@ -179,7 +341,15 @@ static inline int atomic_add_return(int i, atomic_t *v)
8588 #endif
8589 /* Modern 486+ processor */
8590 __i = i;
8591 - asm volatile(LOCK_PREFIX "xaddl %0, %1"
8592 + asm volatile(LOCK_PREFIX "xaddl %0, %1\n"
8593 +
8594 +#ifdef CONFIG_PAX_REFCOUNT
8595 + "jno 0f\n"
8596 + "movl %0, %1\n"
8597 + "int $4\n0:\n"
8598 + _ASM_EXTABLE(0b, 0b)
8599 +#endif
8600 +
8601 : "+r" (i), "+m" (v->counter)
8602 : : "memory");
8603 return i + __i;
8604 @@ -195,6 +365,38 @@ no_xadd: /* Legacy 386 processor */
8605 }
8606
8607 /**
8608 + * atomic_add_return_unchecked - add integer and return
8609 + * @v: pointer of type atomic_unchecked_t
8610 + * @i: integer value to add
8611 + *
8612 + * Atomically adds @i to @v and returns @i + @v
8613 + */
8614 +static inline int atomic_add_return_unchecked(int i, atomic_unchecked_t *v)
8615 +{
8616 + int __i;
8617 +#ifdef CONFIG_M386
8618 + unsigned long flags;
8619 + if (unlikely(boot_cpu_data.x86 <= 3))
8620 + goto no_xadd;
8621 +#endif
8622 + /* Modern 486+ processor */
8623 + __i = i;
8624 + asm volatile(LOCK_PREFIX "xaddl %0, %1"
8625 + : "+r" (i), "+m" (v->counter)
8626 + : : "memory");
8627 + return i + __i;
8628 +
8629 +#ifdef CONFIG_M386
8630 +no_xadd: /* Legacy 386 processor */
8631 + local_irq_save(flags);
8632 + __i = atomic_read_unchecked(v);
8633 + atomic_set_unchecked(v, i + __i);
8634 + local_irq_restore(flags);
8635 + return i + __i;
8636 +#endif
8637 +}
8638 +
8639 +/**
8640 * atomic_sub_return - subtract integer and return
8641 * @v: pointer of type atomic_t
8642 * @i: integer value to subtract
8643 @@ -211,11 +413,21 @@ static inline int atomic_cmpxchg(atomic_t *v, int old, int new)
8644 return cmpxchg(&v->counter, old, new);
8645 }
8646
8647 +static inline int atomic_cmpxchg_unchecked(atomic_unchecked_t *v, int old, int new)
8648 +{
8649 + return cmpxchg(&v->counter, old, new);
8650 +}
8651 +
8652 static inline int atomic_xchg(atomic_t *v, int new)
8653 {
8654 return xchg(&v->counter, new);
8655 }
8656
8657 +static inline int atomic_xchg_unchecked(atomic_unchecked_t *v, int new)
8658 +{
8659 + return xchg(&v->counter, new);
8660 +}
8661 +
8662 /**
8663 * atomic_add_unless - add unless the number is already a given value
8664 * @v: pointer of type atomic_t
8665 @@ -227,22 +439,39 @@ static inline int atomic_xchg(atomic_t *v, int new)
8666 */
8667 static inline int atomic_add_unless(atomic_t *v, int a, int u)
8668 {
8669 - int c, old;
8670 + int c, old, new;
8671 c = atomic_read(v);
8672 for (;;) {
8673 - if (unlikely(c == (u)))
8674 + if (unlikely(c == u))
8675 break;
8676 - old = atomic_cmpxchg((v), c, c + (a));
8677 +
8678 + asm volatile("addl %2,%0\n"
8679 +
8680 +#ifdef CONFIG_PAX_REFCOUNT
8681 + "jno 0f\n"
8682 + "subl %2,%0\n"
8683 + "int $4\n0:\n"
8684 + _ASM_EXTABLE(0b, 0b)
8685 +#endif
8686 +
8687 + : "=r" (new)
8688 + : "0" (c), "ir" (a));
8689 +
8690 + old = atomic_cmpxchg(v, c, new);
8691 if (likely(old == c))
8692 break;
8693 c = old;
8694 }
8695 - return c != (u);
8696 + return c != u;
8697 }
8698
8699 #define atomic_inc_not_zero(v) atomic_add_unless((v), 1, 0)
8700
8701 #define atomic_inc_return(v) (atomic_add_return(1, v))
8702 +static inline int atomic_inc_return_unchecked(atomic_unchecked_t *v)
8703 +{
8704 + return atomic_add_return_unchecked(1, v);
8705 +}
8706 #define atomic_dec_return(v) (atomic_sub_return(1, v))
8707
8708 /* These are x86-specific, used by some header files */
8709 @@ -266,9 +495,18 @@ typedef struct {
8710 u64 __aligned(8) counter;
8711 } atomic64_t;
8712
8713 +#ifdef CONFIG_PAX_REFCOUNT
8714 +typedef struct {
8715 + u64 __aligned(8) counter;
8716 +} atomic64_unchecked_t;
8717 +#else
8718 +typedef atomic64_t atomic64_unchecked_t;
8719 +#endif
8720 +
8721 #define ATOMIC64_INIT(val) { (val) }
8722
8723 extern u64 atomic64_cmpxchg(atomic64_t *ptr, u64 old_val, u64 new_val);
8724 +extern u64 atomic64_cmpxchg_unchecked(atomic64_unchecked_t *ptr, u64 old_val, u64 new_val);
8725
8726 /**
8727 * atomic64_xchg - xchg atomic64 variable
8728 @@ -279,6 +517,7 @@ extern u64 atomic64_cmpxchg(atomic64_t *ptr, u64 old_val, u64 new_val);
8729 * the old value.
8730 */
8731 extern u64 atomic64_xchg(atomic64_t *ptr, u64 new_val);
8732 +extern u64 atomic64_xchg_unchecked(atomic64_unchecked_t *ptr, u64 new_val);
8733
8734 /**
8735 * atomic64_set - set atomic64 variable
8736 @@ -290,6 +529,15 @@ extern u64 atomic64_xchg(atomic64_t *ptr, u64 new_val);
8737 extern void atomic64_set(atomic64_t *ptr, u64 new_val);
8738
8739 /**
8740 + * atomic64_unchecked_set - set atomic64 variable
8741 + * @ptr: pointer to type atomic64_unchecked_t
8742 + * @new_val: value to assign
8743 + *
8744 + * Atomically sets the value of @ptr to @new_val.
8745 + */
8746 +extern void atomic64_set_unchecked(atomic64_unchecked_t *ptr, u64 new_val);
8747 +
8748 +/**
8749 * atomic64_read - read atomic64 variable
8750 * @ptr: pointer to type atomic64_t
8751 *
8752 @@ -317,7 +565,33 @@ static inline u64 atomic64_read(atomic64_t *ptr)
8753 return res;
8754 }
8755
8756 -extern u64 atomic64_read(atomic64_t *ptr);
8757 +/**
8758 + * atomic64_read_unchecked - read atomic64 variable
8759 + * @ptr: pointer to type atomic64_unchecked_t
8760 + *
8761 + * Atomically reads the value of @ptr and returns it.
8762 + */
8763 +static inline u64 atomic64_read_unchecked(atomic64_unchecked_t *ptr)
8764 +{
8765 + u64 res;
8766 +
8767 + /*
8768 + * Note, we inline this atomic64_unchecked_t primitive because
8769 + * it only clobbers EAX/EDX and leaves the others
8770 + * untouched. We also (somewhat subtly) rely on the
8771 + * fact that cmpxchg8b returns the current 64-bit value
8772 + * of the memory location we are touching:
8773 + */
8774 + asm volatile(
8775 + "mov %%ebx, %%eax\n\t"
8776 + "mov %%ecx, %%edx\n\t"
8777 + LOCK_PREFIX "cmpxchg8b %1\n"
8778 + : "=&A" (res)
8779 + : "m" (*ptr)
8780 + );
8781 +
8782 + return res;
8783 +}
8784
8785 /**
8786 * atomic64_add_return - add and return
8787 @@ -332,8 +606,11 @@ extern u64 atomic64_add_return(u64 delta, atomic64_t *ptr);
8788 * Other variants with different arithmetic operators:
8789 */
8790 extern u64 atomic64_sub_return(u64 delta, atomic64_t *ptr);
8791 +extern u64 atomic64_sub_return_unchecked(u64 delta, atomic64_unchecked_t *ptr);
8792 extern u64 atomic64_inc_return(atomic64_t *ptr);
8793 +extern u64 atomic64_inc_return_unchecked(atomic64_unchecked_t *ptr);
8794 extern u64 atomic64_dec_return(atomic64_t *ptr);
8795 +extern u64 atomic64_dec_return_unchecked(atomic64_unchecked_t *ptr);
8796
8797 /**
8798 * atomic64_add - add integer to atomic64 variable
8799 @@ -345,6 +622,15 @@ extern u64 atomic64_dec_return(atomic64_t *ptr);
8800 extern void atomic64_add(u64 delta, atomic64_t *ptr);
8801
8802 /**
8803 + * atomic64_add_unchecked - add integer to atomic64 variable
8804 + * @delta: integer value to add
8805 + * @ptr: pointer to type atomic64_unchecked_t
8806 + *
8807 + * Atomically adds @delta to @ptr.
8808 + */
8809 +extern void atomic64_add_unchecked(u64 delta, atomic64_unchecked_t *ptr);
8810 +
8811 +/**
8812 * atomic64_sub - subtract the atomic64 variable
8813 * @delta: integer value to subtract
8814 * @ptr: pointer to type atomic64_t
8815 @@ -354,6 +640,15 @@ extern void atomic64_add(u64 delta, atomic64_t *ptr);
8816 extern void atomic64_sub(u64 delta, atomic64_t *ptr);
8817
8818 /**
8819 + * atomic64_sub_unchecked - subtract the atomic64 variable
8820 + * @delta: integer value to subtract
8821 + * @ptr: pointer to type atomic64_unchecked_t
8822 + *
8823 + * Atomically subtracts @delta from @ptr.
8824 + */
8825 +extern void atomic64_sub_unchecked(u64 delta, atomic64_unchecked_t *ptr);
8826 +
8827 +/**
8828 * atomic64_sub_and_test - subtract value from variable and test result
8829 * @delta: integer value to subtract
8830 * @ptr: pointer to type atomic64_t
8831 @@ -373,6 +668,14 @@ extern int atomic64_sub_and_test(u64 delta, atomic64_t *ptr);
8832 extern void atomic64_inc(atomic64_t *ptr);
8833
8834 /**
8835 + * atomic64_inc_unchecked - increment atomic64 variable
8836 + * @ptr: pointer to type atomic64_unchecked_t
8837 + *
8838 + * Atomically increments @ptr by 1.
8839 + */
8840 +extern void atomic64_inc_unchecked(atomic64_unchecked_t *ptr);
8841 +
8842 +/**
8843 * atomic64_dec - decrement atomic64 variable
8844 * @ptr: pointer to type atomic64_t
8845 *
8846 @@ -381,6 +684,14 @@ extern void atomic64_inc(atomic64_t *ptr);
8847 extern void atomic64_dec(atomic64_t *ptr);
8848
8849 /**
8850 + * atomic64_dec_unchecked - decrement atomic64 variable
8851 + * @ptr: pointer to type atomic64_unchecked_t
8852 + *
8853 + * Atomically decrements @ptr by 1.
8854 + */
8855 +extern void atomic64_dec_unchecked(atomic64_unchecked_t *ptr);
8856 +
8857 +/**
8858 * atomic64_dec_and_test - decrement and test
8859 * @ptr: pointer to type atomic64_t
8860 *
8861 diff --git a/arch/x86/include/asm/atomic_64.h b/arch/x86/include/asm/atomic_64.h
8862 index d605dc2..fafd7bd 100644
8863 --- a/arch/x86/include/asm/atomic_64.h
8864 +++ b/arch/x86/include/asm/atomic_64.h
8865 @@ -24,6 +24,17 @@ static inline int atomic_read(const atomic_t *v)
8866 }
8867
8868 /**
8869 + * atomic_read_unchecked - read atomic variable
8870 + * @v: pointer of type atomic_unchecked_t
8871 + *
8872 + * Atomically reads the value of @v.
8873 + */
8874 +static inline int atomic_read_unchecked(const atomic_unchecked_t *v)
8875 +{
8876 + return v->counter;
8877 +}
8878 +
8879 +/**
8880 * atomic_set - set atomic variable
8881 * @v: pointer of type atomic_t
8882 * @i: required value
8883 @@ -36,6 +47,18 @@ static inline void atomic_set(atomic_t *v, int i)
8884 }
8885
8886 /**
8887 + * atomic_set_unchecked - set atomic variable
8888 + * @v: pointer of type atomic_unchecked_t
8889 + * @i: required value
8890 + *
8891 + * Atomically sets the value of @v to @i.
8892 + */
8893 +static inline void atomic_set_unchecked(atomic_unchecked_t *v, int i)
8894 +{
8895 + v->counter = i;
8896 +}
8897 +
8898 +/**
8899 * atomic_add - add integer to atomic variable
8900 * @i: integer value to add
8901 * @v: pointer of type atomic_t
8902 @@ -44,7 +67,29 @@ static inline void atomic_set(atomic_t *v, int i)
8903 */
8904 static inline void atomic_add(int i, atomic_t *v)
8905 {
8906 - asm volatile(LOCK_PREFIX "addl %1,%0"
8907 + asm volatile(LOCK_PREFIX "addl %1,%0\n"
8908 +
8909 +#ifdef CONFIG_PAX_REFCOUNT
8910 + "jno 0f\n"
8911 + LOCK_PREFIX "subl %1,%0\n"
8912 + "int $4\n0:\n"
8913 + _ASM_EXTABLE(0b, 0b)
8914 +#endif
8915 +
8916 + : "=m" (v->counter)
8917 + : "ir" (i), "m" (v->counter));
8918 +}
8919 +
8920 +/**
8921 + * atomic_add_unchecked - add integer to atomic variable
8922 + * @i: integer value to add
8923 + * @v: pointer of type atomic_unchecked_t
8924 + *
8925 + * Atomically adds @i to @v.
8926 + */
8927 +static inline void atomic_add_unchecked(int i, atomic_unchecked_t *v)
8928 +{
8929 + asm volatile(LOCK_PREFIX "addl %1,%0\n"
8930 : "=m" (v->counter)
8931 : "ir" (i), "m" (v->counter));
8932 }
8933 @@ -58,7 +103,29 @@ static inline void atomic_add(int i, atomic_t *v)
8934 */
8935 static inline void atomic_sub(int i, atomic_t *v)
8936 {
8937 - asm volatile(LOCK_PREFIX "subl %1,%0"
8938 + asm volatile(LOCK_PREFIX "subl %1,%0\n"
8939 +
8940 +#ifdef CONFIG_PAX_REFCOUNT
8941 + "jno 0f\n"
8942 + LOCK_PREFIX "addl %1,%0\n"
8943 + "int $4\n0:\n"
8944 + _ASM_EXTABLE(0b, 0b)
8945 +#endif
8946 +
8947 + : "=m" (v->counter)
8948 + : "ir" (i), "m" (v->counter));
8949 +}
8950 +
8951 +/**
8952 + * atomic_sub_unchecked - subtract the atomic variable
8953 + * @i: integer value to subtract
8954 + * @v: pointer of type atomic_unchecked_t
8955 + *
8956 + * Atomically subtracts @i from @v.
8957 + */
8958 +static inline void atomic_sub_unchecked(int i, atomic_unchecked_t *v)
8959 +{
8960 + asm volatile(LOCK_PREFIX "subl %1,%0\n"
8961 : "=m" (v->counter)
8962 : "ir" (i), "m" (v->counter));
8963 }
8964 @@ -76,7 +143,16 @@ static inline int atomic_sub_and_test(int i, atomic_t *v)
8965 {
8966 unsigned char c;
8967
8968 - asm volatile(LOCK_PREFIX "subl %2,%0; sete %1"
8969 + asm volatile(LOCK_PREFIX "subl %2,%0\n"
8970 +
8971 +#ifdef CONFIG_PAX_REFCOUNT
8972 + "jno 0f\n"
8973 + LOCK_PREFIX "addl %2,%0\n"
8974 + "int $4\n0:\n"
8975 + _ASM_EXTABLE(0b, 0b)
8976 +#endif
8977 +
8978 + "sete %1\n"
8979 : "=m" (v->counter), "=qm" (c)
8980 : "ir" (i), "m" (v->counter) : "memory");
8981 return c;
8982 @@ -90,7 +166,28 @@ static inline int atomic_sub_and_test(int i, atomic_t *v)
8983 */
8984 static inline void atomic_inc(atomic_t *v)
8985 {
8986 - asm volatile(LOCK_PREFIX "incl %0"
8987 + asm volatile(LOCK_PREFIX "incl %0\n"
8988 +
8989 +#ifdef CONFIG_PAX_REFCOUNT
8990 + "jno 0f\n"
8991 + LOCK_PREFIX "decl %0\n"
8992 + "int $4\n0:\n"
8993 + _ASM_EXTABLE(0b, 0b)
8994 +#endif
8995 +
8996 + : "=m" (v->counter)
8997 + : "m" (v->counter));
8998 +}
8999 +
9000 +/**
9001 + * atomic_inc_unchecked - increment atomic variable
9002 + * @v: pointer of type atomic_unchecked_t
9003 + *
9004 + * Atomically increments @v by 1.
9005 + */
9006 +static inline void atomic_inc_unchecked(atomic_unchecked_t *v)
9007 +{
9008 + asm volatile(LOCK_PREFIX "incl %0\n"
9009 : "=m" (v->counter)
9010 : "m" (v->counter));
9011 }
9012 @@ -103,7 +200,28 @@ static inline void atomic_inc(atomic_t *v)
9013 */
9014 static inline void atomic_dec(atomic_t *v)
9015 {
9016 - asm volatile(LOCK_PREFIX "decl %0"
9017 + asm volatile(LOCK_PREFIX "decl %0\n"
9018 +
9019 +#ifdef CONFIG_PAX_REFCOUNT
9020 + "jno 0f\n"
9021 + LOCK_PREFIX "incl %0\n"
9022 + "int $4\n0:\n"
9023 + _ASM_EXTABLE(0b, 0b)
9024 +#endif
9025 +
9026 + : "=m" (v->counter)
9027 + : "m" (v->counter));
9028 +}
9029 +
9030 +/**
9031 + * atomic_dec_unchecked - decrement atomic variable
9032 + * @v: pointer of type atomic_unchecked_t
9033 + *
9034 + * Atomically decrements @v by 1.
9035 + */
9036 +static inline void atomic_dec_unchecked(atomic_unchecked_t *v)
9037 +{
9038 + asm volatile(LOCK_PREFIX "decl %0\n"
9039 : "=m" (v->counter)
9040 : "m" (v->counter));
9041 }
9042 @@ -120,7 +238,16 @@ static inline int atomic_dec_and_test(atomic_t *v)
9043 {
9044 unsigned char c;
9045
9046 - asm volatile(LOCK_PREFIX "decl %0; sete %1"
9047 + asm volatile(LOCK_PREFIX "decl %0\n"
9048 +
9049 +#ifdef CONFIG_PAX_REFCOUNT
9050 + "jno 0f\n"
9051 + LOCK_PREFIX "incl %0\n"
9052 + "int $4\n0:\n"
9053 + _ASM_EXTABLE(0b, 0b)
9054 +#endif
9055 +
9056 + "sete %1\n"
9057 : "=m" (v->counter), "=qm" (c)
9058 : "m" (v->counter) : "memory");
9059 return c != 0;
9060 @@ -138,7 +265,35 @@ static inline int atomic_inc_and_test(atomic_t *v)
9061 {
9062 unsigned char c;
9063
9064 - asm volatile(LOCK_PREFIX "incl %0; sete %1"
9065 + asm volatile(LOCK_PREFIX "incl %0\n"
9066 +
9067 +#ifdef CONFIG_PAX_REFCOUNT
9068 + "jno 0f\n"
9069 + LOCK_PREFIX "decl %0\n"
9070 + "int $4\n0:\n"
9071 + _ASM_EXTABLE(0b, 0b)
9072 +#endif
9073 +
9074 + "sete %1\n"
9075 + : "=m" (v->counter), "=qm" (c)
9076 + : "m" (v->counter) : "memory");
9077 + return c != 0;
9078 +}
9079 +
9080 +/**
9081 + * atomic_inc_and_test_unchecked - increment and test
9082 + * @v: pointer of type atomic_unchecked_t
9083 + *
9084 + * Atomically increments @v by 1
9085 + * and returns true if the result is zero, or false for all
9086 + * other cases.
9087 + */
9088 +static inline int atomic_inc_and_test_unchecked(atomic_unchecked_t *v)
9089 +{
9090 + unsigned char c;
9091 +
9092 + asm volatile(LOCK_PREFIX "incl %0\n"
9093 + "sete %1\n"
9094 : "=m" (v->counter), "=qm" (c)
9095 : "m" (v->counter) : "memory");
9096 return c != 0;
9097 @@ -157,7 +312,16 @@ static inline int atomic_add_negative(int i, atomic_t *v)
9098 {
9099 unsigned char c;
9100
9101 - asm volatile(LOCK_PREFIX "addl %2,%0; sets %1"
9102 + asm volatile(LOCK_PREFIX "addl %2,%0\n"
9103 +
9104 +#ifdef CONFIG_PAX_REFCOUNT
9105 + "jno 0f\n"
9106 + LOCK_PREFIX "subl %2,%0\n"
9107 + "int $4\n0:\n"
9108 + _ASM_EXTABLE(0b, 0b)
9109 +#endif
9110 +
9111 + "sets %1\n"
9112 : "=m" (v->counter), "=qm" (c)
9113 : "ir" (i), "m" (v->counter) : "memory");
9114 return c;
9115 @@ -173,7 +337,31 @@ static inline int atomic_add_negative(int i, atomic_t *v)
9116 static inline int atomic_add_return(int i, atomic_t *v)
9117 {
9118 int __i = i;
9119 - asm volatile(LOCK_PREFIX "xaddl %0, %1"
9120 + asm volatile(LOCK_PREFIX "xaddl %0, %1\n"
9121 +
9122 +#ifdef CONFIG_PAX_REFCOUNT
9123 + "jno 0f\n"
9124 + "movl %0, %1\n"
9125 + "int $4\n0:\n"
9126 + _ASM_EXTABLE(0b, 0b)
9127 +#endif
9128 +
9129 + : "+r" (i), "+m" (v->counter)
9130 + : : "memory");
9131 + return i + __i;
9132 +}
9133 +
9134 +/**
9135 + * atomic_add_return_unchecked - add and return
9136 + * @i: integer value to add
9137 + * @v: pointer of type atomic_unchecked_t
9138 + *
9139 + * Atomically adds @i to @v and returns @i + @v
9140 + */
9141 +static inline int atomic_add_return_unchecked(int i, atomic_unchecked_t *v)
9142 +{
9143 + int __i = i;
9144 + asm volatile(LOCK_PREFIX "xaddl %0, %1\n"
9145 : "+r" (i), "+m" (v->counter)
9146 : : "memory");
9147 return i + __i;
9148 @@ -185,6 +373,10 @@ static inline int atomic_sub_return(int i, atomic_t *v)
9149 }
9150
9151 #define atomic_inc_return(v) (atomic_add_return(1, v))
9152 +static inline int atomic_inc_return_unchecked(atomic_unchecked_t *v)
9153 +{
9154 + return atomic_add_return_unchecked(1, v);
9155 +}
9156 #define atomic_dec_return(v) (atomic_sub_return(1, v))
9157
9158 /* The 64-bit atomic type */
9159 @@ -204,6 +396,18 @@ static inline long atomic64_read(const atomic64_t *v)
9160 }
9161
9162 /**
9163 + * atomic64_read_unchecked - read atomic64 variable
9164 + * @v: pointer of type atomic64_unchecked_t
9165 + *
9166 + * Atomically reads the value of @v.
9167 + * Doesn't imply a read memory barrier.
9168 + */
9169 +static inline long atomic64_read_unchecked(const atomic64_unchecked_t *v)
9170 +{
9171 + return v->counter;
9172 +}
9173 +
9174 +/**
9175 * atomic64_set - set atomic64 variable
9176 * @v: pointer to type atomic64_t
9177 * @i: required value
9178 @@ -216,6 +420,18 @@ static inline void atomic64_set(atomic64_t *v, long i)
9179 }
9180
9181 /**
9182 + * atomic64_set_unchecked - set atomic64 variable
9183 + * @v: pointer to type atomic64_unchecked_t
9184 + * @i: required value
9185 + *
9186 + * Atomically sets the value of @v to @i.
9187 + */
9188 +static inline void atomic64_set_unchecked(atomic64_unchecked_t *v, long i)
9189 +{
9190 + v->counter = i;
9191 +}
9192 +
9193 +/**
9194 * atomic64_add - add integer to atomic64 variable
9195 * @i: integer value to add
9196 * @v: pointer to type atomic64_t
9197 @@ -224,6 +440,28 @@ static inline void atomic64_set(atomic64_t *v, long i)
9198 */
9199 static inline void atomic64_add(long i, atomic64_t *v)
9200 {
9201 + asm volatile(LOCK_PREFIX "addq %1,%0\n"
9202 +
9203 +#ifdef CONFIG_PAX_REFCOUNT
9204 + "jno 0f\n"
9205 + LOCK_PREFIX "subq %1,%0\n"
9206 + "int $4\n0:\n"
9207 + _ASM_EXTABLE(0b, 0b)
9208 +#endif
9209 +
9210 + : "=m" (v->counter)
9211 + : "er" (i), "m" (v->counter));
9212 +}
9213 +
9214 +/**
9215 + * atomic64_add_unchecked - add integer to atomic64 variable
9216 + * @i: integer value to add
9217 + * @v: pointer to type atomic64_unchecked_t
9218 + *
9219 + * Atomically adds @i to @v.
9220 + */
9221 +static inline void atomic64_add_unchecked(long i, atomic64_unchecked_t *v)
9222 +{
9223 asm volatile(LOCK_PREFIX "addq %1,%0"
9224 : "=m" (v->counter)
9225 : "er" (i), "m" (v->counter));
9226 @@ -238,7 +476,15 @@ static inline void atomic64_add(long i, atomic64_t *v)
9227 */
9228 static inline void atomic64_sub(long i, atomic64_t *v)
9229 {
9230 - asm volatile(LOCK_PREFIX "subq %1,%0"
9231 + asm volatile(LOCK_PREFIX "subq %1,%0\n"
9232 +
9233 +#ifdef CONFIG_PAX_REFCOUNT
9234 + "jno 0f\n"
9235 + LOCK_PREFIX "addq %1,%0\n"
9236 + "int $4\n0:\n"
9237 + _ASM_EXTABLE(0b, 0b)
9238 +#endif
9239 +
9240 : "=m" (v->counter)
9241 : "er" (i), "m" (v->counter));
9242 }
9243 @@ -256,7 +502,16 @@ static inline int atomic64_sub_and_test(long i, atomic64_t *v)
9244 {
9245 unsigned char c;
9246
9247 - asm volatile(LOCK_PREFIX "subq %2,%0; sete %1"
9248 + asm volatile(LOCK_PREFIX "subq %2,%0\n"
9249 +
9250 +#ifdef CONFIG_PAX_REFCOUNT
9251 + "jno 0f\n"
9252 + LOCK_PREFIX "addq %2,%0\n"
9253 + "int $4\n0:\n"
9254 + _ASM_EXTABLE(0b, 0b)
9255 +#endif
9256 +
9257 + "sete %1\n"
9258 : "=m" (v->counter), "=qm" (c)
9259 : "er" (i), "m" (v->counter) : "memory");
9260 return c;
9261 @@ -270,6 +525,27 @@ static inline int atomic64_sub_and_test(long i, atomic64_t *v)
9262 */
9263 static inline void atomic64_inc(atomic64_t *v)
9264 {
9265 + asm volatile(LOCK_PREFIX "incq %0\n"
9266 +
9267 +#ifdef CONFIG_PAX_REFCOUNT
9268 + "jno 0f\n"
9269 + LOCK_PREFIX "decq %0\n"
9270 + "int $4\n0:\n"
9271 + _ASM_EXTABLE(0b, 0b)
9272 +#endif
9273 +
9274 + : "=m" (v->counter)
9275 + : "m" (v->counter));
9276 +}
9277 +
9278 +/**
9279 + * atomic64_inc_unchecked - increment atomic64 variable
9280 + * @v: pointer to type atomic64_unchecked_t
9281 + *
9282 + * Atomically increments @v by 1.
9283 + */
9284 +static inline void atomic64_inc_unchecked(atomic64_unchecked_t *v)
9285 +{
9286 asm volatile(LOCK_PREFIX "incq %0"
9287 : "=m" (v->counter)
9288 : "m" (v->counter));
9289 @@ -283,7 +559,28 @@ static inline void atomic64_inc(atomic64_t *v)
9290 */
9291 static inline void atomic64_dec(atomic64_t *v)
9292 {
9293 - asm volatile(LOCK_PREFIX "decq %0"
9294 + asm volatile(LOCK_PREFIX "decq %0\n"
9295 +
9296 +#ifdef CONFIG_PAX_REFCOUNT
9297 + "jno 0f\n"
9298 + LOCK_PREFIX "incq %0\n"
9299 + "int $4\n0:\n"
9300 + _ASM_EXTABLE(0b, 0b)
9301 +#endif
9302 +
9303 + : "=m" (v->counter)
9304 + : "m" (v->counter));
9305 +}
9306 +
9307 +/**
9308 + * atomic64_dec_unchecked - decrement atomic64 variable
9309 + * @v: pointer to type atomic64_t
9310 + *
9311 + * Atomically decrements @v by 1.
9312 + */
9313 +static inline void atomic64_dec_unchecked(atomic64_unchecked_t *v)
9314 +{
9315 + asm volatile(LOCK_PREFIX "decq %0\n"
9316 : "=m" (v->counter)
9317 : "m" (v->counter));
9318 }
9319 @@ -300,7 +597,16 @@ static inline int atomic64_dec_and_test(atomic64_t *v)
9320 {
9321 unsigned char c;
9322
9323 - asm volatile(LOCK_PREFIX "decq %0; sete %1"
9324 + asm volatile(LOCK_PREFIX "decq %0\n"
9325 +
9326 +#ifdef CONFIG_PAX_REFCOUNT
9327 + "jno 0f\n"
9328 + LOCK_PREFIX "incq %0\n"
9329 + "int $4\n0:\n"
9330 + _ASM_EXTABLE(0b, 0b)
9331 +#endif
9332 +
9333 + "sete %1\n"
9334 : "=m" (v->counter), "=qm" (c)
9335 : "m" (v->counter) : "memory");
9336 return c != 0;
9337 @@ -318,7 +624,16 @@ static inline int atomic64_inc_and_test(atomic64_t *v)
9338 {
9339 unsigned char c;
9340
9341 - asm volatile(LOCK_PREFIX "incq %0; sete %1"
9342 + asm volatile(LOCK_PREFIX "incq %0\n"
9343 +
9344 +#ifdef CONFIG_PAX_REFCOUNT
9345 + "jno 0f\n"
9346 + LOCK_PREFIX "decq %0\n"
9347 + "int $4\n0:\n"
9348 + _ASM_EXTABLE(0b, 0b)
9349 +#endif
9350 +
9351 + "sete %1\n"
9352 : "=m" (v->counter), "=qm" (c)
9353 : "m" (v->counter) : "memory");
9354 return c != 0;
9355 @@ -337,7 +652,16 @@ static inline int atomic64_add_negative(long i, atomic64_t *v)
9356 {
9357 unsigned char c;
9358
9359 - asm volatile(LOCK_PREFIX "addq %2,%0; sets %1"
9360 + asm volatile(LOCK_PREFIX "addq %2,%0\n"
9361 +
9362 +#ifdef CONFIG_PAX_REFCOUNT
9363 + "jno 0f\n"
9364 + LOCK_PREFIX "subq %2,%0\n"
9365 + "int $4\n0:\n"
9366 + _ASM_EXTABLE(0b, 0b)
9367 +#endif
9368 +
9369 + "sets %1\n"
9370 : "=m" (v->counter), "=qm" (c)
9371 : "er" (i), "m" (v->counter) : "memory");
9372 return c;
9373 @@ -353,7 +677,31 @@ static inline int atomic64_add_negative(long i, atomic64_t *v)
9374 static inline long atomic64_add_return(long i, atomic64_t *v)
9375 {
9376 long __i = i;
9377 - asm volatile(LOCK_PREFIX "xaddq %0, %1;"
9378 + asm volatile(LOCK_PREFIX "xaddq %0, %1\n"
9379 +
9380 +#ifdef CONFIG_PAX_REFCOUNT
9381 + "jno 0f\n"
9382 + "movq %0, %1\n"
9383 + "int $4\n0:\n"
9384 + _ASM_EXTABLE(0b, 0b)
9385 +#endif
9386 +
9387 + : "+r" (i), "+m" (v->counter)
9388 + : : "memory");
9389 + return i + __i;
9390 +}
9391 +
9392 +/**
9393 + * atomic64_add_return_unchecked - add and return
9394 + * @i: integer value to add
9395 + * @v: pointer to type atomic64_unchecked_t
9396 + *
9397 + * Atomically adds @i to @v and returns @i + @v
9398 + */
9399 +static inline long atomic64_add_return_unchecked(long i, atomic64_unchecked_t *v)
9400 +{
9401 + long __i = i;
9402 + asm volatile(LOCK_PREFIX "xaddq %0, %1"
9403 : "+r" (i), "+m" (v->counter)
9404 : : "memory");
9405 return i + __i;
9406 @@ -365,6 +713,10 @@ static inline long atomic64_sub_return(long i, atomic64_t *v)
9407 }
9408
9409 #define atomic64_inc_return(v) (atomic64_add_return(1, (v)))
9410 +static inline long atomic64_inc_return_unchecked(atomic64_unchecked_t *v)
9411 +{
9412 + return atomic64_add_return_unchecked(1, v);
9413 +}
9414 #define atomic64_dec_return(v) (atomic64_sub_return(1, (v)))
9415
9416 static inline long atomic64_cmpxchg(atomic64_t *v, long old, long new)
9417 @@ -372,21 +724,41 @@ static inline long atomic64_cmpxchg(atomic64_t *v, long old, long new)
9418 return cmpxchg(&v->counter, old, new);
9419 }
9420
9421 +static inline long atomic64_cmpxchg_unchecked(atomic64_unchecked_t *v, long old, long new)
9422 +{
9423 + return cmpxchg(&v->counter, old, new);
9424 +}
9425 +
9426 static inline long atomic64_xchg(atomic64_t *v, long new)
9427 {
9428 return xchg(&v->counter, new);
9429 }
9430
9431 +static inline long atomic64_xchg_unchecked(atomic64_unchecked_t *v, long new)
9432 +{
9433 + return xchg(&v->counter, new);
9434 +}
9435 +
9436 static inline long atomic_cmpxchg(atomic_t *v, int old, int new)
9437 {
9438 return cmpxchg(&v->counter, old, new);
9439 }
9440
9441 +static inline long atomic_cmpxchg_unchecked(atomic_unchecked_t *v, int old, int new)
9442 +{
9443 + return cmpxchg(&v->counter, old, new);
9444 +}
9445 +
9446 static inline long atomic_xchg(atomic_t *v, int new)
9447 {
9448 return xchg(&v->counter, new);
9449 }
9450
9451 +static inline long atomic_xchg_unchecked(atomic_unchecked_t *v, int new)
9452 +{
9453 + return xchg(&v->counter, new);
9454 +}
9455 +
9456 /**
9457 * atomic_add_unless - add unless the number is a given value
9458 * @v: pointer of type atomic_t
9459 @@ -398,17 +770,30 @@ static inline long atomic_xchg(atomic_t *v, int new)
9460 */
9461 static inline int atomic_add_unless(atomic_t *v, int a, int u)
9462 {
9463 - int c, old;
9464 + int c, old, new;
9465 c = atomic_read(v);
9466 for (;;) {
9467 - if (unlikely(c == (u)))
9468 + if (unlikely(c == u))
9469 break;
9470 - old = atomic_cmpxchg((v), c, c + (a));
9471 +
9472 + asm volatile("addl %2,%0\n"
9473 +
9474 +#ifdef CONFIG_PAX_REFCOUNT
9475 + "jno 0f\n"
9476 + "subl %2,%0\n"
9477 + "int $4\n0:\n"
9478 + _ASM_EXTABLE(0b, 0b)
9479 +#endif
9480 +
9481 + : "=r" (new)
9482 + : "0" (c), "ir" (a));
9483 +
9484 + old = atomic_cmpxchg(v, c, new);
9485 if (likely(old == c))
9486 break;
9487 c = old;
9488 }
9489 - return c != (u);
9490 + return c != u;
9491 }
9492
9493 #define atomic_inc_not_zero(v) atomic_add_unless((v), 1, 0)
9494 @@ -424,17 +809,30 @@ static inline int atomic_add_unless(atomic_t *v, int a, int u)
9495 */
9496 static inline int atomic64_add_unless(atomic64_t *v, long a, long u)
9497 {
9498 - long c, old;
9499 + long c, old, new;
9500 c = atomic64_read(v);
9501 for (;;) {
9502 - if (unlikely(c == (u)))
9503 + if (unlikely(c == u))
9504 break;
9505 - old = atomic64_cmpxchg((v), c, c + (a));
9506 +
9507 + asm volatile("addq %2,%0\n"
9508 +
9509 +#ifdef CONFIG_PAX_REFCOUNT
9510 + "jno 0f\n"
9511 + "subq %2,%0\n"
9512 + "int $4\n0:\n"
9513 + _ASM_EXTABLE(0b, 0b)
9514 +#endif
9515 +
9516 + : "=r" (new)
9517 + : "0" (c), "er" (a));
9518 +
9519 + old = atomic64_cmpxchg(v, c, new);
9520 if (likely(old == c))
9521 break;
9522 c = old;
9523 }
9524 - return c != (u);
9525 + return c != u;
9526 }
9527
9528 /**
9529 diff --git a/arch/x86/include/asm/bitops.h b/arch/x86/include/asm/bitops.h
9530 index 02b47a6..d5c4b15 100644
9531 --- a/arch/x86/include/asm/bitops.h
9532 +++ b/arch/x86/include/asm/bitops.h
9533 @@ -38,7 +38,7 @@
9534 * a mask operation on a byte.
9535 */
9536 #define IS_IMMEDIATE(nr) (__builtin_constant_p(nr))
9537 -#define CONST_MASK_ADDR(nr, addr) BITOP_ADDR((void *)(addr) + ((nr)>>3))
9538 +#define CONST_MASK_ADDR(nr, addr) BITOP_ADDR((volatile void *)(addr) + ((nr)>>3))
9539 #define CONST_MASK(nr) (1 << ((nr) & 7))
9540
9541 /**
9542 diff --git a/arch/x86/include/asm/boot.h b/arch/x86/include/asm/boot.h
9543 index 7a10659..8bbf355 100644
9544 --- a/arch/x86/include/asm/boot.h
9545 +++ b/arch/x86/include/asm/boot.h
9546 @@ -11,10 +11,15 @@
9547 #include <asm/pgtable_types.h>
9548
9549 /* Physical address where kernel should be loaded. */
9550 -#define LOAD_PHYSICAL_ADDR ((CONFIG_PHYSICAL_START \
9551 +#define ____LOAD_PHYSICAL_ADDR ((CONFIG_PHYSICAL_START \
9552 + (CONFIG_PHYSICAL_ALIGN - 1)) \
9553 & ~(CONFIG_PHYSICAL_ALIGN - 1))
9554
9555 +#ifndef __ASSEMBLY__
9556 +extern unsigned char __LOAD_PHYSICAL_ADDR[];
9557 +#define LOAD_PHYSICAL_ADDR ((unsigned long)__LOAD_PHYSICAL_ADDR)
9558 +#endif
9559 +
9560 /* Minimum kernel alignment, as a power of two */
9561 #ifdef CONFIG_X86_64
9562 #define MIN_KERNEL_ALIGN_LG2 PMD_SHIFT
9563 diff --git a/arch/x86/include/asm/cache.h b/arch/x86/include/asm/cache.h
9564 index 549860d..7d45f68 100644
9565 --- a/arch/x86/include/asm/cache.h
9566 +++ b/arch/x86/include/asm/cache.h
9567 @@ -5,9 +5,10 @@
9568
9569 /* L1 cache line size */
9570 #define L1_CACHE_SHIFT (CONFIG_X86_L1_CACHE_SHIFT)
9571 -#define L1_CACHE_BYTES (1 << L1_CACHE_SHIFT)
9572 +#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT)
9573
9574 #define __read_mostly __attribute__((__section__(".data.read_mostly")))
9575 +#define __read_only __attribute__((__section__(".data.read_only")))
9576
9577 #ifdef CONFIG_X86_VSMP
9578 /* vSMP Internode cacheline shift */
9579 diff --git a/arch/x86/include/asm/cacheflush.h b/arch/x86/include/asm/cacheflush.h
9580 index b54f6af..5b376a6 100644
9581 --- a/arch/x86/include/asm/cacheflush.h
9582 +++ b/arch/x86/include/asm/cacheflush.h
9583 @@ -60,7 +60,7 @@ PAGEFLAG(WC, WC)
9584 static inline unsigned long get_page_memtype(struct page *pg)
9585 {
9586 if (!PageUncached(pg) && !PageWC(pg))
9587 - return -1;
9588 + return ~0UL;
9589 else if (!PageUncached(pg) && PageWC(pg))
9590 return _PAGE_CACHE_WC;
9591 else if (PageUncached(pg) && !PageWC(pg))
9592 @@ -85,7 +85,7 @@ static inline void set_page_memtype(struct page *pg, unsigned long memtype)
9593 SetPageWC(pg);
9594 break;
9595 default:
9596 - case -1:
9597 + case ~0UL:
9598 ClearPageUncached(pg);
9599 ClearPageWC(pg);
9600 break;
9601 diff --git a/arch/x86/include/asm/calling.h b/arch/x86/include/asm/calling.h
9602 index 0e63c9a..ab8d972 100644
9603 --- a/arch/x86/include/asm/calling.h
9604 +++ b/arch/x86/include/asm/calling.h
9605 @@ -52,32 +52,32 @@ For 32-bit we have the following conventions - kernel is built with
9606 * for assembly code:
9607 */
9608
9609 -#define R15 0
9610 -#define R14 8
9611 -#define R13 16
9612 -#define R12 24
9613 -#define RBP 32
9614 -#define RBX 40
9615 +#define R15 (0)
9616 +#define R14 (8)
9617 +#define R13 (16)
9618 +#define R12 (24)
9619 +#define RBP (32)
9620 +#define RBX (40)
9621
9622 /* arguments: interrupts/non tracing syscalls only save up to here: */
9623 -#define R11 48
9624 -#define R10 56
9625 -#define R9 64
9626 -#define R8 72
9627 -#define RAX 80
9628 -#define RCX 88
9629 -#define RDX 96
9630 -#define RSI 104
9631 -#define RDI 112
9632 -#define ORIG_RAX 120 /* + error_code */
9633 +#define R11 (48)
9634 +#define R10 (56)
9635 +#define R9 (64)
9636 +#define R8 (72)
9637 +#define RAX (80)
9638 +#define RCX (88)
9639 +#define RDX (96)
9640 +#define RSI (104)
9641 +#define RDI (112)
9642 +#define ORIG_RAX (120) /* + error_code */
9643 /* end of arguments */
9644
9645 /* cpu exception frame or undefined in case of fast syscall: */
9646 -#define RIP 128
9647 -#define CS 136
9648 -#define EFLAGS 144
9649 -#define RSP 152
9650 -#define SS 160
9651 +#define RIP (128)
9652 +#define CS (136)
9653 +#define EFLAGS (144)
9654 +#define RSP (152)
9655 +#define SS (160)
9656
9657 #define ARGOFFSET R11
9658 #define SWFRAME ORIG_RAX
9659 diff --git a/arch/x86/include/asm/checksum_32.h b/arch/x86/include/asm/checksum_32.h
9660 index 46fc474..b02b0f9 100644
9661 --- a/arch/x86/include/asm/checksum_32.h
9662 +++ b/arch/x86/include/asm/checksum_32.h
9663 @@ -31,6 +31,14 @@ asmlinkage __wsum csum_partial_copy_generic(const void *src, void *dst,
9664 int len, __wsum sum,
9665 int *src_err_ptr, int *dst_err_ptr);
9666
9667 +asmlinkage __wsum csum_partial_copy_generic_to_user(const void *src, void *dst,
9668 + int len, __wsum sum,
9669 + int *src_err_ptr, int *dst_err_ptr);
9670 +
9671 +asmlinkage __wsum csum_partial_copy_generic_from_user(const void *src, void *dst,
9672 + int len, __wsum sum,
9673 + int *src_err_ptr, int *dst_err_ptr);
9674 +
9675 /*
9676 * Note: when you get a NULL pointer exception here this means someone
9677 * passed in an incorrect kernel address to one of these functions.
9678 @@ -50,7 +58,7 @@ static inline __wsum csum_partial_copy_from_user(const void __user *src,
9679 int *err_ptr)
9680 {
9681 might_sleep();
9682 - return csum_partial_copy_generic((__force void *)src, dst,
9683 + return csum_partial_copy_generic_from_user((__force void *)src, dst,
9684 len, sum, err_ptr, NULL);
9685 }
9686
9687 @@ -178,7 +186,7 @@ static inline __wsum csum_and_copy_to_user(const void *src,
9688 {
9689 might_sleep();
9690 if (access_ok(VERIFY_WRITE, dst, len))
9691 - return csum_partial_copy_generic(src, (__force void *)dst,
9692 + return csum_partial_copy_generic_to_user(src, (__force void *)dst,
9693 len, sum, NULL, err_ptr);
9694
9695 if (len)
9696 diff --git a/arch/x86/include/asm/desc.h b/arch/x86/include/asm/desc.h
9697 index 617bd56..7b047a1 100644
9698 --- a/arch/x86/include/asm/desc.h
9699 +++ b/arch/x86/include/asm/desc.h
9700 @@ -4,6 +4,7 @@
9701 #include <asm/desc_defs.h>
9702 #include <asm/ldt.h>
9703 #include <asm/mmu.h>
9704 +#include <asm/pgtable.h>
9705 #include <linux/smp.h>
9706
9707 static inline void fill_ldt(struct desc_struct *desc,
9708 @@ -15,6 +16,7 @@ static inline void fill_ldt(struct desc_struct *desc,
9709 desc->base1 = (info->base_addr & 0x00ff0000) >> 16;
9710 desc->type = (info->read_exec_only ^ 1) << 1;
9711 desc->type |= info->contents << 2;
9712 + desc->type |= info->seg_not_present ^ 1;
9713 desc->s = 1;
9714 desc->dpl = 0x3;
9715 desc->p = info->seg_not_present ^ 1;
9716 @@ -31,16 +33,12 @@ static inline void fill_ldt(struct desc_struct *desc,
9717 }
9718
9719 extern struct desc_ptr idt_descr;
9720 -extern gate_desc idt_table[];
9721 -
9722 -struct gdt_page {
9723 - struct desc_struct gdt[GDT_ENTRIES];
9724 -} __attribute__((aligned(PAGE_SIZE)));
9725 -DECLARE_PER_CPU_PAGE_ALIGNED(struct gdt_page, gdt_page);
9726 +extern gate_desc idt_table[256];
9727
9728 +extern struct desc_struct cpu_gdt_table[NR_CPUS][PAGE_SIZE / sizeof(struct desc_struct)];
9729 static inline struct desc_struct *get_cpu_gdt_table(unsigned int cpu)
9730 {
9731 - return per_cpu(gdt_page, cpu).gdt;
9732 + return cpu_gdt_table[cpu];
9733 }
9734
9735 #ifdef CONFIG_X86_64
9736 @@ -65,9 +63,14 @@ static inline void pack_gate(gate_desc *gate, unsigned char type,
9737 unsigned long base, unsigned dpl, unsigned flags,
9738 unsigned short seg)
9739 {
9740 - gate->a = (seg << 16) | (base & 0xffff);
9741 - gate->b = (base & 0xffff0000) |
9742 - (((0x80 | type | (dpl << 5)) & 0xff) << 8);
9743 + gate->gate.offset_low = base;
9744 + gate->gate.seg = seg;
9745 + gate->gate.reserved = 0;
9746 + gate->gate.type = type;
9747 + gate->gate.s = 0;
9748 + gate->gate.dpl = dpl;
9749 + gate->gate.p = 1;
9750 + gate->gate.offset_high = base >> 16;
9751 }
9752
9753 #endif
9754 @@ -115,13 +118,17 @@ static inline void paravirt_free_ldt(struct desc_struct *ldt, unsigned entries)
9755 static inline void native_write_idt_entry(gate_desc *idt, int entry,
9756 const gate_desc *gate)
9757 {
9758 + pax_open_kernel();
9759 memcpy(&idt[entry], gate, sizeof(*gate));
9760 + pax_close_kernel();
9761 }
9762
9763 static inline void native_write_ldt_entry(struct desc_struct *ldt, int entry,
9764 const void *desc)
9765 {
9766 + pax_open_kernel();
9767 memcpy(&ldt[entry], desc, 8);
9768 + pax_close_kernel();
9769 }
9770
9771 static inline void native_write_gdt_entry(struct desc_struct *gdt, int entry,
9772 @@ -139,7 +146,10 @@ static inline void native_write_gdt_entry(struct desc_struct *gdt, int entry,
9773 size = sizeof(struct desc_struct);
9774 break;
9775 }
9776 +
9777 + pax_open_kernel();
9778 memcpy(&gdt[entry], desc, size);
9779 + pax_close_kernel();
9780 }
9781
9782 static inline void pack_descriptor(struct desc_struct *desc, unsigned long base,
9783 @@ -211,7 +221,9 @@ static inline void native_set_ldt(const void *addr, unsigned int entries)
9784
9785 static inline void native_load_tr_desc(void)
9786 {
9787 + pax_open_kernel();
9788 asm volatile("ltr %w0"::"q" (GDT_ENTRY_TSS*8));
9789 + pax_close_kernel();
9790 }
9791
9792 static inline void native_load_gdt(const struct desc_ptr *dtr)
9793 @@ -246,8 +258,10 @@ static inline void native_load_tls(struct thread_struct *t, unsigned int cpu)
9794 unsigned int i;
9795 struct desc_struct *gdt = get_cpu_gdt_table(cpu);
9796
9797 + pax_open_kernel();
9798 for (i = 0; i < GDT_ENTRY_TLS_ENTRIES; i++)
9799 gdt[GDT_ENTRY_TLS_MIN + i] = t->tls_array[i];
9800 + pax_close_kernel();
9801 }
9802
9803 #define _LDT_empty(info) \
9804 @@ -309,7 +323,7 @@ static inline void set_desc_limit(struct desc_struct *desc, unsigned long limit)
9805 desc->limit = (limit >> 16) & 0xf;
9806 }
9807
9808 -static inline void _set_gate(int gate, unsigned type, void *addr,
9809 +static inline void _set_gate(int gate, unsigned type, const void *addr,
9810 unsigned dpl, unsigned ist, unsigned seg)
9811 {
9812 gate_desc s;
9813 @@ -327,7 +341,7 @@ static inline void _set_gate(int gate, unsigned type, void *addr,
9814 * Pentium F0 0F bugfix can have resulted in the mapped
9815 * IDT being write-protected.
9816 */
9817 -static inline void set_intr_gate(unsigned int n, void *addr)
9818 +static inline void set_intr_gate(unsigned int n, const void *addr)
9819 {
9820 BUG_ON((unsigned)n > 0xFF);
9821 _set_gate(n, GATE_INTERRUPT, addr, 0, 0, __KERNEL_CS);
9822 @@ -356,19 +370,19 @@ static inline void alloc_intr_gate(unsigned int n, void *addr)
9823 /*
9824 * This routine sets up an interrupt gate at directory privilege level 3.
9825 */
9826 -static inline void set_system_intr_gate(unsigned int n, void *addr)
9827 +static inline void set_system_intr_gate(unsigned int n, const void *addr)
9828 {
9829 BUG_ON((unsigned)n > 0xFF);
9830 _set_gate(n, GATE_INTERRUPT, addr, 0x3, 0, __KERNEL_CS);
9831 }
9832
9833 -static inline void set_system_trap_gate(unsigned int n, void *addr)
9834 +static inline void set_system_trap_gate(unsigned int n, const void *addr)
9835 {
9836 BUG_ON((unsigned)n > 0xFF);
9837 _set_gate(n, GATE_TRAP, addr, 0x3, 0, __KERNEL_CS);
9838 }
9839
9840 -static inline void set_trap_gate(unsigned int n, void *addr)
9841 +static inline void set_trap_gate(unsigned int n, const void *addr)
9842 {
9843 BUG_ON((unsigned)n > 0xFF);
9844 _set_gate(n, GATE_TRAP, addr, 0, 0, __KERNEL_CS);
9845 @@ -377,19 +391,31 @@ static inline void set_trap_gate(unsigned int n, void *addr)
9846 static inline void set_task_gate(unsigned int n, unsigned int gdt_entry)
9847 {
9848 BUG_ON((unsigned)n > 0xFF);
9849 - _set_gate(n, GATE_TASK, (void *)0, 0, 0, (gdt_entry<<3));
9850 + _set_gate(n, GATE_TASK, (const void *)0, 0, 0, (gdt_entry<<3));
9851 }
9852
9853 -static inline void set_intr_gate_ist(int n, void *addr, unsigned ist)
9854 +static inline void set_intr_gate_ist(int n, const void *addr, unsigned ist)
9855 {
9856 BUG_ON((unsigned)n > 0xFF);
9857 _set_gate(n, GATE_INTERRUPT, addr, 0, ist, __KERNEL_CS);
9858 }
9859
9860 -static inline void set_system_intr_gate_ist(int n, void *addr, unsigned ist)
9861 +static inline void set_system_intr_gate_ist(int n, const void *addr, unsigned ist)
9862 {
9863 BUG_ON((unsigned)n > 0xFF);
9864 _set_gate(n, GATE_INTERRUPT, addr, 0x3, ist, __KERNEL_CS);
9865 }
9866
9867 +#ifdef CONFIG_X86_32
9868 +static inline void set_user_cs(unsigned long base, unsigned long limit, int cpu)
9869 +{
9870 + struct desc_struct d;
9871 +
9872 + if (likely(limit))
9873 + limit = (limit - 1UL) >> PAGE_SHIFT;
9874 + pack_descriptor(&d, base, limit, 0xFB, 0xC);
9875 + write_gdt_entry(get_cpu_gdt_table(cpu), GDT_ENTRY_DEFAULT_USER_CS, &d, DESCTYPE_S);
9876 +}
9877 +#endif
9878 +
9879 #endif /* _ASM_X86_DESC_H */
9880 diff --git a/arch/x86/include/asm/desc_defs.h b/arch/x86/include/asm/desc_defs.h
9881 index 9d66848..6b4a691 100644
9882 --- a/arch/x86/include/asm/desc_defs.h
9883 +++ b/arch/x86/include/asm/desc_defs.h
9884 @@ -31,6 +31,12 @@ struct desc_struct {
9885 unsigned base1: 8, type: 4, s: 1, dpl: 2, p: 1;
9886 unsigned limit: 4, avl: 1, l: 1, d: 1, g: 1, base2: 8;
9887 };
9888 + struct {
9889 + u16 offset_low;
9890 + u16 seg;
9891 + unsigned reserved: 8, type: 4, s: 1, dpl: 2, p: 1;
9892 + unsigned offset_high: 16;
9893 + } gate;
9894 };
9895 } __attribute__((packed));
9896
9897 diff --git a/arch/x86/include/asm/device.h b/arch/x86/include/asm/device.h
9898 index cee34e9..a7c3fa2 100644
9899 --- a/arch/x86/include/asm/device.h
9900 +++ b/arch/x86/include/asm/device.h
9901 @@ -6,7 +6,7 @@ struct dev_archdata {
9902 void *acpi_handle;
9903 #endif
9904 #ifdef CONFIG_X86_64
9905 -struct dma_map_ops *dma_ops;
9906 + const struct dma_map_ops *dma_ops;
9907 #endif
9908 #ifdef CONFIG_DMAR
9909 void *iommu; /* hook for IOMMU specific extension */
9910 diff --git a/arch/x86/include/asm/dma-mapping.h b/arch/x86/include/asm/dma-mapping.h
9911 index 6a25d5d..786b202 100644
9912 --- a/arch/x86/include/asm/dma-mapping.h
9913 +++ b/arch/x86/include/asm/dma-mapping.h
9914 @@ -25,9 +25,9 @@ extern int iommu_merge;
9915 extern struct device x86_dma_fallback_dev;
9916 extern int panic_on_overflow;
9917
9918 -extern struct dma_map_ops *dma_ops;
9919 +extern const struct dma_map_ops *dma_ops;
9920
9921 -static inline struct dma_map_ops *get_dma_ops(struct device *dev)
9922 +static inline const struct dma_map_ops *get_dma_ops(struct device *dev)
9923 {
9924 #ifdef CONFIG_X86_32
9925 return dma_ops;
9926 @@ -44,7 +44,7 @@ static inline struct dma_map_ops *get_dma_ops(struct device *dev)
9927 /* Make sure we keep the same behaviour */
9928 static inline int dma_mapping_error(struct device *dev, dma_addr_t dma_addr)
9929 {
9930 - struct dma_map_ops *ops = get_dma_ops(dev);
9931 + const struct dma_map_ops *ops = get_dma_ops(dev);
9932 if (ops->mapping_error)
9933 return ops->mapping_error(dev, dma_addr);
9934
9935 @@ -122,7 +122,7 @@ static inline void *
9936 dma_alloc_coherent(struct device *dev, size_t size, dma_addr_t *dma_handle,
9937 gfp_t gfp)
9938 {
9939 - struct dma_map_ops *ops = get_dma_ops(dev);
9940 + const struct dma_map_ops *ops = get_dma_ops(dev);
9941 void *memory;
9942
9943 gfp &= ~(__GFP_DMA | __GFP_HIGHMEM | __GFP_DMA32);
9944 @@ -149,7 +149,7 @@ dma_alloc_coherent(struct device *dev, size_t size, dma_addr_t *dma_handle,
9945 static inline void dma_free_coherent(struct device *dev, size_t size,
9946 void *vaddr, dma_addr_t bus)
9947 {
9948 - struct dma_map_ops *ops = get_dma_ops(dev);
9949 + const struct dma_map_ops *ops = get_dma_ops(dev);
9950
9951 WARN_ON(irqs_disabled()); /* for portability */
9952
9953 diff --git a/arch/x86/include/asm/e820.h b/arch/x86/include/asm/e820.h
9954 index 40b4e61..40d8133 100644
9955 --- a/arch/x86/include/asm/e820.h
9956 +++ b/arch/x86/include/asm/e820.h
9957 @@ -133,7 +133,7 @@ extern char *default_machine_specific_memory_setup(void);
9958 #define ISA_END_ADDRESS 0x100000
9959 #define is_ISA_range(s, e) ((s) >= ISA_START_ADDRESS && (e) < ISA_END_ADDRESS)
9960
9961 -#define BIOS_BEGIN 0x000a0000
9962 +#define BIOS_BEGIN 0x000c0000
9963 #define BIOS_END 0x00100000
9964
9965 #ifdef __KERNEL__
9966 diff --git a/arch/x86/include/asm/elf.h b/arch/x86/include/asm/elf.h
9967 index 8ac9d9a..0a6c96e 100644
9968 --- a/arch/x86/include/asm/elf.h
9969 +++ b/arch/x86/include/asm/elf.h
9970 @@ -257,7 +257,25 @@ extern int force_personality32;
9971 the loader. We need to make sure that it is out of the way of the program
9972 that it will "exec", and that there is sufficient room for the brk. */
9973
9974 +#ifdef CONFIG_PAX_SEGMEXEC
9975 +#define ELF_ET_DYN_BASE ((current->mm->pax_flags & MF_PAX_SEGMEXEC) ? SEGMEXEC_TASK_SIZE/3*2 : TASK_SIZE/3*2)
9976 +#else
9977 #define ELF_ET_DYN_BASE (TASK_SIZE / 3 * 2)
9978 +#endif
9979 +
9980 +#ifdef CONFIG_PAX_ASLR
9981 +#ifdef CONFIG_X86_32
9982 +#define PAX_ELF_ET_DYN_BASE 0x10000000UL
9983 +
9984 +#define PAX_DELTA_MMAP_LEN (current->mm->pax_flags & MF_PAX_SEGMEXEC ? 15 : 16)
9985 +#define PAX_DELTA_STACK_LEN (current->mm->pax_flags & MF_PAX_SEGMEXEC ? 15 : 16)
9986 +#else
9987 +#define PAX_ELF_ET_DYN_BASE 0x400000UL
9988 +
9989 +#define PAX_DELTA_MMAP_LEN ((test_thread_flag(TIF_IA32)) ? 16 : TASK_SIZE_MAX_SHIFT - PAGE_SHIFT - 3)
9990 +#define PAX_DELTA_STACK_LEN ((test_thread_flag(TIF_IA32)) ? 16 : TASK_SIZE_MAX_SHIFT - PAGE_SHIFT - 3)
9991 +#endif
9992 +#endif
9993
9994 /* This yields a mask that user programs can use to figure out what
9995 instruction set this CPU supports. This could be done in user space,
9996 @@ -310,9 +328,7 @@ do { \
9997
9998 #define ARCH_DLINFO \
9999 do { \
10000 - if (vdso_enabled) \
10001 - NEW_AUX_ENT(AT_SYSINFO_EHDR, \
10002 - (unsigned long)current->mm->context.vdso); \
10003 + NEW_AUX_ENT(AT_SYSINFO_EHDR, current->mm->context.vdso); \
10004 } while (0)
10005
10006 #define AT_SYSINFO 32
10007 @@ -323,7 +339,7 @@ do { \
10008
10009 #endif /* !CONFIG_X86_32 */
10010
10011 -#define VDSO_CURRENT_BASE ((unsigned long)current->mm->context.vdso)
10012 +#define VDSO_CURRENT_BASE (current->mm->context.vdso)
10013
10014 #define VDSO_ENTRY \
10015 ((unsigned long)VDSO32_SYMBOL(VDSO_CURRENT_BASE, vsyscall))
10016 @@ -337,7 +353,4 @@ extern int arch_setup_additional_pages(struct linux_binprm *bprm,
10017 extern int syscall32_setup_pages(struct linux_binprm *, int exstack);
10018 #define compat_arch_setup_additional_pages syscall32_setup_pages
10019
10020 -extern unsigned long arch_randomize_brk(struct mm_struct *mm);
10021 -#define arch_randomize_brk arch_randomize_brk
10022 -
10023 #endif /* _ASM_X86_ELF_H */
10024 diff --git a/arch/x86/include/asm/emergency-restart.h b/arch/x86/include/asm/emergency-restart.h
10025 index cc70c1c..d96d011 100644
10026 --- a/arch/x86/include/asm/emergency-restart.h
10027 +++ b/arch/x86/include/asm/emergency-restart.h
10028 @@ -15,6 +15,6 @@ enum reboot_type {
10029
10030 extern enum reboot_type reboot_type;
10031
10032 -extern void machine_emergency_restart(void);
10033 +extern void machine_emergency_restart(void) __noreturn;
10034
10035 #endif /* _ASM_X86_EMERGENCY_RESTART_H */
10036 diff --git a/arch/x86/include/asm/futex.h b/arch/x86/include/asm/futex.h
10037 index 1f11ce4..7caabd1 100644
10038 --- a/arch/x86/include/asm/futex.h
10039 +++ b/arch/x86/include/asm/futex.h
10040 @@ -12,16 +12,18 @@
10041 #include <asm/system.h>
10042
10043 #define __futex_atomic_op1(insn, ret, oldval, uaddr, oparg) \
10044 + typecheck(u32 __user *, uaddr); \
10045 asm volatile("1:\t" insn "\n" \
10046 "2:\t.section .fixup,\"ax\"\n" \
10047 "3:\tmov\t%3, %1\n" \
10048 "\tjmp\t2b\n" \
10049 "\t.previous\n" \
10050 _ASM_EXTABLE(1b, 3b) \
10051 - : "=r" (oldval), "=r" (ret), "+m" (*uaddr) \
10052 + : "=r" (oldval), "=r" (ret), "+m" (*(u32 __user *)____m(uaddr))\
10053 : "i" (-EFAULT), "0" (oparg), "1" (0))
10054
10055 #define __futex_atomic_op2(insn, ret, oldval, uaddr, oparg) \
10056 + typecheck(u32 __user *, uaddr); \
10057 asm volatile("1:\tmovl %2, %0\n" \
10058 "\tmovl\t%0, %3\n" \
10059 "\t" insn "\n" \
10060 @@ -34,10 +36,10 @@
10061 _ASM_EXTABLE(1b, 4b) \
10062 _ASM_EXTABLE(2b, 4b) \
10063 : "=&a" (oldval), "=&r" (ret), \
10064 - "+m" (*uaddr), "=&r" (tem) \
10065 + "+m" (*(u32 __user *)____m(uaddr)), "=&r" (tem) \
10066 : "r" (oparg), "i" (-EFAULT), "1" (0))
10067
10068 -static inline int futex_atomic_op_inuser(int encoded_op, int __user *uaddr)
10069 +static inline int futex_atomic_op_inuser(int encoded_op, u32 __user *uaddr)
10070 {
10071 int op = (encoded_op >> 28) & 7;
10072 int cmp = (encoded_op >> 24) & 15;
10073 @@ -61,10 +63,10 @@ static inline int futex_atomic_op_inuser(int encoded_op, int __user *uaddr)
10074
10075 switch (op) {
10076 case FUTEX_OP_SET:
10077 - __futex_atomic_op1("xchgl %0, %2", ret, oldval, uaddr, oparg);
10078 + __futex_atomic_op1(__copyuser_seg"xchgl %0, %2", ret, oldval, uaddr, oparg);
10079 break;
10080 case FUTEX_OP_ADD:
10081 - __futex_atomic_op1(LOCK_PREFIX "xaddl %0, %2", ret, oldval,
10082 + __futex_atomic_op1(LOCK_PREFIX __copyuser_seg"xaddl %0, %2", ret, oldval,
10083 uaddr, oparg);
10084 break;
10085 case FUTEX_OP_OR:
10086 @@ -109,7 +111,7 @@ static inline int futex_atomic_op_inuser(int encoded_op, int __user *uaddr)
10087 return ret;
10088 }
10089
10090 -static inline int futex_atomic_cmpxchg_inatomic(int __user *uaddr, int oldval,
10091 +static inline int futex_atomic_cmpxchg_inatomic(u32 __user *uaddr, int oldval,
10092 int newval)
10093 {
10094
10095 @@ -119,16 +121,16 @@ static inline int futex_atomic_cmpxchg_inatomic(int __user *uaddr, int oldval,
10096 return -ENOSYS;
10097 #endif
10098
10099 - if (!access_ok(VERIFY_WRITE, uaddr, sizeof(int)))
10100 + if (!access_ok(VERIFY_WRITE, uaddr, sizeof(u32)))
10101 return -EFAULT;
10102
10103 - asm volatile("1:\t" LOCK_PREFIX "cmpxchgl %3, %1\n"
10104 + asm volatile("1:\t" LOCK_PREFIX __copyuser_seg"cmpxchgl %3, %1\n"
10105 "2:\t.section .fixup, \"ax\"\n"
10106 "3:\tmov %2, %0\n"
10107 "\tjmp 2b\n"
10108 "\t.previous\n"
10109 _ASM_EXTABLE(1b, 3b)
10110 - : "=a" (oldval), "+m" (*uaddr)
10111 + : "=a" (oldval), "+m" (*(u32 *)____m(uaddr))
10112 : "i" (-EFAULT), "r" (newval), "0" (oldval)
10113 : "memory"
10114 );
10115 diff --git a/arch/x86/include/asm/hw_irq.h b/arch/x86/include/asm/hw_irq.h
10116 index ba180d9..3bad351 100644
10117 --- a/arch/x86/include/asm/hw_irq.h
10118 +++ b/arch/x86/include/asm/hw_irq.h
10119 @@ -92,8 +92,8 @@ extern void setup_ioapic_dest(void);
10120 extern void enable_IO_APIC(void);
10121
10122 /* Statistics */
10123 -extern atomic_t irq_err_count;
10124 -extern atomic_t irq_mis_count;
10125 +extern atomic_unchecked_t irq_err_count;
10126 +extern atomic_unchecked_t irq_mis_count;
10127
10128 /* EISA */
10129 extern void eisa_set_level_irq(unsigned int irq);
10130 diff --git a/arch/x86/include/asm/i387.h b/arch/x86/include/asm/i387.h
10131 index 0b20bbb..4cb1396 100644
10132 --- a/arch/x86/include/asm/i387.h
10133 +++ b/arch/x86/include/asm/i387.h
10134 @@ -60,6 +60,11 @@ static inline int fxrstor_checking(struct i387_fxsave_struct *fx)
10135 {
10136 int err;
10137
10138 +#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
10139 + if ((unsigned long)fx < PAX_USER_SHADOW_BASE)
10140 + fx = (struct i387_fxsave_struct *)((void *)fx + PAX_USER_SHADOW_BASE);
10141 +#endif
10142 +
10143 asm volatile("1: rex64/fxrstor (%[fx])\n\t"
10144 "2:\n"
10145 ".section .fixup,\"ax\"\n"
10146 @@ -105,6 +110,11 @@ static inline int fxsave_user(struct i387_fxsave_struct __user *fx)
10147 {
10148 int err;
10149
10150 +#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
10151 + if ((unsigned long)fx < PAX_USER_SHADOW_BASE)
10152 + fx = (struct i387_fxsave_struct __user *)((void __user *)fx + PAX_USER_SHADOW_BASE);
10153 +#endif
10154 +
10155 asm volatile("1: rex64/fxsave (%[fx])\n\t"
10156 "2:\n"
10157 ".section .fixup,\"ax\"\n"
10158 @@ -195,13 +205,8 @@ static inline int fxrstor_checking(struct i387_fxsave_struct *fx)
10159 }
10160
10161 /* We need a safe address that is cheap to find and that is already
10162 - in L1 during context switch. The best choices are unfortunately
10163 - different for UP and SMP */
10164 -#ifdef CONFIG_SMP
10165 -#define safe_address (__per_cpu_offset[0])
10166 -#else
10167 -#define safe_address (kstat_cpu(0).cpustat.user)
10168 -#endif
10169 + in L1 during context switch. */
10170 +#define safe_address (init_tss[smp_processor_id()].x86_tss.sp0)
10171
10172 /*
10173 * These must be called with preempt disabled
10174 @@ -291,7 +296,7 @@ static inline void kernel_fpu_begin(void)
10175 struct thread_info *me = current_thread_info();
10176 preempt_disable();
10177 if (me->status & TS_USEDFPU)
10178 - __save_init_fpu(me->task);
10179 + __save_init_fpu(current);
10180 else
10181 clts();
10182 }
10183 diff --git a/arch/x86/include/asm/io_32.h b/arch/x86/include/asm/io_32.h
10184 index a299900..15c5410 100644
10185 --- a/arch/x86/include/asm/io_32.h
10186 +++ b/arch/x86/include/asm/io_32.h
10187 @@ -3,6 +3,7 @@
10188
10189 #include <linux/string.h>
10190 #include <linux/compiler.h>
10191 +#include <asm/processor.h>
10192
10193 /*
10194 * This file contains the definitions for the x86 IO instructions
10195 @@ -42,6 +43,17 @@
10196
10197 #ifdef __KERNEL__
10198
10199 +#define ARCH_HAS_VALID_PHYS_ADDR_RANGE
10200 +static inline int valid_phys_addr_range(unsigned long addr, size_t count)
10201 +{
10202 + return ((addr + count + PAGE_SIZE - 1) >> PAGE_SHIFT) < (1ULL << (boot_cpu_data.x86_phys_bits - PAGE_SHIFT)) ? 1 : 0;
10203 +}
10204 +
10205 +static inline int valid_mmap_phys_addr_range(unsigned long pfn, size_t count)
10206 +{
10207 + return (pfn + (count >> PAGE_SHIFT)) < (1ULL << (boot_cpu_data.x86_phys_bits - PAGE_SHIFT)) ? 1 : 0;
10208 +}
10209 +
10210 #include <asm-generic/iomap.h>
10211
10212 #include <linux/vmalloc.h>
10213 diff --git a/arch/x86/include/asm/io_64.h b/arch/x86/include/asm/io_64.h
10214 index 2440678..c158b88 100644
10215 --- a/arch/x86/include/asm/io_64.h
10216 +++ b/arch/x86/include/asm/io_64.h
10217 @@ -140,6 +140,17 @@ __OUTS(l)
10218
10219 #include <linux/vmalloc.h>
10220
10221 +#define ARCH_HAS_VALID_PHYS_ADDR_RANGE
10222 +static inline int valid_phys_addr_range(unsigned long addr, size_t count)
10223 +{
10224 + return ((addr + count + PAGE_SIZE - 1) >> PAGE_SHIFT) < (1ULL << (boot_cpu_data.x86_phys_bits - PAGE_SHIFT)) ? 1 : 0;
10225 +}
10226 +
10227 +static inline int valid_mmap_phys_addr_range(unsigned long pfn, size_t count)
10228 +{
10229 + return (pfn + (count >> PAGE_SHIFT)) < (1ULL << (boot_cpu_data.x86_phys_bits - PAGE_SHIFT)) ? 1 : 0;
10230 +}
10231 +
10232 #include <asm-generic/iomap.h>
10233
10234 void __memcpy_fromio(void *, unsigned long, unsigned);
10235 diff --git a/arch/x86/include/asm/iommu.h b/arch/x86/include/asm/iommu.h
10236 index fd6d21b..8b13915 100644
10237 --- a/arch/x86/include/asm/iommu.h
10238 +++ b/arch/x86/include/asm/iommu.h
10239 @@ -3,7 +3,7 @@
10240
10241 extern void pci_iommu_shutdown(void);
10242 extern void no_iommu_init(void);
10243 -extern struct dma_map_ops nommu_dma_ops;
10244 +extern const struct dma_map_ops nommu_dma_ops;
10245 extern int force_iommu, no_iommu;
10246 extern int iommu_detected;
10247 extern int iommu_pass_through;
10248 diff --git a/arch/x86/include/asm/irqflags.h b/arch/x86/include/asm/irqflags.h
10249 index 9e2b952..557206e 100644
10250 --- a/arch/x86/include/asm/irqflags.h
10251 +++ b/arch/x86/include/asm/irqflags.h
10252 @@ -142,6 +142,11 @@ static inline unsigned long __raw_local_irq_save(void)
10253 sti; \
10254 sysexit
10255
10256 +#define GET_CR0_INTO_RDI mov %cr0, %rdi
10257 +#define SET_RDI_INTO_CR0 mov %rdi, %cr0
10258 +#define GET_CR3_INTO_RDI mov %cr3, %rdi
10259 +#define SET_RDI_INTO_CR3 mov %rdi, %cr3
10260 +
10261 #else
10262 #define INTERRUPT_RETURN iret
10263 #define ENABLE_INTERRUPTS_SYSEXIT sti; sysexit
10264 diff --git a/arch/x86/include/asm/kprobes.h b/arch/x86/include/asm/kprobes.h
10265 index 4fe681d..bb6d40c 100644
10266 --- a/arch/x86/include/asm/kprobes.h
10267 +++ b/arch/x86/include/asm/kprobes.h
10268 @@ -34,13 +34,8 @@ typedef u8 kprobe_opcode_t;
10269 #define BREAKPOINT_INSTRUCTION 0xcc
10270 #define RELATIVEJUMP_INSTRUCTION 0xe9
10271 #define MAX_INSN_SIZE 16
10272 -#define MAX_STACK_SIZE 64
10273 -#define MIN_STACK_SIZE(ADDR) \
10274 - (((MAX_STACK_SIZE) < (((unsigned long)current_thread_info()) + \
10275 - THREAD_SIZE - (unsigned long)(ADDR))) \
10276 - ? (MAX_STACK_SIZE) \
10277 - : (((unsigned long)current_thread_info()) + \
10278 - THREAD_SIZE - (unsigned long)(ADDR)))
10279 +#define MAX_STACK_SIZE 64UL
10280 +#define MIN_STACK_SIZE(ADDR) min(MAX_STACK_SIZE, current->thread.sp0 - (unsigned long)(ADDR))
10281
10282 #define flush_insn_slot(p) do { } while (0)
10283
10284 diff --git a/arch/x86/include/asm/kvm_host.h b/arch/x86/include/asm/kvm_host.h
10285 index 08bc2ff..2e88d1f 100644
10286 --- a/arch/x86/include/asm/kvm_host.h
10287 +++ b/arch/x86/include/asm/kvm_host.h
10288 @@ -534,9 +534,9 @@ struct kvm_x86_ops {
10289 bool (*gb_page_enable)(void);
10290
10291 const struct trace_print_flags *exit_reasons_str;
10292 -};
10293 +} __do_const;
10294
10295 -extern struct kvm_x86_ops *kvm_x86_ops;
10296 +extern const struct kvm_x86_ops *kvm_x86_ops;
10297
10298 int kvm_mmu_module_init(void);
10299 void kvm_mmu_module_exit(void);
10300 diff --git a/arch/x86/include/asm/local.h b/arch/x86/include/asm/local.h
10301 index 47b9b6f..815aaa1 100644
10302 --- a/arch/x86/include/asm/local.h
10303 +++ b/arch/x86/include/asm/local.h
10304 @@ -18,26 +18,58 @@ typedef struct {
10305
10306 static inline void local_inc(local_t *l)
10307 {
10308 - asm volatile(_ASM_INC "%0"
10309 + asm volatile(_ASM_INC "%0\n"
10310 +
10311 +#ifdef CONFIG_PAX_REFCOUNT
10312 + "jno 0f\n"
10313 + _ASM_DEC "%0\n"
10314 + "int $4\n0:\n"
10315 + _ASM_EXTABLE(0b, 0b)
10316 +#endif
10317 +
10318 : "+m" (l->a.counter));
10319 }
10320
10321 static inline void local_dec(local_t *l)
10322 {
10323 - asm volatile(_ASM_DEC "%0"
10324 + asm volatile(_ASM_DEC "%0\n"
10325 +
10326 +#ifdef CONFIG_PAX_REFCOUNT
10327 + "jno 0f\n"
10328 + _ASM_INC "%0\n"
10329 + "int $4\n0:\n"
10330 + _ASM_EXTABLE(0b, 0b)
10331 +#endif
10332 +
10333 : "+m" (l->a.counter));
10334 }
10335
10336 static inline void local_add(long i, local_t *l)
10337 {
10338 - asm volatile(_ASM_ADD "%1,%0"
10339 + asm volatile(_ASM_ADD "%1,%0\n"
10340 +
10341 +#ifdef CONFIG_PAX_REFCOUNT
10342 + "jno 0f\n"
10343 + _ASM_SUB "%1,%0\n"
10344 + "int $4\n0:\n"
10345 + _ASM_EXTABLE(0b, 0b)
10346 +#endif
10347 +
10348 : "+m" (l->a.counter)
10349 : "ir" (i));
10350 }
10351
10352 static inline void local_sub(long i, local_t *l)
10353 {
10354 - asm volatile(_ASM_SUB "%1,%0"
10355 + asm volatile(_ASM_SUB "%1,%0\n"
10356 +
10357 +#ifdef CONFIG_PAX_REFCOUNT
10358 + "jno 0f\n"
10359 + _ASM_ADD "%1,%0\n"
10360 + "int $4\n0:\n"
10361 + _ASM_EXTABLE(0b, 0b)
10362 +#endif
10363 +
10364 : "+m" (l->a.counter)
10365 : "ir" (i));
10366 }
10367 @@ -55,7 +87,16 @@ static inline int local_sub_and_test(long i, local_t *l)
10368 {
10369 unsigned char c;
10370
10371 - asm volatile(_ASM_SUB "%2,%0; sete %1"
10372 + asm volatile(_ASM_SUB "%2,%0\n"
10373 +
10374 +#ifdef CONFIG_PAX_REFCOUNT
10375 + "jno 0f\n"
10376 + _ASM_ADD "%2,%0\n"
10377 + "int $4\n0:\n"
10378 + _ASM_EXTABLE(0b, 0b)
10379 +#endif
10380 +
10381 + "sete %1\n"
10382 : "+m" (l->a.counter), "=qm" (c)
10383 : "ir" (i) : "memory");
10384 return c;
10385 @@ -73,7 +114,16 @@ static inline int local_dec_and_test(local_t *l)
10386 {
10387 unsigned char c;
10388
10389 - asm volatile(_ASM_DEC "%0; sete %1"
10390 + asm volatile(_ASM_DEC "%0\n"
10391 +
10392 +#ifdef CONFIG_PAX_REFCOUNT
10393 + "jno 0f\n"
10394 + _ASM_INC "%0\n"
10395 + "int $4\n0:\n"
10396 + _ASM_EXTABLE(0b, 0b)
10397 +#endif
10398 +
10399 + "sete %1\n"
10400 : "+m" (l->a.counter), "=qm" (c)
10401 : : "memory");
10402 return c != 0;
10403 @@ -91,7 +141,16 @@ static inline int local_inc_and_test(local_t *l)
10404 {
10405 unsigned char c;
10406
10407 - asm volatile(_ASM_INC "%0; sete %1"
10408 + asm volatile(_ASM_INC "%0\n"
10409 +
10410 +#ifdef CONFIG_PAX_REFCOUNT
10411 + "jno 0f\n"
10412 + _ASM_DEC "%0\n"
10413 + "int $4\n0:\n"
10414 + _ASM_EXTABLE(0b, 0b)
10415 +#endif
10416 +
10417 + "sete %1\n"
10418 : "+m" (l->a.counter), "=qm" (c)
10419 : : "memory");
10420 return c != 0;
10421 @@ -110,7 +169,16 @@ static inline int local_add_negative(long i, local_t *l)
10422 {
10423 unsigned char c;
10424
10425 - asm volatile(_ASM_ADD "%2,%0; sets %1"
10426 + asm volatile(_ASM_ADD "%2,%0\n"
10427 +
10428 +#ifdef CONFIG_PAX_REFCOUNT
10429 + "jno 0f\n"
10430 + _ASM_SUB "%2,%0\n"
10431 + "int $4\n0:\n"
10432 + _ASM_EXTABLE(0b, 0b)
10433 +#endif
10434 +
10435 + "sets %1\n"
10436 : "+m" (l->a.counter), "=qm" (c)
10437 : "ir" (i) : "memory");
10438 return c;
10439 @@ -133,7 +201,15 @@ static inline long local_add_return(long i, local_t *l)
10440 #endif
10441 /* Modern 486+ processor */
10442 __i = i;
10443 - asm volatile(_ASM_XADD "%0, %1;"
10444 + asm volatile(_ASM_XADD "%0, %1\n"
10445 +
10446 +#ifdef CONFIG_PAX_REFCOUNT
10447 + "jno 0f\n"
10448 + _ASM_MOV "%0,%1\n"
10449 + "int $4\n0:\n"
10450 + _ASM_EXTABLE(0b, 0b)
10451 +#endif
10452 +
10453 : "+r" (i), "+m" (l->a.counter)
10454 : : "memory");
10455 return i + __i;
10456 diff --git a/arch/x86/include/asm/microcode.h b/arch/x86/include/asm/microcode.h
10457 index ef51b50..514ba37 100644
10458 --- a/arch/x86/include/asm/microcode.h
10459 +++ b/arch/x86/include/asm/microcode.h
10460 @@ -12,13 +12,13 @@ struct device;
10461 enum ucode_state { UCODE_ERROR, UCODE_OK, UCODE_NFOUND };
10462
10463 struct microcode_ops {
10464 - enum ucode_state (*request_microcode_user) (int cpu,
10465 + enum ucode_state (* const request_microcode_user) (int cpu,
10466 const void __user *buf, size_t size);
10467
10468 - enum ucode_state (*request_microcode_fw) (int cpu,
10469 + enum ucode_state (* const request_microcode_fw) (int cpu,
10470 struct device *device);
10471
10472 - void (*microcode_fini_cpu) (int cpu);
10473 + void (* const microcode_fini_cpu) (int cpu);
10474
10475 /*
10476 * The generic 'microcode_core' part guarantees that
10477 @@ -38,18 +38,18 @@ struct ucode_cpu_info {
10478 extern struct ucode_cpu_info ucode_cpu_info[];
10479
10480 #ifdef CONFIG_MICROCODE_INTEL
10481 -extern struct microcode_ops * __init init_intel_microcode(void);
10482 +extern const struct microcode_ops * __init init_intel_microcode(void);
10483 #else
10484 -static inline struct microcode_ops * __init init_intel_microcode(void)
10485 +static inline const struct microcode_ops * __init init_intel_microcode(void)
10486 {
10487 return NULL;
10488 }
10489 #endif /* CONFIG_MICROCODE_INTEL */
10490
10491 #ifdef CONFIG_MICROCODE_AMD
10492 -extern struct microcode_ops * __init init_amd_microcode(void);
10493 +extern const struct microcode_ops * __init init_amd_microcode(void);
10494 #else
10495 -static inline struct microcode_ops * __init init_amd_microcode(void)
10496 +static inline const struct microcode_ops * __init init_amd_microcode(void)
10497 {
10498 return NULL;
10499 }
10500 diff --git a/arch/x86/include/asm/mman.h b/arch/x86/include/asm/mman.h
10501 index 593e51d..fa69c9a 100644
10502 --- a/arch/x86/include/asm/mman.h
10503 +++ b/arch/x86/include/asm/mman.h
10504 @@ -5,4 +5,14 @@
10505
10506 #include <asm-generic/mman.h>
10507
10508 +#ifdef __KERNEL__
10509 +#ifndef __ASSEMBLY__
10510 +#ifdef CONFIG_X86_32
10511 +#define arch_mmap_check i386_mmap_check
10512 +int i386_mmap_check(unsigned long addr, unsigned long len,
10513 + unsigned long flags);
10514 +#endif
10515 +#endif
10516 +#endif
10517 +
10518 #endif /* _ASM_X86_MMAN_H */
10519 diff --git a/arch/x86/include/asm/mmu.h b/arch/x86/include/asm/mmu.h
10520 index 80a1dee..239c67d 100644
10521 --- a/arch/x86/include/asm/mmu.h
10522 +++ b/arch/x86/include/asm/mmu.h
10523 @@ -9,10 +9,23 @@
10524 * we put the segment information here.
10525 */
10526 typedef struct {
10527 - void *ldt;
10528 + struct desc_struct *ldt;
10529 int size;
10530 struct mutex lock;
10531 - void *vdso;
10532 + unsigned long vdso;
10533 +
10534 +#ifdef CONFIG_X86_32
10535 +#if defined(CONFIG_PAX_PAGEEXEC) || defined(CONFIG_PAX_SEGMEXEC)
10536 + unsigned long user_cs_base;
10537 + unsigned long user_cs_limit;
10538 +
10539 +#if defined(CONFIG_PAX_PAGEEXEC) && defined(CONFIG_SMP)
10540 + cpumask_t cpu_user_cs_mask;
10541 +#endif
10542 +
10543 +#endif
10544 +#endif
10545 +
10546 } mm_context_t;
10547
10548 #ifdef CONFIG_SMP
10549 diff --git a/arch/x86/include/asm/mmu_context.h b/arch/x86/include/asm/mmu_context.h
10550 index 8b5393e..8143173 100644
10551 --- a/arch/x86/include/asm/mmu_context.h
10552 +++ b/arch/x86/include/asm/mmu_context.h
10553 @@ -24,6 +24,18 @@ void destroy_context(struct mm_struct *mm);
10554
10555 static inline void enter_lazy_tlb(struct mm_struct *mm, struct task_struct *tsk)
10556 {
10557 +
10558 +#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
10559 + unsigned int i;
10560 + pgd_t *pgd;
10561 +
10562 + pax_open_kernel();
10563 + pgd = get_cpu_pgd(smp_processor_id());
10564 + for (i = USER_PGD_PTRS; i < 2 * USER_PGD_PTRS; ++i)
10565 + set_pgd_batched(pgd+i, native_make_pgd(0));
10566 + pax_close_kernel();
10567 +#endif
10568 +
10569 #ifdef CONFIG_SMP
10570 if (percpu_read(cpu_tlbstate.state) == TLBSTATE_OK)
10571 percpu_write(cpu_tlbstate.state, TLBSTATE_LAZY);
10572 @@ -34,16 +46,30 @@ static inline void switch_mm(struct mm_struct *prev, struct mm_struct *next,
10573 struct task_struct *tsk)
10574 {
10575 unsigned cpu = smp_processor_id();
10576 +#if defined(CONFIG_X86_32) && (defined(CONFIG_PAX_PAGEEXEC) || defined(CONFIG_PAX_SEGMEXEC)) && defined(CONFIG_SMP)
10577 + int tlbstate = TLBSTATE_OK;
10578 +#endif
10579
10580 if (likely(prev != next)) {
10581 #ifdef CONFIG_SMP
10582 +#if defined(CONFIG_X86_32) && (defined(CONFIG_PAX_PAGEEXEC) || defined(CONFIG_PAX_SEGMEXEC))
10583 + tlbstate = percpu_read(cpu_tlbstate.state);
10584 +#endif
10585 percpu_write(cpu_tlbstate.state, TLBSTATE_OK);
10586 percpu_write(cpu_tlbstate.active_mm, next);
10587 #endif
10588 cpumask_set_cpu(cpu, mm_cpumask(next));
10589
10590 /* Re-load page tables */
10591 +#ifdef CONFIG_PAX_PER_CPU_PGD
10592 + pax_open_kernel();
10593 + __clone_user_pgds(get_cpu_pgd(cpu), next->pgd, USER_PGD_PTRS);
10594 + __shadow_user_pgds(get_cpu_pgd(cpu) + USER_PGD_PTRS, next->pgd, USER_PGD_PTRS);
10595 + pax_close_kernel();
10596 + load_cr3(get_cpu_pgd(cpu));
10597 +#else
10598 load_cr3(next->pgd);
10599 +#endif
10600
10601 /* stop flush ipis for the previous mm */
10602 cpumask_clear_cpu(cpu, mm_cpumask(prev));
10603 @@ -53,9 +79,38 @@ static inline void switch_mm(struct mm_struct *prev, struct mm_struct *next,
10604 */
10605 if (unlikely(prev->context.ldt != next->context.ldt))
10606 load_LDT_nolock(&next->context);
10607 - }
10608 +
10609 +#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_PAGEEXEC) && defined(CONFIG_SMP)
10610 + if (!nx_enabled) {
10611 + smp_mb__before_clear_bit();
10612 + cpu_clear(cpu, prev->context.cpu_user_cs_mask);
10613 + smp_mb__after_clear_bit();
10614 + cpu_set(cpu, next->context.cpu_user_cs_mask);
10615 + }
10616 +#endif
10617 +
10618 +#if defined(CONFIG_X86_32) && (defined(CONFIG_PAX_PAGEEXEC) || defined(CONFIG_PAX_SEGMEXEC))
10619 + if (unlikely(prev->context.user_cs_base != next->context.user_cs_base ||
10620 + prev->context.user_cs_limit != next->context.user_cs_limit))
10621 + set_user_cs(next->context.user_cs_base, next->context.user_cs_limit, cpu);
10622 #ifdef CONFIG_SMP
10623 + else if (unlikely(tlbstate != TLBSTATE_OK))
10624 + set_user_cs(next->context.user_cs_base, next->context.user_cs_limit, cpu);
10625 +#endif
10626 +#endif
10627 +
10628 + }
10629 else {
10630 +
10631 +#ifdef CONFIG_PAX_PER_CPU_PGD
10632 + pax_open_kernel();
10633 + __clone_user_pgds(get_cpu_pgd(cpu), next->pgd, USER_PGD_PTRS);
10634 + __shadow_user_pgds(get_cpu_pgd(cpu) + USER_PGD_PTRS, next->pgd, USER_PGD_PTRS);
10635 + pax_close_kernel();
10636 + load_cr3(get_cpu_pgd(cpu));
10637 +#endif
10638 +
10639 +#ifdef CONFIG_SMP
10640 percpu_write(cpu_tlbstate.state, TLBSTATE_OK);
10641 BUG_ON(percpu_read(cpu_tlbstate.active_mm) != next);
10642
10643 @@ -64,11 +119,28 @@ static inline void switch_mm(struct mm_struct *prev, struct mm_struct *next,
10644 * tlb flush IPI delivery. We must reload CR3
10645 * to make sure to use no freed page tables.
10646 */
10647 +
10648 +#ifndef CONFIG_PAX_PER_CPU_PGD
10649 load_cr3(next->pgd);
10650 +#endif
10651 +
10652 load_LDT_nolock(&next->context);
10653 +
10654 +#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_PAGEEXEC)
10655 + if (!nx_enabled)
10656 + cpu_set(cpu, next->context.cpu_user_cs_mask);
10657 +#endif
10658 +
10659 +#if defined(CONFIG_X86_32) && (defined(CONFIG_PAX_PAGEEXEC) || defined(CONFIG_PAX_SEGMEXEC))
10660 +#ifdef CONFIG_PAX_PAGEEXEC
10661 + if (!((next->pax_flags & MF_PAX_PAGEEXEC) && nx_enabled))
10662 +#endif
10663 + set_user_cs(next->context.user_cs_base, next->context.user_cs_limit, cpu);
10664 +#endif
10665 +
10666 }
10667 +#endif
10668 }
10669 -#endif
10670 }
10671
10672 #define activate_mm(prev, next) \
10673 diff --git a/arch/x86/include/asm/module.h b/arch/x86/include/asm/module.h
10674 index 3e2ce58..caaf478 100644
10675 --- a/arch/x86/include/asm/module.h
10676 +++ b/arch/x86/include/asm/module.h
10677 @@ -5,6 +5,7 @@
10678
10679 #ifdef CONFIG_X86_64
10680 /* X86_64 does not define MODULE_PROC_FAMILY */
10681 +#define MODULE_PROC_FAMILY ""
10682 #elif defined CONFIG_M386
10683 #define MODULE_PROC_FAMILY "386 "
10684 #elif defined CONFIG_M486
10685 @@ -59,13 +60,26 @@
10686 #error unknown processor family
10687 #endif
10688
10689 -#ifdef CONFIG_X86_32
10690 -# ifdef CONFIG_4KSTACKS
10691 -# define MODULE_STACKSIZE "4KSTACKS "
10692 -# else
10693 -# define MODULE_STACKSIZE ""
10694 -# endif
10695 -# define MODULE_ARCH_VERMAGIC MODULE_PROC_FAMILY MODULE_STACKSIZE
10696 +#if defined(CONFIG_X86_32) && defined(CONFIG_4KSTACKS)
10697 +#define MODULE_STACKSIZE "4KSTACKS "
10698 +#else
10699 +#define MODULE_STACKSIZE ""
10700 #endif
10701
10702 +#ifdef CONFIG_PAX_KERNEXEC_PLUGIN_METHOD_BTS
10703 +#define MODULE_PAX_KERNEXEC "KERNEXEC_BTS "
10704 +#elif defined(CONFIG_PAX_KERNEXEC_PLUGIN_METHOD_OR)
10705 +#define MODULE_PAX_KERNEXEC "KERNEXEC_OR "
10706 +#else
10707 +#define MODULE_PAX_KERNEXEC ""
10708 +#endif
10709 +
10710 +#ifdef CONFIG_PAX_MEMORY_UDEREF
10711 +#define MODULE_PAX_UDEREF "UDEREF "
10712 +#else
10713 +#define MODULE_PAX_UDEREF ""
10714 +#endif
10715 +
10716 +#define MODULE_ARCH_VERMAGIC MODULE_PROC_FAMILY MODULE_STACKSIZE MODULE_PAX_KERNEXEC MODULE_PAX_UDEREF
10717 +
10718 #endif /* _ASM_X86_MODULE_H */
10719 diff --git a/arch/x86/include/asm/page_64_types.h b/arch/x86/include/asm/page_64_types.h
10720 index 7639dbf..e08a58c 100644
10721 --- a/arch/x86/include/asm/page_64_types.h
10722 +++ b/arch/x86/include/asm/page_64_types.h
10723 @@ -56,7 +56,7 @@ void copy_page(void *to, void *from);
10724
10725 /* duplicated to the one in bootmem.h */
10726 extern unsigned long max_pfn;
10727 -extern unsigned long phys_base;
10728 +extern const unsigned long phys_base;
10729
10730 extern unsigned long __phys_addr(unsigned long);
10731 #define __phys_reloc_hide(x) (x)
10732 diff --git a/arch/x86/include/asm/paravirt.h b/arch/x86/include/asm/paravirt.h
10733 index efb3899..ef30687 100644
10734 --- a/arch/x86/include/asm/paravirt.h
10735 +++ b/arch/x86/include/asm/paravirt.h
10736 @@ -648,6 +648,18 @@ static inline void set_pgd(pgd_t *pgdp, pgd_t pgd)
10737 val);
10738 }
10739
10740 +static inline void set_pgd_batched(pgd_t *pgdp, pgd_t pgd)
10741 +{
10742 + pgdval_t val = native_pgd_val(pgd);
10743 +
10744 + if (sizeof(pgdval_t) > sizeof(long))
10745 + PVOP_VCALL3(pv_mmu_ops.set_pgd_batched, pgdp,
10746 + val, (u64)val >> 32);
10747 + else
10748 + PVOP_VCALL2(pv_mmu_ops.set_pgd_batched, pgdp,
10749 + val);
10750 +}
10751 +
10752 static inline void pgd_clear(pgd_t *pgdp)
10753 {
10754 set_pgd(pgdp, __pgd(0));
10755 @@ -729,6 +741,21 @@ static inline void __set_fixmap(unsigned /* enum fixed_addresses */ idx,
10756 pv_mmu_ops.set_fixmap(idx, phys, flags);
10757 }
10758
10759 +#ifdef CONFIG_PAX_KERNEXEC
10760 +static inline unsigned long pax_open_kernel(void)
10761 +{
10762 + return PVOP_CALL0(unsigned long, pv_mmu_ops.pax_open_kernel);
10763 +}
10764 +
10765 +static inline unsigned long pax_close_kernel(void)
10766 +{
10767 + return PVOP_CALL0(unsigned long, pv_mmu_ops.pax_close_kernel);
10768 +}
10769 +#else
10770 +static inline unsigned long pax_open_kernel(void) { return 0; }
10771 +static inline unsigned long pax_close_kernel(void) { return 0; }
10772 +#endif
10773 +
10774 #if defined(CONFIG_SMP) && defined(CONFIG_PARAVIRT_SPINLOCKS)
10775
10776 static inline int __raw_spin_is_locked(struct raw_spinlock *lock)
10777 @@ -945,7 +972,7 @@ extern void default_banner(void);
10778
10779 #define PARA_PATCH(struct, off) ((PARAVIRT_PATCH_##struct + (off)) / 4)
10780 #define PARA_SITE(ptype, clobbers, ops) _PVSITE(ptype, clobbers, ops, .long, 4)
10781 -#define PARA_INDIRECT(addr) *%cs:addr
10782 +#define PARA_INDIRECT(addr) *%ss:addr
10783 #endif
10784
10785 #define INTERRUPT_RETURN \
10786 @@ -1022,6 +1049,21 @@ extern void default_banner(void);
10787 PARA_SITE(PARA_PATCH(pv_cpu_ops, PV_CPU_irq_enable_sysexit), \
10788 CLBR_NONE, \
10789 jmp PARA_INDIRECT(pv_cpu_ops+PV_CPU_irq_enable_sysexit))
10790 +
10791 +#define GET_CR0_INTO_RDI \
10792 + call PARA_INDIRECT(pv_cpu_ops+PV_CPU_read_cr0); \
10793 + mov %rax,%rdi
10794 +
10795 +#define SET_RDI_INTO_CR0 \
10796 + call PARA_INDIRECT(pv_cpu_ops+PV_CPU_write_cr0)
10797 +
10798 +#define GET_CR3_INTO_RDI \
10799 + call PARA_INDIRECT(pv_mmu_ops+PV_MMU_read_cr3); \
10800 + mov %rax,%rdi
10801 +
10802 +#define SET_RDI_INTO_CR3 \
10803 + call PARA_INDIRECT(pv_mmu_ops+PV_MMU_write_cr3)
10804 +
10805 #endif /* CONFIG_X86_32 */
10806
10807 #endif /* __ASSEMBLY__ */
10808 diff --git a/arch/x86/include/asm/paravirt_types.h b/arch/x86/include/asm/paravirt_types.h
10809 index 9357473..aeb2de5 100644
10810 --- a/arch/x86/include/asm/paravirt_types.h
10811 +++ b/arch/x86/include/asm/paravirt_types.h
10812 @@ -78,19 +78,19 @@ struct pv_init_ops {
10813 */
10814 unsigned (*patch)(u8 type, u16 clobber, void *insnbuf,
10815 unsigned long addr, unsigned len);
10816 -};
10817 +} __no_const;
10818
10819
10820 struct pv_lazy_ops {
10821 /* Set deferred update mode, used for batching operations. */
10822 void (*enter)(void);
10823 void (*leave)(void);
10824 -};
10825 +} __no_const;
10826
10827 struct pv_time_ops {
10828 unsigned long long (*sched_clock)(void);
10829 unsigned long (*get_tsc_khz)(void);
10830 -};
10831 +} __no_const;
10832
10833 struct pv_cpu_ops {
10834 /* hooks for various privileged instructions */
10835 @@ -186,7 +186,7 @@ struct pv_cpu_ops {
10836
10837 void (*start_context_switch)(struct task_struct *prev);
10838 void (*end_context_switch)(struct task_struct *next);
10839 -};
10840 +} __no_const;
10841
10842 struct pv_irq_ops {
10843 /*
10844 @@ -217,7 +217,7 @@ struct pv_apic_ops {
10845 unsigned long start_eip,
10846 unsigned long start_esp);
10847 #endif
10848 -};
10849 +} __no_const;
10850
10851 struct pv_mmu_ops {
10852 unsigned long (*read_cr2)(void);
10853 @@ -301,6 +301,7 @@ struct pv_mmu_ops {
10854 struct paravirt_callee_save make_pud;
10855
10856 void (*set_pgd)(pgd_t *pudp, pgd_t pgdval);
10857 + void (*set_pgd_batched)(pgd_t *pudp, pgd_t pgdval);
10858 #endif /* PAGETABLE_LEVELS == 4 */
10859 #endif /* PAGETABLE_LEVELS >= 3 */
10860
10861 @@ -316,6 +317,12 @@ struct pv_mmu_ops {
10862 an mfn. We can tell which is which from the index. */
10863 void (*set_fixmap)(unsigned /* enum fixed_addresses */ idx,
10864 phys_addr_t phys, pgprot_t flags);
10865 +
10866 +#ifdef CONFIG_PAX_KERNEXEC
10867 + unsigned long (*pax_open_kernel)(void);
10868 + unsigned long (*pax_close_kernel)(void);
10869 +#endif
10870 +
10871 };
10872
10873 struct raw_spinlock;
10874 @@ -326,7 +333,7 @@ struct pv_lock_ops {
10875 void (*spin_lock_flags)(struct raw_spinlock *lock, unsigned long flags);
10876 int (*spin_trylock)(struct raw_spinlock *lock);
10877 void (*spin_unlock)(struct raw_spinlock *lock);
10878 -};
10879 +} __no_const;
10880
10881 /* This contains all the paravirt structures: we get a convenient
10882 * number for each function using the offset which we use to indicate
10883 diff --git a/arch/x86/include/asm/pci_x86.h b/arch/x86/include/asm/pci_x86.h
10884 index b399988..3f47c38 100644
10885 --- a/arch/x86/include/asm/pci_x86.h
10886 +++ b/arch/x86/include/asm/pci_x86.h
10887 @@ -89,16 +89,16 @@ extern int (*pcibios_enable_irq)(struct pci_dev *dev);
10888 extern void (*pcibios_disable_irq)(struct pci_dev *dev);
10889
10890 struct pci_raw_ops {
10891 - int (*read)(unsigned int domain, unsigned int bus, unsigned int devfn,
10892 + int (* const read)(unsigned int domain, unsigned int bus, unsigned int devfn,
10893 int reg, int len, u32 *val);
10894 - int (*write)(unsigned int domain, unsigned int bus, unsigned int devfn,
10895 + int (* const write)(unsigned int domain, unsigned int bus, unsigned int devfn,
10896 int reg, int len, u32 val);
10897 };
10898
10899 -extern struct pci_raw_ops *raw_pci_ops;
10900 -extern struct pci_raw_ops *raw_pci_ext_ops;
10901 +extern const struct pci_raw_ops *raw_pci_ops;
10902 +extern const struct pci_raw_ops *raw_pci_ext_ops;
10903
10904 -extern struct pci_raw_ops pci_direct_conf1;
10905 +extern const struct pci_raw_ops pci_direct_conf1;
10906 extern bool port_cf9_safe;
10907
10908 /* arch_initcall level */
10909 diff --git a/arch/x86/include/asm/percpu.h b/arch/x86/include/asm/percpu.h
10910 index b65a36d..50345a4 100644
10911 --- a/arch/x86/include/asm/percpu.h
10912 +++ b/arch/x86/include/asm/percpu.h
10913 @@ -78,6 +78,7 @@ do { \
10914 if (0) { \
10915 T__ tmp__; \
10916 tmp__ = (val); \
10917 + (void)tmp__; \
10918 } \
10919 switch (sizeof(var)) { \
10920 case 1: \
10921 diff --git a/arch/x86/include/asm/pgalloc.h b/arch/x86/include/asm/pgalloc.h
10922 index 271de94..ef944d6 100644
10923 --- a/arch/x86/include/asm/pgalloc.h
10924 +++ b/arch/x86/include/asm/pgalloc.h
10925 @@ -63,6 +63,13 @@ static inline void pmd_populate_kernel(struct mm_struct *mm,
10926 pmd_t *pmd, pte_t *pte)
10927 {
10928 paravirt_alloc_pte(mm, __pa(pte) >> PAGE_SHIFT);
10929 + set_pmd(pmd, __pmd(__pa(pte) | _KERNPG_TABLE));
10930 +}
10931 +
10932 +static inline void pmd_populate_user(struct mm_struct *mm,
10933 + pmd_t *pmd, pte_t *pte)
10934 +{
10935 + paravirt_alloc_pte(mm, __pa(pte) >> PAGE_SHIFT);
10936 set_pmd(pmd, __pmd(__pa(pte) | _PAGE_TABLE));
10937 }
10938
10939 diff --git a/arch/x86/include/asm/pgtable-2level.h b/arch/x86/include/asm/pgtable-2level.h
10940 index 2334982..70bc412 100644
10941 --- a/arch/x86/include/asm/pgtable-2level.h
10942 +++ b/arch/x86/include/asm/pgtable-2level.h
10943 @@ -18,7 +18,9 @@ static inline void native_set_pte(pte_t *ptep , pte_t pte)
10944
10945 static inline void native_set_pmd(pmd_t *pmdp, pmd_t pmd)
10946 {
10947 + pax_open_kernel();
10948 *pmdp = pmd;
10949 + pax_close_kernel();
10950 }
10951
10952 static inline void native_set_pte_atomic(pte_t *ptep, pte_t pte)
10953 diff --git a/arch/x86/include/asm/pgtable-3level.h b/arch/x86/include/asm/pgtable-3level.h
10954 index 33927d2..ccde329 100644
10955 --- a/arch/x86/include/asm/pgtable-3level.h
10956 +++ b/arch/x86/include/asm/pgtable-3level.h
10957 @@ -38,12 +38,16 @@ static inline void native_set_pte_atomic(pte_t *ptep, pte_t pte)
10958
10959 static inline void native_set_pmd(pmd_t *pmdp, pmd_t pmd)
10960 {
10961 + pax_open_kernel();
10962 set_64bit((unsigned long long *)(pmdp), native_pmd_val(pmd));
10963 + pax_close_kernel();
10964 }
10965
10966 static inline void native_set_pud(pud_t *pudp, pud_t pud)
10967 {
10968 + pax_open_kernel();
10969 set_64bit((unsigned long long *)(pudp), native_pud_val(pud));
10970 + pax_close_kernel();
10971 }
10972
10973 /*
10974 diff --git a/arch/x86/include/asm/pgtable.h b/arch/x86/include/asm/pgtable.h
10975 index af6fd36..867ff74 100644
10976 --- a/arch/x86/include/asm/pgtable.h
10977 +++ b/arch/x86/include/asm/pgtable.h
10978 @@ -39,6 +39,7 @@ extern struct list_head pgd_list;
10979
10980 #ifndef __PAGETABLE_PUD_FOLDED
10981 #define set_pgd(pgdp, pgd) native_set_pgd(pgdp, pgd)
10982 +#define set_pgd_batched(pgdp, pgd) native_set_pgd_batched(pgdp, pgd)
10983 #define pgd_clear(pgd) native_pgd_clear(pgd)
10984 #endif
10985
10986 @@ -74,12 +75,51 @@ extern struct list_head pgd_list;
10987
10988 #define arch_end_context_switch(prev) do {} while(0)
10989
10990 +#define pax_open_kernel() native_pax_open_kernel()
10991 +#define pax_close_kernel() native_pax_close_kernel()
10992 #endif /* CONFIG_PARAVIRT */
10993
10994 +#define __HAVE_ARCH_PAX_OPEN_KERNEL
10995 +#define __HAVE_ARCH_PAX_CLOSE_KERNEL
10996 +
10997 +#ifdef CONFIG_PAX_KERNEXEC
10998 +static inline unsigned long native_pax_open_kernel(void)
10999 +{
11000 + unsigned long cr0;
11001 +
11002 + preempt_disable();
11003 + barrier();
11004 + cr0 = read_cr0() ^ X86_CR0_WP;
11005 + BUG_ON(unlikely(cr0 & X86_CR0_WP));
11006 + write_cr0(cr0);
11007 + return cr0 ^ X86_CR0_WP;
11008 +}
11009 +
11010 +static inline unsigned long native_pax_close_kernel(void)
11011 +{
11012 + unsigned long cr0;
11013 +
11014 + cr0 = read_cr0() ^ X86_CR0_WP;
11015 + BUG_ON(unlikely(!(cr0 & X86_CR0_WP)));
11016 + write_cr0(cr0);
11017 + barrier();
11018 + preempt_enable_no_resched();
11019 + return cr0 ^ X86_CR0_WP;
11020 +}
11021 +#else
11022 +static inline unsigned long native_pax_open_kernel(void) { return 0; }
11023 +static inline unsigned long native_pax_close_kernel(void) { return 0; }
11024 +#endif
11025 +
11026 /*
11027 * The following only work if pte_present() is true.
11028 * Undefined behaviour if not..
11029 */
11030 +static inline int pte_user(pte_t pte)
11031 +{
11032 + return pte_val(pte) & _PAGE_USER;
11033 +}
11034 +
11035 static inline int pte_dirty(pte_t pte)
11036 {
11037 return pte_flags(pte) & _PAGE_DIRTY;
11038 @@ -167,9 +207,29 @@ static inline pte_t pte_wrprotect(pte_t pte)
11039 return pte_clear_flags(pte, _PAGE_RW);
11040 }
11041
11042 +static inline pte_t pte_mkread(pte_t pte)
11043 +{
11044 + return __pte(pte_val(pte) | _PAGE_USER);
11045 +}
11046 +
11047 static inline pte_t pte_mkexec(pte_t pte)
11048 {
11049 - return pte_clear_flags(pte, _PAGE_NX);
11050 +#ifdef CONFIG_X86_PAE
11051 + if (__supported_pte_mask & _PAGE_NX)
11052 + return pte_clear_flags(pte, _PAGE_NX);
11053 + else
11054 +#endif
11055 + return pte_set_flags(pte, _PAGE_USER);
11056 +}
11057 +
11058 +static inline pte_t pte_exprotect(pte_t pte)
11059 +{
11060 +#ifdef CONFIG_X86_PAE
11061 + if (__supported_pte_mask & _PAGE_NX)
11062 + return pte_set_flags(pte, _PAGE_NX);
11063 + else
11064 +#endif
11065 + return pte_clear_flags(pte, _PAGE_USER);
11066 }
11067
11068 static inline pte_t pte_mkdirty(pte_t pte)
11069 @@ -302,6 +362,15 @@ pte_t *populate_extra_pte(unsigned long vaddr);
11070 #endif
11071
11072 #ifndef __ASSEMBLY__
11073 +
11074 +#ifdef CONFIG_PAX_PER_CPU_PGD
11075 +extern pgd_t cpu_pgd[NR_CPUS][PTRS_PER_PGD];
11076 +static inline pgd_t *get_cpu_pgd(unsigned int cpu)
11077 +{
11078 + return cpu_pgd[cpu];
11079 +}
11080 +#endif
11081 +
11082 #include <linux/mm_types.h>
11083
11084 static inline int pte_none(pte_t pte)
11085 @@ -472,7 +541,7 @@ static inline pud_t *pud_offset(pgd_t *pgd, unsigned long address)
11086
11087 static inline int pgd_bad(pgd_t pgd)
11088 {
11089 - return (pgd_flags(pgd) & ~_PAGE_USER) != _KERNPG_TABLE;
11090 + return (pgd_flags(pgd) & ~(_PAGE_USER | _PAGE_NX)) != _KERNPG_TABLE;
11091 }
11092
11093 static inline int pgd_none(pgd_t pgd)
11094 @@ -495,7 +564,12 @@ static inline int pgd_none(pgd_t pgd)
11095 * pgd_offset() returns a (pgd_t *)
11096 * pgd_index() is used get the offset into the pgd page's array of pgd_t's;
11097 */
11098 -#define pgd_offset(mm, address) ((mm)->pgd + pgd_index((address)))
11099 +#define pgd_offset(mm, address) ((mm)->pgd + pgd_index(address))
11100 +
11101 +#ifdef CONFIG_PAX_PER_CPU_PGD
11102 +#define pgd_offset_cpu(cpu, address) (get_cpu_pgd(cpu) + pgd_index(address))
11103 +#endif
11104 +
11105 /*
11106 * a shortcut which implies the use of the kernel's pgd, instead
11107 * of a process's
11108 @@ -506,6 +580,20 @@ static inline int pgd_none(pgd_t pgd)
11109 #define KERNEL_PGD_BOUNDARY pgd_index(PAGE_OFFSET)
11110 #define KERNEL_PGD_PTRS (PTRS_PER_PGD - KERNEL_PGD_BOUNDARY)
11111
11112 +#ifdef CONFIG_X86_32
11113 +#define USER_PGD_PTRS KERNEL_PGD_BOUNDARY
11114 +#else
11115 +#define TASK_SIZE_MAX_SHIFT CONFIG_TASK_SIZE_MAX_SHIFT
11116 +#define USER_PGD_PTRS (_AC(1,UL) << (TASK_SIZE_MAX_SHIFT - PGDIR_SHIFT))
11117 +
11118 +#ifdef CONFIG_PAX_MEMORY_UDEREF
11119 +#define PAX_USER_SHADOW_BASE (_AC(1,UL) << TASK_SIZE_MAX_SHIFT)
11120 +#else
11121 +#define PAX_USER_SHADOW_BASE (_AC(0,UL))
11122 +#endif
11123 +
11124 +#endif
11125 +
11126 #ifndef __ASSEMBLY__
11127
11128 extern int direct_gbpages;
11129 @@ -611,11 +699,23 @@ static inline void ptep_set_wrprotect(struct mm_struct *mm,
11130 * dst and src can be on the same page, but the range must not overlap,
11131 * and must not cross a page boundary.
11132 */
11133 -static inline void clone_pgd_range(pgd_t *dst, pgd_t *src, int count)
11134 +static inline void clone_pgd_range(pgd_t *dst, const pgd_t *src, int count)
11135 {
11136 - memcpy(dst, src, count * sizeof(pgd_t));
11137 + pax_open_kernel();
11138 + while (count--)
11139 + *dst++ = *src++;
11140 + pax_close_kernel();
11141 }
11142
11143 +#ifdef CONFIG_PAX_PER_CPU_PGD
11144 +extern void __clone_user_pgds(pgd_t *dst, const pgd_t *src, int count);
11145 +#endif
11146 +
11147 +#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
11148 +extern void __shadow_user_pgds(pgd_t *dst, const pgd_t *src, int count);
11149 +#else
11150 +static inline void __shadow_user_pgds(pgd_t *dst, const pgd_t *src, int count) {}
11151 +#endif
11152
11153 #include <asm-generic/pgtable.h>
11154 #endif /* __ASSEMBLY__ */
11155 diff --git a/arch/x86/include/asm/pgtable_32.h b/arch/x86/include/asm/pgtable_32.h
11156 index 750f1bf..971e839 100644
11157 --- a/arch/x86/include/asm/pgtable_32.h
11158 +++ b/arch/x86/include/asm/pgtable_32.h
11159 @@ -26,9 +26,6 @@
11160 struct mm_struct;
11161 struct vm_area_struct;
11162
11163 -extern pgd_t swapper_pg_dir[1024];
11164 -extern pgd_t trampoline_pg_dir[1024];
11165 -
11166 static inline void pgtable_cache_init(void) { }
11167 static inline void check_pgt_cache(void) { }
11168 void paging_init(void);
11169 @@ -49,6 +46,12 @@ extern void set_pmd_pfn(unsigned long, unsigned long, pgprot_t);
11170 # include <asm/pgtable-2level.h>
11171 #endif
11172
11173 +extern pgd_t swapper_pg_dir[PTRS_PER_PGD];
11174 +extern pgd_t trampoline_pg_dir[PTRS_PER_PGD];
11175 +#ifdef CONFIG_X86_PAE
11176 +extern pmd_t swapper_pm_dir[PTRS_PER_PGD][PTRS_PER_PMD];
11177 +#endif
11178 +
11179 #if defined(CONFIG_HIGHPTE)
11180 #define __KM_PTE \
11181 (in_nmi() ? KM_NMI_PTE : \
11182 @@ -73,7 +76,9 @@ extern void set_pmd_pfn(unsigned long, unsigned long, pgprot_t);
11183 /* Clear a kernel PTE and flush it from the TLB */
11184 #define kpte_clear_flush(ptep, vaddr) \
11185 do { \
11186 + pax_open_kernel(); \
11187 pte_clear(&init_mm, (vaddr), (ptep)); \
11188 + pax_close_kernel(); \
11189 __flush_tlb_one((vaddr)); \
11190 } while (0)
11191
11192 @@ -85,6 +90,9 @@ do { \
11193
11194 #endif /* !__ASSEMBLY__ */
11195
11196 +#define HAVE_ARCH_UNMAPPED_AREA
11197 +#define HAVE_ARCH_UNMAPPED_AREA_TOPDOWN
11198 +
11199 /*
11200 * kern_addr_valid() is (1) for FLATMEM and (0) for
11201 * SPARSEMEM and DISCONTIGMEM
11202 diff --git a/arch/x86/include/asm/pgtable_32_types.h b/arch/x86/include/asm/pgtable_32_types.h
11203 index 5e67c15..12d5c47 100644
11204 --- a/arch/x86/include/asm/pgtable_32_types.h
11205 +++ b/arch/x86/include/asm/pgtable_32_types.h
11206 @@ -8,7 +8,7 @@
11207 */
11208 #ifdef CONFIG_X86_PAE
11209 # include <asm/pgtable-3level_types.h>
11210 -# define PMD_SIZE (1UL << PMD_SHIFT)
11211 +# define PMD_SIZE (_AC(1, UL) << PMD_SHIFT)
11212 # define PMD_MASK (~(PMD_SIZE - 1))
11213 #else
11214 # include <asm/pgtable-2level_types.h>
11215 @@ -46,6 +46,19 @@ extern bool __vmalloc_start_set; /* set once high_memory is set */
11216 # define VMALLOC_END (FIXADDR_START - 2 * PAGE_SIZE)
11217 #endif
11218
11219 +#ifdef CONFIG_PAX_KERNEXEC
11220 +#ifndef __ASSEMBLY__
11221 +extern unsigned char MODULES_EXEC_VADDR[];
11222 +extern unsigned char MODULES_EXEC_END[];
11223 +#endif
11224 +#include <asm/boot.h>
11225 +#define ktla_ktva(addr) (addr + LOAD_PHYSICAL_ADDR + PAGE_OFFSET)
11226 +#define ktva_ktla(addr) (addr - LOAD_PHYSICAL_ADDR - PAGE_OFFSET)
11227 +#else
11228 +#define ktla_ktva(addr) (addr)
11229 +#define ktva_ktla(addr) (addr)
11230 +#endif
11231 +
11232 #define MODULES_VADDR VMALLOC_START
11233 #define MODULES_END VMALLOC_END
11234 #define MODULES_LEN (MODULES_VADDR - MODULES_END)
11235 diff --git a/arch/x86/include/asm/pgtable_64.h b/arch/x86/include/asm/pgtable_64.h
11236 index c57a301..6b414ff 100644
11237 --- a/arch/x86/include/asm/pgtable_64.h
11238 +++ b/arch/x86/include/asm/pgtable_64.h
11239 @@ -16,10 +16,14 @@
11240
11241 extern pud_t level3_kernel_pgt[512];
11242 extern pud_t level3_ident_pgt[512];
11243 +extern pud_t level3_vmalloc_start_pgt[512];
11244 +extern pud_t level3_vmalloc_end_pgt[512];
11245 +extern pud_t level3_vmemmap_pgt[512];
11246 +extern pud_t level2_vmemmap_pgt[512];
11247 extern pmd_t level2_kernel_pgt[512];
11248 extern pmd_t level2_fixmap_pgt[512];
11249 -extern pmd_t level2_ident_pgt[512];
11250 -extern pgd_t init_level4_pgt[];
11251 +extern pmd_t level2_ident_pgt[512*2];
11252 +extern pgd_t init_level4_pgt[512];
11253
11254 #define swapper_pg_dir init_level4_pgt
11255
11256 @@ -74,7 +78,9 @@ static inline pte_t native_ptep_get_and_clear(pte_t *xp)
11257
11258 static inline void native_set_pmd(pmd_t *pmdp, pmd_t pmd)
11259 {
11260 + pax_open_kernel();
11261 *pmdp = pmd;
11262 + pax_close_kernel();
11263 }
11264
11265 static inline void native_pmd_clear(pmd_t *pmd)
11266 @@ -94,6 +100,13 @@ static inline void native_pud_clear(pud_t *pud)
11267
11268 static inline void native_set_pgd(pgd_t *pgdp, pgd_t pgd)
11269 {
11270 + pax_open_kernel();
11271 + *pgdp = pgd;
11272 + pax_close_kernel();
11273 +}
11274 +
11275 +static inline void native_set_pgd_batched(pgd_t *pgdp, pgd_t pgd)
11276 +{
11277 *pgdp = pgd;
11278 }
11279
11280 diff --git a/arch/x86/include/asm/pgtable_64_types.h b/arch/x86/include/asm/pgtable_64_types.h
11281 index 766ea16..5b96cb3 100644
11282 --- a/arch/x86/include/asm/pgtable_64_types.h
11283 +++ b/arch/x86/include/asm/pgtable_64_types.h
11284 @@ -59,5 +59,10 @@ typedef struct { pteval_t pte; } pte_t;
11285 #define MODULES_VADDR _AC(0xffffffffa0000000, UL)
11286 #define MODULES_END _AC(0xffffffffff000000, UL)
11287 #define MODULES_LEN (MODULES_END - MODULES_VADDR)
11288 +#define MODULES_EXEC_VADDR MODULES_VADDR
11289 +#define MODULES_EXEC_END MODULES_END
11290 +
11291 +#define ktla_ktva(addr) (addr)
11292 +#define ktva_ktla(addr) (addr)
11293
11294 #endif /* _ASM_X86_PGTABLE_64_DEFS_H */
11295 diff --git a/arch/x86/include/asm/pgtable_types.h b/arch/x86/include/asm/pgtable_types.h
11296 index d1f4a76..2f46ba1 100644
11297 --- a/arch/x86/include/asm/pgtable_types.h
11298 +++ b/arch/x86/include/asm/pgtable_types.h
11299 @@ -16,12 +16,11 @@
11300 #define _PAGE_BIT_PSE 7 /* 4 MB (or 2MB) page */
11301 #define _PAGE_BIT_PAT 7 /* on 4KB pages */
11302 #define _PAGE_BIT_GLOBAL 8 /* Global TLB entry PPro+ */
11303 -#define _PAGE_BIT_UNUSED1 9 /* available for programmer */
11304 +#define _PAGE_BIT_SPECIAL 9 /* special mappings, no associated struct page */
11305 #define _PAGE_BIT_IOMAP 10 /* flag used to indicate IO mapping */
11306 #define _PAGE_BIT_HIDDEN 11 /* hidden by kmemcheck */
11307 #define _PAGE_BIT_PAT_LARGE 12 /* On 2MB or 1GB pages */
11308 -#define _PAGE_BIT_SPECIAL _PAGE_BIT_UNUSED1
11309 -#define _PAGE_BIT_CPA_TEST _PAGE_BIT_UNUSED1
11310 +#define _PAGE_BIT_CPA_TEST _PAGE_BIT_SPECIAL
11311 #define _PAGE_BIT_NX 63 /* No execute: only valid after cpuid check */
11312
11313 /* If _PAGE_BIT_PRESENT is clear, we use these: */
11314 @@ -39,7 +38,6 @@
11315 #define _PAGE_DIRTY (_AT(pteval_t, 1) << _PAGE_BIT_DIRTY)
11316 #define _PAGE_PSE (_AT(pteval_t, 1) << _PAGE_BIT_PSE)
11317 #define _PAGE_GLOBAL (_AT(pteval_t, 1) << _PAGE_BIT_GLOBAL)
11318 -#define _PAGE_UNUSED1 (_AT(pteval_t, 1) << _PAGE_BIT_UNUSED1)
11319 #define _PAGE_IOMAP (_AT(pteval_t, 1) << _PAGE_BIT_IOMAP)
11320 #define _PAGE_PAT (_AT(pteval_t, 1) << _PAGE_BIT_PAT)
11321 #define _PAGE_PAT_LARGE (_AT(pteval_t, 1) << _PAGE_BIT_PAT_LARGE)
11322 @@ -55,8 +53,10 @@
11323
11324 #if defined(CONFIG_X86_64) || defined(CONFIG_X86_PAE)
11325 #define _PAGE_NX (_AT(pteval_t, 1) << _PAGE_BIT_NX)
11326 -#else
11327 +#elif defined(CONFIG_KMEMCHECK)
11328 #define _PAGE_NX (_AT(pteval_t, 0))
11329 +#else
11330 +#define _PAGE_NX (_AT(pteval_t, 1) << _PAGE_BIT_HIDDEN)
11331 #endif
11332
11333 #define _PAGE_FILE (_AT(pteval_t, 1) << _PAGE_BIT_FILE)
11334 @@ -93,6 +93,9 @@
11335 #define PAGE_READONLY_EXEC __pgprot(_PAGE_PRESENT | _PAGE_USER | \
11336 _PAGE_ACCESSED)
11337
11338 +#define PAGE_READONLY_NOEXEC PAGE_READONLY
11339 +#define PAGE_SHARED_NOEXEC PAGE_SHARED
11340 +
11341 #define __PAGE_KERNEL_EXEC \
11342 (_PAGE_PRESENT | _PAGE_RW | _PAGE_DIRTY | _PAGE_ACCESSED | _PAGE_GLOBAL)
11343 #define __PAGE_KERNEL (__PAGE_KERNEL_EXEC | _PAGE_NX)
11344 @@ -103,8 +106,8 @@
11345 #define __PAGE_KERNEL_WC (__PAGE_KERNEL | _PAGE_CACHE_WC)
11346 #define __PAGE_KERNEL_NOCACHE (__PAGE_KERNEL | _PAGE_PCD | _PAGE_PWT)
11347 #define __PAGE_KERNEL_UC_MINUS (__PAGE_KERNEL | _PAGE_PCD)
11348 -#define __PAGE_KERNEL_VSYSCALL (__PAGE_KERNEL_RX | _PAGE_USER)
11349 -#define __PAGE_KERNEL_VSYSCALL_NOCACHE (__PAGE_KERNEL_VSYSCALL | _PAGE_PCD | _PAGE_PWT)
11350 +#define __PAGE_KERNEL_VSYSCALL (__PAGE_KERNEL_RO | _PAGE_USER)
11351 +#define __PAGE_KERNEL_VSYSCALL_NOCACHE (__PAGE_KERNEL_RO | _PAGE_PCD | _PAGE_PWT | _PAGE_USER)
11352 #define __PAGE_KERNEL_LARGE (__PAGE_KERNEL | _PAGE_PSE)
11353 #define __PAGE_KERNEL_LARGE_NOCACHE (__PAGE_KERNEL | _PAGE_CACHE_UC | _PAGE_PSE)
11354 #define __PAGE_KERNEL_LARGE_EXEC (__PAGE_KERNEL_EXEC | _PAGE_PSE)
11355 @@ -163,8 +166,8 @@
11356 * bits are combined, this will alow user to access the high address mapped
11357 * VDSO in the presence of CONFIG_COMPAT_VDSO
11358 */
11359 -#define PTE_IDENT_ATTR 0x003 /* PRESENT+RW */
11360 -#define PDE_IDENT_ATTR 0x067 /* PRESENT+RW+USER+DIRTY+ACCESSED */
11361 +#define PTE_IDENT_ATTR 0x063 /* PRESENT+RW+DIRTY+ACCESSED */
11362 +#define PDE_IDENT_ATTR 0x063 /* PRESENT+RW+DIRTY+ACCESSED */
11363 #define PGD_IDENT_ATTR 0x001 /* PRESENT (no other attributes) */
11364 #endif
11365
11366 @@ -202,7 +205,17 @@ static inline pgdval_t pgd_flags(pgd_t pgd)
11367 {
11368 return native_pgd_val(pgd) & PTE_FLAGS_MASK;
11369 }
11370 +#endif
11371
11372 +#if PAGETABLE_LEVELS == 3
11373 +#include <asm-generic/pgtable-nopud.h>
11374 +#endif
11375 +
11376 +#if PAGETABLE_LEVELS == 2
11377 +#include <asm-generic/pgtable-nopmd.h>
11378 +#endif
11379 +
11380 +#ifndef __ASSEMBLY__
11381 #if PAGETABLE_LEVELS > 3
11382 typedef struct { pudval_t pud; } pud_t;
11383
11384 @@ -216,8 +229,6 @@ static inline pudval_t native_pud_val(pud_t pud)
11385 return pud.pud;
11386 }
11387 #else
11388 -#include <asm-generic/pgtable-nopud.h>
11389 -
11390 static inline pudval_t native_pud_val(pud_t pud)
11391 {
11392 return native_pgd_val(pud.pgd);
11393 @@ -237,8 +248,6 @@ static inline pmdval_t native_pmd_val(pmd_t pmd)
11394 return pmd.pmd;
11395 }
11396 #else
11397 -#include <asm-generic/pgtable-nopmd.h>
11398 -
11399 static inline pmdval_t native_pmd_val(pmd_t pmd)
11400 {
11401 return native_pgd_val(pmd.pud.pgd);
11402 @@ -278,7 +287,16 @@ typedef struct page *pgtable_t;
11403
11404 extern pteval_t __supported_pte_mask;
11405 extern void set_nx(void);
11406 +
11407 +#ifdef CONFIG_X86_32
11408 +#ifdef CONFIG_X86_PAE
11409 extern int nx_enabled;
11410 +#else
11411 +#define nx_enabled (0)
11412 +#endif
11413 +#else
11414 +#define nx_enabled (1)
11415 +#endif
11416
11417 #define pgprot_writecombine pgprot_writecombine
11418 extern pgprot_t pgprot_writecombine(pgprot_t prot);
11419 diff --git a/arch/x86/include/asm/processor.h b/arch/x86/include/asm/processor.h
11420 index fa04dea..5f823fc 100644
11421 --- a/arch/x86/include/asm/processor.h
11422 +++ b/arch/x86/include/asm/processor.h
11423 @@ -272,7 +272,7 @@ struct tss_struct {
11424
11425 } ____cacheline_aligned;
11426
11427 -DECLARE_PER_CPU_SHARED_ALIGNED(struct tss_struct, init_tss);
11428 +extern struct tss_struct init_tss[NR_CPUS];
11429
11430 /*
11431 * Save the original ist values for checking stack pointers during debugging
11432 @@ -911,11 +911,18 @@ static inline void spin_lock_prefetch(const void *x)
11433 */
11434 #define TASK_SIZE PAGE_OFFSET
11435 #define TASK_SIZE_MAX TASK_SIZE
11436 +
11437 +#ifdef CONFIG_PAX_SEGMEXEC
11438 +#define SEGMEXEC_TASK_SIZE (TASK_SIZE / 2)
11439 +#define STACK_TOP ((current->mm->pax_flags & MF_PAX_SEGMEXEC)?SEGMEXEC_TASK_SIZE:TASK_SIZE)
11440 +#else
11441 #define STACK_TOP TASK_SIZE
11442 -#define STACK_TOP_MAX STACK_TOP
11443 +#endif
11444 +
11445 +#define STACK_TOP_MAX TASK_SIZE
11446
11447 #define INIT_THREAD { \
11448 - .sp0 = sizeof(init_stack) + (long)&init_stack, \
11449 + .sp0 = sizeof(init_stack) + (long)&init_stack - 8, \
11450 .vm86_info = NULL, \
11451 .sysenter_cs = __KERNEL_CS, \
11452 .io_bitmap_ptr = NULL, \
11453 @@ -929,7 +936,7 @@ static inline void spin_lock_prefetch(const void *x)
11454 */
11455 #define INIT_TSS { \
11456 .x86_tss = { \
11457 - .sp0 = sizeof(init_stack) + (long)&init_stack, \
11458 + .sp0 = sizeof(init_stack) + (long)&init_stack - 8, \
11459 .ss0 = __KERNEL_DS, \
11460 .ss1 = __KERNEL_CS, \
11461 .io_bitmap_base = INVALID_IO_BITMAP_OFFSET, \
11462 @@ -940,11 +947,7 @@ static inline void spin_lock_prefetch(const void *x)
11463 extern unsigned long thread_saved_pc(struct task_struct *tsk);
11464
11465 #define THREAD_SIZE_LONGS (THREAD_SIZE/sizeof(unsigned long))
11466 -#define KSTK_TOP(info) \
11467 -({ \
11468 - unsigned long *__ptr = (unsigned long *)(info); \
11469 - (unsigned long)(&__ptr[THREAD_SIZE_LONGS]); \
11470 -})
11471 +#define KSTK_TOP(info) ((container_of(info, struct task_struct, tinfo))->thread.sp0)
11472
11473 /*
11474 * The below -8 is to reserve 8 bytes on top of the ring0 stack.
11475 @@ -959,7 +962,7 @@ extern unsigned long thread_saved_pc(struct task_struct *tsk);
11476 #define task_pt_regs(task) \
11477 ({ \
11478 struct pt_regs *__regs__; \
11479 - __regs__ = (struct pt_regs *)(KSTK_TOP(task_stack_page(task))-8); \
11480 + __regs__ = (struct pt_regs *)((task)->thread.sp0); \
11481 __regs__ - 1; \
11482 })
11483
11484 @@ -969,13 +972,13 @@ extern unsigned long thread_saved_pc(struct task_struct *tsk);
11485 /*
11486 * User space process size. 47bits minus one guard page.
11487 */
11488 -#define TASK_SIZE_MAX ((1UL << 47) - PAGE_SIZE)
11489 +#define TASK_SIZE_MAX ((1UL << TASK_SIZE_MAX_SHIFT) - PAGE_SIZE)
11490
11491 /* This decides where the kernel will search for a free chunk of vm
11492 * space during mmap's.
11493 */
11494 #define IA32_PAGE_OFFSET ((current->personality & ADDR_LIMIT_3GB) ? \
11495 - 0xc0000000 : 0xFFFFe000)
11496 + 0xc0000000 : 0xFFFFf000)
11497
11498 #define TASK_SIZE (test_thread_flag(TIF_IA32) ? \
11499 IA32_PAGE_OFFSET : TASK_SIZE_MAX)
11500 @@ -986,11 +989,11 @@ extern unsigned long thread_saved_pc(struct task_struct *tsk);
11501 #define STACK_TOP_MAX TASK_SIZE_MAX
11502
11503 #define INIT_THREAD { \
11504 - .sp0 = (unsigned long)&init_stack + sizeof(init_stack) \
11505 + .sp0 = (unsigned long)&init_stack + sizeof(init_stack) - 16 \
11506 }
11507
11508 #define INIT_TSS { \
11509 - .x86_tss.sp0 = (unsigned long)&init_stack + sizeof(init_stack) \
11510 + .x86_tss.sp0 = (unsigned long)&init_stack + sizeof(init_stack) - 16 \
11511 }
11512
11513 /*
11514 @@ -1012,6 +1015,10 @@ extern void start_thread(struct pt_regs *regs, unsigned long new_ip,
11515 */
11516 #define TASK_UNMAPPED_BASE (PAGE_ALIGN(TASK_SIZE / 3))
11517
11518 +#ifdef CONFIG_PAX_SEGMEXEC
11519 +#define SEGMEXEC_TASK_UNMAPPED_BASE (PAGE_ALIGN(SEGMEXEC_TASK_SIZE / 3))
11520 +#endif
11521 +
11522 #define KSTK_EIP(task) (task_pt_regs(task)->ip)
11523
11524 /* Get/set a process' ability to use the timestamp counter instruction */
11525 diff --git a/arch/x86/include/asm/ptrace.h b/arch/x86/include/asm/ptrace.h
11526 index 0f0d908..f2e3da2 100644
11527 --- a/arch/x86/include/asm/ptrace.h
11528 +++ b/arch/x86/include/asm/ptrace.h
11529 @@ -151,28 +151,29 @@ static inline unsigned long regs_return_value(struct pt_regs *regs)
11530 }
11531
11532 /*
11533 - * user_mode_vm(regs) determines whether a register set came from user mode.
11534 + * user_mode(regs) determines whether a register set came from user mode.
11535 * This is true if V8086 mode was enabled OR if the register set was from
11536 * protected mode with RPL-3 CS value. This tricky test checks that with
11537 * one comparison. Many places in the kernel can bypass this full check
11538 - * if they have already ruled out V8086 mode, so user_mode(regs) can be used.
11539 + * if they have already ruled out V8086 mode, so user_mode_novm(regs) can
11540 + * be used.
11541 */
11542 -static inline int user_mode(struct pt_regs *regs)
11543 +static inline int user_mode_novm(struct pt_regs *regs)
11544 {
11545 #ifdef CONFIG_X86_32
11546 return (regs->cs & SEGMENT_RPL_MASK) == USER_RPL;
11547 #else
11548 - return !!(regs->cs & 3);
11549 + return !!(regs->cs & SEGMENT_RPL_MASK);
11550 #endif
11551 }
11552
11553 -static inline int user_mode_vm(struct pt_regs *regs)
11554 +static inline int user_mode(struct pt_regs *regs)
11555 {
11556 #ifdef CONFIG_X86_32
11557 return ((regs->cs & SEGMENT_RPL_MASK) | (regs->flags & X86_VM_MASK)) >=
11558 USER_RPL;
11559 #else
11560 - return user_mode(regs);
11561 + return user_mode_novm(regs);
11562 #endif
11563 }
11564
11565 diff --git a/arch/x86/include/asm/reboot.h b/arch/x86/include/asm/reboot.h
11566 index 562d4fd..6e39df1 100644
11567 --- a/arch/x86/include/asm/reboot.h
11568 +++ b/arch/x86/include/asm/reboot.h
11569 @@ -6,19 +6,19 @@
11570 struct pt_regs;
11571
11572 struct machine_ops {
11573 - void (*restart)(char *cmd);
11574 - void (*halt)(void);
11575 - void (*power_off)(void);
11576 + void (* __noreturn restart)(char *cmd);
11577 + void (* __noreturn halt)(void);
11578 + void (* __noreturn power_off)(void);
11579 void (*shutdown)(void);
11580 void (*crash_shutdown)(struct pt_regs *);
11581 - void (*emergency_restart)(void);
11582 -};
11583 + void (* __noreturn emergency_restart)(void);
11584 +} __no_const;
11585
11586 extern struct machine_ops machine_ops;
11587
11588 void native_machine_crash_shutdown(struct pt_regs *regs);
11589 void native_machine_shutdown(void);
11590 -void machine_real_restart(const unsigned char *code, int length);
11591 +void machine_real_restart(const unsigned char *code, unsigned int length) __noreturn;
11592
11593 typedef void (*nmi_shootdown_cb)(int, struct die_args*);
11594 void nmi_shootdown_cpus(nmi_shootdown_cb callback);
11595 diff --git a/arch/x86/include/asm/rwsem.h b/arch/x86/include/asm/rwsem.h
11596 index 606ede1..dbfff37 100644
11597 --- a/arch/x86/include/asm/rwsem.h
11598 +++ b/arch/x86/include/asm/rwsem.h
11599 @@ -118,6 +118,14 @@ static inline void __down_read(struct rw_semaphore *sem)
11600 {
11601 asm volatile("# beginning down_read\n\t"
11602 LOCK_PREFIX _ASM_INC "(%1)\n\t"
11603 +
11604 +#ifdef CONFIG_PAX_REFCOUNT
11605 + "jno 0f\n"
11606 + LOCK_PREFIX _ASM_DEC "(%1)\n\t"
11607 + "int $4\n0:\n"
11608 + _ASM_EXTABLE(0b, 0b)
11609 +#endif
11610 +
11611 /* adds 0x00000001, returns the old value */
11612 " jns 1f\n"
11613 " call call_rwsem_down_read_failed\n"
11614 @@ -139,6 +147,14 @@ static inline int __down_read_trylock(struct rw_semaphore *sem)
11615 "1:\n\t"
11616 " mov %1,%2\n\t"
11617 " add %3,%2\n\t"
11618 +
11619 +#ifdef CONFIG_PAX_REFCOUNT
11620 + "jno 0f\n"
11621 + "sub %3,%2\n"
11622 + "int $4\n0:\n"
11623 + _ASM_EXTABLE(0b, 0b)
11624 +#endif
11625 +
11626 " jle 2f\n\t"
11627 LOCK_PREFIX " cmpxchg %2,%0\n\t"
11628 " jnz 1b\n\t"
11629 @@ -160,6 +176,14 @@ static inline void __down_write_nested(struct rw_semaphore *sem, int subclass)
11630 tmp = RWSEM_ACTIVE_WRITE_BIAS;
11631 asm volatile("# beginning down_write\n\t"
11632 LOCK_PREFIX " xadd %1,(%2)\n\t"
11633 +
11634 +#ifdef CONFIG_PAX_REFCOUNT
11635 + "jno 0f\n"
11636 + "mov %1,(%2)\n"
11637 + "int $4\n0:\n"
11638 + _ASM_EXTABLE(0b, 0b)
11639 +#endif
11640 +
11641 /* subtract 0x0000ffff, returns the old value */
11642 " test %1,%1\n\t"
11643 /* was the count 0 before? */
11644 @@ -198,6 +222,14 @@ static inline void __up_read(struct rw_semaphore *sem)
11645 rwsem_count_t tmp = -RWSEM_ACTIVE_READ_BIAS;
11646 asm volatile("# beginning __up_read\n\t"
11647 LOCK_PREFIX " xadd %1,(%2)\n\t"
11648 +
11649 +#ifdef CONFIG_PAX_REFCOUNT
11650 + "jno 0f\n"
11651 + "mov %1,(%2)\n"
11652 + "int $4\n0:\n"
11653 + _ASM_EXTABLE(0b, 0b)
11654 +#endif
11655 +
11656 /* subtracts 1, returns the old value */
11657 " jns 1f\n\t"
11658 " call call_rwsem_wake\n"
11659 @@ -216,6 +248,14 @@ static inline void __up_write(struct rw_semaphore *sem)
11660 rwsem_count_t tmp;
11661 asm volatile("# beginning __up_write\n\t"
11662 LOCK_PREFIX " xadd %1,(%2)\n\t"
11663 +
11664 +#ifdef CONFIG_PAX_REFCOUNT
11665 + "jno 0f\n"
11666 + "mov %1,(%2)\n"
11667 + "int $4\n0:\n"
11668 + _ASM_EXTABLE(0b, 0b)
11669 +#endif
11670 +
11671 /* tries to transition
11672 0xffff0001 -> 0x00000000 */
11673 " jz 1f\n"
11674 @@ -234,6 +274,14 @@ static inline void __downgrade_write(struct rw_semaphore *sem)
11675 {
11676 asm volatile("# beginning __downgrade_write\n\t"
11677 LOCK_PREFIX _ASM_ADD "%2,(%1)\n\t"
11678 +
11679 +#ifdef CONFIG_PAX_REFCOUNT
11680 + "jno 0f\n"
11681 + LOCK_PREFIX _ASM_SUB "%2,(%1)\n"
11682 + "int $4\n0:\n"
11683 + _ASM_EXTABLE(0b, 0b)
11684 +#endif
11685 +
11686 /*
11687 * transitions 0xZZZZ0001 -> 0xYYYY0001 (i386)
11688 * 0xZZZZZZZZ00000001 -> 0xYYYYYYYY00000001 (x86_64)
11689 @@ -253,7 +301,15 @@ static inline void __downgrade_write(struct rw_semaphore *sem)
11690 static inline void rwsem_atomic_add(rwsem_count_t delta,
11691 struct rw_semaphore *sem)
11692 {
11693 - asm volatile(LOCK_PREFIX _ASM_ADD "%1,%0"
11694 + asm volatile(LOCK_PREFIX _ASM_ADD "%1,%0\n"
11695 +
11696 +#ifdef CONFIG_PAX_REFCOUNT
11697 + "jno 0f\n"
11698 + LOCK_PREFIX _ASM_SUB "%1,%0\n"
11699 + "int $4\n0:\n"
11700 + _ASM_EXTABLE(0b, 0b)
11701 +#endif
11702 +
11703 : "+m" (sem->count)
11704 : "er" (delta));
11705 }
11706 @@ -266,7 +322,15 @@ static inline rwsem_count_t rwsem_atomic_update(rwsem_count_t delta,
11707 {
11708 rwsem_count_t tmp = delta;
11709
11710 - asm volatile(LOCK_PREFIX "xadd %0,%1"
11711 + asm volatile(LOCK_PREFIX "xadd %0,%1\n"
11712 +
11713 +#ifdef CONFIG_PAX_REFCOUNT
11714 + "jno 0f\n"
11715 + "mov %0,%1\n"
11716 + "int $4\n0:\n"
11717 + _ASM_EXTABLE(0b, 0b)
11718 +#endif
11719 +
11720 : "+r" (tmp), "+m" (sem->count)
11721 : : "memory");
11722
11723 diff --git a/arch/x86/include/asm/segment.h b/arch/x86/include/asm/segment.h
11724 index 14e0ed8..7f7dd5e 100644
11725 --- a/arch/x86/include/asm/segment.h
11726 +++ b/arch/x86/include/asm/segment.h
11727 @@ -62,10 +62,15 @@
11728 * 26 - ESPFIX small SS
11729 * 27 - per-cpu [ offset to per-cpu data area ]
11730 * 28 - stack_canary-20 [ for stack protector ]
11731 - * 29 - unused
11732 - * 30 - unused
11733 + * 29 - PCI BIOS CS
11734 + * 30 - PCI BIOS DS
11735 * 31 - TSS for double fault handler
11736 */
11737 +#define GDT_ENTRY_KERNEXEC_EFI_CS (1)
11738 +#define GDT_ENTRY_KERNEXEC_EFI_DS (2)
11739 +#define __KERNEXEC_EFI_CS (GDT_ENTRY_KERNEXEC_EFI_CS*8)
11740 +#define __KERNEXEC_EFI_DS (GDT_ENTRY_KERNEXEC_EFI_DS*8)
11741 +
11742 #define GDT_ENTRY_TLS_MIN 6
11743 #define GDT_ENTRY_TLS_MAX (GDT_ENTRY_TLS_MIN + GDT_ENTRY_TLS_ENTRIES - 1)
11744
11745 @@ -77,6 +82,8 @@
11746
11747 #define GDT_ENTRY_KERNEL_CS (GDT_ENTRY_KERNEL_BASE + 0)
11748
11749 +#define GDT_ENTRY_KERNEXEC_KERNEL_CS (4)
11750 +
11751 #define GDT_ENTRY_KERNEL_DS (GDT_ENTRY_KERNEL_BASE + 1)
11752
11753 #define GDT_ENTRY_TSS (GDT_ENTRY_KERNEL_BASE + 4)
11754 @@ -88,7 +95,7 @@
11755 #define GDT_ENTRY_ESPFIX_SS (GDT_ENTRY_KERNEL_BASE + 14)
11756 #define __ESPFIX_SS (GDT_ENTRY_ESPFIX_SS * 8)
11757
11758 -#define GDT_ENTRY_PERCPU (GDT_ENTRY_KERNEL_BASE + 15)
11759 +#define GDT_ENTRY_PERCPU (GDT_ENTRY_KERNEL_BASE + 15)
11760 #ifdef CONFIG_SMP
11761 #define __KERNEL_PERCPU (GDT_ENTRY_PERCPU * 8)
11762 #else
11763 @@ -102,6 +109,12 @@
11764 #define __KERNEL_STACK_CANARY 0
11765 #endif
11766
11767 +#define GDT_ENTRY_PCIBIOS_CS (GDT_ENTRY_KERNEL_BASE + 17)
11768 +#define __PCIBIOS_CS (GDT_ENTRY_PCIBIOS_CS * 8)
11769 +
11770 +#define GDT_ENTRY_PCIBIOS_DS (GDT_ENTRY_KERNEL_BASE + 18)
11771 +#define __PCIBIOS_DS (GDT_ENTRY_PCIBIOS_DS * 8)
11772 +
11773 #define GDT_ENTRY_DOUBLEFAULT_TSS 31
11774
11775 /*
11776 @@ -139,7 +152,7 @@
11777 */
11778
11779 /* Matches PNP_CS32 and PNP_CS16 (they must be consecutive) */
11780 -#define SEGMENT_IS_PNP_CODE(x) (((x) & 0xf4) == GDT_ENTRY_PNPBIOS_BASE * 8)
11781 +#define SEGMENT_IS_PNP_CODE(x) (((x) & 0xFFFCU) == PNP_CS32 || ((x) & 0xFFFCU) == PNP_CS16)
11782
11783
11784 #else
11785 @@ -163,6 +176,8 @@
11786 #define __USER32_CS (GDT_ENTRY_DEFAULT_USER32_CS * 8 + 3)
11787 #define __USER32_DS __USER_DS
11788
11789 +#define GDT_ENTRY_KERNEXEC_KERNEL_CS 7
11790 +
11791 #define GDT_ENTRY_TSS 8 /* needs two entries */
11792 #define GDT_ENTRY_LDT 10 /* needs two entries */
11793 #define GDT_ENTRY_TLS_MIN 12
11794 @@ -183,6 +198,7 @@
11795 #endif
11796
11797 #define __KERNEL_CS (GDT_ENTRY_KERNEL_CS * 8)
11798 +#define __KERNEXEC_KERNEL_CS (GDT_ENTRY_KERNEXEC_KERNEL_CS * 8)
11799 #define __KERNEL_DS (GDT_ENTRY_KERNEL_DS * 8)
11800 #define __USER_DS (GDT_ENTRY_DEFAULT_USER_DS* 8 + 3)
11801 #define __USER_CS (GDT_ENTRY_DEFAULT_USER_CS* 8 + 3)
11802 diff --git a/arch/x86/include/asm/smp.h b/arch/x86/include/asm/smp.h
11803 index 4c2f63c..5685db2 100644
11804 --- a/arch/x86/include/asm/smp.h
11805 +++ b/arch/x86/include/asm/smp.h
11806 @@ -24,7 +24,7 @@ extern unsigned int num_processors;
11807 DECLARE_PER_CPU(cpumask_var_t, cpu_sibling_map);
11808 DECLARE_PER_CPU(cpumask_var_t, cpu_core_map);
11809 DECLARE_PER_CPU(u16, cpu_llc_id);
11810 -DECLARE_PER_CPU(int, cpu_number);
11811 +DECLARE_PER_CPU(unsigned int, cpu_number);
11812
11813 static inline struct cpumask *cpu_sibling_mask(int cpu)
11814 {
11815 @@ -40,10 +40,7 @@ DECLARE_EARLY_PER_CPU(u16, x86_cpu_to_apicid);
11816 DECLARE_EARLY_PER_CPU(u16, x86_bios_cpu_apicid);
11817
11818 /* Static state in head.S used to set up a CPU */
11819 -extern struct {
11820 - void *sp;
11821 - unsigned short ss;
11822 -} stack_start;
11823 +extern unsigned long stack_start; /* Initial stack pointer address */
11824
11825 struct smp_ops {
11826 void (*smp_prepare_boot_cpu)(void);
11827 @@ -60,7 +57,7 @@ struct smp_ops {
11828
11829 void (*send_call_func_ipi)(const struct cpumask *mask);
11830 void (*send_call_func_single_ipi)(int cpu);
11831 -};
11832 +} __no_const;
11833
11834 /* Globals due to paravirt */
11835 extern void set_cpu_sibling_map(int cpu);
11836 @@ -175,14 +172,8 @@ extern unsigned disabled_cpus __cpuinitdata;
11837 extern int safe_smp_processor_id(void);
11838
11839 #elif defined(CONFIG_X86_64_SMP)
11840 -#define raw_smp_processor_id() (percpu_read(cpu_number))
11841 -
11842 -#define stack_smp_processor_id() \
11843 -({ \
11844 - struct thread_info *ti; \
11845 - __asm__("andq %%rsp,%0; ":"=r" (ti) : "0" (CURRENT_MASK)); \
11846 - ti->cpu; \
11847 -})
11848 +#define raw_smp_processor_id() (percpu_read(cpu_number))
11849 +#define stack_smp_processor_id() raw_smp_processor_id()
11850 #define safe_smp_processor_id() smp_processor_id()
11851
11852 #endif
11853 diff --git a/arch/x86/include/asm/spinlock.h b/arch/x86/include/asm/spinlock.h
11854 index 4e77853..4359783 100644
11855 --- a/arch/x86/include/asm/spinlock.h
11856 +++ b/arch/x86/include/asm/spinlock.h
11857 @@ -249,6 +249,14 @@ static inline int __raw_write_can_lock(raw_rwlock_t *lock)
11858 static inline void __raw_read_lock(raw_rwlock_t *rw)
11859 {
11860 asm volatile(LOCK_PREFIX " subl $1,(%0)\n\t"
11861 +
11862 +#ifdef CONFIG_PAX_REFCOUNT
11863 + "jno 0f\n"
11864 + LOCK_PREFIX " addl $1,(%0)\n"
11865 + "int $4\n0:\n"
11866 + _ASM_EXTABLE(0b, 0b)
11867 +#endif
11868 +
11869 "jns 1f\n"
11870 "call __read_lock_failed\n\t"
11871 "1:\n"
11872 @@ -258,6 +266,14 @@ static inline void __raw_read_lock(raw_rwlock_t *rw)
11873 static inline void __raw_write_lock(raw_rwlock_t *rw)
11874 {
11875 asm volatile(LOCK_PREFIX " subl %1,(%0)\n\t"
11876 +
11877 +#ifdef CONFIG_PAX_REFCOUNT
11878 + "jno 0f\n"
11879 + LOCK_PREFIX " addl %1,(%0)\n"
11880 + "int $4\n0:\n"
11881 + _ASM_EXTABLE(0b, 0b)
11882 +#endif
11883 +
11884 "jz 1f\n"
11885 "call __write_lock_failed\n\t"
11886 "1:\n"
11887 @@ -286,12 +302,29 @@ static inline int __raw_write_trylock(raw_rwlock_t *lock)
11888
11889 static inline void __raw_read_unlock(raw_rwlock_t *rw)
11890 {
11891 - asm volatile(LOCK_PREFIX "incl %0" :"+m" (rw->lock) : : "memory");
11892 + asm volatile(LOCK_PREFIX "incl %0\n"
11893 +
11894 +#ifdef CONFIG_PAX_REFCOUNT
11895 + "jno 0f\n"
11896 + LOCK_PREFIX "decl %0\n"
11897 + "int $4\n0:\n"
11898 + _ASM_EXTABLE(0b, 0b)
11899 +#endif
11900 +
11901 + :"+m" (rw->lock) : : "memory");
11902 }
11903
11904 static inline void __raw_write_unlock(raw_rwlock_t *rw)
11905 {
11906 - asm volatile(LOCK_PREFIX "addl %1, %0"
11907 + asm volatile(LOCK_PREFIX "addl %1, %0\n"
11908 +
11909 +#ifdef CONFIG_PAX_REFCOUNT
11910 + "jno 0f\n"
11911 + LOCK_PREFIX "subl %1, %0\n"
11912 + "int $4\n0:\n"
11913 + _ASM_EXTABLE(0b, 0b)
11914 +#endif
11915 +
11916 : "+m" (rw->lock) : "i" (RW_LOCK_BIAS) : "memory");
11917 }
11918
11919 diff --git a/arch/x86/include/asm/stackprotector.h b/arch/x86/include/asm/stackprotector.h
11920 index 1575177..cb23f52 100644
11921 --- a/arch/x86/include/asm/stackprotector.h
11922 +++ b/arch/x86/include/asm/stackprotector.h
11923 @@ -48,7 +48,7 @@
11924 * head_32 for boot CPU and setup_per_cpu_areas() for others.
11925 */
11926 #define GDT_STACK_CANARY_INIT \
11927 - [GDT_ENTRY_STACK_CANARY] = GDT_ENTRY_INIT(0x4090, 0, 0x18),
11928 + [GDT_ENTRY_STACK_CANARY] = GDT_ENTRY_INIT(0x4090, 0, 0x17),
11929
11930 /*
11931 * Initialize the stackprotector canary value.
11932 @@ -113,7 +113,7 @@ static inline void setup_stack_canary_segment(int cpu)
11933
11934 static inline void load_stack_canary_segment(void)
11935 {
11936 -#ifdef CONFIG_X86_32
11937 +#if defined(CONFIG_X86_32) && !defined(CONFIG_PAX_MEMORY_UDEREF)
11938 asm volatile ("mov %0, %%gs" : : "r" (0));
11939 #endif
11940 }
11941 diff --git a/arch/x86/include/asm/system.h b/arch/x86/include/asm/system.h
11942 index e0fbf29..858ef4a 100644
11943 --- a/arch/x86/include/asm/system.h
11944 +++ b/arch/x86/include/asm/system.h
11945 @@ -132,7 +132,7 @@ do { \
11946 "thread_return:\n\t" \
11947 "movq "__percpu_arg([current_task])",%%rsi\n\t" \
11948 __switch_canary \
11949 - "movq %P[thread_info](%%rsi),%%r8\n\t" \
11950 + "movq "__percpu_arg([thread_info])",%%r8\n\t" \
11951 "movq %%rax,%%rdi\n\t" \
11952 "testl %[_tif_fork],%P[ti_flags](%%r8)\n\t" \
11953 "jnz ret_from_fork\n\t" \
11954 @@ -143,7 +143,7 @@ do { \
11955 [threadrsp] "i" (offsetof(struct task_struct, thread.sp)), \
11956 [ti_flags] "i" (offsetof(struct thread_info, flags)), \
11957 [_tif_fork] "i" (_TIF_FORK), \
11958 - [thread_info] "i" (offsetof(struct task_struct, stack)), \
11959 + [thread_info] "m" (per_cpu_var(current_tinfo)), \
11960 [current_task] "m" (per_cpu_var(current_task)) \
11961 __switch_canary_iparam \
11962 : "memory", "cc" __EXTRA_CLOBBER)
11963 @@ -200,7 +200,7 @@ static inline unsigned long get_limit(unsigned long segment)
11964 {
11965 unsigned long __limit;
11966 asm("lsll %1,%0" : "=r" (__limit) : "r" (segment));
11967 - return __limit + 1;
11968 + return __limit;
11969 }
11970
11971 static inline void native_clts(void)
11972 @@ -340,12 +340,12 @@ void enable_hlt(void);
11973
11974 void cpu_idle_wait(void);
11975
11976 -extern unsigned long arch_align_stack(unsigned long sp);
11977 +#define arch_align_stack(x) ((x) & ~0xfUL)
11978 extern void free_init_pages(char *what, unsigned long begin, unsigned long end);
11979
11980 void default_idle(void);
11981
11982 -void stop_this_cpu(void *dummy);
11983 +void stop_this_cpu(void *dummy) __noreturn;
11984
11985 /*
11986 * Force strict CPU ordering.
11987 diff --git a/arch/x86/include/asm/thread_info.h b/arch/x86/include/asm/thread_info.h
11988 index 19c3ce4..8962535 100644
11989 --- a/arch/x86/include/asm/thread_info.h
11990 +++ b/arch/x86/include/asm/thread_info.h
11991 @@ -10,6 +10,7 @@
11992 #include <linux/compiler.h>
11993 #include <asm/page.h>
11994 #include <asm/types.h>
11995 +#include <asm/percpu.h>
11996
11997 /*
11998 * low level task data that entry.S needs immediate access to
11999 @@ -24,7 +25,6 @@ struct exec_domain;
12000 #include <asm/atomic.h>
12001
12002 struct thread_info {
12003 - struct task_struct *task; /* main task structure */
12004 struct exec_domain *exec_domain; /* execution domain */
12005 __u32 flags; /* low level flags */
12006 __u32 status; /* thread synchronous flags */
12007 @@ -34,18 +34,12 @@ struct thread_info {
12008 mm_segment_t addr_limit;
12009 struct restart_block restart_block;
12010 void __user *sysenter_return;
12011 -#ifdef CONFIG_X86_32
12012 - unsigned long previous_esp; /* ESP of the previous stack in
12013 - case of nested (IRQ) stacks
12014 - */
12015 - __u8 supervisor_stack[0];
12016 -#endif
12017 + unsigned long lowest_stack;
12018 int uaccess_err;
12019 };
12020
12021 -#define INIT_THREAD_INFO(tsk) \
12022 +#define INIT_THREAD_INFO \
12023 { \
12024 - .task = &tsk, \
12025 .exec_domain = &default_exec_domain, \
12026 .flags = 0, \
12027 .cpu = 0, \
12028 @@ -56,7 +50,7 @@ struct thread_info {
12029 }, \
12030 }
12031
12032 -#define init_thread_info (init_thread_union.thread_info)
12033 +#define init_thread_info (init_thread_union.stack)
12034 #define init_stack (init_thread_union.stack)
12035
12036 #else /* !__ASSEMBLY__ */
12037 @@ -163,45 +157,40 @@ struct thread_info {
12038 #define alloc_thread_info(tsk) \
12039 ((struct thread_info *)__get_free_pages(THREAD_FLAGS, THREAD_ORDER))
12040
12041 -#ifdef CONFIG_X86_32
12042 -
12043 -#define STACK_WARN (THREAD_SIZE/8)
12044 -/*
12045 - * macros/functions for gaining access to the thread information structure
12046 - *
12047 - * preempt_count needs to be 1 initially, until the scheduler is functional.
12048 - */
12049 -#ifndef __ASSEMBLY__
12050 -
12051 -
12052 -/* how to get the current stack pointer from C */
12053 -register unsigned long current_stack_pointer asm("esp") __used;
12054 -
12055 -/* how to get the thread information struct from C */
12056 -static inline struct thread_info *current_thread_info(void)
12057 -{
12058 - return (struct thread_info *)
12059 - (current_stack_pointer & ~(THREAD_SIZE - 1));
12060 -}
12061 -
12062 -#else /* !__ASSEMBLY__ */
12063 -
12064 +#ifdef __ASSEMBLY__
12065 /* how to get the thread information struct from ASM */
12066 #define GET_THREAD_INFO(reg) \
12067 - movl $-THREAD_SIZE, reg; \
12068 - andl %esp, reg
12069 + mov PER_CPU_VAR(current_tinfo), reg
12070
12071 /* use this one if reg already contains %esp */
12072 -#define GET_THREAD_INFO_WITH_ESP(reg) \
12073 - andl $-THREAD_SIZE, reg
12074 +#define GET_THREAD_INFO_WITH_ESP(reg) GET_THREAD_INFO(reg)
12075 +#else
12076 +/* how to get the thread information struct from C */
12077 +DECLARE_PER_CPU(struct thread_info *, current_tinfo);
12078 +
12079 +static __always_inline struct thread_info *current_thread_info(void)
12080 +{
12081 + return percpu_read_stable(current_tinfo);
12082 +}
12083 +#endif
12084 +
12085 +#ifdef CONFIG_X86_32
12086 +
12087 +#define STACK_WARN (THREAD_SIZE/8)
12088 +/*
12089 + * macros/functions for gaining access to the thread information structure
12090 + *
12091 + * preempt_count needs to be 1 initially, until the scheduler is functional.
12092 + */
12093 +#ifndef __ASSEMBLY__
12094 +
12095 +/* how to get the current stack pointer from C */
12096 +register unsigned long current_stack_pointer asm("esp") __used;
12097
12098 #endif
12099
12100 #else /* X86_32 */
12101
12102 -#include <asm/percpu.h>
12103 -#define KERNEL_STACK_OFFSET (5*8)
12104 -
12105 /*
12106 * macros/functions for gaining access to the thread information structure
12107 * preempt_count needs to be 1 initially, until the scheduler is functional.
12108 @@ -209,21 +198,8 @@ static inline struct thread_info *current_thread_info(void)
12109 #ifndef __ASSEMBLY__
12110 DECLARE_PER_CPU(unsigned long, kernel_stack);
12111
12112 -static inline struct thread_info *current_thread_info(void)
12113 -{
12114 - struct thread_info *ti;
12115 - ti = (void *)(percpu_read_stable(kernel_stack) +
12116 - KERNEL_STACK_OFFSET - THREAD_SIZE);
12117 - return ti;
12118 -}
12119 -
12120 -#else /* !__ASSEMBLY__ */
12121 -
12122 -/* how to get the thread information struct from ASM */
12123 -#define GET_THREAD_INFO(reg) \
12124 - movq PER_CPU_VAR(kernel_stack),reg ; \
12125 - subq $(THREAD_SIZE-KERNEL_STACK_OFFSET),reg
12126 -
12127 +/* how to get the current stack pointer from C */
12128 +register unsigned long current_stack_pointer asm("rsp") __used;
12129 #endif
12130
12131 #endif /* !X86_32 */
12132 @@ -260,5 +236,16 @@ extern void arch_task_cache_init(void);
12133 extern void free_thread_info(struct thread_info *ti);
12134 extern int arch_dup_task_struct(struct task_struct *dst, struct task_struct *src);
12135 #define arch_task_cache_init arch_task_cache_init
12136 +
12137 +#define __HAVE_THREAD_FUNCTIONS
12138 +#define task_thread_info(task) (&(task)->tinfo)
12139 +#define task_stack_page(task) ((task)->stack)
12140 +#define setup_thread_stack(p, org) do {} while (0)
12141 +#define end_of_stack(p) ((unsigned long *)task_stack_page(p) + 1)
12142 +
12143 +#define __HAVE_ARCH_TASK_STRUCT_ALLOCATOR
12144 +extern struct task_struct *alloc_task_struct(void);
12145 +extern void free_task_struct(struct task_struct *);
12146 +
12147 #endif
12148 #endif /* _ASM_X86_THREAD_INFO_H */
12149 diff --git a/arch/x86/include/asm/uaccess.h b/arch/x86/include/asm/uaccess.h
12150 index 61c5874..8a046e9 100644
12151 --- a/arch/x86/include/asm/uaccess.h
12152 +++ b/arch/x86/include/asm/uaccess.h
12153 @@ -8,12 +8,15 @@
12154 #include <linux/thread_info.h>
12155 #include <linux/prefetch.h>
12156 #include <linux/string.h>
12157 +#include <linux/sched.h>
12158 #include <asm/asm.h>
12159 #include <asm/page.h>
12160
12161 #define VERIFY_READ 0
12162 #define VERIFY_WRITE 1
12163
12164 +extern void check_object_size(const void *ptr, unsigned long n, bool to);
12165 +
12166 /*
12167 * The fs value determines whether argument validity checking should be
12168 * performed or not. If get_fs() == USER_DS, checking is performed, with
12169 @@ -29,7 +32,12 @@
12170
12171 #define get_ds() (KERNEL_DS)
12172 #define get_fs() (current_thread_info()->addr_limit)
12173 +#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_MEMORY_UDEREF)
12174 +void __set_fs(mm_segment_t x);
12175 +void set_fs(mm_segment_t x);
12176 +#else
12177 #define set_fs(x) (current_thread_info()->addr_limit = (x))
12178 +#endif
12179
12180 #define segment_eq(a, b) ((a).seg == (b).seg)
12181
12182 @@ -77,7 +85,33 @@
12183 * checks that the pointer is in the user space range - after calling
12184 * this function, memory access functions may still return -EFAULT.
12185 */
12186 -#define access_ok(type, addr, size) (likely(__range_not_ok(addr, size) == 0))
12187 +#define __access_ok(type, addr, size) (likely(__range_not_ok(addr, size) == 0))
12188 +#define access_ok(type, addr, size) \
12189 +({ \
12190 + long __size = size; \
12191 + unsigned long __addr = (unsigned long)addr; \
12192 + unsigned long __addr_ao = __addr & PAGE_MASK; \
12193 + unsigned long __end_ao = __addr + __size - 1; \
12194 + bool __ret_ao = __range_not_ok(__addr, __size) == 0; \
12195 + if (__ret_ao && unlikely((__end_ao ^ __addr_ao) & PAGE_MASK)) { \
12196 + while(__addr_ao <= __end_ao) { \
12197 + char __c_ao; \
12198 + __addr_ao += PAGE_SIZE; \
12199 + if (__size > PAGE_SIZE) \
12200 + cond_resched(); \
12201 + if (__get_user(__c_ao, (char __user *)__addr)) \
12202 + break; \
12203 + if (type != VERIFY_WRITE) { \
12204 + __addr = __addr_ao; \
12205 + continue; \
12206 + } \
12207 + if (__put_user(__c_ao, (char __user *)__addr)) \
12208 + break; \
12209 + __addr = __addr_ao; \
12210 + } \
12211 + } \
12212 + __ret_ao; \
12213 +})
12214
12215 /*
12216 * The exception table consists of pairs of addresses: the first is the
12217 @@ -183,12 +217,20 @@ extern int __get_user_bad(void);
12218 asm volatile("call __put_user_" #size : "=a" (__ret_pu) \
12219 : "0" ((typeof(*(ptr)))(x)), "c" (ptr) : "ebx")
12220
12221 -
12222 +#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_MEMORY_UDEREF)
12223 +#define __copyuser_seg "gs;"
12224 +#define __COPYUSER_SET_ES "pushl %%gs; popl %%es\n"
12225 +#define __COPYUSER_RESTORE_ES "pushl %%ss; popl %%es\n"
12226 +#else
12227 +#define __copyuser_seg
12228 +#define __COPYUSER_SET_ES
12229 +#define __COPYUSER_RESTORE_ES
12230 +#endif
12231
12232 #ifdef CONFIG_X86_32
12233 #define __put_user_asm_u64(x, addr, err, errret) \
12234 - asm volatile("1: movl %%eax,0(%2)\n" \
12235 - "2: movl %%edx,4(%2)\n" \
12236 + asm volatile("1: "__copyuser_seg"movl %%eax,0(%2)\n" \
12237 + "2: "__copyuser_seg"movl %%edx,4(%2)\n" \
12238 "3:\n" \
12239 ".section .fixup,\"ax\"\n" \
12240 "4: movl %3,%0\n" \
12241 @@ -200,8 +242,8 @@ extern int __get_user_bad(void);
12242 : "A" (x), "r" (addr), "i" (errret), "0" (err))
12243
12244 #define __put_user_asm_ex_u64(x, addr) \
12245 - asm volatile("1: movl %%eax,0(%1)\n" \
12246 - "2: movl %%edx,4(%1)\n" \
12247 + asm volatile("1: "__copyuser_seg"movl %%eax,0(%1)\n" \
12248 + "2: "__copyuser_seg"movl %%edx,4(%1)\n" \
12249 "3:\n" \
12250 _ASM_EXTABLE(1b, 2b - 1b) \
12251 _ASM_EXTABLE(2b, 3b - 2b) \
12252 @@ -253,7 +295,7 @@ extern void __put_user_8(void);
12253 __typeof__(*(ptr)) __pu_val; \
12254 __chk_user_ptr(ptr); \
12255 might_fault(); \
12256 - __pu_val = x; \
12257 + __pu_val = (x); \
12258 switch (sizeof(*(ptr))) { \
12259 case 1: \
12260 __put_user_x(1, __pu_val, ptr, __ret_pu); \
12261 @@ -374,7 +416,7 @@ do { \
12262 } while (0)
12263
12264 #define __get_user_asm(x, addr, err, itype, rtype, ltype, errret) \
12265 - asm volatile("1: mov"itype" %2,%"rtype"1\n" \
12266 + asm volatile("1: "__copyuser_seg"mov"itype" %2,%"rtype"1\n"\
12267 "2:\n" \
12268 ".section .fixup,\"ax\"\n" \
12269 "3: mov %3,%0\n" \
12270 @@ -382,7 +424,7 @@ do { \
12271 " jmp 2b\n" \
12272 ".previous\n" \
12273 _ASM_EXTABLE(1b, 3b) \
12274 - : "=r" (err), ltype(x) \
12275 + : "=r" (err), ltype (x) \
12276 : "m" (__m(addr)), "i" (errret), "0" (err))
12277
12278 #define __get_user_size_ex(x, ptr, size) \
12279 @@ -407,7 +449,7 @@ do { \
12280 } while (0)
12281
12282 #define __get_user_asm_ex(x, addr, itype, rtype, ltype) \
12283 - asm volatile("1: mov"itype" %1,%"rtype"0\n" \
12284 + asm volatile("1: "__copyuser_seg"mov"itype" %1,%"rtype"0\n"\
12285 "2:\n" \
12286 _ASM_EXTABLE(1b, 2b - 1b) \
12287 : ltype(x) : "m" (__m(addr)))
12288 @@ -424,13 +466,24 @@ do { \
12289 int __gu_err; \
12290 unsigned long __gu_val; \
12291 __get_user_size(__gu_val, (ptr), (size), __gu_err, -EFAULT); \
12292 - (x) = (__force __typeof__(*(ptr)))__gu_val; \
12293 + (x) = (__typeof__(*(ptr)))__gu_val; \
12294 __gu_err; \
12295 })
12296
12297 /* FIXME: this hack is definitely wrong -AK */
12298 struct __large_struct { unsigned long buf[100]; };
12299 -#define __m(x) (*(struct __large_struct __user *)(x))
12300 +#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
12301 +#define ____m(x) \
12302 +({ \
12303 + unsigned long ____x = (unsigned long)(x); \
12304 + if (____x < PAX_USER_SHADOW_BASE) \
12305 + ____x += PAX_USER_SHADOW_BASE; \
12306 + (void __user *)____x; \
12307 +})
12308 +#else
12309 +#define ____m(x) (x)
12310 +#endif
12311 +#define __m(x) (*(struct __large_struct __user *)____m(x))
12312
12313 /*
12314 * Tell gcc we read from memory instead of writing: this is because
12315 @@ -438,7 +491,7 @@ struct __large_struct { unsigned long buf[100]; };
12316 * aliasing issues.
12317 */
12318 #define __put_user_asm(x, addr, err, itype, rtype, ltype, errret) \
12319 - asm volatile("1: mov"itype" %"rtype"1,%2\n" \
12320 + asm volatile("1: "__copyuser_seg"mov"itype" %"rtype"1,%2\n"\
12321 "2:\n" \
12322 ".section .fixup,\"ax\"\n" \
12323 "3: mov %3,%0\n" \
12324 @@ -446,10 +499,10 @@ struct __large_struct { unsigned long buf[100]; };
12325 ".previous\n" \
12326 _ASM_EXTABLE(1b, 3b) \
12327 : "=r"(err) \
12328 - : ltype(x), "m" (__m(addr)), "i" (errret), "0" (err))
12329 + : ltype (x), "m" (__m(addr)), "i" (errret), "0" (err))
12330
12331 #define __put_user_asm_ex(x, addr, itype, rtype, ltype) \
12332 - asm volatile("1: mov"itype" %"rtype"0,%1\n" \
12333 + asm volatile("1: "__copyuser_seg"mov"itype" %"rtype"0,%1\n"\
12334 "2:\n" \
12335 _ASM_EXTABLE(1b, 2b - 1b) \
12336 : : ltype(x), "m" (__m(addr)))
12337 @@ -488,8 +541,12 @@ struct __large_struct { unsigned long buf[100]; };
12338 * On error, the variable @x is set to zero.
12339 */
12340
12341 +#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
12342 +#define __get_user(x, ptr) get_user((x), (ptr))
12343 +#else
12344 #define __get_user(x, ptr) \
12345 __get_user_nocheck((x), (ptr), sizeof(*(ptr)))
12346 +#endif
12347
12348 /**
12349 * __put_user: - Write a simple value into user space, with less checking.
12350 @@ -511,8 +568,12 @@ struct __large_struct { unsigned long buf[100]; };
12351 * Returns zero on success, or -EFAULT on error.
12352 */
12353
12354 +#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
12355 +#define __put_user(x, ptr) put_user((x), (ptr))
12356 +#else
12357 #define __put_user(x, ptr) \
12358 __put_user_nocheck((__typeof__(*(ptr)))(x), (ptr), sizeof(*(ptr)))
12359 +#endif
12360
12361 #define __get_user_unaligned __get_user
12362 #define __put_user_unaligned __put_user
12363 @@ -530,7 +591,7 @@ struct __large_struct { unsigned long buf[100]; };
12364 #define get_user_ex(x, ptr) do { \
12365 unsigned long __gue_val; \
12366 __get_user_size_ex((__gue_val), (ptr), (sizeof(*(ptr)))); \
12367 - (x) = (__force __typeof__(*(ptr)))__gue_val; \
12368 + (x) = (__typeof__(*(ptr)))__gue_val; \
12369 } while (0)
12370
12371 #ifdef CONFIG_X86_WP_WORKS_OK
12372 @@ -567,6 +628,7 @@ extern struct movsl_mask {
12373
12374 #define ARCH_HAS_NOCACHE_UACCESS 1
12375
12376 +#define ARCH_HAS_SORT_EXTABLE
12377 #ifdef CONFIG_X86_32
12378 # include "uaccess_32.h"
12379 #else
12380 diff --git a/arch/x86/include/asm/uaccess_32.h b/arch/x86/include/asm/uaccess_32.h
12381 index 632fb44..e30e334 100644
12382 --- a/arch/x86/include/asm/uaccess_32.h
12383 +++ b/arch/x86/include/asm/uaccess_32.h
12384 @@ -44,6 +44,11 @@ unsigned long __must_check __copy_from_user_ll_nocache_nozero
12385 static __always_inline unsigned long __must_check
12386 __copy_to_user_inatomic(void __user *to, const void *from, unsigned long n)
12387 {
12388 + pax_track_stack();
12389 +
12390 + if ((long)n < 0)
12391 + return n;
12392 +
12393 if (__builtin_constant_p(n)) {
12394 unsigned long ret;
12395
12396 @@ -62,6 +67,8 @@ __copy_to_user_inatomic(void __user *to, const void *from, unsigned long n)
12397 return ret;
12398 }
12399 }
12400 + if (!__builtin_constant_p(n))
12401 + check_object_size(from, n, true);
12402 return __copy_to_user_ll(to, from, n);
12403 }
12404
12405 @@ -83,12 +90,16 @@ static __always_inline unsigned long __must_check
12406 __copy_to_user(void __user *to, const void *from, unsigned long n)
12407 {
12408 might_fault();
12409 +
12410 return __copy_to_user_inatomic(to, from, n);
12411 }
12412
12413 static __always_inline unsigned long
12414 __copy_from_user_inatomic(void *to, const void __user *from, unsigned long n)
12415 {
12416 + if ((long)n < 0)
12417 + return n;
12418 +
12419 /* Avoid zeroing the tail if the copy fails..
12420 * If 'n' is constant and 1, 2, or 4, we do still zero on a failure,
12421 * but as the zeroing behaviour is only significant when n is not
12422 @@ -138,6 +149,12 @@ static __always_inline unsigned long
12423 __copy_from_user(void *to, const void __user *from, unsigned long n)
12424 {
12425 might_fault();
12426 +
12427 + pax_track_stack();
12428 +
12429 + if ((long)n < 0)
12430 + return n;
12431 +
12432 if (__builtin_constant_p(n)) {
12433 unsigned long ret;
12434
12435 @@ -153,6 +170,8 @@ __copy_from_user(void *to, const void __user *from, unsigned long n)
12436 return ret;
12437 }
12438 }
12439 + if (!__builtin_constant_p(n))
12440 + check_object_size(to, n, false);
12441 return __copy_from_user_ll(to, from, n);
12442 }
12443
12444 @@ -160,6 +179,10 @@ static __always_inline unsigned long __copy_from_user_nocache(void *to,
12445 const void __user *from, unsigned long n)
12446 {
12447 might_fault();
12448 +
12449 + if ((long)n < 0)
12450 + return n;
12451 +
12452 if (__builtin_constant_p(n)) {
12453 unsigned long ret;
12454
12455 @@ -182,14 +205,62 @@ static __always_inline unsigned long
12456 __copy_from_user_inatomic_nocache(void *to, const void __user *from,
12457 unsigned long n)
12458 {
12459 - return __copy_from_user_ll_nocache_nozero(to, from, n);
12460 + if ((long)n < 0)
12461 + return n;
12462 +
12463 + return __copy_from_user_ll_nocache_nozero(to, from, n);
12464 +}
12465 +
12466 +/**
12467 + * copy_to_user: - Copy a block of data into user space.
12468 + * @to: Destination address, in user space.
12469 + * @from: Source address, in kernel space.
12470 + * @n: Number of bytes to copy.
12471 + *
12472 + * Context: User context only. This function may sleep.
12473 + *
12474 + * Copy data from kernel space to user space.
12475 + *
12476 + * Returns number of bytes that could not be copied.
12477 + * On success, this will be zero.
12478 + */
12479 +static __always_inline unsigned long __must_check
12480 +copy_to_user(void __user *to, const void *from, unsigned long n)
12481 +{
12482 + if (access_ok(VERIFY_WRITE, to, n))
12483 + n = __copy_to_user(to, from, n);
12484 + return n;
12485 +}
12486 +
12487 +/**
12488 + * copy_from_user: - Copy a block of data from user space.
12489 + * @to: Destination address, in kernel space.
12490 + * @from: Source address, in user space.
12491 + * @n: Number of bytes to copy.
12492 + *
12493 + * Context: User context only. This function may sleep.
12494 + *
12495 + * Copy data from user space to kernel space.
12496 + *
12497 + * Returns number of bytes that could not be copied.
12498 + * On success, this will be zero.
12499 + *
12500 + * If some data could not be copied, this function will pad the copied
12501 + * data to the requested size using zero bytes.
12502 + */
12503 +static __always_inline unsigned long __must_check
12504 +copy_from_user(void *to, const void __user *from, unsigned long n)
12505 +{
12506 + if (access_ok(VERIFY_READ, from, n))
12507 + n = __copy_from_user(to, from, n);
12508 + else if ((long)n > 0) {
12509 + if (!__builtin_constant_p(n))
12510 + check_object_size(to, n, false);
12511 + memset(to, 0, n);
12512 + }
12513 + return n;
12514 }
12515
12516 -unsigned long __must_check copy_to_user(void __user *to,
12517 - const void *from, unsigned long n);
12518 -unsigned long __must_check copy_from_user(void *to,
12519 - const void __user *from,
12520 - unsigned long n);
12521 long __must_check strncpy_from_user(char *dst, const char __user *src,
12522 long count);
12523 long __must_check __strncpy_from_user(char *dst,
12524 diff --git a/arch/x86/include/asm/uaccess_64.h b/arch/x86/include/asm/uaccess_64.h
12525 index db24b21..f595ae7 100644
12526 --- a/arch/x86/include/asm/uaccess_64.h
12527 +++ b/arch/x86/include/asm/uaccess_64.h
12528 @@ -9,6 +9,9 @@
12529 #include <linux/prefetch.h>
12530 #include <linux/lockdep.h>
12531 #include <asm/page.h>
12532 +#include <asm/pgtable.h>
12533 +
12534 +#define set_fs(x) (current_thread_info()->addr_limit = (x))
12535
12536 /*
12537 * Copy To/From Userspace
12538 @@ -16,116 +19,205 @@
12539
12540 /* Handles exceptions in both to and from, but doesn't do access_ok */
12541 __must_check unsigned long
12542 -copy_user_generic(void *to, const void *from, unsigned len);
12543 +copy_user_generic(void *to, const void *from, unsigned long len);
12544
12545 __must_check unsigned long
12546 -copy_to_user(void __user *to, const void *from, unsigned len);
12547 -__must_check unsigned long
12548 -copy_from_user(void *to, const void __user *from, unsigned len);
12549 -__must_check unsigned long
12550 -copy_in_user(void __user *to, const void __user *from, unsigned len);
12551 +copy_in_user(void __user *to, const void __user *from, unsigned long len);
12552
12553 static __always_inline __must_check
12554 -int __copy_from_user(void *dst, const void __user *src, unsigned size)
12555 +unsigned long __copy_from_user(void *dst, const void __user *src, unsigned long size)
12556 {
12557 - int ret = 0;
12558 + unsigned ret = 0;
12559
12560 might_fault();
12561 - if (!__builtin_constant_p(size))
12562 - return copy_user_generic(dst, (__force void *)src, size);
12563 +
12564 + if (size > INT_MAX)
12565 + return size;
12566 +
12567 +#ifdef CONFIG_PAX_MEMORY_UDEREF
12568 + if (!__access_ok(VERIFY_READ, src, size))
12569 + return size;
12570 +#endif
12571 +
12572 + if (!__builtin_constant_p(size)) {
12573 + check_object_size(dst, size, false);
12574 +
12575 +#ifdef CONFIG_PAX_MEMORY_UDEREF
12576 + if ((unsigned long)src < PAX_USER_SHADOW_BASE)
12577 + src += PAX_USER_SHADOW_BASE;
12578 +#endif
12579 +
12580 + return copy_user_generic(dst, (__force_kernel const void *)src, size);
12581 + }
12582 switch (size) {
12583 - case 1:__get_user_asm(*(u8 *)dst, (u8 __user *)src,
12584 + case 1:__get_user_asm(*(u8 *)dst, (const u8 __user *)src,
12585 ret, "b", "b", "=q", 1);
12586 return ret;
12587 - case 2:__get_user_asm(*(u16 *)dst, (u16 __user *)src,
12588 + case 2:__get_user_asm(*(u16 *)dst, (const u16 __user *)src,
12589 ret, "w", "w", "=r", 2);
12590 return ret;
12591 - case 4:__get_user_asm(*(u32 *)dst, (u32 __user *)src,
12592 + case 4:__get_user_asm(*(u32 *)dst, (const u32 __user *)src,
12593 ret, "l", "k", "=r", 4);
12594 return ret;
12595 - case 8:__get_user_asm(*(u64 *)dst, (u64 __user *)src,
12596 + case 8:__get_user_asm(*(u64 *)dst, (const u64 __user *)src,
12597 ret, "q", "", "=r", 8);
12598 return ret;
12599 case 10:
12600 - __get_user_asm(*(u64 *)dst, (u64 __user *)src,
12601 + __get_user_asm(*(u64 *)dst, (const u64 __user *)src,
12602 ret, "q", "", "=r", 10);
12603 if (unlikely(ret))
12604 return ret;
12605 __get_user_asm(*(u16 *)(8 + (char *)dst),
12606 - (u16 __user *)(8 + (char __user *)src),
12607 + (const u16 __user *)(8 + (const char __user *)src),
12608 ret, "w", "w", "=r", 2);
12609 return ret;
12610 case 16:
12611 - __get_user_asm(*(u64 *)dst, (u64 __user *)src,
12612 + __get_user_asm(*(u64 *)dst, (const u64 __user *)src,
12613 ret, "q", "", "=r", 16);
12614 if (unlikely(ret))
12615 return ret;
12616 __get_user_asm(*(u64 *)(8 + (char *)dst),
12617 - (u64 __user *)(8 + (char __user *)src),
12618 + (const u64 __user *)(8 + (const char __user *)src),
12619 ret, "q", "", "=r", 8);
12620 return ret;
12621 default:
12622 - return copy_user_generic(dst, (__force void *)src, size);
12623 +
12624 +#ifdef CONFIG_PAX_MEMORY_UDEREF
12625 + if ((unsigned long)src < PAX_USER_SHADOW_BASE)
12626 + src += PAX_USER_SHADOW_BASE;
12627 +#endif
12628 +
12629 + return copy_user_generic(dst, (__force_kernel const void *)src, size);
12630 }
12631 }
12632
12633 static __always_inline __must_check
12634 -int __copy_to_user(void __user *dst, const void *src, unsigned size)
12635 +unsigned long __copy_to_user(void __user *dst, const void *src, unsigned long size)
12636 {
12637 - int ret = 0;
12638 + unsigned ret = 0;
12639
12640 might_fault();
12641 - if (!__builtin_constant_p(size))
12642 - return copy_user_generic((__force void *)dst, src, size);
12643 +
12644 + pax_track_stack();
12645 +
12646 + if (size > INT_MAX)
12647 + return size;
12648 +
12649 +#ifdef CONFIG_PAX_MEMORY_UDEREF
12650 + if (!__access_ok(VERIFY_WRITE, dst, size))
12651 + return size;
12652 +#endif
12653 +
12654 + if (!__builtin_constant_p(size)) {
12655 + check_object_size(src, size, true);
12656 +
12657 +#ifdef CONFIG_PAX_MEMORY_UDEREF
12658 + if ((unsigned long)dst < PAX_USER_SHADOW_BASE)
12659 + dst += PAX_USER_SHADOW_BASE;
12660 +#endif
12661 +
12662 + return copy_user_generic((__force_kernel void *)dst, src, size);
12663 + }
12664 switch (size) {
12665 - case 1:__put_user_asm(*(u8 *)src, (u8 __user *)dst,
12666 + case 1:__put_user_asm(*(const u8 *)src, (u8 __user *)dst,
12667 ret, "b", "b", "iq", 1);
12668 return ret;
12669 - case 2:__put_user_asm(*(u16 *)src, (u16 __user *)dst,
12670 + case 2:__put_user_asm(*(const u16 *)src, (u16 __user *)dst,
12671 ret, "w", "w", "ir", 2);
12672 return ret;
12673 - case 4:__put_user_asm(*(u32 *)src, (u32 __user *)dst,
12674 + case 4:__put_user_asm(*(const u32 *)src, (u32 __user *)dst,
12675 ret, "l", "k", "ir", 4);
12676 return ret;
12677 - case 8:__put_user_asm(*(u64 *)src, (u64 __user *)dst,
12678 + case 8:__put_user_asm(*(const u64 *)src, (u64 __user *)dst,
12679 ret, "q", "", "er", 8);
12680 return ret;
12681 case 10:
12682 - __put_user_asm(*(u64 *)src, (u64 __user *)dst,
12683 + __put_user_asm(*(const u64 *)src, (u64 __user *)dst,
12684 ret, "q", "", "er", 10);
12685 if (unlikely(ret))
12686 return ret;
12687 asm("":::"memory");
12688 - __put_user_asm(4[(u16 *)src], 4 + (u16 __user *)dst,
12689 + __put_user_asm(4[(const u16 *)src], 4 + (u16 __user *)dst,
12690 ret, "w", "w", "ir", 2);
12691 return ret;
12692 case 16:
12693 - __put_user_asm(*(u64 *)src, (u64 __user *)dst,
12694 + __put_user_asm(*(const u64 *)src, (u64 __user *)dst,
12695 ret, "q", "", "er", 16);
12696 if (unlikely(ret))
12697 return ret;
12698 asm("":::"memory");
12699 - __put_user_asm(1[(u64 *)src], 1 + (u64 __user *)dst,
12700 + __put_user_asm(1[(const u64 *)src], 1 + (u64 __user *)dst,
12701 ret, "q", "", "er", 8);
12702 return ret;
12703 default:
12704 - return copy_user_generic((__force void *)dst, src, size);
12705 +
12706 +#ifdef CONFIG_PAX_MEMORY_UDEREF
12707 + if ((unsigned long)dst < PAX_USER_SHADOW_BASE)
12708 + dst += PAX_USER_SHADOW_BASE;
12709 +#endif
12710 +
12711 + return copy_user_generic((__force_kernel void *)dst, src, size);
12712 + }
12713 +}
12714 +
12715 +static __always_inline __must_check
12716 +unsigned long copy_to_user(void __user *to, const void *from, unsigned long len)
12717 +{
12718 + if (access_ok(VERIFY_WRITE, to, len))
12719 + len = __copy_to_user(to, from, len);
12720 + return len;
12721 +}
12722 +
12723 +static __always_inline __must_check
12724 +unsigned long copy_from_user(void *to, const void __user *from, unsigned long len)
12725 +{
12726 + might_fault();
12727 +
12728 + if (access_ok(VERIFY_READ, from, len))
12729 + len = __copy_from_user(to, from, len);
12730 + else if (len < INT_MAX) {
12731 + if (!__builtin_constant_p(len))
12732 + check_object_size(to, len, false);
12733 + memset(to, 0, len);
12734 }
12735 + return len;
12736 }
12737
12738 static __always_inline __must_check
12739 -int __copy_in_user(void __user *dst, const void __user *src, unsigned size)
12740 +unsigned long __copy_in_user(void __user *dst, const void __user *src, unsigned long size)
12741 {
12742 - int ret = 0;
12743 + unsigned ret = 0;
12744
12745 might_fault();
12746 - if (!__builtin_constant_p(size))
12747 - return copy_user_generic((__force void *)dst,
12748 - (__force void *)src, size);
12749 +
12750 + pax_track_stack();
12751 +
12752 + if (size > INT_MAX)
12753 + return size;
12754 +
12755 +#ifdef CONFIG_PAX_MEMORY_UDEREF
12756 + if (!__access_ok(VERIFY_READ, src, size))
12757 + return size;
12758 + if (!__access_ok(VERIFY_WRITE, dst, size))
12759 + return size;
12760 +#endif
12761 +
12762 + if (!__builtin_constant_p(size)) {
12763 +
12764 +#ifdef CONFIG_PAX_MEMORY_UDEREF
12765 + if ((unsigned long)src < PAX_USER_SHADOW_BASE)
12766 + src += PAX_USER_SHADOW_BASE;
12767 + if ((unsigned long)dst < PAX_USER_SHADOW_BASE)
12768 + dst += PAX_USER_SHADOW_BASE;
12769 +#endif
12770 +
12771 + return copy_user_generic((__force_kernel void *)dst,
12772 + (__force_kernel const void *)src, size);
12773 + }
12774 switch (size) {
12775 case 1: {
12776 u8 tmp;
12777 - __get_user_asm(tmp, (u8 __user *)src,
12778 + __get_user_asm(tmp, (const u8 __user *)src,
12779 ret, "b", "b", "=q", 1);
12780 if (likely(!ret))
12781 __put_user_asm(tmp, (u8 __user *)dst,
12782 @@ -134,7 +226,7 @@ int __copy_in_user(void __user *dst, const void __user *src, unsigned size)
12783 }
12784 case 2: {
12785 u16 tmp;
12786 - __get_user_asm(tmp, (u16 __user *)src,
12787 + __get_user_asm(tmp, (const u16 __user *)src,
12788 ret, "w", "w", "=r", 2);
12789 if (likely(!ret))
12790 __put_user_asm(tmp, (u16 __user *)dst,
12791 @@ -144,7 +236,7 @@ int __copy_in_user(void __user *dst, const void __user *src, unsigned size)
12792
12793 case 4: {
12794 u32 tmp;
12795 - __get_user_asm(tmp, (u32 __user *)src,
12796 + __get_user_asm(tmp, (const u32 __user *)src,
12797 ret, "l", "k", "=r", 4);
12798 if (likely(!ret))
12799 __put_user_asm(tmp, (u32 __user *)dst,
12800 @@ -153,7 +245,7 @@ int __copy_in_user(void __user *dst, const void __user *src, unsigned size)
12801 }
12802 case 8: {
12803 u64 tmp;
12804 - __get_user_asm(tmp, (u64 __user *)src,
12805 + __get_user_asm(tmp, (const u64 __user *)src,
12806 ret, "q", "", "=r", 8);
12807 if (likely(!ret))
12808 __put_user_asm(tmp, (u64 __user *)dst,
12809 @@ -161,8 +253,16 @@ int __copy_in_user(void __user *dst, const void __user *src, unsigned size)
12810 return ret;
12811 }
12812 default:
12813 - return copy_user_generic((__force void *)dst,
12814 - (__force void *)src, size);
12815 +
12816 +#ifdef CONFIG_PAX_MEMORY_UDEREF
12817 + if ((unsigned long)src < PAX_USER_SHADOW_BASE)
12818 + src += PAX_USER_SHADOW_BASE;
12819 + if ((unsigned long)dst < PAX_USER_SHADOW_BASE)
12820 + dst += PAX_USER_SHADOW_BASE;
12821 +#endif
12822 +
12823 + return copy_user_generic((__force_kernel void *)dst,
12824 + (__force_kernel const void *)src, size);
12825 }
12826 }
12827
12828 @@ -176,33 +276,75 @@ __must_check long strlen_user(const char __user *str);
12829 __must_check unsigned long clear_user(void __user *mem, unsigned long len);
12830 __must_check unsigned long __clear_user(void __user *mem, unsigned long len);
12831
12832 -__must_check long __copy_from_user_inatomic(void *dst, const void __user *src,
12833 - unsigned size);
12834 +static __must_check __always_inline unsigned long
12835 +__copy_from_user_inatomic(void *dst, const void __user *src, unsigned long size)
12836 +{
12837 + pax_track_stack();
12838 +
12839 + if (size > INT_MAX)
12840 + return size;
12841 +
12842 +#ifdef CONFIG_PAX_MEMORY_UDEREF
12843 + if (!__access_ok(VERIFY_READ, src, size))
12844 + return size;
12845
12846 -static __must_check __always_inline int
12847 -__copy_to_user_inatomic(void __user *dst, const void *src, unsigned size)
12848 + if ((unsigned long)src < PAX_USER_SHADOW_BASE)
12849 + src += PAX_USER_SHADOW_BASE;
12850 +#endif
12851 +
12852 + return copy_user_generic(dst, (__force_kernel const void *)src, size);
12853 +}
12854 +
12855 +static __must_check __always_inline unsigned long
12856 +__copy_to_user_inatomic(void __user *dst, const void *src, unsigned long size)
12857 {
12858 - return copy_user_generic((__force void *)dst, src, size);
12859 + if (size > INT_MAX)
12860 + return size;
12861 +
12862 +#ifdef CONFIG_PAX_MEMORY_UDEREF
12863 + if (!__access_ok(VERIFY_WRITE, dst, size))
12864 + return size;
12865 +
12866 + if ((unsigned long)dst < PAX_USER_SHADOW_BASE)
12867 + dst += PAX_USER_SHADOW_BASE;
12868 +#endif
12869 +
12870 + return copy_user_generic((__force_kernel void *)dst, src, size);
12871 }
12872
12873 -extern long __copy_user_nocache(void *dst, const void __user *src,
12874 - unsigned size, int zerorest);
12875 +extern unsigned long __copy_user_nocache(void *dst, const void __user *src,
12876 + unsigned long size, int zerorest);
12877
12878 -static inline int
12879 -__copy_from_user_nocache(void *dst, const void __user *src, unsigned size)
12880 +static inline unsigned long __copy_from_user_nocache(void *dst, const void __user *src, unsigned long size)
12881 {
12882 might_sleep();
12883 +
12884 + if (size > INT_MAX)
12885 + return size;
12886 +
12887 +#ifdef CONFIG_PAX_MEMORY_UDEREF
12888 + if (!__access_ok(VERIFY_READ, src, size))
12889 + return size;
12890 +#endif
12891 +
12892 return __copy_user_nocache(dst, src, size, 1);
12893 }
12894
12895 -static inline int
12896 -__copy_from_user_inatomic_nocache(void *dst, const void __user *src,
12897 - unsigned size)
12898 +static inline unsigned long __copy_from_user_inatomic_nocache(void *dst, const void __user *src,
12899 + unsigned long size)
12900 {
12901 + if (size > INT_MAX)
12902 + return size;
12903 +
12904 +#ifdef CONFIG_PAX_MEMORY_UDEREF
12905 + if (!__access_ok(VERIFY_READ, src, size))
12906 + return size;
12907 +#endif
12908 +
12909 return __copy_user_nocache(dst, src, size, 0);
12910 }
12911
12912 -unsigned long
12913 -copy_user_handle_tail(char *to, char *from, unsigned len, unsigned zerorest);
12914 +extern unsigned long
12915 +copy_user_handle_tail(char __user *to, char __user *from, unsigned long len, unsigned zerorest);
12916
12917 #endif /* _ASM_X86_UACCESS_64_H */
12918 diff --git a/arch/x86/include/asm/vdso.h b/arch/x86/include/asm/vdso.h
12919 index 9064052..786cfbc 100644
12920 --- a/arch/x86/include/asm/vdso.h
12921 +++ b/arch/x86/include/asm/vdso.h
12922 @@ -25,7 +25,7 @@ extern const char VDSO32_PRELINK[];
12923 #define VDSO32_SYMBOL(base, name) \
12924 ({ \
12925 extern const char VDSO32_##name[]; \
12926 - (void *)(VDSO32_##name - VDSO32_PRELINK + (unsigned long)(base)); \
12927 + (void __user *)(VDSO32_##name - VDSO32_PRELINK + (unsigned long)(base)); \
12928 })
12929 #endif
12930
12931 diff --git a/arch/x86/include/asm/vgtod.h b/arch/x86/include/asm/vgtod.h
12932 index 3d61e20..9507180 100644
12933 --- a/arch/x86/include/asm/vgtod.h
12934 +++ b/arch/x86/include/asm/vgtod.h
12935 @@ -14,6 +14,7 @@ struct vsyscall_gtod_data {
12936 int sysctl_enabled;
12937 struct timezone sys_tz;
12938 struct { /* extract of a clocksource struct */
12939 + char name[8];
12940 cycle_t (*vread)(void);
12941 cycle_t cycle_last;
12942 cycle_t mask;
12943 diff --git a/arch/x86/include/asm/vmi.h b/arch/x86/include/asm/vmi.h
12944 index 61e08c0..b0da582 100644
12945 --- a/arch/x86/include/asm/vmi.h
12946 +++ b/arch/x86/include/asm/vmi.h
12947 @@ -191,6 +191,7 @@ struct vrom_header {
12948 u8 reserved[96]; /* Reserved for headers */
12949 char vmi_init[8]; /* VMI_Init jump point */
12950 char get_reloc[8]; /* VMI_GetRelocationInfo jump point */
12951 + char rom_data[8048]; /* rest of the option ROM */
12952 } __attribute__((packed));
12953
12954 struct pnp_header {
12955 diff --git a/arch/x86/include/asm/vmi_time.h b/arch/x86/include/asm/vmi_time.h
12956 index c6e0bee..fcb9f74 100644
12957 --- a/arch/x86/include/asm/vmi_time.h
12958 +++ b/arch/x86/include/asm/vmi_time.h
12959 @@ -43,7 +43,7 @@ extern struct vmi_timer_ops {
12960 int (*wallclock_updated)(void);
12961 void (*set_alarm)(u32 flags, u64 expiry, u64 period);
12962 void (*cancel_alarm)(u32 flags);
12963 -} vmi_timer_ops;
12964 +} __no_const vmi_timer_ops;
12965
12966 /* Prototypes */
12967 extern void __init vmi_time_init(void);
12968 diff --git a/arch/x86/include/asm/vsyscall.h b/arch/x86/include/asm/vsyscall.h
12969 index d0983d2..1f7c9e9 100644
12970 --- a/arch/x86/include/asm/vsyscall.h
12971 +++ b/arch/x86/include/asm/vsyscall.h
12972 @@ -15,9 +15,10 @@ enum vsyscall_num {
12973
12974 #ifdef __KERNEL__
12975 #include <linux/seqlock.h>
12976 +#include <linux/getcpu.h>
12977 +#include <linux/time.h>
12978
12979 #define __section_vgetcpu_mode __attribute__ ((unused, __section__ (".vgetcpu_mode"), aligned(16)))
12980 -#define __section_jiffies __attribute__ ((unused, __section__ (".jiffies"), aligned(16)))
12981
12982 /* Definitions for CONFIG_GENERIC_TIME definitions */
12983 #define __section_vsyscall_gtod_data __attribute__ \
12984 @@ -31,7 +32,6 @@ enum vsyscall_num {
12985 #define VGETCPU_LSL 2
12986
12987 extern int __vgetcpu_mode;
12988 -extern volatile unsigned long __jiffies;
12989
12990 /* kernel space (writeable) */
12991 extern int vgetcpu_mode;
12992 @@ -39,6 +39,9 @@ extern struct timezone sys_tz;
12993
12994 extern void map_vsyscall(void);
12995
12996 +extern int vgettimeofday(struct timeval * tv, struct timezone * tz);
12997 +extern time_t vtime(time_t *t);
12998 +extern long vgetcpu(unsigned *cpu, unsigned *node, struct getcpu_cache *tcache);
12999 #endif /* __KERNEL__ */
13000
13001 #endif /* _ASM_X86_VSYSCALL_H */
13002 diff --git a/arch/x86/include/asm/x86_init.h b/arch/x86/include/asm/x86_init.h
13003 index 2c756fd..3377e37 100644
13004 --- a/arch/x86/include/asm/x86_init.h
13005 +++ b/arch/x86/include/asm/x86_init.h
13006 @@ -28,7 +28,7 @@ struct x86_init_mpparse {
13007 void (*mpc_oem_bus_info)(struct mpc_bus *m, char *name);
13008 void (*find_smp_config)(unsigned int reserve);
13009 void (*get_smp_config)(unsigned int early);
13010 -};
13011 +} __no_const;
13012
13013 /**
13014 * struct x86_init_resources - platform specific resource related ops
13015 @@ -42,7 +42,7 @@ struct x86_init_resources {
13016 void (*probe_roms)(void);
13017 void (*reserve_resources)(void);
13018 char *(*memory_setup)(void);
13019 -};
13020 +} __no_const;
13021
13022 /**
13023 * struct x86_init_irqs - platform specific interrupt setup
13024 @@ -55,7 +55,7 @@ struct x86_init_irqs {
13025 void (*pre_vector_init)(void);
13026 void (*intr_init)(void);
13027 void (*trap_init)(void);
13028 -};
13029 +} __no_const;
13030
13031 /**
13032 * struct x86_init_oem - oem platform specific customizing functions
13033 @@ -65,7 +65,7 @@ struct x86_init_irqs {
13034 struct x86_init_oem {
13035 void (*arch_setup)(void);
13036 void (*banner)(void);
13037 -};
13038 +} __no_const;
13039
13040 /**
13041 * struct x86_init_paging - platform specific paging functions
13042 @@ -75,7 +75,7 @@ struct x86_init_oem {
13043 struct x86_init_paging {
13044 void (*pagetable_setup_start)(pgd_t *base);
13045 void (*pagetable_setup_done)(pgd_t *base);
13046 -};
13047 +} __no_const;
13048
13049 /**
13050 * struct x86_init_timers - platform specific timer setup
13051 @@ -88,7 +88,7 @@ struct x86_init_timers {
13052 void (*setup_percpu_clockev)(void);
13053 void (*tsc_pre_init)(void);
13054 void (*timer_init)(void);
13055 -};
13056 +} __no_const;
13057
13058 /**
13059 * struct x86_init_ops - functions for platform specific setup
13060 @@ -101,7 +101,7 @@ struct x86_init_ops {
13061 struct x86_init_oem oem;
13062 struct x86_init_paging paging;
13063 struct x86_init_timers timers;
13064 -};
13065 +} __no_const;
13066
13067 /**
13068 * struct x86_cpuinit_ops - platform specific cpu hotplug setups
13069 @@ -109,7 +109,7 @@ struct x86_init_ops {
13070 */
13071 struct x86_cpuinit_ops {
13072 void (*setup_percpu_clockev)(void);
13073 -};
13074 +} __no_const;
13075
13076 /**
13077 * struct x86_platform_ops - platform specific runtime functions
13078 @@ -121,7 +121,7 @@ struct x86_platform_ops {
13079 unsigned long (*calibrate_tsc)(void);
13080 unsigned long (*get_wallclock)(void);
13081 int (*set_wallclock)(unsigned long nowtime);
13082 -};
13083 +} __no_const;
13084
13085 extern struct x86_init_ops x86_init;
13086 extern struct x86_cpuinit_ops x86_cpuinit;
13087 diff --git a/arch/x86/include/asm/xsave.h b/arch/x86/include/asm/xsave.h
13088 index 727acc1..554f3eb 100644
13089 --- a/arch/x86/include/asm/xsave.h
13090 +++ b/arch/x86/include/asm/xsave.h
13091 @@ -56,6 +56,12 @@ static inline int xrstor_checking(struct xsave_struct *fx)
13092 static inline int xsave_user(struct xsave_struct __user *buf)
13093 {
13094 int err;
13095 +
13096 +#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
13097 + if ((unsigned long)buf < PAX_USER_SHADOW_BASE)
13098 + buf = (struct xsave_struct __user *)((void __user*)buf + PAX_USER_SHADOW_BASE);
13099 +#endif
13100 +
13101 __asm__ __volatile__("1: .byte " REX_PREFIX "0x0f,0xae,0x27\n"
13102 "2:\n"
13103 ".section .fixup,\"ax\"\n"
13104 @@ -78,10 +84,15 @@ static inline int xsave_user(struct xsave_struct __user *buf)
13105 static inline int xrestore_user(struct xsave_struct __user *buf, u64 mask)
13106 {
13107 int err;
13108 - struct xsave_struct *xstate = ((__force struct xsave_struct *)buf);
13109 + struct xsave_struct *xstate = ((__force_kernel struct xsave_struct *)buf);
13110 u32 lmask = mask;
13111 u32 hmask = mask >> 32;
13112
13113 +#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
13114 + if ((unsigned long)xstate < PAX_USER_SHADOW_BASE)
13115 + xstate = (struct xsave_struct *)((void *)xstate + PAX_USER_SHADOW_BASE);
13116 +#endif
13117 +
13118 __asm__ __volatile__("1: .byte " REX_PREFIX "0x0f,0xae,0x2f\n"
13119 "2:\n"
13120 ".section .fixup,\"ax\"\n"
13121 diff --git a/arch/x86/kernel/acpi/realmode/Makefile b/arch/x86/kernel/acpi/realmode/Makefile
13122 index 6a564ac..9b1340c 100644
13123 --- a/arch/x86/kernel/acpi/realmode/Makefile
13124 +++ b/arch/x86/kernel/acpi/realmode/Makefile
13125 @@ -41,6 +41,9 @@ KBUILD_CFLAGS := $(LINUXINCLUDE) -g -Os -D_SETUP -D_WAKEUP -D__KERNEL__ \
13126 $(call cc-option, -fno-stack-protector) \
13127 $(call cc-option, -mpreferred-stack-boundary=2)
13128 KBUILD_CFLAGS += $(call cc-option, -m32)
13129 +ifdef CONSTIFY_PLUGIN
13130 +KBUILD_CFLAGS += $(CONSTIFY_PLUGIN) -fplugin-arg-constify_plugin-no-constify
13131 +endif
13132 KBUILD_AFLAGS := $(KBUILD_CFLAGS) -D__ASSEMBLY__
13133 GCOV_PROFILE := n
13134
13135 diff --git a/arch/x86/kernel/acpi/realmode/wakeup.S b/arch/x86/kernel/acpi/realmode/wakeup.S
13136 index 580b4e2..d4129e4 100644
13137 --- a/arch/x86/kernel/acpi/realmode/wakeup.S
13138 +++ b/arch/x86/kernel/acpi/realmode/wakeup.S
13139 @@ -91,6 +91,9 @@ _start:
13140 /* Do any other stuff... */
13141
13142 #ifndef CONFIG_64BIT
13143 + /* Recheck NX bit overrides (64bit path does this in trampoline) */
13144 + call verify_cpu
13145 +
13146 /* This could also be done in C code... */
13147 movl pmode_cr3, %eax
13148 movl %eax, %cr3
13149 @@ -104,7 +107,7 @@ _start:
13150 movl %eax, %ecx
13151 orl %edx, %ecx
13152 jz 1f
13153 - movl $0xc0000080, %ecx
13154 + mov $MSR_EFER, %ecx
13155 wrmsr
13156 1:
13157
13158 @@ -114,6 +117,7 @@ _start:
13159 movl pmode_cr0, %eax
13160 movl %eax, %cr0
13161 jmp pmode_return
13162 +# include "../../verify_cpu.S"
13163 #else
13164 pushw $0
13165 pushw trampoline_segment
13166 diff --git a/arch/x86/kernel/acpi/sleep.c b/arch/x86/kernel/acpi/sleep.c
13167 index ca93638..7042f24 100644
13168 --- a/arch/x86/kernel/acpi/sleep.c
13169 +++ b/arch/x86/kernel/acpi/sleep.c
13170 @@ -11,11 +11,12 @@
13171 #include <linux/cpumask.h>
13172 #include <asm/segment.h>
13173 #include <asm/desc.h>
13174 +#include <asm/e820.h>
13175
13176 #include "realmode/wakeup.h"
13177 #include "sleep.h"
13178
13179 -unsigned long acpi_wakeup_address;
13180 +unsigned long acpi_wakeup_address = 0x2000;
13181 unsigned long acpi_realmode_flags;
13182
13183 /* address in low memory of the wakeup routine. */
13184 @@ -98,9 +99,13 @@ int acpi_save_state_mem(void)
13185 #else /* CONFIG_64BIT */
13186 header->trampoline_segment = setup_trampoline() >> 4;
13187 #ifdef CONFIG_SMP
13188 - stack_start.sp = temp_stack + sizeof(temp_stack);
13189 + stack_start = (unsigned long)temp_stack + sizeof(temp_stack);
13190 +
13191 + pax_open_kernel();
13192 early_gdt_descr.address =
13193 (unsigned long)get_cpu_gdt_table(smp_processor_id());
13194 + pax_close_kernel();
13195 +
13196 initial_gs = per_cpu_offset(smp_processor_id());
13197 #endif
13198 initial_code = (unsigned long)wakeup_long64;
13199 @@ -134,14 +139,8 @@ void __init acpi_reserve_bootmem(void)
13200 return;
13201 }
13202
13203 - acpi_realmode = (unsigned long)alloc_bootmem_low(WAKEUP_SIZE);
13204 -
13205 - if (!acpi_realmode) {
13206 - printk(KERN_ERR "ACPI: Cannot allocate lowmem, S3 disabled.\n");
13207 - return;
13208 - }
13209 -
13210 - acpi_wakeup_address = virt_to_phys((void *)acpi_realmode);
13211 + reserve_early(acpi_wakeup_address, acpi_wakeup_address + WAKEUP_SIZE, "ACPI Wakeup Code");
13212 + acpi_realmode = (unsigned long)__va(acpi_wakeup_address);;
13213 }
13214
13215
13216 diff --git a/arch/x86/kernel/acpi/wakeup_32.S b/arch/x86/kernel/acpi/wakeup_32.S
13217 index 8ded418..079961e 100644
13218 --- a/arch/x86/kernel/acpi/wakeup_32.S
13219 +++ b/arch/x86/kernel/acpi/wakeup_32.S
13220 @@ -30,13 +30,11 @@ wakeup_pmode_return:
13221 # and restore the stack ... but you need gdt for this to work
13222 movl saved_context_esp, %esp
13223
13224 - movl %cs:saved_magic, %eax
13225 - cmpl $0x12345678, %eax
13226 + cmpl $0x12345678, saved_magic
13227 jne bogus_magic
13228
13229 # jump to place where we left off
13230 - movl saved_eip, %eax
13231 - jmp *%eax
13232 + jmp *(saved_eip)
13233
13234 bogus_magic:
13235 jmp bogus_magic
13236 diff --git a/arch/x86/kernel/alternative.c b/arch/x86/kernel/alternative.c
13237 index de7353c..075da5f 100644
13238 --- a/arch/x86/kernel/alternative.c
13239 +++ b/arch/x86/kernel/alternative.c
13240 @@ -407,7 +407,7 @@ void __init_or_module apply_paravirt(struct paravirt_patch_site *start,
13241
13242 BUG_ON(p->len > MAX_PATCH_LEN);
13243 /* prep the buffer with the original instructions */
13244 - memcpy(insnbuf, p->instr, p->len);
13245 + memcpy(insnbuf, ktla_ktva(p->instr), p->len);
13246 used = pv_init_ops.patch(p->instrtype, p->clobbers, insnbuf,
13247 (unsigned long)p->instr, p->len);
13248
13249 @@ -475,7 +475,7 @@ void __init alternative_instructions(void)
13250 if (smp_alt_once)
13251 free_init_pages("SMP alternatives",
13252 (unsigned long)__smp_locks,
13253 - (unsigned long)__smp_locks_end);
13254 + PAGE_ALIGN((unsigned long)__smp_locks_end));
13255
13256 restart_nmi();
13257 }
13258 @@ -492,13 +492,17 @@ void __init alternative_instructions(void)
13259 * instructions. And on the local CPU you need to be protected again NMI or MCE
13260 * handlers seeing an inconsistent instruction while you patch.
13261 */
13262 -static void *__init_or_module text_poke_early(void *addr, const void *opcode,
13263 +static void *__kprobes text_poke_early(void *addr, const void *opcode,
13264 size_t len)
13265 {
13266 unsigned long flags;
13267 local_irq_save(flags);
13268 - memcpy(addr, opcode, len);
13269 +
13270 + pax_open_kernel();
13271 + memcpy(ktla_ktva(addr), opcode, len);
13272 sync_core();
13273 + pax_close_kernel();
13274 +
13275 local_irq_restore(flags);
13276 /* Could also do a CLFLUSH here to speed up CPU recovery; but
13277 that causes hangs on some VIA CPUs. */
13278 @@ -520,35 +524,21 @@ static void *__init_or_module text_poke_early(void *addr, const void *opcode,
13279 */
13280 void *__kprobes text_poke(void *addr, const void *opcode, size_t len)
13281 {
13282 - unsigned long flags;
13283 - char *vaddr;
13284 + unsigned char *vaddr = ktla_ktva(addr);
13285 struct page *pages[2];
13286 - int i;
13287 + size_t i;
13288
13289 if (!core_kernel_text((unsigned long)addr)) {
13290 - pages[0] = vmalloc_to_page(addr);
13291 - pages[1] = vmalloc_to_page(addr + PAGE_SIZE);
13292 + pages[0] = vmalloc_to_page(vaddr);
13293 + pages[1] = vmalloc_to_page(vaddr + PAGE_SIZE);
13294 } else {
13295 - pages[0] = virt_to_page(addr);
13296 + pages[0] = virt_to_page(vaddr);
13297 WARN_ON(!PageReserved(pages[0]));
13298 - pages[1] = virt_to_page(addr + PAGE_SIZE);
13299 + pages[1] = virt_to_page(vaddr + PAGE_SIZE);
13300 }
13301 BUG_ON(!pages[0]);
13302 - local_irq_save(flags);
13303 - set_fixmap(FIX_TEXT_POKE0, page_to_phys(pages[0]));
13304 - if (pages[1])
13305 - set_fixmap(FIX_TEXT_POKE1, page_to_phys(pages[1]));
13306 - vaddr = (char *)fix_to_virt(FIX_TEXT_POKE0);
13307 - memcpy(&vaddr[(unsigned long)addr & ~PAGE_MASK], opcode, len);
13308 - clear_fixmap(FIX_TEXT_POKE0);
13309 - if (pages[1])
13310 - clear_fixmap(FIX_TEXT_POKE1);
13311 - local_flush_tlb();
13312 - sync_core();
13313 - /* Could also do a CLFLUSH here to speed up CPU recovery; but
13314 - that causes hangs on some VIA CPUs. */
13315 + text_poke_early(addr, opcode, len);
13316 for (i = 0; i < len; i++)
13317 - BUG_ON(((char *)addr)[i] != ((char *)opcode)[i]);
13318 - local_irq_restore(flags);
13319 + BUG_ON((vaddr)[i] != ((const unsigned char *)opcode)[i]);
13320 return addr;
13321 }
13322 diff --git a/arch/x86/kernel/amd_iommu.c b/arch/x86/kernel/amd_iommu.c
13323 index 3a44b75..1601800 100644
13324 --- a/arch/x86/kernel/amd_iommu.c
13325 +++ b/arch/x86/kernel/amd_iommu.c
13326 @@ -2076,7 +2076,7 @@ static void prealloc_protection_domains(void)
13327 }
13328 }
13329
13330 -static struct dma_map_ops amd_iommu_dma_ops = {
13331 +static const struct dma_map_ops amd_iommu_dma_ops = {
13332 .alloc_coherent = alloc_coherent,
13333 .free_coherent = free_coherent,
13334 .map_page = map_page,
13335 diff --git a/arch/x86/kernel/apic/apic.c b/arch/x86/kernel/apic/apic.c
13336 index 1d2d670..8e3f477 100644
13337 --- a/arch/x86/kernel/apic/apic.c
13338 +++ b/arch/x86/kernel/apic/apic.c
13339 @@ -170,7 +170,7 @@ int first_system_vector = 0xfe;
13340 /*
13341 * Debug level, exported for io_apic.c
13342 */
13343 -unsigned int apic_verbosity;
13344 +int apic_verbosity;
13345
13346 int pic_mode;
13347
13348 @@ -1794,7 +1794,7 @@ void smp_error_interrupt(struct pt_regs *regs)
13349 apic_write(APIC_ESR, 0);
13350 v1 = apic_read(APIC_ESR);
13351 ack_APIC_irq();
13352 - atomic_inc(&irq_err_count);
13353 + atomic_inc_unchecked(&irq_err_count);
13354
13355 /*
13356 * Here is what the APIC error bits mean:
13357 @@ -2184,6 +2184,8 @@ static int __cpuinit apic_cluster_num(void)
13358 u16 *bios_cpu_apicid;
13359 DECLARE_BITMAP(clustermap, NUM_APIC_CLUSTERS);
13360
13361 + pax_track_stack();
13362 +
13363 bios_cpu_apicid = early_per_cpu_ptr(x86_bios_cpu_apicid);
13364 bitmap_zero(clustermap, NUM_APIC_CLUSTERS);
13365
13366 diff --git a/arch/x86/kernel/apic/io_apic.c b/arch/x86/kernel/apic/io_apic.c
13367 index 8928d97..f799cea 100644
13368 --- a/arch/x86/kernel/apic/io_apic.c
13369 +++ b/arch/x86/kernel/apic/io_apic.c
13370 @@ -716,7 +716,7 @@ struct IO_APIC_route_entry **alloc_ioapic_entries(void)
13371 ioapic_entries = kzalloc(sizeof(*ioapic_entries) * nr_ioapics,
13372 GFP_ATOMIC);
13373 if (!ioapic_entries)
13374 - return 0;
13375 + return NULL;
13376
13377 for (apic = 0; apic < nr_ioapics; apic++) {
13378 ioapic_entries[apic] =
13379 @@ -733,7 +733,7 @@ nomem:
13380 kfree(ioapic_entries[apic]);
13381 kfree(ioapic_entries);
13382
13383 - return 0;
13384 + return NULL;
13385 }
13386
13387 /*
13388 @@ -1150,7 +1150,7 @@ int IO_APIC_get_PCI_irq_vector(int bus, int slot, int pin,
13389 }
13390 EXPORT_SYMBOL(IO_APIC_get_PCI_irq_vector);
13391
13392 -void lock_vector_lock(void)
13393 +void lock_vector_lock(void) __acquires(vector_lock)
13394 {
13395 /* Used to the online set of cpus does not change
13396 * during assign_irq_vector.
13397 @@ -1158,7 +1158,7 @@ void lock_vector_lock(void)
13398 spin_lock(&vector_lock);
13399 }
13400
13401 -void unlock_vector_lock(void)
13402 +void unlock_vector_lock(void) __releases(vector_lock)
13403 {
13404 spin_unlock(&vector_lock);
13405 }
13406 @@ -2542,7 +2542,7 @@ static void ack_apic_edge(unsigned int irq)
13407 ack_APIC_irq();
13408 }
13409
13410 -atomic_t irq_mis_count;
13411 +atomic_unchecked_t irq_mis_count;
13412
13413 static void ack_apic_level(unsigned int irq)
13414 {
13415 @@ -2626,7 +2626,7 @@ static void ack_apic_level(unsigned int irq)
13416
13417 /* Tail end of version 0x11 I/O APIC bug workaround */
13418 if (!(v & (1 << (i & 0x1f)))) {
13419 - atomic_inc(&irq_mis_count);
13420 + atomic_inc_unchecked(&irq_mis_count);
13421 spin_lock(&ioapic_lock);
13422 __mask_and_edge_IO_APIC_irq(cfg);
13423 __unmask_and_level_IO_APIC_irq(cfg);
13424 diff --git a/arch/x86/kernel/apm_32.c b/arch/x86/kernel/apm_32.c
13425 index 151ace6..f317474 100644
13426 --- a/arch/x86/kernel/apm_32.c
13427 +++ b/arch/x86/kernel/apm_32.c
13428 @@ -410,7 +410,7 @@ static DEFINE_SPINLOCK(user_list_lock);
13429 * This is for buggy BIOS's that refer to (real mode) segment 0x40
13430 * even though they are called in protected mode.
13431 */
13432 -static struct desc_struct bad_bios_desc = GDT_ENTRY_INIT(0x4092,
13433 +static const struct desc_struct bad_bios_desc = GDT_ENTRY_INIT(0x4093,
13434 (unsigned long)__va(0x400UL), PAGE_SIZE - 0x400 - 1);
13435
13436 static const char driver_version[] = "1.16ac"; /* no spaces */
13437 @@ -588,7 +588,10 @@ static long __apm_bios_call(void *_call)
13438 BUG_ON(cpu != 0);
13439 gdt = get_cpu_gdt_table(cpu);
13440 save_desc_40 = gdt[0x40 / 8];
13441 +
13442 + pax_open_kernel();
13443 gdt[0x40 / 8] = bad_bios_desc;
13444 + pax_close_kernel();
13445
13446 apm_irq_save(flags);
13447 APM_DO_SAVE_SEGS;
13448 @@ -597,7 +600,11 @@ static long __apm_bios_call(void *_call)
13449 &call->esi);
13450 APM_DO_RESTORE_SEGS;
13451 apm_irq_restore(flags);
13452 +
13453 + pax_open_kernel();
13454 gdt[0x40 / 8] = save_desc_40;
13455 + pax_close_kernel();
13456 +
13457 put_cpu();
13458
13459 return call->eax & 0xff;
13460 @@ -664,7 +671,10 @@ static long __apm_bios_call_simple(void *_call)
13461 BUG_ON(cpu != 0);
13462 gdt = get_cpu_gdt_table(cpu);
13463 save_desc_40 = gdt[0x40 / 8];
13464 +
13465 + pax_open_kernel();
13466 gdt[0x40 / 8] = bad_bios_desc;
13467 + pax_close_kernel();
13468
13469 apm_irq_save(flags);
13470 APM_DO_SAVE_SEGS;
13471 @@ -672,7 +682,11 @@ static long __apm_bios_call_simple(void *_call)
13472 &call->eax);
13473 APM_DO_RESTORE_SEGS;
13474 apm_irq_restore(flags);
13475 +
13476 + pax_open_kernel();
13477 gdt[0x40 / 8] = save_desc_40;
13478 + pax_close_kernel();
13479 +
13480 put_cpu();
13481 return error;
13482 }
13483 @@ -975,7 +989,7 @@ recalc:
13484
13485 static void apm_power_off(void)
13486 {
13487 - unsigned char po_bios_call[] = {
13488 + const unsigned char po_bios_call[] = {
13489 0xb8, 0x00, 0x10, /* movw $0x1000,ax */
13490 0x8e, 0xd0, /* movw ax,ss */
13491 0xbc, 0x00, 0xf0, /* movw $0xf000,sp */
13492 @@ -2357,12 +2371,15 @@ static int __init apm_init(void)
13493 * code to that CPU.
13494 */
13495 gdt = get_cpu_gdt_table(0);
13496 +
13497 + pax_open_kernel();
13498 set_desc_base(&gdt[APM_CS >> 3],
13499 (unsigned long)__va((unsigned long)apm_info.bios.cseg << 4));
13500 set_desc_base(&gdt[APM_CS_16 >> 3],
13501 (unsigned long)__va((unsigned long)apm_info.bios.cseg_16 << 4));
13502 set_desc_base(&gdt[APM_DS >> 3],
13503 (unsigned long)__va((unsigned long)apm_info.bios.dseg << 4));
13504 + pax_close_kernel();
13505
13506 proc_create("apm", 0, NULL, &apm_file_ops);
13507
13508 diff --git a/arch/x86/kernel/asm-offsets_32.c b/arch/x86/kernel/asm-offsets_32.c
13509 index dfdbf64..9b2b6ce 100644
13510 --- a/arch/x86/kernel/asm-offsets_32.c
13511 +++ b/arch/x86/kernel/asm-offsets_32.c
13512 @@ -51,7 +51,6 @@ void foo(void)
13513 OFFSET(CPUINFO_x86_vendor_id, cpuinfo_x86, x86_vendor_id);
13514 BLANK();
13515
13516 - OFFSET(TI_task, thread_info, task);
13517 OFFSET(TI_exec_domain, thread_info, exec_domain);
13518 OFFSET(TI_flags, thread_info, flags);
13519 OFFSET(TI_status, thread_info, status);
13520 @@ -60,6 +59,8 @@ void foo(void)
13521 OFFSET(TI_restart_block, thread_info, restart_block);
13522 OFFSET(TI_sysenter_return, thread_info, sysenter_return);
13523 OFFSET(TI_cpu, thread_info, cpu);
13524 + OFFSET(TI_lowest_stack, thread_info, lowest_stack);
13525 + DEFINE(TI_task_thread_sp0, offsetof(struct task_struct, thread.sp0) - offsetof(struct task_struct, tinfo));
13526 BLANK();
13527
13528 OFFSET(GDS_size, desc_ptr, size);
13529 @@ -99,6 +100,7 @@ void foo(void)
13530
13531 DEFINE(PAGE_SIZE_asm, PAGE_SIZE);
13532 DEFINE(PAGE_SHIFT_asm, PAGE_SHIFT);
13533 + DEFINE(THREAD_SIZE_asm, THREAD_SIZE);
13534 DEFINE(PTRS_PER_PTE, PTRS_PER_PTE);
13535 DEFINE(PTRS_PER_PMD, PTRS_PER_PMD);
13536 DEFINE(PTRS_PER_PGD, PTRS_PER_PGD);
13537 @@ -115,6 +117,11 @@ void foo(void)
13538 OFFSET(PV_CPU_iret, pv_cpu_ops, iret);
13539 OFFSET(PV_CPU_irq_enable_sysexit, pv_cpu_ops, irq_enable_sysexit);
13540 OFFSET(PV_CPU_read_cr0, pv_cpu_ops, read_cr0);
13541 +
13542 +#ifdef CONFIG_PAX_KERNEXEC
13543 + OFFSET(PV_CPU_write_cr0, pv_cpu_ops, write_cr0);
13544 +#endif
13545 +
13546 #endif
13547
13548 #ifdef CONFIG_XEN
13549 diff --git a/arch/x86/kernel/asm-offsets_64.c b/arch/x86/kernel/asm-offsets_64.c
13550 index 4a6aeed..371de20 100644
13551 --- a/arch/x86/kernel/asm-offsets_64.c
13552 +++ b/arch/x86/kernel/asm-offsets_64.c
13553 @@ -44,6 +44,8 @@ int main(void)
13554 ENTRY(addr_limit);
13555 ENTRY(preempt_count);
13556 ENTRY(status);
13557 + ENTRY(lowest_stack);
13558 + DEFINE(TI_task_thread_sp0, offsetof(struct task_struct, thread.sp0) - offsetof(struct task_struct, tinfo));
13559 #ifdef CONFIG_IA32_EMULATION
13560 ENTRY(sysenter_return);
13561 #endif
13562 @@ -63,6 +65,18 @@ int main(void)
13563 OFFSET(PV_CPU_irq_enable_sysexit, pv_cpu_ops, irq_enable_sysexit);
13564 OFFSET(PV_CPU_swapgs, pv_cpu_ops, swapgs);
13565 OFFSET(PV_MMU_read_cr2, pv_mmu_ops, read_cr2);
13566 +
13567 +#ifdef CONFIG_PAX_KERNEXEC
13568 + OFFSET(PV_CPU_read_cr0, pv_cpu_ops, read_cr0);
13569 + OFFSET(PV_CPU_write_cr0, pv_cpu_ops, write_cr0);
13570 +#endif
13571 +
13572 +#ifdef CONFIG_PAX_MEMORY_UDEREF
13573 + OFFSET(PV_MMU_read_cr3, pv_mmu_ops, read_cr3);
13574 + OFFSET(PV_MMU_write_cr3, pv_mmu_ops, write_cr3);
13575 + OFFSET(PV_MMU_set_pgd_batched, pv_mmu_ops, set_pgd_batched);
13576 +#endif
13577 +
13578 #endif
13579
13580
13581 @@ -115,6 +129,7 @@ int main(void)
13582 ENTRY(cr8);
13583 BLANK();
13584 #undef ENTRY
13585 + DEFINE(TSS_size, sizeof(struct tss_struct));
13586 DEFINE(TSS_ist, offsetof(struct tss_struct, x86_tss.ist));
13587 BLANK();
13588 DEFINE(crypto_tfm_ctx_offset, offsetof(struct crypto_tfm, __crt_ctx));
13589 @@ -130,6 +145,7 @@ int main(void)
13590
13591 BLANK();
13592 DEFINE(PAGE_SIZE_asm, PAGE_SIZE);
13593 + DEFINE(THREAD_SIZE_asm, THREAD_SIZE);
13594 #ifdef CONFIG_XEN
13595 BLANK();
13596 OFFSET(XEN_vcpu_info_mask, vcpu_info, evtchn_upcall_mask);
13597 diff --git a/arch/x86/kernel/cpu/Makefile b/arch/x86/kernel/cpu/Makefile
13598 index ff502cc..dc5133e 100644
13599 --- a/arch/x86/kernel/cpu/Makefile
13600 +++ b/arch/x86/kernel/cpu/Makefile
13601 @@ -7,10 +7,6 @@ ifdef CONFIG_FUNCTION_TRACER
13602 CFLAGS_REMOVE_common.o = -pg
13603 endif
13604
13605 -# Make sure load_percpu_segment has no stackprotector
13606 -nostackp := $(call cc-option, -fno-stack-protector)
13607 -CFLAGS_common.o := $(nostackp)
13608 -
13609 obj-y := intel_cacheinfo.o addon_cpuid_features.o
13610 obj-y += proc.o capflags.o powerflags.o common.o
13611 obj-y += vmware.o hypervisor.o sched.o
13612 diff --git a/arch/x86/kernel/cpu/amd.c b/arch/x86/kernel/cpu/amd.c
13613 index 6e082dc..a0b5f36 100644
13614 --- a/arch/x86/kernel/cpu/amd.c
13615 +++ b/arch/x86/kernel/cpu/amd.c
13616 @@ -602,7 +602,7 @@ static unsigned int __cpuinit amd_size_cache(struct cpuinfo_x86 *c,
13617 unsigned int size)
13618 {
13619 /* AMD errata T13 (order #21922) */
13620 - if ((c->x86 == 6)) {
13621 + if (c->x86 == 6) {
13622 /* Duron Rev A0 */
13623 if (c->x86_model == 3 && c->x86_mask == 0)
13624 size = 64;
13625 diff --git a/arch/x86/kernel/cpu/common.c b/arch/x86/kernel/cpu/common.c
13626 index 4e34d10..ba6bc97 100644
13627 --- a/arch/x86/kernel/cpu/common.c
13628 +++ b/arch/x86/kernel/cpu/common.c
13629 @@ -83,60 +83,6 @@ static const struct cpu_dev __cpuinitconst default_cpu = {
13630
13631 static const struct cpu_dev *this_cpu __cpuinitdata = &default_cpu;
13632
13633 -DEFINE_PER_CPU_PAGE_ALIGNED(struct gdt_page, gdt_page) = { .gdt = {
13634 -#ifdef CONFIG_X86_64
13635 - /*
13636 - * We need valid kernel segments for data and code in long mode too
13637 - * IRET will check the segment types kkeil 2000/10/28
13638 - * Also sysret mandates a special GDT layout
13639 - *
13640 - * TLS descriptors are currently at a different place compared to i386.
13641 - * Hopefully nobody expects them at a fixed place (Wine?)
13642 - */
13643 - [GDT_ENTRY_KERNEL32_CS] = GDT_ENTRY_INIT(0xc09b, 0, 0xfffff),
13644 - [GDT_ENTRY_KERNEL_CS] = GDT_ENTRY_INIT(0xa09b, 0, 0xfffff),
13645 - [GDT_ENTRY_KERNEL_DS] = GDT_ENTRY_INIT(0xc093, 0, 0xfffff),
13646 - [GDT_ENTRY_DEFAULT_USER32_CS] = GDT_ENTRY_INIT(0xc0fb, 0, 0xfffff),
13647 - [GDT_ENTRY_DEFAULT_USER_DS] = GDT_ENTRY_INIT(0xc0f3, 0, 0xfffff),
13648 - [GDT_ENTRY_DEFAULT_USER_CS] = GDT_ENTRY_INIT(0xa0fb, 0, 0xfffff),
13649 -#else
13650 - [GDT_ENTRY_KERNEL_CS] = GDT_ENTRY_INIT(0xc09a, 0, 0xfffff),
13651 - [GDT_ENTRY_KERNEL_DS] = GDT_ENTRY_INIT(0xc092, 0, 0xfffff),
13652 - [GDT_ENTRY_DEFAULT_USER_CS] = GDT_ENTRY_INIT(0xc0fa, 0, 0xfffff),
13653 - [GDT_ENTRY_DEFAULT_USER_DS] = GDT_ENTRY_INIT(0xc0f2, 0, 0xfffff),
13654 - /*
13655 - * Segments used for calling PnP BIOS have byte granularity.
13656 - * They code segments and data segments have fixed 64k limits,
13657 - * the transfer segment sizes are set at run time.
13658 - */
13659 - /* 32-bit code */
13660 - [GDT_ENTRY_PNPBIOS_CS32] = GDT_ENTRY_INIT(0x409a, 0, 0xffff),
13661 - /* 16-bit code */
13662 - [GDT_ENTRY_PNPBIOS_CS16] = GDT_ENTRY_INIT(0x009a, 0, 0xffff),
13663 - /* 16-bit data */
13664 - [GDT_ENTRY_PNPBIOS_DS] = GDT_ENTRY_INIT(0x0092, 0, 0xffff),
13665 - /* 16-bit data */
13666 - [GDT_ENTRY_PNPBIOS_TS1] = GDT_ENTRY_INIT(0x0092, 0, 0),
13667 - /* 16-bit data */
13668 - [GDT_ENTRY_PNPBIOS_TS2] = GDT_ENTRY_INIT(0x0092, 0, 0),
13669 - /*
13670 - * The APM segments have byte granularity and their bases
13671 - * are set at run time. All have 64k limits.
13672 - */
13673 - /* 32-bit code */
13674 - [GDT_ENTRY_APMBIOS_BASE] = GDT_ENTRY_INIT(0x409a, 0, 0xffff),
13675 - /* 16-bit code */
13676 - [GDT_ENTRY_APMBIOS_BASE+1] = GDT_ENTRY_INIT(0x009a, 0, 0xffff),
13677 - /* data */
13678 - [GDT_ENTRY_APMBIOS_BASE+2] = GDT_ENTRY_INIT(0x4092, 0, 0xffff),
13679 -
13680 - [GDT_ENTRY_ESPFIX_SS] = GDT_ENTRY_INIT(0xc092, 0, 0xfffff),
13681 - [GDT_ENTRY_PERCPU] = GDT_ENTRY_INIT(0xc092, 0, 0xfffff),
13682 - GDT_STACK_CANARY_INIT
13683 -#endif
13684 -} };
13685 -EXPORT_PER_CPU_SYMBOL_GPL(gdt_page);
13686 -
13687 static int __init x86_xsave_setup(char *s)
13688 {
13689 setup_clear_cpu_cap(X86_FEATURE_XSAVE);
13690 @@ -344,7 +290,7 @@ void switch_to_new_gdt(int cpu)
13691 {
13692 struct desc_ptr gdt_descr;
13693
13694 - gdt_descr.address = (long)get_cpu_gdt_table(cpu);
13695 + gdt_descr.address = (unsigned long)get_cpu_gdt_table(cpu);
13696 gdt_descr.size = GDT_SIZE - 1;
13697 load_gdt(&gdt_descr);
13698 /* Reload the per-cpu base */
13699 @@ -798,6 +744,10 @@ static void __cpuinit identify_cpu(struct cpuinfo_x86 *c)
13700 /* Filter out anything that depends on CPUID levels we don't have */
13701 filter_cpuid_features(c, true);
13702
13703 +#if defined(CONFIG_X86_32) && (defined(CONFIG_PAX_SEGMEXEC) || defined(CONFIG_PAX_KERNEXEC) || defined(CONFIG_PAX_MEMORY_UDEREF))
13704 + setup_clear_cpu_cap(X86_FEATURE_SEP);
13705 +#endif
13706 +
13707 /* If the model name is still unset, do table lookup. */
13708 if (!c->x86_model_id[0]) {
13709 const char *p;
13710 @@ -980,6 +930,9 @@ static __init int setup_disablecpuid(char *arg)
13711 }
13712 __setup("clearcpuid=", setup_disablecpuid);
13713
13714 +DEFINE_PER_CPU(struct thread_info *, current_tinfo) = &init_task.tinfo;
13715 +EXPORT_PER_CPU_SYMBOL(current_tinfo);
13716 +
13717 #ifdef CONFIG_X86_64
13718 struct desc_ptr idt_descr = { NR_VECTORS * 16 - 1, (unsigned long) idt_table };
13719
13720 @@ -995,7 +948,7 @@ DEFINE_PER_CPU(struct task_struct *, current_task) ____cacheline_aligned =
13721 EXPORT_PER_CPU_SYMBOL(current_task);
13722
13723 DEFINE_PER_CPU(unsigned long, kernel_stack) =
13724 - (unsigned long)&init_thread_union - KERNEL_STACK_OFFSET + THREAD_SIZE;
13725 + (unsigned long)&init_thread_union - 16 + THREAD_SIZE;
13726 EXPORT_PER_CPU_SYMBOL(kernel_stack);
13727
13728 DEFINE_PER_CPU(char *, irq_stack_ptr) =
13729 @@ -1060,7 +1013,7 @@ struct pt_regs * __cpuinit idle_regs(struct pt_regs *regs)
13730 {
13731 memset(regs, 0, sizeof(struct pt_regs));
13732 regs->fs = __KERNEL_PERCPU;
13733 - regs->gs = __KERNEL_STACK_CANARY;
13734 + savesegment(gs, regs->gs);
13735
13736 return regs;
13737 }
13738 @@ -1101,7 +1054,7 @@ void __cpuinit cpu_init(void)
13739 int i;
13740
13741 cpu = stack_smp_processor_id();
13742 - t = &per_cpu(init_tss, cpu);
13743 + t = init_tss + cpu;
13744 orig_ist = &per_cpu(orig_ist, cpu);
13745
13746 #ifdef CONFIG_NUMA
13747 @@ -1127,7 +1080,7 @@ void __cpuinit cpu_init(void)
13748 switch_to_new_gdt(cpu);
13749 loadsegment(fs, 0);
13750
13751 - load_idt((const struct desc_ptr *)&idt_descr);
13752 + load_idt(&idt_descr);
13753
13754 memset(me->thread.tls_array, 0, GDT_ENTRY_TLS_ENTRIES * 8);
13755 syscall_init();
13756 @@ -1136,7 +1089,6 @@ void __cpuinit cpu_init(void)
13757 wrmsrl(MSR_KERNEL_GS_BASE, 0);
13758 barrier();
13759
13760 - check_efer();
13761 if (cpu != 0)
13762 enable_x2apic();
13763
13764 @@ -1199,7 +1151,7 @@ void __cpuinit cpu_init(void)
13765 {
13766 int cpu = smp_processor_id();
13767 struct task_struct *curr = current;
13768 - struct tss_struct *t = &per_cpu(init_tss, cpu);
13769 + struct tss_struct *t = init_tss + cpu;
13770 struct thread_struct *thread = &curr->thread;
13771
13772 if (cpumask_test_and_set_cpu(cpu, cpu_initialized_mask)) {
13773 diff --git a/arch/x86/kernel/cpu/intel.c b/arch/x86/kernel/cpu/intel.c
13774 index 6a77cca..4f4fca0 100644
13775 --- a/arch/x86/kernel/cpu/intel.c
13776 +++ b/arch/x86/kernel/cpu/intel.c
13777 @@ -162,7 +162,7 @@ static void __cpuinit trap_init_f00f_bug(void)
13778 * Update the IDT descriptor and reload the IDT so that
13779 * it uses the read-only mapped virtual address.
13780 */
13781 - idt_descr.address = fix_to_virt(FIX_F00F_IDT);
13782 + idt_descr.address = (struct desc_struct *)fix_to_virt(FIX_F00F_IDT);
13783 load_idt(&idt_descr);
13784 }
13785 #endif
13786 diff --git a/arch/x86/kernel/cpu/intel_cacheinfo.c b/arch/x86/kernel/cpu/intel_cacheinfo.c
13787 index 417990f..96dc36b 100644
13788 --- a/arch/x86/kernel/cpu/intel_cacheinfo.c
13789 +++ b/arch/x86/kernel/cpu/intel_cacheinfo.c
13790 @@ -921,7 +921,7 @@ static ssize_t store(struct kobject *kobj, struct attribute *attr,
13791 return ret;
13792 }
13793
13794 -static struct sysfs_ops sysfs_ops = {
13795 +static const struct sysfs_ops sysfs_ops = {
13796 .show = show,
13797 .store = store,
13798 };
13799 diff --git a/arch/x86/kernel/cpu/mcheck/mce-inject.c b/arch/x86/kernel/cpu/mcheck/mce-inject.c
13800 index 472763d..9831e11 100644
13801 --- a/arch/x86/kernel/cpu/mcheck/mce-inject.c
13802 +++ b/arch/x86/kernel/cpu/mcheck/mce-inject.c
13803 @@ -211,7 +211,9 @@ static ssize_t mce_write(struct file *filp, const char __user *ubuf,
13804 static int inject_init(void)
13805 {
13806 printk(KERN_INFO "Machine check injector initialized\n");
13807 - mce_chrdev_ops.write = mce_write;
13808 + pax_open_kernel();
13809 + *(void **)&mce_chrdev_ops.write = mce_write;
13810 + pax_close_kernel();
13811 register_die_notifier(&mce_raise_nb);
13812 return 0;
13813 }
13814 diff --git a/arch/x86/kernel/cpu/mcheck/mce.c b/arch/x86/kernel/cpu/mcheck/mce.c
13815 index 0f16a2b..21740f5 100644
13816 --- a/arch/x86/kernel/cpu/mcheck/mce.c
13817 +++ b/arch/x86/kernel/cpu/mcheck/mce.c
13818 @@ -43,6 +43,7 @@
13819 #include <asm/ipi.h>
13820 #include <asm/mce.h>
13821 #include <asm/msr.h>
13822 +#include <asm/local.h>
13823
13824 #include "mce-internal.h"
13825
13826 @@ -187,7 +188,7 @@ static void print_mce(struct mce *m)
13827 !(m->mcgstatus & MCG_STATUS_EIPV) ? " !INEXACT!" : "",
13828 m->cs, m->ip);
13829
13830 - if (m->cs == __KERNEL_CS)
13831 + if (m->cs == __KERNEL_CS || m->cs == __KERNEXEC_KERNEL_CS)
13832 print_symbol("{%s}", m->ip);
13833 pr_cont("\n");
13834 }
13835 @@ -221,10 +222,10 @@ static void print_mce_tail(void)
13836
13837 #define PANIC_TIMEOUT 5 /* 5 seconds */
13838
13839 -static atomic_t mce_paniced;
13840 +static atomic_unchecked_t mce_paniced;
13841
13842 static int fake_panic;
13843 -static atomic_t mce_fake_paniced;
13844 +static atomic_unchecked_t mce_fake_paniced;
13845
13846 /* Panic in progress. Enable interrupts and wait for final IPI */
13847 static void wait_for_panic(void)
13848 @@ -248,7 +249,7 @@ static void mce_panic(char *msg, struct mce *final, char *exp)
13849 /*
13850 * Make sure only one CPU runs in machine check panic
13851 */
13852 - if (atomic_inc_return(&mce_paniced) > 1)
13853 + if (atomic_inc_return_unchecked(&mce_paniced) > 1)
13854 wait_for_panic();
13855 barrier();
13856
13857 @@ -256,7 +257,7 @@ static void mce_panic(char *msg, struct mce *final, char *exp)
13858 console_verbose();
13859 } else {
13860 /* Don't log too much for fake panic */
13861 - if (atomic_inc_return(&mce_fake_paniced) > 1)
13862 + if (atomic_inc_return_unchecked(&mce_fake_paniced) > 1)
13863 return;
13864 }
13865 print_mce_head();
13866 @@ -616,7 +617,7 @@ static int mce_timed_out(u64 *t)
13867 * might have been modified by someone else.
13868 */
13869 rmb();
13870 - if (atomic_read(&mce_paniced))
13871 + if (atomic_read_unchecked(&mce_paniced))
13872 wait_for_panic();
13873 if (!monarch_timeout)
13874 goto out;
13875 @@ -1394,7 +1395,7 @@ static void unexpected_machine_check(struct pt_regs *regs, long error_code)
13876 }
13877
13878 /* Call the installed machine check handler for this CPU setup. */
13879 -void (*machine_check_vector)(struct pt_regs *, long error_code) =
13880 +void (*machine_check_vector)(struct pt_regs *, long error_code) __read_only =
13881 unexpected_machine_check;
13882
13883 /*
13884 @@ -1416,7 +1417,9 @@ void __cpuinit mcheck_init(struct cpuinfo_x86 *c)
13885 return;
13886 }
13887
13888 + pax_open_kernel();
13889 machine_check_vector = do_machine_check;
13890 + pax_close_kernel();
13891
13892 mce_init();
13893 mce_cpu_features(c);
13894 @@ -1429,14 +1432,14 @@ void __cpuinit mcheck_init(struct cpuinfo_x86 *c)
13895 */
13896
13897 static DEFINE_SPINLOCK(mce_state_lock);
13898 -static int open_count; /* #times opened */
13899 +static local_t open_count; /* #times opened */
13900 static int open_exclu; /* already open exclusive? */
13901
13902 static int mce_open(struct inode *inode, struct file *file)
13903 {
13904 spin_lock(&mce_state_lock);
13905
13906 - if (open_exclu || (open_count && (file->f_flags & O_EXCL))) {
13907 + if (open_exclu || (local_read(&open_count) && (file->f_flags & O_EXCL))) {
13908 spin_unlock(&mce_state_lock);
13909
13910 return -EBUSY;
13911 @@ -1444,7 +1447,7 @@ static int mce_open(struct inode *inode, struct file *file)
13912
13913 if (file->f_flags & O_EXCL)
13914 open_exclu = 1;
13915 - open_count++;
13916 + local_inc(&open_count);
13917
13918 spin_unlock(&mce_state_lock);
13919
13920 @@ -1455,7 +1458,7 @@ static int mce_release(struct inode *inode, struct file *file)
13921 {
13922 spin_lock(&mce_state_lock);
13923
13924 - open_count--;
13925 + local_dec(&open_count);
13926 open_exclu = 0;
13927
13928 spin_unlock(&mce_state_lock);
13929 @@ -2082,7 +2085,7 @@ struct dentry *mce_get_debugfs_dir(void)
13930 static void mce_reset(void)
13931 {
13932 cpu_missing = 0;
13933 - atomic_set(&mce_fake_paniced, 0);
13934 + atomic_set_unchecked(&mce_fake_paniced, 0);
13935 atomic_set(&mce_executing, 0);
13936 atomic_set(&mce_callin, 0);
13937 atomic_set(&global_nwo, 0);
13938 diff --git a/arch/x86/kernel/cpu/mcheck/mce_amd.c b/arch/x86/kernel/cpu/mcheck/mce_amd.c
13939 index ef3cd31..9d2f6ab 100644
13940 --- a/arch/x86/kernel/cpu/mcheck/mce_amd.c
13941 +++ b/arch/x86/kernel/cpu/mcheck/mce_amd.c
13942 @@ -385,7 +385,7 @@ static ssize_t store(struct kobject *kobj, struct attribute *attr,
13943 return ret;
13944 }
13945
13946 -static struct sysfs_ops threshold_ops = {
13947 +static const struct sysfs_ops threshold_ops = {
13948 .show = show,
13949 .store = store,
13950 };
13951 diff --git a/arch/x86/kernel/cpu/mcheck/p5.c b/arch/x86/kernel/cpu/mcheck/p5.c
13952 index 5c0e653..1e82c7c 100644
13953 --- a/arch/x86/kernel/cpu/mcheck/p5.c
13954 +++ b/arch/x86/kernel/cpu/mcheck/p5.c
13955 @@ -50,7 +50,9 @@ void intel_p5_mcheck_init(struct cpuinfo_x86 *c)
13956 if (!cpu_has(c, X86_FEATURE_MCE))
13957 return;
13958
13959 + pax_open_kernel();
13960 machine_check_vector = pentium_machine_check;
13961 + pax_close_kernel();
13962 /* Make sure the vector pointer is visible before we enable MCEs: */
13963 wmb();
13964
13965 diff --git a/arch/x86/kernel/cpu/mcheck/winchip.c b/arch/x86/kernel/cpu/mcheck/winchip.c
13966 index 54060f5..e6ba93d 100644
13967 --- a/arch/x86/kernel/cpu/mcheck/winchip.c
13968 +++ b/arch/x86/kernel/cpu/mcheck/winchip.c
13969 @@ -24,7 +24,9 @@ void winchip_mcheck_init(struct cpuinfo_x86 *c)
13970 {
13971 u32 lo, hi;
13972
13973 + pax_open_kernel();
13974 machine_check_vector = winchip_machine_check;
13975 + pax_close_kernel();
13976 /* Make sure the vector pointer is visible before we enable MCEs: */
13977 wmb();
13978
13979 diff --git a/arch/x86/kernel/cpu/mtrr/amd.c b/arch/x86/kernel/cpu/mtrr/amd.c
13980 index 33af141..92ba9cd 100644
13981 --- a/arch/x86/kernel/cpu/mtrr/amd.c
13982 +++ b/arch/x86/kernel/cpu/mtrr/amd.c
13983 @@ -108,7 +108,7 @@ amd_validate_add_page(unsigned long base, unsigned long size, unsigned int type)
13984 return 0;
13985 }
13986
13987 -static struct mtrr_ops amd_mtrr_ops = {
13988 +static const struct mtrr_ops amd_mtrr_ops = {
13989 .vendor = X86_VENDOR_AMD,
13990 .set = amd_set_mtrr,
13991 .get = amd_get_mtrr,
13992 diff --git a/arch/x86/kernel/cpu/mtrr/centaur.c b/arch/x86/kernel/cpu/mtrr/centaur.c
13993 index de89f14..316fe3e 100644
13994 --- a/arch/x86/kernel/cpu/mtrr/centaur.c
13995 +++ b/arch/x86/kernel/cpu/mtrr/centaur.c
13996 @@ -110,7 +110,7 @@ centaur_validate_add_page(unsigned long base, unsigned long size, unsigned int t
13997 return 0;
13998 }
13999
14000 -static struct mtrr_ops centaur_mtrr_ops = {
14001 +static const struct mtrr_ops centaur_mtrr_ops = {
14002 .vendor = X86_VENDOR_CENTAUR,
14003 .set = centaur_set_mcr,
14004 .get = centaur_get_mcr,
14005 diff --git a/arch/x86/kernel/cpu/mtrr/cyrix.c b/arch/x86/kernel/cpu/mtrr/cyrix.c
14006 index 228d982..68a3343 100644
14007 --- a/arch/x86/kernel/cpu/mtrr/cyrix.c
14008 +++ b/arch/x86/kernel/cpu/mtrr/cyrix.c
14009 @@ -265,7 +265,7 @@ static void cyrix_set_all(void)
14010 post_set();
14011 }
14012
14013 -static struct mtrr_ops cyrix_mtrr_ops = {
14014 +static const struct mtrr_ops cyrix_mtrr_ops = {
14015 .vendor = X86_VENDOR_CYRIX,
14016 .set_all = cyrix_set_all,
14017 .set = cyrix_set_arr,
14018 diff --git a/arch/x86/kernel/cpu/mtrr/generic.c b/arch/x86/kernel/cpu/mtrr/generic.c
14019 index 55da0c5..4d75584 100644
14020 --- a/arch/x86/kernel/cpu/mtrr/generic.c
14021 +++ b/arch/x86/kernel/cpu/mtrr/generic.c
14022 @@ -752,7 +752,7 @@ int positive_have_wrcomb(void)
14023 /*
14024 * Generic structure...
14025 */
14026 -struct mtrr_ops generic_mtrr_ops = {
14027 +const struct mtrr_ops generic_mtrr_ops = {
14028 .use_intel_if = 1,
14029 .set_all = generic_set_all,
14030 .get = generic_get_mtrr,
14031 diff --git a/arch/x86/kernel/cpu/mtrr/main.c b/arch/x86/kernel/cpu/mtrr/main.c
14032 index fd60f09..c94ef52 100644
14033 --- a/arch/x86/kernel/cpu/mtrr/main.c
14034 +++ b/arch/x86/kernel/cpu/mtrr/main.c
14035 @@ -60,14 +60,14 @@ static DEFINE_MUTEX(mtrr_mutex);
14036 u64 size_or_mask, size_and_mask;
14037 static bool mtrr_aps_delayed_init;
14038
14039 -static struct mtrr_ops *mtrr_ops[X86_VENDOR_NUM];
14040 +static const struct mtrr_ops *mtrr_ops[X86_VENDOR_NUM] __read_only;
14041
14042 -struct mtrr_ops *mtrr_if;
14043 +const struct mtrr_ops *mtrr_if;
14044
14045 static void set_mtrr(unsigned int reg, unsigned long base,
14046 unsigned long size, mtrr_type type);
14047
14048 -void set_mtrr_ops(struct mtrr_ops *ops)
14049 +void set_mtrr_ops(const struct mtrr_ops *ops)
14050 {
14051 if (ops->vendor && ops->vendor < X86_VENDOR_NUM)
14052 mtrr_ops[ops->vendor] = ops;
14053 diff --git a/arch/x86/kernel/cpu/mtrr/mtrr.h b/arch/x86/kernel/cpu/mtrr/mtrr.h
14054 index a501dee..816c719 100644
14055 --- a/arch/x86/kernel/cpu/mtrr/mtrr.h
14056 +++ b/arch/x86/kernel/cpu/mtrr/mtrr.h
14057 @@ -25,14 +25,14 @@ struct mtrr_ops {
14058 int (*validate_add_page)(unsigned long base, unsigned long size,
14059 unsigned int type);
14060 int (*have_wrcomb)(void);
14061 -};
14062 +} __do_const;
14063
14064 extern int generic_get_free_region(unsigned long base, unsigned long size,
14065 int replace_reg);
14066 extern int generic_validate_add_page(unsigned long base, unsigned long size,
14067 unsigned int type);
14068
14069 -extern struct mtrr_ops generic_mtrr_ops;
14070 +extern const struct mtrr_ops generic_mtrr_ops;
14071
14072 extern int positive_have_wrcomb(void);
14073
14074 @@ -53,10 +53,10 @@ void fill_mtrr_var_range(unsigned int index,
14075 u32 base_lo, u32 base_hi, u32 mask_lo, u32 mask_hi);
14076 void get_mtrr_state(void);
14077
14078 -extern void set_mtrr_ops(struct mtrr_ops *ops);
14079 +extern void set_mtrr_ops(const struct mtrr_ops *ops);
14080
14081 extern u64 size_or_mask, size_and_mask;
14082 -extern struct mtrr_ops *mtrr_if;
14083 +extern const struct mtrr_ops *mtrr_if;
14084
14085 #define is_cpu(vnd) (mtrr_if && mtrr_if->vendor == X86_VENDOR_##vnd)
14086 #define use_intel() (mtrr_if && mtrr_if->use_intel_if == 1)
14087 diff --git a/arch/x86/kernel/cpu/perf_event.c b/arch/x86/kernel/cpu/perf_event.c
14088 index 0ff02ca..fc49a60 100644
14089 --- a/arch/x86/kernel/cpu/perf_event.c
14090 +++ b/arch/x86/kernel/cpu/perf_event.c
14091 @@ -723,10 +723,10 @@ x86_perf_event_update(struct perf_event *event,
14092 * count to the generic event atomically:
14093 */
14094 again:
14095 - prev_raw_count = atomic64_read(&hwc->prev_count);
14096 + prev_raw_count = atomic64_read_unchecked(&hwc->prev_count);
14097 rdmsrl(hwc->event_base + idx, new_raw_count);
14098
14099 - if (atomic64_cmpxchg(&hwc->prev_count, prev_raw_count,
14100 + if (atomic64_cmpxchg_unchecked(&hwc->prev_count, prev_raw_count,
14101 new_raw_count) != prev_raw_count)
14102 goto again;
14103
14104 @@ -741,7 +741,7 @@ again:
14105 delta = (new_raw_count << shift) - (prev_raw_count << shift);
14106 delta >>= shift;
14107
14108 - atomic64_add(delta, &event->count);
14109 + atomic64_add_unchecked(delta, &event->count);
14110 atomic64_sub(delta, &hwc->period_left);
14111
14112 return new_raw_count;
14113 @@ -1353,7 +1353,7 @@ x86_perf_event_set_period(struct perf_event *event,
14114 * The hw event starts counting from this event offset,
14115 * mark it to be able to extra future deltas:
14116 */
14117 - atomic64_set(&hwc->prev_count, (u64)-left);
14118 + atomic64_set_unchecked(&hwc->prev_count, (u64)-left);
14119
14120 err = checking_wrmsrl(hwc->event_base + idx,
14121 (u64)(-left) & x86_pmu.event_mask);
14122 @@ -2357,7 +2357,7 @@ perf_callchain_user(struct pt_regs *regs, struct perf_callchain_entry *entry)
14123 break;
14124
14125 callchain_store(entry, frame.return_address);
14126 - fp = frame.next_frame;
14127 + fp = (__force const void __user *)frame.next_frame;
14128 }
14129 }
14130
14131 diff --git a/arch/x86/kernel/cpu/perfctr-watchdog.c b/arch/x86/kernel/cpu/perfctr-watchdog.c
14132 index 898df97..9e82503 100644
14133 --- a/arch/x86/kernel/cpu/perfctr-watchdog.c
14134 +++ b/arch/x86/kernel/cpu/perfctr-watchdog.c
14135 @@ -30,11 +30,11 @@ struct nmi_watchdog_ctlblk {
14136
14137 /* Interface defining a CPU specific perfctr watchdog */
14138 struct wd_ops {
14139 - int (*reserve)(void);
14140 - void (*unreserve)(void);
14141 - int (*setup)(unsigned nmi_hz);
14142 - void (*rearm)(struct nmi_watchdog_ctlblk *wd, unsigned nmi_hz);
14143 - void (*stop)(void);
14144 + int (* const reserve)(void);
14145 + void (* const unreserve)(void);
14146 + int (* const setup)(unsigned nmi_hz);
14147 + void (* const rearm)(struct nmi_watchdog_ctlblk *wd, unsigned nmi_hz);
14148 + void (* const stop)(void);
14149 unsigned perfctr;
14150 unsigned evntsel;
14151 u64 checkbit;
14152 @@ -645,6 +645,7 @@ static const struct wd_ops p4_wd_ops = {
14153 #define ARCH_PERFMON_NMI_EVENT_SEL ARCH_PERFMON_UNHALTED_CORE_CYCLES_SEL
14154 #define ARCH_PERFMON_NMI_EVENT_UMASK ARCH_PERFMON_UNHALTED_CORE_CYCLES_UMASK
14155
14156 +/* cannot be const */
14157 static struct wd_ops intel_arch_wd_ops;
14158
14159 static int setup_intel_arch_watchdog(unsigned nmi_hz)
14160 @@ -697,6 +698,7 @@ static int setup_intel_arch_watchdog(unsigned nmi_hz)
14161 return 1;
14162 }
14163
14164 +/* cannot be const */
14165 static struct wd_ops intel_arch_wd_ops __read_mostly = {
14166 .reserve = single_msr_reserve,
14167 .unreserve = single_msr_unreserve,
14168 diff --git a/arch/x86/kernel/crash.c b/arch/x86/kernel/crash.c
14169 index ff95824..2ffdcb5 100644
14170 --- a/arch/x86/kernel/crash.c
14171 +++ b/arch/x86/kernel/crash.c
14172 @@ -41,7 +41,7 @@ static void kdump_nmi_callback(int cpu, struct die_args *args)
14173 regs = args->regs;
14174
14175 #ifdef CONFIG_X86_32
14176 - if (!user_mode_vm(regs)) {
14177 + if (!user_mode(regs)) {
14178 crash_fixup_ss_esp(&fixed_regs, regs);
14179 regs = &fixed_regs;
14180 }
14181 diff --git a/arch/x86/kernel/doublefault_32.c b/arch/x86/kernel/doublefault_32.c
14182 index 37250fe..bf2ec74 100644
14183 --- a/arch/x86/kernel/doublefault_32.c
14184 +++ b/arch/x86/kernel/doublefault_32.c
14185 @@ -11,7 +11,7 @@
14186
14187 #define DOUBLEFAULT_STACKSIZE (1024)
14188 static unsigned long doublefault_stack[DOUBLEFAULT_STACKSIZE];
14189 -#define STACK_START (unsigned long)(doublefault_stack+DOUBLEFAULT_STACKSIZE)
14190 +#define STACK_START (unsigned long)(doublefault_stack+DOUBLEFAULT_STACKSIZE-2)
14191
14192 #define ptr_ok(x) ((x) > PAGE_OFFSET && (x) < PAGE_OFFSET + MAXMEM)
14193
14194 @@ -21,7 +21,7 @@ static void doublefault_fn(void)
14195 unsigned long gdt, tss;
14196
14197 store_gdt(&gdt_desc);
14198 - gdt = gdt_desc.address;
14199 + gdt = (unsigned long)gdt_desc.address;
14200
14201 printk(KERN_EMERG "PANIC: double fault, gdt at %08lx [%d bytes]\n", gdt, gdt_desc.size);
14202
14203 @@ -58,10 +58,10 @@ struct tss_struct doublefault_tss __cacheline_aligned = {
14204 /* 0x2 bit is always set */
14205 .flags = X86_EFLAGS_SF | 0x2,
14206 .sp = STACK_START,
14207 - .es = __USER_DS,
14208 + .es = __KERNEL_DS,
14209 .cs = __KERNEL_CS,
14210 .ss = __KERNEL_DS,
14211 - .ds = __USER_DS,
14212 + .ds = __KERNEL_DS,
14213 .fs = __KERNEL_PERCPU,
14214
14215 .__cr3 = __pa_nodebug(swapper_pg_dir),
14216 diff --git a/arch/x86/kernel/dumpstack.c b/arch/x86/kernel/dumpstack.c
14217 index 2d8a371..4fa6ae6 100644
14218 --- a/arch/x86/kernel/dumpstack.c
14219 +++ b/arch/x86/kernel/dumpstack.c
14220 @@ -2,6 +2,9 @@
14221 * Copyright (C) 1991, 1992 Linus Torvalds
14222 * Copyright (C) 2000, 2001, 2002 Andi Kleen, SuSE Labs
14223 */
14224 +#ifdef CONFIG_GRKERNSEC_HIDESYM
14225 +#define __INCLUDED_BY_HIDESYM 1
14226 +#endif
14227 #include <linux/kallsyms.h>
14228 #include <linux/kprobes.h>
14229 #include <linux/uaccess.h>
14230 @@ -28,7 +31,7 @@ static int die_counter;
14231
14232 void printk_address(unsigned long address, int reliable)
14233 {
14234 - printk(" [<%p>] %s%pS\n", (void *) address,
14235 + printk(" [<%p>] %s%pA\n", (void *) address,
14236 reliable ? "" : "? ", (void *) address);
14237 }
14238
14239 @@ -36,9 +39,8 @@ void printk_address(unsigned long address, int reliable)
14240 static void
14241 print_ftrace_graph_addr(unsigned long addr, void *data,
14242 const struct stacktrace_ops *ops,
14243 - struct thread_info *tinfo, int *graph)
14244 + struct task_struct *task, int *graph)
14245 {
14246 - struct task_struct *task = tinfo->task;
14247 unsigned long ret_addr;
14248 int index = task->curr_ret_stack;
14249
14250 @@ -59,7 +61,7 @@ print_ftrace_graph_addr(unsigned long addr, void *data,
14251 static inline void
14252 print_ftrace_graph_addr(unsigned long addr, void *data,
14253 const struct stacktrace_ops *ops,
14254 - struct thread_info *tinfo, int *graph)
14255 + struct task_struct *task, int *graph)
14256 { }
14257 #endif
14258
14259 @@ -70,10 +72,8 @@ print_ftrace_graph_addr(unsigned long addr, void *data,
14260 * severe exception (double fault, nmi, stack fault, debug, mce) hardware stack
14261 */
14262
14263 -static inline int valid_stack_ptr(struct thread_info *tinfo,
14264 - void *p, unsigned int size, void *end)
14265 +static inline int valid_stack_ptr(void *t, void *p, unsigned int size, void *end)
14266 {
14267 - void *t = tinfo;
14268 if (end) {
14269 if (p < end && p >= (end-THREAD_SIZE))
14270 return 1;
14271 @@ -84,14 +84,14 @@ static inline int valid_stack_ptr(struct thread_info *tinfo,
14272 }
14273
14274 unsigned long
14275 -print_context_stack(struct thread_info *tinfo,
14276 +print_context_stack(struct task_struct *task, void *stack_start,
14277 unsigned long *stack, unsigned long bp,
14278 const struct stacktrace_ops *ops, void *data,
14279 unsigned long *end, int *graph)
14280 {
14281 struct stack_frame *frame = (struct stack_frame *)bp;
14282
14283 - while (valid_stack_ptr(tinfo, stack, sizeof(*stack), end)) {
14284 + while (valid_stack_ptr(stack_start, stack, sizeof(*stack), end)) {
14285 unsigned long addr;
14286
14287 addr = *stack;
14288 @@ -103,7 +103,7 @@ print_context_stack(struct thread_info *tinfo,
14289 } else {
14290 ops->address(data, addr, 0);
14291 }
14292 - print_ftrace_graph_addr(addr, data, ops, tinfo, graph);
14293 + print_ftrace_graph_addr(addr, data, ops, task, graph);
14294 }
14295 stack++;
14296 }
14297 @@ -180,7 +180,7 @@ void dump_stack(void)
14298 #endif
14299
14300 printk("Pid: %d, comm: %.20s %s %s %.*s\n",
14301 - current->pid, current->comm, print_tainted(),
14302 + task_pid_nr(current), current->comm, print_tainted(),
14303 init_utsname()->release,
14304 (int)strcspn(init_utsname()->version, " "),
14305 init_utsname()->version);
14306 @@ -220,6 +220,8 @@ unsigned __kprobes long oops_begin(void)
14307 return flags;
14308 }
14309
14310 +extern void gr_handle_kernel_exploit(void);
14311 +
14312 void __kprobes oops_end(unsigned long flags, struct pt_regs *regs, int signr)
14313 {
14314 if (regs && kexec_should_crash(current))
14315 @@ -241,7 +243,10 @@ void __kprobes oops_end(unsigned long flags, struct pt_regs *regs, int signr)
14316 panic("Fatal exception in interrupt");
14317 if (panic_on_oops)
14318 panic("Fatal exception");
14319 - do_exit(signr);
14320 +
14321 + gr_handle_kernel_exploit();
14322 +
14323 + do_group_exit(signr);
14324 }
14325
14326 int __kprobes __die(const char *str, struct pt_regs *regs, long err)
14327 @@ -295,7 +300,7 @@ void die(const char *str, struct pt_regs *regs, long err)
14328 unsigned long flags = oops_begin();
14329 int sig = SIGSEGV;
14330
14331 - if (!user_mode_vm(regs))
14332 + if (!user_mode(regs))
14333 report_bug(regs->ip, regs);
14334
14335 if (__die(str, regs, err))
14336 diff --git a/arch/x86/kernel/dumpstack.h b/arch/x86/kernel/dumpstack.h
14337 index 81086c2..13e8b17 100644
14338 --- a/arch/x86/kernel/dumpstack.h
14339 +++ b/arch/x86/kernel/dumpstack.h
14340 @@ -15,7 +15,7 @@
14341 #endif
14342
14343 extern unsigned long
14344 -print_context_stack(struct thread_info *tinfo,
14345 +print_context_stack(struct task_struct *task, void *stack_start,
14346 unsigned long *stack, unsigned long bp,
14347 const struct stacktrace_ops *ops, void *data,
14348 unsigned long *end, int *graph);
14349 diff --git a/arch/x86/kernel/dumpstack_32.c b/arch/x86/kernel/dumpstack_32.c
14350 index f7dd2a7..504f53b 100644
14351 --- a/arch/x86/kernel/dumpstack_32.c
14352 +++ b/arch/x86/kernel/dumpstack_32.c
14353 @@ -53,16 +53,12 @@ void dump_trace(struct task_struct *task, struct pt_regs *regs,
14354 #endif
14355
14356 for (;;) {
14357 - struct thread_info *context;
14358 + void *stack_start = (void *)((unsigned long)stack & ~(THREAD_SIZE-1));
14359 + bp = print_context_stack(task, stack_start, stack, bp, ops, data, NULL, &graph);
14360
14361 - context = (struct thread_info *)
14362 - ((unsigned long)stack & (~(THREAD_SIZE - 1)));
14363 - bp = print_context_stack(context, stack, bp, ops,
14364 - data, NULL, &graph);
14365 -
14366 - stack = (unsigned long *)context->previous_esp;
14367 - if (!stack)
14368 + if (stack_start == task_stack_page(task))
14369 break;
14370 + stack = *(unsigned long **)stack_start;
14371 if (ops->stack(data, "IRQ") < 0)
14372 break;
14373 touch_nmi_watchdog();
14374 @@ -112,11 +108,12 @@ void show_registers(struct pt_regs *regs)
14375 * When in-kernel, we also print out the stack and code at the
14376 * time of the fault..
14377 */
14378 - if (!user_mode_vm(regs)) {
14379 + if (!user_mode(regs)) {
14380 unsigned int code_prologue = code_bytes * 43 / 64;
14381 unsigned int code_len = code_bytes;
14382 unsigned char c;
14383 u8 *ip;
14384 + unsigned long cs_base = get_desc_base(&get_cpu_gdt_table(smp_processor_id())[(0xffff & regs->cs) >> 3]);
14385
14386 printk(KERN_EMERG "Stack:\n");
14387 show_stack_log_lvl(NULL, regs, &regs->sp,
14388 @@ -124,10 +121,10 @@ void show_registers(struct pt_regs *regs)
14389
14390 printk(KERN_EMERG "Code: ");
14391
14392 - ip = (u8 *)regs->ip - code_prologue;
14393 + ip = (u8 *)regs->ip - code_prologue + cs_base;
14394 if (ip < (u8 *)PAGE_OFFSET || probe_kernel_address(ip, c)) {
14395 /* try starting at IP */
14396 - ip = (u8 *)regs->ip;
14397 + ip = (u8 *)regs->ip + cs_base;
14398 code_len = code_len - code_prologue + 1;
14399 }
14400 for (i = 0; i < code_len; i++, ip++) {
14401 @@ -136,7 +133,7 @@ void show_registers(struct pt_regs *regs)
14402 printk(" Bad EIP value.");
14403 break;
14404 }
14405 - if (ip == (u8 *)regs->ip)
14406 + if (ip == (u8 *)regs->ip + cs_base)
14407 printk("<%02x> ", c);
14408 else
14409 printk("%02x ", c);
14410 @@ -145,10 +142,23 @@ void show_registers(struct pt_regs *regs)
14411 printk("\n");
14412 }
14413
14414 +#ifdef CONFIG_PAX_MEMORY_STACKLEAK
14415 +void pax_check_alloca(unsigned long size)
14416 +{
14417 + unsigned long sp = (unsigned long)&sp, stack_left;
14418 +
14419 + /* all kernel stacks are of the same size */
14420 + stack_left = sp & (THREAD_SIZE - 1);
14421 + BUG_ON(stack_left < 256 || size >= stack_left - 256);
14422 +}
14423 +EXPORT_SYMBOL(pax_check_alloca);
14424 +#endif
14425 +
14426 int is_valid_bugaddr(unsigned long ip)
14427 {
14428 unsigned short ud2;
14429
14430 + ip = ktla_ktva(ip);
14431 if (ip < PAGE_OFFSET)
14432 return 0;
14433 if (probe_kernel_address((unsigned short *)ip, ud2))
14434 diff --git a/arch/x86/kernel/dumpstack_64.c b/arch/x86/kernel/dumpstack_64.c
14435 index a071e6b..36cd585 100644
14436 --- a/arch/x86/kernel/dumpstack_64.c
14437 +++ b/arch/x86/kernel/dumpstack_64.c
14438 @@ -116,8 +116,8 @@ void dump_trace(struct task_struct *task, struct pt_regs *regs,
14439 unsigned long *irq_stack_end =
14440 (unsigned long *)per_cpu(irq_stack_ptr, cpu);
14441 unsigned used = 0;
14442 - struct thread_info *tinfo;
14443 int graph = 0;
14444 + void *stack_start;
14445
14446 if (!task)
14447 task = current;
14448 @@ -146,10 +146,10 @@ void dump_trace(struct task_struct *task, struct pt_regs *regs,
14449 * current stack address. If the stacks consist of nested
14450 * exceptions
14451 */
14452 - tinfo = task_thread_info(task);
14453 for (;;) {
14454 char *id;
14455 unsigned long *estack_end;
14456 +
14457 estack_end = in_exception_stack(cpu, (unsigned long)stack,
14458 &used, &id);
14459
14460 @@ -157,7 +157,7 @@ void dump_trace(struct task_struct *task, struct pt_regs *regs,
14461 if (ops->stack(data, id) < 0)
14462 break;
14463
14464 - bp = print_context_stack(tinfo, stack, bp, ops,
14465 + bp = print_context_stack(task, estack_end - EXCEPTION_STKSZ, stack, bp, ops,
14466 data, estack_end, &graph);
14467 ops->stack(data, "<EOE>");
14468 /*
14469 @@ -176,7 +176,7 @@ void dump_trace(struct task_struct *task, struct pt_regs *regs,
14470 if (stack >= irq_stack && stack < irq_stack_end) {
14471 if (ops->stack(data, "IRQ") < 0)
14472 break;
14473 - bp = print_context_stack(tinfo, stack, bp,
14474 + bp = print_context_stack(task, irq_stack, stack, bp,
14475 ops, data, irq_stack_end, &graph);
14476 /*
14477 * We link to the next stack (which would be
14478 @@ -195,7 +195,8 @@ void dump_trace(struct task_struct *task, struct pt_regs *regs,
14479 /*
14480 * This handles the process stack:
14481 */
14482 - bp = print_context_stack(tinfo, stack, bp, ops, data, NULL, &graph);
14483 + stack_start = (void *)((unsigned long)stack & ~(THREAD_SIZE-1));
14484 + bp = print_context_stack(task, stack_start, stack, bp, ops, data, NULL, &graph);
14485 put_cpu();
14486 }
14487 EXPORT_SYMBOL(dump_trace);
14488 @@ -304,3 +305,50 @@ int is_valid_bugaddr(unsigned long ip)
14489 return ud2 == 0x0b0f;
14490 }
14491
14492 +
14493 +#ifdef CONFIG_PAX_MEMORY_STACKLEAK
14494 +void pax_check_alloca(unsigned long size)
14495 +{
14496 + unsigned long sp = (unsigned long)&sp, stack_start, stack_end;
14497 + unsigned cpu, used;
14498 + char *id;
14499 +
14500 + /* check the process stack first */
14501 + stack_start = (unsigned long)task_stack_page(current);
14502 + stack_end = stack_start + THREAD_SIZE;
14503 + if (likely(stack_start <= sp && sp < stack_end)) {
14504 + unsigned long stack_left = sp & (THREAD_SIZE - 1);
14505 + BUG_ON(stack_left < 256 || size >= stack_left - 256);
14506 + return;
14507 + }
14508 +
14509 + cpu = get_cpu();
14510 +
14511 + /* check the irq stacks */
14512 + stack_end = (unsigned long)per_cpu(irq_stack_ptr, cpu);
14513 + stack_start = stack_end - IRQ_STACK_SIZE;
14514 + if (stack_start <= sp && sp < stack_end) {
14515 + unsigned long stack_left = sp & (IRQ_STACK_SIZE - 1);
14516 + put_cpu();
14517 + BUG_ON(stack_left < 256 || size >= stack_left - 256);
14518 + return;
14519 + }
14520 +
14521 + /* check the exception stacks */
14522 + used = 0;
14523 + stack_end = (unsigned long)in_exception_stack(cpu, sp, &used, &id);
14524 + stack_start = stack_end - EXCEPTION_STKSZ;
14525 + if (stack_end && stack_start <= sp && sp < stack_end) {
14526 + unsigned long stack_left = sp & (EXCEPTION_STKSZ - 1);
14527 + put_cpu();
14528 + BUG_ON(stack_left < 256 || size >= stack_left - 256);
14529 + return;
14530 + }
14531 +
14532 + put_cpu();
14533 +
14534 + /* unknown stack */
14535 + BUG();
14536 +}
14537 +EXPORT_SYMBOL(pax_check_alloca);
14538 +#endif
14539 diff --git a/arch/x86/kernel/e820.c b/arch/x86/kernel/e820.c
14540 index a89739a..95e0c48 100644
14541 --- a/arch/x86/kernel/e820.c
14542 +++ b/arch/x86/kernel/e820.c
14543 @@ -733,7 +733,7 @@ struct early_res {
14544 };
14545 static struct early_res early_res[MAX_EARLY_RES] __initdata = {
14546 { 0, PAGE_SIZE, "BIOS data page" }, /* BIOS data page */
14547 - {}
14548 + { 0, 0, {0}, 0 }
14549 };
14550
14551 static int __init find_overlapped_early(u64 start, u64 end)
14552 diff --git a/arch/x86/kernel/early_printk.c b/arch/x86/kernel/early_printk.c
14553 index b9c830c..1e41a96 100644
14554 --- a/arch/x86/kernel/early_printk.c
14555 +++ b/arch/x86/kernel/early_printk.c
14556 @@ -7,6 +7,7 @@
14557 #include <linux/pci_regs.h>
14558 #include <linux/pci_ids.h>
14559 #include <linux/errno.h>
14560 +#include <linux/sched.h>
14561 #include <asm/io.h>
14562 #include <asm/processor.h>
14563 #include <asm/fcntl.h>
14564 @@ -170,6 +171,8 @@ asmlinkage void early_printk(const char *fmt, ...)
14565 int n;
14566 va_list ap;
14567
14568 + pax_track_stack();
14569 +
14570 va_start(ap, fmt);
14571 n = vscnprintf(buf, sizeof(buf), fmt, ap);
14572 early_console->write(early_console, buf, n);
14573 diff --git a/arch/x86/kernel/efi_32.c b/arch/x86/kernel/efi_32.c
14574 index 5cab48e..b025f9b 100644
14575 --- a/arch/x86/kernel/efi_32.c
14576 +++ b/arch/x86/kernel/efi_32.c
14577 @@ -38,70 +38,56 @@
14578 */
14579
14580 static unsigned long efi_rt_eflags;
14581 -static pgd_t efi_bak_pg_dir_pointer[2];
14582 +static pgd_t __initdata efi_bak_pg_dir_pointer[KERNEL_PGD_PTRS];
14583
14584 -void efi_call_phys_prelog(void)
14585 +void __init efi_call_phys_prelog(void)
14586 {
14587 - unsigned long cr4;
14588 - unsigned long temp;
14589 struct desc_ptr gdt_descr;
14590
14591 +#ifdef CONFIG_PAX_KERNEXEC
14592 + struct desc_struct d;
14593 +#endif
14594 +
14595 local_irq_save(efi_rt_eflags);
14596
14597 - /*
14598 - * If I don't have PAE, I should just duplicate two entries in page
14599 - * directory. If I have PAE, I just need to duplicate one entry in
14600 - * page directory.
14601 - */
14602 - cr4 = read_cr4_safe();
14603 -
14604 - if (cr4 & X86_CR4_PAE) {
14605 - efi_bak_pg_dir_pointer[0].pgd =
14606 - swapper_pg_dir[pgd_index(0)].pgd;
14607 - swapper_pg_dir[0].pgd =
14608 - swapper_pg_dir[pgd_index(PAGE_OFFSET)].pgd;
14609 - } else {
14610 - efi_bak_pg_dir_pointer[0].pgd =
14611 - swapper_pg_dir[pgd_index(0)].pgd;
14612 - efi_bak_pg_dir_pointer[1].pgd =
14613 - swapper_pg_dir[pgd_index(0x400000)].pgd;
14614 - swapper_pg_dir[pgd_index(0)].pgd =
14615 - swapper_pg_dir[pgd_index(PAGE_OFFSET)].pgd;
14616 - temp = PAGE_OFFSET + 0x400000;
14617 - swapper_pg_dir[pgd_index(0x400000)].pgd =
14618 - swapper_pg_dir[pgd_index(temp)].pgd;
14619 - }
14620 + clone_pgd_range(efi_bak_pg_dir_pointer, swapper_pg_dir, KERNEL_PGD_PTRS);
14621 + clone_pgd_range(swapper_pg_dir, swapper_pg_dir + KERNEL_PGD_BOUNDARY,
14622 + min_t(unsigned long, KERNEL_PGD_PTRS, KERNEL_PGD_BOUNDARY));
14623
14624 /*
14625 * After the lock is released, the original page table is restored.
14626 */
14627 __flush_tlb_all();
14628
14629 +#ifdef CONFIG_PAX_KERNEXEC
14630 + pack_descriptor(&d, 0, 0xFFFFF, 0x9B, 0xC);
14631 + write_gdt_entry(get_cpu_gdt_table(0), GDT_ENTRY_KERNEXEC_EFI_CS, &d, DESCTYPE_S);
14632 + pack_descriptor(&d, 0, 0xFFFFF, 0x93, 0xC);
14633 + write_gdt_entry(get_cpu_gdt_table(0), GDT_ENTRY_KERNEXEC_EFI_DS, &d, DESCTYPE_S);
14634 +#endif
14635 +
14636 gdt_descr.address = __pa(get_cpu_gdt_table(0));
14637 gdt_descr.size = GDT_SIZE - 1;
14638 load_gdt(&gdt_descr);
14639 }
14640
14641 -void efi_call_phys_epilog(void)
14642 +void __init efi_call_phys_epilog(void)
14643 {
14644 - unsigned long cr4;
14645 struct desc_ptr gdt_descr;
14646
14647 +#ifdef CONFIG_PAX_KERNEXEC
14648 + struct desc_struct d;
14649 +
14650 + memset(&d, 0, sizeof d);
14651 + write_gdt_entry(get_cpu_gdt_table(0), GDT_ENTRY_KERNEXEC_EFI_CS, &d, DESCTYPE_S);
14652 + write_gdt_entry(get_cpu_gdt_table(0), GDT_ENTRY_KERNEXEC_EFI_DS, &d, DESCTYPE_S);
14653 +#endif
14654 +
14655 gdt_descr.address = (unsigned long)get_cpu_gdt_table(0);
14656 gdt_descr.size = GDT_SIZE - 1;
14657 load_gdt(&gdt_descr);
14658
14659 - cr4 = read_cr4_safe();
14660 -
14661 - if (cr4 & X86_CR4_PAE) {
14662 - swapper_pg_dir[pgd_index(0)].pgd =
14663 - efi_bak_pg_dir_pointer[0].pgd;
14664 - } else {
14665 - swapper_pg_dir[pgd_index(0)].pgd =
14666 - efi_bak_pg_dir_pointer[0].pgd;
14667 - swapper_pg_dir[pgd_index(0x400000)].pgd =
14668 - efi_bak_pg_dir_pointer[1].pgd;
14669 - }
14670 + clone_pgd_range(swapper_pg_dir, efi_bak_pg_dir_pointer, KERNEL_PGD_PTRS);
14671
14672 /*
14673 * After the lock is released, the original page table is restored.
14674 diff --git a/arch/x86/kernel/efi_stub_32.S b/arch/x86/kernel/efi_stub_32.S
14675 index fbe66e6..c5c0dd2 100644
14676 --- a/arch/x86/kernel/efi_stub_32.S
14677 +++ b/arch/x86/kernel/efi_stub_32.S
14678 @@ -6,7 +6,9 @@
14679 */
14680
14681 #include <linux/linkage.h>
14682 +#include <linux/init.h>
14683 #include <asm/page_types.h>
14684 +#include <asm/segment.h>
14685
14686 /*
14687 * efi_call_phys(void *, ...) is a function with variable parameters.
14688 @@ -20,7 +22,7 @@
14689 * service functions will comply with gcc calling convention, too.
14690 */
14691
14692 -.text
14693 +__INIT
14694 ENTRY(efi_call_phys)
14695 /*
14696 * 0. The function can only be called in Linux kernel. So CS has been
14697 @@ -36,9 +38,11 @@ ENTRY(efi_call_phys)
14698 * The mapping of lower virtual memory has been created in prelog and
14699 * epilog.
14700 */
14701 - movl $1f, %edx
14702 - subl $__PAGE_OFFSET, %edx
14703 - jmp *%edx
14704 + movl $(__KERNEXEC_EFI_DS), %edx
14705 + mov %edx, %ds
14706 + mov %edx, %es
14707 + mov %edx, %ss
14708 + ljmp $(__KERNEXEC_EFI_CS),$1f-__PAGE_OFFSET
14709 1:
14710
14711 /*
14712 @@ -47,14 +51,8 @@ ENTRY(efi_call_phys)
14713 * parameter 2, ..., param n. To make things easy, we save the return
14714 * address of efi_call_phys in a global variable.
14715 */
14716 - popl %edx
14717 - movl %edx, saved_return_addr
14718 - /* get the function pointer into ECX*/
14719 - popl %ecx
14720 - movl %ecx, efi_rt_function_ptr
14721 - movl $2f, %edx
14722 - subl $__PAGE_OFFSET, %edx
14723 - pushl %edx
14724 + popl (saved_return_addr)
14725 + popl (efi_rt_function_ptr)
14726
14727 /*
14728 * 3. Clear PG bit in %CR0.
14729 @@ -73,9 +71,8 @@ ENTRY(efi_call_phys)
14730 /*
14731 * 5. Call the physical function.
14732 */
14733 - jmp *%ecx
14734 + call *(efi_rt_function_ptr-__PAGE_OFFSET)
14735
14736 -2:
14737 /*
14738 * 6. After EFI runtime service returns, control will return to
14739 * following instruction. We'd better readjust stack pointer first.
14740 @@ -88,35 +85,32 @@ ENTRY(efi_call_phys)
14741 movl %cr0, %edx
14742 orl $0x80000000, %edx
14743 movl %edx, %cr0
14744 - jmp 1f
14745 -1:
14746 +
14747 /*
14748 * 8. Now restore the virtual mode from flat mode by
14749 * adding EIP with PAGE_OFFSET.
14750 */
14751 - movl $1f, %edx
14752 - jmp *%edx
14753 + ljmp $(__KERNEL_CS),$1f+__PAGE_OFFSET
14754 1:
14755 + movl $(__KERNEL_DS), %edx
14756 + mov %edx, %ds
14757 + mov %edx, %es
14758 + mov %edx, %ss
14759
14760 /*
14761 * 9. Balance the stack. And because EAX contain the return value,
14762 * we'd better not clobber it.
14763 */
14764 - leal efi_rt_function_ptr, %edx
14765 - movl (%edx), %ecx
14766 - pushl %ecx
14767 + pushl (efi_rt_function_ptr)
14768
14769 /*
14770 - * 10. Push the saved return address onto the stack and return.
14771 + * 10. Return to the saved return address.
14772 */
14773 - leal saved_return_addr, %edx
14774 - movl (%edx), %ecx
14775 - pushl %ecx
14776 - ret
14777 + jmpl *(saved_return_addr)
14778 ENDPROC(efi_call_phys)
14779 .previous
14780
14781 -.data
14782 +__INITDATA
14783 saved_return_addr:
14784 .long 0
14785 efi_rt_function_ptr:
14786 diff --git a/arch/x86/kernel/efi_stub_64.S b/arch/x86/kernel/efi_stub_64.S
14787 index 4c07cca..2c8427d 100644
14788 --- a/arch/x86/kernel/efi_stub_64.S
14789 +++ b/arch/x86/kernel/efi_stub_64.S
14790 @@ -7,6 +7,7 @@
14791 */
14792
14793 #include <linux/linkage.h>
14794 +#include <asm/alternative-asm.h>
14795
14796 #define SAVE_XMM \
14797 mov %rsp, %rax; \
14798 @@ -40,6 +41,7 @@ ENTRY(efi_call0)
14799 call *%rdi
14800 addq $32, %rsp
14801 RESTORE_XMM
14802 + pax_force_retaddr 0, 1
14803 ret
14804 ENDPROC(efi_call0)
14805
14806 @@ -50,6 +52,7 @@ ENTRY(efi_call1)
14807 call *%rdi
14808 addq $32, %rsp
14809 RESTORE_XMM
14810 + pax_force_retaddr 0, 1
14811 ret
14812 ENDPROC(efi_call1)
14813
14814 @@ -60,6 +63,7 @@ ENTRY(efi_call2)
14815 call *%rdi
14816 addq $32, %rsp
14817 RESTORE_XMM
14818 + pax_force_retaddr 0, 1
14819 ret
14820 ENDPROC(efi_call2)
14821
14822 @@ -71,6 +75,7 @@ ENTRY(efi_call3)
14823 call *%rdi
14824 addq $32, %rsp
14825 RESTORE_XMM
14826 + pax_force_retaddr 0, 1
14827 ret
14828 ENDPROC(efi_call3)
14829
14830 @@ -83,6 +88,7 @@ ENTRY(efi_call4)
14831 call *%rdi
14832 addq $32, %rsp
14833 RESTORE_XMM
14834 + pax_force_retaddr 0, 1
14835 ret
14836 ENDPROC(efi_call4)
14837
14838 @@ -96,6 +102,7 @@ ENTRY(efi_call5)
14839 call *%rdi
14840 addq $48, %rsp
14841 RESTORE_XMM
14842 + pax_force_retaddr 0, 1
14843 ret
14844 ENDPROC(efi_call5)
14845
14846 @@ -112,5 +119,6 @@ ENTRY(efi_call6)
14847 call *%rdi
14848 addq $48, %rsp
14849 RESTORE_XMM
14850 + pax_force_retaddr 0, 1
14851 ret
14852 ENDPROC(efi_call6)
14853 diff --git a/arch/x86/kernel/entry_32.S b/arch/x86/kernel/entry_32.S
14854 index c097e7d..c689cf4 100644
14855 --- a/arch/x86/kernel/entry_32.S
14856 +++ b/arch/x86/kernel/entry_32.S
14857 @@ -185,13 +185,146 @@
14858 /*CFI_REL_OFFSET gs, PT_GS*/
14859 .endm
14860 .macro SET_KERNEL_GS reg
14861 +
14862 +#ifdef CONFIG_CC_STACKPROTECTOR
14863 movl $(__KERNEL_STACK_CANARY), \reg
14864 +#elif defined(CONFIG_PAX_MEMORY_UDEREF)
14865 + movl $(__USER_DS), \reg
14866 +#else
14867 + xorl \reg, \reg
14868 +#endif
14869 +
14870 movl \reg, %gs
14871 .endm
14872
14873 #endif /* CONFIG_X86_32_LAZY_GS */
14874
14875 -.macro SAVE_ALL
14876 +.macro pax_enter_kernel
14877 +#ifdef CONFIG_PAX_KERNEXEC
14878 + call pax_enter_kernel
14879 +#endif
14880 +.endm
14881 +
14882 +.macro pax_exit_kernel
14883 +#ifdef CONFIG_PAX_KERNEXEC
14884 + call pax_exit_kernel
14885 +#endif
14886 +.endm
14887 +
14888 +#ifdef CONFIG_PAX_KERNEXEC
14889 +ENTRY(pax_enter_kernel)
14890 +#ifdef CONFIG_PARAVIRT
14891 + pushl %eax
14892 + pushl %ecx
14893 + call PARA_INDIRECT(pv_cpu_ops+PV_CPU_read_cr0)
14894 + mov %eax, %esi
14895 +#else
14896 + mov %cr0, %esi
14897 +#endif
14898 + bts $16, %esi
14899 + jnc 1f
14900 + mov %cs, %esi
14901 + cmp $__KERNEL_CS, %esi
14902 + jz 3f
14903 + ljmp $__KERNEL_CS, $3f
14904 +1: ljmp $__KERNEXEC_KERNEL_CS, $2f
14905 +2:
14906 +#ifdef CONFIG_PARAVIRT
14907 + mov %esi, %eax
14908 + call PARA_INDIRECT(pv_cpu_ops+PV_CPU_write_cr0)
14909 +#else
14910 + mov %esi, %cr0
14911 +#endif
14912 +3:
14913 +#ifdef CONFIG_PARAVIRT
14914 + popl %ecx
14915 + popl %eax
14916 +#endif
14917 + ret
14918 +ENDPROC(pax_enter_kernel)
14919 +
14920 +ENTRY(pax_exit_kernel)
14921 +#ifdef CONFIG_PARAVIRT
14922 + pushl %eax
14923 + pushl %ecx
14924 +#endif
14925 + mov %cs, %esi
14926 + cmp $__KERNEXEC_KERNEL_CS, %esi
14927 + jnz 2f
14928 +#ifdef CONFIG_PARAVIRT
14929 + call PARA_INDIRECT(pv_cpu_ops+PV_CPU_read_cr0);
14930 + mov %eax, %esi
14931 +#else
14932 + mov %cr0, %esi
14933 +#endif
14934 + btr $16, %esi
14935 + ljmp $__KERNEL_CS, $1f
14936 +1:
14937 +#ifdef CONFIG_PARAVIRT
14938 + mov %esi, %eax
14939 + call PARA_INDIRECT(pv_cpu_ops+PV_CPU_write_cr0);
14940 +#else
14941 + mov %esi, %cr0
14942 +#endif
14943 +2:
14944 +#ifdef CONFIG_PARAVIRT
14945 + popl %ecx
14946 + popl %eax
14947 +#endif
14948 + ret
14949 +ENDPROC(pax_exit_kernel)
14950 +#endif
14951 +
14952 +.macro pax_erase_kstack
14953 +#ifdef CONFIG_PAX_MEMORY_STACKLEAK
14954 + call pax_erase_kstack
14955 +#endif
14956 +.endm
14957 +
14958 +#ifdef CONFIG_PAX_MEMORY_STACKLEAK
14959 +/*
14960 + * ebp: thread_info
14961 + * ecx, edx: can be clobbered
14962 + */
14963 +ENTRY(pax_erase_kstack)
14964 + pushl %edi
14965 + pushl %eax
14966 +
14967 + mov TI_lowest_stack(%ebp), %edi
14968 + mov $-0xBEEF, %eax
14969 + std
14970 +
14971 +1: mov %edi, %ecx
14972 + and $THREAD_SIZE_asm - 1, %ecx
14973 + shr $2, %ecx
14974 + repne scasl
14975 + jecxz 2f
14976 +
14977 + cmp $2*16, %ecx
14978 + jc 2f
14979 +
14980 + mov $2*16, %ecx
14981 + repe scasl
14982 + jecxz 2f
14983 + jne 1b
14984 +
14985 +2: cld
14986 + mov %esp, %ecx
14987 + sub %edi, %ecx
14988 + shr $2, %ecx
14989 + rep stosl
14990 +
14991 + mov TI_task_thread_sp0(%ebp), %edi
14992 + sub $128, %edi
14993 + mov %edi, TI_lowest_stack(%ebp)
14994 +
14995 + popl %eax
14996 + popl %edi
14997 + ret
14998 +ENDPROC(pax_erase_kstack)
14999 +#endif
15000 +
15001 +.macro __SAVE_ALL _DS
15002 cld
15003 PUSH_GS
15004 pushl %fs
15005 @@ -224,7 +357,7 @@
15006 pushl %ebx
15007 CFI_ADJUST_CFA_OFFSET 4
15008 CFI_REL_OFFSET ebx, 0
15009 - movl $(__USER_DS), %edx
15010 + movl $\_DS, %edx
15011 movl %edx, %ds
15012 movl %edx, %es
15013 movl $(__KERNEL_PERCPU), %edx
15014 @@ -232,6 +365,15 @@
15015 SET_KERNEL_GS %edx
15016 .endm
15017
15018 +.macro SAVE_ALL
15019 +#if defined(CONFIG_PAX_KERNEXEC) || defined(CONFIG_PAX_PAGEEXEC) || defined(CONFIG_PAX_SEGMEXEC) || defined(CONFIG_PAX_MEMORY_UDEREF)
15020 + __SAVE_ALL __KERNEL_DS
15021 + pax_enter_kernel
15022 +#else
15023 + __SAVE_ALL __USER_DS
15024 +#endif
15025 +.endm
15026 +
15027 .macro RESTORE_INT_REGS
15028 popl %ebx
15029 CFI_ADJUST_CFA_OFFSET -4
15030 @@ -331,7 +473,7 @@ ENTRY(ret_from_fork)
15031 CFI_ADJUST_CFA_OFFSET -4
15032 jmp syscall_exit
15033 CFI_ENDPROC
15034 -END(ret_from_fork)
15035 +ENDPROC(ret_from_fork)
15036
15037 /*
15038 * Return to user mode is not as complex as all this looks,
15039 @@ -352,7 +494,15 @@ check_userspace:
15040 movb PT_CS(%esp), %al
15041 andl $(X86_EFLAGS_VM | SEGMENT_RPL_MASK), %eax
15042 cmpl $USER_RPL, %eax
15043 +
15044 +#ifdef CONFIG_PAX_KERNEXEC
15045 + jae resume_userspace
15046 +
15047 + PAX_EXIT_KERNEL
15048 + jmp resume_kernel
15049 +#else
15050 jb resume_kernel # not returning to v8086 or userspace
15051 +#endif
15052
15053 ENTRY(resume_userspace)
15054 LOCKDEP_SYS_EXIT
15055 @@ -364,8 +514,8 @@ ENTRY(resume_userspace)
15056 andl $_TIF_WORK_MASK, %ecx # is there any work to be done on
15057 # int/exception return?
15058 jne work_pending
15059 - jmp restore_all
15060 -END(ret_from_exception)
15061 + jmp restore_all_pax
15062 +ENDPROC(ret_from_exception)
15063
15064 #ifdef CONFIG_PREEMPT
15065 ENTRY(resume_kernel)
15066 @@ -380,7 +530,7 @@ need_resched:
15067 jz restore_all
15068 call preempt_schedule_irq
15069 jmp need_resched
15070 -END(resume_kernel)
15071 +ENDPROC(resume_kernel)
15072 #endif
15073 CFI_ENDPROC
15074
15075 @@ -414,25 +564,36 @@ sysenter_past_esp:
15076 /*CFI_REL_OFFSET cs, 0*/
15077 /*
15078 * Push current_thread_info()->sysenter_return to the stack.
15079 - * A tiny bit of offset fixup is necessary - 4*4 means the 4 words
15080 - * pushed above; +8 corresponds to copy_thread's esp0 setting.
15081 */
15082 - pushl (TI_sysenter_return-THREAD_SIZE+8+4*4)(%esp)
15083 + pushl $0
15084 CFI_ADJUST_CFA_OFFSET 4
15085 CFI_REL_OFFSET eip, 0
15086
15087 pushl %eax
15088 CFI_ADJUST_CFA_OFFSET 4
15089 SAVE_ALL
15090 + GET_THREAD_INFO(%ebp)
15091 + movl TI_sysenter_return(%ebp),%ebp
15092 + movl %ebp,PT_EIP(%esp)
15093 ENABLE_INTERRUPTS(CLBR_NONE)
15094
15095 /*
15096 * Load the potential sixth argument from user stack.
15097 * Careful about security.
15098 */
15099 + movl PT_OLDESP(%esp),%ebp
15100 +
15101 +#ifdef CONFIG_PAX_MEMORY_UDEREF
15102 + mov PT_OLDSS(%esp),%ds
15103 +1: movl %ds:(%ebp),%ebp
15104 + push %ss
15105 + pop %ds
15106 +#else
15107 cmpl $__PAGE_OFFSET-3,%ebp
15108 jae syscall_fault
15109 1: movl (%ebp),%ebp
15110 +#endif
15111 +
15112 movl %ebp,PT_EBP(%esp)
15113 .section __ex_table,"a"
15114 .align 4
15115 @@ -455,12 +616,24 @@ sysenter_do_call:
15116 testl $_TIF_ALLWORK_MASK, %ecx
15117 jne sysexit_audit
15118 sysenter_exit:
15119 +
15120 +#ifdef CONFIG_PAX_RANDKSTACK
15121 + pushl_cfi %eax
15122 + movl %esp, %eax
15123 + call pax_randomize_kstack
15124 + popl_cfi %eax
15125 +#endif
15126 +
15127 + pax_erase_kstack
15128 +
15129 /* if something modifies registers it must also disable sysexit */
15130 movl PT_EIP(%esp), %edx
15131 movl PT_OLDESP(%esp), %ecx
15132 xorl %ebp,%ebp
15133 TRACE_IRQS_ON
15134 1: mov PT_FS(%esp), %fs
15135 +2: mov PT_DS(%esp), %ds
15136 +3: mov PT_ES(%esp), %es
15137 PTGS_TO_GS
15138 ENABLE_INTERRUPTS_SYSEXIT
15139
15140 @@ -477,6 +650,9 @@ sysenter_audit:
15141 movl %eax,%edx /* 2nd arg: syscall number */
15142 movl $AUDIT_ARCH_I386,%eax /* 1st arg: audit arch */
15143 call audit_syscall_entry
15144 +
15145 + pax_erase_kstack
15146 +
15147 pushl %ebx
15148 CFI_ADJUST_CFA_OFFSET 4
15149 movl PT_EAX(%esp),%eax /* reload syscall number */
15150 @@ -504,11 +680,17 @@ sysexit_audit:
15151
15152 CFI_ENDPROC
15153 .pushsection .fixup,"ax"
15154 -2: movl $0,PT_FS(%esp)
15155 +4: movl $0,PT_FS(%esp)
15156 + jmp 1b
15157 +5: movl $0,PT_DS(%esp)
15158 + jmp 1b
15159 +6: movl $0,PT_ES(%esp)
15160 jmp 1b
15161 .section __ex_table,"a"
15162 .align 4
15163 - .long 1b,2b
15164 + .long 1b,4b
15165 + .long 2b,5b
15166 + .long 3b,6b
15167 .popsection
15168 PTGS_TO_GS_EX
15169 ENDPROC(ia32_sysenter_target)
15170 @@ -538,6 +720,15 @@ syscall_exit:
15171 testl $_TIF_ALLWORK_MASK, %ecx # current->work
15172 jne syscall_exit_work
15173
15174 +restore_all_pax:
15175 +
15176 +#ifdef CONFIG_PAX_RANDKSTACK
15177 + movl %esp, %eax
15178 + call pax_randomize_kstack
15179 +#endif
15180 +
15181 + pax_erase_kstack
15182 +
15183 restore_all:
15184 TRACE_IRQS_IRET
15185 restore_all_notrace:
15186 @@ -602,10 +793,29 @@ ldt_ss:
15187 mov PT_OLDESP(%esp), %eax /* load userspace esp */
15188 mov %dx, %ax /* eax: new kernel esp */
15189 sub %eax, %edx /* offset (low word is 0) */
15190 - PER_CPU(gdt_page, %ebx)
15191 +#ifdef CONFIG_SMP
15192 + movl PER_CPU_VAR(cpu_number), %ebx
15193 + shll $PAGE_SHIFT_asm, %ebx
15194 + addl $cpu_gdt_table, %ebx
15195 +#else
15196 + movl $cpu_gdt_table, %ebx
15197 +#endif
15198 shr $16, %edx
15199 +
15200 +#ifdef CONFIG_PAX_KERNEXEC
15201 + mov %cr0, %esi
15202 + btr $16, %esi
15203 + mov %esi, %cr0
15204 +#endif
15205 +
15206 mov %dl, GDT_ENTRY_ESPFIX_SS * 8 + 4(%ebx) /* bits 16..23 */
15207 mov %dh, GDT_ENTRY_ESPFIX_SS * 8 + 7(%ebx) /* bits 24..31 */
15208 +
15209 +#ifdef CONFIG_PAX_KERNEXEC
15210 + bts $16, %esi
15211 + mov %esi, %cr0
15212 +#endif
15213 +
15214 pushl $__ESPFIX_SS
15215 CFI_ADJUST_CFA_OFFSET 4
15216 push %eax /* new kernel esp */
15217 @@ -636,36 +846,30 @@ work_resched:
15218 movl TI_flags(%ebp), %ecx
15219 andl $_TIF_WORK_MASK, %ecx # is there any work to be done other
15220 # than syscall tracing?
15221 - jz restore_all
15222 + jz restore_all_pax
15223 testb $_TIF_NEED_RESCHED, %cl
15224 jnz work_resched
15225
15226 work_notifysig: # deal with pending signals and
15227 # notify-resume requests
15228 + movl %esp, %eax
15229 #ifdef CONFIG_VM86
15230 testl $X86_EFLAGS_VM, PT_EFLAGS(%esp)
15231 - movl %esp, %eax
15232 - jne work_notifysig_v86 # returning to kernel-space or
15233 + jz 1f # returning to kernel-space or
15234 # vm86-space
15235 - xorl %edx, %edx
15236 - call do_notify_resume
15237 - jmp resume_userspace_sig
15238
15239 - ALIGN
15240 -work_notifysig_v86:
15241 pushl %ecx # save ti_flags for do_notify_resume
15242 CFI_ADJUST_CFA_OFFSET 4
15243 call save_v86_state # %eax contains pt_regs pointer
15244 popl %ecx
15245 CFI_ADJUST_CFA_OFFSET -4
15246 movl %eax, %esp
15247 -#else
15248 - movl %esp, %eax
15249 +1:
15250 #endif
15251 xorl %edx, %edx
15252 call do_notify_resume
15253 jmp resume_userspace_sig
15254 -END(work_pending)
15255 +ENDPROC(work_pending)
15256
15257 # perform syscall exit tracing
15258 ALIGN
15259 @@ -673,11 +877,14 @@ syscall_trace_entry:
15260 movl $-ENOSYS,PT_EAX(%esp)
15261 movl %esp, %eax
15262 call syscall_trace_enter
15263 +
15264 + pax_erase_kstack
15265 +
15266 /* What it returned is what we'll actually use. */
15267 cmpl $(nr_syscalls), %eax
15268 jnae syscall_call
15269 jmp syscall_exit
15270 -END(syscall_trace_entry)
15271 +ENDPROC(syscall_trace_entry)
15272
15273 # perform syscall exit tracing
15274 ALIGN
15275 @@ -690,20 +897,24 @@ syscall_exit_work:
15276 movl %esp, %eax
15277 call syscall_trace_leave
15278 jmp resume_userspace
15279 -END(syscall_exit_work)
15280 +ENDPROC(syscall_exit_work)
15281 CFI_ENDPROC
15282
15283 RING0_INT_FRAME # can't unwind into user space anyway
15284 syscall_fault:
15285 +#ifdef CONFIG_PAX_MEMORY_UDEREF
15286 + push %ss
15287 + pop %ds
15288 +#endif
15289 GET_THREAD_INFO(%ebp)
15290 movl $-EFAULT,PT_EAX(%esp)
15291 jmp resume_userspace
15292 -END(syscall_fault)
15293 +ENDPROC(syscall_fault)
15294
15295 syscall_badsys:
15296 movl $-ENOSYS,PT_EAX(%esp)
15297 jmp resume_userspace
15298 -END(syscall_badsys)
15299 +ENDPROC(syscall_badsys)
15300 CFI_ENDPROC
15301
15302 /*
15303 @@ -726,6 +937,33 @@ PTREGSCALL(rt_sigreturn)
15304 PTREGSCALL(vm86)
15305 PTREGSCALL(vm86old)
15306
15307 + ALIGN;
15308 +ENTRY(kernel_execve)
15309 + push %ebp
15310 + sub $PT_OLDSS+4,%esp
15311 + push %edi
15312 + push %ecx
15313 + push %eax
15314 + lea 3*4(%esp),%edi
15315 + mov $PT_OLDSS/4+1,%ecx
15316 + xorl %eax,%eax
15317 + rep stosl
15318 + pop %eax
15319 + pop %ecx
15320 + pop %edi
15321 + movl $X86_EFLAGS_IF,PT_EFLAGS(%esp)
15322 + mov %eax,PT_EBX(%esp)
15323 + mov %edx,PT_ECX(%esp)
15324 + mov %ecx,PT_EDX(%esp)
15325 + mov %esp,%eax
15326 + call sys_execve
15327 + GET_THREAD_INFO(%ebp)
15328 + test %eax,%eax
15329 + jz syscall_exit
15330 + add $PT_OLDSS+4,%esp
15331 + pop %ebp
15332 + ret
15333 +
15334 .macro FIXUP_ESPFIX_STACK
15335 /*
15336 * Switch back for ESPFIX stack to the normal zerobased stack
15337 @@ -735,7 +973,13 @@ PTREGSCALL(vm86old)
15338 * normal stack and adjusts ESP with the matching offset.
15339 */
15340 /* fixup the stack */
15341 - PER_CPU(gdt_page, %ebx)
15342 +#ifdef CONFIG_SMP
15343 + movl PER_CPU_VAR(cpu_number), %ebx
15344 + shll $PAGE_SHIFT_asm, %ebx
15345 + addl $cpu_gdt_table, %ebx
15346 +#else
15347 + movl $cpu_gdt_table, %ebx
15348 +#endif
15349 mov GDT_ENTRY_ESPFIX_SS * 8 + 4(%ebx), %al /* bits 16..23 */
15350 mov GDT_ENTRY_ESPFIX_SS * 8 + 7(%ebx), %ah /* bits 24..31 */
15351 shl $16, %eax
15352 @@ -793,7 +1037,7 @@ vector=vector+1
15353 .endr
15354 2: jmp common_interrupt
15355 .endr
15356 -END(irq_entries_start)
15357 +ENDPROC(irq_entries_start)
15358
15359 .previous
15360 END(interrupt)
15361 @@ -840,7 +1084,7 @@ ENTRY(coprocessor_error)
15362 CFI_ADJUST_CFA_OFFSET 4
15363 jmp error_code
15364 CFI_ENDPROC
15365 -END(coprocessor_error)
15366 +ENDPROC(coprocessor_error)
15367
15368 ENTRY(simd_coprocessor_error)
15369 RING0_INT_FRAME
15370 @@ -850,7 +1094,7 @@ ENTRY(simd_coprocessor_error)
15371 CFI_ADJUST_CFA_OFFSET 4
15372 jmp error_code
15373 CFI_ENDPROC
15374 -END(simd_coprocessor_error)
15375 +ENDPROC(simd_coprocessor_error)
15376
15377 ENTRY(device_not_available)
15378 RING0_INT_FRAME
15379 @@ -860,7 +1104,7 @@ ENTRY(device_not_available)
15380 CFI_ADJUST_CFA_OFFSET 4
15381 jmp error_code
15382 CFI_ENDPROC
15383 -END(device_not_available)
15384 +ENDPROC(device_not_available)
15385
15386 #ifdef CONFIG_PARAVIRT
15387 ENTRY(native_iret)
15388 @@ -869,12 +1113,12 @@ ENTRY(native_iret)
15389 .align 4
15390 .long native_iret, iret_exc
15391 .previous
15392 -END(native_iret)
15393 +ENDPROC(native_iret)
15394
15395 ENTRY(native_irq_enable_sysexit)
15396 sti
15397 sysexit
15398 -END(native_irq_enable_sysexit)
15399 +ENDPROC(native_irq_enable_sysexit)
15400 #endif
15401
15402 ENTRY(overflow)
15403 @@ -885,7 +1129,7 @@ ENTRY(overflow)
15404 CFI_ADJUST_CFA_OFFSET 4
15405 jmp error_code
15406 CFI_ENDPROC
15407 -END(overflow)
15408 +ENDPROC(overflow)
15409
15410 ENTRY(bounds)
15411 RING0_INT_FRAME
15412 @@ -895,7 +1139,7 @@ ENTRY(bounds)
15413 CFI_ADJUST_CFA_OFFSET 4
15414 jmp error_code
15415 CFI_ENDPROC
15416 -END(bounds)
15417 +ENDPROC(bounds)
15418
15419 ENTRY(invalid_op)
15420 RING0_INT_FRAME
15421 @@ -905,7 +1149,7 @@ ENTRY(invalid_op)
15422 CFI_ADJUST_CFA_OFFSET 4
15423 jmp error_code
15424 CFI_ENDPROC
15425 -END(invalid_op)
15426 +ENDPROC(invalid_op)
15427
15428 ENTRY(coprocessor_segment_overrun)
15429 RING0_INT_FRAME
15430 @@ -915,7 +1159,7 @@ ENTRY(coprocessor_segment_overrun)
15431 CFI_ADJUST_CFA_OFFSET 4
15432 jmp error_code
15433 CFI_ENDPROC
15434 -END(coprocessor_segment_overrun)
15435 +ENDPROC(coprocessor_segment_overrun)
15436
15437 ENTRY(invalid_TSS)
15438 RING0_EC_FRAME
15439 @@ -923,7 +1167,7 @@ ENTRY(invalid_TSS)
15440 CFI_ADJUST_CFA_OFFSET 4
15441 jmp error_code
15442 CFI_ENDPROC
15443 -END(invalid_TSS)
15444 +ENDPROC(invalid_TSS)
15445
15446 ENTRY(segment_not_present)
15447 RING0_EC_FRAME
15448 @@ -931,7 +1175,7 @@ ENTRY(segment_not_present)
15449 CFI_ADJUST_CFA_OFFSET 4
15450 jmp error_code
15451 CFI_ENDPROC
15452 -END(segment_not_present)
15453 +ENDPROC(segment_not_present)
15454
15455 ENTRY(stack_segment)
15456 RING0_EC_FRAME
15457 @@ -939,7 +1183,7 @@ ENTRY(stack_segment)
15458 CFI_ADJUST_CFA_OFFSET 4
15459 jmp error_code
15460 CFI_ENDPROC
15461 -END(stack_segment)
15462 +ENDPROC(stack_segment)
15463
15464 ENTRY(alignment_check)
15465 RING0_EC_FRAME
15466 @@ -947,7 +1191,7 @@ ENTRY(alignment_check)
15467 CFI_ADJUST_CFA_OFFSET 4
15468 jmp error_code
15469 CFI_ENDPROC
15470 -END(alignment_check)
15471 +ENDPROC(alignment_check)
15472
15473 ENTRY(divide_error)
15474 RING0_INT_FRAME
15475 @@ -957,7 +1201,7 @@ ENTRY(divide_error)
15476 CFI_ADJUST_CFA_OFFSET 4
15477 jmp error_code
15478 CFI_ENDPROC
15479 -END(divide_error)
15480 +ENDPROC(divide_error)
15481
15482 #ifdef CONFIG_X86_MCE
15483 ENTRY(machine_check)
15484 @@ -968,7 +1212,7 @@ ENTRY(machine_check)
15485 CFI_ADJUST_CFA_OFFSET 4
15486 jmp error_code
15487 CFI_ENDPROC
15488 -END(machine_check)
15489 +ENDPROC(machine_check)
15490 #endif
15491
15492 ENTRY(spurious_interrupt_bug)
15493 @@ -979,7 +1223,7 @@ ENTRY(spurious_interrupt_bug)
15494 CFI_ADJUST_CFA_OFFSET 4
15495 jmp error_code
15496 CFI_ENDPROC
15497 -END(spurious_interrupt_bug)
15498 +ENDPROC(spurious_interrupt_bug)
15499
15500 ENTRY(kernel_thread_helper)
15501 pushl $0 # fake return address for unwinder
15502 @@ -1095,7 +1339,7 @@ ENDPROC(xen_failsafe_callback)
15503
15504 ENTRY(mcount)
15505 ret
15506 -END(mcount)
15507 +ENDPROC(mcount)
15508
15509 ENTRY(ftrace_caller)
15510 cmpl $0, function_trace_stop
15511 @@ -1124,7 +1368,7 @@ ftrace_graph_call:
15512 .globl ftrace_stub
15513 ftrace_stub:
15514 ret
15515 -END(ftrace_caller)
15516 +ENDPROC(ftrace_caller)
15517
15518 #else /* ! CONFIG_DYNAMIC_FTRACE */
15519
15520 @@ -1160,7 +1404,7 @@ trace:
15521 popl %ecx
15522 popl %eax
15523 jmp ftrace_stub
15524 -END(mcount)
15525 +ENDPROC(mcount)
15526 #endif /* CONFIG_DYNAMIC_FTRACE */
15527 #endif /* CONFIG_FUNCTION_TRACER */
15528
15529 @@ -1181,7 +1425,7 @@ ENTRY(ftrace_graph_caller)
15530 popl %ecx
15531 popl %eax
15532 ret
15533 -END(ftrace_graph_caller)
15534 +ENDPROC(ftrace_graph_caller)
15535
15536 .globl return_to_handler
15537 return_to_handler:
15538 @@ -1198,7 +1442,6 @@ return_to_handler:
15539 ret
15540 #endif
15541
15542 -.section .rodata,"a"
15543 #include "syscall_table_32.S"
15544
15545 syscall_table_size=(.-sys_call_table)
15546 @@ -1255,15 +1498,18 @@ error_code:
15547 movl $-1, PT_ORIG_EAX(%esp) # no syscall to restart
15548 REG_TO_PTGS %ecx
15549 SET_KERNEL_GS %ecx
15550 - movl $(__USER_DS), %ecx
15551 + movl $(__KERNEL_DS), %ecx
15552 movl %ecx, %ds
15553 movl %ecx, %es
15554 +
15555 + pax_enter_kernel
15556 +
15557 TRACE_IRQS_OFF
15558 movl %esp,%eax # pt_regs pointer
15559 call *%edi
15560 jmp ret_from_exception
15561 CFI_ENDPROC
15562 -END(page_fault)
15563 +ENDPROC(page_fault)
15564
15565 /*
15566 * Debug traps and NMI can happen at the one SYSENTER instruction
15567 @@ -1309,7 +1555,7 @@ debug_stack_correct:
15568 call do_debug
15569 jmp ret_from_exception
15570 CFI_ENDPROC
15571 -END(debug)
15572 +ENDPROC(debug)
15573
15574 /*
15575 * NMI is doubly nasty. It can happen _while_ we're handling
15576 @@ -1351,6 +1597,9 @@ nmi_stack_correct:
15577 xorl %edx,%edx # zero error code
15578 movl %esp,%eax # pt_regs pointer
15579 call do_nmi
15580 +
15581 + pax_exit_kernel
15582 +
15583 jmp restore_all_notrace
15584 CFI_ENDPROC
15585
15586 @@ -1391,12 +1640,15 @@ nmi_espfix_stack:
15587 FIXUP_ESPFIX_STACK # %eax == %esp
15588 xorl %edx,%edx # zero error code
15589 call do_nmi
15590 +
15591 + pax_exit_kernel
15592 +
15593 RESTORE_REGS
15594 lss 12+4(%esp), %esp # back to espfix stack
15595 CFI_ADJUST_CFA_OFFSET -24
15596 jmp irq_return
15597 CFI_ENDPROC
15598 -END(nmi)
15599 +ENDPROC(nmi)
15600
15601 ENTRY(int3)
15602 RING0_INT_FRAME
15603 @@ -1409,7 +1661,7 @@ ENTRY(int3)
15604 call do_int3
15605 jmp ret_from_exception
15606 CFI_ENDPROC
15607 -END(int3)
15608 +ENDPROC(int3)
15609
15610 ENTRY(general_protection)
15611 RING0_EC_FRAME
15612 @@ -1417,7 +1669,7 @@ ENTRY(general_protection)
15613 CFI_ADJUST_CFA_OFFSET 4
15614 jmp error_code
15615 CFI_ENDPROC
15616 -END(general_protection)
15617 +ENDPROC(general_protection)
15618
15619 /*
15620 * End of kprobes section
15621 diff --git a/arch/x86/kernel/entry_64.S b/arch/x86/kernel/entry_64.S
15622 index 34a56a9..4aa5c8b 100644
15623 --- a/arch/x86/kernel/entry_64.S
15624 +++ b/arch/x86/kernel/entry_64.S
15625 @@ -53,6 +53,8 @@
15626 #include <asm/paravirt.h>
15627 #include <asm/ftrace.h>
15628 #include <asm/percpu.h>
15629 +#include <asm/pgtable.h>
15630 +#include <asm/alternative-asm.h>
15631
15632 /* Avoid __ASSEMBLER__'ifying <linux/audit.h> just for this. */
15633 #include <linux/elf-em.h>
15634 @@ -64,8 +66,9 @@
15635 #ifdef CONFIG_FUNCTION_TRACER
15636 #ifdef CONFIG_DYNAMIC_FTRACE
15637 ENTRY(mcount)
15638 + pax_force_retaddr
15639 retq
15640 -END(mcount)
15641 +ENDPROC(mcount)
15642
15643 ENTRY(ftrace_caller)
15644 cmpl $0, function_trace_stop
15645 @@ -88,8 +91,9 @@ GLOBAL(ftrace_graph_call)
15646 #endif
15647
15648 GLOBAL(ftrace_stub)
15649 + pax_force_retaddr
15650 retq
15651 -END(ftrace_caller)
15652 +ENDPROC(ftrace_caller)
15653
15654 #else /* ! CONFIG_DYNAMIC_FTRACE */
15655 ENTRY(mcount)
15656 @@ -108,6 +112,7 @@ ENTRY(mcount)
15657 #endif
15658
15659 GLOBAL(ftrace_stub)
15660 + pax_force_retaddr
15661 retq
15662
15663 trace:
15664 @@ -117,12 +122,13 @@ trace:
15665 movq 8(%rbp), %rsi
15666 subq $MCOUNT_INSN_SIZE, %rdi
15667
15668 + pax_force_fptr ftrace_trace_function
15669 call *ftrace_trace_function
15670
15671 MCOUNT_RESTORE_FRAME
15672
15673 jmp ftrace_stub
15674 -END(mcount)
15675 +ENDPROC(mcount)
15676 #endif /* CONFIG_DYNAMIC_FTRACE */
15677 #endif /* CONFIG_FUNCTION_TRACER */
15678
15679 @@ -142,8 +148,9 @@ ENTRY(ftrace_graph_caller)
15680
15681 MCOUNT_RESTORE_FRAME
15682
15683 + pax_force_retaddr
15684 retq
15685 -END(ftrace_graph_caller)
15686 +ENDPROC(ftrace_graph_caller)
15687
15688 GLOBAL(return_to_handler)
15689 subq $24, %rsp
15690 @@ -159,6 +166,7 @@ GLOBAL(return_to_handler)
15691 movq 8(%rsp), %rdx
15692 movq (%rsp), %rax
15693 addq $16, %rsp
15694 + pax_force_retaddr
15695 retq
15696 #endif
15697
15698 @@ -174,6 +182,282 @@ ENTRY(native_usergs_sysret64)
15699 ENDPROC(native_usergs_sysret64)
15700 #endif /* CONFIG_PARAVIRT */
15701
15702 + .macro ljmpq sel, off
15703 +#if defined(CONFIG_MPSC) || defined(CONFIG_MCORE2) || defined (CONFIG_MATOM)
15704 + .byte 0x48; ljmp *1234f(%rip)
15705 + .pushsection .rodata
15706 + .align 16
15707 + 1234: .quad \off; .word \sel
15708 + .popsection
15709 +#else
15710 + pushq $\sel
15711 + pushq $\off
15712 + lretq
15713 +#endif
15714 + .endm
15715 +
15716 + .macro pax_enter_kernel
15717 + pax_set_fptr_mask
15718 +#ifdef CONFIG_PAX_KERNEXEC
15719 + call pax_enter_kernel
15720 +#endif
15721 + .endm
15722 +
15723 + .macro pax_exit_kernel
15724 +#ifdef CONFIG_PAX_KERNEXEC
15725 + call pax_exit_kernel
15726 +#endif
15727 + .endm
15728 +
15729 +#ifdef CONFIG_PAX_KERNEXEC
15730 +ENTRY(pax_enter_kernel)
15731 + pushq %rdi
15732 +
15733 +#ifdef CONFIG_PARAVIRT
15734 + PV_SAVE_REGS(CLBR_RDI)
15735 +#endif
15736 +
15737 + GET_CR0_INTO_RDI
15738 + bts $16,%rdi
15739 + jnc 3f
15740 + mov %cs,%edi
15741 + cmp $__KERNEL_CS,%edi
15742 + jnz 2f
15743 +1:
15744 +
15745 +#ifdef CONFIG_PARAVIRT
15746 + PV_RESTORE_REGS(CLBR_RDI)
15747 +#endif
15748 +
15749 + popq %rdi
15750 + pax_force_retaddr
15751 + retq
15752 +
15753 +2: ljmpq __KERNEL_CS,1f
15754 +3: ljmpq __KERNEXEC_KERNEL_CS,4f
15755 +4: SET_RDI_INTO_CR0
15756 + jmp 1b
15757 +ENDPROC(pax_enter_kernel)
15758 +
15759 +ENTRY(pax_exit_kernel)
15760 + pushq %rdi
15761 +
15762 +#ifdef CONFIG_PARAVIRT
15763 + PV_SAVE_REGS(CLBR_RDI)
15764 +#endif
15765 +
15766 + mov %cs,%rdi
15767 + cmp $__KERNEXEC_KERNEL_CS,%edi
15768 + jz 2f
15769 +1:
15770 +
15771 +#ifdef CONFIG_PARAVIRT
15772 + PV_RESTORE_REGS(CLBR_RDI);
15773 +#endif
15774 +
15775 + popq %rdi
15776 + pax_force_retaddr
15777 + retq
15778 +
15779 +2: GET_CR0_INTO_RDI
15780 + btr $16,%rdi
15781 + ljmpq __KERNEL_CS,3f
15782 +3: SET_RDI_INTO_CR0
15783 + jmp 1b
15784 +#ifdef CONFIG_PARAVIRT
15785 + PV_RESTORE_REGS(CLBR_RDI);
15786 +#endif
15787 +
15788 + popq %rdi
15789 + pax_force_retaddr
15790 + retq
15791 +ENDPROC(pax_exit_kernel)
15792 +#endif
15793 +
15794 + .macro pax_enter_kernel_user
15795 + pax_set_fptr_mask
15796 +#ifdef CONFIG_PAX_MEMORY_UDEREF
15797 + call pax_enter_kernel_user
15798 +#endif
15799 + .endm
15800 +
15801 + .macro pax_exit_kernel_user
15802 +#ifdef CONFIG_PAX_MEMORY_UDEREF
15803 + call pax_exit_kernel_user
15804 +#endif
15805 +#ifdef CONFIG_PAX_RANDKSTACK
15806 + pushq %rax
15807 + call pax_randomize_kstack
15808 + popq %rax
15809 +#endif
15810 + .endm
15811 +
15812 +#ifdef CONFIG_PAX_MEMORY_UDEREF
15813 +ENTRY(pax_enter_kernel_user)
15814 + pushq %rdi
15815 + pushq %rbx
15816 +
15817 +#ifdef CONFIG_PARAVIRT
15818 + PV_SAVE_REGS(CLBR_RDI)
15819 +#endif
15820 +
15821 + GET_CR3_INTO_RDI
15822 + mov %rdi,%rbx
15823 + add $__START_KERNEL_map,%rbx
15824 + sub phys_base(%rip),%rbx
15825 +
15826 +#ifdef CONFIG_PARAVIRT
15827 + pushq %rdi
15828 + cmpl $0, pv_info+PARAVIRT_enabled
15829 + jz 1f
15830 + i = 0
15831 + .rept USER_PGD_PTRS
15832 + mov i*8(%rbx),%rsi
15833 + mov $0,%sil
15834 + lea i*8(%rbx),%rdi
15835 + call PARA_INDIRECT(pv_mmu_ops+PV_MMU_set_pgd_batched)
15836 + i = i + 1
15837 + .endr
15838 + jmp 2f
15839 +1:
15840 +#endif
15841 +
15842 + i = 0
15843 + .rept USER_PGD_PTRS
15844 + movb $0,i*8(%rbx)
15845 + i = i + 1
15846 + .endr
15847 +
15848 +#ifdef CONFIG_PARAVIRT
15849 +2: popq %rdi
15850 +#endif
15851 + SET_RDI_INTO_CR3
15852 +
15853 +#ifdef CONFIG_PAX_KERNEXEC
15854 + GET_CR0_INTO_RDI
15855 + bts $16,%rdi
15856 + SET_RDI_INTO_CR0
15857 +#endif
15858 +
15859 +#ifdef CONFIG_PARAVIRT
15860 + PV_RESTORE_REGS(CLBR_RDI)
15861 +#endif
15862 +
15863 + popq %rbx
15864 + popq %rdi
15865 + pax_force_retaddr
15866 + retq
15867 +ENDPROC(pax_enter_kernel_user)
15868 +
15869 +ENTRY(pax_exit_kernel_user)
15870 + push %rdi
15871 +
15872 +#ifdef CONFIG_PARAVIRT
15873 + pushq %rbx
15874 + PV_SAVE_REGS(CLBR_RDI)
15875 +#endif
15876 +
15877 +#ifdef CONFIG_PAX_KERNEXEC
15878 + GET_CR0_INTO_RDI
15879 + btr $16,%rdi
15880 + SET_RDI_INTO_CR0
15881 +#endif
15882 +
15883 + GET_CR3_INTO_RDI
15884 + add $__START_KERNEL_map,%rdi
15885 + sub phys_base(%rip),%rdi
15886 +
15887 +#ifdef CONFIG_PARAVIRT
15888 + cmpl $0, pv_info+PARAVIRT_enabled
15889 + jz 1f
15890 + mov %rdi,%rbx
15891 + i = 0
15892 + .rept USER_PGD_PTRS
15893 + mov i*8(%rbx),%rsi
15894 + mov $0x67,%sil
15895 + lea i*8(%rbx),%rdi
15896 + call PARA_INDIRECT(pv_mmu_ops+PV_MMU_set_pgd_batched)
15897 + i = i + 1
15898 + .endr
15899 + jmp 2f
15900 +1:
15901 +#endif
15902 +
15903 + i = 0
15904 + .rept USER_PGD_PTRS
15905 + movb $0x67,i*8(%rdi)
15906 + i = i + 1
15907 + .endr
15908 +
15909 +#ifdef CONFIG_PARAVIRT
15910 +2: PV_RESTORE_REGS(CLBR_RDI)
15911 + popq %rbx
15912 +#endif
15913 +
15914 + popq %rdi
15915 + pax_force_retaddr
15916 + retq
15917 +ENDPROC(pax_exit_kernel_user)
15918 +#endif
15919 +
15920 +.macro pax_erase_kstack
15921 +#ifdef CONFIG_PAX_MEMORY_STACKLEAK
15922 + call pax_erase_kstack
15923 +#endif
15924 +.endm
15925 +
15926 +#ifdef CONFIG_PAX_MEMORY_STACKLEAK
15927 +/*
15928 + * r11: thread_info
15929 + * rcx, rdx: can be clobbered
15930 + */
15931 +ENTRY(pax_erase_kstack)
15932 + pushq %rdi
15933 + pushq %rax
15934 + pushq %r11
15935 +
15936 + GET_THREAD_INFO(%r11)
15937 + mov TI_lowest_stack(%r11), %rdi
15938 + mov $-0xBEEF, %rax
15939 + std
15940 +
15941 +1: mov %edi, %ecx
15942 + and $THREAD_SIZE_asm - 1, %ecx
15943 + shr $3, %ecx
15944 + repne scasq
15945 + jecxz 2f
15946 +
15947 + cmp $2*8, %ecx
15948 + jc 2f
15949 +
15950 + mov $2*8, %ecx
15951 + repe scasq
15952 + jecxz 2f
15953 + jne 1b
15954 +
15955 +2: cld
15956 + mov %esp, %ecx
15957 + sub %edi, %ecx
15958 +
15959 + cmp $THREAD_SIZE_asm, %rcx
15960 + jb 3f
15961 + ud2
15962 +3:
15963 +
15964 + shr $3, %ecx
15965 + rep stosq
15966 +
15967 + mov TI_task_thread_sp0(%r11), %rdi
15968 + sub $256, %rdi
15969 + mov %rdi, TI_lowest_stack(%r11)
15970 +
15971 + popq %r11
15972 + popq %rax
15973 + popq %rdi
15974 + pax_force_retaddr
15975 + ret
15976 +ENDPROC(pax_erase_kstack)
15977 +#endif
15978
15979 .macro TRACE_IRQS_IRETQ offset=ARGOFFSET
15980 #ifdef CONFIG_TRACE_IRQFLAGS
15981 @@ -233,8 +517,8 @@ ENDPROC(native_usergs_sysret64)
15982 .endm
15983
15984 .macro UNFAKE_STACK_FRAME
15985 - addq $8*6, %rsp
15986 - CFI_ADJUST_CFA_OFFSET -(6*8)
15987 + addq $8*6 + ARG_SKIP, %rsp
15988 + CFI_ADJUST_CFA_OFFSET -(6*8 + ARG_SKIP)
15989 .endm
15990
15991 /*
15992 @@ -317,7 +601,7 @@ ENTRY(save_args)
15993 leaq -ARGOFFSET+16(%rsp),%rdi /* arg1 for handler */
15994 movq_cfi rbp, 8 /* push %rbp */
15995 leaq 8(%rsp), %rbp /* mov %rsp, %ebp */
15996 - testl $3, CS(%rdi)
15997 + testb $3, CS(%rdi)
15998 je 1f
15999 SWAPGS
16000 /*
16001 @@ -337,9 +621,10 @@ ENTRY(save_args)
16002 * We entered an interrupt context - irqs are off:
16003 */
16004 2: TRACE_IRQS_OFF
16005 + pax_force_retaddr
16006 ret
16007 CFI_ENDPROC
16008 -END(save_args)
16009 +ENDPROC(save_args)
16010
16011 ENTRY(save_rest)
16012 PARTIAL_FRAME 1 REST_SKIP+8
16013 @@ -352,9 +637,10 @@ ENTRY(save_rest)
16014 movq_cfi r15, R15+16
16015 movq %r11, 8(%rsp) /* return address */
16016 FIXUP_TOP_OF_STACK %r11, 16
16017 + pax_force_retaddr
16018 ret
16019 CFI_ENDPROC
16020 -END(save_rest)
16021 +ENDPROC(save_rest)
16022
16023 /* save complete stack frame */
16024 .pushsection .kprobes.text, "ax"
16025 @@ -383,9 +669,10 @@ ENTRY(save_paranoid)
16026 js 1f /* negative -> in kernel */
16027 SWAPGS
16028 xorl %ebx,%ebx
16029 -1: ret
16030 +1: pax_force_retaddr_bts
16031 + ret
16032 CFI_ENDPROC
16033 -END(save_paranoid)
16034 +ENDPROC(save_paranoid)
16035 .popsection
16036
16037 /*
16038 @@ -409,7 +696,7 @@ ENTRY(ret_from_fork)
16039
16040 RESTORE_REST
16041
16042 - testl $3, CS-ARGOFFSET(%rsp) # from kernel_thread?
16043 + testb $3, CS-ARGOFFSET(%rsp) # from kernel_thread?
16044 je int_ret_from_sys_call
16045
16046 testl $_TIF_IA32, TI_flags(%rcx) # 32-bit compat task needs IRET
16047 @@ -419,7 +706,7 @@ ENTRY(ret_from_fork)
16048 jmp ret_from_sys_call # go to the SYSRET fastpath
16049
16050 CFI_ENDPROC
16051 -END(ret_from_fork)
16052 +ENDPROC(ret_from_fork)
16053
16054 /*
16055 * System call entry. Upto 6 arguments in registers are supported.
16056 @@ -455,7 +742,7 @@ END(ret_from_fork)
16057 ENTRY(system_call)
16058 CFI_STARTPROC simple
16059 CFI_SIGNAL_FRAME
16060 - CFI_DEF_CFA rsp,KERNEL_STACK_OFFSET
16061 + CFI_DEF_CFA rsp,0
16062 CFI_REGISTER rip,rcx
16063 /*CFI_REGISTER rflags,r11*/
16064 SWAPGS_UNSAFE_STACK
16065 @@ -468,12 +755,13 @@ ENTRY(system_call_after_swapgs)
16066
16067 movq %rsp,PER_CPU_VAR(old_rsp)
16068 movq PER_CPU_VAR(kernel_stack),%rsp
16069 + SAVE_ARGS 8*6,1
16070 + pax_enter_kernel_user
16071 /*
16072 * No need to follow this irqs off/on section - it's straight
16073 * and short:
16074 */
16075 ENABLE_INTERRUPTS(CLBR_NONE)
16076 - SAVE_ARGS 8,1
16077 movq %rax,ORIG_RAX-ARGOFFSET(%rsp)
16078 movq %rcx,RIP-ARGOFFSET(%rsp)
16079 CFI_REL_OFFSET rip,RIP-ARGOFFSET
16080 @@ -483,7 +771,7 @@ ENTRY(system_call_after_swapgs)
16081 system_call_fastpath:
16082 cmpq $__NR_syscall_max,%rax
16083 ja badsys
16084 - movq %r10,%rcx
16085 + movq R10-ARGOFFSET(%rsp),%rcx
16086 call *sys_call_table(,%rax,8) # XXX: rip relative
16087 movq %rax,RAX-ARGOFFSET(%rsp)
16088 /*
16089 @@ -502,6 +790,8 @@ sysret_check:
16090 andl %edi,%edx
16091 jnz sysret_careful
16092 CFI_REMEMBER_STATE
16093 + pax_exit_kernel_user
16094 + pax_erase_kstack
16095 /*
16096 * sysretq will re-enable interrupts:
16097 */
16098 @@ -555,14 +845,18 @@ badsys:
16099 * jump back to the normal fast path.
16100 */
16101 auditsys:
16102 - movq %r10,%r9 /* 6th arg: 4th syscall arg */
16103 + movq R10-ARGOFFSET(%rsp),%r9 /* 6th arg: 4th syscall arg */
16104 movq %rdx,%r8 /* 5th arg: 3rd syscall arg */
16105 movq %rsi,%rcx /* 4th arg: 2nd syscall arg */
16106 movq %rdi,%rdx /* 3rd arg: 1st syscall arg */
16107 movq %rax,%rsi /* 2nd arg: syscall number */
16108 movl $AUDIT_ARCH_X86_64,%edi /* 1st arg: audit arch */
16109 call audit_syscall_entry
16110 +
16111 + pax_erase_kstack
16112 +
16113 LOAD_ARGS 0 /* reload call-clobbered registers */
16114 + pax_set_fptr_mask
16115 jmp system_call_fastpath
16116
16117 /*
16118 @@ -592,16 +886,20 @@ tracesys:
16119 FIXUP_TOP_OF_STACK %rdi
16120 movq %rsp,%rdi
16121 call syscall_trace_enter
16122 +
16123 + pax_erase_kstack
16124 +
16125 /*
16126 * Reload arg registers from stack in case ptrace changed them.
16127 * We don't reload %rax because syscall_trace_enter() returned
16128 * the value it wants us to use in the table lookup.
16129 */
16130 LOAD_ARGS ARGOFFSET, 1
16131 + pax_set_fptr_mask
16132 RESTORE_REST
16133 cmpq $__NR_syscall_max,%rax
16134 ja int_ret_from_sys_call /* RAX(%rsp) set to -ENOSYS above */
16135 - movq %r10,%rcx /* fixup for C */
16136 + movq R10-ARGOFFSET(%rsp),%rcx /* fixup for C */
16137 call *sys_call_table(,%rax,8)
16138 movq %rax,RAX-ARGOFFSET(%rsp)
16139 /* Use IRET because user could have changed frame */
16140 @@ -613,7 +911,7 @@ tracesys:
16141 GLOBAL(int_ret_from_sys_call)
16142 DISABLE_INTERRUPTS(CLBR_NONE)
16143 TRACE_IRQS_OFF
16144 - testl $3,CS-ARGOFFSET(%rsp)
16145 + testb $3,CS-ARGOFFSET(%rsp)
16146 je retint_restore_args
16147 movl $_TIF_ALLWORK_MASK,%edi
16148 /* edi: mask to check */
16149 @@ -674,7 +972,7 @@ int_restore_rest:
16150 TRACE_IRQS_OFF
16151 jmp int_with_check
16152 CFI_ENDPROC
16153 -END(system_call)
16154 +ENDPROC(system_call)
16155
16156 /*
16157 * Certain special system calls that need to save a complete full stack frame.
16158 @@ -690,7 +988,7 @@ ENTRY(\label)
16159 call \func
16160 jmp ptregscall_common
16161 CFI_ENDPROC
16162 -END(\label)
16163 +ENDPROC(\label)
16164 .endm
16165
16166 PTREGSCALL stub_clone, sys_clone, %r8
16167 @@ -708,9 +1006,10 @@ ENTRY(ptregscall_common)
16168 movq_cfi_restore R12+8, r12
16169 movq_cfi_restore RBP+8, rbp
16170 movq_cfi_restore RBX+8, rbx
16171 + pax_force_retaddr
16172 ret $REST_SKIP /* pop extended registers */
16173 CFI_ENDPROC
16174 -END(ptregscall_common)
16175 +ENDPROC(ptregscall_common)
16176
16177 ENTRY(stub_execve)
16178 CFI_STARTPROC
16179 @@ -726,7 +1025,7 @@ ENTRY(stub_execve)
16180 RESTORE_REST
16181 jmp int_ret_from_sys_call
16182 CFI_ENDPROC
16183 -END(stub_execve)
16184 +ENDPROC(stub_execve)
16185
16186 /*
16187 * sigreturn is special because it needs to restore all registers on return.
16188 @@ -744,7 +1043,7 @@ ENTRY(stub_rt_sigreturn)
16189 RESTORE_REST
16190 jmp int_ret_from_sys_call
16191 CFI_ENDPROC
16192 -END(stub_rt_sigreturn)
16193 +ENDPROC(stub_rt_sigreturn)
16194
16195 /*
16196 * Build the entry stubs and pointer table with some assembler magic.
16197 @@ -780,7 +1079,7 @@ vector=vector+1
16198 2: jmp common_interrupt
16199 .endr
16200 CFI_ENDPROC
16201 -END(irq_entries_start)
16202 +ENDPROC(irq_entries_start)
16203
16204 .previous
16205 END(interrupt)
16206 @@ -800,6 +1099,16 @@ END(interrupt)
16207 CFI_ADJUST_CFA_OFFSET 10*8
16208 call save_args
16209 PARTIAL_FRAME 0
16210 +#ifdef CONFIG_PAX_MEMORY_UDEREF
16211 + testb $3, CS(%rdi)
16212 + jnz 1f
16213 + pax_enter_kernel
16214 + jmp 2f
16215 +1: pax_enter_kernel_user
16216 +2:
16217 +#else
16218 + pax_enter_kernel
16219 +#endif
16220 call \func
16221 .endm
16222
16223 @@ -822,7 +1131,7 @@ ret_from_intr:
16224 CFI_ADJUST_CFA_OFFSET -8
16225 exit_intr:
16226 GET_THREAD_INFO(%rcx)
16227 - testl $3,CS-ARGOFFSET(%rsp)
16228 + testb $3,CS-ARGOFFSET(%rsp)
16229 je retint_kernel
16230
16231 /* Interrupt came from user space */
16232 @@ -844,12 +1153,16 @@ retint_swapgs: /* return to user-space */
16233 * The iretq could re-enable interrupts:
16234 */
16235 DISABLE_INTERRUPTS(CLBR_ANY)
16236 + pax_exit_kernel_user
16237 + pax_erase_kstack
16238 TRACE_IRQS_IRETQ
16239 SWAPGS
16240 jmp restore_args
16241
16242 retint_restore_args: /* return to kernel space */
16243 DISABLE_INTERRUPTS(CLBR_ANY)
16244 + pax_exit_kernel
16245 + pax_force_retaddr RIP-ARGOFFSET
16246 /*
16247 * The iretq could re-enable interrupts:
16248 */
16249 @@ -940,7 +1253,7 @@ ENTRY(retint_kernel)
16250 #endif
16251
16252 CFI_ENDPROC
16253 -END(common_interrupt)
16254 +ENDPROC(common_interrupt)
16255
16256 /*
16257 * APIC interrupts.
16258 @@ -953,7 +1266,7 @@ ENTRY(\sym)
16259 interrupt \do_sym
16260 jmp ret_from_intr
16261 CFI_ENDPROC
16262 -END(\sym)
16263 +ENDPROC(\sym)
16264 .endm
16265
16266 #ifdef CONFIG_SMP
16267 @@ -1032,12 +1345,22 @@ ENTRY(\sym)
16268 CFI_ADJUST_CFA_OFFSET 15*8
16269 call error_entry
16270 DEFAULT_FRAME 0
16271 +#ifdef CONFIG_PAX_MEMORY_UDEREF
16272 + testb $3, CS(%rsp)
16273 + jnz 1f
16274 + pax_enter_kernel
16275 + jmp 2f
16276 +1: pax_enter_kernel_user
16277 +2:
16278 +#else
16279 + pax_enter_kernel
16280 +#endif
16281 movq %rsp,%rdi /* pt_regs pointer */
16282 xorl %esi,%esi /* no error code */
16283 call \do_sym
16284 jmp error_exit /* %ebx: no swapgs flag */
16285 CFI_ENDPROC
16286 -END(\sym)
16287 +ENDPROC(\sym)
16288 .endm
16289
16290 .macro paranoidzeroentry sym do_sym
16291 @@ -1049,12 +1372,22 @@ ENTRY(\sym)
16292 subq $15*8, %rsp
16293 call save_paranoid
16294 TRACE_IRQS_OFF
16295 +#ifdef CONFIG_PAX_MEMORY_UDEREF
16296 + testb $3, CS(%rsp)
16297 + jnz 1f
16298 + pax_enter_kernel
16299 + jmp 2f
16300 +1: pax_enter_kernel_user
16301 +2:
16302 +#else
16303 + pax_enter_kernel
16304 +#endif
16305 movq %rsp,%rdi /* pt_regs pointer */
16306 xorl %esi,%esi /* no error code */
16307 call \do_sym
16308 jmp paranoid_exit /* %ebx: no swapgs flag */
16309 CFI_ENDPROC
16310 -END(\sym)
16311 +ENDPROC(\sym)
16312 .endm
16313
16314 .macro paranoidzeroentry_ist sym do_sym ist
16315 @@ -1066,15 +1399,30 @@ ENTRY(\sym)
16316 subq $15*8, %rsp
16317 call save_paranoid
16318 TRACE_IRQS_OFF
16319 +#ifdef CONFIG_PAX_MEMORY_UDEREF
16320 + testb $3, CS(%rsp)
16321 + jnz 1f
16322 + pax_enter_kernel
16323 + jmp 2f
16324 +1: pax_enter_kernel_user
16325 +2:
16326 +#else
16327 + pax_enter_kernel
16328 +#endif
16329 movq %rsp,%rdi /* pt_regs pointer */
16330 xorl %esi,%esi /* no error code */
16331 - PER_CPU(init_tss, %rbp)
16332 +#ifdef CONFIG_SMP
16333 + imul $TSS_size, PER_CPU_VAR(cpu_number), %ebp
16334 + lea init_tss(%rbp), %rbp
16335 +#else
16336 + lea init_tss(%rip), %rbp
16337 +#endif
16338 subq $EXCEPTION_STKSZ, TSS_ist + (\ist - 1) * 8(%rbp)
16339 call \do_sym
16340 addq $EXCEPTION_STKSZ, TSS_ist + (\ist - 1) * 8(%rbp)
16341 jmp paranoid_exit /* %ebx: no swapgs flag */
16342 CFI_ENDPROC
16343 -END(\sym)
16344 +ENDPROC(\sym)
16345 .endm
16346
16347 .macro errorentry sym do_sym
16348 @@ -1085,13 +1433,23 @@ ENTRY(\sym)
16349 CFI_ADJUST_CFA_OFFSET 15*8
16350 call error_entry
16351 DEFAULT_FRAME 0
16352 +#ifdef CONFIG_PAX_MEMORY_UDEREF
16353 + testb $3, CS(%rsp)
16354 + jnz 1f
16355 + pax_enter_kernel
16356 + jmp 2f
16357 +1: pax_enter_kernel_user
16358 +2:
16359 +#else
16360 + pax_enter_kernel
16361 +#endif
16362 movq %rsp,%rdi /* pt_regs pointer */
16363 movq ORIG_RAX(%rsp),%rsi /* get error code */
16364 movq $-1,ORIG_RAX(%rsp) /* no syscall to restart */
16365 call \do_sym
16366 jmp error_exit /* %ebx: no swapgs flag */
16367 CFI_ENDPROC
16368 -END(\sym)
16369 +ENDPROC(\sym)
16370 .endm
16371
16372 /* error code is on the stack already */
16373 @@ -1104,13 +1462,23 @@ ENTRY(\sym)
16374 call save_paranoid
16375 DEFAULT_FRAME 0
16376 TRACE_IRQS_OFF
16377 +#ifdef CONFIG_PAX_MEMORY_UDEREF
16378 + testb $3, CS(%rsp)
16379 + jnz 1f
16380 + pax_enter_kernel
16381 + jmp 2f
16382 +1: pax_enter_kernel_user
16383 +2:
16384 +#else
16385 + pax_enter_kernel
16386 +#endif
16387 movq %rsp,%rdi /* pt_regs pointer */
16388 movq ORIG_RAX(%rsp),%rsi /* get error code */
16389 movq $-1,ORIG_RAX(%rsp) /* no syscall to restart */
16390 call \do_sym
16391 jmp paranoid_exit /* %ebx: no swapgs flag */
16392 CFI_ENDPROC
16393 -END(\sym)
16394 +ENDPROC(\sym)
16395 .endm
16396
16397 zeroentry divide_error do_divide_error
16398 @@ -1141,9 +1509,10 @@ gs_change:
16399 SWAPGS
16400 popf
16401 CFI_ADJUST_CFA_OFFSET -8
16402 + pax_force_retaddr
16403 ret
16404 CFI_ENDPROC
16405 -END(native_load_gs_index)
16406 +ENDPROC(native_load_gs_index)
16407
16408 .section __ex_table,"a"
16409 .align 8
16410 @@ -1193,11 +1562,12 @@ ENTRY(kernel_thread)
16411 * of hacks for example to fork off the per-CPU idle tasks.
16412 * [Hopefully no generic code relies on the reschedule -AK]
16413 */
16414 - RESTORE_ALL
16415 + RESTORE_REST
16416 UNFAKE_STACK_FRAME
16417 + pax_force_retaddr
16418 ret
16419 CFI_ENDPROC
16420 -END(kernel_thread)
16421 +ENDPROC(kernel_thread)
16422
16423 ENTRY(child_rip)
16424 pushq $0 # fake return address
16425 @@ -1208,13 +1578,14 @@ ENTRY(child_rip)
16426 */
16427 movq %rdi, %rax
16428 movq %rsi, %rdi
16429 + pax_force_fptr %rax
16430 call *%rax
16431 # exit
16432 mov %eax, %edi
16433 call do_exit
16434 ud2 # padding for call trace
16435 CFI_ENDPROC
16436 -END(child_rip)
16437 +ENDPROC(child_rip)
16438
16439 /*
16440 * execve(). This function needs to use IRET, not SYSRET, to set up all state properly.
16441 @@ -1241,11 +1612,11 @@ ENTRY(kernel_execve)
16442 RESTORE_REST
16443 testq %rax,%rax
16444 je int_ret_from_sys_call
16445 - RESTORE_ARGS
16446 UNFAKE_STACK_FRAME
16447 + pax_force_retaddr
16448 ret
16449 CFI_ENDPROC
16450 -END(kernel_execve)
16451 +ENDPROC(kernel_execve)
16452
16453 /* Call softirq on interrupt stack. Interrupts are off. */
16454 ENTRY(call_softirq)
16455 @@ -1263,9 +1634,10 @@ ENTRY(call_softirq)
16456 CFI_DEF_CFA_REGISTER rsp
16457 CFI_ADJUST_CFA_OFFSET -8
16458 decl PER_CPU_VAR(irq_count)
16459 + pax_force_retaddr
16460 ret
16461 CFI_ENDPROC
16462 -END(call_softirq)
16463 +ENDPROC(call_softirq)
16464
16465 #ifdef CONFIG_XEN
16466 zeroentry xen_hypervisor_callback xen_do_hypervisor_callback
16467 @@ -1303,7 +1675,7 @@ ENTRY(xen_do_hypervisor_callback) # do_hypervisor_callback(struct *pt_regs)
16468 decl PER_CPU_VAR(irq_count)
16469 jmp error_exit
16470 CFI_ENDPROC
16471 -END(xen_do_hypervisor_callback)
16472 +ENDPROC(xen_do_hypervisor_callback)
16473
16474 /*
16475 * Hypervisor uses this for application faults while it executes.
16476 @@ -1362,7 +1734,7 @@ ENTRY(xen_failsafe_callback)
16477 SAVE_ALL
16478 jmp error_exit
16479 CFI_ENDPROC
16480 -END(xen_failsafe_callback)
16481 +ENDPROC(xen_failsafe_callback)
16482
16483 #endif /* CONFIG_XEN */
16484
16485 @@ -1405,16 +1777,31 @@ ENTRY(paranoid_exit)
16486 TRACE_IRQS_OFF
16487 testl %ebx,%ebx /* swapgs needed? */
16488 jnz paranoid_restore
16489 - testl $3,CS(%rsp)
16490 + testb $3,CS(%rsp)
16491 jnz paranoid_userspace
16492 +#ifdef CONFIG_PAX_MEMORY_UDEREF
16493 + pax_exit_kernel
16494 + TRACE_IRQS_IRETQ 0
16495 + SWAPGS_UNSAFE_STACK
16496 + RESTORE_ALL 8
16497 + pax_force_retaddr_bts
16498 + jmp irq_return
16499 +#endif
16500 paranoid_swapgs:
16501 +#ifdef CONFIG_PAX_MEMORY_UDEREF
16502 + pax_exit_kernel_user
16503 +#else
16504 + pax_exit_kernel
16505 +#endif
16506 TRACE_IRQS_IRETQ 0
16507 SWAPGS_UNSAFE_STACK
16508 RESTORE_ALL 8
16509 jmp irq_return
16510 paranoid_restore:
16511 + pax_exit_kernel
16512 TRACE_IRQS_IRETQ 0
16513 RESTORE_ALL 8
16514 + pax_force_retaddr_bts
16515 jmp irq_return
16516 paranoid_userspace:
16517 GET_THREAD_INFO(%rcx)
16518 @@ -1443,7 +1830,7 @@ paranoid_schedule:
16519 TRACE_IRQS_OFF
16520 jmp paranoid_userspace
16521 CFI_ENDPROC
16522 -END(paranoid_exit)
16523 +ENDPROC(paranoid_exit)
16524
16525 /*
16526 * Exception entry point. This expects an error code/orig_rax on the stack.
16527 @@ -1470,12 +1857,13 @@ ENTRY(error_entry)
16528 movq_cfi r14, R14+8
16529 movq_cfi r15, R15+8
16530 xorl %ebx,%ebx
16531 - testl $3,CS+8(%rsp)
16532 + testb $3,CS+8(%rsp)
16533 je error_kernelspace
16534 error_swapgs:
16535 SWAPGS
16536 error_sti:
16537 TRACE_IRQS_OFF
16538 + pax_force_retaddr_bts
16539 ret
16540 CFI_ENDPROC
16541
16542 @@ -1497,7 +1885,7 @@ error_kernelspace:
16543 cmpq $gs_change,RIP+8(%rsp)
16544 je error_swapgs
16545 jmp error_sti
16546 -END(error_entry)
16547 +ENDPROC(error_entry)
16548
16549
16550 /* ebx: no swapgs flag (1: don't need swapgs, 0: need it) */
16551 @@ -1517,7 +1905,7 @@ ENTRY(error_exit)
16552 jnz retint_careful
16553 jmp retint_swapgs
16554 CFI_ENDPROC
16555 -END(error_exit)
16556 +ENDPROC(error_exit)
16557
16558
16559 /* runs on exception stack */
16560 @@ -1529,6 +1917,16 @@ ENTRY(nmi)
16561 CFI_ADJUST_CFA_OFFSET 15*8
16562 call save_paranoid
16563 DEFAULT_FRAME 0
16564 +#ifdef CONFIG_PAX_MEMORY_UDEREF
16565 + testb $3, CS(%rsp)
16566 + jnz 1f
16567 + pax_enter_kernel
16568 + jmp 2f
16569 +1: pax_enter_kernel_user
16570 +2:
16571 +#else
16572 + pax_enter_kernel
16573 +#endif
16574 /* paranoidentry do_nmi, 0; without TRACE_IRQS_OFF */
16575 movq %rsp,%rdi
16576 movq $-1,%rsi
16577 @@ -1539,12 +1937,28 @@ ENTRY(nmi)
16578 DISABLE_INTERRUPTS(CLBR_NONE)
16579 testl %ebx,%ebx /* swapgs needed? */
16580 jnz nmi_restore
16581 - testl $3,CS(%rsp)
16582 + testb $3,CS(%rsp)
16583 jnz nmi_userspace
16584 +#ifdef CONFIG_PAX_MEMORY_UDEREF
16585 + pax_exit_kernel
16586 + SWAPGS_UNSAFE_STACK
16587 + RESTORE_ALL 8
16588 + pax_force_retaddr_bts
16589 + jmp irq_return
16590 +#endif
16591 nmi_swapgs:
16592 +#ifdef CONFIG_PAX_MEMORY_UDEREF
16593 + pax_exit_kernel_user
16594 +#else
16595 + pax_exit_kernel
16596 +#endif
16597 SWAPGS_UNSAFE_STACK
16598 + RESTORE_ALL 8
16599 + jmp irq_return
16600 nmi_restore:
16601 + pax_exit_kernel
16602 RESTORE_ALL 8
16603 + pax_force_retaddr_bts
16604 jmp irq_return
16605 nmi_userspace:
16606 GET_THREAD_INFO(%rcx)
16607 @@ -1573,14 +1987,14 @@ nmi_schedule:
16608 jmp paranoid_exit
16609 CFI_ENDPROC
16610 #endif
16611 -END(nmi)
16612 +ENDPROC(nmi)
16613
16614 ENTRY(ignore_sysret)
16615 CFI_STARTPROC
16616 mov $-ENOSYS,%eax
16617 sysret
16618 CFI_ENDPROC
16619 -END(ignore_sysret)
16620 +ENDPROC(ignore_sysret)
16621
16622 /*
16623 * End of kprobes section
16624 diff --git a/arch/x86/kernel/ftrace.c b/arch/x86/kernel/ftrace.c
16625 index 9dbb527..7b3615a 100644
16626 --- a/arch/x86/kernel/ftrace.c
16627 +++ b/arch/x86/kernel/ftrace.c
16628 @@ -103,7 +103,7 @@ static void *mod_code_ip; /* holds the IP to write to */
16629 static void *mod_code_newcode; /* holds the text to write to the IP */
16630
16631 static unsigned nmi_wait_count;
16632 -static atomic_t nmi_update_count = ATOMIC_INIT(0);
16633 +static atomic_unchecked_t nmi_update_count = ATOMIC_INIT(0);
16634
16635 int ftrace_arch_read_dyn_info(char *buf, int size)
16636 {
16637 @@ -111,7 +111,7 @@ int ftrace_arch_read_dyn_info(char *buf, int size)
16638
16639 r = snprintf(buf, size, "%u %u",
16640 nmi_wait_count,
16641 - atomic_read(&nmi_update_count));
16642 + atomic_read_unchecked(&nmi_update_count));
16643 return r;
16644 }
16645
16646 @@ -149,8 +149,10 @@ void ftrace_nmi_enter(void)
16647 {
16648 if (atomic_inc_return(&nmi_running) & MOD_CODE_WRITE_FLAG) {
16649 smp_rmb();
16650 + pax_open_kernel();
16651 ftrace_mod_code();
16652 - atomic_inc(&nmi_update_count);
16653 + pax_close_kernel();
16654 + atomic_inc_unchecked(&nmi_update_count);
16655 }
16656 /* Must have previous changes seen before executions */
16657 smp_mb();
16658 @@ -215,7 +217,7 @@ do_ftrace_mod_code(unsigned long ip, void *new_code)
16659
16660
16661
16662 -static unsigned char ftrace_nop[MCOUNT_INSN_SIZE];
16663 +static unsigned char ftrace_nop[MCOUNT_INSN_SIZE] __read_only;
16664
16665 static unsigned char *ftrace_nop_replace(void)
16666 {
16667 @@ -228,6 +230,8 @@ ftrace_modify_code(unsigned long ip, unsigned char *old_code,
16668 {
16669 unsigned char replaced[MCOUNT_INSN_SIZE];
16670
16671 + ip = ktla_ktva(ip);
16672 +
16673 /*
16674 * Note: Due to modules and __init, code can
16675 * disappear and change, we need to protect against faulting
16676 @@ -284,7 +288,7 @@ int ftrace_update_ftrace_func(ftrace_func_t func)
16677 unsigned char old[MCOUNT_INSN_SIZE], *new;
16678 int ret;
16679
16680 - memcpy(old, &ftrace_call, MCOUNT_INSN_SIZE);
16681 + memcpy(old, (void *)ktla_ktva((unsigned long)ftrace_call), MCOUNT_INSN_SIZE);
16682 new = ftrace_call_replace(ip, (unsigned long)func);
16683 ret = ftrace_modify_code(ip, old, new);
16684
16685 @@ -337,15 +341,15 @@ int __init ftrace_dyn_arch_init(void *data)
16686 switch (faulted) {
16687 case 0:
16688 pr_info("ftrace: converting mcount calls to 0f 1f 44 00 00\n");
16689 - memcpy(ftrace_nop, ftrace_test_p6nop, MCOUNT_INSN_SIZE);
16690 + memcpy(ftrace_nop, ktla_ktva(ftrace_test_p6nop), MCOUNT_INSN_SIZE);
16691 break;
16692 case 1:
16693 pr_info("ftrace: converting mcount calls to 66 66 66 66 90\n");
16694 - memcpy(ftrace_nop, ftrace_test_nop5, MCOUNT_INSN_SIZE);
16695 + memcpy(ftrace_nop, ktla_ktva(ftrace_test_nop5), MCOUNT_INSN_SIZE);
16696 break;
16697 case 2:
16698 pr_info("ftrace: converting mcount calls to jmp . + 5\n");
16699 - memcpy(ftrace_nop, ftrace_test_jmp, MCOUNT_INSN_SIZE);
16700 + memcpy(ftrace_nop, ktla_ktva(ftrace_test_jmp), MCOUNT_INSN_SIZE);
16701 break;
16702 }
16703
16704 @@ -366,6 +370,8 @@ static int ftrace_mod_jmp(unsigned long ip,
16705 {
16706 unsigned char code[MCOUNT_INSN_SIZE];
16707
16708 + ip = ktla_ktva(ip);
16709 +
16710 if (probe_kernel_read(code, (void *)ip, MCOUNT_INSN_SIZE))
16711 return -EFAULT;
16712
16713 diff --git a/arch/x86/kernel/head32.c b/arch/x86/kernel/head32.c
16714 index 4f8e250..df24706 100644
16715 --- a/arch/x86/kernel/head32.c
16716 +++ b/arch/x86/kernel/head32.c
16717 @@ -16,6 +16,7 @@
16718 #include <asm/apic.h>
16719 #include <asm/io_apic.h>
16720 #include <asm/bios_ebda.h>
16721 +#include <asm/boot.h>
16722
16723 static void __init i386_default_early_setup(void)
16724 {
16725 @@ -31,7 +32,7 @@ void __init i386_start_kernel(void)
16726 {
16727 reserve_trampoline_memory();
16728
16729 - reserve_early(__pa_symbol(&_text), __pa_symbol(&__bss_stop), "TEXT DATA BSS");
16730 + reserve_early(LOAD_PHYSICAL_ADDR, __pa_symbol(&__bss_stop), "TEXT DATA BSS");
16731
16732 #ifdef CONFIG_BLK_DEV_INITRD
16733 /* Reserve INITRD */
16734 diff --git a/arch/x86/kernel/head_32.S b/arch/x86/kernel/head_32.S
16735 index 34c3308..6fc4e76 100644
16736 --- a/arch/x86/kernel/head_32.S
16737 +++ b/arch/x86/kernel/head_32.S
16738 @@ -19,10 +19,17 @@
16739 #include <asm/setup.h>
16740 #include <asm/processor-flags.h>
16741 #include <asm/percpu.h>
16742 +#include <asm/msr-index.h>
16743
16744 /* Physical address */
16745 #define pa(X) ((X) - __PAGE_OFFSET)
16746
16747 +#ifdef CONFIG_PAX_KERNEXEC
16748 +#define ta(X) (X)
16749 +#else
16750 +#define ta(X) ((X) - __PAGE_OFFSET)
16751 +#endif
16752 +
16753 /*
16754 * References to members of the new_cpu_data structure.
16755 */
16756 @@ -52,11 +59,7 @@
16757 * and small than max_low_pfn, otherwise will waste some page table entries
16758 */
16759
16760 -#if PTRS_PER_PMD > 1
16761 -#define PAGE_TABLE_SIZE(pages) (((pages) / PTRS_PER_PMD) + PTRS_PER_PGD)
16762 -#else
16763 -#define PAGE_TABLE_SIZE(pages) ((pages) / PTRS_PER_PGD)
16764 -#endif
16765 +#define PAGE_TABLE_SIZE(pages) ((pages) / PTRS_PER_PTE)
16766
16767 /* Enough space to fit pagetables for the low memory linear map */
16768 MAPPING_BEYOND_END = \
16769 @@ -73,6 +76,12 @@ INIT_MAP_SIZE = PAGE_TABLE_SIZE(KERNEL_PAGES) * PAGE_SIZE_asm
16770 RESERVE_BRK(pagetables, INIT_MAP_SIZE)
16771
16772 /*
16773 + * Real beginning of normal "text" segment
16774 + */
16775 +ENTRY(stext)
16776 +ENTRY(_stext)
16777 +
16778 +/*
16779 * 32-bit kernel entrypoint; only used by the boot CPU. On entry,
16780 * %esi points to the real-mode code as a 32-bit pointer.
16781 * CS and DS must be 4 GB flat segments, but we don't depend on
16782 @@ -80,7 +89,16 @@ RESERVE_BRK(pagetables, INIT_MAP_SIZE)
16783 * can.
16784 */
16785 __HEAD
16786 +
16787 +#ifdef CONFIG_PAX_KERNEXEC
16788 + jmp startup_32
16789 +/* PaX: fill first page in .text with int3 to catch NULL derefs in kernel mode */
16790 +.fill PAGE_SIZE-5,1,0xcc
16791 +#endif
16792 +
16793 ENTRY(startup_32)
16794 + movl pa(stack_start),%ecx
16795 +
16796 /* test KEEP_SEGMENTS flag to see if the bootloader is asking
16797 us to not reload segments */
16798 testb $(1<<6), BP_loadflags(%esi)
16799 @@ -95,7 +113,60 @@ ENTRY(startup_32)
16800 movl %eax,%es
16801 movl %eax,%fs
16802 movl %eax,%gs
16803 + movl %eax,%ss
16804 2:
16805 + leal -__PAGE_OFFSET(%ecx),%esp
16806 +
16807 +#ifdef CONFIG_SMP
16808 + movl $pa(cpu_gdt_table),%edi
16809 + movl $__per_cpu_load,%eax
16810 + movw %ax,__KERNEL_PERCPU + 2(%edi)
16811 + rorl $16,%eax
16812 + movb %al,__KERNEL_PERCPU + 4(%edi)
16813 + movb %ah,__KERNEL_PERCPU + 7(%edi)
16814 + movl $__per_cpu_end - 1,%eax
16815 + subl $__per_cpu_start,%eax
16816 + movw %ax,__KERNEL_PERCPU + 0(%edi)
16817 +#endif
16818 +
16819 +#ifdef CONFIG_PAX_MEMORY_UDEREF
16820 + movl $NR_CPUS,%ecx
16821 + movl $pa(cpu_gdt_table),%edi
16822 +1:
16823 + movl $((((__PAGE_OFFSET-1) & 0xf0000000) >> 12) | 0x00c09700),GDT_ENTRY_KERNEL_DS * 8 + 4(%edi)
16824 + movl $((((__PAGE_OFFSET-1) & 0xf0000000) >> 12) | 0x00c0fb00),GDT_ENTRY_DEFAULT_USER_CS * 8 + 4(%edi)
16825 + movl $((((__PAGE_OFFSET-1) & 0xf0000000) >> 12) | 0x00c0f300),GDT_ENTRY_DEFAULT_USER_DS * 8 + 4(%edi)
16826 + addl $PAGE_SIZE_asm,%edi
16827 + loop 1b
16828 +#endif
16829 +
16830 +#ifdef CONFIG_PAX_KERNEXEC
16831 + movl $pa(boot_gdt),%edi
16832 + movl $__LOAD_PHYSICAL_ADDR,%eax
16833 + movw %ax,__BOOT_CS + 2(%edi)
16834 + rorl $16,%eax
16835 + movb %al,__BOOT_CS + 4(%edi)
16836 + movb %ah,__BOOT_CS + 7(%edi)
16837 + rorl $16,%eax
16838 +
16839 + ljmp $(__BOOT_CS),$1f
16840 +1:
16841 +
16842 + movl $NR_CPUS,%ecx
16843 + movl $pa(cpu_gdt_table),%edi
16844 + addl $__PAGE_OFFSET,%eax
16845 +1:
16846 + movw %ax,__KERNEL_CS + 2(%edi)
16847 + movw %ax,__KERNEXEC_KERNEL_CS + 2(%edi)
16848 + rorl $16,%eax
16849 + movb %al,__KERNEL_CS + 4(%edi)
16850 + movb %al,__KERNEXEC_KERNEL_CS + 4(%edi)
16851 + movb %ah,__KERNEL_CS + 7(%edi)
16852 + movb %ah,__KERNEXEC_KERNEL_CS + 7(%edi)
16853 + rorl $16,%eax
16854 + addl $PAGE_SIZE_asm,%edi
16855 + loop 1b
16856 +#endif
16857
16858 /*
16859 * Clear BSS first so that there are no surprises...
16860 @@ -140,9 +211,7 @@ ENTRY(startup_32)
16861 cmpl $num_subarch_entries, %eax
16862 jae bad_subarch
16863
16864 - movl pa(subarch_entries)(,%eax,4), %eax
16865 - subl $__PAGE_OFFSET, %eax
16866 - jmp *%eax
16867 + jmp *pa(subarch_entries)(,%eax,4)
16868
16869 bad_subarch:
16870 WEAK(lguest_entry)
16871 @@ -154,10 +223,10 @@ WEAK(xen_entry)
16872 __INITDATA
16873
16874 subarch_entries:
16875 - .long default_entry /* normal x86/PC */
16876 - .long lguest_entry /* lguest hypervisor */
16877 - .long xen_entry /* Xen hypervisor */
16878 - .long default_entry /* Moorestown MID */
16879 + .long ta(default_entry) /* normal x86/PC */
16880 + .long ta(lguest_entry) /* lguest hypervisor */
16881 + .long ta(xen_entry) /* Xen hypervisor */
16882 + .long ta(default_entry) /* Moorestown MID */
16883 num_subarch_entries = (. - subarch_entries) / 4
16884 .previous
16885 #endif /* CONFIG_PARAVIRT */
16886 @@ -218,8 +287,11 @@ default_entry:
16887 movl %eax, pa(max_pfn_mapped)
16888
16889 /* Do early initialization of the fixmap area */
16890 - movl $pa(swapper_pg_fixmap)+PDE_IDENT_ATTR,%eax
16891 - movl %eax,pa(swapper_pg_pmd+0x1000*KPMDS-8)
16892 +#ifdef CONFIG_COMPAT_VDSO
16893 + movl $pa(swapper_pg_fixmap)+PDE_IDENT_ATTR+_PAGE_USER,pa(swapper_pg_pmd+0x1000*KPMDS-8)
16894 +#else
16895 + movl $pa(swapper_pg_fixmap)+PDE_IDENT_ATTR,pa(swapper_pg_pmd+0x1000*KPMDS-8)
16896 +#endif
16897 #else /* Not PAE */
16898
16899 page_pde_offset = (__PAGE_OFFSET >> 20);
16900 @@ -249,8 +321,11 @@ page_pde_offset = (__PAGE_OFFSET >> 20);
16901 movl %eax, pa(max_pfn_mapped)
16902
16903 /* Do early initialization of the fixmap area */
16904 - movl $pa(swapper_pg_fixmap)+PDE_IDENT_ATTR,%eax
16905 - movl %eax,pa(swapper_pg_dir+0xffc)
16906 +#ifdef CONFIG_COMPAT_VDSO
16907 + movl $pa(swapper_pg_fixmap)+PDE_IDENT_ATTR+_PAGE_USER,pa(swapper_pg_dir+0xffc)
16908 +#else
16909 + movl $pa(swapper_pg_fixmap)+PDE_IDENT_ATTR,pa(swapper_pg_dir+0xffc)
16910 +#endif
16911 #endif
16912 jmp 3f
16913 /*
16914 @@ -272,6 +347,9 @@ ENTRY(startup_32_smp)
16915 movl %eax,%es
16916 movl %eax,%fs
16917 movl %eax,%gs
16918 + movl pa(stack_start),%ecx
16919 + movl %eax,%ss
16920 + leal -__PAGE_OFFSET(%ecx),%esp
16921 #endif /* CONFIG_SMP */
16922 3:
16923
16924 @@ -297,6 +375,7 @@ ENTRY(startup_32_smp)
16925 orl %edx,%eax
16926 movl %eax,%cr4
16927
16928 +#ifdef CONFIG_X86_PAE
16929 btl $5, %eax # check if PAE is enabled
16930 jnc 6f
16931
16932 @@ -305,6 +384,10 @@ ENTRY(startup_32_smp)
16933 cpuid
16934 cmpl $0x80000000, %eax
16935 jbe 6f
16936 +
16937 + /* Clear bogus XD_DISABLE bits */
16938 + call verify_cpu
16939 +
16940 mov $0x80000001, %eax
16941 cpuid
16942 /* Execute Disable bit supported? */
16943 @@ -312,13 +395,17 @@ ENTRY(startup_32_smp)
16944 jnc 6f
16945
16946 /* Setup EFER (Extended Feature Enable Register) */
16947 - movl $0xc0000080, %ecx
16948 + movl $MSR_EFER, %ecx
16949 rdmsr
16950
16951 btsl $11, %eax
16952 /* Make changes effective */
16953 wrmsr
16954
16955 + btsl $_PAGE_BIT_NX-32,pa(__supported_pte_mask+4)
16956 + movl $1,pa(nx_enabled)
16957 +#endif
16958 +
16959 6:
16960
16961 /*
16962 @@ -331,8 +418,8 @@ ENTRY(startup_32_smp)
16963 movl %eax,%cr0 /* ..and set paging (PG) bit */
16964 ljmp $__BOOT_CS,$1f /* Clear prefetch and normalize %eip */
16965 1:
16966 - /* Set up the stack pointer */
16967 - lss stack_start,%esp
16968 + /* Shift the stack pointer to a virtual address */
16969 + addl $__PAGE_OFFSET, %esp
16970
16971 /*
16972 * Initialize eflags. Some BIOS's leave bits like NT set. This would
16973 @@ -344,9 +431,7 @@ ENTRY(startup_32_smp)
16974
16975 #ifdef CONFIG_SMP
16976 cmpb $0, ready
16977 - jz 1f /* Initial CPU cleans BSS */
16978 - jmp checkCPUtype
16979 -1:
16980 + jnz checkCPUtype
16981 #endif /* CONFIG_SMP */
16982
16983 /*
16984 @@ -424,7 +509,7 @@ is386: movl $2,%ecx # set MP
16985 1: movl $(__KERNEL_DS),%eax # reload all the segment registers
16986 movl %eax,%ss # after changing gdt.
16987
16988 - movl $(__USER_DS),%eax # DS/ES contains default USER segment
16989 +# movl $(__KERNEL_DS),%eax # DS/ES contains default KERNEL segment
16990 movl %eax,%ds
16991 movl %eax,%es
16992
16993 @@ -438,15 +523,22 @@ is386: movl $2,%ecx # set MP
16994 */
16995 cmpb $0,ready
16996 jne 1f
16997 - movl $per_cpu__gdt_page,%eax
16998 + movl $cpu_gdt_table,%eax
16999 movl $per_cpu__stack_canary,%ecx
17000 +#ifdef CONFIG_SMP
17001 + addl $__per_cpu_load,%ecx
17002 +#endif
17003 movw %cx, 8 * GDT_ENTRY_STACK_CANARY + 2(%eax)
17004 shrl $16, %ecx
17005 movb %cl, 8 * GDT_ENTRY_STACK_CANARY + 4(%eax)
17006 movb %ch, 8 * GDT_ENTRY_STACK_CANARY + 7(%eax)
17007 1:
17008 -#endif
17009 movl $(__KERNEL_STACK_CANARY),%eax
17010 +#elif defined(CONFIG_PAX_MEMORY_UDEREF)
17011 + movl $(__USER_DS),%eax
17012 +#else
17013 + xorl %eax,%eax
17014 +#endif
17015 movl %eax,%gs
17016
17017 xorl %eax,%eax # Clear LDT
17018 @@ -454,14 +546,7 @@ is386: movl $2,%ecx # set MP
17019
17020 cld # gcc2 wants the direction flag cleared at all times
17021 pushl $0 # fake return address for unwinder
17022 -#ifdef CONFIG_SMP
17023 - movb ready, %cl
17024 movb $1, ready
17025 - cmpb $0,%cl # the first CPU calls start_kernel
17026 - je 1f
17027 - movl (stack_start), %esp
17028 -1:
17029 -#endif /* CONFIG_SMP */
17030 jmp *(initial_code)
17031
17032 /*
17033 @@ -546,22 +631,22 @@ early_page_fault:
17034 jmp early_fault
17035
17036 early_fault:
17037 - cld
17038 #ifdef CONFIG_PRINTK
17039 + cmpl $1,%ss:early_recursion_flag
17040 + je hlt_loop
17041 + incl %ss:early_recursion_flag
17042 + cld
17043 pusha
17044 movl $(__KERNEL_DS),%eax
17045 movl %eax,%ds
17046 movl %eax,%es
17047 - cmpl $2,early_recursion_flag
17048 - je hlt_loop
17049 - incl early_recursion_flag
17050 movl %cr2,%eax
17051 pushl %eax
17052 pushl %edx /* trapno */
17053 pushl $fault_msg
17054 call printk
17055 +; call dump_stack
17056 #endif
17057 - call dump_stack
17058 hlt_loop:
17059 hlt
17060 jmp hlt_loop
17061 @@ -569,8 +654,11 @@ hlt_loop:
17062 /* This is the default interrupt "handler" :-) */
17063 ALIGN
17064 ignore_int:
17065 - cld
17066 #ifdef CONFIG_PRINTK
17067 + cmpl $2,%ss:early_recursion_flag
17068 + je hlt_loop
17069 + incl %ss:early_recursion_flag
17070 + cld
17071 pushl %eax
17072 pushl %ecx
17073 pushl %edx
17074 @@ -579,9 +667,6 @@ ignore_int:
17075 movl $(__KERNEL_DS),%eax
17076 movl %eax,%ds
17077 movl %eax,%es
17078 - cmpl $2,early_recursion_flag
17079 - je hlt_loop
17080 - incl early_recursion_flag
17081 pushl 16(%esp)
17082 pushl 24(%esp)
17083 pushl 32(%esp)
17084 @@ -600,6 +685,8 @@ ignore_int:
17085 #endif
17086 iret
17087
17088 +#include "verify_cpu.S"
17089 +
17090 __REFDATA
17091 .align 4
17092 ENTRY(initial_code)
17093 @@ -610,31 +697,47 @@ ENTRY(initial_page_table)
17094 /*
17095 * BSS section
17096 */
17097 -__PAGE_ALIGNED_BSS
17098 - .align PAGE_SIZE_asm
17099 #ifdef CONFIG_X86_PAE
17100 +.section .swapper_pg_pmd,"a",@progbits
17101 swapper_pg_pmd:
17102 .fill 1024*KPMDS,4,0
17103 #else
17104 +.section .swapper_pg_dir,"a",@progbits
17105 ENTRY(swapper_pg_dir)
17106 .fill 1024,4,0
17107 #endif
17108 +.section .swapper_pg_fixmap,"a",@progbits
17109 swapper_pg_fixmap:
17110 .fill 1024,4,0
17111 #ifdef CONFIG_X86_TRAMPOLINE
17112 +.section .trampoline_pg_dir,"a",@progbits
17113 ENTRY(trampoline_pg_dir)
17114 +#ifdef CONFIG_X86_PAE
17115 + .fill 4,8,0
17116 +#else
17117 .fill 1024,4,0
17118 #endif
17119 +#endif
17120 +
17121 +.section .empty_zero_page,"a",@progbits
17122 ENTRY(empty_zero_page)
17123 .fill 4096,1,0
17124
17125 /*
17126 + * The IDT has to be page-aligned to simplify the Pentium
17127 + * F0 0F bug workaround.. We have a special link segment
17128 + * for this.
17129 + */
17130 +.section .idt,"a",@progbits
17131 +ENTRY(idt_table)
17132 + .fill 256,8,0
17133 +
17134 +/*
17135 * This starts the data section.
17136 */
17137 #ifdef CONFIG_X86_PAE
17138 -__PAGE_ALIGNED_DATA
17139 - /* Page-aligned for the benefit of paravirt? */
17140 - .align PAGE_SIZE_asm
17141 +.section .swapper_pg_dir,"a",@progbits
17142 +
17143 ENTRY(swapper_pg_dir)
17144 .long pa(swapper_pg_pmd+PGD_IDENT_ATTR),0 /* low identity map */
17145 # if KPMDS == 3
17146 @@ -653,15 +756,24 @@ ENTRY(swapper_pg_dir)
17147 # error "Kernel PMDs should be 1, 2 or 3"
17148 # endif
17149 .align PAGE_SIZE_asm /* needs to be page-sized too */
17150 +
17151 +#ifdef CONFIG_PAX_PER_CPU_PGD
17152 +ENTRY(cpu_pgd)
17153 + .rept NR_CPUS
17154 + .fill 4,8,0
17155 + .endr
17156 +#endif
17157 +
17158 #endif
17159
17160 .data
17161 +.balign 4
17162 ENTRY(stack_start)
17163 - .long init_thread_union+THREAD_SIZE
17164 - .long __BOOT_DS
17165 + .long init_thread_union+THREAD_SIZE-8
17166
17167 ready: .byte 0
17168
17169 +.section .rodata,"a",@progbits
17170 early_recursion_flag:
17171 .long 0
17172
17173 @@ -697,7 +809,7 @@ fault_msg:
17174 .word 0 # 32 bit align gdt_desc.address
17175 boot_gdt_descr:
17176 .word __BOOT_DS+7
17177 - .long boot_gdt - __PAGE_OFFSET
17178 + .long pa(boot_gdt)
17179
17180 .word 0 # 32-bit align idt_desc.address
17181 idt_descr:
17182 @@ -708,7 +820,7 @@ idt_descr:
17183 .word 0 # 32 bit align gdt_desc.address
17184 ENTRY(early_gdt_descr)
17185 .word GDT_ENTRIES*8-1
17186 - .long per_cpu__gdt_page /* Overwritten for secondary CPUs */
17187 + .long cpu_gdt_table /* Overwritten for secondary CPUs */
17188
17189 /*
17190 * The boot_gdt must mirror the equivalent in setup.S and is
17191 @@ -717,5 +829,65 @@ ENTRY(early_gdt_descr)
17192 .align L1_CACHE_BYTES
17193 ENTRY(boot_gdt)
17194 .fill GDT_ENTRY_BOOT_CS,8,0
17195 - .quad 0x00cf9a000000ffff /* kernel 4GB code at 0x00000000 */
17196 - .quad 0x00cf92000000ffff /* kernel 4GB data at 0x00000000 */
17197 + .quad 0x00cf9b000000ffff /* kernel 4GB code at 0x00000000 */
17198 + .quad 0x00cf93000000ffff /* kernel 4GB data at 0x00000000 */
17199 +
17200 + .align PAGE_SIZE_asm
17201 +ENTRY(cpu_gdt_table)
17202 + .rept NR_CPUS
17203 + .quad 0x0000000000000000 /* NULL descriptor */
17204 + .quad 0x0000000000000000 /* 0x0b reserved */
17205 + .quad 0x0000000000000000 /* 0x13 reserved */
17206 + .quad 0x0000000000000000 /* 0x1b reserved */
17207 +
17208 +#ifdef CONFIG_PAX_KERNEXEC
17209 + .quad 0x00cf9b000000ffff /* 0x20 alternate kernel 4GB code at 0x00000000 */
17210 +#else
17211 + .quad 0x0000000000000000 /* 0x20 unused */
17212 +#endif
17213 +
17214 + .quad 0x0000000000000000 /* 0x28 unused */
17215 + .quad 0x0000000000000000 /* 0x33 TLS entry 1 */
17216 + .quad 0x0000000000000000 /* 0x3b TLS entry 2 */
17217 + .quad 0x0000000000000000 /* 0x43 TLS entry 3 */
17218 + .quad 0x0000000000000000 /* 0x4b reserved */
17219 + .quad 0x0000000000000000 /* 0x53 reserved */
17220 + .quad 0x0000000000000000 /* 0x5b reserved */
17221 +
17222 + .quad 0x00cf9b000000ffff /* 0x60 kernel 4GB code at 0x00000000 */
17223 + .quad 0x00cf93000000ffff /* 0x68 kernel 4GB data at 0x00000000 */
17224 + .quad 0x00cffb000000ffff /* 0x73 user 4GB code at 0x00000000 */
17225 + .quad 0x00cff3000000ffff /* 0x7b user 4GB data at 0x00000000 */
17226 +
17227 + .quad 0x0000000000000000 /* 0x80 TSS descriptor */
17228 + .quad 0x0000000000000000 /* 0x88 LDT descriptor */
17229 +
17230 + /*
17231 + * Segments used for calling PnP BIOS have byte granularity.
17232 + * The code segments and data segments have fixed 64k limits,
17233 + * the transfer segment sizes are set at run time.
17234 + */
17235 + .quad 0x00409b000000ffff /* 0x90 32-bit code */
17236 + .quad 0x00009b000000ffff /* 0x98 16-bit code */
17237 + .quad 0x000093000000ffff /* 0xa0 16-bit data */
17238 + .quad 0x0000930000000000 /* 0xa8 16-bit data */
17239 + .quad 0x0000930000000000 /* 0xb0 16-bit data */
17240 +
17241 + /*
17242 + * The APM segments have byte granularity and their bases
17243 + * are set at run time. All have 64k limits.
17244 + */
17245 + .quad 0x00409b000000ffff /* 0xb8 APM CS code */
17246 + .quad 0x00009b000000ffff /* 0xc0 APM CS 16 code (16 bit) */
17247 + .quad 0x004093000000ffff /* 0xc8 APM DS data */
17248 +
17249 + .quad 0x00c0930000000000 /* 0xd0 - ESPFIX SS */
17250 + .quad 0x0040930000000000 /* 0xd8 - PERCPU */
17251 + .quad 0x0040910000000017 /* 0xe0 - STACK_CANARY */
17252 + .quad 0x0000000000000000 /* 0xe8 - PCIBIOS_CS */
17253 + .quad 0x0000000000000000 /* 0xf0 - PCIBIOS_DS */
17254 + .quad 0x0000000000000000 /* 0xf8 - GDT entry 31: double-fault TSS */
17255 +
17256 + /* Be sure this is zeroed to avoid false validations in Xen */
17257 + .fill PAGE_SIZE_asm - GDT_SIZE,1,0
17258 + .endr
17259 diff --git a/arch/x86/kernel/head_64.S b/arch/x86/kernel/head_64.S
17260 index 780cd92..758b2a6 100644
17261 --- a/arch/x86/kernel/head_64.S
17262 +++ b/arch/x86/kernel/head_64.S
17263 @@ -19,6 +19,8 @@
17264 #include <asm/cache.h>
17265 #include <asm/processor-flags.h>
17266 #include <asm/percpu.h>
17267 +#include <asm/cpufeature.h>
17268 +#include <asm/alternative-asm.h>
17269
17270 #ifdef CONFIG_PARAVIRT
17271 #include <asm/asm-offsets.h>
17272 @@ -38,6 +40,12 @@ L4_PAGE_OFFSET = pgd_index(__PAGE_OFFSET)
17273 L3_PAGE_OFFSET = pud_index(__PAGE_OFFSET)
17274 L4_START_KERNEL = pgd_index(__START_KERNEL_map)
17275 L3_START_KERNEL = pud_index(__START_KERNEL_map)
17276 +L4_VMALLOC_START = pgd_index(VMALLOC_START)
17277 +L3_VMALLOC_START = pud_index(VMALLOC_START)
17278 +L4_VMALLOC_END = pgd_index(VMALLOC_END)
17279 +L3_VMALLOC_END = pud_index(VMALLOC_END)
17280 +L4_VMEMMAP_START = pgd_index(VMEMMAP_START)
17281 +L3_VMEMMAP_START = pud_index(VMEMMAP_START)
17282
17283 .text
17284 __HEAD
17285 @@ -85,35 +93,23 @@ startup_64:
17286 */
17287 addq %rbp, init_level4_pgt + 0(%rip)
17288 addq %rbp, init_level4_pgt + (L4_PAGE_OFFSET*8)(%rip)
17289 + addq %rbp, init_level4_pgt + (L4_VMALLOC_START*8)(%rip)
17290 + addq %rbp, init_level4_pgt + (L4_VMALLOC_END*8)(%rip)
17291 + addq %rbp, init_level4_pgt + (L4_VMEMMAP_START*8)(%rip)
17292 addq %rbp, init_level4_pgt + (L4_START_KERNEL*8)(%rip)
17293
17294 addq %rbp, level3_ident_pgt + 0(%rip)
17295 +#ifndef CONFIG_XEN
17296 + addq %rbp, level3_ident_pgt + 8(%rip)
17297 +#endif
17298
17299 - addq %rbp, level3_kernel_pgt + (510*8)(%rip)
17300 - addq %rbp, level3_kernel_pgt + (511*8)(%rip)
17301 + addq %rbp, level3_vmemmap_pgt + (L3_VMEMMAP_START*8)(%rip)
17302 +
17303 + addq %rbp, level3_kernel_pgt + (L3_START_KERNEL*8)(%rip)
17304 + addq %rbp, level3_kernel_pgt + (L3_START_KERNEL*8+8)(%rip)
17305
17306 addq %rbp, level2_fixmap_pgt + (506*8)(%rip)
17307 -
17308 - /* Add an Identity mapping if I am above 1G */
17309 - leaq _text(%rip), %rdi
17310 - andq $PMD_PAGE_MASK, %rdi
17311 -
17312 - movq %rdi, %rax
17313 - shrq $PUD_SHIFT, %rax
17314 - andq $(PTRS_PER_PUD - 1), %rax
17315 - jz ident_complete
17316 -
17317 - leaq (level2_spare_pgt - __START_KERNEL_map + _KERNPG_TABLE)(%rbp), %rdx
17318 - leaq level3_ident_pgt(%rip), %rbx
17319 - movq %rdx, 0(%rbx, %rax, 8)
17320 -
17321 - movq %rdi, %rax
17322 - shrq $PMD_SHIFT, %rax
17323 - andq $(PTRS_PER_PMD - 1), %rax
17324 - leaq __PAGE_KERNEL_IDENT_LARGE_EXEC(%rdi), %rdx
17325 - leaq level2_spare_pgt(%rip), %rbx
17326 - movq %rdx, 0(%rbx, %rax, 8)
17327 -ident_complete:
17328 + addq %rbp, level2_fixmap_pgt + (507*8)(%rip)
17329
17330 /*
17331 * Fixup the kernel text+data virtual addresses. Note that
17332 @@ -161,8 +157,8 @@ ENTRY(secondary_startup_64)
17333 * after the boot processor executes this code.
17334 */
17335
17336 - /* Enable PAE mode and PGE */
17337 - movl $(X86_CR4_PAE | X86_CR4_PGE), %eax
17338 + /* Enable PAE mode and PSE/PGE */
17339 + movl $(X86_CR4_PSE | X86_CR4_PAE | X86_CR4_PGE), %eax
17340 movq %rax, %cr4
17341
17342 /* Setup early boot stage 4 level pagetables. */
17343 @@ -184,9 +180,16 @@ ENTRY(secondary_startup_64)
17344 movl $MSR_EFER, %ecx
17345 rdmsr
17346 btsl $_EFER_SCE, %eax /* Enable System Call */
17347 - btl $20,%edi /* No Execute supported? */
17348 + btl $(X86_FEATURE_NX & 31),%edi /* No Execute supported? */
17349 jnc 1f
17350 btsl $_EFER_NX, %eax
17351 + leaq init_level4_pgt(%rip), %rdi
17352 +#ifndef CONFIG_EFI
17353 + btsq $_PAGE_BIT_NX, 8*L4_PAGE_OFFSET(%rdi)
17354 +#endif
17355 + btsq $_PAGE_BIT_NX, 8*L4_VMALLOC_START(%rdi)
17356 + btsq $_PAGE_BIT_NX, 8*L4_VMALLOC_END(%rdi)
17357 + btsq $_PAGE_BIT_NX, 8*L4_VMEMMAP_START(%rdi)
17358 1: wrmsr /* Make changes effective */
17359
17360 /* Setup cr0 */
17361 @@ -249,6 +252,7 @@ ENTRY(secondary_startup_64)
17362 * jump. In addition we need to ensure %cs is set so we make this
17363 * a far return.
17364 */
17365 + pax_set_fptr_mask
17366 movq initial_code(%rip),%rax
17367 pushq $0 # fake return address to stop unwinder
17368 pushq $__KERNEL_CS # set correct cs
17369 @@ -262,16 +266,16 @@ ENTRY(secondary_startup_64)
17370 .quad x86_64_start_kernel
17371 ENTRY(initial_gs)
17372 .quad INIT_PER_CPU_VAR(irq_stack_union)
17373 - __FINITDATA
17374
17375 ENTRY(stack_start)
17376 .quad init_thread_union+THREAD_SIZE-8
17377 .word 0
17378 + __FINITDATA
17379
17380 bad_address:
17381 jmp bad_address
17382
17383 - .section ".init.text","ax"
17384 + __INIT
17385 #ifdef CONFIG_EARLY_PRINTK
17386 .globl early_idt_handlers
17387 early_idt_handlers:
17388 @@ -316,18 +320,23 @@ ENTRY(early_idt_handler)
17389 #endif /* EARLY_PRINTK */
17390 1: hlt
17391 jmp 1b
17392 + .previous
17393
17394 #ifdef CONFIG_EARLY_PRINTK
17395 + __INITDATA
17396 early_recursion_flag:
17397 .long 0
17398 + .previous
17399
17400 + .section .rodata,"a",@progbits
17401 early_idt_msg:
17402 .asciz "PANIC: early exception %02lx rip %lx:%lx error %lx cr2 %lx\n"
17403 early_idt_ripmsg:
17404 .asciz "RIP %s\n"
17405 + .previous
17406 #endif /* CONFIG_EARLY_PRINTK */
17407 - .previous
17408
17409 + .section .rodata,"a",@progbits
17410 #define NEXT_PAGE(name) \
17411 .balign PAGE_SIZE; \
17412 ENTRY(name)
17413 @@ -350,13 +359,41 @@ NEXT_PAGE(init_level4_pgt)
17414 .quad level3_ident_pgt - __START_KERNEL_map + _KERNPG_TABLE
17415 .org init_level4_pgt + L4_PAGE_OFFSET*8, 0
17416 .quad level3_ident_pgt - __START_KERNEL_map + _KERNPG_TABLE
17417 + .org init_level4_pgt + L4_VMALLOC_START*8, 0
17418 + .quad level3_vmalloc_start_pgt - __START_KERNEL_map + _KERNPG_TABLE
17419 + .org init_level4_pgt + L4_VMALLOC_END*8, 0
17420 + .quad level3_vmalloc_end_pgt - __START_KERNEL_map + _KERNPG_TABLE
17421 + .org init_level4_pgt + L4_VMEMMAP_START*8, 0
17422 + .quad level3_vmemmap_pgt - __START_KERNEL_map + _KERNPG_TABLE
17423 .org init_level4_pgt + L4_START_KERNEL*8, 0
17424 /* (2^48-(2*1024*1024*1024))/(2^39) = 511 */
17425 .quad level3_kernel_pgt - __START_KERNEL_map + _PAGE_TABLE
17426
17427 +#ifdef CONFIG_PAX_PER_CPU_PGD
17428 +NEXT_PAGE(cpu_pgd)
17429 + .rept NR_CPUS
17430 + .fill 512,8,0
17431 + .endr
17432 +#endif
17433 +
17434 NEXT_PAGE(level3_ident_pgt)
17435 .quad level2_ident_pgt - __START_KERNEL_map + _KERNPG_TABLE
17436 +#ifdef CONFIG_XEN
17437 .fill 511,8,0
17438 +#else
17439 + .quad level2_ident_pgt + PAGE_SIZE - __START_KERNEL_map + _KERNPG_TABLE
17440 + .fill 510,8,0
17441 +#endif
17442 +
17443 +NEXT_PAGE(level3_vmalloc_start_pgt)
17444 + .fill 512,8,0
17445 +
17446 +NEXT_PAGE(level3_vmalloc_end_pgt)
17447 + .fill 512,8,0
17448 +
17449 +NEXT_PAGE(level3_vmemmap_pgt)
17450 + .fill L3_VMEMMAP_START,8,0
17451 + .quad level2_vmemmap_pgt - __START_KERNEL_map + _KERNPG_TABLE
17452
17453 NEXT_PAGE(level3_kernel_pgt)
17454 .fill L3_START_KERNEL,8,0
17455 @@ -364,20 +401,23 @@ NEXT_PAGE(level3_kernel_pgt)
17456 .quad level2_kernel_pgt - __START_KERNEL_map + _KERNPG_TABLE
17457 .quad level2_fixmap_pgt - __START_KERNEL_map + _PAGE_TABLE
17458
17459 +NEXT_PAGE(level2_vmemmap_pgt)
17460 + .fill 512,8,0
17461 +
17462 NEXT_PAGE(level2_fixmap_pgt)
17463 - .fill 506,8,0
17464 - .quad level1_fixmap_pgt - __START_KERNEL_map + _PAGE_TABLE
17465 - /* 8MB reserved for vsyscalls + a 2MB hole = 4 + 1 entries */
17466 - .fill 5,8,0
17467 + .fill 507,8,0
17468 + .quad level1_vsyscall_pgt - __START_KERNEL_map + _PAGE_TABLE
17469 + /* 6MB reserved for vsyscalls + a 2MB hole = 3 + 1 entries */
17470 + .fill 4,8,0
17471
17472 -NEXT_PAGE(level1_fixmap_pgt)
17473 +NEXT_PAGE(level1_vsyscall_pgt)
17474 .fill 512,8,0
17475
17476 -NEXT_PAGE(level2_ident_pgt)
17477 - /* Since I easily can, map the first 1G.
17478 + /* Since I easily can, map the first 2G.
17479 * Don't set NX because code runs from these pages.
17480 */
17481 - PMDS(0, __PAGE_KERNEL_IDENT_LARGE_EXEC, PTRS_PER_PMD)
17482 +NEXT_PAGE(level2_ident_pgt)
17483 + PMDS(0, __PAGE_KERNEL_IDENT_LARGE_EXEC, 2*PTRS_PER_PMD)
17484
17485 NEXT_PAGE(level2_kernel_pgt)
17486 /*
17487 @@ -390,33 +430,55 @@ NEXT_PAGE(level2_kernel_pgt)
17488 * If you want to increase this then increase MODULES_VADDR
17489 * too.)
17490 */
17491 - PMDS(0, __PAGE_KERNEL_LARGE_EXEC,
17492 - KERNEL_IMAGE_SIZE/PMD_SIZE)
17493 -
17494 -NEXT_PAGE(level2_spare_pgt)
17495 - .fill 512, 8, 0
17496 + PMDS(0, __PAGE_KERNEL_LARGE_EXEC, KERNEL_IMAGE_SIZE/PMD_SIZE)
17497
17498 #undef PMDS
17499 #undef NEXT_PAGE
17500
17501 - .data
17502 + .align PAGE_SIZE
17503 +ENTRY(cpu_gdt_table)
17504 + .rept NR_CPUS
17505 + .quad 0x0000000000000000 /* NULL descriptor */
17506 + .quad 0x00cf9b000000ffff /* __KERNEL32_CS */
17507 + .quad 0x00af9b000000ffff /* __KERNEL_CS */
17508 + .quad 0x00cf93000000ffff /* __KERNEL_DS */
17509 + .quad 0x00cffb000000ffff /* __USER32_CS */
17510 + .quad 0x00cff3000000ffff /* __USER_DS, __USER32_DS */
17511 + .quad 0x00affb000000ffff /* __USER_CS */
17512 +
17513 +#ifdef CONFIG_PAX_KERNEXEC
17514 + .quad 0x00af9b000000ffff /* __KERNEXEC_KERNEL_CS */
17515 +#else
17516 + .quad 0x0 /* unused */
17517 +#endif
17518 +
17519 + .quad 0,0 /* TSS */
17520 + .quad 0,0 /* LDT */
17521 + .quad 0,0,0 /* three TLS descriptors */
17522 + .quad 0x0000f40000000000 /* node/CPU stored in limit */
17523 + /* asm/segment.h:GDT_ENTRIES must match this */
17524 +
17525 + /* zero the remaining page */
17526 + .fill PAGE_SIZE / 8 - GDT_ENTRIES,8,0
17527 + .endr
17528 +
17529 .align 16
17530 .globl early_gdt_descr
17531 early_gdt_descr:
17532 .word GDT_ENTRIES*8-1
17533 early_gdt_descr_base:
17534 - .quad INIT_PER_CPU_VAR(gdt_page)
17535 + .quad cpu_gdt_table
17536
17537 ENTRY(phys_base)
17538 /* This must match the first entry in level2_kernel_pgt */
17539 .quad 0x0000000000000000
17540
17541 #include "../../x86/xen/xen-head.S"
17542 -
17543 - .section .bss, "aw", @nobits
17544 +
17545 + .section .rodata,"a",@progbits
17546 .align L1_CACHE_BYTES
17547 ENTRY(idt_table)
17548 - .skip IDT_ENTRIES * 16
17549 + .fill 512,8,0
17550
17551 __PAGE_ALIGNED_BSS
17552 .align PAGE_SIZE
17553 diff --git a/arch/x86/kernel/i386_ksyms_32.c b/arch/x86/kernel/i386_ksyms_32.c
17554 index 9c3bd4a..e1d9b35 100644
17555 --- a/arch/x86/kernel/i386_ksyms_32.c
17556 +++ b/arch/x86/kernel/i386_ksyms_32.c
17557 @@ -20,8 +20,12 @@ extern void cmpxchg8b_emu(void);
17558 EXPORT_SYMBOL(cmpxchg8b_emu);
17559 #endif
17560
17561 +EXPORT_SYMBOL_GPL(cpu_gdt_table);
17562 +
17563 /* Networking helper routines. */
17564 EXPORT_SYMBOL(csum_partial_copy_generic);
17565 +EXPORT_SYMBOL(csum_partial_copy_generic_to_user);
17566 +EXPORT_SYMBOL(csum_partial_copy_generic_from_user);
17567
17568 EXPORT_SYMBOL(__get_user_1);
17569 EXPORT_SYMBOL(__get_user_2);
17570 @@ -36,3 +40,7 @@ EXPORT_SYMBOL(strstr);
17571
17572 EXPORT_SYMBOL(csum_partial);
17573 EXPORT_SYMBOL(empty_zero_page);
17574 +
17575 +#ifdef CONFIG_PAX_KERNEXEC
17576 +EXPORT_SYMBOL(__LOAD_PHYSICAL_ADDR);
17577 +#endif
17578 diff --git a/arch/x86/kernel/i8259.c b/arch/x86/kernel/i8259.c
17579 index df89102..a244320 100644
17580 --- a/arch/x86/kernel/i8259.c
17581 +++ b/arch/x86/kernel/i8259.c
17582 @@ -208,7 +208,7 @@ spurious_8259A_irq:
17583 "spurious 8259A interrupt: IRQ%d.\n", irq);
17584 spurious_irq_mask |= irqmask;
17585 }
17586 - atomic_inc(&irq_err_count);
17587 + atomic_inc_unchecked(&irq_err_count);
17588 /*
17589 * Theoretically we do not have to handle this IRQ,
17590 * but in Linux this does not cause problems and is
17591 diff --git a/arch/x86/kernel/init_task.c b/arch/x86/kernel/init_task.c
17592 index 3a54dcb..1c22348 100644
17593 --- a/arch/x86/kernel/init_task.c
17594 +++ b/arch/x86/kernel/init_task.c
17595 @@ -20,8 +20,7 @@ static struct sighand_struct init_sighand = INIT_SIGHAND(init_sighand);
17596 * way process stacks are handled. This is done by having a special
17597 * "init_task" linker map entry..
17598 */
17599 -union thread_union init_thread_union __init_task_data =
17600 - { INIT_THREAD_INFO(init_task) };
17601 +union thread_union init_thread_union __init_task_data;
17602
17603 /*
17604 * Initial task structure.
17605 @@ -38,5 +37,5 @@ EXPORT_SYMBOL(init_task);
17606 * section. Since TSS's are completely CPU-local, we want them
17607 * on exact cacheline boundaries, to eliminate cacheline ping-pong.
17608 */
17609 -DEFINE_PER_CPU_SHARED_ALIGNED(struct tss_struct, init_tss) = INIT_TSS;
17610 -
17611 +struct tss_struct init_tss[NR_CPUS] ____cacheline_internodealigned_in_smp = { [0 ... NR_CPUS-1] = INIT_TSS };
17612 +EXPORT_SYMBOL(init_tss);
17613 diff --git a/arch/x86/kernel/ioport.c b/arch/x86/kernel/ioport.c
17614 index 99c4d30..74c84e9 100644
17615 --- a/arch/x86/kernel/ioport.c
17616 +++ b/arch/x86/kernel/ioport.c
17617 @@ -6,6 +6,7 @@
17618 #include <linux/sched.h>
17619 #include <linux/kernel.h>
17620 #include <linux/capability.h>
17621 +#include <linux/security.h>
17622 #include <linux/errno.h>
17623 #include <linux/types.h>
17624 #include <linux/ioport.h>
17625 @@ -41,6 +42,12 @@ asmlinkage long sys_ioperm(unsigned long from, unsigned long num, int turn_on)
17626
17627 if ((from + num <= from) || (from + num > IO_BITMAP_BITS))
17628 return -EINVAL;
17629 +#ifdef CONFIG_GRKERNSEC_IO
17630 + if (turn_on && grsec_disable_privio) {
17631 + gr_handle_ioperm();
17632 + return -EPERM;
17633 + }
17634 +#endif
17635 if (turn_on && !capable(CAP_SYS_RAWIO))
17636 return -EPERM;
17637
17638 @@ -67,7 +74,7 @@ asmlinkage long sys_ioperm(unsigned long from, unsigned long num, int turn_on)
17639 * because the ->io_bitmap_max value must match the bitmap
17640 * contents:
17641 */
17642 - tss = &per_cpu(init_tss, get_cpu());
17643 + tss = init_tss + get_cpu();
17644
17645 set_bitmap(t->io_bitmap_ptr, from, num, !turn_on);
17646
17647 @@ -111,6 +118,12 @@ static int do_iopl(unsigned int level, struct pt_regs *regs)
17648 return -EINVAL;
17649 /* Trying to gain more privileges? */
17650 if (level > old) {
17651 +#ifdef CONFIG_GRKERNSEC_IO
17652 + if (grsec_disable_privio) {
17653 + gr_handle_iopl();
17654 + return -EPERM;
17655 + }
17656 +#endif
17657 if (!capable(CAP_SYS_RAWIO))
17658 return -EPERM;
17659 }
17660 diff --git a/arch/x86/kernel/irq.c b/arch/x86/kernel/irq.c
17661 index 04bbd52..83a07d9 100644
17662 --- a/arch/x86/kernel/irq.c
17663 +++ b/arch/x86/kernel/irq.c
17664 @@ -15,7 +15,7 @@
17665 #include <asm/mce.h>
17666 #include <asm/hw_irq.h>
17667
17668 -atomic_t irq_err_count;
17669 +atomic_unchecked_t irq_err_count;
17670
17671 /* Function pointer for generic interrupt vector handling */
17672 void (*generic_interrupt_extension)(void) = NULL;
17673 @@ -114,9 +114,9 @@ static int show_other_interrupts(struct seq_file *p, int prec)
17674 seq_printf(p, "%10u ", per_cpu(mce_poll_count, j));
17675 seq_printf(p, " Machine check polls\n");
17676 #endif
17677 - seq_printf(p, "%*s: %10u\n", prec, "ERR", atomic_read(&irq_err_count));
17678 + seq_printf(p, "%*s: %10u\n", prec, "ERR", atomic_read_unchecked(&irq_err_count));
17679 #if defined(CONFIG_X86_IO_APIC)
17680 - seq_printf(p, "%*s: %10u\n", prec, "MIS", atomic_read(&irq_mis_count));
17681 + seq_printf(p, "%*s: %10u\n", prec, "MIS", atomic_read_unchecked(&irq_mis_count));
17682 #endif
17683 return 0;
17684 }
17685 @@ -209,10 +209,10 @@ u64 arch_irq_stat_cpu(unsigned int cpu)
17686
17687 u64 arch_irq_stat(void)
17688 {
17689 - u64 sum = atomic_read(&irq_err_count);
17690 + u64 sum = atomic_read_unchecked(&irq_err_count);
17691
17692 #ifdef CONFIG_X86_IO_APIC
17693 - sum += atomic_read(&irq_mis_count);
17694 + sum += atomic_read_unchecked(&irq_mis_count);
17695 #endif
17696 return sum;
17697 }
17698 diff --git a/arch/x86/kernel/irq_32.c b/arch/x86/kernel/irq_32.c
17699 index 7d35d0f..03f1d52 100644
17700 --- a/arch/x86/kernel/irq_32.c
17701 +++ b/arch/x86/kernel/irq_32.c
17702 @@ -35,7 +35,7 @@ static int check_stack_overflow(void)
17703 __asm__ __volatile__("andl %%esp,%0" :
17704 "=r" (sp) : "0" (THREAD_SIZE - 1));
17705
17706 - return sp < (sizeof(struct thread_info) + STACK_WARN);
17707 + return sp < STACK_WARN;
17708 }
17709
17710 static void print_stack_overflow(void)
17711 @@ -54,9 +54,9 @@ static inline void print_stack_overflow(void) { }
17712 * per-CPU IRQ handling contexts (thread information and stack)
17713 */
17714 union irq_ctx {
17715 - struct thread_info tinfo;
17716 - u32 stack[THREAD_SIZE/sizeof(u32)];
17717 -} __attribute__((aligned(PAGE_SIZE)));
17718 + unsigned long previous_esp;
17719 + u32 stack[THREAD_SIZE/sizeof(u32)];
17720 +} __attribute__((aligned(THREAD_SIZE)));
17721
17722 static DEFINE_PER_CPU(union irq_ctx *, hardirq_ctx);
17723 static DEFINE_PER_CPU(union irq_ctx *, softirq_ctx);
17724 @@ -78,10 +78,9 @@ static void call_on_stack(void *func, void *stack)
17725 static inline int
17726 execute_on_irq_stack(int overflow, struct irq_desc *desc, int irq)
17727 {
17728 - union irq_ctx *curctx, *irqctx;
17729 + union irq_ctx *irqctx;
17730 u32 *isp, arg1, arg2;
17731
17732 - curctx = (union irq_ctx *) current_thread_info();
17733 irqctx = __get_cpu_var(hardirq_ctx);
17734
17735 /*
17736 @@ -90,21 +89,16 @@ execute_on_irq_stack(int overflow, struct irq_desc *desc, int irq)
17737 * handler) we can't do that and just have to keep using the
17738 * current stack (which is the irq stack already after all)
17739 */
17740 - if (unlikely(curctx == irqctx))
17741 + if (unlikely((void *)current_stack_pointer - (void *)irqctx < THREAD_SIZE))
17742 return 0;
17743
17744 /* build the stack frame on the IRQ stack */
17745 - isp = (u32 *) ((char *)irqctx + sizeof(*irqctx));
17746 - irqctx->tinfo.task = curctx->tinfo.task;
17747 - irqctx->tinfo.previous_esp = current_stack_pointer;
17748 + isp = (u32 *) ((char *)irqctx + sizeof(*irqctx) - 8);
17749 + irqctx->previous_esp = current_stack_pointer;
17750
17751 - /*
17752 - * Copy the softirq bits in preempt_count so that the
17753 - * softirq checks work in the hardirq context.
17754 - */
17755 - irqctx->tinfo.preempt_count =
17756 - (irqctx->tinfo.preempt_count & ~SOFTIRQ_MASK) |
17757 - (curctx->tinfo.preempt_count & SOFTIRQ_MASK);
17758 +#ifdef CONFIG_PAX_MEMORY_UDEREF
17759 + __set_fs(MAKE_MM_SEG(0));
17760 +#endif
17761
17762 if (unlikely(overflow))
17763 call_on_stack(print_stack_overflow, isp);
17764 @@ -116,6 +110,11 @@ execute_on_irq_stack(int overflow, struct irq_desc *desc, int irq)
17765 : "0" (irq), "1" (desc), "2" (isp),
17766 "D" (desc->handle_irq)
17767 : "memory", "cc", "ecx");
17768 +
17769 +#ifdef CONFIG_PAX_MEMORY_UDEREF
17770 + __set_fs(current_thread_info()->addr_limit);
17771 +#endif
17772 +
17773 return 1;
17774 }
17775
17776 @@ -124,28 +123,11 @@ execute_on_irq_stack(int overflow, struct irq_desc *desc, int irq)
17777 */
17778 void __cpuinit irq_ctx_init(int cpu)
17779 {
17780 - union irq_ctx *irqctx;
17781 -
17782 if (per_cpu(hardirq_ctx, cpu))
17783 return;
17784
17785 - irqctx = &per_cpu(hardirq_stack, cpu);
17786 - irqctx->tinfo.task = NULL;
17787 - irqctx->tinfo.exec_domain = NULL;
17788 - irqctx->tinfo.cpu = cpu;
17789 - irqctx->tinfo.preempt_count = HARDIRQ_OFFSET;
17790 - irqctx->tinfo.addr_limit = MAKE_MM_SEG(0);
17791 -
17792 - per_cpu(hardirq_ctx, cpu) = irqctx;
17793 -
17794 - irqctx = &per_cpu(softirq_stack, cpu);
17795 - irqctx->tinfo.task = NULL;
17796 - irqctx->tinfo.exec_domain = NULL;
17797 - irqctx->tinfo.cpu = cpu;
17798 - irqctx->tinfo.preempt_count = 0;
17799 - irqctx->tinfo.addr_limit = MAKE_MM_SEG(0);
17800 -
17801 - per_cpu(softirq_ctx, cpu) = irqctx;
17802 + per_cpu(hardirq_ctx, cpu) = &per_cpu(hardirq_stack, cpu);
17803 + per_cpu(softirq_ctx, cpu) = &per_cpu(softirq_stack, cpu);
17804
17805 printk(KERN_DEBUG "CPU %u irqstacks, hard=%p soft=%p\n",
17806 cpu, per_cpu(hardirq_ctx, cpu), per_cpu(softirq_ctx, cpu));
17807 @@ -159,7 +141,6 @@ void irq_ctx_exit(int cpu)
17808 asmlinkage void do_softirq(void)
17809 {
17810 unsigned long flags;
17811 - struct thread_info *curctx;
17812 union irq_ctx *irqctx;
17813 u32 *isp;
17814
17815 @@ -169,15 +150,22 @@ asmlinkage void do_softirq(void)
17816 local_irq_save(flags);
17817
17818 if (local_softirq_pending()) {
17819 - curctx = current_thread_info();
17820 irqctx = __get_cpu_var(softirq_ctx);
17821 - irqctx->tinfo.task = curctx->task;
17822 - irqctx->tinfo.previous_esp = current_stack_pointer;
17823 + irqctx->previous_esp = current_stack_pointer;
17824
17825 /* build the stack frame on the softirq stack */
17826 - isp = (u32 *) ((char *)irqctx + sizeof(*irqctx));
17827 + isp = (u32 *) ((char *)irqctx + sizeof(*irqctx) - 8);
17828 +
17829 +#ifdef CONFIG_PAX_MEMORY_UDEREF
17830 + __set_fs(MAKE_MM_SEG(0));
17831 +#endif
17832
17833 call_on_stack(__do_softirq, isp);
17834 +
17835 +#ifdef CONFIG_PAX_MEMORY_UDEREF
17836 + __set_fs(current_thread_info()->addr_limit);
17837 +#endif
17838 +
17839 /*
17840 * Shouldnt happen, we returned above if in_interrupt():
17841 */
17842 diff --git a/arch/x86/kernel/kgdb.c b/arch/x86/kernel/kgdb.c
17843 index 8d82a77..0baf312 100644
17844 --- a/arch/x86/kernel/kgdb.c
17845 +++ b/arch/x86/kernel/kgdb.c
17846 @@ -390,13 +390,13 @@ int kgdb_arch_handle_exception(int e_vector, int signo, int err_code,
17847
17848 /* clear the trace bit */
17849 linux_regs->flags &= ~X86_EFLAGS_TF;
17850 - atomic_set(&kgdb_cpu_doing_single_step, -1);
17851 + atomic_set_unchecked(&kgdb_cpu_doing_single_step, -1);
17852
17853 /* set the trace bit if we're stepping */
17854 if (remcomInBuffer[0] == 's') {
17855 linux_regs->flags |= X86_EFLAGS_TF;
17856 kgdb_single_step = 1;
17857 - atomic_set(&kgdb_cpu_doing_single_step,
17858 + atomic_set_unchecked(&kgdb_cpu_doing_single_step,
17859 raw_smp_processor_id());
17860 }
17861
17862 @@ -476,7 +476,7 @@ static int __kgdb_notify(struct die_args *args, unsigned long cmd)
17863 break;
17864
17865 case DIE_DEBUG:
17866 - if (atomic_read(&kgdb_cpu_doing_single_step) ==
17867 + if (atomic_read_unchecked(&kgdb_cpu_doing_single_step) ==
17868 raw_smp_processor_id()) {
17869 if (user_mode(regs))
17870 return single_step_cont(regs, args);
17871 @@ -573,7 +573,7 @@ unsigned long kgdb_arch_pc(int exception, struct pt_regs *regs)
17872 return instruction_pointer(regs);
17873 }
17874
17875 -struct kgdb_arch arch_kgdb_ops = {
17876 +const struct kgdb_arch arch_kgdb_ops = {
17877 /* Breakpoint instruction: */
17878 .gdb_bpt_instr = { 0xcc },
17879 .flags = KGDB_HW_BREAKPOINT,
17880 diff --git a/arch/x86/kernel/kprobes.c b/arch/x86/kernel/kprobes.c
17881 index 7a67820..8d15b75 100644
17882 --- a/arch/x86/kernel/kprobes.c
17883 +++ b/arch/x86/kernel/kprobes.c
17884 @@ -168,9 +168,13 @@ static void __kprobes set_jmp_op(void *from, void *to)
17885 char op;
17886 s32 raddr;
17887 } __attribute__((packed)) * jop;
17888 - jop = (struct __arch_jmp_op *)from;
17889 +
17890 + jop = (struct __arch_jmp_op *)(ktla_ktva(from));
17891 +
17892 + pax_open_kernel();
17893 jop->raddr = (s32)((long)(to) - ((long)(from) + 5));
17894 jop->op = RELATIVEJUMP_INSTRUCTION;
17895 + pax_close_kernel();
17896 }
17897
17898 /*
17899 @@ -195,7 +199,7 @@ static int __kprobes can_boost(kprobe_opcode_t *opcodes)
17900 kprobe_opcode_t opcode;
17901 kprobe_opcode_t *orig_opcodes = opcodes;
17902
17903 - if (search_exception_tables((unsigned long)opcodes))
17904 + if (search_exception_tables(ktva_ktla((unsigned long)opcodes)))
17905 return 0; /* Page fault may occur on this address. */
17906
17907 retry:
17908 @@ -339,7 +343,9 @@ static void __kprobes fix_riprel(struct kprobe *p)
17909 disp = (u8 *) p->addr + *((s32 *) insn) -
17910 (u8 *) p->ainsn.insn;
17911 BUG_ON((s64) (s32) disp != disp); /* Sanity check. */
17912 + pax_open_kernel();
17913 *(s32 *)insn = (s32) disp;
17914 + pax_close_kernel();
17915 }
17916 }
17917 #endif
17918 @@ -347,16 +353,18 @@ static void __kprobes fix_riprel(struct kprobe *p)
17919
17920 static void __kprobes arch_copy_kprobe(struct kprobe *p)
17921 {
17922 - memcpy(p->ainsn.insn, p->addr, MAX_INSN_SIZE * sizeof(kprobe_opcode_t));
17923 + pax_open_kernel();
17924 + memcpy(p->ainsn.insn, ktla_ktva(p->addr), MAX_INSN_SIZE * sizeof(kprobe_opcode_t));
17925 + pax_close_kernel();
17926
17927 fix_riprel(p);
17928
17929 - if (can_boost(p->addr))
17930 + if (can_boost(ktla_ktva(p->addr)))
17931 p->ainsn.boostable = 0;
17932 else
17933 p->ainsn.boostable = -1;
17934
17935 - p->opcode = *p->addr;
17936 + p->opcode = *(ktla_ktva(p->addr));
17937 }
17938
17939 int __kprobes arch_prepare_kprobe(struct kprobe *p)
17940 @@ -434,7 +442,7 @@ static void __kprobes prepare_singlestep(struct kprobe *p, struct pt_regs *regs)
17941 if (p->opcode == BREAKPOINT_INSTRUCTION)
17942 regs->ip = (unsigned long)p->addr;
17943 else
17944 - regs->ip = (unsigned long)p->ainsn.insn;
17945 + regs->ip = ktva_ktla((unsigned long)p->ainsn.insn);
17946 }
17947
17948 void __kprobes arch_prepare_kretprobe(struct kretprobe_instance *ri,
17949 @@ -455,7 +463,7 @@ static void __kprobes setup_singlestep(struct kprobe *p, struct pt_regs *regs,
17950 if (p->ainsn.boostable == 1 && !p->post_handler) {
17951 /* Boost up -- we can execute copied instructions directly */
17952 reset_current_kprobe();
17953 - regs->ip = (unsigned long)p->ainsn.insn;
17954 + regs->ip = ktva_ktla((unsigned long)p->ainsn.insn);
17955 preempt_enable_no_resched();
17956 return;
17957 }
17958 @@ -525,7 +533,7 @@ static int __kprobes kprobe_handler(struct pt_regs *regs)
17959 struct kprobe_ctlblk *kcb;
17960
17961 addr = (kprobe_opcode_t *)(regs->ip - sizeof(kprobe_opcode_t));
17962 - if (*addr != BREAKPOINT_INSTRUCTION) {
17963 + if (*(kprobe_opcode_t *)ktla_ktva((unsigned long)addr) != BREAKPOINT_INSTRUCTION) {
17964 /*
17965 * The breakpoint instruction was removed right
17966 * after we hit it. Another cpu has removed
17967 @@ -637,6 +645,9 @@ static void __used __kprobes kretprobe_trampoline_holder(void)
17968 /* Skip orig_ax, ip, cs */
17969 " addq $24, %rsp\n"
17970 " popfq\n"
17971 +#ifdef CONFIG_PAX_KERNEXEC_PLUGIN
17972 + " btsq $63,(%rsp)\n"
17973 +#endif
17974 #else
17975 " pushf\n"
17976 /*
17977 @@ -777,7 +788,7 @@ static void __kprobes resume_execution(struct kprobe *p,
17978 struct pt_regs *regs, struct kprobe_ctlblk *kcb)
17979 {
17980 unsigned long *tos = stack_addr(regs);
17981 - unsigned long copy_ip = (unsigned long)p->ainsn.insn;
17982 + unsigned long copy_ip = ktva_ktla((unsigned long)p->ainsn.insn);
17983 unsigned long orig_ip = (unsigned long)p->addr;
17984 kprobe_opcode_t *insn = p->ainsn.insn;
17985
17986 @@ -960,7 +971,7 @@ int __kprobes kprobe_exceptions_notify(struct notifier_block *self,
17987 struct die_args *args = data;
17988 int ret = NOTIFY_DONE;
17989
17990 - if (args->regs && user_mode_vm(args->regs))
17991 + if (args->regs && user_mode(args->regs))
17992 return ret;
17993
17994 switch (val) {
17995 diff --git a/arch/x86/kernel/kvm.c b/arch/x86/kernel/kvm.c
17996 index 63b0ec8..6d92227 100644
17997 --- a/arch/x86/kernel/kvm.c
17998 +++ b/arch/x86/kernel/kvm.c
17999 @@ -216,6 +216,7 @@ static void __init paravirt_ops_setup(void)
18000 pv_mmu_ops.set_pud = kvm_set_pud;
18001 #if PAGETABLE_LEVELS == 4
18002 pv_mmu_ops.set_pgd = kvm_set_pgd;
18003 + pv_mmu_ops.set_pgd_batched = kvm_set_pgd;
18004 #endif
18005 #endif
18006 pv_mmu_ops.flush_tlb_user = kvm_flush_tlb;
18007 diff --git a/arch/x86/kernel/ldt.c b/arch/x86/kernel/ldt.c
18008 index ec6ef60..ab2c824 100644
18009 --- a/arch/x86/kernel/ldt.c
18010 +++ b/arch/x86/kernel/ldt.c
18011 @@ -66,13 +66,13 @@ static int alloc_ldt(mm_context_t *pc, int mincount, int reload)
18012 if (reload) {
18013 #ifdef CONFIG_SMP
18014 preempt_disable();
18015 - load_LDT(pc);
18016 + load_LDT_nolock(pc);
18017 if (!cpumask_equal(mm_cpumask(current->mm),
18018 cpumask_of(smp_processor_id())))
18019 smp_call_function(flush_ldt, current->mm, 1);
18020 preempt_enable();
18021 #else
18022 - load_LDT(pc);
18023 + load_LDT_nolock(pc);
18024 #endif
18025 }
18026 if (oldsize) {
18027 @@ -94,7 +94,7 @@ static inline int copy_ldt(mm_context_t *new, mm_context_t *old)
18028 return err;
18029
18030 for (i = 0; i < old->size; i++)
18031 - write_ldt_entry(new->ldt, i, old->ldt + i * LDT_ENTRY_SIZE);
18032 + write_ldt_entry(new->ldt, i, old->ldt + i);
18033 return 0;
18034 }
18035
18036 @@ -115,6 +115,24 @@ int init_new_context(struct task_struct *tsk, struct mm_struct *mm)
18037 retval = copy_ldt(&mm->context, &old_mm->context);
18038 mutex_unlock(&old_mm->context.lock);
18039 }
18040 +
18041 + if (tsk == current) {
18042 + mm->context.vdso = 0;
18043 +
18044 +#ifdef CONFIG_X86_32
18045 +#if defined(CONFIG_PAX_PAGEEXEC) || defined(CONFIG_PAX_SEGMEXEC)
18046 + mm->context.user_cs_base = 0UL;
18047 + mm->context.user_cs_limit = ~0UL;
18048 +
18049 +#if defined(CONFIG_PAX_PAGEEXEC) && defined(CONFIG_SMP)
18050 + cpus_clear(mm->context.cpu_user_cs_mask);
18051 +#endif
18052 +
18053 +#endif
18054 +#endif
18055 +
18056 + }
18057 +
18058 return retval;
18059 }
18060
18061 @@ -229,6 +247,13 @@ static int write_ldt(void __user *ptr, unsigned long bytecount, int oldmode)
18062 }
18063 }
18064
18065 +#ifdef CONFIG_PAX_SEGMEXEC
18066 + if ((mm->pax_flags & MF_PAX_SEGMEXEC) && (ldt_info.contents & MODIFY_LDT_CONTENTS_CODE)) {
18067 + error = -EINVAL;
18068 + goto out_unlock;
18069 + }
18070 +#endif
18071 +
18072 fill_ldt(&ldt, &ldt_info);
18073 if (oldmode)
18074 ldt.avl = 0;
18075 diff --git a/arch/x86/kernel/machine_kexec_32.c b/arch/x86/kernel/machine_kexec_32.c
18076 index c1c429d..f02eaf9 100644
18077 --- a/arch/x86/kernel/machine_kexec_32.c
18078 +++ b/arch/x86/kernel/machine_kexec_32.c
18079 @@ -26,7 +26,7 @@
18080 #include <asm/system.h>
18081 #include <asm/cacheflush.h>
18082
18083 -static void set_idt(void *newidt, __u16 limit)
18084 +static void set_idt(struct desc_struct *newidt, __u16 limit)
18085 {
18086 struct desc_ptr curidt;
18087
18088 @@ -38,7 +38,7 @@ static void set_idt(void *newidt, __u16 limit)
18089 }
18090
18091
18092 -static void set_gdt(void *newgdt, __u16 limit)
18093 +static void set_gdt(struct desc_struct *newgdt, __u16 limit)
18094 {
18095 struct desc_ptr curgdt;
18096
18097 @@ -217,7 +217,7 @@ void machine_kexec(struct kimage *image)
18098 }
18099
18100 control_page = page_address(image->control_code_page);
18101 - memcpy(control_page, relocate_kernel, KEXEC_CONTROL_CODE_MAX_SIZE);
18102 + memcpy(control_page, (void *)ktla_ktva((unsigned long)relocate_kernel), KEXEC_CONTROL_CODE_MAX_SIZE);
18103
18104 relocate_kernel_ptr = control_page;
18105 page_list[PA_CONTROL_PAGE] = __pa(control_page);
18106 diff --git a/arch/x86/kernel/microcode_amd.c b/arch/x86/kernel/microcode_amd.c
18107 index 1e47679..e73449d 100644
18108 --- a/arch/x86/kernel/microcode_amd.c
18109 +++ b/arch/x86/kernel/microcode_amd.c
18110 @@ -364,7 +364,7 @@ static void microcode_fini_cpu_amd(int cpu)
18111 uci->mc = NULL;
18112 }
18113
18114 -static struct microcode_ops microcode_amd_ops = {
18115 +static const struct microcode_ops microcode_amd_ops = {
18116 .request_microcode_user = request_microcode_user,
18117 .request_microcode_fw = request_microcode_fw,
18118 .collect_cpu_info = collect_cpu_info_amd,
18119 @@ -372,7 +372,7 @@ static struct microcode_ops microcode_amd_ops = {
18120 .microcode_fini_cpu = microcode_fini_cpu_amd,
18121 };
18122
18123 -struct microcode_ops * __init init_amd_microcode(void)
18124 +const struct microcode_ops * __init init_amd_microcode(void)
18125 {
18126 return &microcode_amd_ops;
18127 }
18128 diff --git a/arch/x86/kernel/microcode_core.c b/arch/x86/kernel/microcode_core.c
18129 index 378e9a8..b5a6ea9 100644
18130 --- a/arch/x86/kernel/microcode_core.c
18131 +++ b/arch/x86/kernel/microcode_core.c
18132 @@ -90,7 +90,7 @@ MODULE_LICENSE("GPL");
18133
18134 #define MICROCODE_VERSION "2.00"
18135
18136 -static struct microcode_ops *microcode_ops;
18137 +static const struct microcode_ops *microcode_ops;
18138
18139 /*
18140 * Synchronization.
18141 diff --git a/arch/x86/kernel/microcode_intel.c b/arch/x86/kernel/microcode_intel.c
18142 index 0d334dd..14cedaf 100644
18143 --- a/arch/x86/kernel/microcode_intel.c
18144 +++ b/arch/x86/kernel/microcode_intel.c
18145 @@ -443,13 +443,13 @@ static enum ucode_state request_microcode_fw(int cpu, struct device *device)
18146
18147 static int get_ucode_user(void *to, const void *from, size_t n)
18148 {
18149 - return copy_from_user(to, from, n);
18150 + return copy_from_user(to, (const void __force_user *)from, n);
18151 }
18152
18153 static enum ucode_state
18154 request_microcode_user(int cpu, const void __user *buf, size_t size)
18155 {
18156 - return generic_load_microcode(cpu, (void *)buf, size, &get_ucode_user);
18157 + return generic_load_microcode(cpu, (__force_kernel void *)buf, size, &get_ucode_user);
18158 }
18159
18160 static void microcode_fini_cpu(int cpu)
18161 @@ -460,7 +460,7 @@ static void microcode_fini_cpu(int cpu)
18162 uci->mc = NULL;
18163 }
18164
18165 -static struct microcode_ops microcode_intel_ops = {
18166 +static const struct microcode_ops microcode_intel_ops = {
18167 .request_microcode_user = request_microcode_user,
18168 .request_microcode_fw = request_microcode_fw,
18169 .collect_cpu_info = collect_cpu_info,
18170 @@ -468,7 +468,7 @@ static struct microcode_ops microcode_intel_ops = {
18171 .microcode_fini_cpu = microcode_fini_cpu,
18172 };
18173
18174 -struct microcode_ops * __init init_intel_microcode(void)
18175 +const struct microcode_ops * __init init_intel_microcode(void)
18176 {
18177 return &microcode_intel_ops;
18178 }
18179 diff --git a/arch/x86/kernel/module.c b/arch/x86/kernel/module.c
18180 index 89f386f..9028f51 100644
18181 --- a/arch/x86/kernel/module.c
18182 +++ b/arch/x86/kernel/module.c
18183 @@ -34,7 +34,7 @@
18184 #define DEBUGP(fmt...)
18185 #endif
18186
18187 -void *module_alloc(unsigned long size)
18188 +static void *__module_alloc(unsigned long size, pgprot_t prot)
18189 {
18190 struct vm_struct *area;
18191
18192 @@ -48,8 +48,18 @@ void *module_alloc(unsigned long size)
18193 if (!area)
18194 return NULL;
18195
18196 - return __vmalloc_area(area, GFP_KERNEL | __GFP_HIGHMEM,
18197 - PAGE_KERNEL_EXEC);
18198 + return __vmalloc_area(area, GFP_KERNEL | __GFP_HIGHMEM | __GFP_ZERO, prot);
18199 +}
18200 +
18201 +void *module_alloc(unsigned long size)
18202 +{
18203 +
18204 +#ifdef CONFIG_PAX_KERNEXEC
18205 + return __module_alloc(size, PAGE_KERNEL);
18206 +#else
18207 + return __module_alloc(size, PAGE_KERNEL_EXEC);
18208 +#endif
18209 +
18210 }
18211
18212 /* Free memory returned from module_alloc */
18213 @@ -58,6 +68,40 @@ void module_free(struct module *mod, void *module_region)
18214 vfree(module_region);
18215 }
18216
18217 +#ifdef CONFIG_PAX_KERNEXEC
18218 +#ifdef CONFIG_X86_32
18219 +void *module_alloc_exec(unsigned long size)
18220 +{
18221 + struct vm_struct *area;
18222 +
18223 + if (size == 0)
18224 + return NULL;
18225 +
18226 + area = __get_vm_area(size, VM_ALLOC, (unsigned long)&MODULES_EXEC_VADDR, (unsigned long)&MODULES_EXEC_END);
18227 + return area ? area->addr : NULL;
18228 +}
18229 +EXPORT_SYMBOL(module_alloc_exec);
18230 +
18231 +void module_free_exec(struct module *mod, void *module_region)
18232 +{
18233 + vunmap(module_region);
18234 +}
18235 +EXPORT_SYMBOL(module_free_exec);
18236 +#else
18237 +void module_free_exec(struct module *mod, void *module_region)
18238 +{
18239 + module_free(mod, module_region);
18240 +}
18241 +EXPORT_SYMBOL(module_free_exec);
18242 +
18243 +void *module_alloc_exec(unsigned long size)
18244 +{
18245 + return __module_alloc(size, PAGE_KERNEL_RX);
18246 +}
18247 +EXPORT_SYMBOL(module_alloc_exec);
18248 +#endif
18249 +#endif
18250 +
18251 /* We don't need anything special. */
18252 int module_frob_arch_sections(Elf_Ehdr *hdr,
18253 Elf_Shdr *sechdrs,
18254 @@ -77,14 +121,16 @@ int apply_relocate(Elf32_Shdr *sechdrs,
18255 unsigned int i;
18256 Elf32_Rel *rel = (void *)sechdrs[relsec].sh_addr;
18257 Elf32_Sym *sym;
18258 - uint32_t *location;
18259 + uint32_t *plocation, location;
18260
18261 DEBUGP("Applying relocate section %u to %u\n", relsec,
18262 sechdrs[relsec].sh_info);
18263 for (i = 0; i < sechdrs[relsec].sh_size / sizeof(*rel); i++) {
18264 /* This is where to make the change */
18265 - location = (void *)sechdrs[sechdrs[relsec].sh_info].sh_addr
18266 - + rel[i].r_offset;
18267 + plocation = (void *)sechdrs[sechdrs[relsec].sh_info].sh_addr + rel[i].r_offset;
18268 + location = (uint32_t)plocation;
18269 + if (sechdrs[sechdrs[relsec].sh_info].sh_flags & SHF_EXECINSTR)
18270 + plocation = ktla_ktva((void *)plocation);
18271 /* This is the symbol it is referring to. Note that all
18272 undefined symbols have been resolved. */
18273 sym = (Elf32_Sym *)sechdrs[symindex].sh_addr
18274 @@ -93,11 +139,15 @@ int apply_relocate(Elf32_Shdr *sechdrs,
18275 switch (ELF32_R_TYPE(rel[i].r_info)) {
18276 case R_386_32:
18277 /* We add the value into the location given */
18278 - *location += sym->st_value;
18279 + pax_open_kernel();
18280 + *plocation += sym->st_value;
18281 + pax_close_kernel();
18282 break;
18283 case R_386_PC32:
18284 /* Add the value, subtract its postition */
18285 - *location += sym->st_value - (uint32_t)location;
18286 + pax_open_kernel();
18287 + *plocation += sym->st_value - location;
18288 + pax_close_kernel();
18289 break;
18290 default:
18291 printk(KERN_ERR "module %s: Unknown relocation: %u\n",
18292 @@ -153,21 +203,30 @@ int apply_relocate_add(Elf64_Shdr *sechdrs,
18293 case R_X86_64_NONE:
18294 break;
18295 case R_X86_64_64:
18296 + pax_open_kernel();
18297 *(u64 *)loc = val;
18298 + pax_close_kernel();
18299 break;
18300 case R_X86_64_32:
18301 + pax_open_kernel();
18302 *(u32 *)loc = val;
18303 + pax_close_kernel();
18304 if (val != *(u32 *)loc)
18305 goto overflow;
18306 break;
18307 case R_X86_64_32S:
18308 + pax_open_kernel();
18309 *(s32 *)loc = val;
18310 + pax_close_kernel();
18311 if ((s64)val != *(s32 *)loc)
18312 goto overflow;
18313 break;
18314 case R_X86_64_PC32:
18315 val -= (u64)loc;
18316 + pax_open_kernel();
18317 *(u32 *)loc = val;
18318 + pax_close_kernel();
18319 +
18320 #if 0
18321 if ((s64)val != *(s32 *)loc)
18322 goto overflow;
18323 diff --git a/arch/x86/kernel/paravirt-spinlocks.c b/arch/x86/kernel/paravirt-spinlocks.c
18324 index 3a7c5a4..9191528 100644
18325 --- a/arch/x86/kernel/paravirt-spinlocks.c
18326 +++ b/arch/x86/kernel/paravirt-spinlocks.c
18327 @@ -13,7 +13,7 @@ default_spin_lock_flags(raw_spinlock_t *lock, unsigned long flags)
18328 __raw_spin_lock(lock);
18329 }
18330
18331 -struct pv_lock_ops pv_lock_ops = {
18332 +struct pv_lock_ops pv_lock_ops __read_only = {
18333 #ifdef CONFIG_SMP
18334 .spin_is_locked = __ticket_spin_is_locked,
18335 .spin_is_contended = __ticket_spin_is_contended,
18336 diff --git a/arch/x86/kernel/paravirt.c b/arch/x86/kernel/paravirt.c
18337 index 1b1739d..dea6077 100644
18338 --- a/arch/x86/kernel/paravirt.c
18339 +++ b/arch/x86/kernel/paravirt.c
18340 @@ -53,6 +53,9 @@ u64 _paravirt_ident_64(u64 x)
18341 {
18342 return x;
18343 }
18344 +#if defined(CONFIG_X86_32) && defined(CONFIG_X86_PAE)
18345 +PV_CALLEE_SAVE_REGS_THUNK(_paravirt_ident_64);
18346 +#endif
18347
18348 void __init default_banner(void)
18349 {
18350 @@ -122,7 +125,7 @@ unsigned paravirt_patch_jmp(void *insnbuf, const void *target,
18351 * corresponding structure. */
18352 static void *get_call_destination(u8 type)
18353 {
18354 - struct paravirt_patch_template tmpl = {
18355 + const struct paravirt_patch_template tmpl = {
18356 .pv_init_ops = pv_init_ops,
18357 .pv_time_ops = pv_time_ops,
18358 .pv_cpu_ops = pv_cpu_ops,
18359 @@ -133,6 +136,8 @@ static void *get_call_destination(u8 type)
18360 .pv_lock_ops = pv_lock_ops,
18361 #endif
18362 };
18363 +
18364 + pax_track_stack();
18365 return *((void **)&tmpl + type);
18366 }
18367
18368 @@ -145,15 +150,19 @@ unsigned paravirt_patch_default(u8 type, u16 clobbers, void *insnbuf,
18369 if (opfunc == NULL)
18370 /* If there's no function, patch it with a ud2a (BUG) */
18371 ret = paravirt_patch_insns(insnbuf, len, ud2a, ud2a+sizeof(ud2a));
18372 - else if (opfunc == _paravirt_nop)
18373 + else if (opfunc == (void *)_paravirt_nop)
18374 /* If the operation is a nop, then nop the callsite */
18375 ret = paravirt_patch_nop();
18376
18377 /* identity functions just return their single argument */
18378 - else if (opfunc == _paravirt_ident_32)
18379 + else if (opfunc == (void *)_paravirt_ident_32)
18380 ret = paravirt_patch_ident_32(insnbuf, len);
18381 - else if (opfunc == _paravirt_ident_64)
18382 + else if (opfunc == (void *)_paravirt_ident_64)
18383 ret = paravirt_patch_ident_64(insnbuf, len);
18384 +#if defined(CONFIG_X86_32) && defined(CONFIG_X86_PAE)
18385 + else if (opfunc == (void *)__raw_callee_save__paravirt_ident_64)
18386 + ret = paravirt_patch_ident_64(insnbuf, len);
18387 +#endif
18388
18389 else if (type == PARAVIRT_PATCH(pv_cpu_ops.iret) ||
18390 type == PARAVIRT_PATCH(pv_cpu_ops.irq_enable_sysexit) ||
18391 @@ -178,7 +187,7 @@ unsigned paravirt_patch_insns(void *insnbuf, unsigned len,
18392 if (insn_len > len || start == NULL)
18393 insn_len = len;
18394 else
18395 - memcpy(insnbuf, start, insn_len);
18396 + memcpy(insnbuf, ktla_ktva(start), insn_len);
18397
18398 return insn_len;
18399 }
18400 @@ -294,22 +303,22 @@ void arch_flush_lazy_mmu_mode(void)
18401 preempt_enable();
18402 }
18403
18404 -struct pv_info pv_info = {
18405 +struct pv_info pv_info __read_only = {
18406 .name = "bare hardware",
18407 .paravirt_enabled = 0,
18408 .kernel_rpl = 0,
18409 .shared_kernel_pmd = 1, /* Only used when CONFIG_X86_PAE is set */
18410 };
18411
18412 -struct pv_init_ops pv_init_ops = {
18413 +struct pv_init_ops pv_init_ops __read_only = {
18414 .patch = native_patch,
18415 };
18416
18417 -struct pv_time_ops pv_time_ops = {
18418 +struct pv_time_ops pv_time_ops __read_only = {
18419 .sched_clock = native_sched_clock,
18420 };
18421
18422 -struct pv_irq_ops pv_irq_ops = {
18423 +struct pv_irq_ops pv_irq_ops __read_only = {
18424 .save_fl = __PV_IS_CALLEE_SAVE(native_save_fl),
18425 .restore_fl = __PV_IS_CALLEE_SAVE(native_restore_fl),
18426 .irq_disable = __PV_IS_CALLEE_SAVE(native_irq_disable),
18427 @@ -321,7 +330,7 @@ struct pv_irq_ops pv_irq_ops = {
18428 #endif
18429 };
18430
18431 -struct pv_cpu_ops pv_cpu_ops = {
18432 +struct pv_cpu_ops pv_cpu_ops __read_only = {
18433 .cpuid = native_cpuid,
18434 .get_debugreg = native_get_debugreg,
18435 .set_debugreg = native_set_debugreg,
18436 @@ -382,21 +391,26 @@ struct pv_cpu_ops pv_cpu_ops = {
18437 .end_context_switch = paravirt_nop,
18438 };
18439
18440 -struct pv_apic_ops pv_apic_ops = {
18441 +struct pv_apic_ops pv_apic_ops __read_only = {
18442 #ifdef CONFIG_X86_LOCAL_APIC
18443 .startup_ipi_hook = paravirt_nop,
18444 #endif
18445 };
18446
18447 -#if defined(CONFIG_X86_32) && !defined(CONFIG_X86_PAE)
18448 +#ifdef CONFIG_X86_32
18449 +#ifdef CONFIG_X86_PAE
18450 +/* 64-bit pagetable entries */
18451 +#define PTE_IDENT PV_CALLEE_SAVE(_paravirt_ident_64)
18452 +#else
18453 /* 32-bit pagetable entries */
18454 #define PTE_IDENT __PV_IS_CALLEE_SAVE(_paravirt_ident_32)
18455 +#endif
18456 #else
18457 /* 64-bit pagetable entries */
18458 #define PTE_IDENT __PV_IS_CALLEE_SAVE(_paravirt_ident_64)
18459 #endif
18460
18461 -struct pv_mmu_ops pv_mmu_ops = {
18462 +struct pv_mmu_ops pv_mmu_ops __read_only = {
18463
18464 .read_cr2 = native_read_cr2,
18465 .write_cr2 = native_write_cr2,
18466 @@ -448,6 +462,7 @@ struct pv_mmu_ops pv_mmu_ops = {
18467 .make_pud = PTE_IDENT,
18468
18469 .set_pgd = native_set_pgd,
18470 + .set_pgd_batched = native_set_pgd_batched,
18471 #endif
18472 #endif /* PAGETABLE_LEVELS >= 3 */
18473
18474 @@ -467,6 +482,12 @@ struct pv_mmu_ops pv_mmu_ops = {
18475 },
18476
18477 .set_fixmap = native_set_fixmap,
18478 +
18479 +#ifdef CONFIG_PAX_KERNEXEC
18480 + .pax_open_kernel = native_pax_open_kernel,
18481 + .pax_close_kernel = native_pax_close_kernel,
18482 +#endif
18483 +
18484 };
18485
18486 EXPORT_SYMBOL_GPL(pv_time_ops);
18487 diff --git a/arch/x86/kernel/pci-calgary_64.c b/arch/x86/kernel/pci-calgary_64.c
18488 index 1a2d4b1..6a0dd55 100644
18489 --- a/arch/x86/kernel/pci-calgary_64.c
18490 +++ b/arch/x86/kernel/pci-calgary_64.c
18491 @@ -477,7 +477,7 @@ static void calgary_free_coherent(struct device *dev, size_t size,
18492 free_pages((unsigned long)vaddr, get_order(size));
18493 }
18494
18495 -static struct dma_map_ops calgary_dma_ops = {
18496 +static const struct dma_map_ops calgary_dma_ops = {
18497 .alloc_coherent = calgary_alloc_coherent,
18498 .free_coherent = calgary_free_coherent,
18499 .map_sg = calgary_map_sg,
18500 diff --git a/arch/x86/kernel/pci-dma.c b/arch/x86/kernel/pci-dma.c
18501 index 6ac3931..42b4414 100644
18502 --- a/arch/x86/kernel/pci-dma.c
18503 +++ b/arch/x86/kernel/pci-dma.c
18504 @@ -14,7 +14,7 @@
18505
18506 static int forbid_dac __read_mostly;
18507
18508 -struct dma_map_ops *dma_ops;
18509 +const struct dma_map_ops *dma_ops;
18510 EXPORT_SYMBOL(dma_ops);
18511
18512 static int iommu_sac_force __read_mostly;
18513 @@ -243,7 +243,7 @@ early_param("iommu", iommu_setup);
18514
18515 int dma_supported(struct device *dev, u64 mask)
18516 {
18517 - struct dma_map_ops *ops = get_dma_ops(dev);
18518 + const struct dma_map_ops *ops = get_dma_ops(dev);
18519
18520 #ifdef CONFIG_PCI
18521 if (mask > 0xffffffff && forbid_dac > 0) {
18522 diff --git a/arch/x86/kernel/pci-gart_64.c b/arch/x86/kernel/pci-gart_64.c
18523 index 1c76691..e3632db 100644
18524 --- a/arch/x86/kernel/pci-gart_64.c
18525 +++ b/arch/x86/kernel/pci-gart_64.c
18526 @@ -682,7 +682,7 @@ static __init int init_k8_gatt(struct agp_kern_info *info)
18527 return -1;
18528 }
18529
18530 -static struct dma_map_ops gart_dma_ops = {
18531 +static const struct dma_map_ops gart_dma_ops = {
18532 .map_sg = gart_map_sg,
18533 .unmap_sg = gart_unmap_sg,
18534 .map_page = gart_map_page,
18535 diff --git a/arch/x86/kernel/pci-nommu.c b/arch/x86/kernel/pci-nommu.c
18536 index a3933d4..c898869 100644
18537 --- a/arch/x86/kernel/pci-nommu.c
18538 +++ b/arch/x86/kernel/pci-nommu.c
18539 @@ -94,7 +94,7 @@ static void nommu_sync_sg_for_device(struct device *dev,
18540 flush_write_buffers();
18541 }
18542
18543 -struct dma_map_ops nommu_dma_ops = {
18544 +const struct dma_map_ops nommu_dma_ops = {
18545 .alloc_coherent = dma_generic_alloc_coherent,
18546 .free_coherent = nommu_free_coherent,
18547 .map_sg = nommu_map_sg,
18548 diff --git a/arch/x86/kernel/pci-swiotlb.c b/arch/x86/kernel/pci-swiotlb.c
18549 index aaa6b78..4de1881 100644
18550 --- a/arch/x86/kernel/pci-swiotlb.c
18551 +++ b/arch/x86/kernel/pci-swiotlb.c
18552 @@ -25,7 +25,7 @@ static void *x86_swiotlb_alloc_coherent(struct device *hwdev, size_t size,
18553 return swiotlb_alloc_coherent(hwdev, size, dma_handle, flags);
18554 }
18555
18556 -static struct dma_map_ops swiotlb_dma_ops = {
18557 +static const struct dma_map_ops swiotlb_dma_ops = {
18558 .mapping_error = swiotlb_dma_mapping_error,
18559 .alloc_coherent = x86_swiotlb_alloc_coherent,
18560 .free_coherent = swiotlb_free_coherent,
18561 diff --git a/arch/x86/kernel/process.c b/arch/x86/kernel/process.c
18562 index fc6c84d..0312ca2 100644
18563 --- a/arch/x86/kernel/process.c
18564 +++ b/arch/x86/kernel/process.c
18565 @@ -51,16 +51,33 @@ void free_thread_xstate(struct task_struct *tsk)
18566
18567 void free_thread_info(struct thread_info *ti)
18568 {
18569 - free_thread_xstate(ti->task);
18570 free_pages((unsigned long)ti, get_order(THREAD_SIZE));
18571 }
18572
18573 +static struct kmem_cache *task_struct_cachep;
18574 +
18575 void arch_task_cache_init(void)
18576 {
18577 - task_xstate_cachep =
18578 - kmem_cache_create("task_xstate", xstate_size,
18579 + /* create a slab on which task_structs can be allocated */
18580 + task_struct_cachep =
18581 + kmem_cache_create("task_struct", sizeof(struct task_struct),
18582 + ARCH_MIN_TASKALIGN, SLAB_PANIC | SLAB_NOTRACK, NULL);
18583 +
18584 + task_xstate_cachep =
18585 + kmem_cache_create("task_xstate", xstate_size,
18586 __alignof__(union thread_xstate),
18587 - SLAB_PANIC | SLAB_NOTRACK, NULL);
18588 + SLAB_PANIC | SLAB_NOTRACK | SLAB_USERCOPY, NULL);
18589 +}
18590 +
18591 +struct task_struct *alloc_task_struct(void)
18592 +{
18593 + return kmem_cache_alloc(task_struct_cachep, GFP_KERNEL);
18594 +}
18595 +
18596 +void free_task_struct(struct task_struct *task)
18597 +{
18598 + free_thread_xstate(task);
18599 + kmem_cache_free(task_struct_cachep, task);
18600 }
18601
18602 /*
18603 @@ -73,7 +90,7 @@ void exit_thread(void)
18604 unsigned long *bp = t->io_bitmap_ptr;
18605
18606 if (bp) {
18607 - struct tss_struct *tss = &per_cpu(init_tss, get_cpu());
18608 + struct tss_struct *tss = init_tss + get_cpu();
18609
18610 t->io_bitmap_ptr = NULL;
18611 clear_thread_flag(TIF_IO_BITMAP);
18612 @@ -93,6 +110,9 @@ void flush_thread(void)
18613
18614 clear_tsk_thread_flag(tsk, TIF_DEBUG);
18615
18616 +#if defined(CONFIG_X86_32) && !defined(CONFIG_CC_STACKPROTECTOR) && !defined(CONFIG_PAX_MEMORY_UDEREF)
18617 + loadsegment(gs, 0);
18618 +#endif
18619 tsk->thread.debugreg0 = 0;
18620 tsk->thread.debugreg1 = 0;
18621 tsk->thread.debugreg2 = 0;
18622 @@ -307,7 +327,7 @@ void default_idle(void)
18623 EXPORT_SYMBOL(default_idle);
18624 #endif
18625
18626 -void stop_this_cpu(void *dummy)
18627 +__noreturn void stop_this_cpu(void *dummy)
18628 {
18629 local_irq_disable();
18630 /*
18631 @@ -568,16 +588,38 @@ 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 + if (!randomize_va_space)
18651 + return;
18652 +
18653 + if (v8086_mode(regs))
18654 + return;
18655 +
18656 + rdtscl(time);
18657 +
18658 + /* P4 seems to return a 0 LSB, ignore it */
18659 +#ifdef CONFIG_MPENTIUM4
18660 + time &= 0x3EUL;
18661 + time <<= 2;
18662 +#elif defined(CONFIG_X86_64)
18663 + time &= 0xFUL;
18664 + time <<= 4;
18665 +#else
18666 + time &= 0x1FUL;
18667 + time <<= 3;
18668 +#endif
18669 +
18670 + thread->sp0 ^= time;
18671 + load_sp0(init_tss + smp_processor_id(), thread);
18672 +
18673 +#ifdef CONFIG_X86_64
18674 + percpu_write(kernel_stack, thread->sp0);
18675 +#endif
18676 }
18677 +#endif
18678
18679 diff --git a/arch/x86/kernel/process_32.c b/arch/x86/kernel/process_32.c
18680 index c40c432..6e1df72 100644
18681 --- a/arch/x86/kernel/process_32.c
18682 +++ b/arch/x86/kernel/process_32.c
18683 @@ -67,6 +67,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 #ifndef CONFIG_SMP
18691 @@ -129,15 +130,14 @@ void __show_regs(struct pt_regs *regs, int all)
18692 unsigned short ss, gs;
18693 const char *board;
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 = (unsigned long) (&regs->sp);
18702 savesegment(ss, ss);
18703 - savesegment(gs, gs);
18704 }
18705 + gs = get_user_gs(regs);
18706
18707 printk("\n");
18708
18709 @@ -210,10 +210,10 @@ int kernel_thread(int (*fn)(void *), void *arg, unsigned long flags)
18710 regs.bx = (unsigned long) fn;
18711 regs.dx = (unsigned long) arg;
18712
18713 - regs.ds = __USER_DS;
18714 - regs.es = __USER_DS;
18715 + regs.ds = __KERNEL_DS;
18716 + regs.es = __KERNEL_DS;
18717 regs.fs = __KERNEL_PERCPU;
18718 - regs.gs = __KERNEL_STACK_CANARY;
18719 + savesegment(gs, regs.gs);
18720 regs.orig_ax = -1;
18721 regs.ip = (unsigned long) kernel_thread_helper;
18722 regs.cs = __KERNEL_CS | get_kernel_rpl();
18723 @@ -247,13 +247,14 @@ int copy_thread(unsigned long clone_flags, unsigned long sp,
18724 struct task_struct *tsk;
18725 int err;
18726
18727 - childregs = task_pt_regs(p);
18728 + childregs = task_stack_page(p) + THREAD_SIZE - sizeof(struct pt_regs) - 8;
18729 *childregs = *regs;
18730 childregs->ax = 0;
18731 childregs->sp = sp;
18732
18733 p->thread.sp = (unsigned long) childregs;
18734 p->thread.sp0 = (unsigned long) (childregs+1);
18735 + p->tinfo.lowest_stack = (unsigned long)task_stack_page(p);
18736
18737 p->thread.ip = (unsigned long) ret_from_fork;
18738
18739 @@ -345,7 +346,7 @@ __switch_to(struct task_struct *prev_p, struct task_struct *next_p)
18740 struct thread_struct *prev = &prev_p->thread,
18741 *next = &next_p->thread;
18742 int cpu = smp_processor_id();
18743 - struct tss_struct *tss = &per_cpu(init_tss, cpu);
18744 + struct tss_struct *tss = init_tss + cpu;
18745 bool preload_fpu;
18746
18747 /* never put a printk in __switch_to... printk() calls wake_up*() indirectly */
18748 @@ -380,6 +381,10 @@ __switch_to(struct task_struct *prev_p, struct task_struct *next_p)
18749 */
18750 lazy_save_gs(prev->gs);
18751
18752 +#ifdef CONFIG_PAX_MEMORY_UDEREF
18753 + __set_fs(task_thread_info(next_p)->addr_limit);
18754 +#endif
18755 +
18756 /*
18757 * Load the per-thread Thread-Local Storage descriptor.
18758 */
18759 @@ -415,6 +420,9 @@ __switch_to(struct task_struct *prev_p, struct task_struct *next_p)
18760 */
18761 arch_end_context_switch(next_p);
18762
18763 + percpu_write(current_task, next_p);
18764 + percpu_write(current_tinfo, &next_p->tinfo);
18765 +
18766 if (preload_fpu)
18767 __math_state_restore();
18768
18769 @@ -424,8 +432,6 @@ __switch_to(struct task_struct *prev_p, struct task_struct *next_p)
18770 if (prev->gs | next->gs)
18771 lazy_load_gs(next->gs);
18772
18773 - percpu_write(current_task, next_p);
18774 -
18775 return prev_p;
18776 }
18777
18778 @@ -495,4 +501,3 @@ unsigned long get_wchan(struct task_struct *p)
18779 } while (count++ < 16);
18780 return 0;
18781 }
18782 -
18783 diff --git a/arch/x86/kernel/process_64.c b/arch/x86/kernel/process_64.c
18784 index 39493bc..196816d 100644
18785 --- a/arch/x86/kernel/process_64.c
18786 +++ b/arch/x86/kernel/process_64.c
18787 @@ -91,7 +91,7 @@ static void __exit_idle(void)
18788 void exit_idle(void)
18789 {
18790 /* idle loop has pid 0 */
18791 - if (current->pid)
18792 + if (task_pid_nr(current))
18793 return;
18794 __exit_idle();
18795 }
18796 @@ -170,7 +170,7 @@ void __show_regs(struct pt_regs *regs, int all)
18797 if (!board)
18798 board = "";
18799 printk(KERN_INFO "Pid: %d, comm: %.20s %s %s %.*s %s\n",
18800 - current->pid, current->comm, print_tainted(),
18801 + task_pid_nr(current), current->comm, print_tainted(),
18802 init_utsname()->release,
18803 (int)strcspn(init_utsname()->version, " "),
18804 init_utsname()->version, board);
18805 @@ -280,8 +280,7 @@ int copy_thread(unsigned long clone_flags, unsigned long sp,
18806 struct pt_regs *childregs;
18807 struct task_struct *me = current;
18808
18809 - childregs = ((struct pt_regs *)
18810 - (THREAD_SIZE + task_stack_page(p))) - 1;
18811 + childregs = task_stack_page(p) + THREAD_SIZE - sizeof(struct pt_regs) - 16;
18812 *childregs = *regs;
18813
18814 childregs->ax = 0;
18815 @@ -292,6 +291,7 @@ int copy_thread(unsigned long clone_flags, unsigned long sp,
18816 p->thread.sp = (unsigned long) childregs;
18817 p->thread.sp0 = (unsigned long) (childregs+1);
18818 p->thread.usersp = me->thread.usersp;
18819 + p->tinfo.lowest_stack = (unsigned long)task_stack_page(p);
18820
18821 set_tsk_thread_flag(p, TIF_FORK);
18822
18823 @@ -379,7 +379,7 @@ __switch_to(struct task_struct *prev_p, struct task_struct *next_p)
18824 struct thread_struct *prev = &prev_p->thread;
18825 struct thread_struct *next = &next_p->thread;
18826 int cpu = smp_processor_id();
18827 - struct tss_struct *tss = &per_cpu(init_tss, cpu);
18828 + struct tss_struct *tss = init_tss + cpu;
18829 unsigned fsindex, gsindex;
18830 bool preload_fpu;
18831
18832 @@ -475,10 +475,9 @@ __switch_to(struct task_struct *prev_p, struct task_struct *next_p)
18833 prev->usersp = percpu_read(old_rsp);
18834 percpu_write(old_rsp, next->usersp);
18835 percpu_write(current_task, next_p);
18836 + percpu_write(current_tinfo, &next_p->tinfo);
18837
18838 - percpu_write(kernel_stack,
18839 - (unsigned long)task_stack_page(next_p) +
18840 - THREAD_SIZE - KERNEL_STACK_OFFSET);
18841 + percpu_write(kernel_stack, next->sp0);
18842
18843 /*
18844 * Now maybe reload the debug registers and handle I/O bitmaps
18845 @@ -559,12 +558,11 @@ unsigned long get_wchan(struct task_struct *p)
18846 if (!p || p == current || p->state == TASK_RUNNING)
18847 return 0;
18848 stack = (unsigned long)task_stack_page(p);
18849 - if (p->thread.sp < stack || p->thread.sp >= stack+THREAD_SIZE)
18850 + if (p->thread.sp < stack || p->thread.sp > stack+THREAD_SIZE-16-sizeof(u64))
18851 return 0;
18852 fp = *(u64 *)(p->thread.sp);
18853 do {
18854 - if (fp < (unsigned long)stack ||
18855 - fp >= (unsigned long)stack+THREAD_SIZE)
18856 + if (fp < stack || fp > stack+THREAD_SIZE-16-sizeof(u64))
18857 return 0;
18858 ip = *(u64 *)(fp+8);
18859 if (!in_sched_functions(ip))
18860 diff --git a/arch/x86/kernel/ptrace.c b/arch/x86/kernel/ptrace.c
18861 index c06acdd..3f5fff5 100644
18862 --- a/arch/x86/kernel/ptrace.c
18863 +++ b/arch/x86/kernel/ptrace.c
18864 @@ -925,7 +925,7 @@ static const struct user_regset_view user_x86_32_view; /* Initialized below. */
18865 long arch_ptrace(struct task_struct *child, long request, long addr, long data)
18866 {
18867 int ret;
18868 - unsigned long __user *datap = (unsigned long __user *)data;
18869 + unsigned long __user *datap = (__force unsigned long __user *)data;
18870
18871 switch (request) {
18872 /* read the word at location addr in the USER area. */
18873 @@ -1012,14 +1012,14 @@ long arch_ptrace(struct task_struct *child, long request, long addr, long data)
18874 if (addr < 0)
18875 return -EIO;
18876 ret = do_get_thread_area(child, addr,
18877 - (struct user_desc __user *) data);
18878 + (__force struct user_desc __user *) data);
18879 break;
18880
18881 case PTRACE_SET_THREAD_AREA:
18882 if (addr < 0)
18883 return -EIO;
18884 ret = do_set_thread_area(child, addr,
18885 - (struct user_desc __user *) data, 0);
18886 + (__force struct user_desc __user *) data, 0);
18887 break;
18888 #endif
18889
18890 @@ -1038,12 +1038,12 @@ long arch_ptrace(struct task_struct *child, long request, long addr, long data)
18891 #ifdef CONFIG_X86_PTRACE_BTS
18892 case PTRACE_BTS_CONFIG:
18893 ret = ptrace_bts_config
18894 - (child, data, (struct ptrace_bts_config __user *)addr);
18895 + (child, data, (__force struct ptrace_bts_config __user *)addr);
18896 break;
18897
18898 case PTRACE_BTS_STATUS:
18899 ret = ptrace_bts_status
18900 - (child, data, (struct ptrace_bts_config __user *)addr);
18901 + (child, data, (__force struct ptrace_bts_config __user *)addr);
18902 break;
18903
18904 case PTRACE_BTS_SIZE:
18905 @@ -1052,7 +1052,7 @@ long arch_ptrace(struct task_struct *child, long request, long addr, long data)
18906
18907 case PTRACE_BTS_GET:
18908 ret = ptrace_bts_read_record
18909 - (child, data, (struct bts_struct __user *) addr);
18910 + (child, data, (__force struct bts_struct __user *) addr);
18911 break;
18912
18913 case PTRACE_BTS_CLEAR:
18914 @@ -1061,7 +1061,7 @@ long arch_ptrace(struct task_struct *child, long request, long addr, long data)
18915
18916 case PTRACE_BTS_DRAIN:
18917 ret = ptrace_bts_drain
18918 - (child, data, (struct bts_struct __user *) addr);
18919 + (child, data, (__force struct bts_struct __user *) addr);
18920 break;
18921 #endif /* CONFIG_X86_PTRACE_BTS */
18922
18923 @@ -1450,7 +1450,7 @@ void send_sigtrap(struct task_struct *tsk, struct pt_regs *regs,
18924 info.si_code = si_code;
18925
18926 /* User-mode ip? */
18927 - info.si_addr = user_mode_vm(regs) ? (void __user *) regs->ip : NULL;
18928 + info.si_addr = user_mode(regs) ? (__force void __user *) regs->ip : NULL;
18929
18930 /* Send us the fake SIGTRAP */
18931 force_sig_info(SIGTRAP, &info, tsk);
18932 @@ -1469,7 +1469,7 @@ void send_sigtrap(struct task_struct *tsk, struct pt_regs *regs,
18933 * We must return the syscall number to actually look up in the table.
18934 * This can be -1L to skip running any syscall at all.
18935 */
18936 -asmregparm long syscall_trace_enter(struct pt_regs *regs)
18937 +long syscall_trace_enter(struct pt_regs *regs)
18938 {
18939 long ret = 0;
18940
18941 @@ -1514,7 +1514,7 @@ asmregparm long syscall_trace_enter(struct pt_regs *regs)
18942 return ret ?: regs->orig_ax;
18943 }
18944
18945 -asmregparm void syscall_trace_leave(struct pt_regs *regs)
18946 +void syscall_trace_leave(struct pt_regs *regs)
18947 {
18948 if (unlikely(current->audit_context))
18949 audit_syscall_exit(AUDITSC_RESULT(regs->ax), regs->ax);
18950 diff --git a/arch/x86/kernel/reboot.c b/arch/x86/kernel/reboot.c
18951 index cf98100..e76e03d 100644
18952 --- a/arch/x86/kernel/reboot.c
18953 +++ b/arch/x86/kernel/reboot.c
18954 @@ -33,7 +33,7 @@ void (*pm_power_off)(void);
18955 EXPORT_SYMBOL(pm_power_off);
18956
18957 static const struct desc_ptr no_idt = {};
18958 -static int reboot_mode;
18959 +static unsigned short reboot_mode;
18960 enum reboot_type reboot_type = BOOT_KBD;
18961 int reboot_force;
18962
18963 @@ -292,12 +292,12 @@ core_initcall(reboot_init);
18964 controller to pulse the CPU reset line, which is more thorough, but
18965 doesn't work with at least one type of 486 motherboard. It is easy
18966 to stop this code working; hence the copious comments. */
18967 -static const unsigned long long
18968 -real_mode_gdt_entries [3] =
18969 +static struct desc_struct
18970 +real_mode_gdt_entries [3] __read_only =
18971 {
18972 - 0x0000000000000000ULL, /* Null descriptor */
18973 - 0x00009b000000ffffULL, /* 16-bit real-mode 64k code at 0x00000000 */
18974 - 0x000093000100ffffULL /* 16-bit real-mode 64k data at 0x00000100 */
18975 + GDT_ENTRY_INIT(0, 0, 0), /* Null descriptor */
18976 + GDT_ENTRY_INIT(0x9b, 0, 0xffff), /* 16-bit real-mode 64k code at 0x00000000 */
18977 + GDT_ENTRY_INIT(0x93, 0x100, 0xffff) /* 16-bit real-mode 64k data at 0x00000100 */
18978 };
18979
18980 static const struct desc_ptr
18981 @@ -346,7 +346,7 @@ static const unsigned char jump_to_bios [] =
18982 * specified by the code and length parameters.
18983 * We assume that length will aways be less that 100!
18984 */
18985 -void machine_real_restart(const unsigned char *code, int length)
18986 +__noreturn void machine_real_restart(const unsigned char *code, unsigned int length)
18987 {
18988 local_irq_disable();
18989
18990 @@ -366,8 +366,8 @@ void machine_real_restart(const unsigned char *code, int length)
18991 /* Remap the kernel at virtual address zero, as well as offset zero
18992 from the kernel segment. This assumes the kernel segment starts at
18993 virtual address PAGE_OFFSET. */
18994 - memcpy(swapper_pg_dir, swapper_pg_dir + KERNEL_PGD_BOUNDARY,
18995 - sizeof(swapper_pg_dir [0]) * KERNEL_PGD_PTRS);
18996 + clone_pgd_range(swapper_pg_dir, swapper_pg_dir + KERNEL_PGD_BOUNDARY,
18997 + min_t(unsigned long, KERNEL_PGD_PTRS, KERNEL_PGD_BOUNDARY));
18998
18999 /*
19000 * Use `swapper_pg_dir' as our page directory.
19001 @@ -379,16 +379,15 @@ void machine_real_restart(const unsigned char *code, int length)
19002 boot)". This seems like a fairly standard thing that gets set by
19003 REBOOT.COM programs, and the previous reset routine did this
19004 too. */
19005 - *((unsigned short *)0x472) = reboot_mode;
19006 + *(unsigned short *)(__va(0x472)) = reboot_mode;
19007
19008 /* For the switch to real mode, copy some code to low memory. It has
19009 to be in the first 64k because it is running in 16-bit mode, and it
19010 has to have the same physical and virtual address, because it turns
19011 off paging. Copy it near the end of the first page, out of the way
19012 of BIOS variables. */
19013 - memcpy((void *)(0x1000 - sizeof(real_mode_switch) - 100),
19014 - real_mode_switch, sizeof (real_mode_switch));
19015 - memcpy((void *)(0x1000 - 100), code, length);
19016 + memcpy(__va(0x1000 - sizeof (real_mode_switch) - 100), real_mode_switch, sizeof (real_mode_switch));
19017 + memcpy(__va(0x1000 - 100), code, length);
19018
19019 /* Set up the IDT for real mode. */
19020 load_idt(&real_mode_idt);
19021 @@ -416,6 +415,7 @@ void machine_real_restart(const unsigned char *code, int length)
19022 __asm__ __volatile__ ("ljmp $0x0008,%0"
19023 :
19024 : "i" ((void *)(0x1000 - sizeof (real_mode_switch) - 100)));
19025 + do { } while (1);
19026 }
19027 #ifdef CONFIG_APM_MODULE
19028 EXPORT_SYMBOL(machine_real_restart);
19029 @@ -544,7 +544,7 @@ void __attribute__((weak)) mach_reboot_fixups(void)
19030 {
19031 }
19032
19033 -static void native_machine_emergency_restart(void)
19034 +__noreturn static void native_machine_emergency_restart(void)
19035 {
19036 int i;
19037
19038 @@ -659,13 +659,13 @@ void native_machine_shutdown(void)
19039 #endif
19040 }
19041
19042 -static void __machine_emergency_restart(int emergency)
19043 +static __noreturn void __machine_emergency_restart(int emergency)
19044 {
19045 reboot_emergency = emergency;
19046 machine_ops.emergency_restart();
19047 }
19048
19049 -static void native_machine_restart(char *__unused)
19050 +static __noreturn void native_machine_restart(char *__unused)
19051 {
19052 printk("machine restart\n");
19053
19054 @@ -674,7 +674,7 @@ static void native_machine_restart(char *__unused)
19055 __machine_emergency_restart(0);
19056 }
19057
19058 -static void native_machine_halt(void)
19059 +static __noreturn void native_machine_halt(void)
19060 {
19061 /* stop other cpus and apics */
19062 machine_shutdown();
19063 @@ -685,7 +685,7 @@ static void native_machine_halt(void)
19064 stop_this_cpu(NULL);
19065 }
19066
19067 -static void native_machine_power_off(void)
19068 +__noreturn static void native_machine_power_off(void)
19069 {
19070 if (pm_power_off) {
19071 if (!reboot_force)
19072 @@ -694,6 +694,7 @@ static void native_machine_power_off(void)
19073 }
19074 /* a fallback in case there is no PM info available */
19075 tboot_shutdown(TB_SHUTDOWN_HALT);
19076 + do { } while (1);
19077 }
19078
19079 struct machine_ops machine_ops = {
19080 diff --git a/arch/x86/kernel/relocate_kernel_64.S b/arch/x86/kernel/relocate_kernel_64.S
19081 index 7a6f3b3..976a959 100644
19082 --- a/arch/x86/kernel/relocate_kernel_64.S
19083 +++ b/arch/x86/kernel/relocate_kernel_64.S
19084 @@ -11,6 +11,7 @@
19085 #include <asm/kexec.h>
19086 #include <asm/processor-flags.h>
19087 #include <asm/pgtable_types.h>
19088 +#include <asm/alternative-asm.h>
19089
19090 /*
19091 * Must be relocatable PIC code callable as a C function
19092 @@ -167,6 +168,7 @@ identity_mapped:
19093 xorq %r14, %r14
19094 xorq %r15, %r15
19095
19096 + pax_force_retaddr 0, 1
19097 ret
19098
19099 1:
19100 diff --git a/arch/x86/kernel/setup.c b/arch/x86/kernel/setup.c
19101 index 5449a26..0b6c759 100644
19102 --- a/arch/x86/kernel/setup.c
19103 +++ b/arch/x86/kernel/setup.c
19104 @@ -783,14 +783,14 @@ void __init setup_arch(char **cmdline_p)
19105
19106 if (!boot_params.hdr.root_flags)
19107 root_mountflags &= ~MS_RDONLY;
19108 - init_mm.start_code = (unsigned long) _text;
19109 - init_mm.end_code = (unsigned long) _etext;
19110 + init_mm.start_code = ktla_ktva((unsigned long) _text);
19111 + init_mm.end_code = ktla_ktva((unsigned long) _etext);
19112 init_mm.end_data = (unsigned long) _edata;
19113 init_mm.brk = _brk_end;
19114
19115 - code_resource.start = virt_to_phys(_text);
19116 - code_resource.end = virt_to_phys(_etext)-1;
19117 - data_resource.start = virt_to_phys(_etext);
19118 + code_resource.start = virt_to_phys(ktla_ktva(_text));
19119 + code_resource.end = virt_to_phys(ktla_ktva(_etext))-1;
19120 + data_resource.start = virt_to_phys(_sdata);
19121 data_resource.end = virt_to_phys(_edata)-1;
19122 bss_resource.start = virt_to_phys(&__bss_start);
19123 bss_resource.end = virt_to_phys(&__bss_stop)-1;
19124 diff --git a/arch/x86/kernel/setup_percpu.c b/arch/x86/kernel/setup_percpu.c
19125 index d559af9..524c6ad 100644
19126 --- a/arch/x86/kernel/setup_percpu.c
19127 +++ b/arch/x86/kernel/setup_percpu.c
19128 @@ -25,19 +25,17 @@
19129 # define DBG(x...)
19130 #endif
19131
19132 -DEFINE_PER_CPU(int, cpu_number);
19133 +#ifdef CONFIG_SMP
19134 +DEFINE_PER_CPU(unsigned int, cpu_number);
19135 EXPORT_PER_CPU_SYMBOL(cpu_number);
19136 +#endif
19137
19138 -#ifdef CONFIG_X86_64
19139 #define BOOT_PERCPU_OFFSET ((unsigned long)__per_cpu_load)
19140 -#else
19141 -#define BOOT_PERCPU_OFFSET 0
19142 -#endif
19143
19144 DEFINE_PER_CPU(unsigned long, this_cpu_off) = BOOT_PERCPU_OFFSET;
19145 EXPORT_PER_CPU_SYMBOL(this_cpu_off);
19146
19147 -unsigned long __per_cpu_offset[NR_CPUS] __read_mostly = {
19148 +unsigned long __per_cpu_offset[NR_CPUS] __read_only = {
19149 [0 ... NR_CPUS-1] = BOOT_PERCPU_OFFSET,
19150 };
19151 EXPORT_SYMBOL(__per_cpu_offset);
19152 @@ -159,10 +157,10 @@ static inline void setup_percpu_segment(int cpu)
19153 {
19154 #ifdef CONFIG_X86_32
19155 struct desc_struct gdt;
19156 + unsigned long base = per_cpu_offset(cpu);
19157
19158 - pack_descriptor(&gdt, per_cpu_offset(cpu), 0xFFFFF,
19159 - 0x2 | DESCTYPE_S, 0x8);
19160 - gdt.s = 1;
19161 + pack_descriptor(&gdt, base, (VMALLOC_END - base - 1) >> PAGE_SHIFT,
19162 + 0x83 | DESCTYPE_S, 0xC);
19163 write_gdt_entry(get_cpu_gdt_table(cpu),
19164 GDT_ENTRY_PERCPU, &gdt, DESCTYPE_S);
19165 #endif
19166 @@ -212,6 +210,11 @@ void __init setup_per_cpu_areas(void)
19167 /* alrighty, percpu areas up and running */
19168 delta = (unsigned long)pcpu_base_addr - (unsigned long)__per_cpu_start;
19169 for_each_possible_cpu(cpu) {
19170 +#ifdef CONFIG_CC_STACKPROTECTOR
19171 +#ifdef CONFIG_X86_32
19172 + unsigned long canary = per_cpu(stack_canary.canary, cpu);
19173 +#endif
19174 +#endif
19175 per_cpu_offset(cpu) = delta + pcpu_unit_offsets[cpu];
19176 per_cpu(this_cpu_off, cpu) = per_cpu_offset(cpu);
19177 per_cpu(cpu_number, cpu) = cpu;
19178 @@ -239,6 +242,12 @@ void __init setup_per_cpu_areas(void)
19179 early_per_cpu_map(x86_cpu_to_node_map, cpu);
19180 #endif
19181 #endif
19182 +#ifdef CONFIG_CC_STACKPROTECTOR
19183 +#ifdef CONFIG_X86_32
19184 + if (!cpu)
19185 + per_cpu(stack_canary.canary, cpu) = canary;
19186 +#endif
19187 +#endif
19188 /*
19189 * Up to this point, the boot CPU has been using .data.init
19190 * area. Reload any changed state for the boot CPU.
19191 diff --git a/arch/x86/kernel/signal.c b/arch/x86/kernel/signal.c
19192 index 6a44a76..a9287a1 100644
19193 --- a/arch/x86/kernel/signal.c
19194 +++ b/arch/x86/kernel/signal.c
19195 @@ -197,7 +197,7 @@ static unsigned long align_sigframe(unsigned long sp)
19196 * Align the stack pointer according to the i386 ABI,
19197 * i.e. so that on function entry ((sp + 4) & 15) == 0.
19198 */
19199 - sp = ((sp + 4) & -16ul) - 4;
19200 + sp = ((sp - 12) & -16ul) - 4;
19201 #else /* !CONFIG_X86_32 */
19202 sp = round_down(sp, 16) - 8;
19203 #endif
19204 @@ -248,11 +248,11 @@ get_sigframe(struct k_sigaction *ka, struct pt_regs *regs, size_t frame_size,
19205 * Return an always-bogus address instead so we will die with SIGSEGV.
19206 */
19207 if (onsigstack && !likely(on_sig_stack(sp)))
19208 - return (void __user *)-1L;
19209 + return (__force void __user *)-1L;
19210
19211 /* save i387 state */
19212 if (used_math() && save_i387_xstate(*fpstate) < 0)
19213 - return (void __user *)-1L;
19214 + return (__force void __user *)-1L;
19215
19216 return (void __user *)sp;
19217 }
19218 @@ -307,9 +307,9 @@ __setup_frame(int sig, struct k_sigaction *ka, sigset_t *set,
19219 }
19220
19221 if (current->mm->context.vdso)
19222 - restorer = VDSO32_SYMBOL(current->mm->context.vdso, sigreturn);
19223 + restorer = (__force void __user *)VDSO32_SYMBOL(current->mm->context.vdso, sigreturn);
19224 else
19225 - restorer = &frame->retcode;
19226 + restorer = (void __user *)&frame->retcode;
19227 if (ka->sa.sa_flags & SA_RESTORER)
19228 restorer = ka->sa.sa_restorer;
19229
19230 @@ -323,7 +323,7 @@ __setup_frame(int sig, struct k_sigaction *ka, sigset_t *set,
19231 * reasons and because gdb uses it as a signature to notice
19232 * signal handler stack frames.
19233 */
19234 - err |= __put_user(*((u64 *)&retcode), (u64 *)frame->retcode);
19235 + err |= __put_user(*((u64 *)&retcode), (u64 __user *)frame->retcode);
19236
19237 if (err)
19238 return -EFAULT;
19239 @@ -377,7 +377,10 @@ static int __setup_rt_frame(int sig, struct k_sigaction *ka, siginfo_t *info,
19240 err |= __copy_to_user(&frame->uc.uc_sigmask, set, sizeof(*set));
19241
19242 /* Set up to return from userspace. */
19243 - restorer = VDSO32_SYMBOL(current->mm->context.vdso, rt_sigreturn);
19244 + if (current->mm->context.vdso)
19245 + restorer = (__force void __user *)VDSO32_SYMBOL(current->mm->context.vdso, rt_sigreturn);
19246 + else
19247 + restorer = (void __user *)&frame->retcode;
19248 if (ka->sa.sa_flags & SA_RESTORER)
19249 restorer = ka->sa.sa_restorer;
19250 put_user_ex(restorer, &frame->pretcode);
19251 @@ -389,7 +392,7 @@ static int __setup_rt_frame(int sig, struct k_sigaction *ka, siginfo_t *info,
19252 * reasons and because gdb uses it as a signature to notice
19253 * signal handler stack frames.
19254 */
19255 - put_user_ex(*((u64 *)&rt_retcode), (u64 *)frame->retcode);
19256 + put_user_ex(*((u64 *)&rt_retcode), (u64 __user *)frame->retcode);
19257 } put_user_catch(err);
19258
19259 if (err)
19260 @@ -782,6 +785,8 @@ static void do_signal(struct pt_regs *regs)
19261 int signr;
19262 sigset_t *oldset;
19263
19264 + pax_track_stack();
19265 +
19266 /*
19267 * We want the common case to go fast, which is why we may in certain
19268 * cases get here from kernel mode. Just return without doing anything
19269 @@ -789,7 +794,7 @@ static void do_signal(struct pt_regs *regs)
19270 * X86_32: vm86 regs switched out by assembly code before reaching
19271 * here, so testing against kernel CS suffices.
19272 */
19273 - if (!user_mode(regs))
19274 + if (!user_mode_novm(regs))
19275 return;
19276
19277 if (current_thread_info()->status & TS_RESTORE_SIGMASK)
19278 diff --git a/arch/x86/kernel/smpboot.c b/arch/x86/kernel/smpboot.c
19279 index 7e8e905..64d5c32 100644
19280 --- a/arch/x86/kernel/smpboot.c
19281 +++ b/arch/x86/kernel/smpboot.c
19282 @@ -94,14 +94,14 @@ static DEFINE_PER_CPU(struct task_struct *, idle_thread_array);
19283 */
19284 static DEFINE_MUTEX(x86_cpu_hotplug_driver_mutex);
19285
19286 -void cpu_hotplug_driver_lock()
19287 +void cpu_hotplug_driver_lock(void)
19288 {
19289 - mutex_lock(&x86_cpu_hotplug_driver_mutex);
19290 + mutex_lock(&x86_cpu_hotplug_driver_mutex);
19291 }
19292
19293 -void cpu_hotplug_driver_unlock()
19294 +void cpu_hotplug_driver_unlock(void)
19295 {
19296 - mutex_unlock(&x86_cpu_hotplug_driver_mutex);
19297 + mutex_unlock(&x86_cpu_hotplug_driver_mutex);
19298 }
19299
19300 ssize_t arch_cpu_probe(const char *buf, size_t count) { return -1; }
19301 @@ -625,7 +625,7 @@ wakeup_secondary_cpu_via_init(int phys_apicid, unsigned long start_eip)
19302 * target processor state.
19303 */
19304 startup_ipi_hook(phys_apicid, (unsigned long) start_secondary,
19305 - (unsigned long)stack_start.sp);
19306 + stack_start);
19307
19308 /*
19309 * Run STARTUP IPI loop.
19310 @@ -743,6 +743,7 @@ static int __cpuinit do_boot_cpu(int apicid, int cpu)
19311 set_idle_for_cpu(cpu, c_idle.idle);
19312 do_rest:
19313 per_cpu(current_task, cpu) = c_idle.idle;
19314 + per_cpu(current_tinfo, cpu) = &c_idle.idle->tinfo;
19315 #ifdef CONFIG_X86_32
19316 /* Stack for startup_32 can be just as for start_secondary onwards */
19317 irq_ctx_init(cpu);
19318 @@ -750,13 +751,15 @@ do_rest:
19319 #else
19320 clear_tsk_thread_flag(c_idle.idle, TIF_FORK);
19321 initial_gs = per_cpu_offset(cpu);
19322 - per_cpu(kernel_stack, cpu) =
19323 - (unsigned long)task_stack_page(c_idle.idle) -
19324 - KERNEL_STACK_OFFSET + THREAD_SIZE;
19325 + per_cpu(kernel_stack, cpu) = (unsigned long)task_stack_page(c_idle.idle) - 16 + THREAD_SIZE;
19326 #endif
19327 +
19328 + pax_open_kernel();
19329 early_gdt_descr.address = (unsigned long)get_cpu_gdt_table(cpu);
19330 + pax_close_kernel();
19331 +
19332 initial_code = (unsigned long)start_secondary;
19333 - stack_start.sp = (void *) c_idle.idle->thread.sp;
19334 + stack_start = c_idle.idle->thread.sp;
19335
19336 /* start_ip had better be page-aligned! */
19337 start_ip = setup_trampoline();
19338 @@ -891,6 +894,12 @@ int __cpuinit native_cpu_up(unsigned int cpu)
19339
19340 per_cpu(cpu_state, cpu) = CPU_UP_PREPARE;
19341
19342 +#ifdef CONFIG_PAX_PER_CPU_PGD
19343 + clone_pgd_range(get_cpu_pgd(cpu) + KERNEL_PGD_BOUNDARY,
19344 + swapper_pg_dir + KERNEL_PGD_BOUNDARY,
19345 + KERNEL_PGD_PTRS);
19346 +#endif
19347 +
19348 err = do_boot_cpu(apicid, cpu);
19349
19350 if (err) {
19351 diff --git a/arch/x86/kernel/step.c b/arch/x86/kernel/step.c
19352 index 3149032..14f1053 100644
19353 --- a/arch/x86/kernel/step.c
19354 +++ b/arch/x86/kernel/step.c
19355 @@ -27,10 +27,10 @@ unsigned long convert_ip_to_linear(struct task_struct *child, struct pt_regs *re
19356 struct desc_struct *desc;
19357 unsigned long base;
19358
19359 - seg &= ~7UL;
19360 + seg >>= 3;
19361
19362 mutex_lock(&child->mm->context.lock);
19363 - if (unlikely((seg >> 3) >= child->mm->context.size))
19364 + if (unlikely(seg >= child->mm->context.size))
19365 addr = -1L; /* bogus selector, access would fault */
19366 else {
19367 desc = child->mm->context.ldt + seg;
19368 @@ -42,7 +42,8 @@ unsigned long convert_ip_to_linear(struct task_struct *child, struct pt_regs *re
19369 addr += base;
19370 }
19371 mutex_unlock(&child->mm->context.lock);
19372 - }
19373 + } else if (seg == __KERNEL_CS || seg == __KERNEXEC_KERNEL_CS)
19374 + addr = ktla_ktva(addr);
19375
19376 return addr;
19377 }
19378 @@ -53,6 +54,9 @@ static int is_setting_trap_flag(struct task_struct *child, struct pt_regs *regs)
19379 unsigned char opcode[15];
19380 unsigned long addr = convert_ip_to_linear(child, regs);
19381
19382 + if (addr == -EINVAL)
19383 + return 0;
19384 +
19385 copied = access_process_vm(child, addr, opcode, sizeof(opcode), 0);
19386 for (i = 0; i < copied; i++) {
19387 switch (opcode[i]) {
19388 @@ -74,7 +78,7 @@ static int is_setting_trap_flag(struct task_struct *child, struct pt_regs *regs)
19389
19390 #ifdef CONFIG_X86_64
19391 case 0x40 ... 0x4f:
19392 - if (regs->cs != __USER_CS)
19393 + if ((regs->cs & 0xffff) != __USER_CS)
19394 /* 32-bit mode: register increment */
19395 return 0;
19396 /* 64-bit mode: REX prefix */
19397 diff --git a/arch/x86/kernel/sys_i386_32.c b/arch/x86/kernel/sys_i386_32.c
19398 index dee1ff7..a397f7f 100644
19399 --- a/arch/x86/kernel/sys_i386_32.c
19400 +++ b/arch/x86/kernel/sys_i386_32.c
19401 @@ -24,6 +24,21 @@
19402
19403 #include <asm/syscalls.h>
19404
19405 +int i386_mmap_check(unsigned long addr, unsigned long len, unsigned long flags)
19406 +{
19407 + unsigned long pax_task_size = TASK_SIZE;
19408 +
19409 +#ifdef CONFIG_PAX_SEGMEXEC
19410 + if (current->mm->pax_flags & MF_PAX_SEGMEXEC)
19411 + pax_task_size = SEGMEXEC_TASK_SIZE;
19412 +#endif
19413 +
19414 + if (len > pax_task_size || addr > pax_task_size - len)
19415 + return -EINVAL;
19416 +
19417 + return 0;
19418 +}
19419 +
19420 /*
19421 * Perform the select(nd, in, out, ex, tv) and mmap() system
19422 * calls. Linux/i386 didn't use to be able to handle more than
19423 @@ -58,6 +73,212 @@ out:
19424 return err;
19425 }
19426
19427 +unsigned long
19428 +arch_get_unmapped_area(struct file *filp, unsigned long addr,
19429 + unsigned long len, unsigned long pgoff, unsigned long flags)
19430 +{
19431 + struct mm_struct *mm = current->mm;
19432 + struct vm_area_struct *vma;
19433 + unsigned long start_addr, pax_task_size = TASK_SIZE;
19434 +
19435 +#ifdef CONFIG_PAX_SEGMEXEC
19436 + if (mm->pax_flags & MF_PAX_SEGMEXEC)
19437 + pax_task_size = SEGMEXEC_TASK_SIZE;
19438 +#endif
19439 +
19440 + pax_task_size -= PAGE_SIZE;
19441 +
19442 + if (len > pax_task_size)
19443 + return -ENOMEM;
19444 +
19445 + if (flags & MAP_FIXED)
19446 + return addr;
19447 +
19448 +#ifdef CONFIG_PAX_RANDMMAP
19449 + if (!(mm->pax_flags & MF_PAX_RANDMMAP))
19450 +#endif
19451 +
19452 + if (addr) {
19453 + addr = PAGE_ALIGN(addr);
19454 + if (pax_task_size - len >= addr) {
19455 + vma = find_vma(mm, addr);
19456 + if (check_heap_stack_gap(vma, addr, len))
19457 + return addr;
19458 + }
19459 + }
19460 + if (len > mm->cached_hole_size) {
19461 + start_addr = addr = mm->free_area_cache;
19462 + } else {
19463 + start_addr = addr = mm->mmap_base;
19464 + mm->cached_hole_size = 0;
19465 + }
19466 +
19467 +#ifdef CONFIG_PAX_PAGEEXEC
19468 + if (!nx_enabled && (mm->pax_flags & MF_PAX_PAGEEXEC) && (flags & MAP_EXECUTABLE) && start_addr >= mm->mmap_base) {
19469 + start_addr = 0x00110000UL;
19470 +
19471 +#ifdef CONFIG_PAX_RANDMMAP
19472 + if (mm->pax_flags & MF_PAX_RANDMMAP)
19473 + start_addr += mm->delta_mmap & 0x03FFF000UL;
19474 +#endif
19475 +
19476 + if (mm->start_brk <= start_addr && start_addr < mm->mmap_base)
19477 + start_addr = addr = mm->mmap_base;
19478 + else
19479 + addr = start_addr;
19480 + }
19481 +#endif
19482 +
19483 +full_search:
19484 + for (vma = find_vma(mm, addr); ; vma = vma->vm_next) {
19485 + /* At this point: (!vma || addr < vma->vm_end). */
19486 + if (pax_task_size - len < addr) {
19487 + /*
19488 + * Start a new search - just in case we missed
19489 + * some holes.
19490 + */
19491 + if (start_addr != mm->mmap_base) {
19492 + start_addr = addr = mm->mmap_base;
19493 + mm->cached_hole_size = 0;
19494 + goto full_search;
19495 + }
19496 + return -ENOMEM;
19497 + }
19498 + if (check_heap_stack_gap(vma, addr, len))
19499 + break;
19500 + if (addr + mm->cached_hole_size < vma->vm_start)
19501 + mm->cached_hole_size = vma->vm_start - addr;
19502 + addr = vma->vm_end;
19503 + if (mm->start_brk <= addr && addr < mm->mmap_base) {
19504 + start_addr = addr = mm->mmap_base;
19505 + mm->cached_hole_size = 0;
19506 + goto full_search;
19507 + }
19508 + }
19509 +
19510 + /*
19511 + * Remember the place where we stopped the search:
19512 + */
19513 + mm->free_area_cache = addr + len;
19514 + return addr;
19515 +}
19516 +
19517 +unsigned long
19518 +arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
19519 + const unsigned long len, const unsigned long pgoff,
19520 + const unsigned long flags)
19521 +{
19522 + struct vm_area_struct *vma;
19523 + struct mm_struct *mm = current->mm;
19524 + unsigned long base = mm->mmap_base, addr = addr0, pax_task_size = TASK_SIZE;
19525 +
19526 +#ifdef CONFIG_PAX_SEGMEXEC
19527 + if (mm->pax_flags & MF_PAX_SEGMEXEC)
19528 + pax_task_size = SEGMEXEC_TASK_SIZE;
19529 +#endif
19530 +
19531 + pax_task_size -= PAGE_SIZE;
19532 +
19533 + /* requested length too big for entire address space */
19534 + if (len > pax_task_size)
19535 + return -ENOMEM;
19536 +
19537 + if (flags & MAP_FIXED)
19538 + return addr;
19539 +
19540 +#ifdef CONFIG_PAX_PAGEEXEC
19541 + if (!nx_enabled && (mm->pax_flags & MF_PAX_PAGEEXEC) && (flags & MAP_EXECUTABLE))
19542 + goto bottomup;
19543 +#endif
19544 +
19545 +#ifdef CONFIG_PAX_RANDMMAP
19546 + if (!(mm->pax_flags & MF_PAX_RANDMMAP))
19547 +#endif
19548 +
19549 + /* requesting a specific address */
19550 + if (addr) {
19551 + addr = PAGE_ALIGN(addr);
19552 + if (pax_task_size - len >= addr) {
19553 + vma = find_vma(mm, addr);
19554 + if (check_heap_stack_gap(vma, addr, len))
19555 + return addr;
19556 + }
19557 + }
19558 +
19559 + /* check if free_area_cache is useful for us */
19560 + if (len <= mm->cached_hole_size) {
19561 + mm->cached_hole_size = 0;
19562 + mm->free_area_cache = mm->mmap_base;
19563 + }
19564 +
19565 + /* either no address requested or can't fit in requested address hole */
19566 + addr = mm->free_area_cache;
19567 +
19568 + /* make sure it can fit in the remaining address space */
19569 + if (addr > len) {
19570 + vma = find_vma(mm, addr-len);
19571 + if (check_heap_stack_gap(vma, addr - len, len))
19572 + /* remember the address as a hint for next time */
19573 + return (mm->free_area_cache = addr-len);
19574 + }
19575 +
19576 + if (mm->mmap_base < len)
19577 + goto bottomup;
19578 +
19579 + addr = mm->mmap_base-len;
19580 +
19581 + do {
19582 + /*
19583 + * Lookup failure means no vma is above this address,
19584 + * else if new region fits below vma->vm_start,
19585 + * return with success:
19586 + */
19587 + vma = find_vma(mm, addr);
19588 + if (check_heap_stack_gap(vma, addr, len))
19589 + /* remember the address as a hint for next time */
19590 + return (mm->free_area_cache = addr);
19591 +
19592 + /* remember the largest hole we saw so far */
19593 + if (addr + mm->cached_hole_size < vma->vm_start)
19594 + mm->cached_hole_size = vma->vm_start - addr;
19595 +
19596 + /* try just below the current vma->vm_start */
19597 + addr = skip_heap_stack_gap(vma, len);
19598 + } while (!IS_ERR_VALUE(addr));
19599 +
19600 +bottomup:
19601 + /*
19602 + * A failed mmap() very likely causes application failure,
19603 + * so fall back to the bottom-up function here. This scenario
19604 + * can happen with large stack limits and large mmap()
19605 + * allocations.
19606 + */
19607 +
19608 +#ifdef CONFIG_PAX_SEGMEXEC
19609 + if (mm->pax_flags & MF_PAX_SEGMEXEC)
19610 + mm->mmap_base = SEGMEXEC_TASK_UNMAPPED_BASE;
19611 + else
19612 +#endif
19613 +
19614 + mm->mmap_base = TASK_UNMAPPED_BASE;
19615 +
19616 +#ifdef CONFIG_PAX_RANDMMAP
19617 + if (mm->pax_flags & MF_PAX_RANDMMAP)
19618 + mm->mmap_base += mm->delta_mmap;
19619 +#endif
19620 +
19621 + mm->free_area_cache = mm->mmap_base;
19622 + mm->cached_hole_size = ~0UL;
19623 + addr = arch_get_unmapped_area(filp, addr0, len, pgoff, flags);
19624 + /*
19625 + * Restore the topdown base:
19626 + */
19627 + mm->mmap_base = base;
19628 + mm->free_area_cache = base;
19629 + mm->cached_hole_size = ~0UL;
19630 +
19631 + return addr;
19632 +}
19633
19634 struct sel_arg_struct {
19635 unsigned long n;
19636 @@ -93,7 +314,7 @@ asmlinkage int sys_ipc(uint call, int first, int second,
19637 return sys_semtimedop(first, (struct sembuf __user *)ptr, second, NULL);
19638 case SEMTIMEDOP:
19639 return sys_semtimedop(first, (struct sembuf __user *)ptr, second,
19640 - (const struct timespec __user *)fifth);
19641 + (__force const struct timespec __user *)fifth);
19642
19643 case SEMGET:
19644 return sys_semget(first, second, third);
19645 @@ -140,7 +361,7 @@ asmlinkage int sys_ipc(uint call, int first, int second,
19646 ret = do_shmat(first, (char __user *) ptr, second, &raddr);
19647 if (ret)
19648 return ret;
19649 - return put_user(raddr, (ulong __user *) third);
19650 + return put_user(raddr, (__force ulong __user *) third);
19651 }
19652 case 1: /* iBCS2 emulator entry point */
19653 if (!segment_eq(get_fs(), get_ds()))
19654 @@ -207,17 +428,3 @@ asmlinkage int sys_olduname(struct oldold_utsname __user *name)
19655
19656 return error;
19657 }
19658 -
19659 -
19660 -/*
19661 - * Do a system call from kernel instead of calling sys_execve so we
19662 - * end up with proper pt_regs.
19663 - */
19664 -int kernel_execve(const char *filename, char *const argv[], char *const envp[])
19665 -{
19666 - long __res;
19667 - asm volatile ("push %%ebx ; movl %2,%%ebx ; int $0x80 ; pop %%ebx"
19668 - : "=a" (__res)
19669 - : "0" (__NR_execve), "ri" (filename), "c" (argv), "d" (envp) : "memory");
19670 - return __res;
19671 -}
19672 diff --git a/arch/x86/kernel/sys_x86_64.c b/arch/x86/kernel/sys_x86_64.c
19673 index 8aa2057..b604bc1 100644
19674 --- a/arch/x86/kernel/sys_x86_64.c
19675 +++ b/arch/x86/kernel/sys_x86_64.c
19676 @@ -32,8 +32,8 @@ out:
19677 return error;
19678 }
19679
19680 -static void find_start_end(unsigned long flags, unsigned long *begin,
19681 - unsigned long *end)
19682 +static void find_start_end(struct mm_struct *mm, unsigned long flags,
19683 + unsigned long *begin, unsigned long *end)
19684 {
19685 if (!test_thread_flag(TIF_IA32) && (flags & MAP_32BIT)) {
19686 unsigned long new_begin;
19687 @@ -52,7 +52,7 @@ static void find_start_end(unsigned long flags, unsigned long *begin,
19688 *begin = new_begin;
19689 }
19690 } else {
19691 - *begin = TASK_UNMAPPED_BASE;
19692 + *begin = mm->mmap_base;
19693 *end = TASK_SIZE;
19694 }
19695 }
19696 @@ -69,16 +69,19 @@ arch_get_unmapped_area(struct file *filp, unsigned long addr,
19697 if (flags & MAP_FIXED)
19698 return addr;
19699
19700 - find_start_end(flags, &begin, &end);
19701 + find_start_end(mm, flags, &begin, &end);
19702
19703 if (len > end)
19704 return -ENOMEM;
19705
19706 +#ifdef CONFIG_PAX_RANDMMAP
19707 + if (!(mm->pax_flags & MF_PAX_RANDMMAP))
19708 +#endif
19709 +
19710 if (addr) {
19711 addr = PAGE_ALIGN(addr);
19712 vma = find_vma(mm, addr);
19713 - if (end - len >= addr &&
19714 - (!vma || addr + len <= vma->vm_start))
19715 + if (end - len >= addr && check_heap_stack_gap(vma, addr, len))
19716 return addr;
19717 }
19718 if (((flags & MAP_32BIT) || test_thread_flag(TIF_IA32))
19719 @@ -106,7 +109,7 @@ full_search:
19720 }
19721 return -ENOMEM;
19722 }
19723 - if (!vma || addr + len <= vma->vm_start) {
19724 + if (check_heap_stack_gap(vma, addr, len)) {
19725 /*
19726 * Remember the place where we stopped the search:
19727 */
19728 @@ -128,7 +131,7 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
19729 {
19730 struct vm_area_struct *vma;
19731 struct mm_struct *mm = current->mm;
19732 - unsigned long addr = addr0;
19733 + unsigned long base = mm->mmap_base, addr = addr0;
19734
19735 /* requested length too big for entire address space */
19736 if (len > TASK_SIZE)
19737 @@ -141,13 +144,18 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
19738 if (!test_thread_flag(TIF_IA32) && (flags & MAP_32BIT))
19739 goto bottomup;
19740
19741 +#ifdef CONFIG_PAX_RANDMMAP
19742 + if (!(mm->pax_flags & MF_PAX_RANDMMAP))
19743 +#endif
19744 +
19745 /* requesting a specific address */
19746 if (addr) {
19747 addr = PAGE_ALIGN(addr);
19748 - vma = find_vma(mm, addr);
19749 - if (TASK_SIZE - len >= addr &&
19750 - (!vma || addr + len <= vma->vm_start))
19751 - return addr;
19752 + if (TASK_SIZE - len >= addr) {
19753 + vma = find_vma(mm, addr);
19754 + if (check_heap_stack_gap(vma, addr, len))
19755 + return addr;
19756 + }
19757 }
19758
19759 /* check if free_area_cache is useful for us */
19760 @@ -162,7 +170,7 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
19761 /* make sure it can fit in the remaining address space */
19762 if (addr > len) {
19763 vma = find_vma(mm, addr-len);
19764 - if (!vma || addr <= vma->vm_start)
19765 + if (check_heap_stack_gap(vma, addr - len, len))
19766 /* remember the address as a hint for next time */
19767 return mm->free_area_cache = addr-len;
19768 }
19769 @@ -179,7 +187,7 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
19770 * return with success:
19771 */
19772 vma = find_vma(mm, addr);
19773 - if (!vma || addr+len <= vma->vm_start)
19774 + if (check_heap_stack_gap(vma, addr, len))
19775 /* remember the address as a hint for next time */
19776 return mm->free_area_cache = addr;
19777
19778 @@ -188,8 +196,8 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
19779 mm->cached_hole_size = vma->vm_start - addr;
19780
19781 /* try just below the current vma->vm_start */
19782 - addr = vma->vm_start-len;
19783 - } while (len < vma->vm_start);
19784 + addr = skip_heap_stack_gap(vma, len);
19785 + } while (!IS_ERR_VALUE(addr));
19786
19787 bottomup:
19788 /*
19789 @@ -198,13 +206,21 @@ bottomup:
19790 * can happen with large stack limits and large mmap()
19791 * allocations.
19792 */
19793 + mm->mmap_base = TASK_UNMAPPED_BASE;
19794 +
19795 +#ifdef CONFIG_PAX_RANDMMAP
19796 + if (mm->pax_flags & MF_PAX_RANDMMAP)
19797 + mm->mmap_base += mm->delta_mmap;
19798 +#endif
19799 +
19800 + mm->free_area_cache = mm->mmap_base;
19801 mm->cached_hole_size = ~0UL;
19802 - mm->free_area_cache = TASK_UNMAPPED_BASE;
19803 addr = arch_get_unmapped_area(filp, addr0, len, pgoff, flags);
19804 /*
19805 * Restore the topdown base:
19806 */
19807 - mm->free_area_cache = mm->mmap_base;
19808 + mm->mmap_base = base;
19809 + mm->free_area_cache = base;
19810 mm->cached_hole_size = ~0UL;
19811
19812 return addr;
19813 diff --git a/arch/x86/kernel/syscall_table_32.S b/arch/x86/kernel/syscall_table_32.S
19814 index 76d70a4..4c94a44 100644
19815 --- a/arch/x86/kernel/syscall_table_32.S
19816 +++ b/arch/x86/kernel/syscall_table_32.S
19817 @@ -1,3 +1,4 @@
19818 +.section .rodata,"a",@progbits
19819 ENTRY(sys_call_table)
19820 .long sys_restart_syscall /* 0 - old "setup()" system call, used for restarting */
19821 .long sys_exit
19822 diff --git a/arch/x86/kernel/tboot.c b/arch/x86/kernel/tboot.c
19823 index 46b8277..3349d55 100644
19824 --- a/arch/x86/kernel/tboot.c
19825 +++ b/arch/x86/kernel/tboot.c
19826 @@ -216,7 +216,7 @@ static int tboot_setup_sleep(void)
19827
19828 void tboot_shutdown(u32 shutdown_type)
19829 {
19830 - void (*shutdown)(void);
19831 + void (* __noreturn shutdown)(void);
19832
19833 if (!tboot_enabled())
19834 return;
19835 @@ -238,7 +238,7 @@ void tboot_shutdown(u32 shutdown_type)
19836
19837 switch_to_tboot_pt();
19838
19839 - shutdown = (void(*)(void))(unsigned long)tboot->shutdown_entry;
19840 + shutdown = (void *)tboot->shutdown_entry;
19841 shutdown();
19842
19843 /* should not reach here */
19844 @@ -295,7 +295,7 @@ void tboot_sleep(u8 sleep_state, u32 pm1a_control, u32 pm1b_control)
19845 tboot_shutdown(acpi_shutdown_map[sleep_state]);
19846 }
19847
19848 -static atomic_t ap_wfs_count;
19849 +static atomic_unchecked_t ap_wfs_count;
19850
19851 static int tboot_wait_for_aps(int num_aps)
19852 {
19853 @@ -319,9 +319,9 @@ static int __cpuinit tboot_cpu_callback(struct notifier_block *nfb,
19854 {
19855 switch (action) {
19856 case CPU_DYING:
19857 - atomic_inc(&ap_wfs_count);
19858 + atomic_inc_unchecked(&ap_wfs_count);
19859 if (num_online_cpus() == 1)
19860 - if (tboot_wait_for_aps(atomic_read(&ap_wfs_count)))
19861 + if (tboot_wait_for_aps(atomic_read_unchecked(&ap_wfs_count)))
19862 return NOTIFY_BAD;
19863 break;
19864 }
19865 @@ -340,7 +340,7 @@ static __init int tboot_late_init(void)
19866
19867 tboot_create_trampoline();
19868
19869 - atomic_set(&ap_wfs_count, 0);
19870 + atomic_set_unchecked(&ap_wfs_count, 0);
19871 register_hotcpu_notifier(&tboot_cpu_notifier);
19872 return 0;
19873 }
19874 diff --git a/arch/x86/kernel/time.c b/arch/x86/kernel/time.c
19875 index be25734..87fe232 100644
19876 --- a/arch/x86/kernel/time.c
19877 +++ b/arch/x86/kernel/time.c
19878 @@ -26,17 +26,13 @@
19879 int timer_ack;
19880 #endif
19881
19882 -#ifdef CONFIG_X86_64
19883 -volatile unsigned long __jiffies __section_jiffies = INITIAL_JIFFIES;
19884 -#endif
19885 -
19886 unsigned long profile_pc(struct pt_regs *regs)
19887 {
19888 unsigned long pc = instruction_pointer(regs);
19889
19890 - if (!user_mode_vm(regs) && in_lock_functions(pc)) {
19891 + if (!user_mode(regs) && in_lock_functions(pc)) {
19892 #ifdef CONFIG_FRAME_POINTER
19893 - return *(unsigned long *)(regs->bp + sizeof(long));
19894 + return ktla_ktva(*(unsigned long *)(regs->bp + sizeof(long)));
19895 #else
19896 unsigned long *sp =
19897 (unsigned long *)kernel_stack_pointer(regs);
19898 @@ -45,11 +41,17 @@ unsigned long profile_pc(struct pt_regs *regs)
19899 * or above a saved flags. Eflags has bits 22-31 zero,
19900 * kernel addresses don't.
19901 */
19902 +
19903 +#ifdef CONFIG_PAX_KERNEXEC
19904 + return ktla_ktva(sp[0]);
19905 +#else
19906 if (sp[0] >> 22)
19907 return sp[0];
19908 if (sp[1] >> 22)
19909 return sp[1];
19910 #endif
19911 +
19912 +#endif
19913 }
19914 return pc;
19915 }
19916 diff --git a/arch/x86/kernel/tls.c b/arch/x86/kernel/tls.c
19917 index 6bb7b85..dd853e1 100644
19918 --- a/arch/x86/kernel/tls.c
19919 +++ b/arch/x86/kernel/tls.c
19920 @@ -85,6 +85,11 @@ int do_set_thread_area(struct task_struct *p, int idx,
19921 if (idx < GDT_ENTRY_TLS_MIN || idx > GDT_ENTRY_TLS_MAX)
19922 return -EINVAL;
19923
19924 +#ifdef CONFIG_PAX_SEGMEXEC
19925 + if ((p->mm->pax_flags & MF_PAX_SEGMEXEC) && (info.contents & MODIFY_LDT_CONTENTS_CODE))
19926 + return -EINVAL;
19927 +#endif
19928 +
19929 set_tls_desc(p, idx, &info, 1);
19930
19931 return 0;
19932 diff --git a/arch/x86/kernel/trampoline_32.S b/arch/x86/kernel/trampoline_32.S
19933 index 8508237..229b664 100644
19934 --- a/arch/x86/kernel/trampoline_32.S
19935 +++ b/arch/x86/kernel/trampoline_32.S
19936 @@ -32,6 +32,12 @@
19937 #include <asm/segment.h>
19938 #include <asm/page_types.h>
19939
19940 +#ifdef CONFIG_PAX_KERNEXEC
19941 +#define ta(X) (X)
19942 +#else
19943 +#define ta(X) ((X) - __PAGE_OFFSET)
19944 +#endif
19945 +
19946 /* We can free up trampoline after bootup if cpu hotplug is not supported. */
19947 __CPUINITRODATA
19948 .code16
19949 @@ -60,7 +66,7 @@ r_base = .
19950 inc %ax # protected mode (PE) bit
19951 lmsw %ax # into protected mode
19952 # flush prefetch and jump to startup_32_smp in arch/i386/kernel/head.S
19953 - ljmpl $__BOOT_CS, $(startup_32_smp-__PAGE_OFFSET)
19954 + ljmpl $__BOOT_CS, $ta(startup_32_smp)
19955
19956 # These need to be in the same 64K segment as the above;
19957 # hence we don't use the boot_gdt_descr defined in head.S
19958 diff --git a/arch/x86/kernel/trampoline_64.S b/arch/x86/kernel/trampoline_64.S
19959 index 3af2dff..ba8aa49 100644
19960 --- a/arch/x86/kernel/trampoline_64.S
19961 +++ b/arch/x86/kernel/trampoline_64.S
19962 @@ -91,7 +91,7 @@ startup_32:
19963 movl $__KERNEL_DS, %eax # Initialize the %ds segment register
19964 movl %eax, %ds
19965
19966 - movl $X86_CR4_PAE, %eax
19967 + movl $(X86_CR4_PSE | X86_CR4_PAE | X86_CR4_PGE), %eax
19968 movl %eax, %cr4 # Enable PAE mode
19969
19970 # Setup trampoline 4 level pagetables
19971 @@ -127,7 +127,7 @@ startup_64:
19972 no_longmode:
19973 hlt
19974 jmp no_longmode
19975 -#include "verify_cpu_64.S"
19976 +#include "verify_cpu.S"
19977
19978 # Careful these need to be in the same 64K segment as the above;
19979 tidt:
19980 @@ -138,7 +138,7 @@ tidt:
19981 # so the kernel can live anywhere
19982 .balign 4
19983 tgdt:
19984 - .short tgdt_end - tgdt # gdt limit
19985 + .short tgdt_end - tgdt - 1 # gdt limit
19986 .long tgdt - r_base
19987 .short 0
19988 .quad 0x00cf9b000000ffff # __KERNEL32_CS
19989 diff --git a/arch/x86/kernel/traps.c b/arch/x86/kernel/traps.c
19990 index 7e37dce..ec3f8e5 100644
19991 --- a/arch/x86/kernel/traps.c
19992 +++ b/arch/x86/kernel/traps.c
19993 @@ -69,12 +69,6 @@ asmlinkage int system_call(void);
19994
19995 /* Do we ignore FPU interrupts ? */
19996 char ignore_fpu_irq;
19997 -
19998 -/*
19999 - * The IDT has to be page-aligned to simplify the Pentium
20000 - * F0 0F bug workaround.
20001 - */
20002 -gate_desc idt_table[NR_VECTORS] __page_aligned_data = { { { { 0, 0 } } }, };
20003 #endif
20004
20005 DECLARE_BITMAP(used_vectors, NR_VECTORS);
20006 @@ -112,19 +106,19 @@ static inline void preempt_conditional_cli(struct pt_regs *regs)
20007 static inline void
20008 die_if_kernel(const char *str, struct pt_regs *regs, long err)
20009 {
20010 - if (!user_mode_vm(regs))
20011 + if (!user_mode(regs))
20012 die(str, regs, err);
20013 }
20014 #endif
20015
20016 static void __kprobes
20017 -do_trap(int trapnr, int signr, char *str, struct pt_regs *regs,
20018 +do_trap(int trapnr, int signr, const char *str, struct pt_regs *regs,
20019 long error_code, siginfo_t *info)
20020 {
20021 struct task_struct *tsk = current;
20022
20023 #ifdef CONFIG_X86_32
20024 - if (regs->flags & X86_VM_MASK) {
20025 + if (v8086_mode(regs)) {
20026 /*
20027 * traps 0, 1, 3, 4, and 5 should be forwarded to vm86.
20028 * On nmi (interrupt 2), do_trap should not be called.
20029 @@ -135,7 +129,7 @@ do_trap(int trapnr, int signr, char *str, struct pt_regs *regs,
20030 }
20031 #endif
20032
20033 - if (!user_mode(regs))
20034 + if (!user_mode_novm(regs))
20035 goto kernel_trap;
20036
20037 #ifdef CONFIG_X86_32
20038 @@ -158,7 +152,7 @@ trap_signal:
20039 printk_ratelimit()) {
20040 printk(KERN_INFO
20041 "%s[%d] trap %s ip:%lx sp:%lx error:%lx",
20042 - tsk->comm, tsk->pid, str,
20043 + tsk->comm, task_pid_nr(tsk), str,
20044 regs->ip, regs->sp, error_code);
20045 print_vma_addr(" in ", regs->ip);
20046 printk("\n");
20047 @@ -175,8 +169,20 @@ kernel_trap:
20048 if (!fixup_exception(regs)) {
20049 tsk->thread.error_code = error_code;
20050 tsk->thread.trap_no = trapnr;
20051 +
20052 +#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
20053 + if (trapnr == 12 && ((regs->cs & 0xFFFF) == __KERNEL_CS || (regs->cs & 0xFFFF) == __KERNEXEC_KERNEL_CS))
20054 + str = "PAX: suspicious stack segment fault";
20055 +#endif
20056 +
20057 die(str, regs, error_code);
20058 }
20059 +
20060 +#ifdef CONFIG_PAX_REFCOUNT
20061 + if (trapnr == 4)
20062 + pax_report_refcount_overflow(regs);
20063 +#endif
20064 +
20065 return;
20066
20067 #ifdef CONFIG_X86_32
20068 @@ -265,14 +271,30 @@ do_general_protection(struct pt_regs *regs, long error_code)
20069 conditional_sti(regs);
20070
20071 #ifdef CONFIG_X86_32
20072 - if (regs->flags & X86_VM_MASK)
20073 + if (v8086_mode(regs))
20074 goto gp_in_vm86;
20075 #endif
20076
20077 tsk = current;
20078 - if (!user_mode(regs))
20079 + if (!user_mode_novm(regs))
20080 goto gp_in_kernel;
20081
20082 +#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_PAGEEXEC)
20083 + if (!nx_enabled && tsk->mm && (tsk->mm->pax_flags & MF_PAX_PAGEEXEC)) {
20084 + struct mm_struct *mm = tsk->mm;
20085 + unsigned long limit;
20086 +
20087 + down_write(&mm->mmap_sem);
20088 + limit = mm->context.user_cs_limit;
20089 + if (limit < TASK_SIZE) {
20090 + track_exec_limit(mm, limit, TASK_SIZE, VM_EXEC);
20091 + up_write(&mm->mmap_sem);
20092 + return;
20093 + }
20094 + up_write(&mm->mmap_sem);
20095 + }
20096 +#endif
20097 +
20098 tsk->thread.error_code = error_code;
20099 tsk->thread.trap_no = 13;
20100
20101 @@ -305,6 +327,13 @@ gp_in_kernel:
20102 if (notify_die(DIE_GPF, "general protection fault", regs,
20103 error_code, 13, SIGSEGV) == NOTIFY_STOP)
20104 return;
20105 +
20106 +#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
20107 + if ((regs->cs & 0xFFFF) == __KERNEL_CS || (regs->cs & 0xFFFF) == __KERNEXEC_KERNEL_CS)
20108 + die("PAX: suspicious general protection fault", regs, error_code);
20109 + else
20110 +#endif
20111 +
20112 die("general protection fault", regs, error_code);
20113 }
20114
20115 @@ -435,6 +464,17 @@ static notrace __kprobes void default_do_nmi(struct pt_regs *regs)
20116 dotraplinkage notrace __kprobes void
20117 do_nmi(struct pt_regs *regs, long error_code)
20118 {
20119 +
20120 +#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
20121 + if (!user_mode(regs)) {
20122 + unsigned long cs = regs->cs & 0xFFFF;
20123 + unsigned long ip = ktva_ktla(regs->ip);
20124 +
20125 + if ((cs == __KERNEL_CS || cs == __KERNEXEC_KERNEL_CS) && ip <= (unsigned long)_etext)
20126 + regs->ip = ip;
20127 + }
20128 +#endif
20129 +
20130 nmi_enter();
20131
20132 inc_irq_stat(__nmi_count);
20133 @@ -558,7 +598,7 @@ dotraplinkage void __kprobes do_debug(struct pt_regs *regs, long error_code)
20134 }
20135
20136 #ifdef CONFIG_X86_32
20137 - if (regs->flags & X86_VM_MASK)
20138 + if (v8086_mode(regs))
20139 goto debug_vm86;
20140 #endif
20141
20142 @@ -570,7 +610,7 @@ dotraplinkage void __kprobes do_debug(struct pt_regs *regs, long error_code)
20143 * kernel space (but re-enable TF when returning to user mode).
20144 */
20145 if (condition & DR_STEP) {
20146 - if (!user_mode(regs))
20147 + if (!user_mode_novm(regs))
20148 goto clear_TF_reenable;
20149 }
20150
20151 @@ -757,7 +797,7 @@ do_simd_coprocessor_error(struct pt_regs *regs, long error_code)
20152 * Handle strange cache flush from user space exception
20153 * in all other cases. This is undocumented behaviour.
20154 */
20155 - if (regs->flags & X86_VM_MASK) {
20156 + if (v8086_mode(regs)) {
20157 handle_vm86_fault((struct kernel_vm86_regs *)regs, error_code);
20158 return;
20159 }
20160 @@ -798,7 +838,7 @@ asmlinkage void __attribute__((weak)) smp_threshold_interrupt(void)
20161 void __math_state_restore(void)
20162 {
20163 struct thread_info *thread = current_thread_info();
20164 - struct task_struct *tsk = thread->task;
20165 + struct task_struct *tsk = current;
20166
20167 /*
20168 * Paranoid restore. send a SIGSEGV if we fail to restore the state.
20169 @@ -825,8 +865,7 @@ void __math_state_restore(void)
20170 */
20171 asmlinkage void math_state_restore(void)
20172 {
20173 - struct thread_info *thread = current_thread_info();
20174 - struct task_struct *tsk = thread->task;
20175 + struct task_struct *tsk = current;
20176
20177 if (!tsk_used_math(tsk)) {
20178 local_irq_enable();
20179 diff --git a/arch/x86/kernel/verify_cpu.S b/arch/x86/kernel/verify_cpu.S
20180 new file mode 100644
20181 index 0000000..50c5edd
20182 --- /dev/null
20183 +++ b/arch/x86/kernel/verify_cpu.S
20184 @@ -0,0 +1,140 @@
20185 +/*
20186 + *
20187 + * verify_cpu.S - Code for cpu long mode and SSE verification. This
20188 + * code has been borrowed from boot/setup.S and was introduced by
20189 + * Andi Kleen.
20190 + *
20191 + * Copyright (c) 2007 Andi Kleen (ak@suse.de)
20192 + * Copyright (c) 2007 Eric Biederman (ebiederm@xmission.com)
20193 + * Copyright (c) 2007 Vivek Goyal (vgoyal@in.ibm.com)
20194 + * Copyright (c) 2010 Kees Cook (kees.cook@canonical.com)
20195 + *
20196 + * This source code is licensed under the GNU General Public License,
20197 + * Version 2. See the file COPYING for more details.
20198 + *
20199 + * This is a common code for verification whether CPU supports
20200 + * long mode and SSE or not. It is not called directly instead this
20201 + * file is included at various places and compiled in that context.
20202 + * This file is expected to run in 32bit code. Currently:
20203 + *
20204 + * arch/x86/boot/compressed/head_64.S: Boot cpu verification
20205 + * arch/x86/kernel/trampoline_64.S: secondary processor verification
20206 + * arch/x86/kernel/head_32.S: processor startup
20207 + * arch/x86/kernel/acpi/realmode/wakeup.S: 32bit processor resume
20208 + *
20209 + * verify_cpu, returns the status of longmode and SSE in register %eax.
20210 + * 0: Success 1: Failure
20211 + *
20212 + * On Intel, the XD_DISABLE flag will be cleared as a side-effect.
20213 + *
20214 + * The caller needs to check for the error code and take the action
20215 + * appropriately. Either display a message or halt.
20216 + */
20217 +
20218 +#include <asm/cpufeature.h>
20219 +#include <asm/msr-index.h>
20220 +
20221 +verify_cpu:
20222 + pushfl # Save caller passed flags
20223 + pushl $0 # Kill any dangerous flags
20224 + popfl
20225 +
20226 + pushfl # standard way to check for cpuid
20227 + popl %eax
20228 + movl %eax,%ebx
20229 + xorl $0x200000,%eax
20230 + pushl %eax
20231 + popfl
20232 + pushfl
20233 + popl %eax
20234 + cmpl %eax,%ebx
20235 + jz verify_cpu_no_longmode # cpu has no cpuid
20236 +
20237 + movl $0x0,%eax # See if cpuid 1 is implemented
20238 + cpuid
20239 + cmpl $0x1,%eax
20240 + jb verify_cpu_no_longmode # no cpuid 1
20241 +
20242 + xor %di,%di
20243 + cmpl $0x68747541,%ebx # AuthenticAMD
20244 + jnz verify_cpu_noamd
20245 + cmpl $0x69746e65,%edx
20246 + jnz verify_cpu_noamd
20247 + cmpl $0x444d4163,%ecx
20248 + jnz verify_cpu_noamd
20249 + mov $1,%di # cpu is from AMD
20250 + jmp verify_cpu_check
20251 +
20252 +verify_cpu_noamd:
20253 + cmpl $0x756e6547,%ebx # GenuineIntel?
20254 + jnz verify_cpu_check
20255 + cmpl $0x49656e69,%edx
20256 + jnz verify_cpu_check
20257 + cmpl $0x6c65746e,%ecx
20258 + jnz verify_cpu_check
20259 +
20260 + # only call IA32_MISC_ENABLE when:
20261 + # family > 6 || (family == 6 && model >= 0xd)
20262 + movl $0x1, %eax # check CPU family and model
20263 + cpuid
20264 + movl %eax, %ecx
20265 +
20266 + andl $0x0ff00f00, %eax # mask family and extended family
20267 + shrl $8, %eax
20268 + cmpl $6, %eax
20269 + ja verify_cpu_clear_xd # family > 6, ok
20270 + jb verify_cpu_check # family < 6, skip
20271 +
20272 + andl $0x000f00f0, %ecx # mask model and extended model
20273 + shrl $4, %ecx
20274 + cmpl $0xd, %ecx
20275 + jb verify_cpu_check # family == 6, model < 0xd, skip
20276 +
20277 +verify_cpu_clear_xd:
20278 + movl $MSR_IA32_MISC_ENABLE, %ecx
20279 + rdmsr
20280 + btrl $2, %edx # clear MSR_IA32_MISC_ENABLE_XD_DISABLE
20281 + jnc verify_cpu_check # only write MSR if bit was changed
20282 + wrmsr
20283 +
20284 +verify_cpu_check:
20285 + movl $0x1,%eax # Does the cpu have what it takes
20286 + cpuid
20287 + andl $REQUIRED_MASK0,%edx
20288 + xorl $REQUIRED_MASK0,%edx
20289 + jnz verify_cpu_no_longmode
20290 +
20291 + movl $0x80000000,%eax # See if extended cpuid is implemented
20292 + cpuid
20293 + cmpl $0x80000001,%eax
20294 + jb verify_cpu_no_longmode # no extended cpuid
20295 +
20296 + movl $0x80000001,%eax # Does the cpu have what it takes
20297 + cpuid
20298 + andl $REQUIRED_MASK1,%edx
20299 + xorl $REQUIRED_MASK1,%edx
20300 + jnz verify_cpu_no_longmode
20301 +
20302 +verify_cpu_sse_test:
20303 + movl $1,%eax
20304 + cpuid
20305 + andl $SSE_MASK,%edx
20306 + cmpl $SSE_MASK,%edx
20307 + je verify_cpu_sse_ok
20308 + test %di,%di
20309 + jz verify_cpu_no_longmode # only try to force SSE on AMD
20310 + movl $MSR_K7_HWCR,%ecx
20311 + rdmsr
20312 + btr $15,%eax # enable SSE
20313 + wrmsr
20314 + xor %di,%di # don't loop
20315 + jmp verify_cpu_sse_test # try again
20316 +
20317 +verify_cpu_no_longmode:
20318 + popfl # Restore caller passed flags
20319 + movl $1,%eax
20320 + ret
20321 +verify_cpu_sse_ok:
20322 + popfl # Restore caller passed flags
20323 + xorl %eax, %eax
20324 + ret
20325 diff --git a/arch/x86/kernel/verify_cpu_64.S b/arch/x86/kernel/verify_cpu_64.S
20326 deleted file mode 100644
20327 index 45b6f8a..0000000
20328 --- a/arch/x86/kernel/verify_cpu_64.S
20329 +++ /dev/null
20330 @@ -1,105 +0,0 @@
20331 -/*
20332 - *
20333 - * verify_cpu.S - Code for cpu long mode and SSE verification. This
20334 - * code has been borrowed from boot/setup.S and was introduced by
20335 - * Andi Kleen.
20336 - *
20337 - * Copyright (c) 2007 Andi Kleen (ak@suse.de)
20338 - * Copyright (c) 2007 Eric Biederman (ebiederm@xmission.com)
20339 - * Copyright (c) 2007 Vivek Goyal (vgoyal@in.ibm.com)
20340 - *
20341 - * This source code is licensed under the GNU General Public License,
20342 - * Version 2. See the file COPYING for more details.
20343 - *
20344 - * This is a common code for verification whether CPU supports
20345 - * long mode and SSE or not. It is not called directly instead this
20346 - * file is included at various places and compiled in that context.
20347 - * Following are the current usage.
20348 - *
20349 - * This file is included by both 16bit and 32bit code.
20350 - *
20351 - * arch/x86_64/boot/setup.S : Boot cpu verification (16bit)
20352 - * arch/x86_64/boot/compressed/head.S: Boot cpu verification (32bit)
20353 - * arch/x86_64/kernel/trampoline.S: secondary processor verfication (16bit)
20354 - * arch/x86_64/kernel/acpi/wakeup.S:Verfication at resume (16bit)
20355 - *
20356 - * verify_cpu, returns the status of cpu check in register %eax.
20357 - * 0: Success 1: Failure
20358 - *
20359 - * The caller needs to check for the error code and take the action
20360 - * appropriately. Either display a message or halt.
20361 - */
20362 -
20363 -#include <asm/cpufeature.h>
20364 -
20365 -verify_cpu:
20366 - pushfl # Save caller passed flags
20367 - pushl $0 # Kill any dangerous flags
20368 - popfl
20369 -
20370 - pushfl # standard way to check for cpuid
20371 - popl %eax
20372 - movl %eax,%ebx
20373 - xorl $0x200000,%eax
20374 - pushl %eax
20375 - popfl
20376 - pushfl
20377 - popl %eax
20378 - cmpl %eax,%ebx
20379 - jz verify_cpu_no_longmode # cpu has no cpuid
20380 -
20381 - movl $0x0,%eax # See if cpuid 1 is implemented
20382 - cpuid
20383 - cmpl $0x1,%eax
20384 - jb verify_cpu_no_longmode # no cpuid 1
20385 -
20386 - xor %di,%di
20387 - cmpl $0x68747541,%ebx # AuthenticAMD
20388 - jnz verify_cpu_noamd
20389 - cmpl $0x69746e65,%edx
20390 - jnz verify_cpu_noamd
20391 - cmpl $0x444d4163,%ecx
20392 - jnz verify_cpu_noamd
20393 - mov $1,%di # cpu is from AMD
20394 -
20395 -verify_cpu_noamd:
20396 - movl $0x1,%eax # Does the cpu have what it takes
20397 - cpuid
20398 - andl $REQUIRED_MASK0,%edx
20399 - xorl $REQUIRED_MASK0,%edx
20400 - jnz verify_cpu_no_longmode
20401 -
20402 - movl $0x80000000,%eax # See if extended cpuid is implemented
20403 - cpuid
20404 - cmpl $0x80000001,%eax
20405 - jb verify_cpu_no_longmode # no extended cpuid
20406 -
20407 - movl $0x80000001,%eax # Does the cpu have what it takes
20408 - cpuid
20409 - andl $REQUIRED_MASK1,%edx
20410 - xorl $REQUIRED_MASK1,%edx
20411 - jnz verify_cpu_no_longmode
20412 -
20413 -verify_cpu_sse_test:
20414 - movl $1,%eax
20415 - cpuid
20416 - andl $SSE_MASK,%edx
20417 - cmpl $SSE_MASK,%edx
20418 - je verify_cpu_sse_ok
20419 - test %di,%di
20420 - jz verify_cpu_no_longmode # only try to force SSE on AMD
20421 - movl $0xc0010015,%ecx # HWCR
20422 - rdmsr
20423 - btr $15,%eax # enable SSE
20424 - wrmsr
20425 - xor %di,%di # don't loop
20426 - jmp verify_cpu_sse_test # try again
20427 -
20428 -verify_cpu_no_longmode:
20429 - popfl # Restore caller passed flags
20430 - movl $1,%eax
20431 - ret
20432 -verify_cpu_sse_ok:
20433 - popfl # Restore caller passed flags
20434 - xorl %eax, %eax
20435 - ret
20436 diff --git a/arch/x86/kernel/vm86_32.c b/arch/x86/kernel/vm86_32.c
20437 index 9c4e625..c992817 100644
20438 --- a/arch/x86/kernel/vm86_32.c
20439 +++ b/arch/x86/kernel/vm86_32.c
20440 @@ -41,6 +41,7 @@
20441 #include <linux/ptrace.h>
20442 #include <linux/audit.h>
20443 #include <linux/stddef.h>
20444 +#include <linux/grsecurity.h>
20445
20446 #include <asm/uaccess.h>
20447 #include <asm/io.h>
20448 @@ -148,7 +149,7 @@ struct pt_regs *save_v86_state(struct kernel_vm86_regs *regs)
20449 do_exit(SIGSEGV);
20450 }
20451
20452 - tss = &per_cpu(init_tss, get_cpu());
20453 + tss = init_tss + get_cpu();
20454 current->thread.sp0 = current->thread.saved_sp0;
20455 current->thread.sysenter_cs = __KERNEL_CS;
20456 load_sp0(tss, &current->thread);
20457 @@ -208,6 +209,13 @@ int sys_vm86old(struct pt_regs *regs)
20458 struct task_struct *tsk;
20459 int tmp, ret = -EPERM;
20460
20461 +#ifdef CONFIG_GRKERNSEC_VM86
20462 + if (!capable(CAP_SYS_RAWIO)) {
20463 + gr_handle_vm86();
20464 + goto out;
20465 + }
20466 +#endif
20467 +
20468 tsk = current;
20469 if (tsk->thread.saved_sp0)
20470 goto out;
20471 @@ -238,6 +246,14 @@ int sys_vm86(struct pt_regs *regs)
20472 int tmp, ret;
20473 struct vm86plus_struct __user *v86;
20474
20475 +#ifdef CONFIG_GRKERNSEC_VM86
20476 + if (!capable(CAP_SYS_RAWIO)) {
20477 + gr_handle_vm86();
20478 + ret = -EPERM;
20479 + goto out;
20480 + }
20481 +#endif
20482 +
20483 tsk = current;
20484 switch (regs->bx) {
20485 case VM86_REQUEST_IRQ:
20486 @@ -324,7 +340,7 @@ static void do_sys_vm86(struct kernel_vm86_struct *info, struct task_struct *tsk
20487 tsk->thread.saved_fs = info->regs32->fs;
20488 tsk->thread.saved_gs = get_user_gs(info->regs32);
20489
20490 - tss = &per_cpu(init_tss, get_cpu());
20491 + tss = init_tss + get_cpu();
20492 tsk->thread.sp0 = (unsigned long) &info->VM86_TSS_ESP0;
20493 if (cpu_has_sep)
20494 tsk->thread.sysenter_cs = 0;
20495 @@ -529,7 +545,7 @@ static void do_int(struct kernel_vm86_regs *regs, int i,
20496 goto cannot_handle;
20497 if (i == 0x21 && is_revectored(AH(regs), &KVM86->int21_revectored))
20498 goto cannot_handle;
20499 - intr_ptr = (unsigned long __user *) (i << 2);
20500 + intr_ptr = (__force unsigned long __user *) (i << 2);
20501 if (get_user(segoffs, intr_ptr))
20502 goto cannot_handle;
20503 if ((segoffs >> 16) == BIOSSEG)
20504 diff --git a/arch/x86/kernel/vmi_32.c b/arch/x86/kernel/vmi_32.c
20505 index d430e4c..831f817 100644
20506 --- a/arch/x86/kernel/vmi_32.c
20507 +++ b/arch/x86/kernel/vmi_32.c
20508 @@ -44,12 +44,17 @@ typedef u32 __attribute__((regparm(1))) (VROMFUNC)(void);
20509 typedef u64 __attribute__((regparm(2))) (VROMLONGFUNC)(int);
20510
20511 #define call_vrom_func(rom,func) \
20512 - (((VROMFUNC *)(rom->func))())
20513 + (((VROMFUNC *)(ktva_ktla(rom.func)))())
20514
20515 #define call_vrom_long_func(rom,func,arg) \
20516 - (((VROMLONGFUNC *)(rom->func)) (arg))
20517 +({\
20518 + u64 __reloc = ((VROMLONGFUNC *)(ktva_ktla(rom.func))) (arg);\
20519 + struct vmi_relocation_info *const __rel = (struct vmi_relocation_info *)&__reloc;\
20520 + __rel->eip = (unsigned char *)ktva_ktla((unsigned long)__rel->eip);\
20521 + __reloc;\
20522 +})
20523
20524 -static struct vrom_header *vmi_rom;
20525 +static struct vrom_header vmi_rom __attribute((__section__(".vmi.rom"), __aligned__(PAGE_SIZE)));
20526 static int disable_pge;
20527 static int disable_pse;
20528 static int disable_sep;
20529 @@ -76,10 +81,10 @@ static struct {
20530 void (*set_initial_ap_state)(int, int);
20531 void (*halt)(void);
20532 void (*set_lazy_mode)(int mode);
20533 -} vmi_ops;
20534 +} __no_const vmi_ops __read_only;
20535
20536 /* Cached VMI operations */
20537 -struct vmi_timer_ops vmi_timer_ops;
20538 +struct vmi_timer_ops vmi_timer_ops __read_only;
20539
20540 /*
20541 * VMI patching routines.
20542 @@ -94,7 +99,7 @@ struct vmi_timer_ops vmi_timer_ops;
20543 static inline void patch_offset(void *insnbuf,
20544 unsigned long ip, unsigned long dest)
20545 {
20546 - *(unsigned long *)(insnbuf+1) = dest-ip-5;
20547 + *(unsigned long *)(insnbuf+1) = dest-ip-5;
20548 }
20549
20550 static unsigned patch_internal(int call, unsigned len, void *insnbuf,
20551 @@ -102,6 +107,7 @@ static unsigned patch_internal(int call, unsigned len, void *insnbuf,
20552 {
20553 u64 reloc;
20554 struct vmi_relocation_info *const rel = (struct vmi_relocation_info *)&reloc;
20555 +
20556 reloc = call_vrom_long_func(vmi_rom, get_reloc, call);
20557 switch(rel->type) {
20558 case VMI_RELOCATION_CALL_REL:
20559 @@ -404,13 +410,13 @@ static void vmi_set_pud(pud_t *pudp, pud_t pudval)
20560
20561 static void vmi_pte_clear(struct mm_struct *mm, unsigned long addr, pte_t *ptep)
20562 {
20563 - const pte_t pte = { .pte = 0 };
20564 + const pte_t pte = __pte(0ULL);
20565 vmi_ops.set_pte(pte, ptep, vmi_flags_addr(mm, addr, VMI_PAGE_PT, 0));
20566 }
20567
20568 static void vmi_pmd_clear(pmd_t *pmd)
20569 {
20570 - const pte_t pte = { .pte = 0 };
20571 + const pte_t pte = __pte(0ULL);
20572 vmi_ops.set_pte(pte, (pte_t *)pmd, VMI_PAGE_PD);
20573 }
20574 #endif
20575 @@ -438,10 +444,10 @@ vmi_startup_ipi_hook(int phys_apicid, unsigned long start_eip,
20576 ap.ss = __KERNEL_DS;
20577 ap.esp = (unsigned long) start_esp;
20578
20579 - ap.ds = __USER_DS;
20580 - ap.es = __USER_DS;
20581 + ap.ds = __KERNEL_DS;
20582 + ap.es = __KERNEL_DS;
20583 ap.fs = __KERNEL_PERCPU;
20584 - ap.gs = __KERNEL_STACK_CANARY;
20585 + savesegment(gs, ap.gs);
20586
20587 ap.eflags = 0;
20588
20589 @@ -486,6 +492,18 @@ static void vmi_leave_lazy_mmu(void)
20590 paravirt_leave_lazy_mmu();
20591 }
20592
20593 +#ifdef CONFIG_PAX_KERNEXEC
20594 +static unsigned long vmi_pax_open_kernel(void)
20595 +{
20596 + return 0;
20597 +}
20598 +
20599 +static unsigned long vmi_pax_close_kernel(void)
20600 +{
20601 + return 0;
20602 +}
20603 +#endif
20604 +
20605 static inline int __init check_vmi_rom(struct vrom_header *rom)
20606 {
20607 struct pci_header *pci;
20608 @@ -498,6 +516,10 @@ static inline int __init check_vmi_rom(struct vrom_header *rom)
20609 return 0;
20610 if (rom->vrom_signature != VMI_SIGNATURE)
20611 return 0;
20612 + if (rom->rom_length * 512 > sizeof(*rom)) {
20613 + printk(KERN_WARNING "PAX: VMI: ROM size too big: %x\n", rom->rom_length * 512);
20614 + return 0;
20615 + }
20616 if (rom->api_version_maj != VMI_API_REV_MAJOR ||
20617 rom->api_version_min+1 < VMI_API_REV_MINOR+1) {
20618 printk(KERN_WARNING "VMI: Found mismatched rom version %d.%d\n",
20619 @@ -562,7 +584,7 @@ static inline int __init probe_vmi_rom(void)
20620 struct vrom_header *romstart;
20621 romstart = (struct vrom_header *)isa_bus_to_virt(base);
20622 if (check_vmi_rom(romstart)) {
20623 - vmi_rom = romstart;
20624 + vmi_rom = *romstart;
20625 return 1;
20626 }
20627 }
20628 @@ -836,6 +858,11 @@ static inline int __init activate_vmi(void)
20629
20630 para_fill(pv_irq_ops.safe_halt, Halt);
20631
20632 +#ifdef CONFIG_PAX_KERNEXEC
20633 + pv_mmu_ops.pax_open_kernel = vmi_pax_open_kernel;
20634 + pv_mmu_ops.pax_close_kernel = vmi_pax_close_kernel;
20635 +#endif
20636 +
20637 /*
20638 * Alternative instruction rewriting doesn't happen soon enough
20639 * to convert VMI_IRET to a call instead of a jump; so we have
20640 @@ -853,16 +880,16 @@ static inline int __init activate_vmi(void)
20641
20642 void __init vmi_init(void)
20643 {
20644 - if (!vmi_rom)
20645 + if (!vmi_rom.rom_signature)
20646 probe_vmi_rom();
20647 else
20648 - check_vmi_rom(vmi_rom);
20649 + check_vmi_rom(&vmi_rom);
20650
20651 /* In case probing for or validating the ROM failed, basil */
20652 - if (!vmi_rom)
20653 + if (!vmi_rom.rom_signature)
20654 return;
20655
20656 - reserve_top_address(-vmi_rom->virtual_top);
20657 + reserve_top_address(-vmi_rom.virtual_top);
20658
20659 #ifdef CONFIG_X86_IO_APIC
20660 /* This is virtual hardware; timer routing is wired correctly */
20661 @@ -874,7 +901,7 @@ void __init vmi_activate(void)
20662 {
20663 unsigned long flags;
20664
20665 - if (!vmi_rom)
20666 + if (!vmi_rom.rom_signature)
20667 return;
20668
20669 local_irq_save(flags);
20670 diff --git a/arch/x86/kernel/vmlinux.lds.S b/arch/x86/kernel/vmlinux.lds.S
20671 index 3c68fe2..12c8280 100644
20672 --- a/arch/x86/kernel/vmlinux.lds.S
20673 +++ b/arch/x86/kernel/vmlinux.lds.S
20674 @@ -26,6 +26,13 @@
20675 #include <asm/page_types.h>
20676 #include <asm/cache.h>
20677 #include <asm/boot.h>
20678 +#include <asm/segment.h>
20679 +
20680 +#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
20681 +#define __KERNEL_TEXT_OFFSET (LOAD_OFFSET + ____LOAD_PHYSICAL_ADDR)
20682 +#else
20683 +#define __KERNEL_TEXT_OFFSET 0
20684 +#endif
20685
20686 #undef i386 /* in case the preprocessor is a 32bit one */
20687
20688 @@ -34,40 +41,53 @@ OUTPUT_FORMAT(CONFIG_OUTPUT_FORMAT, CONFIG_OUTPUT_FORMAT, CONFIG_OUTPUT_FORMAT)
20689 #ifdef CONFIG_X86_32
20690 OUTPUT_ARCH(i386)
20691 ENTRY(phys_startup_32)
20692 -jiffies = jiffies_64;
20693 #else
20694 OUTPUT_ARCH(i386:x86-64)
20695 ENTRY(phys_startup_64)
20696 -jiffies_64 = jiffies;
20697 #endif
20698
20699 PHDRS {
20700 text PT_LOAD FLAGS(5); /* R_E */
20701 - data PT_LOAD FLAGS(7); /* RWE */
20702 +#ifdef CONFIG_X86_32
20703 + module PT_LOAD FLAGS(5); /* R_E */
20704 +#endif
20705 +#ifdef CONFIG_XEN
20706 + rodata PT_LOAD FLAGS(5); /* R_E */
20707 +#else
20708 + rodata PT_LOAD FLAGS(4); /* R__ */
20709 +#endif
20710 + data PT_LOAD FLAGS(6); /* RW_ */
20711 #ifdef CONFIG_X86_64
20712 user PT_LOAD FLAGS(5); /* R_E */
20713 +#endif
20714 + init.begin PT_LOAD FLAGS(6); /* RW_ */
20715 #ifdef CONFIG_SMP
20716 percpu PT_LOAD FLAGS(6); /* RW_ */
20717 #endif
20718 + text.init PT_LOAD FLAGS(5); /* R_E */
20719 + text.exit PT_LOAD FLAGS(5); /* R_E */
20720 init PT_LOAD FLAGS(7); /* RWE */
20721 -#endif
20722 note PT_NOTE FLAGS(0); /* ___ */
20723 }
20724
20725 SECTIONS
20726 {
20727 #ifdef CONFIG_X86_32
20728 - . = LOAD_OFFSET + LOAD_PHYSICAL_ADDR;
20729 - phys_startup_32 = startup_32 - LOAD_OFFSET;
20730 + . = LOAD_OFFSET + ____LOAD_PHYSICAL_ADDR;
20731 #else
20732 - . = __START_KERNEL;
20733 - phys_startup_64 = startup_64 - LOAD_OFFSET;
20734 + . = __START_KERNEL;
20735 #endif
20736
20737 /* Text and read-only data */
20738 - .text : AT(ADDR(.text) - LOAD_OFFSET) {
20739 - _text = .;
20740 + .text (. - __KERNEL_TEXT_OFFSET): AT(ADDR(.text) - LOAD_OFFSET + __KERNEL_TEXT_OFFSET) {
20741 /* bootstrapping code */
20742 +#ifdef CONFIG_X86_32
20743 + phys_startup_32 = startup_32 - LOAD_OFFSET + __KERNEL_TEXT_OFFSET;
20744 +#else
20745 + phys_startup_64 = startup_64 - LOAD_OFFSET + __KERNEL_TEXT_OFFSET;
20746 +#endif
20747 + __LOAD_PHYSICAL_ADDR = . - LOAD_OFFSET + __KERNEL_TEXT_OFFSET;
20748 + _text = .;
20749 HEAD_TEXT
20750 #ifdef CONFIG_X86_32
20751 . = ALIGN(PAGE_SIZE);
20752 @@ -82,28 +102,71 @@ SECTIONS
20753 IRQENTRY_TEXT
20754 *(.fixup)
20755 *(.gnu.warning)
20756 - /* End of text section */
20757 - _etext = .;
20758 } :text = 0x9090
20759
20760 - NOTES :text :note
20761 + . += __KERNEL_TEXT_OFFSET;
20762
20763 - EXCEPTION_TABLE(16) :text = 0x9090
20764 +#ifdef CONFIG_X86_32
20765 + . = ALIGN(PAGE_SIZE);
20766 + .vmi.rom : AT(ADDR(.vmi.rom) - LOAD_OFFSET) {
20767 + *(.vmi.rom)
20768 + } :module
20769 +
20770 + . = ALIGN(PAGE_SIZE);
20771 + .module.text : AT(ADDR(.module.text) - LOAD_OFFSET) {
20772 +
20773 +#if defined(CONFIG_PAX_KERNEXEC) && defined(CONFIG_MODULES)
20774 + MODULES_EXEC_VADDR = .;
20775 + BYTE(0)
20776 + . += (CONFIG_PAX_KERNEXEC_MODULE_TEXT * 1024 * 1024);
20777 + . = ALIGN(HPAGE_SIZE);
20778 + MODULES_EXEC_END = . - 1;
20779 +#endif
20780 +
20781 + } :module
20782 +#endif
20783 +
20784 + .text.end : AT(ADDR(.text.end) - LOAD_OFFSET) {
20785 + /* End of text section */
20786 + _etext = . - __KERNEL_TEXT_OFFSET;
20787 + }
20788 +
20789 +#ifdef CONFIG_X86_32
20790 + . = ALIGN(PAGE_SIZE);
20791 + .rodata.page_aligned : AT(ADDR(.rodata.page_aligned) - LOAD_OFFSET) {
20792 + *(.idt)
20793 + . = ALIGN(PAGE_SIZE);
20794 + *(.empty_zero_page)
20795 + *(.swapper_pg_fixmap)
20796 + *(.swapper_pg_pmd)
20797 + *(.swapper_pg_dir)
20798 + *(.trampoline_pg_dir)
20799 + } :rodata
20800 +#endif
20801 +
20802 + . = ALIGN(PAGE_SIZE);
20803 + NOTES :rodata :note
20804 +
20805 + EXCEPTION_TABLE(16) :rodata
20806
20807 RO_DATA(PAGE_SIZE)
20808
20809 /* Data */
20810 .data : AT(ADDR(.data) - LOAD_OFFSET) {
20811 +
20812 +#ifdef CONFIG_PAX_KERNEXEC
20813 + . = ALIGN(HPAGE_SIZE);
20814 +#else
20815 + . = ALIGN(PAGE_SIZE);
20816 +#endif
20817 +
20818 /* Start of data section */
20819 _sdata = .;
20820
20821 /* init_task */
20822 INIT_TASK_DATA(THREAD_SIZE)
20823
20824 -#ifdef CONFIG_X86_32
20825 - /* 32 bit has nosave before _edata */
20826 NOSAVE_DATA
20827 -#endif
20828
20829 PAGE_ALIGNED_DATA(PAGE_SIZE)
20830
20831 @@ -112,6 +175,8 @@ SECTIONS
20832 DATA_DATA
20833 CONSTRUCTORS
20834
20835 + jiffies = jiffies_64;
20836 +
20837 /* rarely changed data like cpu maps */
20838 READ_MOSTLY_DATA(CONFIG_X86_INTERNODE_CACHE_BYTES)
20839
20840 @@ -166,12 +231,6 @@ SECTIONS
20841 }
20842 vgetcpu_mode = VVIRT(.vgetcpu_mode);
20843
20844 - . = ALIGN(CONFIG_X86_L1_CACHE_BYTES);
20845 - .jiffies : AT(VLOAD(.jiffies)) {
20846 - *(.jiffies)
20847 - }
20848 - jiffies = VVIRT(.jiffies);
20849 -
20850 .vsyscall_3 ADDR(.vsyscall_0) + 3072: AT(VLOAD(.vsyscall_3)) {
20851 *(.vsyscall_3)
20852 }
20853 @@ -187,12 +246,19 @@ SECTIONS
20854 #endif /* CONFIG_X86_64 */
20855
20856 /* Init code and data - will be freed after init */
20857 - . = ALIGN(PAGE_SIZE);
20858 .init.begin : AT(ADDR(.init.begin) - LOAD_OFFSET) {
20859 + BYTE(0)
20860 +
20861 +#ifdef CONFIG_PAX_KERNEXEC
20862 + . = ALIGN(HPAGE_SIZE);
20863 +#else
20864 + . = ALIGN(PAGE_SIZE);
20865 +#endif
20866 +
20867 __init_begin = .; /* paired with __init_end */
20868 - }
20869 + } :init.begin
20870
20871 -#if defined(CONFIG_X86_64) && defined(CONFIG_SMP)
20872 +#ifdef CONFIG_SMP
20873 /*
20874 * percpu offsets are zero-based on SMP. PERCPU_VADDR() changes the
20875 * output PHDR, so the next output section - .init.text - should
20876 @@ -201,12 +267,27 @@ SECTIONS
20877 PERCPU_VADDR(0, :percpu)
20878 #endif
20879
20880 - INIT_TEXT_SECTION(PAGE_SIZE)
20881 -#ifdef CONFIG_X86_64
20882 - :init
20883 -#endif
20884 + . = ALIGN(PAGE_SIZE);
20885 + init_begin = .;
20886 + .init.text (. - __KERNEL_TEXT_OFFSET): AT(init_begin - LOAD_OFFSET) {
20887 + VMLINUX_SYMBOL(_sinittext) = .;
20888 + INIT_TEXT
20889 + VMLINUX_SYMBOL(_einittext) = .;
20890 + . = ALIGN(PAGE_SIZE);
20891 + } :text.init
20892
20893 - INIT_DATA_SECTION(16)
20894 + /*
20895 + * .exit.text is discard at runtime, not link time, to deal with
20896 + * references from .altinstructions and .eh_frame
20897 + */
20898 + .exit.text : AT(ADDR(.exit.text) - LOAD_OFFSET + __KERNEL_TEXT_OFFSET) {
20899 + EXIT_TEXT
20900 + . = ALIGN(16);
20901 + } :text.exit
20902 + . = init_begin + SIZEOF(.init.text) + SIZEOF(.exit.text);
20903 +
20904 + . = ALIGN(PAGE_SIZE);
20905 + INIT_DATA_SECTION(16) :init
20906
20907 .x86_cpu_dev.init : AT(ADDR(.x86_cpu_dev.init) - LOAD_OFFSET) {
20908 __x86_cpu_dev_start = .;
20909 @@ -232,19 +313,11 @@ SECTIONS
20910 *(.altinstr_replacement)
20911 }
20912
20913 - /*
20914 - * .exit.text is discard at runtime, not link time, to deal with
20915 - * references from .altinstructions and .eh_frame
20916 - */
20917 - .exit.text : AT(ADDR(.exit.text) - LOAD_OFFSET) {
20918 - EXIT_TEXT
20919 - }
20920 -
20921 .exit.data : AT(ADDR(.exit.data) - LOAD_OFFSET) {
20922 EXIT_DATA
20923 }
20924
20925 -#if !defined(CONFIG_X86_64) || !defined(CONFIG_SMP)
20926 +#ifndef CONFIG_SMP
20927 PERCPU(PAGE_SIZE)
20928 #endif
20929
20930 @@ -267,12 +340,6 @@ SECTIONS
20931 . = ALIGN(PAGE_SIZE);
20932 }
20933
20934 -#ifdef CONFIG_X86_64
20935 - .data_nosave : AT(ADDR(.data_nosave) - LOAD_OFFSET) {
20936 - NOSAVE_DATA
20937 - }
20938 -#endif
20939 -
20940 /* BSS */
20941 . = ALIGN(PAGE_SIZE);
20942 .bss : AT(ADDR(.bss) - LOAD_OFFSET) {
20943 @@ -288,6 +355,7 @@ SECTIONS
20944 __brk_base = .;
20945 . += 64 * 1024; /* 64k alignment slop space */
20946 *(.brk_reservation) /* areas brk users have reserved */
20947 + . = ALIGN(HPAGE_SIZE);
20948 __brk_limit = .;
20949 }
20950
20951 @@ -316,13 +384,12 @@ SECTIONS
20952 * for the boot processor.
20953 */
20954 #define INIT_PER_CPU(x) init_per_cpu__##x = per_cpu__##x + __per_cpu_load
20955 -INIT_PER_CPU(gdt_page);
20956 INIT_PER_CPU(irq_stack_union);
20957
20958 /*
20959 * Build-time check on the image size:
20960 */
20961 -. = ASSERT((_end - _text <= KERNEL_IMAGE_SIZE),
20962 +. = ASSERT((_end - _text - __KERNEL_TEXT_OFFSET <= KERNEL_IMAGE_SIZE),
20963 "kernel image bigger than KERNEL_IMAGE_SIZE");
20964
20965 #ifdef CONFIG_SMP
20966 diff --git a/arch/x86/kernel/vsyscall_64.c b/arch/x86/kernel/vsyscall_64.c
20967 index 62f39d7..3bc46a1 100644
20968 --- a/arch/x86/kernel/vsyscall_64.c
20969 +++ b/arch/x86/kernel/vsyscall_64.c
20970 @@ -80,6 +80,7 @@ void update_vsyscall(struct timespec *wall_time, struct clocksource *clock,
20971
20972 write_seqlock_irqsave(&vsyscall_gtod_data.lock, flags);
20973 /* copy vsyscall data */
20974 + strlcpy(vsyscall_gtod_data.clock.name, clock->name, sizeof vsyscall_gtod_data.clock.name);
20975 vsyscall_gtod_data.clock.vread = clock->vread;
20976 vsyscall_gtod_data.clock.cycle_last = clock->cycle_last;
20977 vsyscall_gtod_data.clock.mask = clock->mask;
20978 @@ -203,7 +204,7 @@ vgetcpu(unsigned *cpu, unsigned *node, struct getcpu_cache *tcache)
20979 We do this here because otherwise user space would do it on
20980 its own in a likely inferior way (no access to jiffies).
20981 If you don't like it pass NULL. */
20982 - if (tcache && tcache->blob[0] == (j = __jiffies)) {
20983 + if (tcache && tcache->blob[0] == (j = jiffies)) {
20984 p = tcache->blob[1];
20985 } else if (__vgetcpu_mode == VGETCPU_RDTSCP) {
20986 /* Load per CPU data from RDTSCP */
20987 diff --git a/arch/x86/kernel/x8664_ksyms_64.c b/arch/x86/kernel/x8664_ksyms_64.c
20988 index 3909e3b..5433a97 100644
20989 --- a/arch/x86/kernel/x8664_ksyms_64.c
20990 +++ b/arch/x86/kernel/x8664_ksyms_64.c
20991 @@ -30,8 +30,6 @@ EXPORT_SYMBOL(__put_user_8);
20992
20993 EXPORT_SYMBOL(copy_user_generic);
20994 EXPORT_SYMBOL(__copy_user_nocache);
20995 -EXPORT_SYMBOL(copy_from_user);
20996 -EXPORT_SYMBOL(copy_to_user);
20997 EXPORT_SYMBOL(__copy_from_user_inatomic);
20998
20999 EXPORT_SYMBOL(copy_page);
21000 diff --git a/arch/x86/kernel/xsave.c b/arch/x86/kernel/xsave.c
21001 index c5ee17e..d63218f 100644
21002 --- a/arch/x86/kernel/xsave.c
21003 +++ b/arch/x86/kernel/xsave.c
21004 @@ -54,7 +54,7 @@ int check_for_xstate(struct i387_fxsave_struct __user *buf,
21005 fx_sw_user->xstate_size > fx_sw_user->extended_size)
21006 return -1;
21007
21008 - err = __get_user(magic2, (__u32 *) (((void *)fpstate) +
21009 + err = __get_user(magic2, (__u32 __user *) (((void __user *)fpstate) +
21010 fx_sw_user->extended_size -
21011 FP_XSTATE_MAGIC2_SIZE));
21012 /*
21013 @@ -196,7 +196,7 @@ fx_only:
21014 * the other extended state.
21015 */
21016 xrstor_state(init_xstate_buf, pcntxt_mask & ~XSTATE_FPSSE);
21017 - return fxrstor_checking((__force struct i387_fxsave_struct *)buf);
21018 + return fxrstor_checking((struct i387_fxsave_struct __force_kernel *)buf);
21019 }
21020
21021 /*
21022 @@ -228,7 +228,7 @@ int restore_i387_xstate(void __user *buf)
21023 if (task_thread_info(tsk)->status & TS_XSAVE)
21024 err = restore_user_xstate(buf);
21025 else
21026 - err = fxrstor_checking((__force struct i387_fxsave_struct *)
21027 + err = fxrstor_checking((struct i387_fxsave_struct __user *)
21028 buf);
21029 if (unlikely(err)) {
21030 /*
21031 diff --git a/arch/x86/kvm/emulate.c b/arch/x86/kvm/emulate.c
21032 index 1350e43..a94b011 100644
21033 --- a/arch/x86/kvm/emulate.c
21034 +++ b/arch/x86/kvm/emulate.c
21035 @@ -81,8 +81,8 @@
21036 #define Src2CL (1<<29)
21037 #define Src2ImmByte (2<<29)
21038 #define Src2One (3<<29)
21039 -#define Src2Imm16 (4<<29)
21040 -#define Src2Mask (7<<29)
21041 +#define Src2Imm16 (4U<<29)
21042 +#define Src2Mask (7U<<29)
21043
21044 enum {
21045 Group1_80, Group1_81, Group1_82, Group1_83,
21046 @@ -411,6 +411,7 @@ static u32 group2_table[] = {
21047
21048 #define ____emulate_2op(_op, _src, _dst, _eflags, _x, _y, _suffix) \
21049 do { \
21050 + unsigned long _tmp; \
21051 __asm__ __volatile__ ( \
21052 _PRE_EFLAGS("0", "4", "2") \
21053 _op _suffix " %"_x"3,%1; " \
21054 @@ -424,8 +425,6 @@ static u32 group2_table[] = {
21055 /* Raw emulation: instruction has two explicit operands. */
21056 #define __emulate_2op_nobyte(_op,_src,_dst,_eflags,_wx,_wy,_lx,_ly,_qx,_qy) \
21057 do { \
21058 - unsigned long _tmp; \
21059 - \
21060 switch ((_dst).bytes) { \
21061 case 2: \
21062 ____emulate_2op(_op,_src,_dst,_eflags,_wx,_wy,"w"); \
21063 @@ -441,7 +440,6 @@ static u32 group2_table[] = {
21064
21065 #define __emulate_2op(_op,_src,_dst,_eflags,_bx,_by,_wx,_wy,_lx,_ly,_qx,_qy) \
21066 do { \
21067 - unsigned long _tmp; \
21068 switch ((_dst).bytes) { \
21069 case 1: \
21070 ____emulate_2op(_op,_src,_dst,_eflags,_bx,_by,"b"); \
21071 diff --git a/arch/x86/kvm/lapic.c b/arch/x86/kvm/lapic.c
21072 index 8dfeaaa..4daa395 100644
21073 --- a/arch/x86/kvm/lapic.c
21074 +++ b/arch/x86/kvm/lapic.c
21075 @@ -52,7 +52,7 @@
21076 #define APIC_BUS_CYCLE_NS 1
21077
21078 /* #define apic_debug(fmt,arg...) printk(KERN_WARNING fmt,##arg) */
21079 -#define apic_debug(fmt, arg...)
21080 +#define apic_debug(fmt, arg...) do {} while (0)
21081
21082 #define APIC_LVT_NUM 6
21083 /* 14 is the version for Xeon and Pentium 8.4.8*/
21084 diff --git a/arch/x86/kvm/paging_tmpl.h b/arch/x86/kvm/paging_tmpl.h
21085 index 3bc2707..dd157e2 100644
21086 --- a/arch/x86/kvm/paging_tmpl.h
21087 +++ b/arch/x86/kvm/paging_tmpl.h
21088 @@ -416,6 +416,8 @@ static int FNAME(page_fault)(struct kvm_vcpu *vcpu, gva_t addr,
21089 int level = PT_PAGE_TABLE_LEVEL;
21090 unsigned long mmu_seq;
21091
21092 + pax_track_stack();
21093 +
21094 pgprintk("%s: addr %lx err %x\n", __func__, addr, error_code);
21095 kvm_mmu_audit(vcpu, "pre page fault");
21096
21097 @@ -461,6 +463,7 @@ static int FNAME(page_fault)(struct kvm_vcpu *vcpu, gva_t addr,
21098 kvm_mmu_free_some_pages(vcpu);
21099 sptep = FNAME(fetch)(vcpu, addr, &walker, user_fault, write_fault,
21100 level, &write_pt, pfn);
21101 + (void)sptep;
21102 pgprintk("%s: shadow pte %p %llx ptwrite %d\n", __func__,
21103 sptep, *sptep, write_pt);
21104
21105 diff --git a/arch/x86/kvm/svm.c b/arch/x86/kvm/svm.c
21106 index 7c6e63e..c5d92c1 100644
21107 --- a/arch/x86/kvm/svm.c
21108 +++ b/arch/x86/kvm/svm.c
21109 @@ -2486,7 +2486,11 @@ static void reload_tss(struct kvm_vcpu *vcpu)
21110 int cpu = raw_smp_processor_id();
21111
21112 struct svm_cpu_data *svm_data = per_cpu(svm_data, cpu);
21113 +
21114 + pax_open_kernel();
21115 svm_data->tss_desc->type = 9; /* available 32/64-bit TSS */
21116 + pax_close_kernel();
21117 +
21118 load_TR_desc();
21119 }
21120
21121 @@ -2947,7 +2951,7 @@ static bool svm_gb_page_enable(void)
21122 return true;
21123 }
21124
21125 -static struct kvm_x86_ops svm_x86_ops = {
21126 +static const struct kvm_x86_ops svm_x86_ops = {
21127 .cpu_has_kvm_support = has_svm,
21128 .disabled_by_bios = is_disabled,
21129 .hardware_setup = svm_hardware_setup,
21130 diff --git a/arch/x86/kvm/vmx.c b/arch/x86/kvm/vmx.c
21131 index e6d925f..e7a4af8 100644
21132 --- a/arch/x86/kvm/vmx.c
21133 +++ b/arch/x86/kvm/vmx.c
21134 @@ -570,7 +570,11 @@ static void reload_tss(void)
21135
21136 kvm_get_gdt(&gdt);
21137 descs = (void *)gdt.base;
21138 +
21139 + pax_open_kernel();
21140 descs[GDT_ENTRY_TSS].type = 9; /* available TSS */
21141 + pax_close_kernel();
21142 +
21143 load_TR_desc();
21144 }
21145
21146 @@ -1410,8 +1414,11 @@ static __init int hardware_setup(void)
21147 if (!cpu_has_vmx_flexpriority())
21148 flexpriority_enabled = 0;
21149
21150 - if (!cpu_has_vmx_tpr_shadow())
21151 - kvm_x86_ops->update_cr8_intercept = NULL;
21152 + if (!cpu_has_vmx_tpr_shadow()) {
21153 + pax_open_kernel();
21154 + *(void **)&kvm_x86_ops->update_cr8_intercept = NULL;
21155 + pax_close_kernel();
21156 + }
21157
21158 if (enable_ept && !cpu_has_vmx_ept_2m_page())
21159 kvm_disable_largepages();
21160 @@ -2362,7 +2369,7 @@ static int vmx_vcpu_setup(struct vcpu_vmx *vmx)
21161 vmcs_writel(HOST_IDTR_BASE, dt.base); /* 22.2.4 */
21162
21163 asm("mov $.Lkvm_vmx_return, %0" : "=r"(kvm_vmx_return));
21164 - vmcs_writel(HOST_RIP, kvm_vmx_return); /* 22.2.5 */
21165 + vmcs_writel(HOST_RIP, ktla_ktva(kvm_vmx_return)); /* 22.2.5 */
21166 vmcs_write32(VM_EXIT_MSR_STORE_COUNT, 0);
21167 vmcs_write32(VM_EXIT_MSR_LOAD_COUNT, 0);
21168 vmcs_write32(VM_ENTRY_MSR_LOAD_COUNT, 0);
21169 @@ -3718,6 +3725,12 @@ static void vmx_vcpu_run(struct kvm_vcpu *vcpu, struct kvm_run *kvm_run)
21170 "jmp .Lkvm_vmx_return \n\t"
21171 ".Llaunched: " __ex(ASM_VMX_VMRESUME) "\n\t"
21172 ".Lkvm_vmx_return: "
21173 +
21174 +#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
21175 + "ljmp %[cs],$.Lkvm_vmx_return2\n\t"
21176 + ".Lkvm_vmx_return2: "
21177 +#endif
21178 +
21179 /* Save guest registers, load host registers, keep flags */
21180 "xchg %0, (%%"R"sp) \n\t"
21181 "mov %%"R"ax, %c[rax](%0) \n\t"
21182 @@ -3764,8 +3777,13 @@ static void vmx_vcpu_run(struct kvm_vcpu *vcpu, struct kvm_run *kvm_run)
21183 [r15]"i"(offsetof(struct vcpu_vmx, vcpu.arch.regs[VCPU_REGS_R15])),
21184 #endif
21185 [cr2]"i"(offsetof(struct vcpu_vmx, vcpu.arch.cr2))
21186 +
21187 +#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
21188 + ,[cs]"i"(__KERNEL_CS)
21189 +#endif
21190 +
21191 : "cc", "memory"
21192 - , R"bx", R"di", R"si"
21193 + , R"ax", R"bx", R"di", R"si"
21194 #ifdef CONFIG_X86_64
21195 , "r8", "r9", "r10", "r11", "r12", "r13", "r14", "r15"
21196 #endif
21197 @@ -3782,7 +3800,16 @@ static void vmx_vcpu_run(struct kvm_vcpu *vcpu, struct kvm_run *kvm_run)
21198 if (vmx->rmode.irq.pending)
21199 fixup_rmode_irq(vmx);
21200
21201 - asm("mov %0, %%ds; mov %0, %%es" : : "r"(__USER_DS));
21202 + asm("mov %0, %%ds; mov %0, %%es; mov %0, %%ss" : : "r"(__KERNEL_DS));
21203 +
21204 +#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
21205 + loadsegment(fs, __KERNEL_PERCPU);
21206 +#endif
21207 +
21208 +#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_MEMORY_UDEREF)
21209 + __set_fs(current_thread_info()->addr_limit);
21210 +#endif
21211 +
21212 vmx->launched = 1;
21213
21214 vmx_complete_interrupts(vmx);
21215 @@ -3957,7 +3984,7 @@ static bool vmx_gb_page_enable(void)
21216 return false;
21217 }
21218
21219 -static struct kvm_x86_ops vmx_x86_ops = {
21220 +static const struct kvm_x86_ops vmx_x86_ops = {
21221 .cpu_has_kvm_support = cpu_has_kvm_support,
21222 .disabled_by_bios = vmx_disabled_by_bios,
21223 .hardware_setup = hardware_setup,
21224 diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c
21225 index df1cefb..5e882ad 100644
21226 --- a/arch/x86/kvm/x86.c
21227 +++ b/arch/x86/kvm/x86.c
21228 @@ -82,7 +82,7 @@ static void update_cr8_intercept(struct kvm_vcpu *vcpu);
21229 static int kvm_dev_ioctl_get_supported_cpuid(struct kvm_cpuid2 *cpuid,
21230 struct kvm_cpuid_entry2 __user *entries);
21231
21232 -struct kvm_x86_ops *kvm_x86_ops;
21233 +const struct kvm_x86_ops *kvm_x86_ops;
21234 EXPORT_SYMBOL_GPL(kvm_x86_ops);
21235
21236 int ignore_msrs = 0;
21237 @@ -1430,15 +1430,20 @@ static int kvm_vcpu_ioctl_set_cpuid2(struct kvm_vcpu *vcpu,
21238 struct kvm_cpuid2 *cpuid,
21239 struct kvm_cpuid_entry2 __user *entries)
21240 {
21241 - int r;
21242 + int r, i;
21243
21244 r = -E2BIG;
21245 if (cpuid->nent > KVM_MAX_CPUID_ENTRIES)
21246 goto out;
21247 r = -EFAULT;
21248 - if (copy_from_user(&vcpu->arch.cpuid_entries, entries,
21249 - cpuid->nent * sizeof(struct kvm_cpuid_entry2)))
21250 + if (!access_ok(VERIFY_READ, entries, cpuid->nent * sizeof(struct kvm_cpuid_entry2)))
21251 goto out;
21252 + for (i = 0; i < cpuid->nent; ++i) {
21253 + struct kvm_cpuid_entry2 cpuid_entry;
21254 + if (__copy_from_user(&cpuid_entry, entries + i, sizeof(cpuid_entry)))
21255 + goto out;
21256 + vcpu->arch.cpuid_entries[i] = cpuid_entry;
21257 + }
21258 vcpu->arch.cpuid_nent = cpuid->nent;
21259 kvm_apic_set_version(vcpu);
21260 return 0;
21261 @@ -1451,16 +1456,20 @@ static int kvm_vcpu_ioctl_get_cpuid2(struct kvm_vcpu *vcpu,
21262 struct kvm_cpuid2 *cpuid,
21263 struct kvm_cpuid_entry2 __user *entries)
21264 {
21265 - int r;
21266 + int r, i;
21267
21268 vcpu_load(vcpu);
21269 r = -E2BIG;
21270 if (cpuid->nent < vcpu->arch.cpuid_nent)
21271 goto out;
21272 r = -EFAULT;
21273 - if (copy_to_user(entries, &vcpu->arch.cpuid_entries,
21274 - vcpu->arch.cpuid_nent * sizeof(struct kvm_cpuid_entry2)))
21275 + if (!access_ok(VERIFY_WRITE, entries, vcpu->arch.cpuid_nent * sizeof(struct kvm_cpuid_entry2)))
21276 goto out;
21277 + for (i = 0; i < vcpu->arch.cpuid_nent; ++i) {
21278 + struct kvm_cpuid_entry2 cpuid_entry = vcpu->arch.cpuid_entries[i];
21279 + if (__copy_to_user(entries + i, &cpuid_entry, sizeof(cpuid_entry)))
21280 + goto out;
21281 + }
21282 return 0;
21283
21284 out:
21285 @@ -1678,7 +1687,7 @@ static int kvm_vcpu_ioctl_set_lapic(struct kvm_vcpu *vcpu,
21286 static int kvm_vcpu_ioctl_interrupt(struct kvm_vcpu *vcpu,
21287 struct kvm_interrupt *irq)
21288 {
21289 - if (irq->irq < 0 || irq->irq >= 256)
21290 + if (irq->irq >= 256)
21291 return -EINVAL;
21292 if (irqchip_in_kernel(vcpu->kvm))
21293 return -ENXIO;
21294 @@ -3260,10 +3269,10 @@ static struct notifier_block kvmclock_cpufreq_notifier_block = {
21295 .notifier_call = kvmclock_cpufreq_notifier
21296 };
21297
21298 -int kvm_arch_init(void *opaque)
21299 +int kvm_arch_init(const void *opaque)
21300 {
21301 int r, cpu;
21302 - struct kvm_x86_ops *ops = (struct kvm_x86_ops *)opaque;
21303 + const struct kvm_x86_ops *ops = (const struct kvm_x86_ops *)opaque;
21304
21305 if (kvm_x86_ops) {
21306 printk(KERN_ERR "kvm: already loaded the other module\n");
21307 diff --git a/arch/x86/lguest/boot.c b/arch/x86/lguest/boot.c
21308 index 7e59dc1..b88c98f 100644
21309 --- a/arch/x86/lguest/boot.c
21310 +++ b/arch/x86/lguest/boot.c
21311 @@ -1172,9 +1172,10 @@ static __init int early_put_chars(u32 vtermno, const char *buf, int count)
21312 * Rebooting also tells the Host we're finished, but the RESTART flag tells the
21313 * Launcher to reboot us.
21314 */
21315 -static void lguest_restart(char *reason)
21316 +static __noreturn void lguest_restart(char *reason)
21317 {
21318 kvm_hypercall2(LHCALL_SHUTDOWN, __pa(reason), LGUEST_SHUTDOWN_RESTART);
21319 + BUG();
21320 }
21321
21322 /*G:050
21323 diff --git a/arch/x86/lib/atomic64_32.c b/arch/x86/lib/atomic64_32.c
21324 index 824fa0b..c619e96 100644
21325 --- a/arch/x86/lib/atomic64_32.c
21326 +++ b/arch/x86/lib/atomic64_32.c
21327 @@ -25,6 +25,12 @@ u64 atomic64_cmpxchg(atomic64_t *ptr, u64 old_val, u64 new_val)
21328 }
21329 EXPORT_SYMBOL(atomic64_cmpxchg);
21330
21331 +u64 atomic64_cmpxchg_unchecked(atomic64_unchecked_t *ptr, u64 old_val, u64 new_val)
21332 +{
21333 + return cmpxchg8b(&ptr->counter, old_val, new_val);
21334 +}
21335 +EXPORT_SYMBOL(atomic64_cmpxchg_unchecked);
21336 +
21337 /**
21338 * atomic64_xchg - xchg atomic64 variable
21339 * @ptr: pointer to type atomic64_t
21340 @@ -56,6 +62,36 @@ u64 atomic64_xchg(atomic64_t *ptr, u64 new_val)
21341 EXPORT_SYMBOL(atomic64_xchg);
21342
21343 /**
21344 + * atomic64_xchg_unchecked - xchg atomic64 variable
21345 + * @ptr: pointer to type atomic64_unchecked_t
21346 + * @new_val: value to assign
21347 + *
21348 + * Atomically xchgs the value of @ptr to @new_val and returns
21349 + * the old value.
21350 + */
21351 +u64 atomic64_xchg_unchecked(atomic64_unchecked_t *ptr, u64 new_val)
21352 +{
21353 + /*
21354 + * Try first with a (possibly incorrect) assumption about
21355 + * what we have there. We'll do two loops most likely,
21356 + * but we'll get an ownership MESI transaction straight away
21357 + * instead of a read transaction followed by a
21358 + * flush-for-ownership transaction:
21359 + */
21360 + u64 old_val, real_val = 0;
21361 +
21362 + do {
21363 + old_val = real_val;
21364 +
21365 + real_val = atomic64_cmpxchg_unchecked(ptr, old_val, new_val);
21366 +
21367 + } while (real_val != old_val);
21368 +
21369 + return old_val;
21370 +}
21371 +EXPORT_SYMBOL(atomic64_xchg_unchecked);
21372 +
21373 +/**
21374 * atomic64_set - set atomic64 variable
21375 * @ptr: pointer to type atomic64_t
21376 * @new_val: value to assign
21377 @@ -69,7 +105,19 @@ void atomic64_set(atomic64_t *ptr, u64 new_val)
21378 EXPORT_SYMBOL(atomic64_set);
21379
21380 /**
21381 -EXPORT_SYMBOL(atomic64_read);
21382 + * atomic64_unchecked_set - set atomic64 variable
21383 + * @ptr: pointer to type atomic64_unchecked_t
21384 + * @new_val: value to assign
21385 + *
21386 + * Atomically sets the value of @ptr to @new_val.
21387 + */
21388 +void atomic64_set_unchecked(atomic64_unchecked_t *ptr, u64 new_val)
21389 +{
21390 + atomic64_xchg_unchecked(ptr, new_val);
21391 +}
21392 +EXPORT_SYMBOL(atomic64_set_unchecked);
21393 +
21394 +/**
21395 * atomic64_add_return - add and return
21396 * @delta: integer value to add
21397 * @ptr: pointer to type atomic64_t
21398 @@ -99,24 +147,72 @@ noinline u64 atomic64_add_return(u64 delta, atomic64_t *ptr)
21399 }
21400 EXPORT_SYMBOL(atomic64_add_return);
21401
21402 +/**
21403 + * atomic64_add_return_unchecked - add and return
21404 + * @delta: integer value to add
21405 + * @ptr: pointer to type atomic64_unchecked_t
21406 + *
21407 + * Atomically adds @delta to @ptr and returns @delta + *@ptr
21408 + */
21409 +noinline u64 atomic64_add_return_unchecked(u64 delta, atomic64_unchecked_t *ptr)
21410 +{
21411 + /*
21412 + * Try first with a (possibly incorrect) assumption about
21413 + * what we have there. We'll do two loops most likely,
21414 + * but we'll get an ownership MESI transaction straight away
21415 + * instead of a read transaction followed by a
21416 + * flush-for-ownership transaction:
21417 + */
21418 + u64 old_val, new_val, real_val = 0;
21419 +
21420 + do {
21421 + old_val = real_val;
21422 + new_val = old_val + delta;
21423 +
21424 + real_val = atomic64_cmpxchg_unchecked(ptr, old_val, new_val);
21425 +
21426 + } while (real_val != old_val);
21427 +
21428 + return new_val;
21429 +}
21430 +EXPORT_SYMBOL(atomic64_add_return_unchecked);
21431 +
21432 u64 atomic64_sub_return(u64 delta, atomic64_t *ptr)
21433 {
21434 return atomic64_add_return(-delta, ptr);
21435 }
21436 EXPORT_SYMBOL(atomic64_sub_return);
21437
21438 +u64 atomic64_sub_return_unchecked(u64 delta, atomic64_unchecked_t *ptr)
21439 +{
21440 + return atomic64_add_return_unchecked(-delta, ptr);
21441 +}
21442 +EXPORT_SYMBOL(atomic64_sub_return_unchecked);
21443 +
21444 u64 atomic64_inc_return(atomic64_t *ptr)
21445 {
21446 return atomic64_add_return(1, ptr);
21447 }
21448 EXPORT_SYMBOL(atomic64_inc_return);
21449
21450 +u64 atomic64_inc_return_unchecked(atomic64_unchecked_t *ptr)
21451 +{
21452 + return atomic64_add_return_unchecked(1, ptr);
21453 +}
21454 +EXPORT_SYMBOL(atomic64_inc_return_unchecked);
21455 +
21456 u64 atomic64_dec_return(atomic64_t *ptr)
21457 {
21458 return atomic64_sub_return(1, ptr);
21459 }
21460 EXPORT_SYMBOL(atomic64_dec_return);
21461
21462 +u64 atomic64_dec_return_unchecked(atomic64_unchecked_t *ptr)
21463 +{
21464 + return atomic64_sub_return_unchecked(1, ptr);
21465 +}
21466 +EXPORT_SYMBOL(atomic64_dec_return_unchecked);
21467 +
21468 /**
21469 * atomic64_add - add integer to atomic64 variable
21470 * @delta: integer value to add
21471 @@ -131,6 +227,19 @@ void atomic64_add(u64 delta, atomic64_t *ptr)
21472 EXPORT_SYMBOL(atomic64_add);
21473
21474 /**
21475 + * atomic64_add_unchecked - add integer to atomic64 variable
21476 + * @delta: integer value to add
21477 + * @ptr: pointer to type atomic64_unchecked_t
21478 + *
21479 + * Atomically adds @delta to @ptr.
21480 + */
21481 +void atomic64_add_unchecked(u64 delta, atomic64_unchecked_t *ptr)
21482 +{
21483 + atomic64_add_return_unchecked(delta, ptr);
21484 +}
21485 +EXPORT_SYMBOL(atomic64_add_unchecked);
21486 +
21487 +/**
21488 * atomic64_sub - subtract the atomic64 variable
21489 * @delta: integer value to subtract
21490 * @ptr: pointer to type atomic64_t
21491 @@ -144,6 +253,19 @@ void atomic64_sub(u64 delta, atomic64_t *ptr)
21492 EXPORT_SYMBOL(atomic64_sub);
21493
21494 /**
21495 + * atomic64_sub_unchecked - subtract the atomic64 variable
21496 + * @delta: integer value to subtract
21497 + * @ptr: pointer to type atomic64_unchecked_t
21498 + *
21499 + * Atomically subtracts @delta from @ptr.
21500 + */
21501 +void atomic64_sub_unchecked(u64 delta, atomic64_unchecked_t *ptr)
21502 +{
21503 + atomic64_add_unchecked(-delta, ptr);
21504 +}
21505 +EXPORT_SYMBOL(atomic64_sub_unchecked);
21506 +
21507 +/**
21508 * atomic64_sub_and_test - subtract value from variable and test result
21509 * @delta: integer value to subtract
21510 * @ptr: pointer to type atomic64_t
21511 @@ -173,6 +295,18 @@ void atomic64_inc(atomic64_t *ptr)
21512 EXPORT_SYMBOL(atomic64_inc);
21513
21514 /**
21515 + * atomic64_inc_unchecked - increment atomic64 variable
21516 + * @ptr: pointer to type atomic64_unchecked_t
21517 + *
21518 + * Atomically increments @ptr by 1.
21519 + */
21520 +void atomic64_inc_unchecked(atomic64_unchecked_t *ptr)
21521 +{
21522 + atomic64_add_unchecked(1, ptr);
21523 +}
21524 +EXPORT_SYMBOL(atomic64_inc_unchecked);
21525 +
21526 +/**
21527 * atomic64_dec - decrement atomic64 variable
21528 * @ptr: pointer to type atomic64_t
21529 *
21530 @@ -185,6 +319,18 @@ void atomic64_dec(atomic64_t *ptr)
21531 EXPORT_SYMBOL(atomic64_dec);
21532
21533 /**
21534 + * atomic64_dec_unchecked - decrement atomic64 variable
21535 + * @ptr: pointer to type atomic64_unchecked_t
21536 + *
21537 + * Atomically decrements @ptr by 1.
21538 + */
21539 +void atomic64_dec_unchecked(atomic64_unchecked_t *ptr)
21540 +{
21541 + atomic64_sub_unchecked(1, ptr);
21542 +}
21543 +EXPORT_SYMBOL(atomic64_dec_unchecked);
21544 +
21545 +/**
21546 * atomic64_dec_and_test - decrement and test
21547 * @ptr: pointer to type atomic64_t
21548 *
21549 diff --git a/arch/x86/lib/checksum_32.S b/arch/x86/lib/checksum_32.S
21550 index adbccd0..98f96c8 100644
21551 --- a/arch/x86/lib/checksum_32.S
21552 +++ b/arch/x86/lib/checksum_32.S
21553 @@ -28,7 +28,8 @@
21554 #include <linux/linkage.h>
21555 #include <asm/dwarf2.h>
21556 #include <asm/errno.h>
21557 -
21558 +#include <asm/segment.h>
21559 +
21560 /*
21561 * computes a partial checksum, e.g. for TCP/UDP fragments
21562 */
21563 @@ -304,9 +305,28 @@ unsigned int csum_partial_copy_generic (const char *src, char *dst,
21564
21565 #define ARGBASE 16
21566 #define FP 12
21567 -
21568 -ENTRY(csum_partial_copy_generic)
21569 +
21570 +ENTRY(csum_partial_copy_generic_to_user)
21571 CFI_STARTPROC
21572 +
21573 +#ifdef CONFIG_PAX_MEMORY_UDEREF
21574 + pushl %gs
21575 + CFI_ADJUST_CFA_OFFSET 4
21576 + popl %es
21577 + CFI_ADJUST_CFA_OFFSET -4
21578 + jmp csum_partial_copy_generic
21579 +#endif
21580 +
21581 +ENTRY(csum_partial_copy_generic_from_user)
21582 +
21583 +#ifdef CONFIG_PAX_MEMORY_UDEREF
21584 + pushl %gs
21585 + CFI_ADJUST_CFA_OFFSET 4
21586 + popl %ds
21587 + CFI_ADJUST_CFA_OFFSET -4
21588 +#endif
21589 +
21590 +ENTRY(csum_partial_copy_generic)
21591 subl $4,%esp
21592 CFI_ADJUST_CFA_OFFSET 4
21593 pushl %edi
21594 @@ -331,7 +351,7 @@ ENTRY(csum_partial_copy_generic)
21595 jmp 4f
21596 SRC(1: movw (%esi), %bx )
21597 addl $2, %esi
21598 -DST( movw %bx, (%edi) )
21599 +DST( movw %bx, %es:(%edi) )
21600 addl $2, %edi
21601 addw %bx, %ax
21602 adcl $0, %eax
21603 @@ -343,30 +363,30 @@ DST( movw %bx, (%edi) )
21604 SRC(1: movl (%esi), %ebx )
21605 SRC( movl 4(%esi), %edx )
21606 adcl %ebx, %eax
21607 -DST( movl %ebx, (%edi) )
21608 +DST( movl %ebx, %es:(%edi) )
21609 adcl %edx, %eax
21610 -DST( movl %edx, 4(%edi) )
21611 +DST( movl %edx, %es:4(%edi) )
21612
21613 SRC( movl 8(%esi), %ebx )
21614 SRC( movl 12(%esi), %edx )
21615 adcl %ebx, %eax
21616 -DST( movl %ebx, 8(%edi) )
21617 +DST( movl %ebx, %es:8(%edi) )
21618 adcl %edx, %eax
21619 -DST( movl %edx, 12(%edi) )
21620 +DST( movl %edx, %es:12(%edi) )
21621
21622 SRC( movl 16(%esi), %ebx )
21623 SRC( movl 20(%esi), %edx )
21624 adcl %ebx, %eax
21625 -DST( movl %ebx, 16(%edi) )
21626 +DST( movl %ebx, %es:16(%edi) )
21627 adcl %edx, %eax
21628 -DST( movl %edx, 20(%edi) )
21629 +DST( movl %edx, %es:20(%edi) )
21630
21631 SRC( movl 24(%esi), %ebx )
21632 SRC( movl 28(%esi), %edx )
21633 adcl %ebx, %eax
21634 -DST( movl %ebx, 24(%edi) )
21635 +DST( movl %ebx, %es:24(%edi) )
21636 adcl %edx, %eax
21637 -DST( movl %edx, 28(%edi) )
21638 +DST( movl %edx, %es:28(%edi) )
21639
21640 lea 32(%esi), %esi
21641 lea 32(%edi), %edi
21642 @@ -380,7 +400,7 @@ DST( movl %edx, 28(%edi) )
21643 shrl $2, %edx # This clears CF
21644 SRC(3: movl (%esi), %ebx )
21645 adcl %ebx, %eax
21646 -DST( movl %ebx, (%edi) )
21647 +DST( movl %ebx, %es:(%edi) )
21648 lea 4(%esi), %esi
21649 lea 4(%edi), %edi
21650 dec %edx
21651 @@ -392,12 +412,12 @@ DST( movl %ebx, (%edi) )
21652 jb 5f
21653 SRC( movw (%esi), %cx )
21654 leal 2(%esi), %esi
21655 -DST( movw %cx, (%edi) )
21656 +DST( movw %cx, %es:(%edi) )
21657 leal 2(%edi), %edi
21658 je 6f
21659 shll $16,%ecx
21660 SRC(5: movb (%esi), %cl )
21661 -DST( movb %cl, (%edi) )
21662 +DST( movb %cl, %es:(%edi) )
21663 6: addl %ecx, %eax
21664 adcl $0, %eax
21665 7:
21666 @@ -408,7 +428,7 @@ DST( movb %cl, (%edi) )
21667
21668 6001:
21669 movl ARGBASE+20(%esp), %ebx # src_err_ptr
21670 - movl $-EFAULT, (%ebx)
21671 + movl $-EFAULT, %ss:(%ebx)
21672
21673 # zero the complete destination - computing the rest
21674 # is too much work
21675 @@ -421,11 +441,19 @@ DST( movb %cl, (%edi) )
21676
21677 6002:
21678 movl ARGBASE+24(%esp), %ebx # dst_err_ptr
21679 - movl $-EFAULT,(%ebx)
21680 + movl $-EFAULT,%ss:(%ebx)
21681 jmp 5000b
21682
21683 .previous
21684
21685 + pushl %ss
21686 + CFI_ADJUST_CFA_OFFSET 4
21687 + popl %ds
21688 + CFI_ADJUST_CFA_OFFSET -4
21689 + pushl %ss
21690 + CFI_ADJUST_CFA_OFFSET 4
21691 + popl %es
21692 + CFI_ADJUST_CFA_OFFSET -4
21693 popl %ebx
21694 CFI_ADJUST_CFA_OFFSET -4
21695 CFI_RESTORE ebx
21696 @@ -439,26 +467,47 @@ DST( movb %cl, (%edi) )
21697 CFI_ADJUST_CFA_OFFSET -4
21698 ret
21699 CFI_ENDPROC
21700 -ENDPROC(csum_partial_copy_generic)
21701 +ENDPROC(csum_partial_copy_generic_to_user)
21702
21703 #else
21704
21705 /* Version for PentiumII/PPro */
21706
21707 #define ROUND1(x) \
21708 + nop; nop; nop; \
21709 SRC(movl x(%esi), %ebx ) ; \
21710 addl %ebx, %eax ; \
21711 - DST(movl %ebx, x(%edi) ) ;
21712 + DST(movl %ebx, %es:x(%edi)) ;
21713
21714 #define ROUND(x) \
21715 + nop; nop; nop; \
21716 SRC(movl x(%esi), %ebx ) ; \
21717 adcl %ebx, %eax ; \
21718 - DST(movl %ebx, x(%edi) ) ;
21719 + DST(movl %ebx, %es:x(%edi)) ;
21720
21721 #define ARGBASE 12
21722 -
21723 -ENTRY(csum_partial_copy_generic)
21724 +
21725 +ENTRY(csum_partial_copy_generic_to_user)
21726 CFI_STARTPROC
21727 +
21728 +#ifdef CONFIG_PAX_MEMORY_UDEREF
21729 + pushl %gs
21730 + CFI_ADJUST_CFA_OFFSET 4
21731 + popl %es
21732 + CFI_ADJUST_CFA_OFFSET -4
21733 + jmp csum_partial_copy_generic
21734 +#endif
21735 +
21736 +ENTRY(csum_partial_copy_generic_from_user)
21737 +
21738 +#ifdef CONFIG_PAX_MEMORY_UDEREF
21739 + pushl %gs
21740 + CFI_ADJUST_CFA_OFFSET 4
21741 + popl %ds
21742 + CFI_ADJUST_CFA_OFFSET -4
21743 +#endif
21744 +
21745 +ENTRY(csum_partial_copy_generic)
21746 pushl %ebx
21747 CFI_ADJUST_CFA_OFFSET 4
21748 CFI_REL_OFFSET ebx, 0
21749 @@ -482,7 +531,7 @@ ENTRY(csum_partial_copy_generic)
21750 subl %ebx, %edi
21751 lea -1(%esi),%edx
21752 andl $-32,%edx
21753 - lea 3f(%ebx,%ebx), %ebx
21754 + lea 3f(%ebx,%ebx,2), %ebx
21755 testl %esi, %esi
21756 jmp *%ebx
21757 1: addl $64,%esi
21758 @@ -503,19 +552,19 @@ ENTRY(csum_partial_copy_generic)
21759 jb 5f
21760 SRC( movw (%esi), %dx )
21761 leal 2(%esi), %esi
21762 -DST( movw %dx, (%edi) )
21763 +DST( movw %dx, %es:(%edi) )
21764 leal 2(%edi), %edi
21765 je 6f
21766 shll $16,%edx
21767 5:
21768 SRC( movb (%esi), %dl )
21769 -DST( movb %dl, (%edi) )
21770 +DST( movb %dl, %es:(%edi) )
21771 6: addl %edx, %eax
21772 adcl $0, %eax
21773 7:
21774 .section .fixup, "ax"
21775 6001: movl ARGBASE+20(%esp), %ebx # src_err_ptr
21776 - movl $-EFAULT, (%ebx)
21777 + movl $-EFAULT, %ss:(%ebx)
21778 # zero the complete destination (computing the rest is too much work)
21779 movl ARGBASE+8(%esp),%edi # dst
21780 movl ARGBASE+12(%esp),%ecx # len
21781 @@ -523,10 +572,21 @@ DST( movb %dl, (%edi) )
21782 rep; stosb
21783 jmp 7b
21784 6002: movl ARGBASE+24(%esp), %ebx # dst_err_ptr
21785 - movl $-EFAULT, (%ebx)
21786 + movl $-EFAULT, %ss:(%ebx)
21787 jmp 7b
21788 .previous
21789
21790 +#ifdef CONFIG_PAX_MEMORY_UDEREF
21791 + pushl %ss
21792 + CFI_ADJUST_CFA_OFFSET 4
21793 + popl %ds
21794 + CFI_ADJUST_CFA_OFFSET -4
21795 + pushl %ss
21796 + CFI_ADJUST_CFA_OFFSET 4
21797 + popl %es
21798 + CFI_ADJUST_CFA_OFFSET -4
21799 +#endif
21800 +
21801 popl %esi
21802 CFI_ADJUST_CFA_OFFSET -4
21803 CFI_RESTORE esi
21804 @@ -538,7 +598,7 @@ DST( movb %dl, (%edi) )
21805 CFI_RESTORE ebx
21806 ret
21807 CFI_ENDPROC
21808 -ENDPROC(csum_partial_copy_generic)
21809 +ENDPROC(csum_partial_copy_generic_to_user)
21810
21811 #undef ROUND
21812 #undef ROUND1
21813 diff --git a/arch/x86/lib/clear_page_64.S b/arch/x86/lib/clear_page_64.S
21814 index ebeafcc..1e3a402 100644
21815 --- a/arch/x86/lib/clear_page_64.S
21816 +++ b/arch/x86/lib/clear_page_64.S
21817 @@ -1,5 +1,6 @@
21818 #include <linux/linkage.h>
21819 #include <asm/dwarf2.h>
21820 +#include <asm/alternative-asm.h>
21821
21822 /*
21823 * Zero a page.
21824 @@ -10,6 +11,7 @@ ENTRY(clear_page_c)
21825 movl $4096/8,%ecx
21826 xorl %eax,%eax
21827 rep stosq
21828 + pax_force_retaddr
21829 ret
21830 CFI_ENDPROC
21831 ENDPROC(clear_page_c)
21832 @@ -33,6 +35,7 @@ ENTRY(clear_page)
21833 leaq 64(%rdi),%rdi
21834 jnz .Lloop
21835 nop
21836 + pax_force_retaddr
21837 ret
21838 CFI_ENDPROC
21839 .Lclear_page_end:
21840 @@ -43,7 +46,7 @@ ENDPROC(clear_page)
21841
21842 #include <asm/cpufeature.h>
21843
21844 - .section .altinstr_replacement,"ax"
21845 + .section .altinstr_replacement,"a"
21846 1: .byte 0xeb /* jmp <disp8> */
21847 .byte (clear_page_c - clear_page) - (2f - 1b) /* offset */
21848 2:
21849 diff --git a/arch/x86/lib/copy_page_64.S b/arch/x86/lib/copy_page_64.S
21850 index 727a5d4..333818a 100644
21851 --- a/arch/x86/lib/copy_page_64.S
21852 +++ b/arch/x86/lib/copy_page_64.S
21853 @@ -2,12 +2,14 @@
21854
21855 #include <linux/linkage.h>
21856 #include <asm/dwarf2.h>
21857 +#include <asm/alternative-asm.h>
21858
21859 ALIGN
21860 copy_page_c:
21861 CFI_STARTPROC
21862 movl $4096/8,%ecx
21863 rep movsq
21864 + pax_force_retaddr
21865 ret
21866 CFI_ENDPROC
21867 ENDPROC(copy_page_c)
21868 @@ -38,7 +40,7 @@ ENTRY(copy_page)
21869 movq 16 (%rsi), %rdx
21870 movq 24 (%rsi), %r8
21871 movq 32 (%rsi), %r9
21872 - movq 40 (%rsi), %r10
21873 + movq 40 (%rsi), %r13
21874 movq 48 (%rsi), %r11
21875 movq 56 (%rsi), %r12
21876
21877 @@ -49,7 +51,7 @@ ENTRY(copy_page)
21878 movq %rdx, 16 (%rdi)
21879 movq %r8, 24 (%rdi)
21880 movq %r9, 32 (%rdi)
21881 - movq %r10, 40 (%rdi)
21882 + movq %r13, 40 (%rdi)
21883 movq %r11, 48 (%rdi)
21884 movq %r12, 56 (%rdi)
21885
21886 @@ -68,7 +70,7 @@ ENTRY(copy_page)
21887 movq 16 (%rsi), %rdx
21888 movq 24 (%rsi), %r8
21889 movq 32 (%rsi), %r9
21890 - movq 40 (%rsi), %r10
21891 + movq 40 (%rsi), %r13
21892 movq 48 (%rsi), %r11
21893 movq 56 (%rsi), %r12
21894
21895 @@ -77,7 +79,7 @@ ENTRY(copy_page)
21896 movq %rdx, 16 (%rdi)
21897 movq %r8, 24 (%rdi)
21898 movq %r9, 32 (%rdi)
21899 - movq %r10, 40 (%rdi)
21900 + movq %r13, 40 (%rdi)
21901 movq %r11, 48 (%rdi)
21902 movq %r12, 56 (%rdi)
21903
21904 @@ -94,6 +96,7 @@ ENTRY(copy_page)
21905 CFI_RESTORE r13
21906 addq $3*8,%rsp
21907 CFI_ADJUST_CFA_OFFSET -3*8
21908 + pax_force_retaddr
21909 ret
21910 .Lcopy_page_end:
21911 CFI_ENDPROC
21912 @@ -104,7 +107,7 @@ ENDPROC(copy_page)
21913
21914 #include <asm/cpufeature.h>
21915
21916 - .section .altinstr_replacement,"ax"
21917 + .section .altinstr_replacement,"a"
21918 1: .byte 0xeb /* jmp <disp8> */
21919 .byte (copy_page_c - copy_page) - (2f - 1b) /* offset */
21920 2:
21921 diff --git a/arch/x86/lib/copy_user_64.S b/arch/x86/lib/copy_user_64.S
21922 index af8debd..40c75f3 100644
21923 --- a/arch/x86/lib/copy_user_64.S
21924 +++ b/arch/x86/lib/copy_user_64.S
21925 @@ -15,13 +15,15 @@
21926 #include <asm/asm-offsets.h>
21927 #include <asm/thread_info.h>
21928 #include <asm/cpufeature.h>
21929 +#include <asm/pgtable.h>
21930 +#include <asm/alternative-asm.h>
21931
21932 .macro ALTERNATIVE_JUMP feature,orig,alt
21933 0:
21934 .byte 0xe9 /* 32bit jump */
21935 .long \orig-1f /* by default jump to orig */
21936 1:
21937 - .section .altinstr_replacement,"ax"
21938 + .section .altinstr_replacement,"a"
21939 2: .byte 0xe9 /* near jump with 32bit immediate */
21940 .long \alt-1b /* offset */ /* or alternatively to alt */
21941 .previous
21942 @@ -64,55 +66,26 @@
21943 #endif
21944 .endm
21945
21946 -/* Standard copy_to_user with segment limit checking */
21947 -ENTRY(copy_to_user)
21948 - CFI_STARTPROC
21949 - GET_THREAD_INFO(%rax)
21950 - movq %rdi,%rcx
21951 - addq %rdx,%rcx
21952 - jc bad_to_user
21953 - cmpq TI_addr_limit(%rax),%rcx
21954 - ja bad_to_user
21955 - ALTERNATIVE_JUMP X86_FEATURE_REP_GOOD,copy_user_generic_unrolled,copy_user_generic_string
21956 - CFI_ENDPROC
21957 -ENDPROC(copy_to_user)
21958 -
21959 -/* Standard copy_from_user with segment limit checking */
21960 -ENTRY(copy_from_user)
21961 - CFI_STARTPROC
21962 - GET_THREAD_INFO(%rax)
21963 - movq %rsi,%rcx
21964 - addq %rdx,%rcx
21965 - jc bad_from_user
21966 - cmpq TI_addr_limit(%rax),%rcx
21967 - ja bad_from_user
21968 - ALTERNATIVE_JUMP X86_FEATURE_REP_GOOD,copy_user_generic_unrolled,copy_user_generic_string
21969 - CFI_ENDPROC
21970 -ENDPROC(copy_from_user)
21971 -
21972 ENTRY(copy_user_generic)
21973 CFI_STARTPROC
21974 ALTERNATIVE_JUMP X86_FEATURE_REP_GOOD,copy_user_generic_unrolled,copy_user_generic_string
21975 CFI_ENDPROC
21976 ENDPROC(copy_user_generic)
21977
21978 -ENTRY(__copy_from_user_inatomic)
21979 - CFI_STARTPROC
21980 - ALTERNATIVE_JUMP X86_FEATURE_REP_GOOD,copy_user_generic_unrolled,copy_user_generic_string
21981 - CFI_ENDPROC
21982 -ENDPROC(__copy_from_user_inatomic)
21983 -
21984 .section .fixup,"ax"
21985 /* must zero dest */
21986 ENTRY(bad_from_user)
21987 bad_from_user:
21988 CFI_STARTPROC
21989 + testl %edx,%edx
21990 + js bad_to_user
21991 movl %edx,%ecx
21992 xorl %eax,%eax
21993 rep
21994 stosb
21995 bad_to_user:
21996 movl %edx,%eax
21997 + pax_force_retaddr
21998 ret
21999 CFI_ENDPROC
22000 ENDPROC(bad_from_user)
22001 @@ -142,19 +115,19 @@ ENTRY(copy_user_generic_unrolled)
22002 jz 17f
22003 1: movq (%rsi),%r8
22004 2: movq 1*8(%rsi),%r9
22005 -3: movq 2*8(%rsi),%r10
22006 +3: movq 2*8(%rsi),%rax
22007 4: movq 3*8(%rsi),%r11
22008 5: movq %r8,(%rdi)
22009 6: movq %r9,1*8(%rdi)
22010 -7: movq %r10,2*8(%rdi)
22011 +7: movq %rax,2*8(%rdi)
22012 8: movq %r11,3*8(%rdi)
22013 9: movq 4*8(%rsi),%r8
22014 10: movq 5*8(%rsi),%r9
22015 -11: movq 6*8(%rsi),%r10
22016 +11: movq 6*8(%rsi),%rax
22017 12: movq 7*8(%rsi),%r11
22018 13: movq %r8,4*8(%rdi)
22019 14: movq %r9,5*8(%rdi)
22020 -15: movq %r10,6*8(%rdi)
22021 +15: movq %rax,6*8(%rdi)
22022 16: movq %r11,7*8(%rdi)
22023 leaq 64(%rsi),%rsi
22024 leaq 64(%rdi),%rdi
22025 @@ -180,6 +153,7 @@ ENTRY(copy_user_generic_unrolled)
22026 decl %ecx
22027 jnz 21b
22028 23: xor %eax,%eax
22029 + pax_force_retaddr
22030 ret
22031
22032 .section .fixup,"ax"
22033 @@ -252,6 +226,7 @@ ENTRY(copy_user_generic_string)
22034 3: rep
22035 movsb
22036 4: xorl %eax,%eax
22037 + pax_force_retaddr
22038 ret
22039
22040 .section .fixup,"ax"
22041 diff --git a/arch/x86/lib/copy_user_nocache_64.S b/arch/x86/lib/copy_user_nocache_64.S
22042 index cb0c112..e3a6895 100644
22043 --- a/arch/x86/lib/copy_user_nocache_64.S
22044 +++ b/arch/x86/lib/copy_user_nocache_64.S
22045 @@ -8,12 +8,14 @@
22046
22047 #include <linux/linkage.h>
22048 #include <asm/dwarf2.h>
22049 +#include <asm/alternative-asm.h>
22050
22051 #define FIX_ALIGNMENT 1
22052
22053 #include <asm/current.h>
22054 #include <asm/asm-offsets.h>
22055 #include <asm/thread_info.h>
22056 +#include <asm/pgtable.h>
22057
22058 .macro ALIGN_DESTINATION
22059 #ifdef FIX_ALIGNMENT
22060 @@ -50,6 +52,15 @@
22061 */
22062 ENTRY(__copy_user_nocache)
22063 CFI_STARTPROC
22064 +
22065 +#ifdef CONFIG_PAX_MEMORY_UDEREF
22066 + mov $PAX_USER_SHADOW_BASE,%rcx
22067 + cmp %rcx,%rsi
22068 + jae 1f
22069 + add %rcx,%rsi
22070 +1:
22071 +#endif
22072 +
22073 cmpl $8,%edx
22074 jb 20f /* less then 8 bytes, go to byte copy loop */
22075 ALIGN_DESTINATION
22076 @@ -59,19 +70,19 @@ ENTRY(__copy_user_nocache)
22077 jz 17f
22078 1: movq (%rsi),%r8
22079 2: movq 1*8(%rsi),%r9
22080 -3: movq 2*8(%rsi),%r10
22081 +3: movq 2*8(%rsi),%rax
22082 4: movq 3*8(%rsi),%r11
22083 5: movnti %r8,(%rdi)
22084 6: movnti %r9,1*8(%rdi)
22085 -7: movnti %r10,2*8(%rdi)
22086 +7: movnti %rax,2*8(%rdi)
22087 8: movnti %r11,3*8(%rdi)
22088 9: movq 4*8(%rsi),%r8
22089 10: movq 5*8(%rsi),%r9
22090 -11: movq 6*8(%rsi),%r10
22091 +11: movq 6*8(%rsi),%rax
22092 12: movq 7*8(%rsi),%r11
22093 13: movnti %r8,4*8(%rdi)
22094 14: movnti %r9,5*8(%rdi)
22095 -15: movnti %r10,6*8(%rdi)
22096 +15: movnti %rax,6*8(%rdi)
22097 16: movnti %r11,7*8(%rdi)
22098 leaq 64(%rsi),%rsi
22099 leaq 64(%rdi),%rdi
22100 @@ -98,6 +109,7 @@ ENTRY(__copy_user_nocache)
22101 jnz 21b
22102 23: xorl %eax,%eax
22103 sfence
22104 + pax_force_retaddr
22105 ret
22106
22107 .section .fixup,"ax"
22108 diff --git a/arch/x86/lib/csum-copy_64.S b/arch/x86/lib/csum-copy_64.S
22109 index f0dba36..48cb4d6 100644
22110 --- a/arch/x86/lib/csum-copy_64.S
22111 +++ b/arch/x86/lib/csum-copy_64.S
22112 @@ -8,6 +8,7 @@
22113 #include <linux/linkage.h>
22114 #include <asm/dwarf2.h>
22115 #include <asm/errno.h>
22116 +#include <asm/alternative-asm.h>
22117
22118 /*
22119 * Checksum copy with exception handling.
22120 @@ -228,6 +229,7 @@ ENTRY(csum_partial_copy_generic)
22121 CFI_RESTORE rbp
22122 addq $7*8,%rsp
22123 CFI_ADJUST_CFA_OFFSET -7*8
22124 + pax_force_retaddr 0, 1
22125 ret
22126 CFI_RESTORE_STATE
22127
22128 diff --git a/arch/x86/lib/csum-wrappers_64.c b/arch/x86/lib/csum-wrappers_64.c
22129 index 459b58a..9570bc7 100644
22130 --- a/arch/x86/lib/csum-wrappers_64.c
22131 +++ b/arch/x86/lib/csum-wrappers_64.c
22132 @@ -52,7 +52,13 @@ csum_partial_copy_from_user(const void __user *src, void *dst,
22133 len -= 2;
22134 }
22135 }
22136 - isum = csum_partial_copy_generic((__force const void *)src,
22137 +
22138 +#ifdef CONFIG_PAX_MEMORY_UDEREF
22139 + if ((unsigned long)src < PAX_USER_SHADOW_BASE)
22140 + src += PAX_USER_SHADOW_BASE;
22141 +#endif
22142 +
22143 + isum = csum_partial_copy_generic((const void __force_kernel *)src,
22144 dst, len, isum, errp, NULL);
22145 if (unlikely(*errp))
22146 goto out_err;
22147 @@ -105,7 +111,13 @@ csum_partial_copy_to_user(const void *src, void __user *dst,
22148 }
22149
22150 *errp = 0;
22151 - return csum_partial_copy_generic(src, (void __force *)dst,
22152 +
22153 +#ifdef CONFIG_PAX_MEMORY_UDEREF
22154 + if ((unsigned long)dst < PAX_USER_SHADOW_BASE)
22155 + dst += PAX_USER_SHADOW_BASE;
22156 +#endif
22157 +
22158 + return csum_partial_copy_generic(src, (void __force_kernel *)dst,
22159 len, isum, NULL, errp);
22160 }
22161 EXPORT_SYMBOL(csum_partial_copy_to_user);
22162 diff --git a/arch/x86/lib/getuser.S b/arch/x86/lib/getuser.S
22163 index 51f1504..ddac4c1 100644
22164 --- a/arch/x86/lib/getuser.S
22165 +++ b/arch/x86/lib/getuser.S
22166 @@ -33,15 +33,38 @@
22167 #include <asm/asm-offsets.h>
22168 #include <asm/thread_info.h>
22169 #include <asm/asm.h>
22170 +#include <asm/segment.h>
22171 +#include <asm/pgtable.h>
22172 +#include <asm/alternative-asm.h>
22173 +
22174 +#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_MEMORY_UDEREF)
22175 +#define __copyuser_seg gs;
22176 +#else
22177 +#define __copyuser_seg
22178 +#endif
22179
22180 .text
22181 ENTRY(__get_user_1)
22182 CFI_STARTPROC
22183 +
22184 +#if !defined(CONFIG_X86_32) || !defined(CONFIG_PAX_MEMORY_UDEREF)
22185 GET_THREAD_INFO(%_ASM_DX)
22186 cmp TI_addr_limit(%_ASM_DX),%_ASM_AX
22187 jae bad_get_user
22188 -1: movzb (%_ASM_AX),%edx
22189 +
22190 +#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
22191 + mov $PAX_USER_SHADOW_BASE,%_ASM_DX
22192 + cmp %_ASM_DX,%_ASM_AX
22193 + jae 1234f
22194 + add %_ASM_DX,%_ASM_AX
22195 +1234:
22196 +#endif
22197 +
22198 +#endif
22199 +
22200 +1: __copyuser_seg movzb (%_ASM_AX),%edx
22201 xor %eax,%eax
22202 + pax_force_retaddr
22203 ret
22204 CFI_ENDPROC
22205 ENDPROC(__get_user_1)
22206 @@ -49,12 +72,26 @@ ENDPROC(__get_user_1)
22207 ENTRY(__get_user_2)
22208 CFI_STARTPROC
22209 add $1,%_ASM_AX
22210 +
22211 +#if !defined(CONFIG_X86_32) || !defined(CONFIG_PAX_MEMORY_UDEREF)
22212 jc bad_get_user
22213 GET_THREAD_INFO(%_ASM_DX)
22214 cmp TI_addr_limit(%_ASM_DX),%_ASM_AX
22215 jae bad_get_user
22216 -2: movzwl -1(%_ASM_AX),%edx
22217 +
22218 +#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
22219 + mov $PAX_USER_SHADOW_BASE,%_ASM_DX
22220 + cmp %_ASM_DX,%_ASM_AX
22221 + jae 1234f
22222 + add %_ASM_DX,%_ASM_AX
22223 +1234:
22224 +#endif
22225 +
22226 +#endif
22227 +
22228 +2: __copyuser_seg movzwl -1(%_ASM_AX),%edx
22229 xor %eax,%eax
22230 + pax_force_retaddr
22231 ret
22232 CFI_ENDPROC
22233 ENDPROC(__get_user_2)
22234 @@ -62,12 +99,26 @@ ENDPROC(__get_user_2)
22235 ENTRY(__get_user_4)
22236 CFI_STARTPROC
22237 add $3,%_ASM_AX
22238 +
22239 +#if !defined(CONFIG_X86_32) || !defined(CONFIG_PAX_MEMORY_UDEREF)
22240 jc bad_get_user
22241 GET_THREAD_INFO(%_ASM_DX)
22242 cmp TI_addr_limit(%_ASM_DX),%_ASM_AX
22243 jae bad_get_user
22244 -3: mov -3(%_ASM_AX),%edx
22245 +
22246 +#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
22247 + mov $PAX_USER_SHADOW_BASE,%_ASM_DX
22248 + cmp %_ASM_DX,%_ASM_AX
22249 + jae 1234f
22250 + add %_ASM_DX,%_ASM_AX
22251 +1234:
22252 +#endif
22253 +
22254 +#endif
22255 +
22256 +3: __copyuser_seg mov -3(%_ASM_AX),%edx
22257 xor %eax,%eax
22258 + pax_force_retaddr
22259 ret
22260 CFI_ENDPROC
22261 ENDPROC(__get_user_4)
22262 @@ -80,8 +131,18 @@ ENTRY(__get_user_8)
22263 GET_THREAD_INFO(%_ASM_DX)
22264 cmp TI_addr_limit(%_ASM_DX),%_ASM_AX
22265 jae bad_get_user
22266 +
22267 +#ifdef CONFIG_PAX_MEMORY_UDEREF
22268 + mov $PAX_USER_SHADOW_BASE,%_ASM_DX
22269 + cmp %_ASM_DX,%_ASM_AX
22270 + jae 1234f
22271 + add %_ASM_DX,%_ASM_AX
22272 +1234:
22273 +#endif
22274 +
22275 4: movq -7(%_ASM_AX),%_ASM_DX
22276 xor %eax,%eax
22277 + pax_force_retaddr
22278 ret
22279 CFI_ENDPROC
22280 ENDPROC(__get_user_8)
22281 @@ -91,6 +152,7 @@ bad_get_user:
22282 CFI_STARTPROC
22283 xor %edx,%edx
22284 mov $(-EFAULT),%_ASM_AX
22285 + pax_force_retaddr
22286 ret
22287 CFI_ENDPROC
22288 END(bad_get_user)
22289 diff --git a/arch/x86/lib/iomap_copy_64.S b/arch/x86/lib/iomap_copy_64.S
22290 index 05a95e7..326f2fa 100644
22291 --- a/arch/x86/lib/iomap_copy_64.S
22292 +++ b/arch/x86/lib/iomap_copy_64.S
22293 @@ -17,6 +17,7 @@
22294
22295 #include <linux/linkage.h>
22296 #include <asm/dwarf2.h>
22297 +#include <asm/alternative-asm.h>
22298
22299 /*
22300 * override generic version in lib/iomap_copy.c
22301 @@ -25,6 +26,7 @@ ENTRY(__iowrite32_copy)
22302 CFI_STARTPROC
22303 movl %edx,%ecx
22304 rep movsd
22305 + pax_force_retaddr
22306 ret
22307 CFI_ENDPROC
22308 ENDPROC(__iowrite32_copy)
22309 diff --git a/arch/x86/lib/memcpy_64.S b/arch/x86/lib/memcpy_64.S
22310 index ad5441e..610e351 100644
22311 --- a/arch/x86/lib/memcpy_64.S
22312 +++ b/arch/x86/lib/memcpy_64.S
22313 @@ -4,6 +4,7 @@
22314
22315 #include <asm/cpufeature.h>
22316 #include <asm/dwarf2.h>
22317 +#include <asm/alternative-asm.h>
22318
22319 /*
22320 * memcpy - Copy a memory block.
22321 @@ -34,6 +35,7 @@ memcpy_c:
22322 rep movsq
22323 movl %edx, %ecx
22324 rep movsb
22325 + pax_force_retaddr
22326 ret
22327 CFI_ENDPROC
22328 ENDPROC(memcpy_c)
22329 @@ -118,6 +120,7 @@ ENTRY(memcpy)
22330 jnz .Lloop_1
22331
22332 .Lend:
22333 + pax_force_retaddr 0, 1
22334 ret
22335 CFI_ENDPROC
22336 ENDPROC(memcpy)
22337 @@ -128,7 +131,7 @@ ENDPROC(__memcpy)
22338 * It is also a lot simpler. Use this when possible:
22339 */
22340
22341 - .section .altinstr_replacement, "ax"
22342 + .section .altinstr_replacement, "a"
22343 1: .byte 0xeb /* jmp <disp8> */
22344 .byte (memcpy_c - memcpy) - (2f - 1b) /* offset */
22345 2:
22346 diff --git a/arch/x86/lib/memset_64.S b/arch/x86/lib/memset_64.S
22347 index 2c59481..7e9ba4e 100644
22348 --- a/arch/x86/lib/memset_64.S
22349 +++ b/arch/x86/lib/memset_64.S
22350 @@ -2,6 +2,7 @@
22351
22352 #include <linux/linkage.h>
22353 #include <asm/dwarf2.h>
22354 +#include <asm/alternative-asm.h>
22355
22356 /*
22357 * ISO C memset - set a memory block to a byte value.
22358 @@ -28,6 +29,7 @@ memset_c:
22359 movl %r8d,%ecx
22360 rep stosb
22361 movq %r9,%rax
22362 + pax_force_retaddr
22363 ret
22364 CFI_ENDPROC
22365 ENDPROC(memset_c)
22366 @@ -35,13 +37,13 @@ ENDPROC(memset_c)
22367 ENTRY(memset)
22368 ENTRY(__memset)
22369 CFI_STARTPROC
22370 - movq %rdi,%r10
22371 movq %rdx,%r11
22372
22373 /* expand byte value */
22374 movzbl %sil,%ecx
22375 movabs $0x0101010101010101,%rax
22376 mul %rcx /* with rax, clobbers rdx */
22377 + movq %rdi,%rdx
22378
22379 /* align dst */
22380 movl %edi,%r9d
22381 @@ -95,7 +97,8 @@ ENTRY(__memset)
22382 jnz .Lloop_1
22383
22384 .Lende:
22385 - movq %r10,%rax
22386 + movq %rdx,%rax
22387 + pax_force_retaddr
22388 ret
22389
22390 CFI_RESTORE_STATE
22391 @@ -118,7 +121,7 @@ ENDPROC(__memset)
22392
22393 #include <asm/cpufeature.h>
22394
22395 - .section .altinstr_replacement,"ax"
22396 + .section .altinstr_replacement,"a"
22397 1: .byte 0xeb /* jmp <disp8> */
22398 .byte (memset_c - memset) - (2f - 1b) /* offset */
22399 2:
22400 diff --git a/arch/x86/lib/mmx_32.c b/arch/x86/lib/mmx_32.c
22401 index c9f2d9b..e7fd2c0 100644
22402 --- a/arch/x86/lib/mmx_32.c
22403 +++ b/arch/x86/lib/mmx_32.c
22404 @@ -29,6 +29,7 @@ void *_mmx_memcpy(void *to, const void *from, size_t len)
22405 {
22406 void *p;
22407 int i;
22408 + unsigned long cr0;
22409
22410 if (unlikely(in_interrupt()))
22411 return __memcpy(to, from, len);
22412 @@ -39,44 +40,72 @@ void *_mmx_memcpy(void *to, const void *from, size_t len)
22413 kernel_fpu_begin();
22414
22415 __asm__ __volatile__ (
22416 - "1: prefetch (%0)\n" /* This set is 28 bytes */
22417 - " prefetch 64(%0)\n"
22418 - " prefetch 128(%0)\n"
22419 - " prefetch 192(%0)\n"
22420 - " prefetch 256(%0)\n"
22421 + "1: prefetch (%1)\n" /* This set is 28 bytes */
22422 + " prefetch 64(%1)\n"
22423 + " prefetch 128(%1)\n"
22424 + " prefetch 192(%1)\n"
22425 + " prefetch 256(%1)\n"
22426 "2: \n"
22427 ".section .fixup, \"ax\"\n"
22428 - "3: movw $0x1AEB, 1b\n" /* jmp on 26 bytes */
22429 + "3: \n"
22430 +
22431 +#ifdef CONFIG_PAX_KERNEXEC
22432 + " movl %%cr0, %0\n"
22433 + " movl %0, %%eax\n"
22434 + " andl $0xFFFEFFFF, %%eax\n"
22435 + " movl %%eax, %%cr0\n"
22436 +#endif
22437 +
22438 + " movw $0x1AEB, 1b\n" /* jmp on 26 bytes */
22439 +
22440 +#ifdef CONFIG_PAX_KERNEXEC
22441 + " movl %0, %%cr0\n"
22442 +#endif
22443 +
22444 " jmp 2b\n"
22445 ".previous\n"
22446 _ASM_EXTABLE(1b, 3b)
22447 - : : "r" (from));
22448 + : "=&r" (cr0) : "r" (from) : "ax");
22449
22450 for ( ; i > 5; i--) {
22451 __asm__ __volatile__ (
22452 - "1: prefetch 320(%0)\n"
22453 - "2: movq (%0), %%mm0\n"
22454 - " movq 8(%0), %%mm1\n"
22455 - " movq 16(%0), %%mm2\n"
22456 - " movq 24(%0), %%mm3\n"
22457 - " movq %%mm0, (%1)\n"
22458 - " movq %%mm1, 8(%1)\n"
22459 - " movq %%mm2, 16(%1)\n"
22460 - " movq %%mm3, 24(%1)\n"
22461 - " movq 32(%0), %%mm0\n"
22462 - " movq 40(%0), %%mm1\n"
22463 - " movq 48(%0), %%mm2\n"
22464 - " movq 56(%0), %%mm3\n"
22465 - " movq %%mm0, 32(%1)\n"
22466 - " movq %%mm1, 40(%1)\n"
22467 - " movq %%mm2, 48(%1)\n"
22468 - " movq %%mm3, 56(%1)\n"
22469 + "1: prefetch 320(%1)\n"
22470 + "2: movq (%1), %%mm0\n"
22471 + " movq 8(%1), %%mm1\n"
22472 + " movq 16(%1), %%mm2\n"
22473 + " movq 24(%1), %%mm3\n"
22474 + " movq %%mm0, (%2)\n"
22475 + " movq %%mm1, 8(%2)\n"
22476 + " movq %%mm2, 16(%2)\n"
22477 + " movq %%mm3, 24(%2)\n"
22478 + " movq 32(%1), %%mm0\n"
22479 + " movq 40(%1), %%mm1\n"
22480 + " movq 48(%1), %%mm2\n"
22481 + " movq 56(%1), %%mm3\n"
22482 + " movq %%mm0, 32(%2)\n"
22483 + " movq %%mm1, 40(%2)\n"
22484 + " movq %%mm2, 48(%2)\n"
22485 + " movq %%mm3, 56(%2)\n"
22486 ".section .fixup, \"ax\"\n"
22487 - "3: movw $0x05EB, 1b\n" /* jmp on 5 bytes */
22488 + "3:\n"
22489 +
22490 +#ifdef CONFIG_PAX_KERNEXEC
22491 + " movl %%cr0, %0\n"
22492 + " movl %0, %%eax\n"
22493 + " andl $0xFFFEFFFF, %%eax\n"
22494 + " movl %%eax, %%cr0\n"
22495 +#endif
22496 +
22497 + " movw $0x05EB, 1b\n" /* jmp on 5 bytes */
22498 +
22499 +#ifdef CONFIG_PAX_KERNEXEC
22500 + " movl %0, %%cr0\n"
22501 +#endif
22502 +
22503 " jmp 2b\n"
22504 ".previous\n"
22505 _ASM_EXTABLE(1b, 3b)
22506 - : : "r" (from), "r" (to) : "memory");
22507 + : "=&r" (cr0) : "r" (from), "r" (to) : "memory", "ax");
22508
22509 from += 64;
22510 to += 64;
22511 @@ -158,6 +187,7 @@ static void fast_clear_page(void *page)
22512 static void fast_copy_page(void *to, void *from)
22513 {
22514 int i;
22515 + unsigned long cr0;
22516
22517 kernel_fpu_begin();
22518
22519 @@ -166,42 +196,70 @@ static void fast_copy_page(void *to, void *from)
22520 * but that is for later. -AV
22521 */
22522 __asm__ __volatile__(
22523 - "1: prefetch (%0)\n"
22524 - " prefetch 64(%0)\n"
22525 - " prefetch 128(%0)\n"
22526 - " prefetch 192(%0)\n"
22527 - " prefetch 256(%0)\n"
22528 + "1: prefetch (%1)\n"
22529 + " prefetch 64(%1)\n"
22530 + " prefetch 128(%1)\n"
22531 + " prefetch 192(%1)\n"
22532 + " prefetch 256(%1)\n"
22533 "2: \n"
22534 ".section .fixup, \"ax\"\n"
22535 - "3: movw $0x1AEB, 1b\n" /* jmp on 26 bytes */
22536 + "3: \n"
22537 +
22538 +#ifdef CONFIG_PAX_KERNEXEC
22539 + " movl %%cr0, %0\n"
22540 + " movl %0, %%eax\n"
22541 + " andl $0xFFFEFFFF, %%eax\n"
22542 + " movl %%eax, %%cr0\n"
22543 +#endif
22544 +
22545 + " movw $0x1AEB, 1b\n" /* jmp on 26 bytes */
22546 +
22547 +#ifdef CONFIG_PAX_KERNEXEC
22548 + " movl %0, %%cr0\n"
22549 +#endif
22550 +
22551 " jmp 2b\n"
22552 ".previous\n"
22553 - _ASM_EXTABLE(1b, 3b) : : "r" (from));
22554 + _ASM_EXTABLE(1b, 3b) : "=&r" (cr0) : "r" (from) : "ax");
22555
22556 for (i = 0; i < (4096-320)/64; i++) {
22557 __asm__ __volatile__ (
22558 - "1: prefetch 320(%0)\n"
22559 - "2: movq (%0), %%mm0\n"
22560 - " movntq %%mm0, (%1)\n"
22561 - " movq 8(%0), %%mm1\n"
22562 - " movntq %%mm1, 8(%1)\n"
22563 - " movq 16(%0), %%mm2\n"
22564 - " movntq %%mm2, 16(%1)\n"
22565 - " movq 24(%0), %%mm3\n"
22566 - " movntq %%mm3, 24(%1)\n"
22567 - " movq 32(%0), %%mm4\n"
22568 - " movntq %%mm4, 32(%1)\n"
22569 - " movq 40(%0), %%mm5\n"
22570 - " movntq %%mm5, 40(%1)\n"
22571 - " movq 48(%0), %%mm6\n"
22572 - " movntq %%mm6, 48(%1)\n"
22573 - " movq 56(%0), %%mm7\n"
22574 - " movntq %%mm7, 56(%1)\n"
22575 + "1: prefetch 320(%1)\n"
22576 + "2: movq (%1), %%mm0\n"
22577 + " movntq %%mm0, (%2)\n"
22578 + " movq 8(%1), %%mm1\n"
22579 + " movntq %%mm1, 8(%2)\n"
22580 + " movq 16(%1), %%mm2\n"
22581 + " movntq %%mm2, 16(%2)\n"
22582 + " movq 24(%1), %%mm3\n"
22583 + " movntq %%mm3, 24(%2)\n"
22584 + " movq 32(%1), %%mm4\n"
22585 + " movntq %%mm4, 32(%2)\n"
22586 + " movq 40(%1), %%mm5\n"
22587 + " movntq %%mm5, 40(%2)\n"
22588 + " movq 48(%1), %%mm6\n"
22589 + " movntq %%mm6, 48(%2)\n"
22590 + " movq 56(%1), %%mm7\n"
22591 + " movntq %%mm7, 56(%2)\n"
22592 ".section .fixup, \"ax\"\n"
22593 - "3: movw $0x05EB, 1b\n" /* jmp on 5 bytes */
22594 + "3:\n"
22595 +
22596 +#ifdef CONFIG_PAX_KERNEXEC
22597 + " movl %%cr0, %0\n"
22598 + " movl %0, %%eax\n"
22599 + " andl $0xFFFEFFFF, %%eax\n"
22600 + " movl %%eax, %%cr0\n"
22601 +#endif
22602 +
22603 + " movw $0x05EB, 1b\n" /* jmp on 5 bytes */
22604 +
22605 +#ifdef CONFIG_PAX_KERNEXEC
22606 + " movl %0, %%cr0\n"
22607 +#endif
22608 +
22609 " jmp 2b\n"
22610 ".previous\n"
22611 - _ASM_EXTABLE(1b, 3b) : : "r" (from), "r" (to) : "memory");
22612 + _ASM_EXTABLE(1b, 3b) : "=&r" (cr0) : "r" (from), "r" (to) : "memory", "ax");
22613
22614 from += 64;
22615 to += 64;
22616 @@ -280,47 +338,76 @@ static void fast_clear_page(void *page)
22617 static void fast_copy_page(void *to, void *from)
22618 {
22619 int i;
22620 + unsigned long cr0;
22621
22622 kernel_fpu_begin();
22623
22624 __asm__ __volatile__ (
22625 - "1: prefetch (%0)\n"
22626 - " prefetch 64(%0)\n"
22627 - " prefetch 128(%0)\n"
22628 - " prefetch 192(%0)\n"
22629 - " prefetch 256(%0)\n"
22630 + "1: prefetch (%1)\n"
22631 + " prefetch 64(%1)\n"
22632 + " prefetch 128(%1)\n"
22633 + " prefetch 192(%1)\n"
22634 + " prefetch 256(%1)\n"
22635 "2: \n"
22636 ".section .fixup, \"ax\"\n"
22637 - "3: movw $0x1AEB, 1b\n" /* jmp on 26 bytes */
22638 + "3: \n"
22639 +
22640 +#ifdef CONFIG_PAX_KERNEXEC
22641 + " movl %%cr0, %0\n"
22642 + " movl %0, %%eax\n"
22643 + " andl $0xFFFEFFFF, %%eax\n"
22644 + " movl %%eax, %%cr0\n"
22645 +#endif
22646 +
22647 + " movw $0x1AEB, 1b\n" /* jmp on 26 bytes */
22648 +
22649 +#ifdef CONFIG_PAX_KERNEXEC
22650 + " movl %0, %%cr0\n"
22651 +#endif
22652 +
22653 " jmp 2b\n"
22654 ".previous\n"
22655 - _ASM_EXTABLE(1b, 3b) : : "r" (from));
22656 + _ASM_EXTABLE(1b, 3b) : "=&r" (cr0) : "r" (from) : "ax");
22657
22658 for (i = 0; i < 4096/64; i++) {
22659 __asm__ __volatile__ (
22660 - "1: prefetch 320(%0)\n"
22661 - "2: movq (%0), %%mm0\n"
22662 - " movq 8(%0), %%mm1\n"
22663 - " movq 16(%0), %%mm2\n"
22664 - " movq 24(%0), %%mm3\n"
22665 - " movq %%mm0, (%1)\n"
22666 - " movq %%mm1, 8(%1)\n"
22667 - " movq %%mm2, 16(%1)\n"
22668 - " movq %%mm3, 24(%1)\n"
22669 - " movq 32(%0), %%mm0\n"
22670 - " movq 40(%0), %%mm1\n"
22671 - " movq 48(%0), %%mm2\n"
22672 - " movq 56(%0), %%mm3\n"
22673 - " movq %%mm0, 32(%1)\n"
22674 - " movq %%mm1, 40(%1)\n"
22675 - " movq %%mm2, 48(%1)\n"
22676 - " movq %%mm3, 56(%1)\n"
22677 + "1: prefetch 320(%1)\n"
22678 + "2: movq (%1), %%mm0\n"
22679 + " movq 8(%1), %%mm1\n"
22680 + " movq 16(%1), %%mm2\n"
22681 + " movq 24(%1), %%mm3\n"
22682 + " movq %%mm0, (%2)\n"
22683 + " movq %%mm1, 8(%2)\n"
22684 + " movq %%mm2, 16(%2)\n"
22685 + " movq %%mm3, 24(%2)\n"
22686 + " movq 32(%1), %%mm0\n"
22687 + " movq 40(%1), %%mm1\n"
22688 + " movq 48(%1), %%mm2\n"
22689 + " movq 56(%1), %%mm3\n"
22690 + " movq %%mm0, 32(%2)\n"
22691 + " movq %%mm1, 40(%2)\n"
22692 + " movq %%mm2, 48(%2)\n"
22693 + " movq %%mm3, 56(%2)\n"
22694 ".section .fixup, \"ax\"\n"
22695 - "3: movw $0x05EB, 1b\n" /* jmp on 5 bytes */
22696 + "3:\n"
22697 +
22698 +#ifdef CONFIG_PAX_KERNEXEC
22699 + " movl %%cr0, %0\n"
22700 + " movl %0, %%eax\n"
22701 + " andl $0xFFFEFFFF, %%eax\n"
22702 + " movl %%eax, %%cr0\n"
22703 +#endif
22704 +
22705 + " movw $0x05EB, 1b\n" /* jmp on 5 bytes */
22706 +
22707 +#ifdef CONFIG_PAX_KERNEXEC
22708 + " movl %0, %%cr0\n"
22709 +#endif
22710 +
22711 " jmp 2b\n"
22712 ".previous\n"
22713 _ASM_EXTABLE(1b, 3b)
22714 - : : "r" (from), "r" (to) : "memory");
22715 + : "=&r" (cr0) : "r" (from), "r" (to) : "memory", "ax");
22716
22717 from += 64;
22718 to += 64;
22719 diff --git a/arch/x86/lib/msr-reg.S b/arch/x86/lib/msr-reg.S
22720 index 69fa106..adda88b 100644
22721 --- a/arch/x86/lib/msr-reg.S
22722 +++ b/arch/x86/lib/msr-reg.S
22723 @@ -3,6 +3,7 @@
22724 #include <asm/dwarf2.h>
22725 #include <asm/asm.h>
22726 #include <asm/msr.h>
22727 +#include <asm/alternative-asm.h>
22728
22729 #ifdef CONFIG_X86_64
22730 /*
22731 @@ -16,7 +17,7 @@ ENTRY(native_\op\()_safe_regs)
22732 CFI_STARTPROC
22733 pushq_cfi %rbx
22734 pushq_cfi %rbp
22735 - movq %rdi, %r10 /* Save pointer */
22736 + movq %rdi, %r9 /* Save pointer */
22737 xorl %r11d, %r11d /* Return value */
22738 movl (%rdi), %eax
22739 movl 4(%rdi), %ecx
22740 @@ -27,16 +28,17 @@ ENTRY(native_\op\()_safe_regs)
22741 movl 28(%rdi), %edi
22742 CFI_REMEMBER_STATE
22743 1: \op
22744 -2: movl %eax, (%r10)
22745 +2: movl %eax, (%r9)
22746 movl %r11d, %eax /* Return value */
22747 - movl %ecx, 4(%r10)
22748 - movl %edx, 8(%r10)
22749 - movl %ebx, 12(%r10)
22750 - movl %ebp, 20(%r10)
22751 - movl %esi, 24(%r10)
22752 - movl %edi, 28(%r10)
22753 + movl %ecx, 4(%r9)
22754 + movl %edx, 8(%r9)
22755 + movl %ebx, 12(%r9)
22756 + movl %ebp, 20(%r9)
22757 + movl %esi, 24(%r9)
22758 + movl %edi, 28(%r9)
22759 popq_cfi %rbp
22760 popq_cfi %rbx
22761 + pax_force_retaddr
22762 ret
22763 3:
22764 CFI_RESTORE_STATE
22765 diff --git a/arch/x86/lib/putuser.S b/arch/x86/lib/putuser.S
22766 index 36b0d15..d381858 100644
22767 --- a/arch/x86/lib/putuser.S
22768 +++ b/arch/x86/lib/putuser.S
22769 @@ -15,7 +15,9 @@
22770 #include <asm/thread_info.h>
22771 #include <asm/errno.h>
22772 #include <asm/asm.h>
22773 -
22774 +#include <asm/segment.h>
22775 +#include <asm/pgtable.h>
22776 +#include <asm/alternative-asm.h>
22777
22778 /*
22779 * __put_user_X
22780 @@ -29,52 +31,119 @@
22781 * as they get called from within inline assembly.
22782 */
22783
22784 -#define ENTER CFI_STARTPROC ; \
22785 - GET_THREAD_INFO(%_ASM_BX)
22786 -#define EXIT ret ; \
22787 +#define ENTER CFI_STARTPROC
22788 +#define EXIT pax_force_retaddr; ret ; \
22789 CFI_ENDPROC
22790
22791 +#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
22792 +#define _DEST %_ASM_CX,%_ASM_BX
22793 +#else
22794 +#define _DEST %_ASM_CX
22795 +#endif
22796 +
22797 +#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_MEMORY_UDEREF)
22798 +#define __copyuser_seg gs;
22799 +#else
22800 +#define __copyuser_seg
22801 +#endif
22802 +
22803 .text
22804 ENTRY(__put_user_1)
22805 ENTER
22806 +
22807 +#if !defined(CONFIG_X86_32) || !defined(CONFIG_PAX_MEMORY_UDEREF)
22808 + GET_THREAD_INFO(%_ASM_BX)
22809 cmp TI_addr_limit(%_ASM_BX),%_ASM_CX
22810 jae bad_put_user
22811 -1: movb %al,(%_ASM_CX)
22812 +
22813 +#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
22814 + mov $PAX_USER_SHADOW_BASE,%_ASM_BX
22815 + cmp %_ASM_BX,%_ASM_CX
22816 + jb 1234f
22817 + xor %ebx,%ebx
22818 +1234:
22819 +#endif
22820 +
22821 +#endif
22822 +
22823 +1: __copyuser_seg movb %al,(_DEST)
22824 xor %eax,%eax
22825 EXIT
22826 ENDPROC(__put_user_1)
22827
22828 ENTRY(__put_user_2)
22829 ENTER
22830 +
22831 +#if !defined(CONFIG_X86_32) || !defined(CONFIG_PAX_MEMORY_UDEREF)
22832 + GET_THREAD_INFO(%_ASM_BX)
22833 mov TI_addr_limit(%_ASM_BX),%_ASM_BX
22834 sub $1,%_ASM_BX
22835 cmp %_ASM_BX,%_ASM_CX
22836 jae bad_put_user
22837 -2: movw %ax,(%_ASM_CX)
22838 +
22839 +#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
22840 + mov $PAX_USER_SHADOW_BASE,%_ASM_BX
22841 + cmp %_ASM_BX,%_ASM_CX
22842 + jb 1234f
22843 + xor %ebx,%ebx
22844 +1234:
22845 +#endif
22846 +
22847 +#endif
22848 +
22849 +2: __copyuser_seg movw %ax,(_DEST)
22850 xor %eax,%eax
22851 EXIT
22852 ENDPROC(__put_user_2)
22853
22854 ENTRY(__put_user_4)
22855 ENTER
22856 +
22857 +#if !defined(CONFIG_X86_32) || !defined(CONFIG_PAX_MEMORY_UDEREF)
22858 + GET_THREAD_INFO(%_ASM_BX)
22859 mov TI_addr_limit(%_ASM_BX),%_ASM_BX
22860 sub $3,%_ASM_BX
22861 cmp %_ASM_BX,%_ASM_CX
22862 jae bad_put_user
22863 -3: movl %eax,(%_ASM_CX)
22864 +
22865 +#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
22866 + mov $PAX_USER_SHADOW_BASE,%_ASM_BX
22867 + cmp %_ASM_BX,%_ASM_CX
22868 + jb 1234f
22869 + xor %ebx,%ebx
22870 +1234:
22871 +#endif
22872 +
22873 +#endif
22874 +
22875 +3: __copyuser_seg movl %eax,(_DEST)
22876 xor %eax,%eax
22877 EXIT
22878 ENDPROC(__put_user_4)
22879
22880 ENTRY(__put_user_8)
22881 ENTER
22882 +
22883 +#if !defined(CONFIG_X86_32) || !defined(CONFIG_PAX_MEMORY_UDEREF)
22884 + GET_THREAD_INFO(%_ASM_BX)
22885 mov TI_addr_limit(%_ASM_BX),%_ASM_BX
22886 sub $7,%_ASM_BX
22887 cmp %_ASM_BX,%_ASM_CX
22888 jae bad_put_user
22889 -4: mov %_ASM_AX,(%_ASM_CX)
22890 +
22891 +#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
22892 + mov $PAX_USER_SHADOW_BASE,%_ASM_BX
22893 + cmp %_ASM_BX,%_ASM_CX
22894 + jb 1234f
22895 + xor %ebx,%ebx
22896 +1234:
22897 +#endif
22898 +
22899 +#endif
22900 +
22901 +4: __copyuser_seg mov %_ASM_AX,(_DEST)
22902 #ifdef CONFIG_X86_32
22903 -5: movl %edx,4(%_ASM_CX)
22904 +5: __copyuser_seg movl %edx,4(_DEST)
22905 #endif
22906 xor %eax,%eax
22907 EXIT
22908 diff --git a/arch/x86/lib/rwlock_64.S b/arch/x86/lib/rwlock_64.S
22909 index 05ea55f..6345b9a 100644
22910 --- a/arch/x86/lib/rwlock_64.S
22911 +++ b/arch/x86/lib/rwlock_64.S
22912 @@ -2,6 +2,7 @@
22913
22914 #include <linux/linkage.h>
22915 #include <asm/rwlock.h>
22916 +#include <asm/asm.h>
22917 #include <asm/alternative-asm.h>
22918 #include <asm/dwarf2.h>
22919
22920 @@ -10,13 +11,34 @@ ENTRY(__write_lock_failed)
22921 CFI_STARTPROC
22922 LOCK_PREFIX
22923 addl $RW_LOCK_BIAS,(%rdi)
22924 +
22925 +#ifdef CONFIG_PAX_REFCOUNT
22926 + jno 1234f
22927 + LOCK_PREFIX
22928 + subl $RW_LOCK_BIAS,(%rdi)
22929 + int $4
22930 +1234:
22931 + _ASM_EXTABLE(1234b, 1234b)
22932 +#endif
22933 +
22934 1: rep
22935 nop
22936 cmpl $RW_LOCK_BIAS,(%rdi)
22937 jne 1b
22938 LOCK_PREFIX
22939 subl $RW_LOCK_BIAS,(%rdi)
22940 +
22941 +#ifdef CONFIG_PAX_REFCOUNT
22942 + jno 1234f
22943 + LOCK_PREFIX
22944 + addl $RW_LOCK_BIAS,(%rdi)
22945 + int $4
22946 +1234:
22947 + _ASM_EXTABLE(1234b, 1234b)
22948 +#endif
22949 +
22950 jnz __write_lock_failed
22951 + pax_force_retaddr
22952 ret
22953 CFI_ENDPROC
22954 END(__write_lock_failed)
22955 @@ -26,13 +48,34 @@ ENTRY(__read_lock_failed)
22956 CFI_STARTPROC
22957 LOCK_PREFIX
22958 incl (%rdi)
22959 +
22960 +#ifdef CONFIG_PAX_REFCOUNT
22961 + jno 1234f
22962 + LOCK_PREFIX
22963 + decl (%rdi)
22964 + int $4
22965 +1234:
22966 + _ASM_EXTABLE(1234b, 1234b)
22967 +#endif
22968 +
22969 1: rep
22970 nop
22971 cmpl $1,(%rdi)
22972 js 1b
22973 LOCK_PREFIX
22974 decl (%rdi)
22975 +
22976 +#ifdef CONFIG_PAX_REFCOUNT
22977 + jno 1234f
22978 + LOCK_PREFIX
22979 + incl (%rdi)
22980 + int $4
22981 +1234:
22982 + _ASM_EXTABLE(1234b, 1234b)
22983 +#endif
22984 +
22985 js __read_lock_failed
22986 + pax_force_retaddr
22987 ret
22988 CFI_ENDPROC
22989 END(__read_lock_failed)
22990 diff --git a/arch/x86/lib/rwsem_64.S b/arch/x86/lib/rwsem_64.S
22991 index 15acecf..f768b10 100644
22992 --- a/arch/x86/lib/rwsem_64.S
22993 +++ b/arch/x86/lib/rwsem_64.S
22994 @@ -48,6 +48,7 @@ ENTRY(call_rwsem_down_read_failed)
22995 call rwsem_down_read_failed
22996 popq %rdx
22997 restore_common_regs
22998 + pax_force_retaddr
22999 ret
23000 ENDPROC(call_rwsem_down_read_failed)
23001
23002 @@ -56,6 +57,7 @@ ENTRY(call_rwsem_down_write_failed)
23003 movq %rax,%rdi
23004 call rwsem_down_write_failed
23005 restore_common_regs
23006 + pax_force_retaddr
23007 ret
23008 ENDPROC(call_rwsem_down_write_failed)
23009
23010 @@ -66,7 +68,8 @@ ENTRY(call_rwsem_wake)
23011 movq %rax,%rdi
23012 call rwsem_wake
23013 restore_common_regs
23014 -1: ret
23015 +1: pax_force_retaddr
23016 + ret
23017 ENDPROC(call_rwsem_wake)
23018
23019 /* Fix up special calling conventions */
23020 @@ -77,5 +80,6 @@ ENTRY(call_rwsem_downgrade_wake)
23021 call rwsem_downgrade_wake
23022 popq %rdx
23023 restore_common_regs
23024 + pax_force_retaddr
23025 ret
23026 ENDPROC(call_rwsem_downgrade_wake)
23027 diff --git a/arch/x86/lib/thunk_64.S b/arch/x86/lib/thunk_64.S
23028 index bf9a7d5..fb06ab5 100644
23029 --- a/arch/x86/lib/thunk_64.S
23030 +++ b/arch/x86/lib/thunk_64.S
23031 @@ -10,7 +10,8 @@
23032 #include <asm/dwarf2.h>
23033 #include <asm/calling.h>
23034 #include <asm/rwlock.h>
23035 -
23036 + #include <asm/alternative-asm.h>
23037 +
23038 /* rdi: arg1 ... normal C conventions. rax is saved/restored. */
23039 .macro thunk name,func
23040 .globl \name
23041 @@ -70,6 +71,7 @@
23042 SAVE_ARGS
23043 restore:
23044 RESTORE_ARGS
23045 + pax_force_retaddr
23046 ret
23047 CFI_ENDPROC
23048
23049 @@ -77,5 +79,6 @@ restore:
23050 SAVE_ARGS
23051 restore_norax:
23052 RESTORE_ARGS 1
23053 + pax_force_retaddr
23054 ret
23055 CFI_ENDPROC
23056 diff --git a/arch/x86/lib/usercopy_32.c b/arch/x86/lib/usercopy_32.c
23057 index 1f118d4..ec4a953 100644
23058 --- a/arch/x86/lib/usercopy_32.c
23059 +++ b/arch/x86/lib/usercopy_32.c
23060 @@ -43,7 +43,7 @@ do { \
23061 __asm__ __volatile__( \
23062 " testl %1,%1\n" \
23063 " jz 2f\n" \
23064 - "0: lodsb\n" \
23065 + "0: "__copyuser_seg"lodsb\n" \
23066 " stosb\n" \
23067 " testb %%al,%%al\n" \
23068 " jz 1f\n" \
23069 @@ -128,10 +128,12 @@ do { \
23070 int __d0; \
23071 might_fault(); \
23072 __asm__ __volatile__( \
23073 + __COPYUSER_SET_ES \
23074 "0: rep; stosl\n" \
23075 " movl %2,%0\n" \
23076 "1: rep; stosb\n" \
23077 "2:\n" \
23078 + __COPYUSER_RESTORE_ES \
23079 ".section .fixup,\"ax\"\n" \
23080 "3: lea 0(%2,%0,4),%0\n" \
23081 " jmp 2b\n" \
23082 @@ -200,6 +202,7 @@ long strnlen_user(const char __user *s, long n)
23083 might_fault();
23084
23085 __asm__ __volatile__(
23086 + __COPYUSER_SET_ES
23087 " testl %0, %0\n"
23088 " jz 3f\n"
23089 " andl %0,%%ecx\n"
23090 @@ -208,6 +211,7 @@ long strnlen_user(const char __user *s, long n)
23091 " subl %%ecx,%0\n"
23092 " addl %0,%%eax\n"
23093 "1:\n"
23094 + __COPYUSER_RESTORE_ES
23095 ".section .fixup,\"ax\"\n"
23096 "2: xorl %%eax,%%eax\n"
23097 " jmp 1b\n"
23098 @@ -227,7 +231,7 @@ EXPORT_SYMBOL(strnlen_user);
23099
23100 #ifdef CONFIG_X86_INTEL_USERCOPY
23101 static unsigned long
23102 -__copy_user_intel(void __user *to, const void *from, unsigned long size)
23103 +__generic_copy_to_user_intel(void __user *to, const void *from, unsigned long size)
23104 {
23105 int d0, d1;
23106 __asm__ __volatile__(
23107 @@ -239,36 +243,36 @@ __copy_user_intel(void __user *to, const void *from, unsigned long size)
23108 " .align 2,0x90\n"
23109 "3: movl 0(%4), %%eax\n"
23110 "4: movl 4(%4), %%edx\n"
23111 - "5: movl %%eax, 0(%3)\n"
23112 - "6: movl %%edx, 4(%3)\n"
23113 + "5: "__copyuser_seg" movl %%eax, 0(%3)\n"
23114 + "6: "__copyuser_seg" movl %%edx, 4(%3)\n"
23115 "7: movl 8(%4), %%eax\n"
23116 "8: movl 12(%4),%%edx\n"
23117 - "9: movl %%eax, 8(%3)\n"
23118 - "10: movl %%edx, 12(%3)\n"
23119 + "9: "__copyuser_seg" movl %%eax, 8(%3)\n"
23120 + "10: "__copyuser_seg" movl %%edx, 12(%3)\n"
23121 "11: movl 16(%4), %%eax\n"
23122 "12: movl 20(%4), %%edx\n"
23123 - "13: movl %%eax, 16(%3)\n"
23124 - "14: movl %%edx, 20(%3)\n"
23125 + "13: "__copyuser_seg" movl %%eax, 16(%3)\n"
23126 + "14: "__copyuser_seg" movl %%edx, 20(%3)\n"
23127 "15: movl 24(%4), %%eax\n"
23128 "16: movl 28(%4), %%edx\n"
23129 - "17: movl %%eax, 24(%3)\n"
23130 - "18: movl %%edx, 28(%3)\n"
23131 + "17: "__copyuser_seg" movl %%eax, 24(%3)\n"
23132 + "18: "__copyuser_seg" movl %%edx, 28(%3)\n"
23133 "19: movl 32(%4), %%eax\n"
23134 "20: movl 36(%4), %%edx\n"
23135 - "21: movl %%eax, 32(%3)\n"
23136 - "22: movl %%edx, 36(%3)\n"
23137 + "21: "__copyuser_seg" movl %%eax, 32(%3)\n"
23138 + "22: "__copyuser_seg" movl %%edx, 36(%3)\n"
23139 "23: movl 40(%4), %%eax\n"
23140 "24: movl 44(%4), %%edx\n"
23141 - "25: movl %%eax, 40(%3)\n"
23142 - "26: movl %%edx, 44(%3)\n"
23143 + "25: "__copyuser_seg" movl %%eax, 40(%3)\n"
23144 + "26: "__copyuser_seg" movl %%edx, 44(%3)\n"
23145 "27: movl 48(%4), %%eax\n"
23146 "28: movl 52(%4), %%edx\n"
23147 - "29: movl %%eax, 48(%3)\n"
23148 - "30: movl %%edx, 52(%3)\n"
23149 + "29: "__copyuser_seg" movl %%eax, 48(%3)\n"
23150 + "30: "__copyuser_seg" movl %%edx, 52(%3)\n"
23151 "31: movl 56(%4), %%eax\n"
23152 "32: movl 60(%4), %%edx\n"
23153 - "33: movl %%eax, 56(%3)\n"
23154 - "34: movl %%edx, 60(%3)\n"
23155 + "33: "__copyuser_seg" movl %%eax, 56(%3)\n"
23156 + "34: "__copyuser_seg" movl %%edx, 60(%3)\n"
23157 " addl $-64, %0\n"
23158 " addl $64, %4\n"
23159 " addl $64, %3\n"
23160 @@ -278,10 +282,119 @@ __copy_user_intel(void __user *to, const void *from, unsigned long size)
23161 " shrl $2, %0\n"
23162 " andl $3, %%eax\n"
23163 " cld\n"
23164 + __COPYUSER_SET_ES
23165 "99: rep; movsl\n"
23166 "36: movl %%eax, %0\n"
23167 "37: rep; movsb\n"
23168 "100:\n"
23169 + __COPYUSER_RESTORE_ES
23170 + ".section .fixup,\"ax\"\n"
23171 + "101: lea 0(%%eax,%0,4),%0\n"
23172 + " jmp 100b\n"
23173 + ".previous\n"
23174 + ".section __ex_table,\"a\"\n"
23175 + " .align 4\n"
23176 + " .long 1b,100b\n"
23177 + " .long 2b,100b\n"
23178 + " .long 3b,100b\n"
23179 + " .long 4b,100b\n"
23180 + " .long 5b,100b\n"
23181 + " .long 6b,100b\n"
23182 + " .long 7b,100b\n"
23183 + " .long 8b,100b\n"
23184 + " .long 9b,100b\n"
23185 + " .long 10b,100b\n"
23186 + " .long 11b,100b\n"
23187 + " .long 12b,100b\n"
23188 + " .long 13b,100b\n"
23189 + " .long 14b,100b\n"
23190 + " .long 15b,100b\n"
23191 + " .long 16b,100b\n"
23192 + " .long 17b,100b\n"
23193 + " .long 18b,100b\n"
23194 + " .long 19b,100b\n"
23195 + " .long 20b,100b\n"
23196 + " .long 21b,100b\n"
23197 + " .long 22b,100b\n"
23198 + " .long 23b,100b\n"
23199 + " .long 24b,100b\n"
23200 + " .long 25b,100b\n"
23201 + " .long 26b,100b\n"
23202 + " .long 27b,100b\n"
23203 + " .long 28b,100b\n"
23204 + " .long 29b,100b\n"
23205 + " .long 30b,100b\n"
23206 + " .long 31b,100b\n"
23207 + " .long 32b,100b\n"
23208 + " .long 33b,100b\n"
23209 + " .long 34b,100b\n"
23210 + " .long 35b,100b\n"
23211 + " .long 36b,100b\n"
23212 + " .long 37b,100b\n"
23213 + " .long 99b,101b\n"
23214 + ".previous"
23215 + : "=&c"(size), "=&D" (d0), "=&S" (d1)
23216 + : "1"(to), "2"(from), "0"(size)
23217 + : "eax", "edx", "memory");
23218 + return size;
23219 +}
23220 +
23221 +static unsigned long
23222 +__generic_copy_from_user_intel(void *to, const void __user *from, unsigned long size)
23223 +{
23224 + int d0, d1;
23225 + __asm__ __volatile__(
23226 + " .align 2,0x90\n"
23227 + "1: "__copyuser_seg" movl 32(%4), %%eax\n"
23228 + " cmpl $67, %0\n"
23229 + " jbe 3f\n"
23230 + "2: "__copyuser_seg" movl 64(%4), %%eax\n"
23231 + " .align 2,0x90\n"
23232 + "3: "__copyuser_seg" movl 0(%4), %%eax\n"
23233 + "4: "__copyuser_seg" movl 4(%4), %%edx\n"
23234 + "5: movl %%eax, 0(%3)\n"
23235 + "6: movl %%edx, 4(%3)\n"
23236 + "7: "__copyuser_seg" movl 8(%4), %%eax\n"
23237 + "8: "__copyuser_seg" movl 12(%4),%%edx\n"
23238 + "9: movl %%eax, 8(%3)\n"
23239 + "10: movl %%edx, 12(%3)\n"
23240 + "11: "__copyuser_seg" movl 16(%4), %%eax\n"
23241 + "12: "__copyuser_seg" movl 20(%4), %%edx\n"
23242 + "13: movl %%eax, 16(%3)\n"
23243 + "14: movl %%edx, 20(%3)\n"
23244 + "15: "__copyuser_seg" movl 24(%4), %%eax\n"
23245 + "16: "__copyuser_seg" movl 28(%4), %%edx\n"
23246 + "17: movl %%eax, 24(%3)\n"
23247 + "18: movl %%edx, 28(%3)\n"
23248 + "19: "__copyuser_seg" movl 32(%4), %%eax\n"
23249 + "20: "__copyuser_seg" movl 36(%4), %%edx\n"
23250 + "21: movl %%eax, 32(%3)\n"
23251 + "22: movl %%edx, 36(%3)\n"
23252 + "23: "__copyuser_seg" movl 40(%4), %%eax\n"
23253 + "24: "__copyuser_seg" movl 44(%4), %%edx\n"
23254 + "25: movl %%eax, 40(%3)\n"
23255 + "26: movl %%edx, 44(%3)\n"
23256 + "27: "__copyuser_seg" movl 48(%4), %%eax\n"
23257 + "28: "__copyuser_seg" movl 52(%4), %%edx\n"
23258 + "29: movl %%eax, 48(%3)\n"
23259 + "30: movl %%edx, 52(%3)\n"
23260 + "31: "__copyuser_seg" movl 56(%4), %%eax\n"
23261 + "32: "__copyuser_seg" movl 60(%4), %%edx\n"
23262 + "33: movl %%eax, 56(%3)\n"
23263 + "34: movl %%edx, 60(%3)\n"
23264 + " addl $-64, %0\n"
23265 + " addl $64, %4\n"
23266 + " addl $64, %3\n"
23267 + " cmpl $63, %0\n"
23268 + " ja 1b\n"
23269 + "35: movl %0, %%eax\n"
23270 + " shrl $2, %0\n"
23271 + " andl $3, %%eax\n"
23272 + " cld\n"
23273 + "99: rep; "__copyuser_seg" movsl\n"
23274 + "36: movl %%eax, %0\n"
23275 + "37: rep; "__copyuser_seg" movsb\n"
23276 + "100:\n"
23277 ".section .fixup,\"ax\"\n"
23278 "101: lea 0(%%eax,%0,4),%0\n"
23279 " jmp 100b\n"
23280 @@ -339,41 +452,41 @@ __copy_user_zeroing_intel(void *to, const void __user *from, unsigned long size)
23281 int d0, d1;
23282 __asm__ __volatile__(
23283 " .align 2,0x90\n"
23284 - "0: movl 32(%4), %%eax\n"
23285 + "0: "__copyuser_seg" movl 32(%4), %%eax\n"
23286 " cmpl $67, %0\n"
23287 " jbe 2f\n"
23288 - "1: movl 64(%4), %%eax\n"
23289 + "1: "__copyuser_seg" movl 64(%4), %%eax\n"
23290 " .align 2,0x90\n"
23291 - "2: movl 0(%4), %%eax\n"
23292 - "21: movl 4(%4), %%edx\n"
23293 + "2: "__copyuser_seg" movl 0(%4), %%eax\n"
23294 + "21: "__copyuser_seg" movl 4(%4), %%edx\n"
23295 " movl %%eax, 0(%3)\n"
23296 " movl %%edx, 4(%3)\n"
23297 - "3: movl 8(%4), %%eax\n"
23298 - "31: movl 12(%4),%%edx\n"
23299 + "3: "__copyuser_seg" movl 8(%4), %%eax\n"
23300 + "31: "__copyuser_seg" movl 12(%4),%%edx\n"
23301 " movl %%eax, 8(%3)\n"
23302 " movl %%edx, 12(%3)\n"
23303 - "4: movl 16(%4), %%eax\n"
23304 - "41: movl 20(%4), %%edx\n"
23305 + "4: "__copyuser_seg" movl 16(%4), %%eax\n"
23306 + "41: "__copyuser_seg" movl 20(%4), %%edx\n"
23307 " movl %%eax, 16(%3)\n"
23308 " movl %%edx, 20(%3)\n"
23309 - "10: movl 24(%4), %%eax\n"
23310 - "51: movl 28(%4), %%edx\n"
23311 + "10: "__copyuser_seg" movl 24(%4), %%eax\n"
23312 + "51: "__copyuser_seg" movl 28(%4), %%edx\n"
23313 " movl %%eax, 24(%3)\n"
23314 " movl %%edx, 28(%3)\n"
23315 - "11: movl 32(%4), %%eax\n"
23316 - "61: movl 36(%4), %%edx\n"
23317 + "11: "__copyuser_seg" movl 32(%4), %%eax\n"
23318 + "61: "__copyuser_seg" movl 36(%4), %%edx\n"
23319 " movl %%eax, 32(%3)\n"
23320 " movl %%edx, 36(%3)\n"
23321 - "12: movl 40(%4), %%eax\n"
23322 - "71: movl 44(%4), %%edx\n"
23323 + "12: "__copyuser_seg" movl 40(%4), %%eax\n"
23324 + "71: "__copyuser_seg" movl 44(%4), %%edx\n"
23325 " movl %%eax, 40(%3)\n"
23326 " movl %%edx, 44(%3)\n"
23327 - "13: movl 48(%4), %%eax\n"
23328 - "81: movl 52(%4), %%edx\n"
23329 + "13: "__copyuser_seg" movl 48(%4), %%eax\n"
23330 + "81: "__copyuser_seg" movl 52(%4), %%edx\n"
23331 " movl %%eax, 48(%3)\n"
23332 " movl %%edx, 52(%3)\n"
23333 - "14: movl 56(%4), %%eax\n"
23334 - "91: movl 60(%4), %%edx\n"
23335 + "14: "__copyuser_seg" movl 56(%4), %%eax\n"
23336 + "91: "__copyuser_seg" movl 60(%4), %%edx\n"
23337 " movl %%eax, 56(%3)\n"
23338 " movl %%edx, 60(%3)\n"
23339 " addl $-64, %0\n"
23340 @@ -385,9 +498,9 @@ __copy_user_zeroing_intel(void *to, const void __user *from, unsigned long size)
23341 " shrl $2, %0\n"
23342 " andl $3, %%eax\n"
23343 " cld\n"
23344 - "6: rep; movsl\n"
23345 + "6: rep; "__copyuser_seg" movsl\n"
23346 " movl %%eax,%0\n"
23347 - "7: rep; movsb\n"
23348 + "7: rep; "__copyuser_seg" movsb\n"
23349 "8:\n"
23350 ".section .fixup,\"ax\"\n"
23351 "9: lea 0(%%eax,%0,4),%0\n"
23352 @@ -440,41 +553,41 @@ static unsigned long __copy_user_zeroing_intel_nocache(void *to,
23353
23354 __asm__ __volatile__(
23355 " .align 2,0x90\n"
23356 - "0: movl 32(%4), %%eax\n"
23357 + "0: "__copyuser_seg" movl 32(%4), %%eax\n"
23358 " cmpl $67, %0\n"
23359 " jbe 2f\n"
23360 - "1: movl 64(%4), %%eax\n"
23361 + "1: "__copyuser_seg" movl 64(%4), %%eax\n"
23362 " .align 2,0x90\n"
23363 - "2: movl 0(%4), %%eax\n"
23364 - "21: movl 4(%4), %%edx\n"
23365 + "2: "__copyuser_seg" movl 0(%4), %%eax\n"
23366 + "21: "__copyuser_seg" movl 4(%4), %%edx\n"
23367 " movnti %%eax, 0(%3)\n"
23368 " movnti %%edx, 4(%3)\n"
23369 - "3: movl 8(%4), %%eax\n"
23370 - "31: movl 12(%4),%%edx\n"
23371 + "3: "__copyuser_seg" movl 8(%4), %%eax\n"
23372 + "31: "__copyuser_seg" movl 12(%4),%%edx\n"
23373 " movnti %%eax, 8(%3)\n"
23374 " movnti %%edx, 12(%3)\n"
23375 - "4: movl 16(%4), %%eax\n"
23376 - "41: movl 20(%4), %%edx\n"
23377 + "4: "__copyuser_seg" movl 16(%4), %%eax\n"
23378 + "41: "__copyuser_seg" movl 20(%4), %%edx\n"
23379 " movnti %%eax, 16(%3)\n"
23380 " movnti %%edx, 20(%3)\n"
23381 - "10: movl 24(%4), %%eax\n"
23382 - "51: movl 28(%4), %%edx\n"
23383 + "10: "__copyuser_seg" movl 24(%4), %%eax\n"
23384 + "51: "__copyuser_seg" movl 28(%4), %%edx\n"
23385 " movnti %%eax, 24(%3)\n"
23386 " movnti %%edx, 28(%3)\n"
23387 - "11: movl 32(%4), %%eax\n"
23388 - "61: movl 36(%4), %%edx\n"
23389 + "11: "__copyuser_seg" movl 32(%4), %%eax\n"
23390 + "61: "__copyuser_seg" movl 36(%4), %%edx\n"
23391 " movnti %%eax, 32(%3)\n"
23392 " movnti %%edx, 36(%3)\n"
23393 - "12: movl 40(%4), %%eax\n"
23394 - "71: movl 44(%4), %%edx\n"
23395 + "12: "__copyuser_seg" movl 40(%4), %%eax\n"
23396 + "71: "__copyuser_seg" movl 44(%4), %%edx\n"
23397 " movnti %%eax, 40(%3)\n"
23398 " movnti %%edx, 44(%3)\n"
23399 - "13: movl 48(%4), %%eax\n"
23400 - "81: movl 52(%4), %%edx\n"
23401 + "13: "__copyuser_seg" movl 48(%4), %%eax\n"
23402 + "81: "__copyuser_seg" movl 52(%4), %%edx\n"
23403 " movnti %%eax, 48(%3)\n"
23404 " movnti %%edx, 52(%3)\n"
23405 - "14: movl 56(%4), %%eax\n"
23406 - "91: movl 60(%4), %%edx\n"
23407 + "14: "__copyuser_seg" movl 56(%4), %%eax\n"
23408 + "91: "__copyuser_seg" movl 60(%4), %%edx\n"
23409 " movnti %%eax, 56(%3)\n"
23410 " movnti %%edx, 60(%3)\n"
23411 " addl $-64, %0\n"
23412 @@ -487,9 +600,9 @@ static unsigned long __copy_user_zeroing_intel_nocache(void *to,
23413 " shrl $2, %0\n"
23414 " andl $3, %%eax\n"
23415 " cld\n"
23416 - "6: rep; movsl\n"
23417 + "6: rep; "__copyuser_seg" movsl\n"
23418 " movl %%eax,%0\n"
23419 - "7: rep; movsb\n"
23420 + "7: rep; "__copyuser_seg" movsb\n"
23421 "8:\n"
23422 ".section .fixup,\"ax\"\n"
23423 "9: lea 0(%%eax,%0,4),%0\n"
23424 @@ -537,41 +650,41 @@ static unsigned long __copy_user_intel_nocache(void *to,
23425
23426 __asm__ __volatile__(
23427 " .align 2,0x90\n"
23428 - "0: movl 32(%4), %%eax\n"
23429 + "0: "__copyuser_seg" movl 32(%4), %%eax\n"
23430 " cmpl $67, %0\n"
23431 " jbe 2f\n"
23432 - "1: movl 64(%4), %%eax\n"
23433 + "1: "__copyuser_seg" movl 64(%4), %%eax\n"
23434 " .align 2,0x90\n"
23435 - "2: movl 0(%4), %%eax\n"
23436 - "21: movl 4(%4), %%edx\n"
23437 + "2: "__copyuser_seg" movl 0(%4), %%eax\n"
23438 + "21: "__copyuser_seg" movl 4(%4), %%edx\n"
23439 " movnti %%eax, 0(%3)\n"
23440 " movnti %%edx, 4(%3)\n"
23441 - "3: movl 8(%4), %%eax\n"
23442 - "31: movl 12(%4),%%edx\n"
23443 + "3: "__copyuser_seg" movl 8(%4), %%eax\n"
23444 + "31: "__copyuser_seg" movl 12(%4),%%edx\n"
23445 " movnti %%eax, 8(%3)\n"
23446 " movnti %%edx, 12(%3)\n"
23447 - "4: movl 16(%4), %%eax\n"
23448 - "41: movl 20(%4), %%edx\n"
23449 + "4: "__copyuser_seg" movl 16(%4), %%eax\n"
23450 + "41: "__copyuser_seg" movl 20(%4), %%edx\n"
23451 " movnti %%eax, 16(%3)\n"
23452 " movnti %%edx, 20(%3)\n"
23453 - "10: movl 24(%4), %%eax\n"
23454 - "51: movl 28(%4), %%edx\n"
23455 + "10: "__copyuser_seg" movl 24(%4), %%eax\n"
23456 + "51: "__copyuser_seg" movl 28(%4), %%edx\n"
23457 " movnti %%eax, 24(%3)\n"
23458 " movnti %%edx, 28(%3)\n"
23459 - "11: movl 32(%4), %%eax\n"
23460 - "61: movl 36(%4), %%edx\n"
23461 + "11: "__copyuser_seg" movl 32(%4), %%eax\n"
23462 + "61: "__copyuser_seg" movl 36(%4), %%edx\n"
23463 " movnti %%eax, 32(%3)\n"
23464 " movnti %%edx, 36(%3)\n"
23465 - "12: movl 40(%4), %%eax\n"
23466 - "71: movl 44(%4), %%edx\n"
23467 + "12: "__copyuser_seg" movl 40(%4), %%eax\n"
23468 + "71: "__copyuser_seg" movl 44(%4), %%edx\n"
23469 " movnti %%eax, 40(%3)\n"
23470 " movnti %%edx, 44(%3)\n"
23471 - "13: movl 48(%4), %%eax\n"
23472 - "81: movl 52(%4), %%edx\n"
23473 + "13: "__copyuser_seg" movl 48(%4), %%eax\n"
23474 + "81: "__copyuser_seg" movl 52(%4), %%edx\n"
23475 " movnti %%eax, 48(%3)\n"
23476 " movnti %%edx, 52(%3)\n"
23477 - "14: movl 56(%4), %%eax\n"
23478 - "91: movl 60(%4), %%edx\n"
23479 + "14: "__copyuser_seg" movl 56(%4), %%eax\n"
23480 + "91: "__copyuser_seg" movl 60(%4), %%edx\n"
23481 " movnti %%eax, 56(%3)\n"
23482 " movnti %%edx, 60(%3)\n"
23483 " addl $-64, %0\n"
23484 @@ -584,9 +697,9 @@ static unsigned long __copy_user_intel_nocache(void *to,
23485 " shrl $2, %0\n"
23486 " andl $3, %%eax\n"
23487 " cld\n"
23488 - "6: rep; movsl\n"
23489 + "6: rep; "__copyuser_seg" movsl\n"
23490 " movl %%eax,%0\n"
23491 - "7: rep; movsb\n"
23492 + "7: rep; "__copyuser_seg" movsb\n"
23493 "8:\n"
23494 ".section .fixup,\"ax\"\n"
23495 "9: lea 0(%%eax,%0,4),%0\n"
23496 @@ -629,32 +742,36 @@ static unsigned long __copy_user_intel_nocache(void *to,
23497 */
23498 unsigned long __copy_user_zeroing_intel(void *to, const void __user *from,
23499 unsigned long size);
23500 -unsigned long __copy_user_intel(void __user *to, const void *from,
23501 +unsigned long __generic_copy_to_user_intel(void __user *to, const void *from,
23502 + unsigned long size);
23503 +unsigned long __generic_copy_from_user_intel(void *to, const void __user *from,
23504 unsigned long size);
23505 unsigned long __copy_user_zeroing_intel_nocache(void *to,
23506 const void __user *from, unsigned long size);
23507 #endif /* CONFIG_X86_INTEL_USERCOPY */
23508
23509 /* Generic arbitrary sized copy. */
23510 -#define __copy_user(to, from, size) \
23511 +#define __copy_user(to, from, size, prefix, set, restore) \
23512 do { \
23513 int __d0, __d1, __d2; \
23514 __asm__ __volatile__( \
23515 + set \
23516 " cmp $7,%0\n" \
23517 " jbe 1f\n" \
23518 " movl %1,%0\n" \
23519 " negl %0\n" \
23520 " andl $7,%0\n" \
23521 " subl %0,%3\n" \
23522 - "4: rep; movsb\n" \
23523 + "4: rep; "prefix"movsb\n" \
23524 " movl %3,%0\n" \
23525 " shrl $2,%0\n" \
23526 " andl $3,%3\n" \
23527 " .align 2,0x90\n" \
23528 - "0: rep; movsl\n" \
23529 + "0: rep; "prefix"movsl\n" \
23530 " movl %3,%0\n" \
23531 - "1: rep; movsb\n" \
23532 + "1: rep; "prefix"movsb\n" \
23533 "2:\n" \
23534 + restore \
23535 ".section .fixup,\"ax\"\n" \
23536 "5: addl %3,%0\n" \
23537 " jmp 2b\n" \
23538 @@ -682,14 +799,14 @@ do { \
23539 " negl %0\n" \
23540 " andl $7,%0\n" \
23541 " subl %0,%3\n" \
23542 - "4: rep; movsb\n" \
23543 + "4: rep; "__copyuser_seg"movsb\n" \
23544 " movl %3,%0\n" \
23545 " shrl $2,%0\n" \
23546 " andl $3,%3\n" \
23547 " .align 2,0x90\n" \
23548 - "0: rep; movsl\n" \
23549 + "0: rep; "__copyuser_seg"movsl\n" \
23550 " movl %3,%0\n" \
23551 - "1: rep; movsb\n" \
23552 + "1: rep; "__copyuser_seg"movsb\n" \
23553 "2:\n" \
23554 ".section .fixup,\"ax\"\n" \
23555 "5: addl %3,%0\n" \
23556 @@ -775,9 +892,9 @@ survive:
23557 }
23558 #endif
23559 if (movsl_is_ok(to, from, n))
23560 - __copy_user(to, from, n);
23561 + __copy_user(to, from, n, "", __COPYUSER_SET_ES, __COPYUSER_RESTORE_ES);
23562 else
23563 - n = __copy_user_intel(to, from, n);
23564 + n = __generic_copy_to_user_intel(to, from, n);
23565 return n;
23566 }
23567 EXPORT_SYMBOL(__copy_to_user_ll);
23568 @@ -797,10 +914,9 @@ unsigned long __copy_from_user_ll_nozero(void *to, const void __user *from,
23569 unsigned long n)
23570 {
23571 if (movsl_is_ok(to, from, n))
23572 - __copy_user(to, from, n);
23573 + __copy_user(to, from, n, __copyuser_seg, "", "");
23574 else
23575 - n = __copy_user_intel((void __user *)to,
23576 - (const void *)from, n);
23577 + n = __generic_copy_from_user_intel(to, from, n);
23578 return n;
23579 }
23580 EXPORT_SYMBOL(__copy_from_user_ll_nozero);
23581 @@ -827,59 +943,38 @@ unsigned long __copy_from_user_ll_nocache_nozero(void *to, const void __user *fr
23582 if (n > 64 && cpu_has_xmm2)
23583 n = __copy_user_intel_nocache(to, from, n);
23584 else
23585 - __copy_user(to, from, n);
23586 + __copy_user(to, from, n, __copyuser_seg, "", "");
23587 #else
23588 - __copy_user(to, from, n);
23589 + __copy_user(to, from, n, __copyuser_seg, "", "");
23590 #endif
23591 return n;
23592 }
23593 EXPORT_SYMBOL(__copy_from_user_ll_nocache_nozero);
23594
23595 -/**
23596 - * copy_to_user: - Copy a block of data into user space.
23597 - * @to: Destination address, in user space.
23598 - * @from: Source address, in kernel space.
23599 - * @n: Number of bytes to copy.
23600 - *
23601 - * Context: User context only. This function may sleep.
23602 - *
23603 - * Copy data from kernel space to user space.
23604 - *
23605 - * Returns number of bytes that could not be copied.
23606 - * On success, this will be zero.
23607 - */
23608 -unsigned long
23609 -copy_to_user(void __user *to, const void *from, unsigned long n)
23610 +#ifdef CONFIG_PAX_MEMORY_UDEREF
23611 +void __set_fs(mm_segment_t x)
23612 {
23613 - if (access_ok(VERIFY_WRITE, to, n))
23614 - n = __copy_to_user(to, from, n);
23615 - return n;
23616 + switch (x.seg) {
23617 + case 0:
23618 + loadsegment(gs, 0);
23619 + break;
23620 + case TASK_SIZE_MAX:
23621 + loadsegment(gs, __USER_DS);
23622 + break;
23623 + case -1UL:
23624 + loadsegment(gs, __KERNEL_DS);
23625 + break;
23626 + default:
23627 + BUG();
23628 + }
23629 + return;
23630 }
23631 -EXPORT_SYMBOL(copy_to_user);
23632 +EXPORT_SYMBOL(__set_fs);
23633
23634 -/**
23635 - * copy_from_user: - Copy a block of data from user space.
23636 - * @to: Destination address, in kernel space.
23637 - * @from: Source address, in user space.
23638 - * @n: Number of bytes to copy.
23639 - *
23640 - * Context: User context only. This function may sleep.
23641 - *
23642 - * Copy data from user space to kernel space.
23643 - *
23644 - * Returns number of bytes that could not be copied.
23645 - * On success, this will be zero.
23646 - *
23647 - * If some data could not be copied, this function will pad the copied
23648 - * data to the requested size using zero bytes.
23649 - */
23650 -unsigned long
23651 -copy_from_user(void *to, const void __user *from, unsigned long n)
23652 +void set_fs(mm_segment_t x)
23653 {
23654 - if (access_ok(VERIFY_READ, from, n))
23655 - n = __copy_from_user(to, from, n);
23656 - else
23657 - memset(to, 0, n);
23658 - return n;
23659 + current_thread_info()->addr_limit = x;
23660 + __set_fs(x);
23661 }
23662 -EXPORT_SYMBOL(copy_from_user);
23663 +EXPORT_SYMBOL(set_fs);
23664 +#endif
23665 diff --git a/arch/x86/lib/usercopy_64.c b/arch/x86/lib/usercopy_64.c
23666 index b7c2849..8633ad8 100644
23667 --- a/arch/x86/lib/usercopy_64.c
23668 +++ b/arch/x86/lib/usercopy_64.c
23669 @@ -42,6 +42,12 @@ long
23670 __strncpy_from_user(char *dst, const char __user *src, long count)
23671 {
23672 long res;
23673 +
23674 +#ifdef CONFIG_PAX_MEMORY_UDEREF
23675 + if ((unsigned long)src < PAX_USER_SHADOW_BASE)
23676 + src += PAX_USER_SHADOW_BASE;
23677 +#endif
23678 +
23679 __do_strncpy_from_user(dst, src, count, res);
23680 return res;
23681 }
23682 @@ -65,6 +71,12 @@ unsigned long __clear_user(void __user *addr, unsigned long size)
23683 {
23684 long __d0;
23685 might_fault();
23686 +
23687 +#ifdef CONFIG_PAX_MEMORY_UDEREF
23688 + if ((unsigned long)addr < PAX_USER_SHADOW_BASE)
23689 + addr += PAX_USER_SHADOW_BASE;
23690 +#endif
23691 +
23692 /* no memory constraint because it doesn't change any memory gcc knows
23693 about */
23694 asm volatile(
23695 @@ -149,12 +161,20 @@ long strlen_user(const char __user *s)
23696 }
23697 EXPORT_SYMBOL(strlen_user);
23698
23699 -unsigned long copy_in_user(void __user *to, const void __user *from, unsigned len)
23700 +unsigned long copy_in_user(void __user *to, const void __user *from, unsigned long len)
23701 {
23702 - if (access_ok(VERIFY_WRITE, to, len) && access_ok(VERIFY_READ, from, len)) {
23703 - return copy_user_generic((__force void *)to, (__force void *)from, len);
23704 - }
23705 - return len;
23706 + if (access_ok(VERIFY_WRITE, to, len) && access_ok(VERIFY_READ, from, len)) {
23707 +
23708 +#ifdef CONFIG_PAX_MEMORY_UDEREF
23709 + if ((unsigned long)to < PAX_USER_SHADOW_BASE)
23710 + to += PAX_USER_SHADOW_BASE;
23711 + if ((unsigned long)from < PAX_USER_SHADOW_BASE)
23712 + from += PAX_USER_SHADOW_BASE;
23713 +#endif
23714 +
23715 + return copy_user_generic((void __force_kernel *)to, (void __force_kernel *)from, len);
23716 + }
23717 + return len;
23718 }
23719 EXPORT_SYMBOL(copy_in_user);
23720
23721 @@ -164,7 +184,7 @@ EXPORT_SYMBOL(copy_in_user);
23722 * it is not necessary to optimize tail handling.
23723 */
23724 unsigned long
23725 -copy_user_handle_tail(char *to, char *from, unsigned len, unsigned zerorest)
23726 +copy_user_handle_tail(char __user *to, char __user *from, unsigned long len, unsigned zerorest)
23727 {
23728 char c;
23729 unsigned zero_len;
23730 diff --git a/arch/x86/mm/extable.c b/arch/x86/mm/extable.c
23731 index 61b41ca..5fef66a 100644
23732 --- a/arch/x86/mm/extable.c
23733 +++ b/arch/x86/mm/extable.c
23734 @@ -1,14 +1,71 @@
23735 #include <linux/module.h>
23736 #include <linux/spinlock.h>
23737 +#include <linux/sort.h>
23738 #include <asm/uaccess.h>
23739 +#include <asm/pgtable.h>
23740
23741 +/*
23742 + * The exception table needs to be sorted so that the binary
23743 + * search that we use to find entries in it works properly.
23744 + * This is used both for the kernel exception table and for
23745 + * the exception tables of modules that get loaded.
23746 + */
23747 +static int cmp_ex(const void *a, const void *b)
23748 +{
23749 + const struct exception_table_entry *x = a, *y = b;
23750 +
23751 + /* avoid overflow */
23752 + if (x->insn > y->insn)
23753 + return 1;
23754 + if (x->insn < y->insn)
23755 + return -1;
23756 + return 0;
23757 +}
23758 +
23759 +static void swap_ex(void *a, void *b, int size)
23760 +{
23761 + struct exception_table_entry t, *x = a, *y = b;
23762 +
23763 + t = *x;
23764 +
23765 + pax_open_kernel();
23766 + *x = *y;
23767 + *y = t;
23768 + pax_close_kernel();
23769 +}
23770 +
23771 +void sort_extable(struct exception_table_entry *start,
23772 + struct exception_table_entry *finish)
23773 +{
23774 + sort(start, finish - start, sizeof(struct exception_table_entry),
23775 + cmp_ex, swap_ex);
23776 +}
23777 +
23778 +#ifdef CONFIG_MODULES
23779 +/*
23780 + * If the exception table is sorted, any referring to the module init
23781 + * will be at the beginning or the end.
23782 + */
23783 +void trim_init_extable(struct module *m)
23784 +{
23785 + /*trim the beginning*/
23786 + while (m->num_exentries && within_module_init(m->extable[0].insn, m)) {
23787 + m->extable++;
23788 + m->num_exentries--;
23789 + }
23790 + /*trim the end*/
23791 + while (m->num_exentries &&
23792 + within_module_init(m->extable[m->num_exentries-1].insn, m))
23793 + m->num_exentries--;
23794 +}
23795 +#endif /* CONFIG_MODULES */
23796
23797 int fixup_exception(struct pt_regs *regs)
23798 {
23799 const struct exception_table_entry *fixup;
23800
23801 #ifdef CONFIG_PNPBIOS
23802 - if (unlikely(SEGMENT_IS_PNP_CODE(regs->cs))) {
23803 + if (unlikely(!v8086_mode(regs) && SEGMENT_IS_PNP_CODE(regs->cs))) {
23804 extern u32 pnp_bios_fault_eip, pnp_bios_fault_esp;
23805 extern u32 pnp_bios_is_utter_crap;
23806 pnp_bios_is_utter_crap = 1;
23807 diff --git a/arch/x86/mm/fault.c b/arch/x86/mm/fault.c
23808 index 8ac0d76..87899a4 100644
23809 --- a/arch/x86/mm/fault.c
23810 +++ b/arch/x86/mm/fault.c
23811 @@ -11,10 +11,19 @@
23812 #include <linux/kprobes.h> /* __kprobes, ... */
23813 #include <linux/mmiotrace.h> /* kmmio_handler, ... */
23814 #include <linux/perf_event.h> /* perf_sw_event */
23815 +#include <linux/unistd.h>
23816 +#include <linux/compiler.h>
23817
23818 #include <asm/traps.h> /* dotraplinkage, ... */
23819 #include <asm/pgalloc.h> /* pgd_*(), ... */
23820 #include <asm/kmemcheck.h> /* kmemcheck_*(), ... */
23821 +#include <asm/vsyscall.h>
23822 +#include <asm/tlbflush.h>
23823 +
23824 +#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
23825 +#include <asm/stacktrace.h>
23826 +#include "../kernel/dumpstack.h"
23827 +#endif
23828
23829 /*
23830 * Page fault error code bits:
23831 @@ -51,7 +60,7 @@ static inline int notify_page_fault(struct pt_regs *regs)
23832 int ret = 0;
23833
23834 /* kprobe_running() needs smp_processor_id() */
23835 - if (kprobes_built_in() && !user_mode_vm(regs)) {
23836 + if (kprobes_built_in() && !user_mode(regs)) {
23837 preempt_disable();
23838 if (kprobe_running() && kprobe_fault_handler(regs, 14))
23839 ret = 1;
23840 @@ -112,7 +121,10 @@ check_prefetch_opcode(struct pt_regs *regs, unsigned char *instr,
23841 return !instr_lo || (instr_lo>>1) == 1;
23842 case 0x00:
23843 /* Prefetch instruction is 0x0F0D or 0x0F18 */
23844 - if (probe_kernel_address(instr, opcode))
23845 + if (user_mode(regs)) {
23846 + if (__copy_from_user_inatomic(&opcode, (unsigned char __force_user *)(instr), 1))
23847 + return 0;
23848 + } else if (probe_kernel_address(instr, opcode))
23849 return 0;
23850
23851 *prefetch = (instr_lo == 0xF) &&
23852 @@ -146,7 +158,10 @@ is_prefetch(struct pt_regs *regs, unsigned long error_code, unsigned long addr)
23853 while (instr < max_instr) {
23854 unsigned char opcode;
23855
23856 - if (probe_kernel_address(instr, opcode))
23857 + if (user_mode(regs)) {
23858 + if (__copy_from_user_inatomic(&opcode, (unsigned char __force_user *)(instr), 1))
23859 + break;
23860 + } else if (probe_kernel_address(instr, opcode))
23861 break;
23862
23863 instr++;
23864 @@ -172,6 +187,34 @@ force_sig_info_fault(int si_signo, int si_code, unsigned long address,
23865 force_sig_info(si_signo, &info, tsk);
23866 }
23867
23868 +#if defined(CONFIG_PAX_PAGEEXEC) || defined(CONFIG_PAX_SEGMEXEC)
23869 +static bool pax_is_fetch_fault(struct pt_regs *regs, unsigned long error_code, unsigned long address);
23870 +#endif
23871 +
23872 +#ifdef CONFIG_PAX_EMUTRAMP
23873 +static int pax_handle_fetch_fault(struct pt_regs *regs);
23874 +#endif
23875 +
23876 +#ifdef CONFIG_PAX_PAGEEXEC
23877 +static inline pmd_t * pax_get_pmd(struct mm_struct *mm, unsigned long address)
23878 +{
23879 + pgd_t *pgd;
23880 + pud_t *pud;
23881 + pmd_t *pmd;
23882 +
23883 + pgd = pgd_offset(mm, address);
23884 + if (!pgd_present(*pgd))
23885 + return NULL;
23886 + pud = pud_offset(pgd, address);
23887 + if (!pud_present(*pud))
23888 + return NULL;
23889 + pmd = pmd_offset(pud, address);
23890 + if (!pmd_present(*pmd))
23891 + return NULL;
23892 + return pmd;
23893 +}
23894 +#endif
23895 +
23896 DEFINE_SPINLOCK(pgd_lock);
23897 LIST_HEAD(pgd_list);
23898
23899 @@ -224,11 +267,24 @@ void vmalloc_sync_all(void)
23900 address += PMD_SIZE) {
23901
23902 unsigned long flags;
23903 +
23904 +#ifdef CONFIG_PAX_PER_CPU_PGD
23905 + unsigned long cpu;
23906 +#else
23907 struct page *page;
23908 +#endif
23909
23910 spin_lock_irqsave(&pgd_lock, flags);
23911 +
23912 +#ifdef CONFIG_PAX_PER_CPU_PGD
23913 + for (cpu = 0; cpu < NR_CPUS; ++cpu) {
23914 + pgd_t *pgd = get_cpu_pgd(cpu);
23915 +#else
23916 list_for_each_entry(page, &pgd_list, lru) {
23917 - if (!vmalloc_sync_one(page_address(page), address))
23918 + pgd_t *pgd = page_address(page);
23919 +#endif
23920 +
23921 + if (!vmalloc_sync_one(pgd, address))
23922 break;
23923 }
23924 spin_unlock_irqrestore(&pgd_lock, flags);
23925 @@ -258,6 +314,11 @@ static noinline int vmalloc_fault(unsigned long address)
23926 * an interrupt in the middle of a task switch..
23927 */
23928 pgd_paddr = read_cr3();
23929 +
23930 +#ifdef CONFIG_PAX_PER_CPU_PGD
23931 + BUG_ON(__pa(get_cpu_pgd(smp_processor_id())) != (pgd_paddr & PHYSICAL_PAGE_MASK));
23932 +#endif
23933 +
23934 pmd_k = vmalloc_sync_one(__va(pgd_paddr), address);
23935 if (!pmd_k)
23936 return -1;
23937 @@ -332,15 +393,27 @@ void vmalloc_sync_all(void)
23938
23939 const pgd_t *pgd_ref = pgd_offset_k(address);
23940 unsigned long flags;
23941 +
23942 +#ifdef CONFIG_PAX_PER_CPU_PGD
23943 + unsigned long cpu;
23944 +#else
23945 struct page *page;
23946 +#endif
23947
23948 if (pgd_none(*pgd_ref))
23949 continue;
23950
23951 spin_lock_irqsave(&pgd_lock, flags);
23952 +
23953 +#ifdef CONFIG_PAX_PER_CPU_PGD
23954 + for (cpu = 0; cpu < NR_CPUS; ++cpu) {
23955 + pgd_t *pgd = pgd_offset_cpu(cpu, address);
23956 +#else
23957 list_for_each_entry(page, &pgd_list, lru) {
23958 pgd_t *pgd;
23959 pgd = (pgd_t *)page_address(page) + pgd_index(address);
23960 +#endif
23961 +
23962 if (pgd_none(*pgd))
23963 set_pgd(pgd, *pgd_ref);
23964 else
23965 @@ -373,7 +446,14 @@ static noinline int vmalloc_fault(unsigned long address)
23966 * happen within a race in page table update. In the later
23967 * case just flush:
23968 */
23969 +
23970 +#ifdef CONFIG_PAX_PER_CPU_PGD
23971 + BUG_ON(__pa(get_cpu_pgd(smp_processor_id())) != (read_cr3() & PHYSICAL_PAGE_MASK));
23972 + pgd = pgd_offset_cpu(smp_processor_id(), address);
23973 +#else
23974 pgd = pgd_offset(current->active_mm, address);
23975 +#endif
23976 +
23977 pgd_ref = pgd_offset_k(address);
23978 if (pgd_none(*pgd_ref))
23979 return -1;
23980 @@ -535,7 +615,7 @@ static int is_errata93(struct pt_regs *regs, unsigned long address)
23981 static int is_errata100(struct pt_regs *regs, unsigned long address)
23982 {
23983 #ifdef CONFIG_X86_64
23984 - if ((regs->cs == __USER32_CS || (regs->cs & (1<<2))) && (address >> 32))
23985 + if ((regs->cs == __USER32_CS || (regs->cs & SEGMENT_LDT)) && (address >> 32))
23986 return 1;
23987 #endif
23988 return 0;
23989 @@ -562,7 +642,7 @@ static int is_f00f_bug(struct pt_regs *regs, unsigned long address)
23990 }
23991
23992 static const char nx_warning[] = KERN_CRIT
23993 -"kernel tried to execute NX-protected page - exploit attempt? (uid: %d)\n";
23994 +"kernel tried to execute NX-protected page - exploit attempt? (uid: %d, task: %s, pid: %d)\n";
23995
23996 static void
23997 show_fault_oops(struct pt_regs *regs, unsigned long error_code,
23998 @@ -571,15 +651,26 @@ show_fault_oops(struct pt_regs *regs, unsigned long error_code,
23999 if (!oops_may_print())
24000 return;
24001
24002 - if (error_code & PF_INSTR) {
24003 + if (nx_enabled && (error_code & PF_INSTR)) {
24004 unsigned int level;
24005
24006 pte_t *pte = lookup_address(address, &level);
24007
24008 if (pte && pte_present(*pte) && !pte_exec(*pte))
24009 - printk(nx_warning, current_uid());
24010 + printk(nx_warning, current_uid(), current->comm, task_pid_nr(current));
24011 }
24012
24013 +#ifdef CONFIG_PAX_KERNEXEC
24014 + if (init_mm.start_code <= address && address < init_mm.end_code) {
24015 + if (current->signal->curr_ip)
24016 + printk(KERN_ERR "PAX: From %pI4: %s:%d, uid/euid: %u/%u, attempted to modify kernel code\n",
24017 + &current->signal->curr_ip, current->comm, task_pid_nr(current), current_uid(), current_euid());
24018 + else
24019 + printk(KERN_ERR "PAX: %s:%d, uid/euid: %u/%u, attempted to modify kernel code\n",
24020 + current->comm, task_pid_nr(current), current_uid(), current_euid());
24021 + }
24022 +#endif
24023 +
24024 printk(KERN_ALERT "BUG: unable to handle kernel ");
24025 if (address < PAGE_SIZE)
24026 printk(KERN_CONT "NULL pointer dereference");
24027 @@ -705,6 +796,23 @@ __bad_area_nosemaphore(struct pt_regs *regs, unsigned long error_code,
24028 {
24029 struct task_struct *tsk = current;
24030
24031 +#ifdef CONFIG_X86_64
24032 + struct mm_struct *mm = tsk->mm;
24033 +
24034 + if (mm && (error_code & PF_INSTR) && mm->context.vdso) {
24035 + if (regs->ip == (unsigned long)vgettimeofday) {
24036 + regs->ip = (unsigned long)VDSO64_SYMBOL(mm->context.vdso, fallback_gettimeofday);
24037 + return;
24038 + } else if (regs->ip == (unsigned long)vtime) {
24039 + regs->ip = (unsigned long)VDSO64_SYMBOL(mm->context.vdso, fallback_time);
24040 + return;
24041 + } else if (regs->ip == (unsigned long)vgetcpu) {
24042 + regs->ip = (unsigned long)VDSO64_SYMBOL(mm->context.vdso, getcpu);
24043 + return;
24044 + }
24045 + }
24046 +#endif
24047 +
24048 /* User mode accesses just cause a SIGSEGV */
24049 if (error_code & PF_USER) {
24050 /*
24051 @@ -722,6 +830,21 @@ __bad_area_nosemaphore(struct pt_regs *regs, unsigned long error_code,
24052 if (is_errata100(regs, address))
24053 return;
24054
24055 +#if defined(CONFIG_PAX_PAGEEXEC) || defined(CONFIG_PAX_SEGMEXEC)
24056 + if (pax_is_fetch_fault(regs, error_code, address)) {
24057 +
24058 +#ifdef CONFIG_PAX_EMUTRAMP
24059 + switch (pax_handle_fetch_fault(regs)) {
24060 + case 2:
24061 + return;
24062 + }
24063 +#endif
24064 +
24065 + pax_report_fault(regs, (void *)regs->ip, (void *)regs->sp);
24066 + do_group_exit(SIGKILL);
24067 + }
24068 +#endif
24069 +
24070 if (unlikely(show_unhandled_signals))
24071 show_signal_msg(regs, error_code, address, tsk);
24072
24073 @@ -818,7 +941,7 @@ do_sigbus(struct pt_regs *regs, unsigned long error_code, unsigned long address,
24074 if (fault & VM_FAULT_HWPOISON) {
24075 printk(KERN_ERR
24076 "MCE: Killing %s:%d due to hardware memory corruption fault at %lx\n",
24077 - tsk->comm, tsk->pid, address);
24078 + tsk->comm, task_pid_nr(tsk), address);
24079 code = BUS_MCEERR_AR;
24080 }
24081 #endif
24082 @@ -857,6 +980,99 @@ static int spurious_fault_check(unsigned long error_code, pte_t *pte)
24083 return 1;
24084 }
24085
24086 +#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_PAGEEXEC)
24087 +static int pax_handle_pageexec_fault(struct pt_regs *regs, struct mm_struct *mm, unsigned long address, unsigned long error_code)
24088 +{
24089 + pte_t *pte;
24090 + pmd_t *pmd;
24091 + spinlock_t *ptl;
24092 + unsigned char pte_mask;
24093 +
24094 + if (nx_enabled || (error_code & (PF_PROT|PF_USER)) != (PF_PROT|PF_USER) || v8086_mode(regs) ||
24095 + !(mm->pax_flags & MF_PAX_PAGEEXEC))
24096 + return 0;
24097 +
24098 + /* PaX: it's our fault, let's handle it if we can */
24099 +
24100 + /* PaX: take a look at read faults before acquiring any locks */
24101 + if (unlikely(!(error_code & PF_WRITE) && (regs->ip == address))) {
24102 + /* instruction fetch attempt from a protected page in user mode */
24103 + up_read(&mm->mmap_sem);
24104 +
24105 +#ifdef CONFIG_PAX_EMUTRAMP
24106 + switch (pax_handle_fetch_fault(regs)) {
24107 + case 2:
24108 + return 1;
24109 + }
24110 +#endif
24111 +
24112 + pax_report_fault(regs, (void *)regs->ip, (void *)regs->sp);
24113 + do_group_exit(SIGKILL);
24114 + }
24115 +
24116 + pmd = pax_get_pmd(mm, address);
24117 + if (unlikely(!pmd))
24118 + return 0;
24119 +
24120 + pte = pte_offset_map_lock(mm, pmd, address, &ptl);
24121 + if (unlikely(!(pte_val(*pte) & _PAGE_PRESENT) || pte_user(*pte))) {
24122 + pte_unmap_unlock(pte, ptl);
24123 + return 0;
24124 + }
24125 +
24126 + if (unlikely((error_code & PF_WRITE) && !pte_write(*pte))) {
24127 + /* write attempt to a protected page in user mode */
24128 + pte_unmap_unlock(pte, ptl);
24129 + return 0;
24130 + }
24131 +
24132 +#ifdef CONFIG_SMP
24133 + if (likely(address > get_limit(regs->cs) && cpu_isset(smp_processor_id(), mm->context.cpu_user_cs_mask)))
24134 +#else
24135 + if (likely(address > get_limit(regs->cs)))
24136 +#endif
24137 + {
24138 + set_pte(pte, pte_mkread(*pte));
24139 + __flush_tlb_one(address);
24140 + pte_unmap_unlock(pte, ptl);
24141 + up_read(&mm->mmap_sem);
24142 + return 1;
24143 + }
24144 +
24145 + pte_mask = _PAGE_ACCESSED | _PAGE_USER | ((error_code & PF_WRITE) << (_PAGE_BIT_DIRTY-1));
24146 +
24147 + /*
24148 + * PaX: fill DTLB with user rights and retry
24149 + */
24150 + __asm__ __volatile__ (
24151 + "orb %2,(%1)\n"
24152 +#if defined(CONFIG_M586) || defined(CONFIG_M586TSC)
24153 +/*
24154 + * PaX: let this uncommented 'invlpg' remind us on the behaviour of Intel's
24155 + * (and AMD's) TLBs. namely, they do not cache PTEs that would raise *any*
24156 + * page fault when examined during a TLB load attempt. this is true not only
24157 + * for PTEs holding a non-present entry but also present entries that will
24158 + * raise a page fault (such as those set up by PaX, or the copy-on-write
24159 + * mechanism). in effect it means that we do *not* need to flush the TLBs
24160 + * for our target pages since their PTEs are simply not in the TLBs at all.
24161 +
24162 + * the best thing in omitting it is that we gain around 15-20% speed in the
24163 + * fast path of the page fault handler and can get rid of tracing since we
24164 + * can no longer flush unintended entries.
24165 + */
24166 + "invlpg (%0)\n"
24167 +#endif
24168 + __copyuser_seg"testb $0,(%0)\n"
24169 + "xorb %3,(%1)\n"
24170 + :
24171 + : "r" (address), "r" (pte), "q" (pte_mask), "i" (_PAGE_USER)
24172 + : "memory", "cc");
24173 + pte_unmap_unlock(pte, ptl);
24174 + up_read(&mm->mmap_sem);
24175 + return 1;
24176 +}
24177 +#endif
24178 +
24179 /*
24180 * Handle a spurious fault caused by a stale TLB entry.
24181 *
24182 @@ -923,6 +1139,9 @@ int show_unhandled_signals = 1;
24183 static inline int
24184 access_error(unsigned long error_code, int write, struct vm_area_struct *vma)
24185 {
24186 + if (nx_enabled && (error_code & PF_INSTR) && !(vma->vm_flags & VM_EXEC))
24187 + return 1;
24188 +
24189 if (write) {
24190 /* write, present and write, not present: */
24191 if (unlikely(!(vma->vm_flags & VM_WRITE)))
24192 @@ -956,16 +1175,30 @@ do_page_fault(struct pt_regs *regs, unsigned long error_code)
24193 {
24194 struct vm_area_struct *vma;
24195 struct task_struct *tsk;
24196 - unsigned long address;
24197 struct mm_struct *mm;
24198 int write;
24199 int fault;
24200
24201 - tsk = current;
24202 - mm = tsk->mm;
24203 -
24204 /* Get the faulting address: */
24205 - address = read_cr2();
24206 + unsigned long address = read_cr2();
24207 +
24208 +#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
24209 + if (!user_mode(regs) && address < 2 * PAX_USER_SHADOW_BASE) {
24210 + if (!search_exception_tables(regs->ip)) {
24211 + bad_area_nosemaphore(regs, error_code, address);
24212 + return;
24213 + }
24214 + if (address < PAX_USER_SHADOW_BASE) {
24215 + printk(KERN_ERR "PAX: please report this to pageexec@freemail.hu\n");
24216 + printk(KERN_ERR "PAX: faulting IP: %pA\n", (void *)regs->ip);
24217 + show_trace_log_lvl(NULL, NULL, (void *)regs->sp, regs->bp, KERN_ERR);
24218 + } else
24219 + address -= PAX_USER_SHADOW_BASE;
24220 + }
24221 +#endif
24222 +
24223 + tsk = current;
24224 + mm = tsk->mm;
24225
24226 /*
24227 * Detect and handle instructions that would cause a page fault for
24228 @@ -1026,7 +1259,7 @@ do_page_fault(struct pt_regs *regs, unsigned long error_code)
24229 * User-mode registers count as a user access even for any
24230 * potential system fault or CPU buglet:
24231 */
24232 - if (user_mode_vm(regs)) {
24233 + if (user_mode(regs)) {
24234 local_irq_enable();
24235 error_code |= PF_USER;
24236 } else {
24237 @@ -1080,6 +1313,11 @@ do_page_fault(struct pt_regs *regs, unsigned long error_code)
24238 might_sleep();
24239 }
24240
24241 +#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_PAGEEXEC)
24242 + if (pax_handle_pageexec_fault(regs, mm, address, error_code))
24243 + return;
24244 +#endif
24245 +
24246 vma = find_vma(mm, address);
24247 if (unlikely(!vma)) {
24248 bad_area(regs, error_code, address);
24249 @@ -1091,18 +1329,24 @@ do_page_fault(struct pt_regs *regs, unsigned long error_code)
24250 bad_area(regs, error_code, address);
24251 return;
24252 }
24253 - if (error_code & PF_USER) {
24254 - /*
24255 - * Accessing the stack below %sp is always a bug.
24256 - * The large cushion allows instructions like enter
24257 - * and pusha to work. ("enter $65535, $31" pushes
24258 - * 32 pointers and then decrements %sp by 65535.)
24259 - */
24260 - if (unlikely(address + 65536 + 32 * sizeof(unsigned long) < regs->sp)) {
24261 - bad_area(regs, error_code, address);
24262 - return;
24263 - }
24264 + /*
24265 + * Accessing the stack below %sp is always a bug.
24266 + * The large cushion allows instructions like enter
24267 + * and pusha to work. ("enter $65535, $31" pushes
24268 + * 32 pointers and then decrements %sp by 65535.)
24269 + */
24270 + if (unlikely(address + 65536 + 32 * sizeof(unsigned long) < task_pt_regs(tsk)->sp)) {
24271 + bad_area(regs, error_code, address);
24272 + return;
24273 }
24274 +
24275 +#ifdef CONFIG_PAX_SEGMEXEC
24276 + if (unlikely((mm->pax_flags & MF_PAX_SEGMEXEC) && vma->vm_end - SEGMEXEC_TASK_SIZE - 1 < address - SEGMEXEC_TASK_SIZE - 1)) {
24277 + bad_area(regs, error_code, address);
24278 + return;
24279 + }
24280 +#endif
24281 +
24282 if (unlikely(expand_stack(vma, address))) {
24283 bad_area(regs, error_code, address);
24284 return;
24285 @@ -1146,3 +1390,292 @@ good_area:
24286
24287 up_read(&mm->mmap_sem);
24288 }
24289 +
24290 +#if defined(CONFIG_PAX_PAGEEXEC) || defined(CONFIG_PAX_SEGMEXEC)
24291 +static bool pax_is_fetch_fault(struct pt_regs *regs, unsigned long error_code, unsigned long address)
24292 +{
24293 + struct mm_struct *mm = current->mm;
24294 + unsigned long ip = regs->ip;
24295 +
24296 + if (v8086_mode(regs))
24297 + ip = ((regs->cs & 0xffff) << 4) + (ip & 0xffff);
24298 +
24299 +#ifdef CONFIG_PAX_PAGEEXEC
24300 + if (mm->pax_flags & MF_PAX_PAGEEXEC) {
24301 + if ((__supported_pte_mask & _PAGE_NX) && (error_code & PF_INSTR))
24302 + return true;
24303 + if (!(error_code & (PF_PROT | PF_WRITE)) && ip == address)
24304 + return true;
24305 + return false;
24306 + }
24307 +#endif
24308 +
24309 +#ifdef CONFIG_PAX_SEGMEXEC
24310 + if (mm->pax_flags & MF_PAX_SEGMEXEC) {
24311 + if (!(error_code & (PF_PROT | PF_WRITE)) && (ip + SEGMEXEC_TASK_SIZE == address))
24312 + return true;
24313 + return false;
24314 + }
24315 +#endif
24316 +
24317 + return false;
24318 +}
24319 +#endif
24320 +
24321 +#ifdef CONFIG_PAX_EMUTRAMP
24322 +static int pax_handle_fetch_fault_32(struct pt_regs *regs)
24323 +{
24324 + int err;
24325 +
24326 + do { /* PaX: libffi trampoline emulation */
24327 + unsigned char mov, jmp;
24328 + unsigned int addr1, addr2;
24329 +
24330 +#ifdef CONFIG_X86_64
24331 + if ((regs->ip + 9) >> 32)
24332 + break;
24333 +#endif
24334 +
24335 + err = get_user(mov, (unsigned char __user *)regs->ip);
24336 + err |= get_user(addr1, (unsigned int __user *)(regs->ip + 1));
24337 + err |= get_user(jmp, (unsigned char __user *)(regs->ip + 5));
24338 + err |= get_user(addr2, (unsigned int __user *)(regs->ip + 6));
24339 +
24340 + if (err)
24341 + break;
24342 +
24343 + if (mov == 0xB8 && jmp == 0xE9) {
24344 + regs->ax = addr1;
24345 + regs->ip = (unsigned int)(regs->ip + addr2 + 10);
24346 + return 2;
24347 + }
24348 + } while (0);
24349 +
24350 + do { /* PaX: gcc trampoline emulation #1 */
24351 + unsigned char mov1, mov2;
24352 + unsigned short jmp;
24353 + unsigned int addr1, addr2;
24354 +
24355 +#ifdef CONFIG_X86_64
24356 + if ((regs->ip + 11) >> 32)
24357 + break;
24358 +#endif
24359 +
24360 + err = get_user(mov1, (unsigned char __user *)regs->ip);
24361 + err |= get_user(addr1, (unsigned int __user *)(regs->ip + 1));
24362 + err |= get_user(mov2, (unsigned char __user *)(regs->ip + 5));
24363 + err |= get_user(addr2, (unsigned int __user *)(regs->ip + 6));
24364 + err |= get_user(jmp, (unsigned short __user *)(regs->ip + 10));
24365 +
24366 + if (err)
24367 + break;
24368 +
24369 + if (mov1 == 0xB9 && mov2 == 0xB8 && jmp == 0xE0FF) {
24370 + regs->cx = addr1;
24371 + regs->ax = addr2;
24372 + regs->ip = addr2;
24373 + return 2;
24374 + }
24375 + } while (0);
24376 +
24377 + do { /* PaX: gcc trampoline emulation #2 */
24378 + unsigned char mov, jmp;
24379 + unsigned int addr1, addr2;
24380 +
24381 +#ifdef CONFIG_X86_64
24382 + if ((regs->ip + 9) >> 32)
24383 + break;
24384 +#endif
24385 +
24386 + err = get_user(mov, (unsigned char __user *)regs->ip);
24387 + err |= get_user(addr1, (unsigned int __user *)(regs->ip + 1));
24388 + err |= get_user(jmp, (unsigned char __user *)(regs->ip + 5));
24389 + err |= get_user(addr2, (unsigned int __user *)(regs->ip + 6));
24390 +
24391 + if (err)
24392 + break;
24393 +
24394 + if (mov == 0xB9 && jmp == 0xE9) {
24395 + regs->cx = addr1;
24396 + regs->ip = (unsigned int)(regs->ip + addr2 + 10);
24397 + return 2;
24398 + }
24399 + } while (0);
24400 +
24401 + return 1; /* PaX in action */
24402 +}
24403 +
24404 +#ifdef CONFIG_X86_64
24405 +static int pax_handle_fetch_fault_64(struct pt_regs *regs)
24406 +{
24407 + int err;
24408 +
24409 + do { /* PaX: libffi trampoline emulation */
24410 + unsigned short mov1, mov2, jmp1;
24411 + unsigned char stcclc, jmp2;
24412 + unsigned long addr1, addr2;
24413 +
24414 + err = get_user(mov1, (unsigned short __user *)regs->ip);
24415 + err |= get_user(addr1, (unsigned long __user *)(regs->ip + 2));
24416 + err |= get_user(mov2, (unsigned short __user *)(regs->ip + 10));
24417 + err |= get_user(addr2, (unsigned long __user *)(regs->ip + 12));
24418 + err |= get_user(stcclc, (unsigned char __user *)(regs->ip + 20));
24419 + err |= get_user(jmp1, (unsigned short __user *)(regs->ip + 21));
24420 + err |= get_user(jmp2, (unsigned char __user *)(regs->ip + 23));
24421 +
24422 + if (err)
24423 + break;
24424 +
24425 + if (mov1 == 0xBB49 && mov2 == 0xBA49 && (stcclc == 0xF8 || stcclc == 0xF9) && jmp1 == 0xFF49 && jmp2 == 0xE3) {
24426 + regs->r11 = addr1;
24427 + regs->r10 = addr2;
24428 + if (stcclc == 0xF8)
24429 + regs->flags &= ~X86_EFLAGS_CF;
24430 + else
24431 + regs->flags |= X86_EFLAGS_CF;
24432 + regs->ip = addr1;
24433 + return 2;
24434 + }
24435 + } while (0);
24436 +
24437 + do { /* PaX: gcc trampoline emulation #1 */
24438 + unsigned short mov1, mov2, jmp1;
24439 + unsigned char jmp2;
24440 + unsigned int addr1;
24441 + unsigned long addr2;
24442 +
24443 + err = get_user(mov1, (unsigned short __user *)regs->ip);
24444 + err |= get_user(addr1, (unsigned int __user *)(regs->ip + 2));
24445 + err |= get_user(mov2, (unsigned short __user *)(regs->ip + 6));
24446 + err |= get_user(addr2, (unsigned long __user *)(regs->ip + 8));
24447 + err |= get_user(jmp1, (unsigned short __user *)(regs->ip + 16));
24448 + err |= get_user(jmp2, (unsigned char __user *)(regs->ip + 18));
24449 +
24450 + if (err)
24451 + break;
24452 +
24453 + if (mov1 == 0xBB41 && mov2 == 0xBA49 && jmp1 == 0xFF49 && jmp2 == 0xE3) {
24454 + regs->r11 = addr1;
24455 + regs->r10 = addr2;
24456 + regs->ip = addr1;
24457 + return 2;
24458 + }
24459 + } while (0);
24460 +
24461 + do { /* PaX: gcc trampoline emulation #2 */
24462 + unsigned short mov1, mov2, jmp1;
24463 + unsigned char jmp2;
24464 + unsigned long addr1, addr2;
24465 +
24466 + err = get_user(mov1, (unsigned short __user *)regs->ip);
24467 + err |= get_user(addr1, (unsigned long __user *)(regs->ip + 2));
24468 + err |= get_user(mov2, (unsigned short __user *)(regs->ip + 10));
24469 + err |= get_user(addr2, (unsigned long __user *)(regs->ip + 12));
24470 + err |= get_user(jmp1, (unsigned short __user *)(regs->ip + 20));
24471 + err |= get_user(jmp2, (unsigned char __user *)(regs->ip + 22));
24472 +
24473 + if (err)
24474 + break;
24475 +
24476 + if (mov1 == 0xBB49 && mov2 == 0xBA49 && jmp1 == 0xFF49 && jmp2 == 0xE3) {
24477 + regs->r11 = addr1;
24478 + regs->r10 = addr2;
24479 + regs->ip = addr1;
24480 + return 2;
24481 + }
24482 + } while (0);
24483 +
24484 + return 1; /* PaX in action */
24485 +}
24486 +#endif
24487 +
24488 +/*
24489 + * PaX: decide what to do with offenders (regs->ip = fault address)
24490 + *
24491 + * returns 1 when task should be killed
24492 + * 2 when gcc trampoline was detected
24493 + */
24494 +static int pax_handle_fetch_fault(struct pt_regs *regs)
24495 +{
24496 + if (v8086_mode(regs))
24497 + return 1;
24498 +
24499 + if (!(current->mm->pax_flags & MF_PAX_EMUTRAMP))
24500 + return 1;
24501 +
24502 +#ifdef CONFIG_X86_32
24503 + return pax_handle_fetch_fault_32(regs);
24504 +#else
24505 + if (regs->cs == __USER32_CS || (regs->cs & SEGMENT_LDT))
24506 + return pax_handle_fetch_fault_32(regs);
24507 + else
24508 + return pax_handle_fetch_fault_64(regs);
24509 +#endif
24510 +}
24511 +#endif
24512 +
24513 +#if defined(CONFIG_PAX_PAGEEXEC) || defined(CONFIG_PAX_SEGMEXEC)
24514 +void pax_report_insns(struct pt_regs *regs, void *pc, void *sp)
24515 +{
24516 + long i;
24517 +
24518 + printk(KERN_ERR "PAX: bytes at PC: ");
24519 + for (i = 0; i < 20; i++) {
24520 + unsigned char c;
24521 + if (get_user(c, (unsigned char __force_user *)pc+i))
24522 + printk(KERN_CONT "?? ");
24523 + else
24524 + printk(KERN_CONT "%02x ", c);
24525 + }
24526 + printk("\n");
24527 +
24528 + printk(KERN_ERR "PAX: bytes at SP-%lu: ", (unsigned long)sizeof(long));
24529 + for (i = -1; i < 80 / (long)sizeof(long); i++) {
24530 + unsigned long c;
24531 + if (get_user(c, (unsigned long __force_user *)sp+i)) {
24532 +#ifdef CONFIG_X86_32
24533 + printk(KERN_CONT "???????? ");
24534 +#else
24535 + if ((regs->cs == __USER32_CS || (regs->cs & SEGMENT_LDT)))
24536 + printk(KERN_CONT "???????? ???????? ");
24537 + else
24538 + printk(KERN_CONT "???????????????? ");
24539 +#endif
24540 + } else {
24541 +#ifdef CONFIG_X86_64
24542 + if ((regs->cs == __USER32_CS || (regs->cs & SEGMENT_LDT))) {
24543 + printk(KERN_CONT "%08x ", (unsigned int)c);
24544 + printk(KERN_CONT "%08x ", (unsigned int)(c >> 32));
24545 + } else
24546 +#endif
24547 + printk(KERN_CONT "%0*lx ", 2 * (int)sizeof(long), c);
24548 + }
24549 + }
24550 + printk("\n");
24551 +}
24552 +#endif
24553 +
24554 +/**
24555 + * probe_kernel_write(): safely attempt to write to a location
24556 + * @dst: address to write to
24557 + * @src: pointer to the data that shall be written
24558 + * @size: size of the data chunk
24559 + *
24560 + * Safely write to address @dst from the buffer at @src. If a kernel fault
24561 + * happens, handle that and return -EFAULT.
24562 + */
24563 +long notrace probe_kernel_write(void *dst, const void *src, size_t size)
24564 +{
24565 + long ret;
24566 + mm_segment_t old_fs = get_fs();
24567 +
24568 + set_fs(KERNEL_DS);
24569 + pagefault_disable();
24570 + pax_open_kernel();
24571 + ret = __copy_to_user_inatomic((void __force_user *)dst, src, size);
24572 + pax_close_kernel();
24573 + pagefault_enable();
24574 + set_fs(old_fs);
24575 +
24576 + return ret ? -EFAULT : 0;
24577 +}
24578 diff --git a/arch/x86/mm/gup.c b/arch/x86/mm/gup.c
24579 index 71da1bc..7a16bf4 100644
24580 --- a/arch/x86/mm/gup.c
24581 +++ b/arch/x86/mm/gup.c
24582 @@ -237,7 +237,7 @@ int __get_user_pages_fast(unsigned long start, int nr_pages, int write,
24583 addr = start;
24584 len = (unsigned long) nr_pages << PAGE_SHIFT;
24585 end = start + len;
24586 - if (unlikely(!access_ok(write ? VERIFY_WRITE : VERIFY_READ,
24587 + if (unlikely(!__access_ok(write ? VERIFY_WRITE : VERIFY_READ,
24588 (void __user *)start, len)))
24589 return 0;
24590
24591 diff --git a/arch/x86/mm/highmem_32.c b/arch/x86/mm/highmem_32.c
24592 index 63a6ba6..79abd7a 100644
24593 --- a/arch/x86/mm/highmem_32.c
24594 +++ b/arch/x86/mm/highmem_32.c
24595 @@ -43,7 +43,10 @@ void *kmap_atomic_prot(struct page *page, enum km_type type, pgprot_t prot)
24596 idx = type + KM_TYPE_NR*smp_processor_id();
24597 vaddr = __fix_to_virt(FIX_KMAP_BEGIN + idx);
24598 BUG_ON(!pte_none(*(kmap_pte-idx)));
24599 +
24600 + pax_open_kernel();
24601 set_pte(kmap_pte-idx, mk_pte(page, prot));
24602 + pax_close_kernel();
24603
24604 return (void *)vaddr;
24605 }
24606 diff --git a/arch/x86/mm/hugetlbpage.c b/arch/x86/mm/hugetlbpage.c
24607 index f46c340..6ff9a26 100644
24608 --- a/arch/x86/mm/hugetlbpage.c
24609 +++ b/arch/x86/mm/hugetlbpage.c
24610 @@ -267,13 +267,20 @@ static unsigned long hugetlb_get_unmapped_area_bottomup(struct file *file,
24611 struct hstate *h = hstate_file(file);
24612 struct mm_struct *mm = current->mm;
24613 struct vm_area_struct *vma;
24614 - unsigned long start_addr;
24615 + unsigned long start_addr, pax_task_size = TASK_SIZE;
24616 +
24617 +#ifdef CONFIG_PAX_SEGMEXEC
24618 + if (mm->pax_flags & MF_PAX_SEGMEXEC)
24619 + pax_task_size = SEGMEXEC_TASK_SIZE;
24620 +#endif
24621 +
24622 + pax_task_size -= PAGE_SIZE;
24623
24624 if (len > mm->cached_hole_size) {
24625 - start_addr = mm->free_area_cache;
24626 + start_addr = mm->free_area_cache;
24627 } else {
24628 - start_addr = TASK_UNMAPPED_BASE;
24629 - mm->cached_hole_size = 0;
24630 + start_addr = mm->mmap_base;
24631 + mm->cached_hole_size = 0;
24632 }
24633
24634 full_search:
24635 @@ -281,26 +288,27 @@ full_search:
24636
24637 for (vma = find_vma(mm, addr); ; vma = vma->vm_next) {
24638 /* At this point: (!vma || addr < vma->vm_end). */
24639 - if (TASK_SIZE - len < addr) {
24640 + if (pax_task_size - len < addr) {
24641 /*
24642 * Start a new search - just in case we missed
24643 * some holes.
24644 */
24645 - if (start_addr != TASK_UNMAPPED_BASE) {
24646 - start_addr = TASK_UNMAPPED_BASE;
24647 + if (start_addr != mm->mmap_base) {
24648 + start_addr = mm->mmap_base;
24649 mm->cached_hole_size = 0;
24650 goto full_search;
24651 }
24652 return -ENOMEM;
24653 }
24654 - if (!vma || addr + len <= vma->vm_start) {
24655 - mm->free_area_cache = addr + len;
24656 - return addr;
24657 - }
24658 + if (check_heap_stack_gap(vma, addr, len))
24659 + break;
24660 if (addr + mm->cached_hole_size < vma->vm_start)
24661 mm->cached_hole_size = vma->vm_start - addr;
24662 addr = ALIGN(vma->vm_end, huge_page_size(h));
24663 }
24664 +
24665 + mm->free_area_cache = addr + len;
24666 + return addr;
24667 }
24668
24669 static unsigned long hugetlb_get_unmapped_area_topdown(struct file *file,
24670 @@ -309,10 +317,9 @@ static unsigned long hugetlb_get_unmapped_area_topdown(struct file *file,
24671 {
24672 struct hstate *h = hstate_file(file);
24673 struct mm_struct *mm = current->mm;
24674 - struct vm_area_struct *vma, *prev_vma;
24675 - unsigned long base = mm->mmap_base, addr = addr0;
24676 + struct vm_area_struct *vma;
24677 + unsigned long base = mm->mmap_base, addr;
24678 unsigned long largest_hole = mm->cached_hole_size;
24679 - int first_time = 1;
24680
24681 /* don't allow allocations above current base */
24682 if (mm->free_area_cache > base)
24683 @@ -322,64 +329,63 @@ static unsigned long hugetlb_get_unmapped_area_topdown(struct file *file,
24684 largest_hole = 0;
24685 mm->free_area_cache = base;
24686 }
24687 -try_again:
24688 +
24689 /* make sure it can fit in the remaining address space */
24690 if (mm->free_area_cache < len)
24691 goto fail;
24692
24693 /* either no address requested or cant fit in requested address hole */
24694 - addr = (mm->free_area_cache - len) & huge_page_mask(h);
24695 + addr = (mm->free_area_cache - len);
24696 do {
24697 + addr &= huge_page_mask(h);
24698 + vma = find_vma(mm, addr);
24699 /*
24700 * Lookup failure means no vma is above this address,
24701 * i.e. return with success:
24702 - */
24703 - if (!(vma = find_vma_prev(mm, addr, &prev_vma)))
24704 - return addr;
24705 -
24706 - /*
24707 * new region fits between prev_vma->vm_end and
24708 * vma->vm_start, use it:
24709 */
24710 - if (addr + len <= vma->vm_start &&
24711 - (!prev_vma || (addr >= prev_vma->vm_end))) {
24712 + if (check_heap_stack_gap(vma, addr, len)) {
24713 /* remember the address as a hint for next time */
24714 - mm->cached_hole_size = largest_hole;
24715 - return (mm->free_area_cache = addr);
24716 - } else {
24717 - /* pull free_area_cache down to the first hole */
24718 - if (mm->free_area_cache == vma->vm_end) {
24719 - mm->free_area_cache = vma->vm_start;
24720 - mm->cached_hole_size = largest_hole;
24721 - }
24722 + mm->cached_hole_size = largest_hole;
24723 + return (mm->free_area_cache = addr);
24724 + }
24725 + /* pull free_area_cache down to the first hole */
24726 + if (mm->free_area_cache == vma->vm_end) {
24727 + mm->free_area_cache = vma->vm_start;
24728 + mm->cached_hole_size = largest_hole;
24729 }
24730
24731 /* remember the largest hole we saw so far */
24732 if (addr + largest_hole < vma->vm_start)
24733 - largest_hole = vma->vm_start - addr;
24734 + largest_hole = vma->vm_start - addr;
24735
24736 /* try just below the current vma->vm_start */
24737 - addr = (vma->vm_start - len) & huge_page_mask(h);
24738 - } while (len <= vma->vm_start);
24739 + addr = skip_heap_stack_gap(vma, len);
24740 + } while (!IS_ERR_VALUE(addr));
24741
24742 fail:
24743 /*
24744 - * if hint left us with no space for the requested
24745 - * mapping then try again:
24746 - */
24747 - if (first_time) {
24748 - mm->free_area_cache = base;
24749 - largest_hole = 0;
24750 - first_time = 0;
24751 - goto try_again;
24752 - }
24753 - /*
24754 * A failed mmap() very likely causes application failure,
24755 * so fall back to the bottom-up function here. This scenario
24756 * can happen with large stack limits and large mmap()
24757 * allocations.
24758 */
24759 - mm->free_area_cache = TASK_UNMAPPED_BASE;
24760 +
24761 +#ifdef CONFIG_PAX_SEGMEXEC
24762 + if (mm->pax_flags & MF_PAX_SEGMEXEC)
24763 + mm->mmap_base = SEGMEXEC_TASK_UNMAPPED_BASE;
24764 + else
24765 +#endif
24766 +
24767 + mm->mmap_base = TASK_UNMAPPED_BASE;
24768 +
24769 +#ifdef CONFIG_PAX_RANDMMAP
24770 + if (mm->pax_flags & MF_PAX_RANDMMAP)
24771 + mm->mmap_base += mm->delta_mmap;
24772 +#endif
24773 +
24774 + mm->free_area_cache = mm->mmap_base;
24775 mm->cached_hole_size = ~0UL;
24776 addr = hugetlb_get_unmapped_area_bottomup(file, addr0,
24777 len, pgoff, flags);
24778 @@ -387,6 +393,7 @@ fail:
24779 /*
24780 * Restore the topdown base:
24781 */
24782 + mm->mmap_base = base;
24783 mm->free_area_cache = base;
24784 mm->cached_hole_size = ~0UL;
24785
24786 @@ -400,10 +407,19 @@ hugetlb_get_unmapped_area(struct file *file, unsigned long addr,
24787 struct hstate *h = hstate_file(file);
24788 struct mm_struct *mm = current->mm;
24789 struct vm_area_struct *vma;
24790 + unsigned long pax_task_size = TASK_SIZE;
24791
24792 if (len & ~huge_page_mask(h))
24793 return -EINVAL;
24794 - if (len > TASK_SIZE)
24795 +
24796 +#ifdef CONFIG_PAX_SEGMEXEC
24797 + if (mm->pax_flags & MF_PAX_SEGMEXEC)
24798 + pax_task_size = SEGMEXEC_TASK_SIZE;
24799 +#endif
24800 +
24801 + pax_task_size -= PAGE_SIZE;
24802 +
24803 + if (len > pax_task_size)
24804 return -ENOMEM;
24805
24806 if (flags & MAP_FIXED) {
24807 @@ -415,8 +431,7 @@ hugetlb_get_unmapped_area(struct file *file, unsigned long addr,
24808 if (addr) {
24809 addr = ALIGN(addr, huge_page_size(h));
24810 vma = find_vma(mm, addr);
24811 - if (TASK_SIZE - len >= addr &&
24812 - (!vma || addr + len <= vma->vm_start))
24813 + if (pax_task_size - len >= addr && check_heap_stack_gap(vma, addr, len))
24814 return addr;
24815 }
24816 if (mm->get_unmapped_area == arch_get_unmapped_area)
24817 diff --git a/arch/x86/mm/init.c b/arch/x86/mm/init.c
24818 index 73ffd55..ad78676 100644
24819 --- a/arch/x86/mm/init.c
24820 +++ b/arch/x86/mm/init.c
24821 @@ -69,11 +69,7 @@ static void __init find_early_table_space(unsigned long end, int use_pse,
24822 * cause a hotspot and fill up ZONE_DMA. The page tables
24823 * need roughly 0.5KB per GB.
24824 */
24825 -#ifdef CONFIG_X86_32
24826 - start = 0x7000;
24827 -#else
24828 - start = 0x8000;
24829 -#endif
24830 + start = 0x100000;
24831 e820_table_start = find_e820_area(start, max_pfn_mapped<<PAGE_SHIFT,
24832 tables, PAGE_SIZE);
24833 if (e820_table_start == -1UL)
24834 @@ -147,7 +143,7 @@ unsigned long __init_refok init_memory_mapping(unsigned long start,
24835 #endif
24836
24837 set_nx();
24838 - if (nx_enabled)
24839 + if (nx_enabled && cpu_has_nx)
24840 printk(KERN_INFO "NX (Execute Disable) protection: active\n");
24841
24842 /* Enable PSE if available */
24843 @@ -329,10 +325,27 @@ unsigned long __init_refok init_memory_mapping(unsigned long start,
24844 * Access has to be given to non-kernel-ram areas as well, these contain the PCI
24845 * mmio resources as well as potential bios/acpi data regions.
24846 */
24847 +
24848 int devmem_is_allowed(unsigned long pagenr)
24849 {
24850 +#ifdef CONFIG_GRKERNSEC_KMEM
24851 + /* allow BDA */
24852 + if (!pagenr)
24853 + return 1;
24854 + /* allow EBDA */
24855 + if ((0x9f000 >> PAGE_SHIFT) == pagenr)
24856 + return 1;
24857 + /* allow ISA/video mem */
24858 + if ((ISA_START_ADDRESS >> PAGE_SHIFT) <= pagenr && pagenr < (ISA_END_ADDRESS >> PAGE_SHIFT))
24859 + return 1;
24860 + /* throw out everything else below 1MB */
24861 + if (pagenr <= 256)
24862 + return 0;
24863 +#else
24864 if (pagenr <= 256)
24865 return 1;
24866 +#endif
24867 +
24868 if (iomem_is_exclusive(pagenr << PAGE_SHIFT))
24869 return 0;
24870 if (!page_is_ram(pagenr))
24871 @@ -379,6 +392,86 @@ void free_init_pages(char *what, unsigned long begin, unsigned long end)
24872
24873 void free_initmem(void)
24874 {
24875 +
24876 +#ifdef CONFIG_PAX_KERNEXEC
24877 +#ifdef CONFIG_X86_32
24878 + /* PaX: limit KERNEL_CS to actual size */
24879 + unsigned long addr, limit;
24880 + struct desc_struct d;
24881 + int cpu;
24882 +
24883 + limit = paravirt_enabled() ? ktva_ktla(0xffffffff) : (unsigned long)&_etext;
24884 + limit = (limit - 1UL) >> PAGE_SHIFT;
24885 +
24886 + memset(__LOAD_PHYSICAL_ADDR + PAGE_OFFSET, POISON_FREE_INITMEM, PAGE_SIZE);
24887 + for (cpu = 0; cpu < NR_CPUS; cpu++) {
24888 + pack_descriptor(&d, get_desc_base(&get_cpu_gdt_table(cpu)[GDT_ENTRY_KERNEL_CS]), limit, 0x9B, 0xC);
24889 + write_gdt_entry(get_cpu_gdt_table(cpu), GDT_ENTRY_KERNEL_CS, &d, DESCTYPE_S);
24890 + }
24891 +
24892 + /* PaX: make KERNEL_CS read-only */
24893 + addr = PFN_ALIGN(ktla_ktva((unsigned long)&_text));
24894 + if (!paravirt_enabled())
24895 + set_memory_ro(addr, (PFN_ALIGN(_sdata) - addr) >> PAGE_SHIFT);
24896 +/*
24897 + for (addr = ktla_ktva((unsigned long)&_text); addr < (unsigned long)&_sdata; addr += PMD_SIZE) {
24898 + pgd = pgd_offset_k(addr);
24899 + pud = pud_offset(pgd, addr);
24900 + pmd = pmd_offset(pud, addr);
24901 + set_pmd(pmd, __pmd(pmd_val(*pmd) & ~_PAGE_RW));
24902 + }
24903 +*/
24904 +#ifdef CONFIG_X86_PAE
24905 + set_memory_nx(PFN_ALIGN(__init_begin), (PFN_ALIGN(__init_end) - PFN_ALIGN(__init_begin)) >> PAGE_SHIFT);
24906 +/*
24907 + for (addr = (unsigned long)&__init_begin; addr < (unsigned long)&__init_end; addr += PMD_SIZE) {
24908 + pgd = pgd_offset_k(addr);
24909 + pud = pud_offset(pgd, addr);
24910 + pmd = pmd_offset(pud, addr);
24911 + set_pmd(pmd, __pmd(pmd_val(*pmd) | (_PAGE_NX & __supported_pte_mask)));
24912 + }
24913 +*/
24914 +#endif
24915 +
24916 +#ifdef CONFIG_MODULES
24917 + set_memory_4k((unsigned long)MODULES_EXEC_VADDR, (MODULES_EXEC_END - MODULES_EXEC_VADDR) >> PAGE_SHIFT);
24918 +#endif
24919 +
24920 +#else
24921 + pgd_t *pgd;
24922 + pud_t *pud;
24923 + pmd_t *pmd;
24924 + unsigned long addr, end;
24925 +
24926 + /* PaX: make kernel code/rodata read-only, rest non-executable */
24927 + for (addr = __START_KERNEL_map; addr < __START_KERNEL_map + KERNEL_IMAGE_SIZE; addr += PMD_SIZE) {
24928 + pgd = pgd_offset_k(addr);
24929 + pud = pud_offset(pgd, addr);
24930 + pmd = pmd_offset(pud, addr);
24931 + if (!pmd_present(*pmd))
24932 + continue;
24933 + if ((unsigned long)_text <= addr && addr < (unsigned long)_sdata)
24934 + set_pmd(pmd, __pmd(pmd_val(*pmd) & ~_PAGE_RW));
24935 + else
24936 + set_pmd(pmd, __pmd(pmd_val(*pmd) | (_PAGE_NX & __supported_pte_mask)));
24937 + }
24938 +
24939 + addr = (unsigned long)__va(__pa(__START_KERNEL_map));
24940 + end = addr + KERNEL_IMAGE_SIZE;
24941 + for (; addr < end; addr += PMD_SIZE) {
24942 + pgd = pgd_offset_k(addr);
24943 + pud = pud_offset(pgd, addr);
24944 + pmd = pmd_offset(pud, addr);
24945 + if (!pmd_present(*pmd))
24946 + continue;
24947 + if ((unsigned long)__va(__pa(_text)) <= addr && addr < (unsigned long)__va(__pa(_sdata)))
24948 + set_pmd(pmd, __pmd(pmd_val(*pmd) & ~_PAGE_RW));
24949 + }
24950 +#endif
24951 +
24952 + flush_tlb_all();
24953 +#endif
24954 +
24955 free_init_pages("unused kernel memory",
24956 (unsigned long)(&__init_begin),
24957 (unsigned long)(&__init_end));
24958 diff --git a/arch/x86/mm/init_32.c b/arch/x86/mm/init_32.c
24959 index 30938c1..bda3d5d 100644
24960 --- a/arch/x86/mm/init_32.c
24961 +++ b/arch/x86/mm/init_32.c
24962 @@ -72,36 +72,6 @@ static __init void *alloc_low_page(void)
24963 }
24964
24965 /*
24966 - * Creates a middle page table and puts a pointer to it in the
24967 - * given global directory entry. This only returns the gd entry
24968 - * in non-PAE compilation mode, since the middle layer is folded.
24969 - */
24970 -static pmd_t * __init one_md_table_init(pgd_t *pgd)
24971 -{
24972 - pud_t *pud;
24973 - pmd_t *pmd_table;
24974 -
24975 -#ifdef CONFIG_X86_PAE
24976 - if (!(pgd_val(*pgd) & _PAGE_PRESENT)) {
24977 - if (after_bootmem)
24978 - pmd_table = (pmd_t *)alloc_bootmem_pages(PAGE_SIZE);
24979 - else
24980 - pmd_table = (pmd_t *)alloc_low_page();
24981 - paravirt_alloc_pmd(&init_mm, __pa(pmd_table) >> PAGE_SHIFT);
24982 - set_pgd(pgd, __pgd(__pa(pmd_table) | _PAGE_PRESENT));
24983 - pud = pud_offset(pgd, 0);
24984 - BUG_ON(pmd_table != pmd_offset(pud, 0));
24985 -
24986 - return pmd_table;
24987 - }
24988 -#endif
24989 - pud = pud_offset(pgd, 0);
24990 - pmd_table = pmd_offset(pud, 0);
24991 -
24992 - return pmd_table;
24993 -}
24994 -
24995 -/*
24996 * Create a page table and place a pointer to it in a middle page
24997 * directory entry:
24998 */
24999 @@ -121,13 +91,28 @@ static pte_t * __init one_page_table_init(pmd_t *pmd)
25000 page_table = (pte_t *)alloc_low_page();
25001
25002 paravirt_alloc_pte(&init_mm, __pa(page_table) >> PAGE_SHIFT);
25003 +#if defined(CONFIG_PAX_PAGEEXEC) || defined(CONFIG_PAX_SEGMEXEC)
25004 + set_pmd(pmd, __pmd(__pa(page_table) | _KERNPG_TABLE));
25005 +#else
25006 set_pmd(pmd, __pmd(__pa(page_table) | _PAGE_TABLE));
25007 +#endif
25008 BUG_ON(page_table != pte_offset_kernel(pmd, 0));
25009 }
25010
25011 return pte_offset_kernel(pmd, 0);
25012 }
25013
25014 +static pmd_t * __init one_md_table_init(pgd_t *pgd)
25015 +{
25016 + pud_t *pud;
25017 + pmd_t *pmd_table;
25018 +
25019 + pud = pud_offset(pgd, 0);
25020 + pmd_table = pmd_offset(pud, 0);
25021 +
25022 + return pmd_table;
25023 +}
25024 +
25025 pmd_t * __init populate_extra_pmd(unsigned long vaddr)
25026 {
25027 int pgd_idx = pgd_index(vaddr);
25028 @@ -201,6 +186,7 @@ page_table_range_init(unsigned long start, unsigned long end, pgd_t *pgd_base)
25029 int pgd_idx, pmd_idx;
25030 unsigned long vaddr;
25031 pgd_t *pgd;
25032 + pud_t *pud;
25033 pmd_t *pmd;
25034 pte_t *pte = NULL;
25035
25036 @@ -210,8 +196,13 @@ page_table_range_init(unsigned long start, unsigned long end, pgd_t *pgd_base)
25037 pgd = pgd_base + pgd_idx;
25038
25039 for ( ; (pgd_idx < PTRS_PER_PGD) && (vaddr != end); pgd++, pgd_idx++) {
25040 - pmd = one_md_table_init(pgd);
25041 - pmd = pmd + pmd_index(vaddr);
25042 + pud = pud_offset(pgd, vaddr);
25043 + pmd = pmd_offset(pud, vaddr);
25044 +
25045 +#ifdef CONFIG_X86_PAE
25046 + paravirt_alloc_pmd(&init_mm, __pa(pmd) >> PAGE_SHIFT);
25047 +#endif
25048 +
25049 for (; (pmd_idx < PTRS_PER_PMD) && (vaddr != end);
25050 pmd++, pmd_idx++) {
25051 pte = page_table_kmap_check(one_page_table_init(pmd),
25052 @@ -223,11 +214,20 @@ page_table_range_init(unsigned long start, unsigned long end, pgd_t *pgd_base)
25053 }
25054 }
25055
25056 -static inline int is_kernel_text(unsigned long addr)
25057 +static inline int is_kernel_text(unsigned long start, unsigned long end)
25058 {
25059 - if (addr >= PAGE_OFFSET && addr <= (unsigned long)__init_end)
25060 - return 1;
25061 - return 0;
25062 + if ((start > ktla_ktva((unsigned long)_etext) ||
25063 + end <= ktla_ktva((unsigned long)_stext)) &&
25064 + (start > ktla_ktva((unsigned long)_einittext) ||
25065 + end <= ktla_ktva((unsigned long)_sinittext)) &&
25066 +
25067 +#ifdef CONFIG_ACPI_SLEEP
25068 + (start > (unsigned long)__va(acpi_wakeup_address) + 0x4000 || end <= (unsigned long)__va(acpi_wakeup_address)) &&
25069 +#endif
25070 +
25071 + (start > (unsigned long)__va(0xfffff) || end <= (unsigned long)__va(0xc0000)))
25072 + return 0;
25073 + return 1;
25074 }
25075
25076 /*
25077 @@ -243,9 +243,10 @@ kernel_physical_mapping_init(unsigned long start,
25078 int use_pse = page_size_mask == (1<<PG_LEVEL_2M);
25079 unsigned long start_pfn, end_pfn;
25080 pgd_t *pgd_base = swapper_pg_dir;
25081 - int pgd_idx, pmd_idx, pte_ofs;
25082 + unsigned int pgd_idx, pmd_idx, pte_ofs;
25083 unsigned long pfn;
25084 pgd_t *pgd;
25085 + pud_t *pud;
25086 pmd_t *pmd;
25087 pte_t *pte;
25088 unsigned pages_2m, pages_4k;
25089 @@ -278,8 +279,13 @@ repeat:
25090 pfn = start_pfn;
25091 pgd_idx = pgd_index((pfn<<PAGE_SHIFT) + PAGE_OFFSET);
25092 pgd = pgd_base + pgd_idx;
25093 - for (; pgd_idx < PTRS_PER_PGD; pgd++, pgd_idx++) {
25094 - pmd = one_md_table_init(pgd);
25095 + for (; pgd_idx < PTRS_PER_PGD && pfn < max_low_pfn; pgd++, pgd_idx++) {
25096 + pud = pud_offset(pgd, 0);
25097 + pmd = pmd_offset(pud, 0);
25098 +
25099 +#ifdef CONFIG_X86_PAE
25100 + paravirt_alloc_pmd(&init_mm, __pa(pmd) >> PAGE_SHIFT);
25101 +#endif
25102
25103 if (pfn >= end_pfn)
25104 continue;
25105 @@ -291,14 +297,13 @@ repeat:
25106 #endif
25107 for (; pmd_idx < PTRS_PER_PMD && pfn < end_pfn;
25108 pmd++, pmd_idx++) {
25109 - unsigned int addr = pfn * PAGE_SIZE + PAGE_OFFSET;
25110 + unsigned long address = pfn * PAGE_SIZE + PAGE_OFFSET;
25111
25112 /*
25113 * Map with big pages if possible, otherwise
25114 * create normal page tables:
25115 */
25116 if (use_pse) {
25117 - unsigned int addr2;
25118 pgprot_t prot = PAGE_KERNEL_LARGE;
25119 /*
25120 * first pass will use the same initial
25121 @@ -308,11 +313,7 @@ repeat:
25122 __pgprot(PTE_IDENT_ATTR |
25123 _PAGE_PSE);
25124
25125 - addr2 = (pfn + PTRS_PER_PTE-1) * PAGE_SIZE +
25126 - PAGE_OFFSET + PAGE_SIZE-1;
25127 -
25128 - if (is_kernel_text(addr) ||
25129 - is_kernel_text(addr2))
25130 + if (is_kernel_text(address, address + PMD_SIZE))
25131 prot = PAGE_KERNEL_LARGE_EXEC;
25132
25133 pages_2m++;
25134 @@ -329,7 +330,7 @@ repeat:
25135 pte_ofs = pte_index((pfn<<PAGE_SHIFT) + PAGE_OFFSET);
25136 pte += pte_ofs;
25137 for (; pte_ofs < PTRS_PER_PTE && pfn < end_pfn;
25138 - pte++, pfn++, pte_ofs++, addr += PAGE_SIZE) {
25139 + pte++, pfn++, pte_ofs++, address += PAGE_SIZE) {
25140 pgprot_t prot = PAGE_KERNEL;
25141 /*
25142 * first pass will use the same initial
25143 @@ -337,7 +338,7 @@ repeat:
25144 */
25145 pgprot_t init_prot = __pgprot(PTE_IDENT_ATTR);
25146
25147 - if (is_kernel_text(addr))
25148 + if (is_kernel_text(address, address + PAGE_SIZE))
25149 prot = PAGE_KERNEL_EXEC;
25150
25151 pages_4k++;
25152 @@ -489,7 +490,7 @@ void __init native_pagetable_setup_start(pgd_t *base)
25153
25154 pud = pud_offset(pgd, va);
25155 pmd = pmd_offset(pud, va);
25156 - if (!pmd_present(*pmd))
25157 + if (!pmd_present(*pmd) || pmd_huge(*pmd))
25158 break;
25159
25160 pte = pte_offset_kernel(pmd, va);
25161 @@ -541,9 +542,7 @@ void __init early_ioremap_page_table_range_init(void)
25162
25163 static void __init pagetable_init(void)
25164 {
25165 - pgd_t *pgd_base = swapper_pg_dir;
25166 -
25167 - permanent_kmaps_init(pgd_base);
25168 + permanent_kmaps_init(swapper_pg_dir);
25169 }
25170
25171 #ifdef CONFIG_ACPI_SLEEP
25172 @@ -551,12 +550,12 @@ static void __init pagetable_init(void)
25173 * ACPI suspend needs this for resume, because things like the intel-agp
25174 * driver might have split up a kernel 4MB mapping.
25175 */
25176 -char swsusp_pg_dir[PAGE_SIZE]
25177 +pgd_t swsusp_pg_dir[PTRS_PER_PGD]
25178 __attribute__ ((aligned(PAGE_SIZE)));
25179
25180 static inline void save_pg_dir(void)
25181 {
25182 - memcpy(swsusp_pg_dir, swapper_pg_dir, PAGE_SIZE);
25183 + clone_pgd_range(swsusp_pg_dir, swapper_pg_dir, PTRS_PER_PGD);
25184 }
25185 #else /* !CONFIG_ACPI_SLEEP */
25186 static inline void save_pg_dir(void)
25187 @@ -588,7 +587,7 @@ void zap_low_mappings(bool early)
25188 flush_tlb_all();
25189 }
25190
25191 -pteval_t __supported_pte_mask __read_mostly = ~(_PAGE_NX | _PAGE_GLOBAL | _PAGE_IOMAP);
25192 +pteval_t __supported_pte_mask __read_only = ~(_PAGE_NX | _PAGE_GLOBAL | _PAGE_IOMAP);
25193 EXPORT_SYMBOL_GPL(__supported_pte_mask);
25194
25195 /* user-defined highmem size */
25196 @@ -777,7 +776,7 @@ void __init setup_bootmem_allocator(void)
25197 * Initialize the boot-time allocator (with low memory only):
25198 */
25199 bootmap_size = bootmem_bootmap_pages(max_low_pfn)<<PAGE_SHIFT;
25200 - bootmap = find_e820_area(0, max_pfn_mapped<<PAGE_SHIFT, bootmap_size,
25201 + bootmap = find_e820_area(0x100000, max_pfn_mapped<<PAGE_SHIFT, bootmap_size,
25202 PAGE_SIZE);
25203 if (bootmap == -1L)
25204 panic("Cannot find bootmem map of size %ld\n", bootmap_size);
25205 @@ -864,6 +863,12 @@ void __init mem_init(void)
25206
25207 pci_iommu_alloc();
25208
25209 +#ifdef CONFIG_PAX_PER_CPU_PGD
25210 + clone_pgd_range(get_cpu_pgd(0) + KERNEL_PGD_BOUNDARY,
25211 + swapper_pg_dir + KERNEL_PGD_BOUNDARY,
25212 + KERNEL_PGD_PTRS);
25213 +#endif
25214 +
25215 #ifdef CONFIG_FLATMEM
25216 BUG_ON(!mem_map);
25217 #endif
25218 @@ -881,7 +886,7 @@ void __init mem_init(void)
25219 set_highmem_pages_init();
25220
25221 codesize = (unsigned long) &_etext - (unsigned long) &_text;
25222 - datasize = (unsigned long) &_edata - (unsigned long) &_etext;
25223 + datasize = (unsigned long) &_edata - (unsigned long) &_sdata;
25224 initsize = (unsigned long) &__init_end - (unsigned long) &__init_begin;
25225
25226 printk(KERN_INFO "Memory: %luk/%luk available (%dk kernel code, "
25227 @@ -923,10 +928,10 @@ void __init mem_init(void)
25228 ((unsigned long)&__init_end -
25229 (unsigned long)&__init_begin) >> 10,
25230
25231 - (unsigned long)&_etext, (unsigned long)&_edata,
25232 - ((unsigned long)&_edata - (unsigned long)&_etext) >> 10,
25233 + (unsigned long)&_sdata, (unsigned long)&_edata,
25234 + ((unsigned long)&_edata - (unsigned long)&_sdata) >> 10,
25235
25236 - (unsigned long)&_text, (unsigned long)&_etext,
25237 + ktla_ktva((unsigned long)&_text), ktla_ktva((unsigned long)&_etext),
25238 ((unsigned long)&_etext - (unsigned long)&_text) >> 10);
25239
25240 /*
25241 @@ -1007,6 +1012,7 @@ void set_kernel_text_rw(void)
25242 if (!kernel_set_to_readonly)
25243 return;
25244
25245 + start = ktla_ktva(start);
25246 pr_debug("Set kernel text: %lx - %lx for read write\n",
25247 start, start+size);
25248
25249 @@ -1021,6 +1027,7 @@ void set_kernel_text_ro(void)
25250 if (!kernel_set_to_readonly)
25251 return;
25252
25253 + start = ktla_ktva(start);
25254 pr_debug("Set kernel text: %lx - %lx for read only\n",
25255 start, start+size);
25256
25257 @@ -1032,6 +1039,7 @@ void mark_rodata_ro(void)
25258 unsigned long start = PFN_ALIGN(_text);
25259 unsigned long size = PFN_ALIGN(_etext) - start;
25260
25261 + start = ktla_ktva(start);
25262 set_pages_ro(virt_to_page(start), size >> PAGE_SHIFT);
25263 printk(KERN_INFO "Write protecting the kernel text: %luk\n",
25264 size >> 10);
25265 diff --git a/arch/x86/mm/init_64.c b/arch/x86/mm/init_64.c
25266 index 7d095ad..25d2549 100644
25267 --- a/arch/x86/mm/init_64.c
25268 +++ b/arch/x86/mm/init_64.c
25269 @@ -164,7 +164,9 @@ void set_pte_vaddr_pud(pud_t *pud_page, unsigned long vaddr, pte_t new_pte)
25270 pmd = fill_pmd(pud, vaddr);
25271 pte = fill_pte(pmd, vaddr);
25272
25273 + pax_open_kernel();
25274 set_pte(pte, new_pte);
25275 + pax_close_kernel();
25276
25277 /*
25278 * It's enough to flush this one mapping.
25279 @@ -223,14 +225,12 @@ static void __init __init_extra_mapping(unsigned long phys, unsigned long size,
25280 pgd = pgd_offset_k((unsigned long)__va(phys));
25281 if (pgd_none(*pgd)) {
25282 pud = (pud_t *) spp_getpage();
25283 - set_pgd(pgd, __pgd(__pa(pud) | _KERNPG_TABLE |
25284 - _PAGE_USER));
25285 + set_pgd(pgd, __pgd(__pa(pud) | _PAGE_TABLE));
25286 }
25287 pud = pud_offset(pgd, (unsigned long)__va(phys));
25288 if (pud_none(*pud)) {
25289 pmd = (pmd_t *) spp_getpage();
25290 - set_pud(pud, __pud(__pa(pmd) | _KERNPG_TABLE |
25291 - _PAGE_USER));
25292 + set_pud(pud, __pud(__pa(pmd) | _PAGE_TABLE));
25293 }
25294 pmd = pmd_offset(pud, phys);
25295 BUG_ON(!pmd_none(*pmd));
25296 @@ -675,6 +675,12 @@ void __init mem_init(void)
25297
25298 pci_iommu_alloc();
25299
25300 +#ifdef CONFIG_PAX_PER_CPU_PGD
25301 + clone_pgd_range(get_cpu_pgd(0) + KERNEL_PGD_BOUNDARY,
25302 + swapper_pg_dir + KERNEL_PGD_BOUNDARY,
25303 + KERNEL_PGD_PTRS);
25304 +#endif
25305 +
25306 /* clear_bss() already clear the empty_zero_page */
25307
25308 reservedpages = 0;
25309 @@ -861,8 +867,8 @@ int kern_addr_valid(unsigned long addr)
25310 static struct vm_area_struct gate_vma = {
25311 .vm_start = VSYSCALL_START,
25312 .vm_end = VSYSCALL_START + (VSYSCALL_MAPPED_PAGES * PAGE_SIZE),
25313 - .vm_page_prot = PAGE_READONLY_EXEC,
25314 - .vm_flags = VM_READ | VM_EXEC
25315 + .vm_page_prot = PAGE_READONLY,
25316 + .vm_flags = VM_READ
25317 };
25318
25319 struct vm_area_struct *get_gate_vma(struct task_struct *tsk)
25320 @@ -896,7 +902,7 @@ int in_gate_area_no_task(unsigned long addr)
25321
25322 const char *arch_vma_name(struct vm_area_struct *vma)
25323 {
25324 - if (vma->vm_mm && vma->vm_start == (long)vma->vm_mm->context.vdso)
25325 + if (vma->vm_mm && vma->vm_start == vma->vm_mm->context.vdso)
25326 return "[vdso]";
25327 if (vma == &gate_vma)
25328 return "[vsyscall]";
25329 diff --git a/arch/x86/mm/iomap_32.c b/arch/x86/mm/iomap_32.c
25330 index 84e236c..69bd3f6 100644
25331 --- a/arch/x86/mm/iomap_32.c
25332 +++ b/arch/x86/mm/iomap_32.c
25333 @@ -65,7 +65,11 @@ void *kmap_atomic_prot_pfn(unsigned long pfn, enum km_type type, pgprot_t prot)
25334 debug_kmap_atomic(type);
25335 idx = type + KM_TYPE_NR * smp_processor_id();
25336 vaddr = __fix_to_virt(FIX_KMAP_BEGIN + idx);
25337 +
25338 + pax_open_kernel();
25339 set_pte(kmap_pte - idx, pfn_pte(pfn, prot));
25340 + pax_close_kernel();
25341 +
25342 arch_flush_lazy_mmu_mode();
25343
25344 return (void *)vaddr;
25345 diff --git a/arch/x86/mm/ioremap.c b/arch/x86/mm/ioremap.c
25346 index 2feb9bd..3646202 100644
25347 --- a/arch/x86/mm/ioremap.c
25348 +++ b/arch/x86/mm/ioremap.c
25349 @@ -41,8 +41,8 @@ int page_is_ram(unsigned long pagenr)
25350 * Second special case: Some BIOSen report the PC BIOS
25351 * area (640->1Mb) as ram even though it is not.
25352 */
25353 - if (pagenr >= (BIOS_BEGIN >> PAGE_SHIFT) &&
25354 - pagenr < (BIOS_END >> PAGE_SHIFT))
25355 + if (pagenr >= (ISA_START_ADDRESS >> PAGE_SHIFT) &&
25356 + pagenr < (ISA_END_ADDRESS >> PAGE_SHIFT))
25357 return 0;
25358
25359 for (i = 0; i < e820.nr_map; i++) {
25360 @@ -137,13 +137,10 @@ static void __iomem *__ioremap_caller(resource_size_t phys_addr,
25361 /*
25362 * Don't allow anybody to remap normal RAM that we're using..
25363 */
25364 - for (pfn = phys_addr >> PAGE_SHIFT;
25365 - (pfn << PAGE_SHIFT) < (last_addr & PAGE_MASK);
25366 - pfn++) {
25367 -
25368 + for (pfn = phys_addr >> PAGE_SHIFT; ((resource_size_t)pfn << PAGE_SHIFT) < (last_addr & PAGE_MASK); pfn++) {
25369 int is_ram = page_is_ram(pfn);
25370
25371 - if (is_ram && pfn_valid(pfn) && !PageReserved(pfn_to_page(pfn)))
25372 + if (is_ram && pfn_valid(pfn) && (pfn >= 0x100 || !PageReserved(pfn_to_page(pfn))))
25373 return NULL;
25374 WARN_ON_ONCE(is_ram);
25375 }
25376 @@ -407,7 +404,7 @@ static int __init early_ioremap_debug_setup(char *str)
25377 early_param("early_ioremap_debug", early_ioremap_debug_setup);
25378
25379 static __initdata int after_paging_init;
25380 -static pte_t bm_pte[PAGE_SIZE/sizeof(pte_t)] __page_aligned_bss;
25381 +static pte_t bm_pte[PAGE_SIZE/sizeof(pte_t)] __read_only __aligned(PAGE_SIZE);
25382
25383 static inline pmd_t * __init early_ioremap_pmd(unsigned long addr)
25384 {
25385 @@ -439,8 +436,7 @@ void __init early_ioremap_init(void)
25386 slot_virt[i] = __fix_to_virt(FIX_BTMAP_BEGIN - NR_FIX_BTMAPS*i);
25387
25388 pmd = early_ioremap_pmd(fix_to_virt(FIX_BTMAP_BEGIN));
25389 - memset(bm_pte, 0, sizeof(bm_pte));
25390 - pmd_populate_kernel(&init_mm, pmd, bm_pte);
25391 + pmd_populate_user(&init_mm, pmd, bm_pte);
25392
25393 /*
25394 * The boot-ioremap range spans multiple pmds, for which
25395 diff --git a/arch/x86/mm/kmemcheck/kmemcheck.c b/arch/x86/mm/kmemcheck/kmemcheck.c
25396 index 8cc1833..1abbc5b 100644
25397 --- a/arch/x86/mm/kmemcheck/kmemcheck.c
25398 +++ b/arch/x86/mm/kmemcheck/kmemcheck.c
25399 @@ -622,9 +622,9 @@ bool kmemcheck_fault(struct pt_regs *regs, unsigned long address,
25400 * memory (e.g. tracked pages)? For now, we need this to avoid
25401 * invoking kmemcheck for PnP BIOS calls.
25402 */
25403 - if (regs->flags & X86_VM_MASK)
25404 + if (v8086_mode(regs))
25405 return false;
25406 - if (regs->cs != __KERNEL_CS)
25407 + if (regs->cs != __KERNEL_CS && regs->cs != __KERNEXEC_KERNEL_CS)
25408 return false;
25409
25410 pte = kmemcheck_pte_lookup(address);
25411 diff --git a/arch/x86/mm/mmap.c b/arch/x86/mm/mmap.c
25412 index c8191de..2975082 100644
25413 --- a/arch/x86/mm/mmap.c
25414 +++ b/arch/x86/mm/mmap.c
25415 @@ -49,7 +49,7 @@ static unsigned int stack_maxrandom_size(void)
25416 * Leave an at least ~128 MB hole with possible stack randomization.
25417 */
25418 #define MIN_GAP (128*1024*1024UL + stack_maxrandom_size())
25419 -#define MAX_GAP (TASK_SIZE/6*5)
25420 +#define MAX_GAP (pax_task_size/6*5)
25421
25422 /*
25423 * True on X86_32 or when emulating IA32 on X86_64
25424 @@ -94,27 +94,40 @@ static unsigned long mmap_rnd(void)
25425 return rnd << PAGE_SHIFT;
25426 }
25427
25428 -static unsigned long mmap_base(void)
25429 +static unsigned long mmap_base(struct mm_struct *mm)
25430 {
25431 unsigned long gap = current->signal->rlim[RLIMIT_STACK].rlim_cur;
25432 + unsigned long pax_task_size = TASK_SIZE;
25433 +
25434 +#ifdef CONFIG_PAX_SEGMEXEC
25435 + if (mm->pax_flags & MF_PAX_SEGMEXEC)
25436 + pax_task_size = SEGMEXEC_TASK_SIZE;
25437 +#endif
25438
25439 if (gap < MIN_GAP)
25440 gap = MIN_GAP;
25441 else if (gap > MAX_GAP)
25442 gap = MAX_GAP;
25443
25444 - return PAGE_ALIGN(TASK_SIZE - gap - mmap_rnd());
25445 + return PAGE_ALIGN(pax_task_size - gap - mmap_rnd());
25446 }
25447
25448 /*
25449 * Bottom-up (legacy) layout on X86_32 did not support randomization, X86_64
25450 * does, but not when emulating X86_32
25451 */
25452 -static unsigned long mmap_legacy_base(void)
25453 +static unsigned long mmap_legacy_base(struct mm_struct *mm)
25454 {
25455 - if (mmap_is_ia32())
25456 + if (mmap_is_ia32()) {
25457 +
25458 +#ifdef CONFIG_PAX_SEGMEXEC
25459 + if (mm->pax_flags & MF_PAX_SEGMEXEC)
25460 + return SEGMEXEC_TASK_UNMAPPED_BASE;
25461 + else
25462 +#endif
25463 +
25464 return TASK_UNMAPPED_BASE;
25465 - else
25466 + } else
25467 return TASK_UNMAPPED_BASE + mmap_rnd();
25468 }
25469
25470 @@ -125,11 +138,23 @@ static unsigned long mmap_legacy_base(void)
25471 void arch_pick_mmap_layout(struct mm_struct *mm)
25472 {
25473 if (mmap_is_legacy()) {
25474 - mm->mmap_base = mmap_legacy_base();
25475 + mm->mmap_base = mmap_legacy_base(mm);
25476 +
25477 +#ifdef CONFIG_PAX_RANDMMAP
25478 + if (mm->pax_flags & MF_PAX_RANDMMAP)
25479 + mm->mmap_base += mm->delta_mmap;
25480 +#endif
25481 +
25482 mm->get_unmapped_area = arch_get_unmapped_area;
25483 mm->unmap_area = arch_unmap_area;
25484 } else {
25485 - mm->mmap_base = mmap_base();
25486 + mm->mmap_base = mmap_base(mm);
25487 +
25488 +#ifdef CONFIG_PAX_RANDMMAP
25489 + if (mm->pax_flags & MF_PAX_RANDMMAP)
25490 + mm->mmap_base -= mm->delta_mmap + mm->delta_stack;
25491 +#endif
25492 +
25493 mm->get_unmapped_area = arch_get_unmapped_area_topdown;
25494 mm->unmap_area = arch_unmap_area_topdown;
25495 }
25496 diff --git a/arch/x86/mm/mmio-mod.c b/arch/x86/mm/mmio-mod.c
25497 index 132772a..b961f11 100644
25498 --- a/arch/x86/mm/mmio-mod.c
25499 +++ b/arch/x86/mm/mmio-mod.c
25500 @@ -193,7 +193,7 @@ static void pre(struct kmmio_probe *p, struct pt_regs *regs,
25501 break;
25502 default:
25503 {
25504 - unsigned char *ip = (unsigned char *)instptr;
25505 + unsigned char *ip = (unsigned char *)ktla_ktva(instptr);
25506 my_trace->opcode = MMIO_UNKNOWN_OP;
25507 my_trace->width = 0;
25508 my_trace->value = (*ip) << 16 | *(ip + 1) << 8 |
25509 @@ -233,7 +233,7 @@ static void post(struct kmmio_probe *p, unsigned long condition,
25510 static void ioremap_trace_core(resource_size_t offset, unsigned long size,
25511 void __iomem *addr)
25512 {
25513 - static atomic_t next_id;
25514 + static atomic_unchecked_t next_id;
25515 struct remap_trace *trace = kmalloc(sizeof(*trace), GFP_KERNEL);
25516 /* These are page-unaligned. */
25517 struct mmiotrace_map map = {
25518 @@ -257,7 +257,7 @@ static void ioremap_trace_core(resource_size_t offset, unsigned long size,
25519 .private = trace
25520 },
25521 .phys = offset,
25522 - .id = atomic_inc_return(&next_id)
25523 + .id = atomic_inc_return_unchecked(&next_id)
25524 };
25525 map.map_id = trace->id;
25526
25527 diff --git a/arch/x86/mm/numa_32.c b/arch/x86/mm/numa_32.c
25528 index d253006..e56dd6a 100644
25529 --- a/arch/x86/mm/numa_32.c
25530 +++ b/arch/x86/mm/numa_32.c
25531 @@ -98,7 +98,6 @@ unsigned long node_memmap_size_bytes(int nid, unsigned long start_pfn,
25532 }
25533 #endif
25534
25535 -extern unsigned long find_max_low_pfn(void);
25536 extern unsigned long highend_pfn, highstart_pfn;
25537
25538 #define LARGE_PAGE_BYTES (PTRS_PER_PTE * PAGE_SIZE)
25539 diff --git a/arch/x86/mm/pageattr-test.c b/arch/x86/mm/pageattr-test.c
25540 index e1d1069..2251ff3 100644
25541 --- a/arch/x86/mm/pageattr-test.c
25542 +++ b/arch/x86/mm/pageattr-test.c
25543 @@ -36,7 +36,7 @@ enum {
25544
25545 static int pte_testbit(pte_t pte)
25546 {
25547 - return pte_flags(pte) & _PAGE_UNUSED1;
25548 + return pte_flags(pte) & _PAGE_CPA_TEST;
25549 }
25550
25551 struct split_state {
25552 diff --git a/arch/x86/mm/pageattr.c b/arch/x86/mm/pageattr.c
25553 index dd38bfb..8c12306 100644
25554 --- a/arch/x86/mm/pageattr.c
25555 +++ b/arch/x86/mm/pageattr.c
25556 @@ -261,16 +261,17 @@ static inline pgprot_t static_protections(pgprot_t prot, unsigned long address,
25557 * PCI BIOS based config access (CONFIG_PCI_GOBIOS) support.
25558 */
25559 if (within(pfn, BIOS_BEGIN >> PAGE_SHIFT, BIOS_END >> PAGE_SHIFT))
25560 - pgprot_val(forbidden) |= _PAGE_NX;
25561 + pgprot_val(forbidden) |= _PAGE_NX & __supported_pte_mask;
25562
25563 /*
25564 * The kernel text needs to be executable for obvious reasons
25565 * Does not cover __inittext since that is gone later on. On
25566 * 64bit we do not enforce !NX on the low mapping
25567 */
25568 - if (within(address, (unsigned long)_text, (unsigned long)_etext))
25569 - pgprot_val(forbidden) |= _PAGE_NX;
25570 + if (within(address, ktla_ktva((unsigned long)_text), ktla_ktva((unsigned long)_etext)))
25571 + pgprot_val(forbidden) |= _PAGE_NX & __supported_pte_mask;
25572
25573 +#ifdef CONFIG_DEBUG_RODATA
25574 /*
25575 * The .rodata section needs to be read-only. Using the pfn
25576 * catches all aliases.
25577 @@ -278,6 +279,14 @@ static inline pgprot_t static_protections(pgprot_t prot, unsigned long address,
25578 if (within(pfn, __pa((unsigned long)__start_rodata) >> PAGE_SHIFT,
25579 __pa((unsigned long)__end_rodata) >> PAGE_SHIFT))
25580 pgprot_val(forbidden) |= _PAGE_RW;
25581 +#endif
25582 +
25583 +#ifdef CONFIG_PAX_KERNEXEC
25584 + if (within(pfn, __pa((unsigned long)&_text), __pa((unsigned long)&_sdata))) {
25585 + pgprot_val(forbidden) |= _PAGE_RW;
25586 + pgprot_val(forbidden) |= _PAGE_NX & __supported_pte_mask;
25587 + }
25588 +#endif
25589
25590 prot = __pgprot(pgprot_val(prot) & ~pgprot_val(forbidden));
25591
25592 @@ -331,23 +340,37 @@ EXPORT_SYMBOL_GPL(lookup_address);
25593 static void __set_pmd_pte(pte_t *kpte, unsigned long address, pte_t pte)
25594 {
25595 /* change init_mm */
25596 + pax_open_kernel();
25597 set_pte_atomic(kpte, pte);
25598 +
25599 #ifdef CONFIG_X86_32
25600 if (!SHARED_KERNEL_PMD) {
25601 +
25602 +#ifdef CONFIG_PAX_PER_CPU_PGD
25603 + unsigned long cpu;
25604 +#else
25605 struct page *page;
25606 +#endif
25607
25608 +#ifdef CONFIG_PAX_PER_CPU_PGD
25609 + for (cpu = 0; cpu < NR_CPUS; ++cpu) {
25610 + pgd_t *pgd = get_cpu_pgd(cpu);
25611 +#else
25612 list_for_each_entry(page, &pgd_list, lru) {
25613 - pgd_t *pgd;
25614 + pgd_t *pgd = (pgd_t *)page_address(page);
25615 +#endif
25616 +
25617 pud_t *pud;
25618 pmd_t *pmd;
25619
25620 - pgd = (pgd_t *)page_address(page) + pgd_index(address);
25621 + pgd += pgd_index(address);
25622 pud = pud_offset(pgd, address);
25623 pmd = pmd_offset(pud, address);
25624 set_pte_atomic((pte_t *)pmd, pte);
25625 }
25626 }
25627 #endif
25628 + pax_close_kernel();
25629 }
25630
25631 static int
25632 diff --git a/arch/x86/mm/pat.c b/arch/x86/mm/pat.c
25633 index e78cd0e..de0a817 100644
25634 --- a/arch/x86/mm/pat.c
25635 +++ b/arch/x86/mm/pat.c
25636 @@ -258,7 +258,7 @@ chk_conflict(struct memtype *new, struct memtype *entry, unsigned long *type)
25637
25638 conflict:
25639 printk(KERN_INFO "%s:%d conflicting memory types "
25640 - "%Lx-%Lx %s<->%s\n", current->comm, current->pid, new->start,
25641 + "%Lx-%Lx %s<->%s\n", current->comm, task_pid_nr(current), new->start,
25642 new->end, cattr_name(new->type), cattr_name(entry->type));
25643 return -EBUSY;
25644 }
25645 @@ -559,7 +559,7 @@ unlock_ret:
25646
25647 if (err) {
25648 printk(KERN_INFO "%s:%d freeing invalid memtype %Lx-%Lx\n",
25649 - current->comm, current->pid, start, end);
25650 + current->comm, task_pid_nr(current), start, end);
25651 }
25652
25653 dprintk("free_memtype request 0x%Lx-0x%Lx\n", start, end);
25654 @@ -689,8 +689,8 @@ static inline int range_is_allowed(unsigned long pfn, unsigned long size)
25655 while (cursor < to) {
25656 if (!devmem_is_allowed(pfn)) {
25657 printk(KERN_INFO
25658 - "Program %s tried to access /dev/mem between %Lx->%Lx.\n",
25659 - current->comm, from, to);
25660 + "Program %s tried to access /dev/mem between %Lx->%Lx (%Lx).\n",
25661 + current->comm, from, to, cursor);
25662 return 0;
25663 }
25664 cursor += PAGE_SIZE;
25665 @@ -755,7 +755,7 @@ int kernel_map_sync_memtype(u64 base, unsigned long size, unsigned long flags)
25666 printk(KERN_INFO
25667 "%s:%d ioremap_change_attr failed %s "
25668 "for %Lx-%Lx\n",
25669 - current->comm, current->pid,
25670 + current->comm, task_pid_nr(current),
25671 cattr_name(flags),
25672 base, (unsigned long long)(base + size));
25673 return -EINVAL;
25674 @@ -813,7 +813,7 @@ static int reserve_pfn_range(u64 paddr, unsigned long size, pgprot_t *vma_prot,
25675 free_memtype(paddr, paddr + size);
25676 printk(KERN_ERR "%s:%d map pfn expected mapping type %s"
25677 " for %Lx-%Lx, got %s\n",
25678 - current->comm, current->pid,
25679 + current->comm, task_pid_nr(current),
25680 cattr_name(want_flags),
25681 (unsigned long long)paddr,
25682 (unsigned long long)(paddr + size),
25683 diff --git a/arch/x86/mm/pf_in.c b/arch/x86/mm/pf_in.c
25684 index df3d5c8..c2223e1 100644
25685 --- a/arch/x86/mm/pf_in.c
25686 +++ b/arch/x86/mm/pf_in.c
25687 @@ -148,7 +148,7 @@ enum reason_type get_ins_type(unsigned long ins_addr)
25688 int i;
25689 enum reason_type rv = OTHERS;
25690
25691 - p = (unsigned char *)ins_addr;
25692 + p = (unsigned char *)ktla_ktva(ins_addr);
25693 p += skip_prefix(p, &prf);
25694 p += get_opcode(p, &opcode);
25695
25696 @@ -168,7 +168,7 @@ static unsigned int get_ins_reg_width(unsigned long ins_addr)
25697 struct prefix_bits prf;
25698 int i;
25699
25700 - p = (unsigned char *)ins_addr;
25701 + p = (unsigned char *)ktla_ktva(ins_addr);
25702 p += skip_prefix(p, &prf);
25703 p += get_opcode(p, &opcode);
25704
25705 @@ -191,7 +191,7 @@ unsigned int get_ins_mem_width(unsigned long ins_addr)
25706 struct prefix_bits prf;
25707 int i;
25708
25709 - p = (unsigned char *)ins_addr;
25710 + p = (unsigned char *)ktla_ktva(ins_addr);
25711 p += skip_prefix(p, &prf);
25712 p += get_opcode(p, &opcode);
25713
25714 @@ -417,7 +417,7 @@ unsigned long get_ins_reg_val(unsigned long ins_addr, struct pt_regs *regs)
25715 int i;
25716 unsigned long rv;
25717
25718 - p = (unsigned char *)ins_addr;
25719 + p = (unsigned char *)ktla_ktva(ins_addr);
25720 p += skip_prefix(p, &prf);
25721 p += get_opcode(p, &opcode);
25722 for (i = 0; i < ARRAY_SIZE(reg_rop); i++)
25723 @@ -472,7 +472,7 @@ unsigned long get_ins_imm_val(unsigned long ins_addr)
25724 int i;
25725 unsigned long rv;
25726
25727 - p = (unsigned char *)ins_addr;
25728 + p = (unsigned char *)ktla_ktva(ins_addr);
25729 p += skip_prefix(p, &prf);
25730 p += get_opcode(p, &opcode);
25731 for (i = 0; i < ARRAY_SIZE(imm_wop); i++)
25732 diff --git a/arch/x86/mm/pgtable.c b/arch/x86/mm/pgtable.c
25733 index e0e6fad..6b90017 100644
25734 --- a/arch/x86/mm/pgtable.c
25735 +++ b/arch/x86/mm/pgtable.c
25736 @@ -83,9 +83,52 @@ static inline void pgd_list_del(pgd_t *pgd)
25737 list_del(&page->lru);
25738 }
25739
25740 -#define UNSHARED_PTRS_PER_PGD \
25741 - (SHARED_KERNEL_PMD ? KERNEL_PGD_BOUNDARY : PTRS_PER_PGD)
25742 +#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
25743 +pgdval_t clone_pgd_mask __read_only = ~_PAGE_PRESENT;
25744
25745 +void __shadow_user_pgds(pgd_t *dst, const pgd_t *src, int count)
25746 +{
25747 + while (count--)
25748 + *dst++ = __pgd((pgd_val(*src++) | (_PAGE_NX & __supported_pte_mask)) & ~_PAGE_USER);
25749 +}
25750 +#endif
25751 +
25752 +#ifdef CONFIG_PAX_PER_CPU_PGD
25753 +void __clone_user_pgds(pgd_t *dst, const pgd_t *src, int count)
25754 +{
25755 + while (count--)
25756 +
25757 +#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
25758 + *dst++ = __pgd(pgd_val(*src++) & clone_pgd_mask);
25759 +#else
25760 + *dst++ = *src++;
25761 +#endif
25762 +
25763 +}
25764 +#endif
25765 +
25766 +#ifdef CONFIG_X86_64
25767 +#define pxd_t pud_t
25768 +#define pyd_t pgd_t
25769 +#define paravirt_release_pxd(pfn) paravirt_release_pud(pfn)
25770 +#define pxd_free(mm, pud) pud_free((mm), (pud))
25771 +#define pyd_populate(mm, pgd, pud) pgd_populate((mm), (pgd), (pud))
25772 +#define pyd_offset(mm ,address) pgd_offset((mm), (address))
25773 +#define PYD_SIZE PGDIR_SIZE
25774 +#else
25775 +#define pxd_t pmd_t
25776 +#define pyd_t pud_t
25777 +#define paravirt_release_pxd(pfn) paravirt_release_pmd(pfn)
25778 +#define pxd_free(mm, pud) pmd_free((mm), (pud))
25779 +#define pyd_populate(mm, pgd, pud) pud_populate((mm), (pgd), (pud))
25780 +#define pyd_offset(mm ,address) pud_offset((mm), (address))
25781 +#define PYD_SIZE PUD_SIZE
25782 +#endif
25783 +
25784 +#ifdef CONFIG_PAX_PER_CPU_PGD
25785 +static inline void pgd_ctor(pgd_t *pgd) {}
25786 +static inline void pgd_dtor(pgd_t *pgd) {}
25787 +#else
25788 static void pgd_ctor(pgd_t *pgd)
25789 {
25790 /* If the pgd points to a shared pagetable level (either the
25791 @@ -119,6 +162,7 @@ static void pgd_dtor(pgd_t *pgd)
25792 pgd_list_del(pgd);
25793 spin_unlock_irqrestore(&pgd_lock, flags);
25794 }
25795 +#endif
25796
25797 /*
25798 * List of all pgd's needed for non-PAE so it can invalidate entries
25799 @@ -131,7 +175,7 @@ static void pgd_dtor(pgd_t *pgd)
25800 * -- wli
25801 */
25802
25803 -#ifdef CONFIG_X86_PAE
25804 +#if defined(CONFIG_X86_32) && defined(CONFIG_X86_PAE)
25805 /*
25806 * In PAE mode, we need to do a cr3 reload (=tlb flush) when
25807 * updating the top-level pagetable entries to guarantee the
25808 @@ -143,7 +187,7 @@ static void pgd_dtor(pgd_t *pgd)
25809 * not shared between pagetables (!SHARED_KERNEL_PMDS), we allocate
25810 * and initialize the kernel pmds here.
25811 */
25812 -#define PREALLOCATED_PMDS UNSHARED_PTRS_PER_PGD
25813 +#define PREALLOCATED_PXDS (SHARED_KERNEL_PMD ? KERNEL_PGD_BOUNDARY : PTRS_PER_PGD)
25814
25815 void pud_populate(struct mm_struct *mm, pud_t *pudp, pmd_t *pmd)
25816 {
25817 @@ -161,36 +205,38 @@ void pud_populate(struct mm_struct *mm, pud_t *pudp, pmd_t *pmd)
25818 */
25819 flush_tlb_mm(mm);
25820 }
25821 +#elif defined(CONFIG_X86_64) && defined(CONFIG_PAX_PER_CPU_PGD)
25822 +#define PREALLOCATED_PXDS USER_PGD_PTRS
25823 #else /* !CONFIG_X86_PAE */
25824
25825 /* No need to prepopulate any pagetable entries in non-PAE modes. */
25826 -#define PREALLOCATED_PMDS 0
25827 +#define PREALLOCATED_PXDS 0
25828
25829 #endif /* CONFIG_X86_PAE */
25830
25831 -static void free_pmds(pmd_t *pmds[])
25832 +static void free_pxds(pxd_t *pxds[])
25833 {
25834 int i;
25835
25836 - for(i = 0; i < PREALLOCATED_PMDS; i++)
25837 - if (pmds[i])
25838 - free_page((unsigned long)pmds[i]);
25839 + for(i = 0; i < PREALLOCATED_PXDS; i++)
25840 + if (pxds[i])
25841 + free_page((unsigned long)pxds[i]);
25842 }
25843
25844 -static int preallocate_pmds(pmd_t *pmds[])
25845 +static int preallocate_pxds(pxd_t *pxds[])
25846 {
25847 int i;
25848 bool failed = false;
25849
25850 - for(i = 0; i < PREALLOCATED_PMDS; i++) {
25851 - pmd_t *pmd = (pmd_t *)__get_free_page(PGALLOC_GFP);
25852 - if (pmd == NULL)
25853 + for(i = 0; i < PREALLOCATED_PXDS; i++) {
25854 + pxd_t *pxd = (pxd_t *)__get_free_page(PGALLOC_GFP);
25855 + if (pxd == NULL)
25856 failed = true;
25857 - pmds[i] = pmd;
25858 + pxds[i] = pxd;
25859 }
25860
25861 if (failed) {
25862 - free_pmds(pmds);
25863 + free_pxds(pxds);
25864 return -ENOMEM;
25865 }
25866
25867 @@ -203,51 +249,56 @@ static int preallocate_pmds(pmd_t *pmds[])
25868 * preallocate which never got a corresponding vma will need to be
25869 * freed manually.
25870 */
25871 -static void pgd_mop_up_pmds(struct mm_struct *mm, pgd_t *pgdp)
25872 +static void pgd_mop_up_pxds(struct mm_struct *mm, pgd_t *pgdp)
25873 {
25874 int i;
25875
25876 - for(i = 0; i < PREALLOCATED_PMDS; i++) {
25877 + for(i = 0; i < PREALLOCATED_PXDS; i++) {
25878 pgd_t pgd = pgdp[i];
25879
25880 if (pgd_val(pgd) != 0) {
25881 - pmd_t *pmd = (pmd_t *)pgd_page_vaddr(pgd);
25882 + pxd_t *pxd = (pxd_t *)pgd_page_vaddr(pgd);
25883
25884 - pgdp[i] = native_make_pgd(0);
25885 + set_pgd(pgdp + i, native_make_pgd(0));
25886
25887 - paravirt_release_pmd(pgd_val(pgd) >> PAGE_SHIFT);
25888 - pmd_free(mm, pmd);
25889 + paravirt_release_pxd(pgd_val(pgd) >> PAGE_SHIFT);
25890 + pxd_free(mm, pxd);
25891 }
25892 }
25893 }
25894
25895 -static void pgd_prepopulate_pmd(struct mm_struct *mm, pgd_t *pgd, pmd_t *pmds[])
25896 +static void pgd_prepopulate_pxd(struct mm_struct *mm, pgd_t *pgd, pxd_t *pxds[])
25897 {
25898 - pud_t *pud;
25899 + pyd_t *pyd;
25900 unsigned long addr;
25901 int i;
25902
25903 - if (PREALLOCATED_PMDS == 0) /* Work around gcc-3.4.x bug */
25904 + if (PREALLOCATED_PXDS == 0) /* Work around gcc-3.4.x bug */
25905 return;
25906
25907 - pud = pud_offset(pgd, 0);
25908 +#ifdef CONFIG_X86_64
25909 + pyd = pyd_offset(mm, 0L);
25910 +#else
25911 + pyd = pyd_offset(pgd, 0L);
25912 +#endif
25913
25914 - for (addr = i = 0; i < PREALLOCATED_PMDS;
25915 - i++, pud++, addr += PUD_SIZE) {
25916 - pmd_t *pmd = pmds[i];
25917 + for (addr = i = 0; i < PREALLOCATED_PXDS;
25918 + i++, pyd++, addr += PYD_SIZE) {
25919 + pxd_t *pxd = pxds[i];
25920
25921 if (i >= KERNEL_PGD_BOUNDARY)
25922 - memcpy(pmd, (pmd_t *)pgd_page_vaddr(swapper_pg_dir[i]),
25923 - sizeof(pmd_t) * PTRS_PER_PMD);
25924 + memcpy(pxd, (pxd_t *)pgd_page_vaddr(swapper_pg_dir[i]),
25925 + sizeof(pxd_t) * PTRS_PER_PMD);
25926
25927 - pud_populate(mm, pud, pmd);
25928 + pyd_populate(mm, pyd, pxd);
25929 }
25930 }
25931
25932 pgd_t *pgd_alloc(struct mm_struct *mm)
25933 {
25934 pgd_t *pgd;
25935 - pmd_t *pmds[PREALLOCATED_PMDS];
25936 + pxd_t *pxds[PREALLOCATED_PXDS];
25937 +
25938 unsigned long flags;
25939
25940 pgd = (pgd_t *)__get_free_page(PGALLOC_GFP);
25941 @@ -257,11 +308,11 @@ pgd_t *pgd_alloc(struct mm_struct *mm)
25942
25943 mm->pgd = pgd;
25944
25945 - if (preallocate_pmds(pmds) != 0)
25946 + if (preallocate_pxds(pxds) != 0)
25947 goto out_free_pgd;
25948
25949 if (paravirt_pgd_alloc(mm) != 0)
25950 - goto out_free_pmds;
25951 + goto out_free_pxds;
25952
25953 /*
25954 * Make sure that pre-populating the pmds is atomic with
25955 @@ -271,14 +322,14 @@ pgd_t *pgd_alloc(struct mm_struct *mm)
25956 spin_lock_irqsave(&pgd_lock, flags);
25957
25958 pgd_ctor(pgd);
25959 - pgd_prepopulate_pmd(mm, pgd, pmds);
25960 + pgd_prepopulate_pxd(mm, pgd, pxds);
25961
25962 spin_unlock_irqrestore(&pgd_lock, flags);
25963
25964 return pgd;
25965
25966 -out_free_pmds:
25967 - free_pmds(pmds);
25968 +out_free_pxds:
25969 + free_pxds(pxds);
25970 out_free_pgd:
25971 free_page((unsigned long)pgd);
25972 out:
25973 @@ -287,7 +338,7 @@ out:
25974
25975 void pgd_free(struct mm_struct *mm, pgd_t *pgd)
25976 {
25977 - pgd_mop_up_pmds(mm, pgd);
25978 + pgd_mop_up_pxds(mm, pgd);
25979 pgd_dtor(pgd);
25980 paravirt_pgd_free(mm, pgd);
25981 free_page((unsigned long)pgd);
25982 diff --git a/arch/x86/mm/pgtable_32.c b/arch/x86/mm/pgtable_32.c
25983 index 46c8834..fcab43d 100644
25984 --- a/arch/x86/mm/pgtable_32.c
25985 +++ b/arch/x86/mm/pgtable_32.c
25986 @@ -49,10 +49,13 @@ void set_pte_vaddr(unsigned long vaddr, pte_t pteval)
25987 return;
25988 }
25989 pte = pte_offset_kernel(pmd, vaddr);
25990 +
25991 + pax_open_kernel();
25992 if (pte_val(pteval))
25993 set_pte_at(&init_mm, vaddr, pte, pteval);
25994 else
25995 pte_clear(&init_mm, vaddr, pte);
25996 + pax_close_kernel();
25997
25998 /*
25999 * It's enough to flush this one mapping.
26000 diff --git a/arch/x86/mm/setup_nx.c b/arch/x86/mm/setup_nx.c
26001 index 513d8ed..978c161 100644
26002 --- a/arch/x86/mm/setup_nx.c
26003 +++ b/arch/x86/mm/setup_nx.c
26004 @@ -4,11 +4,10 @@
26005
26006 #include <asm/pgtable.h>
26007
26008 +#if defined(CONFIG_X86_32) && defined(CONFIG_X86_PAE)
26009 int nx_enabled;
26010
26011 -#if defined(CONFIG_X86_64) || defined(CONFIG_X86_PAE)
26012 -static int disable_nx __cpuinitdata;
26013 -
26014 +#ifndef CONFIG_PAX_PAGEEXEC
26015 /*
26016 * noexec = on|off
26017 *
26018 @@ -22,32 +21,26 @@ static int __init noexec_setup(char *str)
26019 if (!str)
26020 return -EINVAL;
26021 if (!strncmp(str, "on", 2)) {
26022 - __supported_pte_mask |= _PAGE_NX;
26023 - disable_nx = 0;
26024 + nx_enabled = 1;
26025 } else if (!strncmp(str, "off", 3)) {
26026 - disable_nx = 1;
26027 - __supported_pte_mask &= ~_PAGE_NX;
26028 + nx_enabled = 0;
26029 }
26030 return 0;
26031 }
26032 early_param("noexec", noexec_setup);
26033 #endif
26034 +#endif
26035
26036 #ifdef CONFIG_X86_PAE
26037 void __init set_nx(void)
26038 {
26039 - unsigned int v[4], l, h;
26040 + if (!nx_enabled && cpu_has_nx) {
26041 + unsigned l, h;
26042
26043 - if (cpu_has_pae && (cpuid_eax(0x80000000) > 0x80000001)) {
26044 - cpuid(0x80000001, &v[0], &v[1], &v[2], &v[3]);
26045 -
26046 - if ((v[3] & (1 << 20)) && !disable_nx) {
26047 - rdmsr(MSR_EFER, l, h);
26048 - l |= EFER_NX;
26049 - wrmsr(MSR_EFER, l, h);
26050 - nx_enabled = 1;
26051 - __supported_pte_mask |= _PAGE_NX;
26052 - }
26053 + __supported_pte_mask &= ~_PAGE_NX;
26054 + rdmsr(MSR_EFER, l, h);
26055 + l &= ~EFER_NX;
26056 + wrmsr(MSR_EFER, l, h);
26057 }
26058 }
26059 #else
26060 @@ -62,7 +55,7 @@ void __cpuinit check_efer(void)
26061 unsigned long efer;
26062
26063 rdmsrl(MSR_EFER, efer);
26064 - if (!(efer & EFER_NX) || disable_nx)
26065 + if (!(efer & EFER_NX) || !nx_enabled)
26066 __supported_pte_mask &= ~_PAGE_NX;
26067 }
26068 #endif
26069 diff --git a/arch/x86/mm/tlb.c b/arch/x86/mm/tlb.c
26070 index 36fe08e..b123d3a 100644
26071 --- a/arch/x86/mm/tlb.c
26072 +++ b/arch/x86/mm/tlb.c
26073 @@ -61,7 +61,11 @@ void leave_mm(int cpu)
26074 BUG();
26075 cpumask_clear_cpu(cpu,
26076 mm_cpumask(percpu_read(cpu_tlbstate.active_mm)));
26077 +
26078 +#ifndef CONFIG_PAX_PER_CPU_PGD
26079 load_cr3(swapper_pg_dir);
26080 +#endif
26081 +
26082 }
26083 EXPORT_SYMBOL_GPL(leave_mm);
26084
26085 diff --git a/arch/x86/oprofile/backtrace.c b/arch/x86/oprofile/backtrace.c
26086 index 829edf0..672adb3 100644
26087 --- a/arch/x86/oprofile/backtrace.c
26088 +++ b/arch/x86/oprofile/backtrace.c
26089 @@ -115,7 +115,7 @@ x86_backtrace(struct pt_regs * const regs, unsigned int depth)
26090 {
26091 struct frame_head *head = (struct frame_head *)frame_pointer(regs);
26092
26093 - if (!user_mode_vm(regs)) {
26094 + if (!user_mode(regs)) {
26095 unsigned long stack = kernel_stack_pointer(regs);
26096 if (depth)
26097 dump_trace(NULL, regs, (unsigned long *)stack, 0,
26098 diff --git a/arch/x86/oprofile/op_model_p4.c b/arch/x86/oprofile/op_model_p4.c
26099 index e6a160a..36deff6 100644
26100 --- a/arch/x86/oprofile/op_model_p4.c
26101 +++ b/arch/x86/oprofile/op_model_p4.c
26102 @@ -50,7 +50,7 @@ static inline void setup_num_counters(void)
26103 #endif
26104 }
26105
26106 -static int inline addr_increment(void)
26107 +static inline int addr_increment(void)
26108 {
26109 #ifdef CONFIG_SMP
26110 return smp_num_siblings == 2 ? 2 : 1;
26111 diff --git a/arch/x86/pci/common.c b/arch/x86/pci/common.c
26112 index 1331fcf..03901b2 100644
26113 --- a/arch/x86/pci/common.c
26114 +++ b/arch/x86/pci/common.c
26115 @@ -31,8 +31,8 @@ int noioapicreroute = 1;
26116 int pcibios_last_bus = -1;
26117 unsigned long pirq_table_addr;
26118 struct pci_bus *pci_root_bus;
26119 -struct pci_raw_ops *raw_pci_ops;
26120 -struct pci_raw_ops *raw_pci_ext_ops;
26121 +const struct pci_raw_ops *raw_pci_ops;
26122 +const struct pci_raw_ops *raw_pci_ext_ops;
26123
26124 int raw_pci_read(unsigned int domain, unsigned int bus, unsigned int devfn,
26125 int reg, int len, u32 *val)
26126 diff --git a/arch/x86/pci/direct.c b/arch/x86/pci/direct.c
26127 index 347d882..4baf6b6 100644
26128 --- a/arch/x86/pci/direct.c
26129 +++ b/arch/x86/pci/direct.c
26130 @@ -79,7 +79,7 @@ static int pci_conf1_write(unsigned int seg, unsigned int bus,
26131
26132 #undef PCI_CONF1_ADDRESS
26133
26134 -struct pci_raw_ops pci_direct_conf1 = {
26135 +const struct pci_raw_ops pci_direct_conf1 = {
26136 .read = pci_conf1_read,
26137 .write = pci_conf1_write,
26138 };
26139 @@ -173,7 +173,7 @@ static int pci_conf2_write(unsigned int seg, unsigned int bus,
26140
26141 #undef PCI_CONF2_ADDRESS
26142
26143 -struct pci_raw_ops pci_direct_conf2 = {
26144 +const struct pci_raw_ops pci_direct_conf2 = {
26145 .read = pci_conf2_read,
26146 .write = pci_conf2_write,
26147 };
26148 @@ -189,7 +189,7 @@ struct pci_raw_ops pci_direct_conf2 = {
26149 * This should be close to trivial, but it isn't, because there are buggy
26150 * chipsets (yes, you guessed it, by Intel and Compaq) that have no class ID.
26151 */
26152 -static int __init pci_sanity_check(struct pci_raw_ops *o)
26153 +static int __init pci_sanity_check(const struct pci_raw_ops *o)
26154 {
26155 u32 x = 0;
26156 int year, devfn;
26157 diff --git a/arch/x86/pci/mmconfig_32.c b/arch/x86/pci/mmconfig_32.c
26158 index f10a7e9..0425342 100644
26159 --- a/arch/x86/pci/mmconfig_32.c
26160 +++ b/arch/x86/pci/mmconfig_32.c
26161 @@ -125,7 +125,7 @@ static int pci_mmcfg_write(unsigned int seg, unsigned int bus,
26162 return 0;
26163 }
26164
26165 -static struct pci_raw_ops pci_mmcfg = {
26166 +static const struct pci_raw_ops pci_mmcfg = {
26167 .read = pci_mmcfg_read,
26168 .write = pci_mmcfg_write,
26169 };
26170 diff --git a/arch/x86/pci/mmconfig_64.c b/arch/x86/pci/mmconfig_64.c
26171 index 94349f8..41600a7 100644
26172 --- a/arch/x86/pci/mmconfig_64.c
26173 +++ b/arch/x86/pci/mmconfig_64.c
26174 @@ -104,7 +104,7 @@ static int pci_mmcfg_write(unsigned int seg, unsigned int bus,
26175 return 0;
26176 }
26177
26178 -static struct pci_raw_ops pci_mmcfg = {
26179 +static const struct pci_raw_ops pci_mmcfg = {
26180 .read = pci_mmcfg_read,
26181 .write = pci_mmcfg_write,
26182 };
26183 diff --git a/arch/x86/pci/numaq_32.c b/arch/x86/pci/numaq_32.c
26184 index 8eb295e..86bd657 100644
26185 --- a/arch/x86/pci/numaq_32.c
26186 +++ b/arch/x86/pci/numaq_32.c
26187 @@ -112,7 +112,7 @@ static int pci_conf1_mq_write(unsigned int seg, unsigned int bus,
26188
26189 #undef PCI_CONF1_MQ_ADDRESS
26190
26191 -static struct pci_raw_ops pci_direct_conf1_mq = {
26192 +static const struct pci_raw_ops pci_direct_conf1_mq = {
26193 .read = pci_conf1_mq_read,
26194 .write = pci_conf1_mq_write
26195 };
26196 diff --git a/arch/x86/pci/olpc.c b/arch/x86/pci/olpc.c
26197 index b889d82..5a58a0a 100644
26198 --- a/arch/x86/pci/olpc.c
26199 +++ b/arch/x86/pci/olpc.c
26200 @@ -297,7 +297,7 @@ static int pci_olpc_write(unsigned int seg, unsigned int bus,
26201 return 0;
26202 }
26203
26204 -static struct pci_raw_ops pci_olpc_conf = {
26205 +static const struct pci_raw_ops pci_olpc_conf = {
26206 .read = pci_olpc_read,
26207 .write = pci_olpc_write,
26208 };
26209 diff --git a/arch/x86/pci/pcbios.c b/arch/x86/pci/pcbios.c
26210 index 1c975cc..ffd0536 100644
26211 --- a/arch/x86/pci/pcbios.c
26212 +++ b/arch/x86/pci/pcbios.c
26213 @@ -56,50 +56,93 @@ union bios32 {
26214 static struct {
26215 unsigned long address;
26216 unsigned short segment;
26217 -} bios32_indirect = { 0, __KERNEL_CS };
26218 +} bios32_indirect __read_only = { 0, __PCIBIOS_CS };
26219
26220 /*
26221 * Returns the entry point for the given service, NULL on error
26222 */
26223
26224 -static unsigned long bios32_service(unsigned long service)
26225 +static unsigned long __devinit bios32_service(unsigned long service)
26226 {
26227 unsigned char return_code; /* %al */
26228 unsigned long address; /* %ebx */
26229 unsigned long length; /* %ecx */
26230 unsigned long entry; /* %edx */
26231 unsigned long flags;
26232 + struct desc_struct d, *gdt;
26233
26234 local_irq_save(flags);
26235 - __asm__("lcall *(%%edi); cld"
26236 +
26237 + gdt = get_cpu_gdt_table(smp_processor_id());
26238 +
26239 + pack_descriptor(&d, 0UL, 0xFFFFFUL, 0x9B, 0xC);
26240 + write_gdt_entry(gdt, GDT_ENTRY_PCIBIOS_CS, &d, DESCTYPE_S);
26241 + pack_descriptor(&d, 0UL, 0xFFFFFUL, 0x93, 0xC);
26242 + write_gdt_entry(gdt, GDT_ENTRY_PCIBIOS_DS, &d, DESCTYPE_S);
26243 +
26244 + __asm__("movw %w7, %%ds; lcall *(%%edi); push %%ss; pop %%ds; cld"
26245 : "=a" (return_code),
26246 "=b" (address),
26247 "=c" (length),
26248 "=d" (entry)
26249 : "0" (service),
26250 "1" (0),
26251 - "D" (&bios32_indirect));
26252 + "D" (&bios32_indirect),
26253 + "r"(__PCIBIOS_DS)
26254 + : "memory");
26255 +
26256 + pax_open_kernel();
26257 + gdt[GDT_ENTRY_PCIBIOS_CS].a = 0;
26258 + gdt[GDT_ENTRY_PCIBIOS_CS].b = 0;
26259 + gdt[GDT_ENTRY_PCIBIOS_DS].a = 0;
26260 + gdt[GDT_ENTRY_PCIBIOS_DS].b = 0;
26261 + pax_close_kernel();
26262 +
26263 local_irq_restore(flags);
26264
26265 switch (return_code) {
26266 - case 0:
26267 - return address + entry;
26268 - case 0x80: /* Not present */
26269 - printk(KERN_WARNING "bios32_service(0x%lx): not present\n", service);
26270 - return 0;
26271 - default: /* Shouldn't happen */
26272 - printk(KERN_WARNING "bios32_service(0x%lx): returned 0x%x -- BIOS bug!\n",
26273 - service, return_code);
26274 + case 0: {
26275 + int cpu;
26276 + unsigned char flags;
26277 +
26278 + printk(KERN_INFO "bios32_service: base:%08lx length:%08lx entry:%08lx\n", address, length, entry);
26279 + if (address >= 0xFFFF0 || length > 0x100000 - address || length <= entry) {
26280 + printk(KERN_WARNING "bios32_service: not valid\n");
26281 return 0;
26282 + }
26283 + address = address + PAGE_OFFSET;
26284 + length += 16UL; /* some BIOSs underreport this... */
26285 + flags = 4;
26286 + if (length >= 64*1024*1024) {
26287 + length >>= PAGE_SHIFT;
26288 + flags |= 8;
26289 + }
26290 +
26291 + for (cpu = 0; cpu < NR_CPUS; cpu++) {
26292 + gdt = get_cpu_gdt_table(cpu);
26293 + pack_descriptor(&d, address, length, 0x9b, flags);
26294 + write_gdt_entry(gdt, GDT_ENTRY_PCIBIOS_CS, &d, DESCTYPE_S);
26295 + pack_descriptor(&d, address, length, 0x93, flags);
26296 + write_gdt_entry(gdt, GDT_ENTRY_PCIBIOS_DS, &d, DESCTYPE_S);
26297 + }
26298 + return entry;
26299 + }
26300 + case 0x80: /* Not present */
26301 + printk(KERN_WARNING "bios32_service(0x%lx): not present\n", service);
26302 + return 0;
26303 + default: /* Shouldn't happen */
26304 + printk(KERN_WARNING "bios32_service(0x%lx): returned 0x%x -- BIOS bug!\n",
26305 + service, return_code);
26306 + return 0;
26307 }
26308 }
26309
26310 static struct {
26311 unsigned long address;
26312 unsigned short segment;
26313 -} pci_indirect = { 0, __KERNEL_CS };
26314 +} pci_indirect __read_only = { 0, __PCIBIOS_CS };
26315
26316 -static int pci_bios_present;
26317 +static int pci_bios_present __read_only;
26318
26319 static int __devinit check_pcibios(void)
26320 {
26321 @@ -108,11 +151,13 @@ static int __devinit check_pcibios(void)
26322 unsigned long flags, pcibios_entry;
26323
26324 if ((pcibios_entry = bios32_service(PCI_SERVICE))) {
26325 - pci_indirect.address = pcibios_entry + PAGE_OFFSET;
26326 + pci_indirect.address = pcibios_entry;
26327
26328 local_irq_save(flags);
26329 - __asm__(
26330 - "lcall *(%%edi); cld\n\t"
26331 + __asm__("movw %w6, %%ds\n\t"
26332 + "lcall *%%ss:(%%edi); cld\n\t"
26333 + "push %%ss\n\t"
26334 + "pop %%ds\n\t"
26335 "jc 1f\n\t"
26336 "xor %%ah, %%ah\n"
26337 "1:"
26338 @@ -121,7 +166,8 @@ static int __devinit check_pcibios(void)
26339 "=b" (ebx),
26340 "=c" (ecx)
26341 : "1" (PCIBIOS_PCI_BIOS_PRESENT),
26342 - "D" (&pci_indirect)
26343 + "D" (&pci_indirect),
26344 + "r" (__PCIBIOS_DS)
26345 : "memory");
26346 local_irq_restore(flags);
26347
26348 @@ -165,7 +211,10 @@ static int pci_bios_read(unsigned int seg, unsigned int bus,
26349
26350 switch (len) {
26351 case 1:
26352 - __asm__("lcall *(%%esi); cld\n\t"
26353 + __asm__("movw %w6, %%ds\n\t"
26354 + "lcall *%%ss:(%%esi); cld\n\t"
26355 + "push %%ss\n\t"
26356 + "pop %%ds\n\t"
26357 "jc 1f\n\t"
26358 "xor %%ah, %%ah\n"
26359 "1:"
26360 @@ -174,7 +223,8 @@ static int pci_bios_read(unsigned int seg, unsigned int bus,
26361 : "1" (PCIBIOS_READ_CONFIG_BYTE),
26362 "b" (bx),
26363 "D" ((long)reg),
26364 - "S" (&pci_indirect));
26365 + "S" (&pci_indirect),
26366 + "r" (__PCIBIOS_DS));
26367 /*
26368 * Zero-extend the result beyond 8 bits, do not trust the
26369 * BIOS having done it:
26370 @@ -182,7 +232,10 @@ static int pci_bios_read(unsigned int seg, unsigned int bus,
26371 *value &= 0xff;
26372 break;
26373 case 2:
26374 - __asm__("lcall *(%%esi); cld\n\t"
26375 + __asm__("movw %w6, %%ds\n\t"
26376 + "lcall *%%ss:(%%esi); cld\n\t"
26377 + "push %%ss\n\t"
26378 + "pop %%ds\n\t"
26379 "jc 1f\n\t"
26380 "xor %%ah, %%ah\n"
26381 "1:"
26382 @@ -191,7 +244,8 @@ static int pci_bios_read(unsigned int seg, unsigned int bus,
26383 : "1" (PCIBIOS_READ_CONFIG_WORD),
26384 "b" (bx),
26385 "D" ((long)reg),
26386 - "S" (&pci_indirect));
26387 + "S" (&pci_indirect),
26388 + "r" (__PCIBIOS_DS));
26389 /*
26390 * Zero-extend the result beyond 16 bits, do not trust the
26391 * BIOS having done it:
26392 @@ -199,7 +253,10 @@ static int pci_bios_read(unsigned int seg, unsigned int bus,
26393 *value &= 0xffff;
26394 break;
26395 case 4:
26396 - __asm__("lcall *(%%esi); cld\n\t"
26397 + __asm__("movw %w6, %%ds\n\t"
26398 + "lcall *%%ss:(%%esi); cld\n\t"
26399 + "push %%ss\n\t"
26400 + "pop %%ds\n\t"
26401 "jc 1f\n\t"
26402 "xor %%ah, %%ah\n"
26403 "1:"
26404 @@ -208,7 +265,8 @@ static int pci_bios_read(unsigned int seg, unsigned int bus,
26405 : "1" (PCIBIOS_READ_CONFIG_DWORD),
26406 "b" (bx),
26407 "D" ((long)reg),
26408 - "S" (&pci_indirect));
26409 + "S" (&pci_indirect),
26410 + "r" (__PCIBIOS_DS));
26411 break;
26412 }
26413
26414 @@ -231,7 +289,10 @@ static int pci_bios_write(unsigned int seg, unsigned int bus,
26415
26416 switch (len) {
26417 case 1:
26418 - __asm__("lcall *(%%esi); cld\n\t"
26419 + __asm__("movw %w6, %%ds\n\t"
26420 + "lcall *%%ss:(%%esi); cld\n\t"
26421 + "push %%ss\n\t"
26422 + "pop %%ds\n\t"
26423 "jc 1f\n\t"
26424 "xor %%ah, %%ah\n"
26425 "1:"
26426 @@ -240,10 +301,14 @@ static int pci_bios_write(unsigned int seg, unsigned int bus,
26427 "c" (value),
26428 "b" (bx),
26429 "D" ((long)reg),
26430 - "S" (&pci_indirect));
26431 + "S" (&pci_indirect),
26432 + "r" (__PCIBIOS_DS));
26433 break;
26434 case 2:
26435 - __asm__("lcall *(%%esi); cld\n\t"
26436 + __asm__("movw %w6, %%ds\n\t"
26437 + "lcall *%%ss:(%%esi); cld\n\t"
26438 + "push %%ss\n\t"
26439 + "pop %%ds\n\t"
26440 "jc 1f\n\t"
26441 "xor %%ah, %%ah\n"
26442 "1:"
26443 @@ -252,10 +317,14 @@ static int pci_bios_write(unsigned int seg, unsigned int bus,
26444 "c" (value),
26445 "b" (bx),
26446 "D" ((long)reg),
26447 - "S" (&pci_indirect));
26448 + "S" (&pci_indirect),
26449 + "r" (__PCIBIOS_DS));
26450 break;
26451 case 4:
26452 - __asm__("lcall *(%%esi); cld\n\t"
26453 + __asm__("movw %w6, %%ds\n\t"
26454 + "lcall *%%ss:(%%esi); cld\n\t"
26455 + "push %%ss\n\t"
26456 + "pop %%ds\n\t"
26457 "jc 1f\n\t"
26458 "xor %%ah, %%ah\n"
26459 "1:"
26460 @@ -264,7 +333,8 @@ static int pci_bios_write(unsigned int seg, unsigned int bus,
26461 "c" (value),
26462 "b" (bx),
26463 "D" ((long)reg),
26464 - "S" (&pci_indirect));
26465 + "S" (&pci_indirect),
26466 + "r" (__PCIBIOS_DS));
26467 break;
26468 }
26469
26470 @@ -278,7 +348,7 @@ static int pci_bios_write(unsigned int seg, unsigned int bus,
26471 * Function table for BIOS32 access
26472 */
26473
26474 -static struct pci_raw_ops pci_bios_access = {
26475 +static const struct pci_raw_ops pci_bios_access = {
26476 .read = pci_bios_read,
26477 .write = pci_bios_write
26478 };
26479 @@ -287,7 +357,7 @@ static struct pci_raw_ops pci_bios_access = {
26480 * Try to find PCI BIOS.
26481 */
26482
26483 -static struct pci_raw_ops * __devinit pci_find_bios(void)
26484 +static const struct pci_raw_ops * __devinit pci_find_bios(void)
26485 {
26486 union bios32 *check;
26487 unsigned char sum;
26488 @@ -368,10 +438,13 @@ struct irq_routing_table * pcibios_get_irq_routing_table(void)
26489
26490 DBG("PCI: Fetching IRQ routing table... ");
26491 __asm__("push %%es\n\t"
26492 + "movw %w8, %%ds\n\t"
26493 "push %%ds\n\t"
26494 "pop %%es\n\t"
26495 - "lcall *(%%esi); cld\n\t"
26496 + "lcall *%%ss:(%%esi); cld\n\t"
26497 "pop %%es\n\t"
26498 + "push %%ss\n\t"
26499 + "pop %%ds\n"
26500 "jc 1f\n\t"
26501 "xor %%ah, %%ah\n"
26502 "1:"
26503 @@ -382,7 +455,8 @@ struct irq_routing_table * pcibios_get_irq_routing_table(void)
26504 "1" (0),
26505 "D" ((long) &opt),
26506 "S" (&pci_indirect),
26507 - "m" (opt)
26508 + "m" (opt),
26509 + "r" (__PCIBIOS_DS)
26510 : "memory");
26511 DBG("OK ret=%d, size=%d, map=%x\n", ret, opt.size, map);
26512 if (ret & 0xff00)
26513 @@ -406,7 +480,10 @@ int pcibios_set_irq_routing(struct pci_dev *dev, int pin, int irq)
26514 {
26515 int ret;
26516
26517 - __asm__("lcall *(%%esi); cld\n\t"
26518 + __asm__("movw %w5, %%ds\n\t"
26519 + "lcall *%%ss:(%%esi); cld\n\t"
26520 + "push %%ss\n\t"
26521 + "pop %%ds\n"
26522 "jc 1f\n\t"
26523 "xor %%ah, %%ah\n"
26524 "1:"
26525 @@ -414,7 +491,8 @@ int pcibios_set_irq_routing(struct pci_dev *dev, int pin, int irq)
26526 : "0" (PCIBIOS_SET_PCI_HW_INT),
26527 "b" ((dev->bus->number << 8) | dev->devfn),
26528 "c" ((irq << 8) | (pin + 10)),
26529 - "S" (&pci_indirect));
26530 + "S" (&pci_indirect),
26531 + "r" (__PCIBIOS_DS));
26532 return !(ret & 0xff00);
26533 }
26534 EXPORT_SYMBOL(pcibios_set_irq_routing);
26535 diff --git a/arch/x86/power/cpu.c b/arch/x86/power/cpu.c
26536 index fa0f651..9d8f3d9 100644
26537 --- a/arch/x86/power/cpu.c
26538 +++ b/arch/x86/power/cpu.c
26539 @@ -129,7 +129,7 @@ static void do_fpu_end(void)
26540 static void fix_processor_context(void)
26541 {
26542 int cpu = smp_processor_id();
26543 - struct tss_struct *t = &per_cpu(init_tss, cpu);
26544 + struct tss_struct *t = init_tss + cpu;
26545
26546 set_tss_desc(cpu, t); /*
26547 * This just modifies memory; should not be
26548 @@ -139,7 +139,9 @@ static void fix_processor_context(void)
26549 */
26550
26551 #ifdef CONFIG_X86_64
26552 + pax_open_kernel();
26553 get_cpu_gdt_table(cpu)[GDT_ENTRY_TSS].type = 9;
26554 + pax_close_kernel();
26555
26556 syscall_init(); /* This sets MSR_*STAR and related */
26557 #endif
26558 diff --git a/arch/x86/vdso/Makefile b/arch/x86/vdso/Makefile
26559 index dd78ef6..f9d928d 100644
26560 --- a/arch/x86/vdso/Makefile
26561 +++ b/arch/x86/vdso/Makefile
26562 @@ -122,7 +122,7 @@ quiet_cmd_vdso = VDSO $@
26563 $(VDSO_LDFLAGS) $(VDSO_LDFLAGS_$(filter %.lds,$(^F))) \
26564 -Wl,-T,$(filter %.lds,$^) $(filter %.o,$^)
26565
26566 -VDSO_LDFLAGS = -fPIC -shared $(call cc-ldoption, -Wl$(comma)--hash-style=sysv)
26567 +VDSO_LDFLAGS = -fPIC -shared -Wl,--no-undefined $(call cc-ldoption, -Wl$(comma)--hash-style=sysv)
26568 GCOV_PROFILE := n
26569
26570 #
26571 diff --git a/arch/x86/vdso/vclock_gettime.c b/arch/x86/vdso/vclock_gettime.c
26572 index ee55754..0013b2e 100644
26573 --- a/arch/x86/vdso/vclock_gettime.c
26574 +++ b/arch/x86/vdso/vclock_gettime.c
26575 @@ -22,24 +22,48 @@
26576 #include <asm/hpet.h>
26577 #include <asm/unistd.h>
26578 #include <asm/io.h>
26579 +#include <asm/fixmap.h>
26580 #include "vextern.h"
26581
26582 #define gtod vdso_vsyscall_gtod_data
26583
26584 +notrace noinline long __vdso_fallback_time(long *t)
26585 +{
26586 + long secs;
26587 + asm volatile("syscall"
26588 + : "=a" (secs)
26589 + : "0" (__NR_time),"D" (t) : "r11", "cx", "memory");
26590 + return secs;
26591 +}
26592 +
26593 notrace static long vdso_fallback_gettime(long clock, struct timespec *ts)
26594 {
26595 long ret;
26596 asm("syscall" : "=a" (ret) :
26597 - "0" (__NR_clock_gettime),"D" (clock), "S" (ts) : "memory");
26598 + "0" (__NR_clock_gettime),"D" (clock), "S" (ts) : "r11", "cx", "memory");
26599 return ret;
26600 }
26601
26602 +notrace static inline cycle_t __vdso_vread_hpet(void)
26603 +{
26604 + return readl((const void __iomem *)fix_to_virt(VSYSCALL_HPET) + 0xf0);
26605 +}
26606 +
26607 +notrace static inline cycle_t __vdso_vread_tsc(void)
26608 +{
26609 + cycle_t ret = (cycle_t)vget_cycles();
26610 +
26611 + return ret >= gtod->clock.cycle_last ? ret : gtod->clock.cycle_last;
26612 +}
26613 +
26614 notrace static inline long vgetns(void)
26615 {
26616 long v;
26617 - cycles_t (*vread)(void);
26618 - vread = gtod->clock.vread;
26619 - v = (vread() - gtod->clock.cycle_last) & gtod->clock.mask;
26620 + if (gtod->clock.name[0] == 't' && gtod->clock.name[1] == 's' && gtod->clock.name[2] == 'c' && !gtod->clock.name[3])
26621 + v = __vdso_vread_tsc();
26622 + else
26623 + v = __vdso_vread_hpet();
26624 + v = (v - gtod->clock.cycle_last) & gtod->clock.mask;
26625 return (v * gtod->clock.mult) >> gtod->clock.shift;
26626 }
26627
26628 @@ -113,7 +137,9 @@ notrace static noinline int do_monotonic_coarse(struct timespec *ts)
26629
26630 notrace int __vdso_clock_gettime(clockid_t clock, struct timespec *ts)
26631 {
26632 - if (likely(gtod->sysctl_enabled))
26633 + if (likely(gtod->sysctl_enabled &&
26634 + ((gtod->clock.name[0] == 'h' && gtod->clock.name[1] == 'p' && gtod->clock.name[2] == 'e' && gtod->clock.name[3] == 't' && !gtod->clock.name[4]) ||
26635 + (gtod->clock.name[0] == 't' && gtod->clock.name[1] == 's' && gtod->clock.name[2] == 'c' && !gtod->clock.name[3]))))
26636 switch (clock) {
26637 case CLOCK_REALTIME:
26638 if (likely(gtod->clock.vread))
26639 @@ -133,10 +159,20 @@ notrace int __vdso_clock_gettime(clockid_t clock, struct timespec *ts)
26640 int clock_gettime(clockid_t, struct timespec *)
26641 __attribute__((weak, alias("__vdso_clock_gettime")));
26642
26643 +notrace noinline int __vdso_fallback_gettimeofday(struct timeval *tv, struct timezone *tz)
26644 +{
26645 + long ret;
26646 + asm("syscall" : "=a" (ret) :
26647 + "0" (__NR_gettimeofday), "D" (tv), "S" (tz) : "r11", "cx", "memory");
26648 + return ret;
26649 +}
26650 +
26651 notrace int __vdso_gettimeofday(struct timeval *tv, struct timezone *tz)
26652 {
26653 - long ret;
26654 - if (likely(gtod->sysctl_enabled && gtod->clock.vread)) {
26655 + if (likely(gtod->sysctl_enabled &&
26656 + ((gtod->clock.name[0] == 'h' && gtod->clock.name[1] == 'p' && gtod->clock.name[2] == 'e' && gtod->clock.name[3] == 't' && !gtod->clock.name[4]) ||
26657 + (gtod->clock.name[0] == 't' && gtod->clock.name[1] == 's' && gtod->clock.name[2] == 'c' && !gtod->clock.name[3]))))
26658 + {
26659 if (likely(tv != NULL)) {
26660 BUILD_BUG_ON(offsetof(struct timeval, tv_usec) !=
26661 offsetof(struct timespec, tv_nsec) ||
26662 @@ -151,9 +187,7 @@ notrace int __vdso_gettimeofday(struct timeval *tv, struct timezone *tz)
26663 }
26664 return 0;
26665 }
26666 - asm("syscall" : "=a" (ret) :
26667 - "0" (__NR_gettimeofday), "D" (tv), "S" (tz) : "memory");
26668 - return ret;
26669 + return __vdso_fallback_gettimeofday(tv, tz);
26670 }
26671 int gettimeofday(struct timeval *, struct timezone *)
26672 __attribute__((weak, alias("__vdso_gettimeofday")));
26673 diff --git a/arch/x86/vdso/vdso.lds.S b/arch/x86/vdso/vdso.lds.S
26674 index 4e5dd3b..00ba15e 100644
26675 --- a/arch/x86/vdso/vdso.lds.S
26676 +++ b/arch/x86/vdso/vdso.lds.S
26677 @@ -35,3 +35,9 @@ VDSO64_PRELINK = VDSO_PRELINK;
26678 #define VEXTERN(x) VDSO64_ ## x = vdso_ ## x;
26679 #include "vextern.h"
26680 #undef VEXTERN
26681 +
26682 +#define VEXTERN(x) VDSO64_ ## x = __vdso_ ## x;
26683 +VEXTERN(fallback_gettimeofday)
26684 +VEXTERN(fallback_time)
26685 +VEXTERN(getcpu)
26686 +#undef VEXTERN
26687 diff --git a/arch/x86/vdso/vdso32-setup.c b/arch/x86/vdso/vdso32-setup.c
26688 index 58bc00f..d53fb48 100644
26689 --- a/arch/x86/vdso/vdso32-setup.c
26690 +++ b/arch/x86/vdso/vdso32-setup.c
26691 @@ -25,6 +25,7 @@
26692 #include <asm/tlbflush.h>
26693 #include <asm/vdso.h>
26694 #include <asm/proto.h>
26695 +#include <asm/mman.h>
26696
26697 enum {
26698 VDSO_DISABLED = 0,
26699 @@ -226,7 +227,7 @@ static inline void map_compat_vdso(int map)
26700 void enable_sep_cpu(void)
26701 {
26702 int cpu = get_cpu();
26703 - struct tss_struct *tss = &per_cpu(init_tss, cpu);
26704 + struct tss_struct *tss = init_tss + cpu;
26705
26706 if (!boot_cpu_has(X86_FEATURE_SEP)) {
26707 put_cpu();
26708 @@ -249,7 +250,7 @@ static int __init gate_vma_init(void)
26709 gate_vma.vm_start = FIXADDR_USER_START;
26710 gate_vma.vm_end = FIXADDR_USER_END;
26711 gate_vma.vm_flags = VM_READ | VM_MAYREAD | VM_EXEC | VM_MAYEXEC;
26712 - gate_vma.vm_page_prot = __P101;
26713 + gate_vma.vm_page_prot = vm_get_page_prot(gate_vma.vm_flags);
26714 /*
26715 * Make sure the vDSO gets into every core dump.
26716 * Dumping its contents makes post-mortem fully interpretable later
26717 @@ -331,14 +332,14 @@ int arch_setup_additional_pages(struct linux_binprm *bprm, int uses_interp)
26718 if (compat)
26719 addr = VDSO_HIGH_BASE;
26720 else {
26721 - addr = get_unmapped_area(NULL, 0, PAGE_SIZE, 0, 0);
26722 + addr = get_unmapped_area(NULL, 0, PAGE_SIZE, 0, MAP_EXECUTABLE);
26723 if (IS_ERR_VALUE(addr)) {
26724 ret = addr;
26725 goto up_fail;
26726 }
26727 }
26728
26729 - current->mm->context.vdso = (void *)addr;
26730 + current->mm->context.vdso = addr;
26731
26732 if (compat_uses_vma || !compat) {
26733 /*
26734 @@ -361,11 +362,11 @@ int arch_setup_additional_pages(struct linux_binprm *bprm, int uses_interp)
26735 }
26736
26737 current_thread_info()->sysenter_return =
26738 - VDSO32_SYMBOL(addr, SYSENTER_RETURN);
26739 + (__force void __user *)VDSO32_SYMBOL(addr, SYSENTER_RETURN);
26740
26741 up_fail:
26742 if (ret)
26743 - current->mm->context.vdso = NULL;
26744 + current->mm->context.vdso = 0;
26745
26746 up_write(&mm->mmap_sem);
26747
26748 @@ -413,8 +414,14 @@ __initcall(ia32_binfmt_init);
26749
26750 const char *arch_vma_name(struct vm_area_struct *vma)
26751 {
26752 - if (vma->vm_mm && vma->vm_start == (long)vma->vm_mm->context.vdso)
26753 + if (vma->vm_mm && vma->vm_start == vma->vm_mm->context.vdso)
26754 return "[vdso]";
26755 +
26756 +#ifdef CONFIG_PAX_SEGMEXEC
26757 + if (vma->vm_mm && vma->vm_mirror && vma->vm_mirror->vm_start == vma->vm_mm->context.vdso)
26758 + return "[vdso]";
26759 +#endif
26760 +
26761 return NULL;
26762 }
26763
26764 @@ -423,7 +430,7 @@ struct vm_area_struct *get_gate_vma(struct task_struct *tsk)
26765 struct mm_struct *mm = tsk->mm;
26766
26767 /* Check to see if this task was created in compat vdso mode */
26768 - if (mm && mm->context.vdso == (void *)VDSO_HIGH_BASE)
26769 + if (mm && mm->context.vdso == VDSO_HIGH_BASE)
26770 return &gate_vma;
26771 return NULL;
26772 }
26773 diff --git a/arch/x86/vdso/vextern.h b/arch/x86/vdso/vextern.h
26774 index 1683ba2..48d07f3 100644
26775 --- a/arch/x86/vdso/vextern.h
26776 +++ b/arch/x86/vdso/vextern.h
26777 @@ -11,6 +11,5 @@
26778 put into vextern.h and be referenced as a pointer with vdso prefix.
26779 The main kernel later fills in the values. */
26780
26781 -VEXTERN(jiffies)
26782 VEXTERN(vgetcpu_mode)
26783 VEXTERN(vsyscall_gtod_data)
26784 diff --git a/arch/x86/vdso/vma.c b/arch/x86/vdso/vma.c
26785 index 21e1aeb..2c0b3c4 100644
26786 --- a/arch/x86/vdso/vma.c
26787 +++ b/arch/x86/vdso/vma.c
26788 @@ -17,8 +17,6 @@
26789 #include "vextern.h" /* Just for VMAGIC. */
26790 #undef VEXTERN
26791
26792 -unsigned int __read_mostly vdso_enabled = 1;
26793 -
26794 extern char vdso_start[], vdso_end[];
26795 extern unsigned short vdso_sync_cpuid;
26796
26797 @@ -27,10 +25,8 @@ static unsigned vdso_size;
26798
26799 static inline void *var_ref(void *p, char *name)
26800 {
26801 - if (*(void **)p != (void *)VMAGIC) {
26802 - printk("VDSO: variable %s broken\n", name);
26803 - vdso_enabled = 0;
26804 - }
26805 + if (*(void **)p != (void *)VMAGIC)
26806 + panic("VDSO: variable %s broken\n", name);
26807 return p;
26808 }
26809
26810 @@ -57,21 +53,18 @@ static int __init init_vdso_vars(void)
26811 if (!vbase)
26812 goto oom;
26813
26814 - if (memcmp(vbase, "\177ELF", 4)) {
26815 - printk("VDSO: I'm broken; not ELF\n");
26816 - vdso_enabled = 0;
26817 - }
26818 + if (memcmp(vbase, ELFMAG, SELFMAG))
26819 + panic("VDSO: I'm broken; not ELF\n");
26820
26821 #define VEXTERN(x) \
26822 *(typeof(__ ## x) **) var_ref(VDSO64_SYMBOL(vbase, x), #x) = &__ ## x;
26823 #include "vextern.h"
26824 #undef VEXTERN
26825 + vunmap(vbase);
26826 return 0;
26827
26828 oom:
26829 - printk("Cannot allocate vdso\n");
26830 - vdso_enabled = 0;
26831 - return -ENOMEM;
26832 + panic("Cannot allocate vdso\n");
26833 }
26834 __initcall(init_vdso_vars);
26835
26836 @@ -102,13 +95,15 @@ static unsigned long vdso_addr(unsigned long start, unsigned len)
26837 int arch_setup_additional_pages(struct linux_binprm *bprm, int uses_interp)
26838 {
26839 struct mm_struct *mm = current->mm;
26840 - unsigned long addr;
26841 + unsigned long addr = 0;
26842 int ret;
26843
26844 - if (!vdso_enabled)
26845 - return 0;
26846 -
26847 down_write(&mm->mmap_sem);
26848 +
26849 +#ifdef CONFIG_PAX_RANDMMAP
26850 + if (!(mm->pax_flags & MF_PAX_RANDMMAP))
26851 +#endif
26852 +
26853 addr = vdso_addr(mm->start_stack, vdso_size);
26854 addr = get_unmapped_area(NULL, addr, vdso_size, 0, 0);
26855 if (IS_ERR_VALUE(addr)) {
26856 @@ -116,7 +111,7 @@ int arch_setup_additional_pages(struct linux_binprm *bprm, int uses_interp)
26857 goto up_fail;
26858 }
26859
26860 - current->mm->context.vdso = (void *)addr;
26861 + current->mm->context.vdso = addr;
26862
26863 ret = install_special_mapping(mm, addr, vdso_size,
26864 VM_READ|VM_EXEC|
26865 @@ -124,7 +119,7 @@ int arch_setup_additional_pages(struct linux_binprm *bprm, int uses_interp)
26866 VM_ALWAYSDUMP,
26867 vdso_pages);
26868 if (ret) {
26869 - current->mm->context.vdso = NULL;
26870 + current->mm->context.vdso = 0;
26871 goto up_fail;
26872 }
26873
26874 @@ -132,10 +127,3 @@ up_fail:
26875 up_write(&mm->mmap_sem);
26876 return ret;
26877 }
26878 -
26879 -static __init int vdso_setup(char *s)
26880 -{
26881 - vdso_enabled = simple_strtoul(s, NULL, 0);
26882 - return 0;
26883 -}
26884 -__setup("vdso=", vdso_setup);
26885 diff --git a/arch/x86/xen/enlighten.c b/arch/x86/xen/enlighten.c
26886 index 0087b00..eecb34f 100644
26887 --- a/arch/x86/xen/enlighten.c
26888 +++ b/arch/x86/xen/enlighten.c
26889 @@ -71,8 +71,6 @@ EXPORT_SYMBOL_GPL(xen_start_info);
26890
26891 struct shared_info xen_dummy_shared_info;
26892
26893 -void *xen_initial_gdt;
26894 -
26895 /*
26896 * Point at some empty memory to start with. We map the real shared_info
26897 * page as soon as fixmap is up and running.
26898 @@ -548,7 +546,7 @@ static void xen_write_idt_entry(gate_desc *dt, int entrynum, const gate_desc *g)
26899
26900 preempt_disable();
26901
26902 - start = __get_cpu_var(idt_desc).address;
26903 + start = (unsigned long)__get_cpu_var(idt_desc).address;
26904 end = start + __get_cpu_var(idt_desc).size + 1;
26905
26906 xen_mc_flush();
26907 @@ -993,7 +991,7 @@ static const struct pv_apic_ops xen_apic_ops __initdata = {
26908 #endif
26909 };
26910
26911 -static void xen_reboot(int reason)
26912 +static __noreturn void xen_reboot(int reason)
26913 {
26914 struct sched_shutdown r = { .reason = reason };
26915
26916 @@ -1001,17 +999,17 @@ static void xen_reboot(int reason)
26917 BUG();
26918 }
26919
26920 -static void xen_restart(char *msg)
26921 +static __noreturn void xen_restart(char *msg)
26922 {
26923 xen_reboot(SHUTDOWN_reboot);
26924 }
26925
26926 -static void xen_emergency_restart(void)
26927 +static __noreturn void xen_emergency_restart(void)
26928 {
26929 xen_reboot(SHUTDOWN_reboot);
26930 }
26931
26932 -static void xen_machine_halt(void)
26933 +static __noreturn void xen_machine_halt(void)
26934 {
26935 xen_reboot(SHUTDOWN_poweroff);
26936 }
26937 @@ -1095,9 +1093,20 @@ asmlinkage void __init xen_start_kernel(void)
26938 */
26939 __userpte_alloc_gfp &= ~__GFP_HIGHMEM;
26940
26941 -#ifdef CONFIG_X86_64
26942 /* Work out if we support NX */
26943 - check_efer();
26944 +#if defined(CONFIG_X86_64) || defined(CONFIG_X86_PAE)
26945 + if ((cpuid_eax(0x80000000) & 0xffff0000) == 0x80000000 &&
26946 + (cpuid_edx(0x80000001) & (1U << (X86_FEATURE_NX & 31)))) {
26947 + unsigned l, h;
26948 +
26949 +#ifdef CONFIG_X86_PAE
26950 + nx_enabled = 1;
26951 +#endif
26952 + __supported_pte_mask |= _PAGE_NX;
26953 + rdmsr(MSR_EFER, l, h);
26954 + l |= EFER_NX;
26955 + wrmsr(MSR_EFER, l, h);
26956 + }
26957 #endif
26958
26959 xen_setup_features();
26960 @@ -1129,13 +1138,6 @@ asmlinkage void __init xen_start_kernel(void)
26961
26962 machine_ops = xen_machine_ops;
26963
26964 - /*
26965 - * The only reliable way to retain the initial address of the
26966 - * percpu gdt_page is to remember it here, so we can go and
26967 - * mark it RW later, when the initial percpu area is freed.
26968 - */
26969 - xen_initial_gdt = &per_cpu(gdt_page, 0);
26970 -
26971 xen_smp_init();
26972
26973 pgd = (pgd_t *)xen_start_info->pt_base;
26974 diff --git a/arch/x86/xen/mmu.c b/arch/x86/xen/mmu.c
26975 index 3f90a2c..2c2ad84 100644
26976 --- a/arch/x86/xen/mmu.c
26977 +++ b/arch/x86/xen/mmu.c
26978 @@ -1719,6 +1719,9 @@ __init pgd_t *xen_setup_kernel_pagetable(pgd_t *pgd,
26979 convert_pfn_mfn(init_level4_pgt);
26980 convert_pfn_mfn(level3_ident_pgt);
26981 convert_pfn_mfn(level3_kernel_pgt);
26982 + convert_pfn_mfn(level3_vmalloc_start_pgt);
26983 + convert_pfn_mfn(level3_vmalloc_end_pgt);
26984 + convert_pfn_mfn(level3_vmemmap_pgt);
26985
26986 l3 = m2v(pgd[pgd_index(__START_KERNEL_map)].pgd);
26987 l2 = m2v(l3[pud_index(__START_KERNEL_map)].pud);
26988 @@ -1737,7 +1740,11 @@ __init pgd_t *xen_setup_kernel_pagetable(pgd_t *pgd,
26989 set_page_prot(init_level4_pgt, PAGE_KERNEL_RO);
26990 set_page_prot(level3_ident_pgt, PAGE_KERNEL_RO);
26991 set_page_prot(level3_kernel_pgt, PAGE_KERNEL_RO);
26992 + set_page_prot(level3_vmalloc_start_pgt, PAGE_KERNEL_RO);
26993 + set_page_prot(level3_vmalloc_end_pgt, PAGE_KERNEL_RO);
26994 + set_page_prot(level3_vmemmap_pgt, PAGE_KERNEL_RO);
26995 set_page_prot(level3_user_vsyscall, PAGE_KERNEL_RO);
26996 + set_page_prot(level2_vmemmap_pgt, PAGE_KERNEL_RO);
26997 set_page_prot(level2_kernel_pgt, PAGE_KERNEL_RO);
26998 set_page_prot(level2_fixmap_pgt, PAGE_KERNEL_RO);
26999
27000 @@ -1860,6 +1867,7 @@ static __init void xen_post_allocator_init(void)
27001 pv_mmu_ops.set_pud = xen_set_pud;
27002 #if PAGETABLE_LEVELS == 4
27003 pv_mmu_ops.set_pgd = xen_set_pgd;
27004 + pv_mmu_ops.set_pgd_batched = xen_set_pgd;
27005 #endif
27006
27007 /* This will work as long as patching hasn't happened yet
27008 @@ -1946,6 +1954,7 @@ static const struct pv_mmu_ops xen_mmu_ops __initdata = {
27009 .pud_val = PV_CALLEE_SAVE(xen_pud_val),
27010 .make_pud = PV_CALLEE_SAVE(xen_make_pud),
27011 .set_pgd = xen_set_pgd_hyper,
27012 + .set_pgd_batched = xen_set_pgd_hyper,
27013
27014 .alloc_pud = xen_alloc_pmd_init,
27015 .release_pud = xen_release_pmd_init,
27016 diff --git a/arch/x86/xen/smp.c b/arch/x86/xen/smp.c
27017 index a96204a..fca9b8e 100644
27018 --- a/arch/x86/xen/smp.c
27019 +++ b/arch/x86/xen/smp.c
27020 @@ -168,11 +168,6 @@ static void __init xen_smp_prepare_boot_cpu(void)
27021 {
27022 BUG_ON(smp_processor_id() != 0);
27023 native_smp_prepare_boot_cpu();
27024 -
27025 - /* We've switched to the "real" per-cpu gdt, so make sure the
27026 - old memory can be recycled */
27027 - make_lowmem_page_readwrite(xen_initial_gdt);
27028 -
27029 xen_setup_vcpu_info_placement();
27030 }
27031
27032 @@ -241,12 +236,12 @@ cpu_initialize_context(unsigned int cpu, struct task_struct *idle)
27033 gdt = get_cpu_gdt_table(cpu);
27034
27035 ctxt->flags = VGCF_IN_KERNEL;
27036 - ctxt->user_regs.ds = __USER_DS;
27037 - ctxt->user_regs.es = __USER_DS;
27038 + ctxt->user_regs.ds = __KERNEL_DS;
27039 + ctxt->user_regs.es = __KERNEL_DS;
27040 ctxt->user_regs.ss = __KERNEL_DS;
27041 #ifdef CONFIG_X86_32
27042 ctxt->user_regs.fs = __KERNEL_PERCPU;
27043 - ctxt->user_regs.gs = __KERNEL_STACK_CANARY;
27044 + savesegment(gs, ctxt->user_regs.gs);
27045 #else
27046 ctxt->gs_base_kernel = per_cpu_offset(cpu);
27047 #endif
27048 @@ -297,13 +292,12 @@ static int __cpuinit xen_cpu_up(unsigned int cpu)
27049 int rc;
27050
27051 per_cpu(current_task, cpu) = idle;
27052 + per_cpu(current_tinfo, cpu) = &idle->tinfo;
27053 #ifdef CONFIG_X86_32
27054 irq_ctx_init(cpu);
27055 #else
27056 clear_tsk_thread_flag(idle, TIF_FORK);
27057 - per_cpu(kernel_stack, cpu) =
27058 - (unsigned long)task_stack_page(idle) -
27059 - KERNEL_STACK_OFFSET + THREAD_SIZE;
27060 + per_cpu(kernel_stack, cpu) = (unsigned long)task_stack_page(idle) - 16 + THREAD_SIZE;
27061 #endif
27062 xen_setup_runstate_info(cpu);
27063 xen_setup_timer(cpu);
27064 diff --git a/arch/x86/xen/xen-asm_32.S b/arch/x86/xen/xen-asm_32.S
27065 index 9a95a9c..4f39e774 100644
27066 --- a/arch/x86/xen/xen-asm_32.S
27067 +++ b/arch/x86/xen/xen-asm_32.S
27068 @@ -83,14 +83,14 @@ ENTRY(xen_iret)
27069 ESP_OFFSET=4 # bytes pushed onto stack
27070
27071 /*
27072 - * Store vcpu_info pointer for easy access. Do it this way to
27073 - * avoid having to reload %fs
27074 + * Store vcpu_info pointer for easy access.
27075 */
27076 #ifdef CONFIG_SMP
27077 - GET_THREAD_INFO(%eax)
27078 - movl TI_cpu(%eax), %eax
27079 - movl __per_cpu_offset(,%eax,4), %eax
27080 - mov per_cpu__xen_vcpu(%eax), %eax
27081 + push %fs
27082 + mov $(__KERNEL_PERCPU), %eax
27083 + mov %eax, %fs
27084 + mov PER_CPU_VAR(xen_vcpu), %eax
27085 + pop %fs
27086 #else
27087 movl per_cpu__xen_vcpu, %eax
27088 #endif
27089 diff --git a/arch/x86/xen/xen-head.S b/arch/x86/xen/xen-head.S
27090 index 1a5ff24..a187d40 100644
27091 --- a/arch/x86/xen/xen-head.S
27092 +++ b/arch/x86/xen/xen-head.S
27093 @@ -19,6 +19,17 @@ ENTRY(startup_xen)
27094 #ifdef CONFIG_X86_32
27095 mov %esi,xen_start_info
27096 mov $init_thread_union+THREAD_SIZE,%esp
27097 +#ifdef CONFIG_SMP
27098 + movl $cpu_gdt_table,%edi
27099 + movl $__per_cpu_load,%eax
27100 + movw %ax,__KERNEL_PERCPU + 2(%edi)
27101 + rorl $16,%eax
27102 + movb %al,__KERNEL_PERCPU + 4(%edi)
27103 + movb %ah,__KERNEL_PERCPU + 7(%edi)
27104 + movl $__per_cpu_end - 1,%eax
27105 + subl $__per_cpu_start,%eax
27106 + movw %ax,__KERNEL_PERCPU + 0(%edi)
27107 +#endif
27108 #else
27109 mov %rsi,xen_start_info
27110 mov $init_thread_union+THREAD_SIZE,%rsp
27111 diff --git a/arch/x86/xen/xen-ops.h b/arch/x86/xen/xen-ops.h
27112 index f9153a3..51eab3d 100644
27113 --- a/arch/x86/xen/xen-ops.h
27114 +++ b/arch/x86/xen/xen-ops.h
27115 @@ -10,8 +10,6 @@
27116 extern const char xen_hypervisor_callback[];
27117 extern const char xen_failsafe_callback[];
27118
27119 -extern void *xen_initial_gdt;
27120 -
27121 struct trap_info;
27122 void xen_copy_trap_info(struct trap_info *traps);
27123
27124 diff --git a/block/blk-integrity.c b/block/blk-integrity.c
27125 index 15c6308..96e83c2 100644
27126 --- a/block/blk-integrity.c
27127 +++ b/block/blk-integrity.c
27128 @@ -278,7 +278,7 @@ static struct attribute *integrity_attrs[] = {
27129 NULL,
27130 };
27131
27132 -static struct sysfs_ops integrity_ops = {
27133 +static const struct sysfs_ops integrity_ops = {
27134 .show = &integrity_attr_show,
27135 .store = &integrity_attr_store,
27136 };
27137 diff --git a/block/blk-iopoll.c b/block/blk-iopoll.c
27138 index ca56420..f2fc409 100644
27139 --- a/block/blk-iopoll.c
27140 +++ b/block/blk-iopoll.c
27141 @@ -77,7 +77,7 @@ void blk_iopoll_complete(struct blk_iopoll *iopoll)
27142 }
27143 EXPORT_SYMBOL(blk_iopoll_complete);
27144
27145 -static void blk_iopoll_softirq(struct softirq_action *h)
27146 +static void blk_iopoll_softirq(void)
27147 {
27148 struct list_head *list = &__get_cpu_var(blk_cpu_iopoll);
27149 int rearm = 0, budget = blk_iopoll_budget;
27150 diff --git a/block/blk-map.c b/block/blk-map.c
27151 index 30a7e51..0aeec6a 100644
27152 --- a/block/blk-map.c
27153 +++ b/block/blk-map.c
27154 @@ -54,7 +54,7 @@ static int __blk_rq_map_user(struct request_queue *q, struct request *rq,
27155 * direct dma. else, set up kernel bounce buffers
27156 */
27157 uaddr = (unsigned long) ubuf;
27158 - if (blk_rq_aligned(q, ubuf, len) && !map_data)
27159 + if (blk_rq_aligned(q, (__force void *)ubuf, len) && !map_data)
27160 bio = bio_map_user(q, NULL, uaddr, len, reading, gfp_mask);
27161 else
27162 bio = bio_copy_user(q, map_data, uaddr, len, reading, gfp_mask);
27163 @@ -201,12 +201,13 @@ int blk_rq_map_user_iov(struct request_queue *q, struct request *rq,
27164 for (i = 0; i < iov_count; i++) {
27165 unsigned long uaddr = (unsigned long)iov[i].iov_base;
27166
27167 + if (!iov[i].iov_len)
27168 + return -EINVAL;
27169 +
27170 if (uaddr & queue_dma_alignment(q)) {
27171 unaligned = 1;
27172 break;
27173 }
27174 - if (!iov[i].iov_len)
27175 - return -EINVAL;
27176 }
27177
27178 if (unaligned || (q->dma_pad_mask & len) || map_data)
27179 @@ -299,7 +300,7 @@ int blk_rq_map_kern(struct request_queue *q, struct request *rq, void *kbuf,
27180 if (!len || !kbuf)
27181 return -EINVAL;
27182
27183 - do_copy = !blk_rq_aligned(q, kbuf, len) || object_is_on_stack(kbuf);
27184 + do_copy = !blk_rq_aligned(q, kbuf, len) || object_starts_on_stack(kbuf);
27185 if (do_copy)
27186 bio = bio_copy_kern(q, kbuf, len, gfp_mask, reading);
27187 else
27188 diff --git a/block/blk-softirq.c b/block/blk-softirq.c
27189 index ee9c216..58d410a 100644
27190 --- a/block/blk-softirq.c
27191 +++ b/block/blk-softirq.c
27192 @@ -17,7 +17,7 @@ static DEFINE_PER_CPU(struct list_head, blk_cpu_done);
27193 * Softirq action handler - move entries to local list and loop over them
27194 * while passing them to the queue registered handler.
27195 */
27196 -static void blk_done_softirq(struct softirq_action *h)
27197 +static void blk_done_softirq(void)
27198 {
27199 struct list_head *cpu_list, local_list;
27200
27201 diff --git a/block/blk-sysfs.c b/block/blk-sysfs.c
27202 index bb9c5ea..5330d48 100644
27203 --- a/block/blk-sysfs.c
27204 +++ b/block/blk-sysfs.c
27205 @@ -414,7 +414,7 @@ static void blk_release_queue(struct kobject *kobj)
27206 kmem_cache_free(blk_requestq_cachep, q);
27207 }
27208
27209 -static struct sysfs_ops queue_sysfs_ops = {
27210 +static const struct sysfs_ops queue_sysfs_ops = {
27211 .show = queue_attr_show,
27212 .store = queue_attr_store,
27213 };
27214 diff --git a/block/bsg.c b/block/bsg.c
27215 index 7154a7a..08ac2f0 100644
27216 --- a/block/bsg.c
27217 +++ b/block/bsg.c
27218 @@ -175,16 +175,24 @@ static int blk_fill_sgv4_hdr_rq(struct request_queue *q, struct request *rq,
27219 struct sg_io_v4 *hdr, struct bsg_device *bd,
27220 fmode_t has_write_perm)
27221 {
27222 + unsigned char tmpcmd[sizeof(rq->__cmd)];
27223 + unsigned char *cmdptr;
27224 +
27225 if (hdr->request_len > BLK_MAX_CDB) {
27226 rq->cmd = kzalloc(hdr->request_len, GFP_KERNEL);
27227 if (!rq->cmd)
27228 return -ENOMEM;
27229 - }
27230 + cmdptr = rq->cmd;
27231 + } else
27232 + cmdptr = tmpcmd;
27233
27234 - if (copy_from_user(rq->cmd, (void *)(unsigned long)hdr->request,
27235 + if (copy_from_user(cmdptr, (void __user *)(unsigned long)hdr->request,
27236 hdr->request_len))
27237 return -EFAULT;
27238
27239 + if (cmdptr != rq->cmd)
27240 + memcpy(rq->cmd, cmdptr, hdr->request_len);
27241 +
27242 if (hdr->subprotocol == BSG_SUB_PROTOCOL_SCSI_CMD) {
27243 if (blk_verify_command(rq->cmd, has_write_perm))
27244 return -EPERM;
27245 @@ -282,7 +290,7 @@ bsg_map_hdr(struct bsg_device *bd, struct sg_io_v4 *hdr, fmode_t has_write_perm,
27246 rq->next_rq = next_rq;
27247 next_rq->cmd_type = rq->cmd_type;
27248
27249 - dxferp = (void*)(unsigned long)hdr->din_xferp;
27250 + dxferp = (void __user *)(unsigned long)hdr->din_xferp;
27251 ret = blk_rq_map_user(q, next_rq, NULL, dxferp,
27252 hdr->din_xfer_len, GFP_KERNEL);
27253 if (ret)
27254 @@ -291,10 +299,10 @@ bsg_map_hdr(struct bsg_device *bd, struct sg_io_v4 *hdr, fmode_t has_write_perm,
27255
27256 if (hdr->dout_xfer_len) {
27257 dxfer_len = hdr->dout_xfer_len;
27258 - dxferp = (void*)(unsigned long)hdr->dout_xferp;
27259 + dxferp = (void __user *)(unsigned long)hdr->dout_xferp;
27260 } else if (hdr->din_xfer_len) {
27261 dxfer_len = hdr->din_xfer_len;
27262 - dxferp = (void*)(unsigned long)hdr->din_xferp;
27263 + dxferp = (void __user *)(unsigned long)hdr->din_xferp;
27264 } else
27265 dxfer_len = 0;
27266
27267 @@ -436,7 +444,7 @@ static int blk_complete_sgv4_hdr_rq(struct request *rq, struct sg_io_v4 *hdr,
27268 int len = min_t(unsigned int, hdr->max_response_len,
27269 rq->sense_len);
27270
27271 - ret = copy_to_user((void*)(unsigned long)hdr->response,
27272 + ret = copy_to_user((void __user *)(unsigned long)hdr->response,
27273 rq->sense, len);
27274 if (!ret)
27275 hdr->response_len = len;
27276 diff --git a/block/compat_ioctl.c b/block/compat_ioctl.c
27277 index 9bd086c..ca1fc22 100644
27278 --- a/block/compat_ioctl.c
27279 +++ b/block/compat_ioctl.c
27280 @@ -354,7 +354,7 @@ static int compat_fd_ioctl(struct block_device *bdev, fmode_t mode,
27281 err |= __get_user(f->spec1, &uf->spec1);
27282 err |= __get_user(f->fmt_gap, &uf->fmt_gap);
27283 err |= __get_user(name, &uf->name);
27284 - f->name = compat_ptr(name);
27285 + f->name = (void __force_kernel *)compat_ptr(name);
27286 if (err) {
27287 err = -EFAULT;
27288 goto out;
27289 diff --git a/block/elevator.c b/block/elevator.c
27290 index a847046..75a1746 100644
27291 --- a/block/elevator.c
27292 +++ b/block/elevator.c
27293 @@ -889,7 +889,7 @@ elv_attr_store(struct kobject *kobj, struct attribute *attr,
27294 return error;
27295 }
27296
27297 -static struct sysfs_ops elv_sysfs_ops = {
27298 +static const struct sysfs_ops elv_sysfs_ops = {
27299 .show = elv_attr_show,
27300 .store = elv_attr_store,
27301 };
27302 diff --git a/block/scsi_ioctl.c b/block/scsi_ioctl.c
27303 index 1d5a780..d85b6c2 100644
27304 --- a/block/scsi_ioctl.c
27305 +++ b/block/scsi_ioctl.c
27306 @@ -24,6 +24,7 @@
27307 #include <linux/capability.h>
27308 #include <linux/completion.h>
27309 #include <linux/cdrom.h>
27310 +#include <linux/ratelimit.h>
27311 #include <linux/slab.h>
27312 #include <linux/times.h>
27313 #include <asm/uaccess.h>
27314 @@ -220,8 +221,20 @@ EXPORT_SYMBOL(blk_verify_command);
27315 static int blk_fill_sghdr_rq(struct request_queue *q, struct request *rq,
27316 struct sg_io_hdr *hdr, fmode_t mode)
27317 {
27318 - if (copy_from_user(rq->cmd, hdr->cmdp, hdr->cmd_len))
27319 + unsigned char tmpcmd[sizeof(rq->__cmd)];
27320 + unsigned char *cmdptr;
27321 +
27322 + if (rq->cmd != rq->__cmd)
27323 + cmdptr = rq->cmd;
27324 + else
27325 + cmdptr = tmpcmd;
27326 +
27327 + if (copy_from_user(cmdptr, hdr->cmdp, hdr->cmd_len))
27328 return -EFAULT;
27329 +
27330 + if (cmdptr != rq->cmd)
27331 + memcpy(rq->cmd, cmdptr, hdr->cmd_len);
27332 +
27333 if (blk_verify_command(rq->cmd, mode & FMODE_WRITE))
27334 return -EPERM;
27335
27336 @@ -430,6 +443,8 @@ int sg_scsi_ioctl(struct request_queue *q, struct gendisk *disk, fmode_t mode,
27337 int err;
27338 unsigned int in_len, out_len, bytes, opcode, cmdlen;
27339 char *buffer = NULL, sense[SCSI_SENSE_BUFFERSIZE];
27340 + unsigned char tmpcmd[sizeof(rq->__cmd)];
27341 + unsigned char *cmdptr;
27342
27343 if (!sic)
27344 return -EINVAL;
27345 @@ -463,9 +478,18 @@ int sg_scsi_ioctl(struct request_queue *q, struct gendisk *disk, fmode_t mode,
27346 */
27347 err = -EFAULT;
27348 rq->cmd_len = cmdlen;
27349 - if (copy_from_user(rq->cmd, sic->data, cmdlen))
27350 +
27351 + if (rq->cmd != rq->__cmd)
27352 + cmdptr = rq->cmd;
27353 + else
27354 + cmdptr = tmpcmd;
27355 +
27356 + if (copy_from_user(cmdptr, sic->data, cmdlen))
27357 goto error;
27358
27359 + if (rq->cmd != cmdptr)
27360 + memcpy(rq->cmd, cmdptr, cmdlen);
27361 +
27362 if (in_len && copy_from_user(buffer, sic->data + cmdlen, in_len))
27363 goto error;
27364
27365 @@ -689,7 +713,59 @@ int scsi_cmd_ioctl(struct request_queue *q, struct gendisk *bd_disk, fmode_t mod
27366 }
27367 EXPORT_SYMBOL(scsi_cmd_ioctl);
27368
27369 -int __init blk_scsi_ioctl_init(void)
27370 +int scsi_verify_blk_ioctl(struct block_device *bd, unsigned int cmd)
27371 +{
27372 + if (bd && bd == bd->bd_contains)
27373 + return 0;
27374 +
27375 + /* Actually none of these is particularly useful on a partition,
27376 + * but they are safe.
27377 + */
27378 + switch (cmd) {
27379 + case SCSI_IOCTL_GET_IDLUN:
27380 + case SCSI_IOCTL_GET_BUS_NUMBER:
27381 + case SCSI_IOCTL_GET_PCI:
27382 + case SCSI_IOCTL_PROBE_HOST:
27383 + case SG_GET_VERSION_NUM:
27384 + case SG_SET_TIMEOUT:
27385 + case SG_GET_TIMEOUT:
27386 + case SG_GET_RESERVED_SIZE:
27387 + case SG_SET_RESERVED_SIZE:
27388 + case SG_EMULATED_HOST:
27389 + return 0;
27390 + case CDROM_GET_CAPABILITY:
27391 + /* Keep this until we remove the printk below. udev sends it
27392 + * and we do not want to spam dmesg about it. CD-ROMs do
27393 + * not have partitions, so we get here only for disks.
27394 + */
27395 + return -ENOIOCTLCMD;
27396 + default:
27397 + break;
27398 + }
27399 +
27400 + /* In particular, rule out all resets and host-specific ioctls. */
27401 + if (printk_ratelimit())
27402 + printk(KERN_WARNING "%s: sending ioctl %x to a partition!\n",
27403 + current->comm, cmd);
27404 +
27405 + return capable(CAP_SYS_RAWIO) ? 0 : -ENOIOCTLCMD;
27406 +}
27407 +EXPORT_SYMBOL(scsi_verify_blk_ioctl);
27408 +
27409 +int scsi_cmd_blk_ioctl(struct block_device *bd, fmode_t mode,
27410 + unsigned int cmd, void __user *arg)
27411 +{
27412 + int ret;
27413 +
27414 + ret = scsi_verify_blk_ioctl(bd, cmd);
27415 + if (ret < 0)
27416 + return ret;
27417 +
27418 + return scsi_cmd_ioctl(bd->bd_disk->queue, bd->bd_disk, mode, cmd, arg);
27419 +}
27420 +EXPORT_SYMBOL(scsi_cmd_blk_ioctl);
27421 +
27422 +static int __init blk_scsi_ioctl_init(void)
27423 {
27424 blk_set_cmd_filter_defaults(&blk_default_cmd_filter);
27425 return 0;
27426 diff --git a/crypto/cryptd.c b/crypto/cryptd.c
27427 index 3533582..f143117 100644
27428 --- a/crypto/cryptd.c
27429 +++ b/crypto/cryptd.c
27430 @@ -50,7 +50,7 @@ struct cryptd_blkcipher_ctx {
27431
27432 struct cryptd_blkcipher_request_ctx {
27433 crypto_completion_t complete;
27434 -};
27435 +} __no_const;
27436
27437 struct cryptd_hash_ctx {
27438 struct crypto_shash *child;
27439 diff --git a/crypto/gf128mul.c b/crypto/gf128mul.c
27440 index a90d260..7a9765e 100644
27441 --- a/crypto/gf128mul.c
27442 +++ b/crypto/gf128mul.c
27443 @@ -182,7 +182,7 @@ void gf128mul_lle(be128 *r, const be128 *b)
27444 for (i = 0; i < 7; ++i)
27445 gf128mul_x_lle(&p[i + 1], &p[i]);
27446
27447 - memset(r, 0, sizeof(r));
27448 + memset(r, 0, sizeof(*r));
27449 for (i = 0;;) {
27450 u8 ch = ((u8 *)b)[15 - i];
27451
27452 @@ -220,7 +220,7 @@ void gf128mul_bbe(be128 *r, const be128 *b)
27453 for (i = 0; i < 7; ++i)
27454 gf128mul_x_bbe(&p[i + 1], &p[i]);
27455
27456 - memset(r, 0, sizeof(r));
27457 + memset(r, 0, sizeof(*r));
27458 for (i = 0;;) {
27459 u8 ch = ((u8 *)b)[i];
27460
27461 diff --git a/crypto/serpent.c b/crypto/serpent.c
27462 index b651a55..023297d 100644
27463 --- a/crypto/serpent.c
27464 +++ b/crypto/serpent.c
27465 @@ -21,6 +21,7 @@
27466 #include <asm/byteorder.h>
27467 #include <linux/crypto.h>
27468 #include <linux/types.h>
27469 +#include <linux/sched.h>
27470
27471 /* Key is padded to the maximum of 256 bits before round key generation.
27472 * Any key length <= 256 bits (32 bytes) is allowed by the algorithm.
27473 @@ -224,6 +225,8 @@ static int serpent_setkey(struct crypto_tfm *tfm, const u8 *key,
27474 u32 r0,r1,r2,r3,r4;
27475 int i;
27476
27477 + pax_track_stack();
27478 +
27479 /* Copy key, add padding */
27480
27481 for (i = 0; i < keylen; ++i)
27482 diff --git a/drivers/acpi/acpi_pad.c b/drivers/acpi/acpi_pad.c
27483 index 0d2cdb8..d8de48d 100644
27484 --- a/drivers/acpi/acpi_pad.c
27485 +++ b/drivers/acpi/acpi_pad.c
27486 @@ -30,7 +30,7 @@
27487 #include <acpi/acpi_bus.h>
27488 #include <acpi/acpi_drivers.h>
27489
27490 -#define ACPI_PROCESSOR_AGGREGATOR_CLASS "processor_aggregator"
27491 +#define ACPI_PROCESSOR_AGGREGATOR_CLASS "acpi_pad"
27492 #define ACPI_PROCESSOR_AGGREGATOR_DEVICE_NAME "Processor Aggregator"
27493 #define ACPI_PROCESSOR_AGGREGATOR_NOTIFY 0x80
27494 static DEFINE_MUTEX(isolated_cpus_lock);
27495 diff --git a/drivers/acpi/battery.c b/drivers/acpi/battery.c
27496 index 3f4602b..2e41d36 100644
27497 --- a/drivers/acpi/battery.c
27498 +++ b/drivers/acpi/battery.c
27499 @@ -763,7 +763,7 @@ DECLARE_FILE_FUNCTIONS(alarm);
27500 }
27501
27502 static struct battery_file {
27503 - struct file_operations ops;
27504 + const struct file_operations ops;
27505 mode_t mode;
27506 const char *name;
27507 } acpi_battery_file[] = {
27508 diff --git a/drivers/acpi/dock.c b/drivers/acpi/dock.c
27509 index 7338b6a..82f0257 100644
27510 --- a/drivers/acpi/dock.c
27511 +++ b/drivers/acpi/dock.c
27512 @@ -77,7 +77,7 @@ struct dock_dependent_device {
27513 struct list_head list;
27514 struct list_head hotplug_list;
27515 acpi_handle handle;
27516 - struct acpi_dock_ops *ops;
27517 + const struct acpi_dock_ops *ops;
27518 void *context;
27519 };
27520
27521 @@ -605,7 +605,7 @@ EXPORT_SYMBOL_GPL(unregister_dock_notifier);
27522 * the dock driver after _DCK is executed.
27523 */
27524 int
27525 -register_hotplug_dock_device(acpi_handle handle, struct acpi_dock_ops *ops,
27526 +register_hotplug_dock_device(acpi_handle handle, const struct acpi_dock_ops *ops,
27527 void *context)
27528 {
27529 struct dock_dependent_device *dd;
27530 diff --git a/drivers/acpi/osl.c b/drivers/acpi/osl.c
27531 index 7c1c59e..2993595 100644
27532 --- a/drivers/acpi/osl.c
27533 +++ b/drivers/acpi/osl.c
27534 @@ -523,6 +523,8 @@ acpi_os_read_memory(acpi_physical_address phys_addr, u32 * value, u32 width)
27535 void __iomem *virt_addr;
27536
27537 virt_addr = ioremap(phys_addr, width);
27538 + if (!virt_addr)
27539 + return AE_NO_MEMORY;
27540 if (!value)
27541 value = &dummy;
27542
27543 @@ -551,6 +553,8 @@ acpi_os_write_memory(acpi_physical_address phys_addr, u32 value, u32 width)
27544 void __iomem *virt_addr;
27545
27546 virt_addr = ioremap(phys_addr, width);
27547 + if (!virt_addr)
27548 + return AE_NO_MEMORY;
27549
27550 switch (width) {
27551 case 8:
27552 diff --git a/drivers/acpi/power_meter.c b/drivers/acpi/power_meter.c
27553 index c216062..eec10d2 100644
27554 --- a/drivers/acpi/power_meter.c
27555 +++ b/drivers/acpi/power_meter.c
27556 @@ -315,8 +315,6 @@ static ssize_t set_trip(struct device *dev, struct device_attribute *devattr,
27557 return res;
27558
27559 temp /= 1000;
27560 - if (temp < 0)
27561 - return -EINVAL;
27562
27563 mutex_lock(&resource->lock);
27564 resource->trip[attr->index - 7] = temp;
27565 diff --git a/drivers/acpi/proc.c b/drivers/acpi/proc.c
27566 index d0d25e2..961643d 100644
27567 --- a/drivers/acpi/proc.c
27568 +++ b/drivers/acpi/proc.c
27569 @@ -391,20 +391,15 @@ acpi_system_write_wakeup_device(struct file *file,
27570 size_t count, loff_t * ppos)
27571 {
27572 struct list_head *node, *next;
27573 - char strbuf[5];
27574 - char str[5] = "";
27575 - unsigned int len = count;
27576 + char strbuf[5] = {0};
27577 struct acpi_device *found_dev = NULL;
27578
27579 - if (len > 4)
27580 - len = 4;
27581 - if (len < 0)
27582 - return -EFAULT;
27583 + if (count > 4)
27584 + count = 4;
27585
27586 - if (copy_from_user(strbuf, buffer, len))
27587 + if (copy_from_user(strbuf, buffer, count))
27588 return -EFAULT;
27589 - strbuf[len] = '\0';
27590 - sscanf(strbuf, "%s", str);
27591 + strbuf[count] = '\0';
27592
27593 mutex_lock(&acpi_device_lock);
27594 list_for_each_safe(node, next, &acpi_wakeup_device_list) {
27595 @@ -413,7 +408,7 @@ acpi_system_write_wakeup_device(struct file *file,
27596 if (!dev->wakeup.flags.valid)
27597 continue;
27598
27599 - if (!strncmp(dev->pnp.bus_id, str, 4)) {
27600 + if (!strncmp(dev->pnp.bus_id, strbuf, 4)) {
27601 dev->wakeup.state.enabled =
27602 dev->wakeup.state.enabled ? 0 : 1;
27603 found_dev = dev;
27604 diff --git a/drivers/acpi/processor_core.c b/drivers/acpi/processor_core.c
27605 index 7102474..de8ad22 100644
27606 --- a/drivers/acpi/processor_core.c
27607 +++ b/drivers/acpi/processor_core.c
27608 @@ -790,7 +790,7 @@ static int __cpuinit acpi_processor_add(struct acpi_device *device)
27609 return 0;
27610 }
27611
27612 - BUG_ON((pr->id >= nr_cpu_ids) || (pr->id < 0));
27613 + BUG_ON(pr->id >= nr_cpu_ids);
27614
27615 /*
27616 * Buggy BIOS check
27617 diff --git a/drivers/acpi/sbshc.c b/drivers/acpi/sbshc.c
27618 index d933980..5761f13 100644
27619 --- a/drivers/acpi/sbshc.c
27620 +++ b/drivers/acpi/sbshc.c
27621 @@ -17,7 +17,7 @@
27622
27623 #define PREFIX "ACPI: "
27624
27625 -#define ACPI_SMB_HC_CLASS "smbus_host_controller"
27626 +#define ACPI_SMB_HC_CLASS "smbus_host_ctl"
27627 #define ACPI_SMB_HC_DEVICE_NAME "ACPI SMBus HC"
27628
27629 struct acpi_smb_hc {
27630 diff --git a/drivers/acpi/sleep.c b/drivers/acpi/sleep.c
27631 index 0458094..6978e7b 100644
27632 --- a/drivers/acpi/sleep.c
27633 +++ b/drivers/acpi/sleep.c
27634 @@ -283,7 +283,7 @@ static int acpi_suspend_state_valid(suspend_state_t pm_state)
27635 }
27636 }
27637
27638 -static struct platform_suspend_ops acpi_suspend_ops = {
27639 +static const struct platform_suspend_ops acpi_suspend_ops = {
27640 .valid = acpi_suspend_state_valid,
27641 .begin = acpi_suspend_begin,
27642 .prepare_late = acpi_pm_prepare,
27643 @@ -311,7 +311,7 @@ static int acpi_suspend_begin_old(suspend_state_t pm_state)
27644 * The following callbacks are used if the pre-ACPI 2.0 suspend ordering has
27645 * been requested.
27646 */
27647 -static struct platform_suspend_ops acpi_suspend_ops_old = {
27648 +static const struct platform_suspend_ops acpi_suspend_ops_old = {
27649 .valid = acpi_suspend_state_valid,
27650 .begin = acpi_suspend_begin_old,
27651 .prepare_late = acpi_pm_disable_gpes,
27652 @@ -460,7 +460,7 @@ static void acpi_pm_enable_gpes(void)
27653 acpi_enable_all_runtime_gpes();
27654 }
27655
27656 -static struct platform_hibernation_ops acpi_hibernation_ops = {
27657 +static const struct platform_hibernation_ops acpi_hibernation_ops = {
27658 .begin = acpi_hibernation_begin,
27659 .end = acpi_pm_end,
27660 .pre_snapshot = acpi_hibernation_pre_snapshot,
27661 @@ -513,7 +513,7 @@ static int acpi_hibernation_pre_snapshot_old(void)
27662 * The following callbacks are used if the pre-ACPI 2.0 suspend ordering has
27663 * been requested.
27664 */
27665 -static struct platform_hibernation_ops acpi_hibernation_ops_old = {
27666 +static const struct platform_hibernation_ops acpi_hibernation_ops_old = {
27667 .begin = acpi_hibernation_begin_old,
27668 .end = acpi_pm_end,
27669 .pre_snapshot = acpi_hibernation_pre_snapshot_old,
27670 diff --git a/drivers/acpi/video.c b/drivers/acpi/video.c
27671 index 05dff63..b662ab7 100644
27672 --- a/drivers/acpi/video.c
27673 +++ b/drivers/acpi/video.c
27674 @@ -359,7 +359,7 @@ static int acpi_video_set_brightness(struct backlight_device *bd)
27675 vd->brightness->levels[request_level]);
27676 }
27677
27678 -static struct backlight_ops acpi_backlight_ops = {
27679 +static const struct backlight_ops acpi_backlight_ops = {
27680 .get_brightness = acpi_video_get_brightness,
27681 .update_status = acpi_video_set_brightness,
27682 };
27683 diff --git a/drivers/ata/ahci.c b/drivers/ata/ahci.c
27684 index 6787aab..23ffb0e 100644
27685 --- a/drivers/ata/ahci.c
27686 +++ b/drivers/ata/ahci.c
27687 @@ -387,7 +387,7 @@ static struct scsi_host_template ahci_sht = {
27688 .sdev_attrs = ahci_sdev_attrs,
27689 };
27690
27691 -static struct ata_port_operations ahci_ops = {
27692 +static const struct ata_port_operations ahci_ops = {
27693 .inherits = &sata_pmp_port_ops,
27694
27695 .qc_defer = sata_pmp_qc_defer_cmd_switch,
27696 @@ -424,17 +424,17 @@ static struct ata_port_operations ahci_ops = {
27697 .port_stop = ahci_port_stop,
27698 };
27699
27700 -static struct ata_port_operations ahci_vt8251_ops = {
27701 +static const struct ata_port_operations ahci_vt8251_ops = {
27702 .inherits = &ahci_ops,
27703 .hardreset = ahci_vt8251_hardreset,
27704 };
27705
27706 -static struct ata_port_operations ahci_p5wdh_ops = {
27707 +static const struct ata_port_operations ahci_p5wdh_ops = {
27708 .inherits = &ahci_ops,
27709 .hardreset = ahci_p5wdh_hardreset,
27710 };
27711
27712 -static struct ata_port_operations ahci_sb600_ops = {
27713 +static const struct ata_port_operations ahci_sb600_ops = {
27714 .inherits = &ahci_ops,
27715 .softreset = ahci_sb600_softreset,
27716 .pmp_softreset = ahci_sb600_softreset,
27717 diff --git a/drivers/ata/ata_generic.c b/drivers/ata/ata_generic.c
27718 index 99e7196..4968c77 100644
27719 --- a/drivers/ata/ata_generic.c
27720 +++ b/drivers/ata/ata_generic.c
27721 @@ -104,7 +104,7 @@ static struct scsi_host_template generic_sht = {
27722 ATA_BMDMA_SHT(DRV_NAME),
27723 };
27724
27725 -static struct ata_port_operations generic_port_ops = {
27726 +static const struct ata_port_operations generic_port_ops = {
27727 .inherits = &ata_bmdma_port_ops,
27728 .cable_detect = ata_cable_unknown,
27729 .set_mode = generic_set_mode,
27730 diff --git a/drivers/ata/ata_piix.c b/drivers/ata/ata_piix.c
27731 index c33591d..000c121 100644
27732 --- a/drivers/ata/ata_piix.c
27733 +++ b/drivers/ata/ata_piix.c
27734 @@ -318,7 +318,7 @@ static struct scsi_host_template piix_sht = {
27735 ATA_BMDMA_SHT(DRV_NAME),
27736 };
27737
27738 -static struct ata_port_operations piix_pata_ops = {
27739 +static const struct ata_port_operations piix_pata_ops = {
27740 .inherits = &ata_bmdma32_port_ops,
27741 .cable_detect = ata_cable_40wire,
27742 .set_piomode = piix_set_piomode,
27743 @@ -326,22 +326,22 @@ static struct ata_port_operations piix_pata_ops = {
27744 .prereset = piix_pata_prereset,
27745 };
27746
27747 -static struct ata_port_operations piix_vmw_ops = {
27748 +static const struct ata_port_operations piix_vmw_ops = {
27749 .inherits = &piix_pata_ops,
27750 .bmdma_status = piix_vmw_bmdma_status,
27751 };
27752
27753 -static struct ata_port_operations ich_pata_ops = {
27754 +static const struct ata_port_operations ich_pata_ops = {
27755 .inherits = &piix_pata_ops,
27756 .cable_detect = ich_pata_cable_detect,
27757 .set_dmamode = ich_set_dmamode,
27758 };
27759
27760 -static struct ata_port_operations piix_sata_ops = {
27761 +static const struct ata_port_operations piix_sata_ops = {
27762 .inherits = &ata_bmdma_port_ops,
27763 };
27764
27765 -static struct ata_port_operations piix_sidpr_sata_ops = {
27766 +static const struct ata_port_operations piix_sidpr_sata_ops = {
27767 .inherits = &piix_sata_ops,
27768 .hardreset = sata_std_hardreset,
27769 .scr_read = piix_sidpr_scr_read,
27770 diff --git a/drivers/ata/libata-acpi.c b/drivers/ata/libata-acpi.c
27771 index b0882cd..c295d65 100644
27772 --- a/drivers/ata/libata-acpi.c
27773 +++ b/drivers/ata/libata-acpi.c
27774 @@ -223,12 +223,12 @@ static void ata_acpi_dev_uevent(acpi_handle handle, u32 event, void *data)
27775 ata_acpi_uevent(dev->link->ap, dev, event);
27776 }
27777
27778 -static struct acpi_dock_ops ata_acpi_dev_dock_ops = {
27779 +static const struct acpi_dock_ops ata_acpi_dev_dock_ops = {
27780 .handler = ata_acpi_dev_notify_dock,
27781 .uevent = ata_acpi_dev_uevent,
27782 };
27783
27784 -static struct acpi_dock_ops ata_acpi_ap_dock_ops = {
27785 +static const struct acpi_dock_ops ata_acpi_ap_dock_ops = {
27786 .handler = ata_acpi_ap_notify_dock,
27787 .uevent = ata_acpi_ap_uevent,
27788 };
27789 diff --git a/drivers/ata/libata-core.c b/drivers/ata/libata-core.c
27790 index d4f7f99..94f603e 100644
27791 --- a/drivers/ata/libata-core.c
27792 +++ b/drivers/ata/libata-core.c
27793 @@ -4954,7 +4954,7 @@ void ata_qc_free(struct ata_queued_cmd *qc)
27794 struct ata_port *ap;
27795 unsigned int tag;
27796
27797 - WARN_ON_ONCE(qc == NULL); /* ata_qc_from_tag _might_ return NULL */
27798 + BUG_ON(qc == NULL); /* ata_qc_from_tag _might_ return NULL */
27799 ap = qc->ap;
27800
27801 qc->flags = 0;
27802 @@ -4970,7 +4970,7 @@ void __ata_qc_complete(struct ata_queued_cmd *qc)
27803 struct ata_port *ap;
27804 struct ata_link *link;
27805
27806 - WARN_ON_ONCE(qc == NULL); /* ata_qc_from_tag _might_ return NULL */
27807 + BUG_ON(qc == NULL); /* ata_qc_from_tag _might_ return NULL */
27808 WARN_ON_ONCE(!(qc->flags & ATA_QCFLAG_ACTIVE));
27809 ap = qc->ap;
27810 link = qc->dev->link;
27811 @@ -5987,7 +5987,7 @@ static void ata_host_stop(struct device *gendev, void *res)
27812 * LOCKING:
27813 * None.
27814 */
27815 -static void ata_finalize_port_ops(struct ata_port_operations *ops)
27816 +static void ata_finalize_port_ops(const struct ata_port_operations *ops)
27817 {
27818 static DEFINE_SPINLOCK(lock);
27819 const struct ata_port_operations *cur;
27820 @@ -5999,6 +5999,7 @@ static void ata_finalize_port_ops(struct ata_port_operations *ops)
27821 return;
27822
27823 spin_lock(&lock);
27824 + pax_open_kernel();
27825
27826 for (cur = ops->inherits; cur; cur = cur->inherits) {
27827 void **inherit = (void **)cur;
27828 @@ -6012,8 +6013,9 @@ static void ata_finalize_port_ops(struct ata_port_operations *ops)
27829 if (IS_ERR(*pp))
27830 *pp = NULL;
27831
27832 - ops->inherits = NULL;
27833 + *(struct ata_port_operations **)&ops->inherits = NULL;
27834
27835 + pax_close_kernel();
27836 spin_unlock(&lock);
27837 }
27838
27839 @@ -6110,7 +6112,7 @@ int ata_host_start(struct ata_host *host)
27840 */
27841 /* KILLME - the only user left is ipr */
27842 void ata_host_init(struct ata_host *host, struct device *dev,
27843 - unsigned long flags, struct ata_port_operations *ops)
27844 + unsigned long flags, const struct ata_port_operations *ops)
27845 {
27846 spin_lock_init(&host->lock);
27847 host->dev = dev;
27848 @@ -6773,7 +6775,7 @@ static void ata_dummy_error_handler(struct ata_port *ap)
27849 /* truly dummy */
27850 }
27851
27852 -struct ata_port_operations ata_dummy_port_ops = {
27853 +const struct ata_port_operations ata_dummy_port_ops = {
27854 .qc_prep = ata_noop_qc_prep,
27855 .qc_issue = ata_dummy_qc_issue,
27856 .error_handler = ata_dummy_error_handler,
27857 diff --git a/drivers/ata/libata-eh.c b/drivers/ata/libata-eh.c
27858 index e5bdb9b..45a8e72 100644
27859 --- a/drivers/ata/libata-eh.c
27860 +++ b/drivers/ata/libata-eh.c
27861 @@ -2423,6 +2423,8 @@ void ata_eh_report(struct ata_port *ap)
27862 {
27863 struct ata_link *link;
27864
27865 + pax_track_stack();
27866 +
27867 ata_for_each_link(link, ap, HOST_FIRST)
27868 ata_eh_link_report(link);
27869 }
27870 @@ -3594,7 +3596,7 @@ void ata_do_eh(struct ata_port *ap, ata_prereset_fn_t prereset,
27871 */
27872 void ata_std_error_handler(struct ata_port *ap)
27873 {
27874 - struct ata_port_operations *ops = ap->ops;
27875 + const struct ata_port_operations *ops = ap->ops;
27876 ata_reset_fn_t hardreset = ops->hardreset;
27877
27878 /* ignore built-in hardreset if SCR access is not available */
27879 diff --git a/drivers/ata/libata-pmp.c b/drivers/ata/libata-pmp.c
27880 index 51f0ffb..19ce3e3 100644
27881 --- a/drivers/ata/libata-pmp.c
27882 +++ b/drivers/ata/libata-pmp.c
27883 @@ -841,7 +841,7 @@ static int sata_pmp_handle_link_fail(struct ata_link *link, int *link_tries)
27884 */
27885 static int sata_pmp_eh_recover(struct ata_port *ap)
27886 {
27887 - struct ata_port_operations *ops = ap->ops;
27888 + const struct ata_port_operations *ops = ap->ops;
27889 int pmp_tries, link_tries[SATA_PMP_MAX_PORTS];
27890 struct ata_link *pmp_link = &ap->link;
27891 struct ata_device *pmp_dev = pmp_link->device;
27892 diff --git a/drivers/ata/pata_acpi.c b/drivers/ata/pata_acpi.c
27893 index d8f35fe..288180a 100644
27894 --- a/drivers/ata/pata_acpi.c
27895 +++ b/drivers/ata/pata_acpi.c
27896 @@ -215,7 +215,7 @@ static struct scsi_host_template pacpi_sht = {
27897 ATA_BMDMA_SHT(DRV_NAME),
27898 };
27899
27900 -static struct ata_port_operations pacpi_ops = {
27901 +static const struct ata_port_operations pacpi_ops = {
27902 .inherits = &ata_bmdma_port_ops,
27903 .qc_issue = pacpi_qc_issue,
27904 .cable_detect = pacpi_cable_detect,
27905 diff --git a/drivers/ata/pata_ali.c b/drivers/ata/pata_ali.c
27906 index 9434114..1f2f364 100644
27907 --- a/drivers/ata/pata_ali.c
27908 +++ b/drivers/ata/pata_ali.c
27909 @@ -365,7 +365,7 @@ static struct scsi_host_template ali_sht = {
27910 * Port operations for PIO only ALi
27911 */
27912
27913 -static struct ata_port_operations ali_early_port_ops = {
27914 +static const struct ata_port_operations ali_early_port_ops = {
27915 .inherits = &ata_sff_port_ops,
27916 .cable_detect = ata_cable_40wire,
27917 .set_piomode = ali_set_piomode,
27918 @@ -382,7 +382,7 @@ static const struct ata_port_operations ali_dma_base_ops = {
27919 * Port operations for DMA capable ALi without cable
27920 * detect
27921 */
27922 -static struct ata_port_operations ali_20_port_ops = {
27923 +static const struct ata_port_operations ali_20_port_ops = {
27924 .inherits = &ali_dma_base_ops,
27925 .cable_detect = ata_cable_40wire,
27926 .mode_filter = ali_20_filter,
27927 @@ -393,7 +393,7 @@ static struct ata_port_operations ali_20_port_ops = {
27928 /*
27929 * Port operations for DMA capable ALi with cable detect
27930 */
27931 -static struct ata_port_operations ali_c2_port_ops = {
27932 +static const struct ata_port_operations ali_c2_port_ops = {
27933 .inherits = &ali_dma_base_ops,
27934 .check_atapi_dma = ali_check_atapi_dma,
27935 .cable_detect = ali_c2_cable_detect,
27936 @@ -404,7 +404,7 @@ static struct ata_port_operations ali_c2_port_ops = {
27937 /*
27938 * Port operations for DMA capable ALi with cable detect
27939 */
27940 -static struct ata_port_operations ali_c4_port_ops = {
27941 +static const struct ata_port_operations ali_c4_port_ops = {
27942 .inherits = &ali_dma_base_ops,
27943 .check_atapi_dma = ali_check_atapi_dma,
27944 .cable_detect = ali_c2_cable_detect,
27945 @@ -414,7 +414,7 @@ static struct ata_port_operations ali_c4_port_ops = {
27946 /*
27947 * Port operations for DMA capable ALi with cable detect and LBA48
27948 */
27949 -static struct ata_port_operations ali_c5_port_ops = {
27950 +static const struct ata_port_operations ali_c5_port_ops = {
27951 .inherits = &ali_dma_base_ops,
27952 .check_atapi_dma = ali_check_atapi_dma,
27953 .dev_config = ali_warn_atapi_dma,
27954 diff --git a/drivers/ata/pata_amd.c b/drivers/ata/pata_amd.c
27955 index 567f3f7..c8ee0da 100644
27956 --- a/drivers/ata/pata_amd.c
27957 +++ b/drivers/ata/pata_amd.c
27958 @@ -397,28 +397,28 @@ static const struct ata_port_operations amd_base_port_ops = {
27959 .prereset = amd_pre_reset,
27960 };
27961
27962 -static struct ata_port_operations amd33_port_ops = {
27963 +static const struct ata_port_operations amd33_port_ops = {
27964 .inherits = &amd_base_port_ops,
27965 .cable_detect = ata_cable_40wire,
27966 .set_piomode = amd33_set_piomode,
27967 .set_dmamode = amd33_set_dmamode,
27968 };
27969
27970 -static struct ata_port_operations amd66_port_ops = {
27971 +static const struct ata_port_operations amd66_port_ops = {
27972 .inherits = &amd_base_port_ops,
27973 .cable_detect = ata_cable_unknown,
27974 .set_piomode = amd66_set_piomode,
27975 .set_dmamode = amd66_set_dmamode,
27976 };
27977
27978 -static struct ata_port_operations amd100_port_ops = {
27979 +static const struct ata_port_operations amd100_port_ops = {
27980 .inherits = &amd_base_port_ops,
27981 .cable_detect = ata_cable_unknown,
27982 .set_piomode = amd100_set_piomode,
27983 .set_dmamode = amd100_set_dmamode,
27984 };
27985
27986 -static struct ata_port_operations amd133_port_ops = {
27987 +static const struct ata_port_operations amd133_port_ops = {
27988 .inherits = &amd_base_port_ops,
27989 .cable_detect = amd_cable_detect,
27990 .set_piomode = amd133_set_piomode,
27991 @@ -433,13 +433,13 @@ static const struct ata_port_operations nv_base_port_ops = {
27992 .host_stop = nv_host_stop,
27993 };
27994
27995 -static struct ata_port_operations nv100_port_ops = {
27996 +static const struct ata_port_operations nv100_port_ops = {
27997 .inherits = &nv_base_port_ops,
27998 .set_piomode = nv100_set_piomode,
27999 .set_dmamode = nv100_set_dmamode,
28000 };
28001
28002 -static struct ata_port_operations nv133_port_ops = {
28003 +static const struct ata_port_operations nv133_port_ops = {
28004 .inherits = &nv_base_port_ops,
28005 .set_piomode = nv133_set_piomode,
28006 .set_dmamode = nv133_set_dmamode,
28007 diff --git a/drivers/ata/pata_artop.c b/drivers/ata/pata_artop.c
28008 index d332cfd..4b7eaae 100644
28009 --- a/drivers/ata/pata_artop.c
28010 +++ b/drivers/ata/pata_artop.c
28011 @@ -311,7 +311,7 @@ static struct scsi_host_template artop_sht = {
28012 ATA_BMDMA_SHT(DRV_NAME),
28013 };
28014
28015 -static struct ata_port_operations artop6210_ops = {
28016 +static const struct ata_port_operations artop6210_ops = {
28017 .inherits = &ata_bmdma_port_ops,
28018 .cable_detect = ata_cable_40wire,
28019 .set_piomode = artop6210_set_piomode,
28020 @@ -320,7 +320,7 @@ static struct ata_port_operations artop6210_ops = {
28021 .qc_defer = artop6210_qc_defer,
28022 };
28023
28024 -static struct ata_port_operations artop6260_ops = {
28025 +static const struct ata_port_operations artop6260_ops = {
28026 .inherits = &ata_bmdma_port_ops,
28027 .cable_detect = artop6260_cable_detect,
28028 .set_piomode = artop6260_set_piomode,
28029 diff --git a/drivers/ata/pata_at32.c b/drivers/ata/pata_at32.c
28030 index 5c129f9..7bb7ccb 100644
28031 --- a/drivers/ata/pata_at32.c
28032 +++ b/drivers/ata/pata_at32.c
28033 @@ -172,7 +172,7 @@ static struct scsi_host_template at32_sht = {
28034 ATA_PIO_SHT(DRV_NAME),
28035 };
28036
28037 -static struct ata_port_operations at32_port_ops = {
28038 +static const struct ata_port_operations at32_port_ops = {
28039 .inherits = &ata_sff_port_ops,
28040 .cable_detect = ata_cable_40wire,
28041 .set_piomode = pata_at32_set_piomode,
28042 diff --git a/drivers/ata/pata_at91.c b/drivers/ata/pata_at91.c
28043 index 41c94b1..829006d 100644
28044 --- a/drivers/ata/pata_at91.c
28045 +++ b/drivers/ata/pata_at91.c
28046 @@ -195,7 +195,7 @@ static struct scsi_host_template pata_at91_sht = {
28047 ATA_PIO_SHT(DRV_NAME),
28048 };
28049
28050 -static struct ata_port_operations pata_at91_port_ops = {
28051 +static const struct ata_port_operations pata_at91_port_ops = {
28052 .inherits = &ata_sff_port_ops,
28053
28054 .sff_data_xfer = pata_at91_data_xfer_noirq,
28055 diff --git a/drivers/ata/pata_atiixp.c b/drivers/ata/pata_atiixp.c
28056 index ae4454d..d391eb4 100644
28057 --- a/drivers/ata/pata_atiixp.c
28058 +++ b/drivers/ata/pata_atiixp.c
28059 @@ -205,7 +205,7 @@ static struct scsi_host_template atiixp_sht = {
28060 .sg_tablesize = LIBATA_DUMB_MAX_PRD,
28061 };
28062
28063 -static struct ata_port_operations atiixp_port_ops = {
28064 +static const struct ata_port_operations atiixp_port_ops = {
28065 .inherits = &ata_bmdma_port_ops,
28066
28067 .qc_prep = ata_sff_dumb_qc_prep,
28068 diff --git a/drivers/ata/pata_atp867x.c b/drivers/ata/pata_atp867x.c
28069 index 6fe7ded..2a425dc 100644
28070 --- a/drivers/ata/pata_atp867x.c
28071 +++ b/drivers/ata/pata_atp867x.c
28072 @@ -274,7 +274,7 @@ static struct scsi_host_template atp867x_sht = {
28073 ATA_BMDMA_SHT(DRV_NAME),
28074 };
28075
28076 -static struct ata_port_operations atp867x_ops = {
28077 +static const struct ata_port_operations atp867x_ops = {
28078 .inherits = &ata_bmdma_port_ops,
28079 .cable_detect = atp867x_cable_detect,
28080 .set_piomode = atp867x_set_piomode,
28081 diff --git a/drivers/ata/pata_bf54x.c b/drivers/ata/pata_bf54x.c
28082 index c4b47a3..b27a367 100644
28083 --- a/drivers/ata/pata_bf54x.c
28084 +++ b/drivers/ata/pata_bf54x.c
28085 @@ -1464,7 +1464,7 @@ static struct scsi_host_template bfin_sht = {
28086 .dma_boundary = ATA_DMA_BOUNDARY,
28087 };
28088
28089 -static struct ata_port_operations bfin_pata_ops = {
28090 +static const struct ata_port_operations bfin_pata_ops = {
28091 .inherits = &ata_sff_port_ops,
28092
28093 .set_piomode = bfin_set_piomode,
28094 diff --git a/drivers/ata/pata_cmd640.c b/drivers/ata/pata_cmd640.c
28095 index 5acf9fa..84248be 100644
28096 --- a/drivers/ata/pata_cmd640.c
28097 +++ b/drivers/ata/pata_cmd640.c
28098 @@ -168,7 +168,7 @@ static struct scsi_host_template cmd640_sht = {
28099 ATA_BMDMA_SHT(DRV_NAME),
28100 };
28101
28102 -static struct ata_port_operations cmd640_port_ops = {
28103 +static const struct ata_port_operations cmd640_port_ops = {
28104 .inherits = &ata_bmdma_port_ops,
28105 /* In theory xfer_noirq is not needed once we kill the prefetcher */
28106 .sff_data_xfer = ata_sff_data_xfer_noirq,
28107 diff --git a/drivers/ata/pata_cmd64x.c b/drivers/ata/pata_cmd64x.c
28108 index ccd2694..c869c3d 100644
28109 --- a/drivers/ata/pata_cmd64x.c
28110 +++ b/drivers/ata/pata_cmd64x.c
28111 @@ -271,18 +271,18 @@ static const struct ata_port_operations cmd64x_base_ops = {
28112 .set_dmamode = cmd64x_set_dmamode,
28113 };
28114
28115 -static struct ata_port_operations cmd64x_port_ops = {
28116 +static const struct ata_port_operations cmd64x_port_ops = {
28117 .inherits = &cmd64x_base_ops,
28118 .cable_detect = ata_cable_40wire,
28119 };
28120
28121 -static struct ata_port_operations cmd646r1_port_ops = {
28122 +static const struct ata_port_operations cmd646r1_port_ops = {
28123 .inherits = &cmd64x_base_ops,
28124 .bmdma_stop = cmd646r1_bmdma_stop,
28125 .cable_detect = ata_cable_40wire,
28126 };
28127
28128 -static struct ata_port_operations cmd648_port_ops = {
28129 +static const struct ata_port_operations cmd648_port_ops = {
28130 .inherits = &cmd64x_base_ops,
28131 .bmdma_stop = cmd648_bmdma_stop,
28132 .cable_detect = cmd648_cable_detect,
28133 diff --git a/drivers/ata/pata_cs5520.c b/drivers/ata/pata_cs5520.c
28134 index 0df83cf..d7595b0 100644
28135 --- a/drivers/ata/pata_cs5520.c
28136 +++ b/drivers/ata/pata_cs5520.c
28137 @@ -144,7 +144,7 @@ static struct scsi_host_template cs5520_sht = {
28138 .sg_tablesize = LIBATA_DUMB_MAX_PRD,
28139 };
28140
28141 -static struct ata_port_operations cs5520_port_ops = {
28142 +static const struct ata_port_operations cs5520_port_ops = {
28143 .inherits = &ata_bmdma_port_ops,
28144 .qc_prep = ata_sff_dumb_qc_prep,
28145 .cable_detect = ata_cable_40wire,
28146 diff --git a/drivers/ata/pata_cs5530.c b/drivers/ata/pata_cs5530.c
28147 index c974b05..6d26b11 100644
28148 --- a/drivers/ata/pata_cs5530.c
28149 +++ b/drivers/ata/pata_cs5530.c
28150 @@ -164,7 +164,7 @@ static struct scsi_host_template cs5530_sht = {
28151 .sg_tablesize = LIBATA_DUMB_MAX_PRD,
28152 };
28153
28154 -static struct ata_port_operations cs5530_port_ops = {
28155 +static const struct ata_port_operations cs5530_port_ops = {
28156 .inherits = &ata_bmdma_port_ops,
28157
28158 .qc_prep = ata_sff_dumb_qc_prep,
28159 diff --git a/drivers/ata/pata_cs5535.c b/drivers/ata/pata_cs5535.c
28160 index 403f561..aacd26b 100644
28161 --- a/drivers/ata/pata_cs5535.c
28162 +++ b/drivers/ata/pata_cs5535.c
28163 @@ -160,7 +160,7 @@ static struct scsi_host_template cs5535_sht = {
28164 ATA_BMDMA_SHT(DRV_NAME),
28165 };
28166
28167 -static struct ata_port_operations cs5535_port_ops = {
28168 +static const struct ata_port_operations cs5535_port_ops = {
28169 .inherits = &ata_bmdma_port_ops,
28170 .cable_detect = cs5535_cable_detect,
28171 .set_piomode = cs5535_set_piomode,
28172 diff --git a/drivers/ata/pata_cs5536.c b/drivers/ata/pata_cs5536.c
28173 index 6da4cb4..de24a25 100644
28174 --- a/drivers/ata/pata_cs5536.c
28175 +++ b/drivers/ata/pata_cs5536.c
28176 @@ -223,7 +223,7 @@ static struct scsi_host_template cs5536_sht = {
28177 ATA_BMDMA_SHT(DRV_NAME),
28178 };
28179
28180 -static struct ata_port_operations cs5536_port_ops = {
28181 +static const struct ata_port_operations cs5536_port_ops = {
28182 .inherits = &ata_bmdma_port_ops,
28183 .cable_detect = cs5536_cable_detect,
28184 .set_piomode = cs5536_set_piomode,
28185 diff --git a/drivers/ata/pata_cypress.c b/drivers/ata/pata_cypress.c
28186 index 8fb040b..b16a9c9 100644
28187 --- a/drivers/ata/pata_cypress.c
28188 +++ b/drivers/ata/pata_cypress.c
28189 @@ -113,7 +113,7 @@ static struct scsi_host_template cy82c693_sht = {
28190 ATA_BMDMA_SHT(DRV_NAME),
28191 };
28192
28193 -static struct ata_port_operations cy82c693_port_ops = {
28194 +static const struct ata_port_operations cy82c693_port_ops = {
28195 .inherits = &ata_bmdma_port_ops,
28196 .cable_detect = ata_cable_40wire,
28197 .set_piomode = cy82c693_set_piomode,
28198 diff --git a/drivers/ata/pata_efar.c b/drivers/ata/pata_efar.c
28199 index 2a6412f..555ee11 100644
28200 --- a/drivers/ata/pata_efar.c
28201 +++ b/drivers/ata/pata_efar.c
28202 @@ -222,7 +222,7 @@ static struct scsi_host_template efar_sht = {
28203 ATA_BMDMA_SHT(DRV_NAME),
28204 };
28205
28206 -static struct ata_port_operations efar_ops = {
28207 +static const struct ata_port_operations efar_ops = {
28208 .inherits = &ata_bmdma_port_ops,
28209 .cable_detect = efar_cable_detect,
28210 .set_piomode = efar_set_piomode,
28211 diff --git a/drivers/ata/pata_hpt366.c b/drivers/ata/pata_hpt366.c
28212 index b9d8836..0b92030 100644
28213 --- a/drivers/ata/pata_hpt366.c
28214 +++ b/drivers/ata/pata_hpt366.c
28215 @@ -282,7 +282,7 @@ static struct scsi_host_template hpt36x_sht = {
28216 * Configuration for HPT366/68
28217 */
28218
28219 -static struct ata_port_operations hpt366_port_ops = {
28220 +static const struct ata_port_operations hpt366_port_ops = {
28221 .inherits = &ata_bmdma_port_ops,
28222 .cable_detect = hpt36x_cable_detect,
28223 .mode_filter = hpt366_filter,
28224 diff --git a/drivers/ata/pata_hpt37x.c b/drivers/ata/pata_hpt37x.c
28225 index 5af7f19..00c4980 100644
28226 --- a/drivers/ata/pata_hpt37x.c
28227 +++ b/drivers/ata/pata_hpt37x.c
28228 @@ -576,7 +576,7 @@ static struct scsi_host_template hpt37x_sht = {
28229 * Configuration for HPT370
28230 */
28231
28232 -static struct ata_port_operations hpt370_port_ops = {
28233 +static const struct ata_port_operations hpt370_port_ops = {
28234 .inherits = &ata_bmdma_port_ops,
28235
28236 .bmdma_stop = hpt370_bmdma_stop,
28237 @@ -591,7 +591,7 @@ static struct ata_port_operations hpt370_port_ops = {
28238 * Configuration for HPT370A. Close to 370 but less filters
28239 */
28240
28241 -static struct ata_port_operations hpt370a_port_ops = {
28242 +static const struct ata_port_operations hpt370a_port_ops = {
28243 .inherits = &hpt370_port_ops,
28244 .mode_filter = hpt370a_filter,
28245 };
28246 @@ -601,7 +601,7 @@ static struct ata_port_operations hpt370a_port_ops = {
28247 * and DMA mode setting functionality.
28248 */
28249
28250 -static struct ata_port_operations hpt372_port_ops = {
28251 +static const struct ata_port_operations hpt372_port_ops = {
28252 .inherits = &ata_bmdma_port_ops,
28253
28254 .bmdma_stop = hpt37x_bmdma_stop,
28255 @@ -616,7 +616,7 @@ static struct ata_port_operations hpt372_port_ops = {
28256 * but we have a different cable detection procedure for function 1.
28257 */
28258
28259 -static struct ata_port_operations hpt374_fn1_port_ops = {
28260 +static const struct ata_port_operations hpt374_fn1_port_ops = {
28261 .inherits = &hpt372_port_ops,
28262 .prereset = hpt374_fn1_pre_reset,
28263 };
28264 diff --git a/drivers/ata/pata_hpt3x2n.c b/drivers/ata/pata_hpt3x2n.c
28265 index 100f227..2e39382 100644
28266 --- a/drivers/ata/pata_hpt3x2n.c
28267 +++ b/drivers/ata/pata_hpt3x2n.c
28268 @@ -337,7 +337,7 @@ static struct scsi_host_template hpt3x2n_sht = {
28269 * Configuration for HPT3x2n.
28270 */
28271
28272 -static struct ata_port_operations hpt3x2n_port_ops = {
28273 +static const struct ata_port_operations hpt3x2n_port_ops = {
28274 .inherits = &ata_bmdma_port_ops,
28275
28276 .bmdma_stop = hpt3x2n_bmdma_stop,
28277 diff --git a/drivers/ata/pata_hpt3x3.c b/drivers/ata/pata_hpt3x3.c
28278 index 7e31025..6fca8f4 100644
28279 --- a/drivers/ata/pata_hpt3x3.c
28280 +++ b/drivers/ata/pata_hpt3x3.c
28281 @@ -141,7 +141,7 @@ static struct scsi_host_template hpt3x3_sht = {
28282 ATA_BMDMA_SHT(DRV_NAME),
28283 };
28284
28285 -static struct ata_port_operations hpt3x3_port_ops = {
28286 +static const struct ata_port_operations hpt3x3_port_ops = {
28287 .inherits = &ata_bmdma_port_ops,
28288 .cable_detect = ata_cable_40wire,
28289 .set_piomode = hpt3x3_set_piomode,
28290 diff --git a/drivers/ata/pata_icside.c b/drivers/ata/pata_icside.c
28291 index b663b7f..9a26c2a 100644
28292 --- a/drivers/ata/pata_icside.c
28293 +++ b/drivers/ata/pata_icside.c
28294 @@ -319,7 +319,7 @@ static void pata_icside_postreset(struct ata_link *link, unsigned int *classes)
28295 }
28296 }
28297
28298 -static struct ata_port_operations pata_icside_port_ops = {
28299 +static const struct ata_port_operations pata_icside_port_ops = {
28300 .inherits = &ata_sff_port_ops,
28301 /* no need to build any PRD tables for DMA */
28302 .qc_prep = ata_noop_qc_prep,
28303 diff --git a/drivers/ata/pata_isapnp.c b/drivers/ata/pata_isapnp.c
28304 index 4bceb88..457dfb6 100644
28305 --- a/drivers/ata/pata_isapnp.c
28306 +++ b/drivers/ata/pata_isapnp.c
28307 @@ -23,12 +23,12 @@ static struct scsi_host_template isapnp_sht = {
28308 ATA_PIO_SHT(DRV_NAME),
28309 };
28310
28311 -static struct ata_port_operations isapnp_port_ops = {
28312 +static const struct ata_port_operations isapnp_port_ops = {
28313 .inherits = &ata_sff_port_ops,
28314 .cable_detect = ata_cable_40wire,
28315 };
28316
28317 -static struct ata_port_operations isapnp_noalt_port_ops = {
28318 +static const struct ata_port_operations isapnp_noalt_port_ops = {
28319 .inherits = &ata_sff_port_ops,
28320 .cable_detect = ata_cable_40wire,
28321 /* No altstatus so we don't want to use the lost interrupt poll */
28322 diff --git a/drivers/ata/pata_it8213.c b/drivers/ata/pata_it8213.c
28323 index f156da8..24976e2 100644
28324 --- a/drivers/ata/pata_it8213.c
28325 +++ b/drivers/ata/pata_it8213.c
28326 @@ -234,7 +234,7 @@ static struct scsi_host_template it8213_sht = {
28327 };
28328
28329
28330 -static struct ata_port_operations it8213_ops = {
28331 +static const struct ata_port_operations it8213_ops = {
28332 .inherits = &ata_bmdma_port_ops,
28333 .cable_detect = it8213_cable_detect,
28334 .set_piomode = it8213_set_piomode,
28335 diff --git a/drivers/ata/pata_it821x.c b/drivers/ata/pata_it821x.c
28336 index 188bc2f..ca9e785 100644
28337 --- a/drivers/ata/pata_it821x.c
28338 +++ b/drivers/ata/pata_it821x.c
28339 @@ -800,7 +800,7 @@ static struct scsi_host_template it821x_sht = {
28340 ATA_BMDMA_SHT(DRV_NAME),
28341 };
28342
28343 -static struct ata_port_operations it821x_smart_port_ops = {
28344 +static const struct ata_port_operations it821x_smart_port_ops = {
28345 .inherits = &ata_bmdma_port_ops,
28346
28347 .check_atapi_dma= it821x_check_atapi_dma,
28348 @@ -814,7 +814,7 @@ static struct ata_port_operations it821x_smart_port_ops = {
28349 .port_start = it821x_port_start,
28350 };
28351
28352 -static struct ata_port_operations it821x_passthru_port_ops = {
28353 +static const struct ata_port_operations it821x_passthru_port_ops = {
28354 .inherits = &ata_bmdma_port_ops,
28355
28356 .check_atapi_dma= it821x_check_atapi_dma,
28357 @@ -830,7 +830,7 @@ static struct ata_port_operations it821x_passthru_port_ops = {
28358 .port_start = it821x_port_start,
28359 };
28360
28361 -static struct ata_port_operations it821x_rdc_port_ops = {
28362 +static const struct ata_port_operations it821x_rdc_port_ops = {
28363 .inherits = &ata_bmdma_port_ops,
28364
28365 .check_atapi_dma= it821x_check_atapi_dma,
28366 diff --git a/drivers/ata/pata_ixp4xx_cf.c b/drivers/ata/pata_ixp4xx_cf.c
28367 index ba54b08..4b952b7 100644
28368 --- a/drivers/ata/pata_ixp4xx_cf.c
28369 +++ b/drivers/ata/pata_ixp4xx_cf.c
28370 @@ -89,7 +89,7 @@ static struct scsi_host_template ixp4xx_sht = {
28371 ATA_PIO_SHT(DRV_NAME),
28372 };
28373
28374 -static struct ata_port_operations ixp4xx_port_ops = {
28375 +static const struct ata_port_operations ixp4xx_port_ops = {
28376 .inherits = &ata_sff_port_ops,
28377 .sff_data_xfer = ixp4xx_mmio_data_xfer,
28378 .cable_detect = ata_cable_40wire,
28379 diff --git a/drivers/ata/pata_jmicron.c b/drivers/ata/pata_jmicron.c
28380 index 3a1474a..434b0ff 100644
28381 --- a/drivers/ata/pata_jmicron.c
28382 +++ b/drivers/ata/pata_jmicron.c
28383 @@ -111,7 +111,7 @@ static struct scsi_host_template jmicron_sht = {
28384 ATA_BMDMA_SHT(DRV_NAME),
28385 };
28386
28387 -static struct ata_port_operations jmicron_ops = {
28388 +static const struct ata_port_operations jmicron_ops = {
28389 .inherits = &ata_bmdma_port_ops,
28390 .prereset = jmicron_pre_reset,
28391 };
28392 diff --git a/drivers/ata/pata_legacy.c b/drivers/ata/pata_legacy.c
28393 index 6932e56..220e71d 100644
28394 --- a/drivers/ata/pata_legacy.c
28395 +++ b/drivers/ata/pata_legacy.c
28396 @@ -106,7 +106,7 @@ struct legacy_probe {
28397
28398 struct legacy_controller {
28399 const char *name;
28400 - struct ata_port_operations *ops;
28401 + const struct ata_port_operations *ops;
28402 unsigned int pio_mask;
28403 unsigned int flags;
28404 unsigned int pflags;
28405 @@ -223,12 +223,12 @@ static const struct ata_port_operations legacy_base_port_ops = {
28406 * pio_mask as well.
28407 */
28408
28409 -static struct ata_port_operations simple_port_ops = {
28410 +static const struct ata_port_operations simple_port_ops = {
28411 .inherits = &legacy_base_port_ops,
28412 .sff_data_xfer = ata_sff_data_xfer_noirq,
28413 };
28414
28415 -static struct ata_port_operations legacy_port_ops = {
28416 +static const struct ata_port_operations legacy_port_ops = {
28417 .inherits = &legacy_base_port_ops,
28418 .sff_data_xfer = ata_sff_data_xfer_noirq,
28419 .set_mode = legacy_set_mode,
28420 @@ -324,7 +324,7 @@ static unsigned int pdc_data_xfer_vlb(struct ata_device *dev,
28421 return buflen;
28422 }
28423
28424 -static struct ata_port_operations pdc20230_port_ops = {
28425 +static const struct ata_port_operations pdc20230_port_ops = {
28426 .inherits = &legacy_base_port_ops,
28427 .set_piomode = pdc20230_set_piomode,
28428 .sff_data_xfer = pdc_data_xfer_vlb,
28429 @@ -357,7 +357,7 @@ static void ht6560a_set_piomode(struct ata_port *ap, struct ata_device *adev)
28430 ioread8(ap->ioaddr.status_addr);
28431 }
28432
28433 -static struct ata_port_operations ht6560a_port_ops = {
28434 +static const struct ata_port_operations ht6560a_port_ops = {
28435 .inherits = &legacy_base_port_ops,
28436 .set_piomode = ht6560a_set_piomode,
28437 };
28438 @@ -400,7 +400,7 @@ static void ht6560b_set_piomode(struct ata_port *ap, struct ata_device *adev)
28439 ioread8(ap->ioaddr.status_addr);
28440 }
28441
28442 -static struct ata_port_operations ht6560b_port_ops = {
28443 +static const struct ata_port_operations ht6560b_port_ops = {
28444 .inherits = &legacy_base_port_ops,
28445 .set_piomode = ht6560b_set_piomode,
28446 };
28447 @@ -499,7 +499,7 @@ static void opti82c611a_set_piomode(struct ata_port *ap,
28448 }
28449
28450
28451 -static struct ata_port_operations opti82c611a_port_ops = {
28452 +static const struct ata_port_operations opti82c611a_port_ops = {
28453 .inherits = &legacy_base_port_ops,
28454 .set_piomode = opti82c611a_set_piomode,
28455 };
28456 @@ -609,7 +609,7 @@ static unsigned int opti82c46x_qc_issue(struct ata_queued_cmd *qc)
28457 return ata_sff_qc_issue(qc);
28458 }
28459
28460 -static struct ata_port_operations opti82c46x_port_ops = {
28461 +static const struct ata_port_operations opti82c46x_port_ops = {
28462 .inherits = &legacy_base_port_ops,
28463 .set_piomode = opti82c46x_set_piomode,
28464 .qc_issue = opti82c46x_qc_issue,
28465 @@ -771,20 +771,20 @@ static int qdi_port(struct platform_device *dev,
28466 return 0;
28467 }
28468
28469 -static struct ata_port_operations qdi6500_port_ops = {
28470 +static const struct ata_port_operations qdi6500_port_ops = {
28471 .inherits = &legacy_base_port_ops,
28472 .set_piomode = qdi6500_set_piomode,
28473 .qc_issue = qdi_qc_issue,
28474 .sff_data_xfer = vlb32_data_xfer,
28475 };
28476
28477 -static struct ata_port_operations qdi6580_port_ops = {
28478 +static const struct ata_port_operations qdi6580_port_ops = {
28479 .inherits = &legacy_base_port_ops,
28480 .set_piomode = qdi6580_set_piomode,
28481 .sff_data_xfer = vlb32_data_xfer,
28482 };
28483
28484 -static struct ata_port_operations qdi6580dp_port_ops = {
28485 +static const struct ata_port_operations qdi6580dp_port_ops = {
28486 .inherits = &legacy_base_port_ops,
28487 .set_piomode = qdi6580dp_set_piomode,
28488 .sff_data_xfer = vlb32_data_xfer,
28489 @@ -855,7 +855,7 @@ static int winbond_port(struct platform_device *dev,
28490 return 0;
28491 }
28492
28493 -static struct ata_port_operations winbond_port_ops = {
28494 +static const struct ata_port_operations winbond_port_ops = {
28495 .inherits = &legacy_base_port_ops,
28496 .set_piomode = winbond_set_piomode,
28497 .sff_data_xfer = vlb32_data_xfer,
28498 @@ -978,7 +978,7 @@ static __init int legacy_init_one(struct legacy_probe *probe)
28499 int pio_modes = controller->pio_mask;
28500 unsigned long io = probe->port;
28501 u32 mask = (1 << probe->slot);
28502 - struct ata_port_operations *ops = controller->ops;
28503 + const struct ata_port_operations *ops = controller->ops;
28504 struct legacy_data *ld = &legacy_data[probe->slot];
28505 struct ata_host *host = NULL;
28506 struct ata_port *ap;
28507 diff --git a/drivers/ata/pata_marvell.c b/drivers/ata/pata_marvell.c
28508 index 2096fb7..4d090fc 100644
28509 --- a/drivers/ata/pata_marvell.c
28510 +++ b/drivers/ata/pata_marvell.c
28511 @@ -100,7 +100,7 @@ static struct scsi_host_template marvell_sht = {
28512 ATA_BMDMA_SHT(DRV_NAME),
28513 };
28514
28515 -static struct ata_port_operations marvell_ops = {
28516 +static const struct ata_port_operations marvell_ops = {
28517 .inherits = &ata_bmdma_port_ops,
28518 .cable_detect = marvell_cable_detect,
28519 .prereset = marvell_pre_reset,
28520 diff --git a/drivers/ata/pata_mpc52xx.c b/drivers/ata/pata_mpc52xx.c
28521 index 99d41be..7d56aa8 100644
28522 --- a/drivers/ata/pata_mpc52xx.c
28523 +++ b/drivers/ata/pata_mpc52xx.c
28524 @@ -609,7 +609,7 @@ static struct scsi_host_template mpc52xx_ata_sht = {
28525 ATA_PIO_SHT(DRV_NAME),
28526 };
28527
28528 -static struct ata_port_operations mpc52xx_ata_port_ops = {
28529 +static const struct ata_port_operations mpc52xx_ata_port_ops = {
28530 .inherits = &ata_bmdma_port_ops,
28531 .sff_dev_select = mpc52xx_ata_dev_select,
28532 .set_piomode = mpc52xx_ata_set_piomode,
28533 diff --git a/drivers/ata/pata_mpiix.c b/drivers/ata/pata_mpiix.c
28534 index b21f002..0a27e7f 100644
28535 --- a/drivers/ata/pata_mpiix.c
28536 +++ b/drivers/ata/pata_mpiix.c
28537 @@ -140,7 +140,7 @@ static struct scsi_host_template mpiix_sht = {
28538 ATA_PIO_SHT(DRV_NAME),
28539 };
28540
28541 -static struct ata_port_operations mpiix_port_ops = {
28542 +static const struct ata_port_operations mpiix_port_ops = {
28543 .inherits = &ata_sff_port_ops,
28544 .qc_issue = mpiix_qc_issue,
28545 .cable_detect = ata_cable_40wire,
28546 diff --git a/drivers/ata/pata_netcell.c b/drivers/ata/pata_netcell.c
28547 index f0d52f7..89c3be3 100644
28548 --- a/drivers/ata/pata_netcell.c
28549 +++ b/drivers/ata/pata_netcell.c
28550 @@ -34,7 +34,7 @@ static struct scsi_host_template netcell_sht = {
28551 ATA_BMDMA_SHT(DRV_NAME),
28552 };
28553
28554 -static struct ata_port_operations netcell_ops = {
28555 +static const struct ata_port_operations netcell_ops = {
28556 .inherits = &ata_bmdma_port_ops,
28557 .cable_detect = ata_cable_80wire,
28558 .read_id = netcell_read_id,
28559 diff --git a/drivers/ata/pata_ninja32.c b/drivers/ata/pata_ninja32.c
28560 index dd53a66..a3f4317 100644
28561 --- a/drivers/ata/pata_ninja32.c
28562 +++ b/drivers/ata/pata_ninja32.c
28563 @@ -81,7 +81,7 @@ static struct scsi_host_template ninja32_sht = {
28564 ATA_BMDMA_SHT(DRV_NAME),
28565 };
28566
28567 -static struct ata_port_operations ninja32_port_ops = {
28568 +static const struct ata_port_operations ninja32_port_ops = {
28569 .inherits = &ata_bmdma_port_ops,
28570 .sff_dev_select = ninja32_dev_select,
28571 .cable_detect = ata_cable_40wire,
28572 diff --git a/drivers/ata/pata_ns87410.c b/drivers/ata/pata_ns87410.c
28573 index ca53fac..9aa93ef 100644
28574 --- a/drivers/ata/pata_ns87410.c
28575 +++ b/drivers/ata/pata_ns87410.c
28576 @@ -132,7 +132,7 @@ static struct scsi_host_template ns87410_sht = {
28577 ATA_PIO_SHT(DRV_NAME),
28578 };
28579
28580 -static struct ata_port_operations ns87410_port_ops = {
28581 +static const struct ata_port_operations ns87410_port_ops = {
28582 .inherits = &ata_sff_port_ops,
28583 .qc_issue = ns87410_qc_issue,
28584 .cable_detect = ata_cable_40wire,
28585 diff --git a/drivers/ata/pata_ns87415.c b/drivers/ata/pata_ns87415.c
28586 index 773b159..55f454e 100644
28587 --- a/drivers/ata/pata_ns87415.c
28588 +++ b/drivers/ata/pata_ns87415.c
28589 @@ -299,7 +299,7 @@ static u8 ns87560_bmdma_status(struct ata_port *ap)
28590 }
28591 #endif /* 87560 SuperIO Support */
28592
28593 -static struct ata_port_operations ns87415_pata_ops = {
28594 +static const struct ata_port_operations ns87415_pata_ops = {
28595 .inherits = &ata_bmdma_port_ops,
28596
28597 .check_atapi_dma = ns87415_check_atapi_dma,
28598 @@ -313,7 +313,7 @@ static struct ata_port_operations ns87415_pata_ops = {
28599 };
28600
28601 #if defined(CONFIG_SUPERIO)
28602 -static struct ata_port_operations ns87560_pata_ops = {
28603 +static const struct ata_port_operations ns87560_pata_ops = {
28604 .inherits = &ns87415_pata_ops,
28605 .sff_tf_read = ns87560_tf_read,
28606 .sff_check_status = ns87560_check_status,
28607 diff --git a/drivers/ata/pata_octeon_cf.c b/drivers/ata/pata_octeon_cf.c
28608 index d6f6956..639295b 100644
28609 --- a/drivers/ata/pata_octeon_cf.c
28610 +++ b/drivers/ata/pata_octeon_cf.c
28611 @@ -801,6 +801,7 @@ static unsigned int octeon_cf_qc_issue(struct ata_queued_cmd *qc)
28612 return 0;
28613 }
28614
28615 +/* cannot be const */
28616 static struct ata_port_operations octeon_cf_ops = {
28617 .inherits = &ata_sff_port_ops,
28618 .check_atapi_dma = octeon_cf_check_atapi_dma,
28619 diff --git a/drivers/ata/pata_oldpiix.c b/drivers/ata/pata_oldpiix.c
28620 index 84ac503..adee1cd 100644
28621 --- a/drivers/ata/pata_oldpiix.c
28622 +++ b/drivers/ata/pata_oldpiix.c
28623 @@ -208,7 +208,7 @@ static struct scsi_host_template oldpiix_sht = {
28624 ATA_BMDMA_SHT(DRV_NAME),
28625 };
28626
28627 -static struct ata_port_operations oldpiix_pata_ops = {
28628 +static const struct ata_port_operations oldpiix_pata_ops = {
28629 .inherits = &ata_bmdma_port_ops,
28630 .qc_issue = oldpiix_qc_issue,
28631 .cable_detect = ata_cable_40wire,
28632 diff --git a/drivers/ata/pata_opti.c b/drivers/ata/pata_opti.c
28633 index 99eddda..3a4c0aa 100644
28634 --- a/drivers/ata/pata_opti.c
28635 +++ b/drivers/ata/pata_opti.c
28636 @@ -152,7 +152,7 @@ static struct scsi_host_template opti_sht = {
28637 ATA_PIO_SHT(DRV_NAME),
28638 };
28639
28640 -static struct ata_port_operations opti_port_ops = {
28641 +static const struct ata_port_operations opti_port_ops = {
28642 .inherits = &ata_sff_port_ops,
28643 .cable_detect = ata_cable_40wire,
28644 .set_piomode = opti_set_piomode,
28645 diff --git a/drivers/ata/pata_optidma.c b/drivers/ata/pata_optidma.c
28646 index 86885a4..8e9968d 100644
28647 --- a/drivers/ata/pata_optidma.c
28648 +++ b/drivers/ata/pata_optidma.c
28649 @@ -337,7 +337,7 @@ static struct scsi_host_template optidma_sht = {
28650 ATA_BMDMA_SHT(DRV_NAME),
28651 };
28652
28653 -static struct ata_port_operations optidma_port_ops = {
28654 +static const struct ata_port_operations optidma_port_ops = {
28655 .inherits = &ata_bmdma_port_ops,
28656 .cable_detect = ata_cable_40wire,
28657 .set_piomode = optidma_set_pio_mode,
28658 @@ -346,7 +346,7 @@ static struct ata_port_operations optidma_port_ops = {
28659 .prereset = optidma_pre_reset,
28660 };
28661
28662 -static struct ata_port_operations optiplus_port_ops = {
28663 +static const struct ata_port_operations optiplus_port_ops = {
28664 .inherits = &optidma_port_ops,
28665 .set_piomode = optiplus_set_pio_mode,
28666 .set_dmamode = optiplus_set_dma_mode,
28667 diff --git a/drivers/ata/pata_palmld.c b/drivers/ata/pata_palmld.c
28668 index 11fb4cc..1a14022 100644
28669 --- a/drivers/ata/pata_palmld.c
28670 +++ b/drivers/ata/pata_palmld.c
28671 @@ -37,7 +37,7 @@ static struct scsi_host_template palmld_sht = {
28672 ATA_PIO_SHT(DRV_NAME),
28673 };
28674
28675 -static struct ata_port_operations palmld_port_ops = {
28676 +static const struct ata_port_operations palmld_port_ops = {
28677 .inherits = &ata_sff_port_ops,
28678 .sff_data_xfer = ata_sff_data_xfer_noirq,
28679 .cable_detect = ata_cable_40wire,
28680 diff --git a/drivers/ata/pata_pcmcia.c b/drivers/ata/pata_pcmcia.c
28681 index dc99e26..7f4b1e4 100644
28682 --- a/drivers/ata/pata_pcmcia.c
28683 +++ b/drivers/ata/pata_pcmcia.c
28684 @@ -162,14 +162,14 @@ static struct scsi_host_template pcmcia_sht = {
28685 ATA_PIO_SHT(DRV_NAME),
28686 };
28687
28688 -static struct ata_port_operations pcmcia_port_ops = {
28689 +static const struct ata_port_operations pcmcia_port_ops = {
28690 .inherits = &ata_sff_port_ops,
28691 .sff_data_xfer = ata_sff_data_xfer_noirq,
28692 .cable_detect = ata_cable_40wire,
28693 .set_mode = pcmcia_set_mode,
28694 };
28695
28696 -static struct ata_port_operations pcmcia_8bit_port_ops = {
28697 +static const struct ata_port_operations pcmcia_8bit_port_ops = {
28698 .inherits = &ata_sff_port_ops,
28699 .sff_data_xfer = ata_data_xfer_8bit,
28700 .cable_detect = ata_cable_40wire,
28701 @@ -256,7 +256,7 @@ static int pcmcia_init_one(struct pcmcia_device *pdev)
28702 unsigned long io_base, ctl_base;
28703 void __iomem *io_addr, *ctl_addr;
28704 int n_ports = 1;
28705 - struct ata_port_operations *ops = &pcmcia_port_ops;
28706 + const struct ata_port_operations *ops = &pcmcia_port_ops;
28707
28708 info = kzalloc(sizeof(*info), GFP_KERNEL);
28709 if (info == NULL)
28710 diff --git a/drivers/ata/pata_pdc2027x.c b/drivers/ata/pata_pdc2027x.c
28711 index ca5cad0..3a1f125 100644
28712 --- a/drivers/ata/pata_pdc2027x.c
28713 +++ b/drivers/ata/pata_pdc2027x.c
28714 @@ -132,14 +132,14 @@ static struct scsi_host_template pdc2027x_sht = {
28715 ATA_BMDMA_SHT(DRV_NAME),
28716 };
28717
28718 -static struct ata_port_operations pdc2027x_pata100_ops = {
28719 +static const struct ata_port_operations pdc2027x_pata100_ops = {
28720 .inherits = &ata_bmdma_port_ops,
28721 .check_atapi_dma = pdc2027x_check_atapi_dma,
28722 .cable_detect = pdc2027x_cable_detect,
28723 .prereset = pdc2027x_prereset,
28724 };
28725
28726 -static struct ata_port_operations pdc2027x_pata133_ops = {
28727 +static const struct ata_port_operations pdc2027x_pata133_ops = {
28728 .inherits = &pdc2027x_pata100_ops,
28729 .mode_filter = pdc2027x_mode_filter,
28730 .set_piomode = pdc2027x_set_piomode,
28731 diff --git a/drivers/ata/pata_pdc202xx_old.c b/drivers/ata/pata_pdc202xx_old.c
28732 index 2911120..4bf62aa 100644
28733 --- a/drivers/ata/pata_pdc202xx_old.c
28734 +++ b/drivers/ata/pata_pdc202xx_old.c
28735 @@ -274,7 +274,7 @@ static struct scsi_host_template pdc202xx_sht = {
28736 ATA_BMDMA_SHT(DRV_NAME),
28737 };
28738
28739 -static struct ata_port_operations pdc2024x_port_ops = {
28740 +static const struct ata_port_operations pdc2024x_port_ops = {
28741 .inherits = &ata_bmdma_port_ops,
28742
28743 .cable_detect = ata_cable_40wire,
28744 @@ -284,7 +284,7 @@ static struct ata_port_operations pdc2024x_port_ops = {
28745 .sff_exec_command = pdc202xx_exec_command,
28746 };
28747
28748 -static struct ata_port_operations pdc2026x_port_ops = {
28749 +static const struct ata_port_operations pdc2026x_port_ops = {
28750 .inherits = &pdc2024x_port_ops,
28751
28752 .check_atapi_dma = pdc2026x_check_atapi_dma,
28753 diff --git a/drivers/ata/pata_platform.c b/drivers/ata/pata_platform.c
28754 index 3f6ebc6..a18c358 100644
28755 --- a/drivers/ata/pata_platform.c
28756 +++ b/drivers/ata/pata_platform.c
28757 @@ -48,7 +48,7 @@ static struct scsi_host_template pata_platform_sht = {
28758 ATA_PIO_SHT(DRV_NAME),
28759 };
28760
28761 -static struct ata_port_operations pata_platform_port_ops = {
28762 +static const struct ata_port_operations pata_platform_port_ops = {
28763 .inherits = &ata_sff_port_ops,
28764 .sff_data_xfer = ata_sff_data_xfer_noirq,
28765 .cable_detect = ata_cable_unknown,
28766 diff --git a/drivers/ata/pata_qdi.c b/drivers/ata/pata_qdi.c
28767 index 45879dc..165a9f9 100644
28768 --- a/drivers/ata/pata_qdi.c
28769 +++ b/drivers/ata/pata_qdi.c
28770 @@ -157,7 +157,7 @@ static struct scsi_host_template qdi_sht = {
28771 ATA_PIO_SHT(DRV_NAME),
28772 };
28773
28774 -static struct ata_port_operations qdi6500_port_ops = {
28775 +static const struct ata_port_operations qdi6500_port_ops = {
28776 .inherits = &ata_sff_port_ops,
28777 .qc_issue = qdi_qc_issue,
28778 .sff_data_xfer = qdi_data_xfer,
28779 @@ -165,7 +165,7 @@ static struct ata_port_operations qdi6500_port_ops = {
28780 .set_piomode = qdi6500_set_piomode,
28781 };
28782
28783 -static struct ata_port_operations qdi6580_port_ops = {
28784 +static const struct ata_port_operations qdi6580_port_ops = {
28785 .inherits = &qdi6500_port_ops,
28786 .set_piomode = qdi6580_set_piomode,
28787 };
28788 diff --git a/drivers/ata/pata_radisys.c b/drivers/ata/pata_radisys.c
28789 index 4401b33..716c5cc 100644
28790 --- a/drivers/ata/pata_radisys.c
28791 +++ b/drivers/ata/pata_radisys.c
28792 @@ -187,7 +187,7 @@ static struct scsi_host_template radisys_sht = {
28793 ATA_BMDMA_SHT(DRV_NAME),
28794 };
28795
28796 -static struct ata_port_operations radisys_pata_ops = {
28797 +static const struct ata_port_operations radisys_pata_ops = {
28798 .inherits = &ata_bmdma_port_ops,
28799 .qc_issue = radisys_qc_issue,
28800 .cable_detect = ata_cable_unknown,
28801 diff --git a/drivers/ata/pata_rb532_cf.c b/drivers/ata/pata_rb532_cf.c
28802 index 45f1e10..fab6bca 100644
28803 --- a/drivers/ata/pata_rb532_cf.c
28804 +++ b/drivers/ata/pata_rb532_cf.c
28805 @@ -68,7 +68,7 @@ static irqreturn_t rb532_pata_irq_handler(int irq, void *dev_instance)
28806 return IRQ_HANDLED;
28807 }
28808
28809 -static struct ata_port_operations rb532_pata_port_ops = {
28810 +static const struct ata_port_operations rb532_pata_port_ops = {
28811 .inherits = &ata_sff_port_ops,
28812 .sff_data_xfer = ata_sff_data_xfer32,
28813 };
28814 diff --git a/drivers/ata/pata_rdc.c b/drivers/ata/pata_rdc.c
28815 index c843a1e..b5853c3 100644
28816 --- a/drivers/ata/pata_rdc.c
28817 +++ b/drivers/ata/pata_rdc.c
28818 @@ -272,7 +272,7 @@ static void rdc_set_dmamode(struct ata_port *ap, struct ata_device *adev)
28819 pci_write_config_byte(dev, 0x48, udma_enable);
28820 }
28821
28822 -static struct ata_port_operations rdc_pata_ops = {
28823 +static const struct ata_port_operations rdc_pata_ops = {
28824 .inherits = &ata_bmdma32_port_ops,
28825 .cable_detect = rdc_pata_cable_detect,
28826 .set_piomode = rdc_set_piomode,
28827 diff --git a/drivers/ata/pata_rz1000.c b/drivers/ata/pata_rz1000.c
28828 index a5e4dfe..080c8c9 100644
28829 --- a/drivers/ata/pata_rz1000.c
28830 +++ b/drivers/ata/pata_rz1000.c
28831 @@ -54,7 +54,7 @@ static struct scsi_host_template rz1000_sht = {
28832 ATA_PIO_SHT(DRV_NAME),
28833 };
28834
28835 -static struct ata_port_operations rz1000_port_ops = {
28836 +static const struct ata_port_operations rz1000_port_ops = {
28837 .inherits = &ata_sff_port_ops,
28838 .cable_detect = ata_cable_40wire,
28839 .set_mode = rz1000_set_mode,
28840 diff --git a/drivers/ata/pata_sc1200.c b/drivers/ata/pata_sc1200.c
28841 index 3bbed83..e309daf 100644
28842 --- a/drivers/ata/pata_sc1200.c
28843 +++ b/drivers/ata/pata_sc1200.c
28844 @@ -207,7 +207,7 @@ static struct scsi_host_template sc1200_sht = {
28845 .sg_tablesize = LIBATA_DUMB_MAX_PRD,
28846 };
28847
28848 -static struct ata_port_operations sc1200_port_ops = {
28849 +static const struct ata_port_operations sc1200_port_ops = {
28850 .inherits = &ata_bmdma_port_ops,
28851 .qc_prep = ata_sff_dumb_qc_prep,
28852 .qc_issue = sc1200_qc_issue,
28853 diff --git a/drivers/ata/pata_scc.c b/drivers/ata/pata_scc.c
28854 index 4257d6b..4c1d9d5 100644
28855 --- a/drivers/ata/pata_scc.c
28856 +++ b/drivers/ata/pata_scc.c
28857 @@ -965,7 +965,7 @@ static struct scsi_host_template scc_sht = {
28858 ATA_BMDMA_SHT(DRV_NAME),
28859 };
28860
28861 -static struct ata_port_operations scc_pata_ops = {
28862 +static const struct ata_port_operations scc_pata_ops = {
28863 .inherits = &ata_bmdma_port_ops,
28864
28865 .set_piomode = scc_set_piomode,
28866 diff --git a/drivers/ata/pata_sch.c b/drivers/ata/pata_sch.c
28867 index 99cceb4..e2e0a87 100644
28868 --- a/drivers/ata/pata_sch.c
28869 +++ b/drivers/ata/pata_sch.c
28870 @@ -75,7 +75,7 @@ static struct scsi_host_template sch_sht = {
28871 ATA_BMDMA_SHT(DRV_NAME),
28872 };
28873
28874 -static struct ata_port_operations sch_pata_ops = {
28875 +static const struct ata_port_operations sch_pata_ops = {
28876 .inherits = &ata_bmdma_port_ops,
28877 .cable_detect = ata_cable_unknown,
28878 .set_piomode = sch_set_piomode,
28879 diff --git a/drivers/ata/pata_serverworks.c b/drivers/ata/pata_serverworks.c
28880 index beaed12..39969f1 100644
28881 --- a/drivers/ata/pata_serverworks.c
28882 +++ b/drivers/ata/pata_serverworks.c
28883 @@ -299,7 +299,7 @@ static struct scsi_host_template serverworks_sht = {
28884 ATA_BMDMA_SHT(DRV_NAME),
28885 };
28886
28887 -static struct ata_port_operations serverworks_osb4_port_ops = {
28888 +static const struct ata_port_operations serverworks_osb4_port_ops = {
28889 .inherits = &ata_bmdma_port_ops,
28890 .cable_detect = serverworks_cable_detect,
28891 .mode_filter = serverworks_osb4_filter,
28892 @@ -307,7 +307,7 @@ static struct ata_port_operations serverworks_osb4_port_ops = {
28893 .set_dmamode = serverworks_set_dmamode,
28894 };
28895
28896 -static struct ata_port_operations serverworks_csb_port_ops = {
28897 +static const struct ata_port_operations serverworks_csb_port_ops = {
28898 .inherits = &serverworks_osb4_port_ops,
28899 .mode_filter = serverworks_csb_filter,
28900 };
28901 diff --git a/drivers/ata/pata_sil680.c b/drivers/ata/pata_sil680.c
28902 index a2ace48..0463b44 100644
28903 --- a/drivers/ata/pata_sil680.c
28904 +++ b/drivers/ata/pata_sil680.c
28905 @@ -194,7 +194,7 @@ static struct scsi_host_template sil680_sht = {
28906 ATA_BMDMA_SHT(DRV_NAME),
28907 };
28908
28909 -static struct ata_port_operations sil680_port_ops = {
28910 +static const struct ata_port_operations sil680_port_ops = {
28911 .inherits = &ata_bmdma32_port_ops,
28912 .cable_detect = sil680_cable_detect,
28913 .set_piomode = sil680_set_piomode,
28914 diff --git a/drivers/ata/pata_sis.c b/drivers/ata/pata_sis.c
28915 index 488e77b..b3724d5 100644
28916 --- a/drivers/ata/pata_sis.c
28917 +++ b/drivers/ata/pata_sis.c
28918 @@ -503,47 +503,47 @@ static struct scsi_host_template sis_sht = {
28919 ATA_BMDMA_SHT(DRV_NAME),
28920 };
28921
28922 -static struct ata_port_operations sis_133_for_sata_ops = {
28923 +static const struct ata_port_operations sis_133_for_sata_ops = {
28924 .inherits = &ata_bmdma_port_ops,
28925 .set_piomode = sis_133_set_piomode,
28926 .set_dmamode = sis_133_set_dmamode,
28927 .cable_detect = sis_133_cable_detect,
28928 };
28929
28930 -static struct ata_port_operations sis_base_ops = {
28931 +static const struct ata_port_operations sis_base_ops = {
28932 .inherits = &ata_bmdma_port_ops,
28933 .prereset = sis_pre_reset,
28934 };
28935
28936 -static struct ata_port_operations sis_133_ops = {
28937 +static const struct ata_port_operations sis_133_ops = {
28938 .inherits = &sis_base_ops,
28939 .set_piomode = sis_133_set_piomode,
28940 .set_dmamode = sis_133_set_dmamode,
28941 .cable_detect = sis_133_cable_detect,
28942 };
28943
28944 -static struct ata_port_operations sis_133_early_ops = {
28945 +static const struct ata_port_operations sis_133_early_ops = {
28946 .inherits = &sis_base_ops,
28947 .set_piomode = sis_100_set_piomode,
28948 .set_dmamode = sis_133_early_set_dmamode,
28949 .cable_detect = sis_66_cable_detect,
28950 };
28951
28952 -static struct ata_port_operations sis_100_ops = {
28953 +static const struct ata_port_operations sis_100_ops = {
28954 .inherits = &sis_base_ops,
28955 .set_piomode = sis_100_set_piomode,
28956 .set_dmamode = sis_100_set_dmamode,
28957 .cable_detect = sis_66_cable_detect,
28958 };
28959
28960 -static struct ata_port_operations sis_66_ops = {
28961 +static const struct ata_port_operations sis_66_ops = {
28962 .inherits = &sis_base_ops,
28963 .set_piomode = sis_old_set_piomode,
28964 .set_dmamode = sis_66_set_dmamode,
28965 .cable_detect = sis_66_cable_detect,
28966 };
28967
28968 -static struct ata_port_operations sis_old_ops = {
28969 +static const struct ata_port_operations sis_old_ops = {
28970 .inherits = &sis_base_ops,
28971 .set_piomode = sis_old_set_piomode,
28972 .set_dmamode = sis_old_set_dmamode,
28973 diff --git a/drivers/ata/pata_sl82c105.c b/drivers/ata/pata_sl82c105.c
28974 index 29f733c..43e9ca0 100644
28975 --- a/drivers/ata/pata_sl82c105.c
28976 +++ b/drivers/ata/pata_sl82c105.c
28977 @@ -231,7 +231,7 @@ static struct scsi_host_template sl82c105_sht = {
28978 ATA_BMDMA_SHT(DRV_NAME),
28979 };
28980
28981 -static struct ata_port_operations sl82c105_port_ops = {
28982 +static const struct ata_port_operations sl82c105_port_ops = {
28983 .inherits = &ata_bmdma_port_ops,
28984 .qc_defer = sl82c105_qc_defer,
28985 .bmdma_start = sl82c105_bmdma_start,
28986 diff --git a/drivers/ata/pata_triflex.c b/drivers/ata/pata_triflex.c
28987 index f1f13ff..df39e99 100644
28988 --- a/drivers/ata/pata_triflex.c
28989 +++ b/drivers/ata/pata_triflex.c
28990 @@ -178,7 +178,7 @@ static struct scsi_host_template triflex_sht = {
28991 ATA_BMDMA_SHT(DRV_NAME),
28992 };
28993
28994 -static struct ata_port_operations triflex_port_ops = {
28995 +static const struct ata_port_operations triflex_port_ops = {
28996 .inherits = &ata_bmdma_port_ops,
28997 .bmdma_start = triflex_bmdma_start,
28998 .bmdma_stop = triflex_bmdma_stop,
28999 diff --git a/drivers/ata/pata_via.c b/drivers/ata/pata_via.c
29000 index 1d73b8d..98a4b29 100644
29001 --- a/drivers/ata/pata_via.c
29002 +++ b/drivers/ata/pata_via.c
29003 @@ -419,7 +419,7 @@ static struct scsi_host_template via_sht = {
29004 ATA_BMDMA_SHT(DRV_NAME),
29005 };
29006
29007 -static struct ata_port_operations via_port_ops = {
29008 +static const struct ata_port_operations via_port_ops = {
29009 .inherits = &ata_bmdma_port_ops,
29010 .cable_detect = via_cable_detect,
29011 .set_piomode = via_set_piomode,
29012 @@ -429,7 +429,7 @@ static struct ata_port_operations via_port_ops = {
29013 .port_start = via_port_start,
29014 };
29015
29016 -static struct ata_port_operations via_port_ops_noirq = {
29017 +static const struct ata_port_operations via_port_ops_noirq = {
29018 .inherits = &via_port_ops,
29019 .sff_data_xfer = ata_sff_data_xfer_noirq,
29020 };
29021 diff --git a/drivers/ata/pata_winbond.c b/drivers/ata/pata_winbond.c
29022 index 6d8619b..ad511c4 100644
29023 --- a/drivers/ata/pata_winbond.c
29024 +++ b/drivers/ata/pata_winbond.c
29025 @@ -125,7 +125,7 @@ static struct scsi_host_template winbond_sht = {
29026 ATA_PIO_SHT(DRV_NAME),
29027 };
29028
29029 -static struct ata_port_operations winbond_port_ops = {
29030 +static const struct ata_port_operations winbond_port_ops = {
29031 .inherits = &ata_sff_port_ops,
29032 .sff_data_xfer = winbond_data_xfer,
29033 .cable_detect = ata_cable_40wire,
29034 diff --git a/drivers/ata/pdc_adma.c b/drivers/ata/pdc_adma.c
29035 index 6c65b07..f996ec7 100644
29036 --- a/drivers/ata/pdc_adma.c
29037 +++ b/drivers/ata/pdc_adma.c
29038 @@ -145,7 +145,7 @@ static struct scsi_host_template adma_ata_sht = {
29039 .dma_boundary = ADMA_DMA_BOUNDARY,
29040 };
29041
29042 -static struct ata_port_operations adma_ata_ops = {
29043 +static const struct ata_port_operations adma_ata_ops = {
29044 .inherits = &ata_sff_port_ops,
29045
29046 .lost_interrupt = ATA_OP_NULL,
29047 diff --git a/drivers/ata/sata_fsl.c b/drivers/ata/sata_fsl.c
29048 index 172b57e..c49bc1e 100644
29049 --- a/drivers/ata/sata_fsl.c
29050 +++ b/drivers/ata/sata_fsl.c
29051 @@ -1258,7 +1258,7 @@ static struct scsi_host_template sata_fsl_sht = {
29052 .dma_boundary = ATA_DMA_BOUNDARY,
29053 };
29054
29055 -static struct ata_port_operations sata_fsl_ops = {
29056 +static const struct ata_port_operations sata_fsl_ops = {
29057 .inherits = &sata_pmp_port_ops,
29058
29059 .qc_defer = ata_std_qc_defer,
29060 diff --git a/drivers/ata/sata_inic162x.c b/drivers/ata/sata_inic162x.c
29061 index 4406902..60603ef 100644
29062 --- a/drivers/ata/sata_inic162x.c
29063 +++ b/drivers/ata/sata_inic162x.c
29064 @@ -721,7 +721,7 @@ static int inic_port_start(struct ata_port *ap)
29065 return 0;
29066 }
29067
29068 -static struct ata_port_operations inic_port_ops = {
29069 +static const struct ata_port_operations inic_port_ops = {
29070 .inherits = &sata_port_ops,
29071
29072 .check_atapi_dma = inic_check_atapi_dma,
29073 diff --git a/drivers/ata/sata_mv.c b/drivers/ata/sata_mv.c
29074 index cf41126..8107be6 100644
29075 --- a/drivers/ata/sata_mv.c
29076 +++ b/drivers/ata/sata_mv.c
29077 @@ -656,7 +656,7 @@ static struct scsi_host_template mv6_sht = {
29078 .dma_boundary = MV_DMA_BOUNDARY,
29079 };
29080
29081 -static struct ata_port_operations mv5_ops = {
29082 +static const struct ata_port_operations mv5_ops = {
29083 .inherits = &ata_sff_port_ops,
29084
29085 .lost_interrupt = ATA_OP_NULL,
29086 @@ -678,7 +678,7 @@ static struct ata_port_operations mv5_ops = {
29087 .port_stop = mv_port_stop,
29088 };
29089
29090 -static struct ata_port_operations mv6_ops = {
29091 +static const struct ata_port_operations mv6_ops = {
29092 .inherits = &mv5_ops,
29093 .dev_config = mv6_dev_config,
29094 .scr_read = mv_scr_read,
29095 @@ -698,7 +698,7 @@ static struct ata_port_operations mv6_ops = {
29096 .bmdma_status = mv_bmdma_status,
29097 };
29098
29099 -static struct ata_port_operations mv_iie_ops = {
29100 +static const struct ata_port_operations mv_iie_ops = {
29101 .inherits = &mv6_ops,
29102 .dev_config = ATA_OP_NULL,
29103 .qc_prep = mv_qc_prep_iie,
29104 diff --git a/drivers/ata/sata_nv.c b/drivers/ata/sata_nv.c
29105 index ae2297c..d5c9c33 100644
29106 --- a/drivers/ata/sata_nv.c
29107 +++ b/drivers/ata/sata_nv.c
29108 @@ -464,7 +464,7 @@ static struct scsi_host_template nv_swncq_sht = {
29109 * cases. Define nv_hardreset() which only kicks in for post-boot
29110 * probing and use it for all variants.
29111 */
29112 -static struct ata_port_operations nv_generic_ops = {
29113 +static const struct ata_port_operations nv_generic_ops = {
29114 .inherits = &ata_bmdma_port_ops,
29115 .lost_interrupt = ATA_OP_NULL,
29116 .scr_read = nv_scr_read,
29117 @@ -472,20 +472,20 @@ static struct ata_port_operations nv_generic_ops = {
29118 .hardreset = nv_hardreset,
29119 };
29120
29121 -static struct ata_port_operations nv_nf2_ops = {
29122 +static const struct ata_port_operations nv_nf2_ops = {
29123 .inherits = &nv_generic_ops,
29124 .freeze = nv_nf2_freeze,
29125 .thaw = nv_nf2_thaw,
29126 };
29127
29128 -static struct ata_port_operations nv_ck804_ops = {
29129 +static const struct ata_port_operations nv_ck804_ops = {
29130 .inherits = &nv_generic_ops,
29131 .freeze = nv_ck804_freeze,
29132 .thaw = nv_ck804_thaw,
29133 .host_stop = nv_ck804_host_stop,
29134 };
29135
29136 -static struct ata_port_operations nv_adma_ops = {
29137 +static const struct ata_port_operations nv_adma_ops = {
29138 .inherits = &nv_ck804_ops,
29139
29140 .check_atapi_dma = nv_adma_check_atapi_dma,
29141 @@ -509,7 +509,7 @@ static struct ata_port_operations nv_adma_ops = {
29142 .host_stop = nv_adma_host_stop,
29143 };
29144
29145 -static struct ata_port_operations nv_swncq_ops = {
29146 +static const struct ata_port_operations nv_swncq_ops = {
29147 .inherits = &nv_generic_ops,
29148
29149 .qc_defer = ata_std_qc_defer,
29150 diff --git a/drivers/ata/sata_promise.c b/drivers/ata/sata_promise.c
29151 index 07d8d00..6cc70bb 100644
29152 --- a/drivers/ata/sata_promise.c
29153 +++ b/drivers/ata/sata_promise.c
29154 @@ -195,7 +195,7 @@ static const struct ata_port_operations pdc_common_ops = {
29155 .error_handler = pdc_error_handler,
29156 };
29157
29158 -static struct ata_port_operations pdc_sata_ops = {
29159 +static const struct ata_port_operations pdc_sata_ops = {
29160 .inherits = &pdc_common_ops,
29161 .cable_detect = pdc_sata_cable_detect,
29162 .freeze = pdc_sata_freeze,
29163 @@ -208,14 +208,14 @@ static struct ata_port_operations pdc_sata_ops = {
29164
29165 /* First-generation chips need a more restrictive ->check_atapi_dma op,
29166 and ->freeze/thaw that ignore the hotplug controls. */
29167 -static struct ata_port_operations pdc_old_sata_ops = {
29168 +static const struct ata_port_operations pdc_old_sata_ops = {
29169 .inherits = &pdc_sata_ops,
29170 .freeze = pdc_freeze,
29171 .thaw = pdc_thaw,
29172 .check_atapi_dma = pdc_old_sata_check_atapi_dma,
29173 };
29174
29175 -static struct ata_port_operations pdc_pata_ops = {
29176 +static const struct ata_port_operations pdc_pata_ops = {
29177 .inherits = &pdc_common_ops,
29178 .cable_detect = pdc_pata_cable_detect,
29179 .freeze = pdc_freeze,
29180 diff --git a/drivers/ata/sata_qstor.c b/drivers/ata/sata_qstor.c
29181 index 326c0cf..36ecebe 100644
29182 --- a/drivers/ata/sata_qstor.c
29183 +++ b/drivers/ata/sata_qstor.c
29184 @@ -132,7 +132,7 @@ static struct scsi_host_template qs_ata_sht = {
29185 .dma_boundary = QS_DMA_BOUNDARY,
29186 };
29187
29188 -static struct ata_port_operations qs_ata_ops = {
29189 +static const struct ata_port_operations qs_ata_ops = {
29190 .inherits = &ata_sff_port_ops,
29191
29192 .check_atapi_dma = qs_check_atapi_dma,
29193 diff --git a/drivers/ata/sata_sil.c b/drivers/ata/sata_sil.c
29194 index 3cb69d5..0871d3c 100644
29195 --- a/drivers/ata/sata_sil.c
29196 +++ b/drivers/ata/sata_sil.c
29197 @@ -182,7 +182,7 @@ static struct scsi_host_template sil_sht = {
29198 .sg_tablesize = ATA_MAX_PRD
29199 };
29200
29201 -static struct ata_port_operations sil_ops = {
29202 +static const struct ata_port_operations sil_ops = {
29203 .inherits = &ata_bmdma32_port_ops,
29204 .dev_config = sil_dev_config,
29205 .set_mode = sil_set_mode,
29206 diff --git a/drivers/ata/sata_sil24.c b/drivers/ata/sata_sil24.c
29207 index e6946fc..eddb794 100644
29208 --- a/drivers/ata/sata_sil24.c
29209 +++ b/drivers/ata/sata_sil24.c
29210 @@ -388,7 +388,7 @@ static struct scsi_host_template sil24_sht = {
29211 .dma_boundary = ATA_DMA_BOUNDARY,
29212 };
29213
29214 -static struct ata_port_operations sil24_ops = {
29215 +static const struct ata_port_operations sil24_ops = {
29216 .inherits = &sata_pmp_port_ops,
29217
29218 .qc_defer = sil24_qc_defer,
29219 diff --git a/drivers/ata/sata_sis.c b/drivers/ata/sata_sis.c
29220 index f8a91bf..9cb06b6 100644
29221 --- a/drivers/ata/sata_sis.c
29222 +++ b/drivers/ata/sata_sis.c
29223 @@ -89,7 +89,7 @@ static struct scsi_host_template sis_sht = {
29224 ATA_BMDMA_SHT(DRV_NAME),
29225 };
29226
29227 -static struct ata_port_operations sis_ops = {
29228 +static const struct ata_port_operations sis_ops = {
29229 .inherits = &ata_bmdma_port_ops,
29230 .scr_read = sis_scr_read,
29231 .scr_write = sis_scr_write,
29232 diff --git a/drivers/ata/sata_svw.c b/drivers/ata/sata_svw.c
29233 index 7257f2d..d04c6f5 100644
29234 --- a/drivers/ata/sata_svw.c
29235 +++ b/drivers/ata/sata_svw.c
29236 @@ -344,7 +344,7 @@ static struct scsi_host_template k2_sata_sht = {
29237 };
29238
29239
29240 -static struct ata_port_operations k2_sata_ops = {
29241 +static const struct ata_port_operations k2_sata_ops = {
29242 .inherits = &ata_bmdma_port_ops,
29243 .sff_tf_load = k2_sata_tf_load,
29244 .sff_tf_read = k2_sata_tf_read,
29245 diff --git a/drivers/ata/sata_sx4.c b/drivers/ata/sata_sx4.c
29246 index bbcf970..cd0df0d 100644
29247 --- a/drivers/ata/sata_sx4.c
29248 +++ b/drivers/ata/sata_sx4.c
29249 @@ -248,7 +248,7 @@ static struct scsi_host_template pdc_sata_sht = {
29250 };
29251
29252 /* TODO: inherit from base port_ops after converting to new EH */
29253 -static struct ata_port_operations pdc_20621_ops = {
29254 +static const struct ata_port_operations pdc_20621_ops = {
29255 .inherits = &ata_sff_port_ops,
29256
29257 .check_atapi_dma = pdc_check_atapi_dma,
29258 diff --git a/drivers/ata/sata_uli.c b/drivers/ata/sata_uli.c
29259 index e5bff47..089d859 100644
29260 --- a/drivers/ata/sata_uli.c
29261 +++ b/drivers/ata/sata_uli.c
29262 @@ -79,7 +79,7 @@ static struct scsi_host_template uli_sht = {
29263 ATA_BMDMA_SHT(DRV_NAME),
29264 };
29265
29266 -static struct ata_port_operations uli_ops = {
29267 +static const struct ata_port_operations uli_ops = {
29268 .inherits = &ata_bmdma_port_ops,
29269 .scr_read = uli_scr_read,
29270 .scr_write = uli_scr_write,
29271 diff --git a/drivers/ata/sata_via.c b/drivers/ata/sata_via.c
29272 index f5dcca7..77b94eb 100644
29273 --- a/drivers/ata/sata_via.c
29274 +++ b/drivers/ata/sata_via.c
29275 @@ -115,32 +115,32 @@ static struct scsi_host_template svia_sht = {
29276 ATA_BMDMA_SHT(DRV_NAME),
29277 };
29278
29279 -static struct ata_port_operations svia_base_ops = {
29280 +static const struct ata_port_operations svia_base_ops = {
29281 .inherits = &ata_bmdma_port_ops,
29282 .sff_tf_load = svia_tf_load,
29283 };
29284
29285 -static struct ata_port_operations vt6420_sata_ops = {
29286 +static const struct ata_port_operations vt6420_sata_ops = {
29287 .inherits = &svia_base_ops,
29288 .freeze = svia_noop_freeze,
29289 .prereset = vt6420_prereset,
29290 .bmdma_start = vt6420_bmdma_start,
29291 };
29292
29293 -static struct ata_port_operations vt6421_pata_ops = {
29294 +static const struct ata_port_operations vt6421_pata_ops = {
29295 .inherits = &svia_base_ops,
29296 .cable_detect = vt6421_pata_cable_detect,
29297 .set_piomode = vt6421_set_pio_mode,
29298 .set_dmamode = vt6421_set_dma_mode,
29299 };
29300
29301 -static struct ata_port_operations vt6421_sata_ops = {
29302 +static const struct ata_port_operations vt6421_sata_ops = {
29303 .inherits = &svia_base_ops,
29304 .scr_read = svia_scr_read,
29305 .scr_write = svia_scr_write,
29306 };
29307
29308 -static struct ata_port_operations vt8251_ops = {
29309 +static const struct ata_port_operations vt8251_ops = {
29310 .inherits = &svia_base_ops,
29311 .hardreset = sata_std_hardreset,
29312 .scr_read = vt8251_scr_read,
29313 diff --git a/drivers/ata/sata_vsc.c b/drivers/ata/sata_vsc.c
29314 index 8b2a278..51e65d3 100644
29315 --- a/drivers/ata/sata_vsc.c
29316 +++ b/drivers/ata/sata_vsc.c
29317 @@ -306,7 +306,7 @@ static struct scsi_host_template vsc_sata_sht = {
29318 };
29319
29320
29321 -static struct ata_port_operations vsc_sata_ops = {
29322 +static const struct ata_port_operations vsc_sata_ops = {
29323 .inherits = &ata_bmdma_port_ops,
29324 /* The IRQ handling is not quite standard SFF behaviour so we
29325 cannot use the default lost interrupt handler */
29326 diff --git a/drivers/atm/adummy.c b/drivers/atm/adummy.c
29327 index 5effec6..7e4019a 100644
29328 --- a/drivers/atm/adummy.c
29329 +++ b/drivers/atm/adummy.c
29330 @@ -77,7 +77,7 @@ adummy_send(struct atm_vcc *vcc, struct sk_buff *skb)
29331 vcc->pop(vcc, skb);
29332 else
29333 dev_kfree_skb_any(skb);
29334 - atomic_inc(&vcc->stats->tx);
29335 + atomic_inc_unchecked(&vcc->stats->tx);
29336
29337 return 0;
29338 }
29339 diff --git a/drivers/atm/ambassador.c b/drivers/atm/ambassador.c
29340 index 66e1813..26a27c6 100644
29341 --- a/drivers/atm/ambassador.c
29342 +++ b/drivers/atm/ambassador.c
29343 @@ -453,7 +453,7 @@ static void tx_complete (amb_dev * dev, tx_out * tx) {
29344 PRINTD (DBG_FLOW|DBG_TX, "tx_complete %p %p", dev, tx);
29345
29346 // VC layer stats
29347 - atomic_inc(&ATM_SKB(skb)->vcc->stats->tx);
29348 + atomic_inc_unchecked(&ATM_SKB(skb)->vcc->stats->tx);
29349
29350 // free the descriptor
29351 kfree (tx_descr);
29352 @@ -494,7 +494,7 @@ static void rx_complete (amb_dev * dev, rx_out * rx) {
29353 dump_skb ("<<<", vc, skb);
29354
29355 // VC layer stats
29356 - atomic_inc(&atm_vcc->stats->rx);
29357 + atomic_inc_unchecked(&atm_vcc->stats->rx);
29358 __net_timestamp(skb);
29359 // end of our responsability
29360 atm_vcc->push (atm_vcc, skb);
29361 @@ -509,7 +509,7 @@ static void rx_complete (amb_dev * dev, rx_out * rx) {
29362 } else {
29363 PRINTK (KERN_INFO, "dropped over-size frame");
29364 // should we count this?
29365 - atomic_inc(&atm_vcc->stats->rx_drop);
29366 + atomic_inc_unchecked(&atm_vcc->stats->rx_drop);
29367 }
29368
29369 } else {
29370 @@ -1341,7 +1341,7 @@ static int amb_send (struct atm_vcc * atm_vcc, struct sk_buff * skb) {
29371 }
29372
29373 if (check_area (skb->data, skb->len)) {
29374 - atomic_inc(&atm_vcc->stats->tx_err);
29375 + atomic_inc_unchecked(&atm_vcc->stats->tx_err);
29376 return -ENOMEM; // ?
29377 }
29378
29379 diff --git a/drivers/atm/atmtcp.c b/drivers/atm/atmtcp.c
29380 index 02ad83d..6daffeb 100644
29381 --- a/drivers/atm/atmtcp.c
29382 +++ b/drivers/atm/atmtcp.c
29383 @@ -206,7 +206,7 @@ static int atmtcp_v_send(struct atm_vcc *vcc,struct sk_buff *skb)
29384 if (vcc->pop) vcc->pop(vcc,skb);
29385 else dev_kfree_skb(skb);
29386 if (dev_data) return 0;
29387 - atomic_inc(&vcc->stats->tx_err);
29388 + atomic_inc_unchecked(&vcc->stats->tx_err);
29389 return -ENOLINK;
29390 }
29391 size = skb->len+sizeof(struct atmtcp_hdr);
29392 @@ -214,7 +214,7 @@ static int atmtcp_v_send(struct atm_vcc *vcc,struct sk_buff *skb)
29393 if (!new_skb) {
29394 if (vcc->pop) vcc->pop(vcc,skb);
29395 else dev_kfree_skb(skb);
29396 - atomic_inc(&vcc->stats->tx_err);
29397 + atomic_inc_unchecked(&vcc->stats->tx_err);
29398 return -ENOBUFS;
29399 }
29400 hdr = (void *) skb_put(new_skb,sizeof(struct atmtcp_hdr));
29401 @@ -225,8 +225,8 @@ static int atmtcp_v_send(struct atm_vcc *vcc,struct sk_buff *skb)
29402 if (vcc->pop) vcc->pop(vcc,skb);
29403 else dev_kfree_skb(skb);
29404 out_vcc->push(out_vcc,new_skb);
29405 - atomic_inc(&vcc->stats->tx);
29406 - atomic_inc(&out_vcc->stats->rx);
29407 + atomic_inc_unchecked(&vcc->stats->tx);
29408 + atomic_inc_unchecked(&out_vcc->stats->rx);
29409 return 0;
29410 }
29411
29412 @@ -300,7 +300,7 @@ static int atmtcp_c_send(struct atm_vcc *vcc,struct sk_buff *skb)
29413 out_vcc = find_vcc(dev, ntohs(hdr->vpi), ntohs(hdr->vci));
29414 read_unlock(&vcc_sklist_lock);
29415 if (!out_vcc) {
29416 - atomic_inc(&vcc->stats->tx_err);
29417 + atomic_inc_unchecked(&vcc->stats->tx_err);
29418 goto done;
29419 }
29420 skb_pull(skb,sizeof(struct atmtcp_hdr));
29421 @@ -312,8 +312,8 @@ static int atmtcp_c_send(struct atm_vcc *vcc,struct sk_buff *skb)
29422 __net_timestamp(new_skb);
29423 skb_copy_from_linear_data(skb, skb_put(new_skb, skb->len), skb->len);
29424 out_vcc->push(out_vcc,new_skb);
29425 - atomic_inc(&vcc->stats->tx);
29426 - atomic_inc(&out_vcc->stats->rx);
29427 + atomic_inc_unchecked(&vcc->stats->tx);
29428 + atomic_inc_unchecked(&out_vcc->stats->rx);
29429 done:
29430 if (vcc->pop) vcc->pop(vcc,skb);
29431 else dev_kfree_skb(skb);
29432 diff --git a/drivers/atm/eni.c b/drivers/atm/eni.c
29433 index 0c30261..3da356e 100644
29434 --- a/drivers/atm/eni.c
29435 +++ b/drivers/atm/eni.c
29436 @@ -525,7 +525,7 @@ static int rx_aal0(struct atm_vcc *vcc)
29437 DPRINTK(DEV_LABEL "(itf %d): trashing empty cell\n",
29438 vcc->dev->number);
29439 length = 0;
29440 - atomic_inc(&vcc->stats->rx_err);
29441 + atomic_inc_unchecked(&vcc->stats->rx_err);
29442 }
29443 else {
29444 length = ATM_CELL_SIZE-1; /* no HEC */
29445 @@ -580,7 +580,7 @@ static int rx_aal5(struct atm_vcc *vcc)
29446 size);
29447 }
29448 eff = length = 0;
29449 - atomic_inc(&vcc->stats->rx_err);
29450 + atomic_inc_unchecked(&vcc->stats->rx_err);
29451 }
29452 else {
29453 size = (descr & MID_RED_COUNT)*(ATM_CELL_PAYLOAD >> 2);
29454 @@ -597,7 +597,7 @@ static int rx_aal5(struct atm_vcc *vcc)
29455 "(VCI=%d,length=%ld,size=%ld (descr 0x%lx))\n",
29456 vcc->dev->number,vcc->vci,length,size << 2,descr);
29457 length = eff = 0;
29458 - atomic_inc(&vcc->stats->rx_err);
29459 + atomic_inc_unchecked(&vcc->stats->rx_err);
29460 }
29461 }
29462 skb = eff ? atm_alloc_charge(vcc,eff << 2,GFP_ATOMIC) : NULL;
29463 @@ -770,7 +770,7 @@ rx_dequeued++;
29464 vcc->push(vcc,skb);
29465 pushed++;
29466 }
29467 - atomic_inc(&vcc->stats->rx);
29468 + atomic_inc_unchecked(&vcc->stats->rx);
29469 }
29470 wake_up(&eni_dev->rx_wait);
29471 }
29472 @@ -1227,7 +1227,7 @@ static void dequeue_tx(struct atm_dev *dev)
29473 PCI_DMA_TODEVICE);
29474 if (vcc->pop) vcc->pop(vcc,skb);
29475 else dev_kfree_skb_irq(skb);
29476 - atomic_inc(&vcc->stats->tx);
29477 + atomic_inc_unchecked(&vcc->stats->tx);
29478 wake_up(&eni_dev->tx_wait);
29479 dma_complete++;
29480 }
29481 @@ -1570,7 +1570,7 @@ tx_complete++;
29482 /*--------------------------------- entries ---------------------------------*/
29483
29484
29485 -static const char *media_name[] __devinitdata = {
29486 +static const char *media_name[] __devinitconst = {
29487 "MMF", "SMF", "MMF", "03?", /* 0- 3 */
29488 "UTP", "05?", "06?", "07?", /* 4- 7 */
29489 "TAXI","09?", "10?", "11?", /* 8-11 */
29490 diff --git a/drivers/atm/firestream.c b/drivers/atm/firestream.c
29491 index cd5049a..a51209f 100644
29492 --- a/drivers/atm/firestream.c
29493 +++ b/drivers/atm/firestream.c
29494 @@ -748,7 +748,7 @@ static void process_txdone_queue (struct fs_dev *dev, struct queue *q)
29495 }
29496 }
29497
29498 - atomic_inc(&ATM_SKB(skb)->vcc->stats->tx);
29499 + atomic_inc_unchecked(&ATM_SKB(skb)->vcc->stats->tx);
29500
29501 fs_dprintk (FS_DEBUG_TXMEM, "i");
29502 fs_dprintk (FS_DEBUG_ALLOC, "Free t-skb: %p\n", skb);
29503 @@ -815,7 +815,7 @@ static void process_incoming (struct fs_dev *dev, struct queue *q)
29504 #endif
29505 skb_put (skb, qe->p1 & 0xffff);
29506 ATM_SKB(skb)->vcc = atm_vcc;
29507 - atomic_inc(&atm_vcc->stats->rx);
29508 + atomic_inc_unchecked(&atm_vcc->stats->rx);
29509 __net_timestamp(skb);
29510 fs_dprintk (FS_DEBUG_ALLOC, "Free rec-skb: %p (pushed)\n", skb);
29511 atm_vcc->push (atm_vcc, skb);
29512 @@ -836,12 +836,12 @@ static void process_incoming (struct fs_dev *dev, struct queue *q)
29513 kfree (pe);
29514 }
29515 if (atm_vcc)
29516 - atomic_inc(&atm_vcc->stats->rx_drop);
29517 + atomic_inc_unchecked(&atm_vcc->stats->rx_drop);
29518 break;
29519 case 0x1f: /* Reassembly abort: no buffers. */
29520 /* Silently increment error counter. */
29521 if (atm_vcc)
29522 - atomic_inc(&atm_vcc->stats->rx_drop);
29523 + atomic_inc_unchecked(&atm_vcc->stats->rx_drop);
29524 break;
29525 default: /* Hmm. Haven't written the code to handle the others yet... -- REW */
29526 printk (KERN_WARNING "Don't know what to do with RX status %x: %s.\n",
29527 diff --git a/drivers/atm/fore200e.c b/drivers/atm/fore200e.c
29528 index f766cc4..a34002e 100644
29529 --- a/drivers/atm/fore200e.c
29530 +++ b/drivers/atm/fore200e.c
29531 @@ -931,9 +931,9 @@ fore200e_tx_irq(struct fore200e* fore200e)
29532 #endif
29533 /* check error condition */
29534 if (*entry->status & STATUS_ERROR)
29535 - atomic_inc(&vcc->stats->tx_err);
29536 + atomic_inc_unchecked(&vcc->stats->tx_err);
29537 else
29538 - atomic_inc(&vcc->stats->tx);
29539 + atomic_inc_unchecked(&vcc->stats->tx);
29540 }
29541 }
29542
29543 @@ -1082,7 +1082,7 @@ fore200e_push_rpd(struct fore200e* fore200e, struct atm_vcc* vcc, struct rpd* rp
29544 if (skb == NULL) {
29545 DPRINTK(2, "unable to alloc new skb, rx PDU length = %d\n", pdu_len);
29546
29547 - atomic_inc(&vcc->stats->rx_drop);
29548 + atomic_inc_unchecked(&vcc->stats->rx_drop);
29549 return -ENOMEM;
29550 }
29551
29552 @@ -1125,14 +1125,14 @@ fore200e_push_rpd(struct fore200e* fore200e, struct atm_vcc* vcc, struct rpd* rp
29553
29554 dev_kfree_skb_any(skb);
29555
29556 - atomic_inc(&vcc->stats->rx_drop);
29557 + atomic_inc_unchecked(&vcc->stats->rx_drop);
29558 return -ENOMEM;
29559 }
29560
29561 ASSERT(atomic_read(&sk_atm(vcc)->sk_wmem_alloc) >= 0);
29562
29563 vcc->push(vcc, skb);
29564 - atomic_inc(&vcc->stats->rx);
29565 + atomic_inc_unchecked(&vcc->stats->rx);
29566
29567 ASSERT(atomic_read(&sk_atm(vcc)->sk_wmem_alloc) >= 0);
29568
29569 @@ -1210,7 +1210,7 @@ fore200e_rx_irq(struct fore200e* fore200e)
29570 DPRINTK(2, "damaged PDU on %d.%d.%d\n",
29571 fore200e->atm_dev->number,
29572 entry->rpd->atm_header.vpi, entry->rpd->atm_header.vci);
29573 - atomic_inc(&vcc->stats->rx_err);
29574 + atomic_inc_unchecked(&vcc->stats->rx_err);
29575 }
29576 }
29577
29578 @@ -1655,7 +1655,7 @@ fore200e_send(struct atm_vcc *vcc, struct sk_buff *skb)
29579 goto retry_here;
29580 }
29581
29582 - atomic_inc(&vcc->stats->tx_err);
29583 + atomic_inc_unchecked(&vcc->stats->tx_err);
29584
29585 fore200e->tx_sat++;
29586 DPRINTK(2, "tx queue of device %s is saturated, PDU dropped - heartbeat is %08x\n",
29587 diff --git a/drivers/atm/he.c b/drivers/atm/he.c
29588 index 7066703..2b130de 100644
29589 --- a/drivers/atm/he.c
29590 +++ b/drivers/atm/he.c
29591 @@ -1769,7 +1769,7 @@ he_service_rbrq(struct he_dev *he_dev, int group)
29592
29593 if (RBRQ_HBUF_ERR(he_dev->rbrq_head)) {
29594 hprintk("HBUF_ERR! (cid 0x%x)\n", cid);
29595 - atomic_inc(&vcc->stats->rx_drop);
29596 + atomic_inc_unchecked(&vcc->stats->rx_drop);
29597 goto return_host_buffers;
29598 }
29599
29600 @@ -1802,7 +1802,7 @@ he_service_rbrq(struct he_dev *he_dev, int group)
29601 RBRQ_LEN_ERR(he_dev->rbrq_head)
29602 ? "LEN_ERR" : "",
29603 vcc->vpi, vcc->vci);
29604 - atomic_inc(&vcc->stats->rx_err);
29605 + atomic_inc_unchecked(&vcc->stats->rx_err);
29606 goto return_host_buffers;
29607 }
29608
29609 @@ -1861,7 +1861,7 @@ he_service_rbrq(struct he_dev *he_dev, int group)
29610 vcc->push(vcc, skb);
29611 spin_lock(&he_dev->global_lock);
29612
29613 - atomic_inc(&vcc->stats->rx);
29614 + atomic_inc_unchecked(&vcc->stats->rx);
29615
29616 return_host_buffers:
29617 ++pdus_assembled;
29618 @@ -2206,7 +2206,7 @@ __enqueue_tpd(struct he_dev *he_dev, struct he_tpd *tpd, unsigned cid)
29619 tpd->vcc->pop(tpd->vcc, tpd->skb);
29620 else
29621 dev_kfree_skb_any(tpd->skb);
29622 - atomic_inc(&tpd->vcc->stats->tx_err);
29623 + atomic_inc_unchecked(&tpd->vcc->stats->tx_err);
29624 }
29625 pci_pool_free(he_dev->tpd_pool, tpd, TPD_ADDR(tpd->status));
29626 return;
29627 @@ -2618,7 +2618,7 @@ he_send(struct atm_vcc *vcc, struct sk_buff *skb)
29628 vcc->pop(vcc, skb);
29629 else
29630 dev_kfree_skb_any(skb);
29631 - atomic_inc(&vcc->stats->tx_err);
29632 + atomic_inc_unchecked(&vcc->stats->tx_err);
29633 return -EINVAL;
29634 }
29635
29636 @@ -2629,7 +2629,7 @@ he_send(struct atm_vcc *vcc, struct sk_buff *skb)
29637 vcc->pop(vcc, skb);
29638 else
29639 dev_kfree_skb_any(skb);
29640 - atomic_inc(&vcc->stats->tx_err);
29641 + atomic_inc_unchecked(&vcc->stats->tx_err);
29642 return -EINVAL;
29643 }
29644 #endif
29645 @@ -2641,7 +2641,7 @@ he_send(struct atm_vcc *vcc, struct sk_buff *skb)
29646 vcc->pop(vcc, skb);
29647 else
29648 dev_kfree_skb_any(skb);
29649 - atomic_inc(&vcc->stats->tx_err);
29650 + atomic_inc_unchecked(&vcc->stats->tx_err);
29651 spin_unlock_irqrestore(&he_dev->global_lock, flags);
29652 return -ENOMEM;
29653 }
29654 @@ -2683,7 +2683,7 @@ he_send(struct atm_vcc *vcc, struct sk_buff *skb)
29655 vcc->pop(vcc, skb);
29656 else
29657 dev_kfree_skb_any(skb);
29658 - atomic_inc(&vcc->stats->tx_err);
29659 + atomic_inc_unchecked(&vcc->stats->tx_err);
29660 spin_unlock_irqrestore(&he_dev->global_lock, flags);
29661 return -ENOMEM;
29662 }
29663 @@ -2714,7 +2714,7 @@ he_send(struct atm_vcc *vcc, struct sk_buff *skb)
29664 __enqueue_tpd(he_dev, tpd, cid);
29665 spin_unlock_irqrestore(&he_dev->global_lock, flags);
29666
29667 - atomic_inc(&vcc->stats->tx);
29668 + atomic_inc_unchecked(&vcc->stats->tx);
29669
29670 return 0;
29671 }
29672 diff --git a/drivers/atm/horizon.c b/drivers/atm/horizon.c
29673 index 4e49021..01b1512 100644
29674 --- a/drivers/atm/horizon.c
29675 +++ b/drivers/atm/horizon.c
29676 @@ -1033,7 +1033,7 @@ static void rx_schedule (hrz_dev * dev, int irq) {
29677 {
29678 struct atm_vcc * vcc = ATM_SKB(skb)->vcc;
29679 // VC layer stats
29680 - atomic_inc(&vcc->stats->rx);
29681 + atomic_inc_unchecked(&vcc->stats->rx);
29682 __net_timestamp(skb);
29683 // end of our responsability
29684 vcc->push (vcc, skb);
29685 @@ -1185,7 +1185,7 @@ static void tx_schedule (hrz_dev * const dev, int irq) {
29686 dev->tx_iovec = NULL;
29687
29688 // VC layer stats
29689 - atomic_inc(&ATM_SKB(skb)->vcc->stats->tx);
29690 + atomic_inc_unchecked(&ATM_SKB(skb)->vcc->stats->tx);
29691
29692 // free the skb
29693 hrz_kfree_skb (skb);
29694 diff --git a/drivers/atm/idt77252.c b/drivers/atm/idt77252.c
29695 index e33ae00..9deb4ab 100644
29696 --- a/drivers/atm/idt77252.c
29697 +++ b/drivers/atm/idt77252.c
29698 @@ -810,7 +810,7 @@ drain_scq(struct idt77252_dev *card, struct vc_map *vc)
29699 else
29700 dev_kfree_skb(skb);
29701
29702 - atomic_inc(&vcc->stats->tx);
29703 + atomic_inc_unchecked(&vcc->stats->tx);
29704 }
29705
29706 atomic_dec(&scq->used);
29707 @@ -1073,13 +1073,13 @@ dequeue_rx(struct idt77252_dev *card, struct rsq_entry *rsqe)
29708 if ((sb = dev_alloc_skb(64)) == NULL) {
29709 printk("%s: Can't allocate buffers for aal0.\n",
29710 card->name);
29711 - atomic_add(i, &vcc->stats->rx_drop);
29712 + atomic_add_unchecked(i, &vcc->stats->rx_drop);
29713 break;
29714 }
29715 if (!atm_charge(vcc, sb->truesize)) {
29716 RXPRINTK("%s: atm_charge() dropped aal0 packets.\n",
29717 card->name);
29718 - atomic_add(i - 1, &vcc->stats->rx_drop);
29719 + atomic_add_unchecked(i - 1, &vcc->stats->rx_drop);
29720 dev_kfree_skb(sb);
29721 break;
29722 }
29723 @@ -1096,7 +1096,7 @@ dequeue_rx(struct idt77252_dev *card, struct rsq_entry *rsqe)
29724 ATM_SKB(sb)->vcc = vcc;
29725 __net_timestamp(sb);
29726 vcc->push(vcc, sb);
29727 - atomic_inc(&vcc->stats->rx);
29728 + atomic_inc_unchecked(&vcc->stats->rx);
29729
29730 cell += ATM_CELL_PAYLOAD;
29731 }
29732 @@ -1133,13 +1133,13 @@ dequeue_rx(struct idt77252_dev *card, struct rsq_entry *rsqe)
29733 "(CDC: %08x)\n",
29734 card->name, len, rpp->len, readl(SAR_REG_CDC));
29735 recycle_rx_pool_skb(card, rpp);
29736 - atomic_inc(&vcc->stats->rx_err);
29737 + atomic_inc_unchecked(&vcc->stats->rx_err);
29738 return;
29739 }
29740 if (stat & SAR_RSQE_CRC) {
29741 RXPRINTK("%s: AAL5 CRC error.\n", card->name);
29742 recycle_rx_pool_skb(card, rpp);
29743 - atomic_inc(&vcc->stats->rx_err);
29744 + atomic_inc_unchecked(&vcc->stats->rx_err);
29745 return;
29746 }
29747 if (skb_queue_len(&rpp->queue) > 1) {
29748 @@ -1150,7 +1150,7 @@ dequeue_rx(struct idt77252_dev *card, struct rsq_entry *rsqe)
29749 RXPRINTK("%s: Can't alloc RX skb.\n",
29750 card->name);
29751 recycle_rx_pool_skb(card, rpp);
29752 - atomic_inc(&vcc->stats->rx_err);
29753 + atomic_inc_unchecked(&vcc->stats->rx_err);
29754 return;
29755 }
29756 if (!atm_charge(vcc, skb->truesize)) {
29757 @@ -1169,7 +1169,7 @@ dequeue_rx(struct idt77252_dev *card, struct rsq_entry *rsqe)
29758 __net_timestamp(skb);
29759
29760 vcc->push(vcc, skb);
29761 - atomic_inc(&vcc->stats->rx);
29762 + atomic_inc_unchecked(&vcc->stats->rx);
29763
29764 return;
29765 }
29766 @@ -1191,7 +1191,7 @@ dequeue_rx(struct idt77252_dev *card, struct rsq_entry *rsqe)
29767 __net_timestamp(skb);
29768
29769 vcc->push(vcc, skb);
29770 - atomic_inc(&vcc->stats->rx);
29771 + atomic_inc_unchecked(&vcc->stats->rx);
29772
29773 if (skb->truesize > SAR_FB_SIZE_3)
29774 add_rx_skb(card, 3, SAR_FB_SIZE_3, 1);
29775 @@ -1303,14 +1303,14 @@ idt77252_rx_raw(struct idt77252_dev *card)
29776 if (vcc->qos.aal != ATM_AAL0) {
29777 RPRINTK("%s: raw cell for non AAL0 vc %u.%u\n",
29778 card->name, vpi, vci);
29779 - atomic_inc(&vcc->stats->rx_drop);
29780 + atomic_inc_unchecked(&vcc->stats->rx_drop);
29781 goto drop;
29782 }
29783
29784 if ((sb = dev_alloc_skb(64)) == NULL) {
29785 printk("%s: Can't allocate buffers for AAL0.\n",
29786 card->name);
29787 - atomic_inc(&vcc->stats->rx_err);
29788 + atomic_inc_unchecked(&vcc->stats->rx_err);
29789 goto drop;
29790 }
29791
29792 @@ -1329,7 +1329,7 @@ idt77252_rx_raw(struct idt77252_dev *card)
29793 ATM_SKB(sb)->vcc = vcc;
29794 __net_timestamp(sb);
29795 vcc->push(vcc, sb);
29796 - atomic_inc(&vcc->stats->rx);
29797 + atomic_inc_unchecked(&vcc->stats->rx);
29798
29799 drop:
29800 skb_pull(queue, 64);
29801 @@ -1954,13 +1954,13 @@ idt77252_send_skb(struct atm_vcc *vcc, struct sk_buff *skb, int oam)
29802
29803 if (vc == NULL) {
29804 printk("%s: NULL connection in send().\n", card->name);
29805 - atomic_inc(&vcc->stats->tx_err);
29806 + atomic_inc_unchecked(&vcc->stats->tx_err);
29807 dev_kfree_skb(skb);
29808 return -EINVAL;
29809 }
29810 if (!test_bit(VCF_TX, &vc->flags)) {
29811 printk("%s: Trying to transmit on a non-tx VC.\n", card->name);
29812 - atomic_inc(&vcc->stats->tx_err);
29813 + atomic_inc_unchecked(&vcc->stats->tx_err);
29814 dev_kfree_skb(skb);
29815 return -EINVAL;
29816 }
29817 @@ -1972,14 +1972,14 @@ idt77252_send_skb(struct atm_vcc *vcc, struct sk_buff *skb, int oam)
29818 break;
29819 default:
29820 printk("%s: Unsupported AAL: %d\n", card->name, vcc->qos.aal);
29821 - atomic_inc(&vcc->stats->tx_err);
29822 + atomic_inc_unchecked(&vcc->stats->tx_err);
29823 dev_kfree_skb(skb);
29824 return -EINVAL;
29825 }
29826
29827 if (skb_shinfo(skb)->nr_frags != 0) {
29828 printk("%s: No scatter-gather yet.\n", card->name);
29829 - atomic_inc(&vcc->stats->tx_err);
29830 + atomic_inc_unchecked(&vcc->stats->tx_err);
29831 dev_kfree_skb(skb);
29832 return -EINVAL;
29833 }
29834 @@ -1987,7 +1987,7 @@ idt77252_send_skb(struct atm_vcc *vcc, struct sk_buff *skb, int oam)
29835
29836 err = queue_skb(card, vc, skb, oam);
29837 if (err) {
29838 - atomic_inc(&vcc->stats->tx_err);
29839 + atomic_inc_unchecked(&vcc->stats->tx_err);
29840 dev_kfree_skb(skb);
29841 return err;
29842 }
29843 @@ -2010,7 +2010,7 @@ idt77252_send_oam(struct atm_vcc *vcc, void *cell, int flags)
29844 skb = dev_alloc_skb(64);
29845 if (!skb) {
29846 printk("%s: Out of memory in send_oam().\n", card->name);
29847 - atomic_inc(&vcc->stats->tx_err);
29848 + atomic_inc_unchecked(&vcc->stats->tx_err);
29849 return -ENOMEM;
29850 }
29851 atomic_add(skb->truesize, &sk_atm(vcc)->sk_wmem_alloc);
29852 diff --git a/drivers/atm/iphase.c b/drivers/atm/iphase.c
29853 index b2c1b37..faa672b 100644
29854 --- a/drivers/atm/iphase.c
29855 +++ b/drivers/atm/iphase.c
29856 @@ -1123,7 +1123,7 @@ static int rx_pkt(struct atm_dev *dev)
29857 status = (u_short) (buf_desc_ptr->desc_mode);
29858 if (status & (RX_CER | RX_PTE | RX_OFL))
29859 {
29860 - atomic_inc(&vcc->stats->rx_err);
29861 + atomic_inc_unchecked(&vcc->stats->rx_err);
29862 IF_ERR(printk("IA: bad packet, dropping it");)
29863 if (status & RX_CER) {
29864 IF_ERR(printk(" cause: packet CRC error\n");)
29865 @@ -1146,7 +1146,7 @@ static int rx_pkt(struct atm_dev *dev)
29866 len = dma_addr - buf_addr;
29867 if (len > iadev->rx_buf_sz) {
29868 printk("Over %d bytes sdu received, dropped!!!\n", iadev->rx_buf_sz);
29869 - atomic_inc(&vcc->stats->rx_err);
29870 + atomic_inc_unchecked(&vcc->stats->rx_err);
29871 goto out_free_desc;
29872 }
29873
29874 @@ -1296,7 +1296,7 @@ static void rx_dle_intr(struct atm_dev *dev)
29875 ia_vcc = INPH_IA_VCC(vcc);
29876 if (ia_vcc == NULL)
29877 {
29878 - atomic_inc(&vcc->stats->rx_err);
29879 + atomic_inc_unchecked(&vcc->stats->rx_err);
29880 dev_kfree_skb_any(skb);
29881 atm_return(vcc, atm_guess_pdu2truesize(len));
29882 goto INCR_DLE;
29883 @@ -1308,7 +1308,7 @@ static void rx_dle_intr(struct atm_dev *dev)
29884 if ((length > iadev->rx_buf_sz) || (length >
29885 (skb->len - sizeof(struct cpcs_trailer))))
29886 {
29887 - atomic_inc(&vcc->stats->rx_err);
29888 + atomic_inc_unchecked(&vcc->stats->rx_err);
29889 IF_ERR(printk("rx_dle_intr: Bad AAL5 trailer %d (skb len %d)",
29890 length, skb->len);)
29891 dev_kfree_skb_any(skb);
29892 @@ -1324,7 +1324,7 @@ static void rx_dle_intr(struct atm_dev *dev)
29893
29894 IF_RX(printk("rx_dle_intr: skb push");)
29895 vcc->push(vcc,skb);
29896 - atomic_inc(&vcc->stats->rx);
29897 + atomic_inc_unchecked(&vcc->stats->rx);
29898 iadev->rx_pkt_cnt++;
29899 }
29900 INCR_DLE:
29901 @@ -2806,15 +2806,15 @@ static int ia_ioctl(struct atm_dev *dev, unsigned int cmd, void __user *arg)
29902 {
29903 struct k_sonet_stats *stats;
29904 stats = &PRIV(_ia_dev[board])->sonet_stats;
29905 - printk("section_bip: %d\n", atomic_read(&stats->section_bip));
29906 - printk("line_bip : %d\n", atomic_read(&stats->line_bip));
29907 - printk("path_bip : %d\n", atomic_read(&stats->path_bip));
29908 - printk("line_febe : %d\n", atomic_read(&stats->line_febe));
29909 - printk("path_febe : %d\n", atomic_read(&stats->path_febe));
29910 - printk("corr_hcs : %d\n", atomic_read(&stats->corr_hcs));
29911 - printk("uncorr_hcs : %d\n", atomic_read(&stats->uncorr_hcs));
29912 - printk("tx_cells : %d\n", atomic_read(&stats->tx_cells));
29913 - printk("rx_cells : %d\n", atomic_read(&stats->rx_cells));
29914 + printk("section_bip: %d\n", atomic_read_unchecked(&stats->section_bip));
29915 + printk("line_bip : %d\n", atomic_read_unchecked(&stats->line_bip));
29916 + printk("path_bip : %d\n", atomic_read_unchecked(&stats->path_bip));
29917 + printk("line_febe : %d\n", atomic_read_unchecked(&stats->line_febe));
29918 + printk("path_febe : %d\n", atomic_read_unchecked(&stats->path_febe));
29919 + printk("corr_hcs : %d\n", atomic_read_unchecked(&stats->corr_hcs));
29920 + printk("uncorr_hcs : %d\n", atomic_read_unchecked(&stats->uncorr_hcs));
29921 + printk("tx_cells : %d\n", atomic_read_unchecked(&stats->tx_cells));
29922 + printk("rx_cells : %d\n", atomic_read_unchecked(&stats->rx_cells));
29923 }
29924 ia_cmds.status = 0;
29925 break;
29926 @@ -2919,7 +2919,7 @@ static int ia_pkt_tx (struct atm_vcc *vcc, struct sk_buff *skb) {
29927 if ((desc == 0) || (desc > iadev->num_tx_desc))
29928 {
29929 IF_ERR(printk(DEV_LABEL "invalid desc for send: %d\n", desc);)
29930 - atomic_inc(&vcc->stats->tx);
29931 + atomic_inc_unchecked(&vcc->stats->tx);
29932 if (vcc->pop)
29933 vcc->pop(vcc, skb);
29934 else
29935 @@ -3024,14 +3024,14 @@ static int ia_pkt_tx (struct atm_vcc *vcc, struct sk_buff *skb) {
29936 ATM_DESC(skb) = vcc->vci;
29937 skb_queue_tail(&iadev->tx_dma_q, skb);
29938
29939 - atomic_inc(&vcc->stats->tx);
29940 + atomic_inc_unchecked(&vcc->stats->tx);
29941 iadev->tx_pkt_cnt++;
29942 /* Increment transaction counter */
29943 writel(2, iadev->dma+IPHASE5575_TX_COUNTER);
29944
29945 #if 0
29946 /* add flow control logic */
29947 - if (atomic_read(&vcc->stats->tx) % 20 == 0) {
29948 + if (atomic_read_unchecked(&vcc->stats->tx) % 20 == 0) {
29949 if (iavcc->vc_desc_cnt > 10) {
29950 vcc->tx_quota = vcc->tx_quota * 3 / 4;
29951 printk("Tx1: vcc->tx_quota = %d \n", (u32)vcc->tx_quota );
29952 diff --git a/drivers/atm/lanai.c b/drivers/atm/lanai.c
29953 index cf97c34..8d30655 100644
29954 --- a/drivers/atm/lanai.c
29955 +++ b/drivers/atm/lanai.c
29956 @@ -1305,7 +1305,7 @@ static void lanai_send_one_aal5(struct lanai_dev *lanai,
29957 vcc_tx_add_aal5_trailer(lvcc, skb->len, 0, 0);
29958 lanai_endtx(lanai, lvcc);
29959 lanai_free_skb(lvcc->tx.atmvcc, skb);
29960 - atomic_inc(&lvcc->tx.atmvcc->stats->tx);
29961 + atomic_inc_unchecked(&lvcc->tx.atmvcc->stats->tx);
29962 }
29963
29964 /* Try to fill the buffer - don't call unless there is backlog */
29965 @@ -1428,7 +1428,7 @@ static void vcc_rx_aal5(struct lanai_vcc *lvcc, int endptr)
29966 ATM_SKB(skb)->vcc = lvcc->rx.atmvcc;
29967 __net_timestamp(skb);
29968 lvcc->rx.atmvcc->push(lvcc->rx.atmvcc, skb);
29969 - atomic_inc(&lvcc->rx.atmvcc->stats->rx);
29970 + atomic_inc_unchecked(&lvcc->rx.atmvcc->stats->rx);
29971 out:
29972 lvcc->rx.buf.ptr = end;
29973 cardvcc_write(lvcc, endptr, vcc_rxreadptr);
29974 @@ -1670,7 +1670,7 @@ static int handle_service(struct lanai_dev *lanai, u32 s)
29975 DPRINTK("(itf %d) got RX service entry 0x%X for non-AAL5 "
29976 "vcc %d\n", lanai->number, (unsigned int) s, vci);
29977 lanai->stats.service_rxnotaal5++;
29978 - atomic_inc(&lvcc->rx.atmvcc->stats->rx_err);
29979 + atomic_inc_unchecked(&lvcc->rx.atmvcc->stats->rx_err);
29980 return 0;
29981 }
29982 if (likely(!(s & (SERVICE_TRASH | SERVICE_STREAM | SERVICE_CRCERR)))) {
29983 @@ -1682,7 +1682,7 @@ static int handle_service(struct lanai_dev *lanai, u32 s)
29984 int bytes;
29985 read_unlock(&vcc_sklist_lock);
29986 DPRINTK("got trashed rx pdu on vci %d\n", vci);
29987 - atomic_inc(&lvcc->rx.atmvcc->stats->rx_err);
29988 + atomic_inc_unchecked(&lvcc->rx.atmvcc->stats->rx_err);
29989 lvcc->stats.x.aal5.service_trash++;
29990 bytes = (SERVICE_GET_END(s) * 16) -
29991 (((unsigned long) lvcc->rx.buf.ptr) -
29992 @@ -1694,7 +1694,7 @@ static int handle_service(struct lanai_dev *lanai, u32 s)
29993 }
29994 if (s & SERVICE_STREAM) {
29995 read_unlock(&vcc_sklist_lock);
29996 - atomic_inc(&lvcc->rx.atmvcc->stats->rx_err);
29997 + atomic_inc_unchecked(&lvcc->rx.atmvcc->stats->rx_err);
29998 lvcc->stats.x.aal5.service_stream++;
29999 printk(KERN_ERR DEV_LABEL "(itf %d): Got AAL5 stream "
30000 "PDU on VCI %d!\n", lanai->number, vci);
30001 @@ -1702,7 +1702,7 @@ static int handle_service(struct lanai_dev *lanai, u32 s)
30002 return 0;
30003 }
30004 DPRINTK("got rx crc error on vci %d\n", vci);
30005 - atomic_inc(&lvcc->rx.atmvcc->stats->rx_err);
30006 + atomic_inc_unchecked(&lvcc->rx.atmvcc->stats->rx_err);
30007 lvcc->stats.x.aal5.service_rxcrc++;
30008 lvcc->rx.buf.ptr = &lvcc->rx.buf.start[SERVICE_GET_END(s) * 4];
30009 cardvcc_write(lvcc, SERVICE_GET_END(s), vcc_rxreadptr);
30010 diff --git a/drivers/atm/nicstar.c b/drivers/atm/nicstar.c
30011 index 3da804b..d3b0eed 100644
30012 --- a/drivers/atm/nicstar.c
30013 +++ b/drivers/atm/nicstar.c
30014 @@ -1723,7 +1723,7 @@ static int ns_send(struct atm_vcc *vcc, struct sk_buff *skb)
30015 if ((vc = (vc_map *) vcc->dev_data) == NULL)
30016 {
30017 printk("nicstar%d: vcc->dev_data == NULL on ns_send().\n", card->index);
30018 - atomic_inc(&vcc->stats->tx_err);
30019 + atomic_inc_unchecked(&vcc->stats->tx_err);
30020 dev_kfree_skb_any(skb);
30021 return -EINVAL;
30022 }
30023 @@ -1731,7 +1731,7 @@ static int ns_send(struct atm_vcc *vcc, struct sk_buff *skb)
30024 if (!vc->tx)
30025 {
30026 printk("nicstar%d: Trying to transmit on a non-tx VC.\n", card->index);
30027 - atomic_inc(&vcc->stats->tx_err);
30028 + atomic_inc_unchecked(&vcc->stats->tx_err);
30029 dev_kfree_skb_any(skb);
30030 return -EINVAL;
30031 }
30032 @@ -1739,7 +1739,7 @@ static int ns_send(struct atm_vcc *vcc, struct sk_buff *skb)
30033 if (vcc->qos.aal != ATM_AAL5 && vcc->qos.aal != ATM_AAL0)
30034 {
30035 printk("nicstar%d: Only AAL0 and AAL5 are supported.\n", card->index);
30036 - atomic_inc(&vcc->stats->tx_err);
30037 + atomic_inc_unchecked(&vcc->stats->tx_err);
30038 dev_kfree_skb_any(skb);
30039 return -EINVAL;
30040 }
30041 @@ -1747,7 +1747,7 @@ static int ns_send(struct atm_vcc *vcc, struct sk_buff *skb)
30042 if (skb_shinfo(skb)->nr_frags != 0)
30043 {
30044 printk("nicstar%d: No scatter-gather yet.\n", card->index);
30045 - atomic_inc(&vcc->stats->tx_err);
30046 + atomic_inc_unchecked(&vcc->stats->tx_err);
30047 dev_kfree_skb_any(skb);
30048 return -EINVAL;
30049 }
30050 @@ -1792,11 +1792,11 @@ static int ns_send(struct atm_vcc *vcc, struct sk_buff *skb)
30051
30052 if (push_scqe(card, vc, scq, &scqe, skb) != 0)
30053 {
30054 - atomic_inc(&vcc->stats->tx_err);
30055 + atomic_inc_unchecked(&vcc->stats->tx_err);
30056 dev_kfree_skb_any(skb);
30057 return -EIO;
30058 }
30059 - atomic_inc(&vcc->stats->tx);
30060 + atomic_inc_unchecked(&vcc->stats->tx);
30061
30062 return 0;
30063 }
30064 @@ -2111,14 +2111,14 @@ static void dequeue_rx(ns_dev *card, ns_rsqe *rsqe)
30065 {
30066 printk("nicstar%d: Can't allocate buffers for aal0.\n",
30067 card->index);
30068 - atomic_add(i,&vcc->stats->rx_drop);
30069 + atomic_add_unchecked(i,&vcc->stats->rx_drop);
30070 break;
30071 }
30072 if (!atm_charge(vcc, sb->truesize))
30073 {
30074 RXPRINTK("nicstar%d: atm_charge() dropped aal0 packets.\n",
30075 card->index);
30076 - atomic_add(i-1,&vcc->stats->rx_drop); /* already increased by 1 */
30077 + atomic_add_unchecked(i-1,&vcc->stats->rx_drop); /* already increased by 1 */
30078 dev_kfree_skb_any(sb);
30079 break;
30080 }
30081 @@ -2133,7 +2133,7 @@ static void dequeue_rx(ns_dev *card, ns_rsqe *rsqe)
30082 ATM_SKB(sb)->vcc = vcc;
30083 __net_timestamp(sb);
30084 vcc->push(vcc, sb);
30085 - atomic_inc(&vcc->stats->rx);
30086 + atomic_inc_unchecked(&vcc->stats->rx);
30087 cell += ATM_CELL_PAYLOAD;
30088 }
30089
30090 @@ -2152,7 +2152,7 @@ static void dequeue_rx(ns_dev *card, ns_rsqe *rsqe)
30091 if (iovb == NULL)
30092 {
30093 printk("nicstar%d: Out of iovec buffers.\n", card->index);
30094 - atomic_inc(&vcc->stats->rx_drop);
30095 + atomic_inc_unchecked(&vcc->stats->rx_drop);
30096 recycle_rx_buf(card, skb);
30097 return;
30098 }
30099 @@ -2182,7 +2182,7 @@ static void dequeue_rx(ns_dev *card, ns_rsqe *rsqe)
30100 else if (NS_SKB(iovb)->iovcnt >= NS_MAX_IOVECS)
30101 {
30102 printk("nicstar%d: received too big AAL5 SDU.\n", card->index);
30103 - atomic_inc(&vcc->stats->rx_err);
30104 + atomic_inc_unchecked(&vcc->stats->rx_err);
30105 recycle_iovec_rx_bufs(card, (struct iovec *) iovb->data, NS_MAX_IOVECS);
30106 NS_SKB(iovb)->iovcnt = 0;
30107 iovb->len = 0;
30108 @@ -2202,7 +2202,7 @@ static void dequeue_rx(ns_dev *card, ns_rsqe *rsqe)
30109 printk("nicstar%d: Expected a small buffer, and this is not one.\n",
30110 card->index);
30111 which_list(card, skb);
30112 - atomic_inc(&vcc->stats->rx_err);
30113 + atomic_inc_unchecked(&vcc->stats->rx_err);
30114 recycle_rx_buf(card, skb);
30115 vc->rx_iov = NULL;
30116 recycle_iov_buf(card, iovb);
30117 @@ -2216,7 +2216,7 @@ static void dequeue_rx(ns_dev *card, ns_rsqe *rsqe)
30118 printk("nicstar%d: Expected a large buffer, and this is not one.\n",
30119 card->index);
30120 which_list(card, skb);
30121 - atomic_inc(&vcc->stats->rx_err);
30122 + atomic_inc_unchecked(&vcc->stats->rx_err);
30123 recycle_iovec_rx_bufs(card, (struct iovec *) iovb->data,
30124 NS_SKB(iovb)->iovcnt);
30125 vc->rx_iov = NULL;
30126 @@ -2240,7 +2240,7 @@ static void dequeue_rx(ns_dev *card, ns_rsqe *rsqe)
30127 printk(" - PDU size mismatch.\n");
30128 else
30129 printk(".\n");
30130 - atomic_inc(&vcc->stats->rx_err);
30131 + atomic_inc_unchecked(&vcc->stats->rx_err);
30132 recycle_iovec_rx_bufs(card, (struct iovec *) iovb->data,
30133 NS_SKB(iovb)->iovcnt);
30134 vc->rx_iov = NULL;
30135 @@ -2256,7 +2256,7 @@ static void dequeue_rx(ns_dev *card, ns_rsqe *rsqe)
30136 if (!atm_charge(vcc, skb->truesize))
30137 {
30138 push_rxbufs(card, skb);
30139 - atomic_inc(&vcc->stats->rx_drop);
30140 + atomic_inc_unchecked(&vcc->stats->rx_drop);
30141 }
30142 else
30143 {
30144 @@ -2268,7 +2268,7 @@ static void dequeue_rx(ns_dev *card, ns_rsqe *rsqe)
30145 ATM_SKB(skb)->vcc = vcc;
30146 __net_timestamp(skb);
30147 vcc->push(vcc, skb);
30148 - atomic_inc(&vcc->stats->rx);
30149 + atomic_inc_unchecked(&vcc->stats->rx);
30150 }
30151 }
30152 else if (NS_SKB(iovb)->iovcnt == 2) /* One small plus one large buffer */
30153 @@ -2283,7 +2283,7 @@ static void dequeue_rx(ns_dev *card, ns_rsqe *rsqe)
30154 if (!atm_charge(vcc, sb->truesize))
30155 {
30156 push_rxbufs(card, sb);
30157 - atomic_inc(&vcc->stats->rx_drop);
30158 + atomic_inc_unchecked(&vcc->stats->rx_drop);
30159 }
30160 else
30161 {
30162 @@ -2295,7 +2295,7 @@ static void dequeue_rx(ns_dev *card, ns_rsqe *rsqe)
30163 ATM_SKB(sb)->vcc = vcc;
30164 __net_timestamp(sb);
30165 vcc->push(vcc, sb);
30166 - atomic_inc(&vcc->stats->rx);
30167 + atomic_inc_unchecked(&vcc->stats->rx);
30168 }
30169
30170 push_rxbufs(card, skb);
30171 @@ -2306,7 +2306,7 @@ static void dequeue_rx(ns_dev *card, ns_rsqe *rsqe)
30172 if (!atm_charge(vcc, skb->truesize))
30173 {
30174 push_rxbufs(card, skb);
30175 - atomic_inc(&vcc->stats->rx_drop);
30176 + atomic_inc_unchecked(&vcc->stats->rx_drop);
30177 }
30178 else
30179 {
30180 @@ -2320,7 +2320,7 @@ static void dequeue_rx(ns_dev *card, ns_rsqe *rsqe)
30181 ATM_SKB(skb)->vcc = vcc;
30182 __net_timestamp(skb);
30183 vcc->push(vcc, skb);
30184 - atomic_inc(&vcc->stats->rx);
30185 + atomic_inc_unchecked(&vcc->stats->rx);
30186 }
30187
30188 push_rxbufs(card, sb);
30189 @@ -2342,7 +2342,7 @@ static void dequeue_rx(ns_dev *card, ns_rsqe *rsqe)
30190 if (hb == NULL)
30191 {
30192 printk("nicstar%d: Out of huge buffers.\n", card->index);
30193 - atomic_inc(&vcc->stats->rx_drop);
30194 + atomic_inc_unchecked(&vcc->stats->rx_drop);
30195 recycle_iovec_rx_bufs(card, (struct iovec *) iovb->data,
30196 NS_SKB(iovb)->iovcnt);
30197 vc->rx_iov = NULL;
30198 @@ -2393,7 +2393,7 @@ static void dequeue_rx(ns_dev *card, ns_rsqe *rsqe)
30199 }
30200 else
30201 dev_kfree_skb_any(hb);
30202 - atomic_inc(&vcc->stats->rx_drop);
30203 + atomic_inc_unchecked(&vcc->stats->rx_drop);
30204 }
30205 else
30206 {
30207 @@ -2427,7 +2427,7 @@ static void dequeue_rx(ns_dev *card, ns_rsqe *rsqe)
30208 #endif /* NS_USE_DESTRUCTORS */
30209 __net_timestamp(hb);
30210 vcc->push(vcc, hb);
30211 - atomic_inc(&vcc->stats->rx);
30212 + atomic_inc_unchecked(&vcc->stats->rx);
30213 }
30214 }
30215
30216 diff --git a/drivers/atm/solos-pci.c b/drivers/atm/solos-pci.c
30217 index 84c93ff..e6ed269 100644
30218 --- a/drivers/atm/solos-pci.c
30219 +++ b/drivers/atm/solos-pci.c
30220 @@ -708,7 +708,7 @@ void solos_bh(unsigned long card_arg)
30221 }
30222 atm_charge(vcc, skb->truesize);
30223 vcc->push(vcc, skb);
30224 - atomic_inc(&vcc->stats->rx);
30225 + atomic_inc_unchecked(&vcc->stats->rx);
30226 break;
30227
30228 case PKT_STATUS:
30229 @@ -914,6 +914,8 @@ static int print_buffer(struct sk_buff *buf)
30230 char msg[500];
30231 char item[10];
30232
30233 + pax_track_stack();
30234 +
30235 len = buf->len;
30236 for (i = 0; i < len; i++){
30237 if(i % 8 == 0)
30238 @@ -1023,7 +1025,7 @@ static uint32_t fpga_tx(struct solos_card *card)
30239 vcc = SKB_CB(oldskb)->vcc;
30240
30241 if (vcc) {
30242 - atomic_inc(&vcc->stats->tx);
30243 + atomic_inc_unchecked(&vcc->stats->tx);
30244 solos_pop(vcc, oldskb);
30245 } else
30246 dev_kfree_skb_irq(oldskb);
30247 diff --git a/drivers/atm/suni.c b/drivers/atm/suni.c
30248 index 6dd3f59..ee377f3 100644
30249 --- a/drivers/atm/suni.c
30250 +++ b/drivers/atm/suni.c
30251 @@ -49,8 +49,8 @@ static DEFINE_SPINLOCK(sunis_lock);
30252
30253
30254 #define ADD_LIMITED(s,v) \
30255 - atomic_add((v),&stats->s); \
30256 - if (atomic_read(&stats->s) < 0) atomic_set(&stats->s,INT_MAX);
30257 + atomic_add_unchecked((v),&stats->s); \
30258 + if (atomic_read_unchecked(&stats->s) < 0) atomic_set_unchecked(&stats->s,INT_MAX);
30259
30260
30261 static void suni_hz(unsigned long from_timer)
30262 diff --git a/drivers/atm/uPD98402.c b/drivers/atm/uPD98402.c
30263 index fc8cb07..4a80e53 100644
30264 --- a/drivers/atm/uPD98402.c
30265 +++ b/drivers/atm/uPD98402.c
30266 @@ -41,7 +41,7 @@ static int fetch_stats(struct atm_dev *dev,struct sonet_stats __user *arg,int ze
30267 struct sonet_stats tmp;
30268 int error = 0;
30269
30270 - atomic_add(GET(HECCT),&PRIV(dev)->sonet_stats.uncorr_hcs);
30271 + atomic_add_unchecked(GET(HECCT),&PRIV(dev)->sonet_stats.uncorr_hcs);
30272 sonet_copy_stats(&PRIV(dev)->sonet_stats,&tmp);
30273 if (arg) error = copy_to_user(arg,&tmp,sizeof(tmp));
30274 if (zero && !error) {
30275 @@ -160,9 +160,9 @@ static int uPD98402_ioctl(struct atm_dev *dev,unsigned int cmd,void __user *arg)
30276
30277
30278 #define ADD_LIMITED(s,v) \
30279 - { atomic_add(GET(v),&PRIV(dev)->sonet_stats.s); \
30280 - if (atomic_read(&PRIV(dev)->sonet_stats.s) < 0) \
30281 - atomic_set(&PRIV(dev)->sonet_stats.s,INT_MAX); }
30282 + { atomic_add_unchecked(GET(v),&PRIV(dev)->sonet_stats.s); \
30283 + if (atomic_read_unchecked(&PRIV(dev)->sonet_stats.s) < 0) \
30284 + atomic_set_unchecked(&PRIV(dev)->sonet_stats.s,INT_MAX); }
30285
30286
30287 static void stat_event(struct atm_dev *dev)
30288 @@ -193,7 +193,7 @@ static void uPD98402_int(struct atm_dev *dev)
30289 if (reason & uPD98402_INT_PFM) stat_event(dev);
30290 if (reason & uPD98402_INT_PCO) {
30291 (void) GET(PCOCR); /* clear interrupt cause */
30292 - atomic_add(GET(HECCT),
30293 + atomic_add_unchecked(GET(HECCT),
30294 &PRIV(dev)->sonet_stats.uncorr_hcs);
30295 }
30296 if ((reason & uPD98402_INT_RFO) &&
30297 @@ -221,9 +221,9 @@ static int uPD98402_start(struct atm_dev *dev)
30298 PUT(~(uPD98402_INT_PFM | uPD98402_INT_ALM | uPD98402_INT_RFO |
30299 uPD98402_INT_LOS),PIMR); /* enable them */
30300 (void) fetch_stats(dev,NULL,1); /* clear kernel counters */
30301 - atomic_set(&PRIV(dev)->sonet_stats.corr_hcs,-1);
30302 - atomic_set(&PRIV(dev)->sonet_stats.tx_cells,-1);
30303 - atomic_set(&PRIV(dev)->sonet_stats.rx_cells,-1);
30304 + atomic_set_unchecked(&PRIV(dev)->sonet_stats.corr_hcs,-1);
30305 + atomic_set_unchecked(&PRIV(dev)->sonet_stats.tx_cells,-1);
30306 + atomic_set_unchecked(&PRIV(dev)->sonet_stats.rx_cells,-1);
30307 return 0;
30308 }
30309
30310 diff --git a/drivers/atm/zatm.c b/drivers/atm/zatm.c
30311 index 2e9635b..32927b4 100644
30312 --- a/drivers/atm/zatm.c
30313 +++ b/drivers/atm/zatm.c
30314 @@ -458,7 +458,7 @@ printk("dummy: 0x%08lx, 0x%08lx\n",dummy[0],dummy[1]);
30315 }
30316 if (!size) {
30317 dev_kfree_skb_irq(skb);
30318 - if (vcc) atomic_inc(&vcc->stats->rx_err);
30319 + if (vcc) atomic_inc_unchecked(&vcc->stats->rx_err);
30320 continue;
30321 }
30322 if (!atm_charge(vcc,skb->truesize)) {
30323 @@ -468,7 +468,7 @@ printk("dummy: 0x%08lx, 0x%08lx\n",dummy[0],dummy[1]);
30324 skb->len = size;
30325 ATM_SKB(skb)->vcc = vcc;
30326 vcc->push(vcc,skb);
30327 - atomic_inc(&vcc->stats->rx);
30328 + atomic_inc_unchecked(&vcc->stats->rx);
30329 }
30330 zout(pos & 0xffff,MTA(mbx));
30331 #if 0 /* probably a stupid idea */
30332 @@ -732,7 +732,7 @@ if (*ZATM_PRV_DSC(skb) != (uPD98401_TXPD_V | uPD98401_TXPD_DP |
30333 skb_queue_head(&zatm_vcc->backlog,skb);
30334 break;
30335 }
30336 - atomic_inc(&vcc->stats->tx);
30337 + atomic_inc_unchecked(&vcc->stats->tx);
30338 wake_up(&zatm_vcc->tx_wait);
30339 }
30340
30341 diff --git a/drivers/base/bus.c b/drivers/base/bus.c
30342 index 63c143e..fece183 100644
30343 --- a/drivers/base/bus.c
30344 +++ b/drivers/base/bus.c
30345 @@ -70,7 +70,7 @@ static ssize_t drv_attr_store(struct kobject *kobj, struct attribute *attr,
30346 return ret;
30347 }
30348
30349 -static struct sysfs_ops driver_sysfs_ops = {
30350 +static const struct sysfs_ops driver_sysfs_ops = {
30351 .show = drv_attr_show,
30352 .store = drv_attr_store,
30353 };
30354 @@ -115,7 +115,7 @@ static ssize_t bus_attr_store(struct kobject *kobj, struct attribute *attr,
30355 return ret;
30356 }
30357
30358 -static struct sysfs_ops bus_sysfs_ops = {
30359 +static const struct sysfs_ops bus_sysfs_ops = {
30360 .show = bus_attr_show,
30361 .store = bus_attr_store,
30362 };
30363 @@ -154,7 +154,7 @@ static int bus_uevent_filter(struct kset *kset, struct kobject *kobj)
30364 return 0;
30365 }
30366
30367 -static struct kset_uevent_ops bus_uevent_ops = {
30368 +static const struct kset_uevent_ops bus_uevent_ops = {
30369 .filter = bus_uevent_filter,
30370 };
30371
30372 diff --git a/drivers/base/class.c b/drivers/base/class.c
30373 index 6e2c3b0..cb61871 100644
30374 --- a/drivers/base/class.c
30375 +++ b/drivers/base/class.c
30376 @@ -63,7 +63,7 @@ static void class_release(struct kobject *kobj)
30377 kfree(cp);
30378 }
30379
30380 -static struct sysfs_ops class_sysfs_ops = {
30381 +static const struct sysfs_ops class_sysfs_ops = {
30382 .show = class_attr_show,
30383 .store = class_attr_store,
30384 };
30385 diff --git a/drivers/base/core.c b/drivers/base/core.c
30386 index f33d768..a9358d0 100644
30387 --- a/drivers/base/core.c
30388 +++ b/drivers/base/core.c
30389 @@ -100,7 +100,7 @@ static ssize_t dev_attr_store(struct kobject *kobj, struct attribute *attr,
30390 return ret;
30391 }
30392
30393 -static struct sysfs_ops dev_sysfs_ops = {
30394 +static const struct sysfs_ops dev_sysfs_ops = {
30395 .show = dev_attr_show,
30396 .store = dev_attr_store,
30397 };
30398 @@ -252,7 +252,7 @@ static int dev_uevent(struct kset *kset, struct kobject *kobj,
30399 return retval;
30400 }
30401
30402 -static struct kset_uevent_ops device_uevent_ops = {
30403 +static const struct kset_uevent_ops device_uevent_ops = {
30404 .filter = dev_uevent_filter,
30405 .name = dev_uevent_name,
30406 .uevent = dev_uevent,
30407 diff --git a/drivers/base/memory.c b/drivers/base/memory.c
30408 index 989429c..2272b00 100644
30409 --- a/drivers/base/memory.c
30410 +++ b/drivers/base/memory.c
30411 @@ -44,7 +44,7 @@ static int memory_uevent(struct kset *kset, struct kobject *obj, struct kobj_uev
30412 return retval;
30413 }
30414
30415 -static struct kset_uevent_ops memory_uevent_ops = {
30416 +static const struct kset_uevent_ops memory_uevent_ops = {
30417 .name = memory_uevent_name,
30418 .uevent = memory_uevent,
30419 };
30420 diff --git a/drivers/base/sys.c b/drivers/base/sys.c
30421 index 3f202f7..61c4a6f 100644
30422 --- a/drivers/base/sys.c
30423 +++ b/drivers/base/sys.c
30424 @@ -54,7 +54,7 @@ sysdev_store(struct kobject *kobj, struct attribute *attr,
30425 return -EIO;
30426 }
30427
30428 -static struct sysfs_ops sysfs_ops = {
30429 +static const struct sysfs_ops sysfs_ops = {
30430 .show = sysdev_show,
30431 .store = sysdev_store,
30432 };
30433 @@ -104,7 +104,7 @@ static ssize_t sysdev_class_store(struct kobject *kobj, struct attribute *attr,
30434 return -EIO;
30435 }
30436
30437 -static struct sysfs_ops sysfs_class_ops = {
30438 +static const struct sysfs_ops sysfs_class_ops = {
30439 .show = sysdev_class_show,
30440 .store = sysdev_class_store,
30441 };
30442 diff --git a/drivers/block/DAC960.c b/drivers/block/DAC960.c
30443 index eb4fa19..1954777 100644
30444 --- a/drivers/block/DAC960.c
30445 +++ b/drivers/block/DAC960.c
30446 @@ -1973,6 +1973,8 @@ static bool DAC960_V1_ReadDeviceConfiguration(DAC960_Controller_T
30447 unsigned long flags;
30448 int Channel, TargetID;
30449
30450 + pax_track_stack();
30451 +
30452 if (!init_dma_loaf(Controller->PCIDevice, &local_dma,
30453 DAC960_V1_MaxChannels*(sizeof(DAC960_V1_DCDB_T) +
30454 sizeof(DAC960_SCSI_Inquiry_T) +
30455 diff --git a/drivers/block/cciss.c b/drivers/block/cciss.c
30456 index ca9c548..7e2e3f3 100644
30457 --- a/drivers/block/cciss.c
30458 +++ b/drivers/block/cciss.c
30459 @@ -1011,6 +1011,8 @@ static int cciss_ioctl32_passthru(struct block_device *bdev, fmode_t mode,
30460 int err;
30461 u32 cp;
30462
30463 + memset(&arg64, 0, sizeof(arg64));
30464 +
30465 err = 0;
30466 err |=
30467 copy_from_user(&arg64.LUN_info, &arg32->LUN_info,
30468 @@ -1583,7 +1585,7 @@ static int cciss_ioctl(struct block_device *bdev, fmode_t mode,
30469 return status;
30470 }
30471
30472 - /* scsi_cmd_ioctl handles these, below, though some are not */
30473 + /* scsi_cmd_blk_ioctl handles these, below, though some are not */
30474 /* very meaningful for cciss. SG_IO is the main one people want. */
30475
30476 case SG_GET_VERSION_NUM:
30477 @@ -1594,9 +1596,9 @@ static int cciss_ioctl(struct block_device *bdev, fmode_t mode,
30478 case SG_EMULATED_HOST:
30479 case SG_IO:
30480 case SCSI_IOCTL_SEND_COMMAND:
30481 - return scsi_cmd_ioctl(disk->queue, disk, mode, cmd, argp);
30482 + return scsi_cmd_blk_ioctl(bdev, mode, cmd, argp);
30483
30484 - /* scsi_cmd_ioctl would normally handle these, below, but */
30485 + /* scsi_cmd_blk_ioctl would normally handle these, below, but */
30486 /* they aren't a good fit for cciss, as CD-ROMs are */
30487 /* not supported, and we don't have any bus/target/lun */
30488 /* which we present to the kernel. */
30489 @@ -2852,7 +2854,7 @@ static unsigned long pollcomplete(int ctlr)
30490 /* Wait (up to 20 seconds) for a command to complete */
30491
30492 for (i = 20 * HZ; i > 0; i--) {
30493 - done = hba[ctlr]->access.command_completed(hba[ctlr]);
30494 + done = hba[ctlr]->access->command_completed(hba[ctlr]);
30495 if (done == FIFO_EMPTY)
30496 schedule_timeout_uninterruptible(1);
30497 else
30498 @@ -2876,7 +2878,7 @@ static int sendcmd_core(ctlr_info_t *h, CommandList_struct *c)
30499 resend_cmd1:
30500
30501 /* Disable interrupt on the board. */
30502 - h->access.set_intr_mask(h, CCISS_INTR_OFF);
30503 + h->access->set_intr_mask(h, CCISS_INTR_OFF);
30504
30505 /* Make sure there is room in the command FIFO */
30506 /* Actually it should be completely empty at this time */
30507 @@ -2884,13 +2886,13 @@ resend_cmd1:
30508 /* tape side of the driver. */
30509 for (i = 200000; i > 0; i--) {
30510 /* if fifo isn't full go */
30511 - if (!(h->access.fifo_full(h)))
30512 + if (!(h->access->fifo_full(h)))
30513 break;
30514 udelay(10);
30515 printk(KERN_WARNING "cciss cciss%d: SendCmd FIFO full,"
30516 " waiting!\n", h->ctlr);
30517 }
30518 - h->access.submit_command(h, c); /* Send the cmd */
30519 + h->access->submit_command(h, c); /* Send the cmd */
30520 do {
30521 complete = pollcomplete(h->ctlr);
30522
30523 @@ -3023,7 +3025,7 @@ static void start_io(ctlr_info_t *h)
30524 while (!hlist_empty(&h->reqQ)) {
30525 c = hlist_entry(h->reqQ.first, CommandList_struct, list);
30526 /* can't do anything if fifo is full */
30527 - if ((h->access.fifo_full(h))) {
30528 + if ((h->access->fifo_full(h))) {
30529 printk(KERN_WARNING "cciss: fifo full\n");
30530 break;
30531 }
30532 @@ -3033,7 +3035,7 @@ static void start_io(ctlr_info_t *h)
30533 h->Qdepth--;
30534
30535 /* Tell the controller execute command */
30536 - h->access.submit_command(h, c);
30537 + h->access->submit_command(h, c);
30538
30539 /* Put job onto the completed Q */
30540 addQ(&h->cmpQ, c);
30541 @@ -3393,17 +3395,17 @@ startio:
30542
30543 static inline unsigned long get_next_completion(ctlr_info_t *h)
30544 {
30545 - return h->access.command_completed(h);
30546 + return h->access->command_completed(h);
30547 }
30548
30549 static inline int interrupt_pending(ctlr_info_t *h)
30550 {
30551 - return h->access.intr_pending(h);
30552 + return h->access->intr_pending(h);
30553 }
30554
30555 static inline long interrupt_not_for_us(ctlr_info_t *h)
30556 {
30557 - return (((h->access.intr_pending(h) == 0) ||
30558 + return (((h->access->intr_pending(h) == 0) ||
30559 (h->interrupts_enabled == 0)));
30560 }
30561
30562 @@ -3892,7 +3894,7 @@ static int __devinit cciss_pci_init(ctlr_info_t *c, struct pci_dev *pdev)
30563 */
30564 c->max_commands = readl(&(c->cfgtable->CmdsOutMax));
30565 c->product_name = products[prod_index].product_name;
30566 - c->access = *(products[prod_index].access);
30567 + c->access = products[prod_index].access;
30568 c->nr_cmds = c->max_commands - 4;
30569 if ((readb(&c->cfgtable->Signature[0]) != 'C') ||
30570 (readb(&c->cfgtable->Signature[1]) != 'I') ||
30571 @@ -4291,7 +4293,7 @@ static int __devinit cciss_init_one(struct pci_dev *pdev,
30572 }
30573
30574 /* make sure the board interrupts are off */
30575 - hba[i]->access.set_intr_mask(hba[i], CCISS_INTR_OFF);
30576 + hba[i]->access->set_intr_mask(hba[i], CCISS_INTR_OFF);
30577 if (request_irq(hba[i]->intr[SIMPLE_MODE_INT], do_cciss_intr,
30578 IRQF_DISABLED | IRQF_SHARED, hba[i]->devname, hba[i])) {
30579 printk(KERN_ERR "cciss: Unable to get irq %d for %s\n",
30580 @@ -4341,7 +4343,7 @@ static int __devinit cciss_init_one(struct pci_dev *pdev,
30581 cciss_scsi_setup(i);
30582
30583 /* Turn the interrupts on so we can service requests */
30584 - hba[i]->access.set_intr_mask(hba[i], CCISS_INTR_ON);
30585 + hba[i]->access->set_intr_mask(hba[i], CCISS_INTR_ON);
30586
30587 /* Get the firmware version */
30588 inq_buff = kzalloc(sizeof(InquiryData_struct), GFP_KERNEL);
30589 diff --git a/drivers/block/cciss.h b/drivers/block/cciss.h
30590 index 04d6bf8..36e712d 100644
30591 --- a/drivers/block/cciss.h
30592 +++ b/drivers/block/cciss.h
30593 @@ -90,7 +90,7 @@ struct ctlr_info
30594 // information about each logical volume
30595 drive_info_struct *drv[CISS_MAX_LUN];
30596
30597 - struct access_method access;
30598 + struct access_method *access;
30599
30600 /* queue and queue Info */
30601 struct hlist_head reqQ;
30602 diff --git a/drivers/block/cpqarray.c b/drivers/block/cpqarray.c
30603 index 6422651..bb1bdef 100644
30604 --- a/drivers/block/cpqarray.c
30605 +++ b/drivers/block/cpqarray.c
30606 @@ -402,7 +402,7 @@ static int __init cpqarray_register_ctlr( int i, struct pci_dev *pdev)
30607 if (register_blkdev(COMPAQ_SMART2_MAJOR+i, hba[i]->devname)) {
30608 goto Enomem4;
30609 }
30610 - hba[i]->access.set_intr_mask(hba[i], 0);
30611 + hba[i]->access->set_intr_mask(hba[i], 0);
30612 if (request_irq(hba[i]->intr, do_ida_intr,
30613 IRQF_DISABLED|IRQF_SHARED, hba[i]->devname, hba[i]))
30614 {
30615 @@ -460,7 +460,7 @@ static int __init cpqarray_register_ctlr( int i, struct pci_dev *pdev)
30616 add_timer(&hba[i]->timer);
30617
30618 /* Enable IRQ now that spinlock and rate limit timer are set up */
30619 - hba[i]->access.set_intr_mask(hba[i], FIFO_NOT_EMPTY);
30620 + hba[i]->access->set_intr_mask(hba[i], FIFO_NOT_EMPTY);
30621
30622 for(j=0; j<NWD; j++) {
30623 struct gendisk *disk = ida_gendisk[i][j];
30624 @@ -695,7 +695,7 @@ DBGINFO(
30625 for(i=0; i<NR_PRODUCTS; i++) {
30626 if (board_id == products[i].board_id) {
30627 c->product_name = products[i].product_name;
30628 - c->access = *(products[i].access);
30629 + c->access = products[i].access;
30630 break;
30631 }
30632 }
30633 @@ -793,7 +793,7 @@ static int __init cpqarray_eisa_detect(void)
30634 hba[ctlr]->intr = intr;
30635 sprintf(hba[ctlr]->devname, "ida%d", nr_ctlr);
30636 hba[ctlr]->product_name = products[j].product_name;
30637 - hba[ctlr]->access = *(products[j].access);
30638 + hba[ctlr]->access = products[j].access;
30639 hba[ctlr]->ctlr = ctlr;
30640 hba[ctlr]->board_id = board_id;
30641 hba[ctlr]->pci_dev = NULL; /* not PCI */
30642 @@ -896,6 +896,8 @@ static void do_ida_request(struct request_queue *q)
30643 struct scatterlist tmp_sg[SG_MAX];
30644 int i, dir, seg;
30645
30646 + pax_track_stack();
30647 +
30648 if (blk_queue_plugged(q))
30649 goto startio;
30650
30651 @@ -968,7 +970,7 @@ static void start_io(ctlr_info_t *h)
30652
30653 while((c = h->reqQ) != NULL) {
30654 /* Can't do anything if we're busy */
30655 - if (h->access.fifo_full(h) == 0)
30656 + if (h->access->fifo_full(h) == 0)
30657 return;
30658
30659 /* Get the first entry from the request Q */
30660 @@ -976,7 +978,7 @@ static void start_io(ctlr_info_t *h)
30661 h->Qdepth--;
30662
30663 /* Tell the controller to do our bidding */
30664 - h->access.submit_command(h, c);
30665 + h->access->submit_command(h, c);
30666
30667 /* Get onto the completion Q */
30668 addQ(&h->cmpQ, c);
30669 @@ -1038,7 +1040,7 @@ static irqreturn_t do_ida_intr(int irq, void *dev_id)
30670 unsigned long flags;
30671 __u32 a,a1;
30672
30673 - istat = h->access.intr_pending(h);
30674 + istat = h->access->intr_pending(h);
30675 /* Is this interrupt for us? */
30676 if (istat == 0)
30677 return IRQ_NONE;
30678 @@ -1049,7 +1051,7 @@ static irqreturn_t do_ida_intr(int irq, void *dev_id)
30679 */
30680 spin_lock_irqsave(IDA_LOCK(h->ctlr), flags);
30681 if (istat & FIFO_NOT_EMPTY) {
30682 - while((a = h->access.command_completed(h))) {
30683 + while((a = h->access->command_completed(h))) {
30684 a1 = a; a &= ~3;
30685 if ((c = h->cmpQ) == NULL)
30686 {
30687 @@ -1434,11 +1436,11 @@ static int sendcmd(
30688 /*
30689 * Disable interrupt
30690 */
30691 - info_p->access.set_intr_mask(info_p, 0);
30692 + info_p->access->set_intr_mask(info_p, 0);
30693 /* Make sure there is room in the command FIFO */
30694 /* Actually it should be completely empty at this time. */
30695 for (i = 200000; i > 0; i--) {
30696 - temp = info_p->access.fifo_full(info_p);
30697 + temp = info_p->access->fifo_full(info_p);
30698 if (temp != 0) {
30699 break;
30700 }
30701 @@ -1451,7 +1453,7 @@ DBG(
30702 /*
30703 * Send the cmd
30704 */
30705 - info_p->access.submit_command(info_p, c);
30706 + info_p->access->submit_command(info_p, c);
30707 complete = pollcomplete(ctlr);
30708
30709 pci_unmap_single(info_p->pci_dev, (dma_addr_t) c->req.sg[0].addr,
30710 @@ -1534,9 +1536,9 @@ static int revalidate_allvol(ctlr_info_t *host)
30711 * we check the new geometry. Then turn interrupts back on when
30712 * we're done.
30713 */
30714 - host->access.set_intr_mask(host, 0);
30715 + host->access->set_intr_mask(host, 0);
30716 getgeometry(ctlr);
30717 - host->access.set_intr_mask(host, FIFO_NOT_EMPTY);
30718 + host->access->set_intr_mask(host, FIFO_NOT_EMPTY);
30719
30720 for(i=0; i<NWD; i++) {
30721 struct gendisk *disk = ida_gendisk[ctlr][i];
30722 @@ -1576,7 +1578,7 @@ static int pollcomplete(int ctlr)
30723 /* Wait (up to 2 seconds) for a command to complete */
30724
30725 for (i = 200000; i > 0; i--) {
30726 - done = hba[ctlr]->access.command_completed(hba[ctlr]);
30727 + done = hba[ctlr]->access->command_completed(hba[ctlr]);
30728 if (done == 0) {
30729 udelay(10); /* a short fixed delay */
30730 } else
30731 diff --git a/drivers/block/cpqarray.h b/drivers/block/cpqarray.h
30732 index be73e9d..7fbf140 100644
30733 --- a/drivers/block/cpqarray.h
30734 +++ b/drivers/block/cpqarray.h
30735 @@ -99,7 +99,7 @@ struct ctlr_info {
30736 drv_info_t drv[NWD];
30737 struct proc_dir_entry *proc;
30738
30739 - struct access_method access;
30740 + struct access_method *access;
30741
30742 cmdlist_t *reqQ;
30743 cmdlist_t *cmpQ;
30744 diff --git a/drivers/block/loop.c b/drivers/block/loop.c
30745 index 8ec2d70..2804b30 100644
30746 --- a/drivers/block/loop.c
30747 +++ b/drivers/block/loop.c
30748 @@ -282,7 +282,7 @@ static int __do_lo_send_write(struct file *file,
30749 mm_segment_t old_fs = get_fs();
30750
30751 set_fs(get_ds());
30752 - bw = file->f_op->write(file, buf, len, &pos);
30753 + bw = file->f_op->write(file, (const char __force_user *)buf, len, &pos);
30754 set_fs(old_fs);
30755 if (likely(bw == len))
30756 return 0;
30757 diff --git a/drivers/block/nbd.c b/drivers/block/nbd.c
30758 index 26ada47..083c480 100644
30759 --- a/drivers/block/nbd.c
30760 +++ b/drivers/block/nbd.c
30761 @@ -155,6 +155,8 @@ static int sock_xmit(struct nbd_device *lo, int send, void *buf, int size,
30762 struct kvec iov;
30763 sigset_t blocked, oldset;
30764
30765 + pax_track_stack();
30766 +
30767 if (unlikely(!sock)) {
30768 printk(KERN_ERR "%s: Attempted %s on closed socket in sock_xmit\n",
30769 lo->disk->disk_name, (send ? "send" : "recv"));
30770 @@ -569,6 +571,8 @@ static void do_nbd_request(struct request_queue *q)
30771 static int __nbd_ioctl(struct block_device *bdev, struct nbd_device *lo,
30772 unsigned int cmd, unsigned long arg)
30773 {
30774 + pax_track_stack();
30775 +
30776 switch (cmd) {
30777 case NBD_DISCONNECT: {
30778 struct request sreq;
30779 diff --git a/drivers/block/pktcdvd.c b/drivers/block/pktcdvd.c
30780 index a5d585d..d087be3 100644
30781 --- a/drivers/block/pktcdvd.c
30782 +++ b/drivers/block/pktcdvd.c
30783 @@ -284,7 +284,7 @@ static ssize_t kobj_pkt_store(struct kobject *kobj,
30784 return len;
30785 }
30786
30787 -static struct sysfs_ops kobj_pkt_ops = {
30788 +static const struct sysfs_ops kobj_pkt_ops = {
30789 .show = kobj_pkt_show,
30790 .store = kobj_pkt_store
30791 };
30792 diff --git a/drivers/block/ub.c b/drivers/block/ub.c
30793 index c739b20..c6ac1b2 100644
30794 --- a/drivers/block/ub.c
30795 +++ b/drivers/block/ub.c
30796 @@ -1726,10 +1726,9 @@ static int ub_bd_release(struct gendisk *disk, fmode_t mode)
30797 static int ub_bd_ioctl(struct block_device *bdev, fmode_t mode,
30798 unsigned int cmd, unsigned long arg)
30799 {
30800 - struct gendisk *disk = bdev->bd_disk;
30801 void __user *usermem = (void __user *) arg;
30802
30803 - return scsi_cmd_ioctl(disk->queue, disk, mode, cmd, usermem);
30804 + return scsi_cmd_blk_ioctl(bdev, mode, cmd, usermem);
30805 }
30806
30807 /*
30808 diff --git a/drivers/block/virtio_blk.c b/drivers/block/virtio_blk.c
30809 index 51042f0ba7..44d019b 100644
30810 --- a/drivers/block/virtio_blk.c
30811 +++ b/drivers/block/virtio_blk.c
30812 @@ -200,8 +200,8 @@ static int virtblk_ioctl(struct block_device *bdev, fmode_t mode,
30813 if (!virtio_has_feature(vblk->vdev, VIRTIO_BLK_F_SCSI))
30814 return -ENOTTY;
30815
30816 - return scsi_cmd_ioctl(disk->queue, disk, mode, cmd,
30817 - (void __user *)data);
30818 + return scsi_cmd_blk_ioctl(bdev, mode, cmd,
30819 + (void __user *)data);
30820 }
30821
30822 /* We provide getgeo only to please some old bootloader/partitioning tools */
30823 diff --git a/drivers/cdrom/cdrom.c b/drivers/cdrom/cdrom.c
30824 index 614da5b..59cccc9 100644
30825 --- a/drivers/cdrom/cdrom.c
30826 +++ b/drivers/cdrom/cdrom.c
30827 @@ -2684,12 +2684,11 @@ int cdrom_ioctl(struct cdrom_device_info *cdi, struct block_device *bdev,
30828 {
30829 void __user *argp = (void __user *)arg;
30830 int ret;
30831 - struct gendisk *disk = bdev->bd_disk;
30832
30833 /*
30834 * Try the generic SCSI command ioctl's first.
30835 */
30836 - ret = scsi_cmd_ioctl(disk->queue, disk, mode, cmd, argp);
30837 + ret = scsi_cmd_blk_ioctl(bdev, mode, cmd, argp);
30838 if (ret != -ENOTTY)
30839 return ret;
30840
30841 diff --git a/drivers/char/Kconfig b/drivers/char/Kconfig
30842 index 6aad99e..89cd142 100644
30843 --- a/drivers/char/Kconfig
30844 +++ b/drivers/char/Kconfig
30845 @@ -90,7 +90,8 @@ config VT_HW_CONSOLE_BINDING
30846
30847 config DEVKMEM
30848 bool "/dev/kmem virtual device support"
30849 - default y
30850 + default n
30851 + depends on !GRKERNSEC_KMEM
30852 help
30853 Say Y here if you want to support the /dev/kmem device. The
30854 /dev/kmem device is rarely used, but can be used for certain
30855 @@ -1114,6 +1115,7 @@ config DEVPORT
30856 bool
30857 depends on !M68K
30858 depends on ISA || PCI
30859 + depends on !GRKERNSEC_KMEM
30860 default y
30861
30862 source "drivers/s390/char/Kconfig"
30863 diff --git a/drivers/char/agp/frontend.c b/drivers/char/agp/frontend.c
30864 index a96f319..a778a5b 100644
30865 --- a/drivers/char/agp/frontend.c
30866 +++ b/drivers/char/agp/frontend.c
30867 @@ -824,7 +824,7 @@ static int agpioc_reserve_wrap(struct agp_file_private *priv, void __user *arg)
30868 if (copy_from_user(&reserve, arg, sizeof(struct agp_region)))
30869 return -EFAULT;
30870
30871 - if ((unsigned) reserve.seg_count >= ~0U/sizeof(struct agp_segment))
30872 + if ((unsigned) reserve.seg_count >= ~0U/sizeof(struct agp_segment_priv))
30873 return -EFAULT;
30874
30875 client = agp_find_client_by_pid(reserve.pid);
30876 diff --git a/drivers/char/briq_panel.c b/drivers/char/briq_panel.c
30877 index d8cff90..9628e70 100644
30878 --- a/drivers/char/briq_panel.c
30879 +++ b/drivers/char/briq_panel.c
30880 @@ -10,6 +10,7 @@
30881 #include <linux/types.h>
30882 #include <linux/errno.h>
30883 #include <linux/tty.h>
30884 +#include <linux/mutex.h>
30885 #include <linux/timer.h>
30886 #include <linux/kernel.h>
30887 #include <linux/wait.h>
30888 @@ -36,6 +37,7 @@ static int vfd_is_open;
30889 static unsigned char vfd[40];
30890 static int vfd_cursor;
30891 static unsigned char ledpb, led;
30892 +static DEFINE_MUTEX(vfd_mutex);
30893
30894 static void update_vfd(void)
30895 {
30896 @@ -142,12 +144,15 @@ static ssize_t briq_panel_write(struct file *file, const char __user *buf, size_
30897 if (!vfd_is_open)
30898 return -EBUSY;
30899
30900 + mutex_lock(&vfd_mutex);
30901 for (;;) {
30902 char c;
30903 if (!indx)
30904 break;
30905 - if (get_user(c, buf))
30906 + if (get_user(c, buf)) {
30907 + mutex_unlock(&vfd_mutex);
30908 return -EFAULT;
30909 + }
30910 if (esc) {
30911 set_led(c);
30912 esc = 0;
30913 @@ -177,6 +182,7 @@ static ssize_t briq_panel_write(struct file *file, const char __user *buf, size_
30914 buf++;
30915 }
30916 update_vfd();
30917 + mutex_unlock(&vfd_mutex);
30918
30919 return len;
30920 }
30921 diff --git a/drivers/char/genrtc.c b/drivers/char/genrtc.c
30922 index 31e7c91..161afc0 100644
30923 --- a/drivers/char/genrtc.c
30924 +++ b/drivers/char/genrtc.c
30925 @@ -272,6 +272,7 @@ static int gen_rtc_ioctl(struct inode *inode, struct file *file,
30926 switch (cmd) {
30927
30928 case RTC_PLL_GET:
30929 + memset(&pll, 0, sizeof(pll));
30930 if (get_rtc_pll(&pll))
30931 return -EINVAL;
30932 else
30933 diff --git a/drivers/char/hpet.c b/drivers/char/hpet.c
30934 index 006466d..a2bb21c 100644
30935 --- a/drivers/char/hpet.c
30936 +++ b/drivers/char/hpet.c
30937 @@ -430,7 +430,7 @@ static int hpet_release(struct inode *inode, struct file *file)
30938 return 0;
30939 }
30940
30941 -static int hpet_ioctl_common(struct hpet_dev *, int, unsigned long, int);
30942 +static int hpet_ioctl_common(struct hpet_dev *, unsigned int, unsigned long, int);
30943
30944 static int
30945 hpet_ioctl(struct inode *inode, struct file *file, unsigned int cmd,
30946 @@ -565,7 +565,7 @@ static inline unsigned long hpet_time_div(struct hpets *hpets,
30947 }
30948
30949 static int
30950 -hpet_ioctl_common(struct hpet_dev *devp, int cmd, unsigned long arg, int kernel)
30951 +hpet_ioctl_common(struct hpet_dev *devp, unsigned int cmd, unsigned long arg, int kernel)
30952 {
30953 struct hpet_timer __iomem *timer;
30954 struct hpet __iomem *hpet;
30955 @@ -608,11 +608,11 @@ hpet_ioctl_common(struct hpet_dev *devp, int cmd, unsigned long arg, int kernel)
30956 {
30957 struct hpet_info info;
30958
30959 + memset(&info, 0, sizeof(info));
30960 +
30961 if (devp->hd_ireqfreq)
30962 info.hi_ireqfreq =
30963 hpet_time_div(hpetp, devp->hd_ireqfreq);
30964 - else
30965 - info.hi_ireqfreq = 0;
30966 info.hi_flags =
30967 readq(&timer->hpet_config) & Tn_PER_INT_CAP_MASK;
30968 info.hi_hpet = hpetp->hp_which;
30969 diff --git a/drivers/char/hvc_beat.c b/drivers/char/hvc_beat.c
30970 index 0afc8b8..6913fc3 100644
30971 --- a/drivers/char/hvc_beat.c
30972 +++ b/drivers/char/hvc_beat.c
30973 @@ -84,7 +84,7 @@ static int hvc_beat_put_chars(uint32_t vtermno, const char *buf, int cnt)
30974 return cnt;
30975 }
30976
30977 -static struct hv_ops hvc_beat_get_put_ops = {
30978 +static const struct hv_ops hvc_beat_get_put_ops = {
30979 .get_chars = hvc_beat_get_chars,
30980 .put_chars = hvc_beat_put_chars,
30981 };
30982 diff --git a/drivers/char/hvc_console.c b/drivers/char/hvc_console.c
30983 index 98097f2..407dddc 100644
30984 --- a/drivers/char/hvc_console.c
30985 +++ b/drivers/char/hvc_console.c
30986 @@ -125,7 +125,7 @@ static struct hvc_struct *hvc_get_by_index(int index)
30987 * console interfaces but can still be used as a tty device. This has to be
30988 * static because kmalloc will not work during early console init.
30989 */
30990 -static struct hv_ops *cons_ops[MAX_NR_HVC_CONSOLES];
30991 +static const struct hv_ops *cons_ops[MAX_NR_HVC_CONSOLES];
30992 static uint32_t vtermnos[MAX_NR_HVC_CONSOLES] =
30993 {[0 ... MAX_NR_HVC_CONSOLES - 1] = -1};
30994
30995 @@ -249,7 +249,7 @@ static void destroy_hvc_struct(struct kref *kref)
30996 * vty adapters do NOT get an hvc_instantiate() callback since they
30997 * appear after early console init.
30998 */
30999 -int hvc_instantiate(uint32_t vtermno, int index, struct hv_ops *ops)
31000 +int hvc_instantiate(uint32_t vtermno, int index, const struct hv_ops *ops)
31001 {
31002 struct hvc_struct *hp;
31003
31004 @@ -758,7 +758,7 @@ static const struct tty_operations hvc_ops = {
31005 };
31006
31007 struct hvc_struct __devinit *hvc_alloc(uint32_t vtermno, int data,
31008 - struct hv_ops *ops, int outbuf_size)
31009 + const struct hv_ops *ops, int outbuf_size)
31010 {
31011 struct hvc_struct *hp;
31012 int i;
31013 diff --git a/drivers/char/hvc_console.h b/drivers/char/hvc_console.h
31014 index 10950ca..ed176c3 100644
31015 --- a/drivers/char/hvc_console.h
31016 +++ b/drivers/char/hvc_console.h
31017 @@ -55,7 +55,7 @@ struct hvc_struct {
31018 int outbuf_size;
31019 int n_outbuf;
31020 uint32_t vtermno;
31021 - struct hv_ops *ops;
31022 + const struct hv_ops *ops;
31023 int irq_requested;
31024 int data;
31025 struct winsize ws;
31026 @@ -76,11 +76,11 @@ struct hv_ops {
31027 };
31028
31029 /* Register a vterm and a slot index for use as a console (console_init) */
31030 -extern int hvc_instantiate(uint32_t vtermno, int index, struct hv_ops *ops);
31031 +extern int hvc_instantiate(uint32_t vtermno, int index, const struct hv_ops *ops);
31032
31033 /* register a vterm for hvc tty operation (module_init or hotplug add) */
31034 extern struct hvc_struct * __devinit hvc_alloc(uint32_t vtermno, int data,
31035 - struct hv_ops *ops, int outbuf_size);
31036 + const struct hv_ops *ops, int outbuf_size);
31037 /* remove a vterm from hvc tty operation (module_exit or hotplug remove) */
31038 extern int hvc_remove(struct hvc_struct *hp);
31039
31040 diff --git a/drivers/char/hvc_iseries.c b/drivers/char/hvc_iseries.c
31041 index 936d05b..fd02426 100644
31042 --- a/drivers/char/hvc_iseries.c
31043 +++ b/drivers/char/hvc_iseries.c
31044 @@ -197,7 +197,7 @@ done:
31045 return sent;
31046 }
31047
31048 -static struct hv_ops hvc_get_put_ops = {
31049 +static const struct hv_ops hvc_get_put_ops = {
31050 .get_chars = get_chars,
31051 .put_chars = put_chars,
31052 .notifier_add = notifier_add_irq,
31053 diff --git a/drivers/char/hvc_iucv.c b/drivers/char/hvc_iucv.c
31054 index b0e168f..69cda2a 100644
31055 --- a/drivers/char/hvc_iucv.c
31056 +++ b/drivers/char/hvc_iucv.c
31057 @@ -924,7 +924,7 @@ static int hvc_iucv_pm_restore_thaw(struct device *dev)
31058
31059
31060 /* HVC operations */
31061 -static struct hv_ops hvc_iucv_ops = {
31062 +static const struct hv_ops hvc_iucv_ops = {
31063 .get_chars = hvc_iucv_get_chars,
31064 .put_chars = hvc_iucv_put_chars,
31065 .notifier_add = hvc_iucv_notifier_add,
31066 diff --git a/drivers/char/hvc_rtas.c b/drivers/char/hvc_rtas.c
31067 index 88590d0..61c4a61 100644
31068 --- a/drivers/char/hvc_rtas.c
31069 +++ b/drivers/char/hvc_rtas.c
31070 @@ -71,7 +71,7 @@ static int hvc_rtas_read_console(uint32_t vtermno, char *buf, int count)
31071 return i;
31072 }
31073
31074 -static struct hv_ops hvc_rtas_get_put_ops = {
31075 +static const struct hv_ops hvc_rtas_get_put_ops = {
31076 .get_chars = hvc_rtas_read_console,
31077 .put_chars = hvc_rtas_write_console,
31078 };
31079 diff --git a/drivers/char/hvc_udbg.c b/drivers/char/hvc_udbg.c
31080 index bd63ba8..b0957e6 100644
31081 --- a/drivers/char/hvc_udbg.c
31082 +++ b/drivers/char/hvc_udbg.c
31083 @@ -58,7 +58,7 @@ static int hvc_udbg_get(uint32_t vtermno, char *buf, int count)
31084 return i;
31085 }
31086
31087 -static struct hv_ops hvc_udbg_ops = {
31088 +static const struct hv_ops hvc_udbg_ops = {
31089 .get_chars = hvc_udbg_get,
31090 .put_chars = hvc_udbg_put,
31091 };
31092 diff --git a/drivers/char/hvc_vio.c b/drivers/char/hvc_vio.c
31093 index 10be343..27370e9 100644
31094 --- a/drivers/char/hvc_vio.c
31095 +++ b/drivers/char/hvc_vio.c
31096 @@ -77,7 +77,7 @@ static int filtered_get_chars(uint32_t vtermno, char *buf, int count)
31097 return got;
31098 }
31099
31100 -static struct hv_ops hvc_get_put_ops = {
31101 +static const struct hv_ops hvc_get_put_ops = {
31102 .get_chars = filtered_get_chars,
31103 .put_chars = hvc_put_chars,
31104 .notifier_add = notifier_add_irq,
31105 diff --git a/drivers/char/hvc_xen.c b/drivers/char/hvc_xen.c
31106 index a6ee32b..94f8c26 100644
31107 --- a/drivers/char/hvc_xen.c
31108 +++ b/drivers/char/hvc_xen.c
31109 @@ -120,7 +120,7 @@ static int read_console(uint32_t vtermno, char *buf, int len)
31110 return recv;
31111 }
31112
31113 -static struct hv_ops hvc_ops = {
31114 +static const struct hv_ops hvc_ops = {
31115 .get_chars = read_console,
31116 .put_chars = write_console,
31117 .notifier_add = notifier_add_irq,
31118 diff --git a/drivers/char/hvcs.c b/drivers/char/hvcs.c
31119 index 266b858..f3ee0bb 100644
31120 --- a/drivers/char/hvcs.c
31121 +++ b/drivers/char/hvcs.c
31122 @@ -82,6 +82,7 @@
31123 #include <asm/hvcserver.h>
31124 #include <asm/uaccess.h>
31125 #include <asm/vio.h>
31126 +#include <asm/local.h>
31127
31128 /*
31129 * 1.3.0 -> 1.3.1 In hvcs_open memset(..,0x00,..) instead of memset(..,0x3F,00).
31130 @@ -269,7 +270,7 @@ struct hvcs_struct {
31131 unsigned int index;
31132
31133 struct tty_struct *tty;
31134 - int open_count;
31135 + local_t open_count;
31136
31137 /*
31138 * Used to tell the driver kernel_thread what operations need to take
31139 @@ -419,7 +420,7 @@ static ssize_t hvcs_vterm_state_store(struct device *dev, struct device_attribut
31140
31141 spin_lock_irqsave(&hvcsd->lock, flags);
31142
31143 - if (hvcsd->open_count > 0) {
31144 + if (local_read(&hvcsd->open_count) > 0) {
31145 spin_unlock_irqrestore(&hvcsd->lock, flags);
31146 printk(KERN_INFO "HVCS: vterm state unchanged. "
31147 "The hvcs device node is still in use.\n");
31148 @@ -1135,7 +1136,7 @@ static int hvcs_open(struct tty_struct *tty, struct file *filp)
31149 if ((retval = hvcs_partner_connect(hvcsd)))
31150 goto error_release;
31151
31152 - hvcsd->open_count = 1;
31153 + local_set(&hvcsd->open_count, 1);
31154 hvcsd->tty = tty;
31155 tty->driver_data = hvcsd;
31156
31157 @@ -1169,7 +1170,7 @@ fast_open:
31158
31159 spin_lock_irqsave(&hvcsd->lock, flags);
31160 kref_get(&hvcsd->kref);
31161 - hvcsd->open_count++;
31162 + local_inc(&hvcsd->open_count);
31163 hvcsd->todo_mask |= HVCS_SCHED_READ;
31164 spin_unlock_irqrestore(&hvcsd->lock, flags);
31165
31166 @@ -1213,7 +1214,7 @@ static void hvcs_close(struct tty_struct *tty, struct file *filp)
31167 hvcsd = tty->driver_data;
31168
31169 spin_lock_irqsave(&hvcsd->lock, flags);
31170 - if (--hvcsd->open_count == 0) {
31171 + if (local_dec_and_test(&hvcsd->open_count)) {
31172
31173 vio_disable_interrupts(hvcsd->vdev);
31174
31175 @@ -1239,10 +1240,10 @@ static void hvcs_close(struct tty_struct *tty, struct file *filp)
31176 free_irq(irq, hvcsd);
31177 kref_put(&hvcsd->kref, destroy_hvcs_struct);
31178 return;
31179 - } else if (hvcsd->open_count < 0) {
31180 + } else if (local_read(&hvcsd->open_count) < 0) {
31181 printk(KERN_ERR "HVCS: vty-server@%X open_count: %d"
31182 " is missmanaged.\n",
31183 - hvcsd->vdev->unit_address, hvcsd->open_count);
31184 + hvcsd->vdev->unit_address, local_read(&hvcsd->open_count));
31185 }
31186
31187 spin_unlock_irqrestore(&hvcsd->lock, flags);
31188 @@ -1258,7 +1259,7 @@ static void hvcs_hangup(struct tty_struct * tty)
31189
31190 spin_lock_irqsave(&hvcsd->lock, flags);
31191 /* Preserve this so that we know how many kref refs to put */
31192 - temp_open_count = hvcsd->open_count;
31193 + temp_open_count = local_read(&hvcsd->open_count);
31194
31195 /*
31196 * Don't kref put inside the spinlock because the destruction
31197 @@ -1273,7 +1274,7 @@ static void hvcs_hangup(struct tty_struct * tty)
31198 hvcsd->tty->driver_data = NULL;
31199 hvcsd->tty = NULL;
31200
31201 - hvcsd->open_count = 0;
31202 + local_set(&hvcsd->open_count, 0);
31203
31204 /* This will drop any buffered data on the floor which is OK in a hangup
31205 * scenario. */
31206 @@ -1344,7 +1345,7 @@ static int hvcs_write(struct tty_struct *tty,
31207 * the middle of a write operation? This is a crummy place to do this
31208 * but we want to keep it all in the spinlock.
31209 */
31210 - if (hvcsd->open_count <= 0) {
31211 + if (local_read(&hvcsd->open_count) <= 0) {
31212 spin_unlock_irqrestore(&hvcsd->lock, flags);
31213 return -ENODEV;
31214 }
31215 @@ -1418,7 +1419,7 @@ static int hvcs_write_room(struct tty_struct *tty)
31216 {
31217 struct hvcs_struct *hvcsd = tty->driver_data;
31218
31219 - if (!hvcsd || hvcsd->open_count <= 0)
31220 + if (!hvcsd || local_read(&hvcsd->open_count) <= 0)
31221 return 0;
31222
31223 return HVCS_BUFF_LEN - hvcsd->chars_in_buffer;
31224 diff --git a/drivers/char/ipmi/ipmi_msghandler.c b/drivers/char/ipmi/ipmi_msghandler.c
31225 index ec5e3f8..02455ba 100644
31226 --- a/drivers/char/ipmi/ipmi_msghandler.c
31227 +++ b/drivers/char/ipmi/ipmi_msghandler.c
31228 @@ -414,7 +414,7 @@ struct ipmi_smi {
31229 struct proc_dir_entry *proc_dir;
31230 char proc_dir_name[10];
31231
31232 - atomic_t stats[IPMI_NUM_STATS];
31233 + atomic_unchecked_t stats[IPMI_NUM_STATS];
31234
31235 /*
31236 * run_to_completion duplicate of smb_info, smi_info
31237 @@ -447,9 +447,9 @@ static DEFINE_MUTEX(smi_watchers_mutex);
31238
31239
31240 #define ipmi_inc_stat(intf, stat) \
31241 - atomic_inc(&(intf)->stats[IPMI_STAT_ ## stat])
31242 + atomic_inc_unchecked(&(intf)->stats[IPMI_STAT_ ## stat])
31243 #define ipmi_get_stat(intf, stat) \
31244 - ((unsigned int) atomic_read(&(intf)->stats[IPMI_STAT_ ## stat]))
31245 + ((unsigned int) atomic_read_unchecked(&(intf)->stats[IPMI_STAT_ ## stat]))
31246
31247 static int is_lan_addr(struct ipmi_addr *addr)
31248 {
31249 @@ -2808,7 +2808,7 @@ int ipmi_register_smi(struct ipmi_smi_handlers *handlers,
31250 INIT_LIST_HEAD(&intf->cmd_rcvrs);
31251 init_waitqueue_head(&intf->waitq);
31252 for (i = 0; i < IPMI_NUM_STATS; i++)
31253 - atomic_set(&intf->stats[i], 0);
31254 + atomic_set_unchecked(&intf->stats[i], 0);
31255
31256 intf->proc_dir = NULL;
31257
31258 @@ -4160,6 +4160,8 @@ static void send_panic_events(char *str)
31259 struct ipmi_smi_msg smi_msg;
31260 struct ipmi_recv_msg recv_msg;
31261
31262 + pax_track_stack();
31263 +
31264 si = (struct ipmi_system_interface_addr *) &addr;
31265 si->addr_type = IPMI_SYSTEM_INTERFACE_ADDR_TYPE;
31266 si->channel = IPMI_BMC_CHANNEL;
31267 diff --git a/drivers/char/ipmi/ipmi_si_intf.c b/drivers/char/ipmi/ipmi_si_intf.c
31268 index abae8c9..8021979 100644
31269 --- a/drivers/char/ipmi/ipmi_si_intf.c
31270 +++ b/drivers/char/ipmi/ipmi_si_intf.c
31271 @@ -277,7 +277,7 @@ struct smi_info {
31272 unsigned char slave_addr;
31273
31274 /* Counters and things for the proc filesystem. */
31275 - atomic_t stats[SI_NUM_STATS];
31276 + atomic_unchecked_t stats[SI_NUM_STATS];
31277
31278 struct task_struct *thread;
31279
31280 @@ -285,9 +285,9 @@ struct smi_info {
31281 };
31282
31283 #define smi_inc_stat(smi, stat) \
31284 - atomic_inc(&(smi)->stats[SI_STAT_ ## stat])
31285 + atomic_inc_unchecked(&(smi)->stats[SI_STAT_ ## stat])
31286 #define smi_get_stat(smi, stat) \
31287 - ((unsigned int) atomic_read(&(smi)->stats[SI_STAT_ ## stat]))
31288 + ((unsigned int) atomic_read_unchecked(&(smi)->stats[SI_STAT_ ## stat]))
31289
31290 #define SI_MAX_PARMS 4
31291
31292 @@ -2931,7 +2931,7 @@ static int try_smi_init(struct smi_info *new_smi)
31293 atomic_set(&new_smi->req_events, 0);
31294 new_smi->run_to_completion = 0;
31295 for (i = 0; i < SI_NUM_STATS; i++)
31296 - atomic_set(&new_smi->stats[i], 0);
31297 + atomic_set_unchecked(&new_smi->stats[i], 0);
31298
31299 new_smi->interrupt_disabled = 0;
31300 atomic_set(&new_smi->stop_operation, 0);
31301 diff --git a/drivers/char/istallion.c b/drivers/char/istallion.c
31302 index 402838f..55e2200 100644
31303 --- a/drivers/char/istallion.c
31304 +++ b/drivers/char/istallion.c
31305 @@ -187,7 +187,6 @@ static struct ktermios stli_deftermios = {
31306 * re-used for each stats call.
31307 */
31308 static comstats_t stli_comstats;
31309 -static combrd_t stli_brdstats;
31310 static struct asystats stli_cdkstats;
31311
31312 /*****************************************************************************/
31313 @@ -4058,6 +4057,7 @@ static int stli_getbrdstats(combrd_t __user *bp)
31314 {
31315 struct stlibrd *brdp;
31316 unsigned int i;
31317 + combrd_t stli_brdstats;
31318
31319 if (copy_from_user(&stli_brdstats, bp, sizeof(combrd_t)))
31320 return -EFAULT;
31321 @@ -4269,6 +4269,8 @@ static int stli_getportstruct(struct stliport __user *arg)
31322 struct stliport stli_dummyport;
31323 struct stliport *portp;
31324
31325 + pax_track_stack();
31326 +
31327 if (copy_from_user(&stli_dummyport, arg, sizeof(struct stliport)))
31328 return -EFAULT;
31329 portp = stli_getport(stli_dummyport.brdnr, stli_dummyport.panelnr,
31330 @@ -4291,6 +4293,8 @@ static int stli_getbrdstruct(struct stlibrd __user *arg)
31331 struct stlibrd stli_dummybrd;
31332 struct stlibrd *brdp;
31333
31334 + pax_track_stack();
31335 +
31336 if (copy_from_user(&stli_dummybrd, arg, sizeof(struct stlibrd)))
31337 return -EFAULT;
31338 if (stli_dummybrd.brdnr >= STL_MAXBRDS)
31339 diff --git a/drivers/char/keyboard.c b/drivers/char/keyboard.c
31340 index 950837c..e55a288 100644
31341 --- a/drivers/char/keyboard.c
31342 +++ b/drivers/char/keyboard.c
31343 @@ -635,6 +635,16 @@ static void k_spec(struct vc_data *vc, unsigned char value, char up_flag)
31344 kbd->kbdmode == VC_MEDIUMRAW) &&
31345 value != KVAL(K_SAK))
31346 return; /* SAK is allowed even in raw mode */
31347 +
31348 +#if defined(CONFIG_GRKERNSEC_PROC) || defined(CONFIG_GRKERNSEC_PROC_MEMMAP)
31349 + {
31350 + void *func = fn_handler[value];
31351 + if (func == fn_show_state || func == fn_show_ptregs ||
31352 + func == fn_show_mem)
31353 + return;
31354 + }
31355 +#endif
31356 +
31357 fn_handler[value](vc);
31358 }
31359
31360 @@ -1386,7 +1396,7 @@ static const struct input_device_id kbd_ids[] = {
31361 .evbit = { BIT_MASK(EV_SND) },
31362 },
31363
31364 - { }, /* Terminating entry */
31365 + { 0 }, /* Terminating entry */
31366 };
31367
31368 MODULE_DEVICE_TABLE(input, kbd_ids);
31369 diff --git a/drivers/char/mbcs.c b/drivers/char/mbcs.c
31370 index 87c67b4..230527a 100644
31371 --- a/drivers/char/mbcs.c
31372 +++ b/drivers/char/mbcs.c
31373 @@ -799,7 +799,7 @@ static int mbcs_remove(struct cx_dev *dev)
31374 return 0;
31375 }
31376
31377 -static const struct cx_device_id __devinitdata mbcs_id_table[] = {
31378 +static const struct cx_device_id __devinitconst mbcs_id_table[] = {
31379 {
31380 .part_num = MBCS_PART_NUM,
31381 .mfg_num = MBCS_MFG_NUM,
31382 diff --git a/drivers/char/mem.c b/drivers/char/mem.c
31383 index 1270f64..8495f49 100644
31384 --- a/drivers/char/mem.c
31385 +++ b/drivers/char/mem.c
31386 @@ -18,6 +18,7 @@
31387 #include <linux/raw.h>
31388 #include <linux/tty.h>
31389 #include <linux/capability.h>
31390 +#include <linux/security.h>
31391 #include <linux/ptrace.h>
31392 #include <linux/device.h>
31393 #include <linux/highmem.h>
31394 @@ -35,6 +36,10 @@
31395 # include <linux/efi.h>
31396 #endif
31397
31398 +#if defined(CONFIG_GRKERNSEC) && !defined(CONFIG_GRKERNSEC_NO_RBAC)
31399 +extern struct file_operations grsec_fops;
31400 +#endif
31401 +
31402 static inline unsigned long size_inside_page(unsigned long start,
31403 unsigned long size)
31404 {
31405 @@ -102,9 +107,13 @@ static inline int range_is_allowed(unsigned long pfn, unsigned long size)
31406
31407 while (cursor < to) {
31408 if (!devmem_is_allowed(pfn)) {
31409 +#ifdef CONFIG_GRKERNSEC_KMEM
31410 + gr_handle_mem_readwrite(from, to);
31411 +#else
31412 printk(KERN_INFO
31413 "Program %s tried to access /dev/mem between %Lx->%Lx.\n",
31414 current->comm, from, to);
31415 +#endif
31416 return 0;
31417 }
31418 cursor += PAGE_SIZE;
31419 @@ -112,6 +121,11 @@ static inline int range_is_allowed(unsigned long pfn, unsigned long size)
31420 }
31421 return 1;
31422 }
31423 +#elif defined(CONFIG_GRKERNSEC_KMEM)
31424 +static inline int range_is_allowed(unsigned long pfn, unsigned long size)
31425 +{
31426 + return 0;
31427 +}
31428 #else
31429 static inline int range_is_allowed(unsigned long pfn, unsigned long size)
31430 {
31431 @@ -155,6 +169,8 @@ static ssize_t read_mem(struct file * file, char __user * buf,
31432 #endif
31433
31434 while (count > 0) {
31435 + char *temp;
31436 +
31437 /*
31438 * Handle first page in case it's not aligned
31439 */
31440 @@ -177,11 +193,31 @@ static ssize_t read_mem(struct file * file, char __user * buf,
31441 if (!ptr)
31442 return -EFAULT;
31443
31444 - if (copy_to_user(buf, ptr, sz)) {
31445 +#ifdef CONFIG_PAX_USERCOPY
31446 + temp = kmalloc(sz, GFP_KERNEL);
31447 + if (!temp) {
31448 + unxlate_dev_mem_ptr(p, ptr);
31449 + return -ENOMEM;
31450 + }
31451 + memcpy(temp, ptr, sz);
31452 +#else
31453 + temp = ptr;
31454 +#endif
31455 +
31456 + if (copy_to_user(buf, temp, sz)) {
31457 +
31458 +#ifdef CONFIG_PAX_USERCOPY
31459 + kfree(temp);
31460 +#endif
31461 +
31462 unxlate_dev_mem_ptr(p, ptr);
31463 return -EFAULT;
31464 }
31465
31466 +#ifdef CONFIG_PAX_USERCOPY
31467 + kfree(temp);
31468 +#endif
31469 +
31470 unxlate_dev_mem_ptr(p, ptr);
31471
31472 buf += sz;
31473 @@ -419,9 +455,8 @@ static ssize_t read_kmem(struct file *file, char __user *buf,
31474 size_t count, loff_t *ppos)
31475 {
31476 unsigned long p = *ppos;
31477 - ssize_t low_count, read, sz;
31478 + ssize_t low_count, read, sz, err = 0;
31479 char * kbuf; /* k-addr because vread() takes vmlist_lock rwlock */
31480 - int err = 0;
31481
31482 read = 0;
31483 if (p < (unsigned long) high_memory) {
31484 @@ -444,6 +479,8 @@ static ssize_t read_kmem(struct file *file, char __user *buf,
31485 }
31486 #endif
31487 while (low_count > 0) {
31488 + char *temp;
31489 +
31490 sz = size_inside_page(p, low_count);
31491
31492 /*
31493 @@ -453,7 +490,22 @@ static ssize_t read_kmem(struct file *file, char __user *buf,
31494 */
31495 kbuf = xlate_dev_kmem_ptr((char *)p);
31496
31497 - if (copy_to_user(buf, kbuf, sz))
31498 +#ifdef CONFIG_PAX_USERCOPY
31499 + temp = kmalloc(sz, GFP_KERNEL);
31500 + if (!temp)
31501 + return -ENOMEM;
31502 + memcpy(temp, kbuf, sz);
31503 +#else
31504 + temp = kbuf;
31505 +#endif
31506 +
31507 + err = copy_to_user(buf, temp, sz);
31508 +
31509 +#ifdef CONFIG_PAX_USERCOPY
31510 + kfree(temp);
31511 +#endif
31512 +
31513 + if (err)
31514 return -EFAULT;
31515 buf += sz;
31516 p += sz;
31517 @@ -889,6 +941,9 @@ static const struct memdev {
31518 #ifdef CONFIG_CRASH_DUMP
31519 [12] = { "oldmem", 0, &oldmem_fops, NULL },
31520 #endif
31521 +#if defined(CONFIG_GRKERNSEC) && !defined(CONFIG_GRKERNSEC_NO_RBAC)
31522 + [13] = { "grsec",S_IRUSR | S_IWUGO, &grsec_fops, NULL },
31523 +#endif
31524 };
31525
31526 static int memory_open(struct inode *inode, struct file *filp)
31527 diff --git a/drivers/char/pcmcia/ipwireless/tty.c b/drivers/char/pcmcia/ipwireless/tty.c
31528 index 674b3ab..a8d1970 100644
31529 --- a/drivers/char/pcmcia/ipwireless/tty.c
31530 +++ b/drivers/char/pcmcia/ipwireless/tty.c
31531 @@ -29,6 +29,7 @@
31532 #include <linux/tty_driver.h>
31533 #include <linux/tty_flip.h>
31534 #include <linux/uaccess.h>
31535 +#include <asm/local.h>
31536
31537 #include "tty.h"
31538 #include "network.h"
31539 @@ -51,7 +52,7 @@ struct ipw_tty {
31540 int tty_type;
31541 struct ipw_network *network;
31542 struct tty_struct *linux_tty;
31543 - int open_count;
31544 + local_t open_count;
31545 unsigned int control_lines;
31546 struct mutex ipw_tty_mutex;
31547 int tx_bytes_queued;
31548 @@ -127,10 +128,10 @@ static int ipw_open(struct tty_struct *linux_tty, struct file *filp)
31549 mutex_unlock(&tty->ipw_tty_mutex);
31550 return -ENODEV;
31551 }
31552 - if (tty->open_count == 0)
31553 + if (local_read(&tty->open_count) == 0)
31554 tty->tx_bytes_queued = 0;
31555
31556 - tty->open_count++;
31557 + local_inc(&tty->open_count);
31558
31559 tty->linux_tty = linux_tty;
31560 linux_tty->driver_data = tty;
31561 @@ -146,9 +147,7 @@ static int ipw_open(struct tty_struct *linux_tty, struct file *filp)
31562
31563 static void do_ipw_close(struct ipw_tty *tty)
31564 {
31565 - tty->open_count--;
31566 -
31567 - if (tty->open_count == 0) {
31568 + if (local_dec_return(&tty->open_count) == 0) {
31569 struct tty_struct *linux_tty = tty->linux_tty;
31570
31571 if (linux_tty != NULL) {
31572 @@ -169,7 +168,7 @@ static void ipw_hangup(struct tty_struct *linux_tty)
31573 return;
31574
31575 mutex_lock(&tty->ipw_tty_mutex);
31576 - if (tty->open_count == 0) {
31577 + if (local_read(&tty->open_count) == 0) {
31578 mutex_unlock(&tty->ipw_tty_mutex);
31579 return;
31580 }
31581 @@ -198,7 +197,7 @@ void ipwireless_tty_received(struct ipw_tty *tty, unsigned char *data,
31582 return;
31583 }
31584
31585 - if (!tty->open_count) {
31586 + if (!local_read(&tty->open_count)) {
31587 mutex_unlock(&tty->ipw_tty_mutex);
31588 return;
31589 }
31590 @@ -240,7 +239,7 @@ static int ipw_write(struct tty_struct *linux_tty,
31591 return -ENODEV;
31592
31593 mutex_lock(&tty->ipw_tty_mutex);
31594 - if (!tty->open_count) {
31595 + if (!local_read(&tty->open_count)) {
31596 mutex_unlock(&tty->ipw_tty_mutex);
31597 return -EINVAL;
31598 }
31599 @@ -280,7 +279,7 @@ static int ipw_write_room(struct tty_struct *linux_tty)
31600 if (!tty)
31601 return -ENODEV;
31602
31603 - if (!tty->open_count)
31604 + if (!local_read(&tty->open_count))
31605 return -EINVAL;
31606
31607 room = IPWIRELESS_TX_QUEUE_SIZE - tty->tx_bytes_queued;
31608 @@ -322,7 +321,7 @@ static int ipw_chars_in_buffer(struct tty_struct *linux_tty)
31609 if (!tty)
31610 return 0;
31611
31612 - if (!tty->open_count)
31613 + if (!local_read(&tty->open_count))
31614 return 0;
31615
31616 return tty->tx_bytes_queued;
31617 @@ -403,7 +402,7 @@ static int ipw_tiocmget(struct tty_struct *linux_tty, struct file *file)
31618 if (!tty)
31619 return -ENODEV;
31620
31621 - if (!tty->open_count)
31622 + if (!local_read(&tty->open_count))
31623 return -EINVAL;
31624
31625 return get_control_lines(tty);
31626 @@ -419,7 +418,7 @@ ipw_tiocmset(struct tty_struct *linux_tty, struct file *file,
31627 if (!tty)
31628 return -ENODEV;
31629
31630 - if (!tty->open_count)
31631 + if (!local_read(&tty->open_count))
31632 return -EINVAL;
31633
31634 return set_control_lines(tty, set, clear);
31635 @@ -433,7 +432,7 @@ static int ipw_ioctl(struct tty_struct *linux_tty, struct file *file,
31636 if (!tty)
31637 return -ENODEV;
31638
31639 - if (!tty->open_count)
31640 + if (!local_read(&tty->open_count))
31641 return -EINVAL;
31642
31643 /* FIXME: Exactly how is the tty object locked here .. */
31644 @@ -591,7 +590,7 @@ void ipwireless_tty_free(struct ipw_tty *tty)
31645 against a parallel ioctl etc */
31646 mutex_lock(&ttyj->ipw_tty_mutex);
31647 }
31648 - while (ttyj->open_count)
31649 + while (local_read(&ttyj->open_count))
31650 do_ipw_close(ttyj);
31651 ipwireless_disassociate_network_ttys(network,
31652 ttyj->channel_idx);
31653 diff --git a/drivers/char/pty.c b/drivers/char/pty.c
31654 index 62f282e..e45c45c 100644
31655 --- a/drivers/char/pty.c
31656 +++ b/drivers/char/pty.c
31657 @@ -736,8 +736,10 @@ static void __init unix98_pty_init(void)
31658 register_sysctl_table(pty_root_table);
31659
31660 /* Now create the /dev/ptmx special device */
31661 + pax_open_kernel();
31662 tty_default_fops(&ptmx_fops);
31663 - ptmx_fops.open = ptmx_open;
31664 + *(void **)&ptmx_fops.open = ptmx_open;
31665 + pax_close_kernel();
31666
31667 cdev_init(&ptmx_cdev, &ptmx_fops);
31668 if (cdev_add(&ptmx_cdev, MKDEV(TTYAUX_MAJOR, 2), 1) ||
31669 diff --git a/drivers/char/random.c b/drivers/char/random.c
31670 index 3a19e2d..6ed09d3 100644
31671 --- a/drivers/char/random.c
31672 +++ b/drivers/char/random.c
31673 @@ -254,8 +254,13 @@
31674 /*
31675 * Configuration information
31676 */
31677 +#ifdef CONFIG_GRKERNSEC_RANDNET
31678 +#define INPUT_POOL_WORDS 512
31679 +#define OUTPUT_POOL_WORDS 128
31680 +#else
31681 #define INPUT_POOL_WORDS 128
31682 #define OUTPUT_POOL_WORDS 32
31683 +#endif
31684 #define SEC_XFER_SIZE 512
31685
31686 /*
31687 @@ -292,10 +297,17 @@ static struct poolinfo {
31688 int poolwords;
31689 int tap1, tap2, tap3, tap4, tap5;
31690 } poolinfo_table[] = {
31691 +#ifdef CONFIG_GRKERNSEC_RANDNET
31692 + /* x^512 + x^411 + x^308 + x^208 +x^104 + x + 1 -- 225 */
31693 + { 512, 411, 308, 208, 104, 1 },
31694 + /* x^128 + x^103 + x^76 + x^51 + x^25 + x + 1 -- 105 */
31695 + { 128, 103, 76, 51, 25, 1 },
31696 +#else
31697 /* x^128 + x^103 + x^76 + x^51 +x^25 + x + 1 -- 105 */
31698 { 128, 103, 76, 51, 25, 1 },
31699 /* x^32 + x^26 + x^20 + x^14 + x^7 + x + 1 -- 15 */
31700 { 32, 26, 20, 14, 7, 1 },
31701 +#endif
31702 #if 0
31703 /* x^2048 + x^1638 + x^1231 + x^819 + x^411 + x + 1 -- 115 */
31704 { 2048, 1638, 1231, 819, 411, 1 },
31705 @@ -1209,7 +1221,7 @@ EXPORT_SYMBOL(generate_random_uuid);
31706 #include <linux/sysctl.h>
31707
31708 static int min_read_thresh = 8, min_write_thresh;
31709 -static int max_read_thresh = INPUT_POOL_WORDS * 32;
31710 +static int max_read_thresh = OUTPUT_POOL_WORDS * 32;
31711 static int max_write_thresh = INPUT_POOL_WORDS * 32;
31712 static char sysctl_bootid[16];
31713
31714 diff --git a/drivers/char/rocket.c b/drivers/char/rocket.c
31715 index 0e29a23..0efc2c2 100644
31716 --- a/drivers/char/rocket.c
31717 +++ b/drivers/char/rocket.c
31718 @@ -1266,6 +1266,8 @@ static int get_ports(struct r_port *info, struct rocket_ports __user *retports)
31719 struct rocket_ports tmp;
31720 int board;
31721
31722 + pax_track_stack();
31723 +
31724 if (!retports)
31725 return -EFAULT;
31726 memset(&tmp, 0, sizeof (tmp));
31727 diff --git a/drivers/char/sonypi.c b/drivers/char/sonypi.c
31728 index 8c262aa..4d3b058 100644
31729 --- a/drivers/char/sonypi.c
31730 +++ b/drivers/char/sonypi.c
31731 @@ -55,6 +55,7 @@
31732 #include <asm/uaccess.h>
31733 #include <asm/io.h>
31734 #include <asm/system.h>
31735 +#include <asm/local.h>
31736
31737 #include <linux/sonypi.h>
31738
31739 @@ -491,7 +492,7 @@ static struct sonypi_device {
31740 spinlock_t fifo_lock;
31741 wait_queue_head_t fifo_proc_list;
31742 struct fasync_struct *fifo_async;
31743 - int open_count;
31744 + local_t open_count;
31745 int model;
31746 struct input_dev *input_jog_dev;
31747 struct input_dev *input_key_dev;
31748 @@ -895,7 +896,7 @@ static int sonypi_misc_fasync(int fd, struct file *filp, int on)
31749 static int sonypi_misc_release(struct inode *inode, struct file *file)
31750 {
31751 mutex_lock(&sonypi_device.lock);
31752 - sonypi_device.open_count--;
31753 + local_dec(&sonypi_device.open_count);
31754 mutex_unlock(&sonypi_device.lock);
31755 return 0;
31756 }
31757 @@ -905,9 +906,9 @@ static int sonypi_misc_open(struct inode *inode, struct file *file)
31758 lock_kernel();
31759 mutex_lock(&sonypi_device.lock);
31760 /* Flush input queue on first open */
31761 - if (!sonypi_device.open_count)
31762 + if (!local_read(&sonypi_device.open_count))
31763 kfifo_reset(sonypi_device.fifo);
31764 - sonypi_device.open_count++;
31765 + local_inc(&sonypi_device.open_count);
31766 mutex_unlock(&sonypi_device.lock);
31767 unlock_kernel();
31768 return 0;
31769 diff --git a/drivers/char/stallion.c b/drivers/char/stallion.c
31770 index db6dcfa..13834cb 100644
31771 --- a/drivers/char/stallion.c
31772 +++ b/drivers/char/stallion.c
31773 @@ -2448,6 +2448,8 @@ static int stl_getportstruct(struct stlport __user *arg)
31774 struct stlport stl_dummyport;
31775 struct stlport *portp;
31776
31777 + pax_track_stack();
31778 +
31779 if (copy_from_user(&stl_dummyport, arg, sizeof(struct stlport)))
31780 return -EFAULT;
31781 portp = stl_getport(stl_dummyport.brdnr, stl_dummyport.panelnr,
31782 diff --git a/drivers/char/tpm/tpm.c b/drivers/char/tpm/tpm.c
31783 index a0789f6..cea3902 100644
31784 --- a/drivers/char/tpm/tpm.c
31785 +++ b/drivers/char/tpm/tpm.c
31786 @@ -405,7 +405,7 @@ static ssize_t tpm_transmit(struct tpm_chip *chip, const char *buf,
31787 chip->vendor.req_complete_val)
31788 goto out_recv;
31789
31790 - if ((status == chip->vendor.req_canceled)) {
31791 + if (status == chip->vendor.req_canceled) {
31792 dev_err(chip->dev, "Operation Canceled\n");
31793 rc = -ECANCELED;
31794 goto out;
31795 @@ -824,6 +824,8 @@ ssize_t tpm_show_pubek(struct device *dev, struct device_attribute *attr,
31796
31797 struct tpm_chip *chip = dev_get_drvdata(dev);
31798
31799 + pax_track_stack();
31800 +
31801 tpm_cmd.header.in = tpm_readpubek_header;
31802 err = transmit_cmd(chip, &tpm_cmd, READ_PUBEK_RESULT_SIZE,
31803 "attempting to read the PUBEK");
31804 diff --git a/drivers/char/tpm/tpm_bios.c b/drivers/char/tpm/tpm_bios.c
31805 index bf2170f..ce8cab9 100644
31806 --- a/drivers/char/tpm/tpm_bios.c
31807 +++ b/drivers/char/tpm/tpm_bios.c
31808 @@ -172,7 +172,7 @@ static void *tpm_bios_measurements_start(struct seq_file *m, loff_t *pos)
31809 event = addr;
31810
31811 if ((event->event_type == 0 && event->event_size == 0) ||
31812 - ((addr + sizeof(struct tcpa_event) + event->event_size) >= limit))
31813 + (event->event_size >= limit - addr - sizeof(struct tcpa_event)))
31814 return NULL;
31815
31816 return addr;
31817 @@ -197,7 +197,7 @@ static void *tpm_bios_measurements_next(struct seq_file *m, void *v,
31818 return NULL;
31819
31820 if ((event->event_type == 0 && event->event_size == 0) ||
31821 - ((v + sizeof(struct tcpa_event) + event->event_size) >= limit))
31822 + (event->event_size >= limit - v - sizeof(struct tcpa_event)))
31823 return NULL;
31824
31825 (*pos)++;
31826 @@ -290,7 +290,8 @@ static int tpm_binary_bios_measurements_show(struct seq_file *m, void *v)
31827 int i;
31828
31829 for (i = 0; i < sizeof(struct tcpa_event) + event->event_size; i++)
31830 - seq_putc(m, data[i]);
31831 + if (!seq_putc(m, data[i]))
31832 + return -EFAULT;
31833
31834 return 0;
31835 }
31836 @@ -409,8 +410,13 @@ static int read_log(struct tpm_bios_log *log)
31837 log->bios_event_log_end = log->bios_event_log + len;
31838
31839 virt = acpi_os_map_memory(start, len);
31840 + if (!virt) {
31841 + kfree(log->bios_event_log);
31842 + log->bios_event_log = NULL;
31843 + return -EFAULT;
31844 + }
31845
31846 - memcpy(log->bios_event_log, virt, len);
31847 + memcpy(log->bios_event_log, (const char __force_kernel *)virt, len);
31848
31849 acpi_os_unmap_memory(virt, len);
31850 return 0;
31851 diff --git a/drivers/char/tty_io.c b/drivers/char/tty_io.c
31852 index 123cedf..137edef 100644
31853 --- a/drivers/char/tty_io.c
31854 +++ b/drivers/char/tty_io.c
31855 @@ -1774,6 +1774,7 @@ got_driver:
31856
31857 if (IS_ERR(tty)) {
31858 mutex_unlock(&tty_mutex);
31859 + tty_driver_kref_put(driver);
31860 return PTR_ERR(tty);
31861 }
31862 }
31863 @@ -2603,8 +2604,10 @@ long tty_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
31864 return retval;
31865 }
31866
31867 +EXPORT_SYMBOL(tty_ioctl);
31868 +
31869 #ifdef CONFIG_COMPAT
31870 -static long tty_compat_ioctl(struct file *file, unsigned int cmd,
31871 +long tty_compat_ioctl(struct file *file, unsigned int cmd,
31872 unsigned long arg)
31873 {
31874 struct inode *inode = file->f_dentry->d_inode;
31875 @@ -2628,6 +2631,8 @@ static long tty_compat_ioctl(struct file *file, unsigned int cmd,
31876
31877 return retval;
31878 }
31879 +
31880 +EXPORT_SYMBOL(tty_compat_ioctl);
31881 #endif
31882
31883 /*
31884 @@ -3073,7 +3078,7 @@ EXPORT_SYMBOL_GPL(get_current_tty);
31885
31886 void tty_default_fops(struct file_operations *fops)
31887 {
31888 - *fops = tty_fops;
31889 + memcpy((void *)fops, &tty_fops, sizeof(tty_fops));
31890 }
31891
31892 /*
31893 diff --git a/drivers/char/tty_ldisc.c b/drivers/char/tty_ldisc.c
31894 index d814a3d..b55b9c9 100644
31895 --- a/drivers/char/tty_ldisc.c
31896 +++ b/drivers/char/tty_ldisc.c
31897 @@ -74,7 +74,7 @@ static void put_ldisc(struct tty_ldisc *ld)
31898 if (atomic_dec_and_lock(&ld->users, &tty_ldisc_lock)) {
31899 struct tty_ldisc_ops *ldo = ld->ops;
31900
31901 - ldo->refcount--;
31902 + atomic_dec(&ldo->refcount);
31903 module_put(ldo->owner);
31904 spin_unlock_irqrestore(&tty_ldisc_lock, flags);
31905
31906 @@ -109,7 +109,7 @@ int tty_register_ldisc(int disc, struct tty_ldisc_ops *new_ldisc)
31907 spin_lock_irqsave(&tty_ldisc_lock, flags);
31908 tty_ldiscs[disc] = new_ldisc;
31909 new_ldisc->num = disc;
31910 - new_ldisc->refcount = 0;
31911 + atomic_set(&new_ldisc->refcount, 0);
31912 spin_unlock_irqrestore(&tty_ldisc_lock, flags);
31913
31914 return ret;
31915 @@ -137,7 +137,7 @@ int tty_unregister_ldisc(int disc)
31916 return -EINVAL;
31917
31918 spin_lock_irqsave(&tty_ldisc_lock, flags);
31919 - if (tty_ldiscs[disc]->refcount)
31920 + if (atomic_read(&tty_ldiscs[disc]->refcount))
31921 ret = -EBUSY;
31922 else
31923 tty_ldiscs[disc] = NULL;
31924 @@ -158,7 +158,7 @@ static struct tty_ldisc_ops *get_ldops(int disc)
31925 if (ldops) {
31926 ret = ERR_PTR(-EAGAIN);
31927 if (try_module_get(ldops->owner)) {
31928 - ldops->refcount++;
31929 + atomic_inc(&ldops->refcount);
31930 ret = ldops;
31931 }
31932 }
31933 @@ -171,7 +171,7 @@ static void put_ldops(struct tty_ldisc_ops *ldops)
31934 unsigned long flags;
31935
31936 spin_lock_irqsave(&tty_ldisc_lock, flags);
31937 - ldops->refcount--;
31938 + atomic_dec(&ldops->refcount);
31939 module_put(ldops->owner);
31940 spin_unlock_irqrestore(&tty_ldisc_lock, flags);
31941 }
31942 diff --git a/drivers/char/virtio_console.c b/drivers/char/virtio_console.c
31943 index a035ae3..c27fe2c 100644
31944 --- a/drivers/char/virtio_console.c
31945 +++ b/drivers/char/virtio_console.c
31946 @@ -133,7 +133,9 @@ static int get_chars(u32 vtermno, char *buf, int count)
31947 * virtqueue, so we let the drivers do some boutique early-output thing. */
31948 int __init virtio_cons_early_init(int (*put_chars)(u32, const char *, int))
31949 {
31950 - virtio_cons.put_chars = put_chars;
31951 + pax_open_kernel();
31952 + *(void **)&virtio_cons.put_chars = put_chars;
31953 + pax_close_kernel();
31954 return hvc_instantiate(0, 0, &virtio_cons);
31955 }
31956
31957 @@ -213,11 +215,13 @@ static int __devinit virtcons_probe(struct virtio_device *dev)
31958 out_vq = vqs[1];
31959
31960 /* Start using the new console output. */
31961 - virtio_cons.get_chars = get_chars;
31962 - virtio_cons.put_chars = put_chars;
31963 - virtio_cons.notifier_add = notifier_add_vio;
31964 - virtio_cons.notifier_del = notifier_del_vio;
31965 - virtio_cons.notifier_hangup = notifier_del_vio;
31966 + pax_open_kernel();
31967 + *(void **)&virtio_cons.get_chars = get_chars;
31968 + *(void **)&virtio_cons.put_chars = put_chars;
31969 + *(void **)&virtio_cons.notifier_add = notifier_add_vio;
31970 + *(void **)&virtio_cons.notifier_del = notifier_del_vio;
31971 + *(void **)&virtio_cons.notifier_hangup = notifier_del_vio;
31972 + pax_close_kernel();
31973
31974 /* The first argument of hvc_alloc() is the virtual console number, so
31975 * we use zero. The second argument is the parameter for the
31976 diff --git a/drivers/char/vt.c b/drivers/char/vt.c
31977 index 0c80c68..53d59c1 100644
31978 --- a/drivers/char/vt.c
31979 +++ b/drivers/char/vt.c
31980 @@ -243,7 +243,7 @@ EXPORT_SYMBOL_GPL(unregister_vt_notifier);
31981
31982 static void notify_write(struct vc_data *vc, unsigned int unicode)
31983 {
31984 - struct vt_notifier_param param = { .vc = vc, unicode = unicode };
31985 + struct vt_notifier_param param = { .vc = vc, .c = unicode };
31986 atomic_notifier_call_chain(&vt_notifier_list, VT_WRITE, &param);
31987 }
31988
31989 diff --git a/drivers/char/vt_ioctl.c b/drivers/char/vt_ioctl.c
31990 index 6351a26..999af95 100644
31991 --- a/drivers/char/vt_ioctl.c
31992 +++ b/drivers/char/vt_ioctl.c
31993 @@ -210,9 +210,6 @@ do_kdsk_ioctl(int cmd, struct kbentry __user *user_kbe, int perm, struct kbd_str
31994 if (copy_from_user(&tmp, user_kbe, sizeof(struct kbentry)))
31995 return -EFAULT;
31996
31997 - if (!capable(CAP_SYS_TTY_CONFIG))
31998 - perm = 0;
31999 -
32000 switch (cmd) {
32001 case KDGKBENT:
32002 key_map = key_maps[s];
32003 @@ -224,8 +221,12 @@ do_kdsk_ioctl(int cmd, struct kbentry __user *user_kbe, int perm, struct kbd_str
32004 val = (i ? K_HOLE : K_NOSUCHMAP);
32005 return put_user(val, &user_kbe->kb_value);
32006 case KDSKBENT:
32007 + if (!capable(CAP_SYS_TTY_CONFIG))
32008 + perm = 0;
32009 +
32010 if (!perm)
32011 return -EPERM;
32012 +
32013 if (!i && v == K_NOSUCHMAP) {
32014 /* deallocate map */
32015 key_map = key_maps[s];
32016 @@ -325,9 +326,6 @@ do_kdgkb_ioctl(int cmd, struct kbsentry __user *user_kdgkb, int perm)
32017 int i, j, k;
32018 int ret;
32019
32020 - if (!capable(CAP_SYS_TTY_CONFIG))
32021 - perm = 0;
32022 -
32023 kbs = kmalloc(sizeof(*kbs), GFP_KERNEL);
32024 if (!kbs) {
32025 ret = -ENOMEM;
32026 @@ -361,6 +359,9 @@ do_kdgkb_ioctl(int cmd, struct kbsentry __user *user_kdgkb, int perm)
32027 kfree(kbs);
32028 return ((p && *p) ? -EOVERFLOW : 0);
32029 case KDSKBSENT:
32030 + if (!capable(CAP_SYS_TTY_CONFIG))
32031 + perm = 0;
32032 +
32033 if (!perm) {
32034 ret = -EPERM;
32035 goto reterr;
32036 diff --git a/drivers/cpufreq/cpufreq.c b/drivers/cpufreq/cpufreq.c
32037 index c7ae026..1769c1d 100644
32038 --- a/drivers/cpufreq/cpufreq.c
32039 +++ b/drivers/cpufreq/cpufreq.c
32040 @@ -750,7 +750,7 @@ static void cpufreq_sysfs_release(struct kobject *kobj)
32041 complete(&policy->kobj_unregister);
32042 }
32043
32044 -static struct sysfs_ops sysfs_ops = {
32045 +static const struct sysfs_ops sysfs_ops = {
32046 .show = show,
32047 .store = store,
32048 };
32049 diff --git a/drivers/cpuidle/sysfs.c b/drivers/cpuidle/sysfs.c
32050 index 97b0038..2056670 100644
32051 --- a/drivers/cpuidle/sysfs.c
32052 +++ b/drivers/cpuidle/sysfs.c
32053 @@ -191,7 +191,7 @@ static ssize_t cpuidle_store(struct kobject * kobj, struct attribute * attr,
32054 return ret;
32055 }
32056
32057 -static struct sysfs_ops cpuidle_sysfs_ops = {
32058 +static const struct sysfs_ops cpuidle_sysfs_ops = {
32059 .show = cpuidle_show,
32060 .store = cpuidle_store,
32061 };
32062 @@ -277,7 +277,7 @@ static ssize_t cpuidle_state_show(struct kobject * kobj,
32063 return ret;
32064 }
32065
32066 -static struct sysfs_ops cpuidle_state_sysfs_ops = {
32067 +static const struct sysfs_ops cpuidle_state_sysfs_ops = {
32068 .show = cpuidle_state_show,
32069 };
32070
32071 @@ -294,7 +294,7 @@ static struct kobj_type ktype_state_cpuidle = {
32072 .release = cpuidle_state_sysfs_release,
32073 };
32074
32075 -static void inline cpuidle_free_state_kobj(struct cpuidle_device *device, int i)
32076 +static inline void cpuidle_free_state_kobj(struct cpuidle_device *device, int i)
32077 {
32078 kobject_put(&device->kobjs[i]->kobj);
32079 wait_for_completion(&device->kobjs[i]->kobj_unregister);
32080 diff --git a/drivers/crypto/hifn_795x.c b/drivers/crypto/hifn_795x.c
32081 index 5f753fc..0377ae9 100644
32082 --- a/drivers/crypto/hifn_795x.c
32083 +++ b/drivers/crypto/hifn_795x.c
32084 @@ -1655,6 +1655,8 @@ static int hifn_test(struct hifn_device *dev, int encdec, u8 snum)
32085 0xCA, 0x34, 0x2B, 0x2E};
32086 struct scatterlist sg;
32087
32088 + pax_track_stack();
32089 +
32090 memset(src, 0, sizeof(src));
32091 memset(ctx.key, 0, sizeof(ctx.key));
32092
32093 diff --git a/drivers/crypto/padlock-aes.c b/drivers/crypto/padlock-aes.c
32094 index 71e6482..de8d96c 100644
32095 --- a/drivers/crypto/padlock-aes.c
32096 +++ b/drivers/crypto/padlock-aes.c
32097 @@ -108,6 +108,8 @@ static int aes_set_key(struct crypto_tfm *tfm, const u8 *in_key,
32098 struct crypto_aes_ctx gen_aes;
32099 int cpu;
32100
32101 + pax_track_stack();
32102 +
32103 if (key_len % 8) {
32104 *flags |= CRYPTO_TFM_RES_BAD_KEY_LEN;
32105 return -EINVAL;
32106 diff --git a/drivers/dma/ioat/dma.c b/drivers/dma/ioat/dma.c
32107 index dcc4ab7..cc834bb 100644
32108 --- a/drivers/dma/ioat/dma.c
32109 +++ b/drivers/dma/ioat/dma.c
32110 @@ -1146,7 +1146,7 @@ ioat_attr_show(struct kobject *kobj, struct attribute *attr, char *page)
32111 return entry->show(&chan->common, page);
32112 }
32113
32114 -struct sysfs_ops ioat_sysfs_ops = {
32115 +const struct sysfs_ops ioat_sysfs_ops = {
32116 .show = ioat_attr_show,
32117 };
32118
32119 diff --git a/drivers/dma/ioat/dma.h b/drivers/dma/ioat/dma.h
32120 index bbc3e78..f2db62c 100644
32121 --- a/drivers/dma/ioat/dma.h
32122 +++ b/drivers/dma/ioat/dma.h
32123 @@ -347,7 +347,7 @@ bool ioat_cleanup_preamble(struct ioat_chan_common *chan,
32124 unsigned long *phys_complete);
32125 void ioat_kobject_add(struct ioatdma_device *device, struct kobj_type *type);
32126 void ioat_kobject_del(struct ioatdma_device *device);
32127 -extern struct sysfs_ops ioat_sysfs_ops;
32128 +extern const struct sysfs_ops ioat_sysfs_ops;
32129 extern struct ioat_sysfs_entry ioat_version_attr;
32130 extern struct ioat_sysfs_entry ioat_cap_attr;
32131 #endif /* IOATDMA_H */
32132 diff --git a/drivers/dma/ioat/dma_v3.c b/drivers/dma/ioat/dma_v3.c
32133 index 9908c9e..3ceb0e5 100644
32134 --- a/drivers/dma/ioat/dma_v3.c
32135 +++ b/drivers/dma/ioat/dma_v3.c
32136 @@ -71,10 +71,10 @@
32137 /* provide a lookup table for setting the source address in the base or
32138 * extended descriptor of an xor or pq descriptor
32139 */
32140 -static const u8 xor_idx_to_desc __read_mostly = 0xd0;
32141 -static const u8 xor_idx_to_field[] __read_mostly = { 1, 4, 5, 6, 7, 0, 1, 2 };
32142 -static const u8 pq_idx_to_desc __read_mostly = 0xf8;
32143 -static const u8 pq_idx_to_field[] __read_mostly = { 1, 4, 5, 0, 1, 2, 4, 5 };
32144 +static const u8 xor_idx_to_desc = 0xd0;
32145 +static const u8 xor_idx_to_field[] = { 1, 4, 5, 6, 7, 0, 1, 2 };
32146 +static const u8 pq_idx_to_desc = 0xf8;
32147 +static const u8 pq_idx_to_field[] = { 1, 4, 5, 0, 1, 2, 4, 5 };
32148
32149 static dma_addr_t xor_get_src(struct ioat_raw_descriptor *descs[2], int idx)
32150 {
32151 diff --git a/drivers/edac/amd64_edac.c b/drivers/edac/amd64_edac.c
32152 index 85c464a..afd1e73 100644
32153 --- a/drivers/edac/amd64_edac.c
32154 +++ b/drivers/edac/amd64_edac.c
32155 @@ -3099,7 +3099,7 @@ static void __devexit amd64_remove_one_instance(struct pci_dev *pdev)
32156 * PCI core identifies what devices are on a system during boot, and then
32157 * inquiry this table to see if this driver is for a given device found.
32158 */
32159 -static const struct pci_device_id amd64_pci_table[] __devinitdata = {
32160 +static const struct pci_device_id amd64_pci_table[] __devinitconst = {
32161 {
32162 .vendor = PCI_VENDOR_ID_AMD,
32163 .device = PCI_DEVICE_ID_AMD_K8_NB_MEMCTL,
32164 diff --git a/drivers/edac/amd76x_edac.c b/drivers/edac/amd76x_edac.c
32165 index 2b95f1a..4f52793 100644
32166 --- a/drivers/edac/amd76x_edac.c
32167 +++ b/drivers/edac/amd76x_edac.c
32168 @@ -322,7 +322,7 @@ static void __devexit amd76x_remove_one(struct pci_dev *pdev)
32169 edac_mc_free(mci);
32170 }
32171
32172 -static const struct pci_device_id amd76x_pci_tbl[] __devinitdata = {
32173 +static const struct pci_device_id amd76x_pci_tbl[] __devinitconst = {
32174 {
32175 PCI_VEND_DEV(AMD, FE_GATE_700C), PCI_ANY_ID, PCI_ANY_ID, 0, 0,
32176 AMD762},
32177 diff --git a/drivers/edac/e752x_edac.c b/drivers/edac/e752x_edac.c
32178 index d205d49..74c9672 100644
32179 --- a/drivers/edac/e752x_edac.c
32180 +++ b/drivers/edac/e752x_edac.c
32181 @@ -1282,7 +1282,7 @@ static void __devexit e752x_remove_one(struct pci_dev *pdev)
32182 edac_mc_free(mci);
32183 }
32184
32185 -static const struct pci_device_id e752x_pci_tbl[] __devinitdata = {
32186 +static const struct pci_device_id e752x_pci_tbl[] __devinitconst = {
32187 {
32188 PCI_VEND_DEV(INTEL, 7520_0), PCI_ANY_ID, PCI_ANY_ID, 0, 0,
32189 E7520},
32190 diff --git a/drivers/edac/e7xxx_edac.c b/drivers/edac/e7xxx_edac.c
32191 index c7d11cc..c59c1ca 100644
32192 --- a/drivers/edac/e7xxx_edac.c
32193 +++ b/drivers/edac/e7xxx_edac.c
32194 @@ -526,7 +526,7 @@ static void __devexit e7xxx_remove_one(struct pci_dev *pdev)
32195 edac_mc_free(mci);
32196 }
32197
32198 -static const struct pci_device_id e7xxx_pci_tbl[] __devinitdata = {
32199 +static const struct pci_device_id e7xxx_pci_tbl[] __devinitconst = {
32200 {
32201 PCI_VEND_DEV(INTEL, 7205_0), PCI_ANY_ID, PCI_ANY_ID, 0, 0,
32202 E7205},
32203 diff --git a/drivers/edac/edac_device_sysfs.c b/drivers/edac/edac_device_sysfs.c
32204 index 5376457..5fdedbc 100644
32205 --- a/drivers/edac/edac_device_sysfs.c
32206 +++ b/drivers/edac/edac_device_sysfs.c
32207 @@ -137,7 +137,7 @@ static ssize_t edac_dev_ctl_info_store(struct kobject *kobj,
32208 }
32209
32210 /* edac_dev file operations for an 'ctl_info' */
32211 -static struct sysfs_ops device_ctl_info_ops = {
32212 +static const struct sysfs_ops device_ctl_info_ops = {
32213 .show = edac_dev_ctl_info_show,
32214 .store = edac_dev_ctl_info_store
32215 };
32216 @@ -373,7 +373,7 @@ static ssize_t edac_dev_instance_store(struct kobject *kobj,
32217 }
32218
32219 /* edac_dev file operations for an 'instance' */
32220 -static struct sysfs_ops device_instance_ops = {
32221 +static const struct sysfs_ops device_instance_ops = {
32222 .show = edac_dev_instance_show,
32223 .store = edac_dev_instance_store
32224 };
32225 @@ -476,7 +476,7 @@ static ssize_t edac_dev_block_store(struct kobject *kobj,
32226 }
32227
32228 /* edac_dev file operations for a 'block' */
32229 -static struct sysfs_ops device_block_ops = {
32230 +static const struct sysfs_ops device_block_ops = {
32231 .show = edac_dev_block_show,
32232 .store = edac_dev_block_store
32233 };
32234 diff --git a/drivers/edac/edac_mc_sysfs.c b/drivers/edac/edac_mc_sysfs.c
32235 index e1d4ce0..88840e9 100644
32236 --- a/drivers/edac/edac_mc_sysfs.c
32237 +++ b/drivers/edac/edac_mc_sysfs.c
32238 @@ -245,7 +245,7 @@ static ssize_t csrowdev_store(struct kobject *kobj, struct attribute *attr,
32239 return -EIO;
32240 }
32241
32242 -static struct sysfs_ops csrowfs_ops = {
32243 +static const struct sysfs_ops csrowfs_ops = {
32244 .show = csrowdev_show,
32245 .store = csrowdev_store
32246 };
32247 @@ -575,7 +575,7 @@ static ssize_t mcidev_store(struct kobject *kobj, struct attribute *attr,
32248 }
32249
32250 /* Intermediate show/store table */
32251 -static struct sysfs_ops mci_ops = {
32252 +static const struct sysfs_ops mci_ops = {
32253 .show = mcidev_show,
32254 .store = mcidev_store
32255 };
32256 diff --git a/drivers/edac/edac_pci_sysfs.c b/drivers/edac/edac_pci_sysfs.c
32257 index 422728c..d8d9c88 100644
32258 --- a/drivers/edac/edac_pci_sysfs.c
32259 +++ b/drivers/edac/edac_pci_sysfs.c
32260 @@ -25,8 +25,8 @@ static int edac_pci_log_pe = 1; /* log PCI parity errors */
32261 static int edac_pci_log_npe = 1; /* log PCI non-parity error errors */
32262 static int edac_pci_poll_msec = 1000; /* one second workq period */
32263
32264 -static atomic_t pci_parity_count = ATOMIC_INIT(0);
32265 -static atomic_t pci_nonparity_count = ATOMIC_INIT(0);
32266 +static atomic_unchecked_t pci_parity_count = ATOMIC_INIT(0);
32267 +static atomic_unchecked_t pci_nonparity_count = ATOMIC_INIT(0);
32268
32269 static struct kobject *edac_pci_top_main_kobj;
32270 static atomic_t edac_pci_sysfs_refcount = ATOMIC_INIT(0);
32271 @@ -121,7 +121,7 @@ static ssize_t edac_pci_instance_store(struct kobject *kobj,
32272 }
32273
32274 /* fs_ops table */
32275 -static struct sysfs_ops pci_instance_ops = {
32276 +static const struct sysfs_ops pci_instance_ops = {
32277 .show = edac_pci_instance_show,
32278 .store = edac_pci_instance_store
32279 };
32280 @@ -261,7 +261,7 @@ static ssize_t edac_pci_dev_store(struct kobject *kobj,
32281 return -EIO;
32282 }
32283
32284 -static struct sysfs_ops edac_pci_sysfs_ops = {
32285 +static const struct sysfs_ops edac_pci_sysfs_ops = {
32286 .show = edac_pci_dev_show,
32287 .store = edac_pci_dev_store
32288 };
32289 @@ -579,7 +579,7 @@ static void edac_pci_dev_parity_test(struct pci_dev *dev)
32290 edac_printk(KERN_CRIT, EDAC_PCI,
32291 "Signaled System Error on %s\n",
32292 pci_name(dev));
32293 - atomic_inc(&pci_nonparity_count);
32294 + atomic_inc_unchecked(&pci_nonparity_count);
32295 }
32296
32297 if (status & (PCI_STATUS_PARITY)) {
32298 @@ -587,7 +587,7 @@ static void edac_pci_dev_parity_test(struct pci_dev *dev)
32299 "Master Data Parity Error on %s\n",
32300 pci_name(dev));
32301
32302 - atomic_inc(&pci_parity_count);
32303 + atomic_inc_unchecked(&pci_parity_count);
32304 }
32305
32306 if (status & (PCI_STATUS_DETECTED_PARITY)) {
32307 @@ -595,7 +595,7 @@ static void edac_pci_dev_parity_test(struct pci_dev *dev)
32308 "Detected Parity Error on %s\n",
32309 pci_name(dev));
32310
32311 - atomic_inc(&pci_parity_count);
32312 + atomic_inc_unchecked(&pci_parity_count);
32313 }
32314 }
32315
32316 @@ -616,7 +616,7 @@ static void edac_pci_dev_parity_test(struct pci_dev *dev)
32317 edac_printk(KERN_CRIT, EDAC_PCI, "Bridge "
32318 "Signaled System Error on %s\n",
32319 pci_name(dev));
32320 - atomic_inc(&pci_nonparity_count);
32321 + atomic_inc_unchecked(&pci_nonparity_count);
32322 }
32323
32324 if (status & (PCI_STATUS_PARITY)) {
32325 @@ -624,7 +624,7 @@ static void edac_pci_dev_parity_test(struct pci_dev *dev)
32326 "Master Data Parity Error on "
32327 "%s\n", pci_name(dev));
32328
32329 - atomic_inc(&pci_parity_count);
32330 + atomic_inc_unchecked(&pci_parity_count);
32331 }
32332
32333 if (status & (PCI_STATUS_DETECTED_PARITY)) {
32334 @@ -632,7 +632,7 @@ static void edac_pci_dev_parity_test(struct pci_dev *dev)
32335 "Detected Parity Error on %s\n",
32336 pci_name(dev));
32337
32338 - atomic_inc(&pci_parity_count);
32339 + atomic_inc_unchecked(&pci_parity_count);
32340 }
32341 }
32342 }
32343 @@ -674,7 +674,7 @@ void edac_pci_do_parity_check(void)
32344 if (!check_pci_errors)
32345 return;
32346
32347 - before_count = atomic_read(&pci_parity_count);
32348 + before_count = atomic_read_unchecked(&pci_parity_count);
32349
32350 /* scan all PCI devices looking for a Parity Error on devices and
32351 * bridges.
32352 @@ -686,7 +686,7 @@ void edac_pci_do_parity_check(void)
32353 /* Only if operator has selected panic on PCI Error */
32354 if (edac_pci_get_panic_on_pe()) {
32355 /* If the count is different 'after' from 'before' */
32356 - if (before_count != atomic_read(&pci_parity_count))
32357 + if (before_count != atomic_read_unchecked(&pci_parity_count))
32358 panic("EDAC: PCI Parity Error");
32359 }
32360 }
32361 diff --git a/drivers/edac/i3000_edac.c b/drivers/edac/i3000_edac.c
32362 index 6c9a0f2..9c1cf7e 100644
32363 --- a/drivers/edac/i3000_edac.c
32364 +++ b/drivers/edac/i3000_edac.c
32365 @@ -471,7 +471,7 @@ static void __devexit i3000_remove_one(struct pci_dev *pdev)
32366 edac_mc_free(mci);
32367 }
32368
32369 -static const struct pci_device_id i3000_pci_tbl[] __devinitdata = {
32370 +static const struct pci_device_id i3000_pci_tbl[] __devinitconst = {
32371 {
32372 PCI_VEND_DEV(INTEL, 3000_HB), PCI_ANY_ID, PCI_ANY_ID, 0, 0,
32373 I3000},
32374 diff --git a/drivers/edac/i3200_edac.c b/drivers/edac/i3200_edac.c
32375 index fde4db9..fe108f9 100644
32376 --- a/drivers/edac/i3200_edac.c
32377 +++ b/drivers/edac/i3200_edac.c
32378 @@ -444,7 +444,7 @@ static void __devexit i3200_remove_one(struct pci_dev *pdev)
32379 edac_mc_free(mci);
32380 }
32381
32382 -static const struct pci_device_id i3200_pci_tbl[] __devinitdata = {
32383 +static const struct pci_device_id i3200_pci_tbl[] __devinitconst = {
32384 {
32385 PCI_VEND_DEV(INTEL, 3200_HB), PCI_ANY_ID, PCI_ANY_ID, 0, 0,
32386 I3200},
32387 diff --git a/drivers/edac/i5000_edac.c b/drivers/edac/i5000_edac.c
32388 index adc10a2..57d4ccf 100644
32389 --- a/drivers/edac/i5000_edac.c
32390 +++ b/drivers/edac/i5000_edac.c
32391 @@ -1516,7 +1516,7 @@ static void __devexit i5000_remove_one(struct pci_dev *pdev)
32392 *
32393 * The "E500P" device is the first device supported.
32394 */
32395 -static const struct pci_device_id i5000_pci_tbl[] __devinitdata = {
32396 +static const struct pci_device_id i5000_pci_tbl[] __devinitconst = {
32397 {PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_I5000_DEV16),
32398 .driver_data = I5000P},
32399
32400 diff --git a/drivers/edac/i5100_edac.c b/drivers/edac/i5100_edac.c
32401 index 22db05a..b2b5503 100644
32402 --- a/drivers/edac/i5100_edac.c
32403 +++ b/drivers/edac/i5100_edac.c
32404 @@ -944,7 +944,7 @@ static void __devexit i5100_remove_one(struct pci_dev *pdev)
32405 edac_mc_free(mci);
32406 }
32407
32408 -static const struct pci_device_id i5100_pci_tbl[] __devinitdata = {
32409 +static const struct pci_device_id i5100_pci_tbl[] __devinitconst = {
32410 /* Device 16, Function 0, Channel 0 Memory Map, Error Flag/Mask, ... */
32411 { PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_5100_16) },
32412 { 0, }
32413 diff --git a/drivers/edac/i5400_edac.c b/drivers/edac/i5400_edac.c
32414 index f99d106..f050710 100644
32415 --- a/drivers/edac/i5400_edac.c
32416 +++ b/drivers/edac/i5400_edac.c
32417 @@ -1383,7 +1383,7 @@ static void __devexit i5400_remove_one(struct pci_dev *pdev)
32418 *
32419 * The "E500P" device is the first device supported.
32420 */
32421 -static const struct pci_device_id i5400_pci_tbl[] __devinitdata = {
32422 +static const struct pci_device_id i5400_pci_tbl[] __devinitconst = {
32423 {PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_5400_ERR)},
32424 {0,} /* 0 terminated list. */
32425 };
32426 diff --git a/drivers/edac/i82443bxgx_edac.c b/drivers/edac/i82443bxgx_edac.c
32427 index 577760a..9ce16ce 100644
32428 --- a/drivers/edac/i82443bxgx_edac.c
32429 +++ b/drivers/edac/i82443bxgx_edac.c
32430 @@ -381,7 +381,7 @@ static void __devexit i82443bxgx_edacmc_remove_one(struct pci_dev *pdev)
32431
32432 EXPORT_SYMBOL_GPL(i82443bxgx_edacmc_remove_one);
32433
32434 -static const struct pci_device_id i82443bxgx_pci_tbl[] __devinitdata = {
32435 +static const struct pci_device_id i82443bxgx_pci_tbl[] __devinitconst = {
32436 {PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82443BX_0)},
32437 {PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82443BX_2)},
32438 {PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82443GX_0)},
32439 diff --git a/drivers/edac/i82860_edac.c b/drivers/edac/i82860_edac.c
32440 index c0088ba..64a7b98 100644
32441 --- a/drivers/edac/i82860_edac.c
32442 +++ b/drivers/edac/i82860_edac.c
32443 @@ -271,7 +271,7 @@ static void __devexit i82860_remove_one(struct pci_dev *pdev)
32444 edac_mc_free(mci);
32445 }
32446
32447 -static const struct pci_device_id i82860_pci_tbl[] __devinitdata = {
32448 +static const struct pci_device_id i82860_pci_tbl[] __devinitconst = {
32449 {
32450 PCI_VEND_DEV(INTEL, 82860_0), PCI_ANY_ID, PCI_ANY_ID, 0, 0,
32451 I82860},
32452 diff --git a/drivers/edac/i82875p_edac.c b/drivers/edac/i82875p_edac.c
32453 index b2d83b9..a34357b 100644
32454 --- a/drivers/edac/i82875p_edac.c
32455 +++ b/drivers/edac/i82875p_edac.c
32456 @@ -512,7 +512,7 @@ static void __devexit i82875p_remove_one(struct pci_dev *pdev)
32457 edac_mc_free(mci);
32458 }
32459
32460 -static const struct pci_device_id i82875p_pci_tbl[] __devinitdata = {
32461 +static const struct pci_device_id i82875p_pci_tbl[] __devinitconst = {
32462 {
32463 PCI_VEND_DEV(INTEL, 82875_0), PCI_ANY_ID, PCI_ANY_ID, 0, 0,
32464 I82875P},
32465 diff --git a/drivers/edac/i82975x_edac.c b/drivers/edac/i82975x_edac.c
32466 index 2eed3ea..87bbbd1 100644
32467 --- a/drivers/edac/i82975x_edac.c
32468 +++ b/drivers/edac/i82975x_edac.c
32469 @@ -586,7 +586,7 @@ static void __devexit i82975x_remove_one(struct pci_dev *pdev)
32470 edac_mc_free(mci);
32471 }
32472
32473 -static const struct pci_device_id i82975x_pci_tbl[] __devinitdata = {
32474 +static const struct pci_device_id i82975x_pci_tbl[] __devinitconst = {
32475 {
32476 PCI_VEND_DEV(INTEL, 82975_0), PCI_ANY_ID, PCI_ANY_ID, 0, 0,
32477 I82975X
32478 diff --git a/drivers/edac/r82600_edac.c b/drivers/edac/r82600_edac.c
32479 index 9900675..78ac2b6 100644
32480 --- a/drivers/edac/r82600_edac.c
32481 +++ b/drivers/edac/r82600_edac.c
32482 @@ -374,7 +374,7 @@ static void __devexit r82600_remove_one(struct pci_dev *pdev)
32483 edac_mc_free(mci);
32484 }
32485
32486 -static const struct pci_device_id r82600_pci_tbl[] __devinitdata = {
32487 +static const struct pci_device_id r82600_pci_tbl[] __devinitconst = {
32488 {
32489 PCI_DEVICE(PCI_VENDOR_ID_RADISYS, R82600_BRIDGE_ID)
32490 },
32491 diff --git a/drivers/edac/x38_edac.c b/drivers/edac/x38_edac.c
32492 index d4ec605..4cfec4e 100644
32493 --- a/drivers/edac/x38_edac.c
32494 +++ b/drivers/edac/x38_edac.c
32495 @@ -441,7 +441,7 @@ static void __devexit x38_remove_one(struct pci_dev *pdev)
32496 edac_mc_free(mci);
32497 }
32498
32499 -static const struct pci_device_id x38_pci_tbl[] __devinitdata = {
32500 +static const struct pci_device_id x38_pci_tbl[] __devinitconst = {
32501 {
32502 PCI_VEND_DEV(INTEL, X38_HB), PCI_ANY_ID, PCI_ANY_ID, 0, 0,
32503 X38},
32504 diff --git a/drivers/firewire/core-card.c b/drivers/firewire/core-card.c
32505 index 3fc2ceb..daf098f 100644
32506 --- a/drivers/firewire/core-card.c
32507 +++ b/drivers/firewire/core-card.c
32508 @@ -558,7 +558,7 @@ void fw_card_release(struct kref *kref)
32509
32510 void fw_core_remove_card(struct fw_card *card)
32511 {
32512 - struct fw_card_driver dummy_driver = dummy_driver_template;
32513 + fw_card_driver_no_const dummy_driver = dummy_driver_template;
32514
32515 card->driver->update_phy_reg(card, 4,
32516 PHY_LINK_ACTIVE | PHY_CONTENDER, 0);
32517 diff --git a/drivers/firewire/core-cdev.c b/drivers/firewire/core-cdev.c
32518 index 4560d8f..36db24a 100644
32519 --- a/drivers/firewire/core-cdev.c
32520 +++ b/drivers/firewire/core-cdev.c
32521 @@ -1141,8 +1141,7 @@ static int init_iso_resource(struct client *client,
32522 int ret;
32523
32524 if ((request->channels == 0 && request->bandwidth == 0) ||
32525 - request->bandwidth > BANDWIDTH_AVAILABLE_INITIAL ||
32526 - request->bandwidth < 0)
32527 + request->bandwidth > BANDWIDTH_AVAILABLE_INITIAL)
32528 return -EINVAL;
32529
32530 r = kmalloc(sizeof(*r), GFP_KERNEL);
32531 diff --git a/drivers/firewire/core-transaction.c b/drivers/firewire/core-transaction.c
32532 index da628c7..cf54a2c 100644
32533 --- a/drivers/firewire/core-transaction.c
32534 +++ b/drivers/firewire/core-transaction.c
32535 @@ -36,6 +36,7 @@
32536 #include <linux/string.h>
32537 #include <linux/timer.h>
32538 #include <linux/types.h>
32539 +#include <linux/sched.h>
32540
32541 #include <asm/byteorder.h>
32542
32543 @@ -344,6 +345,8 @@ int fw_run_transaction(struct fw_card *card, int tcode, int destination_id,
32544 struct transaction_callback_data d;
32545 struct fw_transaction t;
32546
32547 + pax_track_stack();
32548 +
32549 init_completion(&d.done);
32550 d.payload = payload;
32551 fw_send_request(card, &t, tcode, destination_id, generation, speed,
32552 diff --git a/drivers/firewire/core.h b/drivers/firewire/core.h
32553 index 7ff6e75..a2965d9 100644
32554 --- a/drivers/firewire/core.h
32555 +++ b/drivers/firewire/core.h
32556 @@ -86,6 +86,7 @@ struct fw_card_driver {
32557
32558 int (*stop_iso)(struct fw_iso_context *ctx);
32559 };
32560 +typedef struct fw_card_driver __no_const fw_card_driver_no_const;
32561
32562 void fw_card_initialize(struct fw_card *card,
32563 const struct fw_card_driver *driver, struct device *device);
32564 diff --git a/drivers/firmware/dmi_scan.c b/drivers/firmware/dmi_scan.c
32565 index 3a2ccb0..82fd7c4 100644
32566 --- a/drivers/firmware/dmi_scan.c
32567 +++ b/drivers/firmware/dmi_scan.c
32568 @@ -391,11 +391,6 @@ void __init dmi_scan_machine(void)
32569 }
32570 }
32571 else {
32572 - /*
32573 - * no iounmap() for that ioremap(); it would be a no-op, but
32574 - * it's so early in setup that sucker gets confused into doing
32575 - * what it shouldn't if we actually call it.
32576 - */
32577 p = dmi_ioremap(0xF0000, 0x10000);
32578 if (p == NULL)
32579 goto error;
32580 @@ -667,7 +662,7 @@ int dmi_walk(void (*decode)(const struct dmi_header *, void *),
32581 if (buf == NULL)
32582 return -1;
32583
32584 - dmi_table(buf, dmi_len, dmi_num, decode, private_data);
32585 + dmi_table((char __force_kernel *)buf, dmi_len, dmi_num, decode, private_data);
32586
32587 iounmap(buf);
32588 return 0;
32589 diff --git a/drivers/firmware/edd.c b/drivers/firmware/edd.c
32590 index 9e4f59d..110e24e 100644
32591 --- a/drivers/firmware/edd.c
32592 +++ b/drivers/firmware/edd.c
32593 @@ -122,7 +122,7 @@ edd_attr_show(struct kobject * kobj, struct attribute *attr, char *buf)
32594 return ret;
32595 }
32596
32597 -static struct sysfs_ops edd_attr_ops = {
32598 +static const struct sysfs_ops edd_attr_ops = {
32599 .show = edd_attr_show,
32600 };
32601
32602 diff --git a/drivers/firmware/efivars.c b/drivers/firmware/efivars.c
32603 index f4f709d..082f06e 100644
32604 --- a/drivers/firmware/efivars.c
32605 +++ b/drivers/firmware/efivars.c
32606 @@ -362,7 +362,7 @@ static ssize_t efivar_attr_store(struct kobject *kobj, struct attribute *attr,
32607 return ret;
32608 }
32609
32610 -static struct sysfs_ops efivar_attr_ops = {
32611 +static const struct sysfs_ops efivar_attr_ops = {
32612 .show = efivar_attr_show,
32613 .store = efivar_attr_store,
32614 };
32615 diff --git a/drivers/firmware/iscsi_ibft.c b/drivers/firmware/iscsi_ibft.c
32616 index 051d1eb..0a5d4e7 100644
32617 --- a/drivers/firmware/iscsi_ibft.c
32618 +++ b/drivers/firmware/iscsi_ibft.c
32619 @@ -525,7 +525,7 @@ static ssize_t ibft_show_attribute(struct kobject *kobj,
32620 return ret;
32621 }
32622
32623 -static struct sysfs_ops ibft_attr_ops = {
32624 +static const struct sysfs_ops ibft_attr_ops = {
32625 .show = ibft_show_attribute,
32626 };
32627
32628 diff --git a/drivers/firmware/memmap.c b/drivers/firmware/memmap.c
32629 index 56f9234..8c58c7b 100644
32630 --- a/drivers/firmware/memmap.c
32631 +++ b/drivers/firmware/memmap.c
32632 @@ -74,7 +74,7 @@ static struct attribute *def_attrs[] = {
32633 NULL
32634 };
32635
32636 -static struct sysfs_ops memmap_attr_ops = {
32637 +static const struct sysfs_ops memmap_attr_ops = {
32638 .show = memmap_attr_show,
32639 };
32640
32641 diff --git a/drivers/gpio/vr41xx_giu.c b/drivers/gpio/vr41xx_giu.c
32642 index b16c9a8..2af7d3f 100644
32643 --- a/drivers/gpio/vr41xx_giu.c
32644 +++ b/drivers/gpio/vr41xx_giu.c
32645 @@ -204,7 +204,7 @@ static int giu_get_irq(unsigned int irq)
32646 printk(KERN_ERR "spurious GIU interrupt: %04x(%04x),%04x(%04x)\n",
32647 maskl, pendl, maskh, pendh);
32648
32649 - atomic_inc(&irq_err_count);
32650 + atomic_inc_unchecked(&irq_err_count);
32651
32652 return -EINVAL;
32653 }
32654 diff --git a/drivers/gpu/drm/drm_crtc.c b/drivers/gpu/drm/drm_crtc.c
32655 index bea6efc..3dc0f42 100644
32656 --- a/drivers/gpu/drm/drm_crtc.c
32657 +++ b/drivers/gpu/drm/drm_crtc.c
32658 @@ -1323,7 +1323,7 @@ int drm_mode_getconnector(struct drm_device *dev, void *data,
32659 */
32660 if ((out_resp->count_modes >= mode_count) && mode_count) {
32661 copied = 0;
32662 - mode_ptr = (struct drm_mode_modeinfo *)(unsigned long)out_resp->modes_ptr;
32663 + mode_ptr = (struct drm_mode_modeinfo __user *)(unsigned long)out_resp->modes_ptr;
32664 list_for_each_entry(mode, &connector->modes, head) {
32665 drm_crtc_convert_to_umode(&u_mode, mode);
32666 if (copy_to_user(mode_ptr + copied,
32667 @@ -1338,8 +1338,8 @@ int drm_mode_getconnector(struct drm_device *dev, void *data,
32668
32669 if ((out_resp->count_props >= props_count) && props_count) {
32670 copied = 0;
32671 - prop_ptr = (uint32_t *)(unsigned long)(out_resp->props_ptr);
32672 - prop_values = (uint64_t *)(unsigned long)(out_resp->prop_values_ptr);
32673 + prop_ptr = (uint32_t __user *)(unsigned long)(out_resp->props_ptr);
32674 + prop_values = (uint64_t __user *)(unsigned long)(out_resp->prop_values_ptr);
32675 for (i = 0; i < DRM_CONNECTOR_MAX_PROPERTY; i++) {
32676 if (connector->property_ids[i] != 0) {
32677 if (put_user(connector->property_ids[i],
32678 @@ -1361,7 +1361,7 @@ int drm_mode_getconnector(struct drm_device *dev, void *data,
32679
32680 if ((out_resp->count_encoders >= encoders_count) && encoders_count) {
32681 copied = 0;
32682 - encoder_ptr = (uint32_t *)(unsigned long)(out_resp->encoders_ptr);
32683 + encoder_ptr = (uint32_t __user *)(unsigned long)(out_resp->encoders_ptr);
32684 for (i = 0; i < DRM_CONNECTOR_MAX_ENCODER; i++) {
32685 if (connector->encoder_ids[i] != 0) {
32686 if (put_user(connector->encoder_ids[i],
32687 @@ -1513,7 +1513,7 @@ int drm_mode_setcrtc(struct drm_device *dev, void *data,
32688 }
32689
32690 for (i = 0; i < crtc_req->count_connectors; i++) {
32691 - set_connectors_ptr = (uint32_t *)(unsigned long)crtc_req->set_connectors_ptr;
32692 + set_connectors_ptr = (uint32_t __user *)(unsigned long)crtc_req->set_connectors_ptr;
32693 if (get_user(out_id, &set_connectors_ptr[i])) {
32694 ret = -EFAULT;
32695 goto out;
32696 @@ -2118,7 +2118,7 @@ int drm_mode_getproperty_ioctl(struct drm_device *dev,
32697 out_resp->flags = property->flags;
32698
32699 if ((out_resp->count_values >= value_count) && value_count) {
32700 - values_ptr = (uint64_t *)(unsigned long)out_resp->values_ptr;
32701 + values_ptr = (uint64_t __user *)(unsigned long)out_resp->values_ptr;
32702 for (i = 0; i < value_count; i++) {
32703 if (copy_to_user(values_ptr + i, &property->values[i], sizeof(uint64_t))) {
32704 ret = -EFAULT;
32705 @@ -2131,7 +2131,7 @@ int drm_mode_getproperty_ioctl(struct drm_device *dev,
32706 if (property->flags & DRM_MODE_PROP_ENUM) {
32707 if ((out_resp->count_enum_blobs >= enum_count) && enum_count) {
32708 copied = 0;
32709 - enum_ptr = (struct drm_mode_property_enum *)(unsigned long)out_resp->enum_blob_ptr;
32710 + enum_ptr = (struct drm_mode_property_enum __user *)(unsigned long)out_resp->enum_blob_ptr;
32711 list_for_each_entry(prop_enum, &property->enum_blob_list, head) {
32712
32713 if (copy_to_user(&enum_ptr[copied].value, &prop_enum->value, sizeof(uint64_t))) {
32714 @@ -2154,7 +2154,7 @@ int drm_mode_getproperty_ioctl(struct drm_device *dev,
32715 if ((out_resp->count_enum_blobs >= blob_count) && blob_count) {
32716 copied = 0;
32717 blob_id_ptr = (uint32_t *)(unsigned long)out_resp->enum_blob_ptr;
32718 - blob_length_ptr = (uint32_t *)(unsigned long)out_resp->values_ptr;
32719 + blob_length_ptr = (uint32_t __user *)(unsigned long)out_resp->values_ptr;
32720
32721 list_for_each_entry(prop_blob, &property->enum_blob_list, head) {
32722 if (put_user(prop_blob->base.id, blob_id_ptr + copied)) {
32723 @@ -2226,7 +2226,7 @@ int drm_mode_getblob_ioctl(struct drm_device *dev,
32724 blob = obj_to_blob(obj);
32725
32726 if (out_resp->length == blob->length) {
32727 - blob_ptr = (void *)(unsigned long)out_resp->data;
32728 + blob_ptr = (void __user *)(unsigned long)out_resp->data;
32729 if (copy_to_user(blob_ptr, blob->data, blob->length)){
32730 ret = -EFAULT;
32731 goto done;
32732 diff --git a/drivers/gpu/drm/drm_crtc_helper.c b/drivers/gpu/drm/drm_crtc_helper.c
32733 index 1b8745d..92fdbf6 100644
32734 --- a/drivers/gpu/drm/drm_crtc_helper.c
32735 +++ b/drivers/gpu/drm/drm_crtc_helper.c
32736 @@ -573,7 +573,7 @@ static bool drm_encoder_crtc_ok(struct drm_encoder *encoder,
32737 struct drm_crtc *tmp;
32738 int crtc_mask = 1;
32739
32740 - WARN(!crtc, "checking null crtc?");
32741 + BUG_ON(!crtc);
32742
32743 dev = crtc->dev;
32744
32745 @@ -642,6 +642,8 @@ bool drm_crtc_helper_set_mode(struct drm_crtc *crtc,
32746
32747 adjusted_mode = drm_mode_duplicate(dev, mode);
32748
32749 + pax_track_stack();
32750 +
32751 crtc->enabled = drm_helper_crtc_in_use(crtc);
32752
32753 if (!crtc->enabled)
32754 diff --git a/drivers/gpu/drm/drm_drv.c b/drivers/gpu/drm/drm_drv.c
32755 index 0e27d98..dec8768 100644
32756 --- a/drivers/gpu/drm/drm_drv.c
32757 +++ b/drivers/gpu/drm/drm_drv.c
32758 @@ -417,7 +417,7 @@ int drm_ioctl(struct inode *inode, struct file *filp,
32759 char *kdata = NULL;
32760
32761 atomic_inc(&dev->ioctl_count);
32762 - atomic_inc(&dev->counts[_DRM_STAT_IOCTLS]);
32763 + atomic_inc_unchecked(&dev->counts[_DRM_STAT_IOCTLS]);
32764 ++file_priv->ioctl_count;
32765
32766 DRM_DEBUG("pid=%d, cmd=0x%02x, nr=0x%02x, dev 0x%lx, auth=%d\n",
32767 diff --git a/drivers/gpu/drm/drm_fops.c b/drivers/gpu/drm/drm_fops.c
32768 index ba14553..182d0bb 100644
32769 --- a/drivers/gpu/drm/drm_fops.c
32770 +++ b/drivers/gpu/drm/drm_fops.c
32771 @@ -66,7 +66,7 @@ static int drm_setup(struct drm_device * dev)
32772 }
32773
32774 for (i = 0; i < ARRAY_SIZE(dev->counts); i++)
32775 - atomic_set(&dev->counts[i], 0);
32776 + atomic_set_unchecked(&dev->counts[i], 0);
32777
32778 dev->sigdata.lock = NULL;
32779
32780 @@ -130,9 +130,9 @@ int drm_open(struct inode *inode, struct file *filp)
32781
32782 retcode = drm_open_helper(inode, filp, dev);
32783 if (!retcode) {
32784 - atomic_inc(&dev->counts[_DRM_STAT_OPENS]);
32785 + atomic_inc_unchecked(&dev->counts[_DRM_STAT_OPENS]);
32786 spin_lock(&dev->count_lock);
32787 - if (!dev->open_count++) {
32788 + if (local_inc_return(&dev->open_count) == 1) {
32789 spin_unlock(&dev->count_lock);
32790 retcode = drm_setup(dev);
32791 goto out;
32792 @@ -435,7 +435,7 @@ int drm_release(struct inode *inode, struct file *filp)
32793
32794 lock_kernel();
32795
32796 - DRM_DEBUG("open_count = %d\n", dev->open_count);
32797 + DRM_DEBUG("open_count = %d\n", local_read(&dev->open_count));
32798
32799 if (dev->driver->preclose)
32800 dev->driver->preclose(dev, file_priv);
32801 @@ -447,7 +447,7 @@ int drm_release(struct inode *inode, struct file *filp)
32802 DRM_DEBUG("pid = %d, device = 0x%lx, open_count = %d\n",
32803 task_pid_nr(current),
32804 (long)old_encode_dev(file_priv->minor->device),
32805 - dev->open_count);
32806 + local_read(&dev->open_count));
32807
32808 /* if the master has gone away we can't do anything with the lock */
32809 if (file_priv->minor->master)
32810 @@ -524,9 +524,9 @@ int drm_release(struct inode *inode, struct file *filp)
32811 * End inline drm_release
32812 */
32813
32814 - atomic_inc(&dev->counts[_DRM_STAT_CLOSES]);
32815 + atomic_inc_unchecked(&dev->counts[_DRM_STAT_CLOSES]);
32816 spin_lock(&dev->count_lock);
32817 - if (!--dev->open_count) {
32818 + if (local_dec_and_test(&dev->open_count)) {
32819 if (atomic_read(&dev->ioctl_count)) {
32820 DRM_ERROR("Device busy: %d\n",
32821 atomic_read(&dev->ioctl_count));
32822 diff --git a/drivers/gpu/drm/drm_gem.c b/drivers/gpu/drm/drm_gem.c
32823 index 8bf3770..79422805 100644
32824 --- a/drivers/gpu/drm/drm_gem.c
32825 +++ b/drivers/gpu/drm/drm_gem.c
32826 @@ -83,11 +83,11 @@ drm_gem_init(struct drm_device *dev)
32827 spin_lock_init(&dev->object_name_lock);
32828 idr_init(&dev->object_name_idr);
32829 atomic_set(&dev->object_count, 0);
32830 - atomic_set(&dev->object_memory, 0);
32831 + atomic_set_unchecked(&dev->object_memory, 0);
32832 atomic_set(&dev->pin_count, 0);
32833 - atomic_set(&dev->pin_memory, 0);
32834 + atomic_set_unchecked(&dev->pin_memory, 0);
32835 atomic_set(&dev->gtt_count, 0);
32836 - atomic_set(&dev->gtt_memory, 0);
32837 + atomic_set_unchecked(&dev->gtt_memory, 0);
32838
32839 mm = kzalloc(sizeof(struct drm_gem_mm), GFP_KERNEL);
32840 if (!mm) {
32841 @@ -150,7 +150,7 @@ drm_gem_object_alloc(struct drm_device *dev, size_t size)
32842 goto fput;
32843 }
32844 atomic_inc(&dev->object_count);
32845 - atomic_add(obj->size, &dev->object_memory);
32846 + atomic_add_unchecked(obj->size, &dev->object_memory);
32847 return obj;
32848 fput:
32849 fput(obj->filp);
32850 @@ -429,7 +429,7 @@ drm_gem_object_free(struct kref *kref)
32851
32852 fput(obj->filp);
32853 atomic_dec(&dev->object_count);
32854 - atomic_sub(obj->size, &dev->object_memory);
32855 + atomic_sub_unchecked(obj->size, &dev->object_memory);
32856 kfree(obj);
32857 }
32858 EXPORT_SYMBOL(drm_gem_object_free);
32859 diff --git a/drivers/gpu/drm/drm_info.c b/drivers/gpu/drm/drm_info.c
32860 index f0f6c6b..34af322 100644
32861 --- a/drivers/gpu/drm/drm_info.c
32862 +++ b/drivers/gpu/drm/drm_info.c
32863 @@ -75,10 +75,14 @@ int drm_vm_info(struct seq_file *m, void *data)
32864 struct drm_local_map *map;
32865 struct drm_map_list *r_list;
32866
32867 - /* Hardcoded from _DRM_FRAME_BUFFER,
32868 - _DRM_REGISTERS, _DRM_SHM, _DRM_AGP, and
32869 - _DRM_SCATTER_GATHER and _DRM_CONSISTENT */
32870 - const char *types[] = { "FB", "REG", "SHM", "AGP", "SG", "PCI" };
32871 + static const char * const types[] = {
32872 + [_DRM_FRAME_BUFFER] = "FB",
32873 + [_DRM_REGISTERS] = "REG",
32874 + [_DRM_SHM] = "SHM",
32875 + [_DRM_AGP] = "AGP",
32876 + [_DRM_SCATTER_GATHER] = "SG",
32877 + [_DRM_CONSISTENT] = "PCI",
32878 + [_DRM_GEM] = "GEM" };
32879 const char *type;
32880 int i;
32881
32882 @@ -89,7 +93,7 @@ int drm_vm_info(struct seq_file *m, void *data)
32883 map = r_list->map;
32884 if (!map)
32885 continue;
32886 - if (map->type < 0 || map->type > 5)
32887 + if (map->type >= ARRAY_SIZE(types))
32888 type = "??";
32889 else
32890 type = types[map->type];
32891 @@ -265,10 +269,10 @@ int drm_gem_object_info(struct seq_file *m, void* data)
32892 struct drm_device *dev = node->minor->dev;
32893
32894 seq_printf(m, "%d objects\n", atomic_read(&dev->object_count));
32895 - seq_printf(m, "%d object bytes\n", atomic_read(&dev->object_memory));
32896 + seq_printf(m, "%d object bytes\n", atomic_read_unchecked(&dev->object_memory));
32897 seq_printf(m, "%d pinned\n", atomic_read(&dev->pin_count));
32898 - seq_printf(m, "%d pin bytes\n", atomic_read(&dev->pin_memory));
32899 - seq_printf(m, "%d gtt bytes\n", atomic_read(&dev->gtt_memory));
32900 + seq_printf(m, "%d pin bytes\n", atomic_read_unchecked(&dev->pin_memory));
32901 + seq_printf(m, "%d gtt bytes\n", atomic_read_unchecked(&dev->gtt_memory));
32902 seq_printf(m, "%d gtt total\n", dev->gtt_total);
32903 return 0;
32904 }
32905 @@ -288,7 +292,11 @@ int drm_vma_info(struct seq_file *m, void *data)
32906 mutex_lock(&dev->struct_mutex);
32907 seq_printf(m, "vma use count: %d, high_memory = %p, 0x%08llx\n",
32908 atomic_read(&dev->vma_count),
32909 +#ifdef CONFIG_GRKERNSEC_HIDESYM
32910 + NULL, 0);
32911 +#else
32912 high_memory, (u64)virt_to_phys(high_memory));
32913 +#endif
32914
32915 list_for_each_entry(pt, &dev->vmalist, head) {
32916 vma = pt->vma;
32917 @@ -296,14 +304,23 @@ int drm_vma_info(struct seq_file *m, void *data)
32918 continue;
32919 seq_printf(m,
32920 "\n%5d 0x%08lx-0x%08lx %c%c%c%c%c%c 0x%08lx000",
32921 - pt->pid, vma->vm_start, vma->vm_end,
32922 + pt->pid,
32923 +#ifdef CONFIG_GRKERNSEC_HIDESYM
32924 + 0, 0,
32925 +#else
32926 + vma->vm_start, vma->vm_end,
32927 +#endif
32928 vma->vm_flags & VM_READ ? 'r' : '-',
32929 vma->vm_flags & VM_WRITE ? 'w' : '-',
32930 vma->vm_flags & VM_EXEC ? 'x' : '-',
32931 vma->vm_flags & VM_MAYSHARE ? 's' : 'p',
32932 vma->vm_flags & VM_LOCKED ? 'l' : '-',
32933 vma->vm_flags & VM_IO ? 'i' : '-',
32934 +#ifdef CONFIG_GRKERNSEC_HIDESYM
32935 + 0);
32936 +#else
32937 vma->vm_pgoff);
32938 +#endif
32939
32940 #if defined(__i386__)
32941 pgprot = pgprot_val(vma->vm_page_prot);
32942 diff --git a/drivers/gpu/drm/drm_ioc32.c b/drivers/gpu/drm/drm_ioc32.c
32943 index 282d9fd..71e5f11 100644
32944 --- a/drivers/gpu/drm/drm_ioc32.c
32945 +++ b/drivers/gpu/drm/drm_ioc32.c
32946 @@ -463,7 +463,7 @@ static int compat_drm_infobufs(struct file *file, unsigned int cmd,
32947 request = compat_alloc_user_space(nbytes);
32948 if (!access_ok(VERIFY_WRITE, request, nbytes))
32949 return -EFAULT;
32950 - list = (struct drm_buf_desc *) (request + 1);
32951 + list = (struct drm_buf_desc __user *) (request + 1);
32952
32953 if (__put_user(count, &request->count)
32954 || __put_user(list, &request->list))
32955 @@ -525,7 +525,7 @@ static int compat_drm_mapbufs(struct file *file, unsigned int cmd,
32956 request = compat_alloc_user_space(nbytes);
32957 if (!access_ok(VERIFY_WRITE, request, nbytes))
32958 return -EFAULT;
32959 - list = (struct drm_buf_pub *) (request + 1);
32960 + list = (struct drm_buf_pub __user *) (request + 1);
32961
32962 if (__put_user(count, &request->count)
32963 || __put_user(list, &request->list))
32964 diff --git a/drivers/gpu/drm/drm_ioctl.c b/drivers/gpu/drm/drm_ioctl.c
32965 index 9b9ff46..4ea724c 100644
32966 --- a/drivers/gpu/drm/drm_ioctl.c
32967 +++ b/drivers/gpu/drm/drm_ioctl.c
32968 @@ -283,7 +283,7 @@ int drm_getstats(struct drm_device *dev, void *data,
32969 stats->data[i].value =
32970 (file_priv->master->lock.hw_lock ? file_priv->master->lock.hw_lock->lock : 0);
32971 else
32972 - stats->data[i].value = atomic_read(&dev->counts[i]);
32973 + stats->data[i].value = atomic_read_unchecked(&dev->counts[i]);
32974 stats->data[i].type = dev->types[i];
32975 }
32976
32977 diff --git a/drivers/gpu/drm/drm_lock.c b/drivers/gpu/drm/drm_lock.c
32978 index e2f70a5..c703e86 100644
32979 --- a/drivers/gpu/drm/drm_lock.c
32980 +++ b/drivers/gpu/drm/drm_lock.c
32981 @@ -87,7 +87,7 @@ int drm_lock(struct drm_device *dev, void *data, struct drm_file *file_priv)
32982 if (drm_lock_take(&master->lock, lock->context)) {
32983 master->lock.file_priv = file_priv;
32984 master->lock.lock_time = jiffies;
32985 - atomic_inc(&dev->counts[_DRM_STAT_LOCKS]);
32986 + atomic_inc_unchecked(&dev->counts[_DRM_STAT_LOCKS]);
32987 break; /* Got lock */
32988 }
32989
32990 @@ -165,7 +165,7 @@ int drm_unlock(struct drm_device *dev, void *data, struct drm_file *file_priv)
32991 return -EINVAL;
32992 }
32993
32994 - atomic_inc(&dev->counts[_DRM_STAT_UNLOCKS]);
32995 + atomic_inc_unchecked(&dev->counts[_DRM_STAT_UNLOCKS]);
32996
32997 /* kernel_context_switch isn't used by any of the x86 drm
32998 * modules but is required by the Sparc driver.
32999 diff --git a/drivers/gpu/drm/i810/i810_dma.c b/drivers/gpu/drm/i810/i810_dma.c
33000 index 7d1d88c..b9131b2 100644
33001 --- a/drivers/gpu/drm/i810/i810_dma.c
33002 +++ b/drivers/gpu/drm/i810/i810_dma.c
33003 @@ -952,8 +952,8 @@ static int i810_dma_vertex(struct drm_device *dev, void *data,
33004 dma->buflist[vertex->idx],
33005 vertex->discard, vertex->used);
33006
33007 - atomic_add(vertex->used, &dev->counts[_DRM_STAT_SECONDARY]);
33008 - atomic_inc(&dev->counts[_DRM_STAT_DMA]);
33009 + atomic_add_unchecked(vertex->used, &dev->counts[_DRM_STAT_SECONDARY]);
33010 + atomic_inc_unchecked(&dev->counts[_DRM_STAT_DMA]);
33011 sarea_priv->last_enqueue = dev_priv->counter - 1;
33012 sarea_priv->last_dispatch = (int)hw_status[5];
33013
33014 @@ -1115,8 +1115,8 @@ static int i810_dma_mc(struct drm_device *dev, void *data,
33015 i810_dma_dispatch_mc(dev, dma->buflist[mc->idx], mc->used,
33016 mc->last_render);
33017
33018 - atomic_add(mc->used, &dev->counts[_DRM_STAT_SECONDARY]);
33019 - atomic_inc(&dev->counts[_DRM_STAT_DMA]);
33020 + atomic_add_unchecked(mc->used, &dev->counts[_DRM_STAT_SECONDARY]);
33021 + atomic_inc_unchecked(&dev->counts[_DRM_STAT_DMA]);
33022 sarea_priv->last_enqueue = dev_priv->counter - 1;
33023 sarea_priv->last_dispatch = (int)hw_status[5];
33024
33025 diff --git a/drivers/gpu/drm/i810/i810_drv.h b/drivers/gpu/drm/i810/i810_drv.h
33026 index 21e2691..7321edd 100644
33027 --- a/drivers/gpu/drm/i810/i810_drv.h
33028 +++ b/drivers/gpu/drm/i810/i810_drv.h
33029 @@ -108,8 +108,8 @@ typedef struct drm_i810_private {
33030 int page_flipping;
33031
33032 wait_queue_head_t irq_queue;
33033 - atomic_t irq_received;
33034 - atomic_t irq_emitted;
33035 + atomic_unchecked_t irq_received;
33036 + atomic_unchecked_t irq_emitted;
33037
33038 int front_offset;
33039 } drm_i810_private_t;
33040 diff --git a/drivers/gpu/drm/i830/i830_drv.h b/drivers/gpu/drm/i830/i830_drv.h
33041 index da82afe..48a45de 100644
33042 --- a/drivers/gpu/drm/i830/i830_drv.h
33043 +++ b/drivers/gpu/drm/i830/i830_drv.h
33044 @@ -115,8 +115,8 @@ typedef struct drm_i830_private {
33045 int page_flipping;
33046
33047 wait_queue_head_t irq_queue;
33048 - atomic_t irq_received;
33049 - atomic_t irq_emitted;
33050 + atomic_unchecked_t irq_received;
33051 + atomic_unchecked_t irq_emitted;
33052
33053 int use_mi_batchbuffer_start;
33054
33055 diff --git a/drivers/gpu/drm/i830/i830_irq.c b/drivers/gpu/drm/i830/i830_irq.c
33056 index 91ec2bb..6f21fab 100644
33057 --- a/drivers/gpu/drm/i830/i830_irq.c
33058 +++ b/drivers/gpu/drm/i830/i830_irq.c
33059 @@ -47,7 +47,7 @@ irqreturn_t i830_driver_irq_handler(DRM_IRQ_ARGS)
33060
33061 I830_WRITE16(I830REG_INT_IDENTITY_R, temp);
33062
33063 - atomic_inc(&dev_priv->irq_received);
33064 + atomic_inc_unchecked(&dev_priv->irq_received);
33065 wake_up_interruptible(&dev_priv->irq_queue);
33066
33067 return IRQ_HANDLED;
33068 @@ -60,14 +60,14 @@ static int i830_emit_irq(struct drm_device * dev)
33069
33070 DRM_DEBUG("%s\n", __func__);
33071
33072 - atomic_inc(&dev_priv->irq_emitted);
33073 + atomic_inc_unchecked(&dev_priv->irq_emitted);
33074
33075 BEGIN_LP_RING(2);
33076 OUT_RING(0);
33077 OUT_RING(GFX_OP_USER_INTERRUPT);
33078 ADVANCE_LP_RING();
33079
33080 - return atomic_read(&dev_priv->irq_emitted);
33081 + return atomic_read_unchecked(&dev_priv->irq_emitted);
33082 }
33083
33084 static int i830_wait_irq(struct drm_device * dev, int irq_nr)
33085 @@ -79,7 +79,7 @@ static int i830_wait_irq(struct drm_device * dev, int irq_nr)
33086
33087 DRM_DEBUG("%s\n", __func__);
33088
33089 - if (atomic_read(&dev_priv->irq_received) >= irq_nr)
33090 + if (atomic_read_unchecked(&dev_priv->irq_received) >= irq_nr)
33091 return 0;
33092
33093 dev_priv->sarea_priv->perf_boxes |= I830_BOX_WAIT;
33094 @@ -88,7 +88,7 @@ static int i830_wait_irq(struct drm_device * dev, int irq_nr)
33095
33096 for (;;) {
33097 __set_current_state(TASK_INTERRUPTIBLE);
33098 - if (atomic_read(&dev_priv->irq_received) >= irq_nr)
33099 + if (atomic_read_unchecked(&dev_priv->irq_received) >= irq_nr)
33100 break;
33101 if ((signed)(end - jiffies) <= 0) {
33102 DRM_ERROR("timeout iir %x imr %x ier %x hwstam %x\n",
33103 @@ -163,8 +163,8 @@ void i830_driver_irq_preinstall(struct drm_device * dev)
33104 I830_WRITE16(I830REG_HWSTAM, 0xffff);
33105 I830_WRITE16(I830REG_INT_MASK_R, 0x0);
33106 I830_WRITE16(I830REG_INT_ENABLE_R, 0x0);
33107 - atomic_set(&dev_priv->irq_received, 0);
33108 - atomic_set(&dev_priv->irq_emitted, 0);
33109 + atomic_set_unchecked(&dev_priv->irq_received, 0);
33110 + atomic_set_unchecked(&dev_priv->irq_emitted, 0);
33111 init_waitqueue_head(&dev_priv->irq_queue);
33112 }
33113
33114 diff --git a/drivers/gpu/drm/i915/dvo.h b/drivers/gpu/drm/i915/dvo.h
33115 index 288fc50..c6092055 100644
33116 --- a/drivers/gpu/drm/i915/dvo.h
33117 +++ b/drivers/gpu/drm/i915/dvo.h
33118 @@ -135,23 +135,23 @@ struct intel_dvo_dev_ops {
33119 *
33120 * \return singly-linked list of modes or NULL if no modes found.
33121 */
33122 - struct drm_display_mode *(*get_modes)(struct intel_dvo_device *dvo);
33123 + struct drm_display_mode *(* const get_modes)(struct intel_dvo_device *dvo);
33124
33125 /**
33126 * Clean up driver-specific bits of the output
33127 */
33128 - void (*destroy) (struct intel_dvo_device *dvo);
33129 + void (* const destroy) (struct intel_dvo_device *dvo);
33130
33131 /**
33132 * Debugging hook to dump device registers to log file
33133 */
33134 - void (*dump_regs)(struct intel_dvo_device *dvo);
33135 + void (* const dump_regs)(struct intel_dvo_device *dvo);
33136 };
33137
33138 -extern struct intel_dvo_dev_ops sil164_ops;
33139 -extern struct intel_dvo_dev_ops ch7xxx_ops;
33140 -extern struct intel_dvo_dev_ops ivch_ops;
33141 -extern struct intel_dvo_dev_ops tfp410_ops;
33142 -extern struct intel_dvo_dev_ops ch7017_ops;
33143 +extern const struct intel_dvo_dev_ops sil164_ops;
33144 +extern const struct intel_dvo_dev_ops ch7xxx_ops;
33145 +extern const struct intel_dvo_dev_ops ivch_ops;
33146 +extern const struct intel_dvo_dev_ops tfp410_ops;
33147 +extern const struct intel_dvo_dev_ops ch7017_ops;
33148
33149 #endif /* _INTEL_DVO_H */
33150 diff --git a/drivers/gpu/drm/i915/dvo_ch7017.c b/drivers/gpu/drm/i915/dvo_ch7017.c
33151 index 621815b..499d82e 100644
33152 --- a/drivers/gpu/drm/i915/dvo_ch7017.c
33153 +++ b/drivers/gpu/drm/i915/dvo_ch7017.c
33154 @@ -443,7 +443,7 @@ static void ch7017_destroy(struct intel_dvo_device *dvo)
33155 }
33156 }
33157
33158 -struct intel_dvo_dev_ops ch7017_ops = {
33159 +const struct intel_dvo_dev_ops ch7017_ops = {
33160 .init = ch7017_init,
33161 .detect = ch7017_detect,
33162 .mode_valid = ch7017_mode_valid,
33163 diff --git a/drivers/gpu/drm/i915/dvo_ch7xxx.c b/drivers/gpu/drm/i915/dvo_ch7xxx.c
33164 index a9b8962..ac769ba 100644
33165 --- a/drivers/gpu/drm/i915/dvo_ch7xxx.c
33166 +++ b/drivers/gpu/drm/i915/dvo_ch7xxx.c
33167 @@ -356,7 +356,7 @@ static void ch7xxx_destroy(struct intel_dvo_device *dvo)
33168 }
33169 }
33170
33171 -struct intel_dvo_dev_ops ch7xxx_ops = {
33172 +const struct intel_dvo_dev_ops ch7xxx_ops = {
33173 .init = ch7xxx_init,
33174 .detect = ch7xxx_detect,
33175 .mode_valid = ch7xxx_mode_valid,
33176 diff --git a/drivers/gpu/drm/i915/dvo_ivch.c b/drivers/gpu/drm/i915/dvo_ivch.c
33177 index aa176f9..ed2930c 100644
33178 --- a/drivers/gpu/drm/i915/dvo_ivch.c
33179 +++ b/drivers/gpu/drm/i915/dvo_ivch.c
33180 @@ -430,7 +430,7 @@ static void ivch_destroy(struct intel_dvo_device *dvo)
33181 }
33182 }
33183
33184 -struct intel_dvo_dev_ops ivch_ops= {
33185 +const struct intel_dvo_dev_ops ivch_ops= {
33186 .init = ivch_init,
33187 .dpms = ivch_dpms,
33188 .save = ivch_save,
33189 diff --git a/drivers/gpu/drm/i915/dvo_sil164.c b/drivers/gpu/drm/i915/dvo_sil164.c
33190 index e1c1f73..7dbebcf 100644
33191 --- a/drivers/gpu/drm/i915/dvo_sil164.c
33192 +++ b/drivers/gpu/drm/i915/dvo_sil164.c
33193 @@ -290,7 +290,7 @@ static void sil164_destroy(struct intel_dvo_device *dvo)
33194 }
33195 }
33196
33197 -struct intel_dvo_dev_ops sil164_ops = {
33198 +const struct intel_dvo_dev_ops sil164_ops = {
33199 .init = sil164_init,
33200 .detect = sil164_detect,
33201 .mode_valid = sil164_mode_valid,
33202 diff --git a/drivers/gpu/drm/i915/dvo_tfp410.c b/drivers/gpu/drm/i915/dvo_tfp410.c
33203 index 16dce84..7e1b6f8 100644
33204 --- a/drivers/gpu/drm/i915/dvo_tfp410.c
33205 +++ b/drivers/gpu/drm/i915/dvo_tfp410.c
33206 @@ -323,7 +323,7 @@ static void tfp410_destroy(struct intel_dvo_device *dvo)
33207 }
33208 }
33209
33210 -struct intel_dvo_dev_ops tfp410_ops = {
33211 +const struct intel_dvo_dev_ops tfp410_ops = {
33212 .init = tfp410_init,
33213 .detect = tfp410_detect,
33214 .mode_valid = tfp410_mode_valid,
33215 diff --git a/drivers/gpu/drm/i915/i915_debugfs.c b/drivers/gpu/drm/i915/i915_debugfs.c
33216 index 7e859d6..7d1cf2b 100644
33217 --- a/drivers/gpu/drm/i915/i915_debugfs.c
33218 +++ b/drivers/gpu/drm/i915/i915_debugfs.c
33219 @@ -192,7 +192,7 @@ static int i915_interrupt_info(struct seq_file *m, void *data)
33220 I915_READ(GTIMR));
33221 }
33222 seq_printf(m, "Interrupts received: %d\n",
33223 - atomic_read(&dev_priv->irq_received));
33224 + atomic_read_unchecked(&dev_priv->irq_received));
33225 if (dev_priv->hw_status_page != NULL) {
33226 seq_printf(m, "Current sequence: %d\n",
33227 i915_get_gem_seqno(dev));
33228 diff --git a/drivers/gpu/drm/i915/i915_drv.c b/drivers/gpu/drm/i915/i915_drv.c
33229 index 5449239..7e4f68d 100644
33230 --- a/drivers/gpu/drm/i915/i915_drv.c
33231 +++ b/drivers/gpu/drm/i915/i915_drv.c
33232 @@ -285,7 +285,7 @@ i915_pci_resume(struct pci_dev *pdev)
33233 return i915_resume(dev);
33234 }
33235
33236 -static struct vm_operations_struct i915_gem_vm_ops = {
33237 +static const struct vm_operations_struct i915_gem_vm_ops = {
33238 .fault = i915_gem_fault,
33239 .open = drm_gem_vm_open,
33240 .close = drm_gem_vm_close,
33241 diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h
33242 index 97163f7..c24c7c7 100644
33243 --- a/drivers/gpu/drm/i915/i915_drv.h
33244 +++ b/drivers/gpu/drm/i915/i915_drv.h
33245 @@ -168,7 +168,7 @@ struct drm_i915_display_funcs {
33246 /* display clock increase/decrease */
33247 /* pll clock increase/decrease */
33248 /* clock gating init */
33249 -};
33250 +} __no_const;
33251
33252 typedef struct drm_i915_private {
33253 struct drm_device *dev;
33254 @@ -197,7 +197,7 @@ typedef struct drm_i915_private {
33255 int page_flipping;
33256
33257 wait_queue_head_t irq_queue;
33258 - atomic_t irq_received;
33259 + atomic_unchecked_t irq_received;
33260 /** Protects user_irq_refcount and irq_mask_reg */
33261 spinlock_t user_irq_lock;
33262 /** Refcount for i915_user_irq_get() versus i915_user_irq_put(). */
33263 diff --git a/drivers/gpu/drm/i915/i915_gem.c b/drivers/gpu/drm/i915/i915_gem.c
33264 index 27a3074..eb3f959 100644
33265 --- a/drivers/gpu/drm/i915/i915_gem.c
33266 +++ b/drivers/gpu/drm/i915/i915_gem.c
33267 @@ -102,7 +102,7 @@ i915_gem_get_aperture_ioctl(struct drm_device *dev, void *data,
33268
33269 args->aper_size = dev->gtt_total;
33270 args->aper_available_size = (args->aper_size -
33271 - atomic_read(&dev->pin_memory));
33272 + atomic_read_unchecked(&dev->pin_memory));
33273
33274 return 0;
33275 }
33276 @@ -2058,7 +2058,7 @@ i915_gem_object_unbind(struct drm_gem_object *obj)
33277
33278 if (obj_priv->gtt_space) {
33279 atomic_dec(&dev->gtt_count);
33280 - atomic_sub(obj->size, &dev->gtt_memory);
33281 + atomic_sub_unchecked(obj->size, &dev->gtt_memory);
33282
33283 drm_mm_put_block(obj_priv->gtt_space);
33284 obj_priv->gtt_space = NULL;
33285 @@ -2701,7 +2701,7 @@ i915_gem_object_bind_to_gtt(struct drm_gem_object *obj, unsigned alignment)
33286 goto search_free;
33287 }
33288 atomic_inc(&dev->gtt_count);
33289 - atomic_add(obj->size, &dev->gtt_memory);
33290 + atomic_add_unchecked(obj->size, &dev->gtt_memory);
33291
33292 /* Assert that the object is not currently in any GPU domain. As it
33293 * wasn't in the GTT, there shouldn't be any way it could have been in
33294 @@ -3755,9 +3755,9 @@ i915_gem_execbuffer(struct drm_device *dev, void *data,
33295 "%d/%d gtt bytes\n",
33296 atomic_read(&dev->object_count),
33297 atomic_read(&dev->pin_count),
33298 - atomic_read(&dev->object_memory),
33299 - atomic_read(&dev->pin_memory),
33300 - atomic_read(&dev->gtt_memory),
33301 + atomic_read_unchecked(&dev->object_memory),
33302 + atomic_read_unchecked(&dev->pin_memory),
33303 + atomic_read_unchecked(&dev->gtt_memory),
33304 dev->gtt_total);
33305 }
33306 goto err;
33307 @@ -3989,7 +3989,7 @@ i915_gem_object_pin(struct drm_gem_object *obj, uint32_t alignment)
33308 */
33309 if (obj_priv->pin_count == 1) {
33310 atomic_inc(&dev->pin_count);
33311 - atomic_add(obj->size, &dev->pin_memory);
33312 + atomic_add_unchecked(obj->size, &dev->pin_memory);
33313 if (!obj_priv->active &&
33314 (obj->write_domain & I915_GEM_GPU_DOMAINS) == 0 &&
33315 !list_empty(&obj_priv->list))
33316 @@ -4022,7 +4022,7 @@ i915_gem_object_unpin(struct drm_gem_object *obj)
33317 list_move_tail(&obj_priv->list,
33318 &dev_priv->mm.inactive_list);
33319 atomic_dec(&dev->pin_count);
33320 - atomic_sub(obj->size, &dev->pin_memory);
33321 + atomic_sub_unchecked(obj->size, &dev->pin_memory);
33322 }
33323 i915_verify_inactive(dev, __FILE__, __LINE__);
33324 }
33325 diff --git a/drivers/gpu/drm/i915/i915_irq.c b/drivers/gpu/drm/i915/i915_irq.c
33326 index 63f28ad..f5469da 100644
33327 --- a/drivers/gpu/drm/i915/i915_irq.c
33328 +++ b/drivers/gpu/drm/i915/i915_irq.c
33329 @@ -528,7 +528,7 @@ irqreturn_t i915_driver_irq_handler(DRM_IRQ_ARGS)
33330 int irq_received;
33331 int ret = IRQ_NONE;
33332
33333 - atomic_inc(&dev_priv->irq_received);
33334 + atomic_inc_unchecked(&dev_priv->irq_received);
33335
33336 if (IS_IGDNG(dev))
33337 return igdng_irq_handler(dev);
33338 @@ -1021,7 +1021,7 @@ void i915_driver_irq_preinstall(struct drm_device * dev)
33339 {
33340 drm_i915_private_t *dev_priv = (drm_i915_private_t *) dev->dev_private;
33341
33342 - atomic_set(&dev_priv->irq_received, 0);
33343 + atomic_set_unchecked(&dev_priv->irq_received, 0);
33344
33345 INIT_WORK(&dev_priv->hotplug_work, i915_hotplug_work_func);
33346 INIT_WORK(&dev_priv->error_work, i915_error_work_func);
33347 diff --git a/drivers/gpu/drm/i915/intel_sdvo.c b/drivers/gpu/drm/i915/intel_sdvo.c
33348 index 5d9c6a7..d1b0e29 100644
33349 --- a/drivers/gpu/drm/i915/intel_sdvo.c
33350 +++ b/drivers/gpu/drm/i915/intel_sdvo.c
33351 @@ -2795,7 +2795,9 @@ bool intel_sdvo_init(struct drm_device *dev, int output_device)
33352 sdvo_priv->slave_addr = intel_sdvo_get_slave_addr(dev, output_device);
33353
33354 /* Save the bit-banging i2c functionality for use by the DDC wrapper */
33355 - intel_sdvo_i2c_bit_algo.functionality = intel_output->i2c_bus->algo->functionality;
33356 + pax_open_kernel();
33357 + *(void **)&intel_sdvo_i2c_bit_algo.functionality = intel_output->i2c_bus->algo->functionality;
33358 + pax_close_kernel();
33359
33360 /* Read the regs to test if we can talk to the device */
33361 for (i = 0; i < 0x40; i++) {
33362 diff --git a/drivers/gpu/drm/mga/mga_drv.h b/drivers/gpu/drm/mga/mga_drv.h
33363 index be6c6b9..8615d9c 100644
33364 --- a/drivers/gpu/drm/mga/mga_drv.h
33365 +++ b/drivers/gpu/drm/mga/mga_drv.h
33366 @@ -120,9 +120,9 @@ typedef struct drm_mga_private {
33367 u32 clear_cmd;
33368 u32 maccess;
33369
33370 - atomic_t vbl_received; /**< Number of vblanks received. */
33371 + atomic_unchecked_t vbl_received; /**< Number of vblanks received. */
33372 wait_queue_head_t fence_queue;
33373 - atomic_t last_fence_retired;
33374 + atomic_unchecked_t last_fence_retired;
33375 u32 next_fence_to_post;
33376
33377 unsigned int fb_cpp;
33378 diff --git a/drivers/gpu/drm/mga/mga_irq.c b/drivers/gpu/drm/mga/mga_irq.c
33379 index daa6041..a28a5da 100644
33380 --- a/drivers/gpu/drm/mga/mga_irq.c
33381 +++ b/drivers/gpu/drm/mga/mga_irq.c
33382 @@ -44,7 +44,7 @@ u32 mga_get_vblank_counter(struct drm_device *dev, int crtc)
33383 if (crtc != 0)
33384 return 0;
33385
33386 - return atomic_read(&dev_priv->vbl_received);
33387 + return atomic_read_unchecked(&dev_priv->vbl_received);
33388 }
33389
33390
33391 @@ -60,7 +60,7 @@ irqreturn_t mga_driver_irq_handler(DRM_IRQ_ARGS)
33392 /* VBLANK interrupt */
33393 if (status & MGA_VLINEPEN) {
33394 MGA_WRITE(MGA_ICLEAR, MGA_VLINEICLR);
33395 - atomic_inc(&dev_priv->vbl_received);
33396 + atomic_inc_unchecked(&dev_priv->vbl_received);
33397 drm_handle_vblank(dev, 0);
33398 handled = 1;
33399 }
33400 @@ -80,7 +80,7 @@ irqreturn_t mga_driver_irq_handler(DRM_IRQ_ARGS)
33401 MGA_WRITE(MGA_PRIMEND, prim_end);
33402 }
33403
33404 - atomic_inc(&dev_priv->last_fence_retired);
33405 + atomic_inc_unchecked(&dev_priv->last_fence_retired);
33406 DRM_WAKEUP(&dev_priv->fence_queue);
33407 handled = 1;
33408 }
33409 @@ -131,7 +131,7 @@ int mga_driver_fence_wait(struct drm_device * dev, unsigned int *sequence)
33410 * using fences.
33411 */
33412 DRM_WAIT_ON(ret, dev_priv->fence_queue, 3 * DRM_HZ,
33413 - (((cur_fence = atomic_read(&dev_priv->last_fence_retired))
33414 + (((cur_fence = atomic_read_unchecked(&dev_priv->last_fence_retired))
33415 - *sequence) <= (1 << 23)));
33416
33417 *sequence = cur_fence;
33418 diff --git a/drivers/gpu/drm/r128/r128_cce.c b/drivers/gpu/drm/r128/r128_cce.c
33419 index 4c39a40..b22a9ea 100644
33420 --- a/drivers/gpu/drm/r128/r128_cce.c
33421 +++ b/drivers/gpu/drm/r128/r128_cce.c
33422 @@ -377,7 +377,7 @@ static int r128_do_init_cce(struct drm_device * dev, drm_r128_init_t * init)
33423
33424 /* GH: Simple idle check.
33425 */
33426 - atomic_set(&dev_priv->idle_count, 0);
33427 + atomic_set_unchecked(&dev_priv->idle_count, 0);
33428
33429 /* We don't support anything other than bus-mastering ring mode,
33430 * but the ring can be in either AGP or PCI space for the ring
33431 diff --git a/drivers/gpu/drm/r128/r128_drv.h b/drivers/gpu/drm/r128/r128_drv.h
33432 index 3c60829..4faf484 100644
33433 --- a/drivers/gpu/drm/r128/r128_drv.h
33434 +++ b/drivers/gpu/drm/r128/r128_drv.h
33435 @@ -90,14 +90,14 @@ typedef struct drm_r128_private {
33436 int is_pci;
33437 unsigned long cce_buffers_offset;
33438
33439 - atomic_t idle_count;
33440 + atomic_unchecked_t idle_count;
33441
33442 int page_flipping;
33443 int current_page;
33444 u32 crtc_offset;
33445 u32 crtc_offset_cntl;
33446
33447 - atomic_t vbl_received;
33448 + atomic_unchecked_t vbl_received;
33449
33450 u32 color_fmt;
33451 unsigned int front_offset;
33452 diff --git a/drivers/gpu/drm/r128/r128_irq.c b/drivers/gpu/drm/r128/r128_irq.c
33453 index 69810fb..97bf17a 100644
33454 --- a/drivers/gpu/drm/r128/r128_irq.c
33455 +++ b/drivers/gpu/drm/r128/r128_irq.c
33456 @@ -42,7 +42,7 @@ u32 r128_get_vblank_counter(struct drm_device *dev, int crtc)
33457 if (crtc != 0)
33458 return 0;
33459
33460 - return atomic_read(&dev_priv->vbl_received);
33461 + return atomic_read_unchecked(&dev_priv->vbl_received);
33462 }
33463
33464 irqreturn_t r128_driver_irq_handler(DRM_IRQ_ARGS)
33465 @@ -56,7 +56,7 @@ irqreturn_t r128_driver_irq_handler(DRM_IRQ_ARGS)
33466 /* VBLANK interrupt */
33467 if (status & R128_CRTC_VBLANK_INT) {
33468 R128_WRITE(R128_GEN_INT_STATUS, R128_CRTC_VBLANK_INT_AK);
33469 - atomic_inc(&dev_priv->vbl_received);
33470 + atomic_inc_unchecked(&dev_priv->vbl_received);
33471 drm_handle_vblank(dev, 0);
33472 return IRQ_HANDLED;
33473 }
33474 diff --git a/drivers/gpu/drm/r128/r128_state.c b/drivers/gpu/drm/r128/r128_state.c
33475 index af2665c..51922d2 100644
33476 --- a/drivers/gpu/drm/r128/r128_state.c
33477 +++ b/drivers/gpu/drm/r128/r128_state.c
33478 @@ -323,10 +323,10 @@ static void r128_clear_box(drm_r128_private_t * dev_priv,
33479
33480 static void r128_cce_performance_boxes(drm_r128_private_t * dev_priv)
33481 {
33482 - if (atomic_read(&dev_priv->idle_count) == 0) {
33483 + if (atomic_read_unchecked(&dev_priv->idle_count) == 0) {
33484 r128_clear_box(dev_priv, 64, 4, 8, 8, 0, 255, 0);
33485 } else {
33486 - atomic_set(&dev_priv->idle_count, 0);
33487 + atomic_set_unchecked(&dev_priv->idle_count, 0);
33488 }
33489 }
33490
33491 diff --git a/drivers/gpu/drm/radeon/atom.c b/drivers/gpu/drm/radeon/atom.c
33492 index dd72b91..8644b3c 100644
33493 --- a/drivers/gpu/drm/radeon/atom.c
33494 +++ b/drivers/gpu/drm/radeon/atom.c
33495 @@ -1115,6 +1115,8 @@ struct atom_context *atom_parse(struct card_info *card, void *bios)
33496 char name[512];
33497 int i;
33498
33499 + pax_track_stack();
33500 +
33501 ctx->card = card;
33502 ctx->bios = bios;
33503
33504 diff --git a/drivers/gpu/drm/radeon/mkregtable.c b/drivers/gpu/drm/radeon/mkregtable.c
33505 index 0d79577..efaa7a5 100644
33506 --- a/drivers/gpu/drm/radeon/mkregtable.c
33507 +++ b/drivers/gpu/drm/radeon/mkregtable.c
33508 @@ -637,14 +637,14 @@ static int parser_auth(struct table *t, const char *filename)
33509 regex_t mask_rex;
33510 regmatch_t match[4];
33511 char buf[1024];
33512 - size_t end;
33513 + long end;
33514 int len;
33515 int done = 0;
33516 int r;
33517 unsigned o;
33518 struct offset *offset;
33519 char last_reg_s[10];
33520 - int last_reg;
33521 + unsigned long last_reg;
33522
33523 if (regcomp
33524 (&mask_rex, "(0x[0-9a-fA-F]*) *([_a-zA-Z0-9]*)", REG_EXTENDED)) {
33525 diff --git a/drivers/gpu/drm/radeon/radeon.h b/drivers/gpu/drm/radeon/radeon.h
33526 index 6735213..38c2c67 100644
33527 --- a/drivers/gpu/drm/radeon/radeon.h
33528 +++ b/drivers/gpu/drm/radeon/radeon.h
33529 @@ -149,7 +149,7 @@ int radeon_pm_init(struct radeon_device *rdev);
33530 */
33531 struct radeon_fence_driver {
33532 uint32_t scratch_reg;
33533 - atomic_t seq;
33534 + atomic_unchecked_t seq;
33535 uint32_t last_seq;
33536 unsigned long count_timeout;
33537 wait_queue_head_t queue;
33538 @@ -640,7 +640,7 @@ struct radeon_asic {
33539 uint32_t offset, uint32_t obj_size);
33540 int (*clear_surface_reg)(struct radeon_device *rdev, int reg);
33541 void (*bandwidth_update)(struct radeon_device *rdev);
33542 -};
33543 +} __no_const;
33544
33545 /*
33546 * Asic structures
33547 diff --git a/drivers/gpu/drm/radeon/radeon_atombios.c b/drivers/gpu/drm/radeon/radeon_atombios.c
33548 index 4e928b9..d8b6008 100644
33549 --- a/drivers/gpu/drm/radeon/radeon_atombios.c
33550 +++ b/drivers/gpu/drm/radeon/radeon_atombios.c
33551 @@ -275,6 +275,8 @@ bool radeon_get_atom_connector_info_from_object_table(struct drm_device *dev)
33552 bool linkb;
33553 struct radeon_i2c_bus_rec ddc_bus;
33554
33555 + pax_track_stack();
33556 +
33557 atom_parse_data_header(ctx, index, &size, &frev, &crev, &data_offset);
33558
33559 if (data_offset == 0)
33560 @@ -520,13 +522,13 @@ static uint16_t atombios_get_connector_object_id(struct drm_device *dev,
33561 }
33562 }
33563
33564 -struct bios_connector {
33565 +static struct bios_connector {
33566 bool valid;
33567 uint16_t line_mux;
33568 uint16_t devices;
33569 int connector_type;
33570 struct radeon_i2c_bus_rec ddc_bus;
33571 -};
33572 +} bios_connectors[ATOM_MAX_SUPPORTED_DEVICE];
33573
33574 bool radeon_get_atom_connector_info_from_supported_devices_table(struct
33575 drm_device
33576 @@ -542,7 +544,6 @@ bool radeon_get_atom_connector_info_from_supported_devices_table(struct
33577 uint8_t dac;
33578 union atom_supported_devices *supported_devices;
33579 int i, j;
33580 - struct bios_connector bios_connectors[ATOM_MAX_SUPPORTED_DEVICE];
33581
33582 atom_parse_data_header(ctx, index, &size, &frev, &crev, &data_offset);
33583
33584 diff --git a/drivers/gpu/drm/radeon/radeon_display.c b/drivers/gpu/drm/radeon/radeon_display.c
33585 index 083a181..ccccae0 100644
33586 --- a/drivers/gpu/drm/radeon/radeon_display.c
33587 +++ b/drivers/gpu/drm/radeon/radeon_display.c
33588 @@ -482,7 +482,7 @@ void radeon_compute_pll(struct radeon_pll *pll,
33589
33590 if (flags & RADEON_PLL_PREFER_CLOSEST_LOWER) {
33591 error = freq - current_freq;
33592 - error = error < 0 ? 0xffffffff : error;
33593 + error = (int32_t)error < 0 ? 0xffffffff : error;
33594 } else
33595 error = abs(current_freq - freq);
33596 vco_diff = abs(vco - best_vco);
33597 diff --git a/drivers/gpu/drm/radeon/radeon_drv.h b/drivers/gpu/drm/radeon/radeon_drv.h
33598 index 76e4070..193fa7f 100644
33599 --- a/drivers/gpu/drm/radeon/radeon_drv.h
33600 +++ b/drivers/gpu/drm/radeon/radeon_drv.h
33601 @@ -253,7 +253,7 @@ typedef struct drm_radeon_private {
33602
33603 /* SW interrupt */
33604 wait_queue_head_t swi_queue;
33605 - atomic_t swi_emitted;
33606 + atomic_unchecked_t swi_emitted;
33607 int vblank_crtc;
33608 uint32_t irq_enable_reg;
33609 uint32_t r500_disp_irq_reg;
33610 diff --git a/drivers/gpu/drm/radeon/radeon_fence.c b/drivers/gpu/drm/radeon/radeon_fence.c
33611 index 3beb26d..6ce9c4a 100644
33612 --- a/drivers/gpu/drm/radeon/radeon_fence.c
33613 +++ b/drivers/gpu/drm/radeon/radeon_fence.c
33614 @@ -47,7 +47,7 @@ int radeon_fence_emit(struct radeon_device *rdev, struct radeon_fence *fence)
33615 write_unlock_irqrestore(&rdev->fence_drv.lock, irq_flags);
33616 return 0;
33617 }
33618 - fence->seq = atomic_add_return(1, &rdev->fence_drv.seq);
33619 + fence->seq = atomic_add_return_unchecked(1, &rdev->fence_drv.seq);
33620 if (!rdev->cp.ready) {
33621 /* FIXME: cp is not running assume everythings is done right
33622 * away
33623 @@ -364,7 +364,7 @@ int radeon_fence_driver_init(struct radeon_device *rdev)
33624 return r;
33625 }
33626 WREG32(rdev->fence_drv.scratch_reg, 0);
33627 - atomic_set(&rdev->fence_drv.seq, 0);
33628 + atomic_set_unchecked(&rdev->fence_drv.seq, 0);
33629 INIT_LIST_HEAD(&rdev->fence_drv.created);
33630 INIT_LIST_HEAD(&rdev->fence_drv.emited);
33631 INIT_LIST_HEAD(&rdev->fence_drv.signaled);
33632 diff --git a/drivers/gpu/drm/radeon/radeon_ioc32.c b/drivers/gpu/drm/radeon/radeon_ioc32.c
33633 index a1bf11d..4a123c0 100644
33634 --- a/drivers/gpu/drm/radeon/radeon_ioc32.c
33635 +++ b/drivers/gpu/drm/radeon/radeon_ioc32.c
33636 @@ -368,7 +368,7 @@ static int compat_radeon_cp_setparam(struct file *file, unsigned int cmd,
33637 request = compat_alloc_user_space(sizeof(*request));
33638 if (!access_ok(VERIFY_WRITE, request, sizeof(*request))
33639 || __put_user(req32.param, &request->param)
33640 - || __put_user((void __user *)(unsigned long)req32.value,
33641 + || __put_user((unsigned long)req32.value,
33642 &request->value))
33643 return -EFAULT;
33644
33645 diff --git a/drivers/gpu/drm/radeon/radeon_irq.c b/drivers/gpu/drm/radeon/radeon_irq.c
33646 index b79ecc4..8dab92d 100644
33647 --- a/drivers/gpu/drm/radeon/radeon_irq.c
33648 +++ b/drivers/gpu/drm/radeon/radeon_irq.c
33649 @@ -225,8 +225,8 @@ static int radeon_emit_irq(struct drm_device * dev)
33650 unsigned int ret;
33651 RING_LOCALS;
33652
33653 - atomic_inc(&dev_priv->swi_emitted);
33654 - ret = atomic_read(&dev_priv->swi_emitted);
33655 + atomic_inc_unchecked(&dev_priv->swi_emitted);
33656 + ret = atomic_read_unchecked(&dev_priv->swi_emitted);
33657
33658 BEGIN_RING(4);
33659 OUT_RING_REG(RADEON_LAST_SWI_REG, ret);
33660 @@ -352,7 +352,7 @@ int radeon_driver_irq_postinstall(struct drm_device *dev)
33661 drm_radeon_private_t *dev_priv =
33662 (drm_radeon_private_t *) dev->dev_private;
33663
33664 - atomic_set(&dev_priv->swi_emitted, 0);
33665 + atomic_set_unchecked(&dev_priv->swi_emitted, 0);
33666 DRM_INIT_WAITQUEUE(&dev_priv->swi_queue);
33667
33668 dev->max_vblank_count = 0x001fffff;
33669 diff --git a/drivers/gpu/drm/radeon/radeon_state.c b/drivers/gpu/drm/radeon/radeon_state.c
33670 index 4747910..48ca4b3 100644
33671 --- a/drivers/gpu/drm/radeon/radeon_state.c
33672 +++ b/drivers/gpu/drm/radeon/radeon_state.c
33673 @@ -3021,7 +3021,7 @@ static int radeon_cp_getparam(struct drm_device *dev, void *data, struct drm_fil
33674 {
33675 drm_radeon_private_t *dev_priv = dev->dev_private;
33676 drm_radeon_getparam_t *param = data;
33677 - int value;
33678 + int value = 0;
33679
33680 DRM_DEBUG("pid=%d\n", DRM_CURRENTPID);
33681
33682 diff --git a/drivers/gpu/drm/radeon/radeon_ttm.c b/drivers/gpu/drm/radeon/radeon_ttm.c
33683 index 1381e06..0e53b17 100644
33684 --- a/drivers/gpu/drm/radeon/radeon_ttm.c
33685 +++ b/drivers/gpu/drm/radeon/radeon_ttm.c
33686 @@ -535,27 +535,10 @@ void radeon_ttm_fini(struct radeon_device *rdev)
33687 DRM_INFO("radeon: ttm finalized\n");
33688 }
33689
33690 -static struct vm_operations_struct radeon_ttm_vm_ops;
33691 -static const struct vm_operations_struct *ttm_vm_ops = NULL;
33692 -
33693 -static int radeon_ttm_fault(struct vm_area_struct *vma, struct vm_fault *vmf)
33694 -{
33695 - struct ttm_buffer_object *bo;
33696 - int r;
33697 -
33698 - bo = (struct ttm_buffer_object *)vma->vm_private_data;
33699 - if (bo == NULL) {
33700 - return VM_FAULT_NOPAGE;
33701 - }
33702 - r = ttm_vm_ops->fault(vma, vmf);
33703 - return r;
33704 -}
33705 -
33706 int radeon_mmap(struct file *filp, struct vm_area_struct *vma)
33707 {
33708 struct drm_file *file_priv;
33709 struct radeon_device *rdev;
33710 - int r;
33711
33712 if (unlikely(vma->vm_pgoff < DRM_FILE_PAGE_OFFSET)) {
33713 return drm_mmap(filp, vma);
33714 @@ -563,20 +546,9 @@ int radeon_mmap(struct file *filp, struct vm_area_struct *vma)
33715
33716 file_priv = (struct drm_file *)filp->private_data;
33717 rdev = file_priv->minor->dev->dev_private;
33718 - if (rdev == NULL) {
33719 + if (!rdev)
33720 return -EINVAL;
33721 - }
33722 - r = ttm_bo_mmap(filp, vma, &rdev->mman.bdev);
33723 - if (unlikely(r != 0)) {
33724 - return r;
33725 - }
33726 - if (unlikely(ttm_vm_ops == NULL)) {
33727 - ttm_vm_ops = vma->vm_ops;
33728 - radeon_ttm_vm_ops = *ttm_vm_ops;
33729 - radeon_ttm_vm_ops.fault = &radeon_ttm_fault;
33730 - }
33731 - vma->vm_ops = &radeon_ttm_vm_ops;
33732 - return 0;
33733 + return ttm_bo_mmap(filp, vma, &rdev->mman.bdev);
33734 }
33735
33736
33737 diff --git a/drivers/gpu/drm/radeon/rs690.c b/drivers/gpu/drm/radeon/rs690.c
33738 index b12ff76..0bd0c6e 100644
33739 --- a/drivers/gpu/drm/radeon/rs690.c
33740 +++ b/drivers/gpu/drm/radeon/rs690.c
33741 @@ -302,9 +302,11 @@ void rs690_crtc_bandwidth_compute(struct radeon_device *rdev,
33742 if (rdev->pm.max_bandwidth.full > rdev->pm.sideport_bandwidth.full &&
33743 rdev->pm.sideport_bandwidth.full)
33744 rdev->pm.max_bandwidth = rdev->pm.sideport_bandwidth;
33745 - read_delay_latency.full = rfixed_const(370 * 800 * 1000);
33746 + read_delay_latency.full = rfixed_const(800 * 1000);
33747 read_delay_latency.full = rfixed_div(read_delay_latency,
33748 rdev->pm.igp_sideport_mclk);
33749 + a.full = rfixed_const(370);
33750 + read_delay_latency.full = rfixed_mul(read_delay_latency, a);
33751 } else {
33752 if (rdev->pm.max_bandwidth.full > rdev->pm.k8_bandwidth.full &&
33753 rdev->pm.k8_bandwidth.full)
33754 diff --git a/drivers/gpu/drm/ttm/ttm_bo.c b/drivers/gpu/drm/ttm/ttm_bo.c
33755 index 0ed436e..e6e7ce3 100644
33756 --- a/drivers/gpu/drm/ttm/ttm_bo.c
33757 +++ b/drivers/gpu/drm/ttm/ttm_bo.c
33758 @@ -67,7 +67,7 @@ static struct attribute *ttm_bo_global_attrs[] = {
33759 NULL
33760 };
33761
33762 -static struct sysfs_ops ttm_bo_global_ops = {
33763 +static const struct sysfs_ops ttm_bo_global_ops = {
33764 .show = &ttm_bo_global_show
33765 };
33766
33767 diff --git a/drivers/gpu/drm/ttm/ttm_bo_vm.c b/drivers/gpu/drm/ttm/ttm_bo_vm.c
33768 index 1c040d0..f9e4af8 100644
33769 --- a/drivers/gpu/drm/ttm/ttm_bo_vm.c
33770 +++ b/drivers/gpu/drm/ttm/ttm_bo_vm.c
33771 @@ -73,7 +73,7 @@ static int ttm_bo_vm_fault(struct vm_area_struct *vma, struct vm_fault *vmf)
33772 {
33773 struct ttm_buffer_object *bo = (struct ttm_buffer_object *)
33774 vma->vm_private_data;
33775 - struct ttm_bo_device *bdev = bo->bdev;
33776 + struct ttm_bo_device *bdev;
33777 unsigned long bus_base;
33778 unsigned long bus_offset;
33779 unsigned long bus_size;
33780 @@ -88,6 +88,10 @@ static int ttm_bo_vm_fault(struct vm_area_struct *vma, struct vm_fault *vmf)
33781 unsigned long address = (unsigned long)vmf->virtual_address;
33782 int retval = VM_FAULT_NOPAGE;
33783
33784 + if (!bo)
33785 + return VM_FAULT_NOPAGE;
33786 + bdev = bo->bdev;
33787 +
33788 /*
33789 * Work around locking order reversal in fault / nopfn
33790 * between mmap_sem and bo_reserve: Perform a trylock operation
33791 diff --git a/drivers/gpu/drm/ttm/ttm_global.c b/drivers/gpu/drm/ttm/ttm_global.c
33792 index b170071..28ae90e 100644
33793 --- a/drivers/gpu/drm/ttm/ttm_global.c
33794 +++ b/drivers/gpu/drm/ttm/ttm_global.c
33795 @@ -36,7 +36,7 @@
33796 struct ttm_global_item {
33797 struct mutex mutex;
33798 void *object;
33799 - int refcount;
33800 + atomic_t refcount;
33801 };
33802
33803 static struct ttm_global_item glob[TTM_GLOBAL_NUM];
33804 @@ -49,7 +49,7 @@ void ttm_global_init(void)
33805 struct ttm_global_item *item = &glob[i];
33806 mutex_init(&item->mutex);
33807 item->object = NULL;
33808 - item->refcount = 0;
33809 + atomic_set(&item->refcount, 0);
33810 }
33811 }
33812
33813 @@ -59,7 +59,7 @@ void ttm_global_release(void)
33814 for (i = 0; i < TTM_GLOBAL_NUM; ++i) {
33815 struct ttm_global_item *item = &glob[i];
33816 BUG_ON(item->object != NULL);
33817 - BUG_ON(item->refcount != 0);
33818 + BUG_ON(atomic_read(&item->refcount) != 0);
33819 }
33820 }
33821
33822 @@ -70,7 +70,7 @@ int ttm_global_item_ref(struct ttm_global_reference *ref)
33823 void *object;
33824
33825 mutex_lock(&item->mutex);
33826 - if (item->refcount == 0) {
33827 + if (atomic_read(&item->refcount) == 0) {
33828 item->object = kzalloc(ref->size, GFP_KERNEL);
33829 if (unlikely(item->object == NULL)) {
33830 ret = -ENOMEM;
33831 @@ -83,7 +83,7 @@ int ttm_global_item_ref(struct ttm_global_reference *ref)
33832 goto out_err;
33833
33834 }
33835 - ++item->refcount;
33836 + atomic_inc(&item->refcount);
33837 ref->object = item->object;
33838 object = item->object;
33839 mutex_unlock(&item->mutex);
33840 @@ -100,9 +100,9 @@ void ttm_global_item_unref(struct ttm_global_reference *ref)
33841 struct ttm_global_item *item = &glob[ref->global_type];
33842
33843 mutex_lock(&item->mutex);
33844 - BUG_ON(item->refcount == 0);
33845 + BUG_ON(atomic_read(&item->refcount) == 0);
33846 BUG_ON(ref->object != item->object);
33847 - if (--item->refcount == 0) {
33848 + if (atomic_dec_and_test(&item->refcount)) {
33849 ref->release(ref);
33850 item->object = NULL;
33851 }
33852 diff --git a/drivers/gpu/drm/ttm/ttm_memory.c b/drivers/gpu/drm/ttm/ttm_memory.c
33853 index 072c281..d8ef483 100644
33854 --- a/drivers/gpu/drm/ttm/ttm_memory.c
33855 +++ b/drivers/gpu/drm/ttm/ttm_memory.c
33856 @@ -152,7 +152,7 @@ static struct attribute *ttm_mem_zone_attrs[] = {
33857 NULL
33858 };
33859
33860 -static struct sysfs_ops ttm_mem_zone_ops = {
33861 +static const struct sysfs_ops ttm_mem_zone_ops = {
33862 .show = &ttm_mem_zone_show,
33863 .store = &ttm_mem_zone_store
33864 };
33865 diff --git a/drivers/gpu/drm/via/via_drv.h b/drivers/gpu/drm/via/via_drv.h
33866 index cafcb84..b8e66cc 100644
33867 --- a/drivers/gpu/drm/via/via_drv.h
33868 +++ b/drivers/gpu/drm/via/via_drv.h
33869 @@ -51,7 +51,7 @@ typedef struct drm_via_ring_buffer {
33870 typedef uint32_t maskarray_t[5];
33871
33872 typedef struct drm_via_irq {
33873 - atomic_t irq_received;
33874 + atomic_unchecked_t irq_received;
33875 uint32_t pending_mask;
33876 uint32_t enable_mask;
33877 wait_queue_head_t irq_queue;
33878 @@ -75,7 +75,7 @@ typedef struct drm_via_private {
33879 struct timeval last_vblank;
33880 int last_vblank_valid;
33881 unsigned usec_per_vblank;
33882 - atomic_t vbl_received;
33883 + atomic_unchecked_t vbl_received;
33884 drm_via_state_t hc_state;
33885 char pci_buf[VIA_PCI_BUF_SIZE];
33886 const uint32_t *fire_offsets[VIA_FIRE_BUF_SIZE];
33887 diff --git a/drivers/gpu/drm/via/via_irq.c b/drivers/gpu/drm/via/via_irq.c
33888 index 5935b88..127a8a6 100644
33889 --- a/drivers/gpu/drm/via/via_irq.c
33890 +++ b/drivers/gpu/drm/via/via_irq.c
33891 @@ -102,7 +102,7 @@ u32 via_get_vblank_counter(struct drm_device *dev, int crtc)
33892 if (crtc != 0)
33893 return 0;
33894
33895 - return atomic_read(&dev_priv->vbl_received);
33896 + return atomic_read_unchecked(&dev_priv->vbl_received);
33897 }
33898
33899 irqreturn_t via_driver_irq_handler(DRM_IRQ_ARGS)
33900 @@ -117,8 +117,8 @@ irqreturn_t via_driver_irq_handler(DRM_IRQ_ARGS)
33901
33902 status = VIA_READ(VIA_REG_INTERRUPT);
33903 if (status & VIA_IRQ_VBLANK_PENDING) {
33904 - atomic_inc(&dev_priv->vbl_received);
33905 - if (!(atomic_read(&dev_priv->vbl_received) & 0x0F)) {
33906 + atomic_inc_unchecked(&dev_priv->vbl_received);
33907 + if (!(atomic_read_unchecked(&dev_priv->vbl_received) & 0x0F)) {
33908 do_gettimeofday(&cur_vblank);
33909 if (dev_priv->last_vblank_valid) {
33910 dev_priv->usec_per_vblank =
33911 @@ -128,7 +128,7 @@ irqreturn_t via_driver_irq_handler(DRM_IRQ_ARGS)
33912 dev_priv->last_vblank = cur_vblank;
33913 dev_priv->last_vblank_valid = 1;
33914 }
33915 - if (!(atomic_read(&dev_priv->vbl_received) & 0xFF)) {
33916 + if (!(atomic_read_unchecked(&dev_priv->vbl_received) & 0xFF)) {
33917 DRM_DEBUG("US per vblank is: %u\n",
33918 dev_priv->usec_per_vblank);
33919 }
33920 @@ -138,7 +138,7 @@ irqreturn_t via_driver_irq_handler(DRM_IRQ_ARGS)
33921
33922 for (i = 0; i < dev_priv->num_irqs; ++i) {
33923 if (status & cur_irq->pending_mask) {
33924 - atomic_inc(&cur_irq->irq_received);
33925 + atomic_inc_unchecked(&cur_irq->irq_received);
33926 DRM_WAKEUP(&cur_irq->irq_queue);
33927 handled = 1;
33928 if (dev_priv->irq_map[drm_via_irq_dma0_td] == i) {
33929 @@ -244,11 +244,11 @@ via_driver_irq_wait(struct drm_device * dev, unsigned int irq, int force_sequenc
33930 DRM_WAIT_ON(ret, cur_irq->irq_queue, 3 * DRM_HZ,
33931 ((VIA_READ(masks[irq][2]) & masks[irq][3]) ==
33932 masks[irq][4]));
33933 - cur_irq_sequence = atomic_read(&cur_irq->irq_received);
33934 + cur_irq_sequence = atomic_read_unchecked(&cur_irq->irq_received);
33935 } else {
33936 DRM_WAIT_ON(ret, cur_irq->irq_queue, 3 * DRM_HZ,
33937 (((cur_irq_sequence =
33938 - atomic_read(&cur_irq->irq_received)) -
33939 + atomic_read_unchecked(&cur_irq->irq_received)) -
33940 *sequence) <= (1 << 23)));
33941 }
33942 *sequence = cur_irq_sequence;
33943 @@ -286,7 +286,7 @@ void via_driver_irq_preinstall(struct drm_device * dev)
33944 }
33945
33946 for (i = 0; i < dev_priv->num_irqs; ++i) {
33947 - atomic_set(&cur_irq->irq_received, 0);
33948 + atomic_set_unchecked(&cur_irq->irq_received, 0);
33949 cur_irq->enable_mask = dev_priv->irq_masks[i][0];
33950 cur_irq->pending_mask = dev_priv->irq_masks[i][1];
33951 DRM_INIT_WAITQUEUE(&cur_irq->irq_queue);
33952 @@ -368,7 +368,7 @@ int via_wait_irq(struct drm_device *dev, void *data, struct drm_file *file_priv)
33953 switch (irqwait->request.type & ~VIA_IRQ_FLAGS_MASK) {
33954 case VIA_IRQ_RELATIVE:
33955 irqwait->request.sequence +=
33956 - atomic_read(&cur_irq->irq_received);
33957 + atomic_read_unchecked(&cur_irq->irq_received);
33958 irqwait->request.type &= ~_DRM_VBLANK_RELATIVE;
33959 case VIA_IRQ_ABSOLUTE:
33960 break;
33961 diff --git a/drivers/gpu/vga/vgaarb.c b/drivers/gpu/vga/vgaarb.c
33962 index aa8688d..6a0140c 100644
33963 --- a/drivers/gpu/vga/vgaarb.c
33964 +++ b/drivers/gpu/vga/vgaarb.c
33965 @@ -894,14 +894,20 @@ static ssize_t vga_arb_write(struct file *file, const char __user * buf,
33966 uc = &priv->cards[i];
33967 }
33968
33969 - if (!uc)
33970 - return -EINVAL;
33971 + if (!uc) {
33972 + ret_val = -EINVAL;
33973 + goto done;
33974 + }
33975
33976 - if (io_state & VGA_RSRC_LEGACY_IO && uc->io_cnt == 0)
33977 - return -EINVAL;
33978 + if (io_state & VGA_RSRC_LEGACY_IO && uc->io_cnt == 0) {
33979 + ret_val = -EINVAL;
33980 + goto done;
33981 + }
33982
33983 - if (io_state & VGA_RSRC_LEGACY_MEM && uc->mem_cnt == 0)
33984 - return -EINVAL;
33985 + if (io_state & VGA_RSRC_LEGACY_MEM && uc->mem_cnt == 0) {
33986 + ret_val = -EINVAL;
33987 + goto done;
33988 + }
33989
33990 vga_put(pdev, io_state);
33991
33992 diff --git a/drivers/hid/hid-core.c b/drivers/hid/hid-core.c
33993 index f3f1415..e561d90 100644
33994 --- a/drivers/hid/hid-core.c
33995 +++ b/drivers/hid/hid-core.c
33996 @@ -1752,7 +1752,7 @@ static bool hid_ignore(struct hid_device *hdev)
33997
33998 int hid_add_device(struct hid_device *hdev)
33999 {
34000 - static atomic_t id = ATOMIC_INIT(0);
34001 + static atomic_unchecked_t id = ATOMIC_INIT(0);
34002 int ret;
34003
34004 if (WARN_ON(hdev->status & HID_STAT_ADDED))
34005 @@ -1766,7 +1766,7 @@ int hid_add_device(struct hid_device *hdev)
34006 /* XXX hack, any other cleaner solution after the driver core
34007 * is converted to allow more than 20 bytes as the device name? */
34008 dev_set_name(&hdev->dev, "%04X:%04X:%04X.%04X", hdev->bus,
34009 - hdev->vendor, hdev->product, atomic_inc_return(&id));
34010 + hdev->vendor, hdev->product, atomic_inc_return_unchecked(&id));
34011
34012 ret = device_add(&hdev->dev);
34013 if (!ret)
34014 diff --git a/drivers/hid/usbhid/hiddev.c b/drivers/hid/usbhid/hiddev.c
34015 index 8b6ee24..70f657d 100644
34016 --- a/drivers/hid/usbhid/hiddev.c
34017 +++ b/drivers/hid/usbhid/hiddev.c
34018 @@ -617,7 +617,7 @@ static long hiddev_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
34019 return put_user(HID_VERSION, (int __user *)arg);
34020
34021 case HIDIOCAPPLICATION:
34022 - if (arg < 0 || arg >= hid->maxapplication)
34023 + if (arg >= hid->maxapplication)
34024 return -EINVAL;
34025
34026 for (i = 0; i < hid->maxcollection; i++)
34027 diff --git a/drivers/hwmon/lis3lv02d.c b/drivers/hwmon/lis3lv02d.c
34028 index 5d5ed69..f40533e 100644
34029 --- a/drivers/hwmon/lis3lv02d.c
34030 +++ b/drivers/hwmon/lis3lv02d.c
34031 @@ -146,7 +146,7 @@ static irqreturn_t lis302dl_interrupt(int irq, void *dummy)
34032 * the lid is closed. This leads to interrupts as soon as a little move
34033 * is done.
34034 */
34035 - atomic_inc(&lis3_dev.count);
34036 + atomic_inc_unchecked(&lis3_dev.count);
34037
34038 wake_up_interruptible(&lis3_dev.misc_wait);
34039 kill_fasync(&lis3_dev.async_queue, SIGIO, POLL_IN);
34040 @@ -160,7 +160,7 @@ static int lis3lv02d_misc_open(struct inode *inode, struct file *file)
34041 if (test_and_set_bit(0, &lis3_dev.misc_opened))
34042 return -EBUSY; /* already open */
34043
34044 - atomic_set(&lis3_dev.count, 0);
34045 + atomic_set_unchecked(&lis3_dev.count, 0);
34046
34047 /*
34048 * The sensor can generate interrupts for free-fall and direction
34049 @@ -206,7 +206,7 @@ static ssize_t lis3lv02d_misc_read(struct file *file, char __user *buf,
34050 add_wait_queue(&lis3_dev.misc_wait, &wait);
34051 while (true) {
34052 set_current_state(TASK_INTERRUPTIBLE);
34053 - data = atomic_xchg(&lis3_dev.count, 0);
34054 + data = atomic_xchg_unchecked(&lis3_dev.count, 0);
34055 if (data)
34056 break;
34057
34058 @@ -244,7 +244,7 @@ out:
34059 static unsigned int lis3lv02d_misc_poll(struct file *file, poll_table *wait)
34060 {
34061 poll_wait(file, &lis3_dev.misc_wait, wait);
34062 - if (atomic_read(&lis3_dev.count))
34063 + if (atomic_read_unchecked(&lis3_dev.count))
34064 return POLLIN | POLLRDNORM;
34065 return 0;
34066 }
34067 diff --git a/drivers/hwmon/lis3lv02d.h b/drivers/hwmon/lis3lv02d.h
34068 index 7cdd76f..fe0efdf 100644
34069 --- a/drivers/hwmon/lis3lv02d.h
34070 +++ b/drivers/hwmon/lis3lv02d.h
34071 @@ -201,7 +201,7 @@ struct lis3lv02d {
34072
34073 struct input_polled_dev *idev; /* input device */
34074 struct platform_device *pdev; /* platform device */
34075 - atomic_t count; /* interrupt count after last read */
34076 + atomic_unchecked_t count; /* interrupt count after last read */
34077 int xcalib; /* calibrated null value for x */
34078 int ycalib; /* calibrated null value for y */
34079 int zcalib; /* calibrated null value for z */
34080 diff --git a/drivers/hwmon/sht15.c b/drivers/hwmon/sht15.c
34081 index 2040507..706ec1e 100644
34082 --- a/drivers/hwmon/sht15.c
34083 +++ b/drivers/hwmon/sht15.c
34084 @@ -112,7 +112,7 @@ struct sht15_data {
34085 int supply_uV;
34086 int supply_uV_valid;
34087 struct work_struct update_supply_work;
34088 - atomic_t interrupt_handled;
34089 + atomic_unchecked_t interrupt_handled;
34090 };
34091
34092 /**
34093 @@ -245,13 +245,13 @@ static inline int sht15_update_single_val(struct sht15_data *data,
34094 return ret;
34095
34096 gpio_direction_input(data->pdata->gpio_data);
34097 - atomic_set(&data->interrupt_handled, 0);
34098 + atomic_set_unchecked(&data->interrupt_handled, 0);
34099
34100 enable_irq(gpio_to_irq(data->pdata->gpio_data));
34101 if (gpio_get_value(data->pdata->gpio_data) == 0) {
34102 disable_irq_nosync(gpio_to_irq(data->pdata->gpio_data));
34103 /* Only relevant if the interrupt hasn't occured. */
34104 - if (!atomic_read(&data->interrupt_handled))
34105 + if (!atomic_read_unchecked(&data->interrupt_handled))
34106 schedule_work(&data->read_work);
34107 }
34108 ret = wait_event_timeout(data->wait_queue,
34109 @@ -398,7 +398,7 @@ static irqreturn_t sht15_interrupt_fired(int irq, void *d)
34110 struct sht15_data *data = d;
34111 /* First disable the interrupt */
34112 disable_irq_nosync(irq);
34113 - atomic_inc(&data->interrupt_handled);
34114 + atomic_inc_unchecked(&data->interrupt_handled);
34115 /* Then schedule a reading work struct */
34116 if (data->flag != SHT15_READING_NOTHING)
34117 schedule_work(&data->read_work);
34118 @@ -449,11 +449,11 @@ static void sht15_bh_read_data(struct work_struct *work_s)
34119 here as could have gone low in meantime so verify
34120 it hasn't!
34121 */
34122 - atomic_set(&data->interrupt_handled, 0);
34123 + atomic_set_unchecked(&data->interrupt_handled, 0);
34124 enable_irq(gpio_to_irq(data->pdata->gpio_data));
34125 /* If still not occured or another handler has been scheduled */
34126 if (gpio_get_value(data->pdata->gpio_data)
34127 - || atomic_read(&data->interrupt_handled))
34128 + || atomic_read_unchecked(&data->interrupt_handled))
34129 return;
34130 }
34131 /* Read the data back from the device */
34132 diff --git a/drivers/hwmon/w83791d.c b/drivers/hwmon/w83791d.c
34133 index 97851c5..cb40626 100644
34134 --- a/drivers/hwmon/w83791d.c
34135 +++ b/drivers/hwmon/w83791d.c
34136 @@ -330,8 +330,8 @@ static int w83791d_detect(struct i2c_client *client, int kind,
34137 struct i2c_board_info *info);
34138 static int w83791d_remove(struct i2c_client *client);
34139
34140 -static int w83791d_read(struct i2c_client *client, u8 register);
34141 -static int w83791d_write(struct i2c_client *client, u8 register, u8 value);
34142 +static int w83791d_read(struct i2c_client *client, u8 reg);
34143 +static int w83791d_write(struct i2c_client *client, u8 reg, u8 value);
34144 static struct w83791d_data *w83791d_update_device(struct device *dev);
34145
34146 #ifdef DEBUG
34147 diff --git a/drivers/i2c/busses/i2c-amd756-s4882.c b/drivers/i2c/busses/i2c-amd756-s4882.c
34148 index 378fcb5..5e91fa8 100644
34149 --- a/drivers/i2c/busses/i2c-amd756-s4882.c
34150 +++ b/drivers/i2c/busses/i2c-amd756-s4882.c
34151 @@ -43,7 +43,7 @@
34152 extern struct i2c_adapter amd756_smbus;
34153
34154 static struct i2c_adapter *s4882_adapter;
34155 -static struct i2c_algorithm *s4882_algo;
34156 +static i2c_algorithm_no_const *s4882_algo;
34157
34158 /* Wrapper access functions for multiplexed SMBus */
34159 static DEFINE_MUTEX(amd756_lock);
34160 diff --git a/drivers/i2c/busses/i2c-nforce2-s4985.c b/drivers/i2c/busses/i2c-nforce2-s4985.c
34161 index 29015eb..af2d8e9 100644
34162 --- a/drivers/i2c/busses/i2c-nforce2-s4985.c
34163 +++ b/drivers/i2c/busses/i2c-nforce2-s4985.c
34164 @@ -41,7 +41,7 @@
34165 extern struct i2c_adapter *nforce2_smbus;
34166
34167 static struct i2c_adapter *s4985_adapter;
34168 -static struct i2c_algorithm *s4985_algo;
34169 +static i2c_algorithm_no_const *s4985_algo;
34170
34171 /* Wrapper access functions for multiplexed SMBus */
34172 static DEFINE_MUTEX(nforce2_lock);
34173 diff --git a/drivers/ide/aec62xx.c b/drivers/ide/aec62xx.c
34174 index 878f8ec..12376fc 100644
34175 --- a/drivers/ide/aec62xx.c
34176 +++ b/drivers/ide/aec62xx.c
34177 @@ -180,7 +180,7 @@ static const struct ide_port_ops atp86x_port_ops = {
34178 .cable_detect = atp86x_cable_detect,
34179 };
34180
34181 -static const struct ide_port_info aec62xx_chipsets[] __devinitdata = {
34182 +static const struct ide_port_info aec62xx_chipsets[] __devinitconst = {
34183 { /* 0: AEC6210 */
34184 .name = DRV_NAME,
34185 .init_chipset = init_chipset_aec62xx,
34186 diff --git a/drivers/ide/alim15x3.c b/drivers/ide/alim15x3.c
34187 index e59b6de..4b4fc65 100644
34188 --- a/drivers/ide/alim15x3.c
34189 +++ b/drivers/ide/alim15x3.c
34190 @@ -509,7 +509,7 @@ static const struct ide_dma_ops ali_dma_ops = {
34191 .dma_sff_read_status = ide_dma_sff_read_status,
34192 };
34193
34194 -static const struct ide_port_info ali15x3_chipset __devinitdata = {
34195 +static const struct ide_port_info ali15x3_chipset __devinitconst = {
34196 .name = DRV_NAME,
34197 .init_chipset = init_chipset_ali15x3,
34198 .init_hwif = init_hwif_ali15x3,
34199 diff --git a/drivers/ide/amd74xx.c b/drivers/ide/amd74xx.c
34200 index 628cd2e..087a414 100644
34201 --- a/drivers/ide/amd74xx.c
34202 +++ b/drivers/ide/amd74xx.c
34203 @@ -221,7 +221,7 @@ static const struct ide_port_ops amd_port_ops = {
34204 .udma_mask = udma, \
34205 }
34206
34207 -static const struct ide_port_info amd74xx_chipsets[] __devinitdata = {
34208 +static const struct ide_port_info amd74xx_chipsets[] __devinitconst = {
34209 /* 0: AMD7401 */ DECLARE_AMD_DEV(0x00, ATA_UDMA2),
34210 /* 1: AMD7409 */ DECLARE_AMD_DEV(ATA_SWDMA2, ATA_UDMA4),
34211 /* 2: AMD7411/7441 */ DECLARE_AMD_DEV(ATA_SWDMA2, ATA_UDMA5),
34212 diff --git a/drivers/ide/atiixp.c b/drivers/ide/atiixp.c
34213 index 837322b..837fd71 100644
34214 --- a/drivers/ide/atiixp.c
34215 +++ b/drivers/ide/atiixp.c
34216 @@ -137,7 +137,7 @@ static const struct ide_port_ops atiixp_port_ops = {
34217 .cable_detect = atiixp_cable_detect,
34218 };
34219
34220 -static const struct ide_port_info atiixp_pci_info[] __devinitdata = {
34221 +static const struct ide_port_info atiixp_pci_info[] __devinitconst = {
34222 { /* 0: IXP200/300/400/700 */
34223 .name = DRV_NAME,
34224 .enablebits = {{0x48,0x01,0x00}, {0x48,0x08,0x00}},
34225 diff --git a/drivers/ide/cmd64x.c b/drivers/ide/cmd64x.c
34226 index ca0c46f..d55318a 100644
34227 --- a/drivers/ide/cmd64x.c
34228 +++ b/drivers/ide/cmd64x.c
34229 @@ -372,7 +372,7 @@ static const struct ide_dma_ops cmd646_rev1_dma_ops = {
34230 .dma_sff_read_status = ide_dma_sff_read_status,
34231 };
34232
34233 -static const struct ide_port_info cmd64x_chipsets[] __devinitdata = {
34234 +static const struct ide_port_info cmd64x_chipsets[] __devinitconst = {
34235 { /* 0: CMD643 */
34236 .name = DRV_NAME,
34237 .init_chipset = init_chipset_cmd64x,
34238 diff --git a/drivers/ide/cs5520.c b/drivers/ide/cs5520.c
34239 index 09f98ed..cebc5bc 100644
34240 --- a/drivers/ide/cs5520.c
34241 +++ b/drivers/ide/cs5520.c
34242 @@ -93,7 +93,7 @@ static const struct ide_port_ops cs5520_port_ops = {
34243 .set_dma_mode = cs5520_set_dma_mode,
34244 };
34245
34246 -static const struct ide_port_info cyrix_chipset __devinitdata = {
34247 +static const struct ide_port_info cyrix_chipset __devinitconst = {
34248 .name = DRV_NAME,
34249 .enablebits = { { 0x60, 0x01, 0x01 }, { 0x60, 0x02, 0x02 } },
34250 .port_ops = &cs5520_port_ops,
34251 diff --git a/drivers/ide/cs5530.c b/drivers/ide/cs5530.c
34252 index 40bf05e..7d58ca0 100644
34253 --- a/drivers/ide/cs5530.c
34254 +++ b/drivers/ide/cs5530.c
34255 @@ -244,7 +244,7 @@ static const struct ide_port_ops cs5530_port_ops = {
34256 .udma_filter = cs5530_udma_filter,
34257 };
34258
34259 -static const struct ide_port_info cs5530_chipset __devinitdata = {
34260 +static const struct ide_port_info cs5530_chipset __devinitconst = {
34261 .name = DRV_NAME,
34262 .init_chipset = init_chipset_cs5530,
34263 .init_hwif = init_hwif_cs5530,
34264 diff --git a/drivers/ide/cs5535.c b/drivers/ide/cs5535.c
34265 index 983d957..53e6172 100644
34266 --- a/drivers/ide/cs5535.c
34267 +++ b/drivers/ide/cs5535.c
34268 @@ -170,7 +170,7 @@ static const struct ide_port_ops cs5535_port_ops = {
34269 .cable_detect = cs5535_cable_detect,
34270 };
34271
34272 -static const struct ide_port_info cs5535_chipset __devinitdata = {
34273 +static const struct ide_port_info cs5535_chipset __devinitconst = {
34274 .name = DRV_NAME,
34275 .port_ops = &cs5535_port_ops,
34276 .host_flags = IDE_HFLAG_SINGLE | IDE_HFLAG_POST_SET_MODE,
34277 diff --git a/drivers/ide/cy82c693.c b/drivers/ide/cy82c693.c
34278 index 74fc540..8e933d8 100644
34279 --- a/drivers/ide/cy82c693.c
34280 +++ b/drivers/ide/cy82c693.c
34281 @@ -288,7 +288,7 @@ static const struct ide_port_ops cy82c693_port_ops = {
34282 .set_dma_mode = cy82c693_set_dma_mode,
34283 };
34284
34285 -static const struct ide_port_info cy82c693_chipset __devinitdata = {
34286 +static const struct ide_port_info cy82c693_chipset __devinitconst = {
34287 .name = DRV_NAME,
34288 .init_iops = init_iops_cy82c693,
34289 .port_ops = &cy82c693_port_ops,
34290 diff --git a/drivers/ide/hpt366.c b/drivers/ide/hpt366.c
34291 index 7ce68ef..e78197d 100644
34292 --- a/drivers/ide/hpt366.c
34293 +++ b/drivers/ide/hpt366.c
34294 @@ -507,7 +507,7 @@ static struct hpt_timings hpt37x_timings = {
34295 }
34296 };
34297
34298 -static const struct hpt_info hpt36x __devinitdata = {
34299 +static const struct hpt_info hpt36x __devinitconst = {
34300 .chip_name = "HPT36x",
34301 .chip_type = HPT36x,
34302 .udma_mask = HPT366_ALLOW_ATA66_3 ? (HPT366_ALLOW_ATA66_4 ? ATA_UDMA4 : ATA_UDMA3) : ATA_UDMA2,
34303 @@ -515,7 +515,7 @@ static const struct hpt_info hpt36x __devinitdata = {
34304 .timings = &hpt36x_timings
34305 };
34306
34307 -static const struct hpt_info hpt370 __devinitdata = {
34308 +static const struct hpt_info hpt370 __devinitconst = {
34309 .chip_name = "HPT370",
34310 .chip_type = HPT370,
34311 .udma_mask = HPT370_ALLOW_ATA100_5 ? ATA_UDMA5 : ATA_UDMA4,
34312 @@ -523,7 +523,7 @@ static const struct hpt_info hpt370 __devinitdata = {
34313 .timings = &hpt37x_timings
34314 };
34315
34316 -static const struct hpt_info hpt370a __devinitdata = {
34317 +static const struct hpt_info hpt370a __devinitconst = {
34318 .chip_name = "HPT370A",
34319 .chip_type = HPT370A,
34320 .udma_mask = HPT370_ALLOW_ATA100_5 ? ATA_UDMA5 : ATA_UDMA4,
34321 @@ -531,7 +531,7 @@ static const struct hpt_info hpt370a __devinitdata = {
34322 .timings = &hpt37x_timings
34323 };
34324
34325 -static const struct hpt_info hpt374 __devinitdata = {
34326 +static const struct hpt_info hpt374 __devinitconst = {
34327 .chip_name = "HPT374",
34328 .chip_type = HPT374,
34329 .udma_mask = ATA_UDMA5,
34330 @@ -539,7 +539,7 @@ static const struct hpt_info hpt374 __devinitdata = {
34331 .timings = &hpt37x_timings
34332 };
34333
34334 -static const struct hpt_info hpt372 __devinitdata = {
34335 +static const struct hpt_info hpt372 __devinitconst = {
34336 .chip_name = "HPT372",
34337 .chip_type = HPT372,
34338 .udma_mask = HPT372_ALLOW_ATA133_6 ? ATA_UDMA6 : ATA_UDMA5,
34339 @@ -547,7 +547,7 @@ static const struct hpt_info hpt372 __devinitdata = {
34340 .timings = &hpt37x_timings
34341 };
34342
34343 -static const struct hpt_info hpt372a __devinitdata = {
34344 +static const struct hpt_info hpt372a __devinitconst = {
34345 .chip_name = "HPT372A",
34346 .chip_type = HPT372A,
34347 .udma_mask = HPT372_ALLOW_ATA133_6 ? ATA_UDMA6 : ATA_UDMA5,
34348 @@ -555,7 +555,7 @@ static const struct hpt_info hpt372a __devinitdata = {
34349 .timings = &hpt37x_timings
34350 };
34351
34352 -static const struct hpt_info hpt302 __devinitdata = {
34353 +static const struct hpt_info hpt302 __devinitconst = {
34354 .chip_name = "HPT302",
34355 .chip_type = HPT302,
34356 .udma_mask = HPT302_ALLOW_ATA133_6 ? ATA_UDMA6 : ATA_UDMA5,
34357 @@ -563,7 +563,7 @@ static const struct hpt_info hpt302 __devinitdata = {
34358 .timings = &hpt37x_timings
34359 };
34360
34361 -static const struct hpt_info hpt371 __devinitdata = {
34362 +static const struct hpt_info hpt371 __devinitconst = {
34363 .chip_name = "HPT371",
34364 .chip_type = HPT371,
34365 .udma_mask = HPT371_ALLOW_ATA133_6 ? ATA_UDMA6 : ATA_UDMA5,
34366 @@ -571,7 +571,7 @@ static const struct hpt_info hpt371 __devinitdata = {
34367 .timings = &hpt37x_timings
34368 };
34369
34370 -static const struct hpt_info hpt372n __devinitdata = {
34371 +static const struct hpt_info hpt372n __devinitconst = {
34372 .chip_name = "HPT372N",
34373 .chip_type = HPT372N,
34374 .udma_mask = HPT372_ALLOW_ATA133_6 ? ATA_UDMA6 : ATA_UDMA5,
34375 @@ -579,7 +579,7 @@ static const struct hpt_info hpt372n __devinitdata = {
34376 .timings = &hpt37x_timings
34377 };
34378
34379 -static const struct hpt_info hpt302n __devinitdata = {
34380 +static const struct hpt_info hpt302n __devinitconst = {
34381 .chip_name = "HPT302N",
34382 .chip_type = HPT302N,
34383 .udma_mask = HPT302_ALLOW_ATA133_6 ? ATA_UDMA6 : ATA_UDMA5,
34384 @@ -587,7 +587,7 @@ static const struct hpt_info hpt302n __devinitdata = {
34385 .timings = &hpt37x_timings
34386 };
34387
34388 -static const struct hpt_info hpt371n __devinitdata = {
34389 +static const struct hpt_info hpt371n __devinitconst = {
34390 .chip_name = "HPT371N",
34391 .chip_type = HPT371N,
34392 .udma_mask = HPT371_ALLOW_ATA133_6 ? ATA_UDMA6 : ATA_UDMA5,
34393 @@ -1422,7 +1422,7 @@ static const struct ide_dma_ops hpt36x_dma_ops = {
34394 .dma_sff_read_status = ide_dma_sff_read_status,
34395 };
34396
34397 -static const struct ide_port_info hpt366_chipsets[] __devinitdata = {
34398 +static const struct ide_port_info hpt366_chipsets[] __devinitconst = {
34399 { /* 0: HPT36x */
34400 .name = DRV_NAME,
34401 .init_chipset = init_chipset_hpt366,
34402 diff --git a/drivers/ide/ide-cd.c b/drivers/ide/ide-cd.c
34403 index 2de76cc..74186a1 100644
34404 --- a/drivers/ide/ide-cd.c
34405 +++ b/drivers/ide/ide-cd.c
34406 @@ -774,7 +774,7 @@ static void cdrom_do_block_pc(ide_drive_t *drive, struct request *rq)
34407 alignment = queue_dma_alignment(q) | q->dma_pad_mask;
34408 if ((unsigned long)buf & alignment
34409 || blk_rq_bytes(rq) & q->dma_pad_mask
34410 - || object_is_on_stack(buf))
34411 + || object_starts_on_stack(buf))
34412 drive->dma = 0;
34413 }
34414 }
34415 diff --git a/drivers/ide/ide-floppy.c b/drivers/ide/ide-floppy.c
34416 index fefbdfc..62ff465 100644
34417 --- a/drivers/ide/ide-floppy.c
34418 +++ b/drivers/ide/ide-floppy.c
34419 @@ -373,6 +373,8 @@ static int ide_floppy_get_capacity(ide_drive_t *drive)
34420 u8 pc_buf[256], header_len, desc_cnt;
34421 int i, rc = 1, blocks, length;
34422
34423 + pax_track_stack();
34424 +
34425 ide_debug_log(IDE_DBG_FUNC, "enter");
34426
34427 drive->bios_cyl = 0;
34428 diff --git a/drivers/ide/ide-floppy_ioctl.c b/drivers/ide/ide-floppy_ioctl.c
34429 index 9c22882..05f024c 100644
34430 --- a/drivers/ide/ide-floppy_ioctl.c
34431 +++ b/drivers/ide/ide-floppy_ioctl.c
34432 @@ -287,8 +287,7 @@ int ide_floppy_ioctl(ide_drive_t *drive, struct block_device *bdev,
34433 * and CDROM_SEND_PACKET (legacy) ioctls
34434 */
34435 if (cmd != CDROM_SEND_PACKET && cmd != SCSI_IOCTL_SEND_COMMAND)
34436 - err = scsi_cmd_ioctl(bdev->bd_disk->queue, bdev->bd_disk,
34437 - mode, cmd, argp);
34438 + err = scsi_cmd_blk_ioctl(bdev, mode, cmd, argp);
34439
34440 if (err == -ENOTTY)
34441 err = generic_ide_ioctl(drive, bdev, cmd, arg);
34442 diff --git a/drivers/ide/ide-pci-generic.c b/drivers/ide/ide-pci-generic.c
34443 index 39d4e01..11538ce 100644
34444 --- a/drivers/ide/ide-pci-generic.c
34445 +++ b/drivers/ide/ide-pci-generic.c
34446 @@ -53,7 +53,7 @@ static const struct ide_port_ops netcell_port_ops = {
34447 .udma_mask = ATA_UDMA6, \
34448 }
34449
34450 -static const struct ide_port_info generic_chipsets[] __devinitdata = {
34451 +static const struct ide_port_info generic_chipsets[] __devinitconst = {
34452 /* 0: Unknown */
34453 DECLARE_GENERIC_PCI_DEV(0),
34454
34455 diff --git a/drivers/ide/it8172.c b/drivers/ide/it8172.c
34456 index 0d266a5..aaca790 100644
34457 --- a/drivers/ide/it8172.c
34458 +++ b/drivers/ide/it8172.c
34459 @@ -115,7 +115,7 @@ static const struct ide_port_ops it8172_port_ops = {
34460 .set_dma_mode = it8172_set_dma_mode,
34461 };
34462
34463 -static const struct ide_port_info it8172_port_info __devinitdata = {
34464 +static const struct ide_port_info it8172_port_info __devinitconst = {
34465 .name = DRV_NAME,
34466 .port_ops = &it8172_port_ops,
34467 .enablebits = { {0x41, 0x80, 0x80}, {0x00, 0x00, 0x00} },
34468 diff --git a/drivers/ide/it8213.c b/drivers/ide/it8213.c
34469 index 4797616..4be488a 100644
34470 --- a/drivers/ide/it8213.c
34471 +++ b/drivers/ide/it8213.c
34472 @@ -156,7 +156,7 @@ static const struct ide_port_ops it8213_port_ops = {
34473 .cable_detect = it8213_cable_detect,
34474 };
34475
34476 -static const struct ide_port_info it8213_chipset __devinitdata = {
34477 +static const struct ide_port_info it8213_chipset __devinitconst = {
34478 .name = DRV_NAME,
34479 .enablebits = { {0x41, 0x80, 0x80} },
34480 .port_ops = &it8213_port_ops,
34481 diff --git a/drivers/ide/it821x.c b/drivers/ide/it821x.c
34482 index 51aa745..146ee60 100644
34483 --- a/drivers/ide/it821x.c
34484 +++ b/drivers/ide/it821x.c
34485 @@ -627,7 +627,7 @@ static const struct ide_port_ops it821x_port_ops = {
34486 .cable_detect = it821x_cable_detect,
34487 };
34488
34489 -static const struct ide_port_info it821x_chipset __devinitdata = {
34490 +static const struct ide_port_info it821x_chipset __devinitconst = {
34491 .name = DRV_NAME,
34492 .init_chipset = init_chipset_it821x,
34493 .init_hwif = init_hwif_it821x,
34494 diff --git a/drivers/ide/jmicron.c b/drivers/ide/jmicron.c
34495 index bf2be64..9270098 100644
34496 --- a/drivers/ide/jmicron.c
34497 +++ b/drivers/ide/jmicron.c
34498 @@ -102,7 +102,7 @@ static const struct ide_port_ops jmicron_port_ops = {
34499 .cable_detect = jmicron_cable_detect,
34500 };
34501
34502 -static const struct ide_port_info jmicron_chipset __devinitdata = {
34503 +static const struct ide_port_info jmicron_chipset __devinitconst = {
34504 .name = DRV_NAME,
34505 .enablebits = { { 0x40, 0x01, 0x01 }, { 0x40, 0x10, 0x10 } },
34506 .port_ops = &jmicron_port_ops,
34507 diff --git a/drivers/ide/ns87415.c b/drivers/ide/ns87415.c
34508 index 95327a2..73f78d8 100644
34509 --- a/drivers/ide/ns87415.c
34510 +++ b/drivers/ide/ns87415.c
34511 @@ -293,7 +293,7 @@ static const struct ide_dma_ops ns87415_dma_ops = {
34512 .dma_sff_read_status = superio_dma_sff_read_status,
34513 };
34514
34515 -static const struct ide_port_info ns87415_chipset __devinitdata = {
34516 +static const struct ide_port_info ns87415_chipset __devinitconst = {
34517 .name = DRV_NAME,
34518 .init_hwif = init_hwif_ns87415,
34519 .tp_ops = &ns87415_tp_ops,
34520 diff --git a/drivers/ide/opti621.c b/drivers/ide/opti621.c
34521 index f1d70d6..e1de05b 100644
34522 --- a/drivers/ide/opti621.c
34523 +++ b/drivers/ide/opti621.c
34524 @@ -202,7 +202,7 @@ static const struct ide_port_ops opti621_port_ops = {
34525 .set_pio_mode = opti621_set_pio_mode,
34526 };
34527
34528 -static const struct ide_port_info opti621_chipset __devinitdata = {
34529 +static const struct ide_port_info opti621_chipset __devinitconst = {
34530 .name = DRV_NAME,
34531 .enablebits = { {0x45, 0x80, 0x00}, {0x40, 0x08, 0x00} },
34532 .port_ops = &opti621_port_ops,
34533 diff --git a/drivers/ide/pdc202xx_new.c b/drivers/ide/pdc202xx_new.c
34534 index 65ba823..7311f4d 100644
34535 --- a/drivers/ide/pdc202xx_new.c
34536 +++ b/drivers/ide/pdc202xx_new.c
34537 @@ -465,7 +465,7 @@ static const struct ide_port_ops pdcnew_port_ops = {
34538 .udma_mask = udma, \
34539 }
34540
34541 -static const struct ide_port_info pdcnew_chipsets[] __devinitdata = {
34542 +static const struct ide_port_info pdcnew_chipsets[] __devinitconst = {
34543 /* 0: PDC202{68,70} */ DECLARE_PDCNEW_DEV(ATA_UDMA5),
34544 /* 1: PDC202{69,71,75,76,77} */ DECLARE_PDCNEW_DEV(ATA_UDMA6),
34545 };
34546 diff --git a/drivers/ide/pdc202xx_old.c b/drivers/ide/pdc202xx_old.c
34547 index cb812f3..af816ef 100644
34548 --- a/drivers/ide/pdc202xx_old.c
34549 +++ b/drivers/ide/pdc202xx_old.c
34550 @@ -285,7 +285,7 @@ static const struct ide_dma_ops pdc2026x_dma_ops = {
34551 .max_sectors = sectors, \
34552 }
34553
34554 -static const struct ide_port_info pdc202xx_chipsets[] __devinitdata = {
34555 +static const struct ide_port_info pdc202xx_chipsets[] __devinitconst = {
34556 { /* 0: PDC20246 */
34557 .name = DRV_NAME,
34558 .init_chipset = init_chipset_pdc202xx,
34559 diff --git a/drivers/ide/piix.c b/drivers/ide/piix.c
34560 index bf14f39..15c4b98 100644
34561 --- a/drivers/ide/piix.c
34562 +++ b/drivers/ide/piix.c
34563 @@ -344,7 +344,7 @@ static const struct ide_port_ops ich_port_ops = {
34564 .udma_mask = udma, \
34565 }
34566
34567 -static const struct ide_port_info piix_pci_info[] __devinitdata = {
34568 +static const struct ide_port_info piix_pci_info[] __devinitconst = {
34569 /* 0: MPIIX */
34570 { /*
34571 * MPIIX actually has only a single IDE channel mapped to
34572 diff --git a/drivers/ide/rz1000.c b/drivers/ide/rz1000.c
34573 index a6414a8..c04173e 100644
34574 --- a/drivers/ide/rz1000.c
34575 +++ b/drivers/ide/rz1000.c
34576 @@ -38,7 +38,7 @@ static int __devinit rz1000_disable_readahead(struct pci_dev *dev)
34577 }
34578 }
34579
34580 -static const struct ide_port_info rz1000_chipset __devinitdata = {
34581 +static const struct ide_port_info rz1000_chipset __devinitconst = {
34582 .name = DRV_NAME,
34583 .host_flags = IDE_HFLAG_NO_DMA,
34584 };
34585 diff --git a/drivers/ide/sc1200.c b/drivers/ide/sc1200.c
34586 index d467478..9203942 100644
34587 --- a/drivers/ide/sc1200.c
34588 +++ b/drivers/ide/sc1200.c
34589 @@ -290,7 +290,7 @@ static const struct ide_dma_ops sc1200_dma_ops = {
34590 .dma_sff_read_status = ide_dma_sff_read_status,
34591 };
34592
34593 -static const struct ide_port_info sc1200_chipset __devinitdata = {
34594 +static const struct ide_port_info sc1200_chipset __devinitconst = {
34595 .name = DRV_NAME,
34596 .port_ops = &sc1200_port_ops,
34597 .dma_ops = &sc1200_dma_ops,
34598 diff --git a/drivers/ide/scc_pata.c b/drivers/ide/scc_pata.c
34599 index 1104bb3..59c5194 100644
34600 --- a/drivers/ide/scc_pata.c
34601 +++ b/drivers/ide/scc_pata.c
34602 @@ -811,7 +811,7 @@ static const struct ide_dma_ops scc_dma_ops = {
34603 .dma_sff_read_status = scc_dma_sff_read_status,
34604 };
34605
34606 -static const struct ide_port_info scc_chipset __devinitdata = {
34607 +static const struct ide_port_info scc_chipset __devinitconst = {
34608 .name = "sccIDE",
34609 .init_iops = init_iops_scc,
34610 .init_dma = scc_init_dma,
34611 diff --git a/drivers/ide/serverworks.c b/drivers/ide/serverworks.c
34612 index b6554ef..6cc2cc3 100644
34613 --- a/drivers/ide/serverworks.c
34614 +++ b/drivers/ide/serverworks.c
34615 @@ -353,7 +353,7 @@ static const struct ide_port_ops svwks_port_ops = {
34616 .cable_detect = svwks_cable_detect,
34617 };
34618
34619 -static const struct ide_port_info serverworks_chipsets[] __devinitdata = {
34620 +static const struct ide_port_info serverworks_chipsets[] __devinitconst = {
34621 { /* 0: OSB4 */
34622 .name = DRV_NAME,
34623 .init_chipset = init_chipset_svwks,
34624 diff --git a/drivers/ide/setup-pci.c b/drivers/ide/setup-pci.c
34625 index ab3db61..afed580 100644
34626 --- a/drivers/ide/setup-pci.c
34627 +++ b/drivers/ide/setup-pci.c
34628 @@ -542,6 +542,8 @@ int ide_pci_init_two(struct pci_dev *dev1, struct pci_dev *dev2,
34629 int ret, i, n_ports = dev2 ? 4 : 2;
34630 struct ide_hw hw[4], *hws[] = { NULL, NULL, NULL, NULL };
34631
34632 + pax_track_stack();
34633 +
34634 for (i = 0; i < n_ports / 2; i++) {
34635 ret = ide_setup_pci_controller(pdev[i], d, !i);
34636 if (ret < 0)
34637 diff --git a/drivers/ide/siimage.c b/drivers/ide/siimage.c
34638 index d95df52..0b03a39 100644
34639 --- a/drivers/ide/siimage.c
34640 +++ b/drivers/ide/siimage.c
34641 @@ -719,7 +719,7 @@ static const struct ide_dma_ops sil_dma_ops = {
34642 .udma_mask = ATA_UDMA6, \
34643 }
34644
34645 -static const struct ide_port_info siimage_chipsets[] __devinitdata = {
34646 +static const struct ide_port_info siimage_chipsets[] __devinitconst = {
34647 /* 0: SiI680 */ DECLARE_SII_DEV(&sil_pata_port_ops),
34648 /* 1: SiI3112 */ DECLARE_SII_DEV(&sil_sata_port_ops)
34649 };
34650 diff --git a/drivers/ide/sis5513.c b/drivers/ide/sis5513.c
34651 index 3b88eba..ca8699d 100644
34652 --- a/drivers/ide/sis5513.c
34653 +++ b/drivers/ide/sis5513.c
34654 @@ -561,7 +561,7 @@ static const struct ide_port_ops sis_ata133_port_ops = {
34655 .cable_detect = sis_cable_detect,
34656 };
34657
34658 -static const struct ide_port_info sis5513_chipset __devinitdata = {
34659 +static const struct ide_port_info sis5513_chipset __devinitconst = {
34660 .name = DRV_NAME,
34661 .init_chipset = init_chipset_sis5513,
34662 .enablebits = { {0x4a, 0x02, 0x02}, {0x4a, 0x04, 0x04} },
34663 diff --git a/drivers/ide/sl82c105.c b/drivers/ide/sl82c105.c
34664 index d698da4..fca42a4 100644
34665 --- a/drivers/ide/sl82c105.c
34666 +++ b/drivers/ide/sl82c105.c
34667 @@ -319,7 +319,7 @@ static const struct ide_dma_ops sl82c105_dma_ops = {
34668 .dma_sff_read_status = ide_dma_sff_read_status,
34669 };
34670
34671 -static const struct ide_port_info sl82c105_chipset __devinitdata = {
34672 +static const struct ide_port_info sl82c105_chipset __devinitconst = {
34673 .name = DRV_NAME,
34674 .init_chipset = init_chipset_sl82c105,
34675 .enablebits = {{0x40,0x01,0x01}, {0x40,0x10,0x10}},
34676 diff --git a/drivers/ide/slc90e66.c b/drivers/ide/slc90e66.c
34677 index 1ccfb40..83d5779 100644
34678 --- a/drivers/ide/slc90e66.c
34679 +++ b/drivers/ide/slc90e66.c
34680 @@ -131,7 +131,7 @@ static const struct ide_port_ops slc90e66_port_ops = {
34681 .cable_detect = slc90e66_cable_detect,
34682 };
34683
34684 -static const struct ide_port_info slc90e66_chipset __devinitdata = {
34685 +static const struct ide_port_info slc90e66_chipset __devinitconst = {
34686 .name = DRV_NAME,
34687 .enablebits = { {0x41, 0x80, 0x80}, {0x43, 0x80, 0x80} },
34688 .port_ops = &slc90e66_port_ops,
34689 diff --git a/drivers/ide/tc86c001.c b/drivers/ide/tc86c001.c
34690 index 05a93d6..5f9e325 100644
34691 --- a/drivers/ide/tc86c001.c
34692 +++ b/drivers/ide/tc86c001.c
34693 @@ -190,7 +190,7 @@ static const struct ide_dma_ops tc86c001_dma_ops = {
34694 .dma_sff_read_status = ide_dma_sff_read_status,
34695 };
34696
34697 -static const struct ide_port_info tc86c001_chipset __devinitdata = {
34698 +static const struct ide_port_info tc86c001_chipset __devinitconst = {
34699 .name = DRV_NAME,
34700 .init_hwif = init_hwif_tc86c001,
34701 .port_ops = &tc86c001_port_ops,
34702 diff --git a/drivers/ide/triflex.c b/drivers/ide/triflex.c
34703 index 8773c3b..7907d6c 100644
34704 --- a/drivers/ide/triflex.c
34705 +++ b/drivers/ide/triflex.c
34706 @@ -92,7 +92,7 @@ static const struct ide_port_ops triflex_port_ops = {
34707 .set_dma_mode = triflex_set_mode,
34708 };
34709
34710 -static const struct ide_port_info triflex_device __devinitdata = {
34711 +static const struct ide_port_info triflex_device __devinitconst = {
34712 .name = DRV_NAME,
34713 .enablebits = {{0x80, 0x01, 0x01}, {0x80, 0x02, 0x02}},
34714 .port_ops = &triflex_port_ops,
34715 diff --git a/drivers/ide/trm290.c b/drivers/ide/trm290.c
34716 index 4b42ca0..e494a98 100644
34717 --- a/drivers/ide/trm290.c
34718 +++ b/drivers/ide/trm290.c
34719 @@ -324,7 +324,7 @@ static struct ide_dma_ops trm290_dma_ops = {
34720 .dma_check = trm290_dma_check,
34721 };
34722
34723 -static const struct ide_port_info trm290_chipset __devinitdata = {
34724 +static const struct ide_port_info trm290_chipset __devinitconst = {
34725 .name = DRV_NAME,
34726 .init_hwif = init_hwif_trm290,
34727 .tp_ops = &trm290_tp_ops,
34728 diff --git a/drivers/ide/via82cxxx.c b/drivers/ide/via82cxxx.c
34729 index 028de26..520d5d5 100644
34730 --- a/drivers/ide/via82cxxx.c
34731 +++ b/drivers/ide/via82cxxx.c
34732 @@ -374,7 +374,7 @@ static const struct ide_port_ops via_port_ops = {
34733 .cable_detect = via82cxxx_cable_detect,
34734 };
34735
34736 -static const struct ide_port_info via82cxxx_chipset __devinitdata = {
34737 +static const struct ide_port_info via82cxxx_chipset __devinitconst = {
34738 .name = DRV_NAME,
34739 .init_chipset = init_chipset_via82cxxx,
34740 .enablebits = { { 0x40, 0x02, 0x02 }, { 0x40, 0x01, 0x01 } },
34741 diff --git a/drivers/ieee1394/dv1394.c b/drivers/ieee1394/dv1394.c
34742 index 2cd00b5..14de699 100644
34743 --- a/drivers/ieee1394/dv1394.c
34744 +++ b/drivers/ieee1394/dv1394.c
34745 @@ -739,7 +739,7 @@ static void frame_prepare(struct video_card *video, unsigned int this_frame)
34746 based upon DIF section and sequence
34747 */
34748
34749 -static void inline
34750 +static inline void
34751 frame_put_packet (struct frame *f, struct packet *p)
34752 {
34753 int section_type = p->data[0] >> 5; /* section type is in bits 5 - 7 */
34754 diff --git a/drivers/ieee1394/hosts.c b/drivers/ieee1394/hosts.c
34755 index e947d8f..6a966b9 100644
34756 --- a/drivers/ieee1394/hosts.c
34757 +++ b/drivers/ieee1394/hosts.c
34758 @@ -78,6 +78,7 @@ static int dummy_isoctl(struct hpsb_iso *iso, enum isoctl_cmd command,
34759 }
34760
34761 static struct hpsb_host_driver dummy_driver = {
34762 + .name = "dummy",
34763 .transmit_packet = dummy_transmit_packet,
34764 .devctl = dummy_devctl,
34765 .isoctl = dummy_isoctl
34766 diff --git a/drivers/ieee1394/init_ohci1394_dma.c b/drivers/ieee1394/init_ohci1394_dma.c
34767 index ddaab6e..8d37435 100644
34768 --- a/drivers/ieee1394/init_ohci1394_dma.c
34769 +++ b/drivers/ieee1394/init_ohci1394_dma.c
34770 @@ -257,7 +257,7 @@ void __init init_ohci1394_dma_on_all_controllers(void)
34771 for (func = 0; func < 8; func++) {
34772 u32 class = read_pci_config(num,slot,func,
34773 PCI_CLASS_REVISION);
34774 - if ((class == 0xffffffff))
34775 + if (class == 0xffffffff)
34776 continue; /* No device at this func */
34777
34778 if (class>>8 != PCI_CLASS_SERIAL_FIREWIRE_OHCI)
34779 diff --git a/drivers/ieee1394/ohci1394.c b/drivers/ieee1394/ohci1394.c
34780 index 65c1429..5d8c11f 100644
34781 --- a/drivers/ieee1394/ohci1394.c
34782 +++ b/drivers/ieee1394/ohci1394.c
34783 @@ -147,9 +147,9 @@ printk(level "%s: " fmt "\n" , OHCI1394_DRIVER_NAME , ## args)
34784 printk(level "%s: fw-host%d: " fmt "\n" , OHCI1394_DRIVER_NAME, ohci->host->id , ## args)
34785
34786 /* Module Parameters */
34787 -static int phys_dma = 1;
34788 +static int phys_dma;
34789 module_param(phys_dma, int, 0444);
34790 -MODULE_PARM_DESC(phys_dma, "Enable physical DMA (default = 1).");
34791 +MODULE_PARM_DESC(phys_dma, "Enable physical DMA (default = 0).");
34792
34793 static void dma_trm_tasklet(unsigned long data);
34794 static void dma_trm_reset(struct dma_trm_ctx *d);
34795 diff --git a/drivers/ieee1394/sbp2.c b/drivers/ieee1394/sbp2.c
34796 index f199896..78c9fc8 100644
34797 --- a/drivers/ieee1394/sbp2.c
34798 +++ b/drivers/ieee1394/sbp2.c
34799 @@ -2111,7 +2111,7 @@ MODULE_DESCRIPTION("IEEE-1394 SBP-2 protocol driver");
34800 MODULE_SUPPORTED_DEVICE(SBP2_DEVICE_NAME);
34801 MODULE_LICENSE("GPL");
34802
34803 -static int sbp2_module_init(void)
34804 +static int __init sbp2_module_init(void)
34805 {
34806 int ret;
34807
34808 diff --git a/drivers/infiniband/core/cm.c b/drivers/infiniband/core/cm.c
34809 index a5dea6b..0cefe8f 100644
34810 --- a/drivers/infiniband/core/cm.c
34811 +++ b/drivers/infiniband/core/cm.c
34812 @@ -112,7 +112,7 @@ static char const counter_group_names[CM_COUNTER_GROUPS]
34813
34814 struct cm_counter_group {
34815 struct kobject obj;
34816 - atomic_long_t counter[CM_ATTR_COUNT];
34817 + atomic_long_unchecked_t counter[CM_ATTR_COUNT];
34818 };
34819
34820 struct cm_counter_attribute {
34821 @@ -1386,7 +1386,7 @@ static void cm_dup_req_handler(struct cm_work *work,
34822 struct ib_mad_send_buf *msg = NULL;
34823 int ret;
34824
34825 - atomic_long_inc(&work->port->counter_group[CM_RECV_DUPLICATES].
34826 + atomic_long_inc_unchecked(&work->port->counter_group[CM_RECV_DUPLICATES].
34827 counter[CM_REQ_COUNTER]);
34828
34829 /* Quick state check to discard duplicate REQs. */
34830 @@ -1764,7 +1764,7 @@ static void cm_dup_rep_handler(struct cm_work *work)
34831 if (!cm_id_priv)
34832 return;
34833
34834 - atomic_long_inc(&work->port->counter_group[CM_RECV_DUPLICATES].
34835 + atomic_long_inc_unchecked(&work->port->counter_group[CM_RECV_DUPLICATES].
34836 counter[CM_REP_COUNTER]);
34837 ret = cm_alloc_response_msg(work->port, work->mad_recv_wc, &msg);
34838 if (ret)
34839 @@ -1931,7 +1931,7 @@ static int cm_rtu_handler(struct cm_work *work)
34840 if (cm_id_priv->id.state != IB_CM_REP_SENT &&
34841 cm_id_priv->id.state != IB_CM_MRA_REP_RCVD) {
34842 spin_unlock_irq(&cm_id_priv->lock);
34843 - atomic_long_inc(&work->port->counter_group[CM_RECV_DUPLICATES].
34844 + atomic_long_inc_unchecked(&work->port->counter_group[CM_RECV_DUPLICATES].
34845 counter[CM_RTU_COUNTER]);
34846 goto out;
34847 }
34848 @@ -2110,7 +2110,7 @@ static int cm_dreq_handler(struct cm_work *work)
34849 cm_id_priv = cm_acquire_id(dreq_msg->remote_comm_id,
34850 dreq_msg->local_comm_id);
34851 if (!cm_id_priv) {
34852 - atomic_long_inc(&work->port->counter_group[CM_RECV_DUPLICATES].
34853 + atomic_long_inc_unchecked(&work->port->counter_group[CM_RECV_DUPLICATES].
34854 counter[CM_DREQ_COUNTER]);
34855 cm_issue_drep(work->port, work->mad_recv_wc);
34856 return -EINVAL;
34857 @@ -2131,7 +2131,7 @@ static int cm_dreq_handler(struct cm_work *work)
34858 case IB_CM_MRA_REP_RCVD:
34859 break;
34860 case IB_CM_TIMEWAIT:
34861 - atomic_long_inc(&work->port->counter_group[CM_RECV_DUPLICATES].
34862 + atomic_long_inc_unchecked(&work->port->counter_group[CM_RECV_DUPLICATES].
34863 counter[CM_DREQ_COUNTER]);
34864 if (cm_alloc_response_msg(work->port, work->mad_recv_wc, &msg))
34865 goto unlock;
34866 @@ -2145,7 +2145,7 @@ static int cm_dreq_handler(struct cm_work *work)
34867 cm_free_msg(msg);
34868 goto deref;
34869 case IB_CM_DREQ_RCVD:
34870 - atomic_long_inc(&work->port->counter_group[CM_RECV_DUPLICATES].
34871 + atomic_long_inc_unchecked(&work->port->counter_group[CM_RECV_DUPLICATES].
34872 counter[CM_DREQ_COUNTER]);
34873 goto unlock;
34874 default:
34875 @@ -2501,7 +2501,7 @@ static int cm_mra_handler(struct cm_work *work)
34876 ib_modify_mad(cm_id_priv->av.port->mad_agent,
34877 cm_id_priv->msg, timeout)) {
34878 if (cm_id_priv->id.lap_state == IB_CM_MRA_LAP_RCVD)
34879 - atomic_long_inc(&work->port->
34880 + atomic_long_inc_unchecked(&work->port->
34881 counter_group[CM_RECV_DUPLICATES].
34882 counter[CM_MRA_COUNTER]);
34883 goto out;
34884 @@ -2510,7 +2510,7 @@ static int cm_mra_handler(struct cm_work *work)
34885 break;
34886 case IB_CM_MRA_REQ_RCVD:
34887 case IB_CM_MRA_REP_RCVD:
34888 - atomic_long_inc(&work->port->counter_group[CM_RECV_DUPLICATES].
34889 + atomic_long_inc_unchecked(&work->port->counter_group[CM_RECV_DUPLICATES].
34890 counter[CM_MRA_COUNTER]);
34891 /* fall through */
34892 default:
34893 @@ -2672,7 +2672,7 @@ static int cm_lap_handler(struct cm_work *work)
34894 case IB_CM_LAP_IDLE:
34895 break;
34896 case IB_CM_MRA_LAP_SENT:
34897 - atomic_long_inc(&work->port->counter_group[CM_RECV_DUPLICATES].
34898 + atomic_long_inc_unchecked(&work->port->counter_group[CM_RECV_DUPLICATES].
34899 counter[CM_LAP_COUNTER]);
34900 if (cm_alloc_response_msg(work->port, work->mad_recv_wc, &msg))
34901 goto unlock;
34902 @@ -2688,7 +2688,7 @@ static int cm_lap_handler(struct cm_work *work)
34903 cm_free_msg(msg);
34904 goto deref;
34905 case IB_CM_LAP_RCVD:
34906 - atomic_long_inc(&work->port->counter_group[CM_RECV_DUPLICATES].
34907 + atomic_long_inc_unchecked(&work->port->counter_group[CM_RECV_DUPLICATES].
34908 counter[CM_LAP_COUNTER]);
34909 goto unlock;
34910 default:
34911 @@ -2972,7 +2972,7 @@ static int cm_sidr_req_handler(struct cm_work *work)
34912 cur_cm_id_priv = cm_insert_remote_sidr(cm_id_priv);
34913 if (cur_cm_id_priv) {
34914 spin_unlock_irq(&cm.lock);
34915 - atomic_long_inc(&work->port->counter_group[CM_RECV_DUPLICATES].
34916 + atomic_long_inc_unchecked(&work->port->counter_group[CM_RECV_DUPLICATES].
34917 counter[CM_SIDR_REQ_COUNTER]);
34918 goto out; /* Duplicate message. */
34919 }
34920 @@ -3184,10 +3184,10 @@ static void cm_send_handler(struct ib_mad_agent *mad_agent,
34921 if (!msg->context[0] && (attr_index != CM_REJ_COUNTER))
34922 msg->retries = 1;
34923
34924 - atomic_long_add(1 + msg->retries,
34925 + atomic_long_add_unchecked(1 + msg->retries,
34926 &port->counter_group[CM_XMIT].counter[attr_index]);
34927 if (msg->retries)
34928 - atomic_long_add(msg->retries,
34929 + atomic_long_add_unchecked(msg->retries,
34930 &port->counter_group[CM_XMIT_RETRIES].
34931 counter[attr_index]);
34932
34933 @@ -3397,7 +3397,7 @@ static void cm_recv_handler(struct ib_mad_agent *mad_agent,
34934 }
34935
34936 attr_id = be16_to_cpu(mad_recv_wc->recv_buf.mad->mad_hdr.attr_id);
34937 - atomic_long_inc(&port->counter_group[CM_RECV].
34938 + atomic_long_inc_unchecked(&port->counter_group[CM_RECV].
34939 counter[attr_id - CM_ATTR_ID_OFFSET]);
34940
34941 work = kmalloc(sizeof *work + sizeof(struct ib_sa_path_rec) * paths,
34942 @@ -3595,10 +3595,10 @@ static ssize_t cm_show_counter(struct kobject *obj, struct attribute *attr,
34943 cm_attr = container_of(attr, struct cm_counter_attribute, attr);
34944
34945 return sprintf(buf, "%ld\n",
34946 - atomic_long_read(&group->counter[cm_attr->index]));
34947 + atomic_long_read_unchecked(&group->counter[cm_attr->index]));
34948 }
34949
34950 -static struct sysfs_ops cm_counter_ops = {
34951 +static const struct sysfs_ops cm_counter_ops = {
34952 .show = cm_show_counter
34953 };
34954
34955 diff --git a/drivers/infiniband/core/cma.c b/drivers/infiniband/core/cma.c
34956 index 8fd3a6f..61d8075 100644
34957 --- a/drivers/infiniband/core/cma.c
34958 +++ b/drivers/infiniband/core/cma.c
34959 @@ -2267,6 +2267,9 @@ static int cma_resolve_ib_udp(struct rdma_id_private *id_priv,
34960
34961 req.private_data_len = sizeof(struct cma_hdr) +
34962 conn_param->private_data_len;
34963 + if (req.private_data_len < conn_param->private_data_len)
34964 + return -EINVAL;
34965 +
34966 req.private_data = kzalloc(req.private_data_len, GFP_ATOMIC);
34967 if (!req.private_data)
34968 return -ENOMEM;
34969 @@ -2314,6 +2317,9 @@ static int cma_connect_ib(struct rdma_id_private *id_priv,
34970 memset(&req, 0, sizeof req);
34971 offset = cma_user_data_offset(id_priv->id.ps);
34972 req.private_data_len = offset + conn_param->private_data_len;
34973 + if (req.private_data_len < conn_param->private_data_len)
34974 + return -EINVAL;
34975 +
34976 private_data = kzalloc(req.private_data_len, GFP_ATOMIC);
34977 if (!private_data)
34978 return -ENOMEM;
34979 diff --git a/drivers/infiniband/core/fmr_pool.c b/drivers/infiniband/core/fmr_pool.c
34980 index 4507043..14ad522 100644
34981 --- a/drivers/infiniband/core/fmr_pool.c
34982 +++ b/drivers/infiniband/core/fmr_pool.c
34983 @@ -97,8 +97,8 @@ struct ib_fmr_pool {
34984
34985 struct task_struct *thread;
34986
34987 - atomic_t req_ser;
34988 - atomic_t flush_ser;
34989 + atomic_unchecked_t req_ser;
34990 + atomic_unchecked_t flush_ser;
34991
34992 wait_queue_head_t force_wait;
34993 };
34994 @@ -179,10 +179,10 @@ static int ib_fmr_cleanup_thread(void *pool_ptr)
34995 struct ib_fmr_pool *pool = pool_ptr;
34996
34997 do {
34998 - if (atomic_read(&pool->flush_ser) - atomic_read(&pool->req_ser) < 0) {
34999 + if (atomic_read_unchecked(&pool->flush_ser) - atomic_read_unchecked(&pool->req_ser) < 0) {
35000 ib_fmr_batch_release(pool);
35001
35002 - atomic_inc(&pool->flush_ser);
35003 + atomic_inc_unchecked(&pool->flush_ser);
35004 wake_up_interruptible(&pool->force_wait);
35005
35006 if (pool->flush_function)
35007 @@ -190,7 +190,7 @@ static int ib_fmr_cleanup_thread(void *pool_ptr)
35008 }
35009
35010 set_current_state(TASK_INTERRUPTIBLE);
35011 - if (atomic_read(&pool->flush_ser) - atomic_read(&pool->req_ser) >= 0 &&
35012 + if (atomic_read_unchecked(&pool->flush_ser) - atomic_read_unchecked(&pool->req_ser) >= 0 &&
35013 !kthread_should_stop())
35014 schedule();
35015 __set_current_state(TASK_RUNNING);
35016 @@ -282,8 +282,8 @@ struct ib_fmr_pool *ib_create_fmr_pool(struct ib_pd *pd,
35017 pool->dirty_watermark = params->dirty_watermark;
35018 pool->dirty_len = 0;
35019 spin_lock_init(&pool->pool_lock);
35020 - atomic_set(&pool->req_ser, 0);
35021 - atomic_set(&pool->flush_ser, 0);
35022 + atomic_set_unchecked(&pool->req_ser, 0);
35023 + atomic_set_unchecked(&pool->flush_ser, 0);
35024 init_waitqueue_head(&pool->force_wait);
35025
35026 pool->thread = kthread_run(ib_fmr_cleanup_thread,
35027 @@ -411,11 +411,11 @@ int ib_flush_fmr_pool(struct ib_fmr_pool *pool)
35028 }
35029 spin_unlock_irq(&pool->pool_lock);
35030
35031 - serial = atomic_inc_return(&pool->req_ser);
35032 + serial = atomic_inc_return_unchecked(&pool->req_ser);
35033 wake_up_process(pool->thread);
35034
35035 if (wait_event_interruptible(pool->force_wait,
35036 - atomic_read(&pool->flush_ser) - serial >= 0))
35037 + atomic_read_unchecked(&pool->flush_ser) - serial >= 0))
35038 return -EINTR;
35039
35040 return 0;
35041 @@ -525,7 +525,7 @@ int ib_fmr_pool_unmap(struct ib_pool_fmr *fmr)
35042 } else {
35043 list_add_tail(&fmr->list, &pool->dirty_list);
35044 if (++pool->dirty_len >= pool->dirty_watermark) {
35045 - atomic_inc(&pool->req_ser);
35046 + atomic_inc_unchecked(&pool->req_ser);
35047 wake_up_process(pool->thread);
35048 }
35049 }
35050 diff --git a/drivers/infiniband/core/sysfs.c b/drivers/infiniband/core/sysfs.c
35051 index 158a214..1558bb7 100644
35052 --- a/drivers/infiniband/core/sysfs.c
35053 +++ b/drivers/infiniband/core/sysfs.c
35054 @@ -79,7 +79,7 @@ static ssize_t port_attr_show(struct kobject *kobj,
35055 return port_attr->show(p, port_attr, buf);
35056 }
35057
35058 -static struct sysfs_ops port_sysfs_ops = {
35059 +static const struct sysfs_ops port_sysfs_ops = {
35060 .show = port_attr_show
35061 };
35062
35063 diff --git a/drivers/infiniband/core/uverbs_marshall.c b/drivers/infiniband/core/uverbs_marshall.c
35064 index 5440da0..1194ecb 100644
35065 --- a/drivers/infiniband/core/uverbs_marshall.c
35066 +++ b/drivers/infiniband/core/uverbs_marshall.c
35067 @@ -40,18 +40,21 @@ void ib_copy_ah_attr_to_user(struct ib_uverbs_ah_attr *dst,
35068 dst->grh.sgid_index = src->grh.sgid_index;
35069 dst->grh.hop_limit = src->grh.hop_limit;
35070 dst->grh.traffic_class = src->grh.traffic_class;
35071 + memset(&dst->grh.reserved, 0, sizeof(dst->grh.reserved));
35072 dst->dlid = src->dlid;
35073 dst->sl = src->sl;
35074 dst->src_path_bits = src->src_path_bits;
35075 dst->static_rate = src->static_rate;
35076 dst->is_global = src->ah_flags & IB_AH_GRH ? 1 : 0;
35077 dst->port_num = src->port_num;
35078 + dst->reserved = 0;
35079 }
35080 EXPORT_SYMBOL(ib_copy_ah_attr_to_user);
35081
35082 void ib_copy_qp_attr_to_user(struct ib_uverbs_qp_attr *dst,
35083 struct ib_qp_attr *src)
35084 {
35085 + dst->qp_state = src->qp_state;
35086 dst->cur_qp_state = src->cur_qp_state;
35087 dst->path_mtu = src->path_mtu;
35088 dst->path_mig_state = src->path_mig_state;
35089 @@ -83,6 +86,7 @@ void ib_copy_qp_attr_to_user(struct ib_uverbs_qp_attr *dst,
35090 dst->rnr_retry = src->rnr_retry;
35091 dst->alt_port_num = src->alt_port_num;
35092 dst->alt_timeout = src->alt_timeout;
35093 + memset(dst->reserved, 0, sizeof(dst->reserved));
35094 }
35095 EXPORT_SYMBOL(ib_copy_qp_attr_to_user);
35096
35097 diff --git a/drivers/infiniband/hw/ipath/ipath_fs.c b/drivers/infiniband/hw/ipath/ipath_fs.c
35098 index 100da85..62e6b88 100644
35099 --- a/drivers/infiniband/hw/ipath/ipath_fs.c
35100 +++ b/drivers/infiniband/hw/ipath/ipath_fs.c
35101 @@ -110,6 +110,8 @@ static ssize_t atomic_counters_read(struct file *file, char __user *buf,
35102 struct infinipath_counters counters;
35103 struct ipath_devdata *dd;
35104
35105 + pax_track_stack();
35106 +
35107 dd = file->f_path.dentry->d_inode->i_private;
35108 dd->ipath_f_read_counters(dd, &counters);
35109
35110 diff --git a/drivers/infiniband/hw/nes/nes.c b/drivers/infiniband/hw/nes/nes.c
35111 index cbde0cf..afaf55c 100644
35112 --- a/drivers/infiniband/hw/nes/nes.c
35113 +++ b/drivers/infiniband/hw/nes/nes.c
35114 @@ -102,7 +102,7 @@ MODULE_PARM_DESC(limit_maxrdreqsz, "Limit max read request size to 256 Bytes");
35115 LIST_HEAD(nes_adapter_list);
35116 static LIST_HEAD(nes_dev_list);
35117
35118 -atomic_t qps_destroyed;
35119 +atomic_unchecked_t qps_destroyed;
35120
35121 static unsigned int ee_flsh_adapter;
35122 static unsigned int sysfs_nonidx_addr;
35123 @@ -259,7 +259,7 @@ static void nes_cqp_rem_ref_callback(struct nes_device *nesdev, struct nes_cqp_r
35124 struct nes_adapter *nesadapter = nesdev->nesadapter;
35125 u32 qp_id;
35126
35127 - atomic_inc(&qps_destroyed);
35128 + atomic_inc_unchecked(&qps_destroyed);
35129
35130 /* Free the control structures */
35131
35132 diff --git a/drivers/infiniband/hw/nes/nes.h b/drivers/infiniband/hw/nes/nes.h
35133 index bcc6abc..9c76b2f 100644
35134 --- a/drivers/infiniband/hw/nes/nes.h
35135 +++ b/drivers/infiniband/hw/nes/nes.h
35136 @@ -174,17 +174,17 @@ extern unsigned int nes_debug_level;
35137 extern unsigned int wqm_quanta;
35138 extern struct list_head nes_adapter_list;
35139
35140 -extern atomic_t cm_connects;
35141 -extern atomic_t cm_accepts;
35142 -extern atomic_t cm_disconnects;
35143 -extern atomic_t cm_closes;
35144 -extern atomic_t cm_connecteds;
35145 -extern atomic_t cm_connect_reqs;
35146 -extern atomic_t cm_rejects;
35147 -extern atomic_t mod_qp_timouts;
35148 -extern atomic_t qps_created;
35149 -extern atomic_t qps_destroyed;
35150 -extern atomic_t sw_qps_destroyed;
35151 +extern atomic_unchecked_t cm_connects;
35152 +extern atomic_unchecked_t cm_accepts;
35153 +extern atomic_unchecked_t cm_disconnects;
35154 +extern atomic_unchecked_t cm_closes;
35155 +extern atomic_unchecked_t cm_connecteds;
35156 +extern atomic_unchecked_t cm_connect_reqs;
35157 +extern atomic_unchecked_t cm_rejects;
35158 +extern atomic_unchecked_t mod_qp_timouts;
35159 +extern atomic_unchecked_t qps_created;
35160 +extern atomic_unchecked_t qps_destroyed;
35161 +extern atomic_unchecked_t sw_qps_destroyed;
35162 extern u32 mh_detected;
35163 extern u32 mh_pauses_sent;
35164 extern u32 cm_packets_sent;
35165 @@ -196,11 +196,11 @@ extern u32 cm_packets_retrans;
35166 extern u32 cm_listens_created;
35167 extern u32 cm_listens_destroyed;
35168 extern u32 cm_backlog_drops;
35169 -extern atomic_t cm_loopbacks;
35170 -extern atomic_t cm_nodes_created;
35171 -extern atomic_t cm_nodes_destroyed;
35172 -extern atomic_t cm_accel_dropped_pkts;
35173 -extern atomic_t cm_resets_recvd;
35174 +extern atomic_unchecked_t cm_loopbacks;
35175 +extern atomic_unchecked_t cm_nodes_created;
35176 +extern atomic_unchecked_t cm_nodes_destroyed;
35177 +extern atomic_unchecked_t cm_accel_dropped_pkts;
35178 +extern atomic_unchecked_t cm_resets_recvd;
35179
35180 extern u32 int_mod_timer_init;
35181 extern u32 int_mod_cq_depth_256;
35182 diff --git a/drivers/infiniband/hw/nes/nes_cm.c b/drivers/infiniband/hw/nes/nes_cm.c
35183 index 73473db..5ed06e8 100644
35184 --- a/drivers/infiniband/hw/nes/nes_cm.c
35185 +++ b/drivers/infiniband/hw/nes/nes_cm.c
35186 @@ -69,11 +69,11 @@ u32 cm_packets_received;
35187 u32 cm_listens_created;
35188 u32 cm_listens_destroyed;
35189 u32 cm_backlog_drops;
35190 -atomic_t cm_loopbacks;
35191 -atomic_t cm_nodes_created;
35192 -atomic_t cm_nodes_destroyed;
35193 -atomic_t cm_accel_dropped_pkts;
35194 -atomic_t cm_resets_recvd;
35195 +atomic_unchecked_t cm_loopbacks;
35196 +atomic_unchecked_t cm_nodes_created;
35197 +atomic_unchecked_t cm_nodes_destroyed;
35198 +atomic_unchecked_t cm_accel_dropped_pkts;
35199 +atomic_unchecked_t cm_resets_recvd;
35200
35201 static inline int mini_cm_accelerated(struct nes_cm_core *,
35202 struct nes_cm_node *);
35203 @@ -149,13 +149,13 @@ static struct nes_cm_ops nes_cm_api = {
35204
35205 static struct nes_cm_core *g_cm_core;
35206
35207 -atomic_t cm_connects;
35208 -atomic_t cm_accepts;
35209 -atomic_t cm_disconnects;
35210 -atomic_t cm_closes;
35211 -atomic_t cm_connecteds;
35212 -atomic_t cm_connect_reqs;
35213 -atomic_t cm_rejects;
35214 +atomic_unchecked_t cm_connects;
35215 +atomic_unchecked_t cm_accepts;
35216 +atomic_unchecked_t cm_disconnects;
35217 +atomic_unchecked_t cm_closes;
35218 +atomic_unchecked_t cm_connecteds;
35219 +atomic_unchecked_t cm_connect_reqs;
35220 +atomic_unchecked_t cm_rejects;
35221
35222
35223 /**
35224 @@ -1195,7 +1195,7 @@ static struct nes_cm_node *make_cm_node(struct nes_cm_core *cm_core,
35225 cm_node->rem_mac);
35226
35227 add_hte_node(cm_core, cm_node);
35228 - atomic_inc(&cm_nodes_created);
35229 + atomic_inc_unchecked(&cm_nodes_created);
35230
35231 return cm_node;
35232 }
35233 @@ -1253,7 +1253,7 @@ static int rem_ref_cm_node(struct nes_cm_core *cm_core,
35234 }
35235
35236 atomic_dec(&cm_core->node_cnt);
35237 - atomic_inc(&cm_nodes_destroyed);
35238 + atomic_inc_unchecked(&cm_nodes_destroyed);
35239 nesqp = cm_node->nesqp;
35240 if (nesqp) {
35241 nesqp->cm_node = NULL;
35242 @@ -1320,7 +1320,7 @@ static int process_options(struct nes_cm_node *cm_node, u8 *optionsloc,
35243
35244 static void drop_packet(struct sk_buff *skb)
35245 {
35246 - atomic_inc(&cm_accel_dropped_pkts);
35247 + atomic_inc_unchecked(&cm_accel_dropped_pkts);
35248 dev_kfree_skb_any(skb);
35249 }
35250
35251 @@ -1377,7 +1377,7 @@ static void handle_rst_pkt(struct nes_cm_node *cm_node, struct sk_buff *skb,
35252
35253 int reset = 0; /* whether to send reset in case of err.. */
35254 int passive_state;
35255 - atomic_inc(&cm_resets_recvd);
35256 + atomic_inc_unchecked(&cm_resets_recvd);
35257 nes_debug(NES_DBG_CM, "Received Reset, cm_node = %p, state = %u."
35258 " refcnt=%d\n", cm_node, cm_node->state,
35259 atomic_read(&cm_node->ref_count));
35260 @@ -2000,7 +2000,7 @@ static struct nes_cm_node *mini_cm_connect(struct nes_cm_core *cm_core,
35261 rem_ref_cm_node(cm_node->cm_core, cm_node);
35262 return NULL;
35263 }
35264 - atomic_inc(&cm_loopbacks);
35265 + atomic_inc_unchecked(&cm_loopbacks);
35266 loopbackremotenode->loopbackpartner = cm_node;
35267 loopbackremotenode->tcp_cntxt.rcv_wscale =
35268 NES_CM_DEFAULT_RCV_WND_SCALE;
35269 @@ -2262,7 +2262,7 @@ static int mini_cm_recv_pkt(struct nes_cm_core *cm_core,
35270 add_ref_cm_node(cm_node);
35271 } else if (cm_node->state == NES_CM_STATE_TSA) {
35272 rem_ref_cm_node(cm_core, cm_node);
35273 - atomic_inc(&cm_accel_dropped_pkts);
35274 + atomic_inc_unchecked(&cm_accel_dropped_pkts);
35275 dev_kfree_skb_any(skb);
35276 break;
35277 }
35278 @@ -2568,7 +2568,7 @@ static int nes_cm_disconn_true(struct nes_qp *nesqp)
35279
35280 if ((cm_id) && (cm_id->event_handler)) {
35281 if (issue_disconn) {
35282 - atomic_inc(&cm_disconnects);
35283 + atomic_inc_unchecked(&cm_disconnects);
35284 cm_event.event = IW_CM_EVENT_DISCONNECT;
35285 cm_event.status = disconn_status;
35286 cm_event.local_addr = cm_id->local_addr;
35287 @@ -2590,7 +2590,7 @@ static int nes_cm_disconn_true(struct nes_qp *nesqp)
35288 }
35289
35290 if (issue_close) {
35291 - atomic_inc(&cm_closes);
35292 + atomic_inc_unchecked(&cm_closes);
35293 nes_disconnect(nesqp, 1);
35294
35295 cm_id->provider_data = nesqp;
35296 @@ -2710,7 +2710,7 @@ int nes_accept(struct iw_cm_id *cm_id, struct iw_cm_conn_param *conn_param)
35297
35298 nes_debug(NES_DBG_CM, "QP%u, cm_node=%p, jiffies = %lu listener = %p\n",
35299 nesqp->hwqp.qp_id, cm_node, jiffies, cm_node->listener);
35300 - atomic_inc(&cm_accepts);
35301 + atomic_inc_unchecked(&cm_accepts);
35302
35303 nes_debug(NES_DBG_CM, "netdev refcnt = %u.\n",
35304 atomic_read(&nesvnic->netdev->refcnt));
35305 @@ -2919,7 +2919,7 @@ int nes_reject(struct iw_cm_id *cm_id, const void *pdata, u8 pdata_len)
35306
35307 struct nes_cm_core *cm_core;
35308
35309 - atomic_inc(&cm_rejects);
35310 + atomic_inc_unchecked(&cm_rejects);
35311 cm_node = (struct nes_cm_node *) cm_id->provider_data;
35312 loopback = cm_node->loopbackpartner;
35313 cm_core = cm_node->cm_core;
35314 @@ -2982,7 +2982,7 @@ int nes_connect(struct iw_cm_id *cm_id, struct iw_cm_conn_param *conn_param)
35315 ntohl(cm_id->local_addr.sin_addr.s_addr),
35316 ntohs(cm_id->local_addr.sin_port));
35317
35318 - atomic_inc(&cm_connects);
35319 + atomic_inc_unchecked(&cm_connects);
35320 nesqp->active_conn = 1;
35321
35322 /* cache the cm_id in the qp */
35323 @@ -3195,7 +3195,7 @@ static void cm_event_connected(struct nes_cm_event *event)
35324 if (nesqp->destroyed) {
35325 return;
35326 }
35327 - atomic_inc(&cm_connecteds);
35328 + atomic_inc_unchecked(&cm_connecteds);
35329 nes_debug(NES_DBG_CM, "QP%u attempting to connect to 0x%08X:0x%04X on"
35330 " local port 0x%04X. jiffies = %lu.\n",
35331 nesqp->hwqp.qp_id,
35332 @@ -3403,7 +3403,7 @@ static void cm_event_reset(struct nes_cm_event *event)
35333
35334 ret = cm_id->event_handler(cm_id, &cm_event);
35335 cm_id->add_ref(cm_id);
35336 - atomic_inc(&cm_closes);
35337 + atomic_inc_unchecked(&cm_closes);
35338 cm_event.event = IW_CM_EVENT_CLOSE;
35339 cm_event.status = IW_CM_EVENT_STATUS_OK;
35340 cm_event.provider_data = cm_id->provider_data;
35341 @@ -3439,7 +3439,7 @@ static void cm_event_mpa_req(struct nes_cm_event *event)
35342 return;
35343 cm_id = cm_node->cm_id;
35344
35345 - atomic_inc(&cm_connect_reqs);
35346 + atomic_inc_unchecked(&cm_connect_reqs);
35347 nes_debug(NES_DBG_CM, "cm_node = %p - cm_id = %p, jiffies = %lu\n",
35348 cm_node, cm_id, jiffies);
35349
35350 @@ -3477,7 +3477,7 @@ static void cm_event_mpa_reject(struct nes_cm_event *event)
35351 return;
35352 cm_id = cm_node->cm_id;
35353
35354 - atomic_inc(&cm_connect_reqs);
35355 + atomic_inc_unchecked(&cm_connect_reqs);
35356 nes_debug(NES_DBG_CM, "cm_node = %p - cm_id = %p, jiffies = %lu\n",
35357 cm_node, cm_id, jiffies);
35358
35359 diff --git a/drivers/infiniband/hw/nes/nes_nic.c b/drivers/infiniband/hw/nes/nes_nic.c
35360 index e593af3..870694a 100644
35361 --- a/drivers/infiniband/hw/nes/nes_nic.c
35362 +++ b/drivers/infiniband/hw/nes/nes_nic.c
35363 @@ -1210,17 +1210,17 @@ static void nes_netdev_get_ethtool_stats(struct net_device *netdev,
35364 target_stat_values[++index] = mh_detected;
35365 target_stat_values[++index] = mh_pauses_sent;
35366 target_stat_values[++index] = nesvnic->endnode_ipv4_tcp_retransmits;
35367 - target_stat_values[++index] = atomic_read(&cm_connects);
35368 - target_stat_values[++index] = atomic_read(&cm_accepts);
35369 - target_stat_values[++index] = atomic_read(&cm_disconnects);
35370 - target_stat_values[++index] = atomic_read(&cm_connecteds);
35371 - target_stat_values[++index] = atomic_read(&cm_connect_reqs);
35372 - target_stat_values[++index] = atomic_read(&cm_rejects);
35373 - target_stat_values[++index] = atomic_read(&mod_qp_timouts);
35374 - target_stat_values[++index] = atomic_read(&qps_created);
35375 - target_stat_values[++index] = atomic_read(&sw_qps_destroyed);
35376 - target_stat_values[++index] = atomic_read(&qps_destroyed);
35377 - target_stat_values[++index] = atomic_read(&cm_closes);
35378 + target_stat_values[++index] = atomic_read_unchecked(&cm_connects);
35379 + target_stat_values[++index] = atomic_read_unchecked(&cm_accepts);
35380 + target_stat_values[++index] = atomic_read_unchecked(&cm_disconnects);
35381 + target_stat_values[++index] = atomic_read_unchecked(&cm_connecteds);
35382 + target_stat_values[++index] = atomic_read_unchecked(&cm_connect_reqs);
35383 + target_stat_values[++index] = atomic_read_unchecked(&cm_rejects);
35384 + target_stat_values[++index] = atomic_read_unchecked(&mod_qp_timouts);
35385 + target_stat_values[++index] = atomic_read_unchecked(&qps_created);
35386 + target_stat_values[++index] = atomic_read_unchecked(&sw_qps_destroyed);
35387 + target_stat_values[++index] = atomic_read_unchecked(&qps_destroyed);
35388 + target_stat_values[++index] = atomic_read_unchecked(&cm_closes);
35389 target_stat_values[++index] = cm_packets_sent;
35390 target_stat_values[++index] = cm_packets_bounced;
35391 target_stat_values[++index] = cm_packets_created;
35392 @@ -1230,11 +1230,11 @@ static void nes_netdev_get_ethtool_stats(struct net_device *netdev,
35393 target_stat_values[++index] = cm_listens_created;
35394 target_stat_values[++index] = cm_listens_destroyed;
35395 target_stat_values[++index] = cm_backlog_drops;
35396 - target_stat_values[++index] = atomic_read(&cm_loopbacks);
35397 - target_stat_values[++index] = atomic_read(&cm_nodes_created);
35398 - target_stat_values[++index] = atomic_read(&cm_nodes_destroyed);
35399 - target_stat_values[++index] = atomic_read(&cm_accel_dropped_pkts);
35400 - target_stat_values[++index] = atomic_read(&cm_resets_recvd);
35401 + target_stat_values[++index] = atomic_read_unchecked(&cm_loopbacks);
35402 + target_stat_values[++index] = atomic_read_unchecked(&cm_nodes_created);
35403 + target_stat_values[++index] = atomic_read_unchecked(&cm_nodes_destroyed);
35404 + target_stat_values[++index] = atomic_read_unchecked(&cm_accel_dropped_pkts);
35405 + target_stat_values[++index] = atomic_read_unchecked(&cm_resets_recvd);
35406 target_stat_values[++index] = int_mod_timer_init;
35407 target_stat_values[++index] = int_mod_cq_depth_1;
35408 target_stat_values[++index] = int_mod_cq_depth_4;
35409 diff --git a/drivers/infiniband/hw/nes/nes_verbs.c b/drivers/infiniband/hw/nes/nes_verbs.c
35410 index a680c42..f914deb 100644
35411 --- a/drivers/infiniband/hw/nes/nes_verbs.c
35412 +++ b/drivers/infiniband/hw/nes/nes_verbs.c
35413 @@ -45,9 +45,9 @@
35414
35415 #include <rdma/ib_umem.h>
35416
35417 -atomic_t mod_qp_timouts;
35418 -atomic_t qps_created;
35419 -atomic_t sw_qps_destroyed;
35420 +atomic_unchecked_t mod_qp_timouts;
35421 +atomic_unchecked_t qps_created;
35422 +atomic_unchecked_t sw_qps_destroyed;
35423
35424 static void nes_unregister_ofa_device(struct nes_ib_device *nesibdev);
35425
35426 @@ -1240,7 +1240,7 @@ static struct ib_qp *nes_create_qp(struct ib_pd *ibpd,
35427 if (init_attr->create_flags)
35428 return ERR_PTR(-EINVAL);
35429
35430 - atomic_inc(&qps_created);
35431 + atomic_inc_unchecked(&qps_created);
35432 switch (init_attr->qp_type) {
35433 case IB_QPT_RC:
35434 if (nes_drv_opt & NES_DRV_OPT_NO_INLINE_DATA) {
35435 @@ -1568,7 +1568,7 @@ static int nes_destroy_qp(struct ib_qp *ibqp)
35436 struct iw_cm_event cm_event;
35437 int ret;
35438
35439 - atomic_inc(&sw_qps_destroyed);
35440 + atomic_inc_unchecked(&sw_qps_destroyed);
35441 nesqp->destroyed = 1;
35442
35443 /* Blow away the connection if it exists. */
35444 diff --git a/drivers/input/gameport/gameport.c b/drivers/input/gameport/gameport.c
35445 index ac11be0..3883c04 100644
35446 --- a/drivers/input/gameport/gameport.c
35447 +++ b/drivers/input/gameport/gameport.c
35448 @@ -515,13 +515,13 @@ EXPORT_SYMBOL(gameport_set_phys);
35449 */
35450 static void gameport_init_port(struct gameport *gameport)
35451 {
35452 - static atomic_t gameport_no = ATOMIC_INIT(0);
35453 + static atomic_unchecked_t gameport_no = ATOMIC_INIT(0);
35454
35455 __module_get(THIS_MODULE);
35456
35457 mutex_init(&gameport->drv_mutex);
35458 device_initialize(&gameport->dev);
35459 - dev_set_name(&gameport->dev, "gameport%lu", (unsigned long)atomic_inc_return(&gameport_no) - 1);
35460 + dev_set_name(&gameport->dev, "gameport%lu", (unsigned long)atomic_inc_return_unchecked(&gameport_no) - 1);
35461 gameport->dev.bus = &gameport_bus;
35462 gameport->dev.release = gameport_release_port;
35463 if (gameport->parent)
35464 diff --git a/drivers/input/input.c b/drivers/input/input.c
35465 index c82ae82..8cfb9cb 100644
35466 --- a/drivers/input/input.c
35467 +++ b/drivers/input/input.c
35468 @@ -1558,7 +1558,7 @@ EXPORT_SYMBOL(input_set_capability);
35469 */
35470 int input_register_device(struct input_dev *dev)
35471 {
35472 - static atomic_t input_no = ATOMIC_INIT(0);
35473 + static atomic_unchecked_t input_no = ATOMIC_INIT(0);
35474 struct input_handler *handler;
35475 const char *path;
35476 int error;
35477 @@ -1585,7 +1585,7 @@ int input_register_device(struct input_dev *dev)
35478 dev->setkeycode = input_default_setkeycode;
35479
35480 dev_set_name(&dev->dev, "input%ld",
35481 - (unsigned long) atomic_inc_return(&input_no) - 1);
35482 + (unsigned long) atomic_inc_return_unchecked(&input_no) - 1);
35483
35484 error = device_add(&dev->dev);
35485 if (error)
35486 diff --git a/drivers/input/joystick/sidewinder.c b/drivers/input/joystick/sidewinder.c
35487 index ca13a6b..b032b0c 100644
35488 --- a/drivers/input/joystick/sidewinder.c
35489 +++ b/drivers/input/joystick/sidewinder.c
35490 @@ -30,6 +30,7 @@
35491 #include <linux/kernel.h>
35492 #include <linux/module.h>
35493 #include <linux/slab.h>
35494 +#include <linux/sched.h>
35495 #include <linux/init.h>
35496 #include <linux/input.h>
35497 #include <linux/gameport.h>
35498 @@ -428,6 +429,8 @@ static int sw_read(struct sw *sw)
35499 unsigned char buf[SW_LENGTH];
35500 int i;
35501
35502 + pax_track_stack();
35503 +
35504 i = sw_read_packet(sw->gameport, buf, sw->length, 0);
35505
35506 if (sw->type == SW_ID_3DP && sw->length == 66 && i != 66) { /* Broken packet, try to fix */
35507 diff --git a/drivers/input/joystick/xpad.c b/drivers/input/joystick/xpad.c
35508 index 79e3edc..01412b9 100644
35509 --- a/drivers/input/joystick/xpad.c
35510 +++ b/drivers/input/joystick/xpad.c
35511 @@ -621,7 +621,7 @@ static void xpad_led_set(struct led_classdev *led_cdev,
35512
35513 static int xpad_led_probe(struct usb_xpad *xpad)
35514 {
35515 - static atomic_t led_seq = ATOMIC_INIT(0);
35516 + static atomic_unchecked_t led_seq = ATOMIC_INIT(0);
35517 long led_no;
35518 struct xpad_led *led;
35519 struct led_classdev *led_cdev;
35520 @@ -634,7 +634,7 @@ static int xpad_led_probe(struct usb_xpad *xpad)
35521 if (!led)
35522 return -ENOMEM;
35523
35524 - led_no = (long)atomic_inc_return(&led_seq) - 1;
35525 + led_no = (long)atomic_inc_return_unchecked(&led_seq) - 1;
35526
35527 snprintf(led->name, sizeof(led->name), "xpad%ld", led_no);
35528 led->xpad = xpad;
35529 diff --git a/drivers/input/serio/serio.c b/drivers/input/serio/serio.c
35530 index 0236f0d..c7327f1 100644
35531 --- a/drivers/input/serio/serio.c
35532 +++ b/drivers/input/serio/serio.c
35533 @@ -527,7 +527,7 @@ static void serio_release_port(struct device *dev)
35534 */
35535 static void serio_init_port(struct serio *serio)
35536 {
35537 - static atomic_t serio_no = ATOMIC_INIT(0);
35538 + static atomic_unchecked_t serio_no = ATOMIC_INIT(0);
35539
35540 __module_get(THIS_MODULE);
35541
35542 @@ -536,7 +536,7 @@ static void serio_init_port(struct serio *serio)
35543 mutex_init(&serio->drv_mutex);
35544 device_initialize(&serio->dev);
35545 dev_set_name(&serio->dev, "serio%ld",
35546 - (long)atomic_inc_return(&serio_no) - 1);
35547 + (long)atomic_inc_return_unchecked(&serio_no) - 1);
35548 serio->dev.bus = &serio_bus;
35549 serio->dev.release = serio_release_port;
35550 if (serio->parent) {
35551 diff --git a/drivers/isdn/gigaset/common.c b/drivers/isdn/gigaset/common.c
35552 index 33dcd8d..2783d25 100644
35553 --- a/drivers/isdn/gigaset/common.c
35554 +++ b/drivers/isdn/gigaset/common.c
35555 @@ -712,7 +712,7 @@ struct cardstate *gigaset_initcs(struct gigaset_driver *drv, int channels,
35556 cs->commands_pending = 0;
35557 cs->cur_at_seq = 0;
35558 cs->gotfwver = -1;
35559 - cs->open_count = 0;
35560 + local_set(&cs->open_count, 0);
35561 cs->dev = NULL;
35562 cs->tty = NULL;
35563 cs->tty_dev = NULL;
35564 diff --git a/drivers/isdn/gigaset/gigaset.h b/drivers/isdn/gigaset/gigaset.h
35565 index a2f6125..6a70677 100644
35566 --- a/drivers/isdn/gigaset/gigaset.h
35567 +++ b/drivers/isdn/gigaset/gigaset.h
35568 @@ -34,6 +34,7 @@
35569 #include <linux/tty_driver.h>
35570 #include <linux/list.h>
35571 #include <asm/atomic.h>
35572 +#include <asm/local.h>
35573
35574 #define GIG_VERSION {0,5,0,0}
35575 #define GIG_COMPAT {0,4,0,0}
35576 @@ -446,7 +447,7 @@ struct cardstate {
35577 spinlock_t cmdlock;
35578 unsigned curlen, cmdbytes;
35579
35580 - unsigned open_count;
35581 + local_t open_count;
35582 struct tty_struct *tty;
35583 struct tasklet_struct if_wake_tasklet;
35584 unsigned control_state;
35585 diff --git a/drivers/isdn/gigaset/interface.c b/drivers/isdn/gigaset/interface.c
35586 index b3065b8..c7e8cc9 100644
35587 --- a/drivers/isdn/gigaset/interface.c
35588 +++ b/drivers/isdn/gigaset/interface.c
35589 @@ -165,9 +165,7 @@ static int if_open(struct tty_struct *tty, struct file *filp)
35590 return -ERESTARTSYS; // FIXME -EINTR?
35591 tty->driver_data = cs;
35592
35593 - ++cs->open_count;
35594 -
35595 - if (cs->open_count == 1) {
35596 + if (local_inc_return(&cs->open_count) == 1) {
35597 spin_lock_irqsave(&cs->lock, flags);
35598 cs->tty = tty;
35599 spin_unlock_irqrestore(&cs->lock, flags);
35600 @@ -195,10 +193,10 @@ static void if_close(struct tty_struct *tty, struct file *filp)
35601
35602 if (!cs->connected)
35603 gig_dbg(DEBUG_IF, "not connected"); /* nothing to do */
35604 - else if (!cs->open_count)
35605 + else if (!local_read(&cs->open_count))
35606 dev_warn(cs->dev, "%s: device not opened\n", __func__);
35607 else {
35608 - if (!--cs->open_count) {
35609 + if (!local_dec_return(&cs->open_count)) {
35610 spin_lock_irqsave(&cs->lock, flags);
35611 cs->tty = NULL;
35612 spin_unlock_irqrestore(&cs->lock, flags);
35613 @@ -233,7 +231,7 @@ static int if_ioctl(struct tty_struct *tty, struct file *file,
35614 if (!cs->connected) {
35615 gig_dbg(DEBUG_IF, "not connected");
35616 retval = -ENODEV;
35617 - } else if (!cs->open_count)
35618 + } else if (!local_read(&cs->open_count))
35619 dev_warn(cs->dev, "%s: device not opened\n", __func__);
35620 else {
35621 retval = 0;
35622 @@ -361,7 +359,7 @@ static int if_write(struct tty_struct *tty, const unsigned char *buf, int count)
35623 if (!cs->connected) {
35624 gig_dbg(DEBUG_IF, "not connected");
35625 retval = -ENODEV;
35626 - } else if (!cs->open_count)
35627 + } else if (!local_read(&cs->open_count))
35628 dev_warn(cs->dev, "%s: device not opened\n", __func__);
35629 else if (cs->mstate != MS_LOCKED) {
35630 dev_warn(cs->dev, "can't write to unlocked device\n");
35631 @@ -395,7 +393,7 @@ static int if_write_room(struct tty_struct *tty)
35632 if (!cs->connected) {
35633 gig_dbg(DEBUG_IF, "not connected");
35634 retval = -ENODEV;
35635 - } else if (!cs->open_count)
35636 + } else if (!local_read(&cs->open_count))
35637 dev_warn(cs->dev, "%s: device not opened\n", __func__);
35638 else if (cs->mstate != MS_LOCKED) {
35639 dev_warn(cs->dev, "can't write to unlocked device\n");
35640 @@ -425,7 +423,7 @@ static int if_chars_in_buffer(struct tty_struct *tty)
35641
35642 if (!cs->connected)
35643 gig_dbg(DEBUG_IF, "not connected");
35644 - else if (!cs->open_count)
35645 + else if (!local_read(&cs->open_count))
35646 dev_warn(cs->dev, "%s: device not opened\n", __func__);
35647 else if (cs->mstate != MS_LOCKED)
35648 dev_warn(cs->dev, "can't write to unlocked device\n");
35649 @@ -453,7 +451,7 @@ static void if_throttle(struct tty_struct *tty)
35650
35651 if (!cs->connected)
35652 gig_dbg(DEBUG_IF, "not connected"); /* nothing to do */
35653 - else if (!cs->open_count)
35654 + else if (!local_read(&cs->open_count))
35655 dev_warn(cs->dev, "%s: device not opened\n", __func__);
35656 else {
35657 //FIXME
35658 @@ -478,7 +476,7 @@ static void if_unthrottle(struct tty_struct *tty)
35659
35660 if (!cs->connected)
35661 gig_dbg(DEBUG_IF, "not connected"); /* nothing to do */
35662 - else if (!cs->open_count)
35663 + else if (!local_read(&cs->open_count))
35664 dev_warn(cs->dev, "%s: device not opened\n", __func__);
35665 else {
35666 //FIXME
35667 @@ -510,7 +508,7 @@ static void if_set_termios(struct tty_struct *tty, struct ktermios *old)
35668 goto out;
35669 }
35670
35671 - if (!cs->open_count) {
35672 + if (!local_read(&cs->open_count)) {
35673 dev_warn(cs->dev, "%s: device not opened\n", __func__);
35674 goto out;
35675 }
35676 diff --git a/drivers/isdn/hardware/avm/b1.c b/drivers/isdn/hardware/avm/b1.c
35677 index a7c0083..62a7cb6 100644
35678 --- a/drivers/isdn/hardware/avm/b1.c
35679 +++ b/drivers/isdn/hardware/avm/b1.c
35680 @@ -173,7 +173,7 @@ int b1_load_t4file(avmcard *card, capiloaddatapart * t4file)
35681 }
35682 if (left) {
35683 if (t4file->user) {
35684 - if (copy_from_user(buf, dp, left))
35685 + if (left > sizeof buf || copy_from_user(buf, dp, left))
35686 return -EFAULT;
35687 } else {
35688 memcpy(buf, dp, left);
35689 @@ -221,7 +221,7 @@ int b1_load_config(avmcard *card, capiloaddatapart * config)
35690 }
35691 if (left) {
35692 if (config->user) {
35693 - if (copy_from_user(buf, dp, left))
35694 + if (left > sizeof buf || copy_from_user(buf, dp, left))
35695 return -EFAULT;
35696 } else {
35697 memcpy(buf, dp, left);
35698 diff --git a/drivers/isdn/hardware/eicon/capidtmf.c b/drivers/isdn/hardware/eicon/capidtmf.c
35699 index f130724..c373c68 100644
35700 --- a/drivers/isdn/hardware/eicon/capidtmf.c
35701 +++ b/drivers/isdn/hardware/eicon/capidtmf.c
35702 @@ -498,6 +498,7 @@ void capidtmf_recv_block (t_capidtmf_state *p_state, byte *buffer, word leng
35703 byte goertzel_result_buffer[CAPIDTMF_RECV_TOTAL_FREQUENCY_COUNT];
35704 short windowed_sample_buffer[CAPIDTMF_RECV_WINDOWED_SAMPLES];
35705
35706 + pax_track_stack();
35707
35708 if (p_state->recv.state & CAPIDTMF_RECV_STATE_DTMF_ACTIVE)
35709 {
35710 diff --git a/drivers/isdn/hardware/eicon/capifunc.c b/drivers/isdn/hardware/eicon/capifunc.c
35711 index 4d425c6..a9be6c4 100644
35712 --- a/drivers/isdn/hardware/eicon/capifunc.c
35713 +++ b/drivers/isdn/hardware/eicon/capifunc.c
35714 @@ -1055,6 +1055,8 @@ static int divacapi_connect_didd(void)
35715 IDI_SYNC_REQ req;
35716 DESCRIPTOR DIDD_Table[MAX_DESCRIPTORS];
35717
35718 + pax_track_stack();
35719 +
35720 DIVA_DIDD_Read(DIDD_Table, sizeof(DIDD_Table));
35721
35722 for (x = 0; x < MAX_DESCRIPTORS; x++) {
35723 diff --git a/drivers/isdn/hardware/eicon/diddfunc.c b/drivers/isdn/hardware/eicon/diddfunc.c
35724 index 3029234..ef0d9e2 100644
35725 --- a/drivers/isdn/hardware/eicon/diddfunc.c
35726 +++ b/drivers/isdn/hardware/eicon/diddfunc.c
35727 @@ -54,6 +54,8 @@ static int DIVA_INIT_FUNCTION connect_didd(void)
35728 IDI_SYNC_REQ req;
35729 DESCRIPTOR DIDD_Table[MAX_DESCRIPTORS];
35730
35731 + pax_track_stack();
35732 +
35733 DIVA_DIDD_Read(DIDD_Table, sizeof(DIDD_Table));
35734
35735 for (x = 0; x < MAX_DESCRIPTORS; x++) {
35736 diff --git a/drivers/isdn/hardware/eicon/divasfunc.c b/drivers/isdn/hardware/eicon/divasfunc.c
35737 index d36a4c0..11e7d1a 100644
35738 --- a/drivers/isdn/hardware/eicon/divasfunc.c
35739 +++ b/drivers/isdn/hardware/eicon/divasfunc.c
35740 @@ -161,6 +161,8 @@ static int DIVA_INIT_FUNCTION connect_didd(void)
35741 IDI_SYNC_REQ req;
35742 DESCRIPTOR DIDD_Table[MAX_DESCRIPTORS];
35743
35744 + pax_track_stack();
35745 +
35746 DIVA_DIDD_Read(DIDD_Table, sizeof(DIDD_Table));
35747
35748 for (x = 0; x < MAX_DESCRIPTORS; x++) {
35749 diff --git a/drivers/isdn/hardware/eicon/divasync.h b/drivers/isdn/hardware/eicon/divasync.h
35750 index 85784a7..a19ca98 100644
35751 --- a/drivers/isdn/hardware/eicon/divasync.h
35752 +++ b/drivers/isdn/hardware/eicon/divasync.h
35753 @@ -146,7 +146,7 @@ typedef struct _diva_didd_add_adapter {
35754 } diva_didd_add_adapter_t;
35755 typedef struct _diva_didd_remove_adapter {
35756 IDI_CALL p_request;
35757 -} diva_didd_remove_adapter_t;
35758 +} __no_const diva_didd_remove_adapter_t;
35759 typedef struct _diva_didd_read_adapter_array {
35760 void * buffer;
35761 dword length;
35762 diff --git a/drivers/isdn/hardware/eicon/idifunc.c b/drivers/isdn/hardware/eicon/idifunc.c
35763 index db87d51..7d09acf 100644
35764 --- a/drivers/isdn/hardware/eicon/idifunc.c
35765 +++ b/drivers/isdn/hardware/eicon/idifunc.c
35766 @@ -188,6 +188,8 @@ static int DIVA_INIT_FUNCTION connect_didd(void)
35767 IDI_SYNC_REQ req;
35768 DESCRIPTOR DIDD_Table[MAX_DESCRIPTORS];
35769
35770 + pax_track_stack();
35771 +
35772 DIVA_DIDD_Read(DIDD_Table, sizeof(DIDD_Table));
35773
35774 for (x = 0; x < MAX_DESCRIPTORS; x++) {
35775 diff --git a/drivers/isdn/hardware/eicon/message.c b/drivers/isdn/hardware/eicon/message.c
35776 index ae89fb8..0fab299 100644
35777 --- a/drivers/isdn/hardware/eicon/message.c
35778 +++ b/drivers/isdn/hardware/eicon/message.c
35779 @@ -4889,6 +4889,8 @@ static void sig_ind(PLCI *plci)
35780 dword d;
35781 word w;
35782
35783 + pax_track_stack();
35784 +
35785 a = plci->adapter;
35786 Id = ((word)plci->Id<<8)|a->Id;
35787 PUT_WORD(&SS_Ind[4],0x0000);
35788 @@ -7484,6 +7486,8 @@ static word add_b1(PLCI *plci, API_PARSE *bp, word b_channel_info,
35789 word j, n, w;
35790 dword d;
35791
35792 + pax_track_stack();
35793 +
35794
35795 for(i=0;i<8;i++) bp_parms[i].length = 0;
35796 for(i=0;i<2;i++) global_config[i].length = 0;
35797 @@ -7958,6 +7962,8 @@ static word add_b23(PLCI *plci, API_PARSE *bp)
35798 const byte llc3[] = {4,3,2,2,6,6,0};
35799 const byte header[] = {0,2,3,3,0,0,0};
35800
35801 + pax_track_stack();
35802 +
35803 for(i=0;i<8;i++) bp_parms[i].length = 0;
35804 for(i=0;i<6;i++) b2_config_parms[i].length = 0;
35805 for(i=0;i<5;i++) b3_config_parms[i].length = 0;
35806 @@ -14761,6 +14767,8 @@ static void group_optimization(DIVA_CAPI_ADAPTER * a, PLCI * plci)
35807 word appl_number_group_type[MAX_APPL];
35808 PLCI *auxplci;
35809
35810 + pax_track_stack();
35811 +
35812 set_group_ind_mask (plci); /* all APPLs within this inc. call are allowed to dial in */
35813
35814 if(!a->group_optimization_enabled)
35815 diff --git a/drivers/isdn/hardware/eicon/mntfunc.c b/drivers/isdn/hardware/eicon/mntfunc.c
35816 index a564b75..f3cf8b5 100644
35817 --- a/drivers/isdn/hardware/eicon/mntfunc.c
35818 +++ b/drivers/isdn/hardware/eicon/mntfunc.c
35819 @@ -79,6 +79,8 @@ static int DIVA_INIT_FUNCTION connect_didd(void)
35820 IDI_SYNC_REQ req;
35821 DESCRIPTOR DIDD_Table[MAX_DESCRIPTORS];
35822
35823 + pax_track_stack();
35824 +
35825 DIVA_DIDD_Read(DIDD_Table, sizeof(DIDD_Table));
35826
35827 for (x = 0; x < MAX_DESCRIPTORS; x++) {
35828 diff --git a/drivers/isdn/hardware/eicon/xdi_adapter.h b/drivers/isdn/hardware/eicon/xdi_adapter.h
35829 index a3bd163..8956575 100644
35830 --- a/drivers/isdn/hardware/eicon/xdi_adapter.h
35831 +++ b/drivers/isdn/hardware/eicon/xdi_adapter.h
35832 @@ -44,7 +44,7 @@ typedef struct _xdi_mbox_t {
35833 typedef struct _diva_os_idi_adapter_interface {
35834 diva_init_card_proc_t cleanup_adapter_proc;
35835 diva_cmd_card_proc_t cmd_proc;
35836 -} diva_os_idi_adapter_interface_t;
35837 +} __no_const diva_os_idi_adapter_interface_t;
35838
35839 typedef struct _diva_os_xdi_adapter {
35840 struct list_head link;
35841 diff --git a/drivers/isdn/i4l/isdn_common.c b/drivers/isdn/i4l/isdn_common.c
35842 index adb1e8c..21b590b 100644
35843 --- a/drivers/isdn/i4l/isdn_common.c
35844 +++ b/drivers/isdn/i4l/isdn_common.c
35845 @@ -1290,6 +1290,8 @@ isdn_ioctl(struct inode *inode, struct file *file, uint cmd, ulong arg)
35846 } iocpar;
35847 void __user *argp = (void __user *)arg;
35848
35849 + pax_track_stack();
35850 +
35851 #define name iocpar.name
35852 #define bname iocpar.bname
35853 #define iocts iocpar.iocts
35854 diff --git a/drivers/isdn/icn/icn.c b/drivers/isdn/icn/icn.c
35855 index bf7997a..cf091db 100644
35856 --- a/drivers/isdn/icn/icn.c
35857 +++ b/drivers/isdn/icn/icn.c
35858 @@ -1044,7 +1044,7 @@ icn_writecmd(const u_char * buf, int len, int user, icn_card * card)
35859 if (count > len)
35860 count = len;
35861 if (user) {
35862 - if (copy_from_user(msg, buf, count))
35863 + if (count > sizeof msg || copy_from_user(msg, buf, count))
35864 return -EFAULT;
35865 } else
35866 memcpy(msg, buf, count);
35867 diff --git a/drivers/isdn/mISDN/socket.c b/drivers/isdn/mISDN/socket.c
35868 index feb0fa4..f76f830 100644
35869 --- a/drivers/isdn/mISDN/socket.c
35870 +++ b/drivers/isdn/mISDN/socket.c
35871 @@ -391,6 +391,7 @@ data_sock_ioctl(struct socket *sock, unsigned int cmd, unsigned long arg)
35872 if (dev) {
35873 struct mISDN_devinfo di;
35874
35875 + memset(&di, 0, sizeof(di));
35876 di.id = dev->id;
35877 di.Dprotocols = dev->Dprotocols;
35878 di.Bprotocols = dev->Bprotocols | get_all_Bprotocols();
35879 @@ -671,6 +672,7 @@ base_sock_ioctl(struct socket *sock, unsigned int cmd, unsigned long arg)
35880 if (dev) {
35881 struct mISDN_devinfo di;
35882
35883 + memset(&di, 0, sizeof(di));
35884 di.id = dev->id;
35885 di.Dprotocols = dev->Dprotocols;
35886 di.Bprotocols = dev->Bprotocols | get_all_Bprotocols();
35887 diff --git a/drivers/isdn/sc/interrupt.c b/drivers/isdn/sc/interrupt.c
35888 index 485be8b..f0225bc 100644
35889 --- a/drivers/isdn/sc/interrupt.c
35890 +++ b/drivers/isdn/sc/interrupt.c
35891 @@ -112,11 +112,19 @@ irqreturn_t interrupt_handler(int dummy, void *card_inst)
35892 }
35893 else if(callid>=0x0000 && callid<=0x7FFF)
35894 {
35895 + int len;
35896 +
35897 pr_debug("%s: Got Incoming Call\n",
35898 sc_adapter[card]->devicename);
35899 - strcpy(setup.phone,&(rcvmsg.msg_data.byte_array[4]));
35900 - strcpy(setup.eazmsn,
35901 - sc_adapter[card]->channel[rcvmsg.phy_link_no-1].dn);
35902 + len = strlcpy(setup.phone, &(rcvmsg.msg_data.byte_array[4]),
35903 + sizeof(setup.phone));
35904 + if (len >= sizeof(setup.phone))
35905 + continue;
35906 + len = strlcpy(setup.eazmsn,
35907 + sc_adapter[card]->channel[rcvmsg.phy_link_no - 1].dn,
35908 + sizeof(setup.eazmsn));
35909 + if (len >= sizeof(setup.eazmsn))
35910 + continue;
35911 setup.si1 = 7;
35912 setup.si2 = 0;
35913 setup.plan = 0;
35914 @@ -176,7 +184,9 @@ irqreturn_t interrupt_handler(int dummy, void *card_inst)
35915 * Handle a GetMyNumber Rsp
35916 */
35917 if (IS_CE_MESSAGE(rcvmsg,Call,0,GetMyNumber)){
35918 - strcpy(sc_adapter[card]->channel[rcvmsg.phy_link_no-1].dn,rcvmsg.msg_data.byte_array);
35919 + strlcpy(sc_adapter[card]->channel[rcvmsg.phy_link_no - 1].dn,
35920 + rcvmsg.msg_data.byte_array,
35921 + sizeof(rcvmsg.msg_data.byte_array));
35922 continue;
35923 }
35924
35925 diff --git a/drivers/lguest/core.c b/drivers/lguest/core.c
35926 index 8744d24..d1f9a9a 100644
35927 --- a/drivers/lguest/core.c
35928 +++ b/drivers/lguest/core.c
35929 @@ -91,9 +91,17 @@ static __init int map_switcher(void)
35930 * it's worked so far. The end address needs +1 because __get_vm_area
35931 * allocates an extra guard page, so we need space for that.
35932 */
35933 +
35934 +#if defined(CONFIG_MODULES) && defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
35935 + switcher_vma = __get_vm_area(TOTAL_SWITCHER_PAGES * PAGE_SIZE,
35936 + VM_ALLOC | VM_KERNEXEC, SWITCHER_ADDR, SWITCHER_ADDR
35937 + + (TOTAL_SWITCHER_PAGES+1) * PAGE_SIZE);
35938 +#else
35939 switcher_vma = __get_vm_area(TOTAL_SWITCHER_PAGES * PAGE_SIZE,
35940 VM_ALLOC, SWITCHER_ADDR, SWITCHER_ADDR
35941 + (TOTAL_SWITCHER_PAGES+1) * PAGE_SIZE);
35942 +#endif
35943 +
35944 if (!switcher_vma) {
35945 err = -ENOMEM;
35946 printk("lguest: could not map switcher pages high\n");
35947 @@ -118,7 +126,7 @@ static __init int map_switcher(void)
35948 * Now the Switcher is mapped at the right address, we can't fail!
35949 * Copy in the compiled-in Switcher code (from <arch>_switcher.S).
35950 */
35951 - memcpy(switcher_vma->addr, start_switcher_text,
35952 + memcpy(switcher_vma->addr, ktla_ktva(start_switcher_text),
35953 end_switcher_text - start_switcher_text);
35954
35955 printk(KERN_INFO "lguest: mapped switcher at %p\n",
35956 diff --git a/drivers/lguest/x86/core.c b/drivers/lguest/x86/core.c
35957 index 6ae3888..8b38145 100644
35958 --- a/drivers/lguest/x86/core.c
35959 +++ b/drivers/lguest/x86/core.c
35960 @@ -59,7 +59,7 @@ static struct {
35961 /* Offset from where switcher.S was compiled to where we've copied it */
35962 static unsigned long switcher_offset(void)
35963 {
35964 - return SWITCHER_ADDR - (unsigned long)start_switcher_text;
35965 + return SWITCHER_ADDR - (unsigned long)ktla_ktva(start_switcher_text);
35966 }
35967
35968 /* This cpu's struct lguest_pages. */
35969 @@ -100,7 +100,13 @@ static void copy_in_guest_info(struct lg_cpu *cpu, struct lguest_pages *pages)
35970 * These copies are pretty cheap, so we do them unconditionally: */
35971 /* Save the current Host top-level page directory.
35972 */
35973 +
35974 +#ifdef CONFIG_PAX_PER_CPU_PGD
35975 + pages->state.host_cr3 = read_cr3();
35976 +#else
35977 pages->state.host_cr3 = __pa(current->mm->pgd);
35978 +#endif
35979 +
35980 /*
35981 * Set up the Guest's page tables to see this CPU's pages (and no
35982 * other CPU's pages).
35983 @@ -535,7 +541,7 @@ void __init lguest_arch_host_init(void)
35984 * compiled-in switcher code and the high-mapped copy we just made.
35985 */
35986 for (i = 0; i < IDT_ENTRIES; i++)
35987 - default_idt_entries[i] += switcher_offset();
35988 + default_idt_entries[i] = ktla_ktva(default_idt_entries[i]) + switcher_offset();
35989
35990 /*
35991 * Set up the Switcher's per-cpu areas.
35992 @@ -618,7 +624,7 @@ void __init lguest_arch_host_init(void)
35993 * it will be undisturbed when we switch. To change %cs and jump we
35994 * need this structure to feed to Intel's "lcall" instruction.
35995 */
35996 - lguest_entry.offset = (long)switch_to_guest + switcher_offset();
35997 + lguest_entry.offset = (long)ktla_ktva(switch_to_guest) + switcher_offset();
35998 lguest_entry.segment = LGUEST_CS;
35999
36000 /*
36001 diff --git a/drivers/lguest/x86/switcher_32.S b/drivers/lguest/x86/switcher_32.S
36002 index 40634b0..4f5855e 100644
36003 --- a/drivers/lguest/x86/switcher_32.S
36004 +++ b/drivers/lguest/x86/switcher_32.S
36005 @@ -87,6 +87,7 @@
36006 #include <asm/page.h>
36007 #include <asm/segment.h>
36008 #include <asm/lguest.h>
36009 +#include <asm/processor-flags.h>
36010
36011 // We mark the start of the code to copy
36012 // It's placed in .text tho it's never run here
36013 @@ -149,6 +150,13 @@ ENTRY(switch_to_guest)
36014 // Changes type when we load it: damn Intel!
36015 // For after we switch over our page tables
36016 // That entry will be read-only: we'd crash.
36017 +
36018 +#ifdef CONFIG_PAX_KERNEXEC
36019 + mov %cr0, %edx
36020 + xor $X86_CR0_WP, %edx
36021 + mov %edx, %cr0
36022 +#endif
36023 +
36024 movl $(GDT_ENTRY_TSS*8), %edx
36025 ltr %dx
36026
36027 @@ -157,9 +165,15 @@ ENTRY(switch_to_guest)
36028 // Let's clear it again for our return.
36029 // The GDT descriptor of the Host
36030 // Points to the table after two "size" bytes
36031 - movl (LGUEST_PAGES_host_gdt_desc+2)(%eax), %edx
36032 + movl (LGUEST_PAGES_host_gdt_desc+2)(%eax), %eax
36033 // Clear "used" from type field (byte 5, bit 2)
36034 - andb $0xFD, (GDT_ENTRY_TSS*8 + 5)(%edx)
36035 + andb $0xFD, (GDT_ENTRY_TSS*8 + 5)(%eax)
36036 +
36037 +#ifdef CONFIG_PAX_KERNEXEC
36038 + mov %cr0, %eax
36039 + xor $X86_CR0_WP, %eax
36040 + mov %eax, %cr0
36041 +#endif
36042
36043 // Once our page table's switched, the Guest is live!
36044 // The Host fades as we run this final step.
36045 @@ -295,13 +309,12 @@ deliver_to_host:
36046 // I consulted gcc, and it gave
36047 // These instructions, which I gladly credit:
36048 leal (%edx,%ebx,8), %eax
36049 - movzwl (%eax),%edx
36050 - movl 4(%eax), %eax
36051 - xorw %ax, %ax
36052 - orl %eax, %edx
36053 + movl 4(%eax), %edx
36054 + movw (%eax), %dx
36055 // Now the address of the handler's in %edx
36056 // We call it now: its "iret" drops us home.
36057 - jmp *%edx
36058 + ljmp $__KERNEL_CS, $1f
36059 +1: jmp *%edx
36060
36061 // Every interrupt can come to us here
36062 // But we must truly tell each apart.
36063 diff --git a/drivers/macintosh/macio_asic.c b/drivers/macintosh/macio_asic.c
36064 index 588a5b0..b71db89 100644
36065 --- a/drivers/macintosh/macio_asic.c
36066 +++ b/drivers/macintosh/macio_asic.c
36067 @@ -701,7 +701,7 @@ static void __devexit macio_pci_remove(struct pci_dev* pdev)
36068 * MacIO is matched against any Apple ID, it's probe() function
36069 * will then decide wether it applies or not
36070 */
36071 -static const struct pci_device_id __devinitdata pci_ids [] = { {
36072 +static const struct pci_device_id __devinitconst pci_ids [] = { {
36073 .vendor = PCI_VENDOR_ID_APPLE,
36074 .device = PCI_ANY_ID,
36075 .subvendor = PCI_ANY_ID,
36076 diff --git a/drivers/macintosh/via-pmu-backlight.c b/drivers/macintosh/via-pmu-backlight.c
36077 index a348bb0..ecd9b3f 100644
36078 --- a/drivers/macintosh/via-pmu-backlight.c
36079 +++ b/drivers/macintosh/via-pmu-backlight.c
36080 @@ -15,7 +15,7 @@
36081
36082 #define MAX_PMU_LEVEL 0xFF
36083
36084 -static struct backlight_ops pmu_backlight_data;
36085 +static const struct backlight_ops pmu_backlight_data;
36086 static DEFINE_SPINLOCK(pmu_backlight_lock);
36087 static int sleeping, uses_pmu_bl;
36088 static u8 bl_curve[FB_BACKLIGHT_LEVELS];
36089 @@ -115,7 +115,7 @@ static int pmu_backlight_get_brightness(struct backlight_device *bd)
36090 return bd->props.brightness;
36091 }
36092
36093 -static struct backlight_ops pmu_backlight_data = {
36094 +static const struct backlight_ops pmu_backlight_data = {
36095 .get_brightness = pmu_backlight_get_brightness,
36096 .update_status = pmu_backlight_update_status,
36097
36098 diff --git a/drivers/macintosh/via-pmu.c b/drivers/macintosh/via-pmu.c
36099 index 6f308a4..b5f7ff7 100644
36100 --- a/drivers/macintosh/via-pmu.c
36101 +++ b/drivers/macintosh/via-pmu.c
36102 @@ -2232,7 +2232,7 @@ static int pmu_sleep_valid(suspend_state_t state)
36103 && (pmac_call_feature(PMAC_FTR_SLEEP_STATE, NULL, 0, -1) >= 0);
36104 }
36105
36106 -static struct platform_suspend_ops pmu_pm_ops = {
36107 +static const struct platform_suspend_ops pmu_pm_ops = {
36108 .enter = powerbook_sleep,
36109 .valid = pmu_sleep_valid,
36110 };
36111 diff --git a/drivers/md/dm-ioctl.c b/drivers/md/dm-ioctl.c
36112 index 818b617..4656e38 100644
36113 --- a/drivers/md/dm-ioctl.c
36114 +++ b/drivers/md/dm-ioctl.c
36115 @@ -1437,7 +1437,7 @@ static int validate_params(uint cmd, struct dm_ioctl *param)
36116 cmd == DM_LIST_VERSIONS_CMD)
36117 return 0;
36118
36119 - if ((cmd == DM_DEV_CREATE_CMD)) {
36120 + if (cmd == DM_DEV_CREATE_CMD) {
36121 if (!*param->name) {
36122 DMWARN("name not supplied when creating device");
36123 return -EINVAL;
36124 diff --git a/drivers/md/dm-raid1.c b/drivers/md/dm-raid1.c
36125 index 6021d0a..a878643 100644
36126 --- a/drivers/md/dm-raid1.c
36127 +++ b/drivers/md/dm-raid1.c
36128 @@ -41,7 +41,7 @@ enum dm_raid1_error {
36129
36130 struct mirror {
36131 struct mirror_set *ms;
36132 - atomic_t error_count;
36133 + atomic_unchecked_t error_count;
36134 unsigned long error_type;
36135 struct dm_dev *dev;
36136 sector_t offset;
36137 @@ -203,7 +203,7 @@ static void fail_mirror(struct mirror *m, enum dm_raid1_error error_type)
36138 * simple way to tell if a device has encountered
36139 * errors.
36140 */
36141 - atomic_inc(&m->error_count);
36142 + atomic_inc_unchecked(&m->error_count);
36143
36144 if (test_and_set_bit(error_type, &m->error_type))
36145 return;
36146 @@ -225,7 +225,7 @@ static void fail_mirror(struct mirror *m, enum dm_raid1_error error_type)
36147 }
36148
36149 for (new = ms->mirror; new < ms->mirror + ms->nr_mirrors; new++)
36150 - if (!atomic_read(&new->error_count)) {
36151 + if (!atomic_read_unchecked(&new->error_count)) {
36152 set_default_mirror(new);
36153 break;
36154 }
36155 @@ -363,7 +363,7 @@ static struct mirror *choose_mirror(struct mirror_set *ms, sector_t sector)
36156 struct mirror *m = get_default_mirror(ms);
36157
36158 do {
36159 - if (likely(!atomic_read(&m->error_count)))
36160 + if (likely(!atomic_read_unchecked(&m->error_count)))
36161 return m;
36162
36163 if (m-- == ms->mirror)
36164 @@ -377,7 +377,7 @@ static int default_ok(struct mirror *m)
36165 {
36166 struct mirror *default_mirror = get_default_mirror(m->ms);
36167
36168 - return !atomic_read(&default_mirror->error_count);
36169 + return !atomic_read_unchecked(&default_mirror->error_count);
36170 }
36171
36172 static int mirror_available(struct mirror_set *ms, struct bio *bio)
36173 @@ -484,7 +484,7 @@ static void do_reads(struct mirror_set *ms, struct bio_list *reads)
36174 */
36175 if (likely(region_in_sync(ms, region, 1)))
36176 m = choose_mirror(ms, bio->bi_sector);
36177 - else if (m && atomic_read(&m->error_count))
36178 + else if (m && atomic_read_unchecked(&m->error_count))
36179 m = NULL;
36180
36181 if (likely(m))
36182 @@ -855,7 +855,7 @@ static int get_mirror(struct mirror_set *ms, struct dm_target *ti,
36183 }
36184
36185 ms->mirror[mirror].ms = ms;
36186 - atomic_set(&(ms->mirror[mirror].error_count), 0);
36187 + atomic_set_unchecked(&(ms->mirror[mirror].error_count), 0);
36188 ms->mirror[mirror].error_type = 0;
36189 ms->mirror[mirror].offset = offset;
36190
36191 @@ -1241,7 +1241,7 @@ static void mirror_resume(struct dm_target *ti)
36192 */
36193 static char device_status_char(struct mirror *m)
36194 {
36195 - if (!atomic_read(&(m->error_count)))
36196 + if (!atomic_read_unchecked(&(m->error_count)))
36197 return 'A';
36198
36199 return (test_bit(DM_RAID1_WRITE_ERROR, &(m->error_type))) ? 'D' :
36200 diff --git a/drivers/md/dm-stripe.c b/drivers/md/dm-stripe.c
36201 index bd58703..9f26571 100644
36202 --- a/drivers/md/dm-stripe.c
36203 +++ b/drivers/md/dm-stripe.c
36204 @@ -20,7 +20,7 @@ struct stripe {
36205 struct dm_dev *dev;
36206 sector_t physical_start;
36207
36208 - atomic_t error_count;
36209 + atomic_unchecked_t error_count;
36210 };
36211
36212 struct stripe_c {
36213 @@ -188,7 +188,7 @@ static int stripe_ctr(struct dm_target *ti, unsigned int argc, char **argv)
36214 kfree(sc);
36215 return r;
36216 }
36217 - atomic_set(&(sc->stripe[i].error_count), 0);
36218 + atomic_set_unchecked(&(sc->stripe[i].error_count), 0);
36219 }
36220
36221 ti->private = sc;
36222 @@ -257,7 +257,7 @@ static int stripe_status(struct dm_target *ti,
36223 DMEMIT("%d ", sc->stripes);
36224 for (i = 0; i < sc->stripes; i++) {
36225 DMEMIT("%s ", sc->stripe[i].dev->name);
36226 - buffer[i] = atomic_read(&(sc->stripe[i].error_count)) ?
36227 + buffer[i] = atomic_read_unchecked(&(sc->stripe[i].error_count)) ?
36228 'D' : 'A';
36229 }
36230 buffer[i] = '\0';
36231 @@ -304,8 +304,8 @@ static int stripe_end_io(struct dm_target *ti, struct bio *bio,
36232 */
36233 for (i = 0; i < sc->stripes; i++)
36234 if (!strcmp(sc->stripe[i].dev->name, major_minor)) {
36235 - atomic_inc(&(sc->stripe[i].error_count));
36236 - if (atomic_read(&(sc->stripe[i].error_count)) <
36237 + atomic_inc_unchecked(&(sc->stripe[i].error_count));
36238 + if (atomic_read_unchecked(&(sc->stripe[i].error_count)) <
36239 DM_IO_ERROR_THRESHOLD)
36240 queue_work(kstriped, &sc->kstriped_ws);
36241 }
36242 diff --git a/drivers/md/dm-sysfs.c b/drivers/md/dm-sysfs.c
36243 index 4b04590..13a77b2 100644
36244 --- a/drivers/md/dm-sysfs.c
36245 +++ b/drivers/md/dm-sysfs.c
36246 @@ -75,7 +75,7 @@ static struct attribute *dm_attrs[] = {
36247 NULL,
36248 };
36249
36250 -static struct sysfs_ops dm_sysfs_ops = {
36251 +static const struct sysfs_ops dm_sysfs_ops = {
36252 .show = dm_attr_show,
36253 };
36254
36255 diff --git a/drivers/md/dm-table.c b/drivers/md/dm-table.c
36256 index 03345bb..332250d 100644
36257 --- a/drivers/md/dm-table.c
36258 +++ b/drivers/md/dm-table.c
36259 @@ -376,7 +376,7 @@ static int device_area_is_invalid(struct dm_target *ti, struct dm_dev *dev,
36260 if (!dev_size)
36261 return 0;
36262
36263 - if ((start >= dev_size) || (start + len > dev_size)) {
36264 + if ((start >= dev_size) || (len > dev_size - start)) {
36265 DMWARN("%s: %s too small for target: "
36266 "start=%llu, len=%llu, dev_size=%llu",
36267 dm_device_name(ti->table->md), bdevname(bdev, b),
36268 diff --git a/drivers/md/dm.c b/drivers/md/dm.c
36269 index c988ac2..c418141 100644
36270 --- a/drivers/md/dm.c
36271 +++ b/drivers/md/dm.c
36272 @@ -165,9 +165,9 @@ struct mapped_device {
36273 /*
36274 * Event handling.
36275 */
36276 - atomic_t event_nr;
36277 + atomic_unchecked_t event_nr;
36278 wait_queue_head_t eventq;
36279 - atomic_t uevent_seq;
36280 + atomic_unchecked_t uevent_seq;
36281 struct list_head uevent_list;
36282 spinlock_t uevent_lock; /* Protect access to uevent_list */
36283
36284 @@ -1776,8 +1776,8 @@ static struct mapped_device *alloc_dev(int minor)
36285 rwlock_init(&md->map_lock);
36286 atomic_set(&md->holders, 1);
36287 atomic_set(&md->open_count, 0);
36288 - atomic_set(&md->event_nr, 0);
36289 - atomic_set(&md->uevent_seq, 0);
36290 + atomic_set_unchecked(&md->event_nr, 0);
36291 + atomic_set_unchecked(&md->uevent_seq, 0);
36292 INIT_LIST_HEAD(&md->uevent_list);
36293 spin_lock_init(&md->uevent_lock);
36294
36295 @@ -1927,7 +1927,7 @@ static void event_callback(void *context)
36296
36297 dm_send_uevents(&uevents, &disk_to_dev(md->disk)->kobj);
36298
36299 - atomic_inc(&md->event_nr);
36300 + atomic_inc_unchecked(&md->event_nr);
36301 wake_up(&md->eventq);
36302 }
36303
36304 @@ -2562,18 +2562,18 @@ void dm_kobject_uevent(struct mapped_device *md, enum kobject_action action,
36305
36306 uint32_t dm_next_uevent_seq(struct mapped_device *md)
36307 {
36308 - return atomic_add_return(1, &md->uevent_seq);
36309 + return atomic_add_return_unchecked(1, &md->uevent_seq);
36310 }
36311
36312 uint32_t dm_get_event_nr(struct mapped_device *md)
36313 {
36314 - return atomic_read(&md->event_nr);
36315 + return atomic_read_unchecked(&md->event_nr);
36316 }
36317
36318 int dm_wait_event(struct mapped_device *md, int event_nr)
36319 {
36320 return wait_event_interruptible(md->eventq,
36321 - (event_nr != atomic_read(&md->event_nr)));
36322 + (event_nr != atomic_read_unchecked(&md->event_nr)));
36323 }
36324
36325 void dm_uevent_add(struct mapped_device *md, struct list_head *elist)
36326 diff --git a/drivers/md/md.c b/drivers/md/md.c
36327 index 4ce6e2f..7a9530a 100644
36328 --- a/drivers/md/md.c
36329 +++ b/drivers/md/md.c
36330 @@ -153,10 +153,10 @@ static int start_readonly;
36331 * start build, activate spare
36332 */
36333 static DECLARE_WAIT_QUEUE_HEAD(md_event_waiters);
36334 -static atomic_t md_event_count;
36335 +static atomic_unchecked_t md_event_count;
36336 void md_new_event(mddev_t *mddev)
36337 {
36338 - atomic_inc(&md_event_count);
36339 + atomic_inc_unchecked(&md_event_count);
36340 wake_up(&md_event_waiters);
36341 }
36342 EXPORT_SYMBOL_GPL(md_new_event);
36343 @@ -166,7 +166,7 @@ EXPORT_SYMBOL_GPL(md_new_event);
36344 */
36345 static void md_new_event_inintr(mddev_t *mddev)
36346 {
36347 - atomic_inc(&md_event_count);
36348 + atomic_inc_unchecked(&md_event_count);
36349 wake_up(&md_event_waiters);
36350 }
36351
36352 @@ -1226,7 +1226,7 @@ static int super_1_load(mdk_rdev_t *rdev, mdk_rdev_t *refdev, int minor_version)
36353
36354 rdev->preferred_minor = 0xffff;
36355 rdev->data_offset = le64_to_cpu(sb->data_offset);
36356 - atomic_set(&rdev->corrected_errors, le32_to_cpu(sb->cnt_corrected_read));
36357 + atomic_set_unchecked(&rdev->corrected_errors, le32_to_cpu(sb->cnt_corrected_read));
36358
36359 rdev->sb_size = le32_to_cpu(sb->max_dev) * 2 + 256;
36360 bmask = queue_logical_block_size(rdev->bdev->bd_disk->queue)-1;
36361 @@ -1400,7 +1400,7 @@ static void super_1_sync(mddev_t *mddev, mdk_rdev_t *rdev)
36362 else
36363 sb->resync_offset = cpu_to_le64(0);
36364
36365 - sb->cnt_corrected_read = cpu_to_le32(atomic_read(&rdev->corrected_errors));
36366 + sb->cnt_corrected_read = cpu_to_le32(atomic_read_unchecked(&rdev->corrected_errors));
36367
36368 sb->raid_disks = cpu_to_le32(mddev->raid_disks);
36369 sb->size = cpu_to_le64(mddev->dev_sectors);
36370 @@ -2222,7 +2222,7 @@ __ATTR(state, S_IRUGO|S_IWUSR, state_show, state_store);
36371 static ssize_t
36372 errors_show(mdk_rdev_t *rdev, char *page)
36373 {
36374 - return sprintf(page, "%d\n", atomic_read(&rdev->corrected_errors));
36375 + return sprintf(page, "%d\n", atomic_read_unchecked(&rdev->corrected_errors));
36376 }
36377
36378 static ssize_t
36379 @@ -2231,7 +2231,7 @@ errors_store(mdk_rdev_t *rdev, const char *buf, size_t len)
36380 char *e;
36381 unsigned long n = simple_strtoul(buf, &e, 10);
36382 if (*buf && (*e == 0 || *e == '\n')) {
36383 - atomic_set(&rdev->corrected_errors, n);
36384 + atomic_set_unchecked(&rdev->corrected_errors, n);
36385 return len;
36386 }
36387 return -EINVAL;
36388 @@ -2525,7 +2525,7 @@ static void rdev_free(struct kobject *ko)
36389 mdk_rdev_t *rdev = container_of(ko, mdk_rdev_t, kobj);
36390 kfree(rdev);
36391 }
36392 -static struct sysfs_ops rdev_sysfs_ops = {
36393 +static const struct sysfs_ops rdev_sysfs_ops = {
36394 .show = rdev_attr_show,
36395 .store = rdev_attr_store,
36396 };
36397 @@ -2574,8 +2574,8 @@ static mdk_rdev_t *md_import_device(dev_t newdev, int super_format, int super_mi
36398 rdev->data_offset = 0;
36399 rdev->sb_events = 0;
36400 atomic_set(&rdev->nr_pending, 0);
36401 - atomic_set(&rdev->read_errors, 0);
36402 - atomic_set(&rdev->corrected_errors, 0);
36403 + atomic_set_unchecked(&rdev->read_errors, 0);
36404 + atomic_set_unchecked(&rdev->corrected_errors, 0);
36405
36406 size = rdev->bdev->bd_inode->i_size >> BLOCK_SIZE_BITS;
36407 if (!size) {
36408 @@ -3895,7 +3895,7 @@ static void md_free(struct kobject *ko)
36409 kfree(mddev);
36410 }
36411
36412 -static struct sysfs_ops md_sysfs_ops = {
36413 +static const struct sysfs_ops md_sysfs_ops = {
36414 .show = md_attr_show,
36415 .store = md_attr_store,
36416 };
36417 @@ -4482,7 +4482,8 @@ out:
36418 err = 0;
36419 blk_integrity_unregister(disk);
36420 md_new_event(mddev);
36421 - sysfs_notify_dirent(mddev->sysfs_state);
36422 + if (mddev->sysfs_state)
36423 + sysfs_notify_dirent(mddev->sysfs_state);
36424 return err;
36425 }
36426
36427 @@ -5962,7 +5963,7 @@ static int md_seq_show(struct seq_file *seq, void *v)
36428
36429 spin_unlock(&pers_lock);
36430 seq_printf(seq, "\n");
36431 - mi->event = atomic_read(&md_event_count);
36432 + mi->event = atomic_read_unchecked(&md_event_count);
36433 return 0;
36434 }
36435 if (v == (void*)2) {
36436 @@ -6051,7 +6052,7 @@ static int md_seq_show(struct seq_file *seq, void *v)
36437 chunk_kb ? "KB" : "B");
36438 if (bitmap->file) {
36439 seq_printf(seq, ", file: ");
36440 - seq_path(seq, &bitmap->file->f_path, " \t\n");
36441 + seq_path(seq, &bitmap->file->f_path, " \t\n\\");
36442 }
36443
36444 seq_printf(seq, "\n");
36445 @@ -6085,7 +6086,7 @@ static int md_seq_open(struct inode *inode, struct file *file)
36446 else {
36447 struct seq_file *p = file->private_data;
36448 p->private = mi;
36449 - mi->event = atomic_read(&md_event_count);
36450 + mi->event = atomic_read_unchecked(&md_event_count);
36451 }
36452 return error;
36453 }
36454 @@ -6101,7 +6102,7 @@ static unsigned int mdstat_poll(struct file *filp, poll_table *wait)
36455 /* always allow read */
36456 mask = POLLIN | POLLRDNORM;
36457
36458 - if (mi->event != atomic_read(&md_event_count))
36459 + if (mi->event != atomic_read_unchecked(&md_event_count))
36460 mask |= POLLERR | POLLPRI;
36461 return mask;
36462 }
36463 @@ -6145,7 +6146,7 @@ static int is_mddev_idle(mddev_t *mddev, int init)
36464 struct gendisk *disk = rdev->bdev->bd_contains->bd_disk;
36465 curr_events = (int)part_stat_read(&disk->part0, sectors[0]) +
36466 (int)part_stat_read(&disk->part0, sectors[1]) -
36467 - atomic_read(&disk->sync_io);
36468 + atomic_read_unchecked(&disk->sync_io);
36469 /* sync IO will cause sync_io to increase before the disk_stats
36470 * as sync_io is counted when a request starts, and
36471 * disk_stats is counted when it completes.
36472 diff --git a/drivers/md/md.h b/drivers/md/md.h
36473 index 87430fe..0024a4c 100644
36474 --- a/drivers/md/md.h
36475 +++ b/drivers/md/md.h
36476 @@ -94,10 +94,10 @@ struct mdk_rdev_s
36477 * only maintained for arrays that
36478 * support hot removal
36479 */
36480 - atomic_t read_errors; /* number of consecutive read errors that
36481 + atomic_unchecked_t read_errors; /* number of consecutive read errors that
36482 * we have tried to ignore.
36483 */
36484 - atomic_t corrected_errors; /* number of corrected read errors,
36485 + atomic_unchecked_t corrected_errors; /* number of corrected read errors,
36486 * for reporting to userspace and storing
36487 * in superblock.
36488 */
36489 @@ -304,7 +304,7 @@ static inline void rdev_dec_pending(mdk_rdev_t *rdev, mddev_t *mddev)
36490
36491 static inline void md_sync_acct(struct block_device *bdev, unsigned long nr_sectors)
36492 {
36493 - atomic_add(nr_sectors, &bdev->bd_contains->bd_disk->sync_io);
36494 + atomic_add_unchecked(nr_sectors, &bdev->bd_contains->bd_disk->sync_io);
36495 }
36496
36497 struct mdk_personality
36498 diff --git a/drivers/md/raid1.c b/drivers/md/raid1.c
36499 index 968cb14..f0ad2e4 100644
36500 --- a/drivers/md/raid1.c
36501 +++ b/drivers/md/raid1.c
36502 @@ -1415,7 +1415,7 @@ static void sync_request_write(mddev_t *mddev, r1bio_t *r1_bio)
36503 if (r1_bio->bios[d]->bi_end_io != end_sync_read)
36504 continue;
36505 rdev = conf->mirrors[d].rdev;
36506 - atomic_add(s, &rdev->corrected_errors);
36507 + atomic_add_unchecked(s, &rdev->corrected_errors);
36508 if (sync_page_io(rdev->bdev,
36509 sect + rdev->data_offset,
36510 s<<9,
36511 @@ -1564,7 +1564,7 @@ static void fix_read_error(conf_t *conf, int read_disk,
36512 /* Well, this device is dead */
36513 md_error(mddev, rdev);
36514 else {
36515 - atomic_add(s, &rdev->corrected_errors);
36516 + atomic_add_unchecked(s, &rdev->corrected_errors);
36517 printk(KERN_INFO
36518 "raid1:%s: read error corrected "
36519 "(%d sectors at %llu on %s)\n",
36520 diff --git a/drivers/md/raid10.c b/drivers/md/raid10.c
36521 index 1b4e232..cf0f534 100644
36522 --- a/drivers/md/raid10.c
36523 +++ b/drivers/md/raid10.c
36524 @@ -1255,7 +1255,7 @@ static void end_sync_read(struct bio *bio, int error)
36525 if (test_bit(BIO_UPTODATE, &bio->bi_flags))
36526 set_bit(R10BIO_Uptodate, &r10_bio->state);
36527 else {
36528 - atomic_add(r10_bio->sectors,
36529 + atomic_add_unchecked(r10_bio->sectors,
36530 &conf->mirrors[d].rdev->corrected_errors);
36531 if (!test_bit(MD_RECOVERY_SYNC, &conf->mddev->recovery))
36532 md_error(r10_bio->mddev,
36533 @@ -1520,7 +1520,7 @@ static void fix_read_error(conf_t *conf, mddev_t *mddev, r10bio_t *r10_bio)
36534 test_bit(In_sync, &rdev->flags)) {
36535 atomic_inc(&rdev->nr_pending);
36536 rcu_read_unlock();
36537 - atomic_add(s, &rdev->corrected_errors);
36538 + atomic_add_unchecked(s, &rdev->corrected_errors);
36539 if (sync_page_io(rdev->bdev,
36540 r10_bio->devs[sl].addr +
36541 sect + rdev->data_offset,
36542 diff --git a/drivers/md/raid5.c b/drivers/md/raid5.c
36543 index 883215d..675bf47 100644
36544 --- a/drivers/md/raid5.c
36545 +++ b/drivers/md/raid5.c
36546 @@ -482,7 +482,7 @@ static void ops_run_io(struct stripe_head *sh, struct stripe_head_state *s)
36547 bi->bi_next = NULL;
36548 if ((rw & WRITE) &&
36549 test_bit(R5_ReWrite, &sh->dev[i].flags))
36550 - atomic_add(STRIPE_SECTORS,
36551 + atomic_add_unchecked(STRIPE_SECTORS,
36552 &rdev->corrected_errors);
36553 generic_make_request(bi);
36554 } else {
36555 @@ -1517,15 +1517,15 @@ static void raid5_end_read_request(struct bio * bi, int error)
36556 clear_bit(R5_ReadError, &sh->dev[i].flags);
36557 clear_bit(R5_ReWrite, &sh->dev[i].flags);
36558 }
36559 - if (atomic_read(&conf->disks[i].rdev->read_errors))
36560 - atomic_set(&conf->disks[i].rdev->read_errors, 0);
36561 + if (atomic_read_unchecked(&conf->disks[i].rdev->read_errors))
36562 + atomic_set_unchecked(&conf->disks[i].rdev->read_errors, 0);
36563 } else {
36564 const char *bdn = bdevname(conf->disks[i].rdev->bdev, b);
36565 int retry = 0;
36566 rdev = conf->disks[i].rdev;
36567
36568 clear_bit(R5_UPTODATE, &sh->dev[i].flags);
36569 - atomic_inc(&rdev->read_errors);
36570 + atomic_inc_unchecked(&rdev->read_errors);
36571 if (conf->mddev->degraded >= conf->max_degraded)
36572 printk_rl(KERN_WARNING
36573 "raid5:%s: read error not correctable "
36574 @@ -1543,7 +1543,7 @@ static void raid5_end_read_request(struct bio * bi, int error)
36575 (unsigned long long)(sh->sector
36576 + rdev->data_offset),
36577 bdn);
36578 - else if (atomic_read(&rdev->read_errors)
36579 + else if (atomic_read_unchecked(&rdev->read_errors)
36580 > conf->max_nr_stripes)
36581 printk(KERN_WARNING
36582 "raid5:%s: Too many read errors, failing device %s.\n",
36583 @@ -1870,6 +1870,7 @@ static sector_t compute_blocknr(struct stripe_head *sh, int i, int previous)
36584 sector_t r_sector;
36585 struct stripe_head sh2;
36586
36587 + pax_track_stack();
36588
36589 chunk_offset = sector_div(new_sector, sectors_per_chunk);
36590 stripe = new_sector;
36591 diff --git a/drivers/media/common/saa7146_hlp.c b/drivers/media/common/saa7146_hlp.c
36592 index 05bde9c..2f31d40 100644
36593 --- a/drivers/media/common/saa7146_hlp.c
36594 +++ b/drivers/media/common/saa7146_hlp.c
36595 @@ -353,6 +353,8 @@ static void calculate_clipping_registers_rect(struct saa7146_dev *dev, struct sa
36596
36597 int x[32], y[32], w[32], h[32];
36598
36599 + pax_track_stack();
36600 +
36601 /* clear out memory */
36602 memset(&line_list[0], 0x00, sizeof(u32)*32);
36603 memset(&pixel_list[0], 0x00, sizeof(u32)*32);
36604 diff --git a/drivers/media/dvb/dvb-core/dvb_ca_en50221.c b/drivers/media/dvb/dvb-core/dvb_ca_en50221.c
36605 index cb22da5..82b686e 100644
36606 --- a/drivers/media/dvb/dvb-core/dvb_ca_en50221.c
36607 +++ b/drivers/media/dvb/dvb-core/dvb_ca_en50221.c
36608 @@ -590,6 +590,8 @@ static int dvb_ca_en50221_read_data(struct dvb_ca_private *ca, int slot, u8 * eb
36609 u8 buf[HOST_LINK_BUF_SIZE];
36610 int i;
36611
36612 + pax_track_stack();
36613 +
36614 dprintk("%s\n", __func__);
36615
36616 /* check if we have space for a link buf in the rx_buffer */
36617 @@ -1285,6 +1287,8 @@ static ssize_t dvb_ca_en50221_io_write(struct file *file,
36618 unsigned long timeout;
36619 int written;
36620
36621 + pax_track_stack();
36622 +
36623 dprintk("%s\n", __func__);
36624
36625 /* Incoming packet has a 2 byte header. hdr[0] = slot_id, hdr[1] = connection_id */
36626 diff --git a/drivers/media/dvb/dvb-core/dvb_demux.h b/drivers/media/dvb/dvb-core/dvb_demux.h
36627 index 2fe05d0..a3289c4 100644
36628 --- a/drivers/media/dvb/dvb-core/dvb_demux.h
36629 +++ b/drivers/media/dvb/dvb-core/dvb_demux.h
36630 @@ -71,7 +71,7 @@ struct dvb_demux_feed {
36631 union {
36632 dmx_ts_cb ts;
36633 dmx_section_cb sec;
36634 - } cb;
36635 + } __no_const cb;
36636
36637 struct dvb_demux *demux;
36638 void *priv;
36639 diff --git a/drivers/media/dvb/dvb-core/dvbdev.c b/drivers/media/dvb/dvb-core/dvbdev.c
36640 index 94159b9..376bd8e 100644
36641 --- a/drivers/media/dvb/dvb-core/dvbdev.c
36642 +++ b/drivers/media/dvb/dvb-core/dvbdev.c
36643 @@ -191,7 +191,7 @@ int dvb_register_device(struct dvb_adapter *adap, struct dvb_device **pdvbdev,
36644 const struct dvb_device *template, void *priv, int type)
36645 {
36646 struct dvb_device *dvbdev;
36647 - struct file_operations *dvbdevfops;
36648 + file_operations_no_const *dvbdevfops;
36649 struct device *clsdev;
36650 int minor;
36651 int id;
36652 diff --git a/drivers/media/dvb/dvb-usb/cxusb.c b/drivers/media/dvb/dvb-usb/cxusb.c
36653 index 2a53dd0..db8c07a 100644
36654 --- a/drivers/media/dvb/dvb-usb/cxusb.c
36655 +++ b/drivers/media/dvb/dvb-usb/cxusb.c
36656 @@ -1040,7 +1040,7 @@ static struct dib0070_config dib7070p_dib0070_config = {
36657 struct dib0700_adapter_state {
36658 int (*set_param_save) (struct dvb_frontend *,
36659 struct dvb_frontend_parameters *);
36660 -};
36661 +} __no_const;
36662
36663 static int dib7070_set_param_override(struct dvb_frontend *fe,
36664 struct dvb_frontend_parameters *fep)
36665 diff --git a/drivers/media/dvb/dvb-usb/dib0700_core.c b/drivers/media/dvb/dvb-usb/dib0700_core.c
36666 index db7f7f7..f55e96f 100644
36667 --- a/drivers/media/dvb/dvb-usb/dib0700_core.c
36668 +++ b/drivers/media/dvb/dvb-usb/dib0700_core.c
36669 @@ -332,6 +332,8 @@ int dib0700_download_firmware(struct usb_device *udev, const struct firmware *fw
36670
36671 u8 buf[260];
36672
36673 + pax_track_stack();
36674 +
36675 while ((ret = dvb_usb_get_hexline(fw, &hx, &pos)) > 0) {
36676 deb_fwdata("writing to address 0x%08x (buffer: 0x%02x %02x)\n",hx.addr, hx.len, hx.chk);
36677
36678 diff --git a/drivers/media/dvb/dvb-usb/dib0700_devices.c b/drivers/media/dvb/dvb-usb/dib0700_devices.c
36679 index 524acf5..5ffc403 100644
36680 --- a/drivers/media/dvb/dvb-usb/dib0700_devices.c
36681 +++ b/drivers/media/dvb/dvb-usb/dib0700_devices.c
36682 @@ -28,7 +28,7 @@ MODULE_PARM_DESC(force_lna_activation, "force the activation of Low-Noise-Amplif
36683
36684 struct dib0700_adapter_state {
36685 int (*set_param_save) (struct dvb_frontend *, struct dvb_frontend_parameters *);
36686 -};
36687 +} __no_const;
36688
36689 /* Hauppauge Nova-T 500 (aka Bristol)
36690 * has a LNA on GPIO0 which is enabled by setting 1 */
36691 diff --git a/drivers/media/dvb/frontends/dib3000.h b/drivers/media/dvb/frontends/dib3000.h
36692 index ba91735..4261d84 100644
36693 --- a/drivers/media/dvb/frontends/dib3000.h
36694 +++ b/drivers/media/dvb/frontends/dib3000.h
36695 @@ -39,7 +39,7 @@ struct dib_fe_xfer_ops
36696 int (*fifo_ctrl)(struct dvb_frontend *fe, int onoff);
36697 int (*pid_ctrl)(struct dvb_frontend *fe, int index, int pid, int onoff);
36698 int (*tuner_pass_ctrl)(struct dvb_frontend *fe, int onoff, u8 pll_ctrl);
36699 -};
36700 +} __no_const;
36701
36702 #if defined(CONFIG_DVB_DIB3000MB) || (defined(CONFIG_DVB_DIB3000MB_MODULE) && defined(MODULE))
36703 extern struct dvb_frontend* dib3000mb_attach(const struct dib3000_config* config,
36704 diff --git a/drivers/media/dvb/frontends/or51211.c b/drivers/media/dvb/frontends/or51211.c
36705 index c709ce6..b3fe620 100644
36706 --- a/drivers/media/dvb/frontends/or51211.c
36707 +++ b/drivers/media/dvb/frontends/or51211.c
36708 @@ -113,6 +113,8 @@ static int or51211_load_firmware (struct dvb_frontend* fe,
36709 u8 tudata[585];
36710 int i;
36711
36712 + pax_track_stack();
36713 +
36714 dprintk("Firmware is %zd bytes\n",fw->size);
36715
36716 /* Get eprom data */
36717 diff --git a/drivers/media/radio/radio-cadet.c b/drivers/media/radio/radio-cadet.c
36718 index 482d0f3..ee1e202 100644
36719 --- a/drivers/media/radio/radio-cadet.c
36720 +++ b/drivers/media/radio/radio-cadet.c
36721 @@ -347,7 +347,7 @@ static ssize_t cadet_read(struct file *file, char __user *data, size_t count, lo
36722 while (i < count && dev->rdsin != dev->rdsout)
36723 readbuf[i++] = dev->rdsbuf[dev->rdsout++];
36724
36725 - if (copy_to_user(data, readbuf, i))
36726 + if (i > sizeof readbuf || copy_to_user(data, readbuf, i))
36727 return -EFAULT;
36728 return i;
36729 }
36730 diff --git a/drivers/media/video/cx18/cx18-driver.c b/drivers/media/video/cx18/cx18-driver.c
36731 index 6dd51e2..0359b92 100644
36732 --- a/drivers/media/video/cx18/cx18-driver.c
36733 +++ b/drivers/media/video/cx18/cx18-driver.c
36734 @@ -56,7 +56,7 @@ static struct pci_device_id cx18_pci_tbl[] __devinitdata = {
36735
36736 MODULE_DEVICE_TABLE(pci, cx18_pci_tbl);
36737
36738 -static atomic_t cx18_instance = ATOMIC_INIT(0);
36739 +static atomic_unchecked_t cx18_instance = ATOMIC_INIT(0);
36740
36741 /* Parameter declarations */
36742 static int cardtype[CX18_MAX_CARDS];
36743 @@ -288,6 +288,8 @@ void cx18_read_eeprom(struct cx18 *cx, struct tveeprom *tv)
36744 struct i2c_client c;
36745 u8 eedata[256];
36746
36747 + pax_track_stack();
36748 +
36749 memset(&c, 0, sizeof(c));
36750 strlcpy(c.name, "cx18 tveeprom tmp", sizeof(c.name));
36751 c.adapter = &cx->i2c_adap[0];
36752 @@ -800,7 +802,7 @@ static int __devinit cx18_probe(struct pci_dev *pci_dev,
36753 struct cx18 *cx;
36754
36755 /* FIXME - module parameter arrays constrain max instances */
36756 - i = atomic_inc_return(&cx18_instance) - 1;
36757 + i = atomic_inc_return_unchecked(&cx18_instance) - 1;
36758 if (i >= CX18_MAX_CARDS) {
36759 printk(KERN_ERR "cx18: cannot manage card %d, driver has a "
36760 "limit of 0 - %d\n", i, CX18_MAX_CARDS - 1);
36761 diff --git a/drivers/media/video/ivtv/ivtv-driver.c b/drivers/media/video/ivtv/ivtv-driver.c
36762 index 463ec34..2f4625a 100644
36763 --- a/drivers/media/video/ivtv/ivtv-driver.c
36764 +++ b/drivers/media/video/ivtv/ivtv-driver.c
36765 @@ -79,7 +79,7 @@ static struct pci_device_id ivtv_pci_tbl[] __devinitdata = {
36766 MODULE_DEVICE_TABLE(pci,ivtv_pci_tbl);
36767
36768 /* ivtv instance counter */
36769 -static atomic_t ivtv_instance = ATOMIC_INIT(0);
36770 +static atomic_unchecked_t ivtv_instance = ATOMIC_INIT(0);
36771
36772 /* Parameter declarations */
36773 static int cardtype[IVTV_MAX_CARDS];
36774 diff --git a/drivers/media/video/omap24xxcam.c b/drivers/media/video/omap24xxcam.c
36775 index 5fc4ac0..652a54a 100644
36776 --- a/drivers/media/video/omap24xxcam.c
36777 +++ b/drivers/media/video/omap24xxcam.c
36778 @@ -401,7 +401,7 @@ static void omap24xxcam_vbq_complete(struct omap24xxcam_sgdma *sgdma,
36779 spin_unlock_irqrestore(&cam->core_enable_disable_lock, flags);
36780
36781 do_gettimeofday(&vb->ts);
36782 - vb->field_count = atomic_add_return(2, &fh->field_count);
36783 + vb->field_count = atomic_add_return_unchecked(2, &fh->field_count);
36784 if (csr & csr_error) {
36785 vb->state = VIDEOBUF_ERROR;
36786 if (!atomic_read(&fh->cam->in_reset)) {
36787 diff --git a/drivers/media/video/omap24xxcam.h b/drivers/media/video/omap24xxcam.h
36788 index 2ce67f5..cf26a5b 100644
36789 --- a/drivers/media/video/omap24xxcam.h
36790 +++ b/drivers/media/video/omap24xxcam.h
36791 @@ -533,7 +533,7 @@ struct omap24xxcam_fh {
36792 spinlock_t vbq_lock; /* spinlock for the videobuf queue */
36793 struct videobuf_queue vbq;
36794 struct v4l2_pix_format pix; /* serialise pix by vbq->lock */
36795 - atomic_t field_count; /* field counter for videobuf_buffer */
36796 + atomic_unchecked_t field_count; /* field counter for videobuf_buffer */
36797 /* accessing cam here doesn't need serialisation: it's constant */
36798 struct omap24xxcam_device *cam;
36799 };
36800 diff --git a/drivers/media/video/pvrusb2/pvrusb2-eeprom.c b/drivers/media/video/pvrusb2/pvrusb2-eeprom.c
36801 index 299afa4..eb47459 100644
36802 --- a/drivers/media/video/pvrusb2/pvrusb2-eeprom.c
36803 +++ b/drivers/media/video/pvrusb2/pvrusb2-eeprom.c
36804 @@ -119,6 +119,8 @@ int pvr2_eeprom_analyze(struct pvr2_hdw *hdw)
36805 u8 *eeprom;
36806 struct tveeprom tvdata;
36807
36808 + pax_track_stack();
36809 +
36810 memset(&tvdata,0,sizeof(tvdata));
36811
36812 eeprom = pvr2_eeprom_fetch(hdw);
36813 diff --git a/drivers/media/video/pvrusb2/pvrusb2-hdw-internal.h b/drivers/media/video/pvrusb2/pvrusb2-hdw-internal.h
36814 index 5b152ff..3320638 100644
36815 --- a/drivers/media/video/pvrusb2/pvrusb2-hdw-internal.h
36816 +++ b/drivers/media/video/pvrusb2/pvrusb2-hdw-internal.h
36817 @@ -195,7 +195,7 @@ struct pvr2_hdw {
36818
36819 /* I2C stuff */
36820 struct i2c_adapter i2c_adap;
36821 - struct i2c_algorithm i2c_algo;
36822 + i2c_algorithm_no_const i2c_algo;
36823 pvr2_i2c_func i2c_func[PVR2_I2C_FUNC_CNT];
36824 int i2c_cx25840_hack_state;
36825 int i2c_linked;
36826 diff --git a/drivers/media/video/saa7134/saa6752hs.c b/drivers/media/video/saa7134/saa6752hs.c
36827 index 1eabff6..8e2313a 100644
36828 --- a/drivers/media/video/saa7134/saa6752hs.c
36829 +++ b/drivers/media/video/saa7134/saa6752hs.c
36830 @@ -683,6 +683,8 @@ static int saa6752hs_init(struct v4l2_subdev *sd, u32 leading_null_bytes)
36831 unsigned char localPAT[256];
36832 unsigned char localPMT[256];
36833
36834 + pax_track_stack();
36835 +
36836 /* Set video format - must be done first as it resets other settings */
36837 set_reg8(client, 0x41, h->video_format);
36838
36839 diff --git a/drivers/media/video/saa7164/saa7164-cmd.c b/drivers/media/video/saa7164/saa7164-cmd.c
36840 index 9c1d3ac..b1b49e9 100644
36841 --- a/drivers/media/video/saa7164/saa7164-cmd.c
36842 +++ b/drivers/media/video/saa7164/saa7164-cmd.c
36843 @@ -87,6 +87,8 @@ int saa7164_irq_dequeue(struct saa7164_dev *dev)
36844 wait_queue_head_t *q = 0;
36845 dprintk(DBGLVL_CMD, "%s()\n", __func__);
36846
36847 + pax_track_stack();
36848 +
36849 /* While any outstand message on the bus exists... */
36850 do {
36851
36852 @@ -126,6 +128,8 @@ int saa7164_cmd_dequeue(struct saa7164_dev *dev)
36853 u8 tmp[512];
36854 dprintk(DBGLVL_CMD, "%s()\n", __func__);
36855
36856 + pax_track_stack();
36857 +
36858 while (loop) {
36859
36860 tmComResInfo_t tRsp = { 0, 0, 0, 0, 0, 0 };
36861 diff --git a/drivers/media/video/usbvideo/ibmcam.c b/drivers/media/video/usbvideo/ibmcam.c
36862 index b085496..cde0270 100644
36863 --- a/drivers/media/video/usbvideo/ibmcam.c
36864 +++ b/drivers/media/video/usbvideo/ibmcam.c
36865 @@ -3947,15 +3947,15 @@ static struct usb_device_id id_table[] = {
36866 static int __init ibmcam_init(void)
36867 {
36868 struct usbvideo_cb cbTbl;
36869 - memset(&cbTbl, 0, sizeof(cbTbl));
36870 - cbTbl.probe = ibmcam_probe;
36871 - cbTbl.setupOnOpen = ibmcam_setup_on_open;
36872 - cbTbl.videoStart = ibmcam_video_start;
36873 - cbTbl.videoStop = ibmcam_video_stop;
36874 - cbTbl.processData = ibmcam_ProcessIsocData;
36875 - cbTbl.postProcess = usbvideo_DeinterlaceFrame;
36876 - cbTbl.adjustPicture = ibmcam_adjust_picture;
36877 - cbTbl.getFPS = ibmcam_calculate_fps;
36878 + memset((void *)&cbTbl, 0, sizeof(cbTbl));
36879 + *(void **)&cbTbl.probe = ibmcam_probe;
36880 + *(void **)&cbTbl.setupOnOpen = ibmcam_setup_on_open;
36881 + *(void **)&cbTbl.videoStart = ibmcam_video_start;
36882 + *(void **)&cbTbl.videoStop = ibmcam_video_stop;
36883 + *(void **)&cbTbl.processData = ibmcam_ProcessIsocData;
36884 + *(void **)&cbTbl.postProcess = usbvideo_DeinterlaceFrame;
36885 + *(void **)&cbTbl.adjustPicture = ibmcam_adjust_picture;
36886 + *(void **)&cbTbl.getFPS = ibmcam_calculate_fps;
36887 return usbvideo_register(
36888 &cams,
36889 MAX_IBMCAM,
36890 diff --git a/drivers/media/video/usbvideo/konicawc.c b/drivers/media/video/usbvideo/konicawc.c
36891 index 31d57f2..600b735 100644
36892 --- a/drivers/media/video/usbvideo/konicawc.c
36893 +++ b/drivers/media/video/usbvideo/konicawc.c
36894 @@ -225,7 +225,7 @@ static void konicawc_register_input(struct konicawc *cam, struct usb_device *dev
36895 int error;
36896
36897 usb_make_path(dev, cam->input_physname, sizeof(cam->input_physname));
36898 - strncat(cam->input_physname, "/input0", sizeof(cam->input_physname));
36899 + strlcat(cam->input_physname, "/input0", sizeof(cam->input_physname));
36900
36901 cam->input = input_dev = input_allocate_device();
36902 if (!input_dev) {
36903 @@ -935,16 +935,16 @@ static int __init konicawc_init(void)
36904 struct usbvideo_cb cbTbl;
36905 printk(KERN_INFO KBUILD_MODNAME ": " DRIVER_VERSION ":"
36906 DRIVER_DESC "\n");
36907 - memset(&cbTbl, 0, sizeof(cbTbl));
36908 - cbTbl.probe = konicawc_probe;
36909 - cbTbl.setupOnOpen = konicawc_setup_on_open;
36910 - cbTbl.processData = konicawc_process_isoc;
36911 - cbTbl.getFPS = konicawc_calculate_fps;
36912 - cbTbl.setVideoMode = konicawc_set_video_mode;
36913 - cbTbl.startDataPump = konicawc_start_data;
36914 - cbTbl.stopDataPump = konicawc_stop_data;
36915 - cbTbl.adjustPicture = konicawc_adjust_picture;
36916 - cbTbl.userFree = konicawc_free_uvd;
36917 + memset((void * )&cbTbl, 0, sizeof(cbTbl));
36918 + *(void **)&cbTbl.probe = konicawc_probe;
36919 + *(void **)&cbTbl.setupOnOpen = konicawc_setup_on_open;
36920 + *(void **)&cbTbl.processData = konicawc_process_isoc;
36921 + *(void **)&cbTbl.getFPS = konicawc_calculate_fps;
36922 + *(void **)&cbTbl.setVideoMode = konicawc_set_video_mode;
36923 + *(void **)&cbTbl.startDataPump = konicawc_start_data;
36924 + *(void **)&cbTbl.stopDataPump = konicawc_stop_data;
36925 + *(void **)&cbTbl.adjustPicture = konicawc_adjust_picture;
36926 + *(void **)&cbTbl.userFree = konicawc_free_uvd;
36927 return usbvideo_register(
36928 &cams,
36929 MAX_CAMERAS,
36930 diff --git a/drivers/media/video/usbvideo/quickcam_messenger.c b/drivers/media/video/usbvideo/quickcam_messenger.c
36931 index 803d3e4..c4d1b96 100644
36932 --- a/drivers/media/video/usbvideo/quickcam_messenger.c
36933 +++ b/drivers/media/video/usbvideo/quickcam_messenger.c
36934 @@ -89,7 +89,7 @@ static void qcm_register_input(struct qcm *cam, struct usb_device *dev)
36935 int error;
36936
36937 usb_make_path(dev, cam->input_physname, sizeof(cam->input_physname));
36938 - strncat(cam->input_physname, "/input0", sizeof(cam->input_physname));
36939 + strlcat(cam->input_physname, "/input0", sizeof(cam->input_physname));
36940
36941 cam->input = input_dev = input_allocate_device();
36942 if (!input_dev) {
36943 diff --git a/drivers/media/video/usbvideo/ultracam.c b/drivers/media/video/usbvideo/ultracam.c
36944 index fbd1b63..292f9f0 100644
36945 --- a/drivers/media/video/usbvideo/ultracam.c
36946 +++ b/drivers/media/video/usbvideo/ultracam.c
36947 @@ -655,14 +655,14 @@ static int __init ultracam_init(void)
36948 {
36949 struct usbvideo_cb cbTbl;
36950 memset(&cbTbl, 0, sizeof(cbTbl));
36951 - cbTbl.probe = ultracam_probe;
36952 - cbTbl.setupOnOpen = ultracam_setup_on_open;
36953 - cbTbl.videoStart = ultracam_video_start;
36954 - cbTbl.videoStop = ultracam_video_stop;
36955 - cbTbl.processData = ultracam_ProcessIsocData;
36956 - cbTbl.postProcess = usbvideo_DeinterlaceFrame;
36957 - cbTbl.adjustPicture = ultracam_adjust_picture;
36958 - cbTbl.getFPS = ultracam_calculate_fps;
36959 + *(void **)&cbTbl.probe = ultracam_probe;
36960 + *(void **)&cbTbl.setupOnOpen = ultracam_setup_on_open;
36961 + *(void **)&cbTbl.videoStart = ultracam_video_start;
36962 + *(void **)&cbTbl.videoStop = ultracam_video_stop;
36963 + *(void **)&cbTbl.processData = ultracam_ProcessIsocData;
36964 + *(void **)&cbTbl.postProcess = usbvideo_DeinterlaceFrame;
36965 + *(void **)&cbTbl.adjustPicture = ultracam_adjust_picture;
36966 + *(void **)&cbTbl.getFPS = ultracam_calculate_fps;
36967 return usbvideo_register(
36968 &cams,
36969 MAX_CAMERAS,
36970 diff --git a/drivers/media/video/usbvideo/usbvideo.c b/drivers/media/video/usbvideo/usbvideo.c
36971 index dea8b32..34f6878 100644
36972 --- a/drivers/media/video/usbvideo/usbvideo.c
36973 +++ b/drivers/media/video/usbvideo/usbvideo.c
36974 @@ -697,15 +697,15 @@ int usbvideo_register(
36975 __func__, cams, base_size, num_cams);
36976
36977 /* Copy callbacks, apply defaults for those that are not set */
36978 - memmove(&cams->cb, cbTbl, sizeof(cams->cb));
36979 + memmove((void *)&cams->cb, cbTbl, sizeof(cams->cb));
36980 if (cams->cb.getFrame == NULL)
36981 - cams->cb.getFrame = usbvideo_GetFrame;
36982 + *(void **)&cams->cb.getFrame = usbvideo_GetFrame;
36983 if (cams->cb.disconnect == NULL)
36984 - cams->cb.disconnect = usbvideo_Disconnect;
36985 + *(void **)&cams->cb.disconnect = usbvideo_Disconnect;
36986 if (cams->cb.startDataPump == NULL)
36987 - cams->cb.startDataPump = usbvideo_StartDataPump;
36988 + *(void **)&cams->cb.startDataPump = usbvideo_StartDataPump;
36989 if (cams->cb.stopDataPump == NULL)
36990 - cams->cb.stopDataPump = usbvideo_StopDataPump;
36991 + *(void **)&cams->cb.stopDataPump = usbvideo_StopDataPump;
36992
36993 cams->num_cameras = num_cams;
36994 cams->cam = (struct uvd *) &cams[1];
36995 diff --git a/drivers/media/video/usbvideo/usbvideo.h b/drivers/media/video/usbvideo/usbvideo.h
36996 index c66985b..7fa143a 100644
36997 --- a/drivers/media/video/usbvideo/usbvideo.h
36998 +++ b/drivers/media/video/usbvideo/usbvideo.h
36999 @@ -268,7 +268,7 @@ struct usbvideo_cb {
37000 int (*startDataPump)(struct uvd *uvd);
37001 void (*stopDataPump)(struct uvd *uvd);
37002 int (*setVideoMode)(struct uvd *uvd, struct video_window *vw);
37003 -};
37004 +} __no_const;
37005
37006 struct usbvideo {
37007 int num_cameras; /* As allocated */
37008 diff --git a/drivers/media/video/usbvision/usbvision-core.c b/drivers/media/video/usbvision/usbvision-core.c
37009 index e0f91e4..37554ea 100644
37010 --- a/drivers/media/video/usbvision/usbvision-core.c
37011 +++ b/drivers/media/video/usbvision/usbvision-core.c
37012 @@ -820,6 +820,8 @@ static enum ParseState usbvision_parse_compress(struct usb_usbvision *usbvision,
37013 unsigned char rv, gv, bv;
37014 static unsigned char *Y, *U, *V;
37015
37016 + pax_track_stack();
37017 +
37018 frame = usbvision->curFrame;
37019 imageSize = frame->frmwidth * frame->frmheight;
37020 if ( (frame->v4l2_format.format == V4L2_PIX_FMT_YUV422P) ||
37021 diff --git a/drivers/media/video/v4l2-device.c b/drivers/media/video/v4l2-device.c
37022 index 0d06e7c..3d17d24 100644
37023 --- a/drivers/media/video/v4l2-device.c
37024 +++ b/drivers/media/video/v4l2-device.c
37025 @@ -50,9 +50,9 @@ int v4l2_device_register(struct device *dev, struct v4l2_device *v4l2_dev)
37026 EXPORT_SYMBOL_GPL(v4l2_device_register);
37027
37028 int v4l2_device_set_name(struct v4l2_device *v4l2_dev, const char *basename,
37029 - atomic_t *instance)
37030 + atomic_unchecked_t *instance)
37031 {
37032 - int num = atomic_inc_return(instance) - 1;
37033 + int num = atomic_inc_return_unchecked(instance) - 1;
37034 int len = strlen(basename);
37035
37036 if (basename[len - 1] >= '0' && basename[len - 1] <= '9')
37037 diff --git a/drivers/media/video/videobuf-dma-sg.c b/drivers/media/video/videobuf-dma-sg.c
37038 index 032ebae..6a3532c 100644
37039 --- a/drivers/media/video/videobuf-dma-sg.c
37040 +++ b/drivers/media/video/videobuf-dma-sg.c
37041 @@ -693,6 +693,8 @@ void *videobuf_sg_alloc(size_t size)
37042 {
37043 struct videobuf_queue q;
37044
37045 + pax_track_stack();
37046 +
37047 /* Required to make generic handler to call __videobuf_alloc */
37048 q.int_ops = &sg_ops;
37049
37050 diff --git a/drivers/message/fusion/mptbase.c b/drivers/message/fusion/mptbase.c
37051 index b6992b7..9fa7547 100644
37052 --- a/drivers/message/fusion/mptbase.c
37053 +++ b/drivers/message/fusion/mptbase.c
37054 @@ -6709,8 +6709,14 @@ procmpt_iocinfo_read(char *buf, char **start, off_t offset, int request, int *eo
37055 len += sprintf(buf+len, " MaxChainDepth = 0x%02x frames\n", ioc->facts.MaxChainDepth);
37056 len += sprintf(buf+len, " MinBlockSize = 0x%02x bytes\n", 4*ioc->facts.BlockSize);
37057
37058 +#ifdef CONFIG_GRKERNSEC_HIDESYM
37059 + len += sprintf(buf+len, " RequestFrames @ 0x%p (Dma @ 0x%p)\n",
37060 + NULL, NULL);
37061 +#else
37062 len += sprintf(buf+len, " RequestFrames @ 0x%p (Dma @ 0x%p)\n",
37063 (void *)ioc->req_frames, (void *)(ulong)ioc->req_frames_dma);
37064 +#endif
37065 +
37066 /*
37067 * Rounding UP to nearest 4-kB boundary here...
37068 */
37069 diff --git a/drivers/message/fusion/mptsas.c b/drivers/message/fusion/mptsas.c
37070 index 83873e3..e360e9a 100644
37071 --- a/drivers/message/fusion/mptsas.c
37072 +++ b/drivers/message/fusion/mptsas.c
37073 @@ -436,6 +436,23 @@ mptsas_is_end_device(struct mptsas_devinfo * attached)
37074 return 0;
37075 }
37076
37077 +static inline void
37078 +mptsas_set_rphy(MPT_ADAPTER *ioc, struct mptsas_phyinfo *phy_info, struct sas_rphy *rphy)
37079 +{
37080 + if (phy_info->port_details) {
37081 + phy_info->port_details->rphy = rphy;
37082 + dsaswideprintk(ioc, printk(MYIOC_s_DEBUG_FMT "sas_rphy_add: rphy=%p\n",
37083 + ioc->name, rphy));
37084 + }
37085 +
37086 + if (rphy) {
37087 + dsaswideprintk(ioc, dev_printk(KERN_DEBUG,
37088 + &rphy->dev, MYIOC_s_FMT "add:", ioc->name));
37089 + dsaswideprintk(ioc, printk(MYIOC_s_DEBUG_FMT "rphy=%p release=%p\n",
37090 + ioc->name, rphy, rphy->dev.release));
37091 + }
37092 +}
37093 +
37094 /* no mutex */
37095 static void
37096 mptsas_port_delete(MPT_ADAPTER *ioc, struct mptsas_portinfo_details * port_details)
37097 @@ -474,23 +491,6 @@ mptsas_get_rphy(struct mptsas_phyinfo *phy_info)
37098 return NULL;
37099 }
37100
37101 -static inline void
37102 -mptsas_set_rphy(MPT_ADAPTER *ioc, struct mptsas_phyinfo *phy_info, struct sas_rphy *rphy)
37103 -{
37104 - if (phy_info->port_details) {
37105 - phy_info->port_details->rphy = rphy;
37106 - dsaswideprintk(ioc, printk(MYIOC_s_DEBUG_FMT "sas_rphy_add: rphy=%p\n",
37107 - ioc->name, rphy));
37108 - }
37109 -
37110 - if (rphy) {
37111 - dsaswideprintk(ioc, dev_printk(KERN_DEBUG,
37112 - &rphy->dev, MYIOC_s_FMT "add:", ioc->name));
37113 - dsaswideprintk(ioc, printk(MYIOC_s_DEBUG_FMT "rphy=%p release=%p\n",
37114 - ioc->name, rphy, rphy->dev.release));
37115 - }
37116 -}
37117 -
37118 static inline struct sas_port *
37119 mptsas_get_port(struct mptsas_phyinfo *phy_info)
37120 {
37121 diff --git a/drivers/message/fusion/mptscsih.c b/drivers/message/fusion/mptscsih.c
37122 index bd096ca..332cf76 100644
37123 --- a/drivers/message/fusion/mptscsih.c
37124 +++ b/drivers/message/fusion/mptscsih.c
37125 @@ -1248,15 +1248,16 @@ mptscsih_info(struct Scsi_Host *SChost)
37126
37127 h = shost_priv(SChost);
37128
37129 - if (h) {
37130 - if (h->info_kbuf == NULL)
37131 - if ((h->info_kbuf = kmalloc(0x1000 /* 4Kb */, GFP_KERNEL)) == NULL)
37132 - return h->info_kbuf;
37133 - h->info_kbuf[0] = '\0';
37134 + if (!h)
37135 + return NULL;
37136
37137 - mpt_print_ioc_summary(h->ioc, h->info_kbuf, &size, 0, 0);
37138 - h->info_kbuf[size-1] = '\0';
37139 - }
37140 + if (h->info_kbuf == NULL)
37141 + if ((h->info_kbuf = kmalloc(0x1000 /* 4Kb */, GFP_KERNEL)) == NULL)
37142 + return h->info_kbuf;
37143 + h->info_kbuf[0] = '\0';
37144 +
37145 + mpt_print_ioc_summary(h->ioc, h->info_kbuf, &size, 0, 0);
37146 + h->info_kbuf[size-1] = '\0';
37147
37148 return h->info_kbuf;
37149 }
37150 diff --git a/drivers/message/i2o/i2o_config.c b/drivers/message/i2o/i2o_config.c
37151 index efba702..59b2c0f 100644
37152 --- a/drivers/message/i2o/i2o_config.c
37153 +++ b/drivers/message/i2o/i2o_config.c
37154 @@ -787,6 +787,8 @@ static int i2o_cfg_passthru(unsigned long arg)
37155 struct i2o_message *msg;
37156 unsigned int iop;
37157
37158 + pax_track_stack();
37159 +
37160 if (get_user(iop, &cmd->iop) || get_user(user_msg, &cmd->msg))
37161 return -EFAULT;
37162
37163 diff --git a/drivers/message/i2o/i2o_proc.c b/drivers/message/i2o/i2o_proc.c
37164 index 7045c45..c07b170 100644
37165 --- a/drivers/message/i2o/i2o_proc.c
37166 +++ b/drivers/message/i2o/i2o_proc.c
37167 @@ -259,13 +259,6 @@ static char *scsi_devices[] = {
37168 "Array Controller Device"
37169 };
37170
37171 -static char *chtostr(u8 * chars, int n)
37172 -{
37173 - char tmp[256];
37174 - tmp[0] = 0;
37175 - return strncat(tmp, (char *)chars, n);
37176 -}
37177 -
37178 static int i2o_report_query_status(struct seq_file *seq, int block_status,
37179 char *group)
37180 {
37181 @@ -842,8 +835,7 @@ static int i2o_seq_show_ddm_table(struct seq_file *seq, void *v)
37182
37183 seq_printf(seq, "%-#7x", ddm_table.i2o_vendor_id);
37184 seq_printf(seq, "%-#8x", ddm_table.module_id);
37185 - seq_printf(seq, "%-29s",
37186 - chtostr(ddm_table.module_name_version, 28));
37187 + seq_printf(seq, "%-.28s", ddm_table.module_name_version);
37188 seq_printf(seq, "%9d ", ddm_table.data_size);
37189 seq_printf(seq, "%8d", ddm_table.code_size);
37190
37191 @@ -944,8 +936,8 @@ static int i2o_seq_show_drivers_stored(struct seq_file *seq, void *v)
37192
37193 seq_printf(seq, "%-#7x", dst->i2o_vendor_id);
37194 seq_printf(seq, "%-#8x", dst->module_id);
37195 - seq_printf(seq, "%-29s", chtostr(dst->module_name_version, 28));
37196 - seq_printf(seq, "%-9s", chtostr(dst->date, 8));
37197 + seq_printf(seq, "%-.28s", dst->module_name_version);
37198 + seq_printf(seq, "%-.8s", dst->date);
37199 seq_printf(seq, "%8d ", dst->module_size);
37200 seq_printf(seq, "%8d ", dst->mpb_size);
37201 seq_printf(seq, "0x%04x", dst->module_flags);
37202 @@ -1276,14 +1268,10 @@ static int i2o_seq_show_dev_identity(struct seq_file *seq, void *v)
37203 seq_printf(seq, "Device Class : %s\n", i2o_get_class_name(work16[0]));
37204 seq_printf(seq, "Owner TID : %0#5x\n", work16[2]);
37205 seq_printf(seq, "Parent TID : %0#5x\n", work16[3]);
37206 - seq_printf(seq, "Vendor info : %s\n",
37207 - chtostr((u8 *) (work32 + 2), 16));
37208 - seq_printf(seq, "Product info : %s\n",
37209 - chtostr((u8 *) (work32 + 6), 16));
37210 - seq_printf(seq, "Description : %s\n",
37211 - chtostr((u8 *) (work32 + 10), 16));
37212 - seq_printf(seq, "Product rev. : %s\n",
37213 - chtostr((u8 *) (work32 + 14), 8));
37214 + seq_printf(seq, "Vendor info : %.16s\n", (u8 *) (work32 + 2));
37215 + seq_printf(seq, "Product info : %.16s\n", (u8 *) (work32 + 6));
37216 + seq_printf(seq, "Description : %.16s\n", (u8 *) (work32 + 10));
37217 + seq_printf(seq, "Product rev. : %.8s\n", (u8 *) (work32 + 14));
37218
37219 seq_printf(seq, "Serial number : ");
37220 print_serial_number(seq, (u8 *) (work32 + 16),
37221 @@ -1328,10 +1316,8 @@ static int i2o_seq_show_ddm_identity(struct seq_file *seq, void *v)
37222 }
37223
37224 seq_printf(seq, "Registering DDM TID : 0x%03x\n", result.ddm_tid);
37225 - seq_printf(seq, "Module name : %s\n",
37226 - chtostr(result.module_name, 24));
37227 - seq_printf(seq, "Module revision : %s\n",
37228 - chtostr(result.module_rev, 8));
37229 + seq_printf(seq, "Module name : %.24s\n", result.module_name);
37230 + seq_printf(seq, "Module revision : %.8s\n", result.module_rev);
37231
37232 seq_printf(seq, "Serial number : ");
37233 print_serial_number(seq, result.serial_number, sizeof(result) - 36);
37234 @@ -1362,14 +1348,10 @@ static int i2o_seq_show_uinfo(struct seq_file *seq, void *v)
37235 return 0;
37236 }
37237
37238 - seq_printf(seq, "Device name : %s\n",
37239 - chtostr(result.device_name, 64));
37240 - seq_printf(seq, "Service name : %s\n",
37241 - chtostr(result.service_name, 64));
37242 - seq_printf(seq, "Physical name : %s\n",
37243 - chtostr(result.physical_location, 64));
37244 - seq_printf(seq, "Instance number : %s\n",
37245 - chtostr(result.instance_number, 4));
37246 + seq_printf(seq, "Device name : %.64s\n", result.device_name);
37247 + seq_printf(seq, "Service name : %.64s\n", result.service_name);
37248 + seq_printf(seq, "Physical name : %.64s\n", result.physical_location);
37249 + seq_printf(seq, "Instance number : %.4s\n", result.instance_number);
37250
37251 return 0;
37252 }
37253 diff --git a/drivers/message/i2o/iop.c b/drivers/message/i2o/iop.c
37254 index 27cf4af..b1205b8 100644
37255 --- a/drivers/message/i2o/iop.c
37256 +++ b/drivers/message/i2o/iop.c
37257 @@ -110,10 +110,10 @@ u32 i2o_cntxt_list_add(struct i2o_controller * c, void *ptr)
37258
37259 spin_lock_irqsave(&c->context_list_lock, flags);
37260
37261 - if (unlikely(atomic_inc_and_test(&c->context_list_counter)))
37262 - atomic_inc(&c->context_list_counter);
37263 + if (unlikely(atomic_inc_and_test_unchecked(&c->context_list_counter)))
37264 + atomic_inc_unchecked(&c->context_list_counter);
37265
37266 - entry->context = atomic_read(&c->context_list_counter);
37267 + entry->context = atomic_read_unchecked(&c->context_list_counter);
37268
37269 list_add(&entry->list, &c->context_list);
37270
37271 @@ -1076,7 +1076,7 @@ struct i2o_controller *i2o_iop_alloc(void)
37272
37273 #if BITS_PER_LONG == 64
37274 spin_lock_init(&c->context_list_lock);
37275 - atomic_set(&c->context_list_counter, 0);
37276 + atomic_set_unchecked(&c->context_list_counter, 0);
37277 INIT_LIST_HEAD(&c->context_list);
37278 #endif
37279
37280 diff --git a/drivers/mfd/ab3100-core.c b/drivers/mfd/ab3100-core.c
37281 index 78e3e85..66c9a0d 100644
37282 --- a/drivers/mfd/ab3100-core.c
37283 +++ b/drivers/mfd/ab3100-core.c
37284 @@ -777,7 +777,7 @@ struct ab_family_id {
37285 char *name;
37286 };
37287
37288 -static const struct ab_family_id ids[] __initdata = {
37289 +static const struct ab_family_id ids[] __initconst = {
37290 /* AB3100 */
37291 {
37292 .id = 0xc0,
37293 diff --git a/drivers/mfd/wm8350-i2c.c b/drivers/mfd/wm8350-i2c.c
37294 index 8d8c932..8104515 100644
37295 --- a/drivers/mfd/wm8350-i2c.c
37296 +++ b/drivers/mfd/wm8350-i2c.c
37297 @@ -43,6 +43,8 @@ static int wm8350_i2c_write_device(struct wm8350 *wm8350, char reg,
37298 u8 msg[(WM8350_MAX_REGISTER << 1) + 1];
37299 int ret;
37300
37301 + pax_track_stack();
37302 +
37303 if (bytes > ((WM8350_MAX_REGISTER << 1) + 1))
37304 return -EINVAL;
37305
37306 diff --git a/drivers/misc/kgdbts.c b/drivers/misc/kgdbts.c
37307 index e4ff50b..4cc3f04 100644
37308 --- a/drivers/misc/kgdbts.c
37309 +++ b/drivers/misc/kgdbts.c
37310 @@ -118,7 +118,7 @@
37311 } while (0)
37312 #define MAX_CONFIG_LEN 40
37313
37314 -static struct kgdb_io kgdbts_io_ops;
37315 +static const struct kgdb_io kgdbts_io_ops;
37316 static char get_buf[BUFMAX];
37317 static int get_buf_cnt;
37318 static char put_buf[BUFMAX];
37319 @@ -1102,7 +1102,7 @@ static void kgdbts_post_exp_handler(void)
37320 module_put(THIS_MODULE);
37321 }
37322
37323 -static struct kgdb_io kgdbts_io_ops = {
37324 +static const struct kgdb_io kgdbts_io_ops = {
37325 .name = "kgdbts",
37326 .read_char = kgdbts_get_char,
37327 .write_char = kgdbts_put_char,
37328 diff --git a/drivers/misc/sgi-gru/gruhandles.c b/drivers/misc/sgi-gru/gruhandles.c
37329 index 37e7cfc..67cfb76 100644
37330 --- a/drivers/misc/sgi-gru/gruhandles.c
37331 +++ b/drivers/misc/sgi-gru/gruhandles.c
37332 @@ -39,8 +39,8 @@ struct mcs_op_statistic mcs_op_statistics[mcsop_last];
37333
37334 static void update_mcs_stats(enum mcs_op op, unsigned long clks)
37335 {
37336 - atomic_long_inc(&mcs_op_statistics[op].count);
37337 - atomic_long_add(clks, &mcs_op_statistics[op].total);
37338 + atomic_long_inc_unchecked(&mcs_op_statistics[op].count);
37339 + atomic_long_add_unchecked(clks, &mcs_op_statistics[op].total);
37340 if (mcs_op_statistics[op].max < clks)
37341 mcs_op_statistics[op].max = clks;
37342 }
37343 diff --git a/drivers/misc/sgi-gru/gruprocfs.c b/drivers/misc/sgi-gru/gruprocfs.c
37344 index 3f2375c..467c6e6 100644
37345 --- a/drivers/misc/sgi-gru/gruprocfs.c
37346 +++ b/drivers/misc/sgi-gru/gruprocfs.c
37347 @@ -32,9 +32,9 @@
37348
37349 #define printstat(s, f) printstat_val(s, &gru_stats.f, #f)
37350
37351 -static void printstat_val(struct seq_file *s, atomic_long_t *v, char *id)
37352 +static void printstat_val(struct seq_file *s, atomic_long_unchecked_t *v, char *id)
37353 {
37354 - unsigned long val = atomic_long_read(v);
37355 + unsigned long val = atomic_long_read_unchecked(v);
37356
37357 if (val)
37358 seq_printf(s, "%16lu %s\n", val, id);
37359 @@ -136,8 +136,8 @@ static int mcs_statistics_show(struct seq_file *s, void *p)
37360 "cch_interrupt_sync", "cch_deallocate", "tgh_invalidate"};
37361
37362 for (op = 0; op < mcsop_last; op++) {
37363 - count = atomic_long_read(&mcs_op_statistics[op].count);
37364 - total = atomic_long_read(&mcs_op_statistics[op].total);
37365 + count = atomic_long_read_unchecked(&mcs_op_statistics[op].count);
37366 + total = atomic_long_read_unchecked(&mcs_op_statistics[op].total);
37367 max = mcs_op_statistics[op].max;
37368 seq_printf(s, "%-20s%12ld%12ld%12ld\n", id[op], count,
37369 count ? total / count : 0, max);
37370 diff --git a/drivers/misc/sgi-gru/grutables.h b/drivers/misc/sgi-gru/grutables.h
37371 index 46990bc..4a251b5 100644
37372 --- a/drivers/misc/sgi-gru/grutables.h
37373 +++ b/drivers/misc/sgi-gru/grutables.h
37374 @@ -167,84 +167,84 @@ extern unsigned int gru_max_gids;
37375 * GRU statistics.
37376 */
37377 struct gru_stats_s {
37378 - atomic_long_t vdata_alloc;
37379 - atomic_long_t vdata_free;
37380 - atomic_long_t gts_alloc;
37381 - atomic_long_t gts_free;
37382 - atomic_long_t vdata_double_alloc;
37383 - atomic_long_t gts_double_allocate;
37384 - atomic_long_t assign_context;
37385 - atomic_long_t assign_context_failed;
37386 - atomic_long_t free_context;
37387 - atomic_long_t load_user_context;
37388 - atomic_long_t load_kernel_context;
37389 - atomic_long_t lock_kernel_context;
37390 - atomic_long_t unlock_kernel_context;
37391 - atomic_long_t steal_user_context;
37392 - atomic_long_t steal_kernel_context;
37393 - atomic_long_t steal_context_failed;
37394 - atomic_long_t nopfn;
37395 - atomic_long_t break_cow;
37396 - atomic_long_t asid_new;
37397 - atomic_long_t asid_next;
37398 - atomic_long_t asid_wrap;
37399 - atomic_long_t asid_reuse;
37400 - atomic_long_t intr;
37401 - atomic_long_t intr_mm_lock_failed;
37402 - atomic_long_t call_os;
37403 - atomic_long_t call_os_offnode_reference;
37404 - atomic_long_t call_os_check_for_bug;
37405 - atomic_long_t call_os_wait_queue;
37406 - atomic_long_t user_flush_tlb;
37407 - atomic_long_t user_unload_context;
37408 - atomic_long_t user_exception;
37409 - atomic_long_t set_context_option;
37410 - atomic_long_t migrate_check;
37411 - atomic_long_t migrated_retarget;
37412 - atomic_long_t migrated_unload;
37413 - atomic_long_t migrated_unload_delay;
37414 - atomic_long_t migrated_nopfn_retarget;
37415 - atomic_long_t migrated_nopfn_unload;
37416 - atomic_long_t tlb_dropin;
37417 - atomic_long_t tlb_dropin_fail_no_asid;
37418 - atomic_long_t tlb_dropin_fail_upm;
37419 - atomic_long_t tlb_dropin_fail_invalid;
37420 - atomic_long_t tlb_dropin_fail_range_active;
37421 - atomic_long_t tlb_dropin_fail_idle;
37422 - atomic_long_t tlb_dropin_fail_fmm;
37423 - atomic_long_t tlb_dropin_fail_no_exception;
37424 - atomic_long_t tlb_dropin_fail_no_exception_war;
37425 - atomic_long_t tfh_stale_on_fault;
37426 - atomic_long_t mmu_invalidate_range;
37427 - atomic_long_t mmu_invalidate_page;
37428 - atomic_long_t mmu_clear_flush_young;
37429 - atomic_long_t flush_tlb;
37430 - atomic_long_t flush_tlb_gru;
37431 - atomic_long_t flush_tlb_gru_tgh;
37432 - atomic_long_t flush_tlb_gru_zero_asid;
37433 + atomic_long_unchecked_t vdata_alloc;
37434 + atomic_long_unchecked_t vdata_free;
37435 + atomic_long_unchecked_t gts_alloc;
37436 + atomic_long_unchecked_t gts_free;
37437 + atomic_long_unchecked_t vdata_double_alloc;
37438 + atomic_long_unchecked_t gts_double_allocate;
37439 + atomic_long_unchecked_t assign_context;
37440 + atomic_long_unchecked_t assign_context_failed;
37441 + atomic_long_unchecked_t free_context;
37442 + atomic_long_unchecked_t load_user_context;
37443 + atomic_long_unchecked_t load_kernel_context;
37444 + atomic_long_unchecked_t lock_kernel_context;
37445 + atomic_long_unchecked_t unlock_kernel_context;
37446 + atomic_long_unchecked_t steal_user_context;
37447 + atomic_long_unchecked_t steal_kernel_context;
37448 + atomic_long_unchecked_t steal_context_failed;
37449 + atomic_long_unchecked_t nopfn;
37450 + atomic_long_unchecked_t break_cow;
37451 + atomic_long_unchecked_t asid_new;
37452 + atomic_long_unchecked_t asid_next;
37453 + atomic_long_unchecked_t asid_wrap;
37454 + atomic_long_unchecked_t asid_reuse;
37455 + atomic_long_unchecked_t intr;
37456 + atomic_long_unchecked_t intr_mm_lock_failed;
37457 + atomic_long_unchecked_t call_os;
37458 + atomic_long_unchecked_t call_os_offnode_reference;
37459 + atomic_long_unchecked_t call_os_check_for_bug;
37460 + atomic_long_unchecked_t call_os_wait_queue;
37461 + atomic_long_unchecked_t user_flush_tlb;
37462 + atomic_long_unchecked_t user_unload_context;
37463 + atomic_long_unchecked_t user_exception;
37464 + atomic_long_unchecked_t set_context_option;
37465 + atomic_long_unchecked_t migrate_check;
37466 + atomic_long_unchecked_t migrated_retarget;
37467 + atomic_long_unchecked_t migrated_unload;
37468 + atomic_long_unchecked_t migrated_unload_delay;
37469 + atomic_long_unchecked_t migrated_nopfn_retarget;
37470 + atomic_long_unchecked_t migrated_nopfn_unload;
37471 + atomic_long_unchecked_t tlb_dropin;
37472 + atomic_long_unchecked_t tlb_dropin_fail_no_asid;
37473 + atomic_long_unchecked_t tlb_dropin_fail_upm;
37474 + atomic_long_unchecked_t tlb_dropin_fail_invalid;
37475 + atomic_long_unchecked_t tlb_dropin_fail_range_active;
37476 + atomic_long_unchecked_t tlb_dropin_fail_idle;
37477 + atomic_long_unchecked_t tlb_dropin_fail_fmm;
37478 + atomic_long_unchecked_t tlb_dropin_fail_no_exception;
37479 + atomic_long_unchecked_t tlb_dropin_fail_no_exception_war;
37480 + atomic_long_unchecked_t tfh_stale_on_fault;
37481 + atomic_long_unchecked_t mmu_invalidate_range;
37482 + atomic_long_unchecked_t mmu_invalidate_page;
37483 + atomic_long_unchecked_t mmu_clear_flush_young;
37484 + atomic_long_unchecked_t flush_tlb;
37485 + atomic_long_unchecked_t flush_tlb_gru;
37486 + atomic_long_unchecked_t flush_tlb_gru_tgh;
37487 + atomic_long_unchecked_t flush_tlb_gru_zero_asid;
37488
37489 - atomic_long_t copy_gpa;
37490 + atomic_long_unchecked_t copy_gpa;
37491
37492 - atomic_long_t mesq_receive;
37493 - atomic_long_t mesq_receive_none;
37494 - atomic_long_t mesq_send;
37495 - atomic_long_t mesq_send_failed;
37496 - atomic_long_t mesq_noop;
37497 - atomic_long_t mesq_send_unexpected_error;
37498 - atomic_long_t mesq_send_lb_overflow;
37499 - atomic_long_t mesq_send_qlimit_reached;
37500 - atomic_long_t mesq_send_amo_nacked;
37501 - atomic_long_t mesq_send_put_nacked;
37502 - atomic_long_t mesq_qf_not_full;
37503 - atomic_long_t mesq_qf_locked;
37504 - atomic_long_t mesq_qf_noop_not_full;
37505 - atomic_long_t mesq_qf_switch_head_failed;
37506 - atomic_long_t mesq_qf_unexpected_error;
37507 - atomic_long_t mesq_noop_unexpected_error;
37508 - atomic_long_t mesq_noop_lb_overflow;
37509 - atomic_long_t mesq_noop_qlimit_reached;
37510 - atomic_long_t mesq_noop_amo_nacked;
37511 - atomic_long_t mesq_noop_put_nacked;
37512 + atomic_long_unchecked_t mesq_receive;
37513 + atomic_long_unchecked_t mesq_receive_none;
37514 + atomic_long_unchecked_t mesq_send;
37515 + atomic_long_unchecked_t mesq_send_failed;
37516 + atomic_long_unchecked_t mesq_noop;
37517 + atomic_long_unchecked_t mesq_send_unexpected_error;
37518 + atomic_long_unchecked_t mesq_send_lb_overflow;
37519 + atomic_long_unchecked_t mesq_send_qlimit_reached;
37520 + atomic_long_unchecked_t mesq_send_amo_nacked;
37521 + atomic_long_unchecked_t mesq_send_put_nacked;
37522 + atomic_long_unchecked_t mesq_qf_not_full;
37523 + atomic_long_unchecked_t mesq_qf_locked;
37524 + atomic_long_unchecked_t mesq_qf_noop_not_full;
37525 + atomic_long_unchecked_t mesq_qf_switch_head_failed;
37526 + atomic_long_unchecked_t mesq_qf_unexpected_error;
37527 + atomic_long_unchecked_t mesq_noop_unexpected_error;
37528 + atomic_long_unchecked_t mesq_noop_lb_overflow;
37529 + atomic_long_unchecked_t mesq_noop_qlimit_reached;
37530 + atomic_long_unchecked_t mesq_noop_amo_nacked;
37531 + atomic_long_unchecked_t mesq_noop_put_nacked;
37532
37533 };
37534
37535 @@ -252,8 +252,8 @@ enum mcs_op {cchop_allocate, cchop_start, cchop_interrupt, cchop_interrupt_sync,
37536 cchop_deallocate, tghop_invalidate, mcsop_last};
37537
37538 struct mcs_op_statistic {
37539 - atomic_long_t count;
37540 - atomic_long_t total;
37541 + atomic_long_unchecked_t count;
37542 + atomic_long_unchecked_t total;
37543 unsigned long max;
37544 };
37545
37546 @@ -276,7 +276,7 @@ extern struct mcs_op_statistic mcs_op_statistics[mcsop_last];
37547
37548 #define STAT(id) do { \
37549 if (gru_options & OPT_STATS) \
37550 - atomic_long_inc(&gru_stats.id); \
37551 + atomic_long_inc_unchecked(&gru_stats.id); \
37552 } while (0)
37553
37554 #ifdef CONFIG_SGI_GRU_DEBUG
37555 diff --git a/drivers/misc/sgi-xp/xp.h b/drivers/misc/sgi-xp/xp.h
37556 index 2275126..12a9dbfb 100644
37557 --- a/drivers/misc/sgi-xp/xp.h
37558 +++ b/drivers/misc/sgi-xp/xp.h
37559 @@ -289,7 +289,7 @@ struct xpc_interface {
37560 xpc_notify_func, void *);
37561 void (*received) (short, int, void *);
37562 enum xp_retval (*partid_to_nasids) (short, void *);
37563 -};
37564 +} __no_const;
37565
37566 extern struct xpc_interface xpc_interface;
37567
37568 diff --git a/drivers/misc/sgi-xp/xpc.h b/drivers/misc/sgi-xp/xpc.h
37569 index b94d5f7..7f494c5 100644
37570 --- a/drivers/misc/sgi-xp/xpc.h
37571 +++ b/drivers/misc/sgi-xp/xpc.h
37572 @@ -835,6 +835,7 @@ struct xpc_arch_operations {
37573 void (*received_payload) (struct xpc_channel *, void *);
37574 void (*notify_senders_of_disconnect) (struct xpc_channel *);
37575 };
37576 +typedef struct xpc_arch_operations __no_const xpc_arch_operations_no_const;
37577
37578 /* struct xpc_partition act_state values (for XPC HB) */
37579
37580 @@ -876,7 +877,7 @@ extern struct xpc_registration xpc_registrations[];
37581 /* found in xpc_main.c */
37582 extern struct device *xpc_part;
37583 extern struct device *xpc_chan;
37584 -extern struct xpc_arch_operations xpc_arch_ops;
37585 +extern xpc_arch_operations_no_const xpc_arch_ops;
37586 extern int xpc_disengage_timelimit;
37587 extern int xpc_disengage_timedout;
37588 extern int xpc_activate_IRQ_rcvd;
37589 diff --git a/drivers/misc/sgi-xp/xpc_main.c b/drivers/misc/sgi-xp/xpc_main.c
37590 index fd3688a..7e211a4 100644
37591 --- a/drivers/misc/sgi-xp/xpc_main.c
37592 +++ b/drivers/misc/sgi-xp/xpc_main.c
37593 @@ -169,7 +169,7 @@ static struct notifier_block xpc_die_notifier = {
37594 .notifier_call = xpc_system_die,
37595 };
37596
37597 -struct xpc_arch_operations xpc_arch_ops;
37598 +xpc_arch_operations_no_const xpc_arch_ops;
37599
37600 /*
37601 * Timer function to enforce the timelimit on the partition disengage.
37602 diff --git a/drivers/misc/sgi-xp/xpc_sn2.c b/drivers/misc/sgi-xp/xpc_sn2.c
37603 index 8b70e03..700bda6 100644
37604 --- a/drivers/misc/sgi-xp/xpc_sn2.c
37605 +++ b/drivers/misc/sgi-xp/xpc_sn2.c
37606 @@ -2350,7 +2350,7 @@ xpc_received_payload_sn2(struct xpc_channel *ch, void *payload)
37607 xpc_acknowledge_msgs_sn2(ch, get, msg->flags);
37608 }
37609
37610 -static struct xpc_arch_operations xpc_arch_ops_sn2 = {
37611 +static const struct xpc_arch_operations xpc_arch_ops_sn2 = {
37612 .setup_partitions = xpc_setup_partitions_sn2,
37613 .teardown_partitions = xpc_teardown_partitions_sn2,
37614 .process_activate_IRQ_rcvd = xpc_process_activate_IRQ_rcvd_sn2,
37615 @@ -2413,7 +2413,9 @@ xpc_init_sn2(void)
37616 int ret;
37617 size_t buf_size;
37618
37619 - xpc_arch_ops = xpc_arch_ops_sn2;
37620 + pax_open_kernel();
37621 + memcpy((void *)&xpc_arch_ops, &xpc_arch_ops_sn2, sizeof(xpc_arch_ops_sn2));
37622 + pax_close_kernel();
37623
37624 if (offsetof(struct xpc_msg_sn2, payload) > XPC_MSG_HDR_MAX_SIZE) {
37625 dev_err(xpc_part, "header portion of struct xpc_msg_sn2 is "
37626 diff --git a/drivers/misc/sgi-xp/xpc_uv.c b/drivers/misc/sgi-xp/xpc_uv.c
37627 index 8e08d71..7cb8c9b 100644
37628 --- a/drivers/misc/sgi-xp/xpc_uv.c
37629 +++ b/drivers/misc/sgi-xp/xpc_uv.c
37630 @@ -1669,7 +1669,7 @@ xpc_received_payload_uv(struct xpc_channel *ch, void *payload)
37631 XPC_DEACTIVATE_PARTITION(&xpc_partitions[ch->partid], ret);
37632 }
37633
37634 -static struct xpc_arch_operations xpc_arch_ops_uv = {
37635 +static const struct xpc_arch_operations xpc_arch_ops_uv = {
37636 .setup_partitions = xpc_setup_partitions_uv,
37637 .teardown_partitions = xpc_teardown_partitions_uv,
37638 .process_activate_IRQ_rcvd = xpc_process_activate_IRQ_rcvd_uv,
37639 @@ -1729,7 +1729,9 @@ static struct xpc_arch_operations xpc_arch_ops_uv = {
37640 int
37641 xpc_init_uv(void)
37642 {
37643 - xpc_arch_ops = xpc_arch_ops_uv;
37644 + pax_open_kernel();
37645 + memcpy((void *)&xpc_arch_ops, &xpc_arch_ops_uv, sizeof(xpc_arch_ops_uv));
37646 + pax_close_kernel();
37647
37648 if (sizeof(struct xpc_notify_mq_msghdr_uv) > XPC_MSG_HDR_MAX_SIZE) {
37649 dev_err(xpc_part, "xpc_notify_mq_msghdr_uv is larger than %d\n",
37650 diff --git a/drivers/mmc/host/sdhci-pci.c b/drivers/mmc/host/sdhci-pci.c
37651 index 6fd20b42..650efe3 100644
37652 --- a/drivers/mmc/host/sdhci-pci.c
37653 +++ b/drivers/mmc/host/sdhci-pci.c
37654 @@ -297,7 +297,7 @@ static const struct sdhci_pci_fixes sdhci_via = {
37655 .probe = via_probe,
37656 };
37657
37658 -static const struct pci_device_id pci_ids[] __devinitdata = {
37659 +static const struct pci_device_id pci_ids[] __devinitconst = {
37660 {
37661 .vendor = PCI_VENDOR_ID_RICOH,
37662 .device = PCI_DEVICE_ID_RICOH_R5C822,
37663 diff --git a/drivers/mtd/chips/cfi_cmdset_0001.c b/drivers/mtd/chips/cfi_cmdset_0001.c
37664 index e7563a9..5f90ce5 100644
37665 --- a/drivers/mtd/chips/cfi_cmdset_0001.c
37666 +++ b/drivers/mtd/chips/cfi_cmdset_0001.c
37667 @@ -743,6 +743,8 @@ static int chip_ready (struct map_info *map, struct flchip *chip, unsigned long
37668 struct cfi_pri_intelext *cfip = cfi->cmdset_priv;
37669 unsigned long timeo = jiffies + HZ;
37670
37671 + pax_track_stack();
37672 +
37673 /* Prevent setting state FL_SYNCING for chip in suspended state. */
37674 if (mode == FL_SYNCING && chip->oldstate != FL_READY)
37675 goto sleep;
37676 @@ -1642,6 +1644,8 @@ static int __xipram do_write_buffer(struct map_info *map, struct flchip *chip,
37677 unsigned long initial_adr;
37678 int initial_len = len;
37679
37680 + pax_track_stack();
37681 +
37682 wbufsize = cfi_interleave(cfi) << cfi->cfiq->MaxBufWriteSize;
37683 adr += chip->start;
37684 initial_adr = adr;
37685 @@ -1860,6 +1864,8 @@ static int __xipram do_erase_oneblock(struct map_info *map, struct flchip *chip,
37686 int retries = 3;
37687 int ret;
37688
37689 + pax_track_stack();
37690 +
37691 adr += chip->start;
37692
37693 retry:
37694 diff --git a/drivers/mtd/chips/cfi_cmdset_0020.c b/drivers/mtd/chips/cfi_cmdset_0020.c
37695 index 0667a67..3ab97ed 100644
37696 --- a/drivers/mtd/chips/cfi_cmdset_0020.c
37697 +++ b/drivers/mtd/chips/cfi_cmdset_0020.c
37698 @@ -255,6 +255,8 @@ static inline int do_read_onechip(struct map_info *map, struct flchip *chip, lof
37699 unsigned long cmd_addr;
37700 struct cfi_private *cfi = map->fldrv_priv;
37701
37702 + pax_track_stack();
37703 +
37704 adr += chip->start;
37705
37706 /* Ensure cmd read/writes are aligned. */
37707 @@ -428,6 +430,8 @@ static inline int do_write_buffer(struct map_info *map, struct flchip *chip,
37708 DECLARE_WAITQUEUE(wait, current);
37709 int wbufsize, z;
37710
37711 + pax_track_stack();
37712 +
37713 /* M58LW064A requires bus alignment for buffer wriets -- saw */
37714 if (adr & (map_bankwidth(map)-1))
37715 return -EINVAL;
37716 @@ -742,6 +746,8 @@ static inline int do_erase_oneblock(struct map_info *map, struct flchip *chip, u
37717 DECLARE_WAITQUEUE(wait, current);
37718 int ret = 0;
37719
37720 + pax_track_stack();
37721 +
37722 adr += chip->start;
37723
37724 /* Let's determine this according to the interleave only once */
37725 @@ -1047,6 +1053,8 @@ static inline int do_lock_oneblock(struct map_info *map, struct flchip *chip, un
37726 unsigned long timeo = jiffies + HZ;
37727 DECLARE_WAITQUEUE(wait, current);
37728
37729 + pax_track_stack();
37730 +
37731 adr += chip->start;
37732
37733 /* Let's determine this according to the interleave only once */
37734 @@ -1196,6 +1204,8 @@ static inline int do_unlock_oneblock(struct map_info *map, struct flchip *chip,
37735 unsigned long timeo = jiffies + HZ;
37736 DECLARE_WAITQUEUE(wait, current);
37737
37738 + pax_track_stack();
37739 +
37740 adr += chip->start;
37741
37742 /* Let's determine this according to the interleave only once */
37743 diff --git a/drivers/mtd/devices/doc2000.c b/drivers/mtd/devices/doc2000.c
37744 index 5bf5f46..c5de373 100644
37745 --- a/drivers/mtd/devices/doc2000.c
37746 +++ b/drivers/mtd/devices/doc2000.c
37747 @@ -776,7 +776,7 @@ static int doc_write(struct mtd_info *mtd, loff_t to, size_t len,
37748
37749 /* The ECC will not be calculated correctly if less than 512 is written */
37750 /* DBB-
37751 - if (len != 0x200 && eccbuf)
37752 + if (len != 0x200)
37753 printk(KERN_WARNING
37754 "ECC needs a full sector write (adr: %lx size %lx)\n",
37755 (long) to, (long) len);
37756 diff --git a/drivers/mtd/devices/doc2001.c b/drivers/mtd/devices/doc2001.c
37757 index 0990f78..bb4e8a4 100644
37758 --- a/drivers/mtd/devices/doc2001.c
37759 +++ b/drivers/mtd/devices/doc2001.c
37760 @@ -393,7 +393,7 @@ static int doc_read (struct mtd_info *mtd, loff_t from, size_t len,
37761 struct Nand *mychip = &this->chips[from >> (this->chipshift)];
37762
37763 /* Don't allow read past end of device */
37764 - if (from >= this->totlen)
37765 + if (from >= this->totlen || !len)
37766 return -EINVAL;
37767
37768 /* Don't allow a single read to cross a 512-byte block boundary */
37769 diff --git a/drivers/mtd/ftl.c b/drivers/mtd/ftl.c
37770 index e56d6b4..f07e6cf 100644
37771 --- a/drivers/mtd/ftl.c
37772 +++ b/drivers/mtd/ftl.c
37773 @@ -474,6 +474,8 @@ static int copy_erase_unit(partition_t *part, uint16_t srcunit,
37774 loff_t offset;
37775 uint16_t srcunitswap = cpu_to_le16(srcunit);
37776
37777 + pax_track_stack();
37778 +
37779 eun = &part->EUNInfo[srcunit];
37780 xfer = &part->XferInfo[xferunit];
37781 DEBUG(2, "ftl_cs: copying block 0x%x to 0x%x\n",
37782 diff --git a/drivers/mtd/inftlcore.c b/drivers/mtd/inftlcore.c
37783 index 8aca552..146446e 100755
37784 --- a/drivers/mtd/inftlcore.c
37785 +++ b/drivers/mtd/inftlcore.c
37786 @@ -260,6 +260,8 @@ static u16 INFTL_foldchain(struct INFTLrecord *inftl, unsigned thisVUC, unsigned
37787 struct inftl_oob oob;
37788 size_t retlen;
37789
37790 + pax_track_stack();
37791 +
37792 DEBUG(MTD_DEBUG_LEVEL3, "INFTL: INFTL_foldchain(inftl=%p,thisVUC=%d,"
37793 "pending=%d)\n", inftl, thisVUC, pendingblock);
37794
37795 diff --git a/drivers/mtd/inftlmount.c b/drivers/mtd/inftlmount.c
37796 index 32e82ae..ed50953 100644
37797 --- a/drivers/mtd/inftlmount.c
37798 +++ b/drivers/mtd/inftlmount.c
37799 @@ -54,6 +54,8 @@ static int find_boot_record(struct INFTLrecord *inftl)
37800 struct INFTLPartition *ip;
37801 size_t retlen;
37802
37803 + pax_track_stack();
37804 +
37805 DEBUG(MTD_DEBUG_LEVEL3, "INFTL: find_boot_record(inftl=%p)\n", inftl);
37806
37807 /*
37808 diff --git a/drivers/mtd/lpddr/qinfo_probe.c b/drivers/mtd/lpddr/qinfo_probe.c
37809 index 79bf40f..fe5f8fd 100644
37810 --- a/drivers/mtd/lpddr/qinfo_probe.c
37811 +++ b/drivers/mtd/lpddr/qinfo_probe.c
37812 @@ -106,6 +106,8 @@ static int lpddr_pfow_present(struct map_info *map, struct lpddr_private *lpddr)
37813 {
37814 map_word pfow_val[4];
37815
37816 + pax_track_stack();
37817 +
37818 /* Check identification string */
37819 pfow_val[0] = map_read(map, map->pfow_base + PFOW_QUERY_STRING_P);
37820 pfow_val[1] = map_read(map, map->pfow_base + PFOW_QUERY_STRING_F);
37821 diff --git a/drivers/mtd/mtdchar.c b/drivers/mtd/mtdchar.c
37822 index 726a1b8..f46b460 100644
37823 --- a/drivers/mtd/mtdchar.c
37824 +++ b/drivers/mtd/mtdchar.c
37825 @@ -461,6 +461,8 @@ static int mtd_ioctl(struct inode *inode, struct file *file,
37826 u_long size;
37827 struct mtd_info_user info;
37828
37829 + pax_track_stack();
37830 +
37831 DEBUG(MTD_DEBUG_LEVEL0, "MTD_ioctl\n");
37832
37833 size = (cmd & IOCSIZE_MASK) >> IOCSIZE_SHIFT;
37834 diff --git a/drivers/mtd/nftlcore.c b/drivers/mtd/nftlcore.c
37835 index 1002e18..26d82d5 100644
37836 --- a/drivers/mtd/nftlcore.c
37837 +++ b/drivers/mtd/nftlcore.c
37838 @@ -254,6 +254,8 @@ static u16 NFTL_foldchain (struct NFTLrecord *nftl, unsigned thisVUC, unsigned p
37839 int inplace = 1;
37840 size_t retlen;
37841
37842 + pax_track_stack();
37843 +
37844 memset(BlockMap, 0xff, sizeof(BlockMap));
37845 memset(BlockFreeFound, 0, sizeof(BlockFreeFound));
37846
37847 diff --git a/drivers/mtd/nftlmount.c b/drivers/mtd/nftlmount.c
37848 index 8b22b18..6fada85 100644
37849 --- a/drivers/mtd/nftlmount.c
37850 +++ b/drivers/mtd/nftlmount.c
37851 @@ -23,6 +23,7 @@
37852 #include <asm/errno.h>
37853 #include <linux/delay.h>
37854 #include <linux/slab.h>
37855 +#include <linux/sched.h>
37856 #include <linux/mtd/mtd.h>
37857 #include <linux/mtd/nand.h>
37858 #include <linux/mtd/nftl.h>
37859 @@ -44,6 +45,8 @@ static int find_boot_record(struct NFTLrecord *nftl)
37860 struct mtd_info *mtd = nftl->mbd.mtd;
37861 unsigned int i;
37862
37863 + pax_track_stack();
37864 +
37865 /* Assume logical EraseSize == physical erasesize for starting the scan.
37866 We'll sort it out later if we find a MediaHeader which says otherwise */
37867 /* Actually, we won't. The new DiskOnChip driver has already scanned
37868 diff --git a/drivers/mtd/ubi/build.c b/drivers/mtd/ubi/build.c
37869 index 14cec04..d775b87 100644
37870 --- a/drivers/mtd/ubi/build.c
37871 +++ b/drivers/mtd/ubi/build.c
37872 @@ -1255,7 +1255,7 @@ module_exit(ubi_exit);
37873 static int __init bytes_str_to_int(const char *str)
37874 {
37875 char *endp;
37876 - unsigned long result;
37877 + unsigned long result, scale = 1;
37878
37879 result = simple_strtoul(str, &endp, 0);
37880 if (str == endp || result >= INT_MAX) {
37881 @@ -1266,11 +1266,11 @@ static int __init bytes_str_to_int(const char *str)
37882
37883 switch (*endp) {
37884 case 'G':
37885 - result *= 1024;
37886 + scale *= 1024;
37887 case 'M':
37888 - result *= 1024;
37889 + scale *= 1024;
37890 case 'K':
37891 - result *= 1024;
37892 + scale *= 1024;
37893 if (endp[1] == 'i' && endp[2] == 'B')
37894 endp += 2;
37895 case '\0':
37896 @@ -1281,7 +1281,13 @@ static int __init bytes_str_to_int(const char *str)
37897 return -EINVAL;
37898 }
37899
37900 - return result;
37901 + if ((intoverflow_t)result*scale >= INT_MAX) {
37902 + printk(KERN_ERR "UBI error: incorrect bytes count: \"%s\"\n",
37903 + str);
37904 + return -EINVAL;
37905 + }
37906 +
37907 + return result*scale;
37908 }
37909
37910 /**
37911 diff --git a/drivers/net/atlx/atl2.c b/drivers/net/atlx/atl2.c
37912 index ab68886..ca405e8 100644
37913 --- a/drivers/net/atlx/atl2.c
37914 +++ b/drivers/net/atlx/atl2.c
37915 @@ -2845,7 +2845,7 @@ static void atl2_force_ps(struct atl2_hw *hw)
37916 */
37917
37918 #define ATL2_PARAM(X, desc) \
37919 - static const int __devinitdata X[ATL2_MAX_NIC + 1] = ATL2_PARAM_INIT; \
37920 + static const int __devinitconst X[ATL2_MAX_NIC + 1] = ATL2_PARAM_INIT; \
37921 MODULE_PARM(X, "1-" __MODULE_STRING(ATL2_MAX_NIC) "i"); \
37922 MODULE_PARM_DESC(X, desc);
37923 #else
37924 diff --git a/drivers/net/bnx2.c b/drivers/net/bnx2.c
37925 index 4874b2b..67f8526 100644
37926 --- a/drivers/net/bnx2.c
37927 +++ b/drivers/net/bnx2.c
37928 @@ -5809,6 +5809,8 @@ bnx2_test_nvram(struct bnx2 *bp)
37929 int rc = 0;
37930 u32 magic, csum;
37931
37932 + pax_track_stack();
37933 +
37934 if ((rc = bnx2_nvram_read(bp, 0, data, 4)) != 0)
37935 goto test_nvram_done;
37936
37937 diff --git a/drivers/net/cxgb3/l2t.h b/drivers/net/cxgb3/l2t.h
37938 index fd3eb07..8a6978d 100644
37939 --- a/drivers/net/cxgb3/l2t.h
37940 +++ b/drivers/net/cxgb3/l2t.h
37941 @@ -86,7 +86,7 @@ typedef void (*arp_failure_handler_func)(struct t3cdev * dev,
37942 */
37943 struct l2t_skb_cb {
37944 arp_failure_handler_func arp_failure_handler;
37945 -};
37946 +} __no_const;
37947
37948 #define L2T_SKB_CB(skb) ((struct l2t_skb_cb *)(skb)->cb)
37949
37950 diff --git a/drivers/net/cxgb3/t3_hw.c b/drivers/net/cxgb3/t3_hw.c
37951 index 032cfe0..411af379 100644
37952 --- a/drivers/net/cxgb3/t3_hw.c
37953 +++ b/drivers/net/cxgb3/t3_hw.c
37954 @@ -699,6 +699,8 @@ static int get_vpd_params(struct adapter *adapter, struct vpd_params *p)
37955 int i, addr, ret;
37956 struct t3_vpd vpd;
37957
37958 + pax_track_stack();
37959 +
37960 /*
37961 * Card information is normally at VPD_BASE but some early cards had
37962 * it at 0.
37963 diff --git a/drivers/net/e1000e/82571.c b/drivers/net/e1000e/82571.c
37964 index d1e0563..b9e129c 100644
37965 --- a/drivers/net/e1000e/82571.c
37966 +++ b/drivers/net/e1000e/82571.c
37967 @@ -212,7 +212,7 @@ static s32 e1000_init_mac_params_82571(struct e1000_adapter *adapter)
37968 {
37969 struct e1000_hw *hw = &adapter->hw;
37970 struct e1000_mac_info *mac = &hw->mac;
37971 - struct e1000_mac_operations *func = &mac->ops;
37972 + e1000_mac_operations_no_const *func = &mac->ops;
37973 u32 swsm = 0;
37974 u32 swsm2 = 0;
37975 bool force_clear_smbi = false;
37976 @@ -1656,7 +1656,7 @@ static void e1000_clear_hw_cntrs_82571(struct e1000_hw *hw)
37977 temp = er32(ICRXDMTC);
37978 }
37979
37980 -static struct e1000_mac_operations e82571_mac_ops = {
37981 +static const struct e1000_mac_operations e82571_mac_ops = {
37982 /* .check_mng_mode: mac type dependent */
37983 /* .check_for_link: media type dependent */
37984 .id_led_init = e1000e_id_led_init,
37985 @@ -1674,7 +1674,7 @@ static struct e1000_mac_operations e82571_mac_ops = {
37986 .setup_led = e1000e_setup_led_generic,
37987 };
37988
37989 -static struct e1000_phy_operations e82_phy_ops_igp = {
37990 +static const struct e1000_phy_operations e82_phy_ops_igp = {
37991 .acquire_phy = e1000_get_hw_semaphore_82571,
37992 .check_reset_block = e1000e_check_reset_block_generic,
37993 .commit_phy = NULL,
37994 @@ -1691,7 +1691,7 @@ static struct e1000_phy_operations e82_phy_ops_igp = {
37995 .cfg_on_link_up = NULL,
37996 };
37997
37998 -static struct e1000_phy_operations e82_phy_ops_m88 = {
37999 +static const struct e1000_phy_operations e82_phy_ops_m88 = {
38000 .acquire_phy = e1000_get_hw_semaphore_82571,
38001 .check_reset_block = e1000e_check_reset_block_generic,
38002 .commit_phy = e1000e_phy_sw_reset,
38003 @@ -1708,7 +1708,7 @@ static struct e1000_phy_operations e82_phy_ops_m88 = {
38004 .cfg_on_link_up = NULL,
38005 };
38006
38007 -static struct e1000_phy_operations e82_phy_ops_bm = {
38008 +static const struct e1000_phy_operations e82_phy_ops_bm = {
38009 .acquire_phy = e1000_get_hw_semaphore_82571,
38010 .check_reset_block = e1000e_check_reset_block_generic,
38011 .commit_phy = e1000e_phy_sw_reset,
38012 @@ -1725,7 +1725,7 @@ static struct e1000_phy_operations e82_phy_ops_bm = {
38013 .cfg_on_link_up = NULL,
38014 };
38015
38016 -static struct e1000_nvm_operations e82571_nvm_ops = {
38017 +static const struct e1000_nvm_operations e82571_nvm_ops = {
38018 .acquire_nvm = e1000_acquire_nvm_82571,
38019 .read_nvm = e1000e_read_nvm_eerd,
38020 .release_nvm = e1000_release_nvm_82571,
38021 diff --git a/drivers/net/e1000e/e1000.h b/drivers/net/e1000e/e1000.h
38022 index 47db9bd..fa58ccd 100644
38023 --- a/drivers/net/e1000e/e1000.h
38024 +++ b/drivers/net/e1000e/e1000.h
38025 @@ -375,9 +375,9 @@ struct e1000_info {
38026 u32 pba;
38027 u32 max_hw_frame_size;
38028 s32 (*get_variants)(struct e1000_adapter *);
38029 - struct e1000_mac_operations *mac_ops;
38030 - struct e1000_phy_operations *phy_ops;
38031 - struct e1000_nvm_operations *nvm_ops;
38032 + const struct e1000_mac_operations *mac_ops;
38033 + const struct e1000_phy_operations *phy_ops;
38034 + const struct e1000_nvm_operations *nvm_ops;
38035 };
38036
38037 /* hardware capability, feature, and workaround flags */
38038 diff --git a/drivers/net/e1000e/es2lan.c b/drivers/net/e1000e/es2lan.c
38039 index ae5d736..e9a93a1 100644
38040 --- a/drivers/net/e1000e/es2lan.c
38041 +++ b/drivers/net/e1000e/es2lan.c
38042 @@ -207,7 +207,7 @@ static s32 e1000_init_mac_params_80003es2lan(struct e1000_adapter *adapter)
38043 {
38044 struct e1000_hw *hw = &adapter->hw;
38045 struct e1000_mac_info *mac = &hw->mac;
38046 - struct e1000_mac_operations *func = &mac->ops;
38047 + e1000_mac_operations_no_const *func = &mac->ops;
38048
38049 /* Set media type */
38050 switch (adapter->pdev->device) {
38051 @@ -1365,7 +1365,7 @@ static void e1000_clear_hw_cntrs_80003es2lan(struct e1000_hw *hw)
38052 temp = er32(ICRXDMTC);
38053 }
38054
38055 -static struct e1000_mac_operations es2_mac_ops = {
38056 +static const struct e1000_mac_operations es2_mac_ops = {
38057 .id_led_init = e1000e_id_led_init,
38058 .check_mng_mode = e1000e_check_mng_mode_generic,
38059 /* check_for_link dependent on media type */
38060 @@ -1383,7 +1383,7 @@ static struct e1000_mac_operations es2_mac_ops = {
38061 .setup_led = e1000e_setup_led_generic,
38062 };
38063
38064 -static struct e1000_phy_operations es2_phy_ops = {
38065 +static const struct e1000_phy_operations es2_phy_ops = {
38066 .acquire_phy = e1000_acquire_phy_80003es2lan,
38067 .check_reset_block = e1000e_check_reset_block_generic,
38068 .commit_phy = e1000e_phy_sw_reset,
38069 @@ -1400,7 +1400,7 @@ static struct e1000_phy_operations es2_phy_ops = {
38070 .cfg_on_link_up = e1000_cfg_on_link_up_80003es2lan,
38071 };
38072
38073 -static struct e1000_nvm_operations es2_nvm_ops = {
38074 +static const struct e1000_nvm_operations es2_nvm_ops = {
38075 .acquire_nvm = e1000_acquire_nvm_80003es2lan,
38076 .read_nvm = e1000e_read_nvm_eerd,
38077 .release_nvm = e1000_release_nvm_80003es2lan,
38078 diff --git a/drivers/net/e1000e/hw.h b/drivers/net/e1000e/hw.h
38079 index 11f3b7c..6381887 100644
38080 --- a/drivers/net/e1000e/hw.h
38081 +++ b/drivers/net/e1000e/hw.h
38082 @@ -753,6 +753,7 @@ struct e1000_mac_operations {
38083 s32 (*setup_physical_interface)(struct e1000_hw *);
38084 s32 (*setup_led)(struct e1000_hw *);
38085 };
38086 +typedef struct e1000_mac_operations __no_const e1000_mac_operations_no_const;
38087
38088 /* Function pointers for the PHY. */
38089 struct e1000_phy_operations {
38090 @@ -774,6 +775,7 @@ struct e1000_phy_operations {
38091 s32 (*write_phy_reg_locked)(struct e1000_hw *, u32, u16);
38092 s32 (*cfg_on_link_up)(struct e1000_hw *);
38093 };
38094 +typedef struct e1000_phy_operations __no_const e1000_phy_operations_no_const;
38095
38096 /* Function pointers for the NVM. */
38097 struct e1000_nvm_operations {
38098 @@ -785,9 +787,10 @@ struct e1000_nvm_operations {
38099 s32 (*validate_nvm)(struct e1000_hw *);
38100 s32 (*write_nvm)(struct e1000_hw *, u16, u16, u16 *);
38101 };
38102 +typedef struct e1000_nvm_operations __no_const e1000_nvm_operations_no_const;
38103
38104 struct e1000_mac_info {
38105 - struct e1000_mac_operations ops;
38106 + e1000_mac_operations_no_const ops;
38107
38108 u8 addr[6];
38109 u8 perm_addr[6];
38110 @@ -823,7 +826,7 @@ struct e1000_mac_info {
38111 };
38112
38113 struct e1000_phy_info {
38114 - struct e1000_phy_operations ops;
38115 + e1000_phy_operations_no_const ops;
38116
38117 enum e1000_phy_type type;
38118
38119 @@ -857,7 +860,7 @@ struct e1000_phy_info {
38120 };
38121
38122 struct e1000_nvm_info {
38123 - struct e1000_nvm_operations ops;
38124 + e1000_nvm_operations_no_const ops;
38125
38126 enum e1000_nvm_type type;
38127 enum e1000_nvm_override override;
38128 diff --git a/drivers/net/e1000e/ich8lan.c b/drivers/net/e1000e/ich8lan.c
38129 index de39f9a..e28d3e0 100644
38130 --- a/drivers/net/e1000e/ich8lan.c
38131 +++ b/drivers/net/e1000e/ich8lan.c
38132 @@ -3463,7 +3463,7 @@ static void e1000_clear_hw_cntrs_ich8lan(struct e1000_hw *hw)
38133 }
38134 }
38135
38136 -static struct e1000_mac_operations ich8_mac_ops = {
38137 +static const struct e1000_mac_operations ich8_mac_ops = {
38138 .id_led_init = e1000e_id_led_init,
38139 .check_mng_mode = e1000_check_mng_mode_ich8lan,
38140 .check_for_link = e1000_check_for_copper_link_ich8lan,
38141 @@ -3481,7 +3481,7 @@ static struct e1000_mac_operations ich8_mac_ops = {
38142 /* id_led_init dependent on mac type */
38143 };
38144
38145 -static struct e1000_phy_operations ich8_phy_ops = {
38146 +static const struct e1000_phy_operations ich8_phy_ops = {
38147 .acquire_phy = e1000_acquire_swflag_ich8lan,
38148 .check_reset_block = e1000_check_reset_block_ich8lan,
38149 .commit_phy = NULL,
38150 @@ -3497,7 +3497,7 @@ static struct e1000_phy_operations ich8_phy_ops = {
38151 .write_phy_reg = e1000e_write_phy_reg_igp,
38152 };
38153
38154 -static struct e1000_nvm_operations ich8_nvm_ops = {
38155 +static const struct e1000_nvm_operations ich8_nvm_ops = {
38156 .acquire_nvm = e1000_acquire_nvm_ich8lan,
38157 .read_nvm = e1000_read_nvm_ich8lan,
38158 .release_nvm = e1000_release_nvm_ich8lan,
38159 diff --git a/drivers/net/fealnx.c b/drivers/net/fealnx.c
38160 index 18d5fbb..542d96d 100644
38161 --- a/drivers/net/fealnx.c
38162 +++ b/drivers/net/fealnx.c
38163 @@ -151,7 +151,7 @@ struct chip_info {
38164 int flags;
38165 };
38166
38167 -static const struct chip_info skel_netdrv_tbl[] __devinitdata = {
38168 +static const struct chip_info skel_netdrv_tbl[] __devinitconst = {
38169 { "100/10M Ethernet PCI Adapter", HAS_MII_XCVR },
38170 { "100/10M Ethernet PCI Adapter", HAS_CHIP_XCVR },
38171 { "1000/100/10M Ethernet PCI Adapter", HAS_MII_XCVR },
38172 diff --git a/drivers/net/hamradio/6pack.c b/drivers/net/hamradio/6pack.c
38173 index 0e5b54b..b503f82 100644
38174 --- a/drivers/net/hamradio/6pack.c
38175 +++ b/drivers/net/hamradio/6pack.c
38176 @@ -461,6 +461,8 @@ static void sixpack_receive_buf(struct tty_struct *tty,
38177 unsigned char buf[512];
38178 int count1;
38179
38180 + pax_track_stack();
38181 +
38182 if (!count)
38183 return;
38184
38185 diff --git a/drivers/net/ibmveth.c b/drivers/net/ibmveth.c
38186 index 5862282..7cce8cb 100644
38187 --- a/drivers/net/ibmveth.c
38188 +++ b/drivers/net/ibmveth.c
38189 @@ -1577,7 +1577,7 @@ static struct attribute * veth_pool_attrs[] = {
38190 NULL,
38191 };
38192
38193 -static struct sysfs_ops veth_pool_ops = {
38194 +static const struct sysfs_ops veth_pool_ops = {
38195 .show = veth_pool_show,
38196 .store = veth_pool_store,
38197 };
38198 diff --git a/drivers/net/igb/e1000_82575.c b/drivers/net/igb/e1000_82575.c
38199 index d617f2d..57b5309 100644
38200 --- a/drivers/net/igb/e1000_82575.c
38201 +++ b/drivers/net/igb/e1000_82575.c
38202 @@ -1411,7 +1411,7 @@ void igb_vmdq_set_replication_pf(struct e1000_hw *hw, bool enable)
38203 wr32(E1000_VT_CTL, vt_ctl);
38204 }
38205
38206 -static struct e1000_mac_operations e1000_mac_ops_82575 = {
38207 +static const struct e1000_mac_operations e1000_mac_ops_82575 = {
38208 .reset_hw = igb_reset_hw_82575,
38209 .init_hw = igb_init_hw_82575,
38210 .check_for_link = igb_check_for_link_82575,
38211 @@ -1420,13 +1420,13 @@ static struct e1000_mac_operations e1000_mac_ops_82575 = {
38212 .get_speed_and_duplex = igb_get_speed_and_duplex_copper,
38213 };
38214
38215 -static struct e1000_phy_operations e1000_phy_ops_82575 = {
38216 +static const struct e1000_phy_operations e1000_phy_ops_82575 = {
38217 .acquire = igb_acquire_phy_82575,
38218 .get_cfg_done = igb_get_cfg_done_82575,
38219 .release = igb_release_phy_82575,
38220 };
38221
38222 -static struct e1000_nvm_operations e1000_nvm_ops_82575 = {
38223 +static const struct e1000_nvm_operations e1000_nvm_ops_82575 = {
38224 .acquire = igb_acquire_nvm_82575,
38225 .read = igb_read_nvm_eerd,
38226 .release = igb_release_nvm_82575,
38227 diff --git a/drivers/net/igb/e1000_hw.h b/drivers/net/igb/e1000_hw.h
38228 index 72081df..d855cf5 100644
38229 --- a/drivers/net/igb/e1000_hw.h
38230 +++ b/drivers/net/igb/e1000_hw.h
38231 @@ -288,6 +288,7 @@ struct e1000_mac_operations {
38232 s32 (*read_mac_addr)(struct e1000_hw *);
38233 s32 (*get_speed_and_duplex)(struct e1000_hw *, u16 *, u16 *);
38234 };
38235 +typedef struct e1000_mac_operations __no_const e1000_mac_operations_no_const;
38236
38237 struct e1000_phy_operations {
38238 s32 (*acquire)(struct e1000_hw *);
38239 @@ -303,6 +304,7 @@ struct e1000_phy_operations {
38240 s32 (*set_d3_lplu_state)(struct e1000_hw *, bool);
38241 s32 (*write_reg)(struct e1000_hw *, u32, u16);
38242 };
38243 +typedef struct e1000_phy_operations __no_const e1000_phy_operations_no_const;
38244
38245 struct e1000_nvm_operations {
38246 s32 (*acquire)(struct e1000_hw *);
38247 @@ -310,6 +312,7 @@ struct e1000_nvm_operations {
38248 void (*release)(struct e1000_hw *);
38249 s32 (*write)(struct e1000_hw *, u16, u16, u16 *);
38250 };
38251 +typedef struct e1000_nvm_operations __no_const e1000_nvm_operations_no_const;
38252
38253 struct e1000_info {
38254 s32 (*get_invariants)(struct e1000_hw *);
38255 @@ -321,7 +324,7 @@ struct e1000_info {
38256 extern const struct e1000_info e1000_82575_info;
38257
38258 struct e1000_mac_info {
38259 - struct e1000_mac_operations ops;
38260 + e1000_mac_operations_no_const ops;
38261
38262 u8 addr[6];
38263 u8 perm_addr[6];
38264 @@ -365,7 +368,7 @@ struct e1000_mac_info {
38265 };
38266
38267 struct e1000_phy_info {
38268 - struct e1000_phy_operations ops;
38269 + e1000_phy_operations_no_const ops;
38270
38271 enum e1000_phy_type type;
38272
38273 @@ -400,7 +403,7 @@ struct e1000_phy_info {
38274 };
38275
38276 struct e1000_nvm_info {
38277 - struct e1000_nvm_operations ops;
38278 + e1000_nvm_operations_no_const ops;
38279
38280 enum e1000_nvm_type type;
38281 enum e1000_nvm_override override;
38282 @@ -446,6 +449,7 @@ struct e1000_mbx_operations {
38283 s32 (*check_for_ack)(struct e1000_hw *, u16);
38284 s32 (*check_for_rst)(struct e1000_hw *, u16);
38285 };
38286 +typedef struct e1000_mbx_operations __no_const e1000_mbx_operations_no_const;
38287
38288 struct e1000_mbx_stats {
38289 u32 msgs_tx;
38290 @@ -457,7 +461,7 @@ struct e1000_mbx_stats {
38291 };
38292
38293 struct e1000_mbx_info {
38294 - struct e1000_mbx_operations ops;
38295 + e1000_mbx_operations_no_const ops;
38296 struct e1000_mbx_stats stats;
38297 u32 timeout;
38298 u32 usec_delay;
38299 diff --git a/drivers/net/igbvf/vf.h b/drivers/net/igbvf/vf.h
38300 index 1e8ce37..549c453 100644
38301 --- a/drivers/net/igbvf/vf.h
38302 +++ b/drivers/net/igbvf/vf.h
38303 @@ -187,9 +187,10 @@ struct e1000_mac_operations {
38304 s32 (*read_mac_addr)(struct e1000_hw *);
38305 s32 (*set_vfta)(struct e1000_hw *, u16, bool);
38306 };
38307 +typedef struct e1000_mac_operations __no_const e1000_mac_operations_no_const;
38308
38309 struct e1000_mac_info {
38310 - struct e1000_mac_operations ops;
38311 + e1000_mac_operations_no_const ops;
38312 u8 addr[6];
38313 u8 perm_addr[6];
38314
38315 @@ -211,6 +212,7 @@ struct e1000_mbx_operations {
38316 s32 (*check_for_ack)(struct e1000_hw *);
38317 s32 (*check_for_rst)(struct e1000_hw *);
38318 };
38319 +typedef struct e1000_mbx_operations __no_const e1000_mbx_operations_no_const;
38320
38321 struct e1000_mbx_stats {
38322 u32 msgs_tx;
38323 @@ -222,7 +224,7 @@ struct e1000_mbx_stats {
38324 };
38325
38326 struct e1000_mbx_info {
38327 - struct e1000_mbx_operations ops;
38328 + e1000_mbx_operations_no_const ops;
38329 struct e1000_mbx_stats stats;
38330 u32 timeout;
38331 u32 usec_delay;
38332 diff --git a/drivers/net/iseries_veth.c b/drivers/net/iseries_veth.c
38333 index aa7286b..a61394f 100644
38334 --- a/drivers/net/iseries_veth.c
38335 +++ b/drivers/net/iseries_veth.c
38336 @@ -384,7 +384,7 @@ static struct attribute *veth_cnx_default_attrs[] = {
38337 NULL
38338 };
38339
38340 -static struct sysfs_ops veth_cnx_sysfs_ops = {
38341 +static const struct sysfs_ops veth_cnx_sysfs_ops = {
38342 .show = veth_cnx_attribute_show
38343 };
38344
38345 @@ -441,7 +441,7 @@ static struct attribute *veth_port_default_attrs[] = {
38346 NULL
38347 };
38348
38349 -static struct sysfs_ops veth_port_sysfs_ops = {
38350 +static const struct sysfs_ops veth_port_sysfs_ops = {
38351 .show = veth_port_attribute_show
38352 };
38353
38354 diff --git a/drivers/net/ixgb/ixgb_main.c b/drivers/net/ixgb/ixgb_main.c
38355 index 8aa44dc..fa1e797 100644
38356 --- a/drivers/net/ixgb/ixgb_main.c
38357 +++ b/drivers/net/ixgb/ixgb_main.c
38358 @@ -1052,6 +1052,8 @@ ixgb_set_multi(struct net_device *netdev)
38359 u32 rctl;
38360 int i;
38361
38362 + pax_track_stack();
38363 +
38364 /* Check for Promiscuous and All Multicast modes */
38365
38366 rctl = IXGB_READ_REG(hw, RCTL);
38367 diff --git a/drivers/net/ixgb/ixgb_param.c b/drivers/net/ixgb/ixgb_param.c
38368 index af35e1d..8781785 100644
38369 --- a/drivers/net/ixgb/ixgb_param.c
38370 +++ b/drivers/net/ixgb/ixgb_param.c
38371 @@ -260,6 +260,9 @@ void __devinit
38372 ixgb_check_options(struct ixgb_adapter *adapter)
38373 {
38374 int bd = adapter->bd_number;
38375 +
38376 + pax_track_stack();
38377 +
38378 if (bd >= IXGB_MAX_NIC) {
38379 printk(KERN_NOTICE
38380 "Warning: no configuration for board #%i\n", bd);
38381 diff --git a/drivers/net/ixgbe/ixgbe_type.h b/drivers/net/ixgbe/ixgbe_type.h
38382 index b17aa73..ed74540 100644
38383 --- a/drivers/net/ixgbe/ixgbe_type.h
38384 +++ b/drivers/net/ixgbe/ixgbe_type.h
38385 @@ -2327,6 +2327,7 @@ struct ixgbe_eeprom_operations {
38386 s32 (*validate_checksum)(struct ixgbe_hw *, u16 *);
38387 s32 (*update_checksum)(struct ixgbe_hw *);
38388 };
38389 +typedef struct ixgbe_eeprom_operations __no_const ixgbe_eeprom_operations_no_const;
38390
38391 struct ixgbe_mac_operations {
38392 s32 (*init_hw)(struct ixgbe_hw *);
38393 @@ -2376,6 +2377,7 @@ struct ixgbe_mac_operations {
38394 /* Flow Control */
38395 s32 (*fc_enable)(struct ixgbe_hw *, s32);
38396 };
38397 +typedef struct ixgbe_mac_operations __no_const ixgbe_mac_operations_no_const;
38398
38399 struct ixgbe_phy_operations {
38400 s32 (*identify)(struct ixgbe_hw *);
38401 @@ -2394,9 +2396,10 @@ struct ixgbe_phy_operations {
38402 s32 (*read_i2c_eeprom)(struct ixgbe_hw *, u8 , u8 *);
38403 s32 (*write_i2c_eeprom)(struct ixgbe_hw *, u8, u8);
38404 };
38405 +typedef struct ixgbe_phy_operations __no_const ixgbe_phy_operations_no_const;
38406
38407 struct ixgbe_eeprom_info {
38408 - struct ixgbe_eeprom_operations ops;
38409 + ixgbe_eeprom_operations_no_const ops;
38410 enum ixgbe_eeprom_type type;
38411 u32 semaphore_delay;
38412 u16 word_size;
38413 @@ -2404,7 +2407,7 @@ struct ixgbe_eeprom_info {
38414 };
38415
38416 struct ixgbe_mac_info {
38417 - struct ixgbe_mac_operations ops;
38418 + ixgbe_mac_operations_no_const ops;
38419 enum ixgbe_mac_type type;
38420 u8 addr[IXGBE_ETH_LENGTH_OF_ADDRESS];
38421 u8 perm_addr[IXGBE_ETH_LENGTH_OF_ADDRESS];
38422 @@ -2423,7 +2426,7 @@ struct ixgbe_mac_info {
38423 };
38424
38425 struct ixgbe_phy_info {
38426 - struct ixgbe_phy_operations ops;
38427 + ixgbe_phy_operations_no_const ops;
38428 struct mdio_if_info mdio;
38429 enum ixgbe_phy_type type;
38430 u32 id;
38431 diff --git a/drivers/net/mlx4/main.c b/drivers/net/mlx4/main.c
38432 index 291a505..2543756 100644
38433 --- a/drivers/net/mlx4/main.c
38434 +++ b/drivers/net/mlx4/main.c
38435 @@ -38,6 +38,7 @@
38436 #include <linux/errno.h>
38437 #include <linux/pci.h>
38438 #include <linux/dma-mapping.h>
38439 +#include <linux/sched.h>
38440
38441 #include <linux/mlx4/device.h>
38442 #include <linux/mlx4/doorbell.h>
38443 @@ -730,6 +731,8 @@ static int mlx4_init_hca(struct mlx4_dev *dev)
38444 u64 icm_size;
38445 int err;
38446
38447 + pax_track_stack();
38448 +
38449 err = mlx4_QUERY_FW(dev);
38450 if (err) {
38451 if (err == -EACCES)
38452 diff --git a/drivers/net/niu.c b/drivers/net/niu.c
38453 index 2dce134..fa5ce75 100644
38454 --- a/drivers/net/niu.c
38455 +++ b/drivers/net/niu.c
38456 @@ -9128,6 +9128,8 @@ static void __devinit niu_try_msix(struct niu *np, u8 *ldg_num_map)
38457 int i, num_irqs, err;
38458 u8 first_ldg;
38459
38460 + pax_track_stack();
38461 +
38462 first_ldg = (NIU_NUM_LDG / parent->num_ports) * np->port;
38463 for (i = 0; i < (NIU_NUM_LDG / parent->num_ports); i++)
38464 ldg_num_map[i] = first_ldg + i;
38465 diff --git a/drivers/net/pcnet32.c b/drivers/net/pcnet32.c
38466 index c1b3f09..97cd8c4 100644
38467 --- a/drivers/net/pcnet32.c
38468 +++ b/drivers/net/pcnet32.c
38469 @@ -79,7 +79,7 @@ static int cards_found;
38470 /*
38471 * VLB I/O addresses
38472 */
38473 -static unsigned int pcnet32_portlist[] __initdata =
38474 +static unsigned int pcnet32_portlist[] __devinitdata =
38475 { 0x300, 0x320, 0x340, 0x360, 0 };
38476
38477 static int pcnet32_debug = 0;
38478 @@ -267,7 +267,7 @@ struct pcnet32_private {
38479 struct sk_buff **rx_skbuff;
38480 dma_addr_t *tx_dma_addr;
38481 dma_addr_t *rx_dma_addr;
38482 - struct pcnet32_access a;
38483 + struct pcnet32_access *a;
38484 spinlock_t lock; /* Guard lock */
38485 unsigned int cur_rx, cur_tx; /* The next free ring entry */
38486 unsigned int rx_ring_size; /* current rx ring size */
38487 @@ -457,9 +457,9 @@ static void pcnet32_netif_start(struct net_device *dev)
38488 u16 val;
38489
38490 netif_wake_queue(dev);
38491 - val = lp->a.read_csr(ioaddr, CSR3);
38492 + val = lp->a->read_csr(ioaddr, CSR3);
38493 val &= 0x00ff;
38494 - lp->a.write_csr(ioaddr, CSR3, val);
38495 + lp->a->write_csr(ioaddr, CSR3, val);
38496 napi_enable(&lp->napi);
38497 }
38498
38499 @@ -744,7 +744,7 @@ static u32 pcnet32_get_link(struct net_device *dev)
38500 r = mii_link_ok(&lp->mii_if);
38501 } else if (lp->chip_version >= PCNET32_79C970A) {
38502 ulong ioaddr = dev->base_addr; /* card base I/O address */
38503 - r = (lp->a.read_bcr(ioaddr, 4) != 0xc0);
38504 + r = (lp->a->read_bcr(ioaddr, 4) != 0xc0);
38505 } else { /* can not detect link on really old chips */
38506 r = 1;
38507 }
38508 @@ -806,7 +806,7 @@ static int pcnet32_set_ringparam(struct net_device *dev,
38509 pcnet32_netif_stop(dev);
38510
38511 spin_lock_irqsave(&lp->lock, flags);
38512 - lp->a.write_csr(ioaddr, CSR0, CSR0_STOP); /* stop the chip */
38513 + lp->a->write_csr(ioaddr, CSR0, CSR0_STOP); /* stop the chip */
38514
38515 size = min(ering->tx_pending, (unsigned int)TX_MAX_RING_SIZE);
38516
38517 @@ -886,7 +886,7 @@ static void pcnet32_ethtool_test(struct net_device *dev,
38518 static int pcnet32_loopback_test(struct net_device *dev, uint64_t * data1)
38519 {
38520 struct pcnet32_private *lp = netdev_priv(dev);
38521 - struct pcnet32_access *a = &lp->a; /* access to registers */
38522 + struct pcnet32_access *a = lp->a; /* access to registers */
38523 ulong ioaddr = dev->base_addr; /* card base I/O address */
38524 struct sk_buff *skb; /* sk buff */
38525 int x, i; /* counters */
38526 @@ -906,21 +906,21 @@ static int pcnet32_loopback_test(struct net_device *dev, uint64_t * data1)
38527 pcnet32_netif_stop(dev);
38528
38529 spin_lock_irqsave(&lp->lock, flags);
38530 - lp->a.write_csr(ioaddr, CSR0, CSR0_STOP); /* stop the chip */
38531 + lp->a->write_csr(ioaddr, CSR0, CSR0_STOP); /* stop the chip */
38532
38533 numbuffs = min(numbuffs, (int)min(lp->rx_ring_size, lp->tx_ring_size));
38534
38535 /* Reset the PCNET32 */
38536 - lp->a.reset(ioaddr);
38537 - lp->a.write_csr(ioaddr, CSR4, 0x0915); /* auto tx pad */
38538 + lp->a->reset(ioaddr);
38539 + lp->a->write_csr(ioaddr, CSR4, 0x0915); /* auto tx pad */
38540
38541 /* switch pcnet32 to 32bit mode */
38542 - lp->a.write_bcr(ioaddr, 20, 2);
38543 + lp->a->write_bcr(ioaddr, 20, 2);
38544
38545 /* purge & init rings but don't actually restart */
38546 pcnet32_restart(dev, 0x0000);
38547
38548 - lp->a.write_csr(ioaddr, CSR0, CSR0_STOP); /* Set STOP bit */
38549 + lp->a->write_csr(ioaddr, CSR0, CSR0_STOP); /* Set STOP bit */
38550
38551 /* Initialize Transmit buffers. */
38552 size = data_len + 15;
38553 @@ -966,10 +966,10 @@ static int pcnet32_loopback_test(struct net_device *dev, uint64_t * data1)
38554
38555 /* set int loopback in CSR15 */
38556 x = a->read_csr(ioaddr, CSR15) & 0xfffc;
38557 - lp->a.write_csr(ioaddr, CSR15, x | 0x0044);
38558 + lp->a->write_csr(ioaddr, CSR15, x | 0x0044);
38559
38560 teststatus = cpu_to_le16(0x8000);
38561 - lp->a.write_csr(ioaddr, CSR0, CSR0_START); /* Set STRT bit */
38562 + lp->a->write_csr(ioaddr, CSR0, CSR0_START); /* Set STRT bit */
38563
38564 /* Check status of descriptors */
38565 for (x = 0; x < numbuffs; x++) {
38566 @@ -990,7 +990,7 @@ static int pcnet32_loopback_test(struct net_device *dev, uint64_t * data1)
38567 }
38568 }
38569
38570 - lp->a.write_csr(ioaddr, CSR0, CSR0_STOP); /* Set STOP bit */
38571 + lp->a->write_csr(ioaddr, CSR0, CSR0_STOP); /* Set STOP bit */
38572 wmb();
38573 if (netif_msg_hw(lp) && netif_msg_pktdata(lp)) {
38574 printk(KERN_DEBUG "%s: RX loopback packets:\n", dev->name);
38575 @@ -1039,7 +1039,7 @@ static int pcnet32_loopback_test(struct net_device *dev, uint64_t * data1)
38576 pcnet32_restart(dev, CSR0_NORMAL);
38577 } else {
38578 pcnet32_purge_rx_ring(dev);
38579 - lp->a.write_bcr(ioaddr, 20, 4); /* return to 16bit mode */
38580 + lp->a->write_bcr(ioaddr, 20, 4); /* return to 16bit mode */
38581 }
38582 spin_unlock_irqrestore(&lp->lock, flags);
38583
38584 @@ -1049,7 +1049,7 @@ static int pcnet32_loopback_test(struct net_device *dev, uint64_t * data1)
38585 static void pcnet32_led_blink_callback(struct net_device *dev)
38586 {
38587 struct pcnet32_private *lp = netdev_priv(dev);
38588 - struct pcnet32_access *a = &lp->a;
38589 + struct pcnet32_access *a = lp->a;
38590 ulong ioaddr = dev->base_addr;
38591 unsigned long flags;
38592 int i;
38593 @@ -1066,7 +1066,7 @@ static void pcnet32_led_blink_callback(struct net_device *dev)
38594 static int pcnet32_phys_id(struct net_device *dev, u32 data)
38595 {
38596 struct pcnet32_private *lp = netdev_priv(dev);
38597 - struct pcnet32_access *a = &lp->a;
38598 + struct pcnet32_access *a = lp->a;
38599 ulong ioaddr = dev->base_addr;
38600 unsigned long flags;
38601 int i, regs[4];
38602 @@ -1112,7 +1112,7 @@ static int pcnet32_suspend(struct net_device *dev, unsigned long *flags,
38603 {
38604 int csr5;
38605 struct pcnet32_private *lp = netdev_priv(dev);
38606 - struct pcnet32_access *a = &lp->a;
38607 + struct pcnet32_access *a = lp->a;
38608 ulong ioaddr = dev->base_addr;
38609 int ticks;
38610
38611 @@ -1388,8 +1388,8 @@ static int pcnet32_poll(struct napi_struct *napi, int budget)
38612 spin_lock_irqsave(&lp->lock, flags);
38613 if (pcnet32_tx(dev)) {
38614 /* reset the chip to clear the error condition, then restart */
38615 - lp->a.reset(ioaddr);
38616 - lp->a.write_csr(ioaddr, CSR4, 0x0915); /* auto tx pad */
38617 + lp->a->reset(ioaddr);
38618 + lp->a->write_csr(ioaddr, CSR4, 0x0915); /* auto tx pad */
38619 pcnet32_restart(dev, CSR0_START);
38620 netif_wake_queue(dev);
38621 }
38622 @@ -1401,12 +1401,12 @@ static int pcnet32_poll(struct napi_struct *napi, int budget)
38623 __napi_complete(napi);
38624
38625 /* clear interrupt masks */
38626 - val = lp->a.read_csr(ioaddr, CSR3);
38627 + val = lp->a->read_csr(ioaddr, CSR3);
38628 val &= 0x00ff;
38629 - lp->a.write_csr(ioaddr, CSR3, val);
38630 + lp->a->write_csr(ioaddr, CSR3, val);
38631
38632 /* Set interrupt enable. */
38633 - lp->a.write_csr(ioaddr, CSR0, CSR0_INTEN);
38634 + lp->a->write_csr(ioaddr, CSR0, CSR0_INTEN);
38635
38636 spin_unlock_irqrestore(&lp->lock, flags);
38637 }
38638 @@ -1429,7 +1429,7 @@ static void pcnet32_get_regs(struct net_device *dev, struct ethtool_regs *regs,
38639 int i, csr0;
38640 u16 *buff = ptr;
38641 struct pcnet32_private *lp = netdev_priv(dev);
38642 - struct pcnet32_access *a = &lp->a;
38643 + struct pcnet32_access *a = lp->a;
38644 ulong ioaddr = dev->base_addr;
38645 unsigned long flags;
38646
38647 @@ -1466,9 +1466,9 @@ static void pcnet32_get_regs(struct net_device *dev, struct ethtool_regs *regs,
38648 for (j = 0; j < PCNET32_MAX_PHYS; j++) {
38649 if (lp->phymask & (1 << j)) {
38650 for (i = 0; i < PCNET32_REGS_PER_PHY; i++) {
38651 - lp->a.write_bcr(ioaddr, 33,
38652 + lp->a->write_bcr(ioaddr, 33,
38653 (j << 5) | i);
38654 - *buff++ = lp->a.read_bcr(ioaddr, 34);
38655 + *buff++ = lp->a->read_bcr(ioaddr, 34);
38656 }
38657 }
38658 }
38659 @@ -1858,7 +1858,7 @@ pcnet32_probe1(unsigned long ioaddr, int shared, struct pci_dev *pdev)
38660 ((cards_found >= MAX_UNITS) || full_duplex[cards_found]))
38661 lp->options |= PCNET32_PORT_FD;
38662
38663 - lp->a = *a;
38664 + lp->a = a;
38665
38666 /* prior to register_netdev, dev->name is not yet correct */
38667 if (pcnet32_alloc_ring(dev, pci_name(lp->pci_dev))) {
38668 @@ -1917,7 +1917,7 @@ pcnet32_probe1(unsigned long ioaddr, int shared, struct pci_dev *pdev)
38669 if (lp->mii) {
38670 /* lp->phycount and lp->phymask are set to 0 by memset above */
38671
38672 - lp->mii_if.phy_id = ((lp->a.read_bcr(ioaddr, 33)) >> 5) & 0x1f;
38673 + lp->mii_if.phy_id = ((lp->a->read_bcr(ioaddr, 33)) >> 5) & 0x1f;
38674 /* scan for PHYs */
38675 for (i = 0; i < PCNET32_MAX_PHYS; i++) {
38676 unsigned short id1, id2;
38677 @@ -1938,7 +1938,7 @@ pcnet32_probe1(unsigned long ioaddr, int shared, struct pci_dev *pdev)
38678 "Found PHY %04x:%04x at address %d.\n",
38679 id1, id2, i);
38680 }
38681 - lp->a.write_bcr(ioaddr, 33, (lp->mii_if.phy_id) << 5);
38682 + lp->a->write_bcr(ioaddr, 33, (lp->mii_if.phy_id) << 5);
38683 if (lp->phycount > 1) {
38684 lp->options |= PCNET32_PORT_MII;
38685 }
38686 @@ -2109,10 +2109,10 @@ static int pcnet32_open(struct net_device *dev)
38687 }
38688
38689 /* Reset the PCNET32 */
38690 - lp->a.reset(ioaddr);
38691 + lp->a->reset(ioaddr);
38692
38693 /* switch pcnet32 to 32bit mode */
38694 - lp->a.write_bcr(ioaddr, 20, 2);
38695 + lp->a->write_bcr(ioaddr, 20, 2);
38696
38697 if (netif_msg_ifup(lp))
38698 printk(KERN_DEBUG
38699 @@ -2122,14 +2122,14 @@ static int pcnet32_open(struct net_device *dev)
38700 (u32) (lp->init_dma_addr));
38701
38702 /* set/reset autoselect bit */
38703 - val = lp->a.read_bcr(ioaddr, 2) & ~2;
38704 + val = lp->a->read_bcr(ioaddr, 2) & ~2;
38705 if (lp->options & PCNET32_PORT_ASEL)
38706 val |= 2;
38707 - lp->a.write_bcr(ioaddr, 2, val);
38708 + lp->a->write_bcr(ioaddr, 2, val);
38709
38710 /* handle full duplex setting */
38711 if (lp->mii_if.full_duplex) {
38712 - val = lp->a.read_bcr(ioaddr, 9) & ~3;
38713 + val = lp->a->read_bcr(ioaddr, 9) & ~3;
38714 if (lp->options & PCNET32_PORT_FD) {
38715 val |= 1;
38716 if (lp->options == (PCNET32_PORT_FD | PCNET32_PORT_AUI))
38717 @@ -2139,14 +2139,14 @@ static int pcnet32_open(struct net_device *dev)
38718 if (lp->chip_version == 0x2627)
38719 val |= 3;
38720 }
38721 - lp->a.write_bcr(ioaddr, 9, val);
38722 + lp->a->write_bcr(ioaddr, 9, val);
38723 }
38724
38725 /* set/reset GPSI bit in test register */
38726 - val = lp->a.read_csr(ioaddr, 124) & ~0x10;
38727 + val = lp->a->read_csr(ioaddr, 124) & ~0x10;
38728 if ((lp->options & PCNET32_PORT_PORTSEL) == PCNET32_PORT_GPSI)
38729 val |= 0x10;
38730 - lp->a.write_csr(ioaddr, 124, val);
38731 + lp->a->write_csr(ioaddr, 124, val);
38732
38733 /* Allied Telesyn AT 2700/2701 FX are 100Mbit only and do not negotiate */
38734 if (pdev && pdev->subsystem_vendor == PCI_VENDOR_ID_AT &&
38735 @@ -2167,24 +2167,24 @@ static int pcnet32_open(struct net_device *dev)
38736 * duplex, and/or enable auto negotiation, and clear DANAS
38737 */
38738 if (lp->mii && !(lp->options & PCNET32_PORT_ASEL)) {
38739 - lp->a.write_bcr(ioaddr, 32,
38740 - lp->a.read_bcr(ioaddr, 32) | 0x0080);
38741 + lp->a->write_bcr(ioaddr, 32,
38742 + lp->a->read_bcr(ioaddr, 32) | 0x0080);
38743 /* disable Auto Negotiation, set 10Mpbs, HD */
38744 - val = lp->a.read_bcr(ioaddr, 32) & ~0xb8;
38745 + val = lp->a->read_bcr(ioaddr, 32) & ~0xb8;
38746 if (lp->options & PCNET32_PORT_FD)
38747 val |= 0x10;
38748 if (lp->options & PCNET32_PORT_100)
38749 val |= 0x08;
38750 - lp->a.write_bcr(ioaddr, 32, val);
38751 + lp->a->write_bcr(ioaddr, 32, val);
38752 } else {
38753 if (lp->options & PCNET32_PORT_ASEL) {
38754 - lp->a.write_bcr(ioaddr, 32,
38755 - lp->a.read_bcr(ioaddr,
38756 + lp->a->write_bcr(ioaddr, 32,
38757 + lp->a->read_bcr(ioaddr,
38758 32) | 0x0080);
38759 /* enable auto negotiate, setup, disable fd */
38760 - val = lp->a.read_bcr(ioaddr, 32) & ~0x98;
38761 + val = lp->a->read_bcr(ioaddr, 32) & ~0x98;
38762 val |= 0x20;
38763 - lp->a.write_bcr(ioaddr, 32, val);
38764 + lp->a->write_bcr(ioaddr, 32, val);
38765 }
38766 }
38767 } else {
38768 @@ -2197,10 +2197,10 @@ static int pcnet32_open(struct net_device *dev)
38769 * There is really no good other way to handle multiple PHYs
38770 * other than turning off all automatics
38771 */
38772 - val = lp->a.read_bcr(ioaddr, 2);
38773 - lp->a.write_bcr(ioaddr, 2, val & ~2);
38774 - val = lp->a.read_bcr(ioaddr, 32);
38775 - lp->a.write_bcr(ioaddr, 32, val & ~(1 << 7)); /* stop MII manager */
38776 + val = lp->a->read_bcr(ioaddr, 2);
38777 + lp->a->write_bcr(ioaddr, 2, val & ~2);
38778 + val = lp->a->read_bcr(ioaddr, 32);
38779 + lp->a->write_bcr(ioaddr, 32, val & ~(1 << 7)); /* stop MII manager */
38780
38781 if (!(lp->options & PCNET32_PORT_ASEL)) {
38782 /* setup ecmd */
38783 @@ -2210,7 +2210,7 @@ static int pcnet32_open(struct net_device *dev)
38784 ecmd.speed =
38785 lp->
38786 options & PCNET32_PORT_100 ? SPEED_100 : SPEED_10;
38787 - bcr9 = lp->a.read_bcr(ioaddr, 9);
38788 + bcr9 = lp->a->read_bcr(ioaddr, 9);
38789
38790 if (lp->options & PCNET32_PORT_FD) {
38791 ecmd.duplex = DUPLEX_FULL;
38792 @@ -2219,7 +2219,7 @@ static int pcnet32_open(struct net_device *dev)
38793 ecmd.duplex = DUPLEX_HALF;
38794 bcr9 |= ~(1 << 0);
38795 }
38796 - lp->a.write_bcr(ioaddr, 9, bcr9);
38797 + lp->a->write_bcr(ioaddr, 9, bcr9);
38798 }
38799
38800 for (i = 0; i < PCNET32_MAX_PHYS; i++) {
38801 @@ -2252,9 +2252,9 @@ static int pcnet32_open(struct net_device *dev)
38802
38803 #ifdef DO_DXSUFLO
38804 if (lp->dxsuflo) { /* Disable transmit stop on underflow */
38805 - val = lp->a.read_csr(ioaddr, CSR3);
38806 + val = lp->a->read_csr(ioaddr, CSR3);
38807 val |= 0x40;
38808 - lp->a.write_csr(ioaddr, CSR3, val);
38809 + lp->a->write_csr(ioaddr, CSR3, val);
38810 }
38811 #endif
38812
38813 @@ -2270,11 +2270,11 @@ static int pcnet32_open(struct net_device *dev)
38814 napi_enable(&lp->napi);
38815
38816 /* Re-initialize the PCNET32, and start it when done. */
38817 - lp->a.write_csr(ioaddr, 1, (lp->init_dma_addr & 0xffff));
38818 - lp->a.write_csr(ioaddr, 2, (lp->init_dma_addr >> 16));
38819 + lp->a->write_csr(ioaddr, 1, (lp->init_dma_addr & 0xffff));
38820 + lp->a->write_csr(ioaddr, 2, (lp->init_dma_addr >> 16));
38821
38822 - lp->a.write_csr(ioaddr, CSR4, 0x0915); /* auto tx pad */
38823 - lp->a.write_csr(ioaddr, CSR0, CSR0_INIT);
38824 + lp->a->write_csr(ioaddr, CSR4, 0x0915); /* auto tx pad */
38825 + lp->a->write_csr(ioaddr, CSR0, CSR0_INIT);
38826
38827 netif_start_queue(dev);
38828
38829 @@ -2286,20 +2286,20 @@ static int pcnet32_open(struct net_device *dev)
38830
38831 i = 0;
38832 while (i++ < 100)
38833 - if (lp->a.read_csr(ioaddr, CSR0) & CSR0_IDON)
38834 + if (lp->a->read_csr(ioaddr, CSR0) & CSR0_IDON)
38835 break;
38836 /*
38837 * We used to clear the InitDone bit, 0x0100, here but Mark Stockton
38838 * reports that doing so triggers a bug in the '974.
38839 */
38840 - lp->a.write_csr(ioaddr, CSR0, CSR0_NORMAL);
38841 + lp->a->write_csr(ioaddr, CSR0, CSR0_NORMAL);
38842
38843 if (netif_msg_ifup(lp))
38844 printk(KERN_DEBUG
38845 "%s: pcnet32 open after %d ticks, init block %#x csr0 %4.4x.\n",
38846 dev->name, i,
38847 (u32) (lp->init_dma_addr),
38848 - lp->a.read_csr(ioaddr, CSR0));
38849 + lp->a->read_csr(ioaddr, CSR0));
38850
38851 spin_unlock_irqrestore(&lp->lock, flags);
38852
38853 @@ -2313,7 +2313,7 @@ static int pcnet32_open(struct net_device *dev)
38854 * Switch back to 16bit mode to avoid problems with dumb
38855 * DOS packet driver after a warm reboot
38856 */
38857 - lp->a.write_bcr(ioaddr, 20, 4);
38858 + lp->a->write_bcr(ioaddr, 20, 4);
38859
38860 err_free_irq:
38861 spin_unlock_irqrestore(&lp->lock, flags);
38862 @@ -2420,7 +2420,7 @@ static void pcnet32_restart(struct net_device *dev, unsigned int csr0_bits)
38863
38864 /* wait for stop */
38865 for (i = 0; i < 100; i++)
38866 - if (lp->a.read_csr(ioaddr, CSR0) & CSR0_STOP)
38867 + if (lp->a->read_csr(ioaddr, CSR0) & CSR0_STOP)
38868 break;
38869
38870 if (i >= 100 && netif_msg_drv(lp))
38871 @@ -2433,13 +2433,13 @@ static void pcnet32_restart(struct net_device *dev, unsigned int csr0_bits)
38872 return;
38873
38874 /* ReInit Ring */
38875 - lp->a.write_csr(ioaddr, CSR0, CSR0_INIT);
38876 + lp->a->write_csr(ioaddr, CSR0, CSR0_INIT);
38877 i = 0;
38878 while (i++ < 1000)
38879 - if (lp->a.read_csr(ioaddr, CSR0) & CSR0_IDON)
38880 + if (lp->a->read_csr(ioaddr, CSR0) & CSR0_IDON)
38881 break;
38882
38883 - lp->a.write_csr(ioaddr, CSR0, csr0_bits);
38884 + lp->a->write_csr(ioaddr, CSR0, csr0_bits);
38885 }
38886
38887 static void pcnet32_tx_timeout(struct net_device *dev)
38888 @@ -2452,8 +2452,8 @@ static void pcnet32_tx_timeout(struct net_device *dev)
38889 if (pcnet32_debug & NETIF_MSG_DRV)
38890 printk(KERN_ERR
38891 "%s: transmit timed out, status %4.4x, resetting.\n",
38892 - dev->name, lp->a.read_csr(ioaddr, CSR0));
38893 - lp->a.write_csr(ioaddr, CSR0, CSR0_STOP);
38894 + dev->name, lp->a->read_csr(ioaddr, CSR0));
38895 + lp->a->write_csr(ioaddr, CSR0, CSR0_STOP);
38896 dev->stats.tx_errors++;
38897 if (netif_msg_tx_err(lp)) {
38898 int i;
38899 @@ -2497,7 +2497,7 @@ static netdev_tx_t pcnet32_start_xmit(struct sk_buff *skb,
38900 if (netif_msg_tx_queued(lp)) {
38901 printk(KERN_DEBUG
38902 "%s: pcnet32_start_xmit() called, csr0 %4.4x.\n",
38903 - dev->name, lp->a.read_csr(ioaddr, CSR0));
38904 + dev->name, lp->a->read_csr(ioaddr, CSR0));
38905 }
38906
38907 /* Default status -- will not enable Successful-TxDone
38908 @@ -2528,7 +2528,7 @@ static netdev_tx_t pcnet32_start_xmit(struct sk_buff *skb,
38909 dev->stats.tx_bytes += skb->len;
38910
38911 /* Trigger an immediate send poll. */
38912 - lp->a.write_csr(ioaddr, CSR0, CSR0_INTEN | CSR0_TXPOLL);
38913 + lp->a->write_csr(ioaddr, CSR0, CSR0_INTEN | CSR0_TXPOLL);
38914
38915 dev->trans_start = jiffies;
38916
38917 @@ -2555,18 +2555,18 @@ pcnet32_interrupt(int irq, void *dev_id)
38918
38919 spin_lock(&lp->lock);
38920
38921 - csr0 = lp->a.read_csr(ioaddr, CSR0);
38922 + csr0 = lp->a->read_csr(ioaddr, CSR0);
38923 while ((csr0 & 0x8f00) && --boguscnt >= 0) {
38924 if (csr0 == 0xffff) {
38925 break; /* PCMCIA remove happened */
38926 }
38927 /* Acknowledge all of the current interrupt sources ASAP. */
38928 - lp->a.write_csr(ioaddr, CSR0, csr0 & ~0x004f);
38929 + lp->a->write_csr(ioaddr, CSR0, csr0 & ~0x004f);
38930
38931 if (netif_msg_intr(lp))
38932 printk(KERN_DEBUG
38933 "%s: interrupt csr0=%#2.2x new csr=%#2.2x.\n",
38934 - dev->name, csr0, lp->a.read_csr(ioaddr, CSR0));
38935 + dev->name, csr0, lp->a->read_csr(ioaddr, CSR0));
38936
38937 /* Log misc errors. */
38938 if (csr0 & 0x4000)
38939 @@ -2595,19 +2595,19 @@ pcnet32_interrupt(int irq, void *dev_id)
38940 if (napi_schedule_prep(&lp->napi)) {
38941 u16 val;
38942 /* set interrupt masks */
38943 - val = lp->a.read_csr(ioaddr, CSR3);
38944 + val = lp->a->read_csr(ioaddr, CSR3);
38945 val |= 0x5f00;
38946 - lp->a.write_csr(ioaddr, CSR3, val);
38947 + lp->a->write_csr(ioaddr, CSR3, val);
38948
38949 __napi_schedule(&lp->napi);
38950 break;
38951 }
38952 - csr0 = lp->a.read_csr(ioaddr, CSR0);
38953 + csr0 = lp->a->read_csr(ioaddr, CSR0);
38954 }
38955
38956 if (netif_msg_intr(lp))
38957 printk(KERN_DEBUG "%s: exiting interrupt, csr0=%#4.4x.\n",
38958 - dev->name, lp->a.read_csr(ioaddr, CSR0));
38959 + dev->name, lp->a->read_csr(ioaddr, CSR0));
38960
38961 spin_unlock(&lp->lock);
38962
38963 @@ -2627,21 +2627,21 @@ static int pcnet32_close(struct net_device *dev)
38964
38965 spin_lock_irqsave(&lp->lock, flags);
38966
38967 - dev->stats.rx_missed_errors = lp->a.read_csr(ioaddr, 112);
38968 + dev->stats.rx_missed_errors = lp->a->read_csr(ioaddr, 112);
38969
38970 if (netif_msg_ifdown(lp))
38971 printk(KERN_DEBUG
38972 "%s: Shutting down ethercard, status was %2.2x.\n",
38973 - dev->name, lp->a.read_csr(ioaddr, CSR0));
38974 + dev->name, lp->a->read_csr(ioaddr, CSR0));
38975
38976 /* We stop the PCNET32 here -- it occasionally polls memory if we don't. */
38977 - lp->a.write_csr(ioaddr, CSR0, CSR0_STOP);
38978 + lp->a->write_csr(ioaddr, CSR0, CSR0_STOP);
38979
38980 /*
38981 * Switch back to 16bit mode to avoid problems with dumb
38982 * DOS packet driver after a warm reboot
38983 */
38984 - lp->a.write_bcr(ioaddr, 20, 4);
38985 + lp->a->write_bcr(ioaddr, 20, 4);
38986
38987 spin_unlock_irqrestore(&lp->lock, flags);
38988
38989 @@ -2664,7 +2664,7 @@ static struct net_device_stats *pcnet32_get_stats(struct net_device *dev)
38990 unsigned long flags;
38991
38992 spin_lock_irqsave(&lp->lock, flags);
38993 - dev->stats.rx_missed_errors = lp->a.read_csr(ioaddr, 112);
38994 + dev->stats.rx_missed_errors = lp->a->read_csr(ioaddr, 112);
38995 spin_unlock_irqrestore(&lp->lock, flags);
38996
38997 return &dev->stats;
38998 @@ -2686,10 +2686,10 @@ static void pcnet32_load_multicast(struct net_device *dev)
38999 if (dev->flags & IFF_ALLMULTI) {
39000 ib->filter[0] = cpu_to_le32(~0U);
39001 ib->filter[1] = cpu_to_le32(~0U);
39002 - lp->a.write_csr(ioaddr, PCNET32_MC_FILTER, 0xffff);
39003 - lp->a.write_csr(ioaddr, PCNET32_MC_FILTER+1, 0xffff);
39004 - lp->a.write_csr(ioaddr, PCNET32_MC_FILTER+2, 0xffff);
39005 - lp->a.write_csr(ioaddr, PCNET32_MC_FILTER+3, 0xffff);
39006 + lp->a->write_csr(ioaddr, PCNET32_MC_FILTER, 0xffff);
39007 + lp->a->write_csr(ioaddr, PCNET32_MC_FILTER+1, 0xffff);
39008 + lp->a->write_csr(ioaddr, PCNET32_MC_FILTER+2, 0xffff);
39009 + lp->a->write_csr(ioaddr, PCNET32_MC_FILTER+3, 0xffff);
39010 return;
39011 }
39012 /* clear the multicast filter */
39013 @@ -2710,7 +2710,7 @@ static void pcnet32_load_multicast(struct net_device *dev)
39014 mcast_table[crc >> 4] |= cpu_to_le16(1 << (crc & 0xf));
39015 }
39016 for (i = 0; i < 4; i++)
39017 - lp->a.write_csr(ioaddr, PCNET32_MC_FILTER + i,
39018 + lp->a->write_csr(ioaddr, PCNET32_MC_FILTER + i,
39019 le16_to_cpu(mcast_table[i]));
39020 return;
39021 }
39022 @@ -2726,7 +2726,7 @@ static void pcnet32_set_multicast_list(struct net_device *dev)
39023
39024 spin_lock_irqsave(&lp->lock, flags);
39025 suspended = pcnet32_suspend(dev, &flags, 0);
39026 - csr15 = lp->a.read_csr(ioaddr, CSR15);
39027 + csr15 = lp->a->read_csr(ioaddr, CSR15);
39028 if (dev->flags & IFF_PROMISC) {
39029 /* Log any net taps. */
39030 if (netif_msg_hw(lp))
39031 @@ -2735,21 +2735,21 @@ static void pcnet32_set_multicast_list(struct net_device *dev)
39032 lp->init_block->mode =
39033 cpu_to_le16(0x8000 | (lp->options & PCNET32_PORT_PORTSEL) <<
39034 7);
39035 - lp->a.write_csr(ioaddr, CSR15, csr15 | 0x8000);
39036 + lp->a->write_csr(ioaddr, CSR15, csr15 | 0x8000);
39037 } else {
39038 lp->init_block->mode =
39039 cpu_to_le16((lp->options & PCNET32_PORT_PORTSEL) << 7);
39040 - lp->a.write_csr(ioaddr, CSR15, csr15 & 0x7fff);
39041 + lp->a->write_csr(ioaddr, CSR15, csr15 & 0x7fff);
39042 pcnet32_load_multicast(dev);
39043 }
39044
39045 if (suspended) {
39046 int csr5;
39047 /* clear SUSPEND (SPND) - CSR5 bit 0 */
39048 - csr5 = lp->a.read_csr(ioaddr, CSR5);
39049 - lp->a.write_csr(ioaddr, CSR5, csr5 & (~CSR5_SUSPEND));
39050 + csr5 = lp->a->read_csr(ioaddr, CSR5);
39051 + lp->a->write_csr(ioaddr, CSR5, csr5 & (~CSR5_SUSPEND));
39052 } else {
39053 - lp->a.write_csr(ioaddr, CSR0, CSR0_STOP);
39054 + lp->a->write_csr(ioaddr, CSR0, CSR0_STOP);
39055 pcnet32_restart(dev, CSR0_NORMAL);
39056 netif_wake_queue(dev);
39057 }
39058 @@ -2767,8 +2767,8 @@ static int mdio_read(struct net_device *dev, int phy_id, int reg_num)
39059 if (!lp->mii)
39060 return 0;
39061
39062 - lp->a.write_bcr(ioaddr, 33, ((phy_id & 0x1f) << 5) | (reg_num & 0x1f));
39063 - val_out = lp->a.read_bcr(ioaddr, 34);
39064 + lp->a->write_bcr(ioaddr, 33, ((phy_id & 0x1f) << 5) | (reg_num & 0x1f));
39065 + val_out = lp->a->read_bcr(ioaddr, 34);
39066
39067 return val_out;
39068 }
39069 @@ -2782,8 +2782,8 @@ static void mdio_write(struct net_device *dev, int phy_id, int reg_num, int val)
39070 if (!lp->mii)
39071 return;
39072
39073 - lp->a.write_bcr(ioaddr, 33, ((phy_id & 0x1f) << 5) | (reg_num & 0x1f));
39074 - lp->a.write_bcr(ioaddr, 34, val);
39075 + lp->a->write_bcr(ioaddr, 33, ((phy_id & 0x1f) << 5) | (reg_num & 0x1f));
39076 + lp->a->write_bcr(ioaddr, 34, val);
39077 }
39078
39079 static int pcnet32_ioctl(struct net_device *dev, struct ifreq *rq, int cmd)
39080 @@ -2862,7 +2862,7 @@ static void pcnet32_check_media(struct net_device *dev, int verbose)
39081 curr_link = mii_link_ok(&lp->mii_if);
39082 } else {
39083 ulong ioaddr = dev->base_addr; /* card base I/O address */
39084 - curr_link = (lp->a.read_bcr(ioaddr, 4) != 0xc0);
39085 + curr_link = (lp->a->read_bcr(ioaddr, 4) != 0xc0);
39086 }
39087 if (!curr_link) {
39088 if (prev_link || verbose) {
39089 @@ -2887,13 +2887,13 @@ static void pcnet32_check_media(struct net_device *dev, int verbose)
39090 (ecmd.duplex ==
39091 DUPLEX_FULL) ? "full" : "half");
39092 }
39093 - bcr9 = lp->a.read_bcr(dev->base_addr, 9);
39094 + bcr9 = lp->a->read_bcr(dev->base_addr, 9);
39095 if ((bcr9 & (1 << 0)) != lp->mii_if.full_duplex) {
39096 if (lp->mii_if.full_duplex)
39097 bcr9 |= (1 << 0);
39098 else
39099 bcr9 &= ~(1 << 0);
39100 - lp->a.write_bcr(dev->base_addr, 9, bcr9);
39101 + lp->a->write_bcr(dev->base_addr, 9, bcr9);
39102 }
39103 } else {
39104 if (netif_msg_link(lp))
39105 diff --git a/drivers/net/sis190.c b/drivers/net/sis190.c
39106 index 7cc9898..6eb50d3 100644
39107 --- a/drivers/net/sis190.c
39108 +++ b/drivers/net/sis190.c
39109 @@ -1598,7 +1598,7 @@ static int __devinit sis190_get_mac_addr_from_eeprom(struct pci_dev *pdev,
39110 static int __devinit sis190_get_mac_addr_from_apc(struct pci_dev *pdev,
39111 struct net_device *dev)
39112 {
39113 - static const u16 __devinitdata ids[] = { 0x0965, 0x0966, 0x0968 };
39114 + static const u16 __devinitconst ids[] = { 0x0965, 0x0966, 0x0968 };
39115 struct sis190_private *tp = netdev_priv(dev);
39116 struct pci_dev *isa_bridge;
39117 u8 reg, tmp8;
39118 diff --git a/drivers/net/sundance.c b/drivers/net/sundance.c
39119 index e13685a..60c948c 100644
39120 --- a/drivers/net/sundance.c
39121 +++ b/drivers/net/sundance.c
39122 @@ -225,7 +225,7 @@ enum {
39123 struct pci_id_info {
39124 const char *name;
39125 };
39126 -static const struct pci_id_info pci_id_tbl[] __devinitdata = {
39127 +static const struct pci_id_info pci_id_tbl[] __devinitconst = {
39128 {"D-Link DFE-550TX FAST Ethernet Adapter"},
39129 {"D-Link DFE-550FX 100Mbps Fiber-optics Adapter"},
39130 {"D-Link DFE-580TX 4 port Server Adapter"},
39131 diff --git a/drivers/net/tg3.h b/drivers/net/tg3.h
39132 index 529f55a..cccaa18 100644
39133 --- a/drivers/net/tg3.h
39134 +++ b/drivers/net/tg3.h
39135 @@ -95,6 +95,7 @@
39136 #define CHIPREV_ID_5750_A0 0x4000
39137 #define CHIPREV_ID_5750_A1 0x4001
39138 #define CHIPREV_ID_5750_A3 0x4003
39139 +#define CHIPREV_ID_5750_C1 0x4201
39140 #define CHIPREV_ID_5750_C2 0x4202
39141 #define CHIPREV_ID_5752_A0_HW 0x5000
39142 #define CHIPREV_ID_5752_A0 0x6000
39143 diff --git a/drivers/net/tokenring/abyss.c b/drivers/net/tokenring/abyss.c
39144 index b9db1b5..720f9ce 100644
39145 --- a/drivers/net/tokenring/abyss.c
39146 +++ b/drivers/net/tokenring/abyss.c
39147 @@ -451,10 +451,12 @@ static struct pci_driver abyss_driver = {
39148
39149 static int __init abyss_init (void)
39150 {
39151 - abyss_netdev_ops = tms380tr_netdev_ops;
39152 + pax_open_kernel();
39153 + memcpy((void *)&abyss_netdev_ops, &tms380tr_netdev_ops, sizeof(tms380tr_netdev_ops));
39154
39155 - abyss_netdev_ops.ndo_open = abyss_open;
39156 - abyss_netdev_ops.ndo_stop = abyss_close;
39157 + *(void **)&abyss_netdev_ops.ndo_open = abyss_open;
39158 + *(void **)&abyss_netdev_ops.ndo_stop = abyss_close;
39159 + pax_close_kernel();
39160
39161 return pci_register_driver(&abyss_driver);
39162 }
39163 diff --git a/drivers/net/tokenring/madgemc.c b/drivers/net/tokenring/madgemc.c
39164 index 456f8bf..373e56d 100644
39165 --- a/drivers/net/tokenring/madgemc.c
39166 +++ b/drivers/net/tokenring/madgemc.c
39167 @@ -755,9 +755,11 @@ static struct mca_driver madgemc_driver = {
39168
39169 static int __init madgemc_init (void)
39170 {
39171 - madgemc_netdev_ops = tms380tr_netdev_ops;
39172 - madgemc_netdev_ops.ndo_open = madgemc_open;
39173 - madgemc_netdev_ops.ndo_stop = madgemc_close;
39174 + pax_open_kernel();
39175 + memcpy((void *)&madgemc_netdev_ops, &tms380tr_netdev_ops, sizeof(tms380tr_netdev_ops));
39176 + *(void **)&madgemc_netdev_ops.ndo_open = madgemc_open;
39177 + *(void **)&madgemc_netdev_ops.ndo_stop = madgemc_close;
39178 + pax_close_kernel();
39179
39180 return mca_register_driver (&madgemc_driver);
39181 }
39182 diff --git a/drivers/net/tokenring/proteon.c b/drivers/net/tokenring/proteon.c
39183 index 16e8783..925bd49 100644
39184 --- a/drivers/net/tokenring/proteon.c
39185 +++ b/drivers/net/tokenring/proteon.c
39186 @@ -353,9 +353,11 @@ static int __init proteon_init(void)
39187 struct platform_device *pdev;
39188 int i, num = 0, err = 0;
39189
39190 - proteon_netdev_ops = tms380tr_netdev_ops;
39191 - proteon_netdev_ops.ndo_open = proteon_open;
39192 - proteon_netdev_ops.ndo_stop = tms380tr_close;
39193 + pax_open_kernel();
39194 + memcpy((void *)&proteon_netdev_ops, &tms380tr_netdev_ops, sizeof(tms380tr_netdev_ops));
39195 + *(void **)&proteon_netdev_ops.ndo_open = proteon_open;
39196 + *(void **)&proteon_netdev_ops.ndo_stop = tms380tr_close;
39197 + pax_close_kernel();
39198
39199 err = platform_driver_register(&proteon_driver);
39200 if (err)
39201 diff --git a/drivers/net/tokenring/skisa.c b/drivers/net/tokenring/skisa.c
39202 index 46db5c5..37c1536 100644
39203 --- a/drivers/net/tokenring/skisa.c
39204 +++ b/drivers/net/tokenring/skisa.c
39205 @@ -363,9 +363,11 @@ static int __init sk_isa_init(void)
39206 struct platform_device *pdev;
39207 int i, num = 0, err = 0;
39208
39209 - sk_isa_netdev_ops = tms380tr_netdev_ops;
39210 - sk_isa_netdev_ops.ndo_open = sk_isa_open;
39211 - sk_isa_netdev_ops.ndo_stop = tms380tr_close;
39212 + pax_open_kernel();
39213 + memcpy((void *)&sk_isa_netdev_ops, &tms380tr_netdev_ops, sizeof(tms380tr_netdev_ops));
39214 + *(void **)&sk_isa_netdev_ops.ndo_open = sk_isa_open;
39215 + *(void **)&sk_isa_netdev_ops.ndo_stop = tms380tr_close;
39216 + pax_close_kernel();
39217
39218 err = platform_driver_register(&sk_isa_driver);
39219 if (err)
39220 diff --git a/drivers/net/tulip/de2104x.c b/drivers/net/tulip/de2104x.c
39221 index 74e5ba4..5cf6bc9 100644
39222 --- a/drivers/net/tulip/de2104x.c
39223 +++ b/drivers/net/tulip/de2104x.c
39224 @@ -1785,6 +1785,8 @@ static void __devinit de21041_get_srom_info (struct de_private *de)
39225 struct de_srom_info_leaf *il;
39226 void *bufp;
39227
39228 + pax_track_stack();
39229 +
39230 /* download entire eeprom */
39231 for (i = 0; i < DE_EEPROM_WORDS; i++)
39232 ((__le16 *)ee_data)[i] =
39233 diff --git a/drivers/net/tulip/de4x5.c b/drivers/net/tulip/de4x5.c
39234 index a8349b7..90f9dfe 100644
39235 --- a/drivers/net/tulip/de4x5.c
39236 +++ b/drivers/net/tulip/de4x5.c
39237 @@ -5472,7 +5472,7 @@ de4x5_ioctl(struct net_device *dev, struct ifreq *rq, int cmd)
39238 for (i=0; i<ETH_ALEN; i++) {
39239 tmp.addr[i] = dev->dev_addr[i];
39240 }
39241 - if (copy_to_user(ioc->data, tmp.addr, ioc->len)) return -EFAULT;
39242 + if (ioc->len > sizeof tmp.addr || copy_to_user(ioc->data, tmp.addr, ioc->len)) return -EFAULT;
39243 break;
39244
39245 case DE4X5_SET_HWADDR: /* Set the hardware address */
39246 @@ -5512,7 +5512,7 @@ de4x5_ioctl(struct net_device *dev, struct ifreq *rq, int cmd)
39247 spin_lock_irqsave(&lp->lock, flags);
39248 memcpy(&statbuf, &lp->pktStats, ioc->len);
39249 spin_unlock_irqrestore(&lp->lock, flags);
39250 - if (copy_to_user(ioc->data, &statbuf, ioc->len))
39251 + if (ioc->len > sizeof statbuf || copy_to_user(ioc->data, &statbuf, ioc->len))
39252 return -EFAULT;
39253 break;
39254 }
39255 diff --git a/drivers/net/tulip/eeprom.c b/drivers/net/tulip/eeprom.c
39256 index 391acd3..56d11cd 100644
39257 --- a/drivers/net/tulip/eeprom.c
39258 +++ b/drivers/net/tulip/eeprom.c
39259 @@ -80,7 +80,7 @@ static struct eeprom_fixup eeprom_fixups[] __devinitdata = {
39260 {NULL}};
39261
39262
39263 -static const char *block_name[] __devinitdata = {
39264 +static const char *block_name[] __devinitconst = {
39265 "21140 non-MII",
39266 "21140 MII PHY",
39267 "21142 Serial PHY",
39268 diff --git a/drivers/net/tulip/winbond-840.c b/drivers/net/tulip/winbond-840.c
39269 index b38d3b7..b1cff23 100644
39270 --- a/drivers/net/tulip/winbond-840.c
39271 +++ b/drivers/net/tulip/winbond-840.c
39272 @@ -235,7 +235,7 @@ struct pci_id_info {
39273 int drv_flags; /* Driver use, intended as capability flags. */
39274 };
39275
39276 -static const struct pci_id_info pci_id_tbl[] __devinitdata = {
39277 +static const struct pci_id_info pci_id_tbl[] __devinitconst = {
39278 { /* Sometime a Level-One switch card. */
39279 "Winbond W89c840", CanHaveMII | HasBrokenTx | FDXOnNoMII},
39280 { "Winbond W89c840", CanHaveMII | HasBrokenTx},
39281 diff --git a/drivers/net/usb/hso.c b/drivers/net/usb/hso.c
39282 index f450bc9..2b747c8 100644
39283 --- a/drivers/net/usb/hso.c
39284 +++ b/drivers/net/usb/hso.c
39285 @@ -71,7 +71,7 @@
39286 #include <asm/byteorder.h>
39287 #include <linux/serial_core.h>
39288 #include <linux/serial.h>
39289 -
39290 +#include <asm/local.h>
39291
39292 #define DRIVER_VERSION "1.2"
39293 #define MOD_AUTHOR "Option Wireless"
39294 @@ -258,7 +258,7 @@ struct hso_serial {
39295
39296 /* from usb_serial_port */
39297 struct tty_struct *tty;
39298 - int open_count;
39299 + local_t open_count;
39300 spinlock_t serial_lock;
39301
39302 int (*write_data) (struct hso_serial *serial);
39303 @@ -1180,7 +1180,7 @@ static void put_rxbuf_data_and_resubmit_ctrl_urb(struct hso_serial *serial)
39304 struct urb *urb;
39305
39306 urb = serial->rx_urb[0];
39307 - if (serial->open_count > 0) {
39308 + if (local_read(&serial->open_count) > 0) {
39309 count = put_rxbuf_data(urb, serial);
39310 if (count == -1)
39311 return;
39312 @@ -1216,7 +1216,7 @@ static void hso_std_serial_read_bulk_callback(struct urb *urb)
39313 DUMP1(urb->transfer_buffer, urb->actual_length);
39314
39315 /* Anyone listening? */
39316 - if (serial->open_count == 0)
39317 + if (local_read(&serial->open_count) == 0)
39318 return;
39319
39320 if (status == 0) {
39321 @@ -1311,8 +1311,7 @@ static int hso_serial_open(struct tty_struct *tty, struct file *filp)
39322 spin_unlock_irq(&serial->serial_lock);
39323
39324 /* check for port already opened, if not set the termios */
39325 - serial->open_count++;
39326 - if (serial->open_count == 1) {
39327 + if (local_inc_return(&serial->open_count) == 1) {
39328 tty->low_latency = 1;
39329 serial->rx_state = RX_IDLE;
39330 /* Force default termio settings */
39331 @@ -1325,7 +1324,7 @@ static int hso_serial_open(struct tty_struct *tty, struct file *filp)
39332 result = hso_start_serial_device(serial->parent, GFP_KERNEL);
39333 if (result) {
39334 hso_stop_serial_device(serial->parent);
39335 - serial->open_count--;
39336 + local_dec(&serial->open_count);
39337 kref_put(&serial->parent->ref, hso_serial_ref_free);
39338 }
39339 } else {
39340 @@ -1362,10 +1361,10 @@ static void hso_serial_close(struct tty_struct *tty, struct file *filp)
39341
39342 /* reset the rts and dtr */
39343 /* do the actual close */
39344 - serial->open_count--;
39345 + local_dec(&serial->open_count);
39346
39347 - if (serial->open_count <= 0) {
39348 - serial->open_count = 0;
39349 + if (local_read(&serial->open_count) <= 0) {
39350 + local_set(&serial->open_count, 0);
39351 spin_lock_irq(&serial->serial_lock);
39352 if (serial->tty == tty) {
39353 serial->tty->driver_data = NULL;
39354 @@ -1447,7 +1446,7 @@ static void hso_serial_set_termios(struct tty_struct *tty, struct ktermios *old)
39355
39356 /* the actual setup */
39357 spin_lock_irqsave(&serial->serial_lock, flags);
39358 - if (serial->open_count)
39359 + if (local_read(&serial->open_count))
39360 _hso_serial_set_termios(tty, old);
39361 else
39362 tty->termios = old;
39363 @@ -3097,7 +3096,7 @@ static int hso_resume(struct usb_interface *iface)
39364 /* Start all serial ports */
39365 for (i = 0; i < HSO_SERIAL_TTY_MINORS; i++) {
39366 if (serial_table[i] && (serial_table[i]->interface == iface)) {
39367 - if (dev2ser(serial_table[i])->open_count) {
39368 + if (local_read(&dev2ser(serial_table[i])->open_count)) {
39369 result =
39370 hso_start_serial_device(serial_table[i], GFP_NOIO);
39371 hso_kick_transmit(dev2ser(serial_table[i]));
39372 diff --git a/drivers/net/vxge/vxge-config.h b/drivers/net/vxge/vxge-config.h
39373 index 3e94f0c..ffdd926 100644
39374 --- a/drivers/net/vxge/vxge-config.h
39375 +++ b/drivers/net/vxge/vxge-config.h
39376 @@ -474,7 +474,7 @@ struct vxge_hw_uld_cbs {
39377 void (*link_down)(struct __vxge_hw_device *devh);
39378 void (*crit_err)(struct __vxge_hw_device *devh,
39379 enum vxge_hw_event type, u64 ext_data);
39380 -};
39381 +} __no_const;
39382
39383 /*
39384 * struct __vxge_hw_blockpool_entry - Block private data structure
39385 diff --git a/drivers/net/vxge/vxge-main.c b/drivers/net/vxge/vxge-main.c
39386 index 068d7a9..35293de 100644
39387 --- a/drivers/net/vxge/vxge-main.c
39388 +++ b/drivers/net/vxge/vxge-main.c
39389 @@ -93,6 +93,8 @@ static inline void VXGE_COMPLETE_VPATH_TX(struct vxge_fifo *fifo)
39390 struct sk_buff *completed[NR_SKB_COMPLETED];
39391 int more;
39392
39393 + pax_track_stack();
39394 +
39395 do {
39396 more = 0;
39397 skb_ptr = completed;
39398 @@ -1779,6 +1781,8 @@ static enum vxge_hw_status vxge_rth_configure(struct vxgedev *vdev)
39399 u8 mtable[256] = {0}; /* CPU to vpath mapping */
39400 int index;
39401
39402 + pax_track_stack();
39403 +
39404 /*
39405 * Filling
39406 * - itable with bucket numbers
39407 diff --git a/drivers/net/vxge/vxge-traffic.h b/drivers/net/vxge/vxge-traffic.h
39408 index 461742b..81be42e 100644
39409 --- a/drivers/net/vxge/vxge-traffic.h
39410 +++ b/drivers/net/vxge/vxge-traffic.h
39411 @@ -2123,7 +2123,7 @@ struct vxge_hw_mempool_cbs {
39412 struct vxge_hw_mempool_dma *dma_object,
39413 u32 index,
39414 u32 is_last);
39415 -};
39416 +} __no_const;
39417
39418 void
39419 __vxge_hw_mempool_destroy(
39420 diff --git a/drivers/net/wan/cycx_x25.c b/drivers/net/wan/cycx_x25.c
39421 index cd8cb95..4153b79 100644
39422 --- a/drivers/net/wan/cycx_x25.c
39423 +++ b/drivers/net/wan/cycx_x25.c
39424 @@ -1017,6 +1017,8 @@ static void hex_dump(char *msg, unsigned char *p, int len)
39425 unsigned char hex[1024],
39426 * phex = hex;
39427
39428 + pax_track_stack();
39429 +
39430 if (len >= (sizeof(hex) / 2))
39431 len = (sizeof(hex) / 2) - 1;
39432
39433 diff --git a/drivers/net/wan/hdlc_x25.c b/drivers/net/wan/hdlc_x25.c
39434 index aa9248f..a4e3c3b 100644
39435 --- a/drivers/net/wan/hdlc_x25.c
39436 +++ b/drivers/net/wan/hdlc_x25.c
39437 @@ -136,16 +136,16 @@ static netdev_tx_t x25_xmit(struct sk_buff *skb, struct net_device *dev)
39438
39439 static int x25_open(struct net_device *dev)
39440 {
39441 - struct lapb_register_struct cb;
39442 + static struct lapb_register_struct cb = {
39443 + .connect_confirmation = x25_connected,
39444 + .connect_indication = x25_connected,
39445 + .disconnect_confirmation = x25_disconnected,
39446 + .disconnect_indication = x25_disconnected,
39447 + .data_indication = x25_data_indication,
39448 + .data_transmit = x25_data_transmit
39449 + };
39450 int result;
39451
39452 - cb.connect_confirmation = x25_connected;
39453 - cb.connect_indication = x25_connected;
39454 - cb.disconnect_confirmation = x25_disconnected;
39455 - cb.disconnect_indication = x25_disconnected;
39456 - cb.data_indication = x25_data_indication;
39457 - cb.data_transmit = x25_data_transmit;
39458 -
39459 result = lapb_register(dev, &cb);
39460 if (result != LAPB_OK)
39461 return result;
39462 diff --git a/drivers/net/wimax/i2400m/usb-fw.c b/drivers/net/wimax/i2400m/usb-fw.c
39463 index 5ad287c..783b020 100644
39464 --- a/drivers/net/wimax/i2400m/usb-fw.c
39465 +++ b/drivers/net/wimax/i2400m/usb-fw.c
39466 @@ -263,6 +263,8 @@ ssize_t i2400mu_bus_bm_wait_for_ack(struct i2400m *i2400m,
39467 int do_autopm = 1;
39468 DECLARE_COMPLETION_ONSTACK(notif_completion);
39469
39470 + pax_track_stack();
39471 +
39472 d_fnstart(8, dev, "(i2400m %p ack %p size %zu)\n",
39473 i2400m, ack, ack_size);
39474 BUG_ON(_ack == i2400m->bm_ack_buf);
39475 diff --git a/drivers/net/wireless/airo.c b/drivers/net/wireless/airo.c
39476 index 6c26840..62c97c3 100644
39477 --- a/drivers/net/wireless/airo.c
39478 +++ b/drivers/net/wireless/airo.c
39479 @@ -3003,6 +3003,8 @@ static void airo_process_scan_results (struct airo_info *ai) {
39480 BSSListElement * loop_net;
39481 BSSListElement * tmp_net;
39482
39483 + pax_track_stack();
39484 +
39485 /* Blow away current list of scan results */
39486 list_for_each_entry_safe (loop_net, tmp_net, &ai->network_list, list) {
39487 list_move_tail (&loop_net->list, &ai->network_free_list);
39488 @@ -3783,6 +3785,8 @@ static u16 setup_card(struct airo_info *ai, u8 *mac, int lock)
39489 WepKeyRid wkr;
39490 int rc;
39491
39492 + pax_track_stack();
39493 +
39494 memset( &mySsid, 0, sizeof( mySsid ) );
39495 kfree (ai->flash);
39496 ai->flash = NULL;
39497 @@ -4758,6 +4762,8 @@ static int proc_stats_rid_open( struct inode *inode,
39498 __le32 *vals = stats.vals;
39499 int len;
39500
39501 + pax_track_stack();
39502 +
39503 if ((file->private_data = kzalloc(sizeof(struct proc_data ), GFP_KERNEL)) == NULL)
39504 return -ENOMEM;
39505 data = (struct proc_data *)file->private_data;
39506 @@ -5487,6 +5493,8 @@ static int proc_BSSList_open( struct inode *inode, struct file *file ) {
39507 /* If doLoseSync is not 1, we won't do a Lose Sync */
39508 int doLoseSync = -1;
39509
39510 + pax_track_stack();
39511 +
39512 if ((file->private_data = kzalloc(sizeof(struct proc_data ), GFP_KERNEL)) == NULL)
39513 return -ENOMEM;
39514 data = (struct proc_data *)file->private_data;
39515 @@ -7193,6 +7201,8 @@ static int airo_get_aplist(struct net_device *dev,
39516 int i;
39517 int loseSync = capable(CAP_NET_ADMIN) ? 1: -1;
39518
39519 + pax_track_stack();
39520 +
39521 qual = kmalloc(IW_MAX_AP * sizeof(*qual), GFP_KERNEL);
39522 if (!qual)
39523 return -ENOMEM;
39524 @@ -7753,6 +7763,8 @@ static void airo_read_wireless_stats(struct airo_info *local)
39525 CapabilityRid cap_rid;
39526 __le32 *vals = stats_rid.vals;
39527
39528 + pax_track_stack();
39529 +
39530 /* Get stats out of the card */
39531 clear_bit(JOB_WSTATS, &local->jobs);
39532 if (local->power.event) {
39533 diff --git a/drivers/net/wireless/ath/ath5k/debug.c b/drivers/net/wireless/ath/ath5k/debug.c
39534 index 747508c..82e965d 100644
39535 --- a/drivers/net/wireless/ath/ath5k/debug.c
39536 +++ b/drivers/net/wireless/ath/ath5k/debug.c
39537 @@ -205,6 +205,8 @@ static ssize_t read_file_beacon(struct file *file, char __user *user_buf,
39538 unsigned int v;
39539 u64 tsf;
39540
39541 + pax_track_stack();
39542 +
39543 v = ath5k_hw_reg_read(sc->ah, AR5K_BEACON);
39544 len += snprintf(buf+len, sizeof(buf)-len,
39545 "%-24s0x%08x\tintval: %d\tTIM: 0x%x\n",
39546 @@ -318,6 +320,8 @@ static ssize_t read_file_debug(struct file *file, char __user *user_buf,
39547 unsigned int len = 0;
39548 unsigned int i;
39549
39550 + pax_track_stack();
39551 +
39552 len += snprintf(buf+len, sizeof(buf)-len,
39553 "DEBUG LEVEL: 0x%08x\n\n", sc->debug.level);
39554
39555 diff --git a/drivers/net/wireless/ath/ath9k/debug.c b/drivers/net/wireless/ath/ath9k/debug.c
39556 index 2be4c22..593b1eb 100644
39557 --- a/drivers/net/wireless/ath/ath9k/debug.c
39558 +++ b/drivers/net/wireless/ath/ath9k/debug.c
39559 @@ -220,6 +220,8 @@ static ssize_t read_file_interrupt(struct file *file, char __user *user_buf,
39560 char buf[512];
39561 unsigned int len = 0;
39562
39563 + pax_track_stack();
39564 +
39565 len += snprintf(buf + len, sizeof(buf) - len,
39566 "%8s: %10u\n", "RX", sc->debug.stats.istats.rxok);
39567 len += snprintf(buf + len, sizeof(buf) - len,
39568 @@ -360,6 +362,8 @@ static ssize_t read_file_wiphy(struct file *file, char __user *user_buf,
39569 int i;
39570 u8 addr[ETH_ALEN];
39571
39572 + pax_track_stack();
39573 +
39574 len += snprintf(buf + len, sizeof(buf) - len,
39575 "primary: %s (%s chan=%d ht=%d)\n",
39576 wiphy_name(sc->pri_wiphy->hw->wiphy),
39577 diff --git a/drivers/net/wireless/b43/debugfs.c b/drivers/net/wireless/b43/debugfs.c
39578 index 80b19a4..dab3a45 100644
39579 --- a/drivers/net/wireless/b43/debugfs.c
39580 +++ b/drivers/net/wireless/b43/debugfs.c
39581 @@ -43,7 +43,7 @@ static struct dentry *rootdir;
39582 struct b43_debugfs_fops {
39583 ssize_t (*read)(struct b43_wldev *dev, char *buf, size_t bufsize);
39584 int (*write)(struct b43_wldev *dev, const char *buf, size_t count);
39585 - struct file_operations fops;
39586 + const struct file_operations fops;
39587 /* Offset of struct b43_dfs_file in struct b43_dfsentry */
39588 size_t file_struct_offset;
39589 };
39590 diff --git a/drivers/net/wireless/b43legacy/debugfs.c b/drivers/net/wireless/b43legacy/debugfs.c
39591 index 1f85ac5..c99b4b4 100644
39592 --- a/drivers/net/wireless/b43legacy/debugfs.c
39593 +++ b/drivers/net/wireless/b43legacy/debugfs.c
39594 @@ -44,7 +44,7 @@ static struct dentry *rootdir;
39595 struct b43legacy_debugfs_fops {
39596 ssize_t (*read)(struct b43legacy_wldev *dev, char *buf, size_t bufsize);
39597 int (*write)(struct b43legacy_wldev *dev, const char *buf, size_t count);
39598 - struct file_operations fops;
39599 + const struct file_operations fops;
39600 /* Offset of struct b43legacy_dfs_file in struct b43legacy_dfsentry */
39601 size_t file_struct_offset;
39602 /* Take wl->irq_lock before calling read/write? */
39603 diff --git a/drivers/net/wireless/ipw2x00/ipw2100.c b/drivers/net/wireless/ipw2x00/ipw2100.c
39604 index 43102bf..3b569c3 100644
39605 --- a/drivers/net/wireless/ipw2x00/ipw2100.c
39606 +++ b/drivers/net/wireless/ipw2x00/ipw2100.c
39607 @@ -2014,6 +2014,8 @@ static int ipw2100_set_essid(struct ipw2100_priv *priv, char *essid,
39608 int err;
39609 DECLARE_SSID_BUF(ssid);
39610
39611 + pax_track_stack();
39612 +
39613 IPW_DEBUG_HC("SSID: '%s'\n", print_ssid(ssid, essid, ssid_len));
39614
39615 if (ssid_len)
39616 @@ -5380,6 +5382,8 @@ static int ipw2100_set_key(struct ipw2100_priv *priv,
39617 struct ipw2100_wep_key *wep_key = (void *)cmd.host_command_parameters;
39618 int err;
39619
39620 + pax_track_stack();
39621 +
39622 IPW_DEBUG_HC("WEP_KEY_INFO: index = %d, len = %d/%d\n",
39623 idx, keylen, len);
39624
39625 diff --git a/drivers/net/wireless/ipw2x00/libipw_rx.c b/drivers/net/wireless/ipw2x00/libipw_rx.c
39626 index 282b1f7..169f0cf 100644
39627 --- a/drivers/net/wireless/ipw2x00/libipw_rx.c
39628 +++ b/drivers/net/wireless/ipw2x00/libipw_rx.c
39629 @@ -1566,6 +1566,8 @@ static void libipw_process_probe_response(struct libipw_device
39630 unsigned long flags;
39631 DECLARE_SSID_BUF(ssid);
39632
39633 + pax_track_stack();
39634 +
39635 LIBIPW_DEBUG_SCAN("'%s' (%pM"
39636 "): %c%c%c%c %c%c%c%c-%c%c%c%c %c%c%c%c\n",
39637 print_ssid(ssid, info_element->data, info_element->len),
39638 diff --git a/drivers/net/wireless/iwlwifi/iwl-1000.c b/drivers/net/wireless/iwlwifi/iwl-1000.c
39639 index 950267a..80d5fd2 100644
39640 --- a/drivers/net/wireless/iwlwifi/iwl-1000.c
39641 +++ b/drivers/net/wireless/iwlwifi/iwl-1000.c
39642 @@ -137,7 +137,7 @@ static struct iwl_lib_ops iwl1000_lib = {
39643 },
39644 };
39645
39646 -static struct iwl_ops iwl1000_ops = {
39647 +static const struct iwl_ops iwl1000_ops = {
39648 .ucode = &iwl5000_ucode,
39649 .lib = &iwl1000_lib,
39650 .hcmd = &iwl5000_hcmd,
39651 diff --git a/drivers/net/wireless/iwlwifi/iwl-3945.c b/drivers/net/wireless/iwlwifi/iwl-3945.c
39652 index 56bfcc3..b348020 100644
39653 --- a/drivers/net/wireless/iwlwifi/iwl-3945.c
39654 +++ b/drivers/net/wireless/iwlwifi/iwl-3945.c
39655 @@ -2874,7 +2874,7 @@ static struct iwl_hcmd_utils_ops iwl3945_hcmd_utils = {
39656 .build_addsta_hcmd = iwl3945_build_addsta_hcmd,
39657 };
39658
39659 -static struct iwl_ops iwl3945_ops = {
39660 +static const struct iwl_ops iwl3945_ops = {
39661 .ucode = &iwl3945_ucode,
39662 .lib = &iwl3945_lib,
39663 .hcmd = &iwl3945_hcmd,
39664 diff --git a/drivers/net/wireless/iwlwifi/iwl-4965.c b/drivers/net/wireless/iwlwifi/iwl-4965.c
39665 index 585b8d4..e142963 100644
39666 --- a/drivers/net/wireless/iwlwifi/iwl-4965.c
39667 +++ b/drivers/net/wireless/iwlwifi/iwl-4965.c
39668 @@ -2345,7 +2345,7 @@ static struct iwl_lib_ops iwl4965_lib = {
39669 },
39670 };
39671
39672 -static struct iwl_ops iwl4965_ops = {
39673 +static const struct iwl_ops iwl4965_ops = {
39674 .ucode = &iwl4965_ucode,
39675 .lib = &iwl4965_lib,
39676 .hcmd = &iwl4965_hcmd,
39677 diff --git a/drivers/net/wireless/iwlwifi/iwl-5000.c b/drivers/net/wireless/iwlwifi/iwl-5000.c
39678 index 1f423f2..e37c192 100644
39679 --- a/drivers/net/wireless/iwlwifi/iwl-5000.c
39680 +++ b/drivers/net/wireless/iwlwifi/iwl-5000.c
39681 @@ -1633,14 +1633,14 @@ static struct iwl_lib_ops iwl5150_lib = {
39682 },
39683 };
39684
39685 -struct iwl_ops iwl5000_ops = {
39686 +const struct iwl_ops iwl5000_ops = {
39687 .ucode = &iwl5000_ucode,
39688 .lib = &iwl5000_lib,
39689 .hcmd = &iwl5000_hcmd,
39690 .utils = &iwl5000_hcmd_utils,
39691 };
39692
39693 -static struct iwl_ops iwl5150_ops = {
39694 +static const struct iwl_ops iwl5150_ops = {
39695 .ucode = &iwl5000_ucode,
39696 .lib = &iwl5150_lib,
39697 .hcmd = &iwl5000_hcmd,
39698 diff --git a/drivers/net/wireless/iwlwifi/iwl-6000.c b/drivers/net/wireless/iwlwifi/iwl-6000.c
39699 index 1473452..f07d5e1 100644
39700 --- a/drivers/net/wireless/iwlwifi/iwl-6000.c
39701 +++ b/drivers/net/wireless/iwlwifi/iwl-6000.c
39702 @@ -146,7 +146,7 @@ static struct iwl_hcmd_utils_ops iwl6000_hcmd_utils = {
39703 .calc_rssi = iwl5000_calc_rssi,
39704 };
39705
39706 -static struct iwl_ops iwl6000_ops = {
39707 +static const struct iwl_ops iwl6000_ops = {
39708 .ucode = &iwl5000_ucode,
39709 .lib = &iwl6000_lib,
39710 .hcmd = &iwl5000_hcmd,
39711 diff --git a/drivers/net/wireless/iwlwifi/iwl-agn-rs.c b/drivers/net/wireless/iwlwifi/iwl-agn-rs.c
39712 index 1a3dfa2..b3e0a61 100644
39713 --- a/drivers/net/wireless/iwlwifi/iwl-agn-rs.c
39714 +++ b/drivers/net/wireless/iwlwifi/iwl-agn-rs.c
39715 @@ -857,6 +857,8 @@ static void rs_tx_status(void *priv_r, struct ieee80211_supported_band *sband,
39716 u8 active_index = 0;
39717 s32 tpt = 0;
39718
39719 + pax_track_stack();
39720 +
39721 IWL_DEBUG_RATE_LIMIT(priv, "get frame ack response, update rate scale window\n");
39722
39723 if (!ieee80211_is_data(hdr->frame_control) ||
39724 @@ -2722,6 +2724,8 @@ static void rs_fill_link_cmd(struct iwl_priv *priv,
39725 u8 valid_tx_ant = 0;
39726 struct iwl_link_quality_cmd *lq_cmd = &lq_sta->lq;
39727
39728 + pax_track_stack();
39729 +
39730 /* Override starting rate (index 0) if needed for debug purposes */
39731 rs_dbgfs_set_mcs(lq_sta, &new_rate, index);
39732
39733 diff --git a/drivers/net/wireless/iwlwifi/iwl-agn.c b/drivers/net/wireless/iwlwifi/iwl-agn.c
39734 index 0e56d78..6a3c107 100644
39735 --- a/drivers/net/wireless/iwlwifi/iwl-agn.c
39736 +++ b/drivers/net/wireless/iwlwifi/iwl-agn.c
39737 @@ -2911,7 +2911,9 @@ static int iwl_pci_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
39738 if (iwl_debug_level & IWL_DL_INFO)
39739 dev_printk(KERN_DEBUG, &(pdev->dev),
39740 "Disabling hw_scan\n");
39741 - iwl_hw_ops.hw_scan = NULL;
39742 + pax_open_kernel();
39743 + *(void **)&iwl_hw_ops.hw_scan = NULL;
39744 + pax_close_kernel();
39745 }
39746
39747 hw = iwl_alloc_all(cfg, &iwl_hw_ops);
39748 diff --git a/drivers/net/wireless/iwlwifi/iwl-debug.h b/drivers/net/wireless/iwlwifi/iwl-debug.h
39749 index cbc6290..eb323d7 100644
39750 --- a/drivers/net/wireless/iwlwifi/iwl-debug.h
39751 +++ b/drivers/net/wireless/iwlwifi/iwl-debug.h
39752 @@ -118,8 +118,8 @@ void iwl_dbgfs_unregister(struct iwl_priv *priv);
39753 #endif
39754
39755 #else
39756 -#define IWL_DEBUG(__priv, level, fmt, args...)
39757 -#define IWL_DEBUG_LIMIT(__priv, level, fmt, args...)
39758 +#define IWL_DEBUG(__priv, level, fmt, args...) do {} while (0)
39759 +#define IWL_DEBUG_LIMIT(__priv, level, fmt, args...) do {} while (0)
39760 static inline void iwl_print_hex_dump(struct iwl_priv *priv, int level,
39761 void *p, u32 len)
39762 {}
39763 diff --git a/drivers/net/wireless/iwlwifi/iwl-debugfs.c b/drivers/net/wireless/iwlwifi/iwl-debugfs.c
39764 index a198bcf..8e68233 100644
39765 --- a/drivers/net/wireless/iwlwifi/iwl-debugfs.c
39766 +++ b/drivers/net/wireless/iwlwifi/iwl-debugfs.c
39767 @@ -524,6 +524,8 @@ static ssize_t iwl_dbgfs_status_read(struct file *file,
39768 int pos = 0;
39769 const size_t bufsz = sizeof(buf);
39770
39771 + pax_track_stack();
39772 +
39773 pos += scnprintf(buf + pos, bufsz - pos, "STATUS_HCMD_ACTIVE:\t %d\n",
39774 test_bit(STATUS_HCMD_ACTIVE, &priv->status));
39775 pos += scnprintf(buf + pos, bufsz - pos, "STATUS_HCMD_SYNC_ACTIVE: %d\n",
39776 @@ -658,6 +660,8 @@ static ssize_t iwl_dbgfs_qos_read(struct file *file, char __user *user_buf,
39777 const size_t bufsz = sizeof(buf);
39778 ssize_t ret;
39779
39780 + pax_track_stack();
39781 +
39782 for (i = 0; i < AC_NUM; i++) {
39783 pos += scnprintf(buf + pos, bufsz - pos,
39784 "\tcw_min\tcw_max\taifsn\ttxop\n");
39785 diff --git a/drivers/net/wireless/iwlwifi/iwl-dev.h b/drivers/net/wireless/iwlwifi/iwl-dev.h
39786 index 3539ea4..b174bfa 100644
39787 --- a/drivers/net/wireless/iwlwifi/iwl-dev.h
39788 +++ b/drivers/net/wireless/iwlwifi/iwl-dev.h
39789 @@ -68,7 +68,7 @@ struct iwl_tx_queue;
39790
39791 /* shared structures from iwl-5000.c */
39792 extern struct iwl_mod_params iwl50_mod_params;
39793 -extern struct iwl_ops iwl5000_ops;
39794 +extern const struct iwl_ops iwl5000_ops;
39795 extern struct iwl_ucode_ops iwl5000_ucode;
39796 extern struct iwl_lib_ops iwl5000_lib;
39797 extern struct iwl_hcmd_ops iwl5000_hcmd;
39798 diff --git a/drivers/net/wireless/iwlwifi/iwl3945-base.c b/drivers/net/wireless/iwlwifi/iwl3945-base.c
39799 index 619590d..69235ee 100644
39800 --- a/drivers/net/wireless/iwlwifi/iwl3945-base.c
39801 +++ b/drivers/net/wireless/iwlwifi/iwl3945-base.c
39802 @@ -3927,7 +3927,9 @@ static int iwl3945_pci_probe(struct pci_dev *pdev, const struct pci_device_id *e
39803 */
39804 if (iwl3945_mod_params.disable_hw_scan) {
39805 IWL_DEBUG_INFO(priv, "Disabling hw_scan\n");
39806 - iwl3945_hw_ops.hw_scan = NULL;
39807 + pax_open_kernel();
39808 + *(void **)&iwl3945_hw_ops.hw_scan = NULL;
39809 + pax_close_kernel();
39810 }
39811
39812
39813 diff --git a/drivers/net/wireless/iwmc3200wifi/debugfs.c b/drivers/net/wireless/iwmc3200wifi/debugfs.c
39814 index 1465379..fe4d78b 100644
39815 --- a/drivers/net/wireless/iwmc3200wifi/debugfs.c
39816 +++ b/drivers/net/wireless/iwmc3200wifi/debugfs.c
39817 @@ -299,6 +299,8 @@ static ssize_t iwm_debugfs_fw_err_read(struct file *filp,
39818 int buf_len = 512;
39819 size_t len = 0;
39820
39821 + pax_track_stack();
39822 +
39823 if (*ppos != 0)
39824 return 0;
39825 if (count < sizeof(buf))
39826 diff --git a/drivers/net/wireless/libertas/debugfs.c b/drivers/net/wireless/libertas/debugfs.c
39827 index 893a55c..7f66a50 100644
39828 --- a/drivers/net/wireless/libertas/debugfs.c
39829 +++ b/drivers/net/wireless/libertas/debugfs.c
39830 @@ -708,7 +708,7 @@ out_unlock:
39831 struct lbs_debugfs_files {
39832 const char *name;
39833 int perm;
39834 - struct file_operations fops;
39835 + const struct file_operations fops;
39836 };
39837
39838 static const struct lbs_debugfs_files debugfs_files[] = {
39839 diff --git a/drivers/net/wireless/rndis_wlan.c b/drivers/net/wireless/rndis_wlan.c
39840 index 2ecbedb..42704f0 100644
39841 --- a/drivers/net/wireless/rndis_wlan.c
39842 +++ b/drivers/net/wireless/rndis_wlan.c
39843 @@ -1176,7 +1176,7 @@ static int set_rts_threshold(struct usbnet *usbdev, u32 rts_threshold)
39844
39845 devdbg(usbdev, "set_rts_threshold %i", rts_threshold);
39846
39847 - if (rts_threshold < 0 || rts_threshold > 2347)
39848 + if (rts_threshold > 2347)
39849 rts_threshold = 2347;
39850
39851 tmp = cpu_to_le32(rts_threshold);
39852 diff --git a/drivers/oprofile/buffer_sync.c b/drivers/oprofile/buffer_sync.c
39853 index 334ccd6..47f8944 100644
39854 --- a/drivers/oprofile/buffer_sync.c
39855 +++ b/drivers/oprofile/buffer_sync.c
39856 @@ -342,7 +342,7 @@ static void add_data(struct op_entry *entry, struct mm_struct *mm)
39857 if (cookie == NO_COOKIE)
39858 offset = pc;
39859 if (cookie == INVALID_COOKIE) {
39860 - atomic_inc(&oprofile_stats.sample_lost_no_mapping);
39861 + atomic_inc_unchecked(&oprofile_stats.sample_lost_no_mapping);
39862 offset = pc;
39863 }
39864 if (cookie != last_cookie) {
39865 @@ -386,14 +386,14 @@ add_sample(struct mm_struct *mm, struct op_sample *s, int in_kernel)
39866 /* add userspace sample */
39867
39868 if (!mm) {
39869 - atomic_inc(&oprofile_stats.sample_lost_no_mm);
39870 + atomic_inc_unchecked(&oprofile_stats.sample_lost_no_mm);
39871 return 0;
39872 }
39873
39874 cookie = lookup_dcookie(mm, s->eip, &offset);
39875
39876 if (cookie == INVALID_COOKIE) {
39877 - atomic_inc(&oprofile_stats.sample_lost_no_mapping);
39878 + atomic_inc_unchecked(&oprofile_stats.sample_lost_no_mapping);
39879 return 0;
39880 }
39881
39882 @@ -562,7 +562,7 @@ void sync_buffer(int cpu)
39883 /* ignore backtraces if failed to add a sample */
39884 if (state == sb_bt_start) {
39885 state = sb_bt_ignore;
39886 - atomic_inc(&oprofile_stats.bt_lost_no_mapping);
39887 + atomic_inc_unchecked(&oprofile_stats.bt_lost_no_mapping);
39888 }
39889 }
39890 release_mm(mm);
39891 diff --git a/drivers/oprofile/event_buffer.c b/drivers/oprofile/event_buffer.c
39892 index 5df60a6..72f5c1c 100644
39893 --- a/drivers/oprofile/event_buffer.c
39894 +++ b/drivers/oprofile/event_buffer.c
39895 @@ -53,7 +53,7 @@ void add_event_entry(unsigned long value)
39896 }
39897
39898 if (buffer_pos == buffer_size) {
39899 - atomic_inc(&oprofile_stats.event_lost_overflow);
39900 + atomic_inc_unchecked(&oprofile_stats.event_lost_overflow);
39901 return;
39902 }
39903
39904 diff --git a/drivers/oprofile/oprof.c b/drivers/oprofile/oprof.c
39905 index dc8a042..fe5f315 100644
39906 --- a/drivers/oprofile/oprof.c
39907 +++ b/drivers/oprofile/oprof.c
39908 @@ -110,7 +110,7 @@ static void switch_worker(struct work_struct *work)
39909 if (oprofile_ops.switch_events())
39910 return;
39911
39912 - atomic_inc(&oprofile_stats.multiplex_counter);
39913 + atomic_inc_unchecked(&oprofile_stats.multiplex_counter);
39914 start_switch_worker();
39915 }
39916
39917 diff --git a/drivers/oprofile/oprofile_stats.c b/drivers/oprofile/oprofile_stats.c
39918 index 61689e8..387f7f8 100644
39919 --- a/drivers/oprofile/oprofile_stats.c
39920 +++ b/drivers/oprofile/oprofile_stats.c
39921 @@ -30,11 +30,11 @@ void oprofile_reset_stats(void)
39922 cpu_buf->sample_invalid_eip = 0;
39923 }
39924
39925 - atomic_set(&oprofile_stats.sample_lost_no_mm, 0);
39926 - atomic_set(&oprofile_stats.sample_lost_no_mapping, 0);
39927 - atomic_set(&oprofile_stats.event_lost_overflow, 0);
39928 - atomic_set(&oprofile_stats.bt_lost_no_mapping, 0);
39929 - atomic_set(&oprofile_stats.multiplex_counter, 0);
39930 + atomic_set_unchecked(&oprofile_stats.sample_lost_no_mm, 0);
39931 + atomic_set_unchecked(&oprofile_stats.sample_lost_no_mapping, 0);
39932 + atomic_set_unchecked(&oprofile_stats.event_lost_overflow, 0);
39933 + atomic_set_unchecked(&oprofile_stats.bt_lost_no_mapping, 0);
39934 + atomic_set_unchecked(&oprofile_stats.multiplex_counter, 0);
39935 }
39936
39937
39938 diff --git a/drivers/oprofile/oprofile_stats.h b/drivers/oprofile/oprofile_stats.h
39939 index 0b54e46..a37c527 100644
39940 --- a/drivers/oprofile/oprofile_stats.h
39941 +++ b/drivers/oprofile/oprofile_stats.h
39942 @@ -13,11 +13,11 @@
39943 #include <asm/atomic.h>
39944
39945 struct oprofile_stat_struct {
39946 - atomic_t sample_lost_no_mm;
39947 - atomic_t sample_lost_no_mapping;
39948 - atomic_t bt_lost_no_mapping;
39949 - atomic_t event_lost_overflow;
39950 - atomic_t multiplex_counter;
39951 + atomic_unchecked_t sample_lost_no_mm;
39952 + atomic_unchecked_t sample_lost_no_mapping;
39953 + atomic_unchecked_t bt_lost_no_mapping;
39954 + atomic_unchecked_t event_lost_overflow;
39955 + atomic_unchecked_t multiplex_counter;
39956 };
39957
39958 extern struct oprofile_stat_struct oprofile_stats;
39959 diff --git a/drivers/oprofile/oprofilefs.c b/drivers/oprofile/oprofilefs.c
39960 index 2766a6d..80c77e2 100644
39961 --- a/drivers/oprofile/oprofilefs.c
39962 +++ b/drivers/oprofile/oprofilefs.c
39963 @@ -187,7 +187,7 @@ static const struct file_operations atomic_ro_fops = {
39964
39965
39966 int oprofilefs_create_ro_atomic(struct super_block *sb, struct dentry *root,
39967 - char const *name, atomic_t *val)
39968 + char const *name, atomic_unchecked_t *val)
39969 {
39970 struct dentry *d = __oprofilefs_create_file(sb, root, name,
39971 &atomic_ro_fops, 0444);
39972 diff --git a/drivers/parisc/pdc_stable.c b/drivers/parisc/pdc_stable.c
39973 index 13a64bc..ad62835 100644
39974 --- a/drivers/parisc/pdc_stable.c
39975 +++ b/drivers/parisc/pdc_stable.c
39976 @@ -481,7 +481,7 @@ pdcspath_attr_store(struct kobject *kobj, struct attribute *attr,
39977 return ret;
39978 }
39979
39980 -static struct sysfs_ops pdcspath_attr_ops = {
39981 +static const struct sysfs_ops pdcspath_attr_ops = {
39982 .show = pdcspath_attr_show,
39983 .store = pdcspath_attr_store,
39984 };
39985 diff --git a/drivers/parport/procfs.c b/drivers/parport/procfs.c
39986 index 8eefe56..40751a7 100644
39987 --- a/drivers/parport/procfs.c
39988 +++ b/drivers/parport/procfs.c
39989 @@ -64,7 +64,7 @@ static int do_active_device(ctl_table *table, int write,
39990
39991 *ppos += len;
39992
39993 - return copy_to_user(result, buffer, len) ? -EFAULT : 0;
39994 + return (len > sizeof buffer || copy_to_user(result, buffer, len)) ? -EFAULT : 0;
39995 }
39996
39997 #ifdef CONFIG_PARPORT_1284
39998 @@ -106,7 +106,7 @@ static int do_autoprobe(ctl_table *table, int write,
39999
40000 *ppos += len;
40001
40002 - return copy_to_user (result, buffer, len) ? -EFAULT : 0;
40003 + return (len > sizeof buffer || copy_to_user (result, buffer, len)) ? -EFAULT : 0;
40004 }
40005 #endif /* IEEE1284.3 support. */
40006
40007 diff --git a/drivers/pci/hotplug/acpiphp_glue.c b/drivers/pci/hotplug/acpiphp_glue.c
40008 index 73e7d8e..c80f3d2 100644
40009 --- a/drivers/pci/hotplug/acpiphp_glue.c
40010 +++ b/drivers/pci/hotplug/acpiphp_glue.c
40011 @@ -111,7 +111,7 @@ static int post_dock_fixups(struct notifier_block *nb, unsigned long val,
40012 }
40013
40014
40015 -static struct acpi_dock_ops acpiphp_dock_ops = {
40016 +static const struct acpi_dock_ops acpiphp_dock_ops = {
40017 .handler = handle_hotplug_event_func,
40018 };
40019
40020 diff --git a/drivers/pci/hotplug/cpci_hotplug.h b/drivers/pci/hotplug/cpci_hotplug.h
40021 index 9fff878..ad0ad53 100644
40022 --- a/drivers/pci/hotplug/cpci_hotplug.h
40023 +++ b/drivers/pci/hotplug/cpci_hotplug.h
40024 @@ -59,7 +59,7 @@ struct cpci_hp_controller_ops {
40025 int (*hardware_test) (struct slot* slot, u32 value);
40026 u8 (*get_power) (struct slot* slot);
40027 int (*set_power) (struct slot* slot, int value);
40028 -};
40029 +} __no_const;
40030
40031 struct cpci_hp_controller {
40032 unsigned int irq;
40033 diff --git a/drivers/pci/hotplug/cpqphp_nvram.c b/drivers/pci/hotplug/cpqphp_nvram.c
40034 index 76ba8a1..20ca857 100644
40035 --- a/drivers/pci/hotplug/cpqphp_nvram.c
40036 +++ b/drivers/pci/hotplug/cpqphp_nvram.c
40037 @@ -428,9 +428,13 @@ static u32 store_HRT (void __iomem *rom_start)
40038
40039 void compaq_nvram_init (void __iomem *rom_start)
40040 {
40041 +
40042 +#ifndef CONFIG_PAX_KERNEXEC
40043 if (rom_start) {
40044 compaq_int15_entry_point = (rom_start + ROM_INT15_PHY_ADDR - ROM_PHY_ADDR);
40045 }
40046 +#endif
40047 +
40048 dbg("int15 entry = %p\n", compaq_int15_entry_point);
40049
40050 /* initialize our int15 lock */
40051 diff --git a/drivers/pci/hotplug/fakephp.c b/drivers/pci/hotplug/fakephp.c
40052 index 6151389..0a894ef 100644
40053 --- a/drivers/pci/hotplug/fakephp.c
40054 +++ b/drivers/pci/hotplug/fakephp.c
40055 @@ -73,7 +73,7 @@ static void legacy_release(struct kobject *kobj)
40056 }
40057
40058 static struct kobj_type legacy_ktype = {
40059 - .sysfs_ops = &(struct sysfs_ops){
40060 + .sysfs_ops = &(const struct sysfs_ops){
40061 .store = legacy_store, .show = legacy_show
40062 },
40063 .release = &legacy_release,
40064 diff --git a/drivers/pci/intel-iommu.c b/drivers/pci/intel-iommu.c
40065 index 5b680df..fe05b7e 100644
40066 --- a/drivers/pci/intel-iommu.c
40067 +++ b/drivers/pci/intel-iommu.c
40068 @@ -2643,7 +2643,7 @@ error:
40069 return 0;
40070 }
40071
40072 -static dma_addr_t intel_map_page(struct device *dev, struct page *page,
40073 +dma_addr_t intel_map_page(struct device *dev, struct page *page,
40074 unsigned long offset, size_t size,
40075 enum dma_data_direction dir,
40076 struct dma_attrs *attrs)
40077 @@ -2719,7 +2719,7 @@ static void add_unmap(struct dmar_domain *dom, struct iova *iova)
40078 spin_unlock_irqrestore(&async_umap_flush_lock, flags);
40079 }
40080
40081 -static void intel_unmap_page(struct device *dev, dma_addr_t dev_addr,
40082 +void intel_unmap_page(struct device *dev, dma_addr_t dev_addr,
40083 size_t size, enum dma_data_direction dir,
40084 struct dma_attrs *attrs)
40085 {
40086 @@ -2768,7 +2768,7 @@ static void intel_unmap_page(struct device *dev, dma_addr_t dev_addr,
40087 }
40088 }
40089
40090 -static void *intel_alloc_coherent(struct device *hwdev, size_t size,
40091 +void *intel_alloc_coherent(struct device *hwdev, size_t size,
40092 dma_addr_t *dma_handle, gfp_t flags)
40093 {
40094 void *vaddr;
40095 @@ -2800,7 +2800,7 @@ static void *intel_alloc_coherent(struct device *hwdev, size_t size,
40096 return NULL;
40097 }
40098
40099 -static void intel_free_coherent(struct device *hwdev, size_t size, void *vaddr,
40100 +void intel_free_coherent(struct device *hwdev, size_t size, void *vaddr,
40101 dma_addr_t dma_handle)
40102 {
40103 int order;
40104 @@ -2812,7 +2812,7 @@ static void intel_free_coherent(struct device *hwdev, size_t size, void *vaddr,
40105 free_pages((unsigned long)vaddr, order);
40106 }
40107
40108 -static void intel_unmap_sg(struct device *hwdev, struct scatterlist *sglist,
40109 +void intel_unmap_sg(struct device *hwdev, struct scatterlist *sglist,
40110 int nelems, enum dma_data_direction dir,
40111 struct dma_attrs *attrs)
40112 {
40113 @@ -2872,7 +2872,7 @@ static int intel_nontranslate_map_sg(struct device *hddev,
40114 return nelems;
40115 }
40116
40117 -static int intel_map_sg(struct device *hwdev, struct scatterlist *sglist, int nelems,
40118 +int intel_map_sg(struct device *hwdev, struct scatterlist *sglist, int nelems,
40119 enum dma_data_direction dir, struct dma_attrs *attrs)
40120 {
40121 int i;
40122 @@ -2941,12 +2941,12 @@ static int intel_map_sg(struct device *hwdev, struct scatterlist *sglist, int ne
40123 return nelems;
40124 }
40125
40126 -static int intel_mapping_error(struct device *dev, dma_addr_t dma_addr)
40127 +int intel_mapping_error(struct device *dev, dma_addr_t dma_addr)
40128 {
40129 return !dma_addr;
40130 }
40131
40132 -struct dma_map_ops intel_dma_ops = {
40133 +const struct dma_map_ops intel_dma_ops = {
40134 .alloc_coherent = intel_alloc_coherent,
40135 .free_coherent = intel_free_coherent,
40136 .map_sg = intel_map_sg,
40137 diff --git a/drivers/pci/pcie/aspm.c b/drivers/pci/pcie/aspm.c
40138 index 5b7056c..607bc94 100644
40139 --- a/drivers/pci/pcie/aspm.c
40140 +++ b/drivers/pci/pcie/aspm.c
40141 @@ -27,9 +27,9 @@
40142 #define MODULE_PARAM_PREFIX "pcie_aspm."
40143
40144 /* Note: those are not register definitions */
40145 -#define ASPM_STATE_L0S_UP (1) /* Upstream direction L0s state */
40146 -#define ASPM_STATE_L0S_DW (2) /* Downstream direction L0s state */
40147 -#define ASPM_STATE_L1 (4) /* L1 state */
40148 +#define ASPM_STATE_L0S_UP (1U) /* Upstream direction L0s state */
40149 +#define ASPM_STATE_L0S_DW (2U) /* Downstream direction L0s state */
40150 +#define ASPM_STATE_L1 (4U) /* L1 state */
40151 #define ASPM_STATE_L0S (ASPM_STATE_L0S_UP | ASPM_STATE_L0S_DW)
40152 #define ASPM_STATE_ALL (ASPM_STATE_L0S | ASPM_STATE_L1)
40153
40154 diff --git a/drivers/pci/probe.c b/drivers/pci/probe.c
40155 index 8105e32..ca10419 100644
40156 --- a/drivers/pci/probe.c
40157 +++ b/drivers/pci/probe.c
40158 @@ -62,14 +62,14 @@ static ssize_t pci_bus_show_cpuaffinity(struct device *dev,
40159 return ret;
40160 }
40161
40162 -static ssize_t inline pci_bus_show_cpumaskaffinity(struct device *dev,
40163 +static inline ssize_t pci_bus_show_cpumaskaffinity(struct device *dev,
40164 struct device_attribute *attr,
40165 char *buf)
40166 {
40167 return pci_bus_show_cpuaffinity(dev, 0, attr, buf);
40168 }
40169
40170 -static ssize_t inline pci_bus_show_cpulistaffinity(struct device *dev,
40171 +static inline ssize_t pci_bus_show_cpulistaffinity(struct device *dev,
40172 struct device_attribute *attr,
40173 char *buf)
40174 {
40175 diff --git a/drivers/pci/proc.c b/drivers/pci/proc.c
40176 index a03ad8c..024b0da 100644
40177 --- a/drivers/pci/proc.c
40178 +++ b/drivers/pci/proc.c
40179 @@ -480,7 +480,16 @@ static const struct file_operations proc_bus_pci_dev_operations = {
40180 static int __init pci_proc_init(void)
40181 {
40182 struct pci_dev *dev = NULL;
40183 +
40184 +#ifdef CONFIG_GRKERNSEC_PROC_ADD
40185 +#ifdef CONFIG_GRKERNSEC_PROC_USER
40186 + proc_bus_pci_dir = proc_mkdir_mode("bus/pci", S_IRUSR | S_IXUSR, NULL);
40187 +#elif defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
40188 + proc_bus_pci_dir = proc_mkdir_mode("bus/pci", S_IRUSR | S_IXUSR | S_IRGRP | S_IXGRP, NULL);
40189 +#endif
40190 +#else
40191 proc_bus_pci_dir = proc_mkdir("bus/pci", NULL);
40192 +#endif
40193 proc_create("devices", 0, proc_bus_pci_dir,
40194 &proc_bus_pci_dev_operations);
40195 proc_initialized = 1;
40196 diff --git a/drivers/pci/slot.c b/drivers/pci/slot.c
40197 index 8c02b6c..5584d8e 100644
40198 --- a/drivers/pci/slot.c
40199 +++ b/drivers/pci/slot.c
40200 @@ -29,7 +29,7 @@ static ssize_t pci_slot_attr_store(struct kobject *kobj,
40201 return attribute->store ? attribute->store(slot, buf, len) : -EIO;
40202 }
40203
40204 -static struct sysfs_ops pci_slot_sysfs_ops = {
40205 +static const struct sysfs_ops pci_slot_sysfs_ops = {
40206 .show = pci_slot_attr_show,
40207 .store = pci_slot_attr_store,
40208 };
40209 diff --git a/drivers/pcmcia/pcmcia_ioctl.c b/drivers/pcmcia/pcmcia_ioctl.c
40210 index 30cf71d2..50938f1 100644
40211 --- a/drivers/pcmcia/pcmcia_ioctl.c
40212 +++ b/drivers/pcmcia/pcmcia_ioctl.c
40213 @@ -819,7 +819,7 @@ static int ds_ioctl(struct inode * inode, struct file * file,
40214 return -EFAULT;
40215 }
40216 }
40217 - buf = kmalloc(sizeof(ds_ioctl_arg_t), GFP_KERNEL);
40218 + buf = kzalloc(sizeof(ds_ioctl_arg_t), GFP_KERNEL);
40219 if (!buf)
40220 return -ENOMEM;
40221
40222 diff --git a/drivers/platform/x86/acer-wmi.c b/drivers/platform/x86/acer-wmi.c
40223 index 52183c4..b224c69 100644
40224 --- a/drivers/platform/x86/acer-wmi.c
40225 +++ b/drivers/platform/x86/acer-wmi.c
40226 @@ -918,7 +918,7 @@ static int update_bl_status(struct backlight_device *bd)
40227 return 0;
40228 }
40229
40230 -static struct backlight_ops acer_bl_ops = {
40231 +static const struct backlight_ops acer_bl_ops = {
40232 .get_brightness = read_brightness,
40233 .update_status = update_bl_status,
40234 };
40235 diff --git a/drivers/platform/x86/asus-laptop.c b/drivers/platform/x86/asus-laptop.c
40236 index 767cb61..a87380b 100644
40237 --- a/drivers/platform/x86/asus-laptop.c
40238 +++ b/drivers/platform/x86/asus-laptop.c
40239 @@ -250,7 +250,7 @@ static struct backlight_device *asus_backlight_device;
40240 */
40241 static int read_brightness(struct backlight_device *bd);
40242 static int update_bl_status(struct backlight_device *bd);
40243 -static struct backlight_ops asusbl_ops = {
40244 +static const struct backlight_ops asusbl_ops = {
40245 .get_brightness = read_brightness,
40246 .update_status = update_bl_status,
40247 };
40248 diff --git a/drivers/platform/x86/asus_acpi.c b/drivers/platform/x86/asus_acpi.c
40249 index d66c07a..a4abaac 100644
40250 --- a/drivers/platform/x86/asus_acpi.c
40251 +++ b/drivers/platform/x86/asus_acpi.c
40252 @@ -1396,7 +1396,7 @@ static int asus_hotk_remove(struct acpi_device *device, int type)
40253 return 0;
40254 }
40255
40256 -static struct backlight_ops asus_backlight_data = {
40257 +static const struct backlight_ops asus_backlight_data = {
40258 .get_brightness = read_brightness,
40259 .update_status = set_brightness_status,
40260 };
40261 diff --git a/drivers/platform/x86/compal-laptop.c b/drivers/platform/x86/compal-laptop.c
40262 index 11003bb..550ff1b 100644
40263 --- a/drivers/platform/x86/compal-laptop.c
40264 +++ b/drivers/platform/x86/compal-laptop.c
40265 @@ -163,7 +163,7 @@ static int bl_update_status(struct backlight_device *b)
40266 return set_lcd_level(b->props.brightness);
40267 }
40268
40269 -static struct backlight_ops compalbl_ops = {
40270 +static const struct backlight_ops compalbl_ops = {
40271 .get_brightness = bl_get_brightness,
40272 .update_status = bl_update_status,
40273 };
40274 diff --git a/drivers/platform/x86/dell-laptop.c b/drivers/platform/x86/dell-laptop.c
40275 index 07a74da..9dc99fa 100644
40276 --- a/drivers/platform/x86/dell-laptop.c
40277 +++ b/drivers/platform/x86/dell-laptop.c
40278 @@ -318,7 +318,7 @@ static int dell_get_intensity(struct backlight_device *bd)
40279 return buffer.output[1];
40280 }
40281
40282 -static struct backlight_ops dell_ops = {
40283 +static const struct backlight_ops dell_ops = {
40284 .get_brightness = dell_get_intensity,
40285 .update_status = dell_send_intensity,
40286 };
40287 diff --git a/drivers/platform/x86/eeepc-laptop.c b/drivers/platform/x86/eeepc-laptop.c
40288 index c533b1c..5c81f22 100644
40289 --- a/drivers/platform/x86/eeepc-laptop.c
40290 +++ b/drivers/platform/x86/eeepc-laptop.c
40291 @@ -245,7 +245,7 @@ static struct device *eeepc_hwmon_device;
40292 */
40293 static int read_brightness(struct backlight_device *bd);
40294 static int update_bl_status(struct backlight_device *bd);
40295 -static struct backlight_ops eeepcbl_ops = {
40296 +static const struct backlight_ops eeepcbl_ops = {
40297 .get_brightness = read_brightness,
40298 .update_status = update_bl_status,
40299 };
40300 diff --git a/drivers/platform/x86/fujitsu-laptop.c b/drivers/platform/x86/fujitsu-laptop.c
40301 index bcd4ba8..a249b35 100644
40302 --- a/drivers/platform/x86/fujitsu-laptop.c
40303 +++ b/drivers/platform/x86/fujitsu-laptop.c
40304 @@ -436,7 +436,7 @@ static int bl_update_status(struct backlight_device *b)
40305 return ret;
40306 }
40307
40308 -static struct backlight_ops fujitsubl_ops = {
40309 +static const struct backlight_ops fujitsubl_ops = {
40310 .get_brightness = bl_get_brightness,
40311 .update_status = bl_update_status,
40312 };
40313 diff --git a/drivers/platform/x86/msi-laptop.c b/drivers/platform/x86/msi-laptop.c
40314 index 759763d..1093ba2 100644
40315 --- a/drivers/platform/x86/msi-laptop.c
40316 +++ b/drivers/platform/x86/msi-laptop.c
40317 @@ -161,7 +161,7 @@ static int bl_update_status(struct backlight_device *b)
40318 return set_lcd_level(b->props.brightness);
40319 }
40320
40321 -static struct backlight_ops msibl_ops = {
40322 +static const struct backlight_ops msibl_ops = {
40323 .get_brightness = bl_get_brightness,
40324 .update_status = bl_update_status,
40325 };
40326 diff --git a/drivers/platform/x86/panasonic-laptop.c b/drivers/platform/x86/panasonic-laptop.c
40327 index fe7cf01..9012d8d 100644
40328 --- a/drivers/platform/x86/panasonic-laptop.c
40329 +++ b/drivers/platform/x86/panasonic-laptop.c
40330 @@ -352,7 +352,7 @@ static int bl_set_status(struct backlight_device *bd)
40331 return acpi_pcc_write_sset(pcc, SINF_DC_CUR_BRIGHT, bright);
40332 }
40333
40334 -static struct backlight_ops pcc_backlight_ops = {
40335 +static const struct backlight_ops pcc_backlight_ops = {
40336 .get_brightness = bl_get,
40337 .update_status = bl_set_status,
40338 };
40339 diff --git a/drivers/platform/x86/sony-laptop.c b/drivers/platform/x86/sony-laptop.c
40340 index a2a742c..b37e25e 100644
40341 --- a/drivers/platform/x86/sony-laptop.c
40342 +++ b/drivers/platform/x86/sony-laptop.c
40343 @@ -850,7 +850,7 @@ static int sony_backlight_get_brightness(struct backlight_device *bd)
40344 }
40345
40346 static struct backlight_device *sony_backlight_device;
40347 -static struct backlight_ops sony_backlight_ops = {
40348 +static const struct backlight_ops sony_backlight_ops = {
40349 .update_status = sony_backlight_update_status,
40350 .get_brightness = sony_backlight_get_brightness,
40351 };
40352 diff --git a/drivers/platform/x86/thinkpad_acpi.c b/drivers/platform/x86/thinkpad_acpi.c
40353 index 68271ae..5e8fb10 100644
40354 --- a/drivers/platform/x86/thinkpad_acpi.c
40355 +++ b/drivers/platform/x86/thinkpad_acpi.c
40356 @@ -2139,7 +2139,7 @@ static int hotkey_mask_get(void)
40357 return 0;
40358 }
40359
40360 -void static hotkey_mask_warn_incomplete_mask(void)
40361 +static void hotkey_mask_warn_incomplete_mask(void)
40362 {
40363 /* log only what the user can fix... */
40364 const u32 wantedmask = hotkey_driver_mask &
40365 @@ -6125,7 +6125,7 @@ static void tpacpi_brightness_notify_change(void)
40366 BACKLIGHT_UPDATE_HOTKEY);
40367 }
40368
40369 -static struct backlight_ops ibm_backlight_data = {
40370 +static const struct backlight_ops ibm_backlight_data = {
40371 .get_brightness = brightness_get,
40372 .update_status = brightness_update_status,
40373 };
40374 diff --git a/drivers/platform/x86/toshiba_acpi.c b/drivers/platform/x86/toshiba_acpi.c
40375 index 51c0a8b..0786629 100644
40376 --- a/drivers/platform/x86/toshiba_acpi.c
40377 +++ b/drivers/platform/x86/toshiba_acpi.c
40378 @@ -671,7 +671,7 @@ static acpi_status remove_device(void)
40379 return AE_OK;
40380 }
40381
40382 -static struct backlight_ops toshiba_backlight_data = {
40383 +static const struct backlight_ops toshiba_backlight_data = {
40384 .get_brightness = get_lcd,
40385 .update_status = set_lcd_status,
40386 };
40387 diff --git a/drivers/pnp/pnpbios/bioscalls.c b/drivers/pnp/pnpbios/bioscalls.c
40388 index fc83783c..cf370d7 100644
40389 --- a/drivers/pnp/pnpbios/bioscalls.c
40390 +++ b/drivers/pnp/pnpbios/bioscalls.c
40391 @@ -60,7 +60,7 @@ do { \
40392 set_desc_limit(&gdt[(selname) >> 3], (size) - 1); \
40393 } while(0)
40394
40395 -static struct desc_struct bad_bios_desc = GDT_ENTRY_INIT(0x4092,
40396 +static const struct desc_struct bad_bios_desc = GDT_ENTRY_INIT(0x4093,
40397 (unsigned long)__va(0x400UL), PAGE_SIZE - 0x400 - 1);
40398
40399 /*
40400 @@ -97,7 +97,10 @@ static inline u16 call_pnp_bios(u16 func, u16 arg1, u16 arg2, u16 arg3,
40401
40402 cpu = get_cpu();
40403 save_desc_40 = get_cpu_gdt_table(cpu)[0x40 / 8];
40404 +
40405 + pax_open_kernel();
40406 get_cpu_gdt_table(cpu)[0x40 / 8] = bad_bios_desc;
40407 + pax_close_kernel();
40408
40409 /* On some boxes IRQ's during PnP BIOS calls are deadly. */
40410 spin_lock_irqsave(&pnp_bios_lock, flags);
40411 @@ -135,7 +138,10 @@ static inline u16 call_pnp_bios(u16 func, u16 arg1, u16 arg2, u16 arg3,
40412 :"memory");
40413 spin_unlock_irqrestore(&pnp_bios_lock, flags);
40414
40415 + pax_open_kernel();
40416 get_cpu_gdt_table(cpu)[0x40 / 8] = save_desc_40;
40417 + pax_close_kernel();
40418 +
40419 put_cpu();
40420
40421 /* If we get here and this is set then the PnP BIOS faulted on us. */
40422 @@ -469,7 +475,7 @@ int pnp_bios_read_escd(char *data, u32 nvram_base)
40423 return status;
40424 }
40425
40426 -void pnpbios_calls_init(union pnp_bios_install_struct *header)
40427 +void __init pnpbios_calls_init(union pnp_bios_install_struct *header)
40428 {
40429 int i;
40430
40431 @@ -477,6 +483,8 @@ void pnpbios_calls_init(union pnp_bios_install_struct *header)
40432 pnp_bios_callpoint.offset = header->fields.pm16offset;
40433 pnp_bios_callpoint.segment = PNP_CS16;
40434
40435 + pax_open_kernel();
40436 +
40437 for_each_possible_cpu(i) {
40438 struct desc_struct *gdt = get_cpu_gdt_table(i);
40439 if (!gdt)
40440 @@ -488,4 +496,6 @@ void pnpbios_calls_init(union pnp_bios_install_struct *header)
40441 set_desc_base(&gdt[GDT_ENTRY_PNPBIOS_DS],
40442 (unsigned long)__va(header->fields.pm16dseg));
40443 }
40444 +
40445 + pax_close_kernel();
40446 }
40447 diff --git a/drivers/pnp/resource.c b/drivers/pnp/resource.c
40448 index ba97654..66b99d4 100644
40449 --- a/drivers/pnp/resource.c
40450 +++ b/drivers/pnp/resource.c
40451 @@ -355,7 +355,7 @@ int pnp_check_irq(struct pnp_dev *dev, struct resource *res)
40452 return 1;
40453
40454 /* check if the resource is valid */
40455 - if (*irq < 0 || *irq > 15)
40456 + if (*irq > 15)
40457 return 0;
40458
40459 /* check if the resource is reserved */
40460 @@ -419,7 +419,7 @@ int pnp_check_dma(struct pnp_dev *dev, struct resource *res)
40461 return 1;
40462
40463 /* check if the resource is valid */
40464 - if (*dma < 0 || *dma == 4 || *dma > 7)
40465 + if (*dma == 4 || *dma > 7)
40466 return 0;
40467
40468 /* check if the resource is reserved */
40469 diff --git a/drivers/power/bq27x00_battery.c b/drivers/power/bq27x00_battery.c
40470 index 62bb981..24a2dc9 100644
40471 --- a/drivers/power/bq27x00_battery.c
40472 +++ b/drivers/power/bq27x00_battery.c
40473 @@ -44,7 +44,7 @@ struct bq27x00_device_info;
40474 struct bq27x00_access_methods {
40475 int (*read)(u8 reg, int *rt_value, int b_single,
40476 struct bq27x00_device_info *di);
40477 -};
40478 +} __no_const;
40479
40480 struct bq27x00_device_info {
40481 struct device *dev;
40482 diff --git a/drivers/rtc/rtc-dev.c b/drivers/rtc/rtc-dev.c
40483 index 62227cd..b5b538b 100644
40484 --- a/drivers/rtc/rtc-dev.c
40485 +++ b/drivers/rtc/rtc-dev.c
40486 @@ -14,6 +14,7 @@
40487 #include <linux/module.h>
40488 #include <linux/rtc.h>
40489 #include <linux/sched.h>
40490 +#include <linux/grsecurity.h>
40491 #include "rtc-core.h"
40492
40493 static dev_t rtc_devt;
40494 @@ -357,6 +358,8 @@ static long rtc_dev_ioctl(struct file *file,
40495 if (copy_from_user(&tm, uarg, sizeof(tm)))
40496 return -EFAULT;
40497
40498 + gr_log_timechange();
40499 +
40500 return rtc_set_time(rtc, &tm);
40501
40502 case RTC_PIE_ON:
40503 diff --git a/drivers/s390/cio/qdio_perf.c b/drivers/s390/cio/qdio_perf.c
40504 index 968e3c7..fbc637a 100644
40505 --- a/drivers/s390/cio/qdio_perf.c
40506 +++ b/drivers/s390/cio/qdio_perf.c
40507 @@ -31,51 +31,51 @@ static struct proc_dir_entry *qdio_perf_pde;
40508 static int qdio_perf_proc_show(struct seq_file *m, void *v)
40509 {
40510 seq_printf(m, "Number of qdio interrupts\t\t\t: %li\n",
40511 - (long)atomic_long_read(&perf_stats.qdio_int));
40512 + (long)atomic_long_read_unchecked(&perf_stats.qdio_int));
40513 seq_printf(m, "Number of PCI interrupts\t\t\t: %li\n",
40514 - (long)atomic_long_read(&perf_stats.pci_int));
40515 + (long)atomic_long_read_unchecked(&perf_stats.pci_int));
40516 seq_printf(m, "Number of adapter interrupts\t\t\t: %li\n",
40517 - (long)atomic_long_read(&perf_stats.thin_int));
40518 + (long)atomic_long_read_unchecked(&perf_stats.thin_int));
40519 seq_printf(m, "\n");
40520 seq_printf(m, "Inbound tasklet runs\t\t\t\t: %li\n",
40521 - (long)atomic_long_read(&perf_stats.tasklet_inbound));
40522 + (long)atomic_long_read_unchecked(&perf_stats.tasklet_inbound));
40523 seq_printf(m, "Outbound tasklet runs\t\t\t\t: %li\n",
40524 - (long)atomic_long_read(&perf_stats.tasklet_outbound));
40525 + (long)atomic_long_read_unchecked(&perf_stats.tasklet_outbound));
40526 seq_printf(m, "Adapter interrupt tasklet runs/loops\t\t: %li/%li\n",
40527 - (long)atomic_long_read(&perf_stats.tasklet_thinint),
40528 - (long)atomic_long_read(&perf_stats.tasklet_thinint_loop));
40529 + (long)atomic_long_read_unchecked(&perf_stats.tasklet_thinint),
40530 + (long)atomic_long_read_unchecked(&perf_stats.tasklet_thinint_loop));
40531 seq_printf(m, "Adapter interrupt inbound tasklet runs/loops\t: %li/%li\n",
40532 - (long)atomic_long_read(&perf_stats.thinint_inbound),
40533 - (long)atomic_long_read(&perf_stats.thinint_inbound_loop));
40534 + (long)atomic_long_read_unchecked(&perf_stats.thinint_inbound),
40535 + (long)atomic_long_read_unchecked(&perf_stats.thinint_inbound_loop));
40536 seq_printf(m, "\n");
40537 seq_printf(m, "Number of SIGA In issued\t\t\t: %li\n",
40538 - (long)atomic_long_read(&perf_stats.siga_in));
40539 + (long)atomic_long_read_unchecked(&perf_stats.siga_in));
40540 seq_printf(m, "Number of SIGA Out issued\t\t\t: %li\n",
40541 - (long)atomic_long_read(&perf_stats.siga_out));
40542 + (long)atomic_long_read_unchecked(&perf_stats.siga_out));
40543 seq_printf(m, "Number of SIGA Sync issued\t\t\t: %li\n",
40544 - (long)atomic_long_read(&perf_stats.siga_sync));
40545 + (long)atomic_long_read_unchecked(&perf_stats.siga_sync));
40546 seq_printf(m, "\n");
40547 seq_printf(m, "Number of inbound transfers\t\t\t: %li\n",
40548 - (long)atomic_long_read(&perf_stats.inbound_handler));
40549 + (long)atomic_long_read_unchecked(&perf_stats.inbound_handler));
40550 seq_printf(m, "Number of outbound transfers\t\t\t: %li\n",
40551 - (long)atomic_long_read(&perf_stats.outbound_handler));
40552 + (long)atomic_long_read_unchecked(&perf_stats.outbound_handler));
40553 seq_printf(m, "\n");
40554 seq_printf(m, "Number of fast requeues (outg. SBAL w/o SIGA)\t: %li\n",
40555 - (long)atomic_long_read(&perf_stats.fast_requeue));
40556 + (long)atomic_long_read_unchecked(&perf_stats.fast_requeue));
40557 seq_printf(m, "Number of outbound target full condition\t: %li\n",
40558 - (long)atomic_long_read(&perf_stats.outbound_target_full));
40559 + (long)atomic_long_read_unchecked(&perf_stats.outbound_target_full));
40560 seq_printf(m, "Number of outbound tasklet mod_timer calls\t: %li\n",
40561 - (long)atomic_long_read(&perf_stats.debug_tl_out_timer));
40562 + (long)atomic_long_read_unchecked(&perf_stats.debug_tl_out_timer));
40563 seq_printf(m, "Number of stop polling calls\t\t\t: %li\n",
40564 - (long)atomic_long_read(&perf_stats.debug_stop_polling));
40565 + (long)atomic_long_read_unchecked(&perf_stats.debug_stop_polling));
40566 seq_printf(m, "AI inbound tasklet loops after stop polling\t: %li\n",
40567 - (long)atomic_long_read(&perf_stats.thinint_inbound_loop2));
40568 + (long)atomic_long_read_unchecked(&perf_stats.thinint_inbound_loop2));
40569 seq_printf(m, "QEBSM EQBS total/incomplete\t\t\t: %li/%li\n",
40570 - (long)atomic_long_read(&perf_stats.debug_eqbs_all),
40571 - (long)atomic_long_read(&perf_stats.debug_eqbs_incomplete));
40572 + (long)atomic_long_read_unchecked(&perf_stats.debug_eqbs_all),
40573 + (long)atomic_long_read_unchecked(&perf_stats.debug_eqbs_incomplete));
40574 seq_printf(m, "QEBSM SQBS total/incomplete\t\t\t: %li/%li\n",
40575 - (long)atomic_long_read(&perf_stats.debug_sqbs_all),
40576 - (long)atomic_long_read(&perf_stats.debug_sqbs_incomplete));
40577 + (long)atomic_long_read_unchecked(&perf_stats.debug_sqbs_all),
40578 + (long)atomic_long_read_unchecked(&perf_stats.debug_sqbs_incomplete));
40579 seq_printf(m, "\n");
40580 return 0;
40581 }
40582 diff --git a/drivers/s390/cio/qdio_perf.h b/drivers/s390/cio/qdio_perf.h
40583 index ff4504c..b3604c3 100644
40584 --- a/drivers/s390/cio/qdio_perf.h
40585 +++ b/drivers/s390/cio/qdio_perf.h
40586 @@ -13,46 +13,46 @@
40587
40588 struct qdio_perf_stats {
40589 /* interrupt handler calls */
40590 - atomic_long_t qdio_int;
40591 - atomic_long_t pci_int;
40592 - atomic_long_t thin_int;
40593 + atomic_long_unchecked_t qdio_int;
40594 + atomic_long_unchecked_t pci_int;
40595 + atomic_long_unchecked_t thin_int;
40596
40597 /* tasklet runs */
40598 - atomic_long_t tasklet_inbound;
40599 - atomic_long_t tasklet_outbound;
40600 - atomic_long_t tasklet_thinint;
40601 - atomic_long_t tasklet_thinint_loop;
40602 - atomic_long_t thinint_inbound;
40603 - atomic_long_t thinint_inbound_loop;
40604 - atomic_long_t thinint_inbound_loop2;
40605 + atomic_long_unchecked_t tasklet_inbound;
40606 + atomic_long_unchecked_t tasklet_outbound;
40607 + atomic_long_unchecked_t tasklet_thinint;
40608 + atomic_long_unchecked_t tasklet_thinint_loop;
40609 + atomic_long_unchecked_t thinint_inbound;
40610 + atomic_long_unchecked_t thinint_inbound_loop;
40611 + atomic_long_unchecked_t thinint_inbound_loop2;
40612
40613 /* signal adapter calls */
40614 - atomic_long_t siga_out;
40615 - atomic_long_t siga_in;
40616 - atomic_long_t siga_sync;
40617 + atomic_long_unchecked_t siga_out;
40618 + atomic_long_unchecked_t siga_in;
40619 + atomic_long_unchecked_t siga_sync;
40620
40621 /* misc */
40622 - atomic_long_t inbound_handler;
40623 - atomic_long_t outbound_handler;
40624 - atomic_long_t fast_requeue;
40625 - atomic_long_t outbound_target_full;
40626 + atomic_long_unchecked_t inbound_handler;
40627 + atomic_long_unchecked_t outbound_handler;
40628 + atomic_long_unchecked_t fast_requeue;
40629 + atomic_long_unchecked_t outbound_target_full;
40630
40631 /* for debugging */
40632 - atomic_long_t debug_tl_out_timer;
40633 - atomic_long_t debug_stop_polling;
40634 - atomic_long_t debug_eqbs_all;
40635 - atomic_long_t debug_eqbs_incomplete;
40636 - atomic_long_t debug_sqbs_all;
40637 - atomic_long_t debug_sqbs_incomplete;
40638 + atomic_long_unchecked_t debug_tl_out_timer;
40639 + atomic_long_unchecked_t debug_stop_polling;
40640 + atomic_long_unchecked_t debug_eqbs_all;
40641 + atomic_long_unchecked_t debug_eqbs_incomplete;
40642 + atomic_long_unchecked_t debug_sqbs_all;
40643 + atomic_long_unchecked_t debug_sqbs_incomplete;
40644 };
40645
40646 extern struct qdio_perf_stats perf_stats;
40647 extern int qdio_performance_stats;
40648
40649 -static inline void qdio_perf_stat_inc(atomic_long_t *count)
40650 +static inline void qdio_perf_stat_inc(atomic_long_unchecked_t *count)
40651 {
40652 if (qdio_performance_stats)
40653 - atomic_long_inc(count);
40654 + atomic_long_inc_unchecked(count);
40655 }
40656
40657 int qdio_setup_perf_stats(void);
40658 diff --git a/drivers/scsi/BusLogic.c b/drivers/scsi/BusLogic.c
40659 index 1ddcf40..a85f062 100644
40660 --- a/drivers/scsi/BusLogic.c
40661 +++ b/drivers/scsi/BusLogic.c
40662 @@ -961,6 +961,8 @@ static int __init BusLogic_InitializeFlashPointProbeInfo(struct BusLogic_HostAda
40663 static void __init BusLogic_InitializeProbeInfoList(struct BusLogic_HostAdapter
40664 *PrototypeHostAdapter)
40665 {
40666 + pax_track_stack();
40667 +
40668 /*
40669 If a PCI BIOS is present, interrogate it for MultiMaster and FlashPoint
40670 Host Adapters; otherwise, default to the standard ISA MultiMaster probe.
40671 diff --git a/drivers/scsi/aacraid/aacraid.h b/drivers/scsi/aacraid/aacraid.h
40672 index cdbdec9..b7d560b 100644
40673 --- a/drivers/scsi/aacraid/aacraid.h
40674 +++ b/drivers/scsi/aacraid/aacraid.h
40675 @@ -471,7 +471,7 @@ struct adapter_ops
40676 int (*adapter_scsi)(struct fib * fib, struct scsi_cmnd * cmd);
40677 /* Administrative operations */
40678 int (*adapter_comm)(struct aac_dev * dev, int comm);
40679 -};
40680 +} __no_const;
40681
40682 /*
40683 * Define which interrupt handler needs to be installed
40684 diff --git a/drivers/scsi/aacraid/commctrl.c b/drivers/scsi/aacraid/commctrl.c
40685 index a5b8e7b..a6a0e43 100644
40686 --- a/drivers/scsi/aacraid/commctrl.c
40687 +++ b/drivers/scsi/aacraid/commctrl.c
40688 @@ -481,6 +481,7 @@ static int aac_send_raw_srb(struct aac_dev* dev, void __user * arg)
40689 u32 actual_fibsize64, actual_fibsize = 0;
40690 int i;
40691
40692 + pax_track_stack();
40693
40694 if (dev->in_reset) {
40695 dprintk((KERN_DEBUG"aacraid: send raw srb -EBUSY\n"));
40696 diff --git a/drivers/scsi/aacraid/linit.c b/drivers/scsi/aacraid/linit.c
40697 index 9b97c3e..f099725 100644
40698 --- a/drivers/scsi/aacraid/linit.c
40699 +++ b/drivers/scsi/aacraid/linit.c
40700 @@ -91,7 +91,7 @@ static DECLARE_PCI_DEVICE_TABLE(aac_pci_tbl) = {
40701 #elif defined(__devinitconst)
40702 static const struct pci_device_id aac_pci_tbl[] __devinitconst = {
40703 #else
40704 -static const struct pci_device_id aac_pci_tbl[] __devinitdata = {
40705 +static const struct pci_device_id aac_pci_tbl[] __devinitconst = {
40706 #endif
40707 { 0x1028, 0x0001, 0x1028, 0x0001, 0, 0, 0 }, /* PERC 2/Si (Iguana/PERC2Si) */
40708 { 0x1028, 0x0002, 0x1028, 0x0002, 0, 0, 1 }, /* PERC 3/Di (Opal/PERC3Di) */
40709 diff --git a/drivers/scsi/aic94xx/aic94xx_init.c b/drivers/scsi/aic94xx/aic94xx_init.c
40710 index 996f722..9127845 100644
40711 --- a/drivers/scsi/aic94xx/aic94xx_init.c
40712 +++ b/drivers/scsi/aic94xx/aic94xx_init.c
40713 @@ -485,7 +485,7 @@ static ssize_t asd_show_update_bios(struct device *dev,
40714 flash_error_table[i].reason);
40715 }
40716
40717 -static DEVICE_ATTR(update_bios, S_IRUGO|S_IWUGO,
40718 +static DEVICE_ATTR(update_bios, S_IRUGO|S_IWUSR,
40719 asd_show_update_bios, asd_store_update_bios);
40720
40721 static int asd_create_dev_attrs(struct asd_ha_struct *asd_ha)
40722 @@ -1011,7 +1011,7 @@ static struct sas_domain_function_template aic94xx_transport_functions = {
40723 .lldd_control_phy = asd_control_phy,
40724 };
40725
40726 -static const struct pci_device_id aic94xx_pci_table[] __devinitdata = {
40727 +static const struct pci_device_id aic94xx_pci_table[] __devinitconst = {
40728 {PCI_DEVICE(PCI_VENDOR_ID_ADAPTEC2, 0x410),0, 0, 1},
40729 {PCI_DEVICE(PCI_VENDOR_ID_ADAPTEC2, 0x412),0, 0, 1},
40730 {PCI_DEVICE(PCI_VENDOR_ID_ADAPTEC2, 0x416),0, 0, 1},
40731 diff --git a/drivers/scsi/bfa/bfa_ioc.h b/drivers/scsi/bfa/bfa_ioc.h
40732 index 58efd4b..cb48dc7 100644
40733 --- a/drivers/scsi/bfa/bfa_ioc.h
40734 +++ b/drivers/scsi/bfa/bfa_ioc.h
40735 @@ -127,7 +127,7 @@ struct bfa_ioc_cbfn_s {
40736 bfa_ioc_disable_cbfn_t disable_cbfn;
40737 bfa_ioc_hbfail_cbfn_t hbfail_cbfn;
40738 bfa_ioc_reset_cbfn_t reset_cbfn;
40739 -};
40740 +} __no_const;
40741
40742 /**
40743 * Heartbeat failure notification queue element.
40744 diff --git a/drivers/scsi/bfa/bfa_iocfc.h b/drivers/scsi/bfa/bfa_iocfc.h
40745 index 7ad177e..5503586 100644
40746 --- a/drivers/scsi/bfa/bfa_iocfc.h
40747 +++ b/drivers/scsi/bfa/bfa_iocfc.h
40748 @@ -61,7 +61,7 @@ struct bfa_hwif_s {
40749 void (*hw_isr_mode_set)(struct bfa_s *bfa, bfa_boolean_t msix);
40750 void (*hw_msix_getvecs)(struct bfa_s *bfa, u32 *vecmap,
40751 u32 *nvecs, u32 *maxvec);
40752 -};
40753 +} __no_const;
40754 typedef void (*bfa_cb_iocfc_t) (void *cbarg, enum bfa_status status);
40755
40756 struct bfa_iocfc_s {
40757 diff --git a/drivers/scsi/dpt_i2o.c b/drivers/scsi/dpt_i2o.c
40758 index 4967643..cbec06b 100644
40759 --- a/drivers/scsi/dpt_i2o.c
40760 +++ b/drivers/scsi/dpt_i2o.c
40761 @@ -1804,6 +1804,8 @@ static int adpt_i2o_passthru(adpt_hba* pHba, u32 __user *arg)
40762 dma_addr_t addr;
40763 ulong flags = 0;
40764
40765 + pax_track_stack();
40766 +
40767 memset(&msg, 0, MAX_MESSAGE_SIZE*4);
40768 // get user msg size in u32s
40769 if(get_user(size, &user_msg[0])){
40770 @@ -2297,6 +2299,8 @@ static s32 adpt_scsi_to_i2o(adpt_hba* pHba, struct scsi_cmnd* cmd, struct adpt_d
40771 s32 rcode;
40772 dma_addr_t addr;
40773
40774 + pax_track_stack();
40775 +
40776 memset(msg, 0 , sizeof(msg));
40777 len = scsi_bufflen(cmd);
40778 direction = 0x00000000;
40779 diff --git a/drivers/scsi/eata.c b/drivers/scsi/eata.c
40780 index c7076ce..e20c67c 100644
40781 --- a/drivers/scsi/eata.c
40782 +++ b/drivers/scsi/eata.c
40783 @@ -1087,6 +1087,8 @@ static int port_detect(unsigned long port_base, unsigned int j,
40784 struct hostdata *ha;
40785 char name[16];
40786
40787 + pax_track_stack();
40788 +
40789 sprintf(name, "%s%d", driver_name, j);
40790
40791 if (!request_region(port_base, REGION_SIZE, driver_name)) {
40792 diff --git a/drivers/scsi/fcoe/libfcoe.c b/drivers/scsi/fcoe/libfcoe.c
40793 index 11ae5c9..891daec 100644
40794 --- a/drivers/scsi/fcoe/libfcoe.c
40795 +++ b/drivers/scsi/fcoe/libfcoe.c
40796 @@ -809,6 +809,8 @@ static void fcoe_ctlr_recv_els(struct fcoe_ctlr *fip, struct sk_buff *skb)
40797 size_t rlen;
40798 size_t dlen;
40799
40800 + pax_track_stack();
40801 +
40802 fiph = (struct fip_header *)skb->data;
40803 sub = fiph->fip_subcode;
40804 if (sub != FIP_SC_REQ && sub != FIP_SC_REP)
40805 diff --git a/drivers/scsi/fnic/fnic_main.c b/drivers/scsi/fnic/fnic_main.c
40806 index 71c7bbe..e93088a 100644
40807 --- a/drivers/scsi/fnic/fnic_main.c
40808 +++ b/drivers/scsi/fnic/fnic_main.c
40809 @@ -669,7 +669,7 @@ static int __devinit fnic_probe(struct pci_dev *pdev,
40810 /* Start local port initiatialization */
40811
40812 lp->link_up = 0;
40813 - lp->tt = fnic_transport_template;
40814 + memcpy((void *)&lp->tt, &fnic_transport_template, sizeof(fnic_transport_template));
40815
40816 lp->max_retry_count = fnic->config.flogi_retries;
40817 lp->max_rport_retry_count = fnic->config.plogi_retries;
40818 diff --git a/drivers/scsi/gdth.c b/drivers/scsi/gdth.c
40819 index bb96d74..9ec3ce4 100644
40820 --- a/drivers/scsi/gdth.c
40821 +++ b/drivers/scsi/gdth.c
40822 @@ -4102,6 +4102,8 @@ static int ioc_lockdrv(void __user *arg)
40823 ulong flags;
40824 gdth_ha_str *ha;
40825
40826 + pax_track_stack();
40827 +
40828 if (copy_from_user(&ldrv, arg, sizeof(gdth_ioctl_lockdrv)))
40829 return -EFAULT;
40830 ha = gdth_find_ha(ldrv.ionode);
40831 @@ -4134,6 +4136,8 @@ static int ioc_resetdrv(void __user *arg, char *cmnd)
40832 gdth_ha_str *ha;
40833 int rval;
40834
40835 + pax_track_stack();
40836 +
40837 if (copy_from_user(&res, arg, sizeof(gdth_ioctl_reset)) ||
40838 res.number >= MAX_HDRIVES)
40839 return -EFAULT;
40840 @@ -4169,6 +4173,8 @@ static int ioc_general(void __user *arg, char *cmnd)
40841 gdth_ha_str *ha;
40842 int rval;
40843
40844 + pax_track_stack();
40845 +
40846 if (copy_from_user(&gen, arg, sizeof(gdth_ioctl_general)))
40847 return -EFAULT;
40848 ha = gdth_find_ha(gen.ionode);
40849 @@ -4625,6 +4631,9 @@ static void gdth_flush(gdth_ha_str *ha)
40850 int i;
40851 gdth_cmd_str gdtcmd;
40852 char cmnd[MAX_COMMAND_SIZE];
40853 +
40854 + pax_track_stack();
40855 +
40856 memset(cmnd, 0xff, MAX_COMMAND_SIZE);
40857
40858 TRACE2(("gdth_flush() hanum %d\n", ha->hanum));
40859 diff --git a/drivers/scsi/gdth_proc.c b/drivers/scsi/gdth_proc.c
40860 index 1258da3..20d8ae6 100644
40861 --- a/drivers/scsi/gdth_proc.c
40862 +++ b/drivers/scsi/gdth_proc.c
40863 @@ -46,6 +46,9 @@ static int gdth_set_asc_info(struct Scsi_Host *host, char *buffer,
40864 ulong64 paddr;
40865
40866 char cmnd[MAX_COMMAND_SIZE];
40867 +
40868 + pax_track_stack();
40869 +
40870 memset(cmnd, 0xff, 12);
40871 memset(&gdtcmd, 0, sizeof(gdth_cmd_str));
40872
40873 @@ -174,6 +177,8 @@ static int gdth_get_info(char *buffer,char **start,off_t offset,int length,
40874 gdth_hget_str *phg;
40875 char cmnd[MAX_COMMAND_SIZE];
40876
40877 + pax_track_stack();
40878 +
40879 gdtcmd = kmalloc(sizeof(*gdtcmd), GFP_KERNEL);
40880 estr = kmalloc(sizeof(*estr), GFP_KERNEL);
40881 if (!gdtcmd || !estr)
40882 diff --git a/drivers/scsi/hosts.c b/drivers/scsi/hosts.c
40883 index d03a926..f324286 100644
40884 --- a/drivers/scsi/hosts.c
40885 +++ b/drivers/scsi/hosts.c
40886 @@ -40,7 +40,7 @@
40887 #include "scsi_logging.h"
40888
40889
40890 -static atomic_t scsi_host_next_hn; /* host_no for next new host */
40891 +static atomic_unchecked_t scsi_host_next_hn; /* host_no for next new host */
40892
40893
40894 static void scsi_host_cls_release(struct device *dev)
40895 @@ -347,7 +347,7 @@ struct Scsi_Host *scsi_host_alloc(struct scsi_host_template *sht, int privsize)
40896 * subtract one because we increment first then return, but we need to
40897 * know what the next host number was before increment
40898 */
40899 - shost->host_no = atomic_inc_return(&scsi_host_next_hn) - 1;
40900 + shost->host_no = atomic_inc_return_unchecked(&scsi_host_next_hn) - 1;
40901 shost->dma_channel = 0xff;
40902
40903 /* These three are default values which can be overridden */
40904 diff --git a/drivers/scsi/ipr.c b/drivers/scsi/ipr.c
40905 index a601159..55e19d2 100644
40906 --- a/drivers/scsi/ipr.c
40907 +++ b/drivers/scsi/ipr.c
40908 @@ -5286,7 +5286,7 @@ static bool ipr_qc_fill_rtf(struct ata_queued_cmd *qc)
40909 return true;
40910 }
40911
40912 -static struct ata_port_operations ipr_sata_ops = {
40913 +static const struct ata_port_operations ipr_sata_ops = {
40914 .phy_reset = ipr_ata_phy_reset,
40915 .hardreset = ipr_sata_reset,
40916 .post_internal_cmd = ipr_ata_post_internal,
40917 diff --git a/drivers/scsi/ips.h b/drivers/scsi/ips.h
40918 index 4e49fbc..97907ff 100644
40919 --- a/drivers/scsi/ips.h
40920 +++ b/drivers/scsi/ips.h
40921 @@ -1027,7 +1027,7 @@ typedef struct {
40922 int (*intr)(struct ips_ha *);
40923 void (*enableint)(struct ips_ha *);
40924 uint32_t (*statupd)(struct ips_ha *);
40925 -} ips_hw_func_t;
40926 +} __no_const ips_hw_func_t;
40927
40928 typedef struct ips_ha {
40929 uint8_t ha_id[IPS_MAX_CHANNELS+1];
40930 diff --git a/drivers/scsi/libfc/fc_exch.c b/drivers/scsi/libfc/fc_exch.c
40931 index c1c1574..a9c9348 100644
40932 --- a/drivers/scsi/libfc/fc_exch.c
40933 +++ b/drivers/scsi/libfc/fc_exch.c
40934 @@ -86,12 +86,12 @@ struct fc_exch_mgr {
40935 * all together if not used XXX
40936 */
40937 struct {
40938 - atomic_t no_free_exch;
40939 - atomic_t no_free_exch_xid;
40940 - atomic_t xid_not_found;
40941 - atomic_t xid_busy;
40942 - atomic_t seq_not_found;
40943 - atomic_t non_bls_resp;
40944 + atomic_unchecked_t no_free_exch;
40945 + atomic_unchecked_t no_free_exch_xid;
40946 + atomic_unchecked_t xid_not_found;
40947 + atomic_unchecked_t xid_busy;
40948 + atomic_unchecked_t seq_not_found;
40949 + atomic_unchecked_t non_bls_resp;
40950 } stats;
40951 };
40952 #define fc_seq_exch(sp) container_of(sp, struct fc_exch, seq)
40953 @@ -510,7 +510,7 @@ static struct fc_exch *fc_exch_em_alloc(struct fc_lport *lport,
40954 /* allocate memory for exchange */
40955 ep = mempool_alloc(mp->ep_pool, GFP_ATOMIC);
40956 if (!ep) {
40957 - atomic_inc(&mp->stats.no_free_exch);
40958 + atomic_inc_unchecked(&mp->stats.no_free_exch);
40959 goto out;
40960 }
40961 memset(ep, 0, sizeof(*ep));
40962 @@ -557,7 +557,7 @@ out:
40963 return ep;
40964 err:
40965 spin_unlock_bh(&pool->lock);
40966 - atomic_inc(&mp->stats.no_free_exch_xid);
40967 + atomic_inc_unchecked(&mp->stats.no_free_exch_xid);
40968 mempool_free(ep, mp->ep_pool);
40969 return NULL;
40970 }
40971 @@ -690,7 +690,7 @@ static enum fc_pf_rjt_reason fc_seq_lookup_recip(struct fc_lport *lport,
40972 xid = ntohs(fh->fh_ox_id); /* we originated exch */
40973 ep = fc_exch_find(mp, xid);
40974 if (!ep) {
40975 - atomic_inc(&mp->stats.xid_not_found);
40976 + atomic_inc_unchecked(&mp->stats.xid_not_found);
40977 reject = FC_RJT_OX_ID;
40978 goto out;
40979 }
40980 @@ -720,7 +720,7 @@ static enum fc_pf_rjt_reason fc_seq_lookup_recip(struct fc_lport *lport,
40981 ep = fc_exch_find(mp, xid);
40982 if ((f_ctl & FC_FC_FIRST_SEQ) && fc_sof_is_init(fr_sof(fp))) {
40983 if (ep) {
40984 - atomic_inc(&mp->stats.xid_busy);
40985 + atomic_inc_unchecked(&mp->stats.xid_busy);
40986 reject = FC_RJT_RX_ID;
40987 goto rel;
40988 }
40989 @@ -731,7 +731,7 @@ static enum fc_pf_rjt_reason fc_seq_lookup_recip(struct fc_lport *lport,
40990 }
40991 xid = ep->xid; /* get our XID */
40992 } else if (!ep) {
40993 - atomic_inc(&mp->stats.xid_not_found);
40994 + atomic_inc_unchecked(&mp->stats.xid_not_found);
40995 reject = FC_RJT_RX_ID; /* XID not found */
40996 goto out;
40997 }
40998 @@ -752,7 +752,7 @@ static enum fc_pf_rjt_reason fc_seq_lookup_recip(struct fc_lport *lport,
40999 } else {
41000 sp = &ep->seq;
41001 if (sp->id != fh->fh_seq_id) {
41002 - atomic_inc(&mp->stats.seq_not_found);
41003 + atomic_inc_unchecked(&mp->stats.seq_not_found);
41004 reject = FC_RJT_SEQ_ID; /* sequence/exch should exist */
41005 goto rel;
41006 }
41007 @@ -1163,22 +1163,22 @@ static void fc_exch_recv_seq_resp(struct fc_exch_mgr *mp, struct fc_frame *fp)
41008
41009 ep = fc_exch_find(mp, ntohs(fh->fh_ox_id));
41010 if (!ep) {
41011 - atomic_inc(&mp->stats.xid_not_found);
41012 + atomic_inc_unchecked(&mp->stats.xid_not_found);
41013 goto out;
41014 }
41015 if (ep->esb_stat & ESB_ST_COMPLETE) {
41016 - atomic_inc(&mp->stats.xid_not_found);
41017 + atomic_inc_unchecked(&mp->stats.xid_not_found);
41018 goto out;
41019 }
41020 if (ep->rxid == FC_XID_UNKNOWN)
41021 ep->rxid = ntohs(fh->fh_rx_id);
41022 if (ep->sid != 0 && ep->sid != ntoh24(fh->fh_d_id)) {
41023 - atomic_inc(&mp->stats.xid_not_found);
41024 + atomic_inc_unchecked(&mp->stats.xid_not_found);
41025 goto rel;
41026 }
41027 if (ep->did != ntoh24(fh->fh_s_id) &&
41028 ep->did != FC_FID_FLOGI) {
41029 - atomic_inc(&mp->stats.xid_not_found);
41030 + atomic_inc_unchecked(&mp->stats.xid_not_found);
41031 goto rel;
41032 }
41033 sof = fr_sof(fp);
41034 @@ -1189,7 +1189,7 @@ static void fc_exch_recv_seq_resp(struct fc_exch_mgr *mp, struct fc_frame *fp)
41035 } else {
41036 sp = &ep->seq;
41037 if (sp->id != fh->fh_seq_id) {
41038 - atomic_inc(&mp->stats.seq_not_found);
41039 + atomic_inc_unchecked(&mp->stats.seq_not_found);
41040 goto rel;
41041 }
41042 }
41043 @@ -1249,9 +1249,9 @@ static void fc_exch_recv_resp(struct fc_exch_mgr *mp, struct fc_frame *fp)
41044 sp = fc_seq_lookup_orig(mp, fp); /* doesn't hold sequence */
41045
41046 if (!sp)
41047 - atomic_inc(&mp->stats.xid_not_found);
41048 + atomic_inc_unchecked(&mp->stats.xid_not_found);
41049 else
41050 - atomic_inc(&mp->stats.non_bls_resp);
41051 + atomic_inc_unchecked(&mp->stats.non_bls_resp);
41052
41053 fc_frame_free(fp);
41054 }
41055 diff --git a/drivers/scsi/libsas/sas_ata.c b/drivers/scsi/libsas/sas_ata.c
41056 index 0ee989f..a582241 100644
41057 --- a/drivers/scsi/libsas/sas_ata.c
41058 +++ b/drivers/scsi/libsas/sas_ata.c
41059 @@ -343,7 +343,7 @@ static int sas_ata_scr_read(struct ata_link *link, unsigned int sc_reg_in,
41060 }
41061 }
41062
41063 -static struct ata_port_operations sas_sata_ops = {
41064 +static const struct ata_port_operations sas_sata_ops = {
41065 .phy_reset = sas_ata_phy_reset,
41066 .post_internal_cmd = sas_ata_post_internal,
41067 .qc_defer = ata_std_qc_defer,
41068 diff --git a/drivers/scsi/lpfc/lpfc.h b/drivers/scsi/lpfc/lpfc.h
41069 index aa10f79..5cc79e4 100644
41070 --- a/drivers/scsi/lpfc/lpfc.h
41071 +++ b/drivers/scsi/lpfc/lpfc.h
41072 @@ -400,7 +400,7 @@ struct lpfc_vport {
41073 struct dentry *debug_nodelist;
41074 struct dentry *vport_debugfs_root;
41075 struct lpfc_debugfs_trc *disc_trc;
41076 - atomic_t disc_trc_cnt;
41077 + atomic_unchecked_t disc_trc_cnt;
41078 #endif
41079 uint8_t stat_data_enabled;
41080 uint8_t stat_data_blocked;
41081 @@ -725,8 +725,8 @@ struct lpfc_hba {
41082 struct timer_list fabric_block_timer;
41083 unsigned long bit_flags;
41084 #define FABRIC_COMANDS_BLOCKED 0
41085 - atomic_t num_rsrc_err;
41086 - atomic_t num_cmd_success;
41087 + atomic_unchecked_t num_rsrc_err;
41088 + atomic_unchecked_t num_cmd_success;
41089 unsigned long last_rsrc_error_time;
41090 unsigned long last_ramp_down_time;
41091 unsigned long last_ramp_up_time;
41092 @@ -740,7 +740,7 @@ struct lpfc_hba {
41093 struct dentry *debug_dumpDif; /* BlockGuard BPL*/
41094 struct dentry *debug_slow_ring_trc;
41095 struct lpfc_debugfs_trc *slow_ring_trc;
41096 - atomic_t slow_ring_trc_cnt;
41097 + atomic_unchecked_t slow_ring_trc_cnt;
41098 #endif
41099
41100 /* Used for deferred freeing of ELS data buffers */
41101 diff --git a/drivers/scsi/lpfc/lpfc_debugfs.c b/drivers/scsi/lpfc/lpfc_debugfs.c
41102 index 8d0f0de..7c77a62 100644
41103 --- a/drivers/scsi/lpfc/lpfc_debugfs.c
41104 +++ b/drivers/scsi/lpfc/lpfc_debugfs.c
41105 @@ -124,7 +124,7 @@ struct lpfc_debug {
41106 int len;
41107 };
41108
41109 -static atomic_t lpfc_debugfs_seq_trc_cnt = ATOMIC_INIT(0);
41110 +static atomic_unchecked_t lpfc_debugfs_seq_trc_cnt = ATOMIC_INIT(0);
41111 static unsigned long lpfc_debugfs_start_time = 0L;
41112
41113 /**
41114 @@ -158,7 +158,7 @@ lpfc_debugfs_disc_trc_data(struct lpfc_vport *vport, char *buf, int size)
41115 lpfc_debugfs_enable = 0;
41116
41117 len = 0;
41118 - index = (atomic_read(&vport->disc_trc_cnt) + 1) &
41119 + index = (atomic_read_unchecked(&vport->disc_trc_cnt) + 1) &
41120 (lpfc_debugfs_max_disc_trc - 1);
41121 for (i = index; i < lpfc_debugfs_max_disc_trc; i++) {
41122 dtp = vport->disc_trc + i;
41123 @@ -219,7 +219,7 @@ lpfc_debugfs_slow_ring_trc_data(struct lpfc_hba *phba, char *buf, int size)
41124 lpfc_debugfs_enable = 0;
41125
41126 len = 0;
41127 - index = (atomic_read(&phba->slow_ring_trc_cnt) + 1) &
41128 + index = (atomic_read_unchecked(&phba->slow_ring_trc_cnt) + 1) &
41129 (lpfc_debugfs_max_slow_ring_trc - 1);
41130 for (i = index; i < lpfc_debugfs_max_slow_ring_trc; i++) {
41131 dtp = phba->slow_ring_trc + i;
41132 @@ -397,6 +397,8 @@ lpfc_debugfs_dumpHBASlim_data(struct lpfc_hba *phba, char *buf, int size)
41133 uint32_t *ptr;
41134 char buffer[1024];
41135
41136 + pax_track_stack();
41137 +
41138 off = 0;
41139 spin_lock_irq(&phba->hbalock);
41140
41141 @@ -634,14 +636,14 @@ lpfc_debugfs_disc_trc(struct lpfc_vport *vport, int mask, char *fmt,
41142 !vport || !vport->disc_trc)
41143 return;
41144
41145 - index = atomic_inc_return(&vport->disc_trc_cnt) &
41146 + index = atomic_inc_return_unchecked(&vport->disc_trc_cnt) &
41147 (lpfc_debugfs_max_disc_trc - 1);
41148 dtp = vport->disc_trc + index;
41149 dtp->fmt = fmt;
41150 dtp->data1 = data1;
41151 dtp->data2 = data2;
41152 dtp->data3 = data3;
41153 - dtp->seq_cnt = atomic_inc_return(&lpfc_debugfs_seq_trc_cnt);
41154 + dtp->seq_cnt = atomic_inc_return_unchecked(&lpfc_debugfs_seq_trc_cnt);
41155 dtp->jif = jiffies;
41156 #endif
41157 return;
41158 @@ -672,14 +674,14 @@ lpfc_debugfs_slow_ring_trc(struct lpfc_hba *phba, char *fmt,
41159 !phba || !phba->slow_ring_trc)
41160 return;
41161
41162 - index = atomic_inc_return(&phba->slow_ring_trc_cnt) &
41163 + index = atomic_inc_return_unchecked(&phba->slow_ring_trc_cnt) &
41164 (lpfc_debugfs_max_slow_ring_trc - 1);
41165 dtp = phba->slow_ring_trc + index;
41166 dtp->fmt = fmt;
41167 dtp->data1 = data1;
41168 dtp->data2 = data2;
41169 dtp->data3 = data3;
41170 - dtp->seq_cnt = atomic_inc_return(&lpfc_debugfs_seq_trc_cnt);
41171 + dtp->seq_cnt = atomic_inc_return_unchecked(&lpfc_debugfs_seq_trc_cnt);
41172 dtp->jif = jiffies;
41173 #endif
41174 return;
41175 @@ -1364,7 +1366,7 @@ lpfc_debugfs_initialize(struct lpfc_vport *vport)
41176 "slow_ring buffer\n");
41177 goto debug_failed;
41178 }
41179 - atomic_set(&phba->slow_ring_trc_cnt, 0);
41180 + atomic_set_unchecked(&phba->slow_ring_trc_cnt, 0);
41181 memset(phba->slow_ring_trc, 0,
41182 (sizeof(struct lpfc_debugfs_trc) *
41183 lpfc_debugfs_max_slow_ring_trc));
41184 @@ -1410,7 +1412,7 @@ lpfc_debugfs_initialize(struct lpfc_vport *vport)
41185 "buffer\n");
41186 goto debug_failed;
41187 }
41188 - atomic_set(&vport->disc_trc_cnt, 0);
41189 + atomic_set_unchecked(&vport->disc_trc_cnt, 0);
41190
41191 snprintf(name, sizeof(name), "discovery_trace");
41192 vport->debug_disc_trc =
41193 diff --git a/drivers/scsi/lpfc/lpfc_init.c b/drivers/scsi/lpfc/lpfc_init.c
41194 index 549bc7d..8189dbb 100644
41195 --- a/drivers/scsi/lpfc/lpfc_init.c
41196 +++ b/drivers/scsi/lpfc/lpfc_init.c
41197 @@ -8021,8 +8021,10 @@ lpfc_init(void)
41198 printk(LPFC_COPYRIGHT "\n");
41199
41200 if (lpfc_enable_npiv) {
41201 - lpfc_transport_functions.vport_create = lpfc_vport_create;
41202 - lpfc_transport_functions.vport_delete = lpfc_vport_delete;
41203 + pax_open_kernel();
41204 + *(void **)&lpfc_transport_functions.vport_create = lpfc_vport_create;
41205 + *(void **)&lpfc_transport_functions.vport_delete = lpfc_vport_delete;
41206 + pax_close_kernel();
41207 }
41208 lpfc_transport_template =
41209 fc_attach_transport(&lpfc_transport_functions);
41210 diff --git a/drivers/scsi/lpfc/lpfc_scsi.c b/drivers/scsi/lpfc/lpfc_scsi.c
41211 index c88f59f..ff2a42f 100644
41212 --- a/drivers/scsi/lpfc/lpfc_scsi.c
41213 +++ b/drivers/scsi/lpfc/lpfc_scsi.c
41214 @@ -259,7 +259,7 @@ lpfc_rampdown_queue_depth(struct lpfc_hba *phba)
41215 uint32_t evt_posted;
41216
41217 spin_lock_irqsave(&phba->hbalock, flags);
41218 - atomic_inc(&phba->num_rsrc_err);
41219 + atomic_inc_unchecked(&phba->num_rsrc_err);
41220 phba->last_rsrc_error_time = jiffies;
41221
41222 if ((phba->last_ramp_down_time + QUEUE_RAMP_DOWN_INTERVAL) > jiffies) {
41223 @@ -300,7 +300,7 @@ lpfc_rampup_queue_depth(struct lpfc_vport *vport,
41224 unsigned long flags;
41225 struct lpfc_hba *phba = vport->phba;
41226 uint32_t evt_posted;
41227 - atomic_inc(&phba->num_cmd_success);
41228 + atomic_inc_unchecked(&phba->num_cmd_success);
41229
41230 if (vport->cfg_lun_queue_depth <= queue_depth)
41231 return;
41232 @@ -343,8 +343,8 @@ lpfc_ramp_down_queue_handler(struct lpfc_hba *phba)
41233 int i;
41234 struct lpfc_rport_data *rdata;
41235
41236 - num_rsrc_err = atomic_read(&phba->num_rsrc_err);
41237 - num_cmd_success = atomic_read(&phba->num_cmd_success);
41238 + num_rsrc_err = atomic_read_unchecked(&phba->num_rsrc_err);
41239 + num_cmd_success = atomic_read_unchecked(&phba->num_cmd_success);
41240
41241 vports = lpfc_create_vport_work_array(phba);
41242 if (vports != NULL)
41243 @@ -378,8 +378,8 @@ lpfc_ramp_down_queue_handler(struct lpfc_hba *phba)
41244 }
41245 }
41246 lpfc_destroy_vport_work_array(phba, vports);
41247 - atomic_set(&phba->num_rsrc_err, 0);
41248 - atomic_set(&phba->num_cmd_success, 0);
41249 + atomic_set_unchecked(&phba->num_rsrc_err, 0);
41250 + atomic_set_unchecked(&phba->num_cmd_success, 0);
41251 }
41252
41253 /**
41254 @@ -427,8 +427,8 @@ lpfc_ramp_up_queue_handler(struct lpfc_hba *phba)
41255 }
41256 }
41257 lpfc_destroy_vport_work_array(phba, vports);
41258 - atomic_set(&phba->num_rsrc_err, 0);
41259 - atomic_set(&phba->num_cmd_success, 0);
41260 + atomic_set_unchecked(&phba->num_rsrc_err, 0);
41261 + atomic_set_unchecked(&phba->num_cmd_success, 0);
41262 }
41263
41264 /**
41265 diff --git a/drivers/scsi/megaraid/megaraid_mbox.c b/drivers/scsi/megaraid/megaraid_mbox.c
41266 index 234f0b7..3020aea 100644
41267 --- a/drivers/scsi/megaraid/megaraid_mbox.c
41268 +++ b/drivers/scsi/megaraid/megaraid_mbox.c
41269 @@ -3503,6 +3503,8 @@ megaraid_cmm_register(adapter_t *adapter)
41270 int rval;
41271 int i;
41272
41273 + pax_track_stack();
41274 +
41275 // Allocate memory for the base list of scb for management module.
41276 adapter->uscb_list = kcalloc(MBOX_MAX_USER_CMDS, sizeof(scb_t), GFP_KERNEL);
41277
41278 diff --git a/drivers/scsi/osd/osd_initiator.c b/drivers/scsi/osd/osd_initiator.c
41279 index 7a117c1..ee01e9e 100644
41280 --- a/drivers/scsi/osd/osd_initiator.c
41281 +++ b/drivers/scsi/osd/osd_initiator.c
41282 @@ -94,6 +94,8 @@ static int _osd_print_system_info(struct osd_dev *od, void *caps)
41283 int nelem = ARRAY_SIZE(get_attrs), a = 0;
41284 int ret;
41285
41286 + pax_track_stack();
41287 +
41288 or = osd_start_request(od, GFP_KERNEL);
41289 if (!or)
41290 return -ENOMEM;
41291 diff --git a/drivers/scsi/pmcraid.c b/drivers/scsi/pmcraid.c
41292 index 9ab8c86..9425ad3 100644
41293 --- a/drivers/scsi/pmcraid.c
41294 +++ b/drivers/scsi/pmcraid.c
41295 @@ -189,8 +189,8 @@ static int pmcraid_slave_alloc(struct scsi_device *scsi_dev)
41296 res->scsi_dev = scsi_dev;
41297 scsi_dev->hostdata = res;
41298 res->change_detected = 0;
41299 - atomic_set(&res->read_failures, 0);
41300 - atomic_set(&res->write_failures, 0);
41301 + atomic_set_unchecked(&res->read_failures, 0);
41302 + atomic_set_unchecked(&res->write_failures, 0);
41303 rc = 0;
41304 }
41305 spin_unlock_irqrestore(&pinstance->resource_lock, lock_flags);
41306 @@ -2396,9 +2396,9 @@ static int pmcraid_error_handler(struct pmcraid_cmd *cmd)
41307
41308 /* If this was a SCSI read/write command keep count of errors */
41309 if (SCSI_CMD_TYPE(scsi_cmd->cmnd[0]) == SCSI_READ_CMD)
41310 - atomic_inc(&res->read_failures);
41311 + atomic_inc_unchecked(&res->read_failures);
41312 else if (SCSI_CMD_TYPE(scsi_cmd->cmnd[0]) == SCSI_WRITE_CMD)
41313 - atomic_inc(&res->write_failures);
41314 + atomic_inc_unchecked(&res->write_failures);
41315
41316 if (!RES_IS_GSCSI(res->cfg_entry) &&
41317 masked_ioasc != PMCRAID_IOASC_HW_DEVICE_BUS_STATUS_ERROR) {
41318 @@ -4116,7 +4116,7 @@ static void pmcraid_worker_function(struct work_struct *workp)
41319
41320 pinstance = container_of(workp, struct pmcraid_instance, worker_q);
41321 /* add resources only after host is added into system */
41322 - if (!atomic_read(&pinstance->expose_resources))
41323 + if (!atomic_read_unchecked(&pinstance->expose_resources))
41324 return;
41325
41326 spin_lock_irqsave(&pinstance->resource_lock, lock_flags);
41327 @@ -4850,7 +4850,7 @@ static int __devinit pmcraid_init_instance(
41328 init_waitqueue_head(&pinstance->reset_wait_q);
41329
41330 atomic_set(&pinstance->outstanding_cmds, 0);
41331 - atomic_set(&pinstance->expose_resources, 0);
41332 + atomic_set_unchecked(&pinstance->expose_resources, 0);
41333
41334 INIT_LIST_HEAD(&pinstance->free_res_q);
41335 INIT_LIST_HEAD(&pinstance->used_res_q);
41336 @@ -5502,7 +5502,7 @@ static int __devinit pmcraid_probe(
41337 /* Schedule worker thread to handle CCN and take care of adding and
41338 * removing devices to OS
41339 */
41340 - atomic_set(&pinstance->expose_resources, 1);
41341 + atomic_set_unchecked(&pinstance->expose_resources, 1);
41342 schedule_work(&pinstance->worker_q);
41343 return rc;
41344
41345 diff --git a/drivers/scsi/pmcraid.h b/drivers/scsi/pmcraid.h
41346 index 3441b3f..6cbe8f7 100644
41347 --- a/drivers/scsi/pmcraid.h
41348 +++ b/drivers/scsi/pmcraid.h
41349 @@ -690,7 +690,7 @@ struct pmcraid_instance {
41350 atomic_t outstanding_cmds;
41351
41352 /* should add/delete resources to mid-layer now ?*/
41353 - atomic_t expose_resources;
41354 + atomic_unchecked_t expose_resources;
41355
41356 /* Tasklet to handle deferred processing */
41357 struct tasklet_struct isr_tasklet[PMCRAID_NUM_MSIX_VECTORS];
41358 @@ -727,8 +727,8 @@ struct pmcraid_resource_entry {
41359 struct list_head queue; /* link to "to be exposed" resources */
41360 struct pmcraid_config_table_entry cfg_entry;
41361 struct scsi_device *scsi_dev; /* Link scsi_device structure */
41362 - atomic_t read_failures; /* count of failed READ commands */
41363 - atomic_t write_failures; /* count of failed WRITE commands */
41364 + atomic_unchecked_t read_failures; /* count of failed READ commands */
41365 + atomic_unchecked_t write_failures; /* count of failed WRITE commands */
41366
41367 /* To indicate add/delete/modify during CCN */
41368 u8 change_detected;
41369 diff --git a/drivers/scsi/qla2xxx/qla_def.h b/drivers/scsi/qla2xxx/qla_def.h
41370 index 2150618..7034215 100644
41371 --- a/drivers/scsi/qla2xxx/qla_def.h
41372 +++ b/drivers/scsi/qla2xxx/qla_def.h
41373 @@ -2089,7 +2089,7 @@ struct isp_operations {
41374
41375 int (*get_flash_version) (struct scsi_qla_host *, void *);
41376 int (*start_scsi) (srb_t *);
41377 -};
41378 +} __no_const;
41379
41380 /* MSI-X Support *************************************************************/
41381
41382 diff --git a/drivers/scsi/qla4xxx/ql4_def.h b/drivers/scsi/qla4xxx/ql4_def.h
41383 index 81b5f29..2ae1fad 100644
41384 --- a/drivers/scsi/qla4xxx/ql4_def.h
41385 +++ b/drivers/scsi/qla4xxx/ql4_def.h
41386 @@ -240,7 +240,7 @@ struct ddb_entry {
41387 atomic_t retry_relogin_timer; /* Min Time between relogins
41388 * (4000 only) */
41389 atomic_t relogin_timer; /* Max Time to wait for relogin to complete */
41390 - atomic_t relogin_retry_count; /* Num of times relogin has been
41391 + atomic_unchecked_t relogin_retry_count; /* Num of times relogin has been
41392 * retried */
41393
41394 uint16_t port;
41395 diff --git a/drivers/scsi/qla4xxx/ql4_init.c b/drivers/scsi/qla4xxx/ql4_init.c
41396 index af8c323..515dd51 100644
41397 --- a/drivers/scsi/qla4xxx/ql4_init.c
41398 +++ b/drivers/scsi/qla4xxx/ql4_init.c
41399 @@ -482,7 +482,7 @@ static struct ddb_entry * qla4xxx_alloc_ddb(struct scsi_qla_host *ha,
41400 atomic_set(&ddb_entry->port_down_timer, ha->port_down_retry_count);
41401 atomic_set(&ddb_entry->retry_relogin_timer, INVALID_ENTRY);
41402 atomic_set(&ddb_entry->relogin_timer, 0);
41403 - atomic_set(&ddb_entry->relogin_retry_count, 0);
41404 + atomic_set_unchecked(&ddb_entry->relogin_retry_count, 0);
41405 atomic_set(&ddb_entry->state, DDB_STATE_ONLINE);
41406 list_add_tail(&ddb_entry->list, &ha->ddb_list);
41407 ha->fw_ddb_index_map[fw_ddb_index] = ddb_entry;
41408 @@ -1308,7 +1308,7 @@ int qla4xxx_process_ddb_changed(struct scsi_qla_host *ha,
41409 atomic_set(&ddb_entry->state, DDB_STATE_ONLINE);
41410 atomic_set(&ddb_entry->port_down_timer,
41411 ha->port_down_retry_count);
41412 - atomic_set(&ddb_entry->relogin_retry_count, 0);
41413 + atomic_set_unchecked(&ddb_entry->relogin_retry_count, 0);
41414 atomic_set(&ddb_entry->relogin_timer, 0);
41415 clear_bit(DF_RELOGIN, &ddb_entry->flags);
41416 clear_bit(DF_NO_RELOGIN, &ddb_entry->flags);
41417 diff --git a/drivers/scsi/qla4xxx/ql4_os.c b/drivers/scsi/qla4xxx/ql4_os.c
41418 index 83c8b5e..a82b348 100644
41419 --- a/drivers/scsi/qla4xxx/ql4_os.c
41420 +++ b/drivers/scsi/qla4xxx/ql4_os.c
41421 @@ -641,13 +641,13 @@ static void qla4xxx_timer(struct scsi_qla_host *ha)
41422 ddb_entry->fw_ddb_device_state ==
41423 DDB_DS_SESSION_FAILED) {
41424 /* Reset retry relogin timer */
41425 - atomic_inc(&ddb_entry->relogin_retry_count);
41426 + atomic_inc_unchecked(&ddb_entry->relogin_retry_count);
41427 DEBUG2(printk("scsi%ld: index[%d] relogin"
41428 " timed out-retrying"
41429 " relogin (%d)\n",
41430 ha->host_no,
41431 ddb_entry->fw_ddb_index,
41432 - atomic_read(&ddb_entry->
41433 + atomic_read_unchecked(&ddb_entry->
41434 relogin_retry_count))
41435 );
41436 start_dpc++;
41437 diff --git a/drivers/scsi/scsi.c b/drivers/scsi/scsi.c
41438 index dd098ca..686ce01 100644
41439 --- a/drivers/scsi/scsi.c
41440 +++ b/drivers/scsi/scsi.c
41441 @@ -652,7 +652,7 @@ int scsi_dispatch_cmd(struct scsi_cmnd *cmd)
41442 unsigned long timeout;
41443 int rtn = 0;
41444
41445 - atomic_inc(&cmd->device->iorequest_cnt);
41446 + atomic_inc_unchecked(&cmd->device->iorequest_cnt);
41447
41448 /* check if the device is still usable */
41449 if (unlikely(cmd->device->sdev_state == SDEV_DEL)) {
41450 diff --git a/drivers/scsi/scsi_debug.c b/drivers/scsi/scsi_debug.c
41451 index bc3e363..e1a8e50 100644
41452 --- a/drivers/scsi/scsi_debug.c
41453 +++ b/drivers/scsi/scsi_debug.c
41454 @@ -1395,6 +1395,8 @@ static int resp_mode_select(struct scsi_cmnd * scp, int mselect6,
41455 unsigned char arr[SDEBUG_MAX_MSELECT_SZ];
41456 unsigned char *cmd = (unsigned char *)scp->cmnd;
41457
41458 + pax_track_stack();
41459 +
41460 if ((errsts = check_readiness(scp, 1, devip)))
41461 return errsts;
41462 memset(arr, 0, sizeof(arr));
41463 @@ -1492,6 +1494,8 @@ static int resp_log_sense(struct scsi_cmnd * scp,
41464 unsigned char arr[SDEBUG_MAX_LSENSE_SZ];
41465 unsigned char *cmd = (unsigned char *)scp->cmnd;
41466
41467 + pax_track_stack();
41468 +
41469 if ((errsts = check_readiness(scp, 1, devip)))
41470 return errsts;
41471 memset(arr, 0, sizeof(arr));
41472 diff --git a/drivers/scsi/scsi_lib.c b/drivers/scsi/scsi_lib.c
41473 index 8df12522..c4c1472 100644
41474 --- a/drivers/scsi/scsi_lib.c
41475 +++ b/drivers/scsi/scsi_lib.c
41476 @@ -1389,7 +1389,7 @@ static void scsi_kill_request(struct request *req, struct request_queue *q)
41477 shost = sdev->host;
41478 scsi_init_cmd_errh(cmd);
41479 cmd->result = DID_NO_CONNECT << 16;
41480 - atomic_inc(&cmd->device->iorequest_cnt);
41481 + atomic_inc_unchecked(&cmd->device->iorequest_cnt);
41482
41483 /*
41484 * SCSI request completion path will do scsi_device_unbusy(),
41485 @@ -1420,9 +1420,9 @@ static void scsi_softirq_done(struct request *rq)
41486 */
41487 cmd->serial_number = 0;
41488
41489 - atomic_inc(&cmd->device->iodone_cnt);
41490 + atomic_inc_unchecked(&cmd->device->iodone_cnt);
41491 if (cmd->result)
41492 - atomic_inc(&cmd->device->ioerr_cnt);
41493 + atomic_inc_unchecked(&cmd->device->ioerr_cnt);
41494
41495 disposition = scsi_decide_disposition(cmd);
41496 if (disposition != SUCCESS &&
41497 diff --git a/drivers/scsi/scsi_sysfs.c b/drivers/scsi/scsi_sysfs.c
41498 index 91a93e0..eae0fe3 100644
41499 --- a/drivers/scsi/scsi_sysfs.c
41500 +++ b/drivers/scsi/scsi_sysfs.c
41501 @@ -662,7 +662,7 @@ show_iostat_##field(struct device *dev, struct device_attribute *attr, \
41502 char *buf) \
41503 { \
41504 struct scsi_device *sdev = to_scsi_device(dev); \
41505 - unsigned long long count = atomic_read(&sdev->field); \
41506 + unsigned long long count = atomic_read_unchecked(&sdev->field); \
41507 return snprintf(buf, 20, "0x%llx\n", count); \
41508 } \
41509 static DEVICE_ATTR(field, S_IRUGO, show_iostat_##field, NULL)
41510 diff --git a/drivers/scsi/scsi_tgt_lib.c b/drivers/scsi/scsi_tgt_lib.c
41511 index 1030327..f91fd30 100644
41512 --- a/drivers/scsi/scsi_tgt_lib.c
41513 +++ b/drivers/scsi/scsi_tgt_lib.c
41514 @@ -362,7 +362,7 @@ static int scsi_map_user_pages(struct scsi_tgt_cmd *tcmd, struct scsi_cmnd *cmd,
41515 int err;
41516
41517 dprintk("%lx %u\n", uaddr, len);
41518 - err = blk_rq_map_user(q, rq, NULL, (void *)uaddr, len, GFP_KERNEL);
41519 + err = blk_rq_map_user(q, rq, NULL, (void __user *)uaddr, len, GFP_KERNEL);
41520 if (err) {
41521 /*
41522 * TODO: need to fixup sg_tablesize, max_segment_size,
41523 diff --git a/drivers/scsi/scsi_transport_fc.c b/drivers/scsi/scsi_transport_fc.c
41524 index db02e31..1b42ea9 100644
41525 --- a/drivers/scsi/scsi_transport_fc.c
41526 +++ b/drivers/scsi/scsi_transport_fc.c
41527 @@ -480,7 +480,7 @@ MODULE_PARM_DESC(dev_loss_tmo,
41528 * Netlink Infrastructure
41529 */
41530
41531 -static atomic_t fc_event_seq;
41532 +static atomic_unchecked_t fc_event_seq;
41533
41534 /**
41535 * fc_get_event_number - Obtain the next sequential FC event number
41536 @@ -493,7 +493,7 @@ static atomic_t fc_event_seq;
41537 u32
41538 fc_get_event_number(void)
41539 {
41540 - return atomic_add_return(1, &fc_event_seq);
41541 + return atomic_add_return_unchecked(1, &fc_event_seq);
41542 }
41543 EXPORT_SYMBOL(fc_get_event_number);
41544
41545 @@ -641,7 +641,7 @@ static __init int fc_transport_init(void)
41546 {
41547 int error;
41548
41549 - atomic_set(&fc_event_seq, 0);
41550 + atomic_set_unchecked(&fc_event_seq, 0);
41551
41552 error = transport_class_register(&fc_host_class);
41553 if (error)
41554 diff --git a/drivers/scsi/scsi_transport_iscsi.c b/drivers/scsi/scsi_transport_iscsi.c
41555 index de2f8c4..63c5278 100644
41556 --- a/drivers/scsi/scsi_transport_iscsi.c
41557 +++ b/drivers/scsi/scsi_transport_iscsi.c
41558 @@ -81,7 +81,7 @@ struct iscsi_internal {
41559 struct device_attribute *session_attrs[ISCSI_SESSION_ATTRS + 1];
41560 };
41561
41562 -static atomic_t iscsi_session_nr; /* sysfs session id for next new session */
41563 +static atomic_unchecked_t iscsi_session_nr; /* sysfs session id for next new session */
41564 static struct workqueue_struct *iscsi_eh_timer_workq;
41565
41566 /*
41567 @@ -728,7 +728,7 @@ int iscsi_add_session(struct iscsi_cls_session *session, unsigned int target_id)
41568 int err;
41569
41570 ihost = shost->shost_data;
41571 - session->sid = atomic_add_return(1, &iscsi_session_nr);
41572 + session->sid = atomic_add_return_unchecked(1, &iscsi_session_nr);
41573
41574 if (id == ISCSI_MAX_TARGET) {
41575 for (id = 0; id < ISCSI_MAX_TARGET; id++) {
41576 @@ -2060,7 +2060,7 @@ static __init int iscsi_transport_init(void)
41577 printk(KERN_INFO "Loading iSCSI transport class v%s.\n",
41578 ISCSI_TRANSPORT_VERSION);
41579
41580 - atomic_set(&iscsi_session_nr, 0);
41581 + atomic_set_unchecked(&iscsi_session_nr, 0);
41582
41583 err = class_register(&iscsi_transport_class);
41584 if (err)
41585 diff --git a/drivers/scsi/scsi_transport_srp.c b/drivers/scsi/scsi_transport_srp.c
41586 index 21a045e..ec89e03 100644
41587 --- a/drivers/scsi/scsi_transport_srp.c
41588 +++ b/drivers/scsi/scsi_transport_srp.c
41589 @@ -33,7 +33,7 @@
41590 #include "scsi_transport_srp_internal.h"
41591
41592 struct srp_host_attrs {
41593 - atomic_t next_port_id;
41594 + atomic_unchecked_t next_port_id;
41595 };
41596 #define to_srp_host_attrs(host) ((struct srp_host_attrs *)(host)->shost_data)
41597
41598 @@ -62,7 +62,7 @@ static int srp_host_setup(struct transport_container *tc, struct device *dev,
41599 struct Scsi_Host *shost = dev_to_shost(dev);
41600 struct srp_host_attrs *srp_host = to_srp_host_attrs(shost);
41601
41602 - atomic_set(&srp_host->next_port_id, 0);
41603 + atomic_set_unchecked(&srp_host->next_port_id, 0);
41604 return 0;
41605 }
41606
41607 @@ -211,7 +211,7 @@ struct srp_rport *srp_rport_add(struct Scsi_Host *shost,
41608 memcpy(rport->port_id, ids->port_id, sizeof(rport->port_id));
41609 rport->roles = ids->roles;
41610
41611 - id = atomic_inc_return(&to_srp_host_attrs(shost)->next_port_id);
41612 + id = atomic_inc_return_unchecked(&to_srp_host_attrs(shost)->next_port_id);
41613 dev_set_name(&rport->dev, "port-%d:%d", shost->host_no, id);
41614
41615 transport_setup_device(&rport->dev);
41616 diff --git a/drivers/scsi/sd.c b/drivers/scsi/sd.c
41617 index 568d363..fd8145f 100644
41618 --- a/drivers/scsi/sd.c
41619 +++ b/drivers/scsi/sd.c
41620 @@ -817,6 +817,10 @@ static int sd_ioctl(struct block_device *bdev, fmode_t mode,
41621 SCSI_LOG_IOCTL(1, printk("sd_ioctl: disk=%s, cmd=0x%x\n",
41622 disk->disk_name, cmd));
41623
41624 + error = scsi_verify_blk_ioctl(bdev, cmd);
41625 + if (error < 0)
41626 + return error;
41627 +
41628 /*
41629 * If we are in the middle of error recovery, don't let anyone
41630 * else try and use this device. Also, if error recovery fails, it
41631 @@ -838,7 +842,7 @@ static int sd_ioctl(struct block_device *bdev, fmode_t mode,
41632 case SCSI_IOCTL_GET_BUS_NUMBER:
41633 return scsi_ioctl(sdp, cmd, p);
41634 default:
41635 - error = scsi_cmd_ioctl(disk->queue, disk, mode, cmd, p);
41636 + error = scsi_cmd_blk_ioctl(bdev, mode, cmd, p);
41637 if (error != -ENOTTY)
41638 return error;
41639 }
41640 @@ -996,6 +1000,11 @@ static int sd_compat_ioctl(struct block_device *bdev, fmode_t mode,
41641 unsigned int cmd, unsigned long arg)
41642 {
41643 struct scsi_device *sdev = scsi_disk(bdev->bd_disk)->device;
41644 + int ret;
41645 +
41646 + ret = scsi_verify_blk_ioctl(bdev, cmd);
41647 + if (ret < 0)
41648 + return ret;
41649
41650 /*
41651 * If we are in the middle of error recovery, don't let anyone
41652 @@ -1007,8 +1016,6 @@ static int sd_compat_ioctl(struct block_device *bdev, fmode_t mode,
41653 return -ENODEV;
41654
41655 if (sdev->host->hostt->compat_ioctl) {
41656 - int ret;
41657 -
41658 ret = sdev->host->hostt->compat_ioctl(sdev, cmd, (void __user *)arg);
41659
41660 return ret;
41661 diff --git a/drivers/scsi/sg.c b/drivers/scsi/sg.c
41662 index 040f751..98a5ed2 100644
41663 --- a/drivers/scsi/sg.c
41664 +++ b/drivers/scsi/sg.c
41665 @@ -1064,7 +1064,7 @@ sg_ioctl(struct inode *inode, struct file *filp,
41666 sdp->disk->disk_name,
41667 MKDEV(SCSI_GENERIC_MAJOR, sdp->index),
41668 NULL,
41669 - (char *)arg);
41670 + (char __user *)arg);
41671 case BLKTRACESTART:
41672 return blk_trace_startstop(sdp->device->request_queue, 1);
41673 case BLKTRACESTOP:
41674 @@ -2292,7 +2292,7 @@ struct sg_proc_leaf {
41675 const struct file_operations * fops;
41676 };
41677
41678 -static struct sg_proc_leaf sg_proc_leaf_arr[] = {
41679 +static const struct sg_proc_leaf sg_proc_leaf_arr[] = {
41680 {"allow_dio", &adio_fops},
41681 {"debug", &debug_fops},
41682 {"def_reserved_size", &dressz_fops},
41683 @@ -2307,7 +2307,7 @@ sg_proc_init(void)
41684 {
41685 int k, mask;
41686 int num_leaves = ARRAY_SIZE(sg_proc_leaf_arr);
41687 - struct sg_proc_leaf * leaf;
41688 + const struct sg_proc_leaf * leaf;
41689
41690 sg_proc_sgp = proc_mkdir(sg_proc_sg_dirname, NULL);
41691 if (!sg_proc_sgp)
41692 diff --git a/drivers/scsi/sym53c8xx_2/sym_glue.c b/drivers/scsi/sym53c8xx_2/sym_glue.c
41693 index 45374d6..61ee484 100644
41694 --- a/drivers/scsi/sym53c8xx_2/sym_glue.c
41695 +++ b/drivers/scsi/sym53c8xx_2/sym_glue.c
41696 @@ -1754,6 +1754,8 @@ static int __devinit sym2_probe(struct pci_dev *pdev,
41697 int do_iounmap = 0;
41698 int do_disable_device = 1;
41699
41700 + pax_track_stack();
41701 +
41702 memset(&sym_dev, 0, sizeof(sym_dev));
41703 memset(&nvram, 0, sizeof(nvram));
41704 sym_dev.pdev = pdev;
41705 diff --git a/drivers/serial/kgdboc.c b/drivers/serial/kgdboc.c
41706 index eadc1ab..2d81457 100644
41707 --- a/drivers/serial/kgdboc.c
41708 +++ b/drivers/serial/kgdboc.c
41709 @@ -18,7 +18,7 @@
41710
41711 #define MAX_CONFIG_LEN 40
41712
41713 -static struct kgdb_io kgdboc_io_ops;
41714 +static const struct kgdb_io kgdboc_io_ops;
41715
41716 /* -1 = init not run yet, 0 = unconfigured, 1 = configured. */
41717 static int configured = -1;
41718 @@ -154,7 +154,7 @@ static void kgdboc_post_exp_handler(void)
41719 module_put(THIS_MODULE);
41720 }
41721
41722 -static struct kgdb_io kgdboc_io_ops = {
41723 +static const struct kgdb_io kgdboc_io_ops = {
41724 .name = "kgdboc",
41725 .read_char = kgdboc_get_char,
41726 .write_char = kgdboc_put_char,
41727 diff --git a/drivers/spi/spi.c b/drivers/spi/spi.c
41728 index b76f246..7f41af7 100644
41729 --- a/drivers/spi/spi.c
41730 +++ b/drivers/spi/spi.c
41731 @@ -774,7 +774,7 @@ int spi_sync(struct spi_device *spi, struct spi_message *message)
41732 EXPORT_SYMBOL_GPL(spi_sync);
41733
41734 /* portable code must never pass more than 32 bytes */
41735 -#define SPI_BUFSIZ max(32,SMP_CACHE_BYTES)
41736 +#define SPI_BUFSIZ max(32U,SMP_CACHE_BYTES)
41737
41738 static u8 *buf;
41739
41740 diff --git a/drivers/staging/android/binder.c b/drivers/staging/android/binder.c
41741 index 99010d4..6bad87b 100644
41742 --- a/drivers/staging/android/binder.c
41743 +++ b/drivers/staging/android/binder.c
41744 @@ -2756,7 +2756,7 @@ static void binder_vma_close(struct vm_area_struct *vma)
41745 binder_defer_work(proc, BINDER_DEFERRED_PUT_FILES);
41746 }
41747
41748 -static struct vm_operations_struct binder_vm_ops = {
41749 +static const struct vm_operations_struct binder_vm_ops = {
41750 .open = binder_vma_open,
41751 .close = binder_vma_close,
41752 };
41753 diff --git a/drivers/staging/b3dfg/b3dfg.c b/drivers/staging/b3dfg/b3dfg.c
41754 index cda26bb..39fed3f 100644
41755 --- a/drivers/staging/b3dfg/b3dfg.c
41756 +++ b/drivers/staging/b3dfg/b3dfg.c
41757 @@ -455,7 +455,7 @@ static int b3dfg_vma_fault(struct vm_area_struct *vma,
41758 return VM_FAULT_NOPAGE;
41759 }
41760
41761 -static struct vm_operations_struct b3dfg_vm_ops = {
41762 +static const struct vm_operations_struct b3dfg_vm_ops = {
41763 .fault = b3dfg_vma_fault,
41764 };
41765
41766 @@ -848,7 +848,7 @@ static int b3dfg_mmap(struct file *filp, struct vm_area_struct *vma)
41767 return r;
41768 }
41769
41770 -static struct file_operations b3dfg_fops = {
41771 +static const struct file_operations b3dfg_fops = {
41772 .owner = THIS_MODULE,
41773 .open = b3dfg_open,
41774 .release = b3dfg_release,
41775 diff --git a/drivers/staging/comedi/comedi_fops.c b/drivers/staging/comedi/comedi_fops.c
41776 index 908f25a..c9a579b 100644
41777 --- a/drivers/staging/comedi/comedi_fops.c
41778 +++ b/drivers/staging/comedi/comedi_fops.c
41779 @@ -1389,7 +1389,7 @@ void comedi_unmap(struct vm_area_struct *area)
41780 mutex_unlock(&dev->mutex);
41781 }
41782
41783 -static struct vm_operations_struct comedi_vm_ops = {
41784 +static const struct vm_operations_struct comedi_vm_ops = {
41785 .close = comedi_unmap,
41786 };
41787
41788 diff --git a/drivers/staging/dream/qdsp5/adsp_driver.c b/drivers/staging/dream/qdsp5/adsp_driver.c
41789 index e55a0db..577b776 100644
41790 --- a/drivers/staging/dream/qdsp5/adsp_driver.c
41791 +++ b/drivers/staging/dream/qdsp5/adsp_driver.c
41792 @@ -576,7 +576,7 @@ static struct adsp_device *inode_to_device(struct inode *inode)
41793 static dev_t adsp_devno;
41794 static struct class *adsp_class;
41795
41796 -static struct file_operations adsp_fops = {
41797 +static const struct file_operations adsp_fops = {
41798 .owner = THIS_MODULE,
41799 .open = adsp_open,
41800 .unlocked_ioctl = adsp_ioctl,
41801 diff --git a/drivers/staging/dream/qdsp5/audio_aac.c b/drivers/staging/dream/qdsp5/audio_aac.c
41802 index ad2390f..4116ee8 100644
41803 --- a/drivers/staging/dream/qdsp5/audio_aac.c
41804 +++ b/drivers/staging/dream/qdsp5/audio_aac.c
41805 @@ -1022,7 +1022,7 @@ done:
41806 return rc;
41807 }
41808
41809 -static struct file_operations audio_aac_fops = {
41810 +static const struct file_operations audio_aac_fops = {
41811 .owner = THIS_MODULE,
41812 .open = audio_open,
41813 .release = audio_release,
41814 diff --git a/drivers/staging/dream/qdsp5/audio_amrnb.c b/drivers/staging/dream/qdsp5/audio_amrnb.c
41815 index cd818a5..870b37b 100644
41816 --- a/drivers/staging/dream/qdsp5/audio_amrnb.c
41817 +++ b/drivers/staging/dream/qdsp5/audio_amrnb.c
41818 @@ -833,7 +833,7 @@ done:
41819 return rc;
41820 }
41821
41822 -static struct file_operations audio_amrnb_fops = {
41823 +static const struct file_operations audio_amrnb_fops = {
41824 .owner = THIS_MODULE,
41825 .open = audamrnb_open,
41826 .release = audamrnb_release,
41827 diff --git a/drivers/staging/dream/qdsp5/audio_evrc.c b/drivers/staging/dream/qdsp5/audio_evrc.c
41828 index 4b43e18..cedafda 100644
41829 --- a/drivers/staging/dream/qdsp5/audio_evrc.c
41830 +++ b/drivers/staging/dream/qdsp5/audio_evrc.c
41831 @@ -805,7 +805,7 @@ dma_fail:
41832 return rc;
41833 }
41834
41835 -static struct file_operations audio_evrc_fops = {
41836 +static const struct file_operations audio_evrc_fops = {
41837 .owner = THIS_MODULE,
41838 .open = audevrc_open,
41839 .release = audevrc_release,
41840 diff --git a/drivers/staging/dream/qdsp5/audio_in.c b/drivers/staging/dream/qdsp5/audio_in.c
41841 index 3d950a2..9431118 100644
41842 --- a/drivers/staging/dream/qdsp5/audio_in.c
41843 +++ b/drivers/staging/dream/qdsp5/audio_in.c
41844 @@ -913,7 +913,7 @@ static int audpre_open(struct inode *inode, struct file *file)
41845 return 0;
41846 }
41847
41848 -static struct file_operations audio_fops = {
41849 +static const struct file_operations audio_fops = {
41850 .owner = THIS_MODULE,
41851 .open = audio_in_open,
41852 .release = audio_in_release,
41853 @@ -922,7 +922,7 @@ static struct file_operations audio_fops = {
41854 .unlocked_ioctl = audio_in_ioctl,
41855 };
41856
41857 -static struct file_operations audpre_fops = {
41858 +static const struct file_operations audpre_fops = {
41859 .owner = THIS_MODULE,
41860 .open = audpre_open,
41861 .unlocked_ioctl = audpre_ioctl,
41862 diff --git a/drivers/staging/dream/qdsp5/audio_mp3.c b/drivers/staging/dream/qdsp5/audio_mp3.c
41863 index b95574f..286c2f4 100644
41864 --- a/drivers/staging/dream/qdsp5/audio_mp3.c
41865 +++ b/drivers/staging/dream/qdsp5/audio_mp3.c
41866 @@ -941,7 +941,7 @@ done:
41867 return rc;
41868 }
41869
41870 -static struct file_operations audio_mp3_fops = {
41871 +static const struct file_operations audio_mp3_fops = {
41872 .owner = THIS_MODULE,
41873 .open = audio_open,
41874 .release = audio_release,
41875 diff --git a/drivers/staging/dream/qdsp5/audio_out.c b/drivers/staging/dream/qdsp5/audio_out.c
41876 index d1adcf6..f8f9833 100644
41877 --- a/drivers/staging/dream/qdsp5/audio_out.c
41878 +++ b/drivers/staging/dream/qdsp5/audio_out.c
41879 @@ -810,7 +810,7 @@ static int audpp_open(struct inode *inode, struct file *file)
41880 return 0;
41881 }
41882
41883 -static struct file_operations audio_fops = {
41884 +static const struct file_operations audio_fops = {
41885 .owner = THIS_MODULE,
41886 .open = audio_open,
41887 .release = audio_release,
41888 @@ -819,7 +819,7 @@ static struct file_operations audio_fops = {
41889 .unlocked_ioctl = audio_ioctl,
41890 };
41891
41892 -static struct file_operations audpp_fops = {
41893 +static const struct file_operations audpp_fops = {
41894 .owner = THIS_MODULE,
41895 .open = audpp_open,
41896 .unlocked_ioctl = audpp_ioctl,
41897 diff --git a/drivers/staging/dream/qdsp5/audio_qcelp.c b/drivers/staging/dream/qdsp5/audio_qcelp.c
41898 index f0f50e3..f6b9dbc 100644
41899 --- a/drivers/staging/dream/qdsp5/audio_qcelp.c
41900 +++ b/drivers/staging/dream/qdsp5/audio_qcelp.c
41901 @@ -816,7 +816,7 @@ err:
41902 return rc;
41903 }
41904
41905 -static struct file_operations audio_qcelp_fops = {
41906 +static const struct file_operations audio_qcelp_fops = {
41907 .owner = THIS_MODULE,
41908 .open = audqcelp_open,
41909 .release = audqcelp_release,
41910 diff --git a/drivers/staging/dream/qdsp5/snd.c b/drivers/staging/dream/qdsp5/snd.c
41911 index 037d7ff..5469ec3 100644
41912 --- a/drivers/staging/dream/qdsp5/snd.c
41913 +++ b/drivers/staging/dream/qdsp5/snd.c
41914 @@ -242,7 +242,7 @@ err:
41915 return rc;
41916 }
41917
41918 -static struct file_operations snd_fops = {
41919 +static const struct file_operations snd_fops = {
41920 .owner = THIS_MODULE,
41921 .open = snd_open,
41922 .release = snd_release,
41923 diff --git a/drivers/staging/dream/smd/smd_qmi.c b/drivers/staging/dream/smd/smd_qmi.c
41924 index d4e7d88..0ea632a 100644
41925 --- a/drivers/staging/dream/smd/smd_qmi.c
41926 +++ b/drivers/staging/dream/smd/smd_qmi.c
41927 @@ -793,7 +793,7 @@ static int qmi_release(struct inode *ip, struct file *fp)
41928 return 0;
41929 }
41930
41931 -static struct file_operations qmi_fops = {
41932 +static const struct file_operations qmi_fops = {
41933 .owner = THIS_MODULE,
41934 .read = qmi_read,
41935 .write = qmi_write,
41936 diff --git a/drivers/staging/dream/smd/smd_rpcrouter_device.c b/drivers/staging/dream/smd/smd_rpcrouter_device.c
41937 index cd3910b..ff053d3 100644
41938 --- a/drivers/staging/dream/smd/smd_rpcrouter_device.c
41939 +++ b/drivers/staging/dream/smd/smd_rpcrouter_device.c
41940 @@ -214,7 +214,7 @@ static long rpcrouter_ioctl(struct file *filp, unsigned int cmd,
41941 return rc;
41942 }
41943
41944 -static struct file_operations rpcrouter_server_fops = {
41945 +static const struct file_operations rpcrouter_server_fops = {
41946 .owner = THIS_MODULE,
41947 .open = rpcrouter_open,
41948 .release = rpcrouter_release,
41949 @@ -224,7 +224,7 @@ static struct file_operations rpcrouter_server_fops = {
41950 .unlocked_ioctl = rpcrouter_ioctl,
41951 };
41952
41953 -static struct file_operations rpcrouter_router_fops = {
41954 +static const struct file_operations rpcrouter_router_fops = {
41955 .owner = THIS_MODULE,
41956 .open = rpcrouter_open,
41957 .release = rpcrouter_release,
41958 diff --git a/drivers/staging/dst/dcore.c b/drivers/staging/dst/dcore.c
41959 index c24e4e0..07665be 100644
41960 --- a/drivers/staging/dst/dcore.c
41961 +++ b/drivers/staging/dst/dcore.c
41962 @@ -149,7 +149,7 @@ static int dst_bdev_release(struct gendisk *disk, fmode_t mode)
41963 return 0;
41964 }
41965
41966 -static struct block_device_operations dst_blk_ops = {
41967 +static const struct block_device_operations dst_blk_ops = {
41968 .open = dst_bdev_open,
41969 .release = dst_bdev_release,
41970 .owner = THIS_MODULE,
41971 @@ -588,7 +588,7 @@ static struct dst_node *dst_alloc_node(struct dst_ctl *ctl,
41972 n->size = ctl->size;
41973
41974 atomic_set(&n->refcnt, 1);
41975 - atomic_long_set(&n->gen, 0);
41976 + atomic_long_set_unchecked(&n->gen, 0);
41977 snprintf(n->name, sizeof(n->name), "%s", ctl->name);
41978
41979 err = dst_node_sysfs_init(n);
41980 diff --git a/drivers/staging/dst/trans.c b/drivers/staging/dst/trans.c
41981 index 557d372..8d84422 100644
41982 --- a/drivers/staging/dst/trans.c
41983 +++ b/drivers/staging/dst/trans.c
41984 @@ -169,7 +169,7 @@ int dst_process_bio(struct dst_node *n, struct bio *bio)
41985 t->error = 0;
41986 t->retries = 0;
41987 atomic_set(&t->refcnt, 1);
41988 - t->gen = atomic_long_inc_return(&n->gen);
41989 + t->gen = atomic_long_inc_return_unchecked(&n->gen);
41990
41991 t->enc = bio_data_dir(bio);
41992 dst_bio_to_cmd(bio, &t->cmd, DST_IO, t->gen);
41993 diff --git a/drivers/staging/et131x/et1310_tx.c b/drivers/staging/et131x/et1310_tx.c
41994 index 94f7752..d051514 100644
41995 --- a/drivers/staging/et131x/et1310_tx.c
41996 +++ b/drivers/staging/et131x/et1310_tx.c
41997 @@ -710,11 +710,11 @@ inline void et131x_free_send_packet(struct et131x_adapter *etdev,
41998 struct net_device_stats *stats = &etdev->net_stats;
41999
42000 if (pMpTcb->Flags & fMP_DEST_BROAD)
42001 - atomic_inc(&etdev->Stats.brdcstxmt);
42002 + atomic_inc_unchecked(&etdev->Stats.brdcstxmt);
42003 else if (pMpTcb->Flags & fMP_DEST_MULTI)
42004 - atomic_inc(&etdev->Stats.multixmt);
42005 + atomic_inc_unchecked(&etdev->Stats.multixmt);
42006 else
42007 - atomic_inc(&etdev->Stats.unixmt);
42008 + atomic_inc_unchecked(&etdev->Stats.unixmt);
42009
42010 if (pMpTcb->Packet) {
42011 stats->tx_bytes += pMpTcb->Packet->len;
42012 diff --git a/drivers/staging/et131x/et131x_adapter.h b/drivers/staging/et131x/et131x_adapter.h
42013 index 1dfe06f..f469b4d 100644
42014 --- a/drivers/staging/et131x/et131x_adapter.h
42015 +++ b/drivers/staging/et131x/et131x_adapter.h
42016 @@ -145,11 +145,11 @@ typedef struct _ce_stats_t {
42017 * operations
42018 */
42019 u32 unircv; /* # multicast packets received */
42020 - atomic_t unixmt; /* # multicast packets for Tx */
42021 + atomic_unchecked_t unixmt; /* # multicast packets for Tx */
42022 u32 multircv; /* # multicast packets received */
42023 - atomic_t multixmt; /* # multicast packets for Tx */
42024 + atomic_unchecked_t multixmt; /* # multicast packets for Tx */
42025 u32 brdcstrcv; /* # broadcast packets received */
42026 - atomic_t brdcstxmt; /* # broadcast packets for Tx */
42027 + atomic_unchecked_t brdcstxmt; /* # broadcast packets for Tx */
42028 u32 norcvbuf; /* # Rx packets discarded */
42029 u32 noxmtbuf; /* # Tx packets discarded */
42030
42031 diff --git a/drivers/staging/go7007/go7007-v4l2.c b/drivers/staging/go7007/go7007-v4l2.c
42032 index 4bd353a..e28f455 100644
42033 --- a/drivers/staging/go7007/go7007-v4l2.c
42034 +++ b/drivers/staging/go7007/go7007-v4l2.c
42035 @@ -1700,7 +1700,7 @@ static int go7007_vm_fault(struct vm_area_struct *vma, struct vm_fault *vmf)
42036 return 0;
42037 }
42038
42039 -static struct vm_operations_struct go7007_vm_ops = {
42040 +static const struct vm_operations_struct go7007_vm_ops = {
42041 .open = go7007_vm_open,
42042 .close = go7007_vm_close,
42043 .fault = go7007_vm_fault,
42044 diff --git a/drivers/staging/hv/Channel.c b/drivers/staging/hv/Channel.c
42045 index 366dc95..b974d87 100644
42046 --- a/drivers/staging/hv/Channel.c
42047 +++ b/drivers/staging/hv/Channel.c
42048 @@ -464,8 +464,8 @@ int VmbusChannelEstablishGpadl(struct vmbus_channel *Channel, void *Kbuffer,
42049
42050 DPRINT_ENTER(VMBUS);
42051
42052 - nextGpadlHandle = atomic_read(&gVmbusConnection.NextGpadlHandle);
42053 - atomic_inc(&gVmbusConnection.NextGpadlHandle);
42054 + nextGpadlHandle = atomic_read_unchecked(&gVmbusConnection.NextGpadlHandle);
42055 + atomic_inc_unchecked(&gVmbusConnection.NextGpadlHandle);
42056
42057 VmbusChannelCreateGpadlHeader(Kbuffer, Size, &msgInfo, &msgCount);
42058 ASSERT(msgInfo != NULL);
42059 diff --git a/drivers/staging/hv/Hv.c b/drivers/staging/hv/Hv.c
42060 index b12237f..01ae28a 100644
42061 --- a/drivers/staging/hv/Hv.c
42062 +++ b/drivers/staging/hv/Hv.c
42063 @@ -161,7 +161,7 @@ static u64 HvDoHypercall(u64 Control, void *Input, void *Output)
42064 u64 outputAddress = (Output) ? virt_to_phys(Output) : 0;
42065 u32 outputAddressHi = outputAddress >> 32;
42066 u32 outputAddressLo = outputAddress & 0xFFFFFFFF;
42067 - volatile void *hypercallPage = gHvContext.HypercallPage;
42068 + volatile void *hypercallPage = ktva_ktla(gHvContext.HypercallPage);
42069
42070 DPRINT_DBG(VMBUS, "Hypercall <control %llx input %p output %p>",
42071 Control, Input, Output);
42072 diff --git a/drivers/staging/hv/VmbusApi.h b/drivers/staging/hv/VmbusApi.h
42073 index d089bb1..2ebc158 100644
42074 --- a/drivers/staging/hv/VmbusApi.h
42075 +++ b/drivers/staging/hv/VmbusApi.h
42076 @@ -109,7 +109,7 @@ struct vmbus_channel_interface {
42077 u32 *GpadlHandle);
42078 int (*TeardownGpadl)(struct hv_device *device, u32 GpadlHandle);
42079 void (*GetInfo)(struct hv_device *dev, struct hv_device_info *devinfo);
42080 -};
42081 +} __no_const;
42082
42083 /* Base driver object */
42084 struct hv_driver {
42085 diff --git a/drivers/staging/hv/VmbusPrivate.h b/drivers/staging/hv/VmbusPrivate.h
42086 index 5a37cce..6ecc88c 100644
42087 --- a/drivers/staging/hv/VmbusPrivate.h
42088 +++ b/drivers/staging/hv/VmbusPrivate.h
42089 @@ -59,7 +59,7 @@ enum VMBUS_CONNECT_STATE {
42090 struct VMBUS_CONNECTION {
42091 enum VMBUS_CONNECT_STATE ConnectState;
42092
42093 - atomic_t NextGpadlHandle;
42094 + atomic_unchecked_t NextGpadlHandle;
42095
42096 /*
42097 * Represents channel interrupts. Each bit position represents a
42098 diff --git a/drivers/staging/hv/blkvsc_drv.c b/drivers/staging/hv/blkvsc_drv.c
42099 index 871a202..ca50ddf 100644
42100 --- a/drivers/staging/hv/blkvsc_drv.c
42101 +++ b/drivers/staging/hv/blkvsc_drv.c
42102 @@ -153,7 +153,7 @@ static int blkvsc_ringbuffer_size = BLKVSC_RING_BUFFER_SIZE;
42103 /* The one and only one */
42104 static struct blkvsc_driver_context g_blkvsc_drv;
42105
42106 -static struct block_device_operations block_ops = {
42107 +static const struct block_device_operations block_ops = {
42108 .owner = THIS_MODULE,
42109 .open = blkvsc_open,
42110 .release = blkvsc_release,
42111 diff --git a/drivers/staging/hv/vmbus_drv.c b/drivers/staging/hv/vmbus_drv.c
42112 index 6acc49a..fbc8d46 100644
42113 --- a/drivers/staging/hv/vmbus_drv.c
42114 +++ b/drivers/staging/hv/vmbus_drv.c
42115 @@ -532,7 +532,7 @@ static int vmbus_child_device_register(struct hv_device *root_device_obj,
42116 to_device_context(root_device_obj);
42117 struct device_context *child_device_ctx =
42118 to_device_context(child_device_obj);
42119 - static atomic_t device_num = ATOMIC_INIT(0);
42120 + static atomic_unchecked_t device_num = ATOMIC_INIT(0);
42121
42122 DPRINT_ENTER(VMBUS_DRV);
42123
42124 @@ -541,7 +541,7 @@ static int vmbus_child_device_register(struct hv_device *root_device_obj,
42125
42126 /* Set the device name. Otherwise, device_register() will fail. */
42127 dev_set_name(&child_device_ctx->device, "vmbus_0_%d",
42128 - atomic_inc_return(&device_num));
42129 + atomic_inc_return_unchecked(&device_num));
42130
42131 /* The new device belongs to this bus */
42132 child_device_ctx->device.bus = &g_vmbus_drv.bus; /* device->dev.bus; */
42133 diff --git a/drivers/staging/iio/ring_generic.h b/drivers/staging/iio/ring_generic.h
42134 index d926189..17b19fd 100644
42135 --- a/drivers/staging/iio/ring_generic.h
42136 +++ b/drivers/staging/iio/ring_generic.h
42137 @@ -87,7 +87,7 @@ struct iio_ring_access_funcs {
42138
42139 int (*is_enabled)(struct iio_ring_buffer *ring);
42140 int (*enable)(struct iio_ring_buffer *ring);
42141 -};
42142 +} __no_const;
42143
42144 /**
42145 * struct iio_ring_buffer - general ring buffer structure
42146 diff --git a/drivers/staging/octeon/ethernet-rx.c b/drivers/staging/octeon/ethernet-rx.c
42147 index 1b237b7..88c624e 100644
42148 --- a/drivers/staging/octeon/ethernet-rx.c
42149 +++ b/drivers/staging/octeon/ethernet-rx.c
42150 @@ -406,11 +406,11 @@ void cvm_oct_tasklet_rx(unsigned long unused)
42151 /* Increment RX stats for virtual ports */
42152 if (work->ipprt >= CVMX_PIP_NUM_INPUT_PORTS) {
42153 #ifdef CONFIG_64BIT
42154 - atomic64_add(1, (atomic64_t *)&priv->stats.rx_packets);
42155 - atomic64_add(skb->len, (atomic64_t *)&priv->stats.rx_bytes);
42156 + atomic64_add_unchecked(1, (atomic64_unchecked_t *)&priv->stats.rx_packets);
42157 + atomic64_add_unchecked(skb->len, (atomic64_unchecked_t *)&priv->stats.rx_bytes);
42158 #else
42159 - atomic_add(1, (atomic_t *)&priv->stats.rx_packets);
42160 - atomic_add(skb->len, (atomic_t *)&priv->stats.rx_bytes);
42161 + atomic_add_unchecked(1, (atomic_unchecked_t *)&priv->stats.rx_packets);
42162 + atomic_add_unchecked(skb->len, (atomic_unchecked_t *)&priv->stats.rx_bytes);
42163 #endif
42164 }
42165 netif_receive_skb(skb);
42166 @@ -424,9 +424,9 @@ void cvm_oct_tasklet_rx(unsigned long unused)
42167 dev->name);
42168 */
42169 #ifdef CONFIG_64BIT
42170 - atomic64_add(1, (atomic64_t *)&priv->stats.rx_dropped);
42171 + atomic64_add_unchecked(1, (atomic64_t *)&priv->stats.rx_dropped);
42172 #else
42173 - atomic_add(1, (atomic_t *)&priv->stats.rx_dropped);
42174 + atomic_add_unchecked(1, (atomic_t *)&priv->stats.rx_dropped);
42175 #endif
42176 dev_kfree_skb_irq(skb);
42177 }
42178 diff --git a/drivers/staging/octeon/ethernet.c b/drivers/staging/octeon/ethernet.c
42179 index 492c502..d9909f1 100644
42180 --- a/drivers/staging/octeon/ethernet.c
42181 +++ b/drivers/staging/octeon/ethernet.c
42182 @@ -294,11 +294,11 @@ static struct net_device_stats *cvm_oct_common_get_stats(struct net_device *dev)
42183 * since the RX tasklet also increments it.
42184 */
42185 #ifdef CONFIG_64BIT
42186 - atomic64_add(rx_status.dropped_packets,
42187 - (atomic64_t *)&priv->stats.rx_dropped);
42188 + atomic64_add_unchecked(rx_status.dropped_packets,
42189 + (atomic64_unchecked_t *)&priv->stats.rx_dropped);
42190 #else
42191 - atomic_add(rx_status.dropped_packets,
42192 - (atomic_t *)&priv->stats.rx_dropped);
42193 + atomic_add_unchecked(rx_status.dropped_packets,
42194 + (atomic_unchecked_t *)&priv->stats.rx_dropped);
42195 #endif
42196 }
42197
42198 diff --git a/drivers/staging/otus/80211core/pub_zfi.h b/drivers/staging/otus/80211core/pub_zfi.h
42199 index a35bd5d..28fff45 100644
42200 --- a/drivers/staging/otus/80211core/pub_zfi.h
42201 +++ b/drivers/staging/otus/80211core/pub_zfi.h
42202 @@ -531,7 +531,7 @@ struct zsCbFuncTbl
42203 u8_t (*zfcbClassifyTxPacket)(zdev_t* dev, zbuf_t* buf);
42204
42205 void (*zfcbHwWatchDogNotify)(zdev_t* dev);
42206 -};
42207 +} __no_const;
42208
42209 extern void zfZeroMemory(u8_t* va, u16_t length);
42210 #define ZM_INIT_CB_FUNC_TABLE(p) zfZeroMemory((u8_t *)p, sizeof(struct zsCbFuncTbl));
42211 diff --git a/drivers/staging/panel/panel.c b/drivers/staging/panel/panel.c
42212 index c39a25f..696f5aa 100644
42213 --- a/drivers/staging/panel/panel.c
42214 +++ b/drivers/staging/panel/panel.c
42215 @@ -1305,7 +1305,7 @@ static int lcd_release(struct inode *inode, struct file *file)
42216 return 0;
42217 }
42218
42219 -static struct file_operations lcd_fops = {
42220 +static const struct file_operations lcd_fops = {
42221 .write = lcd_write,
42222 .open = lcd_open,
42223 .release = lcd_release,
42224 @@ -1565,7 +1565,7 @@ static int keypad_release(struct inode *inode, struct file *file)
42225 return 0;
42226 }
42227
42228 -static struct file_operations keypad_fops = {
42229 +static const struct file_operations keypad_fops = {
42230 .read = keypad_read, /* read */
42231 .open = keypad_open, /* open */
42232 .release = keypad_release, /* close */
42233 diff --git a/drivers/staging/phison/phison.c b/drivers/staging/phison/phison.c
42234 index 270ebcb..37e46af 100644
42235 --- a/drivers/staging/phison/phison.c
42236 +++ b/drivers/staging/phison/phison.c
42237 @@ -43,7 +43,7 @@ static struct scsi_host_template phison_sht = {
42238 ATA_BMDMA_SHT(DRV_NAME),
42239 };
42240
42241 -static struct ata_port_operations phison_ops = {
42242 +static const struct ata_port_operations phison_ops = {
42243 .inherits = &ata_bmdma_port_ops,
42244 .prereset = phison_pre_reset,
42245 };
42246 diff --git a/drivers/staging/poch/poch.c b/drivers/staging/poch/poch.c
42247 index 2eb8e3d..57616a7 100644
42248 --- a/drivers/staging/poch/poch.c
42249 +++ b/drivers/staging/poch/poch.c
42250 @@ -1057,7 +1057,7 @@ static int poch_ioctl(struct inode *inode, struct file *filp,
42251 return 0;
42252 }
42253
42254 -static struct file_operations poch_fops = {
42255 +static const struct file_operations poch_fops = {
42256 .owner = THIS_MODULE,
42257 .open = poch_open,
42258 .release = poch_release,
42259 diff --git a/drivers/staging/pohmelfs/inode.c b/drivers/staging/pohmelfs/inode.c
42260 index c94de31..19402bc 100644
42261 --- a/drivers/staging/pohmelfs/inode.c
42262 +++ b/drivers/staging/pohmelfs/inode.c
42263 @@ -1850,7 +1850,7 @@ static int pohmelfs_fill_super(struct super_block *sb, void *data, int silent)
42264 mutex_init(&psb->mcache_lock);
42265 psb->mcache_root = RB_ROOT;
42266 psb->mcache_timeout = msecs_to_jiffies(5000);
42267 - atomic_long_set(&psb->mcache_gen, 0);
42268 + atomic_long_set_unchecked(&psb->mcache_gen, 0);
42269
42270 psb->trans_max_pages = 100;
42271
42272 @@ -1865,7 +1865,7 @@ static int pohmelfs_fill_super(struct super_block *sb, void *data, int silent)
42273 INIT_LIST_HEAD(&psb->crypto_ready_list);
42274 INIT_LIST_HEAD(&psb->crypto_active_list);
42275
42276 - atomic_set(&psb->trans_gen, 1);
42277 + atomic_set_unchecked(&psb->trans_gen, 1);
42278 atomic_long_set(&psb->total_inodes, 0);
42279
42280 mutex_init(&psb->state_lock);
42281 diff --git a/drivers/staging/pohmelfs/mcache.c b/drivers/staging/pohmelfs/mcache.c
42282 index e22665c..a2a9390 100644
42283 --- a/drivers/staging/pohmelfs/mcache.c
42284 +++ b/drivers/staging/pohmelfs/mcache.c
42285 @@ -121,7 +121,7 @@ struct pohmelfs_mcache *pohmelfs_mcache_alloc(struct pohmelfs_sb *psb, u64 start
42286 m->data = data;
42287 m->start = start;
42288 m->size = size;
42289 - m->gen = atomic_long_inc_return(&psb->mcache_gen);
42290 + m->gen = atomic_long_inc_return_unchecked(&psb->mcache_gen);
42291
42292 mutex_lock(&psb->mcache_lock);
42293 err = pohmelfs_mcache_insert(psb, m);
42294 diff --git a/drivers/staging/pohmelfs/netfs.h b/drivers/staging/pohmelfs/netfs.h
42295 index 623a07d..4035c19 100644
42296 --- a/drivers/staging/pohmelfs/netfs.h
42297 +++ b/drivers/staging/pohmelfs/netfs.h
42298 @@ -570,14 +570,14 @@ struct pohmelfs_config;
42299 struct pohmelfs_sb {
42300 struct rb_root mcache_root;
42301 struct mutex mcache_lock;
42302 - atomic_long_t mcache_gen;
42303 + atomic_long_unchecked_t mcache_gen;
42304 unsigned long mcache_timeout;
42305
42306 unsigned int idx;
42307
42308 unsigned int trans_retries;
42309
42310 - atomic_t trans_gen;
42311 + atomic_unchecked_t trans_gen;
42312
42313 unsigned int crypto_attached_size;
42314 unsigned int crypto_align_size;
42315 diff --git a/drivers/staging/pohmelfs/trans.c b/drivers/staging/pohmelfs/trans.c
42316 index 36a2535..0591bf4 100644
42317 --- a/drivers/staging/pohmelfs/trans.c
42318 +++ b/drivers/staging/pohmelfs/trans.c
42319 @@ -492,7 +492,7 @@ int netfs_trans_finish(struct netfs_trans *t, struct pohmelfs_sb *psb)
42320 int err;
42321 struct netfs_cmd *cmd = t->iovec.iov_base;
42322
42323 - t->gen = atomic_inc_return(&psb->trans_gen);
42324 + t->gen = atomic_inc_return_unchecked(&psb->trans_gen);
42325
42326 cmd->size = t->iovec.iov_len - sizeof(struct netfs_cmd) +
42327 t->attached_size + t->attached_pages * sizeof(struct netfs_cmd);
42328 diff --git a/drivers/staging/sep/sep_driver.c b/drivers/staging/sep/sep_driver.c
42329 index f890a16..509ece8 100644
42330 --- a/drivers/staging/sep/sep_driver.c
42331 +++ b/drivers/staging/sep/sep_driver.c
42332 @@ -2603,7 +2603,7 @@ static struct pci_driver sep_pci_driver = {
42333 static dev_t sep_devno;
42334
42335 /* the files operations structure of the driver */
42336 -static struct file_operations sep_file_operations = {
42337 +static const struct file_operations sep_file_operations = {
42338 .owner = THIS_MODULE,
42339 .ioctl = sep_ioctl,
42340 .poll = sep_poll,
42341 diff --git a/drivers/staging/usbip/usbip_common.h b/drivers/staging/usbip/usbip_common.h
42342 index 5e16bc3..7655b10 100644
42343 --- a/drivers/staging/usbip/usbip_common.h
42344 +++ b/drivers/staging/usbip/usbip_common.h
42345 @@ -374,7 +374,7 @@ struct usbip_device {
42346 void (*shutdown)(struct usbip_device *);
42347 void (*reset)(struct usbip_device *);
42348 void (*unusable)(struct usbip_device *);
42349 - } eh_ops;
42350 + } __no_const eh_ops;
42351 };
42352
42353
42354 diff --git a/drivers/staging/usbip/vhci.h b/drivers/staging/usbip/vhci.h
42355 index 57f7946..d9df23d 100644
42356 --- a/drivers/staging/usbip/vhci.h
42357 +++ b/drivers/staging/usbip/vhci.h
42358 @@ -92,7 +92,7 @@ struct vhci_hcd {
42359 unsigned resuming:1;
42360 unsigned long re_timeout;
42361
42362 - atomic_t seqnum;
42363 + atomic_unchecked_t seqnum;
42364
42365 /*
42366 * NOTE:
42367 diff --git a/drivers/staging/usbip/vhci_hcd.c b/drivers/staging/usbip/vhci_hcd.c
42368 index 20cd7db..c2693ff 100644
42369 --- a/drivers/staging/usbip/vhci_hcd.c
42370 +++ b/drivers/staging/usbip/vhci_hcd.c
42371 @@ -534,7 +534,7 @@ static void vhci_tx_urb(struct urb *urb)
42372 return;
42373 }
42374
42375 - priv->seqnum = atomic_inc_return(&the_controller->seqnum);
42376 + priv->seqnum = atomic_inc_return_unchecked(&the_controller->seqnum);
42377 if (priv->seqnum == 0xffff)
42378 usbip_uinfo("seqnum max\n");
42379
42380 @@ -793,7 +793,7 @@ static int vhci_urb_dequeue(struct usb_hcd *hcd, struct urb *urb, int status)
42381 return -ENOMEM;
42382 }
42383
42384 - unlink->seqnum = atomic_inc_return(&the_controller->seqnum);
42385 + unlink->seqnum = atomic_inc_return_unchecked(&the_controller->seqnum);
42386 if (unlink->seqnum == 0xffff)
42387 usbip_uinfo("seqnum max\n");
42388
42389 @@ -988,7 +988,7 @@ static int vhci_start(struct usb_hcd *hcd)
42390 vdev->rhport = rhport;
42391 }
42392
42393 - atomic_set(&vhci->seqnum, 0);
42394 + atomic_set_unchecked(&vhci->seqnum, 0);
42395 spin_lock_init(&vhci->lock);
42396
42397
42398 diff --git a/drivers/staging/usbip/vhci_rx.c b/drivers/staging/usbip/vhci_rx.c
42399 index 7fd76fe..673695a 100644
42400 --- a/drivers/staging/usbip/vhci_rx.c
42401 +++ b/drivers/staging/usbip/vhci_rx.c
42402 @@ -79,7 +79,7 @@ static void vhci_recv_ret_submit(struct vhci_device *vdev,
42403 usbip_uerr("cannot find a urb of seqnum %u\n",
42404 pdu->base.seqnum);
42405 usbip_uinfo("max seqnum %d\n",
42406 - atomic_read(&the_controller->seqnum));
42407 + atomic_read_unchecked(&the_controller->seqnum));
42408 usbip_event_add(ud, VDEV_EVENT_ERROR_TCP);
42409 return;
42410 }
42411 diff --git a/drivers/staging/vme/devices/vme_user.c b/drivers/staging/vme/devices/vme_user.c
42412 index 7891288..8e31300 100644
42413 --- a/drivers/staging/vme/devices/vme_user.c
42414 +++ b/drivers/staging/vme/devices/vme_user.c
42415 @@ -136,7 +136,7 @@ static int vme_user_ioctl(struct inode *, struct file *, unsigned int,
42416 static int __init vme_user_probe(struct device *, int, int);
42417 static int __exit vme_user_remove(struct device *, int, int);
42418
42419 -static struct file_operations vme_user_fops = {
42420 +static const struct file_operations vme_user_fops = {
42421 .open = vme_user_open,
42422 .release = vme_user_release,
42423 .read = vme_user_read,
42424 diff --git a/drivers/staging/vt6655/hostap.c b/drivers/staging/vt6655/hostap.c
42425 index 58abf44..00c1fc8 100644
42426 --- a/drivers/staging/vt6655/hostap.c
42427 +++ b/drivers/staging/vt6655/hostap.c
42428 @@ -84,7 +84,7 @@ static int hostap_enable_hostapd(PSDevice pDevice, int rtnl_locked)
42429 PSDevice apdev_priv;
42430 struct net_device *dev = pDevice->dev;
42431 int ret;
42432 - const struct net_device_ops apdev_netdev_ops = {
42433 + net_device_ops_no_const apdev_netdev_ops = {
42434 .ndo_start_xmit = pDevice->tx_80211,
42435 };
42436
42437 diff --git a/drivers/staging/vt6656/hostap.c b/drivers/staging/vt6656/hostap.c
42438 index 0c8267a..db1f363 100644
42439 --- a/drivers/staging/vt6656/hostap.c
42440 +++ b/drivers/staging/vt6656/hostap.c
42441 @@ -86,7 +86,7 @@ static int hostap_enable_hostapd(PSDevice pDevice, int rtnl_locked)
42442 PSDevice apdev_priv;
42443 struct net_device *dev = pDevice->dev;
42444 int ret;
42445 - const struct net_device_ops apdev_netdev_ops = {
42446 + net_device_ops_no_const apdev_netdev_ops = {
42447 .ndo_start_xmit = pDevice->tx_80211,
42448 };
42449
42450 diff --git a/drivers/staging/wlan-ng/hfa384x_usb.c b/drivers/staging/wlan-ng/hfa384x_usb.c
42451 index 925678b..da7f5ed 100644
42452 --- a/drivers/staging/wlan-ng/hfa384x_usb.c
42453 +++ b/drivers/staging/wlan-ng/hfa384x_usb.c
42454 @@ -205,7 +205,7 @@ static void unlocked_usbctlx_complete(hfa384x_t *hw, hfa384x_usbctlx_t *ctlx);
42455
42456 struct usbctlx_completor {
42457 int (*complete) (struct usbctlx_completor *);
42458 -};
42459 +} __no_const;
42460 typedef struct usbctlx_completor usbctlx_completor_t;
42461
42462 static int
42463 diff --git a/drivers/telephony/ixj.c b/drivers/telephony/ixj.c
42464 index 40de151..924f268 100644
42465 --- a/drivers/telephony/ixj.c
42466 +++ b/drivers/telephony/ixj.c
42467 @@ -4976,6 +4976,8 @@ static int ixj_daa_cid_read(IXJ *j)
42468 bool mContinue;
42469 char *pIn, *pOut;
42470
42471 + pax_track_stack();
42472 +
42473 if (!SCI_Prepare(j))
42474 return 0;
42475
42476 diff --git a/drivers/uio/uio.c b/drivers/uio/uio.c
42477 index e941367..b631f5a 100644
42478 --- a/drivers/uio/uio.c
42479 +++ b/drivers/uio/uio.c
42480 @@ -23,6 +23,7 @@
42481 #include <linux/string.h>
42482 #include <linux/kobject.h>
42483 #include <linux/uio_driver.h>
42484 +#include <asm/local.h>
42485
42486 #define UIO_MAX_DEVICES 255
42487
42488 @@ -30,10 +31,10 @@ struct uio_device {
42489 struct module *owner;
42490 struct device *dev;
42491 int minor;
42492 - atomic_t event;
42493 + atomic_unchecked_t event;
42494 struct fasync_struct *async_queue;
42495 wait_queue_head_t wait;
42496 - int vma_count;
42497 + local_t vma_count;
42498 struct uio_info *info;
42499 struct kobject *map_dir;
42500 struct kobject *portio_dir;
42501 @@ -129,7 +130,7 @@ static ssize_t map_type_show(struct kobject *kobj, struct attribute *attr,
42502 return entry->show(mem, buf);
42503 }
42504
42505 -static struct sysfs_ops map_sysfs_ops = {
42506 +static const struct sysfs_ops map_sysfs_ops = {
42507 .show = map_type_show,
42508 };
42509
42510 @@ -217,7 +218,7 @@ static ssize_t portio_type_show(struct kobject *kobj, struct attribute *attr,
42511 return entry->show(port, buf);
42512 }
42513
42514 -static struct sysfs_ops portio_sysfs_ops = {
42515 +static const struct sysfs_ops portio_sysfs_ops = {
42516 .show = portio_type_show,
42517 };
42518
42519 @@ -255,7 +256,7 @@ static ssize_t show_event(struct device *dev,
42520 struct uio_device *idev = dev_get_drvdata(dev);
42521 if (idev)
42522 return sprintf(buf, "%u\n",
42523 - (unsigned int)atomic_read(&idev->event));
42524 + (unsigned int)atomic_read_unchecked(&idev->event));
42525 else
42526 return -ENODEV;
42527 }
42528 @@ -424,7 +425,7 @@ void uio_event_notify(struct uio_info *info)
42529 {
42530 struct uio_device *idev = info->uio_dev;
42531
42532 - atomic_inc(&idev->event);
42533 + atomic_inc_unchecked(&idev->event);
42534 wake_up_interruptible(&idev->wait);
42535 kill_fasync(&idev->async_queue, SIGIO, POLL_IN);
42536 }
42537 @@ -477,7 +478,7 @@ static int uio_open(struct inode *inode, struct file *filep)
42538 }
42539
42540 listener->dev = idev;
42541 - listener->event_count = atomic_read(&idev->event);
42542 + listener->event_count = atomic_read_unchecked(&idev->event);
42543 filep->private_data = listener;
42544
42545 if (idev->info->open) {
42546 @@ -528,7 +529,7 @@ static unsigned int uio_poll(struct file *filep, poll_table *wait)
42547 return -EIO;
42548
42549 poll_wait(filep, &idev->wait, wait);
42550 - if (listener->event_count != atomic_read(&idev->event))
42551 + if (listener->event_count != atomic_read_unchecked(&idev->event))
42552 return POLLIN | POLLRDNORM;
42553 return 0;
42554 }
42555 @@ -553,7 +554,7 @@ static ssize_t uio_read(struct file *filep, char __user *buf,
42556 do {
42557 set_current_state(TASK_INTERRUPTIBLE);
42558
42559 - event_count = atomic_read(&idev->event);
42560 + event_count = atomic_read_unchecked(&idev->event);
42561 if (event_count != listener->event_count) {
42562 if (copy_to_user(buf, &event_count, count))
42563 retval = -EFAULT;
42564 @@ -624,13 +625,13 @@ static int uio_find_mem_index(struct vm_area_struct *vma)
42565 static void uio_vma_open(struct vm_area_struct *vma)
42566 {
42567 struct uio_device *idev = vma->vm_private_data;
42568 - idev->vma_count++;
42569 + local_inc(&idev->vma_count);
42570 }
42571
42572 static void uio_vma_close(struct vm_area_struct *vma)
42573 {
42574 struct uio_device *idev = vma->vm_private_data;
42575 - idev->vma_count--;
42576 + local_dec(&idev->vma_count);
42577 }
42578
42579 static int uio_vma_fault(struct vm_area_struct *vma, struct vm_fault *vmf)
42580 @@ -840,7 +841,7 @@ int __uio_register_device(struct module *owner,
42581 idev->owner = owner;
42582 idev->info = info;
42583 init_waitqueue_head(&idev->wait);
42584 - atomic_set(&idev->event, 0);
42585 + atomic_set_unchecked(&idev->event, 0);
42586
42587 ret = uio_get_minor(idev);
42588 if (ret)
42589 diff --git a/drivers/usb/atm/usbatm.c b/drivers/usb/atm/usbatm.c
42590 index fbea856..06efea6 100644
42591 --- a/drivers/usb/atm/usbatm.c
42592 +++ b/drivers/usb/atm/usbatm.c
42593 @@ -333,7 +333,7 @@ static void usbatm_extract_one_cell(struct usbatm_data *instance, unsigned char
42594 if (printk_ratelimit())
42595 atm_warn(instance, "%s: OAM not supported (vpi %d, vci %d)!\n",
42596 __func__, vpi, vci);
42597 - atomic_inc(&vcc->stats->rx_err);
42598 + atomic_inc_unchecked(&vcc->stats->rx_err);
42599 return;
42600 }
42601
42602 @@ -361,7 +361,7 @@ static void usbatm_extract_one_cell(struct usbatm_data *instance, unsigned char
42603 if (length > ATM_MAX_AAL5_PDU) {
42604 atm_rldbg(instance, "%s: bogus length %u (vcc: 0x%p)!\n",
42605 __func__, length, vcc);
42606 - atomic_inc(&vcc->stats->rx_err);
42607 + atomic_inc_unchecked(&vcc->stats->rx_err);
42608 goto out;
42609 }
42610
42611 @@ -370,14 +370,14 @@ static void usbatm_extract_one_cell(struct usbatm_data *instance, unsigned char
42612 if (sarb->len < pdu_length) {
42613 atm_rldbg(instance, "%s: bogus pdu_length %u (sarb->len: %u, vcc: 0x%p)!\n",
42614 __func__, pdu_length, sarb->len, vcc);
42615 - atomic_inc(&vcc->stats->rx_err);
42616 + atomic_inc_unchecked(&vcc->stats->rx_err);
42617 goto out;
42618 }
42619
42620 if (crc32_be(~0, skb_tail_pointer(sarb) - pdu_length, pdu_length) != 0xc704dd7b) {
42621 atm_rldbg(instance, "%s: packet failed crc check (vcc: 0x%p)!\n",
42622 __func__, vcc);
42623 - atomic_inc(&vcc->stats->rx_err);
42624 + atomic_inc_unchecked(&vcc->stats->rx_err);
42625 goto out;
42626 }
42627
42628 @@ -387,7 +387,7 @@ static void usbatm_extract_one_cell(struct usbatm_data *instance, unsigned char
42629 if (printk_ratelimit())
42630 atm_err(instance, "%s: no memory for skb (length: %u)!\n",
42631 __func__, length);
42632 - atomic_inc(&vcc->stats->rx_drop);
42633 + atomic_inc_unchecked(&vcc->stats->rx_drop);
42634 goto out;
42635 }
42636
42637 @@ -412,7 +412,7 @@ static void usbatm_extract_one_cell(struct usbatm_data *instance, unsigned char
42638
42639 vcc->push(vcc, skb);
42640
42641 - atomic_inc(&vcc->stats->rx);
42642 + atomic_inc_unchecked(&vcc->stats->rx);
42643 out:
42644 skb_trim(sarb, 0);
42645 }
42646 @@ -616,7 +616,7 @@ static void usbatm_tx_process(unsigned long data)
42647 struct atm_vcc *vcc = UDSL_SKB(skb)->atm.vcc;
42648
42649 usbatm_pop(vcc, skb);
42650 - atomic_inc(&vcc->stats->tx);
42651 + atomic_inc_unchecked(&vcc->stats->tx);
42652
42653 skb = skb_dequeue(&instance->sndqueue);
42654 }
42655 @@ -775,11 +775,11 @@ static int usbatm_atm_proc_read(struct atm_dev *atm_dev, loff_t * pos, char *pag
42656 if (!left--)
42657 return sprintf(page,
42658 "AAL5: tx %d ( %d err ), rx %d ( %d err, %d drop )\n",
42659 - atomic_read(&atm_dev->stats.aal5.tx),
42660 - atomic_read(&atm_dev->stats.aal5.tx_err),
42661 - atomic_read(&atm_dev->stats.aal5.rx),
42662 - atomic_read(&atm_dev->stats.aal5.rx_err),
42663 - atomic_read(&atm_dev->stats.aal5.rx_drop));
42664 + atomic_read_unchecked(&atm_dev->stats.aal5.tx),
42665 + atomic_read_unchecked(&atm_dev->stats.aal5.tx_err),
42666 + atomic_read_unchecked(&atm_dev->stats.aal5.rx),
42667 + atomic_read_unchecked(&atm_dev->stats.aal5.rx_err),
42668 + atomic_read_unchecked(&atm_dev->stats.aal5.rx_drop));
42669
42670 if (!left--) {
42671 if (instance->disconnected)
42672 diff --git a/drivers/usb/class/cdc-wdm.c b/drivers/usb/class/cdc-wdm.c
42673 index 3e564bf..949b448 100644
42674 --- a/drivers/usb/class/cdc-wdm.c
42675 +++ b/drivers/usb/class/cdc-wdm.c
42676 @@ -314,7 +314,7 @@ static ssize_t wdm_write
42677 if (r < 0)
42678 goto outnp;
42679
42680 - if (!file->f_flags && O_NONBLOCK)
42681 + if (!(file->f_flags & O_NONBLOCK))
42682 r = wait_event_interruptible(desc->wait, !test_bit(WDM_IN_USE,
42683 &desc->flags));
42684 else
42685 diff --git a/drivers/usb/core/hcd.c b/drivers/usb/core/hcd.c
42686 index 24e6205..fe5a5d4 100644
42687 --- a/drivers/usb/core/hcd.c
42688 +++ b/drivers/usb/core/hcd.c
42689 @@ -2216,7 +2216,7 @@ EXPORT_SYMBOL_GPL(usb_hcd_platform_shutdown);
42690
42691 #if defined(CONFIG_USB_MON) || defined(CONFIG_USB_MON_MODULE)
42692
42693 -struct usb_mon_operations *mon_ops;
42694 +const struct usb_mon_operations *mon_ops;
42695
42696 /*
42697 * The registration is unlocked.
42698 @@ -2226,7 +2226,7 @@ struct usb_mon_operations *mon_ops;
42699 * symbols from usbcore, usbcore gets referenced and cannot be unloaded first.
42700 */
42701
42702 -int usb_mon_register (struct usb_mon_operations *ops)
42703 +int usb_mon_register (const struct usb_mon_operations *ops)
42704 {
42705
42706 if (mon_ops)
42707 diff --git a/drivers/usb/core/hcd.h b/drivers/usb/core/hcd.h
42708 index bcbe104..9cfd1c6 100644
42709 --- a/drivers/usb/core/hcd.h
42710 +++ b/drivers/usb/core/hcd.h
42711 @@ -486,13 +486,13 @@ static inline void usbfs_cleanup(void) { }
42712 #if defined(CONFIG_USB_MON) || defined(CONFIG_USB_MON_MODULE)
42713
42714 struct usb_mon_operations {
42715 - void (*urb_submit)(struct usb_bus *bus, struct urb *urb);
42716 - void (*urb_submit_error)(struct usb_bus *bus, struct urb *urb, int err);
42717 - void (*urb_complete)(struct usb_bus *bus, struct urb *urb, int status);
42718 + void (* const urb_submit)(struct usb_bus *bus, struct urb *urb);
42719 + void (* const urb_submit_error)(struct usb_bus *bus, struct urb *urb, int err);
42720 + void (* const urb_complete)(struct usb_bus *bus, struct urb *urb, int status);
42721 /* void (*urb_unlink)(struct usb_bus *bus, struct urb *urb); */
42722 };
42723
42724 -extern struct usb_mon_operations *mon_ops;
42725 +extern const struct usb_mon_operations *mon_ops;
42726
42727 static inline void usbmon_urb_submit(struct usb_bus *bus, struct urb *urb)
42728 {
42729 @@ -514,7 +514,7 @@ static inline void usbmon_urb_complete(struct usb_bus *bus, struct urb *urb,
42730 (*mon_ops->urb_complete)(bus, urb, status);
42731 }
42732
42733 -int usb_mon_register(struct usb_mon_operations *ops);
42734 +int usb_mon_register(const struct usb_mon_operations *ops);
42735 void usb_mon_deregister(void);
42736
42737 #else
42738 diff --git a/drivers/usb/core/message.c b/drivers/usb/core/message.c
42739 index 409cc94..a673bad 100644
42740 --- a/drivers/usb/core/message.c
42741 +++ b/drivers/usb/core/message.c
42742 @@ -914,8 +914,8 @@ char *usb_cache_string(struct usb_device *udev, int index)
42743 buf = kmalloc(MAX_USB_STRING_SIZE, GFP_NOIO);
42744 if (buf) {
42745 len = usb_string(udev, index, buf, MAX_USB_STRING_SIZE);
42746 - if (len > 0) {
42747 - smallbuf = kmalloc(++len, GFP_NOIO);
42748 + if (len++ > 0) {
42749 + smallbuf = kmalloc(len, GFP_NOIO);
42750 if (!smallbuf)
42751 return buf;
42752 memcpy(smallbuf, buf, len);
42753 diff --git a/drivers/usb/misc/appledisplay.c b/drivers/usb/misc/appledisplay.c
42754 index 62ff5e7..530b74e 100644
42755 --- a/drivers/usb/misc/appledisplay.c
42756 +++ b/drivers/usb/misc/appledisplay.c
42757 @@ -178,7 +178,7 @@ static int appledisplay_bl_get_brightness(struct backlight_device *bd)
42758 return pdata->msgdata[1];
42759 }
42760
42761 -static struct backlight_ops appledisplay_bl_data = {
42762 +static const struct backlight_ops appledisplay_bl_data = {
42763 .get_brightness = appledisplay_bl_get_brightness,
42764 .update_status = appledisplay_bl_update_status,
42765 };
42766 diff --git a/drivers/usb/mon/mon_main.c b/drivers/usb/mon/mon_main.c
42767 index e0c2db3..bd8cb66 100644
42768 --- a/drivers/usb/mon/mon_main.c
42769 +++ b/drivers/usb/mon/mon_main.c
42770 @@ -238,7 +238,7 @@ static struct notifier_block mon_nb = {
42771 /*
42772 * Ops
42773 */
42774 -static struct usb_mon_operations mon_ops_0 = {
42775 +static const struct usb_mon_operations mon_ops_0 = {
42776 .urb_submit = mon_submit,
42777 .urb_submit_error = mon_submit_error,
42778 .urb_complete = mon_complete,
42779 diff --git a/drivers/usb/wusbcore/wa-hc.h b/drivers/usb/wusbcore/wa-hc.h
42780 index d6bea3e..60b250e 100644
42781 --- a/drivers/usb/wusbcore/wa-hc.h
42782 +++ b/drivers/usb/wusbcore/wa-hc.h
42783 @@ -192,7 +192,7 @@ struct wahc {
42784 struct list_head xfer_delayed_list;
42785 spinlock_t xfer_list_lock;
42786 struct work_struct xfer_work;
42787 - atomic_t xfer_id_count;
42788 + atomic_unchecked_t xfer_id_count;
42789 };
42790
42791
42792 @@ -246,7 +246,7 @@ static inline void wa_init(struct wahc *wa)
42793 INIT_LIST_HEAD(&wa->xfer_delayed_list);
42794 spin_lock_init(&wa->xfer_list_lock);
42795 INIT_WORK(&wa->xfer_work, wa_urb_enqueue_run);
42796 - atomic_set(&wa->xfer_id_count, 1);
42797 + atomic_set_unchecked(&wa->xfer_id_count, 1);
42798 }
42799
42800 /**
42801 diff --git a/drivers/usb/wusbcore/wa-xfer.c b/drivers/usb/wusbcore/wa-xfer.c
42802 index 613a5fc..3174865 100644
42803 --- a/drivers/usb/wusbcore/wa-xfer.c
42804 +++ b/drivers/usb/wusbcore/wa-xfer.c
42805 @@ -293,7 +293,7 @@ out:
42806 */
42807 static void wa_xfer_id_init(struct wa_xfer *xfer)
42808 {
42809 - xfer->id = atomic_add_return(1, &xfer->wa->xfer_id_count);
42810 + xfer->id = atomic_add_return_unchecked(1, &xfer->wa->xfer_id_count);
42811 }
42812
42813 /*
42814 diff --git a/drivers/uwb/wlp/messages.c b/drivers/uwb/wlp/messages.c
42815 index aa42fce..f8a828c 100644
42816 --- a/drivers/uwb/wlp/messages.c
42817 +++ b/drivers/uwb/wlp/messages.c
42818 @@ -903,7 +903,7 @@ int wlp_parse_f0(struct wlp *wlp, struct sk_buff *skb)
42819 size_t len = skb->len;
42820 size_t used;
42821 ssize_t result;
42822 - struct wlp_nonce enonce, rnonce;
42823 + struct wlp_nonce enonce = {{0}}, rnonce = {{0}};
42824 enum wlp_assc_error assc_err;
42825 char enonce_buf[WLP_WSS_NONCE_STRSIZE];
42826 char rnonce_buf[WLP_WSS_NONCE_STRSIZE];
42827 diff --git a/drivers/uwb/wlp/sysfs.c b/drivers/uwb/wlp/sysfs.c
42828 index 0370399..6627c94 100644
42829 --- a/drivers/uwb/wlp/sysfs.c
42830 +++ b/drivers/uwb/wlp/sysfs.c
42831 @@ -615,8 +615,7 @@ ssize_t wlp_wss_attr_store(struct kobject *kobj, struct attribute *attr,
42832 return ret;
42833 }
42834
42835 -static
42836 -struct sysfs_ops wss_sysfs_ops = {
42837 +static const struct sysfs_ops wss_sysfs_ops = {
42838 .show = wlp_wss_attr_show,
42839 .store = wlp_wss_attr_store,
42840 };
42841 diff --git a/drivers/video/atmel_lcdfb.c b/drivers/video/atmel_lcdfb.c
42842 index d5e8010..5687b56 100644
42843 --- a/drivers/video/atmel_lcdfb.c
42844 +++ b/drivers/video/atmel_lcdfb.c
42845 @@ -110,7 +110,7 @@ static int atmel_bl_get_brightness(struct backlight_device *bl)
42846 return lcdc_readl(sinfo, ATMEL_LCDC_CONTRAST_VAL);
42847 }
42848
42849 -static struct backlight_ops atmel_lcdc_bl_ops = {
42850 +static const struct backlight_ops atmel_lcdc_bl_ops = {
42851 .update_status = atmel_bl_update_status,
42852 .get_brightness = atmel_bl_get_brightness,
42853 };
42854 diff --git a/drivers/video/aty/aty128fb.c b/drivers/video/aty/aty128fb.c
42855 index e4e4d43..66bcbcc 100644
42856 --- a/drivers/video/aty/aty128fb.c
42857 +++ b/drivers/video/aty/aty128fb.c
42858 @@ -149,7 +149,7 @@ enum {
42859 };
42860
42861 /* Must match above enum */
42862 -static const char *r128_family[] __devinitdata = {
42863 +static const char *r128_family[] __devinitconst = {
42864 "AGP",
42865 "PCI",
42866 "PRO AGP",
42867 @@ -1787,7 +1787,7 @@ static int aty128_bl_get_brightness(struct backlight_device *bd)
42868 return bd->props.brightness;
42869 }
42870
42871 -static struct backlight_ops aty128_bl_data = {
42872 +static const struct backlight_ops aty128_bl_data = {
42873 .get_brightness = aty128_bl_get_brightness,
42874 .update_status = aty128_bl_update_status,
42875 };
42876 diff --git a/drivers/video/aty/atyfb_base.c b/drivers/video/aty/atyfb_base.c
42877 index 913b4a4..9295a38 100644
42878 --- a/drivers/video/aty/atyfb_base.c
42879 +++ b/drivers/video/aty/atyfb_base.c
42880 @@ -2225,7 +2225,7 @@ static int aty_bl_get_brightness(struct backlight_device *bd)
42881 return bd->props.brightness;
42882 }
42883
42884 -static struct backlight_ops aty_bl_data = {
42885 +static const struct backlight_ops aty_bl_data = {
42886 .get_brightness = aty_bl_get_brightness,
42887 .update_status = aty_bl_update_status,
42888 };
42889 diff --git a/drivers/video/aty/radeon_backlight.c b/drivers/video/aty/radeon_backlight.c
42890 index 1a056ad..221bd6a 100644
42891 --- a/drivers/video/aty/radeon_backlight.c
42892 +++ b/drivers/video/aty/radeon_backlight.c
42893 @@ -127,7 +127,7 @@ static int radeon_bl_get_brightness(struct backlight_device *bd)
42894 return bd->props.brightness;
42895 }
42896
42897 -static struct backlight_ops radeon_bl_data = {
42898 +static const struct backlight_ops radeon_bl_data = {
42899 .get_brightness = radeon_bl_get_brightness,
42900 .update_status = radeon_bl_update_status,
42901 };
42902 diff --git a/drivers/video/backlight/adp5520_bl.c b/drivers/video/backlight/adp5520_bl.c
42903 index ad05da5..3cb2cb9 100644
42904 --- a/drivers/video/backlight/adp5520_bl.c
42905 +++ b/drivers/video/backlight/adp5520_bl.c
42906 @@ -84,7 +84,7 @@ static int adp5520_bl_get_brightness(struct backlight_device *bl)
42907 return error ? data->current_brightness : reg_val;
42908 }
42909
42910 -static struct backlight_ops adp5520_bl_ops = {
42911 +static const struct backlight_ops adp5520_bl_ops = {
42912 .update_status = adp5520_bl_update_status,
42913 .get_brightness = adp5520_bl_get_brightness,
42914 };
42915 diff --git a/drivers/video/backlight/adx_bl.c b/drivers/video/backlight/adx_bl.c
42916 index 2c3bdfc..d769b0b 100644
42917 --- a/drivers/video/backlight/adx_bl.c
42918 +++ b/drivers/video/backlight/adx_bl.c
42919 @@ -61,7 +61,7 @@ static int adx_backlight_check_fb(struct fb_info *fb)
42920 return 1;
42921 }
42922
42923 -static struct backlight_ops adx_backlight_ops = {
42924 +static const struct backlight_ops adx_backlight_ops = {
42925 .options = 0,
42926 .update_status = adx_backlight_update_status,
42927 .get_brightness = adx_backlight_get_brightness,
42928 diff --git a/drivers/video/backlight/atmel-pwm-bl.c b/drivers/video/backlight/atmel-pwm-bl.c
42929 index 505c082..6b6b3cc 100644
42930 --- a/drivers/video/backlight/atmel-pwm-bl.c
42931 +++ b/drivers/video/backlight/atmel-pwm-bl.c
42932 @@ -113,7 +113,7 @@ static int atmel_pwm_bl_init_pwm(struct atmel_pwm_bl *pwmbl)
42933 return pwm_channel_enable(&pwmbl->pwmc);
42934 }
42935
42936 -static struct backlight_ops atmel_pwm_bl_ops = {
42937 +static const struct backlight_ops atmel_pwm_bl_ops = {
42938 .get_brightness = atmel_pwm_bl_get_intensity,
42939 .update_status = atmel_pwm_bl_set_intensity,
42940 };
42941 diff --git a/drivers/video/backlight/backlight.c b/drivers/video/backlight/backlight.c
42942 index 5e20e6e..89025e6 100644
42943 --- a/drivers/video/backlight/backlight.c
42944 +++ b/drivers/video/backlight/backlight.c
42945 @@ -269,7 +269,7 @@ EXPORT_SYMBOL(backlight_force_update);
42946 * ERR_PTR() or a pointer to the newly allocated device.
42947 */
42948 struct backlight_device *backlight_device_register(const char *name,
42949 - struct device *parent, void *devdata, struct backlight_ops *ops)
42950 + struct device *parent, void *devdata, const struct backlight_ops *ops)
42951 {
42952 struct backlight_device *new_bd;
42953 int rc;
42954 diff --git a/drivers/video/backlight/corgi_lcd.c b/drivers/video/backlight/corgi_lcd.c
42955 index 9677494..b4bcf80 100644
42956 --- a/drivers/video/backlight/corgi_lcd.c
42957 +++ b/drivers/video/backlight/corgi_lcd.c
42958 @@ -451,7 +451,7 @@ void corgi_lcd_limit_intensity(int limit)
42959 }
42960 EXPORT_SYMBOL(corgi_lcd_limit_intensity);
42961
42962 -static struct backlight_ops corgi_bl_ops = {
42963 +static const struct backlight_ops corgi_bl_ops = {
42964 .get_brightness = corgi_bl_get_intensity,
42965 .update_status = corgi_bl_update_status,
42966 };
42967 diff --git a/drivers/video/backlight/cr_bllcd.c b/drivers/video/backlight/cr_bllcd.c
42968 index b9fe62b..2914bf1 100644
42969 --- a/drivers/video/backlight/cr_bllcd.c
42970 +++ b/drivers/video/backlight/cr_bllcd.c
42971 @@ -108,7 +108,7 @@ static int cr_backlight_get_intensity(struct backlight_device *bd)
42972 return intensity;
42973 }
42974
42975 -static struct backlight_ops cr_backlight_ops = {
42976 +static const struct backlight_ops cr_backlight_ops = {
42977 .get_brightness = cr_backlight_get_intensity,
42978 .update_status = cr_backlight_set_intensity,
42979 };
42980 diff --git a/drivers/video/backlight/da903x_bl.c b/drivers/video/backlight/da903x_bl.c
42981 index 701a108..feacfd5 100644
42982 --- a/drivers/video/backlight/da903x_bl.c
42983 +++ b/drivers/video/backlight/da903x_bl.c
42984 @@ -94,7 +94,7 @@ static int da903x_backlight_get_brightness(struct backlight_device *bl)
42985 return data->current_brightness;
42986 }
42987
42988 -static struct backlight_ops da903x_backlight_ops = {
42989 +static const struct backlight_ops da903x_backlight_ops = {
42990 .update_status = da903x_backlight_update_status,
42991 .get_brightness = da903x_backlight_get_brightness,
42992 };
42993 diff --git a/drivers/video/backlight/generic_bl.c b/drivers/video/backlight/generic_bl.c
42994 index 6d27f62..e6d348e 100644
42995 --- a/drivers/video/backlight/generic_bl.c
42996 +++ b/drivers/video/backlight/generic_bl.c
42997 @@ -70,7 +70,7 @@ void corgibl_limit_intensity(int limit)
42998 }
42999 EXPORT_SYMBOL(corgibl_limit_intensity);
43000
43001 -static struct backlight_ops genericbl_ops = {
43002 +static const struct backlight_ops genericbl_ops = {
43003 .options = BL_CORE_SUSPENDRESUME,
43004 .get_brightness = genericbl_get_intensity,
43005 .update_status = genericbl_send_intensity,
43006 diff --git a/drivers/video/backlight/hp680_bl.c b/drivers/video/backlight/hp680_bl.c
43007 index 7fb4eef..f7cc528 100644
43008 --- a/drivers/video/backlight/hp680_bl.c
43009 +++ b/drivers/video/backlight/hp680_bl.c
43010 @@ -98,7 +98,7 @@ static int hp680bl_get_intensity(struct backlight_device *bd)
43011 return current_intensity;
43012 }
43013
43014 -static struct backlight_ops hp680bl_ops = {
43015 +static const struct backlight_ops hp680bl_ops = {
43016 .get_brightness = hp680bl_get_intensity,
43017 .update_status = hp680bl_set_intensity,
43018 };
43019 diff --git a/drivers/video/backlight/jornada720_bl.c b/drivers/video/backlight/jornada720_bl.c
43020 index 7aed256..db9071f 100644
43021 --- a/drivers/video/backlight/jornada720_bl.c
43022 +++ b/drivers/video/backlight/jornada720_bl.c
43023 @@ -93,7 +93,7 @@ out:
43024 return ret;
43025 }
43026
43027 -static struct backlight_ops jornada_bl_ops = {
43028 +static const struct backlight_ops jornada_bl_ops = {
43029 .get_brightness = jornada_bl_get_brightness,
43030 .update_status = jornada_bl_update_status,
43031 .options = BL_CORE_SUSPENDRESUME,
43032 diff --git a/drivers/video/backlight/kb3886_bl.c b/drivers/video/backlight/kb3886_bl.c
43033 index a38fda1..939e7b8 100644
43034 --- a/drivers/video/backlight/kb3886_bl.c
43035 +++ b/drivers/video/backlight/kb3886_bl.c
43036 @@ -134,7 +134,7 @@ static int kb3886bl_get_intensity(struct backlight_device *bd)
43037 return kb3886bl_intensity;
43038 }
43039
43040 -static struct backlight_ops kb3886bl_ops = {
43041 +static const struct backlight_ops kb3886bl_ops = {
43042 .get_brightness = kb3886bl_get_intensity,
43043 .update_status = kb3886bl_send_intensity,
43044 };
43045 diff --git a/drivers/video/backlight/locomolcd.c b/drivers/video/backlight/locomolcd.c
43046 index 6b488b8..00a9591 100644
43047 --- a/drivers/video/backlight/locomolcd.c
43048 +++ b/drivers/video/backlight/locomolcd.c
43049 @@ -141,7 +141,7 @@ static int locomolcd_get_intensity(struct backlight_device *bd)
43050 return current_intensity;
43051 }
43052
43053 -static struct backlight_ops locomobl_data = {
43054 +static const struct backlight_ops locomobl_data = {
43055 .get_brightness = locomolcd_get_intensity,
43056 .update_status = locomolcd_set_intensity,
43057 };
43058 diff --git a/drivers/video/backlight/mbp_nvidia_bl.c b/drivers/video/backlight/mbp_nvidia_bl.c
43059 index 99bdfa8..3dac448 100644
43060 --- a/drivers/video/backlight/mbp_nvidia_bl.c
43061 +++ b/drivers/video/backlight/mbp_nvidia_bl.c
43062 @@ -33,7 +33,7 @@ struct dmi_match_data {
43063 unsigned long iostart;
43064 unsigned long iolen;
43065 /* Backlight operations structure. */
43066 - struct backlight_ops backlight_ops;
43067 + const struct backlight_ops backlight_ops;
43068 };
43069
43070 /* Module parameters. */
43071 diff --git a/drivers/video/backlight/omap1_bl.c b/drivers/video/backlight/omap1_bl.c
43072 index cbad67e..3cf900e 100644
43073 --- a/drivers/video/backlight/omap1_bl.c
43074 +++ b/drivers/video/backlight/omap1_bl.c
43075 @@ -125,7 +125,7 @@ static int omapbl_get_intensity(struct backlight_device *dev)
43076 return bl->current_intensity;
43077 }
43078
43079 -static struct backlight_ops omapbl_ops = {
43080 +static const struct backlight_ops omapbl_ops = {
43081 .get_brightness = omapbl_get_intensity,
43082 .update_status = omapbl_update_status,
43083 };
43084 diff --git a/drivers/video/backlight/progear_bl.c b/drivers/video/backlight/progear_bl.c
43085 index 9edaf24..075786e 100644
43086 --- a/drivers/video/backlight/progear_bl.c
43087 +++ b/drivers/video/backlight/progear_bl.c
43088 @@ -54,7 +54,7 @@ static int progearbl_get_intensity(struct backlight_device *bd)
43089 return intensity - HW_LEVEL_MIN;
43090 }
43091
43092 -static struct backlight_ops progearbl_ops = {
43093 +static const struct backlight_ops progearbl_ops = {
43094 .get_brightness = progearbl_get_intensity,
43095 .update_status = progearbl_set_intensity,
43096 };
43097 diff --git a/drivers/video/backlight/pwm_bl.c b/drivers/video/backlight/pwm_bl.c
43098 index 8871662..df9e0b3 100644
43099 --- a/drivers/video/backlight/pwm_bl.c
43100 +++ b/drivers/video/backlight/pwm_bl.c
43101 @@ -56,7 +56,7 @@ static int pwm_backlight_get_brightness(struct backlight_device *bl)
43102 return bl->props.brightness;
43103 }
43104
43105 -static struct backlight_ops pwm_backlight_ops = {
43106 +static const struct backlight_ops pwm_backlight_ops = {
43107 .update_status = pwm_backlight_update_status,
43108 .get_brightness = pwm_backlight_get_brightness,
43109 };
43110 diff --git a/drivers/video/backlight/tosa_bl.c b/drivers/video/backlight/tosa_bl.c
43111 index 43edbad..e14ce4d 100644
43112 --- a/drivers/video/backlight/tosa_bl.c
43113 +++ b/drivers/video/backlight/tosa_bl.c
43114 @@ -72,7 +72,7 @@ static int tosa_bl_get_brightness(struct backlight_device *dev)
43115 return props->brightness;
43116 }
43117
43118 -static struct backlight_ops bl_ops = {
43119 +static const struct backlight_ops bl_ops = {
43120 .get_brightness = tosa_bl_get_brightness,
43121 .update_status = tosa_bl_update_status,
43122 };
43123 diff --git a/drivers/video/backlight/wm831x_bl.c b/drivers/video/backlight/wm831x_bl.c
43124 index 467bdb7..e32add3 100644
43125 --- a/drivers/video/backlight/wm831x_bl.c
43126 +++ b/drivers/video/backlight/wm831x_bl.c
43127 @@ -112,7 +112,7 @@ static int wm831x_backlight_get_brightness(struct backlight_device *bl)
43128 return data->current_brightness;
43129 }
43130
43131 -static struct backlight_ops wm831x_backlight_ops = {
43132 +static const struct backlight_ops wm831x_backlight_ops = {
43133 .options = BL_CORE_SUSPENDRESUME,
43134 .update_status = wm831x_backlight_update_status,
43135 .get_brightness = wm831x_backlight_get_brightness,
43136 diff --git a/drivers/video/bf54x-lq043fb.c b/drivers/video/bf54x-lq043fb.c
43137 index e49ae5e..db4e6f7 100644
43138 --- a/drivers/video/bf54x-lq043fb.c
43139 +++ b/drivers/video/bf54x-lq043fb.c
43140 @@ -463,7 +463,7 @@ static int bl_get_brightness(struct backlight_device *bd)
43141 return 0;
43142 }
43143
43144 -static struct backlight_ops bfin_lq043fb_bl_ops = {
43145 +static const struct backlight_ops bfin_lq043fb_bl_ops = {
43146 .get_brightness = bl_get_brightness,
43147 };
43148
43149 diff --git a/drivers/video/bfin-t350mcqb-fb.c b/drivers/video/bfin-t350mcqb-fb.c
43150 index 2c72a7c..d523e52 100644
43151 --- a/drivers/video/bfin-t350mcqb-fb.c
43152 +++ b/drivers/video/bfin-t350mcqb-fb.c
43153 @@ -381,7 +381,7 @@ static int bl_get_brightness(struct backlight_device *bd)
43154 return 0;
43155 }
43156
43157 -static struct backlight_ops bfin_lq043fb_bl_ops = {
43158 +static const struct backlight_ops bfin_lq043fb_bl_ops = {
43159 .get_brightness = bl_get_brightness,
43160 };
43161
43162 diff --git a/drivers/video/fbcmap.c b/drivers/video/fbcmap.c
43163 index f53b9f1..958bf4e 100644
43164 --- a/drivers/video/fbcmap.c
43165 +++ b/drivers/video/fbcmap.c
43166 @@ -266,8 +266,7 @@ int fb_set_user_cmap(struct fb_cmap_user *cmap, struct fb_info *info)
43167 rc = -ENODEV;
43168 goto out;
43169 }
43170 - if (cmap->start < 0 || (!info->fbops->fb_setcolreg &&
43171 - !info->fbops->fb_setcmap)) {
43172 + if (!info->fbops->fb_setcolreg && !info->fbops->fb_setcmap) {
43173 rc = -EINVAL;
43174 goto out1;
43175 }
43176 diff --git a/drivers/video/fbmem.c b/drivers/video/fbmem.c
43177 index 99bbd28..ad3829e 100644
43178 --- a/drivers/video/fbmem.c
43179 +++ b/drivers/video/fbmem.c
43180 @@ -403,7 +403,7 @@ static void fb_do_show_logo(struct fb_info *info, struct fb_image *image,
43181 image->dx += image->width + 8;
43182 }
43183 } else if (rotate == FB_ROTATE_UD) {
43184 - for (x = 0; x < num && image->dx >= 0; x++) {
43185 + for (x = 0; x < num && (__s32)image->dx >= 0; x++) {
43186 info->fbops->fb_imageblit(info, image);
43187 image->dx -= image->width + 8;
43188 }
43189 @@ -415,7 +415,7 @@ static void fb_do_show_logo(struct fb_info *info, struct fb_image *image,
43190 image->dy += image->height + 8;
43191 }
43192 } else if (rotate == FB_ROTATE_CCW) {
43193 - for (x = 0; x < num && image->dy >= 0; x++) {
43194 + for (x = 0; x < num && (__s32)image->dy >= 0; x++) {
43195 info->fbops->fb_imageblit(info, image);
43196 image->dy -= image->height + 8;
43197 }
43198 @@ -915,6 +915,8 @@ fb_set_var(struct fb_info *info, struct fb_var_screeninfo *var)
43199 int flags = info->flags;
43200 int ret = 0;
43201
43202 + pax_track_stack();
43203 +
43204 if (var->activate & FB_ACTIVATE_INV_MODE) {
43205 struct fb_videomode mode1, mode2;
43206
43207 @@ -1040,6 +1042,8 @@ static long do_fb_ioctl(struct fb_info *info, unsigned int cmd,
43208 void __user *argp = (void __user *)arg;
43209 long ret = 0;
43210
43211 + pax_track_stack();
43212 +
43213 switch (cmd) {
43214 case FBIOGET_VSCREENINFO:
43215 if (!lock_fb_info(info))
43216 @@ -1119,7 +1123,7 @@ static long do_fb_ioctl(struct fb_info *info, unsigned int cmd,
43217 return -EFAULT;
43218 if (con2fb.console < 1 || con2fb.console > MAX_NR_CONSOLES)
43219 return -EINVAL;
43220 - if (con2fb.framebuffer < 0 || con2fb.framebuffer >= FB_MAX)
43221 + if (con2fb.framebuffer >= FB_MAX)
43222 return -EINVAL;
43223 if (!registered_fb[con2fb.framebuffer])
43224 request_module("fb%d", con2fb.framebuffer);
43225 diff --git a/drivers/video/geode/gx1fb_core.c b/drivers/video/geode/gx1fb_core.c
43226 index f20eff8..3e4f622 100644
43227 --- a/drivers/video/geode/gx1fb_core.c
43228 +++ b/drivers/video/geode/gx1fb_core.c
43229 @@ -30,7 +30,7 @@ static int crt_option = 1;
43230 static char panel_option[32] = "";
43231
43232 /* Modes relevant to the GX1 (taken from modedb.c) */
43233 -static const struct fb_videomode __initdata gx1_modedb[] = {
43234 +static const struct fb_videomode __initconst gx1_modedb[] = {
43235 /* 640x480-60 VESA */
43236 { NULL, 60, 640, 480, 39682, 48, 16, 33, 10, 96, 2,
43237 0, FB_VMODE_NONINTERLACED, FB_MODE_IS_VESA },
43238 diff --git a/drivers/video/gxt4500.c b/drivers/video/gxt4500.c
43239 index 896e53d..4d87d0b 100644
43240 --- a/drivers/video/gxt4500.c
43241 +++ b/drivers/video/gxt4500.c
43242 @@ -156,7 +156,7 @@ struct gxt4500_par {
43243 static char *mode_option;
43244
43245 /* default mode: 1280x1024 @ 60 Hz, 8 bpp */
43246 -static const struct fb_videomode defaultmode __devinitdata = {
43247 +static const struct fb_videomode defaultmode __devinitconst = {
43248 .refresh = 60,
43249 .xres = 1280,
43250 .yres = 1024,
43251 @@ -581,7 +581,7 @@ static int gxt4500_blank(int blank, struct fb_info *info)
43252 return 0;
43253 }
43254
43255 -static const struct fb_fix_screeninfo gxt4500_fix __devinitdata = {
43256 +static const struct fb_fix_screeninfo gxt4500_fix __devinitconst = {
43257 .id = "IBM GXT4500P",
43258 .type = FB_TYPE_PACKED_PIXELS,
43259 .visual = FB_VISUAL_PSEUDOCOLOR,
43260 diff --git a/drivers/video/i810/i810_accel.c b/drivers/video/i810/i810_accel.c
43261 index f5bedee..28c6028 100644
43262 --- a/drivers/video/i810/i810_accel.c
43263 +++ b/drivers/video/i810/i810_accel.c
43264 @@ -73,6 +73,7 @@ static inline int wait_for_space(struct fb_info *info, u32 space)
43265 }
43266 }
43267 printk("ringbuffer lockup!!!\n");
43268 + printk("head:%u tail:%u iring.size:%u space:%u\n", head, tail, par->iring.size, space);
43269 i810_report_error(mmio);
43270 par->dev_flags |= LOCKUP;
43271 info->pixmap.scan_align = 1;
43272 diff --git a/drivers/video/i810/i810_main.c b/drivers/video/i810/i810_main.c
43273 index 5743ea2..457f82c 100644
43274 --- a/drivers/video/i810/i810_main.c
43275 +++ b/drivers/video/i810/i810_main.c
43276 @@ -97,7 +97,7 @@ static int i810fb_blank (int blank_mode, struct fb_info *info);
43277 static void i810fb_release_resource (struct fb_info *info, struct i810fb_par *par);
43278
43279 /* PCI */
43280 -static const char *i810_pci_list[] __devinitdata = {
43281 +static const char *i810_pci_list[] __devinitconst = {
43282 "Intel(R) 810 Framebuffer Device" ,
43283 "Intel(R) 810-DC100 Framebuffer Device" ,
43284 "Intel(R) 810E Framebuffer Device" ,
43285 diff --git a/drivers/video/logo/logo_linux_clut224.ppm b/drivers/video/logo/logo_linux_clut224.ppm
43286 index 3c14e43..eafa544 100644
43287 --- a/drivers/video/logo/logo_linux_clut224.ppm
43288 +++ b/drivers/video/logo/logo_linux_clut224.ppm
43289 @@ -1,1604 +1,1123 @@
43290 P3
43291 -# Standard 224-color Linux logo
43292 80 80
43293 255
43294 - 0 0 0 0 0 0 0 0 0 0 0 0
43295 - 0 0 0 0 0 0 0 0 0 0 0 0
43296 - 0 0 0 0 0 0 0 0 0 0 0 0
43297 - 0 0 0 0 0 0 0 0 0 0 0 0
43298 - 0 0 0 0 0 0 0 0 0 0 0 0
43299 - 0 0 0 0 0 0 0 0 0 0 0 0
43300 - 0 0 0 0 0 0 0 0 0 0 0 0
43301 - 0 0 0 0 0 0 0 0 0 0 0 0
43302 - 0 0 0 0 0 0 0 0 0 0 0 0
43303 - 6 6 6 6 6 6 10 10 10 10 10 10
43304 - 10 10 10 6 6 6 6 6 6 6 6 6
43305 - 0 0 0 0 0 0 0 0 0 0 0 0
43306 - 0 0 0 0 0 0 0 0 0 0 0 0
43307 - 0 0 0 0 0 0 0 0 0 0 0 0
43308 - 0 0 0 0 0 0 0 0 0 0 0 0
43309 - 0 0 0 0 0 0 0 0 0 0 0 0
43310 - 0 0 0 0 0 0 0 0 0 0 0 0
43311 - 0 0 0 0 0 0 0 0 0 0 0 0
43312 - 0 0 0 0 0 0 0 0 0 0 0 0
43313 - 0 0 0 0 0 0 0 0 0 0 0 0
43314 - 0 0 0 0 0 0 0 0 0 0 0 0
43315 - 0 0 0 0 0 0 0 0 0 0 0 0
43316 - 0 0 0 0 0 0 0 0 0 0 0 0
43317 - 0 0 0 0 0 0 0 0 0 0 0 0
43318 - 0 0 0 0 0 0 0 0 0 0 0 0
43319 - 0 0 0 0 0 0 0 0 0 0 0 0
43320 - 0 0 0 0 0 0 0 0 0 0 0 0
43321 - 0 0 0 0 0 0 0 0 0 0 0 0
43322 - 0 0 0 6 6 6 10 10 10 14 14 14
43323 - 22 22 22 26 26 26 30 30 30 34 34 34
43324 - 30 30 30 30 30 30 26 26 26 18 18 18
43325 - 14 14 14 10 10 10 6 6 6 0 0 0
43326 - 0 0 0 0 0 0 0 0 0 0 0 0
43327 - 0 0 0 0 0 0 0 0 0 0 0 0
43328 - 0 0 0 0 0 0 0 0 0 0 0 0
43329 - 0 0 0 0 0 0 0 0 0 0 0 0
43330 - 0 0 0 0 0 0 0 0 0 0 0 0
43331 - 0 0 0 0 0 0 0 0 0 0 0 0
43332 - 0 0 0 0 0 0 0 0 0 0 0 0
43333 - 0 0 0 0 0 0 0 0 0 0 0 0
43334 - 0 0 0 0 0 0 0 0 0 0 0 0
43335 - 0 0 0 0 0 1 0 0 1 0 0 0
43336 - 0 0 0 0 0 0 0 0 0 0 0 0
43337 - 0 0 0 0 0 0 0 0 0 0 0 0
43338 - 0 0 0 0 0 0 0 0 0 0 0 0
43339 - 0 0 0 0 0 0 0 0 0 0 0 0
43340 - 0 0 0 0 0 0 0 0 0 0 0 0
43341 - 0 0 0 0 0 0 0 0 0 0 0 0
43342 - 6 6 6 14 14 14 26 26 26 42 42 42
43343 - 54 54 54 66 66 66 78 78 78 78 78 78
43344 - 78 78 78 74 74 74 66 66 66 54 54 54
43345 - 42 42 42 26 26 26 18 18 18 10 10 10
43346 - 6 6 6 0 0 0 0 0 0 0 0 0
43347 - 0 0 0 0 0 0 0 0 0 0 0 0
43348 - 0 0 0 0 0 0 0 0 0 0 0 0
43349 - 0 0 0 0 0 0 0 0 0 0 0 0
43350 - 0 0 0 0 0 0 0 0 0 0 0 0
43351 - 0 0 0 0 0 0 0 0 0 0 0 0
43352 - 0 0 0 0 0 0 0 0 0 0 0 0
43353 - 0 0 0 0 0 0 0 0 0 0 0 0
43354 - 0 0 0 0 0 0 0 0 0 0 0 0
43355 - 0 0 1 0 0 0 0 0 0 0 0 0
43356 - 0 0 0 0 0 0 0 0 0 0 0 0
43357 - 0 0 0 0 0 0 0 0 0 0 0 0
43358 - 0 0 0 0 0 0 0 0 0 0 0 0
43359 - 0 0 0 0 0 0 0 0 0 0 0 0
43360 - 0 0 0 0 0 0 0 0 0 0 0 0
43361 - 0 0 0 0 0 0 0 0 0 10 10 10
43362 - 22 22 22 42 42 42 66 66 66 86 86 86
43363 - 66 66 66 38 38 38 38 38 38 22 22 22
43364 - 26 26 26 34 34 34 54 54 54 66 66 66
43365 - 86 86 86 70 70 70 46 46 46 26 26 26
43366 - 14 14 14 6 6 6 0 0 0 0 0 0
43367 - 0 0 0 0 0 0 0 0 0 0 0 0
43368 - 0 0 0 0 0 0 0 0 0 0 0 0
43369 - 0 0 0 0 0 0 0 0 0 0 0 0
43370 - 0 0 0 0 0 0 0 0 0 0 0 0
43371 - 0 0 0 0 0 0 0 0 0 0 0 0
43372 - 0 0 0 0 0 0 0 0 0 0 0 0
43373 - 0 0 0 0 0 0 0 0 0 0 0 0
43374 - 0 0 0 0 0 0 0 0 0 0 0 0
43375 - 0 0 1 0 0 1 0 0 1 0 0 0
43376 - 0 0 0 0 0 0 0 0 0 0 0 0
43377 - 0 0 0 0 0 0 0 0 0 0 0 0
43378 - 0 0 0 0 0 0 0 0 0 0 0 0
43379 - 0 0 0 0 0 0 0 0 0 0 0 0
43380 - 0 0 0 0 0 0 0 0 0 0 0 0
43381 - 0 0 0 0 0 0 10 10 10 26 26 26
43382 - 50 50 50 82 82 82 58 58 58 6 6 6
43383 - 2 2 6 2 2 6 2 2 6 2 2 6
43384 - 2 2 6 2 2 6 2 2 6 2 2 6
43385 - 6 6 6 54 54 54 86 86 86 66 66 66
43386 - 38 38 38 18 18 18 6 6 6 0 0 0
43387 - 0 0 0 0 0 0 0 0 0 0 0 0
43388 - 0 0 0 0 0 0 0 0 0 0 0 0
43389 - 0 0 0 0 0 0 0 0 0 0 0 0
43390 - 0 0 0 0 0 0 0 0 0 0 0 0
43391 - 0 0 0 0 0 0 0 0 0 0 0 0
43392 - 0 0 0 0 0 0 0 0 0 0 0 0
43393 - 0 0 0 0 0 0 0 0 0 0 0 0
43394 - 0 0 0 0 0 0 0 0 0 0 0 0
43395 - 0 0 0 0 0 0 0 0 0 0 0 0
43396 - 0 0 0 0 0 0 0 0 0 0 0 0
43397 - 0 0 0 0 0 0 0 0 0 0 0 0
43398 - 0 0 0 0 0 0 0 0 0 0 0 0
43399 - 0 0 0 0 0 0 0 0 0 0 0 0
43400 - 0 0 0 0 0 0 0 0 0 0 0 0
43401 - 0 0 0 6 6 6 22 22 22 50 50 50
43402 - 78 78 78 34 34 34 2 2 6 2 2 6
43403 - 2 2 6 2 2 6 2 2 6 2 2 6
43404 - 2 2 6 2 2 6 2 2 6 2 2 6
43405 - 2 2 6 2 2 6 6 6 6 70 70 70
43406 - 78 78 78 46 46 46 22 22 22 6 6 6
43407 - 0 0 0 0 0 0 0 0 0 0 0 0
43408 - 0 0 0 0 0 0 0 0 0 0 0 0
43409 - 0 0 0 0 0 0 0 0 0 0 0 0
43410 - 0 0 0 0 0 0 0 0 0 0 0 0
43411 - 0 0 0 0 0 0 0 0 0 0 0 0
43412 - 0 0 0 0 0 0 0 0 0 0 0 0
43413 - 0 0 0 0 0 0 0 0 0 0 0 0
43414 - 0 0 0 0 0 0 0 0 0 0 0 0
43415 - 0 0 1 0 0 1 0 0 1 0 0 0
43416 - 0 0 0 0 0 0 0 0 0 0 0 0
43417 - 0 0 0 0 0 0 0 0 0 0 0 0
43418 - 0 0 0 0 0 0 0 0 0 0 0 0
43419 - 0 0 0 0 0 0 0 0 0 0 0 0
43420 - 0 0 0 0 0 0 0 0 0 0 0 0
43421 - 6 6 6 18 18 18 42 42 42 82 82 82
43422 - 26 26 26 2 2 6 2 2 6 2 2 6
43423 - 2 2 6 2 2 6 2 2 6 2 2 6
43424 - 2 2 6 2 2 6 2 2 6 14 14 14
43425 - 46 46 46 34 34 34 6 6 6 2 2 6
43426 - 42 42 42 78 78 78 42 42 42 18 18 18
43427 - 6 6 6 0 0 0 0 0 0 0 0 0
43428 - 0 0 0 0 0 0 0 0 0 0 0 0
43429 - 0 0 0 0 0 0 0 0 0 0 0 0
43430 - 0 0 0 0 0 0 0 0 0 0 0 0
43431 - 0 0 0 0 0 0 0 0 0 0 0 0
43432 - 0 0 0 0 0 0 0 0 0 0 0 0
43433 - 0 0 0 0 0 0 0 0 0 0 0 0
43434 - 0 0 0 0 0 0 0 0 0 0 0 0
43435 - 0 0 1 0 0 0 0 0 1 0 0 0
43436 - 0 0 0 0 0 0 0 0 0 0 0 0
43437 - 0 0 0 0 0 0 0 0 0 0 0 0
43438 - 0 0 0 0 0 0 0 0 0 0 0 0
43439 - 0 0 0 0 0 0 0 0 0 0 0 0
43440 - 0 0 0 0 0 0 0 0 0 0 0 0
43441 - 10 10 10 30 30 30 66 66 66 58 58 58
43442 - 2 2 6 2 2 6 2 2 6 2 2 6
43443 - 2 2 6 2 2 6 2 2 6 2 2 6
43444 - 2 2 6 2 2 6 2 2 6 26 26 26
43445 - 86 86 86 101 101 101 46 46 46 10 10 10
43446 - 2 2 6 58 58 58 70 70 70 34 34 34
43447 - 10 10 10 0 0 0 0 0 0 0 0 0
43448 - 0 0 0 0 0 0 0 0 0 0 0 0
43449 - 0 0 0 0 0 0 0 0 0 0 0 0
43450 - 0 0 0 0 0 0 0 0 0 0 0 0
43451 - 0 0 0 0 0 0 0 0 0 0 0 0
43452 - 0 0 0 0 0 0 0 0 0 0 0 0
43453 - 0 0 0 0 0 0 0 0 0 0 0 0
43454 - 0 0 0 0 0 0 0 0 0 0 0 0
43455 - 0 0 1 0 0 1 0 0 1 0 0 0
43456 - 0 0 0 0 0 0 0 0 0 0 0 0
43457 - 0 0 0 0 0 0 0 0 0 0 0 0
43458 - 0 0 0 0 0 0 0 0 0 0 0 0
43459 - 0 0 0 0 0 0 0 0 0 0 0 0
43460 - 0 0 0 0 0 0 0 0 0 0 0 0
43461 - 14 14 14 42 42 42 86 86 86 10 10 10
43462 - 2 2 6 2 2 6 2 2 6 2 2 6
43463 - 2 2 6 2 2 6 2 2 6 2 2 6
43464 - 2 2 6 2 2 6 2 2 6 30 30 30
43465 - 94 94 94 94 94 94 58 58 58 26 26 26
43466 - 2 2 6 6 6 6 78 78 78 54 54 54
43467 - 22 22 22 6 6 6 0 0 0 0 0 0
43468 - 0 0 0 0 0 0 0 0 0 0 0 0
43469 - 0 0 0 0 0 0 0 0 0 0 0 0
43470 - 0 0 0 0 0 0 0 0 0 0 0 0
43471 - 0 0 0 0 0 0 0 0 0 0 0 0
43472 - 0 0 0 0 0 0 0 0 0 0 0 0
43473 - 0 0 0 0 0 0 0 0 0 0 0 0
43474 - 0 0 0 0 0 0 0 0 0 0 0 0
43475 - 0 0 0 0 0 0 0 0 0 0 0 0
43476 - 0 0 0 0 0 0 0 0 0 0 0 0
43477 - 0 0 0 0 0 0 0 0 0 0 0 0
43478 - 0 0 0 0 0 0 0 0 0 0 0 0
43479 - 0 0 0 0 0 0 0 0 0 0 0 0
43480 - 0 0 0 0 0 0 0 0 0 6 6 6
43481 - 22 22 22 62 62 62 62 62 62 2 2 6
43482 - 2 2 6 2 2 6 2 2 6 2 2 6
43483 - 2 2 6 2 2 6 2 2 6 2 2 6
43484 - 2 2 6 2 2 6 2 2 6 26 26 26
43485 - 54 54 54 38 38 38 18 18 18 10 10 10
43486 - 2 2 6 2 2 6 34 34 34 82 82 82
43487 - 38 38 38 14 14 14 0 0 0 0 0 0
43488 - 0 0 0 0 0 0 0 0 0 0 0 0
43489 - 0 0 0 0 0 0 0 0 0 0 0 0
43490 - 0 0 0 0 0 0 0 0 0 0 0 0
43491 - 0 0 0 0 0 0 0 0 0 0 0 0
43492 - 0 0 0 0 0 0 0 0 0 0 0 0
43493 - 0 0 0 0 0 0 0 0 0 0 0 0
43494 - 0 0 0 0 0 0 0 0 0 0 0 0
43495 - 0 0 0 0 0 1 0 0 1 0 0 0
43496 - 0 0 0 0 0 0 0 0 0 0 0 0
43497 - 0 0 0 0 0 0 0 0 0 0 0 0
43498 - 0 0 0 0 0 0 0 0 0 0 0 0
43499 - 0 0 0 0 0 0 0 0 0 0 0 0
43500 - 0 0 0 0 0 0 0 0 0 6 6 6
43501 - 30 30 30 78 78 78 30 30 30 2 2 6
43502 - 2 2 6 2 2 6 2 2 6 2 2 6
43503 - 2 2 6 2 2 6 2 2 6 2 2 6
43504 - 2 2 6 2 2 6 2 2 6 10 10 10
43505 - 10 10 10 2 2 6 2 2 6 2 2 6
43506 - 2 2 6 2 2 6 2 2 6 78 78 78
43507 - 50 50 50 18 18 18 6 6 6 0 0 0
43508 - 0 0 0 0 0 0 0 0 0 0 0 0
43509 - 0 0 0 0 0 0 0 0 0 0 0 0
43510 - 0 0 0 0 0 0 0 0 0 0 0 0
43511 - 0 0 0 0 0 0 0 0 0 0 0 0
43512 - 0 0 0 0 0 0 0 0 0 0 0 0
43513 - 0 0 0 0 0 0 0 0 0 0 0 0
43514 - 0 0 0 0 0 0 0 0 0 0 0 0
43515 - 0 0 1 0 0 0 0 0 0 0 0 0
43516 - 0 0 0 0 0 0 0 0 0 0 0 0
43517 - 0 0 0 0 0 0 0 0 0 0 0 0
43518 - 0 0 0 0 0 0 0 0 0 0 0 0
43519 - 0 0 0 0 0 0 0 0 0 0 0 0
43520 - 0 0 0 0 0 0 0 0 0 10 10 10
43521 - 38 38 38 86 86 86 14 14 14 2 2 6
43522 - 2 2 6 2 2 6 2 2 6 2 2 6
43523 - 2 2 6 2 2 6 2 2 6 2 2 6
43524 - 2 2 6 2 2 6 2 2 6 2 2 6
43525 - 2 2 6 2 2 6 2 2 6 2 2 6
43526 - 2 2 6 2 2 6 2 2 6 54 54 54
43527 - 66 66 66 26 26 26 6 6 6 0 0 0
43528 - 0 0 0 0 0 0 0 0 0 0 0 0
43529 - 0 0 0 0 0 0 0 0 0 0 0 0
43530 - 0 0 0 0 0 0 0 0 0 0 0 0
43531 - 0 0 0 0 0 0 0 0 0 0 0 0
43532 - 0 0 0 0 0 0 0 0 0 0 0 0
43533 - 0 0 0 0 0 0 0 0 0 0 0 0
43534 - 0 0 0 0 0 0 0 0 0 0 0 0
43535 - 0 0 0 0 0 1 0 0 1 0 0 0
43536 - 0 0 0 0 0 0 0 0 0 0 0 0
43537 - 0 0 0 0 0 0 0 0 0 0 0 0
43538 - 0 0 0 0 0 0 0 0 0 0 0 0
43539 - 0 0 0 0 0 0 0 0 0 0 0 0
43540 - 0 0 0 0 0 0 0 0 0 14 14 14
43541 - 42 42 42 82 82 82 2 2 6 2 2 6
43542 - 2 2 6 6 6 6 10 10 10 2 2 6
43543 - 2 2 6 2 2 6 2 2 6 2 2 6
43544 - 2 2 6 2 2 6 2 2 6 6 6 6
43545 - 14 14 14 10 10 10 2 2 6 2 2 6
43546 - 2 2 6 2 2 6 2 2 6 18 18 18
43547 - 82 82 82 34 34 34 10 10 10 0 0 0
43548 - 0 0 0 0 0 0 0 0 0 0 0 0
43549 - 0 0 0 0 0 0 0 0 0 0 0 0
43550 - 0 0 0 0 0 0 0 0 0 0 0 0
43551 - 0 0 0 0 0 0 0 0 0 0 0 0
43552 - 0 0 0 0 0 0 0 0 0 0 0 0
43553 - 0 0 0 0 0 0 0 0 0 0 0 0
43554 - 0 0 0 0 0 0 0 0 0 0 0 0
43555 - 0 0 1 0 0 0 0 0 0 0 0 0
43556 - 0 0 0 0 0 0 0 0 0 0 0 0
43557 - 0 0 0 0 0 0 0 0 0 0 0 0
43558 - 0 0 0 0 0 0 0 0 0 0 0 0
43559 - 0 0 0 0 0 0 0 0 0 0 0 0
43560 - 0 0 0 0 0 0 0 0 0 14 14 14
43561 - 46 46 46 86 86 86 2 2 6 2 2 6
43562 - 6 6 6 6 6 6 22 22 22 34 34 34
43563 - 6 6 6 2 2 6 2 2 6 2 2 6
43564 - 2 2 6 2 2 6 18 18 18 34 34 34
43565 - 10 10 10 50 50 50 22 22 22 2 2 6
43566 - 2 2 6 2 2 6 2 2 6 10 10 10
43567 - 86 86 86 42 42 42 14 14 14 0 0 0
43568 - 0 0 0 0 0 0 0 0 0 0 0 0
43569 - 0 0 0 0 0 0 0 0 0 0 0 0
43570 - 0 0 0 0 0 0 0 0 0 0 0 0
43571 - 0 0 0 0 0 0 0 0 0 0 0 0
43572 - 0 0 0 0 0 0 0 0 0 0 0 0
43573 - 0 0 0 0 0 0 0 0 0 0 0 0
43574 - 0 0 0 0 0 0 0 0 0 0 0 0
43575 - 0 0 1 0 0 1 0 0 1 0 0 0
43576 - 0 0 0 0 0 0 0 0 0 0 0 0
43577 - 0 0 0 0 0 0 0 0 0 0 0 0
43578 - 0 0 0 0 0 0 0 0 0 0 0 0
43579 - 0 0 0 0 0 0 0 0 0 0 0 0
43580 - 0 0 0 0 0 0 0 0 0 14 14 14
43581 - 46 46 46 86 86 86 2 2 6 2 2 6
43582 - 38 38 38 116 116 116 94 94 94 22 22 22
43583 - 22 22 22 2 2 6 2 2 6 2 2 6
43584 - 14 14 14 86 86 86 138 138 138 162 162 162
43585 -154 154 154 38 38 38 26 26 26 6 6 6
43586 - 2 2 6 2 2 6 2 2 6 2 2 6
43587 - 86 86 86 46 46 46 14 14 14 0 0 0
43588 - 0 0 0 0 0 0 0 0 0 0 0 0
43589 - 0 0 0 0 0 0 0 0 0 0 0 0
43590 - 0 0 0 0 0 0 0 0 0 0 0 0
43591 - 0 0 0 0 0 0 0 0 0 0 0 0
43592 - 0 0 0 0 0 0 0 0 0 0 0 0
43593 - 0 0 0 0 0 0 0 0 0 0 0 0
43594 - 0 0 0 0 0 0 0 0 0 0 0 0
43595 - 0 0 0 0 0 0 0 0 0 0 0 0
43596 - 0 0 0 0 0 0 0 0 0 0 0 0
43597 - 0 0 0 0 0 0 0 0 0 0 0 0
43598 - 0 0 0 0 0 0 0 0 0 0 0 0
43599 - 0 0 0 0 0 0 0 0 0 0 0 0
43600 - 0 0 0 0 0 0 0 0 0 14 14 14
43601 - 46 46 46 86 86 86 2 2 6 14 14 14
43602 -134 134 134 198 198 198 195 195 195 116 116 116
43603 - 10 10 10 2 2 6 2 2 6 6 6 6
43604 -101 98 89 187 187 187 210 210 210 218 218 218
43605 -214 214 214 134 134 134 14 14 14 6 6 6
43606 - 2 2 6 2 2 6 2 2 6 2 2 6
43607 - 86 86 86 50 50 50 18 18 18 6 6 6
43608 - 0 0 0 0 0 0 0 0 0 0 0 0
43609 - 0 0 0 0 0 0 0 0 0 0 0 0
43610 - 0 0 0 0 0 0 0 0 0 0 0 0
43611 - 0 0 0 0 0 0 0 0 0 0 0 0
43612 - 0 0 0 0 0 0 0 0 0 0 0 0
43613 - 0 0 0 0 0 0 0 0 0 0 0 0
43614 - 0 0 0 0 0 0 0 0 1 0 0 0
43615 - 0 0 1 0 0 1 0 0 1 0 0 0
43616 - 0 0 0 0 0 0 0 0 0 0 0 0
43617 - 0 0 0 0 0 0 0 0 0 0 0 0
43618 - 0 0 0 0 0 0 0 0 0 0 0 0
43619 - 0 0 0 0 0 0 0 0 0 0 0 0
43620 - 0 0 0 0 0 0 0 0 0 14 14 14
43621 - 46 46 46 86 86 86 2 2 6 54 54 54
43622 -218 218 218 195 195 195 226 226 226 246 246 246
43623 - 58 58 58 2 2 6 2 2 6 30 30 30
43624 -210 210 210 253 253 253 174 174 174 123 123 123
43625 -221 221 221 234 234 234 74 74 74 2 2 6
43626 - 2 2 6 2 2 6 2 2 6 2 2 6
43627 - 70 70 70 58 58 58 22 22 22 6 6 6
43628 - 0 0 0 0 0 0 0 0 0 0 0 0
43629 - 0 0 0 0 0 0 0 0 0 0 0 0
43630 - 0 0 0 0 0 0 0 0 0 0 0 0
43631 - 0 0 0 0 0 0 0 0 0 0 0 0
43632 - 0 0 0 0 0 0 0 0 0 0 0 0
43633 - 0 0 0 0 0 0 0 0 0 0 0 0
43634 - 0 0 0 0 0 0 0 0 0 0 0 0
43635 - 0 0 0 0 0 0 0 0 0 0 0 0
43636 - 0 0 0 0 0 0 0 0 0 0 0 0
43637 - 0 0 0 0 0 0 0 0 0 0 0 0
43638 - 0 0 0 0 0 0 0 0 0 0 0 0
43639 - 0 0 0 0 0 0 0 0 0 0 0 0
43640 - 0 0 0 0 0 0 0 0 0 14 14 14
43641 - 46 46 46 82 82 82 2 2 6 106 106 106
43642 -170 170 170 26 26 26 86 86 86 226 226 226
43643 -123 123 123 10 10 10 14 14 14 46 46 46
43644 -231 231 231 190 190 190 6 6 6 70 70 70
43645 - 90 90 90 238 238 238 158 158 158 2 2 6
43646 - 2 2 6 2 2 6 2 2 6 2 2 6
43647 - 70 70 70 58 58 58 22 22 22 6 6 6
43648 - 0 0 0 0 0 0 0 0 0 0 0 0
43649 - 0 0 0 0 0 0 0 0 0 0 0 0
43650 - 0 0 0 0 0 0 0 0 0 0 0 0
43651 - 0 0 0 0 0 0 0 0 0 0 0 0
43652 - 0 0 0 0 0 0 0 0 0 0 0 0
43653 - 0 0 0 0 0 0 0 0 0 0 0 0
43654 - 0 0 0 0 0 0 0 0 1 0 0 0
43655 - 0 0 1 0 0 1 0 0 1 0 0 0
43656 - 0 0 0 0 0 0 0 0 0 0 0 0
43657 - 0 0 0 0 0 0 0 0 0 0 0 0
43658 - 0 0 0 0 0 0 0 0 0 0 0 0
43659 - 0 0 0 0 0 0 0 0 0 0 0 0
43660 - 0 0 0 0 0 0 0 0 0 14 14 14
43661 - 42 42 42 86 86 86 6 6 6 116 116 116
43662 -106 106 106 6 6 6 70 70 70 149 149 149
43663 -128 128 128 18 18 18 38 38 38 54 54 54
43664 -221 221 221 106 106 106 2 2 6 14 14 14
43665 - 46 46 46 190 190 190 198 198 198 2 2 6
43666 - 2 2 6 2 2 6 2 2 6 2 2 6
43667 - 74 74 74 62 62 62 22 22 22 6 6 6
43668 - 0 0 0 0 0 0 0 0 0 0 0 0
43669 - 0 0 0 0 0 0 0 0 0 0 0 0
43670 - 0 0 0 0 0 0 0 0 0 0 0 0
43671 - 0 0 0 0 0 0 0 0 0 0 0 0
43672 - 0 0 0 0 0 0 0 0 0 0 0 0
43673 - 0 0 0 0 0 0 0 0 0 0 0 0
43674 - 0 0 0 0 0 0 0 0 1 0 0 0
43675 - 0 0 1 0 0 0 0 0 1 0 0 0
43676 - 0 0 0 0 0 0 0 0 0 0 0 0
43677 - 0 0 0 0 0 0 0 0 0 0 0 0
43678 - 0 0 0 0 0 0 0 0 0 0 0 0
43679 - 0 0 0 0 0 0 0 0 0 0 0 0
43680 - 0 0 0 0 0 0 0 0 0 14 14 14
43681 - 42 42 42 94 94 94 14 14 14 101 101 101
43682 -128 128 128 2 2 6 18 18 18 116 116 116
43683 -118 98 46 121 92 8 121 92 8 98 78 10
43684 -162 162 162 106 106 106 2 2 6 2 2 6
43685 - 2 2 6 195 195 195 195 195 195 6 6 6
43686 - 2 2 6 2 2 6 2 2 6 2 2 6
43687 - 74 74 74 62 62 62 22 22 22 6 6 6
43688 - 0 0 0 0 0 0 0 0 0 0 0 0
43689 - 0 0 0 0 0 0 0 0 0 0 0 0
43690 - 0 0 0 0 0 0 0 0 0 0 0 0
43691 - 0 0 0 0 0 0 0 0 0 0 0 0
43692 - 0 0 0 0 0 0 0 0 0 0 0 0
43693 - 0 0 0 0 0 0 0 0 0 0 0 0
43694 - 0 0 0 0 0 0 0 0 1 0 0 1
43695 - 0 0 1 0 0 0 0 0 1 0 0 0
43696 - 0 0 0 0 0 0 0 0 0 0 0 0
43697 - 0 0 0 0 0 0 0 0 0 0 0 0
43698 - 0 0 0 0 0 0 0 0 0 0 0 0
43699 - 0 0 0 0 0 0 0 0 0 0 0 0
43700 - 0 0 0 0 0 0 0 0 0 10 10 10
43701 - 38 38 38 90 90 90 14 14 14 58 58 58
43702 -210 210 210 26 26 26 54 38 6 154 114 10
43703 -226 170 11 236 186 11 225 175 15 184 144 12
43704 -215 174 15 175 146 61 37 26 9 2 2 6
43705 - 70 70 70 246 246 246 138 138 138 2 2 6
43706 - 2 2 6 2 2 6 2 2 6 2 2 6
43707 - 70 70 70 66 66 66 26 26 26 6 6 6
43708 - 0 0 0 0 0 0 0 0 0 0 0 0
43709 - 0 0 0 0 0 0 0 0 0 0 0 0
43710 - 0 0 0 0 0 0 0 0 0 0 0 0
43711 - 0 0 0 0 0 0 0 0 0 0 0 0
43712 - 0 0 0 0 0 0 0 0 0 0 0 0
43713 - 0 0 0 0 0 0 0 0 0 0 0 0
43714 - 0 0 0 0 0 0 0 0 0 0 0 0
43715 - 0 0 0 0 0 0 0 0 0 0 0 0
43716 - 0 0 0 0 0 0 0 0 0 0 0 0
43717 - 0 0 0 0 0 0 0 0 0 0 0 0
43718 - 0 0 0 0 0 0 0 0 0 0 0 0
43719 - 0 0 0 0 0 0 0 0 0 0 0 0
43720 - 0 0 0 0 0 0 0 0 0 10 10 10
43721 - 38 38 38 86 86 86 14 14 14 10 10 10
43722 -195 195 195 188 164 115 192 133 9 225 175 15
43723 -239 182 13 234 190 10 232 195 16 232 200 30
43724 -245 207 45 241 208 19 232 195 16 184 144 12
43725 -218 194 134 211 206 186 42 42 42 2 2 6
43726 - 2 2 6 2 2 6 2 2 6 2 2 6
43727 - 50 50 50 74 74 74 30 30 30 6 6 6
43728 - 0 0 0 0 0 0 0 0 0 0 0 0
43729 - 0 0 0 0 0 0 0 0 0 0 0 0
43730 - 0 0 0 0 0 0 0 0 0 0 0 0
43731 - 0 0 0 0 0 0 0 0 0 0 0 0
43732 - 0 0 0 0 0 0 0 0 0 0 0 0
43733 - 0 0 0 0 0 0 0 0 0 0 0 0
43734 - 0 0 0 0 0 0 0 0 0 0 0 0
43735 - 0 0 0 0 0 0 0 0 0 0 0 0
43736 - 0 0 0 0 0 0 0 0 0 0 0 0
43737 - 0 0 0 0 0 0 0 0 0 0 0 0
43738 - 0 0 0 0 0 0 0 0 0 0 0 0
43739 - 0 0 0 0 0 0 0 0 0 0 0 0
43740 - 0 0 0 0 0 0 0 0 0 10 10 10
43741 - 34 34 34 86 86 86 14 14 14 2 2 6
43742 -121 87 25 192 133 9 219 162 10 239 182 13
43743 -236 186 11 232 195 16 241 208 19 244 214 54
43744 -246 218 60 246 218 38 246 215 20 241 208 19
43745 -241 208 19 226 184 13 121 87 25 2 2 6
43746 - 2 2 6 2 2 6 2 2 6 2 2 6
43747 - 50 50 50 82 82 82 34 34 34 10 10 10
43748 - 0 0 0 0 0 0 0 0 0 0 0 0
43749 - 0 0 0 0 0 0 0 0 0 0 0 0
43750 - 0 0 0 0 0 0 0 0 0 0 0 0
43751 - 0 0 0 0 0 0 0 0 0 0 0 0
43752 - 0 0 0 0 0 0 0 0 0 0 0 0
43753 - 0 0 0 0 0 0 0 0 0 0 0 0
43754 - 0 0 0 0 0 0 0 0 0 0 0 0
43755 - 0 0 0 0 0 0 0 0 0 0 0 0
43756 - 0 0 0 0 0 0 0 0 0 0 0 0
43757 - 0 0 0 0 0 0 0 0 0 0 0 0
43758 - 0 0 0 0 0 0 0 0 0 0 0 0
43759 - 0 0 0 0 0 0 0 0 0 0 0 0
43760 - 0 0 0 0 0 0 0 0 0 10 10 10
43761 - 34 34 34 82 82 82 30 30 30 61 42 6
43762 -180 123 7 206 145 10 230 174 11 239 182 13
43763 -234 190 10 238 202 15 241 208 19 246 218 74
43764 -246 218 38 246 215 20 246 215 20 246 215 20
43765 -226 184 13 215 174 15 184 144 12 6 6 6
43766 - 2 2 6 2 2 6 2 2 6 2 2 6
43767 - 26 26 26 94 94 94 42 42 42 14 14 14
43768 - 0 0 0 0 0 0 0 0 0 0 0 0
43769 - 0 0 0 0 0 0 0 0 0 0 0 0
43770 - 0 0 0 0 0 0 0 0 0 0 0 0
43771 - 0 0 0 0 0 0 0 0 0 0 0 0
43772 - 0 0 0 0 0 0 0 0 0 0 0 0
43773 - 0 0 0 0 0 0 0 0 0 0 0 0
43774 - 0 0 0 0 0 0 0 0 0 0 0 0
43775 - 0 0 0 0 0 0 0 0 0 0 0 0
43776 - 0 0 0 0 0 0 0 0 0 0 0 0
43777 - 0 0 0 0 0 0 0 0 0 0 0 0
43778 - 0 0 0 0 0 0 0 0 0 0 0 0
43779 - 0 0 0 0 0 0 0 0 0 0 0 0
43780 - 0 0 0 0 0 0 0 0 0 10 10 10
43781 - 30 30 30 78 78 78 50 50 50 104 69 6
43782 -192 133 9 216 158 10 236 178 12 236 186 11
43783 -232 195 16 241 208 19 244 214 54 245 215 43
43784 -246 215 20 246 215 20 241 208 19 198 155 10
43785 -200 144 11 216 158 10 156 118 10 2 2 6
43786 - 2 2 6 2 2 6 2 2 6 2 2 6
43787 - 6 6 6 90 90 90 54 54 54 18 18 18
43788 - 6 6 6 0 0 0 0 0 0 0 0 0
43789 - 0 0 0 0 0 0 0 0 0 0 0 0
43790 - 0 0 0 0 0 0 0 0 0 0 0 0
43791 - 0 0 0 0 0 0 0 0 0 0 0 0
43792 - 0 0 0 0 0 0 0 0 0 0 0 0
43793 - 0 0 0 0 0 0 0 0 0 0 0 0
43794 - 0 0 0 0 0 0 0 0 0 0 0 0
43795 - 0 0 0 0 0 0 0 0 0 0 0 0
43796 - 0 0 0 0 0 0 0 0 0 0 0 0
43797 - 0 0 0 0 0 0 0 0 0 0 0 0
43798 - 0 0 0 0 0 0 0 0 0 0 0 0
43799 - 0 0 0 0 0 0 0 0 0 0 0 0
43800 - 0 0 0 0 0 0 0 0 0 10 10 10
43801 - 30 30 30 78 78 78 46 46 46 22 22 22
43802 -137 92 6 210 162 10 239 182 13 238 190 10
43803 -238 202 15 241 208 19 246 215 20 246 215 20
43804 -241 208 19 203 166 17 185 133 11 210 150 10
43805 -216 158 10 210 150 10 102 78 10 2 2 6
43806 - 6 6 6 54 54 54 14 14 14 2 2 6
43807 - 2 2 6 62 62 62 74 74 74 30 30 30
43808 - 10 10 10 0 0 0 0 0 0 0 0 0
43809 - 0 0 0 0 0 0 0 0 0 0 0 0
43810 - 0 0 0 0 0 0 0 0 0 0 0 0
43811 - 0 0 0 0 0 0 0 0 0 0 0 0
43812 - 0 0 0 0 0 0 0 0 0 0 0 0
43813 - 0 0 0 0 0 0 0 0 0 0 0 0
43814 - 0 0 0 0 0 0 0 0 0 0 0 0
43815 - 0 0 0 0 0 0 0 0 0 0 0 0
43816 - 0 0 0 0 0 0 0 0 0 0 0 0
43817 - 0 0 0 0 0 0 0 0 0 0 0 0
43818 - 0 0 0 0 0 0 0 0 0 0 0 0
43819 - 0 0 0 0 0 0 0 0 0 0 0 0
43820 - 0 0 0 0 0 0 0 0 0 10 10 10
43821 - 34 34 34 78 78 78 50 50 50 6 6 6
43822 - 94 70 30 139 102 15 190 146 13 226 184 13
43823 -232 200 30 232 195 16 215 174 15 190 146 13
43824 -168 122 10 192 133 9 210 150 10 213 154 11
43825 -202 150 34 182 157 106 101 98 89 2 2 6
43826 - 2 2 6 78 78 78 116 116 116 58 58 58
43827 - 2 2 6 22 22 22 90 90 90 46 46 46
43828 - 18 18 18 6 6 6 0 0 0 0 0 0
43829 - 0 0 0 0 0 0 0 0 0 0 0 0
43830 - 0 0 0 0 0 0 0 0 0 0 0 0
43831 - 0 0 0 0 0 0 0 0 0 0 0 0
43832 - 0 0 0 0 0 0 0 0 0 0 0 0
43833 - 0 0 0 0 0 0 0 0 0 0 0 0
43834 - 0 0 0 0 0 0 0 0 0 0 0 0
43835 - 0 0 0 0 0 0 0 0 0 0 0 0
43836 - 0 0 0 0 0 0 0 0 0 0 0 0
43837 - 0 0 0 0 0 0 0 0 0 0 0 0
43838 - 0 0 0 0 0 0 0 0 0 0 0 0
43839 - 0 0 0 0 0 0 0 0 0 0 0 0
43840 - 0 0 0 0 0 0 0 0 0 10 10 10
43841 - 38 38 38 86 86 86 50 50 50 6 6 6
43842 -128 128 128 174 154 114 156 107 11 168 122 10
43843 -198 155 10 184 144 12 197 138 11 200 144 11
43844 -206 145 10 206 145 10 197 138 11 188 164 115
43845 -195 195 195 198 198 198 174 174 174 14 14 14
43846 - 2 2 6 22 22 22 116 116 116 116 116 116
43847 - 22 22 22 2 2 6 74 74 74 70 70 70
43848 - 30 30 30 10 10 10 0 0 0 0 0 0
43849 - 0 0 0 0 0 0 0 0 0 0 0 0
43850 - 0 0 0 0 0 0 0 0 0 0 0 0
43851 - 0 0 0 0 0 0 0 0 0 0 0 0
43852 - 0 0 0 0 0 0 0 0 0 0 0 0
43853 - 0 0 0 0 0 0 0 0 0 0 0 0
43854 - 0 0 0 0 0 0 0 0 0 0 0 0
43855 - 0 0 0 0 0 0 0 0 0 0 0 0
43856 - 0 0 0 0 0 0 0 0 0 0 0 0
43857 - 0 0 0 0 0 0 0 0 0 0 0 0
43858 - 0 0 0 0 0 0 0 0 0 0 0 0
43859 - 0 0 0 0 0 0 0 0 0 0 0 0
43860 - 0 0 0 0 0 0 6 6 6 18 18 18
43861 - 50 50 50 101 101 101 26 26 26 10 10 10
43862 -138 138 138 190 190 190 174 154 114 156 107 11
43863 -197 138 11 200 144 11 197 138 11 192 133 9
43864 -180 123 7 190 142 34 190 178 144 187 187 187
43865 -202 202 202 221 221 221 214 214 214 66 66 66
43866 - 2 2 6 2 2 6 50 50 50 62 62 62
43867 - 6 6 6 2 2 6 10 10 10 90 90 90
43868 - 50 50 50 18 18 18 6 6 6 0 0 0
43869 - 0 0 0 0 0 0 0 0 0 0 0 0
43870 - 0 0 0 0 0 0 0 0 0 0 0 0
43871 - 0 0 0 0 0 0 0 0 0 0 0 0
43872 - 0 0 0 0 0 0 0 0 0 0 0 0
43873 - 0 0 0 0 0 0 0 0 0 0 0 0
43874 - 0 0 0 0 0 0 0 0 0 0 0 0
43875 - 0 0 0 0 0 0 0 0 0 0 0 0
43876 - 0 0 0 0 0 0 0 0 0 0 0 0
43877 - 0 0 0 0 0 0 0 0 0 0 0 0
43878 - 0 0 0 0 0 0 0 0 0 0 0 0
43879 - 0 0 0 0 0 0 0 0 0 0 0 0
43880 - 0 0 0 0 0 0 10 10 10 34 34 34
43881 - 74 74 74 74 74 74 2 2 6 6 6 6
43882 -144 144 144 198 198 198 190 190 190 178 166 146
43883 -154 121 60 156 107 11 156 107 11 168 124 44
43884 -174 154 114 187 187 187 190 190 190 210 210 210
43885 -246 246 246 253 253 253 253 253 253 182 182 182
43886 - 6 6 6 2 2 6 2 2 6 2 2 6
43887 - 2 2 6 2 2 6 2 2 6 62 62 62
43888 - 74 74 74 34 34 34 14 14 14 0 0 0
43889 - 0 0 0 0 0 0 0 0 0 0 0 0
43890 - 0 0 0 0 0 0 0 0 0 0 0 0
43891 - 0 0 0 0 0 0 0 0 0 0 0 0
43892 - 0 0 0 0 0 0 0 0 0 0 0 0
43893 - 0 0 0 0 0 0 0 0 0 0 0 0
43894 - 0 0 0 0 0 0 0 0 0 0 0 0
43895 - 0 0 0 0 0 0 0 0 0 0 0 0
43896 - 0 0 0 0 0 0 0 0 0 0 0 0
43897 - 0 0 0 0 0 0 0 0 0 0 0 0
43898 - 0 0 0 0 0 0 0 0 0 0 0 0
43899 - 0 0 0 0 0 0 0 0 0 0 0 0
43900 - 0 0 0 10 10 10 22 22 22 54 54 54
43901 - 94 94 94 18 18 18 2 2 6 46 46 46
43902 -234 234 234 221 221 221 190 190 190 190 190 190
43903 -190 190 190 187 187 187 187 187 187 190 190 190
43904 -190 190 190 195 195 195 214 214 214 242 242 242
43905 -253 253 253 253 253 253 253 253 253 253 253 253
43906 - 82 82 82 2 2 6 2 2 6 2 2 6
43907 - 2 2 6 2 2 6 2 2 6 14 14 14
43908 - 86 86 86 54 54 54 22 22 22 6 6 6
43909 - 0 0 0 0 0 0 0 0 0 0 0 0
43910 - 0 0 0 0 0 0 0 0 0 0 0 0
43911 - 0 0 0 0 0 0 0 0 0 0 0 0
43912 - 0 0 0 0 0 0 0 0 0 0 0 0
43913 - 0 0 0 0 0 0 0 0 0 0 0 0
43914 - 0 0 0 0 0 0 0 0 0 0 0 0
43915 - 0 0 0 0 0 0 0 0 0 0 0 0
43916 - 0 0 0 0 0 0 0 0 0 0 0 0
43917 - 0 0 0 0 0 0 0 0 0 0 0 0
43918 - 0 0 0 0 0 0 0 0 0 0 0 0
43919 - 0 0 0 0 0 0 0 0 0 0 0 0
43920 - 6 6 6 18 18 18 46 46 46 90 90 90
43921 - 46 46 46 18 18 18 6 6 6 182 182 182
43922 -253 253 253 246 246 246 206 206 206 190 190 190
43923 -190 190 190 190 190 190 190 190 190 190 190 190
43924 -206 206 206 231 231 231 250 250 250 253 253 253
43925 -253 253 253 253 253 253 253 253 253 253 253 253
43926 -202 202 202 14 14 14 2 2 6 2 2 6
43927 - 2 2 6 2 2 6 2 2 6 2 2 6
43928 - 42 42 42 86 86 86 42 42 42 18 18 18
43929 - 6 6 6 0 0 0 0 0 0 0 0 0
43930 - 0 0 0 0 0 0 0 0 0 0 0 0
43931 - 0 0 0 0 0 0 0 0 0 0 0 0
43932 - 0 0 0 0 0 0 0 0 0 0 0 0
43933 - 0 0 0 0 0 0 0 0 0 0 0 0
43934 - 0 0 0 0 0 0 0 0 0 0 0 0
43935 - 0 0 0 0 0 0 0 0 0 0 0 0
43936 - 0 0 0 0 0 0 0 0 0 0 0 0
43937 - 0 0 0 0 0 0 0 0 0 0 0 0
43938 - 0 0 0 0 0 0 0 0 0 0 0 0
43939 - 0 0 0 0 0 0 0 0 0 6 6 6
43940 - 14 14 14 38 38 38 74 74 74 66 66 66
43941 - 2 2 6 6 6 6 90 90 90 250 250 250
43942 -253 253 253 253 253 253 238 238 238 198 198 198
43943 -190 190 190 190 190 190 195 195 195 221 221 221
43944 -246 246 246 253 253 253 253 253 253 253 253 253
43945 -253 253 253 253 253 253 253 253 253 253 253 253
43946 -253 253 253 82 82 82 2 2 6 2 2 6
43947 - 2 2 6 2 2 6 2 2 6 2 2 6
43948 - 2 2 6 78 78 78 70 70 70 34 34 34
43949 - 14 14 14 6 6 6 0 0 0 0 0 0
43950 - 0 0 0 0 0 0 0 0 0 0 0 0
43951 - 0 0 0 0 0 0 0 0 0 0 0 0
43952 - 0 0 0 0 0 0 0 0 0 0 0 0
43953 - 0 0 0 0 0 0 0 0 0 0 0 0
43954 - 0 0 0 0 0 0 0 0 0 0 0 0
43955 - 0 0 0 0 0 0 0 0 0 0 0 0
43956 - 0 0 0 0 0 0 0 0 0 0 0 0
43957 - 0 0 0 0 0 0 0 0 0 0 0 0
43958 - 0 0 0 0 0 0 0 0 0 0 0 0
43959 - 0 0 0 0 0 0 0 0 0 14 14 14
43960 - 34 34 34 66 66 66 78 78 78 6 6 6
43961 - 2 2 6 18 18 18 218 218 218 253 253 253
43962 -253 253 253 253 253 253 253 253 253 246 246 246
43963 -226 226 226 231 231 231 246 246 246 253 253 253
43964 -253 253 253 253 253 253 253 253 253 253 253 253
43965 -253 253 253 253 253 253 253 253 253 253 253 253
43966 -253 253 253 178 178 178 2 2 6 2 2 6
43967 - 2 2 6 2 2 6 2 2 6 2 2 6
43968 - 2 2 6 18 18 18 90 90 90 62 62 62
43969 - 30 30 30 10 10 10 0 0 0 0 0 0
43970 - 0 0 0 0 0 0 0 0 0 0 0 0
43971 - 0 0 0 0 0 0 0 0 0 0 0 0
43972 - 0 0 0 0 0 0 0 0 0 0 0 0
43973 - 0 0 0 0 0 0 0 0 0 0 0 0
43974 - 0 0 0 0 0 0 0 0 0 0 0 0
43975 - 0 0 0 0 0 0 0 0 0 0 0 0
43976 - 0 0 0 0 0 0 0 0 0 0 0 0
43977 - 0 0 0 0 0 0 0 0 0 0 0 0
43978 - 0 0 0 0 0 0 0 0 0 0 0 0
43979 - 0 0 0 0 0 0 10 10 10 26 26 26
43980 - 58 58 58 90 90 90 18 18 18 2 2 6
43981 - 2 2 6 110 110 110 253 253 253 253 253 253
43982 -253 253 253 253 253 253 253 253 253 253 253 253
43983 -250 250 250 253 253 253 253 253 253 253 253 253
43984 -253 253 253 253 253 253 253 253 253 253 253 253
43985 -253 253 253 253 253 253 253 253 253 253 253 253
43986 -253 253 253 231 231 231 18 18 18 2 2 6
43987 - 2 2 6 2 2 6 2 2 6 2 2 6
43988 - 2 2 6 2 2 6 18 18 18 94 94 94
43989 - 54 54 54 26 26 26 10 10 10 0 0 0
43990 - 0 0 0 0 0 0 0 0 0 0 0 0
43991 - 0 0 0 0 0 0 0 0 0 0 0 0
43992 - 0 0 0 0 0 0 0 0 0 0 0 0
43993 - 0 0 0 0 0 0 0 0 0 0 0 0
43994 - 0 0 0 0 0 0 0 0 0 0 0 0
43995 - 0 0 0 0 0 0 0 0 0 0 0 0
43996 - 0 0 0 0 0 0 0 0 0 0 0 0
43997 - 0 0 0 0 0 0 0 0 0 0 0 0
43998 - 0 0 0 0 0 0 0 0 0 0 0 0
43999 - 0 0 0 6 6 6 22 22 22 50 50 50
44000 - 90 90 90 26 26 26 2 2 6 2 2 6
44001 - 14 14 14 195 195 195 250 250 250 253 253 253
44002 -253 253 253 253 253 253 253 253 253 253 253 253
44003 -253 253 253 253 253 253 253 253 253 253 253 253
44004 -253 253 253 253 253 253 253 253 253 253 253 253
44005 -253 253 253 253 253 253 253 253 253 253 253 253
44006 -250 250 250 242 242 242 54 54 54 2 2 6
44007 - 2 2 6 2 2 6 2 2 6 2 2 6
44008 - 2 2 6 2 2 6 2 2 6 38 38 38
44009 - 86 86 86 50 50 50 22 22 22 6 6 6
44010 - 0 0 0 0 0 0 0 0 0 0 0 0
44011 - 0 0 0 0 0 0 0 0 0 0 0 0
44012 - 0 0 0 0 0 0 0 0 0 0 0 0
44013 - 0 0 0 0 0 0 0 0 0 0 0 0
44014 - 0 0 0 0 0 0 0 0 0 0 0 0
44015 - 0 0 0 0 0 0 0 0 0 0 0 0
44016 - 0 0 0 0 0 0 0 0 0 0 0 0
44017 - 0 0 0 0 0 0 0 0 0 0 0 0
44018 - 0 0 0 0 0 0 0 0 0 0 0 0
44019 - 6 6 6 14 14 14 38 38 38 82 82 82
44020 - 34 34 34 2 2 6 2 2 6 2 2 6
44021 - 42 42 42 195 195 195 246 246 246 253 253 253
44022 -253 253 253 253 253 253 253 253 253 250 250 250
44023 -242 242 242 242 242 242 250 250 250 253 253 253
44024 -253 253 253 253 253 253 253 253 253 253 253 253
44025 -253 253 253 250 250 250 246 246 246 238 238 238
44026 -226 226 226 231 231 231 101 101 101 6 6 6
44027 - 2 2 6 2 2 6 2 2 6 2 2 6
44028 - 2 2 6 2 2 6 2 2 6 2 2 6
44029 - 38 38 38 82 82 82 42 42 42 14 14 14
44030 - 6 6 6 0 0 0 0 0 0 0 0 0
44031 - 0 0 0 0 0 0 0 0 0 0 0 0
44032 - 0 0 0 0 0 0 0 0 0 0 0 0
44033 - 0 0 0 0 0 0 0 0 0 0 0 0
44034 - 0 0 0 0 0 0 0 0 0 0 0 0
44035 - 0 0 0 0 0 0 0 0 0 0 0 0
44036 - 0 0 0 0 0 0 0 0 0 0 0 0
44037 - 0 0 0 0 0 0 0 0 0 0 0 0
44038 - 0 0 0 0 0 0 0 0 0 0 0 0
44039 - 10 10 10 26 26 26 62 62 62 66 66 66
44040 - 2 2 6 2 2 6 2 2 6 6 6 6
44041 - 70 70 70 170 170 170 206 206 206 234 234 234
44042 -246 246 246 250 250 250 250 250 250 238 238 238
44043 -226 226 226 231 231 231 238 238 238 250 250 250
44044 -250 250 250 250 250 250 246 246 246 231 231 231
44045 -214 214 214 206 206 206 202 202 202 202 202 202
44046 -198 198 198 202 202 202 182 182 182 18 18 18
44047 - 2 2 6 2 2 6 2 2 6 2 2 6
44048 - 2 2 6 2 2 6 2 2 6 2 2 6
44049 - 2 2 6 62 62 62 66 66 66 30 30 30
44050 - 10 10 10 0 0 0 0 0 0 0 0 0
44051 - 0 0 0 0 0 0 0 0 0 0 0 0
44052 - 0 0 0 0 0 0 0 0 0 0 0 0
44053 - 0 0 0 0 0 0 0 0 0 0 0 0
44054 - 0 0 0 0 0 0 0 0 0 0 0 0
44055 - 0 0 0 0 0 0 0 0 0 0 0 0
44056 - 0 0 0 0 0 0 0 0 0 0 0 0
44057 - 0 0 0 0 0 0 0 0 0 0 0 0
44058 - 0 0 0 0 0 0 0 0 0 0 0 0
44059 - 14 14 14 42 42 42 82 82 82 18 18 18
44060 - 2 2 6 2 2 6 2 2 6 10 10 10
44061 - 94 94 94 182 182 182 218 218 218 242 242 242
44062 -250 250 250 253 253 253 253 253 253 250 250 250
44063 -234 234 234 253 253 253 253 253 253 253 253 253
44064 -253 253 253 253 253 253 253 253 253 246 246 246
44065 -238 238 238 226 226 226 210 210 210 202 202 202
44066 -195 195 195 195 195 195 210 210 210 158 158 158
44067 - 6 6 6 14 14 14 50 50 50 14 14 14
44068 - 2 2 6 2 2 6 2 2 6 2 2 6
44069 - 2 2 6 6 6 6 86 86 86 46 46 46
44070 - 18 18 18 6 6 6 0 0 0 0 0 0
44071 - 0 0 0 0 0 0 0 0 0 0 0 0
44072 - 0 0 0 0 0 0 0 0 0 0 0 0
44073 - 0 0 0 0 0 0 0 0 0 0 0 0
44074 - 0 0 0 0 0 0 0 0 0 0 0 0
44075 - 0 0 0 0 0 0 0 0 0 0 0 0
44076 - 0 0 0 0 0 0 0 0 0 0 0 0
44077 - 0 0 0 0 0 0 0 0 0 0 0 0
44078 - 0 0 0 0 0 0 0 0 0 6 6 6
44079 - 22 22 22 54 54 54 70 70 70 2 2 6
44080 - 2 2 6 10 10 10 2 2 6 22 22 22
44081 -166 166 166 231 231 231 250 250 250 253 253 253
44082 -253 253 253 253 253 253 253 253 253 250 250 250
44083 -242 242 242 253 253 253 253 253 253 253 253 253
44084 -253 253 253 253 253 253 253 253 253 253 253 253
44085 -253 253 253 253 253 253 253 253 253 246 246 246
44086 -231 231 231 206 206 206 198 198 198 226 226 226
44087 - 94 94 94 2 2 6 6 6 6 38 38 38
44088 - 30 30 30 2 2 6 2 2 6 2 2 6
44089 - 2 2 6 2 2 6 62 62 62 66 66 66
44090 - 26 26 26 10 10 10 0 0 0 0 0 0
44091 - 0 0 0 0 0 0 0 0 0 0 0 0
44092 - 0 0 0 0 0 0 0 0 0 0 0 0
44093 - 0 0 0 0 0 0 0 0 0 0 0 0
44094 - 0 0 0 0 0 0 0 0 0 0 0 0
44095 - 0 0 0 0 0 0 0 0 0 0 0 0
44096 - 0 0 0 0 0 0 0 0 0 0 0 0
44097 - 0 0 0 0 0 0 0 0 0 0 0 0
44098 - 0 0 0 0 0 0 0 0 0 10 10 10
44099 - 30 30 30 74 74 74 50 50 50 2 2 6
44100 - 26 26 26 26 26 26 2 2 6 106 106 106
44101 -238 238 238 253 253 253 253 253 253 253 253 253
44102 -253 253 253 253 253 253 253 253 253 253 253 253
44103 -253 253 253 253 253 253 253 253 253 253 253 253
44104 -253 253 253 253 253 253 253 253 253 253 253 253
44105 -253 253 253 253 253 253 253 253 253 253 253 253
44106 -253 253 253 246 246 246 218 218 218 202 202 202
44107 -210 210 210 14 14 14 2 2 6 2 2 6
44108 - 30 30 30 22 22 22 2 2 6 2 2 6
44109 - 2 2 6 2 2 6 18 18 18 86 86 86
44110 - 42 42 42 14 14 14 0 0 0 0 0 0
44111 - 0 0 0 0 0 0 0 0 0 0 0 0
44112 - 0 0 0 0 0 0 0 0 0 0 0 0
44113 - 0 0 0 0 0 0 0 0 0 0 0 0
44114 - 0 0 0 0 0 0 0 0 0 0 0 0
44115 - 0 0 0 0 0 0 0 0 0 0 0 0
44116 - 0 0 0 0 0 0 0 0 0 0 0 0
44117 - 0 0 0 0 0 0 0 0 0 0 0 0
44118 - 0 0 0 0 0 0 0 0 0 14 14 14
44119 - 42 42 42 90 90 90 22 22 22 2 2 6
44120 - 42 42 42 2 2 6 18 18 18 218 218 218
44121 -253 253 253 253 253 253 253 253 253 253 253 253
44122 -253 253 253 253 253 253 253 253 253 253 253 253
44123 -253 253 253 253 253 253 253 253 253 253 253 253
44124 -253 253 253 253 253 253 253 253 253 253 253 253
44125 -253 253 253 253 253 253 253 253 253 253 253 253
44126 -253 253 253 253 253 253 250 250 250 221 221 221
44127 -218 218 218 101 101 101 2 2 6 14 14 14
44128 - 18 18 18 38 38 38 10 10 10 2 2 6
44129 - 2 2 6 2 2 6 2 2 6 78 78 78
44130 - 58 58 58 22 22 22 6 6 6 0 0 0
44131 - 0 0 0 0 0 0 0 0 0 0 0 0
44132 - 0 0 0 0 0 0 0 0 0 0 0 0
44133 - 0 0 0 0 0 0 0 0 0 0 0 0
44134 - 0 0 0 0 0 0 0 0 0 0 0 0
44135 - 0 0 0 0 0 0 0 0 0 0 0 0
44136 - 0 0 0 0 0 0 0 0 0 0 0 0
44137 - 0 0 0 0 0 0 0 0 0 0 0 0
44138 - 0 0 0 0 0 0 6 6 6 18 18 18
44139 - 54 54 54 82 82 82 2 2 6 26 26 26
44140 - 22 22 22 2 2 6 123 123 123 253 253 253
44141 -253 253 253 253 253 253 253 253 253 253 253 253
44142 -253 253 253 253 253 253 253 253 253 253 253 253
44143 -253 253 253 253 253 253 253 253 253 253 253 253
44144 -253 253 253 253 253 253 253 253 253 253 253 253
44145 -253 253 253 253 253 253 253 253 253 253 253 253
44146 -253 253 253 253 253 253 253 253 253 250 250 250
44147 -238 238 238 198 198 198 6 6 6 38 38 38
44148 - 58 58 58 26 26 26 38 38 38 2 2 6
44149 - 2 2 6 2 2 6 2 2 6 46 46 46
44150 - 78 78 78 30 30 30 10 10 10 0 0 0
44151 - 0 0 0 0 0 0 0 0 0 0 0 0
44152 - 0 0 0 0 0 0 0 0 0 0 0 0
44153 - 0 0 0 0 0 0 0 0 0 0 0 0
44154 - 0 0 0 0 0 0 0 0 0 0 0 0
44155 - 0 0 0 0 0 0 0 0 0 0 0 0
44156 - 0 0 0 0 0 0 0 0 0 0 0 0
44157 - 0 0 0 0 0 0 0 0 0 0 0 0
44158 - 0 0 0 0 0 0 10 10 10 30 30 30
44159 - 74 74 74 58 58 58 2 2 6 42 42 42
44160 - 2 2 6 22 22 22 231 231 231 253 253 253
44161 -253 253 253 253 253 253 253 253 253 253 253 253
44162 -253 253 253 253 253 253 253 253 253 250 250 250
44163 -253 253 253 253 253 253 253 253 253 253 253 253
44164 -253 253 253 253 253 253 253 253 253 253 253 253
44165 -253 253 253 253 253 253 253 253 253 253 253 253
44166 -253 253 253 253 253 253 253 253 253 253 253 253
44167 -253 253 253 246 246 246 46 46 46 38 38 38
44168 - 42 42 42 14 14 14 38 38 38 14 14 14
44169 - 2 2 6 2 2 6 2 2 6 6 6 6
44170 - 86 86 86 46 46 46 14 14 14 0 0 0
44171 - 0 0 0 0 0 0 0 0 0 0 0 0
44172 - 0 0 0 0 0 0 0 0 0 0 0 0
44173 - 0 0 0 0 0 0 0 0 0 0 0 0
44174 - 0 0 0 0 0 0 0 0 0 0 0 0
44175 - 0 0 0 0 0 0 0 0 0 0 0 0
44176 - 0 0 0 0 0 0 0 0 0 0 0 0
44177 - 0 0 0 0 0 0 0 0 0 0 0 0
44178 - 0 0 0 6 6 6 14 14 14 42 42 42
44179 - 90 90 90 18 18 18 18 18 18 26 26 26
44180 - 2 2 6 116 116 116 253 253 253 253 253 253
44181 -253 253 253 253 253 253 253 253 253 253 253 253
44182 -253 253 253 253 253 253 250 250 250 238 238 238
44183 -253 253 253 253 253 253 253 253 253 253 253 253
44184 -253 253 253 253 253 253 253 253 253 253 253 253
44185 -253 253 253 253 253 253 253 253 253 253 253 253
44186 -253 253 253 253 253 253 253 253 253 253 253 253
44187 -253 253 253 253 253 253 94 94 94 6 6 6
44188 - 2 2 6 2 2 6 10 10 10 34 34 34
44189 - 2 2 6 2 2 6 2 2 6 2 2 6
44190 - 74 74 74 58 58 58 22 22 22 6 6 6
44191 - 0 0 0 0 0 0 0 0 0 0 0 0
44192 - 0 0 0 0 0 0 0 0 0 0 0 0
44193 - 0 0 0 0 0 0 0 0 0 0 0 0
44194 - 0 0 0 0 0 0 0 0 0 0 0 0
44195 - 0 0 0 0 0 0 0 0 0 0 0 0
44196 - 0 0 0 0 0 0 0 0 0 0 0 0
44197 - 0 0 0 0 0 0 0 0 0 0 0 0
44198 - 0 0 0 10 10 10 26 26 26 66 66 66
44199 - 82 82 82 2 2 6 38 38 38 6 6 6
44200 - 14 14 14 210 210 210 253 253 253 253 253 253
44201 -253 253 253 253 253 253 253 253 253 253 253 253
44202 -253 253 253 253 253 253 246 246 246 242 242 242
44203 -253 253 253 253 253 253 253 253 253 253 253 253
44204 -253 253 253 253 253 253 253 253 253 253 253 253
44205 -253 253 253 253 253 253 253 253 253 253 253 253
44206 -253 253 253 253 253 253 253 253 253 253 253 253
44207 -253 253 253 253 253 253 144 144 144 2 2 6
44208 - 2 2 6 2 2 6 2 2 6 46 46 46
44209 - 2 2 6 2 2 6 2 2 6 2 2 6
44210 - 42 42 42 74 74 74 30 30 30 10 10 10
44211 - 0 0 0 0 0 0 0 0 0 0 0 0
44212 - 0 0 0 0 0 0 0 0 0 0 0 0
44213 - 0 0 0 0 0 0 0 0 0 0 0 0
44214 - 0 0 0 0 0 0 0 0 0 0 0 0
44215 - 0 0 0 0 0 0 0 0 0 0 0 0
44216 - 0 0 0 0 0 0 0 0 0 0 0 0
44217 - 0 0 0 0 0 0 0 0 0 0 0 0
44218 - 6 6 6 14 14 14 42 42 42 90 90 90
44219 - 26 26 26 6 6 6 42 42 42 2 2 6
44220 - 74 74 74 250 250 250 253 253 253 253 253 253
44221 -253 253 253 253 253 253 253 253 253 253 253 253
44222 -253 253 253 253 253 253 242 242 242 242 242 242
44223 -253 253 253 253 253 253 253 253 253 253 253 253
44224 -253 253 253 253 253 253 253 253 253 253 253 253
44225 -253 253 253 253 253 253 253 253 253 253 253 253
44226 -253 253 253 253 253 253 253 253 253 253 253 253
44227 -253 253 253 253 253 253 182 182 182 2 2 6
44228 - 2 2 6 2 2 6 2 2 6 46 46 46
44229 - 2 2 6 2 2 6 2 2 6 2 2 6
44230 - 10 10 10 86 86 86 38 38 38 10 10 10
44231 - 0 0 0 0 0 0 0 0 0 0 0 0
44232 - 0 0 0 0 0 0 0 0 0 0 0 0
44233 - 0 0 0 0 0 0 0 0 0 0 0 0
44234 - 0 0 0 0 0 0 0 0 0 0 0 0
44235 - 0 0 0 0 0 0 0 0 0 0 0 0
44236 - 0 0 0 0 0 0 0 0 0 0 0 0
44237 - 0 0 0 0 0 0 0 0 0 0 0 0
44238 - 10 10 10 26 26 26 66 66 66 82 82 82
44239 - 2 2 6 22 22 22 18 18 18 2 2 6
44240 -149 149 149 253 253 253 253 253 253 253 253 253
44241 -253 253 253 253 253 253 253 253 253 253 253 253
44242 -253 253 253 253 253 253 234 234 234 242 242 242
44243 -253 253 253 253 253 253 253 253 253 253 253 253
44244 -253 253 253 253 253 253 253 253 253 253 253 253
44245 -253 253 253 253 253 253 253 253 253 253 253 253
44246 -253 253 253 253 253 253 253 253 253 253 253 253
44247 -253 253 253 253 253 253 206 206 206 2 2 6
44248 - 2 2 6 2 2 6 2 2 6 38 38 38
44249 - 2 2 6 2 2 6 2 2 6 2 2 6
44250 - 6 6 6 86 86 86 46 46 46 14 14 14
44251 - 0 0 0 0 0 0 0 0 0 0 0 0
44252 - 0 0 0 0 0 0 0 0 0 0 0 0
44253 - 0 0 0 0 0 0 0 0 0 0 0 0
44254 - 0 0 0 0 0 0 0 0 0 0 0 0
44255 - 0 0 0 0 0 0 0 0 0 0 0 0
44256 - 0 0 0 0 0 0 0 0 0 0 0 0
44257 - 0 0 0 0 0 0 0 0 0 6 6 6
44258 - 18 18 18 46 46 46 86 86 86 18 18 18
44259 - 2 2 6 34 34 34 10 10 10 6 6 6
44260 -210 210 210 253 253 253 253 253 253 253 253 253
44261 -253 253 253 253 253 253 253 253 253 253 253 253
44262 -253 253 253 253 253 253 234 234 234 242 242 242
44263 -253 253 253 253 253 253 253 253 253 253 253 253
44264 -253 253 253 253 253 253 253 253 253 253 253 253
44265 -253 253 253 253 253 253 253 253 253 253 253 253
44266 -253 253 253 253 253 253 253 253 253 253 253 253
44267 -253 253 253 253 253 253 221 221 221 6 6 6
44268 - 2 2 6 2 2 6 6 6 6 30 30 30
44269 - 2 2 6 2 2 6 2 2 6 2 2 6
44270 - 2 2 6 82 82 82 54 54 54 18 18 18
44271 - 6 6 6 0 0 0 0 0 0 0 0 0
44272 - 0 0 0 0 0 0 0 0 0 0 0 0
44273 - 0 0 0 0 0 0 0 0 0 0 0 0
44274 - 0 0 0 0 0 0 0 0 0 0 0 0
44275 - 0 0 0 0 0 0 0 0 0 0 0 0
44276 - 0 0 0 0 0 0 0 0 0 0 0 0
44277 - 0 0 0 0 0 0 0 0 0 10 10 10
44278 - 26 26 26 66 66 66 62 62 62 2 2 6
44279 - 2 2 6 38 38 38 10 10 10 26 26 26
44280 -238 238 238 253 253 253 253 253 253 253 253 253
44281 -253 253 253 253 253 253 253 253 253 253 253 253
44282 -253 253 253 253 253 253 231 231 231 238 238 238
44283 -253 253 253 253 253 253 253 253 253 253 253 253
44284 -253 253 253 253 253 253 253 253 253 253 253 253
44285 -253 253 253 253 253 253 253 253 253 253 253 253
44286 -253 253 253 253 253 253 253 253 253 253 253 253
44287 -253 253 253 253 253 253 231 231 231 6 6 6
44288 - 2 2 6 2 2 6 10 10 10 30 30 30
44289 - 2 2 6 2 2 6 2 2 6 2 2 6
44290 - 2 2 6 66 66 66 58 58 58 22 22 22
44291 - 6 6 6 0 0 0 0 0 0 0 0 0
44292 - 0 0 0 0 0 0 0 0 0 0 0 0
44293 - 0 0 0 0 0 0 0 0 0 0 0 0
44294 - 0 0 0 0 0 0 0 0 0 0 0 0
44295 - 0 0 0 0 0 0 0 0 0 0 0 0
44296 - 0 0 0 0 0 0 0 0 0 0 0 0
44297 - 0 0 0 0 0 0 0 0 0 10 10 10
44298 - 38 38 38 78 78 78 6 6 6 2 2 6
44299 - 2 2 6 46 46 46 14 14 14 42 42 42
44300 -246 246 246 253 253 253 253 253 253 253 253 253
44301 -253 253 253 253 253 253 253 253 253 253 253 253
44302 -253 253 253 253 253 253 231 231 231 242 242 242
44303 -253 253 253 253 253 253 253 253 253 253 253 253
44304 -253 253 253 253 253 253 253 253 253 253 253 253
44305 -253 253 253 253 253 253 253 253 253 253 253 253
44306 -253 253 253 253 253 253 253 253 253 253 253 253
44307 -253 253 253 253 253 253 234 234 234 10 10 10
44308 - 2 2 6 2 2 6 22 22 22 14 14 14
44309 - 2 2 6 2 2 6 2 2 6 2 2 6
44310 - 2 2 6 66 66 66 62 62 62 22 22 22
44311 - 6 6 6 0 0 0 0 0 0 0 0 0
44312 - 0 0 0 0 0 0 0 0 0 0 0 0
44313 - 0 0 0 0 0 0 0 0 0 0 0 0
44314 - 0 0 0 0 0 0 0 0 0 0 0 0
44315 - 0 0 0 0 0 0 0 0 0 0 0 0
44316 - 0 0 0 0 0 0 0 0 0 0 0 0
44317 - 0 0 0 0 0 0 6 6 6 18 18 18
44318 - 50 50 50 74 74 74 2 2 6 2 2 6
44319 - 14 14 14 70 70 70 34 34 34 62 62 62
44320 -250 250 250 253 253 253 253 253 253 253 253 253
44321 -253 253 253 253 253 253 253 253 253 253 253 253
44322 -253 253 253 253 253 253 231 231 231 246 246 246
44323 -253 253 253 253 253 253 253 253 253 253 253 253
44324 -253 253 253 253 253 253 253 253 253 253 253 253
44325 -253 253 253 253 253 253 253 253 253 253 253 253
44326 -253 253 253 253 253 253 253 253 253 253 253 253
44327 -253 253 253 253 253 253 234 234 234 14 14 14
44328 - 2 2 6 2 2 6 30 30 30 2 2 6
44329 - 2 2 6 2 2 6 2 2 6 2 2 6
44330 - 2 2 6 66 66 66 62 62 62 22 22 22
44331 - 6 6 6 0 0 0 0 0 0 0 0 0
44332 - 0 0 0 0 0 0 0 0 0 0 0 0
44333 - 0 0 0 0 0 0 0 0 0 0 0 0
44334 - 0 0 0 0 0 0 0 0 0 0 0 0
44335 - 0 0 0 0 0 0 0 0 0 0 0 0
44336 - 0 0 0 0 0 0 0 0 0 0 0 0
44337 - 0 0 0 0 0 0 6 6 6 18 18 18
44338 - 54 54 54 62 62 62 2 2 6 2 2 6
44339 - 2 2 6 30 30 30 46 46 46 70 70 70
44340 -250 250 250 253 253 253 253 253 253 253 253 253
44341 -253 253 253 253 253 253 253 253 253 253 253 253
44342 -253 253 253 253 253 253 231 231 231 246 246 246
44343 -253 253 253 253 253 253 253 253 253 253 253 253
44344 -253 253 253 253 253 253 253 253 253 253 253 253
44345 -253 253 253 253 253 253 253 253 253 253 253 253
44346 -253 253 253 253 253 253 253 253 253 253 253 253
44347 -253 253 253 253 253 253 226 226 226 10 10 10
44348 - 2 2 6 6 6 6 30 30 30 2 2 6
44349 - 2 2 6 2 2 6 2 2 6 2 2 6
44350 - 2 2 6 66 66 66 58 58 58 22 22 22
44351 - 6 6 6 0 0 0 0 0 0 0 0 0
44352 - 0 0 0 0 0 0 0 0 0 0 0 0
44353 - 0 0 0 0 0 0 0 0 0 0 0 0
44354 - 0 0 0 0 0 0 0 0 0 0 0 0
44355 - 0 0 0 0 0 0 0 0 0 0 0 0
44356 - 0 0 0 0 0 0 0 0 0 0 0 0
44357 - 0 0 0 0 0 0 6 6 6 22 22 22
44358 - 58 58 58 62 62 62 2 2 6 2 2 6
44359 - 2 2 6 2 2 6 30 30 30 78 78 78
44360 -250 250 250 253 253 253 253 253 253 253 253 253
44361 -253 253 253 253 253 253 253 253 253 253 253 253
44362 -253 253 253 253 253 253 231 231 231 246 246 246
44363 -253 253 253 253 253 253 253 253 253 253 253 253
44364 -253 253 253 253 253 253 253 253 253 253 253 253
44365 -253 253 253 253 253 253 253 253 253 253 253 253
44366 -253 253 253 253 253 253 253 253 253 253 253 253
44367 -253 253 253 253 253 253 206 206 206 2 2 6
44368 - 22 22 22 34 34 34 18 14 6 22 22 22
44369 - 26 26 26 18 18 18 6 6 6 2 2 6
44370 - 2 2 6 82 82 82 54 54 54 18 18 18
44371 - 6 6 6 0 0 0 0 0 0 0 0 0
44372 - 0 0 0 0 0 0 0 0 0 0 0 0
44373 - 0 0 0 0 0 0 0 0 0 0 0 0
44374 - 0 0 0 0 0 0 0 0 0 0 0 0
44375 - 0 0 0 0 0 0 0 0 0 0 0 0
44376 - 0 0 0 0 0 0 0 0 0 0 0 0
44377 - 0 0 0 0 0 0 6 6 6 26 26 26
44378 - 62 62 62 106 106 106 74 54 14 185 133 11
44379 -210 162 10 121 92 8 6 6 6 62 62 62
44380 -238 238 238 253 253 253 253 253 253 253 253 253
44381 -253 253 253 253 253 253 253 253 253 253 253 253
44382 -253 253 253 253 253 253 231 231 231 246 246 246
44383 -253 253 253 253 253 253 253 253 253 253 253 253
44384 -253 253 253 253 253 253 253 253 253 253 253 253
44385 -253 253 253 253 253 253 253 253 253 253 253 253
44386 -253 253 253 253 253 253 253 253 253 253 253 253
44387 -253 253 253 253 253 253 158 158 158 18 18 18
44388 - 14 14 14 2 2 6 2 2 6 2 2 6
44389 - 6 6 6 18 18 18 66 66 66 38 38 38
44390 - 6 6 6 94 94 94 50 50 50 18 18 18
44391 - 6 6 6 0 0 0 0 0 0 0 0 0
44392 - 0 0 0 0 0 0 0 0 0 0 0 0
44393 - 0 0 0 0 0 0 0 0 0 0 0 0
44394 - 0 0 0 0 0 0 0 0 0 0 0 0
44395 - 0 0 0 0 0 0 0 0 0 0 0 0
44396 - 0 0 0 0 0 0 0 0 0 6 6 6
44397 - 10 10 10 10 10 10 18 18 18 38 38 38
44398 - 78 78 78 142 134 106 216 158 10 242 186 14
44399 -246 190 14 246 190 14 156 118 10 10 10 10
44400 - 90 90 90 238 238 238 253 253 253 253 253 253
44401 -253 253 253 253 253 253 253 253 253 253 253 253
44402 -253 253 253 253 253 253 231 231 231 250 250 250
44403 -253 253 253 253 253 253 253 253 253 253 253 253
44404 -253 253 253 253 253 253 253 253 253 253 253 253
44405 -253 253 253 253 253 253 253 253 253 253 253 253
44406 -253 253 253 253 253 253 253 253 253 246 230 190
44407 -238 204 91 238 204 91 181 142 44 37 26 9
44408 - 2 2 6 2 2 6 2 2 6 2 2 6
44409 - 2 2 6 2 2 6 38 38 38 46 46 46
44410 - 26 26 26 106 106 106 54 54 54 18 18 18
44411 - 6 6 6 0 0 0 0 0 0 0 0 0
44412 - 0 0 0 0 0 0 0 0 0 0 0 0
44413 - 0 0 0 0 0 0 0 0 0 0 0 0
44414 - 0 0 0 0 0 0 0 0 0 0 0 0
44415 - 0 0 0 0 0 0 0 0 0 0 0 0
44416 - 0 0 0 6 6 6 14 14 14 22 22 22
44417 - 30 30 30 38 38 38 50 50 50 70 70 70
44418 -106 106 106 190 142 34 226 170 11 242 186 14
44419 -246 190 14 246 190 14 246 190 14 154 114 10
44420 - 6 6 6 74 74 74 226 226 226 253 253 253
44421 -253 253 253 253 253 253 253 253 253 253 253 253
44422 -253 253 253 253 253 253 231 231 231 250 250 250
44423 -253 253 253 253 253 253 253 253 253 253 253 253
44424 -253 253 253 253 253 253 253 253 253 253 253 253
44425 -253 253 253 253 253 253 253 253 253 253 253 253
44426 -253 253 253 253 253 253 253 253 253 228 184 62
44427 -241 196 14 241 208 19 232 195 16 38 30 10
44428 - 2 2 6 2 2 6 2 2 6 2 2 6
44429 - 2 2 6 6 6 6 30 30 30 26 26 26
44430 -203 166 17 154 142 90 66 66 66 26 26 26
44431 - 6 6 6 0 0 0 0 0 0 0 0 0
44432 - 0 0 0 0 0 0 0 0 0 0 0 0
44433 - 0 0 0 0 0 0 0 0 0 0 0 0
44434 - 0 0 0 0 0 0 0 0 0 0 0 0
44435 - 0 0 0 0 0 0 0 0 0 0 0 0
44436 - 6 6 6 18 18 18 38 38 38 58 58 58
44437 - 78 78 78 86 86 86 101 101 101 123 123 123
44438 -175 146 61 210 150 10 234 174 13 246 186 14
44439 -246 190 14 246 190 14 246 190 14 238 190 10
44440 -102 78 10 2 2 6 46 46 46 198 198 198
44441 -253 253 253 253 253 253 253 253 253 253 253 253
44442 -253 253 253 253 253 253 234 234 234 242 242 242
44443 -253 253 253 253 253 253 253 253 253 253 253 253
44444 -253 253 253 253 253 253 253 253 253 253 253 253
44445 -253 253 253 253 253 253 253 253 253 253 253 253
44446 -253 253 253 253 253 253 253 253 253 224 178 62
44447 -242 186 14 241 196 14 210 166 10 22 18 6
44448 - 2 2 6 2 2 6 2 2 6 2 2 6
44449 - 2 2 6 2 2 6 6 6 6 121 92 8
44450 -238 202 15 232 195 16 82 82 82 34 34 34
44451 - 10 10 10 0 0 0 0 0 0 0 0 0
44452 - 0 0 0 0 0 0 0 0 0 0 0 0
44453 - 0 0 0 0 0 0 0 0 0 0 0 0
44454 - 0 0 0 0 0 0 0 0 0 0 0 0
44455 - 0 0 0 0 0 0 0 0 0 0 0 0
44456 - 14 14 14 38 38 38 70 70 70 154 122 46
44457 -190 142 34 200 144 11 197 138 11 197 138 11
44458 -213 154 11 226 170 11 242 186 14 246 190 14
44459 -246 190 14 246 190 14 246 190 14 246 190 14
44460 -225 175 15 46 32 6 2 2 6 22 22 22
44461 -158 158 158 250 250 250 253 253 253 253 253 253
44462 -253 253 253 253 253 253 253 253 253 253 253 253
44463 -253 253 253 253 253 253 253 253 253 253 253 253
44464 -253 253 253 253 253 253 253 253 253 253 253 253
44465 -253 253 253 253 253 253 253 253 253 253 253 253
44466 -253 253 253 250 250 250 242 242 242 224 178 62
44467 -239 182 13 236 186 11 213 154 11 46 32 6
44468 - 2 2 6 2 2 6 2 2 6 2 2 6
44469 - 2 2 6 2 2 6 61 42 6 225 175 15
44470 -238 190 10 236 186 11 112 100 78 42 42 42
44471 - 14 14 14 0 0 0 0 0 0 0 0 0
44472 - 0 0 0 0 0 0 0 0 0 0 0 0
44473 - 0 0 0 0 0 0 0 0 0 0 0 0
44474 - 0 0 0 0 0 0 0 0 0 0 0 0
44475 - 0 0 0 0 0 0 0 0 0 6 6 6
44476 - 22 22 22 54 54 54 154 122 46 213 154 11
44477 -226 170 11 230 174 11 226 170 11 226 170 11
44478 -236 178 12 242 186 14 246 190 14 246 190 14
44479 -246 190 14 246 190 14 246 190 14 246 190 14
44480 -241 196 14 184 144 12 10 10 10 2 2 6
44481 - 6 6 6 116 116 116 242 242 242 253 253 253
44482 -253 253 253 253 253 253 253 253 253 253 253 253
44483 -253 253 253 253 253 253 253 253 253 253 253 253
44484 -253 253 253 253 253 253 253 253 253 253 253 253
44485 -253 253 253 253 253 253 253 253 253 253 253 253
44486 -253 253 253 231 231 231 198 198 198 214 170 54
44487 -236 178 12 236 178 12 210 150 10 137 92 6
44488 - 18 14 6 2 2 6 2 2 6 2 2 6
44489 - 6 6 6 70 47 6 200 144 11 236 178 12
44490 -239 182 13 239 182 13 124 112 88 58 58 58
44491 - 22 22 22 6 6 6 0 0 0 0 0 0
44492 - 0 0 0 0 0 0 0 0 0 0 0 0
44493 - 0 0 0 0 0 0 0 0 0 0 0 0
44494 - 0 0 0 0 0 0 0 0 0 0 0 0
44495 - 0 0 0 0 0 0 0 0 0 10 10 10
44496 - 30 30 30 70 70 70 180 133 36 226 170 11
44497 -239 182 13 242 186 14 242 186 14 246 186 14
44498 -246 190 14 246 190 14 246 190 14 246 190 14
44499 -246 190 14 246 190 14 246 190 14 246 190 14
44500 -246 190 14 232 195 16 98 70 6 2 2 6
44501 - 2 2 6 2 2 6 66 66 66 221 221 221
44502 -253 253 253 253 253 253 253 253 253 253 253 253
44503 -253 253 253 253 253 253 253 253 253 253 253 253
44504 -253 253 253 253 253 253 253 253 253 253 253 253
44505 -253 253 253 253 253 253 253 253 253 253 253 253
44506 -253 253 253 206 206 206 198 198 198 214 166 58
44507 -230 174 11 230 174 11 216 158 10 192 133 9
44508 -163 110 8 116 81 8 102 78 10 116 81 8
44509 -167 114 7 197 138 11 226 170 11 239 182 13
44510 -242 186 14 242 186 14 162 146 94 78 78 78
44511 - 34 34 34 14 14 14 6 6 6 0 0 0
44512 - 0 0 0 0 0 0 0 0 0 0 0 0
44513 - 0 0 0 0 0 0 0 0 0 0 0 0
44514 - 0 0 0 0 0 0 0 0 0 0 0 0
44515 - 0 0 0 0 0 0 0 0 0 6 6 6
44516 - 30 30 30 78 78 78 190 142 34 226 170 11
44517 -239 182 13 246 190 14 246 190 14 246 190 14
44518 -246 190 14 246 190 14 246 190 14 246 190 14
44519 -246 190 14 246 190 14 246 190 14 246 190 14
44520 -246 190 14 241 196 14 203 166 17 22 18 6
44521 - 2 2 6 2 2 6 2 2 6 38 38 38
44522 -218 218 218 253 253 253 253 253 253 253 253 253
44523 -253 253 253 253 253 253 253 253 253 253 253 253
44524 -253 253 253 253 253 253 253 253 253 253 253 253
44525 -253 253 253 253 253 253 253 253 253 253 253 253
44526 -250 250 250 206 206 206 198 198 198 202 162 69
44527 -226 170 11 236 178 12 224 166 10 210 150 10
44528 -200 144 11 197 138 11 192 133 9 197 138 11
44529 -210 150 10 226 170 11 242 186 14 246 190 14
44530 -246 190 14 246 186 14 225 175 15 124 112 88
44531 - 62 62 62 30 30 30 14 14 14 6 6 6
44532 - 0 0 0 0 0 0 0 0 0 0 0 0
44533 - 0 0 0 0 0 0 0 0 0 0 0 0
44534 - 0 0 0 0 0 0 0 0 0 0 0 0
44535 - 0 0 0 0 0 0 0 0 0 10 10 10
44536 - 30 30 30 78 78 78 174 135 50 224 166 10
44537 -239 182 13 246 190 14 246 190 14 246 190 14
44538 -246 190 14 246 190 14 246 190 14 246 190 14
44539 -246 190 14 246 190 14 246 190 14 246 190 14
44540 -246 190 14 246 190 14 241 196 14 139 102 15
44541 - 2 2 6 2 2 6 2 2 6 2 2 6
44542 - 78 78 78 250 250 250 253 253 253 253 253 253
44543 -253 253 253 253 253 253 253 253 253 253 253 253
44544 -253 253 253 253 253 253 253 253 253 253 253 253
44545 -253 253 253 253 253 253 253 253 253 253 253 253
44546 -250 250 250 214 214 214 198 198 198 190 150 46
44547 -219 162 10 236 178 12 234 174 13 224 166 10
44548 -216 158 10 213 154 11 213 154 11 216 158 10
44549 -226 170 11 239 182 13 246 190 14 246 190 14
44550 -246 190 14 246 190 14 242 186 14 206 162 42
44551 -101 101 101 58 58 58 30 30 30 14 14 14
44552 - 6 6 6 0 0 0 0 0 0 0 0 0
44553 - 0 0 0 0 0 0 0 0 0 0 0 0
44554 - 0 0 0 0 0 0 0 0 0 0 0 0
44555 - 0 0 0 0 0 0 0 0 0 10 10 10
44556 - 30 30 30 74 74 74 174 135 50 216 158 10
44557 -236 178 12 246 190 14 246 190 14 246 190 14
44558 -246 190 14 246 190 14 246 190 14 246 190 14
44559 -246 190 14 246 190 14 246 190 14 246 190 14
44560 -246 190 14 246 190 14 241 196 14 226 184 13
44561 - 61 42 6 2 2 6 2 2 6 2 2 6
44562 - 22 22 22 238 238 238 253 253 253 253 253 253
44563 -253 253 253 253 253 253 253 253 253 253 253 253
44564 -253 253 253 253 253 253 253 253 253 253 253 253
44565 -253 253 253 253 253 253 253 253 253 253 253 253
44566 -253 253 253 226 226 226 187 187 187 180 133 36
44567 -216 158 10 236 178 12 239 182 13 236 178 12
44568 -230 174 11 226 170 11 226 170 11 230 174 11
44569 -236 178 12 242 186 14 246 190 14 246 190 14
44570 -246 190 14 246 190 14 246 186 14 239 182 13
44571 -206 162 42 106 106 106 66 66 66 34 34 34
44572 - 14 14 14 6 6 6 0 0 0 0 0 0
44573 - 0 0 0 0 0 0 0 0 0 0 0 0
44574 - 0 0 0 0 0 0 0 0 0 0 0 0
44575 - 0 0 0 0 0 0 0 0 0 6 6 6
44576 - 26 26 26 70 70 70 163 133 67 213 154 11
44577 -236 178 12 246 190 14 246 190 14 246 190 14
44578 -246 190 14 246 190 14 246 190 14 246 190 14
44579 -246 190 14 246 190 14 246 190 14 246 190 14
44580 -246 190 14 246 190 14 246 190 14 241 196 14
44581 -190 146 13 18 14 6 2 2 6 2 2 6
44582 - 46 46 46 246 246 246 253 253 253 253 253 253
44583 -253 253 253 253 253 253 253 253 253 253 253 253
44584 -253 253 253 253 253 253 253 253 253 253 253 253
44585 -253 253 253 253 253 253 253 253 253 253 253 253
44586 -253 253 253 221 221 221 86 86 86 156 107 11
44587 -216 158 10 236 178 12 242 186 14 246 186 14
44588 -242 186 14 239 182 13 239 182 13 242 186 14
44589 -242 186 14 246 186 14 246 190 14 246 190 14
44590 -246 190 14 246 190 14 246 190 14 246 190 14
44591 -242 186 14 225 175 15 142 122 72 66 66 66
44592 - 30 30 30 10 10 10 0 0 0 0 0 0
44593 - 0 0 0 0 0 0 0 0 0 0 0 0
44594 - 0 0 0 0 0 0 0 0 0 0 0 0
44595 - 0 0 0 0 0 0 0 0 0 6 6 6
44596 - 26 26 26 70 70 70 163 133 67 210 150 10
44597 -236 178 12 246 190 14 246 190 14 246 190 14
44598 -246 190 14 246 190 14 246 190 14 246 190 14
44599 -246 190 14 246 190 14 246 190 14 246 190 14
44600 -246 190 14 246 190 14 246 190 14 246 190 14
44601 -232 195 16 121 92 8 34 34 34 106 106 106
44602 -221 221 221 253 253 253 253 253 253 253 253 253
44603 -253 253 253 253 253 253 253 253 253 253 253 253
44604 -253 253 253 253 253 253 253 253 253 253 253 253
44605 -253 253 253 253 253 253 253 253 253 253 253 253
44606 -242 242 242 82 82 82 18 14 6 163 110 8
44607 -216 158 10 236 178 12 242 186 14 246 190 14
44608 -246 190 14 246 190 14 246 190 14 246 190 14
44609 -246 190 14 246 190 14 246 190 14 246 190 14
44610 -246 190 14 246 190 14 246 190 14 246 190 14
44611 -246 190 14 246 190 14 242 186 14 163 133 67
44612 - 46 46 46 18 18 18 6 6 6 0 0 0
44613 - 0 0 0 0 0 0 0 0 0 0 0 0
44614 - 0 0 0 0 0 0 0 0 0 0 0 0
44615 - 0 0 0 0 0 0 0 0 0 10 10 10
44616 - 30 30 30 78 78 78 163 133 67 210 150 10
44617 -236 178 12 246 186 14 246 190 14 246 190 14
44618 -246 190 14 246 190 14 246 190 14 246 190 14
44619 -246 190 14 246 190 14 246 190 14 246 190 14
44620 -246 190 14 246 190 14 246 190 14 246 190 14
44621 -241 196 14 215 174 15 190 178 144 253 253 253
44622 -253 253 253 253 253 253 253 253 253 253 253 253
44623 -253 253 253 253 253 253 253 253 253 253 253 253
44624 -253 253 253 253 253 253 253 253 253 253 253 253
44625 -253 253 253 253 253 253 253 253 253 218 218 218
44626 - 58 58 58 2 2 6 22 18 6 167 114 7
44627 -216 158 10 236 178 12 246 186 14 246 190 14
44628 -246 190 14 246 190 14 246 190 14 246 190 14
44629 -246 190 14 246 190 14 246 190 14 246 190 14
44630 -246 190 14 246 190 14 246 190 14 246 190 14
44631 -246 190 14 246 186 14 242 186 14 190 150 46
44632 - 54 54 54 22 22 22 6 6 6 0 0 0
44633 - 0 0 0 0 0 0 0 0 0 0 0 0
44634 - 0 0 0 0 0 0 0 0 0 0 0 0
44635 - 0 0 0 0 0 0 0 0 0 14 14 14
44636 - 38 38 38 86 86 86 180 133 36 213 154 11
44637 -236 178 12 246 186 14 246 190 14 246 190 14
44638 -246 190 14 246 190 14 246 190 14 246 190 14
44639 -246 190 14 246 190 14 246 190 14 246 190 14
44640 -246 190 14 246 190 14 246 190 14 246 190 14
44641 -246 190 14 232 195 16 190 146 13 214 214 214
44642 -253 253 253 253 253 253 253 253 253 253 253 253
44643 -253 253 253 253 253 253 253 253 253 253 253 253
44644 -253 253 253 253 253 253 253 253 253 253 253 253
44645 -253 253 253 250 250 250 170 170 170 26 26 26
44646 - 2 2 6 2 2 6 37 26 9 163 110 8
44647 -219 162 10 239 182 13 246 186 14 246 190 14
44648 -246 190 14 246 190 14 246 190 14 246 190 14
44649 -246 190 14 246 190 14 246 190 14 246 190 14
44650 -246 190 14 246 190 14 246 190 14 246 190 14
44651 -246 186 14 236 178 12 224 166 10 142 122 72
44652 - 46 46 46 18 18 18 6 6 6 0 0 0
44653 - 0 0 0 0 0 0 0 0 0 0 0 0
44654 - 0 0 0 0 0 0 0 0 0 0 0 0
44655 - 0 0 0 0 0 0 6 6 6 18 18 18
44656 - 50 50 50 109 106 95 192 133 9 224 166 10
44657 -242 186 14 246 190 14 246 190 14 246 190 14
44658 -246 190 14 246 190 14 246 190 14 246 190 14
44659 -246 190 14 246 190 14 246 190 14 246 190 14
44660 -246 190 14 246 190 14 246 190 14 246 190 14
44661 -242 186 14 226 184 13 210 162 10 142 110 46
44662 -226 226 226 253 253 253 253 253 253 253 253 253
44663 -253 253 253 253 253 253 253 253 253 253 253 253
44664 -253 253 253 253 253 253 253 253 253 253 253 253
44665 -198 198 198 66 66 66 2 2 6 2 2 6
44666 - 2 2 6 2 2 6 50 34 6 156 107 11
44667 -219 162 10 239 182 13 246 186 14 246 190 14
44668 -246 190 14 246 190 14 246 190 14 246 190 14
44669 -246 190 14 246 190 14 246 190 14 246 190 14
44670 -246 190 14 246 190 14 246 190 14 242 186 14
44671 -234 174 13 213 154 11 154 122 46 66 66 66
44672 - 30 30 30 10 10 10 0 0 0 0 0 0
44673 - 0 0 0 0 0 0 0 0 0 0 0 0
44674 - 0 0 0 0 0 0 0 0 0 0 0 0
44675 - 0 0 0 0 0 0 6 6 6 22 22 22
44676 - 58 58 58 154 121 60 206 145 10 234 174 13
44677 -242 186 14 246 186 14 246 190 14 246 190 14
44678 -246 190 14 246 190 14 246 190 14 246 190 14
44679 -246 190 14 246 190 14 246 190 14 246 190 14
44680 -246 190 14 246 190 14 246 190 14 246 190 14
44681 -246 186 14 236 178 12 210 162 10 163 110 8
44682 - 61 42 6 138 138 138 218 218 218 250 250 250
44683 -253 253 253 253 253 253 253 253 253 250 250 250
44684 -242 242 242 210 210 210 144 144 144 66 66 66
44685 - 6 6 6 2 2 6 2 2 6 2 2 6
44686 - 2 2 6 2 2 6 61 42 6 163 110 8
44687 -216 158 10 236 178 12 246 190 14 246 190 14
44688 -246 190 14 246 190 14 246 190 14 246 190 14
44689 -246 190 14 246 190 14 246 190 14 246 190 14
44690 -246 190 14 239 182 13 230 174 11 216 158 10
44691 -190 142 34 124 112 88 70 70 70 38 38 38
44692 - 18 18 18 6 6 6 0 0 0 0 0 0
44693 - 0 0 0 0 0 0 0 0 0 0 0 0
44694 - 0 0 0 0 0 0 0 0 0 0 0 0
44695 - 0 0 0 0 0 0 6 6 6 22 22 22
44696 - 62 62 62 168 124 44 206 145 10 224 166 10
44697 -236 178 12 239 182 13 242 186 14 242 186 14
44698 -246 186 14 246 190 14 246 190 14 246 190 14
44699 -246 190 14 246 190 14 246 190 14 246 190 14
44700 -246 190 14 246 190 14 246 190 14 246 190 14
44701 -246 190 14 236 178 12 216 158 10 175 118 6
44702 - 80 54 7 2 2 6 6 6 6 30 30 30
44703 - 54 54 54 62 62 62 50 50 50 38 38 38
44704 - 14 14 14 2 2 6 2 2 6 2 2 6
44705 - 2 2 6 2 2 6 2 2 6 2 2 6
44706 - 2 2 6 6 6 6 80 54 7 167 114 7
44707 -213 154 11 236 178 12 246 190 14 246 190 14
44708 -246 190 14 246 190 14 246 190 14 246 190 14
44709 -246 190 14 242 186 14 239 182 13 239 182 13
44710 -230 174 11 210 150 10 174 135 50 124 112 88
44711 - 82 82 82 54 54 54 34 34 34 18 18 18
44712 - 6 6 6 0 0 0 0 0 0 0 0 0
44713 - 0 0 0 0 0 0 0 0 0 0 0 0
44714 - 0 0 0 0 0 0 0 0 0 0 0 0
44715 - 0 0 0 0 0 0 6 6 6 18 18 18
44716 - 50 50 50 158 118 36 192 133 9 200 144 11
44717 -216 158 10 219 162 10 224 166 10 226 170 11
44718 -230 174 11 236 178 12 239 182 13 239 182 13
44719 -242 186 14 246 186 14 246 190 14 246 190 14
44720 -246 190 14 246 190 14 246 190 14 246 190 14
44721 -246 186 14 230 174 11 210 150 10 163 110 8
44722 -104 69 6 10 10 10 2 2 6 2 2 6
44723 - 2 2 6 2 2 6 2 2 6 2 2 6
44724 - 2 2 6 2 2 6 2 2 6 2 2 6
44725 - 2 2 6 2 2 6 2 2 6 2 2 6
44726 - 2 2 6 6 6 6 91 60 6 167 114 7
44727 -206 145 10 230 174 11 242 186 14 246 190 14
44728 -246 190 14 246 190 14 246 186 14 242 186 14
44729 -239 182 13 230 174 11 224 166 10 213 154 11
44730 -180 133 36 124 112 88 86 86 86 58 58 58
44731 - 38 38 38 22 22 22 10 10 10 6 6 6
44732 - 0 0 0 0 0 0 0 0 0 0 0 0
44733 - 0 0 0 0 0 0 0 0 0 0 0 0
44734 - 0 0 0 0 0 0 0 0 0 0 0 0
44735 - 0 0 0 0 0 0 0 0 0 14 14 14
44736 - 34 34 34 70 70 70 138 110 50 158 118 36
44737 -167 114 7 180 123 7 192 133 9 197 138 11
44738 -200 144 11 206 145 10 213 154 11 219 162 10
44739 -224 166 10 230 174 11 239 182 13 242 186 14
44740 -246 186 14 246 186 14 246 186 14 246 186 14
44741 -239 182 13 216 158 10 185 133 11 152 99 6
44742 -104 69 6 18 14 6 2 2 6 2 2 6
44743 - 2 2 6 2 2 6 2 2 6 2 2 6
44744 - 2 2 6 2 2 6 2 2 6 2 2 6
44745 - 2 2 6 2 2 6 2 2 6 2 2 6
44746 - 2 2 6 6 6 6 80 54 7 152 99 6
44747 -192 133 9 219 162 10 236 178 12 239 182 13
44748 -246 186 14 242 186 14 239 182 13 236 178 12
44749 -224 166 10 206 145 10 192 133 9 154 121 60
44750 - 94 94 94 62 62 62 42 42 42 22 22 22
44751 - 14 14 14 6 6 6 0 0 0 0 0 0
44752 - 0 0 0 0 0 0 0 0 0 0 0 0
44753 - 0 0 0 0 0 0 0 0 0 0 0 0
44754 - 0 0 0 0 0 0 0 0 0 0 0 0
44755 - 0 0 0 0 0 0 0 0 0 6 6 6
44756 - 18 18 18 34 34 34 58 58 58 78 78 78
44757 -101 98 89 124 112 88 142 110 46 156 107 11
44758 -163 110 8 167 114 7 175 118 6 180 123 7
44759 -185 133 11 197 138 11 210 150 10 219 162 10
44760 -226 170 11 236 178 12 236 178 12 234 174 13
44761 -219 162 10 197 138 11 163 110 8 130 83 6
44762 - 91 60 6 10 10 10 2 2 6 2 2 6
44763 - 18 18 18 38 38 38 38 38 38 38 38 38
44764 - 38 38 38 38 38 38 38 38 38 38 38 38
44765 - 38 38 38 38 38 38 26 26 26 2 2 6
44766 - 2 2 6 6 6 6 70 47 6 137 92 6
44767 -175 118 6 200 144 11 219 162 10 230 174 11
44768 -234 174 13 230 174 11 219 162 10 210 150 10
44769 -192 133 9 163 110 8 124 112 88 82 82 82
44770 - 50 50 50 30 30 30 14 14 14 6 6 6
44771 - 0 0 0 0 0 0 0 0 0 0 0 0
44772 - 0 0 0 0 0 0 0 0 0 0 0 0
44773 - 0 0 0 0 0 0 0 0 0 0 0 0
44774 - 0 0 0 0 0 0 0 0 0 0 0 0
44775 - 0 0 0 0 0 0 0 0 0 0 0 0
44776 - 6 6 6 14 14 14 22 22 22 34 34 34
44777 - 42 42 42 58 58 58 74 74 74 86 86 86
44778 -101 98 89 122 102 70 130 98 46 121 87 25
44779 -137 92 6 152 99 6 163 110 8 180 123 7
44780 -185 133 11 197 138 11 206 145 10 200 144 11
44781 -180 123 7 156 107 11 130 83 6 104 69 6
44782 - 50 34 6 54 54 54 110 110 110 101 98 89
44783 - 86 86 86 82 82 82 78 78 78 78 78 78
44784 - 78 78 78 78 78 78 78 78 78 78 78 78
44785 - 78 78 78 82 82 82 86 86 86 94 94 94
44786 -106 106 106 101 101 101 86 66 34 124 80 6
44787 -156 107 11 180 123 7 192 133 9 200 144 11
44788 -206 145 10 200 144 11 192 133 9 175 118 6
44789 -139 102 15 109 106 95 70 70 70 42 42 42
44790 - 22 22 22 10 10 10 0 0 0 0 0 0
44791 - 0 0 0 0 0 0 0 0 0 0 0 0
44792 - 0 0 0 0 0 0 0 0 0 0 0 0
44793 - 0 0 0 0 0 0 0 0 0 0 0 0
44794 - 0 0 0 0 0 0 0 0 0 0 0 0
44795 - 0 0 0 0 0 0 0 0 0 0 0 0
44796 - 0 0 0 0 0 0 6 6 6 10 10 10
44797 - 14 14 14 22 22 22 30 30 30 38 38 38
44798 - 50 50 50 62 62 62 74 74 74 90 90 90
44799 -101 98 89 112 100 78 121 87 25 124 80 6
44800 -137 92 6 152 99 6 152 99 6 152 99 6
44801 -138 86 6 124 80 6 98 70 6 86 66 30
44802 -101 98 89 82 82 82 58 58 58 46 46 46
44803 - 38 38 38 34 34 34 34 34 34 34 34 34
44804 - 34 34 34 34 34 34 34 34 34 34 34 34
44805 - 34 34 34 34 34 34 38 38 38 42 42 42
44806 - 54 54 54 82 82 82 94 86 76 91 60 6
44807 -134 86 6 156 107 11 167 114 7 175 118 6
44808 -175 118 6 167 114 7 152 99 6 121 87 25
44809 -101 98 89 62 62 62 34 34 34 18 18 18
44810 - 6 6 6 0 0 0 0 0 0 0 0 0
44811 - 0 0 0 0 0 0 0 0 0 0 0 0
44812 - 0 0 0 0 0 0 0 0 0 0 0 0
44813 - 0 0 0 0 0 0 0 0 0 0 0 0
44814 - 0 0 0 0 0 0 0 0 0 0 0 0
44815 - 0 0 0 0 0 0 0 0 0 0 0 0
44816 - 0 0 0 0 0 0 0 0 0 0 0 0
44817 - 0 0 0 6 6 6 6 6 6 10 10 10
44818 - 18 18 18 22 22 22 30 30 30 42 42 42
44819 - 50 50 50 66 66 66 86 86 86 101 98 89
44820 -106 86 58 98 70 6 104 69 6 104 69 6
44821 -104 69 6 91 60 6 82 62 34 90 90 90
44822 - 62 62 62 38 38 38 22 22 22 14 14 14
44823 - 10 10 10 10 10 10 10 10 10 10 10 10
44824 - 10 10 10 10 10 10 6 6 6 10 10 10
44825 - 10 10 10 10 10 10 10 10 10 14 14 14
44826 - 22 22 22 42 42 42 70 70 70 89 81 66
44827 - 80 54 7 104 69 6 124 80 6 137 92 6
44828 -134 86 6 116 81 8 100 82 52 86 86 86
44829 - 58 58 58 30 30 30 14 14 14 6 6 6
44830 - 0 0 0 0 0 0 0 0 0 0 0 0
44831 - 0 0 0 0 0 0 0 0 0 0 0 0
44832 - 0 0 0 0 0 0 0 0 0 0 0 0
44833 - 0 0 0 0 0 0 0 0 0 0 0 0
44834 - 0 0 0 0 0 0 0 0 0 0 0 0
44835 - 0 0 0 0 0 0 0 0 0 0 0 0
44836 - 0 0 0 0 0 0 0 0 0 0 0 0
44837 - 0 0 0 0 0 0 0 0 0 0 0 0
44838 - 0 0 0 6 6 6 10 10 10 14 14 14
44839 - 18 18 18 26 26 26 38 38 38 54 54 54
44840 - 70 70 70 86 86 86 94 86 76 89 81 66
44841 - 89 81 66 86 86 86 74 74 74 50 50 50
44842 - 30 30 30 14 14 14 6 6 6 0 0 0
44843 - 0 0 0 0 0 0 0 0 0 0 0 0
44844 - 0 0 0 0 0 0 0 0 0 0 0 0
44845 - 0 0 0 0 0 0 0 0 0 0 0 0
44846 - 6 6 6 18 18 18 34 34 34 58 58 58
44847 - 82 82 82 89 81 66 89 81 66 89 81 66
44848 - 94 86 66 94 86 76 74 74 74 50 50 50
44849 - 26 26 26 14 14 14 6 6 6 0 0 0
44850 - 0 0 0 0 0 0 0 0 0 0 0 0
44851 - 0 0 0 0 0 0 0 0 0 0 0 0
44852 - 0 0 0 0 0 0 0 0 0 0 0 0
44853 - 0 0 0 0 0 0 0 0 0 0 0 0
44854 - 0 0 0 0 0 0 0 0 0 0 0 0
44855 - 0 0 0 0 0 0 0 0 0 0 0 0
44856 - 0 0 0 0 0 0 0 0 0 0 0 0
44857 - 0 0 0 0 0 0 0 0 0 0 0 0
44858 - 0 0 0 0 0 0 0 0 0 0 0 0
44859 - 6 6 6 6 6 6 14 14 14 18 18 18
44860 - 30 30 30 38 38 38 46 46 46 54 54 54
44861 - 50 50 50 42 42 42 30 30 30 18 18 18
44862 - 10 10 10 0 0 0 0 0 0 0 0 0
44863 - 0 0 0 0 0 0 0 0 0 0 0 0
44864 - 0 0 0 0 0 0 0 0 0 0 0 0
44865 - 0 0 0 0 0 0 0 0 0 0 0 0
44866 - 0 0 0 6 6 6 14 14 14 26 26 26
44867 - 38 38 38 50 50 50 58 58 58 58 58 58
44868 - 54 54 54 42 42 42 30 30 30 18 18 18
44869 - 10 10 10 0 0 0 0 0 0 0 0 0
44870 - 0 0 0 0 0 0 0 0 0 0 0 0
44871 - 0 0 0 0 0 0 0 0 0 0 0 0
44872 - 0 0 0 0 0 0 0 0 0 0 0 0
44873 - 0 0 0 0 0 0 0 0 0 0 0 0
44874 - 0 0 0 0 0 0 0 0 0 0 0 0
44875 - 0 0 0 0 0 0 0 0 0 0 0 0
44876 - 0 0 0 0 0 0 0 0 0 0 0 0
44877 - 0 0 0 0 0 0 0 0 0 0 0 0
44878 - 0 0 0 0 0 0 0 0 0 0 0 0
44879 - 0 0 0 0 0 0 0 0 0 6 6 6
44880 - 6 6 6 10 10 10 14 14 14 18 18 18
44881 - 18 18 18 14 14 14 10 10 10 6 6 6
44882 - 0 0 0 0 0 0 0 0 0 0 0 0
44883 - 0 0 0 0 0 0 0 0 0 0 0 0
44884 - 0 0 0 0 0 0 0 0 0 0 0 0
44885 - 0 0 0 0 0 0 0 0 0 0 0 0
44886 - 0 0 0 0 0 0 0 0 0 6 6 6
44887 - 14 14 14 18 18 18 22 22 22 22 22 22
44888 - 18 18 18 14 14 14 10 10 10 6 6 6
44889 - 0 0 0 0 0 0 0 0 0 0 0 0
44890 - 0 0 0 0 0 0 0 0 0 0 0 0
44891 - 0 0 0 0 0 0 0 0 0 0 0 0
44892 - 0 0 0 0 0 0 0 0 0 0 0 0
44893 - 0 0 0 0 0 0 0 0 0 0 0 0
44894 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
44895 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
44896 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
44897 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
44898 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
44899 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
44900 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
44901 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
44902 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
44903 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
44904 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
44905 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
44906 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
44907 +4 4 4 4 4 4
44908 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
44909 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
44910 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
44911 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
44912 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
44913 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
44914 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
44915 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
44916 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
44917 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
44918 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
44919 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
44920 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
44921 +4 4 4 4 4 4
44922 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
44923 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
44924 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
44925 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
44926 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
44927 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
44928 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
44929 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
44930 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
44931 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
44932 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
44933 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
44934 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
44935 +4 4 4 4 4 4
44936 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
44937 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
44938 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
44939 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
44940 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
44941 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
44942 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
44943 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
44944 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
44945 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
44946 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
44947 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
44948 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
44949 +4 4 4 4 4 4
44950 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
44951 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
44952 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
44953 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
44954 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
44955 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
44956 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
44957 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
44958 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
44959 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
44960 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
44961 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
44962 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
44963 +4 4 4 4 4 4
44964 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
44965 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
44966 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
44967 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
44968 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
44969 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
44970 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
44971 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
44972 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
44973 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
44974 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
44975 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
44976 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
44977 +4 4 4 4 4 4
44978 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
44979 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
44980 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
44981 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
44982 +4 4 4 4 4 4 4 4 4 3 3 3 0 0 0 0 0 0
44983 +0 0 0 0 0 0 0 0 0 0 0 0 3 3 3 4 4 4
44984 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
44985 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
44986 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
44987 +4 4 4 4 4 4 4 4 4 4 4 4 1 1 1 0 0 0
44988 +0 0 0 3 3 3 4 4 4 4 4 4 4 4 4 4 4 4
44989 +4 4 4 4 4 4 4 4 4 2 1 0 2 1 0 3 2 2
44990 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
44991 +4 4 4 4 4 4
44992 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
44993 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
44994 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
44995 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
44996 +4 4 4 4 4 4 2 2 2 0 0 0 3 4 3 26 28 28
44997 +37 38 37 37 38 37 14 17 19 2 2 2 0 0 0 2 2 2
44998 +5 5 5 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
44999 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
45000 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
45001 +4 4 4 4 4 4 3 3 3 0 0 0 1 1 1 6 6 6
45002 +2 2 2 0 0 0 3 3 3 4 4 4 4 4 4 4 4 4
45003 +4 4 5 3 3 3 1 0 0 0 0 0 1 0 0 0 0 0
45004 +1 1 1 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
45005 +4 4 4 4 4 4
45006 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
45007 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
45008 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
45009 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
45010 +2 2 2 0 0 0 0 0 0 14 17 19 60 74 84 137 136 137
45011 +153 152 153 137 136 137 125 124 125 60 73 81 6 6 6 3 1 0
45012 +0 0 0 3 3 3 4 4 4 4 4 4 4 4 4 4 4 4
45013 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
45014 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
45015 +4 4 4 4 4 4 0 0 0 4 4 4 41 54 63 125 124 125
45016 +60 73 81 6 6 6 4 0 0 3 3 3 4 4 4 4 4 4
45017 +4 4 4 0 0 0 6 9 11 41 54 63 41 65 82 22 30 35
45018 +2 2 2 2 1 0 4 4 4 4 4 4 4 4 4 4 4 4
45019 +4 4 4 4 4 4
45020 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
45021 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
45022 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
45023 +4 4 4 4 4 4 5 5 5 5 5 5 2 2 2 0 0 0
45024 +4 0 0 6 6 6 41 54 63 137 136 137 174 174 174 167 166 167
45025 +165 164 165 165 164 165 163 162 163 163 162 163 125 124 125 41 54 63
45026 +1 1 1 0 0 0 0 0 0 3 3 3 5 5 5 4 4 4
45027 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
45028 +4 4 4 4 4 4 4 4 4 4 4 4 5 5 5 5 5 5
45029 +3 3 3 2 0 0 4 0 0 60 73 81 156 155 156 167 166 167
45030 +163 162 163 85 115 134 5 7 8 0 0 0 4 4 4 5 5 5
45031 +0 0 0 2 5 5 55 98 126 90 154 193 90 154 193 72 125 159
45032 +37 51 59 2 0 0 1 1 1 4 5 5 4 4 4 4 4 4
45033 +4 4 4 4 4 4
45034 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
45035 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
45036 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
45037 +4 4 4 5 5 5 4 4 4 1 1 1 0 0 0 3 3 3
45038 +37 38 37 125 124 125 163 162 163 174 174 174 158 157 158 158 157 158
45039 +156 155 156 156 155 156 158 157 158 165 164 165 174 174 174 166 165 166
45040 +125 124 125 16 19 21 1 0 0 0 0 0 0 0 0 4 4 4
45041 +5 5 5 5 5 5 4 4 4 4 4 4 4 4 4 4 4 4
45042 +4 4 4 4 4 4 4 4 4 5 5 5 5 5 5 1 1 1
45043 +0 0 0 0 0 0 37 38 37 153 152 153 174 174 174 158 157 158
45044 +174 174 174 163 162 163 37 38 37 4 3 3 4 0 0 1 1 1
45045 +0 0 0 22 40 52 101 161 196 101 161 196 90 154 193 101 161 196
45046 +64 123 161 14 17 19 0 0 0 4 4 4 4 4 4 4 4 4
45047 +4 4 4 4 4 4
45048 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
45049 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
45050 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 5 5 5
45051 +5 5 5 2 2 2 0 0 0 4 0 0 24 26 27 85 115 134
45052 +156 155 156 174 174 174 167 166 167 156 155 156 154 153 154 157 156 157
45053 +156 155 156 156 155 156 155 154 155 153 152 153 158 157 158 167 166 167
45054 +174 174 174 156 155 156 60 74 84 16 19 21 0 0 0 0 0 0
45055 +1 1 1 5 5 5 5 5 5 4 4 4 4 4 4 4 4 4
45056 +4 4 4 5 5 5 6 6 6 3 3 3 0 0 0 4 0 0
45057 +13 16 17 60 73 81 137 136 137 165 164 165 156 155 156 153 152 153
45058 +174 174 174 177 184 187 60 73 81 3 1 0 0 0 0 1 1 2
45059 +22 30 35 64 123 161 136 185 209 90 154 193 90 154 193 90 154 193
45060 +90 154 193 21 29 34 0 0 0 3 2 2 4 4 5 4 4 4
45061 +4 4 4 4 4 4
45062 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
45063 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
45064 +4 4 4 4 4 4 4 4 4 4 4 4 5 5 5 3 3 3
45065 +0 0 0 0 0 0 10 13 16 60 74 84 157 156 157 174 174 174
45066 +174 174 174 158 157 158 153 152 153 154 153 154 156 155 156 155 154 155
45067 +156 155 156 155 154 155 154 153 154 157 156 157 154 153 154 153 152 153
45068 +163 162 163 174 174 174 177 184 187 137 136 137 60 73 81 13 16 17
45069 +4 0 0 0 0 0 3 3 3 5 5 5 4 4 4 4 4 4
45070 +5 5 5 4 4 4 1 1 1 0 0 0 3 3 3 41 54 63
45071 +131 129 131 174 174 174 174 174 174 174 174 174 167 166 167 174 174 174
45072 +190 197 201 137 136 137 24 26 27 4 0 0 16 21 25 50 82 103
45073 +90 154 193 136 185 209 90 154 193 101 161 196 101 161 196 101 161 196
45074 +31 91 132 3 6 7 0 0 0 4 4 4 4 4 4 4 4 4
45075 +4 4 4 4 4 4
45076 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
45077 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
45078 +4 4 4 4 4 4 4 4 4 2 2 2 0 0 0 4 0 0
45079 +4 0 0 43 57 68 137 136 137 177 184 187 174 174 174 163 162 163
45080 +155 154 155 155 154 155 156 155 156 155 154 155 158 157 158 165 164 165
45081 +167 166 167 166 165 166 163 162 163 157 156 157 155 154 155 155 154 155
45082 +153 152 153 156 155 156 167 166 167 174 174 174 174 174 174 131 129 131
45083 +41 54 63 5 5 5 0 0 0 0 0 0 3 3 3 4 4 4
45084 +1 1 1 0 0 0 1 0 0 26 28 28 125 124 125 174 174 174
45085 +177 184 187 174 174 174 174 174 174 156 155 156 131 129 131 137 136 137
45086 +125 124 125 24 26 27 4 0 0 41 65 82 90 154 193 136 185 209
45087 +136 185 209 101 161 196 53 118 160 37 112 160 90 154 193 34 86 122
45088 +7 12 15 0 0 0 4 4 4 4 4 4 4 4 4 4 4 4
45089 +4 4 4 4 4 4
45090 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
45091 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
45092 +4 4 4 3 3 3 0 0 0 0 0 0 5 5 5 37 38 37
45093 +125 124 125 167 166 167 174 174 174 167 166 167 158 157 158 155 154 155
45094 +156 155 156 156 155 156 156 155 156 163 162 163 167 166 167 155 154 155
45095 +137 136 137 153 152 153 156 155 156 165 164 165 163 162 163 156 155 156
45096 +156 155 156 156 155 156 155 154 155 158 157 158 166 165 166 174 174 174
45097 +167 166 167 125 124 125 37 38 37 1 0 0 0 0 0 0 0 0
45098 +0 0 0 24 26 27 60 74 84 158 157 158 174 174 174 174 174 174
45099 +166 165 166 158 157 158 125 124 125 41 54 63 13 16 17 6 6 6
45100 +6 6 6 37 38 37 80 127 157 136 185 209 101 161 196 101 161 196
45101 +90 154 193 28 67 93 6 10 14 13 20 25 13 20 25 6 10 14
45102 +1 1 2 4 3 3 4 4 4 4 4 4 4 4 4 4 4 4
45103 +4 4 4 4 4 4
45104 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
45105 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
45106 +1 1 1 1 0 0 4 3 3 37 38 37 60 74 84 153 152 153
45107 +167 166 167 167 166 167 158 157 158 154 153 154 155 154 155 156 155 156
45108 +157 156 157 158 157 158 167 166 167 167 166 167 131 129 131 43 57 68
45109 +26 28 28 37 38 37 60 73 81 131 129 131 165 164 165 166 165 166
45110 +158 157 158 155 154 155 156 155 156 156 155 156 156 155 156 158 157 158
45111 +165 164 165 174 174 174 163 162 163 60 74 84 16 19 21 13 16 17
45112 +60 73 81 131 129 131 174 174 174 174 174 174 167 166 167 165 164 165
45113 +137 136 137 60 73 81 24 26 27 4 0 0 4 0 0 16 19 21
45114 +52 104 138 101 161 196 136 185 209 136 185 209 90 154 193 27 99 146
45115 +13 20 25 4 5 7 2 5 5 4 5 7 1 1 2 0 0 0
45116 +4 4 4 4 4 4 3 3 3 2 2 2 2 2 2 4 4 4
45117 +4 4 4 4 4 4
45118 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
45119 +4 4 4 4 4 4 4 4 4 4 4 4 3 3 3 0 0 0
45120 +0 0 0 13 16 17 60 73 81 137 136 137 174 174 174 166 165 166
45121 +158 157 158 156 155 156 157 156 157 156 155 156 155 154 155 158 157 158
45122 +167 166 167 174 174 174 153 152 153 60 73 81 16 19 21 4 0 0
45123 +4 0 0 4 0 0 6 6 6 26 28 28 60 74 84 158 157 158
45124 +174 174 174 166 165 166 157 156 157 155 154 155 156 155 156 156 155 156
45125 +155 154 155 158 157 158 167 166 167 167 166 167 131 129 131 125 124 125
45126 +137 136 137 167 166 167 167 166 167 174 174 174 158 157 158 125 124 125
45127 +16 19 21 4 0 0 4 0 0 10 13 16 49 76 92 107 159 188
45128 +136 185 209 136 185 209 90 154 193 26 108 161 22 40 52 6 10 14
45129 +2 3 3 1 1 2 1 1 2 4 4 5 4 4 5 4 4 5
45130 +4 4 5 2 2 1 0 0 0 0 0 0 0 0 0 2 2 2
45131 +4 4 4 4 4 4
45132 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
45133 +4 4 4 5 5 5 3 3 3 0 0 0 1 0 0 4 0 0
45134 +37 51 59 131 129 131 167 166 167 167 166 167 163 162 163 157 156 157
45135 +157 156 157 155 154 155 153 152 153 157 156 157 167 166 167 174 174 174
45136 +153 152 153 125 124 125 37 38 37 4 0 0 4 0 0 4 0 0
45137 +4 3 3 4 3 3 4 0 0 6 6 6 4 0 0 37 38 37
45138 +125 124 125 174 174 174 174 174 174 165 164 165 156 155 156 154 153 154
45139 +156 155 156 156 155 156 155 154 155 163 162 163 158 157 158 163 162 163
45140 +174 174 174 174 174 174 174 174 174 125 124 125 37 38 37 0 0 0
45141 +4 0 0 6 9 11 41 54 63 90 154 193 136 185 209 146 190 211
45142 +136 185 209 37 112 160 22 40 52 6 10 14 3 6 7 1 1 2
45143 +1 1 2 3 3 3 1 1 2 3 3 3 4 4 4 4 4 4
45144 +2 2 2 2 0 0 16 19 21 37 38 37 24 26 27 0 0 0
45145 +0 0 0 4 4 4
45146 +4 4 4 4 4 4 4 4 4 4 4 4 5 5 5 5 5 5
45147 +4 4 4 0 0 0 0 0 0 0 0 0 26 28 28 120 125 127
45148 +158 157 158 174 174 174 165 164 165 157 156 157 155 154 155 156 155 156
45149 +153 152 153 153 152 153 167 166 167 174 174 174 174 174 174 125 124 125
45150 +37 38 37 4 0 0 0 0 0 4 0 0 4 3 3 4 4 4
45151 +4 4 4 4 4 4 5 5 5 4 0 0 4 0 0 4 0 0
45152 +4 3 3 43 57 68 137 136 137 174 174 174 174 174 174 165 164 165
45153 +154 153 154 153 152 153 153 152 153 153 152 153 163 162 163 174 174 174
45154 +174 174 174 153 152 153 60 73 81 6 6 6 4 0 0 4 3 3
45155 +32 43 50 80 127 157 136 185 209 146 190 211 146 190 211 90 154 193
45156 +28 67 93 28 67 93 40 71 93 3 6 7 1 1 2 2 5 5
45157 +50 82 103 79 117 143 26 37 45 0 0 0 3 3 3 1 1 1
45158 +0 0 0 41 54 63 137 136 137 174 174 174 153 152 153 60 73 81
45159 +2 0 0 0 0 0
45160 +4 4 4 4 4 4 4 4 4 4 4 4 6 6 6 2 2 2
45161 +0 0 0 2 0 0 24 26 27 60 74 84 153 152 153 174 174 174
45162 +174 174 174 157 156 157 154 153 154 156 155 156 154 153 154 153 152 153
45163 +165 164 165 174 174 174 177 184 187 137 136 137 43 57 68 6 6 6
45164 +4 0 0 2 0 0 3 3 3 5 5 5 5 5 5 4 4 4
45165 +4 4 4 4 4 4 4 4 4 5 5 5 6 6 6 4 3 3
45166 +4 0 0 4 0 0 24 26 27 60 73 81 153 152 153 174 174 174
45167 +174 174 174 158 157 158 158 157 158 174 174 174 174 174 174 158 157 158
45168 +60 74 84 24 26 27 4 0 0 4 0 0 17 23 27 59 113 148
45169 +136 185 209 191 222 234 146 190 211 136 185 209 31 91 132 7 11 13
45170 +22 40 52 101 161 196 90 154 193 6 9 11 3 4 4 43 95 132
45171 +136 185 209 172 205 220 55 98 126 0 0 0 0 0 0 2 0 0
45172 +26 28 28 153 152 153 177 184 187 167 166 167 177 184 187 165 164 165
45173 +37 38 37 0 0 0
45174 +4 4 4 4 4 4 5 5 5 5 5 5 1 1 1 0 0 0
45175 +13 16 17 60 73 81 137 136 137 174 174 174 174 174 174 165 164 165
45176 +153 152 153 153 152 153 155 154 155 154 153 154 158 157 158 174 174 174
45177 +177 184 187 163 162 163 60 73 81 16 19 21 4 0 0 4 0 0
45178 +4 3 3 4 4 4 5 5 5 5 5 5 4 4 4 5 5 5
45179 +5 5 5 5 5 5 5 5 5 4 4 4 4 4 4 5 5 5
45180 +6 6 6 4 0 0 4 0 0 4 0 0 24 26 27 60 74 84
45181 +166 165 166 174 174 174 177 184 187 165 164 165 125 124 125 24 26 27
45182 +4 0 0 4 0 0 5 5 5 50 82 103 136 185 209 172 205 220
45183 +146 190 211 136 185 209 26 108 161 22 40 52 7 12 15 44 81 103
45184 +71 116 144 28 67 93 37 51 59 41 65 82 100 139 164 101 161 196
45185 +90 154 193 90 154 193 28 67 93 0 0 0 0 0 0 26 28 28
45186 +125 124 125 167 166 167 163 162 163 153 152 153 163 162 163 174 174 174
45187 +85 115 134 4 0 0
45188 +4 4 4 5 5 5 4 4 4 1 0 0 4 0 0 34 47 55
45189 +125 124 125 174 174 174 174 174 174 167 166 167 157 156 157 153 152 153
45190 +155 154 155 155 154 155 158 157 158 166 165 166 167 166 167 154 153 154
45191 +125 124 125 26 28 28 4 0 0 4 0 0 4 0 0 5 5 5
45192 +5 5 5 4 4 4 4 4 4 4 4 4 4 4 4 1 1 1
45193 +0 0 0 0 0 0 1 1 1 4 4 4 4 4 4 4 4 4
45194 +5 5 5 5 5 5 4 3 3 4 0 0 4 0 0 6 6 6
45195 +37 38 37 131 129 131 137 136 137 37 38 37 0 0 0 4 0 0
45196 +4 5 5 43 61 72 90 154 193 172 205 220 146 190 211 136 185 209
45197 +90 154 193 28 67 93 13 20 25 43 61 72 71 116 144 44 81 103
45198 +2 5 5 7 11 13 59 113 148 101 161 196 90 154 193 28 67 93
45199 +13 20 25 6 10 14 0 0 0 13 16 17 60 73 81 137 136 137
45200 +166 165 166 158 157 158 156 155 156 154 153 154 167 166 167 174 174 174
45201 +60 73 81 4 0 0
45202 +4 4 4 4 4 4 0 0 0 3 3 3 60 74 84 174 174 174
45203 +174 174 174 167 166 167 163 162 163 155 154 155 157 156 157 155 154 155
45204 +156 155 156 163 162 163 167 166 167 158 157 158 125 124 125 37 38 37
45205 +4 3 3 4 0 0 4 0 0 6 6 6 6 6 6 5 5 5
45206 +4 4 4 4 4 4 4 4 4 1 1 1 0 0 0 2 3 3
45207 +10 13 16 7 11 13 1 0 0 0 0 0 2 2 1 4 4 4
45208 +4 4 4 4 4 4 4 4 4 5 5 5 4 3 3 4 0 0
45209 +4 0 0 7 11 13 13 16 17 4 0 0 3 3 3 34 47 55
45210 +80 127 157 146 190 211 172 205 220 136 185 209 136 185 209 136 185 209
45211 +28 67 93 22 40 52 55 98 126 55 98 126 21 29 34 7 11 13
45212 +50 82 103 101 161 196 101 161 196 35 83 115 13 20 25 2 2 1
45213 +1 1 2 1 1 2 37 51 59 131 129 131 174 174 174 174 174 174
45214 +167 166 167 163 162 163 163 162 163 167 166 167 174 174 174 125 124 125
45215 +16 19 21 4 0 0
45216 +4 4 4 4 0 0 4 0 0 60 74 84 174 174 174 174 174 174
45217 +158 157 158 155 154 155 155 154 155 156 155 156 155 154 155 158 157 158
45218 +167 166 167 165 164 165 131 129 131 60 73 81 13 16 17 4 0 0
45219 +4 0 0 4 3 3 6 6 6 4 3 3 5 5 5 4 4 4
45220 +4 4 4 3 2 2 0 0 0 0 0 0 7 11 13 45 69 86
45221 +80 127 157 71 116 144 43 61 72 7 11 13 0 0 0 1 1 1
45222 +4 3 3 4 4 4 4 4 4 4 4 4 6 6 6 5 5 5
45223 +3 2 2 4 0 0 1 0 0 21 29 34 59 113 148 136 185 209
45224 +146 190 211 136 185 209 136 185 209 136 185 209 136 185 209 136 185 209
45225 +68 124 159 44 81 103 22 40 52 13 16 17 43 61 72 90 154 193
45226 +136 185 209 59 113 148 21 29 34 3 4 3 1 1 1 0 0 0
45227 +24 26 27 125 124 125 163 162 163 174 174 174 166 165 166 165 164 165
45228 +163 162 163 125 124 125 125 124 125 125 124 125 125 124 125 26 28 28
45229 +4 0 0 4 3 3
45230 +3 3 3 0 0 0 24 26 27 153 152 153 177 184 187 158 157 158
45231 +156 155 156 156 155 156 155 154 155 155 154 155 165 164 165 174 174 174
45232 +155 154 155 60 74 84 26 28 28 4 0 0 4 0 0 3 1 0
45233 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 3 3
45234 +2 0 0 0 0 0 0 0 0 32 43 50 72 125 159 101 161 196
45235 +136 185 209 101 161 196 101 161 196 79 117 143 32 43 50 0 0 0
45236 +0 0 0 2 2 2 4 4 4 4 4 4 3 3 3 1 0 0
45237 +0 0 0 4 5 5 49 76 92 101 161 196 146 190 211 146 190 211
45238 +136 185 209 136 185 209 136 185 209 136 185 209 136 185 209 90 154 193
45239 +28 67 93 13 16 17 37 51 59 80 127 157 136 185 209 90 154 193
45240 +22 40 52 6 9 11 3 4 3 2 2 1 16 19 21 60 73 81
45241 +137 136 137 163 162 163 158 157 158 166 165 166 167 166 167 153 152 153
45242 +60 74 84 37 38 37 6 6 6 13 16 17 4 0 0 1 0 0
45243 +3 2 2 4 4 4
45244 +3 2 2 4 0 0 37 38 37 137 136 137 167 166 167 158 157 158
45245 +157 156 157 154 153 154 157 156 157 167 166 167 174 174 174 125 124 125
45246 +37 38 37 4 0 0 4 0 0 4 0 0 4 3 3 4 4 4
45247 +4 4 4 4 4 4 5 5 5 5 5 5 1 1 1 0 0 0
45248 +0 0 0 16 21 25 55 98 126 90 154 193 136 185 209 101 161 196
45249 +101 161 196 101 161 196 136 185 209 136 185 209 101 161 196 55 98 126
45250 +14 17 19 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
45251 +22 40 52 90 154 193 146 190 211 146 190 211 136 185 209 136 185 209
45252 +136 185 209 136 185 209 136 185 209 101 161 196 35 83 115 7 11 13
45253 +17 23 27 59 113 148 136 185 209 101 161 196 34 86 122 7 12 15
45254 +2 5 5 3 4 3 6 6 6 60 73 81 131 129 131 163 162 163
45255 +166 165 166 174 174 174 174 174 174 163 162 163 125 124 125 41 54 63
45256 +13 16 17 4 0 0 4 0 0 4 0 0 1 0 0 2 2 2
45257 +4 4 4 4 4 4
45258 +1 1 1 2 1 0 43 57 68 137 136 137 153 152 153 153 152 153
45259 +163 162 163 156 155 156 165 164 165 167 166 167 60 74 84 6 6 6
45260 +4 0 0 4 0 0 5 5 5 4 4 4 4 4 4 4 4 4
45261 +4 5 5 6 6 6 4 3 3 0 0 0 0 0 0 11 15 18
45262 +40 71 93 100 139 164 101 161 196 101 161 196 101 161 196 101 161 196
45263 +101 161 196 101 161 196 101 161 196 101 161 196 136 185 209 136 185 209
45264 +101 161 196 45 69 86 6 6 6 0 0 0 17 23 27 55 98 126
45265 +136 185 209 146 190 211 136 185 209 136 185 209 136 185 209 136 185 209
45266 +136 185 209 136 185 209 90 154 193 22 40 52 7 11 13 50 82 103
45267 +136 185 209 136 185 209 53 118 160 22 40 52 7 11 13 2 5 5
45268 +3 4 3 37 38 37 125 124 125 157 156 157 166 165 166 167 166 167
45269 +174 174 174 174 174 174 137 136 137 60 73 81 4 0 0 4 0 0
45270 +4 0 0 4 0 0 5 5 5 3 3 3 3 3 3 4 4 4
45271 +4 4 4 4 4 4
45272 +4 0 0 4 0 0 41 54 63 137 136 137 125 124 125 131 129 131
45273 +155 154 155 167 166 167 174 174 174 60 74 84 6 6 6 4 0 0
45274 +4 3 3 6 6 6 4 4 4 4 4 4 4 4 4 5 5 5
45275 +4 4 4 1 1 1 0 0 0 3 6 7 41 65 82 72 125 159
45276 +101 161 196 101 161 196 101 161 196 90 154 193 90 154 193 101 161 196
45277 +101 161 196 101 161 196 101 161 196 101 161 196 101 161 196 136 185 209
45278 +136 185 209 136 185 209 80 127 157 55 98 126 101 161 196 146 190 211
45279 +136 185 209 136 185 209 136 185 209 101 161 196 136 185 209 101 161 196
45280 +136 185 209 101 161 196 35 83 115 22 30 35 101 161 196 172 205 220
45281 +90 154 193 28 67 93 7 11 13 2 5 5 3 4 3 13 16 17
45282 +85 115 134 167 166 167 174 174 174 174 174 174 174 174 174 174 174 174
45283 +167 166 167 60 74 84 13 16 17 4 0 0 4 0 0 4 3 3
45284 +6 6 6 5 5 5 4 4 4 5 5 5 4 4 4 5 5 5
45285 +5 5 5 5 5 5
45286 +1 1 1 4 0 0 41 54 63 137 136 137 137 136 137 125 124 125
45287 +131 129 131 167 166 167 157 156 157 37 38 37 6 6 6 4 0 0
45288 +6 6 6 5 5 5 4 4 4 4 4 4 4 5 5 2 2 1
45289 +0 0 0 0 0 0 26 37 45 58 111 146 101 161 196 101 161 196
45290 +101 161 196 90 154 193 90 154 193 90 154 193 101 161 196 101 161 196
45291 +101 161 196 101 161 196 101 161 196 101 161 196 101 161 196 101 161 196
45292 +101 161 196 136 185 209 136 185 209 136 185 209 146 190 211 136 185 209
45293 +136 185 209 101 161 196 136 185 209 136 185 209 101 161 196 136 185 209
45294 +101 161 196 136 185 209 136 185 209 136 185 209 136 185 209 16 89 141
45295 +7 11 13 2 5 5 2 5 5 13 16 17 60 73 81 154 154 154
45296 +174 174 174 174 174 174 174 174 174 174 174 174 163 162 163 125 124 125
45297 +24 26 27 4 0 0 4 0 0 4 0 0 5 5 5 5 5 5
45298 +4 4 4 4 4 4 4 4 4 5 5 5 5 5 5 5 5 5
45299 +5 5 5 4 4 4
45300 +4 0 0 6 6 6 37 38 37 137 136 137 137 136 137 131 129 131
45301 +131 129 131 153 152 153 131 129 131 26 28 28 4 0 0 4 3 3
45302 +6 6 6 4 4 4 4 4 4 4 4 4 0 0 0 0 0 0
45303 +13 20 25 51 88 114 90 154 193 101 161 196 101 161 196 90 154 193
45304 +90 154 193 90 154 193 90 154 193 90 154 193 90 154 193 101 161 196
45305 +101 161 196 101 161 196 101 161 196 101 161 196 136 185 209 101 161 196
45306 +101 161 196 136 185 209 101 161 196 136 185 209 136 185 209 101 161 196
45307 +136 185 209 101 161 196 136 185 209 101 161 196 101 161 196 101 161 196
45308 +136 185 209 136 185 209 136 185 209 37 112 160 21 29 34 5 7 8
45309 +2 5 5 13 16 17 43 57 68 131 129 131 174 174 174 174 174 174
45310 +174 174 174 167 166 167 157 156 157 125 124 125 37 38 37 4 0 0
45311 +4 0 0 4 0 0 5 5 5 5 5 5 4 4 4 4 4 4
45312 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
45313 +4 4 4 4 4 4
45314 +1 1 1 4 0 0 41 54 63 153 152 153 137 136 137 137 136 137
45315 +137 136 137 153 152 153 125 124 125 24 26 27 4 0 0 3 2 2
45316 +4 4 4 4 4 4 4 3 3 4 0 0 3 6 7 43 61 72
45317 +64 123 161 101 161 196 90 154 193 90 154 193 90 154 193 90 154 193
45318 +90 154 193 90 154 193 90 154 193 90 154 193 101 161 196 90 154 193
45319 +101 161 196 101 161 196 101 161 196 101 161 196 101 161 196 101 161 196
45320 +101 161 196 101 161 196 101 161 196 101 161 196 101 161 196 101 161 196
45321 +136 185 209 101 161 196 101 161 196 136 185 209 136 185 209 101 161 196
45322 +101 161 196 90 154 193 28 67 93 13 16 17 7 11 13 3 6 7
45323 +37 51 59 125 124 125 163 162 163 174 174 174 167 166 167 166 165 166
45324 +167 166 167 131 129 131 60 73 81 4 0 0 4 0 0 4 0 0
45325 +3 3 3 5 5 5 6 6 6 4 4 4 4 4 4 4 4 4
45326 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
45327 +4 4 4 4 4 4
45328 +4 0 0 4 0 0 41 54 63 137 136 137 153 152 153 137 136 137
45329 +153 152 153 157 156 157 125 124 125 24 26 27 0 0 0 2 2 2
45330 +4 4 4 4 4 4 2 0 0 0 0 0 28 67 93 90 154 193
45331 +90 154 193 90 154 193 90 154 193 90 154 193 64 123 161 90 154 193
45332 +90 154 193 90 154 193 90 154 193 90 154 193 90 154 193 101 161 196
45333 +90 154 193 101 161 196 101 161 196 101 161 196 90 154 193 136 185 209
45334 +101 161 196 101 161 196 136 185 209 101 161 196 136 185 209 101 161 196
45335 +101 161 196 101 161 196 136 185 209 101 161 196 101 161 196 90 154 193
45336 +35 83 115 13 16 17 3 6 7 2 5 5 13 16 17 60 74 84
45337 +154 154 154 166 165 166 165 164 165 158 157 158 163 162 163 157 156 157
45338 +60 74 84 13 16 17 4 0 0 4 0 0 3 2 2 4 4 4
45339 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
45340 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
45341 +4 4 4 4 4 4
45342 +1 1 1 4 0 0 41 54 63 157 156 157 155 154 155 137 136 137
45343 +153 152 153 158 157 158 137 136 137 26 28 28 2 0 0 2 2 2
45344 +4 4 4 4 4 4 1 0 0 6 10 14 34 86 122 90 154 193
45345 +64 123 161 90 154 193 64 123 161 90 154 193 90 154 193 90 154 193
45346 +64 123 161 90 154 193 90 154 193 90 154 193 90 154 193 90 154 193
45347 +101 161 196 101 161 196 101 161 196 101 161 196 101 161 196 101 161 196
45348 +101 161 196 101 161 196 101 161 196 101 161 196 101 161 196 101 161 196
45349 +136 185 209 101 161 196 136 185 209 90 154 193 26 108 161 22 40 52
45350 +13 16 17 5 7 8 2 5 5 2 5 5 37 38 37 165 164 165
45351 +174 174 174 163 162 163 154 154 154 165 164 165 167 166 167 60 73 81
45352 +6 6 6 4 0 0 4 0 0 4 4 4 4 4 4 4 4 4
45353 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
45354 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
45355 +4 4 4 4 4 4
45356 +4 0 0 6 6 6 41 54 63 156 155 156 158 157 158 153 152 153
45357 +156 155 156 165 164 165 137 136 137 26 28 28 0 0 0 2 2 2
45358 +4 4 5 4 4 4 2 0 0 7 12 15 31 96 139 64 123 161
45359 +90 154 193 64 123 161 90 154 193 90 154 193 64 123 161 90 154 193
45360 +90 154 193 90 154 193 90 154 193 90 154 193 90 154 193 90 154 193
45361 +90 154 193 90 154 193 90 154 193 101 161 196 101 161 196 101 161 196
45362 +101 161 196 101 161 196 101 161 196 101 161 196 101 161 196 136 185 209
45363 +101 161 196 136 185 209 26 108 161 22 40 52 7 11 13 5 7 8
45364 +2 5 5 2 5 5 2 5 5 2 2 1 37 38 37 158 157 158
45365 +174 174 174 154 154 154 156 155 156 167 166 167 165 164 165 37 38 37
45366 +4 0 0 4 3 3 5 5 5 4 4 4 4 4 4 4 4 4
45367 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
45368 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
45369 +4 4 4 4 4 4
45370 +3 1 0 4 0 0 60 73 81 157 156 157 163 162 163 153 152 153
45371 +158 157 158 167 166 167 137 136 137 26 28 28 2 0 0 2 2 2
45372 +4 5 5 4 4 4 4 0 0 7 12 15 24 86 132 26 108 161
45373 +37 112 160 64 123 161 90 154 193 64 123 161 90 154 193 90 154 193
45374 +90 154 193 90 154 193 90 154 193 90 154 193 90 154 193 90 154 193
45375 +90 154 193 101 161 196 90 154 193 101 161 196 101 161 196 101 161 196
45376 +101 161 196 101 161 196 101 161 196 136 185 209 101 161 196 136 185 209
45377 +90 154 193 35 83 115 13 16 17 13 16 17 7 11 13 3 6 7
45378 +5 7 8 6 6 6 3 4 3 2 2 1 30 32 34 154 154 154
45379 +167 166 167 154 154 154 154 154 154 174 174 174 165 164 165 37 38 37
45380 +6 6 6 4 0 0 6 6 6 4 4 4 4 4 4 4 4 4
45381 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
45382 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
45383 +4 4 4 4 4 4
45384 +4 0 0 4 0 0 41 54 63 163 162 163 166 165 166 154 154 154
45385 +163 162 163 174 174 174 137 136 137 26 28 28 0 0 0 2 2 2
45386 +4 5 5 4 4 5 1 1 2 6 10 14 28 67 93 18 97 151
45387 +18 97 151 18 97 151 26 108 161 37 112 160 37 112 160 90 154 193
45388 +64 123 161 90 154 193 90 154 193 90 154 193 90 154 193 101 161 196
45389 +90 154 193 101 161 196 101 161 196 90 154 193 101 161 196 101 161 196
45390 +101 161 196 101 161 196 101 161 196 136 185 209 90 154 193 16 89 141
45391 +13 20 25 7 11 13 5 7 8 5 7 8 2 5 5 4 5 5
45392 +3 4 3 4 5 5 3 4 3 0 0 0 37 38 37 158 157 158
45393 +174 174 174 158 157 158 158 157 158 167 166 167 174 174 174 41 54 63
45394 +4 0 0 3 2 2 5 5 5 4 4 4 4 4 4 4 4 4
45395 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
45396 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
45397 +4 4 4 4 4 4
45398 +1 1 1 4 0 0 60 73 81 165 164 165 174 174 174 158 157 158
45399 +167 166 167 174 174 174 153 152 153 26 28 28 2 0 0 2 2 2
45400 +4 5 5 4 4 4 4 0 0 7 12 15 10 87 144 10 87 144
45401 +18 97 151 18 97 151 18 97 151 26 108 161 26 108 161 26 108 161
45402 +26 108 161 37 112 160 53 118 160 90 154 193 90 154 193 90 154 193
45403 +90 154 193 90 154 193 101 161 196 101 161 196 101 161 196 101 161 196
45404 +101 161 196 136 185 209 90 154 193 26 108 161 22 40 52 13 16 17
45405 +7 11 13 3 6 7 5 7 8 5 7 8 2 5 5 4 5 5
45406 +4 5 5 6 6 6 3 4 3 0 0 0 30 32 34 158 157 158
45407 +174 174 174 156 155 156 155 154 155 165 164 165 154 153 154 37 38 37
45408 +4 0 0 4 3 3 5 5 5 4 4 4 4 4 4 4 4 4
45409 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
45410 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
45411 +4 4 4 4 4 4
45412 +4 0 0 4 0 0 60 73 81 167 166 167 174 174 174 163 162 163
45413 +174 174 174 174 174 174 153 152 153 26 28 28 0 0 0 3 3 3
45414 +5 5 5 4 4 4 1 1 2 7 12 15 28 67 93 18 97 151
45415 +18 97 151 18 97 151 18 97 151 18 97 151 18 97 151 26 108 161
45416 +26 108 161 26 108 161 26 108 161 26 108 161 26 108 161 26 108 161
45417 +90 154 193 26 108 161 90 154 193 90 154 193 90 154 193 101 161 196
45418 +101 161 196 26 108 161 22 40 52 13 16 17 7 11 13 2 5 5
45419 +2 5 5 6 6 6 2 5 5 4 5 5 4 5 5 4 5 5
45420 +3 4 3 5 5 5 3 4 3 2 0 0 30 32 34 137 136 137
45421 +153 152 153 137 136 137 131 129 131 137 136 137 131 129 131 37 38 37
45422 +4 0 0 4 3 3 5 5 5 4 4 4 4 4 4 4 4 4
45423 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
45424 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
45425 +4 4 4 4 4 4
45426 +1 1 1 4 0 0 60 73 81 167 166 167 174 174 174 166 165 166
45427 +174 174 174 177 184 187 153 152 153 30 32 34 1 0 0 3 3 3
45428 +5 5 5 4 3 3 4 0 0 7 12 15 10 87 144 10 87 144
45429 +18 97 151 18 97 151 18 97 151 26 108 161 26 108 161 26 108 161
45430 +26 108 161 26 108 161 26 108 161 26 108 161 26 108 161 26 108 161
45431 +26 108 161 26 108 161 26 108 161 90 154 193 90 154 193 26 108 161
45432 +35 83 115 13 16 17 7 11 13 5 7 8 3 6 7 5 7 8
45433 +2 5 5 6 6 6 4 5 5 4 5 5 3 4 3 4 5 5
45434 +3 4 3 6 6 6 3 4 3 0 0 0 26 28 28 125 124 125
45435 +131 129 131 125 124 125 125 124 125 131 129 131 131 129 131 37 38 37
45436 +4 0 0 3 3 3 5 5 5 4 4 4 4 4 4 4 4 4
45437 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
45438 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
45439 +4 4 4 4 4 4
45440 +3 1 0 4 0 0 60 73 81 174 174 174 177 184 187 167 166 167
45441 +174 174 174 177 184 187 153 152 153 30 32 34 0 0 0 3 3 3
45442 +5 5 5 4 4 4 1 1 2 6 10 14 28 67 93 18 97 151
45443 +18 97 151 18 97 151 18 97 151 18 97 151 18 97 151 26 108 161
45444 +26 108 161 26 108 161 26 108 161 26 108 161 26 108 161 26 108 161
45445 +26 108 161 90 154 193 26 108 161 26 108 161 24 86 132 13 20 25
45446 +7 11 13 13 20 25 22 40 52 5 7 8 3 4 3 3 4 3
45447 +4 5 5 3 4 3 4 5 5 3 4 3 4 5 5 3 4 3
45448 +4 4 4 5 5 5 3 3 3 2 0 0 26 28 28 125 124 125
45449 +137 136 137 125 124 125 125 124 125 137 136 137 131 129 131 37 38 37
45450 +0 0 0 3 3 3 5 5 5 4 4 4 4 4 4 4 4 4
45451 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
45452 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
45453 +4 4 4 4 4 4
45454 +1 1 1 4 0 0 60 73 81 174 174 174 177 184 187 174 174 174
45455 +174 174 174 190 197 201 157 156 157 30 32 34 1 0 0 3 3 3
45456 +5 5 5 4 3 3 4 0 0 7 12 15 10 87 144 10 87 144
45457 +18 97 151 19 95 150 19 95 150 18 97 151 18 97 151 26 108 161
45458 +18 97 151 26 108 161 26 108 161 26 108 161 26 108 161 90 154 193
45459 +26 108 161 26 108 161 26 108 161 22 40 52 2 5 5 3 4 3
45460 +28 67 93 37 112 160 34 86 122 2 5 5 3 4 3 3 4 3
45461 +3 4 3 3 4 3 3 4 3 2 2 1 3 4 3 4 4 4
45462 +4 5 5 5 5 5 3 3 3 0 0 0 26 28 28 131 129 131
45463 +137 136 137 125 124 125 125 124 125 137 136 137 131 129 131 37 38 37
45464 +0 0 0 3 3 3 5 5 5 4 4 4 4 4 4 4 4 4
45465 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
45466 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
45467 +4 4 4 4 4 4
45468 +4 0 0 4 0 0 60 73 81 174 174 174 177 184 187 174 174 174
45469 +174 174 174 190 197 201 158 157 158 30 32 34 0 0 0 2 2 2
45470 +5 5 5 4 4 4 1 1 2 6 10 14 28 67 93 18 97 151
45471 +10 87 144 19 95 150 19 95 150 18 97 151 18 97 151 18 97 151
45472 +26 108 161 26 108 161 26 108 161 26 108 161 26 108 161 26 108 161
45473 +18 97 151 22 40 52 2 5 5 2 2 1 22 40 52 26 108 161
45474 +90 154 193 37 112 160 22 40 52 3 4 3 13 20 25 22 30 35
45475 +3 6 7 1 1 1 2 2 2 6 9 11 5 5 5 4 3 3
45476 +4 4 4 5 5 5 3 3 3 2 0 0 26 28 28 131 129 131
45477 +137 136 137 125 124 125 125 124 125 137 136 137 131 129 131 37 38 37
45478 +0 0 0 3 3 3 5 5 5 4 4 4 4 4 4 4 4 4
45479 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
45480 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
45481 +4 4 4 4 4 4
45482 +1 1 1 4 0 0 60 73 81 177 184 187 193 200 203 174 174 174
45483 +177 184 187 193 200 203 163 162 163 30 32 34 4 0 0 2 2 2
45484 +5 5 5 4 3 3 4 0 0 6 10 14 24 86 132 10 87 144
45485 +10 87 144 10 87 144 19 95 150 19 95 150 19 95 150 18 97 151
45486 +26 108 161 26 108 161 26 108 161 90 154 193 26 108 161 28 67 93
45487 +6 10 14 2 5 5 13 20 25 24 86 132 37 112 160 90 154 193
45488 +10 87 144 7 12 15 2 5 5 28 67 93 37 112 160 28 67 93
45489 +2 2 1 7 12 15 35 83 115 28 67 93 3 6 7 1 0 0
45490 +4 4 4 5 5 5 3 3 3 0 0 0 26 28 28 131 129 131
45491 +137 136 137 125 124 125 125 124 125 137 136 137 131 129 131 37 38 37
45492 +0 0 0 3 3 3 5 5 5 4 4 4 4 4 4 4 4 4
45493 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
45494 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
45495 +4 4 4 4 4 4
45496 +4 0 0 4 0 0 60 73 81 174 174 174 190 197 201 174 174 174
45497 +177 184 187 193 200 203 163 162 163 30 32 34 0 0 0 2 2 2
45498 +5 5 5 4 4 4 1 1 2 6 10 14 28 67 93 10 87 144
45499 +10 87 144 16 89 141 19 95 150 10 87 144 26 108 161 26 108 161
45500 +26 108 161 26 108 161 26 108 161 28 67 93 6 10 14 1 1 2
45501 +7 12 15 28 67 93 26 108 161 16 89 141 24 86 132 21 29 34
45502 +3 4 3 21 29 34 37 112 160 37 112 160 27 99 146 21 29 34
45503 +21 29 34 26 108 161 90 154 193 35 83 115 1 1 2 2 0 0
45504 +4 4 4 5 5 5 3 3 3 2 0 0 26 28 28 125 124 125
45505 +137 136 137 125 124 125 125 124 125 137 136 137 131 129 131 37 38 37
45506 +0 0 0 3 3 3 5 5 5 4 4 4 4 4 4 4 4 4
45507 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
45508 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
45509 +4 4 4 4 4 4
45510 +3 1 0 4 0 0 60 73 81 193 200 203 193 200 203 174 174 174
45511 +190 197 201 193 200 203 165 164 165 37 38 37 4 0 0 2 2 2
45512 +5 5 5 4 3 3 4 0 0 6 10 14 24 86 132 10 87 144
45513 +10 87 144 10 87 144 16 89 141 18 97 151 18 97 151 10 87 144
45514 +24 86 132 24 86 132 13 20 25 4 5 7 4 5 7 22 40 52
45515 +18 97 151 37 112 160 26 108 161 7 12 15 1 1 1 0 0 0
45516 +28 67 93 37 112 160 26 108 161 28 67 93 22 40 52 28 67 93
45517 +26 108 161 90 154 193 26 108 161 10 87 144 0 0 0 2 0 0
45518 +4 4 4 5 5 5 3 3 3 0 0 0 26 28 28 131 129 131
45519 +137 136 137 125 124 125 125 124 125 137 136 137 131 129 131 37 38 37
45520 +0 0 0 3 3 3 5 5 5 4 4 4 4 4 4 4 4 4
45521 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
45522 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
45523 +4 4 4 4 4 4
45524 +4 0 0 6 6 6 60 73 81 174 174 174 193 200 203 174 174 174
45525 +190 197 201 193 200 203 165 164 165 30 32 34 0 0 0 2 2 2
45526 +5 5 5 4 4 4 1 1 2 6 10 14 28 67 93 10 87 144
45527 +10 87 144 10 87 144 10 87 144 18 97 151 28 67 93 6 10 14
45528 +0 0 0 1 1 2 4 5 7 13 20 25 16 89 141 26 108 161
45529 +26 108 161 26 108 161 24 86 132 6 9 11 2 3 3 22 40 52
45530 +37 112 160 16 89 141 22 40 52 28 67 93 26 108 161 26 108 161
45531 +90 154 193 26 108 161 26 108 161 28 67 93 1 1 1 4 0 0
45532 +4 4 4 5 5 5 3 3 3 4 0 0 26 28 28 124 126 130
45533 +137 136 137 125 124 125 125 124 125 137 136 137 131 129 131 37 38 37
45534 +0 0 0 3 3 3 5 5 5 4 4 4 4 4 4 4 4 4
45535 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
45536 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
45537 +4 4 4 4 4 4
45538 +4 0 0 4 0 0 60 73 81 193 200 203 193 200 203 174 174 174
45539 +193 200 203 193 200 203 167 166 167 37 38 37 4 0 0 2 2 2
45540 +5 5 5 4 4 4 4 0 0 6 10 14 28 67 93 10 87 144
45541 +10 87 144 10 87 144 18 97 151 10 87 144 13 20 25 4 5 7
45542 +1 1 2 1 1 1 22 40 52 26 108 161 26 108 161 26 108 161
45543 +26 108 161 26 108 161 26 108 161 24 86 132 22 40 52 22 40 52
45544 +22 40 52 22 40 52 10 87 144 26 108 161 26 108 161 26 108 161
45545 +26 108 161 26 108 161 90 154 193 10 87 144 0 0 0 4 0 0
45546 +4 4 4 5 5 5 3 3 3 0 0 0 26 28 28 131 129 131
45547 +137 136 137 125 124 125 125 124 125 137 136 137 131 129 131 37 38 37
45548 +0 0 0 3 3 3 5 5 5 4 4 4 4 4 4 4 4 4
45549 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
45550 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
45551 +4 4 4 4 4 4
45552 +4 0 0 6 6 6 60 73 81 174 174 174 220 221 221 174 174 174
45553 +190 197 201 205 212 215 167 166 167 30 32 34 0 0 0 2 2 2
45554 +5 5 5 4 4 4 1 1 2 6 10 14 28 67 93 10 87 144
45555 +10 87 144 10 87 144 10 87 144 10 87 144 22 40 52 1 1 2
45556 +2 0 0 1 1 2 24 86 132 26 108 161 26 108 161 26 108 161
45557 +26 108 161 19 95 150 16 89 141 10 87 144 22 40 52 22 40 52
45558 +10 87 144 26 108 161 37 112 160 26 108 161 26 108 161 26 108 161
45559 +26 108 161 26 108 161 26 108 161 28 67 93 2 0 0 3 1 0
45560 +4 4 4 5 5 5 3 3 3 2 0 0 26 28 28 131 129 131
45561 +137 136 137 125 124 125 125 124 125 137 136 137 131 129 131 37 38 37
45562 +0 0 0 3 3 3 5 5 5 4 4 4 4 4 4 4 4 4
45563 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
45564 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
45565 +4 4 4 4 4 4
45566 +4 0 0 4 0 0 60 73 81 220 221 221 190 197 201 174 174 174
45567 +193 200 203 193 200 203 174 174 174 37 38 37 4 0 0 2 2 2
45568 +5 5 5 4 4 4 3 2 2 1 1 2 13 20 25 10 87 144
45569 +10 87 144 10 87 144 10 87 144 10 87 144 10 87 144 13 20 25
45570 +13 20 25 22 40 52 10 87 144 18 97 151 18 97 151 26 108 161
45571 +10 87 144 13 20 25 6 10 14 21 29 34 24 86 132 18 97 151
45572 +26 108 161 26 108 161 26 108 161 26 108 161 26 108 161 26 108 161
45573 +26 108 161 90 154 193 18 97 151 13 20 25 0 0 0 4 3 3
45574 +4 4 4 5 5 5 3 3 3 0 0 0 26 28 28 131 129 131
45575 +137 136 137 125 124 125 125 124 125 137 136 137 131 129 131 37 38 37
45576 +0 0 0 3 3 3 5 5 5 4 4 4 4 4 4 4 4 4
45577 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
45578 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
45579 +4 4 4 4 4 4
45580 +4 0 0 6 6 6 60 73 81 174 174 174 220 221 221 174 174 174
45581 +190 197 201 220 221 221 167 166 167 30 32 34 1 0 0 2 2 2
45582 +5 5 5 4 4 4 4 4 5 2 5 5 4 5 7 13 20 25
45583 +28 67 93 10 87 144 10 87 144 10 87 144 10 87 144 10 87 144
45584 +10 87 144 10 87 144 18 97 151 10 87 144 18 97 151 18 97 151
45585 +28 67 93 2 3 3 0 0 0 28 67 93 26 108 161 26 108 161
45586 +26 108 161 26 108 161 26 108 161 26 108 161 26 108 161 26 108 161
45587 +26 108 161 10 87 144 13 20 25 1 1 2 3 2 2 4 4 4
45588 +4 4 4 5 5 5 3 3 3 2 0 0 26 28 28 131 129 131
45589 +137 136 137 125 124 125 125 124 125 137 136 137 131 129 131 37 38 37
45590 +0 0 0 3 3 3 5 5 5 4 4 4 4 4 4 4 4 4
45591 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
45592 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
45593 +4 4 4 4 4 4
45594 +4 0 0 4 0 0 60 73 81 220 221 221 190 197 201 174 174 174
45595 +193 200 203 193 200 203 174 174 174 26 28 28 4 0 0 4 3 3
45596 +5 5 5 4 4 4 4 4 4 4 4 5 1 1 2 2 5 5
45597 +4 5 7 22 40 52 10 87 144 10 87 144 18 97 151 10 87 144
45598 +10 87 144 10 87 144 10 87 144 10 87 144 10 87 144 18 97 151
45599 +10 87 144 28 67 93 22 40 52 10 87 144 26 108 161 18 97 151
45600 +18 97 151 18 97 151 26 108 161 26 108 161 26 108 161 26 108 161
45601 +22 40 52 1 1 2 0 0 0 2 3 3 4 4 4 4 4 4
45602 +4 4 4 5 5 5 4 4 4 0 0 0 26 28 28 131 129 131
45603 +137 136 137 125 124 125 125 124 125 137 136 137 131 129 131 37 38 37
45604 +0 0 0 3 3 3 5 5 5 4 4 4 4 4 4 4 4 4
45605 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
45606 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
45607 +4 4 4 4 4 4
45608 +4 0 0 6 6 6 60 73 81 174 174 174 220 221 221 174 174 174
45609 +190 197 201 220 221 221 190 197 201 41 54 63 4 0 0 2 2 2
45610 +6 6 6 4 4 4 4 4 4 4 4 5 4 4 5 3 3 3
45611 +1 1 2 1 1 2 6 10 14 22 40 52 10 87 144 18 97 151
45612 +18 97 151 10 87 144 10 87 144 10 87 144 18 97 151 10 87 144
45613 +10 87 144 18 97 151 26 108 161 18 97 151 18 97 151 10 87 144
45614 +26 108 161 26 108 161 26 108 161 10 87 144 28 67 93 6 10 14
45615 +1 1 2 1 1 2 4 3 3 4 4 5 4 4 4 4 4 4
45616 +5 5 5 5 5 5 1 1 1 4 0 0 37 51 59 137 136 137
45617 +137 136 137 125 124 125 125 124 125 137 136 137 131 129 131 37 38 37
45618 +0 0 0 3 3 3 5 5 5 4 4 4 4 4 4 4 4 4
45619 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
45620 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
45621 +4 4 4 4 4 4
45622 +4 0 0 4 0 0 60 73 81 220 221 221 193 200 203 174 174 174
45623 +193 200 203 193 200 203 220 221 221 137 136 137 13 16 17 4 0 0
45624 +2 2 2 4 4 4 4 4 4 4 4 4 4 4 4 4 4 5
45625 +4 4 5 4 3 3 1 1 2 4 5 7 13 20 25 28 67 93
45626 +10 87 144 10 87 144 10 87 144 10 87 144 10 87 144 10 87 144
45627 +10 87 144 18 97 151 18 97 151 10 87 144 18 97 151 26 108 161
45628 +26 108 161 18 97 151 28 67 93 6 10 14 0 0 0 0 0 0
45629 +2 3 3 4 5 5 4 4 5 4 4 4 4 4 4 5 5 5
45630 +3 3 3 1 1 1 0 0 0 16 19 21 125 124 125 137 136 137
45631 +131 129 131 125 124 125 125 124 125 137 136 137 131 129 131 37 38 37
45632 +0 0 0 3 3 3 5 5 5 4 4 4 4 4 4 4 4 4
45633 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
45634 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
45635 +4 4 4 4 4 4
45636 +4 0 0 6 6 6 60 73 81 174 174 174 220 221 221 174 174 174
45637 +193 200 203 190 197 201 220 221 221 220 221 221 153 152 153 30 32 34
45638 +0 0 0 0 0 0 2 2 2 4 4 4 4 4 4 4 4 4
45639 +4 4 4 4 5 5 4 5 7 1 1 2 1 1 2 4 5 7
45640 +13 20 25 28 67 93 10 87 144 18 97 151 10 87 144 10 87 144
45641 +10 87 144 10 87 144 10 87 144 18 97 151 26 108 161 18 97 151
45642 +28 67 93 7 12 15 0 0 0 0 0 0 2 2 1 4 4 4
45643 +4 5 5 4 5 5 4 4 4 4 4 4 3 3 3 0 0 0
45644 +0 0 0 0 0 0 37 38 37 125 124 125 158 157 158 131 129 131
45645 +125 124 125 125 124 125 125 124 125 137 136 137 131 129 131 37 38 37
45646 +0 0 0 3 3 3 5 5 5 4 4 4 4 4 4 4 4 4
45647 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
45648 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
45649 +4 4 4 4 4 4
45650 +4 3 3 4 0 0 41 54 63 193 200 203 220 221 221 174 174 174
45651 +193 200 203 193 200 203 193 200 203 220 221 221 244 246 246 193 200 203
45652 +120 125 127 5 5 5 1 0 0 0 0 0 1 1 1 4 4 4
45653 +4 4 4 4 4 4 4 5 5 4 5 5 4 4 5 1 1 2
45654 +4 5 7 4 5 7 22 40 52 10 87 144 10 87 144 10 87 144
45655 +10 87 144 10 87 144 18 97 151 10 87 144 10 87 144 13 20 25
45656 +4 5 7 2 3 3 1 1 2 4 4 4 4 5 5 4 4 4
45657 +4 4 4 4 4 4 4 4 4 1 1 1 0 0 0 1 1 2
45658 +24 26 27 60 74 84 153 152 153 163 162 163 137 136 137 125 124 125
45659 +125 124 125 125 124 125 125 124 125 137 136 137 125 124 125 26 28 28
45660 +0 0 0 3 3 3 5 5 5 4 4 4 4 4 4 4 4 4
45661 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
45662 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
45663 +4 4 4 4 4 4
45664 +4 0 0 6 6 6 26 28 28 156 155 156 220 221 221 220 221 221
45665 +174 174 174 193 200 203 193 200 203 193 200 203 205 212 215 220 221 221
45666 +220 221 221 167 166 167 60 73 81 7 11 13 0 0 0 0 0 0
45667 +3 3 3 4 4 4 4 4 4 4 4 4 4 4 5 4 4 5
45668 +4 4 5 1 1 2 1 1 2 4 5 7 22 40 52 10 87 144
45669 +10 87 144 10 87 144 10 87 144 22 40 52 4 5 7 1 1 2
45670 +1 1 2 4 4 5 4 4 4 4 4 4 4 4 4 4 4 4
45671 +5 5 5 2 2 2 0 0 0 4 0 0 16 19 21 60 73 81
45672 +137 136 137 167 166 167 158 157 158 137 136 137 131 129 131 131 129 131
45673 +125 124 125 125 124 125 131 129 131 155 154 155 60 74 84 5 7 8
45674 +0 0 0 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
45675 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
45676 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
45677 +4 4 4 4 4 4
45678 +5 5 5 4 0 0 4 0 0 60 73 81 193 200 203 220 221 221
45679 +193 200 203 193 200 203 193 200 203 193 200 203 205 212 215 220 221 221
45680 +220 221 221 220 221 221 220 221 221 137 136 137 43 57 68 6 6 6
45681 +4 0 0 1 1 1 4 4 4 4 4 4 4 4 4 4 4 4
45682 +4 4 5 4 4 5 3 2 2 1 1 2 2 5 5 13 20 25
45683 +22 40 52 22 40 52 13 20 25 2 3 3 1 1 2 3 3 3
45684 +4 5 7 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
45685 +1 1 1 0 0 0 2 3 3 41 54 63 131 129 131 166 165 166
45686 +166 165 166 155 154 155 153 152 153 137 136 137 137 136 137 125 124 125
45687 +125 124 125 137 136 137 137 136 137 125 124 125 37 38 37 4 3 3
45688 +4 3 3 5 5 5 4 4 4 4 4 4 4 4 4 4 4 4
45689 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
45690 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
45691 +4 4 4 4 4 4
45692 +4 3 3 6 6 6 6 6 6 13 16 17 60 73 81 167 166 167
45693 +220 221 221 220 221 221 220 221 221 193 200 203 193 200 203 193 200 203
45694 +205 212 215 220 221 221 220 221 221 244 246 246 205 212 215 125 124 125
45695 +24 26 27 0 0 0 0 0 0 2 2 2 5 5 5 5 5 5
45696 +4 4 4 4 4 4 4 4 4 4 4 5 1 1 2 4 5 7
45697 +4 5 7 4 5 7 1 1 2 3 2 2 4 4 5 4 4 4
45698 +4 4 4 4 4 4 5 5 5 4 4 4 0 0 0 0 0 0
45699 +2 0 0 26 28 28 125 124 125 174 174 174 174 174 174 166 165 166
45700 +156 155 156 153 152 153 137 136 137 137 136 137 131 129 131 137 136 137
45701 +137 136 137 137 136 137 60 74 84 30 32 34 4 0 0 4 0 0
45702 +5 5 5 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
45703 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
45704 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
45705 +4 4 4 4 4 4
45706 +5 5 5 6 6 6 4 0 0 4 0 0 6 6 6 26 28 28
45707 +125 124 125 174 174 174 220 221 221 220 221 221 220 221 221 193 200 203
45708 +205 212 215 220 221 221 205 212 215 220 221 221 220 221 221 244 246 246
45709 +193 200 203 60 74 84 13 16 17 4 0 0 0 0 0 3 3 3
45710 +5 5 5 5 5 5 4 4 4 4 4 4 4 4 5 3 3 3
45711 +1 1 2 3 3 3 4 4 5 4 4 5 4 4 4 4 4 4
45712 +5 5 5 5 5 5 2 2 2 0 0 0 0 0 0 13 16 17
45713 +60 74 84 174 174 174 193 200 203 174 174 174 167 166 167 163 162 163
45714 +153 152 153 153 152 153 137 136 137 137 136 137 153 152 153 137 136 137
45715 +125 124 125 41 54 63 24 26 27 4 0 0 4 0 0 5 5 5
45716 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
45717 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
45718 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
45719 +4 4 4 4 4 4
45720 +4 3 3 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6
45721 +6 6 6 37 38 37 131 129 131 220 221 221 220 221 221 220 221 221
45722 +193 200 203 193 200 203 220 221 221 205 212 215 220 221 221 244 246 246
45723 +244 246 246 244 246 246 174 174 174 41 54 63 0 0 0 0 0 0
45724 +0 0 0 4 4 4 5 5 5 5 5 5 4 4 4 4 4 5
45725 +4 4 5 4 4 5 4 4 4 4 4 4 6 6 6 6 6 6
45726 +3 3 3 0 0 0 2 0 0 13 16 17 60 73 81 156 155 156
45727 +220 221 221 193 200 203 174 174 174 165 164 165 163 162 163 154 153 154
45728 +153 152 153 153 152 153 158 157 158 163 162 163 137 136 137 60 73 81
45729 +13 16 17 4 0 0 4 0 0 4 3 3 4 4 4 4 4 4
45730 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
45731 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
45732 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
45733 +4 4 4 4 4 4
45734 +5 5 5 4 3 3 4 3 3 6 6 6 6 6 6 6 6 6
45735 +6 6 6 6 6 6 6 6 6 37 38 37 167 166 167 244 246 246
45736 +244 246 246 220 221 221 205 212 215 205 212 215 220 221 221 193 200 203
45737 +220 221 221 244 246 246 244 246 246 244 246 246 137 136 137 37 38 37
45738 +3 2 2 0 0 0 1 1 1 5 5 5 5 5 5 4 4 4
45739 +4 4 4 4 4 4 4 4 4 5 5 5 4 4 4 1 1 1
45740 +0 0 0 5 5 5 43 57 68 153 152 153 193 200 203 220 221 221
45741 +177 184 187 174 174 174 167 166 167 166 165 166 158 157 158 157 156 157
45742 +158 157 158 166 165 166 156 155 156 85 115 134 13 16 17 4 0 0
45743 +4 0 0 4 0 0 5 5 5 5 5 5 4 4 4 4 4 4
45744 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
45745 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
45746 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
45747 +4 4 4 4 4 4
45748 +5 5 5 4 3 3 6 6 6 6 6 6 4 0 0 6 6 6
45749 +6 6 6 6 6 6 6 6 6 6 6 6 13 16 17 60 73 81
45750 +177 184 187 220 221 221 220 221 221 220 221 221 205 212 215 220 221 221
45751 +220 221 221 205 212 215 220 221 221 244 246 246 244 246 246 205 212 215
45752 +125 124 125 30 32 34 0 0 0 0 0 0 2 2 2 5 5 5
45753 +4 4 4 4 4 4 4 4 4 1 1 1 0 0 0 1 0 0
45754 +37 38 37 131 129 131 205 212 215 220 221 221 193 200 203 174 174 174
45755 +174 174 174 174 174 174 167 166 167 165 164 165 166 165 166 167 166 167
45756 +158 157 158 125 124 125 37 38 37 4 0 0 4 0 0 4 0 0
45757 +4 3 3 5 5 5 4 4 4 4 4 4 4 4 4 4 4 4
45758 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
45759 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
45760 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
45761 +4 4 4 4 4 4
45762 +4 4 4 5 5 5 4 3 3 4 3 3 6 6 6 6 6 6
45763 +4 0 0 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6
45764 +26 28 28 125 124 125 205 212 215 220 221 221 220 221 221 220 221 221
45765 +205 212 215 220 221 221 205 212 215 220 221 221 220 221 221 244 246 246
45766 +244 246 246 190 197 201 60 74 84 16 19 21 4 0 0 0 0 0
45767 +0 0 0 0 0 0 0 0 0 0 0 0 16 19 21 120 125 127
45768 +177 184 187 220 221 221 205 212 215 177 184 187 174 174 174 177 184 187
45769 +174 174 174 174 174 174 167 166 167 174 174 174 166 165 166 137 136 137
45770 +60 73 81 13 16 17 4 0 0 4 0 0 4 3 3 6 6 6
45771 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
45772 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
45773 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
45774 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
45775 +4 4 4 4 4 4
45776 +5 5 5 4 3 3 5 5 5 4 3 3 6 6 6 4 0 0
45777 +6 6 6 6 6 6 4 0 0 6 6 6 4 0 0 6 6 6
45778 +6 6 6 6 6 6 37 38 37 137 136 137 193 200 203 220 221 221
45779 +220 221 221 205 212 215 220 221 221 205 212 215 205 212 215 220 221 221
45780 +220 221 221 220 221 221 244 246 246 166 165 166 43 57 68 2 2 2
45781 +0 0 0 4 0 0 16 19 21 60 73 81 157 156 157 202 210 214
45782 +220 221 221 193 200 203 177 184 187 177 184 187 177 184 187 174 174 174
45783 +174 174 174 174 174 174 174 174 174 157 156 157 60 74 84 24 26 27
45784 +4 0 0 4 0 0 4 0 0 6 6 6 4 4 4 4 4 4
45785 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
45786 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
45787 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
45788 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
45789 +4 4 4 4 4 4
45790 +4 4 4 4 4 4 5 5 5 4 3 3 5 5 5 6 6 6
45791 +6 6 6 4 0 0 6 6 6 6 6 6 6 6 6 4 0 0
45792 +4 0 0 4 0 0 6 6 6 24 26 27 60 73 81 167 166 167
45793 +220 221 221 220 221 221 220 221 221 205 212 215 205 212 215 205 212 215
45794 +205 212 215 220 221 221 220 221 221 220 221 221 205 212 215 137 136 137
45795 +60 74 84 125 124 125 137 136 137 190 197 201 220 221 221 193 200 203
45796 +177 184 187 177 184 187 177 184 187 174 174 174 174 174 174 177 184 187
45797 +190 197 201 174 174 174 125 124 125 37 38 37 6 6 6 4 0 0
45798 +4 0 0 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
45799 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
45800 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
45801 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
45802 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
45803 +4 4 4 4 4 4
45804 +4 4 4 4 4 4 5 5 5 5 5 5 4 3 3 6 6 6
45805 +4 0 0 6 6 6 6 6 6 6 6 6 4 0 0 6 6 6
45806 +6 6 6 6 6 6 4 0 0 4 0 0 6 6 6 6 6 6
45807 +125 124 125 193 200 203 244 246 246 220 221 221 205 212 215 205 212 215
45808 +205 212 215 193 200 203 205 212 215 205 212 215 220 221 221 220 221 221
45809 +193 200 203 193 200 203 205 212 215 193 200 203 193 200 203 177 184 187
45810 +190 197 201 190 197 201 174 174 174 190 197 201 193 200 203 190 197 201
45811 +153 152 153 60 73 81 4 0 0 4 0 0 4 0 0 3 2 2
45812 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
45813 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
45814 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
45815 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
45816 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
45817 +4 4 4 4 4 4
45818 +4 4 4 4 4 4 4 4 4 4 4 4 5 5 5 4 3 3
45819 +6 6 6 4 3 3 4 3 3 4 3 3 6 6 6 6 6 6
45820 +4 0 0 6 6 6 6 6 6 6 6 6 4 0 0 4 0 0
45821 +4 0 0 26 28 28 131 129 131 220 221 221 244 246 246 220 221 221
45822 +205 212 215 193 200 203 205 212 215 193 200 203 193 200 203 205 212 215
45823 +220 221 221 193 200 203 193 200 203 193 200 203 190 197 201 174 174 174
45824 +174 174 174 190 197 201 193 200 203 193 200 203 167 166 167 125 124 125
45825 +6 6 6 4 0 0 4 0 0 4 3 3 4 4 4 4 4 4
45826 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
45827 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
45828 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
45829 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
45830 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
45831 +4 4 4 4 4 4
45832 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 5 5 5
45833 +5 5 5 4 3 3 5 5 5 6 6 6 4 3 3 5 5 5
45834 +6 6 6 6 6 6 4 0 0 6 6 6 6 6 6 6 6 6
45835 +4 0 0 4 0 0 6 6 6 41 54 63 158 157 158 220 221 221
45836 +220 221 221 220 221 221 193 200 203 193 200 203 193 200 203 190 197 201
45837 +190 197 201 190 197 201 190 197 201 190 197 201 174 174 174 193 200 203
45838 +193 200 203 220 221 221 174 174 174 125 124 125 37 38 37 4 0 0
45839 +4 0 0 4 3 3 6 6 6 4 4 4 4 4 4 4 4 4
45840 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
45841 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
45842 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
45843 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
45844 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
45845 +4 4 4 4 4 4
45846 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
45847 +4 4 4 5 5 5 4 3 3 4 3 3 4 3 3 5 5 5
45848 +4 3 3 6 6 6 5 5 5 4 3 3 6 6 6 6 6 6
45849 +6 6 6 6 6 6 4 0 0 4 0 0 13 16 17 60 73 81
45850 +174 174 174 220 221 221 220 221 221 205 212 215 190 197 201 174 174 174
45851 +193 200 203 174 174 174 190 197 201 174 174 174 193 200 203 220 221 221
45852 +193 200 203 131 129 131 37 38 37 6 6 6 4 0 0 4 0 0
45853 +6 6 6 6 6 6 4 3 3 5 5 5 4 4 4 4 4 4
45854 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
45855 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
45856 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
45857 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
45858 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
45859 +4 4 4 4 4 4
45860 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
45861 +4 4 4 4 4 4 4 4 4 5 5 5 5 5 5 5 5 5
45862 +5 5 5 4 3 3 4 3 3 5 5 5 4 3 3 4 3 3
45863 +5 5 5 6 6 6 6 6 6 4 0 0 6 6 6 6 6 6
45864 +6 6 6 125 124 125 174 174 174 220 221 221 220 221 221 193 200 203
45865 +193 200 203 193 200 203 193 200 203 193 200 203 220 221 221 158 157 158
45866 +60 73 81 6 6 6 4 0 0 4 0 0 5 5 5 6 6 6
45867 +5 5 5 5 5 5 4 4 4 4 4 4 4 4 4 4 4 4
45868 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
45869 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
45870 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
45871 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
45872 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
45873 +4 4 4 4 4 4
45874 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
45875 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
45876 +4 4 4 5 5 5 5 5 5 4 3 3 5 5 5 4 3 3
45877 +5 5 5 5 5 5 6 6 6 6 6 6 4 0 0 4 0 0
45878 +4 0 0 4 0 0 26 28 28 125 124 125 174 174 174 193 200 203
45879 +193 200 203 174 174 174 193 200 203 167 166 167 125 124 125 6 6 6
45880 +6 6 6 6 6 6 4 0 0 6 6 6 6 6 6 5 5 5
45881 +4 3 3 5 5 5 4 4 4 4 4 4 4 4 4 4 4 4
45882 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
45883 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
45884 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
45885 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
45886 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
45887 +4 4 4 4 4 4
45888 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
45889 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
45890 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 5 5 5
45891 +4 3 3 6 6 6 4 0 0 6 6 6 6 6 6 6 6 6
45892 +6 6 6 4 0 0 4 0 0 6 6 6 37 38 37 125 124 125
45893 +153 152 153 131 129 131 125 124 125 37 38 37 6 6 6 6 6 6
45894 +6 6 6 4 0 0 6 6 6 6 6 6 4 3 3 5 5 5
45895 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
45896 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
45897 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
45898 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
45899 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
45900 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
45901 +4 4 4 4 4 4
45902 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
45903 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
45904 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
45905 +4 4 4 5 5 5 5 5 5 4 3 3 5 5 5 4 3 3
45906 +6 6 6 6 6 6 4 0 0 4 0 0 6 6 6 6 6 6
45907 +24 26 27 24 26 27 6 6 6 6 6 6 6 6 6 4 0 0
45908 +6 6 6 6 6 6 4 0 0 6 6 6 5 5 5 4 3 3
45909 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
45910 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
45911 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
45912 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
45913 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
45914 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
45915 +4 4 4 4 4 4
45916 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
45917 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
45918 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
45919 +4 4 4 4 4 4 5 5 5 4 3 3 5 5 5 6 6 6
45920 +4 0 0 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6
45921 +6 6 6 6 6 6 6 6 6 4 0 0 6 6 6 6 6 6
45922 +4 0 0 6 6 6 6 6 6 4 3 3 5 5 5 4 4 4
45923 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
45924 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
45925 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
45926 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
45927 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
45928 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
45929 +4 4 4 4 4 4
45930 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
45931 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
45932 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
45933 +4 4 4 4 4 4 4 4 4 5 5 5 4 3 3 5 5 5
45934 +5 5 5 5 5 5 4 0 0 6 6 6 4 0 0 6 6 6
45935 +6 6 6 6 6 6 6 6 6 4 0 0 6 6 6 4 0 0
45936 +6 6 6 4 3 3 5 5 5 4 3 3 5 5 5 4 4 4
45937 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
45938 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
45939 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
45940 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
45941 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
45942 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
45943 +4 4 4 4 4 4
45944 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
45945 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
45946 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
45947 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 5 5 5
45948 +4 3 3 6 6 6 4 3 3 6 6 6 6 6 6 6 6 6
45949 +4 0 0 6 6 6 4 0 0 6 6 6 6 6 6 6 6 6
45950 +6 6 6 4 3 3 5 5 5 4 4 4 4 4 4 4 4 4
45951 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
45952 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
45953 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
45954 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
45955 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
45956 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
45957 +4 4 4 4 4 4
45958 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
45959 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
45960 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
45961 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
45962 +4 4 4 5 5 5 4 3 3 5 5 5 4 0 0 6 6 6
45963 +6 6 6 4 0 0 6 6 6 6 6 6 4 0 0 6 6 6
45964 +4 3 3 5 5 5 5 5 5 4 4 4 4 4 4 4 4 4
45965 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
45966 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
45967 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
45968 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
45969 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
45970 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
45971 +4 4 4 4 4 4
45972 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
45973 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
45974 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
45975 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
45976 +4 4 4 5 5 5 4 3 3 5 5 5 6 6 6 4 3 3
45977 +4 3 3 6 6 6 6 6 6 4 3 3 6 6 6 4 3 3
45978 +5 5 5 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
45979 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
45980 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
45981 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
45982 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
45983 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
45984 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
45985 +4 4 4 4 4 4
45986 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
45987 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
45988 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
45989 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
45990 +4 4 4 4 4 4 4 4 4 5 5 5 4 3 3 6 6 6
45991 +5 5 5 4 3 3 4 3 3 4 3 3 5 5 5 5 5 5
45992 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
45993 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
45994 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
45995 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
45996 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
45997 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
45998 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
45999 +4 4 4 4 4 4
46000 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
46001 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
46002 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
46003 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
46004 +4 4 4 4 4 4 4 4 4 4 4 4 5 5 5 4 3 3
46005 +5 5 5 4 3 3 5 5 5 5 5 5 4 4 4 4 4 4
46006 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
46007 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
46008 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
46009 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
46010 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
46011 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
46012 +4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
46013 +4 4 4 4 4 4
46014 diff --git a/drivers/video/nvidia/nv_backlight.c b/drivers/video/nvidia/nv_backlight.c
46015 index 443e3c8..c443d6a 100644
46016 --- a/drivers/video/nvidia/nv_backlight.c
46017 +++ b/drivers/video/nvidia/nv_backlight.c
46018 @@ -87,7 +87,7 @@ static int nvidia_bl_get_brightness(struct backlight_device *bd)
46019 return bd->props.brightness;
46020 }
46021
46022 -static struct backlight_ops nvidia_bl_ops = {
46023 +static const struct backlight_ops nvidia_bl_ops = {
46024 .get_brightness = nvidia_bl_get_brightness,
46025 .update_status = nvidia_bl_update_status,
46026 };
46027 diff --git a/drivers/video/riva/fbdev.c b/drivers/video/riva/fbdev.c
46028 index d94c57f..912984c 100644
46029 --- a/drivers/video/riva/fbdev.c
46030 +++ b/drivers/video/riva/fbdev.c
46031 @@ -331,7 +331,7 @@ static int riva_bl_get_brightness(struct backlight_device *bd)
46032 return bd->props.brightness;
46033 }
46034
46035 -static struct backlight_ops riva_bl_ops = {
46036 +static const struct backlight_ops riva_bl_ops = {
46037 .get_brightness = riva_bl_get_brightness,
46038 .update_status = riva_bl_update_status,
46039 };
46040 diff --git a/drivers/video/uvesafb.c b/drivers/video/uvesafb.c
46041 index 54fbb29..2c108fc 100644
46042 --- a/drivers/video/uvesafb.c
46043 +++ b/drivers/video/uvesafb.c
46044 @@ -18,6 +18,7 @@
46045 #include <linux/fb.h>
46046 #include <linux/io.h>
46047 #include <linux/mutex.h>
46048 +#include <linux/moduleloader.h>
46049 #include <video/edid.h>
46050 #include <video/uvesafb.h>
46051 #ifdef CONFIG_X86
46052 @@ -120,7 +121,7 @@ static int uvesafb_helper_start(void)
46053 NULL,
46054 };
46055
46056 - return call_usermodehelper(v86d_path, argv, envp, 1);
46057 + return call_usermodehelper(v86d_path, argv, envp, UMH_WAIT_PROC);
46058 }
46059
46060 /*
46061 @@ -568,10 +569,32 @@ static int __devinit uvesafb_vbe_getpmi(struct uvesafb_ktask *task,
46062 if ((task->t.regs.eax & 0xffff) != 0x4f || task->t.regs.es < 0xc000) {
46063 par->pmi_setpal = par->ypan = 0;
46064 } else {
46065 +
46066 +#ifdef CONFIG_PAX_KERNEXEC
46067 +#ifdef CONFIG_MODULES
46068 + par->pmi_code = module_alloc_exec((u16)task->t.regs.ecx);
46069 +#endif
46070 + if (!par->pmi_code) {
46071 + par->pmi_setpal = par->ypan = 0;
46072 + return 0;
46073 + }
46074 +#endif
46075 +
46076 par->pmi_base = (u16 *)phys_to_virt(((u32)task->t.regs.es << 4)
46077 + task->t.regs.edi);
46078 +
46079 +#if defined(CONFIG_MODULES) && defined(CONFIG_PAX_KERNEXEC)
46080 + pax_open_kernel();
46081 + memcpy(par->pmi_code, par->pmi_base, (u16)task->t.regs.ecx);
46082 + pax_close_kernel();
46083 +
46084 + par->pmi_start = ktva_ktla(par->pmi_code + par->pmi_base[1]);
46085 + par->pmi_pal = ktva_ktla(par->pmi_code + par->pmi_base[2]);
46086 +#else
46087 par->pmi_start = (u8 *)par->pmi_base + par->pmi_base[1];
46088 par->pmi_pal = (u8 *)par->pmi_base + par->pmi_base[2];
46089 +#endif
46090 +
46091 printk(KERN_INFO "uvesafb: protected mode interface info at "
46092 "%04x:%04x\n",
46093 (u16)task->t.regs.es, (u16)task->t.regs.edi);
46094 @@ -1799,6 +1822,11 @@ out:
46095 if (par->vbe_modes)
46096 kfree(par->vbe_modes);
46097
46098 +#if defined(CONFIG_MODULES) && defined(CONFIG_PAX_KERNEXEC)
46099 + if (par->pmi_code)
46100 + module_free_exec(NULL, par->pmi_code);
46101 +#endif
46102 +
46103 framebuffer_release(info);
46104 return err;
46105 }
46106 @@ -1825,6 +1853,12 @@ static int uvesafb_remove(struct platform_device *dev)
46107 kfree(par->vbe_state_orig);
46108 if (par->vbe_state_saved)
46109 kfree(par->vbe_state_saved);
46110 +
46111 +#if defined(CONFIG_MODULES) && defined(CONFIG_PAX_KERNEXEC)
46112 + if (par->pmi_code)
46113 + module_free_exec(NULL, par->pmi_code);
46114 +#endif
46115 +
46116 }
46117
46118 framebuffer_release(info);
46119 diff --git a/drivers/video/vesafb.c b/drivers/video/vesafb.c
46120 index bd37ee1..cb827e8 100644
46121 --- a/drivers/video/vesafb.c
46122 +++ b/drivers/video/vesafb.c
46123 @@ -9,6 +9,7 @@
46124 */
46125
46126 #include <linux/module.h>
46127 +#include <linux/moduleloader.h>
46128 #include <linux/kernel.h>
46129 #include <linux/errno.h>
46130 #include <linux/string.h>
46131 @@ -53,8 +54,8 @@ static int vram_remap __initdata; /* Set amount of memory to be used */
46132 static int vram_total __initdata; /* Set total amount of memory */
46133 static int pmi_setpal __read_mostly = 1; /* pmi for palette changes ??? */
46134 static int ypan __read_mostly; /* 0..nothing, 1..ypan, 2..ywrap */
46135 -static void (*pmi_start)(void) __read_mostly;
46136 -static void (*pmi_pal) (void) __read_mostly;
46137 +static void (*pmi_start)(void) __read_only;
46138 +static void (*pmi_pal) (void) __read_only;
46139 static int depth __read_mostly;
46140 static int vga_compat __read_mostly;
46141 /* --------------------------------------------------------------------- */
46142 @@ -233,6 +234,7 @@ static int __init vesafb_probe(struct platform_device *dev)
46143 unsigned int size_vmode;
46144 unsigned int size_remap;
46145 unsigned int size_total;
46146 + void *pmi_code = NULL;
46147
46148 if (screen_info.orig_video_isVGA != VIDEO_TYPE_VLFB)
46149 return -ENODEV;
46150 @@ -275,10 +277,6 @@ static int __init vesafb_probe(struct platform_device *dev)
46151 size_remap = size_total;
46152 vesafb_fix.smem_len = size_remap;
46153
46154 -#ifndef __i386__
46155 - screen_info.vesapm_seg = 0;
46156 -#endif
46157 -
46158 if (!request_mem_region(vesafb_fix.smem_start, size_total, "vesafb")) {
46159 printk(KERN_WARNING
46160 "vesafb: cannot reserve video memory at 0x%lx\n",
46161 @@ -315,9 +313,21 @@ static int __init vesafb_probe(struct platform_device *dev)
46162 printk(KERN_INFO "vesafb: mode is %dx%dx%d, linelength=%d, pages=%d\n",
46163 vesafb_defined.xres, vesafb_defined.yres, vesafb_defined.bits_per_pixel, vesafb_fix.line_length, screen_info.pages);
46164
46165 +#ifdef __i386__
46166 +
46167 +#if defined(CONFIG_MODULES) && defined(CONFIG_PAX_KERNEXEC)
46168 + pmi_code = module_alloc_exec(screen_info.vesapm_size);
46169 + if (!pmi_code)
46170 +#elif !defined(CONFIG_PAX_KERNEXEC)
46171 + if (0)
46172 +#endif
46173 +
46174 +#endif
46175 + screen_info.vesapm_seg = 0;
46176 +
46177 if (screen_info.vesapm_seg) {
46178 - printk(KERN_INFO "vesafb: protected mode interface info at %04x:%04x\n",
46179 - screen_info.vesapm_seg,screen_info.vesapm_off);
46180 + printk(KERN_INFO "vesafb: protected mode interface info at %04x:%04x %04x bytes\n",
46181 + screen_info.vesapm_seg,screen_info.vesapm_off,screen_info.vesapm_size);
46182 }
46183
46184 if (screen_info.vesapm_seg < 0xc000)
46185 @@ -325,9 +335,25 @@ static int __init vesafb_probe(struct platform_device *dev)
46186
46187 if (ypan || pmi_setpal) {
46188 unsigned short *pmi_base;
46189 +
46190 pmi_base = (unsigned short*)phys_to_virt(((unsigned long)screen_info.vesapm_seg << 4) + screen_info.vesapm_off);
46191 - pmi_start = (void*)((char*)pmi_base + pmi_base[1]);
46192 - pmi_pal = (void*)((char*)pmi_base + pmi_base[2]);
46193 +
46194 +#if defined(CONFIG_MODULES) && defined(CONFIG_PAX_KERNEXEC)
46195 + pax_open_kernel();
46196 + memcpy(pmi_code, pmi_base, screen_info.vesapm_size);
46197 +#else
46198 + pmi_code = pmi_base;
46199 +#endif
46200 +
46201 + pmi_start = (void*)((char*)pmi_code + pmi_base[1]);
46202 + pmi_pal = (void*)((char*)pmi_code + pmi_base[2]);
46203 +
46204 +#if defined(CONFIG_MODULES) && defined(CONFIG_PAX_KERNEXEC)
46205 + pmi_start = ktva_ktla(pmi_start);
46206 + pmi_pal = ktva_ktla(pmi_pal);
46207 + pax_close_kernel();
46208 +#endif
46209 +
46210 printk(KERN_INFO "vesafb: pmi: set display start = %p, set palette = %p\n",pmi_start,pmi_pal);
46211 if (pmi_base[3]) {
46212 printk(KERN_INFO "vesafb: pmi: ports = ");
46213 @@ -469,6 +495,11 @@ static int __init vesafb_probe(struct platform_device *dev)
46214 info->node, info->fix.id);
46215 return 0;
46216 err:
46217 +
46218 +#if defined(__i386__) && defined(CONFIG_MODULES) && defined(CONFIG_PAX_KERNEXEC)
46219 + module_free_exec(NULL, pmi_code);
46220 +#endif
46221 +
46222 if (info->screen_base)
46223 iounmap(info->screen_base);
46224 framebuffer_release(info);
46225 diff --git a/drivers/xen/sys-hypervisor.c b/drivers/xen/sys-hypervisor.c
46226 index 88a60e0..6783cc2 100644
46227 --- a/drivers/xen/sys-hypervisor.c
46228 +++ b/drivers/xen/sys-hypervisor.c
46229 @@ -425,7 +425,7 @@ static ssize_t hyp_sysfs_store(struct kobject *kobj,
46230 return 0;
46231 }
46232
46233 -static struct sysfs_ops hyp_sysfs_ops = {
46234 +static const struct sysfs_ops hyp_sysfs_ops = {
46235 .show = hyp_sysfs_show,
46236 .store = hyp_sysfs_store,
46237 };
46238 diff --git a/fs/9p/vfs_inode.c b/fs/9p/vfs_inode.c
46239 index 18f74ec..3227009 100644
46240 --- a/fs/9p/vfs_inode.c
46241 +++ b/fs/9p/vfs_inode.c
46242 @@ -1079,7 +1079,7 @@ static void *v9fs_vfs_follow_link(struct dentry *dentry, struct nameidata *nd)
46243 static void
46244 v9fs_vfs_put_link(struct dentry *dentry, struct nameidata *nd, void *p)
46245 {
46246 - char *s = nd_get_link(nd);
46247 + const char *s = nd_get_link(nd);
46248
46249 P9_DPRINTK(P9_DEBUG_VFS, " %s %s\n", dentry->d_name.name,
46250 IS_ERR(s) ? "<error>" : s);
46251 diff --git a/fs/Kconfig.binfmt b/fs/Kconfig.binfmt
46252 index bb4cc5b..df5eaa0 100644
46253 --- a/fs/Kconfig.binfmt
46254 +++ b/fs/Kconfig.binfmt
46255 @@ -86,7 +86,7 @@ config HAVE_AOUT
46256
46257 config BINFMT_AOUT
46258 tristate "Kernel support for a.out and ECOFF binaries"
46259 - depends on HAVE_AOUT
46260 + depends on HAVE_AOUT && BROKEN
46261 ---help---
46262 A.out (Assembler.OUTput) is a set of formats for libraries and
46263 executables used in the earliest versions of UNIX. Linux used
46264 diff --git a/fs/aio.c b/fs/aio.c
46265 index 22a19ad..d484e5b 100644
46266 --- a/fs/aio.c
46267 +++ b/fs/aio.c
46268 @@ -115,7 +115,7 @@ static int aio_setup_ring(struct kioctx *ctx)
46269 size += sizeof(struct io_event) * nr_events;
46270 nr_pages = (size + PAGE_SIZE-1) >> PAGE_SHIFT;
46271
46272 - if (nr_pages < 0)
46273 + if (nr_pages <= 0)
46274 return -EINVAL;
46275
46276 nr_events = (PAGE_SIZE * nr_pages - sizeof(struct aio_ring)) / sizeof(struct io_event);
46277 @@ -1089,6 +1089,8 @@ static int read_events(struct kioctx *ctx,
46278 struct aio_timeout to;
46279 int retry = 0;
46280
46281 + pax_track_stack();
46282 +
46283 /* needed to zero any padding within an entry (there shouldn't be
46284 * any, but C is fun!
46285 */
46286 @@ -1382,13 +1384,18 @@ static ssize_t aio_fsync(struct kiocb *iocb)
46287 static ssize_t aio_setup_vectored_rw(int type, struct kiocb *kiocb)
46288 {
46289 ssize_t ret;
46290 + struct iovec iovstack;
46291
46292 ret = rw_copy_check_uvector(type, (struct iovec __user *)kiocb->ki_buf,
46293 kiocb->ki_nbytes, 1,
46294 - &kiocb->ki_inline_vec, &kiocb->ki_iovec);
46295 + &iovstack, &kiocb->ki_iovec);
46296 if (ret < 0)
46297 goto out;
46298
46299 + if (kiocb->ki_iovec == &iovstack) {
46300 + kiocb->ki_inline_vec = iovstack;
46301 + kiocb->ki_iovec = &kiocb->ki_inline_vec;
46302 + }
46303 kiocb->ki_nr_segs = kiocb->ki_nbytes;
46304 kiocb->ki_cur_seg = 0;
46305 /* ki_nbytes/left now reflect bytes instead of segs */
46306 diff --git a/fs/attr.c b/fs/attr.c
46307 index 96d394b..33cf5b4 100644
46308 --- a/fs/attr.c
46309 +++ b/fs/attr.c
46310 @@ -83,6 +83,7 @@ int inode_newsize_ok(const struct inode *inode, loff_t offset)
46311 unsigned long limit;
46312
46313 limit = current->signal->rlim[RLIMIT_FSIZE].rlim_cur;
46314 + gr_learn_resource(current, RLIMIT_FSIZE, (unsigned long)offset, 1);
46315 if (limit != RLIM_INFINITY && offset > limit)
46316 goto out_sig;
46317 if (offset > inode->i_sb->s_maxbytes)
46318 diff --git a/fs/autofs/root.c b/fs/autofs/root.c
46319 index 4a1401c..05eb5ca 100644
46320 --- a/fs/autofs/root.c
46321 +++ b/fs/autofs/root.c
46322 @@ -299,7 +299,8 @@ static int autofs_root_symlink(struct inode *dir, struct dentry *dentry, const c
46323 set_bit(n,sbi->symlink_bitmap);
46324 sl = &sbi->symlink[n];
46325 sl->len = strlen(symname);
46326 - sl->data = kmalloc(slsize = sl->len+1, GFP_KERNEL);
46327 + slsize = sl->len+1;
46328 + sl->data = kmalloc(slsize, GFP_KERNEL);
46329 if (!sl->data) {
46330 clear_bit(n,sbi->symlink_bitmap);
46331 unlock_kernel();
46332 diff --git a/fs/autofs4/symlink.c b/fs/autofs4/symlink.c
46333 index b4ea829..e63ef18 100644
46334 --- a/fs/autofs4/symlink.c
46335 +++ b/fs/autofs4/symlink.c
46336 @@ -15,7 +15,7 @@
46337 static void *autofs4_follow_link(struct dentry *dentry, struct nameidata *nd)
46338 {
46339 struct autofs_info *ino = autofs4_dentry_ino(dentry);
46340 - nd_set_link(nd, (char *)ino->u.symlink);
46341 + nd_set_link(nd, ino->u.symlink);
46342 return NULL;
46343 }
46344
46345 diff --git a/fs/autofs4/waitq.c b/fs/autofs4/waitq.c
46346 index 2341375..df9d1c2 100644
46347 --- a/fs/autofs4/waitq.c
46348 +++ b/fs/autofs4/waitq.c
46349 @@ -60,7 +60,7 @@ static int autofs4_write(struct file *file, const void *addr, int bytes)
46350 {
46351 unsigned long sigpipe, flags;
46352 mm_segment_t fs;
46353 - const char *data = (const char *)addr;
46354 + const char __user *data = (const char __force_user *)addr;
46355 ssize_t wr = 0;
46356
46357 /** WARNING: this is not safe for writing more than PIPE_BUF bytes! **/
46358 diff --git a/fs/befs/linuxvfs.c b/fs/befs/linuxvfs.c
46359 index 9158c07..3f06659 100644
46360 --- a/fs/befs/linuxvfs.c
46361 +++ b/fs/befs/linuxvfs.c
46362 @@ -498,7 +498,7 @@ static void befs_put_link(struct dentry *dentry, struct nameidata *nd, void *p)
46363 {
46364 befs_inode_info *befs_ino = BEFS_I(dentry->d_inode);
46365 if (befs_ino->i_flags & BEFS_LONG_SYMLINK) {
46366 - char *link = nd_get_link(nd);
46367 + const char *link = nd_get_link(nd);
46368 if (!IS_ERR(link))
46369 kfree(link);
46370 }
46371 diff --git a/fs/binfmt_aout.c b/fs/binfmt_aout.c
46372 index 0133b5a..b3baa9f 100644
46373 --- a/fs/binfmt_aout.c
46374 +++ b/fs/binfmt_aout.c
46375 @@ -16,6 +16,7 @@
46376 #include <linux/string.h>
46377 #include <linux/fs.h>
46378 #include <linux/file.h>
46379 +#include <linux/security.h>
46380 #include <linux/stat.h>
46381 #include <linux/fcntl.h>
46382 #include <linux/ptrace.h>
46383 @@ -102,6 +103,8 @@ static int aout_core_dump(long signr, struct pt_regs *regs, struct file *file, u
46384 #endif
46385 # define START_STACK(u) (u.start_stack)
46386
46387 + memset(&dump, 0, sizeof(dump));
46388 +
46389 fs = get_fs();
46390 set_fs(KERNEL_DS);
46391 has_dumped = 1;
46392 @@ -113,10 +116,12 @@ static int aout_core_dump(long signr, struct pt_regs *regs, struct file *file, u
46393
46394 /* If the size of the dump file exceeds the rlimit, then see what would happen
46395 if we wrote the stack, but not the data area. */
46396 + gr_learn_resource(current, RLIMIT_CORE, (dump.u_dsize + dump.u_ssize+1) * PAGE_SIZE, 1);
46397 if ((dump.u_dsize + dump.u_ssize+1) * PAGE_SIZE > limit)
46398 dump.u_dsize = 0;
46399
46400 /* Make sure we have enough room to write the stack and data areas. */
46401 + gr_learn_resource(current, RLIMIT_CORE, (dump.u_ssize + 1) * PAGE_SIZE, 1);
46402 if ((dump.u_ssize + 1) * PAGE_SIZE > limit)
46403 dump.u_ssize = 0;
46404
46405 @@ -146,9 +151,7 @@ static int aout_core_dump(long signr, struct pt_regs *regs, struct file *file, u
46406 dump_size = dump.u_ssize << PAGE_SHIFT;
46407 DUMP_WRITE(dump_start,dump_size);
46408 }
46409 -/* Finally dump the task struct. Not be used by gdb, but could be useful */
46410 - set_fs(KERNEL_DS);
46411 - DUMP_WRITE(current,sizeof(*current));
46412 +/* Finally, let's not dump the task struct. Not be used by gdb, but could be useful to an attacker */
46413 end_coredump:
46414 set_fs(fs);
46415 return has_dumped;
46416 @@ -249,6 +252,8 @@ static int load_aout_binary(struct linux_binprm * bprm, struct pt_regs * regs)
46417 rlim = current->signal->rlim[RLIMIT_DATA].rlim_cur;
46418 if (rlim >= RLIM_INFINITY)
46419 rlim = ~0;
46420 +
46421 + gr_learn_resource(current, RLIMIT_DATA, ex.a_data + ex.a_bss, 1);
46422 if (ex.a_data + ex.a_bss > rlim)
46423 return -ENOMEM;
46424
46425 @@ -277,6 +282,27 @@ static int load_aout_binary(struct linux_binprm * bprm, struct pt_regs * regs)
46426 install_exec_creds(bprm);
46427 current->flags &= ~PF_FORKNOEXEC;
46428
46429 +#if defined(CONFIG_PAX_NOEXEC) || defined(CONFIG_PAX_ASLR)
46430 + current->mm->pax_flags = 0UL;
46431 +#endif
46432 +
46433 +#ifdef CONFIG_PAX_PAGEEXEC
46434 + if (!(N_FLAGS(ex) & F_PAX_PAGEEXEC)) {
46435 + current->mm->pax_flags |= MF_PAX_PAGEEXEC;
46436 +
46437 +#ifdef CONFIG_PAX_EMUTRAMP
46438 + if (N_FLAGS(ex) & F_PAX_EMUTRAMP)
46439 + current->mm->pax_flags |= MF_PAX_EMUTRAMP;
46440 +#endif
46441 +
46442 +#ifdef CONFIG_PAX_MPROTECT
46443 + if (!(N_FLAGS(ex) & F_PAX_MPROTECT))
46444 + current->mm->pax_flags |= MF_PAX_MPROTECT;
46445 +#endif
46446 +
46447 + }
46448 +#endif
46449 +
46450 if (N_MAGIC(ex) == OMAGIC) {
46451 unsigned long text_addr, map_size;
46452 loff_t pos;
46453 @@ -349,7 +375,7 @@ static int load_aout_binary(struct linux_binprm * bprm, struct pt_regs * regs)
46454
46455 down_write(&current->mm->mmap_sem);
46456 error = do_mmap(bprm->file, N_DATADDR(ex), ex.a_data,
46457 - PROT_READ | PROT_WRITE | PROT_EXEC,
46458 + PROT_READ | PROT_WRITE,
46459 MAP_FIXED | MAP_PRIVATE | MAP_DENYWRITE | MAP_EXECUTABLE,
46460 fd_offset + ex.a_text);
46461 up_write(&current->mm->mmap_sem);
46462 diff --git a/fs/binfmt_elf.c b/fs/binfmt_elf.c
46463 index 1ed37ba..b9c035f 100644
46464 --- a/fs/binfmt_elf.c
46465 +++ b/fs/binfmt_elf.c
46466 @@ -31,6 +31,7 @@
46467 #include <linux/random.h>
46468 #include <linux/elf.h>
46469 #include <linux/utsname.h>
46470 +#include <linux/xattr.h>
46471 #include <asm/uaccess.h>
46472 #include <asm/param.h>
46473 #include <asm/page.h>
46474 @@ -50,6 +51,10 @@ static int elf_core_dump(long signr, struct pt_regs *regs, struct file *file, un
46475 #define elf_core_dump NULL
46476 #endif
46477
46478 +#ifdef CONFIG_PAX_MPROTECT
46479 +static void elf_handle_mprotect(struct vm_area_struct *vma, unsigned long newflags);
46480 +#endif
46481 +
46482 #if ELF_EXEC_PAGESIZE > PAGE_SIZE
46483 #define ELF_MIN_ALIGN ELF_EXEC_PAGESIZE
46484 #else
46485 @@ -69,6 +74,11 @@ static struct linux_binfmt elf_format = {
46486 .load_binary = load_elf_binary,
46487 .load_shlib = load_elf_library,
46488 .core_dump = elf_core_dump,
46489 +
46490 +#ifdef CONFIG_PAX_MPROTECT
46491 + .handle_mprotect= elf_handle_mprotect,
46492 +#endif
46493 +
46494 .min_coredump = ELF_EXEC_PAGESIZE,
46495 .hasvdso = 1
46496 };
46497 @@ -77,6 +87,8 @@ static struct linux_binfmt elf_format = {
46498
46499 static int set_brk(unsigned long start, unsigned long end)
46500 {
46501 + unsigned long e = end;
46502 +
46503 start = ELF_PAGEALIGN(start);
46504 end = ELF_PAGEALIGN(end);
46505 if (end > start) {
46506 @@ -87,7 +99,7 @@ static int set_brk(unsigned long start, unsigned long end)
46507 if (BAD_ADDR(addr))
46508 return addr;
46509 }
46510 - current->mm->start_brk = current->mm->brk = end;
46511 + current->mm->start_brk = current->mm->brk = e;
46512 return 0;
46513 }
46514
46515 @@ -148,12 +160,15 @@ create_elf_tables(struct linux_binprm *bprm, struct elfhdr *exec,
46516 elf_addr_t __user *u_rand_bytes;
46517 const char *k_platform = ELF_PLATFORM;
46518 const char *k_base_platform = ELF_BASE_PLATFORM;
46519 - unsigned char k_rand_bytes[16];
46520 + u32 k_rand_bytes[4];
46521 int items;
46522 elf_addr_t *elf_info;
46523 int ei_index = 0;
46524 const struct cred *cred = current_cred();
46525 struct vm_area_struct *vma;
46526 + unsigned long saved_auxv[AT_VECTOR_SIZE];
46527 +
46528 + pax_track_stack();
46529
46530 /*
46531 * In some cases (e.g. Hyper-Threading), we want to avoid L1
46532 @@ -195,8 +210,12 @@ create_elf_tables(struct linux_binprm *bprm, struct elfhdr *exec,
46533 * Generate 16 random bytes for userspace PRNG seeding.
46534 */
46535 get_random_bytes(k_rand_bytes, sizeof(k_rand_bytes));
46536 - u_rand_bytes = (elf_addr_t __user *)
46537 - STACK_ALLOC(p, sizeof(k_rand_bytes));
46538 + srandom32(k_rand_bytes[0] ^ random32());
46539 + srandom32(k_rand_bytes[1] ^ random32());
46540 + srandom32(k_rand_bytes[2] ^ random32());
46541 + srandom32(k_rand_bytes[3] ^ random32());
46542 + p = STACK_ROUND(p, sizeof(k_rand_bytes));
46543 + u_rand_bytes = (elf_addr_t __user *) p;
46544 if (__copy_to_user(u_rand_bytes, k_rand_bytes, sizeof(k_rand_bytes)))
46545 return -EFAULT;
46546
46547 @@ -308,9 +327,11 @@ create_elf_tables(struct linux_binprm *bprm, struct elfhdr *exec,
46548 return -EFAULT;
46549 current->mm->env_end = p;
46550
46551 + memcpy(saved_auxv, elf_info, ei_index * sizeof(elf_addr_t));
46552 +
46553 /* Put the elf_info on the stack in the right place. */
46554 sp = (elf_addr_t __user *)envp + 1;
46555 - if (copy_to_user(sp, elf_info, ei_index * sizeof(elf_addr_t)))
46556 + if (copy_to_user(sp, saved_auxv, ei_index * sizeof(elf_addr_t)))
46557 return -EFAULT;
46558 return 0;
46559 }
46560 @@ -385,10 +406,10 @@ static unsigned long load_elf_interp(struct elfhdr *interp_elf_ex,
46561 {
46562 struct elf_phdr *elf_phdata;
46563 struct elf_phdr *eppnt;
46564 - unsigned long load_addr = 0;
46565 + unsigned long load_addr = 0, pax_task_size = TASK_SIZE;
46566 int load_addr_set = 0;
46567 unsigned long last_bss = 0, elf_bss = 0;
46568 - unsigned long error = ~0UL;
46569 + unsigned long error = -EINVAL;
46570 unsigned long total_size;
46571 int retval, i, size;
46572
46573 @@ -434,6 +455,11 @@ static unsigned long load_elf_interp(struct elfhdr *interp_elf_ex,
46574 goto out_close;
46575 }
46576
46577 +#ifdef CONFIG_PAX_SEGMEXEC
46578 + if (current->mm->pax_flags & MF_PAX_SEGMEXEC)
46579 + pax_task_size = SEGMEXEC_TASK_SIZE;
46580 +#endif
46581 +
46582 eppnt = elf_phdata;
46583 for (i = 0; i < interp_elf_ex->e_phnum; i++, eppnt++) {
46584 if (eppnt->p_type == PT_LOAD) {
46585 @@ -477,8 +503,8 @@ static unsigned long load_elf_interp(struct elfhdr *interp_elf_ex,
46586 k = load_addr + eppnt->p_vaddr;
46587 if (BAD_ADDR(k) ||
46588 eppnt->p_filesz > eppnt->p_memsz ||
46589 - eppnt->p_memsz > TASK_SIZE ||
46590 - TASK_SIZE - eppnt->p_memsz < k) {
46591 + eppnt->p_memsz > pax_task_size ||
46592 + pax_task_size - eppnt->p_memsz < k) {
46593 error = -ENOMEM;
46594 goto out_close;
46595 }
46596 @@ -532,6 +558,348 @@ out:
46597 return error;
46598 }
46599
46600 +static unsigned long pax_parse_pt_pax_softmode(const struct elf_phdr * const elf_phdata)
46601 +{
46602 + unsigned long pax_flags = 0UL;
46603 +
46604 +#ifdef CONFIG_PAX_PT_PAX_FLAGS
46605 +
46606 +#ifdef CONFIG_PAX_PAGEEXEC
46607 + if (elf_phdata->p_flags & PF_PAGEEXEC)
46608 + pax_flags |= MF_PAX_PAGEEXEC;
46609 +#endif
46610 +
46611 +#ifdef CONFIG_PAX_SEGMEXEC
46612 + if (elf_phdata->p_flags & PF_SEGMEXEC)
46613 + pax_flags |= MF_PAX_SEGMEXEC;
46614 +#endif
46615 +
46616 +#if defined(CONFIG_PAX_PAGEEXEC) && defined(CONFIG_PAX_SEGMEXEC)
46617 + if ((pax_flags & (MF_PAX_PAGEEXEC | MF_PAX_SEGMEXEC)) == (MF_PAX_PAGEEXEC | MF_PAX_SEGMEXEC)) {
46618 + if (nx_enabled)
46619 + pax_flags &= ~MF_PAX_SEGMEXEC;
46620 + else
46621 + pax_flags &= ~MF_PAX_PAGEEXEC;
46622 + }
46623 +#endif
46624 +
46625 +#ifdef CONFIG_PAX_EMUTRAMP
46626 + if (elf_phdata->p_flags & PF_EMUTRAMP)
46627 + pax_flags |= MF_PAX_EMUTRAMP;
46628 +#endif
46629 +
46630 +#ifdef CONFIG_PAX_MPROTECT
46631 + if (elf_phdata->p_flags & PF_MPROTECT)
46632 + pax_flags |= MF_PAX_MPROTECT;
46633 +#endif
46634 +
46635 +#if defined(CONFIG_PAX_RANDMMAP) || defined(CONFIG_PAX_RANDUSTACK)
46636 + if (randomize_va_space && (elf_phdata->p_flags & PF_RANDMMAP))
46637 + pax_flags |= MF_PAX_RANDMMAP;
46638 +#endif
46639 +
46640 +#endif
46641 +
46642 + return pax_flags;
46643 +}
46644 +
46645 +static unsigned long pax_parse_pt_pax_hardmode(const struct elf_phdr * const elf_phdata)
46646 +{
46647 + unsigned long pax_flags = 0UL;
46648 +
46649 +#ifdef CONFIG_PAX_PT_PAX_FLAGS
46650 +
46651 +#ifdef CONFIG_PAX_PAGEEXEC
46652 + if (!(elf_phdata->p_flags & PF_NOPAGEEXEC))
46653 + pax_flags |= MF_PAX_PAGEEXEC;
46654 +#endif
46655 +
46656 +#ifdef CONFIG_PAX_SEGMEXEC
46657 + if (!(elf_phdata->p_flags & PF_NOSEGMEXEC))
46658 + pax_flags |= MF_PAX_SEGMEXEC;
46659 +#endif
46660 +
46661 +#if defined(CONFIG_PAX_PAGEEXEC) && defined(CONFIG_PAX_SEGMEXEC)
46662 + if ((pax_flags & (MF_PAX_PAGEEXEC | MF_PAX_SEGMEXEC)) == (MF_PAX_PAGEEXEC | MF_PAX_SEGMEXEC)) {
46663 + if (nx_enabled)
46664 + pax_flags &= ~MF_PAX_SEGMEXEC;
46665 + else
46666 + pax_flags &= ~MF_PAX_PAGEEXEC;
46667 + }
46668 +#endif
46669 +
46670 +#ifdef CONFIG_PAX_EMUTRAMP
46671 + if (!(elf_phdata->p_flags & PF_NOEMUTRAMP))
46672 + pax_flags |= MF_PAX_EMUTRAMP;
46673 +#endif
46674 +
46675 +#ifdef CONFIG_PAX_MPROTECT
46676 + if (!(elf_phdata->p_flags & PF_NOMPROTECT))
46677 + pax_flags |= MF_PAX_MPROTECT;
46678 +#endif
46679 +
46680 +#if defined(CONFIG_PAX_RANDMMAP) || defined(CONFIG_PAX_RANDUSTACK)
46681 + if (randomize_va_space && !(elf_phdata->p_flags & PF_NORANDMMAP))
46682 + pax_flags |= MF_PAX_RANDMMAP;
46683 +#endif
46684 +
46685 +#endif
46686 +
46687 + return pax_flags;
46688 +}
46689 +
46690 +static unsigned long pax_parse_ei_pax(const struct elfhdr * const elf_ex)
46691 +{
46692 + unsigned long pax_flags = 0UL;
46693 +
46694 +#ifdef CONFIG_PAX_EI_PAX
46695 +
46696 +#ifdef CONFIG_PAX_PAGEEXEC
46697 + if (!(elf_ex->e_ident[EI_PAX] & EF_PAX_PAGEEXEC))
46698 + pax_flags |= MF_PAX_PAGEEXEC;
46699 +#endif
46700 +
46701 +#ifdef CONFIG_PAX_SEGMEXEC
46702 + if (!(elf_ex->e_ident[EI_PAX] & EF_PAX_SEGMEXEC))
46703 + pax_flags |= MF_PAX_SEGMEXEC;
46704 +#endif
46705 +
46706 +#if defined(CONFIG_PAX_PAGEEXEC) && defined(CONFIG_PAX_SEGMEXEC)
46707 + if ((pax_flags & (MF_PAX_PAGEEXEC | MF_PAX_SEGMEXEC)) == (MF_PAX_PAGEEXEC | MF_PAX_SEGMEXEC)) {
46708 + if (nx_enabled)
46709 + pax_flags &= ~MF_PAX_SEGMEXEC;
46710 + else
46711 + pax_flags &= ~MF_PAX_PAGEEXEC;
46712 + }
46713 +#endif
46714 +
46715 +#ifdef CONFIG_PAX_EMUTRAMP
46716 + if ((pax_flags & (MF_PAX_PAGEEXEC | MF_PAX_SEGMEXEC)) && (elf_ex->e_ident[EI_PAX] & EF_PAX_EMUTRAMP))
46717 + pax_flags |= MF_PAX_EMUTRAMP;
46718 +#endif
46719 +
46720 +#ifdef CONFIG_PAX_MPROTECT
46721 + if ((pax_flags & (MF_PAX_PAGEEXEC | MF_PAX_SEGMEXEC)) && !(elf_ex->e_ident[EI_PAX] & EF_PAX_MPROTECT))
46722 + pax_flags |= MF_PAX_MPROTECT;
46723 +#endif
46724 +
46725 +#ifdef CONFIG_PAX_ASLR
46726 + if (randomize_va_space && !(elf_ex->e_ident[EI_PAX] & EF_PAX_RANDMMAP))
46727 + pax_flags |= MF_PAX_RANDMMAP;
46728 +#endif
46729 +
46730 +#else
46731 +
46732 +#ifdef CONFIG_PAX_PAGEEXEC
46733 + pax_flags |= MF_PAX_PAGEEXEC;
46734 +#endif
46735 +
46736 +#ifdef CONFIG_PAX_MPROTECT
46737 + pax_flags |= MF_PAX_MPROTECT;
46738 +#endif
46739 +
46740 +#ifdef CONFIG_PAX_RANDMMAP
46741 + pax_flags |= MF_PAX_RANDMMAP;
46742 +#endif
46743 +
46744 +#ifdef CONFIG_PAX_SEGMEXEC
46745 + if (!(__supported_pte_mask & _PAGE_NX)) {
46746 + pax_flags &= ~MF_PAX_PAGEEXEC;
46747 + pax_flags |= MF_PAX_SEGMEXEC;
46748 + }
46749 +#endif
46750 +
46751 +#endif
46752 +
46753 + return pax_flags;
46754 +}
46755 +
46756 +static unsigned long pax_parse_pt_pax(const struct elfhdr * const elf_ex, const struct elf_phdr * const elf_phdata)
46757 +{
46758 +
46759 +#ifdef CONFIG_PAX_PT_PAX_FLAGS
46760 + unsigned long i;
46761 +
46762 + for (i = 0UL; i < elf_ex->e_phnum; i++)
46763 + if (elf_phdata[i].p_type == PT_PAX_FLAGS) {
46764 + if (((elf_phdata[i].p_flags & PF_PAGEEXEC) && (elf_phdata[i].p_flags & PF_NOPAGEEXEC)) ||
46765 + ((elf_phdata[i].p_flags & PF_SEGMEXEC) && (elf_phdata[i].p_flags & PF_NOSEGMEXEC)) ||
46766 + ((elf_phdata[i].p_flags & PF_EMUTRAMP) && (elf_phdata[i].p_flags & PF_NOEMUTRAMP)) ||
46767 + ((elf_phdata[i].p_flags & PF_MPROTECT) && (elf_phdata[i].p_flags & PF_NOMPROTECT)) ||
46768 + ((elf_phdata[i].p_flags & PF_RANDMMAP) && (elf_phdata[i].p_flags & PF_NORANDMMAP)))
46769 + return ~0UL;
46770 +
46771 +#ifdef CONFIG_PAX_SOFTMODE
46772 + if (pax_softmode)
46773 + return pax_parse_pt_pax_softmode(&elf_phdata[i]);
46774 + else
46775 +#endif
46776 +
46777 + return pax_parse_pt_pax_hardmode(&elf_phdata[i]);
46778 + break;
46779 + }
46780 +#endif
46781 +
46782 + return ~0UL;
46783 +}
46784 +
46785 +static unsigned long pax_parse_xattr_pax_softmode(unsigned long pax_flags_softmode)
46786 +{
46787 + unsigned long pax_flags = 0UL;
46788 +
46789 +#ifdef CONFIG_PAX_PAGEEXEC
46790 + if (pax_flags_softmode & MF_PAX_PAGEEXEC)
46791 + pax_flags |= MF_PAX_PAGEEXEC;
46792 +#endif
46793 +
46794 +#ifdef CONFIG_PAX_SEGMEXEC
46795 + if (pax_flags_softmode & MF_PAX_SEGMEXEC)
46796 + pax_flags |= MF_PAX_SEGMEXEC;
46797 +#endif
46798 +
46799 +#if defined(CONFIG_PAX_PAGEEXEC) && defined(CONFIG_PAX_SEGMEXEC)
46800 + if ((pax_flags & (MF_PAX_PAGEEXEC | MF_PAX_SEGMEXEC)) == (MF_PAX_PAGEEXEC | MF_PAX_SEGMEXEC)) {
46801 + if ((__supported_pte_mask & _PAGE_NX))
46802 + pax_flags &= ~MF_PAX_SEGMEXEC;
46803 + else
46804 + pax_flags &= ~MF_PAX_PAGEEXEC;
46805 + }
46806 +#endif
46807 +
46808 +#ifdef CONFIG_PAX_EMUTRAMP
46809 + if (pax_flags_softmode & MF_PAX_EMUTRAMP)
46810 + pax_flags |= MF_PAX_EMUTRAMP;
46811 +#endif
46812 +
46813 +#ifdef CONFIG_PAX_MPROTECT
46814 + if (pax_flags_softmode & MF_PAX_MPROTECT)
46815 + pax_flags |= MF_PAX_MPROTECT;
46816 +#endif
46817 +
46818 +#if defined(CONFIG_PAX_RANDMMAP) || defined(CONFIG_PAX_RANDUSTACK)
46819 + if (randomize_va_space && (pax_flags_softmode & MF_PAX_RANDMMAP))
46820 + pax_flags |= MF_PAX_RANDMMAP;
46821 +#endif
46822 +
46823 + return pax_flags;
46824 +}
46825 +
46826 +static unsigned long pax_parse_xattr_pax_hardmode(unsigned long pax_flags_hardmode)
46827 +{
46828 + unsigned long pax_flags = 0UL;
46829 +
46830 +#ifdef CONFIG_PAX_PAGEEXEC
46831 + if (!(pax_flags_hardmode & MF_PAX_PAGEEXEC))
46832 + pax_flags |= MF_PAX_PAGEEXEC;
46833 +#endif
46834 +
46835 +#ifdef CONFIG_PAX_SEGMEXEC
46836 + if (!(pax_flags_hardmode & MF_PAX_SEGMEXEC))
46837 + pax_flags |= MF_PAX_SEGMEXEC;
46838 +#endif
46839 +
46840 +#if defined(CONFIG_PAX_PAGEEXEC) && defined(CONFIG_PAX_SEGMEXEC)
46841 + if ((pax_flags & (MF_PAX_PAGEEXEC | MF_PAX_SEGMEXEC)) == (MF_PAX_PAGEEXEC | MF_PAX_SEGMEXEC)) {
46842 + if ((__supported_pte_mask & _PAGE_NX))
46843 + pax_flags &= ~MF_PAX_SEGMEXEC;
46844 + else
46845 + pax_flags &= ~MF_PAX_PAGEEXEC;
46846 + }
46847 +#endif
46848 +
46849 +#ifdef CONFIG_PAX_EMUTRAMP
46850 + if (!(pax_flags_hardmode & MF_PAX_EMUTRAMP))
46851 + pax_flags |= MF_PAX_EMUTRAMP;
46852 +#endif
46853 +
46854 +#ifdef CONFIG_PAX_MPROTECT
46855 + if (!(pax_flags_hardmode & MF_PAX_MPROTECT))
46856 + pax_flags |= MF_PAX_MPROTECT;
46857 +#endif
46858 +
46859 +#if defined(CONFIG_PAX_RANDMMAP) || defined(CONFIG_PAX_RANDUSTACK)
46860 + if (randomize_va_space && !(pax_flags_hardmode & MF_PAX_RANDMMAP))
46861 + pax_flags |= MF_PAX_RANDMMAP;
46862 +#endif
46863 +
46864 + return pax_flags;
46865 +}
46866 +
46867 +static unsigned long pax_parse_xattr_pax(struct file * const file)
46868 +{
46869 +
46870 +#ifdef CONFIG_PAX_XATTR_PAX_FLAGS
46871 + ssize_t xattr_size, i;
46872 + unsigned char xattr_value[5];
46873 + unsigned long pax_flags_hardmode = 0UL, pax_flags_softmode = 0UL;
46874 +
46875 + xattr_size = vfs_getxattr(file->f_path.dentry, XATTR_NAME_PAX_FLAGS, xattr_value, sizeof xattr_value);
46876 + if (xattr_size <= 0)
46877 + return ~0UL;
46878 +
46879 + for (i = 0; i < xattr_size; i++)
46880 + switch (xattr_value[i]) {
46881 + default:
46882 + return ~0UL;
46883 +
46884 +#define parse_flag(option1, option2, flag) \
46885 + case option1: \
46886 + pax_flags_hardmode |= MF_PAX_##flag; \
46887 + break; \
46888 + case option2: \
46889 + pax_flags_softmode |= MF_PAX_##flag; \
46890 + break;
46891 +
46892 + parse_flag('p', 'P', PAGEEXEC);
46893 + parse_flag('e', 'E', EMUTRAMP);
46894 + parse_flag('m', 'M', MPROTECT);
46895 + parse_flag('r', 'R', RANDMMAP);
46896 + parse_flag('s', 'S', SEGMEXEC);
46897 +
46898 +#undef parse_flag
46899 + }
46900 +
46901 + if (pax_flags_hardmode & pax_flags_softmode)
46902 + return ~0UL;
46903 +
46904 +#ifdef CONFIG_PAX_SOFTMODE
46905 + if (pax_softmode)
46906 + return pax_parse_xattr_pax_softmode(pax_flags_softmode);
46907 + else
46908 +#endif
46909 +
46910 + return pax_parse_xattr_pax_hardmode(pax_flags_hardmode);
46911 +#else
46912 + return ~0UL;
46913 +#endif
46914 +}
46915 +
46916 +#if defined(CONFIG_PAX_EI_PAX) || defined(CONFIG_PAX_PT_PAX_FLAGS) || defined(CONFIG_PAX_XATTR_PAX_FLAGS)
46917 +static long pax_parse_pax_flags(const struct elfhdr * const elf_ex, const struct elf_phdr * const elf_phdata, struct file * const file)
46918 +{
46919 + unsigned long pax_flags, pt_pax_flags, xattr_pax_flags;
46920 +
46921 + pax_flags = pax_parse_ei_pax(elf_ex);
46922 + pt_pax_flags = pax_parse_pt_pax(elf_ex, elf_phdata);
46923 + xattr_pax_flags = pax_parse_xattr_pax(file);
46924 +
46925 + if (pt_pax_flags == ~0UL)
46926 + pt_pax_flags = xattr_pax_flags;
46927 + else if (xattr_pax_flags == ~0UL)
46928 + xattr_pax_flags = pt_pax_flags;
46929 + if (pt_pax_flags != xattr_pax_flags)
46930 + return -EINVAL;
46931 + if (pt_pax_flags != ~0UL)
46932 + pax_flags = pt_pax_flags;
46933 +
46934 + if (0 > pax_check_flags(&pax_flags))
46935 + return -EINVAL;
46936 +
46937 + current->mm->pax_flags = pax_flags;
46938 + return 0;
46939 +}
46940 +#endif
46941 +
46942 /*
46943 * These are the functions used to load ELF style executables and shared
46944 * libraries. There is no binary dependent code anywhere else.
46945 @@ -548,6 +916,11 @@ static unsigned long randomize_stack_top(unsigned long stack_top)
46946 {
46947 unsigned int random_variable = 0;
46948
46949 +#ifdef CONFIG_PAX_RANDUSTACK
46950 + if (randomize_va_space)
46951 + return stack_top - current->mm->delta_stack;
46952 +#endif
46953 +
46954 if ((current->flags & PF_RANDOMIZE) &&
46955 !(current->personality & ADDR_NO_RANDOMIZE)) {
46956 random_variable = get_random_int() & STACK_RND_MASK;
46957 @@ -566,7 +939,7 @@ static int load_elf_binary(struct linux_binprm *bprm, struct pt_regs *regs)
46958 unsigned long load_addr = 0, load_bias = 0;
46959 int load_addr_set = 0;
46960 char * elf_interpreter = NULL;
46961 - unsigned long error;
46962 + unsigned long error = 0;
46963 struct elf_phdr *elf_ppnt, *elf_phdata;
46964 unsigned long elf_bss, elf_brk;
46965 int retval, i;
46966 @@ -576,11 +949,11 @@ static int load_elf_binary(struct linux_binprm *bprm, struct pt_regs *regs)
46967 unsigned long start_code, end_code, start_data, end_data;
46968 unsigned long reloc_func_desc = 0;
46969 int executable_stack = EXSTACK_DEFAULT;
46970 - unsigned long def_flags = 0;
46971 struct {
46972 struct elfhdr elf_ex;
46973 struct elfhdr interp_elf_ex;
46974 } *loc;
46975 + unsigned long pax_task_size = TASK_SIZE;
46976
46977 loc = kmalloc(sizeof(*loc), GFP_KERNEL);
46978 if (!loc) {
46979 @@ -718,11 +1091,80 @@ static int load_elf_binary(struct linux_binprm *bprm, struct pt_regs *regs)
46980
46981 /* OK, This is the point of no return */
46982 current->flags &= ~PF_FORKNOEXEC;
46983 - current->mm->def_flags = def_flags;
46984 +
46985 +#if defined(CONFIG_PAX_NOEXEC) || defined(CONFIG_PAX_ASLR)
46986 + current->mm->pax_flags = 0UL;
46987 +#endif
46988 +
46989 +#ifdef CONFIG_PAX_DLRESOLVE
46990 + current->mm->call_dl_resolve = 0UL;
46991 +#endif
46992 +
46993 +#if defined(CONFIG_PPC32) && defined(CONFIG_PAX_EMUSIGRT)
46994 + current->mm->call_syscall = 0UL;
46995 +#endif
46996 +
46997 +#ifdef CONFIG_PAX_ASLR
46998 + current->mm->delta_mmap = 0UL;
46999 + current->mm->delta_stack = 0UL;
47000 +#endif
47001 +
47002 + current->mm->def_flags = 0;
47003 +
47004 +#if defined(CONFIG_PAX_EI_PAX) || defined(CONFIG_PAX_PT_PAX_FLAGS) || defined(CONFIG_PAX_XATTR_PAX_FLAGS)
47005 + if (0 > pax_parse_pax_flags(&loc->elf_ex, elf_phdata, bprm->file)) {
47006 + send_sig(SIGKILL, current, 0);
47007 + goto out_free_dentry;
47008 + }
47009 +#endif
47010 +
47011 +#ifdef CONFIG_PAX_HAVE_ACL_FLAGS
47012 + pax_set_initial_flags(bprm);
47013 +#elif defined(CONFIG_PAX_HOOK_ACL_FLAGS)
47014 + if (pax_set_initial_flags_func)
47015 + (pax_set_initial_flags_func)(bprm);
47016 +#endif
47017 +
47018 +#ifdef CONFIG_ARCH_TRACK_EXEC_LIMIT
47019 + if ((current->mm->pax_flags & MF_PAX_PAGEEXEC) && !nx_enabled) {
47020 + current->mm->context.user_cs_limit = PAGE_SIZE;
47021 + current->mm->def_flags |= VM_PAGEEXEC;
47022 + }
47023 +#endif
47024 +
47025 +#ifdef CONFIG_PAX_SEGMEXEC
47026 + if (current->mm->pax_flags & MF_PAX_SEGMEXEC) {
47027 + current->mm->context.user_cs_base = SEGMEXEC_TASK_SIZE;
47028 + current->mm->context.user_cs_limit = TASK_SIZE-SEGMEXEC_TASK_SIZE;
47029 + pax_task_size = SEGMEXEC_TASK_SIZE;
47030 + }
47031 +#endif
47032 +
47033 +#if defined(CONFIG_ARCH_TRACK_EXEC_LIMIT) || defined(CONFIG_PAX_SEGMEXEC)
47034 + if (current->mm->pax_flags & (MF_PAX_PAGEEXEC | MF_PAX_SEGMEXEC)) {
47035 + set_user_cs(current->mm->context.user_cs_base, current->mm->context.user_cs_limit, get_cpu());
47036 + put_cpu();
47037 + }
47038 +#endif
47039
47040 /* Do this immediately, since STACK_TOP as used in setup_arg_pages
47041 may depend on the personality. */
47042 SET_PERSONALITY(loc->elf_ex);
47043 +
47044 +#ifdef CONFIG_PAX_ASLR
47045 + if (current->mm->pax_flags & MF_PAX_RANDMMAP) {
47046 + current->mm->delta_mmap = (pax_get_random_long() & ((1UL << PAX_DELTA_MMAP_LEN)-1)) << PAGE_SHIFT;
47047 + current->mm->delta_stack = (pax_get_random_long() & ((1UL << PAX_DELTA_STACK_LEN)-1)) << PAGE_SHIFT;
47048 + }
47049 +#endif
47050 +
47051 +#if defined(CONFIG_PAX_PAGEEXEC) || defined(CONFIG_PAX_SEGMEXEC)
47052 + if (current->mm->pax_flags & (MF_PAX_PAGEEXEC | MF_PAX_SEGMEXEC)) {
47053 + executable_stack = EXSTACK_DISABLE_X;
47054 + current->personality &= ~READ_IMPLIES_EXEC;
47055 + } else
47056 +#endif
47057 +
47058 if (elf_read_implies_exec(loc->elf_ex, executable_stack))
47059 current->personality |= READ_IMPLIES_EXEC;
47060
47061 @@ -800,10 +1242,27 @@ static int load_elf_binary(struct linux_binprm *bprm, struct pt_regs *regs)
47062 * might try to exec. This is because the brk will
47063 * follow the loader, and is not movable. */
47064 #ifdef CONFIG_X86
47065 - load_bias = 0;
47066 + if (current->flags & PF_RANDOMIZE)
47067 + load_bias = 0;
47068 + else
47069 + load_bias = ELF_PAGESTART(ELF_ET_DYN_BASE - vaddr);
47070 #else
47071 load_bias = ELF_PAGESTART(ELF_ET_DYN_BASE - vaddr);
47072 #endif
47073 +
47074 +#ifdef CONFIG_PAX_RANDMMAP
47075 + /* PaX: randomize base address at the default exe base if requested */
47076 + if ((current->mm->pax_flags & MF_PAX_RANDMMAP) && elf_interpreter) {
47077 +#ifdef CONFIG_SPARC64
47078 + load_bias = (pax_get_random_long() & ((1UL << PAX_DELTA_MMAP_LEN) - 1)) << (PAGE_SHIFT+1);
47079 +#else
47080 + load_bias = (pax_get_random_long() & ((1UL << PAX_DELTA_MMAP_LEN) - 1)) << PAGE_SHIFT;
47081 +#endif
47082 + load_bias = ELF_PAGESTART(PAX_ELF_ET_DYN_BASE - vaddr + load_bias);
47083 + elf_flags |= MAP_FIXED;
47084 + }
47085 +#endif
47086 +
47087 }
47088
47089 error = elf_map(bprm->file, load_bias + vaddr, elf_ppnt,
47090 @@ -836,9 +1295,9 @@ static int load_elf_binary(struct linux_binprm *bprm, struct pt_regs *regs)
47091 * allowed task size. Note that p_filesz must always be
47092 * <= p_memsz so it is only necessary to check p_memsz.
47093 */
47094 - if (BAD_ADDR(k) || elf_ppnt->p_filesz > elf_ppnt->p_memsz ||
47095 - elf_ppnt->p_memsz > TASK_SIZE ||
47096 - TASK_SIZE - elf_ppnt->p_memsz < k) {
47097 + if (k >= pax_task_size || elf_ppnt->p_filesz > elf_ppnt->p_memsz ||
47098 + elf_ppnt->p_memsz > pax_task_size ||
47099 + pax_task_size - elf_ppnt->p_memsz < k) {
47100 /* set_brk can never work. Avoid overflows. */
47101 send_sig(SIGKILL, current, 0);
47102 retval = -EINVAL;
47103 @@ -866,6 +1325,11 @@ static int load_elf_binary(struct linux_binprm *bprm, struct pt_regs *regs)
47104 start_data += load_bias;
47105 end_data += load_bias;
47106
47107 +#ifdef CONFIG_PAX_RANDMMAP
47108 + if (current->mm->pax_flags & MF_PAX_RANDMMAP)
47109 + elf_brk += PAGE_SIZE + ((pax_get_random_long() & ~PAGE_MASK) << 4);
47110 +#endif
47111 +
47112 /* Calling set_brk effectively mmaps the pages that we need
47113 * for the bss and break sections. We must do this before
47114 * mapping in the interpreter, to make sure it doesn't wind
47115 @@ -877,9 +1341,11 @@ static int load_elf_binary(struct linux_binprm *bprm, struct pt_regs *regs)
47116 goto out_free_dentry;
47117 }
47118 if (likely(elf_bss != elf_brk) && unlikely(padzero(elf_bss))) {
47119 - send_sig(SIGSEGV, current, 0);
47120 - retval = -EFAULT; /* Nobody gets to see this, but.. */
47121 - goto out_free_dentry;
47122 + /*
47123 + * This bss-zeroing can fail if the ELF
47124 + * file specifies odd protections. So
47125 + * we don't check the return value
47126 + */
47127 }
47128
47129 if (elf_interpreter) {
47130 @@ -1112,8 +1578,10 @@ static int dump_seek(struct file *file, loff_t off)
47131 unsigned long n = off;
47132 if (n > PAGE_SIZE)
47133 n = PAGE_SIZE;
47134 - if (!dump_write(file, buf, n))
47135 + if (!dump_write(file, buf, n)) {
47136 + free_page((unsigned long)buf);
47137 return 0;
47138 + }
47139 off -= n;
47140 }
47141 free_page((unsigned long)buf);
47142 @@ -1125,7 +1593,7 @@ static int dump_seek(struct file *file, loff_t off)
47143 * Decide what to dump of a segment, part, all or none.
47144 */
47145 static unsigned long vma_dump_size(struct vm_area_struct *vma,
47146 - unsigned long mm_flags)
47147 + unsigned long mm_flags, long signr)
47148 {
47149 #define FILTER(type) (mm_flags & (1UL << MMF_DUMP_##type))
47150
47151 @@ -1159,7 +1627,7 @@ static unsigned long vma_dump_size(struct vm_area_struct *vma,
47152 if (vma->vm_file == NULL)
47153 return 0;
47154
47155 - if (FILTER(MAPPED_PRIVATE))
47156 + if (signr == SIGKILL || FILTER(MAPPED_PRIVATE))
47157 goto whole;
47158
47159 /*
47160 @@ -1255,8 +1723,11 @@ static int writenote(struct memelfnote *men, struct file *file,
47161 #undef DUMP_WRITE
47162
47163 #define DUMP_WRITE(addr, nr) \
47164 + do { \
47165 + gr_learn_resource(current, RLIMIT_CORE, size + (nr), 1); \
47166 if ((size += (nr)) > limit || !dump_write(file, (addr), (nr))) \
47167 - goto end_coredump;
47168 + goto end_coredump; \
47169 + } while (0);
47170
47171 static void fill_elf_header(struct elfhdr *elf, int segs,
47172 u16 machine, u32 flags, u8 osabi)
47173 @@ -1385,9 +1856,9 @@ static void fill_auxv_note(struct memelfnote *note, struct mm_struct *mm)
47174 {
47175 elf_addr_t *auxv = (elf_addr_t *) mm->saved_auxv;
47176 int i = 0;
47177 - do
47178 + do {
47179 i += 2;
47180 - while (auxv[i - 2] != AT_NULL);
47181 + } while (auxv[i - 2] != AT_NULL);
47182 fill_note(note, "CORE", NT_AUXV, i * sizeof(elf_addr_t), auxv);
47183 }
47184
47185 @@ -1973,7 +2444,7 @@ static int elf_core_dump(long signr, struct pt_regs *regs, struct file *file, un
47186 phdr.p_offset = offset;
47187 phdr.p_vaddr = vma->vm_start;
47188 phdr.p_paddr = 0;
47189 - phdr.p_filesz = vma_dump_size(vma, mm_flags);
47190 + phdr.p_filesz = vma_dump_size(vma, mm_flags, signr);
47191 phdr.p_memsz = vma->vm_end - vma->vm_start;
47192 offset += phdr.p_filesz;
47193 phdr.p_flags = vma->vm_flags & VM_READ ? PF_R : 0;
47194 @@ -2006,7 +2477,7 @@ static int elf_core_dump(long signr, struct pt_regs *regs, struct file *file, un
47195 unsigned long addr;
47196 unsigned long end;
47197
47198 - end = vma->vm_start + vma_dump_size(vma, mm_flags);
47199 + end = vma->vm_start + vma_dump_size(vma, mm_flags, signr);
47200
47201 for (addr = vma->vm_start; addr < end; addr += PAGE_SIZE) {
47202 struct page *page;
47203 @@ -2015,6 +2486,7 @@ static int elf_core_dump(long signr, struct pt_regs *regs, struct file *file, un
47204 page = get_dump_page(addr);
47205 if (page) {
47206 void *kaddr = kmap(page);
47207 + gr_learn_resource(current, RLIMIT_CORE, size + PAGE_SIZE, 1);
47208 stop = ((size += PAGE_SIZE) > limit) ||
47209 !dump_write(file, kaddr, PAGE_SIZE);
47210 kunmap(page);
47211 @@ -2042,6 +2514,97 @@ out:
47212
47213 #endif /* USE_ELF_CORE_DUMP */
47214
47215 +#ifdef CONFIG_PAX_MPROTECT
47216 +/* PaX: non-PIC ELF libraries need relocations on their executable segments
47217 + * therefore we'll grant them VM_MAYWRITE once during their life. Similarly
47218 + * we'll remove VM_MAYWRITE for good on RELRO segments.
47219 + *
47220 + * The checks favour ld-linux.so behaviour which operates on a per ELF segment
47221 + * basis because we want to allow the common case and not the special ones.
47222 + */
47223 +static void elf_handle_mprotect(struct vm_area_struct *vma, unsigned long newflags)
47224 +{
47225 + struct elfhdr elf_h;
47226 + struct elf_phdr elf_p;
47227 + unsigned long i;
47228 + unsigned long oldflags;
47229 + bool is_textrel_rw, is_textrel_rx, is_relro;
47230 +
47231 + if (!(vma->vm_mm->pax_flags & MF_PAX_MPROTECT))
47232 + return;
47233 +
47234 + oldflags = vma->vm_flags & (VM_MAYEXEC | VM_MAYWRITE | VM_MAYREAD | VM_EXEC | VM_WRITE | VM_READ);
47235 + newflags &= VM_MAYEXEC | VM_MAYWRITE | VM_MAYREAD | VM_EXEC | VM_WRITE | VM_READ;
47236 +
47237 +#ifdef CONFIG_PAX_ELFRELOCS
47238 + /* possible TEXTREL */
47239 + is_textrel_rw = vma->vm_file && !vma->anon_vma && oldflags == (VM_MAYEXEC | VM_MAYREAD | VM_EXEC | VM_READ) && newflags == (VM_WRITE | VM_READ);
47240 + 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);
47241 +#else
47242 + is_textrel_rw = false;
47243 + is_textrel_rx = false;
47244 +#endif
47245 +
47246 + /* possible RELRO */
47247 + is_relro = vma->vm_file && vma->anon_vma && oldflags == (VM_MAYWRITE | VM_MAYREAD | VM_READ) && newflags == (VM_MAYWRITE | VM_MAYREAD | VM_READ);
47248 +
47249 + if (!is_textrel_rw && !is_textrel_rx && !is_relro)
47250 + return;
47251 +
47252 + if (sizeof(elf_h) != kernel_read(vma->vm_file, 0UL, (char *)&elf_h, sizeof(elf_h)) ||
47253 + memcmp(elf_h.e_ident, ELFMAG, SELFMAG) ||
47254 +
47255 +#ifdef CONFIG_PAX_ETEXECRELOCS
47256 + ((is_textrel_rw || is_textrel_rx) && (elf_h.e_type != ET_DYN && elf_h.e_type != ET_EXEC)) ||
47257 +#else
47258 + ((is_textrel_rw || is_textrel_rx) && elf_h.e_type != ET_DYN) ||
47259 +#endif
47260 +
47261 + (is_relro && (elf_h.e_type != ET_DYN && elf_h.e_type != ET_EXEC)) ||
47262 + !elf_check_arch(&elf_h) ||
47263 + elf_h.e_phentsize != sizeof(struct elf_phdr) ||
47264 + elf_h.e_phnum > 65536UL / sizeof(struct elf_phdr))
47265 + return;
47266 +
47267 + for (i = 0UL; i < elf_h.e_phnum; i++) {
47268 + if (sizeof(elf_p) != kernel_read(vma->vm_file, elf_h.e_phoff + i*sizeof(elf_p), (char *)&elf_p, sizeof(elf_p)))
47269 + return;
47270 + switch (elf_p.p_type) {
47271 + case PT_DYNAMIC:
47272 + if (!is_textrel_rw && !is_textrel_rx)
47273 + continue;
47274 + i = 0UL;
47275 + while ((i+1) * sizeof(elf_dyn) <= elf_p.p_filesz) {
47276 + elf_dyn dyn;
47277 +
47278 + if (sizeof(dyn) != kernel_read(vma->vm_file, elf_p.p_offset + i*sizeof(dyn), (char *)&dyn, sizeof(dyn)))
47279 + return;
47280 + if (dyn.d_tag == DT_NULL)
47281 + return;
47282 + if (dyn.d_tag == DT_TEXTREL || (dyn.d_tag == DT_FLAGS && (dyn.d_un.d_val & DF_TEXTREL))) {
47283 + gr_log_textrel(vma);
47284 + if (is_textrel_rw)
47285 + vma->vm_flags |= VM_MAYWRITE;
47286 + else
47287 + /* PaX: disallow write access after relocs are done, hopefully noone else needs it... */
47288 + vma->vm_flags &= ~VM_MAYWRITE;
47289 + return;
47290 + }
47291 + i++;
47292 + }
47293 + return;
47294 +
47295 + case PT_GNU_RELRO:
47296 + if (!is_relro)
47297 + continue;
47298 + if ((elf_p.p_offset >> PAGE_SHIFT) == vma->vm_pgoff && ELF_PAGEALIGN(elf_p.p_memsz) == vma->vm_end - vma->vm_start)
47299 + vma->vm_flags &= ~VM_MAYWRITE;
47300 + return;
47301 + }
47302 + }
47303 +}
47304 +#endif
47305 +
47306 static int __init init_elf_binfmt(void)
47307 {
47308 return register_binfmt(&elf_format);
47309 diff --git a/fs/binfmt_flat.c b/fs/binfmt_flat.c
47310 index ca88c46..f155a60 100644
47311 --- a/fs/binfmt_flat.c
47312 +++ b/fs/binfmt_flat.c
47313 @@ -564,7 +564,9 @@ static int load_flat_file(struct linux_binprm * bprm,
47314 realdatastart = (unsigned long) -ENOMEM;
47315 printk("Unable to allocate RAM for process data, errno %d\n",
47316 (int)-realdatastart);
47317 + down_write(&current->mm->mmap_sem);
47318 do_munmap(current->mm, textpos, text_len);
47319 + up_write(&current->mm->mmap_sem);
47320 ret = realdatastart;
47321 goto err;
47322 }
47323 @@ -588,8 +590,10 @@ static int load_flat_file(struct linux_binprm * bprm,
47324 }
47325 if (IS_ERR_VALUE(result)) {
47326 printk("Unable to read data+bss, errno %d\n", (int)-result);
47327 + down_write(&current->mm->mmap_sem);
47328 do_munmap(current->mm, textpos, text_len);
47329 do_munmap(current->mm, realdatastart, data_len + extra);
47330 + up_write(&current->mm->mmap_sem);
47331 ret = result;
47332 goto err;
47333 }
47334 @@ -658,8 +662,10 @@ static int load_flat_file(struct linux_binprm * bprm,
47335 }
47336 if (IS_ERR_VALUE(result)) {
47337 printk("Unable to read code+data+bss, errno %d\n",(int)-result);
47338 + down_write(&current->mm->mmap_sem);
47339 do_munmap(current->mm, textpos, text_len + data_len + extra +
47340 MAX_SHARED_LIBS * sizeof(unsigned long));
47341 + up_write(&current->mm->mmap_sem);
47342 ret = result;
47343 goto err;
47344 }
47345 diff --git a/fs/bio.c b/fs/bio.c
47346 index e696713..83de133 100644
47347 --- a/fs/bio.c
47348 +++ b/fs/bio.c
47349 @@ -78,7 +78,7 @@ static struct kmem_cache *bio_find_or_create_slab(unsigned int extra_size)
47350
47351 i = 0;
47352 while (i < bio_slab_nr) {
47353 - struct bio_slab *bslab = &bio_slabs[i];
47354 + bslab = &bio_slabs[i];
47355
47356 if (!bslab->slab && entry == -1)
47357 entry = i;
47358 @@ -1236,7 +1236,7 @@ static void bio_copy_kern_endio(struct bio *bio, int err)
47359 const int read = bio_data_dir(bio) == READ;
47360 struct bio_map_data *bmd = bio->bi_private;
47361 int i;
47362 - char *p = bmd->sgvecs[0].iov_base;
47363 + char *p = (char __force_kernel *)bmd->sgvecs[0].iov_base;
47364
47365 __bio_for_each_segment(bvec, bio, i, 0) {
47366 char *addr = page_address(bvec->bv_page);
47367 diff --git a/fs/block_dev.c b/fs/block_dev.c
47368 index e65efa2..04fae57 100644
47369 --- a/fs/block_dev.c
47370 +++ b/fs/block_dev.c
47371 @@ -664,7 +664,7 @@ int bd_claim(struct block_device *bdev, void *holder)
47372 else if (bdev->bd_contains == bdev)
47373 res = 0; /* is a whole device which isn't held */
47374
47375 - else if (bdev->bd_contains->bd_holder == bd_claim)
47376 + else if (bdev->bd_contains->bd_holder == (void *)bd_claim)
47377 res = 0; /* is a partition of a device that is being partitioned */
47378 else if (bdev->bd_contains->bd_holder != NULL)
47379 res = -EBUSY; /* is a partition of a held device */
47380 diff --git a/fs/btrfs/ctree.c b/fs/btrfs/ctree.c
47381 index c4bc570..42acd8d 100644
47382 --- a/fs/btrfs/ctree.c
47383 +++ b/fs/btrfs/ctree.c
47384 @@ -461,9 +461,12 @@ static noinline int __btrfs_cow_block(struct btrfs_trans_handle *trans,
47385 free_extent_buffer(buf);
47386 add_root_to_dirty_list(root);
47387 } else {
47388 - if (root->root_key.objectid == BTRFS_TREE_RELOC_OBJECTID)
47389 - parent_start = parent->start;
47390 - else
47391 + if (root->root_key.objectid == BTRFS_TREE_RELOC_OBJECTID) {
47392 + if (parent)
47393 + parent_start = parent->start;
47394 + else
47395 + parent_start = 0;
47396 + } else
47397 parent_start = 0;
47398
47399 WARN_ON(trans->transid != btrfs_header_generation(parent));
47400 @@ -3645,7 +3648,6 @@ setup_items_for_insert(struct btrfs_trans_handle *trans,
47401
47402 ret = 0;
47403 if (slot == 0) {
47404 - struct btrfs_disk_key disk_key;
47405 btrfs_cpu_key_to_disk(&disk_key, cpu_key);
47406 ret = fixup_low_keys(trans, root, path, &disk_key, 1);
47407 }
47408 diff --git a/fs/btrfs/disk-io.c b/fs/btrfs/disk-io.c
47409 index f447188..59c17c5 100644
47410 --- a/fs/btrfs/disk-io.c
47411 +++ b/fs/btrfs/disk-io.c
47412 @@ -39,7 +39,7 @@
47413 #include "tree-log.h"
47414 #include "free-space-cache.h"
47415
47416 -static struct extent_io_ops btree_extent_io_ops;
47417 +static const struct extent_io_ops btree_extent_io_ops;
47418 static void end_workqueue_fn(struct btrfs_work *work);
47419 static void free_fs_root(struct btrfs_root *root);
47420
47421 @@ -2607,7 +2607,7 @@ out:
47422 return 0;
47423 }
47424
47425 -static struct extent_io_ops btree_extent_io_ops = {
47426 +static const struct extent_io_ops btree_extent_io_ops = {
47427 .write_cache_pages_lock_hook = btree_lock_page_hook,
47428 .readpage_end_io_hook = btree_readpage_end_io_hook,
47429 .submit_bio_hook = btree_submit_bio_hook,
47430 diff --git a/fs/btrfs/extent-tree.c b/fs/btrfs/extent-tree.c
47431 index 559f724..a026171 100644
47432 --- a/fs/btrfs/extent-tree.c
47433 +++ b/fs/btrfs/extent-tree.c
47434 @@ -7141,6 +7141,10 @@ static noinline int relocate_one_extent(struct btrfs_root *extent_root,
47435 u64 group_start = group->key.objectid;
47436 new_extents = kmalloc(sizeof(*new_extents),
47437 GFP_NOFS);
47438 + if (!new_extents) {
47439 + ret = -ENOMEM;
47440 + goto out;
47441 + }
47442 nr_extents = 1;
47443 ret = get_new_locations(reloc_inode,
47444 extent_key,
47445 diff --git a/fs/btrfs/extent_io.h b/fs/btrfs/extent_io.h
47446 index 36de250..7ec75c7 100644
47447 --- a/fs/btrfs/extent_io.h
47448 +++ b/fs/btrfs/extent_io.h
47449 @@ -49,36 +49,36 @@ typedef int (extent_submit_bio_hook_t)(struct inode *inode, int rw,
47450 struct bio *bio, int mirror_num,
47451 unsigned long bio_flags);
47452 struct extent_io_ops {
47453 - int (*fill_delalloc)(struct inode *inode, struct page *locked_page,
47454 + int (* const fill_delalloc)(struct inode *inode, struct page *locked_page,
47455 u64 start, u64 end, int *page_started,
47456 unsigned long *nr_written);
47457 - int (*writepage_start_hook)(struct page *page, u64 start, u64 end);
47458 - int (*writepage_io_hook)(struct page *page, u64 start, u64 end);
47459 + int (* const writepage_start_hook)(struct page *page, u64 start, u64 end);
47460 + int (* const writepage_io_hook)(struct page *page, u64 start, u64 end);
47461 extent_submit_bio_hook_t *submit_bio_hook;
47462 - int (*merge_bio_hook)(struct page *page, unsigned long offset,
47463 + int (* const merge_bio_hook)(struct page *page, unsigned long offset,
47464 size_t size, struct bio *bio,
47465 unsigned long bio_flags);
47466 - int (*readpage_io_hook)(struct page *page, u64 start, u64 end);
47467 - int (*readpage_io_failed_hook)(struct bio *bio, struct page *page,
47468 + int (* const readpage_io_hook)(struct page *page, u64 start, u64 end);
47469 + int (* const readpage_io_failed_hook)(struct bio *bio, struct page *page,
47470 u64 start, u64 end,
47471 struct extent_state *state);
47472 - int (*writepage_io_failed_hook)(struct bio *bio, struct page *page,
47473 + int (* const writepage_io_failed_hook)(struct bio *bio, struct page *page,
47474 u64 start, u64 end,
47475 struct extent_state *state);
47476 - int (*readpage_end_io_hook)(struct page *page, u64 start, u64 end,
47477 + int (* const readpage_end_io_hook)(struct page *page, u64 start, u64 end,
47478 struct extent_state *state);
47479 - int (*writepage_end_io_hook)(struct page *page, u64 start, u64 end,
47480 + int (* const writepage_end_io_hook)(struct page *page, u64 start, u64 end,
47481 struct extent_state *state, int uptodate);
47482 - int (*set_bit_hook)(struct inode *inode, u64 start, u64 end,
47483 + int (* const set_bit_hook)(struct inode *inode, u64 start, u64 end,
47484 unsigned long old, unsigned long bits);
47485 - int (*clear_bit_hook)(struct inode *inode, struct extent_state *state,
47486 + int (* const clear_bit_hook)(struct inode *inode, struct extent_state *state,
47487 unsigned long bits);
47488 - int (*merge_extent_hook)(struct inode *inode,
47489 + int (* const merge_extent_hook)(struct inode *inode,
47490 struct extent_state *new,
47491 struct extent_state *other);
47492 - int (*split_extent_hook)(struct inode *inode,
47493 + int (* const split_extent_hook)(struct inode *inode,
47494 struct extent_state *orig, u64 split);
47495 - int (*write_cache_pages_lock_hook)(struct page *page);
47496 + int (* const write_cache_pages_lock_hook)(struct page *page);
47497 };
47498
47499 struct extent_io_tree {
47500 @@ -88,7 +88,7 @@ struct extent_io_tree {
47501 u64 dirty_bytes;
47502 spinlock_t lock;
47503 spinlock_t buffer_lock;
47504 - struct extent_io_ops *ops;
47505 + const struct extent_io_ops *ops;
47506 };
47507
47508 struct extent_state {
47509 diff --git a/fs/btrfs/free-space-cache.c b/fs/btrfs/free-space-cache.c
47510 index cb2849f..3718fb4 100644
47511 --- a/fs/btrfs/free-space-cache.c
47512 +++ b/fs/btrfs/free-space-cache.c
47513 @@ -1074,8 +1074,6 @@ u64 btrfs_alloc_from_cluster(struct btrfs_block_group_cache *block_group,
47514
47515 while(1) {
47516 if (entry->bytes < bytes || entry->offset < min_start) {
47517 - struct rb_node *node;
47518 -
47519 node = rb_next(&entry->offset_index);
47520 if (!node)
47521 break;
47522 @@ -1226,7 +1224,7 @@ again:
47523 */
47524 while (entry->bitmap || found_bitmap ||
47525 (!entry->bitmap && entry->bytes < min_bytes)) {
47526 - struct rb_node *node = rb_next(&entry->offset_index);
47527 + node = rb_next(&entry->offset_index);
47528
47529 if (entry->bitmap && entry->bytes > bytes + empty_size) {
47530 ret = btrfs_bitmap_cluster(block_group, entry, cluster,
47531 diff --git a/fs/btrfs/inode.c b/fs/btrfs/inode.c
47532 index e03a836..323837e 100644
47533 --- a/fs/btrfs/inode.c
47534 +++ b/fs/btrfs/inode.c
47535 @@ -63,7 +63,7 @@ static const struct inode_operations btrfs_file_inode_operations;
47536 static const struct address_space_operations btrfs_aops;
47537 static const struct address_space_operations btrfs_symlink_aops;
47538 static const struct file_operations btrfs_dir_file_operations;
47539 -static struct extent_io_ops btrfs_extent_io_ops;
47540 +static const struct extent_io_ops btrfs_extent_io_ops;
47541
47542 static struct kmem_cache *btrfs_inode_cachep;
47543 struct kmem_cache *btrfs_trans_handle_cachep;
47544 @@ -925,6 +925,7 @@ static int cow_file_range_async(struct inode *inode, struct page *locked_page,
47545 1, 0, NULL, GFP_NOFS);
47546 while (start < end) {
47547 async_cow = kmalloc(sizeof(*async_cow), GFP_NOFS);
47548 + BUG_ON(!async_cow);
47549 async_cow->inode = inode;
47550 async_cow->root = root;
47551 async_cow->locked_page = locked_page;
47552 @@ -4591,6 +4592,8 @@ static noinline int uncompress_inline(struct btrfs_path *path,
47553 inline_size = btrfs_file_extent_inline_item_len(leaf,
47554 btrfs_item_nr(leaf, path->slots[0]));
47555 tmp = kmalloc(inline_size, GFP_NOFS);
47556 + if (!tmp)
47557 + return -ENOMEM;
47558 ptr = btrfs_file_extent_inline_start(item);
47559
47560 read_extent_buffer(leaf, tmp, ptr, inline_size);
47561 @@ -5410,7 +5413,7 @@ fail:
47562 return -ENOMEM;
47563 }
47564
47565 -static int btrfs_getattr(struct vfsmount *mnt,
47566 +int btrfs_getattr(struct vfsmount *mnt,
47567 struct dentry *dentry, struct kstat *stat)
47568 {
47569 struct inode *inode = dentry->d_inode;
47570 @@ -5422,6 +5425,14 @@ static int btrfs_getattr(struct vfsmount *mnt,
47571 return 0;
47572 }
47573
47574 +EXPORT_SYMBOL(btrfs_getattr);
47575 +
47576 +dev_t get_btrfs_dev_from_inode(struct inode *inode)
47577 +{
47578 + return BTRFS_I(inode)->root->anon_super.s_dev;
47579 +}
47580 +EXPORT_SYMBOL(get_btrfs_dev_from_inode);
47581 +
47582 static int btrfs_rename(struct inode *old_dir, struct dentry *old_dentry,
47583 struct inode *new_dir, struct dentry *new_dentry)
47584 {
47585 @@ -5972,7 +5983,7 @@ static const struct file_operations btrfs_dir_file_operations = {
47586 .fsync = btrfs_sync_file,
47587 };
47588
47589 -static struct extent_io_ops btrfs_extent_io_ops = {
47590 +static const struct extent_io_ops btrfs_extent_io_ops = {
47591 .fill_delalloc = run_delalloc_range,
47592 .submit_bio_hook = btrfs_submit_bio_hook,
47593 .merge_bio_hook = btrfs_merge_bio_hook,
47594 diff --git a/fs/btrfs/relocation.c b/fs/btrfs/relocation.c
47595 index ab7ab53..94e0781 100644
47596 --- a/fs/btrfs/relocation.c
47597 +++ b/fs/btrfs/relocation.c
47598 @@ -884,7 +884,7 @@ static int __update_reloc_root(struct btrfs_root *root, int del)
47599 }
47600 spin_unlock(&rc->reloc_root_tree.lock);
47601
47602 - BUG_ON((struct btrfs_root *)node->data != root);
47603 + BUG_ON(!node || (struct btrfs_root *)node->data != root);
47604
47605 if (!del) {
47606 spin_lock(&rc->reloc_root_tree.lock);
47607 diff --git a/fs/btrfs/sysfs.c b/fs/btrfs/sysfs.c
47608 index a240b6f..4ce16ef 100644
47609 --- a/fs/btrfs/sysfs.c
47610 +++ b/fs/btrfs/sysfs.c
47611 @@ -164,12 +164,12 @@ static void btrfs_root_release(struct kobject *kobj)
47612 complete(&root->kobj_unregister);
47613 }
47614
47615 -static struct sysfs_ops btrfs_super_attr_ops = {
47616 +static const struct sysfs_ops btrfs_super_attr_ops = {
47617 .show = btrfs_super_attr_show,
47618 .store = btrfs_super_attr_store,
47619 };
47620
47621 -static struct sysfs_ops btrfs_root_attr_ops = {
47622 +static const struct sysfs_ops btrfs_root_attr_ops = {
47623 .show = btrfs_root_attr_show,
47624 .store = btrfs_root_attr_store,
47625 };
47626 diff --git a/fs/buffer.c b/fs/buffer.c
47627 index 6fa5302..395d9f6 100644
47628 --- a/fs/buffer.c
47629 +++ b/fs/buffer.c
47630 @@ -25,6 +25,7 @@
47631 #include <linux/percpu.h>
47632 #include <linux/slab.h>
47633 #include <linux/capability.h>
47634 +#include <linux/security.h>
47635 #include <linux/blkdev.h>
47636 #include <linux/file.h>
47637 #include <linux/quotaops.h>
47638 diff --git a/fs/cachefiles/bind.c b/fs/cachefiles/bind.c
47639 index 3797e00..ce776f6 100644
47640 --- a/fs/cachefiles/bind.c
47641 +++ b/fs/cachefiles/bind.c
47642 @@ -39,13 +39,11 @@ int cachefiles_daemon_bind(struct cachefiles_cache *cache, char *args)
47643 args);
47644
47645 /* start by checking things over */
47646 - ASSERT(cache->fstop_percent >= 0 &&
47647 - cache->fstop_percent < cache->fcull_percent &&
47648 + ASSERT(cache->fstop_percent < cache->fcull_percent &&
47649 cache->fcull_percent < cache->frun_percent &&
47650 cache->frun_percent < 100);
47651
47652 - ASSERT(cache->bstop_percent >= 0 &&
47653 - cache->bstop_percent < cache->bcull_percent &&
47654 + ASSERT(cache->bstop_percent < cache->bcull_percent &&
47655 cache->bcull_percent < cache->brun_percent &&
47656 cache->brun_percent < 100);
47657
47658 diff --git a/fs/cachefiles/daemon.c b/fs/cachefiles/daemon.c
47659 index 4618516..bb30d01 100644
47660 --- a/fs/cachefiles/daemon.c
47661 +++ b/fs/cachefiles/daemon.c
47662 @@ -220,7 +220,7 @@ static ssize_t cachefiles_daemon_write(struct file *file,
47663 if (test_bit(CACHEFILES_DEAD, &cache->flags))
47664 return -EIO;
47665
47666 - if (datalen < 0 || datalen > PAGE_SIZE - 1)
47667 + if (datalen > PAGE_SIZE - 1)
47668 return -EOPNOTSUPP;
47669
47670 /* drag the command string into the kernel so we can parse it */
47671 @@ -385,7 +385,7 @@ static int cachefiles_daemon_fstop(struct cachefiles_cache *cache, char *args)
47672 if (args[0] != '%' || args[1] != '\0')
47673 return -EINVAL;
47674
47675 - if (fstop < 0 || fstop >= cache->fcull_percent)
47676 + if (fstop >= cache->fcull_percent)
47677 return cachefiles_daemon_range_error(cache, args);
47678
47679 cache->fstop_percent = fstop;
47680 @@ -457,7 +457,7 @@ static int cachefiles_daemon_bstop(struct cachefiles_cache *cache, char *args)
47681 if (args[0] != '%' || args[1] != '\0')
47682 return -EINVAL;
47683
47684 - if (bstop < 0 || bstop >= cache->bcull_percent)
47685 + if (bstop >= cache->bcull_percent)
47686 return cachefiles_daemon_range_error(cache, args);
47687
47688 cache->bstop_percent = bstop;
47689 diff --git a/fs/cachefiles/internal.h b/fs/cachefiles/internal.h
47690 index f7c255f..fcd61de 100644
47691 --- a/fs/cachefiles/internal.h
47692 +++ b/fs/cachefiles/internal.h
47693 @@ -56,7 +56,7 @@ struct cachefiles_cache {
47694 wait_queue_head_t daemon_pollwq; /* poll waitqueue for daemon */
47695 struct rb_root active_nodes; /* active nodes (can't be culled) */
47696 rwlock_t active_lock; /* lock for active_nodes */
47697 - atomic_t gravecounter; /* graveyard uniquifier */
47698 + atomic_unchecked_t gravecounter; /* graveyard uniquifier */
47699 unsigned frun_percent; /* when to stop culling (% files) */
47700 unsigned fcull_percent; /* when to start culling (% files) */
47701 unsigned fstop_percent; /* when to stop allocating (% files) */
47702 @@ -168,19 +168,19 @@ extern int cachefiles_check_in_use(struct cachefiles_cache *cache,
47703 * proc.c
47704 */
47705 #ifdef CONFIG_CACHEFILES_HISTOGRAM
47706 -extern atomic_t cachefiles_lookup_histogram[HZ];
47707 -extern atomic_t cachefiles_mkdir_histogram[HZ];
47708 -extern atomic_t cachefiles_create_histogram[HZ];
47709 +extern atomic_unchecked_t cachefiles_lookup_histogram[HZ];
47710 +extern atomic_unchecked_t cachefiles_mkdir_histogram[HZ];
47711 +extern atomic_unchecked_t cachefiles_create_histogram[HZ];
47712
47713 extern int __init cachefiles_proc_init(void);
47714 extern void cachefiles_proc_cleanup(void);
47715 static inline
47716 -void cachefiles_hist(atomic_t histogram[], unsigned long start_jif)
47717 +void cachefiles_hist(atomic_unchecked_t histogram[], unsigned long start_jif)
47718 {
47719 unsigned long jif = jiffies - start_jif;
47720 if (jif >= HZ)
47721 jif = HZ - 1;
47722 - atomic_inc(&histogram[jif]);
47723 + atomic_inc_unchecked(&histogram[jif]);
47724 }
47725
47726 #else
47727 diff --git a/fs/cachefiles/namei.c b/fs/cachefiles/namei.c
47728 index 14ac480..a62766c 100644
47729 --- a/fs/cachefiles/namei.c
47730 +++ b/fs/cachefiles/namei.c
47731 @@ -250,7 +250,7 @@ try_again:
47732 /* first step is to make up a grave dentry in the graveyard */
47733 sprintf(nbuffer, "%08x%08x",
47734 (uint32_t) get_seconds(),
47735 - (uint32_t) atomic_inc_return(&cache->gravecounter));
47736 + (uint32_t) atomic_inc_return_unchecked(&cache->gravecounter));
47737
47738 /* do the multiway lock magic */
47739 trap = lock_rename(cache->graveyard, dir);
47740 diff --git a/fs/cachefiles/proc.c b/fs/cachefiles/proc.c
47741 index eccd339..4c1d995 100644
47742 --- a/fs/cachefiles/proc.c
47743 +++ b/fs/cachefiles/proc.c
47744 @@ -14,9 +14,9 @@
47745 #include <linux/seq_file.h>
47746 #include "internal.h"
47747
47748 -atomic_t cachefiles_lookup_histogram[HZ];
47749 -atomic_t cachefiles_mkdir_histogram[HZ];
47750 -atomic_t cachefiles_create_histogram[HZ];
47751 +atomic_unchecked_t cachefiles_lookup_histogram[HZ];
47752 +atomic_unchecked_t cachefiles_mkdir_histogram[HZ];
47753 +atomic_unchecked_t cachefiles_create_histogram[HZ];
47754
47755 /*
47756 * display the latency histogram
47757 @@ -35,9 +35,9 @@ static int cachefiles_histogram_show(struct seq_file *m, void *v)
47758 return 0;
47759 default:
47760 index = (unsigned long) v - 3;
47761 - x = atomic_read(&cachefiles_lookup_histogram[index]);
47762 - y = atomic_read(&cachefiles_mkdir_histogram[index]);
47763 - z = atomic_read(&cachefiles_create_histogram[index]);
47764 + x = atomic_read_unchecked(&cachefiles_lookup_histogram[index]);
47765 + y = atomic_read_unchecked(&cachefiles_mkdir_histogram[index]);
47766 + z = atomic_read_unchecked(&cachefiles_create_histogram[index]);
47767 if (x == 0 && y == 0 && z == 0)
47768 return 0;
47769
47770 diff --git a/fs/cachefiles/rdwr.c b/fs/cachefiles/rdwr.c
47771 index a6c8c6f..5cf8517 100644
47772 --- a/fs/cachefiles/rdwr.c
47773 +++ b/fs/cachefiles/rdwr.c
47774 @@ -946,7 +946,7 @@ int cachefiles_write_page(struct fscache_storage *op, struct page *page)
47775 old_fs = get_fs();
47776 set_fs(KERNEL_DS);
47777 ret = file->f_op->write(
47778 - file, (const void __user *) data, len, &pos);
47779 + file, (const void __force_user *) data, len, &pos);
47780 set_fs(old_fs);
47781 kunmap(page);
47782 if (ret != len)
47783 diff --git a/fs/cifs/cifs_debug.c b/fs/cifs/cifs_debug.c
47784 index 42cec2a..2aba466 100644
47785 --- a/fs/cifs/cifs_debug.c
47786 +++ b/fs/cifs/cifs_debug.c
47787 @@ -256,25 +256,25 @@ static ssize_t cifs_stats_proc_write(struct file *file,
47788 tcon = list_entry(tmp3,
47789 struct cifsTconInfo,
47790 tcon_list);
47791 - atomic_set(&tcon->num_smbs_sent, 0);
47792 - atomic_set(&tcon->num_writes, 0);
47793 - atomic_set(&tcon->num_reads, 0);
47794 - atomic_set(&tcon->num_oplock_brks, 0);
47795 - atomic_set(&tcon->num_opens, 0);
47796 - atomic_set(&tcon->num_posixopens, 0);
47797 - atomic_set(&tcon->num_posixmkdirs, 0);
47798 - atomic_set(&tcon->num_closes, 0);
47799 - atomic_set(&tcon->num_deletes, 0);
47800 - atomic_set(&tcon->num_mkdirs, 0);
47801 - atomic_set(&tcon->num_rmdirs, 0);
47802 - atomic_set(&tcon->num_renames, 0);
47803 - atomic_set(&tcon->num_t2renames, 0);
47804 - atomic_set(&tcon->num_ffirst, 0);
47805 - atomic_set(&tcon->num_fnext, 0);
47806 - atomic_set(&tcon->num_fclose, 0);
47807 - atomic_set(&tcon->num_hardlinks, 0);
47808 - atomic_set(&tcon->num_symlinks, 0);
47809 - atomic_set(&tcon->num_locks, 0);
47810 + atomic_set_unchecked(&tcon->num_smbs_sent, 0);
47811 + atomic_set_unchecked(&tcon->num_writes, 0);
47812 + atomic_set_unchecked(&tcon->num_reads, 0);
47813 + atomic_set_unchecked(&tcon->num_oplock_brks, 0);
47814 + atomic_set_unchecked(&tcon->num_opens, 0);
47815 + atomic_set_unchecked(&tcon->num_posixopens, 0);
47816 + atomic_set_unchecked(&tcon->num_posixmkdirs, 0);
47817 + atomic_set_unchecked(&tcon->num_closes, 0);
47818 + atomic_set_unchecked(&tcon->num_deletes, 0);
47819 + atomic_set_unchecked(&tcon->num_mkdirs, 0);
47820 + atomic_set_unchecked(&tcon->num_rmdirs, 0);
47821 + atomic_set_unchecked(&tcon->num_renames, 0);
47822 + atomic_set_unchecked(&tcon->num_t2renames, 0);
47823 + atomic_set_unchecked(&tcon->num_ffirst, 0);
47824 + atomic_set_unchecked(&tcon->num_fnext, 0);
47825 + atomic_set_unchecked(&tcon->num_fclose, 0);
47826 + atomic_set_unchecked(&tcon->num_hardlinks, 0);
47827 + atomic_set_unchecked(&tcon->num_symlinks, 0);
47828 + atomic_set_unchecked(&tcon->num_locks, 0);
47829 }
47830 }
47831 }
47832 @@ -334,41 +334,41 @@ static int cifs_stats_proc_show(struct seq_file *m, void *v)
47833 if (tcon->need_reconnect)
47834 seq_puts(m, "\tDISCONNECTED ");
47835 seq_printf(m, "\nSMBs: %d Oplock Breaks: %d",
47836 - atomic_read(&tcon->num_smbs_sent),
47837 - atomic_read(&tcon->num_oplock_brks));
47838 + atomic_read_unchecked(&tcon->num_smbs_sent),
47839 + atomic_read_unchecked(&tcon->num_oplock_brks));
47840 seq_printf(m, "\nReads: %d Bytes: %lld",
47841 - atomic_read(&tcon->num_reads),
47842 + atomic_read_unchecked(&tcon->num_reads),
47843 (long long)(tcon->bytes_read));
47844 seq_printf(m, "\nWrites: %d Bytes: %lld",
47845 - atomic_read(&tcon->num_writes),
47846 + atomic_read_unchecked(&tcon->num_writes),
47847 (long long)(tcon->bytes_written));
47848 seq_printf(m, "\nFlushes: %d",
47849 - atomic_read(&tcon->num_flushes));
47850 + atomic_read_unchecked(&tcon->num_flushes));
47851 seq_printf(m, "\nLocks: %d HardLinks: %d "
47852 "Symlinks: %d",
47853 - atomic_read(&tcon->num_locks),
47854 - atomic_read(&tcon->num_hardlinks),
47855 - atomic_read(&tcon->num_symlinks));
47856 + atomic_read_unchecked(&tcon->num_locks),
47857 + atomic_read_unchecked(&tcon->num_hardlinks),
47858 + atomic_read_unchecked(&tcon->num_symlinks));
47859 seq_printf(m, "\nOpens: %d Closes: %d "
47860 "Deletes: %d",
47861 - atomic_read(&tcon->num_opens),
47862 - atomic_read(&tcon->num_closes),
47863 - atomic_read(&tcon->num_deletes));
47864 + atomic_read_unchecked(&tcon->num_opens),
47865 + atomic_read_unchecked(&tcon->num_closes),
47866 + atomic_read_unchecked(&tcon->num_deletes));
47867 seq_printf(m, "\nPosix Opens: %d "
47868 "Posix Mkdirs: %d",
47869 - atomic_read(&tcon->num_posixopens),
47870 - atomic_read(&tcon->num_posixmkdirs));
47871 + atomic_read_unchecked(&tcon->num_posixopens),
47872 + atomic_read_unchecked(&tcon->num_posixmkdirs));
47873 seq_printf(m, "\nMkdirs: %d Rmdirs: %d",
47874 - atomic_read(&tcon->num_mkdirs),
47875 - atomic_read(&tcon->num_rmdirs));
47876 + atomic_read_unchecked(&tcon->num_mkdirs),
47877 + atomic_read_unchecked(&tcon->num_rmdirs));
47878 seq_printf(m, "\nRenames: %d T2 Renames %d",
47879 - atomic_read(&tcon->num_renames),
47880 - atomic_read(&tcon->num_t2renames));
47881 + atomic_read_unchecked(&tcon->num_renames),
47882 + atomic_read_unchecked(&tcon->num_t2renames));
47883 seq_printf(m, "\nFindFirst: %d FNext %d "
47884 "FClose %d",
47885 - atomic_read(&tcon->num_ffirst),
47886 - atomic_read(&tcon->num_fnext),
47887 - atomic_read(&tcon->num_fclose));
47888 + atomic_read_unchecked(&tcon->num_ffirst),
47889 + atomic_read_unchecked(&tcon->num_fnext),
47890 + atomic_read_unchecked(&tcon->num_fclose));
47891 }
47892 }
47893 }
47894 diff --git a/fs/cifs/cifsfs.c b/fs/cifs/cifsfs.c
47895 index 1445407..68cb0dc 100644
47896 --- a/fs/cifs/cifsfs.c
47897 +++ b/fs/cifs/cifsfs.c
47898 @@ -869,7 +869,7 @@ cifs_init_request_bufs(void)
47899 cifs_req_cachep = kmem_cache_create("cifs_request",
47900 CIFSMaxBufSize +
47901 MAX_CIFS_HDR_SIZE, 0,
47902 - SLAB_HWCACHE_ALIGN, NULL);
47903 + SLAB_HWCACHE_ALIGN | SLAB_USERCOPY, NULL);
47904 if (cifs_req_cachep == NULL)
47905 return -ENOMEM;
47906
47907 @@ -896,7 +896,7 @@ cifs_init_request_bufs(void)
47908 efficient to alloc 1 per page off the slab compared to 17K (5page)
47909 alloc of large cifs buffers even when page debugging is on */
47910 cifs_sm_req_cachep = kmem_cache_create("cifs_small_rq",
47911 - MAX_CIFS_SMALL_BUFFER_SIZE, 0, SLAB_HWCACHE_ALIGN,
47912 + MAX_CIFS_SMALL_BUFFER_SIZE, 0, SLAB_HWCACHE_ALIGN | SLAB_USERCOPY,
47913 NULL);
47914 if (cifs_sm_req_cachep == NULL) {
47915 mempool_destroy(cifs_req_poolp);
47916 @@ -991,8 +991,8 @@ init_cifs(void)
47917 atomic_set(&bufAllocCount, 0);
47918 atomic_set(&smBufAllocCount, 0);
47919 #ifdef CONFIG_CIFS_STATS2
47920 - atomic_set(&totBufAllocCount, 0);
47921 - atomic_set(&totSmBufAllocCount, 0);
47922 + atomic_set_unchecked(&totBufAllocCount, 0);
47923 + atomic_set_unchecked(&totSmBufAllocCount, 0);
47924 #endif /* CONFIG_CIFS_STATS2 */
47925
47926 atomic_set(&midCount, 0);
47927 diff --git a/fs/cifs/cifsglob.h b/fs/cifs/cifsglob.h
47928 index e29581e..1c22bab 100644
47929 --- a/fs/cifs/cifsglob.h
47930 +++ b/fs/cifs/cifsglob.h
47931 @@ -252,28 +252,28 @@ struct cifsTconInfo {
47932 __u16 Flags; /* optional support bits */
47933 enum statusEnum tidStatus;
47934 #ifdef CONFIG_CIFS_STATS
47935 - atomic_t num_smbs_sent;
47936 - atomic_t num_writes;
47937 - atomic_t num_reads;
47938 - atomic_t num_flushes;
47939 - atomic_t num_oplock_brks;
47940 - atomic_t num_opens;
47941 - atomic_t num_closes;
47942 - atomic_t num_deletes;
47943 - atomic_t num_mkdirs;
47944 - atomic_t num_posixopens;
47945 - atomic_t num_posixmkdirs;
47946 - atomic_t num_rmdirs;
47947 - atomic_t num_renames;
47948 - atomic_t num_t2renames;
47949 - atomic_t num_ffirst;
47950 - atomic_t num_fnext;
47951 - atomic_t num_fclose;
47952 - atomic_t num_hardlinks;
47953 - atomic_t num_symlinks;
47954 - atomic_t num_locks;
47955 - atomic_t num_acl_get;
47956 - atomic_t num_acl_set;
47957 + atomic_unchecked_t num_smbs_sent;
47958 + atomic_unchecked_t num_writes;
47959 + atomic_unchecked_t num_reads;
47960 + atomic_unchecked_t num_flushes;
47961 + atomic_unchecked_t num_oplock_brks;
47962 + atomic_unchecked_t num_opens;
47963 + atomic_unchecked_t num_closes;
47964 + atomic_unchecked_t num_deletes;
47965 + atomic_unchecked_t num_mkdirs;
47966 + atomic_unchecked_t num_posixopens;
47967 + atomic_unchecked_t num_posixmkdirs;
47968 + atomic_unchecked_t num_rmdirs;
47969 + atomic_unchecked_t num_renames;
47970 + atomic_unchecked_t num_t2renames;
47971 + atomic_unchecked_t num_ffirst;
47972 + atomic_unchecked_t num_fnext;
47973 + atomic_unchecked_t num_fclose;
47974 + atomic_unchecked_t num_hardlinks;
47975 + atomic_unchecked_t num_symlinks;
47976 + atomic_unchecked_t num_locks;
47977 + atomic_unchecked_t num_acl_get;
47978 + atomic_unchecked_t num_acl_set;
47979 #ifdef CONFIG_CIFS_STATS2
47980 unsigned long long time_writes;
47981 unsigned long long time_reads;
47982 @@ -414,7 +414,7 @@ static inline char CIFS_DIR_SEP(const struct cifs_sb_info *cifs_sb)
47983 }
47984
47985 #ifdef CONFIG_CIFS_STATS
47986 -#define cifs_stats_inc atomic_inc
47987 +#define cifs_stats_inc atomic_inc_unchecked
47988
47989 static inline void cifs_stats_bytes_written(struct cifsTconInfo *tcon,
47990 unsigned int bytes)
47991 @@ -701,8 +701,8 @@ GLOBAL_EXTERN atomic_t tconInfoReconnectCount;
47992 /* Various Debug counters */
47993 GLOBAL_EXTERN atomic_t bufAllocCount; /* current number allocated */
47994 #ifdef CONFIG_CIFS_STATS2
47995 -GLOBAL_EXTERN atomic_t totBufAllocCount; /* total allocated over all time */
47996 -GLOBAL_EXTERN atomic_t totSmBufAllocCount;
47997 +GLOBAL_EXTERN atomic_unchecked_t totBufAllocCount; /* total allocated over all time */
47998 +GLOBAL_EXTERN atomic_unchecked_t totSmBufAllocCount;
47999 #endif
48000 GLOBAL_EXTERN atomic_t smBufAllocCount;
48001 GLOBAL_EXTERN atomic_t midCount;
48002 diff --git a/fs/cifs/link.c b/fs/cifs/link.c
48003 index fc1e048..28b3441 100644
48004 --- a/fs/cifs/link.c
48005 +++ b/fs/cifs/link.c
48006 @@ -215,7 +215,7 @@ cifs_symlink(struct inode *inode, struct dentry *direntry, const char *symname)
48007
48008 void cifs_put_link(struct dentry *direntry, struct nameidata *nd, void *cookie)
48009 {
48010 - char *p = nd_get_link(nd);
48011 + const char *p = nd_get_link(nd);
48012 if (!IS_ERR(p))
48013 kfree(p);
48014 }
48015 diff --git a/fs/cifs/misc.c b/fs/cifs/misc.c
48016 index 95b82e8..12a538d 100644
48017 --- a/fs/cifs/misc.c
48018 +++ b/fs/cifs/misc.c
48019 @@ -155,7 +155,7 @@ cifs_buf_get(void)
48020 memset(ret_buf, 0, sizeof(struct smb_hdr) + 3);
48021 atomic_inc(&bufAllocCount);
48022 #ifdef CONFIG_CIFS_STATS2
48023 - atomic_inc(&totBufAllocCount);
48024 + atomic_inc_unchecked(&totBufAllocCount);
48025 #endif /* CONFIG_CIFS_STATS2 */
48026 }
48027
48028 @@ -190,7 +190,7 @@ cifs_small_buf_get(void)
48029 /* memset(ret_buf, 0, sizeof(struct smb_hdr) + 27);*/
48030 atomic_inc(&smBufAllocCount);
48031 #ifdef CONFIG_CIFS_STATS2
48032 - atomic_inc(&totSmBufAllocCount);
48033 + atomic_inc_unchecked(&totSmBufAllocCount);
48034 #endif /* CONFIG_CIFS_STATS2 */
48035
48036 }
48037 diff --git a/fs/coda/cache.c b/fs/coda/cache.c
48038 index a5bf577..6d19845 100644
48039 --- a/fs/coda/cache.c
48040 +++ b/fs/coda/cache.c
48041 @@ -24,14 +24,14 @@
48042 #include <linux/coda_fs_i.h>
48043 #include <linux/coda_cache.h>
48044
48045 -static atomic_t permission_epoch = ATOMIC_INIT(0);
48046 +static atomic_unchecked_t permission_epoch = ATOMIC_INIT(0);
48047
48048 /* replace or extend an acl cache hit */
48049 void coda_cache_enter(struct inode *inode, int mask)
48050 {
48051 struct coda_inode_info *cii = ITOC(inode);
48052
48053 - cii->c_cached_epoch = atomic_read(&permission_epoch);
48054 + cii->c_cached_epoch = atomic_read_unchecked(&permission_epoch);
48055 if (cii->c_uid != current_fsuid()) {
48056 cii->c_uid = current_fsuid();
48057 cii->c_cached_perm = mask;
48058 @@ -43,13 +43,13 @@ void coda_cache_enter(struct inode *inode, int mask)
48059 void coda_cache_clear_inode(struct inode *inode)
48060 {
48061 struct coda_inode_info *cii = ITOC(inode);
48062 - cii->c_cached_epoch = atomic_read(&permission_epoch) - 1;
48063 + cii->c_cached_epoch = atomic_read_unchecked(&permission_epoch) - 1;
48064 }
48065
48066 /* remove all acl caches */
48067 void coda_cache_clear_all(struct super_block *sb)
48068 {
48069 - atomic_inc(&permission_epoch);
48070 + atomic_inc_unchecked(&permission_epoch);
48071 }
48072
48073
48074 @@ -61,7 +61,7 @@ int coda_cache_check(struct inode *inode, int mask)
48075
48076 hit = (mask & cii->c_cached_perm) == mask &&
48077 cii->c_uid == current_fsuid() &&
48078 - cii->c_cached_epoch == atomic_read(&permission_epoch);
48079 + cii->c_cached_epoch == atomic_read_unchecked(&permission_epoch);
48080
48081 return hit;
48082 }
48083 diff --git a/fs/compat.c b/fs/compat.c
48084 index d1e2411..27064e4 100644
48085 --- a/fs/compat.c
48086 +++ b/fs/compat.c
48087 @@ -133,8 +133,8 @@ asmlinkage long compat_sys_utimes(char __user *filename, struct compat_timeval _
48088 static int cp_compat_stat(struct kstat *stat, struct compat_stat __user *ubuf)
48089 {
48090 compat_ino_t ino = stat->ino;
48091 - typeof(ubuf->st_uid) uid = 0;
48092 - typeof(ubuf->st_gid) gid = 0;
48093 + typeof(((struct compat_stat *)0)->st_uid) uid = 0;
48094 + typeof(((struct compat_stat *)0)->st_gid) gid = 0;
48095 int err;
48096
48097 SET_UID(uid, stat->uid);
48098 @@ -533,7 +533,7 @@ compat_sys_io_setup(unsigned nr_reqs, u32 __user *ctx32p)
48099
48100 set_fs(KERNEL_DS);
48101 /* The __user pointer cast is valid because of the set_fs() */
48102 - ret = sys_io_setup(nr_reqs, (aio_context_t __user *) &ctx64);
48103 + ret = sys_io_setup(nr_reqs, (aio_context_t __force_user *) &ctx64);
48104 set_fs(oldfs);
48105 /* truncating is ok because it's a user address */
48106 if (!ret)
48107 @@ -830,6 +830,7 @@ struct compat_old_linux_dirent {
48108
48109 struct compat_readdir_callback {
48110 struct compat_old_linux_dirent __user *dirent;
48111 + struct file * file;
48112 int result;
48113 };
48114
48115 @@ -847,6 +848,10 @@ static int compat_fillonedir(void *__buf, const char *name, int namlen,
48116 buf->result = -EOVERFLOW;
48117 return -EOVERFLOW;
48118 }
48119 +
48120 + if (!gr_acl_handle_filldir(buf->file, name, namlen, ino))
48121 + return 0;
48122 +
48123 buf->result++;
48124 dirent = buf->dirent;
48125 if (!access_ok(VERIFY_WRITE, dirent,
48126 @@ -879,6 +884,7 @@ asmlinkage long compat_sys_old_readdir(unsigned int fd,
48127
48128 buf.result = 0;
48129 buf.dirent = dirent;
48130 + buf.file = file;
48131
48132 error = vfs_readdir(file, compat_fillonedir, &buf);
48133 if (buf.result)
48134 @@ -899,6 +905,7 @@ struct compat_linux_dirent {
48135 struct compat_getdents_callback {
48136 struct compat_linux_dirent __user *current_dir;
48137 struct compat_linux_dirent __user *previous;
48138 + struct file * file;
48139 int count;
48140 int error;
48141 };
48142 @@ -919,6 +926,10 @@ static int compat_filldir(void *__buf, const char *name, int namlen,
48143 buf->error = -EOVERFLOW;
48144 return -EOVERFLOW;
48145 }
48146 +
48147 + if (!gr_acl_handle_filldir(buf->file, name, namlen, ino))
48148 + return 0;
48149 +
48150 dirent = buf->previous;
48151 if (dirent) {
48152 if (__put_user(offset, &dirent->d_off))
48153 @@ -966,6 +977,7 @@ asmlinkage long compat_sys_getdents(unsigned int fd,
48154 buf.previous = NULL;
48155 buf.count = count;
48156 buf.error = 0;
48157 + buf.file = file;
48158
48159 error = vfs_readdir(file, compat_filldir, &buf);
48160 if (error >= 0)
48161 @@ -987,6 +999,7 @@ out:
48162 struct compat_getdents_callback64 {
48163 struct linux_dirent64 __user *current_dir;
48164 struct linux_dirent64 __user *previous;
48165 + struct file * file;
48166 int count;
48167 int error;
48168 };
48169 @@ -1003,6 +1016,10 @@ static int compat_filldir64(void * __buf, const char * name, int namlen, loff_t
48170 buf->error = -EINVAL; /* only used if we fail.. */
48171 if (reclen > buf->count)
48172 return -EINVAL;
48173 +
48174 + if (!gr_acl_handle_filldir(buf->file, name, namlen, ino))
48175 + return 0;
48176 +
48177 dirent = buf->previous;
48178
48179 if (dirent) {
48180 @@ -1054,13 +1071,14 @@ asmlinkage long compat_sys_getdents64(unsigned int fd,
48181 buf.previous = NULL;
48182 buf.count = count;
48183 buf.error = 0;
48184 + buf.file = file;
48185
48186 error = vfs_readdir(file, compat_filldir64, &buf);
48187 if (error >= 0)
48188 error = buf.error;
48189 lastdirent = buf.previous;
48190 if (lastdirent) {
48191 - typeof(lastdirent->d_off) d_off = file->f_pos;
48192 + typeof(((struct linux_dirent64 *)0)->d_off) d_off = file->f_pos;
48193 if (__put_user_unaligned(d_off, &lastdirent->d_off))
48194 error = -EFAULT;
48195 else
48196 @@ -1098,7 +1116,7 @@ static ssize_t compat_do_readv_writev(int type, struct file *file,
48197 * verify all the pointers
48198 */
48199 ret = -EINVAL;
48200 - if ((nr_segs > UIO_MAXIOV) || (nr_segs <= 0))
48201 + if (nr_segs > UIO_MAXIOV)
48202 goto out;
48203 if (!file->f_op)
48204 goto out;
48205 @@ -1463,11 +1481,35 @@ int compat_do_execve(char * filename,
48206 compat_uptr_t __user *envp,
48207 struct pt_regs * regs)
48208 {
48209 +#ifdef CONFIG_GRKERNSEC
48210 + struct file *old_exec_file;
48211 + struct acl_subject_label *old_acl;
48212 + struct rlimit old_rlim[RLIM_NLIMITS];
48213 +#endif
48214 struct linux_binprm *bprm;
48215 struct file *file;
48216 struct files_struct *displaced;
48217 bool clear_in_exec;
48218 int retval;
48219 + const struct cred *cred = current_cred();
48220 +
48221 + /*
48222 + * We move the actual failure in case of RLIMIT_NPROC excess from
48223 + * set*uid() to execve() because too many poorly written programs
48224 + * don't check setuid() return code. Here we additionally recheck
48225 + * whether NPROC limit is still exceeded.
48226 + */
48227 + gr_learn_resource(current, RLIMIT_NPROC, atomic_read(&current->cred->user->processes), 1);
48228 +
48229 + if ((current->flags & PF_NPROC_EXCEEDED) &&
48230 + atomic_read(&cred->user->processes) > current->signal->rlim[RLIMIT_NPROC].rlim_cur) {
48231 + retval = -EAGAIN;
48232 + goto out_ret;
48233 + }
48234 +
48235 + /* We're below the limit (still or again), so we don't want to make
48236 + * further execve() calls fail. */
48237 + current->flags &= ~PF_NPROC_EXCEEDED;
48238
48239 retval = unshare_files(&displaced);
48240 if (retval)
48241 @@ -1499,6 +1541,15 @@ int compat_do_execve(char * filename,
48242 bprm->filename = filename;
48243 bprm->interp = filename;
48244
48245 + if (gr_process_user_ban()) {
48246 + retval = -EPERM;
48247 + goto out_file;
48248 + }
48249 +
48250 + retval = -EACCES;
48251 + if (!gr_acl_handle_execve(file->f_dentry, file->f_vfsmnt))
48252 + goto out_file;
48253 +
48254 retval = bprm_mm_init(bprm);
48255 if (retval)
48256 goto out_file;
48257 @@ -1528,9 +1579,40 @@ int compat_do_execve(char * filename,
48258 if (retval < 0)
48259 goto out;
48260
48261 + if (!gr_tpe_allow(file)) {
48262 + retval = -EACCES;
48263 + goto out;
48264 + }
48265 +
48266 + if (gr_check_crash_exec(file)) {
48267 + retval = -EACCES;
48268 + goto out;
48269 + }
48270 +
48271 + gr_log_chroot_exec(file->f_dentry, file->f_vfsmnt);
48272 +
48273 + gr_handle_exec_args_compat(bprm, argv);
48274 +
48275 +#ifdef CONFIG_GRKERNSEC
48276 + old_acl = current->acl;
48277 + memcpy(old_rlim, current->signal->rlim, sizeof(old_rlim));
48278 + old_exec_file = current->exec_file;
48279 + get_file(file);
48280 + current->exec_file = file;
48281 +#endif
48282 +
48283 + retval = gr_set_proc_label(file->f_dentry, file->f_vfsmnt,
48284 + bprm->unsafe & LSM_UNSAFE_SHARE);
48285 + if (retval < 0)
48286 + goto out_fail;
48287 +
48288 retval = search_binary_handler(bprm, regs);
48289 if (retval < 0)
48290 - goto out;
48291 + goto out_fail;
48292 +#ifdef CONFIG_GRKERNSEC
48293 + if (old_exec_file)
48294 + fput(old_exec_file);
48295 +#endif
48296
48297 /* execve succeeded */
48298 current->fs->in_exec = 0;
48299 @@ -1541,6 +1623,14 @@ int compat_do_execve(char * filename,
48300 put_files_struct(displaced);
48301 return retval;
48302
48303 +out_fail:
48304 +#ifdef CONFIG_GRKERNSEC
48305 + current->acl = old_acl;
48306 + memcpy(current->signal->rlim, old_rlim, sizeof(old_rlim));
48307 + fput(current->exec_file);
48308 + current->exec_file = old_exec_file;
48309 +#endif
48310 +
48311 out:
48312 if (bprm->mm) {
48313 acct_arg_size(bprm, 0);
48314 @@ -1711,6 +1801,8 @@ int compat_core_sys_select(int n, compat_ulong_t __user *inp,
48315 struct fdtable *fdt;
48316 long stack_fds[SELECT_STACK_ALLOC/sizeof(long)];
48317
48318 + pax_track_stack();
48319 +
48320 if (n < 0)
48321 goto out_nofds;
48322
48323 @@ -2151,7 +2243,7 @@ asmlinkage long compat_sys_nfsservctl(int cmd,
48324 oldfs = get_fs();
48325 set_fs(KERNEL_DS);
48326 /* The __user pointer casts are valid because of the set_fs() */
48327 - err = sys_nfsservctl(cmd, (void __user *) karg, (void __user *) kres);
48328 + err = sys_nfsservctl(cmd, (void __force_user *) karg, (void __force_user *) kres);
48329 set_fs(oldfs);
48330
48331 if (err)
48332 diff --git a/fs/compat_binfmt_elf.c b/fs/compat_binfmt_elf.c
48333 index 0adced2..bbb1b0d 100644
48334 --- a/fs/compat_binfmt_elf.c
48335 +++ b/fs/compat_binfmt_elf.c
48336 @@ -29,10 +29,12 @@
48337 #undef elfhdr
48338 #undef elf_phdr
48339 #undef elf_note
48340 +#undef elf_dyn
48341 #undef elf_addr_t
48342 #define elfhdr elf32_hdr
48343 #define elf_phdr elf32_phdr
48344 #define elf_note elf32_note
48345 +#define elf_dyn Elf32_Dyn
48346 #define elf_addr_t Elf32_Addr
48347
48348 /*
48349 diff --git a/fs/compat_ioctl.c b/fs/compat_ioctl.c
48350 index d84e705..d8c364c 100644
48351 --- a/fs/compat_ioctl.c
48352 +++ b/fs/compat_ioctl.c
48353 @@ -234,6 +234,8 @@ static int do_video_set_spu_palette(unsigned int fd, unsigned int cmd, unsigned
48354 up = (struct compat_video_spu_palette __user *) arg;
48355 err = get_user(palp, &up->palette);
48356 err |= get_user(length, &up->length);
48357 + if (err)
48358 + return -EFAULT;
48359
48360 up_native = compat_alloc_user_space(sizeof(struct video_spu_palette));
48361 err = put_user(compat_ptr(palp), &up_native->palette);
48362 @@ -1513,7 +1515,7 @@ static int serial_struct_ioctl(unsigned fd, unsigned cmd, unsigned long arg)
48363 return -EFAULT;
48364 if (__get_user(udata, &ss32->iomem_base))
48365 return -EFAULT;
48366 - ss.iomem_base = compat_ptr(udata);
48367 + ss.iomem_base = (unsigned char __force_kernel *)compat_ptr(udata);
48368 if (__get_user(ss.iomem_reg_shift, &ss32->iomem_reg_shift) ||
48369 __get_user(ss.port_high, &ss32->port_high))
48370 return -EFAULT;
48371 @@ -1809,7 +1811,7 @@ static int compat_ioctl_preallocate(struct file *file, unsigned long arg)
48372 copy_in_user(&p->l_len, &p32->l_len, sizeof(s64)) ||
48373 copy_in_user(&p->l_sysid, &p32->l_sysid, sizeof(s32)) ||
48374 copy_in_user(&p->l_pid, &p32->l_pid, sizeof(u32)) ||
48375 - copy_in_user(&p->l_pad, &p32->l_pad, 4*sizeof(u32)))
48376 + copy_in_user(p->l_pad, &p32->l_pad, 4*sizeof(u32)))
48377 return -EFAULT;
48378
48379 return ioctl_preallocate(file, p);
48380 diff --git a/fs/configfs/dir.c b/fs/configfs/dir.c
48381 index 8e48b52..f01ed91 100644
48382 --- a/fs/configfs/dir.c
48383 +++ b/fs/configfs/dir.c
48384 @@ -1572,7 +1572,8 @@ static int configfs_readdir(struct file * filp, void * dirent, filldir_t filldir
48385 }
48386 for (p=q->next; p!= &parent_sd->s_children; p=p->next) {
48387 struct configfs_dirent *next;
48388 - const char * name;
48389 + const unsigned char * name;
48390 + char d_name[sizeof(next->s_dentry->d_iname)];
48391 int len;
48392
48393 next = list_entry(p, struct configfs_dirent,
48394 @@ -1581,7 +1582,12 @@ static int configfs_readdir(struct file * filp, void * dirent, filldir_t filldir
48395 continue;
48396
48397 name = configfs_get_name(next);
48398 - len = strlen(name);
48399 + if (next->s_dentry && name == next->s_dentry->d_iname) {
48400 + len = next->s_dentry->d_name.len;
48401 + memcpy(d_name, name, len);
48402 + name = d_name;
48403 + } else
48404 + len = strlen(name);
48405 if (next->s_dentry)
48406 ino = next->s_dentry->d_inode->i_ino;
48407 else
48408 diff --git a/fs/dcache.c b/fs/dcache.c
48409 index 44c0aea..2529092 100644
48410 --- a/fs/dcache.c
48411 +++ b/fs/dcache.c
48412 @@ -45,8 +45,6 @@ EXPORT_SYMBOL(dcache_lock);
48413
48414 static struct kmem_cache *dentry_cache __read_mostly;
48415
48416 -#define DNAME_INLINE_LEN (sizeof(struct dentry)-offsetof(struct dentry,d_iname))
48417 -
48418 /*
48419 * This is the single most critical data structure when it comes
48420 * to the dcache: the hashtable for lookups. Somebody should try
48421 @@ -2319,7 +2317,7 @@ void __init vfs_caches_init(unsigned long mempages)
48422 mempages -= reserve;
48423
48424 names_cachep = kmem_cache_create("names_cache", PATH_MAX, 0,
48425 - SLAB_HWCACHE_ALIGN|SLAB_PANIC, NULL);
48426 + SLAB_HWCACHE_ALIGN|SLAB_PANIC|SLAB_USERCOPY, NULL);
48427
48428 dcache_init();
48429 inode_init();
48430 diff --git a/fs/dlm/lockspace.c b/fs/dlm/lockspace.c
48431 index c010ecf..a8d8c59 100644
48432 --- a/fs/dlm/lockspace.c
48433 +++ b/fs/dlm/lockspace.c
48434 @@ -148,7 +148,7 @@ static void lockspace_kobj_release(struct kobject *k)
48435 kfree(ls);
48436 }
48437
48438 -static struct sysfs_ops dlm_attr_ops = {
48439 +static const struct sysfs_ops dlm_attr_ops = {
48440 .show = dlm_attr_show,
48441 .store = dlm_attr_store,
48442 };
48443 diff --git a/fs/ecryptfs/inode.c b/fs/ecryptfs/inode.c
48444 index 88ba4d4..073f003 100644
48445 --- a/fs/ecryptfs/inode.c
48446 +++ b/fs/ecryptfs/inode.c
48447 @@ -660,7 +660,7 @@ static int ecryptfs_readlink_lower(struct dentry *dentry, char **buf,
48448 old_fs = get_fs();
48449 set_fs(get_ds());
48450 rc = lower_dentry->d_inode->i_op->readlink(lower_dentry,
48451 - (char __user *)lower_buf,
48452 + (char __force_user *)lower_buf,
48453 lower_bufsiz);
48454 set_fs(old_fs);
48455 if (rc < 0)
48456 @@ -706,7 +706,7 @@ static void *ecryptfs_follow_link(struct dentry *dentry, struct nameidata *nd)
48457 }
48458 old_fs = get_fs();
48459 set_fs(get_ds());
48460 - rc = dentry->d_inode->i_op->readlink(dentry, (char __user *)buf, len);
48461 + rc = dentry->d_inode->i_op->readlink(dentry, (__force char __user *)buf, len);
48462 set_fs(old_fs);
48463 if (rc < 0)
48464 goto out_free;
48465 diff --git a/fs/exec.c b/fs/exec.c
48466 index 86fafc6..6d33cbb 100644
48467 --- a/fs/exec.c
48468 +++ b/fs/exec.c
48469 @@ -56,12 +56,28 @@
48470 #include <linux/fsnotify.h>
48471 #include <linux/fs_struct.h>
48472 #include <linux/pipe_fs_i.h>
48473 +#include <linux/random.h>
48474 +#include <linux/seq_file.h>
48475 +
48476 +#ifdef CONFIG_PAX_REFCOUNT
48477 +#include <linux/kallsyms.h>
48478 +#include <linux/kdebug.h>
48479 +#endif
48480
48481 #include <asm/uaccess.h>
48482 #include <asm/mmu_context.h>
48483 #include <asm/tlb.h>
48484 #include "internal.h"
48485
48486 +#ifndef CONFIG_PAX_HAVE_ACL_FLAGS
48487 +void __weak pax_set_initial_flags(struct linux_binprm *bprm) {}
48488 +#endif
48489 +
48490 +#ifdef CONFIG_PAX_HOOK_ACL_FLAGS
48491 +void (*pax_set_initial_flags_func)(struct linux_binprm *bprm);
48492 +EXPORT_SYMBOL(pax_set_initial_flags_func);
48493 +#endif
48494 +
48495 int core_uses_pid;
48496 char core_pattern[CORENAME_MAX_SIZE] = "core";
48497 unsigned int core_pipe_limit;
48498 @@ -178,18 +194,10 @@ struct page *get_arg_page(struct linux_binprm *bprm, unsigned long pos,
48499 int write)
48500 {
48501 struct page *page;
48502 - int ret;
48503
48504 -#ifdef CONFIG_STACK_GROWSUP
48505 - if (write) {
48506 - ret = expand_stack_downwards(bprm->vma, pos);
48507 - if (ret < 0)
48508 - return NULL;
48509 - }
48510 -#endif
48511 - ret = get_user_pages(current, bprm->mm, pos,
48512 - 1, write, 1, &page, NULL);
48513 - if (ret <= 0)
48514 + if (0 > expand_stack_downwards(bprm->vma, pos))
48515 + return NULL;
48516 + if (0 >= get_user_pages(current, bprm->mm, pos, 1, write, 1, &page, NULL))
48517 return NULL;
48518
48519 if (write) {
48520 @@ -263,6 +271,11 @@ static int __bprm_mm_init(struct linux_binprm *bprm)
48521 vma->vm_end = STACK_TOP_MAX;
48522 vma->vm_start = vma->vm_end - PAGE_SIZE;
48523 vma->vm_flags = VM_STACK_FLAGS;
48524 +
48525 +#ifdef CONFIG_PAX_SEGMEXEC
48526 + vma->vm_flags &= ~(VM_EXEC | VM_MAYEXEC);
48527 +#endif
48528 +
48529 vma->vm_page_prot = vm_get_page_prot(vma->vm_flags);
48530
48531 err = security_file_mmap(NULL, 0, 0, 0, vma->vm_start, 1);
48532 @@ -276,6 +289,12 @@ static int __bprm_mm_init(struct linux_binprm *bprm)
48533 mm->stack_vm = mm->total_vm = 1;
48534 up_write(&mm->mmap_sem);
48535 bprm->p = vma->vm_end - sizeof(void *);
48536 +
48537 +#ifdef CONFIG_PAX_RANDUSTACK
48538 + if (randomize_va_space)
48539 + bprm->p ^= (pax_get_random_long() & ~15) & ~PAGE_MASK;
48540 +#endif
48541 +
48542 return 0;
48543 err:
48544 up_write(&mm->mmap_sem);
48545 @@ -510,7 +529,7 @@ int copy_strings_kernel(int argc,char ** argv, struct linux_binprm *bprm)
48546 int r;
48547 mm_segment_t oldfs = get_fs();
48548 set_fs(KERNEL_DS);
48549 - r = copy_strings(argc, (char __user * __user *)argv, bprm);
48550 + r = copy_strings(argc, (__force char __user * __user *)argv, bprm);
48551 set_fs(oldfs);
48552 return r;
48553 }
48554 @@ -540,7 +559,8 @@ static int shift_arg_pages(struct vm_area_struct *vma, unsigned long shift)
48555 unsigned long new_end = old_end - shift;
48556 struct mmu_gather *tlb;
48557
48558 - BUG_ON(new_start > new_end);
48559 + if (new_start >= new_end || new_start < mmap_min_addr)
48560 + return -ENOMEM;
48561
48562 /*
48563 * ensure there are no vmas between where we want to go
48564 @@ -549,6 +569,10 @@ static int shift_arg_pages(struct vm_area_struct *vma, unsigned long shift)
48565 if (vma != find_vma(mm, new_start))
48566 return -EFAULT;
48567
48568 +#ifdef CONFIG_PAX_SEGMEXEC
48569 + BUG_ON(pax_find_mirror_vma(vma));
48570 +#endif
48571 +
48572 /*
48573 * cover the whole range: [new_start, old_end)
48574 */
48575 @@ -630,10 +654,6 @@ int setup_arg_pages(struct linux_binprm *bprm,
48576 stack_top = arch_align_stack(stack_top);
48577 stack_top = PAGE_ALIGN(stack_top);
48578
48579 - if (unlikely(stack_top < mmap_min_addr) ||
48580 - unlikely(vma->vm_end - vma->vm_start >= stack_top - mmap_min_addr))
48581 - return -ENOMEM;
48582 -
48583 stack_shift = vma->vm_end - stack_top;
48584
48585 bprm->p -= stack_shift;
48586 @@ -645,6 +665,14 @@ int setup_arg_pages(struct linux_binprm *bprm,
48587 bprm->exec -= stack_shift;
48588
48589 down_write(&mm->mmap_sem);
48590 +
48591 + /* Move stack pages down in memory. */
48592 + if (stack_shift) {
48593 + ret = shift_arg_pages(vma, stack_shift);
48594 + if (ret)
48595 + goto out_unlock;
48596 + }
48597 +
48598 vm_flags = VM_STACK_FLAGS;
48599
48600 /*
48601 @@ -658,19 +686,24 @@ int setup_arg_pages(struct linux_binprm *bprm,
48602 vm_flags &= ~VM_EXEC;
48603 vm_flags |= mm->def_flags;
48604
48605 +#if defined(CONFIG_PAX_PAGEEXEC) || defined(CONFIG_PAX_SEGMEXEC)
48606 + if (mm->pax_flags & (MF_PAX_PAGEEXEC | MF_PAX_SEGMEXEC)) {
48607 + vm_flags &= ~VM_EXEC;
48608 +
48609 +#ifdef CONFIG_PAX_MPROTECT
48610 + if (mm->pax_flags & MF_PAX_MPROTECT)
48611 + vm_flags &= ~VM_MAYEXEC;
48612 +#endif
48613 +
48614 + }
48615 +#endif
48616 +
48617 ret = mprotect_fixup(vma, &prev, vma->vm_start, vma->vm_end,
48618 vm_flags);
48619 if (ret)
48620 goto out_unlock;
48621 BUG_ON(prev != vma);
48622
48623 - /* Move stack pages down in memory. */
48624 - if (stack_shift) {
48625 - ret = shift_arg_pages(vma, stack_shift);
48626 - if (ret)
48627 - goto out_unlock;
48628 - }
48629 -
48630 stack_expand = EXTRA_STACK_VM_PAGES * PAGE_SIZE;
48631 stack_size = vma->vm_end - vma->vm_start;
48632 /*
48633 @@ -744,7 +777,7 @@ int kernel_read(struct file *file, loff_t offset,
48634 old_fs = get_fs();
48635 set_fs(get_ds());
48636 /* The cast to a user pointer is valid due to the set_fs() */
48637 - result = vfs_read(file, (void __user *)addr, count, &pos);
48638 + result = vfs_read(file, (void __force_user *)addr, count, &pos);
48639 set_fs(old_fs);
48640 return result;
48641 }
48642 @@ -1152,7 +1185,7 @@ int check_unsafe_exec(struct linux_binprm *bprm)
48643 }
48644 rcu_read_unlock();
48645
48646 - if (p->fs->users > n_fs) {
48647 + if (atomic_read(&p->fs->users) > n_fs) {
48648 bprm->unsafe |= LSM_UNSAFE_SHARE;
48649 } else {
48650 res = -EAGAIN;
48651 @@ -1347,11 +1380,35 @@ int do_execve(char * filename,
48652 char __user *__user *envp,
48653 struct pt_regs * regs)
48654 {
48655 +#ifdef CONFIG_GRKERNSEC
48656 + struct file *old_exec_file;
48657 + struct acl_subject_label *old_acl;
48658 + struct rlimit old_rlim[RLIM_NLIMITS];
48659 +#endif
48660 struct linux_binprm *bprm;
48661 struct file *file;
48662 struct files_struct *displaced;
48663 bool clear_in_exec;
48664 int retval;
48665 + const struct cred *cred = current_cred();
48666 +
48667 + /*
48668 + * We move the actual failure in case of RLIMIT_NPROC excess from
48669 + * set*uid() to execve() because too many poorly written programs
48670 + * don't check setuid() return code. Here we additionally recheck
48671 + * whether NPROC limit is still exceeded.
48672 + */
48673 + gr_learn_resource(current, RLIMIT_NPROC, atomic_read(&current->cred->user->processes), 1);
48674 +
48675 + if ((current->flags & PF_NPROC_EXCEEDED) &&
48676 + atomic_read(&cred->user->processes) > current->signal->rlim[RLIMIT_NPROC].rlim_cur) {
48677 + retval = -EAGAIN;
48678 + goto out_ret;
48679 + }
48680 +
48681 + /* We're below the limit (still or again), so we don't want to make
48682 + * further execve() calls fail. */
48683 + current->flags &= ~PF_NPROC_EXCEEDED;
48684
48685 retval = unshare_files(&displaced);
48686 if (retval)
48687 @@ -1383,6 +1440,16 @@ int do_execve(char * filename,
48688 bprm->filename = filename;
48689 bprm->interp = filename;
48690
48691 + if (gr_process_user_ban()) {
48692 + retval = -EPERM;
48693 + goto out_file;
48694 + }
48695 +
48696 + if (!gr_acl_handle_execve(file->f_dentry, file->f_vfsmnt)) {
48697 + retval = -EACCES;
48698 + goto out_file;
48699 + }
48700 +
48701 retval = bprm_mm_init(bprm);
48702 if (retval)
48703 goto out_file;
48704 @@ -1412,10 +1479,41 @@ int do_execve(char * filename,
48705 if (retval < 0)
48706 goto out;
48707
48708 + if (!gr_tpe_allow(file)) {
48709 + retval = -EACCES;
48710 + goto out;
48711 + }
48712 +
48713 + if (gr_check_crash_exec(file)) {
48714 + retval = -EACCES;
48715 + goto out;
48716 + }
48717 +
48718 + gr_log_chroot_exec(file->f_dentry, file->f_vfsmnt);
48719 +
48720 + gr_handle_exec_args(bprm, (const char __user *const __user *)argv);
48721 +
48722 +#ifdef CONFIG_GRKERNSEC
48723 + old_acl = current->acl;
48724 + memcpy(old_rlim, current->signal->rlim, sizeof(old_rlim));
48725 + old_exec_file = current->exec_file;
48726 + get_file(file);
48727 + current->exec_file = file;
48728 +#endif
48729 +
48730 + retval = gr_set_proc_label(file->f_dentry, file->f_vfsmnt,
48731 + bprm->unsafe & LSM_UNSAFE_SHARE);
48732 + if (retval < 0)
48733 + goto out_fail;
48734 +
48735 current->flags &= ~PF_KTHREAD;
48736 retval = search_binary_handler(bprm,regs);
48737 if (retval < 0)
48738 - goto out;
48739 + goto out_fail;
48740 +#ifdef CONFIG_GRKERNSEC
48741 + if (old_exec_file)
48742 + fput(old_exec_file);
48743 +#endif
48744
48745 /* execve succeeded */
48746 current->fs->in_exec = 0;
48747 @@ -1426,6 +1524,14 @@ int do_execve(char * filename,
48748 put_files_struct(displaced);
48749 return retval;
48750
48751 +out_fail:
48752 +#ifdef CONFIG_GRKERNSEC
48753 + current->acl = old_acl;
48754 + memcpy(current->signal->rlim, old_rlim, sizeof(old_rlim));
48755 + fput(current->exec_file);
48756 + current->exec_file = old_exec_file;
48757 +#endif
48758 +
48759 out:
48760 if (bprm->mm) {
48761 acct_arg_size(bprm, 0);
48762 @@ -1591,6 +1697,220 @@ out:
48763 return ispipe;
48764 }
48765
48766 +int pax_check_flags(unsigned long *flags)
48767 +{
48768 + int retval = 0;
48769 +
48770 +#if !defined(CONFIG_X86_32) || !defined(CONFIG_PAX_SEGMEXEC)
48771 + if (*flags & MF_PAX_SEGMEXEC)
48772 + {
48773 + *flags &= ~MF_PAX_SEGMEXEC;
48774 + retval = -EINVAL;
48775 + }
48776 +#endif
48777 +
48778 + if ((*flags & MF_PAX_PAGEEXEC)
48779 +
48780 +#ifdef CONFIG_PAX_PAGEEXEC
48781 + && (*flags & MF_PAX_SEGMEXEC)
48782 +#endif
48783 +
48784 + )
48785 + {
48786 + *flags &= ~MF_PAX_PAGEEXEC;
48787 + retval = -EINVAL;
48788 + }
48789 +
48790 + if ((*flags & MF_PAX_MPROTECT)
48791 +
48792 +#ifdef CONFIG_PAX_MPROTECT
48793 + && !(*flags & (MF_PAX_PAGEEXEC | MF_PAX_SEGMEXEC))
48794 +#endif
48795 +
48796 + )
48797 + {
48798 + *flags &= ~MF_PAX_MPROTECT;
48799 + retval = -EINVAL;
48800 + }
48801 +
48802 + if ((*flags & MF_PAX_EMUTRAMP)
48803 +
48804 +#ifdef CONFIG_PAX_EMUTRAMP
48805 + && !(*flags & (MF_PAX_PAGEEXEC | MF_PAX_SEGMEXEC))
48806 +#endif
48807 +
48808 + )
48809 + {
48810 + *flags &= ~MF_PAX_EMUTRAMP;
48811 + retval = -EINVAL;
48812 + }
48813 +
48814 + return retval;
48815 +}
48816 +
48817 +EXPORT_SYMBOL(pax_check_flags);
48818 +
48819 +#if defined(CONFIG_PAX_PAGEEXEC) || defined(CONFIG_PAX_SEGMEXEC)
48820 +void pax_report_fault(struct pt_regs *regs, void *pc, void *sp)
48821 +{
48822 + struct task_struct *tsk = current;
48823 + struct mm_struct *mm = current->mm;
48824 + char *buffer_exec = (char *)__get_free_page(GFP_KERNEL);
48825 + char *buffer_fault = (char *)__get_free_page(GFP_KERNEL);
48826 + char *path_exec = NULL;
48827 + char *path_fault = NULL;
48828 + unsigned long start = 0UL, end = 0UL, offset = 0UL;
48829 +
48830 + if (buffer_exec && buffer_fault) {
48831 + struct vm_area_struct *vma, *vma_exec = NULL, *vma_fault = NULL;
48832 +
48833 + down_read(&mm->mmap_sem);
48834 + vma = mm->mmap;
48835 + while (vma && (!vma_exec || !vma_fault)) {
48836 + if ((vma->vm_flags & VM_EXECUTABLE) && vma->vm_file)
48837 + vma_exec = vma;
48838 + if (vma->vm_start <= (unsigned long)pc && (unsigned long)pc < vma->vm_end)
48839 + vma_fault = vma;
48840 + vma = vma->vm_next;
48841 + }
48842 + if (vma_exec) {
48843 + path_exec = d_path(&vma_exec->vm_file->f_path, buffer_exec, PAGE_SIZE);
48844 + if (IS_ERR(path_exec))
48845 + path_exec = "<path too long>";
48846 + else {
48847 + path_exec = mangle_path(buffer_exec, path_exec, "\t\n\\");
48848 + if (path_exec) {
48849 + *path_exec = 0;
48850 + path_exec = buffer_exec;
48851 + } else
48852 + path_exec = "<path too long>";
48853 + }
48854 + }
48855 + if (vma_fault) {
48856 + start = vma_fault->vm_start;
48857 + end = vma_fault->vm_end;
48858 + offset = vma_fault->vm_pgoff << PAGE_SHIFT;
48859 + if (vma_fault->vm_file) {
48860 + path_fault = d_path(&vma_fault->vm_file->f_path, buffer_fault, PAGE_SIZE);
48861 + if (IS_ERR(path_fault))
48862 + path_fault = "<path too long>";
48863 + else {
48864 + path_fault = mangle_path(buffer_fault, path_fault, "\t\n\\");
48865 + if (path_fault) {
48866 + *path_fault = 0;
48867 + path_fault = buffer_fault;
48868 + } else
48869 + path_fault = "<path too long>";
48870 + }
48871 + } else
48872 + path_fault = "<anonymous mapping>";
48873 + }
48874 + up_read(&mm->mmap_sem);
48875 + }
48876 + if (tsk->signal->curr_ip)
48877 + printk(KERN_ERR "PAX: From %pI4: execution attempt in: %s, %08lx-%08lx %08lx\n", &tsk->signal->curr_ip, path_fault, start, end, offset);
48878 + else
48879 + printk(KERN_ERR "PAX: execution attempt in: %s, %08lx-%08lx %08lx\n", path_fault, start, end, offset);
48880 + printk(KERN_ERR "PAX: terminating task: %s(%s):%d, uid/euid: %u/%u, "
48881 + "PC: %p, SP: %p\n", path_exec, tsk->comm, task_pid_nr(tsk),
48882 + task_uid(tsk), task_euid(tsk), pc, sp);
48883 + free_page((unsigned long)buffer_exec);
48884 + free_page((unsigned long)buffer_fault);
48885 + pax_report_insns(regs, pc, sp);
48886 + do_coredump(SIGKILL, SIGKILL, regs);
48887 +}
48888 +#endif
48889 +
48890 +#ifdef CONFIG_PAX_REFCOUNT
48891 +void pax_report_refcount_overflow(struct pt_regs *regs)
48892 +{
48893 + if (current->signal->curr_ip)
48894 + printk(KERN_ERR "PAX: From %pI4: refcount overflow detected in: %s:%d, uid/euid: %u/%u\n",
48895 + &current->signal->curr_ip, current->comm, task_pid_nr(current), current_uid(), current_euid());
48896 + else
48897 + printk(KERN_ERR "PAX: refcount overflow detected in: %s:%d, uid/euid: %u/%u\n",
48898 + current->comm, task_pid_nr(current), current_uid(), current_euid());
48899 + print_symbol(KERN_ERR "PAX: refcount overflow occured at: %s\n", instruction_pointer(regs));
48900 + show_regs(regs);
48901 + force_sig_specific(SIGKILL, current);
48902 +}
48903 +#endif
48904 +
48905 +#ifdef CONFIG_PAX_USERCOPY
48906 +/* 0: not at all, 1: fully, 2: fully inside frame, -1: partially (implies an error) */
48907 +int object_is_on_stack(const void *obj, unsigned long len)
48908 +{
48909 + const void * const stack = task_stack_page(current);
48910 + const void * const stackend = stack + THREAD_SIZE;
48911 +
48912 +#if defined(CONFIG_FRAME_POINTER) && defined(CONFIG_X86)
48913 + const void *frame = NULL;
48914 + const void *oldframe;
48915 +#endif
48916 +
48917 + if (obj + len < obj)
48918 + return -1;
48919 +
48920 + if (obj + len <= stack || stackend <= obj)
48921 + return 0;
48922 +
48923 + if (obj < stack || stackend < obj + len)
48924 + return -1;
48925 +
48926 +#if defined(CONFIG_FRAME_POINTER) && defined(CONFIG_X86)
48927 + oldframe = __builtin_frame_address(1);
48928 + if (oldframe)
48929 + frame = __builtin_frame_address(2);
48930 + /*
48931 + low ----------------------------------------------> high
48932 + [saved bp][saved ip][args][local vars][saved bp][saved ip]
48933 + ^----------------^
48934 + allow copies only within here
48935 + */
48936 + while (stack <= frame && frame < stackend) {
48937 + /* if obj + len extends past the last frame, this
48938 + check won't pass and the next frame will be 0,
48939 + causing us to bail out and correctly report
48940 + the copy as invalid
48941 + */
48942 + if (obj + len <= frame)
48943 + return obj >= oldframe + 2 * sizeof(void *) ? 2 : -1;
48944 + oldframe = frame;
48945 + frame = *(const void * const *)frame;
48946 + }
48947 + return -1;
48948 +#else
48949 + return 1;
48950 +#endif
48951 +}
48952 +
48953 +
48954 +NORET_TYPE void pax_report_usercopy(const void *ptr, unsigned long len, bool to, const char *type)
48955 +{
48956 + if (current->signal->curr_ip)
48957 + printk(KERN_ERR "PAX: From %pI4: kernel memory %s attempt detected %s %p (%s) (%lu bytes)\n",
48958 + &current->signal->curr_ip, to ? "leak" : "overwrite", to ? "from" : "to", ptr, type ? : "unknown", len);
48959 + else
48960 + printk(KERN_ERR "PAX: kernel memory %s attempt detected %s %p (%s) (%lu bytes)\n",
48961 + to ? "leak" : "overwrite", to ? "from" : "to", ptr, type ? : "unknown", len);
48962 +
48963 + dump_stack();
48964 + gr_handle_kernel_exploit();
48965 + do_group_exit(SIGKILL);
48966 +}
48967 +#endif
48968 +
48969 +#ifdef CONFIG_PAX_MEMORY_STACKLEAK
48970 +void pax_track_stack(void)
48971 +{
48972 + unsigned long sp = (unsigned long)&sp;
48973 + if (sp < current_thread_info()->lowest_stack &&
48974 + sp > (unsigned long)task_stack_page(current))
48975 + current_thread_info()->lowest_stack = sp;
48976 +}
48977 +EXPORT_SYMBOL(pax_track_stack);
48978 +#endif
48979 +
48980 static int zap_process(struct task_struct *start)
48981 {
48982 struct task_struct *t;
48983 @@ -1793,17 +2113,17 @@ static void wait_for_dump_helpers(struct file *file)
48984 pipe = file->f_path.dentry->d_inode->i_pipe;
48985
48986 pipe_lock(pipe);
48987 - pipe->readers++;
48988 - pipe->writers--;
48989 + atomic_inc(&pipe->readers);
48990 + atomic_dec(&pipe->writers);
48991
48992 - while ((pipe->readers > 1) && (!signal_pending(current))) {
48993 + while ((atomic_read(&pipe->readers) > 1) && (!signal_pending(current))) {
48994 wake_up_interruptible_sync(&pipe->wait);
48995 kill_fasync(&pipe->fasync_readers, SIGIO, POLL_IN);
48996 pipe_wait(pipe);
48997 }
48998
48999 - pipe->readers--;
49000 - pipe->writers++;
49001 + atomic_dec(&pipe->readers);
49002 + atomic_inc(&pipe->writers);
49003 pipe_unlock(pipe);
49004
49005 }
49006 @@ -1826,10 +2146,13 @@ void do_coredump(long signr, int exit_code, struct pt_regs *regs)
49007 char **helper_argv = NULL;
49008 int helper_argc = 0;
49009 int dump_count = 0;
49010 - static atomic_t core_dump_count = ATOMIC_INIT(0);
49011 + static atomic_unchecked_t core_dump_count = ATOMIC_INIT(0);
49012
49013 audit_core_dumps(signr);
49014
49015 + if (signr == SIGSEGV || signr == SIGBUS || signr == SIGKILL || signr == SIGILL)
49016 + gr_handle_brute_attach(current, mm->flags);
49017 +
49018 binfmt = mm->binfmt;
49019 if (!binfmt || !binfmt->core_dump)
49020 goto fail;
49021 @@ -1874,6 +2197,8 @@ void do_coredump(long signr, int exit_code, struct pt_regs *regs)
49022 */
49023 clear_thread_flag(TIF_SIGPENDING);
49024
49025 + gr_learn_resource(current, RLIMIT_CORE, binfmt->min_coredump, 1);
49026 +
49027 /*
49028 * lock_kernel() because format_corename() is controlled by sysctl, which
49029 * uses lock_kernel()
49030 @@ -1908,7 +2233,7 @@ void do_coredump(long signr, int exit_code, struct pt_regs *regs)
49031 goto fail_unlock;
49032 }
49033
49034 - dump_count = atomic_inc_return(&core_dump_count);
49035 + dump_count = atomic_inc_return_unchecked(&core_dump_count);
49036 if (core_pipe_limit && (core_pipe_limit < dump_count)) {
49037 printk(KERN_WARNING "Pid %d(%s) over core_pipe_limit\n",
49038 task_tgid_vnr(current), current->comm);
49039 @@ -1972,7 +2297,7 @@ close_fail:
49040 filp_close(file, NULL);
49041 fail_dropcount:
49042 if (dump_count)
49043 - atomic_dec(&core_dump_count);
49044 + atomic_dec_unchecked(&core_dump_count);
49045 fail_unlock:
49046 if (helper_argv)
49047 argv_free(helper_argv);
49048 diff --git a/fs/ext2/balloc.c b/fs/ext2/balloc.c
49049 index 7f8d2e5..a1abdbb 100644
49050 --- a/fs/ext2/balloc.c
49051 +++ b/fs/ext2/balloc.c
49052 @@ -1192,7 +1192,7 @@ static int ext2_has_free_blocks(struct ext2_sb_info *sbi)
49053
49054 free_blocks = percpu_counter_read_positive(&sbi->s_freeblocks_counter);
49055 root_blocks = le32_to_cpu(sbi->s_es->s_r_blocks_count);
49056 - if (free_blocks < root_blocks + 1 && !capable(CAP_SYS_RESOURCE) &&
49057 + if (free_blocks < root_blocks + 1 && !capable_nolog(CAP_SYS_RESOURCE) &&
49058 sbi->s_resuid != current_fsuid() &&
49059 (sbi->s_resgid == 0 || !in_group_p (sbi->s_resgid))) {
49060 return 0;
49061 diff --git a/fs/ext3/balloc.c b/fs/ext3/balloc.c
49062 index 27967f9..9f2a5fb 100644
49063 --- a/fs/ext3/balloc.c
49064 +++ b/fs/ext3/balloc.c
49065 @@ -1421,7 +1421,7 @@ static int ext3_has_free_blocks(struct ext3_sb_info *sbi)
49066
49067 free_blocks = percpu_counter_read_positive(&sbi->s_freeblocks_counter);
49068 root_blocks = le32_to_cpu(sbi->s_es->s_r_blocks_count);
49069 - if (free_blocks < root_blocks + 1 && !capable(CAP_SYS_RESOURCE) &&
49070 + if (free_blocks < root_blocks + 1 && !capable_nolog(CAP_SYS_RESOURCE) &&
49071 sbi->s_resuid != current_fsuid() &&
49072 (sbi->s_resgid == 0 || !in_group_p (sbi->s_resgid))) {
49073 return 0;
49074 diff --git a/fs/ext4/balloc.c b/fs/ext4/balloc.c
49075 index e85b63c..80398e6 100644
49076 --- a/fs/ext4/balloc.c
49077 +++ b/fs/ext4/balloc.c
49078 @@ -570,7 +570,7 @@ int ext4_has_free_blocks(struct ext4_sb_info *sbi, s64 nblocks)
49079 /* Hm, nope. Are (enough) root reserved blocks available? */
49080 if (sbi->s_resuid == current_fsuid() ||
49081 ((sbi->s_resgid != 0) && in_group_p(sbi->s_resgid)) ||
49082 - capable(CAP_SYS_RESOURCE)) {
49083 + capable_nolog(CAP_SYS_RESOURCE)) {
49084 if (free_blocks >= (nblocks + dirty_blocks))
49085 return 1;
49086 }
49087 diff --git a/fs/ext4/ext4.h b/fs/ext4/ext4.h
49088 index 67c46ed..1f237e5 100644
49089 --- a/fs/ext4/ext4.h
49090 +++ b/fs/ext4/ext4.h
49091 @@ -1077,19 +1077,19 @@ struct ext4_sb_info {
49092
49093 /* stats for buddy allocator */
49094 spinlock_t s_mb_pa_lock;
49095 - atomic_t s_bal_reqs; /* number of reqs with len > 1 */
49096 - atomic_t s_bal_success; /* we found long enough chunks */
49097 - atomic_t s_bal_allocated; /* in blocks */
49098 - atomic_t s_bal_ex_scanned; /* total extents scanned */
49099 - atomic_t s_bal_goals; /* goal hits */
49100 - atomic_t s_bal_breaks; /* too long searches */
49101 - atomic_t s_bal_2orders; /* 2^order hits */
49102 + atomic_unchecked_t s_bal_reqs; /* number of reqs with len > 1 */
49103 + atomic_unchecked_t s_bal_success; /* we found long enough chunks */
49104 + atomic_unchecked_t s_bal_allocated; /* in blocks */
49105 + atomic_unchecked_t s_bal_ex_scanned; /* total extents scanned */
49106 + atomic_unchecked_t s_bal_goals; /* goal hits */
49107 + atomic_unchecked_t s_bal_breaks; /* too long searches */
49108 + atomic_unchecked_t s_bal_2orders; /* 2^order hits */
49109 spinlock_t s_bal_lock;
49110 unsigned long s_mb_buddies_generated;
49111 unsigned long long s_mb_generation_time;
49112 - atomic_t s_mb_lost_chunks;
49113 - atomic_t s_mb_preallocated;
49114 - atomic_t s_mb_discarded;
49115 + atomic_unchecked_t s_mb_lost_chunks;
49116 + atomic_unchecked_t s_mb_preallocated;
49117 + atomic_unchecked_t s_mb_discarded;
49118 atomic_t s_lock_busy;
49119
49120 /* locality groups */
49121 diff --git a/fs/ext4/file.c b/fs/ext4/file.c
49122 index 2a60541..7439d61 100644
49123 --- a/fs/ext4/file.c
49124 +++ b/fs/ext4/file.c
49125 @@ -122,8 +122,8 @@ static int ext4_file_open(struct inode * inode, struct file * filp)
49126 cp = d_path(&path, buf, sizeof(buf));
49127 path_put(&path);
49128 if (!IS_ERR(cp)) {
49129 - memcpy(sbi->s_es->s_last_mounted, cp,
49130 - sizeof(sbi->s_es->s_last_mounted));
49131 + strlcpy(sbi->s_es->s_last_mounted, cp,
49132 + sizeof(sbi->s_es->s_last_mounted));
49133 sb->s_dirt = 1;
49134 }
49135 }
49136 diff --git a/fs/ext4/mballoc.c b/fs/ext4/mballoc.c
49137 index 42bac1b..0aab9d8 100644
49138 --- a/fs/ext4/mballoc.c
49139 +++ b/fs/ext4/mballoc.c
49140 @@ -1755,7 +1755,7 @@ void ext4_mb_simple_scan_group(struct ext4_allocation_context *ac,
49141 BUG_ON(ac->ac_b_ex.fe_len != ac->ac_g_ex.fe_len);
49142
49143 if (EXT4_SB(sb)->s_mb_stats)
49144 - atomic_inc(&EXT4_SB(sb)->s_bal_2orders);
49145 + atomic_inc_unchecked(&EXT4_SB(sb)->s_bal_2orders);
49146
49147 break;
49148 }
49149 @@ -2131,7 +2131,7 @@ repeat:
49150 ac->ac_status = AC_STATUS_CONTINUE;
49151 ac->ac_flags |= EXT4_MB_HINT_FIRST;
49152 cr = 3;
49153 - atomic_inc(&sbi->s_mb_lost_chunks);
49154 + atomic_inc_unchecked(&sbi->s_mb_lost_chunks);
49155 goto repeat;
49156 }
49157 }
49158 @@ -2174,6 +2174,8 @@ static int ext4_mb_seq_groups_show(struct seq_file *seq, void *v)
49159 ext4_grpblk_t counters[16];
49160 } sg;
49161
49162 + pax_track_stack();
49163 +
49164 group--;
49165 if (group == 0)
49166 seq_printf(seq, "#%-5s: %-5s %-5s %-5s "
49167 @@ -2534,25 +2536,25 @@ int ext4_mb_release(struct super_block *sb)
49168 if (sbi->s_mb_stats) {
49169 printk(KERN_INFO
49170 "EXT4-fs: mballoc: %u blocks %u reqs (%u success)\n",
49171 - atomic_read(&sbi->s_bal_allocated),
49172 - atomic_read(&sbi->s_bal_reqs),
49173 - atomic_read(&sbi->s_bal_success));
49174 + atomic_read_unchecked(&sbi->s_bal_allocated),
49175 + atomic_read_unchecked(&sbi->s_bal_reqs),
49176 + atomic_read_unchecked(&sbi->s_bal_success));
49177 printk(KERN_INFO
49178 "EXT4-fs: mballoc: %u extents scanned, %u goal hits, "
49179 "%u 2^N hits, %u breaks, %u lost\n",
49180 - atomic_read(&sbi->s_bal_ex_scanned),
49181 - atomic_read(&sbi->s_bal_goals),
49182 - atomic_read(&sbi->s_bal_2orders),
49183 - atomic_read(&sbi->s_bal_breaks),
49184 - atomic_read(&sbi->s_mb_lost_chunks));
49185 + atomic_read_unchecked(&sbi->s_bal_ex_scanned),
49186 + atomic_read_unchecked(&sbi->s_bal_goals),
49187 + atomic_read_unchecked(&sbi->s_bal_2orders),
49188 + atomic_read_unchecked(&sbi->s_bal_breaks),
49189 + atomic_read_unchecked(&sbi->s_mb_lost_chunks));
49190 printk(KERN_INFO
49191 "EXT4-fs: mballoc: %lu generated and it took %Lu\n",
49192 sbi->s_mb_buddies_generated++,
49193 sbi->s_mb_generation_time);
49194 printk(KERN_INFO
49195 "EXT4-fs: mballoc: %u preallocated, %u discarded\n",
49196 - atomic_read(&sbi->s_mb_preallocated),
49197 - atomic_read(&sbi->s_mb_discarded));
49198 + atomic_read_unchecked(&sbi->s_mb_preallocated),
49199 + atomic_read_unchecked(&sbi->s_mb_discarded));
49200 }
49201
49202 free_percpu(sbi->s_locality_groups);
49203 @@ -3034,16 +3036,16 @@ static void ext4_mb_collect_stats(struct ext4_allocation_context *ac)
49204 struct ext4_sb_info *sbi = EXT4_SB(ac->ac_sb);
49205
49206 if (sbi->s_mb_stats && ac->ac_g_ex.fe_len > 1) {
49207 - atomic_inc(&sbi->s_bal_reqs);
49208 - atomic_add(ac->ac_b_ex.fe_len, &sbi->s_bal_allocated);
49209 + atomic_inc_unchecked(&sbi->s_bal_reqs);
49210 + atomic_add_unchecked(ac->ac_b_ex.fe_len, &sbi->s_bal_allocated);
49211 if (ac->ac_o_ex.fe_len >= ac->ac_g_ex.fe_len)
49212 - atomic_inc(&sbi->s_bal_success);
49213 - atomic_add(ac->ac_found, &sbi->s_bal_ex_scanned);
49214 + atomic_inc_unchecked(&sbi->s_bal_success);
49215 + atomic_add_unchecked(ac->ac_found, &sbi->s_bal_ex_scanned);
49216 if (ac->ac_g_ex.fe_start == ac->ac_b_ex.fe_start &&
49217 ac->ac_g_ex.fe_group == ac->ac_b_ex.fe_group)
49218 - atomic_inc(&sbi->s_bal_goals);
49219 + atomic_inc_unchecked(&sbi->s_bal_goals);
49220 if (ac->ac_found > sbi->s_mb_max_to_scan)
49221 - atomic_inc(&sbi->s_bal_breaks);
49222 + atomic_inc_unchecked(&sbi->s_bal_breaks);
49223 }
49224
49225 if (ac->ac_op == EXT4_MB_HISTORY_ALLOC)
49226 @@ -3443,7 +3445,7 @@ ext4_mb_new_inode_pa(struct ext4_allocation_context *ac)
49227 trace_ext4_mb_new_inode_pa(ac, pa);
49228
49229 ext4_mb_use_inode_pa(ac, pa);
49230 - atomic_add(pa->pa_free, &EXT4_SB(sb)->s_mb_preallocated);
49231 + atomic_add_unchecked(pa->pa_free, &EXT4_SB(sb)->s_mb_preallocated);
49232
49233 ei = EXT4_I(ac->ac_inode);
49234 grp = ext4_get_group_info(sb, ac->ac_b_ex.fe_group);
49235 @@ -3503,7 +3505,7 @@ ext4_mb_new_group_pa(struct ext4_allocation_context *ac)
49236 trace_ext4_mb_new_group_pa(ac, pa);
49237
49238 ext4_mb_use_group_pa(ac, pa);
49239 - atomic_add(pa->pa_free, &EXT4_SB(sb)->s_mb_preallocated);
49240 + atomic_add_unchecked(pa->pa_free, &EXT4_SB(sb)->s_mb_preallocated);
49241
49242 grp = ext4_get_group_info(sb, ac->ac_b_ex.fe_group);
49243 lg = ac->ac_lg;
49244 @@ -3607,7 +3609,7 @@ ext4_mb_release_inode_pa(struct ext4_buddy *e4b, struct buffer_head *bitmap_bh,
49245 * from the bitmap and continue.
49246 */
49247 }
49248 - atomic_add(free, &sbi->s_mb_discarded);
49249 + atomic_add_unchecked(free, &sbi->s_mb_discarded);
49250
49251 return err;
49252 }
49253 @@ -3626,7 +3628,7 @@ ext4_mb_release_group_pa(struct ext4_buddy *e4b,
49254 ext4_get_group_no_and_offset(sb, pa->pa_pstart, &group, &bit);
49255 BUG_ON(group != e4b->bd_group && pa->pa_len != 0);
49256 mb_free_blocks(pa->pa_inode, e4b, bit, pa->pa_len);
49257 - atomic_add(pa->pa_len, &EXT4_SB(sb)->s_mb_discarded);
49258 + atomic_add_unchecked(pa->pa_len, &EXT4_SB(sb)->s_mb_discarded);
49259
49260 if (ac) {
49261 ac->ac_sb = sb;
49262 diff --git a/fs/ext4/super.c b/fs/ext4/super.c
49263 index f27e045..be5a1c3 100644
49264 --- a/fs/ext4/super.c
49265 +++ b/fs/ext4/super.c
49266 @@ -2287,7 +2287,7 @@ static void ext4_sb_release(struct kobject *kobj)
49267 }
49268
49269
49270 -static struct sysfs_ops ext4_attr_ops = {
49271 +static const struct sysfs_ops ext4_attr_ops = {
49272 .show = ext4_attr_show,
49273 .store = ext4_attr_store,
49274 };
49275 diff --git a/fs/fcntl.c b/fs/fcntl.c
49276 index 97e01dc..e9aab2d 100644
49277 --- a/fs/fcntl.c
49278 +++ b/fs/fcntl.c
49279 @@ -223,6 +223,11 @@ int __f_setown(struct file *filp, struct pid *pid, enum pid_type type,
49280 if (err)
49281 return err;
49282
49283 + if (gr_handle_chroot_fowner(pid, type))
49284 + return -ENOENT;
49285 + if (gr_check_protected_task_fowner(pid, type))
49286 + return -EACCES;
49287 +
49288 f_modown(filp, pid, type, force);
49289 return 0;
49290 }
49291 @@ -265,7 +270,7 @@ pid_t f_getown(struct file *filp)
49292
49293 static int f_setown_ex(struct file *filp, unsigned long arg)
49294 {
49295 - struct f_owner_ex * __user owner_p = (void * __user)arg;
49296 + struct f_owner_ex __user *owner_p = (void __user *)arg;
49297 struct f_owner_ex owner;
49298 struct pid *pid;
49299 int type;
49300 @@ -305,7 +310,7 @@ static int f_setown_ex(struct file *filp, unsigned long arg)
49301
49302 static int f_getown_ex(struct file *filp, unsigned long arg)
49303 {
49304 - struct f_owner_ex * __user owner_p = (void * __user)arg;
49305 + struct f_owner_ex __user *owner_p = (void __user *)arg;
49306 struct f_owner_ex owner;
49307 int ret = 0;
49308
49309 @@ -344,6 +349,7 @@ static long do_fcntl(int fd, unsigned int cmd, unsigned long arg,
49310 switch (cmd) {
49311 case F_DUPFD:
49312 case F_DUPFD_CLOEXEC:
49313 + gr_learn_resource(current, RLIMIT_NOFILE, arg, 0);
49314 if (arg >= current->signal->rlim[RLIMIT_NOFILE].rlim_cur)
49315 break;
49316 err = alloc_fd(arg, cmd == F_DUPFD_CLOEXEC ? O_CLOEXEC : 0);
49317 diff --git a/fs/fifo.c b/fs/fifo.c
49318 index f8f97b8..b1f2259 100644
49319 --- a/fs/fifo.c
49320 +++ b/fs/fifo.c
49321 @@ -59,10 +59,10 @@ static int fifo_open(struct inode *inode, struct file *filp)
49322 */
49323 filp->f_op = &read_pipefifo_fops;
49324 pipe->r_counter++;
49325 - if (pipe->readers++ == 0)
49326 + if (atomic_inc_return(&pipe->readers) == 1)
49327 wake_up_partner(inode);
49328
49329 - if (!pipe->writers) {
49330 + if (!atomic_read(&pipe->writers)) {
49331 if ((filp->f_flags & O_NONBLOCK)) {
49332 /* suppress POLLHUP until we have
49333 * seen a writer */
49334 @@ -83,15 +83,15 @@ static int fifo_open(struct inode *inode, struct file *filp)
49335 * errno=ENXIO when there is no process reading the FIFO.
49336 */
49337 ret = -ENXIO;
49338 - if ((filp->f_flags & O_NONBLOCK) && !pipe->readers)
49339 + if ((filp->f_flags & O_NONBLOCK) && !atomic_read(&pipe->readers))
49340 goto err;
49341
49342 filp->f_op = &write_pipefifo_fops;
49343 pipe->w_counter++;
49344 - if (!pipe->writers++)
49345 + if (atomic_inc_return(&pipe->writers) == 1)
49346 wake_up_partner(inode);
49347
49348 - if (!pipe->readers) {
49349 + if (!atomic_read(&pipe->readers)) {
49350 wait_for_partner(inode, &pipe->r_counter);
49351 if (signal_pending(current))
49352 goto err_wr;
49353 @@ -107,11 +107,11 @@ static int fifo_open(struct inode *inode, struct file *filp)
49354 */
49355 filp->f_op = &rdwr_pipefifo_fops;
49356
49357 - pipe->readers++;
49358 - pipe->writers++;
49359 + atomic_inc(&pipe->readers);
49360 + atomic_inc(&pipe->writers);
49361 pipe->r_counter++;
49362 pipe->w_counter++;
49363 - if (pipe->readers == 1 || pipe->writers == 1)
49364 + if (atomic_read(&pipe->readers) == 1 || atomic_read(&pipe->writers) == 1)
49365 wake_up_partner(inode);
49366 break;
49367
49368 @@ -125,19 +125,19 @@ static int fifo_open(struct inode *inode, struct file *filp)
49369 return 0;
49370
49371 err_rd:
49372 - if (!--pipe->readers)
49373 + if (atomic_dec_and_test(&pipe->readers))
49374 wake_up_interruptible(&pipe->wait);
49375 ret = -ERESTARTSYS;
49376 goto err;
49377
49378 err_wr:
49379 - if (!--pipe->writers)
49380 + if (atomic_dec_and_test(&pipe->writers))
49381 wake_up_interruptible(&pipe->wait);
49382 ret = -ERESTARTSYS;
49383 goto err;
49384
49385 err:
49386 - if (!pipe->readers && !pipe->writers)
49387 + if (!atomic_read(&pipe->readers) && !atomic_read(&pipe->writers))
49388 free_pipe_info(inode);
49389
49390 err_nocleanup:
49391 diff --git a/fs/file.c b/fs/file.c
49392 index 87e1290..a930cc4 100644
49393 --- a/fs/file.c
49394 +++ b/fs/file.c
49395 @@ -14,6 +14,7 @@
49396 #include <linux/slab.h>
49397 #include <linux/vmalloc.h>
49398 #include <linux/file.h>
49399 +#include <linux/security.h>
49400 #include <linux/fdtable.h>
49401 #include <linux/bitops.h>
49402 #include <linux/interrupt.h>
49403 @@ -257,6 +258,8 @@ int expand_files(struct files_struct *files, int nr)
49404 * N.B. For clone tasks sharing a files structure, this test
49405 * will limit the total number of files that can be opened.
49406 */
49407 +
49408 + gr_learn_resource(current, RLIMIT_NOFILE, nr, 0);
49409 if (nr >= current->signal->rlim[RLIMIT_NOFILE].rlim_cur)
49410 return -EMFILE;
49411
49412 diff --git a/fs/filesystems.c b/fs/filesystems.c
49413 index a24c58e..53f91ee 100644
49414 --- a/fs/filesystems.c
49415 +++ b/fs/filesystems.c
49416 @@ -272,7 +272,12 @@ struct file_system_type *get_fs_type(const char *name)
49417 int len = dot ? dot - name : strlen(name);
49418
49419 fs = __get_fs_type(name, len);
49420 +
49421 +#ifdef CONFIG_GRKERNSEC_MODHARDEN
49422 + if (!fs && (___request_module(true, "grsec_modharden_fs", "%.*s", len, name) == 0))
49423 +#else
49424 if (!fs && (request_module("%.*s", len, name) == 0))
49425 +#endif
49426 fs = __get_fs_type(name, len);
49427
49428 if (dot && fs && !(fs->fs_flags & FS_HAS_SUBTYPE)) {
49429 diff --git a/fs/fs_struct.c b/fs/fs_struct.c
49430 index eee0590..ef5bc0e 100644
49431 --- a/fs/fs_struct.c
49432 +++ b/fs/fs_struct.c
49433 @@ -4,6 +4,7 @@
49434 #include <linux/path.h>
49435 #include <linux/slab.h>
49436 #include <linux/fs_struct.h>
49437 +#include <linux/grsecurity.h>
49438
49439 /*
49440 * Replace the fs->{rootmnt,root} with {mnt,dentry}. Put the old values.
49441 @@ -17,6 +18,7 @@ void set_fs_root(struct fs_struct *fs, struct path *path)
49442 old_root = fs->root;
49443 fs->root = *path;
49444 path_get(path);
49445 + gr_set_chroot_entries(current, path);
49446 write_unlock(&fs->lock);
49447 if (old_root.dentry)
49448 path_put(&old_root);
49449 @@ -56,6 +58,7 @@ void chroot_fs_refs(struct path *old_root, struct path *new_root)
49450 && fs->root.mnt == old_root->mnt) {
49451 path_get(new_root);
49452 fs->root = *new_root;
49453 + gr_set_chroot_entries(p, new_root);
49454 count++;
49455 }
49456 if (fs->pwd.dentry == old_root->dentry
49457 @@ -89,7 +92,8 @@ void exit_fs(struct task_struct *tsk)
49458 task_lock(tsk);
49459 write_lock(&fs->lock);
49460 tsk->fs = NULL;
49461 - kill = !--fs->users;
49462 + gr_clear_chroot_entries(tsk);
49463 + kill = !atomic_dec_return(&fs->users);
49464 write_unlock(&fs->lock);
49465 task_unlock(tsk);
49466 if (kill)
49467 @@ -102,7 +106,7 @@ struct fs_struct *copy_fs_struct(struct fs_struct *old)
49468 struct fs_struct *fs = kmem_cache_alloc(fs_cachep, GFP_KERNEL);
49469 /* We don't need to lock fs - think why ;-) */
49470 if (fs) {
49471 - fs->users = 1;
49472 + atomic_set(&fs->users, 1);
49473 fs->in_exec = 0;
49474 rwlock_init(&fs->lock);
49475 fs->umask = old->umask;
49476 @@ -127,8 +131,9 @@ int unshare_fs_struct(void)
49477
49478 task_lock(current);
49479 write_lock(&fs->lock);
49480 - kill = !--fs->users;
49481 + kill = !atomic_dec_return(&fs->users);
49482 current->fs = new_fs;
49483 + gr_set_chroot_entries(current, &new_fs->root);
49484 write_unlock(&fs->lock);
49485 task_unlock(current);
49486
49487 @@ -147,7 +152,7 @@ EXPORT_SYMBOL(current_umask);
49488
49489 /* to be mentioned only in INIT_TASK */
49490 struct fs_struct init_fs = {
49491 - .users = 1,
49492 + .users = ATOMIC_INIT(1),
49493 .lock = __RW_LOCK_UNLOCKED(init_fs.lock),
49494 .umask = 0022,
49495 };
49496 @@ -162,12 +167,13 @@ void daemonize_fs_struct(void)
49497 task_lock(current);
49498
49499 write_lock(&init_fs.lock);
49500 - init_fs.users++;
49501 + atomic_inc(&init_fs.users);
49502 write_unlock(&init_fs.lock);
49503
49504 write_lock(&fs->lock);
49505 current->fs = &init_fs;
49506 - kill = !--fs->users;
49507 + gr_set_chroot_entries(current, &current->fs->root);
49508 + kill = !atomic_dec_return(&fs->users);
49509 write_unlock(&fs->lock);
49510
49511 task_unlock(current);
49512 diff --git a/fs/fscache/cookie.c b/fs/fscache/cookie.c
49513 index 9905350..02eaec4 100644
49514 --- a/fs/fscache/cookie.c
49515 +++ b/fs/fscache/cookie.c
49516 @@ -68,11 +68,11 @@ struct fscache_cookie *__fscache_acquire_cookie(
49517 parent ? (char *) parent->def->name : "<no-parent>",
49518 def->name, netfs_data);
49519
49520 - fscache_stat(&fscache_n_acquires);
49521 + fscache_stat_unchecked(&fscache_n_acquires);
49522
49523 /* if there's no parent cookie, then we don't create one here either */
49524 if (!parent) {
49525 - fscache_stat(&fscache_n_acquires_null);
49526 + fscache_stat_unchecked(&fscache_n_acquires_null);
49527 _leave(" [no parent]");
49528 return NULL;
49529 }
49530 @@ -87,7 +87,7 @@ struct fscache_cookie *__fscache_acquire_cookie(
49531 /* allocate and initialise a cookie */
49532 cookie = kmem_cache_alloc(fscache_cookie_jar, GFP_KERNEL);
49533 if (!cookie) {
49534 - fscache_stat(&fscache_n_acquires_oom);
49535 + fscache_stat_unchecked(&fscache_n_acquires_oom);
49536 _leave(" [ENOMEM]");
49537 return NULL;
49538 }
49539 @@ -109,13 +109,13 @@ struct fscache_cookie *__fscache_acquire_cookie(
49540
49541 switch (cookie->def->type) {
49542 case FSCACHE_COOKIE_TYPE_INDEX:
49543 - fscache_stat(&fscache_n_cookie_index);
49544 + fscache_stat_unchecked(&fscache_n_cookie_index);
49545 break;
49546 case FSCACHE_COOKIE_TYPE_DATAFILE:
49547 - fscache_stat(&fscache_n_cookie_data);
49548 + fscache_stat_unchecked(&fscache_n_cookie_data);
49549 break;
49550 default:
49551 - fscache_stat(&fscache_n_cookie_special);
49552 + fscache_stat_unchecked(&fscache_n_cookie_special);
49553 break;
49554 }
49555
49556 @@ -126,13 +126,13 @@ struct fscache_cookie *__fscache_acquire_cookie(
49557 if (fscache_acquire_non_index_cookie(cookie) < 0) {
49558 atomic_dec(&parent->n_children);
49559 __fscache_cookie_put(cookie);
49560 - fscache_stat(&fscache_n_acquires_nobufs);
49561 + fscache_stat_unchecked(&fscache_n_acquires_nobufs);
49562 _leave(" = NULL");
49563 return NULL;
49564 }
49565 }
49566
49567 - fscache_stat(&fscache_n_acquires_ok);
49568 + fscache_stat_unchecked(&fscache_n_acquires_ok);
49569 _leave(" = %p", cookie);
49570 return cookie;
49571 }
49572 @@ -168,7 +168,7 @@ static int fscache_acquire_non_index_cookie(struct fscache_cookie *cookie)
49573 cache = fscache_select_cache_for_object(cookie->parent);
49574 if (!cache) {
49575 up_read(&fscache_addremove_sem);
49576 - fscache_stat(&fscache_n_acquires_no_cache);
49577 + fscache_stat_unchecked(&fscache_n_acquires_no_cache);
49578 _leave(" = -ENOMEDIUM [no cache]");
49579 return -ENOMEDIUM;
49580 }
49581 @@ -256,12 +256,12 @@ static int fscache_alloc_object(struct fscache_cache *cache,
49582 object = cache->ops->alloc_object(cache, cookie);
49583 fscache_stat_d(&fscache_n_cop_alloc_object);
49584 if (IS_ERR(object)) {
49585 - fscache_stat(&fscache_n_object_no_alloc);
49586 + fscache_stat_unchecked(&fscache_n_object_no_alloc);
49587 ret = PTR_ERR(object);
49588 goto error;
49589 }
49590
49591 - fscache_stat(&fscache_n_object_alloc);
49592 + fscache_stat_unchecked(&fscache_n_object_alloc);
49593
49594 object->debug_id = atomic_inc_return(&fscache_object_debug_id);
49595
49596 @@ -377,10 +377,10 @@ void __fscache_update_cookie(struct fscache_cookie *cookie)
49597 struct fscache_object *object;
49598 struct hlist_node *_p;
49599
49600 - fscache_stat(&fscache_n_updates);
49601 + fscache_stat_unchecked(&fscache_n_updates);
49602
49603 if (!cookie) {
49604 - fscache_stat(&fscache_n_updates_null);
49605 + fscache_stat_unchecked(&fscache_n_updates_null);
49606 _leave(" [no cookie]");
49607 return;
49608 }
49609 @@ -414,12 +414,12 @@ void __fscache_relinquish_cookie(struct fscache_cookie *cookie, int retire)
49610 struct fscache_object *object;
49611 unsigned long event;
49612
49613 - fscache_stat(&fscache_n_relinquishes);
49614 + fscache_stat_unchecked(&fscache_n_relinquishes);
49615 if (retire)
49616 - fscache_stat(&fscache_n_relinquishes_retire);
49617 + fscache_stat_unchecked(&fscache_n_relinquishes_retire);
49618
49619 if (!cookie) {
49620 - fscache_stat(&fscache_n_relinquishes_null);
49621 + fscache_stat_unchecked(&fscache_n_relinquishes_null);
49622 _leave(" [no cookie]");
49623 return;
49624 }
49625 @@ -435,7 +435,7 @@ void __fscache_relinquish_cookie(struct fscache_cookie *cookie, int retire)
49626
49627 /* wait for the cookie to finish being instantiated (or to fail) */
49628 if (test_bit(FSCACHE_COOKIE_CREATING, &cookie->flags)) {
49629 - fscache_stat(&fscache_n_relinquishes_waitcrt);
49630 + fscache_stat_unchecked(&fscache_n_relinquishes_waitcrt);
49631 wait_on_bit(&cookie->flags, FSCACHE_COOKIE_CREATING,
49632 fscache_wait_bit, TASK_UNINTERRUPTIBLE);
49633 }
49634 diff --git a/fs/fscache/internal.h b/fs/fscache/internal.h
49635 index edd7434..0725e66 100644
49636 --- a/fs/fscache/internal.h
49637 +++ b/fs/fscache/internal.h
49638 @@ -136,94 +136,94 @@ extern void fscache_proc_cleanup(void);
49639 extern atomic_t fscache_n_ops_processed[FSCACHE_MAX_THREADS];
49640 extern atomic_t fscache_n_objs_processed[FSCACHE_MAX_THREADS];
49641
49642 -extern atomic_t fscache_n_op_pend;
49643 -extern atomic_t fscache_n_op_run;
49644 -extern atomic_t fscache_n_op_enqueue;
49645 -extern atomic_t fscache_n_op_deferred_release;
49646 -extern atomic_t fscache_n_op_release;
49647 -extern atomic_t fscache_n_op_gc;
49648 -extern atomic_t fscache_n_op_cancelled;
49649 -extern atomic_t fscache_n_op_rejected;
49650 +extern atomic_unchecked_t fscache_n_op_pend;
49651 +extern atomic_unchecked_t fscache_n_op_run;
49652 +extern atomic_unchecked_t fscache_n_op_enqueue;
49653 +extern atomic_unchecked_t fscache_n_op_deferred_release;
49654 +extern atomic_unchecked_t fscache_n_op_release;
49655 +extern atomic_unchecked_t fscache_n_op_gc;
49656 +extern atomic_unchecked_t fscache_n_op_cancelled;
49657 +extern atomic_unchecked_t fscache_n_op_rejected;
49658
49659 -extern atomic_t fscache_n_attr_changed;
49660 -extern atomic_t fscache_n_attr_changed_ok;
49661 -extern atomic_t fscache_n_attr_changed_nobufs;
49662 -extern atomic_t fscache_n_attr_changed_nomem;
49663 -extern atomic_t fscache_n_attr_changed_calls;
49664 +extern atomic_unchecked_t fscache_n_attr_changed;
49665 +extern atomic_unchecked_t fscache_n_attr_changed_ok;
49666 +extern atomic_unchecked_t fscache_n_attr_changed_nobufs;
49667 +extern atomic_unchecked_t fscache_n_attr_changed_nomem;
49668 +extern atomic_unchecked_t fscache_n_attr_changed_calls;
49669
49670 -extern atomic_t fscache_n_allocs;
49671 -extern atomic_t fscache_n_allocs_ok;
49672 -extern atomic_t fscache_n_allocs_wait;
49673 -extern atomic_t fscache_n_allocs_nobufs;
49674 -extern atomic_t fscache_n_allocs_intr;
49675 -extern atomic_t fscache_n_allocs_object_dead;
49676 -extern atomic_t fscache_n_alloc_ops;
49677 -extern atomic_t fscache_n_alloc_op_waits;
49678 +extern atomic_unchecked_t fscache_n_allocs;
49679 +extern atomic_unchecked_t fscache_n_allocs_ok;
49680 +extern atomic_unchecked_t fscache_n_allocs_wait;
49681 +extern atomic_unchecked_t fscache_n_allocs_nobufs;
49682 +extern atomic_unchecked_t fscache_n_allocs_intr;
49683 +extern atomic_unchecked_t fscache_n_allocs_object_dead;
49684 +extern atomic_unchecked_t fscache_n_alloc_ops;
49685 +extern atomic_unchecked_t fscache_n_alloc_op_waits;
49686
49687 -extern atomic_t fscache_n_retrievals;
49688 -extern atomic_t fscache_n_retrievals_ok;
49689 -extern atomic_t fscache_n_retrievals_wait;
49690 -extern atomic_t fscache_n_retrievals_nodata;
49691 -extern atomic_t fscache_n_retrievals_nobufs;
49692 -extern atomic_t fscache_n_retrievals_intr;
49693 -extern atomic_t fscache_n_retrievals_nomem;
49694 -extern atomic_t fscache_n_retrievals_object_dead;
49695 -extern atomic_t fscache_n_retrieval_ops;
49696 -extern atomic_t fscache_n_retrieval_op_waits;
49697 +extern atomic_unchecked_t fscache_n_retrievals;
49698 +extern atomic_unchecked_t fscache_n_retrievals_ok;
49699 +extern atomic_unchecked_t fscache_n_retrievals_wait;
49700 +extern atomic_unchecked_t fscache_n_retrievals_nodata;
49701 +extern atomic_unchecked_t fscache_n_retrievals_nobufs;
49702 +extern atomic_unchecked_t fscache_n_retrievals_intr;
49703 +extern atomic_unchecked_t fscache_n_retrievals_nomem;
49704 +extern atomic_unchecked_t fscache_n_retrievals_object_dead;
49705 +extern atomic_unchecked_t fscache_n_retrieval_ops;
49706 +extern atomic_unchecked_t fscache_n_retrieval_op_waits;
49707
49708 -extern atomic_t fscache_n_stores;
49709 -extern atomic_t fscache_n_stores_ok;
49710 -extern atomic_t fscache_n_stores_again;
49711 -extern atomic_t fscache_n_stores_nobufs;
49712 -extern atomic_t fscache_n_stores_oom;
49713 -extern atomic_t fscache_n_store_ops;
49714 -extern atomic_t fscache_n_store_calls;
49715 -extern atomic_t fscache_n_store_pages;
49716 -extern atomic_t fscache_n_store_radix_deletes;
49717 -extern atomic_t fscache_n_store_pages_over_limit;
49718 +extern atomic_unchecked_t fscache_n_stores;
49719 +extern atomic_unchecked_t fscache_n_stores_ok;
49720 +extern atomic_unchecked_t fscache_n_stores_again;
49721 +extern atomic_unchecked_t fscache_n_stores_nobufs;
49722 +extern atomic_unchecked_t fscache_n_stores_oom;
49723 +extern atomic_unchecked_t fscache_n_store_ops;
49724 +extern atomic_unchecked_t fscache_n_store_calls;
49725 +extern atomic_unchecked_t fscache_n_store_pages;
49726 +extern atomic_unchecked_t fscache_n_store_radix_deletes;
49727 +extern atomic_unchecked_t fscache_n_store_pages_over_limit;
49728
49729 -extern atomic_t fscache_n_store_vmscan_not_storing;
49730 -extern atomic_t fscache_n_store_vmscan_gone;
49731 -extern atomic_t fscache_n_store_vmscan_busy;
49732 -extern atomic_t fscache_n_store_vmscan_cancelled;
49733 +extern atomic_unchecked_t fscache_n_store_vmscan_not_storing;
49734 +extern atomic_unchecked_t fscache_n_store_vmscan_gone;
49735 +extern atomic_unchecked_t fscache_n_store_vmscan_busy;
49736 +extern atomic_unchecked_t fscache_n_store_vmscan_cancelled;
49737
49738 -extern atomic_t fscache_n_marks;
49739 -extern atomic_t fscache_n_uncaches;
49740 +extern atomic_unchecked_t fscache_n_marks;
49741 +extern atomic_unchecked_t fscache_n_uncaches;
49742
49743 -extern atomic_t fscache_n_acquires;
49744 -extern atomic_t fscache_n_acquires_null;
49745 -extern atomic_t fscache_n_acquires_no_cache;
49746 -extern atomic_t fscache_n_acquires_ok;
49747 -extern atomic_t fscache_n_acquires_nobufs;
49748 -extern atomic_t fscache_n_acquires_oom;
49749 +extern atomic_unchecked_t fscache_n_acquires;
49750 +extern atomic_unchecked_t fscache_n_acquires_null;
49751 +extern atomic_unchecked_t fscache_n_acquires_no_cache;
49752 +extern atomic_unchecked_t fscache_n_acquires_ok;
49753 +extern atomic_unchecked_t fscache_n_acquires_nobufs;
49754 +extern atomic_unchecked_t fscache_n_acquires_oom;
49755
49756 -extern atomic_t fscache_n_updates;
49757 -extern atomic_t fscache_n_updates_null;
49758 -extern atomic_t fscache_n_updates_run;
49759 +extern atomic_unchecked_t fscache_n_updates;
49760 +extern atomic_unchecked_t fscache_n_updates_null;
49761 +extern atomic_unchecked_t fscache_n_updates_run;
49762
49763 -extern atomic_t fscache_n_relinquishes;
49764 -extern atomic_t fscache_n_relinquishes_null;
49765 -extern atomic_t fscache_n_relinquishes_waitcrt;
49766 -extern atomic_t fscache_n_relinquishes_retire;
49767 +extern atomic_unchecked_t fscache_n_relinquishes;
49768 +extern atomic_unchecked_t fscache_n_relinquishes_null;
49769 +extern atomic_unchecked_t fscache_n_relinquishes_waitcrt;
49770 +extern atomic_unchecked_t fscache_n_relinquishes_retire;
49771
49772 -extern atomic_t fscache_n_cookie_index;
49773 -extern atomic_t fscache_n_cookie_data;
49774 -extern atomic_t fscache_n_cookie_special;
49775 +extern atomic_unchecked_t fscache_n_cookie_index;
49776 +extern atomic_unchecked_t fscache_n_cookie_data;
49777 +extern atomic_unchecked_t fscache_n_cookie_special;
49778
49779 -extern atomic_t fscache_n_object_alloc;
49780 -extern atomic_t fscache_n_object_no_alloc;
49781 -extern atomic_t fscache_n_object_lookups;
49782 -extern atomic_t fscache_n_object_lookups_negative;
49783 -extern atomic_t fscache_n_object_lookups_positive;
49784 -extern atomic_t fscache_n_object_lookups_timed_out;
49785 -extern atomic_t fscache_n_object_created;
49786 -extern atomic_t fscache_n_object_avail;
49787 -extern atomic_t fscache_n_object_dead;
49788 +extern atomic_unchecked_t fscache_n_object_alloc;
49789 +extern atomic_unchecked_t fscache_n_object_no_alloc;
49790 +extern atomic_unchecked_t fscache_n_object_lookups;
49791 +extern atomic_unchecked_t fscache_n_object_lookups_negative;
49792 +extern atomic_unchecked_t fscache_n_object_lookups_positive;
49793 +extern atomic_unchecked_t fscache_n_object_lookups_timed_out;
49794 +extern atomic_unchecked_t fscache_n_object_created;
49795 +extern atomic_unchecked_t fscache_n_object_avail;
49796 +extern atomic_unchecked_t fscache_n_object_dead;
49797
49798 -extern atomic_t fscache_n_checkaux_none;
49799 -extern atomic_t fscache_n_checkaux_okay;
49800 -extern atomic_t fscache_n_checkaux_update;
49801 -extern atomic_t fscache_n_checkaux_obsolete;
49802 +extern atomic_unchecked_t fscache_n_checkaux_none;
49803 +extern atomic_unchecked_t fscache_n_checkaux_okay;
49804 +extern atomic_unchecked_t fscache_n_checkaux_update;
49805 +extern atomic_unchecked_t fscache_n_checkaux_obsolete;
49806
49807 extern atomic_t fscache_n_cop_alloc_object;
49808 extern atomic_t fscache_n_cop_lookup_object;
49809 @@ -247,6 +247,11 @@ static inline void fscache_stat(atomic_t *stat)
49810 atomic_inc(stat);
49811 }
49812
49813 +static inline void fscache_stat_unchecked(atomic_unchecked_t *stat)
49814 +{
49815 + atomic_inc_unchecked(stat);
49816 +}
49817 +
49818 static inline void fscache_stat_d(atomic_t *stat)
49819 {
49820 atomic_dec(stat);
49821 @@ -259,6 +264,7 @@ extern const struct file_operations fscache_stats_fops;
49822
49823 #define __fscache_stat(stat) (NULL)
49824 #define fscache_stat(stat) do {} while (0)
49825 +#define fscache_stat_unchecked(stat) do {} while (0)
49826 #define fscache_stat_d(stat) do {} while (0)
49827 #endif
49828
49829 diff --git a/fs/fscache/object.c b/fs/fscache/object.c
49830 index e513ac5..e888d34 100644
49831 --- a/fs/fscache/object.c
49832 +++ b/fs/fscache/object.c
49833 @@ -144,7 +144,7 @@ static void fscache_object_state_machine(struct fscache_object *object)
49834 /* update the object metadata on disk */
49835 case FSCACHE_OBJECT_UPDATING:
49836 clear_bit(FSCACHE_OBJECT_EV_UPDATE, &object->events);
49837 - fscache_stat(&fscache_n_updates_run);
49838 + fscache_stat_unchecked(&fscache_n_updates_run);
49839 fscache_stat(&fscache_n_cop_update_object);
49840 object->cache->ops->update_object(object);
49841 fscache_stat_d(&fscache_n_cop_update_object);
49842 @@ -233,7 +233,7 @@ static void fscache_object_state_machine(struct fscache_object *object)
49843 spin_lock(&object->lock);
49844 object->state = FSCACHE_OBJECT_DEAD;
49845 spin_unlock(&object->lock);
49846 - fscache_stat(&fscache_n_object_dead);
49847 + fscache_stat_unchecked(&fscache_n_object_dead);
49848 goto terminal_transit;
49849
49850 /* handle the parent cache of this object being withdrawn from
49851 @@ -248,7 +248,7 @@ static void fscache_object_state_machine(struct fscache_object *object)
49852 spin_lock(&object->lock);
49853 object->state = FSCACHE_OBJECT_DEAD;
49854 spin_unlock(&object->lock);
49855 - fscache_stat(&fscache_n_object_dead);
49856 + fscache_stat_unchecked(&fscache_n_object_dead);
49857 goto terminal_transit;
49858
49859 /* complain about the object being woken up once it is
49860 @@ -492,7 +492,7 @@ static void fscache_lookup_object(struct fscache_object *object)
49861 parent->cookie->def->name, cookie->def->name,
49862 object->cache->tag->name);
49863
49864 - fscache_stat(&fscache_n_object_lookups);
49865 + fscache_stat_unchecked(&fscache_n_object_lookups);
49866 fscache_stat(&fscache_n_cop_lookup_object);
49867 ret = object->cache->ops->lookup_object(object);
49868 fscache_stat_d(&fscache_n_cop_lookup_object);
49869 @@ -503,7 +503,7 @@ static void fscache_lookup_object(struct fscache_object *object)
49870 if (ret == -ETIMEDOUT) {
49871 /* probably stuck behind another object, so move this one to
49872 * the back of the queue */
49873 - fscache_stat(&fscache_n_object_lookups_timed_out);
49874 + fscache_stat_unchecked(&fscache_n_object_lookups_timed_out);
49875 set_bit(FSCACHE_OBJECT_EV_REQUEUE, &object->events);
49876 }
49877
49878 @@ -526,7 +526,7 @@ void fscache_object_lookup_negative(struct fscache_object *object)
49879
49880 spin_lock(&object->lock);
49881 if (object->state == FSCACHE_OBJECT_LOOKING_UP) {
49882 - fscache_stat(&fscache_n_object_lookups_negative);
49883 + fscache_stat_unchecked(&fscache_n_object_lookups_negative);
49884
49885 /* transit here to allow write requests to begin stacking up
49886 * and read requests to begin returning ENODATA */
49887 @@ -572,7 +572,7 @@ void fscache_obtained_object(struct fscache_object *object)
49888 * result, in which case there may be data available */
49889 spin_lock(&object->lock);
49890 if (object->state == FSCACHE_OBJECT_LOOKING_UP) {
49891 - fscache_stat(&fscache_n_object_lookups_positive);
49892 + fscache_stat_unchecked(&fscache_n_object_lookups_positive);
49893
49894 clear_bit(FSCACHE_COOKIE_NO_DATA_YET, &cookie->flags);
49895
49896 @@ -586,7 +586,7 @@ void fscache_obtained_object(struct fscache_object *object)
49897 set_bit(FSCACHE_OBJECT_EV_REQUEUE, &object->events);
49898 } else {
49899 ASSERTCMP(object->state, ==, FSCACHE_OBJECT_CREATING);
49900 - fscache_stat(&fscache_n_object_created);
49901 + fscache_stat_unchecked(&fscache_n_object_created);
49902
49903 object->state = FSCACHE_OBJECT_AVAILABLE;
49904 spin_unlock(&object->lock);
49905 @@ -633,7 +633,7 @@ static void fscache_object_available(struct fscache_object *object)
49906 fscache_enqueue_dependents(object);
49907
49908 fscache_hist(fscache_obj_instantiate_histogram, object->lookup_jif);
49909 - fscache_stat(&fscache_n_object_avail);
49910 + fscache_stat_unchecked(&fscache_n_object_avail);
49911
49912 _leave("");
49913 }
49914 @@ -861,7 +861,7 @@ enum fscache_checkaux fscache_check_aux(struct fscache_object *object,
49915 enum fscache_checkaux result;
49916
49917 if (!object->cookie->def->check_aux) {
49918 - fscache_stat(&fscache_n_checkaux_none);
49919 + fscache_stat_unchecked(&fscache_n_checkaux_none);
49920 return FSCACHE_CHECKAUX_OKAY;
49921 }
49922
49923 @@ -870,17 +870,17 @@ enum fscache_checkaux fscache_check_aux(struct fscache_object *object,
49924 switch (result) {
49925 /* entry okay as is */
49926 case FSCACHE_CHECKAUX_OKAY:
49927 - fscache_stat(&fscache_n_checkaux_okay);
49928 + fscache_stat_unchecked(&fscache_n_checkaux_okay);
49929 break;
49930
49931 /* entry requires update */
49932 case FSCACHE_CHECKAUX_NEEDS_UPDATE:
49933 - fscache_stat(&fscache_n_checkaux_update);
49934 + fscache_stat_unchecked(&fscache_n_checkaux_update);
49935 break;
49936
49937 /* entry requires deletion */
49938 case FSCACHE_CHECKAUX_OBSOLETE:
49939 - fscache_stat(&fscache_n_checkaux_obsolete);
49940 + fscache_stat_unchecked(&fscache_n_checkaux_obsolete);
49941 break;
49942
49943 default:
49944 diff --git a/fs/fscache/operation.c b/fs/fscache/operation.c
49945 index 313e79a..775240f 100644
49946 --- a/fs/fscache/operation.c
49947 +++ b/fs/fscache/operation.c
49948 @@ -16,7 +16,7 @@
49949 #include <linux/seq_file.h>
49950 #include "internal.h"
49951
49952 -atomic_t fscache_op_debug_id;
49953 +atomic_unchecked_t fscache_op_debug_id;
49954 EXPORT_SYMBOL(fscache_op_debug_id);
49955
49956 /**
49957 @@ -39,7 +39,7 @@ void fscache_enqueue_operation(struct fscache_operation *op)
49958 ASSERTCMP(op->object->state, >=, FSCACHE_OBJECT_AVAILABLE);
49959 ASSERTCMP(atomic_read(&op->usage), >, 0);
49960
49961 - fscache_stat(&fscache_n_op_enqueue);
49962 + fscache_stat_unchecked(&fscache_n_op_enqueue);
49963 switch (op->flags & FSCACHE_OP_TYPE) {
49964 case FSCACHE_OP_FAST:
49965 _debug("queue fast");
49966 @@ -76,7 +76,7 @@ static void fscache_run_op(struct fscache_object *object,
49967 wake_up_bit(&op->flags, FSCACHE_OP_WAITING);
49968 if (op->processor)
49969 fscache_enqueue_operation(op);
49970 - fscache_stat(&fscache_n_op_run);
49971 + fscache_stat_unchecked(&fscache_n_op_run);
49972 }
49973
49974 /*
49975 @@ -107,11 +107,11 @@ int fscache_submit_exclusive_op(struct fscache_object *object,
49976 if (object->n_ops > 0) {
49977 atomic_inc(&op->usage);
49978 list_add_tail(&op->pend_link, &object->pending_ops);
49979 - fscache_stat(&fscache_n_op_pend);
49980 + fscache_stat_unchecked(&fscache_n_op_pend);
49981 } else if (!list_empty(&object->pending_ops)) {
49982 atomic_inc(&op->usage);
49983 list_add_tail(&op->pend_link, &object->pending_ops);
49984 - fscache_stat(&fscache_n_op_pend);
49985 + fscache_stat_unchecked(&fscache_n_op_pend);
49986 fscache_start_operations(object);
49987 } else {
49988 ASSERTCMP(object->n_in_progress, ==, 0);
49989 @@ -127,7 +127,7 @@ int fscache_submit_exclusive_op(struct fscache_object *object,
49990 object->n_exclusive++; /* reads and writes must wait */
49991 atomic_inc(&op->usage);
49992 list_add_tail(&op->pend_link, &object->pending_ops);
49993 - fscache_stat(&fscache_n_op_pend);
49994 + fscache_stat_unchecked(&fscache_n_op_pend);
49995 ret = 0;
49996 } else {
49997 /* not allowed to submit ops in any other state */
49998 @@ -214,11 +214,11 @@ int fscache_submit_op(struct fscache_object *object,
49999 if (object->n_exclusive > 0) {
50000 atomic_inc(&op->usage);
50001 list_add_tail(&op->pend_link, &object->pending_ops);
50002 - fscache_stat(&fscache_n_op_pend);
50003 + fscache_stat_unchecked(&fscache_n_op_pend);
50004 } else if (!list_empty(&object->pending_ops)) {
50005 atomic_inc(&op->usage);
50006 list_add_tail(&op->pend_link, &object->pending_ops);
50007 - fscache_stat(&fscache_n_op_pend);
50008 + fscache_stat_unchecked(&fscache_n_op_pend);
50009 fscache_start_operations(object);
50010 } else {
50011 ASSERTCMP(object->n_exclusive, ==, 0);
50012 @@ -230,12 +230,12 @@ int fscache_submit_op(struct fscache_object *object,
50013 object->n_ops++;
50014 atomic_inc(&op->usage);
50015 list_add_tail(&op->pend_link, &object->pending_ops);
50016 - fscache_stat(&fscache_n_op_pend);
50017 + fscache_stat_unchecked(&fscache_n_op_pend);
50018 ret = 0;
50019 } else if (object->state == FSCACHE_OBJECT_DYING ||
50020 object->state == FSCACHE_OBJECT_LC_DYING ||
50021 object->state == FSCACHE_OBJECT_WITHDRAWING) {
50022 - fscache_stat(&fscache_n_op_rejected);
50023 + fscache_stat_unchecked(&fscache_n_op_rejected);
50024 ret = -ENOBUFS;
50025 } else if (!test_bit(FSCACHE_IOERROR, &object->cache->flags)) {
50026 fscache_report_unexpected_submission(object, op, ostate);
50027 @@ -305,7 +305,7 @@ int fscache_cancel_op(struct fscache_operation *op)
50028
50029 ret = -EBUSY;
50030 if (!list_empty(&op->pend_link)) {
50031 - fscache_stat(&fscache_n_op_cancelled);
50032 + fscache_stat_unchecked(&fscache_n_op_cancelled);
50033 list_del_init(&op->pend_link);
50034 object->n_ops--;
50035 if (test_bit(FSCACHE_OP_EXCLUSIVE, &op->flags))
50036 @@ -344,7 +344,7 @@ void fscache_put_operation(struct fscache_operation *op)
50037 if (test_and_set_bit(FSCACHE_OP_DEAD, &op->flags))
50038 BUG();
50039
50040 - fscache_stat(&fscache_n_op_release);
50041 + fscache_stat_unchecked(&fscache_n_op_release);
50042
50043 if (op->release) {
50044 op->release(op);
50045 @@ -361,7 +361,7 @@ void fscache_put_operation(struct fscache_operation *op)
50046 * lock, and defer it otherwise */
50047 if (!spin_trylock(&object->lock)) {
50048 _debug("defer put");
50049 - fscache_stat(&fscache_n_op_deferred_release);
50050 + fscache_stat_unchecked(&fscache_n_op_deferred_release);
50051
50052 cache = object->cache;
50053 spin_lock(&cache->op_gc_list_lock);
50054 @@ -423,7 +423,7 @@ void fscache_operation_gc(struct work_struct *work)
50055
50056 _debug("GC DEFERRED REL OBJ%x OP%x",
50057 object->debug_id, op->debug_id);
50058 - fscache_stat(&fscache_n_op_gc);
50059 + fscache_stat_unchecked(&fscache_n_op_gc);
50060
50061 ASSERTCMP(atomic_read(&op->usage), ==, 0);
50062
50063 diff --git a/fs/fscache/page.c b/fs/fscache/page.c
50064 index c598ea4..6aac13e 100644
50065 --- a/fs/fscache/page.c
50066 +++ b/fs/fscache/page.c
50067 @@ -59,7 +59,7 @@ bool __fscache_maybe_release_page(struct fscache_cookie *cookie,
50068 val = radix_tree_lookup(&cookie->stores, page->index);
50069 if (!val) {
50070 rcu_read_unlock();
50071 - fscache_stat(&fscache_n_store_vmscan_not_storing);
50072 + fscache_stat_unchecked(&fscache_n_store_vmscan_not_storing);
50073 __fscache_uncache_page(cookie, page);
50074 return true;
50075 }
50076 @@ -89,11 +89,11 @@ bool __fscache_maybe_release_page(struct fscache_cookie *cookie,
50077 spin_unlock(&cookie->stores_lock);
50078
50079 if (xpage) {
50080 - fscache_stat(&fscache_n_store_vmscan_cancelled);
50081 - fscache_stat(&fscache_n_store_radix_deletes);
50082 + fscache_stat_unchecked(&fscache_n_store_vmscan_cancelled);
50083 + fscache_stat_unchecked(&fscache_n_store_radix_deletes);
50084 ASSERTCMP(xpage, ==, page);
50085 } else {
50086 - fscache_stat(&fscache_n_store_vmscan_gone);
50087 + fscache_stat_unchecked(&fscache_n_store_vmscan_gone);
50088 }
50089
50090 wake_up_bit(&cookie->flags, 0);
50091 @@ -106,7 +106,7 @@ page_busy:
50092 /* we might want to wait here, but that could deadlock the allocator as
50093 * the slow-work threads writing to the cache may all end up sleeping
50094 * on memory allocation */
50095 - fscache_stat(&fscache_n_store_vmscan_busy);
50096 + fscache_stat_unchecked(&fscache_n_store_vmscan_busy);
50097 return false;
50098 }
50099 EXPORT_SYMBOL(__fscache_maybe_release_page);
50100 @@ -130,7 +130,7 @@ static void fscache_end_page_write(struct fscache_object *object,
50101 FSCACHE_COOKIE_STORING_TAG);
50102 if (!radix_tree_tag_get(&cookie->stores, page->index,
50103 FSCACHE_COOKIE_PENDING_TAG)) {
50104 - fscache_stat(&fscache_n_store_radix_deletes);
50105 + fscache_stat_unchecked(&fscache_n_store_radix_deletes);
50106 xpage = radix_tree_delete(&cookie->stores, page->index);
50107 }
50108 spin_unlock(&cookie->stores_lock);
50109 @@ -151,7 +151,7 @@ static void fscache_attr_changed_op(struct fscache_operation *op)
50110
50111 _enter("{OBJ%x OP%x}", object->debug_id, op->debug_id);
50112
50113 - fscache_stat(&fscache_n_attr_changed_calls);
50114 + fscache_stat_unchecked(&fscache_n_attr_changed_calls);
50115
50116 if (fscache_object_is_active(object)) {
50117 fscache_set_op_state(op, "CallFS");
50118 @@ -178,11 +178,11 @@ int __fscache_attr_changed(struct fscache_cookie *cookie)
50119
50120 ASSERTCMP(cookie->def->type, !=, FSCACHE_COOKIE_TYPE_INDEX);
50121
50122 - fscache_stat(&fscache_n_attr_changed);
50123 + fscache_stat_unchecked(&fscache_n_attr_changed);
50124
50125 op = kzalloc(sizeof(*op), GFP_KERNEL);
50126 if (!op) {
50127 - fscache_stat(&fscache_n_attr_changed_nomem);
50128 + fscache_stat_unchecked(&fscache_n_attr_changed_nomem);
50129 _leave(" = -ENOMEM");
50130 return -ENOMEM;
50131 }
50132 @@ -202,7 +202,7 @@ int __fscache_attr_changed(struct fscache_cookie *cookie)
50133 if (fscache_submit_exclusive_op(object, op) < 0)
50134 goto nobufs;
50135 spin_unlock(&cookie->lock);
50136 - fscache_stat(&fscache_n_attr_changed_ok);
50137 + fscache_stat_unchecked(&fscache_n_attr_changed_ok);
50138 fscache_put_operation(op);
50139 _leave(" = 0");
50140 return 0;
50141 @@ -210,7 +210,7 @@ int __fscache_attr_changed(struct fscache_cookie *cookie)
50142 nobufs:
50143 spin_unlock(&cookie->lock);
50144 kfree(op);
50145 - fscache_stat(&fscache_n_attr_changed_nobufs);
50146 + fscache_stat_unchecked(&fscache_n_attr_changed_nobufs);
50147 _leave(" = %d", -ENOBUFS);
50148 return -ENOBUFS;
50149 }
50150 @@ -264,7 +264,7 @@ static struct fscache_retrieval *fscache_alloc_retrieval(
50151 /* allocate a retrieval operation and attempt to submit it */
50152 op = kzalloc(sizeof(*op), GFP_NOIO);
50153 if (!op) {
50154 - fscache_stat(&fscache_n_retrievals_nomem);
50155 + fscache_stat_unchecked(&fscache_n_retrievals_nomem);
50156 return NULL;
50157 }
50158
50159 @@ -294,13 +294,13 @@ static int fscache_wait_for_deferred_lookup(struct fscache_cookie *cookie)
50160 return 0;
50161 }
50162
50163 - fscache_stat(&fscache_n_retrievals_wait);
50164 + fscache_stat_unchecked(&fscache_n_retrievals_wait);
50165
50166 jif = jiffies;
50167 if (wait_on_bit(&cookie->flags, FSCACHE_COOKIE_LOOKING_UP,
50168 fscache_wait_bit_interruptible,
50169 TASK_INTERRUPTIBLE) != 0) {
50170 - fscache_stat(&fscache_n_retrievals_intr);
50171 + fscache_stat_unchecked(&fscache_n_retrievals_intr);
50172 _leave(" = -ERESTARTSYS");
50173 return -ERESTARTSYS;
50174 }
50175 @@ -318,8 +318,8 @@ static int fscache_wait_for_deferred_lookup(struct fscache_cookie *cookie)
50176 */
50177 static int fscache_wait_for_retrieval_activation(struct fscache_object *object,
50178 struct fscache_retrieval *op,
50179 - atomic_t *stat_op_waits,
50180 - atomic_t *stat_object_dead)
50181 + atomic_unchecked_t *stat_op_waits,
50182 + atomic_unchecked_t *stat_object_dead)
50183 {
50184 int ret;
50185
50186 @@ -327,7 +327,7 @@ static int fscache_wait_for_retrieval_activation(struct fscache_object *object,
50187 goto check_if_dead;
50188
50189 _debug(">>> WT");
50190 - fscache_stat(stat_op_waits);
50191 + fscache_stat_unchecked(stat_op_waits);
50192 if (wait_on_bit(&op->op.flags, FSCACHE_OP_WAITING,
50193 fscache_wait_bit_interruptible,
50194 TASK_INTERRUPTIBLE) < 0) {
50195 @@ -344,7 +344,7 @@ static int fscache_wait_for_retrieval_activation(struct fscache_object *object,
50196
50197 check_if_dead:
50198 if (unlikely(fscache_object_is_dead(object))) {
50199 - fscache_stat(stat_object_dead);
50200 + fscache_stat_unchecked(stat_object_dead);
50201 return -ENOBUFS;
50202 }
50203 return 0;
50204 @@ -371,7 +371,7 @@ int __fscache_read_or_alloc_page(struct fscache_cookie *cookie,
50205
50206 _enter("%p,%p,,,", cookie, page);
50207
50208 - fscache_stat(&fscache_n_retrievals);
50209 + fscache_stat_unchecked(&fscache_n_retrievals);
50210
50211 if (hlist_empty(&cookie->backing_objects))
50212 goto nobufs;
50213 @@ -405,7 +405,7 @@ int __fscache_read_or_alloc_page(struct fscache_cookie *cookie,
50214 goto nobufs_unlock;
50215 spin_unlock(&cookie->lock);
50216
50217 - fscache_stat(&fscache_n_retrieval_ops);
50218 + fscache_stat_unchecked(&fscache_n_retrieval_ops);
50219
50220 /* pin the netfs read context in case we need to do the actual netfs
50221 * read because we've encountered a cache read failure */
50222 @@ -435,15 +435,15 @@ int __fscache_read_or_alloc_page(struct fscache_cookie *cookie,
50223
50224 error:
50225 if (ret == -ENOMEM)
50226 - fscache_stat(&fscache_n_retrievals_nomem);
50227 + fscache_stat_unchecked(&fscache_n_retrievals_nomem);
50228 else if (ret == -ERESTARTSYS)
50229 - fscache_stat(&fscache_n_retrievals_intr);
50230 + fscache_stat_unchecked(&fscache_n_retrievals_intr);
50231 else if (ret == -ENODATA)
50232 - fscache_stat(&fscache_n_retrievals_nodata);
50233 + fscache_stat_unchecked(&fscache_n_retrievals_nodata);
50234 else if (ret < 0)
50235 - fscache_stat(&fscache_n_retrievals_nobufs);
50236 + fscache_stat_unchecked(&fscache_n_retrievals_nobufs);
50237 else
50238 - fscache_stat(&fscache_n_retrievals_ok);
50239 + fscache_stat_unchecked(&fscache_n_retrievals_ok);
50240
50241 fscache_put_retrieval(op);
50242 _leave(" = %d", ret);
50243 @@ -453,7 +453,7 @@ nobufs_unlock:
50244 spin_unlock(&cookie->lock);
50245 kfree(op);
50246 nobufs:
50247 - fscache_stat(&fscache_n_retrievals_nobufs);
50248 + fscache_stat_unchecked(&fscache_n_retrievals_nobufs);
50249 _leave(" = -ENOBUFS");
50250 return -ENOBUFS;
50251 }
50252 @@ -491,7 +491,7 @@ int __fscache_read_or_alloc_pages(struct fscache_cookie *cookie,
50253
50254 _enter("%p,,%d,,,", cookie, *nr_pages);
50255
50256 - fscache_stat(&fscache_n_retrievals);
50257 + fscache_stat_unchecked(&fscache_n_retrievals);
50258
50259 if (hlist_empty(&cookie->backing_objects))
50260 goto nobufs;
50261 @@ -522,7 +522,7 @@ int __fscache_read_or_alloc_pages(struct fscache_cookie *cookie,
50262 goto nobufs_unlock;
50263 spin_unlock(&cookie->lock);
50264
50265 - fscache_stat(&fscache_n_retrieval_ops);
50266 + fscache_stat_unchecked(&fscache_n_retrieval_ops);
50267
50268 /* pin the netfs read context in case we need to do the actual netfs
50269 * read because we've encountered a cache read failure */
50270 @@ -552,15 +552,15 @@ int __fscache_read_or_alloc_pages(struct fscache_cookie *cookie,
50271
50272 error:
50273 if (ret == -ENOMEM)
50274 - fscache_stat(&fscache_n_retrievals_nomem);
50275 + fscache_stat_unchecked(&fscache_n_retrievals_nomem);
50276 else if (ret == -ERESTARTSYS)
50277 - fscache_stat(&fscache_n_retrievals_intr);
50278 + fscache_stat_unchecked(&fscache_n_retrievals_intr);
50279 else if (ret == -ENODATA)
50280 - fscache_stat(&fscache_n_retrievals_nodata);
50281 + fscache_stat_unchecked(&fscache_n_retrievals_nodata);
50282 else if (ret < 0)
50283 - fscache_stat(&fscache_n_retrievals_nobufs);
50284 + fscache_stat_unchecked(&fscache_n_retrievals_nobufs);
50285 else
50286 - fscache_stat(&fscache_n_retrievals_ok);
50287 + fscache_stat_unchecked(&fscache_n_retrievals_ok);
50288
50289 fscache_put_retrieval(op);
50290 _leave(" = %d", ret);
50291 @@ -570,7 +570,7 @@ nobufs_unlock:
50292 spin_unlock(&cookie->lock);
50293 kfree(op);
50294 nobufs:
50295 - fscache_stat(&fscache_n_retrievals_nobufs);
50296 + fscache_stat_unchecked(&fscache_n_retrievals_nobufs);
50297 _leave(" = -ENOBUFS");
50298 return -ENOBUFS;
50299 }
50300 @@ -594,7 +594,7 @@ int __fscache_alloc_page(struct fscache_cookie *cookie,
50301
50302 _enter("%p,%p,,,", cookie, page);
50303
50304 - fscache_stat(&fscache_n_allocs);
50305 + fscache_stat_unchecked(&fscache_n_allocs);
50306
50307 if (hlist_empty(&cookie->backing_objects))
50308 goto nobufs;
50309 @@ -621,7 +621,7 @@ int __fscache_alloc_page(struct fscache_cookie *cookie,
50310 goto nobufs_unlock;
50311 spin_unlock(&cookie->lock);
50312
50313 - fscache_stat(&fscache_n_alloc_ops);
50314 + fscache_stat_unchecked(&fscache_n_alloc_ops);
50315
50316 ret = fscache_wait_for_retrieval_activation(
50317 object, op,
50318 @@ -637,11 +637,11 @@ int __fscache_alloc_page(struct fscache_cookie *cookie,
50319
50320 error:
50321 if (ret == -ERESTARTSYS)
50322 - fscache_stat(&fscache_n_allocs_intr);
50323 + fscache_stat_unchecked(&fscache_n_allocs_intr);
50324 else if (ret < 0)
50325 - fscache_stat(&fscache_n_allocs_nobufs);
50326 + fscache_stat_unchecked(&fscache_n_allocs_nobufs);
50327 else
50328 - fscache_stat(&fscache_n_allocs_ok);
50329 + fscache_stat_unchecked(&fscache_n_allocs_ok);
50330
50331 fscache_put_retrieval(op);
50332 _leave(" = %d", ret);
50333 @@ -651,7 +651,7 @@ nobufs_unlock:
50334 spin_unlock(&cookie->lock);
50335 kfree(op);
50336 nobufs:
50337 - fscache_stat(&fscache_n_allocs_nobufs);
50338 + fscache_stat_unchecked(&fscache_n_allocs_nobufs);
50339 _leave(" = -ENOBUFS");
50340 return -ENOBUFS;
50341 }
50342 @@ -694,7 +694,7 @@ static void fscache_write_op(struct fscache_operation *_op)
50343
50344 spin_lock(&cookie->stores_lock);
50345
50346 - fscache_stat(&fscache_n_store_calls);
50347 + fscache_stat_unchecked(&fscache_n_store_calls);
50348
50349 /* find a page to store */
50350 page = NULL;
50351 @@ -705,7 +705,7 @@ static void fscache_write_op(struct fscache_operation *_op)
50352 page = results[0];
50353 _debug("gang %d [%lx]", n, page->index);
50354 if (page->index > op->store_limit) {
50355 - fscache_stat(&fscache_n_store_pages_over_limit);
50356 + fscache_stat_unchecked(&fscache_n_store_pages_over_limit);
50357 goto superseded;
50358 }
50359
50360 @@ -721,7 +721,7 @@ static void fscache_write_op(struct fscache_operation *_op)
50361
50362 if (page) {
50363 fscache_set_op_state(&op->op, "Store");
50364 - fscache_stat(&fscache_n_store_pages);
50365 + fscache_stat_unchecked(&fscache_n_store_pages);
50366 fscache_stat(&fscache_n_cop_write_page);
50367 ret = object->cache->ops->write_page(op, page);
50368 fscache_stat_d(&fscache_n_cop_write_page);
50369 @@ -792,7 +792,7 @@ int __fscache_write_page(struct fscache_cookie *cookie,
50370 ASSERTCMP(cookie->def->type, !=, FSCACHE_COOKIE_TYPE_INDEX);
50371 ASSERT(PageFsCache(page));
50372
50373 - fscache_stat(&fscache_n_stores);
50374 + fscache_stat_unchecked(&fscache_n_stores);
50375
50376 op = kzalloc(sizeof(*op), GFP_NOIO);
50377 if (!op)
50378 @@ -844,7 +844,7 @@ int __fscache_write_page(struct fscache_cookie *cookie,
50379 spin_unlock(&cookie->stores_lock);
50380 spin_unlock(&object->lock);
50381
50382 - op->op.debug_id = atomic_inc_return(&fscache_op_debug_id);
50383 + op->op.debug_id = atomic_inc_return_unchecked(&fscache_op_debug_id);
50384 op->store_limit = object->store_limit;
50385
50386 if (fscache_submit_op(object, &op->op) < 0)
50387 @@ -852,8 +852,8 @@ int __fscache_write_page(struct fscache_cookie *cookie,
50388
50389 spin_unlock(&cookie->lock);
50390 radix_tree_preload_end();
50391 - fscache_stat(&fscache_n_store_ops);
50392 - fscache_stat(&fscache_n_stores_ok);
50393 + fscache_stat_unchecked(&fscache_n_store_ops);
50394 + fscache_stat_unchecked(&fscache_n_stores_ok);
50395
50396 /* the slow work queue now carries its own ref on the object */
50397 fscache_put_operation(&op->op);
50398 @@ -861,14 +861,14 @@ int __fscache_write_page(struct fscache_cookie *cookie,
50399 return 0;
50400
50401 already_queued:
50402 - fscache_stat(&fscache_n_stores_again);
50403 + fscache_stat_unchecked(&fscache_n_stores_again);
50404 already_pending:
50405 spin_unlock(&cookie->stores_lock);
50406 spin_unlock(&object->lock);
50407 spin_unlock(&cookie->lock);
50408 radix_tree_preload_end();
50409 kfree(op);
50410 - fscache_stat(&fscache_n_stores_ok);
50411 + fscache_stat_unchecked(&fscache_n_stores_ok);
50412 _leave(" = 0");
50413 return 0;
50414
50415 @@ -886,14 +886,14 @@ nobufs:
50416 spin_unlock(&cookie->lock);
50417 radix_tree_preload_end();
50418 kfree(op);
50419 - fscache_stat(&fscache_n_stores_nobufs);
50420 + fscache_stat_unchecked(&fscache_n_stores_nobufs);
50421 _leave(" = -ENOBUFS");
50422 return -ENOBUFS;
50423
50424 nomem_free:
50425 kfree(op);
50426 nomem:
50427 - fscache_stat(&fscache_n_stores_oom);
50428 + fscache_stat_unchecked(&fscache_n_stores_oom);
50429 _leave(" = -ENOMEM");
50430 return -ENOMEM;
50431 }
50432 @@ -911,7 +911,7 @@ void __fscache_uncache_page(struct fscache_cookie *cookie, struct page *page)
50433 ASSERTCMP(cookie->def->type, !=, FSCACHE_COOKIE_TYPE_INDEX);
50434 ASSERTCMP(page, !=, NULL);
50435
50436 - fscache_stat(&fscache_n_uncaches);
50437 + fscache_stat_unchecked(&fscache_n_uncaches);
50438
50439 /* cache withdrawal may beat us to it */
50440 if (!PageFsCache(page))
50441 @@ -964,7 +964,7 @@ void fscache_mark_pages_cached(struct fscache_retrieval *op,
50442 unsigned long loop;
50443
50444 #ifdef CONFIG_FSCACHE_STATS
50445 - atomic_add(pagevec->nr, &fscache_n_marks);
50446 + atomic_add_unchecked(pagevec->nr, &fscache_n_marks);
50447 #endif
50448
50449 for (loop = 0; loop < pagevec->nr; loop++) {
50450 diff --git a/fs/fscache/stats.c b/fs/fscache/stats.c
50451 index 46435f3..8cddf18 100644
50452 --- a/fs/fscache/stats.c
50453 +++ b/fs/fscache/stats.c
50454 @@ -18,95 +18,95 @@
50455 /*
50456 * operation counters
50457 */
50458 -atomic_t fscache_n_op_pend;
50459 -atomic_t fscache_n_op_run;
50460 -atomic_t fscache_n_op_enqueue;
50461 -atomic_t fscache_n_op_requeue;
50462 -atomic_t fscache_n_op_deferred_release;
50463 -atomic_t fscache_n_op_release;
50464 -atomic_t fscache_n_op_gc;
50465 -atomic_t fscache_n_op_cancelled;
50466 -atomic_t fscache_n_op_rejected;
50467 +atomic_unchecked_t fscache_n_op_pend;
50468 +atomic_unchecked_t fscache_n_op_run;
50469 +atomic_unchecked_t fscache_n_op_enqueue;
50470 +atomic_unchecked_t fscache_n_op_requeue;
50471 +atomic_unchecked_t fscache_n_op_deferred_release;
50472 +atomic_unchecked_t fscache_n_op_release;
50473 +atomic_unchecked_t fscache_n_op_gc;
50474 +atomic_unchecked_t fscache_n_op_cancelled;
50475 +atomic_unchecked_t fscache_n_op_rejected;
50476
50477 -atomic_t fscache_n_attr_changed;
50478 -atomic_t fscache_n_attr_changed_ok;
50479 -atomic_t fscache_n_attr_changed_nobufs;
50480 -atomic_t fscache_n_attr_changed_nomem;
50481 -atomic_t fscache_n_attr_changed_calls;
50482 +atomic_unchecked_t fscache_n_attr_changed;
50483 +atomic_unchecked_t fscache_n_attr_changed_ok;
50484 +atomic_unchecked_t fscache_n_attr_changed_nobufs;
50485 +atomic_unchecked_t fscache_n_attr_changed_nomem;
50486 +atomic_unchecked_t fscache_n_attr_changed_calls;
50487
50488 -atomic_t fscache_n_allocs;
50489 -atomic_t fscache_n_allocs_ok;
50490 -atomic_t fscache_n_allocs_wait;
50491 -atomic_t fscache_n_allocs_nobufs;
50492 -atomic_t fscache_n_allocs_intr;
50493 -atomic_t fscache_n_allocs_object_dead;
50494 -atomic_t fscache_n_alloc_ops;
50495 -atomic_t fscache_n_alloc_op_waits;
50496 +atomic_unchecked_t fscache_n_allocs;
50497 +atomic_unchecked_t fscache_n_allocs_ok;
50498 +atomic_unchecked_t fscache_n_allocs_wait;
50499 +atomic_unchecked_t fscache_n_allocs_nobufs;
50500 +atomic_unchecked_t fscache_n_allocs_intr;
50501 +atomic_unchecked_t fscache_n_allocs_object_dead;
50502 +atomic_unchecked_t fscache_n_alloc_ops;
50503 +atomic_unchecked_t fscache_n_alloc_op_waits;
50504
50505 -atomic_t fscache_n_retrievals;
50506 -atomic_t fscache_n_retrievals_ok;
50507 -atomic_t fscache_n_retrievals_wait;
50508 -atomic_t fscache_n_retrievals_nodata;
50509 -atomic_t fscache_n_retrievals_nobufs;
50510 -atomic_t fscache_n_retrievals_intr;
50511 -atomic_t fscache_n_retrievals_nomem;
50512 -atomic_t fscache_n_retrievals_object_dead;
50513 -atomic_t fscache_n_retrieval_ops;
50514 -atomic_t fscache_n_retrieval_op_waits;
50515 +atomic_unchecked_t fscache_n_retrievals;
50516 +atomic_unchecked_t fscache_n_retrievals_ok;
50517 +atomic_unchecked_t fscache_n_retrievals_wait;
50518 +atomic_unchecked_t fscache_n_retrievals_nodata;
50519 +atomic_unchecked_t fscache_n_retrievals_nobufs;
50520 +atomic_unchecked_t fscache_n_retrievals_intr;
50521 +atomic_unchecked_t fscache_n_retrievals_nomem;
50522 +atomic_unchecked_t fscache_n_retrievals_object_dead;
50523 +atomic_unchecked_t fscache_n_retrieval_ops;
50524 +atomic_unchecked_t fscache_n_retrieval_op_waits;
50525
50526 -atomic_t fscache_n_stores;
50527 -atomic_t fscache_n_stores_ok;
50528 -atomic_t fscache_n_stores_again;
50529 -atomic_t fscache_n_stores_nobufs;
50530 -atomic_t fscache_n_stores_oom;
50531 -atomic_t fscache_n_store_ops;
50532 -atomic_t fscache_n_store_calls;
50533 -atomic_t fscache_n_store_pages;
50534 -atomic_t fscache_n_store_radix_deletes;
50535 -atomic_t fscache_n_store_pages_over_limit;
50536 +atomic_unchecked_t fscache_n_stores;
50537 +atomic_unchecked_t fscache_n_stores_ok;
50538 +atomic_unchecked_t fscache_n_stores_again;
50539 +atomic_unchecked_t fscache_n_stores_nobufs;
50540 +atomic_unchecked_t fscache_n_stores_oom;
50541 +atomic_unchecked_t fscache_n_store_ops;
50542 +atomic_unchecked_t fscache_n_store_calls;
50543 +atomic_unchecked_t fscache_n_store_pages;
50544 +atomic_unchecked_t fscache_n_store_radix_deletes;
50545 +atomic_unchecked_t fscache_n_store_pages_over_limit;
50546
50547 -atomic_t fscache_n_store_vmscan_not_storing;
50548 -atomic_t fscache_n_store_vmscan_gone;
50549 -atomic_t fscache_n_store_vmscan_busy;
50550 -atomic_t fscache_n_store_vmscan_cancelled;
50551 +atomic_unchecked_t fscache_n_store_vmscan_not_storing;
50552 +atomic_unchecked_t fscache_n_store_vmscan_gone;
50553 +atomic_unchecked_t fscache_n_store_vmscan_busy;
50554 +atomic_unchecked_t fscache_n_store_vmscan_cancelled;
50555
50556 -atomic_t fscache_n_marks;
50557 -atomic_t fscache_n_uncaches;
50558 +atomic_unchecked_t fscache_n_marks;
50559 +atomic_unchecked_t fscache_n_uncaches;
50560
50561 -atomic_t fscache_n_acquires;
50562 -atomic_t fscache_n_acquires_null;
50563 -atomic_t fscache_n_acquires_no_cache;
50564 -atomic_t fscache_n_acquires_ok;
50565 -atomic_t fscache_n_acquires_nobufs;
50566 -atomic_t fscache_n_acquires_oom;
50567 +atomic_unchecked_t fscache_n_acquires;
50568 +atomic_unchecked_t fscache_n_acquires_null;
50569 +atomic_unchecked_t fscache_n_acquires_no_cache;
50570 +atomic_unchecked_t fscache_n_acquires_ok;
50571 +atomic_unchecked_t fscache_n_acquires_nobufs;
50572 +atomic_unchecked_t fscache_n_acquires_oom;
50573
50574 -atomic_t fscache_n_updates;
50575 -atomic_t fscache_n_updates_null;
50576 -atomic_t fscache_n_updates_run;
50577 +atomic_unchecked_t fscache_n_updates;
50578 +atomic_unchecked_t fscache_n_updates_null;
50579 +atomic_unchecked_t fscache_n_updates_run;
50580
50581 -atomic_t fscache_n_relinquishes;
50582 -atomic_t fscache_n_relinquishes_null;
50583 -atomic_t fscache_n_relinquishes_waitcrt;
50584 -atomic_t fscache_n_relinquishes_retire;
50585 +atomic_unchecked_t fscache_n_relinquishes;
50586 +atomic_unchecked_t fscache_n_relinquishes_null;
50587 +atomic_unchecked_t fscache_n_relinquishes_waitcrt;
50588 +atomic_unchecked_t fscache_n_relinquishes_retire;
50589
50590 -atomic_t fscache_n_cookie_index;
50591 -atomic_t fscache_n_cookie_data;
50592 -atomic_t fscache_n_cookie_special;
50593 +atomic_unchecked_t fscache_n_cookie_index;
50594 +atomic_unchecked_t fscache_n_cookie_data;
50595 +atomic_unchecked_t fscache_n_cookie_special;
50596
50597 -atomic_t fscache_n_object_alloc;
50598 -atomic_t fscache_n_object_no_alloc;
50599 -atomic_t fscache_n_object_lookups;
50600 -atomic_t fscache_n_object_lookups_negative;
50601 -atomic_t fscache_n_object_lookups_positive;
50602 -atomic_t fscache_n_object_lookups_timed_out;
50603 -atomic_t fscache_n_object_created;
50604 -atomic_t fscache_n_object_avail;
50605 -atomic_t fscache_n_object_dead;
50606 +atomic_unchecked_t fscache_n_object_alloc;
50607 +atomic_unchecked_t fscache_n_object_no_alloc;
50608 +atomic_unchecked_t fscache_n_object_lookups;
50609 +atomic_unchecked_t fscache_n_object_lookups_negative;
50610 +atomic_unchecked_t fscache_n_object_lookups_positive;
50611 +atomic_unchecked_t fscache_n_object_lookups_timed_out;
50612 +atomic_unchecked_t fscache_n_object_created;
50613 +atomic_unchecked_t fscache_n_object_avail;
50614 +atomic_unchecked_t fscache_n_object_dead;
50615
50616 -atomic_t fscache_n_checkaux_none;
50617 -atomic_t fscache_n_checkaux_okay;
50618 -atomic_t fscache_n_checkaux_update;
50619 -atomic_t fscache_n_checkaux_obsolete;
50620 +atomic_unchecked_t fscache_n_checkaux_none;
50621 +atomic_unchecked_t fscache_n_checkaux_okay;
50622 +atomic_unchecked_t fscache_n_checkaux_update;
50623 +atomic_unchecked_t fscache_n_checkaux_obsolete;
50624
50625 atomic_t fscache_n_cop_alloc_object;
50626 atomic_t fscache_n_cop_lookup_object;
50627 @@ -133,113 +133,113 @@ static int fscache_stats_show(struct seq_file *m, void *v)
50628 seq_puts(m, "FS-Cache statistics\n");
50629
50630 seq_printf(m, "Cookies: idx=%u dat=%u spc=%u\n",
50631 - atomic_read(&fscache_n_cookie_index),
50632 - atomic_read(&fscache_n_cookie_data),
50633 - atomic_read(&fscache_n_cookie_special));
50634 + atomic_read_unchecked(&fscache_n_cookie_index),
50635 + atomic_read_unchecked(&fscache_n_cookie_data),
50636 + atomic_read_unchecked(&fscache_n_cookie_special));
50637
50638 seq_printf(m, "Objects: alc=%u nal=%u avl=%u ded=%u\n",
50639 - atomic_read(&fscache_n_object_alloc),
50640 - atomic_read(&fscache_n_object_no_alloc),
50641 - atomic_read(&fscache_n_object_avail),
50642 - atomic_read(&fscache_n_object_dead));
50643 + atomic_read_unchecked(&fscache_n_object_alloc),
50644 + atomic_read_unchecked(&fscache_n_object_no_alloc),
50645 + atomic_read_unchecked(&fscache_n_object_avail),
50646 + atomic_read_unchecked(&fscache_n_object_dead));
50647 seq_printf(m, "ChkAux : non=%u ok=%u upd=%u obs=%u\n",
50648 - atomic_read(&fscache_n_checkaux_none),
50649 - atomic_read(&fscache_n_checkaux_okay),
50650 - atomic_read(&fscache_n_checkaux_update),
50651 - atomic_read(&fscache_n_checkaux_obsolete));
50652 + atomic_read_unchecked(&fscache_n_checkaux_none),
50653 + atomic_read_unchecked(&fscache_n_checkaux_okay),
50654 + atomic_read_unchecked(&fscache_n_checkaux_update),
50655 + atomic_read_unchecked(&fscache_n_checkaux_obsolete));
50656
50657 seq_printf(m, "Pages : mrk=%u unc=%u\n",
50658 - atomic_read(&fscache_n_marks),
50659 - atomic_read(&fscache_n_uncaches));
50660 + atomic_read_unchecked(&fscache_n_marks),
50661 + atomic_read_unchecked(&fscache_n_uncaches));
50662
50663 seq_printf(m, "Acquire: n=%u nul=%u noc=%u ok=%u nbf=%u"
50664 " oom=%u\n",
50665 - atomic_read(&fscache_n_acquires),
50666 - atomic_read(&fscache_n_acquires_null),
50667 - atomic_read(&fscache_n_acquires_no_cache),
50668 - atomic_read(&fscache_n_acquires_ok),
50669 - atomic_read(&fscache_n_acquires_nobufs),
50670 - atomic_read(&fscache_n_acquires_oom));
50671 + atomic_read_unchecked(&fscache_n_acquires),
50672 + atomic_read_unchecked(&fscache_n_acquires_null),
50673 + atomic_read_unchecked(&fscache_n_acquires_no_cache),
50674 + atomic_read_unchecked(&fscache_n_acquires_ok),
50675 + atomic_read_unchecked(&fscache_n_acquires_nobufs),
50676 + atomic_read_unchecked(&fscache_n_acquires_oom));
50677
50678 seq_printf(m, "Lookups: n=%u neg=%u pos=%u crt=%u tmo=%u\n",
50679 - atomic_read(&fscache_n_object_lookups),
50680 - atomic_read(&fscache_n_object_lookups_negative),
50681 - atomic_read(&fscache_n_object_lookups_positive),
50682 - atomic_read(&fscache_n_object_lookups_timed_out),
50683 - atomic_read(&fscache_n_object_created));
50684 + atomic_read_unchecked(&fscache_n_object_lookups),
50685 + atomic_read_unchecked(&fscache_n_object_lookups_negative),
50686 + atomic_read_unchecked(&fscache_n_object_lookups_positive),
50687 + atomic_read_unchecked(&fscache_n_object_lookups_timed_out),
50688 + atomic_read_unchecked(&fscache_n_object_created));
50689
50690 seq_printf(m, "Updates: n=%u nul=%u run=%u\n",
50691 - atomic_read(&fscache_n_updates),
50692 - atomic_read(&fscache_n_updates_null),
50693 - atomic_read(&fscache_n_updates_run));
50694 + atomic_read_unchecked(&fscache_n_updates),
50695 + atomic_read_unchecked(&fscache_n_updates_null),
50696 + atomic_read_unchecked(&fscache_n_updates_run));
50697
50698 seq_printf(m, "Relinqs: n=%u nul=%u wcr=%u rtr=%u\n",
50699 - atomic_read(&fscache_n_relinquishes),
50700 - atomic_read(&fscache_n_relinquishes_null),
50701 - atomic_read(&fscache_n_relinquishes_waitcrt),
50702 - atomic_read(&fscache_n_relinquishes_retire));
50703 + atomic_read_unchecked(&fscache_n_relinquishes),
50704 + atomic_read_unchecked(&fscache_n_relinquishes_null),
50705 + atomic_read_unchecked(&fscache_n_relinquishes_waitcrt),
50706 + atomic_read_unchecked(&fscache_n_relinquishes_retire));
50707
50708 seq_printf(m, "AttrChg: n=%u ok=%u nbf=%u oom=%u run=%u\n",
50709 - atomic_read(&fscache_n_attr_changed),
50710 - atomic_read(&fscache_n_attr_changed_ok),
50711 - atomic_read(&fscache_n_attr_changed_nobufs),
50712 - atomic_read(&fscache_n_attr_changed_nomem),
50713 - atomic_read(&fscache_n_attr_changed_calls));
50714 + atomic_read_unchecked(&fscache_n_attr_changed),
50715 + atomic_read_unchecked(&fscache_n_attr_changed_ok),
50716 + atomic_read_unchecked(&fscache_n_attr_changed_nobufs),
50717 + atomic_read_unchecked(&fscache_n_attr_changed_nomem),
50718 + atomic_read_unchecked(&fscache_n_attr_changed_calls));
50719
50720 seq_printf(m, "Allocs : n=%u ok=%u wt=%u nbf=%u int=%u\n",
50721 - atomic_read(&fscache_n_allocs),
50722 - atomic_read(&fscache_n_allocs_ok),
50723 - atomic_read(&fscache_n_allocs_wait),
50724 - atomic_read(&fscache_n_allocs_nobufs),
50725 - atomic_read(&fscache_n_allocs_intr));
50726 + atomic_read_unchecked(&fscache_n_allocs),
50727 + atomic_read_unchecked(&fscache_n_allocs_ok),
50728 + atomic_read_unchecked(&fscache_n_allocs_wait),
50729 + atomic_read_unchecked(&fscache_n_allocs_nobufs),
50730 + atomic_read_unchecked(&fscache_n_allocs_intr));
50731 seq_printf(m, "Allocs : ops=%u owt=%u abt=%u\n",
50732 - atomic_read(&fscache_n_alloc_ops),
50733 - atomic_read(&fscache_n_alloc_op_waits),
50734 - atomic_read(&fscache_n_allocs_object_dead));
50735 + atomic_read_unchecked(&fscache_n_alloc_ops),
50736 + atomic_read_unchecked(&fscache_n_alloc_op_waits),
50737 + atomic_read_unchecked(&fscache_n_allocs_object_dead));
50738
50739 seq_printf(m, "Retrvls: n=%u ok=%u wt=%u nod=%u nbf=%u"
50740 " int=%u oom=%u\n",
50741 - atomic_read(&fscache_n_retrievals),
50742 - atomic_read(&fscache_n_retrievals_ok),
50743 - atomic_read(&fscache_n_retrievals_wait),
50744 - atomic_read(&fscache_n_retrievals_nodata),
50745 - atomic_read(&fscache_n_retrievals_nobufs),
50746 - atomic_read(&fscache_n_retrievals_intr),
50747 - atomic_read(&fscache_n_retrievals_nomem));
50748 + atomic_read_unchecked(&fscache_n_retrievals),
50749 + atomic_read_unchecked(&fscache_n_retrievals_ok),
50750 + atomic_read_unchecked(&fscache_n_retrievals_wait),
50751 + atomic_read_unchecked(&fscache_n_retrievals_nodata),
50752 + atomic_read_unchecked(&fscache_n_retrievals_nobufs),
50753 + atomic_read_unchecked(&fscache_n_retrievals_intr),
50754 + atomic_read_unchecked(&fscache_n_retrievals_nomem));
50755 seq_printf(m, "Retrvls: ops=%u owt=%u abt=%u\n",
50756 - atomic_read(&fscache_n_retrieval_ops),
50757 - atomic_read(&fscache_n_retrieval_op_waits),
50758 - atomic_read(&fscache_n_retrievals_object_dead));
50759 + atomic_read_unchecked(&fscache_n_retrieval_ops),
50760 + atomic_read_unchecked(&fscache_n_retrieval_op_waits),
50761 + atomic_read_unchecked(&fscache_n_retrievals_object_dead));
50762
50763 seq_printf(m, "Stores : n=%u ok=%u agn=%u nbf=%u oom=%u\n",
50764 - atomic_read(&fscache_n_stores),
50765 - atomic_read(&fscache_n_stores_ok),
50766 - atomic_read(&fscache_n_stores_again),
50767 - atomic_read(&fscache_n_stores_nobufs),
50768 - atomic_read(&fscache_n_stores_oom));
50769 + atomic_read_unchecked(&fscache_n_stores),
50770 + atomic_read_unchecked(&fscache_n_stores_ok),
50771 + atomic_read_unchecked(&fscache_n_stores_again),
50772 + atomic_read_unchecked(&fscache_n_stores_nobufs),
50773 + atomic_read_unchecked(&fscache_n_stores_oom));
50774 seq_printf(m, "Stores : ops=%u run=%u pgs=%u rxd=%u olm=%u\n",
50775 - atomic_read(&fscache_n_store_ops),
50776 - atomic_read(&fscache_n_store_calls),
50777 - atomic_read(&fscache_n_store_pages),
50778 - atomic_read(&fscache_n_store_radix_deletes),
50779 - atomic_read(&fscache_n_store_pages_over_limit));
50780 + atomic_read_unchecked(&fscache_n_store_ops),
50781 + atomic_read_unchecked(&fscache_n_store_calls),
50782 + atomic_read_unchecked(&fscache_n_store_pages),
50783 + atomic_read_unchecked(&fscache_n_store_radix_deletes),
50784 + atomic_read_unchecked(&fscache_n_store_pages_over_limit));
50785
50786 seq_printf(m, "VmScan : nos=%u gon=%u bsy=%u can=%u\n",
50787 - atomic_read(&fscache_n_store_vmscan_not_storing),
50788 - atomic_read(&fscache_n_store_vmscan_gone),
50789 - atomic_read(&fscache_n_store_vmscan_busy),
50790 - atomic_read(&fscache_n_store_vmscan_cancelled));
50791 + atomic_read_unchecked(&fscache_n_store_vmscan_not_storing),
50792 + atomic_read_unchecked(&fscache_n_store_vmscan_gone),
50793 + atomic_read_unchecked(&fscache_n_store_vmscan_busy),
50794 + atomic_read_unchecked(&fscache_n_store_vmscan_cancelled));
50795
50796 seq_printf(m, "Ops : pend=%u run=%u enq=%u can=%u rej=%u\n",
50797 - atomic_read(&fscache_n_op_pend),
50798 - atomic_read(&fscache_n_op_run),
50799 - atomic_read(&fscache_n_op_enqueue),
50800 - atomic_read(&fscache_n_op_cancelled),
50801 - atomic_read(&fscache_n_op_rejected));
50802 + atomic_read_unchecked(&fscache_n_op_pend),
50803 + atomic_read_unchecked(&fscache_n_op_run),
50804 + atomic_read_unchecked(&fscache_n_op_enqueue),
50805 + atomic_read_unchecked(&fscache_n_op_cancelled),
50806 + atomic_read_unchecked(&fscache_n_op_rejected));
50807 seq_printf(m, "Ops : dfr=%u rel=%u gc=%u\n",
50808 - atomic_read(&fscache_n_op_deferred_release),
50809 - atomic_read(&fscache_n_op_release),
50810 - atomic_read(&fscache_n_op_gc));
50811 + atomic_read_unchecked(&fscache_n_op_deferred_release),
50812 + atomic_read_unchecked(&fscache_n_op_release),
50813 + atomic_read_unchecked(&fscache_n_op_gc));
50814
50815 seq_printf(m, "CacheOp: alo=%d luo=%d luc=%d gro=%d\n",
50816 atomic_read(&fscache_n_cop_alloc_object),
50817 diff --git a/fs/fuse/cuse.c b/fs/fuse/cuse.c
50818 index de792dc..448b532 100644
50819 --- a/fs/fuse/cuse.c
50820 +++ b/fs/fuse/cuse.c
50821 @@ -576,10 +576,12 @@ static int __init cuse_init(void)
50822 INIT_LIST_HEAD(&cuse_conntbl[i]);
50823
50824 /* inherit and extend fuse_dev_operations */
50825 - cuse_channel_fops = fuse_dev_operations;
50826 - cuse_channel_fops.owner = THIS_MODULE;
50827 - cuse_channel_fops.open = cuse_channel_open;
50828 - cuse_channel_fops.release = cuse_channel_release;
50829 + pax_open_kernel();
50830 + memcpy((void *)&cuse_channel_fops, &fuse_dev_operations, sizeof(fuse_dev_operations));
50831 + *(void **)&cuse_channel_fops.owner = THIS_MODULE;
50832 + *(void **)&cuse_channel_fops.open = cuse_channel_open;
50833 + *(void **)&cuse_channel_fops.release = cuse_channel_release;
50834 + pax_close_kernel();
50835
50836 cuse_class = class_create(THIS_MODULE, "cuse");
50837 if (IS_ERR(cuse_class))
50838 diff --git a/fs/fuse/dev.c b/fs/fuse/dev.c
50839 index 1facb39..7f48557 100644
50840 --- a/fs/fuse/dev.c
50841 +++ b/fs/fuse/dev.c
50842 @@ -885,7 +885,7 @@ static int fuse_notify_inval_entry(struct fuse_conn *fc, unsigned int size,
50843 {
50844 struct fuse_notify_inval_entry_out outarg;
50845 int err = -EINVAL;
50846 - char buf[FUSE_NAME_MAX+1];
50847 + char *buf = NULL;
50848 struct qstr name;
50849
50850 if (size < sizeof(outarg))
50851 @@ -899,6 +899,11 @@ static int fuse_notify_inval_entry(struct fuse_conn *fc, unsigned int size,
50852 if (outarg.namelen > FUSE_NAME_MAX)
50853 goto err;
50854
50855 + err = -ENOMEM;
50856 + buf = kmalloc(FUSE_NAME_MAX+1, GFP_KERNEL);
50857 + if (!buf)
50858 + goto err;
50859 +
50860 err = -EINVAL;
50861 if (size != sizeof(outarg) + outarg.namelen + 1)
50862 goto err;
50863 @@ -914,17 +919,15 @@ static int fuse_notify_inval_entry(struct fuse_conn *fc, unsigned int size,
50864
50865 down_read(&fc->killsb);
50866 err = -ENOENT;
50867 - if (!fc->sb)
50868 - goto err_unlock;
50869 -
50870 - err = fuse_reverse_inval_entry(fc->sb, outarg.parent, &name);
50871 -
50872 -err_unlock:
50873 + if (fc->sb)
50874 + err = fuse_reverse_inval_entry(fc->sb, outarg.parent, &name);
50875 up_read(&fc->killsb);
50876 + kfree(buf);
50877 return err;
50878
50879 err:
50880 fuse_copy_finish(cs);
50881 + kfree(buf);
50882 return err;
50883 }
50884
50885 diff --git a/fs/fuse/dir.c b/fs/fuse/dir.c
50886 index 4787ae6..73efff7 100644
50887 --- a/fs/fuse/dir.c
50888 +++ b/fs/fuse/dir.c
50889 @@ -1127,7 +1127,7 @@ static char *read_link(struct dentry *dentry)
50890 return link;
50891 }
50892
50893 -static void free_link(char *link)
50894 +static void free_link(const char *link)
50895 {
50896 if (!IS_ERR(link))
50897 free_page((unsigned long) link);
50898 diff --git a/fs/gfs2/ops_inode.c b/fs/gfs2/ops_inode.c
50899 index 247436c..e650ccb 100644
50900 --- a/fs/gfs2/ops_inode.c
50901 +++ b/fs/gfs2/ops_inode.c
50902 @@ -752,6 +752,8 @@ static int gfs2_rename(struct inode *odir, struct dentry *odentry,
50903 unsigned int x;
50904 int error;
50905
50906 + pax_track_stack();
50907 +
50908 if (ndentry->d_inode) {
50909 nip = GFS2_I(ndentry->d_inode);
50910 if (ip == nip)
50911 diff --git a/fs/gfs2/sys.c b/fs/gfs2/sys.c
50912 index 4463297..4fed53b 100644
50913 --- a/fs/gfs2/sys.c
50914 +++ b/fs/gfs2/sys.c
50915 @@ -49,7 +49,7 @@ static ssize_t gfs2_attr_store(struct kobject *kobj, struct attribute *attr,
50916 return a->store ? a->store(sdp, buf, len) : len;
50917 }
50918
50919 -static struct sysfs_ops gfs2_attr_ops = {
50920 +static const struct sysfs_ops gfs2_attr_ops = {
50921 .show = gfs2_attr_show,
50922 .store = gfs2_attr_store,
50923 };
50924 @@ -584,7 +584,7 @@ static int gfs2_uevent(struct kset *kset, struct kobject *kobj,
50925 return 0;
50926 }
50927
50928 -static struct kset_uevent_ops gfs2_uevent_ops = {
50929 +static const struct kset_uevent_ops gfs2_uevent_ops = {
50930 .uevent = gfs2_uevent,
50931 };
50932
50933 diff --git a/fs/hfsplus/catalog.c b/fs/hfsplus/catalog.c
50934 index f6874ac..7cd98a8 100644
50935 --- a/fs/hfsplus/catalog.c
50936 +++ b/fs/hfsplus/catalog.c
50937 @@ -157,6 +157,8 @@ int hfsplus_find_cat(struct super_block *sb, u32 cnid,
50938 int err;
50939 u16 type;
50940
50941 + pax_track_stack();
50942 +
50943 hfsplus_cat_build_key(sb, fd->search_key, cnid, NULL);
50944 err = hfs_brec_read(fd, &tmp, sizeof(hfsplus_cat_entry));
50945 if (err)
50946 @@ -186,6 +188,8 @@ int hfsplus_create_cat(u32 cnid, struct inode *dir, struct qstr *str, struct ino
50947 int entry_size;
50948 int err;
50949
50950 + pax_track_stack();
50951 +
50952 dprint(DBG_CAT_MOD, "create_cat: %s,%u(%d)\n", str->name, cnid, inode->i_nlink);
50953 sb = dir->i_sb;
50954 hfs_find_init(HFSPLUS_SB(sb).cat_tree, &fd);
50955 @@ -318,6 +322,8 @@ int hfsplus_rename_cat(u32 cnid,
50956 int entry_size, type;
50957 int err = 0;
50958
50959 + pax_track_stack();
50960 +
50961 dprint(DBG_CAT_MOD, "rename_cat: %u - %lu,%s - %lu,%s\n", cnid, src_dir->i_ino, src_name->name,
50962 dst_dir->i_ino, dst_name->name);
50963 sb = src_dir->i_sb;
50964 diff --git a/fs/hfsplus/dir.c b/fs/hfsplus/dir.c
50965 index 5f40236..dac3421 100644
50966 --- a/fs/hfsplus/dir.c
50967 +++ b/fs/hfsplus/dir.c
50968 @@ -121,6 +121,8 @@ static int hfsplus_readdir(struct file *filp, void *dirent, filldir_t filldir)
50969 struct hfsplus_readdir_data *rd;
50970 u16 type;
50971
50972 + pax_track_stack();
50973 +
50974 if (filp->f_pos >= inode->i_size)
50975 return 0;
50976
50977 diff --git a/fs/hfsplus/inode.c b/fs/hfsplus/inode.c
50978 index 1bcf597..905a251 100644
50979 --- a/fs/hfsplus/inode.c
50980 +++ b/fs/hfsplus/inode.c
50981 @@ -399,6 +399,8 @@ int hfsplus_cat_read_inode(struct inode *inode, struct hfs_find_data *fd)
50982 int res = 0;
50983 u16 type;
50984
50985 + pax_track_stack();
50986 +
50987 type = hfs_bnode_read_u16(fd->bnode, fd->entryoffset);
50988
50989 HFSPLUS_I(inode).dev = 0;
50990 @@ -461,6 +463,8 @@ int hfsplus_cat_write_inode(struct inode *inode)
50991 struct hfs_find_data fd;
50992 hfsplus_cat_entry entry;
50993
50994 + pax_track_stack();
50995 +
50996 if (HFSPLUS_IS_RSRC(inode))
50997 main_inode = HFSPLUS_I(inode).rsrc_inode;
50998
50999 diff --git a/fs/hfsplus/ioctl.c b/fs/hfsplus/ioctl.c
51000 index f457d2c..7ef4ad5 100644
51001 --- a/fs/hfsplus/ioctl.c
51002 +++ b/fs/hfsplus/ioctl.c
51003 @@ -101,6 +101,8 @@ int hfsplus_setxattr(struct dentry *dentry, const char *name,
51004 struct hfsplus_cat_file *file;
51005 int res;
51006
51007 + pax_track_stack();
51008 +
51009 if (!S_ISREG(inode->i_mode) || HFSPLUS_IS_RSRC(inode))
51010 return -EOPNOTSUPP;
51011
51012 @@ -143,6 +145,8 @@ ssize_t hfsplus_getxattr(struct dentry *dentry, const char *name,
51013 struct hfsplus_cat_file *file;
51014 ssize_t res = 0;
51015
51016 + pax_track_stack();
51017 +
51018 if (!S_ISREG(inode->i_mode) || HFSPLUS_IS_RSRC(inode))
51019 return -EOPNOTSUPP;
51020
51021 diff --git a/fs/hfsplus/super.c b/fs/hfsplus/super.c
51022 index 43022f3..7298079 100644
51023 --- a/fs/hfsplus/super.c
51024 +++ b/fs/hfsplus/super.c
51025 @@ -312,6 +312,8 @@ static int hfsplus_fill_super(struct super_block *sb, void *data, int silent)
51026 struct nls_table *nls = NULL;
51027 int err = -EINVAL;
51028
51029 + pax_track_stack();
51030 +
51031 sbi = kzalloc(sizeof(*sbi), GFP_KERNEL);
51032 if (!sbi)
51033 return -ENOMEM;
51034 diff --git a/fs/hugetlbfs/inode.c b/fs/hugetlbfs/inode.c
51035 index 87a1258..5694d91 100644
51036 --- a/fs/hugetlbfs/inode.c
51037 +++ b/fs/hugetlbfs/inode.c
51038 @@ -909,7 +909,7 @@ static struct file_system_type hugetlbfs_fs_type = {
51039 .kill_sb = kill_litter_super,
51040 };
51041
51042 -static struct vfsmount *hugetlbfs_vfsmount;
51043 +struct vfsmount *hugetlbfs_vfsmount;
51044
51045 static int can_do_hugetlb_shm(void)
51046 {
51047 diff --git a/fs/ioctl.c b/fs/ioctl.c
51048 index 6c75110..19d2c3c 100644
51049 --- a/fs/ioctl.c
51050 +++ b/fs/ioctl.c
51051 @@ -97,7 +97,7 @@ int fiemap_fill_next_extent(struct fiemap_extent_info *fieinfo, u64 logical,
51052 u64 phys, u64 len, u32 flags)
51053 {
51054 struct fiemap_extent extent;
51055 - struct fiemap_extent *dest = fieinfo->fi_extents_start;
51056 + struct fiemap_extent __user *dest = fieinfo->fi_extents_start;
51057
51058 /* only count the extents */
51059 if (fieinfo->fi_extents_max == 0) {
51060 @@ -207,7 +207,7 @@ static int ioctl_fiemap(struct file *filp, unsigned long arg)
51061
51062 fieinfo.fi_flags = fiemap.fm_flags;
51063 fieinfo.fi_extents_max = fiemap.fm_extent_count;
51064 - fieinfo.fi_extents_start = (struct fiemap_extent *)(arg + sizeof(fiemap));
51065 + fieinfo.fi_extents_start = (struct fiemap_extent __user *)(arg + sizeof(fiemap));
51066
51067 if (fiemap.fm_extent_count != 0 &&
51068 !access_ok(VERIFY_WRITE, fieinfo.fi_extents_start,
51069 @@ -220,7 +220,7 @@ static int ioctl_fiemap(struct file *filp, unsigned long arg)
51070 error = inode->i_op->fiemap(inode, &fieinfo, fiemap.fm_start, len);
51071 fiemap.fm_flags = fieinfo.fi_flags;
51072 fiemap.fm_mapped_extents = fieinfo.fi_extents_mapped;
51073 - if (copy_to_user((char *)arg, &fiemap, sizeof(fiemap)))
51074 + if (copy_to_user((__force char __user *)arg, &fiemap, sizeof(fiemap)))
51075 error = -EFAULT;
51076
51077 return error;
51078 diff --git a/fs/jbd/checkpoint.c b/fs/jbd/checkpoint.c
51079 index b0435dd..81ee0be 100644
51080 --- a/fs/jbd/checkpoint.c
51081 +++ b/fs/jbd/checkpoint.c
51082 @@ -348,6 +348,8 @@ int log_do_checkpoint(journal_t *journal)
51083 tid_t this_tid;
51084 int result;
51085
51086 + pax_track_stack();
51087 +
51088 jbd_debug(1, "Start checkpoint\n");
51089
51090 /*
51091 diff --git a/fs/jffs2/compr_rtime.c b/fs/jffs2/compr_rtime.c
51092 index 546d153..736896c 100644
51093 --- a/fs/jffs2/compr_rtime.c
51094 +++ b/fs/jffs2/compr_rtime.c
51095 @@ -37,6 +37,8 @@ static int jffs2_rtime_compress(unsigned char *data_in,
51096 int outpos = 0;
51097 int pos=0;
51098
51099 + pax_track_stack();
51100 +
51101 memset(positions,0,sizeof(positions));
51102
51103 while (pos < (*sourcelen) && outpos <= (*dstlen)-2) {
51104 @@ -79,6 +81,8 @@ static int jffs2_rtime_decompress(unsigned char *data_in,
51105 int outpos = 0;
51106 int pos=0;
51107
51108 + pax_track_stack();
51109 +
51110 memset(positions,0,sizeof(positions));
51111
51112 while (outpos<destlen) {
51113 diff --git a/fs/jffs2/compr_rubin.c b/fs/jffs2/compr_rubin.c
51114 index 170d289..3254b98 100644
51115 --- a/fs/jffs2/compr_rubin.c
51116 +++ b/fs/jffs2/compr_rubin.c
51117 @@ -314,6 +314,8 @@ static int jffs2_dynrubin_compress(unsigned char *data_in,
51118 int ret;
51119 uint32_t mysrclen, mydstlen;
51120
51121 + pax_track_stack();
51122 +
51123 mysrclen = *sourcelen;
51124 mydstlen = *dstlen - 8;
51125
51126 diff --git a/fs/jffs2/erase.c b/fs/jffs2/erase.c
51127 index b47679b..00d65d3 100644
51128 --- a/fs/jffs2/erase.c
51129 +++ b/fs/jffs2/erase.c
51130 @@ -434,7 +434,8 @@ static void jffs2_mark_erased_block(struct jffs2_sb_info *c, struct jffs2_eraseb
51131 struct jffs2_unknown_node marker = {
51132 .magic = cpu_to_je16(JFFS2_MAGIC_BITMASK),
51133 .nodetype = cpu_to_je16(JFFS2_NODETYPE_CLEANMARKER),
51134 - .totlen = cpu_to_je32(c->cleanmarker_size)
51135 + .totlen = cpu_to_je32(c->cleanmarker_size),
51136 + .hdr_crc = cpu_to_je32(0)
51137 };
51138
51139 jffs2_prealloc_raw_node_refs(c, jeb, 1);
51140 diff --git a/fs/jffs2/wbuf.c b/fs/jffs2/wbuf.c
51141 index 5ef7bac..4fd1e3c 100644
51142 --- a/fs/jffs2/wbuf.c
51143 +++ b/fs/jffs2/wbuf.c
51144 @@ -1012,7 +1012,8 @@ static const struct jffs2_unknown_node oob_cleanmarker =
51145 {
51146 .magic = constant_cpu_to_je16(JFFS2_MAGIC_BITMASK),
51147 .nodetype = constant_cpu_to_je16(JFFS2_NODETYPE_CLEANMARKER),
51148 - .totlen = constant_cpu_to_je32(8)
51149 + .totlen = constant_cpu_to_je32(8),
51150 + .hdr_crc = constant_cpu_to_je32(0)
51151 };
51152
51153 /*
51154 diff --git a/fs/jffs2/xattr.c b/fs/jffs2/xattr.c
51155 index 082e844..52012a1 100644
51156 --- a/fs/jffs2/xattr.c
51157 +++ b/fs/jffs2/xattr.c
51158 @@ -773,6 +773,8 @@ void jffs2_build_xattr_subsystem(struct jffs2_sb_info *c)
51159
51160 BUG_ON(!(c->flags & JFFS2_SB_FLAG_BUILDING));
51161
51162 + pax_track_stack();
51163 +
51164 /* Phase.1 : Merge same xref */
51165 for (i=0; i < XREF_TMPHASH_SIZE; i++)
51166 xref_tmphash[i] = NULL;
51167 diff --git a/fs/jfs/super.c b/fs/jfs/super.c
51168 index 2234c73..f6e6e6b 100644
51169 --- a/fs/jfs/super.c
51170 +++ b/fs/jfs/super.c
51171 @@ -793,7 +793,7 @@ static int __init init_jfs_fs(void)
51172
51173 jfs_inode_cachep =
51174 kmem_cache_create("jfs_ip", sizeof(struct jfs_inode_info), 0,
51175 - SLAB_RECLAIM_ACCOUNT|SLAB_MEM_SPREAD,
51176 + SLAB_RECLAIM_ACCOUNT|SLAB_MEM_SPREAD|SLAB_USERCOPY,
51177 init_once);
51178 if (jfs_inode_cachep == NULL)
51179 return -ENOMEM;
51180 diff --git a/fs/libfs.c b/fs/libfs.c
51181 index ba36e93..3153fce 100644
51182 --- a/fs/libfs.c
51183 +++ b/fs/libfs.c
51184 @@ -157,12 +157,20 @@ int dcache_readdir(struct file * filp, void * dirent, filldir_t filldir)
51185
51186 for (p=q->next; p != &dentry->d_subdirs; p=p->next) {
51187 struct dentry *next;
51188 + char d_name[sizeof(next->d_iname)];
51189 + const unsigned char *name;
51190 +
51191 next = list_entry(p, struct dentry, d_u.d_child);
51192 if (d_unhashed(next) || !next->d_inode)
51193 continue;
51194
51195 spin_unlock(&dcache_lock);
51196 - if (filldir(dirent, next->d_name.name,
51197 + name = next->d_name.name;
51198 + if (name == next->d_iname) {
51199 + memcpy(d_name, name, next->d_name.len);
51200 + name = d_name;
51201 + }
51202 + if (filldir(dirent, name,
51203 next->d_name.len, filp->f_pos,
51204 next->d_inode->i_ino,
51205 dt_type(next->d_inode)) < 0)
51206 diff --git a/fs/lockd/clntproc.c b/fs/lockd/clntproc.c
51207 index c325a83..d15b07b 100644
51208 --- a/fs/lockd/clntproc.c
51209 +++ b/fs/lockd/clntproc.c
51210 @@ -36,11 +36,11 @@ static const struct rpc_call_ops nlmclnt_cancel_ops;
51211 /*
51212 * Cookie counter for NLM requests
51213 */
51214 -static atomic_t nlm_cookie = ATOMIC_INIT(0x1234);
51215 +static atomic_unchecked_t nlm_cookie = ATOMIC_INIT(0x1234);
51216
51217 void nlmclnt_next_cookie(struct nlm_cookie *c)
51218 {
51219 - u32 cookie = atomic_inc_return(&nlm_cookie);
51220 + u32 cookie = atomic_inc_return_unchecked(&nlm_cookie);
51221
51222 memcpy(c->data, &cookie, 4);
51223 c->len=4;
51224 @@ -621,6 +621,8 @@ nlmclnt_reclaim(struct nlm_host *host, struct file_lock *fl)
51225 struct nlm_rqst reqst, *req;
51226 int status;
51227
51228 + pax_track_stack();
51229 +
51230 req = &reqst;
51231 memset(req, 0, sizeof(*req));
51232 locks_init_lock(&req->a_args.lock.fl);
51233 diff --git a/fs/lockd/svc.c b/fs/lockd/svc.c
51234 index 1a54ae1..6a16c27 100644
51235 --- a/fs/lockd/svc.c
51236 +++ b/fs/lockd/svc.c
51237 @@ -43,7 +43,7 @@
51238
51239 static struct svc_program nlmsvc_program;
51240
51241 -struct nlmsvc_binding * nlmsvc_ops;
51242 +const struct nlmsvc_binding * nlmsvc_ops;
51243 EXPORT_SYMBOL_GPL(nlmsvc_ops);
51244
51245 static DEFINE_MUTEX(nlmsvc_mutex);
51246 diff --git a/fs/locks.c b/fs/locks.c
51247 index a8794f2..4041e55 100644
51248 --- a/fs/locks.c
51249 +++ b/fs/locks.c
51250 @@ -145,10 +145,28 @@ static LIST_HEAD(blocked_list);
51251
51252 static struct kmem_cache *filelock_cache __read_mostly;
51253
51254 +static void locks_init_lock_always(struct file_lock *fl)
51255 +{
51256 + fl->fl_next = NULL;
51257 + fl->fl_fasync = NULL;
51258 + fl->fl_owner = NULL;
51259 + fl->fl_pid = 0;
51260 + fl->fl_nspid = NULL;
51261 + fl->fl_file = NULL;
51262 + fl->fl_flags = 0;
51263 + fl->fl_type = 0;
51264 + fl->fl_start = fl->fl_end = 0;
51265 +}
51266 +
51267 /* Allocate an empty lock structure. */
51268 static struct file_lock *locks_alloc_lock(void)
51269 {
51270 - return kmem_cache_alloc(filelock_cache, GFP_KERNEL);
51271 + struct file_lock *fl = kmem_cache_alloc(filelock_cache, GFP_KERNEL);
51272 +
51273 + if (fl)
51274 + locks_init_lock_always(fl);
51275 +
51276 + return fl;
51277 }
51278
51279 void locks_release_private(struct file_lock *fl)
51280 @@ -183,17 +201,9 @@ void locks_init_lock(struct file_lock *fl)
51281 INIT_LIST_HEAD(&fl->fl_link);
51282 INIT_LIST_HEAD(&fl->fl_block);
51283 init_waitqueue_head(&fl->fl_wait);
51284 - fl->fl_next = NULL;
51285 - fl->fl_fasync = NULL;
51286 - fl->fl_owner = NULL;
51287 - fl->fl_pid = 0;
51288 - fl->fl_nspid = NULL;
51289 - fl->fl_file = NULL;
51290 - fl->fl_flags = 0;
51291 - fl->fl_type = 0;
51292 - fl->fl_start = fl->fl_end = 0;
51293 fl->fl_ops = NULL;
51294 fl->fl_lmops = NULL;
51295 + locks_init_lock_always(fl);
51296 }
51297
51298 EXPORT_SYMBOL(locks_init_lock);
51299 @@ -2007,16 +2017,16 @@ void locks_remove_flock(struct file *filp)
51300 return;
51301
51302 if (filp->f_op && filp->f_op->flock) {
51303 - struct file_lock fl = {
51304 + struct file_lock flock = {
51305 .fl_pid = current->tgid,
51306 .fl_file = filp,
51307 .fl_flags = FL_FLOCK,
51308 .fl_type = F_UNLCK,
51309 .fl_end = OFFSET_MAX,
51310 };
51311 - filp->f_op->flock(filp, F_SETLKW, &fl);
51312 - if (fl.fl_ops && fl.fl_ops->fl_release_private)
51313 - fl.fl_ops->fl_release_private(&fl);
51314 + filp->f_op->flock(filp, F_SETLKW, &flock);
51315 + if (flock.fl_ops && flock.fl_ops->fl_release_private)
51316 + flock.fl_ops->fl_release_private(&flock);
51317 }
51318
51319 lock_kernel();
51320 diff --git a/fs/mbcache.c b/fs/mbcache.c
51321 index ec88ff3..b843a82 100644
51322 --- a/fs/mbcache.c
51323 +++ b/fs/mbcache.c
51324 @@ -266,9 +266,9 @@ mb_cache_create(const char *name, struct mb_cache_op *cache_op,
51325 if (!cache)
51326 goto fail;
51327 cache->c_name = name;
51328 - cache->c_op.free = NULL;
51329 + *(void **)&cache->c_op.free = NULL;
51330 if (cache_op)
51331 - cache->c_op.free = cache_op->free;
51332 + *(void **)&cache->c_op.free = cache_op->free;
51333 atomic_set(&cache->c_entry_count, 0);
51334 cache->c_bucket_bits = bucket_bits;
51335 #ifdef MB_CACHE_INDEXES_COUNT
51336 diff --git a/fs/namei.c b/fs/namei.c
51337 index b0afbd4..8d065a1 100644
51338 --- a/fs/namei.c
51339 +++ b/fs/namei.c
51340 @@ -224,6 +224,14 @@ int generic_permission(struct inode *inode, int mask,
51341 return ret;
51342
51343 /*
51344 + * Searching includes executable on directories, else just read.
51345 + */
51346 + mask &= MAY_READ | MAY_WRITE | MAY_EXEC;
51347 + if (mask == MAY_READ || (S_ISDIR(inode->i_mode) && !(mask & MAY_WRITE)))
51348 + if (capable(CAP_DAC_READ_SEARCH))
51349 + return 0;
51350 +
51351 + /*
51352 * Read/write DACs are always overridable.
51353 * Executable DACs are overridable if at least one exec bit is set.
51354 */
51355 @@ -231,14 +239,6 @@ int generic_permission(struct inode *inode, int mask,
51356 if (capable(CAP_DAC_OVERRIDE))
51357 return 0;
51358
51359 - /*
51360 - * Searching includes executable on directories, else just read.
51361 - */
51362 - mask &= MAY_READ | MAY_WRITE | MAY_EXEC;
51363 - if (mask == MAY_READ || (S_ISDIR(inode->i_mode) && !(mask & MAY_WRITE)))
51364 - if (capable(CAP_DAC_READ_SEARCH))
51365 - return 0;
51366 -
51367 return -EACCES;
51368 }
51369
51370 @@ -458,7 +458,8 @@ static int exec_permission_lite(struct inode *inode)
51371 if (!ret)
51372 goto ok;
51373
51374 - if (capable(CAP_DAC_OVERRIDE) || capable(CAP_DAC_READ_SEARCH))
51375 + if (capable_nolog(CAP_DAC_OVERRIDE) || capable(CAP_DAC_READ_SEARCH) ||
51376 + capable(CAP_DAC_OVERRIDE))
51377 goto ok;
51378
51379 return ret;
51380 @@ -638,7 +639,7 @@ static __always_inline int __do_follow_link(struct path *path, struct nameidata
51381 cookie = dentry->d_inode->i_op->follow_link(dentry, nd);
51382 error = PTR_ERR(cookie);
51383 if (!IS_ERR(cookie)) {
51384 - char *s = nd_get_link(nd);
51385 + const char *s = nd_get_link(nd);
51386 error = 0;
51387 if (s)
51388 error = __vfs_follow_link(nd, s);
51389 @@ -669,6 +670,13 @@ static inline int do_follow_link(struct path *path, struct nameidata *nd)
51390 err = security_inode_follow_link(path->dentry, nd);
51391 if (err)
51392 goto loop;
51393 +
51394 + if (gr_handle_follow_link(path->dentry->d_parent->d_inode,
51395 + path->dentry->d_inode, path->dentry, nd->path.mnt)) {
51396 + err = -EACCES;
51397 + goto loop;
51398 + }
51399 +
51400 current->link_count++;
51401 current->total_link_count++;
51402 nd->depth++;
51403 @@ -1016,11 +1024,19 @@ return_reval:
51404 break;
51405 }
51406 return_base:
51407 + if (!(nd->flags & (LOOKUP_CONTINUE | LOOKUP_PARENT)) &&
51408 + !gr_acl_handle_hidden_file(nd->path.dentry, nd->path.mnt)) {
51409 + path_put(&nd->path);
51410 + return -ENOENT;
51411 + }
51412 return 0;
51413 out_dput:
51414 path_put_conditional(&next, nd);
51415 break;
51416 }
51417 + if (!gr_acl_handle_hidden_file(nd->path.dentry, nd->path.mnt))
51418 + err = -ENOENT;
51419 +
51420 path_put(&nd->path);
51421 return_err:
51422 return err;
51423 @@ -1091,13 +1107,20 @@ static int do_path_lookup(int dfd, const char *name,
51424 int retval = path_init(dfd, name, flags, nd);
51425 if (!retval)
51426 retval = path_walk(name, nd);
51427 - if (unlikely(!retval && !audit_dummy_context() && nd->path.dentry &&
51428 - nd->path.dentry->d_inode))
51429 - audit_inode(name, nd->path.dentry);
51430 +
51431 + if (likely(!retval)) {
51432 + if (nd->path.dentry && nd->path.dentry->d_inode) {
51433 + if (*name != '/' && !gr_chroot_fchdir(nd->path.dentry, nd->path.mnt))
51434 + retval = -ENOENT;
51435 + if (!audit_dummy_context())
51436 + audit_inode(name, nd->path.dentry);
51437 + }
51438 + }
51439 if (nd->root.mnt) {
51440 path_put(&nd->root);
51441 nd->root.mnt = NULL;
51442 }
51443 +
51444 return retval;
51445 }
51446
51447 @@ -1576,6 +1599,20 @@ int may_open(struct path *path, int acc_mode, int flag)
51448 if (error)
51449 goto err_out;
51450
51451 +
51452 + if (gr_handle_rofs_blockwrite(dentry, path->mnt, acc_mode)) {
51453 + error = -EPERM;
51454 + goto err_out;
51455 + }
51456 + if (gr_handle_rawio(inode)) {
51457 + error = -EPERM;
51458 + goto err_out;
51459 + }
51460 + if (!gr_acl_handle_open(dentry, path->mnt, acc_mode)) {
51461 + error = -EACCES;
51462 + goto err_out;
51463 + }
51464 +
51465 if (flag & O_TRUNC) {
51466 error = get_write_access(inode);
51467 if (error)
51468 @@ -1620,6 +1657,17 @@ static int __open_namei_create(struct nameidata *nd, struct path *path,
51469 {
51470 int error;
51471 struct dentry *dir = nd->path.dentry;
51472 + int acc_mode = ACC_MODE(flag);
51473 +
51474 + if (flag & O_TRUNC)
51475 + acc_mode |= MAY_WRITE;
51476 + if (flag & O_APPEND)
51477 + acc_mode |= MAY_APPEND;
51478 +
51479 + if (!gr_acl_handle_creat(path->dentry, dir, nd->path.mnt, flag, acc_mode, mode)) {
51480 + error = -EACCES;
51481 + goto out_unlock;
51482 + }
51483
51484 if (!IS_POSIXACL(dir->d_inode))
51485 mode &= ~current_umask();
51486 @@ -1627,6 +1675,8 @@ static int __open_namei_create(struct nameidata *nd, struct path *path,
51487 if (error)
51488 goto out_unlock;
51489 error = vfs_create(dir->d_inode, path->dentry, mode, nd);
51490 + if (!error)
51491 + gr_handle_create(path->dentry, nd->path.mnt);
51492 out_unlock:
51493 mutex_unlock(&dir->d_inode->i_mutex);
51494 dput(nd->path.dentry);
51495 @@ -1709,6 +1759,22 @@ struct file *do_filp_open(int dfd, const char *pathname,
51496 &nd, flag);
51497 if (error)
51498 return ERR_PTR(error);
51499 +
51500 + if (gr_handle_rofs_blockwrite(nd.path.dentry, nd.path.mnt, acc_mode)) {
51501 + error = -EPERM;
51502 + goto exit;
51503 + }
51504 +
51505 + if (gr_handle_rawio(nd.path.dentry->d_inode)) {
51506 + error = -EPERM;
51507 + goto exit;
51508 + }
51509 +
51510 + if (!gr_acl_handle_open(nd.path.dentry, nd.path.mnt, acc_mode)) {
51511 + error = -EACCES;
51512 + goto exit;
51513 + }
51514 +
51515 goto ok;
51516 }
51517
51518 @@ -1795,6 +1861,19 @@ do_last:
51519 /*
51520 * It already exists.
51521 */
51522 +
51523 + if (!gr_acl_handle_hidden_file(path.dentry, path.mnt)) {
51524 + error = -ENOENT;
51525 + goto exit_mutex_unlock;
51526 + }
51527 +
51528 + /* only check if O_CREAT is specified, all other checks need
51529 + to go into may_open */
51530 + if (gr_handle_fifo(path.dentry, path.mnt, dir, flag, acc_mode)) {
51531 + error = -EACCES;
51532 + goto exit_mutex_unlock;
51533 + }
51534 +
51535 mutex_unlock(&dir->d_inode->i_mutex);
51536 audit_inode(pathname, path.dentry);
51537
51538 @@ -1887,6 +1966,13 @@ do_link:
51539 error = security_inode_follow_link(path.dentry, &nd);
51540 if (error)
51541 goto exit_dput;
51542 +
51543 + if (gr_handle_follow_link(path.dentry->d_parent->d_inode, path.dentry->d_inode,
51544 + path.dentry, nd.path.mnt)) {
51545 + error = -EACCES;
51546 + goto exit_dput;
51547 + }
51548 +
51549 error = __do_follow_link(&path, &nd);
51550 if (error) {
51551 /* Does someone understand code flow here? Or it is only
51552 @@ -1984,6 +2070,10 @@ struct dentry *lookup_create(struct nameidata *nd, int is_dir)
51553 }
51554 return dentry;
51555 eexist:
51556 + if (!gr_acl_handle_hidden_file(dentry, nd->path.mnt)) {
51557 + dput(dentry);
51558 + return ERR_PTR(-ENOENT);
51559 + }
51560 dput(dentry);
51561 dentry = ERR_PTR(-EEXIST);
51562 fail:
51563 @@ -2061,6 +2151,17 @@ SYSCALL_DEFINE4(mknodat, int, dfd, const char __user *, filename, int, mode,
51564 error = may_mknod(mode);
51565 if (error)
51566 goto out_dput;
51567 +
51568 + if (gr_handle_chroot_mknod(dentry, nd.path.mnt, mode)) {
51569 + error = -EPERM;
51570 + goto out_dput;
51571 + }
51572 +
51573 + if (!gr_acl_handle_mknod(dentry, nd.path.dentry, nd.path.mnt, mode)) {
51574 + error = -EACCES;
51575 + goto out_dput;
51576 + }
51577 +
51578 error = mnt_want_write(nd.path.mnt);
51579 if (error)
51580 goto out_dput;
51581 @@ -2081,6 +2182,9 @@ SYSCALL_DEFINE4(mknodat, int, dfd, const char __user *, filename, int, mode,
51582 }
51583 out_drop_write:
51584 mnt_drop_write(nd.path.mnt);
51585 +
51586 + if (!error)
51587 + gr_handle_create(dentry, nd.path.mnt);
51588 out_dput:
51589 dput(dentry);
51590 out_unlock:
51591 @@ -2134,6 +2238,11 @@ SYSCALL_DEFINE3(mkdirat, int, dfd, const char __user *, pathname, int, mode)
51592 if (IS_ERR(dentry))
51593 goto out_unlock;
51594
51595 + if (!gr_acl_handle_mkdir(dentry, nd.path.dentry, nd.path.mnt)) {
51596 + error = -EACCES;
51597 + goto out_dput;
51598 + }
51599 +
51600 if (!IS_POSIXACL(nd.path.dentry->d_inode))
51601 mode &= ~current_umask();
51602 error = mnt_want_write(nd.path.mnt);
51603 @@ -2145,6 +2254,10 @@ SYSCALL_DEFINE3(mkdirat, int, dfd, const char __user *, pathname, int, mode)
51604 error = vfs_mkdir(nd.path.dentry->d_inode, dentry, mode);
51605 out_drop_write:
51606 mnt_drop_write(nd.path.mnt);
51607 +
51608 + if (!error)
51609 + gr_handle_create(dentry, nd.path.mnt);
51610 +
51611 out_dput:
51612 dput(dentry);
51613 out_unlock:
51614 @@ -2226,6 +2339,8 @@ static long do_rmdir(int dfd, const char __user *pathname)
51615 char * name;
51616 struct dentry *dentry;
51617 struct nameidata nd;
51618 + ino_t saved_ino = 0;
51619 + dev_t saved_dev = 0;
51620
51621 error = user_path_parent(dfd, pathname, &nd, &name);
51622 if (error)
51623 @@ -2250,6 +2365,17 @@ static long do_rmdir(int dfd, const char __user *pathname)
51624 error = PTR_ERR(dentry);
51625 if (IS_ERR(dentry))
51626 goto exit2;
51627 +
51628 + if (dentry->d_inode != NULL) {
51629 + saved_ino = dentry->d_inode->i_ino;
51630 + saved_dev = gr_get_dev_from_dentry(dentry);
51631 +
51632 + if (!gr_acl_handle_rmdir(dentry, nd.path.mnt)) {
51633 + error = -EACCES;
51634 + goto exit3;
51635 + }
51636 + }
51637 +
51638 error = mnt_want_write(nd.path.mnt);
51639 if (error)
51640 goto exit3;
51641 @@ -2257,6 +2383,8 @@ static long do_rmdir(int dfd, const char __user *pathname)
51642 if (error)
51643 goto exit4;
51644 error = vfs_rmdir(nd.path.dentry->d_inode, dentry);
51645 + if (!error && (saved_dev || saved_ino))
51646 + gr_handle_delete(saved_ino, saved_dev);
51647 exit4:
51648 mnt_drop_write(nd.path.mnt);
51649 exit3:
51650 @@ -2318,6 +2446,8 @@ static long do_unlinkat(int dfd, const char __user *pathname)
51651 struct dentry *dentry;
51652 struct nameidata nd;
51653 struct inode *inode = NULL;
51654 + ino_t saved_ino = 0;
51655 + dev_t saved_dev = 0;
51656
51657 error = user_path_parent(dfd, pathname, &nd, &name);
51658 if (error)
51659 @@ -2337,8 +2467,19 @@ static long do_unlinkat(int dfd, const char __user *pathname)
51660 if (nd.last.name[nd.last.len])
51661 goto slashes;
51662 inode = dentry->d_inode;
51663 - if (inode)
51664 + if (inode) {
51665 + if (inode->i_nlink <= 1) {
51666 + saved_ino = inode->i_ino;
51667 + saved_dev = gr_get_dev_from_dentry(dentry);
51668 + }
51669 +
51670 atomic_inc(&inode->i_count);
51671 +
51672 + if (!gr_acl_handle_unlink(dentry, nd.path.mnt)) {
51673 + error = -EACCES;
51674 + goto exit2;
51675 + }
51676 + }
51677 error = mnt_want_write(nd.path.mnt);
51678 if (error)
51679 goto exit2;
51680 @@ -2346,6 +2487,8 @@ static long do_unlinkat(int dfd, const char __user *pathname)
51681 if (error)
51682 goto exit3;
51683 error = vfs_unlink(nd.path.dentry->d_inode, dentry);
51684 + if (!error && (saved_ino || saved_dev))
51685 + gr_handle_delete(saved_ino, saved_dev);
51686 exit3:
51687 mnt_drop_write(nd.path.mnt);
51688 exit2:
51689 @@ -2424,6 +2567,11 @@ SYSCALL_DEFINE3(symlinkat, const char __user *, oldname,
51690 if (IS_ERR(dentry))
51691 goto out_unlock;
51692
51693 + if (!gr_acl_handle_symlink(dentry, nd.path.dentry, nd.path.mnt, from)) {
51694 + error = -EACCES;
51695 + goto out_dput;
51696 + }
51697 +
51698 error = mnt_want_write(nd.path.mnt);
51699 if (error)
51700 goto out_dput;
51701 @@ -2431,6 +2579,8 @@ SYSCALL_DEFINE3(symlinkat, const char __user *, oldname,
51702 if (error)
51703 goto out_drop_write;
51704 error = vfs_symlink(nd.path.dentry->d_inode, dentry, from);
51705 + if (!error)
51706 + gr_handle_create(dentry, nd.path.mnt);
51707 out_drop_write:
51708 mnt_drop_write(nd.path.mnt);
51709 out_dput:
51710 @@ -2524,6 +2674,20 @@ SYSCALL_DEFINE5(linkat, int, olddfd, const char __user *, oldname,
51711 error = PTR_ERR(new_dentry);
51712 if (IS_ERR(new_dentry))
51713 goto out_unlock;
51714 +
51715 + if (gr_handle_hardlink(old_path.dentry, old_path.mnt,
51716 + old_path.dentry->d_inode,
51717 + old_path.dentry->d_inode->i_mode, to)) {
51718 + error = -EACCES;
51719 + goto out_dput;
51720 + }
51721 +
51722 + if (!gr_acl_handle_link(new_dentry, nd.path.dentry, nd.path.mnt,
51723 + old_path.dentry, old_path.mnt, to)) {
51724 + error = -EACCES;
51725 + goto out_dput;
51726 + }
51727 +
51728 error = mnt_want_write(nd.path.mnt);
51729 if (error)
51730 goto out_dput;
51731 @@ -2531,6 +2695,8 @@ SYSCALL_DEFINE5(linkat, int, olddfd, const char __user *, oldname,
51732 if (error)
51733 goto out_drop_write;
51734 error = vfs_link(old_path.dentry, nd.path.dentry->d_inode, new_dentry);
51735 + if (!error)
51736 + gr_handle_create(new_dentry, nd.path.mnt);
51737 out_drop_write:
51738 mnt_drop_write(nd.path.mnt);
51739 out_dput:
51740 @@ -2708,6 +2874,8 @@ SYSCALL_DEFINE4(renameat, int, olddfd, const char __user *, oldname,
51741 char *to;
51742 int error;
51743
51744 + pax_track_stack();
51745 +
51746 error = user_path_parent(olddfd, oldname, &oldnd, &from);
51747 if (error)
51748 goto exit;
51749 @@ -2764,6 +2932,12 @@ SYSCALL_DEFINE4(renameat, int, olddfd, const char __user *, oldname,
51750 if (new_dentry == trap)
51751 goto exit5;
51752
51753 + error = gr_acl_handle_rename(new_dentry, new_dir, newnd.path.mnt,
51754 + old_dentry, old_dir->d_inode, oldnd.path.mnt,
51755 + to);
51756 + if (error)
51757 + goto exit5;
51758 +
51759 error = mnt_want_write(oldnd.path.mnt);
51760 if (error)
51761 goto exit5;
51762 @@ -2773,6 +2947,9 @@ SYSCALL_DEFINE4(renameat, int, olddfd, const char __user *, oldname,
51763 goto exit6;
51764 error = vfs_rename(old_dir->d_inode, old_dentry,
51765 new_dir->d_inode, new_dentry);
51766 + if (!error)
51767 + gr_handle_rename(old_dir->d_inode, new_dir->d_inode, old_dentry,
51768 + new_dentry, oldnd.path.mnt, new_dentry->d_inode ? 1 : 0);
51769 exit6:
51770 mnt_drop_write(oldnd.path.mnt);
51771 exit5:
51772 @@ -2798,6 +2975,8 @@ SYSCALL_DEFINE2(rename, const char __user *, oldname, const char __user *, newna
51773
51774 int vfs_readlink(struct dentry *dentry, char __user *buffer, int buflen, const char *link)
51775 {
51776 + char tmpbuf[64];
51777 + const char *newlink;
51778 int len;
51779
51780 len = PTR_ERR(link);
51781 @@ -2807,7 +2986,14 @@ int vfs_readlink(struct dentry *dentry, char __user *buffer, int buflen, const c
51782 len = strlen(link);
51783 if (len > (unsigned) buflen)
51784 len = buflen;
51785 - if (copy_to_user(buffer, link, len))
51786 +
51787 + if (len < sizeof(tmpbuf)) {
51788 + memcpy(tmpbuf, link, len);
51789 + newlink = tmpbuf;
51790 + } else
51791 + newlink = link;
51792 +
51793 + if (copy_to_user(buffer, newlink, len))
51794 len = -EFAULT;
51795 out:
51796 return len;
51797 diff --git a/fs/namespace.c b/fs/namespace.c
51798 index 2beb0fb..11a95a5 100644
51799 --- a/fs/namespace.c
51800 +++ b/fs/namespace.c
51801 @@ -1083,6 +1083,9 @@ static int do_umount(struct vfsmount *mnt, int flags)
51802 if (!(sb->s_flags & MS_RDONLY))
51803 retval = do_remount_sb(sb, MS_RDONLY, NULL, 0);
51804 up_write(&sb->s_umount);
51805 +
51806 + gr_log_remount(mnt->mnt_devname, retval);
51807 +
51808 return retval;
51809 }
51810
51811 @@ -1104,6 +1107,9 @@ static int do_umount(struct vfsmount *mnt, int flags)
51812 security_sb_umount_busy(mnt);
51813 up_write(&namespace_sem);
51814 release_mounts(&umount_list);
51815 +
51816 + gr_log_unmount(mnt->mnt_devname, retval);
51817 +
51818 return retval;
51819 }
51820
51821 @@ -1962,6 +1968,16 @@ long do_mount(char *dev_name, char *dir_name, char *type_page,
51822 if (retval)
51823 goto dput_out;
51824
51825 + if (gr_handle_rofs_mount(path.dentry, path.mnt, mnt_flags)) {
51826 + retval = -EPERM;
51827 + goto dput_out;
51828 + }
51829 +
51830 + if (gr_handle_chroot_mount(path.dentry, path.mnt, dev_name)) {
51831 + retval = -EPERM;
51832 + goto dput_out;
51833 + }
51834 +
51835 if (flags & MS_REMOUNT)
51836 retval = do_remount(&path, flags & ~MS_REMOUNT, mnt_flags,
51837 data_page);
51838 @@ -1976,6 +1992,9 @@ long do_mount(char *dev_name, char *dir_name, char *type_page,
51839 dev_name, data_page);
51840 dput_out:
51841 path_put(&path);
51842 +
51843 + gr_log_mount(dev_name, dir_name, retval);
51844 +
51845 return retval;
51846 }
51847
51848 @@ -2182,6 +2201,12 @@ SYSCALL_DEFINE2(pivot_root, const char __user *, new_root,
51849 goto out1;
51850 }
51851
51852 + if (gr_handle_chroot_pivot()) {
51853 + error = -EPERM;
51854 + path_put(&old);
51855 + goto out1;
51856 + }
51857 +
51858 read_lock(&current->fs->lock);
51859 root = current->fs->root;
51860 path_get(&current->fs->root);
51861 diff --git a/fs/ncpfs/dir.c b/fs/ncpfs/dir.c
51862 index b8b5b30..2bd9ccb 100644
51863 --- a/fs/ncpfs/dir.c
51864 +++ b/fs/ncpfs/dir.c
51865 @@ -275,6 +275,8 @@ __ncp_lookup_validate(struct dentry *dentry)
51866 int res, val = 0, len;
51867 __u8 __name[NCP_MAXPATHLEN + 1];
51868
51869 + pax_track_stack();
51870 +
51871 parent = dget_parent(dentry);
51872 dir = parent->d_inode;
51873
51874 @@ -799,6 +801,8 @@ static struct dentry *ncp_lookup(struct inode *dir, struct dentry *dentry, struc
51875 int error, res, len;
51876 __u8 __name[NCP_MAXPATHLEN + 1];
51877
51878 + pax_track_stack();
51879 +
51880 lock_kernel();
51881 error = -EIO;
51882 if (!ncp_conn_valid(server))
51883 @@ -883,10 +887,12 @@ int ncp_create_new(struct inode *dir, struct dentry *dentry, int mode,
51884 int error, result, len;
51885 int opmode;
51886 __u8 __name[NCP_MAXPATHLEN + 1];
51887 -
51888 +
51889 PPRINTK("ncp_create_new: creating %s/%s, mode=%x\n",
51890 dentry->d_parent->d_name.name, dentry->d_name.name, mode);
51891
51892 + pax_track_stack();
51893 +
51894 error = -EIO;
51895 lock_kernel();
51896 if (!ncp_conn_valid(server))
51897 @@ -952,6 +958,8 @@ static int ncp_mkdir(struct inode *dir, struct dentry *dentry, int mode)
51898 int error, len;
51899 __u8 __name[NCP_MAXPATHLEN + 1];
51900
51901 + pax_track_stack();
51902 +
51903 DPRINTK("ncp_mkdir: making %s/%s\n",
51904 dentry->d_parent->d_name.name, dentry->d_name.name);
51905
51906 @@ -960,6 +968,8 @@ static int ncp_mkdir(struct inode *dir, struct dentry *dentry, int mode)
51907 if (!ncp_conn_valid(server))
51908 goto out;
51909
51910 + pax_track_stack();
51911 +
51912 ncp_age_dentry(server, dentry);
51913 len = sizeof(__name);
51914 error = ncp_io2vol(server, __name, &len, dentry->d_name.name,
51915 @@ -1114,6 +1124,8 @@ static int ncp_rename(struct inode *old_dir, struct dentry *old_dentry,
51916 int old_len, new_len;
51917 __u8 __old_name[NCP_MAXPATHLEN + 1], __new_name[NCP_MAXPATHLEN + 1];
51918
51919 + pax_track_stack();
51920 +
51921 DPRINTK("ncp_rename: %s/%s to %s/%s\n",
51922 old_dentry->d_parent->d_name.name, old_dentry->d_name.name,
51923 new_dentry->d_parent->d_name.name, new_dentry->d_name.name);
51924 diff --git a/fs/ncpfs/inode.c b/fs/ncpfs/inode.c
51925 index cf98da1..da890a9 100644
51926 --- a/fs/ncpfs/inode.c
51927 +++ b/fs/ncpfs/inode.c
51928 @@ -445,6 +445,8 @@ static int ncp_fill_super(struct super_block *sb, void *raw_data, int silent)
51929 #endif
51930 struct ncp_entry_info finfo;
51931
51932 + pax_track_stack();
51933 +
51934 data.wdog_pid = NULL;
51935 server = kzalloc(sizeof(struct ncp_server), GFP_KERNEL);
51936 if (!server)
51937 diff --git a/fs/nfs/inode.c b/fs/nfs/inode.c
51938 index bfaef7b..e9d03ca 100644
51939 --- a/fs/nfs/inode.c
51940 +++ b/fs/nfs/inode.c
51941 @@ -156,7 +156,7 @@ static void nfs_zap_caches_locked(struct inode *inode)
51942 nfsi->attrtimeo = NFS_MINATTRTIMEO(inode);
51943 nfsi->attrtimeo_timestamp = jiffies;
51944
51945 - memset(NFS_COOKIEVERF(inode), 0, sizeof(NFS_COOKIEVERF(inode)));
51946 + memset(NFS_COOKIEVERF(inode), 0, sizeof(NFS_I(inode)->cookieverf));
51947 if (S_ISREG(mode) || S_ISDIR(mode) || S_ISLNK(mode))
51948 nfsi->cache_validity |= NFS_INO_INVALID_ATTR|NFS_INO_INVALID_DATA|NFS_INO_INVALID_ACCESS|NFS_INO_INVALID_ACL|NFS_INO_REVAL_PAGECACHE;
51949 else
51950 @@ -973,16 +973,16 @@ static int nfs_size_need_update(const struct inode *inode, const struct nfs_fatt
51951 return nfs_size_to_loff_t(fattr->size) > i_size_read(inode);
51952 }
51953
51954 -static atomic_long_t nfs_attr_generation_counter;
51955 +static atomic_long_unchecked_t nfs_attr_generation_counter;
51956
51957 static unsigned long nfs_read_attr_generation_counter(void)
51958 {
51959 - return atomic_long_read(&nfs_attr_generation_counter);
51960 + return atomic_long_read_unchecked(&nfs_attr_generation_counter);
51961 }
51962
51963 unsigned long nfs_inc_attr_generation_counter(void)
51964 {
51965 - return atomic_long_inc_return(&nfs_attr_generation_counter);
51966 + return atomic_long_inc_return_unchecked(&nfs_attr_generation_counter);
51967 }
51968
51969 void nfs_fattr_init(struct nfs_fattr *fattr)
51970 diff --git a/fs/nfsd/lockd.c b/fs/nfsd/lockd.c
51971 index cc2f505..f6a236f 100644
51972 --- a/fs/nfsd/lockd.c
51973 +++ b/fs/nfsd/lockd.c
51974 @@ -66,7 +66,7 @@ nlm_fclose(struct file *filp)
51975 fput(filp);
51976 }
51977
51978 -static struct nlmsvc_binding nfsd_nlm_ops = {
51979 +static const struct nlmsvc_binding nfsd_nlm_ops = {
51980 .fopen = nlm_fopen, /* open file for locking */
51981 .fclose = nlm_fclose, /* close file */
51982 };
51983 diff --git a/fs/nfsd/nfs4state.c b/fs/nfsd/nfs4state.c
51984 index cfc3391..dcc083a 100644
51985 --- a/fs/nfsd/nfs4state.c
51986 +++ b/fs/nfsd/nfs4state.c
51987 @@ -3459,6 +3459,8 @@ nfsd4_lock(struct svc_rqst *rqstp, struct nfsd4_compound_state *cstate,
51988 unsigned int cmd;
51989 int err;
51990
51991 + pax_track_stack();
51992 +
51993 dprintk("NFSD: nfsd4_lock: start=%Ld length=%Ld\n",
51994 (long long) lock->lk_offset,
51995 (long long) lock->lk_length);
51996 diff --git a/fs/nfsd/nfs4xdr.c b/fs/nfsd/nfs4xdr.c
51997 index 4a82a96..0d5fb49 100644
51998 --- a/fs/nfsd/nfs4xdr.c
51999 +++ b/fs/nfsd/nfs4xdr.c
52000 @@ -1751,6 +1751,8 @@ nfsd4_encode_fattr(struct svc_fh *fhp, struct svc_export *exp,
52001 struct nfsd4_compoundres *resp = rqstp->rq_resp;
52002 u32 minorversion = resp->cstate.minorversion;
52003
52004 + pax_track_stack();
52005 +
52006 BUG_ON(bmval1 & NFSD_WRITEONLY_ATTRS_WORD1);
52007 BUG_ON(bmval0 & ~nfsd_suppattrs0(minorversion));
52008 BUG_ON(bmval1 & ~nfsd_suppattrs1(minorversion));
52009 diff --git a/fs/nfsd/vfs.c b/fs/nfsd/vfs.c
52010 index 2e09588..596421d 100644
52011 --- a/fs/nfsd/vfs.c
52012 +++ b/fs/nfsd/vfs.c
52013 @@ -937,7 +937,7 @@ nfsd_vfs_read(struct svc_rqst *rqstp, struct svc_fh *fhp, struct file *file,
52014 } else {
52015 oldfs = get_fs();
52016 set_fs(KERNEL_DS);
52017 - host_err = vfs_readv(file, (struct iovec __user *)vec, vlen, &offset);
52018 + host_err = vfs_readv(file, (struct iovec __force_user *)vec, vlen, &offset);
52019 set_fs(oldfs);
52020 }
52021
52022 @@ -1060,7 +1060,7 @@ nfsd_vfs_write(struct svc_rqst *rqstp, struct svc_fh *fhp, struct file *file,
52023
52024 /* Write the data. */
52025 oldfs = get_fs(); set_fs(KERNEL_DS);
52026 - host_err = vfs_writev(file, (struct iovec __user *)vec, vlen, &offset);
52027 + host_err = vfs_writev(file, (struct iovec __force_user *)vec, vlen, &offset);
52028 set_fs(oldfs);
52029 if (host_err < 0)
52030 goto out_nfserr;
52031 @@ -1542,7 +1542,7 @@ nfsd_readlink(struct svc_rqst *rqstp, struct svc_fh *fhp, char *buf, int *lenp)
52032 */
52033
52034 oldfs = get_fs(); set_fs(KERNEL_DS);
52035 - host_err = inode->i_op->readlink(dentry, buf, *lenp);
52036 + host_err = inode->i_op->readlink(dentry, (char __force_user *)buf, *lenp);
52037 set_fs(oldfs);
52038
52039 if (host_err < 0)
52040 diff --git a/fs/nilfs2/ioctl.c b/fs/nilfs2/ioctl.c
52041 index f6af760..d0adf34 100644
52042 --- a/fs/nilfs2/ioctl.c
52043 +++ b/fs/nilfs2/ioctl.c
52044 @@ -480,7 +480,7 @@ static int nilfs_ioctl_clean_segments(struct inode *inode, struct file *filp,
52045 unsigned int cmd, void __user *argp)
52046 {
52047 struct nilfs_argv argv[5];
52048 - const static size_t argsz[5] = {
52049 + static const size_t argsz[5] = {
52050 sizeof(struct nilfs_vdesc),
52051 sizeof(struct nilfs_period),
52052 sizeof(__u64),
52053 @@ -522,6 +522,9 @@ static int nilfs_ioctl_clean_segments(struct inode *inode, struct file *filp,
52054 if (argv[n].v_nmembs > nsegs * nilfs->ns_blocks_per_segment)
52055 goto out_free;
52056
52057 + if (argv[n].v_nmembs >= UINT_MAX / argv[n].v_size)
52058 + goto out_free;
52059 +
52060 len = argv[n].v_size * argv[n].v_nmembs;
52061 base = (void __user *)(unsigned long)argv[n].v_base;
52062 if (len == 0) {
52063 diff --git a/fs/notify/dnotify/dnotify.c b/fs/notify/dnotify/dnotify.c
52064 index 7e54e52..9337248 100644
52065 --- a/fs/notify/dnotify/dnotify.c
52066 +++ b/fs/notify/dnotify/dnotify.c
52067 @@ -173,7 +173,7 @@ static void dnotify_free_mark(struct fsnotify_mark_entry *entry)
52068 kmem_cache_free(dnotify_mark_entry_cache, dnentry);
52069 }
52070
52071 -static struct fsnotify_ops dnotify_fsnotify_ops = {
52072 +static const struct fsnotify_ops dnotify_fsnotify_ops = {
52073 .handle_event = dnotify_handle_event,
52074 .should_send_event = dnotify_should_send_event,
52075 .free_group_priv = NULL,
52076 diff --git a/fs/notify/notification.c b/fs/notify/notification.c
52077 index b8bf53b..c518688 100644
52078 --- a/fs/notify/notification.c
52079 +++ b/fs/notify/notification.c
52080 @@ -57,7 +57,7 @@ static struct kmem_cache *fsnotify_event_holder_cachep;
52081 * get set to 0 so it will never get 'freed'
52082 */
52083 static struct fsnotify_event q_overflow_event;
52084 -static atomic_t fsnotify_sync_cookie = ATOMIC_INIT(0);
52085 +static atomic_unchecked_t fsnotify_sync_cookie = ATOMIC_INIT(0);
52086
52087 /**
52088 * fsnotify_get_cookie - return a unique cookie for use in synchronizing events.
52089 @@ -65,7 +65,7 @@ static atomic_t fsnotify_sync_cookie = ATOMIC_INIT(0);
52090 */
52091 u32 fsnotify_get_cookie(void)
52092 {
52093 - return atomic_inc_return(&fsnotify_sync_cookie);
52094 + return atomic_inc_return_unchecked(&fsnotify_sync_cookie);
52095 }
52096 EXPORT_SYMBOL_GPL(fsnotify_get_cookie);
52097
52098 diff --git a/fs/ntfs/dir.c b/fs/ntfs/dir.c
52099 index 5a9e344..0f8cd28 100644
52100 --- a/fs/ntfs/dir.c
52101 +++ b/fs/ntfs/dir.c
52102 @@ -1328,7 +1328,7 @@ find_next_index_buffer:
52103 ia = (INDEX_ALLOCATION*)(kaddr + (ia_pos & ~PAGE_CACHE_MASK &
52104 ~(s64)(ndir->itype.index.block_size - 1)));
52105 /* Bounds checks. */
52106 - if (unlikely((u8*)ia < kaddr || (u8*)ia > kaddr + PAGE_CACHE_SIZE)) {
52107 + if (unlikely(!kaddr || (u8*)ia < kaddr || (u8*)ia > kaddr + PAGE_CACHE_SIZE)) {
52108 ntfs_error(sb, "Out of bounds check failed. Corrupt directory "
52109 "inode 0x%lx or driver bug.", vdir->i_ino);
52110 goto err_out;
52111 diff --git a/fs/ntfs/file.c b/fs/ntfs/file.c
52112 index 663c0e3..b6868e9 100644
52113 --- a/fs/ntfs/file.c
52114 +++ b/fs/ntfs/file.c
52115 @@ -2243,6 +2243,6 @@ const struct inode_operations ntfs_file_inode_ops = {
52116 #endif /* NTFS_RW */
52117 };
52118
52119 -const struct file_operations ntfs_empty_file_ops = {};
52120 +const struct file_operations ntfs_empty_file_ops __read_only;
52121
52122 -const struct inode_operations ntfs_empty_inode_ops = {};
52123 +const struct inode_operations ntfs_empty_inode_ops __read_only;
52124 diff --git a/fs/ocfs2/cluster/masklog.c b/fs/ocfs2/cluster/masklog.c
52125 index 1cd2934..880b5d2 100644
52126 --- a/fs/ocfs2/cluster/masklog.c
52127 +++ b/fs/ocfs2/cluster/masklog.c
52128 @@ -135,7 +135,7 @@ static ssize_t mlog_store(struct kobject *obj, struct attribute *attr,
52129 return mlog_mask_store(mlog_attr->mask, buf, count);
52130 }
52131
52132 -static struct sysfs_ops mlog_attr_ops = {
52133 +static const struct sysfs_ops mlog_attr_ops = {
52134 .show = mlog_show,
52135 .store = mlog_store,
52136 };
52137 diff --git a/fs/ocfs2/localalloc.c b/fs/ocfs2/localalloc.c
52138 index ac10f83..2cd2607 100644
52139 --- a/fs/ocfs2/localalloc.c
52140 +++ b/fs/ocfs2/localalloc.c
52141 @@ -1188,7 +1188,7 @@ static int ocfs2_local_alloc_slide_window(struct ocfs2_super *osb,
52142 goto bail;
52143 }
52144
52145 - atomic_inc(&osb->alloc_stats.moves);
52146 + atomic_inc_unchecked(&osb->alloc_stats.moves);
52147
52148 status = 0;
52149 bail:
52150 diff --git a/fs/ocfs2/namei.c b/fs/ocfs2/namei.c
52151 index f010b22..9f9ed34 100644
52152 --- a/fs/ocfs2/namei.c
52153 +++ b/fs/ocfs2/namei.c
52154 @@ -1043,6 +1043,8 @@ static int ocfs2_rename(struct inode *old_dir,
52155 struct ocfs2_dir_lookup_result orphan_insert = { NULL, };
52156 struct ocfs2_dir_lookup_result target_insert = { NULL, };
52157
52158 + pax_track_stack();
52159 +
52160 /* At some point it might be nice to break this function up a
52161 * bit. */
52162
52163 diff --git a/fs/ocfs2/ocfs2.h b/fs/ocfs2/ocfs2.h
52164 index d963d86..914cfbd 100644
52165 --- a/fs/ocfs2/ocfs2.h
52166 +++ b/fs/ocfs2/ocfs2.h
52167 @@ -217,11 +217,11 @@ enum ocfs2_vol_state
52168
52169 struct ocfs2_alloc_stats
52170 {
52171 - atomic_t moves;
52172 - atomic_t local_data;
52173 - atomic_t bitmap_data;
52174 - atomic_t bg_allocs;
52175 - atomic_t bg_extends;
52176 + atomic_unchecked_t moves;
52177 + atomic_unchecked_t local_data;
52178 + atomic_unchecked_t bitmap_data;
52179 + atomic_unchecked_t bg_allocs;
52180 + atomic_unchecked_t bg_extends;
52181 };
52182
52183 enum ocfs2_local_alloc_state
52184 diff --git a/fs/ocfs2/suballoc.c b/fs/ocfs2/suballoc.c
52185 index 79b5dac..d322952 100644
52186 --- a/fs/ocfs2/suballoc.c
52187 +++ b/fs/ocfs2/suballoc.c
52188 @@ -623,7 +623,7 @@ static int ocfs2_reserve_suballoc_bits(struct ocfs2_super *osb,
52189 mlog_errno(status);
52190 goto bail;
52191 }
52192 - atomic_inc(&osb->alloc_stats.bg_extends);
52193 + atomic_inc_unchecked(&osb->alloc_stats.bg_extends);
52194
52195 /* You should never ask for this much metadata */
52196 BUG_ON(bits_wanted >
52197 @@ -1654,7 +1654,7 @@ int ocfs2_claim_metadata(struct ocfs2_super *osb,
52198 mlog_errno(status);
52199 goto bail;
52200 }
52201 - atomic_inc(&osb->alloc_stats.bg_allocs);
52202 + atomic_inc_unchecked(&osb->alloc_stats.bg_allocs);
52203
52204 *blkno_start = bg_blkno + (u64) *suballoc_bit_start;
52205 ac->ac_bits_given += (*num_bits);
52206 @@ -1728,7 +1728,7 @@ int ocfs2_claim_new_inode(struct ocfs2_super *osb,
52207 mlog_errno(status);
52208 goto bail;
52209 }
52210 - atomic_inc(&osb->alloc_stats.bg_allocs);
52211 + atomic_inc_unchecked(&osb->alloc_stats.bg_allocs);
52212
52213 BUG_ON(num_bits != 1);
52214
52215 @@ -1830,7 +1830,7 @@ int __ocfs2_claim_clusters(struct ocfs2_super *osb,
52216 cluster_start,
52217 num_clusters);
52218 if (!status)
52219 - atomic_inc(&osb->alloc_stats.local_data);
52220 + atomic_inc_unchecked(&osb->alloc_stats.local_data);
52221 } else {
52222 if (min_clusters > (osb->bitmap_cpg - 1)) {
52223 /* The only paths asking for contiguousness
52224 @@ -1858,7 +1858,7 @@ int __ocfs2_claim_clusters(struct ocfs2_super *osb,
52225 ocfs2_desc_bitmap_to_cluster_off(ac->ac_inode,
52226 bg_blkno,
52227 bg_bit_off);
52228 - atomic_inc(&osb->alloc_stats.bitmap_data);
52229 + atomic_inc_unchecked(&osb->alloc_stats.bitmap_data);
52230 }
52231 }
52232 if (status < 0) {
52233 diff --git a/fs/ocfs2/super.c b/fs/ocfs2/super.c
52234 index 9f55be4..a3f8048 100644
52235 --- a/fs/ocfs2/super.c
52236 +++ b/fs/ocfs2/super.c
52237 @@ -284,11 +284,11 @@ static int ocfs2_osb_dump(struct ocfs2_super *osb, char *buf, int len)
52238 "%10s => GlobalAllocs: %d LocalAllocs: %d "
52239 "SubAllocs: %d LAWinMoves: %d SAExtends: %d\n",
52240 "Stats",
52241 - atomic_read(&osb->alloc_stats.bitmap_data),
52242 - atomic_read(&osb->alloc_stats.local_data),
52243 - atomic_read(&osb->alloc_stats.bg_allocs),
52244 - atomic_read(&osb->alloc_stats.moves),
52245 - atomic_read(&osb->alloc_stats.bg_extends));
52246 + atomic_read_unchecked(&osb->alloc_stats.bitmap_data),
52247 + atomic_read_unchecked(&osb->alloc_stats.local_data),
52248 + atomic_read_unchecked(&osb->alloc_stats.bg_allocs),
52249 + atomic_read_unchecked(&osb->alloc_stats.moves),
52250 + atomic_read_unchecked(&osb->alloc_stats.bg_extends));
52251
52252 out += snprintf(buf + out, len - out,
52253 "%10s => State: %u Descriptor: %llu Size: %u bits "
52254 @@ -2002,11 +2002,11 @@ static int ocfs2_initialize_super(struct super_block *sb,
52255 spin_lock_init(&osb->osb_xattr_lock);
52256 ocfs2_init_inode_steal_slot(osb);
52257
52258 - atomic_set(&osb->alloc_stats.moves, 0);
52259 - atomic_set(&osb->alloc_stats.local_data, 0);
52260 - atomic_set(&osb->alloc_stats.bitmap_data, 0);
52261 - atomic_set(&osb->alloc_stats.bg_allocs, 0);
52262 - atomic_set(&osb->alloc_stats.bg_extends, 0);
52263 + atomic_set_unchecked(&osb->alloc_stats.moves, 0);
52264 + atomic_set_unchecked(&osb->alloc_stats.local_data, 0);
52265 + atomic_set_unchecked(&osb->alloc_stats.bitmap_data, 0);
52266 + atomic_set_unchecked(&osb->alloc_stats.bg_allocs, 0);
52267 + atomic_set_unchecked(&osb->alloc_stats.bg_extends, 0);
52268
52269 /* Copy the blockcheck stats from the superblock probe */
52270 osb->osb_ecc_stats = *stats;
52271 diff --git a/fs/open.c b/fs/open.c
52272 index 4f01e06..091f6c3 100644
52273 --- a/fs/open.c
52274 +++ b/fs/open.c
52275 @@ -275,6 +275,10 @@ static long do_sys_truncate(const char __user *pathname, loff_t length)
52276 error = locks_verify_truncate(inode, NULL, length);
52277 if (!error)
52278 error = security_path_truncate(&path, length, 0);
52279 +
52280 + if (!error && !gr_acl_handle_truncate(path.dentry, path.mnt))
52281 + error = -EACCES;
52282 +
52283 if (!error) {
52284 vfs_dq_init(inode);
52285 error = do_truncate(path.dentry, length, 0, NULL);
52286 @@ -511,6 +515,9 @@ SYSCALL_DEFINE3(faccessat, int, dfd, const char __user *, filename, int, mode)
52287 if (__mnt_is_readonly(path.mnt))
52288 res = -EROFS;
52289
52290 + if (!res && !gr_acl_handle_access(path.dentry, path.mnt, mode))
52291 + res = -EACCES;
52292 +
52293 out_path_release:
52294 path_put(&path);
52295 out:
52296 @@ -537,6 +544,8 @@ SYSCALL_DEFINE1(chdir, const char __user *, filename)
52297 if (error)
52298 goto dput_and_out;
52299
52300 + gr_log_chdir(path.dentry, path.mnt);
52301 +
52302 set_fs_pwd(current->fs, &path);
52303
52304 dput_and_out:
52305 @@ -563,6 +572,13 @@ SYSCALL_DEFINE1(fchdir, unsigned int, fd)
52306 goto out_putf;
52307
52308 error = inode_permission(inode, MAY_EXEC | MAY_ACCESS);
52309 +
52310 + if (!error && !gr_chroot_fchdir(file->f_path.dentry, file->f_path.mnt))
52311 + error = -EPERM;
52312 +
52313 + if (!error)
52314 + gr_log_chdir(file->f_path.dentry, file->f_path.mnt);
52315 +
52316 if (!error)
52317 set_fs_pwd(current->fs, &file->f_path);
52318 out_putf:
52319 @@ -588,7 +604,13 @@ SYSCALL_DEFINE1(chroot, const char __user *, filename)
52320 if (!capable(CAP_SYS_CHROOT))
52321 goto dput_and_out;
52322
52323 + if (gr_handle_chroot_chroot(path.dentry, path.mnt))
52324 + goto dput_and_out;
52325 +
52326 set_fs_root(current->fs, &path);
52327 +
52328 + gr_handle_chroot_chdir(&path);
52329 +
52330 error = 0;
52331 dput_and_out:
52332 path_put(&path);
52333 @@ -616,12 +638,27 @@ SYSCALL_DEFINE2(fchmod, unsigned int, fd, mode_t, mode)
52334 err = mnt_want_write_file(file);
52335 if (err)
52336 goto out_putf;
52337 +
52338 mutex_lock(&inode->i_mutex);
52339 +
52340 + if (!gr_acl_handle_fchmod(dentry, file->f_path.mnt, mode)) {
52341 + err = -EACCES;
52342 + goto out_unlock;
52343 + }
52344 +
52345 if (mode == (mode_t) -1)
52346 mode = inode->i_mode;
52347 +
52348 + if (gr_handle_chroot_chmod(dentry, file->f_path.mnt, mode)) {
52349 + err = -EPERM;
52350 + goto out_unlock;
52351 + }
52352 +
52353 newattrs.ia_mode = (mode & S_IALLUGO) | (inode->i_mode & ~S_IALLUGO);
52354 newattrs.ia_valid = ATTR_MODE | ATTR_CTIME;
52355 err = notify_change(dentry, &newattrs);
52356 +
52357 +out_unlock:
52358 mutex_unlock(&inode->i_mutex);
52359 mnt_drop_write(file->f_path.mnt);
52360 out_putf:
52361 @@ -645,12 +682,27 @@ SYSCALL_DEFINE3(fchmodat, int, dfd, const char __user *, filename, mode_t, mode)
52362 error = mnt_want_write(path.mnt);
52363 if (error)
52364 goto dput_and_out;
52365 +
52366 mutex_lock(&inode->i_mutex);
52367 +
52368 + if (!gr_acl_handle_chmod(path.dentry, path.mnt, mode)) {
52369 + error = -EACCES;
52370 + goto out_unlock;
52371 + }
52372 +
52373 if (mode == (mode_t) -1)
52374 mode = inode->i_mode;
52375 +
52376 + if (gr_handle_chroot_chmod(path.dentry, path.mnt, mode)) {
52377 + error = -EACCES;
52378 + goto out_unlock;
52379 + }
52380 +
52381 newattrs.ia_mode = (mode & S_IALLUGO) | (inode->i_mode & ~S_IALLUGO);
52382 newattrs.ia_valid = ATTR_MODE | ATTR_CTIME;
52383 error = notify_change(path.dentry, &newattrs);
52384 +
52385 +out_unlock:
52386 mutex_unlock(&inode->i_mutex);
52387 mnt_drop_write(path.mnt);
52388 dput_and_out:
52389 @@ -664,12 +716,15 @@ SYSCALL_DEFINE2(chmod, const char __user *, filename, mode_t, mode)
52390 return sys_fchmodat(AT_FDCWD, filename, mode);
52391 }
52392
52393 -static int chown_common(struct dentry * dentry, uid_t user, gid_t group)
52394 +static int chown_common(struct dentry * dentry, uid_t user, gid_t group, struct vfsmount *mnt)
52395 {
52396 struct inode *inode = dentry->d_inode;
52397 int error;
52398 struct iattr newattrs;
52399
52400 + if (!gr_acl_handle_chown(dentry, mnt))
52401 + return -EACCES;
52402 +
52403 newattrs.ia_valid = ATTR_CTIME;
52404 if (user != (uid_t) -1) {
52405 newattrs.ia_valid |= ATTR_UID;
52406 @@ -700,7 +755,7 @@ SYSCALL_DEFINE3(chown, const char __user *, filename, uid_t, user, gid_t, group)
52407 error = mnt_want_write(path.mnt);
52408 if (error)
52409 goto out_release;
52410 - error = chown_common(path.dentry, user, group);
52411 + error = chown_common(path.dentry, user, group, path.mnt);
52412 mnt_drop_write(path.mnt);
52413 out_release:
52414 path_put(&path);
52415 @@ -725,7 +780,7 @@ SYSCALL_DEFINE5(fchownat, int, dfd, const char __user *, filename, uid_t, user,
52416 error = mnt_want_write(path.mnt);
52417 if (error)
52418 goto out_release;
52419 - error = chown_common(path.dentry, user, group);
52420 + error = chown_common(path.dentry, user, group, path.mnt);
52421 mnt_drop_write(path.mnt);
52422 out_release:
52423 path_put(&path);
52424 @@ -744,7 +799,7 @@ SYSCALL_DEFINE3(lchown, const char __user *, filename, uid_t, user, gid_t, group
52425 error = mnt_want_write(path.mnt);
52426 if (error)
52427 goto out_release;
52428 - error = chown_common(path.dentry, user, group);
52429 + error = chown_common(path.dentry, user, group, path.mnt);
52430 mnt_drop_write(path.mnt);
52431 out_release:
52432 path_put(&path);
52433 @@ -767,7 +822,7 @@ SYSCALL_DEFINE3(fchown, unsigned int, fd, uid_t, user, gid_t, group)
52434 goto out_fput;
52435 dentry = file->f_path.dentry;
52436 audit_inode(NULL, dentry);
52437 - error = chown_common(dentry, user, group);
52438 + error = chown_common(dentry, user, group, file->f_path.mnt);
52439 mnt_drop_write(file->f_path.mnt);
52440 out_fput:
52441 fput(file);
52442 @@ -1036,7 +1091,7 @@ long do_sys_open(int dfd, const char __user *filename, int flags, int mode)
52443 if (!IS_ERR(tmp)) {
52444 fd = get_unused_fd_flags(flags);
52445 if (fd >= 0) {
52446 - struct file *f = do_filp_open(dfd, tmp, flags, mode, 0);
52447 + struct file *f = do_filp_open(dfd, tmp, flags, mode, 0);
52448 if (IS_ERR(f)) {
52449 put_unused_fd(fd);
52450 fd = PTR_ERR(f);
52451 diff --git a/fs/partitions/efi.c b/fs/partitions/efi.c
52452 index 6ab70f4..f4103d1 100644
52453 --- a/fs/partitions/efi.c
52454 +++ b/fs/partitions/efi.c
52455 @@ -231,14 +231,14 @@ alloc_read_gpt_entries(struct block_device *bdev, gpt_header *gpt)
52456 if (!bdev || !gpt)
52457 return NULL;
52458
52459 + if (!le32_to_cpu(gpt->num_partition_entries))
52460 + return NULL;
52461 + pte = kcalloc(le32_to_cpu(gpt->num_partition_entries), le32_to_cpu(gpt->sizeof_partition_entry), GFP_KERNEL);
52462 + if (!pte)
52463 + return NULL;
52464 +
52465 count = le32_to_cpu(gpt->num_partition_entries) *
52466 le32_to_cpu(gpt->sizeof_partition_entry);
52467 - if (!count)
52468 - return NULL;
52469 - pte = kzalloc(count, GFP_KERNEL);
52470 - if (!pte)
52471 - return NULL;
52472 -
52473 if (read_lba(bdev, le64_to_cpu(gpt->partition_entry_lba),
52474 (u8 *) pte,
52475 count) < count) {
52476 diff --git a/fs/partitions/ldm.c b/fs/partitions/ldm.c
52477 index dd6efdb..3babc6c 100644
52478 --- a/fs/partitions/ldm.c
52479 +++ b/fs/partitions/ldm.c
52480 @@ -1311,6 +1311,7 @@ static bool ldm_frag_add (const u8 *data, int size, struct list_head *frags)
52481 ldm_error ("A VBLK claims to have %d parts.", num);
52482 return false;
52483 }
52484 +
52485 if (rec >= num) {
52486 ldm_error("REC value (%d) exceeds NUM value (%d)", rec, num);
52487 return false;
52488 @@ -1322,7 +1323,7 @@ static bool ldm_frag_add (const u8 *data, int size, struct list_head *frags)
52489 goto found;
52490 }
52491
52492 - f = kmalloc (sizeof (*f) + size*num, GFP_KERNEL);
52493 + f = kmalloc (size*num + sizeof (*f), GFP_KERNEL);
52494 if (!f) {
52495 ldm_crit ("Out of memory.");
52496 return false;
52497 diff --git a/fs/partitions/mac.c b/fs/partitions/mac.c
52498 index 5765198..7f8e9e0 100644
52499 --- a/fs/partitions/mac.c
52500 +++ b/fs/partitions/mac.c
52501 @@ -59,11 +59,11 @@ int mac_partition(struct parsed_partitions *state, struct block_device *bdev)
52502 return 0; /* not a MacOS disk */
52503 }
52504 blocks_in_map = be32_to_cpu(part->map_count);
52505 - if (blocks_in_map < 0 || blocks_in_map >= DISK_MAX_PARTS) {
52506 - put_dev_sector(sect);
52507 - return 0;
52508 - }
52509 printk(" [mac]");
52510 + if (blocks_in_map < 0 || blocks_in_map >= DISK_MAX_PARTS) {
52511 + put_dev_sector(sect);
52512 + return 0;
52513 + }
52514 for (slot = 1; slot <= blocks_in_map; ++slot) {
52515 int pos = slot * secsize;
52516 put_dev_sector(sect);
52517 diff --git a/fs/pipe.c b/fs/pipe.c
52518 index d0cc080..8a6f211 100644
52519 --- a/fs/pipe.c
52520 +++ b/fs/pipe.c
52521 @@ -401,9 +401,9 @@ redo:
52522 }
52523 if (bufs) /* More to do? */
52524 continue;
52525 - if (!pipe->writers)
52526 + if (!atomic_read(&pipe->writers))
52527 break;
52528 - if (!pipe->waiting_writers) {
52529 + if (!atomic_read(&pipe->waiting_writers)) {
52530 /* syscall merging: Usually we must not sleep
52531 * if O_NONBLOCK is set, or if we got some data.
52532 * But if a writer sleeps in kernel space, then
52533 @@ -462,7 +462,7 @@ pipe_write(struct kiocb *iocb, const struct iovec *_iov,
52534 mutex_lock(&inode->i_mutex);
52535 pipe = inode->i_pipe;
52536
52537 - if (!pipe->readers) {
52538 + if (!atomic_read(&pipe->readers)) {
52539 send_sig(SIGPIPE, current, 0);
52540 ret = -EPIPE;
52541 goto out;
52542 @@ -511,7 +511,7 @@ redo1:
52543 for (;;) {
52544 int bufs;
52545
52546 - if (!pipe->readers) {
52547 + if (!atomic_read(&pipe->readers)) {
52548 send_sig(SIGPIPE, current, 0);
52549 if (!ret)
52550 ret = -EPIPE;
52551 @@ -597,9 +597,9 @@ redo2:
52552 kill_fasync(&pipe->fasync_readers, SIGIO, POLL_IN);
52553 do_wakeup = 0;
52554 }
52555 - pipe->waiting_writers++;
52556 + atomic_inc(&pipe->waiting_writers);
52557 pipe_wait(pipe);
52558 - pipe->waiting_writers--;
52559 + atomic_dec(&pipe->waiting_writers);
52560 }
52561 out:
52562 mutex_unlock(&inode->i_mutex);
52563 @@ -666,7 +666,7 @@ pipe_poll(struct file *filp, poll_table *wait)
52564 mask = 0;
52565 if (filp->f_mode & FMODE_READ) {
52566 mask = (nrbufs > 0) ? POLLIN | POLLRDNORM : 0;
52567 - if (!pipe->writers && filp->f_version != pipe->w_counter)
52568 + if (!atomic_read(&pipe->writers) && filp->f_version != pipe->w_counter)
52569 mask |= POLLHUP;
52570 }
52571
52572 @@ -676,7 +676,7 @@ pipe_poll(struct file *filp, poll_table *wait)
52573 * Most Unices do not set POLLERR for FIFOs but on Linux they
52574 * behave exactly like pipes for poll().
52575 */
52576 - if (!pipe->readers)
52577 + if (!atomic_read(&pipe->readers))
52578 mask |= POLLERR;
52579 }
52580
52581 @@ -690,10 +690,10 @@ pipe_release(struct inode *inode, int decr, int decw)
52582
52583 mutex_lock(&inode->i_mutex);
52584 pipe = inode->i_pipe;
52585 - pipe->readers -= decr;
52586 - pipe->writers -= decw;
52587 + atomic_sub(decr, &pipe->readers);
52588 + atomic_sub(decw, &pipe->writers);
52589
52590 - if (!pipe->readers && !pipe->writers) {
52591 + if (!atomic_read(&pipe->readers) && !atomic_read(&pipe->writers)) {
52592 free_pipe_info(inode);
52593 } else {
52594 wake_up_interruptible_sync(&pipe->wait);
52595 @@ -783,7 +783,7 @@ pipe_read_open(struct inode *inode, struct file *filp)
52596
52597 if (inode->i_pipe) {
52598 ret = 0;
52599 - inode->i_pipe->readers++;
52600 + atomic_inc(&inode->i_pipe->readers);
52601 }
52602
52603 mutex_unlock(&inode->i_mutex);
52604 @@ -800,7 +800,7 @@ pipe_write_open(struct inode *inode, struct file *filp)
52605
52606 if (inode->i_pipe) {
52607 ret = 0;
52608 - inode->i_pipe->writers++;
52609 + atomic_inc(&inode->i_pipe->writers);
52610 }
52611
52612 mutex_unlock(&inode->i_mutex);
52613 @@ -818,9 +818,9 @@ pipe_rdwr_open(struct inode *inode, struct file *filp)
52614 if (inode->i_pipe) {
52615 ret = 0;
52616 if (filp->f_mode & FMODE_READ)
52617 - inode->i_pipe->readers++;
52618 + atomic_inc(&inode->i_pipe->readers);
52619 if (filp->f_mode & FMODE_WRITE)
52620 - inode->i_pipe->writers++;
52621 + atomic_inc(&inode->i_pipe->writers);
52622 }
52623
52624 mutex_unlock(&inode->i_mutex);
52625 @@ -905,7 +905,7 @@ void free_pipe_info(struct inode *inode)
52626 inode->i_pipe = NULL;
52627 }
52628
52629 -static struct vfsmount *pipe_mnt __read_mostly;
52630 +struct vfsmount *pipe_mnt __read_mostly;
52631 static int pipefs_delete_dentry(struct dentry *dentry)
52632 {
52633 /*
52634 @@ -945,7 +945,8 @@ static struct inode * get_pipe_inode(void)
52635 goto fail_iput;
52636 inode->i_pipe = pipe;
52637
52638 - pipe->readers = pipe->writers = 1;
52639 + atomic_set(&pipe->readers, 1);
52640 + atomic_set(&pipe->writers, 1);
52641 inode->i_fop = &rdwr_pipefifo_fops;
52642
52643 /*
52644 diff --git a/fs/proc/Kconfig b/fs/proc/Kconfig
52645 index 50f8f06..c5755df 100644
52646 --- a/fs/proc/Kconfig
52647 +++ b/fs/proc/Kconfig
52648 @@ -30,12 +30,12 @@ config PROC_FS
52649
52650 config PROC_KCORE
52651 bool "/proc/kcore support" if !ARM
52652 - depends on PROC_FS && MMU
52653 + depends on PROC_FS && MMU && !GRKERNSEC_PROC_ADD
52654
52655 config PROC_VMCORE
52656 bool "/proc/vmcore support (EXPERIMENTAL)"
52657 - depends on PROC_FS && CRASH_DUMP
52658 - default y
52659 + depends on PROC_FS && CRASH_DUMP && !GRKERNSEC
52660 + default n
52661 help
52662 Exports the dump image of crashed kernel in ELF format.
52663
52664 @@ -59,8 +59,8 @@ config PROC_SYSCTL
52665 limited in memory.
52666
52667 config PROC_PAGE_MONITOR
52668 - default y
52669 - depends on PROC_FS && MMU
52670 + default n
52671 + depends on PROC_FS && MMU && !GRKERNSEC
52672 bool "Enable /proc page monitoring" if EMBEDDED
52673 help
52674 Various /proc files exist to monitor process memory utilization:
52675 diff --git a/fs/proc/array.c b/fs/proc/array.c
52676 index c5ef152..1363194 100644
52677 --- a/fs/proc/array.c
52678 +++ b/fs/proc/array.c
52679 @@ -60,6 +60,7 @@
52680 #include <linux/tty.h>
52681 #include <linux/string.h>
52682 #include <linux/mman.h>
52683 +#include <linux/grsecurity.h>
52684 #include <linux/proc_fs.h>
52685 #include <linux/ioport.h>
52686 #include <linux/uaccess.h>
52687 @@ -321,6 +322,21 @@ static inline void task_context_switch_counts(struct seq_file *m,
52688 p->nivcsw);
52689 }
52690
52691 +#if defined(CONFIG_PAX_NOEXEC) || defined(CONFIG_PAX_ASLR)
52692 +static inline void task_pax(struct seq_file *m, struct task_struct *p)
52693 +{
52694 + if (p->mm)
52695 + seq_printf(m, "PaX:\t%c%c%c%c%c\n",
52696 + p->mm->pax_flags & MF_PAX_PAGEEXEC ? 'P' : 'p',
52697 + p->mm->pax_flags & MF_PAX_EMUTRAMP ? 'E' : 'e',
52698 + p->mm->pax_flags & MF_PAX_MPROTECT ? 'M' : 'm',
52699 + p->mm->pax_flags & MF_PAX_RANDMMAP ? 'R' : 'r',
52700 + p->mm->pax_flags & MF_PAX_SEGMEXEC ? 'S' : 's');
52701 + else
52702 + seq_printf(m, "PaX:\t-----\n");
52703 +}
52704 +#endif
52705 +
52706 int proc_pid_status(struct seq_file *m, struct pid_namespace *ns,
52707 struct pid *pid, struct task_struct *task)
52708 {
52709 @@ -337,9 +353,24 @@ int proc_pid_status(struct seq_file *m, struct pid_namespace *ns,
52710 task_cap(m, task);
52711 cpuset_task_status_allowed(m, task);
52712 task_context_switch_counts(m, task);
52713 +
52714 +#if defined(CONFIG_PAX_NOEXEC) || defined(CONFIG_PAX_ASLR)
52715 + task_pax(m, task);
52716 +#endif
52717 +
52718 +#if defined(CONFIG_GRKERNSEC) && !defined(CONFIG_GRKERNSEC_NO_RBAC)
52719 + task_grsec_rbac(m, task);
52720 +#endif
52721 +
52722 return 0;
52723 }
52724
52725 +#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
52726 +#define PAX_RAND_FLAGS(_mm) (_mm != NULL && _mm != current->mm && \
52727 + (_mm->pax_flags & MF_PAX_RANDMMAP || \
52728 + _mm->pax_flags & MF_PAX_SEGMEXEC))
52729 +#endif
52730 +
52731 static int do_task_stat(struct seq_file *m, struct pid_namespace *ns,
52732 struct pid *pid, struct task_struct *task, int whole)
52733 {
52734 @@ -358,9 +389,11 @@ static int do_task_stat(struct seq_file *m, struct pid_namespace *ns,
52735 cputime_t cutime, cstime, utime, stime;
52736 cputime_t cgtime, gtime;
52737 unsigned long rsslim = 0;
52738 - char tcomm[sizeof(task->comm)];
52739 + char tcomm[sizeof(task->comm)] = { 0 };
52740 unsigned long flags;
52741
52742 + pax_track_stack();
52743 +
52744 state = *get_task_state(task);
52745 vsize = eip = esp = 0;
52746 permitted = ptrace_may_access(task, PTRACE_MODE_READ);
52747 @@ -433,6 +466,19 @@ static int do_task_stat(struct seq_file *m, struct pid_namespace *ns,
52748 gtime = task_gtime(task);
52749 }
52750
52751 +#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
52752 + if (PAX_RAND_FLAGS(mm)) {
52753 + eip = 0;
52754 + esp = 0;
52755 + wchan = 0;
52756 + }
52757 +#endif
52758 +#ifdef CONFIG_GRKERNSEC_HIDESYM
52759 + wchan = 0;
52760 + eip =0;
52761 + esp =0;
52762 +#endif
52763 +
52764 /* scale priority and nice values from timeslices to -20..20 */
52765 /* to make it look like a "normal" Unix priority/nice value */
52766 priority = task_prio(task);
52767 @@ -473,9 +519,15 @@ static int do_task_stat(struct seq_file *m, struct pid_namespace *ns,
52768 vsize,
52769 mm ? get_mm_rss(mm) : 0,
52770 rsslim,
52771 +#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
52772 + PAX_RAND_FLAGS(mm) ? 1 : (mm ? (permitted ? mm->start_code : 1) : 0),
52773 + PAX_RAND_FLAGS(mm) ? 1 : (mm ? (permitted ? mm->end_code : 1) : 0),
52774 + PAX_RAND_FLAGS(mm) ? 0 : ((permitted && mm) ? mm->start_stack : 0),
52775 +#else
52776 mm ? (permitted ? mm->start_code : 1) : 0,
52777 mm ? (permitted ? mm->end_code : 1) : 0,
52778 (permitted && mm) ? mm->start_stack : 0,
52779 +#endif
52780 esp,
52781 eip,
52782 /* The signal information here is obsolete.
52783 @@ -528,3 +580,18 @@ int proc_pid_statm(struct seq_file *m, struct pid_namespace *ns,
52784
52785 return 0;
52786 }
52787 +
52788 +#ifdef CONFIG_GRKERNSEC_PROC_IPADDR
52789 +int proc_pid_ipaddr(struct task_struct *task, char *buffer)
52790 +{
52791 + u32 curr_ip = 0;
52792 + unsigned long flags;
52793 +
52794 + if (lock_task_sighand(task, &flags)) {
52795 + curr_ip = task->signal->curr_ip;
52796 + unlock_task_sighand(task, &flags);
52797 + }
52798 +
52799 + return sprintf(buffer, "%pI4\n", &curr_ip);
52800 +}
52801 +#endif
52802 diff --git a/fs/proc/base.c b/fs/proc/base.c
52803 index 67f7dc0..67ab883 100644
52804 --- a/fs/proc/base.c
52805 +++ b/fs/proc/base.c
52806 @@ -102,6 +102,22 @@ struct pid_entry {
52807 union proc_op op;
52808 };
52809
52810 +struct getdents_callback {
52811 + struct linux_dirent __user * current_dir;
52812 + struct linux_dirent __user * previous;
52813 + struct file * file;
52814 + int count;
52815 + int error;
52816 +};
52817 +
52818 +static int gr_fake_filldir(void * __buf, const char *name, int namlen,
52819 + loff_t offset, u64 ino, unsigned int d_type)
52820 +{
52821 + struct getdents_callback * buf = (struct getdents_callback *) __buf;
52822 + buf->error = -EINVAL;
52823 + return 0;
52824 +}
52825 +
52826 #define NOD(NAME, MODE, IOP, FOP, OP) { \
52827 .name = (NAME), \
52828 .len = sizeof(NAME) - 1, \
52829 @@ -213,6 +229,9 @@ static int check_mem_permission(struct task_struct *task)
52830 if (task == current)
52831 return 0;
52832
52833 + if (gr_handle_proc_ptrace(task) || gr_acl_handle_procpidmem(task))
52834 + return -EPERM;
52835 +
52836 /*
52837 * If current is actively ptrace'ing, and would also be
52838 * permitted to freshly attach with ptrace now, permit it.
52839 @@ -260,6 +279,9 @@ static int proc_pid_cmdline(struct task_struct *task, char * buffer)
52840 if (!mm->arg_end)
52841 goto out_mm; /* Shh! No looking before we're done */
52842
52843 + if (gr_acl_handle_procpidmem(task))
52844 + goto out_mm;
52845 +
52846 len = mm->arg_end - mm->arg_start;
52847
52848 if (len > PAGE_SIZE)
52849 @@ -287,12 +309,28 @@ out:
52850 return res;
52851 }
52852
52853 +#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
52854 +#define PAX_RAND_FLAGS(_mm) (_mm != NULL && _mm != current->mm && \
52855 + (_mm->pax_flags & MF_PAX_RANDMMAP || \
52856 + _mm->pax_flags & MF_PAX_SEGMEXEC))
52857 +#endif
52858 +
52859 static int proc_pid_auxv(struct task_struct *task, char *buffer)
52860 {
52861 int res = 0;
52862 struct mm_struct *mm = get_task_mm(task);
52863 if (mm) {
52864 unsigned int nwords = 0;
52865 +
52866 +#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
52867 + /* allow if we're currently ptracing this task */
52868 + if (PAX_RAND_FLAGS(mm) &&
52869 + (!(task->ptrace & PT_PTRACED) || (task->parent != current))) {
52870 + mmput(mm);
52871 + return 0;
52872 + }
52873 +#endif
52874 +
52875 do {
52876 nwords += 2;
52877 } while (mm->saved_auxv[nwords - 2] != 0); /* AT_NULL */
52878 @@ -306,7 +344,7 @@ static int proc_pid_auxv(struct task_struct *task, char *buffer)
52879 }
52880
52881
52882 -#ifdef CONFIG_KALLSYMS
52883 +#if defined(CONFIG_KALLSYMS) && !defined(CONFIG_GRKERNSEC_HIDESYM)
52884 /*
52885 * Provides a wchan file via kallsyms in a proper one-value-per-file format.
52886 * Returns the resolved symbol. If that fails, simply return the address.
52887 @@ -345,7 +383,7 @@ static void unlock_trace(struct task_struct *task)
52888 mutex_unlock(&task->cred_guard_mutex);
52889 }
52890
52891 -#ifdef CONFIG_STACKTRACE
52892 +#if defined(CONFIG_STACKTRACE) && !defined(CONFIG_GRKERNSEC_HIDESYM)
52893
52894 #define MAX_STACK_TRACE_DEPTH 64
52895
52896 @@ -545,7 +583,7 @@ static int proc_pid_limits(struct task_struct *task, char *buffer)
52897 return count;
52898 }
52899
52900 -#ifdef CONFIG_HAVE_ARCH_TRACEHOOK
52901 +#if defined(CONFIG_HAVE_ARCH_TRACEHOOK) && !defined(CONFIG_GRKERNSEC_PROC_MEMMAP)
52902 static int proc_pid_syscall(struct task_struct *task, char *buffer)
52903 {
52904 long nr;
52905 @@ -574,7 +612,7 @@ static int proc_pid_syscall(struct task_struct *task, char *buffer)
52906 /************************************************************************/
52907
52908 /* permission checks */
52909 -static int proc_fd_access_allowed(struct inode *inode)
52910 +static int proc_fd_access_allowed(struct inode *inode, unsigned int log)
52911 {
52912 struct task_struct *task;
52913 int allowed = 0;
52914 @@ -584,7 +622,10 @@ static int proc_fd_access_allowed(struct inode *inode)
52915 */
52916 task = get_proc_task(inode);
52917 if (task) {
52918 - allowed = ptrace_may_access(task, PTRACE_MODE_READ);
52919 + if (log)
52920 + allowed = ptrace_may_access_log(task, PTRACE_MODE_READ);
52921 + else
52922 + allowed = ptrace_may_access(task, PTRACE_MODE_READ);
52923 put_task_struct(task);
52924 }
52925 return allowed;
52926 @@ -809,6 +850,8 @@ static int mem_open(struct inode* inode, struct file* file)
52927 return 0;
52928 }
52929
52930 +static int task_dumpable(struct task_struct *task);
52931 +
52932 static ssize_t mem_read(struct file * file, char __user * buf,
52933 size_t count, loff_t *ppos)
52934 {
52935 @@ -824,6 +867,12 @@ static ssize_t mem_read(struct file * file, char __user * buf,
52936 if (check_mem_permission(task))
52937 goto out;
52938
52939 + // XXX: temporary workaround
52940 + if (!task_dumpable(task) && task == current) {
52941 + ret = -EACCES;
52942 + goto out;
52943 + }
52944 +
52945 ret = -ENOMEM;
52946 page = (char *)__get_free_page(GFP_TEMPORARY);
52947 if (!page)
52948 @@ -963,6 +1012,9 @@ static ssize_t environ_read(struct file *file, char __user *buf,
52949 if (!task)
52950 goto out_no_task;
52951
52952 + if (gr_acl_handle_procpidmem(task))
52953 + goto out;
52954 +
52955 if (!ptrace_may_access(task, PTRACE_MODE_READ))
52956 goto out;
52957
52958 @@ -1377,7 +1429,7 @@ static void *proc_pid_follow_link(struct dentry *dentry, struct nameidata *nd)
52959 path_put(&nd->path);
52960
52961 /* Are we allowed to snoop on the tasks file descriptors? */
52962 - if (!proc_fd_access_allowed(inode))
52963 + if (!proc_fd_access_allowed(inode,0))
52964 goto out;
52965
52966 error = PROC_I(inode)->op.proc_get_link(inode, &nd->path);
52967 @@ -1417,8 +1469,18 @@ static int proc_pid_readlink(struct dentry * dentry, char __user * buffer, int b
52968 struct path path;
52969
52970 /* Are we allowed to snoop on the tasks file descriptors? */
52971 - if (!proc_fd_access_allowed(inode))
52972 - goto out;
52973 + /* logging this is needed for learning on chromium to work properly,
52974 + but we don't want to flood the logs from 'ps' which does a readlink
52975 + on /proc/fd/2 of tasks in the listing, nor do we want 'ps' to learn
52976 + CAP_SYS_PTRACE as it's not necessary for its basic functionality
52977 + */
52978 + if (dentry->d_name.name[0] == '2' && dentry->d_name.name[1] == '\0') {
52979 + if (!proc_fd_access_allowed(inode,0))
52980 + goto out;
52981 + } else {
52982 + if (!proc_fd_access_allowed(inode,1))
52983 + goto out;
52984 + }
52985
52986 error = PROC_I(inode)->op.proc_get_link(inode, &path);
52987 if (error)
52988 @@ -1483,7 +1545,11 @@ static struct inode *proc_pid_make_inode(struct super_block * sb, struct task_st
52989 rcu_read_lock();
52990 cred = __task_cred(task);
52991 inode->i_uid = cred->euid;
52992 +#ifdef CONFIG_GRKERNSEC_PROC_USERGROUP
52993 + inode->i_gid = CONFIG_GRKERNSEC_PROC_GID;
52994 +#else
52995 inode->i_gid = cred->egid;
52996 +#endif
52997 rcu_read_unlock();
52998 }
52999 security_task_to_inode(task, inode);
53000 @@ -1501,6 +1567,9 @@ static int pid_getattr(struct vfsmount *mnt, struct dentry *dentry, struct kstat
53001 struct inode *inode = dentry->d_inode;
53002 struct task_struct *task;
53003 const struct cred *cred;
53004 +#if defined(CONFIG_GRKERNSEC_PROC_USER) || defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
53005 + const struct cred *tmpcred = current_cred();
53006 +#endif
53007
53008 generic_fillattr(inode, stat);
53009
53010 @@ -1508,13 +1577,41 @@ static int pid_getattr(struct vfsmount *mnt, struct dentry *dentry, struct kstat
53011 stat->uid = 0;
53012 stat->gid = 0;
53013 task = pid_task(proc_pid(inode), PIDTYPE_PID);
53014 +
53015 + if (task && (gr_pid_is_chrooted(task) || gr_check_hidden_task(task))) {
53016 + rcu_read_unlock();
53017 + return -ENOENT;
53018 + }
53019 +
53020 if (task) {
53021 + cred = __task_cred(task);
53022 +#if defined(CONFIG_GRKERNSEC_PROC_USER) || defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
53023 + if (!tmpcred->uid || (tmpcred->uid == cred->uid)
53024 +#ifdef CONFIG_GRKERNSEC_PROC_USERGROUP
53025 + || in_group_p(CONFIG_GRKERNSEC_PROC_GID)
53026 +#endif
53027 + ) {
53028 +#endif
53029 if ((inode->i_mode == (S_IFDIR|S_IRUGO|S_IXUGO)) ||
53030 +#ifdef CONFIG_GRKERNSEC_PROC_USER
53031 + (inode->i_mode == (S_IFDIR|S_IRUSR|S_IXUSR)) ||
53032 +#elif defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
53033 + (inode->i_mode == (S_IFDIR|S_IRUSR|S_IRGRP|S_IXUSR|S_IXGRP)) ||
53034 +#endif
53035 task_dumpable(task)) {
53036 - cred = __task_cred(task);
53037 stat->uid = cred->euid;
53038 +#ifdef CONFIG_GRKERNSEC_PROC_USERGROUP
53039 + stat->gid = CONFIG_GRKERNSEC_PROC_GID;
53040 +#else
53041 stat->gid = cred->egid;
53042 +#endif
53043 }
53044 +#if defined(CONFIG_GRKERNSEC_PROC_USER) || defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
53045 + } else {
53046 + rcu_read_unlock();
53047 + return -ENOENT;
53048 + }
53049 +#endif
53050 }
53051 rcu_read_unlock();
53052 return 0;
53053 @@ -1545,11 +1642,20 @@ static int pid_revalidate(struct dentry *dentry, struct nameidata *nd)
53054
53055 if (task) {
53056 if ((inode->i_mode == (S_IFDIR|S_IRUGO|S_IXUGO)) ||
53057 +#ifdef CONFIG_GRKERNSEC_PROC_USER
53058 + (inode->i_mode == (S_IFDIR|S_IRUSR|S_IXUSR)) ||
53059 +#elif defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
53060 + (inode->i_mode == (S_IFDIR|S_IRUSR|S_IRGRP|S_IXUSR|S_IXGRP)) ||
53061 +#endif
53062 task_dumpable(task)) {
53063 rcu_read_lock();
53064 cred = __task_cred(task);
53065 inode->i_uid = cred->euid;
53066 +#ifdef CONFIG_GRKERNSEC_PROC_USERGROUP
53067 + inode->i_gid = CONFIG_GRKERNSEC_PROC_GID;
53068 +#else
53069 inode->i_gid = cred->egid;
53070 +#endif
53071 rcu_read_unlock();
53072 } else {
53073 inode->i_uid = 0;
53074 @@ -1670,7 +1776,8 @@ static int proc_fd_info(struct inode *inode, struct path *path, char *info)
53075 int fd = proc_fd(inode);
53076
53077 if (task) {
53078 - files = get_files_struct(task);
53079 + if (!gr_acl_handle_procpidmem(task))
53080 + files = get_files_struct(task);
53081 put_task_struct(task);
53082 }
53083 if (files) {
53084 @@ -1922,12 +2029,22 @@ static const struct file_operations proc_fd_operations = {
53085 static int proc_fd_permission(struct inode *inode, int mask)
53086 {
53087 int rv;
53088 + struct task_struct *task;
53089
53090 rv = generic_permission(inode, mask, NULL);
53091 - if (rv == 0)
53092 - return 0;
53093 +
53094 if (task_pid(current) == proc_pid(inode))
53095 rv = 0;
53096 +
53097 + task = get_proc_task(inode);
53098 + if (task == NULL)
53099 + return rv;
53100 +
53101 + if (gr_acl_handle_procpidmem(task))
53102 + rv = -EACCES;
53103 +
53104 + put_task_struct(task);
53105 +
53106 return rv;
53107 }
53108
53109 @@ -2036,6 +2153,9 @@ static struct dentry *proc_pident_lookup(struct inode *dir,
53110 if (!task)
53111 goto out_no_task;
53112
53113 + if (gr_pid_is_chrooted(task) || gr_check_hidden_task(task))
53114 + goto out;
53115 +
53116 /*
53117 * Yes, it does not scale. And it should not. Don't add
53118 * new entries into /proc/<tgid>/ without very good reasons.
53119 @@ -2080,6 +2200,9 @@ static int proc_pident_readdir(struct file *filp,
53120 if (!task)
53121 goto out_no_task;
53122
53123 + if (gr_pid_is_chrooted(task) || gr_check_hidden_task(task))
53124 + goto out;
53125 +
53126 ret = 0;
53127 i = filp->f_pos;
53128 switch (i) {
53129 @@ -2347,7 +2470,7 @@ static void *proc_self_follow_link(struct dentry *dentry, struct nameidata *nd)
53130 static void proc_self_put_link(struct dentry *dentry, struct nameidata *nd,
53131 void *cookie)
53132 {
53133 - char *s = nd_get_link(nd);
53134 + const char *s = nd_get_link(nd);
53135 if (!IS_ERR(s))
53136 __putname(s);
53137 }
53138 @@ -2553,7 +2676,7 @@ static const struct pid_entry tgid_base_stuff[] = {
53139 #ifdef CONFIG_SCHED_DEBUG
53140 REG("sched", S_IRUGO|S_IWUSR, proc_pid_sched_operations),
53141 #endif
53142 -#ifdef CONFIG_HAVE_ARCH_TRACEHOOK
53143 +#if defined(CONFIG_HAVE_ARCH_TRACEHOOK) && !defined(CONFIG_GRKERNSEC_PROC_MEMMAP)
53144 INF("syscall", S_IRUGO, proc_pid_syscall),
53145 #endif
53146 INF("cmdline", S_IRUGO, proc_pid_cmdline),
53147 @@ -2578,10 +2701,10 @@ static const struct pid_entry tgid_base_stuff[] = {
53148 #ifdef CONFIG_SECURITY
53149 DIR("attr", S_IRUGO|S_IXUGO, proc_attr_dir_inode_operations, proc_attr_dir_operations),
53150 #endif
53151 -#ifdef CONFIG_KALLSYMS
53152 +#if defined(CONFIG_KALLSYMS) && !defined(CONFIG_GRKERNSEC_HIDESYM)
53153 INF("wchan", S_IRUGO, proc_pid_wchan),
53154 #endif
53155 -#ifdef CONFIG_STACKTRACE
53156 +#if defined(CONFIG_STACKTRACE) && !defined(CONFIG_GRKERNSEC_HIDESYM)
53157 ONE("stack", S_IRUGO, proc_pid_stack),
53158 #endif
53159 #ifdef CONFIG_SCHEDSTATS
53160 @@ -2611,6 +2734,9 @@ static const struct pid_entry tgid_base_stuff[] = {
53161 #ifdef CONFIG_TASK_IO_ACCOUNTING
53162 INF("io", S_IRUSR, proc_tgid_io_accounting),
53163 #endif
53164 +#ifdef CONFIG_GRKERNSEC_PROC_IPADDR
53165 + INF("ipaddr", S_IRUSR, proc_pid_ipaddr),
53166 +#endif
53167 };
53168
53169 static int proc_tgid_base_readdir(struct file * filp,
53170 @@ -2735,7 +2861,14 @@ static struct dentry *proc_pid_instantiate(struct inode *dir,
53171 if (!inode)
53172 goto out;
53173
53174 +#ifdef CONFIG_GRKERNSEC_PROC_USER
53175 + inode->i_mode = S_IFDIR|S_IRUSR|S_IXUSR;
53176 +#elif defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
53177 + inode->i_gid = CONFIG_GRKERNSEC_PROC_GID;
53178 + inode->i_mode = S_IFDIR|S_IRUSR|S_IRGRP|S_IXUSR|S_IXGRP;
53179 +#else
53180 inode->i_mode = S_IFDIR|S_IRUGO|S_IXUGO;
53181 +#endif
53182 inode->i_op = &proc_tgid_base_inode_operations;
53183 inode->i_fop = &proc_tgid_base_operations;
53184 inode->i_flags|=S_IMMUTABLE;
53185 @@ -2777,7 +2910,11 @@ struct dentry *proc_pid_lookup(struct inode *dir, struct dentry * dentry, struct
53186 if (!task)
53187 goto out;
53188
53189 + if (gr_pid_is_chrooted(task) || gr_check_hidden_task(task))
53190 + goto out_put_task;
53191 +
53192 result = proc_pid_instantiate(dir, dentry, task, NULL);
53193 +out_put_task:
53194 put_task_struct(task);
53195 out:
53196 return result;
53197 @@ -2842,6 +2979,11 @@ int proc_pid_readdir(struct file * filp, void * dirent, filldir_t filldir)
53198 {
53199 unsigned int nr;
53200 struct task_struct *reaper;
53201 +#if defined(CONFIG_GRKERNSEC_PROC_USER) || defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
53202 + const struct cred *tmpcred = current_cred();
53203 + const struct cred *itercred;
53204 +#endif
53205 + filldir_t __filldir = filldir;
53206 struct tgid_iter iter;
53207 struct pid_namespace *ns;
53208
53209 @@ -2865,8 +3007,27 @@ int proc_pid_readdir(struct file * filp, void * dirent, filldir_t filldir)
53210 for (iter = next_tgid(ns, iter);
53211 iter.task;
53212 iter.tgid += 1, iter = next_tgid(ns, iter)) {
53213 +#if defined(CONFIG_GRKERNSEC_PROC_USER) || defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
53214 + rcu_read_lock();
53215 + itercred = __task_cred(iter.task);
53216 +#endif
53217 + if (gr_pid_is_chrooted(iter.task) || gr_check_hidden_task(iter.task)
53218 +#if defined(CONFIG_GRKERNSEC_PROC_USER) || defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
53219 + || (tmpcred->uid && (itercred->uid != tmpcred->uid)
53220 +#ifdef CONFIG_GRKERNSEC_PROC_USERGROUP
53221 + && !in_group_p(CONFIG_GRKERNSEC_PROC_GID)
53222 +#endif
53223 + )
53224 +#endif
53225 + )
53226 + __filldir = &gr_fake_filldir;
53227 + else
53228 + __filldir = filldir;
53229 +#if defined(CONFIG_GRKERNSEC_PROC_USER) || defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
53230 + rcu_read_unlock();
53231 +#endif
53232 filp->f_pos = iter.tgid + TGID_OFFSET;
53233 - if (proc_pid_fill_cache(filp, dirent, filldir, iter) < 0) {
53234 + if (proc_pid_fill_cache(filp, dirent, __filldir, iter) < 0) {
53235 put_task_struct(iter.task);
53236 goto out;
53237 }
53238 @@ -2892,7 +3053,7 @@ static const struct pid_entry tid_base_stuff[] = {
53239 #ifdef CONFIG_SCHED_DEBUG
53240 REG("sched", S_IRUGO|S_IWUSR, proc_pid_sched_operations),
53241 #endif
53242 -#ifdef CONFIG_HAVE_ARCH_TRACEHOOK
53243 +#if defined(CONFIG_HAVE_ARCH_TRACEHOOK) && !defined(CONFIG_GRKERNSEC_PROC_MEMMAP)
53244 INF("syscall", S_IRUGO, proc_pid_syscall),
53245 #endif
53246 INF("cmdline", S_IRUGO, proc_pid_cmdline),
53247 @@ -2916,10 +3077,10 @@ static const struct pid_entry tid_base_stuff[] = {
53248 #ifdef CONFIG_SECURITY
53249 DIR("attr", S_IRUGO|S_IXUGO, proc_attr_dir_inode_operations, proc_attr_dir_operations),
53250 #endif
53251 -#ifdef CONFIG_KALLSYMS
53252 +#if defined(CONFIG_KALLSYMS) && !defined(CONFIG_GRKERNSEC_HIDESYM)
53253 INF("wchan", S_IRUGO, proc_pid_wchan),
53254 #endif
53255 -#ifdef CONFIG_STACKTRACE
53256 +#if defined(CONFIG_STACKTRACE) && !defined(CONFIG_GRKERNSEC_HIDESYM)
53257 ONE("stack", S_IRUGO, proc_pid_stack),
53258 #endif
53259 #ifdef CONFIG_SCHEDSTATS
53260 diff --git a/fs/proc/cmdline.c b/fs/proc/cmdline.c
53261 index 82676e3..5f8518a 100644
53262 --- a/fs/proc/cmdline.c
53263 +++ b/fs/proc/cmdline.c
53264 @@ -23,7 +23,11 @@ static const struct file_operations cmdline_proc_fops = {
53265
53266 static int __init proc_cmdline_init(void)
53267 {
53268 +#ifdef CONFIG_GRKERNSEC_PROC_ADD
53269 + proc_create_grsec("cmdline", 0, NULL, &cmdline_proc_fops);
53270 +#else
53271 proc_create("cmdline", 0, NULL, &cmdline_proc_fops);
53272 +#endif
53273 return 0;
53274 }
53275 module_init(proc_cmdline_init);
53276 diff --git a/fs/proc/devices.c b/fs/proc/devices.c
53277 index 59ee7da..469b4b6 100644
53278 --- a/fs/proc/devices.c
53279 +++ b/fs/proc/devices.c
53280 @@ -64,7 +64,11 @@ static const struct file_operations proc_devinfo_operations = {
53281
53282 static int __init proc_devices_init(void)
53283 {
53284 +#ifdef CONFIG_GRKERNSEC_PROC_ADD
53285 + proc_create_grsec("devices", 0, NULL, &proc_devinfo_operations);
53286 +#else
53287 proc_create("devices", 0, NULL, &proc_devinfo_operations);
53288 +#endif
53289 return 0;
53290 }
53291 module_init(proc_devices_init);
53292 diff --git a/fs/proc/inode.c b/fs/proc/inode.c
53293 index d78ade3..81767f9 100644
53294 --- a/fs/proc/inode.c
53295 +++ b/fs/proc/inode.c
53296 @@ -18,12 +18,19 @@
53297 #include <linux/module.h>
53298 #include <linux/smp_lock.h>
53299 #include <linux/sysctl.h>
53300 +#include <linux/grsecurity.h>
53301
53302 #include <asm/system.h>
53303 #include <asm/uaccess.h>
53304
53305 #include "internal.h"
53306
53307 +#ifdef CONFIG_PROC_SYSCTL
53308 +extern const struct inode_operations proc_sys_inode_operations;
53309 +extern const struct inode_operations proc_sys_dir_operations;
53310 +#endif
53311 +
53312 +
53313 struct proc_dir_entry *de_get(struct proc_dir_entry *de)
53314 {
53315 atomic_inc(&de->count);
53316 @@ -62,6 +69,13 @@ static void proc_delete_inode(struct inode *inode)
53317 de_put(de);
53318 if (PROC_I(inode)->sysctl)
53319 sysctl_head_put(PROC_I(inode)->sysctl);
53320 +
53321 +#ifdef CONFIG_PROC_SYSCTL
53322 + if (inode->i_op == &proc_sys_inode_operations ||
53323 + inode->i_op == &proc_sys_dir_operations)
53324 + gr_handle_delete(inode->i_ino, inode->i_sb->s_dev);
53325 +#endif
53326 +
53327 clear_inode(inode);
53328 }
53329
53330 @@ -457,7 +471,11 @@ struct inode *proc_get_inode(struct super_block *sb, unsigned int ino,
53331 if (de->mode) {
53332 inode->i_mode = de->mode;
53333 inode->i_uid = de->uid;
53334 +#ifdef CONFIG_GRKERNSEC_PROC_USERGROUP
53335 + inode->i_gid = CONFIG_GRKERNSEC_PROC_GID;
53336 +#else
53337 inode->i_gid = de->gid;
53338 +#endif
53339 }
53340 if (de->size)
53341 inode->i_size = de->size;
53342 diff --git a/fs/proc/internal.h b/fs/proc/internal.h
53343 index 753ca37..26bcf3b 100644
53344 --- a/fs/proc/internal.h
53345 +++ b/fs/proc/internal.h
53346 @@ -51,6 +51,9 @@ extern int proc_pid_status(struct seq_file *m, struct pid_namespace *ns,
53347 struct pid *pid, struct task_struct *task);
53348 extern int proc_pid_statm(struct seq_file *m, struct pid_namespace *ns,
53349 struct pid *pid, struct task_struct *task);
53350 +#ifdef CONFIG_GRKERNSEC_PROC_IPADDR
53351 +extern int proc_pid_ipaddr(struct task_struct *task, char *buffer);
53352 +#endif
53353 extern loff_t mem_lseek(struct file *file, loff_t offset, int orig);
53354
53355 extern const struct file_operations proc_maps_operations;
53356 diff --git a/fs/proc/kcore.c b/fs/proc/kcore.c
53357 index b442dac..aab29cb 100644
53358 --- a/fs/proc/kcore.c
53359 +++ b/fs/proc/kcore.c
53360 @@ -320,6 +320,8 @@ static void elf_kcore_store_hdr(char *bufp, int nphdr, int dataoff)
53361 off_t offset = 0;
53362 struct kcore_list *m;
53363
53364 + pax_track_stack();
53365 +
53366 /* setup ELF header */
53367 elf = (struct elfhdr *) bufp;
53368 bufp += sizeof(struct elfhdr);
53369 @@ -477,9 +479,10 @@ read_kcore(struct file *file, char __user *buffer, size_t buflen, loff_t *fpos)
53370 * the addresses in the elf_phdr on our list.
53371 */
53372 start = kc_offset_to_vaddr(*fpos - elf_buflen);
53373 - if ((tsz = (PAGE_SIZE - (start & ~PAGE_MASK))) > buflen)
53374 + tsz = PAGE_SIZE - (start & ~PAGE_MASK);
53375 + if (tsz > buflen)
53376 tsz = buflen;
53377 -
53378 +
53379 while (buflen) {
53380 struct kcore_list *m;
53381
53382 @@ -508,20 +511,23 @@ read_kcore(struct file *file, char __user *buffer, size_t buflen, loff_t *fpos)
53383 kfree(elf_buf);
53384 } else {
53385 if (kern_addr_valid(start)) {
53386 - unsigned long n;
53387 + char *elf_buf;
53388 + mm_segment_t oldfs;
53389
53390 - n = copy_to_user(buffer, (char *)start, tsz);
53391 - /*
53392 - * We cannot distingush between fault on source
53393 - * and fault on destination. When this happens
53394 - * we clear too and hope it will trigger the
53395 - * EFAULT again.
53396 - */
53397 - if (n) {
53398 - if (clear_user(buffer + tsz - n,
53399 - n))
53400 + elf_buf = kmalloc(tsz, GFP_KERNEL);
53401 + if (!elf_buf)
53402 + return -ENOMEM;
53403 + oldfs = get_fs();
53404 + set_fs(KERNEL_DS);
53405 + if (!__copy_from_user(elf_buf, (const void __user *)start, tsz)) {
53406 + set_fs(oldfs);
53407 + if (copy_to_user(buffer, elf_buf, tsz)) {
53408 + kfree(elf_buf);
53409 return -EFAULT;
53410 + }
53411 }
53412 + set_fs(oldfs);
53413 + kfree(elf_buf);
53414 } else {
53415 if (clear_user(buffer, tsz))
53416 return -EFAULT;
53417 @@ -541,6 +547,9 @@ read_kcore(struct file *file, char __user *buffer, size_t buflen, loff_t *fpos)
53418
53419 static int open_kcore(struct inode *inode, struct file *filp)
53420 {
53421 +#if defined(CONFIG_GRKERNSEC_PROC_ADD) || defined(CONFIG_GRKERNSEC_HIDESYM)
53422 + return -EPERM;
53423 +#endif
53424 if (!capable(CAP_SYS_RAWIO))
53425 return -EPERM;
53426 if (kcore_need_update)
53427 diff --git a/fs/proc/kmsg.c b/fs/proc/kmsg.c
53428 index 7ca7834..cfe90a4 100644
53429 --- a/fs/proc/kmsg.c
53430 +++ b/fs/proc/kmsg.c
53431 @@ -12,37 +12,37 @@
53432 #include <linux/poll.h>
53433 #include <linux/proc_fs.h>
53434 #include <linux/fs.h>
53435 +#include <linux/syslog.h>
53436
53437 #include <asm/uaccess.h>
53438 #include <asm/io.h>
53439
53440 extern wait_queue_head_t log_wait;
53441
53442 -extern int do_syslog(int type, char __user *bug, int count);
53443 -
53444 static int kmsg_open(struct inode * inode, struct file * file)
53445 {
53446 - return do_syslog(1,NULL,0);
53447 + return do_syslog(SYSLOG_ACTION_OPEN, NULL, 0, SYSLOG_FROM_FILE);
53448 }
53449
53450 static int kmsg_release(struct inode * inode, struct file * file)
53451 {
53452 - (void) do_syslog(0,NULL,0);
53453 + (void) do_syslog(SYSLOG_ACTION_CLOSE, NULL, 0, SYSLOG_FROM_FILE);
53454 return 0;
53455 }
53456
53457 static ssize_t kmsg_read(struct file *file, char __user *buf,
53458 size_t count, loff_t *ppos)
53459 {
53460 - if ((file->f_flags & O_NONBLOCK) && !do_syslog(9, NULL, 0))
53461 + if ((file->f_flags & O_NONBLOCK) &&
53462 + !do_syslog(SYSLOG_ACTION_SIZE_UNREAD, NULL, 0, SYSLOG_FROM_FILE))
53463 return -EAGAIN;
53464 - return do_syslog(2, buf, count);
53465 + return do_syslog(SYSLOG_ACTION_READ, buf, count, SYSLOG_FROM_FILE);
53466 }
53467
53468 static unsigned int kmsg_poll(struct file *file, poll_table *wait)
53469 {
53470 poll_wait(file, &log_wait, wait);
53471 - if (do_syslog(9, NULL, 0))
53472 + if (do_syslog(SYSLOG_ACTION_SIZE_UNREAD, NULL, 0, SYSLOG_FROM_FILE))
53473 return POLLIN | POLLRDNORM;
53474 return 0;
53475 }
53476 diff --git a/fs/proc/meminfo.c b/fs/proc/meminfo.c
53477 index a65239c..ad1182a 100644
53478 --- a/fs/proc/meminfo.c
53479 +++ b/fs/proc/meminfo.c
53480 @@ -29,6 +29,8 @@ static int meminfo_proc_show(struct seq_file *m, void *v)
53481 unsigned long pages[NR_LRU_LISTS];
53482 int lru;
53483
53484 + pax_track_stack();
53485 +
53486 /*
53487 * display in kilobytes.
53488 */
53489 @@ -149,7 +151,7 @@ static int meminfo_proc_show(struct seq_file *m, void *v)
53490 vmi.used >> 10,
53491 vmi.largest_chunk >> 10
53492 #ifdef CONFIG_MEMORY_FAILURE
53493 - ,atomic_long_read(&mce_bad_pages) << (PAGE_SHIFT - 10)
53494 + ,atomic_long_read_unchecked(&mce_bad_pages) << (PAGE_SHIFT - 10)
53495 #endif
53496 );
53497
53498 diff --git a/fs/proc/nommu.c b/fs/proc/nommu.c
53499 index 9fe7d7e..cdb62c9 100644
53500 --- a/fs/proc/nommu.c
53501 +++ b/fs/proc/nommu.c
53502 @@ -67,7 +67,7 @@ static int nommu_region_show(struct seq_file *m, struct vm_region *region)
53503 if (len < 1)
53504 len = 1;
53505 seq_printf(m, "%*c", len, ' ');
53506 - seq_path(m, &file->f_path, "");
53507 + seq_path(m, &file->f_path, "\n\\");
53508 }
53509
53510 seq_putc(m, '\n');
53511 diff --git a/fs/proc/proc_net.c b/fs/proc/proc_net.c
53512 index 04d1270..25e1173 100644
53513 --- a/fs/proc/proc_net.c
53514 +++ b/fs/proc/proc_net.c
53515 @@ -104,6 +104,17 @@ static struct net *get_proc_task_net(struct inode *dir)
53516 struct task_struct *task;
53517 struct nsproxy *ns;
53518 struct net *net = NULL;
53519 +#if defined(CONFIG_GRKERNSEC_PROC_USER) || defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
53520 + const struct cred *cred = current_cred();
53521 +#endif
53522 +
53523 +#ifdef CONFIG_GRKERNSEC_PROC_USER
53524 + if (cred->fsuid)
53525 + return net;
53526 +#elif defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
53527 + if (cred->fsuid && !in_group_p(CONFIG_GRKERNSEC_PROC_GID))
53528 + return net;
53529 +#endif
53530
53531 rcu_read_lock();
53532 task = pid_task(proc_pid(dir), PIDTYPE_PID);
53533 diff --git a/fs/proc/proc_sysctl.c b/fs/proc/proc_sysctl.c
53534 index f667e8a..55f4d96 100644
53535 --- a/fs/proc/proc_sysctl.c
53536 +++ b/fs/proc/proc_sysctl.c
53537 @@ -7,11 +7,13 @@
53538 #include <linux/security.h>
53539 #include "internal.h"
53540
53541 +extern __u32 gr_handle_sysctl(const struct ctl_table *table, const int op);
53542 +
53543 static const struct dentry_operations proc_sys_dentry_operations;
53544 static const struct file_operations proc_sys_file_operations;
53545 -static const struct inode_operations proc_sys_inode_operations;
53546 +const struct inode_operations proc_sys_inode_operations;
53547 static const struct file_operations proc_sys_dir_file_operations;
53548 -static const struct inode_operations proc_sys_dir_operations;
53549 +const struct inode_operations proc_sys_dir_operations;
53550
53551 static struct inode *proc_sys_make_inode(struct super_block *sb,
53552 struct ctl_table_header *head, struct ctl_table *table)
53553 @@ -109,6 +111,9 @@ static struct dentry *proc_sys_lookup(struct inode *dir, struct dentry *dentry,
53554 if (!p)
53555 goto out;
53556
53557 + if (gr_handle_sysctl(p, MAY_EXEC))
53558 + goto out;
53559 +
53560 err = ERR_PTR(-ENOMEM);
53561 inode = proc_sys_make_inode(dir->i_sb, h ? h : head, p);
53562 if (h)
53563 @@ -119,6 +124,9 @@ static struct dentry *proc_sys_lookup(struct inode *dir, struct dentry *dentry,
53564
53565 err = NULL;
53566 dentry->d_op = &proc_sys_dentry_operations;
53567 +
53568 + gr_handle_proc_create(dentry, inode);
53569 +
53570 d_add(dentry, inode);
53571
53572 out:
53573 @@ -200,6 +208,9 @@ static int proc_sys_fill_cache(struct file *filp, void *dirent,
53574 return -ENOMEM;
53575 } else {
53576 child->d_op = &proc_sys_dentry_operations;
53577 +
53578 + gr_handle_proc_create(child, inode);
53579 +
53580 d_add(child, inode);
53581 }
53582 } else {
53583 @@ -228,6 +239,9 @@ static int scan(struct ctl_table_header *head, ctl_table *table,
53584 if (*pos < file->f_pos)
53585 continue;
53586
53587 + if (gr_handle_sysctl(table, 0))
53588 + continue;
53589 +
53590 res = proc_sys_fill_cache(file, dirent, filldir, head, table);
53591 if (res)
53592 return res;
53593 @@ -344,6 +358,9 @@ static int proc_sys_getattr(struct vfsmount *mnt, struct dentry *dentry, struct
53594 if (IS_ERR(head))
53595 return PTR_ERR(head);
53596
53597 + if (table && gr_handle_sysctl(table, MAY_EXEC))
53598 + return -ENOENT;
53599 +
53600 generic_fillattr(inode, stat);
53601 if (table)
53602 stat->mode = (stat->mode & S_IFMT) | table->mode;
53603 @@ -358,17 +375,18 @@ static const struct file_operations proc_sys_file_operations = {
53604 };
53605
53606 static const struct file_operations proc_sys_dir_file_operations = {
53607 + .read = generic_read_dir,
53608 .readdir = proc_sys_readdir,
53609 .llseek = generic_file_llseek,
53610 };
53611
53612 -static const struct inode_operations proc_sys_inode_operations = {
53613 +const struct inode_operations proc_sys_inode_operations = {
53614 .permission = proc_sys_permission,
53615 .setattr = proc_sys_setattr,
53616 .getattr = proc_sys_getattr,
53617 };
53618
53619 -static const struct inode_operations proc_sys_dir_operations = {
53620 +const struct inode_operations proc_sys_dir_operations = {
53621 .lookup = proc_sys_lookup,
53622 .permission = proc_sys_permission,
53623 .setattr = proc_sys_setattr,
53624 diff --git a/fs/proc/root.c b/fs/proc/root.c
53625 index b080b79..d957e63 100644
53626 --- a/fs/proc/root.c
53627 +++ b/fs/proc/root.c
53628 @@ -134,7 +134,15 @@ void __init proc_root_init(void)
53629 #ifdef CONFIG_PROC_DEVICETREE
53630 proc_device_tree_init();
53631 #endif
53632 +#ifdef CONFIG_GRKERNSEC_PROC_ADD
53633 +#ifdef CONFIG_GRKERNSEC_PROC_USER
53634 + proc_mkdir_mode("bus", S_IRUSR | S_IXUSR, NULL);
53635 +#elif defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
53636 + proc_mkdir_mode("bus", S_IRUSR | S_IXUSR | S_IRGRP | S_IXGRP, NULL);
53637 +#endif
53638 +#else
53639 proc_mkdir("bus", NULL);
53640 +#endif
53641 proc_sys_init();
53642 }
53643
53644 diff --git a/fs/proc/task_mmu.c b/fs/proc/task_mmu.c
53645 index 3b7b82a..7dbb571 100644
53646 --- a/fs/proc/task_mmu.c
53647 +++ b/fs/proc/task_mmu.c
53648 @@ -46,15 +46,26 @@ void task_mem(struct seq_file *m, struct mm_struct *mm)
53649 "VmStk:\t%8lu kB\n"
53650 "VmExe:\t%8lu kB\n"
53651 "VmLib:\t%8lu kB\n"
53652 - "VmPTE:\t%8lu kB\n",
53653 - hiwater_vm << (PAGE_SHIFT-10),
53654 + "VmPTE:\t%8lu kB\n"
53655 +
53656 +#ifdef CONFIG_ARCH_TRACK_EXEC_LIMIT
53657 + "CsBase:\t%8lx\nCsLim:\t%8lx\n"
53658 +#endif
53659 +
53660 + ,hiwater_vm << (PAGE_SHIFT-10),
53661 (total_vm - mm->reserved_vm) << (PAGE_SHIFT-10),
53662 mm->locked_vm << (PAGE_SHIFT-10),
53663 hiwater_rss << (PAGE_SHIFT-10),
53664 total_rss << (PAGE_SHIFT-10),
53665 data << (PAGE_SHIFT-10),
53666 mm->stack_vm << (PAGE_SHIFT-10), text, lib,
53667 - (PTRS_PER_PTE*sizeof(pte_t)*mm->nr_ptes) >> 10);
53668 + (PTRS_PER_PTE*sizeof(pte_t)*mm->nr_ptes) >> 10
53669 +
53670 +#ifdef CONFIG_ARCH_TRACK_EXEC_LIMIT
53671 + , mm->context.user_cs_base, mm->context.user_cs_limit
53672 +#endif
53673 +
53674 + );
53675 }
53676
53677 unsigned long task_vsize(struct mm_struct *mm)
53678 @@ -175,7 +186,8 @@ static void m_stop(struct seq_file *m, void *v)
53679 struct proc_maps_private *priv = m->private;
53680 struct vm_area_struct *vma = v;
53681
53682 - vma_stop(priv, vma);
53683 + if (!IS_ERR(vma))
53684 + vma_stop(priv, vma);
53685 if (priv->task)
53686 put_task_struct(priv->task);
53687 }
53688 @@ -199,6 +211,12 @@ static int do_maps_open(struct inode *inode, struct file *file,
53689 return ret;
53690 }
53691
53692 +#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
53693 +#define PAX_RAND_FLAGS(_mm) (_mm != NULL && _mm != current->mm && \
53694 + (_mm->pax_flags & MF_PAX_RANDMMAP || \
53695 + _mm->pax_flags & MF_PAX_SEGMEXEC))
53696 +#endif
53697 +
53698 static void show_map_vma(struct seq_file *m, struct vm_area_struct *vma)
53699 {
53700 struct mm_struct *mm = vma->vm_mm;
53701 @@ -206,7 +224,6 @@ static void show_map_vma(struct seq_file *m, struct vm_area_struct *vma)
53702 int flags = vma->vm_flags;
53703 unsigned long ino = 0;
53704 unsigned long long pgoff = 0;
53705 - unsigned long start;
53706 dev_t dev = 0;
53707 int len;
53708
53709 @@ -217,20 +234,23 @@ static void show_map_vma(struct seq_file *m, struct vm_area_struct *vma)
53710 pgoff = ((loff_t)vma->vm_pgoff) << PAGE_SHIFT;
53711 }
53712
53713 - /* We don't show the stack guard page in /proc/maps */
53714 - start = vma->vm_start;
53715 - if (vma->vm_flags & VM_GROWSDOWN)
53716 - if (!vma_stack_continue(vma->vm_prev, vma->vm_start))
53717 - start += PAGE_SIZE;
53718 -
53719 seq_printf(m, "%08lx-%08lx %c%c%c%c %08llx %02x:%02x %lu %n",
53720 - start,
53721 +#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
53722 + PAX_RAND_FLAGS(mm) ? 0UL : vma->vm_start,
53723 + PAX_RAND_FLAGS(mm) ? 0UL : vma->vm_end,
53724 +#else
53725 + vma->vm_start,
53726 vma->vm_end,
53727 +#endif
53728 flags & VM_READ ? 'r' : '-',
53729 flags & VM_WRITE ? 'w' : '-',
53730 flags & VM_EXEC ? 'x' : '-',
53731 flags & VM_MAYSHARE ? 's' : 'p',
53732 +#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
53733 + PAX_RAND_FLAGS(mm) ? 0UL : pgoff,
53734 +#else
53735 pgoff,
53736 +#endif
53737 MAJOR(dev), MINOR(dev), ino, &len);
53738
53739 /*
53740 @@ -239,7 +259,7 @@ static void show_map_vma(struct seq_file *m, struct vm_area_struct *vma)
53741 */
53742 if (file) {
53743 pad_len_spaces(m, len);
53744 - seq_path(m, &file->f_path, "\n");
53745 + seq_path(m, &file->f_path, "\n\\");
53746 } else {
53747 const char *name = arch_vma_name(vma);
53748 if (!name) {
53749 @@ -247,8 +267,9 @@ static void show_map_vma(struct seq_file *m, struct vm_area_struct *vma)
53750 if (vma->vm_start <= mm->brk &&
53751 vma->vm_end >= mm->start_brk) {
53752 name = "[heap]";
53753 - } else if (vma->vm_start <= mm->start_stack &&
53754 - vma->vm_end >= mm->start_stack) {
53755 + } else if ((vma->vm_flags & (VM_GROWSDOWN | VM_GROWSUP)) ||
53756 + (vma->vm_start <= mm->start_stack &&
53757 + vma->vm_end >= mm->start_stack)) {
53758 name = "[stack]";
53759 }
53760 } else {
53761 @@ -391,9 +412,16 @@ static int show_smap(struct seq_file *m, void *v)
53762 };
53763
53764 memset(&mss, 0, sizeof mss);
53765 - mss.vma = vma;
53766 - if (vma->vm_mm && !is_vm_hugetlb_page(vma))
53767 - walk_page_range(vma->vm_start, vma->vm_end, &smaps_walk);
53768 +
53769 +#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
53770 + if (!PAX_RAND_FLAGS(vma->vm_mm)) {
53771 +#endif
53772 + mss.vma = vma;
53773 + if (vma->vm_mm && !is_vm_hugetlb_page(vma))
53774 + walk_page_range(vma->vm_start, vma->vm_end, &smaps_walk);
53775 +#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
53776 + }
53777 +#endif
53778
53779 show_map_vma(m, vma);
53780
53781 @@ -409,7 +437,11 @@ static int show_smap(struct seq_file *m, void *v)
53782 "Swap: %8lu kB\n"
53783 "KernelPageSize: %8lu kB\n"
53784 "MMUPageSize: %8lu kB\n",
53785 +#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
53786 + PAX_RAND_FLAGS(vma->vm_mm) ? 0UL : (vma->vm_end - vma->vm_start) >> 10,
53787 +#else
53788 (vma->vm_end - vma->vm_start) >> 10,
53789 +#endif
53790 mss.resident >> 10,
53791 (unsigned long)(mss.pss >> (10 + PSS_SHIFT)),
53792 mss.shared_clean >> 10,
53793 diff --git a/fs/proc/task_nommu.c b/fs/proc/task_nommu.c
53794 index 8f5c05d..c99c76d 100644
53795 --- a/fs/proc/task_nommu.c
53796 +++ b/fs/proc/task_nommu.c
53797 @@ -50,7 +50,7 @@ void task_mem(struct seq_file *m, struct mm_struct *mm)
53798 else
53799 bytes += kobjsize(mm);
53800
53801 - if (current->fs && current->fs->users > 1)
53802 + if (current->fs && atomic_read(&current->fs->users) > 1)
53803 sbytes += kobjsize(current->fs);
53804 else
53805 bytes += kobjsize(current->fs);
53806 @@ -154,7 +154,7 @@ static int nommu_vma_show(struct seq_file *m, struct vm_area_struct *vma)
53807 if (len < 1)
53808 len = 1;
53809 seq_printf(m, "%*c", len, ' ');
53810 - seq_path(m, &file->f_path, "");
53811 + seq_path(m, &file->f_path, "\n\\");
53812 }
53813
53814 seq_putc(m, '\n');
53815 diff --git a/fs/readdir.c b/fs/readdir.c
53816 index 7723401..30059a6 100644
53817 --- a/fs/readdir.c
53818 +++ b/fs/readdir.c
53819 @@ -16,6 +16,7 @@
53820 #include <linux/security.h>
53821 #include <linux/syscalls.h>
53822 #include <linux/unistd.h>
53823 +#include <linux/namei.h>
53824
53825 #include <asm/uaccess.h>
53826
53827 @@ -67,6 +68,7 @@ struct old_linux_dirent {
53828
53829 struct readdir_callback {
53830 struct old_linux_dirent __user * dirent;
53831 + struct file * file;
53832 int result;
53833 };
53834
53835 @@ -84,6 +86,10 @@ static int fillonedir(void * __buf, const char * name, int namlen, loff_t offset
53836 buf->result = -EOVERFLOW;
53837 return -EOVERFLOW;
53838 }
53839 +
53840 + if (!gr_acl_handle_filldir(buf->file, name, namlen, ino))
53841 + return 0;
53842 +
53843 buf->result++;
53844 dirent = buf->dirent;
53845 if (!access_ok(VERIFY_WRITE, dirent,
53846 @@ -116,6 +122,7 @@ SYSCALL_DEFINE3(old_readdir, unsigned int, fd,
53847
53848 buf.result = 0;
53849 buf.dirent = dirent;
53850 + buf.file = file;
53851
53852 error = vfs_readdir(file, fillonedir, &buf);
53853 if (buf.result)
53854 @@ -142,6 +149,7 @@ struct linux_dirent {
53855 struct getdents_callback {
53856 struct linux_dirent __user * current_dir;
53857 struct linux_dirent __user * previous;
53858 + struct file * file;
53859 int count;
53860 int error;
53861 };
53862 @@ -162,6 +170,10 @@ static int filldir(void * __buf, const char * name, int namlen, loff_t offset,
53863 buf->error = -EOVERFLOW;
53864 return -EOVERFLOW;
53865 }
53866 +
53867 + if (!gr_acl_handle_filldir(buf->file, name, namlen, ino))
53868 + return 0;
53869 +
53870 dirent = buf->previous;
53871 if (dirent) {
53872 if (__put_user(offset, &dirent->d_off))
53873 @@ -209,6 +221,7 @@ SYSCALL_DEFINE3(getdents, unsigned int, fd,
53874 buf.previous = NULL;
53875 buf.count = count;
53876 buf.error = 0;
53877 + buf.file = file;
53878
53879 error = vfs_readdir(file, filldir, &buf);
53880 if (error >= 0)
53881 @@ -228,6 +241,7 @@ out:
53882 struct getdents_callback64 {
53883 struct linux_dirent64 __user * current_dir;
53884 struct linux_dirent64 __user * previous;
53885 + struct file *file;
53886 int count;
53887 int error;
53888 };
53889 @@ -242,6 +256,10 @@ static int filldir64(void * __buf, const char * name, int namlen, loff_t offset,
53890 buf->error = -EINVAL; /* only used if we fail.. */
53891 if (reclen > buf->count)
53892 return -EINVAL;
53893 +
53894 + if (!gr_acl_handle_filldir(buf->file, name, namlen, ino))
53895 + return 0;
53896 +
53897 dirent = buf->previous;
53898 if (dirent) {
53899 if (__put_user(offset, &dirent->d_off))
53900 @@ -289,6 +307,7 @@ SYSCALL_DEFINE3(getdents64, unsigned int, fd,
53901
53902 buf.current_dir = dirent;
53903 buf.previous = NULL;
53904 + buf.file = file;
53905 buf.count = count;
53906 buf.error = 0;
53907
53908 @@ -297,7 +316,7 @@ SYSCALL_DEFINE3(getdents64, unsigned int, fd,
53909 error = buf.error;
53910 lastdirent = buf.previous;
53911 if (lastdirent) {
53912 - typeof(lastdirent->d_off) d_off = file->f_pos;
53913 + typeof(((struct linux_dirent64 *)0)->d_off) d_off = file->f_pos;
53914 if (__put_user(d_off, &lastdirent->d_off))
53915 error = -EFAULT;
53916 else
53917 diff --git a/fs/reiserfs/dir.c b/fs/reiserfs/dir.c
53918 index d42c30c..4fd8718 100644
53919 --- a/fs/reiserfs/dir.c
53920 +++ b/fs/reiserfs/dir.c
53921 @@ -66,6 +66,8 @@ int reiserfs_readdir_dentry(struct dentry *dentry, void *dirent,
53922 struct reiserfs_dir_entry de;
53923 int ret = 0;
53924
53925 + pax_track_stack();
53926 +
53927 reiserfs_write_lock(inode->i_sb);
53928
53929 reiserfs_check_lock_depth(inode->i_sb, "readdir");
53930 diff --git a/fs/reiserfs/do_balan.c b/fs/reiserfs/do_balan.c
53931 index 128d3f7..8840d44 100644
53932 --- a/fs/reiserfs/do_balan.c
53933 +++ b/fs/reiserfs/do_balan.c
53934 @@ -2058,7 +2058,7 @@ void do_balance(struct tree_balance *tb, /* tree_balance structure */
53935 return;
53936 }
53937
53938 - atomic_inc(&(fs_generation(tb->tb_sb)));
53939 + atomic_inc_unchecked(&(fs_generation(tb->tb_sb)));
53940 do_balance_starts(tb);
53941
53942 /* balance leaf returns 0 except if combining L R and S into
53943 diff --git a/fs/reiserfs/item_ops.c b/fs/reiserfs/item_ops.c
53944 index 72cb1cc..d0e3181 100644
53945 --- a/fs/reiserfs/item_ops.c
53946 +++ b/fs/reiserfs/item_ops.c
53947 @@ -102,7 +102,7 @@ static void sd_print_vi(struct virtual_item *vi)
53948 vi->vi_index, vi->vi_type, vi->vi_ih);
53949 }
53950
53951 -static struct item_operations stat_data_ops = {
53952 +static const struct item_operations stat_data_ops = {
53953 .bytes_number = sd_bytes_number,
53954 .decrement_key = sd_decrement_key,
53955 .is_left_mergeable = sd_is_left_mergeable,
53956 @@ -196,7 +196,7 @@ static void direct_print_vi(struct virtual_item *vi)
53957 vi->vi_index, vi->vi_type, vi->vi_ih);
53958 }
53959
53960 -static struct item_operations direct_ops = {
53961 +static const struct item_operations direct_ops = {
53962 .bytes_number = direct_bytes_number,
53963 .decrement_key = direct_decrement_key,
53964 .is_left_mergeable = direct_is_left_mergeable,
53965 @@ -341,7 +341,7 @@ static void indirect_print_vi(struct virtual_item *vi)
53966 vi->vi_index, vi->vi_type, vi->vi_ih);
53967 }
53968
53969 -static struct item_operations indirect_ops = {
53970 +static const struct item_operations indirect_ops = {
53971 .bytes_number = indirect_bytes_number,
53972 .decrement_key = indirect_decrement_key,
53973 .is_left_mergeable = indirect_is_left_mergeable,
53974 @@ -628,7 +628,7 @@ static void direntry_print_vi(struct virtual_item *vi)
53975 printk("\n");
53976 }
53977
53978 -static struct item_operations direntry_ops = {
53979 +static const struct item_operations direntry_ops = {
53980 .bytes_number = direntry_bytes_number,
53981 .decrement_key = direntry_decrement_key,
53982 .is_left_mergeable = direntry_is_left_mergeable,
53983 @@ -724,7 +724,7 @@ static void errcatch_print_vi(struct virtual_item *vi)
53984 "Invalid item type observed, run fsck ASAP");
53985 }
53986
53987 -static struct item_operations errcatch_ops = {
53988 +static const struct item_operations errcatch_ops = {
53989 errcatch_bytes_number,
53990 errcatch_decrement_key,
53991 errcatch_is_left_mergeable,
53992 @@ -746,7 +746,7 @@ static struct item_operations errcatch_ops = {
53993 #error Item types must use disk-format assigned values.
53994 #endif
53995
53996 -struct item_operations *item_ops[TYPE_ANY + 1] = {
53997 +const struct item_operations * const item_ops[TYPE_ANY + 1] = {
53998 &stat_data_ops,
53999 &indirect_ops,
54000 &direct_ops,
54001 diff --git a/fs/reiserfs/journal.c b/fs/reiserfs/journal.c
54002 index b5fe0aa..e0e25c4 100644
54003 --- a/fs/reiserfs/journal.c
54004 +++ b/fs/reiserfs/journal.c
54005 @@ -2329,6 +2329,8 @@ static struct buffer_head *reiserfs_breada(struct block_device *dev,
54006 struct buffer_head *bh;
54007 int i, j;
54008
54009 + pax_track_stack();
54010 +
54011 bh = __getblk(dev, block, bufsize);
54012 if (buffer_uptodate(bh))
54013 return (bh);
54014 diff --git a/fs/reiserfs/namei.c b/fs/reiserfs/namei.c
54015 index 2715791..b8996db 100644
54016 --- a/fs/reiserfs/namei.c
54017 +++ b/fs/reiserfs/namei.c
54018 @@ -1214,6 +1214,8 @@ static int reiserfs_rename(struct inode *old_dir, struct dentry *old_dentry,
54019 unsigned long savelink = 1;
54020 struct timespec ctime;
54021
54022 + pax_track_stack();
54023 +
54024 /* three balancings: (1) old name removal, (2) new name insertion
54025 and (3) maybe "save" link insertion
54026 stat data updates: (1) old directory,
54027 diff --git a/fs/reiserfs/procfs.c b/fs/reiserfs/procfs.c
54028 index 9229e55..3d2e3b7 100644
54029 --- a/fs/reiserfs/procfs.c
54030 +++ b/fs/reiserfs/procfs.c
54031 @@ -123,7 +123,7 @@ static int show_super(struct seq_file *m, struct super_block *sb)
54032 "SMALL_TAILS " : "NO_TAILS ",
54033 replay_only(sb) ? "REPLAY_ONLY " : "",
54034 convert_reiserfs(sb) ? "CONV " : "",
54035 - atomic_read(&r->s_generation_counter),
54036 + atomic_read_unchecked(&r->s_generation_counter),
54037 SF(s_disk_reads), SF(s_disk_writes), SF(s_fix_nodes),
54038 SF(s_do_balance), SF(s_unneeded_left_neighbor),
54039 SF(s_good_search_by_key_reada), SF(s_bmaps),
54040 @@ -309,6 +309,8 @@ static int show_journal(struct seq_file *m, struct super_block *sb)
54041 struct journal_params *jp = &rs->s_v1.s_journal;
54042 char b[BDEVNAME_SIZE];
54043
54044 + pax_track_stack();
54045 +
54046 seq_printf(m, /* on-disk fields */
54047 "jp_journal_1st_block: \t%i\n"
54048 "jp_journal_dev: \t%s[%x]\n"
54049 diff --git a/fs/reiserfs/stree.c b/fs/reiserfs/stree.c
54050 index d036ee5..4c7dca1 100644
54051 --- a/fs/reiserfs/stree.c
54052 +++ b/fs/reiserfs/stree.c
54053 @@ -1159,6 +1159,8 @@ int reiserfs_delete_item(struct reiserfs_transaction_handle *th,
54054 int iter = 0;
54055 #endif
54056
54057 + pax_track_stack();
54058 +
54059 BUG_ON(!th->t_trans_id);
54060
54061 init_tb_struct(th, &s_del_balance, sb, path,
54062 @@ -1296,6 +1298,8 @@ void reiserfs_delete_solid_item(struct reiserfs_transaction_handle *th,
54063 int retval;
54064 int quota_cut_bytes = 0;
54065
54066 + pax_track_stack();
54067 +
54068 BUG_ON(!th->t_trans_id);
54069
54070 le_key2cpu_key(&cpu_key, key);
54071 @@ -1525,6 +1529,8 @@ int reiserfs_cut_from_item(struct reiserfs_transaction_handle *th,
54072 int quota_cut_bytes;
54073 loff_t tail_pos = 0;
54074
54075 + pax_track_stack();
54076 +
54077 BUG_ON(!th->t_trans_id);
54078
54079 init_tb_struct(th, &s_cut_balance, inode->i_sb, path,
54080 @@ -1920,6 +1926,8 @@ int reiserfs_paste_into_item(struct reiserfs_transaction_handle *th, struct tree
54081 int retval;
54082 int fs_gen;
54083
54084 + pax_track_stack();
54085 +
54086 BUG_ON(!th->t_trans_id);
54087
54088 fs_gen = get_generation(inode->i_sb);
54089 @@ -2007,6 +2015,8 @@ int reiserfs_insert_item(struct reiserfs_transaction_handle *th,
54090 int fs_gen = 0;
54091 int quota_bytes = 0;
54092
54093 + pax_track_stack();
54094 +
54095 BUG_ON(!th->t_trans_id);
54096
54097 if (inode) { /* Do we count quotas for item? */
54098 diff --git a/fs/reiserfs/super.c b/fs/reiserfs/super.c
54099 index 7cb1285..c726cd0 100644
54100 --- a/fs/reiserfs/super.c
54101 +++ b/fs/reiserfs/super.c
54102 @@ -916,6 +916,8 @@ static int reiserfs_parse_options(struct super_block *s, char *options, /* strin
54103 {.option_name = NULL}
54104 };
54105
54106 + pax_track_stack();
54107 +
54108 *blocks = 0;
54109 if (!options || !*options)
54110 /* use default configuration: create tails, journaling on, no
54111 diff --git a/fs/select.c b/fs/select.c
54112 index fd38ce2..f5381b8 100644
54113 --- a/fs/select.c
54114 +++ b/fs/select.c
54115 @@ -20,6 +20,7 @@
54116 #include <linux/module.h>
54117 #include <linux/slab.h>
54118 #include <linux/poll.h>
54119 +#include <linux/security.h>
54120 #include <linux/personality.h> /* for STICKY_TIMEOUTS */
54121 #include <linux/file.h>
54122 #include <linux/fdtable.h>
54123 @@ -401,6 +402,8 @@ int do_select(int n, fd_set_bits *fds, struct timespec *end_time)
54124 int retval, i, timed_out = 0;
54125 unsigned long slack = 0;
54126
54127 + pax_track_stack();
54128 +
54129 rcu_read_lock();
54130 retval = max_select_fd(n, fds);
54131 rcu_read_unlock();
54132 @@ -529,6 +532,8 @@ int core_sys_select(int n, fd_set __user *inp, fd_set __user *outp,
54133 /* Allocate small arguments on the stack to save memory and be faster */
54134 long stack_fds[SELECT_STACK_ALLOC/sizeof(long)];
54135
54136 + pax_track_stack();
54137 +
54138 ret = -EINVAL;
54139 if (n < 0)
54140 goto out_nofds;
54141 @@ -821,6 +826,9 @@ int do_sys_poll(struct pollfd __user *ufds, unsigned int nfds,
54142 struct poll_list *walk = head;
54143 unsigned long todo = nfds;
54144
54145 + pax_track_stack();
54146 +
54147 + gr_learn_resource(current, RLIMIT_NOFILE, nfds, 1);
54148 if (nfds > current->signal->rlim[RLIMIT_NOFILE].rlim_cur)
54149 return -EINVAL;
54150
54151 diff --git a/fs/seq_file.c b/fs/seq_file.c
54152 index eae7d9d..679f099 100644
54153 --- a/fs/seq_file.c
54154 +++ b/fs/seq_file.c
54155 @@ -76,7 +76,8 @@ static int traverse(struct seq_file *m, loff_t offset)
54156 return 0;
54157 }
54158 if (!m->buf) {
54159 - m->buf = kmalloc(m->size = PAGE_SIZE, GFP_KERNEL);
54160 + m->size = PAGE_SIZE;
54161 + m->buf = kmalloc(PAGE_SIZE, GFP_KERNEL);
54162 if (!m->buf)
54163 return -ENOMEM;
54164 }
54165 @@ -116,7 +117,8 @@ static int traverse(struct seq_file *m, loff_t offset)
54166 Eoverflow:
54167 m->op->stop(m, p);
54168 kfree(m->buf);
54169 - m->buf = kmalloc(m->size <<= 1, GFP_KERNEL);
54170 + m->size <<= 1;
54171 + m->buf = kmalloc(m->size, GFP_KERNEL);
54172 return !m->buf ? -ENOMEM : -EAGAIN;
54173 }
54174
54175 @@ -169,7 +171,8 @@ ssize_t seq_read(struct file *file, char __user *buf, size_t size, loff_t *ppos)
54176 m->version = file->f_version;
54177 /* grab buffer if we didn't have one */
54178 if (!m->buf) {
54179 - m->buf = kmalloc(m->size = PAGE_SIZE, GFP_KERNEL);
54180 + m->size = PAGE_SIZE;
54181 + m->buf = kmalloc(PAGE_SIZE, GFP_KERNEL);
54182 if (!m->buf)
54183 goto Enomem;
54184 }
54185 @@ -210,7 +213,8 @@ ssize_t seq_read(struct file *file, char __user *buf, size_t size, loff_t *ppos)
54186 goto Fill;
54187 m->op->stop(m, p);
54188 kfree(m->buf);
54189 - m->buf = kmalloc(m->size <<= 1, GFP_KERNEL);
54190 + m->size <<= 1;
54191 + m->buf = kmalloc(m->size, GFP_KERNEL);
54192 if (!m->buf)
54193 goto Enomem;
54194 m->count = 0;
54195 @@ -551,7 +555,7 @@ static void single_stop(struct seq_file *p, void *v)
54196 int single_open(struct file *file, int (*show)(struct seq_file *, void *),
54197 void *data)
54198 {
54199 - struct seq_operations *op = kmalloc(sizeof(*op), GFP_KERNEL);
54200 + seq_operations_no_const *op = kmalloc(sizeof(*op), GFP_KERNEL);
54201 int res = -ENOMEM;
54202
54203 if (op) {
54204 diff --git a/fs/smbfs/proc.c b/fs/smbfs/proc.c
54205 index 71c29b6..54694dd 100644
54206 --- a/fs/smbfs/proc.c
54207 +++ b/fs/smbfs/proc.c
54208 @@ -266,9 +266,9 @@ int smb_setcodepage(struct smb_sb_info *server, struct smb_nls_codepage *cp)
54209
54210 out:
54211 if (server->local_nls != NULL && server->remote_nls != NULL)
54212 - server->ops->convert = convert_cp;
54213 + *(void **)&server->ops->convert = convert_cp;
54214 else
54215 - server->ops->convert = convert_memcpy;
54216 + *(void **)&server->ops->convert = convert_memcpy;
54217
54218 smb_unlock_server(server);
54219 return n;
54220 @@ -933,9 +933,9 @@ smb_newconn(struct smb_sb_info *server, struct smb_conn_opt *opt)
54221
54222 /* FIXME: the win9x code wants to modify these ... (seek/trunc bug) */
54223 if (server->mnt->flags & SMB_MOUNT_OLDATTR) {
54224 - server->ops->getattr = smb_proc_getattr_core;
54225 + *(void **)&server->ops->getattr = smb_proc_getattr_core;
54226 } else if (server->mnt->flags & SMB_MOUNT_DIRATTR) {
54227 - server->ops->getattr = smb_proc_getattr_ff;
54228 + *(void **)&server->ops->getattr = smb_proc_getattr_ff;
54229 }
54230
54231 /* Decode server capabilities */
54232 @@ -3439,7 +3439,7 @@ out:
54233 static void
54234 install_ops(struct smb_ops *dst, struct smb_ops *src)
54235 {
54236 - memcpy(dst, src, sizeof(void *) * SMB_OPS_NUM_STATIC);
54237 + memcpy((void *)dst, src, sizeof(void *) * SMB_OPS_NUM_STATIC);
54238 }
54239
54240 /* < LANMAN2 */
54241 diff --git a/fs/smbfs/symlink.c b/fs/smbfs/symlink.c
54242 index 00b2909..2ace383 100644
54243 --- a/fs/smbfs/symlink.c
54244 +++ b/fs/smbfs/symlink.c
54245 @@ -55,7 +55,7 @@ static void *smb_follow_link(struct dentry *dentry, struct nameidata *nd)
54246
54247 static void smb_put_link(struct dentry *dentry, struct nameidata *nd, void *p)
54248 {
54249 - char *s = nd_get_link(nd);
54250 + const char *s = nd_get_link(nd);
54251 if (!IS_ERR(s))
54252 __putname(s);
54253 }
54254 diff --git a/fs/splice.c b/fs/splice.c
54255 index bb92b7c..5aa72b0 100644
54256 --- a/fs/splice.c
54257 +++ b/fs/splice.c
54258 @@ -185,7 +185,7 @@ ssize_t splice_to_pipe(struct pipe_inode_info *pipe,
54259 pipe_lock(pipe);
54260
54261 for (;;) {
54262 - if (!pipe->readers) {
54263 + if (!atomic_read(&pipe->readers)) {
54264 send_sig(SIGPIPE, current, 0);
54265 if (!ret)
54266 ret = -EPIPE;
54267 @@ -239,9 +239,9 @@ ssize_t splice_to_pipe(struct pipe_inode_info *pipe,
54268 do_wakeup = 0;
54269 }
54270
54271 - pipe->waiting_writers++;
54272 + atomic_inc(&pipe->waiting_writers);
54273 pipe_wait(pipe);
54274 - pipe->waiting_writers--;
54275 + atomic_dec(&pipe->waiting_writers);
54276 }
54277
54278 pipe_unlock(pipe);
54279 @@ -285,6 +285,8 @@ __generic_file_splice_read(struct file *in, loff_t *ppos,
54280 .spd_release = spd_release_page,
54281 };
54282
54283 + pax_track_stack();
54284 +
54285 index = *ppos >> PAGE_CACHE_SHIFT;
54286 loff = *ppos & ~PAGE_CACHE_MASK;
54287 req_pages = (len + loff + PAGE_CACHE_SIZE - 1) >> PAGE_CACHE_SHIFT;
54288 @@ -521,7 +523,7 @@ static ssize_t kernel_readv(struct file *file, const struct iovec *vec,
54289 old_fs = get_fs();
54290 set_fs(get_ds());
54291 /* The cast to a user pointer is valid due to the set_fs() */
54292 - res = vfs_readv(file, (const struct iovec __user *)vec, vlen, &pos);
54293 + res = vfs_readv(file, (const struct iovec __force_user *)vec, vlen, &pos);
54294 set_fs(old_fs);
54295
54296 return res;
54297 @@ -536,7 +538,7 @@ static ssize_t kernel_write(struct file *file, const char *buf, size_t count,
54298 old_fs = get_fs();
54299 set_fs(get_ds());
54300 /* The cast to a user pointer is valid due to the set_fs() */
54301 - res = vfs_write(file, (const char __user *)buf, count, &pos);
54302 + res = vfs_write(file, (const char __force_user *)buf, count, &pos);
54303 set_fs(old_fs);
54304
54305 return res;
54306 @@ -565,6 +567,8 @@ ssize_t default_file_splice_read(struct file *in, loff_t *ppos,
54307 .spd_release = spd_release_page,
54308 };
54309
54310 + pax_track_stack();
54311 +
54312 index = *ppos >> PAGE_CACHE_SHIFT;
54313 offset = *ppos & ~PAGE_CACHE_MASK;
54314 nr_pages = (len + offset + PAGE_CACHE_SIZE - 1) >> PAGE_CACHE_SHIFT;
54315 @@ -578,7 +582,7 @@ ssize_t default_file_splice_read(struct file *in, loff_t *ppos,
54316 goto err;
54317
54318 this_len = min_t(size_t, len, PAGE_CACHE_SIZE - offset);
54319 - vec[i].iov_base = (void __user *) page_address(page);
54320 + vec[i].iov_base = (__force void __user *) page_address(page);
54321 vec[i].iov_len = this_len;
54322 pages[i] = page;
54323 spd.nr_pages++;
54324 @@ -800,10 +804,10 @@ EXPORT_SYMBOL(splice_from_pipe_feed);
54325 int splice_from_pipe_next(struct pipe_inode_info *pipe, struct splice_desc *sd)
54326 {
54327 while (!pipe->nrbufs) {
54328 - if (!pipe->writers)
54329 + if (!atomic_read(&pipe->writers))
54330 return 0;
54331
54332 - if (!pipe->waiting_writers && sd->num_spliced)
54333 + if (!atomic_read(&pipe->waiting_writers) && sd->num_spliced)
54334 return 0;
54335
54336 if (sd->flags & SPLICE_F_NONBLOCK)
54337 @@ -1140,7 +1144,7 @@ ssize_t splice_direct_to_actor(struct file *in, struct splice_desc *sd,
54338 * out of the pipe right after the splice_to_pipe(). So set
54339 * PIPE_READERS appropriately.
54340 */
54341 - pipe->readers = 1;
54342 + atomic_set(&pipe->readers, 1);
54343
54344 current->splice_pipe = pipe;
54345 }
54346 @@ -1593,6 +1597,8 @@ static long vmsplice_to_pipe(struct file *file, const struct iovec __user *iov,
54347 .spd_release = spd_release_page,
54348 };
54349
54350 + pax_track_stack();
54351 +
54352 pipe = pipe_info(file->f_path.dentry->d_inode);
54353 if (!pipe)
54354 return -EBADF;
54355 @@ -1701,9 +1707,9 @@ static int ipipe_prep(struct pipe_inode_info *pipe, unsigned int flags)
54356 ret = -ERESTARTSYS;
54357 break;
54358 }
54359 - if (!pipe->writers)
54360 + if (!atomic_read(&pipe->writers))
54361 break;
54362 - if (!pipe->waiting_writers) {
54363 + if (!atomic_read(&pipe->waiting_writers)) {
54364 if (flags & SPLICE_F_NONBLOCK) {
54365 ret = -EAGAIN;
54366 break;
54367 @@ -1735,7 +1741,7 @@ static int opipe_prep(struct pipe_inode_info *pipe, unsigned int flags)
54368 pipe_lock(pipe);
54369
54370 while (pipe->nrbufs >= PIPE_BUFFERS) {
54371 - if (!pipe->readers) {
54372 + if (!atomic_read(&pipe->readers)) {
54373 send_sig(SIGPIPE, current, 0);
54374 ret = -EPIPE;
54375 break;
54376 @@ -1748,9 +1754,9 @@ static int opipe_prep(struct pipe_inode_info *pipe, unsigned int flags)
54377 ret = -ERESTARTSYS;
54378 break;
54379 }
54380 - pipe->waiting_writers++;
54381 + atomic_inc(&pipe->waiting_writers);
54382 pipe_wait(pipe);
54383 - pipe->waiting_writers--;
54384 + atomic_dec(&pipe->waiting_writers);
54385 }
54386
54387 pipe_unlock(pipe);
54388 @@ -1786,14 +1792,14 @@ retry:
54389 pipe_double_lock(ipipe, opipe);
54390
54391 do {
54392 - if (!opipe->readers) {
54393 + if (!atomic_read(&opipe->readers)) {
54394 send_sig(SIGPIPE, current, 0);
54395 if (!ret)
54396 ret = -EPIPE;
54397 break;
54398 }
54399
54400 - if (!ipipe->nrbufs && !ipipe->writers)
54401 + if (!ipipe->nrbufs && !atomic_read(&ipipe->writers))
54402 break;
54403
54404 /*
54405 @@ -1893,7 +1899,7 @@ static int link_pipe(struct pipe_inode_info *ipipe,
54406 pipe_double_lock(ipipe, opipe);
54407
54408 do {
54409 - if (!opipe->readers) {
54410 + if (!atomic_read(&opipe->readers)) {
54411 send_sig(SIGPIPE, current, 0);
54412 if (!ret)
54413 ret = -EPIPE;
54414 @@ -1938,7 +1944,7 @@ static int link_pipe(struct pipe_inode_info *ipipe,
54415 * return EAGAIN if we have the potential of some data in the
54416 * future, otherwise just return 0
54417 */
54418 - if (!ret && ipipe->waiting_writers && (flags & SPLICE_F_NONBLOCK))
54419 + if (!ret && atomic_read(&ipipe->waiting_writers) && (flags & SPLICE_F_NONBLOCK))
54420 ret = -EAGAIN;
54421
54422 pipe_unlock(ipipe);
54423 diff --git a/fs/sysfs/file.c b/fs/sysfs/file.c
54424 index 7118a38..70af853 100644
54425 --- a/fs/sysfs/file.c
54426 +++ b/fs/sysfs/file.c
54427 @@ -44,7 +44,7 @@ static DEFINE_SPINLOCK(sysfs_open_dirent_lock);
54428
54429 struct sysfs_open_dirent {
54430 atomic_t refcnt;
54431 - atomic_t event;
54432 + atomic_unchecked_t event;
54433 wait_queue_head_t poll;
54434 struct list_head buffers; /* goes through sysfs_buffer.list */
54435 };
54436 @@ -53,7 +53,7 @@ struct sysfs_buffer {
54437 size_t count;
54438 loff_t pos;
54439 char * page;
54440 - struct sysfs_ops * ops;
54441 + const struct sysfs_ops * ops;
54442 struct mutex mutex;
54443 int needs_read_fill;
54444 int event;
54445 @@ -75,7 +75,7 @@ static int fill_read_buffer(struct dentry * dentry, struct sysfs_buffer * buffer
54446 {
54447 struct sysfs_dirent *attr_sd = dentry->d_fsdata;
54448 struct kobject *kobj = attr_sd->s_parent->s_dir.kobj;
54449 - struct sysfs_ops * ops = buffer->ops;
54450 + const struct sysfs_ops * ops = buffer->ops;
54451 int ret = 0;
54452 ssize_t count;
54453
54454 @@ -88,7 +88,7 @@ static int fill_read_buffer(struct dentry * dentry, struct sysfs_buffer * buffer
54455 if (!sysfs_get_active_two(attr_sd))
54456 return -ENODEV;
54457
54458 - buffer->event = atomic_read(&attr_sd->s_attr.open->event);
54459 + buffer->event = atomic_read_unchecked(&attr_sd->s_attr.open->event);
54460 count = ops->show(kobj, attr_sd->s_attr.attr, buffer->page);
54461
54462 sysfs_put_active_two(attr_sd);
54463 @@ -199,7 +199,7 @@ flush_write_buffer(struct dentry * dentry, struct sysfs_buffer * buffer, size_t
54464 {
54465 struct sysfs_dirent *attr_sd = dentry->d_fsdata;
54466 struct kobject *kobj = attr_sd->s_parent->s_dir.kobj;
54467 - struct sysfs_ops * ops = buffer->ops;
54468 + const struct sysfs_ops * ops = buffer->ops;
54469 int rc;
54470
54471 /* need attr_sd for attr and ops, its parent for kobj */
54472 @@ -294,7 +294,7 @@ static int sysfs_get_open_dirent(struct sysfs_dirent *sd,
54473 return -ENOMEM;
54474
54475 atomic_set(&new_od->refcnt, 0);
54476 - atomic_set(&new_od->event, 1);
54477 + atomic_set_unchecked(&new_od->event, 1);
54478 init_waitqueue_head(&new_od->poll);
54479 INIT_LIST_HEAD(&new_od->buffers);
54480 goto retry;
54481 @@ -335,7 +335,7 @@ static int sysfs_open_file(struct inode *inode, struct file *file)
54482 struct sysfs_dirent *attr_sd = file->f_path.dentry->d_fsdata;
54483 struct kobject *kobj = attr_sd->s_parent->s_dir.kobj;
54484 struct sysfs_buffer *buffer;
54485 - struct sysfs_ops *ops;
54486 + const struct sysfs_ops *ops;
54487 int error = -EACCES;
54488 char *p;
54489
54490 @@ -444,7 +444,7 @@ static unsigned int sysfs_poll(struct file *filp, poll_table *wait)
54491
54492 sysfs_put_active_two(attr_sd);
54493
54494 - if (buffer->event != atomic_read(&od->event))
54495 + if (buffer->event != atomic_read_unchecked(&od->event))
54496 goto trigger;
54497
54498 return DEFAULT_POLLMASK;
54499 @@ -463,7 +463,7 @@ void sysfs_notify_dirent(struct sysfs_dirent *sd)
54500
54501 od = sd->s_attr.open;
54502 if (od) {
54503 - atomic_inc(&od->event);
54504 + atomic_inc_unchecked(&od->event);
54505 wake_up_interruptible(&od->poll);
54506 }
54507
54508 diff --git a/fs/sysfs/mount.c b/fs/sysfs/mount.c
54509 index 4974995..c26609c 100644
54510 --- a/fs/sysfs/mount.c
54511 +++ b/fs/sysfs/mount.c
54512 @@ -36,7 +36,11 @@ struct sysfs_dirent sysfs_root = {
54513 .s_name = "",
54514 .s_count = ATOMIC_INIT(1),
54515 .s_flags = SYSFS_DIR,
54516 +#ifdef CONFIG_GRKERNSEC_SYSFS_RESTRICT
54517 + .s_mode = S_IFDIR | S_IRWXU,
54518 +#else
54519 .s_mode = S_IFDIR | S_IRWXU | S_IRUGO | S_IXUGO,
54520 +#endif
54521 .s_ino = 1,
54522 };
54523
54524 diff --git a/fs/sysfs/symlink.c b/fs/sysfs/symlink.c
54525 index c5081ad..342ea86 100644
54526 --- a/fs/sysfs/symlink.c
54527 +++ b/fs/sysfs/symlink.c
54528 @@ -204,7 +204,7 @@ static void *sysfs_follow_link(struct dentry *dentry, struct nameidata *nd)
54529
54530 static void sysfs_put_link(struct dentry *dentry, struct nameidata *nd, void *cookie)
54531 {
54532 - char *page = nd_get_link(nd);
54533 + const char *page = nd_get_link(nd);
54534 if (!IS_ERR(page))
54535 free_page((unsigned long)page);
54536 }
54537 diff --git a/fs/udf/balloc.c b/fs/udf/balloc.c
54538 index 1e06853..b06d325 100644
54539 --- a/fs/udf/balloc.c
54540 +++ b/fs/udf/balloc.c
54541 @@ -172,9 +172,7 @@ static void udf_bitmap_free_blocks(struct super_block *sb,
54542
54543 mutex_lock(&sbi->s_alloc_mutex);
54544 partmap = &sbi->s_partmaps[bloc->partitionReferenceNum];
54545 - if (bloc->logicalBlockNum < 0 ||
54546 - (bloc->logicalBlockNum + count) >
54547 - partmap->s_partition_len) {
54548 + if ((bloc->logicalBlockNum + count) > partmap->s_partition_len) {
54549 udf_debug("%d < %d || %d + %d > %d\n",
54550 bloc->logicalBlockNum, 0, bloc->logicalBlockNum,
54551 count, partmap->s_partition_len);
54552 @@ -436,9 +434,7 @@ static void udf_table_free_blocks(struct super_block *sb,
54553
54554 mutex_lock(&sbi->s_alloc_mutex);
54555 partmap = &sbi->s_partmaps[bloc->partitionReferenceNum];
54556 - if (bloc->logicalBlockNum < 0 ||
54557 - (bloc->logicalBlockNum + count) >
54558 - partmap->s_partition_len) {
54559 + if ((bloc->logicalBlockNum + count) > partmap->s_partition_len) {
54560 udf_debug("%d < %d || %d + %d > %d\n",
54561 bloc.logicalBlockNum, 0, bloc.logicalBlockNum, count,
54562 partmap->s_partition_len);
54563 diff --git a/fs/udf/inode.c b/fs/udf/inode.c
54564 index 6d24c2c..fff470f 100644
54565 --- a/fs/udf/inode.c
54566 +++ b/fs/udf/inode.c
54567 @@ -484,6 +484,8 @@ static struct buffer_head *inode_getblk(struct inode *inode, sector_t block,
54568 int goal = 0, pgoal = iinfo->i_location.logicalBlockNum;
54569 int lastblock = 0;
54570
54571 + pax_track_stack();
54572 +
54573 prev_epos.offset = udf_file_entry_alloc_offset(inode);
54574 prev_epos.block = iinfo->i_location;
54575 prev_epos.bh = NULL;
54576 diff --git a/fs/udf/misc.c b/fs/udf/misc.c
54577 index 9215700..bf1f68e 100644
54578 --- a/fs/udf/misc.c
54579 +++ b/fs/udf/misc.c
54580 @@ -286,7 +286,7 @@ void udf_new_tag(char *data, uint16_t ident, uint16_t version, uint16_t snum,
54581
54582 u8 udf_tag_checksum(const struct tag *t)
54583 {
54584 - u8 *data = (u8 *)t;
54585 + const u8 *data = (const u8 *)t;
54586 u8 checksum = 0;
54587 int i;
54588 for (i = 0; i < sizeof(struct tag); ++i)
54589 diff --git a/fs/utimes.c b/fs/utimes.c
54590 index e4c75db..b4df0e0 100644
54591 --- a/fs/utimes.c
54592 +++ b/fs/utimes.c
54593 @@ -1,6 +1,7 @@
54594 #include <linux/compiler.h>
54595 #include <linux/file.h>
54596 #include <linux/fs.h>
54597 +#include <linux/security.h>
54598 #include <linux/linkage.h>
54599 #include <linux/mount.h>
54600 #include <linux/namei.h>
54601 @@ -101,6 +102,12 @@ static int utimes_common(struct path *path, struct timespec *times)
54602 goto mnt_drop_write_and_out;
54603 }
54604 }
54605 +
54606 + if (!gr_acl_handle_utime(path->dentry, path->mnt)) {
54607 + error = -EACCES;
54608 + goto mnt_drop_write_and_out;
54609 + }
54610 +
54611 mutex_lock(&inode->i_mutex);
54612 error = notify_change(path->dentry, &newattrs);
54613 mutex_unlock(&inode->i_mutex);
54614 diff --git a/fs/xattr.c b/fs/xattr.c
54615 index 6d4f6d3..cda3958 100644
54616 --- a/fs/xattr.c
54617 +++ b/fs/xattr.c
54618 @@ -247,7 +247,7 @@ EXPORT_SYMBOL_GPL(vfs_removexattr);
54619 * Extended attribute SET operations
54620 */
54621 static long
54622 -setxattr(struct dentry *d, const char __user *name, const void __user *value,
54623 +setxattr(struct path *path, const char __user *name, const void __user *value,
54624 size_t size, int flags)
54625 {
54626 int error;
54627 @@ -271,7 +271,13 @@ setxattr(struct dentry *d, const char __user *name, const void __user *value,
54628 return PTR_ERR(kvalue);
54629 }
54630
54631 - error = vfs_setxattr(d, kname, kvalue, size, flags);
54632 + if (!gr_acl_handle_setxattr(path->dentry, path->mnt)) {
54633 + error = -EACCES;
54634 + goto out;
54635 + }
54636 +
54637 + error = vfs_setxattr(path->dentry, kname, kvalue, size, flags);
54638 +out:
54639 kfree(kvalue);
54640 return error;
54641 }
54642 @@ -288,7 +294,7 @@ SYSCALL_DEFINE5(setxattr, const char __user *, pathname,
54643 return error;
54644 error = mnt_want_write(path.mnt);
54645 if (!error) {
54646 - error = setxattr(path.dentry, name, value, size, flags);
54647 + error = setxattr(&path, name, value, size, flags);
54648 mnt_drop_write(path.mnt);
54649 }
54650 path_put(&path);
54651 @@ -307,7 +313,7 @@ SYSCALL_DEFINE5(lsetxattr, const char __user *, pathname,
54652 return error;
54653 error = mnt_want_write(path.mnt);
54654 if (!error) {
54655 - error = setxattr(path.dentry, name, value, size, flags);
54656 + error = setxattr(&path, name, value, size, flags);
54657 mnt_drop_write(path.mnt);
54658 }
54659 path_put(&path);
54660 @@ -318,17 +324,15 @@ SYSCALL_DEFINE5(fsetxattr, int, fd, const char __user *, name,
54661 const void __user *,value, size_t, size, int, flags)
54662 {
54663 struct file *f;
54664 - struct dentry *dentry;
54665 int error = -EBADF;
54666
54667 f = fget(fd);
54668 if (!f)
54669 return error;
54670 - dentry = f->f_path.dentry;
54671 - audit_inode(NULL, dentry);
54672 + audit_inode(NULL, f->f_path.dentry);
54673 error = mnt_want_write_file(f);
54674 if (!error) {
54675 - error = setxattr(dentry, name, value, size, flags);
54676 + error = setxattr(&f->f_path, name, value, size, flags);
54677 mnt_drop_write(f->f_path.mnt);
54678 }
54679 fput(f);
54680 diff --git a/fs/xattr_acl.c b/fs/xattr_acl.c
54681 index c6ad7c7..f2847a7 100644
54682 --- a/fs/xattr_acl.c
54683 +++ b/fs/xattr_acl.c
54684 @@ -17,8 +17,8 @@
54685 struct posix_acl *
54686 posix_acl_from_xattr(const void *value, size_t size)
54687 {
54688 - posix_acl_xattr_header *header = (posix_acl_xattr_header *)value;
54689 - posix_acl_xattr_entry *entry = (posix_acl_xattr_entry *)(header+1), *end;
54690 + const posix_acl_xattr_header *header = (const posix_acl_xattr_header *)value;
54691 + const posix_acl_xattr_entry *entry = (const posix_acl_xattr_entry *)(header+1), *end;
54692 int count;
54693 struct posix_acl *acl;
54694 struct posix_acl_entry *acl_e;
54695 diff --git a/fs/xfs/linux-2.6/xfs_ioctl.c b/fs/xfs/linux-2.6/xfs_ioctl.c
54696 index 942362f..88f96f5 100644
54697 --- a/fs/xfs/linux-2.6/xfs_ioctl.c
54698 +++ b/fs/xfs/linux-2.6/xfs_ioctl.c
54699 @@ -134,7 +134,7 @@ xfs_find_handle(
54700 }
54701
54702 error = -EFAULT;
54703 - if (copy_to_user(hreq->ohandle, &handle, hsize) ||
54704 + if (hsize > sizeof handle || copy_to_user(hreq->ohandle, &handle, hsize) ||
54705 copy_to_user(hreq->ohandlen, &hsize, sizeof(__s32)))
54706 goto out_put;
54707
54708 @@ -423,7 +423,7 @@ xfs_attrlist_by_handle(
54709 if (IS_ERR(dentry))
54710 return PTR_ERR(dentry);
54711
54712 - kbuf = kmalloc(al_hreq.buflen, GFP_KERNEL);
54713 + kbuf = kzalloc(al_hreq.buflen, GFP_KERNEL);
54714 if (!kbuf)
54715 goto out_dput;
54716
54717 @@ -697,7 +697,7 @@ xfs_ioc_fsgeometry_v1(
54718 xfs_mount_t *mp,
54719 void __user *arg)
54720 {
54721 - xfs_fsop_geom_t fsgeo;
54722 + xfs_fsop_geom_t fsgeo;
54723 int error;
54724
54725 error = xfs_fs_geometry(mp, &fsgeo, 3);
54726 diff --git a/fs/xfs/linux-2.6/xfs_ioctl32.c b/fs/xfs/linux-2.6/xfs_ioctl32.c
54727 index bad485a..479bd32 100644
54728 --- a/fs/xfs/linux-2.6/xfs_ioctl32.c
54729 +++ b/fs/xfs/linux-2.6/xfs_ioctl32.c
54730 @@ -75,6 +75,7 @@ xfs_compat_ioc_fsgeometry_v1(
54731 xfs_fsop_geom_t fsgeo;
54732 int error;
54733
54734 + memset(&fsgeo, 0, sizeof(fsgeo));
54735 error = xfs_fs_geometry(mp, &fsgeo, 3);
54736 if (error)
54737 return -error;
54738 diff --git a/fs/xfs/linux-2.6/xfs_iops.c b/fs/xfs/linux-2.6/xfs_iops.c
54739 index 1f3b4b8..6102f6d 100644
54740 --- a/fs/xfs/linux-2.6/xfs_iops.c
54741 +++ b/fs/xfs/linux-2.6/xfs_iops.c
54742 @@ -468,7 +468,7 @@ xfs_vn_put_link(
54743 struct nameidata *nd,
54744 void *p)
54745 {
54746 - char *s = nd_get_link(nd);
54747 + const char *s = nd_get_link(nd);
54748
54749 if (!IS_ERR(s))
54750 kfree(s);
54751 diff --git a/fs/xfs/xfs_bmap.c b/fs/xfs/xfs_bmap.c
54752 index 8971fb0..5fc1eb2 100644
54753 --- a/fs/xfs/xfs_bmap.c
54754 +++ b/fs/xfs/xfs_bmap.c
54755 @@ -360,7 +360,7 @@ xfs_bmap_validate_ret(
54756 int nmap,
54757 int ret_nmap);
54758 #else
54759 -#define xfs_bmap_validate_ret(bno,len,flags,mval,onmap,nmap)
54760 +#define xfs_bmap_validate_ret(bno,len,flags,mval,onmap,nmap) do {} while (0)
54761 #endif /* DEBUG */
54762
54763 #if defined(XFS_RW_TRACE)
54764 diff --git a/fs/xfs/xfs_dir2_sf.c b/fs/xfs/xfs_dir2_sf.c
54765 index e89734e..5e84d8d 100644
54766 --- a/fs/xfs/xfs_dir2_sf.c
54767 +++ b/fs/xfs/xfs_dir2_sf.c
54768 @@ -779,7 +779,15 @@ xfs_dir2_sf_getdents(
54769 }
54770
54771 ino = xfs_dir2_sf_get_inumber(sfp, xfs_dir2_sf_inumberp(sfep));
54772 - if (filldir(dirent, sfep->name, sfep->namelen,
54773 + if (dp->i_df.if_u1.if_data == dp->i_df.if_u2.if_inline_data) {
54774 + char name[sfep->namelen];
54775 + memcpy(name, sfep->name, sfep->namelen);
54776 + if (filldir(dirent, name, sfep->namelen,
54777 + off & 0x7fffffff, ino, DT_UNKNOWN)) {
54778 + *offset = off & 0x7fffffff;
54779 + return 0;
54780 + }
54781 + } else if (filldir(dirent, sfep->name, sfep->namelen,
54782 off & 0x7fffffff, ino, DT_UNKNOWN)) {
54783 *offset = off & 0x7fffffff;
54784 return 0;
54785 diff --git a/fs/xfs/xfs_vnodeops.c b/fs/xfs/xfs_vnodeops.c
54786 index 8f32f50..859e8a3 100644
54787 --- a/fs/xfs/xfs_vnodeops.c
54788 +++ b/fs/xfs/xfs_vnodeops.c
54789 @@ -564,13 +564,17 @@ xfs_readlink(
54790
54791 xfs_ilock(ip, XFS_ILOCK_SHARED);
54792
54793 - ASSERT((ip->i_d.di_mode & S_IFMT) == S_IFLNK);
54794 - ASSERT(ip->i_d.di_size <= MAXPATHLEN);
54795 -
54796 pathlen = ip->i_d.di_size;
54797 if (!pathlen)
54798 goto out;
54799
54800 + if (pathlen > MAXPATHLEN) {
54801 + xfs_fs_cmn_err(CE_ALERT, mp, "%s: inode (%llu) symlink length (%d) too long",
54802 + __func__, (unsigned long long)ip->i_ino, pathlen);
54803 + ASSERT(0);
54804 + return XFS_ERROR(EFSCORRUPTED);
54805 + }
54806 +
54807 if (ip->i_df.if_flags & XFS_IFINLINE) {
54808 memcpy(link, ip->i_df.if_u1.if_data, pathlen);
54809 link[pathlen] = '\0';
54810 diff --git a/grsecurity/Kconfig b/grsecurity/Kconfig
54811 new file mode 100644
54812 index 0000000..f27a8e8
54813 --- /dev/null
54814 +++ b/grsecurity/Kconfig
54815 @@ -0,0 +1,1036 @@
54816 +#
54817 +# grecurity configuration
54818 +#
54819 +
54820 +menu "Grsecurity"
54821 +
54822 +config GRKERNSEC
54823 + bool "Grsecurity"
54824 + select CRYPTO
54825 + select CRYPTO_SHA256
54826 + help
54827 + If you say Y here, you will be able to configure many features
54828 + that will enhance the security of your system. It is highly
54829 + recommended that you say Y here and read through the help
54830 + for each option so that you fully understand the features and
54831 + can evaluate their usefulness for your machine.
54832 +
54833 +choice
54834 + prompt "Security Level"
54835 + depends on GRKERNSEC
54836 + default GRKERNSEC_CUSTOM
54837 +
54838 +config GRKERNSEC_LOW
54839 + bool "Low"
54840 + select GRKERNSEC_LINK
54841 + select GRKERNSEC_FIFO
54842 + select GRKERNSEC_RANDNET
54843 + select GRKERNSEC_DMESG
54844 + select GRKERNSEC_CHROOT
54845 + select GRKERNSEC_CHROOT_CHDIR
54846 +
54847 + help
54848 + If you choose this option, several of the grsecurity options will
54849 + be enabled that will give you greater protection against a number
54850 + of attacks, while assuring that none of your software will have any
54851 + conflicts with the additional security measures. If you run a lot
54852 + of unusual software, or you are having problems with the higher
54853 + security levels, you should say Y here. With this option, the
54854 + following features are enabled:
54855 +
54856 + - Linking restrictions
54857 + - FIFO restrictions
54858 + - Restricted dmesg
54859 + - Enforced chdir("/") on chroot
54860 + - Runtime module disabling
54861 +
54862 +config GRKERNSEC_MEDIUM
54863 + bool "Medium"
54864 + select PAX
54865 + select PAX_EI_PAX
54866 + select PAX_PT_PAX_FLAGS
54867 + select PAX_HAVE_ACL_FLAGS
54868 + select GRKERNSEC_PROC_MEMMAP if (PAX_NOEXEC || PAX_ASLR)
54869 + select GRKERNSEC_CHROOT
54870 + select GRKERNSEC_CHROOT_SYSCTL
54871 + select GRKERNSEC_LINK
54872 + select GRKERNSEC_FIFO
54873 + select GRKERNSEC_DMESG
54874 + select GRKERNSEC_RANDNET
54875 + select GRKERNSEC_FORKFAIL
54876 + select GRKERNSEC_TIME
54877 + select GRKERNSEC_SIGNAL
54878 + select GRKERNSEC_CHROOT
54879 + select GRKERNSEC_CHROOT_UNIX
54880 + select GRKERNSEC_CHROOT_MOUNT
54881 + select GRKERNSEC_CHROOT_PIVOT
54882 + select GRKERNSEC_CHROOT_DOUBLE
54883 + select GRKERNSEC_CHROOT_CHDIR
54884 + select GRKERNSEC_CHROOT_MKNOD
54885 + select GRKERNSEC_PROC
54886 + select GRKERNSEC_PROC_USERGROUP
54887 + select PAX_RANDUSTACK
54888 + select PAX_ASLR
54889 + select PAX_RANDMMAP
54890 + select PAX_REFCOUNT if (X86 || SPARC64)
54891 + select PAX_USERCOPY if ((X86 || SPARC || PPC || ARM) && (SLAB || SLUB || SLOB))
54892 +
54893 + help
54894 + If you say Y here, several features in addition to those included
54895 + in the low additional security level will be enabled. These
54896 + features provide even more security to your system, though in rare
54897 + cases they may be incompatible with very old or poorly written
54898 + software. If you enable this option, make sure that your auth
54899 + service (identd) is running as gid 1001. With this option,
54900 + the following features (in addition to those provided in the
54901 + low additional security level) will be enabled:
54902 +
54903 + - Failed fork logging
54904 + - Time change logging
54905 + - Signal logging
54906 + - Deny mounts in chroot
54907 + - Deny double chrooting
54908 + - Deny sysctl writes in chroot
54909 + - Deny mknod in chroot
54910 + - Deny access to abstract AF_UNIX sockets out of chroot
54911 + - Deny pivot_root in chroot
54912 + - Denied reads/writes of /dev/kmem, /dev/mem, and /dev/port
54913 + - /proc restrictions with special GID set to 10 (usually wheel)
54914 + - Address Space Layout Randomization (ASLR)
54915 + - Prevent exploitation of most refcount overflows
54916 + - Bounds checking of copying between the kernel and userland
54917 +
54918 +config GRKERNSEC_HIGH
54919 + bool "High"
54920 + select GRKERNSEC_LINK
54921 + select GRKERNSEC_FIFO
54922 + select GRKERNSEC_DMESG
54923 + select GRKERNSEC_FORKFAIL
54924 + select GRKERNSEC_TIME
54925 + select GRKERNSEC_SIGNAL
54926 + select GRKERNSEC_CHROOT
54927 + select GRKERNSEC_CHROOT_SHMAT
54928 + select GRKERNSEC_CHROOT_UNIX
54929 + select GRKERNSEC_CHROOT_MOUNT
54930 + select GRKERNSEC_CHROOT_FCHDIR
54931 + select GRKERNSEC_CHROOT_PIVOT
54932 + select GRKERNSEC_CHROOT_DOUBLE
54933 + select GRKERNSEC_CHROOT_CHDIR
54934 + select GRKERNSEC_CHROOT_MKNOD
54935 + select GRKERNSEC_CHROOT_CAPS
54936 + select GRKERNSEC_CHROOT_SYSCTL
54937 + select GRKERNSEC_CHROOT_FINDTASK
54938 + select GRKERNSEC_SYSFS_RESTRICT
54939 + select GRKERNSEC_PROC
54940 + select GRKERNSEC_PROC_MEMMAP if (PAX_NOEXEC || PAX_ASLR)
54941 + select GRKERNSEC_HIDESYM
54942 + select GRKERNSEC_BRUTE
54943 + select GRKERNSEC_PROC_USERGROUP
54944 + select GRKERNSEC_KMEM
54945 + select GRKERNSEC_RESLOG
54946 + select GRKERNSEC_RANDNET
54947 + select GRKERNSEC_PROC_ADD
54948 + select GRKERNSEC_CHROOT_CHMOD
54949 + select GRKERNSEC_CHROOT_NICE
54950 + select GRKERNSEC_AUDIT_MOUNT
54951 + select GRKERNSEC_MODHARDEN if (MODULES)
54952 + select GRKERNSEC_HARDEN_PTRACE
54953 + select GRKERNSEC_VM86 if (X86_32)
54954 + select GRKERNSEC_KERN_LOCKOUT if (X86 || ARM || PPC || SPARC)
54955 + select PAX
54956 + select PAX_RANDUSTACK
54957 + select PAX_ASLR
54958 + select PAX_RANDMMAP
54959 + select PAX_NOEXEC
54960 + select PAX_MPROTECT
54961 + select PAX_EI_PAX
54962 + select PAX_PT_PAX_FLAGS
54963 + select PAX_HAVE_ACL_FLAGS
54964 + select PAX_KERNEXEC if ((PPC || X86) && (!X86_32 || X86_WP_WORKS_OK) && !XEN)
54965 + select PAX_MEMORY_UDEREF if (X86 && !XEN)
54966 + select PAX_RANDKSTACK if (X86_TSC && X86)
54967 + select PAX_SEGMEXEC if (X86_32)
54968 + select PAX_PAGEEXEC
54969 + select PAX_EMUPLT if (ALPHA || PARISC || SPARC)
54970 + select PAX_EMUTRAMP if (PARISC)
54971 + select PAX_EMUSIGRT if (PARISC)
54972 + select PAX_ETEXECRELOCS if (ALPHA || IA64 || PARISC)
54973 + select PAX_ELFRELOCS if (PAX_ETEXECRELOCS || (IA64 || PPC || X86))
54974 + select PAX_REFCOUNT if (X86 || SPARC64)
54975 + select PAX_USERCOPY if ((X86 || SPARC || PPC || ARM) && (SLAB || SLUB || SLOB))
54976 + help
54977 + If you say Y here, many of the features of grsecurity will be
54978 + enabled, which will protect you against many kinds of attacks
54979 + against your system. The heightened security comes at a cost
54980 + of an increased chance of incompatibilities with rare software
54981 + on your machine. Since this security level enables PaX, you should
54982 + view <http://pax.grsecurity.net> and read about the PaX
54983 + project. While you are there, download chpax and run it on
54984 + binaries that cause problems with PaX. Also remember that
54985 + since the /proc restrictions are enabled, you must run your
54986 + identd as gid 1001. This security level enables the following
54987 + features in addition to those listed in the low and medium
54988 + security levels:
54989 +
54990 + - Additional /proc restrictions
54991 + - Chmod restrictions in chroot
54992 + - No signals, ptrace, or viewing of processes outside of chroot
54993 + - Capability restrictions in chroot
54994 + - Deny fchdir out of chroot
54995 + - Priority restrictions in chroot
54996 + - Segmentation-based implementation of PaX
54997 + - Mprotect restrictions
54998 + - Removal of addresses from /proc/<pid>/[smaps|maps|stat]
54999 + - Kernel stack randomization
55000 + - Mount/unmount/remount logging
55001 + - Kernel symbol hiding
55002 + - Hardening of module auto-loading
55003 + - Ptrace restrictions
55004 + - Restricted vm86 mode
55005 + - Restricted sysfs/debugfs
55006 + - Active kernel exploit response
55007 +
55008 +config GRKERNSEC_CUSTOM
55009 + bool "Custom"
55010 + help
55011 + If you say Y here, you will be able to configure every grsecurity
55012 + option, which allows you to enable many more features that aren't
55013 + covered in the basic security levels. These additional features
55014 + include TPE, socket restrictions, and the sysctl system for
55015 + grsecurity. It is advised that you read through the help for
55016 + each option to determine its usefulness in your situation.
55017 +
55018 +endchoice
55019 +
55020 +menu "Address Space Protection"
55021 +depends on GRKERNSEC
55022 +
55023 +config GRKERNSEC_KMEM
55024 + bool "Deny reading/writing to /dev/kmem, /dev/mem, and /dev/port"
55025 + select STRICT_DEVMEM if (X86 || ARM || TILE || S390)
55026 + help
55027 + If you say Y here, /dev/kmem and /dev/mem won't be allowed to
55028 + be written to or read from to modify or leak the contents of the running
55029 + kernel. /dev/port will also not be allowed to be opened. If you have module
55030 + support disabled, enabling this will close up four ways that are
55031 + currently used to insert malicious code into the running kernel.
55032 + Even with all these features enabled, we still highly recommend that
55033 + you use the RBAC system, as it is still possible for an attacker to
55034 + modify the running kernel through privileged I/O granted by ioperm/iopl.
55035 + If you are not using XFree86, you may be able to stop this additional
55036 + case by enabling the 'Disable privileged I/O' option. Though nothing
55037 + legitimately writes to /dev/kmem, XFree86 does need to write to /dev/mem,
55038 + but only to video memory, which is the only writing we allow in this
55039 + case. If /dev/kmem or /dev/mem are mmaped without PROT_WRITE, they will
55040 + not be allowed to mprotect it with PROT_WRITE later.
55041 + It is highly recommended that you say Y here if you meet all the
55042 + conditions above.
55043 +
55044 +config GRKERNSEC_VM86
55045 + bool "Restrict VM86 mode"
55046 + depends on X86_32
55047 +
55048 + help
55049 + If you say Y here, only processes with CAP_SYS_RAWIO will be able to
55050 + make use of a special execution mode on 32bit x86 processors called
55051 + Virtual 8086 (VM86) mode. XFree86 may need vm86 mode for certain
55052 + video cards and will still work with this option enabled. The purpose
55053 + of the option is to prevent exploitation of emulation errors in
55054 + virtualization of vm86 mode like the one discovered in VMWare in 2009.
55055 + Nearly all users should be able to enable this option.
55056 +
55057 +config GRKERNSEC_IO
55058 + bool "Disable privileged I/O"
55059 + depends on X86
55060 + select RTC_CLASS
55061 + select RTC_INTF_DEV
55062 + select RTC_DRV_CMOS
55063 +
55064 + help
55065 + If you say Y here, all ioperm and iopl calls will return an error.
55066 + Ioperm and iopl can be used to modify the running kernel.
55067 + Unfortunately, some programs need this access to operate properly,
55068 + the most notable of which are XFree86 and hwclock. hwclock can be
55069 + remedied by having RTC support in the kernel, so real-time
55070 + clock support is enabled if this option is enabled, to ensure
55071 + that hwclock operates correctly. XFree86 still will not
55072 + operate correctly with this option enabled, so DO NOT CHOOSE Y
55073 + IF YOU USE XFree86. If you use XFree86 and you still want to
55074 + protect your kernel against modification, use the RBAC system.
55075 +
55076 +config GRKERNSEC_PROC_MEMMAP
55077 + bool "Remove addresses from /proc/<pid>/[smaps|maps|stat]"
55078 + default y if (PAX_NOEXEC || PAX_ASLR)
55079 + depends on PAX_NOEXEC || PAX_ASLR
55080 + help
55081 + If you say Y here, the /proc/<pid>/maps and /proc/<pid>/stat files will
55082 + give no information about the addresses of its mappings if
55083 + PaX features that rely on random addresses are enabled on the task.
55084 + If you use PaX it is greatly recommended that you say Y here as it
55085 + closes up a hole that makes the full ASLR useless for suid
55086 + binaries.
55087 +
55088 +config GRKERNSEC_BRUTE
55089 + bool "Deter exploit bruteforcing"
55090 + help
55091 + If you say Y here, attempts to bruteforce exploits against forking
55092 + daemons such as apache or sshd, as well as against suid/sgid binaries
55093 + will be deterred. When a child of a forking daemon is killed by PaX
55094 + or crashes due to an illegal instruction or other suspicious signal,
55095 + the parent process will be delayed 30 seconds upon every subsequent
55096 + fork until the administrator is able to assess the situation and
55097 + restart the daemon.
55098 + In the suid/sgid case, the attempt is logged, the user has all their
55099 + processes terminated, and they are prevented from executing any further
55100 + processes for 15 minutes.
55101 + It is recommended that you also enable signal logging in the auditing
55102 + section so that logs are generated when a process triggers a suspicious
55103 + signal.
55104 + If the sysctl option is enabled, a sysctl option with name
55105 + "deter_bruteforce" is created.
55106 +
55107 +config GRKERNSEC_MODHARDEN
55108 + bool "Harden module auto-loading"
55109 + depends on MODULES
55110 + help
55111 + If you say Y here, module auto-loading in response to use of some
55112 + feature implemented by an unloaded module will be restricted to
55113 + root users. Enabling this option helps defend against attacks
55114 + by unprivileged users who abuse the auto-loading behavior to
55115 + cause a vulnerable module to load that is then exploited.
55116 +
55117 + If this option prevents a legitimate use of auto-loading for a
55118 + non-root user, the administrator can execute modprobe manually
55119 + with the exact name of the module mentioned in the alert log.
55120 + Alternatively, the administrator can add the module to the list
55121 + of modules loaded at boot by modifying init scripts.
55122 +
55123 + Modification of init scripts will most likely be needed on
55124 + Ubuntu servers with encrypted home directory support enabled,
55125 + as the first non-root user logging in will cause the ecb(aes),
55126 + ecb(aes)-all, cbc(aes), and cbc(aes)-all modules to be loaded.
55127 +
55128 +config GRKERNSEC_HIDESYM
55129 + bool "Hide kernel symbols"
55130 + help
55131 + If you say Y here, getting information on loaded modules, and
55132 + displaying all kernel symbols through a syscall will be restricted
55133 + to users with CAP_SYS_MODULE. For software compatibility reasons,
55134 + /proc/kallsyms will be restricted to the root user. The RBAC
55135 + system can hide that entry even from root.
55136 +
55137 + This option also prevents leaking of kernel addresses through
55138 + several /proc entries.
55139 +
55140 + Note that this option is only effective provided the following
55141 + conditions are met:
55142 + 1) The kernel using grsecurity is not precompiled by some distribution
55143 + 2) You have also enabled GRKERNSEC_DMESG
55144 + 3) You are using the RBAC system and hiding other files such as your
55145 + kernel image and System.map. Alternatively, enabling this option
55146 + causes the permissions on /boot, /lib/modules, and the kernel
55147 + source directory to change at compile time to prevent
55148 + reading by non-root users.
55149 + If the above conditions are met, this option will aid in providing a
55150 + useful protection against local kernel exploitation of overflows
55151 + and arbitrary read/write vulnerabilities.
55152 +
55153 +config GRKERNSEC_KERN_LOCKOUT
55154 + bool "Active kernel exploit response"
55155 + depends on X86 || ARM || PPC || SPARC
55156 + help
55157 + If you say Y here, when a PaX alert is triggered due to suspicious
55158 + activity in the kernel (from KERNEXEC/UDEREF/USERCOPY)
55159 + or an OOPs occurs due to bad memory accesses, instead of just
55160 + terminating the offending process (and potentially allowing
55161 + a subsequent exploit from the same user), we will take one of two
55162 + actions:
55163 + If the user was root, we will panic the system
55164 + If the user was non-root, we will log the attempt, terminate
55165 + all processes owned by the user, then prevent them from creating
55166 + any new processes until the system is restarted
55167 + This deters repeated kernel exploitation/bruteforcing attempts
55168 + and is useful for later forensics.
55169 +
55170 +endmenu
55171 +menu "Role Based Access Control Options"
55172 +depends on GRKERNSEC
55173 +
55174 +config GRKERNSEC_RBAC_DEBUG
55175 + bool
55176 +
55177 +config GRKERNSEC_NO_RBAC
55178 + bool "Disable RBAC system"
55179 + help
55180 + If you say Y here, the /dev/grsec device will be removed from the kernel,
55181 + preventing the RBAC system from being enabled. You should only say Y
55182 + here if you have no intention of using the RBAC system, so as to prevent
55183 + an attacker with root access from misusing the RBAC system to hide files
55184 + and processes when loadable module support and /dev/[k]mem have been
55185 + locked down.
55186 +
55187 +config GRKERNSEC_ACL_HIDEKERN
55188 + bool "Hide kernel processes"
55189 + help
55190 + If you say Y here, all kernel threads will be hidden to all
55191 + processes but those whose subject has the "view hidden processes"
55192 + flag.
55193 +
55194 +config GRKERNSEC_ACL_MAXTRIES
55195 + int "Maximum tries before password lockout"
55196 + default 3
55197 + help
55198 + This option enforces the maximum number of times a user can attempt
55199 + to authorize themselves with the grsecurity RBAC system before being
55200 + denied the ability to attempt authorization again for a specified time.
55201 + The lower the number, the harder it will be to brute-force a password.
55202 +
55203 +config GRKERNSEC_ACL_TIMEOUT
55204 + int "Time to wait after max password tries, in seconds"
55205 + default 30
55206 + help
55207 + This option specifies the time the user must wait after attempting to
55208 + authorize to the RBAC system with the maximum number of invalid
55209 + passwords. The higher the number, the harder it will be to brute-force
55210 + a password.
55211 +
55212 +endmenu
55213 +menu "Filesystem Protections"
55214 +depends on GRKERNSEC
55215 +
55216 +config GRKERNSEC_PROC
55217 + bool "Proc restrictions"
55218 + help
55219 + If you say Y here, the permissions of the /proc filesystem
55220 + will be altered to enhance system security and privacy. You MUST
55221 + choose either a user only restriction or a user and group restriction.
55222 + Depending upon the option you choose, you can either restrict users to
55223 + see only the processes they themselves run, or choose a group that can
55224 + view all processes and files normally restricted to root if you choose
55225 + the "restrict to user only" option. NOTE: If you're running identd as
55226 + a non-root user, you will have to run it as the group you specify here.
55227 +
55228 +config GRKERNSEC_PROC_USER
55229 + bool "Restrict /proc to user only"
55230 + depends on GRKERNSEC_PROC
55231 + help
55232 + If you say Y here, non-root users will only be able to view their own
55233 + processes, and restricts them from viewing network-related information,
55234 + and viewing kernel symbol and module information.
55235 +
55236 +config GRKERNSEC_PROC_USERGROUP
55237 + bool "Allow special group"
55238 + depends on GRKERNSEC_PROC && !GRKERNSEC_PROC_USER
55239 + help
55240 + If you say Y here, you will be able to select a group that will be
55241 + able to view all processes and network-related information. If you've
55242 + enabled GRKERNSEC_HIDESYM, kernel and symbol information may still
55243 + remain hidden. This option is useful if you want to run identd as
55244 + a non-root user.
55245 +
55246 +config GRKERNSEC_PROC_GID
55247 + int "GID for special group"
55248 + depends on GRKERNSEC_PROC_USERGROUP
55249 + default 1001
55250 +
55251 +config GRKERNSEC_PROC_ADD
55252 + bool "Additional restrictions"
55253 + depends on GRKERNSEC_PROC_USER || GRKERNSEC_PROC_USERGROUP
55254 + help
55255 + If you say Y here, additional restrictions will be placed on
55256 + /proc that keep normal users from viewing device information and
55257 + slabinfo information that could be useful for exploits.
55258 +
55259 +config GRKERNSEC_LINK
55260 + bool "Linking restrictions"
55261 + help
55262 + If you say Y here, /tmp race exploits will be prevented, since users
55263 + will no longer be able to follow symlinks owned by other users in
55264 + world-writable +t directories (e.g. /tmp), unless the owner of the
55265 + symlink is the owner of the directory. users will also not be
55266 + able to hardlink to files they do not own. If the sysctl option is
55267 + enabled, a sysctl option with name "linking_restrictions" is created.
55268 +
55269 +config GRKERNSEC_FIFO
55270 + bool "FIFO restrictions"
55271 + help
55272 + If you say Y here, users will not be able to write to FIFOs they don't
55273 + own in world-writable +t directories (e.g. /tmp), unless the owner of
55274 + the FIFO is the same owner of the directory it's held in. If the sysctl
55275 + option is enabled, a sysctl option with name "fifo_restrictions" is
55276 + created.
55277 +
55278 +config GRKERNSEC_SYSFS_RESTRICT
55279 + bool "Sysfs/debugfs restriction"
55280 + depends on SYSFS
55281 + help
55282 + If you say Y here, sysfs (the pseudo-filesystem mounted at /sys) and
55283 + any filesystem normally mounted under it (e.g. debugfs) will only
55284 + be accessible by root. These filesystems generally provide access
55285 + to hardware and debug information that isn't appropriate for unprivileged
55286 + users of the system. Sysfs and debugfs have also become a large source
55287 + of new vulnerabilities, ranging from infoleaks to local compromise.
55288 + There has been very little oversight with an eye toward security involved
55289 + in adding new exporters of information to these filesystems, so their
55290 + use is discouraged.
55291 + This option is equivalent to a chmod 0700 of the mount paths.
55292 +
55293 +config GRKERNSEC_ROFS
55294 + bool "Runtime read-only mount protection"
55295 + help
55296 + If you say Y here, a sysctl option with name "romount_protect" will
55297 + be created. By setting this option to 1 at runtime, filesystems
55298 + will be protected in the following ways:
55299 + * No new writable mounts will be allowed
55300 + * Existing read-only mounts won't be able to be remounted read/write
55301 + * Write operations will be denied on all block devices
55302 + This option acts independently of grsec_lock: once it is set to 1,
55303 + it cannot be turned off. Therefore, please be mindful of the resulting
55304 + behavior if this option is enabled in an init script on a read-only
55305 + filesystem. This feature is mainly intended for secure embedded systems.
55306 +
55307 +config GRKERNSEC_CHROOT
55308 + bool "Chroot jail restrictions"
55309 + help
55310 + If you say Y here, you will be able to choose several options that will
55311 + make breaking out of a chrooted jail much more difficult. If you
55312 + encounter no software incompatibilities with the following options, it
55313 + is recommended that you enable each one.
55314 +
55315 +config GRKERNSEC_CHROOT_MOUNT
55316 + bool "Deny mounts"
55317 + depends on GRKERNSEC_CHROOT
55318 + help
55319 + If you say Y here, processes inside a chroot will not be able to
55320 + mount or remount filesystems. If the sysctl option is enabled, a
55321 + sysctl option with name "chroot_deny_mount" is created.
55322 +
55323 +config GRKERNSEC_CHROOT_DOUBLE
55324 + bool "Deny double-chroots"
55325 + depends on GRKERNSEC_CHROOT
55326 + help
55327 + If you say Y here, processes inside a chroot will not be able to chroot
55328 + again outside the chroot. This is a widely used method of breaking
55329 + out of a chroot jail and should not be allowed. If the sysctl
55330 + option is enabled, a sysctl option with name
55331 + "chroot_deny_chroot" is created.
55332 +
55333 +config GRKERNSEC_CHROOT_PIVOT
55334 + bool "Deny pivot_root in chroot"
55335 + depends on GRKERNSEC_CHROOT
55336 + help
55337 + If you say Y here, processes inside a chroot will not be able to use
55338 + a function called pivot_root() that was introduced in Linux 2.3.41. It
55339 + works similar to chroot in that it changes the root filesystem. This
55340 + function could be misused in a chrooted process to attempt to break out
55341 + of the chroot, and therefore should not be allowed. If the sysctl
55342 + option is enabled, a sysctl option with name "chroot_deny_pivot" is
55343 + created.
55344 +
55345 +config GRKERNSEC_CHROOT_CHDIR
55346 + bool "Enforce chdir(\"/\") on all chroots"
55347 + depends on GRKERNSEC_CHROOT
55348 + help
55349 + If you say Y here, the current working directory of all newly-chrooted
55350 + applications will be set to the the root directory of the chroot.
55351 + The man page on chroot(2) states:
55352 + Note that this call does not change the current working
55353 + directory, so that `.' can be outside the tree rooted at
55354 + `/'. In particular, the super-user can escape from a
55355 + `chroot jail' by doing `mkdir foo; chroot foo; cd ..'.
55356 +
55357 + It is recommended that you say Y here, since it's not known to break
55358 + any software. If the sysctl option is enabled, a sysctl option with
55359 + name "chroot_enforce_chdir" is created.
55360 +
55361 +config GRKERNSEC_CHROOT_CHMOD
55362 + bool "Deny (f)chmod +s"
55363 + depends on GRKERNSEC_CHROOT
55364 + help
55365 + If you say Y here, processes inside a chroot will not be able to chmod
55366 + or fchmod files to make them have suid or sgid bits. This protects
55367 + against another published method of breaking a chroot. If the sysctl
55368 + option is enabled, a sysctl option with name "chroot_deny_chmod" is
55369 + created.
55370 +
55371 +config GRKERNSEC_CHROOT_FCHDIR
55372 + bool "Deny fchdir out of chroot"
55373 + depends on GRKERNSEC_CHROOT
55374 + help
55375 + If you say Y here, a well-known method of breaking chroots by fchdir'ing
55376 + to a file descriptor of the chrooting process that points to a directory
55377 + outside the filesystem will be stopped. If the sysctl option
55378 + is enabled, a sysctl option with name "chroot_deny_fchdir" is created.
55379 +
55380 +config GRKERNSEC_CHROOT_MKNOD
55381 + bool "Deny mknod"
55382 + depends on GRKERNSEC_CHROOT
55383 + help
55384 + If you say Y here, processes inside a chroot will not be allowed to
55385 + mknod. The problem with using mknod inside a chroot is that it
55386 + would allow an attacker to create a device entry that is the same
55387 + as one on the physical root of your system, which could range from
55388 + anything from the console device to a device for your harddrive (which
55389 + they could then use to wipe the drive or steal data). It is recommended
55390 + that you say Y here, unless you run into software incompatibilities.
55391 + If the sysctl option is enabled, a sysctl option with name
55392 + "chroot_deny_mknod" is created.
55393 +
55394 +config GRKERNSEC_CHROOT_SHMAT
55395 + bool "Deny shmat() out of chroot"
55396 + depends on GRKERNSEC_CHROOT
55397 + help
55398 + If you say Y here, processes inside a chroot will not be able to attach
55399 + to shared memory segments that were created outside of the chroot jail.
55400 + It is recommended that you say Y here. If the sysctl option is enabled,
55401 + a sysctl option with name "chroot_deny_shmat" is created.
55402 +
55403 +config GRKERNSEC_CHROOT_UNIX
55404 + bool "Deny access to abstract AF_UNIX sockets out of chroot"
55405 + depends on GRKERNSEC_CHROOT
55406 + help
55407 + If you say Y here, processes inside a chroot will not be able to
55408 + connect to abstract (meaning not belonging to a filesystem) Unix
55409 + domain sockets that were bound outside of a chroot. It is recommended
55410 + that you say Y here. If the sysctl option is enabled, a sysctl option
55411 + with name "chroot_deny_unix" is created.
55412 +
55413 +config GRKERNSEC_CHROOT_FINDTASK
55414 + bool "Protect outside processes"
55415 + depends on GRKERNSEC_CHROOT
55416 + help
55417 + If you say Y here, processes inside a chroot will not be able to
55418 + kill, send signals with fcntl, ptrace, capget, getpgid, setpgid,
55419 + getsid, or view any process outside of the chroot. If the sysctl
55420 + option is enabled, a sysctl option with name "chroot_findtask" is
55421 + created.
55422 +
55423 +config GRKERNSEC_CHROOT_NICE
55424 + bool "Restrict priority changes"
55425 + depends on GRKERNSEC_CHROOT
55426 + help
55427 + If you say Y here, processes inside a chroot will not be able to raise
55428 + the priority of processes in the chroot, or alter the priority of
55429 + processes outside the chroot. This provides more security than simply
55430 + removing CAP_SYS_NICE from the process' capability set. If the
55431 + sysctl option is enabled, a sysctl option with name "chroot_restrict_nice"
55432 + is created.
55433 +
55434 +config GRKERNSEC_CHROOT_SYSCTL
55435 + bool "Deny sysctl writes"
55436 + depends on GRKERNSEC_CHROOT
55437 + help
55438 + If you say Y here, an attacker in a chroot will not be able to
55439 + write to sysctl entries, either by sysctl(2) or through a /proc
55440 + interface. It is strongly recommended that you say Y here. If the
55441 + sysctl option is enabled, a sysctl option with name
55442 + "chroot_deny_sysctl" is created.
55443 +
55444 +config GRKERNSEC_CHROOT_CAPS
55445 + bool "Capability restrictions"
55446 + depends on GRKERNSEC_CHROOT
55447 + help
55448 + If you say Y here, the capabilities on all processes within a
55449 + chroot jail will be lowered to stop module insertion, raw i/o,
55450 + system and net admin tasks, rebooting the system, modifying immutable
55451 + files, modifying IPC owned by another, and changing the system time.
55452 + This is left an option because it can break some apps. Disable this
55453 + if your chrooted apps are having problems performing those kinds of
55454 + tasks. If the sysctl option is enabled, a sysctl option with
55455 + name "chroot_caps" is created.
55456 +
55457 +endmenu
55458 +menu "Kernel Auditing"
55459 +depends on GRKERNSEC
55460 +
55461 +config GRKERNSEC_AUDIT_GROUP
55462 + bool "Single group for auditing"
55463 + help
55464 + If you say Y here, the exec, chdir, and (un)mount logging features
55465 + will only operate on a group you specify. This option is recommended
55466 + if you only want to watch certain users instead of having a large
55467 + amount of logs from the entire system. If the sysctl option is enabled,
55468 + a sysctl option with name "audit_group" is created.
55469 +
55470 +config GRKERNSEC_AUDIT_GID
55471 + int "GID for auditing"
55472 + depends on GRKERNSEC_AUDIT_GROUP
55473 + default 1007
55474 +
55475 +config GRKERNSEC_EXECLOG
55476 + bool "Exec logging"
55477 + help
55478 + If you say Y here, all execve() calls will be logged (since the
55479 + other exec*() calls are frontends to execve(), all execution
55480 + will be logged). Useful for shell-servers that like to keep track
55481 + of their users. If the sysctl option is enabled, a sysctl option with
55482 + name "exec_logging" is created.
55483 + WARNING: This option when enabled will produce a LOT of logs, especially
55484 + on an active system.
55485 +
55486 +config GRKERNSEC_RESLOG
55487 + bool "Resource logging"
55488 + help
55489 + If you say Y here, all attempts to overstep resource limits will
55490 + be logged with the resource name, the requested size, and the current
55491 + limit. It is highly recommended that you say Y here. If the sysctl
55492 + option is enabled, a sysctl option with name "resource_logging" is
55493 + created. If the RBAC system is enabled, the sysctl value is ignored.
55494 +
55495 +config GRKERNSEC_CHROOT_EXECLOG
55496 + bool "Log execs within chroot"
55497 + help
55498 + If you say Y here, all executions inside a chroot jail will be logged
55499 + to syslog. This can cause a large amount of logs if certain
55500 + applications (eg. djb's daemontools) are installed on the system, and
55501 + is therefore left as an option. If the sysctl option is enabled, a
55502 + sysctl option with name "chroot_execlog" is created.
55503 +
55504 +config GRKERNSEC_AUDIT_PTRACE
55505 + bool "Ptrace logging"
55506 + help
55507 + If you say Y here, all attempts to attach to a process via ptrace
55508 + will be logged. If the sysctl option is enabled, a sysctl option
55509 + with name "audit_ptrace" is created.
55510 +
55511 +config GRKERNSEC_AUDIT_CHDIR
55512 + bool "Chdir logging"
55513 + help
55514 + If you say Y here, all chdir() calls will be logged. If the sysctl
55515 + option is enabled, a sysctl option with name "audit_chdir" is created.
55516 +
55517 +config GRKERNSEC_AUDIT_MOUNT
55518 + bool "(Un)Mount logging"
55519 + help
55520 + If you say Y here, all mounts and unmounts will be logged. If the
55521 + sysctl option is enabled, a sysctl option with name "audit_mount" is
55522 + created.
55523 +
55524 +config GRKERNSEC_SIGNAL
55525 + bool "Signal logging"
55526 + help
55527 + If you say Y here, certain important signals will be logged, such as
55528 + SIGSEGV, which will as a result inform you of when a error in a program
55529 + occurred, which in some cases could mean a possible exploit attempt.
55530 + If the sysctl option is enabled, a sysctl option with name
55531 + "signal_logging" is created.
55532 +
55533 +config GRKERNSEC_FORKFAIL
55534 + bool "Fork failure logging"
55535 + help
55536 + If you say Y here, all failed fork() attempts will be logged.
55537 + This could suggest a fork bomb, or someone attempting to overstep
55538 + their process limit. If the sysctl option is enabled, a sysctl option
55539 + with name "forkfail_logging" is created.
55540 +
55541 +config GRKERNSEC_TIME
55542 + bool "Time change logging"
55543 + help
55544 + If you say Y here, any changes of the system clock will be logged.
55545 + If the sysctl option is enabled, a sysctl option with name
55546 + "timechange_logging" is created.
55547 +
55548 +config GRKERNSEC_PROC_IPADDR
55549 + bool "/proc/<pid>/ipaddr support"
55550 + help
55551 + If you say Y here, a new entry will be added to each /proc/<pid>
55552 + directory that contains the IP address of the person using the task.
55553 + The IP is carried across local TCP and AF_UNIX stream sockets.
55554 + This information can be useful for IDS/IPSes to perform remote response
55555 + to a local attack. The entry is readable by only the owner of the
55556 + process (and root if he has CAP_DAC_OVERRIDE, which can be removed via
55557 + the RBAC system), and thus does not create privacy concerns.
55558 +
55559 +config GRKERNSEC_RWXMAP_LOG
55560 + bool 'Denied RWX mmap/mprotect logging'
55561 + depends on PAX_MPROTECT && !PAX_EMUPLT && !PAX_EMUSIGRT
55562 + help
55563 + If you say Y here, calls to mmap() and mprotect() with explicit
55564 + usage of PROT_WRITE and PROT_EXEC together will be logged when
55565 + denied by the PAX_MPROTECT feature. If the sysctl option is
55566 + enabled, a sysctl option with name "rwxmap_logging" is created.
55567 +
55568 +config GRKERNSEC_AUDIT_TEXTREL
55569 + bool 'ELF text relocations logging (READ HELP)'
55570 + depends on PAX_MPROTECT
55571 + help
55572 + If you say Y here, text relocations will be logged with the filename
55573 + of the offending library or binary. The purpose of the feature is
55574 + to help Linux distribution developers get rid of libraries and
55575 + binaries that need text relocations which hinder the future progress
55576 + of PaX. Only Linux distribution developers should say Y here, and
55577 + never on a production machine, as this option creates an information
55578 + leak that could aid an attacker in defeating the randomization of
55579 + a single memory region. If the sysctl option is enabled, a sysctl
55580 + option with name "audit_textrel" is created.
55581 +
55582 +endmenu
55583 +
55584 +menu "Executable Protections"
55585 +depends on GRKERNSEC
55586 +
55587 +config GRKERNSEC_DMESG
55588 + bool "Dmesg(8) restriction"
55589 + help
55590 + If you say Y here, non-root users will not be able to use dmesg(8)
55591 + to view up to the last 4kb of messages in the kernel's log buffer.
55592 + The kernel's log buffer often contains kernel addresses and other
55593 + identifying information useful to an attacker in fingerprinting a
55594 + system for a targeted exploit.
55595 + If the sysctl option is enabled, a sysctl option with name "dmesg" is
55596 + created.
55597 +
55598 +config GRKERNSEC_HARDEN_PTRACE
55599 + bool "Deter ptrace-based process snooping"
55600 + help
55601 + If you say Y here, TTY sniffers and other malicious monitoring
55602 + programs implemented through ptrace will be defeated. If you
55603 + have been using the RBAC system, this option has already been
55604 + enabled for several years for all users, with the ability to make
55605 + fine-grained exceptions.
55606 +
55607 + This option only affects the ability of non-root users to ptrace
55608 + processes that are not a descendent of the ptracing process.
55609 + This means that strace ./binary and gdb ./binary will still work,
55610 + but attaching to arbitrary processes will not. If the sysctl
55611 + option is enabled, a sysctl option with name "harden_ptrace" is
55612 + created.
55613 +
55614 +config GRKERNSEC_TPE
55615 + bool "Trusted Path Execution (TPE)"
55616 + help
55617 + If you say Y here, you will be able to choose a gid to add to the
55618 + supplementary groups of users you want to mark as "untrusted."
55619 + These users will not be able to execute any files that are not in
55620 + root-owned directories writable only by root. If the sysctl option
55621 + is enabled, a sysctl option with name "tpe" is created.
55622 +
55623 +config GRKERNSEC_TPE_ALL
55624 + bool "Partially restrict all non-root users"
55625 + depends on GRKERNSEC_TPE
55626 + help
55627 + If you say Y here, all non-root users will be covered under
55628 + a weaker TPE restriction. This is separate from, and in addition to,
55629 + the main TPE options that you have selected elsewhere. Thus, if a
55630 + "trusted" GID is chosen, this restriction applies to even that GID.
55631 + Under this restriction, all non-root users will only be allowed to
55632 + execute files in directories they own that are not group or
55633 + world-writable, or in directories owned by root and writable only by
55634 + root. If the sysctl option is enabled, a sysctl option with name
55635 + "tpe_restrict_all" is created.
55636 +
55637 +config GRKERNSEC_TPE_INVERT
55638 + bool "Invert GID option"
55639 + depends on GRKERNSEC_TPE
55640 + help
55641 + If you say Y here, the group you specify in the TPE configuration will
55642 + decide what group TPE restrictions will be *disabled* for. This
55643 + option is useful if you want TPE restrictions to be applied to most
55644 + users on the system. If the sysctl option is enabled, a sysctl option
55645 + with name "tpe_invert" is created. Unlike other sysctl options, this
55646 + entry will default to on for backward-compatibility.
55647 +
55648 +config GRKERNSEC_TPE_GID
55649 + int "GID for untrusted users"
55650 + depends on GRKERNSEC_TPE && !GRKERNSEC_TPE_INVERT
55651 + default 1005
55652 + help
55653 + Setting this GID determines what group TPE restrictions will be
55654 + *enabled* for. If the sysctl option is enabled, a sysctl option
55655 + with name "tpe_gid" is created.
55656 +
55657 +config GRKERNSEC_TPE_GID
55658 + int "GID for trusted users"
55659 + depends on GRKERNSEC_TPE && GRKERNSEC_TPE_INVERT
55660 + default 1005
55661 + help
55662 + Setting this GID determines what group TPE restrictions will be
55663 + *disabled* for. If the sysctl option is enabled, a sysctl option
55664 + with name "tpe_gid" is created.
55665 +
55666 +endmenu
55667 +menu "Network Protections"
55668 +depends on GRKERNSEC
55669 +
55670 +config GRKERNSEC_RANDNET
55671 + bool "Larger entropy pools"
55672 + help
55673 + If you say Y here, the entropy pools used for many features of Linux
55674 + and grsecurity will be doubled in size. Since several grsecurity
55675 + features use additional randomness, it is recommended that you say Y
55676 + here. Saying Y here has a similar effect as modifying
55677 + /proc/sys/kernel/random/poolsize.
55678 +
55679 +config GRKERNSEC_BLACKHOLE
55680 + bool "TCP/UDP blackhole and LAST_ACK DoS prevention"
55681 + depends on NET
55682 + help
55683 + If you say Y here, neither TCP resets nor ICMP
55684 + destination-unreachable packets will be sent in response to packets
55685 + sent to ports for which no associated listening process exists.
55686 + This feature supports both IPV4 and IPV6 and exempts the
55687 + loopback interface from blackholing. Enabling this feature
55688 + makes a host more resilient to DoS attacks and reduces network
55689 + visibility against scanners.
55690 +
55691 + The blackhole feature as-implemented is equivalent to the FreeBSD
55692 + blackhole feature, as it prevents RST responses to all packets, not
55693 + just SYNs. Under most application behavior this causes no
55694 + problems, but applications (like haproxy) may not close certain
55695 + connections in a way that cleanly terminates them on the remote
55696 + end, leaving the remote host in LAST_ACK state. Because of this
55697 + side-effect and to prevent intentional LAST_ACK DoSes, this
55698 + feature also adds automatic mitigation against such attacks.
55699 + The mitigation drastically reduces the amount of time a socket
55700 + can spend in LAST_ACK state. If you're using haproxy and not
55701 + all servers it connects to have this option enabled, consider
55702 + disabling this feature on the haproxy host.
55703 +
55704 + If the sysctl option is enabled, two sysctl options with names
55705 + "ip_blackhole" and "lastack_retries" will be created.
55706 + While "ip_blackhole" takes the standard zero/non-zero on/off
55707 + toggle, "lastack_retries" uses the same kinds of values as
55708 + "tcp_retries1" and "tcp_retries2". The default value of 4
55709 + prevents a socket from lasting more than 45 seconds in LAST_ACK
55710 + state.
55711 +
55712 +config GRKERNSEC_SOCKET
55713 + bool "Socket restrictions"
55714 + depends on NET
55715 + help
55716 + If you say Y here, you will be able to choose from several options.
55717 + If you assign a GID on your system and add it to the supplementary
55718 + groups of users you want to restrict socket access to, this patch
55719 + will perform up to three things, based on the option(s) you choose.
55720 +
55721 +config GRKERNSEC_SOCKET_ALL
55722 + bool "Deny any sockets to group"
55723 + depends on GRKERNSEC_SOCKET
55724 + help
55725 + If you say Y here, you will be able to choose a GID of whose users will
55726 + be unable to connect to other hosts from your machine or run server
55727 + applications from your machine. If the sysctl option is enabled, a
55728 + sysctl option with name "socket_all" is created.
55729 +
55730 +config GRKERNSEC_SOCKET_ALL_GID
55731 + int "GID to deny all sockets for"
55732 + depends on GRKERNSEC_SOCKET_ALL
55733 + default 1004
55734 + help
55735 + Here you can choose the GID to disable socket access for. Remember to
55736 + add the users you want socket access disabled for to the GID
55737 + specified here. If the sysctl option is enabled, a sysctl option
55738 + with name "socket_all_gid" is created.
55739 +
55740 +config GRKERNSEC_SOCKET_CLIENT
55741 + bool "Deny client sockets to group"
55742 + depends on GRKERNSEC_SOCKET
55743 + help
55744 + If you say Y here, you will be able to choose a GID of whose users will
55745 + be unable to connect to other hosts from your machine, but will be
55746 + able to run servers. If this option is enabled, all users in the group
55747 + you specify will have to use passive mode when initiating ftp transfers
55748 + from the shell on your machine. If the sysctl option is enabled, a
55749 + sysctl option with name "socket_client" is created.
55750 +
55751 +config GRKERNSEC_SOCKET_CLIENT_GID
55752 + int "GID to deny client sockets for"
55753 + depends on GRKERNSEC_SOCKET_CLIENT
55754 + default 1003
55755 + help
55756 + Here you can choose the GID to disable client socket access for.
55757 + Remember to add the users you want client socket access disabled for to
55758 + the GID specified here. If the sysctl option is enabled, a sysctl
55759 + option with name "socket_client_gid" is created.
55760 +
55761 +config GRKERNSEC_SOCKET_SERVER
55762 + bool "Deny server sockets to group"
55763 + depends on GRKERNSEC_SOCKET
55764 + help
55765 + If you say Y here, you will be able to choose a GID of whose users will
55766 + be unable to run server applications from your machine. If the sysctl
55767 + option is enabled, a sysctl option with name "socket_server" is created.
55768 +
55769 +config GRKERNSEC_SOCKET_SERVER_GID
55770 + int "GID to deny server sockets for"
55771 + depends on GRKERNSEC_SOCKET_SERVER
55772 + default 1002
55773 + help
55774 + Here you can choose the GID to disable server socket access for.
55775 + Remember to add the users you want server socket access disabled for to
55776 + the GID specified here. If the sysctl option is enabled, a sysctl
55777 + option with name "socket_server_gid" is created.
55778 +
55779 +endmenu
55780 +menu "Sysctl support"
55781 +depends on GRKERNSEC && SYSCTL
55782 +
55783 +config GRKERNSEC_SYSCTL
55784 + bool "Sysctl support"
55785 + help
55786 + If you say Y here, you will be able to change the options that
55787 + grsecurity runs with at bootup, without having to recompile your
55788 + kernel. You can echo values to files in /proc/sys/kernel/grsecurity
55789 + to enable (1) or disable (0) various features. All the sysctl entries
55790 + are mutable until the "grsec_lock" entry is set to a non-zero value.
55791 + All features enabled in the kernel configuration are disabled at boot
55792 + if you do not say Y to the "Turn on features by default" option.
55793 + All options should be set at startup, and the grsec_lock entry should
55794 + be set to a non-zero value after all the options are set.
55795 + *THIS IS EXTREMELY IMPORTANT*
55796 +
55797 +config GRKERNSEC_SYSCTL_DISTRO
55798 + bool "Extra sysctl support for distro makers (READ HELP)"
55799 + depends on GRKERNSEC_SYSCTL && GRKERNSEC_IO
55800 + help
55801 + If you say Y here, additional sysctl options will be created
55802 + for features that affect processes running as root. Therefore,
55803 + it is critical when using this option that the grsec_lock entry be
55804 + enabled after boot. Only distros with prebuilt kernel packages
55805 + with this option enabled that can ensure grsec_lock is enabled
55806 + after boot should use this option.
55807 + *Failure to set grsec_lock after boot makes all grsec features
55808 + this option covers useless*
55809 +
55810 + Currently this option creates the following sysctl entries:
55811 + "Disable Privileged I/O": "disable_priv_io"
55812 +
55813 +config GRKERNSEC_SYSCTL_ON
55814 + bool "Turn on features by default"
55815 + depends on GRKERNSEC_SYSCTL
55816 + help
55817 + If you say Y here, instead of having all features enabled in the
55818 + kernel configuration disabled at boot time, the features will be
55819 + enabled at boot time. It is recommended you say Y here unless
55820 + there is some reason you would want all sysctl-tunable features to
55821 + be disabled by default. As mentioned elsewhere, it is important
55822 + to enable the grsec_lock entry once you have finished modifying
55823 + the sysctl entries.
55824 +
55825 +endmenu
55826 +menu "Logging Options"
55827 +depends on GRKERNSEC
55828 +
55829 +config GRKERNSEC_FLOODTIME
55830 + int "Seconds in between log messages (minimum)"
55831 + default 10
55832 + help
55833 + This option allows you to enforce the number of seconds between
55834 + grsecurity log messages. The default should be suitable for most
55835 + people, however, if you choose to change it, choose a value small enough
55836 + to allow informative logs to be produced, but large enough to
55837 + prevent flooding.
55838 +
55839 +config GRKERNSEC_FLOODBURST
55840 + int "Number of messages in a burst (maximum)"
55841 + default 6
55842 + help
55843 + This option allows you to choose the maximum number of messages allowed
55844 + within the flood time interval you chose in a separate option. The
55845 + default should be suitable for most people, however if you find that
55846 + many of your logs are being interpreted as flooding, you may want to
55847 + raise this value.
55848 +
55849 +endmenu
55850 +
55851 +endmenu
55852 diff --git a/grsecurity/Makefile b/grsecurity/Makefile
55853 new file mode 100644
55854 index 0000000..be9ae3a
55855 --- /dev/null
55856 +++ b/grsecurity/Makefile
55857 @@ -0,0 +1,36 @@
55858 +# grsecurity's ACL system was originally written in 2001 by Michael Dalton
55859 +# during 2001-2009 it has been completely redesigned by Brad Spengler
55860 +# into an RBAC system
55861 +#
55862 +# All code in this directory and various hooks inserted throughout the kernel
55863 +# are copyright Brad Spengler - Open Source Security, Inc., and released
55864 +# under the GPL v2 or higher
55865 +
55866 +obj-y = grsec_chdir.o grsec_chroot.o grsec_exec.o grsec_fifo.o grsec_fork.o \
55867 + grsec_mount.o grsec_sig.o grsec_sysctl.o \
55868 + grsec_time.o grsec_tpe.o grsec_link.o grsec_pax.o grsec_ptrace.o
55869 +
55870 +obj-$(CONFIG_GRKERNSEC) += grsec_init.o grsum.o gracl.o gracl_segv.o \
55871 + gracl_cap.o gracl_alloc.o gracl_shm.o grsec_mem.o gracl_fs.o \
55872 + gracl_learn.o grsec_log.o
55873 +obj-$(CONFIG_GRKERNSEC_RESLOG) += gracl_res.o
55874 +
55875 +ifdef CONFIG_NET
55876 +obj-y += grsec_sock.o
55877 +obj-$(CONFIG_GRKERNSEC) += gracl_ip.o
55878 +endif
55879 +
55880 +ifndef CONFIG_GRKERNSEC
55881 +obj-y += grsec_disabled.o
55882 +endif
55883 +
55884 +ifdef CONFIG_GRKERNSEC_HIDESYM
55885 +extra-y := grsec_hidesym.o
55886 +$(obj)/grsec_hidesym.o:
55887 + @-chmod -f 500 /boot
55888 + @-chmod -f 500 /lib/modules
55889 + @-chmod -f 500 /lib64/modules
55890 + @-chmod -f 500 /lib32/modules
55891 + @-chmod -f 700 .
55892 + @echo ' grsec: protected kernel image paths'
55893 +endif
55894 diff --git a/grsecurity/gracl.c b/grsecurity/gracl.c
55895 new file mode 100644
55896 index 0000000..6bd68d6
55897 --- /dev/null
55898 +++ b/grsecurity/gracl.c
55899 @@ -0,0 +1,4141 @@
55900 +#include <linux/kernel.h>
55901 +#include <linux/module.h>
55902 +#include <linux/sched.h>
55903 +#include <linux/mm.h>
55904 +#include <linux/file.h>
55905 +#include <linux/fs.h>
55906 +#include <linux/namei.h>
55907 +#include <linux/mount.h>
55908 +#include <linux/tty.h>
55909 +#include <linux/proc_fs.h>
55910 +#include <linux/smp_lock.h>
55911 +#include <linux/slab.h>
55912 +#include <linux/vmalloc.h>
55913 +#include <linux/types.h>
55914 +#include <linux/sysctl.h>
55915 +#include <linux/netdevice.h>
55916 +#include <linux/ptrace.h>
55917 +#include <linux/gracl.h>
55918 +#include <linux/gralloc.h>
55919 +#include <linux/grsecurity.h>
55920 +#include <linux/grinternal.h>
55921 +#include <linux/pid_namespace.h>
55922 +#include <linux/fdtable.h>
55923 +#include <linux/percpu.h>
55924 +
55925 +#include <asm/uaccess.h>
55926 +#include <asm/errno.h>
55927 +#include <asm/mman.h>
55928 +
55929 +static struct acl_role_db acl_role_set;
55930 +static struct name_db name_set;
55931 +static struct inodev_db inodev_set;
55932 +
55933 +/* for keeping track of userspace pointers used for subjects, so we
55934 + can share references in the kernel as well
55935 +*/
55936 +
55937 +static struct dentry *real_root;
55938 +static struct vfsmount *real_root_mnt;
55939 +
55940 +static struct acl_subj_map_db subj_map_set;
55941 +
55942 +static struct acl_role_label *default_role;
55943 +
55944 +static struct acl_role_label *role_list;
55945 +
55946 +static u16 acl_sp_role_value;
55947 +
55948 +extern char *gr_shared_page[4];
55949 +static DEFINE_MUTEX(gr_dev_mutex);
55950 +DEFINE_RWLOCK(gr_inode_lock);
55951 +
55952 +struct gr_arg *gr_usermode;
55953 +
55954 +static unsigned int gr_status __read_only = GR_STATUS_INIT;
55955 +
55956 +extern int chkpw(struct gr_arg *entry, unsigned char *salt, unsigned char *sum);
55957 +extern void gr_clear_learn_entries(void);
55958 +
55959 +#ifdef CONFIG_GRKERNSEC_RESLOG
55960 +extern void gr_log_resource(const struct task_struct *task,
55961 + const int res, const unsigned long wanted, const int gt);
55962 +#endif
55963 +
55964 +unsigned char *gr_system_salt;
55965 +unsigned char *gr_system_sum;
55966 +
55967 +static struct sprole_pw **acl_special_roles = NULL;
55968 +static __u16 num_sprole_pws = 0;
55969 +
55970 +static struct acl_role_label *kernel_role = NULL;
55971 +
55972 +static unsigned int gr_auth_attempts = 0;
55973 +static unsigned long gr_auth_expires = 0UL;
55974 +
55975 +#ifdef CONFIG_NET
55976 +extern struct vfsmount *sock_mnt;
55977 +#endif
55978 +extern struct vfsmount *pipe_mnt;
55979 +extern struct vfsmount *shm_mnt;
55980 +#ifdef CONFIG_HUGETLBFS
55981 +extern struct vfsmount *hugetlbfs_vfsmount;
55982 +#endif
55983 +
55984 +static struct acl_object_label *fakefs_obj_rw;
55985 +static struct acl_object_label *fakefs_obj_rwx;
55986 +
55987 +extern int gr_init_uidset(void);
55988 +extern void gr_free_uidset(void);
55989 +extern void gr_remove_uid(uid_t uid);
55990 +extern int gr_find_uid(uid_t uid);
55991 +
55992 +__inline__ int
55993 +gr_acl_is_enabled(void)
55994 +{
55995 + return (gr_status & GR_READY);
55996 +}
55997 +
55998 +#ifdef CONFIG_BTRFS_FS
55999 +extern dev_t get_btrfs_dev_from_inode(struct inode *inode);
56000 +extern int btrfs_getattr(struct vfsmount *mnt, struct dentry *dentry, struct kstat *stat);
56001 +#endif
56002 +
56003 +static inline dev_t __get_dev(const struct dentry *dentry)
56004 +{
56005 +#ifdef CONFIG_BTRFS_FS
56006 + if (dentry->d_inode->i_op && dentry->d_inode->i_op->getattr == &btrfs_getattr)
56007 + return get_btrfs_dev_from_inode(dentry->d_inode);
56008 + else
56009 +#endif
56010 + return dentry->d_inode->i_sb->s_dev;
56011 +}
56012 +
56013 +dev_t gr_get_dev_from_dentry(struct dentry *dentry)
56014 +{
56015 + return __get_dev(dentry);
56016 +}
56017 +
56018 +static char gr_task_roletype_to_char(struct task_struct *task)
56019 +{
56020 + switch (task->role->roletype &
56021 + (GR_ROLE_DEFAULT | GR_ROLE_USER | GR_ROLE_GROUP |
56022 + GR_ROLE_SPECIAL)) {
56023 + case GR_ROLE_DEFAULT:
56024 + return 'D';
56025 + case GR_ROLE_USER:
56026 + return 'U';
56027 + case GR_ROLE_GROUP:
56028 + return 'G';
56029 + case GR_ROLE_SPECIAL:
56030 + return 'S';
56031 + }
56032 +
56033 + return 'X';
56034 +}
56035 +
56036 +char gr_roletype_to_char(void)
56037 +{
56038 + return gr_task_roletype_to_char(current);
56039 +}
56040 +
56041 +__inline__ int
56042 +gr_acl_tpe_check(void)
56043 +{
56044 + if (unlikely(!(gr_status & GR_READY)))
56045 + return 0;
56046 + if (current->role->roletype & GR_ROLE_TPE)
56047 + return 1;
56048 + else
56049 + return 0;
56050 +}
56051 +
56052 +int
56053 +gr_handle_rawio(const struct inode *inode)
56054 +{
56055 +#ifdef CONFIG_GRKERNSEC_CHROOT_CAPS
56056 + if (inode && S_ISBLK(inode->i_mode) &&
56057 + grsec_enable_chroot_caps && proc_is_chrooted(current) &&
56058 + !capable(CAP_SYS_RAWIO))
56059 + return 1;
56060 +#endif
56061 + return 0;
56062 +}
56063 +
56064 +static int
56065 +gr_streq(const char *a, const char *b, const unsigned int lena, const unsigned int lenb)
56066 +{
56067 + if (likely(lena != lenb))
56068 + return 0;
56069 +
56070 + return !memcmp(a, b, lena);
56071 +}
56072 +
56073 +static int prepend(char **buffer, int *buflen, const char *str, int namelen)
56074 +{
56075 + *buflen -= namelen;
56076 + if (*buflen < 0)
56077 + return -ENAMETOOLONG;
56078 + *buffer -= namelen;
56079 + memcpy(*buffer, str, namelen);
56080 + return 0;
56081 +}
56082 +
56083 +/* this must be called with vfsmount_lock and dcache_lock held */
56084 +
56085 +static char * __our_d_path(struct dentry *dentry, struct vfsmount *vfsmnt,
56086 + struct dentry *root, struct vfsmount *rootmnt,
56087 + char *buffer, int buflen)
56088 +{
56089 + char * end = buffer+buflen;
56090 + char * retval;
56091 + int namelen;
56092 +
56093 + *--end = '\0';
56094 + buflen--;
56095 +
56096 + if (buflen < 1)
56097 + goto Elong;
56098 + /* Get '/' right */
56099 + retval = end-1;
56100 + *retval = '/';
56101 +
56102 + for (;;) {
56103 + struct dentry * parent;
56104 +
56105 + if (dentry == root && vfsmnt == rootmnt)
56106 + break;
56107 + if (dentry == vfsmnt->mnt_root || IS_ROOT(dentry)) {
56108 + /* Global root? */
56109 + if (vfsmnt->mnt_parent == vfsmnt)
56110 + goto global_root;
56111 + dentry = vfsmnt->mnt_mountpoint;
56112 + vfsmnt = vfsmnt->mnt_parent;
56113 + continue;
56114 + }
56115 + parent = dentry->d_parent;
56116 + prefetch(parent);
56117 + namelen = dentry->d_name.len;
56118 + buflen -= namelen + 1;
56119 + if (buflen < 0)
56120 + goto Elong;
56121 + end -= namelen;
56122 + memcpy(end, dentry->d_name.name, namelen);
56123 + *--end = '/';
56124 + retval = end;
56125 + dentry = parent;
56126 + }
56127 +
56128 +out:
56129 + return retval;
56130 +
56131 +global_root:
56132 + namelen = dentry->d_name.len;
56133 + buflen -= namelen;
56134 + if (buflen < 0)
56135 + goto Elong;
56136 + retval -= namelen-1; /* hit the slash */
56137 + memcpy(retval, dentry->d_name.name, namelen);
56138 + goto out;
56139 +Elong:
56140 + retval = ERR_PTR(-ENAMETOOLONG);
56141 + goto out;
56142 +}
56143 +
56144 +static char *
56145 +gen_full_path(struct dentry *dentry, struct vfsmount *vfsmnt,
56146 + struct dentry *root, struct vfsmount *rootmnt, char *buf, int buflen)
56147 +{
56148 + char *retval;
56149 +
56150 + retval = __our_d_path(dentry, vfsmnt, root, rootmnt, buf, buflen);
56151 + if (unlikely(IS_ERR(retval)))
56152 + retval = strcpy(buf, "<path too long>");
56153 + else if (unlikely(retval[1] == '/' && retval[2] == '\0'))
56154 + retval[1] = '\0';
56155 +
56156 + return retval;
56157 +}
56158 +
56159 +static char *
56160 +__d_real_path(const struct dentry *dentry, const struct vfsmount *vfsmnt,
56161 + char *buf, int buflen)
56162 +{
56163 + char *res;
56164 +
56165 + /* we can use real_root, real_root_mnt, because this is only called
56166 + by the RBAC system */
56167 + res = gen_full_path((struct dentry *)dentry, (struct vfsmount *)vfsmnt, real_root, real_root_mnt, buf, buflen);
56168 +
56169 + return res;
56170 +}
56171 +
56172 +static char *
56173 +d_real_path(const struct dentry *dentry, const struct vfsmount *vfsmnt,
56174 + char *buf, int buflen)
56175 +{
56176 + char *res;
56177 + struct dentry *root;
56178 + struct vfsmount *rootmnt;
56179 + struct task_struct *reaper = &init_task;
56180 +
56181 + /* we can't use real_root, real_root_mnt, because they belong only to the RBAC system */
56182 + read_lock(&reaper->fs->lock);
56183 + root = dget(reaper->fs->root.dentry);
56184 + rootmnt = mntget(reaper->fs->root.mnt);
56185 + read_unlock(&reaper->fs->lock);
56186 +
56187 + spin_lock(&dcache_lock);
56188 + spin_lock(&vfsmount_lock);
56189 + res = gen_full_path((struct dentry *)dentry, (struct vfsmount *)vfsmnt, root, rootmnt, buf, buflen);
56190 + spin_unlock(&vfsmount_lock);
56191 + spin_unlock(&dcache_lock);
56192 +
56193 + dput(root);
56194 + mntput(rootmnt);
56195 + return res;
56196 +}
56197 +
56198 +static char *
56199 +gr_to_filename_rbac(const struct dentry *dentry, const struct vfsmount *mnt)
56200 +{
56201 + char *ret;
56202 + spin_lock(&dcache_lock);
56203 + spin_lock(&vfsmount_lock);
56204 + ret = __d_real_path(dentry, mnt, per_cpu_ptr(gr_shared_page[0],smp_processor_id()),
56205 + PAGE_SIZE);
56206 + spin_unlock(&vfsmount_lock);
56207 + spin_unlock(&dcache_lock);
56208 + return ret;
56209 +}
56210 +
56211 +static char *
56212 +gr_to_proc_filename_rbac(const struct dentry *dentry, const struct vfsmount *mnt)
56213 +{
56214 + char *ret;
56215 + char *buf;
56216 + int buflen;
56217 +
56218 + spin_lock(&dcache_lock);
56219 + spin_lock(&vfsmount_lock);
56220 + buf = per_cpu_ptr(gr_shared_page[0], smp_processor_id());
56221 + ret = __d_real_path(dentry, mnt, buf, PAGE_SIZE - 6);
56222 + buflen = (int)(ret - buf);
56223 + if (buflen >= 5)
56224 + prepend(&ret, &buflen, "/proc", 5);
56225 + else
56226 + ret = strcpy(buf, "<path too long>");
56227 + spin_unlock(&vfsmount_lock);
56228 + spin_unlock(&dcache_lock);
56229 + return ret;
56230 +}
56231 +
56232 +char *
56233 +gr_to_filename_nolock(const struct dentry *dentry, const struct vfsmount *mnt)
56234 +{
56235 + return __d_real_path(dentry, mnt, per_cpu_ptr(gr_shared_page[0],smp_processor_id()),
56236 + PAGE_SIZE);
56237 +}
56238 +
56239 +char *
56240 +gr_to_filename(const struct dentry *dentry, const struct vfsmount *mnt)
56241 +{
56242 + return d_real_path(dentry, mnt, per_cpu_ptr(gr_shared_page[0], smp_processor_id()),
56243 + PAGE_SIZE);
56244 +}
56245 +
56246 +char *
56247 +gr_to_filename1(const struct dentry *dentry, const struct vfsmount *mnt)
56248 +{
56249 + return d_real_path(dentry, mnt, per_cpu_ptr(gr_shared_page[1], smp_processor_id()),
56250 + PAGE_SIZE);
56251 +}
56252 +
56253 +char *
56254 +gr_to_filename2(const struct dentry *dentry, const struct vfsmount *mnt)
56255 +{
56256 + return d_real_path(dentry, mnt, per_cpu_ptr(gr_shared_page[2], smp_processor_id()),
56257 + PAGE_SIZE);
56258 +}
56259 +
56260 +char *
56261 +gr_to_filename3(const struct dentry *dentry, const struct vfsmount *mnt)
56262 +{
56263 + return d_real_path(dentry, mnt, per_cpu_ptr(gr_shared_page[3], smp_processor_id()),
56264 + PAGE_SIZE);
56265 +}
56266 +
56267 +__inline__ __u32
56268 +to_gr_audit(const __u32 reqmode)
56269 +{
56270 + /* masks off auditable permission flags, then shifts them to create
56271 + auditing flags, and adds the special case of append auditing if
56272 + we're requesting write */
56273 + return (((reqmode & ~GR_AUDITS) << 10) | ((reqmode & GR_WRITE) ? GR_AUDIT_APPEND : 0));
56274 +}
56275 +
56276 +struct acl_subject_label *
56277 +lookup_subject_map(const struct acl_subject_label *userp)
56278 +{
56279 + unsigned int index = shash(userp, subj_map_set.s_size);
56280 + struct subject_map *match;
56281 +
56282 + match = subj_map_set.s_hash[index];
56283 +
56284 + while (match && match->user != userp)
56285 + match = match->next;
56286 +
56287 + if (match != NULL)
56288 + return match->kernel;
56289 + else
56290 + return NULL;
56291 +}
56292 +
56293 +static void
56294 +insert_subj_map_entry(struct subject_map *subjmap)
56295 +{
56296 + unsigned int index = shash(subjmap->user, subj_map_set.s_size);
56297 + struct subject_map **curr;
56298 +
56299 + subjmap->prev = NULL;
56300 +
56301 + curr = &subj_map_set.s_hash[index];
56302 + if (*curr != NULL)
56303 + (*curr)->prev = subjmap;
56304 +
56305 + subjmap->next = *curr;
56306 + *curr = subjmap;
56307 +
56308 + return;
56309 +}
56310 +
56311 +static struct acl_role_label *
56312 +lookup_acl_role_label(const struct task_struct *task, const uid_t uid,
56313 + const gid_t gid)
56314 +{
56315 + unsigned int index = rhash(uid, GR_ROLE_USER, acl_role_set.r_size);
56316 + struct acl_role_label *match;
56317 + struct role_allowed_ip *ipp;
56318 + unsigned int x;
56319 + u32 curr_ip = task->signal->curr_ip;
56320 +
56321 + task->signal->saved_ip = curr_ip;
56322 +
56323 + match = acl_role_set.r_hash[index];
56324 +
56325 + while (match) {
56326 + if ((match->roletype & (GR_ROLE_DOMAIN | GR_ROLE_USER)) == (GR_ROLE_DOMAIN | GR_ROLE_USER)) {
56327 + for (x = 0; x < match->domain_child_num; x++) {
56328 + if (match->domain_children[x] == uid)
56329 + goto found;
56330 + }
56331 + } else if (match->uidgid == uid && match->roletype & GR_ROLE_USER)
56332 + break;
56333 + match = match->next;
56334 + }
56335 +found:
56336 + if (match == NULL) {
56337 + try_group:
56338 + index = rhash(gid, GR_ROLE_GROUP, acl_role_set.r_size);
56339 + match = acl_role_set.r_hash[index];
56340 +
56341 + while (match) {
56342 + if ((match->roletype & (GR_ROLE_DOMAIN | GR_ROLE_GROUP)) == (GR_ROLE_DOMAIN | GR_ROLE_GROUP)) {
56343 + for (x = 0; x < match->domain_child_num; x++) {
56344 + if (match->domain_children[x] == gid)
56345 + goto found2;
56346 + }
56347 + } else if (match->uidgid == gid && match->roletype & GR_ROLE_GROUP)
56348 + break;
56349 + match = match->next;
56350 + }
56351 +found2:
56352 + if (match == NULL)
56353 + match = default_role;
56354 + if (match->allowed_ips == NULL)
56355 + return match;
56356 + else {
56357 + for (ipp = match->allowed_ips; ipp; ipp = ipp->next) {
56358 + if (likely
56359 + ((ntohl(curr_ip) & ipp->netmask) ==
56360 + (ntohl(ipp->addr) & ipp->netmask)))
56361 + return match;
56362 + }
56363 + match = default_role;
56364 + }
56365 + } else if (match->allowed_ips == NULL) {
56366 + return match;
56367 + } else {
56368 + for (ipp = match->allowed_ips; ipp; ipp = ipp->next) {
56369 + if (likely
56370 + ((ntohl(curr_ip) & ipp->netmask) ==
56371 + (ntohl(ipp->addr) & ipp->netmask)))
56372 + return match;
56373 + }
56374 + goto try_group;
56375 + }
56376 +
56377 + return match;
56378 +}
56379 +
56380 +struct acl_subject_label *
56381 +lookup_acl_subj_label(const ino_t ino, const dev_t dev,
56382 + const struct acl_role_label *role)
56383 +{
56384 + unsigned int index = fhash(ino, dev, role->subj_hash_size);
56385 + struct acl_subject_label *match;
56386 +
56387 + match = role->subj_hash[index];
56388 +
56389 + while (match && (match->inode != ino || match->device != dev ||
56390 + (match->mode & GR_DELETED))) {
56391 + match = match->next;
56392 + }
56393 +
56394 + if (match && !(match->mode & GR_DELETED))
56395 + return match;
56396 + else
56397 + return NULL;
56398 +}
56399 +
56400 +struct acl_subject_label *
56401 +lookup_acl_subj_label_deleted(const ino_t ino, const dev_t dev,
56402 + const struct acl_role_label *role)
56403 +{
56404 + unsigned int index = fhash(ino, dev, role->subj_hash_size);
56405 + struct acl_subject_label *match;
56406 +
56407 + match = role->subj_hash[index];
56408 +
56409 + while (match && (match->inode != ino || match->device != dev ||
56410 + !(match->mode & GR_DELETED))) {
56411 + match = match->next;
56412 + }
56413 +
56414 + if (match && (match->mode & GR_DELETED))
56415 + return match;
56416 + else
56417 + return NULL;
56418 +}
56419 +
56420 +static struct acl_object_label *
56421 +lookup_acl_obj_label(const ino_t ino, const dev_t dev,
56422 + const struct acl_subject_label *subj)
56423 +{
56424 + unsigned int index = fhash(ino, dev, subj->obj_hash_size);
56425 + struct acl_object_label *match;
56426 +
56427 + match = subj->obj_hash[index];
56428 +
56429 + while (match && (match->inode != ino || match->device != dev ||
56430 + (match->mode & GR_DELETED))) {
56431 + match = match->next;
56432 + }
56433 +
56434 + if (match && !(match->mode & GR_DELETED))
56435 + return match;
56436 + else
56437 + return NULL;
56438 +}
56439 +
56440 +static struct acl_object_label *
56441 +lookup_acl_obj_label_create(const ino_t ino, const dev_t dev,
56442 + const struct acl_subject_label *subj)
56443 +{
56444 + unsigned int index = fhash(ino, dev, subj->obj_hash_size);
56445 + struct acl_object_label *match;
56446 +
56447 + match = subj->obj_hash[index];
56448 +
56449 + while (match && (match->inode != ino || match->device != dev ||
56450 + !(match->mode & GR_DELETED))) {
56451 + match = match->next;
56452 + }
56453 +
56454 + if (match && (match->mode & GR_DELETED))
56455 + return match;
56456 +
56457 + match = subj->obj_hash[index];
56458 +
56459 + while (match && (match->inode != ino || match->device != dev ||
56460 + (match->mode & GR_DELETED))) {
56461 + match = match->next;
56462 + }
56463 +
56464 + if (match && !(match->mode & GR_DELETED))
56465 + return match;
56466 + else
56467 + return NULL;
56468 +}
56469 +
56470 +static struct name_entry *
56471 +lookup_name_entry(const char *name)
56472 +{
56473 + unsigned int len = strlen(name);
56474 + unsigned int key = full_name_hash(name, len);
56475 + unsigned int index = key % name_set.n_size;
56476 + struct name_entry *match;
56477 +
56478 + match = name_set.n_hash[index];
56479 +
56480 + while (match && (match->key != key || !gr_streq(match->name, name, match->len, len)))
56481 + match = match->next;
56482 +
56483 + return match;
56484 +}
56485 +
56486 +static struct name_entry *
56487 +lookup_name_entry_create(const char *name)
56488 +{
56489 + unsigned int len = strlen(name);
56490 + unsigned int key = full_name_hash(name, len);
56491 + unsigned int index = key % name_set.n_size;
56492 + struct name_entry *match;
56493 +
56494 + match = name_set.n_hash[index];
56495 +
56496 + while (match && (match->key != key || !gr_streq(match->name, name, match->len, len) ||
56497 + !match->deleted))
56498 + match = match->next;
56499 +
56500 + if (match && match->deleted)
56501 + return match;
56502 +
56503 + match = name_set.n_hash[index];
56504 +
56505 + while (match && (match->key != key || !gr_streq(match->name, name, match->len, len) ||
56506 + match->deleted))
56507 + match = match->next;
56508 +
56509 + if (match && !match->deleted)
56510 + return match;
56511 + else
56512 + return NULL;
56513 +}
56514 +
56515 +static struct inodev_entry *
56516 +lookup_inodev_entry(const ino_t ino, const dev_t dev)
56517 +{
56518 + unsigned int index = fhash(ino, dev, inodev_set.i_size);
56519 + struct inodev_entry *match;
56520 +
56521 + match = inodev_set.i_hash[index];
56522 +
56523 + while (match && (match->nentry->inode != ino || match->nentry->device != dev))
56524 + match = match->next;
56525 +
56526 + return match;
56527 +}
56528 +
56529 +static void
56530 +insert_inodev_entry(struct inodev_entry *entry)
56531 +{
56532 + unsigned int index = fhash(entry->nentry->inode, entry->nentry->device,
56533 + inodev_set.i_size);
56534 + struct inodev_entry **curr;
56535 +
56536 + entry->prev = NULL;
56537 +
56538 + curr = &inodev_set.i_hash[index];
56539 + if (*curr != NULL)
56540 + (*curr)->prev = entry;
56541 +
56542 + entry->next = *curr;
56543 + *curr = entry;
56544 +
56545 + return;
56546 +}
56547 +
56548 +static void
56549 +__insert_acl_role_label(struct acl_role_label *role, uid_t uidgid)
56550 +{
56551 + unsigned int index =
56552 + rhash(uidgid, role->roletype & (GR_ROLE_USER | GR_ROLE_GROUP), acl_role_set.r_size);
56553 + struct acl_role_label **curr;
56554 + struct acl_role_label *tmp;
56555 +
56556 + curr = &acl_role_set.r_hash[index];
56557 +
56558 + /* if role was already inserted due to domains and already has
56559 + a role in the same bucket as it attached, then we need to
56560 + combine these two buckets
56561 + */
56562 + if (role->next) {
56563 + tmp = role->next;
56564 + while (tmp->next)
56565 + tmp = tmp->next;
56566 + tmp->next = *curr;
56567 + } else
56568 + role->next = *curr;
56569 + *curr = role;
56570 +
56571 + return;
56572 +}
56573 +
56574 +static void
56575 +insert_acl_role_label(struct acl_role_label *role)
56576 +{
56577 + int i;
56578 +
56579 + if (role_list == NULL) {
56580 + role_list = role;
56581 + role->prev = NULL;
56582 + } else {
56583 + role->prev = role_list;
56584 + role_list = role;
56585 + }
56586 +
56587 + /* used for hash chains */
56588 + role->next = NULL;
56589 +
56590 + if (role->roletype & GR_ROLE_DOMAIN) {
56591 + for (i = 0; i < role->domain_child_num; i++)
56592 + __insert_acl_role_label(role, role->domain_children[i]);
56593 + } else
56594 + __insert_acl_role_label(role, role->uidgid);
56595 +}
56596 +
56597 +static int
56598 +insert_name_entry(char *name, const ino_t inode, const dev_t device, __u8 deleted)
56599 +{
56600 + struct name_entry **curr, *nentry;
56601 + struct inodev_entry *ientry;
56602 + unsigned int len = strlen(name);
56603 + unsigned int key = full_name_hash(name, len);
56604 + unsigned int index = key % name_set.n_size;
56605 +
56606 + curr = &name_set.n_hash[index];
56607 +
56608 + while (*curr && ((*curr)->key != key || !gr_streq((*curr)->name, name, (*curr)->len, len)))
56609 + curr = &((*curr)->next);
56610 +
56611 + if (*curr != NULL)
56612 + return 1;
56613 +
56614 + nentry = acl_alloc(sizeof (struct name_entry));
56615 + if (nentry == NULL)
56616 + return 0;
56617 + ientry = acl_alloc(sizeof (struct inodev_entry));
56618 + if (ientry == NULL)
56619 + return 0;
56620 + ientry->nentry = nentry;
56621 +
56622 + nentry->key = key;
56623 + nentry->name = name;
56624 + nentry->inode = inode;
56625 + nentry->device = device;
56626 + nentry->len = len;
56627 + nentry->deleted = deleted;
56628 +
56629 + nentry->prev = NULL;
56630 + curr = &name_set.n_hash[index];
56631 + if (*curr != NULL)
56632 + (*curr)->prev = nentry;
56633 + nentry->next = *curr;
56634 + *curr = nentry;
56635 +
56636 + /* insert us into the table searchable by inode/dev */
56637 + insert_inodev_entry(ientry);
56638 +
56639 + return 1;
56640 +}
56641 +
56642 +static void
56643 +insert_acl_obj_label(struct acl_object_label *obj,
56644 + struct acl_subject_label *subj)
56645 +{
56646 + unsigned int index =
56647 + fhash(obj->inode, obj->device, subj->obj_hash_size);
56648 + struct acl_object_label **curr;
56649 +
56650 +
56651 + obj->prev = NULL;
56652 +
56653 + curr = &subj->obj_hash[index];
56654 + if (*curr != NULL)
56655 + (*curr)->prev = obj;
56656 +
56657 + obj->next = *curr;
56658 + *curr = obj;
56659 +
56660 + return;
56661 +}
56662 +
56663 +static void
56664 +insert_acl_subj_label(struct acl_subject_label *obj,
56665 + struct acl_role_label *role)
56666 +{
56667 + unsigned int index = fhash(obj->inode, obj->device, role->subj_hash_size);
56668 + struct acl_subject_label **curr;
56669 +
56670 + obj->prev = NULL;
56671 +
56672 + curr = &role->subj_hash[index];
56673 + if (*curr != NULL)
56674 + (*curr)->prev = obj;
56675 +
56676 + obj->next = *curr;
56677 + *curr = obj;
56678 +
56679 + return;
56680 +}
56681 +
56682 +/* allocating chained hash tables, so optimal size is where lambda ~ 1 */
56683 +
56684 +static void *
56685 +create_table(__u32 * len, int elementsize)
56686 +{
56687 + unsigned int table_sizes[] = {
56688 + 7, 13, 31, 61, 127, 251, 509, 1021, 2039, 4093, 8191, 16381,
56689 + 32749, 65521, 131071, 262139, 524287, 1048573, 2097143,
56690 + 4194301, 8388593, 16777213, 33554393, 67108859
56691 + };
56692 + void *newtable = NULL;
56693 + unsigned int pwr = 0;
56694 +
56695 + while ((pwr < ((sizeof (table_sizes) / sizeof (table_sizes[0])) - 1)) &&
56696 + table_sizes[pwr] <= *len)
56697 + pwr++;
56698 +
56699 + if (table_sizes[pwr] <= *len || (table_sizes[pwr] > ULONG_MAX / elementsize))
56700 + return newtable;
56701 +
56702 + if ((table_sizes[pwr] * elementsize) <= PAGE_SIZE)
56703 + newtable =
56704 + kmalloc(table_sizes[pwr] * elementsize, GFP_KERNEL);
56705 + else
56706 + newtable = vmalloc(table_sizes[pwr] * elementsize);
56707 +
56708 + *len = table_sizes[pwr];
56709 +
56710 + return newtable;
56711 +}
56712 +
56713 +static int
56714 +init_variables(const struct gr_arg *arg)
56715 +{
56716 + struct task_struct *reaper = &init_task;
56717 + unsigned int stacksize;
56718 +
56719 + subj_map_set.s_size = arg->role_db.num_subjects;
56720 + acl_role_set.r_size = arg->role_db.num_roles + arg->role_db.num_domain_children;
56721 + name_set.n_size = arg->role_db.num_objects;
56722 + inodev_set.i_size = arg->role_db.num_objects;
56723 +
56724 + if (!subj_map_set.s_size || !acl_role_set.r_size ||
56725 + !name_set.n_size || !inodev_set.i_size)
56726 + return 1;
56727 +
56728 + if (!gr_init_uidset())
56729 + return 1;
56730 +
56731 + /* set up the stack that holds allocation info */
56732 +
56733 + stacksize = arg->role_db.num_pointers + 5;
56734 +
56735 + if (!acl_alloc_stack_init(stacksize))
56736 + return 1;
56737 +
56738 + /* grab reference for the real root dentry and vfsmount */
56739 + read_lock(&reaper->fs->lock);
56740 + real_root = dget(reaper->fs->root.dentry);
56741 + real_root_mnt = mntget(reaper->fs->root.mnt);
56742 + read_unlock(&reaper->fs->lock);
56743 +
56744 +#ifdef CONFIG_GRKERNSEC_RBAC_DEBUG
56745 + printk(KERN_ALERT "Obtained real root device=%d, inode=%lu\n", __get_dev(real_root), real_root->d_inode->i_ino);
56746 +#endif
56747 +
56748 + fakefs_obj_rw = acl_alloc(sizeof(struct acl_object_label));
56749 + if (fakefs_obj_rw == NULL)
56750 + return 1;
56751 + fakefs_obj_rw->mode = GR_FIND | GR_READ | GR_WRITE;
56752 +
56753 + fakefs_obj_rwx = acl_alloc(sizeof(struct acl_object_label));
56754 + if (fakefs_obj_rwx == NULL)
56755 + return 1;
56756 + fakefs_obj_rwx->mode = GR_FIND | GR_READ | GR_WRITE | GR_EXEC;
56757 +
56758 + subj_map_set.s_hash =
56759 + (struct subject_map **) create_table(&subj_map_set.s_size, sizeof(void *));
56760 + acl_role_set.r_hash =
56761 + (struct acl_role_label **) create_table(&acl_role_set.r_size, sizeof(void *));
56762 + name_set.n_hash = (struct name_entry **) create_table(&name_set.n_size, sizeof(void *));
56763 + inodev_set.i_hash =
56764 + (struct inodev_entry **) create_table(&inodev_set.i_size, sizeof(void *));
56765 +
56766 + if (!subj_map_set.s_hash || !acl_role_set.r_hash ||
56767 + !name_set.n_hash || !inodev_set.i_hash)
56768 + return 1;
56769 +
56770 + memset(subj_map_set.s_hash, 0,
56771 + sizeof(struct subject_map *) * subj_map_set.s_size);
56772 + memset(acl_role_set.r_hash, 0,
56773 + sizeof (struct acl_role_label *) * acl_role_set.r_size);
56774 + memset(name_set.n_hash, 0,
56775 + sizeof (struct name_entry *) * name_set.n_size);
56776 + memset(inodev_set.i_hash, 0,
56777 + sizeof (struct inodev_entry *) * inodev_set.i_size);
56778 +
56779 + return 0;
56780 +}
56781 +
56782 +/* free information not needed after startup
56783 + currently contains user->kernel pointer mappings for subjects
56784 +*/
56785 +
56786 +static void
56787 +free_init_variables(void)
56788 +{
56789 + __u32 i;
56790 +
56791 + if (subj_map_set.s_hash) {
56792 + for (i = 0; i < subj_map_set.s_size; i++) {
56793 + if (subj_map_set.s_hash[i]) {
56794 + kfree(subj_map_set.s_hash[i]);
56795 + subj_map_set.s_hash[i] = NULL;
56796 + }
56797 + }
56798 +
56799 + if ((subj_map_set.s_size * sizeof (struct subject_map *)) <=
56800 + PAGE_SIZE)
56801 + kfree(subj_map_set.s_hash);
56802 + else
56803 + vfree(subj_map_set.s_hash);
56804 + }
56805 +
56806 + return;
56807 +}
56808 +
56809 +static void
56810 +free_variables(void)
56811 +{
56812 + struct acl_subject_label *s;
56813 + struct acl_role_label *r;
56814 + struct task_struct *task, *task2;
56815 + unsigned int x;
56816 +
56817 + gr_clear_learn_entries();
56818 +
56819 + read_lock(&tasklist_lock);
56820 + do_each_thread(task2, task) {
56821 + task->acl_sp_role = 0;
56822 + task->acl_role_id = 0;
56823 + task->acl = NULL;
56824 + task->role = NULL;
56825 + } while_each_thread(task2, task);
56826 + read_unlock(&tasklist_lock);
56827 +
56828 + /* release the reference to the real root dentry and vfsmount */
56829 + if (real_root)
56830 + dput(real_root);
56831 + real_root = NULL;
56832 + if (real_root_mnt)
56833 + mntput(real_root_mnt);
56834 + real_root_mnt = NULL;
56835 +
56836 + /* free all object hash tables */
56837 +
56838 + FOR_EACH_ROLE_START(r)
56839 + if (r->subj_hash == NULL)
56840 + goto next_role;
56841 + FOR_EACH_SUBJECT_START(r, s, x)
56842 + if (s->obj_hash == NULL)
56843 + break;
56844 + if ((s->obj_hash_size * sizeof (struct acl_object_label *)) <= PAGE_SIZE)
56845 + kfree(s->obj_hash);
56846 + else
56847 + vfree(s->obj_hash);
56848 + FOR_EACH_SUBJECT_END(s, x)
56849 + FOR_EACH_NESTED_SUBJECT_START(r, s)
56850 + if (s->obj_hash == NULL)
56851 + break;
56852 + if ((s->obj_hash_size * sizeof (struct acl_object_label *)) <= PAGE_SIZE)
56853 + kfree(s->obj_hash);
56854 + else
56855 + vfree(s->obj_hash);
56856 + FOR_EACH_NESTED_SUBJECT_END(s)
56857 + if ((r->subj_hash_size * sizeof (struct acl_subject_label *)) <= PAGE_SIZE)
56858 + kfree(r->subj_hash);
56859 + else
56860 + vfree(r->subj_hash);
56861 + r->subj_hash = NULL;
56862 +next_role:
56863 + FOR_EACH_ROLE_END(r)
56864 +
56865 + acl_free_all();
56866 +
56867 + if (acl_role_set.r_hash) {
56868 + if ((acl_role_set.r_size * sizeof (struct acl_role_label *)) <=
56869 + PAGE_SIZE)
56870 + kfree(acl_role_set.r_hash);
56871 + else
56872 + vfree(acl_role_set.r_hash);
56873 + }
56874 + if (name_set.n_hash) {
56875 + if ((name_set.n_size * sizeof (struct name_entry *)) <=
56876 + PAGE_SIZE)
56877 + kfree(name_set.n_hash);
56878 + else
56879 + vfree(name_set.n_hash);
56880 + }
56881 +
56882 + if (inodev_set.i_hash) {
56883 + if ((inodev_set.i_size * sizeof (struct inodev_entry *)) <=
56884 + PAGE_SIZE)
56885 + kfree(inodev_set.i_hash);
56886 + else
56887 + vfree(inodev_set.i_hash);
56888 + }
56889 +
56890 + gr_free_uidset();
56891 +
56892 + memset(&name_set, 0, sizeof (struct name_db));
56893 + memset(&inodev_set, 0, sizeof (struct inodev_db));
56894 + memset(&acl_role_set, 0, sizeof (struct acl_role_db));
56895 + memset(&subj_map_set, 0, sizeof (struct acl_subj_map_db));
56896 +
56897 + default_role = NULL;
56898 + role_list = NULL;
56899 +
56900 + return;
56901 +}
56902 +
56903 +static __u32
56904 +count_user_objs(struct acl_object_label *userp)
56905 +{
56906 + struct acl_object_label o_tmp;
56907 + __u32 num = 0;
56908 +
56909 + while (userp) {
56910 + if (copy_from_user(&o_tmp, userp,
56911 + sizeof (struct acl_object_label)))
56912 + break;
56913 +
56914 + userp = o_tmp.prev;
56915 + num++;
56916 + }
56917 +
56918 + return num;
56919 +}
56920 +
56921 +static struct acl_subject_label *
56922 +do_copy_user_subj(struct acl_subject_label *userp, struct acl_role_label *role);
56923 +
56924 +static int
56925 +copy_user_glob(struct acl_object_label *obj)
56926 +{
56927 + struct acl_object_label *g_tmp, **guser;
56928 + unsigned int len;
56929 + char *tmp;
56930 +
56931 + if (obj->globbed == NULL)
56932 + return 0;
56933 +
56934 + guser = &obj->globbed;
56935 + while (*guser) {
56936 + g_tmp = (struct acl_object_label *)
56937 + acl_alloc(sizeof (struct acl_object_label));
56938 + if (g_tmp == NULL)
56939 + return -ENOMEM;
56940 +
56941 + if (copy_from_user(g_tmp, *guser,
56942 + sizeof (struct acl_object_label)))
56943 + return -EFAULT;
56944 +
56945 + len = strnlen_user(g_tmp->filename, PATH_MAX);
56946 +
56947 + if (!len || len >= PATH_MAX)
56948 + return -EINVAL;
56949 +
56950 + if ((tmp = (char *) acl_alloc(len)) == NULL)
56951 + return -ENOMEM;
56952 +
56953 + if (copy_from_user(tmp, g_tmp->filename, len))
56954 + return -EFAULT;
56955 + tmp[len-1] = '\0';
56956 + g_tmp->filename = tmp;
56957 +
56958 + *guser = g_tmp;
56959 + guser = &(g_tmp->next);
56960 + }
56961 +
56962 + return 0;
56963 +}
56964 +
56965 +static int
56966 +copy_user_objs(struct acl_object_label *userp, struct acl_subject_label *subj,
56967 + struct acl_role_label *role)
56968 +{
56969 + struct acl_object_label *o_tmp;
56970 + unsigned int len;
56971 + int ret;
56972 + char *tmp;
56973 +
56974 + while (userp) {
56975 + if ((o_tmp = (struct acl_object_label *)
56976 + acl_alloc(sizeof (struct acl_object_label))) == NULL)
56977 + return -ENOMEM;
56978 +
56979 + if (copy_from_user(o_tmp, userp,
56980 + sizeof (struct acl_object_label)))
56981 + return -EFAULT;
56982 +
56983 + userp = o_tmp->prev;
56984 +
56985 + len = strnlen_user(o_tmp->filename, PATH_MAX);
56986 +
56987 + if (!len || len >= PATH_MAX)
56988 + return -EINVAL;
56989 +
56990 + if ((tmp = (char *) acl_alloc(len)) == NULL)
56991 + return -ENOMEM;
56992 +
56993 + if (copy_from_user(tmp, o_tmp->filename, len))
56994 + return -EFAULT;
56995 + tmp[len-1] = '\0';
56996 + o_tmp->filename = tmp;
56997 +
56998 + insert_acl_obj_label(o_tmp, subj);
56999 + if (!insert_name_entry(o_tmp->filename, o_tmp->inode,
57000 + o_tmp->device, (o_tmp->mode & GR_DELETED) ? 1 : 0))
57001 + return -ENOMEM;
57002 +
57003 + ret = copy_user_glob(o_tmp);
57004 + if (ret)
57005 + return ret;
57006 +
57007 + if (o_tmp->nested) {
57008 + o_tmp->nested = do_copy_user_subj(o_tmp->nested, role);
57009 + if (IS_ERR(o_tmp->nested))
57010 + return PTR_ERR(o_tmp->nested);
57011 +
57012 + /* insert into nested subject list */
57013 + o_tmp->nested->next = role->hash->first;
57014 + role->hash->first = o_tmp->nested;
57015 + }
57016 + }
57017 +
57018 + return 0;
57019 +}
57020 +
57021 +static __u32
57022 +count_user_subjs(struct acl_subject_label *userp)
57023 +{
57024 + struct acl_subject_label s_tmp;
57025 + __u32 num = 0;
57026 +
57027 + while (userp) {
57028 + if (copy_from_user(&s_tmp, userp,
57029 + sizeof (struct acl_subject_label)))
57030 + break;
57031 +
57032 + userp = s_tmp.prev;
57033 + /* do not count nested subjects against this count, since
57034 + they are not included in the hash table, but are
57035 + attached to objects. We have already counted
57036 + the subjects in userspace for the allocation
57037 + stack
57038 + */
57039 + if (!(s_tmp.mode & GR_NESTED))
57040 + num++;
57041 + }
57042 +
57043 + return num;
57044 +}
57045 +
57046 +static int
57047 +copy_user_allowedips(struct acl_role_label *rolep)
57048 +{
57049 + struct role_allowed_ip *ruserip, *rtmp = NULL, *rlast;
57050 +
57051 + ruserip = rolep->allowed_ips;
57052 +
57053 + while (ruserip) {
57054 + rlast = rtmp;
57055 +
57056 + if ((rtmp = (struct role_allowed_ip *)
57057 + acl_alloc(sizeof (struct role_allowed_ip))) == NULL)
57058 + return -ENOMEM;
57059 +
57060 + if (copy_from_user(rtmp, ruserip,
57061 + sizeof (struct role_allowed_ip)))
57062 + return -EFAULT;
57063 +
57064 + ruserip = rtmp->prev;
57065 +
57066 + if (!rlast) {
57067 + rtmp->prev = NULL;
57068 + rolep->allowed_ips = rtmp;
57069 + } else {
57070 + rlast->next = rtmp;
57071 + rtmp->prev = rlast;
57072 + }
57073 +
57074 + if (!ruserip)
57075 + rtmp->next = NULL;
57076 + }
57077 +
57078 + return 0;
57079 +}
57080 +
57081 +static int
57082 +copy_user_transitions(struct acl_role_label *rolep)
57083 +{
57084 + struct role_transition *rusertp, *rtmp = NULL, *rlast;
57085 +
57086 + unsigned int len;
57087 + char *tmp;
57088 +
57089 + rusertp = rolep->transitions;
57090 +
57091 + while (rusertp) {
57092 + rlast = rtmp;
57093 +
57094 + if ((rtmp = (struct role_transition *)
57095 + acl_alloc(sizeof (struct role_transition))) == NULL)
57096 + return -ENOMEM;
57097 +
57098 + if (copy_from_user(rtmp, rusertp,
57099 + sizeof (struct role_transition)))
57100 + return -EFAULT;
57101 +
57102 + rusertp = rtmp->prev;
57103 +
57104 + len = strnlen_user(rtmp->rolename, GR_SPROLE_LEN);
57105 +
57106 + if (!len || len >= GR_SPROLE_LEN)
57107 + return -EINVAL;
57108 +
57109 + if ((tmp = (char *) acl_alloc(len)) == NULL)
57110 + return -ENOMEM;
57111 +
57112 + if (copy_from_user(tmp, rtmp->rolename, len))
57113 + return -EFAULT;
57114 + tmp[len-1] = '\0';
57115 + rtmp->rolename = tmp;
57116 +
57117 + if (!rlast) {
57118 + rtmp->prev = NULL;
57119 + rolep->transitions = rtmp;
57120 + } else {
57121 + rlast->next = rtmp;
57122 + rtmp->prev = rlast;
57123 + }
57124 +
57125 + if (!rusertp)
57126 + rtmp->next = NULL;
57127 + }
57128 +
57129 + return 0;
57130 +}
57131 +
57132 +static struct acl_subject_label *
57133 +do_copy_user_subj(struct acl_subject_label *userp, struct acl_role_label *role)
57134 +{
57135 + struct acl_subject_label *s_tmp = NULL, *s_tmp2;
57136 + unsigned int len;
57137 + char *tmp;
57138 + __u32 num_objs;
57139 + struct acl_ip_label **i_tmp, *i_utmp2;
57140 + struct gr_hash_struct ghash;
57141 + struct subject_map *subjmap;
57142 + unsigned int i_num;
57143 + int err;
57144 +
57145 + s_tmp = lookup_subject_map(userp);
57146 +
57147 + /* we've already copied this subject into the kernel, just return
57148 + the reference to it, and don't copy it over again
57149 + */
57150 + if (s_tmp)
57151 + return(s_tmp);
57152 +
57153 + if ((s_tmp = (struct acl_subject_label *)
57154 + acl_alloc(sizeof (struct acl_subject_label))) == NULL)
57155 + return ERR_PTR(-ENOMEM);
57156 +
57157 + subjmap = (struct subject_map *)kmalloc(sizeof (struct subject_map), GFP_KERNEL);
57158 + if (subjmap == NULL)
57159 + return ERR_PTR(-ENOMEM);
57160 +
57161 + subjmap->user = userp;
57162 + subjmap->kernel = s_tmp;
57163 + insert_subj_map_entry(subjmap);
57164 +
57165 + if (copy_from_user(s_tmp, userp,
57166 + sizeof (struct acl_subject_label)))
57167 + return ERR_PTR(-EFAULT);
57168 +
57169 + len = strnlen_user(s_tmp->filename, PATH_MAX);
57170 +
57171 + if (!len || len >= PATH_MAX)
57172 + return ERR_PTR(-EINVAL);
57173 +
57174 + if ((tmp = (char *) acl_alloc(len)) == NULL)
57175 + return ERR_PTR(-ENOMEM);
57176 +
57177 + if (copy_from_user(tmp, s_tmp->filename, len))
57178 + return ERR_PTR(-EFAULT);
57179 + tmp[len-1] = '\0';
57180 + s_tmp->filename = tmp;
57181 +
57182 + if (!strcmp(s_tmp->filename, "/"))
57183 + role->root_label = s_tmp;
57184 +
57185 + if (copy_from_user(&ghash, s_tmp->hash, sizeof(struct gr_hash_struct)))
57186 + return ERR_PTR(-EFAULT);
57187 +
57188 + /* copy user and group transition tables */
57189 +
57190 + if (s_tmp->user_trans_num) {
57191 + uid_t *uidlist;
57192 +
57193 + uidlist = (uid_t *)acl_alloc_num(s_tmp->user_trans_num, sizeof(uid_t));
57194 + if (uidlist == NULL)
57195 + return ERR_PTR(-ENOMEM);
57196 + if (copy_from_user(uidlist, s_tmp->user_transitions, s_tmp->user_trans_num * sizeof(uid_t)))
57197 + return ERR_PTR(-EFAULT);
57198 +
57199 + s_tmp->user_transitions = uidlist;
57200 + }
57201 +
57202 + if (s_tmp->group_trans_num) {
57203 + gid_t *gidlist;
57204 +
57205 + gidlist = (gid_t *)acl_alloc_num(s_tmp->group_trans_num, sizeof(gid_t));
57206 + if (gidlist == NULL)
57207 + return ERR_PTR(-ENOMEM);
57208 + if (copy_from_user(gidlist, s_tmp->group_transitions, s_tmp->group_trans_num * sizeof(gid_t)))
57209 + return ERR_PTR(-EFAULT);
57210 +
57211 + s_tmp->group_transitions = gidlist;
57212 + }
57213 +
57214 + /* set up object hash table */
57215 + num_objs = count_user_objs(ghash.first);
57216 +
57217 + s_tmp->obj_hash_size = num_objs;
57218 + s_tmp->obj_hash =
57219 + (struct acl_object_label **)
57220 + create_table(&(s_tmp->obj_hash_size), sizeof(void *));
57221 +
57222 + if (!s_tmp->obj_hash)
57223 + return ERR_PTR(-ENOMEM);
57224 +
57225 + memset(s_tmp->obj_hash, 0,
57226 + s_tmp->obj_hash_size *
57227 + sizeof (struct acl_object_label *));
57228 +
57229 + /* add in objects */
57230 + err = copy_user_objs(ghash.first, s_tmp, role);
57231 +
57232 + if (err)
57233 + return ERR_PTR(err);
57234 +
57235 + /* set pointer for parent subject */
57236 + if (s_tmp->parent_subject) {
57237 + s_tmp2 = do_copy_user_subj(s_tmp->parent_subject, role);
57238 +
57239 + if (IS_ERR(s_tmp2))
57240 + return s_tmp2;
57241 +
57242 + s_tmp->parent_subject = s_tmp2;
57243 + }
57244 +
57245 + /* add in ip acls */
57246 +
57247 + if (!s_tmp->ip_num) {
57248 + s_tmp->ips = NULL;
57249 + goto insert;
57250 + }
57251 +
57252 + i_tmp =
57253 + (struct acl_ip_label **) acl_alloc_num(s_tmp->ip_num,
57254 + sizeof (struct acl_ip_label *));
57255 +
57256 + if (!i_tmp)
57257 + return ERR_PTR(-ENOMEM);
57258 +
57259 + for (i_num = 0; i_num < s_tmp->ip_num; i_num++) {
57260 + *(i_tmp + i_num) =
57261 + (struct acl_ip_label *)
57262 + acl_alloc(sizeof (struct acl_ip_label));
57263 + if (!*(i_tmp + i_num))
57264 + return ERR_PTR(-ENOMEM);
57265 +
57266 + if (copy_from_user
57267 + (&i_utmp2, s_tmp->ips + i_num,
57268 + sizeof (struct acl_ip_label *)))
57269 + return ERR_PTR(-EFAULT);
57270 +
57271 + if (copy_from_user
57272 + (*(i_tmp + i_num), i_utmp2,
57273 + sizeof (struct acl_ip_label)))
57274 + return ERR_PTR(-EFAULT);
57275 +
57276 + if ((*(i_tmp + i_num))->iface == NULL)
57277 + continue;
57278 +
57279 + len = strnlen_user((*(i_tmp + i_num))->iface, IFNAMSIZ);
57280 + if (!len || len >= IFNAMSIZ)
57281 + return ERR_PTR(-EINVAL);
57282 + tmp = acl_alloc(len);
57283 + if (tmp == NULL)
57284 + return ERR_PTR(-ENOMEM);
57285 + if (copy_from_user(tmp, (*(i_tmp + i_num))->iface, len))
57286 + return ERR_PTR(-EFAULT);
57287 + (*(i_tmp + i_num))->iface = tmp;
57288 + }
57289 +
57290 + s_tmp->ips = i_tmp;
57291 +
57292 +insert:
57293 + if (!insert_name_entry(s_tmp->filename, s_tmp->inode,
57294 + s_tmp->device, (s_tmp->mode & GR_DELETED) ? 1 : 0))
57295 + return ERR_PTR(-ENOMEM);
57296 +
57297 + return s_tmp;
57298 +}
57299 +
57300 +static int
57301 +copy_user_subjs(struct acl_subject_label *userp, struct acl_role_label *role)
57302 +{
57303 + struct acl_subject_label s_pre;
57304 + struct acl_subject_label * ret;
57305 + int err;
57306 +
57307 + while (userp) {
57308 + if (copy_from_user(&s_pre, userp,
57309 + sizeof (struct acl_subject_label)))
57310 + return -EFAULT;
57311 +
57312 + /* do not add nested subjects here, add
57313 + while parsing objects
57314 + */
57315 +
57316 + if (s_pre.mode & GR_NESTED) {
57317 + userp = s_pre.prev;
57318 + continue;
57319 + }
57320 +
57321 + ret = do_copy_user_subj(userp, role);
57322 +
57323 + err = PTR_ERR(ret);
57324 + if (IS_ERR(ret))
57325 + return err;
57326 +
57327 + insert_acl_subj_label(ret, role);
57328 +
57329 + userp = s_pre.prev;
57330 + }
57331 +
57332 + return 0;
57333 +}
57334 +
57335 +static int
57336 +copy_user_acl(struct gr_arg *arg)
57337 +{
57338 + struct acl_role_label *r_tmp = NULL, **r_utmp, *r_utmp2;
57339 + struct sprole_pw *sptmp;
57340 + struct gr_hash_struct *ghash;
57341 + uid_t *domainlist;
57342 + unsigned int r_num;
57343 + unsigned int len;
57344 + char *tmp;
57345 + int err = 0;
57346 + __u16 i;
57347 + __u32 num_subjs;
57348 +
57349 + /* we need a default and kernel role */
57350 + if (arg->role_db.num_roles < 2)
57351 + return -EINVAL;
57352 +
57353 + /* copy special role authentication info from userspace */
57354 +
57355 + num_sprole_pws = arg->num_sprole_pws;
57356 + acl_special_roles = (struct sprole_pw **) acl_alloc_num(num_sprole_pws, sizeof(struct sprole_pw *));
57357 +
57358 + if (!acl_special_roles) {
57359 + err = -ENOMEM;
57360 + goto cleanup;
57361 + }
57362 +
57363 + for (i = 0; i < num_sprole_pws; i++) {
57364 + sptmp = (struct sprole_pw *) acl_alloc(sizeof(struct sprole_pw));
57365 + if (!sptmp) {
57366 + err = -ENOMEM;
57367 + goto cleanup;
57368 + }
57369 + if (copy_from_user(sptmp, arg->sprole_pws + i,
57370 + sizeof (struct sprole_pw))) {
57371 + err = -EFAULT;
57372 + goto cleanup;
57373 + }
57374 +
57375 + len =
57376 + strnlen_user(sptmp->rolename, GR_SPROLE_LEN);
57377 +
57378 + if (!len || len >= GR_SPROLE_LEN) {
57379 + err = -EINVAL;
57380 + goto cleanup;
57381 + }
57382 +
57383 + if ((tmp = (char *) acl_alloc(len)) == NULL) {
57384 + err = -ENOMEM;
57385 + goto cleanup;
57386 + }
57387 +
57388 + if (copy_from_user(tmp, sptmp->rolename, len)) {
57389 + err = -EFAULT;
57390 + goto cleanup;
57391 + }
57392 + tmp[len-1] = '\0';
57393 +#ifdef CONFIG_GRKERNSEC_RBAC_DEBUG
57394 + printk(KERN_ALERT "Copying special role %s\n", tmp);
57395 +#endif
57396 + sptmp->rolename = tmp;
57397 + acl_special_roles[i] = sptmp;
57398 + }
57399 +
57400 + r_utmp = (struct acl_role_label **) arg->role_db.r_table;
57401 +
57402 + for (r_num = 0; r_num < arg->role_db.num_roles; r_num++) {
57403 + r_tmp = acl_alloc(sizeof (struct acl_role_label));
57404 +
57405 + if (!r_tmp) {
57406 + err = -ENOMEM;
57407 + goto cleanup;
57408 + }
57409 +
57410 + if (copy_from_user(&r_utmp2, r_utmp + r_num,
57411 + sizeof (struct acl_role_label *))) {
57412 + err = -EFAULT;
57413 + goto cleanup;
57414 + }
57415 +
57416 + if (copy_from_user(r_tmp, r_utmp2,
57417 + sizeof (struct acl_role_label))) {
57418 + err = -EFAULT;
57419 + goto cleanup;
57420 + }
57421 +
57422 + len = strnlen_user(r_tmp->rolename, GR_SPROLE_LEN);
57423 +
57424 + if (!len || len >= PATH_MAX) {
57425 + err = -EINVAL;
57426 + goto cleanup;
57427 + }
57428 +
57429 + if ((tmp = (char *) acl_alloc(len)) == NULL) {
57430 + err = -ENOMEM;
57431 + goto cleanup;
57432 + }
57433 + if (copy_from_user(tmp, r_tmp->rolename, len)) {
57434 + err = -EFAULT;
57435 + goto cleanup;
57436 + }
57437 + tmp[len-1] = '\0';
57438 + r_tmp->rolename = tmp;
57439 +
57440 + if (!strcmp(r_tmp->rolename, "default")
57441 + && (r_tmp->roletype & GR_ROLE_DEFAULT)) {
57442 + default_role = r_tmp;
57443 + } else if (!strcmp(r_tmp->rolename, ":::kernel:::")) {
57444 + kernel_role = r_tmp;
57445 + }
57446 +
57447 + if ((ghash = (struct gr_hash_struct *) acl_alloc(sizeof(struct gr_hash_struct))) == NULL) {
57448 + err = -ENOMEM;
57449 + goto cleanup;
57450 + }
57451 + if (copy_from_user(ghash, r_tmp->hash, sizeof(struct gr_hash_struct))) {
57452 + err = -EFAULT;
57453 + goto cleanup;
57454 + }
57455 +
57456 + r_tmp->hash = ghash;
57457 +
57458 + num_subjs = count_user_subjs(r_tmp->hash->first);
57459 +
57460 + r_tmp->subj_hash_size = num_subjs;
57461 + r_tmp->subj_hash =
57462 + (struct acl_subject_label **)
57463 + create_table(&(r_tmp->subj_hash_size), sizeof(void *));
57464 +
57465 + if (!r_tmp->subj_hash) {
57466 + err = -ENOMEM;
57467 + goto cleanup;
57468 + }
57469 +
57470 + err = copy_user_allowedips(r_tmp);
57471 + if (err)
57472 + goto cleanup;
57473 +
57474 + /* copy domain info */
57475 + if (r_tmp->domain_children != NULL) {
57476 + domainlist = acl_alloc_num(r_tmp->domain_child_num, sizeof(uid_t));
57477 + if (domainlist == NULL) {
57478 + err = -ENOMEM;
57479 + goto cleanup;
57480 + }
57481 + if (copy_from_user(domainlist, r_tmp->domain_children, r_tmp->domain_child_num * sizeof(uid_t))) {
57482 + err = -EFAULT;
57483 + goto cleanup;
57484 + }
57485 + r_tmp->domain_children = domainlist;
57486 + }
57487 +
57488 + err = copy_user_transitions(r_tmp);
57489 + if (err)
57490 + goto cleanup;
57491 +
57492 + memset(r_tmp->subj_hash, 0,
57493 + r_tmp->subj_hash_size *
57494 + sizeof (struct acl_subject_label *));
57495 +
57496 + err = copy_user_subjs(r_tmp->hash->first, r_tmp);
57497 +
57498 + if (err)
57499 + goto cleanup;
57500 +
57501 + /* set nested subject list to null */
57502 + r_tmp->hash->first = NULL;
57503 +
57504 + insert_acl_role_label(r_tmp);
57505 + }
57506 +
57507 + goto return_err;
57508 + cleanup:
57509 + free_variables();
57510 + return_err:
57511 + return err;
57512 +
57513 +}
57514 +
57515 +static int
57516 +gracl_init(struct gr_arg *args)
57517 +{
57518 + int error = 0;
57519 +
57520 + memcpy(gr_system_salt, args->salt, GR_SALT_LEN);
57521 + memcpy(gr_system_sum, args->sum, GR_SHA_LEN);
57522 +
57523 + if (init_variables(args)) {
57524 + gr_log_str(GR_DONT_AUDIT_GOOD, GR_INITF_ACL_MSG, GR_VERSION);
57525 + error = -ENOMEM;
57526 + free_variables();
57527 + goto out;
57528 + }
57529 +
57530 + error = copy_user_acl(args);
57531 + free_init_variables();
57532 + if (error) {
57533 + free_variables();
57534 + goto out;
57535 + }
57536 +
57537 + if ((error = gr_set_acls(0))) {
57538 + free_variables();
57539 + goto out;
57540 + }
57541 +
57542 + pax_open_kernel();
57543 + gr_status |= GR_READY;
57544 + pax_close_kernel();
57545 +
57546 + out:
57547 + return error;
57548 +}
57549 +
57550 +/* derived from glibc fnmatch() 0: match, 1: no match*/
57551 +
57552 +static int
57553 +glob_match(const char *p, const char *n)
57554 +{
57555 + char c;
57556 +
57557 + while ((c = *p++) != '\0') {
57558 + switch (c) {
57559 + case '?':
57560 + if (*n == '\0')
57561 + return 1;
57562 + else if (*n == '/')
57563 + return 1;
57564 + break;
57565 + case '\\':
57566 + if (*n != c)
57567 + return 1;
57568 + break;
57569 + case '*':
57570 + for (c = *p++; c == '?' || c == '*'; c = *p++) {
57571 + if (*n == '/')
57572 + return 1;
57573 + else if (c == '?') {
57574 + if (*n == '\0')
57575 + return 1;
57576 + else
57577 + ++n;
57578 + }
57579 + }
57580 + if (c == '\0') {
57581 + return 0;
57582 + } else {
57583 + const char *endp;
57584 +
57585 + if ((endp = strchr(n, '/')) == NULL)
57586 + endp = n + strlen(n);
57587 +
57588 + if (c == '[') {
57589 + for (--p; n < endp; ++n)
57590 + if (!glob_match(p, n))
57591 + return 0;
57592 + } else if (c == '/') {
57593 + while (*n != '\0' && *n != '/')
57594 + ++n;
57595 + if (*n == '/' && !glob_match(p, n + 1))
57596 + return 0;
57597 + } else {
57598 + for (--p; n < endp; ++n)
57599 + if (*n == c && !glob_match(p, n))
57600 + return 0;
57601 + }
57602 +
57603 + return 1;
57604 + }
57605 + case '[':
57606 + {
57607 + int not;
57608 + char cold;
57609 +
57610 + if (*n == '\0' || *n == '/')
57611 + return 1;
57612 +
57613 + not = (*p == '!' || *p == '^');
57614 + if (not)
57615 + ++p;
57616 +
57617 + c = *p++;
57618 + for (;;) {
57619 + unsigned char fn = (unsigned char)*n;
57620 +
57621 + if (c == '\0')
57622 + return 1;
57623 + else {
57624 + if (c == fn)
57625 + goto matched;
57626 + cold = c;
57627 + c = *p++;
57628 +
57629 + if (c == '-' && *p != ']') {
57630 + unsigned char cend = *p++;
57631 +
57632 + if (cend == '\0')
57633 + return 1;
57634 +
57635 + if (cold <= fn && fn <= cend)
57636 + goto matched;
57637 +
57638 + c = *p++;
57639 + }
57640 + }
57641 +
57642 + if (c == ']')
57643 + break;
57644 + }
57645 + if (!not)
57646 + return 1;
57647 + break;
57648 + matched:
57649 + while (c != ']') {
57650 + if (c == '\0')
57651 + return 1;
57652 +
57653 + c = *p++;
57654 + }
57655 + if (not)
57656 + return 1;
57657 + }
57658 + break;
57659 + default:
57660 + if (c != *n)
57661 + return 1;
57662 + }
57663 +
57664 + ++n;
57665 + }
57666 +
57667 + if (*n == '\0')
57668 + return 0;
57669 +
57670 + if (*n == '/')
57671 + return 0;
57672 +
57673 + return 1;
57674 +}
57675 +
57676 +static struct acl_object_label *
57677 +chk_glob_label(struct acl_object_label *globbed,
57678 + struct dentry *dentry, struct vfsmount *mnt, char **path)
57679 +{
57680 + struct acl_object_label *tmp;
57681 +
57682 + if (*path == NULL)
57683 + *path = gr_to_filename_nolock(dentry, mnt);
57684 +
57685 + tmp = globbed;
57686 +
57687 + while (tmp) {
57688 + if (!glob_match(tmp->filename, *path))
57689 + return tmp;
57690 + tmp = tmp->next;
57691 + }
57692 +
57693 + return NULL;
57694 +}
57695 +
57696 +static struct acl_object_label *
57697 +__full_lookup(const struct dentry *orig_dentry, const struct vfsmount *orig_mnt,
57698 + const ino_t curr_ino, const dev_t curr_dev,
57699 + const struct acl_subject_label *subj, char **path, const int checkglob)
57700 +{
57701 + struct acl_subject_label *tmpsubj;
57702 + struct acl_object_label *retval;
57703 + struct acl_object_label *retval2;
57704 +
57705 + tmpsubj = (struct acl_subject_label *) subj;
57706 + read_lock(&gr_inode_lock);
57707 + do {
57708 + retval = lookup_acl_obj_label(curr_ino, curr_dev, tmpsubj);
57709 + if (retval) {
57710 + if (checkglob && retval->globbed) {
57711 + retval2 = chk_glob_label(retval->globbed, (struct dentry *)orig_dentry,
57712 + (struct vfsmount *)orig_mnt, path);
57713 + if (retval2)
57714 + retval = retval2;
57715 + }
57716 + break;
57717 + }
57718 + } while ((tmpsubj = tmpsubj->parent_subject));
57719 + read_unlock(&gr_inode_lock);
57720 +
57721 + return retval;
57722 +}
57723 +
57724 +static __inline__ struct acl_object_label *
57725 +full_lookup(const struct dentry *orig_dentry, const struct vfsmount *orig_mnt,
57726 + const struct dentry *curr_dentry,
57727 + const struct acl_subject_label *subj, char **path, const int checkglob)
57728 +{
57729 + int newglob = checkglob;
57730 +
57731 + /* if we aren't checking a subdirectory of the original path yet, don't do glob checking
57732 + as we don't want a / * rule to match instead of the / object
57733 + don't do this for create lookups that call this function though, since they're looking up
57734 + on the parent and thus need globbing checks on all paths
57735 + */
57736 + if (orig_dentry == curr_dentry && newglob != GR_CREATE_GLOB)
57737 + newglob = GR_NO_GLOB;
57738 +
57739 + return __full_lookup(orig_dentry, orig_mnt,
57740 + curr_dentry->d_inode->i_ino,
57741 + __get_dev(curr_dentry), subj, path, newglob);
57742 +}
57743 +
57744 +static struct acl_object_label *
57745 +__chk_obj_label(const struct dentry *l_dentry, const struct vfsmount *l_mnt,
57746 + const struct acl_subject_label *subj, char *path, const int checkglob)
57747 +{
57748 + struct dentry *dentry = (struct dentry *) l_dentry;
57749 + struct vfsmount *mnt = (struct vfsmount *) l_mnt;
57750 + struct acl_object_label *retval;
57751 +
57752 + spin_lock(&dcache_lock);
57753 + spin_lock(&vfsmount_lock);
57754 +
57755 + if (unlikely((mnt == shm_mnt && dentry->d_inode->i_nlink == 0) || mnt == pipe_mnt ||
57756 +#ifdef CONFIG_NET
57757 + mnt == sock_mnt ||
57758 +#endif
57759 +#ifdef CONFIG_HUGETLBFS
57760 + (mnt == hugetlbfs_vfsmount && dentry->d_inode->i_nlink == 0) ||
57761 +#endif
57762 + /* ignore Eric Biederman */
57763 + IS_PRIVATE(l_dentry->d_inode))) {
57764 + retval = (subj->mode & GR_SHMEXEC) ? fakefs_obj_rwx : fakefs_obj_rw;
57765 + goto out;
57766 + }
57767 +
57768 + for (;;) {
57769 + if (dentry == real_root && mnt == real_root_mnt)
57770 + break;
57771 +
57772 + if (dentry == mnt->mnt_root || IS_ROOT(dentry)) {
57773 + if (mnt->mnt_parent == mnt)
57774 + break;
57775 +
57776 + retval = full_lookup(l_dentry, l_mnt, dentry, subj, &path, checkglob);
57777 + if (retval != NULL)
57778 + goto out;
57779 +
57780 + dentry = mnt->mnt_mountpoint;
57781 + mnt = mnt->mnt_parent;
57782 + continue;
57783 + }
57784 +
57785 + retval = full_lookup(l_dentry, l_mnt, dentry, subj, &path, checkglob);
57786 + if (retval != NULL)
57787 + goto out;
57788 +
57789 + dentry = dentry->d_parent;
57790 + }
57791 +
57792 + retval = full_lookup(l_dentry, l_mnt, dentry, subj, &path, checkglob);
57793 +
57794 + if (retval == NULL)
57795 + retval = full_lookup(l_dentry, l_mnt, real_root, subj, &path, checkglob);
57796 +out:
57797 + spin_unlock(&vfsmount_lock);
57798 + spin_unlock(&dcache_lock);
57799 +
57800 + BUG_ON(retval == NULL);
57801 +
57802 + return retval;
57803 +}
57804 +
57805 +static __inline__ struct acl_object_label *
57806 +chk_obj_label(const struct dentry *l_dentry, const struct vfsmount *l_mnt,
57807 + const struct acl_subject_label *subj)
57808 +{
57809 + char *path = NULL;
57810 + return __chk_obj_label(l_dentry, l_mnt, subj, path, GR_REG_GLOB);
57811 +}
57812 +
57813 +static __inline__ struct acl_object_label *
57814 +chk_obj_label_noglob(const struct dentry *l_dentry, const struct vfsmount *l_mnt,
57815 + const struct acl_subject_label *subj)
57816 +{
57817 + char *path = NULL;
57818 + return __chk_obj_label(l_dentry, l_mnt, subj, path, GR_NO_GLOB);
57819 +}
57820 +
57821 +static __inline__ struct acl_object_label *
57822 +chk_obj_create_label(const struct dentry *l_dentry, const struct vfsmount *l_mnt,
57823 + const struct acl_subject_label *subj, char *path)
57824 +{
57825 + return __chk_obj_label(l_dentry, l_mnt, subj, path, GR_CREATE_GLOB);
57826 +}
57827 +
57828 +static struct acl_subject_label *
57829 +chk_subj_label(const struct dentry *l_dentry, const struct vfsmount *l_mnt,
57830 + const struct acl_role_label *role)
57831 +{
57832 + struct dentry *dentry = (struct dentry *) l_dentry;
57833 + struct vfsmount *mnt = (struct vfsmount *) l_mnt;
57834 + struct acl_subject_label *retval;
57835 +
57836 + spin_lock(&dcache_lock);
57837 + spin_lock(&vfsmount_lock);
57838 +
57839 + for (;;) {
57840 + if (dentry == real_root && mnt == real_root_mnt)
57841 + break;
57842 + if (dentry == mnt->mnt_root || IS_ROOT(dentry)) {
57843 + if (mnt->mnt_parent == mnt)
57844 + break;
57845 +
57846 + read_lock(&gr_inode_lock);
57847 + retval =
57848 + lookup_acl_subj_label(dentry->d_inode->i_ino,
57849 + __get_dev(dentry), role);
57850 + read_unlock(&gr_inode_lock);
57851 + if (retval != NULL)
57852 + goto out;
57853 +
57854 + dentry = mnt->mnt_mountpoint;
57855 + mnt = mnt->mnt_parent;
57856 + continue;
57857 + }
57858 +
57859 + read_lock(&gr_inode_lock);
57860 + retval = lookup_acl_subj_label(dentry->d_inode->i_ino,
57861 + __get_dev(dentry), role);
57862 + read_unlock(&gr_inode_lock);
57863 + if (retval != NULL)
57864 + goto out;
57865 +
57866 + dentry = dentry->d_parent;
57867 + }
57868 +
57869 + read_lock(&gr_inode_lock);
57870 + retval = lookup_acl_subj_label(dentry->d_inode->i_ino,
57871 + __get_dev(dentry), role);
57872 + read_unlock(&gr_inode_lock);
57873 +
57874 + if (unlikely(retval == NULL)) {
57875 + read_lock(&gr_inode_lock);
57876 + retval = lookup_acl_subj_label(real_root->d_inode->i_ino,
57877 + __get_dev(real_root), role);
57878 + read_unlock(&gr_inode_lock);
57879 + }
57880 +out:
57881 + spin_unlock(&vfsmount_lock);
57882 + spin_unlock(&dcache_lock);
57883 +
57884 + BUG_ON(retval == NULL);
57885 +
57886 + return retval;
57887 +}
57888 +
57889 +static void
57890 +gr_log_learn(const struct dentry *dentry, const struct vfsmount *mnt, const __u32 mode)
57891 +{
57892 + struct task_struct *task = current;
57893 + const struct cred *cred = current_cred();
57894 +
57895 + security_learn(GR_LEARN_AUDIT_MSG, task->role->rolename, task->role->roletype,
57896 + cred->uid, cred->gid, task->exec_file ? gr_to_filename1(task->exec_file->f_path.dentry,
57897 + task->exec_file->f_path.mnt) : task->acl->filename, task->acl->filename,
57898 + 1UL, 1UL, gr_to_filename(dentry, mnt), (unsigned long) mode, &task->signal->saved_ip);
57899 +
57900 + return;
57901 +}
57902 +
57903 +static void
57904 +gr_log_learn_sysctl(const char *path, const __u32 mode)
57905 +{
57906 + struct task_struct *task = current;
57907 + const struct cred *cred = current_cred();
57908 +
57909 + security_learn(GR_LEARN_AUDIT_MSG, task->role->rolename, task->role->roletype,
57910 + cred->uid, cred->gid, task->exec_file ? gr_to_filename1(task->exec_file->f_path.dentry,
57911 + task->exec_file->f_path.mnt) : task->acl->filename, task->acl->filename,
57912 + 1UL, 1UL, path, (unsigned long) mode, &task->signal->saved_ip);
57913 +
57914 + return;
57915 +}
57916 +
57917 +static void
57918 +gr_log_learn_id_change(const char type, const unsigned int real,
57919 + const unsigned int effective, const unsigned int fs)
57920 +{
57921 + struct task_struct *task = current;
57922 + const struct cred *cred = current_cred();
57923 +
57924 + security_learn(GR_ID_LEARN_MSG, task->role->rolename, task->role->roletype,
57925 + cred->uid, cred->gid, task->exec_file ? gr_to_filename1(task->exec_file->f_path.dentry,
57926 + task->exec_file->f_path.mnt) : task->acl->filename, task->acl->filename,
57927 + type, real, effective, fs, &task->signal->saved_ip);
57928 +
57929 + return;
57930 +}
57931 +
57932 +__u32
57933 +gr_search_file(const struct dentry * dentry, const __u32 mode,
57934 + const struct vfsmount * mnt)
57935 +{
57936 + __u32 retval = mode;
57937 + struct acl_subject_label *curracl;
57938 + struct acl_object_label *currobj;
57939 +
57940 + if (unlikely(!(gr_status & GR_READY)))
57941 + return (mode & ~GR_AUDITS);
57942 +
57943 + curracl = current->acl;
57944 +
57945 + currobj = chk_obj_label(dentry, mnt, curracl);
57946 + retval = currobj->mode & mode;
57947 +
57948 + /* if we're opening a specified transfer file for writing
57949 + (e.g. /dev/initctl), then transfer our role to init
57950 + */
57951 + if (unlikely(currobj->mode & GR_INIT_TRANSFER && retval & GR_WRITE &&
57952 + current->role->roletype & GR_ROLE_PERSIST)) {
57953 + struct task_struct *task = init_pid_ns.child_reaper;
57954 +
57955 + if (task->role != current->role) {
57956 + task->acl_sp_role = 0;
57957 + task->acl_role_id = current->acl_role_id;
57958 + task->role = current->role;
57959 + rcu_read_lock();
57960 + read_lock(&grsec_exec_file_lock);
57961 + gr_apply_subject_to_task(task);
57962 + read_unlock(&grsec_exec_file_lock);
57963 + rcu_read_unlock();
57964 + gr_log_noargs(GR_DONT_AUDIT_GOOD, GR_INIT_TRANSFER_MSG);
57965 + }
57966 + }
57967 +
57968 + if (unlikely
57969 + ((curracl->mode & (GR_LEARN | GR_INHERITLEARN)) && !(mode & GR_NOPTRACE)
57970 + && (retval != (mode & ~(GR_AUDITS | GR_SUPPRESS))))) {
57971 + __u32 new_mode = mode;
57972 +
57973 + new_mode &= ~(GR_AUDITS | GR_SUPPRESS);
57974 +
57975 + retval = new_mode;
57976 +
57977 + if (new_mode & GR_EXEC && curracl->mode & GR_INHERITLEARN)
57978 + new_mode |= GR_INHERIT;
57979 +
57980 + if (!(mode & GR_NOLEARN))
57981 + gr_log_learn(dentry, mnt, new_mode);
57982 + }
57983 +
57984 + return retval;
57985 +}
57986 +
57987 +struct acl_object_label *gr_get_create_object(const struct dentry *new_dentry,
57988 + const struct dentry *parent,
57989 + const struct vfsmount *mnt)
57990 +{
57991 + struct name_entry *match;
57992 + struct acl_object_label *matchpo;
57993 + struct acl_subject_label *curracl;
57994 + char *path;
57995 +
57996 + if (unlikely(!(gr_status & GR_READY)))
57997 + return NULL;
57998 +
57999 + preempt_disable();
58000 + path = gr_to_filename_rbac(new_dentry, mnt);
58001 + match = lookup_name_entry_create(path);
58002 +
58003 + curracl = current->acl;
58004 +
58005 + if (match) {
58006 + read_lock(&gr_inode_lock);
58007 + matchpo = lookup_acl_obj_label_create(match->inode, match->device, curracl);
58008 + read_unlock(&gr_inode_lock);
58009 +
58010 + if (matchpo) {
58011 + preempt_enable();
58012 + return matchpo;
58013 + }
58014 + }
58015 +
58016 + // lookup parent
58017 +
58018 + matchpo = chk_obj_create_label(parent, mnt, curracl, path);
58019 +
58020 + preempt_enable();
58021 + return matchpo;
58022 +}
58023 +
58024 +__u32
58025 +gr_check_create(const struct dentry * new_dentry, const struct dentry * parent,
58026 + const struct vfsmount * mnt, const __u32 mode)
58027 +{
58028 + struct acl_object_label *matchpo;
58029 + __u32 retval;
58030 +
58031 + if (unlikely(!(gr_status & GR_READY)))
58032 + return (mode & ~GR_AUDITS);
58033 +
58034 + matchpo = gr_get_create_object(new_dentry, parent, mnt);
58035 +
58036 + retval = matchpo->mode & mode;
58037 +
58038 + if ((retval != (mode & ~(GR_AUDITS | GR_SUPPRESS)))
58039 + && (current->acl->mode & (GR_LEARN | GR_INHERITLEARN))) {
58040 + __u32 new_mode = mode;
58041 +
58042 + new_mode &= ~(GR_AUDITS | GR_SUPPRESS);
58043 +
58044 + gr_log_learn(new_dentry, mnt, new_mode);
58045 + return new_mode;
58046 + }
58047 +
58048 + return retval;
58049 +}
58050 +
58051 +__u32
58052 +gr_check_link(const struct dentry * new_dentry,
58053 + const struct dentry * parent_dentry,
58054 + const struct vfsmount * parent_mnt,
58055 + const struct dentry * old_dentry, const struct vfsmount * old_mnt)
58056 +{
58057 + struct acl_object_label *obj;
58058 + __u32 oldmode, newmode;
58059 + __u32 needmode;
58060 + __u32 checkmodes = GR_FIND | GR_APPEND | GR_WRITE | GR_EXEC | GR_SETID | GR_READ |
58061 + GR_DELETE | GR_INHERIT;
58062 +
58063 + if (unlikely(!(gr_status & GR_READY)))
58064 + return (GR_CREATE | GR_LINK);
58065 +
58066 + obj = chk_obj_label(old_dentry, old_mnt, current->acl);
58067 + oldmode = obj->mode;
58068 +
58069 + obj = gr_get_create_object(new_dentry, parent_dentry, parent_mnt);
58070 + newmode = obj->mode;
58071 +
58072 + needmode = newmode & checkmodes;
58073 +
58074 + // old name for hardlink must have at least the permissions of the new name
58075 + if ((oldmode & needmode) != needmode)
58076 + goto bad;
58077 +
58078 + // if old name had restrictions/auditing, make sure the new name does as well
58079 + needmode = oldmode & (GR_NOPTRACE | GR_PTRACERD | GR_INHERIT | GR_AUDITS);
58080 +
58081 + // don't allow hardlinking of suid/sgid files without permission
58082 + if (old_dentry->d_inode->i_mode & (S_ISUID | S_ISGID))
58083 + needmode |= GR_SETID;
58084 +
58085 + if ((newmode & needmode) != needmode)
58086 + goto bad;
58087 +
58088 + // enforce minimum permissions
58089 + if ((newmode & (GR_CREATE | GR_LINK)) == (GR_CREATE | GR_LINK))
58090 + return newmode;
58091 +bad:
58092 + needmode = oldmode;
58093 + if (old_dentry->d_inode->i_mode & (S_ISUID | S_ISGID))
58094 + needmode |= GR_SETID;
58095 +
58096 + if (current->acl->mode & (GR_LEARN | GR_INHERITLEARN)) {
58097 + gr_log_learn(old_dentry, old_mnt, needmode | GR_CREATE | GR_LINK);
58098 + return (GR_CREATE | GR_LINK);
58099 + } else if (newmode & GR_SUPPRESS)
58100 + return GR_SUPPRESS;
58101 + else
58102 + return 0;
58103 +}
58104 +
58105 +int
58106 +gr_check_hidden_task(const struct task_struct *task)
58107 +{
58108 + if (unlikely(!(gr_status & GR_READY)))
58109 + return 0;
58110 +
58111 + if (!(task->acl->mode & GR_PROCFIND) && !(current->acl->mode & GR_VIEW))
58112 + return 1;
58113 +
58114 + return 0;
58115 +}
58116 +
58117 +int
58118 +gr_check_protected_task(const struct task_struct *task)
58119 +{
58120 + if (unlikely(!(gr_status & GR_READY) || !task))
58121 + return 0;
58122 +
58123 + if ((task->acl->mode & GR_PROTECTED) && !(current->acl->mode & GR_KILL) &&
58124 + task->acl != current->acl)
58125 + return 1;
58126 +
58127 + return 0;
58128 +}
58129 +
58130 +int
58131 +gr_check_protected_task_fowner(struct pid *pid, enum pid_type type)
58132 +{
58133 + struct task_struct *p;
58134 + int ret = 0;
58135 +
58136 + if (unlikely(!(gr_status & GR_READY) || !pid))
58137 + return ret;
58138 +
58139 + read_lock(&tasklist_lock);
58140 + do_each_pid_task(pid, type, p) {
58141 + if ((p->acl->mode & GR_PROTECTED) && !(current->acl->mode & GR_KILL) &&
58142 + p->acl != current->acl) {
58143 + ret = 1;
58144 + goto out;
58145 + }
58146 + } while_each_pid_task(pid, type, p);
58147 +out:
58148 + read_unlock(&tasklist_lock);
58149 +
58150 + return ret;
58151 +}
58152 +
58153 +void
58154 +gr_copy_label(struct task_struct *tsk)
58155 +{
58156 + tsk->signal->used_accept = 0;
58157 + tsk->acl_sp_role = 0;
58158 + tsk->acl_role_id = current->acl_role_id;
58159 + tsk->acl = current->acl;
58160 + tsk->role = current->role;
58161 + tsk->signal->curr_ip = current->signal->curr_ip;
58162 + tsk->signal->saved_ip = current->signal->saved_ip;
58163 + if (current->exec_file)
58164 + get_file(current->exec_file);
58165 + tsk->exec_file = current->exec_file;
58166 + tsk->is_writable = current->is_writable;
58167 + if (unlikely(current->signal->used_accept)) {
58168 + current->signal->curr_ip = 0;
58169 + current->signal->saved_ip = 0;
58170 + }
58171 +
58172 + return;
58173 +}
58174 +
58175 +static void
58176 +gr_set_proc_res(struct task_struct *task)
58177 +{
58178 + struct acl_subject_label *proc;
58179 + unsigned short i;
58180 +
58181 + proc = task->acl;
58182 +
58183 + if (proc->mode & (GR_LEARN | GR_INHERITLEARN))
58184 + return;
58185 +
58186 + for (i = 0; i < RLIM_NLIMITS; i++) {
58187 + if (!(proc->resmask & (1 << i)))
58188 + continue;
58189 +
58190 + task->signal->rlim[i].rlim_cur = proc->res[i].rlim_cur;
58191 + task->signal->rlim[i].rlim_max = proc->res[i].rlim_max;
58192 + }
58193 +
58194 + return;
58195 +}
58196 +
58197 +extern int __gr_process_user_ban(struct user_struct *user);
58198 +
58199 +int
58200 +gr_check_user_change(int real, int effective, int fs)
58201 +{
58202 + unsigned int i;
58203 + __u16 num;
58204 + uid_t *uidlist;
58205 + int curuid;
58206 + int realok = 0;
58207 + int effectiveok = 0;
58208 + int fsok = 0;
58209 +
58210 +#if defined(CONFIG_GRKERNSEC_KERN_LOCKOUT) || defined(CONFIG_GRKERNSEC_BRUTE)
58211 + struct user_struct *user;
58212 +
58213 + if (real == -1)
58214 + goto skipit;
58215 +
58216 + user = find_user(real);
58217 + if (user == NULL)
58218 + goto skipit;
58219 +
58220 + if (__gr_process_user_ban(user)) {
58221 + /* for find_user */
58222 + free_uid(user);
58223 + return 1;
58224 + }
58225 +
58226 + /* for find_user */
58227 + free_uid(user);
58228 +
58229 +skipit:
58230 +#endif
58231 +
58232 + if (unlikely(!(gr_status & GR_READY)))
58233 + return 0;
58234 +
58235 + if (current->acl->mode & (GR_LEARN | GR_INHERITLEARN))
58236 + gr_log_learn_id_change('u', real, effective, fs);
58237 +
58238 + num = current->acl->user_trans_num;
58239 + uidlist = current->acl->user_transitions;
58240 +
58241 + if (uidlist == NULL)
58242 + return 0;
58243 +
58244 + if (real == -1)
58245 + realok = 1;
58246 + if (effective == -1)
58247 + effectiveok = 1;
58248 + if (fs == -1)
58249 + fsok = 1;
58250 +
58251 + if (current->acl->user_trans_type & GR_ID_ALLOW) {
58252 + for (i = 0; i < num; i++) {
58253 + curuid = (int)uidlist[i];
58254 + if (real == curuid)
58255 + realok = 1;
58256 + if (effective == curuid)
58257 + effectiveok = 1;
58258 + if (fs == curuid)
58259 + fsok = 1;
58260 + }
58261 + } else if (current->acl->user_trans_type & GR_ID_DENY) {
58262 + for (i = 0; i < num; i++) {
58263 + curuid = (int)uidlist[i];
58264 + if (real == curuid)
58265 + break;
58266 + if (effective == curuid)
58267 + break;
58268 + if (fs == curuid)
58269 + break;
58270 + }
58271 + /* not in deny list */
58272 + if (i == num) {
58273 + realok = 1;
58274 + effectiveok = 1;
58275 + fsok = 1;
58276 + }
58277 + }
58278 +
58279 + if (realok && effectiveok && fsok)
58280 + return 0;
58281 + else {
58282 + gr_log_int(GR_DONT_AUDIT, GR_USRCHANGE_ACL_MSG, realok ? (effectiveok ? (fsok ? 0 : fs) : effective) : real);
58283 + return 1;
58284 + }
58285 +}
58286 +
58287 +int
58288 +gr_check_group_change(int real, int effective, int fs)
58289 +{
58290 + unsigned int i;
58291 + __u16 num;
58292 + gid_t *gidlist;
58293 + int curgid;
58294 + int realok = 0;
58295 + int effectiveok = 0;
58296 + int fsok = 0;
58297 +
58298 + if (unlikely(!(gr_status & GR_READY)))
58299 + return 0;
58300 +
58301 + if (current->acl->mode & (GR_LEARN | GR_INHERITLEARN))
58302 + gr_log_learn_id_change('g', real, effective, fs);
58303 +
58304 + num = current->acl->group_trans_num;
58305 + gidlist = current->acl->group_transitions;
58306 +
58307 + if (gidlist == NULL)
58308 + return 0;
58309 +
58310 + if (real == -1)
58311 + realok = 1;
58312 + if (effective == -1)
58313 + effectiveok = 1;
58314 + if (fs == -1)
58315 + fsok = 1;
58316 +
58317 + if (current->acl->group_trans_type & GR_ID_ALLOW) {
58318 + for (i = 0; i < num; i++) {
58319 + curgid = (int)gidlist[i];
58320 + if (real == curgid)
58321 + realok = 1;
58322 + if (effective == curgid)
58323 + effectiveok = 1;
58324 + if (fs == curgid)
58325 + fsok = 1;
58326 + }
58327 + } else if (current->acl->group_trans_type & GR_ID_DENY) {
58328 + for (i = 0; i < num; i++) {
58329 + curgid = (int)gidlist[i];
58330 + if (real == curgid)
58331 + break;
58332 + if (effective == curgid)
58333 + break;
58334 + if (fs == curgid)
58335 + break;
58336 + }
58337 + /* not in deny list */
58338 + if (i == num) {
58339 + realok = 1;
58340 + effectiveok = 1;
58341 + fsok = 1;
58342 + }
58343 + }
58344 +
58345 + if (realok && effectiveok && fsok)
58346 + return 0;
58347 + else {
58348 + gr_log_int(GR_DONT_AUDIT, GR_GRPCHANGE_ACL_MSG, realok ? (effectiveok ? (fsok ? 0 : fs) : effective) : real);
58349 + return 1;
58350 + }
58351 +}
58352 +
58353 +void
58354 +gr_set_role_label(struct task_struct *task, const uid_t uid, const uid_t gid)
58355 +{
58356 + struct acl_role_label *role = task->role;
58357 + struct acl_subject_label *subj = NULL;
58358 + struct acl_object_label *obj;
58359 + struct file *filp;
58360 +
58361 + if (unlikely(!(gr_status & GR_READY)))
58362 + return;
58363 +
58364 + filp = task->exec_file;
58365 +
58366 + /* kernel process, we'll give them the kernel role */
58367 + if (unlikely(!filp)) {
58368 + task->role = kernel_role;
58369 + task->acl = kernel_role->root_label;
58370 + return;
58371 + } else if (!task->role || !(task->role->roletype & GR_ROLE_SPECIAL))
58372 + role = lookup_acl_role_label(task, uid, gid);
58373 +
58374 + /* perform subject lookup in possibly new role
58375 + we can use this result below in the case where role == task->role
58376 + */
58377 + subj = chk_subj_label(filp->f_path.dentry, filp->f_path.mnt, role);
58378 +
58379 + /* if we changed uid/gid, but result in the same role
58380 + and are using inheritance, don't lose the inherited subject
58381 + if current subject is other than what normal lookup
58382 + would result in, we arrived via inheritance, don't
58383 + lose subject
58384 + */
58385 + if (role != task->role || (!(task->acl->mode & GR_INHERITLEARN) &&
58386 + (subj == task->acl)))
58387 + task->acl = subj;
58388 +
58389 + task->role = role;
58390 +
58391 + task->is_writable = 0;
58392 +
58393 + /* ignore additional mmap checks for processes that are writable
58394 + by the default ACL */
58395 + obj = chk_obj_label(filp->f_path.dentry, filp->f_path.mnt, default_role->root_label);
58396 + if (unlikely(obj->mode & GR_WRITE))
58397 + task->is_writable = 1;
58398 + obj = chk_obj_label(filp->f_path.dentry, filp->f_path.mnt, task->role->root_label);
58399 + if (unlikely(obj->mode & GR_WRITE))
58400 + task->is_writable = 1;
58401 +
58402 +#ifdef CONFIG_GRKERNSEC_RBAC_DEBUG
58403 + printk(KERN_ALERT "Set role label for (%s:%d): role:%s, subject:%s\n", task->comm, task->pid, task->role->rolename, task->acl->filename);
58404 +#endif
58405 +
58406 + gr_set_proc_res(task);
58407 +
58408 + return;
58409 +}
58410 +
58411 +int
58412 +gr_set_proc_label(const struct dentry *dentry, const struct vfsmount *mnt,
58413 + const int unsafe_share)
58414 +{
58415 + struct task_struct *task = current;
58416 + struct acl_subject_label *newacl;
58417 + struct acl_object_label *obj;
58418 + __u32 retmode;
58419 +
58420 + if (unlikely(!(gr_status & GR_READY)))
58421 + return 0;
58422 +
58423 + newacl = chk_subj_label(dentry, mnt, task->role);
58424 +
58425 + task_lock(task);
58426 + if ((((task->ptrace & PT_PTRACED) || unsafe_share) &&
58427 + !(task->acl->mode & GR_POVERRIDE) && (task->acl != newacl) &&
58428 + !(task->role->roletype & GR_ROLE_GOD) &&
58429 + !gr_search_file(dentry, GR_PTRACERD, mnt) &&
58430 + !(task->acl->mode & (GR_LEARN | GR_INHERITLEARN)))) {
58431 + task_unlock(task);
58432 + if (unsafe_share)
58433 + gr_log_fs_generic(GR_DONT_AUDIT, GR_UNSAFESHARE_EXEC_ACL_MSG, dentry, mnt);
58434 + else
58435 + gr_log_fs_generic(GR_DONT_AUDIT, GR_PTRACE_EXEC_ACL_MSG, dentry, mnt);
58436 + return -EACCES;
58437 + }
58438 + task_unlock(task);
58439 +
58440 + obj = chk_obj_label(dentry, mnt, task->acl);
58441 + retmode = obj->mode & (GR_INHERIT | GR_AUDIT_INHERIT);
58442 +
58443 + if (!(task->acl->mode & GR_INHERITLEARN) &&
58444 + ((newacl->mode & GR_LEARN) || !(retmode & GR_INHERIT))) {
58445 + if (obj->nested)
58446 + task->acl = obj->nested;
58447 + else
58448 + task->acl = newacl;
58449 + } else if (retmode & GR_INHERIT && retmode & GR_AUDIT_INHERIT)
58450 + gr_log_str_fs(GR_DO_AUDIT, GR_INHERIT_ACL_MSG, task->acl->filename, dentry, mnt);
58451 +
58452 + task->is_writable = 0;
58453 +
58454 + /* ignore additional mmap checks for processes that are writable
58455 + by the default ACL */
58456 + obj = chk_obj_label(dentry, mnt, default_role->root_label);
58457 + if (unlikely(obj->mode & GR_WRITE))
58458 + task->is_writable = 1;
58459 + obj = chk_obj_label(dentry, mnt, task->role->root_label);
58460 + if (unlikely(obj->mode & GR_WRITE))
58461 + task->is_writable = 1;
58462 +
58463 + gr_set_proc_res(task);
58464 +
58465 +#ifdef CONFIG_GRKERNSEC_RBAC_DEBUG
58466 + printk(KERN_ALERT "Set subject label for (%s:%d): role:%s, subject:%s\n", task->comm, task->pid, task->role->rolename, task->acl->filename);
58467 +#endif
58468 + return 0;
58469 +}
58470 +
58471 +/* always called with valid inodev ptr */
58472 +static void
58473 +do_handle_delete(struct inodev_entry *inodev, const ino_t ino, const dev_t dev)
58474 +{
58475 + struct acl_object_label *matchpo;
58476 + struct acl_subject_label *matchps;
58477 + struct acl_subject_label *subj;
58478 + struct acl_role_label *role;
58479 + unsigned int x;
58480 +
58481 + FOR_EACH_ROLE_START(role)
58482 + FOR_EACH_SUBJECT_START(role, subj, x)
58483 + if ((matchpo = lookup_acl_obj_label(ino, dev, subj)) != NULL)
58484 + matchpo->mode |= GR_DELETED;
58485 + FOR_EACH_SUBJECT_END(subj,x)
58486 + FOR_EACH_NESTED_SUBJECT_START(role, subj)
58487 + if (subj->inode == ino && subj->device == dev)
58488 + subj->mode |= GR_DELETED;
58489 + FOR_EACH_NESTED_SUBJECT_END(subj)
58490 + if ((matchps = lookup_acl_subj_label(ino, dev, role)) != NULL)
58491 + matchps->mode |= GR_DELETED;
58492 + FOR_EACH_ROLE_END(role)
58493 +
58494 + inodev->nentry->deleted = 1;
58495 +
58496 + return;
58497 +}
58498 +
58499 +void
58500 +gr_handle_delete(const ino_t ino, const dev_t dev)
58501 +{
58502 + struct inodev_entry *inodev;
58503 +
58504 + if (unlikely(!(gr_status & GR_READY)))
58505 + return;
58506 +
58507 + write_lock(&gr_inode_lock);
58508 + inodev = lookup_inodev_entry(ino, dev);
58509 + if (inodev != NULL)
58510 + do_handle_delete(inodev, ino, dev);
58511 + write_unlock(&gr_inode_lock);
58512 +
58513 + return;
58514 +}
58515 +
58516 +static void
58517 +update_acl_obj_label(const ino_t oldinode, const dev_t olddevice,
58518 + const ino_t newinode, const dev_t newdevice,
58519 + struct acl_subject_label *subj)
58520 +{
58521 + unsigned int index = fhash(oldinode, olddevice, subj->obj_hash_size);
58522 + struct acl_object_label *match;
58523 +
58524 + match = subj->obj_hash[index];
58525 +
58526 + while (match && (match->inode != oldinode ||
58527 + match->device != olddevice ||
58528 + !(match->mode & GR_DELETED)))
58529 + match = match->next;
58530 +
58531 + if (match && (match->inode == oldinode)
58532 + && (match->device == olddevice)
58533 + && (match->mode & GR_DELETED)) {
58534 + if (match->prev == NULL) {
58535 + subj->obj_hash[index] = match->next;
58536 + if (match->next != NULL)
58537 + match->next->prev = NULL;
58538 + } else {
58539 + match->prev->next = match->next;
58540 + if (match->next != NULL)
58541 + match->next->prev = match->prev;
58542 + }
58543 + match->prev = NULL;
58544 + match->next = NULL;
58545 + match->inode = newinode;
58546 + match->device = newdevice;
58547 + match->mode &= ~GR_DELETED;
58548 +
58549 + insert_acl_obj_label(match, subj);
58550 + }
58551 +
58552 + return;
58553 +}
58554 +
58555 +static void
58556 +update_acl_subj_label(const ino_t oldinode, const dev_t olddevice,
58557 + const ino_t newinode, const dev_t newdevice,
58558 + struct acl_role_label *role)
58559 +{
58560 + unsigned int index = fhash(oldinode, olddevice, role->subj_hash_size);
58561 + struct acl_subject_label *match;
58562 +
58563 + match = role->subj_hash[index];
58564 +
58565 + while (match && (match->inode != oldinode ||
58566 + match->device != olddevice ||
58567 + !(match->mode & GR_DELETED)))
58568 + match = match->next;
58569 +
58570 + if (match && (match->inode == oldinode)
58571 + && (match->device == olddevice)
58572 + && (match->mode & GR_DELETED)) {
58573 + if (match->prev == NULL) {
58574 + role->subj_hash[index] = match->next;
58575 + if (match->next != NULL)
58576 + match->next->prev = NULL;
58577 + } else {
58578 + match->prev->next = match->next;
58579 + if (match->next != NULL)
58580 + match->next->prev = match->prev;
58581 + }
58582 + match->prev = NULL;
58583 + match->next = NULL;
58584 + match->inode = newinode;
58585 + match->device = newdevice;
58586 + match->mode &= ~GR_DELETED;
58587 +
58588 + insert_acl_subj_label(match, role);
58589 + }
58590 +
58591 + return;
58592 +}
58593 +
58594 +static void
58595 +update_inodev_entry(const ino_t oldinode, const dev_t olddevice,
58596 + const ino_t newinode, const dev_t newdevice)
58597 +{
58598 + unsigned int index = fhash(oldinode, olddevice, inodev_set.i_size);
58599 + struct inodev_entry *match;
58600 +
58601 + match = inodev_set.i_hash[index];
58602 +
58603 + while (match && (match->nentry->inode != oldinode ||
58604 + match->nentry->device != olddevice || !match->nentry->deleted))
58605 + match = match->next;
58606 +
58607 + if (match && (match->nentry->inode == oldinode)
58608 + && (match->nentry->device == olddevice) &&
58609 + match->nentry->deleted) {
58610 + if (match->prev == NULL) {
58611 + inodev_set.i_hash[index] = match->next;
58612 + if (match->next != NULL)
58613 + match->next->prev = NULL;
58614 + } else {
58615 + match->prev->next = match->next;
58616 + if (match->next != NULL)
58617 + match->next->prev = match->prev;
58618 + }
58619 + match->prev = NULL;
58620 + match->next = NULL;
58621 + match->nentry->inode = newinode;
58622 + match->nentry->device = newdevice;
58623 + match->nentry->deleted = 0;
58624 +
58625 + insert_inodev_entry(match);
58626 + }
58627 +
58628 + return;
58629 +}
58630 +
58631 +static void
58632 +__do_handle_create(const struct name_entry *matchn, ino_t inode, dev_t dev)
58633 +{
58634 + struct acl_subject_label *subj;
58635 + struct acl_role_label *role;
58636 + unsigned int x;
58637 +
58638 + FOR_EACH_ROLE_START(role)
58639 + update_acl_subj_label(matchn->inode, matchn->device,
58640 + inode, dev, role);
58641 +
58642 + FOR_EACH_NESTED_SUBJECT_START(role, subj)
58643 + if ((subj->inode == inode) && (subj->device == dev)) {
58644 + subj->inode = inode;
58645 + subj->device = dev;
58646 + }
58647 + FOR_EACH_NESTED_SUBJECT_END(subj)
58648 + FOR_EACH_SUBJECT_START(role, subj, x)
58649 + update_acl_obj_label(matchn->inode, matchn->device,
58650 + inode, dev, subj);
58651 + FOR_EACH_SUBJECT_END(subj,x)
58652 + FOR_EACH_ROLE_END(role)
58653 +
58654 + update_inodev_entry(matchn->inode, matchn->device, inode, dev);
58655 +
58656 + return;
58657 +}
58658 +
58659 +static void
58660 +do_handle_create(const struct name_entry *matchn, const struct dentry *dentry,
58661 + const struct vfsmount *mnt)
58662 +{
58663 + ino_t ino = dentry->d_inode->i_ino;
58664 + dev_t dev = __get_dev(dentry);
58665 +
58666 + __do_handle_create(matchn, ino, dev);
58667 +
58668 + return;
58669 +}
58670 +
58671 +void
58672 +gr_handle_create(const struct dentry *dentry, const struct vfsmount *mnt)
58673 +{
58674 + struct name_entry *matchn;
58675 +
58676 + if (unlikely(!(gr_status & GR_READY)))
58677 + return;
58678 +
58679 + preempt_disable();
58680 + matchn = lookup_name_entry(gr_to_filename_rbac(dentry, mnt));
58681 +
58682 + if (unlikely((unsigned long)matchn)) {
58683 + write_lock(&gr_inode_lock);
58684 + do_handle_create(matchn, dentry, mnt);
58685 + write_unlock(&gr_inode_lock);
58686 + }
58687 + preempt_enable();
58688 +
58689 + return;
58690 +}
58691 +
58692 +void
58693 +gr_handle_proc_create(const struct dentry *dentry, const struct inode *inode)
58694 +{
58695 + struct name_entry *matchn;
58696 +
58697 + if (unlikely(!(gr_status & GR_READY)))
58698 + return;
58699 +
58700 + preempt_disable();
58701 + matchn = lookup_name_entry(gr_to_proc_filename_rbac(dentry, init_pid_ns.proc_mnt));
58702 +
58703 + if (unlikely((unsigned long)matchn)) {
58704 + write_lock(&gr_inode_lock);
58705 + __do_handle_create(matchn, inode->i_ino, inode->i_sb->s_dev);
58706 + write_unlock(&gr_inode_lock);
58707 + }
58708 + preempt_enable();
58709 +
58710 + return;
58711 +}
58712 +
58713 +void
58714 +gr_handle_rename(struct inode *old_dir, struct inode *new_dir,
58715 + struct dentry *old_dentry,
58716 + struct dentry *new_dentry,
58717 + struct vfsmount *mnt, const __u8 replace)
58718 +{
58719 + struct name_entry *matchn;
58720 + struct inodev_entry *inodev;
58721 + struct inode *inode = new_dentry->d_inode;
58722 + ino_t oldinode = old_dentry->d_inode->i_ino;
58723 + dev_t olddev = __get_dev(old_dentry);
58724 +
58725 + /* vfs_rename swaps the name and parent link for old_dentry and
58726 + new_dentry
58727 + at this point, old_dentry has the new name, parent link, and inode
58728 + for the renamed file
58729 + if a file is being replaced by a rename, new_dentry has the inode
58730 + and name for the replaced file
58731 + */
58732 +
58733 + if (unlikely(!(gr_status & GR_READY)))
58734 + return;
58735 +
58736 + preempt_disable();
58737 + matchn = lookup_name_entry(gr_to_filename_rbac(old_dentry, mnt));
58738 +
58739 + /* we wouldn't have to check d_inode if it weren't for
58740 + NFS silly-renaming
58741 + */
58742 +
58743 + write_lock(&gr_inode_lock);
58744 + if (unlikely(replace && inode)) {
58745 + ino_t newinode = inode->i_ino;
58746 + dev_t newdev = __get_dev(new_dentry);
58747 + inodev = lookup_inodev_entry(newinode, newdev);
58748 + if (inodev != NULL && ((inode->i_nlink <= 1) || S_ISDIR(inode->i_mode)))
58749 + do_handle_delete(inodev, newinode, newdev);
58750 + }
58751 +
58752 + inodev = lookup_inodev_entry(oldinode, olddev);
58753 + if (inodev != NULL && ((old_dentry->d_inode->i_nlink <= 1) || S_ISDIR(old_dentry->d_inode->i_mode)))
58754 + do_handle_delete(inodev, oldinode, olddev);
58755 +
58756 + if (unlikely((unsigned long)matchn))
58757 + do_handle_create(matchn, old_dentry, mnt);
58758 +
58759 + write_unlock(&gr_inode_lock);
58760 + preempt_enable();
58761 +
58762 + return;
58763 +}
58764 +
58765 +static int
58766 +lookup_special_role_auth(__u16 mode, const char *rolename, unsigned char **salt,
58767 + unsigned char **sum)
58768 +{
58769 + struct acl_role_label *r;
58770 + struct role_allowed_ip *ipp;
58771 + struct role_transition *trans;
58772 + unsigned int i;
58773 + int found = 0;
58774 + u32 curr_ip = current->signal->curr_ip;
58775 +
58776 + current->signal->saved_ip = curr_ip;
58777 +
58778 + /* check transition table */
58779 +
58780 + for (trans = current->role->transitions; trans; trans = trans->next) {
58781 + if (!strcmp(rolename, trans->rolename)) {
58782 + found = 1;
58783 + break;
58784 + }
58785 + }
58786 +
58787 + if (!found)
58788 + return 0;
58789 +
58790 + /* handle special roles that do not require authentication
58791 + and check ip */
58792 +
58793 + FOR_EACH_ROLE_START(r)
58794 + if (!strcmp(rolename, r->rolename) &&
58795 + (r->roletype & GR_ROLE_SPECIAL)) {
58796 + found = 0;
58797 + if (r->allowed_ips != NULL) {
58798 + for (ipp = r->allowed_ips; ipp; ipp = ipp->next) {
58799 + if ((ntohl(curr_ip) & ipp->netmask) ==
58800 + (ntohl(ipp->addr) & ipp->netmask))
58801 + found = 1;
58802 + }
58803 + } else
58804 + found = 2;
58805 + if (!found)
58806 + return 0;
58807 +
58808 + if (((mode == GR_SPROLE) && (r->roletype & GR_ROLE_NOPW)) ||
58809 + ((mode == GR_SPROLEPAM) && (r->roletype & GR_ROLE_PAM))) {
58810 + *salt = NULL;
58811 + *sum = NULL;
58812 + return 1;
58813 + }
58814 + }
58815 + FOR_EACH_ROLE_END(r)
58816 +
58817 + for (i = 0; i < num_sprole_pws; i++) {
58818 + if (!strcmp(rolename, acl_special_roles[i]->rolename)) {
58819 + *salt = acl_special_roles[i]->salt;
58820 + *sum = acl_special_roles[i]->sum;
58821 + return 1;
58822 + }
58823 + }
58824 +
58825 + return 0;
58826 +}
58827 +
58828 +static void
58829 +assign_special_role(char *rolename)
58830 +{
58831 + struct acl_object_label *obj;
58832 + struct acl_role_label *r;
58833 + struct acl_role_label *assigned = NULL;
58834 + struct task_struct *tsk;
58835 + struct file *filp;
58836 +
58837 + FOR_EACH_ROLE_START(r)
58838 + if (!strcmp(rolename, r->rolename) &&
58839 + (r->roletype & GR_ROLE_SPECIAL)) {
58840 + assigned = r;
58841 + break;
58842 + }
58843 + FOR_EACH_ROLE_END(r)
58844 +
58845 + if (!assigned)
58846 + return;
58847 +
58848 + read_lock(&tasklist_lock);
58849 + read_lock(&grsec_exec_file_lock);
58850 +
58851 + tsk = current->real_parent;
58852 + if (tsk == NULL)
58853 + goto out_unlock;
58854 +
58855 + filp = tsk->exec_file;
58856 + if (filp == NULL)
58857 + goto out_unlock;
58858 +
58859 + tsk->is_writable = 0;
58860 +
58861 + tsk->acl_sp_role = 1;
58862 + tsk->acl_role_id = ++acl_sp_role_value;
58863 + tsk->role = assigned;
58864 + tsk->acl = chk_subj_label(filp->f_path.dentry, filp->f_path.mnt, tsk->role);
58865 +
58866 + /* ignore additional mmap checks for processes that are writable
58867 + by the default ACL */
58868 + obj = chk_obj_label(filp->f_path.dentry, filp->f_path.mnt, default_role->root_label);
58869 + if (unlikely(obj->mode & GR_WRITE))
58870 + tsk->is_writable = 1;
58871 + obj = chk_obj_label(filp->f_path.dentry, filp->f_path.mnt, tsk->role->root_label);
58872 + if (unlikely(obj->mode & GR_WRITE))
58873 + tsk->is_writable = 1;
58874 +
58875 +#ifdef CONFIG_GRKERNSEC_RBAC_DEBUG
58876 + printk(KERN_ALERT "Assigning special role:%s subject:%s to process (%s:%d)\n", tsk->role->rolename, tsk->acl->filename, tsk->comm, tsk->pid);
58877 +#endif
58878 +
58879 +out_unlock:
58880 + read_unlock(&grsec_exec_file_lock);
58881 + read_unlock(&tasklist_lock);
58882 + return;
58883 +}
58884 +
58885 +int gr_check_secure_terminal(struct task_struct *task)
58886 +{
58887 + struct task_struct *p, *p2, *p3;
58888 + struct files_struct *files;
58889 + struct fdtable *fdt;
58890 + struct file *our_file = NULL, *file;
58891 + int i;
58892 +
58893 + if (task->signal->tty == NULL)
58894 + return 1;
58895 +
58896 + files = get_files_struct(task);
58897 + if (files != NULL) {
58898 + rcu_read_lock();
58899 + fdt = files_fdtable(files);
58900 + for (i=0; i < fdt->max_fds; i++) {
58901 + file = fcheck_files(files, i);
58902 + if (file && (our_file == NULL) && (file->private_data == task->signal->tty)) {
58903 + get_file(file);
58904 + our_file = file;
58905 + }
58906 + }
58907 + rcu_read_unlock();
58908 + put_files_struct(files);
58909 + }
58910 +
58911 + if (our_file == NULL)
58912 + return 1;
58913 +
58914 + read_lock(&tasklist_lock);
58915 + do_each_thread(p2, p) {
58916 + files = get_files_struct(p);
58917 + if (files == NULL ||
58918 + (p->signal && p->signal->tty == task->signal->tty)) {
58919 + if (files != NULL)
58920 + put_files_struct(files);
58921 + continue;
58922 + }
58923 + rcu_read_lock();
58924 + fdt = files_fdtable(files);
58925 + for (i=0; i < fdt->max_fds; i++) {
58926 + file = fcheck_files(files, i);
58927 + if (file && S_ISCHR(file->f_path.dentry->d_inode->i_mode) &&
58928 + file->f_path.dentry->d_inode->i_rdev == our_file->f_path.dentry->d_inode->i_rdev) {
58929 + p3 = task;
58930 + while (p3->pid > 0) {
58931 + if (p3 == p)
58932 + break;
58933 + p3 = p3->real_parent;
58934 + }
58935 + if (p3 == p)
58936 + break;
58937 + gr_log_ttysniff(GR_DONT_AUDIT_GOOD, GR_TTYSNIFF_ACL_MSG, p);
58938 + gr_handle_alertkill(p);
58939 + rcu_read_unlock();
58940 + put_files_struct(files);
58941 + read_unlock(&tasklist_lock);
58942 + fput(our_file);
58943 + return 0;
58944 + }
58945 + }
58946 + rcu_read_unlock();
58947 + put_files_struct(files);
58948 + } while_each_thread(p2, p);
58949 + read_unlock(&tasklist_lock);
58950 +
58951 + fput(our_file);
58952 + return 1;
58953 +}
58954 +
58955 +ssize_t
58956 +write_grsec_handler(struct file *file, const char * buf, size_t count, loff_t *ppos)
58957 +{
58958 + struct gr_arg_wrapper uwrap;
58959 + unsigned char *sprole_salt = NULL;
58960 + unsigned char *sprole_sum = NULL;
58961 + int error = sizeof (struct gr_arg_wrapper);
58962 + int error2 = 0;
58963 +
58964 + mutex_lock(&gr_dev_mutex);
58965 +
58966 + if ((gr_status & GR_READY) && !(current->acl->mode & GR_KERNELAUTH)) {
58967 + error = -EPERM;
58968 + goto out;
58969 + }
58970 +
58971 + if (count != sizeof (struct gr_arg_wrapper)) {
58972 + gr_log_int_int(GR_DONT_AUDIT_GOOD, GR_DEV_ACL_MSG, (int)count, (int)sizeof(struct gr_arg_wrapper));
58973 + error = -EINVAL;
58974 + goto out;
58975 + }
58976 +
58977 +
58978 + if (gr_auth_expires && time_after_eq(get_seconds(), gr_auth_expires)) {
58979 + gr_auth_expires = 0;
58980 + gr_auth_attempts = 0;
58981 + }
58982 +
58983 + if (copy_from_user(&uwrap, buf, sizeof (struct gr_arg_wrapper))) {
58984 + error = -EFAULT;
58985 + goto out;
58986 + }
58987 +
58988 + if ((uwrap.version != GRSECURITY_VERSION) || (uwrap.size != sizeof(struct gr_arg))) {
58989 + error = -EINVAL;
58990 + goto out;
58991 + }
58992 +
58993 + if (copy_from_user(gr_usermode, uwrap.arg, sizeof (struct gr_arg))) {
58994 + error = -EFAULT;
58995 + goto out;
58996 + }
58997 +
58998 + if (gr_usermode->mode != GR_SPROLE && gr_usermode->mode != GR_SPROLEPAM &&
58999 + gr_auth_attempts >= CONFIG_GRKERNSEC_ACL_MAXTRIES &&
59000 + time_after(gr_auth_expires, get_seconds())) {
59001 + error = -EBUSY;
59002 + goto out;
59003 + }
59004 +
59005 + /* if non-root trying to do anything other than use a special role,
59006 + do not attempt authentication, do not count towards authentication
59007 + locking
59008 + */
59009 +
59010 + if (gr_usermode->mode != GR_SPROLE && gr_usermode->mode != GR_STATUS &&
59011 + gr_usermode->mode != GR_UNSPROLE && gr_usermode->mode != GR_SPROLEPAM &&
59012 + current_uid()) {
59013 + error = -EPERM;
59014 + goto out;
59015 + }
59016 +
59017 + /* ensure pw and special role name are null terminated */
59018 +
59019 + gr_usermode->pw[GR_PW_LEN - 1] = '\0';
59020 + gr_usermode->sp_role[GR_SPROLE_LEN - 1] = '\0';
59021 +
59022 + /* Okay.
59023 + * We have our enough of the argument structure..(we have yet
59024 + * to copy_from_user the tables themselves) . Copy the tables
59025 + * only if we need them, i.e. for loading operations. */
59026 +
59027 + switch (gr_usermode->mode) {
59028 + case GR_STATUS:
59029 + if (gr_status & GR_READY) {
59030 + error = 1;
59031 + if (!gr_check_secure_terminal(current))
59032 + error = 3;
59033 + } else
59034 + error = 2;
59035 + goto out;
59036 + case GR_SHUTDOWN:
59037 + if ((gr_status & GR_READY)
59038 + && !(chkpw(gr_usermode, gr_system_salt, gr_system_sum))) {
59039 + pax_open_kernel();
59040 + gr_status &= ~GR_READY;
59041 + pax_close_kernel();
59042 +
59043 + gr_log_noargs(GR_DONT_AUDIT_GOOD, GR_SHUTS_ACL_MSG);
59044 + free_variables();
59045 + memset(gr_usermode, 0, sizeof (struct gr_arg));
59046 + memset(gr_system_salt, 0, GR_SALT_LEN);
59047 + memset(gr_system_sum, 0, GR_SHA_LEN);
59048 + } else if (gr_status & GR_READY) {
59049 + gr_log_noargs(GR_DONT_AUDIT, GR_SHUTF_ACL_MSG);
59050 + error = -EPERM;
59051 + } else {
59052 + gr_log_noargs(GR_DONT_AUDIT_GOOD, GR_SHUTI_ACL_MSG);
59053 + error = -EAGAIN;
59054 + }
59055 + break;
59056 + case GR_ENABLE:
59057 + if (!(gr_status & GR_READY) && !(error2 = gracl_init(gr_usermode)))
59058 + gr_log_str(GR_DONT_AUDIT_GOOD, GR_ENABLE_ACL_MSG, GR_VERSION);
59059 + else {
59060 + if (gr_status & GR_READY)
59061 + error = -EAGAIN;
59062 + else
59063 + error = error2;
59064 + gr_log_str(GR_DONT_AUDIT, GR_ENABLEF_ACL_MSG, GR_VERSION);
59065 + }
59066 + break;
59067 + case GR_RELOAD:
59068 + if (!(gr_status & GR_READY)) {
59069 + gr_log_str(GR_DONT_AUDIT_GOOD, GR_RELOADI_ACL_MSG, GR_VERSION);
59070 + error = -EAGAIN;
59071 + } else if (!(chkpw(gr_usermode, gr_system_salt, gr_system_sum))) {
59072 + lock_kernel();
59073 +
59074 + pax_open_kernel();
59075 + gr_status &= ~GR_READY;
59076 + pax_close_kernel();
59077 +
59078 + free_variables();
59079 + if (!(error2 = gracl_init(gr_usermode))) {
59080 + unlock_kernel();
59081 + gr_log_str(GR_DONT_AUDIT_GOOD, GR_RELOAD_ACL_MSG, GR_VERSION);
59082 + } else {
59083 + unlock_kernel();
59084 + error = error2;
59085 + gr_log_str(GR_DONT_AUDIT, GR_RELOADF_ACL_MSG, GR_VERSION);
59086 + }
59087 + } else {
59088 + gr_log_str(GR_DONT_AUDIT, GR_RELOADF_ACL_MSG, GR_VERSION);
59089 + error = -EPERM;
59090 + }
59091 + break;
59092 + case GR_SEGVMOD:
59093 + if (unlikely(!(gr_status & GR_READY))) {
59094 + gr_log_noargs(GR_DONT_AUDIT_GOOD, GR_SEGVMODI_ACL_MSG);
59095 + error = -EAGAIN;
59096 + break;
59097 + }
59098 +
59099 + if (!(chkpw(gr_usermode, gr_system_salt, gr_system_sum))) {
59100 + gr_log_noargs(GR_DONT_AUDIT_GOOD, GR_SEGVMODS_ACL_MSG);
59101 + if (gr_usermode->segv_device && gr_usermode->segv_inode) {
59102 + struct acl_subject_label *segvacl;
59103 + segvacl =
59104 + lookup_acl_subj_label(gr_usermode->segv_inode,
59105 + gr_usermode->segv_device,
59106 + current->role);
59107 + if (segvacl) {
59108 + segvacl->crashes = 0;
59109 + segvacl->expires = 0;
59110 + }
59111 + } else if (gr_find_uid(gr_usermode->segv_uid) >= 0) {
59112 + gr_remove_uid(gr_usermode->segv_uid);
59113 + }
59114 + } else {
59115 + gr_log_noargs(GR_DONT_AUDIT, GR_SEGVMODF_ACL_MSG);
59116 + error = -EPERM;
59117 + }
59118 + break;
59119 + case GR_SPROLE:
59120 + case GR_SPROLEPAM:
59121 + if (unlikely(!(gr_status & GR_READY))) {
59122 + gr_log_noargs(GR_DONT_AUDIT_GOOD, GR_SPROLEI_ACL_MSG);
59123 + error = -EAGAIN;
59124 + break;
59125 + }
59126 +
59127 + if (current->role->expires && time_after_eq(get_seconds(), current->role->expires)) {
59128 + current->role->expires = 0;
59129 + current->role->auth_attempts = 0;
59130 + }
59131 +
59132 + if (current->role->auth_attempts >= CONFIG_GRKERNSEC_ACL_MAXTRIES &&
59133 + time_after(current->role->expires, get_seconds())) {
59134 + error = -EBUSY;
59135 + goto out;
59136 + }
59137 +
59138 + if (lookup_special_role_auth
59139 + (gr_usermode->mode, gr_usermode->sp_role, &sprole_salt, &sprole_sum)
59140 + && ((!sprole_salt && !sprole_sum)
59141 + || !(chkpw(gr_usermode, sprole_salt, sprole_sum)))) {
59142 + char *p = "";
59143 + assign_special_role(gr_usermode->sp_role);
59144 + read_lock(&tasklist_lock);
59145 + if (current->real_parent)
59146 + p = current->real_parent->role->rolename;
59147 + read_unlock(&tasklist_lock);
59148 + gr_log_str_int(GR_DONT_AUDIT_GOOD, GR_SPROLES_ACL_MSG,
59149 + p, acl_sp_role_value);
59150 + } else {
59151 + gr_log_str(GR_DONT_AUDIT, GR_SPROLEF_ACL_MSG, gr_usermode->sp_role);
59152 + error = -EPERM;
59153 + if(!(current->role->auth_attempts++))
59154 + current->role->expires = get_seconds() + CONFIG_GRKERNSEC_ACL_TIMEOUT;
59155 +
59156 + goto out;
59157 + }
59158 + break;
59159 + case GR_UNSPROLE:
59160 + if (unlikely(!(gr_status & GR_READY))) {
59161 + gr_log_noargs(GR_DONT_AUDIT_GOOD, GR_UNSPROLEI_ACL_MSG);
59162 + error = -EAGAIN;
59163 + break;
59164 + }
59165 +
59166 + if (current->role->roletype & GR_ROLE_SPECIAL) {
59167 + char *p = "";
59168 + int i = 0;
59169 +
59170 + read_lock(&tasklist_lock);
59171 + if (current->real_parent) {
59172 + p = current->real_parent->role->rolename;
59173 + i = current->real_parent->acl_role_id;
59174 + }
59175 + read_unlock(&tasklist_lock);
59176 +
59177 + gr_log_str_int(GR_DONT_AUDIT_GOOD, GR_UNSPROLES_ACL_MSG, p, i);
59178 + gr_set_acls(1);
59179 + } else {
59180 + error = -EPERM;
59181 + goto out;
59182 + }
59183 + break;
59184 + default:
59185 + gr_log_int(GR_DONT_AUDIT, GR_INVMODE_ACL_MSG, gr_usermode->mode);
59186 + error = -EINVAL;
59187 + break;
59188 + }
59189 +
59190 + if (error != -EPERM)
59191 + goto out;
59192 +
59193 + if(!(gr_auth_attempts++))
59194 + gr_auth_expires = get_seconds() + CONFIG_GRKERNSEC_ACL_TIMEOUT;
59195 +
59196 + out:
59197 + mutex_unlock(&gr_dev_mutex);
59198 + return error;
59199 +}
59200 +
59201 +/* must be called with
59202 + rcu_read_lock();
59203 + read_lock(&tasklist_lock);
59204 + read_lock(&grsec_exec_file_lock);
59205 +*/
59206 +int gr_apply_subject_to_task(struct task_struct *task)
59207 +{
59208 + struct acl_object_label *obj;
59209 + char *tmpname;
59210 + struct acl_subject_label *tmpsubj;
59211 + struct file *filp;
59212 + struct name_entry *nmatch;
59213 +
59214 + filp = task->exec_file;
59215 + if (filp == NULL)
59216 + return 0;
59217 +
59218 + /* the following is to apply the correct subject
59219 + on binaries running when the RBAC system
59220 + is enabled, when the binaries have been
59221 + replaced or deleted since their execution
59222 + -----
59223 + when the RBAC system starts, the inode/dev
59224 + from exec_file will be one the RBAC system
59225 + is unaware of. It only knows the inode/dev
59226 + of the present file on disk, or the absence
59227 + of it.
59228 + */
59229 + preempt_disable();
59230 + tmpname = gr_to_filename_rbac(filp->f_path.dentry, filp->f_path.mnt);
59231 +
59232 + nmatch = lookup_name_entry(tmpname);
59233 + preempt_enable();
59234 + tmpsubj = NULL;
59235 + if (nmatch) {
59236 + if (nmatch->deleted)
59237 + tmpsubj = lookup_acl_subj_label_deleted(nmatch->inode, nmatch->device, task->role);
59238 + else
59239 + tmpsubj = lookup_acl_subj_label(nmatch->inode, nmatch->device, task->role);
59240 + if (tmpsubj != NULL)
59241 + task->acl = tmpsubj;
59242 + }
59243 + if (tmpsubj == NULL)
59244 + task->acl = chk_subj_label(filp->f_path.dentry, filp->f_path.mnt,
59245 + task->role);
59246 + if (task->acl) {
59247 + task->is_writable = 0;
59248 + /* ignore additional mmap checks for processes that are writable
59249 + by the default ACL */
59250 + obj = chk_obj_label(filp->f_path.dentry, filp->f_path.mnt, default_role->root_label);
59251 + if (unlikely(obj->mode & GR_WRITE))
59252 + task->is_writable = 1;
59253 + obj = chk_obj_label(filp->f_path.dentry, filp->f_path.mnt, task->role->root_label);
59254 + if (unlikely(obj->mode & GR_WRITE))
59255 + task->is_writable = 1;
59256 +
59257 + gr_set_proc_res(task);
59258 +
59259 +#ifdef CONFIG_GRKERNSEC_RBAC_DEBUG
59260 + printk(KERN_ALERT "gr_set_acls for (%s:%d): role:%s, subject:%s\n", task->comm, task->pid, task->role->rolename, task->acl->filename);
59261 +#endif
59262 + } else {
59263 + return 1;
59264 + }
59265 +
59266 + return 0;
59267 +}
59268 +
59269 +int
59270 +gr_set_acls(const int type)
59271 +{
59272 + struct task_struct *task, *task2;
59273 + struct acl_role_label *role = current->role;
59274 + __u16 acl_role_id = current->acl_role_id;
59275 + const struct cred *cred;
59276 + int ret;
59277 +
59278 + rcu_read_lock();
59279 + read_lock(&tasklist_lock);
59280 + read_lock(&grsec_exec_file_lock);
59281 + do_each_thread(task2, task) {
59282 + /* check to see if we're called from the exit handler,
59283 + if so, only replace ACLs that have inherited the admin
59284 + ACL */
59285 +
59286 + if (type && (task->role != role ||
59287 + task->acl_role_id != acl_role_id))
59288 + continue;
59289 +
59290 + task->acl_role_id = 0;
59291 + task->acl_sp_role = 0;
59292 +
59293 + if (task->exec_file) {
59294 + cred = __task_cred(task);
59295 + task->role = lookup_acl_role_label(task, cred->uid, cred->gid);
59296 +
59297 + ret = gr_apply_subject_to_task(task);
59298 + if (ret) {
59299 + read_unlock(&grsec_exec_file_lock);
59300 + read_unlock(&tasklist_lock);
59301 + rcu_read_unlock();
59302 + gr_log_str_int(GR_DONT_AUDIT_GOOD, GR_DEFACL_MSG, task->comm, task->pid);
59303 + return ret;
59304 + }
59305 + } else {
59306 + // it's a kernel process
59307 + task->role = kernel_role;
59308 + task->acl = kernel_role->root_label;
59309 +#ifdef CONFIG_GRKERNSEC_ACL_HIDEKERN
59310 + task->acl->mode &= ~GR_PROCFIND;
59311 +#endif
59312 + }
59313 + } while_each_thread(task2, task);
59314 + read_unlock(&grsec_exec_file_lock);
59315 + read_unlock(&tasklist_lock);
59316 + rcu_read_unlock();
59317 +
59318 + return 0;
59319 +}
59320 +
59321 +void
59322 +gr_learn_resource(const struct task_struct *task,
59323 + const int res, const unsigned long wanted, const int gt)
59324 +{
59325 + struct acl_subject_label *acl;
59326 + const struct cred *cred;
59327 +
59328 + if (unlikely((gr_status & GR_READY) &&
59329 + task->acl && (task->acl->mode & (GR_LEARN | GR_INHERITLEARN))))
59330 + goto skip_reslog;
59331 +
59332 +#ifdef CONFIG_GRKERNSEC_RESLOG
59333 + gr_log_resource(task, res, wanted, gt);
59334 +#endif
59335 + skip_reslog:
59336 +
59337 + if (unlikely(!(gr_status & GR_READY) || !wanted || res >= GR_NLIMITS))
59338 + return;
59339 +
59340 + acl = task->acl;
59341 +
59342 + if (likely(!acl || !(acl->mode & (GR_LEARN | GR_INHERITLEARN)) ||
59343 + !(acl->resmask & (1 << (unsigned short) res))))
59344 + return;
59345 +
59346 + if (wanted >= acl->res[res].rlim_cur) {
59347 + unsigned long res_add;
59348 +
59349 + res_add = wanted;
59350 + switch (res) {
59351 + case RLIMIT_CPU:
59352 + res_add += GR_RLIM_CPU_BUMP;
59353 + break;
59354 + case RLIMIT_FSIZE:
59355 + res_add += GR_RLIM_FSIZE_BUMP;
59356 + break;
59357 + case RLIMIT_DATA:
59358 + res_add += GR_RLIM_DATA_BUMP;
59359 + break;
59360 + case RLIMIT_STACK:
59361 + res_add += GR_RLIM_STACK_BUMP;
59362 + break;
59363 + case RLIMIT_CORE:
59364 + res_add += GR_RLIM_CORE_BUMP;
59365 + break;
59366 + case RLIMIT_RSS:
59367 + res_add += GR_RLIM_RSS_BUMP;
59368 + break;
59369 + case RLIMIT_NPROC:
59370 + res_add += GR_RLIM_NPROC_BUMP;
59371 + break;
59372 + case RLIMIT_NOFILE:
59373 + res_add += GR_RLIM_NOFILE_BUMP;
59374 + break;
59375 + case RLIMIT_MEMLOCK:
59376 + res_add += GR_RLIM_MEMLOCK_BUMP;
59377 + break;
59378 + case RLIMIT_AS:
59379 + res_add += GR_RLIM_AS_BUMP;
59380 + break;
59381 + case RLIMIT_LOCKS:
59382 + res_add += GR_RLIM_LOCKS_BUMP;
59383 + break;
59384 + case RLIMIT_SIGPENDING:
59385 + res_add += GR_RLIM_SIGPENDING_BUMP;
59386 + break;
59387 + case RLIMIT_MSGQUEUE:
59388 + res_add += GR_RLIM_MSGQUEUE_BUMP;
59389 + break;
59390 + case RLIMIT_NICE:
59391 + res_add += GR_RLIM_NICE_BUMP;
59392 + break;
59393 + case RLIMIT_RTPRIO:
59394 + res_add += GR_RLIM_RTPRIO_BUMP;
59395 + break;
59396 + case RLIMIT_RTTIME:
59397 + res_add += GR_RLIM_RTTIME_BUMP;
59398 + break;
59399 + }
59400 +
59401 + acl->res[res].rlim_cur = res_add;
59402 +
59403 + if (wanted > acl->res[res].rlim_max)
59404 + acl->res[res].rlim_max = res_add;
59405 +
59406 + /* only log the subject filename, since resource logging is supported for
59407 + single-subject learning only */
59408 + rcu_read_lock();
59409 + cred = __task_cred(task);
59410 + security_learn(GR_LEARN_AUDIT_MSG, task->role->rolename,
59411 + task->role->roletype, cred->uid, cred->gid, acl->filename,
59412 + acl->filename, acl->res[res].rlim_cur, acl->res[res].rlim_max,
59413 + "", (unsigned long) res, &task->signal->saved_ip);
59414 + rcu_read_unlock();
59415 + }
59416 +
59417 + return;
59418 +}
59419 +
59420 +#if defined(CONFIG_PAX_HAVE_ACL_FLAGS) && (defined(CONFIG_PAX_NOEXEC) || defined(CONFIG_PAX_ASLR))
59421 +void
59422 +pax_set_initial_flags(struct linux_binprm *bprm)
59423 +{
59424 + struct task_struct *task = current;
59425 + struct acl_subject_label *proc;
59426 + unsigned long flags;
59427 +
59428 + if (unlikely(!(gr_status & GR_READY)))
59429 + return;
59430 +
59431 + flags = pax_get_flags(task);
59432 +
59433 + proc = task->acl;
59434 +
59435 + if (proc->pax_flags & GR_PAX_DISABLE_PAGEEXEC)
59436 + flags &= ~MF_PAX_PAGEEXEC;
59437 + if (proc->pax_flags & GR_PAX_DISABLE_SEGMEXEC)
59438 + flags &= ~MF_PAX_SEGMEXEC;
59439 + if (proc->pax_flags & GR_PAX_DISABLE_RANDMMAP)
59440 + flags &= ~MF_PAX_RANDMMAP;
59441 + if (proc->pax_flags & GR_PAX_DISABLE_EMUTRAMP)
59442 + flags &= ~MF_PAX_EMUTRAMP;
59443 + if (proc->pax_flags & GR_PAX_DISABLE_MPROTECT)
59444 + flags &= ~MF_PAX_MPROTECT;
59445 +
59446 + if (proc->pax_flags & GR_PAX_ENABLE_PAGEEXEC)
59447 + flags |= MF_PAX_PAGEEXEC;
59448 + if (proc->pax_flags & GR_PAX_ENABLE_SEGMEXEC)
59449 + flags |= MF_PAX_SEGMEXEC;
59450 + if (proc->pax_flags & GR_PAX_ENABLE_RANDMMAP)
59451 + flags |= MF_PAX_RANDMMAP;
59452 + if (proc->pax_flags & GR_PAX_ENABLE_EMUTRAMP)
59453 + flags |= MF_PAX_EMUTRAMP;
59454 + if (proc->pax_flags & GR_PAX_ENABLE_MPROTECT)
59455 + flags |= MF_PAX_MPROTECT;
59456 +
59457 + pax_set_flags(task, flags);
59458 +
59459 + return;
59460 +}
59461 +#endif
59462 +
59463 +#ifdef CONFIG_SYSCTL
59464 +/* Eric Biederman likes breaking userland ABI and every inode-based security
59465 + system to save 35kb of memory */
59466 +
59467 +/* we modify the passed in filename, but adjust it back before returning */
59468 +static struct acl_object_label *gr_lookup_by_name(char *name, unsigned int len)
59469 +{
59470 + struct name_entry *nmatch;
59471 + char *p, *lastp = NULL;
59472 + struct acl_object_label *obj = NULL, *tmp;
59473 + struct acl_subject_label *tmpsubj;
59474 + char c = '\0';
59475 +
59476 + read_lock(&gr_inode_lock);
59477 +
59478 + p = name + len - 1;
59479 + do {
59480 + nmatch = lookup_name_entry(name);
59481 + if (lastp != NULL)
59482 + *lastp = c;
59483 +
59484 + if (nmatch == NULL)
59485 + goto next_component;
59486 + tmpsubj = current->acl;
59487 + do {
59488 + obj = lookup_acl_obj_label(nmatch->inode, nmatch->device, tmpsubj);
59489 + if (obj != NULL) {
59490 + tmp = obj->globbed;
59491 + while (tmp) {
59492 + if (!glob_match(tmp->filename, name)) {
59493 + obj = tmp;
59494 + goto found_obj;
59495 + }
59496 + tmp = tmp->next;
59497 + }
59498 + goto found_obj;
59499 + }
59500 + } while ((tmpsubj = tmpsubj->parent_subject));
59501 +next_component:
59502 + /* end case */
59503 + if (p == name)
59504 + break;
59505 +
59506 + while (*p != '/')
59507 + p--;
59508 + if (p == name)
59509 + lastp = p + 1;
59510 + else {
59511 + lastp = p;
59512 + p--;
59513 + }
59514 + c = *lastp;
59515 + *lastp = '\0';
59516 + } while (1);
59517 +found_obj:
59518 + read_unlock(&gr_inode_lock);
59519 + /* obj returned will always be non-null */
59520 + return obj;
59521 +}
59522 +
59523 +/* returns 0 when allowing, non-zero on error
59524 + op of 0 is used for readdir, so we don't log the names of hidden files
59525 +*/
59526 +__u32
59527 +gr_handle_sysctl(const struct ctl_table *table, const int op)
59528 +{
59529 + ctl_table *tmp;
59530 + const char *proc_sys = "/proc/sys";
59531 + char *path;
59532 + struct acl_object_label *obj;
59533 + unsigned short len = 0, pos = 0, depth = 0, i;
59534 + __u32 err = 0;
59535 + __u32 mode = 0;
59536 +
59537 + if (unlikely(!(gr_status & GR_READY)))
59538 + return 0;
59539 +
59540 + /* for now, ignore operations on non-sysctl entries if it's not a
59541 + readdir*/
59542 + if (table->child != NULL && op != 0)
59543 + return 0;
59544 +
59545 + mode |= GR_FIND;
59546 + /* it's only a read if it's an entry, read on dirs is for readdir */
59547 + if (op & MAY_READ)
59548 + mode |= GR_READ;
59549 + if (op & MAY_WRITE)
59550 + mode |= GR_WRITE;
59551 +
59552 + preempt_disable();
59553 +
59554 + path = per_cpu_ptr(gr_shared_page[0], smp_processor_id());
59555 +
59556 + /* it's only a read/write if it's an actual entry, not a dir
59557 + (which are opened for readdir)
59558 + */
59559 +
59560 + /* convert the requested sysctl entry into a pathname */
59561 +
59562 + for (tmp = (ctl_table *)table; tmp != NULL; tmp = tmp->parent) {
59563 + len += strlen(tmp->procname);
59564 + len++;
59565 + depth++;
59566 + }
59567 +
59568 + if ((len + depth + strlen(proc_sys) + 1) > PAGE_SIZE) {
59569 + /* deny */
59570 + goto out;
59571 + }
59572 +
59573 + memset(path, 0, PAGE_SIZE);
59574 +
59575 + memcpy(path, proc_sys, strlen(proc_sys));
59576 +
59577 + pos += strlen(proc_sys);
59578 +
59579 + for (; depth > 0; depth--) {
59580 + path[pos] = '/';
59581 + pos++;
59582 + for (i = 1, tmp = (ctl_table *)table; tmp != NULL; tmp = tmp->parent) {
59583 + if (depth == i) {
59584 + memcpy(path + pos, tmp->procname,
59585 + strlen(tmp->procname));
59586 + pos += strlen(tmp->procname);
59587 + }
59588 + i++;
59589 + }
59590 + }
59591 +
59592 + obj = gr_lookup_by_name(path, pos);
59593 + err = obj->mode & (mode | to_gr_audit(mode) | GR_SUPPRESS);
59594 +
59595 + if (unlikely((current->acl->mode & (GR_LEARN | GR_INHERITLEARN)) &&
59596 + ((err & mode) != mode))) {
59597 + __u32 new_mode = mode;
59598 +
59599 + new_mode &= ~(GR_AUDITS | GR_SUPPRESS);
59600 +
59601 + err = 0;
59602 + gr_log_learn_sysctl(path, new_mode);
59603 + } else if (!(err & GR_FIND) && !(err & GR_SUPPRESS) && op != 0) {
59604 + gr_log_hidden_sysctl(GR_DONT_AUDIT, GR_HIDDEN_ACL_MSG, path);
59605 + err = -ENOENT;
59606 + } else if (!(err & GR_FIND)) {
59607 + err = -ENOENT;
59608 + } else if (((err & mode) & ~GR_FIND) != (mode & ~GR_FIND) && !(err & GR_SUPPRESS)) {
59609 + gr_log_str4(GR_DONT_AUDIT, GR_SYSCTL_ACL_MSG, "denied",
59610 + path, (mode & GR_READ) ? " reading" : "",
59611 + (mode & GR_WRITE) ? " writing" : "");
59612 + err = -EACCES;
59613 + } else if ((err & mode) != mode) {
59614 + err = -EACCES;
59615 + } else if ((((err & mode) & ~GR_FIND) == (mode & ~GR_FIND)) && (err & GR_AUDITS)) {
59616 + gr_log_str4(GR_DO_AUDIT, GR_SYSCTL_ACL_MSG, "successful",
59617 + path, (mode & GR_READ) ? " reading" : "",
59618 + (mode & GR_WRITE) ? " writing" : "");
59619 + err = 0;
59620 + } else
59621 + err = 0;
59622 +
59623 + out:
59624 + preempt_enable();
59625 +
59626 + return err;
59627 +}
59628 +#endif
59629 +
59630 +int
59631 +gr_handle_proc_ptrace(struct task_struct *task)
59632 +{
59633 + struct file *filp;
59634 + struct task_struct *tmp = task;
59635 + struct task_struct *curtemp = current;
59636 + __u32 retmode;
59637 +
59638 +#ifndef CONFIG_GRKERNSEC_HARDEN_PTRACE
59639 + if (unlikely(!(gr_status & GR_READY)))
59640 + return 0;
59641 +#endif
59642 +
59643 + read_lock(&tasklist_lock);
59644 + read_lock(&grsec_exec_file_lock);
59645 + filp = task->exec_file;
59646 +
59647 + while (tmp->pid > 0) {
59648 + if (tmp == curtemp)
59649 + break;
59650 + tmp = tmp->real_parent;
59651 + }
59652 +
59653 + if (!filp || (tmp->pid == 0 && ((grsec_enable_harden_ptrace && current_uid() && !(gr_status & GR_READY)) ||
59654 + ((gr_status & GR_READY) && !(current->acl->mode & GR_RELAXPTRACE))))) {
59655 + read_unlock(&grsec_exec_file_lock);
59656 + read_unlock(&tasklist_lock);
59657 + return 1;
59658 + }
59659 +
59660 +#ifdef CONFIG_GRKERNSEC_HARDEN_PTRACE
59661 + if (!(gr_status & GR_READY)) {
59662 + read_unlock(&grsec_exec_file_lock);
59663 + read_unlock(&tasklist_lock);
59664 + return 0;
59665 + }
59666 +#endif
59667 +
59668 + retmode = gr_search_file(filp->f_path.dentry, GR_NOPTRACE, filp->f_path.mnt);
59669 + read_unlock(&grsec_exec_file_lock);
59670 + read_unlock(&tasklist_lock);
59671 +
59672 + if (retmode & GR_NOPTRACE)
59673 + return 1;
59674 +
59675 + if (!(current->acl->mode & GR_POVERRIDE) && !(current->role->roletype & GR_ROLE_GOD)
59676 + && (current->acl != task->acl || (current->acl != current->role->root_label
59677 + && current->pid != task->pid)))
59678 + return 1;
59679 +
59680 + return 0;
59681 +}
59682 +
59683 +void task_grsec_rbac(struct seq_file *m, struct task_struct *p)
59684 +{
59685 + if (unlikely(!(gr_status & GR_READY)))
59686 + return;
59687 +
59688 + if (!(current->role->roletype & GR_ROLE_GOD))
59689 + return;
59690 +
59691 + seq_printf(m, "RBAC:\t%.64s:%c:%.950s\n",
59692 + p->role->rolename, gr_task_roletype_to_char(p),
59693 + p->acl->filename);
59694 +}
59695 +
59696 +int
59697 +gr_handle_ptrace(struct task_struct *task, const long request)
59698 +{
59699 + struct task_struct *tmp = task;
59700 + struct task_struct *curtemp = current;
59701 + __u32 retmode;
59702 +
59703 +#ifndef CONFIG_GRKERNSEC_HARDEN_PTRACE
59704 + if (unlikely(!(gr_status & GR_READY)))
59705 + return 0;
59706 +#endif
59707 +
59708 + read_lock(&tasklist_lock);
59709 + while (tmp->pid > 0) {
59710 + if (tmp == curtemp)
59711 + break;
59712 + tmp = tmp->real_parent;
59713 + }
59714 +
59715 + if (tmp->pid == 0 && ((grsec_enable_harden_ptrace && current_uid() && !(gr_status & GR_READY)) ||
59716 + ((gr_status & GR_READY) && !(current->acl->mode & GR_RELAXPTRACE)))) {
59717 + read_unlock(&tasklist_lock);
59718 + gr_log_ptrace(GR_DONT_AUDIT, GR_PTRACE_ACL_MSG, task);
59719 + return 1;
59720 + }
59721 + read_unlock(&tasklist_lock);
59722 +
59723 +#ifdef CONFIG_GRKERNSEC_HARDEN_PTRACE
59724 + if (!(gr_status & GR_READY))
59725 + return 0;
59726 +#endif
59727 +
59728 + read_lock(&grsec_exec_file_lock);
59729 + if (unlikely(!task->exec_file)) {
59730 + read_unlock(&grsec_exec_file_lock);
59731 + return 0;
59732 + }
59733 +
59734 + retmode = gr_search_file(task->exec_file->f_path.dentry, GR_PTRACERD | GR_NOPTRACE, task->exec_file->f_path.mnt);
59735 + read_unlock(&grsec_exec_file_lock);
59736 +
59737 + if (retmode & GR_NOPTRACE) {
59738 + gr_log_ptrace(GR_DONT_AUDIT, GR_PTRACE_ACL_MSG, task);
59739 + return 1;
59740 + }
59741 +
59742 + if (retmode & GR_PTRACERD) {
59743 + switch (request) {
59744 + case PTRACE_POKETEXT:
59745 + case PTRACE_POKEDATA:
59746 + case PTRACE_POKEUSR:
59747 +#if !defined(CONFIG_PPC32) && !defined(CONFIG_PPC64) && !defined(CONFIG_PARISC) && !defined(CONFIG_ALPHA) && !defined(CONFIG_IA64)
59748 + case PTRACE_SETREGS:
59749 + case PTRACE_SETFPREGS:
59750 +#endif
59751 +#ifdef CONFIG_X86
59752 + case PTRACE_SETFPXREGS:
59753 +#endif
59754 +#ifdef CONFIG_ALTIVEC
59755 + case PTRACE_SETVRREGS:
59756 +#endif
59757 + return 1;
59758 + default:
59759 + return 0;
59760 + }
59761 + } else if (!(current->acl->mode & GR_POVERRIDE) &&
59762 + !(current->role->roletype & GR_ROLE_GOD) &&
59763 + (current->acl != task->acl)) {
59764 + gr_log_ptrace(GR_DONT_AUDIT, GR_PTRACE_ACL_MSG, task);
59765 + return 1;
59766 + }
59767 +
59768 + return 0;
59769 +}
59770 +
59771 +static int is_writable_mmap(const struct file *filp)
59772 +{
59773 + struct task_struct *task = current;
59774 + struct acl_object_label *obj, *obj2;
59775 +
59776 + if (gr_status & GR_READY && !(task->acl->mode & GR_OVERRIDE) &&
59777 + !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))) {
59778 + obj = chk_obj_label(filp->f_path.dentry, filp->f_path.mnt, default_role->root_label);
59779 + obj2 = chk_obj_label(filp->f_path.dentry, filp->f_path.mnt,
59780 + task->role->root_label);
59781 + if (unlikely((obj->mode & GR_WRITE) || (obj2->mode & GR_WRITE))) {
59782 + gr_log_fs_generic(GR_DONT_AUDIT, GR_WRITLIB_ACL_MSG, filp->f_path.dentry, filp->f_path.mnt);
59783 + return 1;
59784 + }
59785 + }
59786 + return 0;
59787 +}
59788 +
59789 +int
59790 +gr_acl_handle_mmap(const struct file *file, const unsigned long prot)
59791 +{
59792 + __u32 mode;
59793 +
59794 + if (unlikely(!file || !(prot & PROT_EXEC)))
59795 + return 1;
59796 +
59797 + if (is_writable_mmap(file))
59798 + return 0;
59799 +
59800 + mode =
59801 + gr_search_file(file->f_path.dentry,
59802 + GR_EXEC | GR_AUDIT_EXEC | GR_SUPPRESS,
59803 + file->f_path.mnt);
59804 +
59805 + if (!gr_tpe_allow(file))
59806 + return 0;
59807 +
59808 + if (unlikely(!(mode & GR_EXEC) && !(mode & GR_SUPPRESS))) {
59809 + gr_log_fs_rbac_generic(GR_DONT_AUDIT, GR_MMAP_ACL_MSG, file->f_path.dentry, file->f_path.mnt);
59810 + return 0;
59811 + } else if (unlikely(!(mode & GR_EXEC))) {
59812 + return 0;
59813 + } else if (unlikely(mode & GR_EXEC && mode & GR_AUDIT_EXEC)) {
59814 + gr_log_fs_rbac_generic(GR_DO_AUDIT, GR_MMAP_ACL_MSG, file->f_path.dentry, file->f_path.mnt);
59815 + return 1;
59816 + }
59817 +
59818 + return 1;
59819 +}
59820 +
59821 +int
59822 +gr_acl_handle_mprotect(const struct file *file, const unsigned long prot)
59823 +{
59824 + __u32 mode;
59825 +
59826 + if (unlikely(!file || !(prot & PROT_EXEC)))
59827 + return 1;
59828 +
59829 + if (is_writable_mmap(file))
59830 + return 0;
59831 +
59832 + mode =
59833 + gr_search_file(file->f_path.dentry,
59834 + GR_EXEC | GR_AUDIT_EXEC | GR_SUPPRESS,
59835 + file->f_path.mnt);
59836 +
59837 + if (!gr_tpe_allow(file))
59838 + return 0;
59839 +
59840 + if (unlikely(!(mode & GR_EXEC) && !(mode & GR_SUPPRESS))) {
59841 + gr_log_fs_rbac_generic(GR_DONT_AUDIT, GR_MPROTECT_ACL_MSG, file->f_path.dentry, file->f_path.mnt);
59842 + return 0;
59843 + } else if (unlikely(!(mode & GR_EXEC))) {
59844 + return 0;
59845 + } else if (unlikely(mode & GR_EXEC && mode & GR_AUDIT_EXEC)) {
59846 + gr_log_fs_rbac_generic(GR_DO_AUDIT, GR_MPROTECT_ACL_MSG, file->f_path.dentry, file->f_path.mnt);
59847 + return 1;
59848 + }
59849 +
59850 + return 1;
59851 +}
59852 +
59853 +void
59854 +gr_acl_handle_psacct(struct task_struct *task, const long code)
59855 +{
59856 + unsigned long runtime;
59857 + unsigned long cputime;
59858 + unsigned int wday, cday;
59859 + __u8 whr, chr;
59860 + __u8 wmin, cmin;
59861 + __u8 wsec, csec;
59862 + struct timespec timeval;
59863 +
59864 + if (unlikely(!(gr_status & GR_READY) || !task->acl ||
59865 + !(task->acl->mode & GR_PROCACCT)))
59866 + return;
59867 +
59868 + do_posix_clock_monotonic_gettime(&timeval);
59869 + runtime = timeval.tv_sec - task->start_time.tv_sec;
59870 + wday = runtime / (3600 * 24);
59871 + runtime -= wday * (3600 * 24);
59872 + whr = runtime / 3600;
59873 + runtime -= whr * 3600;
59874 + wmin = runtime / 60;
59875 + runtime -= wmin * 60;
59876 + wsec = runtime;
59877 +
59878 + cputime = (task->utime + task->stime) / HZ;
59879 + cday = cputime / (3600 * 24);
59880 + cputime -= cday * (3600 * 24);
59881 + chr = cputime / 3600;
59882 + cputime -= chr * 3600;
59883 + cmin = cputime / 60;
59884 + cputime -= cmin * 60;
59885 + csec = cputime;
59886 +
59887 + gr_log_procacct(GR_DO_AUDIT, GR_ACL_PROCACCT_MSG, task, wday, whr, wmin, wsec, cday, chr, cmin, csec, code);
59888 +
59889 + return;
59890 +}
59891 +
59892 +void gr_set_kernel_label(struct task_struct *task)
59893 +{
59894 + if (gr_status & GR_READY) {
59895 + task->role = kernel_role;
59896 + task->acl = kernel_role->root_label;
59897 + }
59898 + return;
59899 +}
59900 +
59901 +#ifdef CONFIG_TASKSTATS
59902 +int gr_is_taskstats_denied(int pid)
59903 +{
59904 + struct task_struct *task;
59905 +#if defined(CONFIG_GRKERNSEC_PROC_USER) || defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
59906 + const struct cred *cred;
59907 +#endif
59908 + int ret = 0;
59909 +
59910 + /* restrict taskstats viewing to un-chrooted root users
59911 + who have the 'view' subject flag if the RBAC system is enabled
59912 + */
59913 +
59914 + rcu_read_lock();
59915 + read_lock(&tasklist_lock);
59916 + task = find_task_by_vpid(pid);
59917 + if (task) {
59918 +#ifdef CONFIG_GRKERNSEC_CHROOT
59919 + if (proc_is_chrooted(task))
59920 + ret = -EACCES;
59921 +#endif
59922 +#if defined(CONFIG_GRKERNSEC_PROC_USER) || defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
59923 + cred = __task_cred(task);
59924 +#ifdef CONFIG_GRKERNSEC_PROC_USER
59925 + if (cred->uid != 0)
59926 + ret = -EACCES;
59927 +#elif defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
59928 + if (cred->uid != 0 && !groups_search(cred->group_info, CONFIG_GRKERNSEC_PROC_GID))
59929 + ret = -EACCES;
59930 +#endif
59931 +#endif
59932 + if (gr_status & GR_READY) {
59933 + if (!(task->acl->mode & GR_VIEW))
59934 + ret = -EACCES;
59935 + }
59936 + } else
59937 + ret = -ENOENT;
59938 +
59939 + read_unlock(&tasklist_lock);
59940 + rcu_read_unlock();
59941 +
59942 + return ret;
59943 +}
59944 +#endif
59945 +
59946 +/* AUXV entries are filled via a descendant of search_binary_handler
59947 + after we've already applied the subject for the target
59948 +*/
59949 +int gr_acl_enable_at_secure(void)
59950 +{
59951 + if (unlikely(!(gr_status & GR_READY)))
59952 + return 0;
59953 +
59954 + if (current->acl->mode & GR_ATSECURE)
59955 + return 1;
59956 +
59957 + return 0;
59958 +}
59959 +
59960 +int gr_acl_handle_filldir(const struct file *file, const char *name, const unsigned int namelen, const ino_t ino)
59961 +{
59962 + struct task_struct *task = current;
59963 + struct dentry *dentry = file->f_path.dentry;
59964 + struct vfsmount *mnt = file->f_path.mnt;
59965 + struct acl_object_label *obj, *tmp;
59966 + struct acl_subject_label *subj;
59967 + unsigned int bufsize;
59968 + int is_not_root;
59969 + char *path;
59970 + dev_t dev = __get_dev(dentry);
59971 +
59972 + if (unlikely(!(gr_status & GR_READY)))
59973 + return 1;
59974 +
59975 + if (task->acl->mode & (GR_LEARN | GR_INHERITLEARN))
59976 + return 1;
59977 +
59978 + /* ignore Eric Biederman */
59979 + if (IS_PRIVATE(dentry->d_inode))
59980 + return 1;
59981 +
59982 + subj = task->acl;
59983 + do {
59984 + obj = lookup_acl_obj_label(ino, dev, subj);
59985 + if (obj != NULL)
59986 + return (obj->mode & GR_FIND) ? 1 : 0;
59987 + } while ((subj = subj->parent_subject));
59988 +
59989 + /* this is purely an optimization since we're looking for an object
59990 + for the directory we're doing a readdir on
59991 + if it's possible for any globbed object to match the entry we're
59992 + filling into the directory, then the object we find here will be
59993 + an anchor point with attached globbed objects
59994 + */
59995 + obj = chk_obj_label_noglob(dentry, mnt, task->acl);
59996 + if (obj->globbed == NULL)
59997 + return (obj->mode & GR_FIND) ? 1 : 0;
59998 +
59999 + is_not_root = ((obj->filename[0] == '/') &&
60000 + (obj->filename[1] == '\0')) ? 0 : 1;
60001 + bufsize = PAGE_SIZE - namelen - is_not_root;
60002 +
60003 + /* check bufsize > PAGE_SIZE || bufsize == 0 */
60004 + if (unlikely((bufsize - 1) > (PAGE_SIZE - 1)))
60005 + return 1;
60006 +
60007 + preempt_disable();
60008 + path = d_real_path(dentry, mnt, per_cpu_ptr(gr_shared_page[0], smp_processor_id()),
60009 + bufsize);
60010 +
60011 + bufsize = strlen(path);
60012 +
60013 + /* if base is "/", don't append an additional slash */
60014 + if (is_not_root)
60015 + *(path + bufsize) = '/';
60016 + memcpy(path + bufsize + is_not_root, name, namelen);
60017 + *(path + bufsize + namelen + is_not_root) = '\0';
60018 +
60019 + tmp = obj->globbed;
60020 + while (tmp) {
60021 + if (!glob_match(tmp->filename, path)) {
60022 + preempt_enable();
60023 + return (tmp->mode & GR_FIND) ? 1 : 0;
60024 + }
60025 + tmp = tmp->next;
60026 + }
60027 + preempt_enable();
60028 + return (obj->mode & GR_FIND) ? 1 : 0;
60029 +}
60030 +
60031 +#ifdef CONFIG_NETFILTER_XT_MATCH_GRADM_MODULE
60032 +EXPORT_SYMBOL(gr_acl_is_enabled);
60033 +#endif
60034 +EXPORT_SYMBOL(gr_learn_resource);
60035 +EXPORT_SYMBOL(gr_set_kernel_label);
60036 +#ifdef CONFIG_SECURITY
60037 +EXPORT_SYMBOL(gr_check_user_change);
60038 +EXPORT_SYMBOL(gr_check_group_change);
60039 +#endif
60040 +
60041 diff --git a/grsecurity/gracl_alloc.c b/grsecurity/gracl_alloc.c
60042 new file mode 100644
60043 index 0000000..34fefda
60044 --- /dev/null
60045 +++ b/grsecurity/gracl_alloc.c
60046 @@ -0,0 +1,105 @@
60047 +#include <linux/kernel.h>
60048 +#include <linux/mm.h>
60049 +#include <linux/slab.h>
60050 +#include <linux/vmalloc.h>
60051 +#include <linux/gracl.h>
60052 +#include <linux/grsecurity.h>
60053 +
60054 +static unsigned long alloc_stack_next = 1;
60055 +static unsigned long alloc_stack_size = 1;
60056 +static void **alloc_stack;
60057 +
60058 +static __inline__ int
60059 +alloc_pop(void)
60060 +{
60061 + if (alloc_stack_next == 1)
60062 + return 0;
60063 +
60064 + kfree(alloc_stack[alloc_stack_next - 2]);
60065 +
60066 + alloc_stack_next--;
60067 +
60068 + return 1;
60069 +}
60070 +
60071 +static __inline__ int
60072 +alloc_push(void *buf)
60073 +{
60074 + if (alloc_stack_next >= alloc_stack_size)
60075 + return 1;
60076 +
60077 + alloc_stack[alloc_stack_next - 1] = buf;
60078 +
60079 + alloc_stack_next++;
60080 +
60081 + return 0;
60082 +}
60083 +
60084 +void *
60085 +acl_alloc(unsigned long len)
60086 +{
60087 + void *ret = NULL;
60088 +
60089 + if (!len || len > PAGE_SIZE)
60090 + goto out;
60091 +
60092 + ret = kmalloc(len, GFP_KERNEL);
60093 +
60094 + if (ret) {
60095 + if (alloc_push(ret)) {
60096 + kfree(ret);
60097 + ret = NULL;
60098 + }
60099 + }
60100 +
60101 +out:
60102 + return ret;
60103 +}
60104 +
60105 +void *
60106 +acl_alloc_num(unsigned long num, unsigned long len)
60107 +{
60108 + if (!len || (num > (PAGE_SIZE / len)))
60109 + return NULL;
60110 +
60111 + return acl_alloc(num * len);
60112 +}
60113 +
60114 +void
60115 +acl_free_all(void)
60116 +{
60117 + if (gr_acl_is_enabled() || !alloc_stack)
60118 + return;
60119 +
60120 + while (alloc_pop()) ;
60121 +
60122 + if (alloc_stack) {
60123 + if ((alloc_stack_size * sizeof (void *)) <= PAGE_SIZE)
60124 + kfree(alloc_stack);
60125 + else
60126 + vfree(alloc_stack);
60127 + }
60128 +
60129 + alloc_stack = NULL;
60130 + alloc_stack_size = 1;
60131 + alloc_stack_next = 1;
60132 +
60133 + return;
60134 +}
60135 +
60136 +int
60137 +acl_alloc_stack_init(unsigned long size)
60138 +{
60139 + if ((size * sizeof (void *)) <= PAGE_SIZE)
60140 + alloc_stack =
60141 + (void **) kmalloc(size * sizeof (void *), GFP_KERNEL);
60142 + else
60143 + alloc_stack = (void **) vmalloc(size * sizeof (void *));
60144 +
60145 + alloc_stack_size = size;
60146 +
60147 + if (!alloc_stack)
60148 + return 0;
60149 + else
60150 + return 1;
60151 +}
60152 diff --git a/grsecurity/gracl_cap.c b/grsecurity/gracl_cap.c
60153 new file mode 100644
60154 index 0000000..955ddfb
60155 --- /dev/null
60156 +++ b/grsecurity/gracl_cap.c
60157 @@ -0,0 +1,101 @@
60158 +#include <linux/kernel.h>
60159 +#include <linux/module.h>
60160 +#include <linux/sched.h>
60161 +#include <linux/gracl.h>
60162 +#include <linux/grsecurity.h>
60163 +#include <linux/grinternal.h>
60164 +
60165 +extern const char *captab_log[];
60166 +extern int captab_log_entries;
60167 +
60168 +int
60169 +gr_acl_is_capable(const int cap)
60170 +{
60171 + struct task_struct *task = current;
60172 + const struct cred *cred = current_cred();
60173 + struct acl_subject_label *curracl;
60174 + kernel_cap_t cap_drop = __cap_empty_set, cap_mask = __cap_empty_set;
60175 + kernel_cap_t cap_audit = __cap_empty_set;
60176 +
60177 + if (!gr_acl_is_enabled())
60178 + return 1;
60179 +
60180 + curracl = task->acl;
60181 +
60182 + cap_drop = curracl->cap_lower;
60183 + cap_mask = curracl->cap_mask;
60184 + cap_audit = curracl->cap_invert_audit;
60185 +
60186 + while ((curracl = curracl->parent_subject)) {
60187 + /* if the cap isn't specified in the current computed mask but is specified in the
60188 + current level subject, and is lowered in the current level subject, then add
60189 + it to the set of dropped capabilities
60190 + otherwise, add the current level subject's mask to the current computed mask
60191 + */
60192 + if (!cap_raised(cap_mask, cap) && cap_raised(curracl->cap_mask, cap)) {
60193 + cap_raise(cap_mask, cap);
60194 + if (cap_raised(curracl->cap_lower, cap))
60195 + cap_raise(cap_drop, cap);
60196 + if (cap_raised(curracl->cap_invert_audit, cap))
60197 + cap_raise(cap_audit, cap);
60198 + }
60199 + }
60200 +
60201 + if (!cap_raised(cap_drop, cap)) {
60202 + if (cap_raised(cap_audit, cap))
60203 + gr_log_cap(GR_DO_AUDIT, GR_CAP_ACL_MSG2, task, captab_log[cap]);
60204 + return 1;
60205 + }
60206 +
60207 + curracl = task->acl;
60208 +
60209 + if ((curracl->mode & (GR_LEARN | GR_INHERITLEARN))
60210 + && cap_raised(cred->cap_effective, cap)) {
60211 + security_learn(GR_LEARN_AUDIT_MSG, task->role->rolename,
60212 + task->role->roletype, cred->uid,
60213 + cred->gid, task->exec_file ?
60214 + gr_to_filename(task->exec_file->f_path.dentry,
60215 + task->exec_file->f_path.mnt) : curracl->filename,
60216 + curracl->filename, 0UL,
60217 + 0UL, "", (unsigned long) cap, &task->signal->saved_ip);
60218 + return 1;
60219 + }
60220 +
60221 + if ((cap >= 0) && (cap < captab_log_entries) && cap_raised(cred->cap_effective, cap) && !cap_raised(cap_audit, cap))
60222 + gr_log_cap(GR_DONT_AUDIT, GR_CAP_ACL_MSG, task, captab_log[cap]);
60223 + return 0;
60224 +}
60225 +
60226 +int
60227 +gr_acl_is_capable_nolog(const int cap)
60228 +{
60229 + struct acl_subject_label *curracl;
60230 + kernel_cap_t cap_drop = __cap_empty_set, cap_mask = __cap_empty_set;
60231 +
60232 + if (!gr_acl_is_enabled())
60233 + return 1;
60234 +
60235 + curracl = current->acl;
60236 +
60237 + cap_drop = curracl->cap_lower;
60238 + cap_mask = curracl->cap_mask;
60239 +
60240 + while ((curracl = curracl->parent_subject)) {
60241 + /* if the cap isn't specified in the current computed mask but is specified in the
60242 + current level subject, and is lowered in the current level subject, then add
60243 + it to the set of dropped capabilities
60244 + otherwise, add the current level subject's mask to the current computed mask
60245 + */
60246 + if (!cap_raised(cap_mask, cap) && cap_raised(curracl->cap_mask, cap)) {
60247 + cap_raise(cap_mask, cap);
60248 + if (cap_raised(curracl->cap_lower, cap))
60249 + cap_raise(cap_drop, cap);
60250 + }
60251 + }
60252 +
60253 + if (!cap_raised(cap_drop, cap))
60254 + return 1;
60255 +
60256 + return 0;
60257 +}
60258 +
60259 diff --git a/grsecurity/gracl_fs.c b/grsecurity/gracl_fs.c
60260 new file mode 100644
60261 index 0000000..d5f210c
60262 --- /dev/null
60263 +++ b/grsecurity/gracl_fs.c
60264 @@ -0,0 +1,433 @@
60265 +#include <linux/kernel.h>
60266 +#include <linux/sched.h>
60267 +#include <linux/types.h>
60268 +#include <linux/fs.h>
60269 +#include <linux/file.h>
60270 +#include <linux/stat.h>
60271 +#include <linux/grsecurity.h>
60272 +#include <linux/grinternal.h>
60273 +#include <linux/gracl.h>
60274 +
60275 +__u32
60276 +gr_acl_handle_hidden_file(const struct dentry * dentry,
60277 + const struct vfsmount * mnt)
60278 +{
60279 + __u32 mode;
60280 +
60281 + if (unlikely(!dentry->d_inode))
60282 + return GR_FIND;
60283 +
60284 + mode =
60285 + gr_search_file(dentry, GR_FIND | GR_AUDIT_FIND | GR_SUPPRESS, mnt);
60286 +
60287 + if (unlikely(mode & GR_FIND && mode & GR_AUDIT_FIND)) {
60288 + gr_log_fs_rbac_generic(GR_DO_AUDIT, GR_HIDDEN_ACL_MSG, dentry, mnt);
60289 + return mode;
60290 + } else if (unlikely(!(mode & GR_FIND) && !(mode & GR_SUPPRESS))) {
60291 + gr_log_fs_rbac_generic(GR_DONT_AUDIT, GR_HIDDEN_ACL_MSG, dentry, mnt);
60292 + return 0;
60293 + } else if (unlikely(!(mode & GR_FIND)))
60294 + return 0;
60295 +
60296 + return GR_FIND;
60297 +}
60298 +
60299 +__u32
60300 +gr_acl_handle_open(const struct dentry * dentry, const struct vfsmount * mnt,
60301 + int acc_mode)
60302 +{
60303 + __u32 reqmode = GR_FIND;
60304 + __u32 mode;
60305 +
60306 + if (unlikely(!dentry->d_inode))
60307 + return reqmode;
60308 +
60309 + if (acc_mode & MAY_APPEND)
60310 + reqmode |= GR_APPEND;
60311 + else if (acc_mode & MAY_WRITE)
60312 + reqmode |= GR_WRITE;
60313 + if ((acc_mode & MAY_READ) && !S_ISDIR(dentry->d_inode->i_mode))
60314 + reqmode |= GR_READ;
60315 +
60316 + mode =
60317 + gr_search_file(dentry, reqmode | to_gr_audit(reqmode) | GR_SUPPRESS,
60318 + mnt);
60319 +
60320 + if (unlikely(((mode & reqmode) == reqmode) && mode & GR_AUDITS)) {
60321 + gr_log_fs_rbac_mode2(GR_DO_AUDIT, GR_OPEN_ACL_MSG, dentry, mnt,
60322 + reqmode & GR_READ ? " reading" : "",
60323 + reqmode & GR_WRITE ? " writing" : reqmode &
60324 + GR_APPEND ? " appending" : "");
60325 + return reqmode;
60326 + } else
60327 + if (unlikely((mode & reqmode) != reqmode && !(mode & GR_SUPPRESS)))
60328 + {
60329 + gr_log_fs_rbac_mode2(GR_DONT_AUDIT, GR_OPEN_ACL_MSG, dentry, mnt,
60330 + reqmode & GR_READ ? " reading" : "",
60331 + reqmode & GR_WRITE ? " writing" : reqmode &
60332 + GR_APPEND ? " appending" : "");
60333 + return 0;
60334 + } else if (unlikely((mode & reqmode) != reqmode))
60335 + return 0;
60336 +
60337 + return reqmode;
60338 +}
60339 +
60340 +__u32
60341 +gr_acl_handle_creat(const struct dentry * dentry,
60342 + const struct dentry * p_dentry,
60343 + const struct vfsmount * p_mnt, int open_flags, int acc_mode,
60344 + const int imode)
60345 +{
60346 + __u32 reqmode = GR_WRITE | GR_CREATE;
60347 + __u32 mode;
60348 +
60349 + if (acc_mode & MAY_APPEND)
60350 + reqmode |= GR_APPEND;
60351 + // if a directory was required or the directory already exists, then
60352 + // don't count this open as a read
60353 + if ((acc_mode & MAY_READ) &&
60354 + !((open_flags & O_DIRECTORY) || (dentry->d_inode && S_ISDIR(dentry->d_inode->i_mode))))
60355 + reqmode |= GR_READ;
60356 + if ((open_flags & O_CREAT) && (imode & (S_ISUID | S_ISGID)))
60357 + reqmode |= GR_SETID;
60358 +
60359 + mode =
60360 + gr_check_create(dentry, p_dentry, p_mnt,
60361 + reqmode | to_gr_audit(reqmode) | GR_SUPPRESS);
60362 +
60363 + if (unlikely(((mode & reqmode) == reqmode) && mode & GR_AUDITS)) {
60364 + gr_log_fs_rbac_mode2(GR_DO_AUDIT, GR_CREATE_ACL_MSG, dentry, p_mnt,
60365 + reqmode & GR_READ ? " reading" : "",
60366 + reqmode & GR_WRITE ? " writing" : reqmode &
60367 + GR_APPEND ? " appending" : "");
60368 + return reqmode;
60369 + } else
60370 + if (unlikely((mode & reqmode) != reqmode && !(mode & GR_SUPPRESS)))
60371 + {
60372 + gr_log_fs_rbac_mode2(GR_DONT_AUDIT, GR_CREATE_ACL_MSG, dentry, p_mnt,
60373 + reqmode & GR_READ ? " reading" : "",
60374 + reqmode & GR_WRITE ? " writing" : reqmode &
60375 + GR_APPEND ? " appending" : "");
60376 + return 0;
60377 + } else if (unlikely((mode & reqmode) != reqmode))
60378 + return 0;
60379 +
60380 + return reqmode;
60381 +}
60382 +
60383 +__u32
60384 +gr_acl_handle_access(const struct dentry * dentry, const struct vfsmount * mnt,
60385 + const int fmode)
60386 +{
60387 + __u32 mode, reqmode = GR_FIND;
60388 +
60389 + if ((fmode & S_IXOTH) && !S_ISDIR(dentry->d_inode->i_mode))
60390 + reqmode |= GR_EXEC;
60391 + if (fmode & S_IWOTH)
60392 + reqmode |= GR_WRITE;
60393 + if (fmode & S_IROTH)
60394 + reqmode |= GR_READ;
60395 +
60396 + mode =
60397 + gr_search_file(dentry, reqmode | to_gr_audit(reqmode) | GR_SUPPRESS,
60398 + mnt);
60399 +
60400 + if (unlikely(((mode & reqmode) == reqmode) && mode & GR_AUDITS)) {
60401 + gr_log_fs_rbac_mode3(GR_DO_AUDIT, GR_ACCESS_ACL_MSG, dentry, mnt,
60402 + reqmode & GR_READ ? " reading" : "",
60403 + reqmode & GR_WRITE ? " writing" : "",
60404 + reqmode & GR_EXEC ? " executing" : "");
60405 + return reqmode;
60406 + } else
60407 + if (unlikely((mode & reqmode) != reqmode && !(mode & GR_SUPPRESS)))
60408 + {
60409 + gr_log_fs_rbac_mode3(GR_DONT_AUDIT, GR_ACCESS_ACL_MSG, dentry, mnt,
60410 + reqmode & GR_READ ? " reading" : "",
60411 + reqmode & GR_WRITE ? " writing" : "",
60412 + reqmode & GR_EXEC ? " executing" : "");
60413 + return 0;
60414 + } else if (unlikely((mode & reqmode) != reqmode))
60415 + return 0;
60416 +
60417 + return reqmode;
60418 +}
60419 +
60420 +static __u32 generic_fs_handler(const struct dentry *dentry, const struct vfsmount *mnt, __u32 reqmode, const char *fmt)
60421 +{
60422 + __u32 mode;
60423 +
60424 + mode = gr_search_file(dentry, reqmode | to_gr_audit(reqmode) | GR_SUPPRESS, mnt);
60425 +
60426 + if (unlikely(((mode & (reqmode)) == (reqmode)) && mode & GR_AUDITS)) {
60427 + gr_log_fs_rbac_generic(GR_DO_AUDIT, fmt, dentry, mnt);
60428 + return mode;
60429 + } else if (unlikely((mode & (reqmode)) != (reqmode) && !(mode & GR_SUPPRESS))) {
60430 + gr_log_fs_rbac_generic(GR_DONT_AUDIT, fmt, dentry, mnt);
60431 + return 0;
60432 + } else if (unlikely((mode & (reqmode)) != (reqmode)))
60433 + return 0;
60434 +
60435 + return (reqmode);
60436 +}
60437 +
60438 +__u32
60439 +gr_acl_handle_rmdir(const struct dentry * dentry, const struct vfsmount * mnt)
60440 +{
60441 + return generic_fs_handler(dentry, mnt, GR_WRITE | GR_DELETE , GR_RMDIR_ACL_MSG);
60442 +}
60443 +
60444 +__u32
60445 +gr_acl_handle_unlink(const struct dentry *dentry, const struct vfsmount *mnt)
60446 +{
60447 + return generic_fs_handler(dentry, mnt, GR_WRITE | GR_DELETE , GR_UNLINK_ACL_MSG);
60448 +}
60449 +
60450 +__u32
60451 +gr_acl_handle_truncate(const struct dentry *dentry, const struct vfsmount *mnt)
60452 +{
60453 + return generic_fs_handler(dentry, mnt, GR_WRITE, GR_TRUNCATE_ACL_MSG);
60454 +}
60455 +
60456 +__u32
60457 +gr_acl_handle_utime(const struct dentry *dentry, const struct vfsmount *mnt)
60458 +{
60459 + return generic_fs_handler(dentry, mnt, GR_WRITE, GR_ATIME_ACL_MSG);
60460 +}
60461 +
60462 +__u32
60463 +gr_acl_handle_fchmod(const struct dentry *dentry, const struct vfsmount *mnt,
60464 + mode_t mode)
60465 +{
60466 + if (unlikely(dentry->d_inode && S_ISSOCK(dentry->d_inode->i_mode)))
60467 + return 1;
60468 +
60469 + if (unlikely((mode != (mode_t)-1) && (mode & (S_ISUID | S_ISGID)))) {
60470 + return generic_fs_handler(dentry, mnt, GR_WRITE | GR_SETID,
60471 + GR_FCHMOD_ACL_MSG);
60472 + } else {
60473 + return generic_fs_handler(dentry, mnt, GR_WRITE, GR_FCHMOD_ACL_MSG);
60474 + }
60475 +}
60476 +
60477 +__u32
60478 +gr_acl_handle_chmod(const struct dentry *dentry, const struct vfsmount *mnt,
60479 + mode_t mode)
60480 +{
60481 + if (unlikely((mode != (mode_t)-1) && (mode & (S_ISUID | S_ISGID)))) {
60482 + return generic_fs_handler(dentry, mnt, GR_WRITE | GR_SETID,
60483 + GR_CHMOD_ACL_MSG);
60484 + } else {
60485 + return generic_fs_handler(dentry, mnt, GR_WRITE, GR_CHMOD_ACL_MSG);
60486 + }
60487 +}
60488 +
60489 +__u32
60490 +gr_acl_handle_chown(const struct dentry *dentry, const struct vfsmount *mnt)
60491 +{
60492 + return generic_fs_handler(dentry, mnt, GR_WRITE, GR_CHOWN_ACL_MSG);
60493 +}
60494 +
60495 +__u32
60496 +gr_acl_handle_setxattr(const struct dentry *dentry, const struct vfsmount *mnt)
60497 +{
60498 + return generic_fs_handler(dentry, mnt, GR_WRITE, GR_SETXATTR_ACL_MSG);
60499 +}
60500 +
60501 +__u32
60502 +gr_acl_handle_execve(const struct dentry *dentry, const struct vfsmount *mnt)
60503 +{
60504 + return generic_fs_handler(dentry, mnt, GR_EXEC, GR_EXEC_ACL_MSG);
60505 +}
60506 +
60507 +__u32
60508 +gr_acl_handle_unix(const struct dentry *dentry, const struct vfsmount *mnt)
60509 +{
60510 + return generic_fs_handler(dentry, mnt, GR_READ | GR_WRITE,
60511 + GR_UNIXCONNECT_ACL_MSG);
60512 +}
60513 +
60514 +/* hardlinks require at minimum create and link permission,
60515 + any additional privilege required is based on the
60516 + privilege of the file being linked to
60517 +*/
60518 +__u32
60519 +gr_acl_handle_link(const struct dentry * new_dentry,
60520 + const struct dentry * parent_dentry,
60521 + const struct vfsmount * parent_mnt,
60522 + const struct dentry * old_dentry,
60523 + const struct vfsmount * old_mnt, const char *to)
60524 +{
60525 + __u32 mode;
60526 + __u32 needmode = GR_CREATE | GR_LINK;
60527 + __u32 needaudit = GR_AUDIT_CREATE | GR_AUDIT_LINK;
60528 +
60529 + mode =
60530 + gr_check_link(new_dentry, parent_dentry, parent_mnt, old_dentry,
60531 + old_mnt);
60532 +
60533 + if (unlikely(((mode & needmode) == needmode) && (mode & needaudit))) {
60534 + gr_log_fs_rbac_str(GR_DO_AUDIT, GR_LINK_ACL_MSG, old_dentry, old_mnt, to);
60535 + return mode;
60536 + } else if (unlikely(((mode & needmode) != needmode) && !(mode & GR_SUPPRESS))) {
60537 + gr_log_fs_rbac_str(GR_DONT_AUDIT, GR_LINK_ACL_MSG, old_dentry, old_mnt, to);
60538 + return 0;
60539 + } else if (unlikely((mode & needmode) != needmode))
60540 + return 0;
60541 +
60542 + return 1;
60543 +}
60544 +
60545 +__u32
60546 +gr_acl_handle_symlink(const struct dentry * new_dentry,
60547 + const struct dentry * parent_dentry,
60548 + const struct vfsmount * parent_mnt, const char *from)
60549 +{
60550 + __u32 needmode = GR_WRITE | GR_CREATE;
60551 + __u32 mode;
60552 +
60553 + mode =
60554 + gr_check_create(new_dentry, parent_dentry, parent_mnt,
60555 + GR_CREATE | GR_AUDIT_CREATE |
60556 + GR_WRITE | GR_AUDIT_WRITE | GR_SUPPRESS);
60557 +
60558 + if (unlikely(mode & GR_WRITE && mode & GR_AUDITS)) {
60559 + gr_log_fs_str_rbac(GR_DO_AUDIT, GR_SYMLINK_ACL_MSG, from, new_dentry, parent_mnt);
60560 + return mode;
60561 + } else if (unlikely(((mode & needmode) != needmode) && !(mode & GR_SUPPRESS))) {
60562 + gr_log_fs_str_rbac(GR_DONT_AUDIT, GR_SYMLINK_ACL_MSG, from, new_dentry, parent_mnt);
60563 + return 0;
60564 + } else if (unlikely((mode & needmode) != needmode))
60565 + return 0;
60566 +
60567 + return (GR_WRITE | GR_CREATE);
60568 +}
60569 +
60570 +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)
60571 +{
60572 + __u32 mode;
60573 +
60574 + mode = gr_check_create(new_dentry, parent_dentry, parent_mnt, reqmode | to_gr_audit(reqmode) | GR_SUPPRESS);
60575 +
60576 + if (unlikely(((mode & (reqmode)) == (reqmode)) && mode & GR_AUDITS)) {
60577 + gr_log_fs_rbac_generic(GR_DO_AUDIT, fmt, new_dentry, parent_mnt);
60578 + return mode;
60579 + } else if (unlikely((mode & (reqmode)) != (reqmode) && !(mode & GR_SUPPRESS))) {
60580 + gr_log_fs_rbac_generic(GR_DONT_AUDIT, fmt, new_dentry, parent_mnt);
60581 + return 0;
60582 + } else if (unlikely((mode & (reqmode)) != (reqmode)))
60583 + return 0;
60584 +
60585 + return (reqmode);
60586 +}
60587 +
60588 +__u32
60589 +gr_acl_handle_mknod(const struct dentry * new_dentry,
60590 + const struct dentry * parent_dentry,
60591 + const struct vfsmount * parent_mnt,
60592 + const int mode)
60593 +{
60594 + __u32 reqmode = GR_WRITE | GR_CREATE;
60595 + if (unlikely(mode & (S_ISUID | S_ISGID)))
60596 + reqmode |= GR_SETID;
60597 +
60598 + return generic_fs_create_handler(new_dentry, parent_dentry, parent_mnt,
60599 + reqmode, GR_MKNOD_ACL_MSG);
60600 +}
60601 +
60602 +__u32
60603 +gr_acl_handle_mkdir(const struct dentry *new_dentry,
60604 + const struct dentry *parent_dentry,
60605 + const struct vfsmount *parent_mnt)
60606 +{
60607 + return generic_fs_create_handler(new_dentry, parent_dentry, parent_mnt,
60608 + GR_WRITE | GR_CREATE, GR_MKDIR_ACL_MSG);
60609 +}
60610 +
60611 +#define RENAME_CHECK_SUCCESS(old, new) \
60612 + (((old & (GR_WRITE | GR_READ)) == (GR_WRITE | GR_READ)) && \
60613 + ((new & (GR_WRITE | GR_READ)) == (GR_WRITE | GR_READ)))
60614 +
60615 +int
60616 +gr_acl_handle_rename(struct dentry *new_dentry,
60617 + struct dentry *parent_dentry,
60618 + const struct vfsmount *parent_mnt,
60619 + struct dentry *old_dentry,
60620 + struct inode *old_parent_inode,
60621 + struct vfsmount *old_mnt, const char *newname)
60622 +{
60623 + __u32 comp1, comp2;
60624 + int error = 0;
60625 +
60626 + if (unlikely(!gr_acl_is_enabled()))
60627 + return 0;
60628 +
60629 + if (!new_dentry->d_inode) {
60630 + comp1 = gr_check_create(new_dentry, parent_dentry, parent_mnt,
60631 + GR_READ | GR_WRITE | GR_CREATE | GR_AUDIT_READ |
60632 + GR_AUDIT_WRITE | GR_AUDIT_CREATE | GR_SUPPRESS);
60633 + comp2 = gr_search_file(old_dentry, GR_READ | GR_WRITE |
60634 + GR_DELETE | GR_AUDIT_DELETE |
60635 + GR_AUDIT_READ | GR_AUDIT_WRITE |
60636 + GR_SUPPRESS, old_mnt);
60637 + } else {
60638 + comp1 = gr_search_file(new_dentry, GR_READ | GR_WRITE |
60639 + GR_CREATE | GR_DELETE |
60640 + GR_AUDIT_CREATE | GR_AUDIT_DELETE |
60641 + GR_AUDIT_READ | GR_AUDIT_WRITE |
60642 + GR_SUPPRESS, parent_mnt);
60643 + comp2 =
60644 + gr_search_file(old_dentry,
60645 + GR_READ | GR_WRITE | GR_AUDIT_READ |
60646 + GR_DELETE | GR_AUDIT_DELETE |
60647 + GR_AUDIT_WRITE | GR_SUPPRESS, old_mnt);
60648 + }
60649 +
60650 + if (RENAME_CHECK_SUCCESS(comp1, comp2) &&
60651 + ((comp1 & GR_AUDITS) || (comp2 & GR_AUDITS)))
60652 + gr_log_fs_rbac_str(GR_DO_AUDIT, GR_RENAME_ACL_MSG, old_dentry, old_mnt, newname);
60653 + else if (!RENAME_CHECK_SUCCESS(comp1, comp2) && !(comp1 & GR_SUPPRESS)
60654 + && !(comp2 & GR_SUPPRESS)) {
60655 + gr_log_fs_rbac_str(GR_DONT_AUDIT, GR_RENAME_ACL_MSG, old_dentry, old_mnt, newname);
60656 + error = -EACCES;
60657 + } else if (unlikely(!RENAME_CHECK_SUCCESS(comp1, comp2)))
60658 + error = -EACCES;
60659 +
60660 + return error;
60661 +}
60662 +
60663 +void
60664 +gr_acl_handle_exit(void)
60665 +{
60666 + u16 id;
60667 + char *rolename;
60668 + struct file *exec_file;
60669 +
60670 + if (unlikely(current->acl_sp_role && gr_acl_is_enabled() &&
60671 + !(current->role->roletype & GR_ROLE_PERSIST))) {
60672 + id = current->acl_role_id;
60673 + rolename = current->role->rolename;
60674 + gr_set_acls(1);
60675 + gr_log_str_int(GR_DONT_AUDIT_GOOD, GR_SPROLEL_ACL_MSG, rolename, id);
60676 + }
60677 +
60678 + write_lock(&grsec_exec_file_lock);
60679 + exec_file = current->exec_file;
60680 + current->exec_file = NULL;
60681 + write_unlock(&grsec_exec_file_lock);
60682 +
60683 + if (exec_file)
60684 + fput(exec_file);
60685 +}
60686 +
60687 +int
60688 +gr_acl_handle_procpidmem(const struct task_struct *task)
60689 +{
60690 + if (unlikely(!gr_acl_is_enabled()))
60691 + return 0;
60692 +
60693 + if (task != current && task->acl->mode & GR_PROTPROCFD)
60694 + return -EACCES;
60695 +
60696 + return 0;
60697 +}
60698 diff --git a/grsecurity/gracl_ip.c b/grsecurity/gracl_ip.c
60699 new file mode 100644
60700 index 0000000..cd07b96
60701 --- /dev/null
60702 +++ b/grsecurity/gracl_ip.c
60703 @@ -0,0 +1,382 @@
60704 +#include <linux/kernel.h>
60705 +#include <asm/uaccess.h>
60706 +#include <asm/errno.h>
60707 +#include <net/sock.h>
60708 +#include <linux/file.h>
60709 +#include <linux/fs.h>
60710 +#include <linux/net.h>
60711 +#include <linux/in.h>
60712 +#include <linux/skbuff.h>
60713 +#include <linux/ip.h>
60714 +#include <linux/udp.h>
60715 +#include <linux/smp_lock.h>
60716 +#include <linux/types.h>
60717 +#include <linux/sched.h>
60718 +#include <linux/netdevice.h>
60719 +#include <linux/inetdevice.h>
60720 +#include <linux/gracl.h>
60721 +#include <linux/grsecurity.h>
60722 +#include <linux/grinternal.h>
60723 +
60724 +#define GR_BIND 0x01
60725 +#define GR_CONNECT 0x02
60726 +#define GR_INVERT 0x04
60727 +#define GR_BINDOVERRIDE 0x08
60728 +#define GR_CONNECTOVERRIDE 0x10
60729 +#define GR_SOCK_FAMILY 0x20
60730 +
60731 +static const char * gr_protocols[IPPROTO_MAX] = {
60732 + "ip", "icmp", "igmp", "ggp", "ipencap", "st", "tcp", "cbt",
60733 + "egp", "igp", "bbn-rcc", "nvp", "pup", "argus", "emcon", "xnet",
60734 + "chaos", "udp", "mux", "dcn", "hmp", "prm", "xns-idp", "trunk-1",
60735 + "trunk-2", "leaf-1", "leaf-2", "rdp", "irtp", "iso-tp4", "netblt", "mfe-nsp",
60736 + "merit-inp", "sep", "3pc", "idpr", "xtp", "ddp", "idpr-cmtp", "tp++",
60737 + "il", "ipv6", "sdrp", "ipv6-route", "ipv6-frag", "idrp", "rsvp", "gre",
60738 + "mhrp", "bna", "ipv6-crypt", "ipv6-auth", "i-nlsp", "swipe", "narp", "mobile",
60739 + "tlsp", "skip", "ipv6-icmp", "ipv6-nonxt", "ipv6-opts", "unknown:61", "cftp", "unknown:63",
60740 + "sat-expak", "kryptolan", "rvd", "ippc", "unknown:68", "sat-mon", "visa", "ipcv",
60741 + "cpnx", "cphb", "wsn", "pvp", "br-sat-mon", "sun-nd", "wb-mon", "wb-expak",
60742 + "iso-ip", "vmtp", "secure-vmtp", "vines", "ttp", "nfsnet-igp", "dgp", "tcf",
60743 + "eigrp", "ospf", "sprite-rpc", "larp", "mtp", "ax.25", "ipip", "micp",
60744 + "scc-sp", "etherip", "encap", "unknown:99", "gmtp", "ifmp", "pnni", "pim",
60745 + "aris", "scps", "qnx", "a/n", "ipcomp", "snp", "compaq-peer", "ipx-in-ip",
60746 + "vrrp", "pgm", "unknown:114", "l2tp", "ddx", "iatp", "stp", "srp",
60747 + "uti", "smp", "sm", "ptp", "isis", "fire", "crtp", "crdup",
60748 + "sscopmce", "iplt", "sps", "pipe", "sctp", "fc", "unkown:134", "unknown:135",
60749 + "unknown:136", "unknown:137", "unknown:138", "unknown:139", "unknown:140", "unknown:141", "unknown:142", "unknown:143",
60750 + "unknown:144", "unknown:145", "unknown:146", "unknown:147", "unknown:148", "unknown:149", "unknown:150", "unknown:151",
60751 + "unknown:152", "unknown:153", "unknown:154", "unknown:155", "unknown:156", "unknown:157", "unknown:158", "unknown:159",
60752 + "unknown:160", "unknown:161", "unknown:162", "unknown:163", "unknown:164", "unknown:165", "unknown:166", "unknown:167",
60753 + "unknown:168", "unknown:169", "unknown:170", "unknown:171", "unknown:172", "unknown:173", "unknown:174", "unknown:175",
60754 + "unknown:176", "unknown:177", "unknown:178", "unknown:179", "unknown:180", "unknown:181", "unknown:182", "unknown:183",
60755 + "unknown:184", "unknown:185", "unknown:186", "unknown:187", "unknown:188", "unknown:189", "unknown:190", "unknown:191",
60756 + "unknown:192", "unknown:193", "unknown:194", "unknown:195", "unknown:196", "unknown:197", "unknown:198", "unknown:199",
60757 + "unknown:200", "unknown:201", "unknown:202", "unknown:203", "unknown:204", "unknown:205", "unknown:206", "unknown:207",
60758 + "unknown:208", "unknown:209", "unknown:210", "unknown:211", "unknown:212", "unknown:213", "unknown:214", "unknown:215",
60759 + "unknown:216", "unknown:217", "unknown:218", "unknown:219", "unknown:220", "unknown:221", "unknown:222", "unknown:223",
60760 + "unknown:224", "unknown:225", "unknown:226", "unknown:227", "unknown:228", "unknown:229", "unknown:230", "unknown:231",
60761 + "unknown:232", "unknown:233", "unknown:234", "unknown:235", "unknown:236", "unknown:237", "unknown:238", "unknown:239",
60762 + "unknown:240", "unknown:241", "unknown:242", "unknown:243", "unknown:244", "unknown:245", "unknown:246", "unknown:247",
60763 + "unknown:248", "unknown:249", "unknown:250", "unknown:251", "unknown:252", "unknown:253", "unknown:254", "unknown:255",
60764 + };
60765 +
60766 +static const char * gr_socktypes[SOCK_MAX] = {
60767 + "unknown:0", "stream", "dgram", "raw", "rdm", "seqpacket", "unknown:6",
60768 + "unknown:7", "unknown:8", "unknown:9", "packet"
60769 + };
60770 +
60771 +static const char * gr_sockfamilies[AF_MAX+1] = {
60772 + "unspec", "unix", "inet", "ax25", "ipx", "appletalk", "netrom", "bridge", "atmpvc", "x25",
60773 + "inet6", "rose", "decnet", "netbeui", "security", "key", "netlink", "packet", "ash",
60774 + "econet", "atmsvc", "rds", "sna", "irda", "ppox", "wanpipe", "llc", "fam_27", "fam_28",
60775 + "tipc", "bluetooth", "iucv", "rxrpc", "isdn", "phonet", "ieee802154"
60776 + };
60777 +
60778 +const char *
60779 +gr_proto_to_name(unsigned char proto)
60780 +{
60781 + return gr_protocols[proto];
60782 +}
60783 +
60784 +const char *
60785 +gr_socktype_to_name(unsigned char type)
60786 +{
60787 + return gr_socktypes[type];
60788 +}
60789 +
60790 +const char *
60791 +gr_sockfamily_to_name(unsigned char family)
60792 +{
60793 + return gr_sockfamilies[family];
60794 +}
60795 +
60796 +int
60797 +gr_search_socket(const int domain, const int type, const int protocol)
60798 +{
60799 + struct acl_subject_label *curr;
60800 + const struct cred *cred = current_cred();
60801 +
60802 + if (unlikely(!gr_acl_is_enabled()))
60803 + goto exit;
60804 +
60805 + if ((domain < 0) || (type < 0) || (protocol < 0) ||
60806 + (domain >= AF_MAX) || (type >= SOCK_MAX) || (protocol >= IPPROTO_MAX))
60807 + goto exit; // let the kernel handle it
60808 +
60809 + curr = current->acl;
60810 +
60811 + if (curr->sock_families[domain / 32] & (1 << (domain % 32))) {
60812 + /* the family is allowed, if this is PF_INET allow it only if
60813 + the extra sock type/protocol checks pass */
60814 + if (domain == PF_INET)
60815 + goto inet_check;
60816 + goto exit;
60817 + } else {
60818 + if (curr->mode & (GR_LEARN | GR_INHERITLEARN)) {
60819 + __u32 fakeip = 0;
60820 + security_learn(GR_IP_LEARN_MSG, current->role->rolename,
60821 + current->role->roletype, cred->uid,
60822 + cred->gid, current->exec_file ?
60823 + gr_to_filename(current->exec_file->f_path.dentry,
60824 + current->exec_file->f_path.mnt) :
60825 + curr->filename, curr->filename,
60826 + &fakeip, domain, 0, 0, GR_SOCK_FAMILY,
60827 + &current->signal->saved_ip);
60828 + goto exit;
60829 + }
60830 + goto exit_fail;
60831 + }
60832 +
60833 +inet_check:
60834 + /* the rest of this checking is for IPv4 only */
60835 + if (!curr->ips)
60836 + goto exit;
60837 +
60838 + if ((curr->ip_type & (1 << type)) &&
60839 + (curr->ip_proto[protocol / 32] & (1 << (protocol % 32))))
60840 + goto exit;
60841 +
60842 + if (curr->mode & (GR_LEARN | GR_INHERITLEARN)) {
60843 + /* we don't place acls on raw sockets , and sometimes
60844 + dgram/ip sockets are opened for ioctl and not
60845 + bind/connect, so we'll fake a bind learn log */
60846 + if (type == SOCK_RAW || type == SOCK_PACKET) {
60847 + __u32 fakeip = 0;
60848 + security_learn(GR_IP_LEARN_MSG, current->role->rolename,
60849 + current->role->roletype, cred->uid,
60850 + cred->gid, current->exec_file ?
60851 + gr_to_filename(current->exec_file->f_path.dentry,
60852 + current->exec_file->f_path.mnt) :
60853 + curr->filename, curr->filename,
60854 + &fakeip, 0, type,
60855 + protocol, GR_CONNECT, &current->signal->saved_ip);
60856 + } else if ((type == SOCK_DGRAM) && (protocol == IPPROTO_IP)) {
60857 + __u32 fakeip = 0;
60858 + security_learn(GR_IP_LEARN_MSG, current->role->rolename,
60859 + current->role->roletype, cred->uid,
60860 + cred->gid, current->exec_file ?
60861 + gr_to_filename(current->exec_file->f_path.dentry,
60862 + current->exec_file->f_path.mnt) :
60863 + curr->filename, curr->filename,
60864 + &fakeip, 0, type,
60865 + protocol, GR_BIND, &current->signal->saved_ip);
60866 + }
60867 + /* we'll log when they use connect or bind */
60868 + goto exit;
60869 + }
60870 +
60871 +exit_fail:
60872 + if (domain == PF_INET)
60873 + gr_log_str3(GR_DONT_AUDIT, GR_SOCK_MSG, gr_sockfamily_to_name(domain),
60874 + gr_socktype_to_name(type), gr_proto_to_name(protocol));
60875 + else
60876 + gr_log_str2_int(GR_DONT_AUDIT, GR_SOCK_NOINET_MSG, gr_sockfamily_to_name(domain),
60877 + gr_socktype_to_name(type), protocol);
60878 +
60879 + return 0;
60880 +exit:
60881 + return 1;
60882 +}
60883 +
60884 +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)
60885 +{
60886 + if ((ip->mode & mode) &&
60887 + (ip_port >= ip->low) &&
60888 + (ip_port <= ip->high) &&
60889 + ((ntohl(ip_addr) & our_netmask) ==
60890 + (ntohl(our_addr) & our_netmask))
60891 + && (ip->proto[protocol / 32] & (1 << (protocol % 32)))
60892 + && (ip->type & (1 << type))) {
60893 + if (ip->mode & GR_INVERT)
60894 + return 2; // specifically denied
60895 + else
60896 + return 1; // allowed
60897 + }
60898 +
60899 + return 0; // not specifically allowed, may continue parsing
60900 +}
60901 +
60902 +static int
60903 +gr_search_connectbind(const int full_mode, struct sock *sk,
60904 + struct sockaddr_in *addr, const int type)
60905 +{
60906 + char iface[IFNAMSIZ] = {0};
60907 + struct acl_subject_label *curr;
60908 + struct acl_ip_label *ip;
60909 + struct inet_sock *isk;
60910 + struct net_device *dev;
60911 + struct in_device *idev;
60912 + unsigned long i;
60913 + int ret;
60914 + int mode = full_mode & (GR_BIND | GR_CONNECT);
60915 + __u32 ip_addr = 0;
60916 + __u32 our_addr;
60917 + __u32 our_netmask;
60918 + char *p;
60919 + __u16 ip_port = 0;
60920 + const struct cred *cred = current_cred();
60921 +
60922 + if (unlikely(!gr_acl_is_enabled() || sk->sk_family != PF_INET))
60923 + return 0;
60924 +
60925 + curr = current->acl;
60926 + isk = inet_sk(sk);
60927 +
60928 + /* INADDR_ANY overriding for binds, inaddr_any_override is already in network order */
60929 + if ((full_mode & GR_BINDOVERRIDE) && addr->sin_addr.s_addr == htonl(INADDR_ANY) && curr->inaddr_any_override != 0)
60930 + addr->sin_addr.s_addr = curr->inaddr_any_override;
60931 + if ((full_mode & GR_CONNECT) && isk->saddr == htonl(INADDR_ANY) && curr->inaddr_any_override != 0) {
60932 + struct sockaddr_in saddr;
60933 + int err;
60934 +
60935 + saddr.sin_family = AF_INET;
60936 + saddr.sin_addr.s_addr = curr->inaddr_any_override;
60937 + saddr.sin_port = isk->sport;
60938 +
60939 + err = security_socket_bind(sk->sk_socket, (struct sockaddr *)&saddr, sizeof(struct sockaddr_in));
60940 + if (err)
60941 + return err;
60942 +
60943 + err = sk->sk_socket->ops->bind(sk->sk_socket, (struct sockaddr *)&saddr, sizeof(struct sockaddr_in));
60944 + if (err)
60945 + return err;
60946 + }
60947 +
60948 + if (!curr->ips)
60949 + return 0;
60950 +
60951 + ip_addr = addr->sin_addr.s_addr;
60952 + ip_port = ntohs(addr->sin_port);
60953 +
60954 + if (curr->mode & (GR_LEARN | GR_INHERITLEARN)) {
60955 + security_learn(GR_IP_LEARN_MSG, current->role->rolename,
60956 + current->role->roletype, cred->uid,
60957 + cred->gid, current->exec_file ?
60958 + gr_to_filename(current->exec_file->f_path.dentry,
60959 + current->exec_file->f_path.mnt) :
60960 + curr->filename, curr->filename,
60961 + &ip_addr, ip_port, type,
60962 + sk->sk_protocol, mode, &current->signal->saved_ip);
60963 + return 0;
60964 + }
60965 +
60966 + for (i = 0; i < curr->ip_num; i++) {
60967 + ip = *(curr->ips + i);
60968 + if (ip->iface != NULL) {
60969 + strncpy(iface, ip->iface, IFNAMSIZ - 1);
60970 + p = strchr(iface, ':');
60971 + if (p != NULL)
60972 + *p = '\0';
60973 + dev = dev_get_by_name(sock_net(sk), iface);
60974 + if (dev == NULL)
60975 + continue;
60976 + idev = in_dev_get(dev);
60977 + if (idev == NULL) {
60978 + dev_put(dev);
60979 + continue;
60980 + }
60981 + rcu_read_lock();
60982 + for_ifa(idev) {
60983 + if (!strcmp(ip->iface, ifa->ifa_label)) {
60984 + our_addr = ifa->ifa_address;
60985 + our_netmask = 0xffffffff;
60986 + ret = check_ip_policy(ip, ip_addr, ip_port, sk->sk_protocol, mode, type, our_addr, our_netmask);
60987 + if (ret == 1) {
60988 + rcu_read_unlock();
60989 + in_dev_put(idev);
60990 + dev_put(dev);
60991 + return 0;
60992 + } else if (ret == 2) {
60993 + rcu_read_unlock();
60994 + in_dev_put(idev);
60995 + dev_put(dev);
60996 + goto denied;
60997 + }
60998 + }
60999 + } endfor_ifa(idev);
61000 + rcu_read_unlock();
61001 + in_dev_put(idev);
61002 + dev_put(dev);
61003 + } else {
61004 + our_addr = ip->addr;
61005 + our_netmask = ip->netmask;
61006 + ret = check_ip_policy(ip, ip_addr, ip_port, sk->sk_protocol, mode, type, our_addr, our_netmask);
61007 + if (ret == 1)
61008 + return 0;
61009 + else if (ret == 2)
61010 + goto denied;
61011 + }
61012 + }
61013 +
61014 +denied:
61015 + if (mode == GR_BIND)
61016 + 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));
61017 + else if (mode == GR_CONNECT)
61018 + 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));
61019 +
61020 + return -EACCES;
61021 +}
61022 +
61023 +int
61024 +gr_search_connect(struct socket *sock, struct sockaddr_in *addr)
61025 +{
61026 + return gr_search_connectbind(GR_CONNECT | GR_CONNECTOVERRIDE, sock->sk, addr, sock->type);
61027 +}
61028 +
61029 +int
61030 +gr_search_bind(struct socket *sock, struct sockaddr_in *addr)
61031 +{
61032 + return gr_search_connectbind(GR_BIND | GR_BINDOVERRIDE, sock->sk, addr, sock->type);
61033 +}
61034 +
61035 +int gr_search_listen(struct socket *sock)
61036 +{
61037 + struct sock *sk = sock->sk;
61038 + struct sockaddr_in addr;
61039 +
61040 + addr.sin_addr.s_addr = inet_sk(sk)->saddr;
61041 + addr.sin_port = inet_sk(sk)->sport;
61042 +
61043 + return gr_search_connectbind(GR_BIND | GR_CONNECTOVERRIDE, sock->sk, &addr, sock->type);
61044 +}
61045 +
61046 +int gr_search_accept(struct socket *sock)
61047 +{
61048 + struct sock *sk = sock->sk;
61049 + struct sockaddr_in addr;
61050 +
61051 + addr.sin_addr.s_addr = inet_sk(sk)->saddr;
61052 + addr.sin_port = inet_sk(sk)->sport;
61053 +
61054 + return gr_search_connectbind(GR_BIND | GR_CONNECTOVERRIDE, sock->sk, &addr, sock->type);
61055 +}
61056 +
61057 +int
61058 +gr_search_udp_sendmsg(struct sock *sk, struct sockaddr_in *addr)
61059 +{
61060 + if (addr)
61061 + return gr_search_connectbind(GR_CONNECT, sk, addr, SOCK_DGRAM);
61062 + else {
61063 + struct sockaddr_in sin;
61064 + const struct inet_sock *inet = inet_sk(sk);
61065 +
61066 + sin.sin_addr.s_addr = inet->daddr;
61067 + sin.sin_port = inet->dport;
61068 +
61069 + return gr_search_connectbind(GR_CONNECT | GR_CONNECTOVERRIDE, sk, &sin, SOCK_DGRAM);
61070 + }
61071 +}
61072 +
61073 +int
61074 +gr_search_udp_recvmsg(struct sock *sk, const struct sk_buff *skb)
61075 +{
61076 + struct sockaddr_in sin;
61077 +
61078 + if (unlikely(skb->len < sizeof (struct udphdr)))
61079 + return 0; // skip this packet
61080 +
61081 + sin.sin_addr.s_addr = ip_hdr(skb)->saddr;
61082 + sin.sin_port = udp_hdr(skb)->source;
61083 +
61084 + return gr_search_connectbind(GR_CONNECT | GR_CONNECTOVERRIDE, sk, &sin, SOCK_DGRAM);
61085 +}
61086 diff --git a/grsecurity/gracl_learn.c b/grsecurity/gracl_learn.c
61087 new file mode 100644
61088 index 0000000..34bdd46
61089 --- /dev/null
61090 +++ b/grsecurity/gracl_learn.c
61091 @@ -0,0 +1,208 @@
61092 +#include <linux/kernel.h>
61093 +#include <linux/mm.h>
61094 +#include <linux/sched.h>
61095 +#include <linux/poll.h>
61096 +#include <linux/smp_lock.h>
61097 +#include <linux/string.h>
61098 +#include <linux/file.h>
61099 +#include <linux/types.h>
61100 +#include <linux/vmalloc.h>
61101 +#include <linux/grinternal.h>
61102 +
61103 +extern ssize_t write_grsec_handler(struct file * file, const char __user * buf,
61104 + size_t count, loff_t *ppos);
61105 +extern int gr_acl_is_enabled(void);
61106 +
61107 +static DECLARE_WAIT_QUEUE_HEAD(learn_wait);
61108 +static int gr_learn_attached;
61109 +
61110 +/* use a 512k buffer */
61111 +#define LEARN_BUFFER_SIZE (512 * 1024)
61112 +
61113 +static DEFINE_SPINLOCK(gr_learn_lock);
61114 +static DEFINE_MUTEX(gr_learn_user_mutex);
61115 +
61116 +/* we need to maintain two buffers, so that the kernel context of grlearn
61117 + uses a semaphore around the userspace copying, and the other kernel contexts
61118 + use a spinlock when copying into the buffer, since they cannot sleep
61119 +*/
61120 +static char *learn_buffer;
61121 +static char *learn_buffer_user;
61122 +static int learn_buffer_len;
61123 +static int learn_buffer_user_len;
61124 +
61125 +static ssize_t
61126 +read_learn(struct file *file, char __user * buf, size_t count, loff_t * ppos)
61127 +{
61128 + DECLARE_WAITQUEUE(wait, current);
61129 + ssize_t retval = 0;
61130 +
61131 + add_wait_queue(&learn_wait, &wait);
61132 + set_current_state(TASK_INTERRUPTIBLE);
61133 + do {
61134 + mutex_lock(&gr_learn_user_mutex);
61135 + spin_lock(&gr_learn_lock);
61136 + if (learn_buffer_len)
61137 + break;
61138 + spin_unlock(&gr_learn_lock);
61139 + mutex_unlock(&gr_learn_user_mutex);
61140 + if (file->f_flags & O_NONBLOCK) {
61141 + retval = -EAGAIN;
61142 + goto out;
61143 + }
61144 + if (signal_pending(current)) {
61145 + retval = -ERESTARTSYS;
61146 + goto out;
61147 + }
61148 +
61149 + schedule();
61150 + } while (1);
61151 +
61152 + memcpy(learn_buffer_user, learn_buffer, learn_buffer_len);
61153 + learn_buffer_user_len = learn_buffer_len;
61154 + retval = learn_buffer_len;
61155 + learn_buffer_len = 0;
61156 +
61157 + spin_unlock(&gr_learn_lock);
61158 +
61159 + if (copy_to_user(buf, learn_buffer_user, learn_buffer_user_len))
61160 + retval = -EFAULT;
61161 +
61162 + mutex_unlock(&gr_learn_user_mutex);
61163 +out:
61164 + set_current_state(TASK_RUNNING);
61165 + remove_wait_queue(&learn_wait, &wait);
61166 + return retval;
61167 +}
61168 +
61169 +static unsigned int
61170 +poll_learn(struct file * file, poll_table * wait)
61171 +{
61172 + poll_wait(file, &learn_wait, wait);
61173 +
61174 + if (learn_buffer_len)
61175 + return (POLLIN | POLLRDNORM);
61176 +
61177 + return 0;
61178 +}
61179 +
61180 +void
61181 +gr_clear_learn_entries(void)
61182 +{
61183 + char *tmp;
61184 +
61185 + mutex_lock(&gr_learn_user_mutex);
61186 + spin_lock(&gr_learn_lock);
61187 + tmp = learn_buffer;
61188 + learn_buffer = NULL;
61189 + spin_unlock(&gr_learn_lock);
61190 + if (tmp)
61191 + vfree(tmp);
61192 + if (learn_buffer_user != NULL) {
61193 + vfree(learn_buffer_user);
61194 + learn_buffer_user = NULL;
61195 + }
61196 + learn_buffer_len = 0;
61197 + mutex_unlock(&gr_learn_user_mutex);
61198 +
61199 + return;
61200 +}
61201 +
61202 +void
61203 +gr_add_learn_entry(const char *fmt, ...)
61204 +{
61205 + va_list args;
61206 + unsigned int len;
61207 +
61208 + if (!gr_learn_attached)
61209 + return;
61210 +
61211 + spin_lock(&gr_learn_lock);
61212 +
61213 + /* leave a gap at the end so we know when it's "full" but don't have to
61214 + compute the exact length of the string we're trying to append
61215 + */
61216 + if (learn_buffer_len > LEARN_BUFFER_SIZE - 16384) {
61217 + spin_unlock(&gr_learn_lock);
61218 + wake_up_interruptible(&learn_wait);
61219 + return;
61220 + }
61221 + if (learn_buffer == NULL) {
61222 + spin_unlock(&gr_learn_lock);
61223 + return;
61224 + }
61225 +
61226 + va_start(args, fmt);
61227 + len = vsnprintf(learn_buffer + learn_buffer_len, LEARN_BUFFER_SIZE - learn_buffer_len, fmt, args);
61228 + va_end(args);
61229 +
61230 + learn_buffer_len += len + 1;
61231 +
61232 + spin_unlock(&gr_learn_lock);
61233 + wake_up_interruptible(&learn_wait);
61234 +
61235 + return;
61236 +}
61237 +
61238 +static int
61239 +open_learn(struct inode *inode, struct file *file)
61240 +{
61241 + if (file->f_mode & FMODE_READ && gr_learn_attached)
61242 + return -EBUSY;
61243 + if (file->f_mode & FMODE_READ) {
61244 + int retval = 0;
61245 + mutex_lock(&gr_learn_user_mutex);
61246 + if (learn_buffer == NULL)
61247 + learn_buffer = vmalloc(LEARN_BUFFER_SIZE);
61248 + if (learn_buffer_user == NULL)
61249 + learn_buffer_user = vmalloc(LEARN_BUFFER_SIZE);
61250 + if (learn_buffer == NULL) {
61251 + retval = -ENOMEM;
61252 + goto out_error;
61253 + }
61254 + if (learn_buffer_user == NULL) {
61255 + retval = -ENOMEM;
61256 + goto out_error;
61257 + }
61258 + learn_buffer_len = 0;
61259 + learn_buffer_user_len = 0;
61260 + gr_learn_attached = 1;
61261 +out_error:
61262 + mutex_unlock(&gr_learn_user_mutex);
61263 + return retval;
61264 + }
61265 + return 0;
61266 +}
61267 +
61268 +static int
61269 +close_learn(struct inode *inode, struct file *file)
61270 +{
61271 + if (file->f_mode & FMODE_READ) {
61272 + char *tmp = NULL;
61273 + mutex_lock(&gr_learn_user_mutex);
61274 + spin_lock(&gr_learn_lock);
61275 + tmp = learn_buffer;
61276 + learn_buffer = NULL;
61277 + spin_unlock(&gr_learn_lock);
61278 + if (tmp)
61279 + vfree(tmp);
61280 + if (learn_buffer_user != NULL) {
61281 + vfree(learn_buffer_user);
61282 + learn_buffer_user = NULL;
61283 + }
61284 + learn_buffer_len = 0;
61285 + learn_buffer_user_len = 0;
61286 + gr_learn_attached = 0;
61287 + mutex_unlock(&gr_learn_user_mutex);
61288 + }
61289 +
61290 + return 0;
61291 +}
61292 +
61293 +const struct file_operations grsec_fops = {
61294 + .read = read_learn,
61295 + .write = write_grsec_handler,
61296 + .open = open_learn,
61297 + .release = close_learn,
61298 + .poll = poll_learn,
61299 +};
61300 diff --git a/grsecurity/gracl_res.c b/grsecurity/gracl_res.c
61301 new file mode 100644
61302 index 0000000..70b2179
61303 --- /dev/null
61304 +++ b/grsecurity/gracl_res.c
61305 @@ -0,0 +1,67 @@
61306 +#include <linux/kernel.h>
61307 +#include <linux/sched.h>
61308 +#include <linux/gracl.h>
61309 +#include <linux/grinternal.h>
61310 +
61311 +static const char *restab_log[] = {
61312 + [RLIMIT_CPU] = "RLIMIT_CPU",
61313 + [RLIMIT_FSIZE] = "RLIMIT_FSIZE",
61314 + [RLIMIT_DATA] = "RLIMIT_DATA",
61315 + [RLIMIT_STACK] = "RLIMIT_STACK",
61316 + [RLIMIT_CORE] = "RLIMIT_CORE",
61317 + [RLIMIT_RSS] = "RLIMIT_RSS",
61318 + [RLIMIT_NPROC] = "RLIMIT_NPROC",
61319 + [RLIMIT_NOFILE] = "RLIMIT_NOFILE",
61320 + [RLIMIT_MEMLOCK] = "RLIMIT_MEMLOCK",
61321 + [RLIMIT_AS] = "RLIMIT_AS",
61322 + [RLIMIT_LOCKS] = "RLIMIT_LOCKS",
61323 + [RLIMIT_SIGPENDING] = "RLIMIT_SIGPENDING",
61324 + [RLIMIT_MSGQUEUE] = "RLIMIT_MSGQUEUE",
61325 + [RLIMIT_NICE] = "RLIMIT_NICE",
61326 + [RLIMIT_RTPRIO] = "RLIMIT_RTPRIO",
61327 + [RLIMIT_RTTIME] = "RLIMIT_RTTIME",
61328 + [GR_CRASH_RES] = "RLIMIT_CRASH"
61329 +};
61330 +
61331 +void
61332 +gr_log_resource(const struct task_struct *task,
61333 + const int res, const unsigned long wanted, const int gt)
61334 +{
61335 + const struct cred *cred;
61336 + unsigned long rlim;
61337 +
61338 + if (!gr_acl_is_enabled() && !grsec_resource_logging)
61339 + return;
61340 +
61341 + // not yet supported resource
61342 + if (unlikely(!restab_log[res]))
61343 + return;
61344 +
61345 + if (res == RLIMIT_CPU || res == RLIMIT_RTTIME)
61346 + rlim = task->signal->rlim[res].rlim_max;
61347 + else
61348 + rlim = task->signal->rlim[res].rlim_cur;
61349 + if (likely((rlim == RLIM_INFINITY) || (gt && wanted <= rlim) || (!gt && wanted < rlim)))
61350 + return;
61351 +
61352 + rcu_read_lock();
61353 + cred = __task_cred(task);
61354 +
61355 + if (res == RLIMIT_NPROC &&
61356 + (cap_raised(cred->cap_effective, CAP_SYS_ADMIN) ||
61357 + cap_raised(cred->cap_effective, CAP_SYS_RESOURCE)))
61358 + goto out_rcu_unlock;
61359 + else if (res == RLIMIT_MEMLOCK &&
61360 + cap_raised(cred->cap_effective, CAP_IPC_LOCK))
61361 + goto out_rcu_unlock;
61362 + else if (res == RLIMIT_NICE && cap_raised(cred->cap_effective, CAP_SYS_NICE))
61363 + goto out_rcu_unlock;
61364 + rcu_read_unlock();
61365 +
61366 + gr_log_res_ulong2_str(GR_DONT_AUDIT, GR_RESOURCE_MSG, task, wanted, restab_log[res], rlim);
61367 +
61368 + return;
61369 +out_rcu_unlock:
61370 + rcu_read_unlock();
61371 + return;
61372 +}
61373 diff --git a/grsecurity/gracl_segv.c b/grsecurity/gracl_segv.c
61374 new file mode 100644
61375 index 0000000..1d1b734
61376 --- /dev/null
61377 +++ b/grsecurity/gracl_segv.c
61378 @@ -0,0 +1,284 @@
61379 +#include <linux/kernel.h>
61380 +#include <linux/mm.h>
61381 +#include <asm/uaccess.h>
61382 +#include <asm/errno.h>
61383 +#include <asm/mman.h>
61384 +#include <net/sock.h>
61385 +#include <linux/file.h>
61386 +#include <linux/fs.h>
61387 +#include <linux/net.h>
61388 +#include <linux/in.h>
61389 +#include <linux/smp_lock.h>
61390 +#include <linux/slab.h>
61391 +#include <linux/types.h>
61392 +#include <linux/sched.h>
61393 +#include <linux/timer.h>
61394 +#include <linux/gracl.h>
61395 +#include <linux/grsecurity.h>
61396 +#include <linux/grinternal.h>
61397 +
61398 +static struct crash_uid *uid_set;
61399 +static unsigned short uid_used;
61400 +static DEFINE_SPINLOCK(gr_uid_lock);
61401 +extern rwlock_t gr_inode_lock;
61402 +extern struct acl_subject_label *
61403 + lookup_acl_subj_label(const ino_t inode, const dev_t dev,
61404 + struct acl_role_label *role);
61405 +extern int gr_fake_force_sig(int sig, struct task_struct *t);
61406 +
61407 +int
61408 +gr_init_uidset(void)
61409 +{
61410 + uid_set =
61411 + kmalloc(GR_UIDTABLE_MAX * sizeof (struct crash_uid), GFP_KERNEL);
61412 + uid_used = 0;
61413 +
61414 + return uid_set ? 1 : 0;
61415 +}
61416 +
61417 +void
61418 +gr_free_uidset(void)
61419 +{
61420 + if (uid_set)
61421 + kfree(uid_set);
61422 +
61423 + return;
61424 +}
61425 +
61426 +int
61427 +gr_find_uid(const uid_t uid)
61428 +{
61429 + struct crash_uid *tmp = uid_set;
61430 + uid_t buid;
61431 + int low = 0, high = uid_used - 1, mid;
61432 +
61433 + while (high >= low) {
61434 + mid = (low + high) >> 1;
61435 + buid = tmp[mid].uid;
61436 + if (buid == uid)
61437 + return mid;
61438 + if (buid > uid)
61439 + high = mid - 1;
61440 + if (buid < uid)
61441 + low = mid + 1;
61442 + }
61443 +
61444 + return -1;
61445 +}
61446 +
61447 +static __inline__ void
61448 +gr_insertsort(void)
61449 +{
61450 + unsigned short i, j;
61451 + struct crash_uid index;
61452 +
61453 + for (i = 1; i < uid_used; i++) {
61454 + index = uid_set[i];
61455 + j = i;
61456 + while ((j > 0) && uid_set[j - 1].uid > index.uid) {
61457 + uid_set[j] = uid_set[j - 1];
61458 + j--;
61459 + }
61460 + uid_set[j] = index;
61461 + }
61462 +
61463 + return;
61464 +}
61465 +
61466 +static __inline__ void
61467 +gr_insert_uid(const uid_t uid, const unsigned long expires)
61468 +{
61469 + int loc;
61470 +
61471 + if (uid_used == GR_UIDTABLE_MAX)
61472 + return;
61473 +
61474 + loc = gr_find_uid(uid);
61475 +
61476 + if (loc >= 0) {
61477 + uid_set[loc].expires = expires;
61478 + return;
61479 + }
61480 +
61481 + uid_set[uid_used].uid = uid;
61482 + uid_set[uid_used].expires = expires;
61483 + uid_used++;
61484 +
61485 + gr_insertsort();
61486 +
61487 + return;
61488 +}
61489 +
61490 +void
61491 +gr_remove_uid(const unsigned short loc)
61492 +{
61493 + unsigned short i;
61494 +
61495 + for (i = loc + 1; i < uid_used; i++)
61496 + uid_set[i - 1] = uid_set[i];
61497 +
61498 + uid_used--;
61499 +
61500 + return;
61501 +}
61502 +
61503 +int
61504 +gr_check_crash_uid(const uid_t uid)
61505 +{
61506 + int loc;
61507 + int ret = 0;
61508 +
61509 + if (unlikely(!gr_acl_is_enabled()))
61510 + return 0;
61511 +
61512 + spin_lock(&gr_uid_lock);
61513 + loc = gr_find_uid(uid);
61514 +
61515 + if (loc < 0)
61516 + goto out_unlock;
61517 +
61518 + if (time_before_eq(uid_set[loc].expires, get_seconds()))
61519 + gr_remove_uid(loc);
61520 + else
61521 + ret = 1;
61522 +
61523 +out_unlock:
61524 + spin_unlock(&gr_uid_lock);
61525 + return ret;
61526 +}
61527 +
61528 +static __inline__ int
61529 +proc_is_setxid(const struct cred *cred)
61530 +{
61531 + if (cred->uid != cred->euid || cred->uid != cred->suid ||
61532 + cred->uid != cred->fsuid)
61533 + return 1;
61534 + if (cred->gid != cred->egid || cred->gid != cred->sgid ||
61535 + cred->gid != cred->fsgid)
61536 + return 1;
61537 +
61538 + return 0;
61539 +}
61540 +
61541 +void
61542 +gr_handle_crash(struct task_struct *task, const int sig)
61543 +{
61544 + struct acl_subject_label *curr;
61545 + struct task_struct *tsk, *tsk2;
61546 + const struct cred *cred;
61547 + const struct cred *cred2;
61548 +
61549 + if (sig != SIGSEGV && sig != SIGKILL && sig != SIGBUS && sig != SIGILL)
61550 + return;
61551 +
61552 + if (unlikely(!gr_acl_is_enabled()))
61553 + return;
61554 +
61555 + curr = task->acl;
61556 +
61557 + if (!(curr->resmask & (1 << GR_CRASH_RES)))
61558 + return;
61559 +
61560 + if (time_before_eq(curr->expires, get_seconds())) {
61561 + curr->expires = 0;
61562 + curr->crashes = 0;
61563 + }
61564 +
61565 + curr->crashes++;
61566 +
61567 + if (!curr->expires)
61568 + curr->expires = get_seconds() + curr->res[GR_CRASH_RES].rlim_max;
61569 +
61570 + if ((curr->crashes >= curr->res[GR_CRASH_RES].rlim_cur) &&
61571 + time_after(curr->expires, get_seconds())) {
61572 + rcu_read_lock();
61573 + cred = __task_cred(task);
61574 + if (cred->uid && proc_is_setxid(cred)) {
61575 + gr_log_crash1(GR_DONT_AUDIT, GR_SEGVSTART_ACL_MSG, task, curr->res[GR_CRASH_RES].rlim_max);
61576 + spin_lock(&gr_uid_lock);
61577 + gr_insert_uid(cred->uid, curr->expires);
61578 + spin_unlock(&gr_uid_lock);
61579 + curr->expires = 0;
61580 + curr->crashes = 0;
61581 + read_lock(&tasklist_lock);
61582 + do_each_thread(tsk2, tsk) {
61583 + cred2 = __task_cred(tsk);
61584 + if (tsk != task && cred2->uid == cred->uid)
61585 + gr_fake_force_sig(SIGKILL, tsk);
61586 + } while_each_thread(tsk2, tsk);
61587 + read_unlock(&tasklist_lock);
61588 + } else {
61589 + gr_log_crash2(GR_DONT_AUDIT, GR_SEGVNOSUID_ACL_MSG, task, curr->res[GR_CRASH_RES].rlim_max);
61590 + read_lock(&tasklist_lock);
61591 + read_lock(&grsec_exec_file_lock);
61592 + do_each_thread(tsk2, tsk) {
61593 + if (likely(tsk != task)) {
61594 + // if this thread has the same subject as the one that triggered
61595 + // RES_CRASH and it's the same binary, kill it
61596 + if (tsk->acl == task->acl && tsk->exec_file == task->exec_file)
61597 + gr_fake_force_sig(SIGKILL, tsk);
61598 + }
61599 + } while_each_thread(tsk2, tsk);
61600 + read_unlock(&grsec_exec_file_lock);
61601 + read_unlock(&tasklist_lock);
61602 + }
61603 + rcu_read_unlock();
61604 + }
61605 +
61606 + return;
61607 +}
61608 +
61609 +int
61610 +gr_check_crash_exec(const struct file *filp)
61611 +{
61612 + struct acl_subject_label *curr;
61613 +
61614 + if (unlikely(!gr_acl_is_enabled()))
61615 + return 0;
61616 +
61617 + read_lock(&gr_inode_lock);
61618 + curr = lookup_acl_subj_label(filp->f_path.dentry->d_inode->i_ino,
61619 + filp->f_path.dentry->d_inode->i_sb->s_dev,
61620 + current->role);
61621 + read_unlock(&gr_inode_lock);
61622 +
61623 + if (!curr || !(curr->resmask & (1 << GR_CRASH_RES)) ||
61624 + (!curr->crashes && !curr->expires))
61625 + return 0;
61626 +
61627 + if ((curr->crashes >= curr->res[GR_CRASH_RES].rlim_cur) &&
61628 + time_after(curr->expires, get_seconds()))
61629 + return 1;
61630 + else if (time_before_eq(curr->expires, get_seconds())) {
61631 + curr->crashes = 0;
61632 + curr->expires = 0;
61633 + }
61634 +
61635 + return 0;
61636 +}
61637 +
61638 +void
61639 +gr_handle_alertkill(struct task_struct *task)
61640 +{
61641 + struct acl_subject_label *curracl;
61642 + __u32 curr_ip;
61643 + struct task_struct *p, *p2;
61644 +
61645 + if (unlikely(!gr_acl_is_enabled()))
61646 + return;
61647 +
61648 + curracl = task->acl;
61649 + curr_ip = task->signal->curr_ip;
61650 +
61651 + if ((curracl->mode & GR_KILLIPPROC) && curr_ip) {
61652 + read_lock(&tasklist_lock);
61653 + do_each_thread(p2, p) {
61654 + if (p->signal->curr_ip == curr_ip)
61655 + gr_fake_force_sig(SIGKILL, p);
61656 + } while_each_thread(p2, p);
61657 + read_unlock(&tasklist_lock);
61658 + } else if (curracl->mode & GR_KILLPROC)
61659 + gr_fake_force_sig(SIGKILL, task);
61660 +
61661 + return;
61662 +}
61663 diff --git a/grsecurity/gracl_shm.c b/grsecurity/gracl_shm.c
61664 new file mode 100644
61665 index 0000000..9d83a69
61666 --- /dev/null
61667 +++ b/grsecurity/gracl_shm.c
61668 @@ -0,0 +1,40 @@
61669 +#include <linux/kernel.h>
61670 +#include <linux/mm.h>
61671 +#include <linux/sched.h>
61672 +#include <linux/file.h>
61673 +#include <linux/ipc.h>
61674 +#include <linux/gracl.h>
61675 +#include <linux/grsecurity.h>
61676 +#include <linux/grinternal.h>
61677 +
61678 +int
61679 +gr_handle_shmat(const pid_t shm_cprid, const pid_t shm_lapid,
61680 + const time_t shm_createtime, const uid_t cuid, const int shmid)
61681 +{
61682 + struct task_struct *task;
61683 +
61684 + if (!gr_acl_is_enabled())
61685 + return 1;
61686 +
61687 + rcu_read_lock();
61688 + read_lock(&tasklist_lock);
61689 +
61690 + task = find_task_by_vpid(shm_cprid);
61691 +
61692 + if (unlikely(!task))
61693 + task = find_task_by_vpid(shm_lapid);
61694 +
61695 + if (unlikely(task && (time_before_eq((unsigned long)task->start_time.tv_sec, (unsigned long)shm_createtime) ||
61696 + (task->pid == shm_lapid)) &&
61697 + (task->acl->mode & GR_PROTSHM) &&
61698 + (task->acl != current->acl))) {
61699 + read_unlock(&tasklist_lock);
61700 + rcu_read_unlock();
61701 + gr_log_int3(GR_DONT_AUDIT, GR_SHMAT_ACL_MSG, cuid, shm_cprid, shmid);
61702 + return 0;
61703 + }
61704 + read_unlock(&tasklist_lock);
61705 + rcu_read_unlock();
61706 +
61707 + return 1;
61708 +}
61709 diff --git a/grsecurity/grsec_chdir.c b/grsecurity/grsec_chdir.c
61710 new file mode 100644
61711 index 0000000..bc0be01
61712 --- /dev/null
61713 +++ b/grsecurity/grsec_chdir.c
61714 @@ -0,0 +1,19 @@
61715 +#include <linux/kernel.h>
61716 +#include <linux/sched.h>
61717 +#include <linux/fs.h>
61718 +#include <linux/file.h>
61719 +#include <linux/grsecurity.h>
61720 +#include <linux/grinternal.h>
61721 +
61722 +void
61723 +gr_log_chdir(const struct dentry *dentry, const struct vfsmount *mnt)
61724 +{
61725 +#ifdef CONFIG_GRKERNSEC_AUDIT_CHDIR
61726 + if ((grsec_enable_chdir && grsec_enable_group &&
61727 + in_group_p(grsec_audit_gid)) || (grsec_enable_chdir &&
61728 + !grsec_enable_group)) {
61729 + gr_log_fs_generic(GR_DO_AUDIT, GR_CHDIR_AUDIT_MSG, dentry, mnt);
61730 + }
61731 +#endif
61732 + return;
61733 +}
61734 diff --git a/grsecurity/grsec_chroot.c b/grsecurity/grsec_chroot.c
61735 new file mode 100644
61736 index 0000000..197bdd5
61737 --- /dev/null
61738 +++ b/grsecurity/grsec_chroot.c
61739 @@ -0,0 +1,386 @@
61740 +#include <linux/kernel.h>
61741 +#include <linux/module.h>
61742 +#include <linux/sched.h>
61743 +#include <linux/file.h>
61744 +#include <linux/fs.h>
61745 +#include <linux/mount.h>
61746 +#include <linux/types.h>
61747 +#include <linux/pid_namespace.h>
61748 +#include <linux/grsecurity.h>
61749 +#include <linux/grinternal.h>
61750 +
61751 +void gr_set_chroot_entries(struct task_struct *task, struct path *path)
61752 +{
61753 +#ifdef CONFIG_GRKERNSEC
61754 + if (task->pid > 1 && path->dentry != init_task.fs->root.dentry &&
61755 + path->dentry != task->nsproxy->mnt_ns->root->mnt_root)
61756 + task->gr_is_chrooted = 1;
61757 + else
61758 + task->gr_is_chrooted = 0;
61759 +
61760 + task->gr_chroot_dentry = path->dentry;
61761 +#endif
61762 + return;
61763 +}
61764 +
61765 +void gr_clear_chroot_entries(struct task_struct *task)
61766 +{
61767 +#ifdef CONFIG_GRKERNSEC
61768 + task->gr_is_chrooted = 0;
61769 + task->gr_chroot_dentry = NULL;
61770 +#endif
61771 + return;
61772 +}
61773 +
61774 +int
61775 +gr_handle_chroot_unix(const pid_t pid)
61776 +{
61777 +#ifdef CONFIG_GRKERNSEC_CHROOT_UNIX
61778 + struct task_struct *p;
61779 +
61780 + if (unlikely(!grsec_enable_chroot_unix))
61781 + return 1;
61782 +
61783 + if (likely(!proc_is_chrooted(current)))
61784 + return 1;
61785 +
61786 + rcu_read_lock();
61787 + read_lock(&tasklist_lock);
61788 +
61789 + p = find_task_by_vpid_unrestricted(pid);
61790 + if (unlikely(p && !have_same_root(current, p))) {
61791 + read_unlock(&tasklist_lock);
61792 + rcu_read_unlock();
61793 + gr_log_noargs(GR_DONT_AUDIT, GR_UNIX_CHROOT_MSG);
61794 + return 0;
61795 + }
61796 + read_unlock(&tasklist_lock);
61797 + rcu_read_unlock();
61798 +#endif
61799 + return 1;
61800 +}
61801 +
61802 +int
61803 +gr_handle_chroot_nice(void)
61804 +{
61805 +#ifdef CONFIG_GRKERNSEC_CHROOT_NICE
61806 + if (grsec_enable_chroot_nice && proc_is_chrooted(current)) {
61807 + gr_log_noargs(GR_DONT_AUDIT, GR_NICE_CHROOT_MSG);
61808 + return -EPERM;
61809 + }
61810 +#endif
61811 + return 0;
61812 +}
61813 +
61814 +int
61815 +gr_handle_chroot_setpriority(struct task_struct *p, const int niceval)
61816 +{
61817 +#ifdef CONFIG_GRKERNSEC_CHROOT_NICE
61818 + if (grsec_enable_chroot_nice && (niceval < task_nice(p))
61819 + && proc_is_chrooted(current)) {
61820 + gr_log_str_int(GR_DONT_AUDIT, GR_PRIORITY_CHROOT_MSG, p->comm, p->pid);
61821 + return -EACCES;
61822 + }
61823 +#endif
61824 + return 0;
61825 +}
61826 +
61827 +int
61828 +gr_handle_chroot_rawio(const struct inode *inode)
61829 +{
61830 +#ifdef CONFIG_GRKERNSEC_CHROOT_CAPS
61831 + if (grsec_enable_chroot_caps && proc_is_chrooted(current) &&
61832 + inode && S_ISBLK(inode->i_mode) && !capable(CAP_SYS_RAWIO))
61833 + return 1;
61834 +#endif
61835 + return 0;
61836 +}
61837 +
61838 +int
61839 +gr_handle_chroot_fowner(struct pid *pid, enum pid_type type)
61840 +{
61841 +#ifdef CONFIG_GRKERNSEC_CHROOT_FINDTASK
61842 + struct task_struct *p;
61843 + int ret = 0;
61844 + if (!grsec_enable_chroot_findtask || !proc_is_chrooted(current) || !pid)
61845 + return ret;
61846 +
61847 + read_lock(&tasklist_lock);
61848 + do_each_pid_task(pid, type, p) {
61849 + if (!have_same_root(current, p)) {
61850 + ret = 1;
61851 + goto out;
61852 + }
61853 + } while_each_pid_task(pid, type, p);
61854 +out:
61855 + read_unlock(&tasklist_lock);
61856 + return ret;
61857 +#endif
61858 + return 0;
61859 +}
61860 +
61861 +int
61862 +gr_pid_is_chrooted(struct task_struct *p)
61863 +{
61864 +#ifdef CONFIG_GRKERNSEC_CHROOT_FINDTASK
61865 + if (!grsec_enable_chroot_findtask || !proc_is_chrooted(current) || p == NULL)
61866 + return 0;
61867 +
61868 + if ((p->exit_state & (EXIT_ZOMBIE | EXIT_DEAD)) ||
61869 + !have_same_root(current, p)) {
61870 + return 1;
61871 + }
61872 +#endif
61873 + return 0;
61874 +}
61875 +
61876 +EXPORT_SYMBOL(gr_pid_is_chrooted);
61877 +
61878 +#if defined(CONFIG_GRKERNSEC_CHROOT_DOUBLE) || defined(CONFIG_GRKERNSEC_CHROOT_FCHDIR)
61879 +int gr_is_outside_chroot(const struct dentry *u_dentry, const struct vfsmount *u_mnt)
61880 +{
61881 + struct dentry *dentry = (struct dentry *)u_dentry;
61882 + struct vfsmount *mnt = (struct vfsmount *)u_mnt;
61883 + struct dentry *realroot;
61884 + struct vfsmount *realrootmnt;
61885 + struct dentry *currentroot;
61886 + struct vfsmount *currentmnt;
61887 + struct task_struct *reaper = &init_task;
61888 + int ret = 1;
61889 +
61890 + read_lock(&reaper->fs->lock);
61891 + realrootmnt = mntget(reaper->fs->root.mnt);
61892 + realroot = dget(reaper->fs->root.dentry);
61893 + read_unlock(&reaper->fs->lock);
61894 +
61895 + read_lock(&current->fs->lock);
61896 + currentmnt = mntget(current->fs->root.mnt);
61897 + currentroot = dget(current->fs->root.dentry);
61898 + read_unlock(&current->fs->lock);
61899 +
61900 + spin_lock(&dcache_lock);
61901 + for (;;) {
61902 + if (unlikely((dentry == realroot && mnt == realrootmnt)
61903 + || (dentry == currentroot && mnt == currentmnt)))
61904 + break;
61905 + if (unlikely(dentry == mnt->mnt_root || IS_ROOT(dentry))) {
61906 + if (mnt->mnt_parent == mnt)
61907 + break;
61908 + dentry = mnt->mnt_mountpoint;
61909 + mnt = mnt->mnt_parent;
61910 + continue;
61911 + }
61912 + dentry = dentry->d_parent;
61913 + }
61914 + spin_unlock(&dcache_lock);
61915 +
61916 + dput(currentroot);
61917 + mntput(currentmnt);
61918 +
61919 + /* access is outside of chroot */
61920 + if (dentry == realroot && mnt == realrootmnt)
61921 + ret = 0;
61922 +
61923 + dput(realroot);
61924 + mntput(realrootmnt);
61925 + return ret;
61926 +}
61927 +#endif
61928 +
61929 +int
61930 +gr_chroot_fchdir(struct dentry *u_dentry, struct vfsmount *u_mnt)
61931 +{
61932 +#ifdef CONFIG_GRKERNSEC_CHROOT_FCHDIR
61933 + if (!grsec_enable_chroot_fchdir)
61934 + return 1;
61935 +
61936 + if (!proc_is_chrooted(current))
61937 + return 1;
61938 + else if (!gr_is_outside_chroot(u_dentry, u_mnt)) {
61939 + gr_log_fs_generic(GR_DONT_AUDIT, GR_CHROOT_FCHDIR_MSG, u_dentry, u_mnt);
61940 + return 0;
61941 + }
61942 +#endif
61943 + return 1;
61944 +}
61945 +
61946 +int
61947 +gr_chroot_shmat(const pid_t shm_cprid, const pid_t shm_lapid,
61948 + const time_t shm_createtime)
61949 +{
61950 +#ifdef CONFIG_GRKERNSEC_CHROOT_SHMAT
61951 + struct task_struct *p;
61952 + time_t starttime;
61953 +
61954 + if (unlikely(!grsec_enable_chroot_shmat))
61955 + return 1;
61956 +
61957 + if (likely(!proc_is_chrooted(current)))
61958 + return 1;
61959 +
61960 + rcu_read_lock();
61961 + read_lock(&tasklist_lock);
61962 +
61963 + if ((p = find_task_by_vpid_unrestricted(shm_cprid))) {
61964 + starttime = p->start_time.tv_sec;
61965 + if (time_before_eq((unsigned long)starttime, (unsigned long)shm_createtime)) {
61966 + if (have_same_root(current, p)) {
61967 + goto allow;
61968 + } else {
61969 + read_unlock(&tasklist_lock);
61970 + rcu_read_unlock();
61971 + gr_log_noargs(GR_DONT_AUDIT, GR_SHMAT_CHROOT_MSG);
61972 + return 0;
61973 + }
61974 + }
61975 + /* creator exited, pid reuse, fall through to next check */
61976 + }
61977 + if ((p = find_task_by_vpid_unrestricted(shm_lapid))) {
61978 + if (unlikely(!have_same_root(current, p))) {
61979 + read_unlock(&tasklist_lock);
61980 + rcu_read_unlock();
61981 + gr_log_noargs(GR_DONT_AUDIT, GR_SHMAT_CHROOT_MSG);
61982 + return 0;
61983 + }
61984 + }
61985 +
61986 +allow:
61987 + read_unlock(&tasklist_lock);
61988 + rcu_read_unlock();
61989 +#endif
61990 + return 1;
61991 +}
61992 +
61993 +void
61994 +gr_log_chroot_exec(const struct dentry *dentry, const struct vfsmount *mnt)
61995 +{
61996 +#ifdef CONFIG_GRKERNSEC_CHROOT_EXECLOG
61997 + if (grsec_enable_chroot_execlog && proc_is_chrooted(current))
61998 + gr_log_fs_generic(GR_DO_AUDIT, GR_EXEC_CHROOT_MSG, dentry, mnt);
61999 +#endif
62000 + return;
62001 +}
62002 +
62003 +int
62004 +gr_handle_chroot_mknod(const struct dentry *dentry,
62005 + const struct vfsmount *mnt, const int mode)
62006 +{
62007 +#ifdef CONFIG_GRKERNSEC_CHROOT_MKNOD
62008 + if (grsec_enable_chroot_mknod && !S_ISFIFO(mode) && !S_ISREG(mode) &&
62009 + proc_is_chrooted(current)) {
62010 + gr_log_fs_generic(GR_DONT_AUDIT, GR_MKNOD_CHROOT_MSG, dentry, mnt);
62011 + return -EPERM;
62012 + }
62013 +#endif
62014 + return 0;
62015 +}
62016 +
62017 +int
62018 +gr_handle_chroot_mount(const struct dentry *dentry,
62019 + const struct vfsmount *mnt, const char *dev_name)
62020 +{
62021 +#ifdef CONFIG_GRKERNSEC_CHROOT_MOUNT
62022 + if (grsec_enable_chroot_mount && proc_is_chrooted(current)) {
62023 + gr_log_str_fs(GR_DONT_AUDIT, GR_MOUNT_CHROOT_MSG, dev_name ? dev_name : "none" , dentry, mnt);
62024 + return -EPERM;
62025 + }
62026 +#endif
62027 + return 0;
62028 +}
62029 +
62030 +int
62031 +gr_handle_chroot_pivot(void)
62032 +{
62033 +#ifdef CONFIG_GRKERNSEC_CHROOT_PIVOT
62034 + if (grsec_enable_chroot_pivot && proc_is_chrooted(current)) {
62035 + gr_log_noargs(GR_DONT_AUDIT, GR_PIVOT_CHROOT_MSG);
62036 + return -EPERM;
62037 + }
62038 +#endif
62039 + return 0;
62040 +}
62041 +
62042 +int
62043 +gr_handle_chroot_chroot(const struct dentry *dentry, const struct vfsmount *mnt)
62044 +{
62045 +#ifdef CONFIG_GRKERNSEC_CHROOT_DOUBLE
62046 + if (grsec_enable_chroot_double && proc_is_chrooted(current) &&
62047 + !gr_is_outside_chroot(dentry, mnt)) {
62048 + gr_log_fs_generic(GR_DONT_AUDIT, GR_CHROOT_CHROOT_MSG, dentry, mnt);
62049 + return -EPERM;
62050 + }
62051 +#endif
62052 + return 0;
62053 +}
62054 +
62055 +extern const char *captab_log[];
62056 +extern int captab_log_entries;
62057 +
62058 +int
62059 +gr_chroot_is_capable(const int cap)
62060 +{
62061 +#ifdef CONFIG_GRKERNSEC_CHROOT_CAPS
62062 + if (grsec_enable_chroot_caps && proc_is_chrooted(current)) {
62063 + kernel_cap_t chroot_caps = GR_CHROOT_CAPS;
62064 + if (cap_raised(chroot_caps, cap)) {
62065 + const struct cred *creds = current_cred();
62066 + if (cap_raised(creds->cap_effective, cap) && cap < captab_log_entries) {
62067 + gr_log_cap(GR_DONT_AUDIT, GR_CAP_CHROOT_MSG, current, captab_log[cap]);
62068 + }
62069 + return 0;
62070 + }
62071 + }
62072 +#endif
62073 + return 1;
62074 +}
62075 +
62076 +int
62077 +gr_chroot_is_capable_nolog(const int cap)
62078 +{
62079 +#ifdef CONFIG_GRKERNSEC_CHROOT_CAPS
62080 + if (grsec_enable_chroot_caps && proc_is_chrooted(current)) {
62081 + kernel_cap_t chroot_caps = GR_CHROOT_CAPS;
62082 + if (cap_raised(chroot_caps, cap)) {
62083 + return 0;
62084 + }
62085 + }
62086 +#endif
62087 + return 1;
62088 +}
62089 +
62090 +int
62091 +gr_handle_chroot_sysctl(const int op)
62092 +{
62093 +#ifdef CONFIG_GRKERNSEC_CHROOT_SYSCTL
62094 + if (grsec_enable_chroot_sysctl && proc_is_chrooted(current)
62095 + && (op & MAY_WRITE))
62096 + return -EACCES;
62097 +#endif
62098 + return 0;
62099 +}
62100 +
62101 +void
62102 +gr_handle_chroot_chdir(struct path *path)
62103 +{
62104 +#ifdef CONFIG_GRKERNSEC_CHROOT_CHDIR
62105 + if (grsec_enable_chroot_chdir)
62106 + set_fs_pwd(current->fs, path);
62107 +#endif
62108 + return;
62109 +}
62110 +
62111 +int
62112 +gr_handle_chroot_chmod(const struct dentry *dentry,
62113 + const struct vfsmount *mnt, const int mode)
62114 +{
62115 +#ifdef CONFIG_GRKERNSEC_CHROOT_CHMOD
62116 + /* allow chmod +s on directories, but not on files */
62117 + if (grsec_enable_chroot_chmod && !S_ISDIR(dentry->d_inode->i_mode) &&
62118 + ((mode & S_ISUID) || ((mode & (S_ISGID | S_IXGRP)) == (S_ISGID | S_IXGRP))) &&
62119 + proc_is_chrooted(current)) {
62120 + gr_log_fs_generic(GR_DONT_AUDIT, GR_CHMOD_CHROOT_MSG, dentry, mnt);
62121 + return -EPERM;
62122 + }
62123 +#endif
62124 + return 0;
62125 +}
62126 diff --git a/grsecurity/grsec_disabled.c b/grsecurity/grsec_disabled.c
62127 new file mode 100644
62128 index 0000000..b81db5b
62129 --- /dev/null
62130 +++ b/grsecurity/grsec_disabled.c
62131 @@ -0,0 +1,439 @@
62132 +#include <linux/kernel.h>
62133 +#include <linux/module.h>
62134 +#include <linux/sched.h>
62135 +#include <linux/file.h>
62136 +#include <linux/fs.h>
62137 +#include <linux/kdev_t.h>
62138 +#include <linux/net.h>
62139 +#include <linux/in.h>
62140 +#include <linux/ip.h>
62141 +#include <linux/skbuff.h>
62142 +#include <linux/sysctl.h>
62143 +
62144 +#ifdef CONFIG_PAX_HAVE_ACL_FLAGS
62145 +void
62146 +pax_set_initial_flags(struct linux_binprm *bprm)
62147 +{
62148 + return;
62149 +}
62150 +#endif
62151 +
62152 +#ifdef CONFIG_SYSCTL
62153 +__u32
62154 +gr_handle_sysctl(const struct ctl_table * table, const int op)
62155 +{
62156 + return 0;
62157 +}
62158 +#endif
62159 +
62160 +#ifdef CONFIG_TASKSTATS
62161 +int gr_is_taskstats_denied(int pid)
62162 +{
62163 + return 0;
62164 +}
62165 +#endif
62166 +
62167 +int
62168 +gr_acl_is_enabled(void)
62169 +{
62170 + return 0;
62171 +}
62172 +
62173 +void
62174 +gr_handle_proc_create(const struct dentry *dentry, const struct inode *inode)
62175 +{
62176 + return;
62177 +}
62178 +
62179 +int
62180 +gr_handle_rawio(const struct inode *inode)
62181 +{
62182 + return 0;
62183 +}
62184 +
62185 +void
62186 +gr_acl_handle_psacct(struct task_struct *task, const long code)
62187 +{
62188 + return;
62189 +}
62190 +
62191 +int
62192 +gr_handle_ptrace(struct task_struct *task, const long request)
62193 +{
62194 + return 0;
62195 +}
62196 +
62197 +int
62198 +gr_handle_proc_ptrace(struct task_struct *task)
62199 +{
62200 + return 0;
62201 +}
62202 +
62203 +void
62204 +gr_learn_resource(const struct task_struct *task,
62205 + const int res, const unsigned long wanted, const int gt)
62206 +{
62207 + return;
62208 +}
62209 +
62210 +int
62211 +gr_set_acls(const int type)
62212 +{
62213 + return 0;
62214 +}
62215 +
62216 +int
62217 +gr_check_hidden_task(const struct task_struct *tsk)
62218 +{
62219 + return 0;
62220 +}
62221 +
62222 +int
62223 +gr_check_protected_task(const struct task_struct *task)
62224 +{
62225 + return 0;
62226 +}
62227 +
62228 +int
62229 +gr_check_protected_task_fowner(struct pid *pid, enum pid_type type)
62230 +{
62231 + return 0;
62232 +}
62233 +
62234 +void
62235 +gr_copy_label(struct task_struct *tsk)
62236 +{
62237 + return;
62238 +}
62239 +
62240 +void
62241 +gr_set_pax_flags(struct task_struct *task)
62242 +{
62243 + return;
62244 +}
62245 +
62246 +int
62247 +gr_set_proc_label(const struct dentry *dentry, const struct vfsmount *mnt,
62248 + const int unsafe_share)
62249 +{
62250 + return 0;
62251 +}
62252 +
62253 +void
62254 +gr_handle_delete(const ino_t ino, const dev_t dev)
62255 +{
62256 + return;
62257 +}
62258 +
62259 +void
62260 +gr_handle_create(const struct dentry *dentry, const struct vfsmount *mnt)
62261 +{
62262 + return;
62263 +}
62264 +
62265 +void
62266 +gr_handle_crash(struct task_struct *task, const int sig)
62267 +{
62268 + return;
62269 +}
62270 +
62271 +int
62272 +gr_check_crash_exec(const struct file *filp)
62273 +{
62274 + return 0;
62275 +}
62276 +
62277 +int
62278 +gr_check_crash_uid(const uid_t uid)
62279 +{
62280 + return 0;
62281 +}
62282 +
62283 +void
62284 +gr_handle_rename(struct inode *old_dir, struct inode *new_dir,
62285 + struct dentry *old_dentry,
62286 + struct dentry *new_dentry,
62287 + struct vfsmount *mnt, const __u8 replace)
62288 +{
62289 + return;
62290 +}
62291 +
62292 +int
62293 +gr_search_socket(const int family, const int type, const int protocol)
62294 +{
62295 + return 1;
62296 +}
62297 +
62298 +int
62299 +gr_search_connectbind(const int mode, const struct socket *sock,
62300 + const struct sockaddr_in *addr)
62301 +{
62302 + return 0;
62303 +}
62304 +
62305 +void
62306 +gr_handle_alertkill(struct task_struct *task)
62307 +{
62308 + return;
62309 +}
62310 +
62311 +__u32
62312 +gr_acl_handle_execve(const struct dentry * dentry, const struct vfsmount * mnt)
62313 +{
62314 + return 1;
62315 +}
62316 +
62317 +__u32
62318 +gr_acl_handle_hidden_file(const struct dentry * dentry,
62319 + const struct vfsmount * mnt)
62320 +{
62321 + return 1;
62322 +}
62323 +
62324 +__u32
62325 +gr_acl_handle_open(const struct dentry * dentry, const struct vfsmount * mnt,
62326 + int acc_mode)
62327 +{
62328 + return 1;
62329 +}
62330 +
62331 +__u32
62332 +gr_acl_handle_rmdir(const struct dentry * dentry, const struct vfsmount * mnt)
62333 +{
62334 + return 1;
62335 +}
62336 +
62337 +__u32
62338 +gr_acl_handle_unlink(const struct dentry * dentry, const struct vfsmount * mnt)
62339 +{
62340 + return 1;
62341 +}
62342 +
62343 +int
62344 +gr_acl_handle_mmap(const struct file *file, const unsigned long prot,
62345 + unsigned int *vm_flags)
62346 +{
62347 + return 1;
62348 +}
62349 +
62350 +__u32
62351 +gr_acl_handle_truncate(const struct dentry * dentry,
62352 + const struct vfsmount * mnt)
62353 +{
62354 + return 1;
62355 +}
62356 +
62357 +__u32
62358 +gr_acl_handle_utime(const struct dentry * dentry, const struct vfsmount * mnt)
62359 +{
62360 + return 1;
62361 +}
62362 +
62363 +__u32
62364 +gr_acl_handle_access(const struct dentry * dentry,
62365 + const struct vfsmount * mnt, const int fmode)
62366 +{
62367 + return 1;
62368 +}
62369 +
62370 +__u32
62371 +gr_acl_handle_fchmod(const struct dentry * dentry, const struct vfsmount * mnt,
62372 + mode_t mode)
62373 +{
62374 + return 1;
62375 +}
62376 +
62377 +__u32
62378 +gr_acl_handle_chmod(const struct dentry * dentry, const struct vfsmount * mnt,
62379 + mode_t mode)
62380 +{
62381 + return 1;
62382 +}
62383 +
62384 +__u32
62385 +gr_acl_handle_chown(const struct dentry * dentry, const struct vfsmount * mnt)
62386 +{
62387 + return 1;
62388 +}
62389 +
62390 +__u32
62391 +gr_acl_handle_setxattr(const struct dentry * dentry, const struct vfsmount * mnt)
62392 +{
62393 + return 1;
62394 +}
62395 +
62396 +void
62397 +grsecurity_init(void)
62398 +{
62399 + return;
62400 +}
62401 +
62402 +__u32
62403 +gr_acl_handle_mknod(const struct dentry * new_dentry,
62404 + const struct dentry * parent_dentry,
62405 + const struct vfsmount * parent_mnt,
62406 + const int mode)
62407 +{
62408 + return 1;
62409 +}
62410 +
62411 +__u32
62412 +gr_acl_handle_mkdir(const struct dentry * new_dentry,
62413 + const struct dentry * parent_dentry,
62414 + const struct vfsmount * parent_mnt)
62415 +{
62416 + return 1;
62417 +}
62418 +
62419 +__u32
62420 +gr_acl_handle_symlink(const struct dentry * new_dentry,
62421 + const struct dentry * parent_dentry,
62422 + const struct vfsmount * parent_mnt, const char *from)
62423 +{
62424 + return 1;
62425 +}
62426 +
62427 +__u32
62428 +gr_acl_handle_link(const struct dentry * new_dentry,
62429 + const struct dentry * parent_dentry,
62430 + const struct vfsmount * parent_mnt,
62431 + const struct dentry * old_dentry,
62432 + const struct vfsmount * old_mnt, const char *to)
62433 +{
62434 + return 1;
62435 +}
62436 +
62437 +int
62438 +gr_acl_handle_rename(const struct dentry *new_dentry,
62439 + const struct dentry *parent_dentry,
62440 + const struct vfsmount *parent_mnt,
62441 + const struct dentry *old_dentry,
62442 + const struct inode *old_parent_inode,
62443 + const struct vfsmount *old_mnt, const char *newname)
62444 +{
62445 + return 0;
62446 +}
62447 +
62448 +int
62449 +gr_acl_handle_filldir(const struct file *file, const char *name,
62450 + const int namelen, const ino_t ino)
62451 +{
62452 + return 1;
62453 +}
62454 +
62455 +int
62456 +gr_handle_shmat(const pid_t shm_cprid, const pid_t shm_lapid,
62457 + const time_t shm_createtime, const uid_t cuid, const int shmid)
62458 +{
62459 + return 1;
62460 +}
62461 +
62462 +int
62463 +gr_search_bind(const struct socket *sock, const struct sockaddr_in *addr)
62464 +{
62465 + return 0;
62466 +}
62467 +
62468 +int
62469 +gr_search_accept(const struct socket *sock)
62470 +{
62471 + return 0;
62472 +}
62473 +
62474 +int
62475 +gr_search_listen(const struct socket *sock)
62476 +{
62477 + return 0;
62478 +}
62479 +
62480 +int
62481 +gr_search_connect(const struct socket *sock, const struct sockaddr_in *addr)
62482 +{
62483 + return 0;
62484 +}
62485 +
62486 +__u32
62487 +gr_acl_handle_unix(const struct dentry * dentry, const struct vfsmount * mnt)
62488 +{
62489 + return 1;
62490 +}
62491 +
62492 +__u32
62493 +gr_acl_handle_creat(const struct dentry * dentry,
62494 + const struct dentry * p_dentry,
62495 + const struct vfsmount * p_mnt, int open_flags, int acc_mode,
62496 + const int imode)
62497 +{
62498 + return 1;
62499 +}
62500 +
62501 +void
62502 +gr_acl_handle_exit(void)
62503 +{
62504 + return;
62505 +}
62506 +
62507 +int
62508 +gr_acl_handle_mprotect(const struct file *file, const unsigned long prot)
62509 +{
62510 + return 1;
62511 +}
62512 +
62513 +void
62514 +gr_set_role_label(const uid_t uid, const gid_t gid)
62515 +{
62516 + return;
62517 +}
62518 +
62519 +int
62520 +gr_acl_handle_procpidmem(const struct task_struct *task)
62521 +{
62522 + return 0;
62523 +}
62524 +
62525 +int
62526 +gr_search_udp_recvmsg(const struct sock *sk, const struct sk_buff *skb)
62527 +{
62528 + return 0;
62529 +}
62530 +
62531 +int
62532 +gr_search_udp_sendmsg(const struct sock *sk, const struct sockaddr_in *addr)
62533 +{
62534 + return 0;
62535 +}
62536 +
62537 +void
62538 +gr_set_kernel_label(struct task_struct *task)
62539 +{
62540 + return;
62541 +}
62542 +
62543 +int
62544 +gr_check_user_change(int real, int effective, int fs)
62545 +{
62546 + return 0;
62547 +}
62548 +
62549 +int
62550 +gr_check_group_change(int real, int effective, int fs)
62551 +{
62552 + return 0;
62553 +}
62554 +
62555 +int gr_acl_enable_at_secure(void)
62556 +{
62557 + return 0;
62558 +}
62559 +
62560 +dev_t gr_get_dev_from_dentry(struct dentry *dentry)
62561 +{
62562 + return dentry->d_inode->i_sb->s_dev;
62563 +}
62564 +
62565 +EXPORT_SYMBOL(gr_learn_resource);
62566 +EXPORT_SYMBOL(gr_set_kernel_label);
62567 +#ifdef CONFIG_SECURITY
62568 +EXPORT_SYMBOL(gr_check_user_change);
62569 +EXPORT_SYMBOL(gr_check_group_change);
62570 +#endif
62571 diff --git a/grsecurity/grsec_exec.c b/grsecurity/grsec_exec.c
62572 new file mode 100644
62573 index 0000000..a96e155
62574 --- /dev/null
62575 +++ b/grsecurity/grsec_exec.c
62576 @@ -0,0 +1,204 @@
62577 +#include <linux/kernel.h>
62578 +#include <linux/sched.h>
62579 +#include <linux/file.h>
62580 +#include <linux/binfmts.h>
62581 +#include <linux/smp_lock.h>
62582 +#include <linux/fs.h>
62583 +#include <linux/types.h>
62584 +#include <linux/grdefs.h>
62585 +#include <linux/grinternal.h>
62586 +#include <linux/capability.h>
62587 +#include <linux/compat.h>
62588 +#include <linux/module.h>
62589 +
62590 +#include <asm/uaccess.h>
62591 +
62592 +#ifdef CONFIG_GRKERNSEC_EXECLOG
62593 +static char gr_exec_arg_buf[132];
62594 +static DEFINE_MUTEX(gr_exec_arg_mutex);
62595 +#endif
62596 +
62597 +void
62598 +gr_handle_exec_args(struct linux_binprm *bprm, const char __user *const __user *argv)
62599 +{
62600 +#ifdef CONFIG_GRKERNSEC_EXECLOG
62601 + char *grarg = gr_exec_arg_buf;
62602 + unsigned int i, x, execlen = 0;
62603 + char c;
62604 +
62605 + if (!((grsec_enable_execlog && grsec_enable_group &&
62606 + in_group_p(grsec_audit_gid))
62607 + || (grsec_enable_execlog && !grsec_enable_group)))
62608 + return;
62609 +
62610 + mutex_lock(&gr_exec_arg_mutex);
62611 + memset(grarg, 0, sizeof(gr_exec_arg_buf));
62612 +
62613 + if (unlikely(argv == NULL))
62614 + goto log;
62615 +
62616 + for (i = 0; i < bprm->argc && execlen < 128; i++) {
62617 + const char __user *p;
62618 + unsigned int len;
62619 +
62620 + if (copy_from_user(&p, argv + i, sizeof(p)))
62621 + goto log;
62622 + if (!p)
62623 + goto log;
62624 + len = strnlen_user(p, 128 - execlen);
62625 + if (len > 128 - execlen)
62626 + len = 128 - execlen;
62627 + else if (len > 0)
62628 + len--;
62629 + if (copy_from_user(grarg + execlen, p, len))
62630 + goto log;
62631 +
62632 + /* rewrite unprintable characters */
62633 + for (x = 0; x < len; x++) {
62634 + c = *(grarg + execlen + x);
62635 + if (c < 32 || c > 126)
62636 + *(grarg + execlen + x) = ' ';
62637 + }
62638 +
62639 + execlen += len;
62640 + *(grarg + execlen) = ' ';
62641 + *(grarg + execlen + 1) = '\0';
62642 + execlen++;
62643 + }
62644 +
62645 + log:
62646 + gr_log_fs_str(GR_DO_AUDIT, GR_EXEC_AUDIT_MSG, bprm->file->f_path.dentry,
62647 + bprm->file->f_path.mnt, grarg);
62648 + mutex_unlock(&gr_exec_arg_mutex);
62649 +#endif
62650 + return;
62651 +}
62652 +
62653 +#ifdef CONFIG_COMPAT
62654 +void
62655 +gr_handle_exec_args_compat(struct linux_binprm *bprm, compat_uptr_t __user *argv)
62656 +{
62657 +#ifdef CONFIG_GRKERNSEC_EXECLOG
62658 + char *grarg = gr_exec_arg_buf;
62659 + unsigned int i, x, execlen = 0;
62660 + char c;
62661 +
62662 + if (!((grsec_enable_execlog && grsec_enable_group &&
62663 + in_group_p(grsec_audit_gid))
62664 + || (grsec_enable_execlog && !grsec_enable_group)))
62665 + return;
62666 +
62667 + mutex_lock(&gr_exec_arg_mutex);
62668 + memset(grarg, 0, sizeof(gr_exec_arg_buf));
62669 +
62670 + if (unlikely(argv == NULL))
62671 + goto log;
62672 +
62673 + for (i = 0; i < bprm->argc && execlen < 128; i++) {
62674 + compat_uptr_t p;
62675 + unsigned int len;
62676 +
62677 + if (get_user(p, argv + i))
62678 + goto log;
62679 + len = strnlen_user(compat_ptr(p), 128 - execlen);
62680 + if (len > 128 - execlen)
62681 + len = 128 - execlen;
62682 + else if (len > 0)
62683 + len--;
62684 + else
62685 + goto log;
62686 + if (copy_from_user(grarg + execlen, compat_ptr(p), len))
62687 + goto log;
62688 +
62689 + /* rewrite unprintable characters */
62690 + for (x = 0; x < len; x++) {
62691 + c = *(grarg + execlen + x);
62692 + if (c < 32 || c > 126)
62693 + *(grarg + execlen + x) = ' ';
62694 + }
62695 +
62696 + execlen += len;
62697 + *(grarg + execlen) = ' ';
62698 + *(grarg + execlen + 1) = '\0';
62699 + execlen++;
62700 + }
62701 +
62702 + log:
62703 + gr_log_fs_str(GR_DO_AUDIT, GR_EXEC_AUDIT_MSG, bprm->file->f_path.dentry,
62704 + bprm->file->f_path.mnt, grarg);
62705 + mutex_unlock(&gr_exec_arg_mutex);
62706 +#endif
62707 + return;
62708 +}
62709 +#endif
62710 +
62711 +#ifdef CONFIG_GRKERNSEC
62712 +extern int gr_acl_is_capable(const int cap);
62713 +extern int gr_acl_is_capable_nolog(const int cap);
62714 +extern int gr_chroot_is_capable(const int cap);
62715 +extern int gr_chroot_is_capable_nolog(const int cap);
62716 +#endif
62717 +
62718 +const char *captab_log[] = {
62719 + "CAP_CHOWN",
62720 + "CAP_DAC_OVERRIDE",
62721 + "CAP_DAC_READ_SEARCH",
62722 + "CAP_FOWNER",
62723 + "CAP_FSETID",
62724 + "CAP_KILL",
62725 + "CAP_SETGID",
62726 + "CAP_SETUID",
62727 + "CAP_SETPCAP",
62728 + "CAP_LINUX_IMMUTABLE",
62729 + "CAP_NET_BIND_SERVICE",
62730 + "CAP_NET_BROADCAST",
62731 + "CAP_NET_ADMIN",
62732 + "CAP_NET_RAW",
62733 + "CAP_IPC_LOCK",
62734 + "CAP_IPC_OWNER",
62735 + "CAP_SYS_MODULE",
62736 + "CAP_SYS_RAWIO",
62737 + "CAP_SYS_CHROOT",
62738 + "CAP_SYS_PTRACE",
62739 + "CAP_SYS_PACCT",
62740 + "CAP_SYS_ADMIN",
62741 + "CAP_SYS_BOOT",
62742 + "CAP_SYS_NICE",
62743 + "CAP_SYS_RESOURCE",
62744 + "CAP_SYS_TIME",
62745 + "CAP_SYS_TTY_CONFIG",
62746 + "CAP_MKNOD",
62747 + "CAP_LEASE",
62748 + "CAP_AUDIT_WRITE",
62749 + "CAP_AUDIT_CONTROL",
62750 + "CAP_SETFCAP",
62751 + "CAP_MAC_OVERRIDE",
62752 + "CAP_MAC_ADMIN"
62753 +};
62754 +
62755 +int captab_log_entries = sizeof(captab_log)/sizeof(captab_log[0]);
62756 +
62757 +int gr_is_capable(const int cap)
62758 +{
62759 +#ifdef CONFIG_GRKERNSEC
62760 + if (gr_acl_is_capable(cap) && gr_chroot_is_capable(cap))
62761 + return 1;
62762 + return 0;
62763 +#else
62764 + return 1;
62765 +#endif
62766 +}
62767 +
62768 +int gr_is_capable_nolog(const int cap)
62769 +{
62770 +#ifdef CONFIG_GRKERNSEC
62771 + if (gr_acl_is_capable_nolog(cap) && gr_chroot_is_capable_nolog(cap))
62772 + return 1;
62773 + return 0;
62774 +#else
62775 + return 1;
62776 +#endif
62777 +}
62778 +
62779 +EXPORT_SYMBOL(gr_is_capable);
62780 +EXPORT_SYMBOL(gr_is_capable_nolog);
62781 diff --git a/grsecurity/grsec_fifo.c b/grsecurity/grsec_fifo.c
62782 new file mode 100644
62783 index 0000000..d3ee748
62784 --- /dev/null
62785 +++ b/grsecurity/grsec_fifo.c
62786 @@ -0,0 +1,24 @@
62787 +#include <linux/kernel.h>
62788 +#include <linux/sched.h>
62789 +#include <linux/fs.h>
62790 +#include <linux/file.h>
62791 +#include <linux/grinternal.h>
62792 +
62793 +int
62794 +gr_handle_fifo(const struct dentry *dentry, const struct vfsmount *mnt,
62795 + const struct dentry *dir, const int flag, const int acc_mode)
62796 +{
62797 +#ifdef CONFIG_GRKERNSEC_FIFO
62798 + const struct cred *cred = current_cred();
62799 +
62800 + if (grsec_enable_fifo && S_ISFIFO(dentry->d_inode->i_mode) &&
62801 + !(flag & O_EXCL) && (dir->d_inode->i_mode & S_ISVTX) &&
62802 + (dentry->d_inode->i_uid != dir->d_inode->i_uid) &&
62803 + (cred->fsuid != dentry->d_inode->i_uid)) {
62804 + if (!inode_permission(dentry->d_inode, acc_mode))
62805 + gr_log_fs_int2(GR_DONT_AUDIT, GR_FIFO_MSG, dentry, mnt, dentry->d_inode->i_uid, dentry->d_inode->i_gid);
62806 + return -EACCES;
62807 + }
62808 +#endif
62809 + return 0;
62810 +}
62811 diff --git a/grsecurity/grsec_fork.c b/grsecurity/grsec_fork.c
62812 new file mode 100644
62813 index 0000000..8ca18bf
62814 --- /dev/null
62815 +++ b/grsecurity/grsec_fork.c
62816 @@ -0,0 +1,23 @@
62817 +#include <linux/kernel.h>
62818 +#include <linux/sched.h>
62819 +#include <linux/grsecurity.h>
62820 +#include <linux/grinternal.h>
62821 +#include <linux/errno.h>
62822 +
62823 +void
62824 +gr_log_forkfail(const int retval)
62825 +{
62826 +#ifdef CONFIG_GRKERNSEC_FORKFAIL
62827 + if (grsec_enable_forkfail && (retval == -EAGAIN || retval == -ENOMEM)) {
62828 + switch (retval) {
62829 + case -EAGAIN:
62830 + gr_log_str(GR_DONT_AUDIT, GR_FAILFORK_MSG, "EAGAIN");
62831 + break;
62832 + case -ENOMEM:
62833 + gr_log_str(GR_DONT_AUDIT, GR_FAILFORK_MSG, "ENOMEM");
62834 + break;
62835 + }
62836 + }
62837 +#endif
62838 + return;
62839 +}
62840 diff --git a/grsecurity/grsec_init.c b/grsecurity/grsec_init.c
62841 new file mode 100644
62842 index 0000000..f813c26
62843 --- /dev/null
62844 +++ b/grsecurity/grsec_init.c
62845 @@ -0,0 +1,270 @@
62846 +#include <linux/kernel.h>
62847 +#include <linux/sched.h>
62848 +#include <linux/mm.h>
62849 +#include <linux/smp_lock.h>
62850 +#include <linux/gracl.h>
62851 +#include <linux/slab.h>
62852 +#include <linux/vmalloc.h>
62853 +#include <linux/percpu.h>
62854 +#include <linux/module.h>
62855 +
62856 +int grsec_enable_brute;
62857 +int grsec_enable_link;
62858 +int grsec_enable_dmesg;
62859 +int grsec_enable_harden_ptrace;
62860 +int grsec_enable_fifo;
62861 +int grsec_enable_execlog;
62862 +int grsec_enable_signal;
62863 +int grsec_enable_forkfail;
62864 +int grsec_enable_audit_ptrace;
62865 +int grsec_enable_time;
62866 +int grsec_enable_audit_textrel;
62867 +int grsec_enable_group;
62868 +int grsec_audit_gid;
62869 +int grsec_enable_chdir;
62870 +int grsec_enable_mount;
62871 +int grsec_enable_rofs;
62872 +int grsec_enable_chroot_findtask;
62873 +int grsec_enable_chroot_mount;
62874 +int grsec_enable_chroot_shmat;
62875 +int grsec_enable_chroot_fchdir;
62876 +int grsec_enable_chroot_double;
62877 +int grsec_enable_chroot_pivot;
62878 +int grsec_enable_chroot_chdir;
62879 +int grsec_enable_chroot_chmod;
62880 +int grsec_enable_chroot_mknod;
62881 +int grsec_enable_chroot_nice;
62882 +int grsec_enable_chroot_execlog;
62883 +int grsec_enable_chroot_caps;
62884 +int grsec_enable_chroot_sysctl;
62885 +int grsec_enable_chroot_unix;
62886 +int grsec_enable_tpe;
62887 +int grsec_tpe_gid;
62888 +int grsec_enable_blackhole;
62889 +#ifdef CONFIG_IPV6_MODULE
62890 +EXPORT_SYMBOL(grsec_enable_blackhole);
62891 +#endif
62892 +int grsec_lastack_retries;
62893 +int grsec_enable_tpe_all;
62894 +int grsec_enable_tpe_invert;
62895 +int grsec_enable_socket_all;
62896 +int grsec_socket_all_gid;
62897 +int grsec_enable_socket_client;
62898 +int grsec_socket_client_gid;
62899 +int grsec_enable_socket_server;
62900 +int grsec_socket_server_gid;
62901 +int grsec_resource_logging;
62902 +int grsec_disable_privio;
62903 +int grsec_enable_log_rwxmaps;
62904 +int grsec_lock;
62905 +
62906 +DEFINE_SPINLOCK(grsec_alert_lock);
62907 +unsigned long grsec_alert_wtime = 0;
62908 +unsigned long grsec_alert_fyet = 0;
62909 +
62910 +DEFINE_SPINLOCK(grsec_audit_lock);
62911 +
62912 +DEFINE_RWLOCK(grsec_exec_file_lock);
62913 +
62914 +char *gr_shared_page[4];
62915 +
62916 +char *gr_alert_log_fmt;
62917 +char *gr_audit_log_fmt;
62918 +char *gr_alert_log_buf;
62919 +char *gr_audit_log_buf;
62920 +
62921 +extern struct gr_arg *gr_usermode;
62922 +extern unsigned char *gr_system_salt;
62923 +extern unsigned char *gr_system_sum;
62924 +
62925 +void __init
62926 +grsecurity_init(void)
62927 +{
62928 + int j;
62929 + /* create the per-cpu shared pages */
62930 +
62931 +#ifdef CONFIG_X86
62932 + memset((char *)(0x41a + PAGE_OFFSET), 0, 36);
62933 +#endif
62934 +
62935 + for (j = 0; j < 4; j++) {
62936 + gr_shared_page[j] = (char *)__alloc_percpu(PAGE_SIZE, __alignof__(unsigned long long));
62937 + if (gr_shared_page[j] == NULL) {
62938 + panic("Unable to allocate grsecurity shared page");
62939 + return;
62940 + }
62941 + }
62942 +
62943 + /* allocate log buffers */
62944 + gr_alert_log_fmt = kmalloc(512, GFP_KERNEL);
62945 + if (!gr_alert_log_fmt) {
62946 + panic("Unable to allocate grsecurity alert log format buffer");
62947 + return;
62948 + }
62949 + gr_audit_log_fmt = kmalloc(512, GFP_KERNEL);
62950 + if (!gr_audit_log_fmt) {
62951 + panic("Unable to allocate grsecurity audit log format buffer");
62952 + return;
62953 + }
62954 + gr_alert_log_buf = (char *) get_zeroed_page(GFP_KERNEL);
62955 + if (!gr_alert_log_buf) {
62956 + panic("Unable to allocate grsecurity alert log buffer");
62957 + return;
62958 + }
62959 + gr_audit_log_buf = (char *) get_zeroed_page(GFP_KERNEL);
62960 + if (!gr_audit_log_buf) {
62961 + panic("Unable to allocate grsecurity audit log buffer");
62962 + return;
62963 + }
62964 +
62965 + /* allocate memory for authentication structure */
62966 + gr_usermode = kmalloc(sizeof(struct gr_arg), GFP_KERNEL);
62967 + gr_system_salt = kmalloc(GR_SALT_LEN, GFP_KERNEL);
62968 + gr_system_sum = kmalloc(GR_SHA_LEN, GFP_KERNEL);
62969 +
62970 + if (!gr_usermode || !gr_system_salt || !gr_system_sum) {
62971 + panic("Unable to allocate grsecurity authentication structure");
62972 + return;
62973 + }
62974 +
62975 +
62976 +#ifdef CONFIG_GRKERNSEC_IO
62977 +#if !defined(CONFIG_GRKERNSEC_SYSCTL_DISTRO)
62978 + grsec_disable_privio = 1;
62979 +#elif defined(CONFIG_GRKERNSEC_SYSCTL_ON)
62980 + grsec_disable_privio = 1;
62981 +#else
62982 + grsec_disable_privio = 0;
62983 +#endif
62984 +#endif
62985 +
62986 +#ifdef CONFIG_GRKERNSEC_TPE_INVERT
62987 + /* for backward compatibility, tpe_invert always defaults to on if
62988 + enabled in the kernel
62989 + */
62990 + grsec_enable_tpe_invert = 1;
62991 +#endif
62992 +
62993 +#if !defined(CONFIG_GRKERNSEC_SYSCTL) || defined(CONFIG_GRKERNSEC_SYSCTL_ON)
62994 +#ifndef CONFIG_GRKERNSEC_SYSCTL
62995 + grsec_lock = 1;
62996 +#endif
62997 +
62998 +#ifdef CONFIG_GRKERNSEC_AUDIT_TEXTREL
62999 + grsec_enable_audit_textrel = 1;
63000 +#endif
63001 +#ifdef CONFIG_GRKERNSEC_RWXMAP_LOG
63002 + grsec_enable_log_rwxmaps = 1;
63003 +#endif
63004 +#ifdef CONFIG_GRKERNSEC_AUDIT_GROUP
63005 + grsec_enable_group = 1;
63006 + grsec_audit_gid = CONFIG_GRKERNSEC_AUDIT_GID;
63007 +#endif
63008 +#ifdef CONFIG_GRKERNSEC_AUDIT_CHDIR
63009 + grsec_enable_chdir = 1;
63010 +#endif
63011 +#ifdef CONFIG_GRKERNSEC_HARDEN_PTRACE
63012 + grsec_enable_harden_ptrace = 1;
63013 +#endif
63014 +#ifdef CONFIG_GRKERNSEC_AUDIT_MOUNT
63015 + grsec_enable_mount = 1;
63016 +#endif
63017 +#ifdef CONFIG_GRKERNSEC_LINK
63018 + grsec_enable_link = 1;
63019 +#endif
63020 +#ifdef CONFIG_GRKERNSEC_BRUTE
63021 + grsec_enable_brute = 1;
63022 +#endif
63023 +#ifdef CONFIG_GRKERNSEC_DMESG
63024 + grsec_enable_dmesg = 1;
63025 +#endif
63026 +#ifdef CONFIG_GRKERNSEC_BLACKHOLE
63027 + grsec_enable_blackhole = 1;
63028 + grsec_lastack_retries = 4;
63029 +#endif
63030 +#ifdef CONFIG_GRKERNSEC_FIFO
63031 + grsec_enable_fifo = 1;
63032 +#endif
63033 +#ifdef CONFIG_GRKERNSEC_EXECLOG
63034 + grsec_enable_execlog = 1;
63035 +#endif
63036 +#ifdef CONFIG_GRKERNSEC_SIGNAL
63037 + grsec_enable_signal = 1;
63038 +#endif
63039 +#ifdef CONFIG_GRKERNSEC_FORKFAIL
63040 + grsec_enable_forkfail = 1;
63041 +#endif
63042 +#ifdef CONFIG_GRKERNSEC_TIME
63043 + grsec_enable_time = 1;
63044 +#endif
63045 +#ifdef CONFIG_GRKERNSEC_RESLOG
63046 + grsec_resource_logging = 1;
63047 +#endif
63048 +#ifdef CONFIG_GRKERNSEC_CHROOT_FINDTASK
63049 + grsec_enable_chroot_findtask = 1;
63050 +#endif
63051 +#ifdef CONFIG_GRKERNSEC_CHROOT_UNIX
63052 + grsec_enable_chroot_unix = 1;
63053 +#endif
63054 +#ifdef CONFIG_GRKERNSEC_CHROOT_MOUNT
63055 + grsec_enable_chroot_mount = 1;
63056 +#endif
63057 +#ifdef CONFIG_GRKERNSEC_CHROOT_FCHDIR
63058 + grsec_enable_chroot_fchdir = 1;
63059 +#endif
63060 +#ifdef CONFIG_GRKERNSEC_CHROOT_SHMAT
63061 + grsec_enable_chroot_shmat = 1;
63062 +#endif
63063 +#ifdef CONFIG_GRKERNSEC_AUDIT_PTRACE
63064 + grsec_enable_audit_ptrace = 1;
63065 +#endif
63066 +#ifdef CONFIG_GRKERNSEC_CHROOT_DOUBLE
63067 + grsec_enable_chroot_double = 1;
63068 +#endif
63069 +#ifdef CONFIG_GRKERNSEC_CHROOT_PIVOT
63070 + grsec_enable_chroot_pivot = 1;
63071 +#endif
63072 +#ifdef CONFIG_GRKERNSEC_CHROOT_CHDIR
63073 + grsec_enable_chroot_chdir = 1;
63074 +#endif
63075 +#ifdef CONFIG_GRKERNSEC_CHROOT_CHMOD
63076 + grsec_enable_chroot_chmod = 1;
63077 +#endif
63078 +#ifdef CONFIG_GRKERNSEC_CHROOT_MKNOD
63079 + grsec_enable_chroot_mknod = 1;
63080 +#endif
63081 +#ifdef CONFIG_GRKERNSEC_CHROOT_NICE
63082 + grsec_enable_chroot_nice = 1;
63083 +#endif
63084 +#ifdef CONFIG_GRKERNSEC_CHROOT_EXECLOG
63085 + grsec_enable_chroot_execlog = 1;
63086 +#endif
63087 +#ifdef CONFIG_GRKERNSEC_CHROOT_CAPS
63088 + grsec_enable_chroot_caps = 1;
63089 +#endif
63090 +#ifdef CONFIG_GRKERNSEC_CHROOT_SYSCTL
63091 + grsec_enable_chroot_sysctl = 1;
63092 +#endif
63093 +#ifdef CONFIG_GRKERNSEC_TPE
63094 + grsec_enable_tpe = 1;
63095 + grsec_tpe_gid = CONFIG_GRKERNSEC_TPE_GID;
63096 +#ifdef CONFIG_GRKERNSEC_TPE_ALL
63097 + grsec_enable_tpe_all = 1;
63098 +#endif
63099 +#endif
63100 +#ifdef CONFIG_GRKERNSEC_SOCKET_ALL
63101 + grsec_enable_socket_all = 1;
63102 + grsec_socket_all_gid = CONFIG_GRKERNSEC_SOCKET_ALL_GID;
63103 +#endif
63104 +#ifdef CONFIG_GRKERNSEC_SOCKET_CLIENT
63105 + grsec_enable_socket_client = 1;
63106 + grsec_socket_client_gid = CONFIG_GRKERNSEC_SOCKET_CLIENT_GID;
63107 +#endif
63108 +#ifdef CONFIG_GRKERNSEC_SOCKET_SERVER
63109 + grsec_enable_socket_server = 1;
63110 + grsec_socket_server_gid = CONFIG_GRKERNSEC_SOCKET_SERVER_GID;
63111 +#endif
63112 +#endif
63113 +
63114 + return;
63115 +}
63116 diff --git a/grsecurity/grsec_link.c b/grsecurity/grsec_link.c
63117 new file mode 100644
63118 index 0000000..3efe141
63119 --- /dev/null
63120 +++ b/grsecurity/grsec_link.c
63121 @@ -0,0 +1,43 @@
63122 +#include <linux/kernel.h>
63123 +#include <linux/sched.h>
63124 +#include <linux/fs.h>
63125 +#include <linux/file.h>
63126 +#include <linux/grinternal.h>
63127 +
63128 +int
63129 +gr_handle_follow_link(const struct inode *parent,
63130 + const struct inode *inode,
63131 + const struct dentry *dentry, const struct vfsmount *mnt)
63132 +{
63133 +#ifdef CONFIG_GRKERNSEC_LINK
63134 + const struct cred *cred = current_cred();
63135 +
63136 + if (grsec_enable_link && S_ISLNK(inode->i_mode) &&
63137 + (parent->i_mode & S_ISVTX) && (parent->i_uid != inode->i_uid) &&
63138 + (parent->i_mode & S_IWOTH) && (cred->fsuid != inode->i_uid)) {
63139 + gr_log_fs_int2(GR_DONT_AUDIT, GR_SYMLINK_MSG, dentry, mnt, inode->i_uid, inode->i_gid);
63140 + return -EACCES;
63141 + }
63142 +#endif
63143 + return 0;
63144 +}
63145 +
63146 +int
63147 +gr_handle_hardlink(const struct dentry *dentry,
63148 + const struct vfsmount *mnt,
63149 + struct inode *inode, const int mode, const char *to)
63150 +{
63151 +#ifdef CONFIG_GRKERNSEC_LINK
63152 + const struct cred *cred = current_cred();
63153 +
63154 + if (grsec_enable_link && cred->fsuid != inode->i_uid &&
63155 + (!S_ISREG(mode) || (mode & S_ISUID) ||
63156 + ((mode & (S_ISGID | S_IXGRP)) == (S_ISGID | S_IXGRP)) ||
63157 + (inode_permission(inode, MAY_READ | MAY_WRITE))) &&
63158 + !capable(CAP_FOWNER) && cred->uid) {
63159 + gr_log_fs_int2_str(GR_DONT_AUDIT, GR_HARDLINK_MSG, dentry, mnt, inode->i_uid, inode->i_gid, to);
63160 + return -EPERM;
63161 + }
63162 +#endif
63163 + return 0;
63164 +}
63165 diff --git a/grsecurity/grsec_log.c b/grsecurity/grsec_log.c
63166 new file mode 100644
63167 index 0000000..a45d2e9
63168 --- /dev/null
63169 +++ b/grsecurity/grsec_log.c
63170 @@ -0,0 +1,322 @@
63171 +#include <linux/kernel.h>
63172 +#include <linux/sched.h>
63173 +#include <linux/file.h>
63174 +#include <linux/tty.h>
63175 +#include <linux/fs.h>
63176 +#include <linux/grinternal.h>
63177 +
63178 +#ifdef CONFIG_TREE_PREEMPT_RCU
63179 +#define DISABLE_PREEMPT() preempt_disable()
63180 +#define ENABLE_PREEMPT() preempt_enable()
63181 +#else
63182 +#define DISABLE_PREEMPT()
63183 +#define ENABLE_PREEMPT()
63184 +#endif
63185 +
63186 +#define BEGIN_LOCKS(x) \
63187 + DISABLE_PREEMPT(); \
63188 + rcu_read_lock(); \
63189 + read_lock(&tasklist_lock); \
63190 + read_lock(&grsec_exec_file_lock); \
63191 + if (x != GR_DO_AUDIT) \
63192 + spin_lock(&grsec_alert_lock); \
63193 + else \
63194 + spin_lock(&grsec_audit_lock)
63195 +
63196 +#define END_LOCKS(x) \
63197 + if (x != GR_DO_AUDIT) \
63198 + spin_unlock(&grsec_alert_lock); \
63199 + else \
63200 + spin_unlock(&grsec_audit_lock); \
63201 + read_unlock(&grsec_exec_file_lock); \
63202 + read_unlock(&tasklist_lock); \
63203 + rcu_read_unlock(); \
63204 + ENABLE_PREEMPT(); \
63205 + if (x == GR_DONT_AUDIT) \
63206 + gr_handle_alertkill(current)
63207 +
63208 +enum {
63209 + FLOODING,
63210 + NO_FLOODING
63211 +};
63212 +
63213 +extern char *gr_alert_log_fmt;
63214 +extern char *gr_audit_log_fmt;
63215 +extern char *gr_alert_log_buf;
63216 +extern char *gr_audit_log_buf;
63217 +
63218 +static int gr_log_start(int audit)
63219 +{
63220 + char *loglevel = (audit == GR_DO_AUDIT) ? KERN_INFO : KERN_ALERT;
63221 + char *fmt = (audit == GR_DO_AUDIT) ? gr_audit_log_fmt : gr_alert_log_fmt;
63222 + char *buf = (audit == GR_DO_AUDIT) ? gr_audit_log_buf : gr_alert_log_buf;
63223 +#if (CONFIG_GRKERNSEC_FLOODTIME > 0 && CONFIG_GRKERNSEC_FLOODBURST > 0)
63224 + unsigned long curr_secs = get_seconds();
63225 +
63226 + if (audit == GR_DO_AUDIT)
63227 + goto set_fmt;
63228 +
63229 + if (!grsec_alert_wtime || time_after(curr_secs, grsec_alert_wtime + CONFIG_GRKERNSEC_FLOODTIME)) {
63230 + grsec_alert_wtime = curr_secs;
63231 + grsec_alert_fyet = 0;
63232 + } else if (time_before_eq(curr_secs, grsec_alert_wtime + CONFIG_GRKERNSEC_FLOODTIME)
63233 + && (grsec_alert_fyet < CONFIG_GRKERNSEC_FLOODBURST)) {
63234 + grsec_alert_fyet++;
63235 + } else if (grsec_alert_fyet == CONFIG_GRKERNSEC_FLOODBURST) {
63236 + grsec_alert_wtime = curr_secs;
63237 + grsec_alert_fyet++;
63238 + printk(KERN_ALERT "grsec: more alerts, logging disabled for %d seconds\n", CONFIG_GRKERNSEC_FLOODTIME);
63239 + return FLOODING;
63240 + }
63241 + else return FLOODING;
63242 +
63243 +set_fmt:
63244 +#endif
63245 + memset(buf, 0, PAGE_SIZE);
63246 + if (current->signal->curr_ip && gr_acl_is_enabled()) {
63247 + sprintf(fmt, "%s%s", loglevel, "grsec: From %pI4: (%.64s:%c:%.950s) ");
63248 + snprintf(buf, PAGE_SIZE - 1, fmt, &current->signal->curr_ip, current->role->rolename, gr_roletype_to_char(), current->acl->filename);
63249 + } else if (current->signal->curr_ip) {
63250 + sprintf(fmt, "%s%s", loglevel, "grsec: From %pI4: ");
63251 + snprintf(buf, PAGE_SIZE - 1, fmt, &current->signal->curr_ip);
63252 + } else if (gr_acl_is_enabled()) {
63253 + sprintf(fmt, "%s%s", loglevel, "grsec: (%.64s:%c:%.950s) ");
63254 + snprintf(buf, PAGE_SIZE - 1, fmt, current->role->rolename, gr_roletype_to_char(), current->acl->filename);
63255 + } else {
63256 + sprintf(fmt, "%s%s", loglevel, "grsec: ");
63257 + strcpy(buf, fmt);
63258 + }
63259 +
63260 + return NO_FLOODING;
63261 +}
63262 +
63263 +static void gr_log_middle(int audit, const char *msg, va_list ap)
63264 + __attribute__ ((format (printf, 2, 0)));
63265 +
63266 +static void gr_log_middle(int audit, const char *msg, va_list ap)
63267 +{
63268 + char *buf = (audit == GR_DO_AUDIT) ? gr_audit_log_buf : gr_alert_log_buf;
63269 + unsigned int len = strlen(buf);
63270 +
63271 + vsnprintf(buf + len, PAGE_SIZE - len - 1, msg, ap);
63272 +
63273 + return;
63274 +}
63275 +
63276 +static void gr_log_middle_varargs(int audit, const char *msg, ...)
63277 + __attribute__ ((format (printf, 2, 3)));
63278 +
63279 +static void gr_log_middle_varargs(int audit, const char *msg, ...)
63280 +{
63281 + char *buf = (audit == GR_DO_AUDIT) ? gr_audit_log_buf : gr_alert_log_buf;
63282 + unsigned int len = strlen(buf);
63283 + va_list ap;
63284 +
63285 + va_start(ap, msg);
63286 + vsnprintf(buf + len, PAGE_SIZE - len - 1, msg, ap);
63287 + va_end(ap);
63288 +
63289 + return;
63290 +}
63291 +
63292 +static void gr_log_end(int audit, int append_default)
63293 +{
63294 + char *buf = (audit == GR_DO_AUDIT) ? gr_audit_log_buf : gr_alert_log_buf;
63295 +
63296 + if (append_default) {
63297 + unsigned int len = strlen(buf);
63298 + snprintf(buf + len, PAGE_SIZE - len - 1, DEFAULTSECMSG, DEFAULTSECARGS(current, current_cred(), __task_cred(current->real_parent)));
63299 + }
63300 +
63301 + printk("%s\n", buf);
63302 +
63303 + return;
63304 +}
63305 +
63306 +void gr_log_varargs(int audit, const char *msg, int argtypes, ...)
63307 +{
63308 + int logtype;
63309 + char *result = (audit == GR_DO_AUDIT) ? "successful" : "denied";
63310 + char *str1 = NULL, *str2 = NULL, *str3 = NULL;
63311 + void *voidptr = NULL;
63312 + int num1 = 0, num2 = 0;
63313 + unsigned long ulong1 = 0, ulong2 = 0;
63314 + struct dentry *dentry = NULL;
63315 + struct vfsmount *mnt = NULL;
63316 + struct file *file = NULL;
63317 + struct task_struct *task = NULL;
63318 + const struct cred *cred, *pcred;
63319 + va_list ap;
63320 +
63321 + BEGIN_LOCKS(audit);
63322 + logtype = gr_log_start(audit);
63323 + if (logtype == FLOODING) {
63324 + END_LOCKS(audit);
63325 + return;
63326 + }
63327 + va_start(ap, argtypes);
63328 + switch (argtypes) {
63329 + case GR_TTYSNIFF:
63330 + task = va_arg(ap, struct task_struct *);
63331 + 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);
63332 + break;
63333 + case GR_SYSCTL_HIDDEN:
63334 + str1 = va_arg(ap, char *);
63335 + gr_log_middle_varargs(audit, msg, result, str1);
63336 + break;
63337 + case GR_RBAC:
63338 + dentry = va_arg(ap, struct dentry *);
63339 + mnt = va_arg(ap, struct vfsmount *);
63340 + gr_log_middle_varargs(audit, msg, result, gr_to_filename(dentry, mnt));
63341 + break;
63342 + case GR_RBAC_STR:
63343 + dentry = va_arg(ap, struct dentry *);
63344 + mnt = va_arg(ap, struct vfsmount *);
63345 + str1 = va_arg(ap, char *);
63346 + gr_log_middle_varargs(audit, msg, result, gr_to_filename(dentry, mnt), str1);
63347 + break;
63348 + case GR_STR_RBAC:
63349 + str1 = va_arg(ap, char *);
63350 + dentry = va_arg(ap, struct dentry *);
63351 + mnt = va_arg(ap, struct vfsmount *);
63352 + gr_log_middle_varargs(audit, msg, result, str1, gr_to_filename(dentry, mnt));
63353 + break;
63354 + case GR_RBAC_MODE2:
63355 + dentry = va_arg(ap, struct dentry *);
63356 + mnt = va_arg(ap, struct vfsmount *);
63357 + str1 = va_arg(ap, char *);
63358 + str2 = va_arg(ap, char *);
63359 + gr_log_middle_varargs(audit, msg, result, gr_to_filename(dentry, mnt), str1, str2);
63360 + break;
63361 + case GR_RBAC_MODE3:
63362 + dentry = va_arg(ap, struct dentry *);
63363 + mnt = va_arg(ap, struct vfsmount *);
63364 + str1 = va_arg(ap, char *);
63365 + str2 = va_arg(ap, char *);
63366 + str3 = va_arg(ap, char *);
63367 + gr_log_middle_varargs(audit, msg, result, gr_to_filename(dentry, mnt), str1, str2, str3);
63368 + break;
63369 + case GR_FILENAME:
63370 + dentry = va_arg(ap, struct dentry *);
63371 + mnt = va_arg(ap, struct vfsmount *);
63372 + gr_log_middle_varargs(audit, msg, gr_to_filename(dentry, mnt));
63373 + break;
63374 + case GR_STR_FILENAME:
63375 + str1 = va_arg(ap, char *);
63376 + dentry = va_arg(ap, struct dentry *);
63377 + mnt = va_arg(ap, struct vfsmount *);
63378 + gr_log_middle_varargs(audit, msg, str1, gr_to_filename(dentry, mnt));
63379 + break;
63380 + case GR_FILENAME_STR:
63381 + dentry = va_arg(ap, struct dentry *);
63382 + mnt = va_arg(ap, struct vfsmount *);
63383 + str1 = va_arg(ap, char *);
63384 + gr_log_middle_varargs(audit, msg, gr_to_filename(dentry, mnt), str1);
63385 + break;
63386 + case GR_FILENAME_TWO_INT:
63387 + dentry = va_arg(ap, struct dentry *);
63388 + mnt = va_arg(ap, struct vfsmount *);
63389 + num1 = va_arg(ap, int);
63390 + num2 = va_arg(ap, int);
63391 + gr_log_middle_varargs(audit, msg, gr_to_filename(dentry, mnt), num1, num2);
63392 + break;
63393 + case GR_FILENAME_TWO_INT_STR:
63394 + dentry = va_arg(ap, struct dentry *);
63395 + mnt = va_arg(ap, struct vfsmount *);
63396 + num1 = va_arg(ap, int);
63397 + num2 = va_arg(ap, int);
63398 + str1 = va_arg(ap, char *);
63399 + gr_log_middle_varargs(audit, msg, gr_to_filename(dentry, mnt), num1, num2, str1);
63400 + break;
63401 + case GR_TEXTREL:
63402 + file = va_arg(ap, struct file *);
63403 + ulong1 = va_arg(ap, unsigned long);
63404 + ulong2 = va_arg(ap, unsigned long);
63405 + gr_log_middle_varargs(audit, msg, file ? gr_to_filename(file->f_path.dentry, file->f_path.mnt) : "<anonymous mapping>", ulong1, ulong2);
63406 + break;
63407 + case GR_PTRACE:
63408 + task = va_arg(ap, struct task_struct *);
63409 + 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);
63410 + break;
63411 + case GR_RESOURCE:
63412 + task = va_arg(ap, struct task_struct *);
63413 + cred = __task_cred(task);
63414 + pcred = __task_cred(task->real_parent);
63415 + ulong1 = va_arg(ap, unsigned long);
63416 + str1 = va_arg(ap, char *);
63417 + ulong2 = va_arg(ap, unsigned long);
63418 + 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);
63419 + break;
63420 + case GR_CAP:
63421 + task = va_arg(ap, struct task_struct *);
63422 + cred = __task_cred(task);
63423 + pcred = __task_cred(task->real_parent);
63424 + str1 = va_arg(ap, char *);
63425 + 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);
63426 + break;
63427 + case GR_SIG:
63428 + str1 = va_arg(ap, char *);
63429 + voidptr = va_arg(ap, void *);
63430 + gr_log_middle_varargs(audit, msg, str1, voidptr);
63431 + break;
63432 + case GR_SIG2:
63433 + task = va_arg(ap, struct task_struct *);
63434 + cred = __task_cred(task);
63435 + pcred = __task_cred(task->real_parent);
63436 + num1 = va_arg(ap, int);
63437 + 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);
63438 + break;
63439 + case GR_CRASH1:
63440 + task = va_arg(ap, struct task_struct *);
63441 + cred = __task_cred(task);
63442 + pcred = __task_cred(task->real_parent);
63443 + ulong1 = va_arg(ap, unsigned long);
63444 + 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);
63445 + break;
63446 + case GR_CRASH2:
63447 + task = va_arg(ap, struct task_struct *);
63448 + cred = __task_cred(task);
63449 + pcred = __task_cred(task->real_parent);
63450 + ulong1 = va_arg(ap, unsigned long);
63451 + 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);
63452 + break;
63453 + case GR_RWXMAP:
63454 + file = va_arg(ap, struct file *);
63455 + gr_log_middle_varargs(audit, msg, file ? gr_to_filename(file->f_path.dentry, file->f_path.mnt) : "<anonymous mapping>");
63456 + break;
63457 + case GR_PSACCT:
63458 + {
63459 + unsigned int wday, cday;
63460 + __u8 whr, chr;
63461 + __u8 wmin, cmin;
63462 + __u8 wsec, csec;
63463 + char cur_tty[64] = { 0 };
63464 + char parent_tty[64] = { 0 };
63465 +
63466 + task = va_arg(ap, struct task_struct *);
63467 + wday = va_arg(ap, unsigned int);
63468 + cday = va_arg(ap, unsigned int);
63469 + whr = va_arg(ap, int);
63470 + chr = va_arg(ap, int);
63471 + wmin = va_arg(ap, int);
63472 + cmin = va_arg(ap, int);
63473 + wsec = va_arg(ap, int);
63474 + csec = va_arg(ap, int);
63475 + ulong1 = va_arg(ap, unsigned long);
63476 + cred = __task_cred(task);
63477 + pcred = __task_cred(task->real_parent);
63478 +
63479 + 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);
63480 + }
63481 + break;
63482 + default:
63483 + gr_log_middle(audit, msg, ap);
63484 + }
63485 + va_end(ap);
63486 + // these don't need DEFAULTSECARGS printed on the end
63487 + if (argtypes == GR_CRASH1 || argtypes == GR_CRASH2)
63488 + gr_log_end(audit, 0);
63489 + else
63490 + gr_log_end(audit, 1);
63491 + END_LOCKS(audit);
63492 +}
63493 diff --git a/grsecurity/grsec_mem.c b/grsecurity/grsec_mem.c
63494 new file mode 100644
63495 index 0000000..6c0416b
63496 --- /dev/null
63497 +++ b/grsecurity/grsec_mem.c
63498 @@ -0,0 +1,33 @@
63499 +#include <linux/kernel.h>
63500 +#include <linux/sched.h>
63501 +#include <linux/mm.h>
63502 +#include <linux/mman.h>
63503 +#include <linux/grinternal.h>
63504 +
63505 +void
63506 +gr_handle_ioperm(void)
63507 +{
63508 + gr_log_noargs(GR_DONT_AUDIT, GR_IOPERM_MSG);
63509 + return;
63510 +}
63511 +
63512 +void
63513 +gr_handle_iopl(void)
63514 +{
63515 + gr_log_noargs(GR_DONT_AUDIT, GR_IOPL_MSG);
63516 + return;
63517 +}
63518 +
63519 +void
63520 +gr_handle_mem_readwrite(u64 from, u64 to)
63521 +{
63522 + gr_log_two_u64(GR_DONT_AUDIT, GR_MEM_READWRITE_MSG, from, to);
63523 + return;
63524 +}
63525 +
63526 +void
63527 +gr_handle_vm86(void)
63528 +{
63529 + gr_log_noargs(GR_DONT_AUDIT, GR_VM86_MSG);
63530 + return;
63531 +}
63532 diff --git a/grsecurity/grsec_mount.c b/grsecurity/grsec_mount.c
63533 new file mode 100644
63534 index 0000000..2131422
63535 --- /dev/null
63536 +++ b/grsecurity/grsec_mount.c
63537 @@ -0,0 +1,62 @@
63538 +#include <linux/kernel.h>
63539 +#include <linux/sched.h>
63540 +#include <linux/mount.h>
63541 +#include <linux/grsecurity.h>
63542 +#include <linux/grinternal.h>
63543 +
63544 +void
63545 +gr_log_remount(const char *devname, const int retval)
63546 +{
63547 +#ifdef CONFIG_GRKERNSEC_AUDIT_MOUNT
63548 + if (grsec_enable_mount && (retval >= 0))
63549 + gr_log_str(GR_DO_AUDIT, GR_REMOUNT_AUDIT_MSG, devname ? devname : "none");
63550 +#endif
63551 + return;
63552 +}
63553 +
63554 +void
63555 +gr_log_unmount(const char *devname, const int retval)
63556 +{
63557 +#ifdef CONFIG_GRKERNSEC_AUDIT_MOUNT
63558 + if (grsec_enable_mount && (retval >= 0))
63559 + gr_log_str(GR_DO_AUDIT, GR_UNMOUNT_AUDIT_MSG, devname ? devname : "none");
63560 +#endif
63561 + return;
63562 +}
63563 +
63564 +void
63565 +gr_log_mount(const char *from, const char *to, const int retval)
63566 +{
63567 +#ifdef CONFIG_GRKERNSEC_AUDIT_MOUNT
63568 + if (grsec_enable_mount && (retval >= 0))
63569 + gr_log_str_str(GR_DO_AUDIT, GR_MOUNT_AUDIT_MSG, from ? from : "none", to);
63570 +#endif
63571 + return;
63572 +}
63573 +
63574 +int
63575 +gr_handle_rofs_mount(struct dentry *dentry, struct vfsmount *mnt, int mnt_flags)
63576 +{
63577 +#ifdef CONFIG_GRKERNSEC_ROFS
63578 + if (grsec_enable_rofs && !(mnt_flags & MNT_READONLY)) {
63579 + gr_log_fs_generic(GR_DO_AUDIT, GR_ROFS_MOUNT_MSG, dentry, mnt);
63580 + return -EPERM;
63581 + } else
63582 + return 0;
63583 +#endif
63584 + return 0;
63585 +}
63586 +
63587 +int
63588 +gr_handle_rofs_blockwrite(struct dentry *dentry, struct vfsmount *mnt, int acc_mode)
63589 +{
63590 +#ifdef CONFIG_GRKERNSEC_ROFS
63591 + if (grsec_enable_rofs && (acc_mode & MAY_WRITE) &&
63592 + dentry->d_inode && S_ISBLK(dentry->d_inode->i_mode)) {
63593 + gr_log_fs_generic(GR_DO_AUDIT, GR_ROFS_BLOCKWRITE_MSG, dentry, mnt);
63594 + return -EPERM;
63595 + } else
63596 + return 0;
63597 +#endif
63598 + return 0;
63599 +}
63600 diff --git a/grsecurity/grsec_pax.c b/grsecurity/grsec_pax.c
63601 new file mode 100644
63602 index 0000000..a3b12a0
63603 --- /dev/null
63604 +++ b/grsecurity/grsec_pax.c
63605 @@ -0,0 +1,36 @@
63606 +#include <linux/kernel.h>
63607 +#include <linux/sched.h>
63608 +#include <linux/mm.h>
63609 +#include <linux/file.h>
63610 +#include <linux/grinternal.h>
63611 +#include <linux/grsecurity.h>
63612 +
63613 +void
63614 +gr_log_textrel(struct vm_area_struct * vma)
63615 +{
63616 +#ifdef CONFIG_GRKERNSEC_AUDIT_TEXTREL
63617 + if (grsec_enable_audit_textrel)
63618 + gr_log_textrel_ulong_ulong(GR_DO_AUDIT, GR_TEXTREL_AUDIT_MSG, vma->vm_file, vma->vm_start, vma->vm_pgoff);
63619 +#endif
63620 + return;
63621 +}
63622 +
63623 +void
63624 +gr_log_rwxmmap(struct file *file)
63625 +{
63626 +#ifdef CONFIG_GRKERNSEC_RWXMAP_LOG
63627 + if (grsec_enable_log_rwxmaps)
63628 + gr_log_rwxmap(GR_DONT_AUDIT, GR_RWXMMAP_MSG, file);
63629 +#endif
63630 + return;
63631 +}
63632 +
63633 +void
63634 +gr_log_rwxmprotect(struct file *file)
63635 +{
63636 +#ifdef CONFIG_GRKERNSEC_RWXMAP_LOG
63637 + if (grsec_enable_log_rwxmaps)
63638 + gr_log_rwxmap(GR_DONT_AUDIT, GR_RWXMPROTECT_MSG, file);
63639 +#endif
63640 + return;
63641 +}
63642 diff --git a/grsecurity/grsec_ptrace.c b/grsecurity/grsec_ptrace.c
63643 new file mode 100644
63644 index 0000000..472c1d6
63645 --- /dev/null
63646 +++ b/grsecurity/grsec_ptrace.c
63647 @@ -0,0 +1,14 @@
63648 +#include <linux/kernel.h>
63649 +#include <linux/sched.h>
63650 +#include <linux/grinternal.h>
63651 +#include <linux/grsecurity.h>
63652 +
63653 +void
63654 +gr_audit_ptrace(struct task_struct *task)
63655 +{
63656 +#ifdef CONFIG_GRKERNSEC_AUDIT_PTRACE
63657 + if (grsec_enable_audit_ptrace)
63658 + gr_log_ptrace(GR_DO_AUDIT, GR_PTRACE_AUDIT_MSG, task);
63659 +#endif
63660 + return;
63661 +}
63662 diff --git a/grsecurity/grsec_sig.c b/grsecurity/grsec_sig.c
63663 new file mode 100644
63664 index 0000000..c648492
63665 --- /dev/null
63666 +++ b/grsecurity/grsec_sig.c
63667 @@ -0,0 +1,206 @@
63668 +#include <linux/kernel.h>
63669 +#include <linux/sched.h>
63670 +#include <linux/delay.h>
63671 +#include <linux/grsecurity.h>
63672 +#include <linux/grinternal.h>
63673 +#include <linux/hardirq.h>
63674 +
63675 +char *signames[] = {
63676 + [SIGSEGV] = "Segmentation fault",
63677 + [SIGILL] = "Illegal instruction",
63678 + [SIGABRT] = "Abort",
63679 + [SIGBUS] = "Invalid alignment/Bus error"
63680 +};
63681 +
63682 +void
63683 +gr_log_signal(const int sig, const void *addr, const struct task_struct *t)
63684 +{
63685 +#ifdef CONFIG_GRKERNSEC_SIGNAL
63686 + if (grsec_enable_signal && ((sig == SIGSEGV) || (sig == SIGILL) ||
63687 + (sig == SIGABRT) || (sig == SIGBUS))) {
63688 + if (t->pid == current->pid) {
63689 + gr_log_sig_addr(GR_DONT_AUDIT_GOOD, GR_UNISIGLOG_MSG, signames[sig], addr);
63690 + } else {
63691 + gr_log_sig_task(GR_DONT_AUDIT_GOOD, GR_DUALSIGLOG_MSG, t, sig);
63692 + }
63693 + }
63694 +#endif
63695 + return;
63696 +}
63697 +
63698 +int
63699 +gr_handle_signal(const struct task_struct *p, const int sig)
63700 +{
63701 +#ifdef CONFIG_GRKERNSEC
63702 + /* ignore the 0 signal for protected task checks */
63703 + if (current->pid > 1 && sig && gr_check_protected_task(p)) {
63704 + gr_log_sig_task(GR_DONT_AUDIT, GR_SIG_ACL_MSG, p, sig);
63705 + return -EPERM;
63706 + } else if (gr_pid_is_chrooted((struct task_struct *)p)) {
63707 + return -EPERM;
63708 + }
63709 +#endif
63710 + return 0;
63711 +}
63712 +
63713 +#ifdef CONFIG_GRKERNSEC
63714 +extern int specific_send_sig_info(int sig, struct siginfo *info, struct task_struct *t);
63715 +
63716 +int gr_fake_force_sig(int sig, struct task_struct *t)
63717 +{
63718 + unsigned long int flags;
63719 + int ret, blocked, ignored;
63720 + struct k_sigaction *action;
63721 +
63722 + spin_lock_irqsave(&t->sighand->siglock, flags);
63723 + action = &t->sighand->action[sig-1];
63724 + ignored = action->sa.sa_handler == SIG_IGN;
63725 + blocked = sigismember(&t->blocked, sig);
63726 + if (blocked || ignored) {
63727 + action->sa.sa_handler = SIG_DFL;
63728 + if (blocked) {
63729 + sigdelset(&t->blocked, sig);
63730 + recalc_sigpending_and_wake(t);
63731 + }
63732 + }
63733 + if (action->sa.sa_handler == SIG_DFL)
63734 + t->signal->flags &= ~SIGNAL_UNKILLABLE;
63735 + ret = specific_send_sig_info(sig, SEND_SIG_PRIV, t);
63736 +
63737 + spin_unlock_irqrestore(&t->sighand->siglock, flags);
63738 +
63739 + return ret;
63740 +}
63741 +#endif
63742 +
63743 +#ifdef CONFIG_GRKERNSEC_BRUTE
63744 +#define GR_USER_BAN_TIME (15 * 60)
63745 +
63746 +static int __get_dumpable(unsigned long mm_flags)
63747 +{
63748 + int ret;
63749 +
63750 + ret = mm_flags & MMF_DUMPABLE_MASK;
63751 + return (ret >= 2) ? 2 : ret;
63752 +}
63753 +#endif
63754 +
63755 +void gr_handle_brute_attach(struct task_struct *p, unsigned long mm_flags)
63756 +{
63757 +#ifdef CONFIG_GRKERNSEC_BRUTE
63758 + uid_t uid = 0;
63759 +
63760 + if (!grsec_enable_brute)
63761 + return;
63762 +
63763 + rcu_read_lock();
63764 + read_lock(&tasklist_lock);
63765 + read_lock(&grsec_exec_file_lock);
63766 + if (p->real_parent && p->real_parent->exec_file == p->exec_file)
63767 + p->real_parent->brute = 1;
63768 + else {
63769 + const struct cred *cred = __task_cred(p), *cred2;
63770 + struct task_struct *tsk, *tsk2;
63771 +
63772 + if (!__get_dumpable(mm_flags) && cred->uid) {
63773 + struct user_struct *user;
63774 +
63775 + uid = cred->uid;
63776 +
63777 + /* this is put upon execution past expiration */
63778 + user = find_user(uid);
63779 + if (user == NULL)
63780 + goto unlock;
63781 + user->banned = 1;
63782 + user->ban_expires = get_seconds() + GR_USER_BAN_TIME;
63783 + if (user->ban_expires == ~0UL)
63784 + user->ban_expires--;
63785 +
63786 + do_each_thread(tsk2, tsk) {
63787 + cred2 = __task_cred(tsk);
63788 + if (tsk != p && cred2->uid == uid)
63789 + gr_fake_force_sig(SIGKILL, tsk);
63790 + } while_each_thread(tsk2, tsk);
63791 + }
63792 + }
63793 +unlock:
63794 + read_unlock(&grsec_exec_file_lock);
63795 + read_unlock(&tasklist_lock);
63796 + rcu_read_unlock();
63797 +
63798 + if (uid)
63799 + printk(KERN_ALERT "grsec: bruteforce prevention initiated against uid %u, banning for %d minutes\n", uid, GR_USER_BAN_TIME / 60);
63800 +#endif
63801 + return;
63802 +}
63803 +
63804 +void gr_handle_brute_check(void)
63805 +{
63806 +#ifdef CONFIG_GRKERNSEC_BRUTE
63807 + if (current->brute)
63808 + msleep(30 * 1000);
63809 +#endif
63810 + return;
63811 +}
63812 +
63813 +void gr_handle_kernel_exploit(void)
63814 +{
63815 +#ifdef CONFIG_GRKERNSEC_KERN_LOCKOUT
63816 + const struct cred *cred;
63817 + struct task_struct *tsk, *tsk2;
63818 + struct user_struct *user;
63819 + uid_t uid;
63820 +
63821 + if (in_irq() || in_serving_softirq() || in_nmi())
63822 + panic("grsec: halting the system due to suspicious kernel crash caused in interrupt context");
63823 +
63824 + uid = current_uid();
63825 +
63826 + if (uid == 0)
63827 + panic("grsec: halting the system due to suspicious kernel crash caused by root");
63828 + else {
63829 + /* kill all the processes of this user, hold a reference
63830 + to their creds struct, and prevent them from creating
63831 + another process until system reset
63832 + */
63833 + printk(KERN_ALERT "grsec: banning user with uid %u until system restart for suspicious kernel crash\n", uid);
63834 + /* we intentionally leak this ref */
63835 + user = get_uid(current->cred->user);
63836 + if (user) {
63837 + user->banned = 1;
63838 + user->ban_expires = ~0UL;
63839 + }
63840 +
63841 + read_lock(&tasklist_lock);
63842 + do_each_thread(tsk2, tsk) {
63843 + cred = __task_cred(tsk);
63844 + if (cred->uid == uid)
63845 + gr_fake_force_sig(SIGKILL, tsk);
63846 + } while_each_thread(tsk2, tsk);
63847 + read_unlock(&tasklist_lock);
63848 + }
63849 +#endif
63850 +}
63851 +
63852 +int __gr_process_user_ban(struct user_struct *user)
63853 +{
63854 +#if defined(CONFIG_GRKERNSEC_KERN_LOCKOUT) || defined(CONFIG_GRKERNSEC_BRUTE)
63855 + if (unlikely(user->banned)) {
63856 + if (user->ban_expires != ~0UL && time_after_eq(get_seconds(), user->ban_expires)) {
63857 + user->banned = 0;
63858 + user->ban_expires = 0;
63859 + free_uid(user);
63860 + } else
63861 + return -EPERM;
63862 + }
63863 +#endif
63864 + return 0;
63865 +}
63866 +
63867 +int gr_process_user_ban(void)
63868 +{
63869 +#if defined(CONFIG_GRKERNSEC_KERN_LOCKOUT) || defined(CONFIG_GRKERNSEC_BRUTE)
63870 + return __gr_process_user_ban(current->cred->user);
63871 +#endif
63872 + return 0;
63873 +}
63874 diff --git a/grsecurity/grsec_sock.c b/grsecurity/grsec_sock.c
63875 new file mode 100644
63876 index 0000000..7512ea9
63877 --- /dev/null
63878 +++ b/grsecurity/grsec_sock.c
63879 @@ -0,0 +1,275 @@
63880 +#include <linux/kernel.h>
63881 +#include <linux/module.h>
63882 +#include <linux/sched.h>
63883 +#include <linux/file.h>
63884 +#include <linux/net.h>
63885 +#include <linux/in.h>
63886 +#include <linux/ip.h>
63887 +#include <net/sock.h>
63888 +#include <net/inet_sock.h>
63889 +#include <linux/grsecurity.h>
63890 +#include <linux/grinternal.h>
63891 +#include <linux/gracl.h>
63892 +
63893 +kernel_cap_t gr_cap_rtnetlink(struct sock *sock);
63894 +EXPORT_SYMBOL(gr_cap_rtnetlink);
63895 +
63896 +extern int gr_search_udp_recvmsg(const struct sock *sk, const struct sk_buff *skb);
63897 +extern int gr_search_udp_sendmsg(const struct sock *sk, const struct sockaddr_in *addr);
63898 +
63899 +EXPORT_SYMBOL(gr_search_udp_recvmsg);
63900 +EXPORT_SYMBOL(gr_search_udp_sendmsg);
63901 +
63902 +#ifdef CONFIG_UNIX_MODULE
63903 +EXPORT_SYMBOL(gr_acl_handle_unix);
63904 +EXPORT_SYMBOL(gr_acl_handle_mknod);
63905 +EXPORT_SYMBOL(gr_handle_chroot_unix);
63906 +EXPORT_SYMBOL(gr_handle_create);
63907 +#endif
63908 +
63909 +#ifdef CONFIG_GRKERNSEC
63910 +#define gr_conn_table_size 32749
63911 +struct conn_table_entry {
63912 + struct conn_table_entry *next;
63913 + struct signal_struct *sig;
63914 +};
63915 +
63916 +struct conn_table_entry *gr_conn_table[gr_conn_table_size];
63917 +DEFINE_SPINLOCK(gr_conn_table_lock);
63918 +
63919 +extern const char * gr_socktype_to_name(unsigned char type);
63920 +extern const char * gr_proto_to_name(unsigned char proto);
63921 +extern const char * gr_sockfamily_to_name(unsigned char family);
63922 +
63923 +static __inline__ int
63924 +conn_hash(__u32 saddr, __u32 daddr, __u16 sport, __u16 dport, unsigned int size)
63925 +{
63926 + return ((daddr + saddr + (sport << 8) + (dport << 16)) % size);
63927 +}
63928 +
63929 +static __inline__ int
63930 +conn_match(const struct signal_struct *sig, __u32 saddr, __u32 daddr,
63931 + __u16 sport, __u16 dport)
63932 +{
63933 + if (unlikely(sig->gr_saddr == saddr && sig->gr_daddr == daddr &&
63934 + sig->gr_sport == sport && sig->gr_dport == dport))
63935 + return 1;
63936 + else
63937 + return 0;
63938 +}
63939 +
63940 +static void gr_add_to_task_ip_table_nolock(struct signal_struct *sig, struct conn_table_entry *newent)
63941 +{
63942 + struct conn_table_entry **match;
63943 + unsigned int index;
63944 +
63945 + index = conn_hash(sig->gr_saddr, sig->gr_daddr,
63946 + sig->gr_sport, sig->gr_dport,
63947 + gr_conn_table_size);
63948 +
63949 + newent->sig = sig;
63950 +
63951 + match = &gr_conn_table[index];
63952 + newent->next = *match;
63953 + *match = newent;
63954 +
63955 + return;
63956 +}
63957 +
63958 +static void gr_del_task_from_ip_table_nolock(struct signal_struct *sig)
63959 +{
63960 + struct conn_table_entry *match, *last = NULL;
63961 + unsigned int index;
63962 +
63963 + index = conn_hash(sig->gr_saddr, sig->gr_daddr,
63964 + sig->gr_sport, sig->gr_dport,
63965 + gr_conn_table_size);
63966 +
63967 + match = gr_conn_table[index];
63968 + while (match && !conn_match(match->sig,
63969 + sig->gr_saddr, sig->gr_daddr, sig->gr_sport,
63970 + sig->gr_dport)) {
63971 + last = match;
63972 + match = match->next;
63973 + }
63974 +
63975 + if (match) {
63976 + if (last)
63977 + last->next = match->next;
63978 + else
63979 + gr_conn_table[index] = NULL;
63980 + kfree(match);
63981 + }
63982 +
63983 + return;
63984 +}
63985 +
63986 +static struct signal_struct * gr_lookup_task_ip_table(__u32 saddr, __u32 daddr,
63987 + __u16 sport, __u16 dport)
63988 +{
63989 + struct conn_table_entry *match;
63990 + unsigned int index;
63991 +
63992 + index = conn_hash(saddr, daddr, sport, dport, gr_conn_table_size);
63993 +
63994 + match = gr_conn_table[index];
63995 + while (match && !conn_match(match->sig, saddr, daddr, sport, dport))
63996 + match = match->next;
63997 +
63998 + if (match)
63999 + return match->sig;
64000 + else
64001 + return NULL;
64002 +}
64003 +
64004 +#endif
64005 +
64006 +void gr_update_task_in_ip_table(struct task_struct *task, const struct inet_sock *inet)
64007 +{
64008 +#ifdef CONFIG_GRKERNSEC
64009 + struct signal_struct *sig = task->signal;
64010 + struct conn_table_entry *newent;
64011 +
64012 + newent = kmalloc(sizeof(struct conn_table_entry), GFP_ATOMIC);
64013 + if (newent == NULL)
64014 + return;
64015 + /* no bh lock needed since we are called with bh disabled */
64016 + spin_lock(&gr_conn_table_lock);
64017 + gr_del_task_from_ip_table_nolock(sig);
64018 + sig->gr_saddr = inet->rcv_saddr;
64019 + sig->gr_daddr = inet->daddr;
64020 + sig->gr_sport = inet->sport;
64021 + sig->gr_dport = inet->dport;
64022 + gr_add_to_task_ip_table_nolock(sig, newent);
64023 + spin_unlock(&gr_conn_table_lock);
64024 +#endif
64025 + return;
64026 +}
64027 +
64028 +void gr_del_task_from_ip_table(struct task_struct *task)
64029 +{
64030 +#ifdef CONFIG_GRKERNSEC
64031 + spin_lock_bh(&gr_conn_table_lock);
64032 + gr_del_task_from_ip_table_nolock(task->signal);
64033 + spin_unlock_bh(&gr_conn_table_lock);
64034 +#endif
64035 + return;
64036 +}
64037 +
64038 +void
64039 +gr_attach_curr_ip(const struct sock *sk)
64040 +{
64041 +#ifdef CONFIG_GRKERNSEC
64042 + struct signal_struct *p, *set;
64043 + const struct inet_sock *inet = inet_sk(sk);
64044 +
64045 + if (unlikely(sk->sk_protocol != IPPROTO_TCP))
64046 + return;
64047 +
64048 + set = current->signal;
64049 +
64050 + spin_lock_bh(&gr_conn_table_lock);
64051 + p = gr_lookup_task_ip_table(inet->daddr, inet->rcv_saddr,
64052 + inet->dport, inet->sport);
64053 + if (unlikely(p != NULL)) {
64054 + set->curr_ip = p->curr_ip;
64055 + set->used_accept = 1;
64056 + gr_del_task_from_ip_table_nolock(p);
64057 + spin_unlock_bh(&gr_conn_table_lock);
64058 + return;
64059 + }
64060 + spin_unlock_bh(&gr_conn_table_lock);
64061 +
64062 + set->curr_ip = inet->daddr;
64063 + set->used_accept = 1;
64064 +#endif
64065 + return;
64066 +}
64067 +
64068 +int
64069 +gr_handle_sock_all(const int family, const int type, const int protocol)
64070 +{
64071 +#ifdef CONFIG_GRKERNSEC_SOCKET_ALL
64072 + if (grsec_enable_socket_all && in_group_p(grsec_socket_all_gid) &&
64073 + (family != AF_UNIX)) {
64074 + if (family == AF_INET)
64075 + gr_log_str3(GR_DONT_AUDIT, GR_SOCK_MSG, gr_sockfamily_to_name(family), gr_socktype_to_name(type), gr_proto_to_name(protocol));
64076 + else
64077 + gr_log_str2_int(GR_DONT_AUDIT, GR_SOCK_NOINET_MSG, gr_sockfamily_to_name(family), gr_socktype_to_name(type), protocol);
64078 + return -EACCES;
64079 + }
64080 +#endif
64081 + return 0;
64082 +}
64083 +
64084 +int
64085 +gr_handle_sock_server(const struct sockaddr *sck)
64086 +{
64087 +#ifdef CONFIG_GRKERNSEC_SOCKET_SERVER
64088 + if (grsec_enable_socket_server &&
64089 + in_group_p(grsec_socket_server_gid) &&
64090 + sck && (sck->sa_family != AF_UNIX) &&
64091 + (sck->sa_family != AF_LOCAL)) {
64092 + gr_log_noargs(GR_DONT_AUDIT, GR_BIND_MSG);
64093 + return -EACCES;
64094 + }
64095 +#endif
64096 + return 0;
64097 +}
64098 +
64099 +int
64100 +gr_handle_sock_server_other(const struct sock *sck)
64101 +{
64102 +#ifdef CONFIG_GRKERNSEC_SOCKET_SERVER
64103 + if (grsec_enable_socket_server &&
64104 + in_group_p(grsec_socket_server_gid) &&
64105 + sck && (sck->sk_family != AF_UNIX) &&
64106 + (sck->sk_family != AF_LOCAL)) {
64107 + gr_log_noargs(GR_DONT_AUDIT, GR_BIND_MSG);
64108 + return -EACCES;
64109 + }
64110 +#endif
64111 + return 0;
64112 +}
64113 +
64114 +int
64115 +gr_handle_sock_client(const struct sockaddr *sck)
64116 +{
64117 +#ifdef CONFIG_GRKERNSEC_SOCKET_CLIENT
64118 + if (grsec_enable_socket_client && in_group_p(grsec_socket_client_gid) &&
64119 + sck && (sck->sa_family != AF_UNIX) &&
64120 + (sck->sa_family != AF_LOCAL)) {
64121 + gr_log_noargs(GR_DONT_AUDIT, GR_CONNECT_MSG);
64122 + return -EACCES;
64123 + }
64124 +#endif
64125 + return 0;
64126 +}
64127 +
64128 +kernel_cap_t
64129 +gr_cap_rtnetlink(struct sock *sock)
64130 +{
64131 +#ifdef CONFIG_GRKERNSEC
64132 + if (!gr_acl_is_enabled())
64133 + return current_cap();
64134 + else if (sock->sk_protocol == NETLINK_ISCSI &&
64135 + cap_raised(current_cap(), CAP_SYS_ADMIN) &&
64136 + gr_is_capable(CAP_SYS_ADMIN))
64137 + return current_cap();
64138 + else if (sock->sk_protocol == NETLINK_AUDIT &&
64139 + cap_raised(current_cap(), CAP_AUDIT_WRITE) &&
64140 + gr_is_capable(CAP_AUDIT_WRITE) &&
64141 + cap_raised(current_cap(), CAP_AUDIT_CONTROL) &&
64142 + gr_is_capable(CAP_AUDIT_CONTROL))
64143 + return current_cap();
64144 + else if (cap_raised(current_cap(), CAP_NET_ADMIN) &&
64145 + ((sock->sk_protocol == NETLINK_ROUTE) ?
64146 + gr_is_capable_nolog(CAP_NET_ADMIN) :
64147 + gr_is_capable(CAP_NET_ADMIN)))
64148 + return current_cap();
64149 + else
64150 + return __cap_empty_set;
64151 +#else
64152 + return current_cap();
64153 +#endif
64154 +}
64155 diff --git a/grsecurity/grsec_sysctl.c b/grsecurity/grsec_sysctl.c
64156 new file mode 100644
64157 index 0000000..2753505
64158 --- /dev/null
64159 +++ b/grsecurity/grsec_sysctl.c
64160 @@ -0,0 +1,479 @@
64161 +#include <linux/kernel.h>
64162 +#include <linux/sched.h>
64163 +#include <linux/sysctl.h>
64164 +#include <linux/grsecurity.h>
64165 +#include <linux/grinternal.h>
64166 +
64167 +int
64168 +gr_handle_sysctl_mod(const char *dirname, const char *name, const int op)
64169 +{
64170 +#ifdef CONFIG_GRKERNSEC_SYSCTL
64171 + if (!strcmp(dirname, "grsecurity") && grsec_lock && (op & MAY_WRITE)) {
64172 + gr_log_str(GR_DONT_AUDIT, GR_SYSCTL_MSG, name);
64173 + return -EACCES;
64174 + }
64175 +#endif
64176 + return 0;
64177 +}
64178 +
64179 +#ifdef CONFIG_GRKERNSEC_ROFS
64180 +static int __maybe_unused one = 1;
64181 +#endif
64182 +
64183 +#if defined(CONFIG_GRKERNSEC_SYSCTL) || defined(CONFIG_GRKERNSEC_ROFS)
64184 +ctl_table grsecurity_table[] = {
64185 +#ifdef CONFIG_GRKERNSEC_SYSCTL
64186 +#ifdef CONFIG_GRKERNSEC_SYSCTL_DISTRO
64187 +#ifdef CONFIG_GRKERNSEC_IO
64188 + {
64189 + .ctl_name = CTL_UNNUMBERED,
64190 + .procname = "disable_priv_io",
64191 + .data = &grsec_disable_privio,
64192 + .maxlen = sizeof(int),
64193 + .mode = 0600,
64194 + .proc_handler = &proc_dointvec,
64195 + },
64196 +#endif
64197 +#endif
64198 +#ifdef CONFIG_GRKERNSEC_LINK
64199 + {
64200 + .ctl_name = CTL_UNNUMBERED,
64201 + .procname = "linking_restrictions",
64202 + .data = &grsec_enable_link,
64203 + .maxlen = sizeof(int),
64204 + .mode = 0600,
64205 + .proc_handler = &proc_dointvec,
64206 + },
64207 +#endif
64208 +#ifdef CONFIG_GRKERNSEC_BRUTE
64209 + {
64210 + .ctl_name = CTL_UNNUMBERED,
64211 + .procname = "deter_bruteforce",
64212 + .data = &grsec_enable_brute,
64213 + .maxlen = sizeof(int),
64214 + .mode = 0600,
64215 + .proc_handler = &proc_dointvec,
64216 + },
64217 +#endif
64218 +#ifdef CONFIG_GRKERNSEC_FIFO
64219 + {
64220 + .ctl_name = CTL_UNNUMBERED,
64221 + .procname = "fifo_restrictions",
64222 + .data = &grsec_enable_fifo,
64223 + .maxlen = sizeof(int),
64224 + .mode = 0600,
64225 + .proc_handler = &proc_dointvec,
64226 + },
64227 +#endif
64228 +#ifdef CONFIG_GRKERNSEC_BLACKHOLE
64229 + {
64230 + .ctl_name = CTL_UNNUMBERED,
64231 + .procname = "ip_blackhole",
64232 + .data = &grsec_enable_blackhole,
64233 + .maxlen = sizeof(int),
64234 + .mode = 0600,
64235 + .proc_handler = &proc_dointvec,
64236 + },
64237 + {
64238 + .ctl_name = CTL_UNNUMBERED,
64239 + .procname = "lastack_retries",
64240 + .data = &grsec_lastack_retries,
64241 + .maxlen = sizeof(int),
64242 + .mode = 0600,
64243 + .proc_handler = &proc_dointvec,
64244 + },
64245 +#endif
64246 +#ifdef CONFIG_GRKERNSEC_EXECLOG
64247 + {
64248 + .ctl_name = CTL_UNNUMBERED,
64249 + .procname = "exec_logging",
64250 + .data = &grsec_enable_execlog,
64251 + .maxlen = sizeof(int),
64252 + .mode = 0600,
64253 + .proc_handler = &proc_dointvec,
64254 + },
64255 +#endif
64256 +#ifdef CONFIG_GRKERNSEC_RWXMAP_LOG
64257 + {
64258 + .ctl_name = CTL_UNNUMBERED,
64259 + .procname = "rwxmap_logging",
64260 + .data = &grsec_enable_log_rwxmaps,
64261 + .maxlen = sizeof(int),
64262 + .mode = 0600,
64263 + .proc_handler = &proc_dointvec,
64264 + },
64265 +#endif
64266 +#ifdef CONFIG_GRKERNSEC_SIGNAL
64267 + {
64268 + .ctl_name = CTL_UNNUMBERED,
64269 + .procname = "signal_logging",
64270 + .data = &grsec_enable_signal,
64271 + .maxlen = sizeof(int),
64272 + .mode = 0600,
64273 + .proc_handler = &proc_dointvec,
64274 + },
64275 +#endif
64276 +#ifdef CONFIG_GRKERNSEC_FORKFAIL
64277 + {
64278 + .ctl_name = CTL_UNNUMBERED,
64279 + .procname = "forkfail_logging",
64280 + .data = &grsec_enable_forkfail,
64281 + .maxlen = sizeof(int),
64282 + .mode = 0600,
64283 + .proc_handler = &proc_dointvec,
64284 + },
64285 +#endif
64286 +#ifdef CONFIG_GRKERNSEC_TIME
64287 + {
64288 + .ctl_name = CTL_UNNUMBERED,
64289 + .procname = "timechange_logging",
64290 + .data = &grsec_enable_time,
64291 + .maxlen = sizeof(int),
64292 + .mode = 0600,
64293 + .proc_handler = &proc_dointvec,
64294 + },
64295 +#endif
64296 +#ifdef CONFIG_GRKERNSEC_CHROOT_SHMAT
64297 + {
64298 + .ctl_name = CTL_UNNUMBERED,
64299 + .procname = "chroot_deny_shmat",
64300 + .data = &grsec_enable_chroot_shmat,
64301 + .maxlen = sizeof(int),
64302 + .mode = 0600,
64303 + .proc_handler = &proc_dointvec,
64304 + },
64305 +#endif
64306 +#ifdef CONFIG_GRKERNSEC_CHROOT_UNIX
64307 + {
64308 + .ctl_name = CTL_UNNUMBERED,
64309 + .procname = "chroot_deny_unix",
64310 + .data = &grsec_enable_chroot_unix,
64311 + .maxlen = sizeof(int),
64312 + .mode = 0600,
64313 + .proc_handler = &proc_dointvec,
64314 + },
64315 +#endif
64316 +#ifdef CONFIG_GRKERNSEC_CHROOT_MOUNT
64317 + {
64318 + .ctl_name = CTL_UNNUMBERED,
64319 + .procname = "chroot_deny_mount",
64320 + .data = &grsec_enable_chroot_mount,
64321 + .maxlen = sizeof(int),
64322 + .mode = 0600,
64323 + .proc_handler = &proc_dointvec,
64324 + },
64325 +#endif
64326 +#ifdef CONFIG_GRKERNSEC_CHROOT_FCHDIR
64327 + {
64328 + .ctl_name = CTL_UNNUMBERED,
64329 + .procname = "chroot_deny_fchdir",
64330 + .data = &grsec_enable_chroot_fchdir,
64331 + .maxlen = sizeof(int),
64332 + .mode = 0600,
64333 + .proc_handler = &proc_dointvec,
64334 + },
64335 +#endif
64336 +#ifdef CONFIG_GRKERNSEC_CHROOT_DOUBLE
64337 + {
64338 + .ctl_name = CTL_UNNUMBERED,
64339 + .procname = "chroot_deny_chroot",
64340 + .data = &grsec_enable_chroot_double,
64341 + .maxlen = sizeof(int),
64342 + .mode = 0600,
64343 + .proc_handler = &proc_dointvec,
64344 + },
64345 +#endif
64346 +#ifdef CONFIG_GRKERNSEC_CHROOT_PIVOT
64347 + {
64348 + .ctl_name = CTL_UNNUMBERED,
64349 + .procname = "chroot_deny_pivot",
64350 + .data = &grsec_enable_chroot_pivot,
64351 + .maxlen = sizeof(int),
64352 + .mode = 0600,
64353 + .proc_handler = &proc_dointvec,
64354 + },
64355 +#endif
64356 +#ifdef CONFIG_GRKERNSEC_CHROOT_CHDIR
64357 + {
64358 + .ctl_name = CTL_UNNUMBERED,
64359 + .procname = "chroot_enforce_chdir",
64360 + .data = &grsec_enable_chroot_chdir,
64361 + .maxlen = sizeof(int),
64362 + .mode = 0600,
64363 + .proc_handler = &proc_dointvec,
64364 + },
64365 +#endif
64366 +#ifdef CONFIG_GRKERNSEC_CHROOT_CHMOD
64367 + {
64368 + .ctl_name = CTL_UNNUMBERED,
64369 + .procname = "chroot_deny_chmod",
64370 + .data = &grsec_enable_chroot_chmod,
64371 + .maxlen = sizeof(int),
64372 + .mode = 0600,
64373 + .proc_handler = &proc_dointvec,
64374 + },
64375 +#endif
64376 +#ifdef CONFIG_GRKERNSEC_CHROOT_MKNOD
64377 + {
64378 + .ctl_name = CTL_UNNUMBERED,
64379 + .procname = "chroot_deny_mknod",
64380 + .data = &grsec_enable_chroot_mknod,
64381 + .maxlen = sizeof(int),
64382 + .mode = 0600,
64383 + .proc_handler = &proc_dointvec,
64384 + },
64385 +#endif
64386 +#ifdef CONFIG_GRKERNSEC_CHROOT_NICE
64387 + {
64388 + .ctl_name = CTL_UNNUMBERED,
64389 + .procname = "chroot_restrict_nice",
64390 + .data = &grsec_enable_chroot_nice,
64391 + .maxlen = sizeof(int),
64392 + .mode = 0600,
64393 + .proc_handler = &proc_dointvec,
64394 + },
64395 +#endif
64396 +#ifdef CONFIG_GRKERNSEC_CHROOT_EXECLOG
64397 + {
64398 + .ctl_name = CTL_UNNUMBERED,
64399 + .procname = "chroot_execlog",
64400 + .data = &grsec_enable_chroot_execlog,
64401 + .maxlen = sizeof(int),
64402 + .mode = 0600,
64403 + .proc_handler = &proc_dointvec,
64404 + },
64405 +#endif
64406 +#ifdef CONFIG_GRKERNSEC_CHROOT_CAPS
64407 + {
64408 + .ctl_name = CTL_UNNUMBERED,
64409 + .procname = "chroot_caps",
64410 + .data = &grsec_enable_chroot_caps,
64411 + .maxlen = sizeof(int),
64412 + .mode = 0600,
64413 + .proc_handler = &proc_dointvec,
64414 + },
64415 +#endif
64416 +#ifdef CONFIG_GRKERNSEC_CHROOT_SYSCTL
64417 + {
64418 + .ctl_name = CTL_UNNUMBERED,
64419 + .procname = "chroot_deny_sysctl",
64420 + .data = &grsec_enable_chroot_sysctl,
64421 + .maxlen = sizeof(int),
64422 + .mode = 0600,
64423 + .proc_handler = &proc_dointvec,
64424 + },
64425 +#endif
64426 +#ifdef CONFIG_GRKERNSEC_TPE
64427 + {
64428 + .ctl_name = CTL_UNNUMBERED,
64429 + .procname = "tpe",
64430 + .data = &grsec_enable_tpe,
64431 + .maxlen = sizeof(int),
64432 + .mode = 0600,
64433 + .proc_handler = &proc_dointvec,
64434 + },
64435 + {
64436 + .ctl_name = CTL_UNNUMBERED,
64437 + .procname = "tpe_gid",
64438 + .data = &grsec_tpe_gid,
64439 + .maxlen = sizeof(int),
64440 + .mode = 0600,
64441 + .proc_handler = &proc_dointvec,
64442 + },
64443 +#endif
64444 +#ifdef CONFIG_GRKERNSEC_TPE_INVERT
64445 + {
64446 + .ctl_name = CTL_UNNUMBERED,
64447 + .procname = "tpe_invert",
64448 + .data = &grsec_enable_tpe_invert,
64449 + .maxlen = sizeof(int),
64450 + .mode = 0600,
64451 + .proc_handler = &proc_dointvec,
64452 + },
64453 +#endif
64454 +#ifdef CONFIG_GRKERNSEC_TPE_ALL
64455 + {
64456 + .ctl_name = CTL_UNNUMBERED,
64457 + .procname = "tpe_restrict_all",
64458 + .data = &grsec_enable_tpe_all,
64459 + .maxlen = sizeof(int),
64460 + .mode = 0600,
64461 + .proc_handler = &proc_dointvec,
64462 + },
64463 +#endif
64464 +#ifdef CONFIG_GRKERNSEC_SOCKET_ALL
64465 + {
64466 + .ctl_name = CTL_UNNUMBERED,
64467 + .procname = "socket_all",
64468 + .data = &grsec_enable_socket_all,
64469 + .maxlen = sizeof(int),
64470 + .mode = 0600,
64471 + .proc_handler = &proc_dointvec,
64472 + },
64473 + {
64474 + .ctl_name = CTL_UNNUMBERED,
64475 + .procname = "socket_all_gid",
64476 + .data = &grsec_socket_all_gid,
64477 + .maxlen = sizeof(int),
64478 + .mode = 0600,
64479 + .proc_handler = &proc_dointvec,
64480 + },
64481 +#endif
64482 +#ifdef CONFIG_GRKERNSEC_SOCKET_CLIENT
64483 + {
64484 + .ctl_name = CTL_UNNUMBERED,
64485 + .procname = "socket_client",
64486 + .data = &grsec_enable_socket_client,
64487 + .maxlen = sizeof(int),
64488 + .mode = 0600,
64489 + .proc_handler = &proc_dointvec,
64490 + },
64491 + {
64492 + .ctl_name = CTL_UNNUMBERED,
64493 + .procname = "socket_client_gid",
64494 + .data = &grsec_socket_client_gid,
64495 + .maxlen = sizeof(int),
64496 + .mode = 0600,
64497 + .proc_handler = &proc_dointvec,
64498 + },
64499 +#endif
64500 +#ifdef CONFIG_GRKERNSEC_SOCKET_SERVER
64501 + {
64502 + .ctl_name = CTL_UNNUMBERED,
64503 + .procname = "socket_server",
64504 + .data = &grsec_enable_socket_server,
64505 + .maxlen = sizeof(int),
64506 + .mode = 0600,
64507 + .proc_handler = &proc_dointvec,
64508 + },
64509 + {
64510 + .ctl_name = CTL_UNNUMBERED,
64511 + .procname = "socket_server_gid",
64512 + .data = &grsec_socket_server_gid,
64513 + .maxlen = sizeof(int),
64514 + .mode = 0600,
64515 + .proc_handler = &proc_dointvec,
64516 + },
64517 +#endif
64518 +#ifdef CONFIG_GRKERNSEC_AUDIT_GROUP
64519 + {
64520 + .ctl_name = CTL_UNNUMBERED,
64521 + .procname = "audit_group",
64522 + .data = &grsec_enable_group,
64523 + .maxlen = sizeof(int),
64524 + .mode = 0600,
64525 + .proc_handler = &proc_dointvec,
64526 + },
64527 + {
64528 + .ctl_name = CTL_UNNUMBERED,
64529 + .procname = "audit_gid",
64530 + .data = &grsec_audit_gid,
64531 + .maxlen = sizeof(int),
64532 + .mode = 0600,
64533 + .proc_handler = &proc_dointvec,
64534 + },
64535 +#endif
64536 +#ifdef CONFIG_GRKERNSEC_AUDIT_CHDIR
64537 + {
64538 + .ctl_name = CTL_UNNUMBERED,
64539 + .procname = "audit_chdir",
64540 + .data = &grsec_enable_chdir,
64541 + .maxlen = sizeof(int),
64542 + .mode = 0600,
64543 + .proc_handler = &proc_dointvec,
64544 + },
64545 +#endif
64546 +#ifdef CONFIG_GRKERNSEC_AUDIT_MOUNT
64547 + {
64548 + .ctl_name = CTL_UNNUMBERED,
64549 + .procname = "audit_mount",
64550 + .data = &grsec_enable_mount,
64551 + .maxlen = sizeof(int),
64552 + .mode = 0600,
64553 + .proc_handler = &proc_dointvec,
64554 + },
64555 +#endif
64556 +#ifdef CONFIG_GRKERNSEC_AUDIT_TEXTREL
64557 + {
64558 + .ctl_name = CTL_UNNUMBERED,
64559 + .procname = "audit_textrel",
64560 + .data = &grsec_enable_audit_textrel,
64561 + .maxlen = sizeof(int),
64562 + .mode = 0600,
64563 + .proc_handler = &proc_dointvec,
64564 + },
64565 +#endif
64566 +#ifdef CONFIG_GRKERNSEC_DMESG
64567 + {
64568 + .ctl_name = CTL_UNNUMBERED,
64569 + .procname = "dmesg",
64570 + .data = &grsec_enable_dmesg,
64571 + .maxlen = sizeof(int),
64572 + .mode = 0600,
64573 + .proc_handler = &proc_dointvec,
64574 + },
64575 +#endif
64576 +#ifdef CONFIG_GRKERNSEC_CHROOT_FINDTASK
64577 + {
64578 + .ctl_name = CTL_UNNUMBERED,
64579 + .procname = "chroot_findtask",
64580 + .data = &grsec_enable_chroot_findtask,
64581 + .maxlen = sizeof(int),
64582 + .mode = 0600,
64583 + .proc_handler = &proc_dointvec,
64584 + },
64585 +#endif
64586 +#ifdef CONFIG_GRKERNSEC_RESLOG
64587 + {
64588 + .ctl_name = CTL_UNNUMBERED,
64589 + .procname = "resource_logging",
64590 + .data = &grsec_resource_logging,
64591 + .maxlen = sizeof(int),
64592 + .mode = 0600,
64593 + .proc_handler = &proc_dointvec,
64594 + },
64595 +#endif
64596 +#ifdef CONFIG_GRKERNSEC_AUDIT_PTRACE
64597 + {
64598 + .ctl_name = CTL_UNNUMBERED,
64599 + .procname = "audit_ptrace",
64600 + .data = &grsec_enable_audit_ptrace,
64601 + .maxlen = sizeof(int),
64602 + .mode = 0600,
64603 + .proc_handler = &proc_dointvec,
64604 + },
64605 +#endif
64606 +#ifdef CONFIG_GRKERNSEC_HARDEN_PTRACE
64607 + {
64608 + .ctl_name = CTL_UNNUMBERED,
64609 + .procname = "harden_ptrace",
64610 + .data = &grsec_enable_harden_ptrace,
64611 + .maxlen = sizeof(int),
64612 + .mode = 0600,
64613 + .proc_handler = &proc_dointvec,
64614 + },
64615 +#endif
64616 + {
64617 + .ctl_name = CTL_UNNUMBERED,
64618 + .procname = "grsec_lock",
64619 + .data = &grsec_lock,
64620 + .maxlen = sizeof(int),
64621 + .mode = 0600,
64622 + .proc_handler = &proc_dointvec,
64623 + },
64624 +#endif
64625 +#ifdef CONFIG_GRKERNSEC_ROFS
64626 + {
64627 + .ctl_name = CTL_UNNUMBERED,
64628 + .procname = "romount_protect",
64629 + .data = &grsec_enable_rofs,
64630 + .maxlen = sizeof(int),
64631 + .mode = 0600,
64632 + .proc_handler = &proc_dointvec_minmax,
64633 + .extra1 = &one,
64634 + .extra2 = &one,
64635 + },
64636 +#endif
64637 + { .ctl_name = 0 }
64638 +};
64639 +#endif
64640 diff --git a/grsecurity/grsec_time.c b/grsecurity/grsec_time.c
64641 new file mode 100644
64642 index 0000000..0dc13c3
64643 --- /dev/null
64644 +++ b/grsecurity/grsec_time.c
64645 @@ -0,0 +1,16 @@
64646 +#include <linux/kernel.h>
64647 +#include <linux/sched.h>
64648 +#include <linux/grinternal.h>
64649 +#include <linux/module.h>
64650 +
64651 +void
64652 +gr_log_timechange(void)
64653 +{
64654 +#ifdef CONFIG_GRKERNSEC_TIME
64655 + if (grsec_enable_time)
64656 + gr_log_noargs(GR_DONT_AUDIT_GOOD, GR_TIME_MSG);
64657 +#endif
64658 + return;
64659 +}
64660 +
64661 +EXPORT_SYMBOL(gr_log_timechange);
64662 diff --git a/grsecurity/grsec_tpe.c b/grsecurity/grsec_tpe.c
64663 new file mode 100644
64664 index 0000000..4a78774
64665 --- /dev/null
64666 +++ b/grsecurity/grsec_tpe.c
64667 @@ -0,0 +1,39 @@
64668 +#include <linux/kernel.h>
64669 +#include <linux/sched.h>
64670 +#include <linux/file.h>
64671 +#include <linux/fs.h>
64672 +#include <linux/grinternal.h>
64673 +
64674 +extern int gr_acl_tpe_check(void);
64675 +
64676 +int
64677 +gr_tpe_allow(const struct file *file)
64678 +{
64679 +#ifdef CONFIG_GRKERNSEC
64680 + struct inode *inode = file->f_path.dentry->d_parent->d_inode;
64681 + const struct cred *cred = current_cred();
64682 +
64683 + if (cred->uid && ((grsec_enable_tpe &&
64684 +#ifdef CONFIG_GRKERNSEC_TPE_INVERT
64685 + ((grsec_enable_tpe_invert && !in_group_p(grsec_tpe_gid)) ||
64686 + (!grsec_enable_tpe_invert && in_group_p(grsec_tpe_gid)))
64687 +#else
64688 + in_group_p(grsec_tpe_gid)
64689 +#endif
64690 + ) || gr_acl_tpe_check()) &&
64691 + (inode->i_uid || (!inode->i_uid && ((inode->i_mode & S_IWGRP) ||
64692 + (inode->i_mode & S_IWOTH))))) {
64693 + gr_log_fs_generic(GR_DONT_AUDIT, GR_EXEC_TPE_MSG, file->f_path.dentry, file->f_path.mnt);
64694 + return 0;
64695 + }
64696 +#ifdef CONFIG_GRKERNSEC_TPE_ALL
64697 + if (cred->uid && grsec_enable_tpe && grsec_enable_tpe_all &&
64698 + ((inode->i_uid && (inode->i_uid != cred->uid)) ||
64699 + (inode->i_mode & S_IWGRP) || (inode->i_mode & S_IWOTH))) {
64700 + gr_log_fs_generic(GR_DONT_AUDIT, GR_EXEC_TPE_MSG, file->f_path.dentry, file->f_path.mnt);
64701 + return 0;
64702 + }
64703 +#endif
64704 +#endif
64705 + return 1;
64706 +}
64707 diff --git a/grsecurity/grsum.c b/grsecurity/grsum.c
64708 new file mode 100644
64709 index 0000000..9f7b1ac
64710 --- /dev/null
64711 +++ b/grsecurity/grsum.c
64712 @@ -0,0 +1,61 @@
64713 +#include <linux/err.h>
64714 +#include <linux/kernel.h>
64715 +#include <linux/sched.h>
64716 +#include <linux/mm.h>
64717 +#include <linux/scatterlist.h>
64718 +#include <linux/crypto.h>
64719 +#include <linux/gracl.h>
64720 +
64721 +
64722 +#if !defined(CONFIG_CRYPTO) || defined(CONFIG_CRYPTO_MODULE) || !defined(CONFIG_CRYPTO_SHA256) || defined(CONFIG_CRYPTO_SHA256_MODULE)
64723 +#error "crypto and sha256 must be built into the kernel"
64724 +#endif
64725 +
64726 +int
64727 +chkpw(struct gr_arg *entry, unsigned char *salt, unsigned char *sum)
64728 +{
64729 + char *p;
64730 + struct crypto_hash *tfm;
64731 + struct hash_desc desc;
64732 + struct scatterlist sg;
64733 + unsigned char temp_sum[GR_SHA_LEN];
64734 + volatile int retval = 0;
64735 + volatile int dummy = 0;
64736 + unsigned int i;
64737 +
64738 + sg_init_table(&sg, 1);
64739 +
64740 + tfm = crypto_alloc_hash("sha256", 0, CRYPTO_ALG_ASYNC);
64741 + if (IS_ERR(tfm)) {
64742 + /* should never happen, since sha256 should be built in */
64743 + return 1;
64744 + }
64745 +
64746 + desc.tfm = tfm;
64747 + desc.flags = 0;
64748 +
64749 + crypto_hash_init(&desc);
64750 +
64751 + p = salt;
64752 + sg_set_buf(&sg, p, GR_SALT_LEN);
64753 + crypto_hash_update(&desc, &sg, sg.length);
64754 +
64755 + p = entry->pw;
64756 + sg_set_buf(&sg, p, strlen(p));
64757 +
64758 + crypto_hash_update(&desc, &sg, sg.length);
64759 +
64760 + crypto_hash_final(&desc, temp_sum);
64761 +
64762 + memset(entry->pw, 0, GR_PW_LEN);
64763 +
64764 + for (i = 0; i < GR_SHA_LEN; i++)
64765 + if (sum[i] != temp_sum[i])
64766 + retval = 1;
64767 + else
64768 + dummy = 1; // waste a cycle
64769 +
64770 + crypto_free_hash(tfm);
64771 +
64772 + return retval;
64773 +}
64774 diff --git a/include/acpi/acpi_bus.h b/include/acpi/acpi_bus.h
64775 index 3cd9ccd..fe16d47 100644
64776 --- a/include/acpi/acpi_bus.h
64777 +++ b/include/acpi/acpi_bus.h
64778 @@ -107,7 +107,7 @@ struct acpi_device_ops {
64779 acpi_op_bind bind;
64780 acpi_op_unbind unbind;
64781 acpi_op_notify notify;
64782 -};
64783 +} __no_const;
64784
64785 #define ACPI_DRIVER_ALL_NOTIFY_EVENTS 0x1 /* system AND device events */
64786
64787 diff --git a/include/acpi/acpi_drivers.h b/include/acpi/acpi_drivers.h
64788 index f4906f6..71feb73 100644
64789 --- a/include/acpi/acpi_drivers.h
64790 +++ b/include/acpi/acpi_drivers.h
64791 @@ -119,8 +119,8 @@ int acpi_processor_set_thermal_limit(acpi_handle handle, int type);
64792 Dock Station
64793 -------------------------------------------------------------------------- */
64794 struct acpi_dock_ops {
64795 - acpi_notify_handler handler;
64796 - acpi_notify_handler uevent;
64797 + const acpi_notify_handler handler;
64798 + const acpi_notify_handler uevent;
64799 };
64800
64801 #if defined(CONFIG_ACPI_DOCK) || defined(CONFIG_ACPI_DOCK_MODULE)
64802 @@ -128,7 +128,7 @@ extern int is_dock_device(acpi_handle handle);
64803 extern int register_dock_notifier(struct notifier_block *nb);
64804 extern void unregister_dock_notifier(struct notifier_block *nb);
64805 extern int register_hotplug_dock_device(acpi_handle handle,
64806 - struct acpi_dock_ops *ops,
64807 + const struct acpi_dock_ops *ops,
64808 void *context);
64809 extern void unregister_hotplug_dock_device(acpi_handle handle);
64810 #else
64811 @@ -144,7 +144,7 @@ static inline void unregister_dock_notifier(struct notifier_block *nb)
64812 {
64813 }
64814 static inline int register_hotplug_dock_device(acpi_handle handle,
64815 - struct acpi_dock_ops *ops,
64816 + const struct acpi_dock_ops *ops,
64817 void *context)
64818 {
64819 return -ENODEV;
64820 diff --git a/include/asm-generic/atomic-long.h b/include/asm-generic/atomic-long.h
64821 index b7babf0..a9ac9fc 100644
64822 --- a/include/asm-generic/atomic-long.h
64823 +++ b/include/asm-generic/atomic-long.h
64824 @@ -22,6 +22,12 @@
64825
64826 typedef atomic64_t atomic_long_t;
64827
64828 +#ifdef CONFIG_PAX_REFCOUNT
64829 +typedef atomic64_unchecked_t atomic_long_unchecked_t;
64830 +#else
64831 +typedef atomic64_t atomic_long_unchecked_t;
64832 +#endif
64833 +
64834 #define ATOMIC_LONG_INIT(i) ATOMIC64_INIT(i)
64835
64836 static inline long atomic_long_read(atomic_long_t *l)
64837 @@ -31,6 +37,15 @@ static inline long atomic_long_read(atomic_long_t *l)
64838 return (long)atomic64_read(v);
64839 }
64840
64841 +#ifdef CONFIG_PAX_REFCOUNT
64842 +static inline long atomic_long_read_unchecked(atomic_long_unchecked_t *l)
64843 +{
64844 + atomic64_unchecked_t *v = (atomic64_unchecked_t *)l;
64845 +
64846 + return (long)atomic64_read_unchecked(v);
64847 +}
64848 +#endif
64849 +
64850 static inline void atomic_long_set(atomic_long_t *l, long i)
64851 {
64852 atomic64_t *v = (atomic64_t *)l;
64853 @@ -38,6 +53,15 @@ static inline void atomic_long_set(atomic_long_t *l, long i)
64854 atomic64_set(v, i);
64855 }
64856
64857 +#ifdef CONFIG_PAX_REFCOUNT
64858 +static inline void atomic_long_set_unchecked(atomic_long_unchecked_t *l, long i)
64859 +{
64860 + atomic64_unchecked_t *v = (atomic64_unchecked_t *)l;
64861 +
64862 + atomic64_set_unchecked(v, i);
64863 +}
64864 +#endif
64865 +
64866 static inline void atomic_long_inc(atomic_long_t *l)
64867 {
64868 atomic64_t *v = (atomic64_t *)l;
64869 @@ -45,6 +69,15 @@ static inline void atomic_long_inc(atomic_long_t *l)
64870 atomic64_inc(v);
64871 }
64872
64873 +#ifdef CONFIG_PAX_REFCOUNT
64874 +static inline void atomic_long_inc_unchecked(atomic_long_unchecked_t *l)
64875 +{
64876 + atomic64_unchecked_t *v = (atomic64_unchecked_t *)l;
64877 +
64878 + atomic64_inc_unchecked(v);
64879 +}
64880 +#endif
64881 +
64882 static inline void atomic_long_dec(atomic_long_t *l)
64883 {
64884 atomic64_t *v = (atomic64_t *)l;
64885 @@ -52,6 +85,15 @@ static inline void atomic_long_dec(atomic_long_t *l)
64886 atomic64_dec(v);
64887 }
64888
64889 +#ifdef CONFIG_PAX_REFCOUNT
64890 +static inline void atomic_long_dec_unchecked(atomic_long_unchecked_t *l)
64891 +{
64892 + atomic64_unchecked_t *v = (atomic64_unchecked_t *)l;
64893 +
64894 + atomic64_dec_unchecked(v);
64895 +}
64896 +#endif
64897 +
64898 static inline void atomic_long_add(long i, atomic_long_t *l)
64899 {
64900 atomic64_t *v = (atomic64_t *)l;
64901 @@ -59,6 +101,15 @@ static inline void atomic_long_add(long i, atomic_long_t *l)
64902 atomic64_add(i, v);
64903 }
64904
64905 +#ifdef CONFIG_PAX_REFCOUNT
64906 +static inline void atomic_long_add_unchecked(long i, atomic_long_unchecked_t *l)
64907 +{
64908 + atomic64_unchecked_t *v = (atomic64_unchecked_t *)l;
64909 +
64910 + atomic64_add_unchecked(i, v);
64911 +}
64912 +#endif
64913 +
64914 static inline void atomic_long_sub(long i, atomic_long_t *l)
64915 {
64916 atomic64_t *v = (atomic64_t *)l;
64917 @@ -115,6 +166,15 @@ static inline long atomic_long_inc_return(atomic_long_t *l)
64918 return (long)atomic64_inc_return(v);
64919 }
64920
64921 +#ifdef CONFIG_PAX_REFCOUNT
64922 +static inline long atomic_long_inc_return_unchecked(atomic_long_unchecked_t *l)
64923 +{
64924 + atomic64_unchecked_t *v = (atomic64_unchecked_t *)l;
64925 +
64926 + return (long)atomic64_inc_return_unchecked(v);
64927 +}
64928 +#endif
64929 +
64930 static inline long atomic_long_dec_return(atomic_long_t *l)
64931 {
64932 atomic64_t *v = (atomic64_t *)l;
64933 @@ -140,6 +200,12 @@ static inline long atomic_long_add_unless(atomic_long_t *l, long a, long u)
64934
64935 typedef atomic_t atomic_long_t;
64936
64937 +#ifdef CONFIG_PAX_REFCOUNT
64938 +typedef atomic_unchecked_t atomic_long_unchecked_t;
64939 +#else
64940 +typedef atomic_t atomic_long_unchecked_t;
64941 +#endif
64942 +
64943 #define ATOMIC_LONG_INIT(i) ATOMIC_INIT(i)
64944 static inline long atomic_long_read(atomic_long_t *l)
64945 {
64946 @@ -148,6 +214,15 @@ static inline long atomic_long_read(atomic_long_t *l)
64947 return (long)atomic_read(v);
64948 }
64949
64950 +#ifdef CONFIG_PAX_REFCOUNT
64951 +static inline long atomic_long_read_unchecked(atomic_long_unchecked_t *l)
64952 +{
64953 + atomic_unchecked_t *v = (atomic_unchecked_t *)l;
64954 +
64955 + return (long)atomic_read_unchecked(v);
64956 +}
64957 +#endif
64958 +
64959 static inline void atomic_long_set(atomic_long_t *l, long i)
64960 {
64961 atomic_t *v = (atomic_t *)l;
64962 @@ -155,6 +230,15 @@ static inline void atomic_long_set(atomic_long_t *l, long i)
64963 atomic_set(v, i);
64964 }
64965
64966 +#ifdef CONFIG_PAX_REFCOUNT
64967 +static inline void atomic_long_set_unchecked(atomic_long_unchecked_t *l, long i)
64968 +{
64969 + atomic_unchecked_t *v = (atomic_unchecked_t *)l;
64970 +
64971 + atomic_set_unchecked(v, i);
64972 +}
64973 +#endif
64974 +
64975 static inline void atomic_long_inc(atomic_long_t *l)
64976 {
64977 atomic_t *v = (atomic_t *)l;
64978 @@ -162,6 +246,15 @@ static inline void atomic_long_inc(atomic_long_t *l)
64979 atomic_inc(v);
64980 }
64981
64982 +#ifdef CONFIG_PAX_REFCOUNT
64983 +static inline void atomic_long_inc_unchecked(atomic_long_unchecked_t *l)
64984 +{
64985 + atomic_unchecked_t *v = (atomic_unchecked_t *)l;
64986 +
64987 + atomic_inc_unchecked(v);
64988 +}
64989 +#endif
64990 +
64991 static inline void atomic_long_dec(atomic_long_t *l)
64992 {
64993 atomic_t *v = (atomic_t *)l;
64994 @@ -169,6 +262,15 @@ static inline void atomic_long_dec(atomic_long_t *l)
64995 atomic_dec(v);
64996 }
64997
64998 +#ifdef CONFIG_PAX_REFCOUNT
64999 +static inline void atomic_long_dec_unchecked(atomic_long_unchecked_t *l)
65000 +{
65001 + atomic_unchecked_t *v = (atomic_unchecked_t *)l;
65002 +
65003 + atomic_dec_unchecked(v);
65004 +}
65005 +#endif
65006 +
65007 static inline void atomic_long_add(long i, atomic_long_t *l)
65008 {
65009 atomic_t *v = (atomic_t *)l;
65010 @@ -176,6 +278,15 @@ static inline void atomic_long_add(long i, atomic_long_t *l)
65011 atomic_add(i, v);
65012 }
65013
65014 +#ifdef CONFIG_PAX_REFCOUNT
65015 +static inline void atomic_long_add_unchecked(long i, atomic_long_unchecked_t *l)
65016 +{
65017 + atomic_unchecked_t *v = (atomic_unchecked_t *)l;
65018 +
65019 + atomic_add_unchecked(i, v);
65020 +}
65021 +#endif
65022 +
65023 static inline void atomic_long_sub(long i, atomic_long_t *l)
65024 {
65025 atomic_t *v = (atomic_t *)l;
65026 @@ -232,6 +343,15 @@ static inline long atomic_long_inc_return(atomic_long_t *l)
65027 return (long)atomic_inc_return(v);
65028 }
65029
65030 +#ifdef CONFIG_PAX_REFCOUNT
65031 +static inline long atomic_long_inc_return_unchecked(atomic_long_unchecked_t *l)
65032 +{
65033 + atomic_unchecked_t *v = (atomic_unchecked_t *)l;
65034 +
65035 + return (long)atomic_inc_return_unchecked(v);
65036 +}
65037 +#endif
65038 +
65039 static inline long atomic_long_dec_return(atomic_long_t *l)
65040 {
65041 atomic_t *v = (atomic_t *)l;
65042 @@ -255,4 +375,47 @@ static inline long atomic_long_add_unless(atomic_long_t *l, long a, long u)
65043
65044 #endif /* BITS_PER_LONG == 64 */
65045
65046 +#ifdef CONFIG_PAX_REFCOUNT
65047 +static inline void pax_refcount_needs_these_functions(void)
65048 +{
65049 + atomic_read_unchecked((atomic_unchecked_t *)NULL);
65050 + atomic_set_unchecked((atomic_unchecked_t *)NULL, 0);
65051 + atomic_add_unchecked(0, (atomic_unchecked_t *)NULL);
65052 + atomic_sub_unchecked(0, (atomic_unchecked_t *)NULL);
65053 + atomic_inc_unchecked((atomic_unchecked_t *)NULL);
65054 + (void)atomic_inc_and_test_unchecked((atomic_unchecked_t *)NULL);
65055 + atomic_inc_return_unchecked((atomic_unchecked_t *)NULL);
65056 + atomic_add_return_unchecked(0, (atomic_unchecked_t *)NULL);
65057 + atomic_dec_unchecked((atomic_unchecked_t *)NULL);
65058 + atomic_cmpxchg_unchecked((atomic_unchecked_t *)NULL, 0, 0);
65059 + (void)atomic_xchg_unchecked((atomic_unchecked_t *)NULL, 0);
65060 +
65061 + atomic_long_read_unchecked((atomic_long_unchecked_t *)NULL);
65062 + atomic_long_set_unchecked((atomic_long_unchecked_t *)NULL, 0);
65063 + atomic_long_add_unchecked(0, (atomic_long_unchecked_t *)NULL);
65064 + atomic_long_inc_unchecked((atomic_long_unchecked_t *)NULL);
65065 + atomic_long_inc_return_unchecked((atomic_long_unchecked_t *)NULL);
65066 + atomic_long_dec_unchecked((atomic_long_unchecked_t *)NULL);
65067 +}
65068 +#else
65069 +#define atomic_read_unchecked(v) atomic_read(v)
65070 +#define atomic_set_unchecked(v, i) atomic_set((v), (i))
65071 +#define atomic_add_unchecked(i, v) atomic_add((i), (v))
65072 +#define atomic_sub_unchecked(i, v) atomic_sub((i), (v))
65073 +#define atomic_inc_unchecked(v) atomic_inc(v)
65074 +#define atomic_inc_and_test_unchecked(v) atomic_inc_and_test(v)
65075 +#define atomic_inc_return_unchecked(v) atomic_inc_return(v)
65076 +#define atomic_add_return_unchecked(i, v) atomic_add_return((i), (v))
65077 +#define atomic_dec_unchecked(v) atomic_dec(v)
65078 +#define atomic_cmpxchg_unchecked(v, o, n) atomic_cmpxchg((v), (o), (n))
65079 +#define atomic_xchg_unchecked(v, i) atomic_xchg((v), (i))
65080 +
65081 +#define atomic_long_read_unchecked(v) atomic_long_read(v)
65082 +#define atomic_long_set_unchecked(v, i) atomic_long_set((v), (i))
65083 +#define atomic_long_add_unchecked(i, v) atomic_long_add((i), (v))
65084 +#define atomic_long_inc_unchecked(v) atomic_long_inc(v)
65085 +#define atomic_long_inc_return_unchecked(v) atomic_long_inc_return(v)
65086 +#define atomic_long_dec_unchecked(v) atomic_long_dec(v)
65087 +#endif
65088 +
65089 #endif /* _ASM_GENERIC_ATOMIC_LONG_H */
65090 diff --git a/include/asm-generic/atomic64.h b/include/asm-generic/atomic64.h
65091 index b18ce4f..2ee2843 100644
65092 --- a/include/asm-generic/atomic64.h
65093 +++ b/include/asm-generic/atomic64.h
65094 @@ -16,6 +16,8 @@ typedef struct {
65095 long long counter;
65096 } atomic64_t;
65097
65098 +typedef atomic64_t atomic64_unchecked_t;
65099 +
65100 #define ATOMIC64_INIT(i) { (i) }
65101
65102 extern long long atomic64_read(const atomic64_t *v);
65103 @@ -39,4 +41,14 @@ extern int atomic64_add_unless(atomic64_t *v, long long a, long long u);
65104 #define atomic64_dec_and_test(v) (atomic64_dec_return((v)) == 0)
65105 #define atomic64_inc_not_zero(v) atomic64_add_unless((v), 1LL, 0LL)
65106
65107 +#define atomic64_read_unchecked(v) atomic64_read(v)
65108 +#define atomic64_set_unchecked(v, i) atomic64_set((v), (i))
65109 +#define atomic64_add_unchecked(a, v) atomic64_add((a), (v))
65110 +#define atomic64_add_return_unchecked(a, v) atomic64_add_return((a), (v))
65111 +#define atomic64_sub_unchecked(a, v) atomic64_sub((a), (v))
65112 +#define atomic64_inc_unchecked(v) atomic64_inc(v)
65113 +#define atomic64_inc_return_unchecked(v) atomic64_inc_return(v)
65114 +#define atomic64_dec_unchecked(v) atomic64_dec(v)
65115 +#define atomic64_cmpxchg_unchecked(v, o, n) atomic64_cmpxchg((v), (o), (n))
65116 +
65117 #endif /* _ASM_GENERIC_ATOMIC64_H */
65118 diff --git a/include/asm-generic/bug.h b/include/asm-generic/bug.h
65119 index d48ddf0..656a0ac 100644
65120 --- a/include/asm-generic/bug.h
65121 +++ b/include/asm-generic/bug.h
65122 @@ -105,11 +105,11 @@ extern void warn_slowpath_null(const char *file, const int line);
65123
65124 #else /* !CONFIG_BUG */
65125 #ifndef HAVE_ARCH_BUG
65126 -#define BUG() do {} while(0)
65127 +#define BUG() do { for (;;) ; } while(0)
65128 #endif
65129
65130 #ifndef HAVE_ARCH_BUG_ON
65131 -#define BUG_ON(condition) do { if (condition) ; } while(0)
65132 +#define BUG_ON(condition) do { if (condition) for (;;) ; } while(0)
65133 #endif
65134
65135 #ifndef HAVE_ARCH_WARN_ON
65136 diff --git a/include/asm-generic/cache.h b/include/asm-generic/cache.h
65137 index 1bfcfe5..e04c5c9 100644
65138 --- a/include/asm-generic/cache.h
65139 +++ b/include/asm-generic/cache.h
65140 @@ -6,7 +6,7 @@
65141 * cache lines need to provide their own cache.h.
65142 */
65143
65144 -#define L1_CACHE_SHIFT 5
65145 -#define L1_CACHE_BYTES (1 << L1_CACHE_SHIFT)
65146 +#define L1_CACHE_SHIFT 5UL
65147 +#define L1_CACHE_BYTES (1UL << L1_CACHE_SHIFT)
65148
65149 #endif /* __ASM_GENERIC_CACHE_H */
65150 diff --git a/include/asm-generic/dma-mapping-common.h b/include/asm-generic/dma-mapping-common.h
65151 index 6920695..41038bc 100644
65152 --- a/include/asm-generic/dma-mapping-common.h
65153 +++ b/include/asm-generic/dma-mapping-common.h
65154 @@ -11,7 +11,7 @@ static inline dma_addr_t dma_map_single_attrs(struct device *dev, void *ptr,
65155 enum dma_data_direction dir,
65156 struct dma_attrs *attrs)
65157 {
65158 - struct dma_map_ops *ops = get_dma_ops(dev);
65159 + const struct dma_map_ops *ops = get_dma_ops(dev);
65160 dma_addr_t addr;
65161
65162 kmemcheck_mark_initialized(ptr, size);
65163 @@ -30,7 +30,7 @@ static inline void dma_unmap_single_attrs(struct device *dev, dma_addr_t addr,
65164 enum dma_data_direction dir,
65165 struct dma_attrs *attrs)
65166 {
65167 - struct dma_map_ops *ops = get_dma_ops(dev);
65168 + const struct dma_map_ops *ops = get_dma_ops(dev);
65169
65170 BUG_ON(!valid_dma_direction(dir));
65171 if (ops->unmap_page)
65172 @@ -42,7 +42,7 @@ static inline int dma_map_sg_attrs(struct device *dev, struct scatterlist *sg,
65173 int nents, enum dma_data_direction dir,
65174 struct dma_attrs *attrs)
65175 {
65176 - struct dma_map_ops *ops = get_dma_ops(dev);
65177 + const struct dma_map_ops *ops = get_dma_ops(dev);
65178 int i, ents;
65179 struct scatterlist *s;
65180
65181 @@ -59,7 +59,7 @@ static inline void dma_unmap_sg_attrs(struct device *dev, struct scatterlist *sg
65182 int nents, enum dma_data_direction dir,
65183 struct dma_attrs *attrs)
65184 {
65185 - struct dma_map_ops *ops = get_dma_ops(dev);
65186 + const struct dma_map_ops *ops = get_dma_ops(dev);
65187
65188 BUG_ON(!valid_dma_direction(dir));
65189 debug_dma_unmap_sg(dev, sg, nents, dir);
65190 @@ -71,7 +71,7 @@ static inline dma_addr_t dma_map_page(struct device *dev, struct page *page,
65191 size_t offset, size_t size,
65192 enum dma_data_direction dir)
65193 {
65194 - struct dma_map_ops *ops = get_dma_ops(dev);
65195 + const struct dma_map_ops *ops = get_dma_ops(dev);
65196 dma_addr_t addr;
65197
65198 kmemcheck_mark_initialized(page_address(page) + offset, size);
65199 @@ -85,7 +85,7 @@ static inline dma_addr_t dma_map_page(struct device *dev, struct page *page,
65200 static inline void dma_unmap_page(struct device *dev, dma_addr_t addr,
65201 size_t size, enum dma_data_direction dir)
65202 {
65203 - struct dma_map_ops *ops = get_dma_ops(dev);
65204 + const struct dma_map_ops *ops = get_dma_ops(dev);
65205
65206 BUG_ON(!valid_dma_direction(dir));
65207 if (ops->unmap_page)
65208 @@ -97,7 +97,7 @@ static inline void dma_sync_single_for_cpu(struct device *dev, dma_addr_t addr,
65209 size_t size,
65210 enum dma_data_direction dir)
65211 {
65212 - struct dma_map_ops *ops = get_dma_ops(dev);
65213 + const struct dma_map_ops *ops = get_dma_ops(dev);
65214
65215 BUG_ON(!valid_dma_direction(dir));
65216 if (ops->sync_single_for_cpu)
65217 @@ -109,7 +109,7 @@ static inline void dma_sync_single_for_device(struct device *dev,
65218 dma_addr_t addr, size_t size,
65219 enum dma_data_direction dir)
65220 {
65221 - struct dma_map_ops *ops = get_dma_ops(dev);
65222 + const struct dma_map_ops *ops = get_dma_ops(dev);
65223
65224 BUG_ON(!valid_dma_direction(dir));
65225 if (ops->sync_single_for_device)
65226 @@ -123,7 +123,7 @@ static inline void dma_sync_single_range_for_cpu(struct device *dev,
65227 size_t size,
65228 enum dma_data_direction dir)
65229 {
65230 - struct dma_map_ops *ops = get_dma_ops(dev);
65231 + const struct dma_map_ops *ops = get_dma_ops(dev);
65232
65233 BUG_ON(!valid_dma_direction(dir));
65234 if (ops->sync_single_range_for_cpu) {
65235 @@ -140,7 +140,7 @@ static inline void dma_sync_single_range_for_device(struct device *dev,
65236 size_t size,
65237 enum dma_data_direction dir)
65238 {
65239 - struct dma_map_ops *ops = get_dma_ops(dev);
65240 + const struct dma_map_ops *ops = get_dma_ops(dev);
65241
65242 BUG_ON(!valid_dma_direction(dir));
65243 if (ops->sync_single_range_for_device) {
65244 @@ -155,7 +155,7 @@ static inline void
65245 dma_sync_sg_for_cpu(struct device *dev, struct scatterlist *sg,
65246 int nelems, enum dma_data_direction dir)
65247 {
65248 - struct dma_map_ops *ops = get_dma_ops(dev);
65249 + const struct dma_map_ops *ops = get_dma_ops(dev);
65250
65251 BUG_ON(!valid_dma_direction(dir));
65252 if (ops->sync_sg_for_cpu)
65253 @@ -167,7 +167,7 @@ static inline void
65254 dma_sync_sg_for_device(struct device *dev, struct scatterlist *sg,
65255 int nelems, enum dma_data_direction dir)
65256 {
65257 - struct dma_map_ops *ops = get_dma_ops(dev);
65258 + const struct dma_map_ops *ops = get_dma_ops(dev);
65259
65260 BUG_ON(!valid_dma_direction(dir));
65261 if (ops->sync_sg_for_device)
65262 diff --git a/include/asm-generic/emergency-restart.h b/include/asm-generic/emergency-restart.h
65263 index 0d68a1e..b74a761 100644
65264 --- a/include/asm-generic/emergency-restart.h
65265 +++ b/include/asm-generic/emergency-restart.h
65266 @@ -1,7 +1,7 @@
65267 #ifndef _ASM_GENERIC_EMERGENCY_RESTART_H
65268 #define _ASM_GENERIC_EMERGENCY_RESTART_H
65269
65270 -static inline void machine_emergency_restart(void)
65271 +static inline __noreturn void machine_emergency_restart(void)
65272 {
65273 machine_restart(NULL);
65274 }
65275 diff --git a/include/asm-generic/futex.h b/include/asm-generic/futex.h
65276 index 3c2344f..4590a7d 100644
65277 --- a/include/asm-generic/futex.h
65278 +++ b/include/asm-generic/futex.h
65279 @@ -6,7 +6,7 @@
65280 #include <asm/errno.h>
65281
65282 static inline int
65283 -futex_atomic_op_inuser (int encoded_op, int __user *uaddr)
65284 +futex_atomic_op_inuser (int encoded_op, u32 __user *uaddr)
65285 {
65286 int op = (encoded_op >> 28) & 7;
65287 int cmp = (encoded_op >> 24) & 15;
65288 @@ -48,7 +48,7 @@ futex_atomic_op_inuser (int encoded_op, int __user *uaddr)
65289 }
65290
65291 static inline int
65292 -futex_atomic_cmpxchg_inatomic(int __user *uaddr, int oldval, int newval)
65293 +futex_atomic_cmpxchg_inatomic(u32 __user *uaddr, int oldval, int newval)
65294 {
65295 return -ENOSYS;
65296 }
65297 diff --git a/include/asm-generic/int-l64.h b/include/asm-generic/int-l64.h
65298 index 1ca3efc..e3dc852 100644
65299 --- a/include/asm-generic/int-l64.h
65300 +++ b/include/asm-generic/int-l64.h
65301 @@ -46,6 +46,8 @@ typedef unsigned int u32;
65302 typedef signed long s64;
65303 typedef unsigned long u64;
65304
65305 +typedef unsigned int intoverflow_t __attribute__ ((mode(TI)));
65306 +
65307 #define S8_C(x) x
65308 #define U8_C(x) x ## U
65309 #define S16_C(x) x
65310 diff --git a/include/asm-generic/int-ll64.h b/include/asm-generic/int-ll64.h
65311 index f394147..b6152b9 100644
65312 --- a/include/asm-generic/int-ll64.h
65313 +++ b/include/asm-generic/int-ll64.h
65314 @@ -51,6 +51,8 @@ typedef unsigned int u32;
65315 typedef signed long long s64;
65316 typedef unsigned long long u64;
65317
65318 +typedef unsigned long long intoverflow_t;
65319 +
65320 #define S8_C(x) x
65321 #define U8_C(x) x ## U
65322 #define S16_C(x) x
65323 diff --git a/include/asm-generic/kmap_types.h b/include/asm-generic/kmap_types.h
65324 index e5f234a..cdb16b3 100644
65325 --- a/include/asm-generic/kmap_types.h
65326 +++ b/include/asm-generic/kmap_types.h
65327 @@ -28,7 +28,8 @@ KMAP_D(15) KM_UML_USERCOPY,
65328 KMAP_D(16) KM_IRQ_PTE,
65329 KMAP_D(17) KM_NMI,
65330 KMAP_D(18) KM_NMI_PTE,
65331 -KMAP_D(19) KM_TYPE_NR
65332 +KMAP_D(19) KM_CLEARPAGE,
65333 +KMAP_D(20) KM_TYPE_NR
65334 };
65335
65336 #undef KMAP_D
65337 diff --git a/include/asm-generic/pgtable-nopmd.h b/include/asm-generic/pgtable-nopmd.h
65338 index 725612b..9cc513a 100644
65339 --- a/include/asm-generic/pgtable-nopmd.h
65340 +++ b/include/asm-generic/pgtable-nopmd.h
65341 @@ -1,14 +1,19 @@
65342 #ifndef _PGTABLE_NOPMD_H
65343 #define _PGTABLE_NOPMD_H
65344
65345 -#ifndef __ASSEMBLY__
65346 -
65347 #include <asm-generic/pgtable-nopud.h>
65348
65349 -struct mm_struct;
65350 -
65351 #define __PAGETABLE_PMD_FOLDED
65352
65353 +#define PMD_SHIFT PUD_SHIFT
65354 +#define PTRS_PER_PMD 1
65355 +#define PMD_SIZE (_AC(1,UL) << PMD_SHIFT)
65356 +#define PMD_MASK (~(PMD_SIZE-1))
65357 +
65358 +#ifndef __ASSEMBLY__
65359 +
65360 +struct mm_struct;
65361 +
65362 /*
65363 * Having the pmd type consist of a pud gets the size right, and allows
65364 * us to conceptually access the pud entry that this pmd is folded into
65365 @@ -16,11 +21,6 @@ struct mm_struct;
65366 */
65367 typedef struct { pud_t pud; } pmd_t;
65368
65369 -#define PMD_SHIFT PUD_SHIFT
65370 -#define PTRS_PER_PMD 1
65371 -#define PMD_SIZE (1UL << PMD_SHIFT)
65372 -#define PMD_MASK (~(PMD_SIZE-1))
65373 -
65374 /*
65375 * The "pud_xxx()" functions here are trivial for a folded two-level
65376 * setup: the pmd is never bad, and a pmd always exists (as it's folded
65377 diff --git a/include/asm-generic/pgtable-nopud.h b/include/asm-generic/pgtable-nopud.h
65378 index 810431d..ccc3638 100644
65379 --- a/include/asm-generic/pgtable-nopud.h
65380 +++ b/include/asm-generic/pgtable-nopud.h
65381 @@ -1,10 +1,15 @@
65382 #ifndef _PGTABLE_NOPUD_H
65383 #define _PGTABLE_NOPUD_H
65384
65385 -#ifndef __ASSEMBLY__
65386 -
65387 #define __PAGETABLE_PUD_FOLDED
65388
65389 +#define PUD_SHIFT PGDIR_SHIFT
65390 +#define PTRS_PER_PUD 1
65391 +#define PUD_SIZE (_AC(1,UL) << PUD_SHIFT)
65392 +#define PUD_MASK (~(PUD_SIZE-1))
65393 +
65394 +#ifndef __ASSEMBLY__
65395 +
65396 /*
65397 * Having the pud type consist of a pgd gets the size right, and allows
65398 * us to conceptually access the pgd entry that this pud is folded into
65399 @@ -12,11 +17,6 @@
65400 */
65401 typedef struct { pgd_t pgd; } pud_t;
65402
65403 -#define PUD_SHIFT PGDIR_SHIFT
65404 -#define PTRS_PER_PUD 1
65405 -#define PUD_SIZE (1UL << PUD_SHIFT)
65406 -#define PUD_MASK (~(PUD_SIZE-1))
65407 -
65408 /*
65409 * The "pgd_xxx()" functions here are trivial for a folded two-level
65410 * setup: the pud is never bad, and a pud always exists (as it's folded
65411 diff --git a/include/asm-generic/pgtable.h b/include/asm-generic/pgtable.h
65412 index e2bd73e..fea8ed3 100644
65413 --- a/include/asm-generic/pgtable.h
65414 +++ b/include/asm-generic/pgtable.h
65415 @@ -344,6 +344,14 @@ extern void untrack_pfn_vma(struct vm_area_struct *vma, unsigned long pfn,
65416 unsigned long size);
65417 #endif
65418
65419 +#ifndef __HAVE_ARCH_PAX_OPEN_KERNEL
65420 +static inline unsigned long pax_open_kernel(void) { return 0; }
65421 +#endif
65422 +
65423 +#ifndef __HAVE_ARCH_PAX_CLOSE_KERNEL
65424 +static inline unsigned long pax_close_kernel(void) { return 0; }
65425 +#endif
65426 +
65427 #endif /* !__ASSEMBLY__ */
65428
65429 #endif /* _ASM_GENERIC_PGTABLE_H */
65430 diff --git a/include/asm-generic/vmlinux.lds.h b/include/asm-generic/vmlinux.lds.h
65431 index b6e818f..21aa58a 100644
65432 --- a/include/asm-generic/vmlinux.lds.h
65433 +++ b/include/asm-generic/vmlinux.lds.h
65434 @@ -199,6 +199,7 @@
65435 .rodata : AT(ADDR(.rodata) - LOAD_OFFSET) { \
65436 VMLINUX_SYMBOL(__start_rodata) = .; \
65437 *(.rodata) *(.rodata.*) \
65438 + *(.data.read_only) \
65439 *(__vermagic) /* Kernel version magic */ \
65440 *(__markers_strings) /* Markers: strings */ \
65441 *(__tracepoints_strings)/* Tracepoints: strings */ \
65442 @@ -656,22 +657,24 @@
65443 * section in the linker script will go there too. @phdr should have
65444 * a leading colon.
65445 *
65446 - * Note that this macros defines __per_cpu_load as an absolute symbol.
65447 + * Note that this macros defines per_cpu_load as an absolute symbol.
65448 * If there is no need to put the percpu section at a predetermined
65449 * address, use PERCPU().
65450 */
65451 #define PERCPU_VADDR(vaddr, phdr) \
65452 - VMLINUX_SYMBOL(__per_cpu_load) = .; \
65453 - .data.percpu vaddr : AT(VMLINUX_SYMBOL(__per_cpu_load) \
65454 + per_cpu_load = .; \
65455 + .data.percpu vaddr : AT(VMLINUX_SYMBOL(per_cpu_load) \
65456 - LOAD_OFFSET) { \
65457 + VMLINUX_SYMBOL(__per_cpu_load) = . + per_cpu_load; \
65458 VMLINUX_SYMBOL(__per_cpu_start) = .; \
65459 *(.data.percpu.first) \
65460 - *(.data.percpu.page_aligned) \
65461 *(.data.percpu) \
65462 + . = ALIGN(PAGE_SIZE); \
65463 + *(.data.percpu.page_aligned) \
65464 *(.data.percpu.shared_aligned) \
65465 VMLINUX_SYMBOL(__per_cpu_end) = .; \
65466 } phdr \
65467 - . = VMLINUX_SYMBOL(__per_cpu_load) + SIZEOF(.data.percpu);
65468 + . = VMLINUX_SYMBOL(per_cpu_load) + SIZEOF(.data.percpu);
65469
65470 /**
65471 * PERCPU - define output section for percpu area, simple version
65472 diff --git a/include/drm/drmP.h b/include/drm/drmP.h
65473 index 66713c6..98c0460 100644
65474 --- a/include/drm/drmP.h
65475 +++ b/include/drm/drmP.h
65476 @@ -71,6 +71,7 @@
65477 #include <linux/workqueue.h>
65478 #include <linux/poll.h>
65479 #include <asm/pgalloc.h>
65480 +#include <asm/local.h>
65481 #include "drm.h"
65482
65483 #include <linux/idr.h>
65484 @@ -814,7 +815,7 @@ struct drm_driver {
65485 void (*vgaarb_irq)(struct drm_device *dev, bool state);
65486
65487 /* Driver private ops for this object */
65488 - struct vm_operations_struct *gem_vm_ops;
65489 + const struct vm_operations_struct *gem_vm_ops;
65490
65491 int major;
65492 int minor;
65493 @@ -917,7 +918,7 @@ struct drm_device {
65494
65495 /** \name Usage Counters */
65496 /*@{ */
65497 - int open_count; /**< Outstanding files open */
65498 + local_t open_count; /**< Outstanding files open */
65499 atomic_t ioctl_count; /**< Outstanding IOCTLs pending */
65500 atomic_t vma_count; /**< Outstanding vma areas open */
65501 int buf_use; /**< Buffers in use -- cannot alloc */
65502 @@ -928,7 +929,7 @@ struct drm_device {
65503 /*@{ */
65504 unsigned long counters;
65505 enum drm_stat_type types[15];
65506 - atomic_t counts[15];
65507 + atomic_unchecked_t counts[15];
65508 /*@} */
65509
65510 struct list_head filelist;
65511 @@ -1016,7 +1017,7 @@ struct drm_device {
65512 struct pci_controller *hose;
65513 #endif
65514 struct drm_sg_mem *sg; /**< Scatter gather memory */
65515 - unsigned int num_crtcs; /**< Number of CRTCs on this device */
65516 + unsigned int num_crtcs; /**< Number of CRTCs on this device */
65517 void *dev_private; /**< device private data */
65518 void *mm_private;
65519 struct address_space *dev_mapping;
65520 @@ -1042,11 +1043,11 @@ struct drm_device {
65521 spinlock_t object_name_lock;
65522 struct idr object_name_idr;
65523 atomic_t object_count;
65524 - atomic_t object_memory;
65525 + atomic_unchecked_t object_memory;
65526 atomic_t pin_count;
65527 - atomic_t pin_memory;
65528 + atomic_unchecked_t pin_memory;
65529 atomic_t gtt_count;
65530 - atomic_t gtt_memory;
65531 + atomic_unchecked_t gtt_memory;
65532 uint32_t gtt_total;
65533 uint32_t invalidate_domains; /* domains pending invalidation */
65534 uint32_t flush_domains; /* domains pending flush */
65535 diff --git a/include/drm/drm_crtc_helper.h b/include/drm/drm_crtc_helper.h
65536 index b29e201..3413cc9 100644
65537 --- a/include/drm/drm_crtc_helper.h
65538 +++ b/include/drm/drm_crtc_helper.h
65539 @@ -64,7 +64,7 @@ struct drm_crtc_helper_funcs {
65540
65541 /* reload the current crtc LUT */
65542 void (*load_lut)(struct drm_crtc *crtc);
65543 -};
65544 +} __no_const;
65545
65546 struct drm_encoder_helper_funcs {
65547 void (*dpms)(struct drm_encoder *encoder, int mode);
65548 @@ -85,7 +85,7 @@ struct drm_encoder_helper_funcs {
65549 struct drm_connector *connector);
65550 /* disable encoder when not in use - more explicit than dpms off */
65551 void (*disable)(struct drm_encoder *encoder);
65552 -};
65553 +} __no_const;
65554
65555 struct drm_connector_helper_funcs {
65556 int (*get_modes)(struct drm_connector *connector);
65557 diff --git a/include/drm/ttm/ttm_memory.h b/include/drm/ttm/ttm_memory.h
65558 index b199170..6f9e64c 100644
65559 --- a/include/drm/ttm/ttm_memory.h
65560 +++ b/include/drm/ttm/ttm_memory.h
65561 @@ -47,7 +47,7 @@
65562
65563 struct ttm_mem_shrink {
65564 int (*do_shrink) (struct ttm_mem_shrink *);
65565 -};
65566 +} __no_const;
65567
65568 /**
65569 * struct ttm_mem_global - Global memory accounting structure.
65570 diff --git a/include/linux/a.out.h b/include/linux/a.out.h
65571 index e86dfca..40cc55f 100644
65572 --- a/include/linux/a.out.h
65573 +++ b/include/linux/a.out.h
65574 @@ -39,6 +39,14 @@ enum machine_type {
65575 M_MIPS2 = 152 /* MIPS R6000/R4000 binary */
65576 };
65577
65578 +/* Constants for the N_FLAGS field */
65579 +#define F_PAX_PAGEEXEC 1 /* Paging based non-executable pages */
65580 +#define F_PAX_EMUTRAMP 2 /* Emulate trampolines */
65581 +#define F_PAX_MPROTECT 4 /* Restrict mprotect() */
65582 +#define F_PAX_RANDMMAP 8 /* Randomize mmap() base */
65583 +/*#define F_PAX_RANDEXEC 16*/ /* Randomize ET_EXEC base */
65584 +#define F_PAX_SEGMEXEC 32 /* Segmentation based non-executable pages */
65585 +
65586 #if !defined (N_MAGIC)
65587 #define N_MAGIC(exec) ((exec).a_info & 0xffff)
65588 #endif
65589 diff --git a/include/linux/atmdev.h b/include/linux/atmdev.h
65590 index 817b237..62c10bc 100644
65591 --- a/include/linux/atmdev.h
65592 +++ b/include/linux/atmdev.h
65593 @@ -237,7 +237,7 @@ struct compat_atm_iobuf {
65594 #endif
65595
65596 struct k_atm_aal_stats {
65597 -#define __HANDLE_ITEM(i) atomic_t i
65598 +#define __HANDLE_ITEM(i) atomic_unchecked_t i
65599 __AAL_STAT_ITEMS
65600 #undef __HANDLE_ITEM
65601 };
65602 diff --git a/include/linux/backlight.h b/include/linux/backlight.h
65603 index 0f5f578..8c4f884 100644
65604 --- a/include/linux/backlight.h
65605 +++ b/include/linux/backlight.h
65606 @@ -36,18 +36,18 @@ struct backlight_device;
65607 struct fb_info;
65608
65609 struct backlight_ops {
65610 - unsigned int options;
65611 + const unsigned int options;
65612
65613 #define BL_CORE_SUSPENDRESUME (1 << 0)
65614
65615 /* Notify the backlight driver some property has changed */
65616 - int (*update_status)(struct backlight_device *);
65617 + int (* const update_status)(struct backlight_device *);
65618 /* Return the current backlight brightness (accounting for power,
65619 fb_blank etc.) */
65620 - int (*get_brightness)(struct backlight_device *);
65621 + int (* const get_brightness)(struct backlight_device *);
65622 /* Check if given framebuffer device is the one bound to this backlight;
65623 return 0 if not, !=0 if it is. If NULL, backlight always matches the fb. */
65624 - int (*check_fb)(struct fb_info *);
65625 + int (* const check_fb)(struct fb_info *);
65626 };
65627
65628 /* This structure defines all the properties of a backlight */
65629 @@ -86,7 +86,7 @@ struct backlight_device {
65630 registered this device has been unloaded, and if class_get_devdata()
65631 points to something in the body of that driver, it is also invalid. */
65632 struct mutex ops_lock;
65633 - struct backlight_ops *ops;
65634 + const struct backlight_ops *ops;
65635
65636 /* The framebuffer notifier block */
65637 struct notifier_block fb_notif;
65638 @@ -103,7 +103,7 @@ static inline void backlight_update_status(struct backlight_device *bd)
65639 }
65640
65641 extern struct backlight_device *backlight_device_register(const char *name,
65642 - struct device *dev, void *devdata, struct backlight_ops *ops);
65643 + struct device *dev, void *devdata, const struct backlight_ops *ops);
65644 extern void backlight_device_unregister(struct backlight_device *bd);
65645 extern void backlight_force_update(struct backlight_device *bd,
65646 enum backlight_update_reason reason);
65647 diff --git a/include/linux/binfmts.h b/include/linux/binfmts.h
65648 index a3d802e..482f69c 100644
65649 --- a/include/linux/binfmts.h
65650 +++ b/include/linux/binfmts.h
65651 @@ -83,6 +83,7 @@ struct linux_binfmt {
65652 int (*load_binary)(struct linux_binprm *, struct pt_regs * regs);
65653 int (*load_shlib)(struct file *);
65654 int (*core_dump)(long signr, struct pt_regs *regs, struct file *file, unsigned long limit);
65655 + void (*handle_mprotect)(struct vm_area_struct *vma, unsigned long newflags);
65656 unsigned long min_coredump; /* minimal dump size */
65657 int hasvdso;
65658 };
65659 diff --git a/include/linux/blkdev.h b/include/linux/blkdev.h
65660 index a06bfab..a2906d2 100644
65661 --- a/include/linux/blkdev.h
65662 +++ b/include/linux/blkdev.h
65663 @@ -777,6 +777,9 @@ extern void blk_plug_device(struct request_queue *);
65664 extern void blk_plug_device_unlocked(struct request_queue *);
65665 extern int blk_remove_plug(struct request_queue *);
65666 extern void blk_recount_segments(struct request_queue *, struct bio *);
65667 +extern int scsi_verify_blk_ioctl(struct block_device *, unsigned int);
65668 +extern int scsi_cmd_blk_ioctl(struct block_device *, fmode_t,
65669 + unsigned int, void __user *);
65670 extern int scsi_cmd_ioctl(struct request_queue *, struct gendisk *, fmode_t,
65671 unsigned int, void __user *);
65672 extern int sg_scsi_ioctl(struct request_queue *, struct gendisk *, fmode_t,
65673 @@ -1278,7 +1281,7 @@ struct block_device_operations {
65674 int (*revalidate_disk) (struct gendisk *);
65675 int (*getgeo)(struct block_device *, struct hd_geometry *);
65676 struct module *owner;
65677 -};
65678 +} __do_const;
65679
65680 extern int __blkdev_driver_ioctl(struct block_device *, fmode_t, unsigned int,
65681 unsigned long);
65682 diff --git a/include/linux/blktrace_api.h b/include/linux/blktrace_api.h
65683 index 3b73b99..629d21b 100644
65684 --- a/include/linux/blktrace_api.h
65685 +++ b/include/linux/blktrace_api.h
65686 @@ -160,7 +160,7 @@ struct blk_trace {
65687 struct dentry *dir;
65688 struct dentry *dropped_file;
65689 struct dentry *msg_file;
65690 - atomic_t dropped;
65691 + atomic_unchecked_t dropped;
65692 };
65693
65694 extern int blk_trace_ioctl(struct block_device *, unsigned, char __user *);
65695 diff --git a/include/linux/byteorder/little_endian.h b/include/linux/byteorder/little_endian.h
65696 index 83195fb..0b0f77d 100644
65697 --- a/include/linux/byteorder/little_endian.h
65698 +++ b/include/linux/byteorder/little_endian.h
65699 @@ -42,51 +42,51 @@
65700
65701 static inline __le64 __cpu_to_le64p(const __u64 *p)
65702 {
65703 - return (__force __le64)*p;
65704 + return (__force const __le64)*p;
65705 }
65706 static inline __u64 __le64_to_cpup(const __le64 *p)
65707 {
65708 - return (__force __u64)*p;
65709 + return (__force const __u64)*p;
65710 }
65711 static inline __le32 __cpu_to_le32p(const __u32 *p)
65712 {
65713 - return (__force __le32)*p;
65714 + return (__force const __le32)*p;
65715 }
65716 static inline __u32 __le32_to_cpup(const __le32 *p)
65717 {
65718 - return (__force __u32)*p;
65719 + return (__force const __u32)*p;
65720 }
65721 static inline __le16 __cpu_to_le16p(const __u16 *p)
65722 {
65723 - return (__force __le16)*p;
65724 + return (__force const __le16)*p;
65725 }
65726 static inline __u16 __le16_to_cpup(const __le16 *p)
65727 {
65728 - return (__force __u16)*p;
65729 + return (__force const __u16)*p;
65730 }
65731 static inline __be64 __cpu_to_be64p(const __u64 *p)
65732 {
65733 - return (__force __be64)__swab64p(p);
65734 + return (__force const __be64)__swab64p(p);
65735 }
65736 static inline __u64 __be64_to_cpup(const __be64 *p)
65737 {
65738 - return __swab64p((__u64 *)p);
65739 + return __swab64p((const __u64 *)p);
65740 }
65741 static inline __be32 __cpu_to_be32p(const __u32 *p)
65742 {
65743 - return (__force __be32)__swab32p(p);
65744 + return (__force const __be32)__swab32p(p);
65745 }
65746 static inline __u32 __be32_to_cpup(const __be32 *p)
65747 {
65748 - return __swab32p((__u32 *)p);
65749 + return __swab32p((const __u32 *)p);
65750 }
65751 static inline __be16 __cpu_to_be16p(const __u16 *p)
65752 {
65753 - return (__force __be16)__swab16p(p);
65754 + return (__force const __be16)__swab16p(p);
65755 }
65756 static inline __u16 __be16_to_cpup(const __be16 *p)
65757 {
65758 - return __swab16p((__u16 *)p);
65759 + return __swab16p((const __u16 *)p);
65760 }
65761 #define __cpu_to_le64s(x) do { (void)(x); } while (0)
65762 #define __le64_to_cpus(x) do { (void)(x); } while (0)
65763 diff --git a/include/linux/cache.h b/include/linux/cache.h
65764 index 97e2488..e7576b9 100644
65765 --- a/include/linux/cache.h
65766 +++ b/include/linux/cache.h
65767 @@ -16,6 +16,10 @@
65768 #define __read_mostly
65769 #endif
65770
65771 +#ifndef __read_only
65772 +#define __read_only __read_mostly
65773 +#endif
65774 +
65775 #ifndef ____cacheline_aligned
65776 #define ____cacheline_aligned __attribute__((__aligned__(SMP_CACHE_BYTES)))
65777 #endif
65778 diff --git a/include/linux/capability.h b/include/linux/capability.h
65779 index c8f2a5f7..1618a5c 100644
65780 --- a/include/linux/capability.h
65781 +++ b/include/linux/capability.h
65782 @@ -563,6 +563,7 @@ extern const kernel_cap_t __cap_init_eff_set;
65783 (security_real_capable_noaudit((t), (cap)) == 0)
65784
65785 extern int capable(int cap);
65786 +int capable_nolog(int cap);
65787
65788 /* audit system wants to get cap info from files as well */
65789 struct dentry;
65790 diff --git a/include/linux/compiler-gcc4.h b/include/linux/compiler-gcc4.h
65791 index 450fa59..86019fb 100644
65792 --- a/include/linux/compiler-gcc4.h
65793 +++ b/include/linux/compiler-gcc4.h
65794 @@ -36,4 +36,16 @@
65795 the kernel context */
65796 #define __cold __attribute__((__cold__))
65797
65798 +#define __alloc_size(...) __attribute((alloc_size(__VA_ARGS__)))
65799 +#define __bos(ptr, arg) __builtin_object_size((ptr), (arg))
65800 +#define __bos0(ptr) __bos((ptr), 0)
65801 +#define __bos1(ptr) __bos((ptr), 1)
65802 +
65803 +#if __GNUC_MINOR__ >= 5
65804 +#ifdef CONSTIFY_PLUGIN
65805 +#define __no_const __attribute__((no_const))
65806 +#define __do_const __attribute__((do_const))
65807 +#endif
65808 +#endif
65809 +
65810 #endif
65811 diff --git a/include/linux/compiler.h b/include/linux/compiler.h
65812 index 04fb513..fd6477b 100644
65813 --- a/include/linux/compiler.h
65814 +++ b/include/linux/compiler.h
65815 @@ -5,11 +5,14 @@
65816
65817 #ifdef __CHECKER__
65818 # define __user __attribute__((noderef, address_space(1)))
65819 +# define __force_user __force __user
65820 # define __kernel /* default address space */
65821 +# define __force_kernel __force __kernel
65822 # define __safe __attribute__((safe))
65823 # define __force __attribute__((force))
65824 # define __nocast __attribute__((nocast))
65825 # define __iomem __attribute__((noderef, address_space(2)))
65826 +# define __force_iomem __force __iomem
65827 # define __acquires(x) __attribute__((context(x,0,1)))
65828 # define __releases(x) __attribute__((context(x,1,0)))
65829 # define __acquire(x) __context__(x,1)
65830 @@ -17,13 +20,34 @@
65831 # define __cond_lock(x,c) ((c) ? ({ __acquire(x); 1; }) : 0)
65832 extern void __chk_user_ptr(const volatile void __user *);
65833 extern void __chk_io_ptr(const volatile void __iomem *);
65834 +#elif defined(CHECKER_PLUGIN)
65835 +//# define __user
65836 +//# define __force_user
65837 +//# define __kernel
65838 +//# define __force_kernel
65839 +# define __safe
65840 +# define __force
65841 +# define __nocast
65842 +# define __iomem
65843 +# define __force_iomem
65844 +# define __chk_user_ptr(x) (void)0
65845 +# define __chk_io_ptr(x) (void)0
65846 +# define __builtin_warning(x, y...) (1)
65847 +# define __acquires(x)
65848 +# define __releases(x)
65849 +# define __acquire(x) (void)0
65850 +# define __release(x) (void)0
65851 +# define __cond_lock(x,c) (c)
65852 #else
65853 # define __user
65854 +# define __force_user
65855 # define __kernel
65856 +# define __force_kernel
65857 # define __safe
65858 # define __force
65859 # define __nocast
65860 # define __iomem
65861 +# define __force_iomem
65862 # define __chk_user_ptr(x) (void)0
65863 # define __chk_io_ptr(x) (void)0
65864 # define __builtin_warning(x, y...) (1)
65865 @@ -247,6 +271,14 @@ void ftrace_likely_update(struct ftrace_branch_data *f, int val, int expect);
65866 # define __attribute_const__ /* unimplemented */
65867 #endif
65868
65869 +#ifndef __no_const
65870 +# define __no_const
65871 +#endif
65872 +
65873 +#ifndef __do_const
65874 +# define __do_const
65875 +#endif
65876 +
65877 /*
65878 * Tell gcc if a function is cold. The compiler will assume any path
65879 * directly leading to the call is unlikely.
65880 @@ -256,6 +288,22 @@ void ftrace_likely_update(struct ftrace_branch_data *f, int val, int expect);
65881 #define __cold
65882 #endif
65883
65884 +#ifndef __alloc_size
65885 +#define __alloc_size(...)
65886 +#endif
65887 +
65888 +#ifndef __bos
65889 +#define __bos(ptr, arg)
65890 +#endif
65891 +
65892 +#ifndef __bos0
65893 +#define __bos0(ptr)
65894 +#endif
65895 +
65896 +#ifndef __bos1
65897 +#define __bos1(ptr)
65898 +#endif
65899 +
65900 /* Simple shorthand for a section definition */
65901 #ifndef __section
65902 # define __section(S) __attribute__ ((__section__(#S)))
65903 @@ -278,6 +326,7 @@ void ftrace_likely_update(struct ftrace_branch_data *f, int val, int expect);
65904 * use is to mediate communication between process-level code and irq/NMI
65905 * handlers, all running on the same CPU.
65906 */
65907 -#define ACCESS_ONCE(x) (*(volatile typeof(x) *)&(x))
65908 +#define ACCESS_ONCE(x) (*(volatile const typeof(x) *)&(x))
65909 +#define ACCESS_ONCE_RW(x) (*(volatile typeof(x) *)&(x))
65910
65911 #endif /* __LINUX_COMPILER_H */
65912 diff --git a/include/linux/crypto.h b/include/linux/crypto.h
65913 index fd92988..a3164bd 100644
65914 --- a/include/linux/crypto.h
65915 +++ b/include/linux/crypto.h
65916 @@ -394,7 +394,7 @@ struct cipher_tfm {
65917 const u8 *key, unsigned int keylen);
65918 void (*cit_encrypt_one)(struct crypto_tfm *tfm, u8 *dst, const u8 *src);
65919 void (*cit_decrypt_one)(struct crypto_tfm *tfm, u8 *dst, const u8 *src);
65920 -};
65921 +} __no_const;
65922
65923 struct hash_tfm {
65924 int (*init)(struct hash_desc *desc);
65925 @@ -415,13 +415,13 @@ struct compress_tfm {
65926 int (*cot_decompress)(struct crypto_tfm *tfm,
65927 const u8 *src, unsigned int slen,
65928 u8 *dst, unsigned int *dlen);
65929 -};
65930 +} __no_const;
65931
65932 struct rng_tfm {
65933 int (*rng_gen_random)(struct crypto_rng *tfm, u8 *rdata,
65934 unsigned int dlen);
65935 int (*rng_reset)(struct crypto_rng *tfm, u8 *seed, unsigned int slen);
65936 -};
65937 +} __no_const;
65938
65939 #define crt_ablkcipher crt_u.ablkcipher
65940 #define crt_aead crt_u.aead
65941 diff --git a/include/linux/dcache.h b/include/linux/dcache.h
65942 index 30b93b2..cd7a8db 100644
65943 --- a/include/linux/dcache.h
65944 +++ b/include/linux/dcache.h
65945 @@ -119,6 +119,8 @@ struct dentry {
65946 unsigned char d_iname[DNAME_INLINE_LEN_MIN]; /* small names */
65947 };
65948
65949 +#define DNAME_INLINE_LEN (sizeof(struct dentry)-offsetof(struct dentry,d_iname))
65950 +
65951 /*
65952 * dentry->d_lock spinlock nesting subclasses:
65953 *
65954 diff --git a/include/linux/decompress/mm.h b/include/linux/decompress/mm.h
65955 index 3e9bd6a..f4e1aa0 100644
65956 --- a/include/linux/decompress/mm.h
65957 +++ b/include/linux/decompress/mm.h
65958 @@ -78,7 +78,7 @@ static void free(void *where)
65959 * warnings when not needed (indeed large_malloc / large_free are not
65960 * needed by inflate */
65961
65962 -#define malloc(a) kmalloc(a, GFP_KERNEL)
65963 +#define malloc(a) kmalloc((a), GFP_KERNEL)
65964 #define free(a) kfree(a)
65965
65966 #define large_malloc(a) vmalloc(a)
65967 diff --git a/include/linux/dma-mapping.h b/include/linux/dma-mapping.h
65968 index 91b7618..92a93d32 100644
65969 --- a/include/linux/dma-mapping.h
65970 +++ b/include/linux/dma-mapping.h
65971 @@ -16,51 +16,51 @@ enum dma_data_direction {
65972 };
65973
65974 struct dma_map_ops {
65975 - void* (*alloc_coherent)(struct device *dev, size_t size,
65976 + void* (* const alloc_coherent)(struct device *dev, size_t size,
65977 dma_addr_t *dma_handle, gfp_t gfp);
65978 - void (*free_coherent)(struct device *dev, size_t size,
65979 + void (* const free_coherent)(struct device *dev, size_t size,
65980 void *vaddr, dma_addr_t dma_handle);
65981 - dma_addr_t (*map_page)(struct device *dev, struct page *page,
65982 + dma_addr_t (* const map_page)(struct device *dev, struct page *page,
65983 unsigned long offset, size_t size,
65984 enum dma_data_direction dir,
65985 struct dma_attrs *attrs);
65986 - void (*unmap_page)(struct device *dev, dma_addr_t dma_handle,
65987 + void (* const unmap_page)(struct device *dev, dma_addr_t dma_handle,
65988 size_t size, enum dma_data_direction dir,
65989 struct dma_attrs *attrs);
65990 - int (*map_sg)(struct device *dev, struct scatterlist *sg,
65991 + int (* const map_sg)(struct device *dev, struct scatterlist *sg,
65992 int nents, enum dma_data_direction dir,
65993 struct dma_attrs *attrs);
65994 - void (*unmap_sg)(struct device *dev,
65995 + void (* const unmap_sg)(struct device *dev,
65996 struct scatterlist *sg, int nents,
65997 enum dma_data_direction dir,
65998 struct dma_attrs *attrs);
65999 - void (*sync_single_for_cpu)(struct device *dev,
66000 + void (* const sync_single_for_cpu)(struct device *dev,
66001 dma_addr_t dma_handle, size_t size,
66002 enum dma_data_direction dir);
66003 - void (*sync_single_for_device)(struct device *dev,
66004 + void (* const sync_single_for_device)(struct device *dev,
66005 dma_addr_t dma_handle, size_t size,
66006 enum dma_data_direction dir);
66007 - void (*sync_single_range_for_cpu)(struct device *dev,
66008 + void (* const sync_single_range_for_cpu)(struct device *dev,
66009 dma_addr_t dma_handle,
66010 unsigned long offset,
66011 size_t size,
66012 enum dma_data_direction dir);
66013 - void (*sync_single_range_for_device)(struct device *dev,
66014 + void (* const sync_single_range_for_device)(struct device *dev,
66015 dma_addr_t dma_handle,
66016 unsigned long offset,
66017 size_t size,
66018 enum dma_data_direction dir);
66019 - void (*sync_sg_for_cpu)(struct device *dev,
66020 + void (* const sync_sg_for_cpu)(struct device *dev,
66021 struct scatterlist *sg, int nents,
66022 enum dma_data_direction dir);
66023 - void (*sync_sg_for_device)(struct device *dev,
66024 + void (* const sync_sg_for_device)(struct device *dev,
66025 struct scatterlist *sg, int nents,
66026 enum dma_data_direction dir);
66027 - int (*mapping_error)(struct device *dev, dma_addr_t dma_addr);
66028 - int (*dma_supported)(struct device *dev, u64 mask);
66029 + int (* const mapping_error)(struct device *dev, dma_addr_t dma_addr);
66030 + int (* const dma_supported)(struct device *dev, u64 mask);
66031 int (*set_dma_mask)(struct device *dev, u64 mask);
66032 int is_phys;
66033 -};
66034 +} __do_const;
66035
66036 #define DMA_BIT_MASK(n) (((n) == 64) ? ~0ULL : ((1ULL<<(n))-1))
66037
66038 diff --git a/include/linux/dst.h b/include/linux/dst.h
66039 index e26fed8..b976d9f 100644
66040 --- a/include/linux/dst.h
66041 +++ b/include/linux/dst.h
66042 @@ -380,7 +380,7 @@ struct dst_node
66043 struct thread_pool *pool;
66044
66045 /* Transaction IDs live here */
66046 - atomic_long_t gen;
66047 + atomic_long_unchecked_t gen;
66048
66049 /*
66050 * How frequently and how many times transaction
66051 diff --git a/include/linux/elf.h b/include/linux/elf.h
66052 index 90a4ed0..d652617 100644
66053 --- a/include/linux/elf.h
66054 +++ b/include/linux/elf.h
66055 @@ -49,6 +49,17 @@ typedef __s64 Elf64_Sxword;
66056 #define PT_GNU_EH_FRAME 0x6474e550
66057
66058 #define PT_GNU_STACK (PT_LOOS + 0x474e551)
66059 +#define PT_GNU_RELRO (PT_LOOS + 0x474e552)
66060 +
66061 +#define PT_PAX_FLAGS (PT_LOOS + 0x5041580)
66062 +
66063 +/* Constants for the e_flags field */
66064 +#define EF_PAX_PAGEEXEC 1 /* Paging based non-executable pages */
66065 +#define EF_PAX_EMUTRAMP 2 /* Emulate trampolines */
66066 +#define EF_PAX_MPROTECT 4 /* Restrict mprotect() */
66067 +#define EF_PAX_RANDMMAP 8 /* Randomize mmap() base */
66068 +/*#define EF_PAX_RANDEXEC 16*/ /* Randomize ET_EXEC base */
66069 +#define EF_PAX_SEGMEXEC 32 /* Segmentation based non-executable pages */
66070
66071 /* These constants define the different elf file types */
66072 #define ET_NONE 0
66073 @@ -84,6 +95,8 @@ typedef __s64 Elf64_Sxword;
66074 #define DT_DEBUG 21
66075 #define DT_TEXTREL 22
66076 #define DT_JMPREL 23
66077 +#define DT_FLAGS 30
66078 + #define DF_TEXTREL 0x00000004
66079 #define DT_ENCODING 32
66080 #define OLD_DT_LOOS 0x60000000
66081 #define DT_LOOS 0x6000000d
66082 @@ -230,6 +243,19 @@ typedef struct elf64_hdr {
66083 #define PF_W 0x2
66084 #define PF_X 0x1
66085
66086 +#define PF_PAGEEXEC (1U << 4) /* Enable PAGEEXEC */
66087 +#define PF_NOPAGEEXEC (1U << 5) /* Disable PAGEEXEC */
66088 +#define PF_SEGMEXEC (1U << 6) /* Enable SEGMEXEC */
66089 +#define PF_NOSEGMEXEC (1U << 7) /* Disable SEGMEXEC */
66090 +#define PF_MPROTECT (1U << 8) /* Enable MPROTECT */
66091 +#define PF_NOMPROTECT (1U << 9) /* Disable MPROTECT */
66092 +/*#define PF_RANDEXEC (1U << 10)*/ /* Enable RANDEXEC */
66093 +/*#define PF_NORANDEXEC (1U << 11)*/ /* Disable RANDEXEC */
66094 +#define PF_EMUTRAMP (1U << 12) /* Enable EMUTRAMP */
66095 +#define PF_NOEMUTRAMP (1U << 13) /* Disable EMUTRAMP */
66096 +#define PF_RANDMMAP (1U << 14) /* Enable RANDMMAP */
66097 +#define PF_NORANDMMAP (1U << 15) /* Disable RANDMMAP */
66098 +
66099 typedef struct elf32_phdr{
66100 Elf32_Word p_type;
66101 Elf32_Off p_offset;
66102 @@ -322,6 +348,8 @@ typedef struct elf64_shdr {
66103 #define EI_OSABI 7
66104 #define EI_PAD 8
66105
66106 +#define EI_PAX 14
66107 +
66108 #define ELFMAG0 0x7f /* EI_MAG */
66109 #define ELFMAG1 'E'
66110 #define ELFMAG2 'L'
66111 @@ -386,6 +414,7 @@ extern Elf32_Dyn _DYNAMIC [];
66112 #define elf_phdr elf32_phdr
66113 #define elf_note elf32_note
66114 #define elf_addr_t Elf32_Off
66115 +#define elf_dyn Elf32_Dyn
66116
66117 #else
66118
66119 @@ -394,6 +423,7 @@ extern Elf64_Dyn _DYNAMIC [];
66120 #define elf_phdr elf64_phdr
66121 #define elf_note elf64_note
66122 #define elf_addr_t Elf64_Off
66123 +#define elf_dyn Elf64_Dyn
66124
66125 #endif
66126
66127 diff --git a/include/linux/fs.h b/include/linux/fs.h
66128 index 1b9a47a..6fe2934 100644
66129 --- a/include/linux/fs.h
66130 +++ b/include/linux/fs.h
66131 @@ -568,41 +568,41 @@ typedef int (*read_actor_t)(read_descriptor_t *, struct page *,
66132 unsigned long, unsigned long);
66133
66134 struct address_space_operations {
66135 - int (*writepage)(struct page *page, struct writeback_control *wbc);
66136 - int (*readpage)(struct file *, struct page *);
66137 - void (*sync_page)(struct page *);
66138 + int (* const writepage)(struct page *page, struct writeback_control *wbc);
66139 + int (* const readpage)(struct file *, struct page *);
66140 + void (* const sync_page)(struct page *);
66141
66142 /* Write back some dirty pages from this mapping. */
66143 - int (*writepages)(struct address_space *, struct writeback_control *);
66144 + int (* const writepages)(struct address_space *, struct writeback_control *);
66145
66146 /* Set a page dirty. Return true if this dirtied it */
66147 - int (*set_page_dirty)(struct page *page);
66148 + int (* const set_page_dirty)(struct page *page);
66149
66150 - int (*readpages)(struct file *filp, struct address_space *mapping,
66151 + int (* const readpages)(struct file *filp, struct address_space *mapping,
66152 struct list_head *pages, unsigned nr_pages);
66153
66154 - int (*write_begin)(struct file *, struct address_space *mapping,
66155 + int (* const write_begin)(struct file *, struct address_space *mapping,
66156 loff_t pos, unsigned len, unsigned flags,
66157 struct page **pagep, void **fsdata);
66158 - int (*write_end)(struct file *, struct address_space *mapping,
66159 + int (* const write_end)(struct file *, struct address_space *mapping,
66160 loff_t pos, unsigned len, unsigned copied,
66161 struct page *page, void *fsdata);
66162
66163 /* Unfortunately this kludge is needed for FIBMAP. Don't use it */
66164 - sector_t (*bmap)(struct address_space *, sector_t);
66165 - void (*invalidatepage) (struct page *, unsigned long);
66166 - int (*releasepage) (struct page *, gfp_t);
66167 - ssize_t (*direct_IO)(int, struct kiocb *, const struct iovec *iov,
66168 + sector_t (* const bmap)(struct address_space *, sector_t);
66169 + void (* const invalidatepage) (struct page *, unsigned long);
66170 + int (* const releasepage) (struct page *, gfp_t);
66171 + ssize_t (* const direct_IO)(int, struct kiocb *, const struct iovec *iov,
66172 loff_t offset, unsigned long nr_segs);
66173 - int (*get_xip_mem)(struct address_space *, pgoff_t, int,
66174 + int (* const get_xip_mem)(struct address_space *, pgoff_t, int,
66175 void **, unsigned long *);
66176 /* migrate the contents of a page to the specified target */
66177 - int (*migratepage) (struct address_space *,
66178 + int (* const migratepage) (struct address_space *,
66179 struct page *, struct page *);
66180 - int (*launder_page) (struct page *);
66181 - int (*is_partially_uptodate) (struct page *, read_descriptor_t *,
66182 + int (* const launder_page) (struct page *);
66183 + int (* const is_partially_uptodate) (struct page *, read_descriptor_t *,
66184 unsigned long);
66185 - int (*error_remove_page)(struct address_space *, struct page *);
66186 + int (* const error_remove_page)(struct address_space *, struct page *);
66187 };
66188
66189 /*
66190 @@ -1031,19 +1031,19 @@ static inline int file_check_writeable(struct file *filp)
66191 typedef struct files_struct *fl_owner_t;
66192
66193 struct file_lock_operations {
66194 - void (*fl_copy_lock)(struct file_lock *, struct file_lock *);
66195 - void (*fl_release_private)(struct file_lock *);
66196 + void (* const fl_copy_lock)(struct file_lock *, struct file_lock *);
66197 + void (* const fl_release_private)(struct file_lock *);
66198 };
66199
66200 struct lock_manager_operations {
66201 - int (*fl_compare_owner)(struct file_lock *, struct file_lock *);
66202 - void (*fl_notify)(struct file_lock *); /* unblock callback */
66203 - int (*fl_grant)(struct file_lock *, struct file_lock *, int);
66204 - void (*fl_copy_lock)(struct file_lock *, struct file_lock *);
66205 - void (*fl_release_private)(struct file_lock *);
66206 - void (*fl_break)(struct file_lock *);
66207 - int (*fl_mylease)(struct file_lock *, struct file_lock *);
66208 - int (*fl_change)(struct file_lock **, int);
66209 + int (* const fl_compare_owner)(struct file_lock *, struct file_lock *);
66210 + void (* const fl_notify)(struct file_lock *); /* unblock callback */
66211 + int (* const fl_grant)(struct file_lock *, struct file_lock *, int);
66212 + void (* const fl_copy_lock)(struct file_lock *, struct file_lock *);
66213 + void (* const fl_release_private)(struct file_lock *);
66214 + void (* const fl_break)(struct file_lock *);
66215 + int (* const fl_mylease)(struct file_lock *, struct file_lock *);
66216 + int (* const fl_change)(struct file_lock **, int);
66217 };
66218
66219 struct lock_manager {
66220 @@ -1442,7 +1442,7 @@ struct fiemap_extent_info {
66221 unsigned int fi_flags; /* Flags as passed from user */
66222 unsigned int fi_extents_mapped; /* Number of mapped extents */
66223 unsigned int fi_extents_max; /* Size of fiemap_extent array */
66224 - struct fiemap_extent *fi_extents_start; /* Start of fiemap_extent
66225 + struct fiemap_extent __user *fi_extents_start; /* Start of fiemap_extent
66226 * array */
66227 };
66228 int fiemap_fill_next_extent(struct fiemap_extent_info *info, u64 logical,
66229 @@ -1512,7 +1512,8 @@ struct file_operations {
66230 ssize_t (*splice_write)(struct pipe_inode_info *, struct file *, loff_t *, size_t, unsigned int);
66231 ssize_t (*splice_read)(struct file *, loff_t *, struct pipe_inode_info *, size_t, unsigned int);
66232 int (*setlease)(struct file *, long, struct file_lock **);
66233 -};
66234 +} __do_const;
66235 +typedef struct file_operations __no_const file_operations_no_const;
66236
66237 struct inode_operations {
66238 int (*create) (struct inode *,struct dentry *,int, struct nameidata *);
66239 @@ -1559,30 +1560,30 @@ extern ssize_t vfs_writev(struct file *, const struct iovec __user *,
66240 unsigned long, loff_t *);
66241
66242 struct super_operations {
66243 - struct inode *(*alloc_inode)(struct super_block *sb);
66244 - void (*destroy_inode)(struct inode *);
66245 + struct inode *(* const alloc_inode)(struct super_block *sb);
66246 + void (* const destroy_inode)(struct inode *);
66247
66248 - void (*dirty_inode) (struct inode *);
66249 - int (*write_inode) (struct inode *, int);
66250 - void (*drop_inode) (struct inode *);
66251 - void (*delete_inode) (struct inode *);
66252 - void (*put_super) (struct super_block *);
66253 - void (*write_super) (struct super_block *);
66254 - int (*sync_fs)(struct super_block *sb, int wait);
66255 - int (*freeze_fs) (struct super_block *);
66256 - int (*unfreeze_fs) (struct super_block *);
66257 - int (*statfs) (struct dentry *, struct kstatfs *);
66258 - int (*remount_fs) (struct super_block *, int *, char *);
66259 - void (*clear_inode) (struct inode *);
66260 - void (*umount_begin) (struct super_block *);
66261 + void (* const dirty_inode) (struct inode *);
66262 + int (* const write_inode) (struct inode *, int);
66263 + void (* const drop_inode) (struct inode *);
66264 + void (* const delete_inode) (struct inode *);
66265 + void (* const put_super) (struct super_block *);
66266 + void (* const write_super) (struct super_block *);
66267 + int (* const sync_fs)(struct super_block *sb, int wait);
66268 + int (* const freeze_fs) (struct super_block *);
66269 + int (* const unfreeze_fs) (struct super_block *);
66270 + int (* const statfs) (struct dentry *, struct kstatfs *);
66271 + int (* const remount_fs) (struct super_block *, int *, char *);
66272 + void (* const clear_inode) (struct inode *);
66273 + void (* const umount_begin) (struct super_block *);
66274
66275 - int (*show_options)(struct seq_file *, struct vfsmount *);
66276 - int (*show_stats)(struct seq_file *, struct vfsmount *);
66277 + int (* const show_options)(struct seq_file *, struct vfsmount *);
66278 + int (* const show_stats)(struct seq_file *, struct vfsmount *);
66279 #ifdef CONFIG_QUOTA
66280 - ssize_t (*quota_read)(struct super_block *, int, char *, size_t, loff_t);
66281 - ssize_t (*quota_write)(struct super_block *, int, const char *, size_t, loff_t);
66282 + ssize_t (* const quota_read)(struct super_block *, int, char *, size_t, loff_t);
66283 + ssize_t (* const quota_write)(struct super_block *, int, const char *, size_t, loff_t);
66284 #endif
66285 - int (*bdev_try_to_free_page)(struct super_block*, struct page*, gfp_t);
66286 + int (* const bdev_try_to_free_page)(struct super_block*, struct page*, gfp_t);
66287 };
66288
66289 /*
66290 diff --git a/include/linux/fs_struct.h b/include/linux/fs_struct.h
66291 index 78a05bf..2a7d3e1 100644
66292 --- a/include/linux/fs_struct.h
66293 +++ b/include/linux/fs_struct.h
66294 @@ -4,7 +4,7 @@
66295 #include <linux/path.h>
66296
66297 struct fs_struct {
66298 - int users;
66299 + atomic_t users;
66300 rwlock_t lock;
66301 int umask;
66302 int in_exec;
66303 diff --git a/include/linux/fscache-cache.h b/include/linux/fscache-cache.h
66304 index 7be0c6f..2f63a2b 100644
66305 --- a/include/linux/fscache-cache.h
66306 +++ b/include/linux/fscache-cache.h
66307 @@ -116,7 +116,7 @@ struct fscache_operation {
66308 #endif
66309 };
66310
66311 -extern atomic_t fscache_op_debug_id;
66312 +extern atomic_unchecked_t fscache_op_debug_id;
66313 extern const struct slow_work_ops fscache_op_slow_work_ops;
66314
66315 extern void fscache_enqueue_operation(struct fscache_operation *);
66316 @@ -134,7 +134,7 @@ static inline void fscache_operation_init(struct fscache_operation *op,
66317 fscache_operation_release_t release)
66318 {
66319 atomic_set(&op->usage, 1);
66320 - op->debug_id = atomic_inc_return(&fscache_op_debug_id);
66321 + op->debug_id = atomic_inc_return_unchecked(&fscache_op_debug_id);
66322 op->release = release;
66323 INIT_LIST_HEAD(&op->pend_link);
66324 fscache_set_op_state(op, "Init");
66325 diff --git a/include/linux/fsnotify_backend.h b/include/linux/fsnotify_backend.h
66326 index 4d6f47b..00bcedb 100644
66327 --- a/include/linux/fsnotify_backend.h
66328 +++ b/include/linux/fsnotify_backend.h
66329 @@ -86,6 +86,7 @@ struct fsnotify_ops {
66330 void (*freeing_mark)(struct fsnotify_mark_entry *entry, struct fsnotify_group *group);
66331 void (*free_event_priv)(struct fsnotify_event_private_data *priv);
66332 };
66333 +typedef struct fsnotify_ops __no_const fsnotify_ops_no_const;
66334
66335 /*
66336 * A group is a "thing" that wants to receive notification about filesystem
66337 diff --git a/include/linux/ftrace_event.h b/include/linux/ftrace_event.h
66338 index 4ec5e67..42f1eb9 100644
66339 --- a/include/linux/ftrace_event.h
66340 +++ b/include/linux/ftrace_event.h
66341 @@ -163,7 +163,7 @@ extern int trace_define_field(struct ftrace_event_call *call,
66342 int filter_type);
66343 extern int trace_define_common_fields(struct ftrace_event_call *call);
66344
66345 -#define is_signed_type(type) (((type)(-1)) < 0)
66346 +#define is_signed_type(type) (((type)(-1)) < (type)1)
66347
66348 int trace_set_clr_event(const char *system, const char *event, int set);
66349
66350 diff --git a/include/linux/genhd.h b/include/linux/genhd.h
66351 index 297df45..b6a74ff 100644
66352 --- a/include/linux/genhd.h
66353 +++ b/include/linux/genhd.h
66354 @@ -161,7 +161,7 @@ struct gendisk {
66355
66356 struct timer_rand_state *random;
66357
66358 - atomic_t sync_io; /* RAID */
66359 + atomic_unchecked_t sync_io; /* RAID */
66360 struct work_struct async_notify;
66361 #ifdef CONFIG_BLK_DEV_INTEGRITY
66362 struct blk_integrity *integrity;
66363 diff --git a/include/linux/gracl.h b/include/linux/gracl.h
66364 new file mode 100644
66365 index 0000000..0dc3943
66366 --- /dev/null
66367 +++ b/include/linux/gracl.h
66368 @@ -0,0 +1,317 @@
66369 +#ifndef GR_ACL_H
66370 +#define GR_ACL_H
66371 +
66372 +#include <linux/grdefs.h>
66373 +#include <linux/resource.h>
66374 +#include <linux/capability.h>
66375 +#include <linux/dcache.h>
66376 +#include <asm/resource.h>
66377 +
66378 +/* Major status information */
66379 +
66380 +#define GR_VERSION "grsecurity 2.2.2"
66381 +#define GRSECURITY_VERSION 0x2202
66382 +
66383 +enum {
66384 + GR_SHUTDOWN = 0,
66385 + GR_ENABLE = 1,
66386 + GR_SPROLE = 2,
66387 + GR_RELOAD = 3,
66388 + GR_SEGVMOD = 4,
66389 + GR_STATUS = 5,
66390 + GR_UNSPROLE = 6,
66391 + GR_PASSSET = 7,
66392 + GR_SPROLEPAM = 8,
66393 +};
66394 +
66395 +/* Password setup definitions
66396 + * kernel/grhash.c */
66397 +enum {
66398 + GR_PW_LEN = 128,
66399 + GR_SALT_LEN = 16,
66400 + GR_SHA_LEN = 32,
66401 +};
66402 +
66403 +enum {
66404 + GR_SPROLE_LEN = 64,
66405 +};
66406 +
66407 +enum {
66408 + GR_NO_GLOB = 0,
66409 + GR_REG_GLOB,
66410 + GR_CREATE_GLOB
66411 +};
66412 +
66413 +#define GR_NLIMITS 32
66414 +
66415 +/* Begin Data Structures */
66416 +
66417 +struct sprole_pw {
66418 + unsigned char *rolename;
66419 + unsigned char salt[GR_SALT_LEN];
66420 + unsigned char sum[GR_SHA_LEN]; /* 256-bit SHA hash of the password */
66421 +};
66422 +
66423 +struct name_entry {
66424 + __u32 key;
66425 + ino_t inode;
66426 + dev_t device;
66427 + char *name;
66428 + __u16 len;
66429 + __u8 deleted;
66430 + struct name_entry *prev;
66431 + struct name_entry *next;
66432 +};
66433 +
66434 +struct inodev_entry {
66435 + struct name_entry *nentry;
66436 + struct inodev_entry *prev;
66437 + struct inodev_entry *next;
66438 +};
66439 +
66440 +struct acl_role_db {
66441 + struct acl_role_label **r_hash;
66442 + __u32 r_size;
66443 +};
66444 +
66445 +struct inodev_db {
66446 + struct inodev_entry **i_hash;
66447 + __u32 i_size;
66448 +};
66449 +
66450 +struct name_db {
66451 + struct name_entry **n_hash;
66452 + __u32 n_size;
66453 +};
66454 +
66455 +struct crash_uid {
66456 + uid_t uid;
66457 + unsigned long expires;
66458 +};
66459 +
66460 +struct gr_hash_struct {
66461 + void **table;
66462 + void **nametable;
66463 + void *first;
66464 + __u32 table_size;
66465 + __u32 used_size;
66466 + int type;
66467 +};
66468 +
66469 +/* Userspace Grsecurity ACL data structures */
66470 +
66471 +struct acl_subject_label {
66472 + char *filename;
66473 + ino_t inode;
66474 + dev_t device;
66475 + __u32 mode;
66476 + kernel_cap_t cap_mask;
66477 + kernel_cap_t cap_lower;
66478 + kernel_cap_t cap_invert_audit;
66479 +
66480 + struct rlimit res[GR_NLIMITS];
66481 + __u32 resmask;
66482 +
66483 + __u8 user_trans_type;
66484 + __u8 group_trans_type;
66485 + uid_t *user_transitions;
66486 + gid_t *group_transitions;
66487 + __u16 user_trans_num;
66488 + __u16 group_trans_num;
66489 +
66490 + __u32 sock_families[2];
66491 + __u32 ip_proto[8];
66492 + __u32 ip_type;
66493 + struct acl_ip_label **ips;
66494 + __u32 ip_num;
66495 + __u32 inaddr_any_override;
66496 +
66497 + __u32 crashes;
66498 + unsigned long expires;
66499 +
66500 + struct acl_subject_label *parent_subject;
66501 + struct gr_hash_struct *hash;
66502 + struct acl_subject_label *prev;
66503 + struct acl_subject_label *next;
66504 +
66505 + struct acl_object_label **obj_hash;
66506 + __u32 obj_hash_size;
66507 + __u16 pax_flags;
66508 +};
66509 +
66510 +struct role_allowed_ip {
66511 + __u32 addr;
66512 + __u32 netmask;
66513 +
66514 + struct role_allowed_ip *prev;
66515 + struct role_allowed_ip *next;
66516 +};
66517 +
66518 +struct role_transition {
66519 + char *rolename;
66520 +
66521 + struct role_transition *prev;
66522 + struct role_transition *next;
66523 +};
66524 +
66525 +struct acl_role_label {
66526 + char *rolename;
66527 + uid_t uidgid;
66528 + __u16 roletype;
66529 +
66530 + __u16 auth_attempts;
66531 + unsigned long expires;
66532 +
66533 + struct acl_subject_label *root_label;
66534 + struct gr_hash_struct *hash;
66535 +
66536 + struct acl_role_label *prev;
66537 + struct acl_role_label *next;
66538 +
66539 + struct role_transition *transitions;
66540 + struct role_allowed_ip *allowed_ips;
66541 + uid_t *domain_children;
66542 + __u16 domain_child_num;
66543 +
66544 + struct acl_subject_label **subj_hash;
66545 + __u32 subj_hash_size;
66546 +};
66547 +
66548 +struct user_acl_role_db {
66549 + struct acl_role_label **r_table;
66550 + __u32 num_pointers; /* Number of allocations to track */
66551 + __u32 num_roles; /* Number of roles */
66552 + __u32 num_domain_children; /* Number of domain children */
66553 + __u32 num_subjects; /* Number of subjects */
66554 + __u32 num_objects; /* Number of objects */
66555 +};
66556 +
66557 +struct acl_object_label {
66558 + char *filename;
66559 + ino_t inode;
66560 + dev_t device;
66561 + __u32 mode;
66562 +
66563 + struct acl_subject_label *nested;
66564 + struct acl_object_label *globbed;
66565 +
66566 + /* next two structures not used */
66567 +
66568 + struct acl_object_label *prev;
66569 + struct acl_object_label *next;
66570 +};
66571 +
66572 +struct acl_ip_label {
66573 + char *iface;
66574 + __u32 addr;
66575 + __u32 netmask;
66576 + __u16 low, high;
66577 + __u8 mode;
66578 + __u32 type;
66579 + __u32 proto[8];
66580 +
66581 + /* next two structures not used */
66582 +
66583 + struct acl_ip_label *prev;
66584 + struct acl_ip_label *next;
66585 +};
66586 +
66587 +struct gr_arg {
66588 + struct user_acl_role_db role_db;
66589 + unsigned char pw[GR_PW_LEN];
66590 + unsigned char salt[GR_SALT_LEN];
66591 + unsigned char sum[GR_SHA_LEN];
66592 + unsigned char sp_role[GR_SPROLE_LEN];
66593 + struct sprole_pw *sprole_pws;
66594 + dev_t segv_device;
66595 + ino_t segv_inode;
66596 + uid_t segv_uid;
66597 + __u16 num_sprole_pws;
66598 + __u16 mode;
66599 +};
66600 +
66601 +struct gr_arg_wrapper {
66602 + struct gr_arg *arg;
66603 + __u32 version;
66604 + __u32 size;
66605 +};
66606 +
66607 +struct subject_map {
66608 + struct acl_subject_label *user;
66609 + struct acl_subject_label *kernel;
66610 + struct subject_map *prev;
66611 + struct subject_map *next;
66612 +};
66613 +
66614 +struct acl_subj_map_db {
66615 + struct subject_map **s_hash;
66616 + __u32 s_size;
66617 +};
66618 +
66619 +/* End Data Structures Section */
66620 +
66621 +/* Hash functions generated by empirical testing by Brad Spengler
66622 + Makes good use of the low bits of the inode. Generally 0-1 times
66623 + in loop for successful match. 0-3 for unsuccessful match.
66624 + Shift/add algorithm with modulus of table size and an XOR*/
66625 +
66626 +static __inline__ unsigned int
66627 +rhash(const uid_t uid, const __u16 type, const unsigned int sz)
66628 +{
66629 + return ((((uid + type) << (16 + type)) ^ uid) % sz);
66630 +}
66631 +
66632 + static __inline__ unsigned int
66633 +shash(const struct acl_subject_label *userp, const unsigned int sz)
66634 +{
66635 + return ((const unsigned long)userp % sz);
66636 +}
66637 +
66638 +static __inline__ unsigned int
66639 +fhash(const ino_t ino, const dev_t dev, const unsigned int sz)
66640 +{
66641 + return (((ino + dev) ^ ((ino << 13) + (ino << 23) + (dev << 9))) % sz);
66642 +}
66643 +
66644 +static __inline__ unsigned int
66645 +nhash(const char *name, const __u16 len, const unsigned int sz)
66646 +{
66647 + return full_name_hash((const unsigned char *)name, len) % sz;
66648 +}
66649 +
66650 +#define FOR_EACH_ROLE_START(role) \
66651 + role = role_list; \
66652 + while (role) {
66653 +
66654 +#define FOR_EACH_ROLE_END(role) \
66655 + role = role->prev; \
66656 + }
66657 +
66658 +#define FOR_EACH_SUBJECT_START(role,subj,iter) \
66659 + subj = NULL; \
66660 + iter = 0; \
66661 + while (iter < role->subj_hash_size) { \
66662 + if (subj == NULL) \
66663 + subj = role->subj_hash[iter]; \
66664 + if (subj == NULL) { \
66665 + iter++; \
66666 + continue; \
66667 + }
66668 +
66669 +#define FOR_EACH_SUBJECT_END(subj,iter) \
66670 + subj = subj->next; \
66671 + if (subj == NULL) \
66672 + iter++; \
66673 + }
66674 +
66675 +
66676 +#define FOR_EACH_NESTED_SUBJECT_START(role,subj) \
66677 + subj = role->hash->first; \
66678 + while (subj != NULL) {
66679 +
66680 +#define FOR_EACH_NESTED_SUBJECT_END(subj) \
66681 + subj = subj->next; \
66682 + }
66683 +
66684 +#endif
66685 +
66686 diff --git a/include/linux/gralloc.h b/include/linux/gralloc.h
66687 new file mode 100644
66688 index 0000000..323ecf2
66689 --- /dev/null
66690 +++ b/include/linux/gralloc.h
66691 @@ -0,0 +1,9 @@
66692 +#ifndef __GRALLOC_H
66693 +#define __GRALLOC_H
66694 +
66695 +void acl_free_all(void);
66696 +int acl_alloc_stack_init(unsigned long size);
66697 +void *acl_alloc(unsigned long len);
66698 +void *acl_alloc_num(unsigned long num, unsigned long len);
66699 +
66700 +#endif
66701 diff --git a/include/linux/grdefs.h b/include/linux/grdefs.h
66702 new file mode 100644
66703 index 0000000..70d6cd5
66704 --- /dev/null
66705 +++ b/include/linux/grdefs.h
66706 @@ -0,0 +1,140 @@
66707 +#ifndef GRDEFS_H
66708 +#define GRDEFS_H
66709 +
66710 +/* Begin grsecurity status declarations */
66711 +
66712 +enum {
66713 + GR_READY = 0x01,
66714 + GR_STATUS_INIT = 0x00 // disabled state
66715 +};
66716 +
66717 +/* Begin ACL declarations */
66718 +
66719 +/* Role flags */
66720 +
66721 +enum {
66722 + GR_ROLE_USER = 0x0001,
66723 + GR_ROLE_GROUP = 0x0002,
66724 + GR_ROLE_DEFAULT = 0x0004,
66725 + GR_ROLE_SPECIAL = 0x0008,
66726 + GR_ROLE_AUTH = 0x0010,
66727 + GR_ROLE_NOPW = 0x0020,
66728 + GR_ROLE_GOD = 0x0040,
66729 + GR_ROLE_LEARN = 0x0080,
66730 + GR_ROLE_TPE = 0x0100,
66731 + GR_ROLE_DOMAIN = 0x0200,
66732 + GR_ROLE_PAM = 0x0400,
66733 + GR_ROLE_PERSIST = 0x800
66734 +};
66735 +
66736 +/* ACL Subject and Object mode flags */
66737 +enum {
66738 + GR_DELETED = 0x80000000
66739 +};
66740 +
66741 +/* ACL Object-only mode flags */
66742 +enum {
66743 + GR_READ = 0x00000001,
66744 + GR_APPEND = 0x00000002,
66745 + GR_WRITE = 0x00000004,
66746 + GR_EXEC = 0x00000008,
66747 + GR_FIND = 0x00000010,
66748 + GR_INHERIT = 0x00000020,
66749 + GR_SETID = 0x00000040,
66750 + GR_CREATE = 0x00000080,
66751 + GR_DELETE = 0x00000100,
66752 + GR_LINK = 0x00000200,
66753 + GR_AUDIT_READ = 0x00000400,
66754 + GR_AUDIT_APPEND = 0x00000800,
66755 + GR_AUDIT_WRITE = 0x00001000,
66756 + GR_AUDIT_EXEC = 0x00002000,
66757 + GR_AUDIT_FIND = 0x00004000,
66758 + GR_AUDIT_INHERIT= 0x00008000,
66759 + GR_AUDIT_SETID = 0x00010000,
66760 + GR_AUDIT_CREATE = 0x00020000,
66761 + GR_AUDIT_DELETE = 0x00040000,
66762 + GR_AUDIT_LINK = 0x00080000,
66763 + GR_PTRACERD = 0x00100000,
66764 + GR_NOPTRACE = 0x00200000,
66765 + GR_SUPPRESS = 0x00400000,
66766 + GR_NOLEARN = 0x00800000,
66767 + GR_INIT_TRANSFER= 0x01000000
66768 +};
66769 +
66770 +#define GR_AUDITS (GR_AUDIT_READ | GR_AUDIT_WRITE | GR_AUDIT_APPEND | GR_AUDIT_EXEC | \
66771 + GR_AUDIT_FIND | GR_AUDIT_INHERIT | GR_AUDIT_SETID | \
66772 + GR_AUDIT_CREATE | GR_AUDIT_DELETE | GR_AUDIT_LINK)
66773 +
66774 +/* ACL subject-only mode flags */
66775 +enum {
66776 + GR_KILL = 0x00000001,
66777 + GR_VIEW = 0x00000002,
66778 + GR_PROTECTED = 0x00000004,
66779 + GR_LEARN = 0x00000008,
66780 + GR_OVERRIDE = 0x00000010,
66781 + /* just a placeholder, this mode is only used in userspace */
66782 + GR_DUMMY = 0x00000020,
66783 + GR_PROTSHM = 0x00000040,
66784 + GR_KILLPROC = 0x00000080,
66785 + GR_KILLIPPROC = 0x00000100,
66786 + /* just a placeholder, this mode is only used in userspace */
66787 + GR_NOTROJAN = 0x00000200,
66788 + GR_PROTPROCFD = 0x00000400,
66789 + GR_PROCACCT = 0x00000800,
66790 + GR_RELAXPTRACE = 0x00001000,
66791 + GR_NESTED = 0x00002000,
66792 + GR_INHERITLEARN = 0x00004000,
66793 + GR_PROCFIND = 0x00008000,
66794 + GR_POVERRIDE = 0x00010000,
66795 + GR_KERNELAUTH = 0x00020000,
66796 + GR_ATSECURE = 0x00040000,
66797 + GR_SHMEXEC = 0x00080000
66798 +};
66799 +
66800 +enum {
66801 + GR_PAX_ENABLE_SEGMEXEC = 0x0001,
66802 + GR_PAX_ENABLE_PAGEEXEC = 0x0002,
66803 + GR_PAX_ENABLE_MPROTECT = 0x0004,
66804 + GR_PAX_ENABLE_RANDMMAP = 0x0008,
66805 + GR_PAX_ENABLE_EMUTRAMP = 0x0010,
66806 + GR_PAX_DISABLE_SEGMEXEC = 0x0100,
66807 + GR_PAX_DISABLE_PAGEEXEC = 0x0200,
66808 + GR_PAX_DISABLE_MPROTECT = 0x0400,
66809 + GR_PAX_DISABLE_RANDMMAP = 0x0800,
66810 + GR_PAX_DISABLE_EMUTRAMP = 0x1000,
66811 +};
66812 +
66813 +enum {
66814 + GR_ID_USER = 0x01,
66815 + GR_ID_GROUP = 0x02,
66816 +};
66817 +
66818 +enum {
66819 + GR_ID_ALLOW = 0x01,
66820 + GR_ID_DENY = 0x02,
66821 +};
66822 +
66823 +#define GR_CRASH_RES 31
66824 +#define GR_UIDTABLE_MAX 500
66825 +
66826 +/* begin resource learning section */
66827 +enum {
66828 + GR_RLIM_CPU_BUMP = 60,
66829 + GR_RLIM_FSIZE_BUMP = 50000,
66830 + GR_RLIM_DATA_BUMP = 10000,
66831 + GR_RLIM_STACK_BUMP = 1000,
66832 + GR_RLIM_CORE_BUMP = 10000,
66833 + GR_RLIM_RSS_BUMP = 500000,
66834 + GR_RLIM_NPROC_BUMP = 1,
66835 + GR_RLIM_NOFILE_BUMP = 5,
66836 + GR_RLIM_MEMLOCK_BUMP = 50000,
66837 + GR_RLIM_AS_BUMP = 500000,
66838 + GR_RLIM_LOCKS_BUMP = 2,
66839 + GR_RLIM_SIGPENDING_BUMP = 5,
66840 + GR_RLIM_MSGQUEUE_BUMP = 10000,
66841 + GR_RLIM_NICE_BUMP = 1,
66842 + GR_RLIM_RTPRIO_BUMP = 1,
66843 + GR_RLIM_RTTIME_BUMP = 1000000
66844 +};
66845 +
66846 +#endif
66847 diff --git a/include/linux/grinternal.h b/include/linux/grinternal.h
66848 new file mode 100644
66849 index 0000000..e5817d7
66850 --- /dev/null
66851 +++ b/include/linux/grinternal.h
66852 @@ -0,0 +1,218 @@
66853 +#ifndef __GRINTERNAL_H
66854 +#define __GRINTERNAL_H
66855 +
66856 +#ifdef CONFIG_GRKERNSEC
66857 +
66858 +#include <linux/fs.h>
66859 +#include <linux/mnt_namespace.h>
66860 +#include <linux/nsproxy.h>
66861 +#include <linux/gracl.h>
66862 +#include <linux/grdefs.h>
66863 +#include <linux/grmsg.h>
66864 +
66865 +void gr_add_learn_entry(const char *fmt, ...)
66866 + __attribute__ ((format (printf, 1, 2)));
66867 +__u32 gr_search_file(const struct dentry *dentry, const __u32 mode,
66868 + const struct vfsmount *mnt);
66869 +__u32 gr_check_create(const struct dentry *new_dentry,
66870 + const struct dentry *parent,
66871 + const struct vfsmount *mnt, const __u32 mode);
66872 +int gr_check_protected_task(const struct task_struct *task);
66873 +__u32 to_gr_audit(const __u32 reqmode);
66874 +int gr_set_acls(const int type);
66875 +int gr_apply_subject_to_task(struct task_struct *task);
66876 +int gr_acl_is_enabled(void);
66877 +char gr_roletype_to_char(void);
66878 +
66879 +void gr_handle_alertkill(struct task_struct *task);
66880 +char *gr_to_filename(const struct dentry *dentry,
66881 + const struct vfsmount *mnt);
66882 +char *gr_to_filename1(const struct dentry *dentry,
66883 + const struct vfsmount *mnt);
66884 +char *gr_to_filename2(const struct dentry *dentry,
66885 + const struct vfsmount *mnt);
66886 +char *gr_to_filename3(const struct dentry *dentry,
66887 + const struct vfsmount *mnt);
66888 +
66889 +extern int grsec_enable_harden_ptrace;
66890 +extern int grsec_enable_link;
66891 +extern int grsec_enable_fifo;
66892 +extern int grsec_enable_shm;
66893 +extern int grsec_enable_execlog;
66894 +extern int grsec_enable_signal;
66895 +extern int grsec_enable_audit_ptrace;
66896 +extern int grsec_enable_forkfail;
66897 +extern int grsec_enable_time;
66898 +extern int grsec_enable_rofs;
66899 +extern int grsec_enable_chroot_shmat;
66900 +extern int grsec_enable_chroot_mount;
66901 +extern int grsec_enable_chroot_double;
66902 +extern int grsec_enable_chroot_pivot;
66903 +extern int grsec_enable_chroot_chdir;
66904 +extern int grsec_enable_chroot_chmod;
66905 +extern int grsec_enable_chroot_mknod;
66906 +extern int grsec_enable_chroot_fchdir;
66907 +extern int grsec_enable_chroot_nice;
66908 +extern int grsec_enable_chroot_execlog;
66909 +extern int grsec_enable_chroot_caps;
66910 +extern int grsec_enable_chroot_sysctl;
66911 +extern int grsec_enable_chroot_unix;
66912 +extern int grsec_enable_tpe;
66913 +extern int grsec_tpe_gid;
66914 +extern int grsec_enable_tpe_all;
66915 +extern int grsec_enable_tpe_invert;
66916 +extern int grsec_enable_socket_all;
66917 +extern int grsec_socket_all_gid;
66918 +extern int grsec_enable_socket_client;
66919 +extern int grsec_socket_client_gid;
66920 +extern int grsec_enable_socket_server;
66921 +extern int grsec_socket_server_gid;
66922 +extern int grsec_audit_gid;
66923 +extern int grsec_enable_group;
66924 +extern int grsec_enable_audit_textrel;
66925 +extern int grsec_enable_log_rwxmaps;
66926 +extern int grsec_enable_mount;
66927 +extern int grsec_enable_chdir;
66928 +extern int grsec_resource_logging;
66929 +extern int grsec_enable_blackhole;
66930 +extern int grsec_lastack_retries;
66931 +extern int grsec_enable_brute;
66932 +extern int grsec_lock;
66933 +
66934 +extern spinlock_t grsec_alert_lock;
66935 +extern unsigned long grsec_alert_wtime;
66936 +extern unsigned long grsec_alert_fyet;
66937 +
66938 +extern spinlock_t grsec_audit_lock;
66939 +
66940 +extern rwlock_t grsec_exec_file_lock;
66941 +
66942 +#define gr_task_fullpath(tsk) ((tsk)->exec_file ? \
66943 + gr_to_filename2((tsk)->exec_file->f_path.dentry, \
66944 + (tsk)->exec_file->f_vfsmnt) : "/")
66945 +
66946 +#define gr_parent_task_fullpath(tsk) ((tsk)->real_parent->exec_file ? \
66947 + gr_to_filename3((tsk)->real_parent->exec_file->f_path.dentry, \
66948 + (tsk)->real_parent->exec_file->f_vfsmnt) : "/")
66949 +
66950 +#define gr_task_fullpath0(tsk) ((tsk)->exec_file ? \
66951 + gr_to_filename((tsk)->exec_file->f_path.dentry, \
66952 + (tsk)->exec_file->f_vfsmnt) : "/")
66953 +
66954 +#define gr_parent_task_fullpath0(tsk) ((tsk)->real_parent->exec_file ? \
66955 + gr_to_filename1((tsk)->real_parent->exec_file->f_path.dentry, \
66956 + (tsk)->real_parent->exec_file->f_vfsmnt) : "/")
66957 +
66958 +#define proc_is_chrooted(tsk_a) ((tsk_a)->gr_is_chrooted)
66959 +
66960 +#define have_same_root(tsk_a,tsk_b) ((tsk_a)->gr_chroot_dentry == (tsk_b)->gr_chroot_dentry)
66961 +
66962 +#define DEFAULTSECARGS(task, cred, pcred) gr_task_fullpath(task), (task)->comm, \
66963 + (task)->pid, (cred)->uid, \
66964 + (cred)->euid, (cred)->gid, (cred)->egid, \
66965 + gr_parent_task_fullpath(task), \
66966 + (task)->real_parent->comm, (task)->real_parent->pid, \
66967 + (pcred)->uid, (pcred)->euid, \
66968 + (pcred)->gid, (pcred)->egid
66969 +
66970 +#define GR_CHROOT_CAPS {{ \
66971 + CAP_TO_MASK(CAP_LINUX_IMMUTABLE) | CAP_TO_MASK(CAP_NET_ADMIN) | \
66972 + CAP_TO_MASK(CAP_SYS_MODULE) | CAP_TO_MASK(CAP_SYS_RAWIO) | \
66973 + CAP_TO_MASK(CAP_SYS_PACCT) | CAP_TO_MASK(CAP_SYS_ADMIN) | \
66974 + CAP_TO_MASK(CAP_SYS_BOOT) | CAP_TO_MASK(CAP_SYS_TIME) | \
66975 + CAP_TO_MASK(CAP_NET_RAW) | CAP_TO_MASK(CAP_SYS_TTY_CONFIG) | \
66976 + CAP_TO_MASK(CAP_IPC_OWNER) | CAP_TO_MASK(CAP_SETFCAP), \
66977 + CAP_TO_MASK(CAP_MAC_ADMIN) }}
66978 +
66979 +#define security_learn(normal_msg,args...) \
66980 +({ \
66981 + read_lock(&grsec_exec_file_lock); \
66982 + gr_add_learn_entry(normal_msg "\n", ## args); \
66983 + read_unlock(&grsec_exec_file_lock); \
66984 +})
66985 +
66986 +enum {
66987 + GR_DO_AUDIT,
66988 + GR_DONT_AUDIT,
66989 + GR_DONT_AUDIT_GOOD
66990 +};
66991 +
66992 +enum {
66993 + GR_TTYSNIFF,
66994 + GR_RBAC,
66995 + GR_RBAC_STR,
66996 + GR_STR_RBAC,
66997 + GR_RBAC_MODE2,
66998 + GR_RBAC_MODE3,
66999 + GR_FILENAME,
67000 + GR_SYSCTL_HIDDEN,
67001 + GR_NOARGS,
67002 + GR_ONE_INT,
67003 + GR_ONE_INT_TWO_STR,
67004 + GR_ONE_STR,
67005 + GR_STR_INT,
67006 + GR_TWO_STR_INT,
67007 + GR_TWO_INT,
67008 + GR_TWO_U64,
67009 + GR_THREE_INT,
67010 + GR_FIVE_INT_TWO_STR,
67011 + GR_TWO_STR,
67012 + GR_THREE_STR,
67013 + GR_FOUR_STR,
67014 + GR_STR_FILENAME,
67015 + GR_FILENAME_STR,
67016 + GR_FILENAME_TWO_INT,
67017 + GR_FILENAME_TWO_INT_STR,
67018 + GR_TEXTREL,
67019 + GR_PTRACE,
67020 + GR_RESOURCE,
67021 + GR_CAP,
67022 + GR_SIG,
67023 + GR_SIG2,
67024 + GR_CRASH1,
67025 + GR_CRASH2,
67026 + GR_PSACCT,
67027 + GR_RWXMAP
67028 +};
67029 +
67030 +#define gr_log_hidden_sysctl(audit, msg, str) gr_log_varargs(audit, msg, GR_SYSCTL_HIDDEN, str)
67031 +#define gr_log_ttysniff(audit, msg, task) gr_log_varargs(audit, msg, GR_TTYSNIFF, task)
67032 +#define gr_log_fs_rbac_generic(audit, msg, dentry, mnt) gr_log_varargs(audit, msg, GR_RBAC, dentry, mnt)
67033 +#define gr_log_fs_rbac_str(audit, msg, dentry, mnt, str) gr_log_varargs(audit, msg, GR_RBAC_STR, dentry, mnt, str)
67034 +#define gr_log_fs_str_rbac(audit, msg, str, dentry, mnt) gr_log_varargs(audit, msg, GR_STR_RBAC, str, dentry, mnt)
67035 +#define gr_log_fs_rbac_mode2(audit, msg, dentry, mnt, str1, str2) gr_log_varargs(audit, msg, GR_RBAC_MODE2, dentry, mnt, str1, str2)
67036 +#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)
67037 +#define gr_log_fs_generic(audit, msg, dentry, mnt) gr_log_varargs(audit, msg, GR_FILENAME, dentry, mnt)
67038 +#define gr_log_noargs(audit, msg) gr_log_varargs(audit, msg, GR_NOARGS)
67039 +#define gr_log_int(audit, msg, num) gr_log_varargs(audit, msg, GR_ONE_INT, num)
67040 +#define gr_log_int_str2(audit, msg, num, str1, str2) gr_log_varargs(audit, msg, GR_ONE_INT_TWO_STR, num, str1, str2)
67041 +#define gr_log_str(audit, msg, str) gr_log_varargs(audit, msg, GR_ONE_STR, str)
67042 +#define gr_log_str_int(audit, msg, str, num) gr_log_varargs(audit, msg, GR_STR_INT, str, num)
67043 +#define gr_log_int_int(audit, msg, num1, num2) gr_log_varargs(audit, msg, GR_TWO_INT, num1, num2)
67044 +#define gr_log_two_u64(audit, msg, num1, num2) gr_log_varargs(audit, msg, GR_TWO_U64, num1, num2)
67045 +#define gr_log_int3(audit, msg, num1, num2, num3) gr_log_varargs(audit, msg, GR_THREE_INT, num1, num2, num3)
67046 +#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)
67047 +#define gr_log_str_str(audit, msg, str1, str2) gr_log_varargs(audit, msg, GR_TWO_STR, str1, str2)
67048 +#define gr_log_str2_int(audit, msg, str1, str2, num) gr_log_varargs(audit, msg, GR_TWO_STR_INT, str1, str2, num)
67049 +#define gr_log_str3(audit, msg, str1, str2, str3) gr_log_varargs(audit, msg, GR_THREE_STR, str1, str2, str3)
67050 +#define gr_log_str4(audit, msg, str1, str2, str3, str4) gr_log_varargs(audit, msg, GR_FOUR_STR, str1, str2, str3, str4)
67051 +#define gr_log_str_fs(audit, msg, str, dentry, mnt) gr_log_varargs(audit, msg, GR_STR_FILENAME, str, dentry, mnt)
67052 +#define gr_log_fs_str(audit, msg, dentry, mnt, str) gr_log_varargs(audit, msg, GR_FILENAME_STR, dentry, mnt, str)
67053 +#define gr_log_fs_int2(audit, msg, dentry, mnt, num1, num2) gr_log_varargs(audit, msg, GR_FILENAME_TWO_INT, dentry, mnt, num1, num2)
67054 +#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)
67055 +#define gr_log_textrel_ulong_ulong(audit, msg, file, ulong1, ulong2) gr_log_varargs(audit, msg, GR_TEXTREL, file, ulong1, ulong2)
67056 +#define gr_log_ptrace(audit, msg, task) gr_log_varargs(audit, msg, GR_PTRACE, task)
67057 +#define gr_log_res_ulong2_str(audit, msg, task, ulong1, str, ulong2) gr_log_varargs(audit, msg, GR_RESOURCE, task, ulong1, str, ulong2)
67058 +#define gr_log_cap(audit, msg, task, str) gr_log_varargs(audit, msg, GR_CAP, task, str)
67059 +#define gr_log_sig_addr(audit, msg, str, addr) gr_log_varargs(audit, msg, GR_SIG, str, addr)
67060 +#define gr_log_sig_task(audit, msg, task, num) gr_log_varargs(audit, msg, GR_SIG2, task, num)
67061 +#define gr_log_crash1(audit, msg, task, ulong) gr_log_varargs(audit, msg, GR_CRASH1, task, ulong)
67062 +#define gr_log_crash2(audit, msg, task, ulong1) gr_log_varargs(audit, msg, GR_CRASH2, task, ulong1)
67063 +#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)
67064 +#define gr_log_rwxmap(audit, msg, str) gr_log_varargs(audit, msg, GR_RWXMAP, str)
67065 +
67066 +void gr_log_varargs(int audit, const char *msg, int argtypes, ...);
67067 +
67068 +#endif
67069 +
67070 +#endif
67071 diff --git a/include/linux/grmsg.h b/include/linux/grmsg.h
67072 new file mode 100644
67073 index 0000000..9d5fd4a
67074 --- /dev/null
67075 +++ b/include/linux/grmsg.h
67076 @@ -0,0 +1,108 @@
67077 +#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"
67078 +#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"
67079 +#define GR_PTRACE_ACL_MSG "denied ptrace of %.950s(%.16s:%d) by "
67080 +#define GR_STOPMOD_MSG "denied modification of module state by "
67081 +#define GR_ROFS_BLOCKWRITE_MSG "denied write to block device %.950s by "
67082 +#define GR_ROFS_MOUNT_MSG "denied writable mount of %.950s by "
67083 +#define GR_IOPERM_MSG "denied use of ioperm() by "
67084 +#define GR_IOPL_MSG "denied use of iopl() by "
67085 +#define GR_SHMAT_ACL_MSG "denied attach of shared memory of UID %u, PID %d, ID %u by "
67086 +#define GR_UNIX_CHROOT_MSG "denied connect() to abstract AF_UNIX socket outside of chroot by "
67087 +#define GR_SHMAT_CHROOT_MSG "denied attach of shared memory outside of chroot by "
67088 +#define GR_MEM_READWRITE_MSG "denied access of range %Lx -> %Lx in /dev/mem by "
67089 +#define GR_SYMLINK_MSG "not following symlink %.950s owned by %d.%d by "
67090 +#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"
67091 +#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"
67092 +#define GR_HIDDEN_ACL_MSG "%s access to hidden file %.950s by "
67093 +#define GR_OPEN_ACL_MSG "%s open of %.950s for%s%s by "
67094 +#define GR_CREATE_ACL_MSG "%s create of %.950s for%s%s by "
67095 +#define GR_FIFO_MSG "denied writing FIFO %.950s of %d.%d by "
67096 +#define GR_MKNOD_CHROOT_MSG "denied mknod of %.950s from chroot by "
67097 +#define GR_MKNOD_ACL_MSG "%s mknod of %.950s by "
67098 +#define GR_UNIXCONNECT_ACL_MSG "%s connect() to the unix domain socket %.950s by "
67099 +#define GR_TTYSNIFF_ACL_MSG "terminal being sniffed by IP:%pI4 %.480s[%.16s:%d], parent %.480s[%.16s:%d] against "
67100 +#define GR_MKDIR_ACL_MSG "%s mkdir of %.950s by "
67101 +#define GR_RMDIR_ACL_MSG "%s rmdir of %.950s by "
67102 +#define GR_UNLINK_ACL_MSG "%s unlink of %.950s by "
67103 +#define GR_SYMLINK_ACL_MSG "%s symlink from %.480s to %.480s by "
67104 +#define GR_HARDLINK_MSG "denied hardlink of %.930s (owned by %d.%d) to %.30s for "
67105 +#define GR_LINK_ACL_MSG "%s link of %.480s to %.480s by "
67106 +#define GR_INHERIT_ACL_MSG "successful inherit of %.480s's ACL for %.480s by "
67107 +#define GR_RENAME_ACL_MSG "%s rename of %.480s to %.480s by "
67108 +#define GR_UNSAFESHARE_EXEC_ACL_MSG "denied exec with cloned fs of %.950s by "
67109 +#define GR_PTRACE_EXEC_ACL_MSG "denied ptrace of %.950s by "
67110 +#define GR_EXEC_ACL_MSG "%s execution of %.950s by "
67111 +#define GR_EXEC_TPE_MSG "denied untrusted exec of %.950s by "
67112 +#define GR_SEGVSTART_ACL_MSG "possible exploit bruteforcing on " DEFAULTSECMSG " banning uid %u from login for %lu seconds"
67113 +#define GR_SEGVNOSUID_ACL_MSG "possible exploit bruteforcing on " DEFAULTSECMSG " banning execution for %lu seconds"
67114 +#define GR_MOUNT_CHROOT_MSG "denied mount of %.256s as %.930s from chroot by "
67115 +#define GR_PIVOT_CHROOT_MSG "denied pivot_root from chroot by "
67116 +#define GR_TRUNCATE_ACL_MSG "%s truncate of %.950s by "
67117 +#define GR_ATIME_ACL_MSG "%s access time change of %.950s by "
67118 +#define GR_ACCESS_ACL_MSG "%s access of %.950s for%s%s%s by "
67119 +#define GR_CHROOT_CHROOT_MSG "denied double chroot to %.950s by "
67120 +#define GR_FCHMOD_ACL_MSG "%s fchmod of %.950s by "
67121 +#define GR_CHMOD_CHROOT_MSG "denied chmod +s of %.950s by "
67122 +#define GR_CHMOD_ACL_MSG "%s chmod of %.950s by "
67123 +#define GR_CHROOT_FCHDIR_MSG "denied fchdir outside of chroot to %.950s by "
67124 +#define GR_CHOWN_ACL_MSG "%s chown of %.950s by "
67125 +#define GR_SETXATTR_ACL_MSG "%s setting extended attributes of %.950s by "
67126 +#define GR_WRITLIB_ACL_MSG "denied load of writable library %.950s by "
67127 +#define GR_INITF_ACL_MSG "init_variables() failed %s by "
67128 +#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"
67129 +#define GR_DEV_ACL_MSG "/dev/grsec: %d bytes sent %d required, being fed garbaged by "
67130 +#define GR_SHUTS_ACL_MSG "shutdown auth success for "
67131 +#define GR_SHUTF_ACL_MSG "shutdown auth failure for "
67132 +#define GR_SHUTI_ACL_MSG "ignoring shutdown for disabled RBAC system for "
67133 +#define GR_SEGVMODS_ACL_MSG "segvmod auth success for "
67134 +#define GR_SEGVMODF_ACL_MSG "segvmod auth failure for "
67135 +#define GR_SEGVMODI_ACL_MSG "ignoring segvmod for disabled RBAC system for "
67136 +#define GR_ENABLE_ACL_MSG "%s RBAC system loaded by "
67137 +#define GR_ENABLEF_ACL_MSG "unable to load %s for "
67138 +#define GR_RELOADI_ACL_MSG "ignoring reload request for disabled RBAC system"
67139 +#define GR_RELOAD_ACL_MSG "%s RBAC system reloaded by "
67140 +#define GR_RELOADF_ACL_MSG "failed reload of %s for "
67141 +#define GR_SPROLEI_ACL_MSG "ignoring change to special role for disabled RBAC system for "
67142 +#define GR_SPROLES_ACL_MSG "successful change to special role %s (id %d) by "
67143 +#define GR_SPROLEL_ACL_MSG "special role %s (id %d) exited by "
67144 +#define GR_SPROLEF_ACL_MSG "special role %s failure for "
67145 +#define GR_UNSPROLEI_ACL_MSG "ignoring unauth of special role for disabled RBAC system for "
67146 +#define GR_UNSPROLES_ACL_MSG "successful unauth of special role %s (id %d) by "
67147 +#define GR_INVMODE_ACL_MSG "invalid mode %d by "
67148 +#define GR_PRIORITY_CHROOT_MSG "denied priority change of process (%.16s:%d) by "
67149 +#define GR_FAILFORK_MSG "failed fork with errno %s by "
67150 +#define GR_NICE_CHROOT_MSG "denied priority change by "
67151 +#define GR_UNISIGLOG_MSG "%.32s occurred at %p in "
67152 +#define GR_DUALSIGLOG_MSG "signal %d sent to " DEFAULTSECMSG " by "
67153 +#define GR_SIG_ACL_MSG "denied send of signal %d to protected task " DEFAULTSECMSG " by "
67154 +#define GR_SYSCTL_MSG "denied modification of grsecurity sysctl value : %.32s by "
67155 +#define GR_SYSCTL_ACL_MSG "%s sysctl of %.950s for%s%s by "
67156 +#define GR_TIME_MSG "time set by "
67157 +#define GR_DEFACL_MSG "fatal: unable to find subject for (%.16s:%d), loaded by "
67158 +#define GR_MMAP_ACL_MSG "%s executable mmap of %.950s by "
67159 +#define GR_MPROTECT_ACL_MSG "%s executable mprotect of %.950s by "
67160 +#define GR_SOCK_MSG "denied socket(%.16s,%.16s,%.16s) by "
67161 +#define GR_SOCK_NOINET_MSG "denied socket(%.16s,%.16s,%d) by "
67162 +#define GR_BIND_MSG "denied bind() by "
67163 +#define GR_CONNECT_MSG "denied connect() by "
67164 +#define GR_BIND_ACL_MSG "denied bind() to %pI4 port %u sock type %.16s protocol %.16s by "
67165 +#define GR_CONNECT_ACL_MSG "denied connect() to %pI4 port %u sock type %.16s protocol %.16s by "
67166 +#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"
67167 +#define GR_EXEC_CHROOT_MSG "exec of %.980s within chroot by process "
67168 +#define GR_CAP_ACL_MSG "use of %s denied for "
67169 +#define GR_CAP_CHROOT_MSG "use of %s in chroot denied for "
67170 +#define GR_CAP_ACL_MSG2 "use of %s permitted for "
67171 +#define GR_USRCHANGE_ACL_MSG "change to uid %u denied for "
67172 +#define GR_GRPCHANGE_ACL_MSG "change to gid %u denied for "
67173 +#define GR_REMOUNT_AUDIT_MSG "remount of %.256s by "
67174 +#define GR_UNMOUNT_AUDIT_MSG "unmount of %.256s by "
67175 +#define GR_MOUNT_AUDIT_MSG "mount of %.256s to %.256s by "
67176 +#define GR_CHDIR_AUDIT_MSG "chdir to %.980s by "
67177 +#define GR_EXEC_AUDIT_MSG "exec of %.930s (%.128s) by "
67178 +#define GR_RESOURCE_MSG "denied resource overstep by requesting %lu for %.16s against limit %lu for "
67179 +#define GR_RWXMMAP_MSG "denied RWX mmap of %.950s by "
67180 +#define GR_RWXMPROTECT_MSG "denied RWX mprotect of %.950s by "
67181 +#define GR_TEXTREL_AUDIT_MSG "text relocation in %s, VMA:0x%08lx 0x%08lx by "
67182 +#define GR_VM86_MSG "denied use of vm86 by "
67183 +#define GR_PTRACE_AUDIT_MSG "process %.950s(%.16s:%d) attached to via ptrace by "
67184 +#define GR_INIT_TRANSFER_MSG "persistent special role transferred privilege to init by "
67185 diff --git a/include/linux/grsecurity.h b/include/linux/grsecurity.h
67186 new file mode 100644
67187 index 0000000..24676f4
67188 --- /dev/null
67189 +++ b/include/linux/grsecurity.h
67190 @@ -0,0 +1,218 @@
67191 +#ifndef GR_SECURITY_H
67192 +#define GR_SECURITY_H
67193 +#include <linux/fs.h>
67194 +#include <linux/fs_struct.h>
67195 +#include <linux/binfmts.h>
67196 +#include <linux/gracl.h>
67197 +#include <linux/compat.h>
67198 +
67199 +/* notify of brain-dead configs */
67200 +#if defined(CONFIG_GRKERNSEC_PROC_USER) && defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
67201 +#error "CONFIG_GRKERNSEC_PROC_USER and CONFIG_GRKERNSEC_PROC_USERGROUP cannot both be enabled."
67202 +#endif
67203 +#if defined(CONFIG_PAX_NOEXEC) && !defined(CONFIG_PAX_PAGEEXEC) && !defined(CONFIG_PAX_SEGMEXEC) && !defined(CONFIG_PAX_KERNEXEC)
67204 +#error "CONFIG_PAX_NOEXEC enabled, but PAGEEXEC, SEGMEXEC, and KERNEXEC are disabled."
67205 +#endif
67206 +#if defined(CONFIG_PAX_NOEXEC) && !defined(CONFIG_PAX_EI_PAX) && !defined(CONFIG_PAX_PT_PAX_FLAGS)
67207 +#error "CONFIG_PAX_NOEXEC enabled, but neither CONFIG_PAX_EI_PAX nor CONFIG_PAX_PT_PAX_FLAGS are enabled."
67208 +#endif
67209 +#if defined(CONFIG_PAX_ASLR) && (defined(CONFIG_PAX_RANDMMAP) || defined(CONFIG_PAX_RANDUSTACK)) && !defined(CONFIG_PAX_EI_PAX) && !defined(CONFIG_PAX_PT_PAX_FLAGS)
67210 +#error "CONFIG_PAX_ASLR enabled, but neither CONFIG_PAX_EI_PAX nor CONFIG_PAX_PT_PAX_FLAGS are enabled."
67211 +#endif
67212 +#if defined(CONFIG_PAX_ASLR) && !defined(CONFIG_PAX_RANDKSTACK) && !defined(CONFIG_PAX_RANDUSTACK) && !defined(CONFIG_PAX_RANDMMAP)
67213 +#error "CONFIG_PAX_ASLR enabled, but RANDKSTACK, RANDUSTACK, and RANDMMAP are disabled."
67214 +#endif
67215 +#if defined(CONFIG_PAX) && !defined(CONFIG_PAX_NOEXEC) && !defined(CONFIG_PAX_ASLR)
67216 +#error "CONFIG_PAX enabled, but no PaX options are enabled."
67217 +#endif
67218 +
67219 +void gr_handle_brute_attach(struct task_struct *p, unsigned long mm_flags);
67220 +void gr_handle_brute_check(void);
67221 +void gr_handle_kernel_exploit(void);
67222 +int gr_process_user_ban(void);
67223 +
67224 +char gr_roletype_to_char(void);
67225 +
67226 +int gr_acl_enable_at_secure(void);
67227 +
67228 +int gr_check_user_change(int real, int effective, int fs);
67229 +int gr_check_group_change(int real, int effective, int fs);
67230 +
67231 +void gr_del_task_from_ip_table(struct task_struct *p);
67232 +
67233 +int gr_pid_is_chrooted(struct task_struct *p);
67234 +int gr_handle_chroot_fowner(struct pid *pid, enum pid_type type);
67235 +int gr_handle_chroot_nice(void);
67236 +int gr_handle_chroot_sysctl(const int op);
67237 +int gr_handle_chroot_setpriority(struct task_struct *p,
67238 + const int niceval);
67239 +int gr_chroot_fchdir(struct dentry *u_dentry, struct vfsmount *u_mnt);
67240 +int gr_handle_chroot_chroot(const struct dentry *dentry,
67241 + const struct vfsmount *mnt);
67242 +void gr_handle_chroot_chdir(struct path *path);
67243 +int gr_handle_chroot_chmod(const struct dentry *dentry,
67244 + const struct vfsmount *mnt, const int mode);
67245 +int gr_handle_chroot_mknod(const struct dentry *dentry,
67246 + const struct vfsmount *mnt, const int mode);
67247 +int gr_handle_chroot_mount(const struct dentry *dentry,
67248 + const struct vfsmount *mnt,
67249 + const char *dev_name);
67250 +int gr_handle_chroot_pivot(void);
67251 +int gr_handle_chroot_unix(const pid_t pid);
67252 +
67253 +int gr_handle_rawio(const struct inode *inode);
67254 +
67255 +void gr_handle_ioperm(void);
67256 +void gr_handle_iopl(void);
67257 +
67258 +int gr_tpe_allow(const struct file *file);
67259 +
67260 +void gr_set_chroot_entries(struct task_struct *task, struct path *path);
67261 +void gr_clear_chroot_entries(struct task_struct *task);
67262 +
67263 +void gr_log_forkfail(const int retval);
67264 +void gr_log_timechange(void);
67265 +void gr_log_signal(const int sig, const void *addr, const struct task_struct *t);
67266 +void gr_log_chdir(const struct dentry *dentry,
67267 + const struct vfsmount *mnt);
67268 +void gr_log_chroot_exec(const struct dentry *dentry,
67269 + const struct vfsmount *mnt);
67270 +void gr_handle_exec_args(struct linux_binprm *bprm, const char __user *const __user *argv);
67271 +#ifdef CONFIG_COMPAT
67272 +void gr_handle_exec_args_compat(struct linux_binprm *bprm, compat_uptr_t __user *argv);
67273 +#endif
67274 +void gr_log_remount(const char *devname, const int retval);
67275 +void gr_log_unmount(const char *devname, const int retval);
67276 +void gr_log_mount(const char *from, const char *to, const int retval);
67277 +void gr_log_textrel(struct vm_area_struct *vma);
67278 +void gr_log_rwxmmap(struct file *file);
67279 +void gr_log_rwxmprotect(struct file *file);
67280 +
67281 +int gr_handle_follow_link(const struct inode *parent,
67282 + const struct inode *inode,
67283 + const struct dentry *dentry,
67284 + const struct vfsmount *mnt);
67285 +int gr_handle_fifo(const struct dentry *dentry,
67286 + const struct vfsmount *mnt,
67287 + const struct dentry *dir, const int flag,
67288 + const int acc_mode);
67289 +int gr_handle_hardlink(const struct dentry *dentry,
67290 + const struct vfsmount *mnt,
67291 + struct inode *inode,
67292 + const int mode, const char *to);
67293 +
67294 +int gr_is_capable(const int cap);
67295 +int gr_is_capable_nolog(const int cap);
67296 +void gr_learn_resource(const struct task_struct *task, const int limit,
67297 + const unsigned long wanted, const int gt);
67298 +void gr_copy_label(struct task_struct *tsk);
67299 +void gr_handle_crash(struct task_struct *task, const int sig);
67300 +int gr_handle_signal(const struct task_struct *p, const int sig);
67301 +int gr_check_crash_uid(const uid_t uid);
67302 +int gr_check_protected_task(const struct task_struct *task);
67303 +int gr_check_protected_task_fowner(struct pid *pid, enum pid_type type);
67304 +int gr_acl_handle_mmap(const struct file *file,
67305 + const unsigned long prot);
67306 +int gr_acl_handle_mprotect(const struct file *file,
67307 + const unsigned long prot);
67308 +int gr_check_hidden_task(const struct task_struct *tsk);
67309 +__u32 gr_acl_handle_truncate(const struct dentry *dentry,
67310 + const struct vfsmount *mnt);
67311 +__u32 gr_acl_handle_utime(const struct dentry *dentry,
67312 + const struct vfsmount *mnt);
67313 +__u32 gr_acl_handle_access(const struct dentry *dentry,
67314 + const struct vfsmount *mnt, const int fmode);
67315 +__u32 gr_acl_handle_fchmod(const struct dentry *dentry,
67316 + const struct vfsmount *mnt, mode_t mode);
67317 +__u32 gr_acl_handle_chmod(const struct dentry *dentry,
67318 + const struct vfsmount *mnt, mode_t mode);
67319 +__u32 gr_acl_handle_chown(const struct dentry *dentry,
67320 + const struct vfsmount *mnt);
67321 +__u32 gr_acl_handle_setxattr(const struct dentry *dentry,
67322 + const struct vfsmount *mnt);
67323 +int gr_handle_ptrace(struct task_struct *task, const long request);
67324 +int gr_handle_proc_ptrace(struct task_struct *task);
67325 +__u32 gr_acl_handle_execve(const struct dentry *dentry,
67326 + const struct vfsmount *mnt);
67327 +int gr_check_crash_exec(const struct file *filp);
67328 +int gr_acl_is_enabled(void);
67329 +void gr_set_kernel_label(struct task_struct *task);
67330 +void gr_set_role_label(struct task_struct *task, const uid_t uid,
67331 + const gid_t gid);
67332 +int gr_set_proc_label(const struct dentry *dentry,
67333 + const struct vfsmount *mnt,
67334 + const int unsafe_share);
67335 +__u32 gr_acl_handle_hidden_file(const struct dentry *dentry,
67336 + const struct vfsmount *mnt);
67337 +__u32 gr_acl_handle_open(const struct dentry *dentry,
67338 + const struct vfsmount *mnt, int acc_mode);
67339 +__u32 gr_acl_handle_creat(const struct dentry *dentry,
67340 + const struct dentry *p_dentry,
67341 + const struct vfsmount *p_mnt,
67342 + int open_flags, int acc_mode, const int imode);
67343 +void gr_handle_create(const struct dentry *dentry,
67344 + const struct vfsmount *mnt);
67345 +void gr_handle_proc_create(const struct dentry *dentry,
67346 + const struct inode *inode);
67347 +__u32 gr_acl_handle_mknod(const struct dentry *new_dentry,
67348 + const struct dentry *parent_dentry,
67349 + const struct vfsmount *parent_mnt,
67350 + const int mode);
67351 +__u32 gr_acl_handle_mkdir(const struct dentry *new_dentry,
67352 + const struct dentry *parent_dentry,
67353 + const struct vfsmount *parent_mnt);
67354 +__u32 gr_acl_handle_rmdir(const struct dentry *dentry,
67355 + const struct vfsmount *mnt);
67356 +void gr_handle_delete(const ino_t ino, const dev_t dev);
67357 +__u32 gr_acl_handle_unlink(const struct dentry *dentry,
67358 + const struct vfsmount *mnt);
67359 +__u32 gr_acl_handle_symlink(const struct dentry *new_dentry,
67360 + const struct dentry *parent_dentry,
67361 + const struct vfsmount *parent_mnt,
67362 + const char *from);
67363 +__u32 gr_acl_handle_link(const struct dentry *new_dentry,
67364 + const struct dentry *parent_dentry,
67365 + const struct vfsmount *parent_mnt,
67366 + const struct dentry *old_dentry,
67367 + const struct vfsmount *old_mnt, const char *to);
67368 +int gr_acl_handle_rename(struct dentry *new_dentry,
67369 + struct dentry *parent_dentry,
67370 + const struct vfsmount *parent_mnt,
67371 + struct dentry *old_dentry,
67372 + struct inode *old_parent_inode,
67373 + struct vfsmount *old_mnt, const char *newname);
67374 +void gr_handle_rename(struct inode *old_dir, struct inode *new_dir,
67375 + struct dentry *old_dentry,
67376 + struct dentry *new_dentry,
67377 + struct vfsmount *mnt, const __u8 replace);
67378 +__u32 gr_check_link(const struct dentry *new_dentry,
67379 + const struct dentry *parent_dentry,
67380 + const struct vfsmount *parent_mnt,
67381 + const struct dentry *old_dentry,
67382 + const struct vfsmount *old_mnt);
67383 +int gr_acl_handle_filldir(const struct file *file, const char *name,
67384 + const unsigned int namelen, const ino_t ino);
67385 +
67386 +__u32 gr_acl_handle_unix(const struct dentry *dentry,
67387 + const struct vfsmount *mnt);
67388 +void gr_acl_handle_exit(void);
67389 +void gr_acl_handle_psacct(struct task_struct *task, const long code);
67390 +int gr_acl_handle_procpidmem(const struct task_struct *task);
67391 +int gr_handle_rofs_mount(struct dentry *dentry, struct vfsmount *mnt, int mnt_flags);
67392 +int gr_handle_rofs_blockwrite(struct dentry *dentry, struct vfsmount *mnt, int acc_mode);
67393 +void gr_audit_ptrace(struct task_struct *task);
67394 +dev_t gr_get_dev_from_dentry(struct dentry *dentry);
67395 +
67396 +#ifdef CONFIG_GRKERNSEC
67397 +void task_grsec_rbac(struct seq_file *m, struct task_struct *p);
67398 +void gr_handle_vm86(void);
67399 +void gr_handle_mem_readwrite(u64 from, u64 to);
67400 +
67401 +extern int grsec_enable_dmesg;
67402 +extern int grsec_disable_privio;
67403 +#ifdef CONFIG_GRKERNSEC_CHROOT_FINDTASK
67404 +extern int grsec_enable_chroot_findtask;
67405 +#endif
67406 +#endif
67407 +
67408 +#endif
67409 diff --git a/include/linux/hdpu_features.h b/include/linux/hdpu_features.h
67410 index 6a87154..a3ce57b 100644
67411 --- a/include/linux/hdpu_features.h
67412 +++ b/include/linux/hdpu_features.h
67413 @@ -3,7 +3,7 @@
67414 struct cpustate_t {
67415 spinlock_t lock;
67416 int excl;
67417 - int open_count;
67418 + atomic_t open_count;
67419 unsigned char cached_val;
67420 int inited;
67421 unsigned long *set_addr;
67422 diff --git a/include/linux/highmem.h b/include/linux/highmem.h
67423 index 211ff44..00ab6d7 100644
67424 --- a/include/linux/highmem.h
67425 +++ b/include/linux/highmem.h
67426 @@ -137,6 +137,18 @@ static inline void clear_highpage(struct page *page)
67427 kunmap_atomic(kaddr, KM_USER0);
67428 }
67429
67430 +static inline void sanitize_highpage(struct page *page)
67431 +{
67432 + void *kaddr;
67433 + unsigned long flags;
67434 +
67435 + local_irq_save(flags);
67436 + kaddr = kmap_atomic(page, KM_CLEARPAGE);
67437 + clear_page(kaddr);
67438 + kunmap_atomic(kaddr, KM_CLEARPAGE);
67439 + local_irq_restore(flags);
67440 +}
67441 +
67442 static inline void zero_user_segments(struct page *page,
67443 unsigned start1, unsigned end1,
67444 unsigned start2, unsigned end2)
67445 diff --git a/include/linux/i2c.h b/include/linux/i2c.h
67446 index 7b40cda..24eb44e 100644
67447 --- a/include/linux/i2c.h
67448 +++ b/include/linux/i2c.h
67449 @@ -325,6 +325,7 @@ struct i2c_algorithm {
67450 /* To determine what the adapter supports */
67451 u32 (*functionality) (struct i2c_adapter *);
67452 };
67453 +typedef struct i2c_algorithm __no_const i2c_algorithm_no_const;
67454
67455 /*
67456 * i2c_adapter is the structure used to identify a physical i2c bus along
67457 diff --git a/include/linux/i2o.h b/include/linux/i2o.h
67458 index 4c4e57d..f3c5303 100644
67459 --- a/include/linux/i2o.h
67460 +++ b/include/linux/i2o.h
67461 @@ -564,7 +564,7 @@ struct i2o_controller {
67462 struct i2o_device *exec; /* Executive */
67463 #if BITS_PER_LONG == 64
67464 spinlock_t context_list_lock; /* lock for context_list */
67465 - atomic_t context_list_counter; /* needed for unique contexts */
67466 + atomic_unchecked_t context_list_counter; /* needed for unique contexts */
67467 struct list_head context_list; /* list of context id's
67468 and pointers */
67469 #endif
67470 diff --git a/include/linux/init_task.h b/include/linux/init_task.h
67471 index 21a6f5d..dc42eab 100644
67472 --- a/include/linux/init_task.h
67473 +++ b/include/linux/init_task.h
67474 @@ -83,6 +83,12 @@ extern struct group_info init_groups;
67475 #define INIT_IDS
67476 #endif
67477
67478 +#ifdef CONFIG_X86
67479 +#define INIT_TASK_THREAD_INFO .tinfo = INIT_THREAD_INFO,
67480 +#else
67481 +#define INIT_TASK_THREAD_INFO
67482 +#endif
67483 +
67484 #ifdef CONFIG_SECURITY_FILE_CAPABILITIES
67485 /*
67486 * Because of the reduced scope of CAP_SETPCAP when filesystem
67487 @@ -156,6 +162,7 @@ extern struct cred init_cred;
67488 __MUTEX_INITIALIZER(tsk.cred_guard_mutex), \
67489 .comm = "swapper", \
67490 .thread = INIT_THREAD, \
67491 + INIT_TASK_THREAD_INFO \
67492 .fs = &init_fs, \
67493 .files = &init_files, \
67494 .signal = &init_signals, \
67495 diff --git a/include/linux/intel-iommu.h b/include/linux/intel-iommu.h
67496 index 4f0a72a..a849599 100644
67497 --- a/include/linux/intel-iommu.h
67498 +++ b/include/linux/intel-iommu.h
67499 @@ -296,7 +296,7 @@ struct iommu_flush {
67500 u8 fm, u64 type);
67501 void (*flush_iotlb)(struct intel_iommu *iommu, u16 did, u64 addr,
67502 unsigned int size_order, u64 type);
67503 -};
67504 +} __no_const;
67505
67506 enum {
67507 SR_DMAR_FECTL_REG,
67508 diff --git a/include/linux/interrupt.h b/include/linux/interrupt.h
67509 index c739150..be577b5 100644
67510 --- a/include/linux/interrupt.h
67511 +++ b/include/linux/interrupt.h
67512 @@ -369,7 +369,7 @@ enum
67513 /* map softirq index to softirq name. update 'softirq_to_name' in
67514 * kernel/softirq.c when adding a new softirq.
67515 */
67516 -extern char *softirq_to_name[NR_SOFTIRQS];
67517 +extern const char * const softirq_to_name[NR_SOFTIRQS];
67518
67519 /* softirq mask and active fields moved to irq_cpustat_t in
67520 * asm/hardirq.h to get better cache usage. KAO
67521 @@ -377,12 +377,12 @@ extern char *softirq_to_name[NR_SOFTIRQS];
67522
67523 struct softirq_action
67524 {
67525 - void (*action)(struct softirq_action *);
67526 + void (*action)(void);
67527 };
67528
67529 asmlinkage void do_softirq(void);
67530 asmlinkage void __do_softirq(void);
67531 -extern void open_softirq(int nr, void (*action)(struct softirq_action *));
67532 +extern void open_softirq(int nr, void (*action)(void));
67533 extern void softirq_init(void);
67534 #define __raise_softirq_irqoff(nr) do { or_softirq_pending(1UL << (nr)); } while (0)
67535 extern void raise_softirq_irqoff(unsigned int nr);
67536 diff --git a/include/linux/irq.h b/include/linux/irq.h
67537 index 9e5f45a..025865b 100644
67538 --- a/include/linux/irq.h
67539 +++ b/include/linux/irq.h
67540 @@ -438,12 +438,12 @@ extern int set_irq_msi(unsigned int irq, struct msi_desc *entry);
67541 static inline bool alloc_desc_masks(struct irq_desc *desc, int node,
67542 bool boot)
67543 {
67544 +#ifdef CONFIG_CPUMASK_OFFSTACK
67545 gfp_t gfp = GFP_ATOMIC;
67546
67547 if (boot)
67548 gfp = GFP_NOWAIT;
67549
67550 -#ifdef CONFIG_CPUMASK_OFFSTACK
67551 if (!alloc_cpumask_var_node(&desc->affinity, gfp, node))
67552 return false;
67553
67554 diff --git a/include/linux/kallsyms.h b/include/linux/kallsyms.h
67555 index 7922742..27306a2 100644
67556 --- a/include/linux/kallsyms.h
67557 +++ b/include/linux/kallsyms.h
67558 @@ -15,7 +15,8 @@
67559
67560 struct module;
67561
67562 -#ifdef CONFIG_KALLSYMS
67563 +#if !defined(__INCLUDED_BY_HIDESYM) || !defined(CONFIG_KALLSYMS)
67564 +#if defined(CONFIG_KALLSYMS) && !defined(CONFIG_GRKERNSEC_HIDESYM)
67565 /* Lookup the address for a symbol. Returns 0 if not found. */
67566 unsigned long kallsyms_lookup_name(const char *name);
67567
67568 @@ -92,6 +93,15 @@ static inline int lookup_symbol_attrs(unsigned long addr, unsigned long *size, u
67569 /* Stupid that this does nothing, but I didn't create this mess. */
67570 #define __print_symbol(fmt, addr)
67571 #endif /*CONFIG_KALLSYMS*/
67572 +#else /* when included by kallsyms.c, vsnprintf.c, or
67573 + arch/x86/kernel/dumpstack.c, with HIDESYM enabled */
67574 +extern void __print_symbol(const char *fmt, unsigned long address);
67575 +extern int sprint_symbol(char *buffer, unsigned long address);
67576 +const char *kallsyms_lookup(unsigned long addr,
67577 + unsigned long *symbolsize,
67578 + unsigned long *offset,
67579 + char **modname, char *namebuf);
67580 +#endif
67581
67582 /* This macro allows us to keep printk typechecking */
67583 static void __check_printsym_format(const char *fmt, ...)
67584 diff --git a/include/linux/kgdb.h b/include/linux/kgdb.h
67585 index 6adcc29..13369e8 100644
67586 --- a/include/linux/kgdb.h
67587 +++ b/include/linux/kgdb.h
67588 @@ -74,8 +74,8 @@ void kgdb_breakpoint(void);
67589
67590 extern int kgdb_connected;
67591
67592 -extern atomic_t kgdb_setting_breakpoint;
67593 -extern atomic_t kgdb_cpu_doing_single_step;
67594 +extern atomic_unchecked_t kgdb_setting_breakpoint;
67595 +extern atomic_unchecked_t kgdb_cpu_doing_single_step;
67596
67597 extern struct task_struct *kgdb_usethread;
67598 extern struct task_struct *kgdb_contthread;
67599 @@ -235,7 +235,7 @@ struct kgdb_arch {
67600 int (*remove_hw_breakpoint)(unsigned long, int, enum kgdb_bptype);
67601 void (*remove_all_hw_break)(void);
67602 void (*correct_hw_break)(void);
67603 -};
67604 +} __do_const;
67605
67606 /**
67607 * struct kgdb_io - Describe the interface for an I/O driver to talk with KGDB.
67608 @@ -257,14 +257,14 @@ struct kgdb_io {
67609 int (*init) (void);
67610 void (*pre_exception) (void);
67611 void (*post_exception) (void);
67612 -};
67613 +} __do_const;
67614
67615 -extern struct kgdb_arch arch_kgdb_ops;
67616 +extern const struct kgdb_arch arch_kgdb_ops;
67617
67618 extern unsigned long __weak kgdb_arch_pc(int exception, struct pt_regs *regs);
67619
67620 -extern int kgdb_register_io_module(struct kgdb_io *local_kgdb_io_ops);
67621 -extern void kgdb_unregister_io_module(struct kgdb_io *local_kgdb_io_ops);
67622 +extern int kgdb_register_io_module(const struct kgdb_io *local_kgdb_io_ops);
67623 +extern void kgdb_unregister_io_module(const struct kgdb_io *local_kgdb_io_ops);
67624
67625 extern int kgdb_hex2long(char **ptr, unsigned long *long_val);
67626 extern int kgdb_mem2hex(char *mem, char *buf, int count);
67627 diff --git a/include/linux/kmod.h b/include/linux/kmod.h
67628 index 384ca8b..83dd97d 100644
67629 --- a/include/linux/kmod.h
67630 +++ b/include/linux/kmod.h
67631 @@ -31,6 +31,8 @@
67632 * usually useless though. */
67633 extern int __request_module(bool wait, const char *name, ...) \
67634 __attribute__((format(printf, 2, 3)));
67635 +extern int ___request_module(bool wait, char *param_name, const char *name, ...) \
67636 + __attribute__((format(printf, 3, 4)));
67637 #define request_module(mod...) __request_module(true, mod)
67638 #define request_module_nowait(mod...) __request_module(false, mod)
67639 #define try_then_request_module(x, mod...) \
67640 diff --git a/include/linux/kobject.h b/include/linux/kobject.h
67641 index 58ae8e0..3950d3c 100644
67642 --- a/include/linux/kobject.h
67643 +++ b/include/linux/kobject.h
67644 @@ -106,7 +106,7 @@ extern char *kobject_get_path(struct kobject *kobj, gfp_t flag);
67645
67646 struct kobj_type {
67647 void (*release)(struct kobject *kobj);
67648 - struct sysfs_ops *sysfs_ops;
67649 + const struct sysfs_ops *sysfs_ops;
67650 struct attribute **default_attrs;
67651 };
67652
67653 @@ -118,9 +118,9 @@ struct kobj_uevent_env {
67654 };
67655
67656 struct kset_uevent_ops {
67657 - int (*filter)(struct kset *kset, struct kobject *kobj);
67658 - const char *(*name)(struct kset *kset, struct kobject *kobj);
67659 - int (*uevent)(struct kset *kset, struct kobject *kobj,
67660 + int (* const filter)(struct kset *kset, struct kobject *kobj);
67661 + const char *(* const name)(struct kset *kset, struct kobject *kobj);
67662 + int (* const uevent)(struct kset *kset, struct kobject *kobj,
67663 struct kobj_uevent_env *env);
67664 };
67665
67666 @@ -132,7 +132,7 @@ struct kobj_attribute {
67667 const char *buf, size_t count);
67668 };
67669
67670 -extern struct sysfs_ops kobj_sysfs_ops;
67671 +extern const struct sysfs_ops kobj_sysfs_ops;
67672
67673 /**
67674 * struct kset - a set of kobjects of a specific type, belonging to a specific subsystem.
67675 @@ -155,14 +155,14 @@ struct kset {
67676 struct list_head list;
67677 spinlock_t list_lock;
67678 struct kobject kobj;
67679 - struct kset_uevent_ops *uevent_ops;
67680 + const struct kset_uevent_ops *uevent_ops;
67681 };
67682
67683 extern void kset_init(struct kset *kset);
67684 extern int __must_check kset_register(struct kset *kset);
67685 extern void kset_unregister(struct kset *kset);
67686 extern struct kset * __must_check kset_create_and_add(const char *name,
67687 - struct kset_uevent_ops *u,
67688 + const struct kset_uevent_ops *u,
67689 struct kobject *parent_kobj);
67690
67691 static inline struct kset *to_kset(struct kobject *kobj)
67692 diff --git a/include/linux/kvm_host.h b/include/linux/kvm_host.h
67693 index c728a50..752d821 100644
67694 --- a/include/linux/kvm_host.h
67695 +++ b/include/linux/kvm_host.h
67696 @@ -210,7 +210,7 @@ void kvm_vcpu_uninit(struct kvm_vcpu *vcpu);
67697 void vcpu_load(struct kvm_vcpu *vcpu);
67698 void vcpu_put(struct kvm_vcpu *vcpu);
67699
67700 -int kvm_init(void *opaque, unsigned int vcpu_size,
67701 +int kvm_init(const void *opaque, unsigned int vcpu_size,
67702 struct module *module);
67703 void kvm_exit(void);
67704
67705 @@ -316,7 +316,7 @@ int kvm_arch_vcpu_ioctl_set_guest_debug(struct kvm_vcpu *vcpu,
67706 struct kvm_guest_debug *dbg);
67707 int kvm_arch_vcpu_ioctl_run(struct kvm_vcpu *vcpu, struct kvm_run *kvm_run);
67708
67709 -int kvm_arch_init(void *opaque);
67710 +int kvm_arch_init(const void *opaque);
67711 void kvm_arch_exit(void);
67712
67713 int kvm_arch_vcpu_init(struct kvm_vcpu *vcpu);
67714 diff --git a/include/linux/libata.h b/include/linux/libata.h
67715 index a069916..223edde 100644
67716 --- a/include/linux/libata.h
67717 +++ b/include/linux/libata.h
67718 @@ -525,11 +525,11 @@ struct ata_ioports {
67719
67720 struct ata_host {
67721 spinlock_t lock;
67722 - struct device *dev;
67723 + struct device *dev;
67724 void __iomem * const *iomap;
67725 unsigned int n_ports;
67726 void *private_data;
67727 - struct ata_port_operations *ops;
67728 + const struct ata_port_operations *ops;
67729 unsigned long flags;
67730 #ifdef CONFIG_ATA_ACPI
67731 acpi_handle acpi_handle;
67732 @@ -710,7 +710,7 @@ struct ata_link {
67733
67734 struct ata_port {
67735 struct Scsi_Host *scsi_host; /* our co-allocated scsi host */
67736 - struct ata_port_operations *ops;
67737 + const struct ata_port_operations *ops;
67738 spinlock_t *lock;
67739 /* Flags owned by the EH context. Only EH should touch these once the
67740 port is active */
67741 @@ -884,7 +884,7 @@ struct ata_port_operations {
67742 * fields must be pointers.
67743 */
67744 const struct ata_port_operations *inherits;
67745 -};
67746 +} __do_const;
67747
67748 struct ata_port_info {
67749 unsigned long flags;
67750 @@ -892,7 +892,7 @@ struct ata_port_info {
67751 unsigned long pio_mask;
67752 unsigned long mwdma_mask;
67753 unsigned long udma_mask;
67754 - struct ata_port_operations *port_ops;
67755 + const struct ata_port_operations *port_ops;
67756 void *private_data;
67757 };
67758
67759 @@ -916,7 +916,7 @@ extern const unsigned long sata_deb_timing_normal[];
67760 extern const unsigned long sata_deb_timing_hotplug[];
67761 extern const unsigned long sata_deb_timing_long[];
67762
67763 -extern struct ata_port_operations ata_dummy_port_ops;
67764 +extern const struct ata_port_operations ata_dummy_port_ops;
67765 extern const struct ata_port_info ata_dummy_port_info;
67766
67767 static inline const unsigned long *
67768 @@ -962,7 +962,7 @@ extern int ata_host_activate(struct ata_host *host, int irq,
67769 struct scsi_host_template *sht);
67770 extern void ata_host_detach(struct ata_host *host);
67771 extern void ata_host_init(struct ata_host *, struct device *,
67772 - unsigned long, struct ata_port_operations *);
67773 + unsigned long, const struct ata_port_operations *);
67774 extern int ata_scsi_detect(struct scsi_host_template *sht);
67775 extern int ata_scsi_ioctl(struct scsi_device *dev, int cmd, void __user *arg);
67776 extern int ata_scsi_queuecmd(struct scsi_cmnd *cmd, void (*done)(struct scsi_cmnd *));
67777 diff --git a/include/linux/lockd/bind.h b/include/linux/lockd/bind.h
67778 index fbc48f8..0886e57 100644
67779 --- a/include/linux/lockd/bind.h
67780 +++ b/include/linux/lockd/bind.h
67781 @@ -23,13 +23,13 @@ struct svc_rqst;
67782 * This is the set of functions for lockd->nfsd communication
67783 */
67784 struct nlmsvc_binding {
67785 - __be32 (*fopen)(struct svc_rqst *,
67786 + __be32 (* const fopen)(struct svc_rqst *,
67787 struct nfs_fh *,
67788 struct file **);
67789 - void (*fclose)(struct file *);
67790 + void (* const fclose)(struct file *);
67791 };
67792
67793 -extern struct nlmsvc_binding * nlmsvc_ops;
67794 +extern const struct nlmsvc_binding * nlmsvc_ops;
67795
67796 /*
67797 * Similar to nfs_client_initdata, but without the NFS-specific
67798 diff --git a/include/linux/mca.h b/include/linux/mca.h
67799 index 3797270..7765ede 100644
67800 --- a/include/linux/mca.h
67801 +++ b/include/linux/mca.h
67802 @@ -80,7 +80,7 @@ struct mca_bus_accessor_functions {
67803 int region);
67804 void * (*mca_transform_memory)(struct mca_device *,
67805 void *memory);
67806 -};
67807 +} __no_const;
67808
67809 struct mca_bus {
67810 u64 default_dma_mask;
67811 diff --git a/include/linux/memory.h b/include/linux/memory.h
67812 index 37fa19b..b597c85 100644
67813 --- a/include/linux/memory.h
67814 +++ b/include/linux/memory.h
67815 @@ -108,7 +108,7 @@ struct memory_accessor {
67816 size_t count);
67817 ssize_t (*write)(struct memory_accessor *, const char *buf,
67818 off_t offset, size_t count);
67819 -};
67820 +} __no_const;
67821
67822 /*
67823 * Kernel text modification mutex, used for code patching. Users of this lock
67824 diff --git a/include/linux/mm.h b/include/linux/mm.h
67825 index 11e5be6..1ff2423 100644
67826 --- a/include/linux/mm.h
67827 +++ b/include/linux/mm.h
67828 @@ -106,7 +106,14 @@ extern unsigned int kobjsize(const void *objp);
67829
67830 #define VM_CAN_NONLINEAR 0x08000000 /* Has ->fault & does nonlinear pages */
67831 #define VM_MIXEDMAP 0x10000000 /* Can contain "struct page" and pure PFN pages */
67832 +
67833 +#if defined(CONFIG_PAX_PAGEEXEC) && defined(CONFIG_X86_32)
67834 +#define VM_SAO 0x00000000 /* Strong Access Ordering (powerpc) */
67835 +#define VM_PAGEEXEC 0x20000000 /* vma->vm_page_prot needs special handling */
67836 +#else
67837 #define VM_SAO 0x20000000 /* Strong Access Ordering (powerpc) */
67838 +#endif
67839 +
67840 #define VM_PFN_AT_MMAP 0x40000000 /* PFNMAP vma that is fully mapped at mmap time */
67841 #define VM_MERGEABLE 0x80000000 /* KSM may merge identical pages */
67842
67843 @@ -841,12 +848,6 @@ int set_page_dirty(struct page *page);
67844 int set_page_dirty_lock(struct page *page);
67845 int clear_page_dirty_for_io(struct page *page);
67846
67847 -/* Is the vma a continuation of the stack vma above it? */
67848 -static inline int vma_stack_continue(struct vm_area_struct *vma, unsigned long addr)
67849 -{
67850 - return vma && (vma->vm_end == addr) && (vma->vm_flags & VM_GROWSDOWN);
67851 -}
67852 -
67853 extern unsigned long move_page_tables(struct vm_area_struct *vma,
67854 unsigned long old_addr, struct vm_area_struct *new_vma,
67855 unsigned long new_addr, unsigned long len);
67856 @@ -890,6 +891,8 @@ struct shrinker {
67857 extern void register_shrinker(struct shrinker *);
67858 extern void unregister_shrinker(struct shrinker *);
67859
67860 +pgprot_t vm_get_page_prot(unsigned long vm_flags);
67861 +
67862 int vma_wants_writenotify(struct vm_area_struct *vma);
67863
67864 extern pte_t *get_locked_pte(struct mm_struct *mm, unsigned long addr, spinlock_t **ptl);
67865 @@ -1162,6 +1165,7 @@ out:
67866 }
67867
67868 extern int do_munmap(struct mm_struct *, unsigned long, size_t);
67869 +extern int __do_munmap(struct mm_struct *, unsigned long, size_t);
67870
67871 extern unsigned long do_brk(unsigned long, unsigned long);
67872
67873 @@ -1218,6 +1222,10 @@ extern struct vm_area_struct * find_vma(struct mm_struct * mm, unsigned long add
67874 extern struct vm_area_struct * find_vma_prev(struct mm_struct * mm, unsigned long addr,
67875 struct vm_area_struct **pprev);
67876
67877 +extern struct vm_area_struct *pax_find_mirror_vma(struct vm_area_struct *vma);
67878 +extern void pax_mirror_vma(struct vm_area_struct *vma_m, struct vm_area_struct *vma);
67879 +extern void pax_mirror_file_pte(struct vm_area_struct *vma, unsigned long address, struct page *page_m, spinlock_t *ptl);
67880 +
67881 /* Look up the first VMA which intersects the interval start_addr..end_addr-1,
67882 NULL if none. Assume start_addr < end_addr. */
67883 static inline struct vm_area_struct * find_vma_intersection(struct mm_struct * mm, unsigned long start_addr, unsigned long end_addr)
67884 @@ -1234,7 +1242,6 @@ static inline unsigned long vma_pages(struct vm_area_struct *vma)
67885 return (vma->vm_end - vma->vm_start) >> PAGE_SHIFT;
67886 }
67887
67888 -pgprot_t vm_get_page_prot(unsigned long vm_flags);
67889 struct vm_area_struct *find_extend_vma(struct mm_struct *, unsigned long addr);
67890 int remap_pfn_range(struct vm_area_struct *, unsigned long addr,
67891 unsigned long pfn, unsigned long size, pgprot_t);
67892 @@ -1332,7 +1339,13 @@ extern void memory_failure(unsigned long pfn, int trapno);
67893 extern int __memory_failure(unsigned long pfn, int trapno, int ref);
67894 extern int sysctl_memory_failure_early_kill;
67895 extern int sysctl_memory_failure_recovery;
67896 -extern atomic_long_t mce_bad_pages;
67897 +extern atomic_long_unchecked_t mce_bad_pages;
67898 +
67899 +#ifdef CONFIG_ARCH_TRACK_EXEC_LIMIT
67900 +extern void track_exec_limit(struct mm_struct *mm, unsigned long start, unsigned long end, unsigned long prot);
67901 +#else
67902 +static inline void track_exec_limit(struct mm_struct *mm, unsigned long start, unsigned long end, unsigned long prot) {}
67903 +#endif
67904
67905 #endif /* __KERNEL__ */
67906 #endif /* _LINUX_MM_H */
67907 diff --git a/include/linux/mm_types.h b/include/linux/mm_types.h
67908 index 9d12ed5..6d9707a 100644
67909 --- a/include/linux/mm_types.h
67910 +++ b/include/linux/mm_types.h
67911 @@ -186,6 +186,8 @@ struct vm_area_struct {
67912 #ifdef CONFIG_NUMA
67913 struct mempolicy *vm_policy; /* NUMA policy for the VMA */
67914 #endif
67915 +
67916 + struct vm_area_struct *vm_mirror;/* PaX: mirror vma or NULL */
67917 };
67918
67919 struct core_thread {
67920 @@ -287,6 +289,24 @@ struct mm_struct {
67921 #ifdef CONFIG_MMU_NOTIFIER
67922 struct mmu_notifier_mm *mmu_notifier_mm;
67923 #endif
67924 +
67925 +#if defined(CONFIG_PAX_NOEXEC) || defined(CONFIG_PAX_ASLR)
67926 + unsigned long pax_flags;
67927 +#endif
67928 +
67929 +#ifdef CONFIG_PAX_DLRESOLVE
67930 + unsigned long call_dl_resolve;
67931 +#endif
67932 +
67933 +#if defined(CONFIG_PPC32) && defined(CONFIG_PAX_EMUSIGRT)
67934 + unsigned long call_syscall;
67935 +#endif
67936 +
67937 +#ifdef CONFIG_PAX_ASLR
67938 + unsigned long delta_mmap; /* randomized offset */
67939 + unsigned long delta_stack; /* randomized offset */
67940 +#endif
67941 +
67942 };
67943
67944 /* Future-safe accessor for struct mm_struct's cpu_vm_mask. */
67945 diff --git a/include/linux/mmu_notifier.h b/include/linux/mmu_notifier.h
67946 index 4e02ee2..afb159e 100644
67947 --- a/include/linux/mmu_notifier.h
67948 +++ b/include/linux/mmu_notifier.h
67949 @@ -235,12 +235,12 @@ static inline void mmu_notifier_mm_destroy(struct mm_struct *mm)
67950 */
67951 #define ptep_clear_flush_notify(__vma, __address, __ptep) \
67952 ({ \
67953 - pte_t __pte; \
67954 + pte_t ___pte; \
67955 struct vm_area_struct *___vma = __vma; \
67956 unsigned long ___address = __address; \
67957 - __pte = ptep_clear_flush(___vma, ___address, __ptep); \
67958 + ___pte = ptep_clear_flush(___vma, ___address, __ptep); \
67959 mmu_notifier_invalidate_page(___vma->vm_mm, ___address); \
67960 - __pte; \
67961 + ___pte; \
67962 })
67963
67964 #define ptep_clear_flush_young_notify(__vma, __address, __ptep) \
67965 diff --git a/include/linux/mmzone.h b/include/linux/mmzone.h
67966 index 6c31a2a..4b0e930 100644
67967 --- a/include/linux/mmzone.h
67968 +++ b/include/linux/mmzone.h
67969 @@ -350,7 +350,7 @@ struct zone {
67970 unsigned long flags; /* zone flags, see below */
67971
67972 /* Zone statistics */
67973 - atomic_long_t vm_stat[NR_VM_ZONE_STAT_ITEMS];
67974 + atomic_long_unchecked_t vm_stat[NR_VM_ZONE_STAT_ITEMS];
67975
67976 /*
67977 * prev_priority holds the scanning priority for this zone. It is
67978 diff --git a/include/linux/mod_devicetable.h b/include/linux/mod_devicetable.h
67979 index f58e9d8..3503935 100644
67980 --- a/include/linux/mod_devicetable.h
67981 +++ b/include/linux/mod_devicetable.h
67982 @@ -12,7 +12,7 @@
67983 typedef unsigned long kernel_ulong_t;
67984 #endif
67985
67986 -#define PCI_ANY_ID (~0)
67987 +#define PCI_ANY_ID ((__u16)~0)
67988
67989 struct pci_device_id {
67990 __u32 vendor, device; /* Vendor and device ID or PCI_ANY_ID*/
67991 @@ -131,7 +131,7 @@ struct usb_device_id {
67992 #define USB_DEVICE_ID_MATCH_INT_SUBCLASS 0x0100
67993 #define USB_DEVICE_ID_MATCH_INT_PROTOCOL 0x0200
67994
67995 -#define HID_ANY_ID (~0)
67996 +#define HID_ANY_ID (~0U)
67997
67998 struct hid_device_id {
67999 __u16 bus;
68000 diff --git a/include/linux/module.h b/include/linux/module.h
68001 index 482efc8..642032b 100644
68002 --- a/include/linux/module.h
68003 +++ b/include/linux/module.h
68004 @@ -16,6 +16,7 @@
68005 #include <linux/kobject.h>
68006 #include <linux/moduleparam.h>
68007 #include <linux/tracepoint.h>
68008 +#include <linux/fs.h>
68009
68010 #include <asm/local.h>
68011 #include <asm/module.h>
68012 @@ -287,16 +288,16 @@ struct module
68013 int (*init)(void);
68014
68015 /* If this is non-NULL, vfree after init() returns */
68016 - void *module_init;
68017 + void *module_init_rx, *module_init_rw;
68018
68019 /* Here is the actual code + data, vfree'd on unload. */
68020 - void *module_core;
68021 + void *module_core_rx, *module_core_rw;
68022
68023 /* Here are the sizes of the init and core sections */
68024 - unsigned int init_size, core_size;
68025 + unsigned int init_size_rw, core_size_rw;
68026
68027 /* The size of the executable code in each section. */
68028 - unsigned int init_text_size, core_text_size;
68029 + unsigned int init_size_rx, core_size_rx;
68030
68031 /* Arch-specific module values */
68032 struct mod_arch_specific arch;
68033 @@ -345,6 +346,10 @@ struct module
68034 #ifdef CONFIG_EVENT_TRACING
68035 struct ftrace_event_call *trace_events;
68036 unsigned int num_trace_events;
68037 + struct file_operations trace_id;
68038 + struct file_operations trace_enable;
68039 + struct file_operations trace_format;
68040 + struct file_operations trace_filter;
68041 #endif
68042 #ifdef CONFIG_FTRACE_MCOUNT_RECORD
68043 unsigned long *ftrace_callsites;
68044 @@ -393,16 +398,46 @@ struct module *__module_address(unsigned long addr);
68045 bool is_module_address(unsigned long addr);
68046 bool is_module_text_address(unsigned long addr);
68047
68048 +static inline int within_module_range(unsigned long addr, void *start, unsigned long size)
68049 +{
68050 +
68051 +#ifdef CONFIG_PAX_KERNEXEC
68052 + if (ktla_ktva(addr) >= (unsigned long)start &&
68053 + ktla_ktva(addr) < (unsigned long)start + size)
68054 + return 1;
68055 +#endif
68056 +
68057 + return ((void *)addr >= start && (void *)addr < start + size);
68058 +}
68059 +
68060 +static inline int within_module_core_rx(unsigned long addr, struct module *mod)
68061 +{
68062 + return within_module_range(addr, mod->module_core_rx, mod->core_size_rx);
68063 +}
68064 +
68065 +static inline int within_module_core_rw(unsigned long addr, struct module *mod)
68066 +{
68067 + return within_module_range(addr, mod->module_core_rw, mod->core_size_rw);
68068 +}
68069 +
68070 +static inline int within_module_init_rx(unsigned long addr, struct module *mod)
68071 +{
68072 + return within_module_range(addr, mod->module_init_rx, mod->init_size_rx);
68073 +}
68074 +
68075 +static inline int within_module_init_rw(unsigned long addr, struct module *mod)
68076 +{
68077 + return within_module_range(addr, mod->module_init_rw, mod->init_size_rw);
68078 +}
68079 +
68080 static inline int within_module_core(unsigned long addr, struct module *mod)
68081 {
68082 - return (unsigned long)mod->module_core <= addr &&
68083 - addr < (unsigned long)mod->module_core + mod->core_size;
68084 + return within_module_core_rx(addr, mod) || within_module_core_rw(addr, mod);
68085 }
68086
68087 static inline int within_module_init(unsigned long addr, struct module *mod)
68088 {
68089 - return (unsigned long)mod->module_init <= addr &&
68090 - addr < (unsigned long)mod->module_init + mod->init_size;
68091 + return within_module_init_rx(addr, mod) || within_module_init_rw(addr, mod);
68092 }
68093
68094 /* Search for module by name: must hold module_mutex. */
68095 diff --git a/include/linux/moduleloader.h b/include/linux/moduleloader.h
68096 index c1f40c2..682ca53 100644
68097 --- a/include/linux/moduleloader.h
68098 +++ b/include/linux/moduleloader.h
68099 @@ -20,9 +20,21 @@ unsigned int arch_mod_section_prepend(struct module *mod, unsigned int section);
68100 sections. Returns NULL on failure. */
68101 void *module_alloc(unsigned long size);
68102
68103 +#ifdef CONFIG_PAX_KERNEXEC
68104 +void *module_alloc_exec(unsigned long size);
68105 +#else
68106 +#define module_alloc_exec(x) module_alloc(x)
68107 +#endif
68108 +
68109 /* Free memory returned from module_alloc. */
68110 void module_free(struct module *mod, void *module_region);
68111
68112 +#ifdef CONFIG_PAX_KERNEXEC
68113 +void module_free_exec(struct module *mod, void *module_region);
68114 +#else
68115 +#define module_free_exec(x, y) module_free((x), (y))
68116 +#endif
68117 +
68118 /* Apply the given relocation to the (simplified) ELF. Return -error
68119 or 0. */
68120 int apply_relocate(Elf_Shdr *sechdrs,
68121 diff --git a/include/linux/moduleparam.h b/include/linux/moduleparam.h
68122 index 82a9124..8a5f622 100644
68123 --- a/include/linux/moduleparam.h
68124 +++ b/include/linux/moduleparam.h
68125 @@ -132,7 +132,7 @@ struct kparam_array
68126
68127 /* Actually copy string: maxlen param is usually sizeof(string). */
68128 #define module_param_string(name, string, len, perm) \
68129 - static const struct kparam_string __param_string_##name \
68130 + static const struct kparam_string __param_string_##name __used \
68131 = { len, string }; \
68132 __module_param_call(MODULE_PARAM_PREFIX, name, \
68133 param_set_copystring, param_get_string, \
68134 @@ -211,7 +211,7 @@ extern int param_get_invbool(char *buffer, struct kernel_param *kp);
68135
68136 /* Comma-separated array: *nump is set to number they actually specified. */
68137 #define module_param_array_named(name, array, type, nump, perm) \
68138 - static const struct kparam_array __param_arr_##name \
68139 + static const struct kparam_array __param_arr_##name __used \
68140 = { ARRAY_SIZE(array), nump, param_set_##type, param_get_##type,\
68141 sizeof(array[0]), array }; \
68142 __module_param_call(MODULE_PARAM_PREFIX, name, \
68143 diff --git a/include/linux/mutex.h b/include/linux/mutex.h
68144 index 878cab4..c92cb3e 100644
68145 --- a/include/linux/mutex.h
68146 +++ b/include/linux/mutex.h
68147 @@ -51,7 +51,7 @@ struct mutex {
68148 spinlock_t wait_lock;
68149 struct list_head wait_list;
68150 #if defined(CONFIG_DEBUG_MUTEXES) || defined(CONFIG_SMP)
68151 - struct thread_info *owner;
68152 + struct task_struct *owner;
68153 #endif
68154 #ifdef CONFIG_DEBUG_MUTEXES
68155 const char *name;
68156 diff --git a/include/linux/namei.h b/include/linux/namei.h
68157 index ec0f607..d19e675 100644
68158 --- a/include/linux/namei.h
68159 +++ b/include/linux/namei.h
68160 @@ -22,7 +22,7 @@ struct nameidata {
68161 unsigned int flags;
68162 int last_type;
68163 unsigned depth;
68164 - char *saved_names[MAX_NESTED_LINKS + 1];
68165 + const char *saved_names[MAX_NESTED_LINKS + 1];
68166
68167 /* Intent data */
68168 union {
68169 @@ -84,12 +84,12 @@ extern int follow_up(struct path *);
68170 extern struct dentry *lock_rename(struct dentry *, struct dentry *);
68171 extern void unlock_rename(struct dentry *, struct dentry *);
68172
68173 -static inline void nd_set_link(struct nameidata *nd, char *path)
68174 +static inline void nd_set_link(struct nameidata *nd, const char *path)
68175 {
68176 nd->saved_names[nd->depth] = path;
68177 }
68178
68179 -static inline char *nd_get_link(struct nameidata *nd)
68180 +static inline const char *nd_get_link(const struct nameidata *nd)
68181 {
68182 return nd->saved_names[nd->depth];
68183 }
68184 diff --git a/include/linux/netdevice.h b/include/linux/netdevice.h
68185 index 9d7e8f7..04428c5 100644
68186 --- a/include/linux/netdevice.h
68187 +++ b/include/linux/netdevice.h
68188 @@ -637,6 +637,7 @@ struct net_device_ops {
68189 u16 xid);
68190 #endif
68191 };
68192 +typedef struct net_device_ops __no_const net_device_ops_no_const;
68193
68194 /*
68195 * The DEVICE structure.
68196 diff --git a/include/linux/netfilter/xt_gradm.h b/include/linux/netfilter/xt_gradm.h
68197 new file mode 100644
68198 index 0000000..33f4af8
68199 --- /dev/null
68200 +++ b/include/linux/netfilter/xt_gradm.h
68201 @@ -0,0 +1,9 @@
68202 +#ifndef _LINUX_NETFILTER_XT_GRADM_H
68203 +#define _LINUX_NETFILTER_XT_GRADM_H 1
68204 +
68205 +struct xt_gradm_mtinfo {
68206 + __u16 flags;
68207 + __u16 invflags;
68208 +};
68209 +
68210 +#endif
68211 diff --git a/include/linux/nodemask.h b/include/linux/nodemask.h
68212 index b359c4a..c08b334 100644
68213 --- a/include/linux/nodemask.h
68214 +++ b/include/linux/nodemask.h
68215 @@ -464,11 +464,11 @@ static inline int num_node_state(enum node_states state)
68216
68217 #define any_online_node(mask) \
68218 ({ \
68219 - int node; \
68220 - for_each_node_mask(node, (mask)) \
68221 - if (node_online(node)) \
68222 + int __node; \
68223 + for_each_node_mask(__node, (mask)) \
68224 + if (node_online(__node)) \
68225 break; \
68226 - node; \
68227 + __node; \
68228 })
68229
68230 #define num_online_nodes() num_node_state(N_ONLINE)
68231 diff --git a/include/linux/oprofile.h b/include/linux/oprofile.h
68232 index 5171639..7cf4235 100644
68233 --- a/include/linux/oprofile.h
68234 +++ b/include/linux/oprofile.h
68235 @@ -129,9 +129,9 @@ int oprofilefs_create_ulong(struct super_block * sb, struct dentry * root,
68236 int oprofilefs_create_ro_ulong(struct super_block * sb, struct dentry * root,
68237 char const * name, ulong * val);
68238
68239 -/** Create a file for read-only access to an atomic_t. */
68240 +/** Create a file for read-only access to an atomic_unchecked_t. */
68241 int oprofilefs_create_ro_atomic(struct super_block * sb, struct dentry * root,
68242 - char const * name, atomic_t * val);
68243 + char const * name, atomic_unchecked_t * val);
68244
68245 /** create a directory */
68246 struct dentry * oprofilefs_mkdir(struct super_block * sb, struct dentry * root,
68247 diff --git a/include/linux/pagemap.h b/include/linux/pagemap.h
68248 index 3c62ed4..8924c7c 100644
68249 --- a/include/linux/pagemap.h
68250 +++ b/include/linux/pagemap.h
68251 @@ -425,7 +425,9 @@ static inline int fault_in_pages_readable(const char __user *uaddr, int size)
68252 if (((unsigned long)uaddr & PAGE_MASK) !=
68253 ((unsigned long)end & PAGE_MASK))
68254 ret = __get_user(c, end);
68255 + (void)c;
68256 }
68257 + (void)c;
68258 return ret;
68259 }
68260
68261 diff --git a/include/linux/perf_event.h b/include/linux/perf_event.h
68262 index 81c9689..a567a55 100644
68263 --- a/include/linux/perf_event.h
68264 +++ b/include/linux/perf_event.h
68265 @@ -476,7 +476,7 @@ struct hw_perf_event {
68266 struct hrtimer hrtimer;
68267 };
68268 };
68269 - atomic64_t prev_count;
68270 + atomic64_unchecked_t prev_count;
68271 u64 sample_period;
68272 u64 last_period;
68273 atomic64_t period_left;
68274 @@ -557,7 +557,7 @@ struct perf_event {
68275 const struct pmu *pmu;
68276
68277 enum perf_event_active_state state;
68278 - atomic64_t count;
68279 + atomic64_unchecked_t count;
68280
68281 /*
68282 * These are the total time in nanoseconds that the event
68283 @@ -595,8 +595,8 @@ struct perf_event {
68284 * These accumulate total time (in nanoseconds) that children
68285 * events have been enabled and running, respectively.
68286 */
68287 - atomic64_t child_total_time_enabled;
68288 - atomic64_t child_total_time_running;
68289 + atomic64_unchecked_t child_total_time_enabled;
68290 + atomic64_unchecked_t child_total_time_running;
68291
68292 /*
68293 * Protect attach/detach and child_list:
68294 diff --git a/include/linux/pipe_fs_i.h b/include/linux/pipe_fs_i.h
68295 index b43a9e0..b77d869 100644
68296 --- a/include/linux/pipe_fs_i.h
68297 +++ b/include/linux/pipe_fs_i.h
68298 @@ -46,9 +46,9 @@ struct pipe_inode_info {
68299 wait_queue_head_t wait;
68300 unsigned int nrbufs, curbuf;
68301 struct page *tmp_page;
68302 - unsigned int readers;
68303 - unsigned int writers;
68304 - unsigned int waiting_writers;
68305 + atomic_t readers;
68306 + atomic_t writers;
68307 + atomic_t waiting_writers;
68308 unsigned int r_counter;
68309 unsigned int w_counter;
68310 struct fasync_struct *fasync_readers;
68311 diff --git a/include/linux/poison.h b/include/linux/poison.h
68312 index 34066ff..e95d744 100644
68313 --- a/include/linux/poison.h
68314 +++ b/include/linux/poison.h
68315 @@ -19,8 +19,8 @@
68316 * under normal circumstances, used to verify that nobody uses
68317 * non-initialized list entries.
68318 */
68319 -#define LIST_POISON1 ((void *) 0x00100100 + POISON_POINTER_DELTA)
68320 -#define LIST_POISON2 ((void *) 0x00200200 + POISON_POINTER_DELTA)
68321 +#define LIST_POISON1 ((void *) (long)0xFFFFFF01)
68322 +#define LIST_POISON2 ((void *) (long)0xFFFFFF02)
68323
68324 /********** include/linux/timer.h **********/
68325 /*
68326 diff --git a/include/linux/posix-timers.h b/include/linux/posix-timers.h
68327 index 4f71bf4..77ffa64 100644
68328 --- a/include/linux/posix-timers.h
68329 +++ b/include/linux/posix-timers.h
68330 @@ -67,7 +67,7 @@ struct k_itimer {
68331 };
68332
68333 struct k_clock {
68334 - int res; /* in nanoseconds */
68335 + const int res; /* in nanoseconds */
68336 int (*clock_getres) (const clockid_t which_clock, struct timespec *tp);
68337 int (*clock_set) (const clockid_t which_clock, struct timespec * tp);
68338 int (*clock_get) (const clockid_t which_clock, struct timespec * tp);
68339 diff --git a/include/linux/preempt.h b/include/linux/preempt.h
68340 index 72b1a10..13303a9 100644
68341 --- a/include/linux/preempt.h
68342 +++ b/include/linux/preempt.h
68343 @@ -110,7 +110,7 @@ struct preempt_ops {
68344 void (*sched_in)(struct preempt_notifier *notifier, int cpu);
68345 void (*sched_out)(struct preempt_notifier *notifier,
68346 struct task_struct *next);
68347 -};
68348 +} __no_const;
68349
68350 /**
68351 * preempt_notifier - key for installing preemption notifiers
68352 diff --git a/include/linux/proc_fs.h b/include/linux/proc_fs.h
68353 index 379eaed..1bf73e3 100644
68354 --- a/include/linux/proc_fs.h
68355 +++ b/include/linux/proc_fs.h
68356 @@ -155,6 +155,19 @@ static inline struct proc_dir_entry *proc_create(const char *name, mode_t mode,
68357 return proc_create_data(name, mode, parent, proc_fops, NULL);
68358 }
68359
68360 +static inline struct proc_dir_entry *proc_create_grsec(const char *name, mode_t mode,
68361 + struct proc_dir_entry *parent, const struct file_operations *proc_fops)
68362 +{
68363 +#ifdef CONFIG_GRKERNSEC_PROC_USER
68364 + return proc_create_data(name, S_IRUSR, parent, proc_fops, NULL);
68365 +#elif defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
68366 + return proc_create_data(name, S_IRUSR | S_IRGRP, parent, proc_fops, NULL);
68367 +#else
68368 + return proc_create_data(name, mode, parent, proc_fops, NULL);
68369 +#endif
68370 +}
68371 +
68372 +
68373 static inline struct proc_dir_entry *create_proc_read_entry(const char *name,
68374 mode_t mode, struct proc_dir_entry *base,
68375 read_proc_t *read_proc, void * data)
68376 @@ -256,7 +269,7 @@ union proc_op {
68377 int (*proc_show)(struct seq_file *m,
68378 struct pid_namespace *ns, struct pid *pid,
68379 struct task_struct *task);
68380 -};
68381 +} __no_const;
68382
68383 struct ctl_table_header;
68384 struct ctl_table;
68385 diff --git a/include/linux/ptrace.h b/include/linux/ptrace.h
68386 index 7456d7d..6c1cfc9 100644
68387 --- a/include/linux/ptrace.h
68388 +++ b/include/linux/ptrace.h
68389 @@ -96,10 +96,10 @@ extern void __ptrace_unlink(struct task_struct *child);
68390 extern void exit_ptrace(struct task_struct *tracer);
68391 #define PTRACE_MODE_READ 1
68392 #define PTRACE_MODE_ATTACH 2
68393 -/* Returns 0 on success, -errno on denial. */
68394 -extern int __ptrace_may_access(struct task_struct *task, unsigned int mode);
68395 /* Returns true on success, false on denial. */
68396 extern bool ptrace_may_access(struct task_struct *task, unsigned int mode);
68397 +/* Returns true on success, false on denial. */
68398 +extern bool ptrace_may_access_log(struct task_struct *task, unsigned int mode);
68399
68400 static inline int ptrace_reparented(struct task_struct *child)
68401 {
68402 diff --git a/include/linux/random.h b/include/linux/random.h
68403 index 2948046..3262567 100644
68404 --- a/include/linux/random.h
68405 +++ b/include/linux/random.h
68406 @@ -63,6 +63,11 @@ unsigned long randomize_range(unsigned long start, unsigned long end, unsigned l
68407 u32 random32(void);
68408 void srandom32(u32 seed);
68409
68410 +static inline unsigned long pax_get_random_long(void)
68411 +{
68412 + return random32() + (sizeof(long) > 4 ? (unsigned long)random32() << 32 : 0);
68413 +}
68414 +
68415 #endif /* __KERNEL___ */
68416
68417 #endif /* _LINUX_RANDOM_H */
68418 diff --git a/include/linux/reboot.h b/include/linux/reboot.h
68419 index 988e55f..17cb4ef 100644
68420 --- a/include/linux/reboot.h
68421 +++ b/include/linux/reboot.h
68422 @@ -47,9 +47,9 @@ extern int unregister_reboot_notifier(struct notifier_block *);
68423 * Architecture-specific implementations of sys_reboot commands.
68424 */
68425
68426 -extern void machine_restart(char *cmd);
68427 -extern void machine_halt(void);
68428 -extern void machine_power_off(void);
68429 +extern void machine_restart(char *cmd) __noreturn;
68430 +extern void machine_halt(void) __noreturn;
68431 +extern void machine_power_off(void) __noreturn;
68432
68433 extern void machine_shutdown(void);
68434 struct pt_regs;
68435 @@ -60,9 +60,9 @@ extern void machine_crash_shutdown(struct pt_regs *);
68436 */
68437
68438 extern void kernel_restart_prepare(char *cmd);
68439 -extern void kernel_restart(char *cmd);
68440 -extern void kernel_halt(void);
68441 -extern void kernel_power_off(void);
68442 +extern void kernel_restart(char *cmd) __noreturn;
68443 +extern void kernel_halt(void) __noreturn;
68444 +extern void kernel_power_off(void) __noreturn;
68445
68446 void ctrl_alt_del(void);
68447
68448 @@ -75,7 +75,7 @@ extern int orderly_poweroff(bool force);
68449 * Emergency restart, callable from an interrupt handler.
68450 */
68451
68452 -extern void emergency_restart(void);
68453 +extern void emergency_restart(void) __noreturn;
68454 #include <asm/emergency-restart.h>
68455
68456 #endif
68457 diff --git a/include/linux/reiserfs_fs.h b/include/linux/reiserfs_fs.h
68458 index dd31e7b..5b03c5c 100644
68459 --- a/include/linux/reiserfs_fs.h
68460 +++ b/include/linux/reiserfs_fs.h
68461 @@ -1326,7 +1326,7 @@ static inline loff_t max_reiserfs_offset(struct inode *inode)
68462 #define REISERFS_USER_MEM 1 /* reiserfs user memory mode */
68463
68464 #define fs_generation(s) (REISERFS_SB(s)->s_generation_counter)
68465 -#define get_generation(s) atomic_read (&fs_generation(s))
68466 +#define get_generation(s) atomic_read_unchecked (&fs_generation(s))
68467 #define FILESYSTEM_CHANGED_TB(tb) (get_generation((tb)->tb_sb) != (tb)->fs_gen)
68468 #define __fs_changed(gen,s) (gen != get_generation (s))
68469 #define fs_changed(gen,s) ({cond_resched(); __fs_changed(gen, s);})
68470 @@ -1534,24 +1534,24 @@ static inline struct super_block *sb_from_bi(struct buffer_info *bi)
68471 */
68472
68473 struct item_operations {
68474 - int (*bytes_number) (struct item_head * ih, int block_size);
68475 - void (*decrement_key) (struct cpu_key *);
68476 - int (*is_left_mergeable) (struct reiserfs_key * ih,
68477 + int (* const bytes_number) (struct item_head * ih, int block_size);
68478 + void (* const decrement_key) (struct cpu_key *);
68479 + int (* const is_left_mergeable) (struct reiserfs_key * ih,
68480 unsigned long bsize);
68481 - void (*print_item) (struct item_head *, char *item);
68482 - void (*check_item) (struct item_head *, char *item);
68483 + void (* const print_item) (struct item_head *, char *item);
68484 + void (* const check_item) (struct item_head *, char *item);
68485
68486 - int (*create_vi) (struct virtual_node * vn, struct virtual_item * vi,
68487 + int (* const create_vi) (struct virtual_node * vn, struct virtual_item * vi,
68488 int is_affected, int insert_size);
68489 - int (*check_left) (struct virtual_item * vi, int free,
68490 + int (* const check_left) (struct virtual_item * vi, int free,
68491 int start_skip, int end_skip);
68492 - int (*check_right) (struct virtual_item * vi, int free);
68493 - int (*part_size) (struct virtual_item * vi, int from, int to);
68494 - int (*unit_num) (struct virtual_item * vi);
68495 - void (*print_vi) (struct virtual_item * vi);
68496 + int (* const check_right) (struct virtual_item * vi, int free);
68497 + int (* const part_size) (struct virtual_item * vi, int from, int to);
68498 + int (* const unit_num) (struct virtual_item * vi);
68499 + void (* const print_vi) (struct virtual_item * vi);
68500 };
68501
68502 -extern struct item_operations *item_ops[TYPE_ANY + 1];
68503 +extern const struct item_operations * const item_ops[TYPE_ANY + 1];
68504
68505 #define op_bytes_number(ih,bsize) item_ops[le_ih_k_type (ih)]->bytes_number (ih, bsize)
68506 #define op_is_left_mergeable(key,bsize) item_ops[le_key_k_type (le_key_version (key), key)]->is_left_mergeable (key, bsize)
68507 diff --git a/include/linux/reiserfs_fs_sb.h b/include/linux/reiserfs_fs_sb.h
68508 index dab68bb..0688727 100644
68509 --- a/include/linux/reiserfs_fs_sb.h
68510 +++ b/include/linux/reiserfs_fs_sb.h
68511 @@ -377,7 +377,7 @@ struct reiserfs_sb_info {
68512 /* Comment? -Hans */
68513 wait_queue_head_t s_wait;
68514 /* To be obsoleted soon by per buffer seals.. -Hans */
68515 - atomic_t s_generation_counter; // increased by one every time the
68516 + atomic_unchecked_t s_generation_counter; // increased by one every time the
68517 // tree gets re-balanced
68518 unsigned long s_properties; /* File system properties. Currently holds
68519 on-disk FS format */
68520 diff --git a/include/linux/relay.h b/include/linux/relay.h
68521 index 14a86bc..17d0700 100644
68522 --- a/include/linux/relay.h
68523 +++ b/include/linux/relay.h
68524 @@ -159,7 +159,7 @@ struct rchan_callbacks
68525 * The callback should return 0 if successful, negative if not.
68526 */
68527 int (*remove_buf_file)(struct dentry *dentry);
68528 -};
68529 +} __no_const;
68530
68531 /*
68532 * CONFIG_RELAY kernel API, kernel/relay.c
68533 diff --git a/include/linux/rfkill.h b/include/linux/rfkill.h
68534 index 3392c59..a746428 100644
68535 --- a/include/linux/rfkill.h
68536 +++ b/include/linux/rfkill.h
68537 @@ -144,6 +144,7 @@ struct rfkill_ops {
68538 void (*query)(struct rfkill *rfkill, void *data);
68539 int (*set_block)(void *data, bool blocked);
68540 };
68541 +typedef struct rfkill_ops __no_const rfkill_ops_no_const;
68542
68543 #if defined(CONFIG_RFKILL) || defined(CONFIG_RFKILL_MODULE)
68544 /**
68545 diff --git a/include/linux/sched.h b/include/linux/sched.h
68546 index 71849bf..40217dc 100644
68547 --- a/include/linux/sched.h
68548 +++ b/include/linux/sched.h
68549 @@ -101,6 +101,7 @@ struct bio;
68550 struct fs_struct;
68551 struct bts_context;
68552 struct perf_event_context;
68553 +struct linux_binprm;
68554
68555 /*
68556 * List of flags we want to share for kernel threads,
68557 @@ -350,7 +351,7 @@ extern signed long schedule_timeout_killable(signed long timeout);
68558 extern signed long schedule_timeout_uninterruptible(signed long timeout);
68559 asmlinkage void __schedule(void);
68560 asmlinkage void schedule(void);
68561 -extern int mutex_spin_on_owner(struct mutex *lock, struct thread_info *owner);
68562 +extern int mutex_spin_on_owner(struct mutex *lock, struct task_struct *owner);
68563
68564 struct nsproxy;
68565 struct user_namespace;
68566 @@ -371,9 +372,12 @@ struct user_namespace;
68567 #define DEFAULT_MAX_MAP_COUNT (USHORT_MAX - MAPCOUNT_ELF_CORE_MARGIN)
68568
68569 extern int sysctl_max_map_count;
68570 +extern unsigned long sysctl_heap_stack_gap;
68571
68572 #include <linux/aio.h>
68573
68574 +extern bool check_heap_stack_gap(const struct vm_area_struct *vma, unsigned long addr, unsigned long len);
68575 +extern unsigned long skip_heap_stack_gap(const struct vm_area_struct *vma, unsigned long len);
68576 extern unsigned long
68577 arch_get_unmapped_area(struct file *, unsigned long, unsigned long,
68578 unsigned long, unsigned long);
68579 @@ -666,6 +670,16 @@ struct signal_struct {
68580 struct tty_audit_buf *tty_audit_buf;
68581 #endif
68582
68583 +#ifdef CONFIG_GRKERNSEC
68584 + u32 curr_ip;
68585 + u32 saved_ip;
68586 + u32 gr_saddr;
68587 + u32 gr_daddr;
68588 + u16 gr_sport;
68589 + u16 gr_dport;
68590 + u8 used_accept:1;
68591 +#endif
68592 +
68593 int oom_adj; /* OOM kill score adjustment (bit shift) */
68594 };
68595
68596 @@ -723,6 +737,11 @@ struct user_struct {
68597 struct key *session_keyring; /* UID's default session keyring */
68598 #endif
68599
68600 +#if defined(CONFIG_GRKERNSEC_KERN_LOCKOUT) || defined(CONFIG_GRKERNSEC_BRUTE)
68601 + unsigned int banned;
68602 + unsigned long ban_expires;
68603 +#endif
68604 +
68605 /* Hash table maintenance information */
68606 struct hlist_node uidhash_node;
68607 uid_t uid;
68608 @@ -1328,8 +1347,8 @@ struct task_struct {
68609 struct list_head thread_group;
68610
68611 struct completion *vfork_done; /* for vfork() */
68612 - int __user *set_child_tid; /* CLONE_CHILD_SETTID */
68613 - int __user *clear_child_tid; /* CLONE_CHILD_CLEARTID */
68614 + pid_t __user *set_child_tid; /* CLONE_CHILD_SETTID */
68615 + pid_t __user *clear_child_tid; /* CLONE_CHILD_CLEARTID */
68616
68617 cputime_t utime, stime, utimescaled, stimescaled;
68618 cputime_t gtime;
68619 @@ -1343,16 +1362,6 @@ struct task_struct {
68620 struct task_cputime cputime_expires;
68621 struct list_head cpu_timers[3];
68622
68623 -/* process credentials */
68624 - const struct cred *real_cred; /* objective and real subjective task
68625 - * credentials (COW) */
68626 - const struct cred *cred; /* effective (overridable) subjective task
68627 - * credentials (COW) */
68628 - struct mutex cred_guard_mutex; /* guard against foreign influences on
68629 - * credential calculations
68630 - * (notably. ptrace) */
68631 - struct cred *replacement_session_keyring; /* for KEYCTL_SESSION_TO_PARENT */
68632 -
68633 char comm[TASK_COMM_LEN]; /* executable name excluding path
68634 - access with [gs]et_task_comm (which lock
68635 it with task_lock())
68636 @@ -1369,6 +1378,10 @@ struct task_struct {
68637 #endif
68638 /* CPU-specific state of this task */
68639 struct thread_struct thread;
68640 +/* thread_info moved to task_struct */
68641 +#ifdef CONFIG_X86
68642 + struct thread_info tinfo;
68643 +#endif
68644 /* filesystem information */
68645 struct fs_struct *fs;
68646 /* open file information */
68647 @@ -1436,6 +1449,15 @@ struct task_struct {
68648 int hardirq_context;
68649 int softirq_context;
68650 #endif
68651 +
68652 +/* process credentials */
68653 + const struct cred *real_cred; /* objective and real subjective task
68654 + * credentials (COW) */
68655 + struct mutex cred_guard_mutex; /* guard against foreign influences on
68656 + * credential calculations
68657 + * (notably. ptrace) */
68658 + struct cred *replacement_session_keyring; /* for KEYCTL_SESSION_TO_PARENT */
68659 +
68660 #ifdef CONFIG_LOCKDEP
68661 # define MAX_LOCK_DEPTH 48UL
68662 u64 curr_chain_key;
68663 @@ -1456,6 +1478,9 @@ struct task_struct {
68664
68665 struct backing_dev_info *backing_dev_info;
68666
68667 + const struct cred *cred; /* effective (overridable) subjective task
68668 + * credentials (COW) */
68669 +
68670 struct io_context *io_context;
68671
68672 unsigned long ptrace_message;
68673 @@ -1519,6 +1544,21 @@ struct task_struct {
68674 unsigned long default_timer_slack_ns;
68675
68676 struct list_head *scm_work_list;
68677 +
68678 +#ifdef CONFIG_GRKERNSEC
68679 + /* grsecurity */
68680 + struct dentry *gr_chroot_dentry;
68681 + struct acl_subject_label *acl;
68682 + struct acl_role_label *role;
68683 + struct file *exec_file;
68684 + u16 acl_role_id;
68685 + /* is this the task that authenticated to the special role */
68686 + u8 acl_sp_role;
68687 + u8 is_writable;
68688 + u8 brute;
68689 + u8 gr_is_chrooted;
68690 +#endif
68691 +
68692 #ifdef CONFIG_FUNCTION_GRAPH_TRACER
68693 /* Index of current stored adress in ret_stack */
68694 int curr_ret_stack;
68695 @@ -1542,6 +1582,57 @@ struct task_struct {
68696 #endif /* CONFIG_TRACING */
68697 };
68698
68699 +#define MF_PAX_PAGEEXEC 0x01000000 /* Paging based non-executable pages */
68700 +#define MF_PAX_EMUTRAMP 0x02000000 /* Emulate trampolines */
68701 +#define MF_PAX_MPROTECT 0x04000000 /* Restrict mprotect() */
68702 +#define MF_PAX_RANDMMAP 0x08000000 /* Randomize mmap() base */
68703 +/*#define MF_PAX_RANDEXEC 0x10000000*/ /* Randomize ET_EXEC base */
68704 +#define MF_PAX_SEGMEXEC 0x20000000 /* Segmentation based non-executable pages */
68705 +
68706 +#ifdef CONFIG_PAX_SOFTMODE
68707 +extern int pax_softmode;
68708 +#endif
68709 +
68710 +extern int pax_check_flags(unsigned long *);
68711 +
68712 +/* if tsk != current then task_lock must be held on it */
68713 +#if defined(CONFIG_PAX_NOEXEC) || defined(CONFIG_PAX_ASLR)
68714 +static inline unsigned long pax_get_flags(struct task_struct *tsk)
68715 +{
68716 + if (likely(tsk->mm))
68717 + return tsk->mm->pax_flags;
68718 + else
68719 + return 0UL;
68720 +}
68721 +
68722 +/* if tsk != current then task_lock must be held on it */
68723 +static inline long pax_set_flags(struct task_struct *tsk, unsigned long flags)
68724 +{
68725 + if (likely(tsk->mm)) {
68726 + tsk->mm->pax_flags = flags;
68727 + return 0;
68728 + }
68729 + return -EINVAL;
68730 +}
68731 +#endif
68732 +
68733 +#ifdef CONFIG_PAX_HAVE_ACL_FLAGS
68734 +extern void pax_set_initial_flags(struct linux_binprm *bprm);
68735 +#elif defined(CONFIG_PAX_HOOK_ACL_FLAGS)
68736 +extern void (*pax_set_initial_flags_func)(struct linux_binprm *bprm);
68737 +#endif
68738 +
68739 +extern void pax_report_fault(struct pt_regs *regs, void *pc, void *sp);
68740 +extern void pax_report_insns(struct pt_regs *regs, void *pc, void *sp);
68741 +extern void pax_report_refcount_overflow(struct pt_regs *regs);
68742 +extern NORET_TYPE void pax_report_usercopy(const void *ptr, unsigned long len, bool to, const char *type) ATTRIB_NORET;
68743 +
68744 +#ifdef CONFIG_PAX_MEMORY_STACKLEAK
68745 +extern void pax_track_stack(void);
68746 +#else
68747 +static inline void pax_track_stack(void) {}
68748 +#endif
68749 +
68750 /* Future-safe accessor for struct task_struct's cpus_allowed. */
68751 #define tsk_cpumask(tsk) (&(tsk)->cpus_allowed)
68752
68753 @@ -1740,7 +1831,7 @@ extern void thread_group_times(struct task_struct *p, cputime_t *ut, cputime_t *
68754 #define PF_DUMPCORE 0x00000200 /* dumped core */
68755 #define PF_SIGNALED 0x00000400 /* killed by a signal */
68756 #define PF_MEMALLOC 0x00000800 /* Allocating memory */
68757 -#define PF_FLUSHER 0x00001000 /* responsible for disk writeback */
68758 +#define PF_NPROC_EXCEEDED 0x00001000 /* set_user noticed that RLIMIT_NPROC was exceeded */
68759 #define PF_USED_MATH 0x00002000 /* if unset the fpu must be initialized before use */
68760 #define PF_FREEZING 0x00004000 /* freeze in progress. do not account to load */
68761 #define PF_NOFREEZE 0x00008000 /* this thread should not be frozen */
68762 @@ -1978,7 +2069,9 @@ void yield(void);
68763 extern struct exec_domain default_exec_domain;
68764
68765 union thread_union {
68766 +#ifndef CONFIG_X86
68767 struct thread_info thread_info;
68768 +#endif
68769 unsigned long stack[THREAD_SIZE/sizeof(long)];
68770 };
68771
68772 @@ -2011,6 +2104,7 @@ extern struct pid_namespace init_pid_ns;
68773 */
68774
68775 extern struct task_struct *find_task_by_vpid(pid_t nr);
68776 +extern struct task_struct *find_task_by_vpid_unrestricted(pid_t nr);
68777 extern struct task_struct *find_task_by_pid_ns(pid_t nr,
68778 struct pid_namespace *ns);
68779
68780 @@ -2155,7 +2249,7 @@ extern void __cleanup_sighand(struct sighand_struct *);
68781 extern void exit_itimers(struct signal_struct *);
68782 extern void flush_itimer_signals(void);
68783
68784 -extern NORET_TYPE void do_group_exit(int);
68785 +extern NORET_TYPE void do_group_exit(int) ATTRIB_NORET;
68786
68787 extern void daemonize(const char *, ...);
68788 extern int allow_signal(int);
68789 @@ -2284,13 +2378,17 @@ static inline unsigned long *end_of_stack(struct task_struct *p)
68790
68791 #endif
68792
68793 -static inline int object_is_on_stack(void *obj)
68794 +static inline int object_starts_on_stack(void *obj)
68795 {
68796 - void *stack = task_stack_page(current);
68797 + const void *stack = task_stack_page(current);
68798
68799 return (obj >= stack) && (obj < (stack + THREAD_SIZE));
68800 }
68801
68802 +#ifdef CONFIG_PAX_USERCOPY
68803 +extern int object_is_on_stack(const void *obj, unsigned long len);
68804 +#endif
68805 +
68806 extern void thread_info_cache_init(void);
68807
68808 #ifdef CONFIG_DEBUG_STACK_USAGE
68809 diff --git a/include/linux/screen_info.h b/include/linux/screen_info.h
68810 index 1ee2c05..81b7ec4 100644
68811 --- a/include/linux/screen_info.h
68812 +++ b/include/linux/screen_info.h
68813 @@ -42,7 +42,8 @@ struct screen_info {
68814 __u16 pages; /* 0x32 */
68815 __u16 vesa_attributes; /* 0x34 */
68816 __u32 capabilities; /* 0x36 */
68817 - __u8 _reserved[6]; /* 0x3a */
68818 + __u16 vesapm_size; /* 0x3a */
68819 + __u8 _reserved[4]; /* 0x3c */
68820 } __attribute__((packed));
68821
68822 #define VIDEO_TYPE_MDA 0x10 /* Monochrome Text Display */
68823 diff --git a/include/linux/security.h b/include/linux/security.h
68824 index d40d23f..d739b08 100644
68825 --- a/include/linux/security.h
68826 +++ b/include/linux/security.h
68827 @@ -34,6 +34,7 @@
68828 #include <linux/key.h>
68829 #include <linux/xfrm.h>
68830 #include <linux/gfp.h>
68831 +#include <linux/grsecurity.h>
68832 #include <net/flow.h>
68833
68834 /* Maximum number of letters for an LSM name string */
68835 @@ -76,7 +77,7 @@ extern int cap_task_prctl(int option, unsigned long arg2, unsigned long arg3,
68836 extern int cap_task_setscheduler(struct task_struct *p, int policy, struct sched_param *lp);
68837 extern int cap_task_setioprio(struct task_struct *p, int ioprio);
68838 extern int cap_task_setnice(struct task_struct *p, int nice);
68839 -extern int cap_syslog(int type);
68840 +extern int cap_syslog(int type, bool from_file);
68841 extern int cap_vm_enough_memory(struct mm_struct *mm, long pages);
68842
68843 struct msghdr;
68844 @@ -1331,6 +1332,7 @@ static inline void security_free_mnt_opts(struct security_mnt_opts *opts)
68845 * logging to the console.
68846 * See the syslog(2) manual page for an explanation of the @type values.
68847 * @type contains the type of action.
68848 + * @from_file indicates the context of action (if it came from /proc).
68849 * Return 0 if permission is granted.
68850 * @settime:
68851 * Check permission to change the system time.
68852 @@ -1445,7 +1447,7 @@ struct security_operations {
68853 int (*sysctl) (struct ctl_table *table, int op);
68854 int (*quotactl) (int cmds, int type, int id, struct super_block *sb);
68855 int (*quota_on) (struct dentry *dentry);
68856 - int (*syslog) (int type);
68857 + int (*syslog) (int type, bool from_file);
68858 int (*settime) (struct timespec *ts, struct timezone *tz);
68859 int (*vm_enough_memory) (struct mm_struct *mm, long pages);
68860
68861 @@ -1740,7 +1742,7 @@ int security_acct(struct file *file);
68862 int security_sysctl(struct ctl_table *table, int op);
68863 int security_quotactl(int cmds, int type, int id, struct super_block *sb);
68864 int security_quota_on(struct dentry *dentry);
68865 -int security_syslog(int type);
68866 +int security_syslog(int type, bool from_file);
68867 int security_settime(struct timespec *ts, struct timezone *tz);
68868 int security_vm_enough_memory(long pages);
68869 int security_vm_enough_memory_mm(struct mm_struct *mm, long pages);
68870 @@ -1986,9 +1988,9 @@ static inline int security_quota_on(struct dentry *dentry)
68871 return 0;
68872 }
68873
68874 -static inline int security_syslog(int type)
68875 +static inline int security_syslog(int type, bool from_file)
68876 {
68877 - return cap_syslog(type);
68878 + return cap_syslog(type, from_file);
68879 }
68880
68881 static inline int security_settime(struct timespec *ts, struct timezone *tz)
68882 diff --git a/include/linux/seq_file.h b/include/linux/seq_file.h
68883 index 8366d8f..2307490 100644
68884 --- a/include/linux/seq_file.h
68885 +++ b/include/linux/seq_file.h
68886 @@ -32,6 +32,7 @@ struct seq_operations {
68887 void * (*next) (struct seq_file *m, void *v, loff_t *pos);
68888 int (*show) (struct seq_file *m, void *v);
68889 };
68890 +typedef struct seq_operations __no_const seq_operations_no_const;
68891
68892 #define SEQ_SKIP 1
68893
68894 diff --git a/include/linux/shm.h b/include/linux/shm.h
68895 index eca6235..c7417ed 100644
68896 --- a/include/linux/shm.h
68897 +++ b/include/linux/shm.h
68898 @@ -95,6 +95,10 @@ struct shmid_kernel /* private to the kernel */
68899 pid_t shm_cprid;
68900 pid_t shm_lprid;
68901 struct user_struct *mlock_user;
68902 +#ifdef CONFIG_GRKERNSEC
68903 + time_t shm_createtime;
68904 + pid_t shm_lapid;
68905 +#endif
68906 };
68907
68908 /* shm_mode upper byte flags */
68909 diff --git a/include/linux/skbuff.h b/include/linux/skbuff.h
68910 index bcdd660..6e12e11 100644
68911 --- a/include/linux/skbuff.h
68912 +++ b/include/linux/skbuff.h
68913 @@ -14,6 +14,7 @@
68914 #ifndef _LINUX_SKBUFF_H
68915 #define _LINUX_SKBUFF_H
68916
68917 +#include <linux/const.h>
68918 #include <linux/kernel.h>
68919 #include <linux/kmemcheck.h>
68920 #include <linux/compiler.h>
68921 @@ -544,7 +545,7 @@ static inline union skb_shared_tx *skb_tx(struct sk_buff *skb)
68922 */
68923 static inline int skb_queue_empty(const struct sk_buff_head *list)
68924 {
68925 - return list->next == (struct sk_buff *)list;
68926 + return list->next == (const struct sk_buff *)list;
68927 }
68928
68929 /**
68930 @@ -557,7 +558,7 @@ static inline int skb_queue_empty(const struct sk_buff_head *list)
68931 static inline bool skb_queue_is_last(const struct sk_buff_head *list,
68932 const struct sk_buff *skb)
68933 {
68934 - return (skb->next == (struct sk_buff *) list);
68935 + return (skb->next == (const struct sk_buff *) list);
68936 }
68937
68938 /**
68939 @@ -570,7 +571,7 @@ static inline bool skb_queue_is_last(const struct sk_buff_head *list,
68940 static inline bool skb_queue_is_first(const struct sk_buff_head *list,
68941 const struct sk_buff *skb)
68942 {
68943 - return (skb->prev == (struct sk_buff *) list);
68944 + return (skb->prev == (const struct sk_buff *) list);
68945 }
68946
68947 /**
68948 @@ -1367,7 +1368,7 @@ static inline int skb_network_offset(const struct sk_buff *skb)
68949 * headroom, you should not reduce this.
68950 */
68951 #ifndef NET_SKB_PAD
68952 -#define NET_SKB_PAD 32
68953 +#define NET_SKB_PAD (_AC(32,UL))
68954 #endif
68955
68956 extern int ___pskb_trim(struct sk_buff *skb, unsigned int len);
68957 diff --git a/include/linux/slab.h b/include/linux/slab.h
68958 index 2da8372..a3be824 100644
68959 --- a/include/linux/slab.h
68960 +++ b/include/linux/slab.h
68961 @@ -11,12 +11,20 @@
68962
68963 #include <linux/gfp.h>
68964 #include <linux/types.h>
68965 +#include <linux/err.h>
68966
68967 /*
68968 * Flags to pass to kmem_cache_create().
68969 * The ones marked DEBUG are only valid if CONFIG_SLAB_DEBUG is set.
68970 */
68971 #define SLAB_DEBUG_FREE 0x00000100UL /* DEBUG: Perform (expensive) checks on free */
68972 +
68973 +#ifdef CONFIG_PAX_USERCOPY
68974 +#define SLAB_USERCOPY 0x00000200UL /* PaX: Allow copying objs to/from userland */
68975 +#else
68976 +#define SLAB_USERCOPY 0x00000000UL
68977 +#endif
68978 +
68979 #define SLAB_RED_ZONE 0x00000400UL /* DEBUG: Red zone objs in a cache */
68980 #define SLAB_POISON 0x00000800UL /* DEBUG: Poison objects */
68981 #define SLAB_HWCACHE_ALIGN 0x00002000UL /* Align objs on cache lines */
68982 @@ -82,10 +90,13 @@
68983 * ZERO_SIZE_PTR can be passed to kfree though in the same way that NULL can.
68984 * Both make kfree a no-op.
68985 */
68986 -#define ZERO_SIZE_PTR ((void *)16)
68987 +#define ZERO_SIZE_PTR \
68988 +({ \
68989 + BUILD_BUG_ON(!(MAX_ERRNO & ~PAGE_MASK));\
68990 + (void *)(-MAX_ERRNO-1L); \
68991 +})
68992
68993 -#define ZERO_OR_NULL_PTR(x) ((unsigned long)(x) <= \
68994 - (unsigned long)ZERO_SIZE_PTR)
68995 +#define ZERO_OR_NULL_PTR(x) ((unsigned long)(x) - 1 >= (unsigned long)ZERO_SIZE_PTR - 1)
68996
68997 /*
68998 * struct kmem_cache related prototypes
68999 @@ -138,6 +149,7 @@ void * __must_check krealloc(const void *, size_t, gfp_t);
69000 void kfree(const void *);
69001 void kzfree(const void *);
69002 size_t ksize(const void *);
69003 +void check_object_size(const void *ptr, unsigned long n, bool to);
69004
69005 /*
69006 * Allocator specific definitions. These are mainly used to establish optimized
69007 @@ -328,4 +340,37 @@ static inline void *kzalloc_node(size_t size, gfp_t flags, int node)
69008
69009 void __init kmem_cache_init_late(void);
69010
69011 +#define kmalloc(x, y) \
69012 +({ \
69013 + void *___retval; \
69014 + intoverflow_t ___x = (intoverflow_t)x; \
69015 + if (WARN(___x > ULONG_MAX, "kmalloc size overflow\n"))\
69016 + ___retval = NULL; \
69017 + else \
69018 + ___retval = kmalloc((size_t)___x, (y)); \
69019 + ___retval; \
69020 +})
69021 +
69022 +#define kmalloc_node(x, y, z) \
69023 +({ \
69024 + void *___retval; \
69025 + intoverflow_t ___x = (intoverflow_t)x; \
69026 + if (WARN(___x > ULONG_MAX, "kmalloc_node size overflow\n"))\
69027 + ___retval = NULL; \
69028 + else \
69029 + ___retval = kmalloc_node((size_t)___x, (y), (z));\
69030 + ___retval; \
69031 +})
69032 +
69033 +#define kzalloc(x, y) \
69034 +({ \
69035 + void *___retval; \
69036 + intoverflow_t ___x = (intoverflow_t)x; \
69037 + if (WARN(___x > ULONG_MAX, "kzalloc size overflow\n"))\
69038 + ___retval = NULL; \
69039 + else \
69040 + ___retval = kzalloc((size_t)___x, (y)); \
69041 + ___retval; \
69042 +})
69043 +
69044 #endif /* _LINUX_SLAB_H */
69045 diff --git a/include/linux/slab_def.h b/include/linux/slab_def.h
69046 index 850d057..d9dfe3c 100644
69047 --- a/include/linux/slab_def.h
69048 +++ b/include/linux/slab_def.h
69049 @@ -69,10 +69,10 @@ struct kmem_cache {
69050 unsigned long node_allocs;
69051 unsigned long node_frees;
69052 unsigned long node_overflow;
69053 - atomic_t allochit;
69054 - atomic_t allocmiss;
69055 - atomic_t freehit;
69056 - atomic_t freemiss;
69057 + atomic_unchecked_t allochit;
69058 + atomic_unchecked_t allocmiss;
69059 + atomic_unchecked_t freehit;
69060 + atomic_unchecked_t freemiss;
69061
69062 /*
69063 * If debugging is enabled, then the allocator can add additional
69064 diff --git a/include/linux/slub_def.h b/include/linux/slub_def.h
69065 index 5ad70a6..57f9f65 100644
69066 --- a/include/linux/slub_def.h
69067 +++ b/include/linux/slub_def.h
69068 @@ -86,7 +86,7 @@ struct kmem_cache {
69069 struct kmem_cache_order_objects max;
69070 struct kmem_cache_order_objects min;
69071 gfp_t allocflags; /* gfp flags to use on each alloc */
69072 - int refcount; /* Refcount for slab cache destroy */
69073 + atomic_t refcount; /* Refcount for slab cache destroy */
69074 void (*ctor)(void *);
69075 int inuse; /* Offset to metadata */
69076 int align; /* Alignment */
69077 @@ -215,7 +215,7 @@ static __always_inline struct kmem_cache *kmalloc_slab(size_t size)
69078 #endif
69079
69080 void *kmem_cache_alloc(struct kmem_cache *, gfp_t);
69081 -void *__kmalloc(size_t size, gfp_t flags);
69082 +void *__kmalloc(size_t size, gfp_t flags) __alloc_size(1);
69083
69084 #ifdef CONFIG_KMEMTRACE
69085 extern void *kmem_cache_alloc_notrace(struct kmem_cache *s, gfp_t gfpflags);
69086 diff --git a/include/linux/sonet.h b/include/linux/sonet.h
69087 index 67ad11f..0bbd8af 100644
69088 --- a/include/linux/sonet.h
69089 +++ b/include/linux/sonet.h
69090 @@ -61,7 +61,7 @@ struct sonet_stats {
69091 #include <asm/atomic.h>
69092
69093 struct k_sonet_stats {
69094 -#define __HANDLE_ITEM(i) atomic_t i
69095 +#define __HANDLE_ITEM(i) atomic_unchecked_t i
69096 __SONET_ITEMS
69097 #undef __HANDLE_ITEM
69098 };
69099 diff --git a/include/linux/sunrpc/cache.h b/include/linux/sunrpc/cache.h
69100 index 6f52b4d..5500323 100644
69101 --- a/include/linux/sunrpc/cache.h
69102 +++ b/include/linux/sunrpc/cache.h
69103 @@ -125,7 +125,7 @@ struct cache_detail {
69104 */
69105 struct cache_req {
69106 struct cache_deferred_req *(*defer)(struct cache_req *req);
69107 -};
69108 +} __no_const;
69109 /* this must be embedded in a deferred_request that is being
69110 * delayed awaiting cache-fill
69111 */
69112 diff --git a/include/linux/sunrpc/clnt.h b/include/linux/sunrpc/clnt.h
69113 index 8ed9642..101ceab 100644
69114 --- a/include/linux/sunrpc/clnt.h
69115 +++ b/include/linux/sunrpc/clnt.h
69116 @@ -167,9 +167,9 @@ static inline unsigned short rpc_get_port(const struct sockaddr *sap)
69117 {
69118 switch (sap->sa_family) {
69119 case AF_INET:
69120 - return ntohs(((struct sockaddr_in *)sap)->sin_port);
69121 + return ntohs(((const struct sockaddr_in *)sap)->sin_port);
69122 case AF_INET6:
69123 - return ntohs(((struct sockaddr_in6 *)sap)->sin6_port);
69124 + return ntohs(((const struct sockaddr_in6 *)sap)->sin6_port);
69125 }
69126 return 0;
69127 }
69128 @@ -202,7 +202,7 @@ static inline bool __rpc_cmp_addr4(const struct sockaddr *sap1,
69129 static inline bool __rpc_copy_addr4(struct sockaddr *dst,
69130 const struct sockaddr *src)
69131 {
69132 - const struct sockaddr_in *ssin = (struct sockaddr_in *) src;
69133 + const struct sockaddr_in *ssin = (const struct sockaddr_in *) src;
69134 struct sockaddr_in *dsin = (struct sockaddr_in *) dst;
69135
69136 dsin->sin_family = ssin->sin_family;
69137 @@ -299,7 +299,7 @@ static inline u32 rpc_get_scope_id(const struct sockaddr *sa)
69138 if (sa->sa_family != AF_INET6)
69139 return 0;
69140
69141 - return ((struct sockaddr_in6 *) sa)->sin6_scope_id;
69142 + return ((const struct sockaddr_in6 *) sa)->sin6_scope_id;
69143 }
69144
69145 #endif /* __KERNEL__ */
69146 diff --git a/include/linux/sunrpc/svc_rdma.h b/include/linux/sunrpc/svc_rdma.h
69147 index c14fe86..393245e 100644
69148 --- a/include/linux/sunrpc/svc_rdma.h
69149 +++ b/include/linux/sunrpc/svc_rdma.h
69150 @@ -53,15 +53,15 @@ extern unsigned int svcrdma_ord;
69151 extern unsigned int svcrdma_max_requests;
69152 extern unsigned int svcrdma_max_req_size;
69153
69154 -extern atomic_t rdma_stat_recv;
69155 -extern atomic_t rdma_stat_read;
69156 -extern atomic_t rdma_stat_write;
69157 -extern atomic_t rdma_stat_sq_starve;
69158 -extern atomic_t rdma_stat_rq_starve;
69159 -extern atomic_t rdma_stat_rq_poll;
69160 -extern atomic_t rdma_stat_rq_prod;
69161 -extern atomic_t rdma_stat_sq_poll;
69162 -extern atomic_t rdma_stat_sq_prod;
69163 +extern atomic_unchecked_t rdma_stat_recv;
69164 +extern atomic_unchecked_t rdma_stat_read;
69165 +extern atomic_unchecked_t rdma_stat_write;
69166 +extern atomic_unchecked_t rdma_stat_sq_starve;
69167 +extern atomic_unchecked_t rdma_stat_rq_starve;
69168 +extern atomic_unchecked_t rdma_stat_rq_poll;
69169 +extern atomic_unchecked_t rdma_stat_rq_prod;
69170 +extern atomic_unchecked_t rdma_stat_sq_poll;
69171 +extern atomic_unchecked_t rdma_stat_sq_prod;
69172
69173 #define RPCRDMA_VERSION 1
69174
69175 diff --git a/include/linux/suspend.h b/include/linux/suspend.h
69176 index 5e781d8..1e62818 100644
69177 --- a/include/linux/suspend.h
69178 +++ b/include/linux/suspend.h
69179 @@ -104,15 +104,15 @@ typedef int __bitwise suspend_state_t;
69180 * which require special recovery actions in that situation.
69181 */
69182 struct platform_suspend_ops {
69183 - int (*valid)(suspend_state_t state);
69184 - int (*begin)(suspend_state_t state);
69185 - int (*prepare)(void);
69186 - int (*prepare_late)(void);
69187 - int (*enter)(suspend_state_t state);
69188 - void (*wake)(void);
69189 - void (*finish)(void);
69190 - void (*end)(void);
69191 - void (*recover)(void);
69192 + int (* const valid)(suspend_state_t state);
69193 + int (* const begin)(suspend_state_t state);
69194 + int (* const prepare)(void);
69195 + int (* const prepare_late)(void);
69196 + int (* const enter)(suspend_state_t state);
69197 + void (* const wake)(void);
69198 + void (* const finish)(void);
69199 + void (* const end)(void);
69200 + void (* const recover)(void);
69201 };
69202
69203 #ifdef CONFIG_SUSPEND
69204 @@ -120,7 +120,7 @@ struct platform_suspend_ops {
69205 * suspend_set_ops - set platform dependent suspend operations
69206 * @ops: The new suspend operations to set.
69207 */
69208 -extern void suspend_set_ops(struct platform_suspend_ops *ops);
69209 +extern void suspend_set_ops(const struct platform_suspend_ops *ops);
69210 extern int suspend_valid_only_mem(suspend_state_t state);
69211
69212 /**
69213 @@ -145,7 +145,7 @@ extern int pm_suspend(suspend_state_t state);
69214 #else /* !CONFIG_SUSPEND */
69215 #define suspend_valid_only_mem NULL
69216
69217 -static inline void suspend_set_ops(struct platform_suspend_ops *ops) {}
69218 +static inline void suspend_set_ops(const struct platform_suspend_ops *ops) {}
69219 static inline int pm_suspend(suspend_state_t state) { return -ENOSYS; }
69220 #endif /* !CONFIG_SUSPEND */
69221
69222 @@ -215,16 +215,16 @@ extern void mark_free_pages(struct zone *zone);
69223 * platforms which require special recovery actions in that situation.
69224 */
69225 struct platform_hibernation_ops {
69226 - int (*begin)(void);
69227 - void (*end)(void);
69228 - int (*pre_snapshot)(void);
69229 - void (*finish)(void);
69230 - int (*prepare)(void);
69231 - int (*enter)(void);
69232 - void (*leave)(void);
69233 - int (*pre_restore)(void);
69234 - void (*restore_cleanup)(void);
69235 - void (*recover)(void);
69236 + int (* const begin)(void);
69237 + void (* const end)(void);
69238 + int (* const pre_snapshot)(void);
69239 + void (* const finish)(void);
69240 + int (* const prepare)(void);
69241 + int (* const enter)(void);
69242 + void (* const leave)(void);
69243 + int (* const pre_restore)(void);
69244 + void (* const restore_cleanup)(void);
69245 + void (* const recover)(void);
69246 };
69247
69248 #ifdef CONFIG_HIBERNATION
69249 @@ -243,7 +243,7 @@ extern void swsusp_set_page_free(struct page *);
69250 extern void swsusp_unset_page_free(struct page *);
69251 extern unsigned long get_safe_page(gfp_t gfp_mask);
69252
69253 -extern void hibernation_set_ops(struct platform_hibernation_ops *ops);
69254 +extern void hibernation_set_ops(const struct platform_hibernation_ops *ops);
69255 extern int hibernate(void);
69256 extern bool system_entering_hibernation(void);
69257 #else /* CONFIG_HIBERNATION */
69258 @@ -251,7 +251,7 @@ static inline int swsusp_page_is_forbidden(struct page *p) { return 0; }
69259 static inline void swsusp_set_page_free(struct page *p) {}
69260 static inline void swsusp_unset_page_free(struct page *p) {}
69261
69262 -static inline void hibernation_set_ops(struct platform_hibernation_ops *ops) {}
69263 +static inline void hibernation_set_ops(const struct platform_hibernation_ops *ops) {}
69264 static inline int hibernate(void) { return -ENOSYS; }
69265 static inline bool system_entering_hibernation(void) { return false; }
69266 #endif /* CONFIG_HIBERNATION */
69267 diff --git a/include/linux/sysctl.h b/include/linux/sysctl.h
69268 index 0eb6942..a805cb6 100644
69269 --- a/include/linux/sysctl.h
69270 +++ b/include/linux/sysctl.h
69271 @@ -164,7 +164,11 @@ enum
69272 KERN_PANIC_ON_NMI=76, /* int: whether we will panic on an unrecovered */
69273 };
69274
69275 -
69276 +#ifdef CONFIG_PAX_SOFTMODE
69277 +enum {
69278 + PAX_SOFTMODE=1 /* PaX: disable/enable soft mode */
69279 +};
69280 +#endif
69281
69282 /* CTL_VM names: */
69283 enum
69284 @@ -982,6 +986,8 @@ typedef int proc_handler (struct ctl_table *ctl, int write,
69285
69286 extern int proc_dostring(struct ctl_table *, int,
69287 void __user *, size_t *, loff_t *);
69288 +extern int proc_dostring_modpriv(struct ctl_table *, int,
69289 + void __user *, size_t *, loff_t *);
69290 extern int proc_dointvec(struct ctl_table *, int,
69291 void __user *, size_t *, loff_t *);
69292 extern int proc_dointvec_minmax(struct ctl_table *, int,
69293 @@ -1003,6 +1009,7 @@ extern int do_sysctl (int __user *name, int nlen,
69294
69295 extern ctl_handler sysctl_data;
69296 extern ctl_handler sysctl_string;
69297 +extern ctl_handler sysctl_string_modpriv;
69298 extern ctl_handler sysctl_intvec;
69299 extern ctl_handler sysctl_jiffies;
69300 extern ctl_handler sysctl_ms_jiffies;
69301 diff --git a/include/linux/sysfs.h b/include/linux/sysfs.h
69302 index 9d68fed..71f02cc 100644
69303 --- a/include/linux/sysfs.h
69304 +++ b/include/linux/sysfs.h
69305 @@ -75,8 +75,8 @@ struct bin_attribute {
69306 };
69307
69308 struct sysfs_ops {
69309 - ssize_t (*show)(struct kobject *, struct attribute *,char *);
69310 - ssize_t (*store)(struct kobject *,struct attribute *,const char *, size_t);
69311 + ssize_t (* const show)(struct kobject *, struct attribute *,char *);
69312 + ssize_t (* const store)(struct kobject *,struct attribute *,const char *, size_t);
69313 };
69314
69315 struct sysfs_dirent;
69316 diff --git a/include/linux/syslog.h b/include/linux/syslog.h
69317 new file mode 100644
69318 index 0000000..3891139
69319 --- /dev/null
69320 +++ b/include/linux/syslog.h
69321 @@ -0,0 +1,52 @@
69322 +/* Syslog internals
69323 + *
69324 + * Copyright 2010 Canonical, Ltd.
69325 + * Author: Kees Cook <kees.cook@canonical.com>
69326 + *
69327 + * This program is free software; you can redistribute it and/or modify
69328 + * it under the terms of the GNU General Public License as published by
69329 + * the Free Software Foundation; either version 2, or (at your option)
69330 + * any later version.
69331 + *
69332 + * This program is distributed in the hope that it will be useful,
69333 + * but WITHOUT ANY WARRANTY; without even the implied warranty of
69334 + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
69335 + * GNU General Public License for more details.
69336 + *
69337 + * You should have received a copy of the GNU General Public License
69338 + * along with this program; see the file COPYING. If not, write to
69339 + * the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
69340 + */
69341 +
69342 +#ifndef _LINUX_SYSLOG_H
69343 +#define _LINUX_SYSLOG_H
69344 +
69345 +/* Close the log. Currently a NOP. */
69346 +#define SYSLOG_ACTION_CLOSE 0
69347 +/* Open the log. Currently a NOP. */
69348 +#define SYSLOG_ACTION_OPEN 1
69349 +/* Read from the log. */
69350 +#define SYSLOG_ACTION_READ 2
69351 +/* Read all messages remaining in the ring buffer. */
69352 +#define SYSLOG_ACTION_READ_ALL 3
69353 +/* Read and clear all messages remaining in the ring buffer */
69354 +#define SYSLOG_ACTION_READ_CLEAR 4
69355 +/* Clear ring buffer. */
69356 +#define SYSLOG_ACTION_CLEAR 5
69357 +/* Disable printk's to console */
69358 +#define SYSLOG_ACTION_CONSOLE_OFF 6
69359 +/* Enable printk's to console */
69360 +#define SYSLOG_ACTION_CONSOLE_ON 7
69361 +/* Set level of messages printed to console */
69362 +#define SYSLOG_ACTION_CONSOLE_LEVEL 8
69363 +/* Return number of unread characters in the log buffer */
69364 +#define SYSLOG_ACTION_SIZE_UNREAD 9
69365 +/* Return size of the log buffer */
69366 +#define SYSLOG_ACTION_SIZE_BUFFER 10
69367 +
69368 +#define SYSLOG_FROM_CALL 0
69369 +#define SYSLOG_FROM_FILE 1
69370 +
69371 +int do_syslog(int type, char __user *buf, int count, bool from_file);
69372 +
69373 +#endif /* _LINUX_SYSLOG_H */
69374 diff --git a/include/linux/thread_info.h b/include/linux/thread_info.h
69375 index a8cc4e1..98d3b85 100644
69376 --- a/include/linux/thread_info.h
69377 +++ b/include/linux/thread_info.h
69378 @@ -23,7 +23,7 @@ struct restart_block {
69379 };
69380 /* For futex_wait and futex_wait_requeue_pi */
69381 struct {
69382 - u32 *uaddr;
69383 + u32 __user *uaddr;
69384 u32 val;
69385 u32 flags;
69386 u32 bitset;
69387 diff --git a/include/linux/tty.h b/include/linux/tty.h
69388 index e9c57e9..ee6d489 100644
69389 --- a/include/linux/tty.h
69390 +++ b/include/linux/tty.h
69391 @@ -493,7 +493,6 @@ extern void tty_ldisc_begin(void);
69392 /* This last one is just for the tty layer internals and shouldn't be used elsewhere */
69393 extern void tty_ldisc_enable(struct tty_struct *tty);
69394
69395 -
69396 /* n_tty.c */
69397 extern struct tty_ldisc_ops tty_ldisc_N_TTY;
69398
69399 diff --git a/include/linux/tty_ldisc.h b/include/linux/tty_ldisc.h
69400 index 0c4ee9b..9f7c426 100644
69401 --- a/include/linux/tty_ldisc.h
69402 +++ b/include/linux/tty_ldisc.h
69403 @@ -139,7 +139,7 @@ struct tty_ldisc_ops {
69404
69405 struct module *owner;
69406
69407 - int refcount;
69408 + atomic_t refcount;
69409 };
69410
69411 struct tty_ldisc {
69412 diff --git a/include/linux/types.h b/include/linux/types.h
69413 index c42724f..d190eee 100644
69414 --- a/include/linux/types.h
69415 +++ b/include/linux/types.h
69416 @@ -191,10 +191,26 @@ typedef struct {
69417 volatile int counter;
69418 } atomic_t;
69419
69420 +#ifdef CONFIG_PAX_REFCOUNT
69421 +typedef struct {
69422 + volatile int counter;
69423 +} atomic_unchecked_t;
69424 +#else
69425 +typedef atomic_t atomic_unchecked_t;
69426 +#endif
69427 +
69428 #ifdef CONFIG_64BIT
69429 typedef struct {
69430 volatile long counter;
69431 } atomic64_t;
69432 +
69433 +#ifdef CONFIG_PAX_REFCOUNT
69434 +typedef struct {
69435 + volatile long counter;
69436 +} atomic64_unchecked_t;
69437 +#else
69438 +typedef atomic64_t atomic64_unchecked_t;
69439 +#endif
69440 #endif
69441
69442 struct ustat {
69443 diff --git a/include/linux/uaccess.h b/include/linux/uaccess.h
69444 index 6b58367..53a3e8e 100644
69445 --- a/include/linux/uaccess.h
69446 +++ b/include/linux/uaccess.h
69447 @@ -76,11 +76,11 @@ static inline unsigned long __copy_from_user_nocache(void *to,
69448 long ret; \
69449 mm_segment_t old_fs = get_fs(); \
69450 \
69451 - set_fs(KERNEL_DS); \
69452 pagefault_disable(); \
69453 - ret = __copy_from_user_inatomic(&(retval), (__force typeof(retval) __user *)(addr), sizeof(retval)); \
69454 - pagefault_enable(); \
69455 + set_fs(KERNEL_DS); \
69456 + ret = __copy_from_user_inatomic(&(retval), (typeof(retval) __force_user *)(addr), sizeof(retval)); \
69457 set_fs(old_fs); \
69458 + pagefault_enable(); \
69459 ret; \
69460 })
69461
69462 @@ -93,7 +93,7 @@ static inline unsigned long __copy_from_user_nocache(void *to,
69463 * Safely read from address @src to the buffer at @dst. If a kernel fault
69464 * happens, handle that and return -EFAULT.
69465 */
69466 -extern long probe_kernel_read(void *dst, void *src, size_t size);
69467 +extern long probe_kernel_read(void *dst, const void *src, size_t size);
69468
69469 /*
69470 * probe_kernel_write(): safely attempt to write to a location
69471 @@ -104,6 +104,6 @@ extern long probe_kernel_read(void *dst, void *src, size_t size);
69472 * Safely write to address @dst from the buffer at @src. If a kernel fault
69473 * happens, handle that and return -EFAULT.
69474 */
69475 -extern long probe_kernel_write(void *dst, void *src, size_t size);
69476 +extern long probe_kernel_write(void *dst, const void *src, size_t size);
69477
69478 #endif /* __LINUX_UACCESS_H__ */
69479 diff --git a/include/linux/unaligned/access_ok.h b/include/linux/unaligned/access_ok.h
69480 index 99c1b4d..bb94261 100644
69481 --- a/include/linux/unaligned/access_ok.h
69482 +++ b/include/linux/unaligned/access_ok.h
69483 @@ -6,32 +6,32 @@
69484
69485 static inline u16 get_unaligned_le16(const void *p)
69486 {
69487 - return le16_to_cpup((__le16 *)p);
69488 + return le16_to_cpup((const __le16 *)p);
69489 }
69490
69491 static inline u32 get_unaligned_le32(const void *p)
69492 {
69493 - return le32_to_cpup((__le32 *)p);
69494 + return le32_to_cpup((const __le32 *)p);
69495 }
69496
69497 static inline u64 get_unaligned_le64(const void *p)
69498 {
69499 - return le64_to_cpup((__le64 *)p);
69500 + return le64_to_cpup((const __le64 *)p);
69501 }
69502
69503 static inline u16 get_unaligned_be16(const void *p)
69504 {
69505 - return be16_to_cpup((__be16 *)p);
69506 + return be16_to_cpup((const __be16 *)p);
69507 }
69508
69509 static inline u32 get_unaligned_be32(const void *p)
69510 {
69511 - return be32_to_cpup((__be32 *)p);
69512 + return be32_to_cpup((const __be32 *)p);
69513 }
69514
69515 static inline u64 get_unaligned_be64(const void *p)
69516 {
69517 - return be64_to_cpup((__be64 *)p);
69518 + return be64_to_cpup((const __be64 *)p);
69519 }
69520
69521 static inline void put_unaligned_le16(u16 val, void *p)
69522 diff --git a/include/linux/vermagic.h b/include/linux/vermagic.h
69523 index 79b9837..b5a56f9 100644
69524 --- a/include/linux/vermagic.h
69525 +++ b/include/linux/vermagic.h
69526 @@ -26,9 +26,35 @@
69527 #define MODULE_ARCH_VERMAGIC ""
69528 #endif
69529
69530 +#ifdef CONFIG_PAX_REFCOUNT
69531 +#define MODULE_PAX_REFCOUNT "REFCOUNT "
69532 +#else
69533 +#define MODULE_PAX_REFCOUNT ""
69534 +#endif
69535 +
69536 +#ifdef CONSTIFY_PLUGIN
69537 +#define MODULE_CONSTIFY_PLUGIN "CONSTIFY_PLUGIN "
69538 +#else
69539 +#define MODULE_CONSTIFY_PLUGIN ""
69540 +#endif
69541 +
69542 +#ifdef STACKLEAK_PLUGIN
69543 +#define MODULE_STACKLEAK_PLUGIN "STACKLEAK_PLUGIN "
69544 +#else
69545 +#define MODULE_STACKLEAK_PLUGIN ""
69546 +#endif
69547 +
69548 +#ifdef CONFIG_GRKERNSEC
69549 +#define MODULE_GRSEC "GRSEC "
69550 +#else
69551 +#define MODULE_GRSEC ""
69552 +#endif
69553 +
69554 #define VERMAGIC_STRING \
69555 UTS_RELEASE " " \
69556 MODULE_VERMAGIC_SMP MODULE_VERMAGIC_PREEMPT \
69557 MODULE_VERMAGIC_MODULE_UNLOAD MODULE_VERMAGIC_MODVERSIONS \
69558 - MODULE_ARCH_VERMAGIC
69559 + MODULE_ARCH_VERMAGIC \
69560 + MODULE_PAX_REFCOUNT MODULE_CONSTIFY_PLUGIN MODULE_STACKLEAK_PLUGIN \
69561 + MODULE_GRSEC
69562
69563 diff --git a/include/linux/vmalloc.h b/include/linux/vmalloc.h
69564 index 819a634..462ac12 100644
69565 --- a/include/linux/vmalloc.h
69566 +++ b/include/linux/vmalloc.h
69567 @@ -14,6 +14,11 @@ struct vm_area_struct; /* vma defining user mapping in mm_types.h */
69568 #define VM_USERMAP 0x00000008 /* suitable for remap_vmalloc_range */
69569 #define VM_VPAGES 0x00000010 /* buffer for pages was vmalloc'ed */
69570 #define VM_UNLIST 0x00000020 /* vm_struct is not listed in vmlist */
69571 +
69572 +#if defined(CONFIG_MODULES) && defined(CONFIG_X86) && defined(CONFIG_PAX_KERNEXEC)
69573 +#define VM_KERNEXEC 0x00000040 /* allocate from executable kernel memory range */
69574 +#endif
69575 +
69576 /* bits [20..32] reserved for arch specific ioremap internals */
69577
69578 /*
69579 @@ -124,4 +129,81 @@ struct vm_struct **pcpu_get_vm_areas(const unsigned long *offsets,
69580
69581 void pcpu_free_vm_areas(struct vm_struct **vms, int nr_vms);
69582
69583 +#define vmalloc(x) \
69584 +({ \
69585 + void *___retval; \
69586 + intoverflow_t ___x = (intoverflow_t)x; \
69587 + if (WARN(___x > ULONG_MAX, "vmalloc size overflow\n")) \
69588 + ___retval = NULL; \
69589 + else \
69590 + ___retval = vmalloc((unsigned long)___x); \
69591 + ___retval; \
69592 +})
69593 +
69594 +#define __vmalloc(x, y, z) \
69595 +({ \
69596 + void *___retval; \
69597 + intoverflow_t ___x = (intoverflow_t)x; \
69598 + if (WARN(___x > ULONG_MAX, "__vmalloc size overflow\n"))\
69599 + ___retval = NULL; \
69600 + else \
69601 + ___retval = __vmalloc((unsigned long)___x, (y), (z));\
69602 + ___retval; \
69603 +})
69604 +
69605 +#define vmalloc_user(x) \
69606 +({ \
69607 + void *___retval; \
69608 + intoverflow_t ___x = (intoverflow_t)x; \
69609 + if (WARN(___x > ULONG_MAX, "vmalloc_user size overflow\n"))\
69610 + ___retval = NULL; \
69611 + else \
69612 + ___retval = vmalloc_user((unsigned long)___x); \
69613 + ___retval; \
69614 +})
69615 +
69616 +#define vmalloc_exec(x) \
69617 +({ \
69618 + void *___retval; \
69619 + intoverflow_t ___x = (intoverflow_t)x; \
69620 + if (WARN(___x > ULONG_MAX, "vmalloc_exec size overflow\n"))\
69621 + ___retval = NULL; \
69622 + else \
69623 + ___retval = vmalloc_exec((unsigned long)___x); \
69624 + ___retval; \
69625 +})
69626 +
69627 +#define vmalloc_node(x, y) \
69628 +({ \
69629 + void *___retval; \
69630 + intoverflow_t ___x = (intoverflow_t)x; \
69631 + if (WARN(___x > ULONG_MAX, "vmalloc_node size overflow\n"))\
69632 + ___retval = NULL; \
69633 + else \
69634 + ___retval = vmalloc_node((unsigned long)___x, (y));\
69635 + ___retval; \
69636 +})
69637 +
69638 +#define vmalloc_32(x) \
69639 +({ \
69640 + void *___retval; \
69641 + intoverflow_t ___x = (intoverflow_t)x; \
69642 + if (WARN(___x > ULONG_MAX, "vmalloc_32 size overflow\n"))\
69643 + ___retval = NULL; \
69644 + else \
69645 + ___retval = vmalloc_32((unsigned long)___x); \
69646 + ___retval; \
69647 +})
69648 +
69649 +#define vmalloc_32_user(x) \
69650 +({ \
69651 + void *___retval; \
69652 + intoverflow_t ___x = (intoverflow_t)x; \
69653 + if (WARN(___x > ULONG_MAX, "vmalloc_32_user size overflow\n"))\
69654 + ___retval = NULL; \
69655 + else \
69656 + ___retval = vmalloc_32_user((unsigned long)___x);\
69657 + ___retval; \
69658 +})
69659 +
69660 #endif /* _LINUX_VMALLOC_H */
69661 diff --git a/include/linux/vmstat.h b/include/linux/vmstat.h
69662 index 13070d6..aa4159a 100644
69663 --- a/include/linux/vmstat.h
69664 +++ b/include/linux/vmstat.h
69665 @@ -136,18 +136,18 @@ static inline void vm_events_fold_cpu(int cpu)
69666 /*
69667 * Zone based page accounting with per cpu differentials.
69668 */
69669 -extern atomic_long_t vm_stat[NR_VM_ZONE_STAT_ITEMS];
69670 +extern atomic_long_unchecked_t vm_stat[NR_VM_ZONE_STAT_ITEMS];
69671
69672 static inline void zone_page_state_add(long x, struct zone *zone,
69673 enum zone_stat_item item)
69674 {
69675 - atomic_long_add(x, &zone->vm_stat[item]);
69676 - atomic_long_add(x, &vm_stat[item]);
69677 + atomic_long_add_unchecked(x, &zone->vm_stat[item]);
69678 + atomic_long_add_unchecked(x, &vm_stat[item]);
69679 }
69680
69681 static inline unsigned long global_page_state(enum zone_stat_item item)
69682 {
69683 - long x = atomic_long_read(&vm_stat[item]);
69684 + long x = atomic_long_read_unchecked(&vm_stat[item]);
69685 #ifdef CONFIG_SMP
69686 if (x < 0)
69687 x = 0;
69688 @@ -158,7 +158,7 @@ static inline unsigned long global_page_state(enum zone_stat_item item)
69689 static inline unsigned long zone_page_state(struct zone *zone,
69690 enum zone_stat_item item)
69691 {
69692 - long x = atomic_long_read(&zone->vm_stat[item]);
69693 + long x = atomic_long_read_unchecked(&zone->vm_stat[item]);
69694 #ifdef CONFIG_SMP
69695 if (x < 0)
69696 x = 0;
69697 @@ -175,7 +175,7 @@ static inline unsigned long zone_page_state(struct zone *zone,
69698 static inline unsigned long zone_page_state_snapshot(struct zone *zone,
69699 enum zone_stat_item item)
69700 {
69701 - long x = atomic_long_read(&zone->vm_stat[item]);
69702 + long x = atomic_long_read_unchecked(&zone->vm_stat[item]);
69703
69704 #ifdef CONFIG_SMP
69705 int cpu;
69706 @@ -264,8 +264,8 @@ static inline void __mod_zone_page_state(struct zone *zone,
69707
69708 static inline void __inc_zone_state(struct zone *zone, enum zone_stat_item item)
69709 {
69710 - atomic_long_inc(&zone->vm_stat[item]);
69711 - atomic_long_inc(&vm_stat[item]);
69712 + atomic_long_inc_unchecked(&zone->vm_stat[item]);
69713 + atomic_long_inc_unchecked(&vm_stat[item]);
69714 }
69715
69716 static inline void __inc_zone_page_state(struct page *page,
69717 @@ -276,8 +276,8 @@ static inline void __inc_zone_page_state(struct page *page,
69718
69719 static inline void __dec_zone_state(struct zone *zone, enum zone_stat_item item)
69720 {
69721 - atomic_long_dec(&zone->vm_stat[item]);
69722 - atomic_long_dec(&vm_stat[item]);
69723 + atomic_long_dec_unchecked(&zone->vm_stat[item]);
69724 + atomic_long_dec_unchecked(&vm_stat[item]);
69725 }
69726
69727 static inline void __dec_zone_page_state(struct page *page,
69728 diff --git a/include/linux/xattr.h b/include/linux/xattr.h
69729 index 5c84af8..1a3b6e2 100644
69730 --- a/include/linux/xattr.h
69731 +++ b/include/linux/xattr.h
69732 @@ -33,6 +33,11 @@
69733 #define XATTR_USER_PREFIX "user."
69734 #define XATTR_USER_PREFIX_LEN (sizeof (XATTR_USER_PREFIX) - 1)
69735
69736 +/* User namespace */
69737 +#define XATTR_PAX_PREFIX XATTR_USER_PREFIX "pax."
69738 +#define XATTR_PAX_FLAGS_SUFFIX "flags"
69739 +#define XATTR_NAME_PAX_FLAGS XATTR_PAX_PREFIX XATTR_PAX_FLAGS_SUFFIX
69740 +
69741 struct inode;
69742 struct dentry;
69743
69744 diff --git a/include/media/saa7146_vv.h b/include/media/saa7146_vv.h
69745 index eed5fcc..5080d24 100644
69746 --- a/include/media/saa7146_vv.h
69747 +++ b/include/media/saa7146_vv.h
69748 @@ -167,7 +167,7 @@ struct saa7146_ext_vv
69749 int (*std_callback)(struct saa7146_dev*, struct saa7146_standard *);
69750
69751 /* the extension can override this */
69752 - struct v4l2_ioctl_ops ops;
69753 + v4l2_ioctl_ops_no_const ops;
69754 /* pointer to the saa7146 core ops */
69755 const struct v4l2_ioctl_ops *core_ops;
69756
69757 diff --git a/include/media/v4l2-dev.h b/include/media/v4l2-dev.h
69758 index 73c9867..2da8837 100644
69759 --- a/include/media/v4l2-dev.h
69760 +++ b/include/media/v4l2-dev.h
69761 @@ -34,7 +34,7 @@ struct v4l2_device;
69762 #define V4L2_FL_UNREGISTERED (0)
69763
69764 struct v4l2_file_operations {
69765 - struct module *owner;
69766 + struct module * const owner;
69767 ssize_t (*read) (struct file *, char __user *, size_t, loff_t *);
69768 ssize_t (*write) (struct file *, const char __user *, size_t, loff_t *);
69769 unsigned int (*poll) (struct file *, struct poll_table_struct *);
69770 @@ -46,6 +46,7 @@ struct v4l2_file_operations {
69771 int (*open) (struct file *);
69772 int (*release) (struct file *);
69773 };
69774 +typedef struct v4l2_file_operations __no_const v4l2_file_operations_no_const;
69775
69776 /*
69777 * Newer version of video_device, handled by videodev2.c
69778 diff --git a/include/media/v4l2-device.h b/include/media/v4l2-device.h
69779 index 5d5d550..f559ef1 100644
69780 --- a/include/media/v4l2-device.h
69781 +++ b/include/media/v4l2-device.h
69782 @@ -71,7 +71,7 @@ int __must_check v4l2_device_register(struct device *dev, struct v4l2_device *v4
69783 this function returns 0. If the name ends with a digit (e.g. cx18),
69784 then the name will be set to cx18-0 since cx180 looks really odd. */
69785 int v4l2_device_set_name(struct v4l2_device *v4l2_dev, const char *basename,
69786 - atomic_t *instance);
69787 + atomic_unchecked_t *instance);
69788
69789 /* Set v4l2_dev->dev to NULL. Call when the USB parent disconnects.
69790 Since the parent disappears this ensures that v4l2_dev doesn't have an
69791 diff --git a/include/media/v4l2-ioctl.h b/include/media/v4l2-ioctl.h
69792 index 7a4529d..7244290 100644
69793 --- a/include/media/v4l2-ioctl.h
69794 +++ b/include/media/v4l2-ioctl.h
69795 @@ -243,6 +243,7 @@ struct v4l2_ioctl_ops {
69796 long (*vidioc_default) (struct file *file, void *fh,
69797 int cmd, void *arg);
69798 };
69799 +typedef struct v4l2_ioctl_ops __no_const v4l2_ioctl_ops_no_const;
69800
69801
69802 /* v4l debugging and diagnostics */
69803 diff --git a/include/net/flow.h b/include/net/flow.h
69804 index 809970b..c3df4f3 100644
69805 --- a/include/net/flow.h
69806 +++ b/include/net/flow.h
69807 @@ -92,7 +92,7 @@ typedef int (*flow_resolve_t)(struct net *net, struct flowi *key, u16 family,
69808 extern void *flow_cache_lookup(struct net *net, struct flowi *key, u16 family,
69809 u8 dir, flow_resolve_t resolver);
69810 extern void flow_cache_flush(void);
69811 -extern atomic_t flow_cache_genid;
69812 +extern atomic_unchecked_t flow_cache_genid;
69813
69814 static inline int flow_cache_uli_match(struct flowi *fl1, struct flowi *fl2)
69815 {
69816 diff --git a/include/net/inetpeer.h b/include/net/inetpeer.h
69817 index 15e1f8fe..668837c 100644
69818 --- a/include/net/inetpeer.h
69819 +++ b/include/net/inetpeer.h
69820 @@ -24,7 +24,7 @@ struct inet_peer
69821 __u32 dtime; /* the time of last use of not
69822 * referenced entries */
69823 atomic_t refcnt;
69824 - atomic_t rid; /* Frag reception counter */
69825 + atomic_unchecked_t rid; /* Frag reception counter */
69826 __u32 tcp_ts;
69827 unsigned long tcp_ts_stamp;
69828 };
69829 diff --git a/include/net/ip_vs.h b/include/net/ip_vs.h
69830 index 98978e7..2243a3d 100644
69831 --- a/include/net/ip_vs.h
69832 +++ b/include/net/ip_vs.h
69833 @@ -365,7 +365,7 @@ struct ip_vs_conn {
69834 struct ip_vs_conn *control; /* Master control connection */
69835 atomic_t n_control; /* Number of controlled ones */
69836 struct ip_vs_dest *dest; /* real server */
69837 - atomic_t in_pkts; /* incoming packet counter */
69838 + atomic_unchecked_t in_pkts; /* incoming packet counter */
69839
69840 /* packet transmitter for different forwarding methods. If it
69841 mangles the packet, it must return NF_DROP or better NF_STOLEN,
69842 @@ -466,7 +466,7 @@ struct ip_vs_dest {
69843 union nf_inet_addr addr; /* IP address of the server */
69844 __be16 port; /* port number of the server */
69845 volatile unsigned flags; /* dest status flags */
69846 - atomic_t conn_flags; /* flags to copy to conn */
69847 + atomic_unchecked_t conn_flags; /* flags to copy to conn */
69848 atomic_t weight; /* server weight */
69849
69850 atomic_t refcnt; /* reference counter */
69851 diff --git a/include/net/irda/ircomm_core.h b/include/net/irda/ircomm_core.h
69852 index 69b610a..fe3962c 100644
69853 --- a/include/net/irda/ircomm_core.h
69854 +++ b/include/net/irda/ircomm_core.h
69855 @@ -51,7 +51,7 @@ typedef struct {
69856 int (*connect_response)(struct ircomm_cb *, struct sk_buff *);
69857 int (*disconnect_request)(struct ircomm_cb *, struct sk_buff *,
69858 struct ircomm_info *);
69859 -} call_t;
69860 +} __no_const call_t;
69861
69862 struct ircomm_cb {
69863 irda_queue_t queue;
69864 diff --git a/include/net/irda/ircomm_tty.h b/include/net/irda/ircomm_tty.h
69865 index eea2e61..08c692d 100644
69866 --- a/include/net/irda/ircomm_tty.h
69867 +++ b/include/net/irda/ircomm_tty.h
69868 @@ -35,6 +35,7 @@
69869 #include <linux/termios.h>
69870 #include <linux/timer.h>
69871 #include <linux/tty.h> /* struct tty_struct */
69872 +#include <asm/local.h>
69873
69874 #include <net/irda/irias_object.h>
69875 #include <net/irda/ircomm_core.h>
69876 @@ -105,8 +106,8 @@ struct ircomm_tty_cb {
69877 unsigned short close_delay;
69878 unsigned short closing_wait; /* time to wait before closing */
69879
69880 - int open_count;
69881 - int blocked_open; /* # of blocked opens */
69882 + local_t open_count;
69883 + local_t blocked_open; /* # of blocked opens */
69884
69885 /* Protect concurent access to :
69886 * o self->open_count
69887 diff --git a/include/net/iucv/af_iucv.h b/include/net/iucv/af_iucv.h
69888 index f82a1e8..82d81e8 100644
69889 --- a/include/net/iucv/af_iucv.h
69890 +++ b/include/net/iucv/af_iucv.h
69891 @@ -87,7 +87,7 @@ struct iucv_sock {
69892 struct iucv_sock_list {
69893 struct hlist_head head;
69894 rwlock_t lock;
69895 - atomic_t autobind_name;
69896 + atomic_unchecked_t autobind_name;
69897 };
69898
69899 unsigned int iucv_sock_poll(struct file *file, struct socket *sock,
69900 diff --git a/include/net/lapb.h b/include/net/lapb.h
69901 index 96cb5dd..25e8d4f 100644
69902 --- a/include/net/lapb.h
69903 +++ b/include/net/lapb.h
69904 @@ -95,7 +95,7 @@ struct lapb_cb {
69905 struct sk_buff_head write_queue;
69906 struct sk_buff_head ack_queue;
69907 unsigned char window;
69908 - struct lapb_register_struct callbacks;
69909 + struct lapb_register_struct *callbacks;
69910
69911 /* FRMR control information */
69912 struct lapb_frame frmr_data;
69913 diff --git a/include/net/neighbour.h b/include/net/neighbour.h
69914 index 3817fda..cdb2343 100644
69915 --- a/include/net/neighbour.h
69916 +++ b/include/net/neighbour.h
69917 @@ -131,7 +131,7 @@ struct neigh_ops
69918 int (*connected_output)(struct sk_buff*);
69919 int (*hh_output)(struct sk_buff*);
69920 int (*queue_xmit)(struct sk_buff*);
69921 -};
69922 +} __do_const;
69923
69924 struct pneigh_entry
69925 {
69926 diff --git a/include/net/netlink.h b/include/net/netlink.h
69927 index c344646..4778c71 100644
69928 --- a/include/net/netlink.h
69929 +++ b/include/net/netlink.h
69930 @@ -335,7 +335,7 @@ static inline int nlmsg_ok(const struct nlmsghdr *nlh, int remaining)
69931 {
69932 return (remaining >= (int) sizeof(struct nlmsghdr) &&
69933 nlh->nlmsg_len >= sizeof(struct nlmsghdr) &&
69934 - nlh->nlmsg_len <= remaining);
69935 + nlh->nlmsg_len <= (unsigned int)remaining);
69936 }
69937
69938 /**
69939 @@ -558,7 +558,7 @@ static inline void *nlmsg_get_pos(struct sk_buff *skb)
69940 static inline void nlmsg_trim(struct sk_buff *skb, const void *mark)
69941 {
69942 if (mark)
69943 - skb_trim(skb, (unsigned char *) mark - skb->data);
69944 + skb_trim(skb, (const unsigned char *) mark - skb->data);
69945 }
69946
69947 /**
69948 diff --git a/include/net/netns/ipv4.h b/include/net/netns/ipv4.h
69949 index 9a4b8b7..e49e077 100644
69950 --- a/include/net/netns/ipv4.h
69951 +++ b/include/net/netns/ipv4.h
69952 @@ -54,7 +54,7 @@ struct netns_ipv4 {
69953 int current_rt_cache_rebuild_count;
69954
69955 struct timer_list rt_secret_timer;
69956 - atomic_t rt_genid;
69957 + atomic_unchecked_t rt_genid;
69958
69959 #ifdef CONFIG_IP_MROUTE
69960 struct sock *mroute_sk;
69961 diff --git a/include/net/sctp/sctp.h b/include/net/sctp/sctp.h
69962 index 8a6d529..171f401 100644
69963 --- a/include/net/sctp/sctp.h
69964 +++ b/include/net/sctp/sctp.h
69965 @@ -305,8 +305,8 @@ extern int sctp_debug_flag;
69966
69967 #else /* SCTP_DEBUG */
69968
69969 -#define SCTP_DEBUG_PRINTK(whatever...)
69970 -#define SCTP_DEBUG_PRINTK_IPADDR(whatever...)
69971 +#define SCTP_DEBUG_PRINTK(whatever...) do {} while (0)
69972 +#define SCTP_DEBUG_PRINTK_IPADDR(whatever...) do {} while (0)
69973 #define SCTP_ENABLE_DEBUG
69974 #define SCTP_DISABLE_DEBUG
69975 #define SCTP_ASSERT(expr, str, func)
69976 diff --git a/include/net/secure_seq.h b/include/net/secure_seq.h
69977 index d97f689..f3b90ab 100644
69978 --- a/include/net/secure_seq.h
69979 +++ b/include/net/secure_seq.h
69980 @@ -7,14 +7,14 @@ extern __u32 secure_ip_id(__be32 daddr);
69981 extern __u32 secure_ipv6_id(const __be32 daddr[4]);
69982 extern u32 secure_ipv4_port_ephemeral(__be32 saddr, __be32 daddr, __be16 dport);
69983 extern u32 secure_ipv6_port_ephemeral(const __be32 *saddr, const __be32 *daddr,
69984 - __be16 dport);
69985 + __be16 dport);
69986 extern __u32 secure_tcp_sequence_number(__be32 saddr, __be32 daddr,
69987 __be16 sport, __be16 dport);
69988 extern __u32 secure_tcpv6_sequence_number(__be32 *saddr, __be32 *daddr,
69989 - __be16 sport, __be16 dport);
69990 + __be16 sport, __be16 dport);
69991 extern u64 secure_dccp_sequence_number(__be32 saddr, __be32 daddr,
69992 - __be16 sport, __be16 dport);
69993 + __be16 sport, __be16 dport);
69994 extern u64 secure_dccpv6_sequence_number(__be32 *saddr, __be32 *daddr,
69995 - __be16 sport, __be16 dport);
69996 + __be16 sport, __be16 dport);
69997
69998 #endif /* _NET_SECURE_SEQ */
69999 diff --git a/include/net/sock.h b/include/net/sock.h
70000 index 9f96394..76fc9c7 100644
70001 --- a/include/net/sock.h
70002 +++ b/include/net/sock.h
70003 @@ -272,7 +272,7 @@ struct sock {
70004 rwlock_t sk_callback_lock;
70005 int sk_err,
70006 sk_err_soft;
70007 - atomic_t sk_drops;
70008 + atomic_unchecked_t sk_drops;
70009 unsigned short sk_ack_backlog;
70010 unsigned short sk_max_ack_backlog;
70011 __u32 sk_priority;
70012 @@ -737,7 +737,7 @@ static inline void sk_refcnt_debug_release(const struct sock *sk)
70013 extern void sock_prot_inuse_add(struct net *net, struct proto *prot, int inc);
70014 extern int sock_prot_inuse_get(struct net *net, struct proto *proto);
70015 #else
70016 -static void inline sock_prot_inuse_add(struct net *net, struct proto *prot,
70017 +static inline void sock_prot_inuse_add(struct net *net, struct proto *prot,
70018 int inc)
70019 {
70020 }
70021 diff --git a/include/net/tcp.h b/include/net/tcp.h
70022 index 6cfe18b..dd21acb 100644
70023 --- a/include/net/tcp.h
70024 +++ b/include/net/tcp.h
70025 @@ -1444,8 +1444,8 @@ enum tcp_seq_states {
70026 struct tcp_seq_afinfo {
70027 char *name;
70028 sa_family_t family;
70029 - struct file_operations seq_fops;
70030 - struct seq_operations seq_ops;
70031 + file_operations_no_const seq_fops;
70032 + seq_operations_no_const seq_ops;
70033 };
70034
70035 struct tcp_iter_state {
70036 diff --git a/include/net/udp.h b/include/net/udp.h
70037 index f98abd2..b4b042f 100644
70038 --- a/include/net/udp.h
70039 +++ b/include/net/udp.h
70040 @@ -187,8 +187,8 @@ struct udp_seq_afinfo {
70041 char *name;
70042 sa_family_t family;
70043 struct udp_table *udp_table;
70044 - struct file_operations seq_fops;
70045 - struct seq_operations seq_ops;
70046 + file_operations_no_const seq_fops;
70047 + seq_operations_no_const seq_ops;
70048 };
70049
70050 struct udp_iter_state {
70051 diff --git a/include/rdma/iw_cm.h b/include/rdma/iw_cm.h
70052 index cbb822e..e9c1cbe 100644
70053 --- a/include/rdma/iw_cm.h
70054 +++ b/include/rdma/iw_cm.h
70055 @@ -129,7 +129,7 @@ struct iw_cm_verbs {
70056 int backlog);
70057
70058 int (*destroy_listen)(struct iw_cm_id *cm_id);
70059 -};
70060 +} __no_const;
70061
70062 /**
70063 * iw_create_cm_id - Create an IW CM identifier.
70064 diff --git a/include/scsi/libfc.h b/include/scsi/libfc.h
70065 index 09a124b..caa8ca8 100644
70066 --- a/include/scsi/libfc.h
70067 +++ b/include/scsi/libfc.h
70068 @@ -675,6 +675,7 @@ struct libfc_function_template {
70069 */
70070 void (*disc_stop_final) (struct fc_lport *);
70071 };
70072 +typedef struct libfc_function_template __no_const libfc_function_template_no_const;
70073
70074 /* information used by the discovery layer */
70075 struct fc_disc {
70076 @@ -707,7 +708,7 @@ struct fc_lport {
70077 struct fc_disc disc;
70078
70079 /* Operational Information */
70080 - struct libfc_function_template tt;
70081 + libfc_function_template_no_const tt;
70082 u8 link_up;
70083 u8 qfull;
70084 enum fc_lport_state state;
70085 diff --git a/include/scsi/scsi_device.h b/include/scsi/scsi_device.h
70086 index de8e180..f15e0d7 100644
70087 --- a/include/scsi/scsi_device.h
70088 +++ b/include/scsi/scsi_device.h
70089 @@ -156,9 +156,9 @@ struct scsi_device {
70090 unsigned int max_device_blocked; /* what device_blocked counts down from */
70091 #define SCSI_DEFAULT_DEVICE_BLOCKED 3
70092
70093 - atomic_t iorequest_cnt;
70094 - atomic_t iodone_cnt;
70095 - atomic_t ioerr_cnt;
70096 + atomic_unchecked_t iorequest_cnt;
70097 + atomic_unchecked_t iodone_cnt;
70098 + atomic_unchecked_t ioerr_cnt;
70099
70100 struct device sdev_gendev,
70101 sdev_dev;
70102 diff --git a/include/scsi/scsi_transport_fc.h b/include/scsi/scsi_transport_fc.h
70103 index fc50bd6..81ba9cb 100644
70104 --- a/include/scsi/scsi_transport_fc.h
70105 +++ b/include/scsi/scsi_transport_fc.h
70106 @@ -708,7 +708,7 @@ struct fc_function_template {
70107 unsigned long show_host_system_hostname:1;
70108
70109 unsigned long disable_target_scan:1;
70110 -};
70111 +} __do_const;
70112
70113
70114 /**
70115 diff --git a/include/sound/ac97_codec.h b/include/sound/ac97_codec.h
70116 index 3dae3f7..8440d6f 100644
70117 --- a/include/sound/ac97_codec.h
70118 +++ b/include/sound/ac97_codec.h
70119 @@ -419,15 +419,15 @@
70120 struct snd_ac97;
70121
70122 struct snd_ac97_build_ops {
70123 - int (*build_3d) (struct snd_ac97 *ac97);
70124 - int (*build_specific) (struct snd_ac97 *ac97);
70125 - int (*build_spdif) (struct snd_ac97 *ac97);
70126 - int (*build_post_spdif) (struct snd_ac97 *ac97);
70127 + int (* const build_3d) (struct snd_ac97 *ac97);
70128 + int (* const build_specific) (struct snd_ac97 *ac97);
70129 + int (* const build_spdif) (struct snd_ac97 *ac97);
70130 + int (* const build_post_spdif) (struct snd_ac97 *ac97);
70131 #ifdef CONFIG_PM
70132 - void (*suspend) (struct snd_ac97 *ac97);
70133 - void (*resume) (struct snd_ac97 *ac97);
70134 + void (* const suspend) (struct snd_ac97 *ac97);
70135 + void (* const resume) (struct snd_ac97 *ac97);
70136 #endif
70137 - void (*update_jacks) (struct snd_ac97 *ac97); /* for jack-sharing */
70138 + void (* const update_jacks) (struct snd_ac97 *ac97); /* for jack-sharing */
70139 };
70140
70141 struct snd_ac97_bus_ops {
70142 @@ -477,7 +477,7 @@ struct snd_ac97_template {
70143
70144 struct snd_ac97 {
70145 /* -- lowlevel (hardware) driver specific -- */
70146 - struct snd_ac97_build_ops * build_ops;
70147 + const struct snd_ac97_build_ops * build_ops;
70148 void *private_data;
70149 void (*private_free) (struct snd_ac97 *ac97);
70150 /* --- */
70151 diff --git a/include/sound/ak4xxx-adda.h b/include/sound/ak4xxx-adda.h
70152 index 891cf1a..a94ba2b 100644
70153 --- a/include/sound/ak4xxx-adda.h
70154 +++ b/include/sound/ak4xxx-adda.h
70155 @@ -35,7 +35,7 @@ struct snd_ak4xxx_ops {
70156 void (*write)(struct snd_akm4xxx *ak, int chip, unsigned char reg,
70157 unsigned char val);
70158 void (*set_rate_val)(struct snd_akm4xxx *ak, unsigned int rate);
70159 -};
70160 +} __no_const;
70161
70162 #define AK4XXX_IMAGE_SIZE (AK4XXX_MAX_CHIPS * 16) /* 64 bytes */
70163
70164 diff --git a/include/sound/hwdep.h b/include/sound/hwdep.h
70165 index 8c05e47..2b5df97 100644
70166 --- a/include/sound/hwdep.h
70167 +++ b/include/sound/hwdep.h
70168 @@ -49,7 +49,7 @@ struct snd_hwdep_ops {
70169 struct snd_hwdep_dsp_status *status);
70170 int (*dsp_load)(struct snd_hwdep *hw,
70171 struct snd_hwdep_dsp_image *image);
70172 -};
70173 +} __no_const;
70174
70175 struct snd_hwdep {
70176 struct snd_card *card;
70177 diff --git a/include/sound/info.h b/include/sound/info.h
70178 index 112e894..6fda5b5 100644
70179 --- a/include/sound/info.h
70180 +++ b/include/sound/info.h
70181 @@ -44,7 +44,7 @@ struct snd_info_entry_text {
70182 struct snd_info_buffer *buffer);
70183 void (*write)(struct snd_info_entry *entry,
70184 struct snd_info_buffer *buffer);
70185 -};
70186 +} __no_const;
70187
70188 struct snd_info_entry_ops {
70189 int (*open)(struct snd_info_entry *entry,
70190 diff --git a/include/sound/pcm.h b/include/sound/pcm.h
70191 index de6d981..590a550 100644
70192 --- a/include/sound/pcm.h
70193 +++ b/include/sound/pcm.h
70194 @@ -80,6 +80,7 @@ struct snd_pcm_ops {
70195 int (*mmap)(struct snd_pcm_substream *substream, struct vm_area_struct *vma);
70196 int (*ack)(struct snd_pcm_substream *substream);
70197 };
70198 +typedef struct snd_pcm_ops __no_const snd_pcm_ops_no_const;
70199
70200 /*
70201 *
70202 diff --git a/include/sound/sb16_csp.h b/include/sound/sb16_csp.h
70203 index 736eac7..fe8a80f 100644
70204 --- a/include/sound/sb16_csp.h
70205 +++ b/include/sound/sb16_csp.h
70206 @@ -139,7 +139,7 @@ struct snd_sb_csp_ops {
70207 int (*csp_start) (struct snd_sb_csp * p, int sample_width, int channels);
70208 int (*csp_stop) (struct snd_sb_csp * p);
70209 int (*csp_qsound_transfer) (struct snd_sb_csp * p);
70210 -};
70211 +} __no_const;
70212
70213 /*
70214 * CSP private data
70215 diff --git a/include/sound/ymfpci.h b/include/sound/ymfpci.h
70216 index 444cd6b..3327cc5 100644
70217 --- a/include/sound/ymfpci.h
70218 +++ b/include/sound/ymfpci.h
70219 @@ -358,7 +358,7 @@ struct snd_ymfpci {
70220 spinlock_t reg_lock;
70221 spinlock_t voice_lock;
70222 wait_queue_head_t interrupt_sleep;
70223 - atomic_t interrupt_sleep_count;
70224 + atomic_unchecked_t interrupt_sleep_count;
70225 struct snd_info_entry *proc_entry;
70226 const struct firmware *dsp_microcode;
70227 const struct firmware *controller_microcode;
70228 diff --git a/include/trace/events/irq.h b/include/trace/events/irq.h
70229 index b89f9db..f097b38 100644
70230 --- a/include/trace/events/irq.h
70231 +++ b/include/trace/events/irq.h
70232 @@ -34,7 +34,7 @@
70233 */
70234 TRACE_EVENT(irq_handler_entry,
70235
70236 - TP_PROTO(int irq, struct irqaction *action),
70237 + TP_PROTO(int irq, const struct irqaction *action),
70238
70239 TP_ARGS(irq, action),
70240
70241 @@ -64,7 +64,7 @@ TRACE_EVENT(irq_handler_entry,
70242 */
70243 TRACE_EVENT(irq_handler_exit,
70244
70245 - TP_PROTO(int irq, struct irqaction *action, int ret),
70246 + TP_PROTO(int irq, const struct irqaction *action, int ret),
70247
70248 TP_ARGS(irq, action, ret),
70249
70250 @@ -95,7 +95,7 @@ TRACE_EVENT(irq_handler_exit,
70251 */
70252 TRACE_EVENT(softirq_entry,
70253
70254 - TP_PROTO(struct softirq_action *h, struct softirq_action *vec),
70255 + TP_PROTO(const struct softirq_action *h, const struct softirq_action *vec),
70256
70257 TP_ARGS(h, vec),
70258
70259 @@ -124,7 +124,7 @@ TRACE_EVENT(softirq_entry,
70260 */
70261 TRACE_EVENT(softirq_exit,
70262
70263 - TP_PROTO(struct softirq_action *h, struct softirq_action *vec),
70264 + TP_PROTO(const struct softirq_action *h, const struct softirq_action *vec),
70265
70266 TP_ARGS(h, vec),
70267
70268 diff --git a/include/video/uvesafb.h b/include/video/uvesafb.h
70269 index 0993a22..32ba2fe 100644
70270 --- a/include/video/uvesafb.h
70271 +++ b/include/video/uvesafb.h
70272 @@ -177,6 +177,7 @@ struct uvesafb_par {
70273 u8 ypan; /* 0 - nothing, 1 - ypan, 2 - ywrap */
70274 u8 pmi_setpal; /* PMI for palette changes */
70275 u16 *pmi_base; /* protected mode interface location */
70276 + u8 *pmi_code; /* protected mode code location */
70277 void *pmi_start;
70278 void *pmi_pal;
70279 u8 *vbe_state_orig; /*
70280 diff --git a/init/Kconfig b/init/Kconfig
70281 index d72691b..3996e54 100644
70282 --- a/init/Kconfig
70283 +++ b/init/Kconfig
70284 @@ -1004,7 +1004,7 @@ config SLUB_DEBUG
70285
70286 config COMPAT_BRK
70287 bool "Disable heap randomization"
70288 - default y
70289 + default n
70290 help
70291 Randomizing heap placement makes heap exploits harder, but it
70292 also breaks ancient binaries (including anything libc5 based).
70293 diff --git a/init/do_mounts.c b/init/do_mounts.c
70294 index bb008d0..4fa3933 100644
70295 --- a/init/do_mounts.c
70296 +++ b/init/do_mounts.c
70297 @@ -216,11 +216,11 @@ static void __init get_fs_names(char *page)
70298
70299 static int __init do_mount_root(char *name, char *fs, int flags, void *data)
70300 {
70301 - int err = sys_mount(name, "/root", fs, flags, data);
70302 + int err = sys_mount((__force char __user *)name, (__force char __user *)"/root", (__force char __user *)fs, flags, (__force void __user *)data);
70303 if (err)
70304 return err;
70305
70306 - sys_chdir("/root");
70307 + sys_chdir((__force const char __user *)"/root");
70308 ROOT_DEV = current->fs->pwd.mnt->mnt_sb->s_dev;
70309 printk("VFS: Mounted root (%s filesystem)%s on device %u:%u.\n",
70310 current->fs->pwd.mnt->mnt_sb->s_type->name,
70311 @@ -311,18 +311,18 @@ void __init change_floppy(char *fmt, ...)
70312 va_start(args, fmt);
70313 vsprintf(buf, fmt, args);
70314 va_end(args);
70315 - fd = sys_open("/dev/root", O_RDWR | O_NDELAY, 0);
70316 + fd = sys_open((char __user *)"/dev/root", O_RDWR | O_NDELAY, 0);
70317 if (fd >= 0) {
70318 sys_ioctl(fd, FDEJECT, 0);
70319 sys_close(fd);
70320 }
70321 printk(KERN_NOTICE "VFS: Insert %s and press ENTER\n", buf);
70322 - fd = sys_open("/dev/console", O_RDWR, 0);
70323 + fd = sys_open((char __user *)"/dev/console", O_RDWR, 0);
70324 if (fd >= 0) {
70325 sys_ioctl(fd, TCGETS, (long)&termios);
70326 termios.c_lflag &= ~ICANON;
70327 sys_ioctl(fd, TCSETSF, (long)&termios);
70328 - sys_read(fd, &c, 1);
70329 + sys_read(fd, (char __user *)&c, 1);
70330 termios.c_lflag |= ICANON;
70331 sys_ioctl(fd, TCSETSF, (long)&termios);
70332 sys_close(fd);
70333 @@ -416,6 +416,6 @@ void __init prepare_namespace(void)
70334 mount_root();
70335 out:
70336 devtmpfs_mount("dev");
70337 - sys_mount(".", "/", NULL, MS_MOVE, NULL);
70338 - sys_chroot(".");
70339 + sys_mount((__force char __user *)".", (__force char __user *)"/", NULL, MS_MOVE, NULL);
70340 + sys_chroot((__force char __user *)".");
70341 }
70342 diff --git a/init/do_mounts.h b/init/do_mounts.h
70343 index f5b978a..69dbfe8 100644
70344 --- a/init/do_mounts.h
70345 +++ b/init/do_mounts.h
70346 @@ -15,15 +15,15 @@ extern int root_mountflags;
70347
70348 static inline int create_dev(char *name, dev_t dev)
70349 {
70350 - sys_unlink(name);
70351 - return sys_mknod(name, S_IFBLK|0600, new_encode_dev(dev));
70352 + sys_unlink((char __force_user *)name);
70353 + return sys_mknod((char __force_user *)name, S_IFBLK|0600, new_encode_dev(dev));
70354 }
70355
70356 #if BITS_PER_LONG == 32
70357 static inline u32 bstat(char *name)
70358 {
70359 struct stat64 stat;
70360 - if (sys_stat64(name, &stat) != 0)
70361 + if (sys_stat64((char __force_user *)name, (struct stat64 __force_user *)&stat) != 0)
70362 return 0;
70363 if (!S_ISBLK(stat.st_mode))
70364 return 0;
70365 @@ -35,7 +35,7 @@ static inline u32 bstat(char *name)
70366 static inline u32 bstat(char *name)
70367 {
70368 struct stat stat;
70369 - if (sys_newstat(name, &stat) != 0)
70370 + if (sys_newstat((const char __force_user *)name, (struct stat __force_user *)&stat) != 0)
70371 return 0;
70372 if (!S_ISBLK(stat.st_mode))
70373 return 0;
70374 diff --git a/init/do_mounts_initrd.c b/init/do_mounts_initrd.c
70375 index 614241b..4da046b 100644
70376 --- a/init/do_mounts_initrd.c
70377 +++ b/init/do_mounts_initrd.c
70378 @@ -32,7 +32,7 @@ static int __init do_linuxrc(void * shell)
70379 sys_close(old_fd);sys_close(root_fd);
70380 sys_close(0);sys_close(1);sys_close(2);
70381 sys_setsid();
70382 - (void) sys_open("/dev/console",O_RDWR,0);
70383 + (void) sys_open((__force const char __user *)"/dev/console",O_RDWR,0);
70384 (void) sys_dup(0);
70385 (void) sys_dup(0);
70386 return kernel_execve(shell, argv, envp_init);
70387 @@ -47,13 +47,13 @@ static void __init handle_initrd(void)
70388 create_dev("/dev/root.old", Root_RAM0);
70389 /* mount initrd on rootfs' /root */
70390 mount_block_root("/dev/root.old", root_mountflags & ~MS_RDONLY);
70391 - sys_mkdir("/old", 0700);
70392 - root_fd = sys_open("/", 0, 0);
70393 - old_fd = sys_open("/old", 0, 0);
70394 + sys_mkdir((const char __force_user *)"/old", 0700);
70395 + root_fd = sys_open((const char __force_user *)"/", 0, 0);
70396 + old_fd = sys_open((const char __force_user *)"/old", 0, 0);
70397 /* move initrd over / and chdir/chroot in initrd root */
70398 - sys_chdir("/root");
70399 - sys_mount(".", "/", NULL, MS_MOVE, NULL);
70400 - sys_chroot(".");
70401 + sys_chdir((const char __force_user *)"/root");
70402 + sys_mount((char __force_user *)".", (char __force_user *)"/", NULL, MS_MOVE, NULL);
70403 + sys_chroot((const char __force_user *)".");
70404
70405 /*
70406 * In case that a resume from disk is carried out by linuxrc or one of
70407 @@ -70,15 +70,15 @@ static void __init handle_initrd(void)
70408
70409 /* move initrd to rootfs' /old */
70410 sys_fchdir(old_fd);
70411 - sys_mount("/", ".", NULL, MS_MOVE, NULL);
70412 + sys_mount((char __force_user *)"/", (char __force_user *)".", NULL, MS_MOVE, NULL);
70413 /* switch root and cwd back to / of rootfs */
70414 sys_fchdir(root_fd);
70415 - sys_chroot(".");
70416 + sys_chroot((const char __force_user *)".");
70417 sys_close(old_fd);
70418 sys_close(root_fd);
70419
70420 if (new_decode_dev(real_root_dev) == Root_RAM0) {
70421 - sys_chdir("/old");
70422 + sys_chdir((const char __force_user *)"/old");
70423 return;
70424 }
70425
70426 @@ -86,17 +86,17 @@ static void __init handle_initrd(void)
70427 mount_root();
70428
70429 printk(KERN_NOTICE "Trying to move old root to /initrd ... ");
70430 - error = sys_mount("/old", "/root/initrd", NULL, MS_MOVE, NULL);
70431 + error = sys_mount((char __force_user *)"/old", (char __force_user *)"/root/initrd", NULL, MS_MOVE, NULL);
70432 if (!error)
70433 printk("okay\n");
70434 else {
70435 - int fd = sys_open("/dev/root.old", O_RDWR, 0);
70436 + int fd = sys_open((const char __force_user *)"/dev/root.old", O_RDWR, 0);
70437 if (error == -ENOENT)
70438 printk("/initrd does not exist. Ignored.\n");
70439 else
70440 printk("failed\n");
70441 printk(KERN_NOTICE "Unmounting old root\n");
70442 - sys_umount("/old", MNT_DETACH);
70443 + sys_umount((char __force_user *)"/old", MNT_DETACH);
70444 printk(KERN_NOTICE "Trying to free ramdisk memory ... ");
70445 if (fd < 0) {
70446 error = fd;
70447 @@ -119,11 +119,11 @@ int __init initrd_load(void)
70448 * mounted in the normal path.
70449 */
70450 if (rd_load_image("/initrd.image") && ROOT_DEV != Root_RAM0) {
70451 - sys_unlink("/initrd.image");
70452 + sys_unlink((const char __force_user *)"/initrd.image");
70453 handle_initrd();
70454 return 1;
70455 }
70456 }
70457 - sys_unlink("/initrd.image");
70458 + sys_unlink((const char __force_user *)"/initrd.image");
70459 return 0;
70460 }
70461 diff --git a/init/do_mounts_md.c b/init/do_mounts_md.c
70462 index 69aebbf..c0bf6a7 100644
70463 --- a/init/do_mounts_md.c
70464 +++ b/init/do_mounts_md.c
70465 @@ -170,7 +170,7 @@ static void __init md_setup_drive(void)
70466 partitioned ? "_d" : "", minor,
70467 md_setup_args[ent].device_names);
70468
70469 - fd = sys_open(name, 0, 0);
70470 + fd = sys_open((char __force_user *)name, 0, 0);
70471 if (fd < 0) {
70472 printk(KERN_ERR "md: open failed - cannot start "
70473 "array %s\n", name);
70474 @@ -233,7 +233,7 @@ static void __init md_setup_drive(void)
70475 * array without it
70476 */
70477 sys_close(fd);
70478 - fd = sys_open(name, 0, 0);
70479 + fd = sys_open((char __force_user *)name, 0, 0);
70480 sys_ioctl(fd, BLKRRPART, 0);
70481 }
70482 sys_close(fd);
70483 @@ -283,7 +283,7 @@ static void __init autodetect_raid(void)
70484
70485 wait_for_device_probe();
70486
70487 - fd = sys_open("/dev/md0", 0, 0);
70488 + fd = sys_open((__force char __user *)"/dev/md0", 0, 0);
70489 if (fd >= 0) {
70490 sys_ioctl(fd, RAID_AUTORUN, raid_autopart);
70491 sys_close(fd);
70492 diff --git a/init/initramfs.c b/init/initramfs.c
70493 index 1fd59b8..a01b079 100644
70494 --- a/init/initramfs.c
70495 +++ b/init/initramfs.c
70496 @@ -74,7 +74,7 @@ static void __init free_hash(void)
70497 }
70498 }
70499
70500 -static long __init do_utime(char __user *filename, time_t mtime)
70501 +static long __init do_utime(__force char __user *filename, time_t mtime)
70502 {
70503 struct timespec t[2];
70504
70505 @@ -109,7 +109,7 @@ static void __init dir_utime(void)
70506 struct dir_entry *de, *tmp;
70507 list_for_each_entry_safe(de, tmp, &dir_list, list) {
70508 list_del(&de->list);
70509 - do_utime(de->name, de->mtime);
70510 + do_utime((char __force_user *)de->name, de->mtime);
70511 kfree(de->name);
70512 kfree(de);
70513 }
70514 @@ -271,7 +271,7 @@ static int __init maybe_link(void)
70515 if (nlink >= 2) {
70516 char *old = find_link(major, minor, ino, mode, collected);
70517 if (old)
70518 - return (sys_link(old, collected) < 0) ? -1 : 1;
70519 + return (sys_link((char __force_user *)old, (char __force_user *)collected) < 0) ? -1 : 1;
70520 }
70521 return 0;
70522 }
70523 @@ -280,11 +280,11 @@ static void __init clean_path(char *path, mode_t mode)
70524 {
70525 struct stat st;
70526
70527 - if (!sys_newlstat(path, &st) && (st.st_mode^mode) & S_IFMT) {
70528 + if (!sys_newlstat((char __force_user *)path, (struct stat __force_user *)&st) && (st.st_mode^mode) & S_IFMT) {
70529 if (S_ISDIR(st.st_mode))
70530 - sys_rmdir(path);
70531 + sys_rmdir((char __force_user *)path);
70532 else
70533 - sys_unlink(path);
70534 + sys_unlink((char __force_user *)path);
70535 }
70536 }
70537
70538 @@ -305,7 +305,7 @@ static int __init do_name(void)
70539 int openflags = O_WRONLY|O_CREAT;
70540 if (ml != 1)
70541 openflags |= O_TRUNC;
70542 - wfd = sys_open(collected, openflags, mode);
70543 + wfd = sys_open((char __force_user *)collected, openflags, mode);
70544
70545 if (wfd >= 0) {
70546 sys_fchown(wfd, uid, gid);
70547 @@ -317,17 +317,17 @@ static int __init do_name(void)
70548 }
70549 }
70550 } else if (S_ISDIR(mode)) {
70551 - sys_mkdir(collected, mode);
70552 - sys_chown(collected, uid, gid);
70553 - sys_chmod(collected, mode);
70554 + sys_mkdir((char __force_user *)collected, mode);
70555 + sys_chown((char __force_user *)collected, uid, gid);
70556 + sys_chmod((char __force_user *)collected, mode);
70557 dir_add(collected, mtime);
70558 } else if (S_ISBLK(mode) || S_ISCHR(mode) ||
70559 S_ISFIFO(mode) || S_ISSOCK(mode)) {
70560 if (maybe_link() == 0) {
70561 - sys_mknod(collected, mode, rdev);
70562 - sys_chown(collected, uid, gid);
70563 - sys_chmod(collected, mode);
70564 - do_utime(collected, mtime);
70565 + sys_mknod((char __force_user *)collected, mode, rdev);
70566 + sys_chown((char __force_user *)collected, uid, gid);
70567 + sys_chmod((char __force_user *)collected, mode);
70568 + do_utime((char __force_user *)collected, mtime);
70569 }
70570 }
70571 return 0;
70572 @@ -336,15 +336,15 @@ static int __init do_name(void)
70573 static int __init do_copy(void)
70574 {
70575 if (count >= body_len) {
70576 - sys_write(wfd, victim, body_len);
70577 + sys_write(wfd, (char __force_user *)victim, body_len);
70578 sys_close(wfd);
70579 - do_utime(vcollected, mtime);
70580 + do_utime((char __force_user *)vcollected, mtime);
70581 kfree(vcollected);
70582 eat(body_len);
70583 state = SkipIt;
70584 return 0;
70585 } else {
70586 - sys_write(wfd, victim, count);
70587 + sys_write(wfd, (char __force_user *)victim, count);
70588 body_len -= count;
70589 eat(count);
70590 return 1;
70591 @@ -355,9 +355,9 @@ static int __init do_symlink(void)
70592 {
70593 collected[N_ALIGN(name_len) + body_len] = '\0';
70594 clean_path(collected, 0);
70595 - sys_symlink(collected + N_ALIGN(name_len), collected);
70596 - sys_lchown(collected, uid, gid);
70597 - do_utime(collected, mtime);
70598 + sys_symlink((char __force_user *)collected + N_ALIGN(name_len), (char __force_user *)collected);
70599 + sys_lchown((char __force_user *)collected, uid, gid);
70600 + do_utime((char __force_user *)collected, mtime);
70601 state = SkipIt;
70602 next_state = Reset;
70603 return 0;
70604 diff --git a/init/main.c b/init/main.c
70605 index 1eb4bd5..da8c6f5 100644
70606 --- a/init/main.c
70607 +++ b/init/main.c
70608 @@ -97,6 +97,7 @@ static inline void mark_rodata_ro(void) { }
70609 #ifdef CONFIG_TC
70610 extern void tc_init(void);
70611 #endif
70612 +extern void grsecurity_init(void);
70613
70614 enum system_states system_state __read_mostly;
70615 EXPORT_SYMBOL(system_state);
70616 @@ -183,6 +184,49 @@ static int __init set_reset_devices(char *str)
70617
70618 __setup("reset_devices", set_reset_devices);
70619
70620 +#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
70621 +extern char pax_enter_kernel_user[];
70622 +extern char pax_exit_kernel_user[];
70623 +extern pgdval_t clone_pgd_mask;
70624 +#endif
70625 +
70626 +#if defined(CONFIG_X86) && defined(CONFIG_PAX_MEMORY_UDEREF)
70627 +static int __init setup_pax_nouderef(char *str)
70628 +{
70629 +#ifdef CONFIG_X86_32
70630 + unsigned int cpu;
70631 + struct desc_struct *gdt;
70632 +
70633 + for (cpu = 0; cpu < NR_CPUS; cpu++) {
70634 + gdt = get_cpu_gdt_table(cpu);
70635 + gdt[GDT_ENTRY_KERNEL_DS].type = 3;
70636 + gdt[GDT_ENTRY_KERNEL_DS].limit = 0xf;
70637 + gdt[GDT_ENTRY_DEFAULT_USER_CS].limit = 0xf;
70638 + gdt[GDT_ENTRY_DEFAULT_USER_DS].limit = 0xf;
70639 + }
70640 + asm("mov %0, %%ds; mov %0, %%es; mov %0, %%ss" : : "r" (__KERNEL_DS) : "memory");
70641 +#else
70642 + memcpy(pax_enter_kernel_user, (unsigned char []){0xc3}, 1);
70643 + memcpy(pax_exit_kernel_user, (unsigned char []){0xc3}, 1);
70644 + clone_pgd_mask = ~(pgdval_t)0UL;
70645 +#endif
70646 +
70647 + return 0;
70648 +}
70649 +early_param("pax_nouderef", setup_pax_nouderef);
70650 +#endif
70651 +
70652 +#ifdef CONFIG_PAX_SOFTMODE
70653 +int pax_softmode;
70654 +
70655 +static int __init setup_pax_softmode(char *str)
70656 +{
70657 + get_option(&str, &pax_softmode);
70658 + return 1;
70659 +}
70660 +__setup("pax_softmode=", setup_pax_softmode);
70661 +#endif
70662 +
70663 static char * argv_init[MAX_INIT_ARGS+2] = { "init", NULL, };
70664 char * envp_init[MAX_INIT_ENVS+2] = { "HOME=/", "TERM=linux", NULL, };
70665 static const char *panic_later, *panic_param;
70666 @@ -705,52 +749,53 @@ int initcall_debug;
70667 core_param(initcall_debug, initcall_debug, bool, 0644);
70668
70669 static char msgbuf[64];
70670 -static struct boot_trace_call call;
70671 -static struct boot_trace_ret ret;
70672 +static struct boot_trace_call trace_call;
70673 +static struct boot_trace_ret trace_ret;
70674
70675 int do_one_initcall(initcall_t fn)
70676 {
70677 int count = preempt_count();
70678 ktime_t calltime, delta, rettime;
70679 + const char *msg1 = "", *msg2 = "";
70680
70681 if (initcall_debug) {
70682 - call.caller = task_pid_nr(current);
70683 - printk("calling %pF @ %i\n", fn, call.caller);
70684 + trace_call.caller = task_pid_nr(current);
70685 + printk("calling %pF @ %i\n", fn, trace_call.caller);
70686 calltime = ktime_get();
70687 - trace_boot_call(&call, fn);
70688 + trace_boot_call(&trace_call, fn);
70689 enable_boot_trace();
70690 }
70691
70692 - ret.result = fn();
70693 + trace_ret.result = fn();
70694
70695 if (initcall_debug) {
70696 disable_boot_trace();
70697 rettime = ktime_get();
70698 delta = ktime_sub(rettime, calltime);
70699 - ret.duration = (unsigned long long) ktime_to_ns(delta) >> 10;
70700 - trace_boot_ret(&ret, fn);
70701 + trace_ret.duration = (unsigned long long) ktime_to_ns(delta) >> 10;
70702 + trace_boot_ret(&trace_ret, fn);
70703 printk("initcall %pF returned %d after %Ld usecs\n", fn,
70704 - ret.result, ret.duration);
70705 + trace_ret.result, trace_ret.duration);
70706 }
70707
70708 msgbuf[0] = 0;
70709
70710 - if (ret.result && ret.result != -ENODEV && initcall_debug)
70711 - sprintf(msgbuf, "error code %d ", ret.result);
70712 + if (trace_ret.result && trace_ret.result != -ENODEV && initcall_debug)
70713 + sprintf(msgbuf, "error code %d ", trace_ret.result);
70714
70715 if (preempt_count() != count) {
70716 - strlcat(msgbuf, "preemption imbalance ", sizeof(msgbuf));
70717 + msg1 = " preemption imbalance";
70718 preempt_count() = count;
70719 }
70720 if (irqs_disabled()) {
70721 - strlcat(msgbuf, "disabled interrupts ", sizeof(msgbuf));
70722 + msg2 = " disabled interrupts";
70723 local_irq_enable();
70724 }
70725 - if (msgbuf[0]) {
70726 - printk("initcall %pF returned with %s\n", fn, msgbuf);
70727 + if (msgbuf[0] || *msg1 || *msg2) {
70728 + printk("initcall %pF returned with %s%s%s\n", fn, msgbuf, msg1, msg2);
70729 }
70730
70731 - return ret.result;
70732 + return trace_ret.result;
70733 }
70734
70735
70736 @@ -893,11 +938,13 @@ static int __init kernel_init(void * unused)
70737 if (!ramdisk_execute_command)
70738 ramdisk_execute_command = "/init";
70739
70740 - if (sys_access((const char __user *) ramdisk_execute_command, 0) != 0) {
70741 + if (sys_access((const char __force_user *) ramdisk_execute_command, 0) != 0) {
70742 ramdisk_execute_command = NULL;
70743 prepare_namespace();
70744 }
70745
70746 + grsecurity_init();
70747 +
70748 /*
70749 * Ok, we have completed the initial bootup, and
70750 * we're essentially up and running. Get rid of the
70751 diff --git a/init/noinitramfs.c b/init/noinitramfs.c
70752 index f4c1a3a..96c19bd 100644
70753 --- a/init/noinitramfs.c
70754 +++ b/init/noinitramfs.c
70755 @@ -29,7 +29,7 @@ static int __init default_rootfs(void)
70756 {
70757 int err;
70758
70759 - err = sys_mkdir("/dev", 0755);
70760 + err = sys_mkdir((const char __user *)"/dev", 0755);
70761 if (err < 0)
70762 goto out;
70763
70764 @@ -39,7 +39,7 @@ static int __init default_rootfs(void)
70765 if (err < 0)
70766 goto out;
70767
70768 - err = sys_mkdir("/root", 0700);
70769 + err = sys_mkdir((const char __user *)"/root", 0700);
70770 if (err < 0)
70771 goto out;
70772
70773 diff --git a/ipc/mqueue.c b/ipc/mqueue.c
70774 index d01bc14..8df81db 100644
70775 --- a/ipc/mqueue.c
70776 +++ b/ipc/mqueue.c
70777 @@ -150,6 +150,7 @@ static struct inode *mqueue_get_inode(struct super_block *sb,
70778 mq_bytes = (mq_msg_tblsz +
70779 (info->attr.mq_maxmsg * info->attr.mq_msgsize));
70780
70781 + gr_learn_resource(current, RLIMIT_MSGQUEUE, u->mq_bytes + mq_bytes, 1);
70782 spin_lock(&mq_lock);
70783 if (u->mq_bytes + mq_bytes < u->mq_bytes ||
70784 u->mq_bytes + mq_bytes >
70785 diff --git a/ipc/msg.c b/ipc/msg.c
70786 index 779f762..4af9e36 100644
70787 --- a/ipc/msg.c
70788 +++ b/ipc/msg.c
70789 @@ -310,18 +310,19 @@ static inline int msg_security(struct kern_ipc_perm *ipcp, int msgflg)
70790 return security_msg_queue_associate(msq, msgflg);
70791 }
70792
70793 +static struct ipc_ops msg_ops = {
70794 + .getnew = newque,
70795 + .associate = msg_security,
70796 + .more_checks = NULL
70797 +};
70798 +
70799 SYSCALL_DEFINE2(msgget, key_t, key, int, msgflg)
70800 {
70801 struct ipc_namespace *ns;
70802 - struct ipc_ops msg_ops;
70803 struct ipc_params msg_params;
70804
70805 ns = current->nsproxy->ipc_ns;
70806
70807 - msg_ops.getnew = newque;
70808 - msg_ops.associate = msg_security;
70809 - msg_ops.more_checks = NULL;
70810 -
70811 msg_params.key = key;
70812 msg_params.flg = msgflg;
70813
70814 diff --git a/ipc/sem.c b/ipc/sem.c
70815 index b781007..f738b04 100644
70816 --- a/ipc/sem.c
70817 +++ b/ipc/sem.c
70818 @@ -309,10 +309,15 @@ static inline int sem_more_checks(struct kern_ipc_perm *ipcp,
70819 return 0;
70820 }
70821
70822 +static struct ipc_ops sem_ops = {
70823 + .getnew = newary,
70824 + .associate = sem_security,
70825 + .more_checks = sem_more_checks
70826 +};
70827 +
70828 SYSCALL_DEFINE3(semget, key_t, key, int, nsems, int, semflg)
70829 {
70830 struct ipc_namespace *ns;
70831 - struct ipc_ops sem_ops;
70832 struct ipc_params sem_params;
70833
70834 ns = current->nsproxy->ipc_ns;
70835 @@ -320,10 +325,6 @@ SYSCALL_DEFINE3(semget, key_t, key, int, nsems, int, semflg)
70836 if (nsems < 0 || nsems > ns->sc_semmsl)
70837 return -EINVAL;
70838
70839 - sem_ops.getnew = newary;
70840 - sem_ops.associate = sem_security;
70841 - sem_ops.more_checks = sem_more_checks;
70842 -
70843 sem_params.key = key;
70844 sem_params.flg = semflg;
70845 sem_params.u.nsems = nsems;
70846 @@ -671,6 +672,8 @@ static int semctl_main(struct ipc_namespace *ns, int semid, int semnum,
70847 ushort* sem_io = fast_sem_io;
70848 int nsems;
70849
70850 + pax_track_stack();
70851 +
70852 sma = sem_lock_check(ns, semid);
70853 if (IS_ERR(sma))
70854 return PTR_ERR(sma);
70855 @@ -1071,6 +1074,8 @@ SYSCALL_DEFINE4(semtimedop, int, semid, struct sembuf __user *, tsops,
70856 unsigned long jiffies_left = 0;
70857 struct ipc_namespace *ns;
70858
70859 + pax_track_stack();
70860 +
70861 ns = current->nsproxy->ipc_ns;
70862
70863 if (nsops < 1 || semid < 0)
70864 diff --git a/ipc/shm.c b/ipc/shm.c
70865 index d30732c..e4992cd 100644
70866 --- a/ipc/shm.c
70867 +++ b/ipc/shm.c
70868 @@ -70,6 +70,14 @@ static void shm_destroy (struct ipc_namespace *ns, struct shmid_kernel *shp);
70869 static int sysvipc_shm_proc_show(struct seq_file *s, void *it);
70870 #endif
70871
70872 +#ifdef CONFIG_GRKERNSEC
70873 +extern int gr_handle_shmat(const pid_t shm_cprid, const pid_t shm_lapid,
70874 + const time_t shm_createtime, const uid_t cuid,
70875 + const int shmid);
70876 +extern int gr_chroot_shmat(const pid_t shm_cprid, const pid_t shm_lapid,
70877 + const time_t shm_createtime);
70878 +#endif
70879 +
70880 void shm_init_ns(struct ipc_namespace *ns)
70881 {
70882 ns->shm_ctlmax = SHMMAX;
70883 @@ -396,6 +404,14 @@ static int newseg(struct ipc_namespace *ns, struct ipc_params *params)
70884 shp->shm_lprid = 0;
70885 shp->shm_atim = shp->shm_dtim = 0;
70886 shp->shm_ctim = get_seconds();
70887 +#ifdef CONFIG_GRKERNSEC
70888 + {
70889 + struct timespec timeval;
70890 + do_posix_clock_monotonic_gettime(&timeval);
70891 +
70892 + shp->shm_createtime = timeval.tv_sec;
70893 + }
70894 +#endif
70895 shp->shm_segsz = size;
70896 shp->shm_nattch = 0;
70897 shp->shm_file = file;
70898 @@ -446,18 +462,19 @@ static inline int shm_more_checks(struct kern_ipc_perm *ipcp,
70899 return 0;
70900 }
70901
70902 +static struct ipc_ops shm_ops = {
70903 + .getnew = newseg,
70904 + .associate = shm_security,
70905 + .more_checks = shm_more_checks
70906 +};
70907 +
70908 SYSCALL_DEFINE3(shmget, key_t, key, size_t, size, int, shmflg)
70909 {
70910 struct ipc_namespace *ns;
70911 - struct ipc_ops shm_ops;
70912 struct ipc_params shm_params;
70913
70914 ns = current->nsproxy->ipc_ns;
70915
70916 - shm_ops.getnew = newseg;
70917 - shm_ops.associate = shm_security;
70918 - shm_ops.more_checks = shm_more_checks;
70919 -
70920 shm_params.key = key;
70921 shm_params.flg = shmflg;
70922 shm_params.u.size = size;
70923 @@ -857,6 +874,12 @@ long do_shmat(int shmid, char __user *shmaddr, int shmflg, ulong *raddr)
70924 f_mode = FMODE_READ | FMODE_WRITE;
70925 }
70926 if (shmflg & SHM_EXEC) {
70927 +
70928 +#ifdef CONFIG_PAX_MPROTECT
70929 + if (current->mm->pax_flags & MF_PAX_MPROTECT)
70930 + goto out;
70931 +#endif
70932 +
70933 prot |= PROT_EXEC;
70934 acc_mode |= S_IXUGO;
70935 }
70936 @@ -880,9 +903,21 @@ long do_shmat(int shmid, char __user *shmaddr, int shmflg, ulong *raddr)
70937 if (err)
70938 goto out_unlock;
70939
70940 +#ifdef CONFIG_GRKERNSEC
70941 + if (!gr_handle_shmat(shp->shm_cprid, shp->shm_lapid, shp->shm_createtime,
70942 + shp->shm_perm.cuid, shmid) ||
70943 + !gr_chroot_shmat(shp->shm_cprid, shp->shm_lapid, shp->shm_createtime)) {
70944 + err = -EACCES;
70945 + goto out_unlock;
70946 + }
70947 +#endif
70948 +
70949 path.dentry = dget(shp->shm_file->f_path.dentry);
70950 path.mnt = shp->shm_file->f_path.mnt;
70951 shp->shm_nattch++;
70952 +#ifdef CONFIG_GRKERNSEC
70953 + shp->shm_lapid = current->pid;
70954 +#endif
70955 size = i_size_read(path.dentry->d_inode);
70956 shm_unlock(shp);
70957
70958 diff --git a/kernel/acct.c b/kernel/acct.c
70959 index a6605ca..ca91111 100644
70960 --- a/kernel/acct.c
70961 +++ b/kernel/acct.c
70962 @@ -579,7 +579,7 @@ static void do_acct_process(struct bsd_acct_struct *acct,
70963 */
70964 flim = current->signal->rlim[RLIMIT_FSIZE].rlim_cur;
70965 current->signal->rlim[RLIMIT_FSIZE].rlim_cur = RLIM_INFINITY;
70966 - file->f_op->write(file, (char *)&ac,
70967 + file->f_op->write(file, (char __force_user *)&ac,
70968 sizeof(acct_t), &file->f_pos);
70969 current->signal->rlim[RLIMIT_FSIZE].rlim_cur = flim;
70970 set_fs(fs);
70971 diff --git a/kernel/audit.c b/kernel/audit.c
70972 index 5feed23..48415fd 100644
70973 --- a/kernel/audit.c
70974 +++ b/kernel/audit.c
70975 @@ -110,7 +110,7 @@ u32 audit_sig_sid = 0;
70976 3) suppressed due to audit_rate_limit
70977 4) suppressed due to audit_backlog_limit
70978 */
70979 -static atomic_t audit_lost = ATOMIC_INIT(0);
70980 +static atomic_unchecked_t audit_lost = ATOMIC_INIT(0);
70981
70982 /* The netlink socket. */
70983 static struct sock *audit_sock;
70984 @@ -232,7 +232,7 @@ void audit_log_lost(const char *message)
70985 unsigned long now;
70986 int print;
70987
70988 - atomic_inc(&audit_lost);
70989 + atomic_inc_unchecked(&audit_lost);
70990
70991 print = (audit_failure == AUDIT_FAIL_PANIC || !audit_rate_limit);
70992
70993 @@ -251,7 +251,7 @@ void audit_log_lost(const char *message)
70994 printk(KERN_WARNING
70995 "audit: audit_lost=%d audit_rate_limit=%d "
70996 "audit_backlog_limit=%d\n",
70997 - atomic_read(&audit_lost),
70998 + atomic_read_unchecked(&audit_lost),
70999 audit_rate_limit,
71000 audit_backlog_limit);
71001 audit_panic(message);
71002 @@ -691,7 +691,7 @@ static int audit_receive_msg(struct sk_buff *skb, struct nlmsghdr *nlh)
71003 status_set.pid = audit_pid;
71004 status_set.rate_limit = audit_rate_limit;
71005 status_set.backlog_limit = audit_backlog_limit;
71006 - status_set.lost = atomic_read(&audit_lost);
71007 + status_set.lost = atomic_read_unchecked(&audit_lost);
71008 status_set.backlog = skb_queue_len(&audit_skb_queue);
71009 audit_send_reply(NETLINK_CB(skb).pid, seq, AUDIT_GET, 0, 0,
71010 &status_set, sizeof(status_set));
71011 @@ -891,8 +891,10 @@ static int audit_receive_msg(struct sk_buff *skb, struct nlmsghdr *nlh)
71012 spin_unlock_irq(&tsk->sighand->siglock);
71013 }
71014 read_unlock(&tasklist_lock);
71015 - audit_send_reply(NETLINK_CB(skb).pid, seq, AUDIT_TTY_GET, 0, 0,
71016 - &s, sizeof(s));
71017 +
71018 + if (!err)
71019 + audit_send_reply(NETLINK_CB(skb).pid, seq,
71020 + AUDIT_TTY_GET, 0, 0, &s, sizeof(s));
71021 break;
71022 }
71023 case AUDIT_TTY_SET: {
71024 @@ -1262,12 +1264,13 @@ static void audit_log_vformat(struct audit_buffer *ab, const char *fmt,
71025 avail = audit_expand(ab,
71026 max_t(unsigned, AUDIT_BUFSIZ, 1+len-avail));
71027 if (!avail)
71028 - goto out;
71029 + goto out_va_end;
71030 len = vsnprintf(skb_tail_pointer(skb), avail, fmt, args2);
71031 }
71032 - va_end(args2);
71033 if (len > 0)
71034 skb_put(skb, len);
71035 +out_va_end:
71036 + va_end(args2);
71037 out:
71038 return;
71039 }
71040 diff --git a/kernel/auditsc.c b/kernel/auditsc.c
71041 index 267e484..ac41bc3 100644
71042 --- a/kernel/auditsc.c
71043 +++ b/kernel/auditsc.c
71044 @@ -1157,8 +1157,8 @@ static void audit_log_execve_info(struct audit_context *context,
71045 struct audit_buffer **ab,
71046 struct audit_aux_data_execve *axi)
71047 {
71048 - int i;
71049 - size_t len, len_sent = 0;
71050 + int i, len;
71051 + size_t len_sent = 0;
71052 const char __user *p;
71053 char *buf;
71054
71055 @@ -2113,7 +2113,7 @@ int auditsc_get_stamp(struct audit_context *ctx,
71056 }
71057
71058 /* global counter which is incremented every time something logs in */
71059 -static atomic_t session_id = ATOMIC_INIT(0);
71060 +static atomic_unchecked_t session_id = ATOMIC_INIT(0);
71061
71062 /**
71063 * audit_set_loginuid - set a task's audit_context loginuid
71064 @@ -2126,7 +2126,7 @@ static atomic_t session_id = ATOMIC_INIT(0);
71065 */
71066 int audit_set_loginuid(struct task_struct *task, uid_t loginuid)
71067 {
71068 - unsigned int sessionid = atomic_inc_return(&session_id);
71069 + unsigned int sessionid = atomic_inc_return_unchecked(&session_id);
71070 struct audit_context *context = task->audit_context;
71071
71072 if (context && context->in_syscall) {
71073 diff --git a/kernel/capability.c b/kernel/capability.c
71074 index 8a944f5..db5001e 100644
71075 --- a/kernel/capability.c
71076 +++ b/kernel/capability.c
71077 @@ -305,10 +305,26 @@ int capable(int cap)
71078 BUG();
71079 }
71080
71081 - if (security_capable(cap) == 0) {
71082 + if (security_capable(cap) == 0 && gr_is_capable(cap)) {
71083 current->flags |= PF_SUPERPRIV;
71084 return 1;
71085 }
71086 return 0;
71087 }
71088 +
71089 +int capable_nolog(int cap)
71090 +{
71091 + if (unlikely(!cap_valid(cap))) {
71092 + printk(KERN_CRIT "capable() called with invalid cap=%u\n", cap);
71093 + BUG();
71094 + }
71095 +
71096 + if (security_capable(cap) == 0 && gr_is_capable_nolog(cap)) {
71097 + current->flags |= PF_SUPERPRIV;
71098 + return 1;
71099 + }
71100 + return 0;
71101 +}
71102 +
71103 EXPORT_SYMBOL(capable);
71104 +EXPORT_SYMBOL(capable_nolog);
71105 diff --git a/kernel/cgroup.c b/kernel/cgroup.c
71106 index 1fbcc74..7000012 100644
71107 --- a/kernel/cgroup.c
71108 +++ b/kernel/cgroup.c
71109 @@ -536,6 +536,8 @@ static struct css_set *find_css_set(
71110 struct hlist_head *hhead;
71111 struct cg_cgroup_link *link;
71112
71113 + pax_track_stack();
71114 +
71115 /* First see if we already have a cgroup group that matches
71116 * the desired set */
71117 read_lock(&css_set_lock);
71118 diff --git a/kernel/compat.c b/kernel/compat.c
71119 index 8bc5578..186e44a 100644
71120 --- a/kernel/compat.c
71121 +++ b/kernel/compat.c
71122 @@ -108,7 +108,7 @@ static long compat_nanosleep_restart(struct restart_block *restart)
71123 mm_segment_t oldfs;
71124 long ret;
71125
71126 - restart->nanosleep.rmtp = (struct timespec __user *) &rmt;
71127 + restart->nanosleep.rmtp = (struct timespec __force_user *) &rmt;
71128 oldfs = get_fs();
71129 set_fs(KERNEL_DS);
71130 ret = hrtimer_nanosleep_restart(restart);
71131 @@ -140,7 +140,7 @@ asmlinkage long compat_sys_nanosleep(struct compat_timespec __user *rqtp,
71132 oldfs = get_fs();
71133 set_fs(KERNEL_DS);
71134 ret = hrtimer_nanosleep(&tu,
71135 - rmtp ? (struct timespec __user *)&rmt : NULL,
71136 + rmtp ? (struct timespec __force_user *)&rmt : NULL,
71137 HRTIMER_MODE_REL, CLOCK_MONOTONIC);
71138 set_fs(oldfs);
71139
71140 @@ -247,7 +247,7 @@ asmlinkage long compat_sys_sigpending(compat_old_sigset_t __user *set)
71141 mm_segment_t old_fs = get_fs();
71142
71143 set_fs(KERNEL_DS);
71144 - ret = sys_sigpending((old_sigset_t __user *) &s);
71145 + ret = sys_sigpending((old_sigset_t __force_user *) &s);
71146 set_fs(old_fs);
71147 if (ret == 0)
71148 ret = put_user(s, set);
71149 @@ -266,8 +266,8 @@ asmlinkage long compat_sys_sigprocmask(int how, compat_old_sigset_t __user *set,
71150 old_fs = get_fs();
71151 set_fs(KERNEL_DS);
71152 ret = sys_sigprocmask(how,
71153 - set ? (old_sigset_t __user *) &s : NULL,
71154 - oset ? (old_sigset_t __user *) &s : NULL);
71155 + set ? (old_sigset_t __force_user *) &s : NULL,
71156 + oset ? (old_sigset_t __force_user *) &s : NULL);
71157 set_fs(old_fs);
71158 if (ret == 0)
71159 if (oset)
71160 @@ -310,7 +310,7 @@ asmlinkage long compat_sys_old_getrlimit(unsigned int resource,
71161 mm_segment_t old_fs = get_fs();
71162
71163 set_fs(KERNEL_DS);
71164 - ret = sys_old_getrlimit(resource, &r);
71165 + ret = sys_old_getrlimit(resource, (struct rlimit __force_user *)&r);
71166 set_fs(old_fs);
71167
71168 if (!ret) {
71169 @@ -385,7 +385,7 @@ asmlinkage long compat_sys_getrusage(int who, struct compat_rusage __user *ru)
71170 mm_segment_t old_fs = get_fs();
71171
71172 set_fs(KERNEL_DS);
71173 - ret = sys_getrusage(who, (struct rusage __user *) &r);
71174 + ret = sys_getrusage(who, (struct rusage __force_user *) &r);
71175 set_fs(old_fs);
71176
71177 if (ret)
71178 @@ -412,8 +412,8 @@ compat_sys_wait4(compat_pid_t pid, compat_uint_t __user *stat_addr, int options,
71179 set_fs (KERNEL_DS);
71180 ret = sys_wait4(pid,
71181 (stat_addr ?
71182 - (unsigned int __user *) &status : NULL),
71183 - options, (struct rusage __user *) &r);
71184 + (unsigned int __force_user *) &status : NULL),
71185 + options, (struct rusage __force_user *) &r);
71186 set_fs (old_fs);
71187
71188 if (ret > 0) {
71189 @@ -438,8 +438,8 @@ asmlinkage long compat_sys_waitid(int which, compat_pid_t pid,
71190 memset(&info, 0, sizeof(info));
71191
71192 set_fs(KERNEL_DS);
71193 - ret = sys_waitid(which, pid, (siginfo_t __user *)&info, options,
71194 - uru ? (struct rusage __user *)&ru : NULL);
71195 + ret = sys_waitid(which, pid, (siginfo_t __force_user *)&info, options,
71196 + uru ? (struct rusage __force_user *)&ru : NULL);
71197 set_fs(old_fs);
71198
71199 if ((ret < 0) || (info.si_signo == 0))
71200 @@ -569,8 +569,8 @@ long compat_sys_timer_settime(timer_t timer_id, int flags,
71201 oldfs = get_fs();
71202 set_fs(KERNEL_DS);
71203 err = sys_timer_settime(timer_id, flags,
71204 - (struct itimerspec __user *) &newts,
71205 - (struct itimerspec __user *) &oldts);
71206 + (struct itimerspec __force_user *) &newts,
71207 + (struct itimerspec __force_user *) &oldts);
71208 set_fs(oldfs);
71209 if (!err && old && put_compat_itimerspec(old, &oldts))
71210 return -EFAULT;
71211 @@ -587,7 +587,7 @@ long compat_sys_timer_gettime(timer_t timer_id,
71212 oldfs = get_fs();
71213 set_fs(KERNEL_DS);
71214 err = sys_timer_gettime(timer_id,
71215 - (struct itimerspec __user *) &ts);
71216 + (struct itimerspec __force_user *) &ts);
71217 set_fs(oldfs);
71218 if (!err && put_compat_itimerspec(setting, &ts))
71219 return -EFAULT;
71220 @@ -606,7 +606,7 @@ long compat_sys_clock_settime(clockid_t which_clock,
71221 oldfs = get_fs();
71222 set_fs(KERNEL_DS);
71223 err = sys_clock_settime(which_clock,
71224 - (struct timespec __user *) &ts);
71225 + (struct timespec __force_user *) &ts);
71226 set_fs(oldfs);
71227 return err;
71228 }
71229 @@ -621,7 +621,7 @@ long compat_sys_clock_gettime(clockid_t which_clock,
71230 oldfs = get_fs();
71231 set_fs(KERNEL_DS);
71232 err = sys_clock_gettime(which_clock,
71233 - (struct timespec __user *) &ts);
71234 + (struct timespec __force_user *) &ts);
71235 set_fs(oldfs);
71236 if (!err && put_compat_timespec(&ts, tp))
71237 return -EFAULT;
71238 @@ -638,7 +638,7 @@ long compat_sys_clock_getres(clockid_t which_clock,
71239 oldfs = get_fs();
71240 set_fs(KERNEL_DS);
71241 err = sys_clock_getres(which_clock,
71242 - (struct timespec __user *) &ts);
71243 + (struct timespec __force_user *) &ts);
71244 set_fs(oldfs);
71245 if (!err && tp && put_compat_timespec(&ts, tp))
71246 return -EFAULT;
71247 @@ -650,9 +650,9 @@ static long compat_clock_nanosleep_restart(struct restart_block *restart)
71248 long err;
71249 mm_segment_t oldfs;
71250 struct timespec tu;
71251 - struct compat_timespec *rmtp = restart->nanosleep.compat_rmtp;
71252 + struct compat_timespec __user *rmtp = restart->nanosleep.compat_rmtp;
71253
71254 - restart->nanosleep.rmtp = (struct timespec __user *) &tu;
71255 + restart->nanosleep.rmtp = (struct timespec __force_user *) &tu;
71256 oldfs = get_fs();
71257 set_fs(KERNEL_DS);
71258 err = clock_nanosleep_restart(restart);
71259 @@ -684,8 +684,8 @@ long compat_sys_clock_nanosleep(clockid_t which_clock, int flags,
71260 oldfs = get_fs();
71261 set_fs(KERNEL_DS);
71262 err = sys_clock_nanosleep(which_clock, flags,
71263 - (struct timespec __user *) &in,
71264 - (struct timespec __user *) &out);
71265 + (struct timespec __force_user *) &in,
71266 + (struct timespec __force_user *) &out);
71267 set_fs(oldfs);
71268
71269 if ((err == -ERESTART_RESTARTBLOCK) && rmtp &&
71270 diff --git a/kernel/configs.c b/kernel/configs.c
71271 index abaee68..047facd 100644
71272 --- a/kernel/configs.c
71273 +++ b/kernel/configs.c
71274 @@ -73,8 +73,19 @@ static int __init ikconfig_init(void)
71275 struct proc_dir_entry *entry;
71276
71277 /* create the current config file */
71278 +#if defined(CONFIG_GRKERNSEC_PROC_ADD) || defined(CONFIG_GRKERNSEC_HIDESYM)
71279 +#if defined(CONFIG_GRKERNSEC_PROC_USER) || defined(CONFIG_GRKERNSEC_HIDESYM)
71280 + entry = proc_create("config.gz", S_IFREG | S_IRUSR, NULL,
71281 + &ikconfig_file_ops);
71282 +#elif defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
71283 + entry = proc_create("config.gz", S_IFREG | S_IRUSR | S_IRGRP, NULL,
71284 + &ikconfig_file_ops);
71285 +#endif
71286 +#else
71287 entry = proc_create("config.gz", S_IFREG | S_IRUGO, NULL,
71288 &ikconfig_file_ops);
71289 +#endif
71290 +
71291 if (!entry)
71292 return -ENOMEM;
71293
71294 diff --git a/kernel/cpu.c b/kernel/cpu.c
71295 index 3f2f04f..4e53ded 100644
71296 --- a/kernel/cpu.c
71297 +++ b/kernel/cpu.c
71298 @@ -20,7 +20,7 @@
71299 /* Serializes the updates to cpu_online_mask, cpu_present_mask */
71300 static DEFINE_MUTEX(cpu_add_remove_lock);
71301
71302 -static __cpuinitdata RAW_NOTIFIER_HEAD(cpu_chain);
71303 +static RAW_NOTIFIER_HEAD(cpu_chain);
71304
71305 /* If set, cpu_up and cpu_down will return -EBUSY and do nothing.
71306 * Should always be manipulated under cpu_add_remove_lock
71307 diff --git a/kernel/cred.c b/kernel/cred.c
71308 index 0b5b5fc..419b86a 100644
71309 --- a/kernel/cred.c
71310 +++ b/kernel/cred.c
71311 @@ -160,6 +160,8 @@ static void put_cred_rcu(struct rcu_head *rcu)
71312 */
71313 void __put_cred(struct cred *cred)
71314 {
71315 + pax_track_stack();
71316 +
71317 kdebug("__put_cred(%p{%d,%d})", cred,
71318 atomic_read(&cred->usage),
71319 read_cred_subscribers(cred));
71320 @@ -184,6 +186,8 @@ void exit_creds(struct task_struct *tsk)
71321 {
71322 struct cred *cred;
71323
71324 + pax_track_stack();
71325 +
71326 kdebug("exit_creds(%u,%p,%p,{%d,%d})", tsk->pid, tsk->real_cred, tsk->cred,
71327 atomic_read(&tsk->cred->usage),
71328 read_cred_subscribers(tsk->cred));
71329 @@ -222,6 +226,8 @@ const struct cred *get_task_cred(struct task_struct *task)
71330 {
71331 const struct cred *cred;
71332
71333 + pax_track_stack();
71334 +
71335 rcu_read_lock();
71336
71337 do {
71338 @@ -241,6 +247,8 @@ struct cred *cred_alloc_blank(void)
71339 {
71340 struct cred *new;
71341
71342 + pax_track_stack();
71343 +
71344 new = kmem_cache_zalloc(cred_jar, GFP_KERNEL);
71345 if (!new)
71346 return NULL;
71347 @@ -289,6 +297,8 @@ struct cred *prepare_creds(void)
71348 const struct cred *old;
71349 struct cred *new;
71350
71351 + pax_track_stack();
71352 +
71353 validate_process_creds();
71354
71355 new = kmem_cache_alloc(cred_jar, GFP_KERNEL);
71356 @@ -335,6 +345,8 @@ struct cred *prepare_exec_creds(void)
71357 struct thread_group_cred *tgcred = NULL;
71358 struct cred *new;
71359
71360 + pax_track_stack();
71361 +
71362 #ifdef CONFIG_KEYS
71363 tgcred = kmalloc(sizeof(*tgcred), GFP_KERNEL);
71364 if (!tgcred)
71365 @@ -441,6 +453,8 @@ int copy_creds(struct task_struct *p, unsigned long clone_flags)
71366 struct cred *new;
71367 int ret;
71368
71369 + pax_track_stack();
71370 +
71371 mutex_init(&p->cred_guard_mutex);
71372
71373 if (
71374 @@ -528,6 +542,8 @@ int commit_creds(struct cred *new)
71375 struct task_struct *task = current;
71376 const struct cred *old = task->real_cred;
71377
71378 + pax_track_stack();
71379 +
71380 kdebug("commit_creds(%p{%d,%d})", new,
71381 atomic_read(&new->usage),
71382 read_cred_subscribers(new));
71383 @@ -544,6 +560,8 @@ int commit_creds(struct cred *new)
71384
71385 get_cred(new); /* we will require a ref for the subj creds too */
71386
71387 + gr_set_role_label(task, new->uid, new->gid);
71388 +
71389 /* dumpability changes */
71390 if (old->euid != new->euid ||
71391 old->egid != new->egid ||
71392 @@ -563,10 +581,8 @@ int commit_creds(struct cred *new)
71393 key_fsgid_changed(task);
71394
71395 /* do it
71396 - * - What if a process setreuid()'s and this brings the
71397 - * new uid over his NPROC rlimit? We can check this now
71398 - * cheaply with the new uid cache, so if it matters
71399 - * we should be checking for it. -DaveM
71400 + * RLIMIT_NPROC limits on user->processes have already been checked
71401 + * in set_user().
71402 */
71403 alter_cred_subscribers(new, 2);
71404 if (new->user != old->user)
71405 @@ -606,6 +622,8 @@ EXPORT_SYMBOL(commit_creds);
71406 */
71407 void abort_creds(struct cred *new)
71408 {
71409 + pax_track_stack();
71410 +
71411 kdebug("abort_creds(%p{%d,%d})", new,
71412 atomic_read(&new->usage),
71413 read_cred_subscribers(new));
71414 @@ -629,6 +647,8 @@ const struct cred *override_creds(const struct cred *new)
71415 {
71416 const struct cred *old = current->cred;
71417
71418 + pax_track_stack();
71419 +
71420 kdebug("override_creds(%p{%d,%d})", new,
71421 atomic_read(&new->usage),
71422 read_cred_subscribers(new));
71423 @@ -658,6 +678,8 @@ void revert_creds(const struct cred *old)
71424 {
71425 const struct cred *override = current->cred;
71426
71427 + pax_track_stack();
71428 +
71429 kdebug("revert_creds(%p{%d,%d})", old,
71430 atomic_read(&old->usage),
71431 read_cred_subscribers(old));
71432 @@ -704,6 +726,8 @@ struct cred *prepare_kernel_cred(struct task_struct *daemon)
71433 const struct cred *old;
71434 struct cred *new;
71435
71436 + pax_track_stack();
71437 +
71438 new = kmem_cache_alloc(cred_jar, GFP_KERNEL);
71439 if (!new)
71440 return NULL;
71441 @@ -758,6 +782,8 @@ EXPORT_SYMBOL(prepare_kernel_cred);
71442 */
71443 int set_security_override(struct cred *new, u32 secid)
71444 {
71445 + pax_track_stack();
71446 +
71447 return security_kernel_act_as(new, secid);
71448 }
71449 EXPORT_SYMBOL(set_security_override);
71450 @@ -777,6 +803,8 @@ int set_security_override_from_ctx(struct cred *new, const char *secctx)
71451 u32 secid;
71452 int ret;
71453
71454 + pax_track_stack();
71455 +
71456 ret = security_secctx_to_secid(secctx, strlen(secctx), &secid);
71457 if (ret < 0)
71458 return ret;
71459 diff --git a/kernel/exit.c b/kernel/exit.c
71460 index 0f8fae3..9344a56 100644
71461 --- a/kernel/exit.c
71462 +++ b/kernel/exit.c
71463 @@ -55,6 +55,10 @@
71464 #include <asm/pgtable.h>
71465 #include <asm/mmu_context.h>
71466
71467 +#ifdef CONFIG_GRKERNSEC
71468 +extern rwlock_t grsec_exec_file_lock;
71469 +#endif
71470 +
71471 static void exit_mm(struct task_struct * tsk);
71472
71473 static void __unhash_process(struct task_struct *p)
71474 @@ -174,6 +178,10 @@ void release_task(struct task_struct * p)
71475 struct task_struct *leader;
71476 int zap_leader;
71477 repeat:
71478 +#ifdef CONFIG_NET
71479 + gr_del_task_from_ip_table(p);
71480 +#endif
71481 +
71482 tracehook_prepare_release_task(p);
71483 /* don't need to get the RCU readlock here - the process is dead and
71484 * can't be modifying its own credentials */
71485 @@ -397,7 +405,7 @@ int allow_signal(int sig)
71486 * know it'll be handled, so that they don't get converted to
71487 * SIGKILL or just silently dropped.
71488 */
71489 - current->sighand->action[(sig)-1].sa.sa_handler = (void __user *)2;
71490 + current->sighand->action[(sig)-1].sa.sa_handler = (__force void __user *)2;
71491 recalc_sigpending();
71492 spin_unlock_irq(&current->sighand->siglock);
71493 return 0;
71494 @@ -433,6 +441,17 @@ void daemonize(const char *name, ...)
71495 vsnprintf(current->comm, sizeof(current->comm), name, args);
71496 va_end(args);
71497
71498 +#ifdef CONFIG_GRKERNSEC
71499 + write_lock(&grsec_exec_file_lock);
71500 + if (current->exec_file) {
71501 + fput(current->exec_file);
71502 + current->exec_file = NULL;
71503 + }
71504 + write_unlock(&grsec_exec_file_lock);
71505 +#endif
71506 +
71507 + gr_set_kernel_label(current);
71508 +
71509 /*
71510 * If we were started as result of loading a module, close all of the
71511 * user space pages. We don't need them, and if we didn't close them
71512 @@ -897,17 +916,17 @@ NORET_TYPE void do_exit(long code)
71513 struct task_struct *tsk = current;
71514 int group_dead;
71515
71516 - profile_task_exit(tsk);
71517 -
71518 - WARN_ON(atomic_read(&tsk->fs_excl));
71519 -
71520 + /*
71521 + * Check this first since set_fs() below depends on
71522 + * current_thread_info(), which we better not access when we're in
71523 + * interrupt context. Other than that, we want to do the set_fs()
71524 + * as early as possible.
71525 + */
71526 if (unlikely(in_interrupt()))
71527 panic("Aiee, killing interrupt handler!");
71528 - if (unlikely(!tsk->pid))
71529 - panic("Attempted to kill the idle task!");
71530
71531 /*
71532 - * If do_exit is called because this processes oopsed, it's possible
71533 + * If do_exit is called because this processes Oops'ed, it's possible
71534 * that get_fs() was left as KERNEL_DS, so reset it to USER_DS before
71535 * continuing. Amongst other possible reasons, this is to prevent
71536 * mm_release()->clear_child_tid() from writing to a user-controlled
71537 @@ -915,6 +934,13 @@ NORET_TYPE void do_exit(long code)
71538 */
71539 set_fs(USER_DS);
71540
71541 + profile_task_exit(tsk);
71542 +
71543 + WARN_ON(atomic_read(&tsk->fs_excl));
71544 +
71545 + if (unlikely(!tsk->pid))
71546 + panic("Attempted to kill the idle task!");
71547 +
71548 tracehook_report_exit(&code);
71549
71550 validate_creds_for_do_exit(tsk);
71551 @@ -973,6 +999,9 @@ NORET_TYPE void do_exit(long code)
71552 tsk->exit_code = code;
71553 taskstats_exit(tsk, group_dead);
71554
71555 + gr_acl_handle_psacct(tsk, code);
71556 + gr_acl_handle_exit();
71557 +
71558 exit_mm(tsk);
71559
71560 if (group_dead)
71561 @@ -1188,7 +1217,7 @@ static int wait_task_zombie(struct wait_opts *wo, struct task_struct *p)
71562
71563 if (unlikely(wo->wo_flags & WNOWAIT)) {
71564 int exit_code = p->exit_code;
71565 - int why, status;
71566 + int why;
71567
71568 get_task_struct(p);
71569 read_unlock(&tasklist_lock);
71570 diff --git a/kernel/fork.c b/kernel/fork.c
71571 index 4bde56f..29a9bab 100644
71572 --- a/kernel/fork.c
71573 +++ b/kernel/fork.c
71574 @@ -253,7 +253,7 @@ static struct task_struct *dup_task_struct(struct task_struct *orig)
71575 *stackend = STACK_END_MAGIC; /* for overflow detection */
71576
71577 #ifdef CONFIG_CC_STACKPROTECTOR
71578 - tsk->stack_canary = get_random_int();
71579 + tsk->stack_canary = pax_get_random_long();
71580 #endif
71581
71582 /* One for us, one for whoever does the "release_task()" (usually parent) */
71583 @@ -293,8 +293,8 @@ static int dup_mmap(struct mm_struct *mm, struct mm_struct *oldmm)
71584 mm->locked_vm = 0;
71585 mm->mmap = NULL;
71586 mm->mmap_cache = NULL;
71587 - mm->free_area_cache = oldmm->mmap_base;
71588 - mm->cached_hole_size = ~0UL;
71589 + mm->free_area_cache = oldmm->free_area_cache;
71590 + mm->cached_hole_size = oldmm->cached_hole_size;
71591 mm->map_count = 0;
71592 cpumask_clear(mm_cpumask(mm));
71593 mm->mm_rb = RB_ROOT;
71594 @@ -335,6 +335,7 @@ static int dup_mmap(struct mm_struct *mm, struct mm_struct *oldmm)
71595 tmp->vm_flags &= ~VM_LOCKED;
71596 tmp->vm_mm = mm;
71597 tmp->vm_next = tmp->vm_prev = NULL;
71598 + tmp->vm_mirror = NULL;
71599 anon_vma_link(tmp);
71600 file = tmp->vm_file;
71601 if (file) {
71602 @@ -384,6 +385,31 @@ static int dup_mmap(struct mm_struct *mm, struct mm_struct *oldmm)
71603 if (retval)
71604 goto out;
71605 }
71606 +
71607 +#ifdef CONFIG_PAX_SEGMEXEC
71608 + if (oldmm->pax_flags & MF_PAX_SEGMEXEC) {
71609 + struct vm_area_struct *mpnt_m;
71610 +
71611 + for (mpnt = oldmm->mmap, mpnt_m = mm->mmap; mpnt; mpnt = mpnt->vm_next, mpnt_m = mpnt_m->vm_next) {
71612 + BUG_ON(!mpnt_m || mpnt_m->vm_mirror || mpnt->vm_mm != oldmm || mpnt_m->vm_mm != mm);
71613 +
71614 + if (!mpnt->vm_mirror)
71615 + continue;
71616 +
71617 + if (mpnt->vm_end <= SEGMEXEC_TASK_SIZE) {
71618 + BUG_ON(mpnt->vm_mirror->vm_mirror != mpnt);
71619 + mpnt->vm_mirror = mpnt_m;
71620 + } else {
71621 + BUG_ON(mpnt->vm_mirror->vm_mirror == mpnt || mpnt->vm_mirror->vm_mirror->vm_mm != mm);
71622 + mpnt_m->vm_mirror = mpnt->vm_mirror->vm_mirror;
71623 + mpnt_m->vm_mirror->vm_mirror = mpnt_m;
71624 + mpnt->vm_mirror->vm_mirror = mpnt;
71625 + }
71626 + }
71627 + BUG_ON(mpnt_m);
71628 + }
71629 +#endif
71630 +
71631 /* a new mm has just been created */
71632 arch_dup_mmap(oldmm, mm);
71633 retval = 0;
71634 @@ -734,13 +760,14 @@ static int copy_fs(unsigned long clone_flags, struct task_struct *tsk)
71635 write_unlock(&fs->lock);
71636 return -EAGAIN;
71637 }
71638 - fs->users++;
71639 + atomic_inc(&fs->users);
71640 write_unlock(&fs->lock);
71641 return 0;
71642 }
71643 tsk->fs = copy_fs_struct(fs);
71644 if (!tsk->fs)
71645 return -ENOMEM;
71646 + gr_set_chroot_entries(tsk, &tsk->fs->root);
71647 return 0;
71648 }
71649
71650 @@ -1033,12 +1060,16 @@ static struct task_struct *copy_process(unsigned long clone_flags,
71651 DEBUG_LOCKS_WARN_ON(!p->softirqs_enabled);
71652 #endif
71653 retval = -EAGAIN;
71654 +
71655 + gr_learn_resource(p, RLIMIT_NPROC, atomic_read(&p->real_cred->user->processes), 0);
71656 +
71657 if (atomic_read(&p->real_cred->user->processes) >=
71658 p->signal->rlim[RLIMIT_NPROC].rlim_cur) {
71659 - if (!capable(CAP_SYS_ADMIN) && !capable(CAP_SYS_RESOURCE) &&
71660 - p->real_cred->user != INIT_USER)
71661 + if (p->real_cred->user != INIT_USER &&
71662 + !capable(CAP_SYS_RESOURCE) && !capable(CAP_SYS_ADMIN))
71663 goto bad_fork_free;
71664 }
71665 + current->flags &= ~PF_NPROC_EXCEEDED;
71666
71667 retval = copy_creds(p, clone_flags);
71668 if (retval < 0)
71669 @@ -1183,6 +1214,8 @@ static struct task_struct *copy_process(unsigned long clone_flags,
71670 goto bad_fork_free_pid;
71671 }
71672
71673 + gr_copy_label(p);
71674 +
71675 p->set_child_tid = (clone_flags & CLONE_CHILD_SETTID) ? child_tidptr : NULL;
71676 /*
71677 * Clear TID on mm_release()?
71678 @@ -1333,6 +1366,8 @@ bad_fork_cleanup_count:
71679 bad_fork_free:
71680 free_task(p);
71681 fork_out:
71682 + gr_log_forkfail(retval);
71683 +
71684 return ERR_PTR(retval);
71685 }
71686
71687 @@ -1426,6 +1461,8 @@ long do_fork(unsigned long clone_flags,
71688 if (clone_flags & CLONE_PARENT_SETTID)
71689 put_user(nr, parent_tidptr);
71690
71691 + gr_handle_brute_check();
71692 +
71693 if (clone_flags & CLONE_VFORK) {
71694 p->vfork_done = &vfork;
71695 init_completion(&vfork);
71696 @@ -1558,7 +1595,7 @@ static int unshare_fs(unsigned long unshare_flags, struct fs_struct **new_fsp)
71697 return 0;
71698
71699 /* don't need lock here; in the worst case we'll do useless copy */
71700 - if (fs->users == 1)
71701 + if (atomic_read(&fs->users) == 1)
71702 return 0;
71703
71704 *new_fsp = copy_fs_struct(fs);
71705 @@ -1681,7 +1718,8 @@ SYSCALL_DEFINE1(unshare, unsigned long, unshare_flags)
71706 fs = current->fs;
71707 write_lock(&fs->lock);
71708 current->fs = new_fs;
71709 - if (--fs->users)
71710 + gr_set_chroot_entries(current, &current->fs->root);
71711 + if (atomic_dec_return(&fs->users))
71712 new_fs = NULL;
71713 else
71714 new_fs = fs;
71715 diff --git a/kernel/futex.c b/kernel/futex.c
71716 index fb98c9f..333faec 100644
71717 --- a/kernel/futex.c
71718 +++ b/kernel/futex.c
71719 @@ -54,6 +54,7 @@
71720 #include <linux/mount.h>
71721 #include <linux/pagemap.h>
71722 #include <linux/syscalls.h>
71723 +#include <linux/ptrace.h>
71724 #include <linux/signal.h>
71725 #include <linux/module.h>
71726 #include <linux/magic.h>
71727 @@ -223,6 +224,11 @@ get_futex_key(u32 __user *uaddr, int fshared, union futex_key *key, int rw)
71728 struct page *page;
71729 int err, ro = 0;
71730
71731 +#ifdef CONFIG_PAX_SEGMEXEC
71732 + if ((mm->pax_flags & MF_PAX_SEGMEXEC) && address >= SEGMEXEC_TASK_SIZE)
71733 + return -EFAULT;
71734 +#endif
71735 +
71736 /*
71737 * The futex address must be "naturally" aligned.
71738 */
71739 @@ -1819,6 +1825,8 @@ static int futex_wait(u32 __user *uaddr, int fshared,
71740 struct futex_q q;
71741 int ret;
71742
71743 + pax_track_stack();
71744 +
71745 if (!bitset)
71746 return -EINVAL;
71747
71748 @@ -1871,7 +1879,7 @@ retry:
71749
71750 restart = &current_thread_info()->restart_block;
71751 restart->fn = futex_wait_restart;
71752 - restart->futex.uaddr = (u32 *)uaddr;
71753 + restart->futex.uaddr = uaddr;
71754 restart->futex.val = val;
71755 restart->futex.time = abs_time->tv64;
71756 restart->futex.bitset = bitset;
71757 @@ -2233,6 +2241,8 @@ static int futex_wait_requeue_pi(u32 __user *uaddr, int fshared,
71758 struct futex_q q;
71759 int res, ret;
71760
71761 + pax_track_stack();
71762 +
71763 if (!bitset)
71764 return -EINVAL;
71765
71766 @@ -2423,6 +2433,10 @@ SYSCALL_DEFINE3(get_robust_list, int, pid,
71767 if (!p)
71768 goto err_unlock;
71769 ret = -EPERM;
71770 +#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
71771 + if (!ptrace_may_access(p, PTRACE_MODE_READ))
71772 + goto err_unlock;
71773 +#endif
71774 pcred = __task_cred(p);
71775 if (cred->euid != pcred->euid &&
71776 cred->euid != pcred->uid &&
71777 @@ -2489,7 +2503,7 @@ retry:
71778 */
71779 static inline int fetch_robust_entry(struct robust_list __user **entry,
71780 struct robust_list __user * __user *head,
71781 - int *pi)
71782 + unsigned int *pi)
71783 {
71784 unsigned long uentry;
71785
71786 @@ -2670,6 +2684,7 @@ static int __init futex_init(void)
71787 {
71788 u32 curval;
71789 int i;
71790 + mm_segment_t oldfs;
71791
71792 /*
71793 * This will fail and we want it. Some arch implementations do
71794 @@ -2681,7 +2696,10 @@ static int __init futex_init(void)
71795 * implementation, the non functional ones will return
71796 * -ENOSYS.
71797 */
71798 + oldfs = get_fs();
71799 + set_fs(USER_DS);
71800 curval = cmpxchg_futex_value_locked(NULL, 0, 0);
71801 + set_fs(oldfs);
71802 if (curval == -EFAULT)
71803 futex_cmpxchg_enabled = 1;
71804
71805 diff --git a/kernel/futex_compat.c b/kernel/futex_compat.c
71806 index 2357165..eb25501 100644
71807 --- a/kernel/futex_compat.c
71808 +++ b/kernel/futex_compat.c
71809 @@ -10,6 +10,7 @@
71810 #include <linux/compat.h>
71811 #include <linux/nsproxy.h>
71812 #include <linux/futex.h>
71813 +#include <linux/ptrace.h>
71814
71815 #include <asm/uaccess.h>
71816
71817 @@ -135,7 +136,8 @@ compat_sys_get_robust_list(int pid, compat_uptr_t __user *head_ptr,
71818 {
71819 struct compat_robust_list_head __user *head;
71820 unsigned long ret;
71821 - const struct cred *cred = current_cred(), *pcred;
71822 + const struct cred *cred = current_cred();
71823 + const struct cred *pcred;
71824
71825 if (!futex_cmpxchg_enabled)
71826 return -ENOSYS;
71827 @@ -151,6 +153,10 @@ compat_sys_get_robust_list(int pid, compat_uptr_t __user *head_ptr,
71828 if (!p)
71829 goto err_unlock;
71830 ret = -EPERM;
71831 +#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
71832 + if (!ptrace_may_access(p, PTRACE_MODE_READ))
71833 + goto err_unlock;
71834 +#endif
71835 pcred = __task_cred(p);
71836 if (cred->euid != pcred->euid &&
71837 cred->euid != pcred->uid &&
71838 diff --git a/kernel/gcov/base.c b/kernel/gcov/base.c
71839 index 9b22d03..6295b62 100644
71840 --- a/kernel/gcov/base.c
71841 +++ b/kernel/gcov/base.c
71842 @@ -102,11 +102,6 @@ void gcov_enable_events(void)
71843 }
71844
71845 #ifdef CONFIG_MODULES
71846 -static inline int within(void *addr, void *start, unsigned long size)
71847 -{
71848 - return ((addr >= start) && (addr < start + size));
71849 -}
71850 -
71851 /* Update list and generate events when modules are unloaded. */
71852 static int gcov_module_notifier(struct notifier_block *nb, unsigned long event,
71853 void *data)
71854 @@ -121,7 +116,7 @@ static int gcov_module_notifier(struct notifier_block *nb, unsigned long event,
71855 prev = NULL;
71856 /* Remove entries located in module from linked list. */
71857 for (info = gcov_info_head; info; info = info->next) {
71858 - if (within(info, mod->module_core, mod->core_size)) {
71859 + if (within_module_core_rw((unsigned long)info, mod)) {
71860 if (prev)
71861 prev->next = info->next;
71862 else
71863 diff --git a/kernel/hrtimer.c b/kernel/hrtimer.c
71864 index a6e9d00..a0da4f9 100644
71865 --- a/kernel/hrtimer.c
71866 +++ b/kernel/hrtimer.c
71867 @@ -1391,7 +1391,7 @@ void hrtimer_peek_ahead_timers(void)
71868 local_irq_restore(flags);
71869 }
71870
71871 -static void run_hrtimer_softirq(struct softirq_action *h)
71872 +static void run_hrtimer_softirq(void)
71873 {
71874 hrtimer_peek_ahead_timers();
71875 }
71876 diff --git a/kernel/kallsyms.c b/kernel/kallsyms.c
71877 index 8b6b8b6..6bc87df 100644
71878 --- a/kernel/kallsyms.c
71879 +++ b/kernel/kallsyms.c
71880 @@ -11,6 +11,9 @@
71881 * Changed the compression method from stem compression to "table lookup"
71882 * compression (see scripts/kallsyms.c for a more complete description)
71883 */
71884 +#ifdef CONFIG_GRKERNSEC_HIDESYM
71885 +#define __INCLUDED_BY_HIDESYM 1
71886 +#endif
71887 #include <linux/kallsyms.h>
71888 #include <linux/module.h>
71889 #include <linux/init.h>
71890 @@ -51,12 +54,33 @@ extern const unsigned long kallsyms_markers[] __attribute__((weak));
71891
71892 static inline int is_kernel_inittext(unsigned long addr)
71893 {
71894 + if (system_state != SYSTEM_BOOTING)
71895 + return 0;
71896 +
71897 if (addr >= (unsigned long)_sinittext
71898 && addr <= (unsigned long)_einittext)
71899 return 1;
71900 return 0;
71901 }
71902
71903 +#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
71904 +#ifdef CONFIG_MODULES
71905 +static inline int is_module_text(unsigned long addr)
71906 +{
71907 + if ((unsigned long)MODULES_EXEC_VADDR <= addr && addr <= (unsigned long)MODULES_EXEC_END)
71908 + return 1;
71909 +
71910 + addr = ktla_ktva(addr);
71911 + return (unsigned long)MODULES_EXEC_VADDR <= addr && addr <= (unsigned long)MODULES_EXEC_END;
71912 +}
71913 +#else
71914 +static inline int is_module_text(unsigned long addr)
71915 +{
71916 + return 0;
71917 +}
71918 +#endif
71919 +#endif
71920 +
71921 static inline int is_kernel_text(unsigned long addr)
71922 {
71923 if ((addr >= (unsigned long)_stext && addr <= (unsigned long)_etext) ||
71924 @@ -67,13 +91,28 @@ static inline int is_kernel_text(unsigned long addr)
71925
71926 static inline int is_kernel(unsigned long addr)
71927 {
71928 +
71929 +#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
71930 + if (is_kernel_text(addr) || is_kernel_inittext(addr))
71931 + return 1;
71932 +
71933 + if (ktla_ktva((unsigned long)_text) <= addr && addr < (unsigned long)_end)
71934 +#else
71935 if (addr >= (unsigned long)_stext && addr <= (unsigned long)_end)
71936 +#endif
71937 +
71938 return 1;
71939 return in_gate_area_no_task(addr);
71940 }
71941
71942 static int is_ksym_addr(unsigned long addr)
71943 {
71944 +
71945 +#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
71946 + if (is_module_text(addr))
71947 + return 0;
71948 +#endif
71949 +
71950 if (all_var)
71951 return is_kernel(addr);
71952
71953 @@ -413,7 +452,6 @@ static unsigned long get_ksymbol_core(struct kallsym_iter *iter)
71954
71955 static void reset_iter(struct kallsym_iter *iter, loff_t new_pos)
71956 {
71957 - iter->name[0] = '\0';
71958 iter->nameoff = get_symbol_offset(new_pos);
71959 iter->pos = new_pos;
71960 }
71961 @@ -461,6 +499,11 @@ static int s_show(struct seq_file *m, void *p)
71962 {
71963 struct kallsym_iter *iter = m->private;
71964
71965 +#ifdef CONFIG_GRKERNSEC_HIDESYM
71966 + if (current_uid())
71967 + return 0;
71968 +#endif
71969 +
71970 /* Some debugging symbols have no name. Ignore them. */
71971 if (!iter->name[0])
71972 return 0;
71973 @@ -501,7 +544,7 @@ static int kallsyms_open(struct inode *inode, struct file *file)
71974 struct kallsym_iter *iter;
71975 int ret;
71976
71977 - iter = kmalloc(sizeof(*iter), GFP_KERNEL);
71978 + iter = kzalloc(sizeof(*iter), GFP_KERNEL);
71979 if (!iter)
71980 return -ENOMEM;
71981 reset_iter(iter, 0);
71982 diff --git a/kernel/kexec.c b/kernel/kexec.c
71983 index f336e21..9c1c20b 100644
71984 --- a/kernel/kexec.c
71985 +++ b/kernel/kexec.c
71986 @@ -1028,7 +1028,8 @@ asmlinkage long compat_sys_kexec_load(unsigned long entry,
71987 unsigned long flags)
71988 {
71989 struct compat_kexec_segment in;
71990 - struct kexec_segment out, __user *ksegments;
71991 + struct kexec_segment out;
71992 + struct kexec_segment __user *ksegments;
71993 unsigned long i, result;
71994
71995 /* Don't allow clients that don't understand the native
71996 diff --git a/kernel/kgdb.c b/kernel/kgdb.c
71997 index 53dae4b..9ba3743 100644
71998 --- a/kernel/kgdb.c
71999 +++ b/kernel/kgdb.c
72000 @@ -86,7 +86,7 @@ static int kgdb_io_module_registered;
72001 /* Guard for recursive entry */
72002 static int exception_level;
72003
72004 -static struct kgdb_io *kgdb_io_ops;
72005 +static const struct kgdb_io *kgdb_io_ops;
72006 static DEFINE_SPINLOCK(kgdb_registration_lock);
72007
72008 /* kgdb console driver is loaded */
72009 @@ -123,7 +123,7 @@ atomic_t kgdb_active = ATOMIC_INIT(-1);
72010 */
72011 static atomic_t passive_cpu_wait[NR_CPUS];
72012 static atomic_t cpu_in_kgdb[NR_CPUS];
72013 -atomic_t kgdb_setting_breakpoint;
72014 +atomic_unchecked_t kgdb_setting_breakpoint;
72015
72016 struct task_struct *kgdb_usethread;
72017 struct task_struct *kgdb_contthread;
72018 @@ -140,7 +140,7 @@ static unsigned long gdb_regs[(NUMREGBYTES +
72019 sizeof(unsigned long)];
72020
72021 /* to keep track of the CPU which is doing the single stepping*/
72022 -atomic_t kgdb_cpu_doing_single_step = ATOMIC_INIT(-1);
72023 +atomic_unchecked_t kgdb_cpu_doing_single_step = ATOMIC_INIT(-1);
72024
72025 /*
72026 * If you are debugging a problem where roundup (the collection of
72027 @@ -815,7 +815,7 @@ static int kgdb_io_ready(int print_wait)
72028 return 0;
72029 if (kgdb_connected)
72030 return 1;
72031 - if (atomic_read(&kgdb_setting_breakpoint))
72032 + if (atomic_read_unchecked(&kgdb_setting_breakpoint))
72033 return 1;
72034 if (print_wait)
72035 printk(KERN_CRIT "KGDB: Waiting for remote debugger\n");
72036 @@ -1426,8 +1426,8 @@ acquirelock:
72037 * instance of the exception handler wanted to come into the
72038 * debugger on a different CPU via a single step
72039 */
72040 - if (atomic_read(&kgdb_cpu_doing_single_step) != -1 &&
72041 - atomic_read(&kgdb_cpu_doing_single_step) != cpu) {
72042 + if (atomic_read_unchecked(&kgdb_cpu_doing_single_step) != -1 &&
72043 + atomic_read_unchecked(&kgdb_cpu_doing_single_step) != cpu) {
72044
72045 atomic_set(&kgdb_active, -1);
72046 touch_softlockup_watchdog();
72047 @@ -1634,7 +1634,7 @@ static void kgdb_initial_breakpoint(void)
72048 *
72049 * Register it with the KGDB core.
72050 */
72051 -int kgdb_register_io_module(struct kgdb_io *new_kgdb_io_ops)
72052 +int kgdb_register_io_module(const struct kgdb_io *new_kgdb_io_ops)
72053 {
72054 int err;
72055
72056 @@ -1679,7 +1679,7 @@ EXPORT_SYMBOL_GPL(kgdb_register_io_module);
72057 *
72058 * Unregister it with the KGDB core.
72059 */
72060 -void kgdb_unregister_io_module(struct kgdb_io *old_kgdb_io_ops)
72061 +void kgdb_unregister_io_module(const struct kgdb_io *old_kgdb_io_ops)
72062 {
72063 BUG_ON(kgdb_connected);
72064
72065 @@ -1712,11 +1712,11 @@ EXPORT_SYMBOL_GPL(kgdb_unregister_io_module);
72066 */
72067 void kgdb_breakpoint(void)
72068 {
72069 - atomic_set(&kgdb_setting_breakpoint, 1);
72070 + atomic_set_unchecked(&kgdb_setting_breakpoint, 1);
72071 wmb(); /* Sync point before breakpoint */
72072 arch_kgdb_breakpoint();
72073 wmb(); /* Sync point after breakpoint */
72074 - atomic_set(&kgdb_setting_breakpoint, 0);
72075 + atomic_set_unchecked(&kgdb_setting_breakpoint, 0);
72076 }
72077 EXPORT_SYMBOL_GPL(kgdb_breakpoint);
72078
72079 diff --git a/kernel/kmod.c b/kernel/kmod.c
72080 index d206078..e27ba6a 100644
72081 --- a/kernel/kmod.c
72082 +++ b/kernel/kmod.c
72083 @@ -65,13 +65,12 @@ char modprobe_path[KMOD_PATH_LEN] = "/sbin/modprobe";
72084 * If module auto-loading support is disabled then this function
72085 * becomes a no-operation.
72086 */
72087 -int __request_module(bool wait, const char *fmt, ...)
72088 +static int ____request_module(bool wait, char *module_param, const char *fmt, va_list ap)
72089 {
72090 - va_list args;
72091 char module_name[MODULE_NAME_LEN];
72092 unsigned int max_modprobes;
72093 int ret;
72094 - char *argv[] = { modprobe_path, "-q", "--", module_name, NULL };
72095 + char *argv[] = { modprobe_path, "-q", "--", module_name, module_param, NULL };
72096 static char *envp[] = { "HOME=/",
72097 "TERM=linux",
72098 "PATH=/sbin:/usr/sbin:/bin:/usr/bin",
72099 @@ -84,12 +83,24 @@ int __request_module(bool wait, const char *fmt, ...)
72100 if (ret)
72101 return ret;
72102
72103 - va_start(args, fmt);
72104 - ret = vsnprintf(module_name, MODULE_NAME_LEN, fmt, args);
72105 - va_end(args);
72106 + ret = vsnprintf(module_name, MODULE_NAME_LEN, fmt, ap);
72107 if (ret >= MODULE_NAME_LEN)
72108 return -ENAMETOOLONG;
72109
72110 +#ifdef CONFIG_GRKERNSEC_MODHARDEN
72111 + if (!current_uid()) {
72112 + /* hack to workaround consolekit/udisks stupidity */
72113 + read_lock(&tasklist_lock);
72114 + if (!strcmp(current->comm, "mount") &&
72115 + current->real_parent && !strncmp(current->real_parent->comm, "udisk", 5)) {
72116 + read_unlock(&tasklist_lock);
72117 + printk(KERN_ALERT "grsec: denied attempt to auto-load fs module %.64s by udisks\n", module_name);
72118 + return -EPERM;
72119 + }
72120 + read_unlock(&tasklist_lock);
72121 + }
72122 +#endif
72123 +
72124 /* If modprobe needs a service that is in a module, we get a recursive
72125 * loop. Limit the number of running kmod threads to max_threads/2 or
72126 * MAX_KMOD_CONCURRENT, whichever is the smaller. A cleaner method
72127 @@ -123,6 +134,48 @@ int __request_module(bool wait, const char *fmt, ...)
72128 atomic_dec(&kmod_concurrent);
72129 return ret;
72130 }
72131 +
72132 +int ___request_module(bool wait, char *module_param, const char *fmt, ...)
72133 +{
72134 + va_list args;
72135 + int ret;
72136 +
72137 + va_start(args, fmt);
72138 + ret = ____request_module(wait, module_param, fmt, args);
72139 + va_end(args);
72140 +
72141 + return ret;
72142 +}
72143 +
72144 +int __request_module(bool wait, const char *fmt, ...)
72145 +{
72146 + va_list args;
72147 + int ret;
72148 +
72149 +#ifdef CONFIG_GRKERNSEC_MODHARDEN
72150 + if (current_uid()) {
72151 + char module_param[MODULE_NAME_LEN];
72152 +
72153 + memset(module_param, 0, sizeof(module_param));
72154 +
72155 + snprintf(module_param, sizeof(module_param) - 1, "grsec_modharden_normal%u_", current_uid());
72156 +
72157 + va_start(args, fmt);
72158 + ret = ____request_module(wait, module_param, fmt, args);
72159 + va_end(args);
72160 +
72161 + return ret;
72162 + }
72163 +#endif
72164 +
72165 + va_start(args, fmt);
72166 + ret = ____request_module(wait, NULL, fmt, args);
72167 + va_end(args);
72168 +
72169 + return ret;
72170 +}
72171 +
72172 +
72173 EXPORT_SYMBOL(__request_module);
72174 #endif /* CONFIG_MODULES */
72175
72176 @@ -228,7 +281,7 @@ static int wait_for_helper(void *data)
72177 *
72178 * Thus the __user pointer cast is valid here.
72179 */
72180 - sys_wait4(pid, (int __user *)&ret, 0, NULL);
72181 + sys_wait4(pid, (int __force_user *)&ret, 0, NULL);
72182
72183 /*
72184 * If ret is 0, either ____call_usermodehelper failed and the
72185 diff --git a/kernel/kprobes.c b/kernel/kprobes.c
72186 index 5240d75..5a6fb33 100644
72187 --- a/kernel/kprobes.c
72188 +++ b/kernel/kprobes.c
72189 @@ -183,7 +183,7 @@ static kprobe_opcode_t __kprobes *__get_insn_slot(void)
72190 * kernel image and loaded module images reside. This is required
72191 * so x86_64 can correctly handle the %rip-relative fixups.
72192 */
72193 - kip->insns = module_alloc(PAGE_SIZE);
72194 + kip->insns = module_alloc_exec(PAGE_SIZE);
72195 if (!kip->insns) {
72196 kfree(kip);
72197 return NULL;
72198 @@ -220,7 +220,7 @@ static int __kprobes collect_one_slot(struct kprobe_insn_page *kip, int idx)
72199 */
72200 if (!list_is_singular(&kprobe_insn_pages)) {
72201 list_del(&kip->list);
72202 - module_free(NULL, kip->insns);
72203 + module_free_exec(NULL, kip->insns);
72204 kfree(kip);
72205 }
72206 return 1;
72207 @@ -1189,7 +1189,7 @@ static int __init init_kprobes(void)
72208 {
72209 int i, err = 0;
72210 unsigned long offset = 0, size = 0;
72211 - char *modname, namebuf[128];
72212 + char *modname, namebuf[KSYM_NAME_LEN];
72213 const char *symbol_name;
72214 void *addr;
72215 struct kprobe_blackpoint *kb;
72216 @@ -1304,7 +1304,7 @@ static int __kprobes show_kprobe_addr(struct seq_file *pi, void *v)
72217 const char *sym = NULL;
72218 unsigned int i = *(loff_t *) v;
72219 unsigned long offset = 0;
72220 - char *modname, namebuf[128];
72221 + char *modname, namebuf[KSYM_NAME_LEN];
72222
72223 head = &kprobe_table[i];
72224 preempt_disable();
72225 diff --git a/kernel/lockdep.c b/kernel/lockdep.c
72226 index d86fe89..d12fc66 100644
72227 --- a/kernel/lockdep.c
72228 +++ b/kernel/lockdep.c
72229 @@ -421,20 +421,20 @@ static struct stack_trace lockdep_init_trace = {
72230 /*
72231 * Various lockdep statistics:
72232 */
72233 -atomic_t chain_lookup_hits;
72234 -atomic_t chain_lookup_misses;
72235 -atomic_t hardirqs_on_events;
72236 -atomic_t hardirqs_off_events;
72237 -atomic_t redundant_hardirqs_on;
72238 -atomic_t redundant_hardirqs_off;
72239 -atomic_t softirqs_on_events;
72240 -atomic_t softirqs_off_events;
72241 -atomic_t redundant_softirqs_on;
72242 -atomic_t redundant_softirqs_off;
72243 -atomic_t nr_unused_locks;
72244 -atomic_t nr_cyclic_checks;
72245 -atomic_t nr_find_usage_forwards_checks;
72246 -atomic_t nr_find_usage_backwards_checks;
72247 +atomic_unchecked_t chain_lookup_hits;
72248 +atomic_unchecked_t chain_lookup_misses;
72249 +atomic_unchecked_t hardirqs_on_events;
72250 +atomic_unchecked_t hardirqs_off_events;
72251 +atomic_unchecked_t redundant_hardirqs_on;
72252 +atomic_unchecked_t redundant_hardirqs_off;
72253 +atomic_unchecked_t softirqs_on_events;
72254 +atomic_unchecked_t softirqs_off_events;
72255 +atomic_unchecked_t redundant_softirqs_on;
72256 +atomic_unchecked_t redundant_softirqs_off;
72257 +atomic_unchecked_t nr_unused_locks;
72258 +atomic_unchecked_t nr_cyclic_checks;
72259 +atomic_unchecked_t nr_find_usage_forwards_checks;
72260 +atomic_unchecked_t nr_find_usage_backwards_checks;
72261 #endif
72262
72263 /*
72264 @@ -577,6 +577,10 @@ static int static_obj(void *obj)
72265 int i;
72266 #endif
72267
72268 +#ifdef CONFIG_PAX_KERNEXEC
72269 + start = ktla_ktva(start);
72270 +#endif
72271 +
72272 /*
72273 * static variable?
72274 */
72275 @@ -592,8 +596,7 @@ static int static_obj(void *obj)
72276 */
72277 for_each_possible_cpu(i) {
72278 start = (unsigned long) &__per_cpu_start + per_cpu_offset(i);
72279 - end = (unsigned long) &__per_cpu_start + PERCPU_ENOUGH_ROOM
72280 - + per_cpu_offset(i);
72281 + end = start + PERCPU_ENOUGH_ROOM;
72282
72283 if ((addr >= start) && (addr < end))
72284 return 1;
72285 @@ -710,6 +713,7 @@ register_lock_class(struct lockdep_map *lock, unsigned int subclass, int force)
72286 if (!static_obj(lock->key)) {
72287 debug_locks_off();
72288 printk("INFO: trying to register non-static key.\n");
72289 + printk("lock:%pS key:%pS.\n", lock, lock->key);
72290 printk("the code is fine but needs lockdep annotation.\n");
72291 printk("turning off the locking correctness validator.\n");
72292 dump_stack();
72293 @@ -2751,7 +2755,7 @@ static int __lock_acquire(struct lockdep_map *lock, unsigned int subclass,
72294 if (!class)
72295 return 0;
72296 }
72297 - debug_atomic_inc((atomic_t *)&class->ops);
72298 + debug_atomic_inc((atomic_unchecked_t *)&class->ops);
72299 if (very_verbose(class)) {
72300 printk("\nacquire class [%p] %s", class->key, class->name);
72301 if (class->name_version > 1)
72302 diff --git a/kernel/lockdep_internals.h b/kernel/lockdep_internals.h
72303 index a2ee95a..092f0f2 100644
72304 --- a/kernel/lockdep_internals.h
72305 +++ b/kernel/lockdep_internals.h
72306 @@ -113,26 +113,26 @@ lockdep_count_backward_deps(struct lock_class *class)
72307 /*
72308 * Various lockdep statistics:
72309 */
72310 -extern atomic_t chain_lookup_hits;
72311 -extern atomic_t chain_lookup_misses;
72312 -extern atomic_t hardirqs_on_events;
72313 -extern atomic_t hardirqs_off_events;
72314 -extern atomic_t redundant_hardirqs_on;
72315 -extern atomic_t redundant_hardirqs_off;
72316 -extern atomic_t softirqs_on_events;
72317 -extern atomic_t softirqs_off_events;
72318 -extern atomic_t redundant_softirqs_on;
72319 -extern atomic_t redundant_softirqs_off;
72320 -extern atomic_t nr_unused_locks;
72321 -extern atomic_t nr_cyclic_checks;
72322 -extern atomic_t nr_cyclic_check_recursions;
72323 -extern atomic_t nr_find_usage_forwards_checks;
72324 -extern atomic_t nr_find_usage_forwards_recursions;
72325 -extern atomic_t nr_find_usage_backwards_checks;
72326 -extern atomic_t nr_find_usage_backwards_recursions;
72327 -# define debug_atomic_inc(ptr) atomic_inc(ptr)
72328 -# define debug_atomic_dec(ptr) atomic_dec(ptr)
72329 -# define debug_atomic_read(ptr) atomic_read(ptr)
72330 +extern atomic_unchecked_t chain_lookup_hits;
72331 +extern atomic_unchecked_t chain_lookup_misses;
72332 +extern atomic_unchecked_t hardirqs_on_events;
72333 +extern atomic_unchecked_t hardirqs_off_events;
72334 +extern atomic_unchecked_t redundant_hardirqs_on;
72335 +extern atomic_unchecked_t redundant_hardirqs_off;
72336 +extern atomic_unchecked_t softirqs_on_events;
72337 +extern atomic_unchecked_t softirqs_off_events;
72338 +extern atomic_unchecked_t redundant_softirqs_on;
72339 +extern atomic_unchecked_t redundant_softirqs_off;
72340 +extern atomic_unchecked_t nr_unused_locks;
72341 +extern atomic_unchecked_t nr_cyclic_checks;
72342 +extern atomic_unchecked_t nr_cyclic_check_recursions;
72343 +extern atomic_unchecked_t nr_find_usage_forwards_checks;
72344 +extern atomic_unchecked_t nr_find_usage_forwards_recursions;
72345 +extern atomic_unchecked_t nr_find_usage_backwards_checks;
72346 +extern atomic_unchecked_t nr_find_usage_backwards_recursions;
72347 +# define debug_atomic_inc(ptr) atomic_inc_unchecked(ptr)
72348 +# define debug_atomic_dec(ptr) atomic_dec_unchecked(ptr)
72349 +# define debug_atomic_read(ptr) atomic_read_unchecked(ptr)
72350 #else
72351 # define debug_atomic_inc(ptr) do { } while (0)
72352 # define debug_atomic_dec(ptr) do { } while (0)
72353 diff --git a/kernel/lockdep_proc.c b/kernel/lockdep_proc.c
72354 index d4aba4f..02a353f 100644
72355 --- a/kernel/lockdep_proc.c
72356 +++ b/kernel/lockdep_proc.c
72357 @@ -39,7 +39,7 @@ static void l_stop(struct seq_file *m, void *v)
72358
72359 static void print_name(struct seq_file *m, struct lock_class *class)
72360 {
72361 - char str[128];
72362 + char str[KSYM_NAME_LEN];
72363 const char *name = class->name;
72364
72365 if (!name) {
72366 diff --git a/kernel/module.c b/kernel/module.c
72367 index 4b270e6..2226274 100644
72368 --- a/kernel/module.c
72369 +++ b/kernel/module.c
72370 @@ -55,6 +55,7 @@
72371 #include <linux/async.h>
72372 #include <linux/percpu.h>
72373 #include <linux/kmemleak.h>
72374 +#include <linux/grsecurity.h>
72375
72376 #define CREATE_TRACE_POINTS
72377 #include <trace/events/module.h>
72378 @@ -89,7 +90,8 @@ static DECLARE_WAIT_QUEUE_HEAD(module_wq);
72379 static BLOCKING_NOTIFIER_HEAD(module_notify_list);
72380
72381 /* Bounds of module allocation, for speeding __module_address */
72382 -static unsigned long module_addr_min = -1UL, module_addr_max = 0;
72383 +static unsigned long module_addr_min_rw = -1UL, module_addr_max_rw = 0;
72384 +static unsigned long module_addr_min_rx = -1UL, module_addr_max_rx = 0;
72385
72386 int register_module_notifier(struct notifier_block * nb)
72387 {
72388 @@ -245,7 +247,7 @@ bool each_symbol(bool (*fn)(const struct symsearch *arr, struct module *owner,
72389 return true;
72390
72391 list_for_each_entry_rcu(mod, &modules, list) {
72392 - struct symsearch arr[] = {
72393 + struct symsearch modarr[] = {
72394 { mod->syms, mod->syms + mod->num_syms, mod->crcs,
72395 NOT_GPL_ONLY, false },
72396 { mod->gpl_syms, mod->gpl_syms + mod->num_gpl_syms,
72397 @@ -267,7 +269,7 @@ bool each_symbol(bool (*fn)(const struct symsearch *arr, struct module *owner,
72398 #endif
72399 };
72400
72401 - if (each_symbol_in_section(arr, ARRAY_SIZE(arr), mod, fn, data))
72402 + if (each_symbol_in_section(modarr, ARRAY_SIZE(modarr), mod, fn, data))
72403 return true;
72404 }
72405 return false;
72406 @@ -442,7 +444,7 @@ static void *percpu_modalloc(unsigned long size, unsigned long align,
72407 void *ptr;
72408 int cpu;
72409
72410 - if (align > PAGE_SIZE) {
72411 + if (align-1 >= PAGE_SIZE) {
72412 printk(KERN_WARNING "%s: per-cpu alignment %li > %li\n",
72413 name, align, PAGE_SIZE);
72414 align = PAGE_SIZE;
72415 @@ -1158,7 +1160,7 @@ static const struct kernel_symbol *resolve_symbol(Elf_Shdr *sechdrs,
72416 * /sys/module/foo/sections stuff
72417 * J. Corbet <corbet@lwn.net>
72418 */
72419 -#if defined(CONFIG_KALLSYMS) && defined(CONFIG_SYSFS)
72420 +#if defined(CONFIG_KALLSYMS) && defined(CONFIG_SYSFS) && !defined(CONFIG_GRKERNSEC_HIDESYM)
72421
72422 static inline bool sect_empty(const Elf_Shdr *sect)
72423 {
72424 @@ -1545,7 +1547,8 @@ static void free_module(struct module *mod)
72425 destroy_params(mod->kp, mod->num_kp);
72426
72427 /* This may be NULL, but that's OK */
72428 - module_free(mod, mod->module_init);
72429 + module_free(mod, mod->module_init_rw);
72430 + module_free_exec(mod, mod->module_init_rx);
72431 kfree(mod->args);
72432 if (mod->percpu)
72433 percpu_modfree(mod->percpu);
72434 @@ -1554,10 +1557,12 @@ static void free_module(struct module *mod)
72435 percpu_modfree(mod->refptr);
72436 #endif
72437 /* Free lock-classes: */
72438 - lockdep_free_key_range(mod->module_core, mod->core_size);
72439 + lockdep_free_key_range(mod->module_core_rx, mod->core_size_rx);
72440 + lockdep_free_key_range(mod->module_core_rw, mod->core_size_rw);
72441
72442 /* Finally, free the core (containing the module structure) */
72443 - module_free(mod, mod->module_core);
72444 + module_free_exec(mod, mod->module_core_rx);
72445 + module_free(mod, mod->module_core_rw);
72446
72447 #ifdef CONFIG_MPU
72448 update_protections(current->mm);
72449 @@ -1628,8 +1633,32 @@ static int simplify_symbols(Elf_Shdr *sechdrs,
72450 unsigned int i, n = sechdrs[symindex].sh_size / sizeof(Elf_Sym);
72451 int ret = 0;
72452 const struct kernel_symbol *ksym;
72453 +#ifdef CONFIG_GRKERNSEC_MODHARDEN
72454 + int is_fs_load = 0;
72455 + int register_filesystem_found = 0;
72456 + char *p;
72457 +
72458 + p = strstr(mod->args, "grsec_modharden_fs");
72459 +
72460 + if (p) {
72461 + char *endptr = p + strlen("grsec_modharden_fs");
72462 + /* copy \0 as well */
72463 + memmove(p, endptr, strlen(mod->args) - (unsigned int)(endptr - mod->args) + 1);
72464 + is_fs_load = 1;
72465 + }
72466 +#endif
72467 +
72468
72469 for (i = 1; i < n; i++) {
72470 +#ifdef CONFIG_GRKERNSEC_MODHARDEN
72471 + const char *name = strtab + sym[i].st_name;
72472 +
72473 + /* it's a real shame this will never get ripped and copied
72474 + upstream! ;(
72475 + */
72476 + if (is_fs_load && !strcmp(name, "register_filesystem"))
72477 + register_filesystem_found = 1;
72478 +#endif
72479 switch (sym[i].st_shndx) {
72480 case SHN_COMMON:
72481 /* We compiled with -fno-common. These are not
72482 @@ -1651,7 +1680,9 @@ static int simplify_symbols(Elf_Shdr *sechdrs,
72483 strtab + sym[i].st_name, mod);
72484 /* Ok if resolved. */
72485 if (ksym) {
72486 + pax_open_kernel();
72487 sym[i].st_value = ksym->value;
72488 + pax_close_kernel();
72489 break;
72490 }
72491
72492 @@ -1670,11 +1701,20 @@ static int simplify_symbols(Elf_Shdr *sechdrs,
72493 secbase = (unsigned long)mod->percpu;
72494 else
72495 secbase = sechdrs[sym[i].st_shndx].sh_addr;
72496 + pax_open_kernel();
72497 sym[i].st_value += secbase;
72498 + pax_close_kernel();
72499 break;
72500 }
72501 }
72502
72503 +#ifdef CONFIG_GRKERNSEC_MODHARDEN
72504 + if (is_fs_load && !register_filesystem_found) {
72505 + printk(KERN_ALERT "grsec: Denied attempt to load non-fs module %.64s through mount\n", mod->name);
72506 + ret = -EPERM;
72507 + }
72508 +#endif
72509 +
72510 return ret;
72511 }
72512
72513 @@ -1731,11 +1771,12 @@ static void layout_sections(struct module *mod,
72514 || s->sh_entsize != ~0UL
72515 || strstarts(secstrings + s->sh_name, ".init"))
72516 continue;
72517 - s->sh_entsize = get_offset(mod, &mod->core_size, s, i);
72518 + if ((s->sh_flags & SHF_WRITE) || !(s->sh_flags & SHF_ALLOC))
72519 + s->sh_entsize = get_offset(mod, &mod->core_size_rw, s, i);
72520 + else
72521 + s->sh_entsize = get_offset(mod, &mod->core_size_rx, s, i);
72522 DEBUGP("\t%s\n", secstrings + s->sh_name);
72523 }
72524 - if (m == 0)
72525 - mod->core_text_size = mod->core_size;
72526 }
72527
72528 DEBUGP("Init section allocation order:\n");
72529 @@ -1748,12 +1789,13 @@ static void layout_sections(struct module *mod,
72530 || s->sh_entsize != ~0UL
72531 || !strstarts(secstrings + s->sh_name, ".init"))
72532 continue;
72533 - s->sh_entsize = (get_offset(mod, &mod->init_size, s, i)
72534 - | INIT_OFFSET_MASK);
72535 + if ((s->sh_flags & SHF_WRITE) || !(s->sh_flags & SHF_ALLOC))
72536 + s->sh_entsize = get_offset(mod, &mod->init_size_rw, s, i);
72537 + else
72538 + s->sh_entsize = get_offset(mod, &mod->init_size_rx, s, i);
72539 + s->sh_entsize |= INIT_OFFSET_MASK;
72540 DEBUGP("\t%s\n", secstrings + s->sh_name);
72541 }
72542 - if (m == 0)
72543 - mod->init_text_size = mod->init_size;
72544 }
72545 }
72546
72547 @@ -1857,9 +1899,8 @@ static int is_exported(const char *name, unsigned long value,
72548
72549 /* As per nm */
72550 static char elf_type(const Elf_Sym *sym,
72551 - Elf_Shdr *sechdrs,
72552 - const char *secstrings,
72553 - struct module *mod)
72554 + const Elf_Shdr *sechdrs,
72555 + const char *secstrings)
72556 {
72557 if (ELF_ST_BIND(sym->st_info) == STB_WEAK) {
72558 if (ELF_ST_TYPE(sym->st_info) == STT_OBJECT)
72559 @@ -1934,7 +1975,7 @@ static unsigned long layout_symtab(struct module *mod,
72560
72561 /* Put symbol section at end of init part of module. */
72562 symsect->sh_flags |= SHF_ALLOC;
72563 - symsect->sh_entsize = get_offset(mod, &mod->init_size, symsect,
72564 + symsect->sh_entsize = get_offset(mod, &mod->init_size_rx, symsect,
72565 symindex) | INIT_OFFSET_MASK;
72566 DEBUGP("\t%s\n", secstrings + symsect->sh_name);
72567
72568 @@ -1951,19 +1992,19 @@ static unsigned long layout_symtab(struct module *mod,
72569 }
72570
72571 /* Append room for core symbols at end of core part. */
72572 - symoffs = ALIGN(mod->core_size, symsect->sh_addralign ?: 1);
72573 - mod->core_size = symoffs + ndst * sizeof(Elf_Sym);
72574 + symoffs = ALIGN(mod->core_size_rx, symsect->sh_addralign ?: 1);
72575 + mod->core_size_rx = symoffs + ndst * sizeof(Elf_Sym);
72576
72577 /* Put string table section at end of init part of module. */
72578 strsect->sh_flags |= SHF_ALLOC;
72579 - strsect->sh_entsize = get_offset(mod, &mod->init_size, strsect,
72580 + strsect->sh_entsize = get_offset(mod, &mod->init_size_rx, strsect,
72581 strindex) | INIT_OFFSET_MASK;
72582 DEBUGP("\t%s\n", secstrings + strsect->sh_name);
72583
72584 /* Append room for core symbols' strings at end of core part. */
72585 - *pstroffs = mod->core_size;
72586 + *pstroffs = mod->core_size_rx;
72587 __set_bit(0, strmap);
72588 - mod->core_size += bitmap_weight(strmap, strsect->sh_size);
72589 + mod->core_size_rx += bitmap_weight(strmap, strsect->sh_size);
72590
72591 return symoffs;
72592 }
72593 @@ -1987,12 +2028,14 @@ static void add_kallsyms(struct module *mod,
72594 mod->num_symtab = sechdrs[symindex].sh_size / sizeof(Elf_Sym);
72595 mod->strtab = (void *)sechdrs[strindex].sh_addr;
72596
72597 + pax_open_kernel();
72598 +
72599 /* Set types up while we still have access to sections. */
72600 for (i = 0; i < mod->num_symtab; i++)
72601 mod->symtab[i].st_info
72602 - = elf_type(&mod->symtab[i], sechdrs, secstrings, mod);
72603 + = elf_type(&mod->symtab[i], sechdrs, secstrings);
72604
72605 - mod->core_symtab = dst = mod->module_core + symoffs;
72606 + mod->core_symtab = dst = mod->module_core_rx + symoffs;
72607 src = mod->symtab;
72608 *dst = *src;
72609 for (ndst = i = 1; i < mod->num_symtab; ++i, ++src) {
72610 @@ -2004,10 +2047,12 @@ static void add_kallsyms(struct module *mod,
72611 }
72612 mod->core_num_syms = ndst;
72613
72614 - mod->core_strtab = s = mod->module_core + stroffs;
72615 + mod->core_strtab = s = mod->module_core_rx + stroffs;
72616 for (*s = 0, i = 1; i < sechdrs[strindex].sh_size; ++i)
72617 if (test_bit(i, strmap))
72618 *++s = mod->strtab[i];
72619 +
72620 + pax_close_kernel();
72621 }
72622 #else
72623 static inline unsigned long layout_symtab(struct module *mod,
72624 @@ -2044,16 +2089,30 @@ static void dynamic_debug_setup(struct _ddebug *debug, unsigned int num)
72625 #endif
72626 }
72627
72628 -static void *module_alloc_update_bounds(unsigned long size)
72629 +static void *module_alloc_update_bounds_rw(unsigned long size)
72630 {
72631 void *ret = module_alloc(size);
72632
72633 if (ret) {
72634 /* Update module bounds. */
72635 - if ((unsigned long)ret < module_addr_min)
72636 - module_addr_min = (unsigned long)ret;
72637 - if ((unsigned long)ret + size > module_addr_max)
72638 - module_addr_max = (unsigned long)ret + size;
72639 + if ((unsigned long)ret < module_addr_min_rw)
72640 + module_addr_min_rw = (unsigned long)ret;
72641 + if ((unsigned long)ret + size > module_addr_max_rw)
72642 + module_addr_max_rw = (unsigned long)ret + size;
72643 + }
72644 + return ret;
72645 +}
72646 +
72647 +static void *module_alloc_update_bounds_rx(unsigned long size)
72648 +{
72649 + void *ret = module_alloc_exec(size);
72650 +
72651 + if (ret) {
72652 + /* Update module bounds. */
72653 + if ((unsigned long)ret < module_addr_min_rx)
72654 + module_addr_min_rx = (unsigned long)ret;
72655 + if ((unsigned long)ret + size > module_addr_max_rx)
72656 + module_addr_max_rx = (unsigned long)ret + size;
72657 }
72658 return ret;
72659 }
72660 @@ -2065,8 +2124,8 @@ static void kmemleak_load_module(struct module *mod, Elf_Ehdr *hdr,
72661 unsigned int i;
72662
72663 /* only scan the sections containing data */
72664 - kmemleak_scan_area(mod->module_core, (unsigned long)mod -
72665 - (unsigned long)mod->module_core,
72666 + kmemleak_scan_area(mod->module_core_rw, (unsigned long)mod -
72667 + (unsigned long)mod->module_core_rw,
72668 sizeof(struct module), GFP_KERNEL);
72669
72670 for (i = 1; i < hdr->e_shnum; i++) {
72671 @@ -2076,8 +2135,8 @@ static void kmemleak_load_module(struct module *mod, Elf_Ehdr *hdr,
72672 && strncmp(secstrings + sechdrs[i].sh_name, ".bss", 4) != 0)
72673 continue;
72674
72675 - kmemleak_scan_area(mod->module_core, sechdrs[i].sh_addr -
72676 - (unsigned long)mod->module_core,
72677 + kmemleak_scan_area(mod->module_core_rw, sechdrs[i].sh_addr -
72678 + (unsigned long)mod->module_core_rw,
72679 sechdrs[i].sh_size, GFP_KERNEL);
72680 }
72681 }
72682 @@ -2097,7 +2156,7 @@ static noinline struct module *load_module(void __user *umod,
72683 Elf_Ehdr *hdr;
72684 Elf_Shdr *sechdrs;
72685 char *secstrings, *args, *modmagic, *strtab = NULL;
72686 - char *staging;
72687 + char *staging, *license;
72688 unsigned int i;
72689 unsigned int symindex = 0;
72690 unsigned int strindex = 0;
72691 @@ -2195,6 +2254,14 @@ static noinline struct module *load_module(void __user *umod,
72692 goto free_hdr;
72693 }
72694
72695 + license = get_modinfo(sechdrs, infoindex, "license");
72696 +#ifdef CONFIG_PAX_KERNEXEC_PLUGIN_METHOD_OR
72697 + if (!license || !license_is_gpl_compatible(license)) {
72698 + err -ENOEXEC;
72699 + goto free_hdr;
72700 + }
72701 +#endif
72702 +
72703 modmagic = get_modinfo(sechdrs, infoindex, "vermagic");
72704 /* This is allowed: modprobe --force will invalidate it. */
72705 if (!modmagic) {
72706 @@ -2263,7 +2330,7 @@ static noinline struct module *load_module(void __user *umod,
72707 secstrings, &stroffs, strmap);
72708
72709 /* Do the allocs. */
72710 - ptr = module_alloc_update_bounds(mod->core_size);
72711 + ptr = module_alloc_update_bounds_rw(mod->core_size_rw);
72712 /*
72713 * The pointer to this block is stored in the module structure
72714 * which is inside the block. Just mark it as not being a
72715 @@ -2274,23 +2341,47 @@ static noinline struct module *load_module(void __user *umod,
72716 err = -ENOMEM;
72717 goto free_percpu;
72718 }
72719 - memset(ptr, 0, mod->core_size);
72720 - mod->module_core = ptr;
72721 + memset(ptr, 0, mod->core_size_rw);
72722 + mod->module_core_rw = ptr;
72723
72724 - ptr = module_alloc_update_bounds(mod->init_size);
72725 + ptr = module_alloc_update_bounds_rw(mod->init_size_rw);
72726 /*
72727 * The pointer to this block is stored in the module structure
72728 * which is inside the block. This block doesn't need to be
72729 * scanned as it contains data and code that will be freed
72730 * after the module is initialized.
72731 */
72732 - kmemleak_ignore(ptr);
72733 - if (!ptr && mod->init_size) {
72734 + kmemleak_not_leak(ptr);
72735 + if (!ptr && mod->init_size_rw) {
72736 err = -ENOMEM;
72737 - goto free_core;
72738 + goto free_core_rw;
72739 }
72740 - memset(ptr, 0, mod->init_size);
72741 - mod->module_init = ptr;
72742 + memset(ptr, 0, mod->init_size_rw);
72743 + mod->module_init_rw = ptr;
72744 +
72745 + ptr = module_alloc_update_bounds_rx(mod->core_size_rx);
72746 + kmemleak_not_leak(ptr);
72747 + if (!ptr) {
72748 + err = -ENOMEM;
72749 + goto free_init_rw;
72750 + }
72751 +
72752 + pax_open_kernel();
72753 + memset(ptr, 0, mod->core_size_rx);
72754 + pax_close_kernel();
72755 + mod->module_core_rx = ptr;
72756 +
72757 + ptr = module_alloc_update_bounds_rx(mod->init_size_rx);
72758 + kmemleak_not_leak(ptr);
72759 + if (!ptr && mod->init_size_rx) {
72760 + err = -ENOMEM;
72761 + goto free_core_rx;
72762 + }
72763 +
72764 + pax_open_kernel();
72765 + memset(ptr, 0, mod->init_size_rx);
72766 + pax_close_kernel();
72767 + mod->module_init_rx = ptr;
72768
72769 /* Transfer each section which specifies SHF_ALLOC */
72770 DEBUGP("final section addresses:\n");
72771 @@ -2300,17 +2391,45 @@ static noinline struct module *load_module(void __user *umod,
72772 if (!(sechdrs[i].sh_flags & SHF_ALLOC))
72773 continue;
72774
72775 - if (sechdrs[i].sh_entsize & INIT_OFFSET_MASK)
72776 - dest = mod->module_init
72777 - + (sechdrs[i].sh_entsize & ~INIT_OFFSET_MASK);
72778 - else
72779 - dest = mod->module_core + sechdrs[i].sh_entsize;
72780 + if (sechdrs[i].sh_entsize & INIT_OFFSET_MASK) {
72781 + if ((sechdrs[i].sh_flags & SHF_WRITE) || !(sechdrs[i].sh_flags & SHF_ALLOC))
72782 + dest = mod->module_init_rw
72783 + + (sechdrs[i].sh_entsize & ~INIT_OFFSET_MASK);
72784 + else
72785 + dest = mod->module_init_rx
72786 + + (sechdrs[i].sh_entsize & ~INIT_OFFSET_MASK);
72787 + } else {
72788 + if ((sechdrs[i].sh_flags & SHF_WRITE) || !(sechdrs[i].sh_flags & SHF_ALLOC))
72789 + dest = mod->module_core_rw + sechdrs[i].sh_entsize;
72790 + else
72791 + dest = mod->module_core_rx + sechdrs[i].sh_entsize;
72792 + }
72793
72794 - if (sechdrs[i].sh_type != SHT_NOBITS)
72795 - memcpy(dest, (void *)sechdrs[i].sh_addr,
72796 - sechdrs[i].sh_size);
72797 + if (sechdrs[i].sh_type != SHT_NOBITS) {
72798 +
72799 +#ifdef CONFIG_PAX_KERNEXEC
72800 +#ifdef CONFIG_X86_64
72801 + if ((sechdrs[i].sh_flags & SHF_WRITE) && (sechdrs[i].sh_flags & SHF_EXECINSTR))
72802 + set_memory_x((unsigned long)dest, (sechdrs[i].sh_size + PAGE_SIZE) >> PAGE_SHIFT);
72803 +#endif
72804 + if (!(sechdrs[i].sh_flags & SHF_WRITE) && (sechdrs[i].sh_flags & SHF_ALLOC)) {
72805 + pax_open_kernel();
72806 + memcpy(dest, (void *)sechdrs[i].sh_addr, sechdrs[i].sh_size);
72807 + pax_close_kernel();
72808 + } else
72809 +#endif
72810 +
72811 + memcpy(dest, (void *)sechdrs[i].sh_addr, sechdrs[i].sh_size);
72812 + }
72813 /* Update sh_addr to point to copy in image. */
72814 - sechdrs[i].sh_addr = (unsigned long)dest;
72815 +
72816 +#ifdef CONFIG_PAX_KERNEXEC
72817 + if (sechdrs[i].sh_flags & SHF_EXECINSTR)
72818 + sechdrs[i].sh_addr = ktva_ktla((unsigned long)dest);
72819 + else
72820 +#endif
72821 +
72822 + sechdrs[i].sh_addr = (unsigned long)dest;
72823 DEBUGP("\t0x%lx %s\n", sechdrs[i].sh_addr, secstrings + sechdrs[i].sh_name);
72824 }
72825 /* Module has been moved. */
72826 @@ -2322,7 +2441,7 @@ static noinline struct module *load_module(void __user *umod,
72827 mod->name);
72828 if (!mod->refptr) {
72829 err = -ENOMEM;
72830 - goto free_init;
72831 + goto free_init_rx;
72832 }
72833 #endif
72834 /* Now we've moved module, initialize linked lists, etc. */
72835 @@ -2334,7 +2453,7 @@ static noinline struct module *load_module(void __user *umod,
72836 goto free_unload;
72837
72838 /* Set up license info based on the info section */
72839 - set_license(mod, get_modinfo(sechdrs, infoindex, "license"));
72840 + set_license(mod, license);
72841
72842 /*
72843 * ndiswrapper is under GPL by itself, but loads proprietary modules.
72844 @@ -2351,6 +2470,31 @@ static noinline struct module *load_module(void __user *umod,
72845 /* Set up MODINFO_ATTR fields */
72846 setup_modinfo(mod, sechdrs, infoindex);
72847
72848 + mod->args = args;
72849 +
72850 +#ifdef CONFIG_GRKERNSEC_MODHARDEN
72851 + {
72852 + char *p, *p2;
72853 +
72854 + if (strstr(mod->args, "grsec_modharden_netdev")) {
72855 + 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);
72856 + err = -EPERM;
72857 + goto cleanup;
72858 + } else if ((p = strstr(mod->args, "grsec_modharden_normal"))) {
72859 + p += strlen("grsec_modharden_normal");
72860 + p2 = strstr(p, "_");
72861 + if (p2) {
72862 + *p2 = '\0';
72863 + printk(KERN_ALERT "grsec: denied kernel module auto-load of %.64s by uid %.9s\n", mod->name, p);
72864 + *p2 = '_';
72865 + }
72866 + err = -EPERM;
72867 + goto cleanup;
72868 + }
72869 + }
72870 +#endif
72871 +
72872 +
72873 /* Fix up syms, so that st_value is a pointer to location. */
72874 err = simplify_symbols(sechdrs, symindex, strtab, versindex, pcpuindex,
72875 mod);
72876 @@ -2431,8 +2575,8 @@ static noinline struct module *load_module(void __user *umod,
72877
72878 /* Now do relocations. */
72879 for (i = 1; i < hdr->e_shnum; i++) {
72880 - const char *strtab = (char *)sechdrs[strindex].sh_addr;
72881 unsigned int info = sechdrs[i].sh_info;
72882 + strtab = (char *)sechdrs[strindex].sh_addr;
72883
72884 /* Not a valid relocation section? */
72885 if (info >= hdr->e_shnum)
72886 @@ -2493,16 +2637,15 @@ static noinline struct module *load_module(void __user *umod,
72887 * Do it before processing of module parameters, so the module
72888 * can provide parameter accessor functions of its own.
72889 */
72890 - if (mod->module_init)
72891 - flush_icache_range((unsigned long)mod->module_init,
72892 - (unsigned long)mod->module_init
72893 - + mod->init_size);
72894 - flush_icache_range((unsigned long)mod->module_core,
72895 - (unsigned long)mod->module_core + mod->core_size);
72896 + if (mod->module_init_rx)
72897 + flush_icache_range((unsigned long)mod->module_init_rx,
72898 + (unsigned long)mod->module_init_rx
72899 + + mod->init_size_rx);
72900 + flush_icache_range((unsigned long)mod->module_core_rx,
72901 + (unsigned long)mod->module_core_rx + mod->core_size_rx);
72902
72903 set_fs(old_fs);
72904
72905 - mod->args = args;
72906 if (section_addr(hdr, sechdrs, secstrings, "__obsparm"))
72907 printk(KERN_WARNING "%s: Ignoring obsolete parameters\n",
72908 mod->name);
72909 @@ -2546,12 +2689,16 @@ static noinline struct module *load_module(void __user *umod,
72910 free_unload:
72911 module_unload_free(mod);
72912 #if defined(CONFIG_MODULE_UNLOAD) && defined(CONFIG_SMP)
72913 + free_init_rx:
72914 percpu_modfree(mod->refptr);
72915 - free_init:
72916 #endif
72917 - module_free(mod, mod->module_init);
72918 - free_core:
72919 - module_free(mod, mod->module_core);
72920 + module_free_exec(mod, mod->module_init_rx);
72921 + free_core_rx:
72922 + module_free_exec(mod, mod->module_core_rx);
72923 + free_init_rw:
72924 + module_free(mod, mod->module_init_rw);
72925 + free_core_rw:
72926 + module_free(mod, mod->module_core_rw);
72927 /* mod will be freed with core. Don't access it beyond this line! */
72928 free_percpu:
72929 if (percpu)
72930 @@ -2653,10 +2800,12 @@ SYSCALL_DEFINE3(init_module, void __user *, umod,
72931 mod->symtab = mod->core_symtab;
72932 mod->strtab = mod->core_strtab;
72933 #endif
72934 - module_free(mod, mod->module_init);
72935 - mod->module_init = NULL;
72936 - mod->init_size = 0;
72937 - mod->init_text_size = 0;
72938 + module_free(mod, mod->module_init_rw);
72939 + module_free_exec(mod, mod->module_init_rx);
72940 + mod->module_init_rw = NULL;
72941 + mod->module_init_rx = NULL;
72942 + mod->init_size_rw = 0;
72943 + mod->init_size_rx = 0;
72944 mutex_unlock(&module_mutex);
72945
72946 return 0;
72947 @@ -2687,10 +2836,16 @@ static const char *get_ksymbol(struct module *mod,
72948 unsigned long nextval;
72949
72950 /* At worse, next value is at end of module */
72951 - if (within_module_init(addr, mod))
72952 - nextval = (unsigned long)mod->module_init+mod->init_text_size;
72953 + if (within_module_init_rx(addr, mod))
72954 + nextval = (unsigned long)mod->module_init_rx+mod->init_size_rx;
72955 + else if (within_module_init_rw(addr, mod))
72956 + nextval = (unsigned long)mod->module_init_rw+mod->init_size_rw;
72957 + else if (within_module_core_rx(addr, mod))
72958 + nextval = (unsigned long)mod->module_core_rx+mod->core_size_rx;
72959 + else if (within_module_core_rw(addr, mod))
72960 + nextval = (unsigned long)mod->module_core_rw+mod->core_size_rw;
72961 else
72962 - nextval = (unsigned long)mod->module_core+mod->core_text_size;
72963 + return NULL;
72964
72965 /* Scan for closest preceeding symbol, and next symbol. (ELF
72966 starts real symbols at 1). */
72967 @@ -2936,7 +3091,7 @@ static int m_show(struct seq_file *m, void *p)
72968 char buf[8];
72969
72970 seq_printf(m, "%s %u",
72971 - mod->name, mod->init_size + mod->core_size);
72972 + mod->name, mod->init_size_rx + mod->init_size_rw + mod->core_size_rx + mod->core_size_rw);
72973 print_unload_info(m, mod);
72974
72975 /* Informative for users. */
72976 @@ -2945,7 +3100,7 @@ static int m_show(struct seq_file *m, void *p)
72977 mod->state == MODULE_STATE_COMING ? "Loading":
72978 "Live");
72979 /* Used by oprofile and other similar tools. */
72980 - seq_printf(m, " 0x%p", mod->module_core);
72981 + seq_printf(m, " 0x%p 0x%p", mod->module_core_rx, mod->module_core_rw);
72982
72983 /* Taints info */
72984 if (mod->taints)
72985 @@ -2981,7 +3136,17 @@ static const struct file_operations proc_modules_operations = {
72986
72987 static int __init proc_modules_init(void)
72988 {
72989 +#ifndef CONFIG_GRKERNSEC_HIDESYM
72990 +#ifdef CONFIG_GRKERNSEC_PROC_USER
72991 + proc_create("modules", S_IRUSR, NULL, &proc_modules_operations);
72992 +#elif defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
72993 + proc_create("modules", S_IRUSR | S_IRGRP, NULL, &proc_modules_operations);
72994 +#else
72995 proc_create("modules", 0, NULL, &proc_modules_operations);
72996 +#endif
72997 +#else
72998 + proc_create("modules", S_IRUSR, NULL, &proc_modules_operations);
72999 +#endif
73000 return 0;
73001 }
73002 module_init(proc_modules_init);
73003 @@ -3040,12 +3205,12 @@ struct module *__module_address(unsigned long addr)
73004 {
73005 struct module *mod;
73006
73007 - if (addr < module_addr_min || addr > module_addr_max)
73008 + if ((addr < module_addr_min_rx || addr > module_addr_max_rx) &&
73009 + (addr < module_addr_min_rw || addr > module_addr_max_rw))
73010 return NULL;
73011
73012 list_for_each_entry_rcu(mod, &modules, list)
73013 - if (within_module_core(addr, mod)
73014 - || within_module_init(addr, mod))
73015 + if (within_module_init(addr, mod) || within_module_core(addr, mod))
73016 return mod;
73017 return NULL;
73018 }
73019 @@ -3079,11 +3244,20 @@ bool is_module_text_address(unsigned long addr)
73020 */
73021 struct module *__module_text_address(unsigned long addr)
73022 {
73023 - struct module *mod = __module_address(addr);
73024 + struct module *mod;
73025 +
73026 +#ifdef CONFIG_X86_32
73027 + addr = ktla_ktva(addr);
73028 +#endif
73029 +
73030 + if (addr < module_addr_min_rx || addr > module_addr_max_rx)
73031 + return NULL;
73032 +
73033 + mod = __module_address(addr);
73034 +
73035 if (mod) {
73036 /* Make sure it's within the text section. */
73037 - if (!within(addr, mod->module_init, mod->init_text_size)
73038 - && !within(addr, mod->module_core, mod->core_text_size))
73039 + if (!within_module_init_rx(addr, mod) && !within_module_core_rx(addr, mod))
73040 mod = NULL;
73041 }
73042 return mod;
73043 diff --git a/kernel/mutex-debug.c b/kernel/mutex-debug.c
73044 index ec815a9..fe46e99 100644
73045 --- a/kernel/mutex-debug.c
73046 +++ b/kernel/mutex-debug.c
73047 @@ -49,21 +49,21 @@ void debug_mutex_free_waiter(struct mutex_waiter *waiter)
73048 }
73049
73050 void debug_mutex_add_waiter(struct mutex *lock, struct mutex_waiter *waiter,
73051 - struct thread_info *ti)
73052 + struct task_struct *task)
73053 {
73054 SMP_DEBUG_LOCKS_WARN_ON(!spin_is_locked(&lock->wait_lock));
73055
73056 /* Mark the current thread as blocked on the lock: */
73057 - ti->task->blocked_on = waiter;
73058 + task->blocked_on = waiter;
73059 }
73060
73061 void mutex_remove_waiter(struct mutex *lock, struct mutex_waiter *waiter,
73062 - struct thread_info *ti)
73063 + struct task_struct *task)
73064 {
73065 DEBUG_LOCKS_WARN_ON(list_empty(&waiter->list));
73066 - DEBUG_LOCKS_WARN_ON(waiter->task != ti->task);
73067 - DEBUG_LOCKS_WARN_ON(ti->task->blocked_on != waiter);
73068 - ti->task->blocked_on = NULL;
73069 + DEBUG_LOCKS_WARN_ON(waiter->task != task);
73070 + DEBUG_LOCKS_WARN_ON(task->blocked_on != waiter);
73071 + task->blocked_on = NULL;
73072
73073 list_del_init(&waiter->list);
73074 waiter->task = NULL;
73075 @@ -75,7 +75,7 @@ void debug_mutex_unlock(struct mutex *lock)
73076 return;
73077
73078 DEBUG_LOCKS_WARN_ON(lock->magic != lock);
73079 - DEBUG_LOCKS_WARN_ON(lock->owner != current_thread_info());
73080 + DEBUG_LOCKS_WARN_ON(lock->owner != current);
73081 DEBUG_LOCKS_WARN_ON(!lock->wait_list.prev && !lock->wait_list.next);
73082 mutex_clear_owner(lock);
73083 }
73084 diff --git a/kernel/mutex-debug.h b/kernel/mutex-debug.h
73085 index 6b2d735..372d3c4 100644
73086 --- a/kernel/mutex-debug.h
73087 +++ b/kernel/mutex-debug.h
73088 @@ -20,16 +20,16 @@ extern void debug_mutex_wake_waiter(struct mutex *lock,
73089 extern void debug_mutex_free_waiter(struct mutex_waiter *waiter);
73090 extern void debug_mutex_add_waiter(struct mutex *lock,
73091 struct mutex_waiter *waiter,
73092 - struct thread_info *ti);
73093 + struct task_struct *task);
73094 extern void mutex_remove_waiter(struct mutex *lock, struct mutex_waiter *waiter,
73095 - struct thread_info *ti);
73096 + struct task_struct *task);
73097 extern void debug_mutex_unlock(struct mutex *lock);
73098 extern void debug_mutex_init(struct mutex *lock, const char *name,
73099 struct lock_class_key *key);
73100
73101 static inline void mutex_set_owner(struct mutex *lock)
73102 {
73103 - lock->owner = current_thread_info();
73104 + lock->owner = current;
73105 }
73106
73107 static inline void mutex_clear_owner(struct mutex *lock)
73108 diff --git a/kernel/mutex.c b/kernel/mutex.c
73109 index f85644c..5ee9f77 100644
73110 --- a/kernel/mutex.c
73111 +++ b/kernel/mutex.c
73112 @@ -169,7 +169,7 @@ __mutex_lock_common(struct mutex *lock, long state, unsigned int subclass,
73113 */
73114
73115 for (;;) {
73116 - struct thread_info *owner;
73117 + struct task_struct *owner;
73118
73119 /*
73120 * If we own the BKL, then don't spin. The owner of
73121 @@ -214,7 +214,7 @@ __mutex_lock_common(struct mutex *lock, long state, unsigned int subclass,
73122 spin_lock_mutex(&lock->wait_lock, flags);
73123
73124 debug_mutex_lock_common(lock, &waiter);
73125 - debug_mutex_add_waiter(lock, &waiter, task_thread_info(task));
73126 + debug_mutex_add_waiter(lock, &waiter, task);
73127
73128 /* add waiting tasks to the end of the waitqueue (FIFO): */
73129 list_add_tail(&waiter.list, &lock->wait_list);
73130 @@ -243,8 +243,7 @@ __mutex_lock_common(struct mutex *lock, long state, unsigned int subclass,
73131 * TASK_UNINTERRUPTIBLE case.)
73132 */
73133 if (unlikely(signal_pending_state(state, task))) {
73134 - mutex_remove_waiter(lock, &waiter,
73135 - task_thread_info(task));
73136 + mutex_remove_waiter(lock, &waiter, task);
73137 mutex_release(&lock->dep_map, 1, ip);
73138 spin_unlock_mutex(&lock->wait_lock, flags);
73139
73140 @@ -265,7 +264,7 @@ __mutex_lock_common(struct mutex *lock, long state, unsigned int subclass,
73141 done:
73142 lock_acquired(&lock->dep_map, ip);
73143 /* got the lock - rejoice! */
73144 - mutex_remove_waiter(lock, &waiter, current_thread_info());
73145 + mutex_remove_waiter(lock, &waiter, task);
73146 mutex_set_owner(lock);
73147
73148 /* set it to 0 if there are no waiters left: */
73149 diff --git a/kernel/mutex.h b/kernel/mutex.h
73150 index 67578ca..4115fbf 100644
73151 --- a/kernel/mutex.h
73152 +++ b/kernel/mutex.h
73153 @@ -19,7 +19,7 @@
73154 #ifdef CONFIG_SMP
73155 static inline void mutex_set_owner(struct mutex *lock)
73156 {
73157 - lock->owner = current_thread_info();
73158 + lock->owner = current;
73159 }
73160
73161 static inline void mutex_clear_owner(struct mutex *lock)
73162 diff --git a/kernel/panic.c b/kernel/panic.c
73163 index 96b45d0..ff70a46 100644
73164 --- a/kernel/panic.c
73165 +++ b/kernel/panic.c
73166 @@ -71,7 +71,11 @@ NORET_TYPE void panic(const char * fmt, ...)
73167 va_end(args);
73168 printk(KERN_EMERG "Kernel panic - not syncing: %s\n",buf);
73169 #ifdef CONFIG_DEBUG_BUGVERBOSE
73170 - dump_stack();
73171 + /*
73172 + * Avoid nested stack-dumping if a panic occurs during oops processing
73173 + */
73174 + if (!oops_in_progress)
73175 + dump_stack();
73176 #endif
73177
73178 /*
73179 @@ -352,7 +356,7 @@ static void warn_slowpath_common(const char *file, int line, void *caller, struc
73180 const char *board;
73181
73182 printk(KERN_WARNING "------------[ cut here ]------------\n");
73183 - printk(KERN_WARNING "WARNING: at %s:%d %pS()\n", file, line, caller);
73184 + printk(KERN_WARNING "WARNING: at %s:%d %pA()\n", file, line, caller);
73185 board = dmi_get_system_info(DMI_PRODUCT_NAME);
73186 if (board)
73187 printk(KERN_WARNING "Hardware name: %s\n", board);
73188 @@ -392,7 +396,8 @@ EXPORT_SYMBOL(warn_slowpath_null);
73189 */
73190 void __stack_chk_fail(void)
73191 {
73192 - panic("stack-protector: Kernel stack is corrupted in: %p\n",
73193 + dump_stack();
73194 + panic("stack-protector: Kernel stack is corrupted in: %pA\n",
73195 __builtin_return_address(0));
73196 }
73197 EXPORT_SYMBOL(__stack_chk_fail);
73198 diff --git a/kernel/params.c b/kernel/params.c
73199 index d656c27..21e452c 100644
73200 --- a/kernel/params.c
73201 +++ b/kernel/params.c
73202 @@ -725,7 +725,7 @@ static ssize_t module_attr_store(struct kobject *kobj,
73203 return ret;
73204 }
73205
73206 -static struct sysfs_ops module_sysfs_ops = {
73207 +static const struct sysfs_ops module_sysfs_ops = {
73208 .show = module_attr_show,
73209 .store = module_attr_store,
73210 };
73211 @@ -739,7 +739,7 @@ static int uevent_filter(struct kset *kset, struct kobject *kobj)
73212 return 0;
73213 }
73214
73215 -static struct kset_uevent_ops module_uevent_ops = {
73216 +static const struct kset_uevent_ops module_uevent_ops = {
73217 .filter = uevent_filter,
73218 };
73219
73220 diff --git a/kernel/perf_event.c b/kernel/perf_event.c
73221 index 37ebc14..9c121d9 100644
73222 --- a/kernel/perf_event.c
73223 +++ b/kernel/perf_event.c
73224 @@ -77,7 +77,7 @@ int sysctl_perf_event_mlock __read_mostly = 516; /* 'free' kb per user */
73225 */
73226 int sysctl_perf_event_sample_rate __read_mostly = 100000;
73227
73228 -static atomic64_t perf_event_id;
73229 +static atomic64_unchecked_t perf_event_id;
73230
73231 /*
73232 * Lock for (sysadmin-configurable) event reservations:
73233 @@ -1094,9 +1094,9 @@ static void __perf_event_sync_stat(struct perf_event *event,
73234 * In order to keep per-task stats reliable we need to flip the event
73235 * values when we flip the contexts.
73236 */
73237 - value = atomic64_read(&next_event->count);
73238 - value = atomic64_xchg(&event->count, value);
73239 - atomic64_set(&next_event->count, value);
73240 + value = atomic64_read_unchecked(&next_event->count);
73241 + value = atomic64_xchg_unchecked(&event->count, value);
73242 + atomic64_set_unchecked(&next_event->count, value);
73243
73244 swap(event->total_time_enabled, next_event->total_time_enabled);
73245 swap(event->total_time_running, next_event->total_time_running);
73246 @@ -1552,7 +1552,7 @@ static u64 perf_event_read(struct perf_event *event)
73247 update_event_times(event);
73248 }
73249
73250 - return atomic64_read(&event->count);
73251 + return atomic64_read_unchecked(&event->count);
73252 }
73253
73254 /*
73255 @@ -1790,11 +1790,11 @@ static int perf_event_read_group(struct perf_event *event,
73256 values[n++] = 1 + leader->nr_siblings;
73257 if (read_format & PERF_FORMAT_TOTAL_TIME_ENABLED) {
73258 values[n++] = leader->total_time_enabled +
73259 - atomic64_read(&leader->child_total_time_enabled);
73260 + atomic64_read_unchecked(&leader->child_total_time_enabled);
73261 }
73262 if (read_format & PERF_FORMAT_TOTAL_TIME_RUNNING) {
73263 values[n++] = leader->total_time_running +
73264 - atomic64_read(&leader->child_total_time_running);
73265 + atomic64_read_unchecked(&leader->child_total_time_running);
73266 }
73267
73268 size = n * sizeof(u64);
73269 @@ -1829,11 +1829,11 @@ static int perf_event_read_one(struct perf_event *event,
73270 values[n++] = perf_event_read_value(event);
73271 if (read_format & PERF_FORMAT_TOTAL_TIME_ENABLED) {
73272 values[n++] = event->total_time_enabled +
73273 - atomic64_read(&event->child_total_time_enabled);
73274 + atomic64_read_unchecked(&event->child_total_time_enabled);
73275 }
73276 if (read_format & PERF_FORMAT_TOTAL_TIME_RUNNING) {
73277 values[n++] = event->total_time_running +
73278 - atomic64_read(&event->child_total_time_running);
73279 + atomic64_read_unchecked(&event->child_total_time_running);
73280 }
73281 if (read_format & PERF_FORMAT_ID)
73282 values[n++] = primary_event_id(event);
73283 @@ -1903,7 +1903,7 @@ static unsigned int perf_poll(struct file *file, poll_table *wait)
73284 static void perf_event_reset(struct perf_event *event)
73285 {
73286 (void)perf_event_read(event);
73287 - atomic64_set(&event->count, 0);
73288 + atomic64_set_unchecked(&event->count, 0);
73289 perf_event_update_userpage(event);
73290 }
73291
73292 @@ -2079,15 +2079,15 @@ void perf_event_update_userpage(struct perf_event *event)
73293 ++userpg->lock;
73294 barrier();
73295 userpg->index = perf_event_index(event);
73296 - userpg->offset = atomic64_read(&event->count);
73297 + userpg->offset = atomic64_read_unchecked(&event->count);
73298 if (event->state == PERF_EVENT_STATE_ACTIVE)
73299 - userpg->offset -= atomic64_read(&event->hw.prev_count);
73300 + userpg->offset -= atomic64_read_unchecked(&event->hw.prev_count);
73301
73302 userpg->time_enabled = event->total_time_enabled +
73303 - atomic64_read(&event->child_total_time_enabled);
73304 + atomic64_read_unchecked(&event->child_total_time_enabled);
73305
73306 userpg->time_running = event->total_time_running +
73307 - atomic64_read(&event->child_total_time_running);
73308 + atomic64_read_unchecked(&event->child_total_time_running);
73309
73310 barrier();
73311 ++userpg->lock;
73312 @@ -2903,14 +2903,14 @@ static void perf_output_read_one(struct perf_output_handle *handle,
73313 u64 values[4];
73314 int n = 0;
73315
73316 - values[n++] = atomic64_read(&event->count);
73317 + values[n++] = atomic64_read_unchecked(&event->count);
73318 if (read_format & PERF_FORMAT_TOTAL_TIME_ENABLED) {
73319 values[n++] = event->total_time_enabled +
73320 - atomic64_read(&event->child_total_time_enabled);
73321 + atomic64_read_unchecked(&event->child_total_time_enabled);
73322 }
73323 if (read_format & PERF_FORMAT_TOTAL_TIME_RUNNING) {
73324 values[n++] = event->total_time_running +
73325 - atomic64_read(&event->child_total_time_running);
73326 + atomic64_read_unchecked(&event->child_total_time_running);
73327 }
73328 if (read_format & PERF_FORMAT_ID)
73329 values[n++] = primary_event_id(event);
73330 @@ -2940,7 +2940,7 @@ static void perf_output_read_group(struct perf_output_handle *handle,
73331 if (leader != event)
73332 leader->pmu->read(leader);
73333
73334 - values[n++] = atomic64_read(&leader->count);
73335 + values[n++] = atomic64_read_unchecked(&leader->count);
73336 if (read_format & PERF_FORMAT_ID)
73337 values[n++] = primary_event_id(leader);
73338
73339 @@ -2952,7 +2952,7 @@ static void perf_output_read_group(struct perf_output_handle *handle,
73340 if (sub != event)
73341 sub->pmu->read(sub);
73342
73343 - values[n++] = atomic64_read(&sub->count);
73344 + values[n++] = atomic64_read_unchecked(&sub->count);
73345 if (read_format & PERF_FORMAT_ID)
73346 values[n++] = primary_event_id(sub);
73347
73348 @@ -3525,12 +3525,12 @@ static void perf_event_mmap_event(struct perf_mmap_event *mmap_event)
73349 * need to add enough zero bytes after the string to handle
73350 * the 64bit alignment we do later.
73351 */
73352 - buf = kzalloc(PATH_MAX + sizeof(u64), GFP_KERNEL);
73353 + buf = kzalloc(PATH_MAX, GFP_KERNEL);
73354 if (!buf) {
73355 name = strncpy(tmp, "//enomem", sizeof(tmp));
73356 goto got_name;
73357 }
73358 - name = d_path(&file->f_path, buf, PATH_MAX);
73359 + name = d_path(&file->f_path, buf, PATH_MAX - sizeof(u64));
73360 if (IS_ERR(name)) {
73361 name = strncpy(tmp, "//toolong", sizeof(tmp));
73362 goto got_name;
73363 @@ -3783,7 +3783,7 @@ static void perf_swevent_add(struct perf_event *event, u64 nr,
73364 {
73365 struct hw_perf_event *hwc = &event->hw;
73366
73367 - atomic64_add(nr, &event->count);
73368 + atomic64_add_unchecked(nr, &event->count);
73369
73370 if (!hwc->sample_period)
73371 return;
73372 @@ -4040,9 +4040,9 @@ static void cpu_clock_perf_event_update(struct perf_event *event)
73373 u64 now;
73374
73375 now = cpu_clock(cpu);
73376 - prev = atomic64_read(&event->hw.prev_count);
73377 - atomic64_set(&event->hw.prev_count, now);
73378 - atomic64_add(now - prev, &event->count);
73379 + prev = atomic64_read_unchecked(&event->hw.prev_count);
73380 + atomic64_set_unchecked(&event->hw.prev_count, now);
73381 + atomic64_add_unchecked(now - prev, &event->count);
73382 }
73383
73384 static int cpu_clock_perf_event_enable(struct perf_event *event)
73385 @@ -4050,7 +4050,7 @@ static int cpu_clock_perf_event_enable(struct perf_event *event)
73386 struct hw_perf_event *hwc = &event->hw;
73387 int cpu = raw_smp_processor_id();
73388
73389 - atomic64_set(&hwc->prev_count, cpu_clock(cpu));
73390 + atomic64_set_unchecked(&hwc->prev_count, cpu_clock(cpu));
73391 perf_swevent_start_hrtimer(event);
73392
73393 return 0;
73394 @@ -4082,9 +4082,9 @@ static void task_clock_perf_event_update(struct perf_event *event, u64 now)
73395 u64 prev;
73396 s64 delta;
73397
73398 - prev = atomic64_xchg(&event->hw.prev_count, now);
73399 + prev = atomic64_xchg_unchecked(&event->hw.prev_count, now);
73400 delta = now - prev;
73401 - atomic64_add(delta, &event->count);
73402 + atomic64_add_unchecked(delta, &event->count);
73403 }
73404
73405 static int task_clock_perf_event_enable(struct perf_event *event)
73406 @@ -4094,7 +4094,7 @@ static int task_clock_perf_event_enable(struct perf_event *event)
73407
73408 now = event->ctx->time;
73409
73410 - atomic64_set(&hwc->prev_count, now);
73411 + atomic64_set_unchecked(&hwc->prev_count, now);
73412
73413 perf_swevent_start_hrtimer(event);
73414
73415 @@ -4289,7 +4289,7 @@ perf_event_alloc(struct perf_event_attr *attr,
73416 event->parent = parent_event;
73417
73418 event->ns = get_pid_ns(current->nsproxy->pid_ns);
73419 - event->id = atomic64_inc_return(&perf_event_id);
73420 + event->id = atomic64_inc_return_unchecked(&perf_event_id);
73421
73422 event->state = PERF_EVENT_STATE_INACTIVE;
73423
73424 @@ -4720,15 +4720,15 @@ static void sync_child_event(struct perf_event *child_event,
73425 if (child_event->attr.inherit_stat)
73426 perf_event_read_event(child_event, child);
73427
73428 - child_val = atomic64_read(&child_event->count);
73429 + child_val = atomic64_read_unchecked(&child_event->count);
73430
73431 /*
73432 * Add back the child's count to the parent's count:
73433 */
73434 - atomic64_add(child_val, &parent_event->count);
73435 - atomic64_add(child_event->total_time_enabled,
73436 + atomic64_add_unchecked(child_val, &parent_event->count);
73437 + atomic64_add_unchecked(child_event->total_time_enabled,
73438 &parent_event->child_total_time_enabled);
73439 - atomic64_add(child_event->total_time_running,
73440 + atomic64_add_unchecked(child_event->total_time_running,
73441 &parent_event->child_total_time_running);
73442
73443 /*
73444 diff --git a/kernel/pid.c b/kernel/pid.c
73445 index fce7198..4f23a7e 100644
73446 --- a/kernel/pid.c
73447 +++ b/kernel/pid.c
73448 @@ -33,6 +33,7 @@
73449 #include <linux/rculist.h>
73450 #include <linux/bootmem.h>
73451 #include <linux/hash.h>
73452 +#include <linux/security.h>
73453 #include <linux/pid_namespace.h>
73454 #include <linux/init_task.h>
73455 #include <linux/syscalls.h>
73456 @@ -45,7 +46,7 @@ struct pid init_struct_pid = INIT_STRUCT_PID;
73457
73458 int pid_max = PID_MAX_DEFAULT;
73459
73460 -#define RESERVED_PIDS 300
73461 +#define RESERVED_PIDS 500
73462
73463 int pid_max_min = RESERVED_PIDS + 1;
73464 int pid_max_max = PID_MAX_LIMIT;
73465 @@ -383,7 +384,14 @@ EXPORT_SYMBOL(pid_task);
73466 */
73467 struct task_struct *find_task_by_pid_ns(pid_t nr, struct pid_namespace *ns)
73468 {
73469 - return pid_task(find_pid_ns(nr, ns), PIDTYPE_PID);
73470 + struct task_struct *task;
73471 +
73472 + task = pid_task(find_pid_ns(nr, ns), PIDTYPE_PID);
73473 +
73474 + if (gr_pid_is_chrooted(task))
73475 + return NULL;
73476 +
73477 + return task;
73478 }
73479
73480 struct task_struct *find_task_by_vpid(pid_t vnr)
73481 @@ -391,6 +399,11 @@ struct task_struct *find_task_by_vpid(pid_t vnr)
73482 return find_task_by_pid_ns(vnr, current->nsproxy->pid_ns);
73483 }
73484
73485 +struct task_struct *find_task_by_vpid_unrestricted(pid_t vnr)
73486 +{
73487 + return pid_task(find_pid_ns(vnr, current->nsproxy->pid_ns), PIDTYPE_PID);
73488 +}
73489 +
73490 struct pid *get_task_pid(struct task_struct *task, enum pid_type type)
73491 {
73492 struct pid *pid;
73493 diff --git a/kernel/posix-cpu-timers.c b/kernel/posix-cpu-timers.c
73494 index 5c9dc22..d271117 100644
73495 --- a/kernel/posix-cpu-timers.c
73496 +++ b/kernel/posix-cpu-timers.c
73497 @@ -6,6 +6,7 @@
73498 #include <linux/posix-timers.h>
73499 #include <linux/errno.h>
73500 #include <linux/math64.h>
73501 +#include <linux/security.h>
73502 #include <asm/uaccess.h>
73503 #include <linux/kernel_stat.h>
73504 #include <trace/events/timer.h>
73505 @@ -1697,7 +1698,7 @@ static long thread_cpu_nsleep_restart(struct restart_block *restart_block)
73506
73507 static __init int init_posix_cpu_timers(void)
73508 {
73509 - struct k_clock process = {
73510 + static struct k_clock process = {
73511 .clock_getres = process_cpu_clock_getres,
73512 .clock_get = process_cpu_clock_get,
73513 .clock_set = do_posix_clock_nosettime,
73514 @@ -1705,7 +1706,7 @@ static __init int init_posix_cpu_timers(void)
73515 .nsleep = process_cpu_nsleep,
73516 .nsleep_restart = process_cpu_nsleep_restart,
73517 };
73518 - struct k_clock thread = {
73519 + static struct k_clock thread = {
73520 .clock_getres = thread_cpu_clock_getres,
73521 .clock_get = thread_cpu_clock_get,
73522 .clock_set = do_posix_clock_nosettime,
73523 diff --git a/kernel/posix-timers.c b/kernel/posix-timers.c
73524 index 5e76d22..cf1baeb 100644
73525 --- a/kernel/posix-timers.c
73526 +++ b/kernel/posix-timers.c
73527 @@ -42,6 +42,7 @@
73528 #include <linux/compiler.h>
73529 #include <linux/idr.h>
73530 #include <linux/posix-timers.h>
73531 +#include <linux/grsecurity.h>
73532 #include <linux/syscalls.h>
73533 #include <linux/wait.h>
73534 #include <linux/workqueue.h>
73535 @@ -131,7 +132,7 @@ static DEFINE_SPINLOCK(idr_lock);
73536 * which we beg off on and pass to do_sys_settimeofday().
73537 */
73538
73539 -static struct k_clock posix_clocks[MAX_CLOCKS];
73540 +static struct k_clock *posix_clocks[MAX_CLOCKS];
73541
73542 /*
73543 * These ones are defined below.
73544 @@ -157,8 +158,8 @@ static inline void unlock_timer(struct k_itimer *timr, unsigned long flags)
73545 */
73546 #define CLOCK_DISPATCH(clock, call, arglist) \
73547 ((clock) < 0 ? posix_cpu_##call arglist : \
73548 - (posix_clocks[clock].call != NULL \
73549 - ? (*posix_clocks[clock].call) arglist : common_##call arglist))
73550 + (posix_clocks[clock]->call != NULL \
73551 + ? (*posix_clocks[clock]->call) arglist : common_##call arglist))
73552
73553 /*
73554 * Default clock hook functions when the struct k_clock passed
73555 @@ -172,7 +173,7 @@ static inline int common_clock_getres(const clockid_t which_clock,
73556 struct timespec *tp)
73557 {
73558 tp->tv_sec = 0;
73559 - tp->tv_nsec = posix_clocks[which_clock].res;
73560 + tp->tv_nsec = posix_clocks[which_clock]->res;
73561 return 0;
73562 }
73563
73564 @@ -217,9 +218,11 @@ static inline int invalid_clockid(const clockid_t which_clock)
73565 return 0;
73566 if ((unsigned) which_clock >= MAX_CLOCKS)
73567 return 1;
73568 - if (posix_clocks[which_clock].clock_getres != NULL)
73569 + if (posix_clocks[which_clock] == NULL)
73570 return 0;
73571 - if (posix_clocks[which_clock].res != 0)
73572 + if (posix_clocks[which_clock]->clock_getres != NULL)
73573 + return 0;
73574 + if (posix_clocks[which_clock]->res != 0)
73575 return 0;
73576 return 1;
73577 }
73578 @@ -266,29 +269,29 @@ int posix_get_coarse_res(const clockid_t which_clock, struct timespec *tp)
73579 */
73580 static __init int init_posix_timers(void)
73581 {
73582 - struct k_clock clock_realtime = {
73583 + static struct k_clock clock_realtime = {
73584 .clock_getres = hrtimer_get_res,
73585 };
73586 - struct k_clock clock_monotonic = {
73587 + static struct k_clock clock_monotonic = {
73588 .clock_getres = hrtimer_get_res,
73589 .clock_get = posix_ktime_get_ts,
73590 .clock_set = do_posix_clock_nosettime,
73591 };
73592 - struct k_clock clock_monotonic_raw = {
73593 + static struct k_clock clock_monotonic_raw = {
73594 .clock_getres = hrtimer_get_res,
73595 .clock_get = posix_get_monotonic_raw,
73596 .clock_set = do_posix_clock_nosettime,
73597 .timer_create = no_timer_create,
73598 .nsleep = no_nsleep,
73599 };
73600 - struct k_clock clock_realtime_coarse = {
73601 + static struct k_clock clock_realtime_coarse = {
73602 .clock_getres = posix_get_coarse_res,
73603 .clock_get = posix_get_realtime_coarse,
73604 .clock_set = do_posix_clock_nosettime,
73605 .timer_create = no_timer_create,
73606 .nsleep = no_nsleep,
73607 };
73608 - struct k_clock clock_monotonic_coarse = {
73609 + static struct k_clock clock_monotonic_coarse = {
73610 .clock_getres = posix_get_coarse_res,
73611 .clock_get = posix_get_monotonic_coarse,
73612 .clock_set = do_posix_clock_nosettime,
73613 @@ -296,6 +299,8 @@ static __init int init_posix_timers(void)
73614 .nsleep = no_nsleep,
73615 };
73616
73617 + pax_track_stack();
73618 +
73619 register_posix_clock(CLOCK_REALTIME, &clock_realtime);
73620 register_posix_clock(CLOCK_MONOTONIC, &clock_monotonic);
73621 register_posix_clock(CLOCK_MONOTONIC_RAW, &clock_monotonic_raw);
73622 @@ -484,7 +489,7 @@ void register_posix_clock(const clockid_t clock_id, struct k_clock *new_clock)
73623 return;
73624 }
73625
73626 - posix_clocks[clock_id] = *new_clock;
73627 + posix_clocks[clock_id] = new_clock;
73628 }
73629 EXPORT_SYMBOL_GPL(register_posix_clock);
73630
73631 @@ -948,6 +953,13 @@ SYSCALL_DEFINE2(clock_settime, const clockid_t, which_clock,
73632 if (copy_from_user(&new_tp, tp, sizeof (*tp)))
73633 return -EFAULT;
73634
73635 + /* only the CLOCK_REALTIME clock can be set, all other clocks
73636 + have their clock_set fptr set to a nosettime dummy function
73637 + CLOCK_REALTIME has a NULL clock_set fptr which causes it to
73638 + call common_clock_set, which calls do_sys_settimeofday, which
73639 + we hook
73640 + */
73641 +
73642 return CLOCK_DISPATCH(which_clock, clock_set, (which_clock, &new_tp));
73643 }
73644
73645 diff --git a/kernel/power/hibernate.c b/kernel/power/hibernate.c
73646 index 04a9e90..bc355aa 100644
73647 --- a/kernel/power/hibernate.c
73648 +++ b/kernel/power/hibernate.c
73649 @@ -48,14 +48,14 @@ enum {
73650
73651 static int hibernation_mode = HIBERNATION_SHUTDOWN;
73652
73653 -static struct platform_hibernation_ops *hibernation_ops;
73654 +static const struct platform_hibernation_ops *hibernation_ops;
73655
73656 /**
73657 * hibernation_set_ops - set the global hibernate operations
73658 * @ops: the hibernation operations to use in subsequent hibernation transitions
73659 */
73660
73661 -void hibernation_set_ops(struct platform_hibernation_ops *ops)
73662 +void hibernation_set_ops(const struct platform_hibernation_ops *ops)
73663 {
73664 if (ops && !(ops->begin && ops->end && ops->pre_snapshot
73665 && ops->prepare && ops->finish && ops->enter && ops->pre_restore
73666 diff --git a/kernel/power/poweroff.c b/kernel/power/poweroff.c
73667 index e8b3370..484c2e4 100644
73668 --- a/kernel/power/poweroff.c
73669 +++ b/kernel/power/poweroff.c
73670 @@ -37,7 +37,7 @@ static struct sysrq_key_op sysrq_poweroff_op = {
73671 .enable_mask = SYSRQ_ENABLE_BOOT,
73672 };
73673
73674 -static int pm_sysrq_init(void)
73675 +static int __init pm_sysrq_init(void)
73676 {
73677 register_sysrq_key('o', &sysrq_poweroff_op);
73678 return 0;
73679 diff --git a/kernel/power/process.c b/kernel/power/process.c
73680 index e7cd671..56d5f459 100644
73681 --- a/kernel/power/process.c
73682 +++ b/kernel/power/process.c
73683 @@ -37,12 +37,15 @@ static int try_to_freeze_tasks(bool sig_only)
73684 struct timeval start, end;
73685 u64 elapsed_csecs64;
73686 unsigned int elapsed_csecs;
73687 + bool timedout = false;
73688
73689 do_gettimeofday(&start);
73690
73691 end_time = jiffies + TIMEOUT;
73692 do {
73693 todo = 0;
73694 + if (time_after(jiffies, end_time))
73695 + timedout = true;
73696 read_lock(&tasklist_lock);
73697 do_each_thread(g, p) {
73698 if (frozen(p) || !freezeable(p))
73699 @@ -57,15 +60,17 @@ static int try_to_freeze_tasks(bool sig_only)
73700 * It is "frozen enough". If the task does wake
73701 * up, it will immediately call try_to_freeze.
73702 */
73703 - if (!task_is_stopped_or_traced(p) &&
73704 - !freezer_should_skip(p))
73705 + if (!task_is_stopped_or_traced(p) && !freezer_should_skip(p)) {
73706 todo++;
73707 + if (timedout) {
73708 + printk(KERN_ERR "Task refusing to freeze:\n");
73709 + sched_show_task(p);
73710 + }
73711 + }
73712 } while_each_thread(g, p);
73713 read_unlock(&tasklist_lock);
73714 yield(); /* Yield is okay here */
73715 - if (time_after(jiffies, end_time))
73716 - break;
73717 - } while (todo);
73718 + } while (todo && !timedout);
73719
73720 do_gettimeofday(&end);
73721 elapsed_csecs64 = timeval_to_ns(&end) - timeval_to_ns(&start);
73722 diff --git a/kernel/power/suspend.c b/kernel/power/suspend.c
73723 index 40dd021..fb30ceb 100644
73724 --- a/kernel/power/suspend.c
73725 +++ b/kernel/power/suspend.c
73726 @@ -23,13 +23,13 @@ const char *const pm_states[PM_SUSPEND_MAX] = {
73727 [PM_SUSPEND_MEM] = "mem",
73728 };
73729
73730 -static struct platform_suspend_ops *suspend_ops;
73731 +static const struct platform_suspend_ops *suspend_ops;
73732
73733 /**
73734 * suspend_set_ops - Set the global suspend method table.
73735 * @ops: Pointer to ops structure.
73736 */
73737 -void suspend_set_ops(struct platform_suspend_ops *ops)
73738 +void suspend_set_ops(const struct platform_suspend_ops *ops)
73739 {
73740 mutex_lock(&pm_mutex);
73741 suspend_ops = ops;
73742 diff --git a/kernel/printk.c b/kernel/printk.c
73743 index 4cade47..4d17900 100644
73744 --- a/kernel/printk.c
73745 +++ b/kernel/printk.c
73746 @@ -33,6 +33,7 @@
73747 #include <linux/bootmem.h>
73748 #include <linux/syscalls.h>
73749 #include <linux/kexec.h>
73750 +#include <linux/syslog.h>
73751
73752 #include <asm/uaccess.h>
73753
73754 @@ -256,38 +257,30 @@ static inline void boot_delay_msec(void)
73755 }
73756 #endif
73757
73758 -/*
73759 - * Commands to do_syslog:
73760 - *
73761 - * 0 -- Close the log. Currently a NOP.
73762 - * 1 -- Open the log. Currently a NOP.
73763 - * 2 -- Read from the log.
73764 - * 3 -- Read all messages remaining in the ring buffer.
73765 - * 4 -- Read and clear all messages remaining in the ring buffer
73766 - * 5 -- Clear ring buffer.
73767 - * 6 -- Disable printk's to console
73768 - * 7 -- Enable printk's to console
73769 - * 8 -- Set level of messages printed to console
73770 - * 9 -- Return number of unread characters in the log buffer
73771 - * 10 -- Return size of the log buffer
73772 - */
73773 -int do_syslog(int type, char __user *buf, int len)
73774 +int do_syslog(int type, char __user *buf, int len, bool from_file)
73775 {
73776 unsigned i, j, limit, count;
73777 int do_clear = 0;
73778 char c;
73779 int error = 0;
73780
73781 - error = security_syslog(type);
73782 +#ifdef CONFIG_GRKERNSEC_DMESG
73783 + if (grsec_enable_dmesg &&
73784 + (!from_file || (from_file && type == SYSLOG_ACTION_OPEN)) &&
73785 + !capable(CAP_SYS_ADMIN))
73786 + return -EPERM;
73787 +#endif
73788 +
73789 + error = security_syslog(type, from_file);
73790 if (error)
73791 return error;
73792
73793 switch (type) {
73794 - case 0: /* Close log */
73795 + case SYSLOG_ACTION_CLOSE: /* Close log */
73796 break;
73797 - case 1: /* Open log */
73798 + case SYSLOG_ACTION_OPEN: /* Open log */
73799 break;
73800 - case 2: /* Read from log */
73801 + case SYSLOG_ACTION_READ: /* Read from log */
73802 error = -EINVAL;
73803 if (!buf || len < 0)
73804 goto out;
73805 @@ -318,10 +311,12 @@ int do_syslog(int type, char __user *buf, int len)
73806 if (!error)
73807 error = i;
73808 break;
73809 - case 4: /* Read/clear last kernel messages */
73810 + /* Read/clear last kernel messages */
73811 + case SYSLOG_ACTION_READ_CLEAR:
73812 do_clear = 1;
73813 /* FALL THRU */
73814 - case 3: /* Read last kernel messages */
73815 + /* Read last kernel messages */
73816 + case SYSLOG_ACTION_READ_ALL:
73817 error = -EINVAL;
73818 if (!buf || len < 0)
73819 goto out;
73820 @@ -374,21 +369,25 @@ int do_syslog(int type, char __user *buf, int len)
73821 }
73822 }
73823 break;
73824 - case 5: /* Clear ring buffer */
73825 + /* Clear ring buffer */
73826 + case SYSLOG_ACTION_CLEAR:
73827 logged_chars = 0;
73828 break;
73829 - case 6: /* Disable logging to console */
73830 + /* Disable logging to console */
73831 + case SYSLOG_ACTION_CONSOLE_OFF:
73832 if (saved_console_loglevel == -1)
73833 saved_console_loglevel = console_loglevel;
73834 console_loglevel = minimum_console_loglevel;
73835 break;
73836 - case 7: /* Enable logging to console */
73837 + /* Enable logging to console */
73838 + case SYSLOG_ACTION_CONSOLE_ON:
73839 if (saved_console_loglevel != -1) {
73840 console_loglevel = saved_console_loglevel;
73841 saved_console_loglevel = -1;
73842 }
73843 break;
73844 - case 8: /* Set level of messages printed to console */
73845 + /* Set level of messages printed to console */
73846 + case SYSLOG_ACTION_CONSOLE_LEVEL:
73847 error = -EINVAL;
73848 if (len < 1 || len > 8)
73849 goto out;
73850 @@ -399,10 +398,12 @@ int do_syslog(int type, char __user *buf, int len)
73851 saved_console_loglevel = -1;
73852 error = 0;
73853 break;
73854 - case 9: /* Number of chars in the log buffer */
73855 + /* Number of chars in the log buffer */
73856 + case SYSLOG_ACTION_SIZE_UNREAD:
73857 error = log_end - log_start;
73858 break;
73859 - case 10: /* Size of the log buffer */
73860 + /* Size of the log buffer */
73861 + case SYSLOG_ACTION_SIZE_BUFFER:
73862 error = log_buf_len;
73863 break;
73864 default:
73865 @@ -415,7 +416,7 @@ out:
73866
73867 SYSCALL_DEFINE3(syslog, int, type, char __user *, buf, int, len)
73868 {
73869 - return do_syslog(type, buf, len);
73870 + return do_syslog(type, buf, len, SYSLOG_FROM_CALL);
73871 }
73872
73873 /*
73874 diff --git a/kernel/profile.c b/kernel/profile.c
73875 index dfadc5b..7f59404 100644
73876 --- a/kernel/profile.c
73877 +++ b/kernel/profile.c
73878 @@ -39,7 +39,7 @@ struct profile_hit {
73879 /* Oprofile timer tick hook */
73880 static int (*timer_hook)(struct pt_regs *) __read_mostly;
73881
73882 -static atomic_t *prof_buffer;
73883 +static atomic_unchecked_t *prof_buffer;
73884 static unsigned long prof_len, prof_shift;
73885
73886 int prof_on __read_mostly;
73887 @@ -283,7 +283,7 @@ static void profile_flip_buffers(void)
73888 hits[i].pc = 0;
73889 continue;
73890 }
73891 - atomic_add(hits[i].hits, &prof_buffer[hits[i].pc]);
73892 + atomic_add_unchecked(hits[i].hits, &prof_buffer[hits[i].pc]);
73893 hits[i].hits = hits[i].pc = 0;
73894 }
73895 }
73896 @@ -346,9 +346,9 @@ void profile_hits(int type, void *__pc, unsigned int nr_hits)
73897 * Add the current hit(s) and flush the write-queue out
73898 * to the global buffer:
73899 */
73900 - atomic_add(nr_hits, &prof_buffer[pc]);
73901 + atomic_add_unchecked(nr_hits, &prof_buffer[pc]);
73902 for (i = 0; i < NR_PROFILE_HIT; ++i) {
73903 - atomic_add(hits[i].hits, &prof_buffer[hits[i].pc]);
73904 + atomic_add_unchecked(hits[i].hits, &prof_buffer[hits[i].pc]);
73905 hits[i].pc = hits[i].hits = 0;
73906 }
73907 out:
73908 @@ -426,7 +426,7 @@ void profile_hits(int type, void *__pc, unsigned int nr_hits)
73909 if (prof_on != type || !prof_buffer)
73910 return;
73911 pc = ((unsigned long)__pc - (unsigned long)_stext) >> prof_shift;
73912 - atomic_add(nr_hits, &prof_buffer[min(pc, prof_len - 1)]);
73913 + atomic_add_unchecked(nr_hits, &prof_buffer[min(pc, prof_len - 1)]);
73914 }
73915 #endif /* !CONFIG_SMP */
73916 EXPORT_SYMBOL_GPL(profile_hits);
73917 @@ -517,7 +517,7 @@ read_profile(struct file *file, char __user *buf, size_t count, loff_t *ppos)
73918 return -EFAULT;
73919 buf++; p++; count--; read++;
73920 }
73921 - pnt = (char *)prof_buffer + p - sizeof(atomic_t);
73922 + pnt = (char *)prof_buffer + p - sizeof(atomic_unchecked_t);
73923 if (copy_to_user(buf, (void *)pnt, count))
73924 return -EFAULT;
73925 read += count;
73926 @@ -548,7 +548,7 @@ static ssize_t write_profile(struct file *file, const char __user *buf,
73927 }
73928 #endif
73929 profile_discard_flip_buffers();
73930 - memset(prof_buffer, 0, prof_len * sizeof(atomic_t));
73931 + memset(prof_buffer, 0, prof_len * sizeof(atomic_unchecked_t));
73932 return count;
73933 }
73934
73935 diff --git a/kernel/ptrace.c b/kernel/ptrace.c
73936 index 05625f6..733bf70 100644
73937 --- a/kernel/ptrace.c
73938 +++ b/kernel/ptrace.c
73939 @@ -117,7 +117,8 @@ int ptrace_check_attach(struct task_struct *child, int kill)
73940 return ret;
73941 }
73942
73943 -int __ptrace_may_access(struct task_struct *task, unsigned int mode)
73944 +static int __ptrace_may_access(struct task_struct *task, unsigned int mode,
73945 + unsigned int log)
73946 {
73947 const struct cred *cred = current_cred(), *tcred;
73948
73949 @@ -141,7 +142,9 @@ int __ptrace_may_access(struct task_struct *task, unsigned int mode)
73950 cred->gid != tcred->egid ||
73951 cred->gid != tcred->sgid ||
73952 cred->gid != tcred->gid) &&
73953 - !capable(CAP_SYS_PTRACE)) {
73954 + ((!log && !capable_nolog(CAP_SYS_PTRACE)) ||
73955 + (log && !capable(CAP_SYS_PTRACE)))
73956 + ) {
73957 rcu_read_unlock();
73958 return -EPERM;
73959 }
73960 @@ -149,7 +152,9 @@ int __ptrace_may_access(struct task_struct *task, unsigned int mode)
73961 smp_rmb();
73962 if (task->mm)
73963 dumpable = get_dumpable(task->mm);
73964 - if (!dumpable && !capable(CAP_SYS_PTRACE))
73965 + if (!dumpable &&
73966 + ((!log && !capable_nolog(CAP_SYS_PTRACE)) ||
73967 + (log && !capable(CAP_SYS_PTRACE))))
73968 return -EPERM;
73969
73970 return security_ptrace_access_check(task, mode);
73971 @@ -159,7 +164,16 @@ bool ptrace_may_access(struct task_struct *task, unsigned int mode)
73972 {
73973 int err;
73974 task_lock(task);
73975 - err = __ptrace_may_access(task, mode);
73976 + err = __ptrace_may_access(task, mode, 0);
73977 + task_unlock(task);
73978 + return !err;
73979 +}
73980 +
73981 +bool ptrace_may_access_log(struct task_struct *task, unsigned int mode)
73982 +{
73983 + int err;
73984 + task_lock(task);
73985 + err = __ptrace_may_access(task, mode, 1);
73986 task_unlock(task);
73987 return !err;
73988 }
73989 @@ -186,7 +200,7 @@ int ptrace_attach(struct task_struct *task)
73990 goto out;
73991
73992 task_lock(task);
73993 - retval = __ptrace_may_access(task, PTRACE_MODE_ATTACH);
73994 + retval = __ptrace_may_access(task, PTRACE_MODE_ATTACH, 1);
73995 task_unlock(task);
73996 if (retval)
73997 goto unlock_creds;
73998 @@ -199,7 +213,7 @@ int ptrace_attach(struct task_struct *task)
73999 goto unlock_tasklist;
74000
74001 task->ptrace = PT_PTRACED;
74002 - if (capable(CAP_SYS_PTRACE))
74003 + if (capable_nolog(CAP_SYS_PTRACE))
74004 task->ptrace |= PT_PTRACE_CAP;
74005
74006 __ptrace_link(task, current);
74007 @@ -351,6 +365,8 @@ int ptrace_readdata(struct task_struct *tsk, unsigned long src, char __user *dst
74008 {
74009 int copied = 0;
74010
74011 + pax_track_stack();
74012 +
74013 while (len > 0) {
74014 char buf[128];
74015 int this_len, retval;
74016 @@ -376,6 +392,8 @@ int ptrace_writedata(struct task_struct *tsk, char __user *src, unsigned long ds
74017 {
74018 int copied = 0;
74019
74020 + pax_track_stack();
74021 +
74022 while (len > 0) {
74023 char buf[128];
74024 int this_len, retval;
74025 @@ -517,6 +535,8 @@ int ptrace_request(struct task_struct *child, long request,
74026 int ret = -EIO;
74027 siginfo_t siginfo;
74028
74029 + pax_track_stack();
74030 +
74031 switch (request) {
74032 case PTRACE_PEEKTEXT:
74033 case PTRACE_PEEKDATA:
74034 @@ -532,18 +552,18 @@ int ptrace_request(struct task_struct *child, long request,
74035 ret = ptrace_setoptions(child, data);
74036 break;
74037 case PTRACE_GETEVENTMSG:
74038 - ret = put_user(child->ptrace_message, (unsigned long __user *) data);
74039 + ret = put_user(child->ptrace_message, (__force unsigned long __user *) data);
74040 break;
74041
74042 case PTRACE_GETSIGINFO:
74043 ret = ptrace_getsiginfo(child, &siginfo);
74044 if (!ret)
74045 - ret = copy_siginfo_to_user((siginfo_t __user *) data,
74046 + ret = copy_siginfo_to_user((__force siginfo_t __user *) data,
74047 &siginfo);
74048 break;
74049
74050 case PTRACE_SETSIGINFO:
74051 - if (copy_from_user(&siginfo, (siginfo_t __user *) data,
74052 + if (copy_from_user(&siginfo, (__force siginfo_t __user *) data,
74053 sizeof siginfo))
74054 ret = -EFAULT;
74055 else
74056 @@ -621,14 +641,21 @@ SYSCALL_DEFINE4(ptrace, long, request, long, pid, long, addr, long, data)
74057 goto out;
74058 }
74059
74060 + if (gr_handle_ptrace(child, request)) {
74061 + ret = -EPERM;
74062 + goto out_put_task_struct;
74063 + }
74064 +
74065 if (request == PTRACE_ATTACH) {
74066 ret = ptrace_attach(child);
74067 /*
74068 * Some architectures need to do book-keeping after
74069 * a ptrace attach.
74070 */
74071 - if (!ret)
74072 + if (!ret) {
74073 arch_ptrace_attach(child);
74074 + gr_audit_ptrace(child);
74075 + }
74076 goto out_put_task_struct;
74077 }
74078
74079 @@ -653,7 +680,7 @@ int generic_ptrace_peekdata(struct task_struct *tsk, long addr, long data)
74080 copied = access_process_vm(tsk, addr, &tmp, sizeof(tmp), 0);
74081 if (copied != sizeof(tmp))
74082 return -EIO;
74083 - return put_user(tmp, (unsigned long __user *)data);
74084 + return put_user(tmp, (__force unsigned long __user *)data);
74085 }
74086
74087 int generic_ptrace_pokedata(struct task_struct *tsk, long addr, long data)
74088 @@ -675,6 +702,8 @@ int compat_ptrace_request(struct task_struct *child, compat_long_t request,
74089 siginfo_t siginfo;
74090 int ret;
74091
74092 + pax_track_stack();
74093 +
74094 switch (request) {
74095 case PTRACE_PEEKTEXT:
74096 case PTRACE_PEEKDATA:
74097 @@ -740,14 +769,21 @@ asmlinkage long compat_sys_ptrace(compat_long_t request, compat_long_t pid,
74098 goto out;
74099 }
74100
74101 + if (gr_handle_ptrace(child, request)) {
74102 + ret = -EPERM;
74103 + goto out_put_task_struct;
74104 + }
74105 +
74106 if (request == PTRACE_ATTACH) {
74107 ret = ptrace_attach(child);
74108 /*
74109 * Some architectures need to do book-keeping after
74110 * a ptrace attach.
74111 */
74112 - if (!ret)
74113 + if (!ret) {
74114 arch_ptrace_attach(child);
74115 + gr_audit_ptrace(child);
74116 + }
74117 goto out_put_task_struct;
74118 }
74119
74120 diff --git a/kernel/rcutorture.c b/kernel/rcutorture.c
74121 index 697c0a0..2402696 100644
74122 --- a/kernel/rcutorture.c
74123 +++ b/kernel/rcutorture.c
74124 @@ -118,12 +118,12 @@ static DEFINE_PER_CPU(long [RCU_TORTURE_PIPE_LEN + 1], rcu_torture_count) =
74125 { 0 };
74126 static DEFINE_PER_CPU(long [RCU_TORTURE_PIPE_LEN + 1], rcu_torture_batch) =
74127 { 0 };
74128 -static atomic_t rcu_torture_wcount[RCU_TORTURE_PIPE_LEN + 1];
74129 -static atomic_t n_rcu_torture_alloc;
74130 -static atomic_t n_rcu_torture_alloc_fail;
74131 -static atomic_t n_rcu_torture_free;
74132 -static atomic_t n_rcu_torture_mberror;
74133 -static atomic_t n_rcu_torture_error;
74134 +static atomic_unchecked_t rcu_torture_wcount[RCU_TORTURE_PIPE_LEN + 1];
74135 +static atomic_unchecked_t n_rcu_torture_alloc;
74136 +static atomic_unchecked_t n_rcu_torture_alloc_fail;
74137 +static atomic_unchecked_t n_rcu_torture_free;
74138 +static atomic_unchecked_t n_rcu_torture_mberror;
74139 +static atomic_unchecked_t n_rcu_torture_error;
74140 static long n_rcu_torture_timers;
74141 static struct list_head rcu_torture_removed;
74142 static cpumask_var_t shuffle_tmp_mask;
74143 @@ -187,11 +187,11 @@ rcu_torture_alloc(void)
74144
74145 spin_lock_bh(&rcu_torture_lock);
74146 if (list_empty(&rcu_torture_freelist)) {
74147 - atomic_inc(&n_rcu_torture_alloc_fail);
74148 + atomic_inc_unchecked(&n_rcu_torture_alloc_fail);
74149 spin_unlock_bh(&rcu_torture_lock);
74150 return NULL;
74151 }
74152 - atomic_inc(&n_rcu_torture_alloc);
74153 + atomic_inc_unchecked(&n_rcu_torture_alloc);
74154 p = rcu_torture_freelist.next;
74155 list_del_init(p);
74156 spin_unlock_bh(&rcu_torture_lock);
74157 @@ -204,7 +204,7 @@ rcu_torture_alloc(void)
74158 static void
74159 rcu_torture_free(struct rcu_torture *p)
74160 {
74161 - atomic_inc(&n_rcu_torture_free);
74162 + atomic_inc_unchecked(&n_rcu_torture_free);
74163 spin_lock_bh(&rcu_torture_lock);
74164 list_add_tail(&p->rtort_free, &rcu_torture_freelist);
74165 spin_unlock_bh(&rcu_torture_lock);
74166 @@ -319,7 +319,7 @@ rcu_torture_cb(struct rcu_head *p)
74167 i = rp->rtort_pipe_count;
74168 if (i > RCU_TORTURE_PIPE_LEN)
74169 i = RCU_TORTURE_PIPE_LEN;
74170 - atomic_inc(&rcu_torture_wcount[i]);
74171 + atomic_inc_unchecked(&rcu_torture_wcount[i]);
74172 if (++rp->rtort_pipe_count >= RCU_TORTURE_PIPE_LEN) {
74173 rp->rtort_mbtest = 0;
74174 rcu_torture_free(rp);
74175 @@ -359,7 +359,7 @@ static void rcu_sync_torture_deferred_free(struct rcu_torture *p)
74176 i = rp->rtort_pipe_count;
74177 if (i > RCU_TORTURE_PIPE_LEN)
74178 i = RCU_TORTURE_PIPE_LEN;
74179 - atomic_inc(&rcu_torture_wcount[i]);
74180 + atomic_inc_unchecked(&rcu_torture_wcount[i]);
74181 if (++rp->rtort_pipe_count >= RCU_TORTURE_PIPE_LEN) {
74182 rp->rtort_mbtest = 0;
74183 list_del(&rp->rtort_free);
74184 @@ -653,7 +653,7 @@ rcu_torture_writer(void *arg)
74185 i = old_rp->rtort_pipe_count;
74186 if (i > RCU_TORTURE_PIPE_LEN)
74187 i = RCU_TORTURE_PIPE_LEN;
74188 - atomic_inc(&rcu_torture_wcount[i]);
74189 + atomic_inc_unchecked(&rcu_torture_wcount[i]);
74190 old_rp->rtort_pipe_count++;
74191 cur_ops->deferred_free(old_rp);
74192 }
74193 @@ -718,7 +718,7 @@ static void rcu_torture_timer(unsigned long unused)
74194 return;
74195 }
74196 if (p->rtort_mbtest == 0)
74197 - atomic_inc(&n_rcu_torture_mberror);
74198 + atomic_inc_unchecked(&n_rcu_torture_mberror);
74199 spin_lock(&rand_lock);
74200 cur_ops->read_delay(&rand);
74201 n_rcu_torture_timers++;
74202 @@ -776,7 +776,7 @@ rcu_torture_reader(void *arg)
74203 continue;
74204 }
74205 if (p->rtort_mbtest == 0)
74206 - atomic_inc(&n_rcu_torture_mberror);
74207 + atomic_inc_unchecked(&n_rcu_torture_mberror);
74208 cur_ops->read_delay(&rand);
74209 preempt_disable();
74210 pipe_count = p->rtort_pipe_count;
74211 @@ -834,17 +834,17 @@ rcu_torture_printk(char *page)
74212 rcu_torture_current,
74213 rcu_torture_current_version,
74214 list_empty(&rcu_torture_freelist),
74215 - atomic_read(&n_rcu_torture_alloc),
74216 - atomic_read(&n_rcu_torture_alloc_fail),
74217 - atomic_read(&n_rcu_torture_free),
74218 - atomic_read(&n_rcu_torture_mberror),
74219 + atomic_read_unchecked(&n_rcu_torture_alloc),
74220 + atomic_read_unchecked(&n_rcu_torture_alloc_fail),
74221 + atomic_read_unchecked(&n_rcu_torture_free),
74222 + atomic_read_unchecked(&n_rcu_torture_mberror),
74223 n_rcu_torture_timers);
74224 - if (atomic_read(&n_rcu_torture_mberror) != 0)
74225 + if (atomic_read_unchecked(&n_rcu_torture_mberror) != 0)
74226 cnt += sprintf(&page[cnt], " !!!");
74227 cnt += sprintf(&page[cnt], "\n%s%s ", torture_type, TORTURE_FLAG);
74228 if (i > 1) {
74229 cnt += sprintf(&page[cnt], "!!! ");
74230 - atomic_inc(&n_rcu_torture_error);
74231 + atomic_inc_unchecked(&n_rcu_torture_error);
74232 WARN_ON_ONCE(1);
74233 }
74234 cnt += sprintf(&page[cnt], "Reader Pipe: ");
74235 @@ -858,7 +858,7 @@ rcu_torture_printk(char *page)
74236 cnt += sprintf(&page[cnt], "Free-Block Circulation: ");
74237 for (i = 0; i < RCU_TORTURE_PIPE_LEN + 1; i++) {
74238 cnt += sprintf(&page[cnt], " %d",
74239 - atomic_read(&rcu_torture_wcount[i]));
74240 + atomic_read_unchecked(&rcu_torture_wcount[i]));
74241 }
74242 cnt += sprintf(&page[cnt], "\n");
74243 if (cur_ops->stats)
74244 @@ -1084,7 +1084,7 @@ rcu_torture_cleanup(void)
74245
74246 if (cur_ops->cleanup)
74247 cur_ops->cleanup();
74248 - if (atomic_read(&n_rcu_torture_error))
74249 + if (atomic_read_unchecked(&n_rcu_torture_error))
74250 rcu_torture_print_module_parms("End of test: FAILURE");
74251 else
74252 rcu_torture_print_module_parms("End of test: SUCCESS");
74253 @@ -1138,13 +1138,13 @@ rcu_torture_init(void)
74254
74255 rcu_torture_current = NULL;
74256 rcu_torture_current_version = 0;
74257 - atomic_set(&n_rcu_torture_alloc, 0);
74258 - atomic_set(&n_rcu_torture_alloc_fail, 0);
74259 - atomic_set(&n_rcu_torture_free, 0);
74260 - atomic_set(&n_rcu_torture_mberror, 0);
74261 - atomic_set(&n_rcu_torture_error, 0);
74262 + atomic_set_unchecked(&n_rcu_torture_alloc, 0);
74263 + atomic_set_unchecked(&n_rcu_torture_alloc_fail, 0);
74264 + atomic_set_unchecked(&n_rcu_torture_free, 0);
74265 + atomic_set_unchecked(&n_rcu_torture_mberror, 0);
74266 + atomic_set_unchecked(&n_rcu_torture_error, 0);
74267 for (i = 0; i < RCU_TORTURE_PIPE_LEN + 1; i++)
74268 - atomic_set(&rcu_torture_wcount[i], 0);
74269 + atomic_set_unchecked(&rcu_torture_wcount[i], 0);
74270 for_each_possible_cpu(cpu) {
74271 for (i = 0; i < RCU_TORTURE_PIPE_LEN + 1; i++) {
74272 per_cpu(rcu_torture_count, cpu)[i] = 0;
74273 diff --git a/kernel/rcutree.c b/kernel/rcutree.c
74274 index 683c4f3..97f54c6 100644
74275 --- a/kernel/rcutree.c
74276 +++ b/kernel/rcutree.c
74277 @@ -1303,7 +1303,7 @@ __rcu_process_callbacks(struct rcu_state *rsp, struct rcu_data *rdp)
74278 /*
74279 * Do softirq processing for the current CPU.
74280 */
74281 -static void rcu_process_callbacks(struct softirq_action *unused)
74282 +static void rcu_process_callbacks(void)
74283 {
74284 /*
74285 * Memory references from any prior RCU read-side critical sections
74286 diff --git a/kernel/rcutree_plugin.h b/kernel/rcutree_plugin.h
74287 index c03edf7..ac1b341 100644
74288 --- a/kernel/rcutree_plugin.h
74289 +++ b/kernel/rcutree_plugin.h
74290 @@ -145,7 +145,7 @@ static void rcu_preempt_note_context_switch(int cpu)
74291 */
74292 void __rcu_read_lock(void)
74293 {
74294 - ACCESS_ONCE(current->rcu_read_lock_nesting)++;
74295 + ACCESS_ONCE_RW(current->rcu_read_lock_nesting)++;
74296 barrier(); /* needed if we ever invoke rcu_read_lock in rcutree.c */
74297 }
74298 EXPORT_SYMBOL_GPL(__rcu_read_lock);
74299 @@ -251,7 +251,7 @@ void __rcu_read_unlock(void)
74300 struct task_struct *t = current;
74301
74302 barrier(); /* needed if we ever invoke rcu_read_unlock in rcutree.c */
74303 - if (--ACCESS_ONCE(t->rcu_read_lock_nesting) == 0 &&
74304 + if (--ACCESS_ONCE_RW(t->rcu_read_lock_nesting) == 0 &&
74305 unlikely(ACCESS_ONCE(t->rcu_read_unlock_special)))
74306 rcu_read_unlock_special(t);
74307 }
74308 diff --git a/kernel/relay.c b/kernel/relay.c
74309 index 760c262..a9fd241 100644
74310 --- a/kernel/relay.c
74311 +++ b/kernel/relay.c
74312 @@ -1222,7 +1222,7 @@ static int subbuf_splice_actor(struct file *in,
74313 unsigned int flags,
74314 int *nonpad_ret)
74315 {
74316 - unsigned int pidx, poff, total_len, subbuf_pages, nr_pages, ret;
74317 + unsigned int pidx, poff, total_len, subbuf_pages, nr_pages;
74318 struct rchan_buf *rbuf = in->private_data;
74319 unsigned int subbuf_size = rbuf->chan->subbuf_size;
74320 uint64_t pos = (uint64_t) *ppos;
74321 @@ -1241,6 +1241,9 @@ static int subbuf_splice_actor(struct file *in,
74322 .ops = &relay_pipe_buf_ops,
74323 .spd_release = relay_page_release,
74324 };
74325 + ssize_t ret;
74326 +
74327 + pax_track_stack();
74328
74329 if (rbuf->subbufs_produced == rbuf->subbufs_consumed)
74330 return 0;
74331 diff --git a/kernel/resource.c b/kernel/resource.c
74332 index fb11a58..4e61ae1 100644
74333 --- a/kernel/resource.c
74334 +++ b/kernel/resource.c
74335 @@ -132,8 +132,18 @@ static const struct file_operations proc_iomem_operations = {
74336
74337 static int __init ioresources_init(void)
74338 {
74339 +#ifdef CONFIG_GRKERNSEC_PROC_ADD
74340 +#ifdef CONFIG_GRKERNSEC_PROC_USER
74341 + proc_create("ioports", S_IRUSR, NULL, &proc_ioports_operations);
74342 + proc_create("iomem", S_IRUSR, NULL, &proc_iomem_operations);
74343 +#elif defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
74344 + proc_create("ioports", S_IRUSR | S_IRGRP, NULL, &proc_ioports_operations);
74345 + proc_create("iomem", S_IRUSR | S_IRGRP, NULL, &proc_iomem_operations);
74346 +#endif
74347 +#else
74348 proc_create("ioports", 0, NULL, &proc_ioports_operations);
74349 proc_create("iomem", 0, NULL, &proc_iomem_operations);
74350 +#endif
74351 return 0;
74352 }
74353 __initcall(ioresources_init);
74354 diff --git a/kernel/rtmutex-tester.c b/kernel/rtmutex-tester.c
74355 index a56f629..1fc4989 100644
74356 --- a/kernel/rtmutex-tester.c
74357 +++ b/kernel/rtmutex-tester.c
74358 @@ -21,7 +21,7 @@
74359 #define MAX_RT_TEST_MUTEXES 8
74360
74361 static spinlock_t rttest_lock;
74362 -static atomic_t rttest_event;
74363 +static atomic_unchecked_t rttest_event;
74364
74365 struct test_thread_data {
74366 int opcode;
74367 @@ -64,7 +64,7 @@ static int handle_op(struct test_thread_data *td, int lockwakeup)
74368
74369 case RTTEST_LOCKCONT:
74370 td->mutexes[td->opdata] = 1;
74371 - td->event = atomic_add_return(1, &rttest_event);
74372 + td->event = atomic_add_return_unchecked(1, &rttest_event);
74373 return 0;
74374
74375 case RTTEST_RESET:
74376 @@ -82,7 +82,7 @@ static int handle_op(struct test_thread_data *td, int lockwakeup)
74377 return 0;
74378
74379 case RTTEST_RESETEVENT:
74380 - atomic_set(&rttest_event, 0);
74381 + atomic_set_unchecked(&rttest_event, 0);
74382 return 0;
74383
74384 default:
74385 @@ -99,9 +99,9 @@ static int handle_op(struct test_thread_data *td, int lockwakeup)
74386 return ret;
74387
74388 td->mutexes[id] = 1;
74389 - td->event = atomic_add_return(1, &rttest_event);
74390 + td->event = atomic_add_return_unchecked(1, &rttest_event);
74391 rt_mutex_lock(&mutexes[id]);
74392 - td->event = atomic_add_return(1, &rttest_event);
74393 + td->event = atomic_add_return_unchecked(1, &rttest_event);
74394 td->mutexes[id] = 4;
74395 return 0;
74396
74397 @@ -112,9 +112,9 @@ static int handle_op(struct test_thread_data *td, int lockwakeup)
74398 return ret;
74399
74400 td->mutexes[id] = 1;
74401 - td->event = atomic_add_return(1, &rttest_event);
74402 + td->event = atomic_add_return_unchecked(1, &rttest_event);
74403 ret = rt_mutex_lock_interruptible(&mutexes[id], 0);
74404 - td->event = atomic_add_return(1, &rttest_event);
74405 + td->event = atomic_add_return_unchecked(1, &rttest_event);
74406 td->mutexes[id] = ret ? 0 : 4;
74407 return ret ? -EINTR : 0;
74408
74409 @@ -123,9 +123,9 @@ static int handle_op(struct test_thread_data *td, int lockwakeup)
74410 if (id < 0 || id >= MAX_RT_TEST_MUTEXES || td->mutexes[id] != 4)
74411 return ret;
74412
74413 - td->event = atomic_add_return(1, &rttest_event);
74414 + td->event = atomic_add_return_unchecked(1, &rttest_event);
74415 rt_mutex_unlock(&mutexes[id]);
74416 - td->event = atomic_add_return(1, &rttest_event);
74417 + td->event = atomic_add_return_unchecked(1, &rttest_event);
74418 td->mutexes[id] = 0;
74419 return 0;
74420
74421 @@ -187,7 +187,7 @@ void schedule_rt_mutex_test(struct rt_mutex *mutex)
74422 break;
74423
74424 td->mutexes[dat] = 2;
74425 - td->event = atomic_add_return(1, &rttest_event);
74426 + td->event = atomic_add_return_unchecked(1, &rttest_event);
74427 break;
74428
74429 case RTTEST_LOCKBKL:
74430 @@ -208,7 +208,7 @@ void schedule_rt_mutex_test(struct rt_mutex *mutex)
74431 return;
74432
74433 td->mutexes[dat] = 3;
74434 - td->event = atomic_add_return(1, &rttest_event);
74435 + td->event = atomic_add_return_unchecked(1, &rttest_event);
74436 break;
74437
74438 case RTTEST_LOCKNOWAIT:
74439 @@ -220,7 +220,7 @@ void schedule_rt_mutex_test(struct rt_mutex *mutex)
74440 return;
74441
74442 td->mutexes[dat] = 1;
74443 - td->event = atomic_add_return(1, &rttest_event);
74444 + td->event = atomic_add_return_unchecked(1, &rttest_event);
74445 return;
74446
74447 case RTTEST_LOCKBKL:
74448 diff --git a/kernel/rtmutex.c b/kernel/rtmutex.c
74449 index 29bd4ba..8c5de90 100644
74450 --- a/kernel/rtmutex.c
74451 +++ b/kernel/rtmutex.c
74452 @@ -511,7 +511,7 @@ static void wakeup_next_waiter(struct rt_mutex *lock)
74453 */
74454 spin_lock_irqsave(&pendowner->pi_lock, flags);
74455
74456 - WARN_ON(!pendowner->pi_blocked_on);
74457 + BUG_ON(!pendowner->pi_blocked_on);
74458 WARN_ON(pendowner->pi_blocked_on != waiter);
74459 WARN_ON(pendowner->pi_blocked_on->lock != lock);
74460
74461 diff --git a/kernel/sched.c b/kernel/sched.c
74462 index 0591df8..db35e3d 100644
74463 --- a/kernel/sched.c
74464 +++ b/kernel/sched.c
74465 @@ -5043,7 +5043,7 @@ out:
74466 * In CONFIG_NO_HZ case, the idle load balance owner will do the
74467 * rebalancing for all the cpus for whom scheduler ticks are stopped.
74468 */
74469 -static void run_rebalance_domains(struct softirq_action *h)
74470 +static void run_rebalance_domains(void)
74471 {
74472 int this_cpu = smp_processor_id();
74473 struct rq *this_rq = cpu_rq(this_cpu);
74474 @@ -5700,6 +5700,8 @@ asmlinkage void __sched schedule(void)
74475 struct rq *rq;
74476 int cpu;
74477
74478 + pax_track_stack();
74479 +
74480 need_resched:
74481 preempt_disable();
74482 cpu = smp_processor_id();
74483 @@ -5770,7 +5772,7 @@ EXPORT_SYMBOL(schedule);
74484 * Look out! "owner" is an entirely speculative pointer
74485 * access and not reliable.
74486 */
74487 -int mutex_spin_on_owner(struct mutex *lock, struct thread_info *owner)
74488 +int mutex_spin_on_owner(struct mutex *lock, struct task_struct *owner)
74489 {
74490 unsigned int cpu;
74491 struct rq *rq;
74492 @@ -5784,10 +5786,10 @@ int mutex_spin_on_owner(struct mutex *lock, struct thread_info *owner)
74493 * DEBUG_PAGEALLOC could have unmapped it if
74494 * the mutex owner just released it and exited.
74495 */
74496 - if (probe_kernel_address(&owner->cpu, cpu))
74497 + if (probe_kernel_address(&task_thread_info(owner)->cpu, cpu))
74498 return 0;
74499 #else
74500 - cpu = owner->cpu;
74501 + cpu = task_thread_info(owner)->cpu;
74502 #endif
74503
74504 /*
74505 @@ -5816,7 +5818,7 @@ int mutex_spin_on_owner(struct mutex *lock, struct thread_info *owner)
74506 /*
74507 * Is that owner really running on that cpu?
74508 */
74509 - if (task_thread_info(rq->curr) != owner || need_resched())
74510 + if (rq->curr != owner || need_resched())
74511 return 0;
74512
74513 cpu_relax();
74514 @@ -6359,6 +6361,8 @@ int can_nice(const struct task_struct *p, const int nice)
74515 /* convert nice value [19,-20] to rlimit style value [1,40] */
74516 int nice_rlim = 20 - nice;
74517
74518 + gr_learn_resource(p, RLIMIT_NICE, nice_rlim, 1);
74519 +
74520 return (nice_rlim <= p->signal->rlim[RLIMIT_NICE].rlim_cur ||
74521 capable(CAP_SYS_NICE));
74522 }
74523 @@ -6392,7 +6396,8 @@ SYSCALL_DEFINE1(nice, int, increment)
74524 if (nice > 19)
74525 nice = 19;
74526
74527 - if (increment < 0 && !can_nice(current, nice))
74528 + if (increment < 0 && (!can_nice(current, nice) ||
74529 + gr_handle_chroot_nice()))
74530 return -EPERM;
74531
74532 retval = security_task_setnice(current, nice);
74533 @@ -8774,7 +8779,7 @@ static void init_sched_groups_power(int cpu, struct sched_domain *sd)
74534 long power;
74535 int weight;
74536
74537 - WARN_ON(!sd || !sd->groups);
74538 + BUG_ON(!sd || !sd->groups);
74539
74540 if (cpu != group_first_cpu(sd->groups))
74541 return;
74542 diff --git a/kernel/signal.c b/kernel/signal.c
74543 index 2494827..cda80a0 100644
74544 --- a/kernel/signal.c
74545 +++ b/kernel/signal.c
74546 @@ -41,12 +41,12 @@
74547
74548 static struct kmem_cache *sigqueue_cachep;
74549
74550 -static void __user *sig_handler(struct task_struct *t, int sig)
74551 +static __sighandler_t sig_handler(struct task_struct *t, int sig)
74552 {
74553 return t->sighand->action[sig - 1].sa.sa_handler;
74554 }
74555
74556 -static int sig_handler_ignored(void __user *handler, int sig)
74557 +static int sig_handler_ignored(__sighandler_t handler, int sig)
74558 {
74559 /* Is it explicitly or implicitly ignored? */
74560 return handler == SIG_IGN ||
74561 @@ -56,7 +56,7 @@ static int sig_handler_ignored(void __user *handler, int sig)
74562 static int sig_task_ignored(struct task_struct *t, int sig,
74563 int from_ancestor_ns)
74564 {
74565 - void __user *handler;
74566 + __sighandler_t handler;
74567
74568 handler = sig_handler(t, sig);
74569
74570 @@ -207,6 +207,9 @@ static struct sigqueue *__sigqueue_alloc(struct task_struct *t, gfp_t flags,
74571 */
74572 user = get_uid(__task_cred(t)->user);
74573 atomic_inc(&user->sigpending);
74574 +
74575 + if (!override_rlimit)
74576 + gr_learn_resource(t, RLIMIT_SIGPENDING, atomic_read(&user->sigpending), 1);
74577 if (override_rlimit ||
74578 atomic_read(&user->sigpending) <=
74579 t->signal->rlim[RLIMIT_SIGPENDING].rlim_cur)
74580 @@ -327,7 +330,7 @@ flush_signal_handlers(struct task_struct *t, int force_default)
74581
74582 int unhandled_signal(struct task_struct *tsk, int sig)
74583 {
74584 - void __user *handler = tsk->sighand->action[sig-1].sa.sa_handler;
74585 + __sighandler_t handler = tsk->sighand->action[sig-1].sa.sa_handler;
74586 if (is_global_init(tsk))
74587 return 1;
74588 if (handler != SIG_IGN && handler != SIG_DFL)
74589 @@ -627,6 +630,13 @@ static int check_kill_permission(int sig, struct siginfo *info,
74590 }
74591 }
74592
74593 + /* allow glibc communication via tgkill to other threads in our
74594 + thread group */
74595 + if ((info == SEND_SIG_NOINFO || info->si_code != SI_TKILL ||
74596 + sig != (SIGRTMIN+1) || task_tgid_vnr(t) != info->si_pid)
74597 + && gr_handle_signal(t, sig))
74598 + return -EPERM;
74599 +
74600 return security_task_kill(t, info, sig, 0);
74601 }
74602
74603 @@ -968,7 +978,7 @@ __group_send_sig_info(int sig, struct siginfo *info, struct task_struct *p)
74604 return send_signal(sig, info, p, 1);
74605 }
74606
74607 -static int
74608 +int
74609 specific_send_sig_info(int sig, struct siginfo *info, struct task_struct *t)
74610 {
74611 return send_signal(sig, info, t, 0);
74612 @@ -1005,6 +1015,7 @@ force_sig_info(int sig, struct siginfo *info, struct task_struct *t)
74613 unsigned long int flags;
74614 int ret, blocked, ignored;
74615 struct k_sigaction *action;
74616 + int is_unhandled = 0;
74617
74618 spin_lock_irqsave(&t->sighand->siglock, flags);
74619 action = &t->sighand->action[sig-1];
74620 @@ -1019,9 +1030,18 @@ force_sig_info(int sig, struct siginfo *info, struct task_struct *t)
74621 }
74622 if (action->sa.sa_handler == SIG_DFL)
74623 t->signal->flags &= ~SIGNAL_UNKILLABLE;
74624 + if (action->sa.sa_handler == SIG_IGN || action->sa.sa_handler == SIG_DFL)
74625 + is_unhandled = 1;
74626 ret = specific_send_sig_info(sig, info, t);
74627 spin_unlock_irqrestore(&t->sighand->siglock, flags);
74628
74629 + /* only deal with unhandled signals, java etc trigger SIGSEGV during
74630 + normal operation */
74631 + if (is_unhandled) {
74632 + gr_log_signal(sig, !is_si_special(info) ? info->si_addr : NULL, t);
74633 + gr_handle_crash(t, sig);
74634 + }
74635 +
74636 return ret;
74637 }
74638
74639 @@ -1081,8 +1101,11 @@ int group_send_sig_info(int sig, struct siginfo *info, struct task_struct *p)
74640 {
74641 int ret = check_kill_permission(sig, info, p);
74642
74643 - if (!ret && sig)
74644 + if (!ret && sig) {
74645 ret = do_send_sig_info(sig, info, p, true);
74646 + if (!ret)
74647 + gr_log_signal(sig, !is_si_special(info) ? info->si_addr : NULL, p);
74648 + }
74649
74650 return ret;
74651 }
74652 @@ -1644,6 +1667,8 @@ void ptrace_notify(int exit_code)
74653 {
74654 siginfo_t info;
74655
74656 + pax_track_stack();
74657 +
74658 BUG_ON((exit_code & (0x7f | ~0xffff)) != SIGTRAP);
74659
74660 memset(&info, 0, sizeof info);
74661 @@ -2275,7 +2300,15 @@ do_send_specific(pid_t tgid, pid_t pid, int sig, struct siginfo *info)
74662 int error = -ESRCH;
74663
74664 rcu_read_lock();
74665 - p = find_task_by_vpid(pid);
74666 +#ifdef CONFIG_GRKERNSEC_CHROOT_FINDTASK
74667 + /* allow glibc communication via tgkill to other threads in our
74668 + thread group */
74669 + if (grsec_enable_chroot_findtask && info->si_code == SI_TKILL &&
74670 + sig == (SIGRTMIN+1) && tgid == info->si_pid)
74671 + p = find_task_by_vpid_unrestricted(pid);
74672 + else
74673 +#endif
74674 + p = find_task_by_vpid(pid);
74675 if (p && (tgid <= 0 || task_tgid_vnr(p) == tgid)) {
74676 error = check_kill_permission(sig, info, p);
74677 /*
74678 diff --git a/kernel/smp.c b/kernel/smp.c
74679 index aa9cff3..631a0de 100644
74680 --- a/kernel/smp.c
74681 +++ b/kernel/smp.c
74682 @@ -522,22 +522,22 @@ int smp_call_function(void (*func)(void *), void *info, int wait)
74683 }
74684 EXPORT_SYMBOL(smp_call_function);
74685
74686 -void ipi_call_lock(void)
74687 +void ipi_call_lock(void) __acquires(call_function.lock)
74688 {
74689 spin_lock(&call_function.lock);
74690 }
74691
74692 -void ipi_call_unlock(void)
74693 +void ipi_call_unlock(void) __releases(call_function.lock)
74694 {
74695 spin_unlock(&call_function.lock);
74696 }
74697
74698 -void ipi_call_lock_irq(void)
74699 +void ipi_call_lock_irq(void) __acquires(call_function.lock)
74700 {
74701 spin_lock_irq(&call_function.lock);
74702 }
74703
74704 -void ipi_call_unlock_irq(void)
74705 +void ipi_call_unlock_irq(void) __releases(call_function.lock)
74706 {
74707 spin_unlock_irq(&call_function.lock);
74708 }
74709 diff --git a/kernel/softirq.c b/kernel/softirq.c
74710 index 04a0252..580c512 100644
74711 --- a/kernel/softirq.c
74712 +++ b/kernel/softirq.c
74713 @@ -56,7 +56,7 @@ static struct softirq_action softirq_vec[NR_SOFTIRQS] __cacheline_aligned_in_smp
74714
74715 static DEFINE_PER_CPU(struct task_struct *, ksoftirqd);
74716
74717 -char *softirq_to_name[NR_SOFTIRQS] = {
74718 +const char * const softirq_to_name[NR_SOFTIRQS] = {
74719 "HI", "TIMER", "NET_TX", "NET_RX", "BLOCK", "BLOCK_IOPOLL",
74720 "TASKLET", "SCHED", "HRTIMER", "RCU"
74721 };
74722 @@ -206,7 +206,7 @@ EXPORT_SYMBOL(local_bh_enable_ip);
74723
74724 asmlinkage void __do_softirq(void)
74725 {
74726 - struct softirq_action *h;
74727 + const struct softirq_action *h;
74728 __u32 pending;
74729 int max_restart = MAX_SOFTIRQ_RESTART;
74730 int cpu;
74731 @@ -233,7 +233,7 @@ restart:
74732 kstat_incr_softirqs_this_cpu(h - softirq_vec);
74733
74734 trace_softirq_entry(h, softirq_vec);
74735 - h->action(h);
74736 + h->action();
74737 trace_softirq_exit(h, softirq_vec);
74738 if (unlikely(prev_count != preempt_count())) {
74739 printk(KERN_ERR "huh, entered softirq %td %s %p"
74740 @@ -363,9 +363,11 @@ void raise_softirq(unsigned int nr)
74741 local_irq_restore(flags);
74742 }
74743
74744 -void open_softirq(int nr, void (*action)(struct softirq_action *))
74745 +void open_softirq(int nr, void (*action)(void))
74746 {
74747 - softirq_vec[nr].action = action;
74748 + pax_open_kernel();
74749 + *(void **)&softirq_vec[nr].action = action;
74750 + pax_close_kernel();
74751 }
74752
74753 /*
74754 @@ -419,7 +421,7 @@ void __tasklet_hi_schedule_first(struct tasklet_struct *t)
74755
74756 EXPORT_SYMBOL(__tasklet_hi_schedule_first);
74757
74758 -static void tasklet_action(struct softirq_action *a)
74759 +static void tasklet_action(void)
74760 {
74761 struct tasklet_struct *list;
74762
74763 @@ -454,7 +456,7 @@ static void tasklet_action(struct softirq_action *a)
74764 }
74765 }
74766
74767 -static void tasklet_hi_action(struct softirq_action *a)
74768 +static void tasklet_hi_action(void)
74769 {
74770 struct tasklet_struct *list;
74771
74772 diff --git a/kernel/sys.c b/kernel/sys.c
74773 index e9512b1..3c265de 100644
74774 --- a/kernel/sys.c
74775 +++ b/kernel/sys.c
74776 @@ -133,6 +133,12 @@ static int set_one_prio(struct task_struct *p, int niceval, int error)
74777 error = -EACCES;
74778 goto out;
74779 }
74780 +
74781 + if (gr_handle_chroot_setpriority(p, niceval)) {
74782 + error = -EACCES;
74783 + goto out;
74784 + }
74785 +
74786 no_nice = security_task_setnice(p, niceval);
74787 if (no_nice) {
74788 error = no_nice;
74789 @@ -190,10 +196,10 @@ SYSCALL_DEFINE3(setpriority, int, which, int, who, int, niceval)
74790 !(user = find_user(who)))
74791 goto out_unlock; /* No processes for this user */
74792
74793 - do_each_thread(g, p)
74794 + do_each_thread(g, p) {
74795 if (__task_cred(p)->uid == who)
74796 error = set_one_prio(p, niceval, error);
74797 - while_each_thread(g, p);
74798 + } while_each_thread(g, p);
74799 if (who != cred->uid)
74800 free_uid(user); /* For find_user() */
74801 break;
74802 @@ -253,13 +259,13 @@ SYSCALL_DEFINE2(getpriority, int, which, int, who)
74803 !(user = find_user(who)))
74804 goto out_unlock; /* No processes for this user */
74805
74806 - do_each_thread(g, p)
74807 + do_each_thread(g, p) {
74808 if (__task_cred(p)->uid == who) {
74809 niceval = 20 - task_nice(p);
74810 if (niceval > retval)
74811 retval = niceval;
74812 }
74813 - while_each_thread(g, p);
74814 + } while_each_thread(g, p);
74815 if (who != cred->uid)
74816 free_uid(user); /* for find_user() */
74817 break;
74818 @@ -509,6 +515,9 @@ SYSCALL_DEFINE2(setregid, gid_t, rgid, gid_t, egid)
74819 goto error;
74820 }
74821
74822 + if (gr_check_group_change(new->gid, new->egid, -1))
74823 + goto error;
74824 +
74825 if (rgid != (gid_t) -1 ||
74826 (egid != (gid_t) -1 && egid != old->gid))
74827 new->sgid = new->egid;
74828 @@ -542,6 +551,10 @@ SYSCALL_DEFINE1(setgid, gid_t, gid)
74829 goto error;
74830
74831 retval = -EPERM;
74832 +
74833 + if (gr_check_group_change(gid, gid, gid))
74834 + goto error;
74835 +
74836 if (capable(CAP_SETGID))
74837 new->gid = new->egid = new->sgid = new->fsgid = gid;
74838 else if (gid == old->gid || gid == old->sgid)
74839 @@ -567,12 +580,19 @@ static int set_user(struct cred *new)
74840 if (!new_user)
74841 return -EAGAIN;
74842
74843 + /*
74844 + * We don't fail in case of NPROC limit excess here because too many
74845 + * poorly written programs don't check set*uid() return code, assuming
74846 + * it never fails if called by root. We may still enforce NPROC limit
74847 + * for programs doing set*uid()+execve() by harmlessly deferring the
74848 + * failure to the execve() stage.
74849 + */
74850 if (atomic_read(&new_user->processes) >=
74851 current->signal->rlim[RLIMIT_NPROC].rlim_cur &&
74852 - new_user != INIT_USER) {
74853 - free_uid(new_user);
74854 - return -EAGAIN;
74855 - }
74856 + new_user != INIT_USER)
74857 + current->flags |= PF_NPROC_EXCEEDED;
74858 + else
74859 + current->flags &= ~PF_NPROC_EXCEEDED;
74860
74861 free_uid(new->user);
74862 new->user = new_user;
74863 @@ -627,6 +647,9 @@ SYSCALL_DEFINE2(setreuid, uid_t, ruid, uid_t, euid)
74864 goto error;
74865 }
74866
74867 + if (gr_check_user_change(new->uid, new->euid, -1))
74868 + goto error;
74869 +
74870 if (new->uid != old->uid) {
74871 retval = set_user(new);
74872 if (retval < 0)
74873 @@ -675,6 +698,12 @@ SYSCALL_DEFINE1(setuid, uid_t, uid)
74874 goto error;
74875
74876 retval = -EPERM;
74877 +
74878 + if (gr_check_crash_uid(uid))
74879 + goto error;
74880 + if (gr_check_user_change(uid, uid, uid))
74881 + goto error;
74882 +
74883 if (capable(CAP_SETUID)) {
74884 new->suid = new->uid = uid;
74885 if (uid != old->uid) {
74886 @@ -732,6 +761,9 @@ SYSCALL_DEFINE3(setresuid, uid_t, ruid, uid_t, euid, uid_t, suid)
74887 goto error;
74888 }
74889
74890 + if (gr_check_user_change(ruid, euid, -1))
74891 + goto error;
74892 +
74893 if (ruid != (uid_t) -1) {
74894 new->uid = ruid;
74895 if (ruid != old->uid) {
74896 @@ -800,6 +832,9 @@ SYSCALL_DEFINE3(setresgid, gid_t, rgid, gid_t, egid, gid_t, sgid)
74897 goto error;
74898 }
74899
74900 + if (gr_check_group_change(rgid, egid, -1))
74901 + goto error;
74902 +
74903 if (rgid != (gid_t) -1)
74904 new->gid = rgid;
74905 if (egid != (gid_t) -1)
74906 @@ -849,6 +884,9 @@ SYSCALL_DEFINE1(setfsuid, uid_t, uid)
74907 if (security_task_setuid(uid, (uid_t)-1, (uid_t)-1, LSM_SETID_FS) < 0)
74908 goto error;
74909
74910 + if (gr_check_user_change(-1, -1, uid))
74911 + goto error;
74912 +
74913 if (uid == old->uid || uid == old->euid ||
74914 uid == old->suid || uid == old->fsuid ||
74915 capable(CAP_SETUID)) {
74916 @@ -889,6 +927,9 @@ SYSCALL_DEFINE1(setfsgid, gid_t, gid)
74917 if (gid == old->gid || gid == old->egid ||
74918 gid == old->sgid || gid == old->fsgid ||
74919 capable(CAP_SETGID)) {
74920 + if (gr_check_group_change(-1, -1, gid))
74921 + goto error;
74922 +
74923 if (gid != old_fsgid) {
74924 new->fsgid = gid;
74925 goto change_okay;
74926 @@ -1454,7 +1495,7 @@ SYSCALL_DEFINE5(prctl, int, option, unsigned long, arg2, unsigned long, arg3,
74927 error = get_dumpable(me->mm);
74928 break;
74929 case PR_SET_DUMPABLE:
74930 - if (arg2 < 0 || arg2 > 1) {
74931 + if (arg2 > 1) {
74932 error = -EINVAL;
74933 break;
74934 }
74935 diff --git a/kernel/sysctl.c b/kernel/sysctl.c
74936 index b8bd058..ab6a76be 100644
74937 --- a/kernel/sysctl.c
74938 +++ b/kernel/sysctl.c
74939 @@ -63,6 +63,13 @@
74940 static int deprecated_sysctl_warning(struct __sysctl_args *args);
74941
74942 #if defined(CONFIG_SYSCTL)
74943 +#include <linux/grsecurity.h>
74944 +#include <linux/grinternal.h>
74945 +
74946 +extern __u32 gr_handle_sysctl(const ctl_table *table, const int op);
74947 +extern int gr_handle_sysctl_mod(const char *dirname, const char *name,
74948 + const int op);
74949 +extern int gr_handle_chroot_sysctl(const int op);
74950
74951 /* External variables not in a header file. */
74952 extern int C_A_D;
74953 @@ -168,6 +175,7 @@ static int proc_do_cad_pid(struct ctl_table *table, int write,
74954 static int proc_taint(struct ctl_table *table, int write,
74955 void __user *buffer, size_t *lenp, loff_t *ppos);
74956 #endif
74957 +extern ctl_table grsecurity_table[];
74958
74959 static struct ctl_table root_table[];
74960 static struct ctl_table_root sysctl_table_root;
74961 @@ -200,6 +208,21 @@ extern struct ctl_table epoll_table[];
74962 int sysctl_legacy_va_layout;
74963 #endif
74964
74965 +#ifdef CONFIG_PAX_SOFTMODE
74966 +static ctl_table pax_table[] = {
74967 + {
74968 + .ctl_name = CTL_UNNUMBERED,
74969 + .procname = "softmode",
74970 + .data = &pax_softmode,
74971 + .maxlen = sizeof(unsigned int),
74972 + .mode = 0600,
74973 + .proc_handler = &proc_dointvec,
74974 + },
74975 +
74976 + { .ctl_name = 0 }
74977 +};
74978 +#endif
74979 +
74980 extern int prove_locking;
74981 extern int lock_stat;
74982
74983 @@ -251,6 +274,24 @@ static int max_wakeup_granularity_ns = NSEC_PER_SEC; /* 1 second */
74984 #endif
74985
74986 static struct ctl_table kern_table[] = {
74987 +#if defined(CONFIG_GRKERNSEC_SYSCTL) || defined(CONFIG_GRKERNSEC_ROFS)
74988 + {
74989 + .ctl_name = CTL_UNNUMBERED,
74990 + .procname = "grsecurity",
74991 + .mode = 0500,
74992 + .child = grsecurity_table,
74993 + },
74994 +#endif
74995 +
74996 +#ifdef CONFIG_PAX_SOFTMODE
74997 + {
74998 + .ctl_name = CTL_UNNUMBERED,
74999 + .procname = "pax",
75000 + .mode = 0500,
75001 + .child = pax_table,
75002 + },
75003 +#endif
75004 +
75005 {
75006 .ctl_name = CTL_UNNUMBERED,
75007 .procname = "sched_child_runs_first",
75008 @@ -567,8 +608,8 @@ static struct ctl_table kern_table[] = {
75009 .data = &modprobe_path,
75010 .maxlen = KMOD_PATH_LEN,
75011 .mode = 0644,
75012 - .proc_handler = &proc_dostring,
75013 - .strategy = &sysctl_string,
75014 + .proc_handler = &proc_dostring_modpriv,
75015 + .strategy = &sysctl_string_modpriv,
75016 },
75017 {
75018 .ctl_name = CTL_UNNUMBERED,
75019 @@ -1247,6 +1288,13 @@ static struct ctl_table vm_table[] = {
75020 .mode = 0644,
75021 .proc_handler = &proc_dointvec
75022 },
75023 + {
75024 + .procname = "heap_stack_gap",
75025 + .data = &sysctl_heap_stack_gap,
75026 + .maxlen = sizeof(sysctl_heap_stack_gap),
75027 + .mode = 0644,
75028 + .proc_handler = proc_doulongvec_minmax,
75029 + },
75030 #else
75031 {
75032 .ctl_name = CTL_UNNUMBERED,
75033 @@ -1803,6 +1851,8 @@ static int do_sysctl_strategy(struct ctl_table_root *root,
75034 return 0;
75035 }
75036
75037 +static int sysctl_perm_nochk(struct ctl_table_root *root, struct ctl_table *table, int op);
75038 +
75039 static int parse_table(int __user *name, int nlen,
75040 void __user *oldval, size_t __user *oldlenp,
75041 void __user *newval, size_t newlen,
75042 @@ -1821,7 +1871,7 @@ repeat:
75043 if (n == table->ctl_name) {
75044 int error;
75045 if (table->child) {
75046 - if (sysctl_perm(root, table, MAY_EXEC))
75047 + if (sysctl_perm_nochk(root, table, MAY_EXEC))
75048 return -EPERM;
75049 name++;
75050 nlen--;
75051 @@ -1906,6 +1956,33 @@ int sysctl_perm(struct ctl_table_root *root, struct ctl_table *table, int op)
75052 int error;
75053 int mode;
75054
75055 + if (table->parent != NULL && table->parent->procname != NULL &&
75056 + table->procname != NULL &&
75057 + gr_handle_sysctl_mod(table->parent->procname, table->procname, op))
75058 + return -EACCES;
75059 + if (gr_handle_chroot_sysctl(op))
75060 + return -EACCES;
75061 + error = gr_handle_sysctl(table, op);
75062 + if (error)
75063 + return error;
75064 +
75065 + error = security_sysctl(table, op & (MAY_READ | MAY_WRITE | MAY_EXEC));
75066 + if (error)
75067 + return error;
75068 +
75069 + if (root->permissions)
75070 + mode = root->permissions(root, current->nsproxy, table);
75071 + else
75072 + mode = table->mode;
75073 +
75074 + return test_perm(mode, op);
75075 +}
75076 +
75077 +int sysctl_perm_nochk(struct ctl_table_root *root, struct ctl_table *table, int op)
75078 +{
75079 + int error;
75080 + int mode;
75081 +
75082 error = security_sysctl(table, op & (MAY_READ | MAY_WRITE | MAY_EXEC));
75083 if (error)
75084 return error;
75085 @@ -2335,6 +2412,16 @@ int proc_dostring(struct ctl_table *table, int write,
75086 buffer, lenp, ppos);
75087 }
75088
75089 +int proc_dostring_modpriv(struct ctl_table *table, int write,
75090 + void __user *buffer, size_t *lenp, loff_t *ppos)
75091 +{
75092 + if (write && !capable(CAP_SYS_MODULE))
75093 + return -EPERM;
75094 +
75095 + return _proc_do_string(table->data, table->maxlen, write,
75096 + buffer, lenp, ppos);
75097 +}
75098 +
75099
75100 static int do_proc_dointvec_conv(int *negp, unsigned long *lvalp,
75101 int *valp,
75102 @@ -2609,7 +2696,7 @@ static int __do_proc_doulongvec_minmax(void *data, struct ctl_table *table, int
75103 vleft = table->maxlen / sizeof(unsigned long);
75104 left = *lenp;
75105
75106 - for (; left && vleft--; i++, min++, max++, first=0) {
75107 + for (; left && vleft--; i++, first=0) {
75108 if (write) {
75109 while (left) {
75110 char c;
75111 @@ -2910,6 +2997,12 @@ int proc_dostring(struct ctl_table *table, int write,
75112 return -ENOSYS;
75113 }
75114
75115 +int proc_dostring_modpriv(struct ctl_table *table, int write,
75116 + void __user *buffer, size_t *lenp, loff_t *ppos)
75117 +{
75118 + return -ENOSYS;
75119 +}
75120 +
75121 int proc_dointvec(struct ctl_table *table, int write,
75122 void __user *buffer, size_t *lenp, loff_t *ppos)
75123 {
75124 @@ -3038,6 +3131,16 @@ int sysctl_string(struct ctl_table *table,
75125 return 1;
75126 }
75127
75128 +int sysctl_string_modpriv(struct ctl_table *table,
75129 + void __user *oldval, size_t __user *oldlenp,
75130 + void __user *newval, size_t newlen)
75131 +{
75132 + if (newval && newlen && !capable(CAP_SYS_MODULE))
75133 + return -EPERM;
75134 +
75135 + return sysctl_string(table, oldval, oldlenp, newval, newlen);
75136 +}
75137 +
75138 /*
75139 * This function makes sure that all of the integers in the vector
75140 * are between the minimum and maximum values given in the arrays
75141 @@ -3182,6 +3285,13 @@ int sysctl_string(struct ctl_table *table,
75142 return -ENOSYS;
75143 }
75144
75145 +int sysctl_string_modpriv(struct ctl_table *table,
75146 + void __user *oldval, size_t __user *oldlenp,
75147 + void __user *newval, size_t newlen)
75148 +{
75149 + return -ENOSYS;
75150 +}
75151 +
75152 int sysctl_intvec(struct ctl_table *table,
75153 void __user *oldval, size_t __user *oldlenp,
75154 void __user *newval, size_t newlen)
75155 @@ -3246,6 +3356,7 @@ EXPORT_SYMBOL(proc_dointvec_minmax);
75156 EXPORT_SYMBOL(proc_dointvec_userhz_jiffies);
75157 EXPORT_SYMBOL(proc_dointvec_ms_jiffies);
75158 EXPORT_SYMBOL(proc_dostring);
75159 +EXPORT_SYMBOL(proc_dostring_modpriv);
75160 EXPORT_SYMBOL(proc_doulongvec_minmax);
75161 EXPORT_SYMBOL(proc_doulongvec_ms_jiffies_minmax);
75162 EXPORT_SYMBOL(register_sysctl_table);
75163 @@ -3254,5 +3365,6 @@ EXPORT_SYMBOL(sysctl_intvec);
75164 EXPORT_SYMBOL(sysctl_jiffies);
75165 EXPORT_SYMBOL(sysctl_ms_jiffies);
75166 EXPORT_SYMBOL(sysctl_string);
75167 +EXPORT_SYMBOL(sysctl_string_modpriv);
75168 EXPORT_SYMBOL(sysctl_data);
75169 EXPORT_SYMBOL(unregister_sysctl_table);
75170 diff --git a/kernel/sysctl_check.c b/kernel/sysctl_check.c
75171 index 469193c..ea3ecb2 100644
75172 --- a/kernel/sysctl_check.c
75173 +++ b/kernel/sysctl_check.c
75174 @@ -1489,10 +1489,12 @@ int sysctl_check_table(struct nsproxy *namespaces, struct ctl_table *table)
75175 } else {
75176 if ((table->strategy == sysctl_data) ||
75177 (table->strategy == sysctl_string) ||
75178 + (table->strategy == sysctl_string_modpriv) ||
75179 (table->strategy == sysctl_intvec) ||
75180 (table->strategy == sysctl_jiffies) ||
75181 (table->strategy == sysctl_ms_jiffies) ||
75182 (table->proc_handler == proc_dostring) ||
75183 + (table->proc_handler == proc_dostring_modpriv) ||
75184 (table->proc_handler == proc_dointvec) ||
75185 (table->proc_handler == proc_dointvec_minmax) ||
75186 (table->proc_handler == proc_dointvec_jiffies) ||
75187 diff --git a/kernel/taskstats.c b/kernel/taskstats.c
75188 index a4ef542..798bcd7 100644
75189 --- a/kernel/taskstats.c
75190 +++ b/kernel/taskstats.c
75191 @@ -26,9 +26,12 @@
75192 #include <linux/cgroup.h>
75193 #include <linux/fs.h>
75194 #include <linux/file.h>
75195 +#include <linux/grsecurity.h>
75196 #include <net/genetlink.h>
75197 #include <asm/atomic.h>
75198
75199 +extern int gr_is_taskstats_denied(int pid);
75200 +
75201 /*
75202 * Maximum length of a cpumask that can be specified in
75203 * the TASKSTATS_CMD_ATTR_REGISTER/DEREGISTER_CPUMASK attribute
75204 @@ -442,6 +445,9 @@ static int taskstats_user_cmd(struct sk_buff *skb, struct genl_info *info)
75205 size_t size;
75206 cpumask_var_t mask;
75207
75208 + if (gr_is_taskstats_denied(current->pid))
75209 + return -EACCES;
75210 +
75211 if (!alloc_cpumask_var(&mask, GFP_KERNEL))
75212 return -ENOMEM;
75213
75214 diff --git a/kernel/time.c b/kernel/time.c
75215 index 33df60e..ca768bd 100644
75216 --- a/kernel/time.c
75217 +++ b/kernel/time.c
75218 @@ -165,6 +165,11 @@ int do_sys_settimeofday(struct timespec *tv, struct timezone *tz)
75219 return error;
75220
75221 if (tz) {
75222 + /* we log in do_settimeofday called below, so don't log twice
75223 + */
75224 + if (!tv)
75225 + gr_log_timechange();
75226 +
75227 /* SMP safe, global irq locking makes it work. */
75228 sys_tz = *tz;
75229 update_vsyscall_tz();
75230 @@ -240,7 +245,7 @@ EXPORT_SYMBOL(current_fs_time);
75231 * Avoid unnecessary multiplications/divisions in the
75232 * two most common HZ cases:
75233 */
75234 -unsigned int inline jiffies_to_msecs(const unsigned long j)
75235 +inline unsigned int jiffies_to_msecs(const unsigned long j)
75236 {
75237 #if HZ <= MSEC_PER_SEC && !(MSEC_PER_SEC % HZ)
75238 return (MSEC_PER_SEC / HZ) * j;
75239 @@ -256,7 +261,7 @@ unsigned int inline jiffies_to_msecs(const unsigned long j)
75240 }
75241 EXPORT_SYMBOL(jiffies_to_msecs);
75242
75243 -unsigned int inline jiffies_to_usecs(const unsigned long j)
75244 +inline unsigned int jiffies_to_usecs(const unsigned long j)
75245 {
75246 #if HZ <= USEC_PER_SEC && !(USEC_PER_SEC % HZ)
75247 return (USEC_PER_SEC / HZ) * j;
75248 diff --git a/kernel/time/tick-broadcast.c b/kernel/time/tick-broadcast.c
75249 index 57b953f..06f149f 100644
75250 --- a/kernel/time/tick-broadcast.c
75251 +++ b/kernel/time/tick-broadcast.c
75252 @@ -116,7 +116,7 @@ int tick_device_uses_broadcast(struct clock_event_device *dev, int cpu)
75253 * then clear the broadcast bit.
75254 */
75255 if (!(dev->features & CLOCK_EVT_FEAT_C3STOP)) {
75256 - int cpu = smp_processor_id();
75257 + cpu = smp_processor_id();
75258
75259 cpumask_clear_cpu(cpu, tick_get_broadcast_mask());
75260 tick_broadcast_clear_oneshot(cpu);
75261 diff --git a/kernel/time/timekeeping.c b/kernel/time/timekeeping.c
75262 index 4a71cff..ffb5548 100644
75263 --- a/kernel/time/timekeeping.c
75264 +++ b/kernel/time/timekeeping.c
75265 @@ -14,6 +14,7 @@
75266 #include <linux/init.h>
75267 #include <linux/mm.h>
75268 #include <linux/sched.h>
75269 +#include <linux/grsecurity.h>
75270 #include <linux/sysdev.h>
75271 #include <linux/clocksource.h>
75272 #include <linux/jiffies.h>
75273 @@ -180,7 +181,7 @@ void update_xtime_cache(u64 nsec)
75274 */
75275 struct timespec ts = xtime;
75276 timespec_add_ns(&ts, nsec);
75277 - ACCESS_ONCE(xtime_cache) = ts;
75278 + ACCESS_ONCE_RW(xtime_cache) = ts;
75279 }
75280
75281 /* must hold xtime_lock */
75282 @@ -337,6 +338,8 @@ int do_settimeofday(struct timespec *tv)
75283 if ((unsigned long)tv->tv_nsec >= NSEC_PER_SEC)
75284 return -EINVAL;
75285
75286 + gr_log_timechange();
75287 +
75288 write_seqlock_irqsave(&xtime_lock, flags);
75289
75290 timekeeping_forward_now();
75291 diff --git a/kernel/time/timer_list.c b/kernel/time/timer_list.c
75292 index 54c0dda..e9095d9 100644
75293 --- a/kernel/time/timer_list.c
75294 +++ b/kernel/time/timer_list.c
75295 @@ -38,12 +38,16 @@ DECLARE_PER_CPU(struct hrtimer_cpu_base, hrtimer_bases);
75296
75297 static void print_name_offset(struct seq_file *m, void *sym)
75298 {
75299 +#ifdef CONFIG_GRKERNSEC_HIDESYM
75300 + SEQ_printf(m, "<%p>", NULL);
75301 +#else
75302 char symname[KSYM_NAME_LEN];
75303
75304 if (lookup_symbol_name((unsigned long)sym, symname) < 0)
75305 SEQ_printf(m, "<%p>", sym);
75306 else
75307 SEQ_printf(m, "%s", symname);
75308 +#endif
75309 }
75310
75311 static void
75312 @@ -112,7 +116,11 @@ next_one:
75313 static void
75314 print_base(struct seq_file *m, struct hrtimer_clock_base *base, u64 now)
75315 {
75316 +#ifdef CONFIG_GRKERNSEC_HIDESYM
75317 + SEQ_printf(m, " .base: %p\n", NULL);
75318 +#else
75319 SEQ_printf(m, " .base: %p\n", base);
75320 +#endif
75321 SEQ_printf(m, " .index: %d\n",
75322 base->index);
75323 SEQ_printf(m, " .resolution: %Lu nsecs\n",
75324 @@ -289,7 +297,11 @@ static int __init init_timer_list_procfs(void)
75325 {
75326 struct proc_dir_entry *pe;
75327
75328 +#ifdef CONFIG_GRKERNSEC_PROC_ADD
75329 + pe = proc_create("timer_list", 0400, NULL, &timer_list_fops);
75330 +#else
75331 pe = proc_create("timer_list", 0444, NULL, &timer_list_fops);
75332 +#endif
75333 if (!pe)
75334 return -ENOMEM;
75335 return 0;
75336 diff --git a/kernel/time/timer_stats.c b/kernel/time/timer_stats.c
75337 index ee5681f..634089b 100644
75338 --- a/kernel/time/timer_stats.c
75339 +++ b/kernel/time/timer_stats.c
75340 @@ -116,7 +116,7 @@ static ktime_t time_start, time_stop;
75341 static unsigned long nr_entries;
75342 static struct entry entries[MAX_ENTRIES];
75343
75344 -static atomic_t overflow_count;
75345 +static atomic_unchecked_t overflow_count;
75346
75347 /*
75348 * The entries are in a hash-table, for fast lookup:
75349 @@ -140,7 +140,7 @@ static void reset_entries(void)
75350 nr_entries = 0;
75351 memset(entries, 0, sizeof(entries));
75352 memset(tstat_hash_table, 0, sizeof(tstat_hash_table));
75353 - atomic_set(&overflow_count, 0);
75354 + atomic_set_unchecked(&overflow_count, 0);
75355 }
75356
75357 static struct entry *alloc_entry(void)
75358 @@ -261,7 +261,7 @@ void timer_stats_update_stats(void *timer, pid_t pid, void *startf,
75359 if (likely(entry))
75360 entry->count++;
75361 else
75362 - atomic_inc(&overflow_count);
75363 + atomic_inc_unchecked(&overflow_count);
75364
75365 out_unlock:
75366 spin_unlock_irqrestore(lock, flags);
75367 @@ -269,12 +269,16 @@ void timer_stats_update_stats(void *timer, pid_t pid, void *startf,
75368
75369 static void print_name_offset(struct seq_file *m, unsigned long addr)
75370 {
75371 +#ifdef CONFIG_GRKERNSEC_HIDESYM
75372 + seq_printf(m, "<%p>", NULL);
75373 +#else
75374 char symname[KSYM_NAME_LEN];
75375
75376 if (lookup_symbol_name(addr, symname) < 0)
75377 seq_printf(m, "<%p>", (void *)addr);
75378 else
75379 seq_printf(m, "%s", symname);
75380 +#endif
75381 }
75382
75383 static int tstats_show(struct seq_file *m, void *v)
75384 @@ -300,9 +304,9 @@ static int tstats_show(struct seq_file *m, void *v)
75385
75386 seq_puts(m, "Timer Stats Version: v0.2\n");
75387 seq_printf(m, "Sample period: %ld.%03ld s\n", period.tv_sec, ms);
75388 - if (atomic_read(&overflow_count))
75389 + if (atomic_read_unchecked(&overflow_count))
75390 seq_printf(m, "Overflow: %d entries\n",
75391 - atomic_read(&overflow_count));
75392 + atomic_read_unchecked(&overflow_count));
75393
75394 for (i = 0; i < nr_entries; i++) {
75395 entry = entries + i;
75396 @@ -415,7 +419,11 @@ static int __init init_tstats_procfs(void)
75397 {
75398 struct proc_dir_entry *pe;
75399
75400 +#ifdef CONFIG_GRKERNSEC_PROC_ADD
75401 + pe = proc_create("timer_stats", 0600, NULL, &tstats_fops);
75402 +#else
75403 pe = proc_create("timer_stats", 0644, NULL, &tstats_fops);
75404 +#endif
75405 if (!pe)
75406 return -ENOMEM;
75407 return 0;
75408 diff --git a/kernel/timer.c b/kernel/timer.c
75409 index cb3c1f1..8bf5526 100644
75410 --- a/kernel/timer.c
75411 +++ b/kernel/timer.c
75412 @@ -1213,7 +1213,7 @@ void update_process_times(int user_tick)
75413 /*
75414 * This function runs timers and the timer-tq in bottom half context.
75415 */
75416 -static void run_timer_softirq(struct softirq_action *h)
75417 +static void run_timer_softirq(void)
75418 {
75419 struct tvec_base *base = __get_cpu_var(tvec_bases);
75420
75421 diff --git a/kernel/trace/blktrace.c b/kernel/trace/blktrace.c
75422 index d9d6206..f19467e 100644
75423 --- a/kernel/trace/blktrace.c
75424 +++ b/kernel/trace/blktrace.c
75425 @@ -313,7 +313,7 @@ static ssize_t blk_dropped_read(struct file *filp, char __user *buffer,
75426 struct blk_trace *bt = filp->private_data;
75427 char buf[16];
75428
75429 - snprintf(buf, sizeof(buf), "%u\n", atomic_read(&bt->dropped));
75430 + snprintf(buf, sizeof(buf), "%u\n", atomic_read_unchecked(&bt->dropped));
75431
75432 return simple_read_from_buffer(buffer, count, ppos, buf, strlen(buf));
75433 }
75434 @@ -376,7 +376,7 @@ static int blk_subbuf_start_callback(struct rchan_buf *buf, void *subbuf,
75435 return 1;
75436
75437 bt = buf->chan->private_data;
75438 - atomic_inc(&bt->dropped);
75439 + atomic_inc_unchecked(&bt->dropped);
75440 return 0;
75441 }
75442
75443 @@ -477,7 +477,7 @@ int do_blk_trace_setup(struct request_queue *q, char *name, dev_t dev,
75444
75445 bt->dir = dir;
75446 bt->dev = dev;
75447 - atomic_set(&bt->dropped, 0);
75448 + atomic_set_unchecked(&bt->dropped, 0);
75449
75450 ret = -EIO;
75451 bt->dropped_file = debugfs_create_file("dropped", 0444, dir, bt,
75452 diff --git a/kernel/trace/ftrace.c b/kernel/trace/ftrace.c
75453 index 4872937..c794d40 100644
75454 --- a/kernel/trace/ftrace.c
75455 +++ b/kernel/trace/ftrace.c
75456 @@ -1100,13 +1100,18 @@ ftrace_code_disable(struct module *mod, struct dyn_ftrace *rec)
75457
75458 ip = rec->ip;
75459
75460 + ret = ftrace_arch_code_modify_prepare();
75461 + FTRACE_WARN_ON(ret);
75462 + if (ret)
75463 + return 0;
75464 +
75465 ret = ftrace_make_nop(mod, rec, MCOUNT_ADDR);
75466 + FTRACE_WARN_ON(ftrace_arch_code_modify_post_process());
75467 if (ret) {
75468 ftrace_bug(ret, ip);
75469 rec->flags |= FTRACE_FL_FAILED;
75470 - return 0;
75471 }
75472 - return 1;
75473 + return ret ? 0 : 1;
75474 }
75475
75476 /*
75477 diff --git a/kernel/trace/ring_buffer.c b/kernel/trace/ring_buffer.c
75478 index e749a05..19c6e94 100644
75479 --- a/kernel/trace/ring_buffer.c
75480 +++ b/kernel/trace/ring_buffer.c
75481 @@ -606,7 +606,7 @@ static struct list_head *rb_list_head(struct list_head *list)
75482 * the reader page). But if the next page is a header page,
75483 * its flags will be non zero.
75484 */
75485 -static int inline
75486 +static inline int
75487 rb_is_head_page(struct ring_buffer_per_cpu *cpu_buffer,
75488 struct buffer_page *page, struct list_head *list)
75489 {
75490 diff --git a/kernel/trace/trace.c b/kernel/trace/trace.c
75491 index a2a2d1f..7f32b09 100644
75492 --- a/kernel/trace/trace.c
75493 +++ b/kernel/trace/trace.c
75494 @@ -3193,6 +3193,8 @@ static ssize_t tracing_splice_read_pipe(struct file *filp,
75495 size_t rem;
75496 unsigned int i;
75497
75498 + pax_track_stack();
75499 +
75500 /* copy the tracer to avoid using a global lock all around */
75501 mutex_lock(&trace_types_lock);
75502 if (unlikely(old_tracer != current_trace && current_trace)) {
75503 @@ -3659,6 +3661,8 @@ tracing_buffers_splice_read(struct file *file, loff_t *ppos,
75504 int entries, size, i;
75505 size_t ret;
75506
75507 + pax_track_stack();
75508 +
75509 if (*ppos & (PAGE_SIZE - 1)) {
75510 WARN_ONCE(1, "Ftrace: previous read must page-align\n");
75511 return -EINVAL;
75512 @@ -3816,10 +3820,9 @@ static const struct file_operations tracing_dyn_info_fops = {
75513 };
75514 #endif
75515
75516 -static struct dentry *d_tracer;
75517 -
75518 struct dentry *tracing_init_dentry(void)
75519 {
75520 + static struct dentry *d_tracer;
75521 static int once;
75522
75523 if (d_tracer)
75524 @@ -3839,10 +3842,9 @@ struct dentry *tracing_init_dentry(void)
75525 return d_tracer;
75526 }
75527
75528 -static struct dentry *d_percpu;
75529 -
75530 struct dentry *tracing_dentry_percpu(void)
75531 {
75532 + static struct dentry *d_percpu;
75533 static int once;
75534 struct dentry *d_tracer;
75535
75536 diff --git a/kernel/trace/trace_events.c b/kernel/trace/trace_events.c
75537 index d128f65..f37b4af 100644
75538 --- a/kernel/trace/trace_events.c
75539 +++ b/kernel/trace/trace_events.c
75540 @@ -951,13 +951,10 @@ static LIST_HEAD(ftrace_module_file_list);
75541 * Modules must own their file_operations to keep up with
75542 * reference counting.
75543 */
75544 +
75545 struct ftrace_module_file_ops {
75546 struct list_head list;
75547 struct module *mod;
75548 - struct file_operations id;
75549 - struct file_operations enable;
75550 - struct file_operations format;
75551 - struct file_operations filter;
75552 };
75553
75554 static void remove_subsystem_dir(const char *name)
75555 @@ -1004,17 +1001,12 @@ trace_create_file_ops(struct module *mod)
75556
75557 file_ops->mod = mod;
75558
75559 - file_ops->id = ftrace_event_id_fops;
75560 - file_ops->id.owner = mod;
75561 -
75562 - file_ops->enable = ftrace_enable_fops;
75563 - file_ops->enable.owner = mod;
75564 -
75565 - file_ops->filter = ftrace_event_filter_fops;
75566 - file_ops->filter.owner = mod;
75567 -
75568 - file_ops->format = ftrace_event_format_fops;
75569 - file_ops->format.owner = mod;
75570 + pax_open_kernel();
75571 + *(void **)&mod->trace_id.owner = mod;
75572 + *(void **)&mod->trace_enable.owner = mod;
75573 + *(void **)&mod->trace_filter.owner = mod;
75574 + *(void **)&mod->trace_format.owner = mod;
75575 + pax_close_kernel();
75576
75577 list_add(&file_ops->list, &ftrace_module_file_list);
75578
75579 @@ -1063,8 +1055,8 @@ static void trace_module_add_events(struct module *mod)
75580 call->mod = mod;
75581 list_add(&call->list, &ftrace_events);
75582 event_create_dir(call, d_events,
75583 - &file_ops->id, &file_ops->enable,
75584 - &file_ops->filter, &file_ops->format);
75585 + &mod->trace_id, &mod->trace_enable,
75586 + &mod->trace_filter, &mod->trace_format);
75587 }
75588 }
75589
75590 diff --git a/kernel/trace/trace_mmiotrace.c b/kernel/trace/trace_mmiotrace.c
75591 index 0acd834..b800b56 100644
75592 --- a/kernel/trace/trace_mmiotrace.c
75593 +++ b/kernel/trace/trace_mmiotrace.c
75594 @@ -23,7 +23,7 @@ struct header_iter {
75595 static struct trace_array *mmio_trace_array;
75596 static bool overrun_detected;
75597 static unsigned long prev_overruns;
75598 -static atomic_t dropped_count;
75599 +static atomic_unchecked_t dropped_count;
75600
75601 static void mmio_reset_data(struct trace_array *tr)
75602 {
75603 @@ -126,7 +126,7 @@ static void mmio_close(struct trace_iterator *iter)
75604
75605 static unsigned long count_overruns(struct trace_iterator *iter)
75606 {
75607 - unsigned long cnt = atomic_xchg(&dropped_count, 0);
75608 + unsigned long cnt = atomic_xchg_unchecked(&dropped_count, 0);
75609 unsigned long over = ring_buffer_overruns(iter->tr->buffer);
75610
75611 if (over > prev_overruns)
75612 @@ -316,7 +316,7 @@ static void __trace_mmiotrace_rw(struct trace_array *tr,
75613 event = trace_buffer_lock_reserve(buffer, TRACE_MMIO_RW,
75614 sizeof(*entry), 0, pc);
75615 if (!event) {
75616 - atomic_inc(&dropped_count);
75617 + atomic_inc_unchecked(&dropped_count);
75618 return;
75619 }
75620 entry = ring_buffer_event_data(event);
75621 @@ -346,7 +346,7 @@ static void __trace_mmiotrace_map(struct trace_array *tr,
75622 event = trace_buffer_lock_reserve(buffer, TRACE_MMIO_MAP,
75623 sizeof(*entry), 0, pc);
75624 if (!event) {
75625 - atomic_inc(&dropped_count);
75626 + atomic_inc_unchecked(&dropped_count);
75627 return;
75628 }
75629 entry = ring_buffer_event_data(event);
75630 diff --git a/kernel/trace/trace_output.c b/kernel/trace/trace_output.c
75631 index b6c12c6..41fdc53 100644
75632 --- a/kernel/trace/trace_output.c
75633 +++ b/kernel/trace/trace_output.c
75634 @@ -237,7 +237,7 @@ int trace_seq_path(struct trace_seq *s, struct path *path)
75635 return 0;
75636 p = d_path(path, s->buffer + s->len, PAGE_SIZE - s->len);
75637 if (!IS_ERR(p)) {
75638 - p = mangle_path(s->buffer + s->len, p, "\n");
75639 + p = mangle_path(s->buffer + s->len, p, "\n\\");
75640 if (p) {
75641 s->len = p - s->buffer;
75642 return 1;
75643 diff --git a/kernel/trace/trace_stack.c b/kernel/trace/trace_stack.c
75644 index 8504ac7..ecf0adb 100644
75645 --- a/kernel/trace/trace_stack.c
75646 +++ b/kernel/trace/trace_stack.c
75647 @@ -50,7 +50,7 @@ static inline void check_stack(void)
75648 return;
75649
75650 /* we do not handle interrupt stacks yet */
75651 - if (!object_is_on_stack(&this_size))
75652 + if (!object_starts_on_stack(&this_size))
75653 return;
75654
75655 local_irq_save(flags);
75656 diff --git a/kernel/trace/trace_workqueue.c b/kernel/trace/trace_workqueue.c
75657 index 40cafb0..d5ead43 100644
75658 --- a/kernel/trace/trace_workqueue.c
75659 +++ b/kernel/trace/trace_workqueue.c
75660 @@ -21,7 +21,7 @@ struct cpu_workqueue_stats {
75661 int cpu;
75662 pid_t pid;
75663 /* Can be inserted from interrupt or user context, need to be atomic */
75664 - atomic_t inserted;
75665 + atomic_unchecked_t inserted;
75666 /*
75667 * Don't need to be atomic, works are serialized in a single workqueue thread
75668 * on a single CPU.
75669 @@ -58,7 +58,7 @@ probe_workqueue_insertion(struct task_struct *wq_thread,
75670 spin_lock_irqsave(&workqueue_cpu_stat(cpu)->lock, flags);
75671 list_for_each_entry(node, &workqueue_cpu_stat(cpu)->list, list) {
75672 if (node->pid == wq_thread->pid) {
75673 - atomic_inc(&node->inserted);
75674 + atomic_inc_unchecked(&node->inserted);
75675 goto found;
75676 }
75677 }
75678 @@ -205,7 +205,7 @@ static int workqueue_stat_show(struct seq_file *s, void *p)
75679 tsk = get_pid_task(pid, PIDTYPE_PID);
75680 if (tsk) {
75681 seq_printf(s, "%3d %6d %6u %s\n", cws->cpu,
75682 - atomic_read(&cws->inserted), cws->executed,
75683 + atomic_read_unchecked(&cws->inserted), cws->executed,
75684 tsk->comm);
75685 put_task_struct(tsk);
75686 }
75687 diff --git a/kernel/user.c b/kernel/user.c
75688 index 1b91701..8795237 100644
75689 --- a/kernel/user.c
75690 +++ b/kernel/user.c
75691 @@ -159,6 +159,7 @@ struct user_struct *alloc_uid(struct user_namespace *ns, uid_t uid)
75692 spin_lock_irq(&uidhash_lock);
75693 up = uid_hash_find(uid, hashent);
75694 if (up) {
75695 + put_user_ns(ns);
75696 key_put(new->uid_keyring);
75697 key_put(new->session_keyring);
75698 kmem_cache_free(uid_cachep, new);
75699 diff --git a/lib/Kconfig.debug b/lib/Kconfig.debug
75700 index 234ceb1..ad74049 100644
75701 --- a/lib/Kconfig.debug
75702 +++ b/lib/Kconfig.debug
75703 @@ -905,7 +905,7 @@ config LATENCYTOP
75704 select STACKTRACE
75705 select SCHEDSTATS
75706 select SCHED_DEBUG
75707 - depends on HAVE_LATENCYTOP_SUPPORT
75708 + depends on HAVE_LATENCYTOP_SUPPORT && !GRKERNSEC_HIDESYM
75709 help
75710 Enable this option if you want to use the LatencyTOP tool
75711 to find out which userspace is blocking on what kernel operations.
75712 diff --git a/lib/bitmap.c b/lib/bitmap.c
75713 index 7025658..8d14cab 100644
75714 --- a/lib/bitmap.c
75715 +++ b/lib/bitmap.c
75716 @@ -341,7 +341,7 @@ int __bitmap_parse(const char *buf, unsigned int buflen,
75717 {
75718 int c, old_c, totaldigits, ndigits, nchunks, nbits;
75719 u32 chunk;
75720 - const char __user *ubuf = buf;
75721 + const char __user *ubuf = (const char __force_user *)buf;
75722
75723 bitmap_zero(maskp, nmaskbits);
75724
75725 @@ -426,7 +426,7 @@ int bitmap_parse_user(const char __user *ubuf,
75726 {
75727 if (!access_ok(VERIFY_READ, ubuf, ulen))
75728 return -EFAULT;
75729 - return __bitmap_parse((const char *)ubuf, ulen, 1, maskp, nmaskbits);
75730 + return __bitmap_parse((const char __force_kernel *)ubuf, ulen, 1, maskp, nmaskbits);
75731 }
75732 EXPORT_SYMBOL(bitmap_parse_user);
75733
75734 diff --git a/lib/bug.c b/lib/bug.c
75735 index 300e41a..2779eb0 100644
75736 --- a/lib/bug.c
75737 +++ b/lib/bug.c
75738 @@ -135,6 +135,8 @@ enum bug_trap_type report_bug(unsigned long bugaddr, struct pt_regs *regs)
75739 return BUG_TRAP_TYPE_NONE;
75740
75741 bug = find_bug(bugaddr);
75742 + if (!bug)
75743 + return BUG_TRAP_TYPE_NONE;
75744
75745 printk(KERN_EMERG "------------[ cut here ]------------\n");
75746
75747 diff --git a/lib/debugobjects.c b/lib/debugobjects.c
75748 index 2b413db..e21d207 100644
75749 --- a/lib/debugobjects.c
75750 +++ b/lib/debugobjects.c
75751 @@ -277,7 +277,7 @@ static void debug_object_is_on_stack(void *addr, int onstack)
75752 if (limit > 4)
75753 return;
75754
75755 - is_on_stack = object_is_on_stack(addr);
75756 + is_on_stack = object_starts_on_stack(addr);
75757 if (is_on_stack == onstack)
75758 return;
75759
75760 diff --git a/lib/devres.c b/lib/devres.c
75761 index 72c8909..7543868 100644
75762 --- a/lib/devres.c
75763 +++ b/lib/devres.c
75764 @@ -80,7 +80,7 @@ void devm_iounmap(struct device *dev, void __iomem *addr)
75765 {
75766 iounmap(addr);
75767 WARN_ON(devres_destroy(dev, devm_ioremap_release, devm_ioremap_match,
75768 - (void *)addr));
75769 + (void __force *)addr));
75770 }
75771 EXPORT_SYMBOL(devm_iounmap);
75772
75773 @@ -140,7 +140,7 @@ void devm_ioport_unmap(struct device *dev, void __iomem *addr)
75774 {
75775 ioport_unmap(addr);
75776 WARN_ON(devres_destroy(dev, devm_ioport_map_release,
75777 - devm_ioport_map_match, (void *)addr));
75778 + devm_ioport_map_match, (void __force *)addr));
75779 }
75780 EXPORT_SYMBOL(devm_ioport_unmap);
75781
75782 diff --git a/lib/dma-debug.c b/lib/dma-debug.c
75783 index 084e879..0674448 100644
75784 --- a/lib/dma-debug.c
75785 +++ b/lib/dma-debug.c
75786 @@ -861,7 +861,7 @@ out:
75787
75788 static void check_for_stack(struct device *dev, void *addr)
75789 {
75790 - if (object_is_on_stack(addr))
75791 + if (object_starts_on_stack(addr))
75792 err_printk(dev, NULL, "DMA-API: device driver maps memory from"
75793 "stack [addr=%p]\n", addr);
75794 }
75795 diff --git a/lib/idr.c b/lib/idr.c
75796 index eda7ba3..915dfae 100644
75797 --- a/lib/idr.c
75798 +++ b/lib/idr.c
75799 @@ -156,7 +156,7 @@ static int sub_alloc(struct idr *idp, int *starting_id, struct idr_layer **pa)
75800 id = (id | ((1 << (IDR_BITS * l)) - 1)) + 1;
75801
75802 /* if already at the top layer, we need to grow */
75803 - if (id >= 1 << (idp->layers * IDR_BITS)) {
75804 + if (id >= (1 << (idp->layers * IDR_BITS))) {
75805 *starting_id = id;
75806 return IDR_NEED_TO_GROW;
75807 }
75808 diff --git a/lib/inflate.c b/lib/inflate.c
75809 index d102559..4215f31 100644
75810 --- a/lib/inflate.c
75811 +++ b/lib/inflate.c
75812 @@ -266,7 +266,7 @@ static void free(void *where)
75813 malloc_ptr = free_mem_ptr;
75814 }
75815 #else
75816 -#define malloc(a) kmalloc(a, GFP_KERNEL)
75817 +#define malloc(a) kmalloc((a), GFP_KERNEL)
75818 #define free(a) kfree(a)
75819 #endif
75820
75821 diff --git a/lib/kobject.c b/lib/kobject.c
75822 index b512b74..8115eb1 100644
75823 --- a/lib/kobject.c
75824 +++ b/lib/kobject.c
75825 @@ -700,7 +700,7 @@ static ssize_t kobj_attr_store(struct kobject *kobj, struct attribute *attr,
75826 return ret;
75827 }
75828
75829 -struct sysfs_ops kobj_sysfs_ops = {
75830 +const struct sysfs_ops kobj_sysfs_ops = {
75831 .show = kobj_attr_show,
75832 .store = kobj_attr_store,
75833 };
75834 @@ -789,7 +789,7 @@ static struct kobj_type kset_ktype = {
75835 * If the kset was not able to be created, NULL will be returned.
75836 */
75837 static struct kset *kset_create(const char *name,
75838 - struct kset_uevent_ops *uevent_ops,
75839 + const struct kset_uevent_ops *uevent_ops,
75840 struct kobject *parent_kobj)
75841 {
75842 struct kset *kset;
75843 @@ -832,7 +832,7 @@ static struct kset *kset_create(const char *name,
75844 * If the kset was not able to be created, NULL will be returned.
75845 */
75846 struct kset *kset_create_and_add(const char *name,
75847 - struct kset_uevent_ops *uevent_ops,
75848 + const struct kset_uevent_ops *uevent_ops,
75849 struct kobject *parent_kobj)
75850 {
75851 struct kset *kset;
75852 diff --git a/lib/kobject_uevent.c b/lib/kobject_uevent.c
75853 index 507b821..0bf8ed0 100644
75854 --- a/lib/kobject_uevent.c
75855 +++ b/lib/kobject_uevent.c
75856 @@ -95,7 +95,7 @@ int kobject_uevent_env(struct kobject *kobj, enum kobject_action action,
75857 const char *subsystem;
75858 struct kobject *top_kobj;
75859 struct kset *kset;
75860 - struct kset_uevent_ops *uevent_ops;
75861 + const struct kset_uevent_ops *uevent_ops;
75862 u64 seq;
75863 int i = 0;
75864 int retval = 0;
75865 diff --git a/lib/kref.c b/lib/kref.c
75866 index 9ecd6e8..12c94c1 100644
75867 --- a/lib/kref.c
75868 +++ b/lib/kref.c
75869 @@ -61,7 +61,7 @@ void kref_get(struct kref *kref)
75870 */
75871 int kref_put(struct kref *kref, void (*release)(struct kref *kref))
75872 {
75873 - WARN_ON(release == NULL);
75874 + BUG_ON(release == NULL);
75875 WARN_ON(release == (void (*)(struct kref *))kfree);
75876
75877 if (atomic_dec_and_test(&kref->refcount)) {
75878 diff --git a/lib/parser.c b/lib/parser.c
75879 index b00d020..1b34325 100644
75880 --- a/lib/parser.c
75881 +++ b/lib/parser.c
75882 @@ -126,7 +126,7 @@ static int match_number(substring_t *s, int *result, int base)
75883 char *buf;
75884 int ret;
75885
75886 - buf = kmalloc(s->to - s->from + 1, GFP_KERNEL);
75887 + buf = kmalloc((s->to - s->from) + 1, GFP_KERNEL);
75888 if (!buf)
75889 return -ENOMEM;
75890 memcpy(buf, s->from, s->to - s->from);
75891 diff --git a/lib/radix-tree.c b/lib/radix-tree.c
75892 index 92cdd99..a8149d7 100644
75893 --- a/lib/radix-tree.c
75894 +++ b/lib/radix-tree.c
75895 @@ -81,7 +81,7 @@ struct radix_tree_preload {
75896 int nr;
75897 struct radix_tree_node *nodes[RADIX_TREE_MAX_PATH];
75898 };
75899 -static DEFINE_PER_CPU(struct radix_tree_preload, radix_tree_preloads) = { 0, };
75900 +static DEFINE_PER_CPU(struct radix_tree_preload, radix_tree_preloads);
75901
75902 static inline gfp_t root_gfp_mask(struct radix_tree_root *root)
75903 {
75904 diff --git a/lib/random32.c b/lib/random32.c
75905 index 217d5c4..45aba8a 100644
75906 --- a/lib/random32.c
75907 +++ b/lib/random32.c
75908 @@ -61,7 +61,7 @@ static u32 __random32(struct rnd_state *state)
75909 */
75910 static inline u32 __seed(u32 x, u32 m)
75911 {
75912 - return (x < m) ? x + m : x;
75913 + return (x <= m) ? x + m + 1 : x;
75914 }
75915
75916 /**
75917 diff --git a/lib/vsprintf.c b/lib/vsprintf.c
75918 index 33bed5e..1477e46 100644
75919 --- a/lib/vsprintf.c
75920 +++ b/lib/vsprintf.c
75921 @@ -16,6 +16,9 @@
75922 * - scnprintf and vscnprintf
75923 */
75924
75925 +#ifdef CONFIG_GRKERNSEC_HIDESYM
75926 +#define __INCLUDED_BY_HIDESYM 1
75927 +#endif
75928 #include <stdarg.h>
75929 #include <linux/module.h>
75930 #include <linux/types.h>
75931 @@ -546,12 +549,12 @@ static char *number(char *buf, char *end, unsigned long long num,
75932 return buf;
75933 }
75934
75935 -static char *string(char *buf, char *end, char *s, struct printf_spec spec)
75936 +static char *string(char *buf, char *end, const char *s, struct printf_spec spec)
75937 {
75938 int len, i;
75939
75940 if ((unsigned long)s < PAGE_SIZE)
75941 - s = "<NULL>";
75942 + s = "(null)";
75943
75944 len = strnlen(s, spec.precision);
75945
75946 @@ -581,7 +584,7 @@ static char *symbol_string(char *buf, char *end, void *ptr,
75947 unsigned long value = (unsigned long) ptr;
75948 #ifdef CONFIG_KALLSYMS
75949 char sym[KSYM_SYMBOL_LEN];
75950 - if (ext != 'f' && ext != 's')
75951 + if (ext != 'f' && ext != 's' && ext != 'a')
75952 sprint_symbol(sym, value);
75953 else
75954 kallsyms_lookup(value, NULL, NULL, NULL, sym);
75955 @@ -801,6 +804,8 @@ static char *ip4_addr_string(char *buf, char *end, const u8 *addr,
75956 * - 'f' For simple symbolic function names without offset
75957 * - 'S' For symbolic direct pointers with offset
75958 * - 's' For symbolic direct pointers without offset
75959 + * - 'A' For symbolic direct pointers with offset approved for use with GRKERNSEC_HIDESYM
75960 + * - 'a' For symbolic direct pointers without offset approved for use with GRKERNSEC_HIDESYM
75961 * - 'R' For a struct resource pointer, it prints the range of
75962 * addresses (not the name nor the flags)
75963 * - 'M' For a 6-byte MAC address, it prints the address in the
75964 @@ -822,7 +827,7 @@ static char *pointer(const char *fmt, char *buf, char *end, void *ptr,
75965 struct printf_spec spec)
75966 {
75967 if (!ptr)
75968 - return string(buf, end, "(null)", spec);
75969 + return string(buf, end, "(nil)", spec);
75970
75971 switch (*fmt) {
75972 case 'F':
75973 @@ -831,6 +836,14 @@ static char *pointer(const char *fmt, char *buf, char *end, void *ptr,
75974 case 's':
75975 /* Fallthrough */
75976 case 'S':
75977 +#ifdef CONFIG_GRKERNSEC_HIDESYM
75978 + break;
75979 +#else
75980 + return symbol_string(buf, end, ptr, spec, *fmt);
75981 +#endif
75982 + case 'a':
75983 + /* Fallthrough */
75984 + case 'A':
75985 return symbol_string(buf, end, ptr, spec, *fmt);
75986 case 'R':
75987 return resource_string(buf, end, ptr, spec);
75988 @@ -1445,7 +1458,7 @@ do { \
75989 size_t len;
75990 if ((unsigned long)save_str > (unsigned long)-PAGE_SIZE
75991 || (unsigned long)save_str < PAGE_SIZE)
75992 - save_str = "<NULL>";
75993 + save_str = "(null)";
75994 len = strlen(save_str);
75995 if (str + len + 1 < end)
75996 memcpy(str, save_str, len + 1);
75997 @@ -1555,11 +1568,11 @@ int bstr_printf(char *buf, size_t size, const char *fmt, const u32 *bin_buf)
75998 typeof(type) value; \
75999 if (sizeof(type) == 8) { \
76000 args = PTR_ALIGN(args, sizeof(u32)); \
76001 - *(u32 *)&value = *(u32 *)args; \
76002 - *((u32 *)&value + 1) = *(u32 *)(args + 4); \
76003 + *(u32 *)&value = *(const u32 *)args; \
76004 + *((u32 *)&value + 1) = *(const u32 *)(args + 4); \
76005 } else { \
76006 args = PTR_ALIGN(args, sizeof(type)); \
76007 - value = *(typeof(type) *)args; \
76008 + value = *(const typeof(type) *)args; \
76009 } \
76010 args += sizeof(type); \
76011 value; \
76012 @@ -1622,7 +1635,7 @@ int bstr_printf(char *buf, size_t size, const char *fmt, const u32 *bin_buf)
76013 const char *str_arg = args;
76014 size_t len = strlen(str_arg);
76015 args += len + 1;
76016 - str = string(str, end, (char *)str_arg, spec);
76017 + str = string(str, end, str_arg, spec);
76018 break;
76019 }
76020
76021 diff --git a/localversion-grsec b/localversion-grsec
76022 new file mode 100644
76023 index 0000000..7cd6065
76024 --- /dev/null
76025 +++ b/localversion-grsec
76026 @@ -0,0 +1 @@
76027 +-grsec
76028 diff --git a/mm/Kconfig b/mm/Kconfig
76029 index 2c19c0b..f3c3f83 100644
76030 --- a/mm/Kconfig
76031 +++ b/mm/Kconfig
76032 @@ -228,7 +228,7 @@ config KSM
76033 config DEFAULT_MMAP_MIN_ADDR
76034 int "Low address space to protect from user allocation"
76035 depends on MMU
76036 - default 4096
76037 + default 65536
76038 help
76039 This is the portion of low virtual memory which should be protected
76040 from userspace allocation. Keeping a user from writing to low pages
76041 diff --git a/mm/backing-dev.c b/mm/backing-dev.c
76042 index 67a33a5..094dcf1 100644
76043 --- a/mm/backing-dev.c
76044 +++ b/mm/backing-dev.c
76045 @@ -272,7 +272,7 @@ static void bdi_task_init(struct backing_dev_info *bdi,
76046 list_add_tail_rcu(&wb->list, &bdi->wb_list);
76047 spin_unlock(&bdi->wb_lock);
76048
76049 - tsk->flags |= PF_FLUSHER | PF_SWAPWRITE;
76050 + tsk->flags |= PF_SWAPWRITE;
76051 set_freezable();
76052
76053 /*
76054 @@ -484,7 +484,7 @@ static void bdi_add_to_pending(struct rcu_head *head)
76055 * Add the default flusher task that gets created for any bdi
76056 * that has dirty data pending writeout
76057 */
76058 -void static bdi_add_default_flusher_task(struct backing_dev_info *bdi)
76059 +static void bdi_add_default_flusher_task(struct backing_dev_info *bdi)
76060 {
76061 if (!bdi_cap_writeback_dirty(bdi))
76062 return;
76063 diff --git a/mm/filemap.c b/mm/filemap.c
76064 index a1fe378..e26702f 100644
76065 --- a/mm/filemap.c
76066 +++ b/mm/filemap.c
76067 @@ -1631,7 +1631,7 @@ int generic_file_mmap(struct file * file, struct vm_area_struct * vma)
76068 struct address_space *mapping = file->f_mapping;
76069
76070 if (!mapping->a_ops->readpage)
76071 - return -ENOEXEC;
76072 + return -ENODEV;
76073 file_accessed(file);
76074 vma->vm_ops = &generic_file_vm_ops;
76075 vma->vm_flags |= VM_CAN_NONLINEAR;
76076 @@ -2024,6 +2024,7 @@ inline int generic_write_checks(struct file *file, loff_t *pos, size_t *count, i
76077 *pos = i_size_read(inode);
76078
76079 if (limit != RLIM_INFINITY) {
76080 + gr_learn_resource(current, RLIMIT_FSIZE,*pos, 0);
76081 if (*pos >= limit) {
76082 send_sig(SIGXFSZ, current, 0);
76083 return -EFBIG;
76084 diff --git a/mm/fremap.c b/mm/fremap.c
76085 index b6ec85a..a24ac22 100644
76086 --- a/mm/fremap.c
76087 +++ b/mm/fremap.c
76088 @@ -153,6 +153,11 @@ SYSCALL_DEFINE5(remap_file_pages, unsigned long, start, unsigned long, size,
76089 retry:
76090 vma = find_vma(mm, start);
76091
76092 +#ifdef CONFIG_PAX_SEGMEXEC
76093 + if (vma && (mm->pax_flags & MF_PAX_SEGMEXEC) && (vma->vm_flags & VM_MAYEXEC))
76094 + goto out;
76095 +#endif
76096 +
76097 /*
76098 * Make sure the vma is shared, that it supports prefaulting,
76099 * and that the remapped range is valid and fully within
76100 @@ -221,7 +226,7 @@ SYSCALL_DEFINE5(remap_file_pages, unsigned long, start, unsigned long, size,
76101 /*
76102 * drop PG_Mlocked flag for over-mapped range
76103 */
76104 - unsigned int saved_flags = vma->vm_flags;
76105 + unsigned long saved_flags = vma->vm_flags;
76106 munlock_vma_pages_range(vma, start, start + size);
76107 vma->vm_flags = saved_flags;
76108 }
76109 diff --git a/mm/highmem.c b/mm/highmem.c
76110 index 9c1e627..5ca9447 100644
76111 --- a/mm/highmem.c
76112 +++ b/mm/highmem.c
76113 @@ -116,9 +116,10 @@ static void flush_all_zero_pkmaps(void)
76114 * So no dangers, even with speculative execution.
76115 */
76116 page = pte_page(pkmap_page_table[i]);
76117 + pax_open_kernel();
76118 pte_clear(&init_mm, (unsigned long)page_address(page),
76119 &pkmap_page_table[i]);
76120 -
76121 + pax_close_kernel();
76122 set_page_address(page, NULL);
76123 need_flush = 1;
76124 }
76125 @@ -177,9 +178,11 @@ start:
76126 }
76127 }
76128 vaddr = PKMAP_ADDR(last_pkmap_nr);
76129 +
76130 + pax_open_kernel();
76131 set_pte_at(&init_mm, vaddr,
76132 &(pkmap_page_table[last_pkmap_nr]), mk_pte(page, kmap_prot));
76133 -
76134 + pax_close_kernel();
76135 pkmap_count[last_pkmap_nr] = 1;
76136 set_page_address(page, (void *)vaddr);
76137
76138 diff --git a/mm/hugetlb.c b/mm/hugetlb.c
76139 index 5e1e508..ac70275 100644
76140 --- a/mm/hugetlb.c
76141 +++ b/mm/hugetlb.c
76142 @@ -869,6 +869,7 @@ free:
76143 list_del(&page->lru);
76144 enqueue_huge_page(h, page);
76145 }
76146 + spin_unlock(&hugetlb_lock);
76147
76148 /* Free unnecessary surplus pages to the buddy allocator */
76149 if (!list_empty(&surplus_list)) {
76150 @@ -1933,6 +1934,26 @@ static int unmap_ref_private(struct mm_struct *mm, struct vm_area_struct *vma,
76151 return 1;
76152 }
76153
76154 +#ifdef CONFIG_PAX_SEGMEXEC
76155 +static void pax_mirror_huge_pte(struct vm_area_struct *vma, unsigned long address, struct page *page_m)
76156 +{
76157 + struct mm_struct *mm = vma->vm_mm;
76158 + struct vm_area_struct *vma_m;
76159 + unsigned long address_m;
76160 + pte_t *ptep_m;
76161 +
76162 + vma_m = pax_find_mirror_vma(vma);
76163 + if (!vma_m)
76164 + return;
76165 +
76166 + BUG_ON(address >= SEGMEXEC_TASK_SIZE);
76167 + address_m = address + SEGMEXEC_TASK_SIZE;
76168 + ptep_m = huge_pte_offset(mm, address_m & HPAGE_MASK);
76169 + get_page(page_m);
76170 + set_huge_pte_at(mm, address_m, ptep_m, make_huge_pte(vma_m, page_m, 0));
76171 +}
76172 +#endif
76173 +
76174 static int hugetlb_cow(struct mm_struct *mm, struct vm_area_struct *vma,
76175 unsigned long address, pte_t *ptep, pte_t pte,
76176 struct page *pagecache_page)
76177 @@ -2004,6 +2025,11 @@ retry_avoidcopy:
76178 huge_ptep_clear_flush(vma, address, ptep);
76179 set_huge_pte_at(mm, address, ptep,
76180 make_huge_pte(vma, new_page, 1));
76181 +
76182 +#ifdef CONFIG_PAX_SEGMEXEC
76183 + pax_mirror_huge_pte(vma, address, new_page);
76184 +#endif
76185 +
76186 /* Make the old page be freed below */
76187 new_page = old_page;
76188 }
76189 @@ -2135,6 +2161,10 @@ retry:
76190 && (vma->vm_flags & VM_SHARED)));
76191 set_huge_pte_at(mm, address, ptep, new_pte);
76192
76193 +#ifdef CONFIG_PAX_SEGMEXEC
76194 + pax_mirror_huge_pte(vma, address, page);
76195 +#endif
76196 +
76197 if ((flags & FAULT_FLAG_WRITE) && !(vma->vm_flags & VM_SHARED)) {
76198 /* Optimization, do the COW without a second fault */
76199 ret = hugetlb_cow(mm, vma, address, ptep, new_pte, page);
76200 @@ -2163,6 +2193,28 @@ int hugetlb_fault(struct mm_struct *mm, struct vm_area_struct *vma,
76201 static DEFINE_MUTEX(hugetlb_instantiation_mutex);
76202 struct hstate *h = hstate_vma(vma);
76203
76204 +#ifdef CONFIG_PAX_SEGMEXEC
76205 + struct vm_area_struct *vma_m;
76206 +
76207 + vma_m = pax_find_mirror_vma(vma);
76208 + if (vma_m) {
76209 + unsigned long address_m;
76210 +
76211 + if (vma->vm_start > vma_m->vm_start) {
76212 + address_m = address;
76213 + address -= SEGMEXEC_TASK_SIZE;
76214 + vma = vma_m;
76215 + h = hstate_vma(vma);
76216 + } else
76217 + address_m = address + SEGMEXEC_TASK_SIZE;
76218 +
76219 + if (!huge_pte_alloc(mm, address_m, huge_page_size(h)))
76220 + return VM_FAULT_OOM;
76221 + address_m &= HPAGE_MASK;
76222 + unmap_hugepage_range(vma, address_m, address_m + HPAGE_SIZE, NULL);
76223 + }
76224 +#endif
76225 +
76226 ptep = huge_pte_alloc(mm, address, huge_page_size(h));
76227 if (!ptep)
76228 return VM_FAULT_OOM;
76229 diff --git a/mm/internal.h b/mm/internal.h
76230 index f03e8e2..7354343 100644
76231 --- a/mm/internal.h
76232 +++ b/mm/internal.h
76233 @@ -49,6 +49,7 @@ extern void putback_lru_page(struct page *page);
76234 * in mm/page_alloc.c
76235 */
76236 extern void __free_pages_bootmem(struct page *page, unsigned int order);
76237 +extern void free_compound_page(struct page *page);
76238 extern void prep_compound_page(struct page *page, unsigned long order);
76239
76240
76241 diff --git a/mm/kmemleak.c b/mm/kmemleak.c
76242 index c346660..b47382f 100644
76243 --- a/mm/kmemleak.c
76244 +++ b/mm/kmemleak.c
76245 @@ -358,7 +358,7 @@ static void print_unreferenced(struct seq_file *seq,
76246
76247 for (i = 0; i < object->trace_len; i++) {
76248 void *ptr = (void *)object->trace[i];
76249 - seq_printf(seq, " [<%p>] %pS\n", ptr, ptr);
76250 + seq_printf(seq, " [<%p>] %pA\n", ptr, ptr);
76251 }
76252 }
76253
76254 diff --git a/mm/maccess.c b/mm/maccess.c
76255 index 9073695..1127f348 100644
76256 --- a/mm/maccess.c
76257 +++ b/mm/maccess.c
76258 @@ -14,7 +14,7 @@
76259 * Safely read from address @src to the buffer at @dst. If a kernel fault
76260 * happens, handle that and return -EFAULT.
76261 */
76262 -long probe_kernel_read(void *dst, void *src, size_t size)
76263 +long probe_kernel_read(void *dst, const void *src, size_t size)
76264 {
76265 long ret;
76266 mm_segment_t old_fs = get_fs();
76267 @@ -22,7 +22,7 @@ long probe_kernel_read(void *dst, void *src, size_t size)
76268 set_fs(KERNEL_DS);
76269 pagefault_disable();
76270 ret = __copy_from_user_inatomic(dst,
76271 - (__force const void __user *)src, size);
76272 + (const void __force_user *)src, size);
76273 pagefault_enable();
76274 set_fs(old_fs);
76275
76276 @@ -39,14 +39,14 @@ EXPORT_SYMBOL_GPL(probe_kernel_read);
76277 * Safely write to address @dst from the buffer at @src. If a kernel fault
76278 * happens, handle that and return -EFAULT.
76279 */
76280 -long notrace __weak probe_kernel_write(void *dst, void *src, size_t size)
76281 +long notrace __weak probe_kernel_write(void *dst, const void *src, size_t size)
76282 {
76283 long ret;
76284 mm_segment_t old_fs = get_fs();
76285
76286 set_fs(KERNEL_DS);
76287 pagefault_disable();
76288 - ret = __copy_to_user_inatomic((__force void __user *)dst, src, size);
76289 + ret = __copy_to_user_inatomic((void __force_user *)dst, src, size);
76290 pagefault_enable();
76291 set_fs(old_fs);
76292
76293 diff --git a/mm/madvise.c b/mm/madvise.c
76294 index 35b1479..499f7d4 100644
76295 --- a/mm/madvise.c
76296 +++ b/mm/madvise.c
76297 @@ -44,6 +44,10 @@ static long madvise_behavior(struct vm_area_struct * vma,
76298 pgoff_t pgoff;
76299 unsigned long new_flags = vma->vm_flags;
76300
76301 +#ifdef CONFIG_PAX_SEGMEXEC
76302 + struct vm_area_struct *vma_m;
76303 +#endif
76304 +
76305 switch (behavior) {
76306 case MADV_NORMAL:
76307 new_flags = new_flags & ~VM_RAND_READ & ~VM_SEQ_READ;
76308 @@ -103,6 +107,13 @@ success:
76309 /*
76310 * vm_flags is protected by the mmap_sem held in write mode.
76311 */
76312 +
76313 +#ifdef CONFIG_PAX_SEGMEXEC
76314 + vma_m = pax_find_mirror_vma(vma);
76315 + if (vma_m)
76316 + vma_m->vm_flags = new_flags & ~(VM_WRITE | VM_MAYWRITE | VM_ACCOUNT);
76317 +#endif
76318 +
76319 vma->vm_flags = new_flags;
76320
76321 out:
76322 @@ -161,6 +172,11 @@ static long madvise_dontneed(struct vm_area_struct * vma,
76323 struct vm_area_struct ** prev,
76324 unsigned long start, unsigned long end)
76325 {
76326 +
76327 +#ifdef CONFIG_PAX_SEGMEXEC
76328 + struct vm_area_struct *vma_m;
76329 +#endif
76330 +
76331 *prev = vma;
76332 if (vma->vm_flags & (VM_LOCKED|VM_HUGETLB|VM_PFNMAP))
76333 return -EINVAL;
76334 @@ -173,6 +189,21 @@ static long madvise_dontneed(struct vm_area_struct * vma,
76335 zap_page_range(vma, start, end - start, &details);
76336 } else
76337 zap_page_range(vma, start, end - start, NULL);
76338 +
76339 +#ifdef CONFIG_PAX_SEGMEXEC
76340 + vma_m = pax_find_mirror_vma(vma);
76341 + if (vma_m) {
76342 + if (unlikely(vma->vm_flags & VM_NONLINEAR)) {
76343 + struct zap_details details = {
76344 + .nonlinear_vma = vma_m,
76345 + .last_index = ULONG_MAX,
76346 + };
76347 + zap_page_range(vma, start + SEGMEXEC_TASK_SIZE, end - start, &details);
76348 + } else
76349 + zap_page_range(vma, start + SEGMEXEC_TASK_SIZE, end - start, NULL);
76350 + }
76351 +#endif
76352 +
76353 return 0;
76354 }
76355
76356 @@ -359,6 +390,16 @@ SYSCALL_DEFINE3(madvise, unsigned long, start, size_t, len_in, int, behavior)
76357 if (end < start)
76358 goto out;
76359
76360 +#ifdef CONFIG_PAX_SEGMEXEC
76361 + if (current->mm->pax_flags & MF_PAX_SEGMEXEC) {
76362 + if (end > SEGMEXEC_TASK_SIZE)
76363 + goto out;
76364 + } else
76365 +#endif
76366 +
76367 + if (end > TASK_SIZE)
76368 + goto out;
76369 +
76370 error = 0;
76371 if (end == start)
76372 goto out;
76373 diff --git a/mm/memory-failure.c b/mm/memory-failure.c
76374 index 8aeba53..b4a4198 100644
76375 --- a/mm/memory-failure.c
76376 +++ b/mm/memory-failure.c
76377 @@ -46,7 +46,7 @@ int sysctl_memory_failure_early_kill __read_mostly = 0;
76378
76379 int sysctl_memory_failure_recovery __read_mostly = 1;
76380
76381 -atomic_long_t mce_bad_pages __read_mostly = ATOMIC_LONG_INIT(0);
76382 +atomic_long_unchecked_t mce_bad_pages __read_mostly = ATOMIC_LONG_INIT(0);
76383
76384 /*
76385 * Send all the processes who have the page mapped an ``action optional''
76386 @@ -64,7 +64,7 @@ static int kill_proc_ao(struct task_struct *t, unsigned long addr, int trapno,
76387 si.si_signo = SIGBUS;
76388 si.si_errno = 0;
76389 si.si_code = BUS_MCEERR_AO;
76390 - si.si_addr = (void *)addr;
76391 + si.si_addr = (void __user *)addr;
76392 #ifdef __ARCH_SI_TRAPNO
76393 si.si_trapno = trapno;
76394 #endif
76395 @@ -745,7 +745,7 @@ int __memory_failure(unsigned long pfn, int trapno, int ref)
76396 return 0;
76397 }
76398
76399 - atomic_long_add(1, &mce_bad_pages);
76400 + atomic_long_add_unchecked(1, &mce_bad_pages);
76401
76402 /*
76403 * We need/can do nothing about count=0 pages.
76404 diff --git a/mm/memory.c b/mm/memory.c
76405 index 6c836d3..48f3264 100644
76406 --- a/mm/memory.c
76407 +++ b/mm/memory.c
76408 @@ -187,8 +187,12 @@ static inline void free_pmd_range(struct mmu_gather *tlb, pud_t *pud,
76409 return;
76410
76411 pmd = pmd_offset(pud, start);
76412 +
76413 +#if !defined(CONFIG_X86_32) || !defined(CONFIG_PAX_PER_CPU_PGD)
76414 pud_clear(pud);
76415 pmd_free_tlb(tlb, pmd, start);
76416 +#endif
76417 +
76418 }
76419
76420 static inline void free_pud_range(struct mmu_gather *tlb, pgd_t *pgd,
76421 @@ -219,9 +223,12 @@ static inline void free_pud_range(struct mmu_gather *tlb, pgd_t *pgd,
76422 if (end - 1 > ceiling - 1)
76423 return;
76424
76425 +#if !defined(CONFIG_X86_64) || !defined(CONFIG_PAX_PER_CPU_PGD)
76426 pud = pud_offset(pgd, start);
76427 pgd_clear(pgd);
76428 pud_free_tlb(tlb, pud, start);
76429 +#endif
76430 +
76431 }
76432
76433 /*
76434 @@ -1251,10 +1258,10 @@ int __get_user_pages(struct task_struct *tsk, struct mm_struct *mm,
76435 (VM_MAYREAD | VM_MAYWRITE) : (VM_READ | VM_WRITE);
76436 i = 0;
76437
76438 - do {
76439 + while (nr_pages) {
76440 struct vm_area_struct *vma;
76441
76442 - vma = find_extend_vma(mm, start);
76443 + vma = find_vma(mm, start);
76444 if (!vma && in_gate_area(tsk, start)) {
76445 unsigned long pg = start & PAGE_MASK;
76446 struct vm_area_struct *gate_vma = get_gate_vma(tsk);
76447 @@ -1306,7 +1313,7 @@ int __get_user_pages(struct task_struct *tsk, struct mm_struct *mm,
76448 continue;
76449 }
76450
76451 - if (!vma ||
76452 + if (!vma || start < vma->vm_start ||
76453 (vma->vm_flags & (VM_IO | VM_PFNMAP)) ||
76454 !(vm_flags & vma->vm_flags))
76455 return i ? : -EFAULT;
76456 @@ -1381,7 +1388,7 @@ int __get_user_pages(struct task_struct *tsk, struct mm_struct *mm,
76457 start += PAGE_SIZE;
76458 nr_pages--;
76459 } while (nr_pages && start < vma->vm_end);
76460 - } while (nr_pages);
76461 + }
76462 return i;
76463 }
76464
76465 @@ -1526,6 +1533,10 @@ static int insert_page(struct vm_area_struct *vma, unsigned long addr,
76466 page_add_file_rmap(page);
76467 set_pte_at(mm, addr, pte, mk_pte(page, prot));
76468
76469 +#ifdef CONFIG_PAX_SEGMEXEC
76470 + pax_mirror_file_pte(vma, addr, page, ptl);
76471 +#endif
76472 +
76473 retval = 0;
76474 pte_unmap_unlock(pte, ptl);
76475 return retval;
76476 @@ -1560,10 +1571,22 @@ out:
76477 int vm_insert_page(struct vm_area_struct *vma, unsigned long addr,
76478 struct page *page)
76479 {
76480 +
76481 +#ifdef CONFIG_PAX_SEGMEXEC
76482 + struct vm_area_struct *vma_m;
76483 +#endif
76484 +
76485 if (addr < vma->vm_start || addr >= vma->vm_end)
76486 return -EFAULT;
76487 if (!page_count(page))
76488 return -EINVAL;
76489 +
76490 +#ifdef CONFIG_PAX_SEGMEXEC
76491 + vma_m = pax_find_mirror_vma(vma);
76492 + if (vma_m)
76493 + vma_m->vm_flags |= VM_INSERTPAGE;
76494 +#endif
76495 +
76496 vma->vm_flags |= VM_INSERTPAGE;
76497 return insert_page(vma, addr, page, vma->vm_page_prot);
76498 }
76499 @@ -1649,6 +1672,7 @@ int vm_insert_mixed(struct vm_area_struct *vma, unsigned long addr,
76500 unsigned long pfn)
76501 {
76502 BUG_ON(!(vma->vm_flags & VM_MIXEDMAP));
76503 + BUG_ON(vma->vm_mirror);
76504
76505 if (addr < vma->vm_start || addr >= vma->vm_end)
76506 return -EFAULT;
76507 @@ -1977,6 +2001,186 @@ static inline void cow_user_page(struct page *dst, struct page *src, unsigned lo
76508 copy_user_highpage(dst, src, va, vma);
76509 }
76510
76511 +#ifdef CONFIG_PAX_SEGMEXEC
76512 +static void pax_unmap_mirror_pte(struct vm_area_struct *vma, unsigned long address, pmd_t *pmd)
76513 +{
76514 + struct mm_struct *mm = vma->vm_mm;
76515 + spinlock_t *ptl;
76516 + pte_t *pte, entry;
76517 +
76518 + pte = pte_offset_map_lock(mm, pmd, address, &ptl);
76519 + entry = *pte;
76520 + if (!pte_present(entry)) {
76521 + if (!pte_none(entry)) {
76522 + BUG_ON(pte_file(entry));
76523 + free_swap_and_cache(pte_to_swp_entry(entry));
76524 + pte_clear_not_present_full(mm, address, pte, 0);
76525 + }
76526 + } else {
76527 + struct page *page;
76528 +
76529 + flush_cache_page(vma, address, pte_pfn(entry));
76530 + entry = ptep_clear_flush(vma, address, pte);
76531 + BUG_ON(pte_dirty(entry));
76532 + page = vm_normal_page(vma, address, entry);
76533 + if (page) {
76534 + update_hiwater_rss(mm);
76535 + if (PageAnon(page))
76536 + dec_mm_counter(mm, anon_rss);
76537 + else
76538 + dec_mm_counter(mm, file_rss);
76539 + page_remove_rmap(page);
76540 + page_cache_release(page);
76541 + }
76542 + }
76543 + pte_unmap_unlock(pte, ptl);
76544 +}
76545 +
76546 +/* PaX: if vma is mirrored, synchronize the mirror's PTE
76547 + *
76548 + * the ptl of the lower mapped page is held on entry and is not released on exit
76549 + * or inside to ensure atomic changes to the PTE states (swapout, mremap, munmap, etc)
76550 + */
76551 +static void pax_mirror_anon_pte(struct vm_area_struct *vma, unsigned long address, struct page *page_m, spinlock_t *ptl)
76552 +{
76553 + struct mm_struct *mm = vma->vm_mm;
76554 + unsigned long address_m;
76555 + spinlock_t *ptl_m;
76556 + struct vm_area_struct *vma_m;
76557 + pmd_t *pmd_m;
76558 + pte_t *pte_m, entry_m;
76559 +
76560 + BUG_ON(!page_m || !PageAnon(page_m));
76561 +
76562 + vma_m = pax_find_mirror_vma(vma);
76563 + if (!vma_m)
76564 + return;
76565 +
76566 + BUG_ON(!PageLocked(page_m));
76567 + BUG_ON(address >= SEGMEXEC_TASK_SIZE);
76568 + address_m = address + SEGMEXEC_TASK_SIZE;
76569 + pmd_m = pmd_offset(pud_offset(pgd_offset(mm, address_m), address_m), address_m);
76570 + pte_m = pte_offset_map_nested(pmd_m, address_m);
76571 + ptl_m = pte_lockptr(mm, pmd_m);
76572 + if (ptl != ptl_m) {
76573 + spin_lock_nested(ptl_m, SINGLE_DEPTH_NESTING);
76574 + if (!pte_none(*pte_m))
76575 + goto out;
76576 + }
76577 +
76578 + entry_m = pfn_pte(page_to_pfn(page_m), vma_m->vm_page_prot);
76579 + page_cache_get(page_m);
76580 + page_add_anon_rmap(page_m, vma_m, address_m);
76581 + inc_mm_counter(mm, anon_rss);
76582 + set_pte_at(mm, address_m, pte_m, entry_m);
76583 + update_mmu_cache(vma_m, address_m, entry_m);
76584 +out:
76585 + if (ptl != ptl_m)
76586 + spin_unlock(ptl_m);
76587 + pte_unmap_nested(pte_m);
76588 + unlock_page(page_m);
76589 +}
76590 +
76591 +void pax_mirror_file_pte(struct vm_area_struct *vma, unsigned long address, struct page *page_m, spinlock_t *ptl)
76592 +{
76593 + struct mm_struct *mm = vma->vm_mm;
76594 + unsigned long address_m;
76595 + spinlock_t *ptl_m;
76596 + struct vm_area_struct *vma_m;
76597 + pmd_t *pmd_m;
76598 + pte_t *pte_m, entry_m;
76599 +
76600 + BUG_ON(!page_m || PageAnon(page_m));
76601 +
76602 + vma_m = pax_find_mirror_vma(vma);
76603 + if (!vma_m)
76604 + return;
76605 +
76606 + BUG_ON(address >= SEGMEXEC_TASK_SIZE);
76607 + address_m = address + SEGMEXEC_TASK_SIZE;
76608 + pmd_m = pmd_offset(pud_offset(pgd_offset(mm, address_m), address_m), address_m);
76609 + pte_m = pte_offset_map_nested(pmd_m, address_m);
76610 + ptl_m = pte_lockptr(mm, pmd_m);
76611 + if (ptl != ptl_m) {
76612 + spin_lock_nested(ptl_m, SINGLE_DEPTH_NESTING);
76613 + if (!pte_none(*pte_m))
76614 + goto out;
76615 + }
76616 +
76617 + entry_m = pfn_pte(page_to_pfn(page_m), vma_m->vm_page_prot);
76618 + page_cache_get(page_m);
76619 + page_add_file_rmap(page_m);
76620 + inc_mm_counter(mm, file_rss);
76621 + set_pte_at(mm, address_m, pte_m, entry_m);
76622 + update_mmu_cache(vma_m, address_m, entry_m);
76623 +out:
76624 + if (ptl != ptl_m)
76625 + spin_unlock(ptl_m);
76626 + pte_unmap_nested(pte_m);
76627 +}
76628 +
76629 +static void pax_mirror_pfn_pte(struct vm_area_struct *vma, unsigned long address, unsigned long pfn_m, spinlock_t *ptl)
76630 +{
76631 + struct mm_struct *mm = vma->vm_mm;
76632 + unsigned long address_m;
76633 + spinlock_t *ptl_m;
76634 + struct vm_area_struct *vma_m;
76635 + pmd_t *pmd_m;
76636 + pte_t *pte_m, entry_m;
76637 +
76638 + vma_m = pax_find_mirror_vma(vma);
76639 + if (!vma_m)
76640 + return;
76641 +
76642 + BUG_ON(address >= SEGMEXEC_TASK_SIZE);
76643 + address_m = address + SEGMEXEC_TASK_SIZE;
76644 + pmd_m = pmd_offset(pud_offset(pgd_offset(mm, address_m), address_m), address_m);
76645 + pte_m = pte_offset_map_nested(pmd_m, address_m);
76646 + ptl_m = pte_lockptr(mm, pmd_m);
76647 + if (ptl != ptl_m) {
76648 + spin_lock_nested(ptl_m, SINGLE_DEPTH_NESTING);
76649 + if (!pte_none(*pte_m))
76650 + goto out;
76651 + }
76652 +
76653 + entry_m = pfn_pte(pfn_m, vma_m->vm_page_prot);
76654 + set_pte_at(mm, address_m, pte_m, entry_m);
76655 +out:
76656 + if (ptl != ptl_m)
76657 + spin_unlock(ptl_m);
76658 + pte_unmap_nested(pte_m);
76659 +}
76660 +
76661 +static void pax_mirror_pte(struct vm_area_struct *vma, unsigned long address, pte_t *pte, pmd_t *pmd, spinlock_t *ptl)
76662 +{
76663 + struct page *page_m;
76664 + pte_t entry;
76665 +
76666 + if (!(vma->vm_mm->pax_flags & MF_PAX_SEGMEXEC))
76667 + goto out;
76668 +
76669 + entry = *pte;
76670 + page_m = vm_normal_page(vma, address, entry);
76671 + if (!page_m)
76672 + pax_mirror_pfn_pte(vma, address, pte_pfn(entry), ptl);
76673 + else if (PageAnon(page_m)) {
76674 + if (pax_find_mirror_vma(vma)) {
76675 + pte_unmap_unlock(pte, ptl);
76676 + lock_page(page_m);
76677 + pte = pte_offset_map_lock(vma->vm_mm, pmd, address, &ptl);
76678 + if (pte_same(entry, *pte))
76679 + pax_mirror_anon_pte(vma, address, page_m, ptl);
76680 + else
76681 + unlock_page(page_m);
76682 + }
76683 + } else
76684 + pax_mirror_file_pte(vma, address, page_m, ptl);
76685 +
76686 +out:
76687 + pte_unmap_unlock(pte, ptl);
76688 +}
76689 +#endif
76690 +
76691 /*
76692 * This routine handles present pages, when users try to write
76693 * to a shared page. It is done by copying the page to a new address
76694 @@ -2156,6 +2360,12 @@ gotten:
76695 */
76696 page_table = pte_offset_map_lock(mm, pmd, address, &ptl);
76697 if (likely(pte_same(*page_table, orig_pte))) {
76698 +
76699 +#ifdef CONFIG_PAX_SEGMEXEC
76700 + if (pax_find_mirror_vma(vma))
76701 + BUG_ON(!trylock_page(new_page));
76702 +#endif
76703 +
76704 if (old_page) {
76705 if (!PageAnon(old_page)) {
76706 dec_mm_counter(mm, file_rss);
76707 @@ -2207,6 +2417,10 @@ gotten:
76708 page_remove_rmap(old_page);
76709 }
76710
76711 +#ifdef CONFIG_PAX_SEGMEXEC
76712 + pax_mirror_anon_pte(vma, address, new_page, ptl);
76713 +#endif
76714 +
76715 /* Free the old page.. */
76716 new_page = old_page;
76717 ret |= VM_FAULT_WRITE;
76718 @@ -2606,6 +2820,11 @@ static int do_swap_page(struct mm_struct *mm, struct vm_area_struct *vma,
76719 swap_free(entry);
76720 if (vm_swap_full() || (vma->vm_flags & VM_LOCKED) || PageMlocked(page))
76721 try_to_free_swap(page);
76722 +
76723 +#ifdef CONFIG_PAX_SEGMEXEC
76724 + if ((flags & FAULT_FLAG_WRITE) || !pax_find_mirror_vma(vma))
76725 +#endif
76726 +
76727 unlock_page(page);
76728
76729 if (flags & FAULT_FLAG_WRITE) {
76730 @@ -2617,6 +2836,11 @@ static int do_swap_page(struct mm_struct *mm, struct vm_area_struct *vma,
76731
76732 /* No need to invalidate - it was non-present before */
76733 update_mmu_cache(vma, address, pte);
76734 +
76735 +#ifdef CONFIG_PAX_SEGMEXEC
76736 + pax_mirror_anon_pte(vma, address, page, ptl);
76737 +#endif
76738 +
76739 unlock:
76740 pte_unmap_unlock(page_table, ptl);
76741 out:
76742 @@ -2632,40 +2856,6 @@ out_release:
76743 }
76744
76745 /*
76746 - * This is like a special single-page "expand_{down|up}wards()",
76747 - * except we must first make sure that 'address{-|+}PAGE_SIZE'
76748 - * doesn't hit another vma.
76749 - */
76750 -static inline int check_stack_guard_page(struct vm_area_struct *vma, unsigned long address)
76751 -{
76752 - address &= PAGE_MASK;
76753 - if ((vma->vm_flags & VM_GROWSDOWN) && address == vma->vm_start) {
76754 - struct vm_area_struct *prev = vma->vm_prev;
76755 -
76756 - /*
76757 - * Is there a mapping abutting this one below?
76758 - *
76759 - * That's only ok if it's the same stack mapping
76760 - * that has gotten split..
76761 - */
76762 - if (prev && prev->vm_end == address)
76763 - return prev->vm_flags & VM_GROWSDOWN ? 0 : -ENOMEM;
76764 -
76765 - expand_stack(vma, address - PAGE_SIZE);
76766 - }
76767 - if ((vma->vm_flags & VM_GROWSUP) && address + PAGE_SIZE == vma->vm_end) {
76768 - struct vm_area_struct *next = vma->vm_next;
76769 -
76770 - /* As VM_GROWSDOWN but s/below/above/ */
76771 - if (next && next->vm_start == address + PAGE_SIZE)
76772 - return next->vm_flags & VM_GROWSUP ? 0 : -ENOMEM;
76773 -
76774 - expand_upwards(vma, address + PAGE_SIZE);
76775 - }
76776 - return 0;
76777 -}
76778 -
76779 -/*
76780 * We enter with non-exclusive mmap_sem (to exclude vma changes,
76781 * but allow concurrent faults), and pte mapped but not yet locked.
76782 * We return with mmap_sem still held, but pte unmapped and unlocked.
76783 @@ -2674,27 +2864,23 @@ static int do_anonymous_page(struct mm_struct *mm, struct vm_area_struct *vma,
76784 unsigned long address, pte_t *page_table, pmd_t *pmd,
76785 unsigned int flags)
76786 {
76787 - struct page *page;
76788 + struct page *page = NULL;
76789 spinlock_t *ptl;
76790 pte_t entry;
76791
76792 - pte_unmap(page_table);
76793 -
76794 - /* Check if we need to add a guard page to the stack */
76795 - if (check_stack_guard_page(vma, address) < 0)
76796 - return VM_FAULT_SIGBUS;
76797 -
76798 - /* Use the zero-page for reads */
76799 if (!(flags & FAULT_FLAG_WRITE)) {
76800 entry = pte_mkspecial(pfn_pte(my_zero_pfn(address),
76801 vma->vm_page_prot));
76802 - page_table = pte_offset_map_lock(mm, pmd, address, &ptl);
76803 + ptl = pte_lockptr(mm, pmd);
76804 + spin_lock(ptl);
76805 if (!pte_none(*page_table))
76806 goto unlock;
76807 goto setpte;
76808 }
76809
76810 /* Allocate our own private page. */
76811 + pte_unmap(page_table);
76812 +
76813 if (unlikely(anon_vma_prepare(vma)))
76814 goto oom;
76815 page = alloc_zeroed_user_highpage_movable(vma, address);
76816 @@ -2713,6 +2899,11 @@ static int do_anonymous_page(struct mm_struct *mm, struct vm_area_struct *vma,
76817 if (!pte_none(*page_table))
76818 goto release;
76819
76820 +#ifdef CONFIG_PAX_SEGMEXEC
76821 + if (pax_find_mirror_vma(vma))
76822 + BUG_ON(!trylock_page(page));
76823 +#endif
76824 +
76825 inc_mm_counter(mm, anon_rss);
76826 page_add_new_anon_rmap(page, vma, address);
76827 setpte:
76828 @@ -2720,6 +2911,12 @@ setpte:
76829
76830 /* No need to invalidate - it was non-present before */
76831 update_mmu_cache(vma, address, entry);
76832 +
76833 +#ifdef CONFIG_PAX_SEGMEXEC
76834 + if (page)
76835 + pax_mirror_anon_pte(vma, address, page, ptl);
76836 +#endif
76837 +
76838 unlock:
76839 pte_unmap_unlock(page_table, ptl);
76840 return 0;
76841 @@ -2862,6 +3059,12 @@ static int __do_fault(struct mm_struct *mm, struct vm_area_struct *vma,
76842 */
76843 /* Only go through if we didn't race with anybody else... */
76844 if (likely(pte_same(*page_table, orig_pte))) {
76845 +
76846 +#ifdef CONFIG_PAX_SEGMEXEC
76847 + if (anon && pax_find_mirror_vma(vma))
76848 + BUG_ON(!trylock_page(page));
76849 +#endif
76850 +
76851 flush_icache_page(vma, page);
76852 entry = mk_pte(page, vma->vm_page_prot);
76853 if (flags & FAULT_FLAG_WRITE)
76854 @@ -2881,6 +3084,14 @@ static int __do_fault(struct mm_struct *mm, struct vm_area_struct *vma,
76855
76856 /* no need to invalidate: a not-present page won't be cached */
76857 update_mmu_cache(vma, address, entry);
76858 +
76859 +#ifdef CONFIG_PAX_SEGMEXEC
76860 + if (anon)
76861 + pax_mirror_anon_pte(vma, address, page, ptl);
76862 + else
76863 + pax_mirror_file_pte(vma, address, page, ptl);
76864 +#endif
76865 +
76866 } else {
76867 if (charged)
76868 mem_cgroup_uncharge_page(page);
76869 @@ -3028,6 +3239,12 @@ static inline int handle_pte_fault(struct mm_struct *mm,
76870 if (flags & FAULT_FLAG_WRITE)
76871 flush_tlb_page(vma, address);
76872 }
76873 +
76874 +#ifdef CONFIG_PAX_SEGMEXEC
76875 + pax_mirror_pte(vma, address, pte, pmd, ptl);
76876 + return 0;
76877 +#endif
76878 +
76879 unlock:
76880 pte_unmap_unlock(pte, ptl);
76881 return 0;
76882 @@ -3044,6 +3261,10 @@ int handle_mm_fault(struct mm_struct *mm, struct vm_area_struct *vma,
76883 pmd_t *pmd;
76884 pte_t *pte;
76885
76886 +#ifdef CONFIG_PAX_SEGMEXEC
76887 + struct vm_area_struct *vma_m;
76888 +#endif
76889 +
76890 __set_current_state(TASK_RUNNING);
76891
76892 count_vm_event(PGFAULT);
76893 @@ -3051,6 +3272,34 @@ int handle_mm_fault(struct mm_struct *mm, struct vm_area_struct *vma,
76894 if (unlikely(is_vm_hugetlb_page(vma)))
76895 return hugetlb_fault(mm, vma, address, flags);
76896
76897 +#ifdef CONFIG_PAX_SEGMEXEC
76898 + vma_m = pax_find_mirror_vma(vma);
76899 + if (vma_m) {
76900 + unsigned long address_m;
76901 + pgd_t *pgd_m;
76902 + pud_t *pud_m;
76903 + pmd_t *pmd_m;
76904 +
76905 + if (vma->vm_start > vma_m->vm_start) {
76906 + address_m = address;
76907 + address -= SEGMEXEC_TASK_SIZE;
76908 + vma = vma_m;
76909 + } else
76910 + address_m = address + SEGMEXEC_TASK_SIZE;
76911 +
76912 + pgd_m = pgd_offset(mm, address_m);
76913 + pud_m = pud_alloc(mm, pgd_m, address_m);
76914 + if (!pud_m)
76915 + return VM_FAULT_OOM;
76916 + pmd_m = pmd_alloc(mm, pud_m, address_m);
76917 + if (!pmd_m)
76918 + return VM_FAULT_OOM;
76919 + if (!pmd_present(*pmd_m) && __pte_alloc(mm, pmd_m, address_m))
76920 + return VM_FAULT_OOM;
76921 + pax_unmap_mirror_pte(vma_m, address_m, pmd_m);
76922 + }
76923 +#endif
76924 +
76925 pgd = pgd_offset(mm, address);
76926 pud = pud_alloc(mm, pgd, address);
76927 if (!pud)
76928 @@ -3148,7 +3397,7 @@ static int __init gate_vma_init(void)
76929 gate_vma.vm_start = FIXADDR_USER_START;
76930 gate_vma.vm_end = FIXADDR_USER_END;
76931 gate_vma.vm_flags = VM_READ | VM_MAYREAD | VM_EXEC | VM_MAYEXEC;
76932 - gate_vma.vm_page_prot = __P101;
76933 + gate_vma.vm_page_prot = vm_get_page_prot(gate_vma.vm_flags);
76934 /*
76935 * Make sure the vDSO gets into every core dump.
76936 * Dumping its contents makes post-mortem fully interpretable later
76937 diff --git a/mm/mempolicy.c b/mm/mempolicy.c
76938 index 3c6e3e2..ad9871c 100644
76939 --- a/mm/mempolicy.c
76940 +++ b/mm/mempolicy.c
76941 @@ -573,6 +573,10 @@ static int mbind_range(struct vm_area_struct *vma, unsigned long start,
76942 struct vm_area_struct *next;
76943 int err;
76944
76945 +#ifdef CONFIG_PAX_SEGMEXEC
76946 + struct vm_area_struct *vma_m;
76947 +#endif
76948 +
76949 err = 0;
76950 for (; vma && vma->vm_start < end; vma = next) {
76951 next = vma->vm_next;
76952 @@ -584,6 +588,16 @@ static int mbind_range(struct vm_area_struct *vma, unsigned long start,
76953 err = policy_vma(vma, new);
76954 if (err)
76955 break;
76956 +
76957 +#ifdef CONFIG_PAX_SEGMEXEC
76958 + vma_m = pax_find_mirror_vma(vma);
76959 + if (vma_m) {
76960 + err = policy_vma(vma_m, new);
76961 + if (err)
76962 + break;
76963 + }
76964 +#endif
76965 +
76966 }
76967 return err;
76968 }
76969 @@ -1002,6 +1016,17 @@ static long do_mbind(unsigned long start, unsigned long len,
76970
76971 if (end < start)
76972 return -EINVAL;
76973 +
76974 +#ifdef CONFIG_PAX_SEGMEXEC
76975 + if (mm->pax_flags & MF_PAX_SEGMEXEC) {
76976 + if (end > SEGMEXEC_TASK_SIZE)
76977 + return -EINVAL;
76978 + } else
76979 +#endif
76980 +
76981 + if (end > TASK_SIZE)
76982 + return -EINVAL;
76983 +
76984 if (end == start)
76985 return 0;
76986
76987 @@ -1207,6 +1232,14 @@ SYSCALL_DEFINE4(migrate_pages, pid_t, pid, unsigned long, maxnode,
76988 if (!mm)
76989 return -EINVAL;
76990
76991 +#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
76992 + if (mm != current->mm &&
76993 + (mm->pax_flags & MF_PAX_RANDMMAP || mm->pax_flags & MF_PAX_SEGMEXEC)) {
76994 + err = -EPERM;
76995 + goto out;
76996 + }
76997 +#endif
76998 +
76999 /*
77000 * Check if this process has the right to modify the specified
77001 * process. The right exists if the process has administrative
77002 @@ -1216,8 +1249,7 @@ SYSCALL_DEFINE4(migrate_pages, pid_t, pid, unsigned long, maxnode,
77003 rcu_read_lock();
77004 tcred = __task_cred(task);
77005 if (cred->euid != tcred->suid && cred->euid != tcred->uid &&
77006 - cred->uid != tcred->suid && cred->uid != tcred->uid &&
77007 - !capable(CAP_SYS_NICE)) {
77008 + cred->uid != tcred->suid && !capable(CAP_SYS_NICE)) {
77009 rcu_read_unlock();
77010 err = -EPERM;
77011 goto out;
77012 @@ -2396,7 +2428,7 @@ int show_numa_map(struct seq_file *m, void *v)
77013
77014 if (file) {
77015 seq_printf(m, " file=");
77016 - seq_path(m, &file->f_path, "\n\t= ");
77017 + seq_path(m, &file->f_path, "\n\t\\= ");
77018 } else if (vma->vm_start <= mm->brk && vma->vm_end >= mm->start_brk) {
77019 seq_printf(m, " heap");
77020 } else if (vma->vm_start <= mm->start_stack &&
77021 diff --git a/mm/migrate.c b/mm/migrate.c
77022 index aaca868..2ebecdc 100644
77023 --- a/mm/migrate.c
77024 +++ b/mm/migrate.c
77025 @@ -916,6 +916,8 @@ static int do_pages_move(struct mm_struct *mm, struct task_struct *task,
77026 unsigned long chunk_start;
77027 int err;
77028
77029 + pax_track_stack();
77030 +
77031 task_nodes = cpuset_mems_allowed(task);
77032
77033 err = -ENOMEM;
77034 @@ -1106,6 +1108,14 @@ SYSCALL_DEFINE6(move_pages, pid_t, pid, unsigned long, nr_pages,
77035 if (!mm)
77036 return -EINVAL;
77037
77038 +#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
77039 + if (mm != current->mm &&
77040 + (mm->pax_flags & MF_PAX_RANDMMAP || mm->pax_flags & MF_PAX_SEGMEXEC)) {
77041 + err = -EPERM;
77042 + goto out;
77043 + }
77044 +#endif
77045 +
77046 /*
77047 * Check if this process has the right to modify the specified
77048 * process. The right exists if the process has administrative
77049 @@ -1115,8 +1125,7 @@ SYSCALL_DEFINE6(move_pages, pid_t, pid, unsigned long, nr_pages,
77050 rcu_read_lock();
77051 tcred = __task_cred(task);
77052 if (cred->euid != tcred->suid && cred->euid != tcred->uid &&
77053 - cred->uid != tcred->suid && cred->uid != tcred->uid &&
77054 - !capable(CAP_SYS_NICE)) {
77055 + cred->uid != tcred->suid && !capable(CAP_SYS_NICE)) {
77056 rcu_read_unlock();
77057 err = -EPERM;
77058 goto out;
77059 diff --git a/mm/mlock.c b/mm/mlock.c
77060 index 2d846cf..98134d2 100644
77061 --- a/mm/mlock.c
77062 +++ b/mm/mlock.c
77063 @@ -13,6 +13,7 @@
77064 #include <linux/pagemap.h>
77065 #include <linux/mempolicy.h>
77066 #include <linux/syscalls.h>
77067 +#include <linux/security.h>
77068 #include <linux/sched.h>
77069 #include <linux/module.h>
77070 #include <linux/rmap.h>
77071 @@ -138,13 +139,6 @@ void munlock_vma_page(struct page *page)
77072 }
77073 }
77074
77075 -static inline int stack_guard_page(struct vm_area_struct *vma, unsigned long addr)
77076 -{
77077 - return (vma->vm_flags & VM_GROWSDOWN) &&
77078 - (vma->vm_start == addr) &&
77079 - !vma_stack_continue(vma->vm_prev, addr);
77080 -}
77081 -
77082 /**
77083 * __mlock_vma_pages_range() - mlock a range of pages in the vma.
77084 * @vma: target vma
77085 @@ -177,12 +171,6 @@ static long __mlock_vma_pages_range(struct vm_area_struct *vma,
77086 if (vma->vm_flags & VM_WRITE)
77087 gup_flags |= FOLL_WRITE;
77088
77089 - /* We don't try to access the guard page of a stack vma */
77090 - if (stack_guard_page(vma, start)) {
77091 - addr += PAGE_SIZE;
77092 - nr_pages--;
77093 - }
77094 -
77095 while (nr_pages > 0) {
77096 int i;
77097
77098 @@ -440,7 +428,7 @@ static int do_mlock(unsigned long start, size_t len, int on)
77099 {
77100 unsigned long nstart, end, tmp;
77101 struct vm_area_struct * vma, * prev;
77102 - int error;
77103 + int error = -EINVAL;
77104
77105 len = PAGE_ALIGN(len);
77106 end = start + len;
77107 @@ -448,6 +436,9 @@ static int do_mlock(unsigned long start, size_t len, int on)
77108 return -EINVAL;
77109 if (end == start)
77110 return 0;
77111 + if (end > TASK_SIZE)
77112 + return -EINVAL;
77113 +
77114 vma = find_vma_prev(current->mm, start, &prev);
77115 if (!vma || vma->vm_start > start)
77116 return -ENOMEM;
77117 @@ -458,6 +449,11 @@ static int do_mlock(unsigned long start, size_t len, int on)
77118 for (nstart = start ; ; ) {
77119 unsigned int newflags;
77120
77121 +#ifdef CONFIG_PAX_SEGMEXEC
77122 + if ((current->mm->pax_flags & MF_PAX_SEGMEXEC) && (vma->vm_start >= SEGMEXEC_TASK_SIZE))
77123 + break;
77124 +#endif
77125 +
77126 /* Here we know that vma->vm_start <= nstart < vma->vm_end. */
77127
77128 newflags = vma->vm_flags | VM_LOCKED;
77129 @@ -507,6 +503,7 @@ SYSCALL_DEFINE2(mlock, unsigned long, start, size_t, len)
77130 lock_limit >>= PAGE_SHIFT;
77131
77132 /* check against resource limits */
77133 + gr_learn_resource(current, RLIMIT_MEMLOCK, (current->mm->locked_vm << PAGE_SHIFT) + len, 1);
77134 if ((locked <= lock_limit) || capable(CAP_IPC_LOCK))
77135 error = do_mlock(start, len, 1);
77136 up_write(&current->mm->mmap_sem);
77137 @@ -528,17 +525,23 @@ SYSCALL_DEFINE2(munlock, unsigned long, start, size_t, len)
77138 static int do_mlockall(int flags)
77139 {
77140 struct vm_area_struct * vma, * prev = NULL;
77141 - unsigned int def_flags = 0;
77142
77143 if (flags & MCL_FUTURE)
77144 - def_flags = VM_LOCKED;
77145 - current->mm->def_flags = def_flags;
77146 + current->mm->def_flags |= VM_LOCKED;
77147 + else
77148 + current->mm->def_flags &= ~VM_LOCKED;
77149 if (flags == MCL_FUTURE)
77150 goto out;
77151
77152 for (vma = current->mm->mmap; vma ; vma = prev->vm_next) {
77153 - unsigned int newflags;
77154 + unsigned long newflags;
77155
77156 +#ifdef CONFIG_PAX_SEGMEXEC
77157 + if ((current->mm->pax_flags & MF_PAX_SEGMEXEC) && (vma->vm_start >= SEGMEXEC_TASK_SIZE))
77158 + break;
77159 +#endif
77160 +
77161 + BUG_ON(vma->vm_end > TASK_SIZE);
77162 newflags = vma->vm_flags | VM_LOCKED;
77163 if (!(flags & MCL_CURRENT))
77164 newflags &= ~VM_LOCKED;
77165 @@ -570,6 +573,7 @@ SYSCALL_DEFINE1(mlockall, int, flags)
77166 lock_limit >>= PAGE_SHIFT;
77167
77168 ret = -ENOMEM;
77169 + gr_learn_resource(current, RLIMIT_MEMLOCK, current->mm->total_vm << PAGE_SHIFT, 1);
77170 if (!(flags & MCL_CURRENT) || (current->mm->total_vm <= lock_limit) ||
77171 capable(CAP_IPC_LOCK))
77172 ret = do_mlockall(flags);
77173 diff --git a/mm/mmap.c b/mm/mmap.c
77174 index 4b80cbf..c5ce1df 100644
77175 --- a/mm/mmap.c
77176 +++ b/mm/mmap.c
77177 @@ -45,6 +45,16 @@
77178 #define arch_rebalance_pgtables(addr, len) (addr)
77179 #endif
77180
77181 +static inline void verify_mm_writelocked(struct mm_struct *mm)
77182 +{
77183 +#if defined(CONFIG_DEBUG_VM) || defined(CONFIG_PAX)
77184 + if (unlikely(down_read_trylock(&mm->mmap_sem))) {
77185 + up_read(&mm->mmap_sem);
77186 + BUG();
77187 + }
77188 +#endif
77189 +}
77190 +
77191 static void unmap_region(struct mm_struct *mm,
77192 struct vm_area_struct *vma, struct vm_area_struct *prev,
77193 unsigned long start, unsigned long end);
77194 @@ -70,22 +80,32 @@ static void unmap_region(struct mm_struct *mm,
77195 * x: (no) no x: (no) yes x: (no) yes x: (yes) yes
77196 *
77197 */
77198 -pgprot_t protection_map[16] = {
77199 +pgprot_t protection_map[16] __read_only = {
77200 __P000, __P001, __P010, __P011, __P100, __P101, __P110, __P111,
77201 __S000, __S001, __S010, __S011, __S100, __S101, __S110, __S111
77202 };
77203
77204 pgprot_t vm_get_page_prot(unsigned long vm_flags)
77205 {
77206 - return __pgprot(pgprot_val(protection_map[vm_flags &
77207 + pgprot_t prot = __pgprot(pgprot_val(protection_map[vm_flags &
77208 (VM_READ|VM_WRITE|VM_EXEC|VM_SHARED)]) |
77209 pgprot_val(arch_vm_get_page_prot(vm_flags)));
77210 +
77211 +#if defined(CONFIG_PAX_PAGEEXEC) && defined(CONFIG_X86_32)
77212 + if (!nx_enabled &&
77213 + (vm_flags & (VM_PAGEEXEC | VM_EXEC)) == VM_PAGEEXEC &&
77214 + (vm_flags & (VM_READ | VM_WRITE)))
77215 + prot = __pgprot(pte_val(pte_exprotect(__pte(pgprot_val(prot)))));
77216 +#endif
77217 +
77218 + return prot;
77219 }
77220 EXPORT_SYMBOL(vm_get_page_prot);
77221
77222 int sysctl_overcommit_memory = OVERCOMMIT_GUESS; /* heuristic overcommit */
77223 int sysctl_overcommit_ratio = 50; /* default is 50% */
77224 int sysctl_max_map_count __read_mostly = DEFAULT_MAX_MAP_COUNT;
77225 +unsigned long sysctl_heap_stack_gap __read_mostly = 64*1024;
77226 struct percpu_counter vm_committed_as;
77227
77228 /*
77229 @@ -231,6 +251,7 @@ static struct vm_area_struct *remove_vma(struct vm_area_struct *vma)
77230 struct vm_area_struct *next = vma->vm_next;
77231
77232 might_sleep();
77233 + BUG_ON(vma->vm_mirror);
77234 if (vma->vm_ops && vma->vm_ops->close)
77235 vma->vm_ops->close(vma);
77236 if (vma->vm_file) {
77237 @@ -267,6 +288,7 @@ SYSCALL_DEFINE1(brk, unsigned long, brk)
77238 * not page aligned -Ram Gupta
77239 */
77240 rlim = current->signal->rlim[RLIMIT_DATA].rlim_cur;
77241 + gr_learn_resource(current, RLIMIT_DATA, (brk - mm->start_brk) + (mm->end_data - mm->start_data), 1);
77242 if (rlim < RLIM_INFINITY && (brk - mm->start_brk) +
77243 (mm->end_data - mm->start_data) > rlim)
77244 goto out;
77245 @@ -704,6 +726,12 @@ static int
77246 can_vma_merge_before(struct vm_area_struct *vma, unsigned long vm_flags,
77247 struct anon_vma *anon_vma, struct file *file, pgoff_t vm_pgoff)
77248 {
77249 +
77250 +#ifdef CONFIG_PAX_SEGMEXEC
77251 + if ((vma->vm_mm->pax_flags & MF_PAX_SEGMEXEC) && vma->vm_start == SEGMEXEC_TASK_SIZE)
77252 + return 0;
77253 +#endif
77254 +
77255 if (is_mergeable_vma(vma, file, vm_flags) &&
77256 is_mergeable_anon_vma(anon_vma, vma->anon_vma)) {
77257 if (vma->vm_pgoff == vm_pgoff)
77258 @@ -723,6 +751,12 @@ static int
77259 can_vma_merge_after(struct vm_area_struct *vma, unsigned long vm_flags,
77260 struct anon_vma *anon_vma, struct file *file, pgoff_t vm_pgoff)
77261 {
77262 +
77263 +#ifdef CONFIG_PAX_SEGMEXEC
77264 + if ((vma->vm_mm->pax_flags & MF_PAX_SEGMEXEC) && vma->vm_end == SEGMEXEC_TASK_SIZE)
77265 + return 0;
77266 +#endif
77267 +
77268 if (is_mergeable_vma(vma, file, vm_flags) &&
77269 is_mergeable_anon_vma(anon_vma, vma->anon_vma)) {
77270 pgoff_t vm_pglen;
77271 @@ -765,12 +799,19 @@ can_vma_merge_after(struct vm_area_struct *vma, unsigned long vm_flags,
77272 struct vm_area_struct *vma_merge(struct mm_struct *mm,
77273 struct vm_area_struct *prev, unsigned long addr,
77274 unsigned long end, unsigned long vm_flags,
77275 - struct anon_vma *anon_vma, struct file *file,
77276 + struct anon_vma *anon_vma, struct file *file,
77277 pgoff_t pgoff, struct mempolicy *policy)
77278 {
77279 pgoff_t pglen = (end - addr) >> PAGE_SHIFT;
77280 struct vm_area_struct *area, *next;
77281
77282 +#ifdef CONFIG_PAX_SEGMEXEC
77283 + unsigned long addr_m = addr + SEGMEXEC_TASK_SIZE, end_m = end + SEGMEXEC_TASK_SIZE;
77284 + struct vm_area_struct *area_m = NULL, *next_m = NULL, *prev_m = NULL;
77285 +
77286 + BUG_ON((mm->pax_flags & MF_PAX_SEGMEXEC) && SEGMEXEC_TASK_SIZE < end);
77287 +#endif
77288 +
77289 /*
77290 * We later require that vma->vm_flags == vm_flags,
77291 * so this tests vma->vm_flags & VM_SPECIAL, too.
77292 @@ -786,6 +827,15 @@ struct vm_area_struct *vma_merge(struct mm_struct *mm,
77293 if (next && next->vm_end == end) /* cases 6, 7, 8 */
77294 next = next->vm_next;
77295
77296 +#ifdef CONFIG_PAX_SEGMEXEC
77297 + if (prev)
77298 + prev_m = pax_find_mirror_vma(prev);
77299 + if (area)
77300 + area_m = pax_find_mirror_vma(area);
77301 + if (next)
77302 + next_m = pax_find_mirror_vma(next);
77303 +#endif
77304 +
77305 /*
77306 * Can it merge with the predecessor?
77307 */
77308 @@ -805,9 +855,24 @@ struct vm_area_struct *vma_merge(struct mm_struct *mm,
77309 /* cases 1, 6 */
77310 vma_adjust(prev, prev->vm_start,
77311 next->vm_end, prev->vm_pgoff, NULL);
77312 - } else /* cases 2, 5, 7 */
77313 +
77314 +#ifdef CONFIG_PAX_SEGMEXEC
77315 + if (prev_m)
77316 + vma_adjust(prev_m, prev_m->vm_start,
77317 + next_m->vm_end, prev_m->vm_pgoff, NULL);
77318 +#endif
77319 +
77320 + } else { /* cases 2, 5, 7 */
77321 vma_adjust(prev, prev->vm_start,
77322 end, prev->vm_pgoff, NULL);
77323 +
77324 +#ifdef CONFIG_PAX_SEGMEXEC
77325 + if (prev_m)
77326 + vma_adjust(prev_m, prev_m->vm_start,
77327 + end_m, prev_m->vm_pgoff, NULL);
77328 +#endif
77329 +
77330 + }
77331 return prev;
77332 }
77333
77334 @@ -818,12 +883,27 @@ struct vm_area_struct *vma_merge(struct mm_struct *mm,
77335 mpol_equal(policy, vma_policy(next)) &&
77336 can_vma_merge_before(next, vm_flags,
77337 anon_vma, file, pgoff+pglen)) {
77338 - if (prev && addr < prev->vm_end) /* case 4 */
77339 + if (prev && addr < prev->vm_end) { /* case 4 */
77340 vma_adjust(prev, prev->vm_start,
77341 addr, prev->vm_pgoff, NULL);
77342 - else /* cases 3, 8 */
77343 +
77344 +#ifdef CONFIG_PAX_SEGMEXEC
77345 + if (prev_m)
77346 + vma_adjust(prev_m, prev_m->vm_start,
77347 + addr_m, prev_m->vm_pgoff, NULL);
77348 +#endif
77349 +
77350 + } else { /* cases 3, 8 */
77351 vma_adjust(area, addr, next->vm_end,
77352 next->vm_pgoff - pglen, NULL);
77353 +
77354 +#ifdef CONFIG_PAX_SEGMEXEC
77355 + if (area_m)
77356 + vma_adjust(area_m, addr_m, next_m->vm_end,
77357 + next_m->vm_pgoff - pglen, NULL);
77358 +#endif
77359 +
77360 + }
77361 return area;
77362 }
77363
77364 @@ -898,14 +978,11 @@ none:
77365 void vm_stat_account(struct mm_struct *mm, unsigned long flags,
77366 struct file *file, long pages)
77367 {
77368 - const unsigned long stack_flags
77369 - = VM_STACK_FLAGS & (VM_GROWSUP|VM_GROWSDOWN);
77370 -
77371 if (file) {
77372 mm->shared_vm += pages;
77373 if ((flags & (VM_EXEC|VM_WRITE)) == VM_EXEC)
77374 mm->exec_vm += pages;
77375 - } else if (flags & stack_flags)
77376 + } else if (flags & (VM_GROWSUP|VM_GROWSDOWN))
77377 mm->stack_vm += pages;
77378 if (flags & (VM_RESERVED|VM_IO))
77379 mm->reserved_vm += pages;
77380 @@ -932,7 +1009,7 @@ unsigned long do_mmap_pgoff(struct file *file, unsigned long addr,
77381 * (the exception is when the underlying filesystem is noexec
77382 * mounted, in which case we dont add PROT_EXEC.)
77383 */
77384 - if ((prot & PROT_READ) && (current->personality & READ_IMPLIES_EXEC))
77385 + if ((prot & (PROT_READ | PROT_WRITE)) && (current->personality & READ_IMPLIES_EXEC))
77386 if (!(file && (file->f_path.mnt->mnt_flags & MNT_NOEXEC)))
77387 prot |= PROT_EXEC;
77388
77389 @@ -958,7 +1035,7 @@ unsigned long do_mmap_pgoff(struct file *file, unsigned long addr,
77390 /* Obtain the address to map to. we verify (or select) it and ensure
77391 * that it represents a valid section of the address space.
77392 */
77393 - addr = get_unmapped_area(file, addr, len, pgoff, flags);
77394 + addr = get_unmapped_area(file, addr, len, pgoff, flags | ((prot & PROT_EXEC) ? MAP_EXECUTABLE : 0));
77395 if (addr & ~PAGE_MASK)
77396 return addr;
77397
77398 @@ -969,6 +1046,36 @@ unsigned long do_mmap_pgoff(struct file *file, unsigned long addr,
77399 vm_flags = calc_vm_prot_bits(prot) | calc_vm_flag_bits(flags) |
77400 mm->def_flags | VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC;
77401
77402 +#ifdef CONFIG_PAX_MPROTECT
77403 + if (mm->pax_flags & MF_PAX_MPROTECT) {
77404 +#ifndef CONFIG_PAX_MPROTECT_COMPAT
77405 + if ((vm_flags & (VM_WRITE | VM_EXEC)) == (VM_WRITE | VM_EXEC)) {
77406 + gr_log_rwxmmap(file);
77407 +
77408 +#ifdef CONFIG_PAX_EMUPLT
77409 + vm_flags &= ~VM_EXEC;
77410 +#else
77411 + return -EPERM;
77412 +#endif
77413 +
77414 + }
77415 +
77416 + if (!(vm_flags & VM_EXEC))
77417 + vm_flags &= ~VM_MAYEXEC;
77418 +#else
77419 + if ((vm_flags & (VM_WRITE | VM_EXEC)) != VM_EXEC)
77420 + vm_flags &= ~(VM_EXEC | VM_MAYEXEC);
77421 +#endif
77422 + else
77423 + vm_flags &= ~VM_MAYWRITE;
77424 + }
77425 +#endif
77426 +
77427 +#if defined(CONFIG_PAX_PAGEEXEC) && defined(CONFIG_X86_32)
77428 + if ((mm->pax_flags & MF_PAX_PAGEEXEC) && file)
77429 + vm_flags &= ~VM_PAGEEXEC;
77430 +#endif
77431 +
77432 if (flags & MAP_LOCKED)
77433 if (!can_do_mlock())
77434 return -EPERM;
77435 @@ -980,6 +1087,7 @@ unsigned long do_mmap_pgoff(struct file *file, unsigned long addr,
77436 locked += mm->locked_vm;
77437 lock_limit = current->signal->rlim[RLIMIT_MEMLOCK].rlim_cur;
77438 lock_limit >>= PAGE_SHIFT;
77439 + gr_learn_resource(current, RLIMIT_MEMLOCK, locked << PAGE_SHIFT, 1);
77440 if (locked > lock_limit && !capable(CAP_IPC_LOCK))
77441 return -EAGAIN;
77442 }
77443 @@ -1053,6 +1161,9 @@ unsigned long do_mmap_pgoff(struct file *file, unsigned long addr,
77444 if (error)
77445 return error;
77446
77447 + if (!gr_acl_handle_mmap(file, prot))
77448 + return -EACCES;
77449 +
77450 return mmap_region(file, addr, len, flags, vm_flags, pgoff);
77451 }
77452 EXPORT_SYMBOL(do_mmap_pgoff);
77453 @@ -1065,10 +1176,10 @@ EXPORT_SYMBOL(do_mmap_pgoff);
77454 */
77455 int vma_wants_writenotify(struct vm_area_struct *vma)
77456 {
77457 - unsigned int vm_flags = vma->vm_flags;
77458 + unsigned long vm_flags = vma->vm_flags;
77459
77460 /* If it was private or non-writable, the write bit is already clear */
77461 - if ((vm_flags & (VM_WRITE|VM_SHARED)) != ((VM_WRITE|VM_SHARED)))
77462 + if ((vm_flags & (VM_WRITE|VM_SHARED)) != (VM_WRITE|VM_SHARED))
77463 return 0;
77464
77465 /* The backer wishes to know when pages are first written to? */
77466 @@ -1117,14 +1228,24 @@ unsigned long mmap_region(struct file *file, unsigned long addr,
77467 unsigned long charged = 0;
77468 struct inode *inode = file ? file->f_path.dentry->d_inode : NULL;
77469
77470 +#ifdef CONFIG_PAX_SEGMEXEC
77471 + struct vm_area_struct *vma_m = NULL;
77472 +#endif
77473 +
77474 + /*
77475 + * mm->mmap_sem is required to protect against another thread
77476 + * changing the mappings in case we sleep.
77477 + */
77478 + verify_mm_writelocked(mm);
77479 +
77480 /* Clear old maps */
77481 error = -ENOMEM;
77482 -munmap_back:
77483 vma = find_vma_prepare(mm, addr, &prev, &rb_link, &rb_parent);
77484 if (vma && vma->vm_start < addr + len) {
77485 if (do_munmap(mm, addr, len))
77486 return -ENOMEM;
77487 - goto munmap_back;
77488 + vma = find_vma_prepare(mm, addr, &prev, &rb_link, &rb_parent);
77489 + BUG_ON(vma && vma->vm_start < addr + len);
77490 }
77491
77492 /* Check against address space limit. */
77493 @@ -1173,6 +1294,16 @@ munmap_back:
77494 goto unacct_error;
77495 }
77496
77497 +#ifdef CONFIG_PAX_SEGMEXEC
77498 + if ((mm->pax_flags & MF_PAX_SEGMEXEC) && (vm_flags & VM_EXEC)) {
77499 + vma_m = kmem_cache_zalloc(vm_area_cachep, GFP_KERNEL);
77500 + if (!vma_m) {
77501 + error = -ENOMEM;
77502 + goto free_vma;
77503 + }
77504 + }
77505 +#endif
77506 +
77507 vma->vm_mm = mm;
77508 vma->vm_start = addr;
77509 vma->vm_end = addr + len;
77510 @@ -1195,6 +1326,19 @@ munmap_back:
77511 error = file->f_op->mmap(file, vma);
77512 if (error)
77513 goto unmap_and_free_vma;
77514 +
77515 +#ifdef CONFIG_PAX_SEGMEXEC
77516 + if (vma_m && (vm_flags & VM_EXECUTABLE))
77517 + added_exe_file_vma(mm);
77518 +#endif
77519 +
77520 +#if defined(CONFIG_PAX_PAGEEXEC) && defined(CONFIG_X86_32)
77521 + if ((mm->pax_flags & MF_PAX_PAGEEXEC) && !(vma->vm_flags & VM_SPECIAL)) {
77522 + vma->vm_flags |= VM_PAGEEXEC;
77523 + vma->vm_page_prot = vm_get_page_prot(vma->vm_flags);
77524 + }
77525 +#endif
77526 +
77527 if (vm_flags & VM_EXECUTABLE)
77528 added_exe_file_vma(mm);
77529
77530 @@ -1218,6 +1362,11 @@ munmap_back:
77531 vma_link(mm, vma, prev, rb_link, rb_parent);
77532 file = vma->vm_file;
77533
77534 +#ifdef CONFIG_PAX_SEGMEXEC
77535 + if (vma_m)
77536 + pax_mirror_vma(vma_m, vma);
77537 +#endif
77538 +
77539 /* Once vma denies write, undo our temporary denial count */
77540 if (correct_wcount)
77541 atomic_inc(&inode->i_writecount);
77542 @@ -1226,6 +1375,7 @@ out:
77543
77544 mm->total_vm += len >> PAGE_SHIFT;
77545 vm_stat_account(mm, vm_flags, file, len >> PAGE_SHIFT);
77546 + track_exec_limit(mm, addr, addr + len, vm_flags);
77547 if (vm_flags & VM_LOCKED) {
77548 /*
77549 * makes pages present; downgrades, drops, reacquires mmap_sem
77550 @@ -1248,6 +1398,12 @@ unmap_and_free_vma:
77551 unmap_region(mm, vma, prev, vma->vm_start, vma->vm_end);
77552 charged = 0;
77553 free_vma:
77554 +
77555 +#ifdef CONFIG_PAX_SEGMEXEC
77556 + if (vma_m)
77557 + kmem_cache_free(vm_area_cachep, vma_m);
77558 +#endif
77559 +
77560 kmem_cache_free(vm_area_cachep, vma);
77561 unacct_error:
77562 if (charged)
77563 @@ -1255,6 +1411,44 @@ unacct_error:
77564 return error;
77565 }
77566
77567 +bool check_heap_stack_gap(const struct vm_area_struct *vma, unsigned long addr, unsigned long len)
77568 +{
77569 + if (!vma) {
77570 +#ifdef CONFIG_STACK_GROWSUP
77571 + if (addr > sysctl_heap_stack_gap)
77572 + vma = find_vma(current->mm, addr - sysctl_heap_stack_gap);
77573 + else
77574 + vma = find_vma(current->mm, 0);
77575 + if (vma && (vma->vm_flags & VM_GROWSUP))
77576 + return false;
77577 +#endif
77578 + return true;
77579 + }
77580 +
77581 + if (addr + len > vma->vm_start)
77582 + return false;
77583 +
77584 + if (vma->vm_flags & VM_GROWSDOWN)
77585 + return sysctl_heap_stack_gap <= vma->vm_start - addr - len;
77586 +#ifdef CONFIG_STACK_GROWSUP
77587 + else if (vma->vm_prev && (vma->vm_prev->vm_flags & VM_GROWSUP))
77588 + return addr - vma->vm_prev->vm_end <= sysctl_heap_stack_gap;
77589 +#endif
77590 +
77591 + return true;
77592 +}
77593 +
77594 +unsigned long skip_heap_stack_gap(const struct vm_area_struct *vma, unsigned long len)
77595 +{
77596 + if (vma->vm_start < len)
77597 + return -ENOMEM;
77598 + if (!(vma->vm_flags & VM_GROWSDOWN))
77599 + return vma->vm_start - len;
77600 + if (sysctl_heap_stack_gap <= vma->vm_start - len)
77601 + return vma->vm_start - len - sysctl_heap_stack_gap;
77602 + return -ENOMEM;
77603 +}
77604 +
77605 /* Get an address range which is currently unmapped.
77606 * For shmat() with addr=0.
77607 *
77608 @@ -1281,18 +1475,23 @@ arch_get_unmapped_area(struct file *filp, unsigned long addr,
77609 if (flags & MAP_FIXED)
77610 return addr;
77611
77612 +#ifdef CONFIG_PAX_RANDMMAP
77613 + if (!(mm->pax_flags & MF_PAX_RANDMMAP))
77614 +#endif
77615 +
77616 if (addr) {
77617 addr = PAGE_ALIGN(addr);
77618 - vma = find_vma(mm, addr);
77619 - if (TASK_SIZE - len >= addr &&
77620 - (!vma || addr + len <= vma->vm_start))
77621 - return addr;
77622 + if (TASK_SIZE - len >= addr) {
77623 + vma = find_vma(mm, addr);
77624 + if (check_heap_stack_gap(vma, addr, len))
77625 + return addr;
77626 + }
77627 }
77628 if (len > mm->cached_hole_size) {
77629 - start_addr = addr = mm->free_area_cache;
77630 + start_addr = addr = mm->free_area_cache;
77631 } else {
77632 - start_addr = addr = TASK_UNMAPPED_BASE;
77633 - mm->cached_hole_size = 0;
77634 + start_addr = addr = mm->mmap_base;
77635 + mm->cached_hole_size = 0;
77636 }
77637
77638 full_search:
77639 @@ -1303,34 +1502,40 @@ full_search:
77640 * Start a new search - just in case we missed
77641 * some holes.
77642 */
77643 - if (start_addr != TASK_UNMAPPED_BASE) {
77644 - addr = TASK_UNMAPPED_BASE;
77645 - start_addr = addr;
77646 + if (start_addr != mm->mmap_base) {
77647 + start_addr = addr = mm->mmap_base;
77648 mm->cached_hole_size = 0;
77649 goto full_search;
77650 }
77651 return -ENOMEM;
77652 }
77653 - if (!vma || addr + len <= vma->vm_start) {
77654 - /*
77655 - * Remember the place where we stopped the search:
77656 - */
77657 - mm->free_area_cache = addr + len;
77658 - return addr;
77659 - }
77660 + if (check_heap_stack_gap(vma, addr, len))
77661 + break;
77662 if (addr + mm->cached_hole_size < vma->vm_start)
77663 mm->cached_hole_size = vma->vm_start - addr;
77664 addr = vma->vm_end;
77665 }
77666 +
77667 + /*
77668 + * Remember the place where we stopped the search:
77669 + */
77670 + mm->free_area_cache = addr + len;
77671 + return addr;
77672 }
77673 #endif
77674
77675 void arch_unmap_area(struct mm_struct *mm, unsigned long addr)
77676 {
77677 +
77678 +#ifdef CONFIG_PAX_SEGMEXEC
77679 + if ((mm->pax_flags & MF_PAX_SEGMEXEC) && SEGMEXEC_TASK_SIZE <= addr)
77680 + return;
77681 +#endif
77682 +
77683 /*
77684 * Is this a new hole at the lowest possible address?
77685 */
77686 - if (addr >= TASK_UNMAPPED_BASE && addr < mm->free_area_cache) {
77687 + if (addr >= mm->mmap_base && addr < mm->free_area_cache) {
77688 mm->free_area_cache = addr;
77689 mm->cached_hole_size = ~0UL;
77690 }
77691 @@ -1348,7 +1553,7 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
77692 {
77693 struct vm_area_struct *vma;
77694 struct mm_struct *mm = current->mm;
77695 - unsigned long addr = addr0;
77696 + unsigned long base = mm->mmap_base, addr = addr0;
77697
77698 /* requested length too big for entire address space */
77699 if (len > TASK_SIZE)
77700 @@ -1357,13 +1562,18 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
77701 if (flags & MAP_FIXED)
77702 return addr;
77703
77704 +#ifdef CONFIG_PAX_RANDMMAP
77705 + if (!(mm->pax_flags & MF_PAX_RANDMMAP))
77706 +#endif
77707 +
77708 /* requesting a specific address */
77709 if (addr) {
77710 addr = PAGE_ALIGN(addr);
77711 - vma = find_vma(mm, addr);
77712 - if (TASK_SIZE - len >= addr &&
77713 - (!vma || addr + len <= vma->vm_start))
77714 - return addr;
77715 + if (TASK_SIZE - len >= addr) {
77716 + vma = find_vma(mm, addr);
77717 + if (check_heap_stack_gap(vma, addr, len))
77718 + return addr;
77719 + }
77720 }
77721
77722 /* check if free_area_cache is useful for us */
77723 @@ -1378,7 +1588,7 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
77724 /* make sure it can fit in the remaining address space */
77725 if (addr > len) {
77726 vma = find_vma(mm, addr-len);
77727 - if (!vma || addr <= vma->vm_start)
77728 + if (check_heap_stack_gap(vma, addr - len, len))
77729 /* remember the address as a hint for next time */
77730 return (mm->free_area_cache = addr-len);
77731 }
77732 @@ -1395,7 +1605,7 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
77733 * return with success:
77734 */
77735 vma = find_vma(mm, addr);
77736 - if (!vma || addr+len <= vma->vm_start)
77737 + if (check_heap_stack_gap(vma, addr, len))
77738 /* remember the address as a hint for next time */
77739 return (mm->free_area_cache = addr);
77740
77741 @@ -1404,8 +1614,8 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
77742 mm->cached_hole_size = vma->vm_start - addr;
77743
77744 /* try just below the current vma->vm_start */
77745 - addr = vma->vm_start-len;
77746 - } while (len < vma->vm_start);
77747 + addr = skip_heap_stack_gap(vma, len);
77748 + } while (!IS_ERR_VALUE(addr));
77749
77750 bottomup:
77751 /*
77752 @@ -1414,13 +1624,21 @@ bottomup:
77753 * can happen with large stack limits and large mmap()
77754 * allocations.
77755 */
77756 + mm->mmap_base = TASK_UNMAPPED_BASE;
77757 +
77758 +#ifdef CONFIG_PAX_RANDMMAP
77759 + if (mm->pax_flags & MF_PAX_RANDMMAP)
77760 + mm->mmap_base += mm->delta_mmap;
77761 +#endif
77762 +
77763 + mm->free_area_cache = mm->mmap_base;
77764 mm->cached_hole_size = ~0UL;
77765 - mm->free_area_cache = TASK_UNMAPPED_BASE;
77766 addr = arch_get_unmapped_area(filp, addr0, len, pgoff, flags);
77767 /*
77768 * Restore the topdown base:
77769 */
77770 - mm->free_area_cache = mm->mmap_base;
77771 + mm->mmap_base = base;
77772 + mm->free_area_cache = base;
77773 mm->cached_hole_size = ~0UL;
77774
77775 return addr;
77776 @@ -1429,6 +1647,12 @@ bottomup:
77777
77778 void arch_unmap_area_topdown(struct mm_struct *mm, unsigned long addr)
77779 {
77780 +
77781 +#ifdef CONFIG_PAX_SEGMEXEC
77782 + if ((mm->pax_flags & MF_PAX_SEGMEXEC) && SEGMEXEC_TASK_SIZE <= addr)
77783 + return;
77784 +#endif
77785 +
77786 /*
77787 * Is this a new hole at the highest possible address?
77788 */
77789 @@ -1436,8 +1660,10 @@ void arch_unmap_area_topdown(struct mm_struct *mm, unsigned long addr)
77790 mm->free_area_cache = addr;
77791
77792 /* dont allow allocations above current base */
77793 - if (mm->free_area_cache > mm->mmap_base)
77794 + if (mm->free_area_cache > mm->mmap_base) {
77795 mm->free_area_cache = mm->mmap_base;
77796 + mm->cached_hole_size = ~0UL;
77797 + }
77798 }
77799
77800 unsigned long
77801 @@ -1545,6 +1771,27 @@ out:
77802 return prev ? prev->vm_next : vma;
77803 }
77804
77805 +#ifdef CONFIG_PAX_SEGMEXEC
77806 +struct vm_area_struct *pax_find_mirror_vma(struct vm_area_struct *vma)
77807 +{
77808 + struct vm_area_struct *vma_m;
77809 +
77810 + BUG_ON(!vma || vma->vm_start >= vma->vm_end);
77811 + if (!(vma->vm_mm->pax_flags & MF_PAX_SEGMEXEC) || !(vma->vm_flags & VM_EXEC)) {
77812 + BUG_ON(vma->vm_mirror);
77813 + return NULL;
77814 + }
77815 + BUG_ON(vma->vm_start < SEGMEXEC_TASK_SIZE && SEGMEXEC_TASK_SIZE < vma->vm_end);
77816 + vma_m = vma->vm_mirror;
77817 + BUG_ON(!vma_m || vma_m->vm_mirror != vma);
77818 + BUG_ON(vma->vm_file != vma_m->vm_file);
77819 + BUG_ON(vma->vm_end - vma->vm_start != vma_m->vm_end - vma_m->vm_start);
77820 + BUG_ON(vma->vm_pgoff != vma_m->vm_pgoff || vma->anon_vma != vma_m->anon_vma);
77821 + BUG_ON((vma->vm_flags ^ vma_m->vm_flags) & ~(VM_WRITE | VM_MAYWRITE | VM_ACCOUNT | VM_LOCKED | VM_RESERVED));
77822 + return vma_m;
77823 +}
77824 +#endif
77825 +
77826 /*
77827 * Verify that the stack growth is acceptable and
77828 * update accounting. This is shared with both the
77829 @@ -1561,6 +1808,7 @@ static int acct_stack_growth(struct vm_area_struct *vma, unsigned long size, uns
77830 return -ENOMEM;
77831
77832 /* Stack limit test */
77833 + gr_learn_resource(current, RLIMIT_STACK, size, 1);
77834 if (size > rlim[RLIMIT_STACK].rlim_cur)
77835 return -ENOMEM;
77836
77837 @@ -1570,6 +1818,7 @@ static int acct_stack_growth(struct vm_area_struct *vma, unsigned long size, uns
77838 unsigned long limit;
77839 locked = mm->locked_vm + grow;
77840 limit = rlim[RLIMIT_MEMLOCK].rlim_cur >> PAGE_SHIFT;
77841 + gr_learn_resource(current, RLIMIT_MEMLOCK, locked << PAGE_SHIFT, 1);
77842 if (locked > limit && !capable(CAP_IPC_LOCK))
77843 return -ENOMEM;
77844 }
77845 @@ -1600,37 +1849,48 @@ static int acct_stack_growth(struct vm_area_struct *vma, unsigned long size, uns
77846 * PA-RISC uses this for its stack; IA64 for its Register Backing Store.
77847 * vma is the last one with address > vma->vm_end. Have to extend vma.
77848 */
77849 +#ifndef CONFIG_IA64
77850 +static
77851 +#endif
77852 int expand_upwards(struct vm_area_struct *vma, unsigned long address)
77853 {
77854 int error;
77855 + bool locknext;
77856
77857 if (!(vma->vm_flags & VM_GROWSUP))
77858 return -EFAULT;
77859
77860 + /* Also guard against wrapping around to address 0. */
77861 + if (address < PAGE_ALIGN(address+1))
77862 + address = PAGE_ALIGN(address+1);
77863 + else
77864 + return -ENOMEM;
77865 +
77866 /*
77867 * We must make sure the anon_vma is allocated
77868 * so that the anon_vma locking is not a noop.
77869 */
77870 if (unlikely(anon_vma_prepare(vma)))
77871 return -ENOMEM;
77872 + locknext = vma->vm_next && (vma->vm_next->vm_flags & VM_GROWSDOWN);
77873 + if (locknext && anon_vma_prepare(vma->vm_next))
77874 + return -ENOMEM;
77875 anon_vma_lock(vma);
77876 + if (locknext)
77877 + anon_vma_lock(vma->vm_next);
77878
77879 /*
77880 * vma->vm_start/vm_end cannot change under us because the caller
77881 * is required to hold the mmap_sem in read mode. We need the
77882 - * anon_vma lock to serialize against concurrent expand_stacks.
77883 - * Also guard against wrapping around to address 0.
77884 + * anon_vma locks to serialize against concurrent expand_stacks
77885 + * and expand_upwards.
77886 */
77887 - if (address < PAGE_ALIGN(address+4))
77888 - address = PAGE_ALIGN(address+4);
77889 - else {
77890 - anon_vma_unlock(vma);
77891 - return -ENOMEM;
77892 - }
77893 error = 0;
77894
77895 /* Somebody else might have raced and expanded it already */
77896 - if (address > vma->vm_end) {
77897 + 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)
77898 + error = -ENOMEM;
77899 + else if (address > vma->vm_end && (!locknext || vma->vm_next->vm_start >= address)) {
77900 unsigned long size, grow;
77901
77902 size = address - vma->vm_start;
77903 @@ -1643,6 +1903,8 @@ int expand_upwards(struct vm_area_struct *vma, unsigned long address)
77904 vma->vm_end = address;
77905 }
77906 }
77907 + if (locknext)
77908 + anon_vma_unlock(vma->vm_next);
77909 anon_vma_unlock(vma);
77910 return error;
77911 }
77912 @@ -1655,6 +1917,8 @@ static int expand_downwards(struct vm_area_struct *vma,
77913 unsigned long address)
77914 {
77915 int error;
77916 + bool lockprev = false;
77917 + struct vm_area_struct *prev;
77918
77919 /*
77920 * We must make sure the anon_vma is allocated
77921 @@ -1668,6 +1932,15 @@ static int expand_downwards(struct vm_area_struct *vma,
77922 if (error)
77923 return error;
77924
77925 + prev = vma->vm_prev;
77926 +#if defined(CONFIG_STACK_GROWSUP) || defined(CONFIG_IA64)
77927 + lockprev = prev && (prev->vm_flags & VM_GROWSUP);
77928 +#endif
77929 + if (lockprev && anon_vma_prepare(prev))
77930 + return -ENOMEM;
77931 + if (lockprev)
77932 + anon_vma_lock(prev);
77933 +
77934 anon_vma_lock(vma);
77935
77936 /*
77937 @@ -1677,9 +1950,17 @@ static int expand_downwards(struct vm_area_struct *vma,
77938 */
77939
77940 /* Somebody else might have raced and expanded it already */
77941 - if (address < vma->vm_start) {
77942 + if (prev && (prev->vm_flags & (VM_READ | VM_WRITE | VM_EXEC)) && address - prev->vm_end < sysctl_heap_stack_gap)
77943 + error = -ENOMEM;
77944 + else if (address < vma->vm_start && (!lockprev || prev->vm_end <= address)) {
77945 unsigned long size, grow;
77946
77947 +#ifdef CONFIG_PAX_SEGMEXEC
77948 + struct vm_area_struct *vma_m;
77949 +
77950 + vma_m = pax_find_mirror_vma(vma);
77951 +#endif
77952 +
77953 size = vma->vm_end - address;
77954 grow = (vma->vm_start - address) >> PAGE_SHIFT;
77955
77956 @@ -1689,10 +1970,22 @@ static int expand_downwards(struct vm_area_struct *vma,
77957 if (!error) {
77958 vma->vm_start = address;
77959 vma->vm_pgoff -= grow;
77960 + track_exec_limit(vma->vm_mm, vma->vm_start, vma->vm_end, vma->vm_flags);
77961 +
77962 +#ifdef CONFIG_PAX_SEGMEXEC
77963 + if (vma_m) {
77964 + vma_m->vm_start -= grow << PAGE_SHIFT;
77965 + vma_m->vm_pgoff -= grow;
77966 + }
77967 +#endif
77968 +
77969 +
77970 }
77971 }
77972 }
77973 anon_vma_unlock(vma);
77974 + if (lockprev)
77975 + anon_vma_unlock(prev);
77976 return error;
77977 }
77978
77979 @@ -1768,6 +2061,13 @@ static void remove_vma_list(struct mm_struct *mm, struct vm_area_struct *vma)
77980 do {
77981 long nrpages = vma_pages(vma);
77982
77983 +#ifdef CONFIG_PAX_SEGMEXEC
77984 + if ((mm->pax_flags & MF_PAX_SEGMEXEC) && (vma->vm_start >= SEGMEXEC_TASK_SIZE)) {
77985 + vma = remove_vma(vma);
77986 + continue;
77987 + }
77988 +#endif
77989 +
77990 mm->total_vm -= nrpages;
77991 vm_stat_account(mm, vma->vm_flags, vma->vm_file, -nrpages);
77992 vma = remove_vma(vma);
77993 @@ -1813,6 +2113,16 @@ detach_vmas_to_be_unmapped(struct mm_struct *mm, struct vm_area_struct *vma,
77994 insertion_point = (prev ? &prev->vm_next : &mm->mmap);
77995 vma->vm_prev = NULL;
77996 do {
77997 +
77998 +#ifdef CONFIG_PAX_SEGMEXEC
77999 + if (vma->vm_mirror) {
78000 + BUG_ON(!vma->vm_mirror->vm_mirror || vma->vm_mirror->vm_mirror != vma);
78001 + vma->vm_mirror->vm_mirror = NULL;
78002 + vma->vm_mirror->vm_flags &= ~VM_EXEC;
78003 + vma->vm_mirror = NULL;
78004 + }
78005 +#endif
78006 +
78007 rb_erase(&vma->vm_rb, &mm->mm_rb);
78008 mm->map_count--;
78009 tail_vma = vma;
78010 @@ -1840,10 +2150,25 @@ int split_vma(struct mm_struct * mm, struct vm_area_struct * vma,
78011 struct mempolicy *pol;
78012 struct vm_area_struct *new;
78013
78014 +#ifdef CONFIG_PAX_SEGMEXEC
78015 + struct vm_area_struct *vma_m, *new_m = NULL;
78016 + unsigned long addr_m = addr + SEGMEXEC_TASK_SIZE;
78017 +#endif
78018 +
78019 if (is_vm_hugetlb_page(vma) && (addr &
78020 ~(huge_page_mask(hstate_vma(vma)))))
78021 return -EINVAL;
78022
78023 +#ifdef CONFIG_PAX_SEGMEXEC
78024 + vma_m = pax_find_mirror_vma(vma);
78025 +
78026 + if (mm->pax_flags & MF_PAX_SEGMEXEC) {
78027 + BUG_ON(vma->vm_end > SEGMEXEC_TASK_SIZE);
78028 + if (mm->map_count >= sysctl_max_map_count-1)
78029 + return -ENOMEM;
78030 + } else
78031 +#endif
78032 +
78033 if (mm->map_count >= sysctl_max_map_count)
78034 return -ENOMEM;
78035
78036 @@ -1851,6 +2176,16 @@ int split_vma(struct mm_struct * mm, struct vm_area_struct * vma,
78037 if (!new)
78038 return -ENOMEM;
78039
78040 +#ifdef CONFIG_PAX_SEGMEXEC
78041 + if (vma_m) {
78042 + new_m = kmem_cache_alloc(vm_area_cachep, GFP_KERNEL);
78043 + if (!new_m) {
78044 + kmem_cache_free(vm_area_cachep, new);
78045 + return -ENOMEM;
78046 + }
78047 + }
78048 +#endif
78049 +
78050 /* most fields are the same, copy all, and then fixup */
78051 *new = *vma;
78052
78053 @@ -1861,8 +2196,29 @@ int split_vma(struct mm_struct * mm, struct vm_area_struct * vma,
78054 new->vm_pgoff += ((addr - vma->vm_start) >> PAGE_SHIFT);
78055 }
78056
78057 +#ifdef CONFIG_PAX_SEGMEXEC
78058 + if (vma_m) {
78059 + *new_m = *vma_m;
78060 + new_m->vm_mirror = new;
78061 + new->vm_mirror = new_m;
78062 +
78063 + if (new_below)
78064 + new_m->vm_end = addr_m;
78065 + else {
78066 + new_m->vm_start = addr_m;
78067 + new_m->vm_pgoff += ((addr_m - vma_m->vm_start) >> PAGE_SHIFT);
78068 + }
78069 + }
78070 +#endif
78071 +
78072 pol = mpol_dup(vma_policy(vma));
78073 if (IS_ERR(pol)) {
78074 +
78075 +#ifdef CONFIG_PAX_SEGMEXEC
78076 + if (new_m)
78077 + kmem_cache_free(vm_area_cachep, new_m);
78078 +#endif
78079 +
78080 kmem_cache_free(vm_area_cachep, new);
78081 return PTR_ERR(pol);
78082 }
78083 @@ -1883,6 +2239,28 @@ int split_vma(struct mm_struct * mm, struct vm_area_struct * vma,
78084 else
78085 vma_adjust(vma, vma->vm_start, addr, vma->vm_pgoff, new);
78086
78087 +#ifdef CONFIG_PAX_SEGMEXEC
78088 + if (vma_m) {
78089 + mpol_get(pol);
78090 + vma_set_policy(new_m, pol);
78091 +
78092 + if (new_m->vm_file) {
78093 + get_file(new_m->vm_file);
78094 + if (vma_m->vm_flags & VM_EXECUTABLE)
78095 + added_exe_file_vma(mm);
78096 + }
78097 +
78098 + if (new_m->vm_ops && new_m->vm_ops->open)
78099 + new_m->vm_ops->open(new_m);
78100 +
78101 + if (new_below)
78102 + vma_adjust(vma_m, addr_m, vma_m->vm_end, vma_m->vm_pgoff +
78103 + ((addr_m - new_m->vm_start) >> PAGE_SHIFT), new_m);
78104 + else
78105 + vma_adjust(vma_m, vma_m->vm_start, addr_m, vma_m->vm_pgoff, new_m);
78106 + }
78107 +#endif
78108 +
78109 return 0;
78110 }
78111
78112 @@ -1891,11 +2269,30 @@ int split_vma(struct mm_struct * mm, struct vm_area_struct * vma,
78113 * work. This now handles partial unmappings.
78114 * Jeremy Fitzhardinge <jeremy@goop.org>
78115 */
78116 +#ifdef CONFIG_PAX_SEGMEXEC
78117 int do_munmap(struct mm_struct *mm, unsigned long start, size_t len)
78118 {
78119 + int ret = __do_munmap(mm, start, len);
78120 + if (ret || !(mm->pax_flags & MF_PAX_SEGMEXEC))
78121 + return ret;
78122 +
78123 + return __do_munmap(mm, start + SEGMEXEC_TASK_SIZE, len);
78124 +}
78125 +
78126 +int __do_munmap(struct mm_struct *mm, unsigned long start, size_t len)
78127 +#else
78128 +int do_munmap(struct mm_struct *mm, unsigned long start, size_t len)
78129 +#endif
78130 +{
78131 unsigned long end;
78132 struct vm_area_struct *vma, *prev, *last;
78133
78134 + /*
78135 + * mm->mmap_sem is required to protect against another thread
78136 + * changing the mappings in case we sleep.
78137 + */
78138 + verify_mm_writelocked(mm);
78139 +
78140 if ((start & ~PAGE_MASK) || start > TASK_SIZE || len > TASK_SIZE-start)
78141 return -EINVAL;
78142
78143 @@ -1959,6 +2356,8 @@ int do_munmap(struct mm_struct *mm, unsigned long start, size_t len)
78144 /* Fix up all other VM information */
78145 remove_vma_list(mm, vma);
78146
78147 + track_exec_limit(mm, start, end, 0UL);
78148 +
78149 return 0;
78150 }
78151
78152 @@ -1971,22 +2370,18 @@ SYSCALL_DEFINE2(munmap, unsigned long, addr, size_t, len)
78153
78154 profile_munmap(addr);
78155
78156 +#ifdef CONFIG_PAX_SEGMEXEC
78157 + if ((mm->pax_flags & MF_PAX_SEGMEXEC) &&
78158 + (len > SEGMEXEC_TASK_SIZE || addr > SEGMEXEC_TASK_SIZE-len))
78159 + return -EINVAL;
78160 +#endif
78161 +
78162 down_write(&mm->mmap_sem);
78163 ret = do_munmap(mm, addr, len);
78164 up_write(&mm->mmap_sem);
78165 return ret;
78166 }
78167
78168 -static inline void verify_mm_writelocked(struct mm_struct *mm)
78169 -{
78170 -#ifdef CONFIG_DEBUG_VM
78171 - if (unlikely(down_read_trylock(&mm->mmap_sem))) {
78172 - WARN_ON(1);
78173 - up_read(&mm->mmap_sem);
78174 - }
78175 -#endif
78176 -}
78177 -
78178 /*
78179 * this is really a simplified "do_mmap". it only handles
78180 * anonymous maps. eventually we may be able to do some
78181 @@ -2000,6 +2395,7 @@ unsigned long do_brk(unsigned long addr, unsigned long len)
78182 struct rb_node ** rb_link, * rb_parent;
78183 pgoff_t pgoff = addr >> PAGE_SHIFT;
78184 int error;
78185 + unsigned long charged;
78186
78187 len = PAGE_ALIGN(len);
78188 if (!len)
78189 @@ -2011,16 +2407,30 @@ unsigned long do_brk(unsigned long addr, unsigned long len)
78190
78191 flags = VM_DATA_DEFAULT_FLAGS | VM_ACCOUNT | mm->def_flags;
78192
78193 +#if defined(CONFIG_PAX_PAGEEXEC) || defined(CONFIG_PAX_SEGMEXEC)
78194 + if (mm->pax_flags & (MF_PAX_PAGEEXEC | MF_PAX_SEGMEXEC)) {
78195 + flags &= ~VM_EXEC;
78196 +
78197 +#ifdef CONFIG_PAX_MPROTECT
78198 + if (mm->pax_flags & MF_PAX_MPROTECT)
78199 + flags &= ~VM_MAYEXEC;
78200 +#endif
78201 +
78202 + }
78203 +#endif
78204 +
78205 error = get_unmapped_area(NULL, addr, len, 0, MAP_FIXED);
78206 if (error & ~PAGE_MASK)
78207 return error;
78208
78209 + charged = len >> PAGE_SHIFT;
78210 +
78211 /*
78212 * mlock MCL_FUTURE?
78213 */
78214 if (mm->def_flags & VM_LOCKED) {
78215 unsigned long locked, lock_limit;
78216 - locked = len >> PAGE_SHIFT;
78217 + locked = charged;
78218 locked += mm->locked_vm;
78219 lock_limit = current->signal->rlim[RLIMIT_MEMLOCK].rlim_cur;
78220 lock_limit >>= PAGE_SHIFT;
78221 @@ -2037,22 +2447,22 @@ unsigned long do_brk(unsigned long addr, unsigned long len)
78222 /*
78223 * Clear old maps. this also does some error checking for us
78224 */
78225 - munmap_back:
78226 vma = find_vma_prepare(mm, addr, &prev, &rb_link, &rb_parent);
78227 if (vma && vma->vm_start < addr + len) {
78228 if (do_munmap(mm, addr, len))
78229 return -ENOMEM;
78230 - goto munmap_back;
78231 + vma = find_vma_prepare(mm, addr, &prev, &rb_link, &rb_parent);
78232 + BUG_ON(vma && vma->vm_start < addr + len);
78233 }
78234
78235 /* Check against address space limits *after* clearing old maps... */
78236 - if (!may_expand_vm(mm, len >> PAGE_SHIFT))
78237 + if (!may_expand_vm(mm, charged))
78238 return -ENOMEM;
78239
78240 if (mm->map_count > sysctl_max_map_count)
78241 return -ENOMEM;
78242
78243 - if (security_vm_enough_memory(len >> PAGE_SHIFT))
78244 + if (security_vm_enough_memory(charged))
78245 return -ENOMEM;
78246
78247 /* Can we just expand an old private anonymous mapping? */
78248 @@ -2066,7 +2476,7 @@ unsigned long do_brk(unsigned long addr, unsigned long len)
78249 */
78250 vma = kmem_cache_zalloc(vm_area_cachep, GFP_KERNEL);
78251 if (!vma) {
78252 - vm_unacct_memory(len >> PAGE_SHIFT);
78253 + vm_unacct_memory(charged);
78254 return -ENOMEM;
78255 }
78256
78257 @@ -2078,11 +2488,12 @@ unsigned long do_brk(unsigned long addr, unsigned long len)
78258 vma->vm_page_prot = vm_get_page_prot(flags);
78259 vma_link(mm, vma, prev, rb_link, rb_parent);
78260 out:
78261 - mm->total_vm += len >> PAGE_SHIFT;
78262 + mm->total_vm += charged;
78263 if (flags & VM_LOCKED) {
78264 if (!mlock_vma_pages_range(vma, addr, addr + len))
78265 - mm->locked_vm += (len >> PAGE_SHIFT);
78266 + mm->locked_vm += charged;
78267 }
78268 + track_exec_limit(mm, addr, addr + len, flags);
78269 return addr;
78270 }
78271
78272 @@ -2129,8 +2540,10 @@ void exit_mmap(struct mm_struct *mm)
78273 * Walk the list again, actually closing and freeing it,
78274 * with preemption enabled, without holding any MM locks.
78275 */
78276 - while (vma)
78277 + while (vma) {
78278 + vma->vm_mirror = NULL;
78279 vma = remove_vma(vma);
78280 + }
78281
78282 BUG_ON(mm->nr_ptes > (FIRST_USER_ADDRESS+PMD_SIZE-1)>>PMD_SHIFT);
78283 }
78284 @@ -2144,6 +2557,10 @@ int insert_vm_struct(struct mm_struct * mm, struct vm_area_struct * vma)
78285 struct vm_area_struct * __vma, * prev;
78286 struct rb_node ** rb_link, * rb_parent;
78287
78288 +#ifdef CONFIG_PAX_SEGMEXEC
78289 + struct vm_area_struct *vma_m = NULL;
78290 +#endif
78291 +
78292 /*
78293 * The vm_pgoff of a purely anonymous vma should be irrelevant
78294 * until its first write fault, when page's anon_vma and index
78295 @@ -2166,7 +2583,22 @@ int insert_vm_struct(struct mm_struct * mm, struct vm_area_struct * vma)
78296 if ((vma->vm_flags & VM_ACCOUNT) &&
78297 security_vm_enough_memory_mm(mm, vma_pages(vma)))
78298 return -ENOMEM;
78299 +
78300 +#ifdef CONFIG_PAX_SEGMEXEC
78301 + if ((mm->pax_flags & MF_PAX_SEGMEXEC) && (vma->vm_flags & VM_EXEC)) {
78302 + vma_m = kmem_cache_zalloc(vm_area_cachep, GFP_KERNEL);
78303 + if (!vma_m)
78304 + return -ENOMEM;
78305 + }
78306 +#endif
78307 +
78308 vma_link(mm, vma, prev, rb_link, rb_parent);
78309 +
78310 +#ifdef CONFIG_PAX_SEGMEXEC
78311 + if (vma_m)
78312 + pax_mirror_vma(vma_m, vma);
78313 +#endif
78314 +
78315 return 0;
78316 }
78317
78318 @@ -2184,6 +2616,8 @@ struct vm_area_struct *copy_vma(struct vm_area_struct **vmap,
78319 struct rb_node **rb_link, *rb_parent;
78320 struct mempolicy *pol;
78321
78322 + BUG_ON(vma->vm_mirror);
78323 +
78324 /*
78325 * If anonymous vma has not yet been faulted, update new pgoff
78326 * to match new location, to increase its chance of merging.
78327 @@ -2227,6 +2661,35 @@ struct vm_area_struct *copy_vma(struct vm_area_struct **vmap,
78328 return new_vma;
78329 }
78330
78331 +#ifdef CONFIG_PAX_SEGMEXEC
78332 +void pax_mirror_vma(struct vm_area_struct *vma_m, struct vm_area_struct *vma)
78333 +{
78334 + struct vm_area_struct *prev_m;
78335 + struct rb_node **rb_link_m, *rb_parent_m;
78336 + struct mempolicy *pol_m;
78337 +
78338 + BUG_ON(!(vma->vm_mm->pax_flags & MF_PAX_SEGMEXEC) || !(vma->vm_flags & VM_EXEC));
78339 + BUG_ON(vma->vm_mirror || vma_m->vm_mirror);
78340 + BUG_ON(!mpol_equal(vma_policy(vma), vma_policy(vma_m)));
78341 + *vma_m = *vma;
78342 + pol_m = vma_policy(vma_m);
78343 + mpol_get(pol_m);
78344 + vma_set_policy(vma_m, pol_m);
78345 + vma_m->vm_start += SEGMEXEC_TASK_SIZE;
78346 + vma_m->vm_end += SEGMEXEC_TASK_SIZE;
78347 + vma_m->vm_flags &= ~(VM_WRITE | VM_MAYWRITE | VM_ACCOUNT | VM_LOCKED);
78348 + vma_m->vm_page_prot = vm_get_page_prot(vma_m->vm_flags);
78349 + if (vma_m->vm_file)
78350 + get_file(vma_m->vm_file);
78351 + if (vma_m->vm_ops && vma_m->vm_ops->open)
78352 + vma_m->vm_ops->open(vma_m);
78353 + find_vma_prepare(vma->vm_mm, vma_m->vm_start, &prev_m, &rb_link_m, &rb_parent_m);
78354 + vma_link(vma->vm_mm, vma_m, prev_m, rb_link_m, rb_parent_m);
78355 + vma_m->vm_mirror = vma;
78356 + vma->vm_mirror = vma_m;
78357 +}
78358 +#endif
78359 +
78360 /*
78361 * Return true if the calling process may expand its vm space by the passed
78362 * number of pages
78363 @@ -2237,7 +2700,7 @@ int may_expand_vm(struct mm_struct *mm, unsigned long npages)
78364 unsigned long lim;
78365
78366 lim = current->signal->rlim[RLIMIT_AS].rlim_cur >> PAGE_SHIFT;
78367 -
78368 + gr_learn_resource(current, RLIMIT_AS, (cur + npages) << PAGE_SHIFT, 1);
78369 if (cur + npages > lim)
78370 return 0;
78371 return 1;
78372 @@ -2307,6 +2770,22 @@ int install_special_mapping(struct mm_struct *mm,
78373 vma->vm_start = addr;
78374 vma->vm_end = addr + len;
78375
78376 +#ifdef CONFIG_PAX_MPROTECT
78377 + if (mm->pax_flags & MF_PAX_MPROTECT) {
78378 +#ifndef CONFIG_PAX_MPROTECT_COMPAT
78379 + if ((vm_flags & (VM_WRITE | VM_EXEC)) == (VM_WRITE | VM_EXEC))
78380 + return -EPERM;
78381 + if (!(vm_flags & VM_EXEC))
78382 + vm_flags &= ~VM_MAYEXEC;
78383 +#else
78384 + if ((vm_flags & (VM_WRITE | VM_EXEC)) != VM_EXEC)
78385 + vm_flags &= ~(VM_EXEC | VM_MAYEXEC);
78386 +#endif
78387 + else
78388 + vm_flags &= ~VM_MAYWRITE;
78389 + }
78390 +#endif
78391 +
78392 vma->vm_flags = vm_flags | mm->def_flags | VM_DONTEXPAND;
78393 vma->vm_page_prot = vm_get_page_prot(vma->vm_flags);
78394
78395 diff --git a/mm/mprotect.c b/mm/mprotect.c
78396 index 1737c7e..c7faeb4 100644
78397 --- a/mm/mprotect.c
78398 +++ b/mm/mprotect.c
78399 @@ -24,10 +24,16 @@
78400 #include <linux/mmu_notifier.h>
78401 #include <linux/migrate.h>
78402 #include <linux/perf_event.h>
78403 +
78404 +#ifdef CONFIG_PAX_MPROTECT
78405 +#include <linux/elf.h>
78406 +#endif
78407 +
78408 #include <asm/uaccess.h>
78409 #include <asm/pgtable.h>
78410 #include <asm/cacheflush.h>
78411 #include <asm/tlbflush.h>
78412 +#include <asm/mmu_context.h>
78413
78414 #ifndef pgprot_modify
78415 static inline pgprot_t pgprot_modify(pgprot_t oldprot, pgprot_t newprot)
78416 @@ -132,6 +138,48 @@ static void change_protection(struct vm_area_struct *vma,
78417 flush_tlb_range(vma, start, end);
78418 }
78419
78420 +#ifdef CONFIG_ARCH_TRACK_EXEC_LIMIT
78421 +/* called while holding the mmap semaphor for writing except stack expansion */
78422 +void track_exec_limit(struct mm_struct *mm, unsigned long start, unsigned long end, unsigned long prot)
78423 +{
78424 + unsigned long oldlimit, newlimit = 0UL;
78425 +
78426 + if (!(mm->pax_flags & MF_PAX_PAGEEXEC) || nx_enabled)
78427 + return;
78428 +
78429 + spin_lock(&mm->page_table_lock);
78430 + oldlimit = mm->context.user_cs_limit;
78431 + if ((prot & VM_EXEC) && oldlimit < end)
78432 + /* USER_CS limit moved up */
78433 + newlimit = end;
78434 + else if (!(prot & VM_EXEC) && start < oldlimit && oldlimit <= end)
78435 + /* USER_CS limit moved down */
78436 + newlimit = start;
78437 +
78438 + if (newlimit) {
78439 + mm->context.user_cs_limit = newlimit;
78440 +
78441 +#ifdef CONFIG_SMP
78442 + wmb();
78443 + cpus_clear(mm->context.cpu_user_cs_mask);
78444 + cpu_set(smp_processor_id(), mm->context.cpu_user_cs_mask);
78445 +#endif
78446 +
78447 + set_user_cs(mm->context.user_cs_base, mm->context.user_cs_limit, smp_processor_id());
78448 + }
78449 + spin_unlock(&mm->page_table_lock);
78450 + if (newlimit == end) {
78451 + struct vm_area_struct *vma = find_vma(mm, oldlimit);
78452 +
78453 + for (; vma && vma->vm_start < end; vma = vma->vm_next)
78454 + if (is_vm_hugetlb_page(vma))
78455 + hugetlb_change_protection(vma, vma->vm_start, vma->vm_end, vma->vm_page_prot);
78456 + else
78457 + change_protection(vma, vma->vm_start, vma->vm_end, vma->vm_page_prot, vma_wants_writenotify(vma));
78458 + }
78459 +}
78460 +#endif
78461 +
78462 int
78463 mprotect_fixup(struct vm_area_struct *vma, struct vm_area_struct **pprev,
78464 unsigned long start, unsigned long end, unsigned long newflags)
78465 @@ -144,11 +192,29 @@ mprotect_fixup(struct vm_area_struct *vma, struct vm_area_struct **pprev,
78466 int error;
78467 int dirty_accountable = 0;
78468
78469 +#ifdef CONFIG_PAX_SEGMEXEC
78470 + struct vm_area_struct *vma_m = NULL;
78471 + unsigned long start_m, end_m;
78472 +
78473 + start_m = start + SEGMEXEC_TASK_SIZE;
78474 + end_m = end + SEGMEXEC_TASK_SIZE;
78475 +#endif
78476 +
78477 if (newflags == oldflags) {
78478 *pprev = vma;
78479 return 0;
78480 }
78481
78482 + if (newflags & (VM_READ | VM_WRITE | VM_EXEC)) {
78483 + struct vm_area_struct *prev = vma->vm_prev, *next = vma->vm_next;
78484 +
78485 + if (next && (next->vm_flags & VM_GROWSDOWN) && sysctl_heap_stack_gap > next->vm_start - end)
78486 + return -ENOMEM;
78487 +
78488 + if (prev && (prev->vm_flags & VM_GROWSUP) && sysctl_heap_stack_gap > start - prev->vm_end)
78489 + return -ENOMEM;
78490 + }
78491 +
78492 /*
78493 * If we make a private mapping writable we increase our commit;
78494 * but (without finer accounting) cannot reduce our commit if we
78495 @@ -165,6 +231,38 @@ mprotect_fixup(struct vm_area_struct *vma, struct vm_area_struct **pprev,
78496 }
78497 }
78498
78499 +#ifdef CONFIG_PAX_SEGMEXEC
78500 + if ((mm->pax_flags & MF_PAX_SEGMEXEC) && ((oldflags ^ newflags) & VM_EXEC)) {
78501 + if (start != vma->vm_start) {
78502 + error = split_vma(mm, vma, start, 1);
78503 + if (error)
78504 + goto fail;
78505 + BUG_ON(!*pprev || (*pprev)->vm_next == vma);
78506 + *pprev = (*pprev)->vm_next;
78507 + }
78508 +
78509 + if (end != vma->vm_end) {
78510 + error = split_vma(mm, vma, end, 0);
78511 + if (error)
78512 + goto fail;
78513 + }
78514 +
78515 + if (pax_find_mirror_vma(vma)) {
78516 + error = __do_munmap(mm, start_m, end_m - start_m);
78517 + if (error)
78518 + goto fail;
78519 + } else {
78520 + vma_m = kmem_cache_zalloc(vm_area_cachep, GFP_KERNEL);
78521 + if (!vma_m) {
78522 + error = -ENOMEM;
78523 + goto fail;
78524 + }
78525 + vma->vm_flags = newflags;
78526 + pax_mirror_vma(vma_m, vma);
78527 + }
78528 + }
78529 +#endif
78530 +
78531 /*
78532 * First try to merge with previous and/or next vma.
78533 */
78534 @@ -195,9 +293,21 @@ success:
78535 * vm_flags and vm_page_prot are protected by the mmap_sem
78536 * held in write mode.
78537 */
78538 +
78539 +#ifdef CONFIG_PAX_SEGMEXEC
78540 + if ((mm->pax_flags & MF_PAX_SEGMEXEC) && (newflags & VM_EXEC) && ((vma->vm_flags ^ newflags) & VM_READ))
78541 + pax_find_mirror_vma(vma)->vm_flags ^= VM_READ;
78542 +#endif
78543 +
78544 vma->vm_flags = newflags;
78545 +
78546 +#ifdef CONFIG_PAX_MPROTECT
78547 + if (mm->binfmt && mm->binfmt->handle_mprotect)
78548 + mm->binfmt->handle_mprotect(vma, newflags);
78549 +#endif
78550 +
78551 vma->vm_page_prot = pgprot_modify(vma->vm_page_prot,
78552 - vm_get_page_prot(newflags));
78553 + vm_get_page_prot(vma->vm_flags));
78554
78555 if (vma_wants_writenotify(vma)) {
78556 vma->vm_page_prot = vm_get_page_prot(newflags & ~VM_SHARED);
78557 @@ -239,6 +349,17 @@ SYSCALL_DEFINE3(mprotect, unsigned long, start, size_t, len,
78558 end = start + len;
78559 if (end <= start)
78560 return -ENOMEM;
78561 +
78562 +#ifdef CONFIG_PAX_SEGMEXEC
78563 + if (current->mm->pax_flags & MF_PAX_SEGMEXEC) {
78564 + if (end > SEGMEXEC_TASK_SIZE)
78565 + return -EINVAL;
78566 + } else
78567 +#endif
78568 +
78569 + if (end > TASK_SIZE)
78570 + return -EINVAL;
78571 +
78572 if (!arch_validate_prot(prot))
78573 return -EINVAL;
78574
78575 @@ -246,7 +367,7 @@ SYSCALL_DEFINE3(mprotect, unsigned long, start, size_t, len,
78576 /*
78577 * Does the application expect PROT_READ to imply PROT_EXEC:
78578 */
78579 - if ((prot & PROT_READ) && (current->personality & READ_IMPLIES_EXEC))
78580 + if ((prot & (PROT_READ | PROT_WRITE)) && (current->personality & READ_IMPLIES_EXEC))
78581 prot |= PROT_EXEC;
78582
78583 vm_flags = calc_vm_prot_bits(prot);
78584 @@ -278,6 +399,11 @@ SYSCALL_DEFINE3(mprotect, unsigned long, start, size_t, len,
78585 if (start > vma->vm_start)
78586 prev = vma;
78587
78588 +#ifdef CONFIG_PAX_MPROTECT
78589 + if (current->mm->binfmt && current->mm->binfmt->handle_mprotect)
78590 + current->mm->binfmt->handle_mprotect(vma, vm_flags);
78591 +#endif
78592 +
78593 for (nstart = start ; ; ) {
78594 unsigned long newflags;
78595
78596 @@ -287,6 +413,14 @@ SYSCALL_DEFINE3(mprotect, unsigned long, start, size_t, len,
78597
78598 /* newflags >> 4 shift VM_MAY% in place of VM_% */
78599 if ((newflags & ~(newflags >> 4)) & (VM_READ | VM_WRITE | VM_EXEC)) {
78600 + if (prot & (PROT_WRITE | PROT_EXEC))
78601 + gr_log_rwxmprotect(vma->vm_file);
78602 +
78603 + error = -EACCES;
78604 + goto out;
78605 + }
78606 +
78607 + if (!gr_acl_handle_mprotect(vma->vm_file, prot)) {
78608 error = -EACCES;
78609 goto out;
78610 }
78611 @@ -301,6 +435,9 @@ SYSCALL_DEFINE3(mprotect, unsigned long, start, size_t, len,
78612 error = mprotect_fixup(vma, &prev, nstart, tmp, newflags);
78613 if (error)
78614 goto out;
78615 +
78616 + track_exec_limit(current->mm, nstart, tmp, vm_flags);
78617 +
78618 nstart = tmp;
78619
78620 if (nstart < prev->vm_end)
78621 diff --git a/mm/mremap.c b/mm/mremap.c
78622 index 3e98d79..1706cec 100644
78623 --- a/mm/mremap.c
78624 +++ b/mm/mremap.c
78625 @@ -112,6 +112,12 @@ static void move_ptes(struct vm_area_struct *vma, pmd_t *old_pmd,
78626 continue;
78627 pte = ptep_clear_flush(vma, old_addr, old_pte);
78628 pte = move_pte(pte, new_vma->vm_page_prot, old_addr, new_addr);
78629 +
78630 +#ifdef CONFIG_ARCH_TRACK_EXEC_LIMIT
78631 + if (!nx_enabled && (new_vma->vm_flags & (VM_PAGEEXEC | VM_EXEC)) == VM_PAGEEXEC)
78632 + pte = pte_exprotect(pte);
78633 +#endif
78634 +
78635 set_pte_at(mm, new_addr, new_pte, pte);
78636 }
78637
78638 @@ -271,6 +277,11 @@ static struct vm_area_struct *vma_to_resize(unsigned long addr,
78639 if (is_vm_hugetlb_page(vma))
78640 goto Einval;
78641
78642 +#ifdef CONFIG_PAX_SEGMEXEC
78643 + if (pax_find_mirror_vma(vma))
78644 + goto Einval;
78645 +#endif
78646 +
78647 /* We can't remap across vm area boundaries */
78648 if (old_len > vma->vm_end - addr)
78649 goto Efault;
78650 @@ -327,20 +338,25 @@ static unsigned long mremap_to(unsigned long addr,
78651 unsigned long ret = -EINVAL;
78652 unsigned long charged = 0;
78653 unsigned long map_flags;
78654 + unsigned long pax_task_size = TASK_SIZE;
78655
78656 if (new_addr & ~PAGE_MASK)
78657 goto out;
78658
78659 - if (new_len > TASK_SIZE || new_addr > TASK_SIZE - new_len)
78660 +#ifdef CONFIG_PAX_SEGMEXEC
78661 + if (mm->pax_flags & MF_PAX_SEGMEXEC)
78662 + pax_task_size = SEGMEXEC_TASK_SIZE;
78663 +#endif
78664 +
78665 + pax_task_size -= PAGE_SIZE;
78666 +
78667 + if (new_len > TASK_SIZE || new_addr > pax_task_size - new_len)
78668 goto out;
78669
78670 /* Check if the location we're moving into overlaps the
78671 * old location at all, and fail if it does.
78672 */
78673 - if ((new_addr <= addr) && (new_addr+new_len) > addr)
78674 - goto out;
78675 -
78676 - if ((addr <= new_addr) && (addr+old_len) > new_addr)
78677 + if (addr + old_len > new_addr && new_addr + new_len > addr)
78678 goto out;
78679
78680 ret = security_file_mmap(NULL, 0, 0, 0, new_addr, 1);
78681 @@ -412,6 +428,7 @@ unsigned long do_mremap(unsigned long addr,
78682 struct vm_area_struct *vma;
78683 unsigned long ret = -EINVAL;
78684 unsigned long charged = 0;
78685 + unsigned long pax_task_size = TASK_SIZE;
78686
78687 if (flags & ~(MREMAP_FIXED | MREMAP_MAYMOVE))
78688 goto out;
78689 @@ -430,6 +447,17 @@ unsigned long do_mremap(unsigned long addr,
78690 if (!new_len)
78691 goto out;
78692
78693 +#ifdef CONFIG_PAX_SEGMEXEC
78694 + if (mm->pax_flags & MF_PAX_SEGMEXEC)
78695 + pax_task_size = SEGMEXEC_TASK_SIZE;
78696 +#endif
78697 +
78698 + pax_task_size -= PAGE_SIZE;
78699 +
78700 + if (new_len > pax_task_size || addr > pax_task_size-new_len ||
78701 + old_len > pax_task_size || addr > pax_task_size-old_len)
78702 + goto out;
78703 +
78704 if (flags & MREMAP_FIXED) {
78705 if (flags & MREMAP_MAYMOVE)
78706 ret = mremap_to(addr, old_len, new_addr, new_len);
78707 @@ -476,6 +504,7 @@ unsigned long do_mremap(unsigned long addr,
78708 addr + new_len);
78709 }
78710 ret = addr;
78711 + track_exec_limit(vma->vm_mm, vma->vm_start, addr + new_len, vma->vm_flags);
78712 goto out;
78713 }
78714 }
78715 @@ -502,7 +531,13 @@ unsigned long do_mremap(unsigned long addr,
78716 ret = security_file_mmap(NULL, 0, 0, 0, new_addr, 1);
78717 if (ret)
78718 goto out;
78719 +
78720 + map_flags = vma->vm_flags;
78721 ret = move_vma(vma, addr, old_len, new_len, new_addr);
78722 + if (!(ret & ~PAGE_MASK)) {
78723 + track_exec_limit(current->mm, addr, addr + old_len, 0UL);
78724 + track_exec_limit(current->mm, new_addr, new_addr + new_len, map_flags);
78725 + }
78726 }
78727 out:
78728 if (ret & ~PAGE_MASK)
78729 diff --git a/mm/nommu.c b/mm/nommu.c
78730 index 406e8d4..53970d3 100644
78731 --- a/mm/nommu.c
78732 +++ b/mm/nommu.c
78733 @@ -67,7 +67,6 @@ int sysctl_overcommit_memory = OVERCOMMIT_GUESS; /* heuristic overcommit */
78734 int sysctl_overcommit_ratio = 50; /* default is 50% */
78735 int sysctl_max_map_count = DEFAULT_MAX_MAP_COUNT;
78736 int sysctl_nr_trim_pages = CONFIG_NOMMU_INITIAL_TRIM_EXCESS;
78737 -int heap_stack_gap = 0;
78738
78739 atomic_long_t mmap_pages_allocated;
78740
78741 @@ -761,15 +760,6 @@ struct vm_area_struct *find_vma(struct mm_struct *mm, unsigned long addr)
78742 EXPORT_SYMBOL(find_vma);
78743
78744 /*
78745 - * find a VMA
78746 - * - we don't extend stack VMAs under NOMMU conditions
78747 - */
78748 -struct vm_area_struct *find_extend_vma(struct mm_struct *mm, unsigned long addr)
78749 -{
78750 - return find_vma(mm, addr);
78751 -}
78752 -
78753 -/*
78754 * expand a stack to a given address
78755 * - not supported under NOMMU conditions
78756 */
78757 diff --git a/mm/page_alloc.c b/mm/page_alloc.c
78758 index 3ecab7e..594a471 100644
78759 --- a/mm/page_alloc.c
78760 +++ b/mm/page_alloc.c
78761 @@ -289,7 +289,7 @@ out:
78762 * This usage means that zero-order pages may not be compound.
78763 */
78764
78765 -static void free_compound_page(struct page *page)
78766 +void free_compound_page(struct page *page)
78767 {
78768 __free_pages_ok(page, compound_order(page));
78769 }
78770 @@ -587,6 +587,10 @@ static void __free_pages_ok(struct page *page, unsigned int order)
78771 int bad = 0;
78772 int wasMlocked = __TestClearPageMlocked(page);
78773
78774 +#ifdef CONFIG_PAX_MEMORY_SANITIZE
78775 + unsigned long index = 1UL << order;
78776 +#endif
78777 +
78778 kmemcheck_free_shadow(page, order);
78779
78780 for (i = 0 ; i < (1 << order) ; ++i)
78781 @@ -599,6 +603,12 @@ static void __free_pages_ok(struct page *page, unsigned int order)
78782 debug_check_no_obj_freed(page_address(page),
78783 PAGE_SIZE << order);
78784 }
78785 +
78786 +#ifdef CONFIG_PAX_MEMORY_SANITIZE
78787 + for (; index; --index)
78788 + sanitize_highpage(page + index - 1);
78789 +#endif
78790 +
78791 arch_free_page(page, order);
78792 kernel_map_pages(page, 1 << order, 0);
78793
78794 @@ -702,8 +712,10 @@ static int prep_new_page(struct page *page, int order, gfp_t gfp_flags)
78795 arch_alloc_page(page, order);
78796 kernel_map_pages(page, 1 << order, 1);
78797
78798 +#ifndef CONFIG_PAX_MEMORY_SANITIZE
78799 if (gfp_flags & __GFP_ZERO)
78800 prep_zero_page(page, order, gfp_flags);
78801 +#endif
78802
78803 if (order && (gfp_flags & __GFP_COMP))
78804 prep_compound_page(page, order);
78805 @@ -1097,6 +1109,11 @@ static void free_hot_cold_page(struct page *page, int cold)
78806 debug_check_no_locks_freed(page_address(page), PAGE_SIZE);
78807 debug_check_no_obj_freed(page_address(page), PAGE_SIZE);
78808 }
78809 +
78810 +#ifdef CONFIG_PAX_MEMORY_SANITIZE
78811 + sanitize_highpage(page);
78812 +#endif
78813 +
78814 arch_free_page(page, 0);
78815 kernel_map_pages(page, 1, 0);
78816
78817 @@ -2179,6 +2196,8 @@ void show_free_areas(void)
78818 int cpu;
78819 struct zone *zone;
78820
78821 + pax_track_stack();
78822 +
78823 for_each_populated_zone(zone) {
78824 show_node(zone);
78825 printk("%s per-cpu:\n", zone->name);
78826 @@ -3736,7 +3755,7 @@ static void __init setup_usemap(struct pglist_data *pgdat,
78827 zone->pageblock_flags = alloc_bootmem_node(pgdat, usemapsize);
78828 }
78829 #else
78830 -static void inline setup_usemap(struct pglist_data *pgdat,
78831 +static inline void setup_usemap(struct pglist_data *pgdat,
78832 struct zone *zone, unsigned long zonesize) {}
78833 #endif /* CONFIG_SPARSEMEM */
78834
78835 diff --git a/mm/percpu.c b/mm/percpu.c
78836 index c90614a..5f7b7b8 100644
78837 --- a/mm/percpu.c
78838 +++ b/mm/percpu.c
78839 @@ -115,7 +115,7 @@ static unsigned int pcpu_low_unit_cpu __read_mostly;
78840 static unsigned int pcpu_high_unit_cpu __read_mostly;
78841
78842 /* the address of the first chunk which starts with the kernel static area */
78843 -void *pcpu_base_addr __read_mostly;
78844 +void *pcpu_base_addr __read_only;
78845 EXPORT_SYMBOL_GPL(pcpu_base_addr);
78846
78847 static const int *pcpu_unit_map __read_mostly; /* cpu -> unit */
78848 diff --git a/mm/rmap.c b/mm/rmap.c
78849 index dd43373..d848cd7 100644
78850 --- a/mm/rmap.c
78851 +++ b/mm/rmap.c
78852 @@ -121,6 +121,17 @@ int anon_vma_prepare(struct vm_area_struct *vma)
78853 /* page_table_lock to protect against threads */
78854 spin_lock(&mm->page_table_lock);
78855 if (likely(!vma->anon_vma)) {
78856 +
78857 +#ifdef CONFIG_PAX_SEGMEXEC
78858 + struct vm_area_struct *vma_m = pax_find_mirror_vma(vma);
78859 +
78860 + if (vma_m) {
78861 + BUG_ON(vma_m->anon_vma);
78862 + vma_m->anon_vma = anon_vma;
78863 + list_add_tail(&vma_m->anon_vma_node, &anon_vma->head);
78864 + }
78865 +#endif
78866 +
78867 vma->anon_vma = anon_vma;
78868 list_add_tail(&vma->anon_vma_node, &anon_vma->head);
78869 allocated = NULL;
78870 diff --git a/mm/shmem.c b/mm/shmem.c
78871 index 3e0005b..1d659a8 100644
78872 --- a/mm/shmem.c
78873 +++ b/mm/shmem.c
78874 @@ -31,7 +31,7 @@
78875 #include <linux/swap.h>
78876 #include <linux/ima.h>
78877
78878 -static struct vfsmount *shm_mnt;
78879 +struct vfsmount *shm_mnt;
78880
78881 #ifdef CONFIG_SHMEM
78882 /*
78883 @@ -1061,6 +1061,8 @@ static int shmem_writepage(struct page *page, struct writeback_control *wbc)
78884 goto unlock;
78885 }
78886 entry = shmem_swp_entry(info, index, NULL);
78887 + if (!entry)
78888 + goto unlock;
78889 if (entry->val) {
78890 /*
78891 * The more uptodate page coming down from a stacked
78892 @@ -1144,6 +1146,8 @@ static struct page *shmem_swapin(swp_entry_t entry, gfp_t gfp,
78893 struct vm_area_struct pvma;
78894 struct page *page;
78895
78896 + pax_track_stack();
78897 +
78898 spol = mpol_cond_copy(&mpol,
78899 mpol_shared_policy_lookup(&info->policy, idx));
78900
78901 @@ -1962,7 +1966,7 @@ static int shmem_symlink(struct inode *dir, struct dentry *dentry, const char *s
78902
78903 info = SHMEM_I(inode);
78904 inode->i_size = len-1;
78905 - if (len <= (char *)inode - (char *)info) {
78906 + if (len <= (char *)inode - (char *)info && len <= 64) {
78907 /* do it inline */
78908 memcpy(info, symname, len);
78909 inode->i_op = &shmem_symlink_inline_operations;
78910 @@ -2310,8 +2314,7 @@ int shmem_fill_super(struct super_block *sb, void *data, int silent)
78911 int err = -ENOMEM;
78912
78913 /* Round up to L1_CACHE_BYTES to resist false sharing */
78914 - sbinfo = kzalloc(max((int)sizeof(struct shmem_sb_info),
78915 - L1_CACHE_BYTES), GFP_KERNEL);
78916 + sbinfo = kzalloc(max(sizeof(struct shmem_sb_info), L1_CACHE_BYTES), GFP_KERNEL);
78917 if (!sbinfo)
78918 return -ENOMEM;
78919
78920 diff --git a/mm/slab.c b/mm/slab.c
78921 index c8d466a..909e01e 100644
78922 --- a/mm/slab.c
78923 +++ b/mm/slab.c
78924 @@ -174,7 +174,7 @@
78925
78926 /* Legal flag mask for kmem_cache_create(). */
78927 #if DEBUG
78928 -# define CREATE_MASK (SLAB_RED_ZONE | \
78929 +# define CREATE_MASK (SLAB_USERCOPY | SLAB_RED_ZONE | \
78930 SLAB_POISON | SLAB_HWCACHE_ALIGN | \
78931 SLAB_CACHE_DMA | \
78932 SLAB_STORE_USER | \
78933 @@ -182,7 +182,7 @@
78934 SLAB_DESTROY_BY_RCU | SLAB_MEM_SPREAD | \
78935 SLAB_DEBUG_OBJECTS | SLAB_NOLEAKTRACE | SLAB_NOTRACK)
78936 #else
78937 -# define CREATE_MASK (SLAB_HWCACHE_ALIGN | \
78938 +# define CREATE_MASK (SLAB_USERCOPY | SLAB_HWCACHE_ALIGN | \
78939 SLAB_CACHE_DMA | \
78940 SLAB_RECLAIM_ACCOUNT | SLAB_PANIC | \
78941 SLAB_DESTROY_BY_RCU | SLAB_MEM_SPREAD | \
78942 @@ -308,7 +308,7 @@ struct kmem_list3 {
78943 * Need this for bootstrapping a per node allocator.
78944 */
78945 #define NUM_INIT_LISTS (3 * MAX_NUMNODES)
78946 -struct kmem_list3 __initdata initkmem_list3[NUM_INIT_LISTS];
78947 +struct kmem_list3 initkmem_list3[NUM_INIT_LISTS];
78948 #define CACHE_CACHE 0
78949 #define SIZE_AC MAX_NUMNODES
78950 #define SIZE_L3 (2 * MAX_NUMNODES)
78951 @@ -409,10 +409,10 @@ static void kmem_list3_init(struct kmem_list3 *parent)
78952 if ((x)->max_freeable < i) \
78953 (x)->max_freeable = i; \
78954 } while (0)
78955 -#define STATS_INC_ALLOCHIT(x) atomic_inc(&(x)->allochit)
78956 -#define STATS_INC_ALLOCMISS(x) atomic_inc(&(x)->allocmiss)
78957 -#define STATS_INC_FREEHIT(x) atomic_inc(&(x)->freehit)
78958 -#define STATS_INC_FREEMISS(x) atomic_inc(&(x)->freemiss)
78959 +#define STATS_INC_ALLOCHIT(x) atomic_inc_unchecked(&(x)->allochit)
78960 +#define STATS_INC_ALLOCMISS(x) atomic_inc_unchecked(&(x)->allocmiss)
78961 +#define STATS_INC_FREEHIT(x) atomic_inc_unchecked(&(x)->freehit)
78962 +#define STATS_INC_FREEMISS(x) atomic_inc_unchecked(&(x)->freemiss)
78963 #else
78964 #define STATS_INC_ACTIVE(x) do { } while (0)
78965 #define STATS_DEC_ACTIVE(x) do { } while (0)
78966 @@ -558,7 +558,7 @@ static inline void *index_to_obj(struct kmem_cache *cache, struct slab *slab,
78967 * reciprocal_divide(offset, cache->reciprocal_buffer_size)
78968 */
78969 static inline unsigned int obj_to_index(const struct kmem_cache *cache,
78970 - const struct slab *slab, void *obj)
78971 + const struct slab *slab, const void *obj)
78972 {
78973 u32 offset = (obj - slab->s_mem);
78974 return reciprocal_divide(offset, cache->reciprocal_buffer_size);
78975 @@ -1453,7 +1453,7 @@ void __init kmem_cache_init(void)
78976 sizes[INDEX_AC].cs_cachep = kmem_cache_create(names[INDEX_AC].name,
78977 sizes[INDEX_AC].cs_size,
78978 ARCH_KMALLOC_MINALIGN,
78979 - ARCH_KMALLOC_FLAGS|SLAB_PANIC,
78980 + ARCH_KMALLOC_FLAGS|SLAB_PANIC|SLAB_USERCOPY,
78981 NULL);
78982
78983 if (INDEX_AC != INDEX_L3) {
78984 @@ -1461,7 +1461,7 @@ void __init kmem_cache_init(void)
78985 kmem_cache_create(names[INDEX_L3].name,
78986 sizes[INDEX_L3].cs_size,
78987 ARCH_KMALLOC_MINALIGN,
78988 - ARCH_KMALLOC_FLAGS|SLAB_PANIC,
78989 + ARCH_KMALLOC_FLAGS|SLAB_PANIC|SLAB_USERCOPY,
78990 NULL);
78991 }
78992
78993 @@ -1479,7 +1479,7 @@ void __init kmem_cache_init(void)
78994 sizes->cs_cachep = kmem_cache_create(names->name,
78995 sizes->cs_size,
78996 ARCH_KMALLOC_MINALIGN,
78997 - ARCH_KMALLOC_FLAGS|SLAB_PANIC,
78998 + ARCH_KMALLOC_FLAGS|SLAB_PANIC|SLAB_USERCOPY,
78999 NULL);
79000 }
79001 #ifdef CONFIG_ZONE_DMA
79002 @@ -4211,10 +4211,10 @@ static int s_show(struct seq_file *m, void *p)
79003 }
79004 /* cpu stats */
79005 {
79006 - unsigned long allochit = atomic_read(&cachep->allochit);
79007 - unsigned long allocmiss = atomic_read(&cachep->allocmiss);
79008 - unsigned long freehit = atomic_read(&cachep->freehit);
79009 - unsigned long freemiss = atomic_read(&cachep->freemiss);
79010 + unsigned long allochit = atomic_read_unchecked(&cachep->allochit);
79011 + unsigned long allocmiss = atomic_read_unchecked(&cachep->allocmiss);
79012 + unsigned long freehit = atomic_read_unchecked(&cachep->freehit);
79013 + unsigned long freemiss = atomic_read_unchecked(&cachep->freemiss);
79014
79015 seq_printf(m, " : cpustat %6lu %6lu %6lu %6lu",
79016 allochit, allocmiss, freehit, freemiss);
79017 @@ -4471,15 +4471,70 @@ static const struct file_operations proc_slabstats_operations = {
79018
79019 static int __init slab_proc_init(void)
79020 {
79021 - proc_create("slabinfo",S_IWUSR|S_IRUGO,NULL,&proc_slabinfo_operations);
79022 + mode_t gr_mode = S_IRUGO;
79023 +
79024 +#ifdef CONFIG_GRKERNSEC_PROC_ADD
79025 + gr_mode = S_IRUSR;
79026 +#endif
79027 +
79028 + proc_create("slabinfo",S_IWUSR|gr_mode,NULL,&proc_slabinfo_operations);
79029 #ifdef CONFIG_DEBUG_SLAB_LEAK
79030 - proc_create("slab_allocators", 0, NULL, &proc_slabstats_operations);
79031 + proc_create("slab_allocators", gr_mode, NULL, &proc_slabstats_operations);
79032 #endif
79033 return 0;
79034 }
79035 module_init(slab_proc_init);
79036 #endif
79037
79038 +void check_object_size(const void *ptr, unsigned long n, bool to)
79039 +{
79040 +
79041 +#ifdef CONFIG_PAX_USERCOPY
79042 + struct page *page;
79043 + struct kmem_cache *cachep = NULL;
79044 + struct slab *slabp;
79045 + unsigned int objnr;
79046 + unsigned long offset;
79047 + const char *type;
79048 +
79049 + if (!n)
79050 + return;
79051 +
79052 + type = "<null>";
79053 + if (ZERO_OR_NULL_PTR(ptr))
79054 + goto report;
79055 +
79056 + if (!virt_addr_valid(ptr))
79057 + return;
79058 +
79059 + page = virt_to_head_page(ptr);
79060 +
79061 + type = "<process stack>";
79062 + if (!PageSlab(page)) {
79063 + if (object_is_on_stack(ptr, n) == -1)
79064 + goto report;
79065 + return;
79066 + }
79067 +
79068 + cachep = page_get_cache(page);
79069 + type = cachep->name;
79070 + if (!(cachep->flags & SLAB_USERCOPY))
79071 + goto report;
79072 +
79073 + slabp = page_get_slab(page);
79074 + objnr = obj_to_index(cachep, slabp, ptr);
79075 + BUG_ON(objnr >= cachep->num);
79076 + offset = ptr - index_to_obj(cachep, slabp, objnr) - obj_offset(cachep);
79077 + if (offset <= obj_size(cachep) && n <= obj_size(cachep) - offset)
79078 + return;
79079 +
79080 +report:
79081 + pax_report_usercopy(ptr, n, to, type);
79082 +#endif
79083 +
79084 +}
79085 +EXPORT_SYMBOL(check_object_size);
79086 +
79087 /**
79088 * ksize - get the actual amount of memory allocated for a given object
79089 * @objp: Pointer to the object
79090 diff --git a/mm/slob.c b/mm/slob.c
79091 index 837ebd6..4712174 100644
79092 --- a/mm/slob.c
79093 +++ b/mm/slob.c
79094 @@ -29,7 +29,7 @@
79095 * If kmalloc is asked for objects of PAGE_SIZE or larger, it calls
79096 * alloc_pages() directly, allocating compound pages so the page order
79097 * does not have to be separately tracked, and also stores the exact
79098 - * allocation size in page->private so that it can be used to accurately
79099 + * allocation size in slob_page->size so that it can be used to accurately
79100 * provide ksize(). These objects are detected in kfree() because slob_page()
79101 * is false for them.
79102 *
79103 @@ -58,6 +58,7 @@
79104 */
79105
79106 #include <linux/kernel.h>
79107 +#include <linux/sched.h>
79108 #include <linux/slab.h>
79109 #include <linux/mm.h>
79110 #include <linux/swap.h> /* struct reclaim_state */
79111 @@ -100,7 +101,8 @@ struct slob_page {
79112 unsigned long flags; /* mandatory */
79113 atomic_t _count; /* mandatory */
79114 slobidx_t units; /* free units left in page */
79115 - unsigned long pad[2];
79116 + unsigned long pad[1];
79117 + unsigned long size; /* size when >=PAGE_SIZE */
79118 slob_t *free; /* first free slob_t in page */
79119 struct list_head list; /* linked list of free pages */
79120 };
79121 @@ -133,7 +135,7 @@ static LIST_HEAD(free_slob_large);
79122 */
79123 static inline int is_slob_page(struct slob_page *sp)
79124 {
79125 - return PageSlab((struct page *)sp);
79126 + return PageSlab((struct page *)sp) && !sp->size;
79127 }
79128
79129 static inline void set_slob_page(struct slob_page *sp)
79130 @@ -148,7 +150,7 @@ static inline void clear_slob_page(struct slob_page *sp)
79131
79132 static inline struct slob_page *slob_page(const void *addr)
79133 {
79134 - return (struct slob_page *)virt_to_page(addr);
79135 + return (struct slob_page *)virt_to_head_page(addr);
79136 }
79137
79138 /*
79139 @@ -208,7 +210,7 @@ static void set_slob(slob_t *s, slobidx_t size, slob_t *next)
79140 /*
79141 * Return the size of a slob block.
79142 */
79143 -static slobidx_t slob_units(slob_t *s)
79144 +static slobidx_t slob_units(const slob_t *s)
79145 {
79146 if (s->units > 0)
79147 return s->units;
79148 @@ -218,7 +220,7 @@ static slobidx_t slob_units(slob_t *s)
79149 /*
79150 * Return the next free slob block pointer after this one.
79151 */
79152 -static slob_t *slob_next(slob_t *s)
79153 +static slob_t *slob_next(const slob_t *s)
79154 {
79155 slob_t *base = (slob_t *)((unsigned long)s & PAGE_MASK);
79156 slobidx_t next;
79157 @@ -233,7 +235,7 @@ static slob_t *slob_next(slob_t *s)
79158 /*
79159 * Returns true if s is the last free block in its page.
79160 */
79161 -static int slob_last(slob_t *s)
79162 +static int slob_last(const slob_t *s)
79163 {
79164 return !((unsigned long)slob_next(s) & ~PAGE_MASK);
79165 }
79166 @@ -252,6 +254,7 @@ static void *slob_new_pages(gfp_t gfp, int order, int node)
79167 if (!page)
79168 return NULL;
79169
79170 + set_slob_page(page);
79171 return page_address(page);
79172 }
79173
79174 @@ -368,11 +371,11 @@ static void *slob_alloc(size_t size, gfp_t gfp, int align, int node)
79175 if (!b)
79176 return NULL;
79177 sp = slob_page(b);
79178 - set_slob_page(sp);
79179
79180 spin_lock_irqsave(&slob_lock, flags);
79181 sp->units = SLOB_UNITS(PAGE_SIZE);
79182 sp->free = b;
79183 + sp->size = 0;
79184 INIT_LIST_HEAD(&sp->list);
79185 set_slob(b, SLOB_UNITS(PAGE_SIZE), b + SLOB_UNITS(PAGE_SIZE));
79186 set_slob_page_free(sp, slob_list);
79187 @@ -475,10 +478,9 @@ out:
79188 #define ARCH_SLAB_MINALIGN __alignof__(unsigned long)
79189 #endif
79190
79191 -void *__kmalloc_node(size_t size, gfp_t gfp, int node)
79192 +static void *__kmalloc_node_align(size_t size, gfp_t gfp, int node, int align)
79193 {
79194 - unsigned int *m;
79195 - int align = max(ARCH_KMALLOC_MINALIGN, ARCH_SLAB_MINALIGN);
79196 + slob_t *m;
79197 void *ret;
79198
79199 lockdep_trace_alloc(gfp);
79200 @@ -491,7 +493,10 @@ void *__kmalloc_node(size_t size, gfp_t gfp, int node)
79201
79202 if (!m)
79203 return NULL;
79204 - *m = size;
79205 + BUILD_BUG_ON(ARCH_KMALLOC_MINALIGN < 2 * SLOB_UNIT);
79206 + BUILD_BUG_ON(ARCH_SLAB_MINALIGN < 2 * SLOB_UNIT);
79207 + m[0].units = size;
79208 + m[1].units = align;
79209 ret = (void *)m + align;
79210
79211 trace_kmalloc_node(_RET_IP_, ret,
79212 @@ -501,16 +506,25 @@ void *__kmalloc_node(size_t size, gfp_t gfp, int node)
79213
79214 ret = slob_new_pages(gfp | __GFP_COMP, get_order(size), node);
79215 if (ret) {
79216 - struct page *page;
79217 - page = virt_to_page(ret);
79218 - page->private = size;
79219 + struct slob_page *sp;
79220 + sp = slob_page(ret);
79221 + sp->size = size;
79222 }
79223
79224 trace_kmalloc_node(_RET_IP_, ret,
79225 size, PAGE_SIZE << order, gfp, node);
79226 }
79227
79228 - kmemleak_alloc(ret, size, 1, gfp);
79229 + return ret;
79230 +}
79231 +
79232 +void *__kmalloc_node(size_t size, gfp_t gfp, int node)
79233 +{
79234 + int align = max(ARCH_KMALLOC_MINALIGN, ARCH_SLAB_MINALIGN);
79235 + void *ret = __kmalloc_node_align(size, gfp, node, align);
79236 +
79237 + if (!ZERO_OR_NULL_PTR(ret))
79238 + kmemleak_alloc(ret, size, 1, gfp);
79239 return ret;
79240 }
79241 EXPORT_SYMBOL(__kmalloc_node);
79242 @@ -528,13 +542,92 @@ void kfree(const void *block)
79243 sp = slob_page(block);
79244 if (is_slob_page(sp)) {
79245 int align = max(ARCH_KMALLOC_MINALIGN, ARCH_SLAB_MINALIGN);
79246 - unsigned int *m = (unsigned int *)(block - align);
79247 - slob_free(m, *m + align);
79248 - } else
79249 + slob_t *m = (slob_t *)(block - align);
79250 + slob_free(m, m[0].units + align);
79251 + } else {
79252 + clear_slob_page(sp);
79253 + free_slob_page(sp);
79254 + sp->size = 0;
79255 put_page(&sp->page);
79256 + }
79257 }
79258 EXPORT_SYMBOL(kfree);
79259
79260 +void check_object_size(const void *ptr, unsigned long n, bool to)
79261 +{
79262 +
79263 +#ifdef CONFIG_PAX_USERCOPY
79264 + struct slob_page *sp;
79265 + const slob_t *free;
79266 + const void *base;
79267 + unsigned long flags;
79268 + const char *type;
79269 +
79270 + if (!n)
79271 + return;
79272 +
79273 + type = "<null>";
79274 + if (ZERO_OR_NULL_PTR(ptr))
79275 + goto report;
79276 +
79277 + if (!virt_addr_valid(ptr))
79278 + return;
79279 +
79280 + type = "<process stack>";
79281 + sp = slob_page(ptr);
79282 + if (!PageSlab((struct page*)sp)) {
79283 + if (object_is_on_stack(ptr, n) == -1)
79284 + goto report;
79285 + return;
79286 + }
79287 +
79288 + type = "<slob>";
79289 + if (sp->size) {
79290 + base = page_address(&sp->page);
79291 + if (base <= ptr && n <= sp->size - (ptr - base))
79292 + return;
79293 + goto report;
79294 + }
79295 +
79296 + /* some tricky double walking to find the chunk */
79297 + spin_lock_irqsave(&slob_lock, flags);
79298 + base = (void *)((unsigned long)ptr & PAGE_MASK);
79299 + free = sp->free;
79300 +
79301 + while (!slob_last(free) && (void *)free <= ptr) {
79302 + base = free + slob_units(free);
79303 + free = slob_next(free);
79304 + }
79305 +
79306 + while (base < (void *)free) {
79307 + slobidx_t m = ((slob_t *)base)[0].units, align = ((slob_t *)base)[1].units;
79308 + int size = SLOB_UNIT * SLOB_UNITS(m + align);
79309 + int offset;
79310 +
79311 + if (ptr < base + align)
79312 + break;
79313 +
79314 + offset = ptr - base - align;
79315 + if (offset >= m) {
79316 + base += size;
79317 + continue;
79318 + }
79319 +
79320 + if (n > m - offset)
79321 + break;
79322 +
79323 + spin_unlock_irqrestore(&slob_lock, flags);
79324 + return;
79325 + }
79326 +
79327 + spin_unlock_irqrestore(&slob_lock, flags);
79328 +report:
79329 + pax_report_usercopy(ptr, n, to, type);
79330 +#endif
79331 +
79332 +}
79333 +EXPORT_SYMBOL(check_object_size);
79334 +
79335 /* can't use ksize for kmem_cache_alloc memory, only kmalloc */
79336 size_t ksize(const void *block)
79337 {
79338 @@ -547,10 +640,10 @@ size_t ksize(const void *block)
79339 sp = slob_page(block);
79340 if (is_slob_page(sp)) {
79341 int align = max(ARCH_KMALLOC_MINALIGN, ARCH_SLAB_MINALIGN);
79342 - unsigned int *m = (unsigned int *)(block - align);
79343 - return SLOB_UNITS(*m) * SLOB_UNIT;
79344 + slob_t *m = (slob_t *)(block - align);
79345 + return SLOB_UNITS(m[0].units) * SLOB_UNIT;
79346 } else
79347 - return sp->page.private;
79348 + return sp->size;
79349 }
79350 EXPORT_SYMBOL(ksize);
79351
79352 @@ -566,8 +659,13 @@ struct kmem_cache *kmem_cache_create(const char *name, size_t size,
79353 {
79354 struct kmem_cache *c;
79355
79356 +#ifdef CONFIG_PAX_USERCOPY
79357 + c = __kmalloc_node_align(sizeof(struct kmem_cache),
79358 + GFP_KERNEL, -1, ARCH_KMALLOC_MINALIGN);
79359 +#else
79360 c = slob_alloc(sizeof(struct kmem_cache),
79361 GFP_KERNEL, ARCH_KMALLOC_MINALIGN, -1);
79362 +#endif
79363
79364 if (c) {
79365 c->name = name;
79366 @@ -605,17 +703,25 @@ void *kmem_cache_alloc_node(struct kmem_cache *c, gfp_t flags, int node)
79367 {
79368 void *b;
79369
79370 +#ifdef CONFIG_PAX_USERCOPY
79371 + b = __kmalloc_node_align(c->size, flags, node, c->align);
79372 +#else
79373 if (c->size < PAGE_SIZE) {
79374 b = slob_alloc(c->size, flags, c->align, node);
79375 trace_kmem_cache_alloc_node(_RET_IP_, b, c->size,
79376 SLOB_UNITS(c->size) * SLOB_UNIT,
79377 flags, node);
79378 } else {
79379 + struct slob_page *sp;
79380 +
79381 b = slob_new_pages(flags, get_order(c->size), node);
79382 + sp = slob_page(b);
79383 + sp->size = c->size;
79384 trace_kmem_cache_alloc_node(_RET_IP_, b, c->size,
79385 PAGE_SIZE << get_order(c->size),
79386 flags, node);
79387 }
79388 +#endif
79389
79390 if (c->ctor)
79391 c->ctor(b);
79392 @@ -627,10 +733,16 @@ EXPORT_SYMBOL(kmem_cache_alloc_node);
79393
79394 static void __kmem_cache_free(void *b, int size)
79395 {
79396 - if (size < PAGE_SIZE)
79397 + struct slob_page *sp = slob_page(b);
79398 +
79399 + if (is_slob_page(sp))
79400 slob_free(b, size);
79401 - else
79402 + else {
79403 + clear_slob_page(sp);
79404 + free_slob_page(sp);
79405 + sp->size = 0;
79406 slob_free_pages(b, get_order(size));
79407 + }
79408 }
79409
79410 static void kmem_rcu_free(struct rcu_head *head)
79411 @@ -643,18 +755,32 @@ static void kmem_rcu_free(struct rcu_head *head)
79412
79413 void kmem_cache_free(struct kmem_cache *c, void *b)
79414 {
79415 + int size = c->size;
79416 +
79417 +#ifdef CONFIG_PAX_USERCOPY
79418 + if (size + c->align < PAGE_SIZE) {
79419 + size += c->align;
79420 + b -= c->align;
79421 + }
79422 +#endif
79423 +
79424 kmemleak_free_recursive(b, c->flags);
79425 if (unlikely(c->flags & SLAB_DESTROY_BY_RCU)) {
79426 struct slob_rcu *slob_rcu;
79427 - slob_rcu = b + (c->size - sizeof(struct slob_rcu));
79428 + slob_rcu = b + (size - sizeof(struct slob_rcu));
79429 INIT_RCU_HEAD(&slob_rcu->head);
79430 - slob_rcu->size = c->size;
79431 + slob_rcu->size = size;
79432 call_rcu(&slob_rcu->head, kmem_rcu_free);
79433 } else {
79434 - __kmem_cache_free(b, c->size);
79435 + __kmem_cache_free(b, size);
79436 }
79437
79438 +#ifdef CONFIG_PAX_USERCOPY
79439 + trace_kfree(_RET_IP_, b);
79440 +#else
79441 trace_kmem_cache_free(_RET_IP_, b);
79442 +#endif
79443 +
79444 }
79445 EXPORT_SYMBOL(kmem_cache_free);
79446
79447 diff --git a/mm/slub.c b/mm/slub.c
79448 index 4996fc7..87e01d0 100644
79449 --- a/mm/slub.c
79450 +++ b/mm/slub.c
79451 @@ -201,7 +201,7 @@ struct track {
79452
79453 enum track_item { TRACK_ALLOC, TRACK_FREE };
79454
79455 -#ifdef CONFIG_SLUB_DEBUG
79456 +#if defined(CONFIG_SLUB_DEBUG) && !defined(CONFIG_GRKERNSEC_PROC_ADD)
79457 static int sysfs_slab_add(struct kmem_cache *);
79458 static int sysfs_slab_alias(struct kmem_cache *, const char *);
79459 static void sysfs_slab_remove(struct kmem_cache *);
79460 @@ -410,7 +410,7 @@ static void print_track(const char *s, struct track *t)
79461 if (!t->addr)
79462 return;
79463
79464 - printk(KERN_ERR "INFO: %s in %pS age=%lu cpu=%u pid=%d\n",
79465 + printk(KERN_ERR "INFO: %s in %pA age=%lu cpu=%u pid=%d\n",
79466 s, (void *)t->addr, jiffies - t->when, t->cpu, t->pid);
79467 }
79468
79469 @@ -1893,6 +1893,8 @@ void kmem_cache_free(struct kmem_cache *s, void *x)
79470
79471 page = virt_to_head_page(x);
79472
79473 + BUG_ON(!PageSlab(page));
79474 +
79475 slab_free(s, page, x, _RET_IP_);
79476
79477 trace_kmem_cache_free(_RET_IP_, x);
79478 @@ -1937,7 +1939,7 @@ static int slub_min_objects;
79479 * Merge control. If this is set then no merging of slab caches will occur.
79480 * (Could be removed. This was introduced to pacify the merge skeptics.)
79481 */
79482 -static int slub_nomerge;
79483 +static int slub_nomerge = 1;
79484
79485 /*
79486 * Calculate the order of allocation given an slab object size.
79487 @@ -2493,7 +2495,7 @@ static int kmem_cache_open(struct kmem_cache *s, gfp_t gfpflags,
79488 * list to avoid pounding the page allocator excessively.
79489 */
79490 set_min_partial(s, ilog2(s->size));
79491 - s->refcount = 1;
79492 + atomic_set(&s->refcount, 1);
79493 #ifdef CONFIG_NUMA
79494 s->remote_node_defrag_ratio = 1000;
79495 #endif
79496 @@ -2630,8 +2632,7 @@ static inline int kmem_cache_close(struct kmem_cache *s)
79497 void kmem_cache_destroy(struct kmem_cache *s)
79498 {
79499 down_write(&slub_lock);
79500 - s->refcount--;
79501 - if (!s->refcount) {
79502 + if (atomic_dec_and_test(&s->refcount)) {
79503 list_del(&s->list);
79504 up_write(&slub_lock);
79505 if (kmem_cache_close(s)) {
79506 @@ -2691,12 +2692,10 @@ static int __init setup_slub_nomerge(char *str)
79507 __setup("slub_nomerge", setup_slub_nomerge);
79508
79509 static struct kmem_cache *create_kmalloc_cache(struct kmem_cache *s,
79510 - const char *name, int size, gfp_t gfp_flags)
79511 + const char *name, int size, gfp_t gfp_flags, unsigned int flags)
79512 {
79513 - unsigned int flags = 0;
79514 -
79515 if (gfp_flags & SLUB_DMA)
79516 - flags = SLAB_CACHE_DMA;
79517 + flags |= SLAB_CACHE_DMA;
79518
79519 /*
79520 * This function is called with IRQs disabled during early-boot on
79521 @@ -2915,6 +2914,50 @@ void *__kmalloc_node(size_t size, gfp_t flags, int node)
79522 EXPORT_SYMBOL(__kmalloc_node);
79523 #endif
79524
79525 +void check_object_size(const void *ptr, unsigned long n, bool to)
79526 +{
79527 +
79528 +#ifdef CONFIG_PAX_USERCOPY
79529 + struct page *page;
79530 + struct kmem_cache *s = NULL;
79531 + unsigned long offset;
79532 + const char *type;
79533 +
79534 + if (!n)
79535 + return;
79536 +
79537 + type = "<null>";
79538 + if (ZERO_OR_NULL_PTR(ptr))
79539 + goto report;
79540 +
79541 + if (!virt_addr_valid(ptr))
79542 + return;
79543 +
79544 + page = get_object_page(ptr);
79545 +
79546 + type = "<process stack>";
79547 + if (!page) {
79548 + if (object_is_on_stack(ptr, n) == -1)
79549 + goto report;
79550 + return;
79551 + }
79552 +
79553 + s = page->slab;
79554 + type = s->name;
79555 + if (!(s->flags & SLAB_USERCOPY))
79556 + goto report;
79557 +
79558 + offset = (ptr - page_address(page)) % s->size;
79559 + if (offset <= s->objsize && n <= s->objsize - offset)
79560 + return;
79561 +
79562 +report:
79563 + pax_report_usercopy(ptr, n, to, type);
79564 +#endif
79565 +
79566 +}
79567 +EXPORT_SYMBOL(check_object_size);
79568 +
79569 size_t ksize(const void *object)
79570 {
79571 struct page *page;
79572 @@ -3185,8 +3228,8 @@ void __init kmem_cache_init(void)
79573 * kmem_cache_open for slab_state == DOWN.
79574 */
79575 create_kmalloc_cache(&kmalloc_caches[0], "kmem_cache_node",
79576 - sizeof(struct kmem_cache_node), GFP_NOWAIT);
79577 - kmalloc_caches[0].refcount = -1;
79578 + sizeof(struct kmem_cache_node), GFP_NOWAIT, 0);
79579 + atomic_set(&kmalloc_caches[0].refcount, -1);
79580 caches++;
79581
79582 hotplug_memory_notifier(slab_memory_callback, SLAB_CALLBACK_PRI);
79583 @@ -3198,18 +3241,18 @@ void __init kmem_cache_init(void)
79584 /* Caches that are not of the two-to-the-power-of size */
79585 if (KMALLOC_MIN_SIZE <= 32) {
79586 create_kmalloc_cache(&kmalloc_caches[1],
79587 - "kmalloc-96", 96, GFP_NOWAIT);
79588 + "kmalloc-96", 96, GFP_NOWAIT, SLAB_USERCOPY);
79589 caches++;
79590 }
79591 if (KMALLOC_MIN_SIZE <= 64) {
79592 create_kmalloc_cache(&kmalloc_caches[2],
79593 - "kmalloc-192", 192, GFP_NOWAIT);
79594 + "kmalloc-192", 192, GFP_NOWAIT, SLAB_USERCOPY);
79595 caches++;
79596 }
79597
79598 for (i = KMALLOC_SHIFT_LOW; i < SLUB_PAGE_SHIFT; i++) {
79599 create_kmalloc_cache(&kmalloc_caches[i],
79600 - "kmalloc", 1 << i, GFP_NOWAIT);
79601 + "kmalloc", 1 << i, GFP_NOWAIT, SLAB_USERCOPY);
79602 caches++;
79603 }
79604
79605 @@ -3293,7 +3336,7 @@ static int slab_unmergeable(struct kmem_cache *s)
79606 /*
79607 * We may have set a slab to be unmergeable during bootstrap.
79608 */
79609 - if (s->refcount < 0)
79610 + if (atomic_read(&s->refcount) < 0)
79611 return 1;
79612
79613 return 0;
79614 @@ -3353,7 +3396,7 @@ struct kmem_cache *kmem_cache_create(const char *name, size_t size,
79615 if (s) {
79616 int cpu;
79617
79618 - s->refcount++;
79619 + atomic_inc(&s->refcount);
79620 /*
79621 * Adjust the object sizes so that we clear
79622 * the complete object on kzalloc.
79623 @@ -3372,7 +3415,7 @@ struct kmem_cache *kmem_cache_create(const char *name, size_t size,
79624
79625 if (sysfs_slab_alias(s, name)) {
79626 down_write(&slub_lock);
79627 - s->refcount--;
79628 + atomic_dec(&s->refcount);
79629 up_write(&slub_lock);
79630 goto err;
79631 }
79632 @@ -4101,7 +4144,7 @@ SLAB_ATTR_RO(ctor);
79633
79634 static ssize_t aliases_show(struct kmem_cache *s, char *buf)
79635 {
79636 - return sprintf(buf, "%d\n", s->refcount - 1);
79637 + return sprintf(buf, "%d\n", atomic_read(&s->refcount) - 1);
79638 }
79639 SLAB_ATTR_RO(aliases);
79640
79641 @@ -4503,7 +4546,7 @@ static void kmem_cache_release(struct kobject *kobj)
79642 kfree(s);
79643 }
79644
79645 -static struct sysfs_ops slab_sysfs_ops = {
79646 +static const struct sysfs_ops slab_sysfs_ops = {
79647 .show = slab_attr_show,
79648 .store = slab_attr_store,
79649 };
79650 @@ -4522,7 +4565,7 @@ static int uevent_filter(struct kset *kset, struct kobject *kobj)
79651 return 0;
79652 }
79653
79654 -static struct kset_uevent_ops slab_uevent_ops = {
79655 +static const struct kset_uevent_ops slab_uevent_ops = {
79656 .filter = uevent_filter,
79657 };
79658
79659 @@ -4564,6 +4607,7 @@ static char *create_unique_id(struct kmem_cache *s)
79660 return name;
79661 }
79662
79663 +#if defined(CONFIG_SLUB_DEBUG) && !defined(CONFIG_GRKERNSEC_PROC_ADD)
79664 static int sysfs_slab_add(struct kmem_cache *s)
79665 {
79666 int err;
79667 @@ -4619,6 +4663,7 @@ static void sysfs_slab_remove(struct kmem_cache *s)
79668 kobject_del(&s->kobj);
79669 kobject_put(&s->kobj);
79670 }
79671 +#endif
79672
79673 /*
79674 * Need to buffer aliases during bootup until sysfs becomes
79675 @@ -4632,6 +4677,7 @@ struct saved_alias {
79676
79677 static struct saved_alias *alias_list;
79678
79679 +#if defined(CONFIG_SLUB_DEBUG) && !defined(CONFIG_GRKERNSEC_PROC_ADD)
79680 static int sysfs_slab_alias(struct kmem_cache *s, const char *name)
79681 {
79682 struct saved_alias *al;
79683 @@ -4654,6 +4700,7 @@ static int sysfs_slab_alias(struct kmem_cache *s, const char *name)
79684 alias_list = al;
79685 return 0;
79686 }
79687 +#endif
79688
79689 static int __init slab_sysfs_init(void)
79690 {
79691 @@ -4785,7 +4832,13 @@ static const struct file_operations proc_slabinfo_operations = {
79692
79693 static int __init slab_proc_init(void)
79694 {
79695 - proc_create("slabinfo", S_IRUGO, NULL, &proc_slabinfo_operations);
79696 + mode_t gr_mode = S_IRUGO;
79697 +
79698 +#ifdef CONFIG_GRKERNSEC_PROC_ADD
79699 + gr_mode = S_IRUSR;
79700 +#endif
79701 +
79702 + proc_create("slabinfo", gr_mode, NULL, &proc_slabinfo_operations);
79703 return 0;
79704 }
79705 module_init(slab_proc_init);
79706 diff --git a/mm/swap.c b/mm/swap.c
79707 index 308e57d..5de19c0 100644
79708 --- a/mm/swap.c
79709 +++ b/mm/swap.c
79710 @@ -30,6 +30,7 @@
79711 #include <linux/notifier.h>
79712 #include <linux/backing-dev.h>
79713 #include <linux/memcontrol.h>
79714 +#include <linux/hugetlb.h>
79715
79716 #include "internal.h"
79717
79718 @@ -65,6 +66,8 @@ static void put_compound_page(struct page *page)
79719 compound_page_dtor *dtor;
79720
79721 dtor = get_compound_page_dtor(page);
79722 + if (!PageHuge(page))
79723 + BUG_ON(dtor != free_compound_page);
79724 (*dtor)(page);
79725 }
79726 }
79727 diff --git a/mm/util.c b/mm/util.c
79728 index e48b493..24a601d 100644
79729 --- a/mm/util.c
79730 +++ b/mm/util.c
79731 @@ -228,6 +228,12 @@ EXPORT_SYMBOL(strndup_user);
79732 void arch_pick_mmap_layout(struct mm_struct *mm)
79733 {
79734 mm->mmap_base = TASK_UNMAPPED_BASE;
79735 +
79736 +#ifdef CONFIG_PAX_RANDMMAP
79737 + if (mm->pax_flags & MF_PAX_RANDMMAP)
79738 + mm->mmap_base += mm->delta_mmap;
79739 +#endif
79740 +
79741 mm->get_unmapped_area = arch_get_unmapped_area;
79742 mm->unmap_area = arch_unmap_area;
79743 }
79744 diff --git a/mm/vmalloc.c b/mm/vmalloc.c
79745 index f34ffd0..e60c44f 100644
79746 --- a/mm/vmalloc.c
79747 +++ b/mm/vmalloc.c
79748 @@ -40,8 +40,19 @@ static void vunmap_pte_range(pmd_t *pmd, unsigned long addr, unsigned long end)
79749
79750 pte = pte_offset_kernel(pmd, addr);
79751 do {
79752 - pte_t ptent = ptep_get_and_clear(&init_mm, addr, pte);
79753 - WARN_ON(!pte_none(ptent) && !pte_present(ptent));
79754 +
79755 +#if defined(CONFIG_MODULES) && defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
79756 + if ((unsigned long)MODULES_EXEC_VADDR <= addr && addr < (unsigned long)MODULES_EXEC_END) {
79757 + BUG_ON(!pte_exec(*pte));
79758 + set_pte_at(&init_mm, addr, pte, pfn_pte(__pa(addr) >> PAGE_SHIFT, PAGE_KERNEL_EXEC));
79759 + continue;
79760 + }
79761 +#endif
79762 +
79763 + {
79764 + pte_t ptent = ptep_get_and_clear(&init_mm, addr, pte);
79765 + WARN_ON(!pte_none(ptent) && !pte_present(ptent));
79766 + }
79767 } while (pte++, addr += PAGE_SIZE, addr != end);
79768 }
79769
79770 @@ -92,6 +103,7 @@ static int vmap_pte_range(pmd_t *pmd, unsigned long addr,
79771 unsigned long end, pgprot_t prot, struct page **pages, int *nr)
79772 {
79773 pte_t *pte;
79774 + int ret = -ENOMEM;
79775
79776 /*
79777 * nr is a running index into the array which helps higher level
79778 @@ -101,17 +113,32 @@ static int vmap_pte_range(pmd_t *pmd, unsigned long addr,
79779 pte = pte_alloc_kernel(pmd, addr);
79780 if (!pte)
79781 return -ENOMEM;
79782 +
79783 + pax_open_kernel();
79784 do {
79785 struct page *page = pages[*nr];
79786
79787 - if (WARN_ON(!pte_none(*pte)))
79788 - return -EBUSY;
79789 - if (WARN_ON(!page))
79790 - return -ENOMEM;
79791 +#if defined(CONFIG_MODULES) && defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
79792 + if (!(pgprot_val(prot) & _PAGE_NX))
79793 + BUG_ON(!pte_exec(*pte) || pte_pfn(*pte) != __pa(addr) >> PAGE_SHIFT);
79794 + else
79795 +#endif
79796 +
79797 + if (WARN_ON(!pte_none(*pte))) {
79798 + ret = -EBUSY;
79799 + goto out;
79800 + }
79801 + if (WARN_ON(!page)) {
79802 + ret = -ENOMEM;
79803 + goto out;
79804 + }
79805 set_pte_at(&init_mm, addr, pte, mk_pte(page, prot));
79806 (*nr)++;
79807 } while (pte++, addr += PAGE_SIZE, addr != end);
79808 - return 0;
79809 + ret = 0;
79810 +out:
79811 + pax_close_kernel();
79812 + return ret;
79813 }
79814
79815 static int vmap_pmd_range(pud_t *pud, unsigned long addr,
79816 @@ -192,11 +219,20 @@ int is_vmalloc_or_module_addr(const void *x)
79817 * and fall back on vmalloc() if that fails. Others
79818 * just put it in the vmalloc space.
79819 */
79820 -#if defined(CONFIG_MODULES) && defined(MODULES_VADDR)
79821 +#ifdef CONFIG_MODULES
79822 +#ifdef MODULES_VADDR
79823 unsigned long addr = (unsigned long)x;
79824 if (addr >= MODULES_VADDR && addr < MODULES_END)
79825 return 1;
79826 #endif
79827 +
79828 +#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
79829 + if (x >= (const void *)MODULES_EXEC_VADDR && x < (const void *)MODULES_EXEC_END)
79830 + return 1;
79831 +#endif
79832 +
79833 +#endif
79834 +
79835 return is_vmalloc_addr(x);
79836 }
79837
79838 @@ -217,8 +253,14 @@ struct page *vmalloc_to_page(const void *vmalloc_addr)
79839
79840 if (!pgd_none(*pgd)) {
79841 pud_t *pud = pud_offset(pgd, addr);
79842 +#ifdef CONFIG_X86
79843 + if (!pud_large(*pud))
79844 +#endif
79845 if (!pud_none(*pud)) {
79846 pmd_t *pmd = pmd_offset(pud, addr);
79847 +#ifdef CONFIG_X86
79848 + if (!pmd_large(*pmd))
79849 +#endif
79850 if (!pmd_none(*pmd)) {
79851 pte_t *ptep, pte;
79852
79853 @@ -292,13 +334,13 @@ static void __insert_vmap_area(struct vmap_area *va)
79854 struct rb_node *tmp;
79855
79856 while (*p) {
79857 - struct vmap_area *tmp;
79858 + struct vmap_area *varea;
79859
79860 parent = *p;
79861 - tmp = rb_entry(parent, struct vmap_area, rb_node);
79862 - if (va->va_start < tmp->va_end)
79863 + varea = rb_entry(parent, struct vmap_area, rb_node);
79864 + if (va->va_start < varea->va_end)
79865 p = &(*p)->rb_left;
79866 - else if (va->va_end > tmp->va_start)
79867 + else if (va->va_end > varea->va_start)
79868 p = &(*p)->rb_right;
79869 else
79870 BUG();
79871 @@ -1245,6 +1287,16 @@ static struct vm_struct *__get_vm_area_node(unsigned long size,
79872 struct vm_struct *area;
79873
79874 BUG_ON(in_interrupt());
79875 +
79876 +#if defined(CONFIG_MODULES) && defined(CONFIG_X86) && defined(CONFIG_PAX_KERNEXEC)
79877 + if (flags & VM_KERNEXEC) {
79878 + if (start != VMALLOC_START || end != VMALLOC_END)
79879 + return NULL;
79880 + start = (unsigned long)MODULES_EXEC_VADDR;
79881 + end = (unsigned long)MODULES_EXEC_END;
79882 + }
79883 +#endif
79884 +
79885 if (flags & VM_IOREMAP) {
79886 int bit = fls(size);
79887
79888 @@ -1484,6 +1536,11 @@ void *vmap(struct page **pages, unsigned int count,
79889 if (count > totalram_pages)
79890 return NULL;
79891
79892 +#if defined(CONFIG_MODULES) && defined(CONFIG_X86) && defined(CONFIG_PAX_KERNEXEC)
79893 + if (!(pgprot_val(prot) & _PAGE_NX))
79894 + flags |= VM_KERNEXEC;
79895 +#endif
79896 +
79897 area = get_vm_area_caller((count << PAGE_SHIFT), flags,
79898 __builtin_return_address(0));
79899 if (!area)
79900 @@ -1594,6 +1651,14 @@ static void *__vmalloc_node(unsigned long size, unsigned long align,
79901 if (!size || (size >> PAGE_SHIFT) > totalram_pages)
79902 return NULL;
79903
79904 +#if defined(CONFIG_MODULES) && defined(CONFIG_X86) && defined(CONFIG_PAX_KERNEXEC)
79905 + if (!(pgprot_val(prot) & _PAGE_NX))
79906 + area = __get_vm_area_node(size, align, VM_ALLOC | VM_UNLIST | VM_KERNEXEC,
79907 + VMALLOC_START, VMALLOC_END, node,
79908 + gfp_mask, caller);
79909 + else
79910 +#endif
79911 +
79912 area = __get_vm_area_node(size, align, VM_ALLOC | VM_UNLIST,
79913 VMALLOC_START, VMALLOC_END, node,
79914 gfp_mask, caller);
79915 @@ -1619,6 +1684,7 @@ static void *__vmalloc_node(unsigned long size, unsigned long align,
79916 return addr;
79917 }
79918
79919 +#undef __vmalloc
79920 void *__vmalloc(unsigned long size, gfp_t gfp_mask, pgprot_t prot)
79921 {
79922 return __vmalloc_node(size, 1, gfp_mask, prot, -1,
79923 @@ -1635,6 +1701,7 @@ EXPORT_SYMBOL(__vmalloc);
79924 * For tight control over page level allocator and protection flags
79925 * use __vmalloc() instead.
79926 */
79927 +#undef vmalloc
79928 void *vmalloc(unsigned long size)
79929 {
79930 return __vmalloc_node(size, 1, GFP_KERNEL | __GFP_HIGHMEM, PAGE_KERNEL,
79931 @@ -1649,6 +1716,7 @@ EXPORT_SYMBOL(vmalloc);
79932 * The resulting memory area is zeroed so it can be mapped to userspace
79933 * without leaking data.
79934 */
79935 +#undef vmalloc_user
79936 void *vmalloc_user(unsigned long size)
79937 {
79938 struct vm_struct *area;
79939 @@ -1676,6 +1744,7 @@ EXPORT_SYMBOL(vmalloc_user);
79940 * For tight control over page level allocator and protection flags
79941 * use __vmalloc() instead.
79942 */
79943 +#undef vmalloc_node
79944 void *vmalloc_node(unsigned long size, int node)
79945 {
79946 return __vmalloc_node(size, 1, GFP_KERNEL | __GFP_HIGHMEM, PAGE_KERNEL,
79947 @@ -1698,10 +1767,10 @@ EXPORT_SYMBOL(vmalloc_node);
79948 * For tight control over page level allocator and protection flags
79949 * use __vmalloc() instead.
79950 */
79951 -
79952 +#undef vmalloc_exec
79953 void *vmalloc_exec(unsigned long size)
79954 {
79955 - return __vmalloc_node(size, 1, GFP_KERNEL | __GFP_HIGHMEM, PAGE_KERNEL_EXEC,
79956 + return __vmalloc_node(size, 1, GFP_KERNEL | __GFP_HIGHMEM | __GFP_ZERO, PAGE_KERNEL_EXEC,
79957 -1, __builtin_return_address(0));
79958 }
79959
79960 @@ -1720,6 +1789,7 @@ void *vmalloc_exec(unsigned long size)
79961 * Allocate enough 32bit PA addressable pages to cover @size from the
79962 * page level allocator and map them into contiguous kernel virtual space.
79963 */
79964 +#undef vmalloc_32
79965 void *vmalloc_32(unsigned long size)
79966 {
79967 return __vmalloc_node(size, 1, GFP_VMALLOC32, PAGE_KERNEL,
79968 @@ -1734,6 +1804,7 @@ EXPORT_SYMBOL(vmalloc_32);
79969 * The resulting memory area is 32bit addressable and zeroed so it can be
79970 * mapped to userspace without leaking data.
79971 */
79972 +#undef vmalloc_32_user
79973 void *vmalloc_32_user(unsigned long size)
79974 {
79975 struct vm_struct *area;
79976 @@ -1998,6 +2069,8 @@ int remap_vmalloc_range(struct vm_area_struct *vma, void *addr,
79977 unsigned long uaddr = vma->vm_start;
79978 unsigned long usize = vma->vm_end - vma->vm_start;
79979
79980 + BUG_ON(vma->vm_mirror);
79981 +
79982 if ((PAGE_SIZE-1) & (unsigned long)addr)
79983 return -EINVAL;
79984
79985 diff --git a/mm/vmstat.c b/mm/vmstat.c
79986 index 42d76c6..5643dc4 100644
79987 --- a/mm/vmstat.c
79988 +++ b/mm/vmstat.c
79989 @@ -74,7 +74,7 @@ void vm_events_fold_cpu(int cpu)
79990 *
79991 * vm_stat contains the global counters
79992 */
79993 -atomic_long_t vm_stat[NR_VM_ZONE_STAT_ITEMS];
79994 +atomic_long_unchecked_t vm_stat[NR_VM_ZONE_STAT_ITEMS];
79995 EXPORT_SYMBOL(vm_stat);
79996
79997 #ifdef CONFIG_SMP
79998 @@ -324,7 +324,7 @@ void refresh_cpu_vm_stats(int cpu)
79999 v = p->vm_stat_diff[i];
80000 p->vm_stat_diff[i] = 0;
80001 local_irq_restore(flags);
80002 - atomic_long_add(v, &zone->vm_stat[i]);
80003 + atomic_long_add_unchecked(v, &zone->vm_stat[i]);
80004 global_diff[i] += v;
80005 #ifdef CONFIG_NUMA
80006 /* 3 seconds idle till flush */
80007 @@ -362,7 +362,7 @@ void refresh_cpu_vm_stats(int cpu)
80008
80009 for (i = 0; i < NR_VM_ZONE_STAT_ITEMS; i++)
80010 if (global_diff[i])
80011 - atomic_long_add(global_diff[i], &vm_stat[i]);
80012 + atomic_long_add_unchecked(global_diff[i], &vm_stat[i]);
80013 }
80014
80015 #endif
80016 @@ -953,10 +953,20 @@ static int __init setup_vmstat(void)
80017 start_cpu_timer(cpu);
80018 #endif
80019 #ifdef CONFIG_PROC_FS
80020 - proc_create("buddyinfo", S_IRUGO, NULL, &fragmentation_file_operations);
80021 - proc_create("pagetypeinfo", S_IRUGO, NULL, &pagetypeinfo_file_ops);
80022 - proc_create("vmstat", S_IRUGO, NULL, &proc_vmstat_file_operations);
80023 - proc_create("zoneinfo", S_IRUGO, NULL, &proc_zoneinfo_file_operations);
80024 + {
80025 + mode_t gr_mode = S_IRUGO;
80026 +#ifdef CONFIG_GRKERNSEC_PROC_ADD
80027 + gr_mode = S_IRUSR;
80028 +#endif
80029 + proc_create("buddyinfo", gr_mode, NULL, &fragmentation_file_operations);
80030 + proc_create("pagetypeinfo", gr_mode, NULL, &pagetypeinfo_file_ops);
80031 +#ifdef CONFIG_GRKERNSEC_PROC_USERGROUP
80032 + proc_create("vmstat", gr_mode | S_IRGRP, NULL, &proc_vmstat_file_operations);
80033 +#else
80034 + proc_create("vmstat", gr_mode, NULL, &proc_vmstat_file_operations);
80035 +#endif
80036 + proc_create("zoneinfo", gr_mode, NULL, &proc_zoneinfo_file_operations);
80037 + }
80038 #endif
80039 return 0;
80040 }
80041 diff --git a/net/8021q/vlan.c b/net/8021q/vlan.c
80042 index a29c5ab..6143f20 100644
80043 --- a/net/8021q/vlan.c
80044 +++ b/net/8021q/vlan.c
80045 @@ -622,8 +622,7 @@ static int vlan_ioctl_handler(struct net *net, void __user *arg)
80046 err = -EPERM;
80047 if (!capable(CAP_NET_ADMIN))
80048 break;
80049 - if ((args.u.name_type >= 0) &&
80050 - (args.u.name_type < VLAN_NAME_TYPE_HIGHEST)) {
80051 + if (args.u.name_type < VLAN_NAME_TYPE_HIGHEST) {
80052 struct vlan_net *vn;
80053
80054 vn = net_generic(net, vlan_net_id);
80055 diff --git a/net/9p/trans_fd.c b/net/9p/trans_fd.c
80056 index a2d2984..f9eb711 100644
80057 --- a/net/9p/trans_fd.c
80058 +++ b/net/9p/trans_fd.c
80059 @@ -419,7 +419,7 @@ static int p9_fd_write(struct p9_client *client, void *v, int len)
80060 oldfs = get_fs();
80061 set_fs(get_ds());
80062 /* The cast to a user pointer is valid due to the set_fs() */
80063 - ret = vfs_write(ts->wr, (__force void __user *)v, len, &ts->wr->f_pos);
80064 + ret = vfs_write(ts->wr, (void __force_user *)v, len, &ts->wr->f_pos);
80065 set_fs(oldfs);
80066
80067 if (ret <= 0 && ret != -ERESTARTSYS && ret != -EAGAIN)
80068 diff --git a/net/atm/atm_misc.c b/net/atm/atm_misc.c
80069 index 02cc7e7..4514f1b 100644
80070 --- a/net/atm/atm_misc.c
80071 +++ b/net/atm/atm_misc.c
80072 @@ -19,7 +19,7 @@ int atm_charge(struct atm_vcc *vcc,int truesize)
80073 if (atomic_read(&sk_atm(vcc)->sk_rmem_alloc) <= sk_atm(vcc)->sk_rcvbuf)
80074 return 1;
80075 atm_return(vcc,truesize);
80076 - atomic_inc(&vcc->stats->rx_drop);
80077 + atomic_inc_unchecked(&vcc->stats->rx_drop);
80078 return 0;
80079 }
80080
80081 @@ -41,7 +41,7 @@ struct sk_buff *atm_alloc_charge(struct atm_vcc *vcc,int pdu_size,
80082 }
80083 }
80084 atm_return(vcc,guess);
80085 - atomic_inc(&vcc->stats->rx_drop);
80086 + atomic_inc_unchecked(&vcc->stats->rx_drop);
80087 return NULL;
80088 }
80089
80090 @@ -88,7 +88,7 @@ int atm_pcr_goal(const struct atm_trafprm *tp)
80091
80092 void sonet_copy_stats(struct k_sonet_stats *from,struct sonet_stats *to)
80093 {
80094 -#define __HANDLE_ITEM(i) to->i = atomic_read(&from->i)
80095 +#define __HANDLE_ITEM(i) to->i = atomic_read_unchecked(&from->i)
80096 __SONET_ITEMS
80097 #undef __HANDLE_ITEM
80098 }
80099 @@ -96,7 +96,7 @@ void sonet_copy_stats(struct k_sonet_stats *from,struct sonet_stats *to)
80100
80101 void sonet_subtract_stats(struct k_sonet_stats *from,struct sonet_stats *to)
80102 {
80103 -#define __HANDLE_ITEM(i) atomic_sub(to->i,&from->i)
80104 +#define __HANDLE_ITEM(i) atomic_sub_unchecked(to->i,&from->i)
80105 __SONET_ITEMS
80106 #undef __HANDLE_ITEM
80107 }
80108 diff --git a/net/atm/lec.h b/net/atm/lec.h
80109 index 9d14d19..5c145f3 100644
80110 --- a/net/atm/lec.h
80111 +++ b/net/atm/lec.h
80112 @@ -48,7 +48,7 @@ struct lane2_ops {
80113 const u8 *tlvs, u32 sizeoftlvs);
80114 void (*associate_indicator) (struct net_device *dev, const u8 *mac_addr,
80115 const u8 *tlvs, u32 sizeoftlvs);
80116 -};
80117 +} __no_const;
80118
80119 /*
80120 * ATM LAN Emulation supports both LLC & Dix Ethernet EtherType
80121 diff --git a/net/atm/mpc.h b/net/atm/mpc.h
80122 index 0919a88..a23d54e 100644
80123 --- a/net/atm/mpc.h
80124 +++ b/net/atm/mpc.h
80125 @@ -33,7 +33,7 @@ struct mpoa_client {
80126 struct mpc_parameters parameters; /* parameters for this client */
80127
80128 const struct net_device_ops *old_ops;
80129 - struct net_device_ops new_ops;
80130 + net_device_ops_no_const new_ops;
80131 };
80132
80133
80134 diff --git a/net/atm/mpoa_caches.c b/net/atm/mpoa_caches.c
80135 index 4504a4b..1733f1e 100644
80136 --- a/net/atm/mpoa_caches.c
80137 +++ b/net/atm/mpoa_caches.c
80138 @@ -498,6 +498,8 @@ static void clear_expired(struct mpoa_client *client)
80139 struct timeval now;
80140 struct k_message msg;
80141
80142 + pax_track_stack();
80143 +
80144 do_gettimeofday(&now);
80145
80146 write_lock_irq(&client->egress_lock);
80147 diff --git a/net/atm/proc.c b/net/atm/proc.c
80148 index ab8419a..aa91497 100644
80149 --- a/net/atm/proc.c
80150 +++ b/net/atm/proc.c
80151 @@ -43,9 +43,9 @@ static void add_stats(struct seq_file *seq, const char *aal,
80152 const struct k_atm_aal_stats *stats)
80153 {
80154 seq_printf(seq, "%s ( %d %d %d %d %d )", aal,
80155 - atomic_read(&stats->tx),atomic_read(&stats->tx_err),
80156 - atomic_read(&stats->rx),atomic_read(&stats->rx_err),
80157 - atomic_read(&stats->rx_drop));
80158 + atomic_read_unchecked(&stats->tx),atomic_read_unchecked(&stats->tx_err),
80159 + atomic_read_unchecked(&stats->rx),atomic_read_unchecked(&stats->rx_err),
80160 + atomic_read_unchecked(&stats->rx_drop));
80161 }
80162
80163 static void atm_dev_info(struct seq_file *seq, const struct atm_dev *dev)
80164 @@ -188,7 +188,12 @@ static void vcc_info(struct seq_file *seq, struct atm_vcc *vcc)
80165 {
80166 struct sock *sk = sk_atm(vcc);
80167
80168 +#ifdef CONFIG_GRKERNSEC_HIDESYM
80169 + seq_printf(seq, "%p ", NULL);
80170 +#else
80171 seq_printf(seq, "%p ", vcc);
80172 +#endif
80173 +
80174 if (!vcc->dev)
80175 seq_printf(seq, "Unassigned ");
80176 else
80177 @@ -214,7 +219,11 @@ static void svc_info(struct seq_file *seq, struct atm_vcc *vcc)
80178 {
80179 if (!vcc->dev)
80180 seq_printf(seq, sizeof(void *) == 4 ?
80181 +#ifdef CONFIG_GRKERNSEC_HIDESYM
80182 + "N/A@%p%10s" : "N/A@%p%2s", NULL, "");
80183 +#else
80184 "N/A@%p%10s" : "N/A@%p%2s", vcc, "");
80185 +#endif
80186 else
80187 seq_printf(seq, "%3d %3d %5d ",
80188 vcc->dev->number, vcc->vpi, vcc->vci);
80189 diff --git a/net/atm/resources.c b/net/atm/resources.c
80190 index 56b7322..c48b84e 100644
80191 --- a/net/atm/resources.c
80192 +++ b/net/atm/resources.c
80193 @@ -161,7 +161,7 @@ void atm_dev_deregister(struct atm_dev *dev)
80194 static void copy_aal_stats(struct k_atm_aal_stats *from,
80195 struct atm_aal_stats *to)
80196 {
80197 -#define __HANDLE_ITEM(i) to->i = atomic_read(&from->i)
80198 +#define __HANDLE_ITEM(i) to->i = atomic_read_unchecked(&from->i)
80199 __AAL_STAT_ITEMS
80200 #undef __HANDLE_ITEM
80201 }
80202 @@ -170,7 +170,7 @@ static void copy_aal_stats(struct k_atm_aal_stats *from,
80203 static void subtract_aal_stats(struct k_atm_aal_stats *from,
80204 struct atm_aal_stats *to)
80205 {
80206 -#define __HANDLE_ITEM(i) atomic_sub(to->i, &from->i)
80207 +#define __HANDLE_ITEM(i) atomic_sub_unchecked(to->i, &from->i)
80208 __AAL_STAT_ITEMS
80209 #undef __HANDLE_ITEM
80210 }
80211 diff --git a/net/bridge/br_private.h b/net/bridge/br_private.h
80212 index 8567d47..bba2292 100644
80213 --- a/net/bridge/br_private.h
80214 +++ b/net/bridge/br_private.h
80215 @@ -255,7 +255,7 @@ extern void br_ifinfo_notify(int event, struct net_bridge_port *port);
80216
80217 #ifdef CONFIG_SYSFS
80218 /* br_sysfs_if.c */
80219 -extern struct sysfs_ops brport_sysfs_ops;
80220 +extern const struct sysfs_ops brport_sysfs_ops;
80221 extern int br_sysfs_addif(struct net_bridge_port *p);
80222
80223 /* br_sysfs_br.c */
80224 diff --git a/net/bridge/br_stp_if.c b/net/bridge/br_stp_if.c
80225 index 9a52ac5..c97538e 100644
80226 --- a/net/bridge/br_stp_if.c
80227 +++ b/net/bridge/br_stp_if.c
80228 @@ -146,7 +146,7 @@ static void br_stp_stop(struct net_bridge *br)
80229 char *envp[] = { NULL };
80230
80231 if (br->stp_enabled == BR_USER_STP) {
80232 - r = call_usermodehelper(BR_STP_PROG, argv, envp, 1);
80233 + r = call_usermodehelper(BR_STP_PROG, argv, envp, UMH_WAIT_PROC);
80234 printk(KERN_INFO "%s: userspace STP stopped, return code %d\n",
80235 br->dev->name, r);
80236
80237 diff --git a/net/bridge/br_sysfs_if.c b/net/bridge/br_sysfs_if.c
80238 index 820643a..ce77fb3 100644
80239 --- a/net/bridge/br_sysfs_if.c
80240 +++ b/net/bridge/br_sysfs_if.c
80241 @@ -220,7 +220,7 @@ static ssize_t brport_store(struct kobject * kobj,
80242 return ret;
80243 }
80244
80245 -struct sysfs_ops brport_sysfs_ops = {
80246 +const struct sysfs_ops brport_sysfs_ops = {
80247 .show = brport_show,
80248 .store = brport_store,
80249 };
80250 diff --git a/net/bridge/netfilter/ebtables.c b/net/bridge/netfilter/ebtables.c
80251 index d73d47f..72df42a 100644
80252 --- a/net/bridge/netfilter/ebtables.c
80253 +++ b/net/bridge/netfilter/ebtables.c
80254 @@ -1337,6 +1337,8 @@ static int copy_everything_to_user(struct ebt_table *t, void __user *user,
80255 unsigned int entries_size, nentries;
80256 char *entries;
80257
80258 + pax_track_stack();
80259 +
80260 if (cmd == EBT_SO_GET_ENTRIES) {
80261 entries_size = t->private->entries_size;
80262 nentries = t->private->nentries;
80263 diff --git a/net/can/bcm.c b/net/can/bcm.c
80264 index 2ffd2e0..72a7486 100644
80265 --- a/net/can/bcm.c
80266 +++ b/net/can/bcm.c
80267 @@ -164,9 +164,15 @@ static int bcm_proc_show(struct seq_file *m, void *v)
80268 struct bcm_sock *bo = bcm_sk(sk);
80269 struct bcm_op *op;
80270
80271 +#ifdef CONFIG_GRKERNSEC_HIDESYM
80272 + seq_printf(m, ">>> socket %p", NULL);
80273 + seq_printf(m, " / sk %p", NULL);
80274 + seq_printf(m, " / bo %p", NULL);
80275 +#else
80276 seq_printf(m, ">>> socket %p", sk->sk_socket);
80277 seq_printf(m, " / sk %p", sk);
80278 seq_printf(m, " / bo %p", bo);
80279 +#endif
80280 seq_printf(m, " / dropped %lu", bo->dropped_usr_msgs);
80281 seq_printf(m, " / bound %s", bcm_proc_getifname(ifname, bo->ifindex));
80282 seq_printf(m, " <<<\n");
80283 diff --git a/net/compat.c b/net/compat.c
80284 index 9559afc..ccd74e1 100644
80285 --- a/net/compat.c
80286 +++ b/net/compat.c
80287 @@ -69,9 +69,9 @@ int get_compat_msghdr(struct msghdr *kmsg, struct compat_msghdr __user *umsg)
80288 __get_user(kmsg->msg_controllen, &umsg->msg_controllen) ||
80289 __get_user(kmsg->msg_flags, &umsg->msg_flags))
80290 return -EFAULT;
80291 - kmsg->msg_name = compat_ptr(tmp1);
80292 - kmsg->msg_iov = compat_ptr(tmp2);
80293 - kmsg->msg_control = compat_ptr(tmp3);
80294 + kmsg->msg_name = (void __force_kernel *)compat_ptr(tmp1);
80295 + kmsg->msg_iov = (void __force_kernel *)compat_ptr(tmp2);
80296 + kmsg->msg_control = (void __force_kernel *)compat_ptr(tmp3);
80297 return 0;
80298 }
80299
80300 @@ -94,7 +94,7 @@ int verify_compat_iovec(struct msghdr *kern_msg, struct iovec *kern_iov,
80301 kern_msg->msg_name = NULL;
80302
80303 tot_len = iov_from_user_compat_to_kern(kern_iov,
80304 - (struct compat_iovec __user *)kern_msg->msg_iov,
80305 + (struct compat_iovec __force_user *)kern_msg->msg_iov,
80306 kern_msg->msg_iovlen);
80307 if (tot_len >= 0)
80308 kern_msg->msg_iov = kern_iov;
80309 @@ -114,20 +114,20 @@ int verify_compat_iovec(struct msghdr *kern_msg, struct iovec *kern_iov,
80310
80311 #define CMSG_COMPAT_FIRSTHDR(msg) \
80312 (((msg)->msg_controllen) >= sizeof(struct compat_cmsghdr) ? \
80313 - (struct compat_cmsghdr __user *)((msg)->msg_control) : \
80314 + (struct compat_cmsghdr __force_user *)((msg)->msg_control) : \
80315 (struct compat_cmsghdr __user *)NULL)
80316
80317 #define CMSG_COMPAT_OK(ucmlen, ucmsg, mhdr) \
80318 ((ucmlen) >= sizeof(struct compat_cmsghdr) && \
80319 (ucmlen) <= (unsigned long) \
80320 ((mhdr)->msg_controllen - \
80321 - ((char *)(ucmsg) - (char *)(mhdr)->msg_control)))
80322 + ((char __force_kernel *)(ucmsg) - (char *)(mhdr)->msg_control)))
80323
80324 static inline struct compat_cmsghdr __user *cmsg_compat_nxthdr(struct msghdr *msg,
80325 struct compat_cmsghdr __user *cmsg, int cmsg_len)
80326 {
80327 char __user *ptr = (char __user *)cmsg + CMSG_COMPAT_ALIGN(cmsg_len);
80328 - if ((unsigned long)(ptr + 1 - (char __user *)msg->msg_control) >
80329 + if ((unsigned long)(ptr + 1 - (char __force_user *)msg->msg_control) >
80330 msg->msg_controllen)
80331 return NULL;
80332 return (struct compat_cmsghdr __user *)ptr;
80333 @@ -219,7 +219,7 @@ int put_cmsg_compat(struct msghdr *kmsg, int level, int type, int len, void *dat
80334 {
80335 struct compat_timeval ctv;
80336 struct compat_timespec cts[3];
80337 - struct compat_cmsghdr __user *cm = (struct compat_cmsghdr __user *) kmsg->msg_control;
80338 + struct compat_cmsghdr __user *cm = (struct compat_cmsghdr __force_user *) kmsg->msg_control;
80339 struct compat_cmsghdr cmhdr;
80340 int cmlen;
80341
80342 @@ -271,7 +271,7 @@ int put_cmsg_compat(struct msghdr *kmsg, int level, int type, int len, void *dat
80343
80344 void scm_detach_fds_compat(struct msghdr *kmsg, struct scm_cookie *scm)
80345 {
80346 - struct compat_cmsghdr __user *cm = (struct compat_cmsghdr __user *) kmsg->msg_control;
80347 + struct compat_cmsghdr __user *cm = (struct compat_cmsghdr __force_user *) kmsg->msg_control;
80348 int fdmax = (kmsg->msg_controllen - sizeof(struct compat_cmsghdr)) / sizeof(int);
80349 int fdnum = scm->fp->count;
80350 struct file **fp = scm->fp->fp;
80351 @@ -433,7 +433,7 @@ static int do_get_sock_timeout(struct socket *sock, int level, int optname,
80352 len = sizeof(ktime);
80353 old_fs = get_fs();
80354 set_fs(KERNEL_DS);
80355 - err = sock_getsockopt(sock, level, optname, (char *) &ktime, &len);
80356 + err = sock_getsockopt(sock, level, optname, (char __force_user *) &ktime, (int __force_user *)&len);
80357 set_fs(old_fs);
80358
80359 if (!err) {
80360 @@ -570,7 +570,7 @@ int compat_mc_setsockopt(struct sock *sock, int level, int optname,
80361 case MCAST_JOIN_GROUP:
80362 case MCAST_LEAVE_GROUP:
80363 {
80364 - struct compat_group_req __user *gr32 = (void *)optval;
80365 + struct compat_group_req __user *gr32 = (void __user *)optval;
80366 struct group_req __user *kgr =
80367 compat_alloc_user_space(sizeof(struct group_req));
80368 u32 interface;
80369 @@ -591,7 +591,7 @@ int compat_mc_setsockopt(struct sock *sock, int level, int optname,
80370 case MCAST_BLOCK_SOURCE:
80371 case MCAST_UNBLOCK_SOURCE:
80372 {
80373 - struct compat_group_source_req __user *gsr32 = (void *)optval;
80374 + struct compat_group_source_req __user *gsr32 = (void __user *)optval;
80375 struct group_source_req __user *kgsr = compat_alloc_user_space(
80376 sizeof(struct group_source_req));
80377 u32 interface;
80378 @@ -612,7 +612,7 @@ int compat_mc_setsockopt(struct sock *sock, int level, int optname,
80379 }
80380 case MCAST_MSFILTER:
80381 {
80382 - struct compat_group_filter __user *gf32 = (void *)optval;
80383 + struct compat_group_filter __user *gf32 = (void __user *)optval;
80384 struct group_filter __user *kgf;
80385 u32 interface, fmode, numsrc;
80386
80387 diff --git a/net/core/dev.c b/net/core/dev.c
80388 index 84a0705..575db4c 100644
80389 --- a/net/core/dev.c
80390 +++ b/net/core/dev.c
80391 @@ -1047,10 +1047,14 @@ void dev_load(struct net *net, const char *name)
80392 if (no_module && capable(CAP_NET_ADMIN))
80393 no_module = request_module("netdev-%s", name);
80394 if (no_module && capable(CAP_SYS_MODULE)) {
80395 +#ifdef CONFIG_GRKERNSEC_MODHARDEN
80396 + ___request_module(true, "grsec_modharden_netdev", "%s", name);
80397 +#else
80398 if (!request_module("%s", name))
80399 pr_err("Loading kernel module for a network device "
80400 "with CAP_SYS_MODULE (deprecated). Use CAP_NET_ADMIN and alias netdev-%s "
80401 "instead\n", name);
80402 +#endif
80403 }
80404 }
80405 EXPORT_SYMBOL(dev_load);
80406 @@ -1654,7 +1658,7 @@ static inline int illegal_highdma(struct net_device *dev, struct sk_buff *skb)
80407
80408 struct dev_gso_cb {
80409 void (*destructor)(struct sk_buff *skb);
80410 -};
80411 +} __no_const;
80412
80413 #define DEV_GSO_CB(skb) ((struct dev_gso_cb *)(skb)->cb)
80414
80415 @@ -2063,7 +2067,7 @@ int netif_rx_ni(struct sk_buff *skb)
80416 }
80417 EXPORT_SYMBOL(netif_rx_ni);
80418
80419 -static void net_tx_action(struct softirq_action *h)
80420 +static void net_tx_action(void)
80421 {
80422 struct softnet_data *sd = &__get_cpu_var(softnet_data);
80423
80424 @@ -2827,7 +2831,7 @@ void netif_napi_del(struct napi_struct *napi)
80425 EXPORT_SYMBOL(netif_napi_del);
80426
80427
80428 -static void net_rx_action(struct softirq_action *h)
80429 +static void net_rx_action(void)
80430 {
80431 struct list_head *list = &__get_cpu_var(softnet_data).poll_list;
80432 unsigned long time_limit = jiffies + 2;
80433 diff --git a/net/core/flow.c b/net/core/flow.c
80434 index 9601587..8c4824e 100644
80435 --- a/net/core/flow.c
80436 +++ b/net/core/flow.c
80437 @@ -35,11 +35,11 @@ struct flow_cache_entry {
80438 atomic_t *object_ref;
80439 };
80440
80441 -atomic_t flow_cache_genid = ATOMIC_INIT(0);
80442 +atomic_unchecked_t flow_cache_genid = ATOMIC_INIT(0);
80443
80444 static u32 flow_hash_shift;
80445 #define flow_hash_size (1 << flow_hash_shift)
80446 -static DEFINE_PER_CPU(struct flow_cache_entry **, flow_tables) = { NULL };
80447 +static DEFINE_PER_CPU(struct flow_cache_entry **, flow_tables);
80448
80449 #define flow_table(cpu) (per_cpu(flow_tables, cpu))
80450
80451 @@ -52,7 +52,7 @@ struct flow_percpu_info {
80452 u32 hash_rnd;
80453 int count;
80454 };
80455 -static DEFINE_PER_CPU(struct flow_percpu_info, flow_hash_info) = { 0 };
80456 +static DEFINE_PER_CPU(struct flow_percpu_info, flow_hash_info);
80457
80458 #define flow_hash_rnd_recalc(cpu) \
80459 (per_cpu(flow_hash_info, cpu).hash_rnd_recalc)
80460 @@ -69,7 +69,7 @@ struct flow_flush_info {
80461 atomic_t cpuleft;
80462 struct completion completion;
80463 };
80464 -static DEFINE_PER_CPU(struct tasklet_struct, flow_flush_tasklets) = { NULL };
80465 +static DEFINE_PER_CPU(struct tasklet_struct, flow_flush_tasklets);
80466
80467 #define flow_flush_tasklet(cpu) (&per_cpu(flow_flush_tasklets, cpu))
80468
80469 @@ -190,7 +190,7 @@ void *flow_cache_lookup(struct net *net, struct flowi *key, u16 family, u8 dir,
80470 if (fle->family == family &&
80471 fle->dir == dir &&
80472 flow_key_compare(key, &fle->key) == 0) {
80473 - if (fle->genid == atomic_read(&flow_cache_genid)) {
80474 + if (fle->genid == atomic_read_unchecked(&flow_cache_genid)) {
80475 void *ret = fle->object;
80476
80477 if (ret)
80478 @@ -228,7 +228,7 @@ nocache:
80479 err = resolver(net, key, family, dir, &obj, &obj_ref);
80480
80481 if (fle && !err) {
80482 - fle->genid = atomic_read(&flow_cache_genid);
80483 + fle->genid = atomic_read_unchecked(&flow_cache_genid);
80484
80485 if (fle->object)
80486 atomic_dec(fle->object_ref);
80487 @@ -258,7 +258,7 @@ static void flow_cache_flush_tasklet(unsigned long data)
80488
80489 fle = flow_table(cpu)[i];
80490 for (; fle; fle = fle->next) {
80491 - unsigned genid = atomic_read(&flow_cache_genid);
80492 + unsigned genid = atomic_read_unchecked(&flow_cache_genid);
80493
80494 if (!fle->object || fle->genid == genid)
80495 continue;
80496 diff --git a/net/core/rtnetlink.c b/net/core/rtnetlink.c
80497 index d4fd895..ac9b1e6 100644
80498 --- a/net/core/rtnetlink.c
80499 +++ b/net/core/rtnetlink.c
80500 @@ -57,7 +57,7 @@ struct rtnl_link
80501 {
80502 rtnl_doit_func doit;
80503 rtnl_dumpit_func dumpit;
80504 -};
80505 +} __no_const;
80506
80507 static DEFINE_MUTEX(rtnl_mutex);
80508
80509 diff --git a/net/core/scm.c b/net/core/scm.c
80510 index d98eafc..1a190a9 100644
80511 --- a/net/core/scm.c
80512 +++ b/net/core/scm.c
80513 @@ -191,7 +191,7 @@ error:
80514 int put_cmsg(struct msghdr * msg, int level, int type, int len, void *data)
80515 {
80516 struct cmsghdr __user *cm
80517 - = (__force struct cmsghdr __user *)msg->msg_control;
80518 + = (struct cmsghdr __force_user *)msg->msg_control;
80519 struct cmsghdr cmhdr;
80520 int cmlen = CMSG_LEN(len);
80521 int err;
80522 @@ -214,7 +214,7 @@ int put_cmsg(struct msghdr * msg, int level, int type, int len, void *data)
80523 err = -EFAULT;
80524 if (copy_to_user(cm, &cmhdr, sizeof cmhdr))
80525 goto out;
80526 - if (copy_to_user(CMSG_DATA(cm), data, cmlen - sizeof(struct cmsghdr)))
80527 + if (copy_to_user((void __force_user *)CMSG_DATA((void __force_kernel *)cm), data, cmlen - sizeof(struct cmsghdr)))
80528 goto out;
80529 cmlen = CMSG_SPACE(len);
80530 if (msg->msg_controllen < cmlen)
80531 @@ -229,7 +229,7 @@ out:
80532 void scm_detach_fds(struct msghdr *msg, struct scm_cookie *scm)
80533 {
80534 struct cmsghdr __user *cm
80535 - = (__force struct cmsghdr __user*)msg->msg_control;
80536 + = (struct cmsghdr __force_user *)msg->msg_control;
80537
80538 int fdmax = 0;
80539 int fdnum = scm->fp->count;
80540 @@ -249,7 +249,7 @@ void scm_detach_fds(struct msghdr *msg, struct scm_cookie *scm)
80541 if (fdnum < fdmax)
80542 fdmax = fdnum;
80543
80544 - for (i=0, cmfptr=(__force int __user *)CMSG_DATA(cm); i<fdmax;
80545 + for (i=0, cmfptr=(int __force_user *)CMSG_DATA((void __force_kernel *)cm); i<fdmax;
80546 i++, cmfptr++)
80547 {
80548 int new_fd;
80549 diff --git a/net/core/secure_seq.c b/net/core/secure_seq.c
80550 index 45329d7..626aaa6 100644
80551 --- a/net/core/secure_seq.c
80552 +++ b/net/core/secure_seq.c
80553 @@ -57,7 +57,7 @@ __u32 secure_tcpv6_sequence_number(__be32 *saddr, __be32 *daddr,
80554 EXPORT_SYMBOL(secure_tcpv6_sequence_number);
80555
80556 u32 secure_ipv6_port_ephemeral(const __be32 *saddr, const __be32 *daddr,
80557 - __be16 dport)
80558 + __be16 dport)
80559 {
80560 u32 secret[MD5_MESSAGE_BYTES / 4];
80561 u32 hash[MD5_DIGEST_WORDS];
80562 @@ -71,7 +71,6 @@ u32 secure_ipv6_port_ephemeral(const __be32 *saddr, const __be32 *daddr,
80563 secret[i] = net_secret[i];
80564
80565 md5_transform(hash, secret);
80566 -
80567 return hash[0];
80568 }
80569 #endif
80570 diff --git a/net/core/skbuff.c b/net/core/skbuff.c
80571 index a807f8c..65f906f 100644
80572 --- a/net/core/skbuff.c
80573 +++ b/net/core/skbuff.c
80574 @@ -1544,6 +1544,8 @@ int skb_splice_bits(struct sk_buff *skb, unsigned int offset,
80575 struct sk_buff *frag_iter;
80576 struct sock *sk = skb->sk;
80577
80578 + pax_track_stack();
80579 +
80580 /*
80581 * __skb_splice_bits() only fails if the output has no room left,
80582 * so no point in going over the frag_list for the error case.
80583 diff --git a/net/core/sock.c b/net/core/sock.c
80584 index 6605e75..3acebda 100644
80585 --- a/net/core/sock.c
80586 +++ b/net/core/sock.c
80587 @@ -864,11 +864,15 @@ int sock_getsockopt(struct socket *sock, int level, int optname,
80588 break;
80589
80590 case SO_PEERCRED:
80591 + {
80592 + struct ucred peercred;
80593 if (len > sizeof(sk->sk_peercred))
80594 len = sizeof(sk->sk_peercred);
80595 - if (copy_to_user(optval, &sk->sk_peercred, len))
80596 + peercred = sk->sk_peercred;
80597 + if (copy_to_user(optval, &peercred, len))
80598 return -EFAULT;
80599 goto lenout;
80600 + }
80601
80602 case SO_PEERNAME:
80603 {
80604 @@ -1892,7 +1896,7 @@ void sock_init_data(struct socket *sock, struct sock *sk)
80605 */
80606 smp_wmb();
80607 atomic_set(&sk->sk_refcnt, 1);
80608 - atomic_set(&sk->sk_drops, 0);
80609 + atomic_set_unchecked(&sk->sk_drops, 0);
80610 }
80611 EXPORT_SYMBOL(sock_init_data);
80612
80613 diff --git a/net/decnet/sysctl_net_decnet.c b/net/decnet/sysctl_net_decnet.c
80614 index 2036568..c55883d 100644
80615 --- a/net/decnet/sysctl_net_decnet.c
80616 +++ b/net/decnet/sysctl_net_decnet.c
80617 @@ -206,7 +206,7 @@ static int dn_node_address_handler(ctl_table *table, int write,
80618
80619 if (len > *lenp) len = *lenp;
80620
80621 - if (copy_to_user(buffer, addr, len))
80622 + if (len > sizeof addr || copy_to_user(buffer, addr, len))
80623 return -EFAULT;
80624
80625 *lenp = len;
80626 @@ -327,7 +327,7 @@ static int dn_def_dev_handler(ctl_table *table, int write,
80627
80628 if (len > *lenp) len = *lenp;
80629
80630 - if (copy_to_user(buffer, devname, len))
80631 + if (len > sizeof devname || copy_to_user(buffer, devname, len))
80632 return -EFAULT;
80633
80634 *lenp = len;
80635 diff --git a/net/econet/Kconfig b/net/econet/Kconfig
80636 index 39a2d29..f39c0fe 100644
80637 --- a/net/econet/Kconfig
80638 +++ b/net/econet/Kconfig
80639 @@ -4,7 +4,7 @@
80640
80641 config ECONET
80642 tristate "Acorn Econet/AUN protocols (EXPERIMENTAL)"
80643 - depends on EXPERIMENTAL && INET
80644 + depends on EXPERIMENTAL && INET && BROKEN
80645 ---help---
80646 Econet is a fairly old and slow networking protocol mainly used by
80647 Acorn computers to access file and print servers. It uses native
80648 diff --git a/net/ieee802154/dgram.c b/net/ieee802154/dgram.c
80649 index a413b1b..380849c 100644
80650 --- a/net/ieee802154/dgram.c
80651 +++ b/net/ieee802154/dgram.c
80652 @@ -318,7 +318,7 @@ out:
80653 static int dgram_rcv_skb(struct sock *sk, struct sk_buff *skb)
80654 {
80655 if (sock_queue_rcv_skb(sk, skb) < 0) {
80656 - atomic_inc(&sk->sk_drops);
80657 + atomic_inc_unchecked(&sk->sk_drops);
80658 kfree_skb(skb);
80659 return NET_RX_DROP;
80660 }
80661 diff --git a/net/ieee802154/raw.c b/net/ieee802154/raw.c
80662 index 30e74ee..bfc6ee0 100644
80663 --- a/net/ieee802154/raw.c
80664 +++ b/net/ieee802154/raw.c
80665 @@ -206,7 +206,7 @@ out:
80666 static int raw_rcv_skb(struct sock *sk, struct sk_buff *skb)
80667 {
80668 if (sock_queue_rcv_skb(sk, skb) < 0) {
80669 - atomic_inc(&sk->sk_drops);
80670 + atomic_inc_unchecked(&sk->sk_drops);
80671 kfree_skb(skb);
80672 return NET_RX_DROP;
80673 }
80674 diff --git a/net/ipv4/inet_diag.c b/net/ipv4/inet_diag.c
80675 index dba56d2..acee5d6 100644
80676 --- a/net/ipv4/inet_diag.c
80677 +++ b/net/ipv4/inet_diag.c
80678 @@ -113,8 +113,13 @@ static int inet_csk_diag_fill(struct sock *sk,
80679 r->idiag_retrans = 0;
80680
80681 r->id.idiag_if = sk->sk_bound_dev_if;
80682 +#ifdef CONFIG_GRKERNSEC_HIDESYM
80683 + r->id.idiag_cookie[0] = 0;
80684 + r->id.idiag_cookie[1] = 0;
80685 +#else
80686 r->id.idiag_cookie[0] = (u32)(unsigned long)sk;
80687 r->id.idiag_cookie[1] = (u32)(((unsigned long)sk >> 31) >> 1);
80688 +#endif
80689
80690 r->id.idiag_sport = inet->sport;
80691 r->id.idiag_dport = inet->dport;
80692 @@ -200,8 +205,15 @@ static int inet_twsk_diag_fill(struct inet_timewait_sock *tw,
80693 r->idiag_family = tw->tw_family;
80694 r->idiag_retrans = 0;
80695 r->id.idiag_if = tw->tw_bound_dev_if;
80696 +
80697 +#ifdef CONFIG_GRKERNSEC_HIDESYM
80698 + r->id.idiag_cookie[0] = 0;
80699 + r->id.idiag_cookie[1] = 0;
80700 +#else
80701 r->id.idiag_cookie[0] = (u32)(unsigned long)tw;
80702 r->id.idiag_cookie[1] = (u32)(((unsigned long)tw >> 31) >> 1);
80703 +#endif
80704 +
80705 r->id.idiag_sport = tw->tw_sport;
80706 r->id.idiag_dport = tw->tw_dport;
80707 r->id.idiag_src[0] = tw->tw_rcv_saddr;
80708 @@ -284,12 +296,14 @@ static int inet_diag_get_exact(struct sk_buff *in_skb,
80709 if (sk == NULL)
80710 goto unlock;
80711
80712 +#ifndef CONFIG_GRKERNSEC_HIDESYM
80713 err = -ESTALE;
80714 if ((req->id.idiag_cookie[0] != INET_DIAG_NOCOOKIE ||
80715 req->id.idiag_cookie[1] != INET_DIAG_NOCOOKIE) &&
80716 ((u32)(unsigned long)sk != req->id.idiag_cookie[0] ||
80717 (u32)((((unsigned long)sk) >> 31) >> 1) != req->id.idiag_cookie[1]))
80718 goto out;
80719 +#endif
80720
80721 err = -ENOMEM;
80722 rep = alloc_skb(NLMSG_SPACE((sizeof(struct inet_diag_msg) +
80723 @@ -579,8 +593,14 @@ static int inet_diag_fill_req(struct sk_buff *skb, struct sock *sk,
80724 r->idiag_retrans = req->retrans;
80725
80726 r->id.idiag_if = sk->sk_bound_dev_if;
80727 +
80728 +#ifdef CONFIG_GRKERNSEC_HIDESYM
80729 + r->id.idiag_cookie[0] = 0;
80730 + r->id.idiag_cookie[1] = 0;
80731 +#else
80732 r->id.idiag_cookie[0] = (u32)(unsigned long)req;
80733 r->id.idiag_cookie[1] = (u32)(((unsigned long)req >> 31) >> 1);
80734 +#endif
80735
80736 tmo = req->expires - jiffies;
80737 if (tmo < 0)
80738 diff --git a/net/ipv4/inet_hashtables.c b/net/ipv4/inet_hashtables.c
80739 index d717267..56de7e7 100644
80740 --- a/net/ipv4/inet_hashtables.c
80741 +++ b/net/ipv4/inet_hashtables.c
80742 @@ -18,12 +18,15 @@
80743 #include <linux/sched.h>
80744 #include <linux/slab.h>
80745 #include <linux/wait.h>
80746 +#include <linux/security.h>
80747
80748 #include <net/inet_connection_sock.h>
80749 #include <net/inet_hashtables.h>
80750 #include <net/secure_seq.h>
80751 #include <net/ip.h>
80752
80753 +extern void gr_update_task_in_ip_table(struct task_struct *task, const struct inet_sock *inet);
80754 +
80755 /*
80756 * Allocate and initialize a new local port bind bucket.
80757 * The bindhash mutex for snum's hash chain must be held here.
80758 @@ -491,6 +494,8 @@ ok:
80759 }
80760 spin_unlock(&head->lock);
80761
80762 + gr_update_task_in_ip_table(current, inet_sk(sk));
80763 +
80764 if (tw) {
80765 inet_twsk_deschedule(tw, death_row);
80766 inet_twsk_put(tw);
80767 diff --git a/net/ipv4/inetpeer.c b/net/ipv4/inetpeer.c
80768 index 13b229f..6956484 100644
80769 --- a/net/ipv4/inetpeer.c
80770 +++ b/net/ipv4/inetpeer.c
80771 @@ -367,6 +367,8 @@ struct inet_peer *inet_getpeer(__be32 daddr, int create)
80772 struct inet_peer *p, *n;
80773 struct inet_peer **stack[PEER_MAXDEPTH], ***stackptr;
80774
80775 + pax_track_stack();
80776 +
80777 /* Look up for the address quickly. */
80778 read_lock_bh(&peer_pool_lock);
80779 p = lookup(daddr, NULL);
80780 @@ -390,7 +392,7 @@ struct inet_peer *inet_getpeer(__be32 daddr, int create)
80781 return NULL;
80782 n->v4daddr = daddr;
80783 atomic_set(&n->refcnt, 1);
80784 - atomic_set(&n->rid, 0);
80785 + atomic_set_unchecked(&n->rid, 0);
80786 n->ip_id_count = secure_ip_id(daddr);
80787 n->tcp_ts_stamp = 0;
80788
80789 diff --git a/net/ipv4/ip_fragment.c b/net/ipv4/ip_fragment.c
80790 index d3fe10b..feeafc9 100644
80791 --- a/net/ipv4/ip_fragment.c
80792 +++ b/net/ipv4/ip_fragment.c
80793 @@ -255,7 +255,7 @@ static inline int ip_frag_too_far(struct ipq *qp)
80794 return 0;
80795
80796 start = qp->rid;
80797 - end = atomic_inc_return(&peer->rid);
80798 + end = atomic_inc_return_unchecked(&peer->rid);
80799 qp->rid = end;
80800
80801 rc = qp->q.fragments && (end - start) > max;
80802 diff --git a/net/ipv4/ip_sockglue.c b/net/ipv4/ip_sockglue.c
80803 index e982b5c..f079d75 100644
80804 --- a/net/ipv4/ip_sockglue.c
80805 +++ b/net/ipv4/ip_sockglue.c
80806 @@ -1015,6 +1015,8 @@ static int do_ip_getsockopt(struct sock *sk, int level, int optname,
80807 int val;
80808 int len;
80809
80810 + pax_track_stack();
80811 +
80812 if (level != SOL_IP)
80813 return -EOPNOTSUPP;
80814
80815 @@ -1173,7 +1175,7 @@ static int do_ip_getsockopt(struct sock *sk, int level, int optname,
80816 if (sk->sk_type != SOCK_STREAM)
80817 return -ENOPROTOOPT;
80818
80819 - msg.msg_control = optval;
80820 + msg.msg_control = (void __force_kernel *)optval;
80821 msg.msg_controllen = len;
80822 msg.msg_flags = 0;
80823
80824 diff --git a/net/ipv4/ipconfig.c b/net/ipv4/ipconfig.c
80825 index f8d04c2..c1188f2 100644
80826 --- a/net/ipv4/ipconfig.c
80827 +++ b/net/ipv4/ipconfig.c
80828 @@ -295,7 +295,7 @@ static int __init ic_devinet_ioctl(unsigned int cmd, struct ifreq *arg)
80829
80830 mm_segment_t oldfs = get_fs();
80831 set_fs(get_ds());
80832 - res = devinet_ioctl(&init_net, cmd, (struct ifreq __user *) arg);
80833 + res = devinet_ioctl(&init_net, cmd, (struct ifreq __force_user *) arg);
80834 set_fs(oldfs);
80835 return res;
80836 }
80837 @@ -306,7 +306,7 @@ static int __init ic_dev_ioctl(unsigned int cmd, struct ifreq *arg)
80838
80839 mm_segment_t oldfs = get_fs();
80840 set_fs(get_ds());
80841 - res = dev_ioctl(&init_net, cmd, (struct ifreq __user *) arg);
80842 + res = dev_ioctl(&init_net, cmd, (struct ifreq __force_user *) arg);
80843 set_fs(oldfs);
80844 return res;
80845 }
80846 @@ -317,7 +317,7 @@ static int __init ic_route_ioctl(unsigned int cmd, struct rtentry *arg)
80847
80848 mm_segment_t oldfs = get_fs();
80849 set_fs(get_ds());
80850 - res = ip_rt_ioctl(&init_net, cmd, (void __user *) arg);
80851 + res = ip_rt_ioctl(&init_net, cmd, (void __force_user *) arg);
80852 set_fs(oldfs);
80853 return res;
80854 }
80855 diff --git a/net/ipv4/netfilter/arp_tables.c b/net/ipv4/netfilter/arp_tables.c
80856 index c8b0cc3..4da5ae2 100644
80857 --- a/net/ipv4/netfilter/arp_tables.c
80858 +++ b/net/ipv4/netfilter/arp_tables.c
80859 @@ -934,6 +934,7 @@ static int get_info(struct net *net, void __user *user, int *len, int compat)
80860 private = &tmp;
80861 }
80862 #endif
80863 + memset(&info, 0, sizeof(info));
80864 info.valid_hooks = t->valid_hooks;
80865 memcpy(info.hook_entry, private->hook_entry,
80866 sizeof(info.hook_entry));
80867 diff --git a/net/ipv4/netfilter/ip_queue.c b/net/ipv4/netfilter/ip_queue.c
80868 index c156db2..e772975 100644
80869 --- a/net/ipv4/netfilter/ip_queue.c
80870 +++ b/net/ipv4/netfilter/ip_queue.c
80871 @@ -286,6 +286,9 @@ ipq_mangle_ipv4(ipq_verdict_msg_t *v, struct nf_queue_entry *e)
80872
80873 if (v->data_len < sizeof(*user_iph))
80874 return 0;
80875 + if (v->data_len > 65535)
80876 + return -EMSGSIZE;
80877 +
80878 diff = v->data_len - e->skb->len;
80879 if (diff < 0) {
80880 if (pskb_trim(e->skb, v->data_len))
80881 @@ -409,7 +412,8 @@ ipq_dev_drop(int ifindex)
80882 static inline void
80883 __ipq_rcv_skb(struct sk_buff *skb)
80884 {
80885 - int status, type, pid, flags, nlmsglen, skblen;
80886 + int status, type, pid, flags;
80887 + unsigned int nlmsglen, skblen;
80888 struct nlmsghdr *nlh;
80889
80890 skblen = skb->len;
80891 diff --git a/net/ipv4/netfilter/ip_tables.c b/net/ipv4/netfilter/ip_tables.c
80892 index 0606db1..02e7e4c 100644
80893 --- a/net/ipv4/netfilter/ip_tables.c
80894 +++ b/net/ipv4/netfilter/ip_tables.c
80895 @@ -1141,6 +1141,7 @@ static int get_info(struct net *net, void __user *user, int *len, int compat)
80896 private = &tmp;
80897 }
80898 #endif
80899 + memset(&info, 0, sizeof(info));
80900 info.valid_hooks = t->valid_hooks;
80901 memcpy(info.hook_entry, private->hook_entry,
80902 sizeof(info.hook_entry));
80903 diff --git a/net/ipv4/netfilter/nf_nat_snmp_basic.c b/net/ipv4/netfilter/nf_nat_snmp_basic.c
80904 index d9521f6..3c3eb25 100644
80905 --- a/net/ipv4/netfilter/nf_nat_snmp_basic.c
80906 +++ b/net/ipv4/netfilter/nf_nat_snmp_basic.c
80907 @@ -397,7 +397,7 @@ static unsigned char asn1_octets_decode(struct asn1_ctx *ctx,
80908
80909 *len = 0;
80910
80911 - *octets = kmalloc(eoc - ctx->pointer, GFP_ATOMIC);
80912 + *octets = kmalloc((eoc - ctx->pointer), GFP_ATOMIC);
80913 if (*octets == NULL) {
80914 if (net_ratelimit())
80915 printk("OOM in bsalg (%d)\n", __LINE__);
80916 diff --git a/net/ipv4/raw.c b/net/ipv4/raw.c
80917 index ab996f9..3da5f96 100644
80918 --- a/net/ipv4/raw.c
80919 +++ b/net/ipv4/raw.c
80920 @@ -292,7 +292,7 @@ static int raw_rcv_skb(struct sock * sk, struct sk_buff * skb)
80921 /* Charge it to the socket. */
80922
80923 if (sock_queue_rcv_skb(sk, skb) < 0) {
80924 - atomic_inc(&sk->sk_drops);
80925 + atomic_inc_unchecked(&sk->sk_drops);
80926 kfree_skb(skb);
80927 return NET_RX_DROP;
80928 }
80929 @@ -303,7 +303,7 @@ static int raw_rcv_skb(struct sock * sk, struct sk_buff * skb)
80930 int raw_rcv(struct sock *sk, struct sk_buff *skb)
80931 {
80932 if (!xfrm4_policy_check(sk, XFRM_POLICY_IN, skb)) {
80933 - atomic_inc(&sk->sk_drops);
80934 + atomic_inc_unchecked(&sk->sk_drops);
80935 kfree_skb(skb);
80936 return NET_RX_DROP;
80937 }
80938 @@ -724,16 +724,23 @@ static int raw_init(struct sock *sk)
80939
80940 static int raw_seticmpfilter(struct sock *sk, char __user *optval, int optlen)
80941 {
80942 + struct icmp_filter filter;
80943 +
80944 + if (optlen < 0)
80945 + return -EINVAL;
80946 if (optlen > sizeof(struct icmp_filter))
80947 optlen = sizeof(struct icmp_filter);
80948 - if (copy_from_user(&raw_sk(sk)->filter, optval, optlen))
80949 + if (copy_from_user(&filter, optval, optlen))
80950 return -EFAULT;
80951 + raw_sk(sk)->filter = filter;
80952 +
80953 return 0;
80954 }
80955
80956 static int raw_geticmpfilter(struct sock *sk, char __user *optval, int __user *optlen)
80957 {
80958 int len, ret = -EFAULT;
80959 + struct icmp_filter filter;
80960
80961 if (get_user(len, optlen))
80962 goto out;
80963 @@ -743,8 +750,9 @@ static int raw_geticmpfilter(struct sock *sk, char __user *optval, int __user *o
80964 if (len > sizeof(struct icmp_filter))
80965 len = sizeof(struct icmp_filter);
80966 ret = -EFAULT;
80967 - if (put_user(len, optlen) ||
80968 - copy_to_user(optval, &raw_sk(sk)->filter, len))
80969 + filter = raw_sk(sk)->filter;
80970 + if (put_user(len, optlen) || len > sizeof filter ||
80971 + copy_to_user(optval, &filter, len))
80972 goto out;
80973 ret = 0;
80974 out: return ret;
80975 @@ -954,7 +962,13 @@ static void raw_sock_seq_show(struct seq_file *seq, struct sock *sp, int i)
80976 sk_wmem_alloc_get(sp),
80977 sk_rmem_alloc_get(sp),
80978 0, 0L, 0, sock_i_uid(sp), 0, sock_i_ino(sp),
80979 - atomic_read(&sp->sk_refcnt), sp, atomic_read(&sp->sk_drops));
80980 + atomic_read(&sp->sk_refcnt),
80981 +#ifdef CONFIG_GRKERNSEC_HIDESYM
80982 + NULL,
80983 +#else
80984 + sp,
80985 +#endif
80986 + atomic_read_unchecked(&sp->sk_drops));
80987 }
80988
80989 static int raw_seq_show(struct seq_file *seq, void *v)
80990 diff --git a/net/ipv4/route.c b/net/ipv4/route.c
80991 index 58f141b..b759702 100644
80992 --- a/net/ipv4/route.c
80993 +++ b/net/ipv4/route.c
80994 @@ -269,7 +269,7 @@ static inline unsigned int rt_hash(__be32 daddr, __be32 saddr, int idx,
80995
80996 static inline int rt_genid(struct net *net)
80997 {
80998 - return atomic_read(&net->ipv4.rt_genid);
80999 + return atomic_read_unchecked(&net->ipv4.rt_genid);
81000 }
81001
81002 #ifdef CONFIG_PROC_FS
81003 @@ -889,7 +889,7 @@ static void rt_cache_invalidate(struct net *net)
81004 unsigned char shuffle;
81005
81006 get_random_bytes(&shuffle, sizeof(shuffle));
81007 - atomic_add(shuffle + 1U, &net->ipv4.rt_genid);
81008 + atomic_add_unchecked(shuffle + 1U, &net->ipv4.rt_genid);
81009 }
81010
81011 /*
81012 @@ -3357,7 +3357,7 @@ static __net_initdata struct pernet_operations sysctl_route_ops = {
81013
81014 static __net_init int rt_secret_timer_init(struct net *net)
81015 {
81016 - atomic_set(&net->ipv4.rt_genid,
81017 + atomic_set_unchecked(&net->ipv4.rt_genid,
81018 (int) ((num_physpages ^ (num_physpages>>8)) ^
81019 (jiffies ^ (jiffies >> 7))));
81020
81021 diff --git a/net/ipv4/tcp.c b/net/ipv4/tcp.c
81022 index f095659..adc892a 100644
81023 --- a/net/ipv4/tcp.c
81024 +++ b/net/ipv4/tcp.c
81025 @@ -2085,6 +2085,8 @@ static int do_tcp_setsockopt(struct sock *sk, int level,
81026 int val;
81027 int err = 0;
81028
81029 + pax_track_stack();
81030 +
81031 /* This is a string value all the others are int's */
81032 if (optname == TCP_CONGESTION) {
81033 char name[TCP_CA_NAME_MAX];
81034 @@ -2355,6 +2357,8 @@ static int do_tcp_getsockopt(struct sock *sk, int level,
81035 struct tcp_sock *tp = tcp_sk(sk);
81036 int val, len;
81037
81038 + pax_track_stack();
81039 +
81040 if (get_user(len, optlen))
81041 return -EFAULT;
81042
81043 diff --git a/net/ipv4/tcp_ipv4.c b/net/ipv4/tcp_ipv4.c
81044 index 6fc7961..33bad4a 100644
81045 --- a/net/ipv4/tcp_ipv4.c
81046 +++ b/net/ipv4/tcp_ipv4.c
81047 @@ -85,6 +85,9 @@
81048 int sysctl_tcp_tw_reuse __read_mostly;
81049 int sysctl_tcp_low_latency __read_mostly;
81050
81051 +#ifdef CONFIG_GRKERNSEC_BLACKHOLE
81052 +extern int grsec_enable_blackhole;
81053 +#endif
81054
81055 #ifdef CONFIG_TCP_MD5SIG
81056 static struct tcp_md5sig_key *tcp_v4_md5_do_lookup(struct sock *sk,
81057 @@ -1543,6 +1546,9 @@ int tcp_v4_do_rcv(struct sock *sk, struct sk_buff *skb)
81058 return 0;
81059
81060 reset:
81061 +#ifdef CONFIG_GRKERNSEC_BLACKHOLE
81062 + if (!grsec_enable_blackhole)
81063 +#endif
81064 tcp_v4_send_reset(rsk, skb);
81065 discard:
81066 kfree_skb(skb);
81067 @@ -1604,12 +1610,20 @@ int tcp_v4_rcv(struct sk_buff *skb)
81068 TCP_SKB_CB(skb)->sacked = 0;
81069
81070 sk = __inet_lookup_skb(&tcp_hashinfo, skb, th->source, th->dest);
81071 - if (!sk)
81072 + if (!sk) {
81073 +#ifdef CONFIG_GRKERNSEC_BLACKHOLE
81074 + ret = 1;
81075 +#endif
81076 goto no_tcp_socket;
81077 + }
81078
81079 process:
81080 - if (sk->sk_state == TCP_TIME_WAIT)
81081 + if (sk->sk_state == TCP_TIME_WAIT) {
81082 +#ifdef CONFIG_GRKERNSEC_BLACKHOLE
81083 + ret = 2;
81084 +#endif
81085 goto do_time_wait;
81086 + }
81087
81088 if (!xfrm4_policy_check(sk, XFRM_POLICY_IN, skb))
81089 goto discard_and_relse;
81090 @@ -1651,6 +1665,10 @@ no_tcp_socket:
81091 bad_packet:
81092 TCP_INC_STATS_BH(net, TCP_MIB_INERRS);
81093 } else {
81094 +#ifdef CONFIG_GRKERNSEC_BLACKHOLE
81095 + if (!grsec_enable_blackhole || (ret == 1 &&
81096 + (skb->dev->flags & IFF_LOOPBACK)))
81097 +#endif
81098 tcp_v4_send_reset(NULL, skb);
81099 }
81100
81101 @@ -2238,7 +2256,11 @@ static void get_openreq4(struct sock *sk, struct request_sock *req,
81102 0, /* non standard timer */
81103 0, /* open_requests have no inode */
81104 atomic_read(&sk->sk_refcnt),
81105 +#ifdef CONFIG_GRKERNSEC_HIDESYM
81106 + NULL,
81107 +#else
81108 req,
81109 +#endif
81110 len);
81111 }
81112
81113 @@ -2280,7 +2302,12 @@ static void get_tcp4_sock(struct sock *sk, struct seq_file *f, int i, int *len)
81114 sock_i_uid(sk),
81115 icsk->icsk_probes_out,
81116 sock_i_ino(sk),
81117 - atomic_read(&sk->sk_refcnt), sk,
81118 + atomic_read(&sk->sk_refcnt),
81119 +#ifdef CONFIG_GRKERNSEC_HIDESYM
81120 + NULL,
81121 +#else
81122 + sk,
81123 +#endif
81124 jiffies_to_clock_t(icsk->icsk_rto),
81125 jiffies_to_clock_t(icsk->icsk_ack.ato),
81126 (icsk->icsk_ack.quick << 1) | icsk->icsk_ack.pingpong,
81127 @@ -2308,7 +2335,13 @@ static void get_timewait4_sock(struct inet_timewait_sock *tw,
81128 " %02X %08X:%08X %02X:%08lX %08X %5d %8d %d %d %p%n",
81129 i, src, srcp, dest, destp, tw->tw_substate, 0, 0,
81130 3, jiffies_to_clock_t(ttd), 0, 0, 0, 0,
81131 - atomic_read(&tw->tw_refcnt), tw, len);
81132 + atomic_read(&tw->tw_refcnt),
81133 +#ifdef CONFIG_GRKERNSEC_HIDESYM
81134 + NULL,
81135 +#else
81136 + tw,
81137 +#endif
81138 + len);
81139 }
81140
81141 #define TMPSZ 150
81142 diff --git a/net/ipv4/tcp_minisocks.c b/net/ipv4/tcp_minisocks.c
81143 index 4c03598..e09a8e8 100644
81144 --- a/net/ipv4/tcp_minisocks.c
81145 +++ b/net/ipv4/tcp_minisocks.c
81146 @@ -26,6 +26,10 @@
81147 #include <net/inet_common.h>
81148 #include <net/xfrm.h>
81149
81150 +#ifdef CONFIG_GRKERNSEC_BLACKHOLE
81151 +extern int grsec_enable_blackhole;
81152 +#endif
81153 +
81154 #ifdef CONFIG_SYSCTL
81155 #define SYNC_INIT 0 /* let the user enable it */
81156 #else
81157 @@ -672,6 +676,10 @@ listen_overflow:
81158
81159 embryonic_reset:
81160 NET_INC_STATS_BH(sock_net(sk), LINUX_MIB_EMBRYONICRSTS);
81161 +
81162 +#ifdef CONFIG_GRKERNSEC_BLACKHOLE
81163 + if (!grsec_enable_blackhole)
81164 +#endif
81165 if (!(flg & TCP_FLAG_RST))
81166 req->rsk_ops->send_reset(sk, skb);
81167
81168 diff --git a/net/ipv4/tcp_output.c b/net/ipv4/tcp_output.c
81169 index af83bdf..ec91cb2 100644
81170 --- a/net/ipv4/tcp_output.c
81171 +++ b/net/ipv4/tcp_output.c
81172 @@ -2234,6 +2234,8 @@ struct sk_buff *tcp_make_synack(struct sock *sk, struct dst_entry *dst,
81173 __u8 *md5_hash_location;
81174 int mss;
81175
81176 + pax_track_stack();
81177 +
81178 skb = sock_wmalloc(sk, MAX_TCP_HEADER + 15, 1, GFP_ATOMIC);
81179 if (skb == NULL)
81180 return NULL;
81181 diff --git a/net/ipv4/tcp_probe.c b/net/ipv4/tcp_probe.c
81182 index 59f5b5e..193860f 100644
81183 --- a/net/ipv4/tcp_probe.c
81184 +++ b/net/ipv4/tcp_probe.c
81185 @@ -200,7 +200,7 @@ static ssize_t tcpprobe_read(struct file *file, char __user *buf,
81186 if (cnt + width >= len)
81187 break;
81188
81189 - if (copy_to_user(buf + cnt, tbuf, width))
81190 + if (width > sizeof tbuf || copy_to_user(buf + cnt, tbuf, width))
81191 return -EFAULT;
81192 cnt += width;
81193 }
81194 diff --git a/net/ipv4/tcp_timer.c b/net/ipv4/tcp_timer.c
81195 index 57d5501..a9ed13a 100644
81196 --- a/net/ipv4/tcp_timer.c
81197 +++ b/net/ipv4/tcp_timer.c
81198 @@ -21,6 +21,10 @@
81199 #include <linux/module.h>
81200 #include <net/tcp.h>
81201
81202 +#ifdef CONFIG_GRKERNSEC_BLACKHOLE
81203 +extern int grsec_lastack_retries;
81204 +#endif
81205 +
81206 int sysctl_tcp_syn_retries __read_mostly = TCP_SYN_RETRIES;
81207 int sysctl_tcp_synack_retries __read_mostly = TCP_SYNACK_RETRIES;
81208 int sysctl_tcp_keepalive_time __read_mostly = TCP_KEEPALIVE_TIME;
81209 @@ -164,6 +168,13 @@ static int tcp_write_timeout(struct sock *sk)
81210 }
81211 }
81212
81213 +#ifdef CONFIG_GRKERNSEC_BLACKHOLE
81214 + if ((sk->sk_state == TCP_LAST_ACK) &&
81215 + (grsec_lastack_retries > 0) &&
81216 + (grsec_lastack_retries < retry_until))
81217 + retry_until = grsec_lastack_retries;
81218 +#endif
81219 +
81220 if (retransmits_timed_out(sk, retry_until)) {
81221 /* Has it gone just too far? */
81222 tcp_write_err(sk);
81223 diff --git a/net/ipv4/udp.c b/net/ipv4/udp.c
81224 index 0ac8833..58d8c43 100644
81225 --- a/net/ipv4/udp.c
81226 +++ b/net/ipv4/udp.c
81227 @@ -86,6 +86,7 @@
81228 #include <linux/types.h>
81229 #include <linux/fcntl.h>
81230 #include <linux/module.h>
81231 +#include <linux/security.h>
81232 #include <linux/socket.h>
81233 #include <linux/sockios.h>
81234 #include <linux/igmp.h>
81235 @@ -106,6 +107,10 @@
81236 #include <net/xfrm.h>
81237 #include "udp_impl.h"
81238
81239 +#ifdef CONFIG_GRKERNSEC_BLACKHOLE
81240 +extern int grsec_enable_blackhole;
81241 +#endif
81242 +
81243 struct udp_table udp_table;
81244 EXPORT_SYMBOL(udp_table);
81245
81246 @@ -371,6 +376,9 @@ found:
81247 return s;
81248 }
81249
81250 +extern int gr_search_udp_recvmsg(struct sock *sk, const struct sk_buff *skb);
81251 +extern int gr_search_udp_sendmsg(struct sock *sk, struct sockaddr_in *addr);
81252 +
81253 /*
81254 * This routine is called by the ICMP module when it gets some
81255 * sort of error condition. If err < 0 then the socket should
81256 @@ -639,9 +647,18 @@ int udp_sendmsg(struct kiocb *iocb, struct sock *sk, struct msghdr *msg,
81257 dport = usin->sin_port;
81258 if (dport == 0)
81259 return -EINVAL;
81260 +
81261 + err = gr_search_udp_sendmsg(sk, usin);
81262 + if (err)
81263 + return err;
81264 } else {
81265 if (sk->sk_state != TCP_ESTABLISHED)
81266 return -EDESTADDRREQ;
81267 +
81268 + err = gr_search_udp_sendmsg(sk, NULL);
81269 + if (err)
81270 + return err;
81271 +
81272 daddr = inet->daddr;
81273 dport = inet->dport;
81274 /* Open fast path for connected socket.
81275 @@ -945,6 +962,10 @@ try_again:
81276 if (!skb)
81277 goto out;
81278
81279 + err = gr_search_udp_recvmsg(sk, skb);
81280 + if (err)
81281 + goto out_free;
81282 +
81283 ulen = skb->len - sizeof(struct udphdr);
81284 copied = len;
81285 if (copied > ulen)
81286 @@ -1068,7 +1089,7 @@ static int __udp_queue_rcv_skb(struct sock *sk, struct sk_buff *skb)
81287 if (rc == -ENOMEM) {
81288 UDP_INC_STATS_BH(sock_net(sk), UDP_MIB_RCVBUFERRORS,
81289 is_udplite);
81290 - atomic_inc(&sk->sk_drops);
81291 + atomic_inc_unchecked(&sk->sk_drops);
81292 }
81293 goto drop;
81294 }
81295 @@ -1338,6 +1359,9 @@ int __udp4_lib_rcv(struct sk_buff *skb, struct udp_table *udptable,
81296 goto csum_error;
81297
81298 UDP_INC_STATS_BH(net, UDP_MIB_NOPORTS, proto == IPPROTO_UDPLITE);
81299 +#ifdef CONFIG_GRKERNSEC_BLACKHOLE
81300 + if (!grsec_enable_blackhole || (skb->dev->flags & IFF_LOOPBACK))
81301 +#endif
81302 icmp_send(skb, ICMP_DEST_UNREACH, ICMP_PORT_UNREACH, 0);
81303
81304 /*
81305 @@ -1758,8 +1782,13 @@ static void udp4_format_sock(struct sock *sp, struct seq_file *f,
81306 sk_wmem_alloc_get(sp),
81307 sk_rmem_alloc_get(sp),
81308 0, 0L, 0, sock_i_uid(sp), 0, sock_i_ino(sp),
81309 - atomic_read(&sp->sk_refcnt), sp,
81310 - atomic_read(&sp->sk_drops), len);
81311 + atomic_read(&sp->sk_refcnt),
81312 +#ifdef CONFIG_GRKERNSEC_HIDESYM
81313 + NULL,
81314 +#else
81315 + sp,
81316 +#endif
81317 + atomic_read_unchecked(&sp->sk_drops), len);
81318 }
81319
81320 int udp4_seq_show(struct seq_file *seq, void *v)
81321 diff --git a/net/ipv6/addrconf.c b/net/ipv6/addrconf.c
81322 index 8ac3d09..fc58c5f 100644
81323 --- a/net/ipv6/addrconf.c
81324 +++ b/net/ipv6/addrconf.c
81325 @@ -2053,7 +2053,7 @@ int addrconf_set_dstaddr(struct net *net, void __user *arg)
81326 p.iph.ihl = 5;
81327 p.iph.protocol = IPPROTO_IPV6;
81328 p.iph.ttl = 64;
81329 - ifr.ifr_ifru.ifru_data = (__force void __user *)&p;
81330 + ifr.ifr_ifru.ifru_data = (void __force_user *)&p;
81331
81332 if (ops->ndo_do_ioctl) {
81333 mm_segment_t oldfs = get_fs();
81334 diff --git a/net/ipv6/inet6_connection_sock.c b/net/ipv6/inet6_connection_sock.c
81335 index cc4797d..7cfdfcc 100644
81336 --- a/net/ipv6/inet6_connection_sock.c
81337 +++ b/net/ipv6/inet6_connection_sock.c
81338 @@ -152,7 +152,7 @@ void __inet6_csk_dst_store(struct sock *sk, struct dst_entry *dst,
81339 #ifdef CONFIG_XFRM
81340 {
81341 struct rt6_info *rt = (struct rt6_info *)dst;
81342 - rt->rt6i_flow_cache_genid = atomic_read(&flow_cache_genid);
81343 + rt->rt6i_flow_cache_genid = atomic_read_unchecked(&flow_cache_genid);
81344 }
81345 #endif
81346 }
81347 @@ -167,7 +167,7 @@ struct dst_entry *__inet6_csk_dst_check(struct sock *sk, u32 cookie)
81348 #ifdef CONFIG_XFRM
81349 if (dst) {
81350 struct rt6_info *rt = (struct rt6_info *)dst;
81351 - if (rt->rt6i_flow_cache_genid != atomic_read(&flow_cache_genid)) {
81352 + if (rt->rt6i_flow_cache_genid != atomic_read_unchecked(&flow_cache_genid)) {
81353 sk->sk_dst_cache = NULL;
81354 dst_release(dst);
81355 dst = NULL;
81356 diff --git a/net/ipv6/inet6_hashtables.c b/net/ipv6/inet6_hashtables.c
81357 index 093e9b2..f72cddb 100644
81358 --- a/net/ipv6/inet6_hashtables.c
81359 +++ b/net/ipv6/inet6_hashtables.c
81360 @@ -119,7 +119,7 @@ out:
81361 }
81362 EXPORT_SYMBOL(__inet6_lookup_established);
81363
81364 -static int inline compute_score(struct sock *sk, struct net *net,
81365 +static inline int compute_score(struct sock *sk, struct net *net,
81366 const unsigned short hnum,
81367 const struct in6_addr *daddr,
81368 const int dif)
81369 diff --git a/net/ipv6/ipv6_sockglue.c b/net/ipv6/ipv6_sockglue.c
81370 index 4f7aaf6..f7acf45 100644
81371 --- a/net/ipv6/ipv6_sockglue.c
81372 +++ b/net/ipv6/ipv6_sockglue.c
81373 @@ -130,6 +130,8 @@ static int do_ipv6_setsockopt(struct sock *sk, int level, int optname,
81374 int val, valbool;
81375 int retv = -ENOPROTOOPT;
81376
81377 + pax_track_stack();
81378 +
81379 if (optval == NULL)
81380 val=0;
81381 else {
81382 @@ -881,6 +883,8 @@ static int do_ipv6_getsockopt(struct sock *sk, int level, int optname,
81383 int len;
81384 int val;
81385
81386 + pax_track_stack();
81387 +
81388 if (ip6_mroute_opt(optname))
81389 return ip6_mroute_getsockopt(sk, optname, optval, optlen);
81390
81391 @@ -922,7 +926,7 @@ static int do_ipv6_getsockopt(struct sock *sk, int level, int optname,
81392 if (sk->sk_type != SOCK_STREAM)
81393 return -ENOPROTOOPT;
81394
81395 - msg.msg_control = optval;
81396 + msg.msg_control = (void __force_kernel *)optval;
81397 msg.msg_controllen = len;
81398 msg.msg_flags = 0;
81399
81400 diff --git a/net/ipv6/netfilter/ip6_queue.c b/net/ipv6/netfilter/ip6_queue.c
81401 index 1cf3f0c..1d4376f 100644
81402 --- a/net/ipv6/netfilter/ip6_queue.c
81403 +++ b/net/ipv6/netfilter/ip6_queue.c
81404 @@ -287,6 +287,9 @@ ipq_mangle_ipv6(ipq_verdict_msg_t *v, struct nf_queue_entry *e)
81405
81406 if (v->data_len < sizeof(*user_iph))
81407 return 0;
81408 + if (v->data_len > 65535)
81409 + return -EMSGSIZE;
81410 +
81411 diff = v->data_len - e->skb->len;
81412 if (diff < 0) {
81413 if (pskb_trim(e->skb, v->data_len))
81414 @@ -411,7 +414,8 @@ ipq_dev_drop(int ifindex)
81415 static inline void
81416 __ipq_rcv_skb(struct sk_buff *skb)
81417 {
81418 - int status, type, pid, flags, nlmsglen, skblen;
81419 + int status, type, pid, flags;
81420 + unsigned int nlmsglen, skblen;
81421 struct nlmsghdr *nlh;
81422
81423 skblen = skb->len;
81424 diff --git a/net/ipv6/netfilter/ip6_tables.c b/net/ipv6/netfilter/ip6_tables.c
81425 index 78b5a36..7f37433 100644
81426 --- a/net/ipv6/netfilter/ip6_tables.c
81427 +++ b/net/ipv6/netfilter/ip6_tables.c
81428 @@ -1173,6 +1173,7 @@ static int get_info(struct net *net, void __user *user, int *len, int compat)
81429 private = &tmp;
81430 }
81431 #endif
81432 + memset(&info, 0, sizeof(info));
81433 info.valid_hooks = t->valid_hooks;
81434 memcpy(info.hook_entry, private->hook_entry,
81435 sizeof(info.hook_entry));
81436 diff --git a/net/ipv6/raw.c b/net/ipv6/raw.c
81437 index 4f24570..b813b34 100644
81438 --- a/net/ipv6/raw.c
81439 +++ b/net/ipv6/raw.c
81440 @@ -375,14 +375,14 @@ static inline int rawv6_rcv_skb(struct sock * sk, struct sk_buff * skb)
81441 {
81442 if ((raw6_sk(sk)->checksum || sk->sk_filter) &&
81443 skb_checksum_complete(skb)) {
81444 - atomic_inc(&sk->sk_drops);
81445 + atomic_inc_unchecked(&sk->sk_drops);
81446 kfree_skb(skb);
81447 return NET_RX_DROP;
81448 }
81449
81450 /* Charge it to the socket. */
81451 if (sock_queue_rcv_skb(sk,skb)<0) {
81452 - atomic_inc(&sk->sk_drops);
81453 + atomic_inc_unchecked(&sk->sk_drops);
81454 kfree_skb(skb);
81455 return NET_RX_DROP;
81456 }
81457 @@ -403,7 +403,7 @@ int rawv6_rcv(struct sock *sk, struct sk_buff *skb)
81458 struct raw6_sock *rp = raw6_sk(sk);
81459
81460 if (!xfrm6_policy_check(sk, XFRM_POLICY_IN, skb)) {
81461 - atomic_inc(&sk->sk_drops);
81462 + atomic_inc_unchecked(&sk->sk_drops);
81463 kfree_skb(skb);
81464 return NET_RX_DROP;
81465 }
81466 @@ -427,7 +427,7 @@ int rawv6_rcv(struct sock *sk, struct sk_buff *skb)
81467
81468 if (inet->hdrincl) {
81469 if (skb_checksum_complete(skb)) {
81470 - atomic_inc(&sk->sk_drops);
81471 + atomic_inc_unchecked(&sk->sk_drops);
81472 kfree_skb(skb);
81473 return NET_RX_DROP;
81474 }
81475 @@ -518,7 +518,7 @@ csum_copy_err:
81476 as some normal condition.
81477 */
81478 err = (flags&MSG_DONTWAIT) ? -EAGAIN : -EHOSTUNREACH;
81479 - atomic_inc(&sk->sk_drops);
81480 + atomic_inc_unchecked(&sk->sk_drops);
81481 goto out;
81482 }
81483
81484 @@ -600,7 +600,7 @@ out:
81485 return err;
81486 }
81487
81488 -static int rawv6_send_hdrinc(struct sock *sk, void *from, int length,
81489 +static int rawv6_send_hdrinc(struct sock *sk, void *from, unsigned int length,
81490 struct flowi *fl, struct rt6_info *rt,
81491 unsigned int flags)
81492 {
81493 @@ -738,6 +738,8 @@ static int rawv6_sendmsg(struct kiocb *iocb, struct sock *sk,
81494 u16 proto;
81495 int err;
81496
81497 + pax_track_stack();
81498 +
81499 /* Rough check on arithmetic overflow,
81500 better check is made in ip6_append_data().
81501 */
81502 @@ -916,12 +918,17 @@ do_confirm:
81503 static int rawv6_seticmpfilter(struct sock *sk, int level, int optname,
81504 char __user *optval, int optlen)
81505 {
81506 + struct icmp6_filter filter;
81507 +
81508 switch (optname) {
81509 case ICMPV6_FILTER:
81510 + if (optlen < 0)
81511 + return -EINVAL;
81512 if (optlen > sizeof(struct icmp6_filter))
81513 optlen = sizeof(struct icmp6_filter);
81514 - if (copy_from_user(&raw6_sk(sk)->filter, optval, optlen))
81515 + if (copy_from_user(&filter, optval, optlen))
81516 return -EFAULT;
81517 + raw6_sk(sk)->filter = filter;
81518 return 0;
81519 default:
81520 return -ENOPROTOOPT;
81521 @@ -934,6 +941,7 @@ static int rawv6_geticmpfilter(struct sock *sk, int level, int optname,
81522 char __user *optval, int __user *optlen)
81523 {
81524 int len;
81525 + struct icmp6_filter filter;
81526
81527 switch (optname) {
81528 case ICMPV6_FILTER:
81529 @@ -945,7 +953,8 @@ static int rawv6_geticmpfilter(struct sock *sk, int level, int optname,
81530 len = sizeof(struct icmp6_filter);
81531 if (put_user(len, optlen))
81532 return -EFAULT;
81533 - if (copy_to_user(optval, &raw6_sk(sk)->filter, len))
81534 + filter = raw6_sk(sk)->filter;
81535 + if (len > sizeof filter || copy_to_user(optval, &filter, len))
81536 return -EFAULT;
81537 return 0;
81538 default:
81539 @@ -1241,7 +1250,13 @@ static void raw6_sock_seq_show(struct seq_file *seq, struct sock *sp, int i)
81540 0, 0L, 0,
81541 sock_i_uid(sp), 0,
81542 sock_i_ino(sp),
81543 - atomic_read(&sp->sk_refcnt), sp, atomic_read(&sp->sk_drops));
81544 + atomic_read(&sp->sk_refcnt),
81545 +#ifdef CONFIG_GRKERNSEC_HIDESYM
81546 + NULL,
81547 +#else
81548 + sp,
81549 +#endif
81550 + atomic_read_unchecked(&sp->sk_drops));
81551 }
81552
81553 static int raw6_seq_show(struct seq_file *seq, void *v)
81554 diff --git a/net/ipv6/tcp_ipv6.c b/net/ipv6/tcp_ipv6.c
81555 index faae6df..d4430c1 100644
81556 --- a/net/ipv6/tcp_ipv6.c
81557 +++ b/net/ipv6/tcp_ipv6.c
81558 @@ -89,6 +89,10 @@ static struct tcp_md5sig_key *tcp_v6_md5_do_lookup(struct sock *sk,
81559 }
81560 #endif
81561
81562 +#ifdef CONFIG_GRKERNSEC_BLACKHOLE
81563 +extern int grsec_enable_blackhole;
81564 +#endif
81565 +
81566 static void tcp_v6_hash(struct sock *sk)
81567 {
81568 if (sk->sk_state != TCP_CLOSE) {
81569 @@ -1579,6 +1583,9 @@ static int tcp_v6_do_rcv(struct sock *sk, struct sk_buff *skb)
81570 return 0;
81571
81572 reset:
81573 +#ifdef CONFIG_GRKERNSEC_BLACKHOLE
81574 + if (!grsec_enable_blackhole)
81575 +#endif
81576 tcp_v6_send_reset(sk, skb);
81577 discard:
81578 if (opt_skb)
81579 @@ -1656,12 +1663,20 @@ static int tcp_v6_rcv(struct sk_buff *skb)
81580 TCP_SKB_CB(skb)->sacked = 0;
81581
81582 sk = __inet6_lookup_skb(&tcp_hashinfo, skb, th->source, th->dest);
81583 - if (!sk)
81584 + if (!sk) {
81585 +#ifdef CONFIG_GRKERNSEC_BLACKHOLE
81586 + ret = 1;
81587 +#endif
81588 goto no_tcp_socket;
81589 + }
81590
81591 process:
81592 - if (sk->sk_state == TCP_TIME_WAIT)
81593 + if (sk->sk_state == TCP_TIME_WAIT) {
81594 +#ifdef CONFIG_GRKERNSEC_BLACKHOLE
81595 + ret = 2;
81596 +#endif
81597 goto do_time_wait;
81598 + }
81599
81600 if (!xfrm6_policy_check(sk, XFRM_POLICY_IN, skb))
81601 goto discard_and_relse;
81602 @@ -1701,6 +1716,10 @@ no_tcp_socket:
81603 bad_packet:
81604 TCP_INC_STATS_BH(net, TCP_MIB_INERRS);
81605 } else {
81606 +#ifdef CONFIG_GRKERNSEC_BLACKHOLE
81607 + if (!grsec_enable_blackhole || (ret == 1 &&
81608 + (skb->dev->flags & IFF_LOOPBACK)))
81609 +#endif
81610 tcp_v6_send_reset(NULL, skb);
81611 }
81612
81613 @@ -1916,7 +1935,13 @@ static void get_openreq6(struct seq_file *seq,
81614 uid,
81615 0, /* non standard timer */
81616 0, /* open_requests have no inode */
81617 - 0, req);
81618 + 0,
81619 +#ifdef CONFIG_GRKERNSEC_HIDESYM
81620 + NULL
81621 +#else
81622 + req
81623 +#endif
81624 + );
81625 }
81626
81627 static void get_tcp6_sock(struct seq_file *seq, struct sock *sp, int i)
81628 @@ -1966,7 +1991,12 @@ static void get_tcp6_sock(struct seq_file *seq, struct sock *sp, int i)
81629 sock_i_uid(sp),
81630 icsk->icsk_probes_out,
81631 sock_i_ino(sp),
81632 - atomic_read(&sp->sk_refcnt), sp,
81633 + atomic_read(&sp->sk_refcnt),
81634 +#ifdef CONFIG_GRKERNSEC_HIDESYM
81635 + NULL,
81636 +#else
81637 + sp,
81638 +#endif
81639 jiffies_to_clock_t(icsk->icsk_rto),
81640 jiffies_to_clock_t(icsk->icsk_ack.ato),
81641 (icsk->icsk_ack.quick << 1 ) | icsk->icsk_ack.pingpong,
81642 @@ -2001,7 +2031,13 @@ static void get_timewait6_sock(struct seq_file *seq,
81643 dest->s6_addr32[2], dest->s6_addr32[3], destp,
81644 tw->tw_substate, 0, 0,
81645 3, jiffies_to_clock_t(ttd), 0, 0, 0, 0,
81646 - atomic_read(&tw->tw_refcnt), tw);
81647 + atomic_read(&tw->tw_refcnt),
81648 +#ifdef CONFIG_GRKERNSEC_HIDESYM
81649 + NULL
81650 +#else
81651 + tw
81652 +#endif
81653 + );
81654 }
81655
81656 static int tcp6_seq_show(struct seq_file *seq, void *v)
81657 diff --git a/net/ipv6/udp.c b/net/ipv6/udp.c
81658 index 9cc6289..052c521 100644
81659 --- a/net/ipv6/udp.c
81660 +++ b/net/ipv6/udp.c
81661 @@ -49,6 +49,10 @@
81662 #include <linux/seq_file.h>
81663 #include "udp_impl.h"
81664
81665 +#ifdef CONFIG_GRKERNSEC_BLACKHOLE
81666 +extern int grsec_enable_blackhole;
81667 +#endif
81668 +
81669 int ipv6_rcv_saddr_equal(const struct sock *sk, const struct sock *sk2)
81670 {
81671 const struct in6_addr *sk_rcv_saddr6 = &inet6_sk(sk)->rcv_saddr;
81672 @@ -391,7 +395,7 @@ int udpv6_queue_rcv_skb(struct sock * sk, struct sk_buff *skb)
81673 if (rc == -ENOMEM) {
81674 UDP6_INC_STATS_BH(sock_net(sk),
81675 UDP_MIB_RCVBUFERRORS, is_udplite);
81676 - atomic_inc(&sk->sk_drops);
81677 + atomic_inc_unchecked(&sk->sk_drops);
81678 }
81679 goto drop;
81680 }
81681 @@ -590,6 +594,9 @@ int __udp6_lib_rcv(struct sk_buff *skb, struct udp_table *udptable,
81682 UDP6_INC_STATS_BH(net, UDP_MIB_NOPORTS,
81683 proto == IPPROTO_UDPLITE);
81684
81685 +#ifdef CONFIG_GRKERNSEC_BLACKHOLE
81686 + if (!grsec_enable_blackhole || (skb->dev->flags & IFF_LOOPBACK))
81687 +#endif
81688 icmpv6_send(skb, ICMPV6_DEST_UNREACH, ICMPV6_PORT_UNREACH, 0, dev);
81689
81690 kfree_skb(skb);
81691 @@ -1209,8 +1216,13 @@ static void udp6_sock_seq_show(struct seq_file *seq, struct sock *sp, int bucket
81692 0, 0L, 0,
81693 sock_i_uid(sp), 0,
81694 sock_i_ino(sp),
81695 - atomic_read(&sp->sk_refcnt), sp,
81696 - atomic_read(&sp->sk_drops));
81697 + atomic_read(&sp->sk_refcnt),
81698 +#ifdef CONFIG_GRKERNSEC_HIDESYM
81699 + NULL,
81700 +#else
81701 + sp,
81702 +#endif
81703 + atomic_read_unchecked(&sp->sk_drops));
81704 }
81705
81706 int udp6_seq_show(struct seq_file *seq, void *v)
81707 diff --git a/net/irda/ircomm/ircomm_tty.c b/net/irda/ircomm/ircomm_tty.c
81708 index 811984d..11f59b7 100644
81709 --- a/net/irda/ircomm/ircomm_tty.c
81710 +++ b/net/irda/ircomm/ircomm_tty.c
81711 @@ -280,16 +280,16 @@ static int ircomm_tty_block_til_ready(struct ircomm_tty_cb *self,
81712 add_wait_queue(&self->open_wait, &wait);
81713
81714 IRDA_DEBUG(2, "%s(%d):block_til_ready before block on %s open_count=%d\n",
81715 - __FILE__,__LINE__, tty->driver->name, self->open_count );
81716 + __FILE__,__LINE__, tty->driver->name, local_read(&self->open_count) );
81717
81718 /* As far as I can see, we protect open_count - Jean II */
81719 spin_lock_irqsave(&self->spinlock, flags);
81720 if (!tty_hung_up_p(filp)) {
81721 extra_count = 1;
81722 - self->open_count--;
81723 + local_dec(&self->open_count);
81724 }
81725 spin_unlock_irqrestore(&self->spinlock, flags);
81726 - self->blocked_open++;
81727 + local_inc(&self->blocked_open);
81728
81729 while (1) {
81730 if (tty->termios->c_cflag & CBAUD) {
81731 @@ -329,7 +329,7 @@ static int ircomm_tty_block_til_ready(struct ircomm_tty_cb *self,
81732 }
81733
81734 IRDA_DEBUG(1, "%s(%d):block_til_ready blocking on %s open_count=%d\n",
81735 - __FILE__,__LINE__, tty->driver->name, self->open_count );
81736 + __FILE__,__LINE__, tty->driver->name, local_read(&self->open_count) );
81737
81738 schedule();
81739 }
81740 @@ -340,13 +340,13 @@ static int ircomm_tty_block_til_ready(struct ircomm_tty_cb *self,
81741 if (extra_count) {
81742 /* ++ is not atomic, so this should be protected - Jean II */
81743 spin_lock_irqsave(&self->spinlock, flags);
81744 - self->open_count++;
81745 + local_inc(&self->open_count);
81746 spin_unlock_irqrestore(&self->spinlock, flags);
81747 }
81748 - self->blocked_open--;
81749 + local_dec(&self->blocked_open);
81750
81751 IRDA_DEBUG(1, "%s(%d):block_til_ready after blocking on %s open_count=%d\n",
81752 - __FILE__,__LINE__, tty->driver->name, self->open_count);
81753 + __FILE__,__LINE__, tty->driver->name, local_read(&self->open_count));
81754
81755 if (!retval)
81756 self->flags |= ASYNC_NORMAL_ACTIVE;
81757 @@ -415,14 +415,14 @@ static int ircomm_tty_open(struct tty_struct *tty, struct file *filp)
81758 }
81759 /* ++ is not atomic, so this should be protected - Jean II */
81760 spin_lock_irqsave(&self->spinlock, flags);
81761 - self->open_count++;
81762 + local_inc(&self->open_count);
81763
81764 tty->driver_data = self;
81765 self->tty = tty;
81766 spin_unlock_irqrestore(&self->spinlock, flags);
81767
81768 IRDA_DEBUG(1, "%s(), %s%d, count = %d\n", __func__ , tty->driver->name,
81769 - self->line, self->open_count);
81770 + self->line, local_read(&self->open_count));
81771
81772 /* Not really used by us, but lets do it anyway */
81773 self->tty->low_latency = (self->flags & ASYNC_LOW_LATENCY) ? 1 : 0;
81774 @@ -511,7 +511,7 @@ static void ircomm_tty_close(struct tty_struct *tty, struct file *filp)
81775 return;
81776 }
81777
81778 - if ((tty->count == 1) && (self->open_count != 1)) {
81779 + if ((tty->count == 1) && (local_read(&self->open_count) != 1)) {
81780 /*
81781 * Uh, oh. tty->count is 1, which means that the tty
81782 * structure will be freed. state->count should always
81783 @@ -521,16 +521,16 @@ static void ircomm_tty_close(struct tty_struct *tty, struct file *filp)
81784 */
81785 IRDA_DEBUG(0, "%s(), bad serial port count; "
81786 "tty->count is 1, state->count is %d\n", __func__ ,
81787 - self->open_count);
81788 - self->open_count = 1;
81789 + local_read(&self->open_count));
81790 + local_set(&self->open_count, 1);
81791 }
81792
81793 - if (--self->open_count < 0) {
81794 + if (local_dec_return(&self->open_count) < 0) {
81795 IRDA_ERROR("%s(), bad serial port count for ttys%d: %d\n",
81796 - __func__, self->line, self->open_count);
81797 - self->open_count = 0;
81798 + __func__, self->line, local_read(&self->open_count));
81799 + local_set(&self->open_count, 0);
81800 }
81801 - if (self->open_count) {
81802 + if (local_read(&self->open_count)) {
81803 spin_unlock_irqrestore(&self->spinlock, flags);
81804
81805 IRDA_DEBUG(0, "%s(), open count > 0\n", __func__ );
81806 @@ -562,7 +562,7 @@ static void ircomm_tty_close(struct tty_struct *tty, struct file *filp)
81807 tty->closing = 0;
81808 self->tty = NULL;
81809
81810 - if (self->blocked_open) {
81811 + if (local_read(&self->blocked_open)) {
81812 if (self->close_delay)
81813 schedule_timeout_interruptible(self->close_delay);
81814 wake_up_interruptible(&self->open_wait);
81815 @@ -1017,7 +1017,7 @@ static void ircomm_tty_hangup(struct tty_struct *tty)
81816 spin_lock_irqsave(&self->spinlock, flags);
81817 self->flags &= ~ASYNC_NORMAL_ACTIVE;
81818 self->tty = NULL;
81819 - self->open_count = 0;
81820 + local_set(&self->open_count, 0);
81821 spin_unlock_irqrestore(&self->spinlock, flags);
81822
81823 wake_up_interruptible(&self->open_wait);
81824 @@ -1369,7 +1369,7 @@ static void ircomm_tty_line_info(struct ircomm_tty_cb *self, struct seq_file *m)
81825 seq_putc(m, '\n');
81826
81827 seq_printf(m, "Role: %s\n", self->client ? "client" : "server");
81828 - seq_printf(m, "Open count: %d\n", self->open_count);
81829 + seq_printf(m, "Open count: %d\n", local_read(&self->open_count));
81830 seq_printf(m, "Max data size: %d\n", self->max_data_size);
81831 seq_printf(m, "Max header size: %d\n", self->max_header_size);
81832
81833 diff --git a/net/iucv/af_iucv.c b/net/iucv/af_iucv.c
81834 index bada1b9..f325943 100644
81835 --- a/net/iucv/af_iucv.c
81836 +++ b/net/iucv/af_iucv.c
81837 @@ -651,10 +651,10 @@ static int iucv_sock_autobind(struct sock *sk)
81838
81839 write_lock_bh(&iucv_sk_list.lock);
81840
81841 - sprintf(name, "%08x", atomic_inc_return(&iucv_sk_list.autobind_name));
81842 + sprintf(name, "%08x", atomic_inc_return_unchecked(&iucv_sk_list.autobind_name));
81843 while (__iucv_get_sock_by_name(name)) {
81844 sprintf(name, "%08x",
81845 - atomic_inc_return(&iucv_sk_list.autobind_name));
81846 + atomic_inc_return_unchecked(&iucv_sk_list.autobind_name));
81847 }
81848
81849 write_unlock_bh(&iucv_sk_list.lock);
81850 diff --git a/net/key/af_key.c b/net/key/af_key.c
81851 index 4e98193..439b449 100644
81852 --- a/net/key/af_key.c
81853 +++ b/net/key/af_key.c
81854 @@ -2489,6 +2489,8 @@ static int pfkey_migrate(struct sock *sk, struct sk_buff *skb,
81855 struct xfrm_migrate m[XFRM_MAX_DEPTH];
81856 struct xfrm_kmaddress k;
81857
81858 + pax_track_stack();
81859 +
81860 if (!present_and_same_family(ext_hdrs[SADB_EXT_ADDRESS_SRC - 1],
81861 ext_hdrs[SADB_EXT_ADDRESS_DST - 1]) ||
81862 !ext_hdrs[SADB_X_EXT_POLICY - 1]) {
81863 @@ -3660,7 +3662,11 @@ static int pfkey_seq_show(struct seq_file *f, void *v)
81864 seq_printf(f ,"sk RefCnt Rmem Wmem User Inode\n");
81865 else
81866 seq_printf(f ,"%p %-6d %-6u %-6u %-6u %-6lu\n",
81867 +#ifdef CONFIG_GRKERNSEC_HIDESYM
81868 + NULL,
81869 +#else
81870 s,
81871 +#endif
81872 atomic_read(&s->sk_refcnt),
81873 sk_rmem_alloc_get(s),
81874 sk_wmem_alloc_get(s),
81875 diff --git a/net/lapb/lapb_iface.c b/net/lapb/lapb_iface.c
81876 index bda96d1..c038b72 100644
81877 --- a/net/lapb/lapb_iface.c
81878 +++ b/net/lapb/lapb_iface.c
81879 @@ -157,7 +157,7 @@ int lapb_register(struct net_device *dev, struct lapb_register_struct *callbacks
81880 goto out;
81881
81882 lapb->dev = dev;
81883 - lapb->callbacks = *callbacks;
81884 + lapb->callbacks = callbacks;
81885
81886 __lapb_insert_cb(lapb);
81887
81888 @@ -379,32 +379,32 @@ int lapb_data_received(struct net_device *dev, struct sk_buff *skb)
81889
81890 void lapb_connect_confirmation(struct lapb_cb *lapb, int reason)
81891 {
81892 - if (lapb->callbacks.connect_confirmation)
81893 - lapb->callbacks.connect_confirmation(lapb->dev, reason);
81894 + if (lapb->callbacks->connect_confirmation)
81895 + lapb->callbacks->connect_confirmation(lapb->dev, reason);
81896 }
81897
81898 void lapb_connect_indication(struct lapb_cb *lapb, int reason)
81899 {
81900 - if (lapb->callbacks.connect_indication)
81901 - lapb->callbacks.connect_indication(lapb->dev, reason);
81902 + if (lapb->callbacks->connect_indication)
81903 + lapb->callbacks->connect_indication(lapb->dev, reason);
81904 }
81905
81906 void lapb_disconnect_confirmation(struct lapb_cb *lapb, int reason)
81907 {
81908 - if (lapb->callbacks.disconnect_confirmation)
81909 - lapb->callbacks.disconnect_confirmation(lapb->dev, reason);
81910 + if (lapb->callbacks->disconnect_confirmation)
81911 + lapb->callbacks->disconnect_confirmation(lapb->dev, reason);
81912 }
81913
81914 void lapb_disconnect_indication(struct lapb_cb *lapb, int reason)
81915 {
81916 - if (lapb->callbacks.disconnect_indication)
81917 - lapb->callbacks.disconnect_indication(lapb->dev, reason);
81918 + if (lapb->callbacks->disconnect_indication)
81919 + lapb->callbacks->disconnect_indication(lapb->dev, reason);
81920 }
81921
81922 int lapb_data_indication(struct lapb_cb *lapb, struct sk_buff *skb)
81923 {
81924 - if (lapb->callbacks.data_indication)
81925 - return lapb->callbacks.data_indication(lapb->dev, skb);
81926 + if (lapb->callbacks->data_indication)
81927 + return lapb->callbacks->data_indication(lapb->dev, skb);
81928
81929 kfree_skb(skb);
81930 return NET_RX_SUCCESS; /* For now; must be != NET_RX_DROP */
81931 @@ -414,8 +414,8 @@ int lapb_data_transmit(struct lapb_cb *lapb, struct sk_buff *skb)
81932 {
81933 int used = 0;
81934
81935 - if (lapb->callbacks.data_transmit) {
81936 - lapb->callbacks.data_transmit(lapb->dev, skb);
81937 + if (lapb->callbacks->data_transmit) {
81938 + lapb->callbacks->data_transmit(lapb->dev, skb);
81939 used = 1;
81940 }
81941
81942 diff --git a/net/mac80211/cfg.c b/net/mac80211/cfg.c
81943 index fe2d3f8..e57f683 100644
81944 --- a/net/mac80211/cfg.c
81945 +++ b/net/mac80211/cfg.c
81946 @@ -1369,7 +1369,7 @@ static int ieee80211_set_bitrate_mask(struct wiphy *wiphy,
81947 return err;
81948 }
81949
81950 -struct cfg80211_ops mac80211_config_ops = {
81951 +const struct cfg80211_ops mac80211_config_ops = {
81952 .add_virtual_intf = ieee80211_add_iface,
81953 .del_virtual_intf = ieee80211_del_iface,
81954 .change_virtual_intf = ieee80211_change_iface,
81955 diff --git a/net/mac80211/cfg.h b/net/mac80211/cfg.h
81956 index 7d7879f..2d51f62 100644
81957 --- a/net/mac80211/cfg.h
81958 +++ b/net/mac80211/cfg.h
81959 @@ -4,6 +4,6 @@
81960 #ifndef __CFG_H
81961 #define __CFG_H
81962
81963 -extern struct cfg80211_ops mac80211_config_ops;
81964 +extern const struct cfg80211_ops mac80211_config_ops;
81965
81966 #endif /* __CFG_H */
81967 diff --git a/net/mac80211/debugfs_key.c b/net/mac80211/debugfs_key.c
81968 index 99c7525..9cb4937 100644
81969 --- a/net/mac80211/debugfs_key.c
81970 +++ b/net/mac80211/debugfs_key.c
81971 @@ -211,9 +211,13 @@ static ssize_t key_key_read(struct file *file, char __user *userbuf,
81972 size_t count, loff_t *ppos)
81973 {
81974 struct ieee80211_key *key = file->private_data;
81975 - int i, res, bufsize = 2 * key->conf.keylen + 2;
81976 + int i, bufsize = 2 * key->conf.keylen + 2;
81977 char *buf = kmalloc(bufsize, GFP_KERNEL);
81978 char *p = buf;
81979 + ssize_t res;
81980 +
81981 + if (buf == NULL)
81982 + return -ENOMEM;
81983
81984 for (i = 0; i < key->conf.keylen; i++)
81985 p += scnprintf(p, bufsize + buf - p, "%02x", key->conf.key[i]);
81986 diff --git a/net/mac80211/debugfs_sta.c b/net/mac80211/debugfs_sta.c
81987 index 33a2e89..08650c8 100644
81988 --- a/net/mac80211/debugfs_sta.c
81989 +++ b/net/mac80211/debugfs_sta.c
81990 @@ -124,6 +124,8 @@ static ssize_t sta_agg_status_read(struct file *file, char __user *userbuf,
81991 int i;
81992 struct sta_info *sta = file->private_data;
81993
81994 + pax_track_stack();
81995 +
81996 spin_lock_bh(&sta->lock);
81997 p += scnprintf(p, sizeof(buf)+buf-p, "next dialog_token is %#02x\n",
81998 sta->ampdu_mlme.dialog_token_allocator + 1);
81999 diff --git a/net/mac80211/ieee80211_i.h b/net/mac80211/ieee80211_i.h
82000 index ca62bfe..6657a03 100644
82001 --- a/net/mac80211/ieee80211_i.h
82002 +++ b/net/mac80211/ieee80211_i.h
82003 @@ -25,6 +25,7 @@
82004 #include <linux/etherdevice.h>
82005 #include <net/cfg80211.h>
82006 #include <net/mac80211.h>
82007 +#include <asm/local.h>
82008 #include "key.h"
82009 #include "sta_info.h"
82010
82011 @@ -635,7 +636,7 @@ struct ieee80211_local {
82012 /* also used to protect ampdu_ac_queue and amdpu_ac_stop_refcnt */
82013 spinlock_t queue_stop_reason_lock;
82014
82015 - int open_count;
82016 + local_t open_count;
82017 int monitors, cooked_mntrs;
82018 /* number of interfaces with corresponding FIF_ flags */
82019 int fif_fcsfail, fif_plcpfail, fif_control, fif_other_bss, fif_pspoll;
82020 diff --git a/net/mac80211/iface.c b/net/mac80211/iface.c
82021 index 079c500..eb3c6d4 100644
82022 --- a/net/mac80211/iface.c
82023 +++ b/net/mac80211/iface.c
82024 @@ -166,7 +166,7 @@ static int ieee80211_open(struct net_device *dev)
82025 break;
82026 }
82027
82028 - if (local->open_count == 0) {
82029 + if (local_read(&local->open_count) == 0) {
82030 res = drv_start(local);
82031 if (res)
82032 goto err_del_bss;
82033 @@ -196,7 +196,7 @@ static int ieee80211_open(struct net_device *dev)
82034 * Validate the MAC address for this device.
82035 */
82036 if (!is_valid_ether_addr(dev->dev_addr)) {
82037 - if (!local->open_count)
82038 + if (!local_read(&local->open_count))
82039 drv_stop(local);
82040 return -EADDRNOTAVAIL;
82041 }
82042 @@ -292,7 +292,7 @@ static int ieee80211_open(struct net_device *dev)
82043
82044 hw_reconf_flags |= __ieee80211_recalc_idle(local);
82045
82046 - local->open_count++;
82047 + local_inc(&local->open_count);
82048 if (hw_reconf_flags) {
82049 ieee80211_hw_config(local, hw_reconf_flags);
82050 /*
82051 @@ -320,7 +320,7 @@ static int ieee80211_open(struct net_device *dev)
82052 err_del_interface:
82053 drv_remove_interface(local, &conf);
82054 err_stop:
82055 - if (!local->open_count)
82056 + if (!local_read(&local->open_count))
82057 drv_stop(local);
82058 err_del_bss:
82059 sdata->bss = NULL;
82060 @@ -420,7 +420,7 @@ static int ieee80211_stop(struct net_device *dev)
82061 WARN_ON(!list_empty(&sdata->u.ap.vlans));
82062 }
82063
82064 - local->open_count--;
82065 + local_dec(&local->open_count);
82066
82067 switch (sdata->vif.type) {
82068 case NL80211_IFTYPE_AP_VLAN:
82069 @@ -526,7 +526,7 @@ static int ieee80211_stop(struct net_device *dev)
82070
82071 ieee80211_recalc_ps(local, -1);
82072
82073 - if (local->open_count == 0) {
82074 + if (local_read(&local->open_count) == 0) {
82075 ieee80211_clear_tx_pending(local);
82076 ieee80211_stop_device(local);
82077
82078 diff --git a/net/mac80211/main.c b/net/mac80211/main.c
82079 index 2dfe176..74e4388 100644
82080 --- a/net/mac80211/main.c
82081 +++ b/net/mac80211/main.c
82082 @@ -145,7 +145,7 @@ int ieee80211_hw_config(struct ieee80211_local *local, u32 changed)
82083 local->hw.conf.power_level = power;
82084 }
82085
82086 - if (changed && local->open_count) {
82087 + if (changed && local_read(&local->open_count)) {
82088 ret = drv_config(local, changed);
82089 /*
82090 * Goal:
82091 diff --git a/net/mac80211/mlme.c b/net/mac80211/mlme.c
82092 index e67eea7..fcc227e 100644
82093 --- a/net/mac80211/mlme.c
82094 +++ b/net/mac80211/mlme.c
82095 @@ -1438,6 +1438,8 @@ ieee80211_rx_mgmt_assoc_resp(struct ieee80211_sub_if_data *sdata,
82096 bool have_higher_than_11mbit = false, newsta = false;
82097 u16 ap_ht_cap_flags;
82098
82099 + pax_track_stack();
82100 +
82101 /*
82102 * AssocResp and ReassocResp have identical structure, so process both
82103 * of them in this function.
82104 diff --git a/net/mac80211/pm.c b/net/mac80211/pm.c
82105 index e535f1c..4d733d1 100644
82106 --- a/net/mac80211/pm.c
82107 +++ b/net/mac80211/pm.c
82108 @@ -107,7 +107,7 @@ int __ieee80211_suspend(struct ieee80211_hw *hw)
82109 }
82110
82111 /* stop hardware - this must stop RX */
82112 - if (local->open_count)
82113 + if (local_read(&local->open_count))
82114 ieee80211_stop_device(local);
82115
82116 local->suspended = true;
82117 diff --git a/net/mac80211/rate.c b/net/mac80211/rate.c
82118 index b33efc4..0a2efb6 100644
82119 --- a/net/mac80211/rate.c
82120 +++ b/net/mac80211/rate.c
82121 @@ -287,7 +287,7 @@ int ieee80211_init_rate_ctrl_alg(struct ieee80211_local *local,
82122 struct rate_control_ref *ref, *old;
82123
82124 ASSERT_RTNL();
82125 - if (local->open_count)
82126 + if (local_read(&local->open_count))
82127 return -EBUSY;
82128
82129 ref = rate_control_alloc(name, local);
82130 diff --git a/net/mac80211/tx.c b/net/mac80211/tx.c
82131 index b1d7904..57e4da7 100644
82132 --- a/net/mac80211/tx.c
82133 +++ b/net/mac80211/tx.c
82134 @@ -173,7 +173,7 @@ static __le16 ieee80211_duration(struct ieee80211_tx_data *tx, int group_addr,
82135 return cpu_to_le16(dur);
82136 }
82137
82138 -static int inline is_ieee80211_device(struct ieee80211_local *local,
82139 +static inline int is_ieee80211_device(struct ieee80211_local *local,
82140 struct net_device *dev)
82141 {
82142 return local == wdev_priv(dev->ieee80211_ptr);
82143 diff --git a/net/mac80211/util.c b/net/mac80211/util.c
82144 index 31b1085..48fb26d 100644
82145 --- a/net/mac80211/util.c
82146 +++ b/net/mac80211/util.c
82147 @@ -1042,7 +1042,7 @@ int ieee80211_reconfig(struct ieee80211_local *local)
82148 local->resuming = true;
82149
82150 /* restart hardware */
82151 - if (local->open_count) {
82152 + if (local_read(&local->open_count)) {
82153 /*
82154 * Upon resume hardware can sometimes be goofy due to
82155 * various platform / driver / bus issues, so restarting
82156 diff --git a/net/netfilter/Kconfig b/net/netfilter/Kconfig
82157 index 634d14a..b35a608 100644
82158 --- a/net/netfilter/Kconfig
82159 +++ b/net/netfilter/Kconfig
82160 @@ -635,6 +635,16 @@ config NETFILTER_XT_MATCH_ESP
82161
82162 To compile it as a module, choose M here. If unsure, say N.
82163
82164 +config NETFILTER_XT_MATCH_GRADM
82165 + tristate '"gradm" match support'
82166 + depends on NETFILTER_XTABLES && NETFILTER_ADVANCED
82167 + depends on GRKERNSEC && !GRKERNSEC_NO_RBAC
82168 + ---help---
82169 + The gradm match allows to match on grsecurity RBAC being enabled.
82170 + It is useful when iptables rules are applied early on bootup to
82171 + prevent connections to the machine (except from a trusted host)
82172 + while the RBAC system is disabled.
82173 +
82174 config NETFILTER_XT_MATCH_HASHLIMIT
82175 tristate '"hashlimit" match support'
82176 depends on (IP6_NF_IPTABLES || IP6_NF_IPTABLES=n)
82177 diff --git a/net/netfilter/Makefile b/net/netfilter/Makefile
82178 index 49f62ee..a17b2c6 100644
82179 --- a/net/netfilter/Makefile
82180 +++ b/net/netfilter/Makefile
82181 @@ -68,6 +68,7 @@ obj-$(CONFIG_NETFILTER_XT_MATCH_CONNTRACK) += xt_conntrack.o
82182 obj-$(CONFIG_NETFILTER_XT_MATCH_DCCP) += xt_dccp.o
82183 obj-$(CONFIG_NETFILTER_XT_MATCH_DSCP) += xt_dscp.o
82184 obj-$(CONFIG_NETFILTER_XT_MATCH_ESP) += xt_esp.o
82185 +obj-$(CONFIG_NETFILTER_XT_MATCH_GRADM) += xt_gradm.o
82186 obj-$(CONFIG_NETFILTER_XT_MATCH_HASHLIMIT) += xt_hashlimit.o
82187 obj-$(CONFIG_NETFILTER_XT_MATCH_HELPER) += xt_helper.o
82188 obj-$(CONFIG_NETFILTER_XT_MATCH_HL) += xt_hl.o
82189 diff --git a/net/netfilter/ipvs/ip_vs_app.c b/net/netfilter/ipvs/ip_vs_app.c
82190 index 3c7e427..724043c 100644
82191 --- a/net/netfilter/ipvs/ip_vs_app.c
82192 +++ b/net/netfilter/ipvs/ip_vs_app.c
82193 @@ -564,7 +564,7 @@ static const struct file_operations ip_vs_app_fops = {
82194 .open = ip_vs_app_open,
82195 .read = seq_read,
82196 .llseek = seq_lseek,
82197 - .release = seq_release,
82198 + .release = seq_release_net,
82199 };
82200 #endif
82201
82202 diff --git a/net/netfilter/ipvs/ip_vs_conn.c b/net/netfilter/ipvs/ip_vs_conn.c
82203 index 95682e5..457dbac 100644
82204 --- a/net/netfilter/ipvs/ip_vs_conn.c
82205 +++ b/net/netfilter/ipvs/ip_vs_conn.c
82206 @@ -453,10 +453,10 @@ ip_vs_bind_dest(struct ip_vs_conn *cp, struct ip_vs_dest *dest)
82207 /* if the connection is not template and is created
82208 * by sync, preserve the activity flag.
82209 */
82210 - cp->flags |= atomic_read(&dest->conn_flags) &
82211 + cp->flags |= atomic_read_unchecked(&dest->conn_flags) &
82212 (~IP_VS_CONN_F_INACTIVE);
82213 else
82214 - cp->flags |= atomic_read(&dest->conn_flags);
82215 + cp->flags |= atomic_read_unchecked(&dest->conn_flags);
82216 cp->dest = dest;
82217
82218 IP_VS_DBG_BUF(7, "Bind-dest %s c:%s:%d v:%s:%d "
82219 @@ -723,7 +723,7 @@ ip_vs_conn_new(int af, int proto, const union nf_inet_addr *caddr, __be16 cport,
82220 atomic_set(&cp->refcnt, 1);
82221
82222 atomic_set(&cp->n_control, 0);
82223 - atomic_set(&cp->in_pkts, 0);
82224 + atomic_set_unchecked(&cp->in_pkts, 0);
82225
82226 atomic_inc(&ip_vs_conn_count);
82227 if (flags & IP_VS_CONN_F_NO_CPORT)
82228 @@ -871,7 +871,7 @@ static const struct file_operations ip_vs_conn_fops = {
82229 .open = ip_vs_conn_open,
82230 .read = seq_read,
82231 .llseek = seq_lseek,
82232 - .release = seq_release,
82233 + .release = seq_release_net,
82234 };
82235
82236 static const char *ip_vs_origin_name(unsigned flags)
82237 @@ -934,7 +934,7 @@ static const struct file_operations ip_vs_conn_sync_fops = {
82238 .open = ip_vs_conn_sync_open,
82239 .read = seq_read,
82240 .llseek = seq_lseek,
82241 - .release = seq_release,
82242 + .release = seq_release_net,
82243 };
82244
82245 #endif
82246 @@ -961,7 +961,7 @@ static inline int todrop_entry(struct ip_vs_conn *cp)
82247
82248 /* Don't drop the entry if its number of incoming packets is not
82249 located in [0, 8] */
82250 - i = atomic_read(&cp->in_pkts);
82251 + i = atomic_read_unchecked(&cp->in_pkts);
82252 if (i > 8 || i < 0) return 0;
82253
82254 if (!todrop_rate[i]) return 0;
82255 diff --git a/net/netfilter/ipvs/ip_vs_core.c b/net/netfilter/ipvs/ip_vs_core.c
82256 index b95699f..5fee919 100644
82257 --- a/net/netfilter/ipvs/ip_vs_core.c
82258 +++ b/net/netfilter/ipvs/ip_vs_core.c
82259 @@ -485,7 +485,7 @@ int ip_vs_leave(struct ip_vs_service *svc, struct sk_buff *skb,
82260 ret = cp->packet_xmit(skb, cp, pp);
82261 /* do not touch skb anymore */
82262
82263 - atomic_inc(&cp->in_pkts);
82264 + atomic_inc_unchecked(&cp->in_pkts);
82265 ip_vs_conn_put(cp);
82266 return ret;
82267 }
82268 @@ -1357,7 +1357,7 @@ ip_vs_in(unsigned int hooknum, struct sk_buff *skb,
82269 * Sync connection if it is about to close to
82270 * encorage the standby servers to update the connections timeout
82271 */
82272 - pkts = atomic_add_return(1, &cp->in_pkts);
82273 + pkts = atomic_add_return_unchecked(1, &cp->in_pkts);
82274 if (af == AF_INET &&
82275 (ip_vs_sync_state & IP_VS_STATE_MASTER) &&
82276 (((cp->protocol != IPPROTO_TCP ||
82277 diff --git a/net/netfilter/ipvs/ip_vs_ctl.c b/net/netfilter/ipvs/ip_vs_ctl.c
82278 index 02b2610..2d89424 100644
82279 --- a/net/netfilter/ipvs/ip_vs_ctl.c
82280 +++ b/net/netfilter/ipvs/ip_vs_ctl.c
82281 @@ -792,7 +792,7 @@ __ip_vs_update_dest(struct ip_vs_service *svc,
82282 ip_vs_rs_hash(dest);
82283 write_unlock_bh(&__ip_vs_rs_lock);
82284 }
82285 - atomic_set(&dest->conn_flags, conn_flags);
82286 + atomic_set_unchecked(&dest->conn_flags, conn_flags);
82287
82288 /* bind the service */
82289 if (!dest->svc) {
82290 @@ -1888,7 +1888,7 @@ static int ip_vs_info_seq_show(struct seq_file *seq, void *v)
82291 " %-7s %-6d %-10d %-10d\n",
82292 &dest->addr.in6,
82293 ntohs(dest->port),
82294 - ip_vs_fwd_name(atomic_read(&dest->conn_flags)),
82295 + ip_vs_fwd_name(atomic_read_unchecked(&dest->conn_flags)),
82296 atomic_read(&dest->weight),
82297 atomic_read(&dest->activeconns),
82298 atomic_read(&dest->inactconns));
82299 @@ -1899,7 +1899,7 @@ static int ip_vs_info_seq_show(struct seq_file *seq, void *v)
82300 "%-7s %-6d %-10d %-10d\n",
82301 ntohl(dest->addr.ip),
82302 ntohs(dest->port),
82303 - ip_vs_fwd_name(atomic_read(&dest->conn_flags)),
82304 + ip_vs_fwd_name(atomic_read_unchecked(&dest->conn_flags)),
82305 atomic_read(&dest->weight),
82306 atomic_read(&dest->activeconns),
82307 atomic_read(&dest->inactconns));
82308 @@ -1927,7 +1927,7 @@ static const struct file_operations ip_vs_info_fops = {
82309 .open = ip_vs_info_open,
82310 .read = seq_read,
82311 .llseek = seq_lseek,
82312 - .release = seq_release_private,
82313 + .release = seq_release_net,
82314 };
82315
82316 #endif
82317 @@ -1976,7 +1976,7 @@ static const struct file_operations ip_vs_stats_fops = {
82318 .open = ip_vs_stats_seq_open,
82319 .read = seq_read,
82320 .llseek = seq_lseek,
82321 - .release = single_release,
82322 + .release = single_release_net,
82323 };
82324
82325 #endif
82326 @@ -2292,7 +2292,7 @@ __ip_vs_get_dest_entries(const struct ip_vs_get_dests *get,
82327
82328 entry.addr = dest->addr.ip;
82329 entry.port = dest->port;
82330 - entry.conn_flags = atomic_read(&dest->conn_flags);
82331 + entry.conn_flags = atomic_read_unchecked(&dest->conn_flags);
82332 entry.weight = atomic_read(&dest->weight);
82333 entry.u_threshold = dest->u_threshold;
82334 entry.l_threshold = dest->l_threshold;
82335 @@ -2353,6 +2353,8 @@ do_ip_vs_get_ctl(struct sock *sk, int cmd, void __user *user, int *len)
82336 unsigned char arg[128];
82337 int ret = 0;
82338
82339 + pax_track_stack();
82340 +
82341 if (!capable(CAP_NET_ADMIN))
82342 return -EPERM;
82343
82344 @@ -2802,7 +2804,7 @@ static int ip_vs_genl_fill_dest(struct sk_buff *skb, struct ip_vs_dest *dest)
82345 NLA_PUT_U16(skb, IPVS_DEST_ATTR_PORT, dest->port);
82346
82347 NLA_PUT_U32(skb, IPVS_DEST_ATTR_FWD_METHOD,
82348 - atomic_read(&dest->conn_flags) & IP_VS_CONN_F_FWD_MASK);
82349 + atomic_read_unchecked(&dest->conn_flags) & IP_VS_CONN_F_FWD_MASK);
82350 NLA_PUT_U32(skb, IPVS_DEST_ATTR_WEIGHT, atomic_read(&dest->weight));
82351 NLA_PUT_U32(skb, IPVS_DEST_ATTR_U_THRESH, dest->u_threshold);
82352 NLA_PUT_U32(skb, IPVS_DEST_ATTR_L_THRESH, dest->l_threshold);
82353 diff --git a/net/netfilter/ipvs/ip_vs_sync.c b/net/netfilter/ipvs/ip_vs_sync.c
82354 index e177f0d..55e8581 100644
82355 --- a/net/netfilter/ipvs/ip_vs_sync.c
82356 +++ b/net/netfilter/ipvs/ip_vs_sync.c
82357 @@ -438,7 +438,7 @@ static void ip_vs_process_message(const char *buffer, const size_t buflen)
82358
82359 if (opt)
82360 memcpy(&cp->in_seq, opt, sizeof(*opt));
82361 - atomic_set(&cp->in_pkts, sysctl_ip_vs_sync_threshold[0]);
82362 + atomic_set_unchecked(&cp->in_pkts, sysctl_ip_vs_sync_threshold[0]);
82363 cp->state = state;
82364 cp->old_state = cp->state;
82365 /*
82366 diff --git a/net/netfilter/ipvs/ip_vs_xmit.c b/net/netfilter/ipvs/ip_vs_xmit.c
82367 index 30b3189..e2e4b55 100644
82368 --- a/net/netfilter/ipvs/ip_vs_xmit.c
82369 +++ b/net/netfilter/ipvs/ip_vs_xmit.c
82370 @@ -875,7 +875,7 @@ ip_vs_icmp_xmit(struct sk_buff *skb, struct ip_vs_conn *cp,
82371 else
82372 rc = NF_ACCEPT;
82373 /* do not touch skb anymore */
82374 - atomic_inc(&cp->in_pkts);
82375 + atomic_inc_unchecked(&cp->in_pkts);
82376 goto out;
82377 }
82378
82379 @@ -949,7 +949,7 @@ ip_vs_icmp_xmit_v6(struct sk_buff *skb, struct ip_vs_conn *cp,
82380 else
82381 rc = NF_ACCEPT;
82382 /* do not touch skb anymore */
82383 - atomic_inc(&cp->in_pkts);
82384 + atomic_inc_unchecked(&cp->in_pkts);
82385 goto out;
82386 }
82387
82388 diff --git a/net/netfilter/nf_conntrack_netlink.c b/net/netfilter/nf_conntrack_netlink.c
82389 index d521718..d0fd7a1 100644
82390 --- a/net/netfilter/nf_conntrack_netlink.c
82391 +++ b/net/netfilter/nf_conntrack_netlink.c
82392 @@ -706,7 +706,7 @@ ctnetlink_parse_tuple_proto(struct nlattr *attr,
82393 static int
82394 ctnetlink_parse_tuple(const struct nlattr * const cda[],
82395 struct nf_conntrack_tuple *tuple,
82396 - enum ctattr_tuple type, u_int8_t l3num)
82397 + enum ctattr_type type, u_int8_t l3num)
82398 {
82399 struct nlattr *tb[CTA_TUPLE_MAX+1];
82400 int err;
82401 diff --git a/net/netfilter/nfnetlink_log.c b/net/netfilter/nfnetlink_log.c
82402 index f900dc3..5e45346 100644
82403 --- a/net/netfilter/nfnetlink_log.c
82404 +++ b/net/netfilter/nfnetlink_log.c
82405 @@ -68,7 +68,7 @@ struct nfulnl_instance {
82406 };
82407
82408 static DEFINE_RWLOCK(instances_lock);
82409 -static atomic_t global_seq;
82410 +static atomic_unchecked_t global_seq;
82411
82412 #define INSTANCE_BUCKETS 16
82413 static struct hlist_head instance_table[INSTANCE_BUCKETS];
82414 @@ -493,7 +493,7 @@ __build_packet_message(struct nfulnl_instance *inst,
82415 /* global sequence number */
82416 if (inst->flags & NFULNL_CFG_F_SEQ_GLOBAL)
82417 NLA_PUT_BE32(inst->skb, NFULA_SEQ_GLOBAL,
82418 - htonl(atomic_inc_return(&global_seq)));
82419 + htonl(atomic_inc_return_unchecked(&global_seq)));
82420
82421 if (data_len) {
82422 struct nlattr *nla;
82423 diff --git a/net/netfilter/xt_gradm.c b/net/netfilter/xt_gradm.c
82424 new file mode 100644
82425 index 0000000..b1bac76
82426 --- /dev/null
82427 +++ b/net/netfilter/xt_gradm.c
82428 @@ -0,0 +1,51 @@
82429 +/*
82430 + * gradm match for netfilter
82431 + * Copyright © Zbigniew Krzystolik, 2010
82432 + *
82433 + * This program is free software; you can redistribute it and/or modify
82434 + * it under the terms of the GNU General Public License; either version
82435 + * 2 or 3 as published by the Free Software Foundation.
82436 + */
82437 +#include <linux/module.h>
82438 +#include <linux/moduleparam.h>
82439 +#include <linux/skbuff.h>
82440 +#include <linux/netfilter/x_tables.h>
82441 +#include <linux/grsecurity.h>
82442 +#include <linux/netfilter/xt_gradm.h>
82443 +
82444 +static bool
82445 +gradm_mt(const struct sk_buff *skb, const struct xt_match_param *par)
82446 +{
82447 + const struct xt_gradm_mtinfo *info = par->matchinfo;
82448 + bool retval = false;
82449 + if (gr_acl_is_enabled())
82450 + retval = true;
82451 + return retval ^ info->invflags;
82452 +}
82453 +
82454 +static struct xt_match gradm_mt_reg __read_mostly = {
82455 + .name = "gradm",
82456 + .revision = 0,
82457 + .family = NFPROTO_UNSPEC,
82458 + .match = gradm_mt,
82459 + .matchsize = XT_ALIGN(sizeof(struct xt_gradm_mtinfo)),
82460 + .me = THIS_MODULE,
82461 +};
82462 +
82463 +static int __init gradm_mt_init(void)
82464 +{
82465 + return xt_register_match(&gradm_mt_reg);
82466 +}
82467 +
82468 +static void __exit gradm_mt_exit(void)
82469 +{
82470 + xt_unregister_match(&gradm_mt_reg);
82471 +}
82472 +
82473 +module_init(gradm_mt_init);
82474 +module_exit(gradm_mt_exit);
82475 +MODULE_AUTHOR("Zbigniew Krzystolik <zbyniu@destrukcja.pl>");
82476 +MODULE_DESCRIPTION("Xtables: Grsecurity RBAC match");
82477 +MODULE_LICENSE("GPL");
82478 +MODULE_ALIAS("ipt_gradm");
82479 +MODULE_ALIAS("ip6t_gradm");
82480 diff --git a/net/netlink/af_netlink.c b/net/netlink/af_netlink.c
82481 index 5a7dcdf..24a3578 100644
82482 --- a/net/netlink/af_netlink.c
82483 +++ b/net/netlink/af_netlink.c
82484 @@ -733,7 +733,7 @@ static void netlink_overrun(struct sock *sk)
82485 sk->sk_error_report(sk);
82486 }
82487 }
82488 - atomic_inc(&sk->sk_drops);
82489 + atomic_inc_unchecked(&sk->sk_drops);
82490 }
82491
82492 static struct sock *netlink_getsockbypid(struct sock *ssk, u32 pid)
82493 @@ -1964,15 +1964,23 @@ static int netlink_seq_show(struct seq_file *seq, void *v)
82494 struct netlink_sock *nlk = nlk_sk(s);
82495
82496 seq_printf(seq, "%p %-3d %-6d %08x %-8d %-8d %p %-8d %-8d\n",
82497 +#ifdef CONFIG_GRKERNSEC_HIDESYM
82498 + NULL,
82499 +#else
82500 s,
82501 +#endif
82502 s->sk_protocol,
82503 nlk->pid,
82504 nlk->groups ? (u32)nlk->groups[0] : 0,
82505 sk_rmem_alloc_get(s),
82506 sk_wmem_alloc_get(s),
82507 +#ifdef CONFIG_GRKERNSEC_HIDESYM
82508 + NULL,
82509 +#else
82510 nlk->cb,
82511 +#endif
82512 atomic_read(&s->sk_refcnt),
82513 - atomic_read(&s->sk_drops)
82514 + atomic_read_unchecked(&s->sk_drops)
82515 );
82516
82517 }
82518 diff --git a/net/netrom/af_netrom.c b/net/netrom/af_netrom.c
82519 index 7a83495..ab0062f 100644
82520 --- a/net/netrom/af_netrom.c
82521 +++ b/net/netrom/af_netrom.c
82522 @@ -838,6 +838,7 @@ static int nr_getname(struct socket *sock, struct sockaddr *uaddr,
82523 struct sock *sk = sock->sk;
82524 struct nr_sock *nr = nr_sk(sk);
82525
82526 + memset(sax, 0, sizeof(*sax));
82527 lock_sock(sk);
82528 if (peer != 0) {
82529 if (sk->sk_state != TCP_ESTABLISHED) {
82530 @@ -852,7 +853,6 @@ static int nr_getname(struct socket *sock, struct sockaddr *uaddr,
82531 *uaddr_len = sizeof(struct full_sockaddr_ax25);
82532 } else {
82533 sax->fsa_ax25.sax25_family = AF_NETROM;
82534 - sax->fsa_ax25.sax25_ndigis = 0;
82535 sax->fsa_ax25.sax25_call = nr->source_addr;
82536 *uaddr_len = sizeof(struct sockaddr_ax25);
82537 }
82538 diff --git a/net/packet/af_packet.c b/net/packet/af_packet.c
82539 index 35cfa79..4e78ff7 100644
82540 --- a/net/packet/af_packet.c
82541 +++ b/net/packet/af_packet.c
82542 @@ -2429,7 +2429,11 @@ static int packet_seq_show(struct seq_file *seq, void *v)
82543
82544 seq_printf(seq,
82545 "%p %-6d %-4d %04x %-5d %1d %-6u %-6u %-6lu\n",
82546 +#ifdef CONFIG_GRKERNSEC_HIDESYM
82547 + NULL,
82548 +#else
82549 s,
82550 +#endif
82551 atomic_read(&s->sk_refcnt),
82552 s->sk_type,
82553 ntohs(po->num),
82554 diff --git a/net/phonet/af_phonet.c b/net/phonet/af_phonet.c
82555 index 519ff9d..a422a90 100644
82556 --- a/net/phonet/af_phonet.c
82557 +++ b/net/phonet/af_phonet.c
82558 @@ -41,7 +41,7 @@ static struct phonet_protocol *phonet_proto_get(int protocol)
82559 {
82560 struct phonet_protocol *pp;
82561
82562 - if (protocol >= PHONET_NPROTO)
82563 + if (protocol < 0 || protocol >= PHONET_NPROTO)
82564 return NULL;
82565
82566 spin_lock(&proto_tab_lock);
82567 @@ -402,7 +402,7 @@ int __init_or_module phonet_proto_register(int protocol,
82568 {
82569 int err = 0;
82570
82571 - if (protocol >= PHONET_NPROTO)
82572 + if (protocol < 0 || protocol >= PHONET_NPROTO)
82573 return -EINVAL;
82574
82575 err = proto_register(pp->prot, 1);
82576 diff --git a/net/phonet/datagram.c b/net/phonet/datagram.c
82577 index ef5c75c..2b6c2fa 100644
82578 --- a/net/phonet/datagram.c
82579 +++ b/net/phonet/datagram.c
82580 @@ -162,7 +162,7 @@ static int pn_backlog_rcv(struct sock *sk, struct sk_buff *skb)
82581 if (err < 0) {
82582 kfree_skb(skb);
82583 if (err == -ENOMEM)
82584 - atomic_inc(&sk->sk_drops);
82585 + atomic_inc_unchecked(&sk->sk_drops);
82586 }
82587 return err ? NET_RX_DROP : NET_RX_SUCCESS;
82588 }
82589 diff --git a/net/phonet/pep.c b/net/phonet/pep.c
82590 index 9cdd35e..16cd850 100644
82591 --- a/net/phonet/pep.c
82592 +++ b/net/phonet/pep.c
82593 @@ -348,7 +348,7 @@ static int pipe_do_rcv(struct sock *sk, struct sk_buff *skb)
82594
82595 case PNS_PEP_CTRL_REQ:
82596 if (skb_queue_len(&pn->ctrlreq_queue) >= PNPIPE_CTRLREQ_MAX) {
82597 - atomic_inc(&sk->sk_drops);
82598 + atomic_inc_unchecked(&sk->sk_drops);
82599 break;
82600 }
82601 __skb_pull(skb, 4);
82602 @@ -362,12 +362,12 @@ static int pipe_do_rcv(struct sock *sk, struct sk_buff *skb)
82603 if (!err)
82604 return 0;
82605 if (err == -ENOMEM)
82606 - atomic_inc(&sk->sk_drops);
82607 + atomic_inc_unchecked(&sk->sk_drops);
82608 break;
82609 }
82610
82611 if (pn->rx_credits == 0) {
82612 - atomic_inc(&sk->sk_drops);
82613 + atomic_inc_unchecked(&sk->sk_drops);
82614 err = -ENOBUFS;
82615 break;
82616 }
82617 diff --git a/net/phonet/socket.c b/net/phonet/socket.c
82618 index aa5b5a9..c09b4f8 100644
82619 --- a/net/phonet/socket.c
82620 +++ b/net/phonet/socket.c
82621 @@ -482,8 +482,13 @@ static int pn_sock_seq_show(struct seq_file *seq, void *v)
82622 sk->sk_state,
82623 sk_wmem_alloc_get(sk), sk_rmem_alloc_get(sk),
82624 sock_i_uid(sk), sock_i_ino(sk),
82625 - atomic_read(&sk->sk_refcnt), sk,
82626 - atomic_read(&sk->sk_drops), &len);
82627 + atomic_read(&sk->sk_refcnt),
82628 +#ifdef CONFIG_GRKERNSEC_HIDESYM
82629 + NULL,
82630 +#else
82631 + sk,
82632 +#endif
82633 + atomic_read_unchecked(&sk->sk_drops), &len);
82634 }
82635 seq_printf(seq, "%*s\n", 127 - len, "");
82636 return 0;
82637 diff --git a/net/rds/Kconfig b/net/rds/Kconfig
82638 index ec753b3..821187c 100644
82639 --- a/net/rds/Kconfig
82640 +++ b/net/rds/Kconfig
82641 @@ -1,7 +1,7 @@
82642
82643 config RDS
82644 tristate "The RDS Protocol (EXPERIMENTAL)"
82645 - depends on INET && EXPERIMENTAL
82646 + depends on INET && EXPERIMENTAL && BROKEN
82647 ---help---
82648 The RDS (Reliable Datagram Sockets) protocol provides reliable,
82649 sequenced delivery of datagrams over Infiniband, iWARP,
82650 diff --git a/net/rds/cong.c b/net/rds/cong.c
82651 index dd2711d..1c7ed12 100644
82652 --- a/net/rds/cong.c
82653 +++ b/net/rds/cong.c
82654 @@ -77,7 +77,7 @@
82655 * finds that the saved generation number is smaller than the global generation
82656 * number, it wakes up the process.
82657 */
82658 -static atomic_t rds_cong_generation = ATOMIC_INIT(0);
82659 +static atomic_unchecked_t rds_cong_generation = ATOMIC_INIT(0);
82660
82661 /*
82662 * Congestion monitoring
82663 @@ -232,7 +232,7 @@ void rds_cong_map_updated(struct rds_cong_map *map, uint64_t portmask)
82664 rdsdebug("waking map %p for %pI4\n",
82665 map, &map->m_addr);
82666 rds_stats_inc(s_cong_update_received);
82667 - atomic_inc(&rds_cong_generation);
82668 + atomic_inc_unchecked(&rds_cong_generation);
82669 if (waitqueue_active(&map->m_waitq))
82670 wake_up(&map->m_waitq);
82671 if (waitqueue_active(&rds_poll_waitq))
82672 @@ -258,7 +258,7 @@ EXPORT_SYMBOL_GPL(rds_cong_map_updated);
82673
82674 int rds_cong_updated_since(unsigned long *recent)
82675 {
82676 - unsigned long gen = atomic_read(&rds_cong_generation);
82677 + unsigned long gen = atomic_read_unchecked(&rds_cong_generation);
82678
82679 if (likely(*recent == gen))
82680 return 0;
82681 diff --git a/net/rds/iw_rdma.c b/net/rds/iw_rdma.c
82682 index de4a1b1..94ec861 100644
82683 --- a/net/rds/iw_rdma.c
82684 +++ b/net/rds/iw_rdma.c
82685 @@ -181,6 +181,8 @@ int rds_iw_update_cm_id(struct rds_iw_device *rds_iwdev, struct rdma_cm_id *cm_i
82686 struct rdma_cm_id *pcm_id;
82687 int rc;
82688
82689 + pax_track_stack();
82690 +
82691 src_addr = (struct sockaddr_in *)&cm_id->route.addr.src_addr;
82692 dst_addr = (struct sockaddr_in *)&cm_id->route.addr.dst_addr;
82693
82694 diff --git a/net/rds/tcp.c b/net/rds/tcp.c
82695 index b5198ae..8b9fb90 100644
82696 --- a/net/rds/tcp.c
82697 +++ b/net/rds/tcp.c
82698 @@ -57,7 +57,7 @@ void rds_tcp_nonagle(struct socket *sock)
82699 int val = 1;
82700
82701 set_fs(KERNEL_DS);
82702 - sock->ops->setsockopt(sock, SOL_TCP, TCP_NODELAY, (char __user *)&val,
82703 + sock->ops->setsockopt(sock, SOL_TCP, TCP_NODELAY, (char __force_user *)&val,
82704 sizeof(val));
82705 set_fs(oldfs);
82706 }
82707 diff --git a/net/rds/tcp_send.c b/net/rds/tcp_send.c
82708 index ab545e0..4079b3b 100644
82709 --- a/net/rds/tcp_send.c
82710 +++ b/net/rds/tcp_send.c
82711 @@ -43,7 +43,7 @@ static void rds_tcp_cork(struct socket *sock, int val)
82712
82713 oldfs = get_fs();
82714 set_fs(KERNEL_DS);
82715 - sock->ops->setsockopt(sock, SOL_TCP, TCP_CORK, (char __user *)&val,
82716 + sock->ops->setsockopt(sock, SOL_TCP, TCP_CORK, (char __force_user *)&val,
82717 sizeof(val));
82718 set_fs(oldfs);
82719 }
82720 diff --git a/net/rxrpc/af_rxrpc.c b/net/rxrpc/af_rxrpc.c
82721 index a86afce..8657bce 100644
82722 --- a/net/rxrpc/af_rxrpc.c
82723 +++ b/net/rxrpc/af_rxrpc.c
82724 @@ -38,7 +38,7 @@ static const struct proto_ops rxrpc_rpc_ops;
82725 __be32 rxrpc_epoch;
82726
82727 /* current debugging ID */
82728 -atomic_t rxrpc_debug_id;
82729 +atomic_unchecked_t rxrpc_debug_id;
82730
82731 /* count of skbs currently in use */
82732 atomic_t rxrpc_n_skbs;
82733 diff --git a/net/rxrpc/ar-ack.c b/net/rxrpc/ar-ack.c
82734 index b4a2209..539106c 100644
82735 --- a/net/rxrpc/ar-ack.c
82736 +++ b/net/rxrpc/ar-ack.c
82737 @@ -174,7 +174,7 @@ static void rxrpc_resend(struct rxrpc_call *call)
82738
82739 _enter("{%d,%d,%d,%d},",
82740 call->acks_hard, call->acks_unacked,
82741 - atomic_read(&call->sequence),
82742 + atomic_read_unchecked(&call->sequence),
82743 CIRC_CNT(call->acks_head, call->acks_tail, call->acks_winsz));
82744
82745 stop = 0;
82746 @@ -198,7 +198,7 @@ static void rxrpc_resend(struct rxrpc_call *call)
82747
82748 /* each Tx packet has a new serial number */
82749 sp->hdr.serial =
82750 - htonl(atomic_inc_return(&call->conn->serial));
82751 + htonl(atomic_inc_return_unchecked(&call->conn->serial));
82752
82753 hdr = (struct rxrpc_header *) txb->head;
82754 hdr->serial = sp->hdr.serial;
82755 @@ -401,7 +401,7 @@ static void rxrpc_rotate_tx_window(struct rxrpc_call *call, u32 hard)
82756 */
82757 static void rxrpc_clear_tx_window(struct rxrpc_call *call)
82758 {
82759 - rxrpc_rotate_tx_window(call, atomic_read(&call->sequence));
82760 + rxrpc_rotate_tx_window(call, atomic_read_unchecked(&call->sequence));
82761 }
82762
82763 /*
82764 @@ -627,7 +627,7 @@ process_further:
82765
82766 latest = ntohl(sp->hdr.serial);
82767 hard = ntohl(ack.firstPacket);
82768 - tx = atomic_read(&call->sequence);
82769 + tx = atomic_read_unchecked(&call->sequence);
82770
82771 _proto("Rx ACK %%%u { m=%hu f=#%u p=#%u s=%%%u r=%s n=%u }",
82772 latest,
82773 @@ -840,6 +840,8 @@ void rxrpc_process_call(struct work_struct *work)
82774 u32 abort_code = RX_PROTOCOL_ERROR;
82775 u8 *acks = NULL;
82776
82777 + pax_track_stack();
82778 +
82779 //printk("\n--------------------\n");
82780 _enter("{%d,%s,%lx} [%lu]",
82781 call->debug_id, rxrpc_call_states[call->state], call->events,
82782 @@ -1159,7 +1161,7 @@ void rxrpc_process_call(struct work_struct *work)
82783 goto maybe_reschedule;
82784
82785 send_ACK_with_skew:
82786 - ack.maxSkew = htons(atomic_read(&call->conn->hi_serial) -
82787 + ack.maxSkew = htons(atomic_read_unchecked(&call->conn->hi_serial) -
82788 ntohl(ack.serial));
82789 send_ACK:
82790 mtu = call->conn->trans->peer->if_mtu;
82791 @@ -1171,7 +1173,7 @@ send_ACK:
82792 ackinfo.rxMTU = htonl(5692);
82793 ackinfo.jumbo_max = htonl(4);
82794
82795 - hdr.serial = htonl(atomic_inc_return(&call->conn->serial));
82796 + hdr.serial = htonl(atomic_inc_return_unchecked(&call->conn->serial));
82797 _proto("Tx ACK %%%u { m=%hu f=#%u p=#%u s=%%%u r=%s n=%u }",
82798 ntohl(hdr.serial),
82799 ntohs(ack.maxSkew),
82800 @@ -1189,7 +1191,7 @@ send_ACK:
82801 send_message:
82802 _debug("send message");
82803
82804 - hdr.serial = htonl(atomic_inc_return(&call->conn->serial));
82805 + hdr.serial = htonl(atomic_inc_return_unchecked(&call->conn->serial));
82806 _proto("Tx %s %%%u", rxrpc_pkts[hdr.type], ntohl(hdr.serial));
82807 send_message_2:
82808
82809 diff --git a/net/rxrpc/ar-call.c b/net/rxrpc/ar-call.c
82810 index bc0019f..e1b4b24 100644
82811 --- a/net/rxrpc/ar-call.c
82812 +++ b/net/rxrpc/ar-call.c
82813 @@ -82,7 +82,7 @@ static struct rxrpc_call *rxrpc_alloc_call(gfp_t gfp)
82814 spin_lock_init(&call->lock);
82815 rwlock_init(&call->state_lock);
82816 atomic_set(&call->usage, 1);
82817 - call->debug_id = atomic_inc_return(&rxrpc_debug_id);
82818 + call->debug_id = atomic_inc_return_unchecked(&rxrpc_debug_id);
82819 call->state = RXRPC_CALL_CLIENT_SEND_REQUEST;
82820
82821 memset(&call->sock_node, 0xed, sizeof(call->sock_node));
82822 diff --git a/net/rxrpc/ar-connection.c b/net/rxrpc/ar-connection.c
82823 index 9f1ce84..ff8d061 100644
82824 --- a/net/rxrpc/ar-connection.c
82825 +++ b/net/rxrpc/ar-connection.c
82826 @@ -205,7 +205,7 @@ static struct rxrpc_connection *rxrpc_alloc_connection(gfp_t gfp)
82827 rwlock_init(&conn->lock);
82828 spin_lock_init(&conn->state_lock);
82829 atomic_set(&conn->usage, 1);
82830 - conn->debug_id = atomic_inc_return(&rxrpc_debug_id);
82831 + conn->debug_id = atomic_inc_return_unchecked(&rxrpc_debug_id);
82832 conn->avail_calls = RXRPC_MAXCALLS;
82833 conn->size_align = 4;
82834 conn->header_size = sizeof(struct rxrpc_header);
82835 diff --git a/net/rxrpc/ar-connevent.c b/net/rxrpc/ar-connevent.c
82836 index 0505cdc..f0748ce 100644
82837 --- a/net/rxrpc/ar-connevent.c
82838 +++ b/net/rxrpc/ar-connevent.c
82839 @@ -109,7 +109,7 @@ static int rxrpc_abort_connection(struct rxrpc_connection *conn,
82840
82841 len = iov[0].iov_len + iov[1].iov_len;
82842
82843 - hdr.serial = htonl(atomic_inc_return(&conn->serial));
82844 + hdr.serial = htonl(atomic_inc_return_unchecked(&conn->serial));
82845 _proto("Tx CONN ABORT %%%u { %d }", ntohl(hdr.serial), abort_code);
82846
82847 ret = kernel_sendmsg(conn->trans->local->socket, &msg, iov, 2, len);
82848 diff --git a/net/rxrpc/ar-input.c b/net/rxrpc/ar-input.c
82849 index f98c802..9e8488e 100644
82850 --- a/net/rxrpc/ar-input.c
82851 +++ b/net/rxrpc/ar-input.c
82852 @@ -339,9 +339,9 @@ void rxrpc_fast_process_packet(struct rxrpc_call *call, struct sk_buff *skb)
82853 /* track the latest serial number on this connection for ACK packet
82854 * information */
82855 serial = ntohl(sp->hdr.serial);
82856 - hi_serial = atomic_read(&call->conn->hi_serial);
82857 + hi_serial = atomic_read_unchecked(&call->conn->hi_serial);
82858 while (serial > hi_serial)
82859 - hi_serial = atomic_cmpxchg(&call->conn->hi_serial, hi_serial,
82860 + hi_serial = atomic_cmpxchg_unchecked(&call->conn->hi_serial, hi_serial,
82861 serial);
82862
82863 /* request ACK generation for any ACK or DATA packet that requests
82864 diff --git a/net/rxrpc/ar-internal.h b/net/rxrpc/ar-internal.h
82865 index 7043b29..06edcdf 100644
82866 --- a/net/rxrpc/ar-internal.h
82867 +++ b/net/rxrpc/ar-internal.h
82868 @@ -272,8 +272,8 @@ struct rxrpc_connection {
82869 int error; /* error code for local abort */
82870 int debug_id; /* debug ID for printks */
82871 unsigned call_counter; /* call ID counter */
82872 - atomic_t serial; /* packet serial number counter */
82873 - atomic_t hi_serial; /* highest serial number received */
82874 + atomic_unchecked_t serial; /* packet serial number counter */
82875 + atomic_unchecked_t hi_serial; /* highest serial number received */
82876 u8 avail_calls; /* number of calls available */
82877 u8 size_align; /* data size alignment (for security) */
82878 u8 header_size; /* rxrpc + security header size */
82879 @@ -346,7 +346,7 @@ struct rxrpc_call {
82880 spinlock_t lock;
82881 rwlock_t state_lock; /* lock for state transition */
82882 atomic_t usage;
82883 - atomic_t sequence; /* Tx data packet sequence counter */
82884 + atomic_unchecked_t sequence; /* Tx data packet sequence counter */
82885 u32 abort_code; /* local/remote abort code */
82886 enum { /* current state of call */
82887 RXRPC_CALL_CLIENT_SEND_REQUEST, /* - client sending request phase */
82888 @@ -420,7 +420,7 @@ static inline void rxrpc_abort_call(struct rxrpc_call *call, u32 abort_code)
82889 */
82890 extern atomic_t rxrpc_n_skbs;
82891 extern __be32 rxrpc_epoch;
82892 -extern atomic_t rxrpc_debug_id;
82893 +extern atomic_unchecked_t rxrpc_debug_id;
82894 extern struct workqueue_struct *rxrpc_workqueue;
82895
82896 /*
82897 diff --git a/net/rxrpc/ar-key.c b/net/rxrpc/ar-key.c
82898 index 74697b2..10f9b77 100644
82899 --- a/net/rxrpc/ar-key.c
82900 +++ b/net/rxrpc/ar-key.c
82901 @@ -88,11 +88,11 @@ static int rxrpc_instantiate_xdr_rxkad(struct key *key, const __be32 *xdr,
82902 return ret;
82903
82904 plen -= sizeof(*token);
82905 - token = kmalloc(sizeof(*token), GFP_KERNEL);
82906 + token = kzalloc(sizeof(*token), GFP_KERNEL);
82907 if (!token)
82908 return -ENOMEM;
82909
82910 - token->kad = kmalloc(plen, GFP_KERNEL);
82911 + token->kad = kzalloc(plen, GFP_KERNEL);
82912 if (!token->kad) {
82913 kfree(token);
82914 return -ENOMEM;
82915 @@ -730,10 +730,10 @@ static int rxrpc_instantiate(struct key *key, const void *data, size_t datalen)
82916 goto error;
82917
82918 ret = -ENOMEM;
82919 - token = kmalloc(sizeof(*token), GFP_KERNEL);
82920 + token = kzalloc(sizeof(*token), GFP_KERNEL);
82921 if (!token)
82922 goto error;
82923 - token->kad = kmalloc(plen, GFP_KERNEL);
82924 + token->kad = kzalloc(plen, GFP_KERNEL);
82925 if (!token->kad)
82926 goto error_free;
82927
82928 diff --git a/net/rxrpc/ar-local.c b/net/rxrpc/ar-local.c
82929 index 807535f..5b7f19e 100644
82930 --- a/net/rxrpc/ar-local.c
82931 +++ b/net/rxrpc/ar-local.c
82932 @@ -44,7 +44,7 @@ struct rxrpc_local *rxrpc_alloc_local(struct sockaddr_rxrpc *srx)
82933 spin_lock_init(&local->lock);
82934 rwlock_init(&local->services_lock);
82935 atomic_set(&local->usage, 1);
82936 - local->debug_id = atomic_inc_return(&rxrpc_debug_id);
82937 + local->debug_id = atomic_inc_return_unchecked(&rxrpc_debug_id);
82938 memcpy(&local->srx, srx, sizeof(*srx));
82939 }
82940
82941 diff --git a/net/rxrpc/ar-output.c b/net/rxrpc/ar-output.c
82942 index cc9102c..7d3888e 100644
82943 --- a/net/rxrpc/ar-output.c
82944 +++ b/net/rxrpc/ar-output.c
82945 @@ -680,9 +680,9 @@ static int rxrpc_send_data(struct kiocb *iocb,
82946 sp->hdr.cid = call->cid;
82947 sp->hdr.callNumber = call->call_id;
82948 sp->hdr.seq =
82949 - htonl(atomic_inc_return(&call->sequence));
82950 + htonl(atomic_inc_return_unchecked(&call->sequence));
82951 sp->hdr.serial =
82952 - htonl(atomic_inc_return(&conn->serial));
82953 + htonl(atomic_inc_return_unchecked(&conn->serial));
82954 sp->hdr.type = RXRPC_PACKET_TYPE_DATA;
82955 sp->hdr.userStatus = 0;
82956 sp->hdr.securityIndex = conn->security_ix;
82957 diff --git a/net/rxrpc/ar-peer.c b/net/rxrpc/ar-peer.c
82958 index edc026c..4bd4e2d 100644
82959 --- a/net/rxrpc/ar-peer.c
82960 +++ b/net/rxrpc/ar-peer.c
82961 @@ -86,7 +86,7 @@ static struct rxrpc_peer *rxrpc_alloc_peer(struct sockaddr_rxrpc *srx,
82962 INIT_LIST_HEAD(&peer->error_targets);
82963 spin_lock_init(&peer->lock);
82964 atomic_set(&peer->usage, 1);
82965 - peer->debug_id = atomic_inc_return(&rxrpc_debug_id);
82966 + peer->debug_id = atomic_inc_return_unchecked(&rxrpc_debug_id);
82967 memcpy(&peer->srx, srx, sizeof(*srx));
82968
82969 rxrpc_assess_MTU_size(peer);
82970 diff --git a/net/rxrpc/ar-proc.c b/net/rxrpc/ar-proc.c
82971 index 38047f7..9f48511 100644
82972 --- a/net/rxrpc/ar-proc.c
82973 +++ b/net/rxrpc/ar-proc.c
82974 @@ -164,8 +164,8 @@ static int rxrpc_connection_seq_show(struct seq_file *seq, void *v)
82975 atomic_read(&conn->usage),
82976 rxrpc_conn_states[conn->state],
82977 key_serial(conn->key),
82978 - atomic_read(&conn->serial),
82979 - atomic_read(&conn->hi_serial));
82980 + atomic_read_unchecked(&conn->serial),
82981 + atomic_read_unchecked(&conn->hi_serial));
82982
82983 return 0;
82984 }
82985 diff --git a/net/rxrpc/ar-transport.c b/net/rxrpc/ar-transport.c
82986 index 0936e1a..437c640 100644
82987 --- a/net/rxrpc/ar-transport.c
82988 +++ b/net/rxrpc/ar-transport.c
82989 @@ -46,7 +46,7 @@ static struct rxrpc_transport *rxrpc_alloc_transport(struct rxrpc_local *local,
82990 spin_lock_init(&trans->client_lock);
82991 rwlock_init(&trans->conn_lock);
82992 atomic_set(&trans->usage, 1);
82993 - trans->debug_id = atomic_inc_return(&rxrpc_debug_id);
82994 + trans->debug_id = atomic_inc_return_unchecked(&rxrpc_debug_id);
82995
82996 if (peer->srx.transport.family == AF_INET) {
82997 switch (peer->srx.transport_type) {
82998 diff --git a/net/rxrpc/rxkad.c b/net/rxrpc/rxkad.c
82999 index 713ac59..306f6ae 100644
83000 --- a/net/rxrpc/rxkad.c
83001 +++ b/net/rxrpc/rxkad.c
83002 @@ -210,6 +210,8 @@ static int rxkad_secure_packet_encrypt(const struct rxrpc_call *call,
83003 u16 check;
83004 int nsg;
83005
83006 + pax_track_stack();
83007 +
83008 sp = rxrpc_skb(skb);
83009
83010 _enter("");
83011 @@ -337,6 +339,8 @@ static int rxkad_verify_packet_auth(const struct rxrpc_call *call,
83012 u16 check;
83013 int nsg;
83014
83015 + pax_track_stack();
83016 +
83017 _enter("");
83018
83019 sp = rxrpc_skb(skb);
83020 @@ -609,7 +613,7 @@ static int rxkad_issue_challenge(struct rxrpc_connection *conn)
83021
83022 len = iov[0].iov_len + iov[1].iov_len;
83023
83024 - hdr.serial = htonl(atomic_inc_return(&conn->serial));
83025 + hdr.serial = htonl(atomic_inc_return_unchecked(&conn->serial));
83026 _proto("Tx CHALLENGE %%%u", ntohl(hdr.serial));
83027
83028 ret = kernel_sendmsg(conn->trans->local->socket, &msg, iov, 2, len);
83029 @@ -659,7 +663,7 @@ static int rxkad_send_response(struct rxrpc_connection *conn,
83030
83031 len = iov[0].iov_len + iov[1].iov_len + iov[2].iov_len;
83032
83033 - hdr->serial = htonl(atomic_inc_return(&conn->serial));
83034 + hdr->serial = htonl(atomic_inc_return_unchecked(&conn->serial));
83035 _proto("Tx RESPONSE %%%u", ntohl(hdr->serial));
83036
83037 ret = kernel_sendmsg(conn->trans->local->socket, &msg, iov, 3, len);
83038 diff --git a/net/sctp/auth.c b/net/sctp/auth.c
83039 index 914c419..7a16d2c 100644
83040 --- a/net/sctp/auth.c
83041 +++ b/net/sctp/auth.c
83042 @@ -81,7 +81,7 @@ static struct sctp_auth_bytes *sctp_auth_create_key(__u32 key_len, gfp_t gfp)
83043 struct sctp_auth_bytes *key;
83044
83045 /* Verify that we are not going to overflow INT_MAX */
83046 - if ((INT_MAX - key_len) < sizeof(struct sctp_auth_bytes))
83047 + if (key_len > (INT_MAX - sizeof(struct sctp_auth_bytes)))
83048 return NULL;
83049
83050 /* Allocate the shared key */
83051 diff --git a/net/sctp/proc.c b/net/sctp/proc.c
83052 index d093cbf..9fc36fc 100644
83053 --- a/net/sctp/proc.c
83054 +++ b/net/sctp/proc.c
83055 @@ -213,7 +213,12 @@ static int sctp_eps_seq_show(struct seq_file *seq, void *v)
83056 sctp_for_each_hentry(epb, node, &head->chain) {
83057 ep = sctp_ep(epb);
83058 sk = epb->sk;
83059 - seq_printf(seq, "%8p %8p %-3d %-3d %-4d %-5d %5d %5lu ", ep, sk,
83060 + seq_printf(seq, "%8p %8p %-3d %-3d %-4d %-5d %5d %5lu ",
83061 +#ifdef CONFIG_GRKERNSEC_HIDESYM
83062 + NULL, NULL,
83063 +#else
83064 + ep, sk,
83065 +#endif
83066 sctp_sk(sk)->type, sk->sk_state, hash,
83067 epb->bind_addr.port,
83068 sock_i_uid(sk), sock_i_ino(sk));
83069 @@ -320,7 +325,12 @@ static int sctp_assocs_seq_show(struct seq_file *seq, void *v)
83070 seq_printf(seq,
83071 "%8p %8p %-3d %-3d %-2d %-4d "
83072 "%4d %8d %8d %7d %5lu %-5d %5d ",
83073 - assoc, sk, sctp_sk(sk)->type, sk->sk_state,
83074 +#ifdef CONFIG_GRKERNSEC_HIDESYM
83075 + NULL, NULL,
83076 +#else
83077 + assoc, sk,
83078 +#endif
83079 + sctp_sk(sk)->type, sk->sk_state,
83080 assoc->state, hash,
83081 assoc->assoc_id,
83082 assoc->sndbuf_used,
83083 diff --git a/net/sctp/socket.c b/net/sctp/socket.c
83084 index 3a95fcb..c40fc1d 100644
83085 --- a/net/sctp/socket.c
83086 +++ b/net/sctp/socket.c
83087 @@ -5802,7 +5802,6 @@ pp_found:
83088 */
83089 int reuse = sk->sk_reuse;
83090 struct sock *sk2;
83091 - struct hlist_node *node;
83092
83093 SCTP_DEBUG_PRINTK("sctp_get_port() found a possible match\n");
83094 if (pp->fastreuse && sk->sk_reuse &&
83095 diff --git a/net/socket.c b/net/socket.c
83096 index d449812..4ac08d3c 100644
83097 --- a/net/socket.c
83098 +++ b/net/socket.c
83099 @@ -87,6 +87,7 @@
83100 #include <linux/wireless.h>
83101 #include <linux/nsproxy.h>
83102 #include <linux/magic.h>
83103 +#include <linux/in.h>
83104
83105 #include <asm/uaccess.h>
83106 #include <asm/unistd.h>
83107 @@ -97,6 +98,21 @@
83108 #include <net/sock.h>
83109 #include <linux/netfilter.h>
83110
83111 +extern void gr_attach_curr_ip(const struct sock *sk);
83112 +extern int gr_handle_sock_all(const int family, const int type,
83113 + const int protocol);
83114 +extern int gr_handle_sock_server(const struct sockaddr *sck);
83115 +extern int gr_handle_sock_server_other(const struct sock *sck);
83116 +extern int gr_handle_sock_client(const struct sockaddr *sck);
83117 +extern int gr_search_connect(struct socket * sock,
83118 + struct sockaddr_in * addr);
83119 +extern int gr_search_bind(struct socket * sock,
83120 + struct sockaddr_in * addr);
83121 +extern int gr_search_listen(struct socket * sock);
83122 +extern int gr_search_accept(struct socket * sock);
83123 +extern int gr_search_socket(const int domain, const int type,
83124 + const int protocol);
83125 +
83126 static int sock_no_open(struct inode *irrelevant, struct file *dontcare);
83127 static ssize_t sock_aio_read(struct kiocb *iocb, const struct iovec *iov,
83128 unsigned long nr_segs, loff_t pos);
83129 @@ -298,7 +314,7 @@ static int sockfs_get_sb(struct file_system_type *fs_type,
83130 mnt);
83131 }
83132
83133 -static struct vfsmount *sock_mnt __read_mostly;
83134 +struct vfsmount *sock_mnt __read_mostly;
83135
83136 static struct file_system_type sock_fs_type = {
83137 .name = "sockfs",
83138 @@ -1154,6 +1170,8 @@ static int __sock_create(struct net *net, int family, int type, int protocol,
83139 return -EAFNOSUPPORT;
83140 if (type < 0 || type >= SOCK_MAX)
83141 return -EINVAL;
83142 + if (protocol < 0)
83143 + return -EINVAL;
83144
83145 /* Compatibility.
83146
83147 @@ -1283,6 +1301,16 @@ SYSCALL_DEFINE3(socket, int, family, int, type, int, protocol)
83148 if (SOCK_NONBLOCK != O_NONBLOCK && (flags & SOCK_NONBLOCK))
83149 flags = (flags & ~SOCK_NONBLOCK) | O_NONBLOCK;
83150
83151 + if(!gr_search_socket(family, type, protocol)) {
83152 + retval = -EACCES;
83153 + goto out;
83154 + }
83155 +
83156 + if (gr_handle_sock_all(family, type, protocol)) {
83157 + retval = -EACCES;
83158 + goto out;
83159 + }
83160 +
83161 retval = sock_create(family, type, protocol, &sock);
83162 if (retval < 0)
83163 goto out;
83164 @@ -1415,6 +1443,14 @@ SYSCALL_DEFINE3(bind, int, fd, struct sockaddr __user *, umyaddr, int, addrlen)
83165 if (sock) {
83166 err = move_addr_to_kernel(umyaddr, addrlen, (struct sockaddr *)&address);
83167 if (err >= 0) {
83168 + if (gr_handle_sock_server((struct sockaddr *)&address)) {
83169 + err = -EACCES;
83170 + goto error;
83171 + }
83172 + err = gr_search_bind(sock, (struct sockaddr_in *)&address);
83173 + if (err)
83174 + goto error;
83175 +
83176 err = security_socket_bind(sock,
83177 (struct sockaddr *)&address,
83178 addrlen);
83179 @@ -1423,6 +1459,7 @@ SYSCALL_DEFINE3(bind, int, fd, struct sockaddr __user *, umyaddr, int, addrlen)
83180 (struct sockaddr *)
83181 &address, addrlen);
83182 }
83183 +error:
83184 fput_light(sock->file, fput_needed);
83185 }
83186 return err;
83187 @@ -1446,10 +1483,20 @@ SYSCALL_DEFINE2(listen, int, fd, int, backlog)
83188 if ((unsigned)backlog > somaxconn)
83189 backlog = somaxconn;
83190
83191 + if (gr_handle_sock_server_other(sock->sk)) {
83192 + err = -EPERM;
83193 + goto error;
83194 + }
83195 +
83196 + err = gr_search_listen(sock);
83197 + if (err)
83198 + goto error;
83199 +
83200 err = security_socket_listen(sock, backlog);
83201 if (!err)
83202 err = sock->ops->listen(sock, backlog);
83203
83204 +error:
83205 fput_light(sock->file, fput_needed);
83206 }
83207 return err;
83208 @@ -1492,6 +1539,18 @@ SYSCALL_DEFINE4(accept4, int, fd, struct sockaddr __user *, upeer_sockaddr,
83209 newsock->type = sock->type;
83210 newsock->ops = sock->ops;
83211
83212 + if (gr_handle_sock_server_other(sock->sk)) {
83213 + err = -EPERM;
83214 + sock_release(newsock);
83215 + goto out_put;
83216 + }
83217 +
83218 + err = gr_search_accept(sock);
83219 + if (err) {
83220 + sock_release(newsock);
83221 + goto out_put;
83222 + }
83223 +
83224 /*
83225 * We don't need try_module_get here, as the listening socket (sock)
83226 * has the protocol module (sock->ops->owner) held.
83227 @@ -1534,6 +1593,8 @@ SYSCALL_DEFINE4(accept4, int, fd, struct sockaddr __user *, upeer_sockaddr,
83228 fd_install(newfd, newfile);
83229 err = newfd;
83230
83231 + gr_attach_curr_ip(newsock->sk);
83232 +
83233 out_put:
83234 fput_light(sock->file, fput_needed);
83235 out:
83236 @@ -1571,6 +1632,7 @@ SYSCALL_DEFINE3(connect, int, fd, struct sockaddr __user *, uservaddr,
83237 int, addrlen)
83238 {
83239 struct socket *sock;
83240 + struct sockaddr *sck;
83241 struct sockaddr_storage address;
83242 int err, fput_needed;
83243
83244 @@ -1581,6 +1643,17 @@ SYSCALL_DEFINE3(connect, int, fd, struct sockaddr __user *, uservaddr,
83245 if (err < 0)
83246 goto out_put;
83247
83248 + sck = (struct sockaddr *)&address;
83249 +
83250 + if (gr_handle_sock_client(sck)) {
83251 + err = -EACCES;
83252 + goto out_put;
83253 + }
83254 +
83255 + err = gr_search_connect(sock, (struct sockaddr_in *)sck);
83256 + if (err)
83257 + goto out_put;
83258 +
83259 err =
83260 security_socket_connect(sock, (struct sockaddr *)&address, addrlen);
83261 if (err)
83262 @@ -1882,6 +1955,8 @@ SYSCALL_DEFINE3(sendmsg, int, fd, struct msghdr __user *, msg, unsigned, flags)
83263 int err, ctl_len, iov_size, total_len;
83264 int fput_needed;
83265
83266 + pax_track_stack();
83267 +
83268 err = -EFAULT;
83269 if (MSG_CMSG_COMPAT & flags) {
83270 if (get_compat_msghdr(&msg_sys, msg_compat))
83271 @@ -2022,7 +2097,7 @@ SYSCALL_DEFINE3(recvmsg, int, fd, struct msghdr __user *, msg,
83272 * kernel msghdr to use the kernel address space)
83273 */
83274
83275 - uaddr = (__force void __user *)msg_sys.msg_name;
83276 + uaddr = (void __force_user *)msg_sys.msg_name;
83277 uaddr_len = COMPAT_NAMELEN(msg);
83278 if (MSG_CMSG_COMPAT & flags) {
83279 err = verify_compat_iovec(&msg_sys, iov,
83280 diff --git a/net/sunrpc/sched.c b/net/sunrpc/sched.c
83281 index ac94477..8afe5c3 100644
83282 --- a/net/sunrpc/sched.c
83283 +++ b/net/sunrpc/sched.c
83284 @@ -234,10 +234,10 @@ static int rpc_wait_bit_killable(void *word)
83285 #ifdef RPC_DEBUG
83286 static void rpc_task_set_debuginfo(struct rpc_task *task)
83287 {
83288 - static atomic_t rpc_pid;
83289 + static atomic_unchecked_t rpc_pid;
83290
83291 task->tk_magic = RPC_TASK_MAGIC_ID;
83292 - task->tk_pid = atomic_inc_return(&rpc_pid);
83293 + task->tk_pid = atomic_inc_return_unchecked(&rpc_pid);
83294 }
83295 #else
83296 static inline void rpc_task_set_debuginfo(struct rpc_task *task)
83297 diff --git a/net/sunrpc/xprtrdma/svc_rdma.c b/net/sunrpc/xprtrdma/svc_rdma.c
83298 index 35fb68b..236a8bf 100644
83299 --- a/net/sunrpc/xprtrdma/svc_rdma.c
83300 +++ b/net/sunrpc/xprtrdma/svc_rdma.c
83301 @@ -59,15 +59,15 @@ unsigned int svcrdma_max_req_size = RPCRDMA_MAX_REQ_SIZE;
83302 static unsigned int min_max_inline = 4096;
83303 static unsigned int max_max_inline = 65536;
83304
83305 -atomic_t rdma_stat_recv;
83306 -atomic_t rdma_stat_read;
83307 -atomic_t rdma_stat_write;
83308 -atomic_t rdma_stat_sq_starve;
83309 -atomic_t rdma_stat_rq_starve;
83310 -atomic_t rdma_stat_rq_poll;
83311 -atomic_t rdma_stat_rq_prod;
83312 -atomic_t rdma_stat_sq_poll;
83313 -atomic_t rdma_stat_sq_prod;
83314 +atomic_unchecked_t rdma_stat_recv;
83315 +atomic_unchecked_t rdma_stat_read;
83316 +atomic_unchecked_t rdma_stat_write;
83317 +atomic_unchecked_t rdma_stat_sq_starve;
83318 +atomic_unchecked_t rdma_stat_rq_starve;
83319 +atomic_unchecked_t rdma_stat_rq_poll;
83320 +atomic_unchecked_t rdma_stat_rq_prod;
83321 +atomic_unchecked_t rdma_stat_sq_poll;
83322 +atomic_unchecked_t rdma_stat_sq_prod;
83323
83324 /* Temporary NFS request map and context caches */
83325 struct kmem_cache *svc_rdma_map_cachep;
83326 @@ -105,7 +105,7 @@ static int read_reset_stat(ctl_table *table, int write,
83327 len -= *ppos;
83328 if (len > *lenp)
83329 len = *lenp;
83330 - if (len && copy_to_user(buffer, str_buf, len))
83331 + if (len > sizeof str_buf || (len && copy_to_user(buffer, str_buf, len)))
83332 return -EFAULT;
83333 *lenp = len;
83334 *ppos += len;
83335 @@ -149,63 +149,63 @@ static ctl_table svcrdma_parm_table[] = {
83336 {
83337 .procname = "rdma_stat_read",
83338 .data = &rdma_stat_read,
83339 - .maxlen = sizeof(atomic_t),
83340 + .maxlen = sizeof(atomic_unchecked_t),
83341 .mode = 0644,
83342 .proc_handler = &read_reset_stat,
83343 },
83344 {
83345 .procname = "rdma_stat_recv",
83346 .data = &rdma_stat_recv,
83347 - .maxlen = sizeof(atomic_t),
83348 + .maxlen = sizeof(atomic_unchecked_t),
83349 .mode = 0644,
83350 .proc_handler = &read_reset_stat,
83351 },
83352 {
83353 .procname = "rdma_stat_write",
83354 .data = &rdma_stat_write,
83355 - .maxlen = sizeof(atomic_t),
83356 + .maxlen = sizeof(atomic_unchecked_t),
83357 .mode = 0644,
83358 .proc_handler = &read_reset_stat,
83359 },
83360 {
83361 .procname = "rdma_stat_sq_starve",
83362 .data = &rdma_stat_sq_starve,
83363 - .maxlen = sizeof(atomic_t),
83364 + .maxlen = sizeof(atomic_unchecked_t),
83365 .mode = 0644,
83366 .proc_handler = &read_reset_stat,
83367 },
83368 {
83369 .procname = "rdma_stat_rq_starve",
83370 .data = &rdma_stat_rq_starve,
83371 - .maxlen = sizeof(atomic_t),
83372 + .maxlen = sizeof(atomic_unchecked_t),
83373 .mode = 0644,
83374 .proc_handler = &read_reset_stat,
83375 },
83376 {
83377 .procname = "rdma_stat_rq_poll",
83378 .data = &rdma_stat_rq_poll,
83379 - .maxlen = sizeof(atomic_t),
83380 + .maxlen = sizeof(atomic_unchecked_t),
83381 .mode = 0644,
83382 .proc_handler = &read_reset_stat,
83383 },
83384 {
83385 .procname = "rdma_stat_rq_prod",
83386 .data = &rdma_stat_rq_prod,
83387 - .maxlen = sizeof(atomic_t),
83388 + .maxlen = sizeof(atomic_unchecked_t),
83389 .mode = 0644,
83390 .proc_handler = &read_reset_stat,
83391 },
83392 {
83393 .procname = "rdma_stat_sq_poll",
83394 .data = &rdma_stat_sq_poll,
83395 - .maxlen = sizeof(atomic_t),
83396 + .maxlen = sizeof(atomic_unchecked_t),
83397 .mode = 0644,
83398 .proc_handler = &read_reset_stat,
83399 },
83400 {
83401 .procname = "rdma_stat_sq_prod",
83402 .data = &rdma_stat_sq_prod,
83403 - .maxlen = sizeof(atomic_t),
83404 + .maxlen = sizeof(atomic_unchecked_t),
83405 .mode = 0644,
83406 .proc_handler = &read_reset_stat,
83407 },
83408 diff --git a/net/sunrpc/xprtrdma/svc_rdma_recvfrom.c b/net/sunrpc/xprtrdma/svc_rdma_recvfrom.c
83409 index 9e88438..8ed5cf0 100644
83410 --- a/net/sunrpc/xprtrdma/svc_rdma_recvfrom.c
83411 +++ b/net/sunrpc/xprtrdma/svc_rdma_recvfrom.c
83412 @@ -495,7 +495,7 @@ next_sge:
83413 svc_rdma_put_context(ctxt, 0);
83414 goto out;
83415 }
83416 - atomic_inc(&rdma_stat_read);
83417 + atomic_inc_unchecked(&rdma_stat_read);
83418
83419 if (read_wr.num_sge < chl_map->ch[ch_no].count) {
83420 chl_map->ch[ch_no].count -= read_wr.num_sge;
83421 @@ -606,7 +606,7 @@ int svc_rdma_recvfrom(struct svc_rqst *rqstp)
83422 dto_q);
83423 list_del_init(&ctxt->dto_q);
83424 } else {
83425 - atomic_inc(&rdma_stat_rq_starve);
83426 + atomic_inc_unchecked(&rdma_stat_rq_starve);
83427 clear_bit(XPT_DATA, &xprt->xpt_flags);
83428 ctxt = NULL;
83429 }
83430 @@ -626,7 +626,7 @@ int svc_rdma_recvfrom(struct svc_rqst *rqstp)
83431 dprintk("svcrdma: processing ctxt=%p on xprt=%p, rqstp=%p, status=%d\n",
83432 ctxt, rdma_xprt, rqstp, ctxt->wc_status);
83433 BUG_ON(ctxt->wc_status != IB_WC_SUCCESS);
83434 - atomic_inc(&rdma_stat_recv);
83435 + atomic_inc_unchecked(&rdma_stat_recv);
83436
83437 /* Build up the XDR from the receive buffers. */
83438 rdma_build_arg_xdr(rqstp, ctxt, ctxt->byte_len);
83439 diff --git a/net/sunrpc/xprtrdma/svc_rdma_sendto.c b/net/sunrpc/xprtrdma/svc_rdma_sendto.c
83440 index f11be72..7aad4e8 100644
83441 --- a/net/sunrpc/xprtrdma/svc_rdma_sendto.c
83442 +++ b/net/sunrpc/xprtrdma/svc_rdma_sendto.c
83443 @@ -328,7 +328,7 @@ static int send_write(struct svcxprt_rdma *xprt, struct svc_rqst *rqstp,
83444 write_wr.wr.rdma.remote_addr = to;
83445
83446 /* Post It */
83447 - atomic_inc(&rdma_stat_write);
83448 + atomic_inc_unchecked(&rdma_stat_write);
83449 if (svc_rdma_send(xprt, &write_wr))
83450 goto err;
83451 return 0;
83452 diff --git a/net/sunrpc/xprtrdma/svc_rdma_transport.c b/net/sunrpc/xprtrdma/svc_rdma_transport.c
83453 index 3fa5751..030ba89 100644
83454 --- a/net/sunrpc/xprtrdma/svc_rdma_transport.c
83455 +++ b/net/sunrpc/xprtrdma/svc_rdma_transport.c
83456 @@ -292,7 +292,7 @@ static void rq_cq_reap(struct svcxprt_rdma *xprt)
83457 return;
83458
83459 ib_req_notify_cq(xprt->sc_rq_cq, IB_CQ_NEXT_COMP);
83460 - atomic_inc(&rdma_stat_rq_poll);
83461 + atomic_inc_unchecked(&rdma_stat_rq_poll);
83462
83463 while ((ret = ib_poll_cq(xprt->sc_rq_cq, 1, &wc)) > 0) {
83464 ctxt = (struct svc_rdma_op_ctxt *)(unsigned long)wc.wr_id;
83465 @@ -314,7 +314,7 @@ static void rq_cq_reap(struct svcxprt_rdma *xprt)
83466 }
83467
83468 if (ctxt)
83469 - atomic_inc(&rdma_stat_rq_prod);
83470 + atomic_inc_unchecked(&rdma_stat_rq_prod);
83471
83472 set_bit(XPT_DATA, &xprt->sc_xprt.xpt_flags);
83473 /*
83474 @@ -386,7 +386,7 @@ static void sq_cq_reap(struct svcxprt_rdma *xprt)
83475 return;
83476
83477 ib_req_notify_cq(xprt->sc_sq_cq, IB_CQ_NEXT_COMP);
83478 - atomic_inc(&rdma_stat_sq_poll);
83479 + atomic_inc_unchecked(&rdma_stat_sq_poll);
83480 while ((ret = ib_poll_cq(cq, 1, &wc)) > 0) {
83481 if (wc.status != IB_WC_SUCCESS)
83482 /* Close the transport */
83483 @@ -404,7 +404,7 @@ static void sq_cq_reap(struct svcxprt_rdma *xprt)
83484 }
83485
83486 if (ctxt)
83487 - atomic_inc(&rdma_stat_sq_prod);
83488 + atomic_inc_unchecked(&rdma_stat_sq_prod);
83489 }
83490
83491 static void sq_comp_handler(struct ib_cq *cq, void *cq_context)
83492 @@ -1260,7 +1260,7 @@ int svc_rdma_send(struct svcxprt_rdma *xprt, struct ib_send_wr *wr)
83493 spin_lock_bh(&xprt->sc_lock);
83494 if (xprt->sc_sq_depth < atomic_read(&xprt->sc_sq_count) + wr_count) {
83495 spin_unlock_bh(&xprt->sc_lock);
83496 - atomic_inc(&rdma_stat_sq_starve);
83497 + atomic_inc_unchecked(&rdma_stat_sq_starve);
83498
83499 /* See if we can opportunistically reap SQ WR to make room */
83500 sq_cq_reap(xprt);
83501 diff --git a/net/sysctl_net.c b/net/sysctl_net.c
83502 index 0b15d72..7934fbb 100644
83503 --- a/net/sysctl_net.c
83504 +++ b/net/sysctl_net.c
83505 @@ -46,7 +46,7 @@ static int net_ctl_permissions(struct ctl_table_root *root,
83506 struct ctl_table *table)
83507 {
83508 /* Allow network administrator to have same access as root. */
83509 - if (capable(CAP_NET_ADMIN)) {
83510 + if (capable_nolog(CAP_NET_ADMIN)) {
83511 int mode = (table->mode >> 6) & 7;
83512 return (mode << 6) | (mode << 3) | mode;
83513 }
83514 diff --git a/net/tipc/link.c b/net/tipc/link.c
83515 index dd4c18b..f40d38d 100644
83516 --- a/net/tipc/link.c
83517 +++ b/net/tipc/link.c
83518 @@ -1418,7 +1418,7 @@ again:
83519
83520 if (!sect_rest) {
83521 sect_rest = msg_sect[++curr_sect].iov_len;
83522 - sect_crs = (const unchar *)msg_sect[curr_sect].iov_base;
83523 + sect_crs = (const unchar __user *)msg_sect[curr_sect].iov_base;
83524 }
83525
83526 if (sect_rest < fragm_rest)
83527 @@ -1437,7 +1437,7 @@ error:
83528 }
83529 } else
83530 skb_copy_to_linear_data_offset(buf, fragm_crs,
83531 - sect_crs, sz);
83532 + (const void __force_kernel *)sect_crs, sz);
83533 sect_crs += sz;
83534 sect_rest -= sz;
83535 fragm_crs += sz;
83536 diff --git a/net/tipc/subscr.c b/net/tipc/subscr.c
83537 index 0747d8a..e8bf3f3 100644
83538 --- a/net/tipc/subscr.c
83539 +++ b/net/tipc/subscr.c
83540 @@ -104,7 +104,7 @@ static void subscr_send_event(struct subscription *sub,
83541 {
83542 struct iovec msg_sect;
83543
83544 - msg_sect.iov_base = (void *)&sub->evt;
83545 + msg_sect.iov_base = (void __force_user *)&sub->evt;
83546 msg_sect.iov_len = sizeof(struct tipc_event);
83547
83548 sub->evt.event = htohl(event, sub->swap);
83549 diff --git a/net/unix/af_unix.c b/net/unix/af_unix.c
83550 index db8d51a..608692d 100644
83551 --- a/net/unix/af_unix.c
83552 +++ b/net/unix/af_unix.c
83553 @@ -745,6 +745,12 @@ static struct sock *unix_find_other(struct net *net,
83554 err = -ECONNREFUSED;
83555 if (!S_ISSOCK(inode->i_mode))
83556 goto put_fail;
83557 +
83558 + if (!gr_acl_handle_unix(path.dentry, path.mnt)) {
83559 + err = -EACCES;
83560 + goto put_fail;
83561 + }
83562 +
83563 u = unix_find_socket_byinode(net, inode);
83564 if (!u)
83565 goto put_fail;
83566 @@ -765,6 +771,13 @@ static struct sock *unix_find_other(struct net *net,
83567 if (u) {
83568 struct dentry *dentry;
83569 dentry = unix_sk(u)->dentry;
83570 +
83571 + if (!gr_handle_chroot_unix(u->sk_peercred.pid)) {
83572 + err = -EPERM;
83573 + sock_put(u);
83574 + goto fail;
83575 + }
83576 +
83577 if (dentry)
83578 touch_atime(unix_sk(u)->mnt, dentry);
83579 } else
83580 @@ -850,11 +863,18 @@ static int unix_bind(struct socket *sock, struct sockaddr *uaddr, int addr_len)
83581 err = security_path_mknod(&nd.path, dentry, mode, 0);
83582 if (err)
83583 goto out_mknod_drop_write;
83584 + if (!gr_acl_handle_mknod(dentry, nd.path.dentry, nd.path.mnt, mode)) {
83585 + err = -EACCES;
83586 + goto out_mknod_drop_write;
83587 + }
83588 err = vfs_mknod(nd.path.dentry->d_inode, dentry, mode, 0);
83589 out_mknod_drop_write:
83590 mnt_drop_write(nd.path.mnt);
83591 if (err)
83592 goto out_mknod_dput;
83593 +
83594 + gr_handle_create(dentry, nd.path.mnt);
83595 +
83596 mutex_unlock(&nd.path.dentry->d_inode->i_mutex);
83597 dput(nd.path.dentry);
83598 nd.path.dentry = dentry;
83599 @@ -2211,7 +2231,11 @@ static int unix_seq_show(struct seq_file *seq, void *v)
83600 unix_state_lock(s);
83601
83602 seq_printf(seq, "%p: %08X %08X %08X %04X %02X %5lu",
83603 +#ifdef CONFIG_GRKERNSEC_HIDESYM
83604 + NULL,
83605 +#else
83606 s,
83607 +#endif
83608 atomic_read(&s->sk_refcnt),
83609 0,
83610 s->sk_state == TCP_LISTEN ? __SO_ACCEPTCON : 0,
83611 diff --git a/net/wireless/core.h b/net/wireless/core.h
83612 index 376798f..109a61f 100644
83613 --- a/net/wireless/core.h
83614 +++ b/net/wireless/core.h
83615 @@ -27,7 +27,7 @@ struct cfg80211_registered_device {
83616 struct mutex mtx;
83617
83618 /* rfkill support */
83619 - struct rfkill_ops rfkill_ops;
83620 + rfkill_ops_no_const rfkill_ops;
83621 struct rfkill *rfkill;
83622 struct work_struct rfkill_sync;
83623
83624 diff --git a/net/wireless/wext.c b/net/wireless/wext.c
83625 index a2e4c60..0979cbe 100644
83626 --- a/net/wireless/wext.c
83627 +++ b/net/wireless/wext.c
83628 @@ -816,8 +816,7 @@ static int ioctl_standard_iw_point(struct iw_point *iwp, unsigned int cmd,
83629 */
83630
83631 /* Support for very large requests */
83632 - if ((descr->flags & IW_DESCR_FLAG_NOMAX) &&
83633 - (user_length > descr->max_tokens)) {
83634 + if (user_length > descr->max_tokens) {
83635 /* Allow userspace to GET more than max so
83636 * we can support any size GET requests.
83637 * There is still a limit : -ENOMEM.
83638 @@ -854,22 +853,6 @@ static int ioctl_standard_iw_point(struct iw_point *iwp, unsigned int cmd,
83639 }
83640 }
83641
83642 - if (IW_IS_GET(cmd) && !(descr->flags & IW_DESCR_FLAG_NOMAX)) {
83643 - /*
83644 - * If this is a GET, but not NOMAX, it means that the extra
83645 - * data is not bounded by userspace, but by max_tokens. Thus
83646 - * set the length to max_tokens. This matches the extra data
83647 - * allocation.
83648 - * The driver should fill it with the number of tokens it
83649 - * provided, and it may check iwp->length rather than having
83650 - * knowledge of max_tokens. If the driver doesn't change the
83651 - * iwp->length, this ioctl just copies back max_token tokens
83652 - * filled with zeroes. Hopefully the driver isn't claiming
83653 - * them to be valid data.
83654 - */
83655 - iwp->length = descr->max_tokens;
83656 - }
83657 -
83658 err = handler(dev, info, (union iwreq_data *) iwp, extra);
83659
83660 iwp->length += essid_compat;
83661 diff --git a/net/xfrm/xfrm_policy.c b/net/xfrm/xfrm_policy.c
83662 index cb81ca3..e15d49a 100644
83663 --- a/net/xfrm/xfrm_policy.c
83664 +++ b/net/xfrm/xfrm_policy.c
83665 @@ -586,7 +586,7 @@ int xfrm_policy_insert(int dir, struct xfrm_policy *policy, int excl)
83666 hlist_add_head(&policy->bydst, chain);
83667 xfrm_pol_hold(policy);
83668 net->xfrm.policy_count[dir]++;
83669 - atomic_inc(&flow_cache_genid);
83670 + atomic_inc_unchecked(&flow_cache_genid);
83671 if (delpol)
83672 __xfrm_policy_unlink(delpol, dir);
83673 policy->index = delpol ? delpol->index : xfrm_gen_index(net, dir);
83674 @@ -669,7 +669,7 @@ struct xfrm_policy *xfrm_policy_bysel_ctx(struct net *net, u8 type, int dir,
83675 write_unlock_bh(&xfrm_policy_lock);
83676
83677 if (ret && delete) {
83678 - atomic_inc(&flow_cache_genid);
83679 + atomic_inc_unchecked(&flow_cache_genid);
83680 xfrm_policy_kill(ret);
83681 }
83682 return ret;
83683 @@ -710,7 +710,7 @@ struct xfrm_policy *xfrm_policy_byid(struct net *net, u8 type, int dir, u32 id,
83684 write_unlock_bh(&xfrm_policy_lock);
83685
83686 if (ret && delete) {
83687 - atomic_inc(&flow_cache_genid);
83688 + atomic_inc_unchecked(&flow_cache_genid);
83689 xfrm_policy_kill(ret);
83690 }
83691 return ret;
83692 @@ -824,7 +824,7 @@ int xfrm_policy_flush(struct net *net, u8 type, struct xfrm_audit *audit_info)
83693 }
83694
83695 }
83696 - atomic_inc(&flow_cache_genid);
83697 + atomic_inc_unchecked(&flow_cache_genid);
83698 out:
83699 write_unlock_bh(&xfrm_policy_lock);
83700 return err;
83701 @@ -1088,7 +1088,7 @@ int xfrm_policy_delete(struct xfrm_policy *pol, int dir)
83702 write_unlock_bh(&xfrm_policy_lock);
83703 if (pol) {
83704 if (dir < XFRM_POLICY_MAX)
83705 - atomic_inc(&flow_cache_genid);
83706 + atomic_inc_unchecked(&flow_cache_genid);
83707 xfrm_policy_kill(pol);
83708 return 0;
83709 }
83710 @@ -1477,7 +1477,7 @@ free_dst:
83711 goto out;
83712 }
83713
83714 -static int inline
83715 +static inline int
83716 xfrm_dst_alloc_copy(void **target, void *src, int size)
83717 {
83718 if (!*target) {
83719 @@ -1489,7 +1489,7 @@ xfrm_dst_alloc_copy(void **target, void *src, int size)
83720 return 0;
83721 }
83722
83723 -static int inline
83724 +static inline int
83725 xfrm_dst_update_parent(struct dst_entry *dst, struct xfrm_selector *sel)
83726 {
83727 #ifdef CONFIG_XFRM_SUB_POLICY
83728 @@ -1501,7 +1501,7 @@ xfrm_dst_update_parent(struct dst_entry *dst, struct xfrm_selector *sel)
83729 #endif
83730 }
83731
83732 -static int inline
83733 +static inline int
83734 xfrm_dst_update_origin(struct dst_entry *dst, struct flowi *fl)
83735 {
83736 #ifdef CONFIG_XFRM_SUB_POLICY
83737 @@ -1537,7 +1537,7 @@ int __xfrm_lookup(struct net *net, struct dst_entry **dst_p, struct flowi *fl,
83738 u8 dir = policy_to_flow_dir(XFRM_POLICY_OUT);
83739
83740 restart:
83741 - genid = atomic_read(&flow_cache_genid);
83742 + genid = atomic_read_unchecked(&flow_cache_genid);
83743 policy = NULL;
83744 for (pi = 0; pi < ARRAY_SIZE(pols); pi++)
83745 pols[pi] = NULL;
83746 @@ -1680,7 +1680,7 @@ restart:
83747 goto error;
83748 }
83749 if (nx == -EAGAIN ||
83750 - genid != atomic_read(&flow_cache_genid)) {
83751 + genid != atomic_read_unchecked(&flow_cache_genid)) {
83752 xfrm_pols_put(pols, npols);
83753 goto restart;
83754 }
83755 diff --git a/net/xfrm/xfrm_user.c b/net/xfrm/xfrm_user.c
83756 index b95a2d6..85c4d78 100644
83757 --- a/net/xfrm/xfrm_user.c
83758 +++ b/net/xfrm/xfrm_user.c
83759 @@ -1169,6 +1169,8 @@ static int copy_to_user_tmpl(struct xfrm_policy *xp, struct sk_buff *skb)
83760 struct xfrm_user_tmpl vec[XFRM_MAX_DEPTH];
83761 int i;
83762
83763 + pax_track_stack();
83764 +
83765 if (xp->xfrm_nr == 0)
83766 return 0;
83767
83768 @@ -1784,6 +1786,8 @@ static int xfrm_do_migrate(struct sk_buff *skb, struct nlmsghdr *nlh,
83769 int err;
83770 int n = 0;
83771
83772 + pax_track_stack();
83773 +
83774 if (attrs[XFRMA_MIGRATE] == NULL)
83775 return -EINVAL;
83776
83777 diff --git a/samples/kobject/kset-example.c b/samples/kobject/kset-example.c
83778 index 45b7d56..19e828c 100644
83779 --- a/samples/kobject/kset-example.c
83780 +++ b/samples/kobject/kset-example.c
83781 @@ -87,7 +87,7 @@ static ssize_t foo_attr_store(struct kobject *kobj,
83782 }
83783
83784 /* Our custom sysfs_ops that we will associate with our ktype later on */
83785 -static struct sysfs_ops foo_sysfs_ops = {
83786 +static const struct sysfs_ops foo_sysfs_ops = {
83787 .show = foo_attr_show,
83788 .store = foo_attr_store,
83789 };
83790 diff --git a/scripts/Makefile.build b/scripts/Makefile.build
83791 index 341b589..405aed3 100644
83792 --- a/scripts/Makefile.build
83793 +++ b/scripts/Makefile.build
83794 @@ -59,7 +59,7 @@ endif
83795 endif
83796
83797 # Do not include host rules unless needed
83798 -ifneq ($(hostprogs-y)$(hostprogs-m),)
83799 +ifneq ($(hostprogs-y)$(hostprogs-m)$(hostlibs-y)$(hostlibs-m),)
83800 include scripts/Makefile.host
83801 endif
83802
83803 diff --git a/scripts/Makefile.clean b/scripts/Makefile.clean
83804 index 6f89fbb..53adc9c 100644
83805 --- a/scripts/Makefile.clean
83806 +++ b/scripts/Makefile.clean
83807 @@ -43,7 +43,8 @@ subdir-ymn := $(addprefix $(obj)/,$(subdir-ymn))
83808 __clean-files := $(extra-y) $(always) \
83809 $(targets) $(clean-files) \
83810 $(host-progs) \
83811 - $(hostprogs-y) $(hostprogs-m) $(hostprogs-)
83812 + $(hostprogs-y) $(hostprogs-m) $(hostprogs-) \
83813 + $(hostlibs-y) $(hostlibs-m) $(hostlibs-)
83814
83815 # as clean-files is given relative to the current directory, this adds
83816 # a $(obj) prefix, except for absolute paths
83817 diff --git a/scripts/Makefile.host b/scripts/Makefile.host
83818 index 1ac414f..a1c1451 100644
83819 --- a/scripts/Makefile.host
83820 +++ b/scripts/Makefile.host
83821 @@ -31,6 +31,7 @@
83822 # Note: Shared libraries consisting of C++ files are not supported
83823
83824 __hostprogs := $(sort $(hostprogs-y) $(hostprogs-m))
83825 +__hostlibs := $(sort $(hostlibs-y) $(hostlibs-m))
83826
83827 # C code
83828 # Executables compiled from a single .c file
83829 @@ -54,6 +55,7 @@ host-cxxobjs := $(sort $(foreach m,$(host-cxxmulti),$($(m)-cxxobjs)))
83830 # Shared libaries (only .c supported)
83831 # Shared libraries (.so) - all .so files referenced in "xxx-objs"
83832 host-cshlib := $(sort $(filter %.so, $(host-cobjs)))
83833 +host-cshlib += $(sort $(filter %.so, $(__hostlibs)))
83834 # Remove .so files from "xxx-objs"
83835 host-cobjs := $(filter-out %.so,$(host-cobjs))
83836
83837 diff --git a/scripts/basic/fixdep.c b/scripts/basic/fixdep.c
83838 index 6bf21f8..c0546b3 100644
83839 --- a/scripts/basic/fixdep.c
83840 +++ b/scripts/basic/fixdep.c
83841 @@ -162,7 +162,7 @@ static void grow_config(int len)
83842 /*
83843 * Lookup a value in the configuration string.
83844 */
83845 -static int is_defined_config(const char * name, int len)
83846 +static int is_defined_config(const char * name, unsigned int len)
83847 {
83848 const char * pconfig;
83849 const char * plast = str_config + len_config - len;
83850 @@ -199,7 +199,7 @@ static void clear_config(void)
83851 /*
83852 * Record the use of a CONFIG_* word.
83853 */
83854 -static void use_config(char *m, int slen)
83855 +static void use_config(char *m, unsigned int slen)
83856 {
83857 char s[PATH_MAX];
83858 char *p;
83859 @@ -222,9 +222,9 @@ static void use_config(char *m, int slen)
83860
83861 static void parse_config_file(char *map, size_t len)
83862 {
83863 - int *end = (int *) (map + len);
83864 + unsigned int *end = (unsigned int *) (map + len);
83865 /* start at +1, so that p can never be < map */
83866 - int *m = (int *) map + 1;
83867 + unsigned int *m = (unsigned int *) map + 1;
83868 char *p, *q;
83869
83870 for (; m < end; m++) {
83871 @@ -371,7 +371,7 @@ static void print_deps(void)
83872 static void traps(void)
83873 {
83874 static char test[] __attribute__((aligned(sizeof(int)))) = "CONF";
83875 - int *p = (int *)test;
83876 + unsigned int *p = (unsigned int *)test;
83877
83878 if (*p != INT_CONF) {
83879 fprintf(stderr, "fixdep: sizeof(int) != 4 or wrong endianess? %#x\n",
83880 diff --git a/scripts/gcc-plugin.sh b/scripts/gcc-plugin.sh
83881 new file mode 100644
83882 index 0000000..8729101
83883 --- /dev/null
83884 +++ b/scripts/gcc-plugin.sh
83885 @@ -0,0 +1,2 @@
83886 +#!/bin/sh
83887 +echo -e "#include \"gcc-plugin.h\"\n#include \"tree.h\"\n#include \"tm.h\"\n#include \"rtl.h\"" | $1 -x c -shared - -o /dev/null -I`$2 -print-file-name=plugin`/include >/dev/null 2>&1 && echo "y"
83888 diff --git a/scripts/mod/file2alias.c b/scripts/mod/file2alias.c
83889 index 62a9025..65b82ad 100644
83890 --- a/scripts/mod/file2alias.c
83891 +++ b/scripts/mod/file2alias.c
83892 @@ -72,7 +72,7 @@ static void device_id_check(const char *modname, const char *device_id,
83893 unsigned long size, unsigned long id_size,
83894 void *symval)
83895 {
83896 - int i;
83897 + unsigned int i;
83898
83899 if (size % id_size || size < id_size) {
83900 if (cross_build != 0)
83901 @@ -102,7 +102,7 @@ static void device_id_check(const char *modname, const char *device_id,
83902 /* USB is special because the bcdDevice can be matched against a numeric range */
83903 /* Looks like "usb:vNpNdNdcNdscNdpNicNiscNipN" */
83904 static void do_usb_entry(struct usb_device_id *id,
83905 - unsigned int bcdDevice_initial, int bcdDevice_initial_digits,
83906 + unsigned int bcdDevice_initial, unsigned int bcdDevice_initial_digits,
83907 unsigned char range_lo, unsigned char range_hi,
83908 struct module *mod)
83909 {
83910 @@ -151,7 +151,7 @@ static void do_usb_entry_multi(struct usb_device_id *id, struct module *mod)
83911 {
83912 unsigned int devlo, devhi;
83913 unsigned char chi, clo;
83914 - int ndigits;
83915 + unsigned int ndigits;
83916
83917 id->match_flags = TO_NATIVE(id->match_flags);
83918 id->idVendor = TO_NATIVE(id->idVendor);
83919 @@ -368,7 +368,7 @@ static void do_pnp_device_entry(void *symval, unsigned long size,
83920 for (i = 0; i < count; i++) {
83921 const char *id = (char *)devs[i].id;
83922 char acpi_id[sizeof(devs[0].id)];
83923 - int j;
83924 + unsigned int j;
83925
83926 buf_printf(&mod->dev_table_buf,
83927 "MODULE_ALIAS(\"pnp:d%s*\");\n", id);
83928 @@ -398,7 +398,7 @@ static void do_pnp_card_entries(void *symval, unsigned long size,
83929
83930 for (j = 0; j < PNP_MAX_DEVICES; j++) {
83931 const char *id = (char *)card->devs[j].id;
83932 - int i2, j2;
83933 + unsigned int i2, j2;
83934 int dup = 0;
83935
83936 if (!id[0])
83937 @@ -424,7 +424,7 @@ static void do_pnp_card_entries(void *symval, unsigned long size,
83938 /* add an individual alias for every device entry */
83939 if (!dup) {
83940 char acpi_id[sizeof(card->devs[0].id)];
83941 - int k;
83942 + unsigned int k;
83943
83944 buf_printf(&mod->dev_table_buf,
83945 "MODULE_ALIAS(\"pnp:d%s*\");\n", id);
83946 @@ -699,7 +699,7 @@ static void dmi_ascii_filter(char *d, const char *s)
83947 static int do_dmi_entry(const char *filename, struct dmi_system_id *id,
83948 char *alias)
83949 {
83950 - int i, j;
83951 + unsigned int i, j;
83952
83953 sprintf(alias, "dmi*");
83954
83955 diff --git a/scripts/mod/modpost.c b/scripts/mod/modpost.c
83956 index 03efeab..0888989 100644
83957 --- a/scripts/mod/modpost.c
83958 +++ b/scripts/mod/modpost.c
83959 @@ -835,6 +835,7 @@ enum mismatch {
83960 INIT_TO_EXIT,
83961 EXIT_TO_INIT,
83962 EXPORT_TO_INIT_EXIT,
83963 + DATA_TO_TEXT
83964 };
83965
83966 struct sectioncheck {
83967 @@ -920,6 +921,12 @@ const struct sectioncheck sectioncheck[] = {
83968 .fromsec = { "__ksymtab*", NULL },
83969 .tosec = { INIT_SECTIONS, EXIT_SECTIONS, NULL },
83970 .mismatch = EXPORT_TO_INIT_EXIT
83971 +},
83972 +/* Do not reference code from writable data */
83973 +{
83974 + .fromsec = { DATA_SECTIONS, NULL },
83975 + .tosec = { TEXT_SECTIONS, NULL },
83976 + .mismatch = DATA_TO_TEXT
83977 }
83978 };
83979
83980 @@ -1024,10 +1031,10 @@ static Elf_Sym *find_elf_symbol(struct elf_info *elf, Elf64_Sword addr,
83981 continue;
83982 if (ELF_ST_TYPE(sym->st_info) == STT_SECTION)
83983 continue;
83984 - if (sym->st_value == addr)
83985 - return sym;
83986 /* Find a symbol nearby - addr are maybe negative */
83987 d = sym->st_value - addr;
83988 + if (d == 0)
83989 + return sym;
83990 if (d < 0)
83991 d = addr - sym->st_value;
83992 if (d < distance) {
83993 @@ -1268,6 +1275,14 @@ static void report_sec_mismatch(const char *modname, enum mismatch mismatch,
83994 "Fix this by removing the %sannotation of %s "
83995 "or drop the export.\n",
83996 tosym, sec2annotation(tosec), sec2annotation(tosec), tosym);
83997 + case DATA_TO_TEXT:
83998 +/*
83999 + fprintf(stderr,
84000 + "The variable %s references\n"
84001 + "the %s %s%s%s\n",
84002 + fromsym, to, sec2annotation(tosec), tosym, to_p);
84003 +*/
84004 + break;
84005 case NO_MISMATCH:
84006 /* To get warnings on missing members */
84007 break;
84008 @@ -1495,7 +1510,7 @@ static void section_rel(const char *modname, struct elf_info *elf,
84009 static void check_sec_ref(struct module *mod, const char *modname,
84010 struct elf_info *elf)
84011 {
84012 - int i;
84013 + unsigned int i;
84014 Elf_Shdr *sechdrs = elf->sechdrs;
84015
84016 /* Walk through all sections */
84017 @@ -1651,7 +1666,7 @@ void __attribute__((format(printf, 2, 3))) buf_printf(struct buffer *buf,
84018 va_end(ap);
84019 }
84020
84021 -void buf_write(struct buffer *buf, const char *s, int len)
84022 +void buf_write(struct buffer *buf, const char *s, unsigned int len)
84023 {
84024 if (buf->size - buf->pos < len) {
84025 buf->size += len + SZ;
84026 @@ -1863,7 +1878,7 @@ static void write_if_changed(struct buffer *b, const char *fname)
84027 if (fstat(fileno(file), &st) < 0)
84028 goto close_write;
84029
84030 - if (st.st_size != b->pos)
84031 + if (st.st_size != (off_t)b->pos)
84032 goto close_write;
84033
84034 tmp = NOFAIL(malloc(b->pos));
84035 diff --git a/scripts/mod/modpost.h b/scripts/mod/modpost.h
84036 index 09f58e3..4b66092 100644
84037 --- a/scripts/mod/modpost.h
84038 +++ b/scripts/mod/modpost.h
84039 @@ -92,15 +92,15 @@ void *do_nofail(void *ptr, const char *expr);
84040
84041 struct buffer {
84042 char *p;
84043 - int pos;
84044 - int size;
84045 + unsigned int pos;
84046 + unsigned int size;
84047 };
84048
84049 void __attribute__((format(printf, 2, 3)))
84050 buf_printf(struct buffer *buf, const char *fmt, ...);
84051
84052 void
84053 -buf_write(struct buffer *buf, const char *s, int len);
84054 +buf_write(struct buffer *buf, const char *s, unsigned int len);
84055
84056 struct module {
84057 struct module *next;
84058 diff --git a/scripts/mod/sumversion.c b/scripts/mod/sumversion.c
84059 index ecf9c7d..d52b38e 100644
84060 --- a/scripts/mod/sumversion.c
84061 +++ b/scripts/mod/sumversion.c
84062 @@ -455,7 +455,7 @@ static void write_version(const char *filename, const char *sum,
84063 goto out;
84064 }
84065
84066 - if (write(fd, sum, strlen(sum)+1) != strlen(sum)+1) {
84067 + if (write(fd, sum, strlen(sum)+1) != (ssize_t)strlen(sum)+1) {
84068 warn("writing sum in %s failed: %s\n",
84069 filename, strerror(errno));
84070 goto out;
84071 diff --git a/scripts/package/mkspec b/scripts/package/mkspec
84072 index 47bdd2f..d4d4e93 100755
84073 --- a/scripts/package/mkspec
84074 +++ b/scripts/package/mkspec
84075 @@ -70,7 +70,7 @@ echo 'mkdir -p $RPM_BUILD_ROOT/boot $RPM_BUILD_ROOT/lib/modules'
84076 echo 'mkdir -p $RPM_BUILD_ROOT/lib/firmware'
84077 echo "%endif"
84078
84079 -echo 'INSTALL_MOD_PATH=$RPM_BUILD_ROOT make %{_smp_mflags} KBUILD_SRC= modules_install'
84080 +echo 'INSTALL_MOD_PATH=$RPM_BUILD_ROOT make %{?_smp_mflags} KBUILD_SRC= modules_install'
84081 echo "%ifarch ia64"
84082 echo 'cp $KBUILD_IMAGE $RPM_BUILD_ROOT'"/boot/efi/vmlinuz-$KERNELRELEASE"
84083 echo 'ln -s '"efi/vmlinuz-$KERNELRELEASE" '$RPM_BUILD_ROOT'"/boot/"
84084 diff --git a/scripts/pnmtologo.c b/scripts/pnmtologo.c
84085 index 5c11312..72742b5 100644
84086 --- a/scripts/pnmtologo.c
84087 +++ b/scripts/pnmtologo.c
84088 @@ -237,14 +237,14 @@ static void write_header(void)
84089 fprintf(out, " * Linux logo %s\n", logoname);
84090 fputs(" */\n\n", out);
84091 fputs("#include <linux/linux_logo.h>\n\n", out);
84092 - fprintf(out, "static unsigned char %s_data[] __initdata = {\n",
84093 + fprintf(out, "static unsigned char %s_data[] = {\n",
84094 logoname);
84095 }
84096
84097 static void write_footer(void)
84098 {
84099 fputs("\n};\n\n", out);
84100 - fprintf(out, "const struct linux_logo %s __initconst = {\n", logoname);
84101 + fprintf(out, "const struct linux_logo %s = {\n", logoname);
84102 fprintf(out, "\t.type\t\t= %s,\n", logo_types[logo_type]);
84103 fprintf(out, "\t.width\t\t= %d,\n", logo_width);
84104 fprintf(out, "\t.height\t\t= %d,\n", logo_height);
84105 @@ -374,7 +374,7 @@ static void write_logo_clut224(void)
84106 fputs("\n};\n\n", out);
84107
84108 /* write logo clut */
84109 - fprintf(out, "static unsigned char %s_clut[] __initdata = {\n",
84110 + fprintf(out, "static unsigned char %s_clut[] = {\n",
84111 logoname);
84112 write_hex_cnt = 0;
84113 for (i = 0; i < logo_clutsize; i++) {
84114 diff --git a/scripts/tags.sh b/scripts/tags.sh
84115 index d52f7a0..269eb1b 100755
84116 --- a/scripts/tags.sh
84117 +++ b/scripts/tags.sh
84118 @@ -93,6 +93,11 @@ docscope()
84119 cscope -b -f cscope.out
84120 }
84121
84122 +dogtags()
84123 +{
84124 + all_sources | gtags -f -
84125 +}
84126 +
84127 exuberant()
84128 {
84129 all_sources | xargs $1 -a \
84130 @@ -164,6 +169,10 @@ case "$1" in
84131 docscope
84132 ;;
84133
84134 + "gtags")
84135 + dogtags
84136 + ;;
84137 +
84138 "tags")
84139 rm -f tags
84140 xtags ctags
84141 diff --git a/security/Kconfig b/security/Kconfig
84142 index fb363cd..0524cf3 100644
84143 --- a/security/Kconfig
84144 +++ b/security/Kconfig
84145 @@ -4,6 +4,625 @@
84146
84147 menu "Security options"
84148
84149 +source grsecurity/Kconfig
84150 +
84151 +menu "PaX"
84152 +
84153 + config ARCH_TRACK_EXEC_LIMIT
84154 + bool
84155 +
84156 + config PAX_KERNEXEC_PLUGIN
84157 + bool
84158 +
84159 + config PAX_PER_CPU_PGD
84160 + bool
84161 +
84162 + config TASK_SIZE_MAX_SHIFT
84163 + int
84164 + depends on X86_64
84165 + default 47 if !PAX_PER_CPU_PGD
84166 + default 42 if PAX_PER_CPU_PGD
84167 +
84168 + config PAX_ENABLE_PAE
84169 + bool
84170 + default y if (X86_32 && (MPENTIUM4 || MK8 || MPSC || MCORE2 || MATOM))
84171 +
84172 +config PAX
84173 + bool "Enable various PaX features"
84174 + depends on GRKERNSEC && (ALPHA || ARM || AVR32 || IA64 || MIPS || PARISC || PPC || SPARC || X86)
84175 + help
84176 + This allows you to enable various PaX features. PaX adds
84177 + intrusion prevention mechanisms to the kernel that reduce
84178 + the risks posed by exploitable memory corruption bugs.
84179 +
84180 +menu "PaX Control"
84181 + depends on PAX
84182 +
84183 +config PAX_SOFTMODE
84184 + bool 'Support soft mode'
84185 + help
84186 + Enabling this option will allow you to run PaX in soft mode, that
84187 + is, PaX features will not be enforced by default, only on executables
84188 + marked explicitly. You must also enable PT_PAX_FLAGS or XATTR_PAX_FLAGS
84189 + support as they are the only way to mark executables for soft mode use.
84190 +
84191 + Soft mode can be activated by using the "pax_softmode=1" kernel command
84192 + line option on boot. Furthermore you can control various PaX features
84193 + at runtime via the entries in /proc/sys/kernel/pax.
84194 +
84195 +config PAX_EI_PAX
84196 + bool 'Use legacy ELF header marking'
84197 + help
84198 + Enabling this option will allow you to control PaX features on
84199 + a per executable basis via the 'chpax' utility available at
84200 + http://pax.grsecurity.net/. The control flags will be read from
84201 + an otherwise reserved part of the ELF header. This marking has
84202 + numerous drawbacks (no support for soft-mode, toolchain does not
84203 + know about the non-standard use of the ELF header) therefore it
84204 + has been deprecated in favour of PT_PAX_FLAGS and XATTR_PAX_FLAGS
84205 + support.
84206 +
84207 + If you have applications not marked by the PT_PAX_FLAGS ELF program
84208 + header and you cannot use XATTR_PAX_FLAGS then you MUST enable this
84209 + option otherwise they will not get any protection.
84210 +
84211 + Note that if you enable PT_PAX_FLAGS or XATTR_PAX_FLAGS marking
84212 + support as well, they will override the legacy EI_PAX marks.
84213 +
84214 +config PAX_PT_PAX_FLAGS
84215 + bool 'Use ELF program header marking'
84216 + help
84217 + Enabling this option will allow you to control PaX features on
84218 + a per executable basis via the 'paxctl' utility available at
84219 + http://pax.grsecurity.net/. The control flags will be read from
84220 + a PaX specific ELF program header (PT_PAX_FLAGS). This marking
84221 + has the benefits of supporting both soft mode and being fully
84222 + integrated into the toolchain (the binutils patch is available
84223 + from http://pax.grsecurity.net).
84224 +
84225 + If you have applications not marked by the PT_PAX_FLAGS ELF program
84226 + header then you MUST enable either XATTR_PAX_FLAGS or EI_PAX marking
84227 + support otherwise they will not get any protection.
84228 +
84229 + If you enable both PT_PAX_FLAGS and XATTR_PAX_FLAGS support then you
84230 + must make sure that the marks are the same if a binary has both marks.
84231 +
84232 + Note that if you enable the legacy EI_PAX marking support as well,
84233 + the EI_PAX marks will be overridden by the PT_PAX_FLAGS marks.
84234 +
84235 +config PAX_XATTR_PAX_FLAGS
84236 + bool 'Use filesystem extended attributes marking'
84237 + depends on EXPERT
84238 + select CIFS_XATTR if CIFS
84239 + select EXT2_FS_XATTR if EXT2_FS
84240 + select EXT3_FS_XATTR if EXT3_FS
84241 + select EXT4_FS_XATTR if EXT4_FS
84242 + select JFFS2_FS_XATTR if JFFS2_FS
84243 + select REISERFS_FS_XATTR if REISERFS_FS
84244 + select UBIFS_FS_XATTR if UBIFS_FS
84245 + help
84246 + Enabling this option will allow you to control PaX features on
84247 + a per executable basis via the 'setfattr' utility. The control
84248 + flags will be read from the user.pax.flags extended attribute of
84249 + the file. This marking has the benefit of supporting binary-only
84250 + applications that self-check themselves (e.g., skype) and would
84251 + not tolerate chpax/paxctl changes. The main drawback is that
84252 + extended attributes are not supported by some filesystems (e.g.,
84253 + isofs, squashfs, tmpfs, udf, vfat) so copying files through such
84254 + filesystems will lose the extended attributes and these PaX markings.
84255 +
84256 + If you have applications not marked by the PT_PAX_FLAGS ELF program
84257 + header then you MUST enable either XATTR_PAX_FLAGS or EI_PAX marking
84258 + support otherwise they will not get any protection.
84259 +
84260 + If you enable both PT_PAX_FLAGS and XATTR_PAX_FLAGS support then you
84261 + must make sure that the marks are the same if a binary has both marks.
84262 +
84263 + Note that if you enable the legacy EI_PAX marking support as well,
84264 + the EI_PAX marks will be overridden by the XATTR_PAX_FLAGS marks.
84265 +
84266 +choice
84267 + prompt 'MAC system integration'
84268 + default PAX_HAVE_ACL_FLAGS
84269 + help
84270 + Mandatory Access Control systems have the option of controlling
84271 + PaX flags on a per executable basis, choose the method supported
84272 + by your particular system.
84273 +
84274 + - "none": if your MAC system does not interact with PaX,
84275 + - "direct": if your MAC system defines pax_set_initial_flags() itself,
84276 + - "hook": if your MAC system uses the pax_set_initial_flags_func callback.
84277 +
84278 + NOTE: this option is for developers/integrators only.
84279 +
84280 + config PAX_NO_ACL_FLAGS
84281 + bool 'none'
84282 +
84283 + config PAX_HAVE_ACL_FLAGS
84284 + bool 'direct'
84285 +
84286 + config PAX_HOOK_ACL_FLAGS
84287 + bool 'hook'
84288 +endchoice
84289 +
84290 +endmenu
84291 +
84292 +menu "Non-executable pages"
84293 + depends on PAX
84294 +
84295 +config PAX_NOEXEC
84296 + bool "Enforce non-executable pages"
84297 + depends on ALPHA || (ARM && (CPU_V6 || CPU_V7)) || IA64 || MIPS || PARISC || PPC || S390 || SPARC || X86
84298 + help
84299 + By design some architectures do not allow for protecting memory
84300 + pages against execution or even if they do, Linux does not make
84301 + use of this feature. In practice this means that if a page is
84302 + readable (such as the stack or heap) it is also executable.
84303 +
84304 + There is a well known exploit technique that makes use of this
84305 + fact and a common programming mistake where an attacker can
84306 + introduce code of his choice somewhere in the attacked program's
84307 + memory (typically the stack or the heap) and then execute it.
84308 +
84309 + If the attacked program was running with different (typically
84310 + higher) privileges than that of the attacker, then he can elevate
84311 + his own privilege level (e.g. get a root shell, write to files for
84312 + which he does not have write access to, etc).
84313 +
84314 + Enabling this option will let you choose from various features
84315 + that prevent the injection and execution of 'foreign' code in
84316 + a program.
84317 +
84318 + This will also break programs that rely on the old behaviour and
84319 + expect that dynamically allocated memory via the malloc() family
84320 + of functions is executable (which it is not). Notable examples
84321 + are the XFree86 4.x server, the java runtime and wine.
84322 +
84323 +config PAX_PAGEEXEC
84324 + bool "Paging based non-executable pages"
84325 + 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)
84326 + select S390_SWITCH_AMODE if S390
84327 + select S390_EXEC_PROTECT if S390
84328 + select ARCH_TRACK_EXEC_LIMIT if X86_32
84329 + help
84330 + This implementation is based on the paging feature of the CPU.
84331 + On i386 without hardware non-executable bit support there is a
84332 + variable but usually low performance impact, however on Intel's
84333 + P4 core based CPUs it is very high so you should not enable this
84334 + for kernels meant to be used on such CPUs.
84335 +
84336 + On alpha, avr32, ia64, parisc, sparc, sparc64, x86_64 and i386
84337 + with hardware non-executable bit support there is no performance
84338 + impact, on ppc the impact is negligible.
84339 +
84340 + Note that several architectures require various emulations due to
84341 + badly designed userland ABIs, this will cause a performance impact
84342 + but will disappear as soon as userland is fixed. For example, ppc
84343 + userland MUST have been built with secure-plt by a recent toolchain.
84344 +
84345 +config PAX_SEGMEXEC
84346 + bool "Segmentation based non-executable pages"
84347 + depends on PAX_NOEXEC && X86_32
84348 + help
84349 + This implementation is based on the segmentation feature of the
84350 + CPU and has a very small performance impact, however applications
84351 + will be limited to a 1.5 GB address space instead of the normal
84352 + 3 GB.
84353 +
84354 +config PAX_EMUTRAMP
84355 + bool "Emulate trampolines" if (PAX_PAGEEXEC || PAX_SEGMEXEC) && (PARISC || X86)
84356 + default y if PARISC
84357 + help
84358 + There are some programs and libraries that for one reason or
84359 + another attempt to execute special small code snippets from
84360 + non-executable memory pages. Most notable examples are the
84361 + signal handler return code generated by the kernel itself and
84362 + the GCC trampolines.
84363 +
84364 + If you enabled CONFIG_PAX_PAGEEXEC or CONFIG_PAX_SEGMEXEC then
84365 + such programs will no longer work under your kernel.
84366 +
84367 + As a remedy you can say Y here and use the 'chpax' or 'paxctl'
84368 + utilities to enable trampoline emulation for the affected programs
84369 + yet still have the protection provided by the non-executable pages.
84370 +
84371 + On parisc you MUST enable this option and EMUSIGRT as well, otherwise
84372 + your system will not even boot.
84373 +
84374 + Alternatively you can say N here and use the 'chpax' or 'paxctl'
84375 + utilities to disable CONFIG_PAX_PAGEEXEC and CONFIG_PAX_SEGMEXEC
84376 + for the affected files.
84377 +
84378 + NOTE: enabling this feature *may* open up a loophole in the
84379 + protection provided by non-executable pages that an attacker
84380 + could abuse. Therefore the best solution is to not have any
84381 + files on your system that would require this option. This can
84382 + be achieved by not using libc5 (which relies on the kernel
84383 + signal handler return code) and not using or rewriting programs
84384 + that make use of the nested function implementation of GCC.
84385 + Skilled users can just fix GCC itself so that it implements
84386 + nested function calls in a way that does not interfere with PaX.
84387 +
84388 +config PAX_EMUSIGRT
84389 + bool "Automatically emulate sigreturn trampolines"
84390 + depends on PAX_EMUTRAMP && PARISC
84391 + default y
84392 + help
84393 + Enabling this option will have the kernel automatically detect
84394 + and emulate signal return trampolines executing on the stack
84395 + that would otherwise lead to task termination.
84396 +
84397 + This solution is intended as a temporary one for users with
84398 + legacy versions of libc (libc5, glibc 2.0, uClibc before 0.9.17,
84399 + Modula-3 runtime, etc) or executables linked to such, basically
84400 + everything that does not specify its own SA_RESTORER function in
84401 + normal executable memory like glibc 2.1+ does.
84402 +
84403 + On parisc you MUST enable this option, otherwise your system will
84404 + not even boot.
84405 +
84406 + NOTE: this feature cannot be disabled on a per executable basis
84407 + and since it *does* open up a loophole in the protection provided
84408 + by non-executable pages, the best solution is to not have any
84409 + files on your system that would require this option.
84410 +
84411 +config PAX_MPROTECT
84412 + bool "Restrict mprotect()"
84413 + depends on (PAX_PAGEEXEC || PAX_SEGMEXEC)
84414 + help
84415 + Enabling this option will prevent programs from
84416 + - changing the executable status of memory pages that were
84417 + not originally created as executable,
84418 + - making read-only executable pages writable again,
84419 + - creating executable pages from anonymous memory,
84420 + - making read-only-after-relocations (RELRO) data pages writable again.
84421 +
84422 + You should say Y here to complete the protection provided by
84423 + the enforcement of non-executable pages.
84424 +
84425 + NOTE: you can use the 'chpax' or 'paxctl' utilities to control
84426 + this feature on a per file basis.
84427 +
84428 +config PAX_MPROTECT_COMPAT
84429 + bool "Use legacy/compat protection demoting (read help)"
84430 + depends on PAX_MPROTECT
84431 + default n
84432 + help
84433 + The current implementation of PAX_MPROTECT denies RWX allocations/mprotects
84434 + by sending the proper error code to the application. For some broken
84435 + userland, this can cause problems with Python or other applications. The
84436 + current implementation however allows for applications like clamav to
84437 + detect if JIT compilation/execution is allowed and to fall back gracefully
84438 + to an interpreter-based mode if it does not. While we encourage everyone
84439 + to use the current implementation as-is and push upstream to fix broken
84440 + userland (note that the RWX logging option can assist with this), in some
84441 + environments this may not be possible. Having to disable MPROTECT
84442 + completely on certain binaries reduces the security benefit of PaX,
84443 + so this option is provided for those environments to revert to the old
84444 + behavior.
84445 +
84446 +config PAX_ELFRELOCS
84447 + bool "Allow ELF text relocations (read help)"
84448 + depends on PAX_MPROTECT
84449 + default n
84450 + help
84451 + Non-executable pages and mprotect() restrictions are effective
84452 + in preventing the introduction of new executable code into an
84453 + attacked task's address space. There remain only two venues
84454 + for this kind of attack: if the attacker can execute already
84455 + existing code in the attacked task then he can either have it
84456 + create and mmap() a file containing his code or have it mmap()
84457 + an already existing ELF library that does not have position
84458 + independent code in it and use mprotect() on it to make it
84459 + writable and copy his code there. While protecting against
84460 + the former approach is beyond PaX, the latter can be prevented
84461 + by having only PIC ELF libraries on one's system (which do not
84462 + need to relocate their code). If you are sure this is your case,
84463 + as is the case with all modern Linux distributions, then leave
84464 + this option disabled. You should say 'n' here.
84465 +
84466 +config PAX_ETEXECRELOCS
84467 + bool "Allow ELF ET_EXEC text relocations"
84468 + depends on PAX_MPROTECT && (ALPHA || IA64 || PARISC)
84469 + select PAX_ELFRELOCS
84470 + default y
84471 + help
84472 + On some architectures there are incorrectly created applications
84473 + that require text relocations and would not work without enabling
84474 + this option. If you are an alpha, ia64 or parisc user, you should
84475 + enable this option and disable it once you have made sure that
84476 + none of your applications need it.
84477 +
84478 +config PAX_EMUPLT
84479 + bool "Automatically emulate ELF PLT"
84480 + depends on PAX_MPROTECT && (ALPHA || PARISC || SPARC)
84481 + default y
84482 + help
84483 + Enabling this option will have the kernel automatically detect
84484 + and emulate the Procedure Linkage Table entries in ELF files.
84485 + On some architectures such entries are in writable memory, and
84486 + become non-executable leading to task termination. Therefore
84487 + it is mandatory that you enable this option on alpha, parisc,
84488 + sparc and sparc64, otherwise your system would not even boot.
84489 +
84490 + NOTE: this feature *does* open up a loophole in the protection
84491 + provided by the non-executable pages, therefore the proper
84492 + solution is to modify the toolchain to produce a PLT that does
84493 + not need to be writable.
84494 +
84495 +config PAX_DLRESOLVE
84496 + bool 'Emulate old glibc resolver stub'
84497 + depends on PAX_EMUPLT && SPARC
84498 + default n
84499 + help
84500 + This option is needed if userland has an old glibc (before 2.4)
84501 + that puts a 'save' instruction into the runtime generated resolver
84502 + stub that needs special emulation.
84503 +
84504 +config PAX_KERNEXEC
84505 + bool "Enforce non-executable kernel pages"
84506 + depends on (PPC || X86) && (!X86_32 || X86_WP_WORKS_OK) && !XEN
84507 + select PAX_PER_CPU_PGD if X86_64 || (X86_32 && X86_PAE)
84508 + select PAX_KERNEXEC_PLUGIN if X86_64
84509 + help
84510 + This is the kernel land equivalent of PAGEEXEC and MPROTECT,
84511 + that is, enabling this option will make it harder to inject
84512 + and execute 'foreign' code in kernel memory itself.
84513 +
84514 + Note that on x86_64 kernels there is a known regression when
84515 + this feature and KVM/VMX are both enabled in the host kernel.
84516 +
84517 +choice
84518 + prompt "Return Address Instrumentation Method"
84519 + default PAX_KERNEXEC_PLUGIN_METHOD_BTS
84520 + depends on PAX_KERNEXEC_PLUGIN
84521 + help
84522 + Select the method used to instrument function pointer dereferences.
84523 + Note that binary modules cannot be instrumented by this approach.
84524 +
84525 + config PAX_KERNEXEC_PLUGIN_METHOD_BTS
84526 + bool "bts"
84527 + help
84528 + This method is compatible with binary only modules but has
84529 + a higher runtime overhead.
84530 +
84531 + config PAX_KERNEXEC_PLUGIN_METHOD_OR
84532 + bool "or"
84533 + depends on !PARAVIRT
84534 + help
84535 + This method is incompatible with binary only modules but has
84536 + a lower runtime overhead.
84537 +endchoice
84538 +
84539 +config PAX_KERNEXEC_PLUGIN_METHOD
84540 + string
84541 + default "bts" if PAX_KERNEXEC_PLUGIN_METHOD_BTS
84542 + default "or" if PAX_KERNEXEC_PLUGIN_METHOD_OR
84543 + default ""
84544 +
84545 +config PAX_KERNEXEC_MODULE_TEXT
84546 + int "Minimum amount of memory reserved for module code"
84547 + default "4"
84548 + depends on PAX_KERNEXEC && X86_32 && MODULES
84549 + help
84550 + Due to implementation details the kernel must reserve a fixed
84551 + amount of memory for module code at compile time that cannot be
84552 + changed at runtime. Here you can specify the minimum amount
84553 + in MB that will be reserved. Due to the same implementation
84554 + details this size will always be rounded up to the next 2/4 MB
84555 + boundary (depends on PAE) so the actually available memory for
84556 + module code will usually be more than this minimum.
84557 +
84558 + The default 4 MB should be enough for most users but if you have
84559 + an excessive number of modules (e.g., most distribution configs
84560 + compile many drivers as modules) or use huge modules such as
84561 + nvidia's kernel driver, you will need to adjust this amount.
84562 + A good rule of thumb is to look at your currently loaded kernel
84563 + modules and add up their sizes.
84564 +
84565 +endmenu
84566 +
84567 +menu "Address Space Layout Randomization"
84568 + depends on PAX
84569 +
84570 +config PAX_ASLR
84571 + bool "Address Space Layout Randomization"
84572 + help
84573 + Many if not most exploit techniques rely on the knowledge of
84574 + certain addresses in the attacked program. The following options
84575 + will allow the kernel to apply a certain amount of randomization
84576 + to specific parts of the program thereby forcing an attacker to
84577 + guess them in most cases. Any failed guess will most likely crash
84578 + the attacked program which allows the kernel to detect such attempts
84579 + and react on them. PaX itself provides no reaction mechanisms,
84580 + instead it is strongly encouraged that you make use of Nergal's
84581 + segvguard (ftp://ftp.pl.openwall.com/misc/segvguard/) or grsecurity's
84582 + (http://www.grsecurity.net/) built-in crash detection features or
84583 + develop one yourself.
84584 +
84585 + By saying Y here you can choose to randomize the following areas:
84586 + - top of the task's kernel stack
84587 + - top of the task's userland stack
84588 + - base address for mmap() requests that do not specify one
84589 + (this includes all libraries)
84590 + - base address of the main executable
84591 +
84592 + It is strongly recommended to say Y here as address space layout
84593 + randomization has negligible impact on performance yet it provides
84594 + a very effective protection.
84595 +
84596 + NOTE: you can use the 'chpax' or 'paxctl' utilities to control
84597 + this feature on a per file basis.
84598 +
84599 +config PAX_RANDKSTACK
84600 + bool "Randomize kernel stack base"
84601 + depends on X86_TSC && X86
84602 + help
84603 + By saying Y here the kernel will randomize every task's kernel
84604 + stack on every system call. This will not only force an attacker
84605 + to guess it but also prevent him from making use of possible
84606 + leaked information about it.
84607 +
84608 + Since the kernel stack is a rather scarce resource, randomization
84609 + may cause unexpected stack overflows, therefore you should very
84610 + carefully test your system. Note that once enabled in the kernel
84611 + configuration, this feature cannot be disabled on a per file basis.
84612 +
84613 +config PAX_RANDUSTACK
84614 + bool "Randomize user stack base"
84615 + depends on PAX_ASLR
84616 + help
84617 + By saying Y here the kernel will randomize every task's userland
84618 + stack. The randomization is done in two steps where the second
84619 + one may apply a big amount of shift to the top of the stack and
84620 + cause problems for programs that want to use lots of memory (more
84621 + than 2.5 GB if SEGMEXEC is not active, or 1.25 GB when it is).
84622 + For this reason the second step can be controlled by 'chpax' or
84623 + 'paxctl' on a per file basis.
84624 +
84625 +config PAX_RANDMMAP
84626 + bool "Randomize mmap() base"
84627 + depends on PAX_ASLR
84628 + help
84629 + By saying Y here the kernel will use a randomized base address for
84630 + mmap() requests that do not specify one themselves. As a result
84631 + all dynamically loaded libraries will appear at random addresses
84632 + and therefore be harder to exploit by a technique where an attacker
84633 + attempts to execute library code for his purposes (e.g. spawn a
84634 + shell from an exploited program that is running at an elevated
84635 + privilege level).
84636 +
84637 + Furthermore, if a program is relinked as a dynamic ELF file, its
84638 + base address will be randomized as well, completing the full
84639 + randomization of the address space layout. Attacking such programs
84640 + becomes a guess game. You can find an example of doing this at
84641 + http://pax.grsecurity.net/et_dyn.tar.gz and practical samples at
84642 + http://www.grsecurity.net/grsec-gcc-specs.tar.gz .
84643 +
84644 + NOTE: you can use the 'chpax' or 'paxctl' utilities to control this
84645 + feature on a per file basis.
84646 +
84647 +endmenu
84648 +
84649 +menu "Miscellaneous hardening features"
84650 +
84651 +config PAX_MEMORY_SANITIZE
84652 + bool "Sanitize all freed memory"
84653 + help
84654 + By saying Y here the kernel will erase memory pages as soon as they
84655 + are freed. This in turn reduces the lifetime of data stored in the
84656 + pages, making it less likely that sensitive information such as
84657 + passwords, cryptographic secrets, etc stay in memory for too long.
84658 +
84659 + This is especially useful for programs whose runtime is short, long
84660 + lived processes and the kernel itself benefit from this as long as
84661 + they operate on whole memory pages and ensure timely freeing of pages
84662 + that may hold sensitive information.
84663 +
84664 + The tradeoff is performance impact, on a single CPU system kernel
84665 + compilation sees a 3% slowdown, other systems and workloads may vary
84666 + and you are advised to test this feature on your expected workload
84667 + before deploying it.
84668 +
84669 + Note that this feature does not protect data stored in live pages,
84670 + e.g., process memory swapped to disk may stay there for a long time.
84671 +
84672 +config PAX_MEMORY_STACKLEAK
84673 + bool "Sanitize kernel stack"
84674 + depends on X86
84675 + help
84676 + By saying Y here the kernel will erase the kernel stack before it
84677 + returns from a system call. This in turn reduces the information
84678 + that a kernel stack leak bug can reveal.
84679 +
84680 + Note that such a bug can still leak information that was put on
84681 + the stack by the current system call (the one eventually triggering
84682 + the bug) but traces of earlier system calls on the kernel stack
84683 + cannot leak anymore.
84684 +
84685 + The tradeoff is performance impact, on a single CPU system kernel
84686 + compilation sees a 1% slowdown, other systems and workloads may vary
84687 + and you are advised to test this feature on your expected workload
84688 + before deploying it.
84689 +
84690 + Note: full support for this feature requires gcc with plugin support
84691 + so make sure your compiler is at least gcc 4.5.0. Using older gcc
84692 + versions means that functions with large enough stack frames may
84693 + leave uninitialized memory behind that may be exposed to a later
84694 + syscall leaking the stack.
84695 +
84696 +config PAX_MEMORY_UDEREF
84697 + bool "Prevent invalid userland pointer dereference"
84698 + depends on X86 && !UML_X86 && !XEN
84699 + select PAX_PER_CPU_PGD if X86_64
84700 + help
84701 + By saying Y here the kernel will be prevented from dereferencing
84702 + userland pointers in contexts where the kernel expects only kernel
84703 + pointers. This is both a useful runtime debugging feature and a
84704 + security measure that prevents exploiting a class of kernel bugs.
84705 +
84706 + The tradeoff is that some virtualization solutions may experience
84707 + a huge slowdown and therefore you should not enable this feature
84708 + for kernels meant to run in such environments. Whether a given VM
84709 + solution is affected or not is best determined by simply trying it
84710 + out, the performance impact will be obvious right on boot as this
84711 + mechanism engages from very early on. A good rule of thumb is that
84712 + VMs running on CPUs without hardware virtualization support (i.e.,
84713 + the majority of IA-32 CPUs) will likely experience the slowdown.
84714 +
84715 +config PAX_REFCOUNT
84716 + bool "Prevent various kernel object reference counter overflows"
84717 + depends on GRKERNSEC && (X86 || SPARC64)
84718 + help
84719 + By saying Y here the kernel will detect and prevent overflowing
84720 + various (but not all) kinds of object reference counters. Such
84721 + overflows can normally occur due to bugs only and are often, if
84722 + not always, exploitable.
84723 +
84724 + The tradeoff is that data structures protected by an overflowed
84725 + refcount will never be freed and therefore will leak memory. Note
84726 + that this leak also happens even without this protection but in
84727 + that case the overflow can eventually trigger the freeing of the
84728 + data structure while it is still being used elsewhere, resulting
84729 + in the exploitable situation that this feature prevents.
84730 +
84731 + Since this has a negligible performance impact, you should enable
84732 + this feature.
84733 +
84734 +config PAX_USERCOPY
84735 + bool "Harden heap object copies between kernel and userland"
84736 + depends on X86 || PPC || SPARC || ARM
84737 + depends on GRKERNSEC && (SLAB || SLUB || SLOB)
84738 + help
84739 + By saying Y here the kernel will enforce the size of heap objects
84740 + when they are copied in either direction between the kernel and
84741 + userland, even if only a part of the heap object is copied.
84742 +
84743 + Specifically, this checking prevents information leaking from the
84744 + kernel heap during kernel to userland copies (if the kernel heap
84745 + object is otherwise fully initialized) and prevents kernel heap
84746 + overflows during userland to kernel copies.
84747 +
84748 + Note that the current implementation provides the strictest bounds
84749 + checks for the SLUB allocator.
84750 +
84751 + Enabling this option also enables per-slab cache protection against
84752 + data in a given cache being copied into/out of via userland
84753 + accessors. Though the whitelist of regions will be reduced over
84754 + time, it notably protects important data structures like task structs.
84755 +
84756 +
84757 + If frame pointers are enabled on x86, this option will also
84758 + restrict copies into and out of the kernel stack to local variables
84759 + within a single frame.
84760 +
84761 + Since this has a negligible performance impact, you should enable
84762 + this feature.
84763 +
84764 +endmenu
84765 +
84766 +endmenu
84767 +
84768 config KEYS
84769 bool "Enable access key retention support"
84770 help
84771 @@ -146,7 +765,7 @@ config INTEL_TXT
84772 config LSM_MMAP_MIN_ADDR
84773 int "Low address space for LSM to protect from user allocation"
84774 depends on SECURITY && SECURITY_SELINUX
84775 - default 65536
84776 + default 32768
84777 help
84778 This is the portion of low virtual memory which should be protected
84779 from userspace allocation. Keeping a user from writing to low pages
84780 diff --git a/security/capability.c b/security/capability.c
84781 index fce07a7..5f12858 100644
84782 --- a/security/capability.c
84783 +++ b/security/capability.c
84784 @@ -890,7 +890,7 @@ static void cap_audit_rule_free(void *lsmrule)
84785 }
84786 #endif /* CONFIG_AUDIT */
84787
84788 -struct security_operations default_security_ops = {
84789 +struct security_operations default_security_ops __read_only = {
84790 .name = "default",
84791 };
84792
84793 diff --git a/security/commoncap.c b/security/commoncap.c
84794 index fe30751..aaba312 100644
84795 --- a/security/commoncap.c
84796 +++ b/security/commoncap.c
84797 @@ -27,6 +27,8 @@
84798 #include <linux/sched.h>
84799 #include <linux/prctl.h>
84800 #include <linux/securebits.h>
84801 +#include <linux/syslog.h>
84802 +#include <net/sock.h>
84803
84804 /*
84805 * If a non-root user executes a setuid-root binary in
84806 @@ -50,9 +52,18 @@ static void warn_setuid_and_fcaps_mixed(char *fname)
84807 }
84808 }
84809
84810 +#ifdef CONFIG_NET
84811 +extern kernel_cap_t gr_cap_rtnetlink(struct sock *sk);
84812 +#endif
84813 +
84814 int cap_netlink_send(struct sock *sk, struct sk_buff *skb)
84815 {
84816 +#ifdef CONFIG_NET
84817 + NETLINK_CB(skb).eff_cap = gr_cap_rtnetlink(sk);
84818 +#else
84819 NETLINK_CB(skb).eff_cap = current_cap();
84820 +#endif
84821 +
84822 return 0;
84823 }
84824
84825 @@ -582,6 +593,9 @@ int cap_bprm_secureexec(struct linux_binprm *bprm)
84826 {
84827 const struct cred *cred = current_cred();
84828
84829 + if (gr_acl_enable_at_secure())
84830 + return 1;
84831 +
84832 if (cred->uid != 0) {
84833 if (bprm->cap_effective)
84834 return 1;
84835 @@ -956,13 +970,18 @@ error:
84836 /**
84837 * cap_syslog - Determine whether syslog function is permitted
84838 * @type: Function requested
84839 + * @from_file: Whether this request came from an open file (i.e. /proc)
84840 *
84841 * Determine whether the current process is permitted to use a particular
84842 * syslog function, returning 0 if permission is granted, -ve if not.
84843 */
84844 -int cap_syslog(int type)
84845 +int cap_syslog(int type, bool from_file)
84846 {
84847 - if ((type != 3 && type != 10) && !capable(CAP_SYS_ADMIN))
84848 + /* /proc/kmsg can open be opened by CAP_SYS_ADMIN */
84849 + if (type != SYSLOG_ACTION_OPEN && from_file)
84850 + return 0;
84851 + if ((type != SYSLOG_ACTION_READ_ALL &&
84852 + type != SYSLOG_ACTION_SIZE_BUFFER) && !capable(CAP_SYS_ADMIN))
84853 return -EPERM;
84854 return 0;
84855 }
84856 diff --git a/security/integrity/ima/ima.h b/security/integrity/ima/ima.h
84857 index 165eb53..b1db4eb 100644
84858 --- a/security/integrity/ima/ima.h
84859 +++ b/security/integrity/ima/ima.h
84860 @@ -84,8 +84,8 @@ void ima_add_violation(struct inode *inode, const unsigned char *filename,
84861 extern spinlock_t ima_queue_lock;
84862
84863 struct ima_h_table {
84864 - atomic_long_t len; /* number of stored measurements in the list */
84865 - atomic_long_t violations;
84866 + atomic_long_unchecked_t len; /* number of stored measurements in the list */
84867 + atomic_long_unchecked_t violations;
84868 struct hlist_head queue[IMA_MEASURE_HTABLE_SIZE];
84869 };
84870 extern struct ima_h_table ima_htable;
84871 diff --git a/security/integrity/ima/ima_api.c b/security/integrity/ima/ima_api.c
84872 index 3cd58b6..b4c284f 100644
84873 --- a/security/integrity/ima/ima_api.c
84874 +++ b/security/integrity/ima/ima_api.c
84875 @@ -74,7 +74,7 @@ void ima_add_violation(struct inode *inode, const unsigned char *filename,
84876 int result;
84877
84878 /* can overflow, only indicator */
84879 - atomic_long_inc(&ima_htable.violations);
84880 + atomic_long_inc_unchecked(&ima_htable.violations);
84881
84882 entry = kmalloc(sizeof(*entry), GFP_KERNEL);
84883 if (!entry) {
84884 diff --git a/security/integrity/ima/ima_fs.c b/security/integrity/ima/ima_fs.c
84885 index 0c72c9c..433e29b 100644
84886 --- a/security/integrity/ima/ima_fs.c
84887 +++ b/security/integrity/ima/ima_fs.c
84888 @@ -27,12 +27,12 @@
84889 static int valid_policy = 1;
84890 #define TMPBUFLEN 12
84891 static ssize_t ima_show_htable_value(char __user *buf, size_t count,
84892 - loff_t *ppos, atomic_long_t *val)
84893 + loff_t *ppos, atomic_long_unchecked_t *val)
84894 {
84895 char tmpbuf[TMPBUFLEN];
84896 ssize_t len;
84897
84898 - len = scnprintf(tmpbuf, TMPBUFLEN, "%li\n", atomic_long_read(val));
84899 + len = scnprintf(tmpbuf, TMPBUFLEN, "%li\n", atomic_long_read_unchecked(val));
84900 return simple_read_from_buffer(buf, count, ppos, tmpbuf, len);
84901 }
84902
84903 diff --git a/security/integrity/ima/ima_queue.c b/security/integrity/ima/ima_queue.c
84904 index a0880e9..93e4ebb 100644
84905 --- a/security/integrity/ima/ima_queue.c
84906 +++ b/security/integrity/ima/ima_queue.c
84907 @@ -78,7 +78,7 @@ static int ima_add_digest_entry(struct ima_template_entry *entry)
84908 INIT_LIST_HEAD(&qe->later);
84909 list_add_tail_rcu(&qe->later, &ima_measurements);
84910
84911 - atomic_long_inc(&ima_htable.len);
84912 + atomic_long_inc_unchecked(&ima_htable.len);
84913 key = ima_hash_key(entry->digest);
84914 hlist_add_head_rcu(&qe->hnext, &ima_htable.queue[key]);
84915 return 0;
84916 diff --git a/security/keys/keyring.c b/security/keys/keyring.c
84917 index e031952..c9a535d 100644
84918 --- a/security/keys/keyring.c
84919 +++ b/security/keys/keyring.c
84920 @@ -214,15 +214,15 @@ static long keyring_read(const struct key *keyring,
84921 ret = -EFAULT;
84922
84923 for (loop = 0; loop < klist->nkeys; loop++) {
84924 + key_serial_t serial;
84925 key = klist->keys[loop];
84926 + serial = key->serial;
84927
84928 tmp = sizeof(key_serial_t);
84929 if (tmp > buflen)
84930 tmp = buflen;
84931
84932 - if (copy_to_user(buffer,
84933 - &key->serial,
84934 - tmp) != 0)
84935 + if (copy_to_user(buffer, &serial, tmp))
84936 goto error;
84937
84938 buflen -= tmp;
84939 diff --git a/security/keys/process_keys.c b/security/keys/process_keys.c
84940 index 931cfda..e71808a 100644
84941 --- a/security/keys/process_keys.c
84942 +++ b/security/keys/process_keys.c
84943 @@ -208,7 +208,7 @@ static int install_process_keyring(void)
84944 ret = install_process_keyring_to_cred(new);
84945 if (ret < 0) {
84946 abort_creds(new);
84947 - return ret != -EEXIST ?: 0;
84948 + return ret != -EEXIST ? ret : 0;
84949 }
84950
84951 return commit_creds(new);
84952 diff --git a/security/min_addr.c b/security/min_addr.c
84953 index d9f9425..c28cef4 100644
84954 --- a/security/min_addr.c
84955 +++ b/security/min_addr.c
84956 @@ -14,6 +14,7 @@ unsigned long dac_mmap_min_addr = CONFIG_DEFAULT_MMAP_MIN_ADDR;
84957 */
84958 static void update_mmap_min_addr(void)
84959 {
84960 +#ifndef SPARC
84961 #ifdef CONFIG_LSM_MMAP_MIN_ADDR
84962 if (dac_mmap_min_addr > CONFIG_LSM_MMAP_MIN_ADDR)
84963 mmap_min_addr = dac_mmap_min_addr;
84964 @@ -22,6 +23,7 @@ static void update_mmap_min_addr(void)
84965 #else
84966 mmap_min_addr = dac_mmap_min_addr;
84967 #endif
84968 +#endif
84969 }
84970
84971 /*
84972 diff --git a/security/root_plug.c b/security/root_plug.c
84973 index 2f7ffa6..0455400 100644
84974 --- a/security/root_plug.c
84975 +++ b/security/root_plug.c
84976 @@ -70,7 +70,7 @@ static int rootplug_bprm_check_security (struct linux_binprm *bprm)
84977 return 0;
84978 }
84979
84980 -static struct security_operations rootplug_security_ops = {
84981 +static struct security_operations rootplug_security_ops __read_only = {
84982 .bprm_check_security = rootplug_bprm_check_security,
84983 };
84984
84985 diff --git a/security/security.c b/security/security.c
84986 index c4c6732..7abf13b 100644
84987 --- a/security/security.c
84988 +++ b/security/security.c
84989 @@ -24,7 +24,7 @@ static __initdata char chosen_lsm[SECURITY_NAME_MAX + 1];
84990 extern struct security_operations default_security_ops;
84991 extern void security_fixup_ops(struct security_operations *ops);
84992
84993 -struct security_operations *security_ops; /* Initialized to NULL */
84994 +struct security_operations *security_ops __read_only; /* Initialized to NULL */
84995
84996 static inline int verify(struct security_operations *ops)
84997 {
84998 @@ -106,7 +106,7 @@ int __init security_module_enable(struct security_operations *ops)
84999 * If there is already a security module registered with the kernel,
85000 * an error will be returned. Otherwise %0 is returned on success.
85001 */
85002 -int register_security(struct security_operations *ops)
85003 +int __init register_security(struct security_operations *ops)
85004 {
85005 if (verify(ops)) {
85006 printk(KERN_DEBUG "%s could not verify "
85007 @@ -199,9 +199,9 @@ int security_quota_on(struct dentry *dentry)
85008 return security_ops->quota_on(dentry);
85009 }
85010
85011 -int security_syslog(int type)
85012 +int security_syslog(int type, bool from_file)
85013 {
85014 - return security_ops->syslog(type);
85015 + return security_ops->syslog(type, from_file);
85016 }
85017
85018 int security_settime(struct timespec *ts, struct timezone *tz)
85019 diff --git a/security/selinux/hooks.c b/security/selinux/hooks.c
85020 index a106754..ca3a589 100644
85021 --- a/security/selinux/hooks.c
85022 +++ b/security/selinux/hooks.c
85023 @@ -76,6 +76,7 @@
85024 #include <linux/selinux.h>
85025 #include <linux/mutex.h>
85026 #include <linux/posix-timers.h>
85027 +#include <linux/syslog.h>
85028
85029 #include "avc.h"
85030 #include "objsec.h"
85031 @@ -131,7 +132,7 @@ int selinux_enabled = 1;
85032 * Minimal support for a secondary security module,
85033 * just to allow the use of the capability module.
85034 */
85035 -static struct security_operations *secondary_ops;
85036 +static struct security_operations *secondary_ops __read_only;
85037
85038 /* Lists of inode and superblock security structures initialized
85039 before the policy was loaded. */
85040 @@ -2050,29 +2051,30 @@ static int selinux_quota_on(struct dentry *dentry)
85041 return dentry_has_perm(cred, NULL, dentry, FILE__QUOTAON);
85042 }
85043
85044 -static int selinux_syslog(int type)
85045 +static int selinux_syslog(int type, bool from_file)
85046 {
85047 int rc;
85048
85049 - rc = cap_syslog(type);
85050 + rc = cap_syslog(type, from_file);
85051 if (rc)
85052 return rc;
85053
85054 switch (type) {
85055 - case 3: /* Read last kernel messages */
85056 - case 10: /* Return size of the log buffer */
85057 + case SYSLOG_ACTION_READ_ALL: /* Read last kernel messages */
85058 + case SYSLOG_ACTION_SIZE_BUFFER: /* Return size of the log buffer */
85059 rc = task_has_system(current, SYSTEM__SYSLOG_READ);
85060 break;
85061 - case 6: /* Disable logging to console */
85062 - case 7: /* Enable logging to console */
85063 - case 8: /* Set level of messages printed to console */
85064 + case SYSLOG_ACTION_CONSOLE_OFF: /* Disable logging to console */
85065 + case SYSLOG_ACTION_CONSOLE_ON: /* Enable logging to console */
85066 + /* Set level of messages printed to console */
85067 + case SYSLOG_ACTION_CONSOLE_LEVEL:
85068 rc = task_has_system(current, SYSTEM__SYSLOG_CONSOLE);
85069 break;
85070 - case 0: /* Close log */
85071 - case 1: /* Open log */
85072 - case 2: /* Read from log */
85073 - case 4: /* Read/clear last kernel messages */
85074 - case 5: /* Clear ring buffer */
85075 + case SYSLOG_ACTION_CLOSE: /* Close log */
85076 + case SYSLOG_ACTION_OPEN: /* Open log */
85077 + case SYSLOG_ACTION_READ: /* Read from log */
85078 + case SYSLOG_ACTION_READ_CLEAR: /* Read/clear last kernel messages */
85079 + case SYSLOG_ACTION_CLEAR: /* Clear ring buffer */
85080 default:
85081 rc = task_has_system(current, SYSTEM__SYSLOG_MOD);
85082 break;
85083 @@ -5457,7 +5459,7 @@ static int selinux_key_getsecurity(struct key *key, char **_buffer)
85084
85085 #endif
85086
85087 -static struct security_operations selinux_ops = {
85088 +static struct security_operations selinux_ops __read_only = {
85089 .name = "selinux",
85090
85091 .ptrace_access_check = selinux_ptrace_access_check,
85092 @@ -5841,7 +5843,9 @@ int selinux_disable(void)
85093 avc_disable();
85094
85095 /* Reset security_ops to the secondary module, dummy or capability. */
85096 + pax_open_kernel();
85097 security_ops = secondary_ops;
85098 + pax_close_kernel();
85099
85100 /* Unregister netfilter hooks. */
85101 selinux_nf_ip_exit();
85102 diff --git a/security/selinux/include/xfrm.h b/security/selinux/include/xfrm.h
85103 index 13128f9..c23c736 100644
85104 --- a/security/selinux/include/xfrm.h
85105 +++ b/security/selinux/include/xfrm.h
85106 @@ -48,7 +48,7 @@ int selinux_xfrm_decode_session(struct sk_buff *skb, u32 *sid, int ckall);
85107
85108 static inline void selinux_xfrm_notify_policyload(void)
85109 {
85110 - atomic_inc(&flow_cache_genid);
85111 + atomic_inc_unchecked(&flow_cache_genid);
85112 }
85113 #else
85114 static inline int selinux_xfrm_enabled(void)
85115 diff --git a/security/selinux/ss/services.c b/security/selinux/ss/services.c
85116 index ff17820..d68084c 100644
85117 --- a/security/selinux/ss/services.c
85118 +++ b/security/selinux/ss/services.c
85119 @@ -1715,6 +1715,8 @@ int security_load_policy(void *data, size_t len)
85120 int rc = 0;
85121 struct policy_file file = { data, len }, *fp = &file;
85122
85123 + pax_track_stack();
85124 +
85125 if (!ss_initialized) {
85126 avtab_cache_init();
85127 if (policydb_read(&policydb, fp)) {
85128 diff --git a/security/smack/smack_lsm.c b/security/smack/smack_lsm.c
85129 index c33b6bb..b51f19e 100644
85130 --- a/security/smack/smack_lsm.c
85131 +++ b/security/smack/smack_lsm.c
85132 @@ -157,12 +157,12 @@ static int smack_ptrace_traceme(struct task_struct *ptp)
85133 *
85134 * Returns 0 on success, error code otherwise.
85135 */
85136 -static int smack_syslog(int type)
85137 +static int smack_syslog(int type, bool from_file)
85138 {
85139 int rc;
85140 char *sp = current_security();
85141
85142 - rc = cap_syslog(type);
85143 + rc = cap_syslog(type, from_file);
85144 if (rc != 0)
85145 return rc;
85146
85147 @@ -3073,7 +3073,7 @@ static int smack_inode_getsecctx(struct inode *inode, void **ctx, u32 *ctxlen)
85148 return 0;
85149 }
85150
85151 -struct security_operations smack_ops = {
85152 +struct security_operations smack_ops __read_only = {
85153 .name = "smack",
85154
85155 .ptrace_access_check = smack_ptrace_access_check,
85156 diff --git a/security/tomoyo/tomoyo.c b/security/tomoyo/tomoyo.c
85157 index 9548a09..9a5f384 100644
85158 --- a/security/tomoyo/tomoyo.c
85159 +++ b/security/tomoyo/tomoyo.c
85160 @@ -275,7 +275,7 @@ static int tomoyo_dentry_open(struct file *f, const struct cred *cred)
85161 * tomoyo_security_ops is a "struct security_operations" which is used for
85162 * registering TOMOYO.
85163 */
85164 -static struct security_operations tomoyo_security_ops = {
85165 +static struct security_operations tomoyo_security_ops __read_only = {
85166 .name = "tomoyo",
85167 .cred_alloc_blank = tomoyo_cred_alloc_blank,
85168 .cred_prepare = tomoyo_cred_prepare,
85169 diff --git a/sound/aoa/codecs/onyx.c b/sound/aoa/codecs/onyx.c
85170 index 84bb07d..c2ab6b6 100644
85171 --- a/sound/aoa/codecs/onyx.c
85172 +++ b/sound/aoa/codecs/onyx.c
85173 @@ -53,7 +53,7 @@ struct onyx {
85174 spdif_locked:1,
85175 analog_locked:1,
85176 original_mute:2;
85177 - int open_count;
85178 + local_t open_count;
85179 struct codec_info *codec_info;
85180
85181 /* mutex serializes concurrent access to the device
85182 @@ -752,7 +752,7 @@ static int onyx_open(struct codec_info_item *cii,
85183 struct onyx *onyx = cii->codec_data;
85184
85185 mutex_lock(&onyx->mutex);
85186 - onyx->open_count++;
85187 + local_inc(&onyx->open_count);
85188 mutex_unlock(&onyx->mutex);
85189
85190 return 0;
85191 @@ -764,8 +764,7 @@ static int onyx_close(struct codec_info_item *cii,
85192 struct onyx *onyx = cii->codec_data;
85193
85194 mutex_lock(&onyx->mutex);
85195 - onyx->open_count--;
85196 - if (!onyx->open_count)
85197 + if (local_dec_and_test(&onyx->open_count))
85198 onyx->spdif_locked = onyx->analog_locked = 0;
85199 mutex_unlock(&onyx->mutex);
85200
85201 diff --git a/sound/aoa/codecs/onyx.h b/sound/aoa/codecs/onyx.h
85202 index ffd2025..df062c9 100644
85203 --- a/sound/aoa/codecs/onyx.h
85204 +++ b/sound/aoa/codecs/onyx.h
85205 @@ -11,6 +11,7 @@
85206 #include <linux/i2c.h>
85207 #include <asm/pmac_low_i2c.h>
85208 #include <asm/prom.h>
85209 +#include <asm/local.h>
85210
85211 /* PCM3052 register definitions */
85212
85213 diff --git a/sound/core/oss/pcm_oss.c b/sound/core/oss/pcm_oss.c
85214 index d9c9635..bc0a5a2 100644
85215 --- a/sound/core/oss/pcm_oss.c
85216 +++ b/sound/core/oss/pcm_oss.c
85217 @@ -1395,7 +1395,7 @@ static ssize_t snd_pcm_oss_write1(struct snd_pcm_substream *substream, const cha
85218 }
85219 } else {
85220 tmp = snd_pcm_oss_write2(substream,
85221 - (const char __force *)buf,
85222 + (const char __force_kernel *)buf,
85223 runtime->oss.period_bytes, 0);
85224 if (tmp <= 0)
85225 goto err;
85226 @@ -1483,7 +1483,7 @@ static ssize_t snd_pcm_oss_read1(struct snd_pcm_substream *substream, char __use
85227 xfer += tmp;
85228 runtime->oss.buffer_used -= tmp;
85229 } else {
85230 - tmp = snd_pcm_oss_read2(substream, (char __force *)buf,
85231 + tmp = snd_pcm_oss_read2(substream, (char __force_kernel *)buf,
85232 runtime->oss.period_bytes, 0);
85233 if (tmp <= 0)
85234 goto err;
85235 diff --git a/sound/core/pcm_compat.c b/sound/core/pcm_compat.c
85236 index 038232d..7dd9e5c 100644
85237 --- a/sound/core/pcm_compat.c
85238 +++ b/sound/core/pcm_compat.c
85239 @@ -30,7 +30,7 @@ static int snd_pcm_ioctl_delay_compat(struct snd_pcm_substream *substream,
85240 int err;
85241
85242 fs = snd_enter_user();
85243 - err = snd_pcm_delay(substream, &delay);
85244 + err = snd_pcm_delay(substream, (snd_pcm_sframes_t __force_user *)&delay);
85245 snd_leave_user(fs);
85246 if (err < 0)
85247 return err;
85248 diff --git a/sound/core/pcm_native.c b/sound/core/pcm_native.c
85249 index e6d2d97..4843949 100644
85250 --- a/sound/core/pcm_native.c
85251 +++ b/sound/core/pcm_native.c
85252 @@ -2747,11 +2747,11 @@ int snd_pcm_kernel_ioctl(struct snd_pcm_substream *substream,
85253 switch (substream->stream) {
85254 case SNDRV_PCM_STREAM_PLAYBACK:
85255 result = snd_pcm_playback_ioctl1(NULL, substream, cmd,
85256 - (void __user *)arg);
85257 + (void __force_user *)arg);
85258 break;
85259 case SNDRV_PCM_STREAM_CAPTURE:
85260 result = snd_pcm_capture_ioctl1(NULL, substream, cmd,
85261 - (void __user *)arg);
85262 + (void __force_user *)arg);
85263 break;
85264 default:
85265 result = -EINVAL;
85266 diff --git a/sound/core/seq/seq_device.c b/sound/core/seq/seq_device.c
85267 index 1f99767..14636533 100644
85268 --- a/sound/core/seq/seq_device.c
85269 +++ b/sound/core/seq/seq_device.c
85270 @@ -63,7 +63,7 @@ struct ops_list {
85271 int argsize; /* argument size */
85272
85273 /* operators */
85274 - struct snd_seq_dev_ops ops;
85275 + struct snd_seq_dev_ops *ops;
85276
85277 /* registred devices */
85278 struct list_head dev_list; /* list of devices */
85279 @@ -332,7 +332,7 @@ int snd_seq_device_register_driver(char *id, struct snd_seq_dev_ops *entry,
85280
85281 mutex_lock(&ops->reg_mutex);
85282 /* copy driver operators */
85283 - ops->ops = *entry;
85284 + ops->ops = entry;
85285 ops->driver |= DRIVER_LOADED;
85286 ops->argsize = argsize;
85287
85288 @@ -462,7 +462,7 @@ static int init_device(struct snd_seq_device *dev, struct ops_list *ops)
85289 dev->name, ops->id, ops->argsize, dev->argsize);
85290 return -EINVAL;
85291 }
85292 - if (ops->ops.init_device(dev) >= 0) {
85293 + if (ops->ops->init_device(dev) >= 0) {
85294 dev->status = SNDRV_SEQ_DEVICE_REGISTERED;
85295 ops->num_init_devices++;
85296 } else {
85297 @@ -489,7 +489,7 @@ static int free_device(struct snd_seq_device *dev, struct ops_list *ops)
85298 dev->name, ops->id, ops->argsize, dev->argsize);
85299 return -EINVAL;
85300 }
85301 - if ((result = ops->ops.free_device(dev)) >= 0 || result == -ENXIO) {
85302 + if ((result = ops->ops->free_device(dev)) >= 0 || result == -ENXIO) {
85303 dev->status = SNDRV_SEQ_DEVICE_FREE;
85304 dev->driver_data = NULL;
85305 ops->num_init_devices--;
85306 diff --git a/sound/drivers/mts64.c b/sound/drivers/mts64.c
85307 index 9284829..ac8e8b2 100644
85308 --- a/sound/drivers/mts64.c
85309 +++ b/sound/drivers/mts64.c
85310 @@ -27,6 +27,7 @@
85311 #include <sound/initval.h>
85312 #include <sound/rawmidi.h>
85313 #include <sound/control.h>
85314 +#include <asm/local.h>
85315
85316 #define CARD_NAME "Miditerminal 4140"
85317 #define DRIVER_NAME "MTS64"
85318 @@ -65,7 +66,7 @@ struct mts64 {
85319 struct pardevice *pardev;
85320 int pardev_claimed;
85321
85322 - int open_count;
85323 + local_t open_count;
85324 int current_midi_output_port;
85325 int current_midi_input_port;
85326 u8 mode[MTS64_NUM_INPUT_PORTS];
85327 @@ -695,7 +696,7 @@ static int snd_mts64_rawmidi_open(struct snd_rawmidi_substream *substream)
85328 {
85329 struct mts64 *mts = substream->rmidi->private_data;
85330
85331 - if (mts->open_count == 0) {
85332 + if (local_read(&mts->open_count) == 0) {
85333 /* We don't need a spinlock here, because this is just called
85334 if the device has not been opened before.
85335 So there aren't any IRQs from the device */
85336 @@ -703,7 +704,7 @@ static int snd_mts64_rawmidi_open(struct snd_rawmidi_substream *substream)
85337
85338 msleep(50);
85339 }
85340 - ++(mts->open_count);
85341 + local_inc(&mts->open_count);
85342
85343 return 0;
85344 }
85345 @@ -713,8 +714,7 @@ static int snd_mts64_rawmidi_close(struct snd_rawmidi_substream *substream)
85346 struct mts64 *mts = substream->rmidi->private_data;
85347 unsigned long flags;
85348
85349 - --(mts->open_count);
85350 - if (mts->open_count == 0) {
85351 + if (local_dec_return(&mts->open_count) == 0) {
85352 /* We need the spinlock_irqsave here because we can still
85353 have IRQs at this point */
85354 spin_lock_irqsave(&mts->lock, flags);
85355 @@ -723,8 +723,8 @@ static int snd_mts64_rawmidi_close(struct snd_rawmidi_substream *substream)
85356
85357 msleep(500);
85358
85359 - } else if (mts->open_count < 0)
85360 - mts->open_count = 0;
85361 + } else if (local_read(&mts->open_count) < 0)
85362 + local_set(&mts->open_count, 0);
85363
85364 return 0;
85365 }
85366 diff --git a/sound/drivers/opl4/opl4_lib.c b/sound/drivers/opl4/opl4_lib.c
85367 index 01997f2..cbc1195 100644
85368 --- a/sound/drivers/opl4/opl4_lib.c
85369 +++ b/sound/drivers/opl4/opl4_lib.c
85370 @@ -27,7 +27,7 @@ MODULE_AUTHOR("Clemens Ladisch <clemens@ladisch.de>");
85371 MODULE_DESCRIPTION("OPL4 driver");
85372 MODULE_LICENSE("GPL");
85373
85374 -static void inline snd_opl4_wait(struct snd_opl4 *opl4)
85375 +static inline void snd_opl4_wait(struct snd_opl4 *opl4)
85376 {
85377 int timeout = 10;
85378 while ((inb(opl4->fm_port) & OPL4_STATUS_BUSY) && --timeout > 0)
85379 diff --git a/sound/drivers/portman2x4.c b/sound/drivers/portman2x4.c
85380 index 60158e2..0a0cc1a 100644
85381 --- a/sound/drivers/portman2x4.c
85382 +++ b/sound/drivers/portman2x4.c
85383 @@ -46,6 +46,7 @@
85384 #include <sound/initval.h>
85385 #include <sound/rawmidi.h>
85386 #include <sound/control.h>
85387 +#include <asm/local.h>
85388
85389 #define CARD_NAME "Portman 2x4"
85390 #define DRIVER_NAME "portman"
85391 @@ -83,7 +84,7 @@ struct portman {
85392 struct pardevice *pardev;
85393 int pardev_claimed;
85394
85395 - int open_count;
85396 + local_t open_count;
85397 int mode[PORTMAN_NUM_INPUT_PORTS];
85398 struct snd_rawmidi_substream *midi_input[PORTMAN_NUM_INPUT_PORTS];
85399 };
85400 diff --git a/sound/isa/cmi8330.c b/sound/isa/cmi8330.c
85401 index 02f79d2..8691d43 100644
85402 --- a/sound/isa/cmi8330.c
85403 +++ b/sound/isa/cmi8330.c
85404 @@ -173,7 +173,7 @@ struct snd_cmi8330 {
85405
85406 struct snd_pcm *pcm;
85407 struct snd_cmi8330_stream {
85408 - struct snd_pcm_ops ops;
85409 + snd_pcm_ops_no_const ops;
85410 snd_pcm_open_callback_t open;
85411 void *private_data; /* sb or wss */
85412 } streams[2];
85413 diff --git a/sound/oss/sb_audio.c b/sound/oss/sb_audio.c
85414 index 733b014..56ce96f 100644
85415 --- a/sound/oss/sb_audio.c
85416 +++ b/sound/oss/sb_audio.c
85417 @@ -901,7 +901,7 @@ sb16_copy_from_user(int dev,
85418 buf16 = (signed short *)(localbuf + localoffs);
85419 while (c)
85420 {
85421 - locallen = (c >= LBUFCOPYSIZE ? LBUFCOPYSIZE : c);
85422 + locallen = ((unsigned)c >= LBUFCOPYSIZE ? LBUFCOPYSIZE : c);
85423 if (copy_from_user(lbuf8,
85424 userbuf+useroffs + p,
85425 locallen))
85426 diff --git a/sound/oss/swarm_cs4297a.c b/sound/oss/swarm_cs4297a.c
85427 index 3136c88..28ad950 100644
85428 --- a/sound/oss/swarm_cs4297a.c
85429 +++ b/sound/oss/swarm_cs4297a.c
85430 @@ -2577,7 +2577,6 @@ static int __init cs4297a_init(void)
85431 {
85432 struct cs4297a_state *s;
85433 u32 pwr, id;
85434 - mm_segment_t fs;
85435 int rval;
85436 #ifndef CONFIG_BCM_CS4297A_CSWARM
85437 u64 cfg;
85438 @@ -2667,22 +2666,23 @@ static int __init cs4297a_init(void)
85439 if (!rval) {
85440 char *sb1250_duart_present;
85441
85442 +#if 0
85443 + mm_segment_t fs;
85444 fs = get_fs();
85445 set_fs(KERNEL_DS);
85446 -#if 0
85447 val = SOUND_MASK_LINE;
85448 mixer_ioctl(s, SOUND_MIXER_WRITE_RECSRC, (unsigned long) &val);
85449 for (i = 0; i < ARRAY_SIZE(initvol); i++) {
85450 val = initvol[i].vol;
85451 mixer_ioctl(s, initvol[i].mixch, (unsigned long) &val);
85452 }
85453 + set_fs(fs);
85454 // cs4297a_write_ac97(s, 0x18, 0x0808);
85455 #else
85456 // cs4297a_write_ac97(s, 0x5e, 0x180);
85457 cs4297a_write_ac97(s, 0x02, 0x0808);
85458 cs4297a_write_ac97(s, 0x18, 0x0808);
85459 #endif
85460 - set_fs(fs);
85461
85462 list_add(&s->list, &cs4297a_devs);
85463
85464 diff --git a/sound/pci/ac97/ac97_codec.c b/sound/pci/ac97/ac97_codec.c
85465 index 78288db..0406809 100644
85466 --- a/sound/pci/ac97/ac97_codec.c
85467 +++ b/sound/pci/ac97/ac97_codec.c
85468 @@ -1952,7 +1952,7 @@ static int snd_ac97_dev_disconnect(struct snd_device *device)
85469 }
85470
85471 /* build_ops to do nothing */
85472 -static struct snd_ac97_build_ops null_build_ops;
85473 +static const struct snd_ac97_build_ops null_build_ops;
85474
85475 #ifdef CONFIG_SND_AC97_POWER_SAVE
85476 static void do_update_power(struct work_struct *work)
85477 diff --git a/sound/pci/ac97/ac97_patch.c b/sound/pci/ac97/ac97_patch.c
85478 index eeb2e23..82bf625 100644
85479 --- a/sound/pci/ac97/ac97_patch.c
85480 +++ b/sound/pci/ac97/ac97_patch.c
85481 @@ -371,7 +371,7 @@ static int patch_yamaha_ymf743_build_spdif(struct snd_ac97 *ac97)
85482 return 0;
85483 }
85484
85485 -static struct snd_ac97_build_ops patch_yamaha_ymf743_ops = {
85486 +static const struct snd_ac97_build_ops patch_yamaha_ymf743_ops = {
85487 .build_spdif = patch_yamaha_ymf743_build_spdif,
85488 .build_3d = patch_yamaha_ymf7x3_3d,
85489 };
85490 @@ -455,7 +455,7 @@ static int patch_yamaha_ymf753_post_spdif(struct snd_ac97 * ac97)
85491 return 0;
85492 }
85493
85494 -static struct snd_ac97_build_ops patch_yamaha_ymf753_ops = {
85495 +static const struct snd_ac97_build_ops patch_yamaha_ymf753_ops = {
85496 .build_3d = patch_yamaha_ymf7x3_3d,
85497 .build_post_spdif = patch_yamaha_ymf753_post_spdif
85498 };
85499 @@ -502,7 +502,7 @@ static int patch_wolfson_wm9703_specific(struct snd_ac97 * ac97)
85500 return 0;
85501 }
85502
85503 -static struct snd_ac97_build_ops patch_wolfson_wm9703_ops = {
85504 +static const struct snd_ac97_build_ops patch_wolfson_wm9703_ops = {
85505 .build_specific = patch_wolfson_wm9703_specific,
85506 };
85507
85508 @@ -533,7 +533,7 @@ static int patch_wolfson_wm9704_specific(struct snd_ac97 * ac97)
85509 return 0;
85510 }
85511
85512 -static struct snd_ac97_build_ops patch_wolfson_wm9704_ops = {
85513 +static const struct snd_ac97_build_ops patch_wolfson_wm9704_ops = {
85514 .build_specific = patch_wolfson_wm9704_specific,
85515 };
85516
85517 @@ -555,7 +555,7 @@ static int patch_wolfson_wm9705_specific(struct snd_ac97 * ac97)
85518 return 0;
85519 }
85520
85521 -static struct snd_ac97_build_ops patch_wolfson_wm9705_ops = {
85522 +static const struct snd_ac97_build_ops patch_wolfson_wm9705_ops = {
85523 .build_specific = patch_wolfson_wm9705_specific,
85524 };
85525
85526 @@ -692,7 +692,7 @@ static int patch_wolfson_wm9711_specific(struct snd_ac97 * ac97)
85527 return 0;
85528 }
85529
85530 -static struct snd_ac97_build_ops patch_wolfson_wm9711_ops = {
85531 +static const struct snd_ac97_build_ops patch_wolfson_wm9711_ops = {
85532 .build_specific = patch_wolfson_wm9711_specific,
85533 };
85534
85535 @@ -886,7 +886,7 @@ static void patch_wolfson_wm9713_resume (struct snd_ac97 * ac97)
85536 }
85537 #endif
85538
85539 -static struct snd_ac97_build_ops patch_wolfson_wm9713_ops = {
85540 +static const struct snd_ac97_build_ops patch_wolfson_wm9713_ops = {
85541 .build_specific = patch_wolfson_wm9713_specific,
85542 .build_3d = patch_wolfson_wm9713_3d,
85543 #ifdef CONFIG_PM
85544 @@ -991,7 +991,7 @@ static int patch_sigmatel_stac97xx_specific(struct snd_ac97 * ac97)
85545 return 0;
85546 }
85547
85548 -static struct snd_ac97_build_ops patch_sigmatel_stac9700_ops = {
85549 +static const struct snd_ac97_build_ops patch_sigmatel_stac9700_ops = {
85550 .build_3d = patch_sigmatel_stac9700_3d,
85551 .build_specific = patch_sigmatel_stac97xx_specific
85552 };
85553 @@ -1038,7 +1038,7 @@ static int patch_sigmatel_stac9708_specific(struct snd_ac97 *ac97)
85554 return patch_sigmatel_stac97xx_specific(ac97);
85555 }
85556
85557 -static struct snd_ac97_build_ops patch_sigmatel_stac9708_ops = {
85558 +static const struct snd_ac97_build_ops patch_sigmatel_stac9708_ops = {
85559 .build_3d = patch_sigmatel_stac9708_3d,
85560 .build_specific = patch_sigmatel_stac9708_specific
85561 };
85562 @@ -1267,7 +1267,7 @@ static int patch_sigmatel_stac9758_specific(struct snd_ac97 *ac97)
85563 return 0;
85564 }
85565
85566 -static struct snd_ac97_build_ops patch_sigmatel_stac9758_ops = {
85567 +static const struct snd_ac97_build_ops patch_sigmatel_stac9758_ops = {
85568 .build_3d = patch_sigmatel_stac9700_3d,
85569 .build_specific = patch_sigmatel_stac9758_specific
85570 };
85571 @@ -1342,7 +1342,7 @@ static int patch_cirrus_build_spdif(struct snd_ac97 * ac97)
85572 return 0;
85573 }
85574
85575 -static struct snd_ac97_build_ops patch_cirrus_ops = {
85576 +static const struct snd_ac97_build_ops patch_cirrus_ops = {
85577 .build_spdif = patch_cirrus_build_spdif
85578 };
85579
85580 @@ -1399,7 +1399,7 @@ static int patch_conexant_build_spdif(struct snd_ac97 * ac97)
85581 return 0;
85582 }
85583
85584 -static struct snd_ac97_build_ops patch_conexant_ops = {
85585 +static const struct snd_ac97_build_ops patch_conexant_ops = {
85586 .build_spdif = patch_conexant_build_spdif
85587 };
85588
85589 @@ -1575,7 +1575,7 @@ static void patch_ad1881_chained(struct snd_ac97 * ac97, int unchained_idx, int
85590 }
85591 }
85592
85593 -static struct snd_ac97_build_ops patch_ad1881_build_ops = {
85594 +static const struct snd_ac97_build_ops patch_ad1881_build_ops = {
85595 #ifdef CONFIG_PM
85596 .resume = ad18xx_resume
85597 #endif
85598 @@ -1662,7 +1662,7 @@ static int patch_ad1885_specific(struct snd_ac97 * ac97)
85599 return 0;
85600 }
85601
85602 -static struct snd_ac97_build_ops patch_ad1885_build_ops = {
85603 +static const struct snd_ac97_build_ops patch_ad1885_build_ops = {
85604 .build_specific = &patch_ad1885_specific,
85605 #ifdef CONFIG_PM
85606 .resume = ad18xx_resume
85607 @@ -1689,7 +1689,7 @@ static int patch_ad1886_specific(struct snd_ac97 * ac97)
85608 return 0;
85609 }
85610
85611 -static struct snd_ac97_build_ops patch_ad1886_build_ops = {
85612 +static const struct snd_ac97_build_ops patch_ad1886_build_ops = {
85613 .build_specific = &patch_ad1886_specific,
85614 #ifdef CONFIG_PM
85615 .resume = ad18xx_resume
85616 @@ -1896,7 +1896,7 @@ static int patch_ad1981a_specific(struct snd_ac97 * ac97)
85617 ARRAY_SIZE(snd_ac97_ad1981x_jack_sense));
85618 }
85619
85620 -static struct snd_ac97_build_ops patch_ad1981a_build_ops = {
85621 +static const struct snd_ac97_build_ops patch_ad1981a_build_ops = {
85622 .build_post_spdif = patch_ad198x_post_spdif,
85623 .build_specific = patch_ad1981a_specific,
85624 #ifdef CONFIG_PM
85625 @@ -1952,7 +1952,7 @@ static int patch_ad1981b_specific(struct snd_ac97 *ac97)
85626 ARRAY_SIZE(snd_ac97_ad1981x_jack_sense));
85627 }
85628
85629 -static struct snd_ac97_build_ops patch_ad1981b_build_ops = {
85630 +static const struct snd_ac97_build_ops patch_ad1981b_build_ops = {
85631 .build_post_spdif = patch_ad198x_post_spdif,
85632 .build_specific = patch_ad1981b_specific,
85633 #ifdef CONFIG_PM
85634 @@ -2091,7 +2091,7 @@ static int patch_ad1888_specific(struct snd_ac97 *ac97)
85635 return patch_build_controls(ac97, snd_ac97_ad1888_controls, ARRAY_SIZE(snd_ac97_ad1888_controls));
85636 }
85637
85638 -static struct snd_ac97_build_ops patch_ad1888_build_ops = {
85639 +static const struct snd_ac97_build_ops patch_ad1888_build_ops = {
85640 .build_post_spdif = patch_ad198x_post_spdif,
85641 .build_specific = patch_ad1888_specific,
85642 #ifdef CONFIG_PM
85643 @@ -2140,7 +2140,7 @@ static int patch_ad1980_specific(struct snd_ac97 *ac97)
85644 return patch_build_controls(ac97, &snd_ac97_ad198x_2cmic, 1);
85645 }
85646
85647 -static struct snd_ac97_build_ops patch_ad1980_build_ops = {
85648 +static const struct snd_ac97_build_ops patch_ad1980_build_ops = {
85649 .build_post_spdif = patch_ad198x_post_spdif,
85650 .build_specific = patch_ad1980_specific,
85651 #ifdef CONFIG_PM
85652 @@ -2255,7 +2255,7 @@ static int patch_ad1985_specific(struct snd_ac97 *ac97)
85653 ARRAY_SIZE(snd_ac97_ad1985_controls));
85654 }
85655
85656 -static struct snd_ac97_build_ops patch_ad1985_build_ops = {
85657 +static const struct snd_ac97_build_ops patch_ad1985_build_ops = {
85658 .build_post_spdif = patch_ad198x_post_spdif,
85659 .build_specific = patch_ad1985_specific,
85660 #ifdef CONFIG_PM
85661 @@ -2547,7 +2547,7 @@ static int patch_ad1986_specific(struct snd_ac97 *ac97)
85662 ARRAY_SIZE(snd_ac97_ad1985_controls));
85663 }
85664
85665 -static struct snd_ac97_build_ops patch_ad1986_build_ops = {
85666 +static const struct snd_ac97_build_ops patch_ad1986_build_ops = {
85667 .build_post_spdif = patch_ad198x_post_spdif,
85668 .build_specific = patch_ad1986_specific,
85669 #ifdef CONFIG_PM
85670 @@ -2652,7 +2652,7 @@ static int patch_alc650_specific(struct snd_ac97 * ac97)
85671 return 0;
85672 }
85673
85674 -static struct snd_ac97_build_ops patch_alc650_ops = {
85675 +static const struct snd_ac97_build_ops patch_alc650_ops = {
85676 .build_specific = patch_alc650_specific,
85677 .update_jacks = alc650_update_jacks
85678 };
85679 @@ -2804,7 +2804,7 @@ static int patch_alc655_specific(struct snd_ac97 * ac97)
85680 return 0;
85681 }
85682
85683 -static struct snd_ac97_build_ops patch_alc655_ops = {
85684 +static const struct snd_ac97_build_ops patch_alc655_ops = {
85685 .build_specific = patch_alc655_specific,
85686 .update_jacks = alc655_update_jacks
85687 };
85688 @@ -2916,7 +2916,7 @@ static int patch_alc850_specific(struct snd_ac97 *ac97)
85689 return 0;
85690 }
85691
85692 -static struct snd_ac97_build_ops patch_alc850_ops = {
85693 +static const struct snd_ac97_build_ops patch_alc850_ops = {
85694 .build_specific = patch_alc850_specific,
85695 .update_jacks = alc850_update_jacks
85696 };
85697 @@ -2978,7 +2978,7 @@ static int patch_cm9738_specific(struct snd_ac97 * ac97)
85698 return patch_build_controls(ac97, snd_ac97_cm9738_controls, ARRAY_SIZE(snd_ac97_cm9738_controls));
85699 }
85700
85701 -static struct snd_ac97_build_ops patch_cm9738_ops = {
85702 +static const struct snd_ac97_build_ops patch_cm9738_ops = {
85703 .build_specific = patch_cm9738_specific,
85704 .update_jacks = cm9738_update_jacks
85705 };
85706 @@ -3069,7 +3069,7 @@ static int patch_cm9739_post_spdif(struct snd_ac97 * ac97)
85707 return patch_build_controls(ac97, snd_ac97_cm9739_controls_spdif, ARRAY_SIZE(snd_ac97_cm9739_controls_spdif));
85708 }
85709
85710 -static struct snd_ac97_build_ops patch_cm9739_ops = {
85711 +static const struct snd_ac97_build_ops patch_cm9739_ops = {
85712 .build_specific = patch_cm9739_specific,
85713 .build_post_spdif = patch_cm9739_post_spdif,
85714 .update_jacks = cm9739_update_jacks
85715 @@ -3243,7 +3243,7 @@ static int patch_cm9761_specific(struct snd_ac97 * ac97)
85716 return patch_build_controls(ac97, snd_ac97_cm9761_controls, ARRAY_SIZE(snd_ac97_cm9761_controls));
85717 }
85718
85719 -static struct snd_ac97_build_ops patch_cm9761_ops = {
85720 +static const struct snd_ac97_build_ops patch_cm9761_ops = {
85721 .build_specific = patch_cm9761_specific,
85722 .build_post_spdif = patch_cm9761_post_spdif,
85723 .update_jacks = cm9761_update_jacks
85724 @@ -3339,7 +3339,7 @@ static int patch_cm9780_specific(struct snd_ac97 *ac97)
85725 return patch_build_controls(ac97, cm9780_controls, ARRAY_SIZE(cm9780_controls));
85726 }
85727
85728 -static struct snd_ac97_build_ops patch_cm9780_ops = {
85729 +static const struct snd_ac97_build_ops patch_cm9780_ops = {
85730 .build_specific = patch_cm9780_specific,
85731 .build_post_spdif = patch_cm9761_post_spdif /* identical with CM9761 */
85732 };
85733 @@ -3459,7 +3459,7 @@ static int patch_vt1616_specific(struct snd_ac97 * ac97)
85734 return 0;
85735 }
85736
85737 -static struct snd_ac97_build_ops patch_vt1616_ops = {
85738 +static const struct snd_ac97_build_ops patch_vt1616_ops = {
85739 .build_specific = patch_vt1616_specific
85740 };
85741
85742 @@ -3813,7 +3813,7 @@ static int patch_it2646_specific(struct snd_ac97 * ac97)
85743 return 0;
85744 }
85745
85746 -static struct snd_ac97_build_ops patch_it2646_ops = {
85747 +static const struct snd_ac97_build_ops patch_it2646_ops = {
85748 .build_specific = patch_it2646_specific,
85749 .update_jacks = it2646_update_jacks
85750 };
85751 @@ -3847,7 +3847,7 @@ static int patch_si3036_specific(struct snd_ac97 * ac97)
85752 return 0;
85753 }
85754
85755 -static struct snd_ac97_build_ops patch_si3036_ops = {
85756 +static const struct snd_ac97_build_ops patch_si3036_ops = {
85757 .build_specific = patch_si3036_specific,
85758 };
85759
85760 @@ -3914,7 +3914,7 @@ static int patch_ucb1400_specific(struct snd_ac97 * ac97)
85761 return 0;
85762 }
85763
85764 -static struct snd_ac97_build_ops patch_ucb1400_ops = {
85765 +static const struct snd_ac97_build_ops patch_ucb1400_ops = {
85766 .build_specific = patch_ucb1400_specific,
85767 };
85768
85769 diff --git a/sound/pci/hda/hda_codec.h b/sound/pci/hda/hda_codec.h
85770 index 99552fb..4dcc2c5 100644
85771 --- a/sound/pci/hda/hda_codec.h
85772 +++ b/sound/pci/hda/hda_codec.h
85773 @@ -580,7 +580,7 @@ struct hda_bus_ops {
85774 /* notify power-up/down from codec to controller */
85775 void (*pm_notify)(struct hda_bus *bus);
85776 #endif
85777 -};
85778 +} __no_const;
85779
85780 /* template to pass to the bus constructor */
85781 struct hda_bus_template {
85782 @@ -675,6 +675,7 @@ struct hda_codec_ops {
85783 int (*check_power_status)(struct hda_codec *codec, hda_nid_t nid);
85784 #endif
85785 };
85786 +typedef struct hda_codec_ops __no_const hda_codec_ops_no_const;
85787
85788 /* record for amp information cache */
85789 struct hda_cache_head {
85790 @@ -705,7 +706,7 @@ struct hda_pcm_ops {
85791 struct snd_pcm_substream *substream);
85792 int (*cleanup)(struct hda_pcm_stream *info, struct hda_codec *codec,
85793 struct snd_pcm_substream *substream);
85794 -};
85795 +} __no_const;
85796
85797 /* PCM information for each substream */
85798 struct hda_pcm_stream {
85799 @@ -760,7 +761,7 @@ struct hda_codec {
85800 const char *modelname; /* model name for preset */
85801
85802 /* set by patch */
85803 - struct hda_codec_ops patch_ops;
85804 + hda_codec_ops_no_const patch_ops;
85805
85806 /* PCM to create, set by patch_ops.build_pcms callback */
85807 unsigned int num_pcms;
85808 diff --git a/sound/pci/hda/patch_atihdmi.c b/sound/pci/hda/patch_atihdmi.c
85809 index fb684f0..2b11cea 100644
85810 --- a/sound/pci/hda/patch_atihdmi.c
85811 +++ b/sound/pci/hda/patch_atihdmi.c
85812 @@ -177,7 +177,7 @@ static int patch_atihdmi(struct hda_codec *codec)
85813 */
85814 spec->multiout.dig_out_nid = CVT_NID;
85815
85816 - codec->patch_ops = atihdmi_patch_ops;
85817 + memcpy((void *)&codec->patch_ops, &atihdmi_patch_ops, sizeof(atihdmi_patch_ops));
85818
85819 return 0;
85820 }
85821 diff --git a/sound/pci/hda/patch_intelhdmi.c b/sound/pci/hda/patch_intelhdmi.c
85822 index 7c23016..c5bfdd7 100644
85823 --- a/sound/pci/hda/patch_intelhdmi.c
85824 +++ b/sound/pci/hda/patch_intelhdmi.c
85825 @@ -511,10 +511,10 @@ static void hdmi_non_intrinsic_event(struct hda_codec *codec, unsigned int res)
85826 cp_ready);
85827
85828 /* TODO */
85829 - if (cp_state)
85830 - ;
85831 - if (cp_ready)
85832 - ;
85833 + if (cp_state) {
85834 + }
85835 + if (cp_ready) {
85836 + }
85837 }
85838
85839
85840 @@ -656,7 +656,7 @@ static int do_patch_intel_hdmi(struct hda_codec *codec)
85841 spec->multiout.dig_out_nid = cvt_nid;
85842
85843 codec->spec = spec;
85844 - codec->patch_ops = intel_hdmi_patch_ops;
85845 + memcpy((void *)&codec->patch_ops, &intel_hdmi_patch_ops, sizeof(intel_hdmi_patch_ops));
85846
85847 snd_hda_eld_proc_new(codec, &spec->sink_eld);
85848
85849 diff --git a/sound/pci/hda/patch_nvhdmi.c b/sound/pci/hda/patch_nvhdmi.c
85850 index 6afdab0..68ed352 100644
85851 --- a/sound/pci/hda/patch_nvhdmi.c
85852 +++ b/sound/pci/hda/patch_nvhdmi.c
85853 @@ -367,7 +367,7 @@ static int patch_nvhdmi_8ch(struct hda_codec *codec)
85854 spec->multiout.max_channels = 8;
85855 spec->multiout.dig_out_nid = Nv_Master_Convert_nid;
85856
85857 - codec->patch_ops = nvhdmi_patch_ops_8ch;
85858 + memcpy((void *)&codec->patch_ops, &nvhdmi_patch_ops_8ch, sizeof(nvhdmi_patch_ops_8ch));
85859
85860 return 0;
85861 }
85862 @@ -386,7 +386,7 @@ static int patch_nvhdmi_2ch(struct hda_codec *codec)
85863 spec->multiout.max_channels = 2;
85864 spec->multiout.dig_out_nid = Nv_Master_Convert_nid;
85865
85866 - codec->patch_ops = nvhdmi_patch_ops_2ch;
85867 + memcpy((void *)&codec->patch_ops, &nvhdmi_patch_ops_2ch, sizeof(nvhdmi_patch_ops_2ch));
85868
85869 return 0;
85870 }
85871 diff --git a/sound/pci/hda/patch_sigmatel.c b/sound/pci/hda/patch_sigmatel.c
85872 index 01da10b..01bd71f 100644
85873 --- a/sound/pci/hda/patch_sigmatel.c
85874 +++ b/sound/pci/hda/patch_sigmatel.c
85875 @@ -5220,7 +5220,7 @@ again:
85876 snd_hda_codec_write_cache(codec, nid, 0,
85877 AC_VERB_SET_CONNECT_SEL, num_dacs);
85878
85879 - codec->patch_ops = stac92xx_patch_ops;
85880 + memcpy((void *)&codec->patch_ops, &stac92xx_patch_ops, sizeof(stac92xx_patch_ops));
85881
85882 codec->proc_widget_hook = stac92hd_proc_hook;
85883
85884 @@ -5294,7 +5294,7 @@ static int patch_stac92hd71bxx(struct hda_codec *codec)
85885 return -ENOMEM;
85886
85887 codec->spec = spec;
85888 - codec->patch_ops = stac92xx_patch_ops;
85889 + memcpy((void *)&codec->patch_ops, &stac92xx_patch_ops, sizeof(stac92xx_patch_ops));
85890 spec->num_pins = STAC92HD71BXX_NUM_PINS;
85891 switch (codec->vendor_id) {
85892 case 0x111d76b6:
85893 diff --git a/sound/pci/ice1712/ice1712.h b/sound/pci/ice1712/ice1712.h
85894 index d063149..01599a4 100644
85895 --- a/sound/pci/ice1712/ice1712.h
85896 +++ b/sound/pci/ice1712/ice1712.h
85897 @@ -269,7 +269,7 @@ struct snd_ak4xxx_private {
85898 unsigned int mask_flags; /* total mask bits */
85899 struct snd_akm4xxx_ops {
85900 void (*set_rate_val)(struct snd_akm4xxx *ak, unsigned int rate);
85901 - } ops;
85902 + } __no_const ops;
85903 };
85904
85905 struct snd_ice1712_spdif {
85906 @@ -285,7 +285,7 @@ struct snd_ice1712_spdif {
85907 int (*default_put)(struct snd_ice1712 *, struct snd_ctl_elem_value *ucontrol);
85908 void (*stream_get)(struct snd_ice1712 *, struct snd_ctl_elem_value *ucontrol);
85909 int (*stream_put)(struct snd_ice1712 *, struct snd_ctl_elem_value *ucontrol);
85910 - } ops;
85911 + } __no_const ops;
85912 };
85913
85914
85915 diff --git a/sound/pci/intel8x0m.c b/sound/pci/intel8x0m.c
85916 index 9e7d12e..3e3bc64 100644
85917 --- a/sound/pci/intel8x0m.c
85918 +++ b/sound/pci/intel8x0m.c
85919 @@ -1264,7 +1264,7 @@ static struct shortname_table {
85920 { 0x5455, "ALi M5455" },
85921 { 0x746d, "AMD AMD8111" },
85922 #endif
85923 - { 0 },
85924 + { 0, },
85925 };
85926
85927 static int __devinit snd_intel8x0m_probe(struct pci_dev *pci,
85928 diff --git a/sound/pci/ymfpci/ymfpci_main.c b/sound/pci/ymfpci/ymfpci_main.c
85929 index 5518371..45cf7ac 100644
85930 --- a/sound/pci/ymfpci/ymfpci_main.c
85931 +++ b/sound/pci/ymfpci/ymfpci_main.c
85932 @@ -202,8 +202,8 @@ static void snd_ymfpci_hw_stop(struct snd_ymfpci *chip)
85933 if ((snd_ymfpci_readl(chip, YDSXGR_STATUS) & 2) == 0)
85934 break;
85935 }
85936 - if (atomic_read(&chip->interrupt_sleep_count)) {
85937 - atomic_set(&chip->interrupt_sleep_count, 0);
85938 + if (atomic_read_unchecked(&chip->interrupt_sleep_count)) {
85939 + atomic_set_unchecked(&chip->interrupt_sleep_count, 0);
85940 wake_up(&chip->interrupt_sleep);
85941 }
85942 __end:
85943 @@ -787,7 +787,7 @@ static void snd_ymfpci_irq_wait(struct snd_ymfpci *chip)
85944 continue;
85945 init_waitqueue_entry(&wait, current);
85946 add_wait_queue(&chip->interrupt_sleep, &wait);
85947 - atomic_inc(&chip->interrupt_sleep_count);
85948 + atomic_inc_unchecked(&chip->interrupt_sleep_count);
85949 schedule_timeout_uninterruptible(msecs_to_jiffies(50));
85950 remove_wait_queue(&chip->interrupt_sleep, &wait);
85951 }
85952 @@ -825,8 +825,8 @@ static irqreturn_t snd_ymfpci_interrupt(int irq, void *dev_id)
85953 snd_ymfpci_writel(chip, YDSXGR_MODE, mode);
85954 spin_unlock(&chip->reg_lock);
85955
85956 - if (atomic_read(&chip->interrupt_sleep_count)) {
85957 - atomic_set(&chip->interrupt_sleep_count, 0);
85958 + if (atomic_read_unchecked(&chip->interrupt_sleep_count)) {
85959 + atomic_set_unchecked(&chip->interrupt_sleep_count, 0);
85960 wake_up(&chip->interrupt_sleep);
85961 }
85962 }
85963 @@ -2369,7 +2369,7 @@ int __devinit snd_ymfpci_create(struct snd_card *card,
85964 spin_lock_init(&chip->reg_lock);
85965 spin_lock_init(&chip->voice_lock);
85966 init_waitqueue_head(&chip->interrupt_sleep);
85967 - atomic_set(&chip->interrupt_sleep_count, 0);
85968 + atomic_set_unchecked(&chip->interrupt_sleep_count, 0);
85969 chip->card = card;
85970 chip->pci = pci;
85971 chip->irq = -1;
85972 diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c
85973 index 0a1b2f6..776bb19 100644
85974 --- a/sound/soc/soc-core.c
85975 +++ b/sound/soc/soc-core.c
85976 @@ -609,7 +609,7 @@ static int soc_pcm_trigger(struct snd_pcm_substream *substream, int cmd)
85977 }
85978
85979 /* ASoC PCM operations */
85980 -static struct snd_pcm_ops soc_pcm_ops = {
85981 +static snd_pcm_ops_no_const soc_pcm_ops = {
85982 .open = soc_pcm_open,
85983 .close = soc_codec_close,
85984 .hw_params = soc_pcm_hw_params,
85985 diff --git a/sound/usb/usbaudio.c b/sound/usb/usbaudio.c
85986 index 79633ea..9732e90 100644
85987 --- a/sound/usb/usbaudio.c
85988 +++ b/sound/usb/usbaudio.c
85989 @@ -963,12 +963,12 @@ static int snd_usb_pcm_playback_trigger(struct snd_pcm_substream *substream,
85990 switch (cmd) {
85991 case SNDRV_PCM_TRIGGER_START:
85992 case SNDRV_PCM_TRIGGER_PAUSE_RELEASE:
85993 - subs->ops.prepare = prepare_playback_urb;
85994 + *(void **)&subs->ops.prepare = prepare_playback_urb;
85995 return 0;
85996 case SNDRV_PCM_TRIGGER_STOP:
85997 return deactivate_urbs(subs, 0, 0);
85998 case SNDRV_PCM_TRIGGER_PAUSE_PUSH:
85999 - subs->ops.prepare = prepare_nodata_playback_urb;
86000 + *(void **)&subs->ops.prepare = prepare_nodata_playback_urb;
86001 return 0;
86002 default:
86003 return -EINVAL;
86004 @@ -985,15 +985,15 @@ static int snd_usb_pcm_capture_trigger(struct snd_pcm_substream *substream,
86005
86006 switch (cmd) {
86007 case SNDRV_PCM_TRIGGER_START:
86008 - subs->ops.retire = retire_capture_urb;
86009 + *(void **)&subs->ops.retire = retire_capture_urb;
86010 return start_urbs(subs, substream->runtime);
86011 case SNDRV_PCM_TRIGGER_STOP:
86012 return deactivate_urbs(subs, 0, 0);
86013 case SNDRV_PCM_TRIGGER_PAUSE_PUSH:
86014 - subs->ops.retire = retire_paused_capture_urb;
86015 + *(void **)&subs->ops.retire = retire_paused_capture_urb;
86016 return 0;
86017 case SNDRV_PCM_TRIGGER_PAUSE_RELEASE:
86018 - subs->ops.retire = retire_capture_urb;
86019 + *(void **)&subs->ops.retire = retire_capture_urb;
86020 return 0;
86021 default:
86022 return -EINVAL;
86023 @@ -1542,7 +1542,7 @@ static int snd_usb_pcm_prepare(struct snd_pcm_substream *substream)
86024 /* for playback, submit the URBs now; otherwise, the first hwptr_done
86025 * updates for all URBs would happen at the same time when starting */
86026 if (subs->direction == SNDRV_PCM_STREAM_PLAYBACK) {
86027 - subs->ops.prepare = prepare_nodata_playback_urb;
86028 + *(void **)&subs->ops.prepare = prepare_nodata_playback_urb;
86029 return start_urbs(subs, runtime);
86030 } else
86031 return 0;
86032 @@ -2228,14 +2228,14 @@ static void init_substream(struct snd_usb_stream *as, int stream, struct audiofo
86033 subs->direction = stream;
86034 subs->dev = as->chip->dev;
86035 if (snd_usb_get_speed(subs->dev) == USB_SPEED_FULL) {
86036 - subs->ops = audio_urb_ops[stream];
86037 + memcpy((void *)&subs->ops, &audio_urb_ops[stream], sizeof(subs->ops));
86038 } else {
86039 - subs->ops = audio_urb_ops_high_speed[stream];
86040 + memcpy((void *)&subs->ops, &audio_urb_ops_high_speed[stream], sizeof(subs->ops));
86041 switch (as->chip->usb_id) {
86042 case USB_ID(0x041e, 0x3f02): /* E-Mu 0202 USB */
86043 case USB_ID(0x041e, 0x3f04): /* E-Mu 0404 USB */
86044 case USB_ID(0x041e, 0x3f0a): /* E-Mu Tracker Pre */
86045 - subs->ops.retire_sync = retire_playback_sync_urb_hs_emu;
86046 + *(void **)&subs->ops.retire_sync = retire_playback_sync_urb_hs_emu;
86047 break;
86048 }
86049 }
86050 diff --git a/tools/gcc/Makefile b/tools/gcc/Makefile
86051 new file mode 100644
86052 index 0000000..b044b80
86053 --- /dev/null
86054 +++ b/tools/gcc/Makefile
86055 @@ -0,0 +1,21 @@
86056 +#CC := gcc
86057 +#PLUGIN_SOURCE_FILES := pax_plugin.c
86058 +#PLUGIN_OBJECT_FILES := $(patsubst %.c,%.o,$(PLUGIN_SOURCE_FILES))
86059 +GCCPLUGINS_DIR := $(shell $(CC) -print-file-name=plugin)
86060 +#CFLAGS += -I$(GCCPLUGINS_DIR)/include -fPIC -O2 -Wall -W
86061 +
86062 +HOST_EXTRACFLAGS += -I$(GCCPLUGINS_DIR)/include
86063 +
86064 +hostlibs-y := constify_plugin.so
86065 +hostlibs-$(CONFIG_PAX_MEMORY_STACKLEAK) += stackleak_plugin.so
86066 +hostlibs-$(CONFIG_KALLOCSTAT_PLUGIN) += kallocstat_plugin.so
86067 +hostlibs-$(CONFIG_PAX_KERNEXEC_PLUGIN) += kernexec_plugin.so
86068 +hostlibs-$(CONFIG_CHECKER_PLUGIN) += checker_plugin.so
86069 +
86070 +always := $(hostlibs-y)
86071 +
86072 +constify_plugin-objs := constify_plugin.o
86073 +stackleak_plugin-objs := stackleak_plugin.o
86074 +kallocstat_plugin-objs := kallocstat_plugin.o
86075 +kernexec_plugin-objs := kernexec_plugin.o
86076 +checker_plugin-objs := checker_plugin.o
86077 diff --git a/tools/gcc/checker_plugin.c b/tools/gcc/checker_plugin.c
86078 new file mode 100644
86079 index 0000000..d41b5af
86080 --- /dev/null
86081 +++ b/tools/gcc/checker_plugin.c
86082 @@ -0,0 +1,171 @@
86083 +/*
86084 + * Copyright 2011 by the PaX Team <pageexec@freemail.hu>
86085 + * Licensed under the GPL v2
86086 + *
86087 + * Note: the choice of the license means that the compilation process is
86088 + * NOT 'eligible' as defined by gcc's library exception to the GPL v3,
86089 + * but for the kernel it doesn't matter since it doesn't link against
86090 + * any of the gcc libraries
86091 + *
86092 + * gcc plugin to implement various sparse (source code checker) features
86093 + *
86094 + * TODO:
86095 + * - define separate __iomem, __percpu and __rcu address spaces (lots of code to patch)
86096 + *
86097 + * BUGS:
86098 + * - none known
86099 + */
86100 +#include "gcc-plugin.h"
86101 +#include "config.h"
86102 +#include "system.h"
86103 +#include "coretypes.h"
86104 +#include "tree.h"
86105 +#include "tree-pass.h"
86106 +#include "flags.h"
86107 +#include "intl.h"
86108 +#include "toplev.h"
86109 +#include "plugin.h"
86110 +//#include "expr.h" where are you...
86111 +#include "diagnostic.h"
86112 +#include "plugin-version.h"
86113 +#include "tm.h"
86114 +#include "function.h"
86115 +#include "basic-block.h"
86116 +#include "gimple.h"
86117 +#include "rtl.h"
86118 +#include "emit-rtl.h"
86119 +#include "tree-flow.h"
86120 +#include "target.h"
86121 +
86122 +extern void c_register_addr_space (const char *str, addr_space_t as);
86123 +extern enum machine_mode default_addr_space_pointer_mode (addr_space_t);
86124 +extern enum machine_mode default_addr_space_address_mode (addr_space_t);
86125 +extern bool default_addr_space_valid_pointer_mode(enum machine_mode mode, addr_space_t as);
86126 +extern bool default_addr_space_legitimate_address_p(enum machine_mode mode, rtx mem, bool strict, addr_space_t as);
86127 +extern rtx default_addr_space_legitimize_address(rtx x, rtx oldx, enum machine_mode mode, addr_space_t as);
86128 +
86129 +extern void print_gimple_stmt(FILE *, gimple, int, int);
86130 +extern rtx emit_move_insn(rtx x, rtx y);
86131 +
86132 +int plugin_is_GPL_compatible;
86133 +
86134 +static struct plugin_info checker_plugin_info = {
86135 + .version = "201111150100",
86136 +};
86137 +
86138 +#define ADDR_SPACE_KERNEL 0
86139 +#define ADDR_SPACE_FORCE_KERNEL 1
86140 +#define ADDR_SPACE_USER 2
86141 +#define ADDR_SPACE_FORCE_USER 3
86142 +#define ADDR_SPACE_IOMEM 0
86143 +#define ADDR_SPACE_FORCE_IOMEM 0
86144 +#define ADDR_SPACE_PERCPU 0
86145 +#define ADDR_SPACE_FORCE_PERCPU 0
86146 +#define ADDR_SPACE_RCU 0
86147 +#define ADDR_SPACE_FORCE_RCU 0
86148 +
86149 +static enum machine_mode checker_addr_space_pointer_mode(addr_space_t addrspace)
86150 +{
86151 + return default_addr_space_pointer_mode(ADDR_SPACE_GENERIC);
86152 +}
86153 +
86154 +static enum machine_mode checker_addr_space_address_mode(addr_space_t addrspace)
86155 +{
86156 + return default_addr_space_address_mode(ADDR_SPACE_GENERIC);
86157 +}
86158 +
86159 +static bool checker_addr_space_valid_pointer_mode(enum machine_mode mode, addr_space_t as)
86160 +{
86161 + return default_addr_space_valid_pointer_mode(mode, as);
86162 +}
86163 +
86164 +static bool checker_addr_space_legitimate_address_p(enum machine_mode mode, rtx mem, bool strict, addr_space_t as)
86165 +{
86166 + return default_addr_space_legitimate_address_p(mode, mem, strict, ADDR_SPACE_GENERIC);
86167 +}
86168 +
86169 +static rtx checker_addr_space_legitimize_address(rtx x, rtx oldx, enum machine_mode mode, addr_space_t as)
86170 +{
86171 + return default_addr_space_legitimize_address(x, oldx, mode, as);
86172 +}
86173 +
86174 +static bool checker_addr_space_subset_p(addr_space_t subset, addr_space_t superset)
86175 +{
86176 + if (subset == ADDR_SPACE_FORCE_KERNEL && superset == ADDR_SPACE_KERNEL)
86177 + return true;
86178 +
86179 + if (subset == ADDR_SPACE_FORCE_USER && superset == ADDR_SPACE_USER)
86180 + return true;
86181 +
86182 + if (subset == ADDR_SPACE_FORCE_IOMEM && superset == ADDR_SPACE_IOMEM)
86183 + return true;
86184 +
86185 + if (subset == ADDR_SPACE_KERNEL && superset == ADDR_SPACE_FORCE_USER)
86186 + return true;
86187 +
86188 + if (subset == ADDR_SPACE_KERNEL && superset == ADDR_SPACE_FORCE_IOMEM)
86189 + return true;
86190 +
86191 + if (subset == ADDR_SPACE_USER && superset == ADDR_SPACE_FORCE_KERNEL)
86192 + return true;
86193 +
86194 + if (subset == ADDR_SPACE_IOMEM && superset == ADDR_SPACE_FORCE_KERNEL)
86195 + return true;
86196 +
86197 + return subset == superset;
86198 +}
86199 +
86200 +static rtx checker_addr_space_convert(rtx op, tree from_type, tree to_type)
86201 +{
86202 +// addr_space_t from_as = TYPE_ADDR_SPACE(TREE_TYPE(from_type));
86203 +// addr_space_t to_as = TYPE_ADDR_SPACE(TREE_TYPE(to_type));
86204 +
86205 + return op;
86206 +}
86207 +
86208 +static void register_checker_address_spaces(void *event_data, void *data)
86209 +{
86210 + c_register_addr_space("__kernel", ADDR_SPACE_KERNEL);
86211 + c_register_addr_space("__force_kernel", ADDR_SPACE_FORCE_KERNEL);
86212 + c_register_addr_space("__user", ADDR_SPACE_USER);
86213 + c_register_addr_space("__force_user", ADDR_SPACE_FORCE_USER);
86214 +// c_register_addr_space("__iomem", ADDR_SPACE_IOMEM);
86215 +// c_register_addr_space("__force_iomem", ADDR_SPACE_FORCE_IOMEM);
86216 +// c_register_addr_space("__percpu", ADDR_SPACE_PERCPU);
86217 +// c_register_addr_space("__force_percpu", ADDR_SPACE_FORCE_PERCPU);
86218 +// c_register_addr_space("__rcu", ADDR_SPACE_RCU);
86219 +// c_register_addr_space("__force_rcu", ADDR_SPACE_FORCE_RCU);
86220 +
86221 + targetm.addr_space.pointer_mode = checker_addr_space_pointer_mode;
86222 + targetm.addr_space.address_mode = checker_addr_space_address_mode;
86223 + targetm.addr_space.valid_pointer_mode = checker_addr_space_valid_pointer_mode;
86224 + targetm.addr_space.legitimate_address_p = checker_addr_space_legitimate_address_p;
86225 +// targetm.addr_space.legitimize_address = checker_addr_space_legitimize_address;
86226 + targetm.addr_space.subset_p = checker_addr_space_subset_p;
86227 + targetm.addr_space.convert = checker_addr_space_convert;
86228 +}
86229 +
86230 +int plugin_init(struct plugin_name_args *plugin_info, struct plugin_gcc_version *version)
86231 +{
86232 + const char * const plugin_name = plugin_info->base_name;
86233 + const int argc = plugin_info->argc;
86234 + const struct plugin_argument * const argv = plugin_info->argv;
86235 + int i;
86236 +
86237 + if (!plugin_default_version_check(version, &gcc_version)) {
86238 + error(G_("incompatible gcc/plugin versions"));
86239 + return 1;
86240 + }
86241 +
86242 + register_callback(plugin_name, PLUGIN_INFO, NULL, &checker_plugin_info);
86243 +
86244 + for (i = 0; i < argc; ++i)
86245 + error(G_("unkown option '-fplugin-arg-%s-%s'"), plugin_name, argv[i].key);
86246 +
86247 + if (TARGET_64BIT == 0)
86248 + return 0;
86249 +
86250 + register_callback(plugin_name, PLUGIN_PRAGMAS, register_checker_address_spaces, NULL);
86251 +
86252 + return 0;
86253 +}
86254 diff --git a/tools/gcc/constify_plugin.c b/tools/gcc/constify_plugin.c
86255 new file mode 100644
86256 index 0000000..704a564
86257 --- /dev/null
86258 +++ b/tools/gcc/constify_plugin.c
86259 @@ -0,0 +1,303 @@
86260 +/*
86261 + * Copyright 2011 by Emese Revfy <re.emese@gmail.com>
86262 + * Copyright 2011 by PaX Team <pageexec@freemail.hu>
86263 + * Licensed under the GPL v2, or (at your option) v3
86264 + *
86265 + * This gcc plugin constifies all structures which contain only function pointers or are explicitly marked for constification.
86266 + *
86267 + * Homepage:
86268 + * http://www.grsecurity.net/~ephox/const_plugin/
86269 + *
86270 + * Usage:
86271 + * $ gcc -I`gcc -print-file-name=plugin`/include -fPIC -shared -O2 -o constify_plugin.so constify_plugin.c
86272 + * $ gcc -fplugin=constify_plugin.so test.c -O2
86273 + */
86274 +
86275 +#include "gcc-plugin.h"
86276 +#include "config.h"
86277 +#include "system.h"
86278 +#include "coretypes.h"
86279 +#include "tree.h"
86280 +#include "tree-pass.h"
86281 +#include "flags.h"
86282 +#include "intl.h"
86283 +#include "toplev.h"
86284 +#include "plugin.h"
86285 +#include "diagnostic.h"
86286 +#include "plugin-version.h"
86287 +#include "tm.h"
86288 +#include "function.h"
86289 +#include "basic-block.h"
86290 +#include "gimple.h"
86291 +#include "rtl.h"
86292 +#include "emit-rtl.h"
86293 +#include "tree-flow.h"
86294 +
86295 +#define C_TYPE_FIELDS_READONLY(TYPE) TREE_LANG_FLAG_1(TYPE)
86296 +
86297 +int plugin_is_GPL_compatible;
86298 +
86299 +static struct plugin_info const_plugin_info = {
86300 + .version = "201111150100",
86301 + .help = "no-constify\tturn off constification\n",
86302 +};
86303 +
86304 +static void constify_type(tree type);
86305 +static bool walk_struct(tree node);
86306 +
86307 +static tree deconstify_type(tree old_type)
86308 +{
86309 + tree new_type, field;
86310 +
86311 + new_type = build_qualified_type(old_type, TYPE_QUALS(old_type) & ~TYPE_QUAL_CONST);
86312 + TYPE_FIELDS(new_type) = copy_list(TYPE_FIELDS(new_type));
86313 + for (field = TYPE_FIELDS(new_type); field; field = TREE_CHAIN(field))
86314 + DECL_FIELD_CONTEXT(field) = new_type;
86315 + TYPE_READONLY(new_type) = 0;
86316 + C_TYPE_FIELDS_READONLY(new_type) = 0;
86317 + return new_type;
86318 +}
86319 +
86320 +static tree handle_no_const_attribute(tree *node, tree name, tree args, int flags, bool *no_add_attrs)
86321 +{
86322 + tree type;
86323 +
86324 + *no_add_attrs = true;
86325 + if (TREE_CODE(*node) == FUNCTION_DECL) {
86326 + error("%qE attribute does not apply to functions", name);
86327 + return NULL_TREE;
86328 + }
86329 +
86330 + if (TREE_CODE(*node) == VAR_DECL) {
86331 + error("%qE attribute does not apply to variables", name);
86332 + return NULL_TREE;
86333 + }
86334 +
86335 + if (TYPE_P(*node)) {
86336 + if (TREE_CODE(*node) == RECORD_TYPE || TREE_CODE(*node) == UNION_TYPE)
86337 + *no_add_attrs = false;
86338 + else
86339 + error("%qE attribute applies to struct and union types only", name);
86340 + return NULL_TREE;
86341 + }
86342 +
86343 + type = TREE_TYPE(*node);
86344 +
86345 + if (TREE_CODE(type) != RECORD_TYPE && TREE_CODE(type) != UNION_TYPE) {
86346 + error("%qE attribute applies to struct and union types only", name);
86347 + return NULL_TREE;
86348 + }
86349 +
86350 + if (lookup_attribute(IDENTIFIER_POINTER(name), TYPE_ATTRIBUTES(type))) {
86351 + error("%qE attribute is already applied to the type", name);
86352 + return NULL_TREE;
86353 + }
86354 +
86355 + if (TREE_CODE(*node) == TYPE_DECL && !TYPE_READONLY(type)) {
86356 + error("%qE attribute used on type that is not constified", name);
86357 + return NULL_TREE;
86358 + }
86359 +
86360 + if (TREE_CODE(*node) == TYPE_DECL) {
86361 + TREE_TYPE(*node) = deconstify_type(type);
86362 + TREE_READONLY(*node) = 0;
86363 + return NULL_TREE;
86364 + }
86365 +
86366 + return NULL_TREE;
86367 +}
86368 +
86369 +static tree handle_do_const_attribute(tree *node, tree name, tree args, int flags, bool *no_add_attrs)
86370 +{
86371 + *no_add_attrs = true;
86372 + if (!TYPE_P(*node)) {
86373 + error("%qE attribute applies to types only", name);
86374 + return NULL_TREE;
86375 + }
86376 +
86377 + if (TREE_CODE(*node) != RECORD_TYPE && TREE_CODE(*node) != UNION_TYPE) {
86378 + error("%qE attribute applies to struct and union types only", name);
86379 + return NULL_TREE;
86380 + }
86381 +
86382 + *no_add_attrs = false;
86383 + constify_type(*node);
86384 + return NULL_TREE;
86385 +}
86386 +
86387 +static struct attribute_spec no_const_attr = {
86388 + .name = "no_const",
86389 + .min_length = 0,
86390 + .max_length = 0,
86391 + .decl_required = false,
86392 + .type_required = false,
86393 + .function_type_required = false,
86394 + .handler = handle_no_const_attribute,
86395 +#if BUILDING_GCC_VERSION >= 4007
86396 + .affects_type_identity = true
86397 +#endif
86398 +};
86399 +
86400 +static struct attribute_spec do_const_attr = {
86401 + .name = "do_const",
86402 + .min_length = 0,
86403 + .max_length = 0,
86404 + .decl_required = false,
86405 + .type_required = false,
86406 + .function_type_required = false,
86407 + .handler = handle_do_const_attribute,
86408 +#if BUILDING_GCC_VERSION >= 4007
86409 + .affects_type_identity = true
86410 +#endif
86411 +};
86412 +
86413 +static void register_attributes(void *event_data, void *data)
86414 +{
86415 + register_attribute(&no_const_attr);
86416 + register_attribute(&do_const_attr);
86417 +}
86418 +
86419 +static void constify_type(tree type)
86420 +{
86421 + TYPE_READONLY(type) = 1;
86422 + C_TYPE_FIELDS_READONLY(type) = 1;
86423 +}
86424 +
86425 +static bool is_fptr(tree field)
86426 +{
86427 + tree ptr = TREE_TYPE(field);
86428 +
86429 + if (TREE_CODE(ptr) != POINTER_TYPE)
86430 + return false;
86431 +
86432 + return TREE_CODE(TREE_TYPE(ptr)) == FUNCTION_TYPE;
86433 +}
86434 +
86435 +static bool walk_struct(tree node)
86436 +{
86437 + tree field;
86438 +
86439 + if (lookup_attribute("no_const", TYPE_ATTRIBUTES(node)))
86440 + return false;
86441 +
86442 + if (TYPE_FIELDS(node) == NULL_TREE)
86443 + return false;
86444 +
86445 + for (field = TYPE_FIELDS(node); field; field = TREE_CHAIN(field)) {
86446 + tree type = TREE_TYPE(field);
86447 + enum tree_code code = TREE_CODE(type);
86448 + if (code == RECORD_TYPE || code == UNION_TYPE) {
86449 + if (!(walk_struct(type)))
86450 + return false;
86451 + } else if (!is_fptr(field) && !TREE_READONLY(field))
86452 + return false;
86453 + }
86454 + return true;
86455 +}
86456 +
86457 +static void finish_type(void *event_data, void *data)
86458 +{
86459 + tree type = (tree)event_data;
86460 +
86461 + if (type == NULL_TREE)
86462 + return;
86463 +
86464 + if (TYPE_READONLY(type))
86465 + return;
86466 +
86467 + if (walk_struct(type))
86468 + constify_type(type);
86469 +}
86470 +
86471 +static unsigned int check_local_variables(void);
86472 +
86473 +struct gimple_opt_pass pass_local_variable = {
86474 + {
86475 + .type = GIMPLE_PASS,
86476 + .name = "check_local_variables",
86477 + .gate = NULL,
86478 + .execute = check_local_variables,
86479 + .sub = NULL,
86480 + .next = NULL,
86481 + .static_pass_number = 0,
86482 + .tv_id = TV_NONE,
86483 + .properties_required = 0,
86484 + .properties_provided = 0,
86485 + .properties_destroyed = 0,
86486 + .todo_flags_start = 0,
86487 + .todo_flags_finish = 0
86488 + }
86489 +};
86490 +
86491 +static unsigned int check_local_variables(void)
86492 +{
86493 + tree var;
86494 + referenced_var_iterator rvi;
86495 +
86496 +#if BUILDING_GCC_VERSION == 4005
86497 + FOR_EACH_REFERENCED_VAR(var, rvi) {
86498 +#else
86499 + FOR_EACH_REFERENCED_VAR(cfun, var, rvi) {
86500 +#endif
86501 + tree type = TREE_TYPE(var);
86502 +
86503 + if (!DECL_P(var) || TREE_STATIC(var) || DECL_EXTERNAL(var))
86504 + continue;
86505 +
86506 + if (TREE_CODE(type) != RECORD_TYPE && TREE_CODE(type) != UNION_TYPE)
86507 + continue;
86508 +
86509 + if (!TYPE_READONLY(type))
86510 + continue;
86511 +
86512 +// if (lookup_attribute("no_const", DECL_ATTRIBUTES(var)))
86513 +// continue;
86514 +
86515 +// if (lookup_attribute("no_const", TYPE_ATTRIBUTES(type)))
86516 +// continue;
86517 +
86518 + if (walk_struct(type)) {
86519 + error("constified variable %qE cannot be local", var);
86520 + return 1;
86521 + }
86522 + }
86523 + return 0;
86524 +}
86525 +
86526 +int plugin_init(struct plugin_name_args *plugin_info, struct plugin_gcc_version *version)
86527 +{
86528 + const char * const plugin_name = plugin_info->base_name;
86529 + const int argc = plugin_info->argc;
86530 + const struct plugin_argument * const argv = plugin_info->argv;
86531 + int i;
86532 + bool constify = true;
86533 +
86534 + struct register_pass_info local_variable_pass_info = {
86535 + .pass = &pass_local_variable.pass,
86536 + .reference_pass_name = "*referenced_vars",
86537 + .ref_pass_instance_number = 0,
86538 + .pos_op = PASS_POS_INSERT_AFTER
86539 + };
86540 +
86541 + if (!plugin_default_version_check(version, &gcc_version)) {
86542 + error(G_("incompatible gcc/plugin versions"));
86543 + return 1;
86544 + }
86545 +
86546 + for (i = 0; i < argc; ++i) {
86547 + if (!(strcmp(argv[i].key, "no-constify"))) {
86548 + constify = false;
86549 + continue;
86550 + }
86551 + error(G_("unkown option '-fplugin-arg-%s-%s'"), plugin_name, argv[i].key);
86552 + }
86553 +
86554 + register_callback(plugin_name, PLUGIN_INFO, NULL, &const_plugin_info);
86555 + if (constify) {
86556 + register_callback(plugin_name, PLUGIN_FINISH_TYPE, finish_type, NULL);
86557 + register_callback(plugin_name, PLUGIN_PASS_MANAGER_SETUP, NULL, &local_variable_pass_info);
86558 + }
86559 + register_callback(plugin_name, PLUGIN_ATTRIBUTES, register_attributes, NULL);
86560 +
86561 + return 0;
86562 +}
86563 diff --git a/tools/gcc/kallocstat_plugin.c b/tools/gcc/kallocstat_plugin.c
86564 new file mode 100644
86565 index 0000000..a5eabce
86566 --- /dev/null
86567 +++ b/tools/gcc/kallocstat_plugin.c
86568 @@ -0,0 +1,167 @@
86569 +/*
86570 + * Copyright 2011 by the PaX Team <pageexec@freemail.hu>
86571 + * Licensed under the GPL v2
86572 + *
86573 + * Note: the choice of the license means that the compilation process is
86574 + * NOT 'eligible' as defined by gcc's library exception to the GPL v3,
86575 + * but for the kernel it doesn't matter since it doesn't link against
86576 + * any of the gcc libraries
86577 + *
86578 + * gcc plugin to find the distribution of k*alloc sizes
86579 + *
86580 + * TODO:
86581 + *
86582 + * BUGS:
86583 + * - none known
86584 + */
86585 +#include "gcc-plugin.h"
86586 +#include "config.h"
86587 +#include "system.h"
86588 +#include "coretypes.h"
86589 +#include "tree.h"
86590 +#include "tree-pass.h"
86591 +#include "flags.h"
86592 +#include "intl.h"
86593 +#include "toplev.h"
86594 +#include "plugin.h"
86595 +//#include "expr.h" where are you...
86596 +#include "diagnostic.h"
86597 +#include "plugin-version.h"
86598 +#include "tm.h"
86599 +#include "function.h"
86600 +#include "basic-block.h"
86601 +#include "gimple.h"
86602 +#include "rtl.h"
86603 +#include "emit-rtl.h"
86604 +
86605 +extern void print_gimple_stmt(FILE *, gimple, int, int);
86606 +
86607 +int plugin_is_GPL_compatible;
86608 +
86609 +static const char * const kalloc_functions[] = {
86610 + "__kmalloc",
86611 + "kmalloc",
86612 + "kmalloc_large",
86613 + "kmalloc_node",
86614 + "kmalloc_order",
86615 + "kmalloc_order_trace",
86616 + "kmalloc_slab",
86617 + "kzalloc",
86618 + "kzalloc_node",
86619 +};
86620 +
86621 +static struct plugin_info kallocstat_plugin_info = {
86622 + .version = "201111150100",
86623 +};
86624 +
86625 +static unsigned int execute_kallocstat(void);
86626 +
86627 +static struct gimple_opt_pass kallocstat_pass = {
86628 + .pass = {
86629 + .type = GIMPLE_PASS,
86630 + .name = "kallocstat",
86631 + .gate = NULL,
86632 + .execute = execute_kallocstat,
86633 + .sub = NULL,
86634 + .next = NULL,
86635 + .static_pass_number = 0,
86636 + .tv_id = TV_NONE,
86637 + .properties_required = 0,
86638 + .properties_provided = 0,
86639 + .properties_destroyed = 0,
86640 + .todo_flags_start = 0,
86641 + .todo_flags_finish = 0
86642 + }
86643 +};
86644 +
86645 +static bool is_kalloc(const char *fnname)
86646 +{
86647 + size_t i;
86648 +
86649 + for (i = 0; i < ARRAY_SIZE(kalloc_functions); i++)
86650 + if (!strcmp(fnname, kalloc_functions[i]))
86651 + return true;
86652 + return false;
86653 +}
86654 +
86655 +static unsigned int execute_kallocstat(void)
86656 +{
86657 + basic_block bb;
86658 +
86659 + // 1. loop through BBs and GIMPLE statements
86660 + FOR_EACH_BB(bb) {
86661 + gimple_stmt_iterator gsi;
86662 + for (gsi = gsi_start_bb(bb); !gsi_end_p(gsi); gsi_next(&gsi)) {
86663 + // gimple match:
86664 + tree fndecl, size;
86665 + gimple call_stmt;
86666 + const char *fnname;
86667 +
86668 + // is it a call
86669 + call_stmt = gsi_stmt(gsi);
86670 + if (!is_gimple_call(call_stmt))
86671 + continue;
86672 + fndecl = gimple_call_fndecl(call_stmt);
86673 + if (fndecl == NULL_TREE)
86674 + continue;
86675 + if (TREE_CODE(fndecl) != FUNCTION_DECL)
86676 + continue;
86677 +
86678 + // is it a call to k*alloc
86679 + fnname = IDENTIFIER_POINTER(DECL_NAME(fndecl));
86680 + if (!is_kalloc(fnname))
86681 + continue;
86682 +
86683 + // is the size arg the result of a simple const assignment
86684 + size = gimple_call_arg(call_stmt, 0);
86685 + while (true) {
86686 + gimple def_stmt;
86687 + expanded_location xloc;
86688 + size_t size_val;
86689 +
86690 + if (TREE_CODE(size) != SSA_NAME)
86691 + break;
86692 + def_stmt = SSA_NAME_DEF_STMT(size);
86693 + if (!def_stmt || !is_gimple_assign(def_stmt))
86694 + break;
86695 + if (gimple_num_ops(def_stmt) != 2)
86696 + break;
86697 + size = gimple_assign_rhs1(def_stmt);
86698 + if (!TREE_CONSTANT(size))
86699 + continue;
86700 + xloc = expand_location(gimple_location(def_stmt));
86701 + if (!xloc.file)
86702 + xloc = expand_location(DECL_SOURCE_LOCATION(current_function_decl));
86703 + size_val = TREE_INT_CST_LOW(size);
86704 + fprintf(stderr, "kallocsize: %8zu %8zx %s %s:%u\n", size_val, size_val, fnname, xloc.file, xloc.line);
86705 + break;
86706 + }
86707 +//print_gimple_stmt(stderr, call_stmt, 0, TDF_LINENO);
86708 +//debug_tree(gimple_call_fn(call_stmt));
86709 +//print_node(stderr, "pax", fndecl, 4);
86710 + }
86711 + }
86712 +
86713 + return 0;
86714 +}
86715 +
86716 +int plugin_init(struct plugin_name_args *plugin_info, struct plugin_gcc_version *version)
86717 +{
86718 + const char * const plugin_name = plugin_info->base_name;
86719 + struct register_pass_info kallocstat_pass_info = {
86720 + .pass = &kallocstat_pass.pass,
86721 + .reference_pass_name = "ssa",
86722 + .ref_pass_instance_number = 0,
86723 + .pos_op = PASS_POS_INSERT_AFTER
86724 + };
86725 +
86726 + if (!plugin_default_version_check(version, &gcc_version)) {
86727 + error(G_("incompatible gcc/plugin versions"));
86728 + return 1;
86729 + }
86730 +
86731 + register_callback(plugin_name, PLUGIN_INFO, NULL, &kallocstat_plugin_info);
86732 + register_callback(plugin_name, PLUGIN_PASS_MANAGER_SETUP, NULL, &kallocstat_pass_info);
86733 +
86734 + return 0;
86735 +}
86736 diff --git a/tools/gcc/kernexec_plugin.c b/tools/gcc/kernexec_plugin.c
86737 new file mode 100644
86738 index 0000000..51f747e
86739 --- /dev/null
86740 +++ b/tools/gcc/kernexec_plugin.c
86741 @@ -0,0 +1,348 @@
86742 +/*
86743 + * Copyright 2011 by the PaX Team <pageexec@freemail.hu>
86744 + * Licensed under the GPL v2
86745 + *
86746 + * Note: the choice of the license means that the compilation process is
86747 + * NOT 'eligible' as defined by gcc's library exception to the GPL v3,
86748 + * but for the kernel it doesn't matter since it doesn't link against
86749 + * any of the gcc libraries
86750 + *
86751 + * gcc plugin to make KERNEXEC/amd64 almost as good as it is on i386
86752 + *
86753 + * TODO:
86754 + *
86755 + * BUGS:
86756 + * - none known
86757 + */
86758 +#include "gcc-plugin.h"
86759 +#include "config.h"
86760 +#include "system.h"
86761 +#include "coretypes.h"
86762 +#include "tree.h"
86763 +#include "tree-pass.h"
86764 +#include "flags.h"
86765 +#include "intl.h"
86766 +#include "toplev.h"
86767 +#include "plugin.h"
86768 +//#include "expr.h" where are you...
86769 +#include "diagnostic.h"
86770 +#include "plugin-version.h"
86771 +#include "tm.h"
86772 +#include "function.h"
86773 +#include "basic-block.h"
86774 +#include "gimple.h"
86775 +#include "rtl.h"
86776 +#include "emit-rtl.h"
86777 +#include "tree-flow.h"
86778 +
86779 +extern void print_gimple_stmt(FILE *, gimple, int, int);
86780 +extern rtx emit_move_insn(rtx x, rtx y);
86781 +
86782 +int plugin_is_GPL_compatible;
86783 +
86784 +static struct plugin_info kernexec_plugin_info = {
86785 + .version = "201111291120",
86786 + .help = "method=[bts|or]\tinstrumentation method\n"
86787 +};
86788 +
86789 +static unsigned int execute_kernexec_fptr(void);
86790 +static unsigned int execute_kernexec_retaddr(void);
86791 +static bool kernexec_cmodel_check(void);
86792 +
86793 +static void (*kernexec_instrument_fptr)(gimple_stmt_iterator);
86794 +static void (*kernexec_instrument_retaddr)(rtx);
86795 +
86796 +static struct gimple_opt_pass kernexec_fptr_pass = {
86797 + .pass = {
86798 + .type = GIMPLE_PASS,
86799 + .name = "kernexec_fptr",
86800 + .gate = kernexec_cmodel_check,
86801 + .execute = execute_kernexec_fptr,
86802 + .sub = NULL,
86803 + .next = NULL,
86804 + .static_pass_number = 0,
86805 + .tv_id = TV_NONE,
86806 + .properties_required = 0,
86807 + .properties_provided = 0,
86808 + .properties_destroyed = 0,
86809 + .todo_flags_start = 0,
86810 + .todo_flags_finish = TODO_verify_ssa | TODO_verify_stmts | TODO_dump_func | TODO_remove_unused_locals | TODO_update_ssa_no_phi
86811 + }
86812 +};
86813 +
86814 +static struct rtl_opt_pass kernexec_retaddr_pass = {
86815 + .pass = {
86816 + .type = RTL_PASS,
86817 + .name = "kernexec_retaddr",
86818 + .gate = kernexec_cmodel_check,
86819 + .execute = execute_kernexec_retaddr,
86820 + .sub = NULL,
86821 + .next = NULL,
86822 + .static_pass_number = 0,
86823 + .tv_id = TV_NONE,
86824 + .properties_required = 0,
86825 + .properties_provided = 0,
86826 + .properties_destroyed = 0,
86827 + .todo_flags_start = 0,
86828 + .todo_flags_finish = TODO_dump_func | TODO_ggc_collect
86829 + }
86830 +};
86831 +
86832 +static bool kernexec_cmodel_check(void)
86833 +{
86834 + tree section;
86835 +
86836 + if (ix86_cmodel != CM_KERNEL)
86837 + return false;
86838 +
86839 + section = lookup_attribute("section", DECL_ATTRIBUTES(current_function_decl));
86840 + if (!section || !TREE_VALUE(section))
86841 + return true;
86842 +
86843 + section = TREE_VALUE(TREE_VALUE(section));
86844 + if (strncmp(TREE_STRING_POINTER(section), ".vsyscall_", 10))
86845 + return true;
86846 +
86847 + return false;
86848 +}
86849 +
86850 +/*
86851 + * add special KERNEXEC instrumentation: force MSB of fptr to 1, which will produce
86852 + * a non-canonical address from a userland ptr and will just trigger a GPF on dereference
86853 + */
86854 +static void kernexec_instrument_fptr_bts(gimple_stmt_iterator gsi)
86855 +{
86856 + gimple assign_intptr, assign_new_fptr, call_stmt;
86857 + tree intptr, old_fptr, new_fptr, kernexec_mask;
86858 +
86859 + call_stmt = gsi_stmt(gsi);
86860 + old_fptr = gimple_call_fn(call_stmt);
86861 +
86862 + // create temporary unsigned long variable used for bitops and cast fptr to it
86863 + intptr = create_tmp_var(long_unsigned_type_node, "kernexec_bts");
86864 + add_referenced_var(intptr);
86865 + mark_sym_for_renaming(intptr);
86866 + assign_intptr = gimple_build_assign(intptr, fold_convert(long_unsigned_type_node, old_fptr));
86867 + gsi_insert_before(&gsi, assign_intptr, GSI_SAME_STMT);
86868 + update_stmt(assign_intptr);
86869 +
86870 + // apply logical or to temporary unsigned long and bitmask
86871 + kernexec_mask = build_int_cstu(long_long_unsigned_type_node, 0x8000000000000000LL);
86872 +// kernexec_mask = build_int_cstu(long_long_unsigned_type_node, 0xffffffff80000000LL);
86873 + assign_intptr = gimple_build_assign(intptr, fold_build2(BIT_IOR_EXPR, long_long_unsigned_type_node, intptr, kernexec_mask));
86874 + gsi_insert_before(&gsi, assign_intptr, GSI_SAME_STMT);
86875 + update_stmt(assign_intptr);
86876 +
86877 + // cast temporary unsigned long back to a temporary fptr variable
86878 + new_fptr = create_tmp_var(TREE_TYPE(old_fptr), "kernexec");
86879 + add_referenced_var(new_fptr);
86880 + mark_sym_for_renaming(new_fptr);
86881 + assign_new_fptr = gimple_build_assign(new_fptr, fold_convert(TREE_TYPE(old_fptr), intptr));
86882 + gsi_insert_before(&gsi, assign_new_fptr, GSI_SAME_STMT);
86883 + update_stmt(assign_new_fptr);
86884 +
86885 + // replace call stmt fn with the new fptr
86886 + gimple_call_set_fn(call_stmt, new_fptr);
86887 + update_stmt(call_stmt);
86888 +}
86889 +
86890 +static void kernexec_instrument_fptr_or(gimple_stmt_iterator gsi)
86891 +{
86892 + gimple asm_or_stmt, call_stmt;
86893 + tree old_fptr, new_fptr, input, output;
86894 + VEC(tree, gc) *inputs = NULL;
86895 + VEC(tree, gc) *outputs = NULL;
86896 +
86897 + call_stmt = gsi_stmt(gsi);
86898 + old_fptr = gimple_call_fn(call_stmt);
86899 +
86900 + // create temporary fptr variable
86901 + new_fptr = create_tmp_var(TREE_TYPE(old_fptr), "kernexec_or");
86902 + add_referenced_var(new_fptr);
86903 + mark_sym_for_renaming(new_fptr);
86904 +
86905 + // build asm volatile("orq %%r10, %0\n\t" : "=r"(new_fptr) : "0"(old_fptr));
86906 + input = build_tree_list(NULL_TREE, build_string(2, "0"));
86907 + input = chainon(NULL_TREE, build_tree_list(input, old_fptr));
86908 + output = build_tree_list(NULL_TREE, build_string(3, "=r"));
86909 + output = chainon(NULL_TREE, build_tree_list(output, new_fptr));
86910 + VEC_safe_push(tree, gc, inputs, input);
86911 + VEC_safe_push(tree, gc, outputs, output);
86912 + asm_or_stmt = gimple_build_asm_vec("orq %%r10, %0\n\t", inputs, outputs, NULL, NULL);
86913 + gimple_asm_set_volatile(asm_or_stmt, true);
86914 + gsi_insert_before(&gsi, asm_or_stmt, GSI_SAME_STMT);
86915 + update_stmt(asm_or_stmt);
86916 +
86917 + // replace call stmt fn with the new fptr
86918 + gimple_call_set_fn(call_stmt, new_fptr);
86919 + update_stmt(call_stmt);
86920 +}
86921 +
86922 +/*
86923 + * find all C level function pointer dereferences and forcibly set the highest bit of the pointer
86924 + */
86925 +static unsigned int execute_kernexec_fptr(void)
86926 +{
86927 + basic_block bb;
86928 + gimple_stmt_iterator gsi;
86929 +
86930 + // 1. loop through BBs and GIMPLE statements
86931 + FOR_EACH_BB(bb) {
86932 + for (gsi = gsi_start_bb(bb); !gsi_end_p(gsi); gsi_next(&gsi)) {
86933 + // gimple match: h_1 = get_fptr (); D.2709_3 = h_1 (x_2(D));
86934 + tree fn;
86935 + gimple call_stmt;
86936 +
86937 + // is it a call ...
86938 + call_stmt = gsi_stmt(gsi);
86939 + if (!is_gimple_call(call_stmt))
86940 + continue;
86941 + fn = gimple_call_fn(call_stmt);
86942 + if (TREE_CODE(fn) == ADDR_EXPR)
86943 + continue;
86944 + if (TREE_CODE(fn) != SSA_NAME)
86945 + gcc_unreachable();
86946 +
86947 + // ... through a function pointer
86948 + fn = SSA_NAME_VAR(fn);
86949 + if (TREE_CODE(fn) != VAR_DECL && TREE_CODE(fn) != PARM_DECL)
86950 + continue;
86951 + fn = TREE_TYPE(fn);
86952 + if (TREE_CODE(fn) != POINTER_TYPE)
86953 + continue;
86954 + fn = TREE_TYPE(fn);
86955 + if (TREE_CODE(fn) != FUNCTION_TYPE)
86956 + continue;
86957 +
86958 + kernexec_instrument_fptr(gsi);
86959 +
86960 +//debug_tree(gimple_call_fn(call_stmt));
86961 +//print_gimple_stmt(stderr, call_stmt, 0, TDF_LINENO);
86962 + }
86963 + }
86964 +
86965 + return 0;
86966 +}
86967 +
86968 +// add special KERNEXEC instrumentation: btsq $63,(%rsp) just before retn
86969 +static void kernexec_instrument_retaddr_bts(rtx insn)
86970 +{
86971 + rtx btsq;
86972 + rtvec argvec, constraintvec, labelvec;
86973 + int line;
86974 +
86975 + // create asm volatile("btsq $63,(%%rsp)":::)
86976 + argvec = rtvec_alloc(0);
86977 + constraintvec = rtvec_alloc(0);
86978 + labelvec = rtvec_alloc(0);
86979 + line = expand_location(RTL_LOCATION(insn)).line;
86980 + btsq = gen_rtx_ASM_OPERANDS(VOIDmode, "btsq $63,(%%rsp)", empty_string, 0, argvec, constraintvec, labelvec, line);
86981 + MEM_VOLATILE_P(btsq) = 1;
86982 +// RTX_FRAME_RELATED_P(btsq) = 1; // not for ASM_OPERANDS
86983 + emit_insn_before(btsq, insn);
86984 +}
86985 +
86986 +// add special KERNEXEC instrumentation: orq %r10,(%rsp) just before retn
86987 +static void kernexec_instrument_retaddr_or(rtx insn)
86988 +{
86989 + rtx orq;
86990 + rtvec argvec, constraintvec, labelvec;
86991 + int line;
86992 +
86993 + // create asm volatile("orq %%r10,(%%rsp)":::)
86994 + argvec = rtvec_alloc(0);
86995 + constraintvec = rtvec_alloc(0);
86996 + labelvec = rtvec_alloc(0);
86997 + line = expand_location(RTL_LOCATION(insn)).line;
86998 + orq = gen_rtx_ASM_OPERANDS(VOIDmode, "orq %%r10,(%%rsp)", empty_string, 0, argvec, constraintvec, labelvec, line);
86999 + MEM_VOLATILE_P(orq) = 1;
87000 +// RTX_FRAME_RELATED_P(orq) = 1; // not for ASM_OPERANDS
87001 + emit_insn_before(orq, insn);
87002 +}
87003 +
87004 +/*
87005 + * find all asm level function returns and forcibly set the highest bit of the return address
87006 + */
87007 +static unsigned int execute_kernexec_retaddr(void)
87008 +{
87009 + rtx insn;
87010 +
87011 + // 1. find function returns
87012 + for (insn = get_insns(); insn; insn = NEXT_INSN(insn)) {
87013 + // rtl match: (jump_insn 41 40 42 2 (return) fptr.c:42 634 {return_internal} (nil))
87014 + // (jump_insn 12 9 11 2 (parallel [ (return) (unspec [ (0) ] UNSPEC_REP) ]) fptr.c:46 635 {return_internal_long} (nil))
87015 + rtx body;
87016 +
87017 + // is it a retn
87018 + if (!JUMP_P(insn))
87019 + continue;
87020 + body = PATTERN(insn);
87021 + if (GET_CODE(body) == PARALLEL)
87022 + body = XVECEXP(body, 0, 0);
87023 + if (GET_CODE(body) != RETURN)
87024 + continue;
87025 + kernexec_instrument_retaddr(insn);
87026 + }
87027 +
87028 +// print_simple_rtl(stderr, get_insns());
87029 +// print_rtl(stderr, get_insns());
87030 +
87031 + return 0;
87032 +}
87033 +
87034 +int plugin_init(struct plugin_name_args *plugin_info, struct plugin_gcc_version *version)
87035 +{
87036 + const char * const plugin_name = plugin_info->base_name;
87037 + const int argc = plugin_info->argc;
87038 + const struct plugin_argument * const argv = plugin_info->argv;
87039 + int i;
87040 + struct register_pass_info kernexec_fptr_pass_info = {
87041 + .pass = &kernexec_fptr_pass.pass,
87042 + .reference_pass_name = "ssa",
87043 + .ref_pass_instance_number = 0,
87044 + .pos_op = PASS_POS_INSERT_AFTER
87045 + };
87046 + struct register_pass_info kernexec_retaddr_pass_info = {
87047 + .pass = &kernexec_retaddr_pass.pass,
87048 + .reference_pass_name = "pro_and_epilogue",
87049 + .ref_pass_instance_number = 0,
87050 + .pos_op = PASS_POS_INSERT_AFTER
87051 + };
87052 +
87053 + if (!plugin_default_version_check(version, &gcc_version)) {
87054 + error(G_("incompatible gcc/plugin versions"));
87055 + return 1;
87056 + }
87057 +
87058 + register_callback(plugin_name, PLUGIN_INFO, NULL, &kernexec_plugin_info);
87059 +
87060 + if (TARGET_64BIT == 0)
87061 + return 0;
87062 +
87063 + for (i = 0; i < argc; ++i) {
87064 + if (!strcmp(argv[i].key, "method")) {
87065 + if (!argv[i].value) {
87066 + error(G_("no value supplied for option '-fplugin-arg-%s-%s'"), plugin_name, argv[i].key);
87067 + continue;
87068 + }
87069 + if (!strcmp(argv[i].value, "bts")) {
87070 + kernexec_instrument_fptr = kernexec_instrument_fptr_bts;
87071 + kernexec_instrument_retaddr = kernexec_instrument_retaddr_bts;
87072 + } else if (!strcmp(argv[i].value, "or")) {
87073 + kernexec_instrument_fptr = kernexec_instrument_fptr_or;
87074 + kernexec_instrument_retaddr = kernexec_instrument_retaddr_or;
87075 + fix_register("r10", 1, 1);
87076 + } else
87077 + error(G_("invalid option argument '-fplugin-arg-%s-%s=%s'"), plugin_name, argv[i].key, argv[i].value);
87078 + continue;
87079 + }
87080 + error(G_("unkown option '-fplugin-arg-%s-%s'"), plugin_name, argv[i].key);
87081 + }
87082 + if (!kernexec_instrument_fptr || !kernexec_instrument_retaddr)
87083 + error(G_("no instrumentation method was selected via '-fplugin-arg-%s-method'"), plugin_name);
87084 +
87085 + register_callback(plugin_name, PLUGIN_PASS_MANAGER_SETUP, NULL, &kernexec_fptr_pass_info);
87086 + register_callback(plugin_name, PLUGIN_PASS_MANAGER_SETUP, NULL, &kernexec_retaddr_pass_info);
87087 +
87088 + return 0;
87089 +}
87090 diff --git a/tools/gcc/stackleak_plugin.c b/tools/gcc/stackleak_plugin.c
87091 new file mode 100644
87092 index 0000000..d44f37c
87093 --- /dev/null
87094 +++ b/tools/gcc/stackleak_plugin.c
87095 @@ -0,0 +1,291 @@
87096 +/*
87097 + * Copyright 2011 by the PaX Team <pageexec@freemail.hu>
87098 + * Licensed under the GPL v2
87099 + *
87100 + * Note: the choice of the license means that the compilation process is
87101 + * NOT 'eligible' as defined by gcc's library exception to the GPL v3,
87102 + * but for the kernel it doesn't matter since it doesn't link against
87103 + * any of the gcc libraries
87104 + *
87105 + * gcc plugin to help implement various PaX features
87106 + *
87107 + * - track lowest stack pointer
87108 + *
87109 + * TODO:
87110 + * - initialize all local variables
87111 + *
87112 + * BUGS:
87113 + * - none known
87114 + */
87115 +#include "gcc-plugin.h"
87116 +#include "config.h"
87117 +#include "system.h"
87118 +#include "coretypes.h"
87119 +#include "tree.h"
87120 +#include "tree-pass.h"
87121 +#include "flags.h"
87122 +#include "intl.h"
87123 +#include "toplev.h"
87124 +#include "plugin.h"
87125 +//#include "expr.h" where are you...
87126 +#include "diagnostic.h"
87127 +#include "plugin-version.h"
87128 +#include "tm.h"
87129 +#include "function.h"
87130 +#include "basic-block.h"
87131 +#include "gimple.h"
87132 +#include "rtl.h"
87133 +#include "emit-rtl.h"
87134 +
87135 +extern void print_gimple_stmt(FILE *, gimple, int, int);
87136 +
87137 +int plugin_is_GPL_compatible;
87138 +
87139 +static int track_frame_size = -1;
87140 +static const char track_function[] = "pax_track_stack";
87141 +static const char check_function[] = "pax_check_alloca";
87142 +static bool init_locals;
87143 +
87144 +static struct plugin_info stackleak_plugin_info = {
87145 + .version = "201111150100",
87146 + .help = "track-lowest-sp=nn\ttrack sp in functions whose frame size is at least nn bytes\n"
87147 +// "initialize-locals\t\tforcibly initialize all stack frames\n"
87148 +};
87149 +
87150 +static bool gate_stackleak_track_stack(void);
87151 +static unsigned int execute_stackleak_tree_instrument(void);
87152 +static unsigned int execute_stackleak_final(void);
87153 +
87154 +static struct gimple_opt_pass stackleak_tree_instrument_pass = {
87155 + .pass = {
87156 + .type = GIMPLE_PASS,
87157 + .name = "stackleak_tree_instrument",
87158 + .gate = gate_stackleak_track_stack,
87159 + .execute = execute_stackleak_tree_instrument,
87160 + .sub = NULL,
87161 + .next = NULL,
87162 + .static_pass_number = 0,
87163 + .tv_id = TV_NONE,
87164 + .properties_required = PROP_gimple_leh | PROP_cfg,
87165 + .properties_provided = 0,
87166 + .properties_destroyed = 0,
87167 + .todo_flags_start = 0, //TODO_verify_ssa | TODO_verify_flow | TODO_verify_stmts,
87168 + .todo_flags_finish = TODO_verify_ssa | TODO_verify_stmts | TODO_dump_func | TODO_update_ssa
87169 + }
87170 +};
87171 +
87172 +static struct rtl_opt_pass stackleak_final_rtl_opt_pass = {
87173 + .pass = {
87174 + .type = RTL_PASS,
87175 + .name = "stackleak_final",
87176 + .gate = gate_stackleak_track_stack,
87177 + .execute = execute_stackleak_final,
87178 + .sub = NULL,
87179 + .next = NULL,
87180 + .static_pass_number = 0,
87181 + .tv_id = TV_NONE,
87182 + .properties_required = 0,
87183 + .properties_provided = 0,
87184 + .properties_destroyed = 0,
87185 + .todo_flags_start = 0,
87186 + .todo_flags_finish = TODO_dump_func
87187 + }
87188 +};
87189 +
87190 +static bool gate_stackleak_track_stack(void)
87191 +{
87192 + return track_frame_size >= 0;
87193 +}
87194 +
87195 +static void stackleak_check_alloca(gimple_stmt_iterator gsi)
87196 +{
87197 + gimple check_alloca;
87198 + tree fndecl, fntype, alloca_size;
87199 +
87200 + // insert call to void pax_check_alloca(unsigned long size)
87201 + fntype = build_function_type_list(void_type_node, long_unsigned_type_node, NULL_TREE);
87202 + fndecl = build_fn_decl(check_function, fntype);
87203 + DECL_ASSEMBLER_NAME(fndecl); // for LTO
87204 + alloca_size = gimple_call_arg(gsi_stmt(gsi), 0);
87205 + check_alloca = gimple_build_call(fndecl, 1, alloca_size);
87206 + gsi_insert_before(&gsi, check_alloca, GSI_CONTINUE_LINKING);
87207 +}
87208 +
87209 +static void stackleak_add_instrumentation(gimple_stmt_iterator gsi)
87210 +{
87211 + gimple track_stack;
87212 + tree fndecl, fntype;
87213 +
87214 + // insert call to void pax_track_stack(void)
87215 + fntype = build_function_type_list(void_type_node, NULL_TREE);
87216 + fndecl = build_fn_decl(track_function, fntype);
87217 + DECL_ASSEMBLER_NAME(fndecl); // for LTO
87218 + track_stack = gimple_build_call(fndecl, 0);
87219 + gsi_insert_after(&gsi, track_stack, GSI_CONTINUE_LINKING);
87220 +}
87221 +
87222 +#if BUILDING_GCC_VERSION == 4005
87223 +static bool gimple_call_builtin_p(gimple stmt, enum built_in_function code)
87224 +{
87225 + tree fndecl;
87226 +
87227 + if (!is_gimple_call(stmt))
87228 + return false;
87229 + fndecl = gimple_call_fndecl(stmt);
87230 + if (!fndecl)
87231 + return false;
87232 + if (DECL_BUILT_IN_CLASS(fndecl) != BUILT_IN_NORMAL)
87233 + return false;
87234 +// print_node(stderr, "pax", fndecl, 4);
87235 + return DECL_FUNCTION_CODE(fndecl) == code;
87236 +}
87237 +#endif
87238 +
87239 +static bool is_alloca(gimple stmt)
87240 +{
87241 + if (gimple_call_builtin_p(stmt, BUILT_IN_ALLOCA))
87242 + return true;
87243 +
87244 +#if BUILDING_GCC_VERSION >= 4007
87245 + if (gimple_call_builtin_p(stmt, BUILT_IN_ALLOCA_WITH_ALIGN))
87246 + return true;
87247 +#endif
87248 +
87249 + return false;
87250 +}
87251 +
87252 +static unsigned int execute_stackleak_tree_instrument(void)
87253 +{
87254 + basic_block bb, entry_bb;
87255 + bool prologue_instrumented = false;
87256 +
87257 + entry_bb = ENTRY_BLOCK_PTR_FOR_FUNCTION(cfun)->next_bb;
87258 +
87259 + // 1. loop through BBs and GIMPLE statements
87260 + FOR_EACH_BB(bb) {
87261 + gimple_stmt_iterator gsi;
87262 + for (gsi = gsi_start_bb(bb); !gsi_end_p(gsi); gsi_next(&gsi)) {
87263 + // gimple match: align 8 built-in BUILT_IN_NORMAL:BUILT_IN_ALLOCA attributes <tree_list 0xb7576450>
87264 + if (!is_alloca(gsi_stmt(gsi)))
87265 + continue;
87266 +
87267 + // 2. insert stack overflow check before each __builtin_alloca call
87268 + stackleak_check_alloca(gsi);
87269 +
87270 + // 3. insert track call after each __builtin_alloca call
87271 + stackleak_add_instrumentation(gsi);
87272 + if (bb == entry_bb)
87273 + prologue_instrumented = true;
87274 + }
87275 + }
87276 +
87277 + // 4. insert track call at the beginning
87278 + if (!prologue_instrumented) {
87279 + bb = split_block_after_labels(ENTRY_BLOCK_PTR)->dest;
87280 + if (dom_info_available_p(CDI_DOMINATORS))
87281 + set_immediate_dominator(CDI_DOMINATORS, bb, ENTRY_BLOCK_PTR);
87282 + stackleak_add_instrumentation(gsi_start_bb(bb));
87283 + }
87284 +
87285 + return 0;
87286 +}
87287 +
87288 +static unsigned int execute_stackleak_final(void)
87289 +{
87290 + rtx insn;
87291 +
87292 + if (cfun->calls_alloca)
87293 + return 0;
87294 +
87295 + // keep calls only if function frame is big enough
87296 + if (get_frame_size() >= track_frame_size)
87297 + return 0;
87298 +
87299 + // 1. find pax_track_stack calls
87300 + for (insn = get_insns(); insn; insn = NEXT_INSN(insn)) {
87301 + // 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))
87302 + rtx body;
87303 +
87304 + if (!CALL_P(insn))
87305 + continue;
87306 + body = PATTERN(insn);
87307 + if (GET_CODE(body) != CALL)
87308 + continue;
87309 + body = XEXP(body, 0);
87310 + if (GET_CODE(body) != MEM)
87311 + continue;
87312 + body = XEXP(body, 0);
87313 + if (GET_CODE(body) != SYMBOL_REF)
87314 + continue;
87315 + if (strcmp(XSTR(body, 0), track_function))
87316 + continue;
87317 +// warning(0, "track_frame_size: %d %ld %d", cfun->calls_alloca, get_frame_size(), track_frame_size);
87318 + // 2. delete call
87319 + insn = delete_insn_and_edges(insn);
87320 +#if BUILDING_GCC_VERSION >= 4007
87321 + if (GET_CODE(insn) == NOTE && NOTE_KIND(insn) == NOTE_INSN_CALL_ARG_LOCATION)
87322 + insn = delete_insn_and_edges(insn);
87323 +#endif
87324 + }
87325 +
87326 +// print_simple_rtl(stderr, get_insns());
87327 +// print_rtl(stderr, get_insns());
87328 +// warning(0, "track_frame_size: %d %ld %d", cfun->calls_alloca, get_frame_size(), track_frame_size);
87329 +
87330 + return 0;
87331 +}
87332 +
87333 +int plugin_init(struct plugin_name_args *plugin_info, struct plugin_gcc_version *version)
87334 +{
87335 + const char * const plugin_name = plugin_info->base_name;
87336 + const int argc = plugin_info->argc;
87337 + const struct plugin_argument * const argv = plugin_info->argv;
87338 + int i;
87339 + struct register_pass_info stackleak_tree_instrument_pass_info = {
87340 + .pass = &stackleak_tree_instrument_pass.pass,
87341 +// .reference_pass_name = "tree_profile",
87342 + .reference_pass_name = "optimized",
87343 + .ref_pass_instance_number = 0,
87344 + .pos_op = PASS_POS_INSERT_AFTER
87345 + };
87346 + struct register_pass_info stackleak_final_pass_info = {
87347 + .pass = &stackleak_final_rtl_opt_pass.pass,
87348 + .reference_pass_name = "final",
87349 + .ref_pass_instance_number = 0,
87350 + .pos_op = PASS_POS_INSERT_BEFORE
87351 + };
87352 +
87353 + if (!plugin_default_version_check(version, &gcc_version)) {
87354 + error(G_("incompatible gcc/plugin versions"));
87355 + return 1;
87356 + }
87357 +
87358 + register_callback(plugin_name, PLUGIN_INFO, NULL, &stackleak_plugin_info);
87359 +
87360 + for (i = 0; i < argc; ++i) {
87361 + if (!strcmp(argv[i].key, "track-lowest-sp")) {
87362 + if (!argv[i].value) {
87363 + error(G_("no value supplied for option '-fplugin-arg-%s-%s'"), plugin_name, argv[i].key);
87364 + continue;
87365 + }
87366 + track_frame_size = atoi(argv[i].value);
87367 + if (argv[i].value[0] < '0' || argv[i].value[0] > '9' || track_frame_size < 0)
87368 + error(G_("invalid option argument '-fplugin-arg-%s-%s=%s'"), plugin_name, argv[i].key, argv[i].value);
87369 + continue;
87370 + }
87371 + if (!strcmp(argv[i].key, "initialize-locals")) {
87372 + if (argv[i].value) {
87373 + error(G_("invalid option argument '-fplugin-arg-%s-%s=%s'"), plugin_name, argv[i].key, argv[i].value);
87374 + continue;
87375 + }
87376 + init_locals = true;
87377 + continue;
87378 + }
87379 + error(G_("unkown option '-fplugin-arg-%s-%s'"), plugin_name, argv[i].key);
87380 + }
87381 +
87382 + register_callback(plugin_name, PLUGIN_PASS_MANAGER_SETUP, NULL, &stackleak_tree_instrument_pass_info);
87383 + register_callback(plugin_name, PLUGIN_PASS_MANAGER_SETUP, NULL, &stackleak_final_pass_info);
87384 +
87385 + return 0;
87386 +}
87387 diff --git a/usr/gen_init_cpio.c b/usr/gen_init_cpio.c
87388 index 83b3dde..835bee7 100644
87389 --- a/usr/gen_init_cpio.c
87390 +++ b/usr/gen_init_cpio.c
87391 @@ -299,7 +299,7 @@ static int cpio_mkfile(const char *name, const char *location,
87392 int retval;
87393 int rc = -1;
87394 int namesize;
87395 - int i;
87396 + unsigned int i;
87397
87398 mode |= S_IFREG;
87399
87400 @@ -383,9 +383,10 @@ static char *cpio_replace_env(char *new_location)
87401 *env_var = *expanded = '\0';
87402 strncat(env_var, start + 2, end - start - 2);
87403 strncat(expanded, new_location, start - new_location);
87404 - strncat(expanded, getenv(env_var), PATH_MAX);
87405 - strncat(expanded, end + 1, PATH_MAX);
87406 + strncat(expanded, getenv(env_var), PATH_MAX - strlen(expanded));
87407 + strncat(expanded, end + 1, PATH_MAX - strlen(expanded));
87408 strncpy(new_location, expanded, PATH_MAX);
87409 + new_location[PATH_MAX] = 0;
87410 } else
87411 break;
87412 }
87413 diff --git a/virt/kvm/kvm_main.c b/virt/kvm/kvm_main.c
87414 index 4f3434f..159bc3e 100644
87415 --- a/virt/kvm/kvm_main.c
87416 +++ b/virt/kvm/kvm_main.c
87417 @@ -2494,7 +2494,7 @@ asmlinkage void kvm_handle_fault_on_reboot(void)
87418 if (kvm_rebooting)
87419 /* spin while reset goes on */
87420 while (true)
87421 - ;
87422 + cpu_relax();
87423 /* Fault while not rebooting. We want the trace. */
87424 BUG();
87425 }
87426 @@ -2714,7 +2714,7 @@ static void kvm_sched_out(struct preempt_notifier *pn,
87427 kvm_arch_vcpu_put(vcpu);
87428 }
87429
87430 -int kvm_init(void *opaque, unsigned int vcpu_size,
87431 +int kvm_init(const void *opaque, unsigned int vcpu_size,
87432 struct module *module)
87433 {
87434 int r;
87435 @@ -2767,15 +2767,17 @@ int kvm_init(void *opaque, unsigned int vcpu_size,
87436 /* A kmem cache lets us meet the alignment requirements of fx_save. */
87437 kvm_vcpu_cache = kmem_cache_create("kvm_vcpu", vcpu_size,
87438 __alignof__(struct kvm_vcpu),
87439 - 0, NULL);
87440 + SLAB_USERCOPY, NULL);
87441 if (!kvm_vcpu_cache) {
87442 r = -ENOMEM;
87443 goto out_free_5;
87444 }
87445
87446 - kvm_chardev_ops.owner = module;
87447 - kvm_vm_fops.owner = module;
87448 - kvm_vcpu_fops.owner = module;
87449 + pax_open_kernel();
87450 + *(void **)&kvm_chardev_ops.owner = module;
87451 + *(void **)&kvm_vm_fops.owner = module;
87452 + *(void **)&kvm_vcpu_fops.owner = module;
87453 + pax_close_kernel();
87454
87455 r = misc_register(&kvm_dev);
87456 if (r) {
Unofficial grsecurity patch archive (https://github.com/slashbeast/grsecurity-scrape)