]> git.ipfire.org Git - thirdparty/grsecurity-scrape.git/blame - test/grsecurity-2.9-3.2.12-201203221944.patch
projects / thirdparty / grsecurity-scrape.git / blame
? search:
summary | shortlog | log | commit | commitdiff | tree
blob | blame (incremental) | history | HEAD
Auto commit, 1 new patch{es}.
[thirdparty/grsecurity-scrape.git] / test / grsecurity-2.9-3.2.12-201203221944.patch
CommitLineData
3cba718f
PK		 1diff --git a/Documentation/dontdiff b/Documentation/dontdiff
2index dfa6fc6..df93044 100644
3--- a/Documentation/dontdiff
4+++ b/Documentation/dontdiff
5@@ -2,9 +2,11 @@
6 *.aux
7 *.bin
8 *.bz2
9+*.c.[012]*.*
10 *.cis
11 *.cpio
12 *.csp
13+*.dbg
14 *.dsp
15 *.dvi
16 *.elf
17@@ -14,6 +16,7 @@
18 *.gcov
19 *.gen.S
20 *.gif
21+*.gmo
22 *.grep
23 *.grp
24 *.gz
25@@ -48,9 +51,11 @@
26 *.tab.h
27 *.tex
28 *.ver
29+*.vim
30 *.xml
31 *.xz
32 *_MODULES
33+*_reg_safe.h
34 *_vga16.c
35 *~
36 \#*#
37@@ -70,6 +75,7 @@ Kerntypes
38 Module.markers
39 Module.symvers
40 PENDING
41+PERF*
42 SCCS
43 System.map*
44 TAGS
45@@ -93,19 +99,24 @@ bounds.h
46 bsetup
47 btfixupprep
48 build
49+builtin-policy.h
50 bvmlinux
51 bzImage*
52 capability_names.h
53 capflags.c
54 classlist.h*
55+clut_vga16.c
56+common-cmds.h
57 comp*.log
58 compile.h*
59 conf
60 config
61 config-*
62 config_data.h*
63+config.c
64 config.mak
65 config.mak.autogen
66+config.tmp
67 conmakehash
68 consolemap_deftbl.c*
69 cpustr.h
70@@ -116,9 +127,11 @@ devlist.h*
71 dnotify_test
72 docproc
73 dslm
74+dtc-lexer.lex.c
75 elf2ecoff
76 elfconfig.h*
77 evergreen_reg_safe.h
78+exception_policy.conf
79 fixdep
80 flask.h
81 fore200e_mkfirm
82@@ -126,12 +139,15 @@ fore200e_pca_fw.c*
83 gconf
84 gconf.glade.h
85 gen-devlist
86+gen-kdb_cmds.c
87 gen_crc32table
88 gen_init_cpio
89 generated
90 genheaders
91 genksyms
92 *_gray256.c
93+hash
94+hid-example
95 hpet_example
96 hugepage-mmap
97 hugepage-shm
98@@ -146,7 +162,7 @@ int32.c
99 int4.c
100 int8.c
101 kallsyms
102-kconfig
103+kern_constants.h
104 keywords.c
105 ksym.c*
106 ksym.h*
107@@ -154,7 +170,7 @@ kxgettext
108 lkc_defs.h
109 lex.c
110 lex.*.c
111-linux
112+lib1funcs.S
113 logo_*.c
114 logo_*_clut224.c
115 logo_*_mono.c
116@@ -166,14 +182,15 @@ machtypes.h
117 map
118 map_hugetlb
119 maui_boot.h
120-media
121 mconf
122+mdp
123 miboot*
124 mk_elfconfig
125 mkboot
126 mkbugboot
127 mkcpustr
128 mkdep
129+mkpiggy
130 mkprep
131 mkregtable
132 mktables
133@@ -209,6 +226,7 @@ r300_reg_safe.h
134 r420_reg_safe.h
135 r600_reg_safe.h
136 recordmcount
137+regdb.c
138 relocs
139 rlim_names.h
140 rn50_reg_safe.h
141@@ -219,6 +237,7 @@ setup
142 setup.bin
143 setup.elf
144 sImage
145+slabinfo
146 sm_tbl*
147 split-include
148 syscalltab.h
149@@ -229,6 +248,7 @@ tftpboot.img
150 timeconst.h
151 times.h*
152 trix_boot.h
153+user_constants.h
154 utsrelease.h*
155 vdso-syms.lds
156 vdso.lds
157@@ -246,7 +266,9 @@ vmlinux
158 vmlinux-*
159 vmlinux.aout
160 vmlinux.bin.all
161+vmlinux.bin.bz2
162 vmlinux.lds
163+vmlinux.relocs
164 vmlinuz
165 voffset.h
166 vsyscall.lds
167@@ -254,9 +276,11 @@ vsyscall_32.lds
168 wanxlfw.inc
169 uImage
170 unifdef
171+utsrelease.h
172 wakeup.bin
173 wakeup.elf
174 wakeup.lds
175 zImage*
176 zconf.hash.c
177+zconf.lex.c
178 zoffset.h
179diff --git a/Documentation/kernel-parameters.txt b/Documentation/kernel-parameters.txt
180index 81c287f..d456d02 100644
181--- a/Documentation/kernel-parameters.txt
182+++ b/Documentation/kernel-parameters.txt
183@@ -1935,6 +1935,13 @@ bytes respectively. Such letter suffixes can also be entirely omitted.
184 the specified number of seconds. This is to be used if
185 your oopses keep scrolling off the screen.
186
187+ pax_nouderef [X86] disables UDEREF. Most likely needed under certain
188+ virtualization environments that don't cope well with the
189+ expand down segment used by UDEREF on X86-32 or the frequent
190+ page table updates on X86-64.
191+
192+ pax_softmode= 0/1 to disable/enable PaX softmode on boot already.
193+
194 pcbit= [HW,ISDN]
195
196 pcd. [PARIDE]
197diff --git a/Makefile b/Makefile
198index 15e80f1..4fb87db 100644
199--- a/Makefile
200+++ b/Makefile
201@@ -245,8 +245,9 @@ CONFIG_SHELL := $(shell if [ -x "$$BASH" ]; then echo $$BASH; \
202
203 HOSTCC = gcc
204 HOSTCXX = g++
205-HOSTCFLAGS = -Wall -Wmissing-prototypes -Wstrict-prototypes -O2 -fomit-frame-pointer
206-HOSTCXXFLAGS = -O2
207+HOSTCFLAGS = -Wall -W -Wmissing-prototypes -Wstrict-prototypes -Wno-unused-parameter -Wno-missing-field-initializers -O2 -fomit-frame-pointer -fno-delete-null-pointer-checks
208+HOSTCLFAGS += $(call cc-option, -Wno-empty-body)
209+HOSTCXXFLAGS = -O2 -Wall -W -fno-delete-null-pointer-checks
210
211 # Decide whether to build built-in, modular, or both.
212 # Normally, just do built-in.
213@@ -407,8 +408,8 @@ export RCS_TAR_IGNORE := --exclude SCCS --exclude BitKeeper --exclude .svn --exc
214 # Rules shared between *config targets and build targets
215
216 # Basic helpers built in scripts/
217-PHONY += scripts_basic
218-scripts_basic:
219+PHONY += scripts_basic gcc-plugins
220+scripts_basic: gcc-plugins
221 $(Q)$(MAKE) $(build)=scripts/basic
222 $(Q)rm -f .tmp_quiet_recordmcount
223
224@@ -564,6 +565,53 @@ else
225 KBUILD_CFLAGS += -O2
226 endif
227
228+ifndef DISABLE_PAX_PLUGINS
229+ifeq ($(shell $(CONFIG_SHELL) $(srctree)/scripts/gcc-plugin.sh "$(HOSTCC)" "$(CC)"), y)
230+ifndef DISABLE_PAX_CONSTIFY_PLUGIN
231+CONSTIFY_PLUGIN_CFLAGS := -fplugin=$(objtree)/tools/gcc/constify_plugin.so -DCONSTIFY_PLUGIN
232+endif
233+ifdef CONFIG_PAX_MEMORY_STACKLEAK
234+STACKLEAK_PLUGIN_CFLAGS := -fplugin=$(objtree)/tools/gcc/stackleak_plugin.so -DSTACKLEAK_PLUGIN
235+STACKLEAK_PLUGIN_CFLAGS += -fplugin-arg-stackleak_plugin-track-lowest-sp=100
236+endif
237+ifdef CONFIG_KALLOCSTAT_PLUGIN
238+KALLOCSTAT_PLUGIN_CFLAGS := -fplugin=$(objtree)/tools/gcc/kallocstat_plugin.so
239+endif
240+ifdef CONFIG_PAX_KERNEXEC_PLUGIN
241+KERNEXEC_PLUGIN_CFLAGS := -fplugin=$(objtree)/tools/gcc/kernexec_plugin.so
242+KERNEXEC_PLUGIN_CFLAGS += -fplugin-arg-kernexec_plugin-method=$(CONFIG_PAX_KERNEXEC_PLUGIN_METHOD) -DKERNEXEC_PLUGIN
243+KERNEXEC_PLUGIN_AFLAGS := -DKERNEXEC_PLUGIN
244+endif
245+ifdef CONFIG_CHECKER_PLUGIN
246+ifeq ($(call cc-ifversion, -ge, 0406, y), y)
247+CHECKER_PLUGIN_CFLAGS := -fplugin=$(objtree)/tools/gcc/checker_plugin.so -DCHECKER_PLUGIN
248+endif
249+endif
250+COLORIZE_PLUGIN_CFLAGS := -fplugin=$(objtree)/tools/gcc/colorize_plugin.so
251+ifdef CONFIG_PAX_SIZE_OVERFLOW
252+SIZE_OVERFLOW_PLUGIN_CFLAGS := -fplugin=$(objtree)/tools/gcc/size_overflow_plugin.so -DSIZE_OVERFLOW_PLUGIN
253+endif
254+GCC_PLUGINS_CFLAGS := $(CONSTIFY_PLUGIN_CFLAGS) $(STACKLEAK_PLUGIN_CFLAGS) $(KALLOCSTAT_PLUGIN_CFLAGS)
255+GCC_PLUGINS_CFLAGS += $(KERNEXEC_PLUGIN_CFLAGS) $(CHECKER_PLUGIN_CFLAGS) $(COLORIZE_PLUGIN_CFLAGS) $(SIZE_OVERFLOW_PLUGIN_CFLAGS)
256+GCC_PLUGINS_AFLAGS := $(KERNEXEC_PLUGIN_AFLAGS)
257+export CONSTIFY_PLUGIN STACKLEAK_PLUGIN KERNEXEC_PLUGIN CHECKER_PLUGIN SIZE_OVERFLOW_PLUGIN
258+ifeq ($(KBUILD_EXTMOD),)
259+gcc-plugins:
260+ $(Q)$(MAKE) $(build)=tools/gcc
261+else
262+gcc-plugins: ;
263+endif
264+else
265+gcc-plugins:
266+ifeq ($(call cc-ifversion, -ge, 0405, y), y)
267+ $(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.))
268+else
269+ $(Q)echo "warning, your gcc version does not support plugins, you should upgrade it to gcc 4.5 at least"
270+endif
271+ $(Q)echo "PAX_MEMORY_STACKLEAK and other features will be less secure"
272+endif
273+endif
274+
275 include $(srctree)/arch/$(SRCARCH)/Makefile
276
277 ifneq ($(CONFIG_FRAME_WARN),0)
278@@ -708,7 +756,7 @@ export mod_strip_cmd
279
280
281 ifeq ($(KBUILD_EXTMOD),)
282-core-y += kernel/ mm/ fs/ ipc/ security/ crypto/ block/
283+core-y += kernel/ mm/ fs/ ipc/ security/ crypto/ block/ grsecurity/
284
285 vmlinux-dirs := $(patsubst %/,%,$(filter %/, $(init-y) $(init-m) \
286 $(core-y) $(core-m) $(drivers-y) $(drivers-m) \
287@@ -932,6 +980,8 @@ vmlinux.o: $(modpost-init) $(vmlinux-main) FORCE
288
289 # The actual objects are generated when descending,
290 # make sure no implicit rule kicks in
291+$(sort $(vmlinux-init) $(vmlinux-main)) $(vmlinux-lds): KBUILD_CFLAGS += $(GCC_PLUGINS_CFLAGS)
292+$(sort $(vmlinux-init) $(vmlinux-main)) $(vmlinux-lds): KBUILD_AFLAGS += $(GCC_PLUGINS_AFLAGS)
293 $(sort $(vmlinux-init) $(vmlinux-main)) $(vmlinux-lds): $(vmlinux-dirs) ;
294
295 # Handle descending into subdirectories listed in $(vmlinux-dirs)
296@@ -941,7 +991,7 @@ $(sort $(vmlinux-init) $(vmlinux-main)) $(vmlinux-lds): $(vmlinux-dirs) ;
297 # Error messages still appears in the original language
298
299 PHONY += $(vmlinux-dirs)
300-$(vmlinux-dirs): prepare scripts
301+$(vmlinux-dirs): gcc-plugins prepare scripts
302 $(Q)$(MAKE) $(build)=$@
303
304 # Store (new) KERNELRELASE string in include/config/kernel.release
305@@ -985,6 +1035,7 @@ prepare0: archprepare FORCE
306 $(Q)$(MAKE) $(build)=.
307
308 # All the preparing..
309+prepare: KBUILD_CFLAGS := $(filter-out $(GCC_PLUGINS_CFLAGS),$(KBUILD_CFLAGS))
310 prepare: prepare0
311
312 # Generate some files
313@@ -1086,6 +1137,8 @@ all: modules
314 # using awk while concatenating to the final file.
315
316 PHONY += modules
317+modules: KBUILD_CFLAGS += $(GCC_PLUGINS_CFLAGS)
318+modules: KBUILD_AFLAGS += $(GCC_PLUGINS_AFLAGS)
319 modules: $(vmlinux-dirs) $(if $(KBUILD_BUILTIN),vmlinux) modules.builtin
320 $(Q)$(AWK) '!x[$$0]++' $(vmlinux-dirs:%=$(objtree)/%/modules.order) > $(objtree)/modules.order
321 @$(kecho) ' Building modules, stage 2.';
322@@ -1101,7 +1154,7 @@ modules.builtin: $(vmlinux-dirs:%=%/modules.builtin)
323
324 # Target to prepare building external modules
325 PHONY += modules_prepare
326-modules_prepare: prepare scripts
327+modules_prepare: gcc-plugins prepare scripts
328
329 # Target to install modules
330 PHONY += modules_install
331@@ -1198,6 +1251,7 @@ distclean: mrproper
332 \( -name '*.orig' -o -name '*.rej' -o -name '*~' \
333 -o -name '*.bak' -o -name '#*#' -o -name '.*.orig' \
334 -o -name '.*.rej' \
335+ -o -name '.*.rej' -o -name '*.so' \
336 -o -name '*%' -o -name '.*.cmd' -o -name 'core' \) \
337 -type f -print | xargs rm -f
338
339@@ -1358,6 +1412,8 @@ PHONY += $(module-dirs) modules
340 $(module-dirs): crmodverdir $(objtree)/Module.symvers
341 $(Q)$(MAKE) $(build)=$(patsubst _module_%,%,$@)
342
343+modules: KBUILD_CFLAGS += $(GCC_PLUGINS_CFLAGS)
344+modules: KBUILD_AFLAGS += $(GCC_PLUGINS_AFLAGS)
345 modules: $(module-dirs)
346 @$(kecho) ' Building modules, stage 2.';
347 $(Q)$(MAKE) -f $(srctree)/scripts/Makefile.modpost
348@@ -1484,17 +1540,21 @@ else
349 target-dir = $(if $(KBUILD_EXTMOD),$(dir $<),$(dir $@))
350 endif
351
352-%.s: %.c prepare scripts FORCE
353+%.s: KBUILD_CFLAGS += $(GCC_PLUGINS_CFLAGS)
354+%.s: KBUILD_AFLAGS += $(GCC_PLUGINS_AFLAGS)
355+%.s: %.c gcc-plugins prepare scripts FORCE
356 $(Q)$(MAKE) $(build)=$(build-dir) $(target-dir)$(notdir $@)
357 %.i: %.c prepare scripts FORCE
358 $(Q)$(MAKE) $(build)=$(build-dir) $(target-dir)$(notdir $@)
359-%.o: %.c prepare scripts FORCE
360+%.o: KBUILD_CFLAGS += $(GCC_PLUGINS_CFLAGS)
361+%.o: KBUILD_AFLAGS += $(GCC_PLUGINS_AFLAGS)
362+%.o: %.c gcc-plugins prepare scripts FORCE
363 $(Q)$(MAKE) $(build)=$(build-dir) $(target-dir)$(notdir $@)
364 %.lst: %.c prepare scripts FORCE
365 $(Q)$(MAKE) $(build)=$(build-dir) $(target-dir)$(notdir $@)
366-%.s: %.S prepare scripts FORCE
367+%.s: %.S gcc-plugins prepare scripts FORCE
368 $(Q)$(MAKE) $(build)=$(build-dir) $(target-dir)$(notdir $@)
369-%.o: %.S prepare scripts FORCE
370+%.o: %.S gcc-plugins prepare scripts FORCE
371 $(Q)$(MAKE) $(build)=$(build-dir) $(target-dir)$(notdir $@)
372 %.symtypes: %.c prepare scripts FORCE
373 $(Q)$(MAKE) $(build)=$(build-dir) $(target-dir)$(notdir $@)
374@@ -1504,11 +1564,15 @@ endif
375 $(cmd_crmodverdir)
376 $(Q)$(MAKE) KBUILD_MODULES=$(if $(CONFIG_MODULES),1) \
377 $(build)=$(build-dir)
378-%/: prepare scripts FORCE
379+%/: KBUILD_CFLAGS += $(GCC_PLUGINS_CFLAGS)
380+%/: KBUILD_AFLAGS += $(GCC_PLUGINS_AFLAGS)
381+%/: gcc-plugins prepare scripts FORCE
382 $(cmd_crmodverdir)
383 $(Q)$(MAKE) KBUILD_MODULES=$(if $(CONFIG_MODULES),1) \
384 $(build)=$(build-dir)
385-%.ko: prepare scripts FORCE
386+%.ko: KBUILD_CFLAGS += $(GCC_PLUGINS_CFLAGS)
387+%.ko: KBUILD_AFLAGS += $(GCC_PLUGINS_AFLAGS)
388+%.ko: gcc-plugins prepare scripts FORCE
389 $(cmd_crmodverdir)
390 $(Q)$(MAKE) KBUILD_MODULES=$(if $(CONFIG_MODULES),1) \
391 $(build)=$(build-dir) $(@:.ko=.o)
392diff --git a/arch/alpha/include/asm/atomic.h b/arch/alpha/include/asm/atomic.h
393index 640f909..48b6597 100644
394--- a/arch/alpha/include/asm/atomic.h
395+++ b/arch/alpha/include/asm/atomic.h
396@@ -250,6 +250,16 @@ static __inline__ int atomic64_add_unless(atomic64_t *v, long a, long u)
397 #define atomic_dec(v) atomic_sub(1,(v))
398 #define atomic64_dec(v) atomic64_sub(1,(v))
399
400+#define atomic64_read_unchecked(v) atomic64_read(v)
401+#define atomic64_set_unchecked(v, i) atomic64_set((v), (i))
402+#define atomic64_add_unchecked(a, v) atomic64_add((a), (v))
403+#define atomic64_add_return_unchecked(a, v) atomic64_add_return((a), (v))
404+#define atomic64_sub_unchecked(a, v) atomic64_sub((a), (v))
405+#define atomic64_inc_unchecked(v) atomic64_inc(v)
406+#define atomic64_inc_return_unchecked(v) atomic64_inc_return(v)
407+#define atomic64_dec_unchecked(v) atomic64_dec(v)
408+#define atomic64_cmpxchg_unchecked(v, o, n) atomic64_cmpxchg((v), (o), (n))
409+
410 #define smp_mb__before_atomic_dec() smp_mb()
411 #define smp_mb__after_atomic_dec() smp_mb()
412 #define smp_mb__before_atomic_inc() smp_mb()
413diff --git a/arch/alpha/include/asm/cache.h b/arch/alpha/include/asm/cache.h
414index ad368a9..fbe0f25 100644
415--- a/arch/alpha/include/asm/cache.h
416+++ b/arch/alpha/include/asm/cache.h
417@@ -4,19 +4,19 @@
418 #ifndef __ARCH_ALPHA_CACHE_H
419 #define __ARCH_ALPHA_CACHE_H
420
421+#include <linux/const.h>
422
423 /* Bytes per L1 (data) cache line. */
424 #if defined(CONFIG_ALPHA_GENERIC) || defined(CONFIG_ALPHA_EV6)
425-# define L1_CACHE_BYTES 64
426 # define L1_CACHE_SHIFT 6
427 #else
428 /* Both EV4 and EV5 are write-through, read-allocate,
429 direct-mapped, physical.
430 */
431-# define L1_CACHE_BYTES 32
432 # define L1_CACHE_SHIFT 5
433 #endif
434
435+#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT)
436 #define SMP_CACHE_BYTES L1_CACHE_BYTES
437
438 #endif
439diff --git a/arch/alpha/include/asm/elf.h b/arch/alpha/include/asm/elf.h
440index da5449e..7418343 100644
441--- a/arch/alpha/include/asm/elf.h
442+++ b/arch/alpha/include/asm/elf.h
443@@ -90,6 +90,13 @@ typedef elf_fpreg_t elf_fpregset_t[ELF_NFPREG];
444
445 #define ELF_ET_DYN_BASE (TASK_UNMAPPED_BASE + 0x1000000)
446
447+#ifdef CONFIG_PAX_ASLR
448+#define PAX_ELF_ET_DYN_BASE (current->personality & ADDR_LIMIT_32BIT ? 0x10000 : 0x120000000UL)
449+
450+#define PAX_DELTA_MMAP_LEN (current->personality & ADDR_LIMIT_32BIT ? 14 : 28)
451+#define PAX_DELTA_STACK_LEN (current->personality & ADDR_LIMIT_32BIT ? 14 : 19)
452+#endif
453+
454 /* $0 is set by ld.so to a pointer to a function which might be
455 registered using atexit. This provides a mean for the dynamic
456 linker to call DT_FINI functions for shared libraries that have
457diff --git a/arch/alpha/include/asm/pgtable.h b/arch/alpha/include/asm/pgtable.h
458index de98a73..bd4f1f8 100644
459--- a/arch/alpha/include/asm/pgtable.h
460+++ b/arch/alpha/include/asm/pgtable.h
461@@ -101,6 +101,17 @@ struct vm_area_struct;
462 #define PAGE_SHARED __pgprot(_PAGE_VALID | __ACCESS_BITS)
463 #define PAGE_COPY __pgprot(_PAGE_VALID | __ACCESS_BITS | _PAGE_FOW)
464 #define PAGE_READONLY __pgprot(_PAGE_VALID | __ACCESS_BITS | _PAGE_FOW)
465+
466+#ifdef CONFIG_PAX_PAGEEXEC
467+# define PAGE_SHARED_NOEXEC __pgprot(_PAGE_VALID | __ACCESS_BITS | _PAGE_FOE)
468+# define PAGE_COPY_NOEXEC __pgprot(_PAGE_VALID | __ACCESS_BITS | _PAGE_FOW | _PAGE_FOE)
469+# define PAGE_READONLY_NOEXEC __pgprot(_PAGE_VALID | __ACCESS_BITS | _PAGE_FOW | _PAGE_FOE)
470+#else
471+# define PAGE_SHARED_NOEXEC PAGE_SHARED
472+# define PAGE_COPY_NOEXEC PAGE_COPY
473+# define PAGE_READONLY_NOEXEC PAGE_READONLY
474+#endif
475+
476 #define PAGE_KERNEL __pgprot(_PAGE_VALID | _PAGE_ASM | _PAGE_KRE | _PAGE_KWE)
477
478 #define _PAGE_NORMAL(x) __pgprot(_PAGE_VALID | __ACCESS_BITS | (x))
479diff --git a/arch/alpha/kernel/module.c b/arch/alpha/kernel/module.c
480index 2fd00b7..cfd5069 100644
481--- a/arch/alpha/kernel/module.c
482+++ b/arch/alpha/kernel/module.c
483@@ -160,7 +160,7 @@ apply_relocate_add(Elf64_Shdr *sechdrs, const char *strtab,
484
485 /* The small sections were sorted to the end of the segment.
486 The following should definitely cover them. */
487- gp = (u64)me->module_core + me->core_size - 0x8000;
488+ gp = (u64)me->module_core_rw + me->core_size_rw - 0x8000;
489 got = sechdrs[me->arch.gotsecindex].sh_addr;
490
491 for (i = 0; i < n; i++) {
492diff --git a/arch/alpha/kernel/osf_sys.c b/arch/alpha/kernel/osf_sys.c
493index 01e8715..be0e80f 100644
494--- a/arch/alpha/kernel/osf_sys.c
495+++ b/arch/alpha/kernel/osf_sys.c
496@@ -1147,7 +1147,7 @@ arch_get_unmapped_area_1(unsigned long addr, unsigned long len,
497 /* At this point: (!vma || addr < vma->vm_end). */
498 if (limit - len < addr)
499 return -ENOMEM;
500- if (!vma || addr + len <= vma->vm_start)
501+ if (check_heap_stack_gap(vma, addr, len))
502 return addr;
503 addr = vma->vm_end;
504 vma = vma->vm_next;
505@@ -1183,6 +1183,10 @@ arch_get_unmapped_area(struct file *filp, unsigned long addr,
506 merely specific addresses, but regions of memory -- perhaps
507 this feature should be incorporated into all ports? */
508
509+#ifdef CONFIG_PAX_RANDMMAP
510+ if (!(current->mm->pax_flags & MF_PAX_RANDMMAP))
511+#endif
512+
513 if (addr) {
514 addr = arch_get_unmapped_area_1 (PAGE_ALIGN(addr), len, limit);
515 if (addr != (unsigned long) -ENOMEM)
516@@ -1190,8 +1194,8 @@ arch_get_unmapped_area(struct file *filp, unsigned long addr,
517 }
518
519 /* Next, try allocating at TASK_UNMAPPED_BASE. */
520- addr = arch_get_unmapped_area_1 (PAGE_ALIGN(TASK_UNMAPPED_BASE),
521- len, limit);
522+ addr = arch_get_unmapped_area_1 (PAGE_ALIGN(current->mm->mmap_base), len, limit);
523+
524 if (addr != (unsigned long) -ENOMEM)
525 return addr;
526
527diff --git a/arch/alpha/mm/fault.c b/arch/alpha/mm/fault.c
528index fadd5f8..904e73a 100644
529--- a/arch/alpha/mm/fault.c
530+++ b/arch/alpha/mm/fault.c
531@@ -54,6 +54,124 @@ __load_new_mm_context(struct mm_struct *next_mm)
532 __reload_thread(pcb);
533 }
534
535+#ifdef CONFIG_PAX_PAGEEXEC
536+/*
537+ * PaX: decide what to do with offenders (regs->pc = fault address)
538+ *
539+ * returns 1 when task should be killed
540+ * 2 when patched PLT trampoline was detected
541+ * 3 when unpatched PLT trampoline was detected
542+ */
543+static int pax_handle_fetch_fault(struct pt_regs *regs)
544+{
545+
546+#ifdef CONFIG_PAX_EMUPLT
547+ int err;
548+
549+ do { /* PaX: patched PLT emulation #1 */
550+ unsigned int ldah, ldq, jmp;
551+
552+ err = get_user(ldah, (unsigned int *)regs->pc);
553+ err |= get_user(ldq, (unsigned int *)(regs->pc+4));
554+ err |= get_user(jmp, (unsigned int *)(regs->pc+8));
555+
556+ if (err)
557+ break;
558+
559+ if ((ldah & 0xFFFF0000U) == 0x277B0000U &&
560+ (ldq & 0xFFFF0000U) == 0xA77B0000U &&
561+ jmp == 0x6BFB0000U)
562+ {
563+ unsigned long r27, addr;
564+ unsigned long addrh = (ldah | 0xFFFFFFFFFFFF0000UL) << 16;
565+ unsigned long addrl = ldq | 0xFFFFFFFFFFFF0000UL;
566+
567+ addr = regs->r27 + ((addrh ^ 0x80000000UL) + 0x80000000UL) + ((addrl ^ 0x8000UL) + 0x8000UL);
568+ err = get_user(r27, (unsigned long *)addr);
569+ if (err)
570+ break;
571+
572+ regs->r27 = r27;
573+ regs->pc = r27;
574+ return 2;
575+ }
576+ } while (0);
577+
578+ do { /* PaX: patched PLT emulation #2 */
579+ unsigned int ldah, lda, br;
580+
581+ err = get_user(ldah, (unsigned int *)regs->pc);
582+ err |= get_user(lda, (unsigned int *)(regs->pc+4));
583+ err |= get_user(br, (unsigned int *)(regs->pc+8));
584+
585+ if (err)
586+ break;
587+
588+ if ((ldah & 0xFFFF0000U) == 0x277B0000U &&
589+ (lda & 0xFFFF0000U) == 0xA77B0000U &&
590+ (br & 0xFFE00000U) == 0xC3E00000U)
591+ {
592+ unsigned long addr = br | 0xFFFFFFFFFFE00000UL;
593+ unsigned long addrh = (ldah | 0xFFFFFFFFFFFF0000UL) << 16;
594+ unsigned long addrl = lda | 0xFFFFFFFFFFFF0000UL;
595+
596+ regs->r27 += ((addrh ^ 0x80000000UL) + 0x80000000UL) + ((addrl ^ 0x8000UL) + 0x8000UL);
597+ regs->pc += 12 + (((addr ^ 0x00100000UL) + 0x00100000UL) << 2);
598+ return 2;
599+ }
600+ } while (0);
601+
602+ do { /* PaX: unpatched PLT emulation */
603+ unsigned int br;
604+
605+ err = get_user(br, (unsigned int *)regs->pc);
606+
607+ if (!err && (br & 0xFFE00000U) == 0xC3800000U) {
608+ unsigned int br2, ldq, nop, jmp;
609+ unsigned long addr = br | 0xFFFFFFFFFFE00000UL, resolver;
610+
611+ addr = regs->pc + 4 + (((addr ^ 0x00100000UL) + 0x00100000UL) << 2);
612+ err = get_user(br2, (unsigned int *)addr);
613+ err |= get_user(ldq, (unsigned int *)(addr+4));
614+ err |= get_user(nop, (unsigned int *)(addr+8));
615+ err |= get_user(jmp, (unsigned int *)(addr+12));
616+ err |= get_user(resolver, (unsigned long *)(addr+16));
617+
618+ if (err)
619+ break;
620+
621+ if (br2 == 0xC3600000U &&
622+ ldq == 0xA77B000CU &&
623+ nop == 0x47FF041FU &&
624+ jmp == 0x6B7B0000U)
625+ {
626+ regs->r28 = regs->pc+4;
627+ regs->r27 = addr+16;
628+ regs->pc = resolver;
629+ return 3;
630+ }
631+ }
632+ } while (0);
633+#endif
634+
635+ return 1;
636+}
637+
638+void pax_report_insns(struct pt_regs *regs, void *pc, void *sp)
639+{
640+ unsigned long i;
641+
642+ printk(KERN_ERR "PAX: bytes at PC: ");
643+ for (i = 0; i < 5; i++) {
644+ unsigned int c;
645+ if (get_user(c, (unsigned int *)pc+i))
646+ printk(KERN_CONT "???????? ");
647+ else
648+ printk(KERN_CONT "%08x ", c);
649+ }
650+ printk("\n");
651+}
652+#endif
653
654 /*
655 * This routine handles page faults. It determines the address,
656@@ -131,8 +249,29 @@ do_page_fault(unsigned long address, unsigned long mmcsr,
657 good_area:
658 si_code = SEGV_ACCERR;
659 if (cause < 0) {
660- if (!(vma->vm_flags & VM_EXEC))
661+ if (!(vma->vm_flags & VM_EXEC)) {
662+
663+#ifdef CONFIG_PAX_PAGEEXEC
664+ if (!(mm->pax_flags & MF_PAX_PAGEEXEC) || address != regs->pc)
665+ goto bad_area;
666+
667+ up_read(&mm->mmap_sem);
668+ switch (pax_handle_fetch_fault(regs)) {
669+
670+#ifdef CONFIG_PAX_EMUPLT
671+ case 2:
672+ case 3:
673+ return;
674+#endif
675+
676+ }
677+ pax_report_fault(regs, (void *)regs->pc, (void *)rdusp());
678+ do_group_exit(SIGKILL);
679+#else
680 goto bad_area;
681+#endif
682+
683+ }
684 } else if (!cause) {
685 /* Allow reads even for write-only mappings */
686 if (!(vma->vm_flags & (VM_READ | VM_WRITE)))
687diff --git a/arch/arm/include/asm/atomic.h b/arch/arm/include/asm/atomic.h
688index 86976d0..683de93 100644
689--- a/arch/arm/include/asm/atomic.h
690+++ b/arch/arm/include/asm/atomic.h
691@@ -15,6 +15,10 @@
692 #include <linux/types.h>
693 #include <asm/system.h>
694
695+#ifdef CONFIG_GENERIC_ATOMIC64
696+#include <asm-generic/atomic64.h>
697+#endif
698+
699 #define ATOMIC_INIT(i) { (i) }
700
701 #ifdef __KERNEL__
702@@ -25,7 +29,15 @@
703 * atomic_set() is the clrex or dummy strex done on every exception return.
704 */
705 #define atomic_read(v) (*(volatile int *)&(v)->counter)
706+static inline int atomic_read_unchecked(const atomic_unchecked_t *v)
707+{
708+ return v->counter;
709+}
710 #define atomic_set(v,i) (((v)->counter) = (i))
711+static inline void atomic_set_unchecked(atomic_unchecked_t *v, int i)
712+{
713+ v->counter = i;
714+}
715
716 #if __LINUX_ARM_ARCH__ >= 6
717
718@@ -40,6 +52,35 @@ static inline void atomic_add(int i, atomic_t *v)
719 int result;
720
721 __asm__ __volatile__("@ atomic_add\n"
722+"1: ldrex %1, [%3]\n"
723+" adds %0, %1, %4\n"
724+
725+#ifdef CONFIG_PAX_REFCOUNT
726+" bvc 3f\n"
727+"2: bkpt 0xf103\n"
728+"3:\n"
729+#endif
730+
731+" strex %1, %0, [%3]\n"
732+" teq %1, #0\n"
733+" bne 1b"
734+
735+#ifdef CONFIG_PAX_REFCOUNT
736+"\n4:\n"
737+ _ASM_EXTABLE(2b, 4b)
738+#endif
739+
740+ : "=&r" (result), "=&r" (tmp), "+Qo" (v->counter)
741+ : "r" (&v->counter), "Ir" (i)
742+ : "cc");
743+}
744+
745+static inline void atomic_add_unchecked(int i, atomic_unchecked_t *v)
746+{
747+ unsigned long tmp;
748+ int result;
749+
750+ __asm__ __volatile__("@ atomic_add_unchecked\n"
751 "1: ldrex %0, [%3]\n"
752 " add %0, %0, %4\n"
753 " strex %1, %0, [%3]\n"
754@@ -58,6 +99,42 @@ static inline int atomic_add_return(int i, atomic_t *v)
755 smp_mb();
756
757 __asm__ __volatile__("@ atomic_add_return\n"
758+"1: ldrex %1, [%3]\n"
759+" adds %0, %1, %4\n"
760+
761+#ifdef CONFIG_PAX_REFCOUNT
762+" bvc 3f\n"
763+" mov %0, %1\n"
764+"2: bkpt 0xf103\n"
765+"3:\n"
766+#endif
767+
768+" strex %1, %0, [%3]\n"
769+" teq %1, #0\n"
770+" bne 1b"
771+
772+#ifdef CONFIG_PAX_REFCOUNT
773+"\n4:\n"
774+ _ASM_EXTABLE(2b, 4b)
775+#endif
776+
777+ : "=&r" (result), "=&r" (tmp), "+Qo" (v->counter)
778+ : "r" (&v->counter), "Ir" (i)
779+ : "cc");
780+
781+ smp_mb();
782+
783+ return result;
784+}
785+
786+static inline int atomic_add_return_unchecked(int i, atomic_unchecked_t *v)
787+{
788+ unsigned long tmp;
789+ int result;
790+
791+ smp_mb();
792+
793+ __asm__ __volatile__("@ atomic_add_return_unchecked\n"
794 "1: ldrex %0, [%3]\n"
795 " add %0, %0, %4\n"
796 " strex %1, %0, [%3]\n"
797@@ -78,6 +155,35 @@ static inline void atomic_sub(int i, atomic_t *v)
798 int result;
799
800 __asm__ __volatile__("@ atomic_sub\n"
801+"1: ldrex %1, [%3]\n"
802+" subs %0, %1, %4\n"
803+
804+#ifdef CONFIG_PAX_REFCOUNT
805+" bvc 3f\n"
806+"2: bkpt 0xf103\n"
807+"3:\n"
808+#endif
809+
810+" strex %1, %0, [%3]\n"
811+" teq %1, #0\n"
812+" bne 1b"
813+
814+#ifdef CONFIG_PAX_REFCOUNT
815+"\n4:\n"
816+ _ASM_EXTABLE(2b, 4b)
817+#endif
818+
819+ : "=&r" (result), "=&r" (tmp), "+Qo" (v->counter)
820+ : "r" (&v->counter), "Ir" (i)
821+ : "cc");
822+}
823+
824+static inline void atomic_sub_unchecked(int i, atomic_unchecked_t *v)
825+{
826+ unsigned long tmp;
827+ int result;
828+
829+ __asm__ __volatile__("@ atomic_sub_unchecked\n"
830 "1: ldrex %0, [%3]\n"
831 " sub %0, %0, %4\n"
832 " strex %1, %0, [%3]\n"
833@@ -96,11 +202,25 @@ static inline int atomic_sub_return(int i, atomic_t *v)
834 smp_mb();
835
836 __asm__ __volatile__("@ atomic_sub_return\n"
837-"1: ldrex %0, [%3]\n"
838-" sub %0, %0, %4\n"
839+"1: ldrex %1, [%3]\n"
840+" sub %0, %1, %4\n"
841+
842+#ifdef CONFIG_PAX_REFCOUNT
843+" bvc 3f\n"
844+" mov %0, %1\n"
845+"2: bkpt 0xf103\n"
846+"3:\n"
847+#endif
848+
849 " strex %1, %0, [%3]\n"
850 " teq %1, #0\n"
851 " bne 1b"
852+
853+#ifdef CONFIG_PAX_REFCOUNT
854+"\n4:\n"
855+ _ASM_EXTABLE(2b, 4b)
856+#endif
857+
858 : "=&r" (result), "=&r" (tmp), "+Qo" (v->counter)
859 : "r" (&v->counter), "Ir" (i)
860 : "cc");
861@@ -132,6 +252,28 @@ static inline int atomic_cmpxchg(atomic_t *ptr, int old, int new)
862 return oldval;
863 }
864
865+static inline int atomic_cmpxchg_unchecked(atomic_unchecked_t *ptr, int old, int new)
866+{
867+ unsigned long oldval, res;
868+
869+ smp_mb();
870+
871+ do {
872+ __asm__ __volatile__("@ atomic_cmpxchg_unchecked\n"
873+ "ldrex %1, [%3]\n"
874+ "mov %0, #0\n"
875+ "teq %1, %4\n"
876+ "strexeq %0, %5, [%3]\n"
877+ : "=&r" (res), "=&r" (oldval), "+Qo" (ptr->counter)
878+ : "r" (&ptr->counter), "Ir" (old), "r" (new)
879+ : "cc");
880+ } while (res);
881+
882+ smp_mb();
883+
884+ return oldval;
885+}
886+
887 static inline void atomic_clear_mask(unsigned long mask, unsigned long *addr)
888 {
889 unsigned long tmp, tmp2;
890@@ -207,6 +349,10 @@ static inline void atomic_clear_mask(unsigned long mask, unsigned long *addr)
891 #endif /* __LINUX_ARM_ARCH__ */
892
893 #define atomic_xchg(v, new) (xchg(&((v)->counter), new))
894+static inline int atomic_xchg_unchecked(atomic_unchecked_t *v, int new)
895+{
896+ return xchg(&v->counter, new);
897+}
898
899 static inline int __atomic_add_unless(atomic_t *v, int a, int u)
900 {
901@@ -219,11 +365,27 @@ static inline int __atomic_add_unless(atomic_t *v, int a, int u)
902 }
903
904 #define atomic_inc(v) atomic_add(1, v)
905+static inline void atomic_inc_unchecked(atomic_unchecked_t *v)
906+{
907+ atomic_add_unchecked(1, v);
908+}
909 #define atomic_dec(v) atomic_sub(1, v)
910+static inline void atomic_dec_unchecked(atomic_unchecked_t *v)
911+{
912+ atomic_sub_unchecked(1, v);
913+}
914
915 #define atomic_inc_and_test(v) (atomic_add_return(1, v) == 0)
916+static inline int atomic_inc_and_test_unchecked(atomic_unchecked_t *v)
917+{
918+ return atomic_add_return_unchecked(1, v) == 0;
919+}
920 #define atomic_dec_and_test(v) (atomic_sub_return(1, v) == 0)
921 #define atomic_inc_return(v) (atomic_add_return(1, v))
922+static inline int atomic_inc_return_unchecked(atomic_unchecked_t *v)
923+{
924+ return atomic_add_return_unchecked(1, v);
925+}
926 #define atomic_dec_return(v) (atomic_sub_return(1, v))
927 #define atomic_sub_and_test(i, v) (atomic_sub_return(i, v) == 0)
928
929@@ -239,6 +401,14 @@ typedef struct {
930 u64 __aligned(8) counter;
931 } atomic64_t;
932
933+#ifdef CONFIG_PAX_REFCOUNT
934+typedef struct {
935+ u64 __aligned(8) counter;
936+} atomic64_unchecked_t;
937+#else
938+typedef atomic64_t atomic64_unchecked_t;
939+#endif
940+
941 #define ATOMIC64_INIT(i) { (i) }
942
943 static inline u64 atomic64_read(atomic64_t *v)
944@@ -254,6 +424,19 @@ static inline u64 atomic64_read(atomic64_t *v)
945 return result;
946 }
947
948+static inline u64 atomic64_read_unchecked(atomic64_unchecked_t *v)
949+{
950+ u64 result;
951+
952+ __asm__ __volatile__("@ atomic64_read_unchecked\n"
953+" ldrexd %0, %H0, [%1]"
954+ : "=&r" (result)
955+ : "r" (&v->counter), "Qo" (v->counter)
956+ );
957+
958+ return result;
959+}
960+
961 static inline void atomic64_set(atomic64_t *v, u64 i)
962 {
963 u64 tmp;
964@@ -268,6 +451,20 @@ static inline void atomic64_set(atomic64_t *v, u64 i)
965 : "cc");
966 }
967
968+static inline void atomic64_set_unchecked(atomic64_unchecked_t *v, u64 i)
969+{
970+ u64 tmp;
971+
972+ __asm__ __volatile__("@ atomic64_set_unchecked\n"
973+"1: ldrexd %0, %H0, [%2]\n"
974+" strexd %0, %3, %H3, [%2]\n"
975+" teq %0, #0\n"
976+" bne 1b"
977+ : "=&r" (tmp), "=Qo" (v->counter)
978+ : "r" (&v->counter), "r" (i)
979+ : "cc");
980+}
981+
982 static inline void atomic64_add(u64 i, atomic64_t *v)
983 {
984 u64 result;
985@@ -276,6 +473,36 @@ static inline void atomic64_add(u64 i, atomic64_t *v)
986 __asm__ __volatile__("@ atomic64_add\n"
987 "1: ldrexd %0, %H0, [%3]\n"
988 " adds %0, %0, %4\n"
989+" adcs %H0, %H0, %H4\n"
990+
991+#ifdef CONFIG_PAX_REFCOUNT
992+" bvc 3f\n"
993+"2: bkpt 0xf103\n"
994+"3:\n"
995+#endif
996+
997+" strexd %1, %0, %H0, [%3]\n"
998+" teq %1, #0\n"
999+" bne 1b"
1000+
1001+#ifdef CONFIG_PAX_REFCOUNT
1002+"\n4:\n"
1003+ _ASM_EXTABLE(2b, 4b)
1004+#endif
1005+
1006+ : "=&r" (result), "=&r" (tmp), "+Qo" (v->counter)
1007+ : "r" (&v->counter), "r" (i)
1008+ : "cc");
1009+}
1010+
1011+static inline void atomic64_add_unchecked(u64 i, atomic64_unchecked_t *v)
1012+{
1013+ u64 result;
1014+ unsigned long tmp;
1015+
1016+ __asm__ __volatile__("@ atomic64_add_unchecked\n"
1017+"1: ldrexd %0, %H0, [%3]\n"
1018+" adds %0, %0, %4\n"
1019 " adc %H0, %H0, %H4\n"
1020 " strexd %1, %0, %H0, [%3]\n"
1021 " teq %1, #0\n"
1022@@ -287,12 +514,49 @@ static inline void atomic64_add(u64 i, atomic64_t *v)
1023
1024 static inline u64 atomic64_add_return(u64 i, atomic64_t *v)
1025 {
1026- u64 result;
1027- unsigned long tmp;
1028+ u64 result, tmp;
1029
1030 smp_mb();
1031
1032 __asm__ __volatile__("@ atomic64_add_return\n"
1033+"1: ldrexd %1, %H1, [%3]\n"
1034+" adds %0, %1, %4\n"
1035+" adcs %H0, %H1, %H4\n"
1036+
1037+#ifdef CONFIG_PAX_REFCOUNT
1038+" bvc 3f\n"
1039+" mov %0, %1\n"
1040+" mov %H0, %H1\n"
1041+"2: bkpt 0xf103\n"
1042+"3:\n"
1043+#endif
1044+
1045+" strexd %1, %0, %H0, [%3]\n"
1046+" teq %1, #0\n"
1047+" bne 1b"
1048+
1049+#ifdef CONFIG_PAX_REFCOUNT
1050+"\n4:\n"
1051+ _ASM_EXTABLE(2b, 4b)
1052+#endif
1053+
1054+ : "=&r" (result), "=&r" (tmp), "+Qo" (v->counter)
1055+ : "r" (&v->counter), "r" (i)
1056+ : "cc");
1057+
1058+ smp_mb();
1059+
1060+ return result;
1061+}
1062+
1063+static inline u64 atomic64_add_return_unchecked(u64 i, atomic64_unchecked_t *v)
1064+{
1065+ u64 result;
1066+ unsigned long tmp;
1067+
1068+ smp_mb();
1069+
1070+ __asm__ __volatile__("@ atomic64_add_return_unchecked\n"
1071 "1: ldrexd %0, %H0, [%3]\n"
1072 " adds %0, %0, %4\n"
1073 " adc %H0, %H0, %H4\n"
1074@@ -316,6 +580,36 @@ static inline void atomic64_sub(u64 i, atomic64_t *v)
1075 __asm__ __volatile__("@ atomic64_sub\n"
1076 "1: ldrexd %0, %H0, [%3]\n"
1077 " subs %0, %0, %4\n"
1078+" sbcs %H0, %H0, %H4\n"
1079+
1080+#ifdef CONFIG_PAX_REFCOUNT
1081+" bvc 3f\n"
1082+"2: bkpt 0xf103\n"
1083+"3:\n"
1084+#endif
1085+
1086+" strexd %1, %0, %H0, [%3]\n"
1087+" teq %1, #0\n"
1088+" bne 1b"
1089+
1090+#ifdef CONFIG_PAX_REFCOUNT
1091+"\n4:\n"
1092+ _ASM_EXTABLE(2b, 4b)
1093+#endif
1094+
1095+ : "=&r" (result), "=&r" (tmp), "+Qo" (v->counter)
1096+ : "r" (&v->counter), "r" (i)
1097+ : "cc");
1098+}
1099+
1100+static inline void atomic64_sub_unchecked(u64 i, atomic64_unchecked_t *v)
1101+{
1102+ u64 result;
1103+ unsigned long tmp;
1104+
1105+ __asm__ __volatile__("@ atomic64_sub_unchecked\n"
1106+"1: ldrexd %0, %H0, [%3]\n"
1107+" subs %0, %0, %4\n"
1108 " sbc %H0, %H0, %H4\n"
1109 " strexd %1, %0, %H0, [%3]\n"
1110 " teq %1, #0\n"
1111@@ -327,18 +621,32 @@ static inline void atomic64_sub(u64 i, atomic64_t *v)
1112
1113 static inline u64 atomic64_sub_return(u64 i, atomic64_t *v)
1114 {
1115- u64 result;
1116- unsigned long tmp;
1117+ u64 result, tmp;
1118
1119 smp_mb();
1120
1121 __asm__ __volatile__("@ atomic64_sub_return\n"
1122-"1: ldrexd %0, %H0, [%3]\n"
1123-" subs %0, %0, %4\n"
1124-" sbc %H0, %H0, %H4\n"
1125+"1: ldrexd %1, %H1, [%3]\n"
1126+" subs %0, %1, %4\n"
1127+" sbc %H0, %H1, %H4\n"
1128+
1129+#ifdef CONFIG_PAX_REFCOUNT
1130+" bvc 3f\n"
1131+" mov %0, %1\n"
1132+" mov %H0, %H1\n"
1133+"2: bkpt 0xf103\n"
1134+"3:\n"
1135+#endif
1136+
1137 " strexd %1, %0, %H0, [%3]\n"
1138 " teq %1, #0\n"
1139 " bne 1b"
1140+
1141+#ifdef CONFIG_PAX_REFCOUNT
1142+"\n4:\n"
1143+ _ASM_EXTABLE(2b, 4b)
1144+#endif
1145+
1146 : "=&r" (result), "=&r" (tmp), "+Qo" (v->counter)
1147 : "r" (&v->counter), "r" (i)
1148 : "cc");
1149@@ -372,6 +680,30 @@ static inline u64 atomic64_cmpxchg(atomic64_t *ptr, u64 old, u64 new)
1150 return oldval;
1151 }
1152
1153+static inline u64 atomic64_cmpxchg_unchecked(atomic64_unchecked_t *ptr, u64 old, u64 new)
1154+{
1155+ u64 oldval;
1156+ unsigned long res;
1157+
1158+ smp_mb();
1159+
1160+ do {
1161+ __asm__ __volatile__("@ atomic64_cmpxchg_unchecked\n"
1162+ "ldrexd %1, %H1, [%3]\n"
1163+ "mov %0, #0\n"
1164+ "teq %1, %4\n"
1165+ "teqeq %H1, %H4\n"
1166+ "strexdeq %0, %5, %H5, [%3]"
1167+ : "=&r" (res), "=&r" (oldval), "+Qo" (ptr->counter)
1168+ : "r" (&ptr->counter), "r" (old), "r" (new)
1169+ : "cc");
1170+ } while (res);
1171+
1172+ smp_mb();
1173+
1174+ return oldval;
1175+}
1176+
1177 static inline u64 atomic64_xchg(atomic64_t *ptr, u64 new)
1178 {
1179 u64 result;
1180@@ -395,21 +727,34 @@ static inline u64 atomic64_xchg(atomic64_t *ptr, u64 new)
1181
1182 static inline u64 atomic64_dec_if_positive(atomic64_t *v)
1183 {
1184- u64 result;
1185- unsigned long tmp;
1186+ u64 result, tmp;
1187
1188 smp_mb();
1189
1190 __asm__ __volatile__("@ atomic64_dec_if_positive\n"
1191-"1: ldrexd %0, %H0, [%3]\n"
1192-" subs %0, %0, #1\n"
1193-" sbc %H0, %H0, #0\n"
1194+"1: ldrexd %1, %H1, [%3]\n"
1195+" subs %0, %1, #1\n"
1196+" sbc %H0, %H1, #0\n"
1197+
1198+#ifdef CONFIG_PAX_REFCOUNT
1199+" bvc 3f\n"
1200+" mov %0, %1\n"
1201+" mov %H0, %H1\n"
1202+"2: bkpt 0xf103\n"
1203+"3:\n"
1204+#endif
1205+
1206 " teq %H0, #0\n"
1207-" bmi 2f\n"
1208+" bmi 4f\n"
1209 " strexd %1, %0, %H0, [%3]\n"
1210 " teq %1, #0\n"
1211 " bne 1b\n"
1212-"2:"
1213+"4:\n"
1214+
1215+#ifdef CONFIG_PAX_REFCOUNT
1216+ _ASM_EXTABLE(2b, 4b)
1217+#endif
1218+
1219 : "=&r" (result), "=&r" (tmp), "+Qo" (v->counter)
1220 : "r" (&v->counter)
1221 : "cc");
1222@@ -432,13 +777,25 @@ static inline int atomic64_add_unless(atomic64_t *v, u64 a, u64 u)
1223 " teq %0, %5\n"
1224 " teqeq %H0, %H5\n"
1225 " moveq %1, #0\n"
1226-" beq 2f\n"
1227+" beq 4f\n"
1228 " adds %0, %0, %6\n"
1229 " adc %H0, %H0, %H6\n"
1230+
1231+#ifdef CONFIG_PAX_REFCOUNT
1232+" bvc 3f\n"
1233+"2: bkpt 0xf103\n"
1234+"3:\n"
1235+#endif
1236+
1237 " strexd %2, %0, %H0, [%4]\n"
1238 " teq %2, #0\n"
1239 " bne 1b\n"
1240-"2:"
1241+"4:\n"
1242+
1243+#ifdef CONFIG_PAX_REFCOUNT
1244+ _ASM_EXTABLE(2b, 4b)
1245+#endif
1246+
1247 : "=&r" (val), "+r" (ret), "=&r" (tmp), "+Qo" (v->counter)
1248 : "r" (&v->counter), "r" (u), "r" (a)
1249 : "cc");
1250@@ -451,10 +808,13 @@ static inline int atomic64_add_unless(atomic64_t *v, u64 a, u64 u)
1251
1252 #define atomic64_add_negative(a, v) (atomic64_add_return((a), (v)) < 0)
1253 #define atomic64_inc(v) atomic64_add(1LL, (v))
1254+#define atomic64_inc_unchecked(v) atomic64_add_unchecked(1LL, (v))
1255 #define atomic64_inc_return(v) atomic64_add_return(1LL, (v))
1256+#define atomic64_inc_return_unchecked(v) atomic64_add_return_unchecked(1LL, (v))
1257 #define atomic64_inc_and_test(v) (atomic64_inc_return(v) == 0)
1258 #define atomic64_sub_and_test(a, v) (atomic64_sub_return((a), (v)) == 0)
1259 #define atomic64_dec(v) atomic64_sub(1LL, (v))
1260+#define atomic64_dec_unchecked(v) atomic64_sub_unchecked(1LL, (v))
1261 #define atomic64_dec_return(v) atomic64_sub_return(1LL, (v))
1262 #define atomic64_dec_and_test(v) (atomic64_dec_return((v)) == 0)
1263 #define atomic64_inc_not_zero(v) atomic64_add_unless((v), 1LL, 0LL)
1264diff --git a/arch/arm/include/asm/cache.h b/arch/arm/include/asm/cache.h
1265index 75fe66b..2255c86 100644
1266--- a/arch/arm/include/asm/cache.h
1267+++ b/arch/arm/include/asm/cache.h
1268@@ -4,8 +4,10 @@
1269 #ifndef __ASMARM_CACHE_H
1270 #define __ASMARM_CACHE_H
1271
1272+#include <linux/const.h>
1273+
1274 #define L1_CACHE_SHIFT CONFIG_ARM_L1_CACHE_SHIFT
1275-#define L1_CACHE_BYTES (1 << L1_CACHE_SHIFT)
1276+#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT)
1277
1278 /*
1279 * Memory returned by kmalloc() may be used for DMA, so we must make
1280diff --git a/arch/arm/include/asm/cacheflush.h b/arch/arm/include/asm/cacheflush.h
1281index d5d8d5c..ad92c96 100644
1282--- a/arch/arm/include/asm/cacheflush.h
1283+++ b/arch/arm/include/asm/cacheflush.h
1284@@ -108,7 +108,7 @@ struct cpu_cache_fns {
1285 void (*dma_unmap_area)(const void *, size_t, int);
1286
1287 void (*dma_flush_range)(const void *, const void *);
1288-};
1289+} __no_const;
1290
1291 /*
1292 * Select the calling method
1293diff --git a/arch/arm/include/asm/elf.h b/arch/arm/include/asm/elf.h
1294index 0e9ce8d..6ef1e03 100644
1295--- a/arch/arm/include/asm/elf.h
1296+++ b/arch/arm/include/asm/elf.h
1297@@ -116,7 +116,14 @@ int dump_task_regs(struct task_struct *t, elf_gregset_t *elfregs);
1298 the loader. We need to make sure that it is out of the way of the program
1299 that it will "exec", and that there is sufficient room for the brk. */
1300
1301-#define ELF_ET_DYN_BASE (2 * TASK_SIZE / 3)
1302+#define ELF_ET_DYN_BASE (TASK_SIZE / 3 * 2)
1303+
1304+#ifdef CONFIG_PAX_ASLR
1305+#define PAX_ELF_ET_DYN_BASE 0x00008000UL
1306+
1307+#define PAX_DELTA_MMAP_LEN ((current->personality == PER_LINUX_32BIT) ? 16 : 10)
1308+#define PAX_DELTA_STACK_LEN ((current->personality == PER_LINUX_32BIT) ? 16 : 10)
1309+#endif
1310
1311 /* When the program starts, a1 contains a pointer to a function to be
1312 registered with atexit, as per the SVR4 ABI. A value of 0 means we
1313@@ -126,10 +133,6 @@ int dump_task_regs(struct task_struct *t, elf_gregset_t *elfregs);
1314 extern void elf_set_personality(const struct elf32_hdr *);
1315 #define SET_PERSONALITY(ex) elf_set_personality(&(ex))
1316
1317-struct mm_struct;
1318-extern unsigned long arch_randomize_brk(struct mm_struct *mm);
1319-#define arch_randomize_brk arch_randomize_brk
1320-
1321 extern int vectors_user_mapping(void);
1322 #define arch_setup_additional_pages(bprm, uses_interp) vectors_user_mapping()
1323 #define ARCH_HAS_SETUP_ADDITIONAL_PAGES
1324diff --git a/arch/arm/include/asm/kmap_types.h b/arch/arm/include/asm/kmap_types.h
1325index e51b1e8..32a3113 100644
1326--- a/arch/arm/include/asm/kmap_types.h
1327+++ b/arch/arm/include/asm/kmap_types.h
1328@@ -21,6 +21,7 @@ enum km_type {
1329 KM_L1_CACHE,
1330 KM_L2_CACHE,
1331 KM_KDB,
1332+ KM_CLEARPAGE,
1333 KM_TYPE_NR
1334 };
1335
1336diff --git a/arch/arm/include/asm/outercache.h b/arch/arm/include/asm/outercache.h
1337index 53426c6..c7baff3 100644
1338--- a/arch/arm/include/asm/outercache.h
1339+++ b/arch/arm/include/asm/outercache.h
1340@@ -35,7 +35,7 @@ struct outer_cache_fns {
1341 #endif
1342 void (*set_debug)(unsigned long);
1343 void (*resume)(void);
1344-};
1345+} __no_const;
1346
1347 #ifdef CONFIG_OUTER_CACHE
1348
1349diff --git a/arch/arm/include/asm/page.h b/arch/arm/include/asm/page.h
1350index ca94653..6ac0d56 100644
1351--- a/arch/arm/include/asm/page.h
1352+++ b/arch/arm/include/asm/page.h
1353@@ -123,7 +123,7 @@ struct cpu_user_fns {
1354 void (*cpu_clear_user_highpage)(struct page *page, unsigned long vaddr);
1355 void (*cpu_copy_user_highpage)(struct page *to, struct page *from,
1356 unsigned long vaddr, struct vm_area_struct *vma);
1357-};
1358+} __no_const;
1359
1360 #ifdef MULTI_USER
1361 extern struct cpu_user_fns cpu_user;
1362diff --git a/arch/arm/include/asm/system.h b/arch/arm/include/asm/system.h
1363index 984014b..a6d914f 100644
1364--- a/arch/arm/include/asm/system.h
1365+++ b/arch/arm/include/asm/system.h
1366@@ -90,6 +90,8 @@ void hook_ifault_code(int nr, int (*fn)(unsigned long, unsigned int,
1367
1368 #define xchg(ptr,x) \
1369 ((__typeof__(*(ptr)))__xchg((unsigned long)(x),(ptr),sizeof(*(ptr))))
1370+#define xchg_unchecked(ptr,x) \
1371+ ((__typeof__(*(ptr)))__xchg((unsigned long)(x),(ptr),sizeof(*(ptr))))
1372
1373 extern asmlinkage void c_backtrace(unsigned long fp, int pmode);
1374
1375@@ -101,7 +103,7 @@ extern int __pure cpu_architecture(void);
1376 extern void cpu_init(void);
1377
1378 void arm_machine_restart(char mode, const char *cmd);
1379-extern void (*arm_pm_restart)(char str, const char *cmd);
1380+extern void (*arm_pm_restart)(char str, const char *cmd) __noreturn;
1381
1382 #define UDBG_UNDEFINED (1 << 0)
1383 #define UDBG_SYSCALL (1 << 1)
1384@@ -526,6 +528,13 @@ static inline unsigned long long __cmpxchg64_mb(volatile void *ptr,
1385
1386 #endif /* __LINUX_ARM_ARCH__ >= 6 */
1387
1388+#define _ASM_EXTABLE(from, to) \
1389+" .pushsection __ex_table,\"a\"\n"\
1390+" .align 3\n" \
1391+" .long " #from ", " #to"\n" \
1392+" .popsection"
1393+
1394+
1395 #endif /* __ASSEMBLY__ */
1396
1397 #define arch_align_stack(x) (x)
1398diff --git a/arch/arm/include/asm/uaccess.h b/arch/arm/include/asm/uaccess.h
1399index b293616..96310e5 100644
1400--- a/arch/arm/include/asm/uaccess.h
1401+++ b/arch/arm/include/asm/uaccess.h
1402@@ -22,6 +22,8 @@
1403 #define VERIFY_READ 0
1404 #define VERIFY_WRITE 1
1405
1406+extern void check_object_size(const void *ptr, unsigned long n, bool to);
1407+
1408 /*
1409 * The exception table consists of pairs of addresses: the first is the
1410 * address of an instruction that is allowed to fault, and the second is
1411@@ -387,8 +389,23 @@ do { \
1412
1413
1414 #ifdef CONFIG_MMU
1415-extern unsigned long __must_check __copy_from_user(void *to, const void __user *from, unsigned long n);
1416-extern unsigned long __must_check __copy_to_user(void __user *to, const void *from, unsigned long n);
1417+extern unsigned long __must_check ___copy_from_user(void *to, const void __user *from, unsigned long n);
1418+extern unsigned long __must_check ___copy_to_user(void __user *to, const void *from, unsigned long n);
1419+
1420+static inline unsigned long __must_check __copy_from_user(void *to, const void __user *from, unsigned long n)
1421+{
1422+ if (!__builtin_constant_p(n))
1423+ check_object_size(to, n, false);
1424+ return ___copy_from_user(to, from, n);
1425+}
1426+
1427+static inline unsigned long __must_check __copy_to_user(void __user *to, const void *from, unsigned long n)
1428+{
1429+ if (!__builtin_constant_p(n))
1430+ check_object_size(from, n, true);
1431+ return ___copy_to_user(to, from, n);
1432+}
1433+
1434 extern unsigned long __must_check __copy_to_user_std(void __user *to, const void *from, unsigned long n);
1435 extern unsigned long __must_check __clear_user(void __user *addr, unsigned long n);
1436 extern unsigned long __must_check __clear_user_std(void __user *addr, unsigned long n);
1437@@ -403,6 +420,9 @@ extern unsigned long __must_check __strnlen_user(const char __user *s, long n);
1438
1439 static inline unsigned long __must_check copy_from_user(void *to, const void __user *from, unsigned long n)
1440 {
1441+ if ((long)n < 0)
1442+ return n;
1443+
1444 if (access_ok(VERIFY_READ, from, n))
1445 n = __copy_from_user(to, from, n);
1446 else /* security hole - plug it */
1447@@ -412,6 +432,9 @@ static inline unsigned long __must_check copy_from_user(void *to, const void __u
1448
1449 static inline unsigned long __must_check copy_to_user(void __user *to, const void *from, unsigned long n)
1450 {
1451+ if ((long)n < 0)
1452+ return n;
1453+
1454 if (access_ok(VERIFY_WRITE, to, n))
1455 n = __copy_to_user(to, from, n);
1456 return n;
1457diff --git a/arch/arm/kernel/armksyms.c b/arch/arm/kernel/armksyms.c
1458index 5b0bce6..becd81c 100644
1459--- a/arch/arm/kernel/armksyms.c
1460+++ b/arch/arm/kernel/armksyms.c
1461@@ -95,8 +95,8 @@ EXPORT_SYMBOL(__strncpy_from_user);
1462 #ifdef CONFIG_MMU
1463 EXPORT_SYMBOL(copy_page);
1464
1465-EXPORT_SYMBOL(__copy_from_user);
1466-EXPORT_SYMBOL(__copy_to_user);
1467+EXPORT_SYMBOL(___copy_from_user);
1468+EXPORT_SYMBOL(___copy_to_user);
1469 EXPORT_SYMBOL(__clear_user);
1470
1471 EXPORT_SYMBOL(__get_user_1);
1472diff --git a/arch/arm/kernel/process.c b/arch/arm/kernel/process.c
1473index 3d0c6fb..9d326fa 100644
1474--- a/arch/arm/kernel/process.c
1475+++ b/arch/arm/kernel/process.c
1476@@ -28,7 +28,6 @@
1477 #include <linux/tick.h>
1478 #include <linux/utsname.h>
1479 #include <linux/uaccess.h>
1480-#include <linux/random.h>
1481 #include <linux/hw_breakpoint.h>
1482 #include <linux/cpuidle.h>
1483
1484@@ -92,7 +91,7 @@ static int __init hlt_setup(char *__unused)
1485 __setup("nohlt", nohlt_setup);
1486 __setup("hlt", hlt_setup);
1487
1488-void arm_machine_restart(char mode, const char *cmd)
1489+__noreturn void arm_machine_restart(char mode, const char *cmd)
1490 {
1491 /* Disable interrupts first */
1492 local_irq_disable();
1493@@ -134,7 +133,7 @@ void arm_machine_restart(char mode, const char *cmd)
1494 void (*pm_power_off)(void);
1495 EXPORT_SYMBOL(pm_power_off);
1496
1497-void (*arm_pm_restart)(char str, const char *cmd) = arm_machine_restart;
1498+void (*arm_pm_restart)(char str, const char *cmd) __noreturn = arm_machine_restart;
1499 EXPORT_SYMBOL_GPL(arm_pm_restart);
1500
1501 static void do_nothing(void *unused)
1502@@ -248,6 +247,7 @@ void machine_power_off(void)
1503 machine_shutdown();
1504 if (pm_power_off)
1505 pm_power_off();
1506+ BUG();
1507 }
1508
1509 void machine_restart(char *cmd)
1510@@ -484,12 +484,6 @@ unsigned long get_wchan(struct task_struct *p)
1511 return 0;
1512 }
1513
1514-unsigned long arch_randomize_brk(struct mm_struct *mm)
1515-{
1516- unsigned long range_end = mm->brk + 0x02000000;
1517- return randomize_range(mm->brk, range_end, 0) ? : mm->brk;
1518-}
1519-
1520 #ifdef CONFIG_MMU
1521 /*
1522 * The vectors page is always readable from user space for the
1523diff --git a/arch/arm/kernel/setup.c b/arch/arm/kernel/setup.c
1524index 8fc2c8f..064c150 100644
1525--- a/arch/arm/kernel/setup.c
1526+++ b/arch/arm/kernel/setup.c
1527@@ -108,13 +108,13 @@ struct processor processor __read_mostly;
1528 struct cpu_tlb_fns cpu_tlb __read_mostly;
1529 #endif
1530 #ifdef MULTI_USER
1531-struct cpu_user_fns cpu_user __read_mostly;
1532+struct cpu_user_fns cpu_user __read_only;
1533 #endif
1534 #ifdef MULTI_CACHE
1535-struct cpu_cache_fns cpu_cache __read_mostly;
1536+struct cpu_cache_fns cpu_cache __read_only;
1537 #endif
1538 #ifdef CONFIG_OUTER_CACHE
1539-struct outer_cache_fns outer_cache __read_mostly;
1540+struct outer_cache_fns outer_cache __read_only;
1541 EXPORT_SYMBOL(outer_cache);
1542 #endif
1543
1544diff --git a/arch/arm/kernel/traps.c b/arch/arm/kernel/traps.c
1545index 99a5727..a3d5bb1 100644
1546--- a/arch/arm/kernel/traps.c
1547+++ b/arch/arm/kernel/traps.c
1548@@ -259,6 +259,8 @@ static int __die(const char *str, int err, struct thread_info *thread, struct pt
1549
1550 static DEFINE_RAW_SPINLOCK(die_lock);
1551
1552+extern void gr_handle_kernel_exploit(void);
1553+
1554 /*
1555 * This function is protected against re-entrancy.
1556 */
1557@@ -288,6 +290,9 @@ void die(const char *str, struct pt_regs *regs, int err)
1558 panic("Fatal exception in interrupt");
1559 if (panic_on_oops)
1560 panic("Fatal exception");
1561+
1562+ gr_handle_kernel_exploit();
1563+
1564 if (ret != NOTIFY_STOP)
1565 do_exit(SIGSEGV);
1566 }
1567diff --git a/arch/arm/lib/copy_from_user.S b/arch/arm/lib/copy_from_user.S
1568index 66a477a..bee61d3 100644
1569--- a/arch/arm/lib/copy_from_user.S
1570+++ b/arch/arm/lib/copy_from_user.S
1571@@ -16,7 +16,7 @@
1572 /*
1573 * Prototype:
1574 *
1575- * size_t __copy_from_user(void *to, const void *from, size_t n)
1576+ * size_t ___copy_from_user(void *to, const void *from, size_t n)
1577 *
1578 * Purpose:
1579 *
1580@@ -84,11 +84,11 @@
1581
1582 .text
1583
1584-ENTRY(__copy_from_user)
1585+ENTRY(___copy_from_user)
1586
1587 #include "copy_template.S"
1588
1589-ENDPROC(__copy_from_user)
1590+ENDPROC(___copy_from_user)
1591
1592 .pushsection .fixup,"ax"
1593 .align 0
1594diff --git a/arch/arm/lib/copy_page.S b/arch/arm/lib/copy_page.S
1595index 6ee2f67..d1cce76 100644
1596--- a/arch/arm/lib/copy_page.S
1597+++ b/arch/arm/lib/copy_page.S
1598@@ -10,6 +10,7 @@
1599 * ASM optimised string functions
1600 */
1601 #include <linux/linkage.h>
1602+#include <linux/const.h>
1603 #include <asm/assembler.h>
1604 #include <asm/asm-offsets.h>
1605 #include <asm/cache.h>
1606diff --git a/arch/arm/lib/copy_to_user.S b/arch/arm/lib/copy_to_user.S
1607index d066df6..df28194 100644
1608--- a/arch/arm/lib/copy_to_user.S
1609+++ b/arch/arm/lib/copy_to_user.S
1610@@ -16,7 +16,7 @@
1611 /*
1612 * Prototype:
1613 *
1614- * size_t __copy_to_user(void *to, const void *from, size_t n)
1615+ * size_t ___copy_to_user(void *to, const void *from, size_t n)
1616 *
1617 * Purpose:
1618 *
1619@@ -88,11 +88,11 @@
1620 .text
1621
1622 ENTRY(__copy_to_user_std)
1623-WEAK(__copy_to_user)
1624+WEAK(___copy_to_user)
1625
1626 #include "copy_template.S"
1627
1628-ENDPROC(__copy_to_user)
1629+ENDPROC(___copy_to_user)
1630 ENDPROC(__copy_to_user_std)
1631
1632 .pushsection .fixup,"ax"
1633diff --git a/arch/arm/lib/uaccess.S b/arch/arm/lib/uaccess.S
1634index d0ece2a..5ae2f39 100644
1635--- a/arch/arm/lib/uaccess.S
1636+++ b/arch/arm/lib/uaccess.S
1637@@ -20,7 +20,7 @@
1638
1639 #define PAGE_SHIFT 12
1640
1641-/* Prototype: int __copy_to_user(void *to, const char *from, size_t n)
1642+/* Prototype: int ___copy_to_user(void *to, const char *from, size_t n)
1643 * Purpose : copy a block to user memory from kernel memory
1644 * Params : to - user memory
1645 * : from - kernel memory
1646@@ -40,7 +40,7 @@ USER( T(strgtb) r3, [r0], #1) @ May fault
1647 sub r2, r2, ip
1648 b .Lc2u_dest_aligned
1649
1650-ENTRY(__copy_to_user)
1651+ENTRY(___copy_to_user)
1652 stmfd sp!, {r2, r4 - r7, lr}
1653 cmp r2, #4
1654 blt .Lc2u_not_enough
1655@@ -278,14 +278,14 @@ USER( T(strgeb) r3, [r0], #1) @ May fault
1656 ldrgtb r3, [r1], #0
1657 USER( T(strgtb) r3, [r0], #1) @ May fault
1658 b .Lc2u_finished
1659-ENDPROC(__copy_to_user)
1660+ENDPROC(___copy_to_user)
1661
1662 .pushsection .fixup,"ax"
1663 .align 0
1664 9001: ldmfd sp!, {r0, r4 - r7, pc}
1665 .popsection
1666
1667-/* Prototype: unsigned long __copy_from_user(void *to,const void *from,unsigned long n);
1668+/* Prototype: unsigned long ___copy_from_user(void *to,const void *from,unsigned long n);
1669 * Purpose : copy a block from user memory to kernel memory
1670 * Params : to - kernel memory
1671 * : from - user memory
1672@@ -304,7 +304,7 @@ USER( T(ldrgtb) r3, [r1], #1) @ May fault
1673 sub r2, r2, ip
1674 b .Lcfu_dest_aligned
1675
1676-ENTRY(__copy_from_user)
1677+ENTRY(___copy_from_user)
1678 stmfd sp!, {r0, r2, r4 - r7, lr}
1679 cmp r2, #4
1680 blt .Lcfu_not_enough
1681@@ -544,7 +544,7 @@ USER( T(ldrgeb) r3, [r1], #1) @ May fault
1682 USER( T(ldrgtb) r3, [r1], #1) @ May fault
1683 strgtb r3, [r0], #1
1684 b .Lcfu_finished
1685-ENDPROC(__copy_from_user)
1686+ENDPROC(___copy_from_user)
1687
1688 .pushsection .fixup,"ax"
1689 .align 0
1690diff --git a/arch/arm/lib/uaccess_with_memcpy.c b/arch/arm/lib/uaccess_with_memcpy.c
1691index 025f742..8432b08 100644
1692--- a/arch/arm/lib/uaccess_with_memcpy.c
1693+++ b/arch/arm/lib/uaccess_with_memcpy.c
1694@@ -104,7 +104,7 @@ out:
1695 }
1696
1697 unsigned long
1698-__copy_to_user(void __user *to, const void *from, unsigned long n)
1699+___copy_to_user(void __user *to, const void *from, unsigned long n)
1700 {
1701 /*
1702 * This test is stubbed out of the main function above to keep
1703diff --git a/arch/arm/mach-omap2/board-n8x0.c b/arch/arm/mach-omap2/board-n8x0.c
1704index e9d5f4a..f099699 100644
1705--- a/arch/arm/mach-omap2/board-n8x0.c
1706+++ b/arch/arm/mach-omap2/board-n8x0.c
1707@@ -593,7 +593,7 @@ static int n8x0_menelaus_late_init(struct device *dev)
1708 }
1709 #endif
1710
1711-static struct menelaus_platform_data n8x0_menelaus_platform_data __initdata = {
1712+static struct menelaus_platform_data n8x0_menelaus_platform_data __initconst = {
1713 .late_init = n8x0_menelaus_late_init,
1714 };
1715
1716diff --git a/arch/arm/mach-ux500/mbox-db5500.c b/arch/arm/mach-ux500/mbox-db5500.c
1717index 2b2d51c..0127490 100644
1718--- a/arch/arm/mach-ux500/mbox-db5500.c
1719+++ b/arch/arm/mach-ux500/mbox-db5500.c
1720@@ -168,7 +168,7 @@ static ssize_t mbox_read_fifo(struct device *dev,
1721 return sprintf(buf, "0x%X\n", mbox_value);
1722 }
1723
1724-static DEVICE_ATTR(fifo, S_IWUGO | S_IRUGO, mbox_read_fifo, mbox_write_fifo);
1725+static DEVICE_ATTR(fifo, S_IWUSR | S_IRUGO, mbox_read_fifo, mbox_write_fifo);
1726
1727 static int mbox_show(struct seq_file *s, void *data)
1728 {
1729diff --git a/arch/arm/mm/fault.c b/arch/arm/mm/fault.c
1730index aa33949..d366075 100644
1731--- a/arch/arm/mm/fault.c
1732+++ b/arch/arm/mm/fault.c
1733@@ -183,6 +183,13 @@ __do_user_fault(struct task_struct *tsk, unsigned long addr,
1734 }
1735 #endif
1736
1737+#ifdef CONFIG_PAX_PAGEEXEC
1738+ if (fsr & FSR_LNX_PF) {
1739+ pax_report_fault(regs, (void *)regs->ARM_pc, (void *)regs->ARM_sp);
1740+ do_group_exit(SIGKILL);
1741+ }
1742+#endif
1743+
1744 tsk->thread.address = addr;
1745 tsk->thread.error_code = fsr;
1746 tsk->thread.trap_no = 14;
1747@@ -384,6 +391,33 @@ do_page_fault(unsigned long addr, unsigned int fsr, struct pt_regs *regs)
1748 }
1749 #endif /* CONFIG_MMU */
1750
1751+#ifdef CONFIG_PAX_PAGEEXEC
1752+void pax_report_insns(struct pt_regs *regs, void *pc, void *sp)
1753+{
1754+ long i;
1755+
1756+ printk(KERN_ERR "PAX: bytes at PC: ");
1757+ for (i = 0; i < 20; i++) {
1758+ unsigned char c;
1759+ if (get_user(c, (__force unsigned char __user *)pc+i))
1760+ printk(KERN_CONT "?? ");
1761+ else
1762+ printk(KERN_CONT "%02x ", c);
1763+ }
1764+ printk("\n");
1765+
1766+ printk(KERN_ERR "PAX: bytes at SP-4: ");
1767+ for (i = -1; i < 20; i++) {
1768+ unsigned long c;
1769+ if (get_user(c, (__force unsigned long __user *)sp+i))
1770+ printk(KERN_CONT "???????? ");
1771+ else
1772+ printk(KERN_CONT "%08lx ", c);
1773+ }
1774+ printk("\n");
1775+}
1776+#endif
1777+
1778 /*
1779 * First Level Translation Fault Handler
1780 *
1781@@ -628,6 +662,20 @@ do_PrefetchAbort(unsigned long addr, unsigned int ifsr, struct pt_regs *regs)
1782 const struct fsr_info *inf = ifsr_info + fsr_fs(ifsr);
1783 struct siginfo info;
1784
1785+#ifdef CONFIG_PAX_REFCOUNT
1786+ if (fsr_fs(ifsr) == 2) {
1787+ unsigned int bkpt;
1788+
1789+ if (!probe_kernel_address((unsigned int *)addr, bkpt) && bkpt == 0xe12f1073) {
1790+ current->thread.error_code = ifsr;
1791+ current->thread.trap_no = 0;
1792+ pax_report_refcount_overflow(regs);
1793+ fixup_exception(regs);
1794+ return;
1795+ }
1796+ }
1797+#endif
1798+
1799 if (!inf->fn(addr, ifsr | FSR_LNX_PF, regs))
1800 return;
1801
1802diff --git a/arch/arm/mm/mmap.c b/arch/arm/mm/mmap.c
1803index 44b628e..623ee2a 100644
1804--- a/arch/arm/mm/mmap.c
1805+++ b/arch/arm/mm/mmap.c
1806@@ -54,6 +54,10 @@ arch_get_unmapped_area(struct file *filp, unsigned long addr,
1807 if (len > TASK_SIZE)
1808 return -ENOMEM;
1809
1810+#ifdef CONFIG_PAX_RANDMMAP
1811+ if (!(mm->pax_flags & MF_PAX_RANDMMAP))
1812+#endif
1813+
1814 if (addr) {
1815 if (do_align)
1816 addr = COLOUR_ALIGN(addr, pgoff);
1817@@ -61,15 +65,14 @@ arch_get_unmapped_area(struct file *filp, unsigned long addr,
1818 addr = PAGE_ALIGN(addr);
1819
1820 vma = find_vma(mm, addr);
1821- if (TASK_SIZE - len >= addr &&
1822- (!vma || addr + len <= vma->vm_start))
1823+ if (TASK_SIZE - len >= addr && check_heap_stack_gap(vma, addr, len))
1824 return addr;
1825 }
1826 if (len > mm->cached_hole_size) {
1827- start_addr = addr = mm->free_area_cache;
1828+ start_addr = addr = mm->free_area_cache;
1829 } else {
1830- start_addr = addr = TASK_UNMAPPED_BASE;
1831- mm->cached_hole_size = 0;
1832+ start_addr = addr = mm->mmap_base;
1833+ mm->cached_hole_size = 0;
1834 }
1835 /* 8 bits of randomness in 20 address space bits */
1836 if ((current->flags & PF_RANDOMIZE) &&
1837@@ -89,14 +92,14 @@ full_search:
1838 * Start a new search - just in case we missed
1839 * some holes.
1840 */
1841- if (start_addr != TASK_UNMAPPED_BASE) {
1842- start_addr = addr = TASK_UNMAPPED_BASE;
1843+ if (start_addr != mm->mmap_base) {
1844+ start_addr = addr = mm->mmap_base;
1845 mm->cached_hole_size = 0;
1846 goto full_search;
1847 }
1848 return -ENOMEM;
1849 }
1850- if (!vma || addr + len <= vma->vm_start) {
1851+ if (check_heap_stack_gap(vma, addr, len)) {
1852 /*
1853 * Remember the place where we stopped the search:
1854 */
1855diff --git a/arch/arm/plat-samsung/include/plat/dma-ops.h b/arch/arm/plat-samsung/include/plat/dma-ops.h
1856index 4c1a363..df311d0 100644
1857--- a/arch/arm/plat-samsung/include/plat/dma-ops.h
1858+++ b/arch/arm/plat-samsung/include/plat/dma-ops.h
1859@@ -41,7 +41,7 @@ struct samsung_dma_ops {
1860 int (*started)(unsigned ch);
1861 int (*flush)(unsigned ch);
1862 int (*stop)(unsigned ch);
1863-};
1864+} __no_const;
1865
1866 extern void *samsung_dmadev_get_ops(void);
1867 extern void *s3c_dma_get_ops(void);
1868diff --git a/arch/arm/plat-samsung/include/plat/ehci.h b/arch/arm/plat-samsung/include/plat/ehci.h
1869index 5f28cae..3d23723 100644
1870--- a/arch/arm/plat-samsung/include/plat/ehci.h
1871+++ b/arch/arm/plat-samsung/include/plat/ehci.h
1872@@ -14,7 +14,7 @@
1873 struct s5p_ehci_platdata {
1874 int (*phy_init)(struct platform_device *pdev, int type);
1875 int (*phy_exit)(struct platform_device *pdev, int type);
1876-};
1877+} __no_const;
1878
1879 extern void s5p_ehci_set_platdata(struct s5p_ehci_platdata *pd);
1880
1881diff --git a/arch/avr32/include/asm/cache.h b/arch/avr32/include/asm/cache.h
1882index c3a58a1..78fbf54 100644
1883--- a/arch/avr32/include/asm/cache.h
1884+++ b/arch/avr32/include/asm/cache.h
1885@@ -1,8 +1,10 @@
1886 #ifndef __ASM_AVR32_CACHE_H
1887 #define __ASM_AVR32_CACHE_H
1888
1889+#include <linux/const.h>
1890+
1891 #define L1_CACHE_SHIFT 5
1892-#define L1_CACHE_BYTES (1 << L1_CACHE_SHIFT)
1893+#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT)
1894
1895 /*
1896 * Memory returned by kmalloc() may be used for DMA, so we must make
1897diff --git a/arch/avr32/include/asm/elf.h b/arch/avr32/include/asm/elf.h
1898index 3b3159b..425ea94 100644
1899--- a/arch/avr32/include/asm/elf.h
1900+++ b/arch/avr32/include/asm/elf.h
1901@@ -84,8 +84,14 @@ typedef struct user_fpu_struct elf_fpregset_t;
1902 the loader. We need to make sure that it is out of the way of the program
1903 that it will "exec", and that there is sufficient room for the brk. */
1904
1905-#define ELF_ET_DYN_BASE (2 * TASK_SIZE / 3)
1906+#define ELF_ET_DYN_BASE (TASK_SIZE / 3 * 2)
1907
1908+#ifdef CONFIG_PAX_ASLR
1909+#define PAX_ELF_ET_DYN_BASE 0x00001000UL
1910+
1911+#define PAX_DELTA_MMAP_LEN 15
1912+#define PAX_DELTA_STACK_LEN 15
1913+#endif
1914
1915 /* This yields a mask that user programs can use to figure out what
1916 instruction set this CPU supports. This could be done in user space,
1917diff --git a/arch/avr32/include/asm/kmap_types.h b/arch/avr32/include/asm/kmap_types.h
1918index b7f5c68..556135c 100644
1919--- a/arch/avr32/include/asm/kmap_types.h
1920+++ b/arch/avr32/include/asm/kmap_types.h
1921@@ -22,7 +22,8 @@ D(10) KM_IRQ0,
1922 D(11) KM_IRQ1,
1923 D(12) KM_SOFTIRQ0,
1924 D(13) KM_SOFTIRQ1,
1925-D(14) KM_TYPE_NR
1926+D(14) KM_CLEARPAGE,
1927+D(15) KM_TYPE_NR
1928 };
1929
1930 #undef D
1931diff --git a/arch/avr32/mm/fault.c b/arch/avr32/mm/fault.c
1932index f7040a1..db9f300 100644
1933--- a/arch/avr32/mm/fault.c
1934+++ b/arch/avr32/mm/fault.c
1935@@ -41,6 +41,23 @@ static inline int notify_page_fault(struct pt_regs *regs, int trap)
1936
1937 int exception_trace = 1;
1938
1939+#ifdef CONFIG_PAX_PAGEEXEC
1940+void pax_report_insns(struct pt_regs *regs, void *pc, void *sp)
1941+{
1942+ unsigned long i;
1943+
1944+ printk(KERN_ERR "PAX: bytes at PC: ");
1945+ for (i = 0; i < 20; i++) {
1946+ unsigned char c;
1947+ if (get_user(c, (unsigned char *)pc+i))
1948+ printk(KERN_CONT "???????? ");
1949+ else
1950+ printk(KERN_CONT "%02x ", c);
1951+ }
1952+ printk("\n");
1953+}
1954+#endif
1955+
1956 /*
1957 * This routine handles page faults. It determines the address and the
1958 * problem, and then passes it off to one of the appropriate routines.
1959@@ -156,6 +173,16 @@ bad_area:
1960 up_read(&mm->mmap_sem);
1961
1962 if (user_mode(regs)) {
1963+
1964+#ifdef CONFIG_PAX_PAGEEXEC
1965+ if (mm->pax_flags & MF_PAX_PAGEEXEC) {
1966+ if (ecr == ECR_PROTECTION_X || ecr == ECR_TLB_MISS_X) {
1967+ pax_report_fault(regs, (void *)regs->pc, (void *)regs->sp);
1968+ do_group_exit(SIGKILL);
1969+ }
1970+ }
1971+#endif
1972+
1973 if (exception_trace && printk_ratelimit())
1974 printk("%s%s[%d]: segfault at %08lx pc %08lx "
1975 "sp %08lx ecr %lu\n",
1976diff --git a/arch/blackfin/include/asm/cache.h b/arch/blackfin/include/asm/cache.h
1977index 568885a..f8008df 100644
1978--- a/arch/blackfin/include/asm/cache.h
1979+++ b/arch/blackfin/include/asm/cache.h
1980@@ -7,6 +7,7 @@
1981 #ifndef __ARCH_BLACKFIN_CACHE_H
1982 #define __ARCH_BLACKFIN_CACHE_H
1983
1984+#include <linux/const.h>
1985 #include <linux/linkage.h> /* for asmlinkage */
1986
1987 /*
1988@@ -14,7 +15,7 @@
1989 * Blackfin loads 32 bytes for cache
1990 */
1991 #define L1_CACHE_SHIFT 5
1992-#define L1_CACHE_BYTES (1 << L1_CACHE_SHIFT)
1993+#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT)
1994 #define SMP_CACHE_BYTES L1_CACHE_BYTES
1995
1996 #define ARCH_DMA_MINALIGN L1_CACHE_BYTES
1997diff --git a/arch/cris/include/arch-v10/arch/cache.h b/arch/cris/include/arch-v10/arch/cache.h
1998index aea2718..3639a60 100644
1999--- a/arch/cris/include/arch-v10/arch/cache.h
2000+++ b/arch/cris/include/arch-v10/arch/cache.h
2001@@ -1,8 +1,9 @@
2002 #ifndef _ASM_ARCH_CACHE_H
2003 #define _ASM_ARCH_CACHE_H
2004
2005+#include <linux/const.h>
2006 /* Etrax 100LX have 32-byte cache-lines. */
2007-#define L1_CACHE_BYTES 32
2008 #define L1_CACHE_SHIFT 5
2009+#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT)
2010
2011 #endif /* _ASM_ARCH_CACHE_H */
2012diff --git a/arch/cris/include/arch-v32/arch/cache.h b/arch/cris/include/arch-v32/arch/cache.h
2013index 1de779f..336fad3 100644
2014--- a/arch/cris/include/arch-v32/arch/cache.h
2015+++ b/arch/cris/include/arch-v32/arch/cache.h
2016@@ -1,11 +1,12 @@
2017 #ifndef _ASM_CRIS_ARCH_CACHE_H
2018 #define _ASM_CRIS_ARCH_CACHE_H
2019
2020+#include <linux/const.h>
2021 #include <arch/hwregs/dma.h>
2022
2023 /* A cache-line is 32 bytes. */
2024-#define L1_CACHE_BYTES 32
2025 #define L1_CACHE_SHIFT 5
2026+#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT)
2027
2028 #define __read_mostly __attribute__((__section__(".data.read_mostly")))
2029
2030diff --git a/arch/frv/include/asm/atomic.h b/arch/frv/include/asm/atomic.h
2031index 0d8a7d6..d0c9ff5 100644
2032--- a/arch/frv/include/asm/atomic.h
2033+++ b/arch/frv/include/asm/atomic.h
2034@@ -241,6 +241,16 @@ extern uint32_t __xchg_32(uint32_t i, volatile void *v);
2035 #define atomic64_cmpxchg(v, old, new) (__cmpxchg_64(old, new, &(v)->counter))
2036 #define atomic64_xchg(v, new) (__xchg_64(new, &(v)->counter))
2037
2038+#define atomic64_read_unchecked(v) atomic64_read(v)
2039+#define atomic64_set_unchecked(v, i) atomic64_set((v), (i))
2040+#define atomic64_add_unchecked(a, v) atomic64_add((a), (v))
2041+#define atomic64_add_return_unchecked(a, v) atomic64_add_return((a), (v))
2042+#define atomic64_sub_unchecked(a, v) atomic64_sub((a), (v))
2043+#define atomic64_inc_unchecked(v) atomic64_inc(v)
2044+#define atomic64_inc_return_unchecked(v) atomic64_inc_return(v)
2045+#define atomic64_dec_unchecked(v) atomic64_dec(v)
2046+#define atomic64_cmpxchg_unchecked(v, o, n) atomic64_cmpxchg((v), (o), (n))
2047+
2048 static __inline__ int __atomic_add_unless(atomic_t *v, int a, int u)
2049 {
2050 int c, old;
2051diff --git a/arch/frv/include/asm/cache.h b/arch/frv/include/asm/cache.h
2052index 2797163..c2a401d 100644
2053--- a/arch/frv/include/asm/cache.h
2054+++ b/arch/frv/include/asm/cache.h
2055@@ -12,10 +12,11 @@
2056 #ifndef __ASM_CACHE_H
2057 #define __ASM_CACHE_H
2058
2059+#include <linux/const.h>
2060
2061 /* bytes per L1 cache line */
2062 #define L1_CACHE_SHIFT (CONFIG_FRV_L1_CACHE_SHIFT)
2063-#define L1_CACHE_BYTES (1 << L1_CACHE_SHIFT)
2064+#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT)
2065
2066 #define __cacheline_aligned __attribute__((aligned(L1_CACHE_BYTES)))
2067 #define ____cacheline_aligned __attribute__((aligned(L1_CACHE_BYTES)))
2068diff --git a/arch/frv/include/asm/kmap_types.h b/arch/frv/include/asm/kmap_types.h
2069index f8e16b2..c73ff79 100644
2070--- a/arch/frv/include/asm/kmap_types.h
2071+++ b/arch/frv/include/asm/kmap_types.h
2072@@ -23,6 +23,7 @@ enum km_type {
2073 KM_IRQ1,
2074 KM_SOFTIRQ0,
2075 KM_SOFTIRQ1,
2076+ KM_CLEARPAGE,
2077 KM_TYPE_NR
2078 };
2079
2080diff --git a/arch/frv/mm/elf-fdpic.c b/arch/frv/mm/elf-fdpic.c
2081index 385fd30..6c3d97e 100644
2082--- a/arch/frv/mm/elf-fdpic.c
2083+++ b/arch/frv/mm/elf-fdpic.c
2084@@ -73,8 +73,7 @@ unsigned long arch_get_unmapped_area(struct file *filp, unsigned long addr, unsi
2085 if (addr) {
2086 addr = PAGE_ALIGN(addr);
2087 vma = find_vma(current->mm, addr);
2088- if (TASK_SIZE - len >= addr &&
2089- (!vma || addr + len <= vma->vm_start))
2090+ if (TASK_SIZE - len >= addr && check_heap_stack_gap(vma, addr, len))
2091 goto success;
2092 }
2093
2094@@ -89,7 +88,7 @@ unsigned long arch_get_unmapped_area(struct file *filp, unsigned long addr, unsi
2095 for (; vma; vma = vma->vm_next) {
2096 if (addr > limit)
2097 break;
2098- if (addr + len <= vma->vm_start)
2099+ if (check_heap_stack_gap(vma, addr, len))
2100 goto success;
2101 addr = vma->vm_end;
2102 }
2103@@ -104,7 +103,7 @@ unsigned long arch_get_unmapped_area(struct file *filp, unsigned long addr, unsi
2104 for (; vma; vma = vma->vm_next) {
2105 if (addr > limit)
2106 break;
2107- if (addr + len <= vma->vm_start)
2108+ if (check_heap_stack_gap(vma, addr, len))
2109 goto success;
2110 addr = vma->vm_end;
2111 }
2112diff --git a/arch/h8300/include/asm/cache.h b/arch/h8300/include/asm/cache.h
2113index c635028..6d9445a 100644
2114--- a/arch/h8300/include/asm/cache.h
2115+++ b/arch/h8300/include/asm/cache.h
2116@@ -1,8 +1,10 @@
2117 #ifndef __ARCH_H8300_CACHE_H
2118 #define __ARCH_H8300_CACHE_H
2119
2120+#include <linux/const.h>
2121+
2122 /* bytes per L1 cache line */
2123-#define L1_CACHE_BYTES 4
2124+#define L1_CACHE_BYTES _AC(4,UL)
2125
2126 /* m68k-elf-gcc 2.95.2 doesn't like these */
2127
2128diff --git a/arch/hexagon/include/asm/cache.h b/arch/hexagon/include/asm/cache.h
2129index 0f01de2..d37d309 100644
2130--- a/arch/hexagon/include/asm/cache.h
2131+++ b/arch/hexagon/include/asm/cache.h
2132@@ -21,9 +21,11 @@
2133 #ifndef __ASM_CACHE_H
2134 #define __ASM_CACHE_H
2135
2136+#include <linux/const.h>
2137+
2138 /* Bytes per L1 cache line */
2139-#define L1_CACHE_SHIFT (5)
2140-#define L1_CACHE_BYTES (1 << L1_CACHE_SHIFT)
2141+#define L1_CACHE_SHIFT 5
2142+#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT)
2143
2144 #define __cacheline_aligned __aligned(L1_CACHE_BYTES)
2145 #define ____cacheline_aligned __aligned(L1_CACHE_BYTES)
2146diff --git a/arch/ia64/include/asm/atomic.h b/arch/ia64/include/asm/atomic.h
2147index 3fad89e..3047da5 100644
2148--- a/arch/ia64/include/asm/atomic.h
2149+++ b/arch/ia64/include/asm/atomic.h
2150@@ -209,6 +209,16 @@ atomic64_add_negative (__s64 i, atomic64_t *v)
2151 #define atomic64_inc(v) atomic64_add(1, (v))
2152 #define atomic64_dec(v) atomic64_sub(1, (v))
2153
2154+#define atomic64_read_unchecked(v) atomic64_read(v)
2155+#define atomic64_set_unchecked(v, i) atomic64_set((v), (i))
2156+#define atomic64_add_unchecked(a, v) atomic64_add((a), (v))
2157+#define atomic64_add_return_unchecked(a, v) atomic64_add_return((a), (v))
2158+#define atomic64_sub_unchecked(a, v) atomic64_sub((a), (v))
2159+#define atomic64_inc_unchecked(v) atomic64_inc(v)
2160+#define atomic64_inc_return_unchecked(v) atomic64_inc_return(v)
2161+#define atomic64_dec_unchecked(v) atomic64_dec(v)
2162+#define atomic64_cmpxchg_unchecked(v, o, n) atomic64_cmpxchg((v), (o), (n))
2163+
2164 /* Atomic operations are already serializing */
2165 #define smp_mb__before_atomic_dec() barrier()
2166 #define smp_mb__after_atomic_dec() barrier()
2167diff --git a/arch/ia64/include/asm/cache.h b/arch/ia64/include/asm/cache.h
2168index 988254a..e1ee885 100644
2169--- a/arch/ia64/include/asm/cache.h
2170+++ b/arch/ia64/include/asm/cache.h
2171@@ -1,6 +1,7 @@
2172 #ifndef _ASM_IA64_CACHE_H
2173 #define _ASM_IA64_CACHE_H
2174
2175+#include <linux/const.h>
2176
2177 /*
2178 * Copyright (C) 1998-2000 Hewlett-Packard Co
2179@@ -9,7 +10,7 @@
2180
2181 /* Bytes per L1 (data) cache line. */
2182 #define L1_CACHE_SHIFT CONFIG_IA64_L1_CACHE_SHIFT
2183-#define L1_CACHE_BYTES (1 << L1_CACHE_SHIFT)
2184+#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT)
2185
2186 #ifdef CONFIG_SMP
2187 # define SMP_CACHE_SHIFT L1_CACHE_SHIFT
2188diff --git a/arch/ia64/include/asm/elf.h b/arch/ia64/include/asm/elf.h
2189index b5298eb..67c6e62 100644
2190--- a/arch/ia64/include/asm/elf.h
2191+++ b/arch/ia64/include/asm/elf.h
2192@@ -42,6 +42,13 @@
2193 */
2194 #define ELF_ET_DYN_BASE (TASK_UNMAPPED_BASE + 0x800000000UL)
2195
2196+#ifdef CONFIG_PAX_ASLR
2197+#define PAX_ELF_ET_DYN_BASE (current->personality == PER_LINUX32 ? 0x08048000UL : 0x4000000000000000UL)
2198+
2199+#define PAX_DELTA_MMAP_LEN (current->personality == PER_LINUX32 ? 16 : 3*PAGE_SHIFT - 13)
2200+#define PAX_DELTA_STACK_LEN (current->personality == PER_LINUX32 ? 16 : 3*PAGE_SHIFT - 13)
2201+#endif
2202+
2203 #define PT_IA_64_UNWIND 0x70000001
2204
2205 /* IA-64 relocations: */
2206diff --git a/arch/ia64/include/asm/pgtable.h b/arch/ia64/include/asm/pgtable.h
2207index 1a97af3..7529d31 100644
2208--- a/arch/ia64/include/asm/pgtable.h
2209+++ b/arch/ia64/include/asm/pgtable.h
2210@@ -12,7 +12,7 @@
2211 * David Mosberger-Tang <davidm@hpl.hp.com>
2212 */
2213
2214-
2215+#include <linux/const.h>
2216 #include <asm/mman.h>
2217 #include <asm/page.h>
2218 #include <asm/processor.h>
2219@@ -143,6 +143,17 @@
2220 #define PAGE_READONLY __pgprot(__ACCESS_BITS | _PAGE_PL_3 | _PAGE_AR_R)
2221 #define PAGE_COPY __pgprot(__ACCESS_BITS | _PAGE_PL_3 | _PAGE_AR_R)
2222 #define PAGE_COPY_EXEC __pgprot(__ACCESS_BITS | _PAGE_PL_3 | _PAGE_AR_RX)
2223+
2224+#ifdef CONFIG_PAX_PAGEEXEC
2225+# define PAGE_SHARED_NOEXEC __pgprot(__ACCESS_BITS | _PAGE_PL_3 | _PAGE_AR_RW)
2226+# define PAGE_READONLY_NOEXEC __pgprot(__ACCESS_BITS | _PAGE_PL_3 | _PAGE_AR_R)
2227+# define PAGE_COPY_NOEXEC __pgprot(__ACCESS_BITS | _PAGE_PL_3 | _PAGE_AR_R)
2228+#else
2229+# define PAGE_SHARED_NOEXEC PAGE_SHARED
2230+# define PAGE_READONLY_NOEXEC PAGE_READONLY
2231+# define PAGE_COPY_NOEXEC PAGE_COPY
2232+#endif
2233+
2234 #define PAGE_GATE __pgprot(__ACCESS_BITS | _PAGE_PL_0 | _PAGE_AR_X_RX)
2235 #define PAGE_KERNEL __pgprot(__DIRTY_BITS | _PAGE_PL_0 | _PAGE_AR_RWX)
2236 #define PAGE_KERNELRX __pgprot(__ACCESS_BITS | _PAGE_PL_0 | _PAGE_AR_RX)
2237diff --git a/arch/ia64/include/asm/spinlock.h b/arch/ia64/include/asm/spinlock.h
2238index b77768d..e0795eb 100644
2239--- a/arch/ia64/include/asm/spinlock.h
2240+++ b/arch/ia64/include/asm/spinlock.h
2241@@ -72,7 +72,7 @@ static __always_inline void __ticket_spin_unlock(arch_spinlock_t *lock)
2242 unsigned short *p = (unsigned short *)&lock->lock + 1, tmp;
2243
2244 asm volatile ("ld2.bias %0=[%1]" : "=r"(tmp) : "r"(p));
2245- ACCESS_ONCE(*p) = (tmp + 2) & ~1;
2246+ ACCESS_ONCE_RW(*p) = (tmp + 2) & ~1;
2247 }
2248
2249 static __always_inline void __ticket_spin_unlock_wait(arch_spinlock_t *lock)
2250diff --git a/arch/ia64/include/asm/uaccess.h b/arch/ia64/include/asm/uaccess.h
2251index 449c8c0..432a3d2 100644
2252--- a/arch/ia64/include/asm/uaccess.h
2253+++ b/arch/ia64/include/asm/uaccess.h
2254@@ -257,7 +257,7 @@ __copy_from_user (void *to, const void __user *from, unsigned long count)
2255 const void *__cu_from = (from); \
2256 long __cu_len = (n); \
2257 \
2258- if (__access_ok(__cu_to, __cu_len, get_fs())) \
2259+ if (__cu_len > 0 && __cu_len <= INT_MAX && __access_ok(__cu_to, __cu_len, get_fs())) \
2260 __cu_len = __copy_user(__cu_to, (__force void __user *) __cu_from, __cu_len); \
2261 __cu_len; \
2262 })
2263@@ -269,7 +269,7 @@ __copy_from_user (void *to, const void __user *from, unsigned long count)
2264 long __cu_len = (n); \
2265 \
2266 __chk_user_ptr(__cu_from); \
2267- if (__access_ok(__cu_from, __cu_len, get_fs())) \
2268+ if (__cu_len > 0 && __cu_len <= INT_MAX && __access_ok(__cu_from, __cu_len, get_fs())) \
2269 __cu_len = __copy_user((__force void __user *) __cu_to, __cu_from, __cu_len); \
2270 __cu_len; \
2271 })
2272diff --git a/arch/ia64/kernel/module.c b/arch/ia64/kernel/module.c
2273index 24603be..948052d 100644
2274--- a/arch/ia64/kernel/module.c
2275+++ b/arch/ia64/kernel/module.c
2276@@ -307,8 +307,7 @@ plt_target (struct plt_entry *plt)
2277 void
2278 module_free (struct module *mod, void *module_region)
2279 {
2280- if (mod && mod->arch.init_unw_table &&
2281- module_region == mod->module_init) {
2282+ if (mod && mod->arch.init_unw_table && module_region == mod->module_init_rx) {
2283 unw_remove_unwind_table(mod->arch.init_unw_table);
2284 mod->arch.init_unw_table = NULL;
2285 }
2286@@ -494,15 +493,39 @@ module_frob_arch_sections (Elf_Ehdr *ehdr, Elf_Shdr *sechdrs, char *secstrings,
2287 }
2288
2289 static inline int
2290+in_init_rx (const struct module *mod, uint64_t addr)
2291+{
2292+ return addr - (uint64_t) mod->module_init_rx < mod->init_size_rx;
2293+}
2294+
2295+static inline int
2296+in_init_rw (const struct module *mod, uint64_t addr)
2297+{
2298+ return addr - (uint64_t) mod->module_init_rw < mod->init_size_rw;
2299+}
2300+
2301+static inline int
2302 in_init (const struct module *mod, uint64_t addr)
2303 {
2304- return addr - (uint64_t) mod->module_init < mod->init_size;
2305+ return in_init_rx(mod, addr) || in_init_rw(mod, addr);
2306+}
2307+
2308+static inline int
2309+in_core_rx (const struct module *mod, uint64_t addr)
2310+{
2311+ return addr - (uint64_t) mod->module_core_rx < mod->core_size_rx;
2312+}
2313+
2314+static inline int
2315+in_core_rw (const struct module *mod, uint64_t addr)
2316+{
2317+ return addr - (uint64_t) mod->module_core_rw < mod->core_size_rw;
2318 }
2319
2320 static inline int
2321 in_core (const struct module *mod, uint64_t addr)
2322 {
2323- return addr - (uint64_t) mod->module_core < mod->core_size;
2324+ return in_core_rx(mod, addr) || in_core_rw(mod, addr);
2325 }
2326
2327 static inline int
2328@@ -685,7 +708,14 @@ do_reloc (struct module *mod, uint8_t r_type, Elf64_Sym *sym, uint64_t addend,
2329 break;
2330
2331 case RV_BDREL:
2332- val -= (uint64_t) (in_init(mod, val) ? mod->module_init : mod->module_core);
2333+ if (in_init_rx(mod, val))
2334+ val -= (uint64_t) mod->module_init_rx;
2335+ else if (in_init_rw(mod, val))
2336+ val -= (uint64_t) mod->module_init_rw;
2337+ else if (in_core_rx(mod, val))
2338+ val -= (uint64_t) mod->module_core_rx;
2339+ else if (in_core_rw(mod, val))
2340+ val -= (uint64_t) mod->module_core_rw;
2341 break;
2342
2343 case RV_LTV:
2344@@ -820,15 +850,15 @@ apply_relocate_add (Elf64_Shdr *sechdrs, const char *strtab, unsigned int symind
2345 * addresses have been selected...
2346 */
2347 uint64_t gp;
2348- if (mod->core_size > MAX_LTOFF)
2349+ if (mod->core_size_rx + mod->core_size_rw > MAX_LTOFF)
2350 /*
2351 * This takes advantage of fact that SHF_ARCH_SMALL gets allocated
2352 * at the end of the module.
2353 */
2354- gp = mod->core_size - MAX_LTOFF / 2;
2355+ gp = mod->core_size_rx + mod->core_size_rw - MAX_LTOFF / 2;
2356 else
2357- gp = mod->core_size / 2;
2358- gp = (uint64_t) mod->module_core + ((gp + 7) & -8);
2359+ gp = (mod->core_size_rx + mod->core_size_rw) / 2;
2360+ gp = (uint64_t) mod->module_core_rx + ((gp + 7) & -8);
2361 mod->arch.gp = gp;
2362 DEBUGP("%s: placing gp at 0x%lx\n", __func__, gp);
2363 }
2364diff --git a/arch/ia64/kernel/sys_ia64.c b/arch/ia64/kernel/sys_ia64.c
2365index 609d500..7dde2a8 100644
2366--- a/arch/ia64/kernel/sys_ia64.c
2367+++ b/arch/ia64/kernel/sys_ia64.c
2368@@ -43,6 +43,13 @@ arch_get_unmapped_area (struct file *filp, unsigned long addr, unsigned long len
2369 if (REGION_NUMBER(addr) == RGN_HPAGE)
2370 addr = 0;
2371 #endif
2372+
2373+#ifdef CONFIG_PAX_RANDMMAP
2374+ if (mm->pax_flags & MF_PAX_RANDMMAP)
2375+ addr = mm->free_area_cache;
2376+ else
2377+#endif
2378+
2379 if (!addr)
2380 addr = mm->free_area_cache;
2381
2382@@ -61,14 +68,14 @@ arch_get_unmapped_area (struct file *filp, unsigned long addr, unsigned long len
2383 for (vma = find_vma(mm, addr); ; vma = vma->vm_next) {
2384 /* At this point: (!vma || addr < vma->vm_end). */
2385 if (TASK_SIZE - len < addr || RGN_MAP_LIMIT - len < REGION_OFFSET(addr)) {
2386- if (start_addr != TASK_UNMAPPED_BASE) {
2387+ if (start_addr != mm->mmap_base) {
2388 /* Start a new search --- just in case we missed some holes. */
2389- addr = TASK_UNMAPPED_BASE;
2390+ addr = mm->mmap_base;
2391 goto full_search;
2392 }
2393 return -ENOMEM;
2394 }
2395- if (!vma || addr + len <= vma->vm_start) {
2396+ if (check_heap_stack_gap(vma, addr, len)) {
2397 /* Remember the address where we stopped this search: */
2398 mm->free_area_cache = addr + len;
2399 return addr;
2400diff --git a/arch/ia64/kernel/vmlinux.lds.S b/arch/ia64/kernel/vmlinux.lds.S
2401index 53c0ba0..2accdde 100644
2402--- a/arch/ia64/kernel/vmlinux.lds.S
2403+++ b/arch/ia64/kernel/vmlinux.lds.S
2404@@ -199,7 +199,7 @@ SECTIONS {
2405 /* Per-cpu data: */
2406 . = ALIGN(PERCPU_PAGE_SIZE);
2407 PERCPU_VADDR(SMP_CACHE_BYTES, PERCPU_ADDR, :percpu)
2408- __phys_per_cpu_start = __per_cpu_load;
2409+ __phys_per_cpu_start = per_cpu_load;
2410 /*
2411 * ensure percpu data fits
2412 * into percpu page size
2413diff --git a/arch/ia64/mm/fault.c b/arch/ia64/mm/fault.c
2414index 20b3593..1ce77f0 100644
2415--- a/arch/ia64/mm/fault.c
2416+++ b/arch/ia64/mm/fault.c
2417@@ -73,6 +73,23 @@ mapped_kernel_page_is_present (unsigned long address)
2418 return pte_present(pte);
2419 }
2420
2421+#ifdef CONFIG_PAX_PAGEEXEC
2422+void pax_report_insns(struct pt_regs *regs, void *pc, void *sp)
2423+{
2424+ unsigned long i;
2425+
2426+ printk(KERN_ERR "PAX: bytes at PC: ");
2427+ for (i = 0; i < 8; i++) {
2428+ unsigned int c;
2429+ if (get_user(c, (unsigned int *)pc+i))
2430+ printk(KERN_CONT "???????? ");
2431+ else
2432+ printk(KERN_CONT "%08x ", c);
2433+ }
2434+ printk("\n");
2435+}
2436+#endif
2437+
2438 void __kprobes
2439 ia64_do_page_fault (unsigned long address, unsigned long isr, struct pt_regs *regs)
2440 {
2441@@ -146,9 +163,23 @@ ia64_do_page_fault (unsigned long address, unsigned long isr, struct pt_regs *re
2442 mask = ( (((isr >> IA64_ISR_X_BIT) & 1UL) << VM_EXEC_BIT)
2443 | (((isr >> IA64_ISR_W_BIT) & 1UL) << VM_WRITE_BIT));
2444
2445- if ((vma->vm_flags & mask) != mask)
2446+ if ((vma->vm_flags & mask) != mask) {
2447+
2448+#ifdef CONFIG_PAX_PAGEEXEC
2449+ if (!(vma->vm_flags & VM_EXEC) && (mask & VM_EXEC)) {
2450+ if (!(mm->pax_flags & MF_PAX_PAGEEXEC) || address != regs->cr_iip)
2451+ goto bad_area;
2452+
2453+ up_read(&mm->mmap_sem);
2454+ pax_report_fault(regs, (void *)regs->cr_iip, (void *)regs->r12);
2455+ do_group_exit(SIGKILL);
2456+ }
2457+#endif
2458+
2459 goto bad_area;
2460
2461+ }
2462+
2463 /*
2464 * If for any reason at all we couldn't handle the fault, make
2465 * sure we exit gracefully rather than endlessly redo the
2466diff --git a/arch/ia64/mm/hugetlbpage.c b/arch/ia64/mm/hugetlbpage.c
2467index 5ca674b..e0e1b70 100644
2468--- a/arch/ia64/mm/hugetlbpage.c
2469+++ b/arch/ia64/mm/hugetlbpage.c
2470@@ -171,7 +171,7 @@ unsigned long hugetlb_get_unmapped_area(struct file *file, unsigned long addr, u
2471 /* At this point: (!vmm || addr < vmm->vm_end). */
2472 if (REGION_OFFSET(addr) + len > RGN_MAP_LIMIT)
2473 return -ENOMEM;
2474- if (!vmm || (addr + len) <= vmm->vm_start)
2475+ if (check_heap_stack_gap(vmm, addr, len))
2476 return addr;
2477 addr = ALIGN(vmm->vm_end, HPAGE_SIZE);
2478 }
2479diff --git a/arch/ia64/mm/init.c b/arch/ia64/mm/init.c
2480index 00cb0e2..2ad8024 100644
2481--- a/arch/ia64/mm/init.c
2482+++ b/arch/ia64/mm/init.c
2483@@ -120,6 +120,19 @@ ia64_init_addr_space (void)
2484 vma->vm_start = current->thread.rbs_bot & PAGE_MASK;
2485 vma->vm_end = vma->vm_start + PAGE_SIZE;
2486 vma->vm_flags = VM_DATA_DEFAULT_FLAGS|VM_GROWSUP|VM_ACCOUNT;
2487+
2488+#ifdef CONFIG_PAX_PAGEEXEC
2489+ if (current->mm->pax_flags & MF_PAX_PAGEEXEC) {
2490+ vma->vm_flags &= ~VM_EXEC;
2491+
2492+#ifdef CONFIG_PAX_MPROTECT
2493+ if (current->mm->pax_flags & MF_PAX_MPROTECT)
2494+ vma->vm_flags &= ~VM_MAYEXEC;
2495+#endif
2496+
2497+ }
2498+#endif
2499+
2500 vma->vm_page_prot = vm_get_page_prot(vma->vm_flags);
2501 down_write(&current->mm->mmap_sem);
2502 if (insert_vm_struct(current->mm, vma)) {
2503diff --git a/arch/m32r/include/asm/cache.h b/arch/m32r/include/asm/cache.h
2504index 40b3ee9..8c2c112 100644
2505--- a/arch/m32r/include/asm/cache.h
2506+++ b/arch/m32r/include/asm/cache.h
2507@@ -1,8 +1,10 @@
2508 #ifndef _ASM_M32R_CACHE_H
2509 #define _ASM_M32R_CACHE_H
2510
2511+#include <linux/const.h>
2512+
2513 /* L1 cache line size */
2514 #define L1_CACHE_SHIFT 4
2515-#define L1_CACHE_BYTES (1 << L1_CACHE_SHIFT)
2516+#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT)
2517
2518 #endif /* _ASM_M32R_CACHE_H */
2519diff --git a/arch/m32r/lib/usercopy.c b/arch/m32r/lib/usercopy.c
2520index 82abd15..d95ae5d 100644
2521--- a/arch/m32r/lib/usercopy.c
2522+++ b/arch/m32r/lib/usercopy.c
2523@@ -14,6 +14,9 @@
2524 unsigned long
2525 __generic_copy_to_user(void __user *to, const void *from, unsigned long n)
2526 {
2527+ if ((long)n < 0)
2528+ return n;
2529+
2530 prefetch(from);
2531 if (access_ok(VERIFY_WRITE, to, n))
2532 __copy_user(to,from,n);
2533@@ -23,6 +26,9 @@ __generic_copy_to_user(void __user *to, const void *from, unsigned long n)
2534 unsigned long
2535 __generic_copy_from_user(void *to, const void __user *from, unsigned long n)
2536 {
2537+ if ((long)n < 0)
2538+ return n;
2539+
2540 prefetchw(to);
2541 if (access_ok(VERIFY_READ, from, n))
2542 __copy_user_zeroing(to,from,n);
2543diff --git a/arch/m68k/include/asm/cache.h b/arch/m68k/include/asm/cache.h
2544index 0395c51..5f26031 100644
2545--- a/arch/m68k/include/asm/cache.h
2546+++ b/arch/m68k/include/asm/cache.h
2547@@ -4,9 +4,11 @@
2548 #ifndef __ARCH_M68K_CACHE_H
2549 #define __ARCH_M68K_CACHE_H
2550
2551+#include <linux/const.h>
2552+
2553 /* bytes per L1 cache line */
2554 #define L1_CACHE_SHIFT 4
2555-#define L1_CACHE_BYTES (1<< L1_CACHE_SHIFT)
2556+#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT)
2557
2558 #define ARCH_DMA_MINALIGN L1_CACHE_BYTES
2559
2560diff --git a/arch/microblaze/include/asm/cache.h b/arch/microblaze/include/asm/cache.h
2561index 4efe96a..60e8699 100644
2562--- a/arch/microblaze/include/asm/cache.h
2563+++ b/arch/microblaze/include/asm/cache.h
2564@@ -13,11 +13,12 @@
2565 #ifndef _ASM_MICROBLAZE_CACHE_H
2566 #define _ASM_MICROBLAZE_CACHE_H
2567
2568+#include <linux/const.h>
2569 #include <asm/registers.h>
2570
2571 #define L1_CACHE_SHIFT 5
2572 /* word-granular cache in microblaze */
2573-#define L1_CACHE_BYTES (1 << L1_CACHE_SHIFT)
2574+#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT)
2575
2576 #define SMP_CACHE_BYTES L1_CACHE_BYTES
2577
2578diff --git a/arch/mips/include/asm/atomic.h b/arch/mips/include/asm/atomic.h
2579index 1d93f81..67794d0 100644
2580--- a/arch/mips/include/asm/atomic.h
2581+++ b/arch/mips/include/asm/atomic.h
2582@@ -21,6 +21,10 @@
2583 #include <asm/war.h>
2584 #include <asm/system.h>
2585
2586+#ifdef CONFIG_GENERIC_ATOMIC64
2587+#include <asm-generic/atomic64.h>
2588+#endif
2589+
2590 #define ATOMIC_INIT(i) { (i) }
2591
2592 /*
2593@@ -765,6 +769,16 @@ static __inline__ int atomic64_add_unless(atomic64_t *v, long a, long u)
2594 */
2595 #define atomic64_add_negative(i, v) (atomic64_add_return(i, (v)) < 0)
2596
2597+#define atomic64_read_unchecked(v) atomic64_read(v)
2598+#define atomic64_set_unchecked(v, i) atomic64_set((v), (i))
2599+#define atomic64_add_unchecked(a, v) atomic64_add((a), (v))
2600+#define atomic64_add_return_unchecked(a, v) atomic64_add_return((a), (v))
2601+#define atomic64_sub_unchecked(a, v) atomic64_sub((a), (v))
2602+#define atomic64_inc_unchecked(v) atomic64_inc(v)
2603+#define atomic64_inc_return_unchecked(v) atomic64_inc_return(v)
2604+#define atomic64_dec_unchecked(v) atomic64_dec(v)
2605+#define atomic64_cmpxchg_unchecked(v, o, n) atomic64_cmpxchg((v), (o), (n))
2606+
2607 #endif /* CONFIG_64BIT */
2608
2609 /*
2610diff --git a/arch/mips/include/asm/cache.h b/arch/mips/include/asm/cache.h
2611index b4db69f..8f3b093 100644
2612--- a/arch/mips/include/asm/cache.h
2613+++ b/arch/mips/include/asm/cache.h
2614@@ -9,10 +9,11 @@
2615 #ifndef _ASM_CACHE_H
2616 #define _ASM_CACHE_H
2617
2618+#include <linux/const.h>
2619 #include <kmalloc.h>
2620
2621 #define L1_CACHE_SHIFT CONFIG_MIPS_L1_CACHE_SHIFT
2622-#define L1_CACHE_BYTES (1 << L1_CACHE_SHIFT)
2623+#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT)
2624
2625 #define SMP_CACHE_SHIFT L1_CACHE_SHIFT
2626 #define SMP_CACHE_BYTES L1_CACHE_BYTES
2627diff --git a/arch/mips/include/asm/elf.h b/arch/mips/include/asm/elf.h
2628index 455c0ac..ad65fbe 100644
2629--- a/arch/mips/include/asm/elf.h
2630+++ b/arch/mips/include/asm/elf.h
2631@@ -372,13 +372,16 @@ extern const char *__elf_platform;
2632 #define ELF_ET_DYN_BASE (TASK_SIZE / 3 * 2)
2633 #endif
2634
2635+#ifdef CONFIG_PAX_ASLR
2636+#define PAX_ELF_ET_DYN_BASE (TASK_IS_32BIT_ADDR ? 0x00400000UL : 0x00400000UL)
2637+
2638+#define PAX_DELTA_MMAP_LEN (TASK_IS_32BIT_ADDR ? 27-PAGE_SHIFT : 36-PAGE_SHIFT)
2639+#define PAX_DELTA_STACK_LEN (TASK_IS_32BIT_ADDR ? 27-PAGE_SHIFT : 36-PAGE_SHIFT)
2640+#endif
2641+
2642 #define ARCH_HAS_SETUP_ADDITIONAL_PAGES 1
2643 struct linux_binprm;
2644 extern int arch_setup_additional_pages(struct linux_binprm *bprm,
2645 int uses_interp);
2646
2647-struct mm_struct;
2648-extern unsigned long arch_randomize_brk(struct mm_struct *mm);
2649-#define arch_randomize_brk arch_randomize_brk
2650-
2651 #endif /* _ASM_ELF_H */
2652diff --git a/arch/mips/include/asm/page.h b/arch/mips/include/asm/page.h
2653index e59cd1a..8e329d6 100644
2654--- a/arch/mips/include/asm/page.h
2655+++ b/arch/mips/include/asm/page.h
2656@@ -93,7 +93,7 @@ extern void copy_user_highpage(struct page *to, struct page *from,
2657 #ifdef CONFIG_CPU_MIPS32
2658 typedef struct { unsigned long pte_low, pte_high; } pte_t;
2659 #define pte_val(x) ((x).pte_low | ((unsigned long long)(x).pte_high << 32))
2660- #define __pte(x) ({ pte_t __pte = {(x), ((unsigned long long)(x)) >> 32}; __pte; })
2661+ #define __pte(x) ({ pte_t __pte = {(x), (x) >> 32}; __pte; })
2662 #else
2663 typedef struct { unsigned long long pte; } pte_t;
2664 #define pte_val(x) ((x).pte)
2665diff --git a/arch/mips/include/asm/system.h b/arch/mips/include/asm/system.h
2666index 6018c80..7c37203 100644
2667--- a/arch/mips/include/asm/system.h
2668+++ b/arch/mips/include/asm/system.h
2669@@ -230,6 +230,6 @@ extern void per_cpu_trap_init(void);
2670 */
2671 #define __ARCH_WANT_UNLOCKED_CTXSW
2672
2673-extern unsigned long arch_align_stack(unsigned long sp);
2674+#define arch_align_stack(x) ((x) & ~0xfUL)
2675
2676 #endif /* _ASM_SYSTEM_H */
2677diff --git a/arch/mips/kernel/binfmt_elfn32.c b/arch/mips/kernel/binfmt_elfn32.c
2678index 9fdd8bc..4bd7f1a 100644
2679--- a/arch/mips/kernel/binfmt_elfn32.c
2680+++ b/arch/mips/kernel/binfmt_elfn32.c
2681@@ -50,6 +50,13 @@ typedef elf_fpreg_t elf_fpregset_t[ELF_NFPREG];
2682 #undef ELF_ET_DYN_BASE
2683 #define ELF_ET_DYN_BASE (TASK32_SIZE / 3 * 2)
2684
2685+#ifdef CONFIG_PAX_ASLR
2686+#define PAX_ELF_ET_DYN_BASE (TASK_IS_32BIT_ADDR ? 0x00400000UL : 0x00400000UL)
2687+
2688+#define PAX_DELTA_MMAP_LEN (TASK_IS_32BIT_ADDR ? 27-PAGE_SHIFT : 36-PAGE_SHIFT)
2689+#define PAX_DELTA_STACK_LEN (TASK_IS_32BIT_ADDR ? 27-PAGE_SHIFT : 36-PAGE_SHIFT)
2690+#endif
2691+
2692 #include <asm/processor.h>
2693 #include <linux/module.h>
2694 #include <linux/elfcore.h>
2695diff --git a/arch/mips/kernel/binfmt_elfo32.c b/arch/mips/kernel/binfmt_elfo32.c
2696index ff44823..97f8906 100644
2697--- a/arch/mips/kernel/binfmt_elfo32.c
2698+++ b/arch/mips/kernel/binfmt_elfo32.c
2699@@ -52,6 +52,13 @@ typedef elf_fpreg_t elf_fpregset_t[ELF_NFPREG];
2700 #undef ELF_ET_DYN_BASE
2701 #define ELF_ET_DYN_BASE (TASK32_SIZE / 3 * 2)
2702
2703+#ifdef CONFIG_PAX_ASLR
2704+#define PAX_ELF_ET_DYN_BASE (TASK_IS_32BIT_ADDR ? 0x00400000UL : 0x00400000UL)
2705+
2706+#define PAX_DELTA_MMAP_LEN (TASK_IS_32BIT_ADDR ? 27-PAGE_SHIFT : 36-PAGE_SHIFT)
2707+#define PAX_DELTA_STACK_LEN (TASK_IS_32BIT_ADDR ? 27-PAGE_SHIFT : 36-PAGE_SHIFT)
2708+#endif
2709+
2710 #include <asm/processor.h>
2711
2712 /*
2713diff --git a/arch/mips/kernel/process.c b/arch/mips/kernel/process.c
2714index c47f96e..661d418 100644
2715--- a/arch/mips/kernel/process.c
2716+++ b/arch/mips/kernel/process.c
2717@@ -481,15 +481,3 @@ unsigned long get_wchan(struct task_struct *task)
2718 out:
2719 return pc;
2720 }
2721-
2722-/*
2723- * Don't forget that the stack pointer must be aligned on a 8 bytes
2724- * boundary for 32-bits ABI and 16 bytes for 64-bits ABI.
2725- */
2726-unsigned long arch_align_stack(unsigned long sp)
2727-{
2728- if (!(current->personality & ADDR_NO_RANDOMIZE) && randomize_va_space)
2729- sp -= get_random_int() & ~PAGE_MASK;
2730-
2731- return sp & ALMASK;
2732-}
2733diff --git a/arch/mips/mm/fault.c b/arch/mips/mm/fault.c
2734index 937cf33..adb39bb 100644
2735--- a/arch/mips/mm/fault.c
2736+++ b/arch/mips/mm/fault.c
2737@@ -28,6 +28,23 @@
2738 #include <asm/highmem.h> /* For VMALLOC_END */
2739 #include <linux/kdebug.h>
2740
2741+#ifdef CONFIG_PAX_PAGEEXEC
2742+void pax_report_insns(struct pt_regs *regs, void *pc, void *sp)
2743+{
2744+ unsigned long i;
2745+
2746+ printk(KERN_ERR "PAX: bytes at PC: ");
2747+ for (i = 0; i < 5; i++) {
2748+ unsigned int c;
2749+ if (get_user(c, (unsigned int *)pc+i))
2750+ printk(KERN_CONT "???????? ");
2751+ else
2752+ printk(KERN_CONT "%08x ", c);
2753+ }
2754+ printk("\n");
2755+}
2756+#endif
2757+
2758 /*
2759 * This routine handles page faults. It determines the address,
2760 * and the problem, and then passes it off to one of the appropriate
2761diff --git a/arch/mips/mm/mmap.c b/arch/mips/mm/mmap.c
2762index 302d779..7d35bf8 100644
2763--- a/arch/mips/mm/mmap.c
2764+++ b/arch/mips/mm/mmap.c
2765@@ -95,6 +95,11 @@ static unsigned long arch_get_unmapped_area_common(struct file *filp,
2766 do_color_align = 1;
2767
2768 /* requesting a specific address */
2769+
2770+#ifdef CONFIG_PAX_RANDMMAP
2771+ if (!(current->mm->pax_flags & MF_PAX_RANDMMAP))
2772+#endif
2773+
2774 if (addr) {
2775 if (do_color_align)
2776 addr = COLOUR_ALIGN(addr, pgoff);
2777@@ -102,8 +107,7 @@ static unsigned long arch_get_unmapped_area_common(struct file *filp,
2778 addr = PAGE_ALIGN(addr);
2779
2780 vma = find_vma(mm, addr);
2781- if (TASK_SIZE - len >= addr &&
2782- (!vma || addr + len <= vma->vm_start))
2783+ if (TASK_SIZE - len >= addr && check_heap_stack_gap(vmm, addr, len))
2784 return addr;
2785 }
2786
2787@@ -118,7 +122,7 @@ static unsigned long arch_get_unmapped_area_common(struct file *filp,
2788 /* At this point: (!vma || addr < vma->vm_end). */
2789 if (TASK_SIZE - len < addr)
2790 return -ENOMEM;
2791- if (!vma || addr + len <= vma->vm_start)
2792+ if (check_heap_stack_gap(vmm, addr, len))
2793 return addr;
2794 addr = vma->vm_end;
2795 if (do_color_align)
2796@@ -145,7 +149,7 @@ static unsigned long arch_get_unmapped_area_common(struct file *filp,
2797 /* make sure it can fit in the remaining address space */
2798 if (likely(addr > len)) {
2799 vma = find_vma(mm, addr - len);
2800- if (!vma || addr <= vma->vm_start) {
2801+ if (check_heap_stack_gap(vmm, addr - len, len))
2802 /* cache the address as a hint for next time */
2803 return mm->free_area_cache = addr - len;
2804 }
2805@@ -165,7 +169,7 @@ static unsigned long arch_get_unmapped_area_common(struct file *filp,
2806 * return with success:
2807 */
2808 vma = find_vma(mm, addr);
2809- if (likely(!vma || addr + len <= vma->vm_start)) {
2810+ if (check_heap_stack_gap(vmm, addr, len)) {
2811 /* cache the address as a hint for next time */
2812 return mm->free_area_cache = addr;
2813 }
2814@@ -242,30 +246,3 @@ void arch_pick_mmap_layout(struct mm_struct *mm)
2815 mm->unmap_area = arch_unmap_area_topdown;
2816 }
2817 }
2818-
2819-static inline unsigned long brk_rnd(void)
2820-{
2821- unsigned long rnd = get_random_int();
2822-
2823- rnd = rnd << PAGE_SHIFT;
2824- /* 8MB for 32bit, 256MB for 64bit */
2825- if (TASK_IS_32BIT_ADDR)
2826- rnd = rnd & 0x7ffffful;
2827- else
2828- rnd = rnd & 0xffffffful;
2829-
2830- return rnd;
2831-}
2832-
2833-unsigned long arch_randomize_brk(struct mm_struct *mm)
2834-{
2835- unsigned long base = mm->brk;
2836- unsigned long ret;
2837-
2838- ret = PAGE_ALIGN(base + brk_rnd());
2839-
2840- if (ret < mm->brk)
2841- return mm->brk;
2842-
2843- return ret;
2844-}
2845diff --git a/arch/mn10300/proc-mn103e010/include/proc/cache.h b/arch/mn10300/proc-mn103e010/include/proc/cache.h
2846index 967d144..db12197 100644
2847--- a/arch/mn10300/proc-mn103e010/include/proc/cache.h
2848+++ b/arch/mn10300/proc-mn103e010/include/proc/cache.h
2849@@ -11,12 +11,14 @@
2850 #ifndef _ASM_PROC_CACHE_H
2851 #define _ASM_PROC_CACHE_H
2852
2853+#include <linux/const.h>
2854+
2855 /* L1 cache */
2856
2857 #define L1_CACHE_NWAYS 4 /* number of ways in caches */
2858 #define L1_CACHE_NENTRIES 256 /* number of entries in each way */
2859-#define L1_CACHE_BYTES 16 /* bytes per entry */
2860 #define L1_CACHE_SHIFT 4 /* shift for bytes per entry */
2861+#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT) /* bytes per entry */
2862 #define L1_CACHE_WAYDISP 0x1000 /* displacement of one way from the next */
2863
2864 #define L1_CACHE_TAG_VALID 0x00000001 /* cache tag valid bit */
2865diff --git a/arch/mn10300/proc-mn2ws0050/include/proc/cache.h b/arch/mn10300/proc-mn2ws0050/include/proc/cache.h
2866index bcb5df2..84fabd2 100644
2867--- a/arch/mn10300/proc-mn2ws0050/include/proc/cache.h
2868+++ b/arch/mn10300/proc-mn2ws0050/include/proc/cache.h
2869@@ -16,13 +16,15 @@
2870 #ifndef _ASM_PROC_CACHE_H
2871 #define _ASM_PROC_CACHE_H
2872
2873+#include <linux/const.h>
2874+
2875 /*
2876 * L1 cache
2877 */
2878 #define L1_CACHE_NWAYS 4 /* number of ways in caches */
2879 #define L1_CACHE_NENTRIES 128 /* number of entries in each way */
2880-#define L1_CACHE_BYTES 32 /* bytes per entry */
2881 #define L1_CACHE_SHIFT 5 /* shift for bytes per entry */
2882+#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT) /* bytes per entry */
2883 #define L1_CACHE_WAYDISP 0x1000 /* distance from one way to the next */
2884
2885 #define L1_CACHE_TAG_VALID 0x00000001 /* cache tag valid bit */
2886diff --git a/arch/openrisc/include/asm/cache.h b/arch/openrisc/include/asm/cache.h
2887index 4ce7a01..449202a 100644
2888--- a/arch/openrisc/include/asm/cache.h
2889+++ b/arch/openrisc/include/asm/cache.h
2890@@ -19,11 +19,13 @@
2891 #ifndef __ASM_OPENRISC_CACHE_H
2892 #define __ASM_OPENRISC_CACHE_H
2893
2894+#include <linux/const.h>
2895+
2896 /* FIXME: How can we replace these with values from the CPU...
2897 * they shouldn't be hard-coded!
2898 */
2899
2900-#define L1_CACHE_BYTES 16
2901 #define L1_CACHE_SHIFT 4
2902+#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT)
2903
2904 #endif /* __ASM_OPENRISC_CACHE_H */
2905diff --git a/arch/parisc/include/asm/atomic.h b/arch/parisc/include/asm/atomic.h
2906index 4054b31..a10c105 100644
2907--- a/arch/parisc/include/asm/atomic.h
2908+++ b/arch/parisc/include/asm/atomic.h
2909@@ -335,6 +335,16 @@ static __inline__ int atomic64_add_unless(atomic64_t *v, long a, long u)
2910
2911 #define atomic64_inc_not_zero(v) atomic64_add_unless((v), 1, 0)
2912
2913+#define atomic64_read_unchecked(v) atomic64_read(v)
2914+#define atomic64_set_unchecked(v, i) atomic64_set((v), (i))
2915+#define atomic64_add_unchecked(a, v) atomic64_add((a), (v))
2916+#define atomic64_add_return_unchecked(a, v) atomic64_add_return((a), (v))
2917+#define atomic64_sub_unchecked(a, v) atomic64_sub((a), (v))
2918+#define atomic64_inc_unchecked(v) atomic64_inc(v)
2919+#define atomic64_inc_return_unchecked(v) atomic64_inc_return(v)
2920+#define atomic64_dec_unchecked(v) atomic64_dec(v)
2921+#define atomic64_cmpxchg_unchecked(v, o, n) atomic64_cmpxchg((v), (o), (n))
2922+
2923 #endif /* !CONFIG_64BIT */
2924
2925
2926diff --git a/arch/parisc/include/asm/cache.h b/arch/parisc/include/asm/cache.h
2927index 47f11c7..3420df2 100644
2928--- a/arch/parisc/include/asm/cache.h
2929+++ b/arch/parisc/include/asm/cache.h
2930@@ -5,6 +5,7 @@
2931 #ifndef __ARCH_PARISC_CACHE_H
2932 #define __ARCH_PARISC_CACHE_H
2933
2934+#include <linux/const.h>
2935
2936 /*
2937 * PA 2.0 processors have 64-byte cachelines; PA 1.1 processors have
2938@@ -15,13 +16,13 @@
2939 * just ruin performance.
2940 */
2941 #ifdef CONFIG_PA20
2942-#define L1_CACHE_BYTES 64
2943 #define L1_CACHE_SHIFT 6
2944 #else
2945-#define L1_CACHE_BYTES 32
2946 #define L1_CACHE_SHIFT 5
2947 #endif
2948
2949+#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT)
2950+
2951 #ifndef __ASSEMBLY__
2952
2953 #define SMP_CACHE_BYTES L1_CACHE_BYTES
2954diff --git a/arch/parisc/include/asm/elf.h b/arch/parisc/include/asm/elf.h
2955index 19f6cb1..6c78cf2 100644
2956--- a/arch/parisc/include/asm/elf.h
2957+++ b/arch/parisc/include/asm/elf.h
2958@@ -342,6 +342,13 @@ struct pt_regs; /* forward declaration... */
2959
2960 #define ELF_ET_DYN_BASE (TASK_UNMAPPED_BASE + 0x01000000)
2961
2962+#ifdef CONFIG_PAX_ASLR
2963+#define PAX_ELF_ET_DYN_BASE 0x10000UL
2964+
2965+#define PAX_DELTA_MMAP_LEN 16
2966+#define PAX_DELTA_STACK_LEN 16
2967+#endif
2968+
2969 /* This yields a mask that user programs can use to figure out what
2970 instruction set this CPU supports. This could be done in user space,
2971 but it's not easy, and we've already done it here. */
2972diff --git a/arch/parisc/include/asm/pgtable.h b/arch/parisc/include/asm/pgtable.h
2973index 22dadeb..f6c2be4 100644
2974--- a/arch/parisc/include/asm/pgtable.h
2975+++ b/arch/parisc/include/asm/pgtable.h
2976@@ -210,6 +210,17 @@ struct vm_area_struct;
2977 #define PAGE_EXECREAD __pgprot(_PAGE_PRESENT | _PAGE_USER | _PAGE_READ | _PAGE_EXEC |_PAGE_ACCESSED)
2978 #define PAGE_COPY PAGE_EXECREAD
2979 #define PAGE_RWX __pgprot(_PAGE_PRESENT | _PAGE_USER | _PAGE_READ | _PAGE_WRITE | _PAGE_EXEC |_PAGE_ACCESSED)
2980+
2981+#ifdef CONFIG_PAX_PAGEEXEC
2982+# define PAGE_SHARED_NOEXEC __pgprot(_PAGE_PRESENT | _PAGE_USER | _PAGE_READ | _PAGE_WRITE | _PAGE_ACCESSED)
2983+# define PAGE_COPY_NOEXEC __pgprot(_PAGE_PRESENT | _PAGE_USER | _PAGE_READ | _PAGE_ACCESSED)
2984+# define PAGE_READONLY_NOEXEC __pgprot(_PAGE_PRESENT | _PAGE_USER | _PAGE_READ | _PAGE_ACCESSED)
2985+#else
2986+# define PAGE_SHARED_NOEXEC PAGE_SHARED
2987+# define PAGE_COPY_NOEXEC PAGE_COPY
2988+# define PAGE_READONLY_NOEXEC PAGE_READONLY
2989+#endif
2990+
2991 #define PAGE_KERNEL __pgprot(_PAGE_KERNEL)
2992 #define PAGE_KERNEL_EXEC __pgprot(_PAGE_KERNEL_EXEC)
2993 #define PAGE_KERNEL_RWX __pgprot(_PAGE_KERNEL_RWX)
2994diff --git a/arch/parisc/kernel/module.c b/arch/parisc/kernel/module.c
2995index 5e34ccf..672bc9c 100644
2996--- a/arch/parisc/kernel/module.c
2997+++ b/arch/parisc/kernel/module.c
2998@@ -98,16 +98,38 @@
2999
3000 /* three functions to determine where in the module core
3001 * or init pieces the location is */
3002+static inline int in_init_rx(struct module *me, void *loc)
3003+{
3004+ return (loc >= me->module_init_rx &&
3005+ loc < (me->module_init_rx + me->init_size_rx));
3006+}
3007+
3008+static inline int in_init_rw(struct module *me, void *loc)
3009+{
3010+ return (loc >= me->module_init_rw &&
3011+ loc < (me->module_init_rw + me->init_size_rw));
3012+}
3013+
3014 static inline int in_init(struct module *me, void *loc)
3015 {
3016- return (loc >= me->module_init &&
3017- loc <= (me->module_init + me->init_size));
3018+ return in_init_rx(me, loc) || in_init_rw(me, loc);
3019+}
3020+
3021+static inline int in_core_rx(struct module *me, void *loc)
3022+{
3023+ return (loc >= me->module_core_rx &&
3024+ loc < (me->module_core_rx + me->core_size_rx));
3025+}
3026+
3027+static inline int in_core_rw(struct module *me, void *loc)
3028+{
3029+ return (loc >= me->module_core_rw &&
3030+ loc < (me->module_core_rw + me->core_size_rw));
3031 }
3032
3033 static inline int in_core(struct module *me, void *loc)
3034 {
3035- return (loc >= me->module_core &&
3036- loc <= (me->module_core + me->core_size));
3037+ return in_core_rx(me, loc) || in_core_rw(me, loc);
3038 }
3039
3040 static inline int in_local(struct module *me, void *loc)
3041@@ -373,13 +395,13 @@ int module_frob_arch_sections(CONST Elf_Ehdr *hdr,
3042 }
3043
3044 /* align things a bit */
3045- me->core_size = ALIGN(me->core_size, 16);
3046- me->arch.got_offset = me->core_size;
3047- me->core_size += gots * sizeof(struct got_entry);
3048+ me->core_size_rw = ALIGN(me->core_size_rw, 16);
3049+ me->arch.got_offset = me->core_size_rw;
3050+ me->core_size_rw += gots * sizeof(struct got_entry);
3051
3052- me->core_size = ALIGN(me->core_size, 16);
3053- me->arch.fdesc_offset = me->core_size;
3054- me->core_size += fdescs * sizeof(Elf_Fdesc);
3055+ me->core_size_rw = ALIGN(me->core_size_rw, 16);
3056+ me->arch.fdesc_offset = me->core_size_rw;
3057+ me->core_size_rw += fdescs * sizeof(Elf_Fdesc);
3058
3059 me->arch.got_max = gots;
3060 me->arch.fdesc_max = fdescs;
3061@@ -397,7 +419,7 @@ static Elf64_Word get_got(struct module *me, unsigned long value, long addend)
3062
3063 BUG_ON(value == 0);
3064
3065- got = me->module_core + me->arch.got_offset;
3066+ got = me->module_core_rw + me->arch.got_offset;
3067 for (i = 0; got[i].addr; i++)
3068 if (got[i].addr == value)
3069 goto out;
3070@@ -415,7 +437,7 @@ static Elf64_Word get_got(struct module *me, unsigned long value, long addend)
3071 #ifdef CONFIG_64BIT
3072 static Elf_Addr get_fdesc(struct module *me, unsigned long value)
3073 {
3074- Elf_Fdesc *fdesc = me->module_core + me->arch.fdesc_offset;
3075+ Elf_Fdesc *fdesc = me->module_core_rw + me->arch.fdesc_offset;
3076
3077 if (!value) {
3078 printk(KERN_ERR "%s: zero OPD requested!\n", me->name);
3079@@ -433,7 +455,7 @@ static Elf_Addr get_fdesc(struct module *me, unsigned long value)
3080
3081 /* Create new one */
3082 fdesc->addr = value;
3083- fdesc->gp = (Elf_Addr)me->module_core + me->arch.got_offset;
3084+ fdesc->gp = (Elf_Addr)me->module_core_rw + me->arch.got_offset;
3085 return (Elf_Addr)fdesc;
3086 }
3087 #endif /* CONFIG_64BIT */
3088@@ -845,7 +867,7 @@ register_unwind_table(struct module *me,
3089
3090 table = (unsigned char *)sechdrs[me->arch.unwind_section].sh_addr;
3091 end = table + sechdrs[me->arch.unwind_section].sh_size;
3092- gp = (Elf_Addr)me->module_core + me->arch.got_offset;
3093+ gp = (Elf_Addr)me->module_core_rw + me->arch.got_offset;
3094
3095 DEBUGP("register_unwind_table(), sect = %d at 0x%p - 0x%p (gp=0x%lx)\n",
3096 me->arch.unwind_section, table, end, gp);
3097diff --git a/arch/parisc/kernel/sys_parisc.c b/arch/parisc/kernel/sys_parisc.c
3098index c9b9322..02d8940 100644
3099--- a/arch/parisc/kernel/sys_parisc.c
3100+++ b/arch/parisc/kernel/sys_parisc.c
3101@@ -43,7 +43,7 @@ static unsigned long get_unshared_area(unsigned long addr, unsigned long len)
3102 /* At this point: (!vma || addr < vma->vm_end). */
3103 if (TASK_SIZE - len < addr)
3104 return -ENOMEM;
3105- if (!vma || addr + len <= vma->vm_start)
3106+ if (check_heap_stack_gap(vma, addr, len))
3107 return addr;
3108 addr = vma->vm_end;
3109 }
3110@@ -79,7 +79,7 @@ static unsigned long get_shared_area(struct address_space *mapping,
3111 /* At this point: (!vma || addr < vma->vm_end). */
3112 if (TASK_SIZE - len < addr)
3113 return -ENOMEM;
3114- if (!vma || addr + len <= vma->vm_start)
3115+ if (check_heap_stack_gap(vma, addr, len))
3116 return addr;
3117 addr = DCACHE_ALIGN(vma->vm_end - offset) + offset;
3118 if (addr < vma->vm_end) /* handle wraparound */
3119@@ -98,7 +98,7 @@ unsigned long arch_get_unmapped_area(struct file *filp, unsigned long addr,
3120 if (flags & MAP_FIXED)
3121 return addr;
3122 if (!addr)
3123- addr = TASK_UNMAPPED_BASE;
3124+ addr = current->mm->mmap_base;
3125
3126 if (filp) {
3127 addr = get_shared_area(filp->f_mapping, addr, len, pgoff);
3128diff --git a/arch/parisc/kernel/traps.c b/arch/parisc/kernel/traps.c
3129index f19e660..414fe24 100644
3130--- a/arch/parisc/kernel/traps.c
3131+++ b/arch/parisc/kernel/traps.c
3132@@ -733,9 +733,7 @@ void notrace handle_interruption(int code, struct pt_regs *regs)
3133
3134 down_read(&current->mm->mmap_sem);
3135 vma = find_vma(current->mm,regs->iaoq[0]);
3136- if (vma && (regs->iaoq[0] >= vma->vm_start)
3137- && (vma->vm_flags & VM_EXEC)) {
3138-
3139+ if (vma && (regs->iaoq[0] >= vma->vm_start)) {
3140 fault_address = regs->iaoq[0];
3141 fault_space = regs->iasq[0];
3142
3143diff --git a/arch/parisc/mm/fault.c b/arch/parisc/mm/fault.c
3144index 18162ce..94de376 100644
3145--- a/arch/parisc/mm/fault.c
3146+++ b/arch/parisc/mm/fault.c
3147@@ -15,6 +15,7 @@
3148 #include <linux/sched.h>
3149 #include <linux/interrupt.h>
3150 #include <linux/module.h>
3151+#include <linux/unistd.h>
3152
3153 #include <asm/uaccess.h>
3154 #include <asm/traps.h>
3155@@ -52,7 +53,7 @@ DEFINE_PER_CPU(struct exception_data, exception_data);
3156 static unsigned long
3157 parisc_acctyp(unsigned long code, unsigned int inst)
3158 {
3159- if (code == 6 || code == 16)
3160+ if (code == 6 || code == 7 || code == 16)
3161 return VM_EXEC;
3162
3163 switch (inst & 0xf0000000) {
3164@@ -138,6 +139,116 @@ parisc_acctyp(unsigned long code, unsigned int inst)
3165 }
3166 #endif
3167
3168+#ifdef CONFIG_PAX_PAGEEXEC
3169+/*
3170+ * PaX: decide what to do with offenders (instruction_pointer(regs) = fault address)
3171+ *
3172+ * returns 1 when task should be killed
3173+ * 2 when rt_sigreturn trampoline was detected
3174+ * 3 when unpatched PLT trampoline was detected
3175+ */
3176+static int pax_handle_fetch_fault(struct pt_regs *regs)
3177+{
3178+
3179+#ifdef CONFIG_PAX_EMUPLT
3180+ int err;
3181+
3182+ do { /* PaX: unpatched PLT emulation */
3183+ unsigned int bl, depwi;
3184+
3185+ err = get_user(bl, (unsigned int *)instruction_pointer(regs));
3186+ err |= get_user(depwi, (unsigned int *)(instruction_pointer(regs)+4));
3187+
3188+ if (err)
3189+ break;
3190+
3191+ if (bl == 0xEA9F1FDDU && depwi == 0xD6801C1EU) {
3192+ unsigned int ldw, bv, ldw2, addr = instruction_pointer(regs)-12;
3193+
3194+ err = get_user(ldw, (unsigned int *)addr);
3195+ err |= get_user(bv, (unsigned int *)(addr+4));
3196+ err |= get_user(ldw2, (unsigned int *)(addr+8));
3197+
3198+ if (err)
3199+ break;
3200+
3201+ if (ldw == 0x0E801096U &&
3202+ bv == 0xEAC0C000U &&
3203+ ldw2 == 0x0E881095U)
3204+ {
3205+ unsigned int resolver, map;
3206+
3207+ err = get_user(resolver, (unsigned int *)(instruction_pointer(regs)+8));
3208+ err |= get_user(map, (unsigned int *)(instruction_pointer(regs)+12));
3209+ if (err)
3210+ break;
3211+
3212+ regs->gr[20] = instruction_pointer(regs)+8;
3213+ regs->gr[21] = map;
3214+ regs->gr[22] = resolver;
3215+ regs->iaoq[0] = resolver | 3UL;
3216+ regs->iaoq[1] = regs->iaoq[0] + 4;
3217+ return 3;
3218+ }
3219+ }
3220+ } while (0);
3221+#endif
3222+
3223+#ifdef CONFIG_PAX_EMUTRAMP
3224+
3225+#ifndef CONFIG_PAX_EMUSIGRT
3226+ if (!(current->mm->pax_flags & MF_PAX_EMUTRAMP))
3227+ return 1;
3228+#endif
3229+
3230+ do { /* PaX: rt_sigreturn emulation */
3231+ unsigned int ldi1, ldi2, bel, nop;
3232+
3233+ err = get_user(ldi1, (unsigned int *)instruction_pointer(regs));
3234+ err |= get_user(ldi2, (unsigned int *)(instruction_pointer(regs)+4));
3235+ err |= get_user(bel, (unsigned int *)(instruction_pointer(regs)+8));
3236+ err |= get_user(nop, (unsigned int *)(instruction_pointer(regs)+12));
3237+
3238+ if (err)
3239+ break;
3240+
3241+ if ((ldi1 == 0x34190000U || ldi1 == 0x34190002U) &&
3242+ ldi2 == 0x3414015AU &&
3243+ bel == 0xE4008200U &&
3244+ nop == 0x08000240U)
3245+ {
3246+ regs->gr[25] = (ldi1 & 2) >> 1;
3247+ regs->gr[20] = __NR_rt_sigreturn;
3248+ regs->gr[31] = regs->iaoq[1] + 16;
3249+ regs->sr[0] = regs->iasq[1];
3250+ regs->iaoq[0] = 0x100UL;
3251+ regs->iaoq[1] = regs->iaoq[0] + 4;
3252+ regs->iasq[0] = regs->sr[2];
3253+ regs->iasq[1] = regs->sr[2];
3254+ return 2;
3255+ }
3256+ } while (0);
3257+#endif
3258+
3259+ return 1;
3260+}
3261+
3262+void pax_report_insns(struct pt_regs *regs, void *pc, void *sp)
3263+{
3264+ unsigned long i;
3265+
3266+ printk(KERN_ERR "PAX: bytes at PC: ");
3267+ for (i = 0; i < 5; i++) {
3268+ unsigned int c;
3269+ if (get_user(c, (unsigned int *)pc+i))
3270+ printk(KERN_CONT "???????? ");
3271+ else
3272+ printk(KERN_CONT "%08x ", c);
3273+ }
3274+ printk("\n");
3275+}
3276+#endif
3277+
3278 int fixup_exception(struct pt_regs *regs)
3279 {
3280 const struct exception_table_entry *fix;
3281@@ -192,8 +303,33 @@ good_area:
3282
3283 acc_type = parisc_acctyp(code,regs->iir);
3284
3285- if ((vma->vm_flags & acc_type) != acc_type)
3286+ if ((vma->vm_flags & acc_type) != acc_type) {
3287+
3288+#ifdef CONFIG_PAX_PAGEEXEC
3289+ if ((mm->pax_flags & MF_PAX_PAGEEXEC) && (acc_type & VM_EXEC) &&
3290+ (address & ~3UL) == instruction_pointer(regs))
3291+ {
3292+ up_read(&mm->mmap_sem);
3293+ switch (pax_handle_fetch_fault(regs)) {
3294+
3295+#ifdef CONFIG_PAX_EMUPLT
3296+ case 3:
3297+ return;
3298+#endif
3299+
3300+#ifdef CONFIG_PAX_EMUTRAMP
3301+ case 2:
3302+ return;
3303+#endif
3304+
3305+ }
3306+ pax_report_fault(regs, (void *)instruction_pointer(regs), (void *)regs->gr[30]);
3307+ do_group_exit(SIGKILL);
3308+ }
3309+#endif
3310+
3311 goto bad_area;
3312+ }
3313
3314 /*
3315 * If for any reason at all we couldn't handle the fault, make
3316diff --git a/arch/powerpc/include/asm/atomic.h b/arch/powerpc/include/asm/atomic.h
3317index 02e41b5..ec6e26c 100644
3318--- a/arch/powerpc/include/asm/atomic.h
3319+++ b/arch/powerpc/include/asm/atomic.h
3320@@ -469,6 +469,16 @@ static __inline__ int atomic64_add_unless(atomic64_t *v, long a, long u)
3321
3322 #define atomic64_inc_not_zero(v) atomic64_add_unless((v), 1, 0)
3323
3324+#define atomic64_read_unchecked(v) atomic64_read(v)
3325+#define atomic64_set_unchecked(v, i) atomic64_set((v), (i))
3326+#define atomic64_add_unchecked(a, v) atomic64_add((a), (v))
3327+#define atomic64_add_return_unchecked(a, v) atomic64_add_return((a), (v))
3328+#define atomic64_sub_unchecked(a, v) atomic64_sub((a), (v))
3329+#define atomic64_inc_unchecked(v) atomic64_inc(v)
3330+#define atomic64_inc_return_unchecked(v) atomic64_inc_return(v)
3331+#define atomic64_dec_unchecked(v) atomic64_dec(v)
3332+#define atomic64_cmpxchg_unchecked(v, o, n) atomic64_cmpxchg((v), (o), (n))
3333+
3334 #endif /* __powerpc64__ */
3335
3336 #endif /* __KERNEL__ */
3337diff --git a/arch/powerpc/include/asm/cache.h b/arch/powerpc/include/asm/cache.h
3338index 4b50941..5605819 100644
3339--- a/arch/powerpc/include/asm/cache.h
3340+++ b/arch/powerpc/include/asm/cache.h
3341@@ -3,6 +3,7 @@
3342
3343 #ifdef __KERNEL__
3344
3345+#include <linux/const.h>
3346
3347 /* bytes per L1 cache line */
3348 #if defined(CONFIG_8xx) || defined(CONFIG_403GCX)
3349@@ -22,7 +23,7 @@
3350 #define L1_CACHE_SHIFT 7
3351 #endif
3352
3353-#define L1_CACHE_BYTES (1 << L1_CACHE_SHIFT)
3354+#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT)
3355
3356 #define SMP_CACHE_BYTES L1_CACHE_BYTES
3357
3358diff --git a/arch/powerpc/include/asm/elf.h b/arch/powerpc/include/asm/elf.h
3359index 3bf9cca..e7457d0 100644
3360--- a/arch/powerpc/include/asm/elf.h
3361+++ b/arch/powerpc/include/asm/elf.h
3362@@ -178,8 +178,19 @@ typedef elf_fpreg_t elf_vsrreghalf_t32[ELF_NVSRHALFREG];
3363 the loader. We need to make sure that it is out of the way of the program
3364 that it will "exec", and that there is sufficient room for the brk. */
3365
3366-extern unsigned long randomize_et_dyn(unsigned long base);
3367-#define ELF_ET_DYN_BASE (randomize_et_dyn(0x20000000))
3368+#define ELF_ET_DYN_BASE (0x20000000)
3369+
3370+#ifdef CONFIG_PAX_ASLR
3371+#define PAX_ELF_ET_DYN_BASE (0x10000000UL)
3372+
3373+#ifdef __powerpc64__
3374+#define PAX_DELTA_MMAP_LEN (is_32bit_task() ? 16 : 28)
3375+#define PAX_DELTA_STACK_LEN (is_32bit_task() ? 16 : 28)
3376+#else
3377+#define PAX_DELTA_MMAP_LEN 15
3378+#define PAX_DELTA_STACK_LEN 15
3379+#endif
3380+#endif
3381
3382 /*
3383 * Our registers are always unsigned longs, whether we're a 32 bit
3384@@ -274,9 +285,6 @@ extern int arch_setup_additional_pages(struct linux_binprm *bprm,
3385 (0x7ff >> (PAGE_SHIFT - 12)) : \
3386 (0x3ffff >> (PAGE_SHIFT - 12)))
3387
3388-extern unsigned long arch_randomize_brk(struct mm_struct *mm);
3389-#define arch_randomize_brk arch_randomize_brk
3390-
3391 #endif /* __KERNEL__ */
3392
3393 /*
3394diff --git a/arch/powerpc/include/asm/kmap_types.h b/arch/powerpc/include/asm/kmap_types.h
3395index bca8fdc..61e9580 100644
3396--- a/arch/powerpc/include/asm/kmap_types.h
3397+++ b/arch/powerpc/include/asm/kmap_types.h
3398@@ -27,6 +27,7 @@ enum km_type {
3399 KM_PPC_SYNC_PAGE,
3400 KM_PPC_SYNC_ICACHE,
3401 KM_KDB,
3402+ KM_CLEARPAGE,
3403 KM_TYPE_NR
3404 };
3405
3406diff --git a/arch/powerpc/include/asm/mman.h b/arch/powerpc/include/asm/mman.h
3407index d4a7f64..451de1c 100644
3408--- a/arch/powerpc/include/asm/mman.h
3409+++ b/arch/powerpc/include/asm/mman.h
3410@@ -44,7 +44,7 @@ static inline unsigned long arch_calc_vm_prot_bits(unsigned long prot)
3411 }
3412 #define arch_calc_vm_prot_bits(prot) arch_calc_vm_prot_bits(prot)
3413
3414-static inline pgprot_t arch_vm_get_page_prot(unsigned long vm_flags)
3415+static inline pgprot_t arch_vm_get_page_prot(vm_flags_t vm_flags)
3416 {
3417 return (vm_flags & VM_SAO) ? __pgprot(_PAGE_SAO) : __pgprot(0);
3418 }
3419diff --git a/arch/powerpc/include/asm/page.h b/arch/powerpc/include/asm/page.h
3420index dd9c4fd..a2ced87 100644
3421--- a/arch/powerpc/include/asm/page.h
3422+++ b/arch/powerpc/include/asm/page.h
3423@@ -141,8 +141,9 @@ extern phys_addr_t kernstart_addr;
3424 * and needs to be executable. This means the whole heap ends
3425 * up being executable.
3426 */
3427-#define VM_DATA_DEFAULT_FLAGS32 (VM_READ | VM_WRITE | VM_EXEC | \
3428- VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC)
3429+#define VM_DATA_DEFAULT_FLAGS32 \
3430+ (((current->personality & READ_IMPLIES_EXEC) ? VM_EXEC : 0) | \
3431+ VM_READ | VM_WRITE | VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC)
3432
3433 #define VM_DATA_DEFAULT_FLAGS64 (VM_READ | VM_WRITE | \
3434 VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC)
3435@@ -170,6 +171,9 @@ extern phys_addr_t kernstart_addr;
3436 #define is_kernel_addr(x) ((x) >= PAGE_OFFSET)
3437 #endif
3438
3439+#define ktla_ktva(addr) (addr)
3440+#define ktva_ktla(addr) (addr)
3441+
3442 /*
3443 * Use the top bit of the higher-level page table entries to indicate whether
3444 * the entries we point to contain hugepages. This works because we know that
3445diff --git a/arch/powerpc/include/asm/page_64.h b/arch/powerpc/include/asm/page_64.h
3446index fb40ede..d3ce956 100644
3447--- a/arch/powerpc/include/asm/page_64.h
3448+++ b/arch/powerpc/include/asm/page_64.h
3449@@ -144,15 +144,18 @@ do { \
3450 * stack by default, so in the absence of a PT_GNU_STACK program header
3451 * we turn execute permission off.
3452 */
3453-#define VM_STACK_DEFAULT_FLAGS32 (VM_READ | VM_WRITE | VM_EXEC | \
3454- VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC)
3455+#define VM_STACK_DEFAULT_FLAGS32 \
3456+ (((current->personality & READ_IMPLIES_EXEC) ? VM_EXEC : 0) | \
3457+ VM_READ | VM_WRITE | VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC)
3458
3459 #define VM_STACK_DEFAULT_FLAGS64 (VM_READ | VM_WRITE | \
3460 VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC)
3461
3462+#ifndef CONFIG_PAX_PAGEEXEC
3463 #define VM_STACK_DEFAULT_FLAGS \
3464 (is_32bit_task() ? \
3465 VM_STACK_DEFAULT_FLAGS32 : VM_STACK_DEFAULT_FLAGS64)
3466+#endif
3467
3468 #include <asm-generic/getorder.h>
3469
3470diff --git a/arch/powerpc/include/asm/pgtable.h b/arch/powerpc/include/asm/pgtable.h
3471index 88b0bd9..e32bc67 100644
3472--- a/arch/powerpc/include/asm/pgtable.h
3473+++ b/arch/powerpc/include/asm/pgtable.h
3474@@ -2,6 +2,7 @@
3475 #define _ASM_POWERPC_PGTABLE_H
3476 #ifdef __KERNEL__
3477
3478+#include <linux/const.h>
3479 #ifndef __ASSEMBLY__
3480 #include <asm/processor.h> /* For TASK_SIZE */
3481 #include <asm/mmu.h>
3482diff --git a/arch/powerpc/include/asm/pte-hash32.h b/arch/powerpc/include/asm/pte-hash32.h
3483index 4aad413..85d86bf 100644
3484--- a/arch/powerpc/include/asm/pte-hash32.h
3485+++ b/arch/powerpc/include/asm/pte-hash32.h
3486@@ -21,6 +21,7 @@
3487 #define _PAGE_FILE 0x004 /* when !present: nonlinear file mapping */
3488 #define _PAGE_USER 0x004 /* usermode access allowed */
3489 #define _PAGE_GUARDED 0x008 /* G: prohibit speculative access */
3490+#define _PAGE_EXEC _PAGE_GUARDED
3491 #define _PAGE_COHERENT 0x010 /* M: enforce memory coherence (SMP systems) */
3492 #define _PAGE_NO_CACHE 0x020 /* I: cache inhibit */
3493 #define _PAGE_WRITETHRU 0x040 /* W: cache write-through */
3494diff --git a/arch/powerpc/include/asm/reg.h b/arch/powerpc/include/asm/reg.h
3495index 559da19..7e5835c 100644
3496--- a/arch/powerpc/include/asm/reg.h
3497+++ b/arch/powerpc/include/asm/reg.h
3498@@ -212,6 +212,7 @@
3499 #define SPRN_DBCR 0x136 /* e300 Data Breakpoint Control Reg */
3500 #define SPRN_DSISR 0x012 /* Data Storage Interrupt Status Register */
3501 #define DSISR_NOHPTE 0x40000000 /* no translation found */
3502+#define DSISR_GUARDED 0x10000000 /* fetch from guarded storage */
3503 #define DSISR_PROTFAULT 0x08000000 /* protection fault */
3504 #define DSISR_ISSTORE 0x02000000 /* access was a store */
3505 #define DSISR_DABRMATCH 0x00400000 /* hit data breakpoint */
3506diff --git a/arch/powerpc/include/asm/system.h b/arch/powerpc/include/asm/system.h
3507index e30a13d..2b7d994 100644
3508--- a/arch/powerpc/include/asm/system.h
3509+++ b/arch/powerpc/include/asm/system.h
3510@@ -530,7 +530,7 @@ __cmpxchg_local(volatile void *ptr, unsigned long old, unsigned long new,
3511 #define cmpxchg64_local(ptr, o, n) __cmpxchg64_local_generic((ptr), (o), (n))
3512 #endif
3513
3514-extern unsigned long arch_align_stack(unsigned long sp);
3515+#define arch_align_stack(x) ((x) & ~0xfUL)
3516
3517 /* Used in very early kernel initialization. */
3518 extern unsigned long reloc_offset(void);
3519diff --git a/arch/powerpc/include/asm/uaccess.h b/arch/powerpc/include/asm/uaccess.h
3520index bd0fb84..a42a14b 100644
3521--- a/arch/powerpc/include/asm/uaccess.h
3522+++ b/arch/powerpc/include/asm/uaccess.h
3523@@ -13,6 +13,8 @@
3524 #define VERIFY_READ 0
3525 #define VERIFY_WRITE 1
3526
3527+extern void check_object_size(const void *ptr, unsigned long n, bool to);
3528+
3529 /*
3530 * The fs value determines whether argument validity checking should be
3531 * performed or not. If get_fs() == USER_DS, checking is performed, with
3532@@ -327,52 +329,6 @@ do { \
3533 extern unsigned long __copy_tofrom_user(void __user *to,
3534 const void __user *from, unsigned long size);
3535
3536-#ifndef __powerpc64__
3537-
3538-static inline unsigned long copy_from_user(void *to,
3539- const void __user *from, unsigned long n)
3540-{
3541- unsigned long over;
3542-
3543- if (access_ok(VERIFY_READ, from, n))
3544- return __copy_tofrom_user((__force void __user *)to, from, n);
3545- if ((unsigned long)from < TASK_SIZE) {
3546- over = (unsigned long)from + n - TASK_SIZE;
3547- return __copy_tofrom_user((__force void __user *)to, from,
3548- n - over) + over;
3549- }
3550- return n;
3551-}
3552-
3553-static inline unsigned long copy_to_user(void __user *to,
3554- const void *from, unsigned long n)
3555-{
3556- unsigned long over;
3557-
3558- if (access_ok(VERIFY_WRITE, to, n))
3559- return __copy_tofrom_user(to, (__force void __user *)from, n);
3560- if ((unsigned long)to < TASK_SIZE) {
3561- over = (unsigned long)to + n - TASK_SIZE;
3562- return __copy_tofrom_user(to, (__force void __user *)from,
3563- n - over) + over;
3564- }
3565- return n;
3566-}
3567-
3568-#else /* __powerpc64__ */
3569-
3570-#define __copy_in_user(to, from, size) \
3571- __copy_tofrom_user((to), (from), (size))
3572-
3573-extern unsigned long copy_from_user(void *to, const void __user *from,
3574- unsigned long n);
3575-extern unsigned long copy_to_user(void __user *to, const void *from,
3576- unsigned long n);
3577-extern unsigned long copy_in_user(void __user *to, const void __user *from,
3578- unsigned long n);
3579-
3580-#endif /* __powerpc64__ */
3581-
3582 static inline unsigned long __copy_from_user_inatomic(void *to,
3583 const void __user *from, unsigned long n)
3584 {
3585@@ -396,6 +352,10 @@ static inline unsigned long __copy_from_user_inatomic(void *to,
3586 if (ret == 0)
3587 return 0;
3588 }
3589+
3590+ if (!__builtin_constant_p(n))
3591+ check_object_size(to, n, false);
3592+
3593 return __copy_tofrom_user((__force void __user *)to, from, n);
3594 }
3595
3596@@ -422,6 +382,10 @@ static inline unsigned long __copy_to_user_inatomic(void __user *to,
3597 if (ret == 0)
3598 return 0;
3599 }
3600+
3601+ if (!__builtin_constant_p(n))
3602+ check_object_size(from, n, true);
3603+
3604 return __copy_tofrom_user(to, (__force const void __user *)from, n);
3605 }
3606
3607@@ -439,6 +403,92 @@ static inline unsigned long __copy_to_user(void __user *to,
3608 return __copy_to_user_inatomic(to, from, size);
3609 }
3610
3611+#ifndef __powerpc64__
3612+
3613+static inline unsigned long __must_check copy_from_user(void *to,
3614+ const void __user *from, unsigned long n)
3615+{
3616+ unsigned long over;
3617+
3618+ if ((long)n < 0)
3619+ return n;
3620+
3621+ if (access_ok(VERIFY_READ, from, n)) {
3622+ if (!__builtin_constant_p(n))
3623+ check_object_size(to, n, false);
3624+ return __copy_tofrom_user((__force void __user *)to, from, n);
3625+ }
3626+ if ((unsigned long)from < TASK_SIZE) {
3627+ over = (unsigned long)from + n - TASK_SIZE;
3628+ if (!__builtin_constant_p(n - over))
3629+ check_object_size(to, n - over, false);
3630+ return __copy_tofrom_user((__force void __user *)to, from,
3631+ n - over) + over;
3632+ }
3633+ return n;
3634+}
3635+
3636+static inline unsigned long __must_check copy_to_user(void __user *to,
3637+ const void *from, unsigned long n)
3638+{
3639+ unsigned long over;
3640+
3641+ if ((long)n < 0)
3642+ return n;
3643+
3644+ if (access_ok(VERIFY_WRITE, to, n)) {
3645+ if (!__builtin_constant_p(n))
3646+ check_object_size(from, n, true);
3647+ return __copy_tofrom_user(to, (__force void __user *)from, n);
3648+ }
3649+ if ((unsigned long)to < TASK_SIZE) {
3650+ over = (unsigned long)to + n - TASK_SIZE;
3651+ if (!__builtin_constant_p(n))
3652+ check_object_size(from, n - over, true);
3653+ return __copy_tofrom_user(to, (__force void __user *)from,
3654+ n - over) + over;
3655+ }
3656+ return n;
3657+}
3658+
3659+#else /* __powerpc64__ */
3660+
3661+#define __copy_in_user(to, from, size) \
3662+ __copy_tofrom_user((to), (from), (size))
3663+
3664+static inline unsigned long __must_check copy_from_user(void *to, const void __user *from, unsigned long n)
3665+{
3666+ if ((long)n < 0 || n > INT_MAX)
3667+ return n;
3668+
3669+ if (!__builtin_constant_p(n))
3670+ check_object_size(to, n, false);
3671+
3672+ if (likely(access_ok(VERIFY_READ, from, n)))
3673+ n = __copy_from_user(to, from, n);
3674+ else
3675+ memset(to, 0, n);
3676+ return n;
3677+}
3678+
3679+static inline unsigned long __must_check copy_to_user(void __user *to, const void *from, unsigned long n)
3680+{
3681+ if ((long)n < 0 || n > INT_MAX)
3682+ return n;
3683+
3684+ if (likely(access_ok(VERIFY_WRITE, to, n))) {
3685+ if (!__builtin_constant_p(n))
3686+ check_object_size(from, n, true);
3687+ n = __copy_to_user(to, from, n);
3688+ }
3689+ return n;
3690+}
3691+
3692+extern unsigned long copy_in_user(void __user *to, const void __user *from,
3693+ unsigned long n);
3694+
3695+#endif /* __powerpc64__ */
3696+
3697 extern unsigned long __clear_user(void __user *addr, unsigned long size);
3698
3699 static inline unsigned long clear_user(void __user *addr, unsigned long size)
3700diff --git a/arch/powerpc/kernel/exceptions-64e.S b/arch/powerpc/kernel/exceptions-64e.S
3701index 429983c..7af363b 100644
3702--- a/arch/powerpc/kernel/exceptions-64e.S
3703+++ b/arch/powerpc/kernel/exceptions-64e.S
3704@@ -587,6 +587,7 @@ storage_fault_common:
3705 std r14,_DAR(r1)
3706 std r15,_DSISR(r1)
3707 addi r3,r1,STACK_FRAME_OVERHEAD
3708+ bl .save_nvgprs
3709 mr r4,r14
3710 mr r5,r15
3711 ld r14,PACA_EXGEN+EX_R14(r13)
3712@@ -596,8 +597,7 @@ storage_fault_common:
3713 cmpdi r3,0
3714 bne- 1f
3715 b .ret_from_except_lite
3716-1: bl .save_nvgprs
3717- mr r5,r3
3718+1: mr r5,r3
3719 addi r3,r1,STACK_FRAME_OVERHEAD
3720 ld r4,_DAR(r1)
3721 bl .bad_page_fault
3722diff --git a/arch/powerpc/kernel/exceptions-64s.S b/arch/powerpc/kernel/exceptions-64s.S
3723index cf9c69b..ebc9640 100644
3724--- a/arch/powerpc/kernel/exceptions-64s.S
3725+++ b/arch/powerpc/kernel/exceptions-64s.S
3726@@ -1004,10 +1004,10 @@ handle_page_fault:
3727 11: ld r4,_DAR(r1)
3728 ld r5,_DSISR(r1)
3729 addi r3,r1,STACK_FRAME_OVERHEAD
3730+ bl .save_nvgprs
3731 bl .do_page_fault
3732 cmpdi r3,0
3733 beq+ 13f
3734- bl .save_nvgprs
3735 mr r5,r3
3736 addi r3,r1,STACK_FRAME_OVERHEAD
3737 lwz r4,_DAR(r1)
3738diff --git a/arch/powerpc/kernel/irq.c b/arch/powerpc/kernel/irq.c
3739index 745c1e7..59d97a6 100644
3740--- a/arch/powerpc/kernel/irq.c
3741+++ b/arch/powerpc/kernel/irq.c
3742@@ -547,9 +547,6 @@ struct irq_host *irq_alloc_host(struct device_node *of_node,
3743 host->ops = ops;
3744 host->of_node = of_node_get(of_node);
3745
3746- if (host->ops->match == NULL)
3747- host->ops->match = default_irq_host_match;
3748-
3749 raw_spin_lock_irqsave(&irq_big_lock, flags);
3750
3751 /* If it's a legacy controller, check for duplicates and
3752@@ -622,7 +619,12 @@ struct irq_host *irq_find_host(struct device_node *node)
3753 */
3754 raw_spin_lock_irqsave(&irq_big_lock, flags);
3755 list_for_each_entry(h, &irq_hosts, link)
3756- if (h->ops->match(h, node)) {
3757+ if (h->ops->match) {
3758+ if (h->ops->match(h, node)) {
3759+ found = h;
3760+ break;
3761+ }
3762+ } else if (default_irq_host_match(h, node)) {
3763 found = h;
3764 break;
3765 }
3766diff --git a/arch/powerpc/kernel/module_32.c b/arch/powerpc/kernel/module_32.c
3767index 0b6d796..d760ddb 100644
3768--- a/arch/powerpc/kernel/module_32.c
3769+++ b/arch/powerpc/kernel/module_32.c
3770@@ -162,7 +162,7 @@ int module_frob_arch_sections(Elf32_Ehdr *hdr,
3771 me->arch.core_plt_section = i;
3772 }
3773 if (!me->arch.core_plt_section || !me->arch.init_plt_section) {
3774- printk("Module doesn't contain .plt or .init.plt sections.\n");
3775+ printk("Module %s doesn't contain .plt or .init.plt sections.\n", me->name);
3776 return -ENOEXEC;
3777 }
3778
3779@@ -192,11 +192,16 @@ static uint32_t do_plt_call(void *location,
3780
3781 DEBUGP("Doing plt for call to 0x%x at 0x%x\n", val, (unsigned int)location);
3782 /* Init, or core PLT? */
3783- if (location >= mod->module_core
3784- && location < mod->module_core + mod->core_size)
3785+ if ((location >= mod->module_core_rx && location < mod->module_core_rx + mod->core_size_rx) ||
3786+ (location >= mod->module_core_rw && location < mod->module_core_rw + mod->core_size_rw))
3787 entry = (void *)sechdrs[mod->arch.core_plt_section].sh_addr;
3788- else
3789+ else if ((location >= mod->module_init_rx && location < mod->module_init_rx + mod->init_size_rx) ||
3790+ (location >= mod->module_init_rw && location < mod->module_init_rw + mod->init_size_rw))
3791 entry = (void *)sechdrs[mod->arch.init_plt_section].sh_addr;
3792+ else {
3793+ printk(KERN_ERR "%s: invalid R_PPC_REL24 entry found\n", mod->name);
3794+ return ~0UL;
3795+ }
3796
3797 /* Find this entry, or if that fails, the next avail. entry */
3798 while (entry->jump[0]) {
3799diff --git a/arch/powerpc/kernel/process.c b/arch/powerpc/kernel/process.c
3800index 6457574..08b28d3 100644
3801--- a/arch/powerpc/kernel/process.c
3802+++ b/arch/powerpc/kernel/process.c
3803@@ -660,8 +660,8 @@ void show_regs(struct pt_regs * regs)
3804 * Lookup NIP late so we have the best change of getting the
3805 * above info out without failing
3806 */
3807- printk("NIP ["REG"] %pS\n", regs->nip, (void *)regs->nip);
3808- printk("LR ["REG"] %pS\n", regs->link, (void *)regs->link);
3809+ printk("NIP ["REG"] %pA\n", regs->nip, (void *)regs->nip);
3810+ printk("LR ["REG"] %pA\n", regs->link, (void *)regs->link);
3811 #endif
3812 show_stack(current, (unsigned long *) regs->gpr[1]);
3813 if (!user_mode(regs))
3814@@ -1165,10 +1165,10 @@ void show_stack(struct task_struct *tsk, unsigned long *stack)
3815 newsp = stack[0];
3816 ip = stack[STACK_FRAME_LR_SAVE];
3817 if (!firstframe || ip != lr) {
3818- printk("["REG"] ["REG"] %pS", sp, ip, (void *)ip);
3819+ printk("["REG"] ["REG"] %pA", sp, ip, (void *)ip);
3820 #ifdef CONFIG_FUNCTION_GRAPH_TRACER
3821 if ((ip == rth || ip == mrth) && curr_frame >= 0) {
3822- printk(" (%pS)",
3823+ printk(" (%pA)",
3824 (void *)current->ret_stack[curr_frame].ret);
3825 curr_frame--;
3826 }
3827@@ -1188,7 +1188,7 @@ void show_stack(struct task_struct *tsk, unsigned long *stack)
3828 struct pt_regs *regs = (struct pt_regs *)
3829 (sp + STACK_FRAME_OVERHEAD);
3830 lr = regs->link;
3831- printk("--- Exception: %lx at %pS\n LR = %pS\n",
3832+ printk("--- Exception: %lx at %pA\n LR = %pA\n",
3833 regs->trap, (void *)regs->nip, (void *)lr);
3834 firstframe = 1;
3835 }
3836@@ -1263,58 +1263,3 @@ void thread_info_cache_init(void)
3837 }
3838
3839 #endif /* THREAD_SHIFT < PAGE_SHIFT */
3840-
3841-unsigned long arch_align_stack(unsigned long sp)
3842-{
3843- if (!(current->personality & ADDR_NO_RANDOMIZE) && randomize_va_space)
3844- sp -= get_random_int() & ~PAGE_MASK;
3845- return sp & ~0xf;
3846-}
3847-
3848-static inline unsigned long brk_rnd(void)
3849-{
3850- unsigned long rnd = 0;
3851-
3852- /* 8MB for 32bit, 1GB for 64bit */
3853- if (is_32bit_task())
3854- rnd = (long)(get_random_int() % (1<<(23-PAGE_SHIFT)));
3855- else
3856- rnd = (long)(get_random_int() % (1<<(30-PAGE_SHIFT)));
3857-
3858- return rnd << PAGE_SHIFT;
3859-}
3860-
3861-unsigned long arch_randomize_brk(struct mm_struct *mm)
3862-{
3863- unsigned long base = mm->brk;
3864- unsigned long ret;
3865-
3866-#ifdef CONFIG_PPC_STD_MMU_64
3867- /*
3868- * If we are using 1TB segments and we are allowed to randomise
3869- * the heap, we can put it above 1TB so it is backed by a 1TB
3870- * segment. Otherwise the heap will be in the bottom 1TB
3871- * which always uses 256MB segments and this may result in a
3872- * performance penalty.
3873- */
3874- if (!is_32bit_task() && (mmu_highuser_ssize == MMU_SEGSIZE_1T))
3875- base = max_t(unsigned long, mm->brk, 1UL << SID_SHIFT_1T);
3876-#endif
3877-
3878- ret = PAGE_ALIGN(base + brk_rnd());
3879-
3880- if (ret < mm->brk)
3881- return mm->brk;
3882-
3883- return ret;
3884-}
3885-
3886-unsigned long randomize_et_dyn(unsigned long base)
3887-{
3888- unsigned long ret = PAGE_ALIGN(base + brk_rnd());
3889-
3890- if (ret < base)
3891- return base;
3892-
3893- return ret;
3894-}
3895diff --git a/arch/powerpc/kernel/signal_32.c b/arch/powerpc/kernel/signal_32.c
3896index 836a5a1..27289a3 100644
3897--- a/arch/powerpc/kernel/signal_32.c
3898+++ b/arch/powerpc/kernel/signal_32.c
3899@@ -859,7 +859,7 @@ int handle_rt_signal32(unsigned long sig, struct k_sigaction *ka,
3900 /* Save user registers on the stack */
3901 frame = &rt_sf->uc.uc_mcontext;
3902 addr = frame;
3903- if (vdso32_rt_sigtramp && current->mm->context.vdso_base) {
3904+ if (vdso32_rt_sigtramp && current->mm->context.vdso_base != ~0UL) {
3905 if (save_user_regs(regs, frame, 0, 1))
3906 goto badframe;
3907 regs->link = current->mm->context.vdso_base + vdso32_rt_sigtramp;
3908diff --git a/arch/powerpc/kernel/signal_64.c b/arch/powerpc/kernel/signal_64.c
3909index a50b5ec..547078a 100644
3910--- a/arch/powerpc/kernel/signal_64.c
3911+++ b/arch/powerpc/kernel/signal_64.c
3912@@ -429,7 +429,7 @@ int handle_rt_signal64(int signr, struct k_sigaction *ka, siginfo_t *info,
3913 current->thread.fpscr.val = 0;
3914
3915 /* Set up to return from userspace. */
3916- if (vdso64_rt_sigtramp && current->mm->context.vdso_base) {
3917+ if (vdso64_rt_sigtramp && current->mm->context.vdso_base != ~0UL) {
3918 regs->link = current->mm->context.vdso_base + vdso64_rt_sigtramp;
3919 } else {
3920 err |= setup_trampoline(__NR_rt_sigreturn, &frame->tramp[0]);
3921diff --git a/arch/powerpc/kernel/traps.c b/arch/powerpc/kernel/traps.c
3922index 5459d14..10f8070 100644
3923--- a/arch/powerpc/kernel/traps.c
3924+++ b/arch/powerpc/kernel/traps.c
3925@@ -98,6 +98,8 @@ static void pmac_backlight_unblank(void)
3926 static inline void pmac_backlight_unblank(void) { }
3927 #endif
3928
3929+extern void gr_handle_kernel_exploit(void);
3930+
3931 int die(const char *str, struct pt_regs *regs, long err)
3932 {
3933 static struct {
3934@@ -171,6 +173,8 @@ int die(const char *str, struct pt_regs *regs, long err)
3935 if (panic_on_oops)
3936 panic("Fatal exception");
3937
3938+ gr_handle_kernel_exploit();
3939+
3940 oops_exit();
3941 do_exit(err);
3942
3943diff --git a/arch/powerpc/kernel/vdso.c b/arch/powerpc/kernel/vdso.c
3944index 7d14bb6..1305601 100644
3945--- a/arch/powerpc/kernel/vdso.c
3946+++ b/arch/powerpc/kernel/vdso.c
3947@@ -35,6 +35,7 @@
3948 #include <asm/firmware.h>
3949 #include <asm/vdso.h>
3950 #include <asm/vdso_datapage.h>
3951+#include <asm/mman.h>
3952
3953 #include "setup.h"
3954
3955@@ -219,7 +220,7 @@ int arch_setup_additional_pages(struct linux_binprm *bprm, int uses_interp)
3956 vdso_base = VDSO32_MBASE;
3957 #endif
3958
3959- current->mm->context.vdso_base = 0;
3960+ current->mm->context.vdso_base = ~0UL;
3961
3962 /* vDSO has a problem and was disabled, just don't "enable" it for the
3963 * process
3964@@ -239,7 +240,7 @@ int arch_setup_additional_pages(struct linux_binprm *bprm, int uses_interp)
3965 vdso_base = get_unmapped_area(NULL, vdso_base,
3966 (vdso_pages << PAGE_SHIFT) +
3967 ((VDSO_ALIGNMENT - 1) & PAGE_MASK),
3968- 0, 0);
3969+ 0, MAP_PRIVATE | MAP_EXECUTABLE);
3970 if (IS_ERR_VALUE(vdso_base)) {
3971 rc = vdso_base;
3972 goto fail_mmapsem;
3973diff --git a/arch/powerpc/lib/usercopy_64.c b/arch/powerpc/lib/usercopy_64.c
3974index 5eea6f3..5d10396 100644
3975--- a/arch/powerpc/lib/usercopy_64.c
3976+++ b/arch/powerpc/lib/usercopy_64.c
3977@@ -9,22 +9,6 @@
3978 #include <linux/module.h>
3979 #include <asm/uaccess.h>
3980
3981-unsigned long copy_from_user(void *to, const void __user *from, unsigned long n)
3982-{
3983- if (likely(access_ok(VERIFY_READ, from, n)))
3984- n = __copy_from_user(to, from, n);
3985- else
3986- memset(to, 0, n);
3987- return n;
3988-}
3989-
3990-unsigned long copy_to_user(void __user *to, const void *from, unsigned long n)
3991-{
3992- if (likely(access_ok(VERIFY_WRITE, to, n)))
3993- n = __copy_to_user(to, from, n);
3994- return n;
3995-}
3996-
3997 unsigned long copy_in_user(void __user *to, const void __user *from,
3998 unsigned long n)
3999 {
4000@@ -35,7 +19,5 @@ unsigned long copy_in_user(void __user *to, const void __user *from,
4001 return n;
4002 }
4003
4004-EXPORT_SYMBOL(copy_from_user);
4005-EXPORT_SYMBOL(copy_to_user);
4006 EXPORT_SYMBOL(copy_in_user);
4007
4008diff --git a/arch/powerpc/mm/fault.c b/arch/powerpc/mm/fault.c
4009index 5efe8c9..db9ceef 100644
4010--- a/arch/powerpc/mm/fault.c
4011+++ b/arch/powerpc/mm/fault.c
4012@@ -32,6 +32,10 @@
4013 #include <linux/perf_event.h>
4014 #include <linux/magic.h>
4015 #include <linux/ratelimit.h>
4016+#include <linux/slab.h>
4017+#include <linux/pagemap.h>
4018+#include <linux/compiler.h>
4019+#include <linux/unistd.h>
4020
4021 #include <asm/firmware.h>
4022 #include <asm/page.h>
4023@@ -43,6 +47,7 @@
4024 #include <asm/tlbflush.h>
4025 #include <asm/siginfo.h>
4026 #include <mm/mmu_decl.h>
4027+#include <asm/ptrace.h>
4028
4029 #ifdef CONFIG_KPROBES
4030 static inline int notify_page_fault(struct pt_regs *regs)
4031@@ -66,6 +71,33 @@ static inline int notify_page_fault(struct pt_regs *regs)
4032 }
4033 #endif
4034
4035+#ifdef CONFIG_PAX_PAGEEXEC
4036+/*
4037+ * PaX: decide what to do with offenders (regs->nip = fault address)
4038+ *
4039+ * returns 1 when task should be killed
4040+ */
4041+static int pax_handle_fetch_fault(struct pt_regs *regs)
4042+{
4043+ return 1;
4044+}
4045+
4046+void pax_report_insns(struct pt_regs *regs, void *pc, void *sp)
4047+{
4048+ unsigned long i;
4049+
4050+ printk(KERN_ERR "PAX: bytes at PC: ");
4051+ for (i = 0; i < 5; i++) {
4052+ unsigned int c;
4053+ if (get_user(c, (unsigned int __user *)pc+i))
4054+ printk(KERN_CONT "???????? ");
4055+ else
4056+ printk(KERN_CONT "%08x ", c);
4057+ }
4058+ printk("\n");
4059+}
4060+#endif
4061+
4062 /*
4063 * Check whether the instruction at regs->nip is a store using
4064 * an update addressing form which will update r1.
4065@@ -136,7 +168,7 @@ int __kprobes do_page_fault(struct pt_regs *regs, unsigned long address,
4066 * indicate errors in DSISR but can validly be set in SRR1.
4067 */
4068 if (trap == 0x400)
4069- error_code &= 0x48200000;
4070+ error_code &= 0x58200000;
4071 else
4072 is_write = error_code & DSISR_ISSTORE;
4073 #else
4074@@ -259,7 +291,7 @@ good_area:
4075 * "undefined". Of those that can be set, this is the only
4076 * one which seems bad.
4077 */
4078- if (error_code & 0x10000000)
4079+ if (error_code & DSISR_GUARDED)
4080 /* Guarded storage error. */
4081 goto bad_area;
4082 #endif /* CONFIG_8xx */
4083@@ -274,7 +306,7 @@ good_area:
4084 * processors use the same I/D cache coherency mechanism
4085 * as embedded.
4086 */
4087- if (error_code & DSISR_PROTFAULT)
4088+ if (error_code & (DSISR_PROTFAULT | DSISR_GUARDED))
4089 goto bad_area;
4090 #endif /* CONFIG_PPC_STD_MMU */
4091
4092@@ -343,6 +375,23 @@ bad_area:
4093 bad_area_nosemaphore:
4094 /* User mode accesses cause a SIGSEGV */
4095 if (user_mode(regs)) {
4096+
4097+#ifdef CONFIG_PAX_PAGEEXEC
4098+ if (mm->pax_flags & MF_PAX_PAGEEXEC) {
4099+#ifdef CONFIG_PPC_STD_MMU
4100+ if (is_exec && (error_code & (DSISR_PROTFAULT | DSISR_GUARDED))) {
4101+#else
4102+ if (is_exec && regs->nip == address) {
4103+#endif
4104+ switch (pax_handle_fetch_fault(regs)) {
4105+ }
4106+
4107+ pax_report_fault(regs, (void *)regs->nip, (void *)regs->gpr[PT_R1]);
4108+ do_group_exit(SIGKILL);
4109+ }
4110+ }
4111+#endif
4112+
4113 _exception(SIGSEGV, regs, code, address);
4114 return 0;
4115 }
4116diff --git a/arch/powerpc/mm/mmap_64.c b/arch/powerpc/mm/mmap_64.c
4117index 5a783d8..c23e14b 100644
4118--- a/arch/powerpc/mm/mmap_64.c
4119+++ b/arch/powerpc/mm/mmap_64.c
4120@@ -99,10 +99,22 @@ void arch_pick_mmap_layout(struct mm_struct *mm)
4121 */
4122 if (mmap_is_legacy()) {
4123 mm->mmap_base = TASK_UNMAPPED_BASE;
4124+
4125+#ifdef CONFIG_PAX_RANDMMAP
4126+ if (mm->pax_flags & MF_PAX_RANDMMAP)
4127+ mm->mmap_base += mm->delta_mmap;
4128+#endif
4129+
4130 mm->get_unmapped_area = arch_get_unmapped_area;
4131 mm->unmap_area = arch_unmap_area;
4132 } else {
4133 mm->mmap_base = mmap_base();
4134+
4135+#ifdef CONFIG_PAX_RANDMMAP
4136+ if (mm->pax_flags & MF_PAX_RANDMMAP)
4137+ mm->mmap_base -= mm->delta_mmap + mm->delta_stack;
4138+#endif
4139+
4140 mm->get_unmapped_area = arch_get_unmapped_area_topdown;
4141 mm->unmap_area = arch_unmap_area_topdown;
4142 }
4143diff --git a/arch/powerpc/mm/slice.c b/arch/powerpc/mm/slice.c
4144index 73709f7..6b90313 100644
4145--- a/arch/powerpc/mm/slice.c
4146+++ b/arch/powerpc/mm/slice.c
4147@@ -98,7 +98,7 @@ static int slice_area_is_free(struct mm_struct *mm, unsigned long addr,
4148 if ((mm->task_size - len) < addr)
4149 return 0;
4150 vma = find_vma(mm, addr);
4151- return (!vma || (addr + len) <= vma->vm_start);
4152+ return check_heap_stack_gap(vma, addr, len);
4153 }
4154
4155 static int slice_low_has_vma(struct mm_struct *mm, unsigned long slice)
4156@@ -256,7 +256,7 @@ full_search:
4157 addr = _ALIGN_UP(addr + 1, 1ul << SLICE_HIGH_SHIFT);
4158 continue;
4159 }
4160- if (!vma || addr + len <= vma->vm_start) {
4161+ if (check_heap_stack_gap(vma, addr, len)) {
4162 /*
4163 * Remember the place where we stopped the search:
4164 */
4165@@ -313,10 +313,14 @@ static unsigned long slice_find_area_topdown(struct mm_struct *mm,
4166 }
4167 }
4168
4169- addr = mm->mmap_base;
4170- while (addr > len) {
4171+ if (mm->mmap_base < len)
4172+ addr = -ENOMEM;
4173+ else
4174+ addr = mm->mmap_base - len;
4175+
4176+ while (!IS_ERR_VALUE(addr)) {
4177 /* Go down by chunk size */
4178- addr = _ALIGN_DOWN(addr - len, 1ul << pshift);
4179+ addr = _ALIGN_DOWN(addr, 1ul << pshift);
4180
4181 /* Check for hit with different page size */
4182 mask = slice_range_to_mask(addr, len);
4183@@ -336,7 +340,7 @@ static unsigned long slice_find_area_topdown(struct mm_struct *mm,
4184 * return with success:
4185 */
4186 vma = find_vma(mm, addr);
4187- if (!vma || (addr + len) <= vma->vm_start) {
4188+ if (check_heap_stack_gap(vma, addr, len)) {
4189 /* remember the address as a hint for next time */
4190 if (use_cache)
4191 mm->free_area_cache = addr;
4192@@ -348,7 +352,7 @@ static unsigned long slice_find_area_topdown(struct mm_struct *mm,
4193 mm->cached_hole_size = vma->vm_start - addr;
4194
4195 /* try just below the current vma->vm_start */
4196- addr = vma->vm_start;
4197+ addr = skip_heap_stack_gap(vma, len);
4198 }
4199
4200 /*
4201@@ -426,6 +430,11 @@ unsigned long slice_get_unmapped_area(unsigned long addr, unsigned long len,
4202 if (fixed && addr > (mm->task_size - len))
4203 return -EINVAL;
4204
4205+#ifdef CONFIG_PAX_RANDMMAP
4206+ if (!fixed && (mm->pax_flags & MF_PAX_RANDMMAP))
4207+ addr = 0;
4208+#endif
4209+
4210 /* If hint, make sure it matches our alignment restrictions */
4211 if (!fixed && addr) {
4212 addr = _ALIGN_UP(addr, 1ul << pshift);
4213diff --git a/arch/s390/include/asm/atomic.h b/arch/s390/include/asm/atomic.h
4214index 8517d2a..d2738d4 100644
4215--- a/arch/s390/include/asm/atomic.h
4216+++ b/arch/s390/include/asm/atomic.h
4217@@ -326,6 +326,16 @@ static inline long long atomic64_dec_if_positive(atomic64_t *v)
4218 #define atomic64_dec_and_test(_v) (atomic64_sub_return(1, _v) == 0)
4219 #define atomic64_inc_not_zero(v) atomic64_add_unless((v), 1, 0)
4220
4221+#define atomic64_read_unchecked(v) atomic64_read(v)
4222+#define atomic64_set_unchecked(v, i) atomic64_set((v), (i))
4223+#define atomic64_add_unchecked(a, v) atomic64_add((a), (v))
4224+#define atomic64_add_return_unchecked(a, v) atomic64_add_return((a), (v))
4225+#define atomic64_sub_unchecked(a, v) atomic64_sub((a), (v))
4226+#define atomic64_inc_unchecked(v) atomic64_inc(v)
4227+#define atomic64_inc_return_unchecked(v) atomic64_inc_return(v)
4228+#define atomic64_dec_unchecked(v) atomic64_dec(v)
4229+#define atomic64_cmpxchg_unchecked(v, o, n) atomic64_cmpxchg((v), (o), (n))
4230+
4231 #define smp_mb__before_atomic_dec() smp_mb()
4232 #define smp_mb__after_atomic_dec() smp_mb()
4233 #define smp_mb__before_atomic_inc() smp_mb()
4234diff --git a/arch/s390/include/asm/cache.h b/arch/s390/include/asm/cache.h
4235index 2a30d5a..5e5586f 100644
4236--- a/arch/s390/include/asm/cache.h
4237+++ b/arch/s390/include/asm/cache.h
4238@@ -11,8 +11,10 @@
4239 #ifndef __ARCH_S390_CACHE_H
4240 #define __ARCH_S390_CACHE_H
4241
4242-#define L1_CACHE_BYTES 256
4243+#include <linux/const.h>
4244+
4245 #define L1_CACHE_SHIFT 8
4246+#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT)
4247 #define NET_SKB_PAD 32
4248
4249 #define __read_mostly __attribute__((__section__(".data..read_mostly")))
4250diff --git a/arch/s390/include/asm/elf.h b/arch/s390/include/asm/elf.h
4251index 547f1a6..0b22b53 100644
4252--- a/arch/s390/include/asm/elf.h
4253+++ b/arch/s390/include/asm/elf.h
4254@@ -162,8 +162,14 @@ extern unsigned int vdso_enabled;
4255 the loader. We need to make sure that it is out of the way of the program
4256 that it will "exec", and that there is sufficient room for the brk. */
4257
4258-extern unsigned long randomize_et_dyn(unsigned long base);
4259-#define ELF_ET_DYN_BASE (randomize_et_dyn(STACK_TOP / 3 * 2))
4260+#define ELF_ET_DYN_BASE (STACK_TOP / 3 * 2)
4261+
4262+#ifdef CONFIG_PAX_ASLR
4263+#define PAX_ELF_ET_DYN_BASE (test_thread_flag(TIF_31BIT) ? 0x10000UL : 0x80000000UL)
4264+
4265+#define PAX_DELTA_MMAP_LEN (test_thread_flag(TIF_31BIT) ? 15 : 26)
4266+#define PAX_DELTA_STACK_LEN (test_thread_flag(TIF_31BIT) ? 15 : 26)
4267+#endif
4268
4269 /* This yields a mask that user programs can use to figure out what
4270 instruction set this CPU supports. */
4271@@ -211,7 +217,4 @@ struct linux_binprm;
4272 #define ARCH_HAS_SETUP_ADDITIONAL_PAGES 1
4273 int arch_setup_additional_pages(struct linux_binprm *, int);
4274
4275-extern unsigned long arch_randomize_brk(struct mm_struct *mm);
4276-#define arch_randomize_brk arch_randomize_brk
4277-
4278 #endif
4279diff --git a/arch/s390/include/asm/system.h b/arch/s390/include/asm/system.h
4280index ef573c1..75a1ce6 100644
4281--- a/arch/s390/include/asm/system.h
4282+++ b/arch/s390/include/asm/system.h
4283@@ -262,7 +262,7 @@ extern void (*_machine_restart)(char *command);
4284 extern void (*_machine_halt)(void);
4285 extern void (*_machine_power_off)(void);
4286
4287-extern unsigned long arch_align_stack(unsigned long sp);
4288+#define arch_align_stack(x) ((x) & ~0xfUL)
4289
4290 static inline int tprot(unsigned long addr)
4291 {
4292diff --git a/arch/s390/include/asm/uaccess.h b/arch/s390/include/asm/uaccess.h
4293index 2b23885..e136e31 100644
4294--- a/arch/s390/include/asm/uaccess.h
4295+++ b/arch/s390/include/asm/uaccess.h
4296@@ -235,6 +235,10 @@ static inline unsigned long __must_check
4297 copy_to_user(void __user *to, const void *from, unsigned long n)
4298 {
4299 might_fault();
4300+
4301+ if ((long)n < 0)
4302+ return n;
4303+
4304 if (access_ok(VERIFY_WRITE, to, n))
4305 n = __copy_to_user(to, from, n);
4306 return n;
4307@@ -260,6 +264,9 @@ copy_to_user(void __user *to, const void *from, unsigned long n)
4308 static inline unsigned long __must_check
4309 __copy_from_user(void *to, const void __user *from, unsigned long n)
4310 {
4311+ if ((long)n < 0)
4312+ return n;
4313+
4314 if (__builtin_constant_p(n) && (n <= 256))
4315 return uaccess.copy_from_user_small(n, from, to);
4316 else
4317@@ -294,6 +301,10 @@ copy_from_user(void *to, const void __user *from, unsigned long n)
4318 unsigned int sz = __compiletime_object_size(to);
4319
4320 might_fault();
4321+
4322+ if ((long)n < 0)
4323+ return n;
4324+
4325 if (unlikely(sz != -1 && sz < n)) {
4326 copy_from_user_overflow();
4327 return n;
4328diff --git a/arch/s390/kernel/module.c b/arch/s390/kernel/module.c
4329index dfcb343..eda788a 100644
4330--- a/arch/s390/kernel/module.c
4331+++ b/arch/s390/kernel/module.c
4332@@ -161,11 +161,11 @@ module_frob_arch_sections(Elf_Ehdr *hdr, Elf_Shdr *sechdrs,
4333
4334 /* Increase core size by size of got & plt and set start
4335 offsets for got and plt. */
4336- me->core_size = ALIGN(me->core_size, 4);
4337- me->arch.got_offset = me->core_size;
4338- me->core_size += me->arch.got_size;
4339- me->arch.plt_offset = me->core_size;
4340- me->core_size += me->arch.plt_size;
4341+ me->core_size_rw = ALIGN(me->core_size_rw, 4);
4342+ me->arch.got_offset = me->core_size_rw;
4343+ me->core_size_rw += me->arch.got_size;
4344+ me->arch.plt_offset = me->core_size_rx;
4345+ me->core_size_rx += me->arch.plt_size;
4346 return 0;
4347 }
4348
4349@@ -242,7 +242,7 @@ apply_rela(Elf_Rela *rela, Elf_Addr base, Elf_Sym *symtab,
4350 if (info->got_initialized == 0) {
4351 Elf_Addr *gotent;
4352
4353- gotent = me->module_core + me->arch.got_offset +
4354+ gotent = me->module_core_rw + me->arch.got_offset +
4355 info->got_offset;
4356 *gotent = val;
4357 info->got_initialized = 1;
4358@@ -266,7 +266,7 @@ apply_rela(Elf_Rela *rela, Elf_Addr base, Elf_Sym *symtab,
4359 else if (r_type == R_390_GOTENT ||
4360 r_type == R_390_GOTPLTENT)
4361 *(unsigned int *) loc =
4362- (val + (Elf_Addr) me->module_core - loc) >> 1;
4363+ (val + (Elf_Addr) me->module_core_rw - loc) >> 1;
4364 else if (r_type == R_390_GOT64 ||
4365 r_type == R_390_GOTPLT64)
4366 *(unsigned long *) loc = val;
4367@@ -280,7 +280,7 @@ apply_rela(Elf_Rela *rela, Elf_Addr base, Elf_Sym *symtab,
4368 case R_390_PLTOFF64: /* 16 bit offset from GOT to PLT. */
4369 if (info->plt_initialized == 0) {
4370 unsigned int *ip;
4371- ip = me->module_core + me->arch.plt_offset +
4372+ ip = me->module_core_rx + me->arch.plt_offset +
4373 info->plt_offset;
4374 #ifndef CONFIG_64BIT
4375 ip[0] = 0x0d105810; /* basr 1,0; l 1,6(1); br 1 */
4376@@ -305,7 +305,7 @@ apply_rela(Elf_Rela *rela, Elf_Addr base, Elf_Sym *symtab,
4377 val - loc + 0xffffUL < 0x1ffffeUL) ||
4378 (r_type == R_390_PLT32DBL &&
4379 val - loc + 0xffffffffULL < 0x1fffffffeULL)))
4380- val = (Elf_Addr) me->module_core +
4381+ val = (Elf_Addr) me->module_core_rx +
4382 me->arch.plt_offset +
4383 info->plt_offset;
4384 val += rela->r_addend - loc;
4385@@ -327,7 +327,7 @@ apply_rela(Elf_Rela *rela, Elf_Addr base, Elf_Sym *symtab,
4386 case R_390_GOTOFF32: /* 32 bit offset to GOT. */
4387 case R_390_GOTOFF64: /* 64 bit offset to GOT. */
4388 val = val + rela->r_addend -
4389- ((Elf_Addr) me->module_core + me->arch.got_offset);
4390+ ((Elf_Addr) me->module_core_rw + me->arch.got_offset);
4391 if (r_type == R_390_GOTOFF16)
4392 *(unsigned short *) loc = val;
4393 else if (r_type == R_390_GOTOFF32)
4394@@ -337,7 +337,7 @@ apply_rela(Elf_Rela *rela, Elf_Addr base, Elf_Sym *symtab,
4395 break;
4396 case R_390_GOTPC: /* 32 bit PC relative offset to GOT. */
4397 case R_390_GOTPCDBL: /* 32 bit PC rel. off. to GOT shifted by 1. */
4398- val = (Elf_Addr) me->module_core + me->arch.got_offset +
4399+ val = (Elf_Addr) me->module_core_rw + me->arch.got_offset +
4400 rela->r_addend - loc;
4401 if (r_type == R_390_GOTPC)
4402 *(unsigned int *) loc = val;
4403diff --git a/arch/s390/kernel/process.c b/arch/s390/kernel/process.c
4404index 53088e2..9f44a36 100644
4405--- a/arch/s390/kernel/process.c
4406+++ b/arch/s390/kernel/process.c
4407@@ -320,39 +320,3 @@ unsigned long get_wchan(struct task_struct *p)
4408 }
4409 return 0;
4410 }
4411-
4412-unsigned long arch_align_stack(unsigned long sp)
4413-{
4414- if (!(current->personality & ADDR_NO_RANDOMIZE) && randomize_va_space)
4415- sp -= get_random_int() & ~PAGE_MASK;
4416- return sp & ~0xf;
4417-}
4418-
4419-static inline unsigned long brk_rnd(void)
4420-{
4421- /* 8MB for 32bit, 1GB for 64bit */
4422- if (is_32bit_task())
4423- return (get_random_int() & 0x7ffUL) << PAGE_SHIFT;
4424- else
4425- return (get_random_int() & 0x3ffffUL) << PAGE_SHIFT;
4426-}
4427-
4428-unsigned long arch_randomize_brk(struct mm_struct *mm)
4429-{
4430- unsigned long ret = PAGE_ALIGN(mm->brk + brk_rnd());
4431-
4432- if (ret < mm->brk)
4433- return mm->brk;
4434- return ret;
4435-}
4436-
4437-unsigned long randomize_et_dyn(unsigned long base)
4438-{
4439- unsigned long ret = PAGE_ALIGN(base + brk_rnd());
4440-
4441- if (!(current->flags & PF_RANDOMIZE))
4442- return base;
4443- if (ret < base)
4444- return base;
4445- return ret;
4446-}
4447diff --git a/arch/s390/mm/mmap.c b/arch/s390/mm/mmap.c
4448index a0155c0..34cc491 100644
4449--- a/arch/s390/mm/mmap.c
4450+++ b/arch/s390/mm/mmap.c
4451@@ -92,10 +92,22 @@ void arch_pick_mmap_layout(struct mm_struct *mm)
4452 */
4453 if (mmap_is_legacy()) {
4454 mm->mmap_base = TASK_UNMAPPED_BASE;
4455+
4456+#ifdef CONFIG_PAX_RANDMMAP
4457+ if (mm->pax_flags & MF_PAX_RANDMMAP)
4458+ mm->mmap_base += mm->delta_mmap;
4459+#endif
4460+
4461 mm->get_unmapped_area = arch_get_unmapped_area;
4462 mm->unmap_area = arch_unmap_area;
4463 } else {
4464 mm->mmap_base = mmap_base();
4465+
4466+#ifdef CONFIG_PAX_RANDMMAP
4467+ if (mm->pax_flags & MF_PAX_RANDMMAP)
4468+ mm->mmap_base -= mm->delta_mmap + mm->delta_stack;
4469+#endif
4470+
4471 mm->get_unmapped_area = arch_get_unmapped_area_topdown;
4472 mm->unmap_area = arch_unmap_area_topdown;
4473 }
4474@@ -167,10 +179,22 @@ void arch_pick_mmap_layout(struct mm_struct *mm)
4475 */
4476 if (mmap_is_legacy()) {
4477 mm->mmap_base = TASK_UNMAPPED_BASE;
4478+
4479+#ifdef CONFIG_PAX_RANDMMAP
4480+ if (mm->pax_flags & MF_PAX_RANDMMAP)
4481+ mm->mmap_base += mm->delta_mmap;
4482+#endif
4483+
4484 mm->get_unmapped_area = s390_get_unmapped_area;
4485 mm->unmap_area = arch_unmap_area;
4486 } else {
4487 mm->mmap_base = mmap_base();
4488+
4489+#ifdef CONFIG_PAX_RANDMMAP
4490+ if (mm->pax_flags & MF_PAX_RANDMMAP)
4491+ mm->mmap_base -= mm->delta_mmap + mm->delta_stack;
4492+#endif
4493+
4494 mm->get_unmapped_area = s390_get_unmapped_area_topdown;
4495 mm->unmap_area = arch_unmap_area_topdown;
4496 }
4497diff --git a/arch/score/include/asm/cache.h b/arch/score/include/asm/cache.h
4498index ae3d59f..f65f075 100644
4499--- a/arch/score/include/asm/cache.h
4500+++ b/arch/score/include/asm/cache.h
4501@@ -1,7 +1,9 @@
4502 #ifndef _ASM_SCORE_CACHE_H
4503 #define _ASM_SCORE_CACHE_H
4504
4505+#include <linux/const.h>
4506+
4507 #define L1_CACHE_SHIFT 4
4508-#define L1_CACHE_BYTES (1 << L1_CACHE_SHIFT)
4509+#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT)
4510
4511 #endif /* _ASM_SCORE_CACHE_H */
4512diff --git a/arch/score/include/asm/system.h b/arch/score/include/asm/system.h
4513index 589d5c7..669e274 100644
4514--- a/arch/score/include/asm/system.h
4515+++ b/arch/score/include/asm/system.h
4516@@ -17,7 +17,7 @@ do { \
4517 #define finish_arch_switch(prev) do {} while (0)
4518
4519 typedef void (*vi_handler_t)(void);
4520-extern unsigned long arch_align_stack(unsigned long sp);
4521+#define arch_align_stack(x) (x)
4522
4523 #define mb() barrier()
4524 #define rmb() barrier()
4525diff --git a/arch/score/kernel/process.c b/arch/score/kernel/process.c
4526index 25d0803..d6c8e36 100644
4527--- a/arch/score/kernel/process.c
4528+++ b/arch/score/kernel/process.c
4529@@ -161,8 +161,3 @@ unsigned long get_wchan(struct task_struct *task)
4530
4531 return task_pt_regs(task)->cp0_epc;
4532 }
4533-
4534-unsigned long arch_align_stack(unsigned long sp)
4535-{
4536- return sp;
4537-}
4538diff --git a/arch/sh/include/asm/cache.h b/arch/sh/include/asm/cache.h
4539index ef9e555..331bd29 100644
4540--- a/arch/sh/include/asm/cache.h
4541+++ b/arch/sh/include/asm/cache.h
4542@@ -9,10 +9,11 @@
4543 #define __ASM_SH_CACHE_H
4544 #ifdef __KERNEL__
4545
4546+#include <linux/const.h>
4547 #include <linux/init.h>
4548 #include <cpu/cache.h>
4549
4550-#define L1_CACHE_BYTES (1 << L1_CACHE_SHIFT)
4551+#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT)
4552
4553 #define __read_mostly __attribute__((__section__(".data..read_mostly")))
4554
4555diff --git a/arch/sh/mm/mmap.c b/arch/sh/mm/mmap.c
4556index afeb710..d1d1289 100644
4557--- a/arch/sh/mm/mmap.c
4558+++ b/arch/sh/mm/mmap.c
4559@@ -74,8 +74,7 @@ unsigned long arch_get_unmapped_area(struct file *filp, unsigned long addr,
4560 addr = PAGE_ALIGN(addr);
4561
4562 vma = find_vma(mm, addr);
4563- if (TASK_SIZE - len >= addr &&
4564- (!vma || addr + len <= vma->vm_start))
4565+ if (TASK_SIZE - len >= addr && check_heap_stack_gap(vma, addr, len))
4566 return addr;
4567 }
4568
4569@@ -106,7 +105,7 @@ full_search:
4570 }
4571 return -ENOMEM;
4572 }
4573- if (likely(!vma || addr + len <= vma->vm_start)) {
4574+ if (likely(check_heap_stack_gap(vma, addr, len))) {
4575 /*
4576 * Remember the place where we stopped the search:
4577 */
4578@@ -157,8 +156,7 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
4579 addr = PAGE_ALIGN(addr);
4580
4581 vma = find_vma(mm, addr);
4582- if (TASK_SIZE - len >= addr &&
4583- (!vma || addr + len <= vma->vm_start))
4584+ if (TASK_SIZE - len >= addr && check_heap_stack_gap(vma, addr, len))
4585 return addr;
4586 }
4587
4588@@ -179,7 +177,7 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
4589 /* make sure it can fit in the remaining address space */
4590 if (likely(addr > len)) {
4591 vma = find_vma(mm, addr-len);
4592- if (!vma || addr <= vma->vm_start) {
4593+ if (check_heap_stack_gap(vma, addr - len, len)) {
4594 /* remember the address as a hint for next time */
4595 return (mm->free_area_cache = addr-len);
4596 }
4597@@ -188,18 +186,18 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
4598 if (unlikely(mm->mmap_base < len))
4599 goto bottomup;
4600
4601- addr = mm->mmap_base-len;
4602- if (do_colour_align)
4603- addr = COLOUR_ALIGN_DOWN(addr, pgoff);
4604+ addr = mm->mmap_base - len;
4605
4606 do {
4607+ if (do_colour_align)
4608+ addr = COLOUR_ALIGN_DOWN(addr, pgoff);
4609 /*
4610 * Lookup failure means no vma is above this address,
4611 * else if new region fits below vma->vm_start,
4612 * return with success:
4613 */
4614 vma = find_vma(mm, addr);
4615- if (likely(!vma || addr+len <= vma->vm_start)) {
4616+ if (likely(check_heap_stack_gap(vma, addr, len))) {
4617 /* remember the address as a hint for next time */
4618 return (mm->free_area_cache = addr);
4619 }
4620@@ -209,10 +207,8 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
4621 mm->cached_hole_size = vma->vm_start - addr;
4622
4623 /* try just below the current vma->vm_start */
4624- addr = vma->vm_start-len;
4625- if (do_colour_align)
4626- addr = COLOUR_ALIGN_DOWN(addr, pgoff);
4627- } while (likely(len < vma->vm_start));
4628+ addr = skip_heap_stack_gap(vma, len);
4629+ } while (!IS_ERR_VALUE(addr));
4630
4631 bottomup:
4632 /*
4633diff --git a/arch/sparc/Kconfig b/arch/sparc/Kconfig
4634index f92602e..27060b2 100644
4635--- a/arch/sparc/Kconfig
4636+++ b/arch/sparc/Kconfig
4637@@ -31,6 +31,7 @@ config SPARC
4638
4639 config SPARC32
4640 def_bool !64BIT
4641+ select GENERIC_ATOMIC64
4642
4643 config SPARC64
4644 def_bool 64BIT
4645diff --git a/arch/sparc/Makefile b/arch/sparc/Makefile
4646index eddcfb3..b117d90 100644
4647--- a/arch/sparc/Makefile
4648+++ b/arch/sparc/Makefile
4649@@ -75,7 +75,7 @@ drivers-$(CONFIG_OPROFILE) += arch/sparc/oprofile/
4650 # Export what is needed by arch/sparc/boot/Makefile
4651 export VMLINUX_INIT VMLINUX_MAIN
4652 VMLINUX_INIT := $(head-y) $(init-y)
4653-VMLINUX_MAIN := $(core-y) kernel/ mm/ fs/ ipc/ security/ crypto/ block/
4654+VMLINUX_MAIN := $(core-y) kernel/ mm/ fs/ ipc/ security/ crypto/ block/ grsecurity/
4655 VMLINUX_MAIN += $(patsubst %/, %/lib.a, $(libs-y)) $(libs-y)
4656 VMLINUX_MAIN += $(drivers-y) $(net-y)
4657
4658diff --git a/arch/sparc/include/asm/atomic_32.h b/arch/sparc/include/asm/atomic_32.h
4659index 5c3c8b6..ba822fa 100644
4660--- a/arch/sparc/include/asm/atomic_32.h
4661+++ b/arch/sparc/include/asm/atomic_32.h
4662@@ -13,6 +13,8 @@
4663
4664 #include <linux/types.h>
4665
4666+#include <asm-generic/atomic64.h>
4667+
4668 #ifdef __KERNEL__
4669
4670 #include <asm/system.h>
4671diff --git a/arch/sparc/include/asm/atomic_64.h b/arch/sparc/include/asm/atomic_64.h
4672index 9f421df..b81fc12 100644
4673--- a/arch/sparc/include/asm/atomic_64.h
4674+++ b/arch/sparc/include/asm/atomic_64.h
4675@@ -14,18 +14,40 @@
4676 #define ATOMIC64_INIT(i) { (i) }
4677
4678 #define atomic_read(v) (*(volatile int *)&(v)->counter)
4679+static inline int atomic_read_unchecked(const atomic_unchecked_t *v)
4680+{
4681+ return v->counter;
4682+}
4683 #define atomic64_read(v) (*(volatile long *)&(v)->counter)
4684+static inline long atomic64_read_unchecked(const atomic64_unchecked_t *v)
4685+{
4686+ return v->counter;
4687+}
4688
4689 #define atomic_set(v, i) (((v)->counter) = i)
4690+static inline void atomic_set_unchecked(atomic_unchecked_t *v, int i)
4691+{
4692+ v->counter = i;
4693+}
4694 #define atomic64_set(v, i) (((v)->counter) = i)
4695+static inline void atomic64_set_unchecked(atomic64_unchecked_t *v, long i)
4696+{
4697+ v->counter = i;
4698+}
4699
4700 extern void atomic_add(int, atomic_t *);
4701+extern void atomic_add_unchecked(int, atomic_unchecked_t *);
4702 extern void atomic64_add(long, atomic64_t *);
4703+extern void atomic64_add_unchecked(long, atomic64_unchecked_t *);
4704 extern void atomic_sub(int, atomic_t *);
4705+extern void atomic_sub_unchecked(int, atomic_unchecked_t *);
4706 extern void atomic64_sub(long, atomic64_t *);
4707+extern void atomic64_sub_unchecked(long, atomic64_unchecked_t *);
4708
4709 extern int atomic_add_ret(int, atomic_t *);
4710+extern int atomic_add_ret_unchecked(int, atomic_unchecked_t *);
4711 extern long atomic64_add_ret(long, atomic64_t *);
4712+extern long atomic64_add_ret_unchecked(long, atomic64_unchecked_t *);
4713 extern int atomic_sub_ret(int, atomic_t *);
4714 extern long atomic64_sub_ret(long, atomic64_t *);
4715
4716@@ -33,13 +55,29 @@ extern long atomic64_sub_ret(long, atomic64_t *);
4717 #define atomic64_dec_return(v) atomic64_sub_ret(1, v)
4718
4719 #define atomic_inc_return(v) atomic_add_ret(1, v)
4720+static inline int atomic_inc_return_unchecked(atomic_unchecked_t *v)
4721+{
4722+ return atomic_add_ret_unchecked(1, v);
4723+}
4724 #define atomic64_inc_return(v) atomic64_add_ret(1, v)
4725+static inline long atomic64_inc_return_unchecked(atomic64_unchecked_t *v)
4726+{
4727+ return atomic64_add_ret_unchecked(1, v);
4728+}
4729
4730 #define atomic_sub_return(i, v) atomic_sub_ret(i, v)
4731 #define atomic64_sub_return(i, v) atomic64_sub_ret(i, v)
4732
4733 #define atomic_add_return(i, v) atomic_add_ret(i, v)
4734+static inline int atomic_add_return_unchecked(int i, atomic_unchecked_t *v)
4735+{
4736+ return atomic_add_ret_unchecked(i, v);
4737+}
4738 #define atomic64_add_return(i, v) atomic64_add_ret(i, v)
4739+static inline long atomic64_add_return_unchecked(long i, atomic64_unchecked_t *v)
4740+{
4741+ return atomic64_add_ret_unchecked(i, v);
4742+}
4743
4744 /*
4745 * atomic_inc_and_test - increment and test
4746@@ -50,6 +88,10 @@ extern long atomic64_sub_ret(long, atomic64_t *);
4747 * other cases.
4748 */
4749 #define atomic_inc_and_test(v) (atomic_inc_return(v) == 0)
4750+static inline int atomic_inc_and_test_unchecked(atomic_unchecked_t *v)
4751+{
4752+ return atomic_inc_return_unchecked(v) == 0;
4753+}
4754 #define atomic64_inc_and_test(v) (atomic64_inc_return(v) == 0)
4755
4756 #define atomic_sub_and_test(i, v) (atomic_sub_ret(i, v) == 0)
4757@@ -59,25 +101,60 @@ extern long atomic64_sub_ret(long, atomic64_t *);
4758 #define atomic64_dec_and_test(v) (atomic64_sub_ret(1, v) == 0)
4759
4760 #define atomic_inc(v) atomic_add(1, v)
4761+static inline void atomic_inc_unchecked(atomic_unchecked_t *v)
4762+{
4763+ atomic_add_unchecked(1, v);
4764+}
4765 #define atomic64_inc(v) atomic64_add(1, v)
4766+static inline void atomic64_inc_unchecked(atomic64_unchecked_t *v)
4767+{
4768+ atomic64_add_unchecked(1, v);
4769+}
4770
4771 #define atomic_dec(v) atomic_sub(1, v)
4772+static inline void atomic_dec_unchecked(atomic_unchecked_t *v)
4773+{
4774+ atomic_sub_unchecked(1, v);
4775+}
4776 #define atomic64_dec(v) atomic64_sub(1, v)
4777+static inline void atomic64_dec_unchecked(atomic64_unchecked_t *v)
4778+{
4779+ atomic64_sub_unchecked(1, v);
4780+}
4781
4782 #define atomic_add_negative(i, v) (atomic_add_ret(i, v) < 0)
4783 #define atomic64_add_negative(i, v) (atomic64_add_ret(i, v) < 0)
4784
4785 #define atomic_cmpxchg(v, o, n) (cmpxchg(&((v)->counter), (o), (n)))
4786+static inline int atomic_cmpxchg_unchecked(atomic_unchecked_t *v, int old, int new)
4787+{
4788+ return cmpxchg(&v->counter, old, new);
4789+}
4790 #define atomic_xchg(v, new) (xchg(&((v)->counter), new))
4791+static inline int atomic_xchg_unchecked(atomic_unchecked_t *v, int new)
4792+{
4793+ return xchg(&v->counter, new);
4794+}
4795
4796 static inline int __atomic_add_unless(atomic_t *v, int a, int u)
4797 {
4798- int c, old;
4799+ int c, old, new;
4800 c = atomic_read(v);
4801 for (;;) {
4802- if (unlikely(c == (u)))
4803+ if (unlikely(c == u))
4804 break;
4805- old = atomic_cmpxchg((v), c, c + (a));
4806+
4807+ asm volatile("addcc %2, %0, %0\n"
4808+
4809+#ifdef CONFIG_PAX_REFCOUNT
4810+ "tvs %%icc, 6\n"
4811+#endif
4812+
4813+ : "=r" (new)
4814+ : "0" (c), "ir" (a)
4815+ : "cc");
4816+
4817+ old = atomic_cmpxchg(v, c, new);
4818 if (likely(old == c))
4819 break;
4820 c = old;
4821@@ -89,20 +166,35 @@ static inline int __atomic_add_unless(atomic_t *v, int a, int u)
4822 #define atomic64_cmpxchg(v, o, n) \
4823 ((__typeof__((v)->counter))cmpxchg(&((v)->counter), (o), (n)))
4824 #define atomic64_xchg(v, new) (xchg(&((v)->counter), new))
4825+static inline long atomic64_xchg_unchecked(atomic64_unchecked_t *v, long new)
4826+{
4827+ return xchg(&v->counter, new);
4828+}
4829
4830 static inline long atomic64_add_unless(atomic64_t *v, long a, long u)
4831 {
4832- long c, old;
4833+ long c, old, new;
4834 c = atomic64_read(v);
4835 for (;;) {
4836- if (unlikely(c == (u)))
4837+ if (unlikely(c == u))
4838 break;
4839- old = atomic64_cmpxchg((v), c, c + (a));
4840+
4841+ asm volatile("addcc %2, %0, %0\n"
4842+
4843+#ifdef CONFIG_PAX_REFCOUNT
4844+ "tvs %%xcc, 6\n"
4845+#endif
4846+
4847+ : "=r" (new)
4848+ : "0" (c), "ir" (a)
4849+ : "cc");
4850+
4851+ old = atomic64_cmpxchg(v, c, new);
4852 if (likely(old == c))
4853 break;
4854 c = old;
4855 }
4856- return c != (u);
4857+ return c != u;
4858 }
4859
4860 #define atomic64_inc_not_zero(v) atomic64_add_unless((v), 1, 0)
4861diff --git a/arch/sparc/include/asm/cache.h b/arch/sparc/include/asm/cache.h
4862index 69358b5..9d0d492 100644
4863--- a/arch/sparc/include/asm/cache.h
4864+++ b/arch/sparc/include/asm/cache.h
4865@@ -7,10 +7,12 @@
4866 #ifndef _SPARC_CACHE_H
4867 #define _SPARC_CACHE_H
4868
4869+#include <linux/const.h>
4870+
4871 #define ARCH_SLAB_MINALIGN __alignof__(unsigned long long)
4872
4873 #define L1_CACHE_SHIFT 5
4874-#define L1_CACHE_BYTES 32
4875+#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT)
4876
4877 #ifdef CONFIG_SPARC32
4878 #define SMP_CACHE_BYTES_SHIFT 5
4879diff --git a/arch/sparc/include/asm/elf_32.h b/arch/sparc/include/asm/elf_32.h
4880index 4269ca6..e3da77f 100644
4881--- a/arch/sparc/include/asm/elf_32.h
4882+++ b/arch/sparc/include/asm/elf_32.h
4883@@ -114,6 +114,13 @@ typedef struct {
4884
4885 #define ELF_ET_DYN_BASE (TASK_UNMAPPED_BASE)
4886
4887+#ifdef CONFIG_PAX_ASLR
4888+#define PAX_ELF_ET_DYN_BASE 0x10000UL
4889+
4890+#define PAX_DELTA_MMAP_LEN 16
4891+#define PAX_DELTA_STACK_LEN 16
4892+#endif
4893+
4894 /* This yields a mask that user programs can use to figure out what
4895 instruction set this cpu supports. This can NOT be done in userspace
4896 on Sparc. */
4897diff --git a/arch/sparc/include/asm/elf_64.h b/arch/sparc/include/asm/elf_64.h
4898index 7df8b7f..4946269 100644
4899--- a/arch/sparc/include/asm/elf_64.h
4900+++ b/arch/sparc/include/asm/elf_64.h
4901@@ -180,6 +180,13 @@ typedef struct {
4902 #define ELF_ET_DYN_BASE 0x0000010000000000UL
4903 #define COMPAT_ELF_ET_DYN_BASE 0x0000000070000000UL
4904
4905+#ifdef CONFIG_PAX_ASLR
4906+#define PAX_ELF_ET_DYN_BASE (test_thread_flag(TIF_32BIT) ? 0x10000UL : 0x100000UL)
4907+
4908+#define PAX_DELTA_MMAP_LEN (test_thread_flag(TIF_32BIT) ? 14 : 28)
4909+#define PAX_DELTA_STACK_LEN (test_thread_flag(TIF_32BIT) ? 15 : 29)
4910+#endif
4911+
4912 extern unsigned long sparc64_elf_hwcap;
4913 #define ELF_HWCAP sparc64_elf_hwcap
4914
4915diff --git a/arch/sparc/include/asm/page_32.h b/arch/sparc/include/asm/page_32.h
4916index 156707b..aefa786 100644
4917--- a/arch/sparc/include/asm/page_32.h
4918+++ b/arch/sparc/include/asm/page_32.h
4919@@ -8,6 +8,8 @@
4920 #ifndef _SPARC_PAGE_H
4921 #define _SPARC_PAGE_H
4922
4923+#include <linux/const.h>
4924+
4925 #define PAGE_SHIFT 12
4926
4927 #ifndef __ASSEMBLY__
4928diff --git a/arch/sparc/include/asm/pgtable_32.h b/arch/sparc/include/asm/pgtable_32.h
4929index a790cc6..091ed94 100644
4930--- a/arch/sparc/include/asm/pgtable_32.h
4931+++ b/arch/sparc/include/asm/pgtable_32.h
4932@@ -45,6 +45,13 @@ BTFIXUPDEF_SIMM13(user_ptrs_per_pgd)
4933 BTFIXUPDEF_INT(page_none)
4934 BTFIXUPDEF_INT(page_copy)
4935 BTFIXUPDEF_INT(page_readonly)
4936+
4937+#ifdef CONFIG_PAX_PAGEEXEC
4938+BTFIXUPDEF_INT(page_shared_noexec)
4939+BTFIXUPDEF_INT(page_copy_noexec)
4940+BTFIXUPDEF_INT(page_readonly_noexec)
4941+#endif
4942+
4943 BTFIXUPDEF_INT(page_kernel)
4944
4945 #define PMD_SHIFT SUN4C_PMD_SHIFT
4946@@ -66,6 +73,16 @@ extern pgprot_t PAGE_SHARED;
4947 #define PAGE_COPY __pgprot(BTFIXUP_INT(page_copy))
4948 #define PAGE_READONLY __pgprot(BTFIXUP_INT(page_readonly))
4949
4950+#ifdef CONFIG_PAX_PAGEEXEC
4951+extern pgprot_t PAGE_SHARED_NOEXEC;
4952+# define PAGE_COPY_NOEXEC __pgprot(BTFIXUP_INT(page_copy_noexec))
4953+# define PAGE_READONLY_NOEXEC __pgprot(BTFIXUP_INT(page_readonly_noexec))
4954+#else
4955+# define PAGE_SHARED_NOEXEC PAGE_SHARED
4956+# define PAGE_COPY_NOEXEC PAGE_COPY
4957+# define PAGE_READONLY_NOEXEC PAGE_READONLY
4958+#endif
4959+
4960 extern unsigned long page_kernel;
4961
4962 #ifdef MODULE
4963diff --git a/arch/sparc/include/asm/pgtsrmmu.h b/arch/sparc/include/asm/pgtsrmmu.h
4964index f6ae2b2..b03ffc7 100644
4965--- a/arch/sparc/include/asm/pgtsrmmu.h
4966+++ b/arch/sparc/include/asm/pgtsrmmu.h
4967@@ -115,6 +115,13 @@
4968 SRMMU_EXEC | SRMMU_REF)
4969 #define SRMMU_PAGE_RDONLY __pgprot(SRMMU_VALID | SRMMU_CACHE | \
4970 SRMMU_EXEC | SRMMU_REF)
4971+
4972+#ifdef CONFIG_PAX_PAGEEXEC
4973+#define SRMMU_PAGE_SHARED_NOEXEC __pgprot(SRMMU_VALID | SRMMU_CACHE | SRMMU_WRITE | SRMMU_REF)
4974+#define SRMMU_PAGE_COPY_NOEXEC __pgprot(SRMMU_VALID | SRMMU_CACHE | SRMMU_REF)
4975+#define SRMMU_PAGE_RDONLY_NOEXEC __pgprot(SRMMU_VALID | SRMMU_CACHE | SRMMU_REF)
4976+#endif
4977+
4978 #define SRMMU_PAGE_KERNEL __pgprot(SRMMU_VALID | SRMMU_CACHE | SRMMU_PRIV | \
4979 SRMMU_DIRTY | SRMMU_REF)
4980
4981diff --git a/arch/sparc/include/asm/spinlock_64.h b/arch/sparc/include/asm/spinlock_64.h
4982index 9689176..63c18ea 100644
4983--- a/arch/sparc/include/asm/spinlock_64.h
4984+++ b/arch/sparc/include/asm/spinlock_64.h
4985@@ -92,14 +92,19 @@ static inline void arch_spin_lock_flags(arch_spinlock_t *lock, unsigned long fla
4986
4987 /* Multi-reader locks, these are much saner than the 32-bit Sparc ones... */
4988
4989-static void inline arch_read_lock(arch_rwlock_t *lock)
4990+static inline void arch_read_lock(arch_rwlock_t *lock)
4991 {
4992 unsigned long tmp1, tmp2;
4993
4994 __asm__ __volatile__ (
4995 "1: ldsw [%2], %0\n"
4996 " brlz,pn %0, 2f\n"
4997-"4: add %0, 1, %1\n"
4998+"4: addcc %0, 1, %1\n"
4999+
5000+#ifdef CONFIG_PAX_REFCOUNT
5001+" tvs %%icc, 6\n"
5002+#endif
5003+
5004 " cas [%2], %0, %1\n"
5005 " cmp %0, %1\n"
5006 " bne,pn %%icc, 1b\n"
5007@@ -112,10 +117,10 @@ static void inline arch_read_lock(arch_rwlock_t *lock)
5008 " .previous"
5009 : "=&r" (tmp1), "=&r" (tmp2)
5010 : "r" (lock)
5011- : "memory");
5012+ : "memory", "cc");
5013 }
5014
5015-static int inline arch_read_trylock(arch_rwlock_t *lock)
5016+static inline int arch_read_trylock(arch_rwlock_t *lock)
5017 {
5018 int tmp1, tmp2;
5019
5020@@ -123,7 +128,12 @@ static int inline arch_read_trylock(arch_rwlock_t *lock)
5021 "1: ldsw [%2], %0\n"
5022 " brlz,a,pn %0, 2f\n"
5023 " mov 0, %0\n"
5024-" add %0, 1, %1\n"
5025+" addcc %0, 1, %1\n"
5026+
5027+#ifdef CONFIG_PAX_REFCOUNT
5028+" tvs %%icc, 6\n"
5029+#endif
5030+
5031 " cas [%2], %0, %1\n"
5032 " cmp %0, %1\n"
5033 " bne,pn %%icc, 1b\n"
5034@@ -136,13 +146,18 @@ static int inline arch_read_trylock(arch_rwlock_t *lock)
5035 return tmp1;
5036 }
5037
5038-static void inline arch_read_unlock(arch_rwlock_t *lock)
5039+static inline void arch_read_unlock(arch_rwlock_t *lock)
5040 {
5041 unsigned long tmp1, tmp2;
5042
5043 __asm__ __volatile__(
5044 "1: lduw [%2], %0\n"
5045-" sub %0, 1, %1\n"
5046+" subcc %0, 1, %1\n"
5047+
5048+#ifdef CONFIG_PAX_REFCOUNT
5049+" tvs %%icc, 6\n"
5050+#endif
5051+
5052 " cas [%2], %0, %1\n"
5053 " cmp %0, %1\n"
5054 " bne,pn %%xcc, 1b\n"
5055@@ -152,7 +167,7 @@ static void inline arch_read_unlock(arch_rwlock_t *lock)
5056 : "memory");
5057 }
5058
5059-static void inline arch_write_lock(arch_rwlock_t *lock)
5060+static inline void arch_write_lock(arch_rwlock_t *lock)
5061 {
5062 unsigned long mask, tmp1, tmp2;
5063
5064@@ -177,7 +192,7 @@ static void inline arch_write_lock(arch_rwlock_t *lock)
5065 : "memory");
5066 }
5067
5068-static void inline arch_write_unlock(arch_rwlock_t *lock)
5069+static inline void arch_write_unlock(arch_rwlock_t *lock)
5070 {
5071 __asm__ __volatile__(
5072 " stw %%g0, [%0]"
5073@@ -186,7 +201,7 @@ static void inline arch_write_unlock(arch_rwlock_t *lock)
5074 : "memory");
5075 }
5076
5077-static int inline arch_write_trylock(arch_rwlock_t *lock)
5078+static inline int arch_write_trylock(arch_rwlock_t *lock)
5079 {
5080 unsigned long mask, tmp1, tmp2, result;
5081
5082diff --git a/arch/sparc/include/asm/thread_info_32.h b/arch/sparc/include/asm/thread_info_32.h
5083index fa57532..e1a4c53 100644
5084--- a/arch/sparc/include/asm/thread_info_32.h
5085+++ b/arch/sparc/include/asm/thread_info_32.h
5086@@ -50,6 +50,8 @@ struct thread_info {
5087 unsigned long w_saved;
5088
5089 struct restart_block restart_block;
5090+
5091+ unsigned long lowest_stack;
5092 };
5093
5094 /*
5095diff --git a/arch/sparc/include/asm/thread_info_64.h b/arch/sparc/include/asm/thread_info_64.h
5096index 60d86be..952dea1 100644
5097--- a/arch/sparc/include/asm/thread_info_64.h
5098+++ b/arch/sparc/include/asm/thread_info_64.h
5099@@ -63,6 +63,8 @@ struct thread_info {
5100 struct pt_regs *kern_una_regs;
5101 unsigned int kern_una_insn;
5102
5103+ unsigned long lowest_stack;
5104+
5105 unsigned long fpregs[0] __attribute__ ((aligned(64)));
5106 };
5107
5108diff --git a/arch/sparc/include/asm/uaccess.h b/arch/sparc/include/asm/uaccess.h
5109index e88fbe5..96b0ce5 100644
5110--- a/arch/sparc/include/asm/uaccess.h
5111+++ b/arch/sparc/include/asm/uaccess.h
5112@@ -1,5 +1,13 @@
5113 #ifndef ___ASM_SPARC_UACCESS_H
5114 #define ___ASM_SPARC_UACCESS_H
5115+
5116+#ifdef __KERNEL__
5117+#ifndef __ASSEMBLY__
5118+#include <linux/types.h>
5119+extern void check_object_size(const void *ptr, unsigned long n, bool to);
5120+#endif
5121+#endif
5122+
5123 #if defined(__sparc__) && defined(__arch64__)
5124 #include <asm/uaccess_64.h>
5125 #else
5126diff --git a/arch/sparc/include/asm/uaccess_32.h b/arch/sparc/include/asm/uaccess_32.h
5127index 8303ac4..07f333d 100644
5128--- a/arch/sparc/include/asm/uaccess_32.h
5129+++ b/arch/sparc/include/asm/uaccess_32.h
5130@@ -249,27 +249,46 @@ extern unsigned long __copy_user(void __user *to, const void __user *from, unsig
5131
5132 static inline unsigned long copy_to_user(void __user *to, const void *from, unsigned long n)
5133 {
5134- if (n && __access_ok((unsigned long) to, n))
5135+ if ((long)n < 0)
5136+ return n;
5137+
5138+ if (n && __access_ok((unsigned long) to, n)) {
5139+ if (!__builtin_constant_p(n))
5140+ check_object_size(from, n, true);
5141 return __copy_user(to, (__force void __user *) from, n);
5142- else
5143+ } else
5144 return n;
5145 }
5146
5147 static inline unsigned long __copy_to_user(void __user *to, const void *from, unsigned long n)
5148 {
5149+ if ((long)n < 0)
5150+ return n;
5151+
5152+ if (!__builtin_constant_p(n))
5153+ check_object_size(from, n, true);
5154+
5155 return __copy_user(to, (__force void __user *) from, n);
5156 }
5157
5158 static inline unsigned long copy_from_user(void *to, const void __user *from, unsigned long n)
5159 {
5160- if (n && __access_ok((unsigned long) from, n))
5161+ if ((long)n < 0)
5162+ return n;
5163+
5164+ if (n && __access_ok((unsigned long) from, n)) {
5165+ if (!__builtin_constant_p(n))
5166+ check_object_size(to, n, false);
5167 return __copy_user((__force void __user *) to, from, n);
5168- else
5169+ } else
5170 return n;
5171 }
5172
5173 static inline unsigned long __copy_from_user(void *to, const void __user *from, unsigned long n)
5174 {
5175+ if ((long)n < 0)
5176+ return n;
5177+
5178 return __copy_user((__force void __user *) to, from, n);
5179 }
5180
5181diff --git a/arch/sparc/include/asm/uaccess_64.h b/arch/sparc/include/asm/uaccess_64.h
5182index 3e1449f..5293a0e 100644
5183--- a/arch/sparc/include/asm/uaccess_64.h
5184+++ b/arch/sparc/include/asm/uaccess_64.h
5185@@ -10,6 +10,7 @@
5186 #include <linux/compiler.h>
5187 #include <linux/string.h>
5188 #include <linux/thread_info.h>
5189+#include <linux/kernel.h>
5190 #include <asm/asi.h>
5191 #include <asm/system.h>
5192 #include <asm/spitfire.h>
5193@@ -213,8 +214,15 @@ extern unsigned long copy_from_user_fixup(void *to, const void __user *from,
5194 static inline unsigned long __must_check
5195 copy_from_user(void *to, const void __user *from, unsigned long size)
5196 {
5197- unsigned long ret = ___copy_from_user(to, from, size);
5198+ unsigned long ret;
5199
5200+ if ((long)size < 0 || size > INT_MAX)
5201+ return size;
5202+
5203+ if (!__builtin_constant_p(size))
5204+ check_object_size(to, size, false);
5205+
5206+ ret = ___copy_from_user(to, from, size);
5207 if (unlikely(ret))
5208 ret = copy_from_user_fixup(to, from, size);
5209
5210@@ -230,8 +238,15 @@ extern unsigned long copy_to_user_fixup(void __user *to, const void *from,
5211 static inline unsigned long __must_check
5212 copy_to_user(void __user *to, const void *from, unsigned long size)
5213 {
5214- unsigned long ret = ___copy_to_user(to, from, size);
5215+ unsigned long ret;
5216
5217+ if ((long)size < 0 || size > INT_MAX)
5218+ return size;
5219+
5220+ if (!__builtin_constant_p(size))
5221+ check_object_size(from, size, true);
5222+
5223+ ret = ___copy_to_user(to, from, size);
5224 if (unlikely(ret))
5225 ret = copy_to_user_fixup(to, from, size);
5226 return ret;
5227diff --git a/arch/sparc/kernel/Makefile b/arch/sparc/kernel/Makefile
5228index cb85458..e063f17 100644
5229--- a/arch/sparc/kernel/Makefile
5230+++ b/arch/sparc/kernel/Makefile
5231@@ -3,7 +3,7 @@
5232 #
5233
5234 asflags-y := -ansi
5235-ccflags-y := -Werror
5236+#ccflags-y := -Werror
5237
5238 extra-y := head_$(BITS).o
5239 extra-y += init_task.o
5240diff --git a/arch/sparc/kernel/process_32.c b/arch/sparc/kernel/process_32.c
5241index f793742..4d880af 100644
5242--- a/arch/sparc/kernel/process_32.c
5243+++ b/arch/sparc/kernel/process_32.c
5244@@ -204,7 +204,7 @@ void __show_backtrace(unsigned long fp)
5245 rw->ins[4], rw->ins[5],
5246 rw->ins[6],
5247 rw->ins[7]);
5248- printk("%pS\n", (void *) rw->ins[7]);
5249+ printk("%pA\n", (void *) rw->ins[7]);
5250 rw = (struct reg_window32 *) rw->ins[6];
5251 }
5252 spin_unlock_irqrestore(&sparc_backtrace_lock, flags);
5253@@ -271,14 +271,14 @@ void show_regs(struct pt_regs *r)
5254
5255 printk("PSR: %08lx PC: %08lx NPC: %08lx Y: %08lx %s\n",
5256 r->psr, r->pc, r->npc, r->y, print_tainted());
5257- printk("PC: <%pS>\n", (void *) r->pc);
5258+ printk("PC: <%pA>\n", (void *) r->pc);
5259 printk("%%G: %08lx %08lx %08lx %08lx %08lx %08lx %08lx %08lx\n",
5260 r->u_regs[0], r->u_regs[1], r->u_regs[2], r->u_regs[3],
5261 r->u_regs[4], r->u_regs[5], r->u_regs[6], r->u_regs[7]);
5262 printk("%%O: %08lx %08lx %08lx %08lx %08lx %08lx %08lx %08lx\n",
5263 r->u_regs[8], r->u_regs[9], r->u_regs[10], r->u_regs[11],
5264 r->u_regs[12], r->u_regs[13], r->u_regs[14], r->u_regs[15]);
5265- printk("RPC: <%pS>\n", (void *) r->u_regs[15]);
5266+ printk("RPC: <%pA>\n", (void *) r->u_regs[15]);
5267
5268 printk("%%L: %08lx %08lx %08lx %08lx %08lx %08lx %08lx %08lx\n",
5269 rw->locals[0], rw->locals[1], rw->locals[2], rw->locals[3],
5270@@ -313,7 +313,7 @@ void show_stack(struct task_struct *tsk, unsigned long *_ksp)
5271 rw = (struct reg_window32 *) fp;
5272 pc = rw->ins[7];
5273 printk("[%08lx : ", pc);
5274- printk("%pS ] ", (void *) pc);
5275+ printk("%pA ] ", (void *) pc);
5276 fp = rw->ins[6];
5277 } while (++count < 16);
5278 printk("\n");
5279diff --git a/arch/sparc/kernel/process_64.c b/arch/sparc/kernel/process_64.c
5280index 3739a06..48b2ff0 100644
5281--- a/arch/sparc/kernel/process_64.c
5282+++ b/arch/sparc/kernel/process_64.c
5283@@ -180,14 +180,14 @@ static void show_regwindow(struct pt_regs *regs)
5284 printk("i4: %016lx i5: %016lx i6: %016lx i7: %016lx\n",
5285 rwk->ins[4], rwk->ins[5], rwk->ins[6], rwk->ins[7]);
5286 if (regs->tstate & TSTATE_PRIV)
5287- printk("I7: <%pS>\n", (void *) rwk->ins[7]);
5288+ printk("I7: <%pA>\n", (void *) rwk->ins[7]);
5289 }
5290
5291 void show_regs(struct pt_regs *regs)
5292 {
5293 printk("TSTATE: %016lx TPC: %016lx TNPC: %016lx Y: %08x %s\n", regs->tstate,
5294 regs->tpc, regs->tnpc, regs->y, print_tainted());
5295- printk("TPC: <%pS>\n", (void *) regs->tpc);
5296+ printk("TPC: <%pA>\n", (void *) regs->tpc);
5297 printk("g0: %016lx g1: %016lx g2: %016lx g3: %016lx\n",
5298 regs->u_regs[0], regs->u_regs[1], regs->u_regs[2],
5299 regs->u_regs[3]);
5300@@ -200,7 +200,7 @@ void show_regs(struct pt_regs *regs)
5301 printk("o4: %016lx o5: %016lx sp: %016lx ret_pc: %016lx\n",
5302 regs->u_regs[12], regs->u_regs[13], regs->u_regs[14],
5303 regs->u_regs[15]);
5304- printk("RPC: <%pS>\n", (void *) regs->u_regs[15]);
5305+ printk("RPC: <%pA>\n", (void *) regs->u_regs[15]);
5306 show_regwindow(regs);
5307 show_stack(current, (unsigned long *) regs->u_regs[UREG_FP]);
5308 }
5309@@ -285,7 +285,7 @@ void arch_trigger_all_cpu_backtrace(void)
5310 ((tp && tp->task) ? tp->task->pid : -1));
5311
5312 if (gp->tstate & TSTATE_PRIV) {
5313- printk(" TPC[%pS] O7[%pS] I7[%pS] RPC[%pS]\n",
5314+ printk(" TPC[%pA] O7[%pA] I7[%pA] RPC[%pA]\n",
5315 (void *) gp->tpc,
5316 (void *) gp->o7,
5317 (void *) gp->i7,
5318diff --git a/arch/sparc/kernel/sys_sparc_32.c b/arch/sparc/kernel/sys_sparc_32.c
5319index 42b282f..28ce9f2 100644
5320--- a/arch/sparc/kernel/sys_sparc_32.c
5321+++ b/arch/sparc/kernel/sys_sparc_32.c
5322@@ -56,7 +56,7 @@ unsigned long arch_get_unmapped_area(struct file *filp, unsigned long addr, unsi
5323 if (ARCH_SUN4C && len > 0x20000000)
5324 return -ENOMEM;
5325 if (!addr)
5326- addr = TASK_UNMAPPED_BASE;
5327+ addr = current->mm->mmap_base;
5328
5329 if (flags & MAP_SHARED)
5330 addr = COLOUR_ALIGN(addr);
5331@@ -71,7 +71,7 @@ unsigned long arch_get_unmapped_area(struct file *filp, unsigned long addr, unsi
5332 }
5333 if (TASK_SIZE - PAGE_SIZE - len < addr)
5334 return -ENOMEM;
5335- if (!vmm || addr + len <= vmm->vm_start)
5336+ if (check_heap_stack_gap(vmm, addr, len))
5337 return addr;
5338 addr = vmm->vm_end;
5339 if (flags & MAP_SHARED)
5340diff --git a/arch/sparc/kernel/sys_sparc_64.c b/arch/sparc/kernel/sys_sparc_64.c
5341index 441521a..b767073 100644
5342--- a/arch/sparc/kernel/sys_sparc_64.c
5343+++ b/arch/sparc/kernel/sys_sparc_64.c
5344@@ -124,7 +124,7 @@ unsigned long arch_get_unmapped_area(struct file *filp, unsigned long addr, unsi
5345 /* We do not accept a shared mapping if it would violate
5346 * cache aliasing constraints.
5347 */
5348- if ((flags & MAP_SHARED) &&
5349+ if ((filp || (flags & MAP_SHARED)) &&
5350 ((addr - (pgoff << PAGE_SHIFT)) & (SHMLBA - 1)))
5351 return -EINVAL;
5352 return addr;
5353@@ -139,6 +139,10 @@ unsigned long arch_get_unmapped_area(struct file *filp, unsigned long addr, unsi
5354 if (filp || (flags & MAP_SHARED))
5355 do_color_align = 1;
5356
5357+#ifdef CONFIG_PAX_RANDMMAP
5358+ if (!(mm->pax_flags & MF_PAX_RANDMMAP))
5359+#endif
5360+
5361 if (addr) {
5362 if (do_color_align)
5363 addr = COLOUR_ALIGN(addr, pgoff);
5364@@ -146,15 +150,14 @@ unsigned long arch_get_unmapped_area(struct file *filp, unsigned long addr, unsi
5365 addr = PAGE_ALIGN(addr);
5366
5367 vma = find_vma(mm, addr);
5368- if (task_size - len >= addr &&
5369- (!vma || addr + len <= vma->vm_start))
5370+ if (task_size - len >= addr && check_heap_stack_gap(vma, addr, len))
5371 return addr;
5372 }
5373
5374 if (len > mm->cached_hole_size) {
5375- start_addr = addr = mm->free_area_cache;
5376+ start_addr = addr = mm->free_area_cache;
5377 } else {
5378- start_addr = addr = TASK_UNMAPPED_BASE;
5379+ start_addr = addr = mm->mmap_base;
5380 mm->cached_hole_size = 0;
5381 }
5382
5383@@ -174,14 +177,14 @@ full_search:
5384 vma = find_vma(mm, VA_EXCLUDE_END);
5385 }
5386 if (unlikely(task_size < addr)) {
5387- if (start_addr != TASK_UNMAPPED_BASE) {
5388- start_addr = addr = TASK_UNMAPPED_BASE;
5389+ if (start_addr != mm->mmap_base) {
5390+ start_addr = addr = mm->mmap_base;
5391 mm->cached_hole_size = 0;
5392 goto full_search;
5393 }
5394 return -ENOMEM;
5395 }
5396- if (likely(!vma || addr + len <= vma->vm_start)) {
5397+ if (likely(check_heap_stack_gap(vma, addr, len))) {
5398 /*
5399 * Remember the place where we stopped the search:
5400 */
5401@@ -215,7 +218,7 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
5402 /* We do not accept a shared mapping if it would violate
5403 * cache aliasing constraints.
5404 */
5405- if ((flags & MAP_SHARED) &&
5406+ if ((filp || (flags & MAP_SHARED)) &&
5407 ((addr - (pgoff << PAGE_SHIFT)) & (SHMLBA - 1)))
5408 return -EINVAL;
5409 return addr;
5410@@ -236,8 +239,7 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
5411 addr = PAGE_ALIGN(addr);
5412
5413 vma = find_vma(mm, addr);
5414- if (task_size - len >= addr &&
5415- (!vma || addr + len <= vma->vm_start))
5416+ if (task_size - len >= addr && check_heap_stack_gap(vma, addr, len))
5417 return addr;
5418 }
5419
5420@@ -258,7 +260,7 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
5421 /* make sure it can fit in the remaining address space */
5422 if (likely(addr > len)) {
5423 vma = find_vma(mm, addr-len);
5424- if (!vma || addr <= vma->vm_start) {
5425+ if (check_heap_stack_gap(vma, addr - len, len)) {
5426 /* remember the address as a hint for next time */
5427 return (mm->free_area_cache = addr-len);
5428 }
5429@@ -267,18 +269,18 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
5430 if (unlikely(mm->mmap_base < len))
5431 goto bottomup;
5432
5433- addr = mm->mmap_base-len;
5434- if (do_color_align)
5435- addr = COLOUR_ALIGN_DOWN(addr, pgoff);
5436+ addr = mm->mmap_base - len;
5437
5438 do {
5439+ if (do_color_align)
5440+ addr = COLOUR_ALIGN_DOWN(addr, pgoff);
5441 /*
5442 * Lookup failure means no vma is above this address,
5443 * else if new region fits below vma->vm_start,
5444 * return with success:
5445 */
5446 vma = find_vma(mm, addr);
5447- if (likely(!vma || addr+len <= vma->vm_start)) {
5448+ if (likely(check_heap_stack_gap(vma, addr, len))) {
5449 /* remember the address as a hint for next time */
5450 return (mm->free_area_cache = addr);
5451 }
5452@@ -288,10 +290,8 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
5453 mm->cached_hole_size = vma->vm_start - addr;
5454
5455 /* try just below the current vma->vm_start */
5456- addr = vma->vm_start-len;
5457- if (do_color_align)
5458- addr = COLOUR_ALIGN_DOWN(addr, pgoff);
5459- } while (likely(len < vma->vm_start));
5460+ addr = skip_heap_stack_gap(vma, len);
5461+ } while (!IS_ERR_VALUE(addr));
5462
5463 bottomup:
5464 /*
5465@@ -390,6 +390,12 @@ void arch_pick_mmap_layout(struct mm_struct *mm)
5466 gap == RLIM_INFINITY ||
5467 sysctl_legacy_va_layout) {
5468 mm->mmap_base = TASK_UNMAPPED_BASE + random_factor;
5469+
5470+#ifdef CONFIG_PAX_RANDMMAP
5471+ if (mm->pax_flags & MF_PAX_RANDMMAP)
5472+ mm->mmap_base += mm->delta_mmap;
5473+#endif
5474+
5475 mm->get_unmapped_area = arch_get_unmapped_area;
5476 mm->unmap_area = arch_unmap_area;
5477 } else {
5478@@ -402,6 +408,12 @@ void arch_pick_mmap_layout(struct mm_struct *mm)
5479 gap = (task_size / 6 * 5);
5480
5481 mm->mmap_base = PAGE_ALIGN(task_size - gap - random_factor);
5482+
5483+#ifdef CONFIG_PAX_RANDMMAP
5484+ if (mm->pax_flags & MF_PAX_RANDMMAP)
5485+ mm->mmap_base -= mm->delta_mmap + mm->delta_stack;
5486+#endif
5487+
5488 mm->get_unmapped_area = arch_get_unmapped_area_topdown;
5489 mm->unmap_area = arch_unmap_area_topdown;
5490 }
5491diff --git a/arch/sparc/kernel/traps_32.c b/arch/sparc/kernel/traps_32.c
5492index 591f20c..0f1b925 100644
5493--- a/arch/sparc/kernel/traps_32.c
5494+++ b/arch/sparc/kernel/traps_32.c
5495@@ -45,6 +45,8 @@ static void instruction_dump(unsigned long *pc)
5496 #define __SAVE __asm__ __volatile__("save %sp, -0x40, %sp\n\t")
5497 #define __RESTORE __asm__ __volatile__("restore %g0, %g0, %g0\n\t")
5498
5499+extern void gr_handle_kernel_exploit(void);
5500+
5501 void die_if_kernel(char *str, struct pt_regs *regs)
5502 {
5503 static int die_counter;
5504@@ -77,15 +79,17 @@ void die_if_kernel(char *str, struct pt_regs *regs)
5505 count++ < 30 &&
5506 (((unsigned long) rw) >= PAGE_OFFSET) &&
5507 !(((unsigned long) rw) & 0x7)) {
5508- printk("Caller[%08lx]: %pS\n", rw->ins[7],
5509+ printk("Caller[%08lx]: %pA\n", rw->ins[7],
5510 (void *) rw->ins[7]);
5511 rw = (struct reg_window32 *)rw->ins[6];
5512 }
5513 }
5514 printk("Instruction DUMP:");
5515 instruction_dump ((unsigned long *) regs->pc);
5516- if(regs->psr & PSR_PS)
5517+ if(regs->psr & PSR_PS) {
5518+ gr_handle_kernel_exploit();
5519 do_exit(SIGKILL);
5520+ }
5521 do_exit(SIGSEGV);
5522 }
5523
5524diff --git a/arch/sparc/kernel/traps_64.c b/arch/sparc/kernel/traps_64.c
5525index 0cbdaa4..438e4c9 100644
5526--- a/arch/sparc/kernel/traps_64.c
5527+++ b/arch/sparc/kernel/traps_64.c
5528@@ -75,7 +75,7 @@ static void dump_tl1_traplog(struct tl1_traplog *p)
5529 i + 1,
5530 p->trapstack[i].tstate, p->trapstack[i].tpc,
5531 p->trapstack[i].tnpc, p->trapstack[i].tt);
5532- printk("TRAPLOG: TPC<%pS>\n", (void *) p->trapstack[i].tpc);
5533+ printk("TRAPLOG: TPC<%pA>\n", (void *) p->trapstack[i].tpc);
5534 }
5535 }
5536
5537@@ -95,6 +95,12 @@ void bad_trap(struct pt_regs *regs, long lvl)
5538
5539 lvl -= 0x100;
5540 if (regs->tstate & TSTATE_PRIV) {
5541+
5542+#ifdef CONFIG_PAX_REFCOUNT
5543+ if (lvl == 6)
5544+ pax_report_refcount_overflow(regs);
5545+#endif
5546+
5547 sprintf(buffer, "Kernel bad sw trap %lx", lvl);
5548 die_if_kernel(buffer, regs);
5549 }
5550@@ -113,11 +119,16 @@ void bad_trap(struct pt_regs *regs, long lvl)
5551 void bad_trap_tl1(struct pt_regs *regs, long lvl)
5552 {
5553 char buffer[32];
5554-
5555+
5556 if (notify_die(DIE_TRAP_TL1, "bad trap tl1", regs,
5557 0, lvl, SIGTRAP) == NOTIFY_STOP)
5558 return;
5559
5560+#ifdef CONFIG_PAX_REFCOUNT
5561+ if (lvl == 6)
5562+ pax_report_refcount_overflow(regs);
5563+#endif
5564+
5565 dump_tl1_traplog((struct tl1_traplog *)(regs + 1));
5566
5567 sprintf (buffer, "Bad trap %lx at tl>0", lvl);
5568@@ -1141,7 +1152,7 @@ static void cheetah_log_errors(struct pt_regs *regs, struct cheetah_err_info *in
5569 regs->tpc, regs->tnpc, regs->u_regs[UREG_I7], regs->tstate);
5570 printk("%s" "ERROR(%d): ",
5571 (recoverable ? KERN_WARNING : KERN_CRIT), smp_processor_id());
5572- printk("TPC<%pS>\n", (void *) regs->tpc);
5573+ printk("TPC<%pA>\n", (void *) regs->tpc);
5574 printk("%s" "ERROR(%d): M_SYND(%lx), E_SYND(%lx)%s%s\n",
5575 (recoverable ? KERN_WARNING : KERN_CRIT), smp_processor_id(),
5576 (afsr & CHAFSR_M_SYNDROME) >> CHAFSR_M_SYNDROME_SHIFT,
5577@@ -1748,7 +1759,7 @@ void cheetah_plus_parity_error(int type, struct pt_regs *regs)
5578 smp_processor_id(),
5579 (type & 0x1) ? 'I' : 'D',
5580 regs->tpc);
5581- printk(KERN_EMERG "TPC<%pS>\n", (void *) regs->tpc);
5582+ printk(KERN_EMERG "TPC<%pA>\n", (void *) regs->tpc);
5583 panic("Irrecoverable Cheetah+ parity error.");
5584 }
5585
5586@@ -1756,7 +1767,7 @@ void cheetah_plus_parity_error(int type, struct pt_regs *regs)
5587 smp_processor_id(),
5588 (type & 0x1) ? 'I' : 'D',
5589 regs->tpc);
5590- printk(KERN_WARNING "TPC<%pS>\n", (void *) regs->tpc);
5591+ printk(KERN_WARNING "TPC<%pA>\n", (void *) regs->tpc);
5592 }
5593
5594 struct sun4v_error_entry {
5595@@ -1963,9 +1974,9 @@ void sun4v_itlb_error_report(struct pt_regs *regs, int tl)
5596
5597 printk(KERN_EMERG "SUN4V-ITLB: Error at TPC[%lx], tl %d\n",
5598 regs->tpc, tl);
5599- printk(KERN_EMERG "SUN4V-ITLB: TPC<%pS>\n", (void *) regs->tpc);
5600+ printk(KERN_EMERG "SUN4V-ITLB: TPC<%pA>\n", (void *) regs->tpc);
5601 printk(KERN_EMERG "SUN4V-ITLB: O7[%lx]\n", regs->u_regs[UREG_I7]);
5602- printk(KERN_EMERG "SUN4V-ITLB: O7<%pS>\n",
5603+ printk(KERN_EMERG "SUN4V-ITLB: O7<%pA>\n",
5604 (void *) regs->u_regs[UREG_I7]);
5605 printk(KERN_EMERG "SUN4V-ITLB: vaddr[%lx] ctx[%lx] "
5606 "pte[%lx] error[%lx]\n",
5607@@ -1987,9 +1998,9 @@ void sun4v_dtlb_error_report(struct pt_regs *regs, int tl)
5608
5609 printk(KERN_EMERG "SUN4V-DTLB: Error at TPC[%lx], tl %d\n",
5610 regs->tpc, tl);
5611- printk(KERN_EMERG "SUN4V-DTLB: TPC<%pS>\n", (void *) regs->tpc);
5612+ printk(KERN_EMERG "SUN4V-DTLB: TPC<%pA>\n", (void *) regs->tpc);
5613 printk(KERN_EMERG "SUN4V-DTLB: O7[%lx]\n", regs->u_regs[UREG_I7]);
5614- printk(KERN_EMERG "SUN4V-DTLB: O7<%pS>\n",
5615+ printk(KERN_EMERG "SUN4V-DTLB: O7<%pA>\n",
5616 (void *) regs->u_regs[UREG_I7]);
5617 printk(KERN_EMERG "SUN4V-DTLB: vaddr[%lx] ctx[%lx] "
5618 "pte[%lx] error[%lx]\n",
5619@@ -2195,13 +2206,13 @@ void show_stack(struct task_struct *tsk, unsigned long *_ksp)
5620 fp = (unsigned long)sf->fp + STACK_BIAS;
5621 }
5622
5623- printk(" [%016lx] %pS\n", pc, (void *) pc);
5624+ printk(" [%016lx] %pA\n", pc, (void *) pc);
5625 #ifdef CONFIG_FUNCTION_GRAPH_TRACER
5626 if ((pc + 8UL) == (unsigned long) &return_to_handler) {
5627 int index = tsk->curr_ret_stack;
5628 if (tsk->ret_stack && index >= graph) {
5629 pc = tsk->ret_stack[index - graph].ret;
5630- printk(" [%016lx] %pS\n", pc, (void *) pc);
5631+ printk(" [%016lx] %pA\n", pc, (void *) pc);
5632 graph++;
5633 }
5634 }
5635@@ -2226,6 +2237,8 @@ static inline struct reg_window *kernel_stack_up(struct reg_window *rw)
5636 return (struct reg_window *) (fp + STACK_BIAS);
5637 }
5638
5639+extern void gr_handle_kernel_exploit(void);
5640+
5641 void die_if_kernel(char *str, struct pt_regs *regs)
5642 {
5643 static int die_counter;
5644@@ -2254,7 +2267,7 @@ void die_if_kernel(char *str, struct pt_regs *regs)
5645 while (rw &&
5646 count++ < 30 &&
5647 kstack_valid(tp, (unsigned long) rw)) {
5648- printk("Caller[%016lx]: %pS\n", rw->ins[7],
5649+ printk("Caller[%016lx]: %pA\n", rw->ins[7],
5650 (void *) rw->ins[7]);
5651
5652 rw = kernel_stack_up(rw);
5653@@ -2267,8 +2280,10 @@ void die_if_kernel(char *str, struct pt_regs *regs)
5654 }
5655 user_instruction_dump ((unsigned int __user *) regs->tpc);
5656 }
5657- if (regs->tstate & TSTATE_PRIV)
5658+ if (regs->tstate & TSTATE_PRIV) {
5659+ gr_handle_kernel_exploit();
5660 do_exit(SIGKILL);
5661+ }
5662 do_exit(SIGSEGV);
5663 }
5664 EXPORT_SYMBOL(die_if_kernel);
5665diff --git a/arch/sparc/kernel/unaligned_64.c b/arch/sparc/kernel/unaligned_64.c
5666index 76e4ac1..78f8bb1 100644
5667--- a/arch/sparc/kernel/unaligned_64.c
5668+++ b/arch/sparc/kernel/unaligned_64.c
5669@@ -279,7 +279,7 @@ static void log_unaligned(struct pt_regs *regs)
5670 static DEFINE_RATELIMIT_STATE(ratelimit, 5 * HZ, 5);
5671
5672 if (__ratelimit(&ratelimit)) {
5673- printk("Kernel unaligned access at TPC[%lx] %pS\n",
5674+ printk("Kernel unaligned access at TPC[%lx] %pA\n",
5675 regs->tpc, (void *) regs->tpc);
5676 }
5677 }
5678diff --git a/arch/sparc/lib/Makefile b/arch/sparc/lib/Makefile
5679index a3fc437..fea9957 100644
5680--- a/arch/sparc/lib/Makefile
5681+++ b/arch/sparc/lib/Makefile
5682@@ -2,7 +2,7 @@
5683 #
5684
5685 asflags-y := -ansi -DST_DIV0=0x02
5686-ccflags-y := -Werror
5687+#ccflags-y := -Werror
5688
5689 lib-$(CONFIG_SPARC32) += mul.o rem.o sdiv.o udiv.o umul.o urem.o ashrdi3.o
5690 lib-$(CONFIG_SPARC32) += memcpy.o memset.o
5691diff --git a/arch/sparc/lib/atomic_64.S b/arch/sparc/lib/atomic_64.S
5692index 59186e0..f747d7a 100644
5693--- a/arch/sparc/lib/atomic_64.S
5694+++ b/arch/sparc/lib/atomic_64.S
5695@@ -18,7 +18,12 @@
5696 atomic_add: /* %o0 = increment, %o1 = atomic_ptr */
5697 BACKOFF_SETUP(%o2)
5698 1: lduw [%o1], %g1
5699- add %g1, %o0, %g7
5700+ addcc %g1, %o0, %g7
5701+
5702+#ifdef CONFIG_PAX_REFCOUNT
5703+ tvs %icc, 6
5704+#endif
5705+
5706 cas [%o1], %g1, %g7
5707 cmp %g1, %g7
5708 bne,pn %icc, BACKOFF_LABEL(2f, 1b)
5709@@ -28,12 +33,32 @@ atomic_add: /* %o0 = increment, %o1 = atomic_ptr */
5710 2: BACKOFF_SPIN(%o2, %o3, 1b)
5711 .size atomic_add, .-atomic_add
5712
5713+ .globl atomic_add_unchecked
5714+ .type atomic_add_unchecked,#function
5715+atomic_add_unchecked: /* %o0 = increment, %o1 = atomic_ptr */
5716+ BACKOFF_SETUP(%o2)
5717+1: lduw [%o1], %g1
5718+ add %g1, %o0, %g7
5719+ cas [%o1], %g1, %g7
5720+ cmp %g1, %g7
5721+ bne,pn %icc, 2f
5722+ nop
5723+ retl
5724+ nop
5725+2: BACKOFF_SPIN(%o2, %o3, 1b)
5726+ .size atomic_add_unchecked, .-atomic_add_unchecked
5727+
5728 .globl atomic_sub
5729 .type atomic_sub,#function
5730 atomic_sub: /* %o0 = decrement, %o1 = atomic_ptr */
5731 BACKOFF_SETUP(%o2)
5732 1: lduw [%o1], %g1
5733- sub %g1, %o0, %g7
5734+ subcc %g1, %o0, %g7
5735+
5736+#ifdef CONFIG_PAX_REFCOUNT
5737+ tvs %icc, 6
5738+#endif
5739+
5740 cas [%o1], %g1, %g7
5741 cmp %g1, %g7
5742 bne,pn %icc, BACKOFF_LABEL(2f, 1b)
5743@@ -43,12 +68,32 @@ atomic_sub: /* %o0 = decrement, %o1 = atomic_ptr */
5744 2: BACKOFF_SPIN(%o2, %o3, 1b)
5745 .size atomic_sub, .-atomic_sub
5746
5747+ .globl atomic_sub_unchecked
5748+ .type atomic_sub_unchecked,#function
5749+atomic_sub_unchecked: /* %o0 = decrement, %o1 = atomic_ptr */
5750+ BACKOFF_SETUP(%o2)
5751+1: lduw [%o1], %g1
5752+ sub %g1, %o0, %g7
5753+ cas [%o1], %g1, %g7
5754+ cmp %g1, %g7
5755+ bne,pn %icc, 2f
5756+ nop
5757+ retl
5758+ nop
5759+2: BACKOFF_SPIN(%o2, %o3, 1b)
5760+ .size atomic_sub_unchecked, .-atomic_sub_unchecked
5761+
5762 .globl atomic_add_ret
5763 .type atomic_add_ret,#function
5764 atomic_add_ret: /* %o0 = increment, %o1 = atomic_ptr */
5765 BACKOFF_SETUP(%o2)
5766 1: lduw [%o1], %g1
5767- add %g1, %o0, %g7
5768+ addcc %g1, %o0, %g7
5769+
5770+#ifdef CONFIG_PAX_REFCOUNT
5771+ tvs %icc, 6
5772+#endif
5773+
5774 cas [%o1], %g1, %g7
5775 cmp %g1, %g7
5776 bne,pn %icc, BACKOFF_LABEL(2f, 1b)
5777@@ -58,12 +103,33 @@ atomic_add_ret: /* %o0 = increment, %o1 = atomic_ptr */
5778 2: BACKOFF_SPIN(%o2, %o3, 1b)
5779 .size atomic_add_ret, .-atomic_add_ret
5780
5781+ .globl atomic_add_ret_unchecked
5782+ .type atomic_add_ret_unchecked,#function
5783+atomic_add_ret_unchecked: /* %o0 = increment, %o1 = atomic_ptr */
5784+ BACKOFF_SETUP(%o2)
5785+1: lduw [%o1], %g1
5786+ addcc %g1, %o0, %g7
5787+ cas [%o1], %g1, %g7
5788+ cmp %g1, %g7
5789+ bne,pn %icc, 2f
5790+ add %g7, %o0, %g7
5791+ sra %g7, 0, %o0
5792+ retl
5793+ nop
5794+2: BACKOFF_SPIN(%o2, %o3, 1b)
5795+ .size atomic_add_ret_unchecked, .-atomic_add_ret_unchecked
5796+
5797 .globl atomic_sub_ret
5798 .type atomic_sub_ret,#function
5799 atomic_sub_ret: /* %o0 = decrement, %o1 = atomic_ptr */
5800 BACKOFF_SETUP(%o2)
5801 1: lduw [%o1], %g1
5802- sub %g1, %o0, %g7
5803+ subcc %g1, %o0, %g7
5804+
5805+#ifdef CONFIG_PAX_REFCOUNT
5806+ tvs %icc, 6
5807+#endif
5808+
5809 cas [%o1], %g1, %g7
5810 cmp %g1, %g7
5811 bne,pn %icc, BACKOFF_LABEL(2f, 1b)
5812@@ -78,7 +144,12 @@ atomic_sub_ret: /* %o0 = decrement, %o1 = atomic_ptr */
5813 atomic64_add: /* %o0 = increment, %o1 = atomic_ptr */
5814 BACKOFF_SETUP(%o2)
5815 1: ldx [%o1], %g1
5816- add %g1, %o0, %g7
5817+ addcc %g1, %o0, %g7
5818+
5819+#ifdef CONFIG_PAX_REFCOUNT
5820+ tvs %xcc, 6
5821+#endif
5822+
5823 casx [%o1], %g1, %g7
5824 cmp %g1, %g7
5825 bne,pn %xcc, BACKOFF_LABEL(2f, 1b)
5826@@ -88,12 +159,32 @@ atomic64_add: /* %o0 = increment, %o1 = atomic_ptr */
5827 2: BACKOFF_SPIN(%o2, %o3, 1b)
5828 .size atomic64_add, .-atomic64_add
5829
5830+ .globl atomic64_add_unchecked
5831+ .type atomic64_add_unchecked,#function
5832+atomic64_add_unchecked: /* %o0 = increment, %o1 = atomic_ptr */
5833+ BACKOFF_SETUP(%o2)
5834+1: ldx [%o1], %g1
5835+ addcc %g1, %o0, %g7
5836+ casx [%o1], %g1, %g7
5837+ cmp %g1, %g7
5838+ bne,pn %xcc, 2f
5839+ nop
5840+ retl
5841+ nop
5842+2: BACKOFF_SPIN(%o2, %o3, 1b)
5843+ .size atomic64_add_unchecked, .-atomic64_add_unchecked
5844+
5845 .globl atomic64_sub
5846 .type atomic64_sub,#function
5847 atomic64_sub: /* %o0 = decrement, %o1 = atomic_ptr */
5848 BACKOFF_SETUP(%o2)
5849 1: ldx [%o1], %g1
5850- sub %g1, %o0, %g7
5851+ subcc %g1, %o0, %g7
5852+
5853+#ifdef CONFIG_PAX_REFCOUNT
5854+ tvs %xcc, 6
5855+#endif
5856+
5857 casx [%o1], %g1, %g7
5858 cmp %g1, %g7
5859 bne,pn %xcc, BACKOFF_LABEL(2f, 1b)
5860@@ -103,12 +194,32 @@ atomic64_sub: /* %o0 = decrement, %o1 = atomic_ptr */
5861 2: BACKOFF_SPIN(%o2, %o3, 1b)
5862 .size atomic64_sub, .-atomic64_sub
5863
5864+ .globl atomic64_sub_unchecked
5865+ .type atomic64_sub_unchecked,#function
5866+atomic64_sub_unchecked: /* %o0 = decrement, %o1 = atomic_ptr */
5867+ BACKOFF_SETUP(%o2)
5868+1: ldx [%o1], %g1
5869+ subcc %g1, %o0, %g7
5870+ casx [%o1], %g1, %g7
5871+ cmp %g1, %g7
5872+ bne,pn %xcc, 2f
5873+ nop
5874+ retl
5875+ nop
5876+2: BACKOFF_SPIN(%o2, %o3, 1b)
5877+ .size atomic64_sub_unchecked, .-atomic64_sub_unchecked
5878+
5879 .globl atomic64_add_ret
5880 .type atomic64_add_ret,#function
5881 atomic64_add_ret: /* %o0 = increment, %o1 = atomic_ptr */
5882 BACKOFF_SETUP(%o2)
5883 1: ldx [%o1], %g1
5884- add %g1, %o0, %g7
5885+ addcc %g1, %o0, %g7
5886+
5887+#ifdef CONFIG_PAX_REFCOUNT
5888+ tvs %xcc, 6
5889+#endif
5890+
5891 casx [%o1], %g1, %g7
5892 cmp %g1, %g7
5893 bne,pn %xcc, BACKOFF_LABEL(2f, 1b)
5894@@ -118,12 +229,33 @@ atomic64_add_ret: /* %o0 = increment, %o1 = atomic_ptr */
5895 2: BACKOFF_SPIN(%o2, %o3, 1b)
5896 .size atomic64_add_ret, .-atomic64_add_ret
5897
5898+ .globl atomic64_add_ret_unchecked
5899+ .type atomic64_add_ret_unchecked,#function
5900+atomic64_add_ret_unchecked: /* %o0 = increment, %o1 = atomic_ptr */
5901+ BACKOFF_SETUP(%o2)
5902+1: ldx [%o1], %g1
5903+ addcc %g1, %o0, %g7
5904+ casx [%o1], %g1, %g7
5905+ cmp %g1, %g7
5906+ bne,pn %xcc, 2f
5907+ add %g7, %o0, %g7
5908+ mov %g7, %o0
5909+ retl
5910+ nop
5911+2: BACKOFF_SPIN(%o2, %o3, 1b)
5912+ .size atomic64_add_ret_unchecked, .-atomic64_add_ret_unchecked
5913+
5914 .globl atomic64_sub_ret
5915 .type atomic64_sub_ret,#function
5916 atomic64_sub_ret: /* %o0 = decrement, %o1 = atomic_ptr */
5917 BACKOFF_SETUP(%o2)
5918 1: ldx [%o1], %g1
5919- sub %g1, %o0, %g7
5920+ subcc %g1, %o0, %g7
5921+
5922+#ifdef CONFIG_PAX_REFCOUNT
5923+ tvs %xcc, 6
5924+#endif
5925+
5926 casx [%o1], %g1, %g7
5927 cmp %g1, %g7
5928 bne,pn %xcc, BACKOFF_LABEL(2f, 1b)
5929diff --git a/arch/sparc/lib/ksyms.c b/arch/sparc/lib/ksyms.c
5930index 1b30bb3..b4a16c7 100644
5931--- a/arch/sparc/lib/ksyms.c
5932+++ b/arch/sparc/lib/ksyms.c
5933@@ -142,12 +142,18 @@ EXPORT_SYMBOL(__downgrade_write);
5934
5935 /* Atomic counter implementation. */
5936 EXPORT_SYMBOL(atomic_add);
5937+EXPORT_SYMBOL(atomic_add_unchecked);
5938 EXPORT_SYMBOL(atomic_add_ret);
5939+EXPORT_SYMBOL(atomic_add_ret_unchecked);
5940 EXPORT_SYMBOL(atomic_sub);
5941+EXPORT_SYMBOL(atomic_sub_unchecked);
5942 EXPORT_SYMBOL(atomic_sub_ret);
5943 EXPORT_SYMBOL(atomic64_add);
5944+EXPORT_SYMBOL(atomic64_add_unchecked);
5945 EXPORT_SYMBOL(atomic64_add_ret);
5946+EXPORT_SYMBOL(atomic64_add_ret_unchecked);
5947 EXPORT_SYMBOL(atomic64_sub);
5948+EXPORT_SYMBOL(atomic64_sub_unchecked);
5949 EXPORT_SYMBOL(atomic64_sub_ret);
5950
5951 /* Atomic bit operations. */
5952diff --git a/arch/sparc/mm/Makefile b/arch/sparc/mm/Makefile
5953index 301421c..e2535d1 100644
5954--- a/arch/sparc/mm/Makefile
5955+++ b/arch/sparc/mm/Makefile
5956@@ -2,7 +2,7 @@
5957 #
5958
5959 asflags-y := -ansi
5960-ccflags-y := -Werror
5961+#ccflags-y := -Werror
5962
5963 obj-$(CONFIG_SPARC64) += ultra.o tlb.o tsb.o gup.o
5964 obj-y += fault_$(BITS).o
5965diff --git a/arch/sparc/mm/fault_32.c b/arch/sparc/mm/fault_32.c
5966index 8023fd7..c8e89e9 100644
5967--- a/arch/sparc/mm/fault_32.c
5968+++ b/arch/sparc/mm/fault_32.c
5969@@ -21,6 +21,9 @@
5970 #include <linux/perf_event.h>
5971 #include <linux/interrupt.h>
5972 #include <linux/kdebug.h>
5973+#include <linux/slab.h>
5974+#include <linux/pagemap.h>
5975+#include <linux/compiler.h>
5976
5977 #include <asm/system.h>
5978 #include <asm/page.h>
5979@@ -208,6 +211,268 @@ static unsigned long compute_si_addr(struct pt_regs *regs, int text_fault)
5980 return safe_compute_effective_address(regs, insn);
5981 }
5982
5983+#ifdef CONFIG_PAX_PAGEEXEC
5984+#ifdef CONFIG_PAX_DLRESOLVE
5985+static void pax_emuplt_close(struct vm_area_struct *vma)
5986+{
5987+ vma->vm_mm->call_dl_resolve = 0UL;
5988+}
5989+
5990+static int pax_emuplt_fault(struct vm_area_struct *vma, struct vm_fault *vmf)
5991+{
5992+ unsigned int *kaddr;
5993+
5994+ vmf->page = alloc_page(GFP_HIGHUSER);
5995+ if (!vmf->page)
5996+ return VM_FAULT_OOM;
5997+
5998+ kaddr = kmap(vmf->page);
5999+ memset(kaddr, 0, PAGE_SIZE);
6000+ kaddr[0] = 0x9DE3BFA8U; /* save */
6001+ flush_dcache_page(vmf->page);
6002+ kunmap(vmf->page);
6003+ return VM_FAULT_MAJOR;
6004+}
6005+
6006+static const struct vm_operations_struct pax_vm_ops = {
6007+ .close = pax_emuplt_close,
6008+ .fault = pax_emuplt_fault
6009+};
6010+
6011+static int pax_insert_vma(struct vm_area_struct *vma, unsigned long addr)
6012+{
6013+ int ret;
6014+
6015+ INIT_LIST_HEAD(&vma->anon_vma_chain);
6016+ vma->vm_mm = current->mm;
6017+ vma->vm_start = addr;
6018+ vma->vm_end = addr + PAGE_SIZE;
6019+ vma->vm_flags = VM_READ | VM_EXEC | VM_MAYREAD | VM_MAYEXEC;
6020+ vma->vm_page_prot = vm_get_page_prot(vma->vm_flags);
6021+ vma->vm_ops = &pax_vm_ops;
6022+
6023+ ret = insert_vm_struct(current->mm, vma);
6024+ if (ret)
6025+ return ret;
6026+
6027+ ++current->mm->total_vm;
6028+ return 0;
6029+}
6030+#endif
6031+
6032+/*
6033+ * PaX: decide what to do with offenders (regs->pc = fault address)
6034+ *
6035+ * returns 1 when task should be killed
6036+ * 2 when patched PLT trampoline was detected
6037+ * 3 when unpatched PLT trampoline was detected
6038+ */
6039+static int pax_handle_fetch_fault(struct pt_regs *regs)
6040+{
6041+
6042+#ifdef CONFIG_PAX_EMUPLT
6043+ int err;
6044+
6045+ do { /* PaX: patched PLT emulation #1 */
6046+ unsigned int sethi1, sethi2, jmpl;
6047+
6048+ err = get_user(sethi1, (unsigned int *)regs->pc);
6049+ err |= get_user(sethi2, (unsigned int *)(regs->pc+4));
6050+ err |= get_user(jmpl, (unsigned int *)(regs->pc+8));
6051+
6052+ if (err)
6053+ break;
6054+
6055+ if ((sethi1 & 0xFFC00000U) == 0x03000000U &&
6056+ (sethi2 & 0xFFC00000U) == 0x03000000U &&
6057+ (jmpl & 0xFFFFE000U) == 0x81C06000U)
6058+ {
6059+ unsigned int addr;
6060+
6061+ regs->u_regs[UREG_G1] = (sethi2 & 0x003FFFFFU) << 10;
6062+ addr = regs->u_regs[UREG_G1];
6063+ addr += (((jmpl | 0xFFFFE000U) ^ 0x00001000U) + 0x00001000U);
6064+ regs->pc = addr;
6065+ regs->npc = addr+4;
6066+ return 2;
6067+ }
6068+ } while (0);
6069+
6070+ { /* PaX: patched PLT emulation #2 */
6071+ unsigned int ba;
6072+
6073+ err = get_user(ba, (unsigned int *)regs->pc);
6074+
6075+ if (!err && (ba & 0xFFC00000U) == 0x30800000U) {
6076+ unsigned int addr;
6077+
6078+ addr = regs->pc + ((((ba | 0xFFC00000U) ^ 0x00200000U) + 0x00200000U) << 2);
6079+ regs->pc = addr;
6080+ regs->npc = addr+4;
6081+ return 2;
6082+ }
6083+ }
6084+
6085+ do { /* PaX: patched PLT emulation #3 */
6086+ unsigned int sethi, jmpl, nop;
6087+
6088+ err = get_user(sethi, (unsigned int *)regs->pc);
6089+ err |= get_user(jmpl, (unsigned int *)(regs->pc+4));
6090+ err |= get_user(nop, (unsigned int *)(regs->pc+8));
6091+
6092+ if (err)
6093+ break;
6094+
6095+ if ((sethi & 0xFFC00000U) == 0x03000000U &&
6096+ (jmpl & 0xFFFFE000U) == 0x81C06000U &&
6097+ nop == 0x01000000U)
6098+ {
6099+ unsigned int addr;
6100+
6101+ addr = (sethi & 0x003FFFFFU) << 10;
6102+ regs->u_regs[UREG_G1] = addr;
6103+ addr += (((jmpl | 0xFFFFE000U) ^ 0x00001000U) + 0x00001000U);
6104+ regs->pc = addr;
6105+ regs->npc = addr+4;
6106+ return 2;
6107+ }
6108+ } while (0);
6109+
6110+ do { /* PaX: unpatched PLT emulation step 1 */
6111+ unsigned int sethi, ba, nop;
6112+
6113+ err = get_user(sethi, (unsigned int *)regs->pc);
6114+ err |= get_user(ba, (unsigned int *)(regs->pc+4));
6115+ err |= get_user(nop, (unsigned int *)(regs->pc+8));
6116+
6117+ if (err)
6118+ break;
6119+
6120+ if ((sethi & 0xFFC00000U) == 0x03000000U &&
6121+ ((ba & 0xFFC00000U) == 0x30800000U || (ba & 0xFFF80000U) == 0x30680000U) &&
6122+ nop == 0x01000000U)
6123+ {
6124+ unsigned int addr, save, call;
6125+
6126+ if ((ba & 0xFFC00000U) == 0x30800000U)
6127+ addr = regs->pc + 4 + ((((ba | 0xFFC00000U) ^ 0x00200000U) + 0x00200000U) << 2);
6128+ else
6129+ addr = regs->pc + 4 + ((((ba | 0xFFF80000U) ^ 0x00040000U) + 0x00040000U) << 2);
6130+
6131+ err = get_user(save, (unsigned int *)addr);
6132+ err |= get_user(call, (unsigned int *)(addr+4));
6133+ err |= get_user(nop, (unsigned int *)(addr+8));
6134+ if (err)
6135+ break;
6136+
6137+#ifdef CONFIG_PAX_DLRESOLVE
6138+ if (save == 0x9DE3BFA8U &&
6139+ (call & 0xC0000000U) == 0x40000000U &&
6140+ nop == 0x01000000U)
6141+ {
6142+ struct vm_area_struct *vma;
6143+ unsigned long call_dl_resolve;
6144+
6145+ down_read(&current->mm->mmap_sem);
6146+ call_dl_resolve = current->mm->call_dl_resolve;
6147+ up_read(&current->mm->mmap_sem);
6148+ if (likely(call_dl_resolve))
6149+ goto emulate;
6150+
6151+ vma = kmem_cache_zalloc(vm_area_cachep, GFP_KERNEL);
6152+
6153+ down_write(&current->mm->mmap_sem);
6154+ if (current->mm->call_dl_resolve) {
6155+ call_dl_resolve = current->mm->call_dl_resolve;
6156+ up_write(&current->mm->mmap_sem);
6157+ if (vma)
6158+ kmem_cache_free(vm_area_cachep, vma);
6159+ goto emulate;
6160+ }
6161+
6162+ call_dl_resolve = get_unmapped_area(NULL, 0UL, PAGE_SIZE, 0UL, MAP_PRIVATE);
6163+ if (!vma || (call_dl_resolve & ~PAGE_MASK)) {
6164+ up_write(&current->mm->mmap_sem);
6165+ if (vma)
6166+ kmem_cache_free(vm_area_cachep, vma);
6167+ return 1;
6168+ }
6169+
6170+ if (pax_insert_vma(vma, call_dl_resolve)) {
6171+ up_write(&current->mm->mmap_sem);
6172+ kmem_cache_free(vm_area_cachep, vma);
6173+ return 1;
6174+ }
6175+
6176+ current->mm->call_dl_resolve = call_dl_resolve;
6177+ up_write(&current->mm->mmap_sem);
6178+
6179+emulate:
6180+ regs->u_regs[UREG_G1] = (sethi & 0x003FFFFFU) << 10;
6181+ regs->pc = call_dl_resolve;
6182+ regs->npc = addr+4;
6183+ return 3;
6184+ }
6185+#endif
6186+
6187+ /* PaX: glibc 2.4+ generates sethi/jmpl instead of save/call */
6188+ if ((save & 0xFFC00000U) == 0x05000000U &&
6189+ (call & 0xFFFFE000U) == 0x85C0A000U &&
6190+ nop == 0x01000000U)
6191+ {
6192+ regs->u_regs[UREG_G1] = (sethi & 0x003FFFFFU) << 10;
6193+ regs->u_regs[UREG_G2] = addr + 4;
6194+ addr = (save & 0x003FFFFFU) << 10;
6195+ addr += (((call | 0xFFFFE000U) ^ 0x00001000U) + 0x00001000U);
6196+ regs->pc = addr;
6197+ regs->npc = addr+4;
6198+ return 3;
6199+ }
6200+ }
6201+ } while (0);
6202+
6203+ do { /* PaX: unpatched PLT emulation step 2 */
6204+ unsigned int save, call, nop;
6205+
6206+ err = get_user(save, (unsigned int *)(regs->pc-4));
6207+ err |= get_user(call, (unsigned int *)regs->pc);
6208+ err |= get_user(nop, (unsigned int *)(regs->pc+4));
6209+ if (err)
6210+ break;
6211+
6212+ if (save == 0x9DE3BFA8U &&
6213+ (call & 0xC0000000U) == 0x40000000U &&
6214+ nop == 0x01000000U)
6215+ {
6216+ unsigned int dl_resolve = regs->pc + ((((call | 0xC0000000U) ^ 0x20000000U) + 0x20000000U) << 2);
6217+
6218+ regs->u_regs[UREG_RETPC] = regs->pc;
6219+ regs->pc = dl_resolve;
6220+ regs->npc = dl_resolve+4;
6221+ return 3;
6222+ }
6223+ } while (0);
6224+#endif
6225+
6226+ return 1;
6227+}
6228+
6229+void pax_report_insns(struct pt_regs *regs, void *pc, void *sp)
6230+{
6231+ unsigned long i;
6232+
6233+ printk(KERN_ERR "PAX: bytes at PC: ");
6234+ for (i = 0; i < 8; i++) {
6235+ unsigned int c;
6236+ if (get_user(c, (unsigned int *)pc+i))
6237+ printk(KERN_CONT "???????? ");
6238+ else
6239+ printk(KERN_CONT "%08x ", c);
6240+ }
6241+ printk("\n");
6242+}
6243+#endif
6244+
6245 static noinline void do_fault_siginfo(int code, int sig, struct pt_regs *regs,
6246 int text_fault)
6247 {
6248@@ -280,6 +545,24 @@ good_area:
6249 if(!(vma->vm_flags & VM_WRITE))
6250 goto bad_area;
6251 } else {
6252+
6253+#ifdef CONFIG_PAX_PAGEEXEC
6254+ if ((mm->pax_flags & MF_PAX_PAGEEXEC) && text_fault && !(vma->vm_flags & VM_EXEC)) {
6255+ up_read(&mm->mmap_sem);
6256+ switch (pax_handle_fetch_fault(regs)) {
6257+
6258+#ifdef CONFIG_PAX_EMUPLT
6259+ case 2:
6260+ case 3:
6261+ return;
6262+#endif
6263+
6264+ }
6265+ pax_report_fault(regs, (void *)regs->pc, (void *)regs->u_regs[UREG_FP]);
6266+ do_group_exit(SIGKILL);
6267+ }
6268+#endif
6269+
6270 /* Allow reads even for write-only mappings */
6271 if(!(vma->vm_flags & (VM_READ | VM_EXEC)))
6272 goto bad_area;
6273diff --git a/arch/sparc/mm/fault_64.c b/arch/sparc/mm/fault_64.c
6274index 504c062..6fcb9c6 100644
6275--- a/arch/sparc/mm/fault_64.c
6276+++ b/arch/sparc/mm/fault_64.c
6277@@ -21,6 +21,9 @@
6278 #include <linux/kprobes.h>
6279 #include <linux/kdebug.h>
6280 #include <linux/percpu.h>
6281+#include <linux/slab.h>
6282+#include <linux/pagemap.h>
6283+#include <linux/compiler.h>
6284
6285 #include <asm/page.h>
6286 #include <asm/pgtable.h>
6287@@ -74,7 +77,7 @@ static void __kprobes bad_kernel_pc(struct pt_regs *regs, unsigned long vaddr)
6288 printk(KERN_CRIT "OOPS: Bogus kernel PC [%016lx] in fault handler\n",
6289 regs->tpc);
6290 printk(KERN_CRIT "OOPS: RPC [%016lx]\n", regs->u_regs[15]);
6291- printk("OOPS: RPC <%pS>\n", (void *) regs->u_regs[15]);
6292+ printk("OOPS: RPC <%pA>\n", (void *) regs->u_regs[15]);
6293 printk(KERN_CRIT "OOPS: Fault was to vaddr[%lx]\n", vaddr);
6294 dump_stack();
6295 unhandled_fault(regs->tpc, current, regs);
6296@@ -272,6 +275,457 @@ static void noinline __kprobes bogus_32bit_fault_address(struct pt_regs *regs,
6297 show_regs(regs);
6298 }
6299
6300+#ifdef CONFIG_PAX_PAGEEXEC
6301+#ifdef CONFIG_PAX_DLRESOLVE
6302+static void pax_emuplt_close(struct vm_area_struct *vma)
6303+{
6304+ vma->vm_mm->call_dl_resolve = 0UL;
6305+}
6306+
6307+static int pax_emuplt_fault(struct vm_area_struct *vma, struct vm_fault *vmf)
6308+{
6309+ unsigned int *kaddr;
6310+
6311+ vmf->page = alloc_page(GFP_HIGHUSER);
6312+ if (!vmf->page)
6313+ return VM_FAULT_OOM;
6314+
6315+ kaddr = kmap(vmf->page);
6316+ memset(kaddr, 0, PAGE_SIZE);
6317+ kaddr[0] = 0x9DE3BFA8U; /* save */
6318+ flush_dcache_page(vmf->page);
6319+ kunmap(vmf->page);
6320+ return VM_FAULT_MAJOR;
6321+}
6322+
6323+static const struct vm_operations_struct pax_vm_ops = {
6324+ .close = pax_emuplt_close,
6325+ .fault = pax_emuplt_fault
6326+};
6327+
6328+static int pax_insert_vma(struct vm_area_struct *vma, unsigned long addr)
6329+{
6330+ int ret;
6331+
6332+ INIT_LIST_HEAD(&vma->anon_vma_chain);
6333+ vma->vm_mm = current->mm;
6334+ vma->vm_start = addr;
6335+ vma->vm_end = addr + PAGE_SIZE;
6336+ vma->vm_flags = VM_READ | VM_EXEC | VM_MAYREAD | VM_MAYEXEC;
6337+ vma->vm_page_prot = vm_get_page_prot(vma->vm_flags);
6338+ vma->vm_ops = &pax_vm_ops;
6339+
6340+ ret = insert_vm_struct(current->mm, vma);
6341+ if (ret)
6342+ return ret;
6343+
6344+ ++current->mm->total_vm;
6345+ return 0;
6346+}
6347+#endif
6348+
6349+/*
6350+ * PaX: decide what to do with offenders (regs->tpc = fault address)
6351+ *
6352+ * returns 1 when task should be killed
6353+ * 2 when patched PLT trampoline was detected
6354+ * 3 when unpatched PLT trampoline was detected
6355+ */
6356+static int pax_handle_fetch_fault(struct pt_regs *regs)
6357+{
6358+
6359+#ifdef CONFIG_PAX_EMUPLT
6360+ int err;
6361+
6362+ do { /* PaX: patched PLT emulation #1 */
6363+ unsigned int sethi1, sethi2, jmpl;
6364+
6365+ err = get_user(sethi1, (unsigned int *)regs->tpc);
6366+ err |= get_user(sethi2, (unsigned int *)(regs->tpc+4));
6367+ err |= get_user(jmpl, (unsigned int *)(regs->tpc+8));
6368+
6369+ if (err)
6370+ break;
6371+
6372+ if ((sethi1 & 0xFFC00000U) == 0x03000000U &&
6373+ (sethi2 & 0xFFC00000U) == 0x03000000U &&
6374+ (jmpl & 0xFFFFE000U) == 0x81C06000U)
6375+ {
6376+ unsigned long addr;
6377+
6378+ regs->u_regs[UREG_G1] = (sethi2 & 0x003FFFFFU) << 10;
6379+ addr = regs->u_regs[UREG_G1];
6380+ addr += (((jmpl | 0xFFFFFFFFFFFFE000UL) ^ 0x00001000UL) + 0x00001000UL);
6381+
6382+ if (test_thread_flag(TIF_32BIT))
6383+ addr &= 0xFFFFFFFFUL;
6384+
6385+ regs->tpc = addr;
6386+ regs->tnpc = addr+4;
6387+ return 2;
6388+ }
6389+ } while (0);
6390+
6391+ { /* PaX: patched PLT emulation #2 */
6392+ unsigned int ba;
6393+
6394+ err = get_user(ba, (unsigned int *)regs->tpc);
6395+
6396+ if (!err && (ba & 0xFFC00000U) == 0x30800000U) {
6397+ unsigned long addr;
6398+
6399+ addr = regs->tpc + ((((ba | 0xFFFFFFFFFFC00000UL) ^ 0x00200000UL) + 0x00200000UL) << 2);
6400+
6401+ if (test_thread_flag(TIF_32BIT))
6402+ addr &= 0xFFFFFFFFUL;
6403+
6404+ regs->tpc = addr;
6405+ regs->tnpc = addr+4;
6406+ return 2;
6407+ }
6408+ }
6409+
6410+ do { /* PaX: patched PLT emulation #3 */
6411+ unsigned int sethi, jmpl, nop;
6412+
6413+ err = get_user(sethi, (unsigned int *)regs->tpc);
6414+ err |= get_user(jmpl, (unsigned int *)(regs->tpc+4));
6415+ err |= get_user(nop, (unsigned int *)(regs->tpc+8));
6416+
6417+ if (err)
6418+ break;
6419+
6420+ if ((sethi & 0xFFC00000U) == 0x03000000U &&
6421+ (jmpl & 0xFFFFE000U) == 0x81C06000U &&
6422+ nop == 0x01000000U)
6423+ {
6424+ unsigned long addr;
6425+
6426+ addr = (sethi & 0x003FFFFFU) << 10;
6427+ regs->u_regs[UREG_G1] = addr;
6428+ addr += (((jmpl | 0xFFFFFFFFFFFFE000UL) ^ 0x00001000UL) + 0x00001000UL);
6429+
6430+ if (test_thread_flag(TIF_32BIT))
6431+ addr &= 0xFFFFFFFFUL;
6432+
6433+ regs->tpc = addr;
6434+ regs->tnpc = addr+4;
6435+ return 2;
6436+ }
6437+ } while (0);
6438+
6439+ do { /* PaX: patched PLT emulation #4 */
6440+ unsigned int sethi, mov1, call, mov2;
6441+
6442+ err = get_user(sethi, (unsigned int *)regs->tpc);
6443+ err |= get_user(mov1, (unsigned int *)(regs->tpc+4));
6444+ err |= get_user(call, (unsigned int *)(regs->tpc+8));
6445+ err |= get_user(mov2, (unsigned int *)(regs->tpc+12));
6446+
6447+ if (err)
6448+ break;
6449+
6450+ if ((sethi & 0xFFC00000U) == 0x03000000U &&
6451+ mov1 == 0x8210000FU &&
6452+ (call & 0xC0000000U) == 0x40000000U &&
6453+ mov2 == 0x9E100001U)
6454+ {
6455+ unsigned long addr;
6456+
6457+ regs->u_regs[UREG_G1] = regs->u_regs[UREG_RETPC];
6458+ addr = regs->tpc + 4 + ((((call | 0xFFFFFFFFC0000000UL) ^ 0x20000000UL) + 0x20000000UL) << 2);
6459+
6460+ if (test_thread_flag(TIF_32BIT))
6461+ addr &= 0xFFFFFFFFUL;
6462+
6463+ regs->tpc = addr;
6464+ regs->tnpc = addr+4;
6465+ return 2;
6466+ }
6467+ } while (0);
6468+
6469+ do { /* PaX: patched PLT emulation #5 */
6470+ unsigned int sethi, sethi1, sethi2, or1, or2, sllx, jmpl, nop;
6471+
6472+ err = get_user(sethi, (unsigned int *)regs->tpc);
6473+ err |= get_user(sethi1, (unsigned int *)(regs->tpc+4));
6474+ err |= get_user(sethi2, (unsigned int *)(regs->tpc+8));
6475+ err |= get_user(or1, (unsigned int *)(regs->tpc+12));
6476+ err |= get_user(or2, (unsigned int *)(regs->tpc+16));
6477+ err |= get_user(sllx, (unsigned int *)(regs->tpc+20));
6478+ err |= get_user(jmpl, (unsigned int *)(regs->tpc+24));
6479+ err |= get_user(nop, (unsigned int *)(regs->tpc+28));
6480+
6481+ if (err)
6482+ break;
6483+
6484+ if ((sethi & 0xFFC00000U) == 0x03000000U &&
6485+ (sethi1 & 0xFFC00000U) == 0x03000000U &&
6486+ (sethi2 & 0xFFC00000U) == 0x0B000000U &&
6487+ (or1 & 0xFFFFE000U) == 0x82106000U &&
6488+ (or2 & 0xFFFFE000U) == 0x8A116000U &&
6489+ sllx == 0x83287020U &&
6490+ jmpl == 0x81C04005U &&
6491+ nop == 0x01000000U)
6492+ {
6493+ unsigned long addr;
6494+
6495+ regs->u_regs[UREG_G1] = ((sethi1 & 0x003FFFFFU) << 10) | (or1 & 0x000003FFU);
6496+ regs->u_regs[UREG_G1] <<= 32;
6497+ regs->u_regs[UREG_G5] = ((sethi2 & 0x003FFFFFU) << 10) | (or2 & 0x000003FFU);
6498+ addr = regs->u_regs[UREG_G1] + regs->u_regs[UREG_G5];
6499+ regs->tpc = addr;
6500+ regs->tnpc = addr+4;
6501+ return 2;
6502+ }
6503+ } while (0);
6504+
6505+ do { /* PaX: patched PLT emulation #6 */
6506+ unsigned int sethi, sethi1, sethi2, sllx, or, jmpl, nop;
6507+
6508+ err = get_user(sethi, (unsigned int *)regs->tpc);
6509+ err |= get_user(sethi1, (unsigned int *)(regs->tpc+4));
6510+ err |= get_user(sethi2, (unsigned int *)(regs->tpc+8));
6511+ err |= get_user(sllx, (unsigned int *)(regs->tpc+12));
6512+ err |= get_user(or, (unsigned int *)(regs->tpc+16));
6513+ err |= get_user(jmpl, (unsigned int *)(regs->tpc+20));
6514+ err |= get_user(nop, (unsigned int *)(regs->tpc+24));
6515+
6516+ if (err)
6517+ break;
6518+
6519+ if ((sethi & 0xFFC00000U) == 0x03000000U &&
6520+ (sethi1 & 0xFFC00000U) == 0x03000000U &&
6521+ (sethi2 & 0xFFC00000U) == 0x0B000000U &&
6522+ sllx == 0x83287020U &&
6523+ (or & 0xFFFFE000U) == 0x8A116000U &&
6524+ jmpl == 0x81C04005U &&
6525+ nop == 0x01000000U)
6526+ {
6527+ unsigned long addr;
6528+
6529+ regs->u_regs[UREG_G1] = (sethi1 & 0x003FFFFFU) << 10;
6530+ regs->u_regs[UREG_G1] <<= 32;
6531+ regs->u_regs[UREG_G5] = ((sethi2 & 0x003FFFFFU) << 10) | (or & 0x3FFU);
6532+ addr = regs->u_regs[UREG_G1] + regs->u_regs[UREG_G5];
6533+ regs->tpc = addr;
6534+ regs->tnpc = addr+4;
6535+ return 2;
6536+ }
6537+ } while (0);
6538+
6539+ do { /* PaX: unpatched PLT emulation step 1 */
6540+ unsigned int sethi, ba, nop;
6541+
6542+ err = get_user(sethi, (unsigned int *)regs->tpc);
6543+ err |= get_user(ba, (unsigned int *)(regs->tpc+4));
6544+ err |= get_user(nop, (unsigned int *)(regs->tpc+8));
6545+
6546+ if (err)
6547+ break;
6548+
6549+ if ((sethi & 0xFFC00000U) == 0x03000000U &&
6550+ ((ba & 0xFFC00000U) == 0x30800000U || (ba & 0xFFF80000U) == 0x30680000U) &&
6551+ nop == 0x01000000U)
6552+ {
6553+ unsigned long addr;
6554+ unsigned int save, call;
6555+ unsigned int sethi1, sethi2, or1, or2, sllx, add, jmpl;
6556+
6557+ if ((ba & 0xFFC00000U) == 0x30800000U)
6558+ addr = regs->tpc + 4 + ((((ba | 0xFFFFFFFFFFC00000UL) ^ 0x00200000UL) + 0x00200000UL) << 2);
6559+ else
6560+ addr = regs->tpc + 4 + ((((ba | 0xFFFFFFFFFFF80000UL) ^ 0x00040000UL) + 0x00040000UL) << 2);
6561+
6562+ if (test_thread_flag(TIF_32BIT))
6563+ addr &= 0xFFFFFFFFUL;
6564+
6565+ err = get_user(save, (unsigned int *)addr);
6566+ err |= get_user(call, (unsigned int *)(addr+4));
6567+ err |= get_user(nop, (unsigned int *)(addr+8));
6568+ if (err)
6569+ break;
6570+
6571+#ifdef CONFIG_PAX_DLRESOLVE
6572+ if (save == 0x9DE3BFA8U &&
6573+ (call & 0xC0000000U) == 0x40000000U &&
6574+ nop == 0x01000000U)
6575+ {
6576+ struct vm_area_struct *vma;
6577+ unsigned long call_dl_resolve;
6578+
6579+ down_read(&current->mm->mmap_sem);
6580+ call_dl_resolve = current->mm->call_dl_resolve;
6581+ up_read(&current->mm->mmap_sem);
6582+ if (likely(call_dl_resolve))
6583+ goto emulate;
6584+
6585+ vma = kmem_cache_zalloc(vm_area_cachep, GFP_KERNEL);
6586+
6587+ down_write(&current->mm->mmap_sem);
6588+ if (current->mm->call_dl_resolve) {
6589+ call_dl_resolve = current->mm->call_dl_resolve;
6590+ up_write(&current->mm->mmap_sem);
6591+ if (vma)
6592+ kmem_cache_free(vm_area_cachep, vma);
6593+ goto emulate;
6594+ }
6595+
6596+ call_dl_resolve = get_unmapped_area(NULL, 0UL, PAGE_SIZE, 0UL, MAP_PRIVATE);
6597+ if (!vma || (call_dl_resolve & ~PAGE_MASK)) {
6598+ up_write(&current->mm->mmap_sem);
6599+ if (vma)
6600+ kmem_cache_free(vm_area_cachep, vma);
6601+ return 1;
6602+ }
6603+
6604+ if (pax_insert_vma(vma, call_dl_resolve)) {
6605+ up_write(&current->mm->mmap_sem);
6606+ kmem_cache_free(vm_area_cachep, vma);
6607+ return 1;
6608+ }
6609+
6610+ current->mm->call_dl_resolve = call_dl_resolve;
6611+ up_write(&current->mm->mmap_sem);
6612+
6613+emulate:
6614+ regs->u_regs[UREG_G1] = (sethi & 0x003FFFFFU) << 10;
6615+ regs->tpc = call_dl_resolve;
6616+ regs->tnpc = addr+4;
6617+ return 3;
6618+ }
6619+#endif
6620+
6621+ /* PaX: glibc 2.4+ generates sethi/jmpl instead of save/call */
6622+ if ((save & 0xFFC00000U) == 0x05000000U &&
6623+ (call & 0xFFFFE000U) == 0x85C0A000U &&
6624+ nop == 0x01000000U)
6625+ {
6626+ regs->u_regs[UREG_G1] = (sethi & 0x003FFFFFU) << 10;
6627+ regs->u_regs[UREG_G2] = addr + 4;
6628+ addr = (save & 0x003FFFFFU) << 10;
6629+ addr += (((call | 0xFFFFFFFFFFFFE000UL) ^ 0x00001000UL) + 0x00001000UL);
6630+
6631+ if (test_thread_flag(TIF_32BIT))
6632+ addr &= 0xFFFFFFFFUL;
6633+
6634+ regs->tpc = addr;
6635+ regs->tnpc = addr+4;
6636+ return 3;
6637+ }
6638+
6639+ /* PaX: 64-bit PLT stub */
6640+ err = get_user(sethi1, (unsigned int *)addr);
6641+ err |= get_user(sethi2, (unsigned int *)(addr+4));
6642+ err |= get_user(or1, (unsigned int *)(addr+8));
6643+ err |= get_user(or2, (unsigned int *)(addr+12));
6644+ err |= get_user(sllx, (unsigned int *)(addr+16));
6645+ err |= get_user(add, (unsigned int *)(addr+20));
6646+ err |= get_user(jmpl, (unsigned int *)(addr+24));
6647+ err |= get_user(nop, (unsigned int *)(addr+28));
6648+ if (err)
6649+ break;
6650+
6651+ if ((sethi1 & 0xFFC00000U) == 0x09000000U &&
6652+ (sethi2 & 0xFFC00000U) == 0x0B000000U &&
6653+ (or1 & 0xFFFFE000U) == 0x88112000U &&
6654+ (or2 & 0xFFFFE000U) == 0x8A116000U &&
6655+ sllx == 0x89293020U &&
6656+ add == 0x8A010005U &&
6657+ jmpl == 0x89C14000U &&
6658+ nop == 0x01000000U)
6659+ {
6660+ regs->u_regs[UREG_G1] = (sethi & 0x003FFFFFU) << 10;
6661+ regs->u_regs[UREG_G4] = ((sethi1 & 0x003FFFFFU) << 10) | (or1 & 0x000003FFU);
6662+ regs->u_regs[UREG_G4] <<= 32;
6663+ regs->u_regs[UREG_G5] = ((sethi2 & 0x003FFFFFU) << 10) | (or2 & 0x000003FFU);
6664+ regs->u_regs[UREG_G5] += regs->u_regs[UREG_G4];
6665+ regs->u_regs[UREG_G4] = addr + 24;
6666+ addr = regs->u_regs[UREG_G5];
6667+ regs->tpc = addr;
6668+ regs->tnpc = addr+4;
6669+ return 3;
6670+ }
6671+ }
6672+ } while (0);
6673+
6674+#ifdef CONFIG_PAX_DLRESOLVE
6675+ do { /* PaX: unpatched PLT emulation step 2 */
6676+ unsigned int save, call, nop;
6677+
6678+ err = get_user(save, (unsigned int *)(regs->tpc-4));
6679+ err |= get_user(call, (unsigned int *)regs->tpc);
6680+ err |= get_user(nop, (unsigned int *)(regs->tpc+4));
6681+ if (err)
6682+ break;
6683+
6684+ if (save == 0x9DE3BFA8U &&
6685+ (call & 0xC0000000U) == 0x40000000U &&
6686+ nop == 0x01000000U)
6687+ {
6688+ unsigned long dl_resolve = regs->tpc + ((((call | 0xFFFFFFFFC0000000UL) ^ 0x20000000UL) + 0x20000000UL) << 2);
6689+
6690+ if (test_thread_flag(TIF_32BIT))
6691+ dl_resolve &= 0xFFFFFFFFUL;
6692+
6693+ regs->u_regs[UREG_RETPC] = regs->tpc;
6694+ regs->tpc = dl_resolve;
6695+ regs->tnpc = dl_resolve+4;
6696+ return 3;
6697+ }
6698+ } while (0);
6699+#endif
6700+
6701+ do { /* PaX: patched PLT emulation #7, must be AFTER the unpatched PLT emulation */
6702+ unsigned int sethi, ba, nop;
6703+
6704+ err = get_user(sethi, (unsigned int *)regs->tpc);
6705+ err |= get_user(ba, (unsigned int *)(regs->tpc+4));
6706+ err |= get_user(nop, (unsigned int *)(regs->tpc+8));
6707+
6708+ if (err)
6709+ break;
6710+
6711+ if ((sethi & 0xFFC00000U) == 0x03000000U &&
6712+ (ba & 0xFFF00000U) == 0x30600000U &&
6713+ nop == 0x01000000U)
6714+ {
6715+ unsigned long addr;
6716+
6717+ addr = (sethi & 0x003FFFFFU) << 10;
6718+ regs->u_regs[UREG_G1] = addr;
6719+ addr = regs->tpc + ((((ba | 0xFFFFFFFFFFF80000UL) ^ 0x00040000UL) + 0x00040000UL) << 2);
6720+
6721+ if (test_thread_flag(TIF_32BIT))
6722+ addr &= 0xFFFFFFFFUL;
6723+
6724+ regs->tpc = addr;
6725+ regs->tnpc = addr+4;
6726+ return 2;
6727+ }
6728+ } while (0);
6729+
6730+#endif
6731+
6732+ return 1;
6733+}
6734+
6735+void pax_report_insns(struct pt_regs *regs, void *pc, void *sp)
6736+{
6737+ unsigned long i;
6738+
6739+ printk(KERN_ERR "PAX: bytes at PC: ");
6740+ for (i = 0; i < 8; i++) {
6741+ unsigned int c;
6742+ if (get_user(c, (unsigned int *)pc+i))
6743+ printk(KERN_CONT "???????? ");
6744+ else
6745+ printk(KERN_CONT "%08x ", c);
6746+ }
6747+ printk("\n");
6748+}
6749+#endif
6750+
6751 asmlinkage void __kprobes do_sparc64_fault(struct pt_regs *regs)
6752 {
6753 struct mm_struct *mm = current->mm;
6754@@ -340,6 +794,29 @@ asmlinkage void __kprobes do_sparc64_fault(struct pt_regs *regs)
6755 if (!vma)
6756 goto bad_area;
6757
6758+#ifdef CONFIG_PAX_PAGEEXEC
6759+ /* PaX: detect ITLB misses on non-exec pages */
6760+ if ((mm->pax_flags & MF_PAX_PAGEEXEC) && vma->vm_start <= address &&
6761+ !(vma->vm_flags & VM_EXEC) && (fault_code & FAULT_CODE_ITLB))
6762+ {
6763+ if (address != regs->tpc)
6764+ goto good_area;
6765+
6766+ up_read(&mm->mmap_sem);
6767+ switch (pax_handle_fetch_fault(regs)) {
6768+
6769+#ifdef CONFIG_PAX_EMUPLT
6770+ case 2:
6771+ case 3:
6772+ return;
6773+#endif
6774+
6775+ }
6776+ pax_report_fault(regs, (void *)regs->tpc, (void *)(regs->u_regs[UREG_FP] + STACK_BIAS));
6777+ do_group_exit(SIGKILL);
6778+ }
6779+#endif
6780+
6781 /* Pure DTLB misses do not tell us whether the fault causing
6782 * load/store/atomic was a write or not, it only says that there
6783 * was no match. So in such a case we (carefully) read the
6784diff --git a/arch/sparc/mm/hugetlbpage.c b/arch/sparc/mm/hugetlbpage.c
6785index 07e1453..0a7d9e9 100644
6786--- a/arch/sparc/mm/hugetlbpage.c
6787+++ b/arch/sparc/mm/hugetlbpage.c
6788@@ -67,7 +67,7 @@ full_search:
6789 }
6790 return -ENOMEM;
6791 }
6792- if (likely(!vma || addr + len <= vma->vm_start)) {
6793+ if (likely(check_heap_stack_gap(vma, addr, len))) {
6794 /*
6795 * Remember the place where we stopped the search:
6796 */
6797@@ -106,7 +106,7 @@ hugetlb_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
6798 /* make sure it can fit in the remaining address space */
6799 if (likely(addr > len)) {
6800 vma = find_vma(mm, addr-len);
6801- if (!vma || addr <= vma->vm_start) {
6802+ if (check_heap_stack_gap(vma, addr - len, len)) {
6803 /* remember the address as a hint for next time */
6804 return (mm->free_area_cache = addr-len);
6805 }
6806@@ -115,16 +115,17 @@ hugetlb_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
6807 if (unlikely(mm->mmap_base < len))
6808 goto bottomup;
6809
6810- addr = (mm->mmap_base-len) & HPAGE_MASK;
6811+ addr = mm->mmap_base - len;
6812
6813 do {
6814+ addr &= HPAGE_MASK;
6815 /*
6816 * Lookup failure means no vma is above this address,
6817 * else if new region fits below vma->vm_start,
6818 * return with success:
6819 */
6820 vma = find_vma(mm, addr);
6821- if (likely(!vma || addr+len <= vma->vm_start)) {
6822+ if (likely(check_heap_stack_gap(vma, addr, len))) {
6823 /* remember the address as a hint for next time */
6824 return (mm->free_area_cache = addr);
6825 }
6826@@ -134,8 +135,8 @@ hugetlb_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
6827 mm->cached_hole_size = vma->vm_start - addr;
6828
6829 /* try just below the current vma->vm_start */
6830- addr = (vma->vm_start-len) & HPAGE_MASK;
6831- } while (likely(len < vma->vm_start));
6832+ addr = skip_heap_stack_gap(vma, len);
6833+ } while (!IS_ERR_VALUE(addr));
6834
6835 bottomup:
6836 /*
6837@@ -181,8 +182,7 @@ hugetlb_get_unmapped_area(struct file *file, unsigned long addr,
6838 if (addr) {
6839 addr = ALIGN(addr, HPAGE_SIZE);
6840 vma = find_vma(mm, addr);
6841- if (task_size - len >= addr &&
6842- (!vma || addr + len <= vma->vm_start))
6843+ if (task_size - len >= addr && check_heap_stack_gap(vma, addr, len))
6844 return addr;
6845 }
6846 if (mm->get_unmapped_area == arch_get_unmapped_area)
6847diff --git a/arch/sparc/mm/init_32.c b/arch/sparc/mm/init_32.c
6848index 7b00de6..78239f4 100644
6849--- a/arch/sparc/mm/init_32.c
6850+++ b/arch/sparc/mm/init_32.c
6851@@ -316,6 +316,9 @@ extern void device_scan(void);
6852 pgprot_t PAGE_SHARED __read_mostly;
6853 EXPORT_SYMBOL(PAGE_SHARED);
6854
6855+pgprot_t PAGE_SHARED_NOEXEC __read_mostly;
6856+EXPORT_SYMBOL(PAGE_SHARED_NOEXEC);
6857+
6858 void __init paging_init(void)
6859 {
6860 switch(sparc_cpu_model) {
6861@@ -344,17 +347,17 @@ void __init paging_init(void)
6862
6863 /* Initialize the protection map with non-constant, MMU dependent values. */
6864 protection_map[0] = PAGE_NONE;
6865- protection_map[1] = PAGE_READONLY;
6866- protection_map[2] = PAGE_COPY;
6867- protection_map[3] = PAGE_COPY;
6868+ protection_map[1] = PAGE_READONLY_NOEXEC;
6869+ protection_map[2] = PAGE_COPY_NOEXEC;
6870+ protection_map[3] = PAGE_COPY_NOEXEC;
6871 protection_map[4] = PAGE_READONLY;
6872 protection_map[5] = PAGE_READONLY;
6873 protection_map[6] = PAGE_COPY;
6874 protection_map[7] = PAGE_COPY;
6875 protection_map[8] = PAGE_NONE;
6876- protection_map[9] = PAGE_READONLY;
6877- protection_map[10] = PAGE_SHARED;
6878- protection_map[11] = PAGE_SHARED;
6879+ protection_map[9] = PAGE_READONLY_NOEXEC;
6880+ protection_map[10] = PAGE_SHARED_NOEXEC;
6881+ protection_map[11] = PAGE_SHARED_NOEXEC;
6882 protection_map[12] = PAGE_READONLY;
6883 protection_map[13] = PAGE_READONLY;
6884 protection_map[14] = PAGE_SHARED;
6885diff --git a/arch/sparc/mm/srmmu.c b/arch/sparc/mm/srmmu.c
6886index cbef74e..c38fead 100644
6887--- a/arch/sparc/mm/srmmu.c
6888+++ b/arch/sparc/mm/srmmu.c
6889@@ -2200,6 +2200,13 @@ void __init ld_mmu_srmmu(void)
6890 PAGE_SHARED = pgprot_val(SRMMU_PAGE_SHARED);
6891 BTFIXUPSET_INT(page_copy, pgprot_val(SRMMU_PAGE_COPY));
6892 BTFIXUPSET_INT(page_readonly, pgprot_val(SRMMU_PAGE_RDONLY));
6893+
6894+#ifdef CONFIG_PAX_PAGEEXEC
6895+ PAGE_SHARED_NOEXEC = pgprot_val(SRMMU_PAGE_SHARED_NOEXEC);
6896+ BTFIXUPSET_INT(page_copy_noexec, pgprot_val(SRMMU_PAGE_COPY_NOEXEC));
6897+ BTFIXUPSET_INT(page_readonly_noexec, pgprot_val(SRMMU_PAGE_RDONLY_NOEXEC));
6898+#endif
6899+
6900 BTFIXUPSET_INT(page_kernel, pgprot_val(SRMMU_PAGE_KERNEL));
6901 page_kernel = pgprot_val(SRMMU_PAGE_KERNEL);
6902
6903diff --git a/arch/tile/include/asm/atomic_64.h b/arch/tile/include/asm/atomic_64.h
6904index 27fe667..36d474c 100644
6905--- a/arch/tile/include/asm/atomic_64.h
6906+++ b/arch/tile/include/asm/atomic_64.h
6907@@ -142,6 +142,16 @@ static inline long atomic64_add_unless(atomic64_t *v, long a, long u)
6908
6909 #define atomic64_inc_not_zero(v) atomic64_add_unless((v), 1, 0)
6910
6911+#define atomic64_read_unchecked(v) atomic64_read(v)
6912+#define atomic64_set_unchecked(v, i) atomic64_set((v), (i))
6913+#define atomic64_add_unchecked(a, v) atomic64_add((a), (v))
6914+#define atomic64_add_return_unchecked(a, v) atomic64_add_return((a), (v))
6915+#define atomic64_sub_unchecked(a, v) atomic64_sub((a), (v))
6916+#define atomic64_inc_unchecked(v) atomic64_inc(v)
6917+#define atomic64_inc_return_unchecked(v) atomic64_inc_return(v)
6918+#define atomic64_dec_unchecked(v) atomic64_dec(v)
6919+#define atomic64_cmpxchg_unchecked(v, o, n) atomic64_cmpxchg((v), (o), (n))
6920+
6921 /* Atomic dec and inc don't implement barrier, so provide them if needed. */
6922 #define smp_mb__before_atomic_dec() smp_mb()
6923 #define smp_mb__after_atomic_dec() smp_mb()
6924diff --git a/arch/tile/include/asm/cache.h b/arch/tile/include/asm/cache.h
6925index 392e533..536b092 100644
6926--- a/arch/tile/include/asm/cache.h
6927+++ b/arch/tile/include/asm/cache.h
6928@@ -15,11 +15,12 @@
6929 #ifndef _ASM_TILE_CACHE_H
6930 #define _ASM_TILE_CACHE_H
6931
6932+#include <linux/const.h>
6933 #include <arch/chip.h>
6934
6935 /* bytes per L1 data cache line */
6936 #define L1_CACHE_SHIFT CHIP_L1D_LOG_LINE_SIZE()
6937-#define L1_CACHE_BYTES (1 << L1_CACHE_SHIFT)
6938+#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT)
6939
6940 /* bytes per L2 cache line */
6941 #define L2_CACHE_SHIFT CHIP_L2_LOG_LINE_SIZE()
6942diff --git a/arch/um/Makefile b/arch/um/Makefile
6943index 7730af6..cce5b19 100644
6944--- a/arch/um/Makefile
6945+++ b/arch/um/Makefile
6946@@ -61,6 +61,10 @@ USER_CFLAGS = $(patsubst $(KERNEL_DEFINES),,$(patsubst -D__KERNEL__,,\
6947 $(patsubst -I%,,$(KBUILD_CFLAGS)))) $(ARCH_INCLUDE) $(MODE_INCLUDE) \
6948 $(filter -I%,$(CFLAGS)) -D_FILE_OFFSET_BITS=64 -idirafter include
6949
6950+ifdef CONSTIFY_PLUGIN
6951+USER_CFLAGS += $(CONSTIFY_PLUGIN) -fplugin-arg-constify_plugin-no-constify
6952+endif
6953+
6954 #This will adjust *FLAGS accordingly to the platform.
6955 include $(srctree)/$(ARCH_DIR)/Makefile-os-$(OS)
6956
6957diff --git a/arch/um/include/asm/cache.h b/arch/um/include/asm/cache.h
6958index 19e1bdd..3665b77 100644
6959--- a/arch/um/include/asm/cache.h
6960+++ b/arch/um/include/asm/cache.h
6961@@ -1,6 +1,7 @@
6962 #ifndef __UM_CACHE_H
6963 #define __UM_CACHE_H
6964
6965+#include <linux/const.h>
6966
6967 #if defined(CONFIG_UML_X86) && !defined(CONFIG_64BIT)
6968 # define L1_CACHE_SHIFT (CONFIG_X86_L1_CACHE_SHIFT)
6969@@ -12,6 +13,6 @@
6970 # define L1_CACHE_SHIFT 5
6971 #endif
6972
6973-#define L1_CACHE_BYTES (1 << L1_CACHE_SHIFT)
6974+#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT)
6975
6976 #endif
6977diff --git a/arch/um/include/asm/kmap_types.h b/arch/um/include/asm/kmap_types.h
6978index 6c03acd..a5e0215 100644
6979--- a/arch/um/include/asm/kmap_types.h
6980+++ b/arch/um/include/asm/kmap_types.h
6981@@ -23,6 +23,7 @@ enum km_type {
6982 KM_IRQ1,
6983 KM_SOFTIRQ0,
6984 KM_SOFTIRQ1,
6985+ KM_CLEARPAGE,
6986 KM_TYPE_NR
6987 };
6988
6989diff --git a/arch/um/include/asm/page.h b/arch/um/include/asm/page.h
6990index 7cfc3ce..cbd1a58 100644
6991--- a/arch/um/include/asm/page.h
6992+++ b/arch/um/include/asm/page.h
6993@@ -14,6 +14,9 @@
6994 #define PAGE_SIZE (_AC(1, UL) << PAGE_SHIFT)
6995 #define PAGE_MASK (~(PAGE_SIZE-1))
6996
6997+#define ktla_ktva(addr) (addr)
6998+#define ktva_ktla(addr) (addr)
6999+
7000 #ifndef __ASSEMBLY__
7001
7002 struct page;
7003diff --git a/arch/um/kernel/process.c b/arch/um/kernel/process.c
7004index c533835..84db18e 100644
7005--- a/arch/um/kernel/process.c
7006+++ b/arch/um/kernel/process.c
7007@@ -406,22 +406,6 @@ int singlestepping(void * t)
7008 return 2;
7009 }
7010
7011-/*
7012- * Only x86 and x86_64 have an arch_align_stack().
7013- * All other arches have "#define arch_align_stack(x) (x)"
7014- * in their asm/system.h
7015- * As this is included in UML from asm-um/system-generic.h,
7016- * we can use it to behave as the subarch does.
7017- */
7018-#ifndef arch_align_stack
7019-unsigned long arch_align_stack(unsigned long sp)
7020-{
7021- if (!(current->personality & ADDR_NO_RANDOMIZE) && randomize_va_space)
7022- sp -= get_random_int() % 8192;
7023- return sp & ~0xf;
7024-}
7025-#endif
7026-
7027 unsigned long get_wchan(struct task_struct *p)
7028 {
7029 unsigned long stack_page, sp, ip;
7030diff --git a/arch/unicore32/include/asm/cache.h b/arch/unicore32/include/asm/cache.h
7031index ad8f795..2c7eec6 100644
7032--- a/arch/unicore32/include/asm/cache.h
7033+++ b/arch/unicore32/include/asm/cache.h
7034@@ -12,8 +12,10 @@
7035 #ifndef __UNICORE_CACHE_H__
7036 #define __UNICORE_CACHE_H__
7037
7038-#define L1_CACHE_SHIFT (5)
7039-#define L1_CACHE_BYTES (1 << L1_CACHE_SHIFT)
7040+#include <linux/const.h>
7041+
7042+#define L1_CACHE_SHIFT 5
7043+#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT)
7044
7045 /*
7046 * Memory returned by kmalloc() may be used for DMA, so we must make
7047diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig
7048index efb4294..61bc18c 100644
7049--- a/arch/x86/Kconfig
7050+++ b/arch/x86/Kconfig
7051@@ -235,7 +235,7 @@ config X86_HT
7052
7053 config X86_32_LAZY_GS
7054 def_bool y
7055- depends on X86_32 && !CC_STACKPROTECTOR
7056+ depends on X86_32 && !CC_STACKPROTECTOR && !PAX_MEMORY_UDEREF
7057
7058 config ARCH_HWEIGHT_CFLAGS
7059 string
7060@@ -1022,7 +1022,7 @@ choice
7061
7062 config NOHIGHMEM
7063 bool "off"
7064- depends on !X86_NUMAQ
7065+ depends on !X86_NUMAQ && !(PAX_PAGEEXEC && PAX_ENABLE_PAE)
7066 ---help---
7067 Linux can use up to 64 Gigabytes of physical memory on x86 systems.
7068 However, the address space of 32-bit x86 processors is only 4
7069@@ -1059,7 +1059,7 @@ config NOHIGHMEM
7070
7071 config HIGHMEM4G
7072 bool "4GB"
7073- depends on !X86_NUMAQ
7074+ depends on !X86_NUMAQ && !(PAX_PAGEEXEC && PAX_ENABLE_PAE)
7075 ---help---
7076 Select this if you have a 32-bit processor and between 1 and 4
7077 gigabytes of physical RAM.
7078@@ -1113,7 +1113,7 @@ config PAGE_OFFSET
7079 hex
7080 default 0xB0000000 if VMSPLIT_3G_OPT
7081 default 0x80000000 if VMSPLIT_2G
7082- default 0x78000000 if VMSPLIT_2G_OPT
7083+ default 0x70000000 if VMSPLIT_2G_OPT
7084 default 0x40000000 if VMSPLIT_1G
7085 default 0xC0000000
7086 depends on X86_32
7087@@ -1496,6 +1496,7 @@ config SECCOMP
7088
7089 config CC_STACKPROTECTOR
7090 bool "Enable -fstack-protector buffer overflow detection (EXPERIMENTAL)"
7091+ depends on X86_64 || !PAX_MEMORY_UDEREF
7092 ---help---
7093 This option turns on the -fstack-protector GCC feature. This
7094 feature puts, at the beginning of functions, a canary value on
7095@@ -1553,6 +1554,7 @@ config KEXEC_JUMP
7096 config PHYSICAL_START
7097 hex "Physical address where the kernel is loaded" if (EXPERT || CRASH_DUMP)
7098 default "0x1000000"
7099+ range 0x400000 0x40000000
7100 ---help---
7101 This gives the physical address where the kernel is loaded.
7102
7103@@ -1616,6 +1618,7 @@ config X86_NEED_RELOCS
7104 config PHYSICAL_ALIGN
7105 hex "Alignment value to which kernel should be aligned" if X86_32
7106 default "0x1000000"
7107+ range 0x400000 0x1000000 if PAX_KERNEXEC
7108 range 0x2000 0x1000000
7109 ---help---
7110 This value puts the alignment restrictions on physical address
7111@@ -1647,9 +1650,10 @@ config HOTPLUG_CPU
7112 Say N if you want to disable CPU hotplug.
7113
7114 config COMPAT_VDSO
7115- def_bool y
7116+ def_bool n
7117 prompt "Compat VDSO support"
7118 depends on X86_32 || IA32_EMULATION
7119+ depends on !PAX_NOEXEC && !PAX_MEMORY_UDEREF
7120 ---help---
7121 Map the 32-bit VDSO to the predictable old-style address too.
7122
7123diff --git a/arch/x86/Kconfig.cpu b/arch/x86/Kconfig.cpu
7124index e3ca7e0..b30b28a 100644
7125--- a/arch/x86/Kconfig.cpu
7126+++ b/arch/x86/Kconfig.cpu
7127@@ -341,7 +341,7 @@ config X86_PPRO_FENCE
7128
7129 config X86_F00F_BUG
7130 def_bool y
7131- depends on M586MMX || M586TSC || M586 || M486 || M386
7132+ depends on (M586MMX || M586TSC || M586 || M486 || M386) && !PAX_KERNEXEC
7133
7134 config X86_INVD_BUG
7135 def_bool y
7136@@ -365,7 +365,7 @@ config X86_POPAD_OK
7137
7138 config X86_ALIGNMENT_16
7139 def_bool y
7140- depends on MWINCHIP3D || MWINCHIPC6 || MCYRIXIII || MELAN || MK6 || M586MMX || M586TSC || M586 || M486 || MVIAC3_2 || MGEODEGX1
7141+ depends on MWINCHIP3D || MWINCHIPC6 || MCYRIXIII || X86_ELAN || MK8 || MK7 || MK6 || MCORE2 || MPENTIUM4 || MPENTIUMIII || MPENTIUMII || M686 || M586MMX || M586TSC || M586 || M486 || MVIAC3_2 || MGEODEGX1
7142
7143 config X86_INTEL_USERCOPY
7144 def_bool y
7145@@ -411,7 +411,7 @@ config X86_CMPXCHG64
7146 # generates cmov.
7147 config X86_CMOV
7148 def_bool y
7149- depends on (MK8 || MK7 || MCORE2 || MPENTIUM4 || MPENTIUMM || MPENTIUMIII || MPENTIUMII || M686 || MVIAC3_2 || MVIAC7 || MCRUSOE || MEFFICEON || X86_64 || MATOM || MGEODE_LX)
7150+ depends on (MK8 || MK7 || MCORE2 || MPSC || MPENTIUM4 || MPENTIUMM || MPENTIUMIII || MPENTIUMII || M686 || MVIAC3_2 || MVIAC7 || MCRUSOE || MEFFICEON || X86_64 || MATOM || MGEODE_LX)
7151
7152 config X86_MINIMUM_CPU_FAMILY
7153 int
7154diff --git a/arch/x86/Kconfig.debug b/arch/x86/Kconfig.debug
7155index bf56e17..05f9891 100644
7156--- a/arch/x86/Kconfig.debug
7157+++ b/arch/x86/Kconfig.debug
7158@@ -81,7 +81,7 @@ config X86_PTDUMP
7159 config DEBUG_RODATA
7160 bool "Write protect kernel read-only data structures"
7161 default y
7162- depends on DEBUG_KERNEL
7163+ depends on DEBUG_KERNEL && BROKEN
7164 ---help---
7165 Mark the kernel read-only data as write-protected in the pagetables,
7166 in order to catch accidental (and incorrect) writes to such const
7167@@ -99,7 +99,7 @@ config DEBUG_RODATA_TEST
7168
7169 config DEBUG_SET_MODULE_RONX
7170 bool "Set loadable kernel module data as NX and text as RO"
7171- depends on MODULES
7172+ depends on MODULES && BROKEN
7173 ---help---
7174 This option helps catch unintended modifications to loadable
7175 kernel module's text and read-only data. It also prevents execution
7176diff --git a/arch/x86/Makefile b/arch/x86/Makefile
7177index b02e509..2631e48 100644
7178--- a/arch/x86/Makefile
7179+++ b/arch/x86/Makefile
7180@@ -46,6 +46,7 @@ else
7181 UTS_MACHINE := x86_64
7182 CHECKFLAGS += -D__x86_64__ -m64
7183
7184+ biarch := $(call cc-option,-m64)
7185 KBUILD_AFLAGS += -m64
7186 KBUILD_CFLAGS += -m64
7187
7188@@ -195,3 +196,12 @@ define archhelp
7189 echo ' FDARGS="..." arguments for the booted kernel'
7190 echo ' FDINITRD=file initrd for the booted kernel'
7191 endef
7192+
7193+define OLD_LD
7194+
7195+*** ${VERSION}.${PATCHLEVEL} PaX kernels no longer build correctly with old versions of binutils.
7196+*** Please upgrade your binutils to 2.18 or newer
7197+endef
7198+
7199+archprepare:
7200+ $(if $(LDFLAGS_BUILD_ID),,$(error $(OLD_LD)))
7201diff --git a/arch/x86/boot/Makefile b/arch/x86/boot/Makefile
7202index 95365a8..52f857b 100644
7203--- a/arch/x86/boot/Makefile
7204+++ b/arch/x86/boot/Makefile
7205@@ -63,6 +63,9 @@ KBUILD_CFLAGS := $(LINUXINCLUDE) -g -Os -D_SETUP -D__KERNEL__ \
7206 $(call cc-option, -fno-stack-protector) \
7207 $(call cc-option, -mpreferred-stack-boundary=2)
7208 KBUILD_CFLAGS += $(call cc-option, -m32)
7209+ifdef CONSTIFY_PLUGIN
7210+KBUILD_CFLAGS += $(CONSTIFY_PLUGIN) -fplugin-arg-constify_plugin-no-constify
7211+endif
7212 KBUILD_AFLAGS := $(KBUILD_CFLAGS) -D__ASSEMBLY__
7213 GCOV_PROFILE := n
7214
7215diff --git a/arch/x86/boot/bitops.h b/arch/x86/boot/bitops.h
7216index 878e4b9..20537ab 100644
7217--- a/arch/x86/boot/bitops.h
7218+++ b/arch/x86/boot/bitops.h
7219@@ -26,7 +26,7 @@ static inline int variable_test_bit(int nr, const void *addr)
7220 u8 v;
7221 const u32 *p = (const u32 *)addr;
7222
7223- asm("btl %2,%1; setc %0" : "=qm" (v) : "m" (*p), "Ir" (nr));
7224+ asm volatile("btl %2,%1; setc %0" : "=qm" (v) : "m" (*p), "Ir" (nr));
7225 return v;
7226 }
7227
7228@@ -37,7 +37,7 @@ static inline int variable_test_bit(int nr, const void *addr)
7229
7230 static inline void set_bit(int nr, void *addr)
7231 {
7232- asm("btsl %1,%0" : "+m" (*(u32 *)addr) : "Ir" (nr));
7233+ asm volatile("btsl %1,%0" : "+m" (*(u32 *)addr) : "Ir" (nr));
7234 }
7235
7236 #endif /* BOOT_BITOPS_H */
7237diff --git a/arch/x86/boot/boot.h b/arch/x86/boot/boot.h
7238index c7093bd..d4247ffe0 100644
7239--- a/arch/x86/boot/boot.h
7240+++ b/arch/x86/boot/boot.h
7241@@ -85,7 +85,7 @@ static inline void io_delay(void)
7242 static inline u16 ds(void)
7243 {
7244 u16 seg;
7245- asm("movw %%ds,%0" : "=rm" (seg));
7246+ asm volatile("movw %%ds,%0" : "=rm" (seg));
7247 return seg;
7248 }
7249
7250@@ -181,7 +181,7 @@ static inline void wrgs32(u32 v, addr_t addr)
7251 static inline int memcmp(const void *s1, const void *s2, size_t len)
7252 {
7253 u8 diff;
7254- asm("repe; cmpsb; setnz %0"
7255+ asm volatile("repe; cmpsb; setnz %0"
7256 : "=qm" (diff), "+D" (s1), "+S" (s2), "+c" (len));
7257 return diff;
7258 }
7259diff --git a/arch/x86/boot/compressed/Makefile b/arch/x86/boot/compressed/Makefile
7260index 09664ef..edc5d03 100644
7261--- a/arch/x86/boot/compressed/Makefile
7262+++ b/arch/x86/boot/compressed/Makefile
7263@@ -14,6 +14,9 @@ cflags-$(CONFIG_X86_64) := -mcmodel=small
7264 KBUILD_CFLAGS += $(cflags-y)
7265 KBUILD_CFLAGS += $(call cc-option,-ffreestanding)
7266 KBUILD_CFLAGS += $(call cc-option,-fno-stack-protector)
7267+ifdef CONSTIFY_PLUGIN
7268+KBUILD_CFLAGS += $(CONSTIFY_PLUGIN) -fplugin-arg-constify_plugin-no-constify
7269+endif
7270
7271 KBUILD_AFLAGS := $(KBUILD_CFLAGS) -D__ASSEMBLY__
7272 GCOV_PROFILE := n
7273diff --git a/arch/x86/boot/compressed/head_32.S b/arch/x86/boot/compressed/head_32.S
7274index 67a655a..b924059 100644
7275--- a/arch/x86/boot/compressed/head_32.S
7276+++ b/arch/x86/boot/compressed/head_32.S
7277@@ -76,7 +76,7 @@ ENTRY(startup_32)
7278 notl %eax
7279 andl %eax, %ebx
7280 #else
7281- movl $LOAD_PHYSICAL_ADDR, %ebx
7282+ movl $____LOAD_PHYSICAL_ADDR, %ebx
7283 #endif
7284
7285 /* Target address to relocate to for decompression */
7286@@ -162,7 +162,7 @@ relocated:
7287 * and where it was actually loaded.
7288 */
7289 movl %ebp, %ebx
7290- subl $LOAD_PHYSICAL_ADDR, %ebx
7291+ subl $____LOAD_PHYSICAL_ADDR, %ebx
7292 jz 2f /* Nothing to be done if loaded at compiled addr. */
7293 /*
7294 * Process relocations.
7295@@ -170,8 +170,7 @@ relocated:
7296
7297 1: subl $4, %edi
7298 movl (%edi), %ecx
7299- testl %ecx, %ecx
7300- jz 2f
7301+ jecxz 2f
7302 addl %ebx, -__PAGE_OFFSET(%ebx, %ecx)
7303 jmp 1b
7304 2:
7305diff --git a/arch/x86/boot/compressed/head_64.S b/arch/x86/boot/compressed/head_64.S
7306index 35af09d..99c9676 100644
7307--- a/arch/x86/boot/compressed/head_64.S
7308+++ b/arch/x86/boot/compressed/head_64.S
7309@@ -91,7 +91,7 @@ ENTRY(startup_32)
7310 notl %eax
7311 andl %eax, %ebx
7312 #else
7313- movl $LOAD_PHYSICAL_ADDR, %ebx
7314+ movl $____LOAD_PHYSICAL_ADDR, %ebx
7315 #endif
7316
7317 /* Target address to relocate to for decompression */
7318@@ -233,7 +233,7 @@ ENTRY(startup_64)
7319 notq %rax
7320 andq %rax, %rbp
7321 #else
7322- movq $LOAD_PHYSICAL_ADDR, %rbp
7323+ movq $____LOAD_PHYSICAL_ADDR, %rbp
7324 #endif
7325
7326 /* Target address to relocate to for decompression */
7327diff --git a/arch/x86/boot/compressed/misc.c b/arch/x86/boot/compressed/misc.c
7328index 3a19d04..7c1d55a 100644
7329--- a/arch/x86/boot/compressed/misc.c
7330+++ b/arch/x86/boot/compressed/misc.c
7331@@ -310,7 +310,7 @@ static void parse_elf(void *output)
7332 case PT_LOAD:
7333 #ifdef CONFIG_RELOCATABLE
7334 dest = output;
7335- dest += (phdr->p_paddr - LOAD_PHYSICAL_ADDR);
7336+ dest += (phdr->p_paddr - ____LOAD_PHYSICAL_ADDR);
7337 #else
7338 dest = (void *)(phdr->p_paddr);
7339 #endif
7340@@ -363,7 +363,7 @@ asmlinkage void decompress_kernel(void *rmode, memptr heap,
7341 error("Destination address too large");
7342 #endif
7343 #ifndef CONFIG_RELOCATABLE
7344- if ((unsigned long)output != LOAD_PHYSICAL_ADDR)
7345+ if ((unsigned long)output != ____LOAD_PHYSICAL_ADDR)
7346 error("Wrong destination address");
7347 #endif
7348
7349diff --git a/arch/x86/boot/compressed/relocs.c b/arch/x86/boot/compressed/relocs.c
7350index 89bbf4e..869908e 100644
7351--- a/arch/x86/boot/compressed/relocs.c
7352+++ b/arch/x86/boot/compressed/relocs.c
7353@@ -13,8 +13,11 @@
7354
7355 static void die(char *fmt, ...);
7356
7357+#include "../../../../include/generated/autoconf.h"
7358+
7359 #define ARRAY_SIZE(x) (sizeof(x) / sizeof((x)[0]))
7360 static Elf32_Ehdr ehdr;
7361+static Elf32_Phdr *phdr;
7362 static unsigned long reloc_count, reloc_idx;
7363 static unsigned long *relocs;
7364
7365@@ -270,9 +273,39 @@ static void read_ehdr(FILE *fp)
7366 }
7367 }
7368
7369+static void read_phdrs(FILE *fp)
7370+{
7371+ unsigned int i;
7372+
7373+ phdr = calloc(ehdr.e_phnum, sizeof(Elf32_Phdr));
7374+ if (!phdr) {
7375+ die("Unable to allocate %d program headers\n",
7376+ ehdr.e_phnum);
7377+ }
7378+ if (fseek(fp, ehdr.e_phoff, SEEK_SET) < 0) {
7379+ die("Seek to %d failed: %s\n",
7380+ ehdr.e_phoff, strerror(errno));
7381+ }
7382+ if (fread(phdr, sizeof(*phdr), ehdr.e_phnum, fp) != ehdr.e_phnum) {
7383+ die("Cannot read ELF program headers: %s\n",
7384+ strerror(errno));
7385+ }
7386+ for(i = 0; i < ehdr.e_phnum; i++) {
7387+ phdr[i].p_type = elf32_to_cpu(phdr[i].p_type);
7388+ phdr[i].p_offset = elf32_to_cpu(phdr[i].p_offset);
7389+ phdr[i].p_vaddr = elf32_to_cpu(phdr[i].p_vaddr);
7390+ phdr[i].p_paddr = elf32_to_cpu(phdr[i].p_paddr);
7391+ phdr[i].p_filesz = elf32_to_cpu(phdr[i].p_filesz);
7392+ phdr[i].p_memsz = elf32_to_cpu(phdr[i].p_memsz);
7393+ phdr[i].p_flags = elf32_to_cpu(phdr[i].p_flags);
7394+ phdr[i].p_align = elf32_to_cpu(phdr[i].p_align);
7395+ }
7396+
7397+}
7398+
7399 static void read_shdrs(FILE *fp)
7400 {
7401- int i;
7402+ unsigned int i;
7403 Elf32_Shdr shdr;
7404
7405 secs = calloc(ehdr.e_shnum, sizeof(struct section));
7406@@ -307,7 +340,7 @@ static void read_shdrs(FILE *fp)
7407
7408 static void read_strtabs(FILE *fp)
7409 {
7410- int i;
7411+ unsigned int i;
7412 for (i = 0; i < ehdr.e_shnum; i++) {
7413 struct section *sec = &secs[i];
7414 if (sec->shdr.sh_type != SHT_STRTAB) {
7415@@ -332,7 +365,7 @@ static void read_strtabs(FILE *fp)
7416
7417 static void read_symtabs(FILE *fp)
7418 {
7419- int i,j;
7420+ unsigned int i,j;
7421 for (i = 0; i < ehdr.e_shnum; i++) {
7422 struct section *sec = &secs[i];
7423 if (sec->shdr.sh_type != SHT_SYMTAB) {
7424@@ -365,7 +398,9 @@ static void read_symtabs(FILE *fp)
7425
7426 static void read_relocs(FILE *fp)
7427 {
7428- int i,j;
7429+ unsigned int i,j;
7430+ uint32_t base;
7431+
7432 for (i = 0; i < ehdr.e_shnum; i++) {
7433 struct section *sec = &secs[i];
7434 if (sec->shdr.sh_type != SHT_REL) {
7435@@ -385,9 +420,18 @@ static void read_relocs(FILE *fp)
7436 die("Cannot read symbol table: %s\n",
7437 strerror(errno));
7438 }
7439+ base = 0;
7440+ for (j = 0; j < ehdr.e_phnum; j++) {
7441+ if (phdr[j].p_type != PT_LOAD )
7442+ continue;
7443+ 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)
7444+ continue;
7445+ base = CONFIG_PAGE_OFFSET + phdr[j].p_paddr - phdr[j].p_vaddr;
7446+ break;
7447+ }
7448 for (j = 0; j < sec->shdr.sh_size/sizeof(Elf32_Rel); j++) {
7449 Elf32_Rel *rel = &sec->reltab[j];
7450- rel->r_offset = elf32_to_cpu(rel->r_offset);
7451+ rel->r_offset = elf32_to_cpu(rel->r_offset) + base;
7452 rel->r_info = elf32_to_cpu(rel->r_info);
7453 }
7454 }
7455@@ -396,14 +440,14 @@ static void read_relocs(FILE *fp)
7456
7457 static void print_absolute_symbols(void)
7458 {
7459- int i;
7460+ unsigned int i;
7461 printf("Absolute symbols\n");
7462 printf(" Num: Value Size Type Bind Visibility Name\n");
7463 for (i = 0; i < ehdr.e_shnum; i++) {
7464 struct section *sec = &secs[i];
7465 char *sym_strtab;
7466 Elf32_Sym *sh_symtab;
7467- int j;
7468+ unsigned int j;
7469
7470 if (sec->shdr.sh_type != SHT_SYMTAB) {
7471 continue;
7472@@ -431,14 +475,14 @@ static void print_absolute_symbols(void)
7473
7474 static void print_absolute_relocs(void)
7475 {
7476- int i, printed = 0;
7477+ unsigned int i, printed = 0;
7478
7479 for (i = 0; i < ehdr.e_shnum; i++) {
7480 struct section *sec = &secs[i];
7481 struct section *sec_applies, *sec_symtab;
7482 char *sym_strtab;
7483 Elf32_Sym *sh_symtab;
7484- int j;
7485+ unsigned int j;
7486 if (sec->shdr.sh_type != SHT_REL) {
7487 continue;
7488 }
7489@@ -499,13 +543,13 @@ static void print_absolute_relocs(void)
7490
7491 static void walk_relocs(void (*visit)(Elf32_Rel *rel, Elf32_Sym *sym))
7492 {
7493- int i;
7494+ unsigned int i;
7495 /* Walk through the relocations */
7496 for (i = 0; i < ehdr.e_shnum; i++) {
7497 char *sym_strtab;
7498 Elf32_Sym *sh_symtab;
7499 struct section *sec_applies, *sec_symtab;
7500- int j;
7501+ unsigned int j;
7502 struct section *sec = &secs[i];
7503
7504 if (sec->shdr.sh_type != SHT_REL) {
7505@@ -530,6 +574,22 @@ static void walk_relocs(void (*visit)(Elf32_Rel *rel, Elf32_Sym *sym))
7506 !is_rel_reloc(sym_name(sym_strtab, sym))) {
7507 continue;
7508 }
7509+ /* Don't relocate actual per-cpu variables, they are absolute indices, not addresses */
7510+ if (!strcmp(sec_name(sym->st_shndx), ".data..percpu") && strcmp(sym_name(sym_strtab, sym), "__per_cpu_load"))
7511+ continue;
7512+
7513+#if defined(CONFIG_PAX_KERNEXEC) && defined(CONFIG_X86_32)
7514+ /* Don't relocate actual code, they are relocated implicitly by the base address of KERNEL_CS */
7515+ if (!strcmp(sec_name(sym->st_shndx), ".module.text") && !strcmp(sym_name(sym_strtab, sym), "_etext"))
7516+ continue;
7517+ if (!strcmp(sec_name(sym->st_shndx), ".init.text"))
7518+ continue;
7519+ if (!strcmp(sec_name(sym->st_shndx), ".exit.text"))
7520+ continue;
7521+ if (!strcmp(sec_name(sym->st_shndx), ".text") && strcmp(sym_name(sym_strtab, sym), "__LOAD_PHYSICAL_ADDR"))
7522+ continue;
7523+#endif
7524+
7525 switch (r_type) {
7526 case R_386_NONE:
7527 case R_386_PC32:
7528@@ -571,7 +631,7 @@ static int cmp_relocs(const void *va, const void *vb)
7529
7530 static void emit_relocs(int as_text)
7531 {
7532- int i;
7533+ unsigned int i;
7534 /* Count how many relocations I have and allocate space for them. */
7535 reloc_count = 0;
7536 walk_relocs(count_reloc);
7537@@ -665,6 +725,7 @@ int main(int argc, char **argv)
7538 fname, strerror(errno));
7539 }
7540 read_ehdr(fp);
7541+ read_phdrs(fp);
7542 read_shdrs(fp);
7543 read_strtabs(fp);
7544 read_symtabs(fp);
7545diff --git a/arch/x86/boot/cpucheck.c b/arch/x86/boot/cpucheck.c
7546index 4d3ff03..e4972ff 100644
7547--- a/arch/x86/boot/cpucheck.c
7548+++ b/arch/x86/boot/cpucheck.c
7549@@ -74,7 +74,7 @@ static int has_fpu(void)
7550 u16 fcw = -1, fsw = -1;
7551 u32 cr0;
7552
7553- asm("movl %%cr0,%0" : "=r" (cr0));
7554+ asm volatile("movl %%cr0,%0" : "=r" (cr0));
7555 if (cr0 & (X86_CR0_EM|X86_CR0_TS)) {
7556 cr0 &= ~(X86_CR0_EM|X86_CR0_TS);
7557 asm volatile("movl %0,%%cr0" : : "r" (cr0));
7558@@ -90,7 +90,7 @@ static int has_eflag(u32 mask)
7559 {
7560 u32 f0, f1;
7561
7562- asm("pushfl ; "
7563+ asm volatile("pushfl ; "
7564 "pushfl ; "
7565 "popl %0 ; "
7566 "movl %0,%1 ; "
7567@@ -115,7 +115,7 @@ static void get_flags(void)
7568 set_bit(X86_FEATURE_FPU, cpu.flags);
7569
7570 if (has_eflag(X86_EFLAGS_ID)) {
7571- asm("cpuid"
7572+ asm volatile("cpuid"
7573 : "=a" (max_intel_level),
7574 "=b" (cpu_vendor[0]),
7575 "=d" (cpu_vendor[1]),
7576@@ -124,7 +124,7 @@ static void get_flags(void)
7577
7578 if (max_intel_level >= 0x00000001 &&
7579 max_intel_level <= 0x0000ffff) {
7580- asm("cpuid"
7581+ asm volatile("cpuid"
7582 : "=a" (tfms),
7583 "=c" (cpu.flags[4]),
7584 "=d" (cpu.flags[0])
7585@@ -136,7 +136,7 @@ static void get_flags(void)
7586 cpu.model += ((tfms >> 16) & 0xf) << 4;
7587 }
7588
7589- asm("cpuid"
7590+ asm volatile("cpuid"
7591 : "=a" (max_amd_level)
7592 : "a" (0x80000000)
7593 : "ebx", "ecx", "edx");
7594@@ -144,7 +144,7 @@ static void get_flags(void)
7595 if (max_amd_level >= 0x80000001 &&
7596 max_amd_level <= 0x8000ffff) {
7597 u32 eax = 0x80000001;
7598- asm("cpuid"
7599+ asm volatile("cpuid"
7600 : "+a" (eax),
7601 "=c" (cpu.flags[6]),
7602 "=d" (cpu.flags[1])
7603@@ -203,9 +203,9 @@ int check_cpu(int *cpu_level_ptr, int *req_level_ptr, u32 **err_flags_ptr)
7604 u32 ecx = MSR_K7_HWCR;
7605 u32 eax, edx;
7606
7607- asm("rdmsr" : "=a" (eax), "=d" (edx) : "c" (ecx));
7608+ asm volatile("rdmsr" : "=a" (eax), "=d" (edx) : "c" (ecx));
7609 eax &= ~(1 << 15);
7610- asm("wrmsr" : : "a" (eax), "d" (edx), "c" (ecx));
7611+ asm volatile("wrmsr" : : "a" (eax), "d" (edx), "c" (ecx));
7612
7613 get_flags(); /* Make sure it really did something */
7614 err = check_flags();
7615@@ -218,9 +218,9 @@ int check_cpu(int *cpu_level_ptr, int *req_level_ptr, u32 **err_flags_ptr)
7616 u32 ecx = MSR_VIA_FCR;
7617 u32 eax, edx;
7618
7619- asm("rdmsr" : "=a" (eax), "=d" (edx) : "c" (ecx));
7620+ asm volatile("rdmsr" : "=a" (eax), "=d" (edx) : "c" (ecx));
7621 eax |= (1<<1)|(1<<7);
7622- asm("wrmsr" : : "a" (eax), "d" (edx), "c" (ecx));
7623+ asm volatile("wrmsr" : : "a" (eax), "d" (edx), "c" (ecx));
7624
7625 set_bit(X86_FEATURE_CX8, cpu.flags);
7626 err = check_flags();
7627@@ -231,12 +231,12 @@ int check_cpu(int *cpu_level_ptr, int *req_level_ptr, u32 **err_flags_ptr)
7628 u32 eax, edx;
7629 u32 level = 1;
7630
7631- asm("rdmsr" : "=a" (eax), "=d" (edx) : "c" (ecx));
7632- asm("wrmsr" : : "a" (~0), "d" (edx), "c" (ecx));
7633- asm("cpuid"
7634+ asm volatile("rdmsr" : "=a" (eax), "=d" (edx) : "c" (ecx));
7635+ asm volatile("wrmsr" : : "a" (~0), "d" (edx), "c" (ecx));
7636+ asm volatile("cpuid"
7637 : "+a" (level), "=d" (cpu.flags[0])
7638 : : "ecx", "ebx");
7639- asm("wrmsr" : : "a" (eax), "d" (edx), "c" (ecx));
7640+ asm volatile("wrmsr" : : "a" (eax), "d" (edx), "c" (ecx));
7641
7642 err = check_flags();
7643 }
7644diff --git a/arch/x86/boot/header.S b/arch/x86/boot/header.S
7645index bdb4d45..0476680 100644
7646--- a/arch/x86/boot/header.S
7647+++ b/arch/x86/boot/header.S
7648@@ -224,7 +224,7 @@ setup_data: .quad 0 # 64-bit physical pointer to
7649 # single linked list of
7650 # struct setup_data
7651
7652-pref_address: .quad LOAD_PHYSICAL_ADDR # preferred load addr
7653+pref_address: .quad ____LOAD_PHYSICAL_ADDR # preferred load addr
7654
7655 #define ZO_INIT_SIZE (ZO__end - ZO_startup_32 + ZO_z_extract_offset)
7656 #define VO_INIT_SIZE (VO__end - VO__text)
7657diff --git a/arch/x86/boot/memory.c b/arch/x86/boot/memory.c
7658index db75d07..8e6d0af 100644
7659--- a/arch/x86/boot/memory.c
7660+++ b/arch/x86/boot/memory.c
7661@@ -19,7 +19,7 @@
7662
7663 static int detect_memory_e820(void)
7664 {
7665- int count = 0;
7666+ unsigned int count = 0;
7667 struct biosregs ireg, oreg;
7668 struct e820entry *desc = boot_params.e820_map;
7669 static struct e820entry buf; /* static so it is zeroed */
7670diff --git a/arch/x86/boot/video-vesa.c b/arch/x86/boot/video-vesa.c
7671index 11e8c6e..fdbb1ed 100644
7672--- a/arch/x86/boot/video-vesa.c
7673+++ b/arch/x86/boot/video-vesa.c
7674@@ -200,6 +200,7 @@ static void vesa_store_pm_info(void)
7675
7676 boot_params.screen_info.vesapm_seg = oreg.es;
7677 boot_params.screen_info.vesapm_off = oreg.di;
7678+ boot_params.screen_info.vesapm_size = oreg.cx;
7679 }
7680
7681 /*
7682diff --git a/arch/x86/boot/video.c b/arch/x86/boot/video.c
7683index 43eda28..5ab5fdb 100644
7684--- a/arch/x86/boot/video.c
7685+++ b/arch/x86/boot/video.c
7686@@ -96,7 +96,7 @@ static void store_mode_params(void)
7687 static unsigned int get_entry(void)
7688 {
7689 char entry_buf[4];
7690- int i, len = 0;
7691+ unsigned int i, len = 0;
7692 int key;
7693 unsigned int v;
7694
7695diff --git a/arch/x86/crypto/aes-x86_64-asm_64.S b/arch/x86/crypto/aes-x86_64-asm_64.S
7696index 5b577d5..3c1fed4 100644
7697--- a/arch/x86/crypto/aes-x86_64-asm_64.S
7698+++ b/arch/x86/crypto/aes-x86_64-asm_64.S
7699@@ -8,6 +8,8 @@
7700 * including this sentence is retained in full.
7701 */
7702
7703+#include <asm/alternative-asm.h>
7704+
7705 .extern crypto_ft_tab
7706 .extern crypto_it_tab
7707 .extern crypto_fl_tab
7708@@ -71,6 +73,8 @@ FUNC: movq r1,r2; \
7709 je B192; \
7710 leaq 32(r9),r9;
7711
7712+#define ret pax_force_retaddr 0, 1; ret
7713+
7714 #define epilogue(r1,r2,r3,r4,r5,r6,r7,r8,r9) \
7715 movq r1,r2; \
7716 movq r3,r4; \
7717diff --git a/arch/x86/crypto/aesni-intel_asm.S b/arch/x86/crypto/aesni-intel_asm.S
7718index be6d9e3..21fbbca 100644
7719--- a/arch/x86/crypto/aesni-intel_asm.S
7720+++ b/arch/x86/crypto/aesni-intel_asm.S
7721@@ -31,6 +31,7 @@
7722
7723 #include <linux/linkage.h>
7724 #include <asm/inst.h>
7725+#include <asm/alternative-asm.h>
7726
7727 #ifdef __x86_64__
7728 .data
7729@@ -1436,7 +1437,9 @@ _return_T_done_decrypt:
7730 pop %r14
7731 pop %r13
7732 pop %r12
7733+ pax_force_retaddr 0, 1
7734 ret
7735+ENDPROC(aesni_gcm_dec)
7736
7737
7738 /*****************************************************************************
7739@@ -1699,7 +1702,9 @@ _return_T_done_encrypt:
7740 pop %r14
7741 pop %r13
7742 pop %r12
7743+ pax_force_retaddr 0, 1
7744 ret
7745+ENDPROC(aesni_gcm_enc)
7746
7747 #endif
7748
7749@@ -1714,6 +1719,7 @@ _key_expansion_256a:
7750 pxor %xmm1, %xmm0
7751 movaps %xmm0, (TKEYP)
7752 add $0x10, TKEYP
7753+ pax_force_retaddr_bts
7754 ret
7755
7756 .align 4
7757@@ -1738,6 +1744,7 @@ _key_expansion_192a:
7758 shufps $0b01001110, %xmm2, %xmm1
7759 movaps %xmm1, 0x10(TKEYP)
7760 add $0x20, TKEYP
7761+ pax_force_retaddr_bts
7762 ret
7763
7764 .align 4
7765@@ -1757,6 +1764,7 @@ _key_expansion_192b:
7766
7767 movaps %xmm0, (TKEYP)
7768 add $0x10, TKEYP
7769+ pax_force_retaddr_bts
7770 ret
7771
7772 .align 4
7773@@ -1769,6 +1777,7 @@ _key_expansion_256b:
7774 pxor %xmm1, %xmm2
7775 movaps %xmm2, (TKEYP)
7776 add $0x10, TKEYP
7777+ pax_force_retaddr_bts
7778 ret
7779
7780 /*
7781@@ -1881,7 +1890,9 @@ ENTRY(aesni_set_key)
7782 #ifndef __x86_64__
7783 popl KEYP
7784 #endif
7785+ pax_force_retaddr 0, 1
7786 ret
7787+ENDPROC(aesni_set_key)
7788
7789 /*
7790 * void aesni_enc(struct crypto_aes_ctx *ctx, u8 *dst, const u8 *src)
7791@@ -1902,7 +1913,9 @@ ENTRY(aesni_enc)
7792 popl KLEN
7793 popl KEYP
7794 #endif
7795+ pax_force_retaddr 0, 1
7796 ret
7797+ENDPROC(aesni_enc)
7798
7799 /*
7800 * _aesni_enc1: internal ABI
7801@@ -1959,6 +1972,7 @@ _aesni_enc1:
7802 AESENC KEY STATE
7803 movaps 0x70(TKEYP), KEY
7804 AESENCLAST KEY STATE
7805+ pax_force_retaddr_bts
7806 ret
7807
7808 /*
7809@@ -2067,6 +2081,7 @@ _aesni_enc4:
7810 AESENCLAST KEY STATE2
7811 AESENCLAST KEY STATE3
7812 AESENCLAST KEY STATE4
7813+ pax_force_retaddr_bts
7814 ret
7815
7816 /*
7817@@ -2089,7 +2104,9 @@ ENTRY(aesni_dec)
7818 popl KLEN
7819 popl KEYP
7820 #endif
7821+ pax_force_retaddr 0, 1
7822 ret
7823+ENDPROC(aesni_dec)
7824
7825 /*
7826 * _aesni_dec1: internal ABI
7827@@ -2146,6 +2163,7 @@ _aesni_dec1:
7828 AESDEC KEY STATE
7829 movaps 0x70(TKEYP), KEY
7830 AESDECLAST KEY STATE
7831+ pax_force_retaddr_bts
7832 ret
7833
7834 /*
7835@@ -2254,6 +2272,7 @@ _aesni_dec4:
7836 AESDECLAST KEY STATE2
7837 AESDECLAST KEY STATE3
7838 AESDECLAST KEY STATE4
7839+ pax_force_retaddr_bts
7840 ret
7841
7842 /*
7843@@ -2311,7 +2330,9 @@ ENTRY(aesni_ecb_enc)
7844 popl KEYP
7845 popl LEN
7846 #endif
7847+ pax_force_retaddr 0, 1
7848 ret
7849+ENDPROC(aesni_ecb_enc)
7850
7851 /*
7852 * void aesni_ecb_dec(struct crypto_aes_ctx *ctx, const u8 *dst, u8 *src,
7853@@ -2369,7 +2390,9 @@ ENTRY(aesni_ecb_dec)
7854 popl KEYP
7855 popl LEN
7856 #endif
7857+ pax_force_retaddr 0, 1
7858 ret
7859+ENDPROC(aesni_ecb_dec)
7860
7861 /*
7862 * void aesni_cbc_enc(struct crypto_aes_ctx *ctx, const u8 *dst, u8 *src,
7863@@ -2410,7 +2433,9 @@ ENTRY(aesni_cbc_enc)
7864 popl LEN
7865 popl IVP
7866 #endif
7867+ pax_force_retaddr 0, 1
7868 ret
7869+ENDPROC(aesni_cbc_enc)
7870
7871 /*
7872 * void aesni_cbc_dec(struct crypto_aes_ctx *ctx, const u8 *dst, u8 *src,
7873@@ -2498,7 +2523,9 @@ ENTRY(aesni_cbc_dec)
7874 popl LEN
7875 popl IVP
7876 #endif
7877+ pax_force_retaddr 0, 1
7878 ret
7879+ENDPROC(aesni_cbc_dec)
7880
7881 #ifdef __x86_64__
7882 .align 16
7883@@ -2524,6 +2551,7 @@ _aesni_inc_init:
7884 mov $1, TCTR_LOW
7885 MOVQ_R64_XMM TCTR_LOW INC
7886 MOVQ_R64_XMM CTR TCTR_LOW
7887+ pax_force_retaddr_bts
7888 ret
7889
7890 /*
7891@@ -2552,6 +2580,7 @@ _aesni_inc:
7892 .Linc_low:
7893 movaps CTR, IV
7894 PSHUFB_XMM BSWAP_MASK IV
7895+ pax_force_retaddr_bts
7896 ret
7897
7898 /*
7899@@ -2612,5 +2641,7 @@ ENTRY(aesni_ctr_enc)
7900 .Lctr_enc_ret:
7901 movups IV, (IVP)
7902 .Lctr_enc_just_ret:
7903+ pax_force_retaddr 0, 1
7904 ret
7905+ENDPROC(aesni_ctr_enc)
7906 #endif
7907diff --git a/arch/x86/crypto/blowfish-x86_64-asm_64.S b/arch/x86/crypto/blowfish-x86_64-asm_64.S
7908index 391d245..67f35c2 100644
7909--- a/arch/x86/crypto/blowfish-x86_64-asm_64.S
7910+++ b/arch/x86/crypto/blowfish-x86_64-asm_64.S
7911@@ -20,6 +20,8 @@
7912 *
7913 */
7914
7915+#include <asm/alternative-asm.h>
7916+
7917 .file "blowfish-x86_64-asm.S"
7918 .text
7919
7920@@ -151,9 +153,11 @@ __blowfish_enc_blk:
7921 jnz __enc_xor;
7922
7923 write_block();
7924+ pax_force_retaddr 0, 1
7925 ret;
7926 __enc_xor:
7927 xor_block();
7928+ pax_force_retaddr 0, 1
7929 ret;
7930
7931 .align 8
7932@@ -188,6 +192,7 @@ blowfish_dec_blk:
7933
7934 movq %r11, %rbp;
7935
7936+ pax_force_retaddr 0, 1
7937 ret;
7938
7939 /**********************************************************************
7940@@ -342,6 +347,7 @@ __blowfish_enc_blk_4way:
7941
7942 popq %rbx;
7943 popq %rbp;
7944+ pax_force_retaddr 0, 1
7945 ret;
7946
7947 __enc_xor4:
7948@@ -349,6 +355,7 @@ __enc_xor4:
7949
7950 popq %rbx;
7951 popq %rbp;
7952+ pax_force_retaddr 0, 1
7953 ret;
7954
7955 .align 8
7956@@ -386,5 +393,6 @@ blowfish_dec_blk_4way:
7957 popq %rbx;
7958 popq %rbp;
7959
7960+ pax_force_retaddr 0, 1
7961 ret;
7962
7963diff --git a/arch/x86/crypto/salsa20-x86_64-asm_64.S b/arch/x86/crypto/salsa20-x86_64-asm_64.S
7964index 6214a9b..1f4fc9a 100644
7965--- a/arch/x86/crypto/salsa20-x86_64-asm_64.S
7966+++ b/arch/x86/crypto/salsa20-x86_64-asm_64.S
7967@@ -1,3 +1,5 @@
7968+#include <asm/alternative-asm.h>
7969+
7970 # enter ECRYPT_encrypt_bytes
7971 .text
7972 .p2align 5
7973@@ -790,6 +792,7 @@ ECRYPT_encrypt_bytes:
7974 add %r11,%rsp
7975 mov %rdi,%rax
7976 mov %rsi,%rdx
7977+ pax_force_retaddr 0, 1
7978 ret
7979 # bytesatleast65:
7980 ._bytesatleast65:
7981@@ -891,6 +894,7 @@ ECRYPT_keysetup:
7982 add %r11,%rsp
7983 mov %rdi,%rax
7984 mov %rsi,%rdx
7985+ pax_force_retaddr
7986 ret
7987 # enter ECRYPT_ivsetup
7988 .text
7989@@ -917,4 +921,5 @@ ECRYPT_ivsetup:
7990 add %r11,%rsp
7991 mov %rdi,%rax
7992 mov %rsi,%rdx
7993+ pax_force_retaddr
7994 ret
7995diff --git a/arch/x86/crypto/sha1_ssse3_asm.S b/arch/x86/crypto/sha1_ssse3_asm.S
7996index b2c2f57..8470cab 100644
7997--- a/arch/x86/crypto/sha1_ssse3_asm.S
7998+++ b/arch/x86/crypto/sha1_ssse3_asm.S
7999@@ -28,6 +28,8 @@
8000 * (at your option) any later version.
8001 */
8002
8003+#include <asm/alternative-asm.h>
8004+
8005 #define CTX %rdi // arg1
8006 #define BUF %rsi // arg2
8007 #define CNT %rdx // arg3
8008@@ -104,6 +106,7 @@
8009 pop %r12
8010 pop %rbp
8011 pop %rbx
8012+ pax_force_retaddr 0, 1
8013 ret
8014
8015 .size \name, .-\name
8016diff --git a/arch/x86/crypto/twofish-x86_64-asm_64-3way.S b/arch/x86/crypto/twofish-x86_64-asm_64-3way.S
8017index 5b012a2..36d5364 100644
8018--- a/arch/x86/crypto/twofish-x86_64-asm_64-3way.S
8019+++ b/arch/x86/crypto/twofish-x86_64-asm_64-3way.S
8020@@ -20,6 +20,8 @@
8021 *
8022 */
8023
8024+#include <asm/alternative-asm.h>
8025+
8026 .file "twofish-x86_64-asm-3way.S"
8027 .text
8028
8029@@ -260,6 +262,7 @@ __twofish_enc_blk_3way:
8030 popq %r13;
8031 popq %r14;
8032 popq %r15;
8033+ pax_force_retaddr 0, 1
8034 ret;
8035
8036 __enc_xor3:
8037@@ -271,6 +274,7 @@ __enc_xor3:
8038 popq %r13;
8039 popq %r14;
8040 popq %r15;
8041+ pax_force_retaddr 0, 1
8042 ret;
8043
8044 .global twofish_dec_blk_3way
8045@@ -312,5 +316,6 @@ twofish_dec_blk_3way:
8046 popq %r13;
8047 popq %r14;
8048 popq %r15;
8049+ pax_force_retaddr 0, 1
8050 ret;
8051
8052diff --git a/arch/x86/crypto/twofish-x86_64-asm_64.S b/arch/x86/crypto/twofish-x86_64-asm_64.S
8053index 7bcf3fc..f53832f 100644
8054--- a/arch/x86/crypto/twofish-x86_64-asm_64.S
8055+++ b/arch/x86/crypto/twofish-x86_64-asm_64.S
8056@@ -21,6 +21,7 @@
8057 .text
8058
8059 #include <asm/asm-offsets.h>
8060+#include <asm/alternative-asm.h>
8061
8062 #define a_offset 0
8063 #define b_offset 4
8064@@ -268,6 +269,7 @@ twofish_enc_blk:
8065
8066 popq R1
8067 movq $1,%rax
8068+ pax_force_retaddr 0, 1
8069 ret
8070
8071 twofish_dec_blk:
8072@@ -319,4 +321,5 @@ twofish_dec_blk:
8073
8074 popq R1
8075 movq $1,%rax
8076+ pax_force_retaddr 0, 1
8077 ret
8078diff --git a/arch/x86/ia32/ia32_aout.c b/arch/x86/ia32/ia32_aout.c
8079index fd84387..887aa7e 100644
8080--- a/arch/x86/ia32/ia32_aout.c
8081+++ b/arch/x86/ia32/ia32_aout.c
8082@@ -162,6 +162,8 @@ static int aout_core_dump(long signr, struct pt_regs *regs, struct file *file,
8083 unsigned long dump_start, dump_size;
8084 struct user32 dump;
8085
8086+ memset(&dump, 0, sizeof(dump));
8087+
8088 fs = get_fs();
8089 set_fs(KERNEL_DS);
8090 has_dumped = 1;
8091@@ -315,6 +317,13 @@ static int load_aout_binary(struct linux_binprm *bprm, struct pt_regs *regs)
8092 current->mm->free_area_cache = TASK_UNMAPPED_BASE;
8093 current->mm->cached_hole_size = 0;
8094
8095+ retval = setup_arg_pages(bprm, IA32_STACK_TOP, EXSTACK_DEFAULT);
8096+ if (retval < 0) {
8097+ /* Someone check-me: is this error path enough? */
8098+ send_sig(SIGKILL, current, 0);
8099+ return retval;
8100+ }
8101+
8102 install_exec_creds(bprm);
8103 current->flags &= ~PF_FORKNOEXEC;
8104
8105@@ -410,13 +419,6 @@ beyond_if:
8106
8107 set_brk(current->mm->start_brk, current->mm->brk);
8108
8109- retval = setup_arg_pages(bprm, IA32_STACK_TOP, EXSTACK_DEFAULT);
8110- if (retval < 0) {
8111- /* Someone check-me: is this error path enough? */
8112- send_sig(SIGKILL, current, 0);
8113- return retval;
8114- }
8115-
8116 current->mm->start_stack =
8117 (unsigned long)create_aout_tables((char __user *)bprm->p, bprm);
8118 /* start thread */
8119diff --git a/arch/x86/ia32/ia32_signal.c b/arch/x86/ia32/ia32_signal.c
8120index 6557769..ef6ae89 100644
8121--- a/arch/x86/ia32/ia32_signal.c
8122+++ b/arch/x86/ia32/ia32_signal.c
8123@@ -169,7 +169,7 @@ asmlinkage long sys32_sigaltstack(const stack_ia32_t __user *uss_ptr,
8124 }
8125 seg = get_fs();
8126 set_fs(KERNEL_DS);
8127- ret = do_sigaltstack(uss_ptr ? &uss : NULL, &uoss, regs->sp);
8128+ ret = do_sigaltstack(uss_ptr ? (const stack_t __force_user *)&uss : NULL, (stack_t __force_user *)&uoss, regs->sp);
8129 set_fs(seg);
8130 if (ret >= 0 && uoss_ptr) {
8131 if (!access_ok(VERIFY_WRITE, uoss_ptr, sizeof(stack_ia32_t)))
8132@@ -370,7 +370,7 @@ static int ia32_setup_sigcontext(struct sigcontext_ia32 __user *sc,
8133 */
8134 static void __user *get_sigframe(struct k_sigaction *ka, struct pt_regs *regs,
8135 size_t frame_size,
8136- void **fpstate)
8137+ void __user **fpstate)
8138 {
8139 unsigned long sp;
8140
8141@@ -391,7 +391,7 @@ static void __user *get_sigframe(struct k_sigaction *ka, struct pt_regs *regs,
8142
8143 if (used_math()) {
8144 sp = sp - sig_xstate_ia32_size;
8145- *fpstate = (struct _fpstate_ia32 *) sp;
8146+ *fpstate = (struct _fpstate_ia32 __user *) sp;
8147 if (save_i387_xstate_ia32(*fpstate) < 0)
8148 return (void __user *) -1L;
8149 }
8150@@ -399,7 +399,7 @@ static void __user *get_sigframe(struct k_sigaction *ka, struct pt_regs *regs,
8151 sp -= frame_size;
8152 /* Align the stack pointer according to the i386 ABI,
8153 * i.e. so that on function entry ((sp + 4) & 15) == 0. */
8154- sp = ((sp + 4) & -16ul) - 4;
8155+ sp = ((sp - 12) & -16ul) - 4;
8156 return (void __user *) sp;
8157 }
8158
8159@@ -457,7 +457,7 @@ int ia32_setup_frame(int sig, struct k_sigaction *ka,
8160 * These are actually not used anymore, but left because some
8161 * gdb versions depend on them as a marker.
8162 */
8163- put_user_ex(*((u64 *)&code), (u64 *)frame->retcode);
8164+ put_user_ex(*((const u64 *)&code), (u64 __user *)frame->retcode);
8165 } put_user_catch(err);
8166
8167 if (err)
8168@@ -499,7 +499,7 @@ int ia32_setup_rt_frame(int sig, struct k_sigaction *ka, siginfo_t *info,
8169 0xb8,
8170 __NR_ia32_rt_sigreturn,
8171 0x80cd,
8172- 0,
8173+ 0
8174 };
8175
8176 frame = get_sigframe(ka, regs, sizeof(*frame), &fpstate);
8177@@ -529,16 +529,18 @@ int ia32_setup_rt_frame(int sig, struct k_sigaction *ka, siginfo_t *info,
8178
8179 if (ka->sa.sa_flags & SA_RESTORER)
8180 restorer = ka->sa.sa_restorer;
8181+ else if (current->mm->context.vdso)
8182+ /* Return stub is in 32bit vsyscall page */
8183+ restorer = VDSO32_SYMBOL(current->mm->context.vdso, rt_sigreturn);
8184 else
8185- restorer = VDSO32_SYMBOL(current->mm->context.vdso,
8186- rt_sigreturn);
8187+ restorer = &frame->retcode;
8188 put_user_ex(ptr_to_compat(restorer), &frame->pretcode);
8189
8190 /*
8191 * Not actually used anymore, but left because some gdb
8192 * versions need it.
8193 */
8194- put_user_ex(*((u64 *)&code), (u64 *)frame->retcode);
8195+ put_user_ex(*((const u64 *)&code), (u64 __user *)frame->retcode);
8196 } put_user_catch(err);
8197
8198 if (err)
8199diff --git a/arch/x86/ia32/ia32entry.S b/arch/x86/ia32/ia32entry.S
8200index a6253ec..4ad2120 100644
8201--- a/arch/x86/ia32/ia32entry.S
8202+++ b/arch/x86/ia32/ia32entry.S
8203@@ -13,7 +13,9 @@
8204 #include <asm/thread_info.h>
8205 #include <asm/segment.h>
8206 #include <asm/irqflags.h>
8207+#include <asm/pgtable.h>
8208 #include <linux/linkage.h>
8209+#include <asm/alternative-asm.h>
8210
8211 /* Avoid __ASSEMBLER__'ifying <linux/audit.h> just for this. */
8212 #include <linux/elf-em.h>
8213@@ -95,6 +97,32 @@ ENTRY(native_irq_enable_sysexit)
8214 ENDPROC(native_irq_enable_sysexit)
8215 #endif
8216
8217+ .macro pax_enter_kernel_user
8218+ pax_set_fptr_mask
8219+#ifdef CONFIG_PAX_MEMORY_UDEREF
8220+ call pax_enter_kernel_user
8221+#endif
8222+ .endm
8223+
8224+ .macro pax_exit_kernel_user
8225+#ifdef CONFIG_PAX_MEMORY_UDEREF
8226+ call pax_exit_kernel_user
8227+#endif
8228+#ifdef CONFIG_PAX_RANDKSTACK
8229+ pushq %rax
8230+ pushq %r11
8231+ call pax_randomize_kstack
8232+ popq %r11
8233+ popq %rax
8234+#endif
8235+ .endm
8236+
8237+.macro pax_erase_kstack
8238+#ifdef CONFIG_PAX_MEMORY_STACKLEAK
8239+ call pax_erase_kstack
8240+#endif
8241+.endm
8242+
8243 /*
8244 * 32bit SYSENTER instruction entry.
8245 *
8246@@ -121,12 +149,6 @@ ENTRY(ia32_sysenter_target)
8247 CFI_REGISTER rsp,rbp
8248 SWAPGS_UNSAFE_STACK
8249 movq PER_CPU_VAR(kernel_stack), %rsp
8250- addq $(KERNEL_STACK_OFFSET),%rsp
8251- /*
8252- * No need to follow this irqs on/off section: the syscall
8253- * disabled irqs, here we enable it straight after entry:
8254- */
8255- ENABLE_INTERRUPTS(CLBR_NONE)
8256 movl %ebp,%ebp /* zero extension */
8257 pushq_cfi $__USER32_DS
8258 /*CFI_REL_OFFSET ss,0*/
8259@@ -134,25 +156,39 @@ ENTRY(ia32_sysenter_target)
8260 CFI_REL_OFFSET rsp,0
8261 pushfq_cfi
8262 /*CFI_REL_OFFSET rflags,0*/
8263- movl 8*3-THREAD_SIZE+TI_sysenter_return(%rsp), %r10d
8264- CFI_REGISTER rip,r10
8265+ orl $X86_EFLAGS_IF,(%rsp)
8266+ GET_THREAD_INFO(%r11)
8267+ movl TI_sysenter_return(%r11), %r11d
8268+ CFI_REGISTER rip,r11
8269 pushq_cfi $__USER32_CS
8270 /*CFI_REL_OFFSET cs,0*/
8271 movl %eax, %eax
8272- pushq_cfi %r10
8273+ pushq_cfi %r11
8274 CFI_REL_OFFSET rip,0
8275 pushq_cfi %rax
8276 cld
8277 SAVE_ARGS 0,1,0
8278+ pax_enter_kernel_user
8279+ /*
8280+ * No need to follow this irqs on/off section: the syscall
8281+ * disabled irqs, here we enable it straight after entry:
8282+ */
8283+ ENABLE_INTERRUPTS(CLBR_NONE)
8284 /* no need to do an access_ok check here because rbp has been
8285 32bit zero extended */
8286+
8287+#ifdef CONFIG_PAX_MEMORY_UDEREF
8288+ mov $PAX_USER_SHADOW_BASE,%r11
8289+ add %r11,%rbp
8290+#endif
8291+
8292 1: movl (%rbp),%ebp
8293 .section __ex_table,"a"
8294 .quad 1b,ia32_badarg
8295 .previous
8296- GET_THREAD_INFO(%r10)
8297- orl $TS_COMPAT,TI_status(%r10)
8298- testl $_TIF_WORK_SYSCALL_ENTRY,TI_flags(%r10)
8299+ GET_THREAD_INFO(%r11)
8300+ orl $TS_COMPAT,TI_status(%r11)
8301+ testl $_TIF_WORK_SYSCALL_ENTRY,TI_flags(%r11)
8302 CFI_REMEMBER_STATE
8303 jnz sysenter_tracesys
8304 cmpq $(IA32_NR_syscalls-1),%rax
8305@@ -162,13 +198,15 @@ sysenter_do_call:
8306 sysenter_dispatch:
8307 call *ia32_sys_call_table(,%rax,8)
8308 movq %rax,RAX-ARGOFFSET(%rsp)
8309- GET_THREAD_INFO(%r10)
8310+ GET_THREAD_INFO(%r11)
8311 DISABLE_INTERRUPTS(CLBR_NONE)
8312 TRACE_IRQS_OFF
8313- testl $_TIF_ALLWORK_MASK,TI_flags(%r10)
8314+ testl $_TIF_ALLWORK_MASK,TI_flags(%r11)
8315 jnz sysexit_audit
8316 sysexit_from_sys_call:
8317- andl $~TS_COMPAT,TI_status(%r10)
8318+ pax_exit_kernel_user
8319+ pax_erase_kstack
8320+ andl $~TS_COMPAT,TI_status(%r11)
8321 /* clear IF, that popfq doesn't enable interrupts early */
8322 andl $~0x200,EFLAGS-R11(%rsp)
8323 movl RIP-R11(%rsp),%edx /* User %eip */
8324@@ -194,6 +232,9 @@ sysexit_from_sys_call:
8325 movl %eax,%esi /* 2nd arg: syscall number */
8326 movl $AUDIT_ARCH_I386,%edi /* 1st arg: audit arch */
8327 call audit_syscall_entry
8328+
8329+ pax_erase_kstack
8330+
8331 movl RAX-ARGOFFSET(%rsp),%eax /* reload syscall number */
8332 cmpq $(IA32_NR_syscalls-1),%rax
8333 ja ia32_badsys
8334@@ -205,7 +246,7 @@ sysexit_from_sys_call:
8335 .endm
8336
8337 .macro auditsys_exit exit
8338- testl $(_TIF_ALLWORK_MASK & ~_TIF_SYSCALL_AUDIT),TI_flags(%r10)
8339+ testl $(_TIF_ALLWORK_MASK & ~_TIF_SYSCALL_AUDIT),TI_flags(%r11)
8340 jnz ia32_ret_from_sys_call
8341 TRACE_IRQS_ON
8342 sti
8343@@ -215,12 +256,12 @@ sysexit_from_sys_call:
8344 movzbl %al,%edi /* zero-extend that into %edi */
8345 inc %edi /* first arg, 0->1(AUDITSC_SUCCESS), 1->2(AUDITSC_FAILURE) */
8346 call audit_syscall_exit
8347- GET_THREAD_INFO(%r10)
8348+ GET_THREAD_INFO(%r11)
8349 movl RAX-ARGOFFSET(%rsp),%eax /* reload syscall return value */
8350 movl $(_TIF_ALLWORK_MASK & ~_TIF_SYSCALL_AUDIT),%edi
8351 cli
8352 TRACE_IRQS_OFF
8353- testl %edi,TI_flags(%r10)
8354+ testl %edi,TI_flags(%r11)
8355 jz \exit
8356 CLEAR_RREGS -ARGOFFSET
8357 jmp int_with_check
8358@@ -238,7 +279,7 @@ sysexit_audit:
8359
8360 sysenter_tracesys:
8361 #ifdef CONFIG_AUDITSYSCALL
8362- testl $(_TIF_WORK_SYSCALL_ENTRY & ~_TIF_SYSCALL_AUDIT),TI_flags(%r10)
8363+ testl $(_TIF_WORK_SYSCALL_ENTRY & ~_TIF_SYSCALL_AUDIT),TI_flags(%r11)
8364 jz sysenter_auditsys
8365 #endif
8366 SAVE_REST
8367@@ -246,6 +287,9 @@ sysenter_tracesys:
8368 movq $-ENOSYS,RAX(%rsp)/* ptrace can change this for a bad syscall */
8369 movq %rsp,%rdi /* &pt_regs -> arg1 */
8370 call syscall_trace_enter
8371+
8372+ pax_erase_kstack
8373+
8374 LOAD_ARGS32 ARGOFFSET /* reload args from stack in case ptrace changed it */
8375 RESTORE_REST
8376 cmpq $(IA32_NR_syscalls-1),%rax
8377@@ -277,19 +321,20 @@ ENDPROC(ia32_sysenter_target)
8378 ENTRY(ia32_cstar_target)
8379 CFI_STARTPROC32 simple
8380 CFI_SIGNAL_FRAME
8381- CFI_DEF_CFA rsp,KERNEL_STACK_OFFSET
8382+ CFI_DEF_CFA rsp,0
8383 CFI_REGISTER rip,rcx
8384 /*CFI_REGISTER rflags,r11*/
8385 SWAPGS_UNSAFE_STACK
8386 movl %esp,%r8d
8387 CFI_REGISTER rsp,r8
8388 movq PER_CPU_VAR(kernel_stack),%rsp
8389+ SAVE_ARGS 8*6,0,0
8390+ pax_enter_kernel_user
8391 /*
8392 * No need to follow this irqs on/off section: the syscall
8393 * disabled irqs and here we enable it straight after entry:
8394 */
8395 ENABLE_INTERRUPTS(CLBR_NONE)
8396- SAVE_ARGS 8,0,0
8397 movl %eax,%eax /* zero extension */
8398 movq %rax,ORIG_RAX-ARGOFFSET(%rsp)
8399 movq %rcx,RIP-ARGOFFSET(%rsp)
8400@@ -305,13 +350,19 @@ ENTRY(ia32_cstar_target)
8401 /* no need to do an access_ok check here because r8 has been
8402 32bit zero extended */
8403 /* hardware stack frame is complete now */
8404+
8405+#ifdef CONFIG_PAX_MEMORY_UDEREF
8406+ mov $PAX_USER_SHADOW_BASE,%r11
8407+ add %r11,%r8
8408+#endif
8409+
8410 1: movl (%r8),%r9d
8411 .section __ex_table,"a"
8412 .quad 1b,ia32_badarg
8413 .previous
8414- GET_THREAD_INFO(%r10)
8415- orl $TS_COMPAT,TI_status(%r10)
8416- testl $_TIF_WORK_SYSCALL_ENTRY,TI_flags(%r10)
8417+ GET_THREAD_INFO(%r11)
8418+ orl $TS_COMPAT,TI_status(%r11)
8419+ testl $_TIF_WORK_SYSCALL_ENTRY,TI_flags(%r11)
8420 CFI_REMEMBER_STATE
8421 jnz cstar_tracesys
8422 cmpq $IA32_NR_syscalls-1,%rax
8423@@ -321,13 +372,15 @@ cstar_do_call:
8424 cstar_dispatch:
8425 call *ia32_sys_call_table(,%rax,8)
8426 movq %rax,RAX-ARGOFFSET(%rsp)
8427- GET_THREAD_INFO(%r10)
8428+ GET_THREAD_INFO(%r11)
8429 DISABLE_INTERRUPTS(CLBR_NONE)
8430 TRACE_IRQS_OFF
8431- testl $_TIF_ALLWORK_MASK,TI_flags(%r10)
8432+ testl $_TIF_ALLWORK_MASK,TI_flags(%r11)
8433 jnz sysretl_audit
8434 sysretl_from_sys_call:
8435- andl $~TS_COMPAT,TI_status(%r10)
8436+ pax_exit_kernel_user
8437+ pax_erase_kstack
8438+ andl $~TS_COMPAT,TI_status(%r11)
8439 RESTORE_ARGS 0,-ARG_SKIP,0,0,0
8440 movl RIP-ARGOFFSET(%rsp),%ecx
8441 CFI_REGISTER rip,rcx
8442@@ -355,7 +408,7 @@ sysretl_audit:
8443
8444 cstar_tracesys:
8445 #ifdef CONFIG_AUDITSYSCALL
8446- testl $(_TIF_WORK_SYSCALL_ENTRY & ~_TIF_SYSCALL_AUDIT),TI_flags(%r10)
8447+ testl $(_TIF_WORK_SYSCALL_ENTRY & ~_TIF_SYSCALL_AUDIT),TI_flags(%r11)
8448 jz cstar_auditsys
8449 #endif
8450 xchgl %r9d,%ebp
8451@@ -364,6 +417,9 @@ cstar_tracesys:
8452 movq $-ENOSYS,RAX(%rsp) /* ptrace can change this for a bad syscall */
8453 movq %rsp,%rdi /* &pt_regs -> arg1 */
8454 call syscall_trace_enter
8455+
8456+ pax_erase_kstack
8457+
8458 LOAD_ARGS32 ARGOFFSET, 1 /* reload args from stack in case ptrace changed it */
8459 RESTORE_REST
8460 xchgl %ebp,%r9d
8461@@ -409,20 +465,21 @@ ENTRY(ia32_syscall)
8462 CFI_REL_OFFSET rip,RIP-RIP
8463 PARAVIRT_ADJUST_EXCEPTION_FRAME
8464 SWAPGS
8465- /*
8466- * No need to follow this irqs on/off section: the syscall
8467- * disabled irqs and here we enable it straight after entry:
8468- */
8469- ENABLE_INTERRUPTS(CLBR_NONE)
8470 movl %eax,%eax
8471 pushq_cfi %rax
8472 cld
8473 /* note the registers are not zero extended to the sf.
8474 this could be a problem. */
8475 SAVE_ARGS 0,1,0
8476- GET_THREAD_INFO(%r10)
8477- orl $TS_COMPAT,TI_status(%r10)
8478- testl $_TIF_WORK_SYSCALL_ENTRY,TI_flags(%r10)
8479+ pax_enter_kernel_user
8480+ /*
8481+ * No need to follow this irqs on/off section: the syscall
8482+ * disabled irqs and here we enable it straight after entry:
8483+ */
8484+ ENABLE_INTERRUPTS(CLBR_NONE)
8485+ GET_THREAD_INFO(%r11)
8486+ orl $TS_COMPAT,TI_status(%r11)
8487+ testl $_TIF_WORK_SYSCALL_ENTRY,TI_flags(%r11)
8488 jnz ia32_tracesys
8489 cmpq $(IA32_NR_syscalls-1),%rax
8490 ja ia32_badsys
8491@@ -441,6 +498,9 @@ ia32_tracesys:
8492 movq $-ENOSYS,RAX(%rsp) /* ptrace can change this for a bad syscall */
8493 movq %rsp,%rdi /* &pt_regs -> arg1 */
8494 call syscall_trace_enter
8495+
8496+ pax_erase_kstack
8497+
8498 LOAD_ARGS32 ARGOFFSET /* reload args from stack in case ptrace changed it */
8499 RESTORE_REST
8500 cmpq $(IA32_NR_syscalls-1),%rax
8501@@ -455,6 +515,7 @@ ia32_badsys:
8502
8503 quiet_ni_syscall:
8504 movq $-ENOSYS,%rax
8505+ pax_force_retaddr
8506 ret
8507 CFI_ENDPROC
8508
8509diff --git a/arch/x86/ia32/sys_ia32.c b/arch/x86/ia32/sys_ia32.c
8510index f6f5c53..b358b28 100644
8511--- a/arch/x86/ia32/sys_ia32.c
8512+++ b/arch/x86/ia32/sys_ia32.c
8513@@ -69,8 +69,8 @@ asmlinkage long sys32_ftruncate64(unsigned int fd, unsigned long offset_low,
8514 */
8515 static int cp_stat64(struct stat64 __user *ubuf, struct kstat *stat)
8516 {
8517- typeof(ubuf->st_uid) uid = 0;
8518- typeof(ubuf->st_gid) gid = 0;
8519+ typeof(((struct stat64 *)0)->st_uid) uid = 0;
8520+ typeof(((struct stat64 *)0)->st_gid) gid = 0;
8521 SET_UID(uid, stat->uid);
8522 SET_GID(gid, stat->gid);
8523 if (!access_ok(VERIFY_WRITE, ubuf, sizeof(struct stat64)) ||
8524@@ -308,8 +308,8 @@ asmlinkage long sys32_rt_sigprocmask(int how, compat_sigset_t __user *set,
8525 }
8526 set_fs(KERNEL_DS);
8527 ret = sys_rt_sigprocmask(how,
8528- set ? (sigset_t __user *)&s : NULL,
8529- oset ? (sigset_t __user *)&s : NULL,
8530+ set ? (sigset_t __force_user *)&s : NULL,
8531+ oset ? (sigset_t __force_user *)&s : NULL,
8532 sigsetsize);
8533 set_fs(old_fs);
8534 if (ret)
8535@@ -332,7 +332,7 @@ asmlinkage long sys32_alarm(unsigned int seconds)
8536 return alarm_setitimer(seconds);
8537 }
8538
8539-asmlinkage long sys32_waitpid(compat_pid_t pid, unsigned int *stat_addr,
8540+asmlinkage long sys32_waitpid(compat_pid_t pid, unsigned int __user *stat_addr,
8541 int options)
8542 {
8543 return compat_sys_wait4(pid, stat_addr, options, NULL);
8544@@ -353,7 +353,7 @@ asmlinkage long sys32_sched_rr_get_interval(compat_pid_t pid,
8545 mm_segment_t old_fs = get_fs();
8546
8547 set_fs(KERNEL_DS);
8548- ret = sys_sched_rr_get_interval(pid, (struct timespec __user *)&t);
8549+ ret = sys_sched_rr_get_interval(pid, (struct timespec __force_user *)&t);
8550 set_fs(old_fs);
8551 if (put_compat_timespec(&t, interval))
8552 return -EFAULT;
8553@@ -369,7 +369,7 @@ asmlinkage long sys32_rt_sigpending(compat_sigset_t __user *set,
8554 mm_segment_t old_fs = get_fs();
8555
8556 set_fs(KERNEL_DS);
8557- ret = sys_rt_sigpending((sigset_t __user *)&s, sigsetsize);
8558+ ret = sys_rt_sigpending((sigset_t __force_user *)&s, sigsetsize);
8559 set_fs(old_fs);
8560 if (!ret) {
8561 switch (_NSIG_WORDS) {
8562@@ -394,7 +394,7 @@ asmlinkage long sys32_rt_sigqueueinfo(int pid, int sig,
8563 if (copy_siginfo_from_user32(&info, uinfo))
8564 return -EFAULT;
8565 set_fs(KERNEL_DS);
8566- ret = sys_rt_sigqueueinfo(pid, sig, (siginfo_t __user *)&info);
8567+ ret = sys_rt_sigqueueinfo(pid, sig, (siginfo_t __force_user *)&info);
8568 set_fs(old_fs);
8569 return ret;
8570 }
8571@@ -439,7 +439,7 @@ asmlinkage long sys32_sendfile(int out_fd, int in_fd,
8572 return -EFAULT;
8573
8574 set_fs(KERNEL_DS);
8575- ret = sys_sendfile(out_fd, in_fd, offset ? (off_t __user *)&of : NULL,
8576+ ret = sys_sendfile(out_fd, in_fd, offset ? (off_t __force_user *)&of : NULL,
8577 count);
8578 set_fs(old_fs);
8579
8580diff --git a/arch/x86/include/asm/alternative-asm.h b/arch/x86/include/asm/alternative-asm.h
8581index 091508b..7692c6f 100644
8582--- a/arch/x86/include/asm/alternative-asm.h
8583+++ b/arch/x86/include/asm/alternative-asm.h
8584@@ -4,10 +4,10 @@
8585
8586 #ifdef CONFIG_SMP
8587 .macro LOCK_PREFIX
8588-1: lock
8589+672: lock
8590 .section .smp_locks,"a"
8591 .balign 4
8592- .long 1b - .
8593+ .long 672b - .
8594 .previous
8595 .endm
8596 #else
8597@@ -15,6 +15,45 @@
8598 .endm
8599 #endif
8600
8601+#ifdef KERNEXEC_PLUGIN
8602+ .macro pax_force_retaddr_bts rip=0
8603+ btsq $63,\rip(%rsp)
8604+ .endm
8605+#ifdef CONFIG_PAX_KERNEXEC_PLUGIN_METHOD_BTS
8606+ .macro pax_force_retaddr rip=0, reload=0
8607+ btsq $63,\rip(%rsp)
8608+ .endm
8609+ .macro pax_force_fptr ptr
8610+ btsq $63,\ptr
8611+ .endm
8612+ .macro pax_set_fptr_mask
8613+ .endm
8614+#endif
8615+#ifdef CONFIG_PAX_KERNEXEC_PLUGIN_METHOD_OR
8616+ .macro pax_force_retaddr rip=0, reload=0
8617+ .if \reload
8618+ pax_set_fptr_mask
8619+ .endif
8620+ orq %r10,\rip(%rsp)
8621+ .endm
8622+ .macro pax_force_fptr ptr
8623+ orq %r10,\ptr
8624+ .endm
8625+ .macro pax_set_fptr_mask
8626+ movabs $0x8000000000000000,%r10
8627+ .endm
8628+#endif
8629+#else
8630+ .macro pax_force_retaddr rip=0, reload=0
8631+ .endm
8632+ .macro pax_force_fptr ptr
8633+ .endm
8634+ .macro pax_force_retaddr_bts rip=0
8635+ .endm
8636+ .macro pax_set_fptr_mask
8637+ .endm
8638+#endif
8639+
8640 .macro altinstruction_entry orig alt feature orig_len alt_len
8641 .long \orig - .
8642 .long \alt - .
8643diff --git a/arch/x86/include/asm/alternative.h b/arch/x86/include/asm/alternative.h
8644index 37ad100..7d47faa 100644
8645--- a/arch/x86/include/asm/alternative.h
8646+++ b/arch/x86/include/asm/alternative.h
8647@@ -89,7 +89,7 @@ static inline int alternatives_text_reserved(void *start, void *end)
8648 ".section .discard,\"aw\",@progbits\n" \
8649 " .byte 0xff + (664f-663f) - (662b-661b)\n" /* rlen <= slen */ \
8650 ".previous\n" \
8651- ".section .altinstr_replacement, \"ax\"\n" \
8652+ ".section .altinstr_replacement, \"a\"\n" \
8653 "663:\n\t" newinstr "\n664:\n" /* replacement */ \
8654 ".previous"
8655
8656diff --git a/arch/x86/include/asm/apic.h b/arch/x86/include/asm/apic.h
8657index 1a6c09a..fec2432 100644
8658--- a/arch/x86/include/asm/apic.h
8659+++ b/arch/x86/include/asm/apic.h
8660@@ -45,7 +45,7 @@ static inline void generic_apic_probe(void)
8661
8662 #ifdef CONFIG_X86_LOCAL_APIC
8663
8664-extern unsigned int apic_verbosity;
8665+extern int apic_verbosity;
8666 extern int local_apic_timer_c2_ok;
8667
8668 extern int disable_apic;
8669diff --git a/arch/x86/include/asm/apm.h b/arch/x86/include/asm/apm.h
8670index 20370c6..a2eb9b0 100644
8671--- a/arch/x86/include/asm/apm.h
8672+++ b/arch/x86/include/asm/apm.h
8673@@ -34,7 +34,7 @@ static inline void apm_bios_call_asm(u32 func, u32 ebx_in, u32 ecx_in,
8674 __asm__ __volatile__(APM_DO_ZERO_SEGS
8675 "pushl %%edi\n\t"
8676 "pushl %%ebp\n\t"
8677- "lcall *%%cs:apm_bios_entry\n\t"
8678+ "lcall *%%ss:apm_bios_entry\n\t"
8679 "setc %%al\n\t"
8680 "popl %%ebp\n\t"
8681 "popl %%edi\n\t"
8682@@ -58,7 +58,7 @@ static inline u8 apm_bios_call_simple_asm(u32 func, u32 ebx_in,
8683 __asm__ __volatile__(APM_DO_ZERO_SEGS
8684 "pushl %%edi\n\t"
8685 "pushl %%ebp\n\t"
8686- "lcall *%%cs:apm_bios_entry\n\t"
8687+ "lcall *%%ss:apm_bios_entry\n\t"
8688 "setc %%bl\n\t"
8689 "popl %%ebp\n\t"
8690 "popl %%edi\n\t"
8691diff --git a/arch/x86/include/asm/atomic.h b/arch/x86/include/asm/atomic.h
8692index 58cb6d4..ca9010d 100644
8693--- a/arch/x86/include/asm/atomic.h
8694+++ b/arch/x86/include/asm/atomic.h
8695@@ -22,7 +22,18 @@
8696 */
8697 static inline int atomic_read(const atomic_t *v)
8698 {
8699- return (*(volatile int *)&(v)->counter);
8700+ return (*(volatile const int *)&(v)->counter);
8701+}
8702+
8703+/**
8704+ * atomic_read_unchecked - read atomic variable
8705+ * @v: pointer of type atomic_unchecked_t
8706+ *
8707+ * Atomically reads the value of @v.
8708+ */
8709+static inline int atomic_read_unchecked(const atomic_unchecked_t *v)
8710+{
8711+ return (*(volatile const int *)&(v)->counter);
8712 }
8713
8714 /**
8715@@ -38,6 +49,18 @@ static inline void atomic_set(atomic_t *v, int i)
8716 }
8717
8718 /**
8719+ * atomic_set_unchecked - set atomic variable
8720+ * @v: pointer of type atomic_unchecked_t
8721+ * @i: required value
8722+ *
8723+ * Atomically sets the value of @v to @i.
8724+ */
8725+static inline void atomic_set_unchecked(atomic_unchecked_t *v, int i)
8726+{
8727+ v->counter = i;
8728+}
8729+
8730+/**
8731 * atomic_add - add integer to atomic variable
8732 * @i: integer value to add
8733 * @v: pointer of type atomic_t
8734@@ -46,7 +69,29 @@ static inline void atomic_set(atomic_t *v, int i)
8735 */
8736 static inline void atomic_add(int i, atomic_t *v)
8737 {
8738- asm volatile(LOCK_PREFIX "addl %1,%0"
8739+ asm volatile(LOCK_PREFIX "addl %1,%0\n"
8740+
8741+#ifdef CONFIG_PAX_REFCOUNT
8742+ "jno 0f\n"
8743+ LOCK_PREFIX "subl %1,%0\n"
8744+ "int $4\n0:\n"
8745+ _ASM_EXTABLE(0b, 0b)
8746+#endif
8747+
8748+ : "+m" (v->counter)
8749+ : "ir" (i));
8750+}
8751+
8752+/**
8753+ * atomic_add_unchecked - add integer to atomic variable
8754+ * @i: integer value to add
8755+ * @v: pointer of type atomic_unchecked_t
8756+ *
8757+ * Atomically adds @i to @v.
8758+ */
8759+static inline void atomic_add_unchecked(int i, atomic_unchecked_t *v)
8760+{
8761+ asm volatile(LOCK_PREFIX "addl %1,%0\n"
8762 : "+m" (v->counter)
8763 : "ir" (i));
8764 }
8765@@ -60,7 +105,29 @@ static inline void atomic_add(int i, atomic_t *v)
8766 */
8767 static inline void atomic_sub(int i, atomic_t *v)
8768 {
8769- asm volatile(LOCK_PREFIX "subl %1,%0"
8770+ asm volatile(LOCK_PREFIX "subl %1,%0\n"
8771+
8772+#ifdef CONFIG_PAX_REFCOUNT
8773+ "jno 0f\n"
8774+ LOCK_PREFIX "addl %1,%0\n"
8775+ "int $4\n0:\n"
8776+ _ASM_EXTABLE(0b, 0b)
8777+#endif
8778+
8779+ : "+m" (v->counter)
8780+ : "ir" (i));
8781+}
8782+
8783+/**
8784+ * atomic_sub_unchecked - subtract integer from atomic variable
8785+ * @i: integer value to subtract
8786+ * @v: pointer of type atomic_unchecked_t
8787+ *
8788+ * Atomically subtracts @i from @v.
8789+ */
8790+static inline void atomic_sub_unchecked(int i, atomic_unchecked_t *v)
8791+{
8792+ asm volatile(LOCK_PREFIX "subl %1,%0\n"
8793 : "+m" (v->counter)
8794 : "ir" (i));
8795 }
8796@@ -78,7 +145,16 @@ static inline int atomic_sub_and_test(int i, atomic_t *v)
8797 {
8798 unsigned char c;
8799
8800- asm volatile(LOCK_PREFIX "subl %2,%0; sete %1"
8801+ asm volatile(LOCK_PREFIX "subl %2,%0\n"
8802+
8803+#ifdef CONFIG_PAX_REFCOUNT
8804+ "jno 0f\n"
8805+ LOCK_PREFIX "addl %2,%0\n"
8806+ "int $4\n0:\n"
8807+ _ASM_EXTABLE(0b, 0b)
8808+#endif
8809+
8810+ "sete %1\n"
8811 : "+m" (v->counter), "=qm" (c)
8812 : "ir" (i) : "memory");
8813 return c;
8814@@ -92,7 +168,27 @@ static inline int atomic_sub_and_test(int i, atomic_t *v)
8815 */
8816 static inline void atomic_inc(atomic_t *v)
8817 {
8818- asm volatile(LOCK_PREFIX "incl %0"
8819+ asm volatile(LOCK_PREFIX "incl %0\n"
8820+
8821+#ifdef CONFIG_PAX_REFCOUNT
8822+ "jno 0f\n"
8823+ LOCK_PREFIX "decl %0\n"
8824+ "int $4\n0:\n"
8825+ _ASM_EXTABLE(0b, 0b)
8826+#endif
8827+
8828+ : "+m" (v->counter));
8829+}
8830+
8831+/**
8832+ * atomic_inc_unchecked - increment atomic variable
8833+ * @v: pointer of type atomic_unchecked_t
8834+ *
8835+ * Atomically increments @v by 1.
8836+ */
8837+static inline void atomic_inc_unchecked(atomic_unchecked_t *v)
8838+{
8839+ asm volatile(LOCK_PREFIX "incl %0\n"
8840 : "+m" (v->counter));
8841 }
8842
8843@@ -104,7 +200,27 @@ static inline void atomic_inc(atomic_t *v)
8844 */
8845 static inline void atomic_dec(atomic_t *v)
8846 {
8847- asm volatile(LOCK_PREFIX "decl %0"
8848+ asm volatile(LOCK_PREFIX "decl %0\n"
8849+
8850+#ifdef CONFIG_PAX_REFCOUNT
8851+ "jno 0f\n"
8852+ LOCK_PREFIX "incl %0\n"
8853+ "int $4\n0:\n"
8854+ _ASM_EXTABLE(0b, 0b)
8855+#endif
8856+
8857+ : "+m" (v->counter));
8858+}
8859+
8860+/**
8861+ * atomic_dec_unchecked - decrement atomic variable
8862+ * @v: pointer of type atomic_unchecked_t
8863+ *
8864+ * Atomically decrements @v by 1.
8865+ */
8866+static inline void atomic_dec_unchecked(atomic_unchecked_t *v)
8867+{
8868+ asm volatile(LOCK_PREFIX "decl %0\n"
8869 : "+m" (v->counter));
8870 }
8871
8872@@ -120,7 +236,16 @@ static inline int atomic_dec_and_test(atomic_t *v)
8873 {
8874 unsigned char c;
8875
8876- asm volatile(LOCK_PREFIX "decl %0; sete %1"
8877+ asm volatile(LOCK_PREFIX "decl %0\n"
8878+
8879+#ifdef CONFIG_PAX_REFCOUNT
8880+ "jno 0f\n"
8881+ LOCK_PREFIX "incl %0\n"
8882+ "int $4\n0:\n"
8883+ _ASM_EXTABLE(0b, 0b)
8884+#endif
8885+
8886+ "sete %1\n"
8887 : "+m" (v->counter), "=qm" (c)
8888 : : "memory");
8889 return c != 0;
8890@@ -138,7 +263,35 @@ static inline int atomic_inc_and_test(atomic_t *v)
8891 {
8892 unsigned char c;
8893
8894- asm volatile(LOCK_PREFIX "incl %0; sete %1"
8895+ asm volatile(LOCK_PREFIX "incl %0\n"
8896+
8897+#ifdef CONFIG_PAX_REFCOUNT
8898+ "jno 0f\n"
8899+ LOCK_PREFIX "decl %0\n"
8900+ "int $4\n0:\n"
8901+ _ASM_EXTABLE(0b, 0b)
8902+#endif
8903+
8904+ "sete %1\n"
8905+ : "+m" (v->counter), "=qm" (c)
8906+ : : "memory");
8907+ return c != 0;
8908+}
8909+
8910+/**
8911+ * atomic_inc_and_test_unchecked - increment and test
8912+ * @v: pointer of type atomic_unchecked_t
8913+ *
8914+ * Atomically increments @v by 1
8915+ * and returns true if the result is zero, or false for all
8916+ * other cases.
8917+ */
8918+static inline int atomic_inc_and_test_unchecked(atomic_unchecked_t *v)
8919+{
8920+ unsigned char c;
8921+
8922+ asm volatile(LOCK_PREFIX "incl %0\n"
8923+ "sete %1\n"
8924 : "+m" (v->counter), "=qm" (c)
8925 : : "memory");
8926 return c != 0;
8927@@ -157,7 +310,16 @@ static inline int atomic_add_negative(int i, atomic_t *v)
8928 {
8929 unsigned char c;
8930
8931- asm volatile(LOCK_PREFIX "addl %2,%0; sets %1"
8932+ asm volatile(LOCK_PREFIX "addl %2,%0\n"
8933+
8934+#ifdef CONFIG_PAX_REFCOUNT
8935+ "jno 0f\n"
8936+ LOCK_PREFIX "subl %2,%0\n"
8937+ "int $4\n0:\n"
8938+ _ASM_EXTABLE(0b, 0b)
8939+#endif
8940+
8941+ "sets %1\n"
8942 : "+m" (v->counter), "=qm" (c)
8943 : "ir" (i) : "memory");
8944 return c;
8945@@ -179,7 +341,7 @@ static inline int atomic_add_return(int i, atomic_t *v)
8946 goto no_xadd;
8947 #endif
8948 /* Modern 486+ processor */
8949- return i + xadd(&v->counter, i);
8950+ return i + xadd_check_overflow(&v->counter, i);
8951
8952 #ifdef CONFIG_M386
8953 no_xadd: /* Legacy 386 processor */
8954@@ -192,6 +354,34 @@ no_xadd: /* Legacy 386 processor */
8955 }
8956
8957 /**
8958+ * atomic_add_return_unchecked - add integer and return
8959+ * @i: integer value to add
8960+ * @v: pointer of type atomic_unchecked_t
8961+ *
8962+ * Atomically adds @i to @v and returns @i + @v
8963+ */
8964+static inline int atomic_add_return_unchecked(int i, atomic_unchecked_t *v)
8965+{
8966+#ifdef CONFIG_M386
8967+ int __i;
8968+ unsigned long flags;
8969+ if (unlikely(boot_cpu_data.x86 <= 3))
8970+ goto no_xadd;
8971+#endif
8972+ /* Modern 486+ processor */
8973+ return i + xadd(&v->counter, i);
8974+
8975+#ifdef CONFIG_M386
8976+no_xadd: /* Legacy 386 processor */
8977+ raw_local_irq_save(flags);
8978+ __i = atomic_read_unchecked(v);
8979+ atomic_set_unchecked(v, i + __i);
8980+ raw_local_irq_restore(flags);
8981+ return i + __i;
8982+#endif
8983+}
8984+
8985+/**
8986 * atomic_sub_return - subtract integer and return
8987 * @v: pointer of type atomic_t
8988 * @i: integer value to subtract
8989@@ -204,6 +394,10 @@ static inline int atomic_sub_return(int i, atomic_t *v)
8990 }
8991
8992 #define atomic_inc_return(v) (atomic_add_return(1, v))
8993+static inline int atomic_inc_return_unchecked(atomic_unchecked_t *v)
8994+{
8995+ return atomic_add_return_unchecked(1, v);
8996+}
8997 #define atomic_dec_return(v) (atomic_sub_return(1, v))
8998
8999 static inline int atomic_cmpxchg(atomic_t *v, int old, int new)
9000@@ -211,11 +405,21 @@ static inline int atomic_cmpxchg(atomic_t *v, int old, int new)
9001 return cmpxchg(&v->counter, old, new);
9002 }
9003
9004+static inline int atomic_cmpxchg_unchecked(atomic_unchecked_t *v, int old, int new)
9005+{
9006+ return cmpxchg(&v->counter, old, new);
9007+}
9008+
9009 static inline int atomic_xchg(atomic_t *v, int new)
9010 {
9011 return xchg(&v->counter, new);
9012 }
9013
9014+static inline int atomic_xchg_unchecked(atomic_unchecked_t *v, int new)
9015+{
9016+ return xchg(&v->counter, new);
9017+}
9018+
9019 /**
9020 * __atomic_add_unless - add unless the number is already a given value
9021 * @v: pointer of type atomic_t
9022@@ -227,12 +431,25 @@ static inline int atomic_xchg(atomic_t *v, int new)
9023 */
9024 static inline int __atomic_add_unless(atomic_t *v, int a, int u)
9025 {
9026- int c, old;
9027+ int c, old, new;
9028 c = atomic_read(v);
9029 for (;;) {
9030- if (unlikely(c == (u)))
9031+ if (unlikely(c == u))
9032 break;
9033- old = atomic_cmpxchg((v), c, c + (a));
9034+
9035+ asm volatile("addl %2,%0\n"
9036+
9037+#ifdef CONFIG_PAX_REFCOUNT
9038+ "jno 0f\n"
9039+ "subl %2,%0\n"
9040+ "int $4\n0:\n"
9041+ _ASM_EXTABLE(0b, 0b)
9042+#endif
9043+
9044+ : "=r" (new)
9045+ : "0" (c), "ir" (a));
9046+
9047+ old = atomic_cmpxchg(v, c, new);
9048 if (likely(old == c))
9049 break;
9050 c = old;
9051@@ -240,6 +457,48 @@ static inline int __atomic_add_unless(atomic_t *v, int a, int u)
9052 return c;
9053 }
9054
9055+/**
9056+ * atomic_inc_not_zero_hint - increment if not null
9057+ * @v: pointer of type atomic_t
9058+ * @hint: probable value of the atomic before the increment
9059+ *
9060+ * This version of atomic_inc_not_zero() gives a hint of probable
9061+ * value of the atomic. This helps processor to not read the memory
9062+ * before doing the atomic read/modify/write cycle, lowering
9063+ * number of bus transactions on some arches.
9064+ *
9065+ * Returns: 0 if increment was not done, 1 otherwise.
9066+ */
9067+#define atomic_inc_not_zero_hint atomic_inc_not_zero_hint
9068+static inline int atomic_inc_not_zero_hint(atomic_t *v, int hint)
9069+{
9070+ int val, c = hint, new;
9071+
9072+ /* sanity test, should be removed by compiler if hint is a constant */
9073+ if (!hint)
9074+ return __atomic_add_unless(v, 1, 0);
9075+
9076+ do {
9077+ asm volatile("incl %0\n"
9078+
9079+#ifdef CONFIG_PAX_REFCOUNT
9080+ "jno 0f\n"
9081+ "decl %0\n"
9082+ "int $4\n0:\n"
9083+ _ASM_EXTABLE(0b, 0b)
9084+#endif
9085+
9086+ : "=r" (new)
9087+ : "0" (c));
9088+
9089+ val = atomic_cmpxchg(v, c, new);
9090+ if (val == c)
9091+ return 1;
9092+ c = val;
9093+ } while (c);
9094+
9095+ return 0;
9096+}
9097
9098 /*
9099 * atomic_dec_if_positive - decrement by 1 if old value positive
9100diff --git a/arch/x86/include/asm/atomic64_32.h b/arch/x86/include/asm/atomic64_32.h
9101index 24098aa..1e37723 100644
9102--- a/arch/x86/include/asm/atomic64_32.h
9103+++ b/arch/x86/include/asm/atomic64_32.h
9104@@ -12,6 +12,14 @@ typedef struct {
9105 u64 __aligned(8) counter;
9106 } atomic64_t;
9107
9108+#ifdef CONFIG_PAX_REFCOUNT
9109+typedef struct {
9110+ u64 __aligned(8) counter;
9111+} atomic64_unchecked_t;
9112+#else
9113+typedef atomic64_t atomic64_unchecked_t;
9114+#endif
9115+
9116 #define ATOMIC64_INIT(val) { (val) }
9117
9118 #ifdef CONFIG_X86_CMPXCHG64
9119@@ -38,6 +46,21 @@ static inline long long atomic64_cmpxchg(atomic64_t *v, long long o, long long n
9120 }
9121
9122 /**
9123+ * atomic64_cmpxchg_unchecked - cmpxchg atomic64 variable
9124+ * @p: pointer to type atomic64_unchecked_t
9125+ * @o: expected value
9126+ * @n: new value
9127+ *
9128+ * Atomically sets @v to @n if it was equal to @o and returns
9129+ * the old value.
9130+ */
9131+
9132+static inline long long atomic64_cmpxchg_unchecked(atomic64_unchecked_t *v, long long o, long long n)
9133+{
9134+ return cmpxchg64(&v->counter, o, n);
9135+}
9136+
9137+/**
9138 * atomic64_xchg - xchg atomic64 variable
9139 * @v: pointer to type atomic64_t
9140 * @n: value to assign
9141@@ -77,6 +100,24 @@ static inline void atomic64_set(atomic64_t *v, long long i)
9142 }
9143
9144 /**
9145+ * atomic64_set_unchecked - set atomic64 variable
9146+ * @v: pointer to type atomic64_unchecked_t
9147+ * @n: value to assign
9148+ *
9149+ * Atomically sets the value of @v to @n.
9150+ */
9151+static inline void atomic64_set_unchecked(atomic64_unchecked_t *v, long long i)
9152+{
9153+ unsigned high = (unsigned)(i >> 32);
9154+ unsigned low = (unsigned)i;
9155+ asm volatile(ATOMIC64_ALTERNATIVE(set)
9156+ : "+b" (low), "+c" (high)
9157+ : "S" (v)
9158+ : "eax", "edx", "memory"
9159+ );
9160+}
9161+
9162+/**
9163 * atomic64_read - read atomic64 variable
9164 * @v: pointer to type atomic64_t
9165 *
9166@@ -93,6 +134,22 @@ static inline long long atomic64_read(atomic64_t *v)
9167 }
9168
9169 /**
9170+ * atomic64_read_unchecked - read atomic64 variable
9171+ * @v: pointer to type atomic64_unchecked_t
9172+ *
9173+ * Atomically reads the value of @v and returns it.
9174+ */
9175+static inline long long atomic64_read_unchecked(atomic64_unchecked_t *v)
9176+{
9177+ long long r;
9178+ asm volatile(ATOMIC64_ALTERNATIVE(read_unchecked)
9179+ : "=A" (r), "+c" (v)
9180+ : : "memory"
9181+ );
9182+ return r;
9183+ }
9184+
9185+/**
9186 * atomic64_add_return - add and return
9187 * @i: integer value to add
9188 * @v: pointer to type atomic64_t
9189@@ -108,6 +165,22 @@ static inline long long atomic64_add_return(long long i, atomic64_t *v)
9190 return i;
9191 }
9192
9193+/**
9194+ * atomic64_add_return_unchecked - add and return
9195+ * @i: integer value to add
9196+ * @v: pointer to type atomic64_unchecked_t
9197+ *
9198+ * Atomically adds @i to @v and returns @i + *@v
9199+ */
9200+static inline long long atomic64_add_return_unchecked(long long i, atomic64_unchecked_t *v)
9201+{
9202+ asm volatile(ATOMIC64_ALTERNATIVE(add_return_unchecked)
9203+ : "+A" (i), "+c" (v)
9204+ : : "memory"
9205+ );
9206+ return i;
9207+}
9208+
9209 /*
9210 * Other variants with different arithmetic operators:
9211 */
9212@@ -131,6 +204,17 @@ static inline long long atomic64_inc_return(atomic64_t *v)
9213 return a;
9214 }
9215
9216+static inline long long atomic64_inc_return_unchecked(atomic64_unchecked_t *v)
9217+{
9218+ long long a;
9219+ asm volatile(ATOMIC64_ALTERNATIVE(inc_return_unchecked)
9220+ : "=A" (a)
9221+ : "S" (v)
9222+ : "memory", "ecx"
9223+ );
9224+ return a;
9225+}
9226+
9227 static inline long long atomic64_dec_return(atomic64_t *v)
9228 {
9229 long long a;
9230@@ -159,6 +243,22 @@ static inline long long atomic64_add(long long i, atomic64_t *v)
9231 }
9232
9233 /**
9234+ * atomic64_add_unchecked - add integer to atomic64 variable
9235+ * @i: integer value to add
9236+ * @v: pointer to type atomic64_unchecked_t
9237+ *
9238+ * Atomically adds @i to @v.
9239+ */
9240+static inline long long atomic64_add_unchecked(long long i, atomic64_unchecked_t *v)
9241+{
9242+ asm volatile(ATOMIC64_ALTERNATIVE_(add_unchecked, add_return_unchecked)
9243+ : "+A" (i), "+c" (v)
9244+ : : "memory"
9245+ );
9246+ return i;
9247+}
9248+
9249+/**
9250 * atomic64_sub - subtract the atomic64 variable
9251 * @i: integer value to subtract
9252 * @v: pointer to type atomic64_t
9253diff --git a/arch/x86/include/asm/atomic64_64.h b/arch/x86/include/asm/atomic64_64.h
9254index 0e1cbfc..5623683 100644
9255--- a/arch/x86/include/asm/atomic64_64.h
9256+++ b/arch/x86/include/asm/atomic64_64.h
9257@@ -18,7 +18,19 @@
9258 */
9259 static inline long atomic64_read(const atomic64_t *v)
9260 {
9261- return (*(volatile long *)&(v)->counter);
9262+ return (*(volatile const long *)&(v)->counter);
9263+}
9264+
9265+/**
9266+ * atomic64_read_unchecked - read atomic64 variable
9267+ * @v: pointer of type atomic64_unchecked_t
9268+ *
9269+ * Atomically reads the value of @v.
9270+ * Doesn't imply a read memory barrier.
9271+ */
9272+static inline long atomic64_read_unchecked(const atomic64_unchecked_t *v)
9273+{
9274+ return (*(volatile const long *)&(v)->counter);
9275 }
9276
9277 /**
9278@@ -34,6 +46,18 @@ static inline void atomic64_set(atomic64_t *v, long i)
9279 }
9280
9281 /**
9282+ * atomic64_set_unchecked - set atomic64 variable
9283+ * @v: pointer to type atomic64_unchecked_t
9284+ * @i: required value
9285+ *
9286+ * Atomically sets the value of @v to @i.
9287+ */
9288+static inline void atomic64_set_unchecked(atomic64_unchecked_t *v, long i)
9289+{
9290+ v->counter = i;
9291+}
9292+
9293+/**
9294 * atomic64_add - add integer to atomic64 variable
9295 * @i: integer value to add
9296 * @v: pointer to type atomic64_t
9297@@ -42,6 +66,28 @@ static inline void atomic64_set(atomic64_t *v, long i)
9298 */
9299 static inline void atomic64_add(long i, atomic64_t *v)
9300 {
9301+ asm volatile(LOCK_PREFIX "addq %1,%0\n"
9302+
9303+#ifdef CONFIG_PAX_REFCOUNT
9304+ "jno 0f\n"
9305+ LOCK_PREFIX "subq %1,%0\n"
9306+ "int $4\n0:\n"
9307+ _ASM_EXTABLE(0b, 0b)
9308+#endif
9309+
9310+ : "=m" (v->counter)
9311+ : "er" (i), "m" (v->counter));
9312+}
9313+
9314+/**
9315+ * atomic64_add_unchecked - add integer to atomic64 variable
9316+ * @i: integer value to add
9317+ * @v: pointer to type atomic64_unchecked_t
9318+ *
9319+ * Atomically adds @i to @v.
9320+ */
9321+static inline void atomic64_add_unchecked(long i, atomic64_unchecked_t *v)
9322+{
9323 asm volatile(LOCK_PREFIX "addq %1,%0"
9324 : "=m" (v->counter)
9325 : "er" (i), "m" (v->counter));
9326@@ -56,7 +102,29 @@ static inline void atomic64_add(long i, atomic64_t *v)
9327 */
9328 static inline void atomic64_sub(long i, atomic64_t *v)
9329 {
9330- asm volatile(LOCK_PREFIX "subq %1,%0"
9331+ asm volatile(LOCK_PREFIX "subq %1,%0\n"
9332+
9333+#ifdef CONFIG_PAX_REFCOUNT
9334+ "jno 0f\n"
9335+ LOCK_PREFIX "addq %1,%0\n"
9336+ "int $4\n0:\n"
9337+ _ASM_EXTABLE(0b, 0b)
9338+#endif
9339+
9340+ : "=m" (v->counter)
9341+ : "er" (i), "m" (v->counter));
9342+}
9343+
9344+/**
9345+ * atomic64_sub_unchecked - subtract the atomic64 variable
9346+ * @i: integer value to subtract
9347+ * @v: pointer to type atomic64_unchecked_t
9348+ *
9349+ * Atomically subtracts @i from @v.
9350+ */
9351+static inline void atomic64_sub_unchecked(long i, atomic64_unchecked_t *v)
9352+{
9353+ asm volatile(LOCK_PREFIX "subq %1,%0\n"
9354 : "=m" (v->counter)
9355 : "er" (i), "m" (v->counter));
9356 }
9357@@ -74,7 +142,16 @@ static inline int atomic64_sub_and_test(long i, atomic64_t *v)
9358 {
9359 unsigned char c;
9360
9361- asm volatile(LOCK_PREFIX "subq %2,%0; sete %1"
9362+ asm volatile(LOCK_PREFIX "subq %2,%0\n"
9363+
9364+#ifdef CONFIG_PAX_REFCOUNT
9365+ "jno 0f\n"
9366+ LOCK_PREFIX "addq %2,%0\n"
9367+ "int $4\n0:\n"
9368+ _ASM_EXTABLE(0b, 0b)
9369+#endif
9370+
9371+ "sete %1\n"
9372 : "=m" (v->counter), "=qm" (c)
9373 : "er" (i), "m" (v->counter) : "memory");
9374 return c;
9375@@ -88,6 +165,27 @@ static inline int atomic64_sub_and_test(long i, atomic64_t *v)
9376 */
9377 static inline void atomic64_inc(atomic64_t *v)
9378 {
9379+ asm volatile(LOCK_PREFIX "incq %0\n"
9380+
9381+#ifdef CONFIG_PAX_REFCOUNT
9382+ "jno 0f\n"
9383+ LOCK_PREFIX "decq %0\n"
9384+ "int $4\n0:\n"
9385+ _ASM_EXTABLE(0b, 0b)
9386+#endif
9387+
9388+ : "=m" (v->counter)
9389+ : "m" (v->counter));
9390+}
9391+
9392+/**
9393+ * atomic64_inc_unchecked - increment atomic64 variable
9394+ * @v: pointer to type atomic64_unchecked_t
9395+ *
9396+ * Atomically increments @v by 1.
9397+ */
9398+static inline void atomic64_inc_unchecked(atomic64_unchecked_t *v)
9399+{
9400 asm volatile(LOCK_PREFIX "incq %0"
9401 : "=m" (v->counter)
9402 : "m" (v->counter));
9403@@ -101,7 +199,28 @@ static inline void atomic64_inc(atomic64_t *v)
9404 */
9405 static inline void atomic64_dec(atomic64_t *v)
9406 {
9407- asm volatile(LOCK_PREFIX "decq %0"
9408+ asm volatile(LOCK_PREFIX "decq %0\n"
9409+
9410+#ifdef CONFIG_PAX_REFCOUNT
9411+ "jno 0f\n"
9412+ LOCK_PREFIX "incq %0\n"
9413+ "int $4\n0:\n"
9414+ _ASM_EXTABLE(0b, 0b)
9415+#endif
9416+
9417+ : "=m" (v->counter)
9418+ : "m" (v->counter));
9419+}
9420+
9421+/**
9422+ * atomic64_dec_unchecked - decrement atomic64 variable
9423+ * @v: pointer to type atomic64_t
9424+ *
9425+ * Atomically decrements @v by 1.
9426+ */
9427+static inline void atomic64_dec_unchecked(atomic64_unchecked_t *v)
9428+{
9429+ asm volatile(LOCK_PREFIX "decq %0\n"
9430 : "=m" (v->counter)
9431 : "m" (v->counter));
9432 }
9433@@ -118,7 +237,16 @@ static inline int atomic64_dec_and_test(atomic64_t *v)
9434 {
9435 unsigned char c;
9436
9437- asm volatile(LOCK_PREFIX "decq %0; sete %1"
9438+ asm volatile(LOCK_PREFIX "decq %0\n"
9439+
9440+#ifdef CONFIG_PAX_REFCOUNT
9441+ "jno 0f\n"
9442+ LOCK_PREFIX "incq %0\n"
9443+ "int $4\n0:\n"
9444+ _ASM_EXTABLE(0b, 0b)
9445+#endif
9446+
9447+ "sete %1\n"
9448 : "=m" (v->counter), "=qm" (c)
9449 : "m" (v->counter) : "memory");
9450 return c != 0;
9451@@ -136,7 +264,16 @@ static inline int atomic64_inc_and_test(atomic64_t *v)
9452 {
9453 unsigned char c;
9454
9455- asm volatile(LOCK_PREFIX "incq %0; sete %1"
9456+ asm volatile(LOCK_PREFIX "incq %0\n"
9457+
9458+#ifdef CONFIG_PAX_REFCOUNT
9459+ "jno 0f\n"
9460+ LOCK_PREFIX "decq %0\n"
9461+ "int $4\n0:\n"
9462+ _ASM_EXTABLE(0b, 0b)
9463+#endif
9464+
9465+ "sete %1\n"
9466 : "=m" (v->counter), "=qm" (c)
9467 : "m" (v->counter) : "memory");
9468 return c != 0;
9469@@ -155,7 +292,16 @@ static inline int atomic64_add_negative(long i, atomic64_t *v)
9470 {
9471 unsigned char c;
9472
9473- asm volatile(LOCK_PREFIX "addq %2,%0; sets %1"
9474+ asm volatile(LOCK_PREFIX "addq %2,%0\n"
9475+
9476+#ifdef CONFIG_PAX_REFCOUNT
9477+ "jno 0f\n"
9478+ LOCK_PREFIX "subq %2,%0\n"
9479+ "int $4\n0:\n"
9480+ _ASM_EXTABLE(0b, 0b)
9481+#endif
9482+
9483+ "sets %1\n"
9484 : "=m" (v->counter), "=qm" (c)
9485 : "er" (i), "m" (v->counter) : "memory");
9486 return c;
9487@@ -170,6 +316,18 @@ static inline int atomic64_add_negative(long i, atomic64_t *v)
9488 */
9489 static inline long atomic64_add_return(long i, atomic64_t *v)
9490 {
9491+ return i + xadd_check_overflow(&v->counter, i);
9492+}
9493+
9494+/**
9495+ * atomic64_add_return_unchecked - add and return
9496+ * @i: integer value to add
9497+ * @v: pointer to type atomic64_unchecked_t
9498+ *
9499+ * Atomically adds @i to @v and returns @i + @v
9500+ */
9501+static inline long atomic64_add_return_unchecked(long i, atomic64_unchecked_t *v)
9502+{
9503 return i + xadd(&v->counter, i);
9504 }
9505
9506@@ -179,6 +337,10 @@ static inline long atomic64_sub_return(long i, atomic64_t *v)
9507 }
9508
9509 #define atomic64_inc_return(v) (atomic64_add_return(1, (v)))
9510+static inline long atomic64_inc_return_unchecked(atomic64_unchecked_t *v)
9511+{
9512+ return atomic64_add_return_unchecked(1, v);
9513+}
9514 #define atomic64_dec_return(v) (atomic64_sub_return(1, (v)))
9515
9516 static inline long atomic64_cmpxchg(atomic64_t *v, long old, long new)
9517@@ -186,6 +348,11 @@ static inline long atomic64_cmpxchg(atomic64_t *v, long old, long new)
9518 return cmpxchg(&v->counter, old, new);
9519 }
9520
9521+static inline long atomic64_cmpxchg_unchecked(atomic64_unchecked_t *v, long old, long new)
9522+{
9523+ return cmpxchg(&v->counter, old, new);
9524+}
9525+
9526 static inline long atomic64_xchg(atomic64_t *v, long new)
9527 {
9528 return xchg(&v->counter, new);
9529@@ -202,17 +369,30 @@ static inline long atomic64_xchg(atomic64_t *v, long new)
9530 */
9531 static inline int atomic64_add_unless(atomic64_t *v, long a, long u)
9532 {
9533- long c, old;
9534+ long c, old, new;
9535 c = atomic64_read(v);
9536 for (;;) {
9537- if (unlikely(c == (u)))
9538+ if (unlikely(c == u))
9539 break;
9540- old = atomic64_cmpxchg((v), c, c + (a));
9541+
9542+ asm volatile("add %2,%0\n"
9543+
9544+#ifdef CONFIG_PAX_REFCOUNT
9545+ "jno 0f\n"
9546+ "sub %2,%0\n"
9547+ "int $4\n0:\n"
9548+ _ASM_EXTABLE(0b, 0b)
9549+#endif
9550+
9551+ : "=r" (new)
9552+ : "0" (c), "ir" (a));
9553+
9554+ old = atomic64_cmpxchg(v, c, new);
9555 if (likely(old == c))
9556 break;
9557 c = old;
9558 }
9559- return c != (u);
9560+ return c != u;
9561 }
9562
9563 #define atomic64_inc_not_zero(v) atomic64_add_unless((v), 1, 0)
9564diff --git a/arch/x86/include/asm/bitops.h b/arch/x86/include/asm/bitops.h
9565index 1775d6e..b65017f 100644
9566--- a/arch/x86/include/asm/bitops.h
9567+++ b/arch/x86/include/asm/bitops.h
9568@@ -38,7 +38,7 @@
9569 * a mask operation on a byte.
9570 */
9571 #define IS_IMMEDIATE(nr) (__builtin_constant_p(nr))
9572-#define CONST_MASK_ADDR(nr, addr) BITOP_ADDR((void *)(addr) + ((nr)>>3))
9573+#define CONST_MASK_ADDR(nr, addr) BITOP_ADDR((volatile void *)(addr) + ((nr)>>3))
9574 #define CONST_MASK(nr) (1 << ((nr) & 7))
9575
9576 /**
9577diff --git a/arch/x86/include/asm/boot.h b/arch/x86/include/asm/boot.h
9578index 5e1a2ee..c9f9533 100644
9579--- a/arch/x86/include/asm/boot.h
9580+++ b/arch/x86/include/asm/boot.h
9581@@ -11,10 +11,15 @@
9582 #include <asm/pgtable_types.h>
9583
9584 /* Physical address where kernel should be loaded. */
9585-#define LOAD_PHYSICAL_ADDR ((CONFIG_PHYSICAL_START \
9586+#define ____LOAD_PHYSICAL_ADDR ((CONFIG_PHYSICAL_START \
9587 + (CONFIG_PHYSICAL_ALIGN - 1)) \
9588 & ~(CONFIG_PHYSICAL_ALIGN - 1))
9589
9590+#ifndef __ASSEMBLY__
9591+extern unsigned char __LOAD_PHYSICAL_ADDR[];
9592+#define LOAD_PHYSICAL_ADDR ((unsigned long)__LOAD_PHYSICAL_ADDR)
9593+#endif
9594+
9595 /* Minimum kernel alignment, as a power of two */
9596 #ifdef CONFIG_X86_64
9597 #define MIN_KERNEL_ALIGN_LG2 PMD_SHIFT
9598diff --git a/arch/x86/include/asm/cache.h b/arch/x86/include/asm/cache.h
9599index 48f99f1..d78ebf9 100644
9600--- a/arch/x86/include/asm/cache.h
9601+++ b/arch/x86/include/asm/cache.h
9602@@ -5,12 +5,13 @@
9603
9604 /* L1 cache line size */
9605 #define L1_CACHE_SHIFT (CONFIG_X86_L1_CACHE_SHIFT)
9606-#define L1_CACHE_BYTES (1 << L1_CACHE_SHIFT)
9607+#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT)
9608
9609 #define __read_mostly __attribute__((__section__(".data..read_mostly")))
9610+#define __read_only __attribute__((__section__(".data..read_only")))
9611
9612 #define INTERNODE_CACHE_SHIFT CONFIG_X86_INTERNODE_CACHE_SHIFT
9613-#define INTERNODE_CACHE_BYTES (1 << INTERNODE_CACHE_SHIFT)
9614+#define INTERNODE_CACHE_BYTES (_AC(1,UL) << INTERNODE_CACHE_SHIFT)
9615
9616 #ifdef CONFIG_X86_VSMP
9617 #ifdef CONFIG_SMP
9618diff --git a/arch/x86/include/asm/cacheflush.h b/arch/x86/include/asm/cacheflush.h
9619index 4e12668..501d239 100644
9620--- a/arch/x86/include/asm/cacheflush.h
9621+++ b/arch/x86/include/asm/cacheflush.h
9622@@ -26,7 +26,7 @@ static inline unsigned long get_page_memtype(struct page *pg)
9623 unsigned long pg_flags = pg->flags & _PGMT_MASK;
9624
9625 if (pg_flags == _PGMT_DEFAULT)
9626- return -1;
9627+ return ~0UL;
9628 else if (pg_flags == _PGMT_WC)
9629 return _PAGE_CACHE_WC;
9630 else if (pg_flags == _PGMT_UC_MINUS)
9631diff --git a/arch/x86/include/asm/checksum_32.h b/arch/x86/include/asm/checksum_32.h
9632index 46fc474..b02b0f9 100644
9633--- a/arch/x86/include/asm/checksum_32.h
9634+++ b/arch/x86/include/asm/checksum_32.h
9635@@ -31,6 +31,14 @@ asmlinkage __wsum csum_partial_copy_generic(const void *src, void *dst,
9636 int len, __wsum sum,
9637 int *src_err_ptr, int *dst_err_ptr);
9638
9639+asmlinkage __wsum csum_partial_copy_generic_to_user(const void *src, void *dst,
9640+ int len, __wsum sum,
9641+ int *src_err_ptr, int *dst_err_ptr);
9642+
9643+asmlinkage __wsum csum_partial_copy_generic_from_user(const void *src, void *dst,
9644+ int len, __wsum sum,
9645+ int *src_err_ptr, int *dst_err_ptr);
9646+
9647 /*
9648 * Note: when you get a NULL pointer exception here this means someone
9649 * passed in an incorrect kernel address to one of these functions.
9650@@ -50,7 +58,7 @@ static inline __wsum csum_partial_copy_from_user(const void __user *src,
9651 int *err_ptr)
9652 {
9653 might_sleep();
9654- return csum_partial_copy_generic((__force void *)src, dst,
9655+ return csum_partial_copy_generic_from_user((__force void *)src, dst,
9656 len, sum, err_ptr, NULL);
9657 }
9658
9659@@ -178,7 +186,7 @@ static inline __wsum csum_and_copy_to_user(const void *src,
9660 {
9661 might_sleep();
9662 if (access_ok(VERIFY_WRITE, dst, len))
9663- return csum_partial_copy_generic(src, (__force void *)dst,
9664+ return csum_partial_copy_generic_to_user(src, (__force void *)dst,
9665 len, sum, NULL, err_ptr);
9666
9667 if (len)
9668diff --git a/arch/x86/include/asm/cmpxchg.h b/arch/x86/include/asm/cmpxchg.h
9669index 5d3acdf..6447a02 100644
9670--- a/arch/x86/include/asm/cmpxchg.h
9671+++ b/arch/x86/include/asm/cmpxchg.h
9672@@ -14,6 +14,8 @@ extern void __cmpxchg_wrong_size(void)
9673 __compiletime_error("Bad argument size for cmpxchg");
9674 extern void __xadd_wrong_size(void)
9675 __compiletime_error("Bad argument size for xadd");
9676+extern void __xadd_check_overflow_wrong_size(void)
9677+ __compiletime_error("Bad argument size for xadd_check_overflow");
9678
9679 /*
9680 * Constants for operation sizes. On 32-bit, the 64-bit size it set to
9681@@ -195,6 +197,34 @@ extern void __xadd_wrong_size(void)
9682 __ret; \
9683 })
9684
9685+#define __xadd_check_overflow(ptr, inc, lock) \
9686+ ({ \
9687+ __typeof__ (*(ptr)) __ret = (inc); \
9688+ switch (sizeof(*(ptr))) { \
9689+ case __X86_CASE_L: \
9690+ asm volatile (lock "xaddl %0, %1\n" \
9691+ "jno 0f\n" \
9692+ "mov %0,%1\n" \
9693+ "int $4\n0:\n" \
9694+ _ASM_EXTABLE(0b, 0b) \
9695+ : "+r" (__ret), "+m" (*(ptr)) \
9696+ : : "memory", "cc"); \
9697+ break; \
9698+ case __X86_CASE_Q: \
9699+ asm volatile (lock "xaddq %q0, %1\n" \
9700+ "jno 0f\n" \
9701+ "mov %0,%1\n" \
9702+ "int $4\n0:\n" \
9703+ _ASM_EXTABLE(0b, 0b) \
9704+ : "+r" (__ret), "+m" (*(ptr)) \
9705+ : : "memory", "cc"); \
9706+ break; \
9707+ default: \
9708+ __xadd_check_overflow_wrong_size(); \
9709+ } \
9710+ __ret; \
9711+ })
9712+
9713 /*
9714 * xadd() adds "inc" to "*ptr" and atomically returns the previous
9715 * value of "*ptr".
9716@@ -207,4 +237,6 @@ extern void __xadd_wrong_size(void)
9717 #define xadd_sync(ptr, inc) __xadd((ptr), (inc), "lock; ")
9718 #define xadd_local(ptr, inc) __xadd((ptr), (inc), "")
9719
9720+#define xadd_check_overflow(ptr, inc) __xadd_check_overflow((ptr), (inc), LOCK_PREFIX)
9721+
9722 #endif /* ASM_X86_CMPXCHG_H */
9723diff --git a/arch/x86/include/asm/cpufeature.h b/arch/x86/include/asm/cpufeature.h
9724index f3444f7..051a196 100644
9725--- a/arch/x86/include/asm/cpufeature.h
9726+++ b/arch/x86/include/asm/cpufeature.h
9727@@ -363,7 +363,7 @@ static __always_inline __pure bool __static_cpu_has(u16 bit)
9728 ".section .discard,\"aw\",@progbits\n"
9729 " .byte 0xff + (4f-3f) - (2b-1b)\n" /* size check */
9730 ".previous\n"
9731- ".section .altinstr_replacement,\"ax\"\n"
9732+ ".section .altinstr_replacement,\"a\"\n"
9733 "3: movb $1,%0\n"
9734 "4:\n"
9735 ".previous\n"
9736diff --git a/arch/x86/include/asm/desc.h b/arch/x86/include/asm/desc.h
9737index 41935fa..3b40db8 100644
9738--- a/arch/x86/include/asm/desc.h
9739+++ b/arch/x86/include/asm/desc.h
9740@@ -4,6 +4,7 @@
9741 #include <asm/desc_defs.h>
9742 #include <asm/ldt.h>
9743 #include <asm/mmu.h>
9744+#include <asm/pgtable.h>
9745
9746 #include <linux/smp.h>
9747
9748@@ -16,6 +17,7 @@ static inline void fill_ldt(struct desc_struct *desc, const struct user_desc *in
9749
9750 desc->type = (info->read_exec_only ^ 1) << 1;
9751 desc->type |= info->contents << 2;
9752+ desc->type |= info->seg_not_present ^ 1;
9753
9754 desc->s = 1;
9755 desc->dpl = 0x3;
9756@@ -34,17 +36,12 @@ static inline void fill_ldt(struct desc_struct *desc, const struct user_desc *in
9757 }
9758
9759 extern struct desc_ptr idt_descr;
9760-extern gate_desc idt_table[];
9761-
9762-struct gdt_page {
9763- struct desc_struct gdt[GDT_ENTRIES];
9764-} __attribute__((aligned(PAGE_SIZE)));
9765-
9766-DECLARE_PER_CPU_PAGE_ALIGNED(struct gdt_page, gdt_page);
9767+extern gate_desc idt_table[256];
9768
9769+extern struct desc_struct cpu_gdt_table[NR_CPUS][PAGE_SIZE / sizeof(struct desc_struct)];
9770 static inline struct desc_struct *get_cpu_gdt_table(unsigned int cpu)
9771 {
9772- return per_cpu(gdt_page, cpu).gdt;
9773+ return cpu_gdt_table[cpu];
9774 }
9775
9776 #ifdef CONFIG_X86_64
9777@@ -69,8 +66,14 @@ static inline void pack_gate(gate_desc *gate, unsigned char type,
9778 unsigned long base, unsigned dpl, unsigned flags,
9779 unsigned short seg)
9780 {
9781- gate->a = (seg << 16) | (base & 0xffff);
9782- gate->b = (base & 0xffff0000) | (((0x80 | type | (dpl << 5)) & 0xff) << 8);
9783+ gate->gate.offset_low = base;
9784+ gate->gate.seg = seg;
9785+ gate->gate.reserved = 0;
9786+ gate->gate.type = type;
9787+ gate->gate.s = 0;
9788+ gate->gate.dpl = dpl;
9789+ gate->gate.p = 1;
9790+ gate->gate.offset_high = base >> 16;
9791 }
9792
9793 #endif
9794@@ -115,12 +118,16 @@ static inline void paravirt_free_ldt(struct desc_struct *ldt, unsigned entries)
9795
9796 static inline void native_write_idt_entry(gate_desc *idt, int entry, const gate_desc *gate)
9797 {
9798+ pax_open_kernel();
9799 memcpy(&idt[entry], gate, sizeof(*gate));
9800+ pax_close_kernel();
9801 }
9802
9803 static inline void native_write_ldt_entry(struct desc_struct *ldt, int entry, const void *desc)
9804 {
9805+ pax_open_kernel();
9806 memcpy(&ldt[entry], desc, 8);
9807+ pax_close_kernel();
9808 }
9809
9810 static inline void
9811@@ -134,7 +141,9 @@ native_write_gdt_entry(struct desc_struct *gdt, int entry, const void *desc, int
9812 default: size = sizeof(*gdt); break;
9813 }
9814
9815+ pax_open_kernel();
9816 memcpy(&gdt[entry], desc, size);
9817+ pax_close_kernel();
9818 }
9819
9820 static inline void pack_descriptor(struct desc_struct *desc, unsigned long base,
9821@@ -207,7 +216,9 @@ static inline void native_set_ldt(const void *addr, unsigned int entries)
9822
9823 static inline void native_load_tr_desc(void)
9824 {
9825+ pax_open_kernel();
9826 asm volatile("ltr %w0"::"q" (GDT_ENTRY_TSS*8));
9827+ pax_close_kernel();
9828 }
9829
9830 static inline void native_load_gdt(const struct desc_ptr *dtr)
9831@@ -244,8 +255,10 @@ static inline void native_load_tls(struct thread_struct *t, unsigned int cpu)
9832 struct desc_struct *gdt = get_cpu_gdt_table(cpu);
9833 unsigned int i;
9834
9835+ pax_open_kernel();
9836 for (i = 0; i < GDT_ENTRY_TLS_ENTRIES; i++)
9837 gdt[GDT_ENTRY_TLS_MIN + i] = t->tls_array[i];
9838+ pax_close_kernel();
9839 }
9840
9841 #define _LDT_empty(info) \
9842@@ -307,7 +320,7 @@ static inline void set_desc_limit(struct desc_struct *desc, unsigned long limit)
9843 desc->limit = (limit >> 16) & 0xf;
9844 }
9845
9846-static inline void _set_gate(int gate, unsigned type, void *addr,
9847+static inline void _set_gate(int gate, unsigned type, const void *addr,
9848 unsigned dpl, unsigned ist, unsigned seg)
9849 {
9850 gate_desc s;
9851@@ -326,7 +339,7 @@ static inline void _set_gate(int gate, unsigned type, void *addr,
9852 * Pentium F0 0F bugfix can have resulted in the mapped
9853 * IDT being write-protected.
9854 */
9855-static inline void set_intr_gate(unsigned int n, void *addr)
9856+static inline void set_intr_gate(unsigned int n, const void *addr)
9857 {
9858 BUG_ON((unsigned)n > 0xFF);
9859 _set_gate(n, GATE_INTERRUPT, addr, 0, 0, __KERNEL_CS);
9860@@ -356,19 +369,19 @@ static inline void alloc_intr_gate(unsigned int n, void *addr)
9861 /*
9862 * This routine sets up an interrupt gate at directory privilege level 3.
9863 */
9864-static inline void set_system_intr_gate(unsigned int n, void *addr)
9865+static inline void set_system_intr_gate(unsigned int n, const void *addr)
9866 {
9867 BUG_ON((unsigned)n > 0xFF);
9868 _set_gate(n, GATE_INTERRUPT, addr, 0x3, 0, __KERNEL_CS);
9869 }
9870
9871-static inline void set_system_trap_gate(unsigned int n, void *addr)
9872+static inline void set_system_trap_gate(unsigned int n, const void *addr)
9873 {
9874 BUG_ON((unsigned)n > 0xFF);
9875 _set_gate(n, GATE_TRAP, addr, 0x3, 0, __KERNEL_CS);
9876 }
9877
9878-static inline void set_trap_gate(unsigned int n, void *addr)
9879+static inline void set_trap_gate(unsigned int n, const void *addr)
9880 {
9881 BUG_ON((unsigned)n > 0xFF);
9882 _set_gate(n, GATE_TRAP, addr, 0, 0, __KERNEL_CS);
9883@@ -377,19 +390,31 @@ static inline void set_trap_gate(unsigned int n, void *addr)
9884 static inline void set_task_gate(unsigned int n, unsigned int gdt_entry)
9885 {
9886 BUG_ON((unsigned)n > 0xFF);
9887- _set_gate(n, GATE_TASK, (void *)0, 0, 0, (gdt_entry<<3));
9888+ _set_gate(n, GATE_TASK, (const void *)0, 0, 0, (gdt_entry<<3));
9889 }
9890
9891-static inline void set_intr_gate_ist(int n, void *addr, unsigned ist)
9892+static inline void set_intr_gate_ist(int n, const void *addr, unsigned ist)
9893 {
9894 BUG_ON((unsigned)n > 0xFF);
9895 _set_gate(n, GATE_INTERRUPT, addr, 0, ist, __KERNEL_CS);
9896 }
9897
9898-static inline void set_system_intr_gate_ist(int n, void *addr, unsigned ist)
9899+static inline void set_system_intr_gate_ist(int n, const void *addr, unsigned ist)
9900 {
9901 BUG_ON((unsigned)n > 0xFF);
9902 _set_gate(n, GATE_INTERRUPT, addr, 0x3, ist, __KERNEL_CS);
9903 }
9904
9905+#ifdef CONFIG_X86_32
9906+static inline void set_user_cs(unsigned long base, unsigned long limit, int cpu)
9907+{
9908+ struct desc_struct d;
9909+
9910+ if (likely(limit))
9911+ limit = (limit - 1UL) >> PAGE_SHIFT;
9912+ pack_descriptor(&d, base, limit, 0xFB, 0xC);
9913+ write_gdt_entry(get_cpu_gdt_table(cpu), GDT_ENTRY_DEFAULT_USER_CS, &d, DESCTYPE_S);
9914+}
9915+#endif
9916+
9917 #endif /* _ASM_X86_DESC_H */
9918diff --git a/arch/x86/include/asm/desc_defs.h b/arch/x86/include/asm/desc_defs.h
9919index 278441f..b95a174 100644
9920--- a/arch/x86/include/asm/desc_defs.h
9921+++ b/arch/x86/include/asm/desc_defs.h
9922@@ -31,6 +31,12 @@ struct desc_struct {
9923 unsigned base1: 8, type: 4, s: 1, dpl: 2, p: 1;
9924 unsigned limit: 4, avl: 1, l: 1, d: 1, g: 1, base2: 8;
9925 };
9926+ struct {
9927+ u16 offset_low;
9928+ u16 seg;
9929+ unsigned reserved: 8, type: 4, s: 1, dpl: 2, p: 1;
9930+ unsigned offset_high: 16;
9931+ } gate;
9932 };
9933 } __attribute__((packed));
9934
9935diff --git a/arch/x86/include/asm/e820.h b/arch/x86/include/asm/e820.h
9936index 908b969..a1f4eb4 100644
9937--- a/arch/x86/include/asm/e820.h
9938+++ b/arch/x86/include/asm/e820.h
9939@@ -69,7 +69,7 @@ struct e820map {
9940 #define ISA_START_ADDRESS 0xa0000
9941 #define ISA_END_ADDRESS 0x100000
9942
9943-#define BIOS_BEGIN 0x000a0000
9944+#define BIOS_BEGIN 0x000c0000
9945 #define BIOS_END 0x00100000
9946
9947 #define BIOS_ROM_BASE 0xffe00000
9948diff --git a/arch/x86/include/asm/elf.h b/arch/x86/include/asm/elf.h
9949index 5f962df..7289f09 100644
9950--- a/arch/x86/include/asm/elf.h
9951+++ b/arch/x86/include/asm/elf.h
9952@@ -238,7 +238,25 @@ extern int force_personality32;
9953 the loader. We need to make sure that it is out of the way of the program
9954 that it will "exec", and that there is sufficient room for the brk. */
9955
9956+#ifdef CONFIG_PAX_SEGMEXEC
9957+#define ELF_ET_DYN_BASE ((current->mm->pax_flags & MF_PAX_SEGMEXEC) ? SEGMEXEC_TASK_SIZE/3*2 : TASK_SIZE/3*2)
9958+#else
9959 #define ELF_ET_DYN_BASE (TASK_SIZE / 3 * 2)
9960+#endif
9961+
9962+#ifdef CONFIG_PAX_ASLR
9963+#ifdef CONFIG_X86_32
9964+#define PAX_ELF_ET_DYN_BASE 0x10000000UL
9965+
9966+#define PAX_DELTA_MMAP_LEN (current->mm->pax_flags & MF_PAX_SEGMEXEC ? 15 : 16)
9967+#define PAX_DELTA_STACK_LEN (current->mm->pax_flags & MF_PAX_SEGMEXEC ? 15 : 16)
9968+#else
9969+#define PAX_ELF_ET_DYN_BASE 0x400000UL
9970+
9971+#define PAX_DELTA_MMAP_LEN ((test_thread_flag(TIF_IA32)) ? 16 : TASK_SIZE_MAX_SHIFT - PAGE_SHIFT - 3)
9972+#define PAX_DELTA_STACK_LEN ((test_thread_flag(TIF_IA32)) ? 16 : TASK_SIZE_MAX_SHIFT - PAGE_SHIFT - 3)
9973+#endif
9974+#endif
9975
9976 /* This yields a mask that user programs can use to figure out what
9977 instruction set this CPU supports. This could be done in user space,
9978@@ -291,9 +309,7 @@ do { \
9979
9980 #define ARCH_DLINFO \
9981 do { \
9982- if (vdso_enabled) \
9983- NEW_AUX_ENT(AT_SYSINFO_EHDR, \
9984- (unsigned long)current->mm->context.vdso); \
9985+ NEW_AUX_ENT(AT_SYSINFO_EHDR, current->mm->context.vdso); \
9986 } while (0)
9987
9988 #define AT_SYSINFO 32
9989@@ -304,7 +320,7 @@ do { \
9990
9991 #endif /* !CONFIG_X86_32 */
9992
9993-#define VDSO_CURRENT_BASE ((unsigned long)current->mm->context.vdso)
9994+#define VDSO_CURRENT_BASE (current->mm->context.vdso)
9995
9996 #define VDSO_ENTRY \
9997 ((unsigned long)VDSO32_SYMBOL(VDSO_CURRENT_BASE, vsyscall))
9998@@ -318,9 +334,6 @@ extern int arch_setup_additional_pages(struct linux_binprm *bprm,
9999 extern int syscall32_setup_pages(struct linux_binprm *, int exstack);
10000 #define compat_arch_setup_additional_pages syscall32_setup_pages
10001
10002-extern unsigned long arch_randomize_brk(struct mm_struct *mm);
10003-#define arch_randomize_brk arch_randomize_brk
10004-
10005 /*
10006 * True on X86_32 or when emulating IA32 on X86_64
10007 */
10008diff --git a/arch/x86/include/asm/emergency-restart.h b/arch/x86/include/asm/emergency-restart.h
10009index cc70c1c..d96d011 100644
10010--- a/arch/x86/include/asm/emergency-restart.h
10011+++ b/arch/x86/include/asm/emergency-restart.h
10012@@ -15,6 +15,6 @@ enum reboot_type {
10013
10014 extern enum reboot_type reboot_type;
10015
10016-extern void machine_emergency_restart(void);
10017+extern void machine_emergency_restart(void) __noreturn;
10018
10019 #endif /* _ASM_X86_EMERGENCY_RESTART_H */
10020diff --git a/arch/x86/include/asm/floppy.h b/arch/x86/include/asm/floppy.h
10021index dbe82a5..c6d8a00 100644
10022--- a/arch/x86/include/asm/floppy.h
10023+++ b/arch/x86/include/asm/floppy.h
10024@@ -157,6 +157,7 @@ static unsigned long dma_mem_alloc(unsigned long size)
10025 }
10026
10027
10028+static unsigned long vdma_mem_alloc(unsigned long size) __size_overflow(1);
10029 static unsigned long vdma_mem_alloc(unsigned long size)
10030 {
10031 return (unsigned long)vmalloc(size);
10032diff --git a/arch/x86/include/asm/futex.h b/arch/x86/include/asm/futex.h
10033index d09bb03..4ea4194 100644
10034--- a/arch/x86/include/asm/futex.h
10035+++ b/arch/x86/include/asm/futex.h
10036@@ -12,16 +12,18 @@
10037 #include <asm/system.h>
10038
10039 #define __futex_atomic_op1(insn, ret, oldval, uaddr, oparg) \
10040+ typecheck(u32 __user *, uaddr); \
10041 asm volatile("1:\t" insn "\n" \
10042 "2:\t.section .fixup,\"ax\"\n" \
10043 "3:\tmov\t%3, %1\n" \
10044 "\tjmp\t2b\n" \
10045 "\t.previous\n" \
10046 _ASM_EXTABLE(1b, 3b) \
10047- : "=r" (oldval), "=r" (ret), "+m" (*uaddr) \
10048+ : "=r" (oldval), "=r" (ret), "+m" (*(u32 __user *)____m(uaddr))\
10049 : "i" (-EFAULT), "0" (oparg), "1" (0))
10050
10051 #define __futex_atomic_op2(insn, ret, oldval, uaddr, oparg) \
10052+ typecheck(u32 __user *, uaddr); \
10053 asm volatile("1:\tmovl %2, %0\n" \
10054 "\tmovl\t%0, %3\n" \
10055 "\t" insn "\n" \
10056@@ -34,7 +36,7 @@
10057 _ASM_EXTABLE(1b, 4b) \
10058 _ASM_EXTABLE(2b, 4b) \
10059 : "=&a" (oldval), "=&r" (ret), \
10060- "+m" (*uaddr), "=&r" (tem) \
10061+ "+m" (*(u32 __user *)____m(uaddr)), "=&r" (tem) \
10062 : "r" (oparg), "i" (-EFAULT), "1" (0))
10063
10064 static inline int futex_atomic_op_inuser(int encoded_op, u32 __user *uaddr)
10065@@ -61,10 +63,10 @@ static inline int futex_atomic_op_inuser(int encoded_op, u32 __user *uaddr)
10066
10067 switch (op) {
10068 case FUTEX_OP_SET:
10069- __futex_atomic_op1("xchgl %0, %2", ret, oldval, uaddr, oparg);
10070+ __futex_atomic_op1(__copyuser_seg"xchgl %0, %2", ret, oldval, uaddr, oparg);
10071 break;
10072 case FUTEX_OP_ADD:
10073- __futex_atomic_op1(LOCK_PREFIX "xaddl %0, %2", ret, oldval,
10074+ __futex_atomic_op1(LOCK_PREFIX __copyuser_seg"xaddl %0, %2", ret, oldval,
10075 uaddr, oparg);
10076 break;
10077 case FUTEX_OP_OR:
10078@@ -123,13 +125,13 @@ static inline int futex_atomic_cmpxchg_inatomic(u32 *uval, u32 __user *uaddr,
10079 if (!access_ok(VERIFY_WRITE, uaddr, sizeof(u32)))
10080 return -EFAULT;
10081
10082- asm volatile("1:\t" LOCK_PREFIX "cmpxchgl %4, %2\n"
10083+ asm volatile("1:\t" LOCK_PREFIX __copyuser_seg"cmpxchgl %4, %2\n"
10084 "2:\t.section .fixup, \"ax\"\n"
10085 "3:\tmov %3, %0\n"
10086 "\tjmp 2b\n"
10087 "\t.previous\n"
10088 _ASM_EXTABLE(1b, 3b)
10089- : "+r" (ret), "=a" (oldval), "+m" (*uaddr)
10090+ : "+r" (ret), "=a" (oldval), "+m" (*(u32 __user *)____m(uaddr))
10091 : "i" (-EFAULT), "r" (newval), "1" (oldval)
10092 : "memory"
10093 );
10094diff --git a/arch/x86/include/asm/hw_irq.h b/arch/x86/include/asm/hw_irq.h
10095index eb92a6e..b98b2f4 100644
10096--- a/arch/x86/include/asm/hw_irq.h
10097+++ b/arch/x86/include/asm/hw_irq.h
10098@@ -136,8 +136,8 @@ extern void setup_ioapic_dest(void);
10099 extern void enable_IO_APIC(void);
10100
10101 /* Statistics */
10102-extern atomic_t irq_err_count;
10103-extern atomic_t irq_mis_count;
10104+extern atomic_unchecked_t irq_err_count;
10105+extern atomic_unchecked_t irq_mis_count;
10106
10107 /* EISA */
10108 extern void eisa_set_level_irq(unsigned int irq);
10109diff --git a/arch/x86/include/asm/i387.h b/arch/x86/include/asm/i387.h
10110index a850b4d..bae26dc 100644
10111--- a/arch/x86/include/asm/i387.h
10112+++ b/arch/x86/include/asm/i387.h
10113@@ -92,6 +92,11 @@ static inline int fxrstor_checking(struct i387_fxsave_struct *fx)
10114 {
10115 int err;
10116
10117+#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
10118+ if ((unsigned long)fx < PAX_USER_SHADOW_BASE)
10119+ fx = (struct i387_fxsave_struct __user *)((void *)fx + PAX_USER_SHADOW_BASE);
10120+#endif
10121+
10122 /* See comment in fxsave() below. */
10123 #ifdef CONFIG_AS_FXSAVEQ
10124 asm volatile("1: fxrstorq %[fx]\n\t"
10125@@ -121,6 +126,11 @@ static inline int fxsave_user(struct i387_fxsave_struct __user *fx)
10126 {
10127 int err;
10128
10129+#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
10130+ if ((unsigned long)fx < PAX_USER_SHADOW_BASE)
10131+ fx = (struct i387_fxsave_struct __user *)((void __user *)fx + PAX_USER_SHADOW_BASE);
10132+#endif
10133+
10134 /*
10135 * Clear the bytes not touched by the fxsave and reserved
10136 * for the SW usage.
10137@@ -424,7 +434,7 @@ static inline bool interrupted_kernel_fpu_idle(void)
10138 static inline bool interrupted_user_mode(void)
10139 {
10140 struct pt_regs *regs = get_irq_regs();
10141- return regs && user_mode_vm(regs);
10142+ return regs && user_mode(regs);
10143 }
10144
10145 /*
10146diff --git a/arch/x86/include/asm/io.h b/arch/x86/include/asm/io.h
10147index d8e8eef..99f81ae 100644
10148--- a/arch/x86/include/asm/io.h
10149+++ b/arch/x86/include/asm/io.h
10150@@ -194,6 +194,17 @@ extern void set_iounmap_nonlazy(void);
10151
10152 #include <linux/vmalloc.h>
10153
10154+#define ARCH_HAS_VALID_PHYS_ADDR_RANGE
10155+static inline int valid_phys_addr_range(unsigned long addr, size_t count)
10156+{
10157+ return ((addr + count + PAGE_SIZE - 1) >> PAGE_SHIFT) < (1ULL << (boot_cpu_data.x86_phys_bits - PAGE_SHIFT)) ? 1 : 0;
10158+}
10159+
10160+static inline int valid_mmap_phys_addr_range(unsigned long pfn, size_t count)
10161+{
10162+ return (pfn + (count >> PAGE_SHIFT)) < (1ULL << (boot_cpu_data.x86_phys_bits - PAGE_SHIFT)) ? 1 : 0;
10163+}
10164+
10165 /*
10166 * Convert a virtual cached pointer to an uncached pointer
10167 */
10168diff --git a/arch/x86/include/asm/irqflags.h b/arch/x86/include/asm/irqflags.h
10169index bba3cf8..06bc8da 100644
10170--- a/arch/x86/include/asm/irqflags.h
10171+++ b/arch/x86/include/asm/irqflags.h
10172@@ -141,6 +141,11 @@ static inline notrace unsigned long arch_local_irq_save(void)
10173 sti; \
10174 sysexit
10175
10176+#define GET_CR0_INTO_RDI mov %cr0, %rdi
10177+#define SET_RDI_INTO_CR0 mov %rdi, %cr0
10178+#define GET_CR3_INTO_RDI mov %cr3, %rdi
10179+#define SET_RDI_INTO_CR3 mov %rdi, %cr3
10180+
10181 #else
10182 #define INTERRUPT_RETURN iret
10183 #define ENABLE_INTERRUPTS_SYSEXIT sti; sysexit
10184diff --git a/arch/x86/include/asm/kprobes.h b/arch/x86/include/asm/kprobes.h
10185index 5478825..839e88c 100644
10186--- a/arch/x86/include/asm/kprobes.h
10187+++ b/arch/x86/include/asm/kprobes.h
10188@@ -37,13 +37,8 @@ typedef u8 kprobe_opcode_t;
10189 #define RELATIVEJUMP_SIZE 5
10190 #define RELATIVECALL_OPCODE 0xe8
10191 #define RELATIVE_ADDR_SIZE 4
10192-#define MAX_STACK_SIZE 64
10193-#define MIN_STACK_SIZE(ADDR) \
10194- (((MAX_STACK_SIZE) < (((unsigned long)current_thread_info()) + \
10195- THREAD_SIZE - (unsigned long)(ADDR))) \
10196- ? (MAX_STACK_SIZE) \
10197- : (((unsigned long)current_thread_info()) + \
10198- THREAD_SIZE - (unsigned long)(ADDR)))
10199+#define MAX_STACK_SIZE 64UL
10200+#define MIN_STACK_SIZE(ADDR) min(MAX_STACK_SIZE, current->thread.sp0 - (unsigned long)(ADDR))
10201
10202 #define flush_insn_slot(p) do { } while (0)
10203
10204diff --git a/arch/x86/include/asm/kvm_host.h b/arch/x86/include/asm/kvm_host.h
10205index b4973f4..a42170a 100644
10206--- a/arch/x86/include/asm/kvm_host.h
10207+++ b/arch/x86/include/asm/kvm_host.h
10208@@ -459,7 +459,7 @@ struct kvm_arch {
10209 unsigned int n_requested_mmu_pages;
10210 unsigned int n_max_mmu_pages;
10211 unsigned int indirect_shadow_pages;
10212- atomic_t invlpg_counter;
10213+ atomic_unchecked_t invlpg_counter;
10214 struct hlist_head mmu_page_hash[KVM_NUM_MMU_PAGES];
10215 /*
10216 * Hash table of struct kvm_mmu_page.
10217@@ -638,7 +638,7 @@ struct kvm_x86_ops {
10218 int (*check_intercept)(struct kvm_vcpu *vcpu,
10219 struct x86_instruction_info *info,
10220 enum x86_intercept_stage stage);
10221-};
10222+} __do_const;
10223
10224 struct kvm_arch_async_pf {
10225 u32 token;
10226@@ -667,9 +667,9 @@ void kvm_mmu_change_mmu_pages(struct kvm *kvm, unsigned int kvm_nr_mmu_pages);
10227 int load_pdptrs(struct kvm_vcpu *vcpu, struct kvm_mmu *mmu, unsigned long cr3);
10228
10229 int emulator_write_phys(struct kvm_vcpu *vcpu, gpa_t gpa,
10230- const void *val, int bytes);
10231+ const void *val, int bytes) __size_overflow(2);
10232 int kvm_pv_mmu_op(struct kvm_vcpu *vcpu, unsigned long bytes,
10233- gpa_t addr, unsigned long *ret);
10234+ gpa_t addr, unsigned long *ret) __size_overflow(2,3);
10235 u8 kvm_get_guest_memory_type(struct kvm_vcpu *vcpu, gfn_t gfn);
10236
10237 extern bool tdp_enabled;
10238@@ -730,7 +730,7 @@ void kvm_get_cs_db_l_bits(struct kvm_vcpu *vcpu, int *db, int *l);
10239 int kvm_set_xcr(struct kvm_vcpu *vcpu, u32 index, u64 xcr);
10240
10241 int kvm_get_msr_common(struct kvm_vcpu *vcpu, u32 msr, u64 *pdata);
10242-int kvm_set_msr_common(struct kvm_vcpu *vcpu, u32 msr, u64 data);
10243+int kvm_set_msr_common(struct kvm_vcpu *vcpu, u32 msr, u64 data) __size_overflow(3);
10244
10245 unsigned long kvm_get_rflags(struct kvm_vcpu *vcpu);
10246 void kvm_set_rflags(struct kvm_vcpu *vcpu, unsigned long rflags);
10247@@ -755,7 +755,7 @@ int fx_init(struct kvm_vcpu *vcpu);
10248 void kvm_mmu_flush_tlb(struct kvm_vcpu *vcpu);
10249 void kvm_mmu_pte_write(struct kvm_vcpu *vcpu, gpa_t gpa,
10250 const u8 *new, int bytes,
10251- bool guest_initiated);
10252+ bool guest_initiated) __size_overflow(2);
10253 int kvm_mmu_unprotect_page_virt(struct kvm_vcpu *vcpu, gva_t gva);
10254 void __kvm_mmu_free_some_pages(struct kvm_vcpu *vcpu);
10255 int kvm_mmu_load(struct kvm_vcpu *vcpu);
10256diff --git a/arch/x86/include/asm/local.h b/arch/x86/include/asm/local.h
10257index 9cdae5d..300d20f 100644
10258--- a/arch/x86/include/asm/local.h
10259+++ b/arch/x86/include/asm/local.h
10260@@ -18,26 +18,58 @@ typedef struct {
10261
10262 static inline void local_inc(local_t *l)
10263 {
10264- asm volatile(_ASM_INC "%0"
10265+ asm volatile(_ASM_INC "%0\n"
10266+
10267+#ifdef CONFIG_PAX_REFCOUNT
10268+ "jno 0f\n"
10269+ _ASM_DEC "%0\n"
10270+ "int $4\n0:\n"
10271+ _ASM_EXTABLE(0b, 0b)
10272+#endif
10273+
10274 : "+m" (l->a.counter));
10275 }
10276
10277 static inline void local_dec(local_t *l)
10278 {
10279- asm volatile(_ASM_DEC "%0"
10280+ asm volatile(_ASM_DEC "%0\n"
10281+
10282+#ifdef CONFIG_PAX_REFCOUNT
10283+ "jno 0f\n"
10284+ _ASM_INC "%0\n"
10285+ "int $4\n0:\n"
10286+ _ASM_EXTABLE(0b, 0b)
10287+#endif
10288+
10289 : "+m" (l->a.counter));
10290 }
10291
10292 static inline void local_add(long i, local_t *l)
10293 {
10294- asm volatile(_ASM_ADD "%1,%0"
10295+ asm volatile(_ASM_ADD "%1,%0\n"
10296+
10297+#ifdef CONFIG_PAX_REFCOUNT
10298+ "jno 0f\n"
10299+ _ASM_SUB "%1,%0\n"
10300+ "int $4\n0:\n"
10301+ _ASM_EXTABLE(0b, 0b)
10302+#endif
10303+
10304 : "+m" (l->a.counter)
10305 : "ir" (i));
10306 }
10307
10308 static inline void local_sub(long i, local_t *l)
10309 {
10310- asm volatile(_ASM_SUB "%1,%0"
10311+ asm volatile(_ASM_SUB "%1,%0\n"
10312+
10313+#ifdef CONFIG_PAX_REFCOUNT
10314+ "jno 0f\n"
10315+ _ASM_ADD "%1,%0\n"
10316+ "int $4\n0:\n"
10317+ _ASM_EXTABLE(0b, 0b)
10318+#endif
10319+
10320 : "+m" (l->a.counter)
10321 : "ir" (i));
10322 }
10323@@ -55,7 +87,16 @@ static inline int local_sub_and_test(long i, local_t *l)
10324 {
10325 unsigned char c;
10326
10327- asm volatile(_ASM_SUB "%2,%0; sete %1"
10328+ asm volatile(_ASM_SUB "%2,%0\n"
10329+
10330+#ifdef CONFIG_PAX_REFCOUNT
10331+ "jno 0f\n"
10332+ _ASM_ADD "%2,%0\n"
10333+ "int $4\n0:\n"
10334+ _ASM_EXTABLE(0b, 0b)
10335+#endif
10336+
10337+ "sete %1\n"
10338 : "+m" (l->a.counter), "=qm" (c)
10339 : "ir" (i) : "memory");
10340 return c;
10341@@ -73,7 +114,16 @@ static inline int local_dec_and_test(local_t *l)
10342 {
10343 unsigned char c;
10344
10345- asm volatile(_ASM_DEC "%0; sete %1"
10346+ asm volatile(_ASM_DEC "%0\n"
10347+
10348+#ifdef CONFIG_PAX_REFCOUNT
10349+ "jno 0f\n"
10350+ _ASM_INC "%0\n"
10351+ "int $4\n0:\n"
10352+ _ASM_EXTABLE(0b, 0b)
10353+#endif
10354+
10355+ "sete %1\n"
10356 : "+m" (l->a.counter), "=qm" (c)
10357 : : "memory");
10358 return c != 0;
10359@@ -91,7 +141,16 @@ static inline int local_inc_and_test(local_t *l)
10360 {
10361 unsigned char c;
10362
10363- asm volatile(_ASM_INC "%0; sete %1"
10364+ asm volatile(_ASM_INC "%0\n"
10365+
10366+#ifdef CONFIG_PAX_REFCOUNT
10367+ "jno 0f\n"
10368+ _ASM_DEC "%0\n"
10369+ "int $4\n0:\n"
10370+ _ASM_EXTABLE(0b, 0b)
10371+#endif
10372+
10373+ "sete %1\n"
10374 : "+m" (l->a.counter), "=qm" (c)
10375 : : "memory");
10376 return c != 0;
10377@@ -110,7 +169,16 @@ static inline int local_add_negative(long i, local_t *l)
10378 {
10379 unsigned char c;
10380
10381- asm volatile(_ASM_ADD "%2,%0; sets %1"
10382+ asm volatile(_ASM_ADD "%2,%0\n"
10383+
10384+#ifdef CONFIG_PAX_REFCOUNT
10385+ "jno 0f\n"
10386+ _ASM_SUB "%2,%0\n"
10387+ "int $4\n0:\n"
10388+ _ASM_EXTABLE(0b, 0b)
10389+#endif
10390+
10391+ "sets %1\n"
10392 : "+m" (l->a.counter), "=qm" (c)
10393 : "ir" (i) : "memory");
10394 return c;
10395@@ -133,7 +201,15 @@ static inline long local_add_return(long i, local_t *l)
10396 #endif
10397 /* Modern 486+ processor */
10398 __i = i;
10399- asm volatile(_ASM_XADD "%0, %1;"
10400+ asm volatile(_ASM_XADD "%0, %1\n"
10401+
10402+#ifdef CONFIG_PAX_REFCOUNT
10403+ "jno 0f\n"
10404+ _ASM_MOV "%0,%1\n"
10405+ "int $4\n0:\n"
10406+ _ASM_EXTABLE(0b, 0b)
10407+#endif
10408+
10409 : "+r" (i), "+m" (l->a.counter)
10410 : : "memory");
10411 return i + __i;
10412diff --git a/arch/x86/include/asm/mman.h b/arch/x86/include/asm/mman.h
10413index 593e51d..fa69c9a 100644
10414--- a/arch/x86/include/asm/mman.h
10415+++ b/arch/x86/include/asm/mman.h
10416@@ -5,4 +5,14 @@
10417
10418 #include <asm-generic/mman.h>
10419
10420+#ifdef __KERNEL__
10421+#ifndef __ASSEMBLY__
10422+#ifdef CONFIG_X86_32
10423+#define arch_mmap_check i386_mmap_check
10424+int i386_mmap_check(unsigned long addr, unsigned long len,
10425+ unsigned long flags);
10426+#endif
10427+#endif
10428+#endif
10429+
10430 #endif /* _ASM_X86_MMAN_H */
10431diff --git a/arch/x86/include/asm/mmu.h b/arch/x86/include/asm/mmu.h
10432index 5f55e69..e20bfb1 100644
10433--- a/arch/x86/include/asm/mmu.h
10434+++ b/arch/x86/include/asm/mmu.h
10435@@ -9,7 +9,7 @@
10436 * we put the segment information here.
10437 */
10438 typedef struct {
10439- void *ldt;
10440+ struct desc_struct *ldt;
10441 int size;
10442
10443 #ifdef CONFIG_X86_64
10444@@ -18,7 +18,19 @@ typedef struct {
10445 #endif
10446
10447 struct mutex lock;
10448- void *vdso;
10449+ unsigned long vdso;
10450+
10451+#ifdef CONFIG_X86_32
10452+#if defined(CONFIG_PAX_PAGEEXEC) || defined(CONFIG_PAX_SEGMEXEC)
10453+ unsigned long user_cs_base;
10454+ unsigned long user_cs_limit;
10455+
10456+#if defined(CONFIG_PAX_PAGEEXEC) && defined(CONFIG_SMP)
10457+ cpumask_t cpu_user_cs_mask;
10458+#endif
10459+
10460+#endif
10461+#endif
10462 } mm_context_t;
10463
10464 #ifdef CONFIG_SMP
10465diff --git a/arch/x86/include/asm/mmu_context.h b/arch/x86/include/asm/mmu_context.h
10466index 6902152..399f3a2 100644
10467--- a/arch/x86/include/asm/mmu_context.h
10468+++ b/arch/x86/include/asm/mmu_context.h
10469@@ -24,6 +24,18 @@ void destroy_context(struct mm_struct *mm);
10470
10471 static inline void enter_lazy_tlb(struct mm_struct *mm, struct task_struct *tsk)
10472 {
10473+
10474+#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
10475+ unsigned int i;
10476+ pgd_t *pgd;
10477+
10478+ pax_open_kernel();
10479+ pgd = get_cpu_pgd(smp_processor_id());
10480+ for (i = USER_PGD_PTRS; i < 2 * USER_PGD_PTRS; ++i)
10481+ set_pgd_batched(pgd+i, native_make_pgd(0));
10482+ pax_close_kernel();
10483+#endif
10484+
10485 #ifdef CONFIG_SMP
10486 if (percpu_read(cpu_tlbstate.state) == TLBSTATE_OK)
10487 percpu_write(cpu_tlbstate.state, TLBSTATE_LAZY);
10488@@ -34,16 +46,30 @@ static inline void switch_mm(struct mm_struct *prev, struct mm_struct *next,
10489 struct task_struct *tsk)
10490 {
10491 unsigned cpu = smp_processor_id();
10492+#if defined(CONFIG_X86_32) && defined(CONFIG_SMP) && (defined(CONFIG_PAX_PAGEEXEC) || defined(CONFIG_PAX_SEGMEXEC))
10493+ int tlbstate = TLBSTATE_OK;
10494+#endif
10495
10496 if (likely(prev != next)) {
10497 #ifdef CONFIG_SMP
10498+#if defined(CONFIG_X86_32) && (defined(CONFIG_PAX_PAGEEXEC) || defined(CONFIG_PAX_SEGMEXEC))
10499+ tlbstate = percpu_read(cpu_tlbstate.state);
10500+#endif
10501 percpu_write(cpu_tlbstate.state, TLBSTATE_OK);
10502 percpu_write(cpu_tlbstate.active_mm, next);
10503 #endif
10504 cpumask_set_cpu(cpu, mm_cpumask(next));
10505
10506 /* Re-load page tables */
10507+#ifdef CONFIG_PAX_PER_CPU_PGD
10508+ pax_open_kernel();
10509+ __clone_user_pgds(get_cpu_pgd(cpu), next->pgd, USER_PGD_PTRS);
10510+ __shadow_user_pgds(get_cpu_pgd(cpu) + USER_PGD_PTRS, next->pgd, USER_PGD_PTRS);
10511+ pax_close_kernel();
10512+ load_cr3(get_cpu_pgd(cpu));
10513+#else
10514 load_cr3(next->pgd);
10515+#endif
10516
10517 /* stop flush ipis for the previous mm */
10518 cpumask_clear_cpu(cpu, mm_cpumask(prev));
10519@@ -53,9 +79,38 @@ static inline void switch_mm(struct mm_struct *prev, struct mm_struct *next,
10520 */
10521 if (unlikely(prev->context.ldt != next->context.ldt))
10522 load_LDT_nolock(&next->context);
10523- }
10524+
10525+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_PAGEEXEC) && defined(CONFIG_SMP)
10526+ if (!(__supported_pte_mask & _PAGE_NX)) {
10527+ smp_mb__before_clear_bit();
10528+ cpu_clear(cpu, prev->context.cpu_user_cs_mask);
10529+ smp_mb__after_clear_bit();
10530+ cpu_set(cpu, next->context.cpu_user_cs_mask);
10531+ }
10532+#endif
10533+
10534+#if defined(CONFIG_X86_32) && (defined(CONFIG_PAX_PAGEEXEC) || defined(CONFIG_PAX_SEGMEXEC))
10535+ if (unlikely(prev->context.user_cs_base != next->context.user_cs_base ||
10536+ prev->context.user_cs_limit != next->context.user_cs_limit))
10537+ set_user_cs(next->context.user_cs_base, next->context.user_cs_limit, cpu);
10538 #ifdef CONFIG_SMP
10539+ else if (unlikely(tlbstate != TLBSTATE_OK))
10540+ set_user_cs(next->context.user_cs_base, next->context.user_cs_limit, cpu);
10541+#endif
10542+#endif
10543+
10544+ }
10545 else {
10546+
10547+#ifdef CONFIG_PAX_PER_CPU_PGD
10548+ pax_open_kernel();
10549+ __clone_user_pgds(get_cpu_pgd(cpu), next->pgd, USER_PGD_PTRS);
10550+ __shadow_user_pgds(get_cpu_pgd(cpu) + USER_PGD_PTRS, next->pgd, USER_PGD_PTRS);
10551+ pax_close_kernel();
10552+ load_cr3(get_cpu_pgd(cpu));
10553+#endif
10554+
10555+#ifdef CONFIG_SMP
10556 percpu_write(cpu_tlbstate.state, TLBSTATE_OK);
10557 BUG_ON(percpu_read(cpu_tlbstate.active_mm) != next);
10558
10559@@ -64,11 +119,28 @@ static inline void switch_mm(struct mm_struct *prev, struct mm_struct *next,
10560 * tlb flush IPI delivery. We must reload CR3
10561 * to make sure to use no freed page tables.
10562 */
10563+
10564+#ifndef CONFIG_PAX_PER_CPU_PGD
10565 load_cr3(next->pgd);
10566+#endif
10567+
10568 load_LDT_nolock(&next->context);
10569+
10570+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_PAGEEXEC)
10571+ if (!(__supported_pte_mask & _PAGE_NX))
10572+ cpu_set(cpu, next->context.cpu_user_cs_mask);
10573+#endif
10574+
10575+#if defined(CONFIG_X86_32) && (defined(CONFIG_PAX_PAGEEXEC) || defined(CONFIG_PAX_SEGMEXEC))
10576+#ifdef CONFIG_PAX_PAGEEXEC
10577+ if (!((next->pax_flags & MF_PAX_PAGEEXEC) && (__supported_pte_mask & _PAGE_NX)))
10578+#endif
10579+ set_user_cs(next->context.user_cs_base, next->context.user_cs_limit, cpu);
10580+#endif
10581+
10582 }
10583+#endif
10584 }
10585-#endif
10586 }
10587
10588 #define activate_mm(prev, next) \
10589diff --git a/arch/x86/include/asm/module.h b/arch/x86/include/asm/module.h
10590index 9eae775..c914fea 100644
10591--- a/arch/x86/include/asm/module.h
10592+++ b/arch/x86/include/asm/module.h
10593@@ -5,6 +5,7 @@
10594
10595 #ifdef CONFIG_X86_64
10596 /* X86_64 does not define MODULE_PROC_FAMILY */
10597+#define MODULE_PROC_FAMILY ""
10598 #elif defined CONFIG_M386
10599 #define MODULE_PROC_FAMILY "386 "
10600 #elif defined CONFIG_M486
10601@@ -59,8 +60,20 @@
10602 #error unknown processor family
10603 #endif
10604
10605-#ifdef CONFIG_X86_32
10606-# define MODULE_ARCH_VERMAGIC MODULE_PROC_FAMILY
10607+#ifdef CONFIG_PAX_KERNEXEC_PLUGIN_METHOD_BTS
10608+#define MODULE_PAX_KERNEXEC "KERNEXEC_BTS "
10609+#elif defined(CONFIG_PAX_KERNEXEC_PLUGIN_METHOD_OR)
10610+#define MODULE_PAX_KERNEXEC "KERNEXEC_OR "
10611+#else
10612+#define MODULE_PAX_KERNEXEC ""
10613 #endif
10614
10615+#ifdef CONFIG_PAX_MEMORY_UDEREF
10616+#define MODULE_PAX_UDEREF "UDEREF "
10617+#else
10618+#define MODULE_PAX_UDEREF ""
10619+#endif
10620+
10621+#define MODULE_ARCH_VERMAGIC MODULE_PROC_FAMILY MODULE_PAX_KERNEXEC MODULE_PAX_UDEREF
10622+
10623 #endif /* _ASM_X86_MODULE_H */
10624diff --git a/arch/x86/include/asm/page_64_types.h b/arch/x86/include/asm/page_64_types.h
10625index 7639dbf..e08a58c 100644
10626--- a/arch/x86/include/asm/page_64_types.h
10627+++ b/arch/x86/include/asm/page_64_types.h
10628@@ -56,7 +56,7 @@ void copy_page(void *to, void *from);
10629
10630 /* duplicated to the one in bootmem.h */
10631 extern unsigned long max_pfn;
10632-extern unsigned long phys_base;
10633+extern const unsigned long phys_base;
10634
10635 extern unsigned long __phys_addr(unsigned long);
10636 #define __phys_reloc_hide(x) (x)
10637diff --git a/arch/x86/include/asm/paravirt.h b/arch/x86/include/asm/paravirt.h
10638index a7d2db9..edb023e 100644
10639--- a/arch/x86/include/asm/paravirt.h
10640+++ b/arch/x86/include/asm/paravirt.h
10641@@ -667,6 +667,18 @@ static inline void set_pgd(pgd_t *pgdp, pgd_t pgd)
10642 val);
10643 }
10644
10645+static inline void set_pgd_batched(pgd_t *pgdp, pgd_t pgd)
10646+{
10647+ pgdval_t val = native_pgd_val(pgd);
10648+
10649+ if (sizeof(pgdval_t) > sizeof(long))
10650+ PVOP_VCALL3(pv_mmu_ops.set_pgd_batched, pgdp,
10651+ val, (u64)val >> 32);
10652+ else
10653+ PVOP_VCALL2(pv_mmu_ops.set_pgd_batched, pgdp,
10654+ val);
10655+}
10656+
10657 static inline void pgd_clear(pgd_t *pgdp)
10658 {
10659 set_pgd(pgdp, __pgd(0));
10660@@ -748,6 +760,21 @@ static inline void __set_fixmap(unsigned /* enum fixed_addresses */ idx,
10661 pv_mmu_ops.set_fixmap(idx, phys, flags);
10662 }
10663
10664+#ifdef CONFIG_PAX_KERNEXEC
10665+static inline unsigned long pax_open_kernel(void)
10666+{
10667+ return PVOP_CALL0(unsigned long, pv_mmu_ops.pax_open_kernel);
10668+}
10669+
10670+static inline unsigned long pax_close_kernel(void)
10671+{
10672+ return PVOP_CALL0(unsigned long, pv_mmu_ops.pax_close_kernel);
10673+}
10674+#else
10675+static inline unsigned long pax_open_kernel(void) { return 0; }
10676+static inline unsigned long pax_close_kernel(void) { return 0; }
10677+#endif
10678+
10679 #if defined(CONFIG_SMP) && defined(CONFIG_PARAVIRT_SPINLOCKS)
10680
10681 static inline int arch_spin_is_locked(struct arch_spinlock *lock)
10682@@ -964,7 +991,7 @@ extern void default_banner(void);
10683
10684 #define PARA_PATCH(struct, off) ((PARAVIRT_PATCH_##struct + (off)) / 4)
10685 #define PARA_SITE(ptype, clobbers, ops) _PVSITE(ptype, clobbers, ops, .long, 4)
10686-#define PARA_INDIRECT(addr) *%cs:addr
10687+#define PARA_INDIRECT(addr) *%ss:addr
10688 #endif
10689
10690 #define INTERRUPT_RETURN \
10691@@ -1041,6 +1068,21 @@ extern void default_banner(void);
10692 PARA_SITE(PARA_PATCH(pv_cpu_ops, PV_CPU_irq_enable_sysexit), \
10693 CLBR_NONE, \
10694 jmp PARA_INDIRECT(pv_cpu_ops+PV_CPU_irq_enable_sysexit))
10695+
10696+#define GET_CR0_INTO_RDI \
10697+ call PARA_INDIRECT(pv_cpu_ops+PV_CPU_read_cr0); \
10698+ mov %rax,%rdi
10699+
10700+#define SET_RDI_INTO_CR0 \
10701+ call PARA_INDIRECT(pv_cpu_ops+PV_CPU_write_cr0)
10702+
10703+#define GET_CR3_INTO_RDI \
10704+ call PARA_INDIRECT(pv_mmu_ops+PV_MMU_read_cr3); \
10705+ mov %rax,%rdi
10706+
10707+#define SET_RDI_INTO_CR3 \
10708+ call PARA_INDIRECT(pv_mmu_ops+PV_MMU_write_cr3)
10709+
10710 #endif /* CONFIG_X86_32 */
10711
10712 #endif /* __ASSEMBLY__ */
10713diff --git a/arch/x86/include/asm/paravirt_types.h b/arch/x86/include/asm/paravirt_types.h
10714index 8e8b9a4..f07d725 100644
10715--- a/arch/x86/include/asm/paravirt_types.h
10716+++ b/arch/x86/include/asm/paravirt_types.h
10717@@ -84,20 +84,20 @@ struct pv_init_ops {
10718 */
10719 unsigned (*patch)(u8 type, u16 clobber, void *insnbuf,
10720 unsigned long addr, unsigned len);
10721-};
10722+} __no_const;
10723
10724
10725 struct pv_lazy_ops {
10726 /* Set deferred update mode, used for batching operations. */
10727 void (*enter)(void);
10728 void (*leave)(void);
10729-};
10730+} __no_const;
10731
10732 struct pv_time_ops {
10733 unsigned long long (*sched_clock)(void);
10734 unsigned long long (*steal_clock)(int cpu);
10735 unsigned long (*get_tsc_khz)(void);
10736-};
10737+} __no_const;
10738
10739 struct pv_cpu_ops {
10740 /* hooks for various privileged instructions */
10741@@ -193,7 +193,7 @@ struct pv_cpu_ops {
10742
10743 void (*start_context_switch)(struct task_struct *prev);
10744 void (*end_context_switch)(struct task_struct *next);
10745-};
10746+} __no_const;
10747
10748 struct pv_irq_ops {
10749 /*
10750@@ -224,7 +224,7 @@ struct pv_apic_ops {
10751 unsigned long start_eip,
10752 unsigned long start_esp);
10753 #endif
10754-};
10755+} __no_const;
10756
10757 struct pv_mmu_ops {
10758 unsigned long (*read_cr2)(void);
10759@@ -313,6 +313,7 @@ struct pv_mmu_ops {
10760 struct paravirt_callee_save make_pud;
10761
10762 void (*set_pgd)(pgd_t *pudp, pgd_t pgdval);
10763+ void (*set_pgd_batched)(pgd_t *pudp, pgd_t pgdval);
10764 #endif /* PAGETABLE_LEVELS == 4 */
10765 #endif /* PAGETABLE_LEVELS >= 3 */
10766
10767@@ -324,6 +325,12 @@ struct pv_mmu_ops {
10768 an mfn. We can tell which is which from the index. */
10769 void (*set_fixmap)(unsigned /* enum fixed_addresses */ idx,
10770 phys_addr_t phys, pgprot_t flags);
10771+
10772+#ifdef CONFIG_PAX_KERNEXEC
10773+ unsigned long (*pax_open_kernel)(void);
10774+ unsigned long (*pax_close_kernel)(void);
10775+#endif
10776+
10777 };
10778
10779 struct arch_spinlock;
10780@@ -334,7 +341,7 @@ struct pv_lock_ops {
10781 void (*spin_lock_flags)(struct arch_spinlock *lock, unsigned long flags);
10782 int (*spin_trylock)(struct arch_spinlock *lock);
10783 void (*spin_unlock)(struct arch_spinlock *lock);
10784-};
10785+} __no_const;
10786
10787 /* This contains all the paravirt structures: we get a convenient
10788 * number for each function using the offset which we use to indicate
10789diff --git a/arch/x86/include/asm/pgalloc.h b/arch/x86/include/asm/pgalloc.h
10790index b4389a4..b7ff22c 100644
10791--- a/arch/x86/include/asm/pgalloc.h
10792+++ b/arch/x86/include/asm/pgalloc.h
10793@@ -63,6 +63,13 @@ static inline void pmd_populate_kernel(struct mm_struct *mm,
10794 pmd_t *pmd, pte_t *pte)
10795 {
10796 paravirt_alloc_pte(mm, __pa(pte) >> PAGE_SHIFT);
10797+ set_pmd(pmd, __pmd(__pa(pte) | _KERNPG_TABLE));
10798+}
10799+
10800+static inline void pmd_populate_user(struct mm_struct *mm,
10801+ pmd_t *pmd, pte_t *pte)
10802+{
10803+ paravirt_alloc_pte(mm, __pa(pte) >> PAGE_SHIFT);
10804 set_pmd(pmd, __pmd(__pa(pte) | _PAGE_TABLE));
10805 }
10806
10807diff --git a/arch/x86/include/asm/pgtable-2level.h b/arch/x86/include/asm/pgtable-2level.h
10808index 98391db..8f6984e 100644
10809--- a/arch/x86/include/asm/pgtable-2level.h
10810+++ b/arch/x86/include/asm/pgtable-2level.h
10811@@ -18,7 +18,9 @@ static inline void native_set_pte(pte_t *ptep , pte_t pte)
10812
10813 static inline void native_set_pmd(pmd_t *pmdp, pmd_t pmd)
10814 {
10815+ pax_open_kernel();
10816 *pmdp = pmd;
10817+ pax_close_kernel();
10818 }
10819
10820 static inline void native_set_pte_atomic(pte_t *ptep, pte_t pte)
10821diff --git a/arch/x86/include/asm/pgtable-3level.h b/arch/x86/include/asm/pgtable-3level.h
10822index effff47..f9e4035 100644
10823--- a/arch/x86/include/asm/pgtable-3level.h
10824+++ b/arch/x86/include/asm/pgtable-3level.h
10825@@ -38,12 +38,16 @@ static inline void native_set_pte_atomic(pte_t *ptep, pte_t pte)
10826
10827 static inline void native_set_pmd(pmd_t *pmdp, pmd_t pmd)
10828 {
10829+ pax_open_kernel();
10830 set_64bit((unsigned long long *)(pmdp), native_pmd_val(pmd));
10831+ pax_close_kernel();
10832 }
10833
10834 static inline void native_set_pud(pud_t *pudp, pud_t pud)
10835 {
10836+ pax_open_kernel();
10837 set_64bit((unsigned long long *)(pudp), native_pud_val(pud));
10838+ pax_close_kernel();
10839 }
10840
10841 /*
10842diff --git a/arch/x86/include/asm/pgtable.h b/arch/x86/include/asm/pgtable.h
10843index 18601c8..3d716d1 100644
10844--- a/arch/x86/include/asm/pgtable.h
10845+++ b/arch/x86/include/asm/pgtable.h
10846@@ -44,6 +44,7 @@ extern struct mm_struct *pgd_page_get_mm(struct page *page);
10847
10848 #ifndef __PAGETABLE_PUD_FOLDED
10849 #define set_pgd(pgdp, pgd) native_set_pgd(pgdp, pgd)
10850+#define set_pgd_batched(pgdp, pgd) native_set_pgd_batched(pgdp, pgd)
10851 #define pgd_clear(pgd) native_pgd_clear(pgd)
10852 #endif
10853
10854@@ -81,12 +82,51 @@ extern struct mm_struct *pgd_page_get_mm(struct page *page);
10855
10856 #define arch_end_context_switch(prev) do {} while(0)
10857
10858+#define pax_open_kernel() native_pax_open_kernel()
10859+#define pax_close_kernel() native_pax_close_kernel()
10860 #endif /* CONFIG_PARAVIRT */
10861
10862+#define __HAVE_ARCH_PAX_OPEN_KERNEL
10863+#define __HAVE_ARCH_PAX_CLOSE_KERNEL
10864+
10865+#ifdef CONFIG_PAX_KERNEXEC
10866+static inline unsigned long native_pax_open_kernel(void)
10867+{
10868+ unsigned long cr0;
10869+
10870+ preempt_disable();
10871+ barrier();
10872+ cr0 = read_cr0() ^ X86_CR0_WP;
10873+ BUG_ON(unlikely(cr0 & X86_CR0_WP));
10874+ write_cr0(cr0);
10875+ return cr0 ^ X86_CR0_WP;
10876+}
10877+
10878+static inline unsigned long native_pax_close_kernel(void)
10879+{
10880+ unsigned long cr0;
10881+
10882+ cr0 = read_cr0() ^ X86_CR0_WP;
10883+ BUG_ON(unlikely(!(cr0 & X86_CR0_WP)));
10884+ write_cr0(cr0);
10885+ barrier();
10886+ preempt_enable_no_resched();
10887+ return cr0 ^ X86_CR0_WP;
10888+}
10889+#else
10890+static inline unsigned long native_pax_open_kernel(void) { return 0; }
10891+static inline unsigned long native_pax_close_kernel(void) { return 0; }
10892+#endif
10893+
10894 /*
10895 * The following only work if pte_present() is true.
10896 * Undefined behaviour if not..
10897 */
10898+static inline int pte_user(pte_t pte)
10899+{
10900+ return pte_val(pte) & _PAGE_USER;
10901+}
10902+
10903 static inline int pte_dirty(pte_t pte)
10904 {
10905 return pte_flags(pte) & _PAGE_DIRTY;
10906@@ -196,9 +236,29 @@ static inline pte_t pte_wrprotect(pte_t pte)
10907 return pte_clear_flags(pte, _PAGE_RW);
10908 }
10909
10910+static inline pte_t pte_mkread(pte_t pte)
10911+{
10912+ return __pte(pte_val(pte) | _PAGE_USER);
10913+}
10914+
10915 static inline pte_t pte_mkexec(pte_t pte)
10916 {
10917- return pte_clear_flags(pte, _PAGE_NX);
10918+#ifdef CONFIG_X86_PAE
10919+ if (__supported_pte_mask & _PAGE_NX)
10920+ return pte_clear_flags(pte, _PAGE_NX);
10921+ else
10922+#endif
10923+ return pte_set_flags(pte, _PAGE_USER);
10924+}
10925+
10926+static inline pte_t pte_exprotect(pte_t pte)
10927+{
10928+#ifdef CONFIG_X86_PAE
10929+ if (__supported_pte_mask & _PAGE_NX)
10930+ return pte_set_flags(pte, _PAGE_NX);
10931+ else
10932+#endif
10933+ return pte_clear_flags(pte, _PAGE_USER);
10934 }
10935
10936 static inline pte_t pte_mkdirty(pte_t pte)
10937@@ -390,6 +450,15 @@ pte_t *populate_extra_pte(unsigned long vaddr);
10938 #endif
10939
10940 #ifndef __ASSEMBLY__
10941+
10942+#ifdef CONFIG_PAX_PER_CPU_PGD
10943+extern pgd_t cpu_pgd[NR_CPUS][PTRS_PER_PGD];
10944+static inline pgd_t *get_cpu_pgd(unsigned int cpu)
10945+{
10946+ return cpu_pgd[cpu];
10947+}
10948+#endif
10949+
10950 #include <linux/mm_types.h>
10951
10952 static inline int pte_none(pte_t pte)
10953@@ -560,7 +629,7 @@ static inline pud_t *pud_offset(pgd_t *pgd, unsigned long address)
10954
10955 static inline int pgd_bad(pgd_t pgd)
10956 {
10957- return (pgd_flags(pgd) & ~_PAGE_USER) != _KERNPG_TABLE;
10958+ return (pgd_flags(pgd) & ~(_PAGE_USER | _PAGE_NX)) != _KERNPG_TABLE;
10959 }
10960
10961 static inline int pgd_none(pgd_t pgd)
10962@@ -583,7 +652,12 @@ static inline int pgd_none(pgd_t pgd)
10963 * pgd_offset() returns a (pgd_t *)
10964 * pgd_index() is used get the offset into the pgd page's array of pgd_t's;
10965 */
10966-#define pgd_offset(mm, address) ((mm)->pgd + pgd_index((address)))
10967+#define pgd_offset(mm, address) ((mm)->pgd + pgd_index(address))
10968+
10969+#ifdef CONFIG_PAX_PER_CPU_PGD
10970+#define pgd_offset_cpu(cpu, address) (get_cpu_pgd(cpu) + pgd_index(address))
10971+#endif
10972+
10973 /*
10974 * a shortcut which implies the use of the kernel's pgd, instead
10975 * of a process's
10976@@ -594,6 +668,20 @@ static inline int pgd_none(pgd_t pgd)
10977 #define KERNEL_PGD_BOUNDARY pgd_index(PAGE_OFFSET)
10978 #define KERNEL_PGD_PTRS (PTRS_PER_PGD - KERNEL_PGD_BOUNDARY)
10979
10980+#ifdef CONFIG_X86_32
10981+#define USER_PGD_PTRS KERNEL_PGD_BOUNDARY
10982+#else
10983+#define TASK_SIZE_MAX_SHIFT CONFIG_TASK_SIZE_MAX_SHIFT
10984+#define USER_PGD_PTRS (_AC(1,UL) << (TASK_SIZE_MAX_SHIFT - PGDIR_SHIFT))
10985+
10986+#ifdef CONFIG_PAX_MEMORY_UDEREF
10987+#define PAX_USER_SHADOW_BASE (_AC(1,UL) << TASK_SIZE_MAX_SHIFT)
10988+#else
10989+#define PAX_USER_SHADOW_BASE (_AC(0,UL))
10990+#endif
10991+
10992+#endif
10993+
10994 #ifndef __ASSEMBLY__
10995
10996 extern int direct_gbpages;
10997@@ -758,11 +846,23 @@ static inline void pmdp_set_wrprotect(struct mm_struct *mm,
10998 * dst and src can be on the same page, but the range must not overlap,
10999 * and must not cross a page boundary.
11000 */
11001-static inline void clone_pgd_range(pgd_t *dst, pgd_t *src, int count)
11002+static inline void clone_pgd_range(pgd_t *dst, const pgd_t *src, int count)
11003 {
11004- memcpy(dst, src, count * sizeof(pgd_t));
11005+ pax_open_kernel();
11006+ while (count--)
11007+ *dst++ = *src++;
11008+ pax_close_kernel();
11009 }
11010
11011+#ifdef CONFIG_PAX_PER_CPU_PGD
11012+extern void __clone_user_pgds(pgd_t *dst, const pgd_t *src, int count);
11013+#endif
11014+
11015+#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
11016+extern void __shadow_user_pgds(pgd_t *dst, const pgd_t *src, int count);
11017+#else
11018+static inline void __shadow_user_pgds(pgd_t *dst, const pgd_t *src, int count) {}
11019+#endif
11020
11021 #include <asm-generic/pgtable.h>
11022 #endif /* __ASSEMBLY__ */
11023diff --git a/arch/x86/include/asm/pgtable_32.h b/arch/x86/include/asm/pgtable_32.h
11024index 0c92113..34a77c6 100644
11025--- a/arch/x86/include/asm/pgtable_32.h
11026+++ b/arch/x86/include/asm/pgtable_32.h
11027@@ -25,9 +25,6 @@
11028 struct mm_struct;
11029 struct vm_area_struct;
11030
11031-extern pgd_t swapper_pg_dir[1024];
11032-extern pgd_t initial_page_table[1024];
11033-
11034 static inline void pgtable_cache_init(void) { }
11035 static inline void check_pgt_cache(void) { }
11036 void paging_init(void);
11037@@ -48,6 +45,12 @@ extern void set_pmd_pfn(unsigned long, unsigned long, pgprot_t);
11038 # include <asm/pgtable-2level.h>
11039 #endif
11040
11041+extern pgd_t swapper_pg_dir[PTRS_PER_PGD];
11042+extern pgd_t initial_page_table[PTRS_PER_PGD];
11043+#ifdef CONFIG_X86_PAE
11044+extern pmd_t swapper_pm_dir[PTRS_PER_PGD][PTRS_PER_PMD];
11045+#endif
11046+
11047 #if defined(CONFIG_HIGHPTE)
11048 #define pte_offset_map(dir, address) \
11049 ((pte_t *)kmap_atomic(pmd_page(*(dir))) + \
11050@@ -62,7 +65,9 @@ extern void set_pmd_pfn(unsigned long, unsigned long, pgprot_t);
11051 /* Clear a kernel PTE and flush it from the TLB */
11052 #define kpte_clear_flush(ptep, vaddr) \
11053 do { \
11054+ pax_open_kernel(); \
11055 pte_clear(&init_mm, (vaddr), (ptep)); \
11056+ pax_close_kernel(); \
11057 __flush_tlb_one((vaddr)); \
11058 } while (0)
11059
11060@@ -74,6 +79,9 @@ do { \
11061
11062 #endif /* !__ASSEMBLY__ */
11063
11064+#define HAVE_ARCH_UNMAPPED_AREA
11065+#define HAVE_ARCH_UNMAPPED_AREA_TOPDOWN
11066+
11067 /*
11068 * kern_addr_valid() is (1) for FLATMEM and (0) for
11069 * SPARSEMEM and DISCONTIGMEM
11070diff --git a/arch/x86/include/asm/pgtable_32_types.h b/arch/x86/include/asm/pgtable_32_types.h
11071index ed5903b..c7fe163 100644
11072--- a/arch/x86/include/asm/pgtable_32_types.h
11073+++ b/arch/x86/include/asm/pgtable_32_types.h
11074@@ -8,7 +8,7 @@
11075 */
11076 #ifdef CONFIG_X86_PAE
11077 # include <asm/pgtable-3level_types.h>
11078-# define PMD_SIZE (1UL << PMD_SHIFT)
11079+# define PMD_SIZE (_AC(1, UL) << PMD_SHIFT)
11080 # define PMD_MASK (~(PMD_SIZE - 1))
11081 #else
11082 # include <asm/pgtable-2level_types.h>
11083@@ -46,6 +46,19 @@ extern bool __vmalloc_start_set; /* set once high_memory is set */
11084 # define VMALLOC_END (FIXADDR_START - 2 * PAGE_SIZE)
11085 #endif
11086
11087+#ifdef CONFIG_PAX_KERNEXEC
11088+#ifndef __ASSEMBLY__
11089+extern unsigned char MODULES_EXEC_VADDR[];
11090+extern unsigned char MODULES_EXEC_END[];
11091+#endif
11092+#include <asm/boot.h>
11093+#define ktla_ktva(addr) (addr + LOAD_PHYSICAL_ADDR + PAGE_OFFSET)
11094+#define ktva_ktla(addr) (addr - LOAD_PHYSICAL_ADDR - PAGE_OFFSET)
11095+#else
11096+#define ktla_ktva(addr) (addr)
11097+#define ktva_ktla(addr) (addr)
11098+#endif
11099+
11100 #define MODULES_VADDR VMALLOC_START
11101 #define MODULES_END VMALLOC_END
11102 #define MODULES_LEN (MODULES_VADDR - MODULES_END)
11103diff --git a/arch/x86/include/asm/pgtable_64.h b/arch/x86/include/asm/pgtable_64.h
11104index 975f709..107976d 100644
11105--- a/arch/x86/include/asm/pgtable_64.h
11106+++ b/arch/x86/include/asm/pgtable_64.h
11107@@ -16,10 +16,14 @@
11108
11109 extern pud_t level3_kernel_pgt[512];
11110 extern pud_t level3_ident_pgt[512];
11111+extern pud_t level3_vmalloc_start_pgt[512];
11112+extern pud_t level3_vmalloc_end_pgt[512];
11113+extern pud_t level3_vmemmap_pgt[512];
11114+extern pud_t level2_vmemmap_pgt[512];
11115 extern pmd_t level2_kernel_pgt[512];
11116 extern pmd_t level2_fixmap_pgt[512];
11117-extern pmd_t level2_ident_pgt[512];
11118-extern pgd_t init_level4_pgt[];
11119+extern pmd_t level2_ident_pgt[512*2];
11120+extern pgd_t init_level4_pgt[512];
11121
11122 #define swapper_pg_dir init_level4_pgt
11123
11124@@ -61,7 +65,9 @@ static inline void native_set_pte_atomic(pte_t *ptep, pte_t pte)
11125
11126 static inline void native_set_pmd(pmd_t *pmdp, pmd_t pmd)
11127 {
11128+ pax_open_kernel();
11129 *pmdp = pmd;
11130+ pax_close_kernel();
11131 }
11132
11133 static inline void native_pmd_clear(pmd_t *pmd)
11134@@ -107,6 +113,13 @@ static inline void native_pud_clear(pud_t *pud)
11135
11136 static inline void native_set_pgd(pgd_t *pgdp, pgd_t pgd)
11137 {
11138+ pax_open_kernel();
11139+ *pgdp = pgd;
11140+ pax_close_kernel();
11141+}
11142+
11143+static inline void native_set_pgd_batched(pgd_t *pgdp, pgd_t pgd)
11144+{
11145 *pgdp = pgd;
11146 }
11147
11148diff --git a/arch/x86/include/asm/pgtable_64_types.h b/arch/x86/include/asm/pgtable_64_types.h
11149index 766ea16..5b96cb3 100644
11150--- a/arch/x86/include/asm/pgtable_64_types.h
11151+++ b/arch/x86/include/asm/pgtable_64_types.h
11152@@ -59,5 +59,10 @@ typedef struct { pteval_t pte; } pte_t;
11153 #define MODULES_VADDR _AC(0xffffffffa0000000, UL)
11154 #define MODULES_END _AC(0xffffffffff000000, UL)
11155 #define MODULES_LEN (MODULES_END - MODULES_VADDR)
11156+#define MODULES_EXEC_VADDR MODULES_VADDR
11157+#define MODULES_EXEC_END MODULES_END
11158+
11159+#define ktla_ktva(addr) (addr)
11160+#define ktva_ktla(addr) (addr)
11161
11162 #endif /* _ASM_X86_PGTABLE_64_DEFS_H */
11163diff --git a/arch/x86/include/asm/pgtable_types.h b/arch/x86/include/asm/pgtable_types.h
11164index 013286a..8b42f4f 100644
11165--- a/arch/x86/include/asm/pgtable_types.h
11166+++ b/arch/x86/include/asm/pgtable_types.h
11167@@ -16,13 +16,12 @@
11168 #define _PAGE_BIT_PSE 7 /* 4 MB (or 2MB) page */
11169 #define _PAGE_BIT_PAT 7 /* on 4KB pages */
11170 #define _PAGE_BIT_GLOBAL 8 /* Global TLB entry PPro+ */
11171-#define _PAGE_BIT_UNUSED1 9 /* available for programmer */
11172+#define _PAGE_BIT_SPECIAL 9 /* special mappings, no associated struct page */
11173 #define _PAGE_BIT_IOMAP 10 /* flag used to indicate IO mapping */
11174 #define _PAGE_BIT_HIDDEN 11 /* hidden by kmemcheck */
11175 #define _PAGE_BIT_PAT_LARGE 12 /* On 2MB or 1GB pages */
11176-#define _PAGE_BIT_SPECIAL _PAGE_BIT_UNUSED1
11177-#define _PAGE_BIT_CPA_TEST _PAGE_BIT_UNUSED1
11178-#define _PAGE_BIT_SPLITTING _PAGE_BIT_UNUSED1 /* only valid on a PSE pmd */
11179+#define _PAGE_BIT_CPA_TEST _PAGE_BIT_SPECIAL
11180+#define _PAGE_BIT_SPLITTING _PAGE_BIT_SPECIAL /* only valid on a PSE pmd */
11181 #define _PAGE_BIT_NX 63 /* No execute: only valid after cpuid check */
11182
11183 /* If _PAGE_BIT_PRESENT is clear, we use these: */
11184@@ -40,7 +39,6 @@
11185 #define _PAGE_DIRTY (_AT(pteval_t, 1) << _PAGE_BIT_DIRTY)
11186 #define _PAGE_PSE (_AT(pteval_t, 1) << _PAGE_BIT_PSE)
11187 #define _PAGE_GLOBAL (_AT(pteval_t, 1) << _PAGE_BIT_GLOBAL)
11188-#define _PAGE_UNUSED1 (_AT(pteval_t, 1) << _PAGE_BIT_UNUSED1)
11189 #define _PAGE_IOMAP (_AT(pteval_t, 1) << _PAGE_BIT_IOMAP)
11190 #define _PAGE_PAT (_AT(pteval_t, 1) << _PAGE_BIT_PAT)
11191 #define _PAGE_PAT_LARGE (_AT(pteval_t, 1) << _PAGE_BIT_PAT_LARGE)
11192@@ -57,8 +55,10 @@
11193
11194 #if defined(CONFIG_X86_64) || defined(CONFIG_X86_PAE)
11195 #define _PAGE_NX (_AT(pteval_t, 1) << _PAGE_BIT_NX)
11196-#else
11197+#elif defined(CONFIG_KMEMCHECK)
11198 #define _PAGE_NX (_AT(pteval_t, 0))
11199+#else
11200+#define _PAGE_NX (_AT(pteval_t, 1) << _PAGE_BIT_HIDDEN)
11201 #endif
11202
11203 #define _PAGE_FILE (_AT(pteval_t, 1) << _PAGE_BIT_FILE)
11204@@ -96,6 +96,9 @@
11205 #define PAGE_READONLY_EXEC __pgprot(_PAGE_PRESENT | _PAGE_USER | \
11206 _PAGE_ACCESSED)
11207
11208+#define PAGE_READONLY_NOEXEC PAGE_READONLY
11209+#define PAGE_SHARED_NOEXEC PAGE_SHARED
11210+
11211 #define __PAGE_KERNEL_EXEC \
11212 (_PAGE_PRESENT | _PAGE_RW | _PAGE_DIRTY | _PAGE_ACCESSED | _PAGE_GLOBAL)
11213 #define __PAGE_KERNEL (__PAGE_KERNEL_EXEC | _PAGE_NX)
11214@@ -106,7 +109,7 @@
11215 #define __PAGE_KERNEL_WC (__PAGE_KERNEL | _PAGE_CACHE_WC)
11216 #define __PAGE_KERNEL_NOCACHE (__PAGE_KERNEL | _PAGE_PCD | _PAGE_PWT)
11217 #define __PAGE_KERNEL_UC_MINUS (__PAGE_KERNEL | _PAGE_PCD)
11218-#define __PAGE_KERNEL_VSYSCALL (__PAGE_KERNEL_RX | _PAGE_USER)
11219+#define __PAGE_KERNEL_VSYSCALL (__PAGE_KERNEL_RO | _PAGE_USER)
11220 #define __PAGE_KERNEL_VVAR (__PAGE_KERNEL_RO | _PAGE_USER)
11221 #define __PAGE_KERNEL_VVAR_NOCACHE (__PAGE_KERNEL_VVAR | _PAGE_PCD | _PAGE_PWT)
11222 #define __PAGE_KERNEL_LARGE (__PAGE_KERNEL | _PAGE_PSE)
11223@@ -168,8 +171,8 @@
11224 * bits are combined, this will alow user to access the high address mapped
11225 * VDSO in the presence of CONFIG_COMPAT_VDSO
11226 */
11227-#define PTE_IDENT_ATTR 0x003 /* PRESENT+RW */
11228-#define PDE_IDENT_ATTR 0x067 /* PRESENT+RW+USER+DIRTY+ACCESSED */
11229+#define PTE_IDENT_ATTR 0x063 /* PRESENT+RW+DIRTY+ACCESSED */
11230+#define PDE_IDENT_ATTR 0x063 /* PRESENT+RW+DIRTY+ACCESSED */
11231 #define PGD_IDENT_ATTR 0x001 /* PRESENT (no other attributes) */
11232 #endif
11233
11234@@ -207,7 +210,17 @@ static inline pgdval_t pgd_flags(pgd_t pgd)
11235 {
11236 return native_pgd_val(pgd) & PTE_FLAGS_MASK;
11237 }
11238+#endif
11239
11240+#if PAGETABLE_LEVELS == 3
11241+#include <asm-generic/pgtable-nopud.h>
11242+#endif
11243+
11244+#if PAGETABLE_LEVELS == 2
11245+#include <asm-generic/pgtable-nopmd.h>
11246+#endif
11247+
11248+#ifndef __ASSEMBLY__
11249 #if PAGETABLE_LEVELS > 3
11250 typedef struct { pudval_t pud; } pud_t;
11251
11252@@ -221,8 +234,6 @@ static inline pudval_t native_pud_val(pud_t pud)
11253 return pud.pud;
11254 }
11255 #else
11256-#include <asm-generic/pgtable-nopud.h>
11257-
11258 static inline pudval_t native_pud_val(pud_t pud)
11259 {
11260 return native_pgd_val(pud.pgd);
11261@@ -242,8 +253,6 @@ static inline pmdval_t native_pmd_val(pmd_t pmd)
11262 return pmd.pmd;
11263 }
11264 #else
11265-#include <asm-generic/pgtable-nopmd.h>
11266-
11267 static inline pmdval_t native_pmd_val(pmd_t pmd)
11268 {
11269 return native_pgd_val(pmd.pud.pgd);
11270@@ -283,7 +292,6 @@ typedef struct page *pgtable_t;
11271
11272 extern pteval_t __supported_pte_mask;
11273 extern void set_nx(void);
11274-extern int nx_enabled;
11275
11276 #define pgprot_writecombine pgprot_writecombine
11277 extern pgprot_t pgprot_writecombine(pgprot_t prot);
11278diff --git a/arch/x86/include/asm/processor.h b/arch/x86/include/asm/processor.h
11279index bb3ee36..781a6b8 100644
11280--- a/arch/x86/include/asm/processor.h
11281+++ b/arch/x86/include/asm/processor.h
11282@@ -268,7 +268,7 @@ struct tss_struct {
11283
11284 } ____cacheline_aligned;
11285
11286-DECLARE_PER_CPU_SHARED_ALIGNED(struct tss_struct, init_tss);
11287+extern struct tss_struct init_tss[NR_CPUS];
11288
11289 /*
11290 * Save the original ist values for checking stack pointers during debugging
11291@@ -861,11 +861,18 @@ static inline void spin_lock_prefetch(const void *x)
11292 */
11293 #define TASK_SIZE PAGE_OFFSET
11294 #define TASK_SIZE_MAX TASK_SIZE
11295+
11296+#ifdef CONFIG_PAX_SEGMEXEC
11297+#define SEGMEXEC_TASK_SIZE (TASK_SIZE / 2)
11298+#define STACK_TOP ((current->mm->pax_flags & MF_PAX_SEGMEXEC)?SEGMEXEC_TASK_SIZE:TASK_SIZE)
11299+#else
11300 #define STACK_TOP TASK_SIZE
11301-#define STACK_TOP_MAX STACK_TOP
11302+#endif
11303+
11304+#define STACK_TOP_MAX TASK_SIZE
11305
11306 #define INIT_THREAD { \
11307- .sp0 = sizeof(init_stack) + (long)&init_stack, \
11308+ .sp0 = sizeof(init_stack) + (long)&init_stack - 8, \
11309 .vm86_info = NULL, \
11310 .sysenter_cs = __KERNEL_CS, \
11311 .io_bitmap_ptr = NULL, \
11312@@ -879,7 +886,7 @@ static inline void spin_lock_prefetch(const void *x)
11313 */
11314 #define INIT_TSS { \
11315 .x86_tss = { \
11316- .sp0 = sizeof(init_stack) + (long)&init_stack, \
11317+ .sp0 = sizeof(init_stack) + (long)&init_stack - 8, \
11318 .ss0 = __KERNEL_DS, \
11319 .ss1 = __KERNEL_CS, \
11320 .io_bitmap_base = INVALID_IO_BITMAP_OFFSET, \
11321@@ -890,11 +897,7 @@ static inline void spin_lock_prefetch(const void *x)
11322 extern unsigned long thread_saved_pc(struct task_struct *tsk);
11323
11324 #define THREAD_SIZE_LONGS (THREAD_SIZE/sizeof(unsigned long))
11325-#define KSTK_TOP(info) \
11326-({ \
11327- unsigned long *__ptr = (unsigned long *)(info); \
11328- (unsigned long)(&__ptr[THREAD_SIZE_LONGS]); \
11329-})
11330+#define KSTK_TOP(info) ((container_of(info, struct task_struct, tinfo))->thread.sp0)
11331
11332 /*
11333 * The below -8 is to reserve 8 bytes on top of the ring0 stack.
11334@@ -909,7 +912,7 @@ extern unsigned long thread_saved_pc(struct task_struct *tsk);
11335 #define task_pt_regs(task) \
11336 ({ \
11337 struct pt_regs *__regs__; \
11338- __regs__ = (struct pt_regs *)(KSTK_TOP(task_stack_page(task))-8); \
11339+ __regs__ = (struct pt_regs *)((task)->thread.sp0); \
11340 __regs__ - 1; \
11341 })
11342
11343@@ -919,13 +922,13 @@ extern unsigned long thread_saved_pc(struct task_struct *tsk);
11344 /*
11345 * User space process size. 47bits minus one guard page.
11346 */
11347-#define TASK_SIZE_MAX ((1UL << 47) - PAGE_SIZE)
11348+#define TASK_SIZE_MAX ((1UL << TASK_SIZE_MAX_SHIFT) - PAGE_SIZE)
11349
11350 /* This decides where the kernel will search for a free chunk of vm
11351 * space during mmap's.
11352 */
11353 #define IA32_PAGE_OFFSET ((current->personality & ADDR_LIMIT_3GB) ? \
11354- 0xc0000000 : 0xFFFFe000)
11355+ 0xc0000000 : 0xFFFFf000)
11356
11357 #define TASK_SIZE (test_thread_flag(TIF_IA32) ? \
11358 IA32_PAGE_OFFSET : TASK_SIZE_MAX)
11359@@ -936,11 +939,11 @@ extern unsigned long thread_saved_pc(struct task_struct *tsk);
11360 #define STACK_TOP_MAX TASK_SIZE_MAX
11361
11362 #define INIT_THREAD { \
11363- .sp0 = (unsigned long)&init_stack + sizeof(init_stack) \
11364+ .sp0 = (unsigned long)&init_stack + sizeof(init_stack) - 16 \
11365 }
11366
11367 #define INIT_TSS { \
11368- .x86_tss.sp0 = (unsigned long)&init_stack + sizeof(init_stack) \
11369+ .x86_tss.sp0 = (unsigned long)&init_stack + sizeof(init_stack) - 16 \
11370 }
11371
11372 /*
11373@@ -962,6 +965,10 @@ extern void start_thread(struct pt_regs *regs, unsigned long new_ip,
11374 */
11375 #define TASK_UNMAPPED_BASE (PAGE_ALIGN(TASK_SIZE / 3))
11376
11377+#ifdef CONFIG_PAX_SEGMEXEC
11378+#define SEGMEXEC_TASK_UNMAPPED_BASE (PAGE_ALIGN(SEGMEXEC_TASK_SIZE / 3))
11379+#endif
11380+
11381 #define KSTK_EIP(task) (task_pt_regs(task)->ip)
11382
11383 /* Get/set a process' ability to use the timestamp counter instruction */
11384diff --git a/arch/x86/include/asm/ptrace.h b/arch/x86/include/asm/ptrace.h
11385index 3566454..4bdfb8c 100644
11386--- a/arch/x86/include/asm/ptrace.h
11387+++ b/arch/x86/include/asm/ptrace.h
11388@@ -156,28 +156,29 @@ static inline unsigned long regs_return_value(struct pt_regs *regs)
11389 }
11390
11391 /*
11392- * user_mode_vm(regs) determines whether a register set came from user mode.
11393+ * user_mode(regs) determines whether a register set came from user mode.
11394 * This is true if V8086 mode was enabled OR if the register set was from
11395 * protected mode with RPL-3 CS value. This tricky test checks that with
11396 * one comparison. Many places in the kernel can bypass this full check
11397- * if they have already ruled out V8086 mode, so user_mode(regs) can be used.
11398+ * if they have already ruled out V8086 mode, so user_mode_novm(regs) can
11399+ * be used.
11400 */
11401-static inline int user_mode(struct pt_regs *regs)
11402+static inline int user_mode_novm(struct pt_regs *regs)
11403 {
11404 #ifdef CONFIG_X86_32
11405 return (regs->cs & SEGMENT_RPL_MASK) == USER_RPL;
11406 #else
11407- return !!(regs->cs & 3);
11408+ return !!(regs->cs & SEGMENT_RPL_MASK);
11409 #endif
11410 }
11411
11412-static inline int user_mode_vm(struct pt_regs *regs)
11413+static inline int user_mode(struct pt_regs *regs)
11414 {
11415 #ifdef CONFIG_X86_32
11416 return ((regs->cs & SEGMENT_RPL_MASK) | (regs->flags & X86_VM_MASK)) >=
11417 USER_RPL;
11418 #else
11419- return user_mode(regs);
11420+ return user_mode_novm(regs);
11421 #endif
11422 }
11423
11424@@ -193,15 +194,16 @@ static inline int v8086_mode(struct pt_regs *regs)
11425 #ifdef CONFIG_X86_64
11426 static inline bool user_64bit_mode(struct pt_regs *regs)
11427 {
11428+ unsigned long cs = regs->cs & 0xffff;
11429 #ifndef CONFIG_PARAVIRT
11430 /*
11431 * On non-paravirt systems, this is the only long mode CPL 3
11432 * selector. We do not allow long mode selectors in the LDT.
11433 */
11434- return regs->cs == __USER_CS;
11435+ return cs == __USER_CS;
11436 #else
11437 /* Headers are too twisted for this to go in paravirt.h. */
11438- return regs->cs == __USER_CS || regs->cs == pv_info.extra_user_64bit_cs;
11439+ return cs == __USER_CS || cs == pv_info.extra_user_64bit_cs;
11440 #endif
11441 }
11442 #endif
11443diff --git a/arch/x86/include/asm/reboot.h b/arch/x86/include/asm/reboot.h
11444index 92f29706..a79cbbb 100644
11445--- a/arch/x86/include/asm/reboot.h
11446+++ b/arch/x86/include/asm/reboot.h
11447@@ -6,19 +6,19 @@
11448 struct pt_regs;
11449
11450 struct machine_ops {
11451- void (*restart)(char *cmd);
11452- void (*halt)(void);
11453- void (*power_off)(void);
11454+ void (* __noreturn restart)(char *cmd);
11455+ void (* __noreturn halt)(void);
11456+ void (* __noreturn power_off)(void);
11457 void (*shutdown)(void);
11458 void (*crash_shutdown)(struct pt_regs *);
11459- void (*emergency_restart)(void);
11460-};
11461+ void (* __noreturn emergency_restart)(void);
11462+} __no_const;
11463
11464 extern struct machine_ops machine_ops;
11465
11466 void native_machine_crash_shutdown(struct pt_regs *regs);
11467 void native_machine_shutdown(void);
11468-void machine_real_restart(unsigned int type);
11469+void machine_real_restart(unsigned int type) __noreturn;
11470 /* These must match dispatch_table in reboot_32.S */
11471 #define MRR_BIOS 0
11472 #define MRR_APM 1
11473diff --git a/arch/x86/include/asm/rwsem.h b/arch/x86/include/asm/rwsem.h
11474index 2dbe4a7..ce1db00 100644
11475--- a/arch/x86/include/asm/rwsem.h
11476+++ b/arch/x86/include/asm/rwsem.h
11477@@ -64,6 +64,14 @@ static inline void __down_read(struct rw_semaphore *sem)
11478 {
11479 asm volatile("# beginning down_read\n\t"
11480 LOCK_PREFIX _ASM_INC "(%1)\n\t"
11481+
11482+#ifdef CONFIG_PAX_REFCOUNT
11483+ "jno 0f\n"
11484+ LOCK_PREFIX _ASM_DEC "(%1)\n"
11485+ "int $4\n0:\n"
11486+ _ASM_EXTABLE(0b, 0b)
11487+#endif
11488+
11489 /* adds 0x00000001 */
11490 " jns 1f\n"
11491 " call call_rwsem_down_read_failed\n"
11492@@ -85,6 +93,14 @@ static inline int __down_read_trylock(struct rw_semaphore *sem)
11493 "1:\n\t"
11494 " mov %1,%2\n\t"
11495 " add %3,%2\n\t"
11496+
11497+#ifdef CONFIG_PAX_REFCOUNT
11498+ "jno 0f\n"
11499+ "sub %3,%2\n"
11500+ "int $4\n0:\n"
11501+ _ASM_EXTABLE(0b, 0b)
11502+#endif
11503+
11504 " jle 2f\n\t"
11505 LOCK_PREFIX " cmpxchg %2,%0\n\t"
11506 " jnz 1b\n\t"
11507@@ -104,6 +120,14 @@ static inline void __down_write_nested(struct rw_semaphore *sem, int subclass)
11508 long tmp;
11509 asm volatile("# beginning down_write\n\t"
11510 LOCK_PREFIX " xadd %1,(%2)\n\t"
11511+
11512+#ifdef CONFIG_PAX_REFCOUNT
11513+ "jno 0f\n"
11514+ "mov %1,(%2)\n"
11515+ "int $4\n0:\n"
11516+ _ASM_EXTABLE(0b, 0b)
11517+#endif
11518+
11519 /* adds 0xffff0001, returns the old value */
11520 " test %1,%1\n\t"
11521 /* was the count 0 before? */
11522@@ -141,6 +165,14 @@ static inline void __up_read(struct rw_semaphore *sem)
11523 long tmp;
11524 asm volatile("# beginning __up_read\n\t"
11525 LOCK_PREFIX " xadd %1,(%2)\n\t"
11526+
11527+#ifdef CONFIG_PAX_REFCOUNT
11528+ "jno 0f\n"
11529+ "mov %1,(%2)\n"
11530+ "int $4\n0:\n"
11531+ _ASM_EXTABLE(0b, 0b)
11532+#endif
11533+
11534 /* subtracts 1, returns the old value */
11535 " jns 1f\n\t"
11536 " call call_rwsem_wake\n" /* expects old value in %edx */
11537@@ -159,6 +191,14 @@ static inline void __up_write(struct rw_semaphore *sem)
11538 long tmp;
11539 asm volatile("# beginning __up_write\n\t"
11540 LOCK_PREFIX " xadd %1,(%2)\n\t"
11541+
11542+#ifdef CONFIG_PAX_REFCOUNT
11543+ "jno 0f\n"
11544+ "mov %1,(%2)\n"
11545+ "int $4\n0:\n"
11546+ _ASM_EXTABLE(0b, 0b)
11547+#endif
11548+
11549 /* subtracts 0xffff0001, returns the old value */
11550 " jns 1f\n\t"
11551 " call call_rwsem_wake\n" /* expects old value in %edx */
11552@@ -176,6 +216,14 @@ static inline void __downgrade_write(struct rw_semaphore *sem)
11553 {
11554 asm volatile("# beginning __downgrade_write\n\t"
11555 LOCK_PREFIX _ASM_ADD "%2,(%1)\n\t"
11556+
11557+#ifdef CONFIG_PAX_REFCOUNT
11558+ "jno 0f\n"
11559+ LOCK_PREFIX _ASM_SUB "%2,(%1)\n"
11560+ "int $4\n0:\n"
11561+ _ASM_EXTABLE(0b, 0b)
11562+#endif
11563+
11564 /*
11565 * transitions 0xZZZZ0001 -> 0xYYYY0001 (i386)
11566 * 0xZZZZZZZZ00000001 -> 0xYYYYYYYY00000001 (x86_64)
11567@@ -194,7 +242,15 @@ static inline void __downgrade_write(struct rw_semaphore *sem)
11568 */
11569 static inline void rwsem_atomic_add(long delta, struct rw_semaphore *sem)
11570 {
11571- asm volatile(LOCK_PREFIX _ASM_ADD "%1,%0"
11572+ asm volatile(LOCK_PREFIX _ASM_ADD "%1,%0\n"
11573+
11574+#ifdef CONFIG_PAX_REFCOUNT
11575+ "jno 0f\n"
11576+ LOCK_PREFIX _ASM_SUB "%1,%0\n"
11577+ "int $4\n0:\n"
11578+ _ASM_EXTABLE(0b, 0b)
11579+#endif
11580+
11581 : "+m" (sem->count)
11582 : "er" (delta));
11583 }
11584@@ -204,7 +260,7 @@ static inline void rwsem_atomic_add(long delta, struct rw_semaphore *sem)
11585 */
11586 static inline long rwsem_atomic_update(long delta, struct rw_semaphore *sem)
11587 {
11588- return delta + xadd(&sem->count, delta);
11589+ return delta + xadd_check_overflow(&sem->count, delta);
11590 }
11591
11592 #endif /* __KERNEL__ */
11593diff --git a/arch/x86/include/asm/segment.h b/arch/x86/include/asm/segment.h
11594index 5e64171..f58957e 100644
11595--- a/arch/x86/include/asm/segment.h
11596+++ b/arch/x86/include/asm/segment.h
11597@@ -64,10 +64,15 @@
11598 * 26 - ESPFIX small SS
11599 * 27 - per-cpu [ offset to per-cpu data area ]
11600 * 28 - stack_canary-20 [ for stack protector ]
11601- * 29 - unused
11602- * 30 - unused
11603+ * 29 - PCI BIOS CS
11604+ * 30 - PCI BIOS DS
11605 * 31 - TSS for double fault handler
11606 */
11607+#define GDT_ENTRY_KERNEXEC_EFI_CS (1)
11608+#define GDT_ENTRY_KERNEXEC_EFI_DS (2)
11609+#define __KERNEXEC_EFI_CS (GDT_ENTRY_KERNEXEC_EFI_CS*8)
11610+#define __KERNEXEC_EFI_DS (GDT_ENTRY_KERNEXEC_EFI_DS*8)
11611+
11612 #define GDT_ENTRY_TLS_MIN 6
11613 #define GDT_ENTRY_TLS_MAX (GDT_ENTRY_TLS_MIN + GDT_ENTRY_TLS_ENTRIES - 1)
11614
11615@@ -79,6 +84,8 @@
11616
11617 #define GDT_ENTRY_KERNEL_CS (GDT_ENTRY_KERNEL_BASE+0)
11618
11619+#define GDT_ENTRY_KERNEXEC_KERNEL_CS (4)
11620+
11621 #define GDT_ENTRY_KERNEL_DS (GDT_ENTRY_KERNEL_BASE+1)
11622
11623 #define GDT_ENTRY_TSS (GDT_ENTRY_KERNEL_BASE+4)
11624@@ -104,6 +111,12 @@
11625 #define __KERNEL_STACK_CANARY 0
11626 #endif
11627
11628+#define GDT_ENTRY_PCIBIOS_CS (GDT_ENTRY_KERNEL_BASE+17)
11629+#define __PCIBIOS_CS (GDT_ENTRY_PCIBIOS_CS * 8)
11630+
11631+#define GDT_ENTRY_PCIBIOS_DS (GDT_ENTRY_KERNEL_BASE+18)
11632+#define __PCIBIOS_DS (GDT_ENTRY_PCIBIOS_DS * 8)
11633+
11634 #define GDT_ENTRY_DOUBLEFAULT_TSS 31
11635
11636 /*
11637@@ -141,7 +154,7 @@
11638 */
11639
11640 /* Matches PNP_CS32 and PNP_CS16 (they must be consecutive) */
11641-#define SEGMENT_IS_PNP_CODE(x) (((x) & 0xf4) == GDT_ENTRY_PNPBIOS_BASE * 8)
11642+#define SEGMENT_IS_PNP_CODE(x) (((x) & 0xFFFCU) == PNP_CS32 || ((x) & 0xFFFCU) == PNP_CS16)
11643
11644
11645 #else
11646@@ -165,6 +178,8 @@
11647 #define __USER32_CS (GDT_ENTRY_DEFAULT_USER32_CS*8+3)
11648 #define __USER32_DS __USER_DS
11649
11650+#define GDT_ENTRY_KERNEXEC_KERNEL_CS 7
11651+
11652 #define GDT_ENTRY_TSS 8 /* needs two entries */
11653 #define GDT_ENTRY_LDT 10 /* needs two entries */
11654 #define GDT_ENTRY_TLS_MIN 12
11655@@ -185,6 +200,7 @@
11656 #endif
11657
11658 #define __KERNEL_CS (GDT_ENTRY_KERNEL_CS*8)
11659+#define __KERNEXEC_KERNEL_CS (GDT_ENTRY_KERNEXEC_KERNEL_CS*8)
11660 #define __KERNEL_DS (GDT_ENTRY_KERNEL_DS*8)
11661 #define __USER_DS (GDT_ENTRY_DEFAULT_USER_DS*8+3)
11662 #define __USER_CS (GDT_ENTRY_DEFAULT_USER_CS*8+3)
11663diff --git a/arch/x86/include/asm/smp.h b/arch/x86/include/asm/smp.h
11664index 73b11bc..d4a3b63 100644
11665--- a/arch/x86/include/asm/smp.h
11666+++ b/arch/x86/include/asm/smp.h
11667@@ -36,7 +36,7 @@ DECLARE_PER_CPU(cpumask_var_t, cpu_core_map);
11668 /* cpus sharing the last level cache: */
11669 DECLARE_PER_CPU(cpumask_var_t, cpu_llc_shared_map);
11670 DECLARE_PER_CPU(u16, cpu_llc_id);
11671-DECLARE_PER_CPU(int, cpu_number);
11672+DECLARE_PER_CPU(unsigned int, cpu_number);
11673
11674 static inline struct cpumask *cpu_sibling_mask(int cpu)
11675 {
11676@@ -77,7 +77,7 @@ struct smp_ops {
11677
11678 void (*send_call_func_ipi)(const struct cpumask *mask);
11679 void (*send_call_func_single_ipi)(int cpu);
11680-};
11681+} __no_const;
11682
11683 /* Globals due to paravirt */
11684 extern void set_cpu_sibling_map(int cpu);
11685@@ -192,14 +192,8 @@ extern unsigned disabled_cpus __cpuinitdata;
11686 extern int safe_smp_processor_id(void);
11687
11688 #elif defined(CONFIG_X86_64_SMP)
11689-#define raw_smp_processor_id() (percpu_read(cpu_number))
11690-
11691-#define stack_smp_processor_id() \
11692-({ \
11693- struct thread_info *ti; \
11694- __asm__("andq %%rsp,%0; ":"=r" (ti) : "0" (CURRENT_MASK)); \
11695- ti->cpu; \
11696-})
11697+#define raw_smp_processor_id() (percpu_read(cpu_number))
11698+#define stack_smp_processor_id() raw_smp_processor_id()
11699 #define safe_smp_processor_id() smp_processor_id()
11700
11701 #endif
11702diff --git a/arch/x86/include/asm/spinlock.h b/arch/x86/include/asm/spinlock.h
11703index 972c260..43ab1fd 100644
11704--- a/arch/x86/include/asm/spinlock.h
11705+++ b/arch/x86/include/asm/spinlock.h
11706@@ -188,6 +188,14 @@ static inline int arch_write_can_lock(arch_rwlock_t *lock)
11707 static inline void arch_read_lock(arch_rwlock_t *rw)
11708 {
11709 asm volatile(LOCK_PREFIX READ_LOCK_SIZE(dec) " (%0)\n\t"
11710+
11711+#ifdef CONFIG_PAX_REFCOUNT
11712+ "jno 0f\n"
11713+ LOCK_PREFIX READ_LOCK_SIZE(inc) " (%0)\n"
11714+ "int $4\n0:\n"
11715+ _ASM_EXTABLE(0b, 0b)
11716+#endif
11717+
11718 "jns 1f\n"
11719 "call __read_lock_failed\n\t"
11720 "1:\n"
11721@@ -197,6 +205,14 @@ static inline void arch_read_lock(arch_rwlock_t *rw)
11722 static inline void arch_write_lock(arch_rwlock_t *rw)
11723 {
11724 asm volatile(LOCK_PREFIX WRITE_LOCK_SUB(%1) "(%0)\n\t"
11725+
11726+#ifdef CONFIG_PAX_REFCOUNT
11727+ "jno 0f\n"
11728+ LOCK_PREFIX WRITE_LOCK_ADD(%1) "(%0)\n"
11729+ "int $4\n0:\n"
11730+ _ASM_EXTABLE(0b, 0b)
11731+#endif
11732+
11733 "jz 1f\n"
11734 "call __write_lock_failed\n\t"
11735 "1:\n"
11736@@ -226,13 +242,29 @@ static inline int arch_write_trylock(arch_rwlock_t *lock)
11737
11738 static inline void arch_read_unlock(arch_rwlock_t *rw)
11739 {
11740- asm volatile(LOCK_PREFIX READ_LOCK_SIZE(inc) " %0"
11741+ asm volatile(LOCK_PREFIX READ_LOCK_SIZE(inc) " %0\n"
11742+
11743+#ifdef CONFIG_PAX_REFCOUNT
11744+ "jno 0f\n"
11745+ LOCK_PREFIX READ_LOCK_SIZE(dec) " %0\n"
11746+ "int $4\n0:\n"
11747+ _ASM_EXTABLE(0b, 0b)
11748+#endif
11749+
11750 :"+m" (rw->lock) : : "memory");
11751 }
11752
11753 static inline void arch_write_unlock(arch_rwlock_t *rw)
11754 {
11755- asm volatile(LOCK_PREFIX WRITE_LOCK_ADD(%1) "%0"
11756+ asm volatile(LOCK_PREFIX WRITE_LOCK_ADD(%1) "%0\n"
11757+
11758+#ifdef CONFIG_PAX_REFCOUNT
11759+ "jno 0f\n"
11760+ LOCK_PREFIX WRITE_LOCK_SUB(%1) "%0\n"
11761+ "int $4\n0:\n"
11762+ _ASM_EXTABLE(0b, 0b)
11763+#endif
11764+
11765 : "+m" (rw->write) : "i" (RW_LOCK_BIAS) : "memory");
11766 }
11767
11768diff --git a/arch/x86/include/asm/stackprotector.h b/arch/x86/include/asm/stackprotector.h
11769index 1575177..cb23f52 100644
11770--- a/arch/x86/include/asm/stackprotector.h
11771+++ b/arch/x86/include/asm/stackprotector.h
11772@@ -48,7 +48,7 @@
11773 * head_32 for boot CPU and setup_per_cpu_areas() for others.
11774 */
11775 #define GDT_STACK_CANARY_INIT \
11776- [GDT_ENTRY_STACK_CANARY] = GDT_ENTRY_INIT(0x4090, 0, 0x18),
11777+ [GDT_ENTRY_STACK_CANARY] = GDT_ENTRY_INIT(0x4090, 0, 0x17),
11778
11779 /*
11780 * Initialize the stackprotector canary value.
11781@@ -113,7 +113,7 @@ static inline void setup_stack_canary_segment(int cpu)
11782
11783 static inline void load_stack_canary_segment(void)
11784 {
11785-#ifdef CONFIG_X86_32
11786+#if defined(CONFIG_X86_32) && !defined(CONFIG_PAX_MEMORY_UDEREF)
11787 asm volatile ("mov %0, %%gs" : : "r" (0));
11788 #endif
11789 }
11790diff --git a/arch/x86/include/asm/stacktrace.h b/arch/x86/include/asm/stacktrace.h
11791index 70bbe39..4ae2bd4 100644
11792--- a/arch/x86/include/asm/stacktrace.h
11793+++ b/arch/x86/include/asm/stacktrace.h
11794@@ -11,28 +11,20 @@
11795
11796 extern int kstack_depth_to_print;
11797
11798-struct thread_info;
11799+struct task_struct;
11800 struct stacktrace_ops;
11801
11802-typedef unsigned long (*walk_stack_t)(struct thread_info *tinfo,
11803- unsigned long *stack,
11804- unsigned long bp,
11805- const struct stacktrace_ops *ops,
11806- void *data,
11807- unsigned long *end,
11808- int *graph);
11809+typedef unsigned long walk_stack_t(struct task_struct *task,
11810+ void *stack_start,
11811+ unsigned long *stack,
11812+ unsigned long bp,
11813+ const struct stacktrace_ops *ops,
11814+ void *data,
11815+ unsigned long *end,
11816+ int *graph);
11817
11818-extern unsigned long
11819-print_context_stack(struct thread_info *tinfo,
11820- unsigned long *stack, unsigned long bp,
11821- const struct stacktrace_ops *ops, void *data,
11822- unsigned long *end, int *graph);
11823-
11824-extern unsigned long
11825-print_context_stack_bp(struct thread_info *tinfo,
11826- unsigned long *stack, unsigned long bp,
11827- const struct stacktrace_ops *ops, void *data,
11828- unsigned long *end, int *graph);
11829+extern walk_stack_t print_context_stack;
11830+extern walk_stack_t print_context_stack_bp;
11831
11832 /* Generic stack tracer with callbacks */
11833
11834@@ -40,7 +32,7 @@ struct stacktrace_ops {
11835 void (*address)(void *data, unsigned long address, int reliable);
11836 /* On negative return stop dumping */
11837 int (*stack)(void *data, char *name);
11838- walk_stack_t walk_stack;
11839+ walk_stack_t *walk_stack;
11840 };
11841
11842 void dump_trace(struct task_struct *tsk, struct pt_regs *regs,
11843diff --git a/arch/x86/include/asm/sys_ia32.h b/arch/x86/include/asm/sys_ia32.h
11844index cb23852..2dde194 100644
11845--- a/arch/x86/include/asm/sys_ia32.h
11846+++ b/arch/x86/include/asm/sys_ia32.h
11847@@ -40,7 +40,7 @@ asmlinkage long sys32_rt_sigprocmask(int, compat_sigset_t __user *,
11848 compat_sigset_t __user *, unsigned int);
11849 asmlinkage long sys32_alarm(unsigned int);
11850
11851-asmlinkage long sys32_waitpid(compat_pid_t, unsigned int *, int);
11852+asmlinkage long sys32_waitpid(compat_pid_t, unsigned int __user *, int);
11853 asmlinkage long sys32_sysfs(int, u32, u32);
11854
11855 asmlinkage long sys32_sched_rr_get_interval(compat_pid_t,
11856diff --git a/arch/x86/include/asm/syscalls.h b/arch/x86/include/asm/syscalls.h
11857index f1d8b44..a4de8b7 100644
11858--- a/arch/x86/include/asm/syscalls.h
11859+++ b/arch/x86/include/asm/syscalls.h
11860@@ -30,7 +30,7 @@ long sys_clone(unsigned long, unsigned long, void __user *,
11861 void __user *, struct pt_regs *);
11862
11863 /* kernel/ldt.c */
11864-asmlinkage int sys_modify_ldt(int, void __user *, unsigned long);
11865+asmlinkage int sys_modify_ldt(int, void __user *, unsigned long) __size_overflow(3);
11866
11867 /* kernel/signal.c */
11868 long sys_rt_sigreturn(struct pt_regs *);
11869diff --git a/arch/x86/include/asm/system.h b/arch/x86/include/asm/system.h
11870index 2d2f01c..f985723 100644
11871--- a/arch/x86/include/asm/system.h
11872+++ b/arch/x86/include/asm/system.h
11873@@ -129,7 +129,7 @@ do { \
11874 "call __switch_to\n\t" \
11875 "movq "__percpu_arg([current_task])",%%rsi\n\t" \
11876 __switch_canary \
11877- "movq %P[thread_info](%%rsi),%%r8\n\t" \
11878+ "movq "__percpu_arg([thread_info])",%%r8\n\t" \
11879 "movq %%rax,%%rdi\n\t" \
11880 "testl %[_tif_fork],%P[ti_flags](%%r8)\n\t" \
11881 "jnz ret_from_fork\n\t" \
11882@@ -140,7 +140,7 @@ do { \
11883 [threadrsp] "i" (offsetof(struct task_struct, thread.sp)), \
11884 [ti_flags] "i" (offsetof(struct thread_info, flags)), \
11885 [_tif_fork] "i" (_TIF_FORK), \
11886- [thread_info] "i" (offsetof(struct task_struct, stack)), \
11887+ [thread_info] "m" (current_tinfo), \
11888 [current_task] "m" (current_task) \
11889 __switch_canary_iparam \
11890 : "memory", "cc" __EXTRA_CLOBBER)
11891@@ -200,7 +200,7 @@ static inline unsigned long get_limit(unsigned long segment)
11892 {
11893 unsigned long __limit;
11894 asm("lsll %1,%0" : "=r" (__limit) : "r" (segment));
11895- return __limit + 1;
11896+ return __limit;
11897 }
11898
11899 static inline void native_clts(void)
11900@@ -397,13 +397,13 @@ void enable_hlt(void);
11901
11902 void cpu_idle_wait(void);
11903
11904-extern unsigned long arch_align_stack(unsigned long sp);
11905+#define arch_align_stack(x) ((x) & ~0xfUL)
11906 extern void free_init_pages(char *what, unsigned long begin, unsigned long end);
11907
11908 void default_idle(void);
11909 bool set_pm_idle_to_default(void);
11910
11911-void stop_this_cpu(void *dummy);
11912+void stop_this_cpu(void *dummy) __noreturn;
11913
11914 /*
11915 * Force strict CPU ordering.
11916diff --git a/arch/x86/include/asm/thread_info.h b/arch/x86/include/asm/thread_info.h
11917index d7ef849..6af292e 100644
11918--- a/arch/x86/include/asm/thread_info.h
11919+++ b/arch/x86/include/asm/thread_info.h
11920@@ -10,6 +10,7 @@
11921 #include <linux/compiler.h>
11922 #include <asm/page.h>
11923 #include <asm/types.h>
11924+#include <asm/percpu.h>
11925
11926 /*
11927 * low level task data that entry.S needs immediate access to
11928@@ -24,7 +25,6 @@ struct exec_domain;
11929 #include <linux/atomic.h>
11930
11931 struct thread_info {
11932- struct task_struct *task; /* main task structure */
11933 struct exec_domain *exec_domain; /* execution domain */
11934 __u32 flags; /* low level flags */
11935 __u32 status; /* thread synchronous flags */
11936@@ -34,18 +34,12 @@ struct thread_info {
11937 mm_segment_t addr_limit;
11938 struct restart_block restart_block;
11939 void __user *sysenter_return;
11940-#ifdef CONFIG_X86_32
11941- unsigned long previous_esp; /* ESP of the previous stack in
11942- case of nested (IRQ) stacks
11943- */
11944- __u8 supervisor_stack[0];
11945-#endif
11946+ unsigned long lowest_stack;
11947 int uaccess_err;
11948 };
11949
11950-#define INIT_THREAD_INFO(tsk) \
11951+#define INIT_THREAD_INFO \
11952 { \
11953- .task = &tsk, \
11954 .exec_domain = &default_exec_domain, \
11955 .flags = 0, \
11956 .cpu = 0, \
11957@@ -56,7 +50,7 @@ struct thread_info {
11958 }, \
11959 }
11960
11961-#define init_thread_info (init_thread_union.thread_info)
11962+#define init_thread_info (init_thread_union.stack)
11963 #define init_stack (init_thread_union.stack)
11964
11965 #else /* !__ASSEMBLY__ */
11966@@ -170,45 +164,40 @@ struct thread_info {
11967 ret; \
11968 })
11969
11970-#ifdef CONFIG_X86_32
11971-
11972-#define STACK_WARN (THREAD_SIZE/8)
11973-/*
11974- * macros/functions for gaining access to the thread information structure
11975- *
11976- * preempt_count needs to be 1 initially, until the scheduler is functional.
11977- */
11978-#ifndef __ASSEMBLY__
11979-
11980-
11981-/* how to get the current stack pointer from C */
11982-register unsigned long current_stack_pointer asm("esp") __used;
11983-
11984-/* how to get the thread information struct from C */
11985-static inline struct thread_info *current_thread_info(void)
11986-{
11987- return (struct thread_info *)
11988- (current_stack_pointer & ~(THREAD_SIZE - 1));
11989-}
11990-
11991-#else /* !__ASSEMBLY__ */
11992-
11993+#ifdef __ASSEMBLY__
11994 /* how to get the thread information struct from ASM */
11995 #define GET_THREAD_INFO(reg) \
11996- movl $-THREAD_SIZE, reg; \
11997- andl %esp, reg
11998+ mov PER_CPU_VAR(current_tinfo), reg
11999
12000 /* use this one if reg already contains %esp */
12001-#define GET_THREAD_INFO_WITH_ESP(reg) \
12002- andl $-THREAD_SIZE, reg
12003+#define GET_THREAD_INFO_WITH_ESP(reg) GET_THREAD_INFO(reg)
12004+#else
12005+/* how to get the thread information struct from C */
12006+DECLARE_PER_CPU(struct thread_info *, current_tinfo);
12007+
12008+static __always_inline struct thread_info *current_thread_info(void)
12009+{
12010+ return percpu_read_stable(current_tinfo);
12011+}
12012+#endif
12013+
12014+#ifdef CONFIG_X86_32
12015+
12016+#define STACK_WARN (THREAD_SIZE/8)
12017+/*
12018+ * macros/functions for gaining access to the thread information structure
12019+ *
12020+ * preempt_count needs to be 1 initially, until the scheduler is functional.
12021+ */
12022+#ifndef __ASSEMBLY__
12023+
12024+/* how to get the current stack pointer from C */
12025+register unsigned long current_stack_pointer asm("esp") __used;
12026
12027 #endif
12028
12029 #else /* X86_32 */
12030
12031-#include <asm/percpu.h>
12032-#define KERNEL_STACK_OFFSET (5*8)
12033-
12034 /*
12035 * macros/functions for gaining access to the thread information structure
12036 * preempt_count needs to be 1 initially, until the scheduler is functional.
12037@@ -216,21 +205,8 @@ static inline struct thread_info *current_thread_info(void)
12038 #ifndef __ASSEMBLY__
12039 DECLARE_PER_CPU(unsigned long, kernel_stack);
12040
12041-static inline struct thread_info *current_thread_info(void)
12042-{
12043- struct thread_info *ti;
12044- ti = (void *)(percpu_read_stable(kernel_stack) +
12045- KERNEL_STACK_OFFSET - THREAD_SIZE);
12046- return ti;
12047-}
12048-
12049-#else /* !__ASSEMBLY__ */
12050-
12051-/* how to get the thread information struct from ASM */
12052-#define GET_THREAD_INFO(reg) \
12053- movq PER_CPU_VAR(kernel_stack),reg ; \
12054- subq $(THREAD_SIZE-KERNEL_STACK_OFFSET),reg
12055-
12056+/* how to get the current stack pointer from C */
12057+register unsigned long current_stack_pointer asm("rsp") __used;
12058 #endif
12059
12060 #endif /* !X86_32 */
12061@@ -264,5 +240,16 @@ extern void arch_task_cache_init(void);
12062 extern void free_thread_info(struct thread_info *ti);
12063 extern int arch_dup_task_struct(struct task_struct *dst, struct task_struct *src);
12064 #define arch_task_cache_init arch_task_cache_init
12065+
12066+#define __HAVE_THREAD_FUNCTIONS
12067+#define task_thread_info(task) (&(task)->tinfo)
12068+#define task_stack_page(task) ((task)->stack)
12069+#define setup_thread_stack(p, org) do {} while (0)
12070+#define end_of_stack(p) ((unsigned long *)task_stack_page(p) + 1)
12071+
12072+#define __HAVE_ARCH_TASK_STRUCT_ALLOCATOR
12073+extern struct task_struct *alloc_task_struct_node(int node);
12074+extern void free_task_struct(struct task_struct *);
12075+
12076 #endif
12077 #endif /* _ASM_X86_THREAD_INFO_H */
12078diff --git a/arch/x86/include/asm/uaccess.h b/arch/x86/include/asm/uaccess.h
12079index 36361bf..324f262 100644
12080--- a/arch/x86/include/asm/uaccess.h
12081+++ b/arch/x86/include/asm/uaccess.h
12082@@ -7,12 +7,15 @@
12083 #include <linux/compiler.h>
12084 #include <linux/thread_info.h>
12085 #include <linux/string.h>
12086+#include <linux/sched.h>
12087 #include <asm/asm.h>
12088 #include <asm/page.h>
12089
12090 #define VERIFY_READ 0
12091 #define VERIFY_WRITE 1
12092
12093+extern void check_object_size(const void *ptr, unsigned long n, bool to);
12094+
12095 /*
12096 * The fs value determines whether argument validity checking should be
12097 * performed or not. If get_fs() == USER_DS, checking is performed, with
12098@@ -28,7 +31,12 @@
12099
12100 #define get_ds() (KERNEL_DS)
12101 #define get_fs() (current_thread_info()->addr_limit)
12102+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_MEMORY_UDEREF)
12103+void __set_fs(mm_segment_t x);
12104+void set_fs(mm_segment_t x);
12105+#else
12106 #define set_fs(x) (current_thread_info()->addr_limit = (x))
12107+#endif
12108
12109 #define segment_eq(a, b) ((a).seg == (b).seg)
12110
12111@@ -76,7 +84,33 @@
12112 * checks that the pointer is in the user space range - after calling
12113 * this function, memory access functions may still return -EFAULT.
12114 */
12115-#define access_ok(type, addr, size) (likely(__range_not_ok(addr, size) == 0))
12116+#define __access_ok(type, addr, size) (likely(__range_not_ok(addr, size) == 0))
12117+#define access_ok(type, addr, size) \
12118+({ \
12119+ long __size = size; \
12120+ unsigned long __addr = (unsigned long)addr; \
12121+ unsigned long __addr_ao = __addr & PAGE_MASK; \
12122+ unsigned long __end_ao = __addr + __size - 1; \
12123+ bool __ret_ao = __range_not_ok(__addr, __size) == 0; \
12124+ if (__ret_ao && unlikely((__end_ao ^ __addr_ao) & PAGE_MASK)) { \
12125+ while(__addr_ao <= __end_ao) { \
12126+ char __c_ao; \
12127+ __addr_ao += PAGE_SIZE; \
12128+ if (__size > PAGE_SIZE) \
12129+ cond_resched(); \
12130+ if (__get_user(__c_ao, (char __user *)__addr)) \
12131+ break; \
12132+ if (type != VERIFY_WRITE) { \
12133+ __addr = __addr_ao; \
12134+ continue; \
12135+ } \
12136+ if (__put_user(__c_ao, (char __user *)__addr)) \
12137+ break; \
12138+ __addr = __addr_ao; \
12139+ } \
12140+ } \
12141+ __ret_ao; \
12142+})
12143
12144 /*
12145 * The exception table consists of pairs of addresses: the first is the
12146@@ -182,12 +216,20 @@ extern int __get_user_bad(void);
12147 asm volatile("call __put_user_" #size : "=a" (__ret_pu) \
12148 : "0" ((typeof(*(ptr)))(x)), "c" (ptr) : "ebx")
12149
12150-
12151+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_MEMORY_UDEREF)
12152+#define __copyuser_seg "gs;"
12153+#define __COPYUSER_SET_ES "pushl %%gs; popl %%es\n"
12154+#define __COPYUSER_RESTORE_ES "pushl %%ss; popl %%es\n"
12155+#else
12156+#define __copyuser_seg
12157+#define __COPYUSER_SET_ES
12158+#define __COPYUSER_RESTORE_ES
12159+#endif
12160
12161 #ifdef CONFIG_X86_32
12162 #define __put_user_asm_u64(x, addr, err, errret) \
12163- asm volatile("1: movl %%eax,0(%2)\n" \
12164- "2: movl %%edx,4(%2)\n" \
12165+ asm volatile("1: "__copyuser_seg"movl %%eax,0(%2)\n" \
12166+ "2: "__copyuser_seg"movl %%edx,4(%2)\n" \
12167 "3:\n" \
12168 ".section .fixup,\"ax\"\n" \
12169 "4: movl %3,%0\n" \
12170@@ -199,8 +241,8 @@ extern int __get_user_bad(void);
12171 : "A" (x), "r" (addr), "i" (errret), "0" (err))
12172
12173 #define __put_user_asm_ex_u64(x, addr) \
12174- asm volatile("1: movl %%eax,0(%1)\n" \
12175- "2: movl %%edx,4(%1)\n" \
12176+ asm volatile("1: "__copyuser_seg"movl %%eax,0(%1)\n" \
12177+ "2: "__copyuser_seg"movl %%edx,4(%1)\n" \
12178 "3:\n" \
12179 _ASM_EXTABLE(1b, 2b - 1b) \
12180 _ASM_EXTABLE(2b, 3b - 2b) \
12181@@ -252,7 +294,7 @@ extern void __put_user_8(void);
12182 __typeof__(*(ptr)) __pu_val; \
12183 __chk_user_ptr(ptr); \
12184 might_fault(); \
12185- __pu_val = x; \
12186+ __pu_val = (x); \
12187 switch (sizeof(*(ptr))) { \
12188 case 1: \
12189 __put_user_x(1, __pu_val, ptr, __ret_pu); \
12190@@ -373,7 +415,7 @@ do { \
12191 } while (0)
12192
12193 #define __get_user_asm(x, addr, err, itype, rtype, ltype, errret) \
12194- asm volatile("1: mov"itype" %2,%"rtype"1\n" \
12195+ asm volatile("1: "__copyuser_seg"mov"itype" %2,%"rtype"1\n"\
12196 "2:\n" \
12197 ".section .fixup,\"ax\"\n" \
12198 "3: mov %3,%0\n" \
12199@@ -381,7 +423,7 @@ do { \
12200 " jmp 2b\n" \
12201 ".previous\n" \
12202 _ASM_EXTABLE(1b, 3b) \
12203- : "=r" (err), ltype(x) \
12204+ : "=r" (err), ltype (x) \
12205 : "m" (__m(addr)), "i" (errret), "0" (err))
12206
12207 #define __get_user_size_ex(x, ptr, size) \
12208@@ -406,7 +448,7 @@ do { \
12209 } while (0)
12210
12211 #define __get_user_asm_ex(x, addr, itype, rtype, ltype) \
12212- asm volatile("1: mov"itype" %1,%"rtype"0\n" \
12213+ asm volatile("1: "__copyuser_seg"mov"itype" %1,%"rtype"0\n"\
12214 "2:\n" \
12215 _ASM_EXTABLE(1b, 2b - 1b) \
12216 : ltype(x) : "m" (__m(addr)))
12217@@ -423,13 +465,24 @@ do { \
12218 int __gu_err; \
12219 unsigned long __gu_val; \
12220 __get_user_size(__gu_val, (ptr), (size), __gu_err, -EFAULT); \
12221- (x) = (__force __typeof__(*(ptr)))__gu_val; \
12222+ (x) = (__typeof__(*(ptr)))__gu_val; \
12223 __gu_err; \
12224 })
12225
12226 /* FIXME: this hack is definitely wrong -AK */
12227 struct __large_struct { unsigned long buf[100]; };
12228-#define __m(x) (*(struct __large_struct __user *)(x))
12229+#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
12230+#define ____m(x) \
12231+({ \
12232+ unsigned long ____x = (unsigned long)(x); \
12233+ if (____x < PAX_USER_SHADOW_BASE) \
12234+ ____x += PAX_USER_SHADOW_BASE; \
12235+ (void __user *)____x; \
12236+})
12237+#else
12238+#define ____m(x) (x)
12239+#endif
12240+#define __m(x) (*(struct __large_struct __user *)____m(x))
12241
12242 /*
12243 * Tell gcc we read from memory instead of writing: this is because
12244@@ -437,7 +490,7 @@ struct __large_struct { unsigned long buf[100]; };
12245 * aliasing issues.
12246 */
12247 #define __put_user_asm(x, addr, err, itype, rtype, ltype, errret) \
12248- asm volatile("1: mov"itype" %"rtype"1,%2\n" \
12249+ asm volatile("1: "__copyuser_seg"mov"itype" %"rtype"1,%2\n"\
12250 "2:\n" \
12251 ".section .fixup,\"ax\"\n" \
12252 "3: mov %3,%0\n" \
12253@@ -445,10 +498,10 @@ struct __large_struct { unsigned long buf[100]; };
12254 ".previous\n" \
12255 _ASM_EXTABLE(1b, 3b) \
12256 : "=r"(err) \
12257- : ltype(x), "m" (__m(addr)), "i" (errret), "0" (err))
12258+ : ltype (x), "m" (__m(addr)), "i" (errret), "0" (err))
12259
12260 #define __put_user_asm_ex(x, addr, itype, rtype, ltype) \
12261- asm volatile("1: mov"itype" %"rtype"0,%1\n" \
12262+ asm volatile("1: "__copyuser_seg"mov"itype" %"rtype"0,%1\n"\
12263 "2:\n" \
12264 _ASM_EXTABLE(1b, 2b - 1b) \
12265 : : ltype(x), "m" (__m(addr)))
12266@@ -487,8 +540,12 @@ struct __large_struct { unsigned long buf[100]; };
12267 * On error, the variable @x is set to zero.
12268 */
12269
12270+#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
12271+#define __get_user(x, ptr) get_user((x), (ptr))
12272+#else
12273 #define __get_user(x, ptr) \
12274 __get_user_nocheck((x), (ptr), sizeof(*(ptr)))
12275+#endif
12276
12277 /**
12278 * __put_user: - Write a simple value into user space, with less checking.
12279@@ -510,8 +567,12 @@ struct __large_struct { unsigned long buf[100]; };
12280 * Returns zero on success, or -EFAULT on error.
12281 */
12282
12283+#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
12284+#define __put_user(x, ptr) put_user((x), (ptr))
12285+#else
12286 #define __put_user(x, ptr) \
12287 __put_user_nocheck((__typeof__(*(ptr)))(x), (ptr), sizeof(*(ptr)))
12288+#endif
12289
12290 #define __get_user_unaligned __get_user
12291 #define __put_user_unaligned __put_user
12292@@ -529,7 +590,7 @@ struct __large_struct { unsigned long buf[100]; };
12293 #define get_user_ex(x, ptr) do { \
12294 unsigned long __gue_val; \
12295 __get_user_size_ex((__gue_val), (ptr), (sizeof(*(ptr)))); \
12296- (x) = (__force __typeof__(*(ptr)))__gue_val; \
12297+ (x) = (__typeof__(*(ptr)))__gue_val; \
12298 } while (0)
12299
12300 #ifdef CONFIG_X86_WP_WORKS_OK
12301diff --git a/arch/x86/include/asm/uaccess_32.h b/arch/x86/include/asm/uaccess_32.h
12302index 566e803..7183d0b 100644
12303--- a/arch/x86/include/asm/uaccess_32.h
12304+++ b/arch/x86/include/asm/uaccess_32.h
12305@@ -11,15 +11,15 @@
12306 #include <asm/page.h>
12307
12308 unsigned long __must_check __copy_to_user_ll
12309- (void __user *to, const void *from, unsigned long n);
12310+ (void __user *to, const void *from, unsigned long n) __size_overflow(3);
12311 unsigned long __must_check __copy_from_user_ll
12312- (void *to, const void __user *from, unsigned long n);
12313+ (void *to, const void __user *from, unsigned long n) __size_overflow(3);
12314 unsigned long __must_check __copy_from_user_ll_nozero
12315- (void *to, const void __user *from, unsigned long n);
12316+ (void *to, const void __user *from, unsigned long n) __size_overflow(3);
12317 unsigned long __must_check __copy_from_user_ll_nocache
12318- (void *to, const void __user *from, unsigned long n);
12319+ (void *to, const void __user *from, unsigned long n) __size_overflow(3);
12320 unsigned long __must_check __copy_from_user_ll_nocache_nozero
12321- (void *to, const void __user *from, unsigned long n);
12322+ (void *to, const void __user *from, unsigned long n) __size_overflow(3);
12323
12324 /**
12325 * __copy_to_user_inatomic: - Copy a block of data into user space, with less checking.
12326@@ -41,8 +41,13 @@ unsigned long __must_check __copy_from_user_ll_nocache_nozero
12327 */
12328
12329 static __always_inline unsigned long __must_check
12330+__copy_to_user_inatomic(void __user *to, const void *from, unsigned long n) __size_overflow(3);
12331+static __always_inline unsigned long __must_check
12332 __copy_to_user_inatomic(void __user *to, const void *from, unsigned long n)
12333 {
12334+ if ((long)n < 0)
12335+ return n;
12336+
12337 if (__builtin_constant_p(n)) {
12338 unsigned long ret;
12339
12340@@ -61,6 +66,8 @@ __copy_to_user_inatomic(void __user *to, const void *from, unsigned long n)
12341 return ret;
12342 }
12343 }
12344+ if (!__builtin_constant_p(n))
12345+ check_object_size(from, n, true);
12346 return __copy_to_user_ll(to, from, n);
12347 }
12348
12349@@ -79,15 +86,23 @@ __copy_to_user_inatomic(void __user *to, const void *from, unsigned long n)
12350 * On success, this will be zero.
12351 */
12352 static __always_inline unsigned long __must_check
12353+__copy_to_user(void __user *to, const void *from, unsigned long n) __size_overflow(3);
12354+static __always_inline unsigned long __must_check
12355 __copy_to_user(void __user *to, const void *from, unsigned long n)
12356 {
12357 might_fault();
12358+
12359 return __copy_to_user_inatomic(to, from, n);
12360 }
12361
12362 static __always_inline unsigned long
12363+__copy_from_user_inatomic(void *to, const void __user *from, unsigned long n) __size_overflow(3);
12364+static __always_inline unsigned long
12365 __copy_from_user_inatomic(void *to, const void __user *from, unsigned long n)
12366 {
12367+ if ((long)n < 0)
12368+ return n;
12369+
12370 /* Avoid zeroing the tail if the copy fails..
12371 * If 'n' is constant and 1, 2, or 4, we do still zero on a failure,
12372 * but as the zeroing behaviour is only significant when n is not
12373@@ -134,9 +149,15 @@ __copy_from_user_inatomic(void *to, const void __user *from, unsigned long n)
12374 * for explanation of why this is needed.
12375 */
12376 static __always_inline unsigned long
12377+__copy_from_user(void *to, const void __user *from, unsigned long n) __size_overflow(3);
12378+static __always_inline unsigned long
12379 __copy_from_user(void *to, const void __user *from, unsigned long n)
12380 {
12381 might_fault();
12382+
12383+ if ((long)n < 0)
12384+ return n;
12385+
12386 if (__builtin_constant_p(n)) {
12387 unsigned long ret;
12388
12389@@ -152,13 +173,21 @@ __copy_from_user(void *to, const void __user *from, unsigned long n)
12390 return ret;
12391 }
12392 }
12393+ if (!__builtin_constant_p(n))
12394+ check_object_size(to, n, false);
12395 return __copy_from_user_ll(to, from, n);
12396 }
12397
12398 static __always_inline unsigned long __copy_from_user_nocache(void *to,
12399+ const void __user *from, unsigned long n) __size_overflow(3);
12400+static __always_inline unsigned long __copy_from_user_nocache(void *to,
12401 const void __user *from, unsigned long n)
12402 {
12403 might_fault();
12404+
12405+ if ((long)n < 0)
12406+ return n;
12407+
12408 if (__builtin_constant_p(n)) {
12409 unsigned long ret;
12410
12411@@ -179,17 +208,24 @@ static __always_inline unsigned long __copy_from_user_nocache(void *to,
12412
12413 static __always_inline unsigned long
12414 __copy_from_user_inatomic_nocache(void *to, const void __user *from,
12415+ unsigned long n) __size_overflow(3);
12416+static __always_inline unsigned long
12417+__copy_from_user_inatomic_nocache(void *to, const void __user *from,
12418 unsigned long n)
12419 {
12420- return __copy_from_user_ll_nocache_nozero(to, from, n);
12421+ if ((long)n < 0)
12422+ return n;
12423+
12424+ return __copy_from_user_ll_nocache_nozero(to, from, n);
12425 }
12426
12427-unsigned long __must_check copy_to_user(void __user *to,
12428- const void *from, unsigned long n);
12429-unsigned long __must_check _copy_from_user(void *to,
12430- const void __user *from,
12431- unsigned long n);
12432-
12433+extern void copy_to_user_overflow(void)
12434+#ifdef CONFIG_DEBUG_STRICT_USER_COPY_CHECKS
12435+ __compiletime_error("copy_to_user() buffer size is not provably correct")
12436+#else
12437+ __compiletime_warning("copy_to_user() buffer size is not provably correct")
12438+#endif
12439+;
12440
12441 extern void copy_from_user_overflow(void)
12442 #ifdef CONFIG_DEBUG_STRICT_USER_COPY_CHECKS
12443@@ -199,17 +235,65 @@ extern void copy_from_user_overflow(void)
12444 #endif
12445 ;
12446
12447-static inline unsigned long __must_check copy_from_user(void *to,
12448- const void __user *from,
12449- unsigned long n)
12450+/**
12451+ * copy_to_user: - Copy a block of data into user space.
12452+ * @to: Destination address, in user space.
12453+ * @from: Source address, in kernel space.
12454+ * @n: Number of bytes to copy.
12455+ *
12456+ * Context: User context only. This function may sleep.
12457+ *
12458+ * Copy data from kernel space to user space.
12459+ *
12460+ * Returns number of bytes that could not be copied.
12461+ * On success, this will be zero.
12462+ */
12463+static inline unsigned long __must_check
12464+copy_to_user(void __user *to, const void *from, unsigned long n) __size_overflow(3);
12465+static inline unsigned long __must_check
12466+copy_to_user(void __user *to, const void *from, unsigned long n)
12467+{
12468+ int sz = __compiletime_object_size(from);
12469+
12470+ if (unlikely(sz != -1 && sz < n))
12471+ copy_to_user_overflow();
12472+ else if (access_ok(VERIFY_WRITE, to, n))
12473+ n = __copy_to_user(to, from, n);
12474+ return n;
12475+}
12476+
12477+/**
12478+ * copy_from_user: - Copy a block of data from user space.
12479+ * @to: Destination address, in kernel space.
12480+ * @from: Source address, in user space.
12481+ * @n: Number of bytes to copy.
12482+ *
12483+ * Context: User context only. This function may sleep.
12484+ *
12485+ * Copy data from user space to kernel space.
12486+ *
12487+ * Returns number of bytes that could not be copied.
12488+ * On success, this will be zero.
12489+ *
12490+ * If some data could not be copied, this function will pad the copied
12491+ * data to the requested size using zero bytes.
12492+ */
12493+static inline unsigned long __must_check
12494+copy_from_user(void *to, const void __user *from, unsigned long n) __size_overflow(3);
12495+static inline unsigned long __must_check
12496+copy_from_user(void *to, const void __user *from, unsigned long n)
12497 {
12498 int sz = __compiletime_object_size(to);
12499
12500- if (likely(sz == -1 || sz >= n))
12501- n = _copy_from_user(to, from, n);
12502- else
12503+ if (unlikely(sz != -1 && sz < n))
12504 copy_from_user_overflow();
12505-
12506+ else 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@@ -235,7 +319,7 @@ long __must_check __strncpy_from_user(char *dst,
12517 #define strlen_user(str) strnlen_user(str, LONG_MAX)
12518
12519 long strnlen_user(const char __user *str, long n);
12520-unsigned long __must_check clear_user(void __user *mem, unsigned long len);
12521-unsigned long __must_check __clear_user(void __user *mem, unsigned long len);
12522+unsigned long __must_check clear_user(void __user *mem, unsigned long len) __size_overflow(2);
12523+unsigned long __must_check __clear_user(void __user *mem, unsigned long len) __size_overflow(2);
12524
12525 #endif /* _ASM_X86_UACCESS_32_H */
12526diff --git a/arch/x86/include/asm/uaccess_64.h b/arch/x86/include/asm/uaccess_64.h
12527index 1c66d30..e294b5f 100644
12528--- a/arch/x86/include/asm/uaccess_64.h
12529+++ b/arch/x86/include/asm/uaccess_64.h
12530@@ -10,6 +10,9 @@
12531 #include <asm/alternative.h>
12532 #include <asm/cpufeature.h>
12533 #include <asm/page.h>
12534+#include <asm/pgtable.h>
12535+
12536+#define set_fs(x) (current_thread_info()->addr_limit = (x))
12537
12538 /*
12539 * Copy To/From Userspace
12540@@ -17,12 +20,14 @@
12541
12542 /* Handles exceptions in both to and from, but doesn't do access_ok */
12543 __must_check unsigned long
12544-copy_user_generic_string(void *to, const void *from, unsigned len);
12545+copy_user_generic_string(void *to, const void *from, unsigned long len) __size_overflow(3);
12546 __must_check unsigned long
12547-copy_user_generic_unrolled(void *to, const void *from, unsigned len);
12548+copy_user_generic_unrolled(void *to, const void *from, unsigned long len) __size_overflow(3);
12549
12550 static __always_inline __must_check unsigned long
12551-copy_user_generic(void *to, const void *from, unsigned len)
12552+copy_user_generic(void *to, const void *from, unsigned long len) __size_overflow(3);
12553+static __always_inline __must_check unsigned long
12554+copy_user_generic(void *to, const void *from, unsigned long len)
12555 {
12556 unsigned ret;
12557
12558@@ -32,142 +37,237 @@ copy_user_generic(void *to, const void *from, unsigned len)
12559 ASM_OUTPUT2("=a" (ret), "=D" (to), "=S" (from),
12560 "=d" (len)),
12561 "1" (to), "2" (from), "3" (len)
12562- : "memory", "rcx", "r8", "r9", "r10", "r11");
12563+ : "memory", "rcx", "r8", "r9", "r11");
12564 return ret;
12565 }
12566
12567+static __always_inline __must_check unsigned long
12568+__copy_to_user(void __user *to, const void *from, unsigned long len) __size_overflow(3);
12569+static __always_inline __must_check unsigned long
12570+__copy_from_user(void *to, const void __user *from, unsigned long len) __size_overflow(3);
12571 __must_check unsigned long
12572-_copy_to_user(void __user *to, const void *from, unsigned len);
12573-__must_check unsigned long
12574-_copy_from_user(void *to, const void __user *from, unsigned len);
12575-__must_check unsigned long
12576-copy_in_user(void __user *to, const void __user *from, unsigned len);
12577+copy_in_user(void __user *to, const void __user *from, unsigned long len) __size_overflow(3);
12578
12579 static inline unsigned long __must_check copy_from_user(void *to,
12580 const void __user *from,
12581+ unsigned long n) __size_overflow(3);
12582+static inline unsigned long __must_check copy_from_user(void *to,
12583+ const void __user *from,
12584 unsigned long n)
12585 {
12586- int sz = __compiletime_object_size(to);
12587-
12588 might_fault();
12589- if (likely(sz == -1 || sz >= n))
12590- n = _copy_from_user(to, from, n);
12591-#ifdef CONFIG_DEBUG_VM
12592- else
12593- WARN(1, "Buffer overflow detected!\n");
12594-#endif
12595+
12596+ if (access_ok(VERIFY_READ, from, n))
12597+ n = __copy_from_user(to, from, n);
12598+ else if (n < INT_MAX) {
12599+ if (!__builtin_constant_p(n))
12600+ check_object_size(to, n, false);
12601+ memset(to, 0, n);
12602+ }
12603 return n;
12604 }
12605
12606 static __always_inline __must_check
12607-int copy_to_user(void __user *dst, const void *src, unsigned size)
12608+int copy_to_user(void __user *dst, const void *src, unsigned long size) __size_overflow(3);
12609+static __always_inline __must_check
12610+int copy_to_user(void __user *dst, const void *src, unsigned long size)
12611 {
12612 might_fault();
12613
12614- return _copy_to_user(dst, src, size);
12615+ if (access_ok(VERIFY_WRITE, dst, size))
12616+ size = __copy_to_user(dst, src, size);
12617+ return size;
12618 }
12619
12620 static __always_inline __must_check
12621-int __copy_from_user(void *dst, const void __user *src, unsigned size)
12622+unsigned long __copy_from_user(void *dst, const void __user *src, unsigned long size) __size_overflow(3);
12623+static __always_inline __must_check
12624+unsigned long __copy_from_user(void *dst, const void __user *src, unsigned long size)
12625 {
12626- int ret = 0;
12627+ int sz = __compiletime_object_size(dst);
12628+ unsigned ret = 0;
12629
12630 might_fault();
12631- if (!__builtin_constant_p(size))
12632- return copy_user_generic(dst, (__force void *)src, size);
12633+
12634+ if (size > INT_MAX)
12635+ return size;
12636+
12637+#ifdef CONFIG_PAX_MEMORY_UDEREF
12638+ if (!__access_ok(VERIFY_READ, src, size))
12639+ return size;
12640+#endif
12641+
12642+ if (unlikely(sz != -1 && sz < size)) {
12643+#ifdef CONFIG_DEBUG_VM
12644+ WARN(1, "Buffer overflow detected!\n");
12645+#endif
12646+ return size;
12647+ }
12648+
12649+ if (!__builtin_constant_p(size)) {
12650+ check_object_size(dst, size, false);
12651+
12652+#ifdef CONFIG_PAX_MEMORY_UDEREF
12653+ if ((unsigned long)src < PAX_USER_SHADOW_BASE)
12654+ src += PAX_USER_SHADOW_BASE;
12655+#endif
12656+
12657+ return copy_user_generic(dst, (__force_kernel const void *)src, size);
12658+ }
12659 switch (size) {
12660- case 1:__get_user_asm(*(u8 *)dst, (u8 __user *)src,
12661+ case 1:__get_user_asm(*(u8 *)dst, (const u8 __user *)src,
12662 ret, "b", "b", "=q", 1);
12663 return ret;
12664- case 2:__get_user_asm(*(u16 *)dst, (u16 __user *)src,
12665+ case 2:__get_user_asm(*(u16 *)dst, (const u16 __user *)src,
12666 ret, "w", "w", "=r", 2);
12667 return ret;
12668- case 4:__get_user_asm(*(u32 *)dst, (u32 __user *)src,
12669+ case 4:__get_user_asm(*(u32 *)dst, (const u32 __user *)src,
12670 ret, "l", "k", "=r", 4);
12671 return ret;
12672- case 8:__get_user_asm(*(u64 *)dst, (u64 __user *)src,
12673+ case 8:__get_user_asm(*(u64 *)dst, (const u64 __user *)src,
12674 ret, "q", "", "=r", 8);
12675 return ret;
12676 case 10:
12677- __get_user_asm(*(u64 *)dst, (u64 __user *)src,
12678+ __get_user_asm(*(u64 *)dst, (const u64 __user *)src,
12679 ret, "q", "", "=r", 10);
12680 if (unlikely(ret))
12681 return ret;
12682 __get_user_asm(*(u16 *)(8 + (char *)dst),
12683- (u16 __user *)(8 + (char __user *)src),
12684+ (const u16 __user *)(8 + (const char __user *)src),
12685 ret, "w", "w", "=r", 2);
12686 return ret;
12687 case 16:
12688- __get_user_asm(*(u64 *)dst, (u64 __user *)src,
12689+ __get_user_asm(*(u64 *)dst, (const u64 __user *)src,
12690 ret, "q", "", "=r", 16);
12691 if (unlikely(ret))
12692 return ret;
12693 __get_user_asm(*(u64 *)(8 + (char *)dst),
12694- (u64 __user *)(8 + (char __user *)src),
12695+ (const u64 __user *)(8 + (const char __user *)src),
12696 ret, "q", "", "=r", 8);
12697 return ret;
12698 default:
12699- return copy_user_generic(dst, (__force void *)src, size);
12700+
12701+#ifdef CONFIG_PAX_MEMORY_UDEREF
12702+ if ((unsigned long)src < PAX_USER_SHADOW_BASE)
12703+ src += PAX_USER_SHADOW_BASE;
12704+#endif
12705+
12706+ return copy_user_generic(dst, (__force_kernel const void *)src, size);
12707 }
12708 }
12709
12710 static __always_inline __must_check
12711-int __copy_to_user(void __user *dst, const void *src, unsigned size)
12712+unsigned long __copy_to_user(void __user *dst, const void *src, unsigned long size) __size_overflow(3);
12713+static __always_inline __must_check
12714+unsigned long __copy_to_user(void __user *dst, const void *src, unsigned long size)
12715 {
12716- int ret = 0;
12717+ int sz = __compiletime_object_size(src);
12718+ unsigned ret = 0;
12719
12720 might_fault();
12721- if (!__builtin_constant_p(size))
12722- return copy_user_generic((__force void *)dst, src, size);
12723+
12724+ if (size > INT_MAX)
12725+ return size;
12726+
12727+#ifdef CONFIG_PAX_MEMORY_UDEREF
12728+ if (!__access_ok(VERIFY_WRITE, dst, size))
12729+ return size;
12730+#endif
12731+
12732+ if (unlikely(sz != -1 && sz < size)) {
12733+#ifdef CONFIG_DEBUG_VM
12734+ WARN(1, "Buffer overflow detected!\n");
12735+#endif
12736+ return size;
12737+ }
12738+
12739+ if (!__builtin_constant_p(size)) {
12740+ check_object_size(src, size, true);
12741+
12742+#ifdef CONFIG_PAX_MEMORY_UDEREF
12743+ if ((unsigned long)dst < PAX_USER_SHADOW_BASE)
12744+ dst += PAX_USER_SHADOW_BASE;
12745+#endif
12746+
12747+ return copy_user_generic((__force_kernel void *)dst, src, size);
12748+ }
12749 switch (size) {
12750- case 1:__put_user_asm(*(u8 *)src, (u8 __user *)dst,
12751+ case 1:__put_user_asm(*(const u8 *)src, (u8 __user *)dst,
12752 ret, "b", "b", "iq", 1);
12753 return ret;
12754- case 2:__put_user_asm(*(u16 *)src, (u16 __user *)dst,
12755+ case 2:__put_user_asm(*(const u16 *)src, (u16 __user *)dst,
12756 ret, "w", "w", "ir", 2);
12757 return ret;
12758- case 4:__put_user_asm(*(u32 *)src, (u32 __user *)dst,
12759+ case 4:__put_user_asm(*(const u32 *)src, (u32 __user *)dst,
12760 ret, "l", "k", "ir", 4);
12761 return ret;
12762- case 8:__put_user_asm(*(u64 *)src, (u64 __user *)dst,
12763+ case 8:__put_user_asm(*(const u64 *)src, (u64 __user *)dst,
12764 ret, "q", "", "er", 8);
12765 return ret;
12766 case 10:
12767- __put_user_asm(*(u64 *)src, (u64 __user *)dst,
12768+ __put_user_asm(*(const u64 *)src, (u64 __user *)dst,
12769 ret, "q", "", "er", 10);
12770 if (unlikely(ret))
12771 return ret;
12772 asm("":::"memory");
12773- __put_user_asm(4[(u16 *)src], 4 + (u16 __user *)dst,
12774+ __put_user_asm(4[(const u16 *)src], 4 + (u16 __user *)dst,
12775 ret, "w", "w", "ir", 2);
12776 return ret;
12777 case 16:
12778- __put_user_asm(*(u64 *)src, (u64 __user *)dst,
12779+ __put_user_asm(*(const u64 *)src, (u64 __user *)dst,
12780 ret, "q", "", "er", 16);
12781 if (unlikely(ret))
12782 return ret;
12783 asm("":::"memory");
12784- __put_user_asm(1[(u64 *)src], 1 + (u64 __user *)dst,
12785+ __put_user_asm(1[(const u64 *)src], 1 + (u64 __user *)dst,
12786 ret, "q", "", "er", 8);
12787 return ret;
12788 default:
12789- return copy_user_generic((__force void *)dst, src, size);
12790+
12791+#ifdef CONFIG_PAX_MEMORY_UDEREF
12792+ if ((unsigned long)dst < PAX_USER_SHADOW_BASE)
12793+ dst += PAX_USER_SHADOW_BASE;
12794+#endif
12795+
12796+ return copy_user_generic((__force_kernel void *)dst, src, size);
12797 }
12798 }
12799
12800 static __always_inline __must_check
12801-int __copy_in_user(void __user *dst, const void __user *src, unsigned size)
12802+unsigned long __copy_in_user(void __user *dst, const void __user *src, unsigned long size) __size_overflow(3);
12803+static __always_inline __must_check
12804+unsigned long __copy_in_user(void __user *dst, const void __user *src, unsigned long size)
12805 {
12806- int ret = 0;
12807+ unsigned ret = 0;
12808
12809 might_fault();
12810- if (!__builtin_constant_p(size))
12811- return copy_user_generic((__force void *)dst,
12812- (__force void *)src, size);
12813+
12814+ if (size > INT_MAX)
12815+ return size;
12816+
12817+#ifdef CONFIG_PAX_MEMORY_UDEREF
12818+ if (!__access_ok(VERIFY_READ, src, size))
12819+ return size;
12820+ if (!__access_ok(VERIFY_WRITE, dst, size))
12821+ return size;
12822+#endif
12823+
12824+ if (!__builtin_constant_p(size)) {
12825+
12826+#ifdef CONFIG_PAX_MEMORY_UDEREF
12827+ if ((unsigned long)src < PAX_USER_SHADOW_BASE)
12828+ src += PAX_USER_SHADOW_BASE;
12829+ if ((unsigned long)dst < PAX_USER_SHADOW_BASE)
12830+ dst += PAX_USER_SHADOW_BASE;
12831+#endif
12832+
12833+ return copy_user_generic((__force_kernel void *)dst,
12834+ (__force_kernel const void *)src, size);
12835+ }
12836 switch (size) {
12837 case 1: {
12838 u8 tmp;
12839- __get_user_asm(tmp, (u8 __user *)src,
12840+ __get_user_asm(tmp, (const u8 __user *)src,
12841 ret, "b", "b", "=q", 1);
12842 if (likely(!ret))
12843 __put_user_asm(tmp, (u8 __user *)dst,
12844@@ -176,7 +276,7 @@ int __copy_in_user(void __user *dst, const void __user *src, unsigned size)
12845 }
12846 case 2: {
12847 u16 tmp;
12848- __get_user_asm(tmp, (u16 __user *)src,
12849+ __get_user_asm(tmp, (const u16 __user *)src,
12850 ret, "w", "w", "=r", 2);
12851 if (likely(!ret))
12852 __put_user_asm(tmp, (u16 __user *)dst,
12853@@ -186,7 +286,7 @@ int __copy_in_user(void __user *dst, const void __user *src, unsigned size)
12854
12855 case 4: {
12856 u32 tmp;
12857- __get_user_asm(tmp, (u32 __user *)src,
12858+ __get_user_asm(tmp, (const u32 __user *)src,
12859 ret, "l", "k", "=r", 4);
12860 if (likely(!ret))
12861 __put_user_asm(tmp, (u32 __user *)dst,
12862@@ -195,7 +295,7 @@ int __copy_in_user(void __user *dst, const void __user *src, unsigned size)
12863 }
12864 case 8: {
12865 u64 tmp;
12866- __get_user_asm(tmp, (u64 __user *)src,
12867+ __get_user_asm(tmp, (const u64 __user *)src,
12868 ret, "q", "", "=r", 8);
12869 if (likely(!ret))
12870 __put_user_asm(tmp, (u64 __user *)dst,
12871@@ -203,8 +303,16 @@ int __copy_in_user(void __user *dst, const void __user *src, unsigned size)
12872 return ret;
12873 }
12874 default:
12875- return copy_user_generic((__force void *)dst,
12876- (__force void *)src, size);
12877+
12878+#ifdef CONFIG_PAX_MEMORY_UDEREF
12879+ if ((unsigned long)src < PAX_USER_SHADOW_BASE)
12880+ src += PAX_USER_SHADOW_BASE;
12881+ if ((unsigned long)dst < PAX_USER_SHADOW_BASE)
12882+ dst += PAX_USER_SHADOW_BASE;
12883+#endif
12884+
12885+ return copy_user_generic((__force_kernel void *)dst,
12886+ (__force_kernel const void *)src, size);
12887 }
12888 }
12889
12890@@ -215,39 +323,83 @@ __strncpy_from_user(char *dst, const char __user *src, long count);
12891 __must_check long strnlen_user(const char __user *str, long n);
12892 __must_check long __strnlen_user(const char __user *str, long n);
12893 __must_check long strlen_user(const char __user *str);
12894-__must_check unsigned long clear_user(void __user *mem, unsigned long len);
12895-__must_check unsigned long __clear_user(void __user *mem, unsigned long len);
12896+__must_check unsigned long clear_user(void __user *mem, unsigned long len) __size_overflow(2);
12897+__must_check unsigned long __clear_user(void __user *mem, unsigned long len) __size_overflow(2);
12898
12899 static __must_check __always_inline int
12900-__copy_from_user_inatomic(void *dst, const void __user *src, unsigned size)
12901+__copy_from_user_inatomic(void *dst, const void __user *src, unsigned long size) __size_overflow(3);
12902+static __must_check __always_inline int
12903+__copy_from_user_inatomic(void *dst, const void __user *src, unsigned long size)
12904 {
12905- return copy_user_generic(dst, (__force const void *)src, size);
12906+ if (size > INT_MAX)
12907+ return size;
12908+
12909+#ifdef CONFIG_PAX_MEMORY_UDEREF
12910+ if (!__access_ok(VERIFY_READ, src, size))
12911+ return size;
12912+
12913+ if ((unsigned long)src < PAX_USER_SHADOW_BASE)
12914+ src += PAX_USER_SHADOW_BASE;
12915+#endif
12916+
12917+ return copy_user_generic(dst, (__force_kernel const void *)src, size);
12918 }
12919
12920-static __must_check __always_inline int
12921-__copy_to_user_inatomic(void __user *dst, const void *src, unsigned size)
12922+static __must_check __always_inline unsigned long
12923+__copy_to_user_inatomic(void __user *dst, const void *src, unsigned long size) __size_overflow(3);
12924+static __must_check __always_inline unsigned long
12925+__copy_to_user_inatomic(void __user *dst, const void *src, unsigned long size)
12926 {
12927- return copy_user_generic((__force void *)dst, src, size);
12928+ if (size > INT_MAX)
12929+ return size;
12930+
12931+#ifdef CONFIG_PAX_MEMORY_UDEREF
12932+ if (!__access_ok(VERIFY_WRITE, dst, size))
12933+ return size;
12934+
12935+ if ((unsigned long)dst < PAX_USER_SHADOW_BASE)
12936+ dst += PAX_USER_SHADOW_BASE;
12937+#endif
12938+
12939+ return copy_user_generic((__force_kernel void *)dst, src, size);
12940 }
12941
12942-extern long __copy_user_nocache(void *dst, const void __user *src,
12943- unsigned size, int zerorest);
12944+extern unsigned long __copy_user_nocache(void *dst, const void __user *src,
12945+ unsigned long size, int zerorest) __size_overflow(3);
12946
12947-static inline int
12948-__copy_from_user_nocache(void *dst, const void __user *src, unsigned size)
12949+static inline unsigned long __copy_from_user_nocache(void *dst, const void __user *src, unsigned long size) __size_overflow(3);
12950+static inline unsigned long __copy_from_user_nocache(void *dst, const void __user *src, unsigned long size)
12951 {
12952 might_sleep();
12953+
12954+ if (size > INT_MAX)
12955+ return size;
12956+
12957+#ifdef CONFIG_PAX_MEMORY_UDEREF
12958+ if (!__access_ok(VERIFY_READ, src, size))
12959+ return size;
12960+#endif
12961+
12962 return __copy_user_nocache(dst, src, size, 1);
12963 }
12964
12965-static inline int
12966-__copy_from_user_inatomic_nocache(void *dst, const void __user *src,
12967- unsigned size)
12968+static inline unsigned long __copy_from_user_inatomic_nocache(void *dst, const void __user *src,
12969+ unsigned long size) __size_overflow(3);
12970+static inline unsigned long __copy_from_user_inatomic_nocache(void *dst, const void __user *src,
12971+ unsigned long size)
12972 {
12973+ if (size > INT_MAX)
12974+ return size;
12975+
12976+#ifdef CONFIG_PAX_MEMORY_UDEREF
12977+ if (!__access_ok(VERIFY_READ, src, size))
12978+ return size;
12979+#endif
12980+
12981 return __copy_user_nocache(dst, src, size, 0);
12982 }
12983
12984-unsigned long
12985-copy_user_handle_tail(char *to, char *from, unsigned len, unsigned zerorest);
12986+extern unsigned long
12987+copy_user_handle_tail(char __user *to, char __user *from, unsigned long len, unsigned zerorest) __size_overflow(3);
12988
12989 #endif /* _ASM_X86_UACCESS_64_H */
12990diff --git a/arch/x86/include/asm/vdso.h b/arch/x86/include/asm/vdso.h
12991index bb05228..d763d5b 100644
12992--- a/arch/x86/include/asm/vdso.h
12993+++ b/arch/x86/include/asm/vdso.h
12994@@ -11,7 +11,7 @@ extern const char VDSO32_PRELINK[];
12995 #define VDSO32_SYMBOL(base, name) \
12996 ({ \
12997 extern const char VDSO32_##name[]; \
12998- (void *)(VDSO32_##name - VDSO32_PRELINK + (unsigned long)(base)); \
12999+ (void __user *)(VDSO32_##name - VDSO32_PRELINK + (unsigned long)(base)); \
13000 })
13001 #endif
13002
13003diff --git a/arch/x86/include/asm/x86_init.h b/arch/x86/include/asm/x86_init.h
13004index 1971e65..1e3559b 100644
13005--- a/arch/x86/include/asm/x86_init.h
13006+++ b/arch/x86/include/asm/x86_init.h
13007@@ -28,7 +28,7 @@ struct x86_init_mpparse {
13008 void (*mpc_oem_bus_info)(struct mpc_bus *m, char *name);
13009 void (*find_smp_config)(void);
13010 void (*get_smp_config)(unsigned int early);
13011-};
13012+} __no_const;
13013
13014 /**
13015 * struct x86_init_resources - platform specific resource related ops
13016@@ -42,7 +42,7 @@ struct x86_init_resources {
13017 void (*probe_roms)(void);
13018 void (*reserve_resources)(void);
13019 char *(*memory_setup)(void);
13020-};
13021+} __no_const;
13022
13023 /**
13024 * struct x86_init_irqs - platform specific interrupt setup
13025@@ -55,7 +55,7 @@ struct x86_init_irqs {
13026 void (*pre_vector_init)(void);
13027 void (*intr_init)(void);
13028 void (*trap_init)(void);
13029-};
13030+} __no_const;
13031
13032 /**
13033 * struct x86_init_oem - oem platform specific customizing functions
13034@@ -65,7 +65,7 @@ struct x86_init_irqs {
13035 struct x86_init_oem {
13036 void (*arch_setup)(void);
13037 void (*banner)(void);
13038-};
13039+} __no_const;
13040
13041 /**
13042 * struct x86_init_mapping - platform specific initial kernel pagetable setup
13043@@ -76,7 +76,7 @@ struct x86_init_oem {
13044 */
13045 struct x86_init_mapping {
13046 void (*pagetable_reserve)(u64 start, u64 end);
13047-};
13048+} __no_const;
13049
13050 /**
13051 * struct x86_init_paging - platform specific paging functions
13052@@ -86,7 +86,7 @@ struct x86_init_mapping {
13053 struct x86_init_paging {
13054 void (*pagetable_setup_start)(pgd_t *base);
13055 void (*pagetable_setup_done)(pgd_t *base);
13056-};
13057+} __no_const;
13058
13059 /**
13060 * struct x86_init_timers - platform specific timer setup
13061@@ -101,7 +101,7 @@ struct x86_init_timers {
13062 void (*tsc_pre_init)(void);
13063 void (*timer_init)(void);
13064 void (*wallclock_init)(void);
13065-};
13066+} __no_const;
13067
13068 /**
13069 * struct x86_init_iommu - platform specific iommu setup
13070@@ -109,7 +109,7 @@ struct x86_init_timers {
13071 */
13072 struct x86_init_iommu {
13073 int (*iommu_init)(void);
13074-};
13075+} __no_const;
13076
13077 /**
13078 * struct x86_init_pci - platform specific pci init functions
13079@@ -123,7 +123,7 @@ struct x86_init_pci {
13080 int (*init)(void);
13081 void (*init_irq)(void);
13082 void (*fixup_irqs)(void);
13083-};
13084+} __no_const;
13085
13086 /**
13087 * struct x86_init_ops - functions for platform specific setup
13088@@ -139,7 +139,7 @@ struct x86_init_ops {
13089 struct x86_init_timers timers;
13090 struct x86_init_iommu iommu;
13091 struct x86_init_pci pci;
13092-};
13093+} __no_const;
13094
13095 /**
13096 * struct x86_cpuinit_ops - platform specific cpu hotplug setups
13097@@ -147,7 +147,7 @@ struct x86_init_ops {
13098 */
13099 struct x86_cpuinit_ops {
13100 void (*setup_percpu_clockev)(void);
13101-};
13102+} __no_const;
13103
13104 /**
13105 * struct x86_platform_ops - platform specific runtime functions
13106@@ -169,7 +169,7 @@ struct x86_platform_ops {
13107 void (*nmi_init)(void);
13108 unsigned char (*get_nmi_reason)(void);
13109 int (*i8042_detect)(void);
13110-};
13111+} __no_const;
13112
13113 struct pci_dev;
13114
13115@@ -177,7 +177,7 @@ struct x86_msi_ops {
13116 int (*setup_msi_irqs)(struct pci_dev *dev, int nvec, int type);
13117 void (*teardown_msi_irq)(unsigned int irq);
13118 void (*teardown_msi_irqs)(struct pci_dev *dev);
13119-};
13120+} __no_const;
13121
13122 extern struct x86_init_ops x86_init;
13123 extern struct x86_cpuinit_ops x86_cpuinit;
13124diff --git a/arch/x86/include/asm/xsave.h b/arch/x86/include/asm/xsave.h
13125index c6ce245..ffbdab7 100644
13126--- a/arch/x86/include/asm/xsave.h
13127+++ b/arch/x86/include/asm/xsave.h
13128@@ -65,6 +65,11 @@ static inline int xsave_user(struct xsave_struct __user *buf)
13129 {
13130 int err;
13131
13132+#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
13133+ if ((unsigned long)buf < PAX_USER_SHADOW_BASE)
13134+ buf = (struct xsave_struct __user *)((void __user*)buf + PAX_USER_SHADOW_BASE);
13135+#endif
13136+
13137 /*
13138 * Clear the xsave header first, so that reserved fields are
13139 * initialized to zero.
13140@@ -96,10 +101,15 @@ static inline int xsave_user(struct xsave_struct __user *buf)
13141 static inline int xrestore_user(struct xsave_struct __user *buf, u64 mask)
13142 {
13143 int err;
13144- struct xsave_struct *xstate = ((__force struct xsave_struct *)buf);
13145+ struct xsave_struct *xstate = ((__force_kernel struct xsave_struct *)buf);
13146 u32 lmask = mask;
13147 u32 hmask = mask >> 32;
13148
13149+#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
13150+ if ((unsigned long)xstate < PAX_USER_SHADOW_BASE)
13151+ xstate = (struct xsave_struct *)((void *)xstate + PAX_USER_SHADOW_BASE);
13152+#endif
13153+
13154 __asm__ __volatile__("1: .byte " REX_PREFIX "0x0f,0xae,0x2f\n"
13155 "2:\n"
13156 ".section .fixup,\"ax\"\n"
13157diff --git a/arch/x86/kernel/acpi/realmode/Makefile b/arch/x86/kernel/acpi/realmode/Makefile
13158index 6a564ac..9b1340c 100644
13159--- a/arch/x86/kernel/acpi/realmode/Makefile
13160+++ b/arch/x86/kernel/acpi/realmode/Makefile
13161@@ -41,6 +41,9 @@ KBUILD_CFLAGS := $(LINUXINCLUDE) -g -Os -D_SETUP -D_WAKEUP -D__KERNEL__ \
13162 $(call cc-option, -fno-stack-protector) \
13163 $(call cc-option, -mpreferred-stack-boundary=2)
13164 KBUILD_CFLAGS += $(call cc-option, -m32)
13165+ifdef CONSTIFY_PLUGIN
13166+KBUILD_CFLAGS += $(CONSTIFY_PLUGIN) -fplugin-arg-constify_plugin-no-constify
13167+endif
13168 KBUILD_AFLAGS := $(KBUILD_CFLAGS) -D__ASSEMBLY__
13169 GCOV_PROFILE := n
13170
13171diff --git a/arch/x86/kernel/acpi/realmode/wakeup.S b/arch/x86/kernel/acpi/realmode/wakeup.S
13172index b4fd836..4358fe3 100644
13173--- a/arch/x86/kernel/acpi/realmode/wakeup.S
13174+++ b/arch/x86/kernel/acpi/realmode/wakeup.S
13175@@ -108,6 +108,9 @@ wakeup_code:
13176 /* Do any other stuff... */
13177
13178 #ifndef CONFIG_64BIT
13179+ /* Recheck NX bit overrides (64bit path does this in trampoline */
13180+ call verify_cpu
13181+
13182 /* This could also be done in C code... */
13183 movl pmode_cr3, %eax
13184 movl %eax, %cr3
13185@@ -131,6 +134,7 @@ wakeup_code:
13186 movl pmode_cr0, %eax
13187 movl %eax, %cr0
13188 jmp pmode_return
13189+# include "../../verify_cpu.S"
13190 #else
13191 pushw $0
13192 pushw trampoline_segment
13193diff --git a/arch/x86/kernel/acpi/sleep.c b/arch/x86/kernel/acpi/sleep.c
13194index 103b6ab..2004d0a 100644
13195--- a/arch/x86/kernel/acpi/sleep.c
13196+++ b/arch/x86/kernel/acpi/sleep.c
13197@@ -94,8 +94,12 @@ int acpi_suspend_lowlevel(void)
13198 header->trampoline_segment = trampoline_address() >> 4;
13199 #ifdef CONFIG_SMP
13200 stack_start = (unsigned long)temp_stack + sizeof(temp_stack);
13201+
13202+ pax_open_kernel();
13203 early_gdt_descr.address =
13204 (unsigned long)get_cpu_gdt_table(smp_processor_id());
13205+ pax_close_kernel();
13206+
13207 initial_gs = per_cpu_offset(smp_processor_id());
13208 #endif
13209 initial_code = (unsigned long)wakeup_long64;
13210diff --git a/arch/x86/kernel/acpi/wakeup_32.S b/arch/x86/kernel/acpi/wakeup_32.S
13211index 13ab720..95d5442 100644
13212--- a/arch/x86/kernel/acpi/wakeup_32.S
13213+++ b/arch/x86/kernel/acpi/wakeup_32.S
13214@@ -30,13 +30,11 @@ wakeup_pmode_return:
13215 # and restore the stack ... but you need gdt for this to work
13216 movl saved_context_esp, %esp
13217
13218- movl %cs:saved_magic, %eax
13219- cmpl $0x12345678, %eax
13220+ cmpl $0x12345678, saved_magic
13221 jne bogus_magic
13222
13223 # jump to place where we left off
13224- movl saved_eip, %eax
13225- jmp *%eax
13226+ jmp *(saved_eip)
13227
13228 bogus_magic:
13229 jmp bogus_magic
13230diff --git a/arch/x86/kernel/alternative.c b/arch/x86/kernel/alternative.c
13231index 1f84794..e23f862 100644
13232--- a/arch/x86/kernel/alternative.c
13233+++ b/arch/x86/kernel/alternative.c
13234@@ -276,6 +276,13 @@ void __init_or_module apply_alternatives(struct alt_instr *start,
13235 */
13236 for (a = start; a < end; a++) {
13237 instr = (u8 *)&a->instr_offset + a->instr_offset;
13238+
13239+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
13240+ instr += ____LOAD_PHYSICAL_ADDR - LOAD_PHYSICAL_ADDR;
13241+ if (instr < (u8 *)_text || (u8 *)_einittext <= instr)
13242+ instr -= ____LOAD_PHYSICAL_ADDR - LOAD_PHYSICAL_ADDR;
13243+#endif
13244+
13245 replacement = (u8 *)&a->repl_offset + a->repl_offset;
13246 BUG_ON(a->replacementlen > a->instrlen);
13247 BUG_ON(a->instrlen > sizeof(insnbuf));
13248@@ -307,10 +314,16 @@ static void alternatives_smp_lock(const s32 *start, const s32 *end,
13249 for (poff = start; poff < end; poff++) {
13250 u8 *ptr = (u8 *)poff + *poff;
13251
13252+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
13253+ ptr += ____LOAD_PHYSICAL_ADDR - LOAD_PHYSICAL_ADDR;
13254+ if (ptr < (u8 *)_text || (u8 *)_einittext <= ptr)
13255+ ptr -= ____LOAD_PHYSICAL_ADDR - LOAD_PHYSICAL_ADDR;
13256+#endif
13257+
13258 if (!*poff || ptr < text || ptr >= text_end)
13259 continue;
13260 /* turn DS segment override prefix into lock prefix */
13261- if (*ptr == 0x3e)
13262+ if (*ktla_ktva(ptr) == 0x3e)
13263 text_poke(ptr, ((unsigned char []){0xf0}), 1);
13264 };
13265 mutex_unlock(&text_mutex);
13266@@ -328,10 +341,16 @@ static void alternatives_smp_unlock(const s32 *start, const s32 *end,
13267 for (poff = start; poff < end; poff++) {
13268 u8 *ptr = (u8 *)poff + *poff;
13269
13270+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
13271+ ptr += ____LOAD_PHYSICAL_ADDR - LOAD_PHYSICAL_ADDR;
13272+ if (ptr < (u8 *)_text || (u8 *)_einittext <= ptr)
13273+ ptr -= ____LOAD_PHYSICAL_ADDR - LOAD_PHYSICAL_ADDR;
13274+#endif
13275+
13276 if (!*poff || ptr < text || ptr >= text_end)
13277 continue;
13278 /* turn lock prefix into DS segment override prefix */
13279- if (*ptr == 0xf0)
13280+ if (*ktla_ktva(ptr) == 0xf0)
13281 text_poke(ptr, ((unsigned char []){0x3E}), 1);
13282 };
13283 mutex_unlock(&text_mutex);
13284@@ -500,7 +519,7 @@ void __init_or_module apply_paravirt(struct paravirt_patch_site *start,
13285
13286 BUG_ON(p->len > MAX_PATCH_LEN);
13287 /* prep the buffer with the original instructions */
13288- memcpy(insnbuf, p->instr, p->len);
13289+ memcpy(insnbuf, ktla_ktva(p->instr), p->len);
13290 used = pv_init_ops.patch(p->instrtype, p->clobbers, insnbuf,
13291 (unsigned long)p->instr, p->len);
13292
13293@@ -568,7 +587,7 @@ void __init alternative_instructions(void)
13294 if (smp_alt_once)
13295 free_init_pages("SMP alternatives",
13296 (unsigned long)__smp_locks,
13297- (unsigned long)__smp_locks_end);
13298+ PAGE_ALIGN((unsigned long)__smp_locks_end));
13299
13300 restart_nmi();
13301 }
13302@@ -585,13 +604,17 @@ void __init alternative_instructions(void)
13303 * instructions. And on the local CPU you need to be protected again NMI or MCE
13304 * handlers seeing an inconsistent instruction while you patch.
13305 */
13306-void *__init_or_module text_poke_early(void *addr, const void *opcode,
13307+void *__kprobes text_poke_early(void *addr, const void *opcode,
13308 size_t len)
13309 {
13310 unsigned long flags;
13311 local_irq_save(flags);
13312- memcpy(addr, opcode, len);
13313+
13314+ pax_open_kernel();
13315+ memcpy(ktla_ktva(addr), opcode, len);
13316 sync_core();
13317+ pax_close_kernel();
13318+
13319 local_irq_restore(flags);
13320 /* Could also do a CLFLUSH here to speed up CPU recovery; but
13321 that causes hangs on some VIA CPUs. */
13322@@ -613,36 +636,22 @@ void *__init_or_module text_poke_early(void *addr, const void *opcode,
13323 */
13324 void *__kprobes text_poke(void *addr, const void *opcode, size_t len)
13325 {
13326- unsigned long flags;
13327- char *vaddr;
13328+ unsigned char *vaddr = ktla_ktva(addr);
13329 struct page *pages[2];
13330- int i;
13331+ size_t i;
13332
13333 if (!core_kernel_text((unsigned long)addr)) {
13334- pages[0] = vmalloc_to_page(addr);
13335- pages[1] = vmalloc_to_page(addr + PAGE_SIZE);
13336+ pages[0] = vmalloc_to_page(vaddr);
13337+ pages[1] = vmalloc_to_page(vaddr + PAGE_SIZE);
13338 } else {
13339- pages[0] = virt_to_page(addr);
13340+ pages[0] = virt_to_page(vaddr);
13341 WARN_ON(!PageReserved(pages[0]));
13342- pages[1] = virt_to_page(addr + PAGE_SIZE);
13343+ pages[1] = virt_to_page(vaddr + PAGE_SIZE);
13344 }
13345 BUG_ON(!pages[0]);
13346- local_irq_save(flags);
13347- set_fixmap(FIX_TEXT_POKE0, page_to_phys(pages[0]));
13348- if (pages[1])
13349- set_fixmap(FIX_TEXT_POKE1, page_to_phys(pages[1]));
13350- vaddr = (char *)fix_to_virt(FIX_TEXT_POKE0);
13351- memcpy(&vaddr[(unsigned long)addr & ~PAGE_MASK], opcode, len);
13352- clear_fixmap(FIX_TEXT_POKE0);
13353- if (pages[1])
13354- clear_fixmap(FIX_TEXT_POKE1);
13355- local_flush_tlb();
13356- sync_core();
13357- /* Could also do a CLFLUSH here to speed up CPU recovery; but
13358- that causes hangs on some VIA CPUs. */
13359+ text_poke_early(addr, opcode, len);
13360 for (i = 0; i < len; i++)
13361- BUG_ON(((char *)addr)[i] != ((char *)opcode)[i]);
13362- local_irq_restore(flags);
13363+ BUG_ON((vaddr)[i] != ((const unsigned char *)opcode)[i]);
13364 return addr;
13365 }
13366
13367diff --git a/arch/x86/kernel/apic/apic.c b/arch/x86/kernel/apic/apic.c
13368index f98d84c..e402a69 100644
13369--- a/arch/x86/kernel/apic/apic.c
13370+++ b/arch/x86/kernel/apic/apic.c
13371@@ -174,7 +174,7 @@ int first_system_vector = 0xfe;
13372 /*
13373 * Debug level, exported for io_apic.c
13374 */
13375-unsigned int apic_verbosity;
13376+int apic_verbosity;
13377
13378 int pic_mode;
13379
13380@@ -1853,7 +1853,7 @@ void smp_error_interrupt(struct pt_regs *regs)
13381 apic_write(APIC_ESR, 0);
13382 v1 = apic_read(APIC_ESR);
13383 ack_APIC_irq();
13384- atomic_inc(&irq_err_count);
13385+ atomic_inc_unchecked(&irq_err_count);
13386
13387 apic_printk(APIC_DEBUG, KERN_DEBUG "APIC error on CPU%d: %02x(%02x)",
13388 smp_processor_id(), v0 , v1);
13389diff --git a/arch/x86/kernel/apic/io_apic.c b/arch/x86/kernel/apic/io_apic.c
13390index 6d939d7..0697fcc 100644
13391--- a/arch/x86/kernel/apic/io_apic.c
13392+++ b/arch/x86/kernel/apic/io_apic.c
13393@@ -1096,7 +1096,7 @@ int IO_APIC_get_PCI_irq_vector(int bus, int slot, int pin,
13394 }
13395 EXPORT_SYMBOL(IO_APIC_get_PCI_irq_vector);
13396
13397-void lock_vector_lock(void)
13398+void lock_vector_lock(void) __acquires(vector_lock)
13399 {
13400 /* Used to the online set of cpus does not change
13401 * during assign_irq_vector.
13402@@ -1104,7 +1104,7 @@ void lock_vector_lock(void)
13403 raw_spin_lock(&vector_lock);
13404 }
13405
13406-void unlock_vector_lock(void)
13407+void unlock_vector_lock(void) __releases(vector_lock)
13408 {
13409 raw_spin_unlock(&vector_lock);
13410 }
13411@@ -2510,7 +2510,7 @@ static void ack_apic_edge(struct irq_data *data)
13412 ack_APIC_irq();
13413 }
13414
13415-atomic_t irq_mis_count;
13416+atomic_unchecked_t irq_mis_count;
13417
13418 static void ack_apic_level(struct irq_data *data)
13419 {
13420@@ -2576,7 +2576,7 @@ static void ack_apic_level(struct irq_data *data)
13421 * at the cpu.
13422 */
13423 if (!(v & (1 << (i & 0x1f)))) {
13424- atomic_inc(&irq_mis_count);
13425+ atomic_inc_unchecked(&irq_mis_count);
13426
13427 eoi_ioapic_irq(irq, cfg);
13428 }
13429diff --git a/arch/x86/kernel/apm_32.c b/arch/x86/kernel/apm_32.c
13430index a46bd38..6b906d7 100644
13431--- a/arch/x86/kernel/apm_32.c
13432+++ b/arch/x86/kernel/apm_32.c
13433@@ -411,7 +411,7 @@ static DEFINE_MUTEX(apm_mutex);
13434 * This is for buggy BIOS's that refer to (real mode) segment 0x40
13435 * even though they are called in protected mode.
13436 */
13437-static struct desc_struct bad_bios_desc = GDT_ENTRY_INIT(0x4092,
13438+static const struct desc_struct bad_bios_desc = GDT_ENTRY_INIT(0x4093,
13439 (unsigned long)__va(0x400UL), PAGE_SIZE - 0x400 - 1);
13440
13441 static const char driver_version[] = "1.16ac"; /* no spaces */
13442@@ -589,7 +589,10 @@ static long __apm_bios_call(void *_call)
13443 BUG_ON(cpu != 0);
13444 gdt = get_cpu_gdt_table(cpu);
13445 save_desc_40 = gdt[0x40 / 8];
13446+
13447+ pax_open_kernel();
13448 gdt[0x40 / 8] = bad_bios_desc;
13449+ pax_close_kernel();
13450
13451 apm_irq_save(flags);
13452 APM_DO_SAVE_SEGS;
13453@@ -598,7 +601,11 @@ static long __apm_bios_call(void *_call)
13454 &call->esi);
13455 APM_DO_RESTORE_SEGS;
13456 apm_irq_restore(flags);
13457+
13458+ pax_open_kernel();
13459 gdt[0x40 / 8] = save_desc_40;
13460+ pax_close_kernel();
13461+
13462 put_cpu();
13463
13464 return call->eax & 0xff;
13465@@ -665,7 +672,10 @@ static long __apm_bios_call_simple(void *_call)
13466 BUG_ON(cpu != 0);
13467 gdt = get_cpu_gdt_table(cpu);
13468 save_desc_40 = gdt[0x40 / 8];
13469+
13470+ pax_open_kernel();
13471 gdt[0x40 / 8] = bad_bios_desc;
13472+ pax_close_kernel();
13473
13474 apm_irq_save(flags);
13475 APM_DO_SAVE_SEGS;
13476@@ -673,7 +683,11 @@ static long __apm_bios_call_simple(void *_call)
13477 &call->eax);
13478 APM_DO_RESTORE_SEGS;
13479 apm_irq_restore(flags);
13480+
13481+ pax_open_kernel();
13482 gdt[0x40 / 8] = save_desc_40;
13483+ pax_close_kernel();
13484+
13485 put_cpu();
13486 return error;
13487 }
13488@@ -2347,12 +2361,15 @@ static int __init apm_init(void)
13489 * code to that CPU.
13490 */
13491 gdt = get_cpu_gdt_table(0);
13492+
13493+ pax_open_kernel();
13494 set_desc_base(&gdt[APM_CS >> 3],
13495 (unsigned long)__va((unsigned long)apm_info.bios.cseg << 4));
13496 set_desc_base(&gdt[APM_CS_16 >> 3],
13497 (unsigned long)__va((unsigned long)apm_info.bios.cseg_16 << 4));
13498 set_desc_base(&gdt[APM_DS >> 3],
13499 (unsigned long)__va((unsigned long)apm_info.bios.dseg << 4));
13500+ pax_close_kernel();
13501
13502 proc_create("apm", 0, NULL, &apm_file_ops);
13503
13504diff --git a/arch/x86/kernel/asm-offsets.c b/arch/x86/kernel/asm-offsets.c
13505index 4f13faf..87db5d2 100644
13506--- a/arch/x86/kernel/asm-offsets.c
13507+++ b/arch/x86/kernel/asm-offsets.c
13508@@ -33,6 +33,8 @@ void common(void) {
13509 OFFSET(TI_status, thread_info, status);
13510 OFFSET(TI_addr_limit, thread_info, addr_limit);
13511 OFFSET(TI_preempt_count, thread_info, preempt_count);
13512+ OFFSET(TI_lowest_stack, thread_info, lowest_stack);
13513+ DEFINE(TI_task_thread_sp0, offsetof(struct task_struct, thread.sp0) - offsetof(struct task_struct, tinfo));
13514
13515 BLANK();
13516 OFFSET(crypto_tfm_ctx_offset, crypto_tfm, __crt_ctx);
13517@@ -53,8 +55,26 @@ void common(void) {
13518 OFFSET(PV_CPU_irq_enable_sysexit, pv_cpu_ops, irq_enable_sysexit);
13519 OFFSET(PV_CPU_read_cr0, pv_cpu_ops, read_cr0);
13520 OFFSET(PV_MMU_read_cr2, pv_mmu_ops, read_cr2);
13521+
13522+#ifdef CONFIG_PAX_KERNEXEC
13523+ OFFSET(PV_CPU_write_cr0, pv_cpu_ops, write_cr0);
13524 #endif
13525
13526+#ifdef CONFIG_PAX_MEMORY_UDEREF
13527+ OFFSET(PV_MMU_read_cr3, pv_mmu_ops, read_cr3);
13528+ OFFSET(PV_MMU_write_cr3, pv_mmu_ops, write_cr3);
13529+#ifdef CONFIG_X86_64
13530+ OFFSET(PV_MMU_set_pgd_batched, pv_mmu_ops, set_pgd_batched);
13531+#endif
13532+#endif
13533+
13534+#endif
13535+
13536+ BLANK();
13537+ DEFINE(PAGE_SIZE_asm, PAGE_SIZE);
13538+ DEFINE(PAGE_SHIFT_asm, PAGE_SHIFT);
13539+ DEFINE(THREAD_SIZE_asm, THREAD_SIZE);
13540+
13541 #ifdef CONFIG_XEN
13542 BLANK();
13543 OFFSET(XEN_vcpu_info_mask, vcpu_info, evtchn_upcall_mask);
13544diff --git a/arch/x86/kernel/asm-offsets_64.c b/arch/x86/kernel/asm-offsets_64.c
13545index e72a119..6e2955d 100644
13546--- a/arch/x86/kernel/asm-offsets_64.c
13547+++ b/arch/x86/kernel/asm-offsets_64.c
13548@@ -69,6 +69,7 @@ int main(void)
13549 BLANK();
13550 #undef ENTRY
13551
13552+ DEFINE(TSS_size, sizeof(struct tss_struct));
13553 OFFSET(TSS_ist, tss_struct, x86_tss.ist);
13554 BLANK();
13555
13556diff --git a/arch/x86/kernel/cpu/Makefile b/arch/x86/kernel/cpu/Makefile
13557index 25f24dc..4094a7f 100644
13558--- a/arch/x86/kernel/cpu/Makefile
13559+++ b/arch/x86/kernel/cpu/Makefile
13560@@ -8,10 +8,6 @@ CFLAGS_REMOVE_common.o = -pg
13561 CFLAGS_REMOVE_perf_event.o = -pg
13562 endif
13563
13564-# Make sure load_percpu_segment has no stackprotector
13565-nostackp := $(call cc-option, -fno-stack-protector)
13566-CFLAGS_common.o := $(nostackp)
13567-
13568 obj-y := intel_cacheinfo.o scattered.o topology.o
13569 obj-y += proc.o capflags.o powerflags.o common.o
13570 obj-y += vmware.o hypervisor.o sched.o mshyperv.o
13571diff --git a/arch/x86/kernel/cpu/amd.c b/arch/x86/kernel/cpu/amd.c
13572index 0bab2b1..d0a1bf8 100644
13573--- a/arch/x86/kernel/cpu/amd.c
13574+++ b/arch/x86/kernel/cpu/amd.c
13575@@ -664,7 +664,7 @@ static unsigned int __cpuinit amd_size_cache(struct cpuinfo_x86 *c,
13576 unsigned int size)
13577 {
13578 /* AMD errata T13 (order #21922) */
13579- if ((c->x86 == 6)) {
13580+ if (c->x86 == 6) {
13581 /* Duron Rev A0 */
13582 if (c->x86_model == 3 && c->x86_mask == 0)
13583 size = 64;
13584diff --git a/arch/x86/kernel/cpu/common.c b/arch/x86/kernel/cpu/common.c
13585index aa003b1..47ea638 100644
13586--- a/arch/x86/kernel/cpu/common.c
13587+++ b/arch/x86/kernel/cpu/common.c
13588@@ -84,60 +84,6 @@ static const struct cpu_dev __cpuinitconst default_cpu = {
13589
13590 static const struct cpu_dev *this_cpu __cpuinitdata = &default_cpu;
13591
13592-DEFINE_PER_CPU_PAGE_ALIGNED(struct gdt_page, gdt_page) = { .gdt = {
13593-#ifdef CONFIG_X86_64
13594- /*
13595- * We need valid kernel segments for data and code in long mode too
13596- * IRET will check the segment types kkeil 2000/10/28
13597- * Also sysret mandates a special GDT layout
13598- *
13599- * TLS descriptors are currently at a different place compared to i386.
13600- * Hopefully nobody expects them at a fixed place (Wine?)
13601- */
13602- [GDT_ENTRY_KERNEL32_CS] = GDT_ENTRY_INIT(0xc09b, 0, 0xfffff),
13603- [GDT_ENTRY_KERNEL_CS] = GDT_ENTRY_INIT(0xa09b, 0, 0xfffff),
13604- [GDT_ENTRY_KERNEL_DS] = GDT_ENTRY_INIT(0xc093, 0, 0xfffff),
13605- [GDT_ENTRY_DEFAULT_USER32_CS] = GDT_ENTRY_INIT(0xc0fb, 0, 0xfffff),
13606- [GDT_ENTRY_DEFAULT_USER_DS] = GDT_ENTRY_INIT(0xc0f3, 0, 0xfffff),
13607- [GDT_ENTRY_DEFAULT_USER_CS] = GDT_ENTRY_INIT(0xa0fb, 0, 0xfffff),
13608-#else
13609- [GDT_ENTRY_KERNEL_CS] = GDT_ENTRY_INIT(0xc09a, 0, 0xfffff),
13610- [GDT_ENTRY_KERNEL_DS] = GDT_ENTRY_INIT(0xc092, 0, 0xfffff),
13611- [GDT_ENTRY_DEFAULT_USER_CS] = GDT_ENTRY_INIT(0xc0fa, 0, 0xfffff),
13612- [GDT_ENTRY_DEFAULT_USER_DS] = GDT_ENTRY_INIT(0xc0f2, 0, 0xfffff),
13613- /*
13614- * Segments used for calling PnP BIOS have byte granularity.
13615- * They code segments and data segments have fixed 64k limits,
13616- * the transfer segment sizes are set at run time.
13617- */
13618- /* 32-bit code */
13619- [GDT_ENTRY_PNPBIOS_CS32] = GDT_ENTRY_INIT(0x409a, 0, 0xffff),
13620- /* 16-bit code */
13621- [GDT_ENTRY_PNPBIOS_CS16] = GDT_ENTRY_INIT(0x009a, 0, 0xffff),
13622- /* 16-bit data */
13623- [GDT_ENTRY_PNPBIOS_DS] = GDT_ENTRY_INIT(0x0092, 0, 0xffff),
13624- /* 16-bit data */
13625- [GDT_ENTRY_PNPBIOS_TS1] = GDT_ENTRY_INIT(0x0092, 0, 0),
13626- /* 16-bit data */
13627- [GDT_ENTRY_PNPBIOS_TS2] = GDT_ENTRY_INIT(0x0092, 0, 0),
13628- /*
13629- * The APM segments have byte granularity and their bases
13630- * are set at run time. All have 64k limits.
13631- */
13632- /* 32-bit code */
13633- [GDT_ENTRY_APMBIOS_BASE] = GDT_ENTRY_INIT(0x409a, 0, 0xffff),
13634- /* 16-bit code */
13635- [GDT_ENTRY_APMBIOS_BASE+1] = GDT_ENTRY_INIT(0x009a, 0, 0xffff),
13636- /* data */
13637- [GDT_ENTRY_APMBIOS_BASE+2] = GDT_ENTRY_INIT(0x4092, 0, 0xffff),
13638-
13639- [GDT_ENTRY_ESPFIX_SS] = GDT_ENTRY_INIT(0xc092, 0, 0xfffff),
13640- [GDT_ENTRY_PERCPU] = GDT_ENTRY_INIT(0xc092, 0, 0xfffff),
13641- GDT_STACK_CANARY_INIT
13642-#endif
13643-} };
13644-EXPORT_PER_CPU_SYMBOL_GPL(gdt_page);
13645-
13646 static int __init x86_xsave_setup(char *s)
13647 {
13648 setup_clear_cpu_cap(X86_FEATURE_XSAVE);
13649@@ -372,7 +318,7 @@ void switch_to_new_gdt(int cpu)
13650 {
13651 struct desc_ptr gdt_descr;
13652
13653- gdt_descr.address = (long)get_cpu_gdt_table(cpu);
13654+ gdt_descr.address = (unsigned long)get_cpu_gdt_table(cpu);
13655 gdt_descr.size = GDT_SIZE - 1;
13656 load_gdt(&gdt_descr);
13657 /* Reload the per-cpu base */
13658@@ -844,6 +790,10 @@ static void __cpuinit identify_cpu(struct cpuinfo_x86 *c)
13659 /* Filter out anything that depends on CPUID levels we don't have */
13660 filter_cpuid_features(c, true);
13661
13662+#if defined(CONFIG_X86_32) && (defined(CONFIG_PAX_SEGMEXEC) || defined(CONFIG_PAX_KERNEXEC) || defined(CONFIG_PAX_MEMORY_UDEREF))
13663+ setup_clear_cpu_cap(X86_FEATURE_SEP);
13664+#endif
13665+
13666 /* If the model name is still unset, do table lookup. */
13667 if (!c->x86_model_id[0]) {
13668 const char *p;
13669@@ -1024,6 +974,9 @@ static __init int setup_disablecpuid(char *arg)
13670 }
13671 __setup("clearcpuid=", setup_disablecpuid);
13672
13673+DEFINE_PER_CPU(struct thread_info *, current_tinfo) = &init_task.tinfo;
13674+EXPORT_PER_CPU_SYMBOL(current_tinfo);
13675+
13676 #ifdef CONFIG_X86_64
13677 struct desc_ptr idt_descr = { NR_VECTORS * 16 - 1, (unsigned long) idt_table };
13678
13679@@ -1039,7 +992,7 @@ DEFINE_PER_CPU(struct task_struct *, current_task) ____cacheline_aligned =
13680 EXPORT_PER_CPU_SYMBOL(current_task);
13681
13682 DEFINE_PER_CPU(unsigned long, kernel_stack) =
13683- (unsigned long)&init_thread_union - KERNEL_STACK_OFFSET + THREAD_SIZE;
13684+ (unsigned long)&init_thread_union - 16 + THREAD_SIZE;
13685 EXPORT_PER_CPU_SYMBOL(kernel_stack);
13686
13687 DEFINE_PER_CPU(char *, irq_stack_ptr) =
13688@@ -1104,7 +1057,7 @@ struct pt_regs * __cpuinit idle_regs(struct pt_regs *regs)
13689 {
13690 memset(regs, 0, sizeof(struct pt_regs));
13691 regs->fs = __KERNEL_PERCPU;
13692- regs->gs = __KERNEL_STACK_CANARY;
13693+ savesegment(gs, regs->gs);
13694
13695 return regs;
13696 }
13697@@ -1159,7 +1112,7 @@ void __cpuinit cpu_init(void)
13698 int i;
13699
13700 cpu = stack_smp_processor_id();
13701- t = &per_cpu(init_tss, cpu);
13702+ t = init_tss + cpu;
13703 oist = &per_cpu(orig_ist, cpu);
13704
13705 #ifdef CONFIG_NUMA
13706@@ -1185,7 +1138,7 @@ void __cpuinit cpu_init(void)
13707 switch_to_new_gdt(cpu);
13708 loadsegment(fs, 0);
13709
13710- load_idt((const struct desc_ptr *)&idt_descr);
13711+ load_idt(&idt_descr);
13712
13713 memset(me->thread.tls_array, 0, GDT_ENTRY_TLS_ENTRIES * 8);
13714 syscall_init();
13715@@ -1194,7 +1147,6 @@ void __cpuinit cpu_init(void)
13716 wrmsrl(MSR_KERNEL_GS_BASE, 0);
13717 barrier();
13718
13719- x86_configure_nx();
13720 if (cpu != 0)
13721 enable_x2apic();
13722
13723@@ -1248,7 +1200,7 @@ void __cpuinit cpu_init(void)
13724 {
13725 int cpu = smp_processor_id();
13726 struct task_struct *curr = current;
13727- struct tss_struct *t = &per_cpu(init_tss, cpu);
13728+ struct tss_struct *t = init_tss + cpu;
13729 struct thread_struct *thread = &curr->thread;
13730
13731 if (cpumask_test_and_set_cpu(cpu, cpu_initialized_mask)) {
13732diff --git a/arch/x86/kernel/cpu/intel.c b/arch/x86/kernel/cpu/intel.c
13733index 5231312..a78a987 100644
13734--- a/arch/x86/kernel/cpu/intel.c
13735+++ b/arch/x86/kernel/cpu/intel.c
13736@@ -174,7 +174,7 @@ static void __cpuinit trap_init_f00f_bug(void)
13737 * Update the IDT descriptor and reload the IDT so that
13738 * it uses the read-only mapped virtual address.
13739 */
13740- idt_descr.address = fix_to_virt(FIX_F00F_IDT);
13741+ idt_descr.address = (struct desc_struct *)fix_to_virt(FIX_F00F_IDT);
13742 load_idt(&idt_descr);
13743 }
13744 #endif
13745diff --git a/arch/x86/kernel/cpu/mcheck/mce-inject.c b/arch/x86/kernel/cpu/mcheck/mce-inject.c
13746index 319882e..993534e 100644
13747--- a/arch/x86/kernel/cpu/mcheck/mce-inject.c
13748+++ b/arch/x86/kernel/cpu/mcheck/mce-inject.c
13749@@ -173,6 +173,8 @@ static void raise_mce(struct mce *m)
13750
13751 /* Error injection interface */
13752 static ssize_t mce_write(struct file *filp, const char __user *ubuf,
13753+ size_t usize, loff_t *off) __size_overflow(3);
13754+static ssize_t mce_write(struct file *filp, const char __user *ubuf,
13755 size_t usize, loff_t *off)
13756 {
13757 struct mce m;
13758diff --git a/arch/x86/kernel/cpu/mcheck/mce.c b/arch/x86/kernel/cpu/mcheck/mce.c
13759index 2af127d..8ff7ac0 100644
13760--- a/arch/x86/kernel/cpu/mcheck/mce.c
13761+++ b/arch/x86/kernel/cpu/mcheck/mce.c
13762@@ -42,6 +42,7 @@
13763 #include <asm/processor.h>
13764 #include <asm/mce.h>
13765 #include <asm/msr.h>
13766+#include <asm/local.h>
13767
13768 #include "mce-internal.h"
13769
13770@@ -202,7 +203,7 @@ static void print_mce(struct mce *m)
13771 !(m->mcgstatus & MCG_STATUS_EIPV) ? " !INEXACT!" : "",
13772 m->cs, m->ip);
13773
13774- if (m->cs == __KERNEL_CS)
13775+ if (m->cs == __KERNEL_CS || m->cs == __KERNEXEC_KERNEL_CS)
13776 print_symbol("{%s}", m->ip);
13777 pr_cont("\n");
13778 }
13779@@ -235,10 +236,10 @@ static void print_mce(struct mce *m)
13780
13781 #define PANIC_TIMEOUT 5 /* 5 seconds */
13782
13783-static atomic_t mce_paniced;
13784+static atomic_unchecked_t mce_paniced;
13785
13786 static int fake_panic;
13787-static atomic_t mce_fake_paniced;
13788+static atomic_unchecked_t mce_fake_paniced;
13789
13790 /* Panic in progress. Enable interrupts and wait for final IPI */
13791 static void wait_for_panic(void)
13792@@ -262,7 +263,7 @@ static void mce_panic(char *msg, struct mce *final, char *exp)
13793 /*
13794 * Make sure only one CPU runs in machine check panic
13795 */
13796- if (atomic_inc_return(&mce_paniced) > 1)
13797+ if (atomic_inc_return_unchecked(&mce_paniced) > 1)
13798 wait_for_panic();
13799 barrier();
13800
13801@@ -270,7 +271,7 @@ static void mce_panic(char *msg, struct mce *final, char *exp)
13802 console_verbose();
13803 } else {
13804 /* Don't log too much for fake panic */
13805- if (atomic_inc_return(&mce_fake_paniced) > 1)
13806+ if (atomic_inc_return_unchecked(&mce_fake_paniced) > 1)
13807 return;
13808 }
13809 /* First print corrected ones that are still unlogged */
13810@@ -610,7 +611,7 @@ static int mce_timed_out(u64 *t)
13811 * might have been modified by someone else.
13812 */
13813 rmb();
13814- if (atomic_read(&mce_paniced))
13815+ if (atomic_read_unchecked(&mce_paniced))
13816 wait_for_panic();
13817 if (!monarch_timeout)
13818 goto out;
13819@@ -1398,7 +1399,7 @@ static void unexpected_machine_check(struct pt_regs *regs, long error_code)
13820 }
13821
13822 /* Call the installed machine check handler for this CPU setup. */
13823-void (*machine_check_vector)(struct pt_regs *, long error_code) =
13824+void (*machine_check_vector)(struct pt_regs *, long error_code) __read_only =
13825 unexpected_machine_check;
13826
13827 /*
13828@@ -1421,7 +1422,9 @@ void __cpuinit mcheck_cpu_init(struct cpuinfo_x86 *c)
13829 return;
13830 }
13831
13832+ pax_open_kernel();
13833 machine_check_vector = do_machine_check;
13834+ pax_close_kernel();
13835
13836 __mcheck_cpu_init_generic();
13837 __mcheck_cpu_init_vendor(c);
13838@@ -1435,7 +1438,7 @@ void __cpuinit mcheck_cpu_init(struct cpuinfo_x86 *c)
13839 */
13840
13841 static DEFINE_SPINLOCK(mce_chrdev_state_lock);
13842-static int mce_chrdev_open_count; /* #times opened */
13843+static local_t mce_chrdev_open_count; /* #times opened */
13844 static int mce_chrdev_open_exclu; /* already open exclusive? */
13845
13846 static int mce_chrdev_open(struct inode *inode, struct file *file)
13847@@ -1443,7 +1446,7 @@ static int mce_chrdev_open(struct inode *inode, struct file *file)
13848 spin_lock(&mce_chrdev_state_lock);
13849
13850 if (mce_chrdev_open_exclu ||
13851- (mce_chrdev_open_count && (file->f_flags & O_EXCL))) {
13852+ (local_read(&mce_chrdev_open_count) && (file->f_flags & O_EXCL))) {
13853 spin_unlock(&mce_chrdev_state_lock);
13854
13855 return -EBUSY;
13856@@ -1451,7 +1454,7 @@ static int mce_chrdev_open(struct inode *inode, struct file *file)
13857
13858 if (file->f_flags & O_EXCL)
13859 mce_chrdev_open_exclu = 1;
13860- mce_chrdev_open_count++;
13861+ local_inc(&mce_chrdev_open_count);
13862
13863 spin_unlock(&mce_chrdev_state_lock);
13864
13865@@ -1462,7 +1465,7 @@ static int mce_chrdev_release(struct inode *inode, struct file *file)
13866 {
13867 spin_lock(&mce_chrdev_state_lock);
13868
13869- mce_chrdev_open_count--;
13870+ local_dec(&mce_chrdev_open_count);
13871 mce_chrdev_open_exclu = 0;
13872
13873 spin_unlock(&mce_chrdev_state_lock);
13874@@ -2171,7 +2174,7 @@ struct dentry *mce_get_debugfs_dir(void)
13875 static void mce_reset(void)
13876 {
13877 cpu_missing = 0;
13878- atomic_set(&mce_fake_paniced, 0);
13879+ atomic_set_unchecked(&mce_fake_paniced, 0);
13880 atomic_set(&mce_executing, 0);
13881 atomic_set(&mce_callin, 0);
13882 atomic_set(&global_nwo, 0);
13883diff --git a/arch/x86/kernel/cpu/mcheck/p5.c b/arch/x86/kernel/cpu/mcheck/p5.c
13884index 5c0e653..0882b0a 100644
13885--- a/arch/x86/kernel/cpu/mcheck/p5.c
13886+++ b/arch/x86/kernel/cpu/mcheck/p5.c
13887@@ -12,6 +12,7 @@
13888 #include <asm/system.h>
13889 #include <asm/mce.h>
13890 #include <asm/msr.h>
13891+#include <asm/pgtable.h>
13892
13893 /* By default disabled */
13894 int mce_p5_enabled __read_mostly;
13895@@ -50,7 +51,9 @@ void intel_p5_mcheck_init(struct cpuinfo_x86 *c)
13896 if (!cpu_has(c, X86_FEATURE_MCE))
13897 return;
13898
13899+ pax_open_kernel();
13900 machine_check_vector = pentium_machine_check;
13901+ pax_close_kernel();
13902 /* Make sure the vector pointer is visible before we enable MCEs: */
13903 wmb();
13904
13905diff --git a/arch/x86/kernel/cpu/mcheck/winchip.c b/arch/x86/kernel/cpu/mcheck/winchip.c
13906index 54060f5..c1a7577 100644
13907--- a/arch/x86/kernel/cpu/mcheck/winchip.c
13908+++ b/arch/x86/kernel/cpu/mcheck/winchip.c
13909@@ -11,6 +11,7 @@
13910 #include <asm/system.h>
13911 #include <asm/mce.h>
13912 #include <asm/msr.h>
13913+#include <asm/pgtable.h>
13914
13915 /* Machine check handler for WinChip C6: */
13916 static void winchip_machine_check(struct pt_regs *regs, long error_code)
13917@@ -24,7 +25,9 @@ void winchip_mcheck_init(struct cpuinfo_x86 *c)
13918 {
13919 u32 lo, hi;
13920
13921+ pax_open_kernel();
13922 machine_check_vector = winchip_machine_check;
13923+ pax_close_kernel();
13924 /* Make sure the vector pointer is visible before we enable MCEs: */
13925 wmb();
13926
13927diff --git a/arch/x86/kernel/cpu/mtrr/if.c b/arch/x86/kernel/cpu/mtrr/if.c
13928index 7928963..1b16001 100644
13929--- a/arch/x86/kernel/cpu/mtrr/if.c
13930+++ b/arch/x86/kernel/cpu/mtrr/if.c
13931@@ -91,6 +91,8 @@ mtrr_file_del(unsigned long base, unsigned long size,
13932 * "base=%Lx size=%Lx type=%s" or "disable=%d"
13933 */
13934 static ssize_t
13935+mtrr_write(struct file *file, const char __user *buf, size_t len, loff_t * ppos) __size_overflow(3);
13936+static ssize_t
13937 mtrr_write(struct file *file, const char __user *buf, size_t len, loff_t * ppos)
13938 {
13939 int i, err;
13940diff --git a/arch/x86/kernel/cpu/mtrr/main.c b/arch/x86/kernel/cpu/mtrr/main.c
13941index 6b96110..0da73eb 100644
13942--- a/arch/x86/kernel/cpu/mtrr/main.c
13943+++ b/arch/x86/kernel/cpu/mtrr/main.c
13944@@ -62,7 +62,7 @@ static DEFINE_MUTEX(mtrr_mutex);
13945 u64 size_or_mask, size_and_mask;
13946 static bool mtrr_aps_delayed_init;
13947
13948-static const struct mtrr_ops *mtrr_ops[X86_VENDOR_NUM];
13949+static const struct mtrr_ops *mtrr_ops[X86_VENDOR_NUM] __read_only;
13950
13951 const struct mtrr_ops *mtrr_if;
13952
13953diff --git a/arch/x86/kernel/cpu/mtrr/mtrr.h b/arch/x86/kernel/cpu/mtrr/mtrr.h
13954index df5e41f..816c719 100644
13955--- a/arch/x86/kernel/cpu/mtrr/mtrr.h
13956+++ b/arch/x86/kernel/cpu/mtrr/mtrr.h
13957@@ -25,7 +25,7 @@ struct mtrr_ops {
13958 int (*validate_add_page)(unsigned long base, unsigned long size,
13959 unsigned int type);
13960 int (*have_wrcomb)(void);
13961-};
13962+} __do_const;
13963
13964 extern int generic_get_free_region(unsigned long base, unsigned long size,
13965 int replace_reg);
13966diff --git a/arch/x86/kernel/cpu/perf_event.c b/arch/x86/kernel/cpu/perf_event.c
13967index 2bda212..78cc605 100644
13968--- a/arch/x86/kernel/cpu/perf_event.c
13969+++ b/arch/x86/kernel/cpu/perf_event.c
13970@@ -1529,7 +1529,7 @@ perf_callchain_user(struct perf_callchain_entry *entry, struct pt_regs *regs)
13971 break;
13972
13973 perf_callchain_store(entry, frame.return_address);
13974- fp = frame.next_frame;
13975+ fp = (const void __force_user *)frame.next_frame;
13976 }
13977 }
13978
13979diff --git a/arch/x86/kernel/crash.c b/arch/x86/kernel/crash.c
13980index 13ad899..f642b9a 100644
13981--- a/arch/x86/kernel/crash.c
13982+++ b/arch/x86/kernel/crash.c
13983@@ -36,10 +36,8 @@ static void kdump_nmi_callback(int cpu, struct pt_regs *regs)
13984 {
13985 #ifdef CONFIG_X86_32
13986 struct pt_regs fixed_regs;
13987-#endif
13988
13989-#ifdef CONFIG_X86_32
13990- if (!user_mode_vm(regs)) {
13991+ if (!user_mode(regs)) {
13992 crash_fixup_ss_esp(&fixed_regs, regs);
13993 regs = &fixed_regs;
13994 }
13995diff --git a/arch/x86/kernel/doublefault_32.c b/arch/x86/kernel/doublefault_32.c
13996index 37250fe..bf2ec74 100644
13997--- a/arch/x86/kernel/doublefault_32.c
13998+++ b/arch/x86/kernel/doublefault_32.c
13999@@ -11,7 +11,7 @@
14000
14001 #define DOUBLEFAULT_STACKSIZE (1024)
14002 static unsigned long doublefault_stack[DOUBLEFAULT_STACKSIZE];
14003-#define STACK_START (unsigned long)(doublefault_stack+DOUBLEFAULT_STACKSIZE)
14004+#define STACK_START (unsigned long)(doublefault_stack+DOUBLEFAULT_STACKSIZE-2)
14005
14006 #define ptr_ok(x) ((x) > PAGE_OFFSET && (x) < PAGE_OFFSET + MAXMEM)
14007
14008@@ -21,7 +21,7 @@ static void doublefault_fn(void)
14009 unsigned long gdt, tss;
14010
14011 store_gdt(&gdt_desc);
14012- gdt = gdt_desc.address;
14013+ gdt = (unsigned long)gdt_desc.address;
14014
14015 printk(KERN_EMERG "PANIC: double fault, gdt at %08lx [%d bytes]\n", gdt, gdt_desc.size);
14016
14017@@ -58,10 +58,10 @@ struct tss_struct doublefault_tss __cacheline_aligned = {
14018 /* 0x2 bit is always set */
14019 .flags = X86_EFLAGS_SF | 0x2,
14020 .sp = STACK_START,
14021- .es = __USER_DS,
14022+ .es = __KERNEL_DS,
14023 .cs = __KERNEL_CS,
14024 .ss = __KERNEL_DS,
14025- .ds = __USER_DS,
14026+ .ds = __KERNEL_DS,
14027 .fs = __KERNEL_PERCPU,
14028
14029 .__cr3 = __pa_nodebug(swapper_pg_dir),
14030diff --git a/arch/x86/kernel/dumpstack.c b/arch/x86/kernel/dumpstack.c
14031index 1aae78f..aab3a3d 100644
14032--- a/arch/x86/kernel/dumpstack.c
14033+++ b/arch/x86/kernel/dumpstack.c
14034@@ -2,6 +2,9 @@
14035 * Copyright (C) 1991, 1992 Linus Torvalds
14036 * Copyright (C) 2000, 2001, 2002 Andi Kleen, SuSE Labs
14037 */
14038+#ifdef CONFIG_GRKERNSEC_HIDESYM
14039+#define __INCLUDED_BY_HIDESYM 1
14040+#endif
14041 #include <linux/kallsyms.h>
14042 #include <linux/kprobes.h>
14043 #include <linux/uaccess.h>
14044@@ -35,9 +38,8 @@ void printk_address(unsigned long address, int reliable)
14045 static void
14046 print_ftrace_graph_addr(unsigned long addr, void *data,
14047 const struct stacktrace_ops *ops,
14048- struct thread_info *tinfo, int *graph)
14049+ struct task_struct *task, int *graph)
14050 {
14051- struct task_struct *task = tinfo->task;
14052 unsigned long ret_addr;
14053 int index = task->curr_ret_stack;
14054
14055@@ -58,7 +60,7 @@ print_ftrace_graph_addr(unsigned long addr, void *data,
14056 static inline void
14057 print_ftrace_graph_addr(unsigned long addr, void *data,
14058 const struct stacktrace_ops *ops,
14059- struct thread_info *tinfo, int *graph)
14060+ struct task_struct *task, int *graph)
14061 { }
14062 #endif
14063
14064@@ -69,10 +71,8 @@ print_ftrace_graph_addr(unsigned long addr, void *data,
14065 * severe exception (double fault, nmi, stack fault, debug, mce) hardware stack
14066 */
14067
14068-static inline int valid_stack_ptr(struct thread_info *tinfo,
14069- void *p, unsigned int size, void *end)
14070+static inline int valid_stack_ptr(void *t, void *p, unsigned int size, void *end)
14071 {
14072- void *t = tinfo;
14073 if (end) {
14074 if (p < end && p >= (end-THREAD_SIZE))
14075 return 1;
14076@@ -83,14 +83,14 @@ static inline int valid_stack_ptr(struct thread_info *tinfo,
14077 }
14078
14079 unsigned long
14080-print_context_stack(struct thread_info *tinfo,
14081+print_context_stack(struct task_struct *task, void *stack_start,
14082 unsigned long *stack, unsigned long bp,
14083 const struct stacktrace_ops *ops, void *data,
14084 unsigned long *end, int *graph)
14085 {
14086 struct stack_frame *frame = (struct stack_frame *)bp;
14087
14088- while (valid_stack_ptr(tinfo, stack, sizeof(*stack), end)) {
14089+ while (valid_stack_ptr(stack_start, stack, sizeof(*stack), end)) {
14090 unsigned long addr;
14091
14092 addr = *stack;
14093@@ -102,7 +102,7 @@ print_context_stack(struct thread_info *tinfo,
14094 } else {
14095 ops->address(data, addr, 0);
14096 }
14097- print_ftrace_graph_addr(addr, data, ops, tinfo, graph);
14098+ print_ftrace_graph_addr(addr, data, ops, task, graph);
14099 }
14100 stack++;
14101 }
14102@@ -111,7 +111,7 @@ print_context_stack(struct thread_info *tinfo,
14103 EXPORT_SYMBOL_GPL(print_context_stack);
14104
14105 unsigned long
14106-print_context_stack_bp(struct thread_info *tinfo,
14107+print_context_stack_bp(struct task_struct *task, void *stack_start,
14108 unsigned long *stack, unsigned long bp,
14109 const struct stacktrace_ops *ops, void *data,
14110 unsigned long *end, int *graph)
14111@@ -119,7 +119,7 @@ print_context_stack_bp(struct thread_info *tinfo,
14112 struct stack_frame *frame = (struct stack_frame *)bp;
14113 unsigned long *ret_addr = &frame->return_address;
14114
14115- while (valid_stack_ptr(tinfo, ret_addr, sizeof(*ret_addr), end)) {
14116+ while (valid_stack_ptr(stack_start, ret_addr, sizeof(*ret_addr), end)) {
14117 unsigned long addr = *ret_addr;
14118
14119 if (!__kernel_text_address(addr))
14120@@ -128,7 +128,7 @@ print_context_stack_bp(struct thread_info *tinfo,
14121 ops->address(data, addr, 1);
14122 frame = frame->next_frame;
14123 ret_addr = &frame->return_address;
14124- print_ftrace_graph_addr(addr, data, ops, tinfo, graph);
14125+ print_ftrace_graph_addr(addr, data, ops, task, graph);
14126 }
14127
14128 return (unsigned long)frame;
14129@@ -186,7 +186,7 @@ void dump_stack(void)
14130
14131 bp = stack_frame(current, NULL);
14132 printk("Pid: %d, comm: %.20s %s %s %.*s\n",
14133- current->pid, current->comm, print_tainted(),
14134+ task_pid_nr(current), current->comm, print_tainted(),
14135 init_utsname()->release,
14136 (int)strcspn(init_utsname()->version, " "),
14137 init_utsname()->version);
14138@@ -222,6 +222,8 @@ unsigned __kprobes long oops_begin(void)
14139 }
14140 EXPORT_SYMBOL_GPL(oops_begin);
14141
14142+extern void gr_handle_kernel_exploit(void);
14143+
14144 void __kprobes oops_end(unsigned long flags, struct pt_regs *regs, int signr)
14145 {
14146 if (regs && kexec_should_crash(current))
14147@@ -243,7 +245,10 @@ void __kprobes oops_end(unsigned long flags, struct pt_regs *regs, int signr)
14148 panic("Fatal exception in interrupt");
14149 if (panic_on_oops)
14150 panic("Fatal exception");
14151- do_exit(signr);
14152+
14153+ gr_handle_kernel_exploit();
14154+
14155+ do_group_exit(signr);
14156 }
14157
14158 int __kprobes __die(const char *str, struct pt_regs *regs, long err)
14159@@ -269,7 +274,7 @@ int __kprobes __die(const char *str, struct pt_regs *regs, long err)
14160
14161 show_registers(regs);
14162 #ifdef CONFIG_X86_32
14163- if (user_mode_vm(regs)) {
14164+ if (user_mode(regs)) {
14165 sp = regs->sp;
14166 ss = regs->ss & 0xffff;
14167 } else {
14168@@ -297,7 +302,7 @@ void die(const char *str, struct pt_regs *regs, long err)
14169 unsigned long flags = oops_begin();
14170 int sig = SIGSEGV;
14171
14172- if (!user_mode_vm(regs))
14173+ if (!user_mode(regs))
14174 report_bug(regs->ip, regs);
14175
14176 if (__die(str, regs, err))
14177diff --git a/arch/x86/kernel/dumpstack_32.c b/arch/x86/kernel/dumpstack_32.c
14178index c99f9ed..2a15d80 100644
14179--- a/arch/x86/kernel/dumpstack_32.c
14180+++ b/arch/x86/kernel/dumpstack_32.c
14181@@ -38,15 +38,13 @@ void dump_trace(struct task_struct *task, struct pt_regs *regs,
14182 bp = stack_frame(task, regs);
14183
14184 for (;;) {
14185- struct thread_info *context;
14186+ void *stack_start = (void *)((unsigned long)stack & ~(THREAD_SIZE-1));
14187
14188- context = (struct thread_info *)
14189- ((unsigned long)stack & (~(THREAD_SIZE - 1)));
14190- bp = ops->walk_stack(context, stack, bp, ops, data, NULL, &graph);
14191+ bp = ops->walk_stack(task, stack_start, stack, bp, ops, data, NULL, &graph);
14192
14193- stack = (unsigned long *)context->previous_esp;
14194- if (!stack)
14195+ if (stack_start == task_stack_page(task))
14196 break;
14197+ stack = *(unsigned long **)stack_start;
14198 if (ops->stack(data, "IRQ") < 0)
14199 break;
14200 touch_nmi_watchdog();
14201@@ -96,21 +94,22 @@ void show_registers(struct pt_regs *regs)
14202 * When in-kernel, we also print out the stack and code at the
14203 * time of the fault..
14204 */
14205- if (!user_mode_vm(regs)) {
14206+ if (!user_mode(regs)) {
14207 unsigned int code_prologue = code_bytes * 43 / 64;
14208 unsigned int code_len = code_bytes;
14209 unsigned char c;
14210 u8 *ip;
14211+ unsigned long cs_base = get_desc_base(&get_cpu_gdt_table(smp_processor_id())[(0xffff & regs->cs) >> 3]);
14212
14213 printk(KERN_EMERG "Stack:\n");
14214 show_stack_log_lvl(NULL, regs, &regs->sp, 0, KERN_EMERG);
14215
14216 printk(KERN_EMERG "Code: ");
14217
14218- ip = (u8 *)regs->ip - code_prologue;
14219+ ip = (u8 *)regs->ip - code_prologue + cs_base;
14220 if (ip < (u8 *)PAGE_OFFSET || probe_kernel_address(ip, c)) {
14221 /* try starting at IP */
14222- ip = (u8 *)regs->ip;
14223+ ip = (u8 *)regs->ip + cs_base;
14224 code_len = code_len - code_prologue + 1;
14225 }
14226 for (i = 0; i < code_len; i++, ip++) {
14227@@ -119,7 +118,7 @@ void show_registers(struct pt_regs *regs)
14228 printk(KERN_CONT " Bad EIP value.");
14229 break;
14230 }
14231- if (ip == (u8 *)regs->ip)
14232+ if (ip == (u8 *)regs->ip + cs_base)
14233 printk(KERN_CONT "<%02x> ", c);
14234 else
14235 printk(KERN_CONT "%02x ", c);
14236@@ -132,6 +131,7 @@ int is_valid_bugaddr(unsigned long ip)
14237 {
14238 unsigned short ud2;
14239
14240+ ip = ktla_ktva(ip);
14241 if (ip < PAGE_OFFSET)
14242 return 0;
14243 if (probe_kernel_address((unsigned short *)ip, ud2))
14244@@ -139,3 +139,15 @@ int is_valid_bugaddr(unsigned long ip)
14245
14246 return ud2 == 0x0b0f;
14247 }
14248+
14249+#ifdef CONFIG_PAX_MEMORY_STACKLEAK
14250+void pax_check_alloca(unsigned long size)
14251+{
14252+ unsigned long sp = (unsigned long)&sp, stack_left;
14253+
14254+ /* all kernel stacks are of the same size */
14255+ stack_left = sp & (THREAD_SIZE - 1);
14256+ BUG_ON(stack_left < 256 || size >= stack_left - 256);
14257+}
14258+EXPORT_SYMBOL(pax_check_alloca);
14259+#endif
14260diff --git a/arch/x86/kernel/dumpstack_64.c b/arch/x86/kernel/dumpstack_64.c
14261index 6d728d9..279514e 100644
14262--- a/arch/x86/kernel/dumpstack_64.c
14263+++ b/arch/x86/kernel/dumpstack_64.c
14264@@ -119,9 +119,9 @@ void dump_trace(struct task_struct *task, struct pt_regs *regs,
14265 unsigned long *irq_stack_end =
14266 (unsigned long *)per_cpu(irq_stack_ptr, cpu);
14267 unsigned used = 0;
14268- struct thread_info *tinfo;
14269 int graph = 0;
14270 unsigned long dummy;
14271+ void *stack_start;
14272
14273 if (!task)
14274 task = current;
14275@@ -142,10 +142,10 @@ void dump_trace(struct task_struct *task, struct pt_regs *regs,
14276 * current stack address. If the stacks consist of nested
14277 * exceptions
14278 */
14279- tinfo = task_thread_info(task);
14280 for (;;) {
14281 char *id;
14282 unsigned long *estack_end;
14283+
14284 estack_end = in_exception_stack(cpu, (unsigned long)stack,
14285 &used, &id);
14286
14287@@ -153,7 +153,7 @@ void dump_trace(struct task_struct *task, struct pt_regs *regs,
14288 if (ops->stack(data, id) < 0)
14289 break;
14290
14291- bp = ops->walk_stack(tinfo, stack, bp, ops,
14292+ bp = ops->walk_stack(task, estack_end - EXCEPTION_STKSZ, stack, bp, ops,
14293 data, estack_end, &graph);
14294 ops->stack(data, "<EOE>");
14295 /*
14296@@ -172,7 +172,7 @@ void dump_trace(struct task_struct *task, struct pt_regs *regs,
14297 if (in_irq_stack(stack, irq_stack, irq_stack_end)) {
14298 if (ops->stack(data, "IRQ") < 0)
14299 break;
14300- bp = ops->walk_stack(tinfo, stack, bp,
14301+ bp = ops->walk_stack(task, irq_stack, stack, bp,
14302 ops, data, irq_stack_end, &graph);
14303 /*
14304 * We link to the next stack (which would be
14305@@ -191,7 +191,8 @@ void dump_trace(struct task_struct *task, struct pt_regs *regs,
14306 /*
14307 * This handles the process stack:
14308 */
14309- bp = ops->walk_stack(tinfo, stack, bp, ops, data, NULL, &graph);
14310+ stack_start = (void *)((unsigned long)stack & ~(THREAD_SIZE-1));
14311+ bp = ops->walk_stack(task, stack_start, stack, bp, ops, data, NULL, &graph);
14312 put_cpu();
14313 }
14314 EXPORT_SYMBOL(dump_trace);
14315@@ -305,3 +306,50 @@ int is_valid_bugaddr(unsigned long ip)
14316
14317 return ud2 == 0x0b0f;
14318 }
14319+
14320+#ifdef CONFIG_PAX_MEMORY_STACKLEAK
14321+void pax_check_alloca(unsigned long size)
14322+{
14323+ unsigned long sp = (unsigned long)&sp, stack_start, stack_end;
14324+ unsigned cpu, used;
14325+ char *id;
14326+
14327+ /* check the process stack first */
14328+ stack_start = (unsigned long)task_stack_page(current);
14329+ stack_end = stack_start + THREAD_SIZE;
14330+ if (likely(stack_start <= sp && sp < stack_end)) {
14331+ unsigned long stack_left = sp & (THREAD_SIZE - 1);
14332+ BUG_ON(stack_left < 256 || size >= stack_left - 256);
14333+ return;
14334+ }
14335+
14336+ cpu = get_cpu();
14337+
14338+ /* check the irq stacks */
14339+ stack_end = (unsigned long)per_cpu(irq_stack_ptr, cpu);
14340+ stack_start = stack_end - IRQ_STACK_SIZE;
14341+ if (stack_start <= sp && sp < stack_end) {
14342+ unsigned long stack_left = sp & (IRQ_STACK_SIZE - 1);
14343+ put_cpu();
14344+ BUG_ON(stack_left < 256 || size >= stack_left - 256);
14345+ return;
14346+ }
14347+
14348+ /* check the exception stacks */
14349+ used = 0;
14350+ stack_end = (unsigned long)in_exception_stack(cpu, sp, &used, &id);
14351+ stack_start = stack_end - EXCEPTION_STKSZ;
14352+ if (stack_end && stack_start <= sp && sp < stack_end) {
14353+ unsigned long stack_left = sp & (EXCEPTION_STKSZ - 1);
14354+ put_cpu();
14355+ BUG_ON(stack_left < 256 || size >= stack_left - 256);
14356+ return;
14357+ }
14358+
14359+ put_cpu();
14360+
14361+ /* unknown stack */
14362+ BUG();
14363+}
14364+EXPORT_SYMBOL(pax_check_alloca);
14365+#endif
14366diff --git a/arch/x86/kernel/early_printk.c b/arch/x86/kernel/early_printk.c
14367index cd28a35..c72ed9a 100644
14368--- a/arch/x86/kernel/early_printk.c
14369+++ b/arch/x86/kernel/early_printk.c
14370@@ -7,6 +7,7 @@
14371 #include <linux/pci_regs.h>
14372 #include <linux/pci_ids.h>
14373 #include <linux/errno.h>
14374+#include <linux/sched.h>
14375 #include <asm/io.h>
14376 #include <asm/processor.h>
14377 #include <asm/fcntl.h>
14378diff --git a/arch/x86/kernel/entry_32.S b/arch/x86/kernel/entry_32.S
14379index f3f6f53..0841b66 100644
14380--- a/arch/x86/kernel/entry_32.S
14381+++ b/arch/x86/kernel/entry_32.S
14382@@ -186,13 +186,146 @@
14383 /*CFI_REL_OFFSET gs, PT_GS*/
14384 .endm
14385 .macro SET_KERNEL_GS reg
14386+
14387+#ifdef CONFIG_CC_STACKPROTECTOR
14388 movl $(__KERNEL_STACK_CANARY), \reg
14389+#elif defined(CONFIG_PAX_MEMORY_UDEREF)
14390+ movl $(__USER_DS), \reg
14391+#else
14392+ xorl \reg, \reg
14393+#endif
14394+
14395 movl \reg, %gs
14396 .endm
14397
14398 #endif /* CONFIG_X86_32_LAZY_GS */
14399
14400-.macro SAVE_ALL
14401+.macro pax_enter_kernel
14402+#ifdef CONFIG_PAX_KERNEXEC
14403+ call pax_enter_kernel
14404+#endif
14405+.endm
14406+
14407+.macro pax_exit_kernel
14408+#ifdef CONFIG_PAX_KERNEXEC
14409+ call pax_exit_kernel
14410+#endif
14411+.endm
14412+
14413+#ifdef CONFIG_PAX_KERNEXEC
14414+ENTRY(pax_enter_kernel)
14415+#ifdef CONFIG_PARAVIRT
14416+ pushl %eax
14417+ pushl %ecx
14418+ call PARA_INDIRECT(pv_cpu_ops+PV_CPU_read_cr0)
14419+ mov %eax, %esi
14420+#else
14421+ mov %cr0, %esi
14422+#endif
14423+ bts $16, %esi
14424+ jnc 1f
14425+ mov %cs, %esi
14426+ cmp $__KERNEL_CS, %esi
14427+ jz 3f
14428+ ljmp $__KERNEL_CS, $3f
14429+1: ljmp $__KERNEXEC_KERNEL_CS, $2f
14430+2:
14431+#ifdef CONFIG_PARAVIRT
14432+ mov %esi, %eax
14433+ call PARA_INDIRECT(pv_cpu_ops+PV_CPU_write_cr0)
14434+#else
14435+ mov %esi, %cr0
14436+#endif
14437+3:
14438+#ifdef CONFIG_PARAVIRT
14439+ popl %ecx
14440+ popl %eax
14441+#endif
14442+ ret
14443+ENDPROC(pax_enter_kernel)
14444+
14445+ENTRY(pax_exit_kernel)
14446+#ifdef CONFIG_PARAVIRT
14447+ pushl %eax
14448+ pushl %ecx
14449+#endif
14450+ mov %cs, %esi
14451+ cmp $__KERNEXEC_KERNEL_CS, %esi
14452+ jnz 2f
14453+#ifdef CONFIG_PARAVIRT
14454+ call PARA_INDIRECT(pv_cpu_ops+PV_CPU_read_cr0);
14455+ mov %eax, %esi
14456+#else
14457+ mov %cr0, %esi
14458+#endif
14459+ btr $16, %esi
14460+ ljmp $__KERNEL_CS, $1f
14461+1:
14462+#ifdef CONFIG_PARAVIRT
14463+ mov %esi, %eax
14464+ call PARA_INDIRECT(pv_cpu_ops+PV_CPU_write_cr0);
14465+#else
14466+ mov %esi, %cr0
14467+#endif
14468+2:
14469+#ifdef CONFIG_PARAVIRT
14470+ popl %ecx
14471+ popl %eax
14472+#endif
14473+ ret
14474+ENDPROC(pax_exit_kernel)
14475+#endif
14476+
14477+.macro pax_erase_kstack
14478+#ifdef CONFIG_PAX_MEMORY_STACKLEAK
14479+ call pax_erase_kstack
14480+#endif
14481+.endm
14482+
14483+#ifdef CONFIG_PAX_MEMORY_STACKLEAK
14484+/*
14485+ * ebp: thread_info
14486+ * ecx, edx: can be clobbered
14487+ */
14488+ENTRY(pax_erase_kstack)
14489+ pushl %edi
14490+ pushl %eax
14491+
14492+ mov TI_lowest_stack(%ebp), %edi
14493+ mov $-0xBEEF, %eax
14494+ std
14495+
14496+1: mov %edi, %ecx
14497+ and $THREAD_SIZE_asm - 1, %ecx
14498+ shr $2, %ecx
14499+ repne scasl
14500+ jecxz 2f
14501+
14502+ cmp $2*16, %ecx
14503+ jc 2f
14504+
14505+ mov $2*16, %ecx
14506+ repe scasl
14507+ jecxz 2f
14508+ jne 1b
14509+
14510+2: cld
14511+ mov %esp, %ecx
14512+ sub %edi, %ecx
14513+ shr $2, %ecx
14514+ rep stosl
14515+
14516+ mov TI_task_thread_sp0(%ebp), %edi
14517+ sub $128, %edi
14518+ mov %edi, TI_lowest_stack(%ebp)
14519+
14520+ popl %eax
14521+ popl %edi
14522+ ret
14523+ENDPROC(pax_erase_kstack)
14524+#endif
14525+
14526+.macro __SAVE_ALL _DS
14527 cld
14528 PUSH_GS
14529 pushl_cfi %fs
14530@@ -215,7 +348,7 @@
14531 CFI_REL_OFFSET ecx, 0
14532 pushl_cfi %ebx
14533 CFI_REL_OFFSET ebx, 0
14534- movl $(__USER_DS), %edx
14535+ movl $\_DS, %edx
14536 movl %edx, %ds
14537 movl %edx, %es
14538 movl $(__KERNEL_PERCPU), %edx
14539@@ -223,6 +356,15 @@
14540 SET_KERNEL_GS %edx
14541 .endm
14542
14543+.macro SAVE_ALL
14544+#if defined(CONFIG_PAX_KERNEXEC) || defined(CONFIG_PAX_PAGEEXEC) || defined(CONFIG_PAX_SEGMEXEC) || defined(CONFIG_PAX_MEMORY_UDEREF)
14545+ __SAVE_ALL __KERNEL_DS
14546+ pax_enter_kernel
14547+#else
14548+ __SAVE_ALL __USER_DS
14549+#endif
14550+.endm
14551+
14552 .macro RESTORE_INT_REGS
14553 popl_cfi %ebx
14554 CFI_RESTORE ebx
14555@@ -308,7 +450,7 @@ ENTRY(ret_from_fork)
14556 popfl_cfi
14557 jmp syscall_exit
14558 CFI_ENDPROC
14559-END(ret_from_fork)
14560+ENDPROC(ret_from_fork)
14561
14562 /*
14563 * Interrupt exit functions should be protected against kprobes
14564@@ -333,7 +475,15 @@ check_userspace:
14565 movb PT_CS(%esp), %al
14566 andl $(X86_EFLAGS_VM | SEGMENT_RPL_MASK), %eax
14567 cmpl $USER_RPL, %eax
14568+
14569+#ifdef CONFIG_PAX_KERNEXEC
14570+ jae resume_userspace
14571+
14572+ PAX_EXIT_KERNEL
14573+ jmp resume_kernel
14574+#else
14575 jb resume_kernel # not returning to v8086 or userspace
14576+#endif
14577
14578 ENTRY(resume_userspace)
14579 LOCKDEP_SYS_EXIT
14580@@ -345,8 +495,8 @@ ENTRY(resume_userspace)
14581 andl $_TIF_WORK_MASK, %ecx # is there any work to be done on
14582 # int/exception return?
14583 jne work_pending
14584- jmp restore_all
14585-END(ret_from_exception)
14586+ jmp restore_all_pax
14587+ENDPROC(ret_from_exception)
14588
14589 #ifdef CONFIG_PREEMPT
14590 ENTRY(resume_kernel)
14591@@ -361,7 +511,7 @@ need_resched:
14592 jz restore_all
14593 call preempt_schedule_irq
14594 jmp need_resched
14595-END(resume_kernel)
14596+ENDPROC(resume_kernel)
14597 #endif
14598 CFI_ENDPROC
14599 /*
14600@@ -395,23 +545,34 @@ sysenter_past_esp:
14601 /*CFI_REL_OFFSET cs, 0*/
14602 /*
14603 * Push current_thread_info()->sysenter_return to the stack.
14604- * A tiny bit of offset fixup is necessary - 4*4 means the 4 words
14605- * pushed above; +8 corresponds to copy_thread's esp0 setting.
14606 */
14607- pushl_cfi ((TI_sysenter_return)-THREAD_SIZE+8+4*4)(%esp)
14608+ pushl_cfi $0
14609 CFI_REL_OFFSET eip, 0
14610
14611 pushl_cfi %eax
14612 SAVE_ALL
14613+ GET_THREAD_INFO(%ebp)
14614+ movl TI_sysenter_return(%ebp),%ebp
14615+ movl %ebp,PT_EIP(%esp)
14616 ENABLE_INTERRUPTS(CLBR_NONE)
14617
14618 /*
14619 * Load the potential sixth argument from user stack.
14620 * Careful about security.
14621 */
14622+ movl PT_OLDESP(%esp),%ebp
14623+
14624+#ifdef CONFIG_PAX_MEMORY_UDEREF
14625+ mov PT_OLDSS(%esp),%ds
14626+1: movl %ds:(%ebp),%ebp
14627+ push %ss
14628+ pop %ds
14629+#else
14630 cmpl $__PAGE_OFFSET-3,%ebp
14631 jae syscall_fault
14632 1: movl (%ebp),%ebp
14633+#endif
14634+
14635 movl %ebp,PT_EBP(%esp)
14636 .section __ex_table,"a"
14637 .align 4
14638@@ -434,12 +595,24 @@ sysenter_do_call:
14639 testl $_TIF_ALLWORK_MASK, %ecx
14640 jne sysexit_audit
14641 sysenter_exit:
14642+
14643+#ifdef CONFIG_PAX_RANDKSTACK
14644+ pushl_cfi %eax
14645+ movl %esp, %eax
14646+ call pax_randomize_kstack
14647+ popl_cfi %eax
14648+#endif
14649+
14650+ pax_erase_kstack
14651+
14652 /* if something modifies registers it must also disable sysexit */
14653 movl PT_EIP(%esp), %edx
14654 movl PT_OLDESP(%esp), %ecx
14655 xorl %ebp,%ebp
14656 TRACE_IRQS_ON
14657 1: mov PT_FS(%esp), %fs
14658+2: mov PT_DS(%esp), %ds
14659+3: mov PT_ES(%esp), %es
14660 PTGS_TO_GS
14661 ENABLE_INTERRUPTS_SYSEXIT
14662
14663@@ -456,6 +629,9 @@ sysenter_audit:
14664 movl %eax,%edx /* 2nd arg: syscall number */
14665 movl $AUDIT_ARCH_I386,%eax /* 1st arg: audit arch */
14666 call audit_syscall_entry
14667+
14668+ pax_erase_kstack
14669+
14670 pushl_cfi %ebx
14671 movl PT_EAX(%esp),%eax /* reload syscall number */
14672 jmp sysenter_do_call
14673@@ -482,11 +658,17 @@ sysexit_audit:
14674
14675 CFI_ENDPROC
14676 .pushsection .fixup,"ax"
14677-2: movl $0,PT_FS(%esp)
14678+4: movl $0,PT_FS(%esp)
14679+ jmp 1b
14680+5: movl $0,PT_DS(%esp)
14681+ jmp 1b
14682+6: movl $0,PT_ES(%esp)
14683 jmp 1b
14684 .section __ex_table,"a"
14685 .align 4
14686- .long 1b,2b
14687+ .long 1b,4b
14688+ .long 2b,5b
14689+ .long 3b,6b
14690 .popsection
14691 PTGS_TO_GS_EX
14692 ENDPROC(ia32_sysenter_target)
14693@@ -519,6 +701,15 @@ syscall_exit:
14694 testl $_TIF_ALLWORK_MASK, %ecx # current->work
14695 jne syscall_exit_work
14696
14697+restore_all_pax:
14698+
14699+#ifdef CONFIG_PAX_RANDKSTACK
14700+ movl %esp, %eax
14701+ call pax_randomize_kstack
14702+#endif
14703+
14704+ pax_erase_kstack
14705+
14706 restore_all:
14707 TRACE_IRQS_IRET
14708 restore_all_notrace:
14709@@ -578,14 +769,34 @@ ldt_ss:
14710 * compensating for the offset by changing to the ESPFIX segment with
14711 * a base address that matches for the difference.
14712 */
14713-#define GDT_ESPFIX_SS PER_CPU_VAR(gdt_page) + (GDT_ENTRY_ESPFIX_SS * 8)
14714+#define GDT_ESPFIX_SS (GDT_ENTRY_ESPFIX_SS * 8)(%ebx)
14715 mov %esp, %edx /* load kernel esp */
14716 mov PT_OLDESP(%esp), %eax /* load userspace esp */
14717 mov %dx, %ax /* eax: new kernel esp */
14718 sub %eax, %edx /* offset (low word is 0) */
14719+#ifdef CONFIG_SMP
14720+ movl PER_CPU_VAR(cpu_number), %ebx
14721+ shll $PAGE_SHIFT_asm, %ebx
14722+ addl $cpu_gdt_table, %ebx
14723+#else
14724+ movl $cpu_gdt_table, %ebx
14725+#endif
14726 shr $16, %edx
14727- mov %dl, GDT_ESPFIX_SS + 4 /* bits 16..23 */
14728- mov %dh, GDT_ESPFIX_SS + 7 /* bits 24..31 */
14729+
14730+#ifdef CONFIG_PAX_KERNEXEC
14731+ mov %cr0, %esi
14732+ btr $16, %esi
14733+ mov %esi, %cr0
14734+#endif
14735+
14736+ mov %dl, 4 + GDT_ESPFIX_SS /* bits 16..23 */
14737+ mov %dh, 7 + GDT_ESPFIX_SS /* bits 24..31 */
14738+
14739+#ifdef CONFIG_PAX_KERNEXEC
14740+ bts $16, %esi
14741+ mov %esi, %cr0
14742+#endif
14743+
14744 pushl_cfi $__ESPFIX_SS
14745 pushl_cfi %eax /* new kernel esp */
14746 /* Disable interrupts, but do not irqtrace this section: we
14747@@ -614,34 +825,28 @@ work_resched:
14748 movl TI_flags(%ebp), %ecx
14749 andl $_TIF_WORK_MASK, %ecx # is there any work to be done other
14750 # than syscall tracing?
14751- jz restore_all
14752+ jz restore_all_pax
14753 testb $_TIF_NEED_RESCHED, %cl
14754 jnz work_resched
14755
14756 work_notifysig: # deal with pending signals and
14757 # notify-resume requests
14758+ movl %esp, %eax
14759 #ifdef CONFIG_VM86
14760 testl $X86_EFLAGS_VM, PT_EFLAGS(%esp)
14761- movl %esp, %eax
14762- jne work_notifysig_v86 # returning to kernel-space or
14763+ jz 1f # returning to kernel-space or
14764 # vm86-space
14765- xorl %edx, %edx
14766- call do_notify_resume
14767- jmp resume_userspace_sig
14768
14769- ALIGN
14770-work_notifysig_v86:
14771 pushl_cfi %ecx # save ti_flags for do_notify_resume
14772 call save_v86_state # %eax contains pt_regs pointer
14773 popl_cfi %ecx
14774 movl %eax, %esp
14775-#else
14776- movl %esp, %eax
14777+1:
14778 #endif
14779 xorl %edx, %edx
14780 call do_notify_resume
14781 jmp resume_userspace_sig
14782-END(work_pending)
14783+ENDPROC(work_pending)
14784
14785 # perform syscall exit tracing
14786 ALIGN
14787@@ -649,11 +854,14 @@ syscall_trace_entry:
14788 movl $-ENOSYS,PT_EAX(%esp)
14789 movl %esp, %eax
14790 call syscall_trace_enter
14791+
14792+ pax_erase_kstack
14793+
14794 /* What it returned is what we'll actually use. */
14795 cmpl $(nr_syscalls), %eax
14796 jnae syscall_call
14797 jmp syscall_exit
14798-END(syscall_trace_entry)
14799+ENDPROC(syscall_trace_entry)
14800
14801 # perform syscall exit tracing
14802 ALIGN
14803@@ -666,20 +874,24 @@ syscall_exit_work:
14804 movl %esp, %eax
14805 call syscall_trace_leave
14806 jmp resume_userspace
14807-END(syscall_exit_work)
14808+ENDPROC(syscall_exit_work)
14809 CFI_ENDPROC
14810
14811 RING0_INT_FRAME # can't unwind into user space anyway
14812 syscall_fault:
14813+#ifdef CONFIG_PAX_MEMORY_UDEREF
14814+ push %ss
14815+ pop %ds
14816+#endif
14817 GET_THREAD_INFO(%ebp)
14818 movl $-EFAULT,PT_EAX(%esp)
14819 jmp resume_userspace
14820-END(syscall_fault)
14821+ENDPROC(syscall_fault)
14822
14823 syscall_badsys:
14824 movl $-ENOSYS,PT_EAX(%esp)
14825 jmp resume_userspace
14826-END(syscall_badsys)
14827+ENDPROC(syscall_badsys)
14828 CFI_ENDPROC
14829 /*
14830 * End of kprobes section
14831@@ -753,6 +965,36 @@ ptregs_clone:
14832 CFI_ENDPROC
14833 ENDPROC(ptregs_clone)
14834
14835+ ALIGN;
14836+ENTRY(kernel_execve)
14837+ CFI_STARTPROC
14838+ pushl_cfi %ebp
14839+ sub $PT_OLDSS+4,%esp
14840+ pushl_cfi %edi
14841+ pushl_cfi %ecx
14842+ pushl_cfi %eax
14843+ lea 3*4(%esp),%edi
14844+ mov $PT_OLDSS/4+1,%ecx
14845+ xorl %eax,%eax
14846+ rep stosl
14847+ popl_cfi %eax
14848+ popl_cfi %ecx
14849+ popl_cfi %edi
14850+ movl $X86_EFLAGS_IF,PT_EFLAGS(%esp)
14851+ pushl_cfi %esp
14852+ call sys_execve
14853+ add $4,%esp
14854+ CFI_ADJUST_CFA_OFFSET -4
14855+ GET_THREAD_INFO(%ebp)
14856+ test %eax,%eax
14857+ jz syscall_exit
14858+ add $PT_OLDSS+4,%esp
14859+ CFI_ADJUST_CFA_OFFSET -PT_OLDSS-4
14860+ popl_cfi %ebp
14861+ ret
14862+ CFI_ENDPROC
14863+ENDPROC(kernel_execve)
14864+
14865 .macro FIXUP_ESPFIX_STACK
14866 /*
14867 * Switch back for ESPFIX stack to the normal zerobased stack
14868@@ -762,8 +1004,15 @@ ENDPROC(ptregs_clone)
14869 * normal stack and adjusts ESP with the matching offset.
14870 */
14871 /* fixup the stack */
14872- mov GDT_ESPFIX_SS + 4, %al /* bits 16..23 */
14873- mov GDT_ESPFIX_SS + 7, %ah /* bits 24..31 */
14874+#ifdef CONFIG_SMP
14875+ movl PER_CPU_VAR(cpu_number), %ebx
14876+ shll $PAGE_SHIFT_asm, %ebx
14877+ addl $cpu_gdt_table, %ebx
14878+#else
14879+ movl $cpu_gdt_table, %ebx
14880+#endif
14881+ mov 4 + GDT_ESPFIX_SS, %al /* bits 16..23 */
14882+ mov 7 + GDT_ESPFIX_SS, %ah /* bits 24..31 */
14883 shl $16, %eax
14884 addl %esp, %eax /* the adjusted stack pointer */
14885 pushl_cfi $__KERNEL_DS
14886@@ -816,7 +1065,7 @@ vector=vector+1
14887 .endr
14888 2: jmp common_interrupt
14889 .endr
14890-END(irq_entries_start)
14891+ENDPROC(irq_entries_start)
14892
14893 .previous
14894 END(interrupt)
14895@@ -864,7 +1113,7 @@ ENTRY(coprocessor_error)
14896 pushl_cfi $do_coprocessor_error
14897 jmp error_code
14898 CFI_ENDPROC
14899-END(coprocessor_error)
14900+ENDPROC(coprocessor_error)
14901
14902 ENTRY(simd_coprocessor_error)
14903 RING0_INT_FRAME
14904@@ -885,7 +1134,7 @@ ENTRY(simd_coprocessor_error)
14905 #endif
14906 jmp error_code
14907 CFI_ENDPROC
14908-END(simd_coprocessor_error)
14909+ENDPROC(simd_coprocessor_error)
14910
14911 ENTRY(device_not_available)
14912 RING0_INT_FRAME
14913@@ -893,7 +1142,7 @@ ENTRY(device_not_available)
14914 pushl_cfi $do_device_not_available
14915 jmp error_code
14916 CFI_ENDPROC
14917-END(device_not_available)
14918+ENDPROC(device_not_available)
14919
14920 #ifdef CONFIG_PARAVIRT
14921 ENTRY(native_iret)
14922@@ -902,12 +1151,12 @@ ENTRY(native_iret)
14923 .align 4
14924 .long native_iret, iret_exc
14925 .previous
14926-END(native_iret)
14927+ENDPROC(native_iret)
14928
14929 ENTRY(native_irq_enable_sysexit)
14930 sti
14931 sysexit
14932-END(native_irq_enable_sysexit)
14933+ENDPROC(native_irq_enable_sysexit)
14934 #endif
14935
14936 ENTRY(overflow)
14937@@ -916,7 +1165,7 @@ ENTRY(overflow)
14938 pushl_cfi $do_overflow
14939 jmp error_code
14940 CFI_ENDPROC
14941-END(overflow)
14942+ENDPROC(overflow)
14943
14944 ENTRY(bounds)
14945 RING0_INT_FRAME
14946@@ -924,7 +1173,7 @@ ENTRY(bounds)
14947 pushl_cfi $do_bounds
14948 jmp error_code
14949 CFI_ENDPROC
14950-END(bounds)
14951+ENDPROC(bounds)
14952
14953 ENTRY(invalid_op)
14954 RING0_INT_FRAME
14955@@ -932,7 +1181,7 @@ ENTRY(invalid_op)
14956 pushl_cfi $do_invalid_op
14957 jmp error_code
14958 CFI_ENDPROC
14959-END(invalid_op)
14960+ENDPROC(invalid_op)
14961
14962 ENTRY(coprocessor_segment_overrun)
14963 RING0_INT_FRAME
14964@@ -940,35 +1189,35 @@ ENTRY(coprocessor_segment_overrun)
14965 pushl_cfi $do_coprocessor_segment_overrun
14966 jmp error_code
14967 CFI_ENDPROC
14968-END(coprocessor_segment_overrun)
14969+ENDPROC(coprocessor_segment_overrun)
14970
14971 ENTRY(invalid_TSS)
14972 RING0_EC_FRAME
14973 pushl_cfi $do_invalid_TSS
14974 jmp error_code
14975 CFI_ENDPROC
14976-END(invalid_TSS)
14977+ENDPROC(invalid_TSS)
14978
14979 ENTRY(segment_not_present)
14980 RING0_EC_FRAME
14981 pushl_cfi $do_segment_not_present
14982 jmp error_code
14983 CFI_ENDPROC
14984-END(segment_not_present)
14985+ENDPROC(segment_not_present)
14986
14987 ENTRY(stack_segment)
14988 RING0_EC_FRAME
14989 pushl_cfi $do_stack_segment
14990 jmp error_code
14991 CFI_ENDPROC
14992-END(stack_segment)
14993+ENDPROC(stack_segment)
14994
14995 ENTRY(alignment_check)
14996 RING0_EC_FRAME
14997 pushl_cfi $do_alignment_check
14998 jmp error_code
14999 CFI_ENDPROC
15000-END(alignment_check)
15001+ENDPROC(alignment_check)
15002
15003 ENTRY(divide_error)
15004 RING0_INT_FRAME
15005@@ -976,7 +1225,7 @@ ENTRY(divide_error)
15006 pushl_cfi $do_divide_error
15007 jmp error_code
15008 CFI_ENDPROC
15009-END(divide_error)
15010+ENDPROC(divide_error)
15011
15012 #ifdef CONFIG_X86_MCE
15013 ENTRY(machine_check)
15014@@ -985,7 +1234,7 @@ ENTRY(machine_check)
15015 pushl_cfi machine_check_vector
15016 jmp error_code
15017 CFI_ENDPROC
15018-END(machine_check)
15019+ENDPROC(machine_check)
15020 #endif
15021
15022 ENTRY(spurious_interrupt_bug)
15023@@ -994,7 +1243,7 @@ ENTRY(spurious_interrupt_bug)
15024 pushl_cfi $do_spurious_interrupt_bug
15025 jmp error_code
15026 CFI_ENDPROC
15027-END(spurious_interrupt_bug)
15028+ENDPROC(spurious_interrupt_bug)
15029 /*
15030 * End of kprobes section
15031 */
15032@@ -1109,7 +1358,7 @@ BUILD_INTERRUPT3(xen_hvm_callback_vector, XEN_HVM_EVTCHN_CALLBACK,
15033
15034 ENTRY(mcount)
15035 ret
15036-END(mcount)
15037+ENDPROC(mcount)
15038
15039 ENTRY(ftrace_caller)
15040 cmpl $0, function_trace_stop
15041@@ -1138,7 +1387,7 @@ ftrace_graph_call:
15042 .globl ftrace_stub
15043 ftrace_stub:
15044 ret
15045-END(ftrace_caller)
15046+ENDPROC(ftrace_caller)
15047
15048 #else /* ! CONFIG_DYNAMIC_FTRACE */
15049
15050@@ -1174,7 +1423,7 @@ trace:
15051 popl %ecx
15052 popl %eax
15053 jmp ftrace_stub
15054-END(mcount)
15055+ENDPROC(mcount)
15056 #endif /* CONFIG_DYNAMIC_FTRACE */
15057 #endif /* CONFIG_FUNCTION_TRACER */
15058
15059@@ -1195,7 +1444,7 @@ ENTRY(ftrace_graph_caller)
15060 popl %ecx
15061 popl %eax
15062 ret
15063-END(ftrace_graph_caller)
15064+ENDPROC(ftrace_graph_caller)
15065
15066 .globl return_to_handler
15067 return_to_handler:
15068@@ -1209,7 +1458,6 @@ return_to_handler:
15069 jmp *%ecx
15070 #endif
15071
15072-.section .rodata,"a"
15073 #include "syscall_table_32.S"
15074
15075 syscall_table_size=(.-sys_call_table)
15076@@ -1255,15 +1503,18 @@ error_code:
15077 movl $-1, PT_ORIG_EAX(%esp) # no syscall to restart
15078 REG_TO_PTGS %ecx
15079 SET_KERNEL_GS %ecx
15080- movl $(__USER_DS), %ecx
15081+ movl $(__KERNEL_DS), %ecx
15082 movl %ecx, %ds
15083 movl %ecx, %es
15084+
15085+ pax_enter_kernel
15086+
15087 TRACE_IRQS_OFF
15088 movl %esp,%eax # pt_regs pointer
15089 call *%edi
15090 jmp ret_from_exception
15091 CFI_ENDPROC
15092-END(page_fault)
15093+ENDPROC(page_fault)
15094
15095 /*
15096 * Debug traps and NMI can happen at the one SYSENTER instruction
15097@@ -1305,7 +1556,7 @@ debug_stack_correct:
15098 call do_debug
15099 jmp ret_from_exception
15100 CFI_ENDPROC
15101-END(debug)
15102+ENDPROC(debug)
15103
15104 /*
15105 * NMI is doubly nasty. It can happen _while_ we're handling
15106@@ -1342,6 +1593,9 @@ nmi_stack_correct:
15107 xorl %edx,%edx # zero error code
15108 movl %esp,%eax # pt_regs pointer
15109 call do_nmi
15110+
15111+ pax_exit_kernel
15112+
15113 jmp restore_all_notrace
15114 CFI_ENDPROC
15115
15116@@ -1378,12 +1632,15 @@ nmi_espfix_stack:
15117 FIXUP_ESPFIX_STACK # %eax == %esp
15118 xorl %edx,%edx # zero error code
15119 call do_nmi
15120+
15121+ pax_exit_kernel
15122+
15123 RESTORE_REGS
15124 lss 12+4(%esp), %esp # back to espfix stack
15125 CFI_ADJUST_CFA_OFFSET -24
15126 jmp irq_return
15127 CFI_ENDPROC
15128-END(nmi)
15129+ENDPROC(nmi)
15130
15131 ENTRY(int3)
15132 RING0_INT_FRAME
15133@@ -1395,14 +1652,14 @@ ENTRY(int3)
15134 call do_int3
15135 jmp ret_from_exception
15136 CFI_ENDPROC
15137-END(int3)
15138+ENDPROC(int3)
15139
15140 ENTRY(general_protection)
15141 RING0_EC_FRAME
15142 pushl_cfi $do_general_protection
15143 jmp error_code
15144 CFI_ENDPROC
15145-END(general_protection)
15146+ENDPROC(general_protection)
15147
15148 #ifdef CONFIG_KVM_GUEST
15149 ENTRY(async_page_fault)
15150@@ -1410,7 +1667,7 @@ ENTRY(async_page_fault)
15151 pushl_cfi $do_async_page_fault
15152 jmp error_code
15153 CFI_ENDPROC
15154-END(async_page_fault)
15155+ENDPROC(async_page_fault)
15156 #endif
15157
15158 /*
15159diff --git a/arch/x86/kernel/entry_64.S b/arch/x86/kernel/entry_64.S
15160index faf8d5e..4f16a68 100644
15161--- a/arch/x86/kernel/entry_64.S
15162+++ b/arch/x86/kernel/entry_64.S
15163@@ -55,6 +55,8 @@
15164 #include <asm/paravirt.h>
15165 #include <asm/ftrace.h>
15166 #include <asm/percpu.h>
15167+#include <asm/pgtable.h>
15168+#include <asm/alternative-asm.h>
15169
15170 /* Avoid __ASSEMBLER__'ifying <linux/audit.h> just for this. */
15171 #include <linux/elf-em.h>
15172@@ -68,8 +70,9 @@
15173 #ifdef CONFIG_FUNCTION_TRACER
15174 #ifdef CONFIG_DYNAMIC_FTRACE
15175 ENTRY(mcount)
15176+ pax_force_retaddr
15177 retq
15178-END(mcount)
15179+ENDPROC(mcount)
15180
15181 ENTRY(ftrace_caller)
15182 cmpl $0, function_trace_stop
15183@@ -92,8 +95,9 @@ GLOBAL(ftrace_graph_call)
15184 #endif
15185
15186 GLOBAL(ftrace_stub)
15187+ pax_force_retaddr
15188 retq
15189-END(ftrace_caller)
15190+ENDPROC(ftrace_caller)
15191
15192 #else /* ! CONFIG_DYNAMIC_FTRACE */
15193 ENTRY(mcount)
15194@@ -112,6 +116,7 @@ ENTRY(mcount)
15195 #endif
15196
15197 GLOBAL(ftrace_stub)
15198+ pax_force_retaddr
15199 retq
15200
15201 trace:
15202@@ -121,12 +126,13 @@ trace:
15203 movq 8(%rbp), %rsi
15204 subq $MCOUNT_INSN_SIZE, %rdi
15205
15206+ pax_force_fptr ftrace_trace_function
15207 call *ftrace_trace_function
15208
15209 MCOUNT_RESTORE_FRAME
15210
15211 jmp ftrace_stub
15212-END(mcount)
15213+ENDPROC(mcount)
15214 #endif /* CONFIG_DYNAMIC_FTRACE */
15215 #endif /* CONFIG_FUNCTION_TRACER */
15216
15217@@ -146,8 +152,9 @@ ENTRY(ftrace_graph_caller)
15218
15219 MCOUNT_RESTORE_FRAME
15220
15221+ pax_force_retaddr
15222 retq
15223-END(ftrace_graph_caller)
15224+ENDPROC(ftrace_graph_caller)
15225
15226 GLOBAL(return_to_handler)
15227 subq $24, %rsp
15228@@ -163,6 +170,7 @@ GLOBAL(return_to_handler)
15229 movq 8(%rsp), %rdx
15230 movq (%rsp), %rax
15231 addq $24, %rsp
15232+ pax_force_fptr %rdi
15233 jmp *%rdi
15234 #endif
15235
15236@@ -178,6 +186,282 @@ ENTRY(native_usergs_sysret64)
15237 ENDPROC(native_usergs_sysret64)
15238 #endif /* CONFIG_PARAVIRT */
15239
15240+ .macro ljmpq sel, off
15241+#if defined(CONFIG_MPSC) || defined(CONFIG_MCORE2) || defined (CONFIG_MATOM)
15242+ .byte 0x48; ljmp *1234f(%rip)
15243+ .pushsection .rodata
15244+ .align 16
15245+ 1234: .quad \off; .word \sel
15246+ .popsection
15247+#else
15248+ pushq $\sel
15249+ pushq $\off
15250+ lretq
15251+#endif
15252+ .endm
15253+
15254+ .macro pax_enter_kernel
15255+ pax_set_fptr_mask
15256+#ifdef CONFIG_PAX_KERNEXEC
15257+ call pax_enter_kernel
15258+#endif
15259+ .endm
15260+
15261+ .macro pax_exit_kernel
15262+#ifdef CONFIG_PAX_KERNEXEC
15263+ call pax_exit_kernel
15264+#endif
15265+ .endm
15266+
15267+#ifdef CONFIG_PAX_KERNEXEC
15268+ENTRY(pax_enter_kernel)
15269+ pushq %rdi
15270+
15271+#ifdef CONFIG_PARAVIRT
15272+ PV_SAVE_REGS(CLBR_RDI)
15273+#endif
15274+
15275+ GET_CR0_INTO_RDI
15276+ bts $16,%rdi
15277+ jnc 3f
15278+ mov %cs,%edi
15279+ cmp $__KERNEL_CS,%edi
15280+ jnz 2f
15281+1:
15282+
15283+#ifdef CONFIG_PARAVIRT
15284+ PV_RESTORE_REGS(CLBR_RDI)
15285+#endif
15286+
15287+ popq %rdi
15288+ pax_force_retaddr
15289+ retq
15290+
15291+2: ljmpq __KERNEL_CS,1f
15292+3: ljmpq __KERNEXEC_KERNEL_CS,4f
15293+4: SET_RDI_INTO_CR0
15294+ jmp 1b
15295+ENDPROC(pax_enter_kernel)
15296+
15297+ENTRY(pax_exit_kernel)
15298+ pushq %rdi
15299+
15300+#ifdef CONFIG_PARAVIRT
15301+ PV_SAVE_REGS(CLBR_RDI)
15302+#endif
15303+
15304+ mov %cs,%rdi
15305+ cmp $__KERNEXEC_KERNEL_CS,%edi
15306+ jz 2f
15307+1:
15308+
15309+#ifdef CONFIG_PARAVIRT
15310+ PV_RESTORE_REGS(CLBR_RDI);
15311+#endif
15312+
15313+ popq %rdi
15314+ pax_force_retaddr
15315+ retq
15316+
15317+2: GET_CR0_INTO_RDI
15318+ btr $16,%rdi
15319+ ljmpq __KERNEL_CS,3f
15320+3: SET_RDI_INTO_CR0
15321+ jmp 1b
15322+#ifdef CONFIG_PARAVIRT
15323+ PV_RESTORE_REGS(CLBR_RDI);
15324+#endif
15325+
15326+ popq %rdi
15327+ pax_force_retaddr
15328+ retq
15329+ENDPROC(pax_exit_kernel)
15330+#endif
15331+
15332+ .macro pax_enter_kernel_user
15333+ pax_set_fptr_mask
15334+#ifdef CONFIG_PAX_MEMORY_UDEREF
15335+ call pax_enter_kernel_user
15336+#endif
15337+ .endm
15338+
15339+ .macro pax_exit_kernel_user
15340+#ifdef CONFIG_PAX_MEMORY_UDEREF
15341+ call pax_exit_kernel_user
15342+#endif
15343+#ifdef CONFIG_PAX_RANDKSTACK
15344+ pushq %rax
15345+ call pax_randomize_kstack
15346+ popq %rax
15347+#endif
15348+ .endm
15349+
15350+#ifdef CONFIG_PAX_MEMORY_UDEREF
15351+ENTRY(pax_enter_kernel_user)
15352+ pushq %rdi
15353+ pushq %rbx
15354+
15355+#ifdef CONFIG_PARAVIRT
15356+ PV_SAVE_REGS(CLBR_RDI)
15357+#endif
15358+
15359+ GET_CR3_INTO_RDI
15360+ mov %rdi,%rbx
15361+ add $__START_KERNEL_map,%rbx
15362+ sub phys_base(%rip),%rbx
15363+
15364+#ifdef CONFIG_PARAVIRT
15365+ pushq %rdi
15366+ cmpl $0, pv_info+PARAVIRT_enabled
15367+ jz 1f
15368+ i = 0
15369+ .rept USER_PGD_PTRS
15370+ mov i*8(%rbx),%rsi
15371+ mov $0,%sil
15372+ lea i*8(%rbx),%rdi
15373+ call PARA_INDIRECT(pv_mmu_ops+PV_MMU_set_pgd_batched)
15374+ i = i + 1
15375+ .endr
15376+ jmp 2f
15377+1:
15378+#endif
15379+
15380+ i = 0
15381+ .rept USER_PGD_PTRS
15382+ movb $0,i*8(%rbx)
15383+ i = i + 1
15384+ .endr
15385+
15386+#ifdef CONFIG_PARAVIRT
15387+2: popq %rdi
15388+#endif
15389+ SET_RDI_INTO_CR3
15390+
15391+#ifdef CONFIG_PAX_KERNEXEC
15392+ GET_CR0_INTO_RDI
15393+ bts $16,%rdi
15394+ SET_RDI_INTO_CR0
15395+#endif
15396+
15397+#ifdef CONFIG_PARAVIRT
15398+ PV_RESTORE_REGS(CLBR_RDI)
15399+#endif
15400+
15401+ popq %rbx
15402+ popq %rdi
15403+ pax_force_retaddr
15404+ retq
15405+ENDPROC(pax_enter_kernel_user)
15406+
15407+ENTRY(pax_exit_kernel_user)
15408+ push %rdi
15409+
15410+#ifdef CONFIG_PARAVIRT
15411+ pushq %rbx
15412+ PV_SAVE_REGS(CLBR_RDI)
15413+#endif
15414+
15415+#ifdef CONFIG_PAX_KERNEXEC
15416+ GET_CR0_INTO_RDI
15417+ btr $16,%rdi
15418+ SET_RDI_INTO_CR0
15419+#endif
15420+
15421+ GET_CR3_INTO_RDI
15422+ add $__START_KERNEL_map,%rdi
15423+ sub phys_base(%rip),%rdi
15424+
15425+#ifdef CONFIG_PARAVIRT
15426+ cmpl $0, pv_info+PARAVIRT_enabled
15427+ jz 1f
15428+ mov %rdi,%rbx
15429+ i = 0
15430+ .rept USER_PGD_PTRS
15431+ mov i*8(%rbx),%rsi
15432+ mov $0x67,%sil
15433+ lea i*8(%rbx),%rdi
15434+ call PARA_INDIRECT(pv_mmu_ops+PV_MMU_set_pgd_batched)
15435+ i = i + 1
15436+ .endr
15437+ jmp 2f
15438+1:
15439+#endif
15440+
15441+ i = 0
15442+ .rept USER_PGD_PTRS
15443+ movb $0x67,i*8(%rdi)
15444+ i = i + 1
15445+ .endr
15446+
15447+#ifdef CONFIG_PARAVIRT
15448+2: PV_RESTORE_REGS(CLBR_RDI)
15449+ popq %rbx
15450+#endif
15451+
15452+ popq %rdi
15453+ pax_force_retaddr
15454+ retq
15455+ENDPROC(pax_exit_kernel_user)
15456+#endif
15457+
15458+.macro pax_erase_kstack
15459+#ifdef CONFIG_PAX_MEMORY_STACKLEAK
15460+ call pax_erase_kstack
15461+#endif
15462+.endm
15463+
15464+#ifdef CONFIG_PAX_MEMORY_STACKLEAK
15465+/*
15466+ * r11: thread_info
15467+ * rcx, rdx: can be clobbered
15468+ */
15469+ENTRY(pax_erase_kstack)
15470+ pushq %rdi
15471+ pushq %rax
15472+ pushq %r11
15473+
15474+ GET_THREAD_INFO(%r11)
15475+ mov TI_lowest_stack(%r11), %rdi
15476+ mov $-0xBEEF, %rax
15477+ std
15478+
15479+1: mov %edi, %ecx
15480+ and $THREAD_SIZE_asm - 1, %ecx
15481+ shr $3, %ecx
15482+ repne scasq
15483+ jecxz 2f
15484+
15485+ cmp $2*8, %ecx
15486+ jc 2f
15487+
15488+ mov $2*8, %ecx
15489+ repe scasq
15490+ jecxz 2f
15491+ jne 1b
15492+
15493+2: cld
15494+ mov %esp, %ecx
15495+ sub %edi, %ecx
15496+
15497+ cmp $THREAD_SIZE_asm, %rcx
15498+ jb 3f
15499+ ud2
15500+3:
15501+
15502+ shr $3, %ecx
15503+ rep stosq
15504+
15505+ mov TI_task_thread_sp0(%r11), %rdi
15506+ sub $256, %rdi
15507+ mov %rdi, TI_lowest_stack(%r11)
15508+
15509+ popq %r11
15510+ popq %rax
15511+ popq %rdi
15512+ pax_force_retaddr
15513+ ret
15514+ENDPROC(pax_erase_kstack)
15515+#endif
15516
15517 .macro TRACE_IRQS_IRETQ offset=ARGOFFSET
15518 #ifdef CONFIG_TRACE_IRQFLAGS
15519@@ -231,8 +515,8 @@ ENDPROC(native_usergs_sysret64)
15520 .endm
15521
15522 .macro UNFAKE_STACK_FRAME
15523- addq $8*6, %rsp
15524- CFI_ADJUST_CFA_OFFSET -(6*8)
15525+ addq $8*6 + ARG_SKIP, %rsp
15526+ CFI_ADJUST_CFA_OFFSET -(6*8 + ARG_SKIP)
15527 .endm
15528
15529 /*
15530@@ -319,7 +603,7 @@ ENDPROC(native_usergs_sysret64)
15531 movq %rsp, %rsi
15532
15533 leaq -RBP(%rsp),%rdi /* arg1 for handler */
15534- testl $3, CS(%rdi)
15535+ testb $3, CS(%rdi)
15536 je 1f
15537 SWAPGS
15538 /*
15539@@ -355,9 +639,10 @@ ENTRY(save_rest)
15540 movq_cfi r15, R15+16
15541 movq %r11, 8(%rsp) /* return address */
15542 FIXUP_TOP_OF_STACK %r11, 16
15543+ pax_force_retaddr
15544 ret
15545 CFI_ENDPROC
15546-END(save_rest)
15547+ENDPROC(save_rest)
15548
15549 /* save complete stack frame */
15550 .pushsection .kprobes.text, "ax"
15551@@ -386,9 +671,10 @@ ENTRY(save_paranoid)
15552 js 1f /* negative -> in kernel */
15553 SWAPGS
15554 xorl %ebx,%ebx
15555-1: ret
15556+1: pax_force_retaddr_bts
15557+ ret
15558 CFI_ENDPROC
15559-END(save_paranoid)
15560+ENDPROC(save_paranoid)
15561 .popsection
15562
15563 /*
15564@@ -410,7 +696,7 @@ ENTRY(ret_from_fork)
15565
15566 RESTORE_REST
15567
15568- testl $3, CS-ARGOFFSET(%rsp) # from kernel_thread?
15569+ testb $3, CS-ARGOFFSET(%rsp) # from kernel_thread?
15570 je int_ret_from_sys_call
15571
15572 testl $_TIF_IA32, TI_flags(%rcx) # 32-bit compat task needs IRET
15573@@ -420,7 +706,7 @@ ENTRY(ret_from_fork)
15574 jmp ret_from_sys_call # go to the SYSRET fastpath
15575
15576 CFI_ENDPROC
15577-END(ret_from_fork)
15578+ENDPROC(ret_from_fork)
15579
15580 /*
15581 * System call entry. Up to 6 arguments in registers are supported.
15582@@ -456,7 +742,7 @@ END(ret_from_fork)
15583 ENTRY(system_call)
15584 CFI_STARTPROC simple
15585 CFI_SIGNAL_FRAME
15586- CFI_DEF_CFA rsp,KERNEL_STACK_OFFSET
15587+ CFI_DEF_CFA rsp,0
15588 CFI_REGISTER rip,rcx
15589 /*CFI_REGISTER rflags,r11*/
15590 SWAPGS_UNSAFE_STACK
15591@@ -469,12 +755,13 @@ ENTRY(system_call_after_swapgs)
15592
15593 movq %rsp,PER_CPU_VAR(old_rsp)
15594 movq PER_CPU_VAR(kernel_stack),%rsp
15595+ SAVE_ARGS 8*6,0
15596+ pax_enter_kernel_user
15597 /*
15598 * No need to follow this irqs off/on section - it's straight
15599 * and short:
15600 */
15601 ENABLE_INTERRUPTS(CLBR_NONE)
15602- SAVE_ARGS 8,0
15603 movq %rax,ORIG_RAX-ARGOFFSET(%rsp)
15604 movq %rcx,RIP-ARGOFFSET(%rsp)
15605 CFI_REL_OFFSET rip,RIP-ARGOFFSET
15606@@ -484,7 +771,7 @@ ENTRY(system_call_after_swapgs)
15607 system_call_fastpath:
15608 cmpq $__NR_syscall_max,%rax
15609 ja badsys
15610- movq %r10,%rcx
15611+ movq R10-ARGOFFSET(%rsp),%rcx
15612 call *sys_call_table(,%rax,8) # XXX: rip relative
15613 movq %rax,RAX-ARGOFFSET(%rsp)
15614 /*
15615@@ -503,6 +790,8 @@ sysret_check:
15616 andl %edi,%edx
15617 jnz sysret_careful
15618 CFI_REMEMBER_STATE
15619+ pax_exit_kernel_user
15620+ pax_erase_kstack
15621 /*
15622 * sysretq will re-enable interrupts:
15623 */
15624@@ -554,14 +843,18 @@ badsys:
15625 * jump back to the normal fast path.
15626 */
15627 auditsys:
15628- movq %r10,%r9 /* 6th arg: 4th syscall arg */
15629+ movq R10-ARGOFFSET(%rsp),%r9 /* 6th arg: 4th syscall arg */
15630 movq %rdx,%r8 /* 5th arg: 3rd syscall arg */
15631 movq %rsi,%rcx /* 4th arg: 2nd syscall arg */
15632 movq %rdi,%rdx /* 3rd arg: 1st syscall arg */
15633 movq %rax,%rsi /* 2nd arg: syscall number */
15634 movl $AUDIT_ARCH_X86_64,%edi /* 1st arg: audit arch */
15635 call audit_syscall_entry
15636+
15637+ pax_erase_kstack
15638+
15639 LOAD_ARGS 0 /* reload call-clobbered registers */
15640+ pax_set_fptr_mask
15641 jmp system_call_fastpath
15642
15643 /*
15644@@ -591,16 +884,20 @@ tracesys:
15645 FIXUP_TOP_OF_STACK %rdi
15646 movq %rsp,%rdi
15647 call syscall_trace_enter
15648+
15649+ pax_erase_kstack
15650+
15651 /*
15652 * Reload arg registers from stack in case ptrace changed them.
15653 * We don't reload %rax because syscall_trace_enter() returned
15654 * the value it wants us to use in the table lookup.
15655 */
15656 LOAD_ARGS ARGOFFSET, 1
15657+ pax_set_fptr_mask
15658 RESTORE_REST
15659 cmpq $__NR_syscall_max,%rax
15660 ja int_ret_from_sys_call /* RAX(%rsp) set to -ENOSYS above */
15661- movq %r10,%rcx /* fixup for C */
15662+ movq R10-ARGOFFSET(%rsp),%rcx /* fixup for C */
15663 call *sys_call_table(,%rax,8)
15664 movq %rax,RAX-ARGOFFSET(%rsp)
15665 /* Use IRET because user could have changed frame */
15666@@ -612,7 +909,7 @@ tracesys:
15667 GLOBAL(int_ret_from_sys_call)
15668 DISABLE_INTERRUPTS(CLBR_NONE)
15669 TRACE_IRQS_OFF
15670- testl $3,CS-ARGOFFSET(%rsp)
15671+ testb $3,CS-ARGOFFSET(%rsp)
15672 je retint_restore_args
15673 movl $_TIF_ALLWORK_MASK,%edi
15674 /* edi: mask to check */
15675@@ -623,6 +920,7 @@ GLOBAL(int_with_check)
15676 andl %edi,%edx
15677 jnz int_careful
15678 andl $~TS_COMPAT,TI_status(%rcx)
15679+ pax_erase_kstack
15680 jmp retint_swapgs
15681
15682 /* Either reschedule or signal or syscall exit tracking needed. */
15683@@ -669,7 +967,7 @@ int_restore_rest:
15684 TRACE_IRQS_OFF
15685 jmp int_with_check
15686 CFI_ENDPROC
15687-END(system_call)
15688+ENDPROC(system_call)
15689
15690 /*
15691 * Certain special system calls that need to save a complete full stack frame.
15692@@ -685,7 +983,7 @@ ENTRY(\label)
15693 call \func
15694 jmp ptregscall_common
15695 CFI_ENDPROC
15696-END(\label)
15697+ENDPROC(\label)
15698 .endm
15699
15700 PTREGSCALL stub_clone, sys_clone, %r8
15701@@ -703,9 +1001,10 @@ ENTRY(ptregscall_common)
15702 movq_cfi_restore R12+8, r12
15703 movq_cfi_restore RBP+8, rbp
15704 movq_cfi_restore RBX+8, rbx
15705+ pax_force_retaddr
15706 ret $REST_SKIP /* pop extended registers */
15707 CFI_ENDPROC
15708-END(ptregscall_common)
15709+ENDPROC(ptregscall_common)
15710
15711 ENTRY(stub_execve)
15712 CFI_STARTPROC
15713@@ -720,7 +1019,7 @@ ENTRY(stub_execve)
15714 RESTORE_REST
15715 jmp int_ret_from_sys_call
15716 CFI_ENDPROC
15717-END(stub_execve)
15718+ENDPROC(stub_execve)
15719
15720 /*
15721 * sigreturn is special because it needs to restore all registers on return.
15722@@ -738,7 +1037,7 @@ ENTRY(stub_rt_sigreturn)
15723 RESTORE_REST
15724 jmp int_ret_from_sys_call
15725 CFI_ENDPROC
15726-END(stub_rt_sigreturn)
15727+ENDPROC(stub_rt_sigreturn)
15728
15729 /*
15730 * Build the entry stubs and pointer table with some assembler magic.
15731@@ -773,7 +1072,7 @@ vector=vector+1
15732 2: jmp common_interrupt
15733 .endr
15734 CFI_ENDPROC
15735-END(irq_entries_start)
15736+ENDPROC(irq_entries_start)
15737
15738 .previous
15739 END(interrupt)
15740@@ -793,6 +1092,16 @@ END(interrupt)
15741 subq $ORIG_RAX-RBP, %rsp
15742 CFI_ADJUST_CFA_OFFSET ORIG_RAX-RBP
15743 SAVE_ARGS_IRQ
15744+#ifdef CONFIG_PAX_MEMORY_UDEREF
15745+ testb $3, CS(%rdi)
15746+ jnz 1f
15747+ pax_enter_kernel
15748+ jmp 2f
15749+1: pax_enter_kernel_user
15750+2:
15751+#else
15752+ pax_enter_kernel
15753+#endif
15754 call \func
15755 .endm
15756
15757@@ -824,7 +1133,7 @@ ret_from_intr:
15758
15759 exit_intr:
15760 GET_THREAD_INFO(%rcx)
15761- testl $3,CS-ARGOFFSET(%rsp)
15762+ testb $3,CS-ARGOFFSET(%rsp)
15763 je retint_kernel
15764
15765 /* Interrupt came from user space */
15766@@ -846,12 +1155,15 @@ retint_swapgs: /* return to user-space */
15767 * The iretq could re-enable interrupts:
15768 */
15769 DISABLE_INTERRUPTS(CLBR_ANY)
15770+ pax_exit_kernel_user
15771 TRACE_IRQS_IRETQ
15772 SWAPGS
15773 jmp restore_args
15774
15775 retint_restore_args: /* return to kernel space */
15776 DISABLE_INTERRUPTS(CLBR_ANY)
15777+ pax_exit_kernel
15778+ pax_force_retaddr RIP-ARGOFFSET
15779 /*
15780 * The iretq could re-enable interrupts:
15781 */
15782@@ -940,7 +1252,7 @@ ENTRY(retint_kernel)
15783 #endif
15784
15785 CFI_ENDPROC
15786-END(common_interrupt)
15787+ENDPROC(common_interrupt)
15788 /*
15789 * End of kprobes section
15790 */
15791@@ -956,7 +1268,7 @@ ENTRY(\sym)
15792 interrupt \do_sym
15793 jmp ret_from_intr
15794 CFI_ENDPROC
15795-END(\sym)
15796+ENDPROC(\sym)
15797 .endm
15798
15799 #ifdef CONFIG_SMP
15800@@ -1021,12 +1333,22 @@ ENTRY(\sym)
15801 CFI_ADJUST_CFA_OFFSET ORIG_RAX-R15
15802 call error_entry
15803 DEFAULT_FRAME 0
15804+#ifdef CONFIG_PAX_MEMORY_UDEREF
15805+ testb $3, CS(%rsp)
15806+ jnz 1f
15807+ pax_enter_kernel
15808+ jmp 2f
15809+1: pax_enter_kernel_user
15810+2:
15811+#else
15812+ pax_enter_kernel
15813+#endif
15814 movq %rsp,%rdi /* pt_regs pointer */
15815 xorl %esi,%esi /* no error code */
15816 call \do_sym
15817 jmp error_exit /* %ebx: no swapgs flag */
15818 CFI_ENDPROC
15819-END(\sym)
15820+ENDPROC(\sym)
15821 .endm
15822
15823 .macro paranoidzeroentry sym do_sym
15824@@ -1038,15 +1360,25 @@ ENTRY(\sym)
15825 CFI_ADJUST_CFA_OFFSET ORIG_RAX-R15
15826 call save_paranoid
15827 TRACE_IRQS_OFF
15828+#ifdef CONFIG_PAX_MEMORY_UDEREF
15829+ testb $3, CS(%rsp)
15830+ jnz 1f
15831+ pax_enter_kernel
15832+ jmp 2f
15833+1: pax_enter_kernel_user
15834+2:
15835+#else
15836+ pax_enter_kernel
15837+#endif
15838 movq %rsp,%rdi /* pt_regs pointer */
15839 xorl %esi,%esi /* no error code */
15840 call \do_sym
15841 jmp paranoid_exit /* %ebx: no swapgs flag */
15842 CFI_ENDPROC
15843-END(\sym)
15844+ENDPROC(\sym)
15845 .endm
15846
15847-#define INIT_TSS_IST(x) PER_CPU_VAR(init_tss) + (TSS_ist + ((x) - 1) * 8)
15848+#define INIT_TSS_IST(x) (TSS_ist + ((x) - 1) * 8)(%r12)
15849 .macro paranoidzeroentry_ist sym do_sym ist
15850 ENTRY(\sym)
15851 INTR_FRAME
15852@@ -1056,14 +1388,30 @@ ENTRY(\sym)
15853 CFI_ADJUST_CFA_OFFSET ORIG_RAX-R15
15854 call save_paranoid
15855 TRACE_IRQS_OFF
15856+#ifdef CONFIG_PAX_MEMORY_UDEREF
15857+ testb $3, CS(%rsp)
15858+ jnz 1f
15859+ pax_enter_kernel
15860+ jmp 2f
15861+1: pax_enter_kernel_user
15862+2:
15863+#else
15864+ pax_enter_kernel
15865+#endif
15866 movq %rsp,%rdi /* pt_regs pointer */
15867 xorl %esi,%esi /* no error code */
15868+#ifdef CONFIG_SMP
15869+ imul $TSS_size, PER_CPU_VAR(cpu_number), %r12d
15870+ lea init_tss(%r12), %r12
15871+#else
15872+ lea init_tss(%rip), %r12
15873+#endif
15874 subq $EXCEPTION_STKSZ, INIT_TSS_IST(\ist)
15875 call \do_sym
15876 addq $EXCEPTION_STKSZ, INIT_TSS_IST(\ist)
15877 jmp paranoid_exit /* %ebx: no swapgs flag */
15878 CFI_ENDPROC
15879-END(\sym)
15880+ENDPROC(\sym)
15881 .endm
15882
15883 .macro errorentry sym do_sym
15884@@ -1074,13 +1422,23 @@ ENTRY(\sym)
15885 CFI_ADJUST_CFA_OFFSET ORIG_RAX-R15
15886 call error_entry
15887 DEFAULT_FRAME 0
15888+#ifdef CONFIG_PAX_MEMORY_UDEREF
15889+ testb $3, CS(%rsp)
15890+ jnz 1f
15891+ pax_enter_kernel
15892+ jmp 2f
15893+1: pax_enter_kernel_user
15894+2:
15895+#else
15896+ pax_enter_kernel
15897+#endif
15898 movq %rsp,%rdi /* pt_regs pointer */
15899 movq ORIG_RAX(%rsp),%rsi /* get error code */
15900 movq $-1,ORIG_RAX(%rsp) /* no syscall to restart */
15901 call \do_sym
15902 jmp error_exit /* %ebx: no swapgs flag */
15903 CFI_ENDPROC
15904-END(\sym)
15905+ENDPROC(\sym)
15906 .endm
15907
15908 /* error code is on the stack already */
15909@@ -1093,13 +1451,23 @@ ENTRY(\sym)
15910 call save_paranoid
15911 DEFAULT_FRAME 0
15912 TRACE_IRQS_OFF
15913+#ifdef CONFIG_PAX_MEMORY_UDEREF
15914+ testb $3, CS(%rsp)
15915+ jnz 1f
15916+ pax_enter_kernel
15917+ jmp 2f
15918+1: pax_enter_kernel_user
15919+2:
15920+#else
15921+ pax_enter_kernel
15922+#endif
15923 movq %rsp,%rdi /* pt_regs pointer */
15924 movq ORIG_RAX(%rsp),%rsi /* get error code */
15925 movq $-1,ORIG_RAX(%rsp) /* no syscall to restart */
15926 call \do_sym
15927 jmp paranoid_exit /* %ebx: no swapgs flag */
15928 CFI_ENDPROC
15929-END(\sym)
15930+ENDPROC(\sym)
15931 .endm
15932
15933 zeroentry divide_error do_divide_error
15934@@ -1129,9 +1497,10 @@ gs_change:
15935 2: mfence /* workaround */
15936 SWAPGS
15937 popfq_cfi
15938+ pax_force_retaddr
15939 ret
15940 CFI_ENDPROC
15941-END(native_load_gs_index)
15942+ENDPROC(native_load_gs_index)
15943
15944 .section __ex_table,"a"
15945 .align 8
15946@@ -1153,13 +1522,14 @@ ENTRY(kernel_thread_helper)
15947 * Here we are in the child and the registers are set as they were
15948 * at kernel_thread() invocation in the parent.
15949 */
15950+ pax_force_fptr %rsi
15951 call *%rsi
15952 # exit
15953 mov %eax, %edi
15954 call do_exit
15955 ud2 # padding for call trace
15956 CFI_ENDPROC
15957-END(kernel_thread_helper)
15958+ENDPROC(kernel_thread_helper)
15959
15960 /*
15961 * execve(). This function needs to use IRET, not SYSRET, to set up all state properly.
15962@@ -1186,11 +1556,11 @@ ENTRY(kernel_execve)
15963 RESTORE_REST
15964 testq %rax,%rax
15965 je int_ret_from_sys_call
15966- RESTORE_ARGS
15967 UNFAKE_STACK_FRAME
15968+ pax_force_retaddr
15969 ret
15970 CFI_ENDPROC
15971-END(kernel_execve)
15972+ENDPROC(kernel_execve)
15973
15974 /* Call softirq on interrupt stack. Interrupts are off. */
15975 ENTRY(call_softirq)
15976@@ -1208,9 +1578,10 @@ ENTRY(call_softirq)
15977 CFI_DEF_CFA_REGISTER rsp
15978 CFI_ADJUST_CFA_OFFSET -8
15979 decl PER_CPU_VAR(irq_count)
15980+ pax_force_retaddr
15981 ret
15982 CFI_ENDPROC
15983-END(call_softirq)
15984+ENDPROC(call_softirq)
15985
15986 #ifdef CONFIG_XEN
15987 zeroentry xen_hypervisor_callback xen_do_hypervisor_callback
15988@@ -1248,7 +1619,7 @@ ENTRY(xen_do_hypervisor_callback) # do_hypervisor_callback(struct *pt_regs)
15989 decl PER_CPU_VAR(irq_count)
15990 jmp error_exit
15991 CFI_ENDPROC
15992-END(xen_do_hypervisor_callback)
15993+ENDPROC(xen_do_hypervisor_callback)
15994
15995 /*
15996 * Hypervisor uses this for application faults while it executes.
15997@@ -1307,7 +1678,7 @@ ENTRY(xen_failsafe_callback)
15998 SAVE_ALL
15999 jmp error_exit
16000 CFI_ENDPROC
16001-END(xen_failsafe_callback)
16002+ENDPROC(xen_failsafe_callback)
16003
16004 apicinterrupt XEN_HVM_EVTCHN_CALLBACK \
16005 xen_hvm_callback_vector xen_evtchn_do_upcall
16006@@ -1356,16 +1727,31 @@ ENTRY(paranoid_exit)
16007 TRACE_IRQS_OFF
16008 testl %ebx,%ebx /* swapgs needed? */
16009 jnz paranoid_restore
16010- testl $3,CS(%rsp)
16011+ testb $3,CS(%rsp)
16012 jnz paranoid_userspace
16013+#ifdef CONFIG_PAX_MEMORY_UDEREF
16014+ pax_exit_kernel
16015+ TRACE_IRQS_IRETQ 0
16016+ SWAPGS_UNSAFE_STACK
16017+ RESTORE_ALL 8
16018+ pax_force_retaddr_bts
16019+ jmp irq_return
16020+#endif
16021 paranoid_swapgs:
16022+#ifdef CONFIG_PAX_MEMORY_UDEREF
16023+ pax_exit_kernel_user
16024+#else
16025+ pax_exit_kernel
16026+#endif
16027 TRACE_IRQS_IRETQ 0
16028 SWAPGS_UNSAFE_STACK
16029 RESTORE_ALL 8
16030 jmp irq_return
16031 paranoid_restore:
16032+ pax_exit_kernel
16033 TRACE_IRQS_IRETQ 0
16034 RESTORE_ALL 8
16035+ pax_force_retaddr_bts
16036 jmp irq_return
16037 paranoid_userspace:
16038 GET_THREAD_INFO(%rcx)
16039@@ -1394,7 +1780,7 @@ paranoid_schedule:
16040 TRACE_IRQS_OFF
16041 jmp paranoid_userspace
16042 CFI_ENDPROC
16043-END(paranoid_exit)
16044+ENDPROC(paranoid_exit)
16045
16046 /*
16047 * Exception entry point. This expects an error code/orig_rax on the stack.
16048@@ -1421,12 +1807,13 @@ ENTRY(error_entry)
16049 movq_cfi r14, R14+8
16050 movq_cfi r15, R15+8
16051 xorl %ebx,%ebx
16052- testl $3,CS+8(%rsp)
16053+ testb $3,CS+8(%rsp)
16054 je error_kernelspace
16055 error_swapgs:
16056 SWAPGS
16057 error_sti:
16058 TRACE_IRQS_OFF
16059+ pax_force_retaddr_bts
16060 ret
16061
16062 /*
16063@@ -1453,7 +1840,7 @@ bstep_iret:
16064 movq %rcx,RIP+8(%rsp)
16065 jmp error_swapgs
16066 CFI_ENDPROC
16067-END(error_entry)
16068+ENDPROC(error_entry)
16069
16070
16071 /* ebx: no swapgs flag (1: don't need swapgs, 0: need it) */
16072@@ -1473,7 +1860,7 @@ ENTRY(error_exit)
16073 jnz retint_careful
16074 jmp retint_swapgs
16075 CFI_ENDPROC
16076-END(error_exit)
16077+ENDPROC(error_exit)
16078
16079
16080 /* runs on exception stack */
16081@@ -1485,6 +1872,16 @@ ENTRY(nmi)
16082 CFI_ADJUST_CFA_OFFSET ORIG_RAX-R15
16083 call save_paranoid
16084 DEFAULT_FRAME 0
16085+#ifdef CONFIG_PAX_MEMORY_UDEREF
16086+ testb $3, CS(%rsp)
16087+ jnz 1f
16088+ pax_enter_kernel
16089+ jmp 2f
16090+1: pax_enter_kernel_user
16091+2:
16092+#else
16093+ pax_enter_kernel
16094+#endif
16095 /* paranoidentry do_nmi, 0; without TRACE_IRQS_OFF */
16096 movq %rsp,%rdi
16097 movq $-1,%rsi
16098@@ -1495,12 +1892,28 @@ ENTRY(nmi)
16099 DISABLE_INTERRUPTS(CLBR_NONE)
16100 testl %ebx,%ebx /* swapgs needed? */
16101 jnz nmi_restore
16102- testl $3,CS(%rsp)
16103+ testb $3,CS(%rsp)
16104 jnz nmi_userspace
16105+#ifdef CONFIG_PAX_MEMORY_UDEREF
16106+ pax_exit_kernel
16107+ SWAPGS_UNSAFE_STACK
16108+ RESTORE_ALL 8
16109+ pax_force_retaddr_bts
16110+ jmp irq_return
16111+#endif
16112 nmi_swapgs:
16113+#ifdef CONFIG_PAX_MEMORY_UDEREF
16114+ pax_exit_kernel_user
16115+#else
16116+ pax_exit_kernel
16117+#endif
16118 SWAPGS_UNSAFE_STACK
16119+ RESTORE_ALL 8
16120+ jmp irq_return
16121 nmi_restore:
16122+ pax_exit_kernel
16123 RESTORE_ALL 8
16124+ pax_force_retaddr_bts
16125 jmp irq_return
16126 nmi_userspace:
16127 GET_THREAD_INFO(%rcx)
16128@@ -1529,14 +1942,14 @@ nmi_schedule:
16129 jmp paranoid_exit
16130 CFI_ENDPROC
16131 #endif
16132-END(nmi)
16133+ENDPROC(nmi)
16134
16135 ENTRY(ignore_sysret)
16136 CFI_STARTPROC
16137 mov $-ENOSYS,%eax
16138 sysret
16139 CFI_ENDPROC
16140-END(ignore_sysret)
16141+ENDPROC(ignore_sysret)
16142
16143 /*
16144 * End of kprobes section
16145diff --git a/arch/x86/kernel/ftrace.c b/arch/x86/kernel/ftrace.c
16146index c9a281f..ce2f317 100644
16147--- a/arch/x86/kernel/ftrace.c
16148+++ b/arch/x86/kernel/ftrace.c
16149@@ -126,7 +126,7 @@ static void *mod_code_ip; /* holds the IP to write to */
16150 static const void *mod_code_newcode; /* holds the text to write to the IP */
16151
16152 static unsigned nmi_wait_count;
16153-static atomic_t nmi_update_count = ATOMIC_INIT(0);
16154+static atomic_unchecked_t nmi_update_count = ATOMIC_INIT(0);
16155
16156 int ftrace_arch_read_dyn_info(char *buf, int size)
16157 {
16158@@ -134,7 +134,7 @@ int ftrace_arch_read_dyn_info(char *buf, int size)
16159
16160 r = snprintf(buf, size, "%u %u",
16161 nmi_wait_count,
16162- atomic_read(&nmi_update_count));
16163+ atomic_read_unchecked(&nmi_update_count));
16164 return r;
16165 }
16166
16167@@ -177,8 +177,10 @@ void ftrace_nmi_enter(void)
16168
16169 if (atomic_inc_return(&nmi_running) & MOD_CODE_WRITE_FLAG) {
16170 smp_rmb();
16171+ pax_open_kernel();
16172 ftrace_mod_code();
16173- atomic_inc(&nmi_update_count);
16174+ pax_close_kernel();
16175+ atomic_inc_unchecked(&nmi_update_count);
16176 }
16177 /* Must have previous changes seen before executions */
16178 smp_mb();
16179@@ -271,6 +273,8 @@ ftrace_modify_code(unsigned long ip, unsigned const char *old_code,
16180 {
16181 unsigned char replaced[MCOUNT_INSN_SIZE];
16182
16183+ ip = ktla_ktva(ip);
16184+
16185 /*
16186 * Note: Due to modules and __init, code can
16187 * disappear and change, we need to protect against faulting
16188@@ -327,7 +331,7 @@ int ftrace_update_ftrace_func(ftrace_func_t func)
16189 unsigned char old[MCOUNT_INSN_SIZE], *new;
16190 int ret;
16191
16192- memcpy(old, &ftrace_call, MCOUNT_INSN_SIZE);
16193+ memcpy(old, (void *)ktla_ktva((unsigned long)ftrace_call), MCOUNT_INSN_SIZE);
16194 new = ftrace_call_replace(ip, (unsigned long)func);
16195 ret = ftrace_modify_code(ip, old, new);
16196
16197@@ -353,6 +357,8 @@ static int ftrace_mod_jmp(unsigned long ip,
16198 {
16199 unsigned char code[MCOUNT_INSN_SIZE];
16200
16201+ ip = ktla_ktva(ip);
16202+
16203 if (probe_kernel_read(code, (void *)ip, MCOUNT_INSN_SIZE))
16204 return -EFAULT;
16205
16206diff --git a/arch/x86/kernel/head32.c b/arch/x86/kernel/head32.c
16207index 3bb0850..55a56f4 100644
16208--- a/arch/x86/kernel/head32.c
16209+++ b/arch/x86/kernel/head32.c
16210@@ -19,6 +19,7 @@
16211 #include <asm/io_apic.h>
16212 #include <asm/bios_ebda.h>
16213 #include <asm/tlbflush.h>
16214+#include <asm/boot.h>
16215
16216 static void __init i386_default_early_setup(void)
16217 {
16218@@ -33,7 +34,7 @@ void __init i386_start_kernel(void)
16219 {
16220 memblock_init();
16221
16222- memblock_x86_reserve_range(__pa_symbol(&_text), __pa_symbol(&__bss_stop), "TEXT DATA BSS");
16223+ memblock_x86_reserve_range(LOAD_PHYSICAL_ADDR, __pa_symbol(&__bss_stop), "TEXT DATA BSS");
16224
16225 #ifdef CONFIG_BLK_DEV_INITRD
16226 /* Reserve INITRD */
16227diff --git a/arch/x86/kernel/head_32.S b/arch/x86/kernel/head_32.S
16228index ce0be7c..c41476e 100644
16229--- a/arch/x86/kernel/head_32.S
16230+++ b/arch/x86/kernel/head_32.S
16231@@ -25,6 +25,12 @@
16232 /* Physical address */
16233 #define pa(X) ((X) - __PAGE_OFFSET)
16234
16235+#ifdef CONFIG_PAX_KERNEXEC
16236+#define ta(X) (X)
16237+#else
16238+#define ta(X) ((X) - __PAGE_OFFSET)
16239+#endif
16240+
16241 /*
16242 * References to members of the new_cpu_data structure.
16243 */
16244@@ -54,11 +60,7 @@
16245 * and small than max_low_pfn, otherwise will waste some page table entries
16246 */
16247
16248-#if PTRS_PER_PMD > 1
16249-#define PAGE_TABLE_SIZE(pages) (((pages) / PTRS_PER_PMD) + PTRS_PER_PGD)
16250-#else
16251-#define PAGE_TABLE_SIZE(pages) ((pages) / PTRS_PER_PGD)
16252-#endif
16253+#define PAGE_TABLE_SIZE(pages) ((pages) / PTRS_PER_PTE)
16254
16255 /* Number of possible pages in the lowmem region */
16256 LOWMEM_PAGES = (((1<<32) - __PAGE_OFFSET) >> PAGE_SHIFT)
16257@@ -77,6 +79,12 @@ INIT_MAP_SIZE = PAGE_TABLE_SIZE(KERNEL_PAGES) * PAGE_SIZE
16258 RESERVE_BRK(pagetables, INIT_MAP_SIZE)
16259
16260 /*
16261+ * Real beginning of normal "text" segment
16262+ */
16263+ENTRY(stext)
16264+ENTRY(_stext)
16265+
16266+/*
16267 * 32-bit kernel entrypoint; only used by the boot CPU. On entry,
16268 * %esi points to the real-mode code as a 32-bit pointer.
16269 * CS and DS must be 4 GB flat segments, but we don't depend on
16270@@ -84,6 +92,13 @@ RESERVE_BRK(pagetables, INIT_MAP_SIZE)
16271 * can.
16272 */
16273 __HEAD
16274+
16275+#ifdef CONFIG_PAX_KERNEXEC
16276+ jmp startup_32
16277+/* PaX: fill first page in .text with int3 to catch NULL derefs in kernel mode */
16278+.fill PAGE_SIZE-5,1,0xcc
16279+#endif
16280+
16281 ENTRY(startup_32)
16282 movl pa(stack_start),%ecx
16283
16284@@ -105,6 +120,57 @@ ENTRY(startup_32)
16285 2:
16286 leal -__PAGE_OFFSET(%ecx),%esp
16287
16288+#ifdef CONFIG_SMP
16289+ movl $pa(cpu_gdt_table),%edi
16290+ movl $__per_cpu_load,%eax
16291+ movw %ax,__KERNEL_PERCPU + 2(%edi)
16292+ rorl $16,%eax
16293+ movb %al,__KERNEL_PERCPU + 4(%edi)
16294+ movb %ah,__KERNEL_PERCPU + 7(%edi)
16295+ movl $__per_cpu_end - 1,%eax
16296+ subl $__per_cpu_start,%eax
16297+ movw %ax,__KERNEL_PERCPU + 0(%edi)
16298+#endif
16299+
16300+#ifdef CONFIG_PAX_MEMORY_UDEREF
16301+ movl $NR_CPUS,%ecx
16302+ movl $pa(cpu_gdt_table),%edi
16303+1:
16304+ movl $((((__PAGE_OFFSET-1) & 0xf0000000) >> 12) | 0x00c09700),GDT_ENTRY_KERNEL_DS * 8 + 4(%edi)
16305+ movl $((((__PAGE_OFFSET-1) & 0xf0000000) >> 12) | 0x00c0fb00),GDT_ENTRY_DEFAULT_USER_CS * 8 + 4(%edi)
16306+ movl $((((__PAGE_OFFSET-1) & 0xf0000000) >> 12) | 0x00c0f300),GDT_ENTRY_DEFAULT_USER_DS * 8 + 4(%edi)
16307+ addl $PAGE_SIZE_asm,%edi
16308+ loop 1b
16309+#endif
16310+
16311+#ifdef CONFIG_PAX_KERNEXEC
16312+ movl $pa(boot_gdt),%edi
16313+ movl $__LOAD_PHYSICAL_ADDR,%eax
16314+ movw %ax,__BOOT_CS + 2(%edi)
16315+ rorl $16,%eax
16316+ movb %al,__BOOT_CS + 4(%edi)
16317+ movb %ah,__BOOT_CS + 7(%edi)
16318+ rorl $16,%eax
16319+
16320+ ljmp $(__BOOT_CS),$1f
16321+1:
16322+
16323+ movl $NR_CPUS,%ecx
16324+ movl $pa(cpu_gdt_table),%edi
16325+ addl $__PAGE_OFFSET,%eax
16326+1:
16327+ movw %ax,__KERNEL_CS + 2(%edi)
16328+ movw %ax,__KERNEXEC_KERNEL_CS + 2(%edi)
16329+ rorl $16,%eax
16330+ movb %al,__KERNEL_CS + 4(%edi)
16331+ movb %al,__KERNEXEC_KERNEL_CS + 4(%edi)
16332+ movb %ah,__KERNEL_CS + 7(%edi)
16333+ movb %ah,__KERNEXEC_KERNEL_CS + 7(%edi)
16334+ rorl $16,%eax
16335+ addl $PAGE_SIZE_asm,%edi
16336+ loop 1b
16337+#endif
16338+
16339 /*
16340 * Clear BSS first so that there are no surprises...
16341 */
16342@@ -195,8 +261,11 @@ ENTRY(startup_32)
16343 movl %eax, pa(max_pfn_mapped)
16344
16345 /* Do early initialization of the fixmap area */
16346- movl $pa(initial_pg_fixmap)+PDE_IDENT_ATTR,%eax
16347- movl %eax,pa(initial_pg_pmd+0x1000*KPMDS-8)
16348+#ifdef CONFIG_COMPAT_VDSO
16349+ movl $pa(initial_pg_fixmap)+PDE_IDENT_ATTR+_PAGE_USER,pa(initial_pg_pmd+0x1000*KPMDS-8)
16350+#else
16351+ movl $pa(initial_pg_fixmap)+PDE_IDENT_ATTR,pa(initial_pg_pmd+0x1000*KPMDS-8)
16352+#endif
16353 #else /* Not PAE */
16354
16355 page_pde_offset = (__PAGE_OFFSET >> 20);
16356@@ -226,8 +295,11 @@ page_pde_offset = (__PAGE_OFFSET >> 20);
16357 movl %eax, pa(max_pfn_mapped)
16358
16359 /* Do early initialization of the fixmap area */
16360- movl $pa(initial_pg_fixmap)+PDE_IDENT_ATTR,%eax
16361- movl %eax,pa(initial_page_table+0xffc)
16362+#ifdef CONFIG_COMPAT_VDSO
16363+ movl $pa(initial_pg_fixmap)+PDE_IDENT_ATTR+_PAGE_USER,pa(initial_page_table+0xffc)
16364+#else
16365+ movl $pa(initial_pg_fixmap)+PDE_IDENT_ATTR,pa(initial_page_table+0xffc)
16366+#endif
16367 #endif
16368
16369 #ifdef CONFIG_PARAVIRT
16370@@ -241,9 +313,7 @@ page_pde_offset = (__PAGE_OFFSET >> 20);
16371 cmpl $num_subarch_entries, %eax
16372 jae bad_subarch
16373
16374- movl pa(subarch_entries)(,%eax,4), %eax
16375- subl $__PAGE_OFFSET, %eax
16376- jmp *%eax
16377+ jmp *pa(subarch_entries)(,%eax,4)
16378
16379 bad_subarch:
16380 WEAK(lguest_entry)
16381@@ -255,10 +325,10 @@ WEAK(xen_entry)
16382 __INITDATA
16383
16384 subarch_entries:
16385- .long default_entry /* normal x86/PC */
16386- .long lguest_entry /* lguest hypervisor */
16387- .long xen_entry /* Xen hypervisor */
16388- .long default_entry /* Moorestown MID */
16389+ .long ta(default_entry) /* normal x86/PC */
16390+ .long ta(lguest_entry) /* lguest hypervisor */
16391+ .long ta(xen_entry) /* Xen hypervisor */
16392+ .long ta(default_entry) /* Moorestown MID */
16393 num_subarch_entries = (. - subarch_entries) / 4
16394 .previous
16395 #else
16396@@ -312,6 +382,7 @@ default_entry:
16397 orl %edx,%eax
16398 movl %eax,%cr4
16399
16400+#ifdef CONFIG_X86_PAE
16401 testb $X86_CR4_PAE, %al # check if PAE is enabled
16402 jz 6f
16403
16404@@ -340,6 +411,9 @@ default_entry:
16405 /* Make changes effective */
16406 wrmsr
16407
16408+ btsl $_PAGE_BIT_NX-32,pa(__supported_pte_mask+4)
16409+#endif
16410+
16411 6:
16412
16413 /*
16414@@ -443,7 +517,7 @@ is386: movl $2,%ecx # set MP
16415 1: movl $(__KERNEL_DS),%eax # reload all the segment registers
16416 movl %eax,%ss # after changing gdt.
16417
16418- movl $(__USER_DS),%eax # DS/ES contains default USER segment
16419+# movl $(__KERNEL_DS),%eax # DS/ES contains default KERNEL segment
16420 movl %eax,%ds
16421 movl %eax,%es
16422
16423@@ -457,15 +531,22 @@ is386: movl $2,%ecx # set MP
16424 */
16425 cmpb $0,ready
16426 jne 1f
16427- movl $gdt_page,%eax
16428+ movl $cpu_gdt_table,%eax
16429 movl $stack_canary,%ecx
16430+#ifdef CONFIG_SMP
16431+ addl $__per_cpu_load,%ecx
16432+#endif
16433 movw %cx, 8 * GDT_ENTRY_STACK_CANARY + 2(%eax)
16434 shrl $16, %ecx
16435 movb %cl, 8 * GDT_ENTRY_STACK_CANARY + 4(%eax)
16436 movb %ch, 8 * GDT_ENTRY_STACK_CANARY + 7(%eax)
16437 1:
16438-#endif
16439 movl $(__KERNEL_STACK_CANARY),%eax
16440+#elif defined(CONFIG_PAX_MEMORY_UDEREF)
16441+ movl $(__USER_DS),%eax
16442+#else
16443+ xorl %eax,%eax
16444+#endif
16445 movl %eax,%gs
16446
16447 xorl %eax,%eax # Clear LDT
16448@@ -558,22 +639,22 @@ early_page_fault:
16449 jmp early_fault
16450
16451 early_fault:
16452- cld
16453 #ifdef CONFIG_PRINTK
16454+ cmpl $1,%ss:early_recursion_flag
16455+ je hlt_loop
16456+ incl %ss:early_recursion_flag
16457+ cld
16458 pusha
16459 movl $(__KERNEL_DS),%eax
16460 movl %eax,%ds
16461 movl %eax,%es
16462- cmpl $2,early_recursion_flag
16463- je hlt_loop
16464- incl early_recursion_flag
16465 movl %cr2,%eax
16466 pushl %eax
16467 pushl %edx /* trapno */
16468 pushl $fault_msg
16469 call printk
16470+; call dump_stack
16471 #endif
16472- call dump_stack
16473 hlt_loop:
16474 hlt
16475 jmp hlt_loop
16476@@ -581,8 +662,11 @@ hlt_loop:
16477 /* This is the default interrupt "handler" :-) */
16478 ALIGN
16479 ignore_int:
16480- cld
16481 #ifdef CONFIG_PRINTK
16482+ cmpl $2,%ss:early_recursion_flag
16483+ je hlt_loop
16484+ incl %ss:early_recursion_flag
16485+ cld
16486 pushl %eax
16487 pushl %ecx
16488 pushl %edx
16489@@ -591,9 +675,6 @@ ignore_int:
16490 movl $(__KERNEL_DS),%eax
16491 movl %eax,%ds
16492 movl %eax,%es
16493- cmpl $2,early_recursion_flag
16494- je hlt_loop
16495- incl early_recursion_flag
16496 pushl 16(%esp)
16497 pushl 24(%esp)
16498 pushl 32(%esp)
16499@@ -622,29 +703,43 @@ ENTRY(initial_code)
16500 /*
16501 * BSS section
16502 */
16503-__PAGE_ALIGNED_BSS
16504- .align PAGE_SIZE
16505 #ifdef CONFIG_X86_PAE
16506+.section .initial_pg_pmd,"a",@progbits
16507 initial_pg_pmd:
16508 .fill 1024*KPMDS,4,0
16509 #else
16510+.section .initial_page_table,"a",@progbits
16511 ENTRY(initial_page_table)
16512 .fill 1024,4,0
16513 #endif
16514+.section .initial_pg_fixmap,"a",@progbits
16515 initial_pg_fixmap:
16516 .fill 1024,4,0
16517+.section .empty_zero_page,"a",@progbits
16518 ENTRY(empty_zero_page)
16519 .fill 4096,1,0
16520+.section .swapper_pg_dir,"a",@progbits
16521 ENTRY(swapper_pg_dir)
16522+#ifdef CONFIG_X86_PAE
16523+ .fill 4,8,0
16524+#else
16525 .fill 1024,4,0
16526+#endif
16527+
16528+/*
16529+ * The IDT has to be page-aligned to simplify the Pentium
16530+ * F0 0F bug workaround.. We have a special link segment
16531+ * for this.
16532+ */
16533+.section .idt,"a",@progbits
16534+ENTRY(idt_table)
16535+ .fill 256,8,0
16536
16537 /*
16538 * This starts the data section.
16539 */
16540 #ifdef CONFIG_X86_PAE
16541-__PAGE_ALIGNED_DATA
16542- /* Page-aligned for the benefit of paravirt? */
16543- .align PAGE_SIZE
16544+.section .initial_page_table,"a",@progbits
16545 ENTRY(initial_page_table)
16546 .long pa(initial_pg_pmd+PGD_IDENT_ATTR),0 /* low identity map */
16547 # if KPMDS == 3
16548@@ -663,18 +758,27 @@ ENTRY(initial_page_table)
16549 # error "Kernel PMDs should be 1, 2 or 3"
16550 # endif
16551 .align PAGE_SIZE /* needs to be page-sized too */
16552+
16553+#ifdef CONFIG_PAX_PER_CPU_PGD
16554+ENTRY(cpu_pgd)
16555+ .rept NR_CPUS
16556+ .fill 4,8,0
16557+ .endr
16558+#endif
16559+
16560 #endif
16561
16562 .data
16563 .balign 4
16564 ENTRY(stack_start)
16565- .long init_thread_union+THREAD_SIZE
16566+ .long init_thread_union+THREAD_SIZE-8
16567
16568+ready: .byte 0
16569+
16570+.section .rodata,"a",@progbits
16571 early_recursion_flag:
16572 .long 0
16573
16574-ready: .byte 0
16575-
16576 int_msg:
16577 .asciz "Unknown interrupt or fault at: %p %p %p\n"
16578
16579@@ -707,7 +811,7 @@ fault_msg:
16580 .word 0 # 32 bit align gdt_desc.address
16581 boot_gdt_descr:
16582 .word __BOOT_DS+7
16583- .long boot_gdt - __PAGE_OFFSET
16584+ .long pa(boot_gdt)
16585
16586 .word 0 # 32-bit align idt_desc.address
16587 idt_descr:
16588@@ -718,7 +822,7 @@ idt_descr:
16589 .word 0 # 32 bit align gdt_desc.address
16590 ENTRY(early_gdt_descr)
16591 .word GDT_ENTRIES*8-1
16592- .long gdt_page /* Overwritten for secondary CPUs */
16593+ .long cpu_gdt_table /* Overwritten for secondary CPUs */
16594
16595 /*
16596 * The boot_gdt must mirror the equivalent in setup.S and is
16597@@ -727,5 +831,65 @@ ENTRY(early_gdt_descr)
16598 .align L1_CACHE_BYTES
16599 ENTRY(boot_gdt)
16600 .fill GDT_ENTRY_BOOT_CS,8,0
16601- .quad 0x00cf9a000000ffff /* kernel 4GB code at 0x00000000 */
16602- .quad 0x00cf92000000ffff /* kernel 4GB data at 0x00000000 */
16603+ .quad 0x00cf9b000000ffff /* kernel 4GB code at 0x00000000 */
16604+ .quad 0x00cf93000000ffff /* kernel 4GB data at 0x00000000 */
16605+
16606+ .align PAGE_SIZE_asm
16607+ENTRY(cpu_gdt_table)
16608+ .rept NR_CPUS
16609+ .quad 0x0000000000000000 /* NULL descriptor */
16610+ .quad 0x0000000000000000 /* 0x0b reserved */
16611+ .quad 0x0000000000000000 /* 0x13 reserved */
16612+ .quad 0x0000000000000000 /* 0x1b reserved */
16613+
16614+#ifdef CONFIG_PAX_KERNEXEC
16615+ .quad 0x00cf9b000000ffff /* 0x20 alternate kernel 4GB code at 0x00000000 */
16616+#else
16617+ .quad 0x0000000000000000 /* 0x20 unused */
16618+#endif
16619+
16620+ .quad 0x0000000000000000 /* 0x28 unused */
16621+ .quad 0x0000000000000000 /* 0x33 TLS entry 1 */
16622+ .quad 0x0000000000000000 /* 0x3b TLS entry 2 */
16623+ .quad 0x0000000000000000 /* 0x43 TLS entry 3 */
16624+ .quad 0x0000000000000000 /* 0x4b reserved */
16625+ .quad 0x0000000000000000 /* 0x53 reserved */
16626+ .quad 0x0000000000000000 /* 0x5b reserved */
16627+
16628+ .quad 0x00cf9b000000ffff /* 0x60 kernel 4GB code at 0x00000000 */
16629+ .quad 0x00cf93000000ffff /* 0x68 kernel 4GB data at 0x00000000 */
16630+ .quad 0x00cffb000000ffff /* 0x73 user 4GB code at 0x00000000 */
16631+ .quad 0x00cff3000000ffff /* 0x7b user 4GB data at 0x00000000 */
16632+
16633+ .quad 0x0000000000000000 /* 0x80 TSS descriptor */
16634+ .quad 0x0000000000000000 /* 0x88 LDT descriptor */
16635+
16636+ /*
16637+ * Segments used for calling PnP BIOS have byte granularity.
16638+ * The code segments and data segments have fixed 64k limits,
16639+ * the transfer segment sizes are set at run time.
16640+ */
16641+ .quad 0x00409b000000ffff /* 0x90 32-bit code */
16642+ .quad 0x00009b000000ffff /* 0x98 16-bit code */
16643+ .quad 0x000093000000ffff /* 0xa0 16-bit data */
16644+ .quad 0x0000930000000000 /* 0xa8 16-bit data */
16645+ .quad 0x0000930000000000 /* 0xb0 16-bit data */
16646+
16647+ /*
16648+ * The APM segments have byte granularity and their bases
16649+ * are set at run time. All have 64k limits.
16650+ */
16651+ .quad 0x00409b000000ffff /* 0xb8 APM CS code */
16652+ .quad 0x00009b000000ffff /* 0xc0 APM CS 16 code (16 bit) */
16653+ .quad 0x004093000000ffff /* 0xc8 APM DS data */
16654+
16655+ .quad 0x00c0930000000000 /* 0xd0 - ESPFIX SS */
16656+ .quad 0x0040930000000000 /* 0xd8 - PERCPU */
16657+ .quad 0x0040910000000017 /* 0xe0 - STACK_CANARY */
16658+ .quad 0x0000000000000000 /* 0xe8 - PCIBIOS_CS */
16659+ .quad 0x0000000000000000 /* 0xf0 - PCIBIOS_DS */
16660+ .quad 0x0000000000000000 /* 0xf8 - GDT entry 31: double-fault TSS */
16661+
16662+ /* Be sure this is zeroed to avoid false validations in Xen */
16663+ .fill PAGE_SIZE_asm - GDT_SIZE,1,0
16664+ .endr
16665diff --git a/arch/x86/kernel/head_64.S b/arch/x86/kernel/head_64.S
16666index e11e394..9aebc5d 100644
16667--- a/arch/x86/kernel/head_64.S
16668+++ b/arch/x86/kernel/head_64.S
16669@@ -19,6 +19,8 @@
16670 #include <asm/cache.h>
16671 #include <asm/processor-flags.h>
16672 #include <asm/percpu.h>
16673+#include <asm/cpufeature.h>
16674+#include <asm/alternative-asm.h>
16675
16676 #ifdef CONFIG_PARAVIRT
16677 #include <asm/asm-offsets.h>
16678@@ -38,6 +40,12 @@ L4_PAGE_OFFSET = pgd_index(__PAGE_OFFSET)
16679 L3_PAGE_OFFSET = pud_index(__PAGE_OFFSET)
16680 L4_START_KERNEL = pgd_index(__START_KERNEL_map)
16681 L3_START_KERNEL = pud_index(__START_KERNEL_map)
16682+L4_VMALLOC_START = pgd_index(VMALLOC_START)
16683+L3_VMALLOC_START = pud_index(VMALLOC_START)
16684+L4_VMALLOC_END = pgd_index(VMALLOC_END)
16685+L3_VMALLOC_END = pud_index(VMALLOC_END)
16686+L4_VMEMMAP_START = pgd_index(VMEMMAP_START)
16687+L3_VMEMMAP_START = pud_index(VMEMMAP_START)
16688
16689 .text
16690 __HEAD
16691@@ -85,35 +93,23 @@ startup_64:
16692 */
16693 addq %rbp, init_level4_pgt + 0(%rip)
16694 addq %rbp, init_level4_pgt + (L4_PAGE_OFFSET*8)(%rip)
16695+ addq %rbp, init_level4_pgt + (L4_VMALLOC_START*8)(%rip)
16696+ addq %rbp, init_level4_pgt + (L4_VMALLOC_END*8)(%rip)
16697+ addq %rbp, init_level4_pgt + (L4_VMEMMAP_START*8)(%rip)
16698 addq %rbp, init_level4_pgt + (L4_START_KERNEL*8)(%rip)
16699
16700 addq %rbp, level3_ident_pgt + 0(%rip)
16701+#ifndef CONFIG_XEN
16702+ addq %rbp, level3_ident_pgt + 8(%rip)
16703+#endif
16704
16705- addq %rbp, level3_kernel_pgt + (510*8)(%rip)
16706- addq %rbp, level3_kernel_pgt + (511*8)(%rip)
16707+ addq %rbp, level3_vmemmap_pgt + (L3_VMEMMAP_START*8)(%rip)
16708+
16709+ addq %rbp, level3_kernel_pgt + (L3_START_KERNEL*8)(%rip)
16710+ addq %rbp, level3_kernel_pgt + (L3_START_KERNEL*8+8)(%rip)
16711
16712 addq %rbp, level2_fixmap_pgt + (506*8)(%rip)
16713-
16714- /* Add an Identity mapping if I am above 1G */
16715- leaq _text(%rip), %rdi
16716- andq $PMD_PAGE_MASK, %rdi
16717-
16718- movq %rdi, %rax
16719- shrq $PUD_SHIFT, %rax
16720- andq $(PTRS_PER_PUD - 1), %rax
16721- jz ident_complete
16722-
16723- leaq (level2_spare_pgt - __START_KERNEL_map + _KERNPG_TABLE)(%rbp), %rdx
16724- leaq level3_ident_pgt(%rip), %rbx
16725- movq %rdx, 0(%rbx, %rax, 8)
16726-
16727- movq %rdi, %rax
16728- shrq $PMD_SHIFT, %rax
16729- andq $(PTRS_PER_PMD - 1), %rax
16730- leaq __PAGE_KERNEL_IDENT_LARGE_EXEC(%rdi), %rdx
16731- leaq level2_spare_pgt(%rip), %rbx
16732- movq %rdx, 0(%rbx, %rax, 8)
16733-ident_complete:
16734+ addq %rbp, level2_fixmap_pgt + (507*8)(%rip)
16735
16736 /*
16737 * Fixup the kernel text+data virtual addresses. Note that
16738@@ -160,8 +156,8 @@ ENTRY(secondary_startup_64)
16739 * after the boot processor executes this code.
16740 */
16741
16742- /* Enable PAE mode and PGE */
16743- movl $(X86_CR4_PAE | X86_CR4_PGE), %eax
16744+ /* Enable PAE mode and PSE/PGE */
16745+ movl $(X86_CR4_PSE | X86_CR4_PAE | X86_CR4_PGE), %eax
16746 movq %rax, %cr4
16747
16748 /* Setup early boot stage 4 level pagetables. */
16749@@ -183,9 +179,17 @@ ENTRY(secondary_startup_64)
16750 movl $MSR_EFER, %ecx
16751 rdmsr
16752 btsl $_EFER_SCE, %eax /* Enable System Call */
16753- btl $20,%edi /* No Execute supported? */
16754+ btl $(X86_FEATURE_NX & 31),%edi /* No Execute supported? */
16755 jnc 1f
16756 btsl $_EFER_NX, %eax
16757+ leaq init_level4_pgt(%rip), %rdi
16758+#ifndef CONFIG_EFI
16759+ btsq $_PAGE_BIT_NX, 8*L4_PAGE_OFFSET(%rdi)
16760+#endif
16761+ btsq $_PAGE_BIT_NX, 8*L4_VMALLOC_START(%rdi)
16762+ btsq $_PAGE_BIT_NX, 8*L4_VMALLOC_END(%rdi)
16763+ btsq $_PAGE_BIT_NX, 8*L4_VMEMMAP_START(%rdi)
16764+ btsq $_PAGE_BIT_NX, __supported_pte_mask(%rip)
16765 1: wrmsr /* Make changes effective */
16766
16767 /* Setup cr0 */
16768@@ -247,6 +251,7 @@ ENTRY(secondary_startup_64)
16769 * jump. In addition we need to ensure %cs is set so we make this
16770 * a far return.
16771 */
16772+ pax_set_fptr_mask
16773 movq initial_code(%rip),%rax
16774 pushq $0 # fake return address to stop unwinder
16775 pushq $__KERNEL_CS # set correct cs
16776@@ -269,7 +274,7 @@ ENTRY(secondary_startup_64)
16777 bad_address:
16778 jmp bad_address
16779
16780- .section ".init.text","ax"
16781+ __INIT
16782 #ifdef CONFIG_EARLY_PRINTK
16783 .globl early_idt_handlers
16784 early_idt_handlers:
16785@@ -314,18 +319,23 @@ ENTRY(early_idt_handler)
16786 #endif /* EARLY_PRINTK */
16787 1: hlt
16788 jmp 1b
16789+ .previous
16790
16791 #ifdef CONFIG_EARLY_PRINTK
16792+ __INITDATA
16793 early_recursion_flag:
16794 .long 0
16795+ .previous
16796
16797+ .section .rodata,"a",@progbits
16798 early_idt_msg:
16799 .asciz "PANIC: early exception %02lx rip %lx:%lx error %lx cr2 %lx\n"
16800 early_idt_ripmsg:
16801 .asciz "RIP %s\n"
16802+ .previous
16803 #endif /* CONFIG_EARLY_PRINTK */
16804- .previous
16805
16806+ .section .rodata,"a",@progbits
16807 #define NEXT_PAGE(name) \
16808 .balign PAGE_SIZE; \
16809 ENTRY(name)
16810@@ -338,7 +348,6 @@ ENTRY(name)
16811 i = i + 1 ; \
16812 .endr
16813
16814- .data
16815 /*
16816 * This default setting generates an ident mapping at address 0x100000
16817 * and a mapping for the kernel that precisely maps virtual address
16818@@ -349,13 +358,41 @@ NEXT_PAGE(init_level4_pgt)
16819 .quad level3_ident_pgt - __START_KERNEL_map + _KERNPG_TABLE
16820 .org init_level4_pgt + L4_PAGE_OFFSET*8, 0
16821 .quad level3_ident_pgt - __START_KERNEL_map + _KERNPG_TABLE
16822+ .org init_level4_pgt + L4_VMALLOC_START*8, 0
16823+ .quad level3_vmalloc_start_pgt - __START_KERNEL_map + _KERNPG_TABLE
16824+ .org init_level4_pgt + L4_VMALLOC_END*8, 0
16825+ .quad level3_vmalloc_end_pgt - __START_KERNEL_map + _KERNPG_TABLE
16826+ .org init_level4_pgt + L4_VMEMMAP_START*8, 0
16827+ .quad level3_vmemmap_pgt - __START_KERNEL_map + _KERNPG_TABLE
16828 .org init_level4_pgt + L4_START_KERNEL*8, 0
16829 /* (2^48-(2*1024*1024*1024))/(2^39) = 511 */
16830 .quad level3_kernel_pgt - __START_KERNEL_map + _PAGE_TABLE
16831
16832+#ifdef CONFIG_PAX_PER_CPU_PGD
16833+NEXT_PAGE(cpu_pgd)
16834+ .rept NR_CPUS
16835+ .fill 512,8,0
16836+ .endr
16837+#endif
16838+
16839 NEXT_PAGE(level3_ident_pgt)
16840 .quad level2_ident_pgt - __START_KERNEL_map + _KERNPG_TABLE
16841+#ifdef CONFIG_XEN
16842 .fill 511,8,0
16843+#else
16844+ .quad level2_ident_pgt + PAGE_SIZE - __START_KERNEL_map + _KERNPG_TABLE
16845+ .fill 510,8,0
16846+#endif
16847+
16848+NEXT_PAGE(level3_vmalloc_start_pgt)
16849+ .fill 512,8,0
16850+
16851+NEXT_PAGE(level3_vmalloc_end_pgt)
16852+ .fill 512,8,0
16853+
16854+NEXT_PAGE(level3_vmemmap_pgt)
16855+ .fill L3_VMEMMAP_START,8,0
16856+ .quad level2_vmemmap_pgt - __START_KERNEL_map + _KERNPG_TABLE
16857
16858 NEXT_PAGE(level3_kernel_pgt)
16859 .fill L3_START_KERNEL,8,0
16860@@ -363,20 +400,23 @@ NEXT_PAGE(level3_kernel_pgt)
16861 .quad level2_kernel_pgt - __START_KERNEL_map + _KERNPG_TABLE
16862 .quad level2_fixmap_pgt - __START_KERNEL_map + _PAGE_TABLE
16863
16864+NEXT_PAGE(level2_vmemmap_pgt)
16865+ .fill 512,8,0
16866+
16867 NEXT_PAGE(level2_fixmap_pgt)
16868- .fill 506,8,0
16869- .quad level1_fixmap_pgt - __START_KERNEL_map + _PAGE_TABLE
16870- /* 8MB reserved for vsyscalls + a 2MB hole = 4 + 1 entries */
16871- .fill 5,8,0
16872+ .fill 507,8,0
16873+ .quad level1_vsyscall_pgt - __START_KERNEL_map + _PAGE_TABLE
16874+ /* 6MB reserved for vsyscalls + a 2MB hole = 3 + 1 entries */
16875+ .fill 4,8,0
16876
16877-NEXT_PAGE(level1_fixmap_pgt)
16878+NEXT_PAGE(level1_vsyscall_pgt)
16879 .fill 512,8,0
16880
16881-NEXT_PAGE(level2_ident_pgt)
16882- /* Since I easily can, map the first 1G.
16883+ /* Since I easily can, map the first 2G.
16884 * Don't set NX because code runs from these pages.
16885 */
16886- PMDS(0, __PAGE_KERNEL_IDENT_LARGE_EXEC, PTRS_PER_PMD)
16887+NEXT_PAGE(level2_ident_pgt)
16888+ PMDS(0, __PAGE_KERNEL_IDENT_LARGE_EXEC, 2*PTRS_PER_PMD)
16889
16890 NEXT_PAGE(level2_kernel_pgt)
16891 /*
16892@@ -389,33 +429,55 @@ NEXT_PAGE(level2_kernel_pgt)
16893 * If you want to increase this then increase MODULES_VADDR
16894 * too.)
16895 */
16896- PMDS(0, __PAGE_KERNEL_LARGE_EXEC,
16897- KERNEL_IMAGE_SIZE/PMD_SIZE)
16898-
16899-NEXT_PAGE(level2_spare_pgt)
16900- .fill 512, 8, 0
16901+ PMDS(0, __PAGE_KERNEL_LARGE_EXEC, KERNEL_IMAGE_SIZE/PMD_SIZE)
16902
16903 #undef PMDS
16904 #undef NEXT_PAGE
16905
16906- .data
16907+ .align PAGE_SIZE
16908+ENTRY(cpu_gdt_table)
16909+ .rept NR_CPUS
16910+ .quad 0x0000000000000000 /* NULL descriptor */
16911+ .quad 0x00cf9b000000ffff /* __KERNEL32_CS */
16912+ .quad 0x00af9b000000ffff /* __KERNEL_CS */
16913+ .quad 0x00cf93000000ffff /* __KERNEL_DS */
16914+ .quad 0x00cffb000000ffff /* __USER32_CS */
16915+ .quad 0x00cff3000000ffff /* __USER_DS, __USER32_DS */
16916+ .quad 0x00affb000000ffff /* __USER_CS */
16917+
16918+#ifdef CONFIG_PAX_KERNEXEC
16919+ .quad 0x00af9b000000ffff /* __KERNEXEC_KERNEL_CS */
16920+#else
16921+ .quad 0x0 /* unused */
16922+#endif
16923+
16924+ .quad 0,0 /* TSS */
16925+ .quad 0,0 /* LDT */
16926+ .quad 0,0,0 /* three TLS descriptors */
16927+ .quad 0x0000f40000000000 /* node/CPU stored in limit */
16928+ /* asm/segment.h:GDT_ENTRIES must match this */
16929+
16930+ /* zero the remaining page */
16931+ .fill PAGE_SIZE / 8 - GDT_ENTRIES,8,0
16932+ .endr
16933+
16934 .align 16
16935 .globl early_gdt_descr
16936 early_gdt_descr:
16937 .word GDT_ENTRIES*8-1
16938 early_gdt_descr_base:
16939- .quad INIT_PER_CPU_VAR(gdt_page)
16940+ .quad cpu_gdt_table
16941
16942 ENTRY(phys_base)
16943 /* This must match the first entry in level2_kernel_pgt */
16944 .quad 0x0000000000000000
16945
16946 #include "../../x86/xen/xen-head.S"
16947-
16948- .section .bss, "aw", @nobits
16949+
16950+ .section .rodata,"a",@progbits
16951 .align L1_CACHE_BYTES
16952 ENTRY(idt_table)
16953- .skip IDT_ENTRIES * 16
16954+ .fill 512,8,0
16955
16956 __PAGE_ALIGNED_BSS
16957 .align PAGE_SIZE
16958diff --git a/arch/x86/kernel/i386_ksyms_32.c b/arch/x86/kernel/i386_ksyms_32.c
16959index 9c3bd4a..e1d9b35 100644
16960--- a/arch/x86/kernel/i386_ksyms_32.c
16961+++ b/arch/x86/kernel/i386_ksyms_32.c
16962@@ -20,8 +20,12 @@ extern void cmpxchg8b_emu(void);
16963 EXPORT_SYMBOL(cmpxchg8b_emu);
16964 #endif
16965
16966+EXPORT_SYMBOL_GPL(cpu_gdt_table);
16967+
16968 /* Networking helper routines. */
16969 EXPORT_SYMBOL(csum_partial_copy_generic);
16970+EXPORT_SYMBOL(csum_partial_copy_generic_to_user);
16971+EXPORT_SYMBOL(csum_partial_copy_generic_from_user);
16972
16973 EXPORT_SYMBOL(__get_user_1);
16974 EXPORT_SYMBOL(__get_user_2);
16975@@ -36,3 +40,7 @@ EXPORT_SYMBOL(strstr);
16976
16977 EXPORT_SYMBOL(csum_partial);
16978 EXPORT_SYMBOL(empty_zero_page);
16979+
16980+#ifdef CONFIG_PAX_KERNEXEC
16981+EXPORT_SYMBOL(__LOAD_PHYSICAL_ADDR);
16982+#endif
16983diff --git a/arch/x86/kernel/i387.c b/arch/x86/kernel/i387.c
16984index 739d859..d1d6be7 100644
16985--- a/arch/x86/kernel/i387.c
16986+++ b/arch/x86/kernel/i387.c
16987@@ -188,6 +188,9 @@ int xfpregs_active(struct task_struct *target, const struct user_regset *regset)
16988
16989 int xfpregs_get(struct task_struct *target, const struct user_regset *regset,
16990 unsigned int pos, unsigned int count,
16991+ void *kbuf, void __user *ubuf) __size_overflow(4);
16992+int xfpregs_get(struct task_struct *target, const struct user_regset *regset,
16993+ unsigned int pos, unsigned int count,
16994 void *kbuf, void __user *ubuf)
16995 {
16996 int ret;
16997@@ -207,6 +210,9 @@ int xfpregs_get(struct task_struct *target, const struct user_regset *regset,
16998
16999 int xfpregs_set(struct task_struct *target, const struct user_regset *regset,
17000 unsigned int pos, unsigned int count,
17001+ const void *kbuf, const void __user *ubuf) __size_overflow(4);
17002+int xfpregs_set(struct task_struct *target, const struct user_regset *regset,
17003+ unsigned int pos, unsigned int count,
17004 const void *kbuf, const void __user *ubuf)
17005 {
17006 int ret;
17007@@ -240,6 +246,9 @@ int xfpregs_set(struct task_struct *target, const struct user_regset *regset,
17008
17009 int xstateregs_get(struct task_struct *target, const struct user_regset *regset,
17010 unsigned int pos, unsigned int count,
17011+ void *kbuf, void __user *ubuf) __size_overflow(4);
17012+int xstateregs_get(struct task_struct *target, const struct user_regset *regset,
17013+ unsigned int pos, unsigned int count,
17014 void *kbuf, void __user *ubuf)
17015 {
17016 int ret;
17017@@ -269,6 +278,9 @@ int xstateregs_get(struct task_struct *target, const struct user_regset *regset,
17018
17019 int xstateregs_set(struct task_struct *target, const struct user_regset *regset,
17020 unsigned int pos, unsigned int count,
17021+ const void *kbuf, const void __user *ubuf) __size_overflow(4);
17022+int xstateregs_set(struct task_struct *target, const struct user_regset *regset,
17023+ unsigned int pos, unsigned int count,
17024 const void *kbuf, const void __user *ubuf)
17025 {
17026 int ret;
17027@@ -439,6 +451,9 @@ static void convert_to_fxsr(struct task_struct *tsk,
17028
17029 int fpregs_get(struct task_struct *target, const struct user_regset *regset,
17030 unsigned int pos, unsigned int count,
17031+ void *kbuf, void __user *ubuf) __size_overflow(3,4);
17032+int fpregs_get(struct task_struct *target, const struct user_regset *regset,
17033+ unsigned int pos, unsigned int count,
17034 void *kbuf, void __user *ubuf)
17035 {
17036 struct user_i387_ia32_struct env;
17037@@ -471,6 +486,9 @@ int fpregs_get(struct task_struct *target, const struct user_regset *regset,
17038
17039 int fpregs_set(struct task_struct *target, const struct user_regset *regset,
17040 unsigned int pos, unsigned int count,
17041+ const void *kbuf, const void __user *ubuf) __size_overflow(3,4);
17042+int fpregs_set(struct task_struct *target, const struct user_regset *regset,
17043+ unsigned int pos, unsigned int count,
17044 const void *kbuf, const void __user *ubuf)
17045 {
17046 struct user_i387_ia32_struct env;
17047@@ -619,6 +637,8 @@ static inline int restore_i387_fsave(struct _fpstate_ia32 __user *buf)
17048 }
17049
17050 static int restore_i387_fxsave(struct _fpstate_ia32 __user *buf,
17051+ unsigned int size) __size_overflow(2);
17052+static int restore_i387_fxsave(struct _fpstate_ia32 __user *buf,
17053 unsigned int size)
17054 {
17055 struct task_struct *tsk = current;
17056diff --git a/arch/x86/kernel/i8259.c b/arch/x86/kernel/i8259.c
17057index 6104852..6114160 100644
17058--- a/arch/x86/kernel/i8259.c
17059+++ b/arch/x86/kernel/i8259.c
17060@@ -210,7 +210,7 @@ spurious_8259A_irq:
17061 "spurious 8259A interrupt: IRQ%d.\n", irq);
17062 spurious_irq_mask |= irqmask;
17063 }
17064- atomic_inc(&irq_err_count);
17065+ atomic_inc_unchecked(&irq_err_count);
17066 /*
17067 * Theoretically we do not have to handle this IRQ,
17068 * but in Linux this does not cause problems and is
17069diff --git a/arch/x86/kernel/init_task.c b/arch/x86/kernel/init_task.c
17070index 43e9ccf..44ccf6f 100644
17071--- a/arch/x86/kernel/init_task.c
17072+++ b/arch/x86/kernel/init_task.c
17073@@ -20,8 +20,7 @@ static struct sighand_struct init_sighand = INIT_SIGHAND(init_sighand);
17074 * way process stacks are handled. This is done by having a special
17075 * "init_task" linker map entry..
17076 */
17077-union thread_union init_thread_union __init_task_data =
17078- { INIT_THREAD_INFO(init_task) };
17079+union thread_union init_thread_union __init_task_data;
17080
17081 /*
17082 * Initial task structure.
17083@@ -38,5 +37,5 @@ EXPORT_SYMBOL(init_task);
17084 * section. Since TSS's are completely CPU-local, we want them
17085 * on exact cacheline boundaries, to eliminate cacheline ping-pong.
17086 */
17087-DEFINE_PER_CPU_SHARED_ALIGNED(struct tss_struct, init_tss) = INIT_TSS;
17088-
17089+struct tss_struct init_tss[NR_CPUS] ____cacheline_internodealigned_in_smp = { [0 ... NR_CPUS-1] = INIT_TSS };
17090+EXPORT_SYMBOL(init_tss);
17091diff --git a/arch/x86/kernel/ioport.c b/arch/x86/kernel/ioport.c
17092index 8c96897..be66bfa 100644
17093--- a/arch/x86/kernel/ioport.c
17094+++ b/arch/x86/kernel/ioport.c
17095@@ -6,6 +6,7 @@
17096 #include <linux/sched.h>
17097 #include <linux/kernel.h>
17098 #include <linux/capability.h>
17099+#include <linux/security.h>
17100 #include <linux/errno.h>
17101 #include <linux/types.h>
17102 #include <linux/ioport.h>
17103@@ -28,6 +29,12 @@ asmlinkage long sys_ioperm(unsigned long from, unsigned long num, int turn_on)
17104
17105 if ((from + num <= from) || (from + num > IO_BITMAP_BITS))
17106 return -EINVAL;
17107+#ifdef CONFIG_GRKERNSEC_IO
17108+ if (turn_on && grsec_disable_privio) {
17109+ gr_handle_ioperm();
17110+ return -EPERM;
17111+ }
17112+#endif
17113 if (turn_on && !capable(CAP_SYS_RAWIO))
17114 return -EPERM;
17115
17116@@ -54,7 +61,7 @@ asmlinkage long sys_ioperm(unsigned long from, unsigned long num, int turn_on)
17117 * because the ->io_bitmap_max value must match the bitmap
17118 * contents:
17119 */
17120- tss = &per_cpu(init_tss, get_cpu());
17121+ tss = init_tss + get_cpu();
17122
17123 if (turn_on)
17124 bitmap_clear(t->io_bitmap_ptr, from, num);
17125@@ -102,6 +109,12 @@ long sys_iopl(unsigned int level, struct pt_regs *regs)
17126 return -EINVAL;
17127 /* Trying to gain more privileges? */
17128 if (level > old) {
17129+#ifdef CONFIG_GRKERNSEC_IO
17130+ if (grsec_disable_privio) {
17131+ gr_handle_iopl();
17132+ return -EPERM;
17133+ }
17134+#endif
17135 if (!capable(CAP_SYS_RAWIO))
17136 return -EPERM;
17137 }
17138diff --git a/arch/x86/kernel/irq.c b/arch/x86/kernel/irq.c
17139index 429e0c9..17b3ece 100644
17140--- a/arch/x86/kernel/irq.c
17141+++ b/arch/x86/kernel/irq.c
17142@@ -18,7 +18,7 @@
17143 #include <asm/mce.h>
17144 #include <asm/hw_irq.h>
17145
17146-atomic_t irq_err_count;
17147+atomic_unchecked_t irq_err_count;
17148
17149 /* Function pointer for generic interrupt vector handling */
17150 void (*x86_platform_ipi_callback)(void) = NULL;
17151@@ -117,9 +117,9 @@ int arch_show_interrupts(struct seq_file *p, int prec)
17152 seq_printf(p, "%10u ", per_cpu(mce_poll_count, j));
17153 seq_printf(p, " Machine check polls\n");
17154 #endif
17155- seq_printf(p, "%*s: %10u\n", prec, "ERR", atomic_read(&irq_err_count));
17156+ seq_printf(p, "%*s: %10u\n", prec, "ERR", atomic_read_unchecked(&irq_err_count));
17157 #if defined(CONFIG_X86_IO_APIC)
17158- seq_printf(p, "%*s: %10u\n", prec, "MIS", atomic_read(&irq_mis_count));
17159+ seq_printf(p, "%*s: %10u\n", prec, "MIS", atomic_read_unchecked(&irq_mis_count));
17160 #endif
17161 return 0;
17162 }
17163@@ -159,10 +159,10 @@ u64 arch_irq_stat_cpu(unsigned int cpu)
17164
17165 u64 arch_irq_stat(void)
17166 {
17167- u64 sum = atomic_read(&irq_err_count);
17168+ u64 sum = atomic_read_unchecked(&irq_err_count);
17169
17170 #ifdef CONFIG_X86_IO_APIC
17171- sum += atomic_read(&irq_mis_count);
17172+ sum += atomic_read_unchecked(&irq_mis_count);
17173 #endif
17174 return sum;
17175 }
17176diff --git a/arch/x86/kernel/irq_32.c b/arch/x86/kernel/irq_32.c
17177index 7209070..cbcd71a 100644
17178--- a/arch/x86/kernel/irq_32.c
17179+++ b/arch/x86/kernel/irq_32.c
17180@@ -36,7 +36,7 @@ static int check_stack_overflow(void)
17181 __asm__ __volatile__("andl %%esp,%0" :
17182 "=r" (sp) : "0" (THREAD_SIZE - 1));
17183
17184- return sp < (sizeof(struct thread_info) + STACK_WARN);
17185+ return sp < STACK_WARN;
17186 }
17187
17188 static void print_stack_overflow(void)
17189@@ -54,8 +54,8 @@ static inline void print_stack_overflow(void) { }
17190 * per-CPU IRQ handling contexts (thread information and stack)
17191 */
17192 union irq_ctx {
17193- struct thread_info tinfo;
17194- u32 stack[THREAD_SIZE/sizeof(u32)];
17195+ unsigned long previous_esp;
17196+ u32 stack[THREAD_SIZE/sizeof(u32)];
17197 } __attribute__((aligned(THREAD_SIZE)));
17198
17199 static DEFINE_PER_CPU(union irq_ctx *, hardirq_ctx);
17200@@ -75,10 +75,9 @@ static void call_on_stack(void *func, void *stack)
17201 static inline int
17202 execute_on_irq_stack(int overflow, struct irq_desc *desc, int irq)
17203 {
17204- union irq_ctx *curctx, *irqctx;
17205+ union irq_ctx *irqctx;
17206 u32 *isp, arg1, arg2;
17207
17208- curctx = (union irq_ctx *) current_thread_info();
17209 irqctx = __this_cpu_read(hardirq_ctx);
17210
17211 /*
17212@@ -87,21 +86,16 @@ execute_on_irq_stack(int overflow, struct irq_desc *desc, int irq)
17213 * handler) we can't do that and just have to keep using the
17214 * current stack (which is the irq stack already after all)
17215 */
17216- if (unlikely(curctx == irqctx))
17217+ if (unlikely((void *)current_stack_pointer - (void *)irqctx < THREAD_SIZE))
17218 return 0;
17219
17220 /* build the stack frame on the IRQ stack */
17221- isp = (u32 *) ((char *)irqctx + sizeof(*irqctx));
17222- irqctx->tinfo.task = curctx->tinfo.task;
17223- irqctx->tinfo.previous_esp = current_stack_pointer;
17224+ isp = (u32 *) ((char *)irqctx + sizeof(*irqctx) - 8);
17225+ irqctx->previous_esp = current_stack_pointer;
17226
17227- /*
17228- * Copy the softirq bits in preempt_count so that the
17229- * softirq checks work in the hardirq context.
17230- */
17231- irqctx->tinfo.preempt_count =
17232- (irqctx->tinfo.preempt_count & ~SOFTIRQ_MASK) |
17233- (curctx->tinfo.preempt_count & SOFTIRQ_MASK);
17234+#ifdef CONFIG_PAX_MEMORY_UDEREF
17235+ __set_fs(MAKE_MM_SEG(0));
17236+#endif
17237
17238 if (unlikely(overflow))
17239 call_on_stack(print_stack_overflow, isp);
17240@@ -113,6 +107,11 @@ execute_on_irq_stack(int overflow, struct irq_desc *desc, int irq)
17241 : "0" (irq), "1" (desc), "2" (isp),
17242 "D" (desc->handle_irq)
17243 : "memory", "cc", "ecx");
17244+
17245+#ifdef CONFIG_PAX_MEMORY_UDEREF
17246+ __set_fs(current_thread_info()->addr_limit);
17247+#endif
17248+
17249 return 1;
17250 }
17251
17252@@ -121,29 +120,11 @@ execute_on_irq_stack(int overflow, struct irq_desc *desc, int irq)
17253 */
17254 void __cpuinit irq_ctx_init(int cpu)
17255 {
17256- union irq_ctx *irqctx;
17257-
17258 if (per_cpu(hardirq_ctx, cpu))
17259 return;
17260
17261- irqctx = page_address(alloc_pages_node(cpu_to_node(cpu),
17262- THREAD_FLAGS,
17263- THREAD_ORDER));
17264- memset(&irqctx->tinfo, 0, sizeof(struct thread_info));
17265- irqctx->tinfo.cpu = cpu;
17266- irqctx->tinfo.preempt_count = HARDIRQ_OFFSET;
17267- irqctx->tinfo.addr_limit = MAKE_MM_SEG(0);
17268-
17269- per_cpu(hardirq_ctx, cpu) = irqctx;
17270-
17271- irqctx = page_address(alloc_pages_node(cpu_to_node(cpu),
17272- THREAD_FLAGS,
17273- THREAD_ORDER));
17274- memset(&irqctx->tinfo, 0, sizeof(struct thread_info));
17275- irqctx->tinfo.cpu = cpu;
17276- irqctx->tinfo.addr_limit = MAKE_MM_SEG(0);
17277-
17278- per_cpu(softirq_ctx, cpu) = irqctx;
17279+ per_cpu(hardirq_ctx, cpu) = page_address(alloc_pages_node(cpu_to_node(cpu), THREAD_FLAGS, THREAD_ORDER));
17280+ per_cpu(softirq_ctx, cpu) = page_address(alloc_pages_node(cpu_to_node(cpu), THREAD_FLAGS, THREAD_ORDER));
17281
17282 printk(KERN_DEBUG "CPU %u irqstacks, hard=%p soft=%p\n",
17283 cpu, per_cpu(hardirq_ctx, cpu), per_cpu(softirq_ctx, cpu));
17284@@ -152,7 +133,6 @@ void __cpuinit irq_ctx_init(int cpu)
17285 asmlinkage void do_softirq(void)
17286 {
17287 unsigned long flags;
17288- struct thread_info *curctx;
17289 union irq_ctx *irqctx;
17290 u32 *isp;
17291
17292@@ -162,15 +142,22 @@ asmlinkage void do_softirq(void)
17293 local_irq_save(flags);
17294
17295 if (local_softirq_pending()) {
17296- curctx = current_thread_info();
17297 irqctx = __this_cpu_read(softirq_ctx);
17298- irqctx->tinfo.task = curctx->task;
17299- irqctx->tinfo.previous_esp = current_stack_pointer;
17300+ irqctx->previous_esp = current_stack_pointer;
17301
17302 /* build the stack frame on the softirq stack */
17303- isp = (u32 *) ((char *)irqctx + sizeof(*irqctx));
17304+ isp = (u32 *) ((char *)irqctx + sizeof(*irqctx) - 8);
17305+
17306+#ifdef CONFIG_PAX_MEMORY_UDEREF
17307+ __set_fs(MAKE_MM_SEG(0));
17308+#endif
17309
17310 call_on_stack(__do_softirq, isp);
17311+
17312+#ifdef CONFIG_PAX_MEMORY_UDEREF
17313+ __set_fs(current_thread_info()->addr_limit);
17314+#endif
17315+
17316 /*
17317 * Shouldn't happen, we returned above if in_interrupt():
17318 */
17319diff --git a/arch/x86/kernel/irq_64.c b/arch/x86/kernel/irq_64.c
17320index 69bca46..0bac999 100644
17321--- a/arch/x86/kernel/irq_64.c
17322+++ b/arch/x86/kernel/irq_64.c
17323@@ -38,7 +38,7 @@ static inline void stack_overflow_check(struct pt_regs *regs)
17324 #ifdef CONFIG_DEBUG_STACKOVERFLOW
17325 u64 curbase = (u64)task_stack_page(current);
17326
17327- if (user_mode_vm(regs))
17328+ if (user_mode(regs))
17329 return;
17330
17331 WARN_ONCE(regs->sp >= curbase &&
17332diff --git a/arch/x86/kernel/kgdb.c b/arch/x86/kernel/kgdb.c
17333index faba577..93b9e71 100644
17334--- a/arch/x86/kernel/kgdb.c
17335+++ b/arch/x86/kernel/kgdb.c
17336@@ -124,11 +124,11 @@ char *dbg_get_reg(int regno, void *mem, struct pt_regs *regs)
17337 #ifdef CONFIG_X86_32
17338 switch (regno) {
17339 case GDB_SS:
17340- if (!user_mode_vm(regs))
17341+ if (!user_mode(regs))
17342 *(unsigned long *)mem = __KERNEL_DS;
17343 break;
17344 case GDB_SP:
17345- if (!user_mode_vm(regs))
17346+ if (!user_mode(regs))
17347 *(unsigned long *)mem = kernel_stack_pointer(regs);
17348 break;
17349 case GDB_GS:
17350@@ -473,12 +473,12 @@ int kgdb_arch_handle_exception(int e_vector, int signo, int err_code,
17351 case 'k':
17352 /* clear the trace bit */
17353 linux_regs->flags &= ~X86_EFLAGS_TF;
17354- atomic_set(&kgdb_cpu_doing_single_step, -1);
17355+ atomic_set_unchecked(&kgdb_cpu_doing_single_step, -1);
17356
17357 /* set the trace bit if we're stepping */
17358 if (remcomInBuffer[0] == 's') {
17359 linux_regs->flags |= X86_EFLAGS_TF;
17360- atomic_set(&kgdb_cpu_doing_single_step,
17361+ atomic_set_unchecked(&kgdb_cpu_doing_single_step,
17362 raw_smp_processor_id());
17363 }
17364
17365@@ -543,7 +543,7 @@ static int __kgdb_notify(struct die_args *args, unsigned long cmd)
17366
17367 switch (cmd) {
17368 case DIE_DEBUG:
17369- if (atomic_read(&kgdb_cpu_doing_single_step) != -1) {
17370+ if (atomic_read_unchecked(&kgdb_cpu_doing_single_step) != -1) {
17371 if (user_mode(regs))
17372 return single_step_cont(regs, args);
17373 break;
17374diff --git a/arch/x86/kernel/kprobes.c b/arch/x86/kernel/kprobes.c
17375index 7da647d..56fe348 100644
17376--- a/arch/x86/kernel/kprobes.c
17377+++ b/arch/x86/kernel/kprobes.c
17378@@ -118,8 +118,11 @@ static void __kprobes __synthesize_relative_insn(void *from, void *to, u8 op)
17379 } __attribute__((packed)) *insn;
17380
17381 insn = (struct __arch_relative_insn *)from;
17382+
17383+ pax_open_kernel();
17384 insn->raddr = (s32)((long)(to) - ((long)(from) + 5));
17385 insn->op = op;
17386+ pax_close_kernel();
17387 }
17388
17389 /* Insert a jump instruction at address 'from', which jumps to address 'to'.*/
17390@@ -156,7 +159,7 @@ static int __kprobes can_boost(kprobe_opcode_t *opcodes)
17391 kprobe_opcode_t opcode;
17392 kprobe_opcode_t *orig_opcodes = opcodes;
17393
17394- if (search_exception_tables((unsigned long)opcodes))
17395+ if (search_exception_tables(ktva_ktla((unsigned long)opcodes)))
17396 return 0; /* Page fault may occur on this address. */
17397
17398 retry:
17399@@ -317,7 +320,9 @@ static int __kprobes __copy_instruction(u8 *dest, u8 *src, int recover)
17400 }
17401 }
17402 insn_get_length(&insn);
17403+ pax_open_kernel();
17404 memcpy(dest, insn.kaddr, insn.length);
17405+ pax_close_kernel();
17406
17407 #ifdef CONFIG_X86_64
17408 if (insn_rip_relative(&insn)) {
17409@@ -341,7 +346,9 @@ static int __kprobes __copy_instruction(u8 *dest, u8 *src, int recover)
17410 (u8 *) dest;
17411 BUG_ON((s64) (s32) newdisp != newdisp); /* Sanity check. */
17412 disp = (u8 *) dest + insn_offset_displacement(&insn);
17413+ pax_open_kernel();
17414 *(s32 *) disp = (s32) newdisp;
17415+ pax_close_kernel();
17416 }
17417 #endif
17418 return insn.length;
17419@@ -355,12 +362,12 @@ static void __kprobes arch_copy_kprobe(struct kprobe *p)
17420 */
17421 __copy_instruction(p->ainsn.insn, p->addr, 0);
17422
17423- if (can_boost(p->addr))
17424+ if (can_boost(ktla_ktva(p->addr)))
17425 p->ainsn.boostable = 0;
17426 else
17427 p->ainsn.boostable = -1;
17428
17429- p->opcode = *p->addr;
17430+ p->opcode = *(ktla_ktva(p->addr));
17431 }
17432
17433 int __kprobes arch_prepare_kprobe(struct kprobe *p)
17434@@ -477,7 +484,7 @@ static void __kprobes setup_singlestep(struct kprobe *p, struct pt_regs *regs,
17435 * nor set current_kprobe, because it doesn't use single
17436 * stepping.
17437 */
17438- regs->ip = (unsigned long)p->ainsn.insn;
17439+ regs->ip = ktva_ktla((unsigned long)p->ainsn.insn);
17440 preempt_enable_no_resched();
17441 return;
17442 }
17443@@ -496,7 +503,7 @@ static void __kprobes setup_singlestep(struct kprobe *p, struct pt_regs *regs,
17444 if (p->opcode == BREAKPOINT_INSTRUCTION)
17445 regs->ip = (unsigned long)p->addr;
17446 else
17447- regs->ip = (unsigned long)p->ainsn.insn;
17448+ regs->ip = ktva_ktla((unsigned long)p->ainsn.insn);
17449 }
17450
17451 /*
17452@@ -575,7 +582,7 @@ static int __kprobes kprobe_handler(struct pt_regs *regs)
17453 setup_singlestep(p, regs, kcb, 0);
17454 return 1;
17455 }
17456- } else if (*addr != BREAKPOINT_INSTRUCTION) {
17457+ } else if (*(kprobe_opcode_t *)ktla_ktva((unsigned long)addr) != BREAKPOINT_INSTRUCTION) {
17458 /*
17459 * The breakpoint instruction was removed right
17460 * after we hit it. Another cpu has removed
17461@@ -683,6 +690,9 @@ static void __used __kprobes kretprobe_trampoline_holder(void)
17462 " movq %rax, 152(%rsp)\n"
17463 RESTORE_REGS_STRING
17464 " popfq\n"
17465+#ifdef KERNEXEC_PLUGIN
17466+ " btsq $63,(%rsp)\n"
17467+#endif
17468 #else
17469 " pushf\n"
17470 SAVE_REGS_STRING
17471@@ -820,7 +830,7 @@ static void __kprobes resume_execution(struct kprobe *p,
17472 struct pt_regs *regs, struct kprobe_ctlblk *kcb)
17473 {
17474 unsigned long *tos = stack_addr(regs);
17475- unsigned long copy_ip = (unsigned long)p->ainsn.insn;
17476+ unsigned long copy_ip = ktva_ktla((unsigned long)p->ainsn.insn);
17477 unsigned long orig_ip = (unsigned long)p->addr;
17478 kprobe_opcode_t *insn = p->ainsn.insn;
17479
17480@@ -1002,7 +1012,7 @@ int __kprobes kprobe_exceptions_notify(struct notifier_block *self,
17481 struct die_args *args = data;
17482 int ret = NOTIFY_DONE;
17483
17484- if (args->regs && user_mode_vm(args->regs))
17485+ if (args->regs && user_mode(args->regs))
17486 return ret;
17487
17488 switch (val) {
17489@@ -1384,7 +1394,7 @@ int __kprobes arch_prepare_optimized_kprobe(struct optimized_kprobe *op)
17490 * Verify if the address gap is in 2GB range, because this uses
17491 * a relative jump.
17492 */
17493- rel = (long)op->optinsn.insn - (long)op->kp.addr + RELATIVEJUMP_SIZE;
17494+ rel = (long)op->optinsn.insn - ktla_ktva((long)op->kp.addr) + RELATIVEJUMP_SIZE;
17495 if (abs(rel) > 0x7fffffff)
17496 return -ERANGE;
17497
17498@@ -1405,11 +1415,11 @@ int __kprobes arch_prepare_optimized_kprobe(struct optimized_kprobe *op)
17499 synthesize_set_arg1(buf + TMPL_MOVE_IDX, (unsigned long)op);
17500
17501 /* Set probe function call */
17502- synthesize_relcall(buf + TMPL_CALL_IDX, optimized_callback);
17503+ synthesize_relcall(buf + TMPL_CALL_IDX, ktla_ktva(optimized_callback));
17504
17505 /* Set returning jmp instruction at the tail of out-of-line buffer */
17506 synthesize_reljump(buf + TMPL_END_IDX + op->optinsn.size,
17507- (u8 *)op->kp.addr + op->optinsn.size);
17508+ (u8 *)ktla_ktva(op->kp.addr) + op->optinsn.size);
17509
17510 flush_icache_range((unsigned long) buf,
17511 (unsigned long) buf + TMPL_END_IDX +
17512@@ -1431,7 +1441,7 @@ static void __kprobes setup_optimize_kprobe(struct text_poke_param *tprm,
17513 ((long)op->kp.addr + RELATIVEJUMP_SIZE));
17514
17515 /* Backup instructions which will be replaced by jump address */
17516- memcpy(op->optinsn.copied_insn, op->kp.addr + INT3_SIZE,
17517+ memcpy(op->optinsn.copied_insn, ktla_ktva(op->kp.addr) + INT3_SIZE,
17518 RELATIVE_ADDR_SIZE);
17519
17520 insn_buf[0] = RELATIVEJUMP_OPCODE;
17521diff --git a/arch/x86/kernel/kvm.c b/arch/x86/kernel/kvm.c
17522index a9c2116..a52d4fc 100644
17523--- a/arch/x86/kernel/kvm.c
17524+++ b/arch/x86/kernel/kvm.c
17525@@ -437,6 +437,7 @@ static void __init paravirt_ops_setup(void)
17526 pv_mmu_ops.set_pud = kvm_set_pud;
17527 #if PAGETABLE_LEVELS == 4
17528 pv_mmu_ops.set_pgd = kvm_set_pgd;
17529+ pv_mmu_ops.set_pgd_batched = kvm_set_pgd;
17530 #endif
17531 #endif
17532 pv_mmu_ops.flush_tlb_user = kvm_flush_tlb;
17533diff --git a/arch/x86/kernel/ldt.c b/arch/x86/kernel/ldt.c
17534index ea69726..8b497c9 100644
17535--- a/arch/x86/kernel/ldt.c
17536+++ b/arch/x86/kernel/ldt.c
17537@@ -67,13 +67,13 @@ static int alloc_ldt(mm_context_t *pc, int mincount, int reload)
17538 if (reload) {
17539 #ifdef CONFIG_SMP
17540 preempt_disable();
17541- load_LDT(pc);
17542+ load_LDT_nolock(pc);
17543 if (!cpumask_equal(mm_cpumask(current->mm),
17544 cpumask_of(smp_processor_id())))
17545 smp_call_function(flush_ldt, current->mm, 1);
17546 preempt_enable();
17547 #else
17548- load_LDT(pc);
17549+ load_LDT_nolock(pc);
17550 #endif
17551 }
17552 if (oldsize) {
17553@@ -95,7 +95,7 @@ static inline int copy_ldt(mm_context_t *new, mm_context_t *old)
17554 return err;
17555
17556 for (i = 0; i < old->size; i++)
17557- write_ldt_entry(new->ldt, i, old->ldt + i * LDT_ENTRY_SIZE);
17558+ write_ldt_entry(new->ldt, i, old->ldt + i);
17559 return 0;
17560 }
17561
17562@@ -116,6 +116,24 @@ int init_new_context(struct task_struct *tsk, struct mm_struct *mm)
17563 retval = copy_ldt(&mm->context, &old_mm->context);
17564 mutex_unlock(&old_mm->context.lock);
17565 }
17566+
17567+ if (tsk == current) {
17568+ mm->context.vdso = 0;
17569+
17570+#ifdef CONFIG_X86_32
17571+#if defined(CONFIG_PAX_PAGEEXEC) || defined(CONFIG_PAX_SEGMEXEC)
17572+ mm->context.user_cs_base = 0UL;
17573+ mm->context.user_cs_limit = ~0UL;
17574+
17575+#if defined(CONFIG_PAX_PAGEEXEC) && defined(CONFIG_SMP)
17576+ cpus_clear(mm->context.cpu_user_cs_mask);
17577+#endif
17578+
17579+#endif
17580+#endif
17581+
17582+ }
17583+
17584 return retval;
17585 }
17586
17587@@ -141,6 +159,7 @@ void destroy_context(struct mm_struct *mm)
17588 }
17589 }
17590
17591+static int read_ldt(void __user *ptr, unsigned long bytecount) __size_overflow(2);
17592 static int read_ldt(void __user *ptr, unsigned long bytecount)
17593 {
17594 int err;
17595@@ -230,6 +249,13 @@ static int write_ldt(void __user *ptr, unsigned long bytecount, int oldmode)
17596 }
17597 }
17598
17599+#ifdef CONFIG_PAX_SEGMEXEC
17600+ if ((mm->pax_flags & MF_PAX_SEGMEXEC) && (ldt_info.contents & MODIFY_LDT_CONTENTS_CODE)) {
17601+ error = -EINVAL;
17602+ goto out_unlock;
17603+ }
17604+#endif
17605+
17606 fill_ldt(&ldt, &ldt_info);
17607 if (oldmode)
17608 ldt.avl = 0;
17609diff --git a/arch/x86/kernel/machine_kexec_32.c b/arch/x86/kernel/machine_kexec_32.c
17610index a3fa43b..8966f4c 100644
17611--- a/arch/x86/kernel/machine_kexec_32.c
17612+++ b/arch/x86/kernel/machine_kexec_32.c
17613@@ -27,7 +27,7 @@
17614 #include <asm/cacheflush.h>
17615 #include <asm/debugreg.h>
17616
17617-static void set_idt(void *newidt, __u16 limit)
17618+static void set_idt(struct desc_struct *newidt, __u16 limit)
17619 {
17620 struct desc_ptr curidt;
17621
17622@@ -39,7 +39,7 @@ static void set_idt(void *newidt, __u16 limit)
17623 }
17624
17625
17626-static void set_gdt(void *newgdt, __u16 limit)
17627+static void set_gdt(struct desc_struct *newgdt, __u16 limit)
17628 {
17629 struct desc_ptr curgdt;
17630
17631@@ -217,7 +217,7 @@ void machine_kexec(struct kimage *image)
17632 }
17633
17634 control_page = page_address(image->control_code_page);
17635- memcpy(control_page, relocate_kernel, KEXEC_CONTROL_CODE_MAX_SIZE);
17636+ memcpy(control_page, (void *)ktla_ktva((unsigned long)relocate_kernel), KEXEC_CONTROL_CODE_MAX_SIZE);
17637
17638 relocate_kernel_ptr = control_page;
17639 page_list[PA_CONTROL_PAGE] = __pa(control_page);
17640diff --git a/arch/x86/kernel/microcode_intel.c b/arch/x86/kernel/microcode_intel.c
17641index 3ca42d0..79d24cd 100644
17642--- a/arch/x86/kernel/microcode_intel.c
17643+++ b/arch/x86/kernel/microcode_intel.c
17644@@ -434,15 +434,16 @@ static enum ucode_state request_microcode_fw(int cpu, struct device *device)
17645 return ret;
17646 }
17647
17648+static int get_ucode_user(void *to, const void *from, size_t n) __size_overflow(3);
17649 static int get_ucode_user(void *to, const void *from, size_t n)
17650 {
17651- return copy_from_user(to, from, n);
17652+ return copy_from_user(to, (const void __force_user *)from, n);
17653 }
17654
17655 static enum ucode_state
17656 request_microcode_user(int cpu, const void __user *buf, size_t size)
17657 {
17658- return generic_load_microcode(cpu, (void *)buf, size, &get_ucode_user);
17659+ return generic_load_microcode(cpu, (__force_kernel void *)buf, size, &get_ucode_user);
17660 }
17661
17662 static void microcode_fini_cpu(int cpu)
17663diff --git a/arch/x86/kernel/module.c b/arch/x86/kernel/module.c
17664index 925179f..267ac7a 100644
17665--- a/arch/x86/kernel/module.c
17666+++ b/arch/x86/kernel/module.c
17667@@ -36,15 +36,60 @@
17668 #define DEBUGP(fmt...)
17669 #endif
17670
17671-void *module_alloc(unsigned long size)
17672+static inline void *__module_alloc(unsigned long size, pgprot_t prot)
17673 {
17674- if (PAGE_ALIGN(size) > MODULES_LEN)
17675+ if (size == 0 || PAGE_ALIGN(size) > MODULES_LEN)
17676 return NULL;
17677 return __vmalloc_node_range(size, 1, MODULES_VADDR, MODULES_END,
17678- GFP_KERNEL | __GFP_HIGHMEM, PAGE_KERNEL_EXEC,
17679+ GFP_KERNEL | __GFP_HIGHMEM | __GFP_ZERO, prot,
17680 -1, __builtin_return_address(0));
17681 }
17682
17683+void *module_alloc(unsigned long size)
17684+{
17685+
17686+#ifdef CONFIG_PAX_KERNEXEC
17687+ return __module_alloc(size, PAGE_KERNEL);
17688+#else
17689+ return __module_alloc(size, PAGE_KERNEL_EXEC);
17690+#endif
17691+
17692+}
17693+
17694+#ifdef CONFIG_PAX_KERNEXEC
17695+#ifdef CONFIG_X86_32
17696+void *module_alloc_exec(unsigned long size)
17697+{
17698+ struct vm_struct *area;
17699+
17700+ if (size == 0)
17701+ return NULL;
17702+
17703+ area = __get_vm_area(size, VM_ALLOC, (unsigned long)&MODULES_EXEC_VADDR, (unsigned long)&MODULES_EXEC_END);
17704+ return area ? area->addr : NULL;
17705+}
17706+EXPORT_SYMBOL(module_alloc_exec);
17707+
17708+void module_free_exec(struct module *mod, void *module_region)
17709+{
17710+ vunmap(module_region);
17711+}
17712+EXPORT_SYMBOL(module_free_exec);
17713+#else
17714+void module_free_exec(struct module *mod, void *module_region)
17715+{
17716+ module_free(mod, module_region);
17717+}
17718+EXPORT_SYMBOL(module_free_exec);
17719+
17720+void *module_alloc_exec(unsigned long size)
17721+{
17722+ return __module_alloc(size, PAGE_KERNEL_RX);
17723+}
17724+EXPORT_SYMBOL(module_alloc_exec);
17725+#endif
17726+#endif
17727+
17728 #ifdef CONFIG_X86_32
17729 int apply_relocate(Elf32_Shdr *sechdrs,
17730 const char *strtab,
17731@@ -55,14 +100,16 @@ int apply_relocate(Elf32_Shdr *sechdrs,
17732 unsigned int i;
17733 Elf32_Rel *rel = (void *)sechdrs[relsec].sh_addr;
17734 Elf32_Sym *sym;
17735- uint32_t *location;
17736+ uint32_t *plocation, location;
17737
17738 DEBUGP("Applying relocate section %u to %u\n", relsec,
17739 sechdrs[relsec].sh_info);
17740 for (i = 0; i < sechdrs[relsec].sh_size / sizeof(*rel); i++) {
17741 /* This is where to make the change */
17742- location = (void *)sechdrs[sechdrs[relsec].sh_info].sh_addr
17743- + rel[i].r_offset;
17744+ plocation = (void *)sechdrs[sechdrs[relsec].sh_info].sh_addr + rel[i].r_offset;
17745+ location = (uint32_t)plocation;
17746+ if (sechdrs[sechdrs[relsec].sh_info].sh_flags & SHF_EXECINSTR)
17747+ plocation = ktla_ktva((void *)plocation);
17748 /* This is the symbol it is referring to. Note that all
17749 undefined symbols have been resolved. */
17750 sym = (Elf32_Sym *)sechdrs[symindex].sh_addr
17751@@ -71,11 +118,15 @@ int apply_relocate(Elf32_Shdr *sechdrs,
17752 switch (ELF32_R_TYPE(rel[i].r_info)) {
17753 case R_386_32:
17754 /* We add the value into the location given */
17755- *location += sym->st_value;
17756+ pax_open_kernel();
17757+ *plocation += sym->st_value;
17758+ pax_close_kernel();
17759 break;
17760 case R_386_PC32:
17761 /* Add the value, subtract its postition */
17762- *location += sym->st_value - (uint32_t)location;
17763+ pax_open_kernel();
17764+ *plocation += sym->st_value - location;
17765+ pax_close_kernel();
17766 break;
17767 default:
17768 printk(KERN_ERR "module %s: Unknown relocation: %u\n",
17769@@ -120,21 +171,30 @@ int apply_relocate_add(Elf64_Shdr *sechdrs,
17770 case R_X86_64_NONE:
17771 break;
17772 case R_X86_64_64:
17773+ pax_open_kernel();
17774 *(u64 *)loc = val;
17775+ pax_close_kernel();
17776 break;
17777 case R_X86_64_32:
17778+ pax_open_kernel();
17779 *(u32 *)loc = val;
17780+ pax_close_kernel();
17781 if (val != *(u32 *)loc)
17782 goto overflow;
17783 break;
17784 case R_X86_64_32S:
17785+ pax_open_kernel();
17786 *(s32 *)loc = val;
17787+ pax_close_kernel();
17788 if ((s64)val != *(s32 *)loc)
17789 goto overflow;
17790 break;
17791 case R_X86_64_PC32:
17792 val -= (u64)loc;
17793+ pax_open_kernel();
17794 *(u32 *)loc = val;
17795+ pax_close_kernel();
17796+
17797 #if 0
17798 if ((s64)val != *(s32 *)loc)
17799 goto overflow;
17800diff --git a/arch/x86/kernel/nmi.c b/arch/x86/kernel/nmi.c
17801index e88f37b..1353db6 100644
17802--- a/arch/x86/kernel/nmi.c
17803+++ b/arch/x86/kernel/nmi.c
17804@@ -408,6 +408,17 @@ static notrace __kprobes void default_do_nmi(struct pt_regs *regs)
17805 dotraplinkage notrace __kprobes void
17806 do_nmi(struct pt_regs *regs, long error_code)
17807 {
17808+
17809+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
17810+ if (!user_mode(regs)) {
17811+ unsigned long cs = regs->cs & 0xFFFF;
17812+ unsigned long ip = ktva_ktla(regs->ip);
17813+
17814+ if ((cs == __KERNEL_CS || cs == __KERNEXEC_KERNEL_CS) && ip <= (unsigned long)_etext)
17815+ regs->ip = ip;
17816+ }
17817+#endif
17818+
17819 nmi_enter();
17820
17821 inc_irq_stat(__nmi_count);
17822diff --git a/arch/x86/kernel/paravirt-spinlocks.c b/arch/x86/kernel/paravirt-spinlocks.c
17823index 676b8c7..870ba04 100644
17824--- a/arch/x86/kernel/paravirt-spinlocks.c
17825+++ b/arch/x86/kernel/paravirt-spinlocks.c
17826@@ -13,7 +13,7 @@ default_spin_lock_flags(arch_spinlock_t *lock, unsigned long flags)
17827 arch_spin_lock(lock);
17828 }
17829
17830-struct pv_lock_ops pv_lock_ops = {
17831+struct pv_lock_ops pv_lock_ops __read_only = {
17832 #ifdef CONFIG_SMP
17833 .spin_is_locked = __ticket_spin_is_locked,
17834 .spin_is_contended = __ticket_spin_is_contended,
17835diff --git a/arch/x86/kernel/paravirt.c b/arch/x86/kernel/paravirt.c
17836index d90272e..6bb013b 100644
17837--- a/arch/x86/kernel/paravirt.c
17838+++ b/arch/x86/kernel/paravirt.c
17839@@ -53,6 +53,9 @@ u64 _paravirt_ident_64(u64 x)
17840 {
17841 return x;
17842 }
17843+#if defined(CONFIG_X86_32) && defined(CONFIG_X86_PAE)
17844+PV_CALLEE_SAVE_REGS_THUNK(_paravirt_ident_64);
17845+#endif
17846
17847 void __init default_banner(void)
17848 {
17849@@ -145,15 +148,19 @@ unsigned paravirt_patch_default(u8 type, u16 clobbers, void *insnbuf,
17850 if (opfunc == NULL)
17851 /* If there's no function, patch it with a ud2a (BUG) */
17852 ret = paravirt_patch_insns(insnbuf, len, ud2a, ud2a+sizeof(ud2a));
17853- else if (opfunc == _paravirt_nop)
17854+ else if (opfunc == (void *)_paravirt_nop)
17855 /* If the operation is a nop, then nop the callsite */
17856 ret = paravirt_patch_nop();
17857
17858 /* identity functions just return their single argument */
17859- else if (opfunc == _paravirt_ident_32)
17860+ else if (opfunc == (void *)_paravirt_ident_32)
17861 ret = paravirt_patch_ident_32(insnbuf, len);
17862- else if (opfunc == _paravirt_ident_64)
17863+ else if (opfunc == (void *)_paravirt_ident_64)
17864 ret = paravirt_patch_ident_64(insnbuf, len);
17865+#if defined(CONFIG_X86_32) && defined(CONFIG_X86_PAE)
17866+ else if (opfunc == (void *)__raw_callee_save__paravirt_ident_64)
17867+ ret = paravirt_patch_ident_64(insnbuf, len);
17868+#endif
17869
17870 else if (type == PARAVIRT_PATCH(pv_cpu_ops.iret) ||
17871 type == PARAVIRT_PATCH(pv_cpu_ops.irq_enable_sysexit) ||
17872@@ -178,7 +185,7 @@ unsigned paravirt_patch_insns(void *insnbuf, unsigned len,
17873 if (insn_len > len || start == NULL)
17874 insn_len = len;
17875 else
17876- memcpy(insnbuf, start, insn_len);
17877+ memcpy(insnbuf, ktla_ktva(start), insn_len);
17878
17879 return insn_len;
17880 }
17881@@ -302,7 +309,7 @@ void arch_flush_lazy_mmu_mode(void)
17882 preempt_enable();
17883 }
17884
17885-struct pv_info pv_info = {
17886+struct pv_info pv_info __read_only = {
17887 .name = "bare hardware",
17888 .paravirt_enabled = 0,
17889 .kernel_rpl = 0,
17890@@ -313,16 +320,16 @@ struct pv_info pv_info = {
17891 #endif
17892 };
17893
17894-struct pv_init_ops pv_init_ops = {
17895+struct pv_init_ops pv_init_ops __read_only = {
17896 .patch = native_patch,
17897 };
17898
17899-struct pv_time_ops pv_time_ops = {
17900+struct pv_time_ops pv_time_ops __read_only = {
17901 .sched_clock = native_sched_clock,
17902 .steal_clock = native_steal_clock,
17903 };
17904
17905-struct pv_irq_ops pv_irq_ops = {
17906+struct pv_irq_ops pv_irq_ops __read_only = {
17907 .save_fl = __PV_IS_CALLEE_SAVE(native_save_fl),
17908 .restore_fl = __PV_IS_CALLEE_SAVE(native_restore_fl),
17909 .irq_disable = __PV_IS_CALLEE_SAVE(native_irq_disable),
17910@@ -334,7 +341,7 @@ struct pv_irq_ops pv_irq_ops = {
17911 #endif
17912 };
17913
17914-struct pv_cpu_ops pv_cpu_ops = {
17915+struct pv_cpu_ops pv_cpu_ops __read_only = {
17916 .cpuid = native_cpuid,
17917 .get_debugreg = native_get_debugreg,
17918 .set_debugreg = native_set_debugreg,
17919@@ -395,21 +402,26 @@ struct pv_cpu_ops pv_cpu_ops = {
17920 .end_context_switch = paravirt_nop,
17921 };
17922
17923-struct pv_apic_ops pv_apic_ops = {
17924+struct pv_apic_ops pv_apic_ops __read_only = {
17925 #ifdef CONFIG_X86_LOCAL_APIC
17926 .startup_ipi_hook = paravirt_nop,
17927 #endif
17928 };
17929
17930-#if defined(CONFIG_X86_32) && !defined(CONFIG_X86_PAE)
17931+#ifdef CONFIG_X86_32
17932+#ifdef CONFIG_X86_PAE
17933+/* 64-bit pagetable entries */
17934+#define PTE_IDENT PV_CALLEE_SAVE(_paravirt_ident_64)
17935+#else
17936 /* 32-bit pagetable entries */
17937 #define PTE_IDENT __PV_IS_CALLEE_SAVE(_paravirt_ident_32)
17938+#endif
17939 #else
17940 /* 64-bit pagetable entries */
17941 #define PTE_IDENT __PV_IS_CALLEE_SAVE(_paravirt_ident_64)
17942 #endif
17943
17944-struct pv_mmu_ops pv_mmu_ops = {
17945+struct pv_mmu_ops pv_mmu_ops __read_only = {
17946
17947 .read_cr2 = native_read_cr2,
17948 .write_cr2 = native_write_cr2,
17949@@ -459,6 +471,7 @@ struct pv_mmu_ops pv_mmu_ops = {
17950 .make_pud = PTE_IDENT,
17951
17952 .set_pgd = native_set_pgd,
17953+ .set_pgd_batched = native_set_pgd_batched,
17954 #endif
17955 #endif /* PAGETABLE_LEVELS >= 3 */
17956
17957@@ -478,6 +491,12 @@ struct pv_mmu_ops pv_mmu_ops = {
17958 },
17959
17960 .set_fixmap = native_set_fixmap,
17961+
17962+#ifdef CONFIG_PAX_KERNEXEC
17963+ .pax_open_kernel = native_pax_open_kernel,
17964+ .pax_close_kernel = native_pax_close_kernel,
17965+#endif
17966+
17967 };
17968
17969 EXPORT_SYMBOL_GPL(pv_time_ops);
17970diff --git a/arch/x86/kernel/pci-iommu_table.c b/arch/x86/kernel/pci-iommu_table.c
17971index 35ccf75..7a15747 100644
17972--- a/arch/x86/kernel/pci-iommu_table.c
17973+++ b/arch/x86/kernel/pci-iommu_table.c
17974@@ -2,7 +2,7 @@
17975 #include <asm/iommu_table.h>
17976 #include <linux/string.h>
17977 #include <linux/kallsyms.h>
17978-
17979+#include <linux/sched.h>
17980
17981 #define DEBUG 1
17982
17983diff --git a/arch/x86/kernel/process.c b/arch/x86/kernel/process.c
17984index ee5d4fb..426649b 100644
17985--- a/arch/x86/kernel/process.c
17986+++ b/arch/x86/kernel/process.c
17987@@ -48,16 +48,33 @@ void free_thread_xstate(struct task_struct *tsk)
17988
17989 void free_thread_info(struct thread_info *ti)
17990 {
17991- free_thread_xstate(ti->task);
17992 free_pages((unsigned long)ti, THREAD_ORDER);
17993 }
17994
17995+static struct kmem_cache *task_struct_cachep;
17996+
17997 void arch_task_cache_init(void)
17998 {
17999- task_xstate_cachep =
18000- kmem_cache_create("task_xstate", xstate_size,
18001+ /* create a slab on which task_structs can be allocated */
18002+ task_struct_cachep =
18003+ kmem_cache_create("task_struct", sizeof(struct task_struct),
18004+ ARCH_MIN_TASKALIGN, SLAB_PANIC | SLAB_NOTRACK, NULL);
18005+
18006+ task_xstate_cachep =
18007+ kmem_cache_create("task_xstate", xstate_size,
18008 __alignof__(union thread_xstate),
18009- SLAB_PANIC | SLAB_NOTRACK, NULL);
18010+ SLAB_PANIC | SLAB_NOTRACK | SLAB_USERCOPY, NULL);
18011+}
18012+
18013+struct task_struct *alloc_task_struct_node(int node)
18014+{
18015+ return kmem_cache_alloc_node(task_struct_cachep, GFP_KERNEL, node);
18016+}
18017+
18018+void free_task_struct(struct task_struct *task)
18019+{
18020+ free_thread_xstate(task);
18021+ kmem_cache_free(task_struct_cachep, task);
18022 }
18023
18024 /*
18025@@ -70,7 +87,7 @@ void exit_thread(void)
18026 unsigned long *bp = t->io_bitmap_ptr;
18027
18028 if (bp) {
18029- struct tss_struct *tss = &per_cpu(init_tss, get_cpu());
18030+ struct tss_struct *tss = init_tss + get_cpu();
18031
18032 t->io_bitmap_ptr = NULL;
18033 clear_thread_flag(TIF_IO_BITMAP);
18034@@ -106,7 +123,7 @@ void show_regs_common(void)
18035
18036 printk(KERN_CONT "\n");
18037 printk(KERN_DEFAULT "Pid: %d, comm: %.20s %s %s %.*s",
18038- current->pid, current->comm, print_tainted(),
18039+ task_pid_nr(current), current->comm, print_tainted(),
18040 init_utsname()->release,
18041 (int)strcspn(init_utsname()->version, " "),
18042 init_utsname()->version);
18043@@ -120,6 +137,9 @@ void flush_thread(void)
18044 {
18045 struct task_struct *tsk = current;
18046
18047+#if defined(CONFIG_X86_32) && !defined(CONFIG_CC_STACKPROTECTOR) && !defined(CONFIG_PAX_MEMORY_UDEREF)
18048+ loadsegment(gs, 0);
18049+#endif
18050 flush_ptrace_hw_breakpoint(tsk);
18051 memset(tsk->thread.tls_array, 0, sizeof(tsk->thread.tls_array));
18052 /*
18053@@ -282,10 +302,10 @@ int kernel_thread(int (*fn)(void *), void *arg, unsigned long flags)
18054 regs.di = (unsigned long) arg;
18055
18056 #ifdef CONFIG_X86_32
18057- regs.ds = __USER_DS;
18058- regs.es = __USER_DS;
18059+ regs.ds = __KERNEL_DS;
18060+ regs.es = __KERNEL_DS;
18061 regs.fs = __KERNEL_PERCPU;
18062- regs.gs = __KERNEL_STACK_CANARY;
18063+ savesegment(gs, regs.gs);
18064 #else
18065 regs.ss = __KERNEL_DS;
18066 #endif
18067@@ -411,7 +431,7 @@ bool set_pm_idle_to_default(void)
18068
18069 return ret;
18070 }
18071-void stop_this_cpu(void *dummy)
18072+__noreturn void stop_this_cpu(void *dummy)
18073 {
18074 local_irq_disable();
18075 /*
18076@@ -653,16 +673,37 @@ static int __init idle_setup(char *str)
18077 }
18078 early_param("idle", idle_setup);
18079
18080-unsigned long arch_align_stack(unsigned long sp)
18081+#ifdef CONFIG_PAX_RANDKSTACK
18082+void pax_randomize_kstack(struct pt_regs *regs)
18083 {
18084- if (!(current->personality & ADDR_NO_RANDOMIZE) && randomize_va_space)
18085- sp -= get_random_int() % 8192;
18086- return sp & ~0xf;
18087-}
18088+ struct thread_struct *thread = &current->thread;
18089+ unsigned long time;
18090
18091-unsigned long arch_randomize_brk(struct mm_struct *mm)
18092-{
18093- unsigned long range_end = mm->brk + 0x02000000;
18094- return randomize_range(mm->brk, range_end, 0) ? : mm->brk;
18095-}
18096+ if (!randomize_va_space)
18097+ return;
18098+
18099+ if (v8086_mode(regs))
18100+ return;
18101
18102+ rdtscl(time);
18103+
18104+ /* P4 seems to return a 0 LSB, ignore it */
18105+#ifdef CONFIG_MPENTIUM4
18106+ time &= 0x3EUL;
18107+ time <<= 2;
18108+#elif defined(CONFIG_X86_64)
18109+ time &= 0xFUL;
18110+ time <<= 4;
18111+#else
18112+ time &= 0x1FUL;
18113+ time <<= 3;
18114+#endif
18115+
18116+ thread->sp0 ^= time;
18117+ load_sp0(init_tss + smp_processor_id(), thread);
18118+
18119+#ifdef CONFIG_X86_64
18120+ percpu_write(kernel_stack, thread->sp0);
18121+#endif
18122+}
18123+#endif
18124diff --git a/arch/x86/kernel/process_32.c b/arch/x86/kernel/process_32.c
18125index 8598296..bfadef0 100644
18126--- a/arch/x86/kernel/process_32.c
18127+++ b/arch/x86/kernel/process_32.c
18128@@ -67,6 +67,7 @@ asmlinkage void ret_from_fork(void) __asm__("ret_from_fork");
18129 unsigned long thread_saved_pc(struct task_struct *tsk)
18130 {
18131 return ((unsigned long *)tsk->thread.sp)[3];
18132+//XXX return tsk->thread.eip;
18133 }
18134
18135 #ifndef CONFIG_SMP
18136@@ -130,15 +131,14 @@ void __show_regs(struct pt_regs *regs, int all)
18137 unsigned long sp;
18138 unsigned short ss, gs;
18139
18140- if (user_mode_vm(regs)) {
18141+ if (user_mode(regs)) {
18142 sp = regs->sp;
18143 ss = regs->ss & 0xffff;
18144- gs = get_user_gs(regs);
18145 } else {
18146 sp = kernel_stack_pointer(regs);
18147 savesegment(ss, ss);
18148- savesegment(gs, gs);
18149 }
18150+ gs = get_user_gs(regs);
18151
18152 show_regs_common();
18153
18154@@ -200,13 +200,14 @@ int copy_thread(unsigned long clone_flags, unsigned long sp,
18155 struct task_struct *tsk;
18156 int err;
18157
18158- childregs = task_pt_regs(p);
18159+ childregs = task_stack_page(p) + THREAD_SIZE - sizeof(struct pt_regs) - 8;
18160 *childregs = *regs;
18161 childregs->ax = 0;
18162 childregs->sp = sp;
18163
18164 p->thread.sp = (unsigned long) childregs;
18165 p->thread.sp0 = (unsigned long) (childregs+1);
18166+ p->tinfo.lowest_stack = (unsigned long)task_stack_page(p);
18167
18168 p->thread.ip = (unsigned long) ret_from_fork;
18169
18170@@ -296,7 +297,7 @@ __switch_to(struct task_struct *prev_p, struct task_struct *next_p)
18171 struct thread_struct *prev = &prev_p->thread,
18172 *next = &next_p->thread;
18173 int cpu = smp_processor_id();
18174- struct tss_struct *tss = &per_cpu(init_tss, cpu);
18175+ struct tss_struct *tss = init_tss + cpu;
18176 fpu_switch_t fpu;
18177
18178 /* never put a printk in __switch_to... printk() calls wake_up*() indirectly */
18179@@ -320,6 +321,10 @@ __switch_to(struct task_struct *prev_p, struct task_struct *next_p)
18180 */
18181 lazy_save_gs(prev->gs);
18182
18183+#ifdef CONFIG_PAX_MEMORY_UDEREF
18184+ __set_fs(task_thread_info(next_p)->addr_limit);
18185+#endif
18186+
18187 /*
18188 * Load the per-thread Thread-Local Storage descriptor.
18189 */
18190@@ -350,6 +355,9 @@ __switch_to(struct task_struct *prev_p, struct task_struct *next_p)
18191 */
18192 arch_end_context_switch(next_p);
18193
18194+ percpu_write(current_task, next_p);
18195+ percpu_write(current_tinfo, &next_p->tinfo);
18196+
18197 /*
18198 * Restore %gs if needed (which is common)
18199 */
18200@@ -358,8 +366,6 @@ __switch_to(struct task_struct *prev_p, struct task_struct *next_p)
18201
18202 switch_fpu_finish(next_p, fpu);
18203
18204- percpu_write(current_task, next_p);
18205-
18206 return prev_p;
18207 }
18208
18209@@ -389,4 +395,3 @@ unsigned long get_wchan(struct task_struct *p)
18210 } while (count++ < 16);
18211 return 0;
18212 }
18213-
18214diff --git a/arch/x86/kernel/process_64.c b/arch/x86/kernel/process_64.c
18215index 6a364a6..b147d11 100644
18216--- a/arch/x86/kernel/process_64.c
18217+++ b/arch/x86/kernel/process_64.c
18218@@ -89,7 +89,7 @@ static void __exit_idle(void)
18219 void exit_idle(void)
18220 {
18221 /* idle loop has pid 0 */
18222- if (current->pid)
18223+ if (task_pid_nr(current))
18224 return;
18225 __exit_idle();
18226 }
18227@@ -264,8 +264,7 @@ int copy_thread(unsigned long clone_flags, unsigned long sp,
18228 struct pt_regs *childregs;
18229 struct task_struct *me = current;
18230
18231- childregs = ((struct pt_regs *)
18232- (THREAD_SIZE + task_stack_page(p))) - 1;
18233+ childregs = task_stack_page(p) + THREAD_SIZE - sizeof(struct pt_regs) - 16;
18234 *childregs = *regs;
18235
18236 childregs->ax = 0;
18237@@ -277,6 +276,7 @@ int copy_thread(unsigned long clone_flags, unsigned long sp,
18238 p->thread.sp = (unsigned long) childregs;
18239 p->thread.sp0 = (unsigned long) (childregs+1);
18240 p->thread.usersp = me->thread.usersp;
18241+ p->tinfo.lowest_stack = (unsigned long)task_stack_page(p);
18242
18243 set_tsk_thread_flag(p, TIF_FORK);
18244
18245@@ -379,7 +379,7 @@ __switch_to(struct task_struct *prev_p, struct task_struct *next_p)
18246 struct thread_struct *prev = &prev_p->thread;
18247 struct thread_struct *next = &next_p->thread;
18248 int cpu = smp_processor_id();
18249- struct tss_struct *tss = &per_cpu(init_tss, cpu);
18250+ struct tss_struct *tss = init_tss + cpu;
18251 unsigned fsindex, gsindex;
18252 fpu_switch_t fpu;
18253
18254@@ -461,10 +461,9 @@ __switch_to(struct task_struct *prev_p, struct task_struct *next_p)
18255 prev->usersp = percpu_read(old_rsp);
18256 percpu_write(old_rsp, next->usersp);
18257 percpu_write(current_task, next_p);
18258+ percpu_write(current_tinfo, &next_p->tinfo);
18259
18260- percpu_write(kernel_stack,
18261- (unsigned long)task_stack_page(next_p) +
18262- THREAD_SIZE - KERNEL_STACK_OFFSET);
18263+ percpu_write(kernel_stack, next->sp0);
18264
18265 /*
18266 * Now maybe reload the debug registers and handle I/O bitmaps
18267@@ -519,12 +518,11 @@ unsigned long get_wchan(struct task_struct *p)
18268 if (!p || p == current || p->state == TASK_RUNNING)
18269 return 0;
18270 stack = (unsigned long)task_stack_page(p);
18271- if (p->thread.sp < stack || p->thread.sp >= stack+THREAD_SIZE)
18272+ if (p->thread.sp < stack || p->thread.sp > stack+THREAD_SIZE-16-sizeof(u64))
18273 return 0;
18274 fp = *(u64 *)(p->thread.sp);
18275 do {
18276- if (fp < (unsigned long)stack ||
18277- fp >= (unsigned long)stack+THREAD_SIZE)
18278+ if (fp < stack || fp > stack+THREAD_SIZE-16-sizeof(u64))
18279 return 0;
18280 ip = *(u64 *)(fp+8);
18281 if (!in_sched_functions(ip))
18282diff --git a/arch/x86/kernel/ptrace.c b/arch/x86/kernel/ptrace.c
18283index 8252879..f367ec9 100644
18284--- a/arch/x86/kernel/ptrace.c
18285+++ b/arch/x86/kernel/ptrace.c
18286@@ -791,6 +791,10 @@ static int ioperm_active(struct task_struct *target,
18287 static int ioperm_get(struct task_struct *target,
18288 const struct user_regset *regset,
18289 unsigned int pos, unsigned int count,
18290+ void *kbuf, void __user *ubuf) __size_overflow(3,4);
18291+static int ioperm_get(struct task_struct *target,
18292+ const struct user_regset *regset,
18293+ unsigned int pos, unsigned int count,
18294 void *kbuf, void __user *ubuf)
18295 {
18296 if (!target->thread.io_bitmap_ptr)
18297@@ -822,7 +826,7 @@ long arch_ptrace(struct task_struct *child, long request,
18298 unsigned long addr, unsigned long data)
18299 {
18300 int ret;
18301- unsigned long __user *datap = (unsigned long __user *)data;
18302+ unsigned long __user *datap = (__force unsigned long __user *)data;
18303
18304 switch (request) {
18305 /* read the word at location addr in the USER area. */
18306@@ -907,14 +911,14 @@ long arch_ptrace(struct task_struct *child, long request,
18307 if ((int) addr < 0)
18308 return -EIO;
18309 ret = do_get_thread_area(child, addr,
18310- (struct user_desc __user *)data);
18311+ (__force struct user_desc __user *) data);
18312 break;
18313
18314 case PTRACE_SET_THREAD_AREA:
18315 if ((int) addr < 0)
18316 return -EIO;
18317 ret = do_set_thread_area(child, addr,
18318- (struct user_desc __user *)data, 0);
18319+ (__force struct user_desc __user *) data, 0);
18320 break;
18321 #endif
18322
18323@@ -1331,7 +1335,7 @@ static void fill_sigtrap_info(struct task_struct *tsk,
18324 memset(info, 0, sizeof(*info));
18325 info->si_signo = SIGTRAP;
18326 info->si_code = si_code;
18327- info->si_addr = user_mode_vm(regs) ? (void __user *)regs->ip : NULL;
18328+ info->si_addr = user_mode(regs) ? (__force void __user *)regs->ip : NULL;
18329 }
18330
18331 void user_single_step_siginfo(struct task_struct *tsk,
18332diff --git a/arch/x86/kernel/pvclock.c b/arch/x86/kernel/pvclock.c
18333index 42eb330..139955c 100644
18334--- a/arch/x86/kernel/pvclock.c
18335+++ b/arch/x86/kernel/pvclock.c
18336@@ -81,11 +81,11 @@ unsigned long pvclock_tsc_khz(struct pvclock_vcpu_time_info *src)
18337 return pv_tsc_khz;
18338 }
18339
18340-static atomic64_t last_value = ATOMIC64_INIT(0);
18341+static atomic64_unchecked_t last_value = ATOMIC64_INIT(0);
18342
18343 void pvclock_resume(void)
18344 {
18345- atomic64_set(&last_value, 0);
18346+ atomic64_set_unchecked(&last_value, 0);
18347 }
18348
18349 cycle_t pvclock_clocksource_read(struct pvclock_vcpu_time_info *src)
18350@@ -121,11 +121,11 @@ cycle_t pvclock_clocksource_read(struct pvclock_vcpu_time_info *src)
18351 * updating at the same time, and one of them could be slightly behind,
18352 * making the assumption that last_value always go forward fail to hold.
18353 */
18354- last = atomic64_read(&last_value);
18355+ last = atomic64_read_unchecked(&last_value);
18356 do {
18357 if (ret < last)
18358 return last;
18359- last = atomic64_cmpxchg(&last_value, last, ret);
18360+ last = atomic64_cmpxchg_unchecked(&last_value, last, ret);
18361 } while (unlikely(last != ret));
18362
18363 return ret;
18364diff --git a/arch/x86/kernel/reboot.c b/arch/x86/kernel/reboot.c
18365index 37a458b..e63d183 100644
18366--- a/arch/x86/kernel/reboot.c
18367+++ b/arch/x86/kernel/reboot.c
18368@@ -35,7 +35,7 @@ void (*pm_power_off)(void);
18369 EXPORT_SYMBOL(pm_power_off);
18370
18371 static const struct desc_ptr no_idt = {};
18372-static int reboot_mode;
18373+static unsigned short reboot_mode;
18374 enum reboot_type reboot_type = BOOT_ACPI;
18375 int reboot_force;
18376
18377@@ -324,13 +324,17 @@ core_initcall(reboot_init);
18378 extern const unsigned char machine_real_restart_asm[];
18379 extern const u64 machine_real_restart_gdt[3];
18380
18381-void machine_real_restart(unsigned int type)
18382+__noreturn void machine_real_restart(unsigned int type)
18383 {
18384 void *restart_va;
18385 unsigned long restart_pa;
18386- void (*restart_lowmem)(unsigned int);
18387+ void (* __noreturn restart_lowmem)(unsigned int);
18388 u64 *lowmem_gdt;
18389
18390+#if defined(CONFIG_X86_32) && (defined(CONFIG_PAX_KERNEXEC) || defined(CONFIG_PAX_MEMORY_UDEREF))
18391+ struct desc_struct *gdt;
18392+#endif
18393+
18394 local_irq_disable();
18395
18396 /* Write zero to CMOS register number 0x0f, which the BIOS POST
18397@@ -356,14 +360,14 @@ void machine_real_restart(unsigned int type)
18398 boot)". This seems like a fairly standard thing that gets set by
18399 REBOOT.COM programs, and the previous reset routine did this
18400 too. */
18401- *((unsigned short *)0x472) = reboot_mode;
18402+ *(unsigned short *)(__va(0x472)) = reboot_mode;
18403
18404 /* Patch the GDT in the low memory trampoline */
18405 lowmem_gdt = TRAMPOLINE_SYM(machine_real_restart_gdt);
18406
18407 restart_va = TRAMPOLINE_SYM(machine_real_restart_asm);
18408 restart_pa = virt_to_phys(restart_va);
18409- restart_lowmem = (void (*)(unsigned int))restart_pa;
18410+ restart_lowmem = (void *)restart_pa;
18411
18412 /* GDT[0]: GDT self-pointer */
18413 lowmem_gdt[0] =
18414@@ -374,7 +378,33 @@ void machine_real_restart(unsigned int type)
18415 GDT_ENTRY(0x009b, restart_pa, 0xffff);
18416
18417 /* Jump to the identity-mapped low memory code */
18418+
18419+#if defined(CONFIG_X86_32) && (defined(CONFIG_PAX_KERNEXEC) || defined(CONFIG_PAX_MEMORY_UDEREF))
18420+ gdt = get_cpu_gdt_table(smp_processor_id());
18421+ pax_open_kernel();
18422+#ifdef CONFIG_PAX_MEMORY_UDEREF
18423+ gdt[GDT_ENTRY_KERNEL_DS].type = 3;
18424+ gdt[GDT_ENTRY_KERNEL_DS].limit = 0xf;
18425+ asm("mov %0, %%ds; mov %0, %%es; mov %0, %%ss" : : "r" (__KERNEL_DS) : "memory");
18426+#endif
18427+#ifdef CONFIG_PAX_KERNEXEC
18428+ gdt[GDT_ENTRY_KERNEL_CS].base0 = 0;
18429+ gdt[GDT_ENTRY_KERNEL_CS].base1 = 0;
18430+ gdt[GDT_ENTRY_KERNEL_CS].base2 = 0;
18431+ gdt[GDT_ENTRY_KERNEL_CS].limit0 = 0xffff;
18432+ gdt[GDT_ENTRY_KERNEL_CS].limit = 0xf;
18433+ gdt[GDT_ENTRY_KERNEL_CS].g = 1;
18434+#endif
18435+ pax_close_kernel();
18436+#endif
18437+
18438+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
18439+ asm volatile("push %0; push %1; lret\n" : : "i" (__KERNEL_CS), "rm" (restart_lowmem), "a" (type));
18440+ unreachable();
18441+#else
18442 restart_lowmem(type);
18443+#endif
18444+
18445 }
18446 #ifdef CONFIG_APM_MODULE
18447 EXPORT_SYMBOL(machine_real_restart);
18448@@ -540,7 +570,7 @@ void __attribute__((weak)) mach_reboot_fixups(void)
18449 * try to force a triple fault and then cycle between hitting the keyboard
18450 * controller and doing that
18451 */
18452-static void native_machine_emergency_restart(void)
18453+__noreturn static void native_machine_emergency_restart(void)
18454 {
18455 int i;
18456 int attempt = 0;
18457@@ -664,13 +694,13 @@ void native_machine_shutdown(void)
18458 #endif
18459 }
18460
18461-static void __machine_emergency_restart(int emergency)
18462+static __noreturn void __machine_emergency_restart(int emergency)
18463 {
18464 reboot_emergency = emergency;
18465 machine_ops.emergency_restart();
18466 }
18467
18468-static void native_machine_restart(char *__unused)
18469+static __noreturn void native_machine_restart(char *__unused)
18470 {
18471 printk("machine restart\n");
18472
18473@@ -679,7 +709,7 @@ static void native_machine_restart(char *__unused)
18474 __machine_emergency_restart(0);
18475 }
18476
18477-static void native_machine_halt(void)
18478+static __noreturn void native_machine_halt(void)
18479 {
18480 /* stop other cpus and apics */
18481 machine_shutdown();
18482@@ -690,7 +720,7 @@ static void native_machine_halt(void)
18483 stop_this_cpu(NULL);
18484 }
18485
18486-static void native_machine_power_off(void)
18487+__noreturn static void native_machine_power_off(void)
18488 {
18489 if (pm_power_off) {
18490 if (!reboot_force)
18491@@ -699,6 +729,7 @@ static void native_machine_power_off(void)
18492 }
18493 /* a fallback in case there is no PM info available */
18494 tboot_shutdown(TB_SHUTDOWN_HALT);
18495+ unreachable();
18496 }
18497
18498 struct machine_ops machine_ops = {
18499diff --git a/arch/x86/kernel/relocate_kernel_64.S b/arch/x86/kernel/relocate_kernel_64.S
18500index 7a6f3b3..bed145d7 100644
18501--- a/arch/x86/kernel/relocate_kernel_64.S
18502+++ b/arch/x86/kernel/relocate_kernel_64.S
18503@@ -11,6 +11,7 @@
18504 #include <asm/kexec.h>
18505 #include <asm/processor-flags.h>
18506 #include <asm/pgtable_types.h>
18507+#include <asm/alternative-asm.h>
18508
18509 /*
18510 * Must be relocatable PIC code callable as a C function
18511@@ -160,13 +161,14 @@ identity_mapped:
18512 xorq %rbp, %rbp
18513 xorq %r8, %r8
18514 xorq %r9, %r9
18515- xorq %r10, %r9
18516+ xorq %r10, %r10
18517 xorq %r11, %r11
18518 xorq %r12, %r12
18519 xorq %r13, %r13
18520 xorq %r14, %r14
18521 xorq %r15, %r15
18522
18523+ pax_force_retaddr 0, 1
18524 ret
18525
18526 1:
18527diff --git a/arch/x86/kernel/setup.c b/arch/x86/kernel/setup.c
18528index cf0ef98..e3f780b 100644
18529--- a/arch/x86/kernel/setup.c
18530+++ b/arch/x86/kernel/setup.c
18531@@ -447,7 +447,7 @@ static void __init parse_setup_data(void)
18532
18533 switch (data->type) {
18534 case SETUP_E820_EXT:
18535- parse_e820_ext(data);
18536+ parse_e820_ext((struct setup_data __force_kernel *)data);
18537 break;
18538 case SETUP_DTB:
18539 add_dtb(pa_data);
18540@@ -650,7 +650,7 @@ static void __init trim_bios_range(void)
18541 * area (640->1Mb) as ram even though it is not.
18542 * take them out.
18543 */
18544- e820_remove_range(BIOS_BEGIN, BIOS_END - BIOS_BEGIN, E820_RAM, 1);
18545+ e820_remove_range(ISA_START_ADDRESS, ISA_END_ADDRESS - ISA_START_ADDRESS, E820_RAM, 1);
18546 sanitize_e820_map(e820.map, ARRAY_SIZE(e820.map), &e820.nr_map);
18547 }
18548
18549@@ -773,14 +773,14 @@ void __init setup_arch(char **cmdline_p)
18550
18551 if (!boot_params.hdr.root_flags)
18552 root_mountflags &= ~MS_RDONLY;
18553- init_mm.start_code = (unsigned long) _text;
18554- init_mm.end_code = (unsigned long) _etext;
18555+ init_mm.start_code = ktla_ktva((unsigned long) _text);
18556+ init_mm.end_code = ktla_ktva((unsigned long) _etext);
18557 init_mm.end_data = (unsigned long) _edata;
18558 init_mm.brk = _brk_end;
18559
18560- code_resource.start = virt_to_phys(_text);
18561- code_resource.end = virt_to_phys(_etext)-1;
18562- data_resource.start = virt_to_phys(_etext);
18563+ code_resource.start = virt_to_phys(ktla_ktva(_text));
18564+ code_resource.end = virt_to_phys(ktla_ktva(_etext))-1;
18565+ data_resource.start = virt_to_phys(_sdata);
18566 data_resource.end = virt_to_phys(_edata)-1;
18567 bss_resource.start = virt_to_phys(&__bss_start);
18568 bss_resource.end = virt_to_phys(&__bss_stop)-1;
18569diff --git a/arch/x86/kernel/setup_percpu.c b/arch/x86/kernel/setup_percpu.c
18570index 71f4727..217419b 100644
18571--- a/arch/x86/kernel/setup_percpu.c
18572+++ b/arch/x86/kernel/setup_percpu.c
18573@@ -21,19 +21,17 @@
18574 #include <asm/cpu.h>
18575 #include <asm/stackprotector.h>
18576
18577-DEFINE_PER_CPU(int, cpu_number);
18578+#ifdef CONFIG_SMP
18579+DEFINE_PER_CPU(unsigned int, cpu_number);
18580 EXPORT_PER_CPU_SYMBOL(cpu_number);
18581+#endif
18582
18583-#ifdef CONFIG_X86_64
18584 #define BOOT_PERCPU_OFFSET ((unsigned long)__per_cpu_load)
18585-#else
18586-#define BOOT_PERCPU_OFFSET 0
18587-#endif
18588
18589 DEFINE_PER_CPU(unsigned long, this_cpu_off) = BOOT_PERCPU_OFFSET;
18590 EXPORT_PER_CPU_SYMBOL(this_cpu_off);
18591
18592-unsigned long __per_cpu_offset[NR_CPUS] __read_mostly = {
18593+unsigned long __per_cpu_offset[NR_CPUS] __read_only = {
18594 [0 ... NR_CPUS-1] = BOOT_PERCPU_OFFSET,
18595 };
18596 EXPORT_SYMBOL(__per_cpu_offset);
18597@@ -96,6 +94,8 @@ static bool __init pcpu_need_numa(void)
18598 * Pointer to the allocated area on success, NULL on failure.
18599 */
18600 static void * __init pcpu_alloc_bootmem(unsigned int cpu, unsigned long size,
18601+ unsigned long align) __size_overflow(2);
18602+static void * __init pcpu_alloc_bootmem(unsigned int cpu, unsigned long size,
18603 unsigned long align)
18604 {
18605 const unsigned long goal = __pa(MAX_DMA_ADDRESS);
18606@@ -124,6 +124,8 @@ static void * __init pcpu_alloc_bootmem(unsigned int cpu, unsigned long size,
18607 /*
18608 * Helpers for first chunk memory allocation
18609 */
18610+static void * __init pcpu_fc_alloc(unsigned int cpu, size_t size, size_t align) __size_overflow(2);
18611+
18612 static void * __init pcpu_fc_alloc(unsigned int cpu, size_t size, size_t align)
18613 {
18614 return pcpu_alloc_bootmem(cpu, size, align);
18615@@ -155,10 +157,10 @@ static inline void setup_percpu_segment(int cpu)
18616 {
18617 #ifdef CONFIG_X86_32
18618 struct desc_struct gdt;
18619+ unsigned long base = per_cpu_offset(cpu);
18620
18621- pack_descriptor(&gdt, per_cpu_offset(cpu), 0xFFFFF,
18622- 0x2 | DESCTYPE_S, 0x8);
18623- gdt.s = 1;
18624+ pack_descriptor(&gdt, base, (VMALLOC_END - base - 1) >> PAGE_SHIFT,
18625+ 0x83 | DESCTYPE_S, 0xC);
18626 write_gdt_entry(get_cpu_gdt_table(cpu),
18627 GDT_ENTRY_PERCPU, &gdt, DESCTYPE_S);
18628 #endif
18629@@ -207,6 +209,11 @@ void __init setup_per_cpu_areas(void)
18630 /* alrighty, percpu areas up and running */
18631 delta = (unsigned long)pcpu_base_addr - (unsigned long)__per_cpu_start;
18632 for_each_possible_cpu(cpu) {
18633+#ifdef CONFIG_CC_STACKPROTECTOR
18634+#ifdef CONFIG_X86_32
18635+ unsigned long canary = per_cpu(stack_canary.canary, cpu);
18636+#endif
18637+#endif
18638 per_cpu_offset(cpu) = delta + pcpu_unit_offsets[cpu];
18639 per_cpu(this_cpu_off, cpu) = per_cpu_offset(cpu);
18640 per_cpu(cpu_number, cpu) = cpu;
18641@@ -247,6 +254,12 @@ void __init setup_per_cpu_areas(void)
18642 */
18643 set_cpu_numa_node(cpu, early_cpu_to_node(cpu));
18644 #endif
18645+#ifdef CONFIG_CC_STACKPROTECTOR
18646+#ifdef CONFIG_X86_32
18647+ if (!cpu)
18648+ per_cpu(stack_canary.canary, cpu) = canary;
18649+#endif
18650+#endif
18651 /*
18652 * Up to this point, the boot CPU has been using .init.data
18653 * area. Reload any changed state for the boot CPU.
18654diff --git a/arch/x86/kernel/signal.c b/arch/x86/kernel/signal.c
18655index 54ddaeb2..22c3bdc 100644
18656--- a/arch/x86/kernel/signal.c
18657+++ b/arch/x86/kernel/signal.c
18658@@ -198,7 +198,7 @@ static unsigned long align_sigframe(unsigned long sp)
18659 * Align the stack pointer according to the i386 ABI,
18660 * i.e. so that on function entry ((sp + 4) & 15) == 0.
18661 */
18662- sp = ((sp + 4) & -16ul) - 4;
18663+ sp = ((sp - 12) & -16ul) - 4;
18664 #else /* !CONFIG_X86_32 */
18665 sp = round_down(sp, 16) - 8;
18666 #endif
18667@@ -249,11 +249,11 @@ get_sigframe(struct k_sigaction *ka, struct pt_regs *regs, size_t frame_size,
18668 * Return an always-bogus address instead so we will die with SIGSEGV.
18669 */
18670 if (onsigstack && !likely(on_sig_stack(sp)))
18671- return (void __user *)-1L;
18672+ return (__force void __user *)-1L;
18673
18674 /* save i387 state */
18675 if (used_math() && save_i387_xstate(*fpstate) < 0)
18676- return (void __user *)-1L;
18677+ return (__force void __user *)-1L;
18678
18679 return (void __user *)sp;
18680 }
18681@@ -308,9 +308,9 @@ __setup_frame(int sig, struct k_sigaction *ka, sigset_t *set,
18682 }
18683
18684 if (current->mm->context.vdso)
18685- restorer = VDSO32_SYMBOL(current->mm->context.vdso, sigreturn);
18686+ restorer = (__force void __user *)VDSO32_SYMBOL(current->mm->context.vdso, sigreturn);
18687 else
18688- restorer = &frame->retcode;
18689+ restorer = (void __user *)&frame->retcode;
18690 if (ka->sa.sa_flags & SA_RESTORER)
18691 restorer = ka->sa.sa_restorer;
18692
18693@@ -324,7 +324,7 @@ __setup_frame(int sig, struct k_sigaction *ka, sigset_t *set,
18694 * reasons and because gdb uses it as a signature to notice
18695 * signal handler stack frames.
18696 */
18697- err |= __put_user(*((u64 *)&retcode), (u64 *)frame->retcode);
18698+ err |= __put_user(*((u64 *)&retcode), (u64 __user *)frame->retcode);
18699
18700 if (err)
18701 return -EFAULT;
18702@@ -378,7 +378,10 @@ static int __setup_rt_frame(int sig, struct k_sigaction *ka, siginfo_t *info,
18703 err |= __copy_to_user(&frame->uc.uc_sigmask, set, sizeof(*set));
18704
18705 /* Set up to return from userspace. */
18706- restorer = VDSO32_SYMBOL(current->mm->context.vdso, rt_sigreturn);
18707+ if (current->mm->context.vdso)
18708+ restorer = (__force void __user *)VDSO32_SYMBOL(current->mm->context.vdso, rt_sigreturn);
18709+ else
18710+ restorer = (void __user *)&frame->retcode;
18711 if (ka->sa.sa_flags & SA_RESTORER)
18712 restorer = ka->sa.sa_restorer;
18713 put_user_ex(restorer, &frame->pretcode);
18714@@ -390,7 +393,7 @@ static int __setup_rt_frame(int sig, struct k_sigaction *ka, siginfo_t *info,
18715 * reasons and because gdb uses it as a signature to notice
18716 * signal handler stack frames.
18717 */
18718- put_user_ex(*((u64 *)&rt_retcode), (u64 *)frame->retcode);
18719+ put_user_ex(*((u64 *)&rt_retcode), (u64 __user *)frame->retcode);
18720 } put_user_catch(err);
18721
18722 if (err)
18723@@ -769,7 +772,7 @@ static void do_signal(struct pt_regs *regs)
18724 * X86_32: vm86 regs switched out by assembly code before reaching
18725 * here, so testing against kernel CS suffices.
18726 */
18727- if (!user_mode(regs))
18728+ if (!user_mode_novm(regs))
18729 return;
18730
18731 signr = get_signal_to_deliver(&info, &ka, regs, NULL);
18732diff --git a/arch/x86/kernel/smpboot.c b/arch/x86/kernel/smpboot.c
18733index 9f548cb..caf76f7 100644
18734--- a/arch/x86/kernel/smpboot.c
18735+++ b/arch/x86/kernel/smpboot.c
18736@@ -709,17 +709,20 @@ static int __cpuinit do_boot_cpu(int apicid, int cpu)
18737 set_idle_for_cpu(cpu, c_idle.idle);
18738 do_rest:
18739 per_cpu(current_task, cpu) = c_idle.idle;
18740+ per_cpu(current_tinfo, cpu) = &c_idle.idle->tinfo;
18741 #ifdef CONFIG_X86_32
18742 /* Stack for startup_32 can be just as for start_secondary onwards */
18743 irq_ctx_init(cpu);
18744 #else
18745 clear_tsk_thread_flag(c_idle.idle, TIF_FORK);
18746 initial_gs = per_cpu_offset(cpu);
18747- per_cpu(kernel_stack, cpu) =
18748- (unsigned long)task_stack_page(c_idle.idle) -
18749- KERNEL_STACK_OFFSET + THREAD_SIZE;
18750+ per_cpu(kernel_stack, cpu) = (unsigned long)task_stack_page(c_idle.idle) - 16 + THREAD_SIZE;
18751 #endif
18752+
18753+ pax_open_kernel();
18754 early_gdt_descr.address = (unsigned long)get_cpu_gdt_table(cpu);
18755+ pax_close_kernel();
18756+
18757 initial_code = (unsigned long)start_secondary;
18758 stack_start = c_idle.idle->thread.sp;
18759
18760@@ -861,6 +864,12 @@ int __cpuinit native_cpu_up(unsigned int cpu)
18761
18762 per_cpu(cpu_state, cpu) = CPU_UP_PREPARE;
18763
18764+#ifdef CONFIG_PAX_PER_CPU_PGD
18765+ clone_pgd_range(get_cpu_pgd(cpu) + KERNEL_PGD_BOUNDARY,
18766+ swapper_pg_dir + KERNEL_PGD_BOUNDARY,
18767+ KERNEL_PGD_PTRS);
18768+#endif
18769+
18770 err = do_boot_cpu(apicid, cpu);
18771 if (err) {
18772 pr_debug("do_boot_cpu failed %d\n", err);
18773diff --git a/arch/x86/kernel/step.c b/arch/x86/kernel/step.c
18774index c346d11..d43b163 100644
18775--- a/arch/x86/kernel/step.c
18776+++ b/arch/x86/kernel/step.c
18777@@ -27,10 +27,10 @@ unsigned long convert_ip_to_linear(struct task_struct *child, struct pt_regs *re
18778 struct desc_struct *desc;
18779 unsigned long base;
18780
18781- seg &= ~7UL;
18782+ seg >>= 3;
18783
18784 mutex_lock(&child->mm->context.lock);
18785- if (unlikely((seg >> 3) >= child->mm->context.size))
18786+ if (unlikely(seg >= child->mm->context.size))
18787 addr = -1L; /* bogus selector, access would fault */
18788 else {
18789 desc = child->mm->context.ldt + seg;
18790@@ -42,7 +42,8 @@ unsigned long convert_ip_to_linear(struct task_struct *child, struct pt_regs *re
18791 addr += base;
18792 }
18793 mutex_unlock(&child->mm->context.lock);
18794- }
18795+ } else if (seg == __KERNEL_CS || seg == __KERNEXEC_KERNEL_CS)
18796+ addr = ktla_ktva(addr);
18797
18798 return addr;
18799 }
18800@@ -53,6 +54,9 @@ static int is_setting_trap_flag(struct task_struct *child, struct pt_regs *regs)
18801 unsigned char opcode[15];
18802 unsigned long addr = convert_ip_to_linear(child, regs);
18803
18804+ if (addr == -EINVAL)
18805+ return 0;
18806+
18807 copied = access_process_vm(child, addr, opcode, sizeof(opcode), 0);
18808 for (i = 0; i < copied; i++) {
18809 switch (opcode[i]) {
18810diff --git a/arch/x86/kernel/sys_i386_32.c b/arch/x86/kernel/sys_i386_32.c
18811index 0b0cb5f..db6b9ed 100644
18812--- a/arch/x86/kernel/sys_i386_32.c
18813+++ b/arch/x86/kernel/sys_i386_32.c
18814@@ -24,17 +24,224 @@
18815
18816 #include <asm/syscalls.h>
18817
18818-/*
18819- * Do a system call from kernel instead of calling sys_execve so we
18820- * end up with proper pt_regs.
18821- */
18822-int kernel_execve(const char *filename,
18823- const char *const argv[],
18824- const char *const envp[])
18825+int i386_mmap_check(unsigned long addr, unsigned long len, unsigned long flags)
18826 {
18827- long __res;
18828- asm volatile ("int $0x80"
18829- : "=a" (__res)
18830- : "0" (__NR_execve), "b" (filename), "c" (argv), "d" (envp) : "memory");
18831- return __res;
18832+ unsigned long pax_task_size = TASK_SIZE;
18833+
18834+#ifdef CONFIG_PAX_SEGMEXEC
18835+ if (current->mm->pax_flags & MF_PAX_SEGMEXEC)
18836+ pax_task_size = SEGMEXEC_TASK_SIZE;
18837+#endif
18838+
18839+ if (len > pax_task_size || addr > pax_task_size - len)
18840+ return -EINVAL;
18841+
18842+ return 0;
18843+}
18844+
18845+unsigned long
18846+arch_get_unmapped_area(struct file *filp, unsigned long addr,
18847+ unsigned long len, unsigned long pgoff, unsigned long flags)
18848+{
18849+ struct mm_struct *mm = current->mm;
18850+ struct vm_area_struct *vma;
18851+ unsigned long start_addr, pax_task_size = TASK_SIZE;
18852+
18853+#ifdef CONFIG_PAX_SEGMEXEC
18854+ if (mm->pax_flags & MF_PAX_SEGMEXEC)
18855+ pax_task_size = SEGMEXEC_TASK_SIZE;
18856+#endif
18857+
18858+ pax_task_size -= PAGE_SIZE;
18859+
18860+ if (len > pax_task_size)
18861+ return -ENOMEM;
18862+
18863+ if (flags & MAP_FIXED)
18864+ return addr;
18865+
18866+#ifdef CONFIG_PAX_RANDMMAP
18867+ if (!(mm->pax_flags & MF_PAX_RANDMMAP))
18868+#endif
18869+
18870+ if (addr) {
18871+ addr = PAGE_ALIGN(addr);
18872+ if (pax_task_size - len >= addr) {
18873+ vma = find_vma(mm, addr);
18874+ if (check_heap_stack_gap(vma, addr, len))
18875+ return addr;
18876+ }
18877+ }
18878+ if (len > mm->cached_hole_size) {
18879+ start_addr = addr = mm->free_area_cache;
18880+ } else {
18881+ start_addr = addr = mm->mmap_base;
18882+ mm->cached_hole_size = 0;
18883+ }
18884+
18885+#ifdef CONFIG_PAX_PAGEEXEC
18886+ if (!(__supported_pte_mask & _PAGE_NX) && (mm->pax_flags & MF_PAX_PAGEEXEC) && (flags & MAP_EXECUTABLE) && start_addr >= mm->mmap_base) {
18887+ start_addr = 0x00110000UL;
18888+
18889+#ifdef CONFIG_PAX_RANDMMAP
18890+ if (mm->pax_flags & MF_PAX_RANDMMAP)
18891+ start_addr += mm->delta_mmap & 0x03FFF000UL;
18892+#endif
18893+
18894+ if (mm->start_brk <= start_addr && start_addr < mm->mmap_base)
18895+ start_addr = addr = mm->mmap_base;
18896+ else
18897+ addr = start_addr;
18898+ }
18899+#endif
18900+
18901+full_search:
18902+ for (vma = find_vma(mm, addr); ; vma = vma->vm_next) {
18903+ /* At this point: (!vma || addr < vma->vm_end). */
18904+ if (pax_task_size - len < addr) {
18905+ /*
18906+ * Start a new search - just in case we missed
18907+ * some holes.
18908+ */
18909+ if (start_addr != mm->mmap_base) {
18910+ start_addr = addr = mm->mmap_base;
18911+ mm->cached_hole_size = 0;
18912+ goto full_search;
18913+ }
18914+ return -ENOMEM;
18915+ }
18916+ if (check_heap_stack_gap(vma, addr, len))
18917+ break;
18918+ if (addr + mm->cached_hole_size < vma->vm_start)
18919+ mm->cached_hole_size = vma->vm_start - addr;
18920+ addr = vma->vm_end;
18921+ if (mm->start_brk <= addr && addr < mm->mmap_base) {
18922+ start_addr = addr = mm->mmap_base;
18923+ mm->cached_hole_size = 0;
18924+ goto full_search;
18925+ }
18926+ }
18927+
18928+ /*
18929+ * Remember the place where we stopped the search:
18930+ */
18931+ mm->free_area_cache = addr + len;
18932+ return addr;
18933+}
18934+
18935+unsigned long
18936+arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
18937+ const unsigned long len, const unsigned long pgoff,
18938+ const unsigned long flags)
18939+{
18940+ struct vm_area_struct *vma;
18941+ struct mm_struct *mm = current->mm;
18942+ unsigned long base = mm->mmap_base, addr = addr0, pax_task_size = TASK_SIZE;
18943+
18944+#ifdef CONFIG_PAX_SEGMEXEC
18945+ if (mm->pax_flags & MF_PAX_SEGMEXEC)
18946+ pax_task_size = SEGMEXEC_TASK_SIZE;
18947+#endif
18948+
18949+ pax_task_size -= PAGE_SIZE;
18950+
18951+ /* requested length too big for entire address space */
18952+ if (len > pax_task_size)
18953+ return -ENOMEM;
18954+
18955+ if (flags & MAP_FIXED)
18956+ return addr;
18957+
18958+#ifdef CONFIG_PAX_PAGEEXEC
18959+ if (!(__supported_pte_mask & _PAGE_NX) && (mm->pax_flags & MF_PAX_PAGEEXEC) && (flags & MAP_EXECUTABLE))
18960+ goto bottomup;
18961+#endif
18962+
18963+#ifdef CONFIG_PAX_RANDMMAP
18964+ if (!(mm->pax_flags & MF_PAX_RANDMMAP))
18965+#endif
18966+
18967+ /* requesting a specific address */
18968+ if (addr) {
18969+ addr = PAGE_ALIGN(addr);
18970+ if (pax_task_size - len >= addr) {
18971+ vma = find_vma(mm, addr);
18972+ if (check_heap_stack_gap(vma, addr, len))
18973+ return addr;
18974+ }
18975+ }
18976+
18977+ /* check if free_area_cache is useful for us */
18978+ if (len <= mm->cached_hole_size) {
18979+ mm->cached_hole_size = 0;
18980+ mm->free_area_cache = mm->mmap_base;
18981+ }
18982+
18983+ /* either no address requested or can't fit in requested address hole */
18984+ addr = mm->free_area_cache;
18985+
18986+ /* make sure it can fit in the remaining address space */
18987+ if (addr > len) {
18988+ vma = find_vma(mm, addr-len);
18989+ if (check_heap_stack_gap(vma, addr - len, len))
18990+ /* remember the address as a hint for next time */
18991+ return (mm->free_area_cache = addr-len);
18992+ }
18993+
18994+ if (mm->mmap_base < len)
18995+ goto bottomup;
18996+
18997+ addr = mm->mmap_base-len;
18998+
18999+ do {
19000+ /*
19001+ * Lookup failure means no vma is above this address,
19002+ * else if new region fits below vma->vm_start,
19003+ * return with success:
19004+ */
19005+ vma = find_vma(mm, addr);
19006+ if (check_heap_stack_gap(vma, addr, len))
19007+ /* remember the address as a hint for next time */
19008+ return (mm->free_area_cache = addr);
19009+
19010+ /* remember the largest hole we saw so far */
19011+ if (addr + mm->cached_hole_size < vma->vm_start)
19012+ mm->cached_hole_size = vma->vm_start - addr;
19013+
19014+ /* try just below the current vma->vm_start */
19015+ addr = skip_heap_stack_gap(vma, len);
19016+ } while (!IS_ERR_VALUE(addr));
19017+
19018+bottomup:
19019+ /*
19020+ * A failed mmap() very likely causes application failure,
19021+ * so fall back to the bottom-up function here. This scenario
19022+ * can happen with large stack limits and large mmap()
19023+ * allocations.
19024+ */
19025+
19026+#ifdef CONFIG_PAX_SEGMEXEC
19027+ if (mm->pax_flags & MF_PAX_SEGMEXEC)
19028+ mm->mmap_base = SEGMEXEC_TASK_UNMAPPED_BASE;
19029+ else
19030+#endif
19031+
19032+ mm->mmap_base = TASK_UNMAPPED_BASE;
19033+
19034+#ifdef CONFIG_PAX_RANDMMAP
19035+ if (mm->pax_flags & MF_PAX_RANDMMAP)
19036+ mm->mmap_base += mm->delta_mmap;
19037+#endif
19038+
19039+ mm->free_area_cache = mm->mmap_base;
19040+ mm->cached_hole_size = ~0UL;
19041+ addr = arch_get_unmapped_area(filp, addr0, len, pgoff, flags);
19042+ /*
19043+ * Restore the topdown base:
19044+ */
19045+ mm->mmap_base = base;
19046+ mm->free_area_cache = base;
19047+ mm->cached_hole_size = ~0UL;
19048+
19049+ return addr;
19050 }
19051diff --git a/arch/x86/kernel/sys_x86_64.c b/arch/x86/kernel/sys_x86_64.c
19052index 0514890..3dbebce 100644
19053--- a/arch/x86/kernel/sys_x86_64.c
19054+++ b/arch/x86/kernel/sys_x86_64.c
19055@@ -95,8 +95,8 @@ out:
19056 return error;
19057 }
19058
19059-static void find_start_end(unsigned long flags, unsigned long *begin,
19060- unsigned long *end)
19061+static void find_start_end(struct mm_struct *mm, unsigned long flags,
19062+ unsigned long *begin, unsigned long *end)
19063 {
19064 if (!test_thread_flag(TIF_IA32) && (flags & MAP_32BIT)) {
19065 unsigned long new_begin;
19066@@ -115,7 +115,7 @@ static void find_start_end(unsigned long flags, unsigned long *begin,
19067 *begin = new_begin;
19068 }
19069 } else {
19070- *begin = TASK_UNMAPPED_BASE;
19071+ *begin = mm->mmap_base;
19072 *end = TASK_SIZE;
19073 }
19074 }
19075@@ -132,16 +132,19 @@ arch_get_unmapped_area(struct file *filp, unsigned long addr,
19076 if (flags & MAP_FIXED)
19077 return addr;
19078
19079- find_start_end(flags, &begin, &end);
19080+ find_start_end(mm, flags, &begin, &end);
19081
19082 if (len > end)
19083 return -ENOMEM;
19084
19085+#ifdef CONFIG_PAX_RANDMMAP
19086+ if (!(mm->pax_flags & MF_PAX_RANDMMAP))
19087+#endif
19088+
19089 if (addr) {
19090 addr = PAGE_ALIGN(addr);
19091 vma = find_vma(mm, addr);
19092- if (end - len >= addr &&
19093- (!vma || addr + len <= vma->vm_start))
19094+ if (end - len >= addr && check_heap_stack_gap(vma, addr, len))
19095 return addr;
19096 }
19097 if (((flags & MAP_32BIT) || test_thread_flag(TIF_IA32))
19098@@ -172,7 +175,7 @@ full_search:
19099 }
19100 return -ENOMEM;
19101 }
19102- if (!vma || addr + len <= vma->vm_start) {
19103+ if (check_heap_stack_gap(vma, addr, len)) {
19104 /*
19105 * Remember the place where we stopped the search:
19106 */
19107@@ -195,7 +198,7 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
19108 {
19109 struct vm_area_struct *vma;
19110 struct mm_struct *mm = current->mm;
19111- unsigned long addr = addr0;
19112+ unsigned long base = mm->mmap_base, addr = addr0;
19113
19114 /* requested length too big for entire address space */
19115 if (len > TASK_SIZE)
19116@@ -208,13 +211,18 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
19117 if (!test_thread_flag(TIF_IA32) && (flags & MAP_32BIT))
19118 goto bottomup;
19119
19120+#ifdef CONFIG_PAX_RANDMMAP
19121+ if (!(mm->pax_flags & MF_PAX_RANDMMAP))
19122+#endif
19123+
19124 /* requesting a specific address */
19125 if (addr) {
19126 addr = PAGE_ALIGN(addr);
19127- vma = find_vma(mm, addr);
19128- if (TASK_SIZE - len >= addr &&
19129- (!vma || addr + len <= vma->vm_start))
19130- return addr;
19131+ if (TASK_SIZE - len >= addr) {
19132+ vma = find_vma(mm, addr);
19133+ if (check_heap_stack_gap(vma, addr, len))
19134+ return addr;
19135+ }
19136 }
19137
19138 /* check if free_area_cache is useful for us */
19139@@ -232,7 +240,7 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
19140 ALIGN_TOPDOWN);
19141
19142 vma = find_vma(mm, tmp_addr);
19143- if (!vma || tmp_addr + len <= vma->vm_start)
19144+ if (check_heap_stack_gap(vma, tmp_addr, len))
19145 /* remember the address as a hint for next time */
19146 return mm->free_area_cache = tmp_addr;
19147 }
19148@@ -251,7 +259,7 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
19149 * return with success:
19150 */
19151 vma = find_vma(mm, addr);
19152- if (!vma || addr+len <= vma->vm_start)
19153+ if (check_heap_stack_gap(vma, addr, len))
19154 /* remember the address as a hint for next time */
19155 return mm->free_area_cache = addr;
19156
19157@@ -260,8 +268,8 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
19158 mm->cached_hole_size = vma->vm_start - addr;
19159
19160 /* try just below the current vma->vm_start */
19161- addr = vma->vm_start-len;
19162- } while (len < vma->vm_start);
19163+ addr = skip_heap_stack_gap(vma, len);
19164+ } while (!IS_ERR_VALUE(addr));
19165
19166 bottomup:
19167 /*
19168@@ -270,13 +278,21 @@ bottomup:
19169 * can happen with large stack limits and large mmap()
19170 * allocations.
19171 */
19172+ mm->mmap_base = TASK_UNMAPPED_BASE;
19173+
19174+#ifdef CONFIG_PAX_RANDMMAP
19175+ if (mm->pax_flags & MF_PAX_RANDMMAP)
19176+ mm->mmap_base += mm->delta_mmap;
19177+#endif
19178+
19179+ mm->free_area_cache = mm->mmap_base;
19180 mm->cached_hole_size = ~0UL;
19181- mm->free_area_cache = TASK_UNMAPPED_BASE;
19182 addr = arch_get_unmapped_area(filp, addr0, len, pgoff, flags);
19183 /*
19184 * Restore the topdown base:
19185 */
19186- mm->free_area_cache = mm->mmap_base;
19187+ mm->mmap_base = base;
19188+ mm->free_area_cache = base;
19189 mm->cached_hole_size = ~0UL;
19190
19191 return addr;
19192diff --git a/arch/x86/kernel/syscall_table_32.S b/arch/x86/kernel/syscall_table_32.S
19193index 9a0e312..e6f66f2 100644
19194--- a/arch/x86/kernel/syscall_table_32.S
19195+++ b/arch/x86/kernel/syscall_table_32.S
19196@@ -1,3 +1,4 @@
19197+.section .rodata,"a",@progbits
19198 ENTRY(sys_call_table)
19199 .long sys_restart_syscall /* 0 - old "setup()" system call, used for restarting */
19200 .long sys_exit
19201diff --git a/arch/x86/kernel/tboot.c b/arch/x86/kernel/tboot.c
19202index e2410e2..4fe3fbc 100644
19203--- a/arch/x86/kernel/tboot.c
19204+++ b/arch/x86/kernel/tboot.c
19205@@ -219,7 +219,7 @@ static int tboot_setup_sleep(void)
19206
19207 void tboot_shutdown(u32 shutdown_type)
19208 {
19209- void (*shutdown)(void);
19210+ void (* __noreturn shutdown)(void);
19211
19212 if (!tboot_enabled())
19213 return;
19214@@ -241,7 +241,7 @@ void tboot_shutdown(u32 shutdown_type)
19215
19216 switch_to_tboot_pt();
19217
19218- shutdown = (void(*)(void))(unsigned long)tboot->shutdown_entry;
19219+ shutdown = (void *)tboot->shutdown_entry;
19220 shutdown();
19221
19222 /* should not reach here */
19223@@ -298,7 +298,7 @@ void tboot_sleep(u8 sleep_state, u32 pm1a_control, u32 pm1b_control)
19224 tboot_shutdown(acpi_shutdown_map[sleep_state]);
19225 }
19226
19227-static atomic_t ap_wfs_count;
19228+static atomic_unchecked_t ap_wfs_count;
19229
19230 static int tboot_wait_for_aps(int num_aps)
19231 {
19232@@ -322,9 +322,9 @@ static int __cpuinit tboot_cpu_callback(struct notifier_block *nfb,
19233 {
19234 switch (action) {
19235 case CPU_DYING:
19236- atomic_inc(&ap_wfs_count);
19237+ atomic_inc_unchecked(&ap_wfs_count);
19238 if (num_online_cpus() == 1)
19239- if (tboot_wait_for_aps(atomic_read(&ap_wfs_count)))
19240+ if (tboot_wait_for_aps(atomic_read_unchecked(&ap_wfs_count)))
19241 return NOTIFY_BAD;
19242 break;
19243 }
19244@@ -343,7 +343,7 @@ static __init int tboot_late_init(void)
19245
19246 tboot_create_trampoline();
19247
19248- atomic_set(&ap_wfs_count, 0);
19249+ atomic_set_unchecked(&ap_wfs_count, 0);
19250 register_hotcpu_notifier(&tboot_cpu_notifier);
19251 return 0;
19252 }
19253diff --git a/arch/x86/kernel/time.c b/arch/x86/kernel/time.c
19254index dd5fbf4..b7f2232 100644
19255--- a/arch/x86/kernel/time.c
19256+++ b/arch/x86/kernel/time.c
19257@@ -31,9 +31,9 @@ unsigned long profile_pc(struct pt_regs *regs)
19258 {
19259 unsigned long pc = instruction_pointer(regs);
19260
19261- if (!user_mode_vm(regs) && in_lock_functions(pc)) {
19262+ if (!user_mode(regs) && in_lock_functions(pc)) {
19263 #ifdef CONFIG_FRAME_POINTER
19264- return *(unsigned long *)(regs->bp + sizeof(long));
19265+ return ktla_ktva(*(unsigned long *)(regs->bp + sizeof(long)));
19266 #else
19267 unsigned long *sp =
19268 (unsigned long *)kernel_stack_pointer(regs);
19269@@ -42,11 +42,17 @@ unsigned long profile_pc(struct pt_regs *regs)
19270 * or above a saved flags. Eflags has bits 22-31 zero,
19271 * kernel addresses don't.
19272 */
19273+
19274+#ifdef CONFIG_PAX_KERNEXEC
19275+ return ktla_ktva(sp[0]);
19276+#else
19277 if (sp[0] >> 22)
19278 return sp[0];
19279 if (sp[1] >> 22)
19280 return sp[1];
19281 #endif
19282+
19283+#endif
19284 }
19285 return pc;
19286 }
19287diff --git a/arch/x86/kernel/tls.c b/arch/x86/kernel/tls.c
19288index 6bb7b85..dd853e1 100644
19289--- a/arch/x86/kernel/tls.c
19290+++ b/arch/x86/kernel/tls.c
19291@@ -85,6 +85,11 @@ int do_set_thread_area(struct task_struct *p, int idx,
19292 if (idx < GDT_ENTRY_TLS_MIN || idx > GDT_ENTRY_TLS_MAX)
19293 return -EINVAL;
19294
19295+#ifdef CONFIG_PAX_SEGMEXEC
19296+ if ((p->mm->pax_flags & MF_PAX_SEGMEXEC) && (info.contents & MODIFY_LDT_CONTENTS_CODE))
19297+ return -EINVAL;
19298+#endif
19299+
19300 set_tls_desc(p, idx, &info, 1);
19301
19302 return 0;
19303diff --git a/arch/x86/kernel/tls.h b/arch/x86/kernel/tls.h
19304index 2f083a2..7d3fecc 100644
19305--- a/arch/x86/kernel/tls.h
19306+++ b/arch/x86/kernel/tls.h
19307@@ -16,6 +16,6 @@
19308
19309 extern user_regset_active_fn regset_tls_active;
19310 extern user_regset_get_fn regset_tls_get;
19311-extern user_regset_set_fn regset_tls_set;
19312+extern user_regset_set_fn regset_tls_set __size_overflow(4);
19313
19314 #endif /* _ARCH_X86_KERNEL_TLS_H */
19315diff --git a/arch/x86/kernel/trampoline_32.S b/arch/x86/kernel/trampoline_32.S
19316index 451c0a7..e57f551 100644
19317--- a/arch/x86/kernel/trampoline_32.S
19318+++ b/arch/x86/kernel/trampoline_32.S
19319@@ -32,6 +32,12 @@
19320 #include <asm/segment.h>
19321 #include <asm/page_types.h>
19322
19323+#ifdef CONFIG_PAX_KERNEXEC
19324+#define ta(X) (X)
19325+#else
19326+#define ta(X) ((X) - __PAGE_OFFSET)
19327+#endif
19328+
19329 #ifdef CONFIG_SMP
19330
19331 .section ".x86_trampoline","a"
19332@@ -62,7 +68,7 @@ r_base = .
19333 inc %ax # protected mode (PE) bit
19334 lmsw %ax # into protected mode
19335 # flush prefetch and jump to startup_32_smp in arch/i386/kernel/head.S
19336- ljmpl $__BOOT_CS, $(startup_32_smp-__PAGE_OFFSET)
19337+ ljmpl $__BOOT_CS, $ta(startup_32_smp)
19338
19339 # These need to be in the same 64K segment as the above;
19340 # hence we don't use the boot_gdt_descr defined in head.S
19341diff --git a/arch/x86/kernel/trampoline_64.S b/arch/x86/kernel/trampoline_64.S
19342index 09ff517..df19fbff 100644
19343--- a/arch/x86/kernel/trampoline_64.S
19344+++ b/arch/x86/kernel/trampoline_64.S
19345@@ -90,7 +90,7 @@ startup_32:
19346 movl $__KERNEL_DS, %eax # Initialize the %ds segment register
19347 movl %eax, %ds
19348
19349- movl $X86_CR4_PAE, %eax
19350+ movl $(X86_CR4_PSE | X86_CR4_PAE | X86_CR4_PGE), %eax
19351 movl %eax, %cr4 # Enable PAE mode
19352
19353 # Setup trampoline 4 level pagetables
19354@@ -138,7 +138,7 @@ tidt:
19355 # so the kernel can live anywhere
19356 .balign 4
19357 tgdt:
19358- .short tgdt_end - tgdt # gdt limit
19359+ .short tgdt_end - tgdt - 1 # gdt limit
19360 .long tgdt - r_base
19361 .short 0
19362 .quad 0x00cf9b000000ffff # __KERNEL32_CS
19363diff --git a/arch/x86/kernel/traps.c b/arch/x86/kernel/traps.c
19364index 31d9d0f..e244dd9 100644
19365--- a/arch/x86/kernel/traps.c
19366+++ b/arch/x86/kernel/traps.c
19367@@ -70,12 +70,6 @@ asmlinkage int system_call(void);
19368
19369 /* Do we ignore FPU interrupts ? */
19370 char ignore_fpu_irq;
19371-
19372-/*
19373- * The IDT has to be page-aligned to simplify the Pentium
19374- * F0 0F bug workaround.
19375- */
19376-gate_desc idt_table[NR_VECTORS] __page_aligned_data = { { { { 0, 0 } } }, };
19377 #endif
19378
19379 DECLARE_BITMAP(used_vectors, NR_VECTORS);
19380@@ -108,13 +102,13 @@ static inline void preempt_conditional_cli(struct pt_regs *regs)
19381 }
19382
19383 static void __kprobes
19384-do_trap(int trapnr, int signr, char *str, struct pt_regs *regs,
19385+do_trap(int trapnr, int signr, const char *str, struct pt_regs *regs,
19386 long error_code, siginfo_t *info)
19387 {
19388 struct task_struct *tsk = current;
19389
19390 #ifdef CONFIG_X86_32
19391- if (regs->flags & X86_VM_MASK) {
19392+ if (v8086_mode(regs)) {
19393 /*
19394 * traps 0, 1, 3, 4, and 5 should be forwarded to vm86.
19395 * On nmi (interrupt 2), do_trap should not be called.
19396@@ -125,7 +119,7 @@ do_trap(int trapnr, int signr, char *str, struct pt_regs *regs,
19397 }
19398 #endif
19399
19400- if (!user_mode(regs))
19401+ if (!user_mode_novm(regs))
19402 goto kernel_trap;
19403
19404 #ifdef CONFIG_X86_32
19405@@ -148,7 +142,7 @@ trap_signal:
19406 printk_ratelimit()) {
19407 printk(KERN_INFO
19408 "%s[%d] trap %s ip:%lx sp:%lx error:%lx",
19409- tsk->comm, tsk->pid, str,
19410+ tsk->comm, task_pid_nr(tsk), str,
19411 regs->ip, regs->sp, error_code);
19412 print_vma_addr(" in ", regs->ip);
19413 printk("\n");
19414@@ -165,8 +159,20 @@ kernel_trap:
19415 if (!fixup_exception(regs)) {
19416 tsk->thread.error_code = error_code;
19417 tsk->thread.trap_no = trapnr;
19418+
19419+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
19420+ if (trapnr == 12 && ((regs->cs & 0xFFFF) == __KERNEL_CS || (regs->cs & 0xFFFF) == __KERNEXEC_KERNEL_CS))
19421+ str = "PAX: suspicious stack segment fault";
19422+#endif
19423+
19424 die(str, regs, error_code);
19425 }
19426+
19427+#ifdef CONFIG_PAX_REFCOUNT
19428+ if (trapnr == 4)
19429+ pax_report_refcount_overflow(regs);
19430+#endif
19431+
19432 return;
19433
19434 #ifdef CONFIG_X86_32
19435@@ -255,14 +261,30 @@ do_general_protection(struct pt_regs *regs, long error_code)
19436 conditional_sti(regs);
19437
19438 #ifdef CONFIG_X86_32
19439- if (regs->flags & X86_VM_MASK)
19440+ if (v8086_mode(regs))
19441 goto gp_in_vm86;
19442 #endif
19443
19444 tsk = current;
19445- if (!user_mode(regs))
19446+ if (!user_mode_novm(regs))
19447 goto gp_in_kernel;
19448
19449+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_PAGEEXEC)
19450+ if (!(__supported_pte_mask & _PAGE_NX) && tsk->mm && (tsk->mm->pax_flags & MF_PAX_PAGEEXEC)) {
19451+ struct mm_struct *mm = tsk->mm;
19452+ unsigned long limit;
19453+
19454+ down_write(&mm->mmap_sem);
19455+ limit = mm->context.user_cs_limit;
19456+ if (limit < TASK_SIZE) {
19457+ track_exec_limit(mm, limit, TASK_SIZE, VM_EXEC);
19458+ up_write(&mm->mmap_sem);
19459+ return;
19460+ }
19461+ up_write(&mm->mmap_sem);
19462+ }
19463+#endif
19464+
19465 tsk->thread.error_code = error_code;
19466 tsk->thread.trap_no = 13;
19467
19468@@ -295,6 +317,13 @@ gp_in_kernel:
19469 if (notify_die(DIE_GPF, "general protection fault", regs,
19470 error_code, 13, SIGSEGV) == NOTIFY_STOP)
19471 return;
19472+
19473+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
19474+ if ((regs->cs & 0xFFFF) == __KERNEL_CS || (regs->cs & 0xFFFF) == __KERNEXEC_KERNEL_CS)
19475+ die("PAX: suspicious general protection fault", regs, error_code);
19476+ else
19477+#endif
19478+
19479 die("general protection fault", regs, error_code);
19480 }
19481
19482@@ -414,7 +443,7 @@ dotraplinkage void __kprobes do_debug(struct pt_regs *regs, long error_code)
19483 /* It's safe to allow irq's after DR6 has been saved */
19484 preempt_conditional_sti(regs);
19485
19486- if (regs->flags & X86_VM_MASK) {
19487+ if (v8086_mode(regs)) {
19488 handle_vm86_trap((struct kernel_vm86_regs *) regs,
19489 error_code, 1);
19490 preempt_conditional_cli(regs);
19491@@ -428,7 +457,7 @@ dotraplinkage void __kprobes do_debug(struct pt_regs *regs, long error_code)
19492 * We already checked v86 mode above, so we can check for kernel mode
19493 * by just checking the CPL of CS.
19494 */
19495- if ((dr6 & DR_STEP) && !user_mode(regs)) {
19496+ if ((dr6 & DR_STEP) && !user_mode_novm(regs)) {
19497 tsk->thread.debugreg6 &= ~DR_STEP;
19498 set_tsk_thread_flag(tsk, TIF_SINGLESTEP);
19499 regs->flags &= ~X86_EFLAGS_TF;
19500@@ -457,7 +486,7 @@ void math_error(struct pt_regs *regs, int error_code, int trapnr)
19501 return;
19502 conditional_sti(regs);
19503
19504- if (!user_mode_vm(regs))
19505+ if (!user_mode(regs))
19506 {
19507 if (!fixup_exception(regs)) {
19508 task->thread.error_code = error_code;
19509@@ -569,8 +598,8 @@ asmlinkage void __attribute__((weak)) smp_threshold_interrupt(void)
19510 void __math_state_restore(struct task_struct *tsk)
19511 {
19512 /* We need a safe address that is cheap to find and that is already
19513- in L1. We've just brought in "tsk->thread.has_fpu", so use that */
19514-#define safe_address (tsk->thread.has_fpu)
19515+ in L1. */
19516+#define safe_address (init_tss[smp_processor_id()].x86_tss.sp0)
19517
19518 /* AMD K7/K8 CPUs don't save/restore FDP/FIP/FOP unless an exception
19519 is pending. Clear the x87 state here by setting it to fixed
19520diff --git a/arch/x86/kernel/verify_cpu.S b/arch/x86/kernel/verify_cpu.S
19521index b9242ba..50c5edd 100644
19522--- a/arch/x86/kernel/verify_cpu.S
19523+++ b/arch/x86/kernel/verify_cpu.S
19524@@ -20,6 +20,7 @@
19525 * arch/x86/boot/compressed/head_64.S: Boot cpu verification
19526 * arch/x86/kernel/trampoline_64.S: secondary processor verification
19527 * arch/x86/kernel/head_32.S: processor startup
19528+ * arch/x86/kernel/acpi/realmode/wakeup.S: 32bit processor resume
19529 *
19530 * verify_cpu, returns the status of longmode and SSE in register %eax.
19531 * 0: Success 1: Failure
19532diff --git a/arch/x86/kernel/vm86_32.c b/arch/x86/kernel/vm86_32.c
19533index 863f875..4307295 100644
19534--- a/arch/x86/kernel/vm86_32.c
19535+++ b/arch/x86/kernel/vm86_32.c
19536@@ -41,6 +41,7 @@
19537 #include <linux/ptrace.h>
19538 #include <linux/audit.h>
19539 #include <linux/stddef.h>
19540+#include <linux/grsecurity.h>
19541
19542 #include <asm/uaccess.h>
19543 #include <asm/io.h>
19544@@ -148,7 +149,7 @@ struct pt_regs *save_v86_state(struct kernel_vm86_regs *regs)
19545 do_exit(SIGSEGV);
19546 }
19547
19548- tss = &per_cpu(init_tss, get_cpu());
19549+ tss = init_tss + get_cpu();
19550 current->thread.sp0 = current->thread.saved_sp0;
19551 current->thread.sysenter_cs = __KERNEL_CS;
19552 load_sp0(tss, &current->thread);
19553@@ -208,6 +209,13 @@ int sys_vm86old(struct vm86_struct __user *v86, struct pt_regs *regs)
19554 struct task_struct *tsk;
19555 int tmp, ret = -EPERM;
19556
19557+#ifdef CONFIG_GRKERNSEC_VM86
19558+ if (!capable(CAP_SYS_RAWIO)) {
19559+ gr_handle_vm86();
19560+ goto out;
19561+ }
19562+#endif
19563+
19564 tsk = current;
19565 if (tsk->thread.saved_sp0)
19566 goto out;
19567@@ -238,6 +246,14 @@ int sys_vm86(unsigned long cmd, unsigned long arg, struct pt_regs *regs)
19568 int tmp, ret;
19569 struct vm86plus_struct __user *v86;
19570
19571+#ifdef CONFIG_GRKERNSEC_VM86
19572+ if (!capable(CAP_SYS_RAWIO)) {
19573+ gr_handle_vm86();
19574+ ret = -EPERM;
19575+ goto out;
19576+ }
19577+#endif
19578+
19579 tsk = current;
19580 switch (cmd) {
19581 case VM86_REQUEST_IRQ:
19582@@ -324,7 +340,7 @@ static void do_sys_vm86(struct kernel_vm86_struct *info, struct task_struct *tsk
19583 tsk->thread.saved_fs = info->regs32->fs;
19584 tsk->thread.saved_gs = get_user_gs(info->regs32);
19585
19586- tss = &per_cpu(init_tss, get_cpu());
19587+ tss = init_tss + get_cpu();
19588 tsk->thread.sp0 = (unsigned long) &info->VM86_TSS_ESP0;
19589 if (cpu_has_sep)
19590 tsk->thread.sysenter_cs = 0;
19591@@ -529,7 +545,7 @@ static void do_int(struct kernel_vm86_regs *regs, int i,
19592 goto cannot_handle;
19593 if (i == 0x21 && is_revectored(AH(regs), &KVM86->int21_revectored))
19594 goto cannot_handle;
19595- intr_ptr = (unsigned long __user *) (i << 2);
19596+ intr_ptr = (__force unsigned long __user *) (i << 2);
19597 if (get_user(segoffs, intr_ptr))
19598 goto cannot_handle;
19599 if ((segoffs >> 16) == BIOSSEG)
19600diff --git a/arch/x86/kernel/vmlinux.lds.S b/arch/x86/kernel/vmlinux.lds.S
19601index 0f703f1..9e15f64 100644
19602--- a/arch/x86/kernel/vmlinux.lds.S
19603+++ b/arch/x86/kernel/vmlinux.lds.S
19604@@ -26,6 +26,13 @@
19605 #include <asm/page_types.h>
19606 #include <asm/cache.h>
19607 #include <asm/boot.h>
19608+#include <asm/segment.h>
19609+
19610+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
19611+#define __KERNEL_TEXT_OFFSET (LOAD_OFFSET + ____LOAD_PHYSICAL_ADDR)
19612+#else
19613+#define __KERNEL_TEXT_OFFSET 0
19614+#endif
19615
19616 #undef i386 /* in case the preprocessor is a 32bit one */
19617
19618@@ -69,30 +76,43 @@ jiffies_64 = jiffies;
19619
19620 PHDRS {
19621 text PT_LOAD FLAGS(5); /* R_E */
19622+#ifdef CONFIG_X86_32
19623+ module PT_LOAD FLAGS(5); /* R_E */
19624+#endif
19625+#ifdef CONFIG_XEN
19626+ rodata PT_LOAD FLAGS(5); /* R_E */
19627+#else
19628+ rodata PT_LOAD FLAGS(4); /* R__ */
19629+#endif
19630 data PT_LOAD FLAGS(6); /* RW_ */
19631-#ifdef CONFIG_X86_64
19632+ init.begin PT_LOAD FLAGS(6); /* RW_ */
19633 #ifdef CONFIG_SMP
19634 percpu PT_LOAD FLAGS(6); /* RW_ */
19635 #endif
19636+ text.init PT_LOAD FLAGS(5); /* R_E */
19637+ text.exit PT_LOAD FLAGS(5); /* R_E */
19638 init PT_LOAD FLAGS(7); /* RWE */
19639-#endif
19640 note PT_NOTE FLAGS(0); /* ___ */
19641 }
19642
19643 SECTIONS
19644 {
19645 #ifdef CONFIG_X86_32
19646- . = LOAD_OFFSET + LOAD_PHYSICAL_ADDR;
19647- phys_startup_32 = startup_32 - LOAD_OFFSET;
19648+ . = LOAD_OFFSET + ____LOAD_PHYSICAL_ADDR;
19649 #else
19650- . = __START_KERNEL;
19651- phys_startup_64 = startup_64 - LOAD_OFFSET;
19652+ . = __START_KERNEL;
19653 #endif
19654
19655 /* Text and read-only data */
19656- .text : AT(ADDR(.text) - LOAD_OFFSET) {
19657- _text = .;
19658+ .text (. - __KERNEL_TEXT_OFFSET): AT(ADDR(.text) - LOAD_OFFSET + __KERNEL_TEXT_OFFSET) {
19659 /* bootstrapping code */
19660+#ifdef CONFIG_X86_32
19661+ phys_startup_32 = startup_32 - LOAD_OFFSET + __KERNEL_TEXT_OFFSET;
19662+#else
19663+ phys_startup_64 = startup_64 - LOAD_OFFSET + __KERNEL_TEXT_OFFSET;
19664+#endif
19665+ __LOAD_PHYSICAL_ADDR = . - LOAD_OFFSET + __KERNEL_TEXT_OFFSET;
19666+ _text = .;
19667 HEAD_TEXT
19668 #ifdef CONFIG_X86_32
19669 . = ALIGN(PAGE_SIZE);
19670@@ -108,13 +128,47 @@ SECTIONS
19671 IRQENTRY_TEXT
19672 *(.fixup)
19673 *(.gnu.warning)
19674- /* End of text section */
19675- _etext = .;
19676 } :text = 0x9090
19677
19678- NOTES :text :note
19679+ . += __KERNEL_TEXT_OFFSET;
19680
19681- EXCEPTION_TABLE(16) :text = 0x9090
19682+#ifdef CONFIG_X86_32
19683+ . = ALIGN(PAGE_SIZE);
19684+ .module.text : AT(ADDR(.module.text) - LOAD_OFFSET) {
19685+
19686+#if defined(CONFIG_PAX_KERNEXEC) && defined(CONFIG_MODULES)
19687+ MODULES_EXEC_VADDR = .;
19688+ BYTE(0)
19689+ . += (CONFIG_PAX_KERNEXEC_MODULE_TEXT * 1024 * 1024);
19690+ . = ALIGN(HPAGE_SIZE);
19691+ MODULES_EXEC_END = . - 1;
19692+#endif
19693+
19694+ } :module
19695+#endif
19696+
19697+ .text.end : AT(ADDR(.text.end) - LOAD_OFFSET) {
19698+ /* End of text section */
19699+ _etext = . - __KERNEL_TEXT_OFFSET;
19700+ }
19701+
19702+#ifdef CONFIG_X86_32
19703+ . = ALIGN(PAGE_SIZE);
19704+ .rodata.page_aligned : AT(ADDR(.rodata.page_aligned) - LOAD_OFFSET) {
19705+ *(.idt)
19706+ . = ALIGN(PAGE_SIZE);
19707+ *(.empty_zero_page)
19708+ *(.initial_pg_fixmap)
19709+ *(.initial_pg_pmd)
19710+ *(.initial_page_table)
19711+ *(.swapper_pg_dir)
19712+ } :rodata
19713+#endif
19714+
19715+ . = ALIGN(PAGE_SIZE);
19716+ NOTES :rodata :note
19717+
19718+ EXCEPTION_TABLE(16) :rodata
19719
19720 #if defined(CONFIG_DEBUG_RODATA)
19721 /* .text should occupy whole number of pages */
19722@@ -126,16 +180,20 @@ SECTIONS
19723
19724 /* Data */
19725 .data : AT(ADDR(.data) - LOAD_OFFSET) {
19726+
19727+#ifdef CONFIG_PAX_KERNEXEC
19728+ . = ALIGN(HPAGE_SIZE);
19729+#else
19730+ . = ALIGN(PAGE_SIZE);
19731+#endif
19732+
19733 /* Start of data section */
19734 _sdata = .;
19735
19736 /* init_task */
19737 INIT_TASK_DATA(THREAD_SIZE)
19738
19739-#ifdef CONFIG_X86_32
19740- /* 32 bit has nosave before _edata */
19741 NOSAVE_DATA
19742-#endif
19743
19744 PAGE_ALIGNED_DATA(PAGE_SIZE)
19745
19746@@ -176,12 +234,19 @@ SECTIONS
19747 #endif /* CONFIG_X86_64 */
19748
19749 /* Init code and data - will be freed after init */
19750- . = ALIGN(PAGE_SIZE);
19751 .init.begin : AT(ADDR(.init.begin) - LOAD_OFFSET) {
19752+ BYTE(0)
19753+
19754+#ifdef CONFIG_PAX_KERNEXEC
19755+ . = ALIGN(HPAGE_SIZE);
19756+#else
19757+ . = ALIGN(PAGE_SIZE);
19758+#endif
19759+
19760 __init_begin = .; /* paired with __init_end */
19761- }
19762+ } :init.begin
19763
19764-#if defined(CONFIG_X86_64) && defined(CONFIG_SMP)
19765+#ifdef CONFIG_SMP
19766 /*
19767 * percpu offsets are zero-based on SMP. PERCPU_VADDR() changes the
19768 * output PHDR, so the next output section - .init.text - should
19769@@ -190,12 +255,27 @@ SECTIONS
19770 PERCPU_VADDR(INTERNODE_CACHE_BYTES, 0, :percpu)
19771 #endif
19772
19773- INIT_TEXT_SECTION(PAGE_SIZE)
19774-#ifdef CONFIG_X86_64
19775- :init
19776-#endif
19777+ . = ALIGN(PAGE_SIZE);
19778+ init_begin = .;
19779+ .init.text (. - __KERNEL_TEXT_OFFSET): AT(init_begin - LOAD_OFFSET) {
19780+ VMLINUX_SYMBOL(_sinittext) = .;
19781+ INIT_TEXT
19782+ VMLINUX_SYMBOL(_einittext) = .;
19783+ . = ALIGN(PAGE_SIZE);
19784+ } :text.init
19785
19786- INIT_DATA_SECTION(16)
19787+ /*
19788+ * .exit.text is discard at runtime, not link time, to deal with
19789+ * references from .altinstructions and .eh_frame
19790+ */
19791+ .exit.text : AT(ADDR(.exit.text) - LOAD_OFFSET + __KERNEL_TEXT_OFFSET) {
19792+ EXIT_TEXT
19793+ . = ALIGN(16);
19794+ } :text.exit
19795+ . = init_begin + SIZEOF(.init.text) + SIZEOF(.exit.text);
19796+
19797+ . = ALIGN(PAGE_SIZE);
19798+ INIT_DATA_SECTION(16) :init
19799
19800 /*
19801 * Code and data for a variety of lowlevel trampolines, to be
19802@@ -269,19 +349,12 @@ SECTIONS
19803 }
19804
19805 . = ALIGN(8);
19806- /*
19807- * .exit.text is discard at runtime, not link time, to deal with
19808- * references from .altinstructions and .eh_frame
19809- */
19810- .exit.text : AT(ADDR(.exit.text) - LOAD_OFFSET) {
19811- EXIT_TEXT
19812- }
19813
19814 .exit.data : AT(ADDR(.exit.data) - LOAD_OFFSET) {
19815 EXIT_DATA
19816 }
19817
19818-#if !defined(CONFIG_X86_64) || !defined(CONFIG_SMP)
19819+#ifndef CONFIG_SMP
19820 PERCPU_SECTION(INTERNODE_CACHE_BYTES)
19821 #endif
19822
19823@@ -300,16 +373,10 @@ SECTIONS
19824 .smp_locks : AT(ADDR(.smp_locks) - LOAD_OFFSET) {
19825 __smp_locks = .;
19826 *(.smp_locks)
19827- . = ALIGN(PAGE_SIZE);
19828 __smp_locks_end = .;
19829+ . = ALIGN(PAGE_SIZE);
19830 }
19831
19832-#ifdef CONFIG_X86_64
19833- .data_nosave : AT(ADDR(.data_nosave) - LOAD_OFFSET) {
19834- NOSAVE_DATA
19835- }
19836-#endif
19837-
19838 /* BSS */
19839 . = ALIGN(PAGE_SIZE);
19840 .bss : AT(ADDR(.bss) - LOAD_OFFSET) {
19841@@ -325,6 +392,7 @@ SECTIONS
19842 __brk_base = .;
19843 . += 64 * 1024; /* 64k alignment slop space */
19844 *(.brk_reservation) /* areas brk users have reserved */
19845+ . = ALIGN(HPAGE_SIZE);
19846 __brk_limit = .;
19847 }
19848
19849@@ -351,13 +419,12 @@ SECTIONS
19850 * for the boot processor.
19851 */
19852 #define INIT_PER_CPU(x) init_per_cpu__##x = x + __per_cpu_load
19853-INIT_PER_CPU(gdt_page);
19854 INIT_PER_CPU(irq_stack_union);
19855
19856 /*
19857 * Build-time check on the image size:
19858 */
19859-. = ASSERT((_end - _text <= KERNEL_IMAGE_SIZE),
19860+. = ASSERT((_end - _text - __KERNEL_TEXT_OFFSET <= KERNEL_IMAGE_SIZE),
19861 "kernel image bigger than KERNEL_IMAGE_SIZE");
19862
19863 #ifdef CONFIG_SMP
19864diff --git a/arch/x86/kernel/vsyscall_64.c b/arch/x86/kernel/vsyscall_64.c
19865index e4d4a22..47ee71f 100644
19866--- a/arch/x86/kernel/vsyscall_64.c
19867+++ b/arch/x86/kernel/vsyscall_64.c
19868@@ -57,15 +57,13 @@ DEFINE_VVAR(struct vsyscall_gtod_data, vsyscall_gtod_data) =
19869 .lock = __SEQLOCK_UNLOCKED(__vsyscall_gtod_data.lock),
19870 };
19871
19872-static enum { EMULATE, NATIVE, NONE } vsyscall_mode = NATIVE;
19873+static enum { EMULATE, NONE } vsyscall_mode = EMULATE;
19874
19875 static int __init vsyscall_setup(char *str)
19876 {
19877 if (str) {
19878 if (!strcmp("emulate", str))
19879 vsyscall_mode = EMULATE;
19880- else if (!strcmp("native", str))
19881- vsyscall_mode = NATIVE;
19882 else if (!strcmp("none", str))
19883 vsyscall_mode = NONE;
19884 else
19885@@ -178,7 +176,7 @@ bool emulate_vsyscall(struct pt_regs *regs, unsigned long address)
19886
19887 tsk = current;
19888 if (seccomp_mode(&tsk->seccomp))
19889- do_exit(SIGKILL);
19890+ do_group_exit(SIGKILL);
19891
19892 switch (vsyscall_nr) {
19893 case 0:
19894@@ -220,8 +218,7 @@ bool emulate_vsyscall(struct pt_regs *regs, unsigned long address)
19895 return true;
19896
19897 sigsegv:
19898- force_sig(SIGSEGV, current);
19899- return true;
19900+ do_group_exit(SIGKILL);
19901 }
19902
19903 /*
19904@@ -274,10 +271,7 @@ void __init map_vsyscall(void)
19905 extern char __vvar_page;
19906 unsigned long physaddr_vvar_page = __pa_symbol(&__vvar_page);
19907
19908- __set_fixmap(VSYSCALL_FIRST_PAGE, physaddr_vsyscall,
19909- vsyscall_mode == NATIVE
19910- ? PAGE_KERNEL_VSYSCALL
19911- : PAGE_KERNEL_VVAR);
19912+ __set_fixmap(VSYSCALL_FIRST_PAGE, physaddr_vsyscall, PAGE_KERNEL_VVAR);
19913 BUILD_BUG_ON((unsigned long)__fix_to_virt(VSYSCALL_FIRST_PAGE) !=
19914 (unsigned long)VSYSCALL_START);
19915
19916diff --git a/arch/x86/kernel/x8664_ksyms_64.c b/arch/x86/kernel/x8664_ksyms_64.c
19917index 9796c2f..f686fbf 100644
19918--- a/arch/x86/kernel/x8664_ksyms_64.c
19919+++ b/arch/x86/kernel/x8664_ksyms_64.c
19920@@ -29,8 +29,6 @@ EXPORT_SYMBOL(__put_user_8);
19921 EXPORT_SYMBOL(copy_user_generic_string);
19922 EXPORT_SYMBOL(copy_user_generic_unrolled);
19923 EXPORT_SYMBOL(__copy_user_nocache);
19924-EXPORT_SYMBOL(_copy_from_user);
19925-EXPORT_SYMBOL(_copy_to_user);
19926
19927 EXPORT_SYMBOL(copy_page);
19928 EXPORT_SYMBOL(clear_page);
19929diff --git a/arch/x86/kernel/xsave.c b/arch/x86/kernel/xsave.c
19930index 7110911..e8cdee5 100644
19931--- a/arch/x86/kernel/xsave.c
19932+++ b/arch/x86/kernel/xsave.c
19933@@ -130,7 +130,7 @@ int check_for_xstate(struct i387_fxsave_struct __user *buf,
19934 fx_sw_user->xstate_size > fx_sw_user->extended_size)
19935 return -EINVAL;
19936
19937- err = __get_user(magic2, (__u32 *) (((void *)fpstate) +
19938+ err = __get_user(magic2, (__u32 __user *) (((void __user *)fpstate) +
19939 fx_sw_user->extended_size -
19940 FP_XSTATE_MAGIC2_SIZE));
19941 if (err)
19942@@ -266,7 +266,7 @@ fx_only:
19943 * the other extended state.
19944 */
19945 xrstor_state(init_xstate_buf, pcntxt_mask & ~XSTATE_FPSSE);
19946- return fxrstor_checking((__force struct i387_fxsave_struct *)buf);
19947+ return fxrstor_checking((struct i387_fxsave_struct __force_kernel *)buf);
19948 }
19949
19950 /*
19951@@ -295,7 +295,7 @@ int restore_i387_xstate(void __user *buf)
19952 if (use_xsave())
19953 err = restore_user_xstate(buf);
19954 else
19955- err = fxrstor_checking((__force struct i387_fxsave_struct *)
19956+ err = fxrstor_checking((struct i387_fxsave_struct __force_kernel *)
19957 buf);
19958 if (unlikely(err)) {
19959 /*
19960diff --git a/arch/x86/kvm/emulate.c b/arch/x86/kvm/emulate.c
19961index f1e3be18..588efc8 100644
19962--- a/arch/x86/kvm/emulate.c
19963+++ b/arch/x86/kvm/emulate.c
19964@@ -249,6 +249,7 @@ struct gprefix {
19965
19966 #define ____emulate_2op(ctxt, _op, _x, _y, _suffix, _dsttype) \
19967 do { \
19968+ unsigned long _tmp; \
19969 __asm__ __volatile__ ( \
19970 _PRE_EFLAGS("0", "4", "2") \
19971 _op _suffix " %"_x"3,%1; " \
19972@@ -263,8 +264,6 @@ struct gprefix {
19973 /* Raw emulation: instruction has two explicit operands. */
19974 #define __emulate_2op_nobyte(ctxt,_op,_wx,_wy,_lx,_ly,_qx,_qy) \
19975 do { \
19976- unsigned long _tmp; \
19977- \
19978 switch ((ctxt)->dst.bytes) { \
19979 case 2: \
19980 ____emulate_2op(ctxt,_op,_wx,_wy,"w",u16); \
19981@@ -280,7 +279,6 @@ struct gprefix {
19982
19983 #define __emulate_2op(ctxt,_op,_bx,_by,_wx,_wy,_lx,_ly,_qx,_qy) \
19984 do { \
19985- unsigned long _tmp; \
19986 switch ((ctxt)->dst.bytes) { \
19987 case 1: \
19988 ____emulate_2op(ctxt,_op,_bx,_by,"b",u8); \
19989diff --git a/arch/x86/kvm/lapic.c b/arch/x86/kvm/lapic.c
19990index 54abb40..a192606 100644
19991--- a/arch/x86/kvm/lapic.c
19992+++ b/arch/x86/kvm/lapic.c
19993@@ -53,7 +53,7 @@
19994 #define APIC_BUS_CYCLE_NS 1
19995
19996 /* #define apic_debug(fmt,arg...) printk(KERN_WARNING fmt,##arg) */
19997-#define apic_debug(fmt, arg...)
19998+#define apic_debug(fmt, arg...) do {} while (0)
19999
20000 #define APIC_LVT_NUM 6
20001 /* 14 is the version for Xeon and Pentium 8.4.8*/
20002diff --git a/arch/x86/kvm/mmu.c b/arch/x86/kvm/mmu.c
20003index f1b36cf..af8a124 100644
20004--- a/arch/x86/kvm/mmu.c
20005+++ b/arch/x86/kvm/mmu.c
20006@@ -3555,7 +3555,7 @@ void kvm_mmu_pte_write(struct kvm_vcpu *vcpu, gpa_t gpa,
20007
20008 pgprintk("%s: gpa %llx bytes %d\n", __func__, gpa, bytes);
20009
20010- invlpg_counter = atomic_read(&vcpu->kvm->arch.invlpg_counter);
20011+ invlpg_counter = atomic_read_unchecked(&vcpu->kvm->arch.invlpg_counter);
20012
20013 /*
20014 * Assume that the pte write on a page table of the same type
20015@@ -3587,7 +3587,7 @@ void kvm_mmu_pte_write(struct kvm_vcpu *vcpu, gpa_t gpa,
20016 }
20017
20018 spin_lock(&vcpu->kvm->mmu_lock);
20019- if (atomic_read(&vcpu->kvm->arch.invlpg_counter) != invlpg_counter)
20020+ if (atomic_read_unchecked(&vcpu->kvm->arch.invlpg_counter) != invlpg_counter)
20021 gentry = 0;
20022 kvm_mmu_free_some_pages(vcpu);
20023 ++vcpu->kvm->stat.mmu_pte_write;
20024diff --git a/arch/x86/kvm/paging_tmpl.h b/arch/x86/kvm/paging_tmpl.h
20025index 9299410..ade2f9b 100644
20026--- a/arch/x86/kvm/paging_tmpl.h
20027+++ b/arch/x86/kvm/paging_tmpl.h
20028@@ -197,7 +197,7 @@ retry_walk:
20029 if (unlikely(kvm_is_error_hva(host_addr)))
20030 goto error;
20031
20032- ptep_user = (pt_element_t __user *)((void *)host_addr + offset);
20033+ ptep_user = (pt_element_t __force_user *)((void *)host_addr + offset);
20034 if (unlikely(__copy_from_user(&pte, ptep_user, sizeof(pte))))
20035 goto error;
20036
20037@@ -705,7 +705,7 @@ static void FNAME(invlpg)(struct kvm_vcpu *vcpu, gva_t gva)
20038 if (need_flush)
20039 kvm_flush_remote_tlbs(vcpu->kvm);
20040
20041- atomic_inc(&vcpu->kvm->arch.invlpg_counter);
20042+ atomic_inc_unchecked(&vcpu->kvm->arch.invlpg_counter);
20043
20044 spin_unlock(&vcpu->kvm->mmu_lock);
20045
20046diff --git a/arch/x86/kvm/svm.c b/arch/x86/kvm/svm.c
20047index 94a4672..1700ed1 100644
20048--- a/arch/x86/kvm/svm.c
20049+++ b/arch/x86/kvm/svm.c
20050@@ -3037,6 +3037,7 @@ static int svm_set_vm_cr(struct kvm_vcpu *vcpu, u64 data)
20051 return 0;
20052 }
20053
20054+static int svm_set_msr(struct kvm_vcpu *vcpu, unsigned ecx, u64 data) __size_overflow(3);
20055 static int svm_set_msr(struct kvm_vcpu *vcpu, unsigned ecx, u64 data)
20056 {
20057 struct vcpu_svm *svm = to_svm(vcpu);
20058@@ -3405,7 +3406,11 @@ static void reload_tss(struct kvm_vcpu *vcpu)
20059 int cpu = raw_smp_processor_id();
20060
20061 struct svm_cpu_data *sd = per_cpu(svm_data, cpu);
20062+
20063+ pax_open_kernel();
20064 sd->tss_desc->type = 9; /* available 32/64-bit TSS */
20065+ pax_close_kernel();
20066+
20067 load_TR_desc();
20068 }
20069
20070@@ -3783,6 +3788,10 @@ static void svm_vcpu_run(struct kvm_vcpu *vcpu)
20071 #endif
20072 #endif
20073
20074+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_MEMORY_UDEREF)
20075+ __set_fs(current_thread_info()->addr_limit);
20076+#endif
20077+
20078 reload_tss(vcpu);
20079
20080 local_irq_disable();
20081diff --git a/arch/x86/kvm/vmx.c b/arch/x86/kvm/vmx.c
20082index 4ea7678..c715f2f 100644
20083--- a/arch/x86/kvm/vmx.c
20084+++ b/arch/x86/kvm/vmx.c
20085@@ -1305,7 +1305,11 @@ static void reload_tss(void)
20086 struct desc_struct *descs;
20087
20088 descs = (void *)gdt->address;
20089+
20090+ pax_open_kernel();
20091 descs[GDT_ENTRY_TSS].type = 9; /* available TSS */
20092+ pax_close_kernel();
20093+
20094 load_TR_desc();
20095 }
20096
20097@@ -2163,6 +2167,7 @@ static int vmx_get_msr(struct kvm_vcpu *vcpu, u32 msr_index, u64 *pdata)
20098 * Returns 0 on success, non-0 otherwise.
20099 * Assumes vcpu_load() was already called.
20100 */
20101+static int vmx_set_msr(struct kvm_vcpu *vcpu, u32 msr_index, u64 data) __size_overflow(3);
20102 static int vmx_set_msr(struct kvm_vcpu *vcpu, u32 msr_index, u64 data)
20103 {
20104 struct vcpu_vmx *vmx = to_vmx(vcpu);
20105@@ -2633,8 +2638,11 @@ static __init int hardware_setup(void)
20106 if (!cpu_has_vmx_flexpriority())
20107 flexpriority_enabled = 0;
20108
20109- if (!cpu_has_vmx_tpr_shadow())
20110- kvm_x86_ops->update_cr8_intercept = NULL;
20111+ if (!cpu_has_vmx_tpr_shadow()) {
20112+ pax_open_kernel();
20113+ *(void **)&kvm_x86_ops->update_cr8_intercept = NULL;
20114+ pax_close_kernel();
20115+ }
20116
20117 if (enable_ept && !cpu_has_vmx_ept_2m_page())
20118 kvm_disable_largepages();
20119@@ -3648,7 +3656,7 @@ static void vmx_set_constant_host_state(void)
20120 vmcs_writel(HOST_IDTR_BASE, dt.address); /* 22.2.4 */
20121
20122 asm("mov $.Lkvm_vmx_return, %0" : "=r"(tmpl));
20123- vmcs_writel(HOST_RIP, tmpl); /* 22.2.5 */
20124+ vmcs_writel(HOST_RIP, ktla_ktva(tmpl)); /* 22.2.5 */
20125
20126 rdmsr(MSR_IA32_SYSENTER_CS, low32, high32);
20127 vmcs_write32(HOST_IA32_SYSENTER_CS, low32);
20128@@ -6169,6 +6177,12 @@ static void __noclone vmx_vcpu_run(struct kvm_vcpu *vcpu)
20129 "jmp .Lkvm_vmx_return \n\t"
20130 ".Llaunched: " __ex(ASM_VMX_VMRESUME) "\n\t"
20131 ".Lkvm_vmx_return: "
20132+
20133+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
20134+ "ljmp %[cs],$.Lkvm_vmx_return2\n\t"
20135+ ".Lkvm_vmx_return2: "
20136+#endif
20137+
20138 /* Save guest registers, load host registers, keep flags */
20139 "mov %0, %c[wordsize](%%"R"sp) \n\t"
20140 "pop %0 \n\t"
20141@@ -6217,6 +6231,11 @@ static void __noclone vmx_vcpu_run(struct kvm_vcpu *vcpu)
20142 #endif
20143 [cr2]"i"(offsetof(struct vcpu_vmx, vcpu.arch.cr2)),
20144 [wordsize]"i"(sizeof(ulong))
20145+
20146+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
20147+ ,[cs]"i"(__KERNEL_CS)
20148+#endif
20149+
20150 : "cc", "memory"
20151 , R"ax", R"bx", R"di", R"si"
20152 #ifdef CONFIG_X86_64
20153@@ -6245,7 +6264,16 @@ static void __noclone vmx_vcpu_run(struct kvm_vcpu *vcpu)
20154 }
20155 }
20156
20157- asm("mov %0, %%ds; mov %0, %%es" : : "r"(__USER_DS));
20158+ asm("mov %0, %%ds; mov %0, %%es; mov %0, %%ss" : : "r"(__KERNEL_DS));
20159+
20160+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
20161+ loadsegment(fs, __KERNEL_PERCPU);
20162+#endif
20163+
20164+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_MEMORY_UDEREF)
20165+ __set_fs(current_thread_info()->addr_limit);
20166+#endif
20167+
20168 vmx->loaded_vmcs->launched = 1;
20169
20170 vmx->exit_reason = vmcs_read32(VM_EXIT_REASON);
20171diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c
20172index 4c938da..6cd8090 100644
20173--- a/arch/x86/kvm/x86.c
20174+++ b/arch/x86/kvm/x86.c
20175@@ -907,6 +907,7 @@ static int do_set_msr(struct kvm_vcpu *vcpu, unsigned index, u64 *data)
20176 return kvm_set_msr(vcpu, index, *data);
20177 }
20178
20179+static void kvm_write_wall_clock(struct kvm *kvm, gpa_t wall_clock) __size_overflow(2);
20180 static void kvm_write_wall_clock(struct kvm *kvm, gpa_t wall_clock)
20181 {
20182 int version;
20183@@ -1345,8 +1346,8 @@ static int xen_hvm_config(struct kvm_vcpu *vcpu, u64 data)
20184 {
20185 struct kvm *kvm = vcpu->kvm;
20186 int lm = is_long_mode(vcpu);
20187- u8 *blob_addr = lm ? (u8 *)(long)kvm->arch.xen_hvm_config.blob_addr_64
20188- : (u8 *)(long)kvm->arch.xen_hvm_config.blob_addr_32;
20189+ u8 __user *blob_addr = lm ? (u8 __user *)(long)kvm->arch.xen_hvm_config.blob_addr_64
20190+ : (u8 __user *)(long)kvm->arch.xen_hvm_config.blob_addr_32;
20191 u8 blob_size = lm ? kvm->arch.xen_hvm_config.blob_size_64
20192 : kvm->arch.xen_hvm_config.blob_size_32;
20193 u32 page_num = data & ~PAGE_MASK;
20194@@ -2165,6 +2166,8 @@ long kvm_arch_dev_ioctl(struct file *filp,
20195 if (n < msr_list.nmsrs)
20196 goto out;
20197 r = -EFAULT;
20198+ if (num_msrs_to_save > ARRAY_SIZE(msrs_to_save))
20199+ goto out;
20200 if (copy_to_user(user_msr_list->indices, &msrs_to_save,
20201 num_msrs_to_save * sizeof(u32)))
20202 goto out;
20203@@ -2340,15 +2343,20 @@ static int kvm_vcpu_ioctl_set_cpuid2(struct kvm_vcpu *vcpu,
20204 struct kvm_cpuid2 *cpuid,
20205 struct kvm_cpuid_entry2 __user *entries)
20206 {
20207- int r;
20208+ int r, i;
20209
20210 r = -E2BIG;
20211 if (cpuid->nent > KVM_MAX_CPUID_ENTRIES)
20212 goto out;
20213 r = -EFAULT;
20214- if (copy_from_user(&vcpu->arch.cpuid_entries, entries,
20215- cpuid->nent * sizeof(struct kvm_cpuid_entry2)))
20216+ if (!access_ok(VERIFY_READ, entries, cpuid->nent * sizeof(struct kvm_cpuid_entry2)))
20217 goto out;
20218+ for (i = 0; i < cpuid->nent; ++i) {
20219+ struct kvm_cpuid_entry2 cpuid_entry;
20220+ if (__copy_from_user(&cpuid_entry, entries + i, sizeof(cpuid_entry)))
20221+ goto out;
20222+ vcpu->arch.cpuid_entries[i] = cpuid_entry;
20223+ }
20224 vcpu->arch.cpuid_nent = cpuid->nent;
20225 kvm_apic_set_version(vcpu);
20226 kvm_x86_ops->cpuid_update(vcpu);
20227@@ -2363,15 +2371,19 @@ static int kvm_vcpu_ioctl_get_cpuid2(struct kvm_vcpu *vcpu,
20228 struct kvm_cpuid2 *cpuid,
20229 struct kvm_cpuid_entry2 __user *entries)
20230 {
20231- int r;
20232+ int r, i;
20233
20234 r = -E2BIG;
20235 if (cpuid->nent < vcpu->arch.cpuid_nent)
20236 goto out;
20237 r = -EFAULT;
20238- if (copy_to_user(entries, &vcpu->arch.cpuid_entries,
20239- vcpu->arch.cpuid_nent * sizeof(struct kvm_cpuid_entry2)))
20240+ if (!access_ok(VERIFY_WRITE, entries, vcpu->arch.cpuid_nent * sizeof(struct kvm_cpuid_entry2)))
20241 goto out;
20242+ for (i = 0; i < vcpu->arch.cpuid_nent; ++i) {
20243+ struct kvm_cpuid_entry2 cpuid_entry = vcpu->arch.cpuid_entries[i];
20244+ if (__copy_to_user(entries + i, &cpuid_entry, sizeof(cpuid_entry)))
20245+ goto out;
20246+ }
20247 return 0;
20248
20249 out:
20250@@ -2746,7 +2758,7 @@ static int kvm_vcpu_ioctl_set_lapic(struct kvm_vcpu *vcpu,
20251 static int kvm_vcpu_ioctl_interrupt(struct kvm_vcpu *vcpu,
20252 struct kvm_interrupt *irq)
20253 {
20254- if (irq->irq < 0 || irq->irq >= 256)
20255+ if (irq->irq >= 256)
20256 return -EINVAL;
20257 if (irqchip_in_kernel(vcpu->kvm))
20258 return -ENXIO;
20259@@ -3949,6 +3961,9 @@ gpa_t kvm_mmu_gva_to_gpa_system(struct kvm_vcpu *vcpu, gva_t gva,
20260
20261 static int kvm_read_guest_virt_helper(gva_t addr, void *val, unsigned int bytes,
20262 struct kvm_vcpu *vcpu, u32 access,
20263+ struct x86_exception *exception) __size_overflow(1,3);
20264+static int kvm_read_guest_virt_helper(gva_t addr, void *val, unsigned int bytes,
20265+ struct kvm_vcpu *vcpu, u32 access,
20266 struct x86_exception *exception)
20267 {
20268 void *data = val;
20269@@ -3980,6 +3995,9 @@ out:
20270 /* used for instruction fetching */
20271 static int kvm_fetch_guest_virt(struct x86_emulate_ctxt *ctxt,
20272 gva_t addr, void *val, unsigned int bytes,
20273+ struct x86_exception *exception) __size_overflow(2,4);
20274+static int kvm_fetch_guest_virt(struct x86_emulate_ctxt *ctxt,
20275+ gva_t addr, void *val, unsigned int bytes,
20276 struct x86_exception *exception)
20277 {
20278 struct kvm_vcpu *vcpu = emul_to_vcpu(ctxt);
20279@@ -4004,6 +4022,9 @@ EXPORT_SYMBOL_GPL(kvm_read_guest_virt);
20280
20281 static int kvm_read_guest_virt_system(struct x86_emulate_ctxt *ctxt,
20282 gva_t addr, void *val, unsigned int bytes,
20283+ struct x86_exception *exception) __size_overflow(2,4);
20284+static int kvm_read_guest_virt_system(struct x86_emulate_ctxt *ctxt,
20285+ gva_t addr, void *val, unsigned int bytes,
20286 struct x86_exception *exception)
20287 {
20288 struct kvm_vcpu *vcpu = emul_to_vcpu(ctxt);
20289@@ -4117,12 +4138,16 @@ static int read_prepare(struct kvm_vcpu *vcpu, void *val, int bytes)
20290 }
20291
20292 static int read_emulate(struct kvm_vcpu *vcpu, gpa_t gpa,
20293+ void *val, int bytes) __size_overflow(2);
20294+static int read_emulate(struct kvm_vcpu *vcpu, gpa_t gpa,
20295 void *val, int bytes)
20296 {
20297 return !kvm_read_guest(vcpu->kvm, gpa, val, bytes);
20298 }
20299
20300 static int write_emulate(struct kvm_vcpu *vcpu, gpa_t gpa,
20301+ void *val, int bytes) __size_overflow(2);
20302+static int write_emulate(struct kvm_vcpu *vcpu, gpa_t gpa,
20303 void *val, int bytes)
20304 {
20305 return emulator_write_phys(vcpu, gpa, val, bytes);
20306@@ -4273,6 +4298,12 @@ static int emulator_cmpxchg_emulated(struct x86_emulate_ctxt *ctxt,
20307 const void *old,
20308 const void *new,
20309 unsigned int bytes,
20310+ struct x86_exception *exception) __size_overflow(5);
20311+static int emulator_cmpxchg_emulated(struct x86_emulate_ctxt *ctxt,
20312+ unsigned long addr,
20313+ const void *old,
20314+ const void *new,
20315+ unsigned int bytes,
20316 struct x86_exception *exception)
20317 {
20318 struct kvm_vcpu *vcpu = emul_to_vcpu(ctxt);
20319@@ -5162,7 +5193,7 @@ static void kvm_set_mmio_spte_mask(void)
20320 kvm_mmu_set_mmio_spte_mask(mask);
20321 }
20322
20323-int kvm_arch_init(void *opaque)
20324+int kvm_arch_init(const void *opaque)
20325 {
20326 int r;
20327 struct kvm_x86_ops *ops = (struct kvm_x86_ops *)opaque;
20328diff --git a/arch/x86/kvm/x86.h b/arch/x86/kvm/x86.h
20329index d36fe23..a4b189f 100644
20330--- a/arch/x86/kvm/x86.h
20331+++ b/arch/x86/kvm/x86.h
20332@@ -119,10 +119,10 @@ void kvm_write_tsc(struct kvm_vcpu *vcpu, u64 data);
20333
20334 int kvm_read_guest_virt(struct x86_emulate_ctxt *ctxt,
20335 gva_t addr, void *val, unsigned int bytes,
20336- struct x86_exception *exception);
20337+ struct x86_exception *exception) __size_overflow(2,4);
20338
20339 int kvm_write_guest_virt_system(struct x86_emulate_ctxt *ctxt,
20340 gva_t addr, void *val, unsigned int bytes,
20341- struct x86_exception *exception);
20342+ struct x86_exception *exception) __size_overflow(2,4);
20343
20344 #endif
20345diff --git a/arch/x86/lguest/boot.c b/arch/x86/lguest/boot.c
20346index cf4603b..7cdde38 100644
20347--- a/arch/x86/lguest/boot.c
20348+++ b/arch/x86/lguest/boot.c
20349@@ -1195,9 +1195,10 @@ static __init int early_put_chars(u32 vtermno, const char *buf, int count)
20350 * Rebooting also tells the Host we're finished, but the RESTART flag tells the
20351 * Launcher to reboot us.
20352 */
20353-static void lguest_restart(char *reason)
20354+static __noreturn void lguest_restart(char *reason)
20355 {
20356 hcall(LHCALL_SHUTDOWN, __pa(reason), LGUEST_SHUTDOWN_RESTART, 0, 0);
20357+ BUG();
20358 }
20359
20360 /*G:050
20361diff --git a/arch/x86/lib/atomic64_32.c b/arch/x86/lib/atomic64_32.c
20362index 042f682..c92afb6 100644
20363--- a/arch/x86/lib/atomic64_32.c
20364+++ b/arch/x86/lib/atomic64_32.c
20365@@ -8,18 +8,30 @@
20366
20367 long long atomic64_read_cx8(long long, const atomic64_t *v);
20368 EXPORT_SYMBOL(atomic64_read_cx8);
20369+long long atomic64_read_unchecked_cx8(long long, const atomic64_unchecked_t *v);
20370+EXPORT_SYMBOL(atomic64_read_unchecked_cx8);
20371 long long atomic64_set_cx8(long long, const atomic64_t *v);
20372 EXPORT_SYMBOL(atomic64_set_cx8);
20373+long long atomic64_set_unchecked_cx8(long long, const atomic64_unchecked_t *v);
20374+EXPORT_SYMBOL(atomic64_set_unchecked_cx8);
20375 long long atomic64_xchg_cx8(long long, unsigned high);
20376 EXPORT_SYMBOL(atomic64_xchg_cx8);
20377 long long atomic64_add_return_cx8(long long a, atomic64_t *v);
20378 EXPORT_SYMBOL(atomic64_add_return_cx8);
20379+long long atomic64_add_return_unchecked_cx8(long long a, atomic64_unchecked_t *v);
20380+EXPORT_SYMBOL(atomic64_add_return_unchecked_cx8);
20381 long long atomic64_sub_return_cx8(long long a, atomic64_t *v);
20382 EXPORT_SYMBOL(atomic64_sub_return_cx8);
20383+long long atomic64_sub_return_unchecked_cx8(long long a, atomic64_unchecked_t *v);
20384+EXPORT_SYMBOL(atomic64_sub_return_unchecked_cx8);
20385 long long atomic64_inc_return_cx8(long long a, atomic64_t *v);
20386 EXPORT_SYMBOL(atomic64_inc_return_cx8);
20387+long long atomic64_inc_return_unchecked_cx8(long long a, atomic64_unchecked_t *v);
20388+EXPORT_SYMBOL(atomic64_inc_return_unchecked_cx8);
20389 long long atomic64_dec_return_cx8(long long a, atomic64_t *v);
20390 EXPORT_SYMBOL(atomic64_dec_return_cx8);
20391+long long atomic64_dec_return_unchecked_cx8(long long a, atomic64_unchecked_t *v);
20392+EXPORT_SYMBOL(atomic64_dec_return_unchecked_cx8);
20393 long long atomic64_dec_if_positive_cx8(atomic64_t *v);
20394 EXPORT_SYMBOL(atomic64_dec_if_positive_cx8);
20395 int atomic64_inc_not_zero_cx8(atomic64_t *v);
20396@@ -30,26 +42,46 @@ EXPORT_SYMBOL(atomic64_add_unless_cx8);
20397 #ifndef CONFIG_X86_CMPXCHG64
20398 long long atomic64_read_386(long long, const atomic64_t *v);
20399 EXPORT_SYMBOL(atomic64_read_386);
20400+long long atomic64_read_unchecked_386(long long, const atomic64_unchecked_t *v);
20401+EXPORT_SYMBOL(atomic64_read_unchecked_386);
20402 long long atomic64_set_386(long long, const atomic64_t *v);
20403 EXPORT_SYMBOL(atomic64_set_386);
20404+long long atomic64_set_unchecked_386(long long, const atomic64_unchecked_t *v);
20405+EXPORT_SYMBOL(atomic64_set_unchecked_386);
20406 long long atomic64_xchg_386(long long, unsigned high);
20407 EXPORT_SYMBOL(atomic64_xchg_386);
20408 long long atomic64_add_return_386(long long a, atomic64_t *v);
20409 EXPORT_SYMBOL(atomic64_add_return_386);
20410+long long atomic64_add_return_unchecked_386(long long a, atomic64_unchecked_t *v);
20411+EXPORT_SYMBOL(atomic64_add_return_unchecked_386);
20412 long long atomic64_sub_return_386(long long a, atomic64_t *v);
20413 EXPORT_SYMBOL(atomic64_sub_return_386);
20414+long long atomic64_sub_return_unchecked_386(long long a, atomic64_unchecked_t *v);
20415+EXPORT_SYMBOL(atomic64_sub_return_unchecked_386);
20416 long long atomic64_inc_return_386(long long a, atomic64_t *v);
20417 EXPORT_SYMBOL(atomic64_inc_return_386);
20418+long long atomic64_inc_return_unchecked_386(long long a, atomic64_unchecked_t *v);
20419+EXPORT_SYMBOL(atomic64_inc_return_unchecked_386);
20420 long long atomic64_dec_return_386(long long a, atomic64_t *v);
20421 EXPORT_SYMBOL(atomic64_dec_return_386);
20422+long long atomic64_dec_return_unchecked_386(long long a, atomic64_unchecked_t *v);
20423+EXPORT_SYMBOL(atomic64_dec_return_unchecked_386);
20424 long long atomic64_add_386(long long a, atomic64_t *v);
20425 EXPORT_SYMBOL(atomic64_add_386);
20426+long long atomic64_add_unchecked_386(long long a, atomic64_unchecked_t *v);
20427+EXPORT_SYMBOL(atomic64_add_unchecked_386);
20428 long long atomic64_sub_386(long long a, atomic64_t *v);
20429 EXPORT_SYMBOL(atomic64_sub_386);
20430+long long atomic64_sub_unchecked_386(long long a, atomic64_unchecked_t *v);
20431+EXPORT_SYMBOL(atomic64_sub_unchecked_386);
20432 long long atomic64_inc_386(long long a, atomic64_t *v);
20433 EXPORT_SYMBOL(atomic64_inc_386);
20434+long long atomic64_inc_unchecked_386(long long a, atomic64_unchecked_t *v);
20435+EXPORT_SYMBOL(atomic64_inc_unchecked_386);
20436 long long atomic64_dec_386(long long a, atomic64_t *v);
20437 EXPORT_SYMBOL(atomic64_dec_386);
20438+long long atomic64_dec_unchecked_386(long long a, atomic64_unchecked_t *v);
20439+EXPORT_SYMBOL(atomic64_dec_unchecked_386);
20440 long long atomic64_dec_if_positive_386(atomic64_t *v);
20441 EXPORT_SYMBOL(atomic64_dec_if_positive_386);
20442 int atomic64_inc_not_zero_386(atomic64_t *v);
20443diff --git a/arch/x86/lib/atomic64_386_32.S b/arch/x86/lib/atomic64_386_32.S
20444index e8e7e0d..56fd1b0 100644
20445--- a/arch/x86/lib/atomic64_386_32.S
20446+++ b/arch/x86/lib/atomic64_386_32.S
20447@@ -48,6 +48,10 @@ BEGIN(read)
20448 movl (v), %eax
20449 movl 4(v), %edx
20450 RET_ENDP
20451+BEGIN(read_unchecked)
20452+ movl (v), %eax
20453+ movl 4(v), %edx
20454+RET_ENDP
20455 #undef v
20456
20457 #define v %esi
20458@@ -55,6 +59,10 @@ BEGIN(set)
20459 movl %ebx, (v)
20460 movl %ecx, 4(v)
20461 RET_ENDP
20462+BEGIN(set_unchecked)
20463+ movl %ebx, (v)
20464+ movl %ecx, 4(v)
20465+RET_ENDP
20466 #undef v
20467
20468 #define v %esi
20469@@ -70,6 +78,20 @@ RET_ENDP
20470 BEGIN(add)
20471 addl %eax, (v)
20472 adcl %edx, 4(v)
20473+
20474+#ifdef CONFIG_PAX_REFCOUNT
20475+ jno 0f
20476+ subl %eax, (v)
20477+ sbbl %edx, 4(v)
20478+ int $4
20479+0:
20480+ _ASM_EXTABLE(0b, 0b)
20481+#endif
20482+
20483+RET_ENDP
20484+BEGIN(add_unchecked)
20485+ addl %eax, (v)
20486+ adcl %edx, 4(v)
20487 RET_ENDP
20488 #undef v
20489
20490@@ -77,6 +99,24 @@ RET_ENDP
20491 BEGIN(add_return)
20492 addl (v), %eax
20493 adcl 4(v), %edx
20494+
20495+#ifdef CONFIG_PAX_REFCOUNT
20496+ into
20497+1234:
20498+ _ASM_EXTABLE(1234b, 2f)
20499+#endif
20500+
20501+ movl %eax, (v)
20502+ movl %edx, 4(v)
20503+
20504+#ifdef CONFIG_PAX_REFCOUNT
20505+2:
20506+#endif
20507+
20508+RET_ENDP
20509+BEGIN(add_return_unchecked)
20510+ addl (v), %eax
20511+ adcl 4(v), %edx
20512 movl %eax, (v)
20513 movl %edx, 4(v)
20514 RET_ENDP
20515@@ -86,6 +126,20 @@ RET_ENDP
20516 BEGIN(sub)
20517 subl %eax, (v)
20518 sbbl %edx, 4(v)
20519+
20520+#ifdef CONFIG_PAX_REFCOUNT
20521+ jno 0f
20522+ addl %eax, (v)
20523+ adcl %edx, 4(v)
20524+ int $4
20525+0:
20526+ _ASM_EXTABLE(0b, 0b)
20527+#endif
20528+
20529+RET_ENDP
20530+BEGIN(sub_unchecked)
20531+ subl %eax, (v)
20532+ sbbl %edx, 4(v)
20533 RET_ENDP
20534 #undef v
20535
20536@@ -96,6 +150,27 @@ BEGIN(sub_return)
20537 sbbl $0, %edx
20538 addl (v), %eax
20539 adcl 4(v), %edx
20540+
20541+#ifdef CONFIG_PAX_REFCOUNT
20542+ into
20543+1234:
20544+ _ASM_EXTABLE(1234b, 2f)
20545+#endif
20546+
20547+ movl %eax, (v)
20548+ movl %edx, 4(v)
20549+
20550+#ifdef CONFIG_PAX_REFCOUNT
20551+2:
20552+#endif
20553+
20554+RET_ENDP
20555+BEGIN(sub_return_unchecked)
20556+ negl %edx
20557+ negl %eax
20558+ sbbl $0, %edx
20559+ addl (v), %eax
20560+ adcl 4(v), %edx
20561 movl %eax, (v)
20562 movl %edx, 4(v)
20563 RET_ENDP
20564@@ -105,6 +180,20 @@ RET_ENDP
20565 BEGIN(inc)
20566 addl $1, (v)
20567 adcl $0, 4(v)
20568+
20569+#ifdef CONFIG_PAX_REFCOUNT
20570+ jno 0f
20571+ subl $1, (v)
20572+ sbbl $0, 4(v)
20573+ int $4
20574+0:
20575+ _ASM_EXTABLE(0b, 0b)
20576+#endif
20577+
20578+RET_ENDP
20579+BEGIN(inc_unchecked)
20580+ addl $1, (v)
20581+ adcl $0, 4(v)
20582 RET_ENDP
20583 #undef v
20584
20585@@ -114,6 +203,26 @@ BEGIN(inc_return)
20586 movl 4(v), %edx
20587 addl $1, %eax
20588 adcl $0, %edx
20589+
20590+#ifdef CONFIG_PAX_REFCOUNT
20591+ into
20592+1234:
20593+ _ASM_EXTABLE(1234b, 2f)
20594+#endif
20595+
20596+ movl %eax, (v)
20597+ movl %edx, 4(v)
20598+
20599+#ifdef CONFIG_PAX_REFCOUNT
20600+2:
20601+#endif
20602+
20603+RET_ENDP
20604+BEGIN(inc_return_unchecked)
20605+ movl (v), %eax
20606+ movl 4(v), %edx
20607+ addl $1, %eax
20608+ adcl $0, %edx
20609 movl %eax, (v)
20610 movl %edx, 4(v)
20611 RET_ENDP
20612@@ -123,6 +232,20 @@ RET_ENDP
20613 BEGIN(dec)
20614 subl $1, (v)
20615 sbbl $0, 4(v)
20616+
20617+#ifdef CONFIG_PAX_REFCOUNT
20618+ jno 0f
20619+ addl $1, (v)
20620+ adcl $0, 4(v)
20621+ int $4
20622+0:
20623+ _ASM_EXTABLE(0b, 0b)
20624+#endif
20625+
20626+RET_ENDP
20627+BEGIN(dec_unchecked)
20628+ subl $1, (v)
20629+ sbbl $0, 4(v)
20630 RET_ENDP
20631 #undef v
20632
20633@@ -132,6 +255,26 @@ BEGIN(dec_return)
20634 movl 4(v), %edx
20635 subl $1, %eax
20636 sbbl $0, %edx
20637+
20638+#ifdef CONFIG_PAX_REFCOUNT
20639+ into
20640+1234:
20641+ _ASM_EXTABLE(1234b, 2f)
20642+#endif
20643+
20644+ movl %eax, (v)
20645+ movl %edx, 4(v)
20646+
20647+#ifdef CONFIG_PAX_REFCOUNT
20648+2:
20649+#endif
20650+
20651+RET_ENDP
20652+BEGIN(dec_return_unchecked)
20653+ movl (v), %eax
20654+ movl 4(v), %edx
20655+ subl $1, %eax
20656+ sbbl $0, %edx
20657 movl %eax, (v)
20658 movl %edx, 4(v)
20659 RET_ENDP
20660@@ -143,6 +286,13 @@ BEGIN(add_unless)
20661 adcl %edx, %edi
20662 addl (v), %eax
20663 adcl 4(v), %edx
20664+
20665+#ifdef CONFIG_PAX_REFCOUNT
20666+ into
20667+1234:
20668+ _ASM_EXTABLE(1234b, 2f)
20669+#endif
20670+
20671 cmpl %eax, %esi
20672 je 3f
20673 1:
20674@@ -168,6 +318,13 @@ BEGIN(inc_not_zero)
20675 1:
20676 addl $1, %eax
20677 adcl $0, %edx
20678+
20679+#ifdef CONFIG_PAX_REFCOUNT
20680+ into
20681+1234:
20682+ _ASM_EXTABLE(1234b, 2f)
20683+#endif
20684+
20685 movl %eax, (v)
20686 movl %edx, 4(v)
20687 movl $1, %eax
20688@@ -186,6 +343,13 @@ BEGIN(dec_if_positive)
20689 movl 4(v), %edx
20690 subl $1, %eax
20691 sbbl $0, %edx
20692+
20693+#ifdef CONFIG_PAX_REFCOUNT
20694+ into
20695+1234:
20696+ _ASM_EXTABLE(1234b, 1f)
20697+#endif
20698+
20699 js 1f
20700 movl %eax, (v)
20701 movl %edx, 4(v)
20702diff --git a/arch/x86/lib/atomic64_cx8_32.S b/arch/x86/lib/atomic64_cx8_32.S
20703index 391a083..d658e9f 100644
20704--- a/arch/x86/lib/atomic64_cx8_32.S
20705+++ b/arch/x86/lib/atomic64_cx8_32.S
20706@@ -35,10 +35,20 @@ ENTRY(atomic64_read_cx8)
20707 CFI_STARTPROC
20708
20709 read64 %ecx
20710+ pax_force_retaddr
20711 ret
20712 CFI_ENDPROC
20713 ENDPROC(atomic64_read_cx8)
20714
20715+ENTRY(atomic64_read_unchecked_cx8)
20716+ CFI_STARTPROC
20717+
20718+ read64 %ecx
20719+ pax_force_retaddr
20720+ ret
20721+ CFI_ENDPROC
20722+ENDPROC(atomic64_read_unchecked_cx8)
20723+
20724 ENTRY(atomic64_set_cx8)
20725 CFI_STARTPROC
20726
20727@@ -48,10 +58,25 @@ ENTRY(atomic64_set_cx8)
20728 cmpxchg8b (%esi)
20729 jne 1b
20730
20731+ pax_force_retaddr
20732 ret
20733 CFI_ENDPROC
20734 ENDPROC(atomic64_set_cx8)
20735
20736+ENTRY(atomic64_set_unchecked_cx8)
20737+ CFI_STARTPROC
20738+
20739+1:
20740+/* we don't need LOCK_PREFIX since aligned 64-bit writes
20741+ * are atomic on 586 and newer */
20742+ cmpxchg8b (%esi)
20743+ jne 1b
20744+
20745+ pax_force_retaddr
20746+ ret
20747+ CFI_ENDPROC
20748+ENDPROC(atomic64_set_unchecked_cx8)
20749+
20750 ENTRY(atomic64_xchg_cx8)
20751 CFI_STARTPROC
20752
20753@@ -62,12 +87,13 @@ ENTRY(atomic64_xchg_cx8)
20754 cmpxchg8b (%esi)
20755 jne 1b
20756
20757+ pax_force_retaddr
20758 ret
20759 CFI_ENDPROC
20760 ENDPROC(atomic64_xchg_cx8)
20761
20762-.macro addsub_return func ins insc
20763-ENTRY(atomic64_\func\()_return_cx8)
20764+.macro addsub_return func ins insc unchecked=""
20765+ENTRY(atomic64_\func\()_return\unchecked\()_cx8)
20766 CFI_STARTPROC
20767 SAVE ebp
20768 SAVE ebx
20769@@ -84,27 +110,44 @@ ENTRY(atomic64_\func\()_return_cx8)
20770 movl %edx, %ecx
20771 \ins\()l %esi, %ebx
20772 \insc\()l %edi, %ecx
20773+
20774+.ifb \unchecked
20775+#ifdef CONFIG_PAX_REFCOUNT
20776+ into
20777+2:
20778+ _ASM_EXTABLE(2b, 3f)
20779+#endif
20780+.endif
20781+
20782 LOCK_PREFIX
20783 cmpxchg8b (%ebp)
20784 jne 1b
20785-
20786-10:
20787 movl %ebx, %eax
20788 movl %ecx, %edx
20789+
20790+.ifb \unchecked
20791+#ifdef CONFIG_PAX_REFCOUNT
20792+3:
20793+#endif
20794+.endif
20795+
20796 RESTORE edi
20797 RESTORE esi
20798 RESTORE ebx
20799 RESTORE ebp
20800+ pax_force_retaddr
20801 ret
20802 CFI_ENDPROC
20803-ENDPROC(atomic64_\func\()_return_cx8)
20804+ENDPROC(atomic64_\func\()_return\unchecked\()_cx8)
20805 .endm
20806
20807 addsub_return add add adc
20808 addsub_return sub sub sbb
20809+addsub_return add add adc _unchecked
20810+addsub_return sub sub sbb _unchecked
20811
20812-.macro incdec_return func ins insc
20813-ENTRY(atomic64_\func\()_return_cx8)
20814+.macro incdec_return func ins insc unchecked
20815+ENTRY(atomic64_\func\()_return\unchecked\()_cx8)
20816 CFI_STARTPROC
20817 SAVE ebx
20818
20819@@ -114,21 +157,39 @@ ENTRY(atomic64_\func\()_return_cx8)
20820 movl %edx, %ecx
20821 \ins\()l $1, %ebx
20822 \insc\()l $0, %ecx
20823+
20824+.ifb \unchecked
20825+#ifdef CONFIG_PAX_REFCOUNT
20826+ into
20827+2:
20828+ _ASM_EXTABLE(2b, 3f)
20829+#endif
20830+.endif
20831+
20832 LOCK_PREFIX
20833 cmpxchg8b (%esi)
20834 jne 1b
20835
20836-10:
20837 movl %ebx, %eax
20838 movl %ecx, %edx
20839+
20840+.ifb \unchecked
20841+#ifdef CONFIG_PAX_REFCOUNT
20842+3:
20843+#endif
20844+.endif
20845+
20846 RESTORE ebx
20847+ pax_force_retaddr
20848 ret
20849 CFI_ENDPROC
20850-ENDPROC(atomic64_\func\()_return_cx8)
20851+ENDPROC(atomic64_\func\()_return\unchecked\()_cx8)
20852 .endm
20853
20854 incdec_return inc add adc
20855 incdec_return dec sub sbb
20856+incdec_return inc add adc _unchecked
20857+incdec_return dec sub sbb _unchecked
20858
20859 ENTRY(atomic64_dec_if_positive_cx8)
20860 CFI_STARTPROC
20861@@ -140,6 +201,13 @@ ENTRY(atomic64_dec_if_positive_cx8)
20862 movl %edx, %ecx
20863 subl $1, %ebx
20864 sbb $0, %ecx
20865+
20866+#ifdef CONFIG_PAX_REFCOUNT
20867+ into
20868+1234:
20869+ _ASM_EXTABLE(1234b, 2f)
20870+#endif
20871+
20872 js 2f
20873 LOCK_PREFIX
20874 cmpxchg8b (%esi)
20875@@ -149,6 +217,7 @@ ENTRY(atomic64_dec_if_positive_cx8)
20876 movl %ebx, %eax
20877 movl %ecx, %edx
20878 RESTORE ebx
20879+ pax_force_retaddr
20880 ret
20881 CFI_ENDPROC
20882 ENDPROC(atomic64_dec_if_positive_cx8)
20883@@ -174,6 +243,13 @@ ENTRY(atomic64_add_unless_cx8)
20884 movl %edx, %ecx
20885 addl %esi, %ebx
20886 adcl %edi, %ecx
20887+
20888+#ifdef CONFIG_PAX_REFCOUNT
20889+ into
20890+1234:
20891+ _ASM_EXTABLE(1234b, 3f)
20892+#endif
20893+
20894 LOCK_PREFIX
20895 cmpxchg8b (%ebp)
20896 jne 1b
20897@@ -184,6 +260,7 @@ ENTRY(atomic64_add_unless_cx8)
20898 CFI_ADJUST_CFA_OFFSET -8
20899 RESTORE ebx
20900 RESTORE ebp
20901+ pax_force_retaddr
20902 ret
20903 4:
20904 cmpl %edx, 4(%esp)
20905@@ -206,6 +283,13 @@ ENTRY(atomic64_inc_not_zero_cx8)
20906 movl %edx, %ecx
20907 addl $1, %ebx
20908 adcl $0, %ecx
20909+
20910+#ifdef CONFIG_PAX_REFCOUNT
20911+ into
20912+1234:
20913+ _ASM_EXTABLE(1234b, 3f)
20914+#endif
20915+
20916 LOCK_PREFIX
20917 cmpxchg8b (%esi)
20918 jne 1b
20919@@ -213,6 +297,7 @@ ENTRY(atomic64_inc_not_zero_cx8)
20920 movl $1, %eax
20921 3:
20922 RESTORE ebx
20923+ pax_force_retaddr
20924 ret
20925 4:
20926 testl %edx, %edx
20927diff --git a/arch/x86/lib/checksum_32.S b/arch/x86/lib/checksum_32.S
20928index 78d16a5..fbcf666 100644
20929--- a/arch/x86/lib/checksum_32.S
20930+++ b/arch/x86/lib/checksum_32.S
20931@@ -28,7 +28,8 @@
20932 #include <linux/linkage.h>
20933 #include <asm/dwarf2.h>
20934 #include <asm/errno.h>
20935-
20936+#include <asm/segment.h>
20937+
20938 /*
20939 * computes a partial checksum, e.g. for TCP/UDP fragments
20940 */
20941@@ -296,9 +297,24 @@ unsigned int csum_partial_copy_generic (const char *src, char *dst,
20942
20943 #define ARGBASE 16
20944 #define FP 12
20945-
20946-ENTRY(csum_partial_copy_generic)
20947+
20948+ENTRY(csum_partial_copy_generic_to_user)
20949 CFI_STARTPROC
20950+
20951+#ifdef CONFIG_PAX_MEMORY_UDEREF
20952+ pushl_cfi %gs
20953+ popl_cfi %es
20954+ jmp csum_partial_copy_generic
20955+#endif
20956+
20957+ENTRY(csum_partial_copy_generic_from_user)
20958+
20959+#ifdef CONFIG_PAX_MEMORY_UDEREF
20960+ pushl_cfi %gs
20961+ popl_cfi %ds
20962+#endif
20963+
20964+ENTRY(csum_partial_copy_generic)
20965 subl $4,%esp
20966 CFI_ADJUST_CFA_OFFSET 4
20967 pushl_cfi %edi
20968@@ -320,7 +336,7 @@ ENTRY(csum_partial_copy_generic)
20969 jmp 4f
20970 SRC(1: movw (%esi), %bx )
20971 addl $2, %esi
20972-DST( movw %bx, (%edi) )
20973+DST( movw %bx, %es:(%edi) )
20974 addl $2, %edi
20975 addw %bx, %ax
20976 adcl $0, %eax
20977@@ -332,30 +348,30 @@ DST( movw %bx, (%edi) )
20978 SRC(1: movl (%esi), %ebx )
20979 SRC( movl 4(%esi), %edx )
20980 adcl %ebx, %eax
20981-DST( movl %ebx, (%edi) )
20982+DST( movl %ebx, %es:(%edi) )
20983 adcl %edx, %eax
20984-DST( movl %edx, 4(%edi) )
20985+DST( movl %edx, %es:4(%edi) )
20986
20987 SRC( movl 8(%esi), %ebx )
20988 SRC( movl 12(%esi), %edx )
20989 adcl %ebx, %eax
20990-DST( movl %ebx, 8(%edi) )
20991+DST( movl %ebx, %es:8(%edi) )
20992 adcl %edx, %eax
20993-DST( movl %edx, 12(%edi) )
20994+DST( movl %edx, %es:12(%edi) )
20995
20996 SRC( movl 16(%esi), %ebx )
20997 SRC( movl 20(%esi), %edx )
20998 adcl %ebx, %eax
20999-DST( movl %ebx, 16(%edi) )
21000+DST( movl %ebx, %es:16(%edi) )
21001 adcl %edx, %eax
21002-DST( movl %edx, 20(%edi) )
21003+DST( movl %edx, %es:20(%edi) )
21004
21005 SRC( movl 24(%esi), %ebx )
21006 SRC( movl 28(%esi), %edx )
21007 adcl %ebx, %eax
21008-DST( movl %ebx, 24(%edi) )
21009+DST( movl %ebx, %es:24(%edi) )
21010 adcl %edx, %eax
21011-DST( movl %edx, 28(%edi) )
21012+DST( movl %edx, %es:28(%edi) )
21013
21014 lea 32(%esi), %esi
21015 lea 32(%edi), %edi
21016@@ -369,7 +385,7 @@ DST( movl %edx, 28(%edi) )
21017 shrl $2, %edx # This clears CF
21018 SRC(3: movl (%esi), %ebx )
21019 adcl %ebx, %eax
21020-DST( movl %ebx, (%edi) )
21021+DST( movl %ebx, %es:(%edi) )
21022 lea 4(%esi), %esi
21023 lea 4(%edi), %edi
21024 dec %edx
21025@@ -381,12 +397,12 @@ DST( movl %ebx, (%edi) )
21026 jb 5f
21027 SRC( movw (%esi), %cx )
21028 leal 2(%esi), %esi
21029-DST( movw %cx, (%edi) )
21030+DST( movw %cx, %es:(%edi) )
21031 leal 2(%edi), %edi
21032 je 6f
21033 shll $16,%ecx
21034 SRC(5: movb (%esi), %cl )
21035-DST( movb %cl, (%edi) )
21036+DST( movb %cl, %es:(%edi) )
21037 6: addl %ecx, %eax
21038 adcl $0, %eax
21039 7:
21040@@ -397,7 +413,7 @@ DST( movb %cl, (%edi) )
21041
21042 6001:
21043 movl ARGBASE+20(%esp), %ebx # src_err_ptr
21044- movl $-EFAULT, (%ebx)
21045+ movl $-EFAULT, %ss:(%ebx)
21046
21047 # zero the complete destination - computing the rest
21048 # is too much work
21049@@ -410,11 +426,15 @@ DST( movb %cl, (%edi) )
21050
21051 6002:
21052 movl ARGBASE+24(%esp), %ebx # dst_err_ptr
21053- movl $-EFAULT,(%ebx)
21054+ movl $-EFAULT,%ss:(%ebx)
21055 jmp 5000b
21056
21057 .previous
21058
21059+ pushl_cfi %ss
21060+ popl_cfi %ds
21061+ pushl_cfi %ss
21062+ popl_cfi %es
21063 popl_cfi %ebx
21064 CFI_RESTORE ebx
21065 popl_cfi %esi
21066@@ -424,26 +444,43 @@ DST( movb %cl, (%edi) )
21067 popl_cfi %ecx # equivalent to addl $4,%esp
21068 ret
21069 CFI_ENDPROC
21070-ENDPROC(csum_partial_copy_generic)
21071+ENDPROC(csum_partial_copy_generic_to_user)
21072
21073 #else
21074
21075 /* Version for PentiumII/PPro */
21076
21077 #define ROUND1(x) \
21078+ nop; nop; nop; \
21079 SRC(movl x(%esi), %ebx ) ; \
21080 addl %ebx, %eax ; \
21081- DST(movl %ebx, x(%edi) ) ;
21082+ DST(movl %ebx, %es:x(%edi)) ;
21083
21084 #define ROUND(x) \
21085+ nop; nop; nop; \
21086 SRC(movl x(%esi), %ebx ) ; \
21087 adcl %ebx, %eax ; \
21088- DST(movl %ebx, x(%edi) ) ;
21089+ DST(movl %ebx, %es:x(%edi)) ;
21090
21091 #define ARGBASE 12
21092-
21093-ENTRY(csum_partial_copy_generic)
21094+
21095+ENTRY(csum_partial_copy_generic_to_user)
21096 CFI_STARTPROC
21097+
21098+#ifdef CONFIG_PAX_MEMORY_UDEREF
21099+ pushl_cfi %gs
21100+ popl_cfi %es
21101+ jmp csum_partial_copy_generic
21102+#endif
21103+
21104+ENTRY(csum_partial_copy_generic_from_user)
21105+
21106+#ifdef CONFIG_PAX_MEMORY_UDEREF
21107+ pushl_cfi %gs
21108+ popl_cfi %ds
21109+#endif
21110+
21111+ENTRY(csum_partial_copy_generic)
21112 pushl_cfi %ebx
21113 CFI_REL_OFFSET ebx, 0
21114 pushl_cfi %edi
21115@@ -464,7 +501,7 @@ ENTRY(csum_partial_copy_generic)
21116 subl %ebx, %edi
21117 lea -1(%esi),%edx
21118 andl $-32,%edx
21119- lea 3f(%ebx,%ebx), %ebx
21120+ lea 3f(%ebx,%ebx,2), %ebx
21121 testl %esi, %esi
21122 jmp *%ebx
21123 1: addl $64,%esi
21124@@ -485,19 +522,19 @@ ENTRY(csum_partial_copy_generic)
21125 jb 5f
21126 SRC( movw (%esi), %dx )
21127 leal 2(%esi), %esi
21128-DST( movw %dx, (%edi) )
21129+DST( movw %dx, %es:(%edi) )
21130 leal 2(%edi), %edi
21131 je 6f
21132 shll $16,%edx
21133 5:
21134 SRC( movb (%esi), %dl )
21135-DST( movb %dl, (%edi) )
21136+DST( movb %dl, %es:(%edi) )
21137 6: addl %edx, %eax
21138 adcl $0, %eax
21139 7:
21140 .section .fixup, "ax"
21141 6001: movl ARGBASE+20(%esp), %ebx # src_err_ptr
21142- movl $-EFAULT, (%ebx)
21143+ movl $-EFAULT, %ss:(%ebx)
21144 # zero the complete destination (computing the rest is too much work)
21145 movl ARGBASE+8(%esp),%edi # dst
21146 movl ARGBASE+12(%esp),%ecx # len
21147@@ -505,10 +542,17 @@ DST( movb %dl, (%edi) )
21148 rep; stosb
21149 jmp 7b
21150 6002: movl ARGBASE+24(%esp), %ebx # dst_err_ptr
21151- movl $-EFAULT, (%ebx)
21152+ movl $-EFAULT, %ss:(%ebx)
21153 jmp 7b
21154 .previous
21155
21156+#ifdef CONFIG_PAX_MEMORY_UDEREF
21157+ pushl_cfi %ss
21158+ popl_cfi %ds
21159+ pushl_cfi %ss
21160+ popl_cfi %es
21161+#endif
21162+
21163 popl_cfi %esi
21164 CFI_RESTORE esi
21165 popl_cfi %edi
21166@@ -517,7 +561,7 @@ DST( movb %dl, (%edi) )
21167 CFI_RESTORE ebx
21168 ret
21169 CFI_ENDPROC
21170-ENDPROC(csum_partial_copy_generic)
21171+ENDPROC(csum_partial_copy_generic_to_user)
21172
21173 #undef ROUND
21174 #undef ROUND1
21175diff --git a/arch/x86/lib/clear_page_64.S b/arch/x86/lib/clear_page_64.S
21176index f2145cf..cea889d 100644
21177--- a/arch/x86/lib/clear_page_64.S
21178+++ b/arch/x86/lib/clear_page_64.S
21179@@ -11,6 +11,7 @@ ENTRY(clear_page_c)
21180 movl $4096/8,%ecx
21181 xorl %eax,%eax
21182 rep stosq
21183+ pax_force_retaddr
21184 ret
21185 CFI_ENDPROC
21186 ENDPROC(clear_page_c)
21187@@ -20,6 +21,7 @@ ENTRY(clear_page_c_e)
21188 movl $4096,%ecx
21189 xorl %eax,%eax
21190 rep stosb
21191+ pax_force_retaddr
21192 ret
21193 CFI_ENDPROC
21194 ENDPROC(clear_page_c_e)
21195@@ -43,6 +45,7 @@ ENTRY(clear_page)
21196 leaq 64(%rdi),%rdi
21197 jnz .Lloop
21198 nop
21199+ pax_force_retaddr
21200 ret
21201 CFI_ENDPROC
21202 .Lclear_page_end:
21203@@ -58,7 +61,7 @@ ENDPROC(clear_page)
21204
21205 #include <asm/cpufeature.h>
21206
21207- .section .altinstr_replacement,"ax"
21208+ .section .altinstr_replacement,"a"
21209 1: .byte 0xeb /* jmp <disp8> */
21210 .byte (clear_page_c - clear_page) - (2f - 1b) /* offset */
21211 2: .byte 0xeb /* jmp <disp8> */
21212diff --git a/arch/x86/lib/cmpxchg16b_emu.S b/arch/x86/lib/cmpxchg16b_emu.S
21213index 1e572c5..2a162cd 100644
21214--- a/arch/x86/lib/cmpxchg16b_emu.S
21215+++ b/arch/x86/lib/cmpxchg16b_emu.S
21216@@ -53,11 +53,13 @@ this_cpu_cmpxchg16b_emu:
21217
21218 popf
21219 mov $1, %al
21220+ pax_force_retaddr
21221 ret
21222
21223 not_same:
21224 popf
21225 xor %al,%al
21226+ pax_force_retaddr
21227 ret
21228
21229 CFI_ENDPROC
21230diff --git a/arch/x86/lib/copy_page_64.S b/arch/x86/lib/copy_page_64.S
21231index 01c805b..dccb07f 100644
21232--- a/arch/x86/lib/copy_page_64.S
21233+++ b/arch/x86/lib/copy_page_64.S
21234@@ -9,6 +9,7 @@ copy_page_c:
21235 CFI_STARTPROC
21236 movl $4096/8,%ecx
21237 rep movsq
21238+ pax_force_retaddr
21239 ret
21240 CFI_ENDPROC
21241 ENDPROC(copy_page_c)
21242@@ -39,7 +40,7 @@ ENTRY(copy_page)
21243 movq 16 (%rsi), %rdx
21244 movq 24 (%rsi), %r8
21245 movq 32 (%rsi), %r9
21246- movq 40 (%rsi), %r10
21247+ movq 40 (%rsi), %r13
21248 movq 48 (%rsi), %r11
21249 movq 56 (%rsi), %r12
21250
21251@@ -50,7 +51,7 @@ ENTRY(copy_page)
21252 movq %rdx, 16 (%rdi)
21253 movq %r8, 24 (%rdi)
21254 movq %r9, 32 (%rdi)
21255- movq %r10, 40 (%rdi)
21256+ movq %r13, 40 (%rdi)
21257 movq %r11, 48 (%rdi)
21258 movq %r12, 56 (%rdi)
21259
21260@@ -69,7 +70,7 @@ ENTRY(copy_page)
21261 movq 16 (%rsi), %rdx
21262 movq 24 (%rsi), %r8
21263 movq 32 (%rsi), %r9
21264- movq 40 (%rsi), %r10
21265+ movq 40 (%rsi), %r13
21266 movq 48 (%rsi), %r11
21267 movq 56 (%rsi), %r12
21268
21269@@ -78,7 +79,7 @@ ENTRY(copy_page)
21270 movq %rdx, 16 (%rdi)
21271 movq %r8, 24 (%rdi)
21272 movq %r9, 32 (%rdi)
21273- movq %r10, 40 (%rdi)
21274+ movq %r13, 40 (%rdi)
21275 movq %r11, 48 (%rdi)
21276 movq %r12, 56 (%rdi)
21277
21278@@ -95,6 +96,7 @@ ENTRY(copy_page)
21279 CFI_RESTORE r13
21280 addq $3*8,%rsp
21281 CFI_ADJUST_CFA_OFFSET -3*8
21282+ pax_force_retaddr
21283 ret
21284 .Lcopy_page_end:
21285 CFI_ENDPROC
21286@@ -105,7 +107,7 @@ ENDPROC(copy_page)
21287
21288 #include <asm/cpufeature.h>
21289
21290- .section .altinstr_replacement,"ax"
21291+ .section .altinstr_replacement,"a"
21292 1: .byte 0xeb /* jmp <disp8> */
21293 .byte (copy_page_c - copy_page) - (2f - 1b) /* offset */
21294 2:
21295diff --git a/arch/x86/lib/copy_user_64.S b/arch/x86/lib/copy_user_64.S
21296index 0248402..821c786 100644
21297--- a/arch/x86/lib/copy_user_64.S
21298+++ b/arch/x86/lib/copy_user_64.S
21299@@ -16,6 +16,7 @@
21300 #include <asm/thread_info.h>
21301 #include <asm/cpufeature.h>
21302 #include <asm/alternative-asm.h>
21303+#include <asm/pgtable.h>
21304
21305 /*
21306 * By placing feature2 after feature1 in altinstructions section, we logically
21307@@ -29,7 +30,7 @@
21308 .byte 0xe9 /* 32bit jump */
21309 .long \orig-1f /* by default jump to orig */
21310 1:
21311- .section .altinstr_replacement,"ax"
21312+ .section .altinstr_replacement,"a"
21313 2: .byte 0xe9 /* near jump with 32bit immediate */
21314 .long \alt1-1b /* offset */ /* or alternatively to alt1 */
21315 3: .byte 0xe9 /* near jump with 32bit immediate */
21316@@ -71,47 +72,20 @@
21317 #endif
21318 .endm
21319
21320-/* Standard copy_to_user with segment limit checking */
21321-ENTRY(_copy_to_user)
21322- CFI_STARTPROC
21323- GET_THREAD_INFO(%rax)
21324- movq %rdi,%rcx
21325- addq %rdx,%rcx
21326- jc bad_to_user
21327- cmpq TI_addr_limit(%rax),%rcx
21328- ja bad_to_user
21329- ALTERNATIVE_JUMP X86_FEATURE_REP_GOOD,X86_FEATURE_ERMS, \
21330- copy_user_generic_unrolled,copy_user_generic_string, \
21331- copy_user_enhanced_fast_string
21332- CFI_ENDPROC
21333-ENDPROC(_copy_to_user)
21334-
21335-/* Standard copy_from_user with segment limit checking */
21336-ENTRY(_copy_from_user)
21337- CFI_STARTPROC
21338- GET_THREAD_INFO(%rax)
21339- movq %rsi,%rcx
21340- addq %rdx,%rcx
21341- jc bad_from_user
21342- cmpq TI_addr_limit(%rax),%rcx
21343- ja bad_from_user
21344- ALTERNATIVE_JUMP X86_FEATURE_REP_GOOD,X86_FEATURE_ERMS, \
21345- copy_user_generic_unrolled,copy_user_generic_string, \
21346- copy_user_enhanced_fast_string
21347- CFI_ENDPROC
21348-ENDPROC(_copy_from_user)
21349-
21350 .section .fixup,"ax"
21351 /* must zero dest */
21352 ENTRY(bad_from_user)
21353 bad_from_user:
21354 CFI_STARTPROC
21355+ testl %edx,%edx
21356+ js bad_to_user
21357 movl %edx,%ecx
21358 xorl %eax,%eax
21359 rep
21360 stosb
21361 bad_to_user:
21362 movl %edx,%eax
21363+ pax_force_retaddr
21364 ret
21365 CFI_ENDPROC
21366 ENDPROC(bad_from_user)
21367@@ -141,19 +115,19 @@ ENTRY(copy_user_generic_unrolled)
21368 jz 17f
21369 1: movq (%rsi),%r8
21370 2: movq 1*8(%rsi),%r9
21371-3: movq 2*8(%rsi),%r10
21372+3: movq 2*8(%rsi),%rax
21373 4: movq 3*8(%rsi),%r11
21374 5: movq %r8,(%rdi)
21375 6: movq %r9,1*8(%rdi)
21376-7: movq %r10,2*8(%rdi)
21377+7: movq %rax,2*8(%rdi)
21378 8: movq %r11,3*8(%rdi)
21379 9: movq 4*8(%rsi),%r8
21380 10: movq 5*8(%rsi),%r9
21381-11: movq 6*8(%rsi),%r10
21382+11: movq 6*8(%rsi),%rax
21383 12: movq 7*8(%rsi),%r11
21384 13: movq %r8,4*8(%rdi)
21385 14: movq %r9,5*8(%rdi)
21386-15: movq %r10,6*8(%rdi)
21387+15: movq %rax,6*8(%rdi)
21388 16: movq %r11,7*8(%rdi)
21389 leaq 64(%rsi),%rsi
21390 leaq 64(%rdi),%rdi
21391@@ -179,6 +153,7 @@ ENTRY(copy_user_generic_unrolled)
21392 decl %ecx
21393 jnz 21b
21394 23: xor %eax,%eax
21395+ pax_force_retaddr
21396 ret
21397
21398 .section .fixup,"ax"
21399@@ -251,6 +226,7 @@ ENTRY(copy_user_generic_string)
21400 3: rep
21401 movsb
21402 4: xorl %eax,%eax
21403+ pax_force_retaddr
21404 ret
21405
21406 .section .fixup,"ax"
21407@@ -287,6 +263,7 @@ ENTRY(copy_user_enhanced_fast_string)
21408 1: rep
21409 movsb
21410 2: xorl %eax,%eax
21411+ pax_force_retaddr
21412 ret
21413
21414 .section .fixup,"ax"
21415diff --git a/arch/x86/lib/copy_user_nocache_64.S b/arch/x86/lib/copy_user_nocache_64.S
21416index cb0c112..e3a6895 100644
21417--- a/arch/x86/lib/copy_user_nocache_64.S
21418+++ b/arch/x86/lib/copy_user_nocache_64.S
21419@@ -8,12 +8,14 @@
21420
21421 #include <linux/linkage.h>
21422 #include <asm/dwarf2.h>
21423+#include <asm/alternative-asm.h>
21424
21425 #define FIX_ALIGNMENT 1
21426
21427 #include <asm/current.h>
21428 #include <asm/asm-offsets.h>
21429 #include <asm/thread_info.h>
21430+#include <asm/pgtable.h>
21431
21432 .macro ALIGN_DESTINATION
21433 #ifdef FIX_ALIGNMENT
21434@@ -50,6 +52,15 @@
21435 */
21436 ENTRY(__copy_user_nocache)
21437 CFI_STARTPROC
21438+
21439+#ifdef CONFIG_PAX_MEMORY_UDEREF
21440+ mov $PAX_USER_SHADOW_BASE,%rcx
21441+ cmp %rcx,%rsi
21442+ jae 1f
21443+ add %rcx,%rsi
21444+1:
21445+#endif
21446+
21447 cmpl $8,%edx
21448 jb 20f /* less then 8 bytes, go to byte copy loop */
21449 ALIGN_DESTINATION
21450@@ -59,19 +70,19 @@ ENTRY(__copy_user_nocache)
21451 jz 17f
21452 1: movq (%rsi),%r8
21453 2: movq 1*8(%rsi),%r9
21454-3: movq 2*8(%rsi),%r10
21455+3: movq 2*8(%rsi),%rax
21456 4: movq 3*8(%rsi),%r11
21457 5: movnti %r8,(%rdi)
21458 6: movnti %r9,1*8(%rdi)
21459-7: movnti %r10,2*8(%rdi)
21460+7: movnti %rax,2*8(%rdi)
21461 8: movnti %r11,3*8(%rdi)
21462 9: movq 4*8(%rsi),%r8
21463 10: movq 5*8(%rsi),%r9
21464-11: movq 6*8(%rsi),%r10
21465+11: movq 6*8(%rsi),%rax
21466 12: movq 7*8(%rsi),%r11
21467 13: movnti %r8,4*8(%rdi)
21468 14: movnti %r9,5*8(%rdi)
21469-15: movnti %r10,6*8(%rdi)
21470+15: movnti %rax,6*8(%rdi)
21471 16: movnti %r11,7*8(%rdi)
21472 leaq 64(%rsi),%rsi
21473 leaq 64(%rdi),%rdi
21474@@ -98,6 +109,7 @@ ENTRY(__copy_user_nocache)
21475 jnz 21b
21476 23: xorl %eax,%eax
21477 sfence
21478+ pax_force_retaddr
21479 ret
21480
21481 .section .fixup,"ax"
21482diff --git a/arch/x86/lib/csum-copy_64.S b/arch/x86/lib/csum-copy_64.S
21483index fb903b7..c92b7f7 100644
21484--- a/arch/x86/lib/csum-copy_64.S
21485+++ b/arch/x86/lib/csum-copy_64.S
21486@@ -8,6 +8,7 @@
21487 #include <linux/linkage.h>
21488 #include <asm/dwarf2.h>
21489 #include <asm/errno.h>
21490+#include <asm/alternative-asm.h>
21491
21492 /*
21493 * Checksum copy with exception handling.
21494@@ -228,6 +229,7 @@ ENTRY(csum_partial_copy_generic)
21495 CFI_RESTORE rbp
21496 addq $7*8, %rsp
21497 CFI_ADJUST_CFA_OFFSET -7*8
21498+ pax_force_retaddr 0, 1
21499 ret
21500 CFI_RESTORE_STATE
21501
21502diff --git a/arch/x86/lib/csum-wrappers_64.c b/arch/x86/lib/csum-wrappers_64.c
21503index 459b58a..9570bc7 100644
21504--- a/arch/x86/lib/csum-wrappers_64.c
21505+++ b/arch/x86/lib/csum-wrappers_64.c
21506@@ -52,7 +52,13 @@ csum_partial_copy_from_user(const void __user *src, void *dst,
21507 len -= 2;
21508 }
21509 }
21510- isum = csum_partial_copy_generic((__force const void *)src,
21511+
21512+#ifdef CONFIG_PAX_MEMORY_UDEREF
21513+ if ((unsigned long)src < PAX_USER_SHADOW_BASE)
21514+ src += PAX_USER_SHADOW_BASE;
21515+#endif
21516+
21517+ isum = csum_partial_copy_generic((const void __force_kernel *)src,
21518 dst, len, isum, errp, NULL);
21519 if (unlikely(*errp))
21520 goto out_err;
21521@@ -105,7 +111,13 @@ csum_partial_copy_to_user(const void *src, void __user *dst,
21522 }
21523
21524 *errp = 0;
21525- return csum_partial_copy_generic(src, (void __force *)dst,
21526+
21527+#ifdef CONFIG_PAX_MEMORY_UDEREF
21528+ if ((unsigned long)dst < PAX_USER_SHADOW_BASE)
21529+ dst += PAX_USER_SHADOW_BASE;
21530+#endif
21531+
21532+ return csum_partial_copy_generic(src, (void __force_kernel *)dst,
21533 len, isum, NULL, errp);
21534 }
21535 EXPORT_SYMBOL(csum_partial_copy_to_user);
21536diff --git a/arch/x86/lib/getuser.S b/arch/x86/lib/getuser.S
21537index 51f1504..ddac4c1 100644
21538--- a/arch/x86/lib/getuser.S
21539+++ b/arch/x86/lib/getuser.S
21540@@ -33,15 +33,38 @@
21541 #include <asm/asm-offsets.h>
21542 #include <asm/thread_info.h>
21543 #include <asm/asm.h>
21544+#include <asm/segment.h>
21545+#include <asm/pgtable.h>
21546+#include <asm/alternative-asm.h>
21547+
21548+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_MEMORY_UDEREF)
21549+#define __copyuser_seg gs;
21550+#else
21551+#define __copyuser_seg
21552+#endif
21553
21554 .text
21555 ENTRY(__get_user_1)
21556 CFI_STARTPROC
21557+
21558+#if !defined(CONFIG_X86_32) || !defined(CONFIG_PAX_MEMORY_UDEREF)
21559 GET_THREAD_INFO(%_ASM_DX)
21560 cmp TI_addr_limit(%_ASM_DX),%_ASM_AX
21561 jae bad_get_user
21562-1: movzb (%_ASM_AX),%edx
21563+
21564+#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
21565+ mov $PAX_USER_SHADOW_BASE,%_ASM_DX
21566+ cmp %_ASM_DX,%_ASM_AX
21567+ jae 1234f
21568+ add %_ASM_DX,%_ASM_AX
21569+1234:
21570+#endif
21571+
21572+#endif
21573+
21574+1: __copyuser_seg movzb (%_ASM_AX),%edx
21575 xor %eax,%eax
21576+ pax_force_retaddr
21577 ret
21578 CFI_ENDPROC
21579 ENDPROC(__get_user_1)
21580@@ -49,12 +72,26 @@ ENDPROC(__get_user_1)
21581 ENTRY(__get_user_2)
21582 CFI_STARTPROC
21583 add $1,%_ASM_AX
21584+
21585+#if !defined(CONFIG_X86_32) || !defined(CONFIG_PAX_MEMORY_UDEREF)
21586 jc bad_get_user
21587 GET_THREAD_INFO(%_ASM_DX)
21588 cmp TI_addr_limit(%_ASM_DX),%_ASM_AX
21589 jae bad_get_user
21590-2: movzwl -1(%_ASM_AX),%edx
21591+
21592+#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
21593+ mov $PAX_USER_SHADOW_BASE,%_ASM_DX
21594+ cmp %_ASM_DX,%_ASM_AX
21595+ jae 1234f
21596+ add %_ASM_DX,%_ASM_AX
21597+1234:
21598+#endif
21599+
21600+#endif
21601+
21602+2: __copyuser_seg movzwl -1(%_ASM_AX),%edx
21603 xor %eax,%eax
21604+ pax_force_retaddr
21605 ret
21606 CFI_ENDPROC
21607 ENDPROC(__get_user_2)
21608@@ -62,12 +99,26 @@ ENDPROC(__get_user_2)
21609 ENTRY(__get_user_4)
21610 CFI_STARTPROC
21611 add $3,%_ASM_AX
21612+
21613+#if !defined(CONFIG_X86_32) || !defined(CONFIG_PAX_MEMORY_UDEREF)
21614 jc bad_get_user
21615 GET_THREAD_INFO(%_ASM_DX)
21616 cmp TI_addr_limit(%_ASM_DX),%_ASM_AX
21617 jae bad_get_user
21618-3: mov -3(%_ASM_AX),%edx
21619+
21620+#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
21621+ mov $PAX_USER_SHADOW_BASE,%_ASM_DX
21622+ cmp %_ASM_DX,%_ASM_AX
21623+ jae 1234f
21624+ add %_ASM_DX,%_ASM_AX
21625+1234:
21626+#endif
21627+
21628+#endif
21629+
21630+3: __copyuser_seg mov -3(%_ASM_AX),%edx
21631 xor %eax,%eax
21632+ pax_force_retaddr
21633 ret
21634 CFI_ENDPROC
21635 ENDPROC(__get_user_4)
21636@@ -80,8 +131,18 @@ ENTRY(__get_user_8)
21637 GET_THREAD_INFO(%_ASM_DX)
21638 cmp TI_addr_limit(%_ASM_DX),%_ASM_AX
21639 jae bad_get_user
21640+
21641+#ifdef CONFIG_PAX_MEMORY_UDEREF
21642+ mov $PAX_USER_SHADOW_BASE,%_ASM_DX
21643+ cmp %_ASM_DX,%_ASM_AX
21644+ jae 1234f
21645+ add %_ASM_DX,%_ASM_AX
21646+1234:
21647+#endif
21648+
21649 4: movq -7(%_ASM_AX),%_ASM_DX
21650 xor %eax,%eax
21651+ pax_force_retaddr
21652 ret
21653 CFI_ENDPROC
21654 ENDPROC(__get_user_8)
21655@@ -91,6 +152,7 @@ bad_get_user:
21656 CFI_STARTPROC
21657 xor %edx,%edx
21658 mov $(-EFAULT),%_ASM_AX
21659+ pax_force_retaddr
21660 ret
21661 CFI_ENDPROC
21662 END(bad_get_user)
21663diff --git a/arch/x86/lib/insn.c b/arch/x86/lib/insn.c
21664index 374562e..a75830b 100644
21665--- a/arch/x86/lib/insn.c
21666+++ b/arch/x86/lib/insn.c
21667@@ -21,6 +21,11 @@
21668 #include <linux/string.h>
21669 #include <asm/inat.h>
21670 #include <asm/insn.h>
21671+#ifdef __KERNEL__
21672+#include <asm/pgtable_types.h>
21673+#else
21674+#define ktla_ktva(addr) addr
21675+#endif
21676
21677 /* Verify next sizeof(t) bytes can be on the same instruction */
21678 #define validate_next(t, insn, n) \
21679@@ -49,8 +54,8 @@
21680 void insn_init(struct insn *insn, const void *kaddr, int x86_64)
21681 {
21682 memset(insn, 0, sizeof(*insn));
21683- insn->kaddr = kaddr;
21684- insn->next_byte = kaddr;
21685+ insn->kaddr = ktla_ktva(kaddr);
21686+ insn->next_byte = ktla_ktva(kaddr);
21687 insn->x86_64 = x86_64 ? 1 : 0;
21688 insn->opnd_bytes = 4;
21689 if (x86_64)
21690diff --git a/arch/x86/lib/iomap_copy_64.S b/arch/x86/lib/iomap_copy_64.S
21691index 05a95e7..326f2fa 100644
21692--- a/arch/x86/lib/iomap_copy_64.S
21693+++ b/arch/x86/lib/iomap_copy_64.S
21694@@ -17,6 +17,7 @@
21695
21696 #include <linux/linkage.h>
21697 #include <asm/dwarf2.h>
21698+#include <asm/alternative-asm.h>
21699
21700 /*
21701 * override generic version in lib/iomap_copy.c
21702@@ -25,6 +26,7 @@ ENTRY(__iowrite32_copy)
21703 CFI_STARTPROC
21704 movl %edx,%ecx
21705 rep movsd
21706+ pax_force_retaddr
21707 ret
21708 CFI_ENDPROC
21709 ENDPROC(__iowrite32_copy)
21710diff --git a/arch/x86/lib/memcpy_64.S b/arch/x86/lib/memcpy_64.S
21711index efbf2a0..8893637 100644
21712--- a/arch/x86/lib/memcpy_64.S
21713+++ b/arch/x86/lib/memcpy_64.S
21714@@ -34,6 +34,7 @@
21715 rep movsq
21716 movl %edx, %ecx
21717 rep movsb
21718+ pax_force_retaddr
21719 ret
21720 .Lmemcpy_e:
21721 .previous
21722@@ -51,6 +52,7 @@
21723
21724 movl %edx, %ecx
21725 rep movsb
21726+ pax_force_retaddr
21727 ret
21728 .Lmemcpy_e_e:
21729 .previous
21730@@ -81,13 +83,13 @@ ENTRY(memcpy)
21731 */
21732 movq 0*8(%rsi), %r8
21733 movq 1*8(%rsi), %r9
21734- movq 2*8(%rsi), %r10
21735+ movq 2*8(%rsi), %rcx
21736 movq 3*8(%rsi), %r11
21737 leaq 4*8(%rsi), %rsi
21738
21739 movq %r8, 0*8(%rdi)
21740 movq %r9, 1*8(%rdi)
21741- movq %r10, 2*8(%rdi)
21742+ movq %rcx, 2*8(%rdi)
21743 movq %r11, 3*8(%rdi)
21744 leaq 4*8(%rdi), %rdi
21745 jae .Lcopy_forward_loop
21746@@ -110,12 +112,12 @@ ENTRY(memcpy)
21747 subq $0x20, %rdx
21748 movq -1*8(%rsi), %r8
21749 movq -2*8(%rsi), %r9
21750- movq -3*8(%rsi), %r10
21751+ movq -3*8(%rsi), %rcx
21752 movq -4*8(%rsi), %r11
21753 leaq -4*8(%rsi), %rsi
21754 movq %r8, -1*8(%rdi)
21755 movq %r9, -2*8(%rdi)
21756- movq %r10, -3*8(%rdi)
21757+ movq %rcx, -3*8(%rdi)
21758 movq %r11, -4*8(%rdi)
21759 leaq -4*8(%rdi), %rdi
21760 jae .Lcopy_backward_loop
21761@@ -135,12 +137,13 @@ ENTRY(memcpy)
21762 */
21763 movq 0*8(%rsi), %r8
21764 movq 1*8(%rsi), %r9
21765- movq -2*8(%rsi, %rdx), %r10
21766+ movq -2*8(%rsi, %rdx), %rcx
21767 movq -1*8(%rsi, %rdx), %r11
21768 movq %r8, 0*8(%rdi)
21769 movq %r9, 1*8(%rdi)
21770- movq %r10, -2*8(%rdi, %rdx)
21771+ movq %rcx, -2*8(%rdi, %rdx)
21772 movq %r11, -1*8(%rdi, %rdx)
21773+ pax_force_retaddr
21774 retq
21775 .p2align 4
21776 .Lless_16bytes:
21777@@ -153,6 +156,7 @@ ENTRY(memcpy)
21778 movq -1*8(%rsi, %rdx), %r9
21779 movq %r8, 0*8(%rdi)
21780 movq %r9, -1*8(%rdi, %rdx)
21781+ pax_force_retaddr
21782 retq
21783 .p2align 4
21784 .Lless_8bytes:
21785@@ -166,6 +170,7 @@ ENTRY(memcpy)
21786 movl -4(%rsi, %rdx), %r8d
21787 movl %ecx, (%rdi)
21788 movl %r8d, -4(%rdi, %rdx)
21789+ pax_force_retaddr
21790 retq
21791 .p2align 4
21792 .Lless_3bytes:
21793@@ -183,6 +188,7 @@ ENTRY(memcpy)
21794 jnz .Lloop_1
21795
21796 .Lend:
21797+ pax_force_retaddr
21798 retq
21799 CFI_ENDPROC
21800 ENDPROC(memcpy)
21801diff --git a/arch/x86/lib/memmove_64.S b/arch/x86/lib/memmove_64.S
21802index ee16461..c39c199 100644
21803--- a/arch/x86/lib/memmove_64.S
21804+++ b/arch/x86/lib/memmove_64.S
21805@@ -61,13 +61,13 @@ ENTRY(memmove)
21806 5:
21807 sub $0x20, %rdx
21808 movq 0*8(%rsi), %r11
21809- movq 1*8(%rsi), %r10
21810+ movq 1*8(%rsi), %rcx
21811 movq 2*8(%rsi), %r9
21812 movq 3*8(%rsi), %r8
21813 leaq 4*8(%rsi), %rsi
21814
21815 movq %r11, 0*8(%rdi)
21816- movq %r10, 1*8(%rdi)
21817+ movq %rcx, 1*8(%rdi)
21818 movq %r9, 2*8(%rdi)
21819 movq %r8, 3*8(%rdi)
21820 leaq 4*8(%rdi), %rdi
21821@@ -81,10 +81,10 @@ ENTRY(memmove)
21822 4:
21823 movq %rdx, %rcx
21824 movq -8(%rsi, %rdx), %r11
21825- lea -8(%rdi, %rdx), %r10
21826+ lea -8(%rdi, %rdx), %r9
21827 shrq $3, %rcx
21828 rep movsq
21829- movq %r11, (%r10)
21830+ movq %r11, (%r9)
21831 jmp 13f
21832 .Lmemmove_end_forward:
21833
21834@@ -95,14 +95,14 @@ ENTRY(memmove)
21835 7:
21836 movq %rdx, %rcx
21837 movq (%rsi), %r11
21838- movq %rdi, %r10
21839+ movq %rdi, %r9
21840 leaq -8(%rsi, %rdx), %rsi
21841 leaq -8(%rdi, %rdx), %rdi
21842 shrq $3, %rcx
21843 std
21844 rep movsq
21845 cld
21846- movq %r11, (%r10)
21847+ movq %r11, (%r9)
21848 jmp 13f
21849
21850 /*
21851@@ -127,13 +127,13 @@ ENTRY(memmove)
21852 8:
21853 subq $0x20, %rdx
21854 movq -1*8(%rsi), %r11
21855- movq -2*8(%rsi), %r10
21856+ movq -2*8(%rsi), %rcx
21857 movq -3*8(%rsi), %r9
21858 movq -4*8(%rsi), %r8
21859 leaq -4*8(%rsi), %rsi
21860
21861 movq %r11, -1*8(%rdi)
21862- movq %r10, -2*8(%rdi)
21863+ movq %rcx, -2*8(%rdi)
21864 movq %r9, -3*8(%rdi)
21865 movq %r8, -4*8(%rdi)
21866 leaq -4*8(%rdi), %rdi
21867@@ -151,11 +151,11 @@ ENTRY(memmove)
21868 * Move data from 16 bytes to 31 bytes.
21869 */
21870 movq 0*8(%rsi), %r11
21871- movq 1*8(%rsi), %r10
21872+ movq 1*8(%rsi), %rcx
21873 movq -2*8(%rsi, %rdx), %r9
21874 movq -1*8(%rsi, %rdx), %r8
21875 movq %r11, 0*8(%rdi)
21876- movq %r10, 1*8(%rdi)
21877+ movq %rcx, 1*8(%rdi)
21878 movq %r9, -2*8(%rdi, %rdx)
21879 movq %r8, -1*8(%rdi, %rdx)
21880 jmp 13f
21881@@ -167,9 +167,9 @@ ENTRY(memmove)
21882 * Move data from 8 bytes to 15 bytes.
21883 */
21884 movq 0*8(%rsi), %r11
21885- movq -1*8(%rsi, %rdx), %r10
21886+ movq -1*8(%rsi, %rdx), %r9
21887 movq %r11, 0*8(%rdi)
21888- movq %r10, -1*8(%rdi, %rdx)
21889+ movq %r9, -1*8(%rdi, %rdx)
21890 jmp 13f
21891 10:
21892 cmpq $4, %rdx
21893@@ -178,9 +178,9 @@ ENTRY(memmove)
21894 * Move data from 4 bytes to 7 bytes.
21895 */
21896 movl (%rsi), %r11d
21897- movl -4(%rsi, %rdx), %r10d
21898+ movl -4(%rsi, %rdx), %r9d
21899 movl %r11d, (%rdi)
21900- movl %r10d, -4(%rdi, %rdx)
21901+ movl %r9d, -4(%rdi, %rdx)
21902 jmp 13f
21903 11:
21904 cmp $2, %rdx
21905@@ -189,9 +189,9 @@ ENTRY(memmove)
21906 * Move data from 2 bytes to 3 bytes.
21907 */
21908 movw (%rsi), %r11w
21909- movw -2(%rsi, %rdx), %r10w
21910+ movw -2(%rsi, %rdx), %r9w
21911 movw %r11w, (%rdi)
21912- movw %r10w, -2(%rdi, %rdx)
21913+ movw %r9w, -2(%rdi, %rdx)
21914 jmp 13f
21915 12:
21916 cmp $1, %rdx
21917@@ -202,6 +202,7 @@ ENTRY(memmove)
21918 movb (%rsi), %r11b
21919 movb %r11b, (%rdi)
21920 13:
21921+ pax_force_retaddr
21922 retq
21923 CFI_ENDPROC
21924
21925@@ -210,6 +211,7 @@ ENTRY(memmove)
21926 /* Forward moving data. */
21927 movq %rdx, %rcx
21928 rep movsb
21929+ pax_force_retaddr
21930 retq
21931 .Lmemmove_end_forward_efs:
21932 .previous
21933diff --git a/arch/x86/lib/memset_64.S b/arch/x86/lib/memset_64.S
21934index 79bd454..dff325a 100644
21935--- a/arch/x86/lib/memset_64.S
21936+++ b/arch/x86/lib/memset_64.S
21937@@ -31,6 +31,7 @@
21938 movl %r8d,%ecx
21939 rep stosb
21940 movq %r9,%rax
21941+ pax_force_retaddr
21942 ret
21943 .Lmemset_e:
21944 .previous
21945@@ -53,6 +54,7 @@
21946 movl %edx,%ecx
21947 rep stosb
21948 movq %r9,%rax
21949+ pax_force_retaddr
21950 ret
21951 .Lmemset_e_e:
21952 .previous
21953@@ -60,13 +62,13 @@
21954 ENTRY(memset)
21955 ENTRY(__memset)
21956 CFI_STARTPROC
21957- movq %rdi,%r10
21958 movq %rdx,%r11
21959
21960 /* expand byte value */
21961 movzbl %sil,%ecx
21962 movabs $0x0101010101010101,%rax
21963 mul %rcx /* with rax, clobbers rdx */
21964+ movq %rdi,%rdx
21965
21966 /* align dst */
21967 movl %edi,%r9d
21968@@ -120,7 +122,8 @@ ENTRY(__memset)
21969 jnz .Lloop_1
21970
21971 .Lende:
21972- movq %r10,%rax
21973+ movq %rdx,%rax
21974+ pax_force_retaddr
21975 ret
21976
21977 CFI_RESTORE_STATE
21978diff --git a/arch/x86/lib/mmx_32.c b/arch/x86/lib/mmx_32.c
21979index c9f2d9b..e7fd2c0 100644
21980--- a/arch/x86/lib/mmx_32.c
21981+++ b/arch/x86/lib/mmx_32.c
21982@@ -29,6 +29,7 @@ void *_mmx_memcpy(void *to, const void *from, size_t len)
21983 {
21984 void *p;
21985 int i;
21986+ unsigned long cr0;
21987
21988 if (unlikely(in_interrupt()))
21989 return __memcpy(to, from, len);
21990@@ -39,44 +40,72 @@ void *_mmx_memcpy(void *to, const void *from, size_t len)
21991 kernel_fpu_begin();
21992
21993 __asm__ __volatile__ (
21994- "1: prefetch (%0)\n" /* This set is 28 bytes */
21995- " prefetch 64(%0)\n"
21996- " prefetch 128(%0)\n"
21997- " prefetch 192(%0)\n"
21998- " prefetch 256(%0)\n"
21999+ "1: prefetch (%1)\n" /* This set is 28 bytes */
22000+ " prefetch 64(%1)\n"
22001+ " prefetch 128(%1)\n"
22002+ " prefetch 192(%1)\n"
22003+ " prefetch 256(%1)\n"
22004 "2: \n"
22005 ".section .fixup, \"ax\"\n"
22006- "3: movw $0x1AEB, 1b\n" /* jmp on 26 bytes */
22007+ "3: \n"
22008+
22009+#ifdef CONFIG_PAX_KERNEXEC
22010+ " movl %%cr0, %0\n"
22011+ " movl %0, %%eax\n"
22012+ " andl $0xFFFEFFFF, %%eax\n"
22013+ " movl %%eax, %%cr0\n"
22014+#endif
22015+
22016+ " movw $0x1AEB, 1b\n" /* jmp on 26 bytes */
22017+
22018+#ifdef CONFIG_PAX_KERNEXEC
22019+ " movl %0, %%cr0\n"
22020+#endif
22021+
22022 " jmp 2b\n"
22023 ".previous\n"
22024 _ASM_EXTABLE(1b, 3b)
22025- : : "r" (from));
22026+ : "=&r" (cr0) : "r" (from) : "ax");
22027
22028 for ( ; i > 5; i--) {
22029 __asm__ __volatile__ (
22030- "1: prefetch 320(%0)\n"
22031- "2: movq (%0), %%mm0\n"
22032- " movq 8(%0), %%mm1\n"
22033- " movq 16(%0), %%mm2\n"
22034- " movq 24(%0), %%mm3\n"
22035- " movq %%mm0, (%1)\n"
22036- " movq %%mm1, 8(%1)\n"
22037- " movq %%mm2, 16(%1)\n"
22038- " movq %%mm3, 24(%1)\n"
22039- " movq 32(%0), %%mm0\n"
22040- " movq 40(%0), %%mm1\n"
22041- " movq 48(%0), %%mm2\n"
22042- " movq 56(%0), %%mm3\n"
22043- " movq %%mm0, 32(%1)\n"
22044- " movq %%mm1, 40(%1)\n"
22045- " movq %%mm2, 48(%1)\n"
22046- " movq %%mm3, 56(%1)\n"
22047+ "1: prefetch 320(%1)\n"
22048+ "2: movq (%1), %%mm0\n"
22049+ " movq 8(%1), %%mm1\n"
22050+ " movq 16(%1), %%mm2\n"
22051+ " movq 24(%1), %%mm3\n"
22052+ " movq %%mm0, (%2)\n"
22053+ " movq %%mm1, 8(%2)\n"
22054+ " movq %%mm2, 16(%2)\n"
22055+ " movq %%mm3, 24(%2)\n"
22056+ " movq 32(%1), %%mm0\n"
22057+ " movq 40(%1), %%mm1\n"
22058+ " movq 48(%1), %%mm2\n"
22059+ " movq 56(%1), %%mm3\n"
22060+ " movq %%mm0, 32(%2)\n"
22061+ " movq %%mm1, 40(%2)\n"
22062+ " movq %%mm2, 48(%2)\n"
22063+ " movq %%mm3, 56(%2)\n"
22064 ".section .fixup, \"ax\"\n"
22065- "3: movw $0x05EB, 1b\n" /* jmp on 5 bytes */
22066+ "3:\n"
22067+
22068+#ifdef CONFIG_PAX_KERNEXEC
22069+ " movl %%cr0, %0\n"
22070+ " movl %0, %%eax\n"
22071+ " andl $0xFFFEFFFF, %%eax\n"
22072+ " movl %%eax, %%cr0\n"
22073+#endif
22074+
22075+ " movw $0x05EB, 1b\n" /* jmp on 5 bytes */
22076+
22077+#ifdef CONFIG_PAX_KERNEXEC
22078+ " movl %0, %%cr0\n"
22079+#endif
22080+
22081 " jmp 2b\n"
22082 ".previous\n"
22083 _ASM_EXTABLE(1b, 3b)
22084- : : "r" (from), "r" (to) : "memory");
22085+ : "=&r" (cr0) : "r" (from), "r" (to) : "memory", "ax");
22086
22087 from += 64;
22088 to += 64;
22089@@ -158,6 +187,7 @@ static void fast_clear_page(void *page)
22090 static void fast_copy_page(void *to, void *from)
22091 {
22092 int i;
22093+ unsigned long cr0;
22094
22095 kernel_fpu_begin();
22096
22097@@ -166,42 +196,70 @@ static void fast_copy_page(void *to, void *from)
22098 * but that is for later. -AV
22099 */
22100 __asm__ __volatile__(
22101- "1: prefetch (%0)\n"
22102- " prefetch 64(%0)\n"
22103- " prefetch 128(%0)\n"
22104- " prefetch 192(%0)\n"
22105- " prefetch 256(%0)\n"
22106+ "1: prefetch (%1)\n"
22107+ " prefetch 64(%1)\n"
22108+ " prefetch 128(%1)\n"
22109+ " prefetch 192(%1)\n"
22110+ " prefetch 256(%1)\n"
22111 "2: \n"
22112 ".section .fixup, \"ax\"\n"
22113- "3: movw $0x1AEB, 1b\n" /* jmp on 26 bytes */
22114+ "3: \n"
22115+
22116+#ifdef CONFIG_PAX_KERNEXEC
22117+ " movl %%cr0, %0\n"
22118+ " movl %0, %%eax\n"
22119+ " andl $0xFFFEFFFF, %%eax\n"
22120+ " movl %%eax, %%cr0\n"
22121+#endif
22122+
22123+ " movw $0x1AEB, 1b\n" /* jmp on 26 bytes */
22124+
22125+#ifdef CONFIG_PAX_KERNEXEC
22126+ " movl %0, %%cr0\n"
22127+#endif
22128+
22129 " jmp 2b\n"
22130 ".previous\n"
22131- _ASM_EXTABLE(1b, 3b) : : "r" (from));
22132+ _ASM_EXTABLE(1b, 3b) : "=&r" (cr0) : "r" (from) : "ax");
22133
22134 for (i = 0; i < (4096-320)/64; i++) {
22135 __asm__ __volatile__ (
22136- "1: prefetch 320(%0)\n"
22137- "2: movq (%0), %%mm0\n"
22138- " movntq %%mm0, (%1)\n"
22139- " movq 8(%0), %%mm1\n"
22140- " movntq %%mm1, 8(%1)\n"
22141- " movq 16(%0), %%mm2\n"
22142- " movntq %%mm2, 16(%1)\n"
22143- " movq 24(%0), %%mm3\n"
22144- " movntq %%mm3, 24(%1)\n"
22145- " movq 32(%0), %%mm4\n"
22146- " movntq %%mm4, 32(%1)\n"
22147- " movq 40(%0), %%mm5\n"
22148- " movntq %%mm5, 40(%1)\n"
22149- " movq 48(%0), %%mm6\n"
22150- " movntq %%mm6, 48(%1)\n"
22151- " movq 56(%0), %%mm7\n"
22152- " movntq %%mm7, 56(%1)\n"
22153+ "1: prefetch 320(%1)\n"
22154+ "2: movq (%1), %%mm0\n"
22155+ " movntq %%mm0, (%2)\n"
22156+ " movq 8(%1), %%mm1\n"
22157+ " movntq %%mm1, 8(%2)\n"
22158+ " movq 16(%1), %%mm2\n"
22159+ " movntq %%mm2, 16(%2)\n"
22160+ " movq 24(%1), %%mm3\n"
22161+ " movntq %%mm3, 24(%2)\n"
22162+ " movq 32(%1), %%mm4\n"
22163+ " movntq %%mm4, 32(%2)\n"
22164+ " movq 40(%1), %%mm5\n"
22165+ " movntq %%mm5, 40(%2)\n"
22166+ " movq 48(%1), %%mm6\n"
22167+ " movntq %%mm6, 48(%2)\n"
22168+ " movq 56(%1), %%mm7\n"
22169+ " movntq %%mm7, 56(%2)\n"
22170 ".section .fixup, \"ax\"\n"
22171- "3: movw $0x05EB, 1b\n" /* jmp on 5 bytes */
22172+ "3:\n"
22173+
22174+#ifdef CONFIG_PAX_KERNEXEC
22175+ " movl %%cr0, %0\n"
22176+ " movl %0, %%eax\n"
22177+ " andl $0xFFFEFFFF, %%eax\n"
22178+ " movl %%eax, %%cr0\n"
22179+#endif
22180+
22181+ " movw $0x05EB, 1b\n" /* jmp on 5 bytes */
22182+
22183+#ifdef CONFIG_PAX_KERNEXEC
22184+ " movl %0, %%cr0\n"
22185+#endif
22186+
22187 " jmp 2b\n"
22188 ".previous\n"
22189- _ASM_EXTABLE(1b, 3b) : : "r" (from), "r" (to) : "memory");
22190+ _ASM_EXTABLE(1b, 3b) : "=&r" (cr0) : "r" (from), "r" (to) : "memory", "ax");
22191
22192 from += 64;
22193 to += 64;
22194@@ -280,47 +338,76 @@ static void fast_clear_page(void *page)
22195 static void fast_copy_page(void *to, void *from)
22196 {
22197 int i;
22198+ unsigned long cr0;
22199
22200 kernel_fpu_begin();
22201
22202 __asm__ __volatile__ (
22203- "1: prefetch (%0)\n"
22204- " prefetch 64(%0)\n"
22205- " prefetch 128(%0)\n"
22206- " prefetch 192(%0)\n"
22207- " prefetch 256(%0)\n"
22208+ "1: prefetch (%1)\n"
22209+ " prefetch 64(%1)\n"
22210+ " prefetch 128(%1)\n"
22211+ " prefetch 192(%1)\n"
22212+ " prefetch 256(%1)\n"
22213 "2: \n"
22214 ".section .fixup, \"ax\"\n"
22215- "3: movw $0x1AEB, 1b\n" /* jmp on 26 bytes */
22216+ "3: \n"
22217+
22218+#ifdef CONFIG_PAX_KERNEXEC
22219+ " movl %%cr0, %0\n"
22220+ " movl %0, %%eax\n"
22221+ " andl $0xFFFEFFFF, %%eax\n"
22222+ " movl %%eax, %%cr0\n"
22223+#endif
22224+
22225+ " movw $0x1AEB, 1b\n" /* jmp on 26 bytes */
22226+
22227+#ifdef CONFIG_PAX_KERNEXEC
22228+ " movl %0, %%cr0\n"
22229+#endif
22230+
22231 " jmp 2b\n"
22232 ".previous\n"
22233- _ASM_EXTABLE(1b, 3b) : : "r" (from));
22234+ _ASM_EXTABLE(1b, 3b) : "=&r" (cr0) : "r" (from) : "ax");
22235
22236 for (i = 0; i < 4096/64; i++) {
22237 __asm__ __volatile__ (
22238- "1: prefetch 320(%0)\n"
22239- "2: movq (%0), %%mm0\n"
22240- " movq 8(%0), %%mm1\n"
22241- " movq 16(%0), %%mm2\n"
22242- " movq 24(%0), %%mm3\n"
22243- " movq %%mm0, (%1)\n"
22244- " movq %%mm1, 8(%1)\n"
22245- " movq %%mm2, 16(%1)\n"
22246- " movq %%mm3, 24(%1)\n"
22247- " movq 32(%0), %%mm0\n"
22248- " movq 40(%0), %%mm1\n"
22249- " movq 48(%0), %%mm2\n"
22250- " movq 56(%0), %%mm3\n"
22251- " movq %%mm0, 32(%1)\n"
22252- " movq %%mm1, 40(%1)\n"
22253- " movq %%mm2, 48(%1)\n"
22254- " movq %%mm3, 56(%1)\n"
22255+ "1: prefetch 320(%1)\n"
22256+ "2: movq (%1), %%mm0\n"
22257+ " movq 8(%1), %%mm1\n"
22258+ " movq 16(%1), %%mm2\n"
22259+ " movq 24(%1), %%mm3\n"
22260+ " movq %%mm0, (%2)\n"
22261+ " movq %%mm1, 8(%2)\n"
22262+ " movq %%mm2, 16(%2)\n"
22263+ " movq %%mm3, 24(%2)\n"
22264+ " movq 32(%1), %%mm0\n"
22265+ " movq 40(%1), %%mm1\n"
22266+ " movq 48(%1), %%mm2\n"
22267+ " movq 56(%1), %%mm3\n"
22268+ " movq %%mm0, 32(%2)\n"
22269+ " movq %%mm1, 40(%2)\n"
22270+ " movq %%mm2, 48(%2)\n"
22271+ " movq %%mm3, 56(%2)\n"
22272 ".section .fixup, \"ax\"\n"
22273- "3: movw $0x05EB, 1b\n" /* jmp on 5 bytes */
22274+ "3:\n"
22275+
22276+#ifdef CONFIG_PAX_KERNEXEC
22277+ " movl %%cr0, %0\n"
22278+ " movl %0, %%eax\n"
22279+ " andl $0xFFFEFFFF, %%eax\n"
22280+ " movl %%eax, %%cr0\n"
22281+#endif
22282+
22283+ " movw $0x05EB, 1b\n" /* jmp on 5 bytes */
22284+
22285+#ifdef CONFIG_PAX_KERNEXEC
22286+ " movl %0, %%cr0\n"
22287+#endif
22288+
22289 " jmp 2b\n"
22290 ".previous\n"
22291 _ASM_EXTABLE(1b, 3b)
22292- : : "r" (from), "r" (to) : "memory");
22293+ : "=&r" (cr0) : "r" (from), "r" (to) : "memory", "ax");
22294
22295 from += 64;
22296 to += 64;
22297diff --git a/arch/x86/lib/msr-reg.S b/arch/x86/lib/msr-reg.S
22298index 69fa106..adda88b 100644
22299--- a/arch/x86/lib/msr-reg.S
22300+++ b/arch/x86/lib/msr-reg.S
22301@@ -3,6 +3,7 @@
22302 #include <asm/dwarf2.h>
22303 #include <asm/asm.h>
22304 #include <asm/msr.h>
22305+#include <asm/alternative-asm.h>
22306
22307 #ifdef CONFIG_X86_64
22308 /*
22309@@ -16,7 +17,7 @@ ENTRY(native_\op\()_safe_regs)
22310 CFI_STARTPROC
22311 pushq_cfi %rbx
22312 pushq_cfi %rbp
22313- movq %rdi, %r10 /* Save pointer */
22314+ movq %rdi, %r9 /* Save pointer */
22315 xorl %r11d, %r11d /* Return value */
22316 movl (%rdi), %eax
22317 movl 4(%rdi), %ecx
22318@@ -27,16 +28,17 @@ ENTRY(native_\op\()_safe_regs)
22319 movl 28(%rdi), %edi
22320 CFI_REMEMBER_STATE
22321 1: \op
22322-2: movl %eax, (%r10)
22323+2: movl %eax, (%r9)
22324 movl %r11d, %eax /* Return value */
22325- movl %ecx, 4(%r10)
22326- movl %edx, 8(%r10)
22327- movl %ebx, 12(%r10)
22328- movl %ebp, 20(%r10)
22329- movl %esi, 24(%r10)
22330- movl %edi, 28(%r10)
22331+ movl %ecx, 4(%r9)
22332+ movl %edx, 8(%r9)
22333+ movl %ebx, 12(%r9)
22334+ movl %ebp, 20(%r9)
22335+ movl %esi, 24(%r9)
22336+ movl %edi, 28(%r9)
22337 popq_cfi %rbp
22338 popq_cfi %rbx
22339+ pax_force_retaddr
22340 ret
22341 3:
22342 CFI_RESTORE_STATE
22343diff --git a/arch/x86/lib/putuser.S b/arch/x86/lib/putuser.S
22344index 36b0d15..d381858 100644
22345--- a/arch/x86/lib/putuser.S
22346+++ b/arch/x86/lib/putuser.S
22347@@ -15,7 +15,9 @@
22348 #include <asm/thread_info.h>
22349 #include <asm/errno.h>
22350 #include <asm/asm.h>
22351-
22352+#include <asm/segment.h>
22353+#include <asm/pgtable.h>
22354+#include <asm/alternative-asm.h>
22355
22356 /*
22357 * __put_user_X
22358@@ -29,52 +31,119 @@
22359 * as they get called from within inline assembly.
22360 */
22361
22362-#define ENTER CFI_STARTPROC ; \
22363- GET_THREAD_INFO(%_ASM_BX)
22364-#define EXIT ret ; \
22365+#define ENTER CFI_STARTPROC
22366+#define EXIT pax_force_retaddr; ret ; \
22367 CFI_ENDPROC
22368
22369+#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
22370+#define _DEST %_ASM_CX,%_ASM_BX
22371+#else
22372+#define _DEST %_ASM_CX
22373+#endif
22374+
22375+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_MEMORY_UDEREF)
22376+#define __copyuser_seg gs;
22377+#else
22378+#define __copyuser_seg
22379+#endif
22380+
22381 .text
22382 ENTRY(__put_user_1)
22383 ENTER
22384+
22385+#if !defined(CONFIG_X86_32) || !defined(CONFIG_PAX_MEMORY_UDEREF)
22386+ GET_THREAD_INFO(%_ASM_BX)
22387 cmp TI_addr_limit(%_ASM_BX),%_ASM_CX
22388 jae bad_put_user
22389-1: movb %al,(%_ASM_CX)
22390+
22391+#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
22392+ mov $PAX_USER_SHADOW_BASE,%_ASM_BX
22393+ cmp %_ASM_BX,%_ASM_CX
22394+ jb 1234f
22395+ xor %ebx,%ebx
22396+1234:
22397+#endif
22398+
22399+#endif
22400+
22401+1: __copyuser_seg movb %al,(_DEST)
22402 xor %eax,%eax
22403 EXIT
22404 ENDPROC(__put_user_1)
22405
22406 ENTRY(__put_user_2)
22407 ENTER
22408+
22409+#if !defined(CONFIG_X86_32) || !defined(CONFIG_PAX_MEMORY_UDEREF)
22410+ GET_THREAD_INFO(%_ASM_BX)
22411 mov TI_addr_limit(%_ASM_BX),%_ASM_BX
22412 sub $1,%_ASM_BX
22413 cmp %_ASM_BX,%_ASM_CX
22414 jae bad_put_user
22415-2: movw %ax,(%_ASM_CX)
22416+
22417+#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
22418+ mov $PAX_USER_SHADOW_BASE,%_ASM_BX
22419+ cmp %_ASM_BX,%_ASM_CX
22420+ jb 1234f
22421+ xor %ebx,%ebx
22422+1234:
22423+#endif
22424+
22425+#endif
22426+
22427+2: __copyuser_seg movw %ax,(_DEST)
22428 xor %eax,%eax
22429 EXIT
22430 ENDPROC(__put_user_2)
22431
22432 ENTRY(__put_user_4)
22433 ENTER
22434+
22435+#if !defined(CONFIG_X86_32) || !defined(CONFIG_PAX_MEMORY_UDEREF)
22436+ GET_THREAD_INFO(%_ASM_BX)
22437 mov TI_addr_limit(%_ASM_BX),%_ASM_BX
22438 sub $3,%_ASM_BX
22439 cmp %_ASM_BX,%_ASM_CX
22440 jae bad_put_user
22441-3: movl %eax,(%_ASM_CX)
22442+
22443+#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
22444+ mov $PAX_USER_SHADOW_BASE,%_ASM_BX
22445+ cmp %_ASM_BX,%_ASM_CX
22446+ jb 1234f
22447+ xor %ebx,%ebx
22448+1234:
22449+#endif
22450+
22451+#endif
22452+
22453+3: __copyuser_seg movl %eax,(_DEST)
22454 xor %eax,%eax
22455 EXIT
22456 ENDPROC(__put_user_4)
22457
22458 ENTRY(__put_user_8)
22459 ENTER
22460+
22461+#if !defined(CONFIG_X86_32) || !defined(CONFIG_PAX_MEMORY_UDEREF)
22462+ GET_THREAD_INFO(%_ASM_BX)
22463 mov TI_addr_limit(%_ASM_BX),%_ASM_BX
22464 sub $7,%_ASM_BX
22465 cmp %_ASM_BX,%_ASM_CX
22466 jae bad_put_user
22467-4: mov %_ASM_AX,(%_ASM_CX)
22468+
22469+#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
22470+ mov $PAX_USER_SHADOW_BASE,%_ASM_BX
22471+ cmp %_ASM_BX,%_ASM_CX
22472+ jb 1234f
22473+ xor %ebx,%ebx
22474+1234:
22475+#endif
22476+
22477+#endif
22478+
22479+4: __copyuser_seg mov %_ASM_AX,(_DEST)
22480 #ifdef CONFIG_X86_32
22481-5: movl %edx,4(%_ASM_CX)
22482+5: __copyuser_seg movl %edx,4(_DEST)
22483 #endif
22484 xor %eax,%eax
22485 EXIT
22486diff --git a/arch/x86/lib/rwlock.S b/arch/x86/lib/rwlock.S
22487index 1cad221..de671ee 100644
22488--- a/arch/x86/lib/rwlock.S
22489+++ b/arch/x86/lib/rwlock.S
22490@@ -16,13 +16,34 @@ ENTRY(__write_lock_failed)
22491 FRAME
22492 0: LOCK_PREFIX
22493 WRITE_LOCK_ADD($RW_LOCK_BIAS) (%__lock_ptr)
22494+
22495+#ifdef CONFIG_PAX_REFCOUNT
22496+ jno 1234f
22497+ LOCK_PREFIX
22498+ WRITE_LOCK_SUB($RW_LOCK_BIAS) (%__lock_ptr)
22499+ int $4
22500+1234:
22501+ _ASM_EXTABLE(1234b, 1234b)
22502+#endif
22503+
22504 1: rep; nop
22505 cmpl $WRITE_LOCK_CMP, (%__lock_ptr)
22506 jne 1b
22507 LOCK_PREFIX
22508 WRITE_LOCK_SUB($RW_LOCK_BIAS) (%__lock_ptr)
22509+
22510+#ifdef CONFIG_PAX_REFCOUNT
22511+ jno 1234f
22512+ LOCK_PREFIX
22513+ WRITE_LOCK_ADD($RW_LOCK_BIAS) (%__lock_ptr)
22514+ int $4
22515+1234:
22516+ _ASM_EXTABLE(1234b, 1234b)
22517+#endif
22518+
22519 jnz 0b
22520 ENDFRAME
22521+ pax_force_retaddr
22522 ret
22523 CFI_ENDPROC
22524 END(__write_lock_failed)
22525@@ -32,13 +53,34 @@ ENTRY(__read_lock_failed)
22526 FRAME
22527 0: LOCK_PREFIX
22528 READ_LOCK_SIZE(inc) (%__lock_ptr)
22529+
22530+#ifdef CONFIG_PAX_REFCOUNT
22531+ jno 1234f
22532+ LOCK_PREFIX
22533+ READ_LOCK_SIZE(dec) (%__lock_ptr)
22534+ int $4
22535+1234:
22536+ _ASM_EXTABLE(1234b, 1234b)
22537+#endif
22538+
22539 1: rep; nop
22540 READ_LOCK_SIZE(cmp) $1, (%__lock_ptr)
22541 js 1b
22542 LOCK_PREFIX
22543 READ_LOCK_SIZE(dec) (%__lock_ptr)
22544+
22545+#ifdef CONFIG_PAX_REFCOUNT
22546+ jno 1234f
22547+ LOCK_PREFIX
22548+ READ_LOCK_SIZE(inc) (%__lock_ptr)
22549+ int $4
22550+1234:
22551+ _ASM_EXTABLE(1234b, 1234b)
22552+#endif
22553+
22554 js 0b
22555 ENDFRAME
22556+ pax_force_retaddr
22557 ret
22558 CFI_ENDPROC
22559 END(__read_lock_failed)
22560diff --git a/arch/x86/lib/rwsem.S b/arch/x86/lib/rwsem.S
22561index 5dff5f0..cadebf4 100644
22562--- a/arch/x86/lib/rwsem.S
22563+++ b/arch/x86/lib/rwsem.S
22564@@ -94,6 +94,7 @@ ENTRY(call_rwsem_down_read_failed)
22565 __ASM_SIZE(pop,_cfi) %__ASM_REG(dx)
22566 CFI_RESTORE __ASM_REG(dx)
22567 restore_common_regs
22568+ pax_force_retaddr
22569 ret
22570 CFI_ENDPROC
22571 ENDPROC(call_rwsem_down_read_failed)
22572@@ -104,6 +105,7 @@ ENTRY(call_rwsem_down_write_failed)
22573 movq %rax,%rdi
22574 call rwsem_down_write_failed
22575 restore_common_regs
22576+ pax_force_retaddr
22577 ret
22578 CFI_ENDPROC
22579 ENDPROC(call_rwsem_down_write_failed)
22580@@ -117,7 +119,8 @@ ENTRY(call_rwsem_wake)
22581 movq %rax,%rdi
22582 call rwsem_wake
22583 restore_common_regs
22584-1: ret
22585+1: pax_force_retaddr
22586+ ret
22587 CFI_ENDPROC
22588 ENDPROC(call_rwsem_wake)
22589
22590@@ -131,6 +134,7 @@ ENTRY(call_rwsem_downgrade_wake)
22591 __ASM_SIZE(pop,_cfi) %__ASM_REG(dx)
22592 CFI_RESTORE __ASM_REG(dx)
22593 restore_common_regs
22594+ pax_force_retaddr
22595 ret
22596 CFI_ENDPROC
22597 ENDPROC(call_rwsem_downgrade_wake)
22598diff --git a/arch/x86/lib/thunk_64.S b/arch/x86/lib/thunk_64.S
22599index a63efd6..ccecad8 100644
22600--- a/arch/x86/lib/thunk_64.S
22601+++ b/arch/x86/lib/thunk_64.S
22602@@ -8,6 +8,7 @@
22603 #include <linux/linkage.h>
22604 #include <asm/dwarf2.h>
22605 #include <asm/calling.h>
22606+#include <asm/alternative-asm.h>
22607
22608 /* rdi: arg1 ... normal C conventions. rax is saved/restored. */
22609 .macro THUNK name, func, put_ret_addr_in_rdi=0
22610@@ -41,5 +42,6 @@
22611 SAVE_ARGS
22612 restore:
22613 RESTORE_ARGS
22614+ pax_force_retaddr
22615 ret
22616 CFI_ENDPROC
22617diff --git a/arch/x86/lib/usercopy_32.c b/arch/x86/lib/usercopy_32.c
22618index e218d5d..a99a1eb 100644
22619--- a/arch/x86/lib/usercopy_32.c
22620+++ b/arch/x86/lib/usercopy_32.c
22621@@ -43,7 +43,7 @@ do { \
22622 __asm__ __volatile__( \
22623 " testl %1,%1\n" \
22624 " jz 2f\n" \
22625- "0: lodsb\n" \
22626+ "0: "__copyuser_seg"lodsb\n" \
22627 " stosb\n" \
22628 " testb %%al,%%al\n" \
22629 " jz 1f\n" \
22630@@ -128,10 +128,12 @@ do { \
22631 int __d0; \
22632 might_fault(); \
22633 __asm__ __volatile__( \
22634+ __COPYUSER_SET_ES \
22635 "0: rep; stosl\n" \
22636 " movl %2,%0\n" \
22637 "1: rep; stosb\n" \
22638 "2:\n" \
22639+ __COPYUSER_RESTORE_ES \
22640 ".section .fixup,\"ax\"\n" \
22641 "3: lea 0(%2,%0,4),%0\n" \
22642 " jmp 2b\n" \
22643@@ -200,6 +202,7 @@ long strnlen_user(const char __user *s, long n)
22644 might_fault();
22645
22646 __asm__ __volatile__(
22647+ __COPYUSER_SET_ES
22648 " testl %0, %0\n"
22649 " jz 3f\n"
22650 " andl %0,%%ecx\n"
22651@@ -208,6 +211,7 @@ long strnlen_user(const char __user *s, long n)
22652 " subl %%ecx,%0\n"
22653 " addl %0,%%eax\n"
22654 "1:\n"
22655+ __COPYUSER_RESTORE_ES
22656 ".section .fixup,\"ax\"\n"
22657 "2: xorl %%eax,%%eax\n"
22658 " jmp 1b\n"
22659@@ -227,7 +231,7 @@ EXPORT_SYMBOL(strnlen_user);
22660
22661 #ifdef CONFIG_X86_INTEL_USERCOPY
22662 static unsigned long
22663-__copy_user_intel(void __user *to, const void *from, unsigned long size)
22664+__generic_copy_to_user_intel(void __user *to, const void *from, unsigned long size)
22665 {
22666 int d0, d1;
22667 __asm__ __volatile__(
22668@@ -239,36 +243,36 @@ __copy_user_intel(void __user *to, const void *from, unsigned long size)
22669 " .align 2,0x90\n"
22670 "3: movl 0(%4), %%eax\n"
22671 "4: movl 4(%4), %%edx\n"
22672- "5: movl %%eax, 0(%3)\n"
22673- "6: movl %%edx, 4(%3)\n"
22674+ "5: "__copyuser_seg" movl %%eax, 0(%3)\n"
22675+ "6: "__copyuser_seg" movl %%edx, 4(%3)\n"
22676 "7: movl 8(%4), %%eax\n"
22677 "8: movl 12(%4),%%edx\n"
22678- "9: movl %%eax, 8(%3)\n"
22679- "10: movl %%edx, 12(%3)\n"
22680+ "9: "__copyuser_seg" movl %%eax, 8(%3)\n"
22681+ "10: "__copyuser_seg" movl %%edx, 12(%3)\n"
22682 "11: movl 16(%4), %%eax\n"
22683 "12: movl 20(%4), %%edx\n"
22684- "13: movl %%eax, 16(%3)\n"
22685- "14: movl %%edx, 20(%3)\n"
22686+ "13: "__copyuser_seg" movl %%eax, 16(%3)\n"
22687+ "14: "__copyuser_seg" movl %%edx, 20(%3)\n"
22688 "15: movl 24(%4), %%eax\n"
22689 "16: movl 28(%4), %%edx\n"
22690- "17: movl %%eax, 24(%3)\n"
22691- "18: movl %%edx, 28(%3)\n"
22692+ "17: "__copyuser_seg" movl %%eax, 24(%3)\n"
22693+ "18: "__copyuser_seg" movl %%edx, 28(%3)\n"
22694 "19: movl 32(%4), %%eax\n"
22695 "20: movl 36(%4), %%edx\n"
22696- "21: movl %%eax, 32(%3)\n"
22697- "22: movl %%edx, 36(%3)\n"
22698+ "21: "__copyuser_seg" movl %%eax, 32(%3)\n"
22699+ "22: "__copyuser_seg" movl %%edx, 36(%3)\n"
22700 "23: movl 40(%4), %%eax\n"
22701 "24: movl 44(%4), %%edx\n"
22702- "25: movl %%eax, 40(%3)\n"
22703- "26: movl %%edx, 44(%3)\n"
22704+ "25: "__copyuser_seg" movl %%eax, 40(%3)\n"
22705+ "26: "__copyuser_seg" movl %%edx, 44(%3)\n"
22706 "27: movl 48(%4), %%eax\n"
22707 "28: movl 52(%4), %%edx\n"
22708- "29: movl %%eax, 48(%3)\n"
22709- "30: movl %%edx, 52(%3)\n"
22710+ "29: "__copyuser_seg" movl %%eax, 48(%3)\n"
22711+ "30: "__copyuser_seg" movl %%edx, 52(%3)\n"
22712 "31: movl 56(%4), %%eax\n"
22713 "32: movl 60(%4), %%edx\n"
22714- "33: movl %%eax, 56(%3)\n"
22715- "34: movl %%edx, 60(%3)\n"
22716+ "33: "__copyuser_seg" movl %%eax, 56(%3)\n"
22717+ "34: "__copyuser_seg" movl %%edx, 60(%3)\n"
22718 " addl $-64, %0\n"
22719 " addl $64, %4\n"
22720 " addl $64, %3\n"
22721@@ -278,10 +282,12 @@ __copy_user_intel(void __user *to, const void *from, unsigned long size)
22722 " shrl $2, %0\n"
22723 " andl $3, %%eax\n"
22724 " cld\n"
22725+ __COPYUSER_SET_ES
22726 "99: rep; movsl\n"
22727 "36: movl %%eax, %0\n"
22728 "37: rep; movsb\n"
22729 "100:\n"
22730+ __COPYUSER_RESTORE_ES
22731 ".section .fixup,\"ax\"\n"
22732 "101: lea 0(%%eax,%0,4),%0\n"
22733 " jmp 100b\n"
22734@@ -334,46 +340,155 @@ __copy_user_intel(void __user *to, const void *from, unsigned long size)
22735 }
22736
22737 static unsigned long
22738+__generic_copy_from_user_intel(void *to, const void __user *from, unsigned long size)
22739+{
22740+ int d0, d1;
22741+ __asm__ __volatile__(
22742+ " .align 2,0x90\n"
22743+ "1: "__copyuser_seg" movl 32(%4), %%eax\n"
22744+ " cmpl $67, %0\n"
22745+ " jbe 3f\n"
22746+ "2: "__copyuser_seg" movl 64(%4), %%eax\n"
22747+ " .align 2,0x90\n"
22748+ "3: "__copyuser_seg" movl 0(%4), %%eax\n"
22749+ "4: "__copyuser_seg" movl 4(%4), %%edx\n"
22750+ "5: movl %%eax, 0(%3)\n"
22751+ "6: movl %%edx, 4(%3)\n"
22752+ "7: "__copyuser_seg" movl 8(%4), %%eax\n"
22753+ "8: "__copyuser_seg" movl 12(%4),%%edx\n"
22754+ "9: movl %%eax, 8(%3)\n"
22755+ "10: movl %%edx, 12(%3)\n"
22756+ "11: "__copyuser_seg" movl 16(%4), %%eax\n"
22757+ "12: "__copyuser_seg" movl 20(%4), %%edx\n"
22758+ "13: movl %%eax, 16(%3)\n"
22759+ "14: movl %%edx, 20(%3)\n"
22760+ "15: "__copyuser_seg" movl 24(%4), %%eax\n"
22761+ "16: "__copyuser_seg" movl 28(%4), %%edx\n"
22762+ "17: movl %%eax, 24(%3)\n"
22763+ "18: movl %%edx, 28(%3)\n"
22764+ "19: "__copyuser_seg" movl 32(%4), %%eax\n"
22765+ "20: "__copyuser_seg" movl 36(%4), %%edx\n"
22766+ "21: movl %%eax, 32(%3)\n"
22767+ "22: movl %%edx, 36(%3)\n"
22768+ "23: "__copyuser_seg" movl 40(%4), %%eax\n"
22769+ "24: "__copyuser_seg" movl 44(%4), %%edx\n"
22770+ "25: movl %%eax, 40(%3)\n"
22771+ "26: movl %%edx, 44(%3)\n"
22772+ "27: "__copyuser_seg" movl 48(%4), %%eax\n"
22773+ "28: "__copyuser_seg" movl 52(%4), %%edx\n"
22774+ "29: movl %%eax, 48(%3)\n"
22775+ "30: movl %%edx, 52(%3)\n"
22776+ "31: "__copyuser_seg" movl 56(%4), %%eax\n"
22777+ "32: "__copyuser_seg" movl 60(%4), %%edx\n"
22778+ "33: movl %%eax, 56(%3)\n"
22779+ "34: movl %%edx, 60(%3)\n"
22780+ " addl $-64, %0\n"
22781+ " addl $64, %4\n"
22782+ " addl $64, %3\n"
22783+ " cmpl $63, %0\n"
22784+ " ja 1b\n"
22785+ "35: movl %0, %%eax\n"
22786+ " shrl $2, %0\n"
22787+ " andl $3, %%eax\n"
22788+ " cld\n"
22789+ "99: rep; "__copyuser_seg" movsl\n"
22790+ "36: movl %%eax, %0\n"
22791+ "37: rep; "__copyuser_seg" movsb\n"
22792+ "100:\n"
22793+ ".section .fixup,\"ax\"\n"
22794+ "101: lea 0(%%eax,%0,4),%0\n"
22795+ " jmp 100b\n"
22796+ ".previous\n"
22797+ ".section __ex_table,\"a\"\n"
22798+ " .align 4\n"
22799+ " .long 1b,100b\n"
22800+ " .long 2b,100b\n"
22801+ " .long 3b,100b\n"
22802+ " .long 4b,100b\n"
22803+ " .long 5b,100b\n"
22804+ " .long 6b,100b\n"
22805+ " .long 7b,100b\n"
22806+ " .long 8b,100b\n"
22807+ " .long 9b,100b\n"
22808+ " .long 10b,100b\n"
22809+ " .long 11b,100b\n"
22810+ " .long 12b,100b\n"
22811+ " .long 13b,100b\n"
22812+ " .long 14b,100b\n"
22813+ " .long 15b,100b\n"
22814+ " .long 16b,100b\n"
22815+ " .long 17b,100b\n"
22816+ " .long 18b,100b\n"
22817+ " .long 19b,100b\n"
22818+ " .long 20b,100b\n"
22819+ " .long 21b,100b\n"
22820+ " .long 22b,100b\n"
22821+ " .long 23b,100b\n"
22822+ " .long 24b,100b\n"
22823+ " .long 25b,100b\n"
22824+ " .long 26b,100b\n"
22825+ " .long 27b,100b\n"
22826+ " .long 28b,100b\n"
22827+ " .long 29b,100b\n"
22828+ " .long 30b,100b\n"
22829+ " .long 31b,100b\n"
22830+ " .long 32b,100b\n"
22831+ " .long 33b,100b\n"
22832+ " .long 34b,100b\n"
22833+ " .long 35b,100b\n"
22834+ " .long 36b,100b\n"
22835+ " .long 37b,100b\n"
22836+ " .long 99b,101b\n"
22837+ ".previous"
22838+ : "=&c"(size), "=&D" (d0), "=&S" (d1)
22839+ : "1"(to), "2"(from), "0"(size)
22840+ : "eax", "edx", "memory");
22841+ return size;
22842+}
22843+
22844+static unsigned long
22845+__copy_user_zeroing_intel(void *to, const void __user *from, unsigned long size) __size_overflow(3);
22846+static unsigned long
22847 __copy_user_zeroing_intel(void *to, const void __user *from, unsigned long size)
22848 {
22849 int d0, d1;
22850 __asm__ __volatile__(
22851 " .align 2,0x90\n"
22852- "0: movl 32(%4), %%eax\n"
22853+ "0: "__copyuser_seg" movl 32(%4), %%eax\n"
22854 " cmpl $67, %0\n"
22855 " jbe 2f\n"
22856- "1: movl 64(%4), %%eax\n"
22857+ "1: "__copyuser_seg" movl 64(%4), %%eax\n"
22858 " .align 2,0x90\n"
22859- "2: movl 0(%4), %%eax\n"
22860- "21: movl 4(%4), %%edx\n"
22861+ "2: "__copyuser_seg" movl 0(%4), %%eax\n"
22862+ "21: "__copyuser_seg" movl 4(%4), %%edx\n"
22863 " movl %%eax, 0(%3)\n"
22864 " movl %%edx, 4(%3)\n"
22865- "3: movl 8(%4), %%eax\n"
22866- "31: movl 12(%4),%%edx\n"
22867+ "3: "__copyuser_seg" movl 8(%4), %%eax\n"
22868+ "31: "__copyuser_seg" movl 12(%4),%%edx\n"
22869 " movl %%eax, 8(%3)\n"
22870 " movl %%edx, 12(%3)\n"
22871- "4: movl 16(%4), %%eax\n"
22872- "41: movl 20(%4), %%edx\n"
22873+ "4: "__copyuser_seg" movl 16(%4), %%eax\n"
22874+ "41: "__copyuser_seg" movl 20(%4), %%edx\n"
22875 " movl %%eax, 16(%3)\n"
22876 " movl %%edx, 20(%3)\n"
22877- "10: movl 24(%4), %%eax\n"
22878- "51: movl 28(%4), %%edx\n"
22879+ "10: "__copyuser_seg" movl 24(%4), %%eax\n"
22880+ "51: "__copyuser_seg" movl 28(%4), %%edx\n"
22881 " movl %%eax, 24(%3)\n"
22882 " movl %%edx, 28(%3)\n"
22883- "11: movl 32(%4), %%eax\n"
22884- "61: movl 36(%4), %%edx\n"
22885+ "11: "__copyuser_seg" movl 32(%4), %%eax\n"
22886+ "61: "__copyuser_seg" movl 36(%4), %%edx\n"
22887 " movl %%eax, 32(%3)\n"
22888 " movl %%edx, 36(%3)\n"
22889- "12: movl 40(%4), %%eax\n"
22890- "71: movl 44(%4), %%edx\n"
22891+ "12: "__copyuser_seg" movl 40(%4), %%eax\n"
22892+ "71: "__copyuser_seg" movl 44(%4), %%edx\n"
22893 " movl %%eax, 40(%3)\n"
22894 " movl %%edx, 44(%3)\n"
22895- "13: movl 48(%4), %%eax\n"
22896- "81: movl 52(%4), %%edx\n"
22897+ "13: "__copyuser_seg" movl 48(%4), %%eax\n"
22898+ "81: "__copyuser_seg" movl 52(%4), %%edx\n"
22899 " movl %%eax, 48(%3)\n"
22900 " movl %%edx, 52(%3)\n"
22901- "14: movl 56(%4), %%eax\n"
22902- "91: movl 60(%4), %%edx\n"
22903+ "14: "__copyuser_seg" movl 56(%4), %%eax\n"
22904+ "91: "__copyuser_seg" movl 60(%4), %%edx\n"
22905 " movl %%eax, 56(%3)\n"
22906 " movl %%edx, 60(%3)\n"
22907 " addl $-64, %0\n"
22908@@ -385,9 +500,9 @@ __copy_user_zeroing_intel(void *to, const void __user *from, unsigned long size)
22909 " shrl $2, %0\n"
22910 " andl $3, %%eax\n"
22911 " cld\n"
22912- "6: rep; movsl\n"
22913+ "6: rep; "__copyuser_seg" movsl\n"
22914 " movl %%eax,%0\n"
22915- "7: rep; movsb\n"
22916+ "7: rep; "__copyuser_seg" movsb\n"
22917 "8:\n"
22918 ".section .fixup,\"ax\"\n"
22919 "9: lea 0(%%eax,%0,4),%0\n"
22920@@ -434,47 +549,49 @@ __copy_user_zeroing_intel(void *to, const void __user *from, unsigned long size)
22921 */
22922
22923 static unsigned long __copy_user_zeroing_intel_nocache(void *to,
22924+ const void __user *from, unsigned long size) __size_overflow(3);
22925+static unsigned long __copy_user_zeroing_intel_nocache(void *to,
22926 const void __user *from, unsigned long size)
22927 {
22928 int d0, d1;
22929
22930 __asm__ __volatile__(
22931 " .align 2,0x90\n"
22932- "0: movl 32(%4), %%eax\n"
22933+ "0: "__copyuser_seg" movl 32(%4), %%eax\n"
22934 " cmpl $67, %0\n"
22935 " jbe 2f\n"
22936- "1: movl 64(%4), %%eax\n"
22937+ "1: "__copyuser_seg" movl 64(%4), %%eax\n"
22938 " .align 2,0x90\n"
22939- "2: movl 0(%4), %%eax\n"
22940- "21: movl 4(%4), %%edx\n"
22941+ "2: "__copyuser_seg" movl 0(%4), %%eax\n"
22942+ "21: "__copyuser_seg" movl 4(%4), %%edx\n"
22943 " movnti %%eax, 0(%3)\n"
22944 " movnti %%edx, 4(%3)\n"
22945- "3: movl 8(%4), %%eax\n"
22946- "31: movl 12(%4),%%edx\n"
22947+ "3: "__copyuser_seg" movl 8(%4), %%eax\n"
22948+ "31: "__copyuser_seg" movl 12(%4),%%edx\n"
22949 " movnti %%eax, 8(%3)\n"
22950 " movnti %%edx, 12(%3)\n"
22951- "4: movl 16(%4), %%eax\n"
22952- "41: movl 20(%4), %%edx\n"
22953+ "4: "__copyuser_seg" movl 16(%4), %%eax\n"
22954+ "41: "__copyuser_seg" movl 20(%4), %%edx\n"
22955 " movnti %%eax, 16(%3)\n"
22956 " movnti %%edx, 20(%3)\n"
22957- "10: movl 24(%4), %%eax\n"
22958- "51: movl 28(%4), %%edx\n"
22959+ "10: "__copyuser_seg" movl 24(%4), %%eax\n"
22960+ "51: "__copyuser_seg" movl 28(%4), %%edx\n"
22961 " movnti %%eax, 24(%3)\n"
22962 " movnti %%edx, 28(%3)\n"
22963- "11: movl 32(%4), %%eax\n"
22964- "61: movl 36(%4), %%edx\n"
22965+ "11: "__copyuser_seg" movl 32(%4), %%eax\n"
22966+ "61: "__copyuser_seg" movl 36(%4), %%edx\n"
22967 " movnti %%eax, 32(%3)\n"
22968 " movnti %%edx, 36(%3)\n"
22969- "12: movl 40(%4), %%eax\n"
22970- "71: movl 44(%4), %%edx\n"
22971+ "12: "__copyuser_seg" movl 40(%4), %%eax\n"
22972+ "71: "__copyuser_seg" movl 44(%4), %%edx\n"
22973 " movnti %%eax, 40(%3)\n"
22974 " movnti %%edx, 44(%3)\n"
22975- "13: movl 48(%4), %%eax\n"
22976- "81: movl 52(%4), %%edx\n"
22977+ "13: "__copyuser_seg" movl 48(%4), %%eax\n"
22978+ "81: "__copyuser_seg" movl 52(%4), %%edx\n"
22979 " movnti %%eax, 48(%3)\n"
22980 " movnti %%edx, 52(%3)\n"
22981- "14: movl 56(%4), %%eax\n"
22982- "91: movl 60(%4), %%edx\n"
22983+ "14: "__copyuser_seg" movl 56(%4), %%eax\n"
22984+ "91: "__copyuser_seg" movl 60(%4), %%edx\n"
22985 " movnti %%eax, 56(%3)\n"
22986 " movnti %%edx, 60(%3)\n"
22987 " addl $-64, %0\n"
22988@@ -487,9 +604,9 @@ static unsigned long __copy_user_zeroing_intel_nocache(void *to,
22989 " shrl $2, %0\n"
22990 " andl $3, %%eax\n"
22991 " cld\n"
22992- "6: rep; movsl\n"
22993+ "6: rep; "__copyuser_seg" movsl\n"
22994 " movl %%eax,%0\n"
22995- "7: rep; movsb\n"
22996+ "7: rep; "__copyuser_seg" movsb\n"
22997 "8:\n"
22998 ".section .fixup,\"ax\"\n"
22999 "9: lea 0(%%eax,%0,4),%0\n"
23000@@ -531,47 +648,49 @@ static unsigned long __copy_user_zeroing_intel_nocache(void *to,
23001 }
23002
23003 static unsigned long __copy_user_intel_nocache(void *to,
23004+ const void __user *from, unsigned long size) __size_overflow(3);
23005+static unsigned long __copy_user_intel_nocache(void *to,
23006 const void __user *from, unsigned long size)
23007 {
23008 int d0, d1;
23009
23010 __asm__ __volatile__(
23011 " .align 2,0x90\n"
23012- "0: movl 32(%4), %%eax\n"
23013+ "0: "__copyuser_seg" movl 32(%4), %%eax\n"
23014 " cmpl $67, %0\n"
23015 " jbe 2f\n"
23016- "1: movl 64(%4), %%eax\n"
23017+ "1: "__copyuser_seg" movl 64(%4), %%eax\n"
23018 " .align 2,0x90\n"
23019- "2: movl 0(%4), %%eax\n"
23020- "21: movl 4(%4), %%edx\n"
23021+ "2: "__copyuser_seg" movl 0(%4), %%eax\n"
23022+ "21: "__copyuser_seg" movl 4(%4), %%edx\n"
23023 " movnti %%eax, 0(%3)\n"
23024 " movnti %%edx, 4(%3)\n"
23025- "3: movl 8(%4), %%eax\n"
23026- "31: movl 12(%4),%%edx\n"
23027+ "3: "__copyuser_seg" movl 8(%4), %%eax\n"
23028+ "31: "__copyuser_seg" movl 12(%4),%%edx\n"
23029 " movnti %%eax, 8(%3)\n"
23030 " movnti %%edx, 12(%3)\n"
23031- "4: movl 16(%4), %%eax\n"
23032- "41: movl 20(%4), %%edx\n"
23033+ "4: "__copyuser_seg" movl 16(%4), %%eax\n"
23034+ "41: "__copyuser_seg" movl 20(%4), %%edx\n"
23035 " movnti %%eax, 16(%3)\n"
23036 " movnti %%edx, 20(%3)\n"
23037- "10: movl 24(%4), %%eax\n"
23038- "51: movl 28(%4), %%edx\n"
23039+ "10: "__copyuser_seg" movl 24(%4), %%eax\n"
23040+ "51: "__copyuser_seg" movl 28(%4), %%edx\n"
23041 " movnti %%eax, 24(%3)\n"
23042 " movnti %%edx, 28(%3)\n"
23043- "11: movl 32(%4), %%eax\n"
23044- "61: movl 36(%4), %%edx\n"
23045+ "11: "__copyuser_seg" movl 32(%4), %%eax\n"
23046+ "61: "__copyuser_seg" movl 36(%4), %%edx\n"
23047 " movnti %%eax, 32(%3)\n"
23048 " movnti %%edx, 36(%3)\n"
23049- "12: movl 40(%4), %%eax\n"
23050- "71: movl 44(%4), %%edx\n"
23051+ "12: "__copyuser_seg" movl 40(%4), %%eax\n"
23052+ "71: "__copyuser_seg" movl 44(%4), %%edx\n"
23053 " movnti %%eax, 40(%3)\n"
23054 " movnti %%edx, 44(%3)\n"
23055- "13: movl 48(%4), %%eax\n"
23056- "81: movl 52(%4), %%edx\n"
23057+ "13: "__copyuser_seg" movl 48(%4), %%eax\n"
23058+ "81: "__copyuser_seg" movl 52(%4), %%edx\n"
23059 " movnti %%eax, 48(%3)\n"
23060 " movnti %%edx, 52(%3)\n"
23061- "14: movl 56(%4), %%eax\n"
23062- "91: movl 60(%4), %%edx\n"
23063+ "14: "__copyuser_seg" movl 56(%4), %%eax\n"
23064+ "91: "__copyuser_seg" movl 60(%4), %%edx\n"
23065 " movnti %%eax, 56(%3)\n"
23066 " movnti %%edx, 60(%3)\n"
23067 " addl $-64, %0\n"
23068@@ -584,9 +703,9 @@ static unsigned long __copy_user_intel_nocache(void *to,
23069 " shrl $2, %0\n"
23070 " andl $3, %%eax\n"
23071 " cld\n"
23072- "6: rep; movsl\n"
23073+ "6: rep; "__copyuser_seg" movsl\n"
23074 " movl %%eax,%0\n"
23075- "7: rep; movsb\n"
23076+ "7: rep; "__copyuser_seg" movsb\n"
23077 "8:\n"
23078 ".section .fixup,\"ax\"\n"
23079 "9: lea 0(%%eax,%0,4),%0\n"
23080@@ -629,32 +748,36 @@ static unsigned long __copy_user_intel_nocache(void *to,
23081 */
23082 unsigned long __copy_user_zeroing_intel(void *to, const void __user *from,
23083 unsigned long size);
23084-unsigned long __copy_user_intel(void __user *to, const void *from,
23085+unsigned long __generic_copy_to_user_intel(void __user *to, const void *from,
23086+ unsigned long size);
23087+unsigned long __generic_copy_from_user_intel(void *to, const void __user *from,
23088 unsigned long size);
23089 unsigned long __copy_user_zeroing_intel_nocache(void *to,
23090 const void __user *from, unsigned long size);
23091 #endif /* CONFIG_X86_INTEL_USERCOPY */
23092
23093 /* Generic arbitrary sized copy. */
23094-#define __copy_user(to, from, size) \
23095+#define __copy_user(to, from, size, prefix, set, restore) \
23096 do { \
23097 int __d0, __d1, __d2; \
23098 __asm__ __volatile__( \
23099+ set \
23100 " cmp $7,%0\n" \
23101 " jbe 1f\n" \
23102 " movl %1,%0\n" \
23103 " negl %0\n" \
23104 " andl $7,%0\n" \
23105 " subl %0,%3\n" \
23106- "4: rep; movsb\n" \
23107+ "4: rep; "prefix"movsb\n" \
23108 " movl %3,%0\n" \
23109 " shrl $2,%0\n" \
23110 " andl $3,%3\n" \
23111 " .align 2,0x90\n" \
23112- "0: rep; movsl\n" \
23113+ "0: rep; "prefix"movsl\n" \
23114 " movl %3,%0\n" \
23115- "1: rep; movsb\n" \
23116+ "1: rep; "prefix"movsb\n" \
23117 "2:\n" \
23118+ restore \
23119 ".section .fixup,\"ax\"\n" \
23120 "5: addl %3,%0\n" \
23121 " jmp 2b\n" \
23122@@ -682,14 +805,14 @@ do { \
23123 " negl %0\n" \
23124 " andl $7,%0\n" \
23125 " subl %0,%3\n" \
23126- "4: rep; movsb\n" \
23127+ "4: rep; "__copyuser_seg"movsb\n" \
23128 " movl %3,%0\n" \
23129 " shrl $2,%0\n" \
23130 " andl $3,%3\n" \
23131 " .align 2,0x90\n" \
23132- "0: rep; movsl\n" \
23133+ "0: rep; "__copyuser_seg"movsl\n" \
23134 " movl %3,%0\n" \
23135- "1: rep; movsb\n" \
23136+ "1: rep; "__copyuser_seg"movsb\n" \
23137 "2:\n" \
23138 ".section .fixup,\"ax\"\n" \
23139 "5: addl %3,%0\n" \
23140@@ -775,9 +898,9 @@ survive:
23141 }
23142 #endif
23143 if (movsl_is_ok(to, from, n))
23144- __copy_user(to, from, n);
23145+ __copy_user(to, from, n, "", __COPYUSER_SET_ES, __COPYUSER_RESTORE_ES);
23146 else
23147- n = __copy_user_intel(to, from, n);
23148+ n = __generic_copy_to_user_intel(to, from, n);
23149 return n;
23150 }
23151 EXPORT_SYMBOL(__copy_to_user_ll);
23152@@ -797,10 +920,9 @@ unsigned long __copy_from_user_ll_nozero(void *to, const void __user *from,
23153 unsigned long n)
23154 {
23155 if (movsl_is_ok(to, from, n))
23156- __copy_user(to, from, n);
23157+ __copy_user(to, from, n, __copyuser_seg, "", "");
23158 else
23159- n = __copy_user_intel((void __user *)to,
23160- (const void *)from, n);
23161+ n = __generic_copy_from_user_intel(to, from, n);
23162 return n;
23163 }
23164 EXPORT_SYMBOL(__copy_from_user_ll_nozero);
23165@@ -827,65 +949,50 @@ unsigned long __copy_from_user_ll_nocache_nozero(void *to, const void __user *fr
23166 if (n > 64 && cpu_has_xmm2)
23167 n = __copy_user_intel_nocache(to, from, n);
23168 else
23169- __copy_user(to, from, n);
23170+ __copy_user(to, from, n, __copyuser_seg, "", "");
23171 #else
23172- __copy_user(to, from, n);
23173+ __copy_user(to, from, n, __copyuser_seg, "", "");
23174 #endif
23175 return n;
23176 }
23177 EXPORT_SYMBOL(__copy_from_user_ll_nocache_nozero);
23178
23179-/**
23180- * copy_to_user: - Copy a block of data into user space.
23181- * @to: Destination address, in user space.
23182- * @from: Source address, in kernel space.
23183- * @n: Number of bytes to copy.
23184- *
23185- * Context: User context only. This function may sleep.
23186- *
23187- * Copy data from kernel space to user space.
23188- *
23189- * Returns number of bytes that could not be copied.
23190- * On success, this will be zero.
23191- */
23192-unsigned long
23193-copy_to_user(void __user *to, const void *from, unsigned long n)
23194-{
23195- if (access_ok(VERIFY_WRITE, to, n))
23196- n = __copy_to_user(to, from, n);
23197- return n;
23198-}
23199-EXPORT_SYMBOL(copy_to_user);
23200-
23201-/**
23202- * copy_from_user: - Copy a block of data from user space.
23203- * @to: Destination address, in kernel space.
23204- * @from: Source address, in user space.
23205- * @n: Number of bytes to copy.
23206- *
23207- * Context: User context only. This function may sleep.
23208- *
23209- * Copy data from user space to kernel space.
23210- *
23211- * Returns number of bytes that could not be copied.
23212- * On success, this will be zero.
23213- *
23214- * If some data could not be copied, this function will pad the copied
23215- * data to the requested size using zero bytes.
23216- */
23217-unsigned long
23218-_copy_from_user(void *to, const void __user *from, unsigned long n)
23219-{
23220- if (access_ok(VERIFY_READ, from, n))
23221- n = __copy_from_user(to, from, n);
23222- else
23223- memset(to, 0, n);
23224- return n;
23225-}
23226-EXPORT_SYMBOL(_copy_from_user);
23227-
23228 void copy_from_user_overflow(void)
23229 {
23230 WARN(1, "Buffer overflow detected!\n");
23231 }
23232 EXPORT_SYMBOL(copy_from_user_overflow);
23233+
23234+void copy_to_user_overflow(void)
23235+{
23236+ WARN(1, "Buffer overflow detected!\n");
23237+}
23238+EXPORT_SYMBOL(copy_to_user_overflow);
23239+
23240+#ifdef CONFIG_PAX_MEMORY_UDEREF
23241+void __set_fs(mm_segment_t x)
23242+{
23243+ switch (x.seg) {
23244+ case 0:
23245+ loadsegment(gs, 0);
23246+ break;
23247+ case TASK_SIZE_MAX:
23248+ loadsegment(gs, __USER_DS);
23249+ break;
23250+ case -1UL:
23251+ loadsegment(gs, __KERNEL_DS);
23252+ break;
23253+ default:
23254+ BUG();
23255+ }
23256+ return;
23257+}
23258+EXPORT_SYMBOL(__set_fs);
23259+
23260+void set_fs(mm_segment_t x)
23261+{
23262+ current_thread_info()->addr_limit = x;
23263+ __set_fs(x);
23264+}
23265+EXPORT_SYMBOL(set_fs);
23266+#endif
23267diff --git a/arch/x86/lib/usercopy_64.c b/arch/x86/lib/usercopy_64.c
23268index b7c2849..8633ad8 100644
23269--- a/arch/x86/lib/usercopy_64.c
23270+++ b/arch/x86/lib/usercopy_64.c
23271@@ -42,6 +42,12 @@ long
23272 __strncpy_from_user(char *dst, const char __user *src, long count)
23273 {
23274 long res;
23275+
23276+#ifdef CONFIG_PAX_MEMORY_UDEREF
23277+ if ((unsigned long)src < PAX_USER_SHADOW_BASE)
23278+ src += PAX_USER_SHADOW_BASE;
23279+#endif
23280+
23281 __do_strncpy_from_user(dst, src, count, res);
23282 return res;
23283 }
23284@@ -65,6 +71,12 @@ unsigned long __clear_user(void __user *addr, unsigned long size)
23285 {
23286 long __d0;
23287 might_fault();
23288+
23289+#ifdef CONFIG_PAX_MEMORY_UDEREF
23290+ if ((unsigned long)addr < PAX_USER_SHADOW_BASE)
23291+ addr += PAX_USER_SHADOW_BASE;
23292+#endif
23293+
23294 /* no memory constraint because it doesn't change any memory gcc knows
23295 about */
23296 asm volatile(
23297@@ -149,12 +161,20 @@ long strlen_user(const char __user *s)
23298 }
23299 EXPORT_SYMBOL(strlen_user);
23300
23301-unsigned long copy_in_user(void __user *to, const void __user *from, unsigned len)
23302+unsigned long copy_in_user(void __user *to, const void __user *from, unsigned long len)
23303 {
23304- if (access_ok(VERIFY_WRITE, to, len) && access_ok(VERIFY_READ, from, len)) {
23305- return copy_user_generic((__force void *)to, (__force void *)from, len);
23306- }
23307- return len;
23308+ if (access_ok(VERIFY_WRITE, to, len) && access_ok(VERIFY_READ, from, len)) {
23309+
23310+#ifdef CONFIG_PAX_MEMORY_UDEREF
23311+ if ((unsigned long)to < PAX_USER_SHADOW_BASE)
23312+ to += PAX_USER_SHADOW_BASE;
23313+ if ((unsigned long)from < PAX_USER_SHADOW_BASE)
23314+ from += PAX_USER_SHADOW_BASE;
23315+#endif
23316+
23317+ return copy_user_generic((void __force_kernel *)to, (void __force_kernel *)from, len);
23318+ }
23319+ return len;
23320 }
23321 EXPORT_SYMBOL(copy_in_user);
23322
23323@@ -164,7 +184,7 @@ EXPORT_SYMBOL(copy_in_user);
23324 * it is not necessary to optimize tail handling.
23325 */
23326 unsigned long
23327-copy_user_handle_tail(char *to, char *from, unsigned len, unsigned zerorest)
23328+copy_user_handle_tail(char __user *to, char __user *from, unsigned long len, unsigned zerorest)
23329 {
23330 char c;
23331 unsigned zero_len;
23332diff --git a/arch/x86/mm/extable.c b/arch/x86/mm/extable.c
23333index d0474ad..36e9257 100644
23334--- a/arch/x86/mm/extable.c
23335+++ b/arch/x86/mm/extable.c
23336@@ -8,7 +8,7 @@ int fixup_exception(struct pt_regs *regs)
23337 const struct exception_table_entry *fixup;
23338
23339 #ifdef CONFIG_PNPBIOS
23340- if (unlikely(SEGMENT_IS_PNP_CODE(regs->cs))) {
23341+ if (unlikely(!v8086_mode(regs) && SEGMENT_IS_PNP_CODE(regs->cs))) {
23342 extern u32 pnp_bios_fault_eip, pnp_bios_fault_esp;
23343 extern u32 pnp_bios_is_utter_crap;
23344 pnp_bios_is_utter_crap = 1;
23345diff --git a/arch/x86/mm/fault.c b/arch/x86/mm/fault.c
23346index 5db0490..2ddce45 100644
23347--- a/arch/x86/mm/fault.c
23348+++ b/arch/x86/mm/fault.c
23349@@ -13,11 +13,18 @@
23350 #include <linux/perf_event.h> /* perf_sw_event */
23351 #include <linux/hugetlb.h> /* hstate_index_to_shift */
23352 #include <linux/prefetch.h> /* prefetchw */
23353+#include <linux/unistd.h>
23354+#include <linux/compiler.h>
23355
23356 #include <asm/traps.h> /* dotraplinkage, ... */
23357 #include <asm/pgalloc.h> /* pgd_*(), ... */
23358 #include <asm/kmemcheck.h> /* kmemcheck_*(), ... */
23359 #include <asm/fixmap.h> /* VSYSCALL_START */
23360+#include <asm/tlbflush.h>
23361+
23362+#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
23363+#include <asm/stacktrace.h>
23364+#endif
23365
23366 /*
23367 * Page fault error code bits:
23368@@ -55,7 +62,7 @@ static inline int __kprobes notify_page_fault(struct pt_regs *regs)
23369 int ret = 0;
23370
23371 /* kprobe_running() needs smp_processor_id() */
23372- if (kprobes_built_in() && !user_mode_vm(regs)) {
23373+ if (kprobes_built_in() && !user_mode(regs)) {
23374 preempt_disable();
23375 if (kprobe_running() && kprobe_fault_handler(regs, 14))
23376 ret = 1;
23377@@ -116,7 +123,10 @@ check_prefetch_opcode(struct pt_regs *regs, unsigned char *instr,
23378 return !instr_lo || (instr_lo>>1) == 1;
23379 case 0x00:
23380 /* Prefetch instruction is 0x0F0D or 0x0F18 */
23381- if (probe_kernel_address(instr, opcode))
23382+ if (user_mode(regs)) {
23383+ if (__copy_from_user_inatomic(&opcode, (unsigned char __force_user *)(instr), 1))
23384+ return 0;
23385+ } else if (probe_kernel_address(instr, opcode))
23386 return 0;
23387
23388 *prefetch = (instr_lo == 0xF) &&
23389@@ -150,7 +160,10 @@ is_prefetch(struct pt_regs *regs, unsigned long error_code, unsigned long addr)
23390 while (instr < max_instr) {
23391 unsigned char opcode;
23392
23393- if (probe_kernel_address(instr, opcode))
23394+ if (user_mode(regs)) {
23395+ if (__copy_from_user_inatomic(&opcode, (unsigned char __force_user *)(instr), 1))
23396+ break;
23397+ } else if (probe_kernel_address(instr, opcode))
23398 break;
23399
23400 instr++;
23401@@ -181,6 +194,34 @@ force_sig_info_fault(int si_signo, int si_code, unsigned long address,
23402 force_sig_info(si_signo, &info, tsk);
23403 }
23404
23405+#if defined(CONFIG_PAX_PAGEEXEC) || defined(CONFIG_PAX_SEGMEXEC)
23406+static bool pax_is_fetch_fault(struct pt_regs *regs, unsigned long error_code, unsigned long address);
23407+#endif
23408+
23409+#ifdef CONFIG_PAX_EMUTRAMP
23410+static int pax_handle_fetch_fault(struct pt_regs *regs);
23411+#endif
23412+
23413+#ifdef CONFIG_PAX_PAGEEXEC
23414+static inline pmd_t * pax_get_pmd(struct mm_struct *mm, unsigned long address)
23415+{
23416+ pgd_t *pgd;
23417+ pud_t *pud;
23418+ pmd_t *pmd;
23419+
23420+ pgd = pgd_offset(mm, address);
23421+ if (!pgd_present(*pgd))
23422+ return NULL;
23423+ pud = pud_offset(pgd, address);
23424+ if (!pud_present(*pud))
23425+ return NULL;
23426+ pmd = pmd_offset(pud, address);
23427+ if (!pmd_present(*pmd))
23428+ return NULL;
23429+ return pmd;
23430+}
23431+#endif
23432+
23433 DEFINE_SPINLOCK(pgd_lock);
23434 LIST_HEAD(pgd_list);
23435
23436@@ -231,10 +272,22 @@ void vmalloc_sync_all(void)
23437 for (address = VMALLOC_START & PMD_MASK;
23438 address >= TASK_SIZE && address < FIXADDR_TOP;
23439 address += PMD_SIZE) {
23440+
23441+#ifdef CONFIG_PAX_PER_CPU_PGD
23442+ unsigned long cpu;
23443+#else
23444 struct page *page;
23445+#endif
23446
23447 spin_lock(&pgd_lock);
23448+
23449+#ifdef CONFIG_PAX_PER_CPU_PGD
23450+ for (cpu = 0; cpu < nr_cpu_ids; ++cpu) {
23451+ pgd_t *pgd = get_cpu_pgd(cpu);
23452+ pmd_t *ret;
23453+#else
23454 list_for_each_entry(page, &pgd_list, lru) {
23455+ pgd_t *pgd = page_address(page);
23456 spinlock_t *pgt_lock;
23457 pmd_t *ret;
23458
23459@@ -242,8 +295,13 @@ void vmalloc_sync_all(void)
23460 pgt_lock = &pgd_page_get_mm(page)->page_table_lock;
23461
23462 spin_lock(pgt_lock);
23463- ret = vmalloc_sync_one(page_address(page), address);
23464+#endif
23465+
23466+ ret = vmalloc_sync_one(pgd, address);
23467+
23468+#ifndef CONFIG_PAX_PER_CPU_PGD
23469 spin_unlock(pgt_lock);
23470+#endif
23471
23472 if (!ret)
23473 break;
23474@@ -277,6 +335,11 @@ static noinline __kprobes int vmalloc_fault(unsigned long address)
23475 * an interrupt in the middle of a task switch..
23476 */
23477 pgd_paddr = read_cr3();
23478+
23479+#ifdef CONFIG_PAX_PER_CPU_PGD
23480+ BUG_ON(__pa(get_cpu_pgd(smp_processor_id())) != (pgd_paddr & PHYSICAL_PAGE_MASK));
23481+#endif
23482+
23483 pmd_k = vmalloc_sync_one(__va(pgd_paddr), address);
23484 if (!pmd_k)
23485 return -1;
23486@@ -372,7 +435,14 @@ static noinline __kprobes int vmalloc_fault(unsigned long address)
23487 * happen within a race in page table update. In the later
23488 * case just flush:
23489 */
23490+
23491+#ifdef CONFIG_PAX_PER_CPU_PGD
23492+ BUG_ON(__pa(get_cpu_pgd(smp_processor_id())) != (read_cr3() & PHYSICAL_PAGE_MASK));
23493+ pgd = pgd_offset_cpu(smp_processor_id(), address);
23494+#else
23495 pgd = pgd_offset(current->active_mm, address);
23496+#endif
23497+
23498 pgd_ref = pgd_offset_k(address);
23499 if (pgd_none(*pgd_ref))
23500 return -1;
23501@@ -540,7 +610,7 @@ static int is_errata93(struct pt_regs *regs, unsigned long address)
23502 static int is_errata100(struct pt_regs *regs, unsigned long address)
23503 {
23504 #ifdef CONFIG_X86_64
23505- if ((regs->cs == __USER32_CS || (regs->cs & (1<<2))) && (address >> 32))
23506+ if ((regs->cs == __USER32_CS || (regs->cs & SEGMENT_LDT)) && (address >> 32))
23507 return 1;
23508 #endif
23509 return 0;
23510@@ -567,7 +637,7 @@ static int is_f00f_bug(struct pt_regs *regs, unsigned long address)
23511 }
23512
23513 static const char nx_warning[] = KERN_CRIT
23514-"kernel tried to execute NX-protected page - exploit attempt? (uid: %d)\n";
23515+"kernel tried to execute NX-protected page - exploit attempt? (uid: %d, task: %s, pid: %d)\n";
23516
23517 static void
23518 show_fault_oops(struct pt_regs *regs, unsigned long error_code,
23519@@ -576,15 +646,26 @@ show_fault_oops(struct pt_regs *regs, unsigned long error_code,
23520 if (!oops_may_print())
23521 return;
23522
23523- if (error_code & PF_INSTR) {
23524+ if ((__supported_pte_mask & _PAGE_NX) && (error_code & PF_INSTR)) {
23525 unsigned int level;
23526
23527 pte_t *pte = lookup_address(address, &level);
23528
23529 if (pte && pte_present(*pte) && !pte_exec(*pte))
23530- printk(nx_warning, current_uid());
23531+ printk(nx_warning, current_uid(), current->comm, task_pid_nr(current));
23532 }
23533
23534+#ifdef CONFIG_PAX_KERNEXEC
23535+ if (init_mm.start_code <= address && address < init_mm.end_code) {
23536+ if (current->signal->curr_ip)
23537+ printk(KERN_ERR "PAX: From %pI4: %s:%d, uid/euid: %u/%u, attempted to modify kernel code\n",
23538+ &current->signal->curr_ip, current->comm, task_pid_nr(current), current_uid(), current_euid());
23539+ else
23540+ printk(KERN_ERR "PAX: %s:%d, uid/euid: %u/%u, attempted to modify kernel code\n",
23541+ current->comm, task_pid_nr(current), current_uid(), current_euid());
23542+ }
23543+#endif
23544+
23545 printk(KERN_ALERT "BUG: unable to handle kernel ");
23546 if (address < PAGE_SIZE)
23547 printk(KERN_CONT "NULL pointer dereference");
23548@@ -739,6 +820,21 @@ __bad_area_nosemaphore(struct pt_regs *regs, unsigned long error_code,
23549 }
23550 #endif
23551
23552+#if defined(CONFIG_PAX_PAGEEXEC) || defined(CONFIG_PAX_SEGMEXEC)
23553+ if (pax_is_fetch_fault(regs, error_code, address)) {
23554+
23555+#ifdef CONFIG_PAX_EMUTRAMP
23556+ switch (pax_handle_fetch_fault(regs)) {
23557+ case 2:
23558+ return;
23559+ }
23560+#endif
23561+
23562+ pax_report_fault(regs, (void *)regs->ip, (void *)regs->sp);
23563+ do_group_exit(SIGKILL);
23564+ }
23565+#endif
23566+
23567 if (unlikely(show_unhandled_signals))
23568 show_signal_msg(regs, error_code, address, tsk);
23569
23570@@ -835,7 +931,7 @@ do_sigbus(struct pt_regs *regs, unsigned long error_code, unsigned long address,
23571 if (fault & (VM_FAULT_HWPOISON|VM_FAULT_HWPOISON_LARGE)) {
23572 printk(KERN_ERR
23573 "MCE: Killing %s:%d due to hardware memory corruption fault at %lx\n",
23574- tsk->comm, tsk->pid, address);
23575+ tsk->comm, task_pid_nr(tsk), address);
23576 code = BUS_MCEERR_AR;
23577 }
23578 #endif
23579@@ -890,6 +986,99 @@ static int spurious_fault_check(unsigned long error_code, pte_t *pte)
23580 return 1;
23581 }
23582
23583+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_PAGEEXEC)
23584+static int pax_handle_pageexec_fault(struct pt_regs *regs, struct mm_struct *mm, unsigned long address, unsigned long error_code)
23585+{
23586+ pte_t *pte;
23587+ pmd_t *pmd;
23588+ spinlock_t *ptl;
23589+ unsigned char pte_mask;
23590+
23591+ if ((__supported_pte_mask & _PAGE_NX) || (error_code & (PF_PROT|PF_USER)) != (PF_PROT|PF_USER) || v8086_mode(regs) ||
23592+ !(mm->pax_flags & MF_PAX_PAGEEXEC))
23593+ return 0;
23594+
23595+ /* PaX: it's our fault, let's handle it if we can */
23596+
23597+ /* PaX: take a look at read faults before acquiring any locks */
23598+ if (unlikely(!(error_code & PF_WRITE) && (regs->ip == address))) {
23599+ /* instruction fetch attempt from a protected page in user mode */
23600+ up_read(&mm->mmap_sem);
23601+
23602+#ifdef CONFIG_PAX_EMUTRAMP
23603+ switch (pax_handle_fetch_fault(regs)) {
23604+ case 2:
23605+ return 1;
23606+ }
23607+#endif
23608+
23609+ pax_report_fault(regs, (void *)regs->ip, (void *)regs->sp);
23610+ do_group_exit(SIGKILL);
23611+ }
23612+
23613+ pmd = pax_get_pmd(mm, address);
23614+ if (unlikely(!pmd))
23615+ return 0;
23616+
23617+ pte = pte_offset_map_lock(mm, pmd, address, &ptl);
23618+ if (unlikely(!(pte_val(*pte) & _PAGE_PRESENT) || pte_user(*pte))) {
23619+ pte_unmap_unlock(pte, ptl);
23620+ return 0;
23621+ }
23622+
23623+ if (unlikely((error_code & PF_WRITE) && !pte_write(*pte))) {
23624+ /* write attempt to a protected page in user mode */
23625+ pte_unmap_unlock(pte, ptl);
23626+ return 0;
23627+ }
23628+
23629+#ifdef CONFIG_SMP
23630+ if (likely(address > get_limit(regs->cs) && cpu_isset(smp_processor_id(), mm->context.cpu_user_cs_mask)))
23631+#else
23632+ if (likely(address > get_limit(regs->cs)))
23633+#endif
23634+ {
23635+ set_pte(pte, pte_mkread(*pte));
23636+ __flush_tlb_one(address);
23637+ pte_unmap_unlock(pte, ptl);
23638+ up_read(&mm->mmap_sem);
23639+ return 1;
23640+ }
23641+
23642+ pte_mask = _PAGE_ACCESSED | _PAGE_USER | ((error_code & PF_WRITE) << (_PAGE_BIT_DIRTY-1));
23643+
23644+ /*
23645+ * PaX: fill DTLB with user rights and retry
23646+ */
23647+ __asm__ __volatile__ (
23648+ "orb %2,(%1)\n"
23649+#if defined(CONFIG_M586) || defined(CONFIG_M586TSC)
23650+/*
23651+ * PaX: let this uncommented 'invlpg' remind us on the behaviour of Intel's
23652+ * (and AMD's) TLBs. namely, they do not cache PTEs that would raise *any*
23653+ * page fault when examined during a TLB load attempt. this is true not only
23654+ * for PTEs holding a non-present entry but also present entries that will
23655+ * raise a page fault (such as those set up by PaX, or the copy-on-write
23656+ * mechanism). in effect it means that we do *not* need to flush the TLBs
23657+ * for our target pages since their PTEs are simply not in the TLBs at all.
23658+
23659+ * the best thing in omitting it is that we gain around 15-20% speed in the
23660+ * fast path of the page fault handler and can get rid of tracing since we
23661+ * can no longer flush unintended entries.
23662+ */
23663+ "invlpg (%0)\n"
23664+#endif
23665+ __copyuser_seg"testb $0,(%0)\n"
23666+ "xorb %3,(%1)\n"
23667+ :
23668+ : "r" (address), "r" (pte), "q" (pte_mask), "i" (_PAGE_USER)
23669+ : "memory", "cc");
23670+ pte_unmap_unlock(pte, ptl);
23671+ up_read(&mm->mmap_sem);
23672+ return 1;
23673+}
23674+#endif
23675+
23676 /*
23677 * Handle a spurious fault caused by a stale TLB entry.
23678 *
23679@@ -962,6 +1151,9 @@ int show_unhandled_signals = 1;
23680 static inline int
23681 access_error(unsigned long error_code, struct vm_area_struct *vma)
23682 {
23683+ if ((__supported_pte_mask & _PAGE_NX) && (error_code & PF_INSTR) && !(vma->vm_flags & VM_EXEC))
23684+ return 1;
23685+
23686 if (error_code & PF_WRITE) {
23687 /* write, present and write, not present: */
23688 if (unlikely(!(vma->vm_flags & VM_WRITE)))
23689@@ -995,18 +1187,32 @@ do_page_fault(struct pt_regs *regs, unsigned long error_code)
23690 {
23691 struct vm_area_struct *vma;
23692 struct task_struct *tsk;
23693- unsigned long address;
23694 struct mm_struct *mm;
23695 int fault;
23696 int write = error_code & PF_WRITE;
23697 unsigned int flags = FAULT_FLAG_ALLOW_RETRY | FAULT_FLAG_KILLABLE |
23698 (write ? FAULT_FLAG_WRITE : 0);
23699
23700- tsk = current;
23701- mm = tsk->mm;
23702-
23703 /* Get the faulting address: */
23704- address = read_cr2();
23705+ unsigned long address = read_cr2();
23706+
23707+#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
23708+ if (!user_mode(regs) && address < 2 * PAX_USER_SHADOW_BASE) {
23709+ if (!search_exception_tables(regs->ip)) {
23710+ bad_area_nosemaphore(regs, error_code, address);
23711+ return;
23712+ }
23713+ if (address < PAX_USER_SHADOW_BASE) {
23714+ printk(KERN_ERR "PAX: please report this to pageexec@freemail.hu\n");
23715+ printk(KERN_ERR "PAX: faulting IP: %pS\n", (void *)regs->ip);
23716+ show_trace_log_lvl(NULL, NULL, (void *)regs->sp, regs->bp, KERN_ERR);
23717+ } else
23718+ address -= PAX_USER_SHADOW_BASE;
23719+ }
23720+#endif
23721+
23722+ tsk = current;
23723+ mm = tsk->mm;
23724
23725 /*
23726 * Detect and handle instructions that would cause a page fault for
23727@@ -1067,7 +1273,7 @@ do_page_fault(struct pt_regs *regs, unsigned long error_code)
23728 * User-mode registers count as a user access even for any
23729 * potential system fault or CPU buglet:
23730 */
23731- if (user_mode_vm(regs)) {
23732+ if (user_mode(regs)) {
23733 local_irq_enable();
23734 error_code |= PF_USER;
23735 } else {
23736@@ -1122,6 +1328,11 @@ retry:
23737 might_sleep();
23738 }
23739
23740+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_PAGEEXEC)
23741+ if (pax_handle_pageexec_fault(regs, mm, address, error_code))
23742+ return;
23743+#endif
23744+
23745 vma = find_vma(mm, address);
23746 if (unlikely(!vma)) {
23747 bad_area(regs, error_code, address);
23748@@ -1133,18 +1344,24 @@ retry:
23749 bad_area(regs, error_code, address);
23750 return;
23751 }
23752- if (error_code & PF_USER) {
23753- /*
23754- * Accessing the stack below %sp is always a bug.
23755- * The large cushion allows instructions like enter
23756- * and pusha to work. ("enter $65535, $31" pushes
23757- * 32 pointers and then decrements %sp by 65535.)
23758- */
23759- if (unlikely(address + 65536 + 32 * sizeof(unsigned long) < regs->sp)) {
23760- bad_area(regs, error_code, address);
23761- return;
23762- }
23763+ /*
23764+ * Accessing the stack below %sp is always a bug.
23765+ * The large cushion allows instructions like enter
23766+ * and pusha to work. ("enter $65535, $31" pushes
23767+ * 32 pointers and then decrements %sp by 65535.)
23768+ */
23769+ if (unlikely(address + 65536 + 32 * sizeof(unsigned long) < task_pt_regs(tsk)->sp)) {
23770+ bad_area(regs, error_code, address);
23771+ return;
23772 }
23773+
23774+#ifdef CONFIG_PAX_SEGMEXEC
23775+ if (unlikely((mm->pax_flags & MF_PAX_SEGMEXEC) && vma->vm_end - SEGMEXEC_TASK_SIZE - 1 < address - SEGMEXEC_TASK_SIZE - 1)) {
23776+ bad_area(regs, error_code, address);
23777+ return;
23778+ }
23779+#endif
23780+
23781 if (unlikely(expand_stack(vma, address))) {
23782 bad_area(regs, error_code, address);
23783 return;
23784@@ -1199,3 +1416,292 @@ good_area:
23785
23786 up_read(&mm->mmap_sem);
23787 }
23788+
23789+#if defined(CONFIG_PAX_PAGEEXEC) || defined(CONFIG_PAX_SEGMEXEC)
23790+static bool pax_is_fetch_fault(struct pt_regs *regs, unsigned long error_code, unsigned long address)
23791+{
23792+ struct mm_struct *mm = current->mm;
23793+ unsigned long ip = regs->ip;
23794+
23795+ if (v8086_mode(regs))
23796+ ip = ((regs->cs & 0xffff) << 4) + (ip & 0xffff);
23797+
23798+#ifdef CONFIG_PAX_PAGEEXEC
23799+ if (mm->pax_flags & MF_PAX_PAGEEXEC) {
23800+ if ((__supported_pte_mask & _PAGE_NX) && (error_code & PF_INSTR))
23801+ return true;
23802+ if (!(error_code & (PF_PROT | PF_WRITE)) && ip == address)
23803+ return true;
23804+ return false;
23805+ }
23806+#endif
23807+
23808+#ifdef CONFIG_PAX_SEGMEXEC
23809+ if (mm->pax_flags & MF_PAX_SEGMEXEC) {
23810+ if (!(error_code & (PF_PROT | PF_WRITE)) && (ip + SEGMEXEC_TASK_SIZE == address))
23811+ return true;
23812+ return false;
23813+ }
23814+#endif
23815+
23816+ return false;
23817+}
23818+#endif
23819+
23820+#ifdef CONFIG_PAX_EMUTRAMP
23821+static int pax_handle_fetch_fault_32(struct pt_regs *regs)
23822+{
23823+ int err;
23824+
23825+ do { /* PaX: libffi trampoline emulation */
23826+ unsigned char mov, jmp;
23827+ unsigned int addr1, addr2;
23828+
23829+#ifdef CONFIG_X86_64
23830+ if ((regs->ip + 9) >> 32)
23831+ break;
23832+#endif
23833+
23834+ err = get_user(mov, (unsigned char __user *)regs->ip);
23835+ err |= get_user(addr1, (unsigned int __user *)(regs->ip + 1));
23836+ err |= get_user(jmp, (unsigned char __user *)(regs->ip + 5));
23837+ err |= get_user(addr2, (unsigned int __user *)(regs->ip + 6));
23838+
23839+ if (err)
23840+ break;
23841+
23842+ if (mov == 0xB8 && jmp == 0xE9) {
23843+ regs->ax = addr1;
23844+ regs->ip = (unsigned int)(regs->ip + addr2 + 10);
23845+ return 2;
23846+ }
23847+ } while (0);
23848+
23849+ do { /* PaX: gcc trampoline emulation #1 */
23850+ unsigned char mov1, mov2;
23851+ unsigned short jmp;
23852+ unsigned int addr1, addr2;
23853+
23854+#ifdef CONFIG_X86_64
23855+ if ((regs->ip + 11) >> 32)
23856+ break;
23857+#endif
23858+
23859+ err = get_user(mov1, (unsigned char __user *)regs->ip);
23860+ err |= get_user(addr1, (unsigned int __user *)(regs->ip + 1));
23861+ err |= get_user(mov2, (unsigned char __user *)(regs->ip + 5));
23862+ err |= get_user(addr2, (unsigned int __user *)(regs->ip + 6));
23863+ err |= get_user(jmp, (unsigned short __user *)(regs->ip + 10));
23864+
23865+ if (err)
23866+ break;
23867+
23868+ if (mov1 == 0xB9 && mov2 == 0xB8 && jmp == 0xE0FF) {
23869+ regs->cx = addr1;
23870+ regs->ax = addr2;
23871+ regs->ip = addr2;
23872+ return 2;
23873+ }
23874+ } while (0);
23875+
23876+ do { /* PaX: gcc trampoline emulation #2 */
23877+ unsigned char mov, jmp;
23878+ unsigned int addr1, addr2;
23879+
23880+#ifdef CONFIG_X86_64
23881+ if ((regs->ip + 9) >> 32)
23882+ break;
23883+#endif
23884+
23885+ err = get_user(mov, (unsigned char __user *)regs->ip);
23886+ err |= get_user(addr1, (unsigned int __user *)(regs->ip + 1));
23887+ err |= get_user(jmp, (unsigned char __user *)(regs->ip + 5));
23888+ err |= get_user(addr2, (unsigned int __user *)(regs->ip + 6));
23889+
23890+ if (err)
23891+ break;
23892+
23893+ if (mov == 0xB9 && jmp == 0xE9) {
23894+ regs->cx = addr1;
23895+ regs->ip = (unsigned int)(regs->ip + addr2 + 10);
23896+ return 2;
23897+ }
23898+ } while (0);
23899+
23900+ return 1; /* PaX in action */
23901+}
23902+
23903+#ifdef CONFIG_X86_64
23904+static int pax_handle_fetch_fault_64(struct pt_regs *regs)
23905+{
23906+ int err;
23907+
23908+ do { /* PaX: libffi trampoline emulation */
23909+ unsigned short mov1, mov2, jmp1;
23910+ unsigned char stcclc, jmp2;
23911+ unsigned long addr1, addr2;
23912+
23913+ err = get_user(mov1, (unsigned short __user *)regs->ip);
23914+ err |= get_user(addr1, (unsigned long __user *)(regs->ip + 2));
23915+ err |= get_user(mov2, (unsigned short __user *)(regs->ip + 10));
23916+ err |= get_user(addr2, (unsigned long __user *)(regs->ip + 12));
23917+ err |= get_user(stcclc, (unsigned char __user *)(regs->ip + 20));
23918+ err |= get_user(jmp1, (unsigned short __user *)(regs->ip + 21));
23919+ err |= get_user(jmp2, (unsigned char __user *)(regs->ip + 23));
23920+
23921+ if (err)
23922+ break;
23923+
23924+ if (mov1 == 0xBB49 && mov2 == 0xBA49 && (stcclc == 0xF8 || stcclc == 0xF9) && jmp1 == 0xFF49 && jmp2 == 0xE3) {
23925+ regs->r11 = addr1;
23926+ regs->r10 = addr2;
23927+ if (stcclc == 0xF8)
23928+ regs->flags &= ~X86_EFLAGS_CF;
23929+ else
23930+ regs->flags |= X86_EFLAGS_CF;
23931+ regs->ip = addr1;
23932+ return 2;
23933+ }
23934+ } while (0);
23935+
23936+ do { /* PaX: gcc trampoline emulation #1 */
23937+ unsigned short mov1, mov2, jmp1;
23938+ unsigned char jmp2;
23939+ unsigned int addr1;
23940+ unsigned long addr2;
23941+
23942+ err = get_user(mov1, (unsigned short __user *)regs->ip);
23943+ err |= get_user(addr1, (unsigned int __user *)(regs->ip + 2));
23944+ err |= get_user(mov2, (unsigned short __user *)(regs->ip + 6));
23945+ err |= get_user(addr2, (unsigned long __user *)(regs->ip + 8));
23946+ err |= get_user(jmp1, (unsigned short __user *)(regs->ip + 16));
23947+ err |= get_user(jmp2, (unsigned char __user *)(regs->ip + 18));
23948+
23949+ if (err)
23950+ break;
23951+
23952+ if (mov1 == 0xBB41 && mov2 == 0xBA49 && jmp1 == 0xFF49 && jmp2 == 0xE3) {
23953+ regs->r11 = addr1;
23954+ regs->r10 = addr2;
23955+ regs->ip = addr1;
23956+ return 2;
23957+ }
23958+ } while (0);
23959+
23960+ do { /* PaX: gcc trampoline emulation #2 */
23961+ unsigned short mov1, mov2, jmp1;
23962+ unsigned char jmp2;
23963+ unsigned long addr1, addr2;
23964+
23965+ err = get_user(mov1, (unsigned short __user *)regs->ip);
23966+ err |= get_user(addr1, (unsigned long __user *)(regs->ip + 2));
23967+ err |= get_user(mov2, (unsigned short __user *)(regs->ip + 10));
23968+ err |= get_user(addr2, (unsigned long __user *)(regs->ip + 12));
23969+ err |= get_user(jmp1, (unsigned short __user *)(regs->ip + 20));
23970+ err |= get_user(jmp2, (unsigned char __user *)(regs->ip + 22));
23971+
23972+ if (err)
23973+ break;
23974+
23975+ if (mov1 == 0xBB49 && mov2 == 0xBA49 && jmp1 == 0xFF49 && jmp2 == 0xE3) {
23976+ regs->r11 = addr1;
23977+ regs->r10 = addr2;
23978+ regs->ip = addr1;
23979+ return 2;
23980+ }
23981+ } while (0);
23982+
23983+ return 1; /* PaX in action */
23984+}
23985+#endif
23986+
23987+/*
23988+ * PaX: decide what to do with offenders (regs->ip = fault address)
23989+ *
23990+ * returns 1 when task should be killed
23991+ * 2 when gcc trampoline was detected
23992+ */
23993+static int pax_handle_fetch_fault(struct pt_regs *regs)
23994+{
23995+ if (v8086_mode(regs))
23996+ return 1;
23997+
23998+ if (!(current->mm->pax_flags & MF_PAX_EMUTRAMP))
23999+ return 1;
24000+
24001+#ifdef CONFIG_X86_32
24002+ return pax_handle_fetch_fault_32(regs);
24003+#else
24004+ if (regs->cs == __USER32_CS || (regs->cs & SEGMENT_LDT))
24005+ return pax_handle_fetch_fault_32(regs);
24006+ else
24007+ return pax_handle_fetch_fault_64(regs);
24008+#endif
24009+}
24010+#endif
24011+
24012+#if defined(CONFIG_PAX_PAGEEXEC) || defined(CONFIG_PAX_SEGMEXEC)
24013+void pax_report_insns(struct pt_regs *regs, void *pc, void *sp)
24014+{
24015+ long i;
24016+
24017+ printk(KERN_ERR "PAX: bytes at PC: ");
24018+ for (i = 0; i < 20; i++) {
24019+ unsigned char c;
24020+ if (get_user(c, (unsigned char __force_user *)pc+i))
24021+ printk(KERN_CONT "?? ");
24022+ else
24023+ printk(KERN_CONT "%02x ", c);
24024+ }
24025+ printk("\n");
24026+
24027+ printk(KERN_ERR "PAX: bytes at SP-%lu: ", (unsigned long)sizeof(long));
24028+ for (i = -1; i < 80 / (long)sizeof(long); i++) {
24029+ unsigned long c;
24030+ if (get_user(c, (unsigned long __force_user *)sp+i)) {
24031+#ifdef CONFIG_X86_32
24032+ printk(KERN_CONT "???????? ");
24033+#else
24034+ if ((regs->cs == __USER32_CS || (regs->cs & SEGMENT_LDT)))
24035+ printk(KERN_CONT "???????? ???????? ");
24036+ else
24037+ printk(KERN_CONT "???????????????? ");
24038+#endif
24039+ } else {
24040+#ifdef CONFIG_X86_64
24041+ if ((regs->cs == __USER32_CS || (regs->cs & SEGMENT_LDT))) {
24042+ printk(KERN_CONT "%08x ", (unsigned int)c);
24043+ printk(KERN_CONT "%08x ", (unsigned int)(c >> 32));
24044+ } else
24045+#endif
24046+ printk(KERN_CONT "%0*lx ", 2 * (int)sizeof(long), c);
24047+ }
24048+ }
24049+ printk("\n");
24050+}
24051+#endif
24052+
24053+/**
24054+ * probe_kernel_write(): safely attempt to write to a location
24055+ * @dst: address to write to
24056+ * @src: pointer to the data that shall be written
24057+ * @size: size of the data chunk
24058+ *
24059+ * Safely write to address @dst from the buffer at @src. If a kernel fault
24060+ * happens, handle that and return -EFAULT.
24061+ */
24062+long notrace probe_kernel_write(void *dst, const void *src, size_t size)
24063+{
24064+ long ret;
24065+ mm_segment_t old_fs = get_fs();
24066+
24067+ set_fs(KERNEL_DS);
24068+ pagefault_disable();
24069+ pax_open_kernel();
24070+ ret = __copy_to_user_inatomic((void __force_user *)dst, src, size);
24071+ pax_close_kernel();
24072+ pagefault_enable();
24073+ set_fs(old_fs);
24074+
24075+ return ret ? -EFAULT : 0;
24076+}
24077diff --git a/arch/x86/mm/gup.c b/arch/x86/mm/gup.c
24078index dd74e46..7d26398 100644
24079--- a/arch/x86/mm/gup.c
24080+++ b/arch/x86/mm/gup.c
24081@@ -255,7 +255,7 @@ int __get_user_pages_fast(unsigned long start, int nr_pages, int write,
24082 addr = start;
24083 len = (unsigned long) nr_pages << PAGE_SHIFT;
24084 end = start + len;
24085- if (unlikely(!access_ok(write ? VERIFY_WRITE : VERIFY_READ,
24086+ if (unlikely(!__access_ok(write ? VERIFY_WRITE : VERIFY_READ,
24087 (void __user *)start, len)))
24088 return 0;
24089
24090diff --git a/arch/x86/mm/highmem_32.c b/arch/x86/mm/highmem_32.c
24091index f4f29b1..5cac4fb 100644
24092--- a/arch/x86/mm/highmem_32.c
24093+++ b/arch/x86/mm/highmem_32.c
24094@@ -44,7 +44,11 @@ void *kmap_atomic_prot(struct page *page, pgprot_t prot)
24095 idx = type + KM_TYPE_NR*smp_processor_id();
24096 vaddr = __fix_to_virt(FIX_KMAP_BEGIN + idx);
24097 BUG_ON(!pte_none(*(kmap_pte-idx)));
24098+
24099+ pax_open_kernel();
24100 set_pte(kmap_pte-idx, mk_pte(page, prot));
24101+ pax_close_kernel();
24102+
24103 arch_flush_lazy_mmu_mode();
24104
24105 return (void *)vaddr;
24106diff --git a/arch/x86/mm/hugetlbpage.c b/arch/x86/mm/hugetlbpage.c
24107index f581a18..29efd37 100644
24108--- a/arch/x86/mm/hugetlbpage.c
24109+++ b/arch/x86/mm/hugetlbpage.c
24110@@ -266,13 +266,20 @@ static unsigned long hugetlb_get_unmapped_area_bottomup(struct file *file,
24111 struct hstate *h = hstate_file(file);
24112 struct mm_struct *mm = current->mm;
24113 struct vm_area_struct *vma;
24114- unsigned long start_addr;
24115+ unsigned long start_addr, pax_task_size = TASK_SIZE;
24116+
24117+#ifdef CONFIG_PAX_SEGMEXEC
24118+ if (mm->pax_flags & MF_PAX_SEGMEXEC)
24119+ pax_task_size = SEGMEXEC_TASK_SIZE;
24120+#endif
24121+
24122+ pax_task_size -= PAGE_SIZE;
24123
24124 if (len > mm->cached_hole_size) {
24125- start_addr = mm->free_area_cache;
24126+ start_addr = mm->free_area_cache;
24127 } else {
24128- start_addr = TASK_UNMAPPED_BASE;
24129- mm->cached_hole_size = 0;
24130+ start_addr = mm->mmap_base;
24131+ mm->cached_hole_size = 0;
24132 }
24133
24134 full_search:
24135@@ -280,26 +287,27 @@ full_search:
24136
24137 for (vma = find_vma(mm, addr); ; vma = vma->vm_next) {
24138 /* At this point: (!vma || addr < vma->vm_end). */
24139- if (TASK_SIZE - len < addr) {
24140+ if (pax_task_size - len < addr) {
24141 /*
24142 * Start a new search - just in case we missed
24143 * some holes.
24144 */
24145- if (start_addr != TASK_UNMAPPED_BASE) {
24146- start_addr = TASK_UNMAPPED_BASE;
24147+ if (start_addr != mm->mmap_base) {
24148+ start_addr = mm->mmap_base;
24149 mm->cached_hole_size = 0;
24150 goto full_search;
24151 }
24152 return -ENOMEM;
24153 }
24154- if (!vma || addr + len <= vma->vm_start) {
24155- mm->free_area_cache = addr + len;
24156- return addr;
24157- }
24158+ if (check_heap_stack_gap(vma, addr, len))
24159+ break;
24160 if (addr + mm->cached_hole_size < vma->vm_start)
24161 mm->cached_hole_size = vma->vm_start - addr;
24162 addr = ALIGN(vma->vm_end, huge_page_size(h));
24163 }
24164+
24165+ mm->free_area_cache = addr + len;
24166+ return addr;
24167 }
24168
24169 static unsigned long hugetlb_get_unmapped_area_topdown(struct file *file,
24170@@ -308,10 +316,9 @@ static unsigned long hugetlb_get_unmapped_area_topdown(struct file *file,
24171 {
24172 struct hstate *h = hstate_file(file);
24173 struct mm_struct *mm = current->mm;
24174- struct vm_area_struct *vma, *prev_vma;
24175- unsigned long base = mm->mmap_base, addr = addr0;
24176+ struct vm_area_struct *vma;
24177+ unsigned long base = mm->mmap_base, addr;
24178 unsigned long largest_hole = mm->cached_hole_size;
24179- int first_time = 1;
24180
24181 /* don't allow allocations above current base */
24182 if (mm->free_area_cache > base)
24183@@ -321,64 +328,63 @@ static unsigned long hugetlb_get_unmapped_area_topdown(struct file *file,
24184 largest_hole = 0;
24185 mm->free_area_cache = base;
24186 }
24187-try_again:
24188+
24189 /* make sure it can fit in the remaining address space */
24190 if (mm->free_area_cache < len)
24191 goto fail;
24192
24193 /* either no address requested or can't fit in requested address hole */
24194- addr = (mm->free_area_cache - len) & huge_page_mask(h);
24195+ addr = (mm->free_area_cache - len);
24196 do {
24197+ addr &= huge_page_mask(h);
24198+ vma = find_vma(mm, addr);
24199 /*
24200 * Lookup failure means no vma is above this address,
24201 * i.e. return with success:
24202- */
24203- if (!(vma = find_vma_prev(mm, addr, &prev_vma)))
24204- return addr;
24205-
24206- /*
24207 * new region fits between prev_vma->vm_end and
24208 * vma->vm_start, use it:
24209 */
24210- if (addr + len <= vma->vm_start &&
24211- (!prev_vma || (addr >= prev_vma->vm_end))) {
24212+ if (check_heap_stack_gap(vma, addr, len)) {
24213 /* remember the address as a hint for next time */
24214- mm->cached_hole_size = largest_hole;
24215- return (mm->free_area_cache = addr);
24216- } else {
24217- /* pull free_area_cache down to the first hole */
24218- if (mm->free_area_cache == vma->vm_end) {
24219- mm->free_area_cache = vma->vm_start;
24220- mm->cached_hole_size = largest_hole;
24221- }
24222+ mm->cached_hole_size = largest_hole;
24223+ return (mm->free_area_cache = addr);
24224+ }
24225+ /* pull free_area_cache down to the first hole */
24226+ if (mm->free_area_cache == vma->vm_end) {
24227+ mm->free_area_cache = vma->vm_start;
24228+ mm->cached_hole_size = largest_hole;
24229 }
24230
24231 /* remember the largest hole we saw so far */
24232 if (addr + largest_hole < vma->vm_start)
24233- largest_hole = vma->vm_start - addr;
24234+ largest_hole = vma->vm_start - addr;
24235
24236 /* try just below the current vma->vm_start */
24237- addr = (vma->vm_start - len) & huge_page_mask(h);
24238- } while (len <= vma->vm_start);
24239+ addr = skip_heap_stack_gap(vma, len);
24240+ } while (!IS_ERR_VALUE(addr));
24241
24242 fail:
24243 /*
24244- * if hint left us with no space for the requested
24245- * mapping then try again:
24246- */
24247- if (first_time) {
24248- mm->free_area_cache = base;
24249- largest_hole = 0;
24250- first_time = 0;
24251- goto try_again;
24252- }
24253- /*
24254 * A failed mmap() very likely causes application failure,
24255 * so fall back to the bottom-up function here. This scenario
24256 * can happen with large stack limits and large mmap()
24257 * allocations.
24258 */
24259- mm->free_area_cache = TASK_UNMAPPED_BASE;
24260+
24261+#ifdef CONFIG_PAX_SEGMEXEC
24262+ if (mm->pax_flags & MF_PAX_SEGMEXEC)
24263+ mm->mmap_base = SEGMEXEC_TASK_UNMAPPED_BASE;
24264+ else
24265+#endif
24266+
24267+ mm->mmap_base = TASK_UNMAPPED_BASE;
24268+
24269+#ifdef CONFIG_PAX_RANDMMAP
24270+ if (mm->pax_flags & MF_PAX_RANDMMAP)
24271+ mm->mmap_base += mm->delta_mmap;
24272+#endif
24273+
24274+ mm->free_area_cache = mm->mmap_base;
24275 mm->cached_hole_size = ~0UL;
24276 addr = hugetlb_get_unmapped_area_bottomup(file, addr0,
24277 len, pgoff, flags);
24278@@ -386,6 +392,7 @@ fail:
24279 /*
24280 * Restore the topdown base:
24281 */
24282+ mm->mmap_base = base;
24283 mm->free_area_cache = base;
24284 mm->cached_hole_size = ~0UL;
24285
24286@@ -399,10 +406,19 @@ hugetlb_get_unmapped_area(struct file *file, unsigned long addr,
24287 struct hstate *h = hstate_file(file);
24288 struct mm_struct *mm = current->mm;
24289 struct vm_area_struct *vma;
24290+ unsigned long pax_task_size = TASK_SIZE;
24291
24292 if (len & ~huge_page_mask(h))
24293 return -EINVAL;
24294- if (len > TASK_SIZE)
24295+
24296+#ifdef CONFIG_PAX_SEGMEXEC
24297+ if (mm->pax_flags & MF_PAX_SEGMEXEC)
24298+ pax_task_size = SEGMEXEC_TASK_SIZE;
24299+#endif
24300+
24301+ pax_task_size -= PAGE_SIZE;
24302+
24303+ if (len > pax_task_size)
24304 return -ENOMEM;
24305
24306 if (flags & MAP_FIXED) {
24307@@ -414,8 +430,7 @@ hugetlb_get_unmapped_area(struct file *file, unsigned long addr,
24308 if (addr) {
24309 addr = ALIGN(addr, huge_page_size(h));
24310 vma = find_vma(mm, addr);
24311- if (TASK_SIZE - len >= addr &&
24312- (!vma || addr + len <= vma->vm_start))
24313+ if (pax_task_size - len >= addr && check_heap_stack_gap(vma, addr, len))
24314 return addr;
24315 }
24316 if (mm->get_unmapped_area == arch_get_unmapped_area)
24317diff --git a/arch/x86/mm/init.c b/arch/x86/mm/init.c
24318index 87488b9..399f416 100644
24319--- a/arch/x86/mm/init.c
24320+++ b/arch/x86/mm/init.c
24321@@ -15,6 +15,7 @@
24322 #include <asm/tlbflush.h>
24323 #include <asm/tlb.h>
24324 #include <asm/proto.h>
24325+#include <asm/desc.h>
24326
24327 unsigned long __initdata pgt_buf_start;
24328 unsigned long __meminitdata pgt_buf_end;
24329@@ -31,7 +32,7 @@ int direct_gbpages
24330 static void __init find_early_table_space(unsigned long end, int use_pse,
24331 int use_gbpages)
24332 {
24333- unsigned long puds, pmds, ptes, tables, start = 0, good_end = end;
24334+ unsigned long puds, pmds, ptes, tables, start = 0x100000, good_end = end;
24335 phys_addr_t base;
24336
24337 puds = (end + PUD_SIZE - 1) >> PUD_SHIFT;
24338@@ -312,8 +313,29 @@ unsigned long __init_refok init_memory_mapping(unsigned long start,
24339 */
24340 int devmem_is_allowed(unsigned long pagenr)
24341 {
24342+#ifdef CONFIG_GRKERNSEC_KMEM
24343+ /* allow BDA */
24344+ if (!pagenr)
24345+ return 1;
24346+ /* allow EBDA */
24347+ if ((0x9f000 >> PAGE_SHIFT) == pagenr)
24348+ return 1;
24349+#else
24350+ if (!pagenr)
24351+ return 1;
24352+#ifdef CONFIG_VM86
24353+ if (pagenr < (ISA_START_ADDRESS >> PAGE_SHIFT))
24354+ return 1;
24355+#endif
24356+#endif
24357+
24358+ if ((ISA_START_ADDRESS >> PAGE_SHIFT) <= pagenr && pagenr < (ISA_END_ADDRESS >> PAGE_SHIFT))
24359+ return 1;
24360+#ifdef CONFIG_GRKERNSEC_KMEM
24361+ /* throw out everything else below 1MB */
24362 if (pagenr <= 256)
24363- return 1;
24364+ return 0;
24365+#endif
24366 if (iomem_is_exclusive(pagenr << PAGE_SHIFT))
24367 return 0;
24368 if (!page_is_ram(pagenr))
24369@@ -372,6 +394,86 @@ void free_init_pages(char *what, unsigned long begin, unsigned long end)
24370
24371 void free_initmem(void)
24372 {
24373+
24374+#ifdef CONFIG_PAX_KERNEXEC
24375+#ifdef CONFIG_X86_32
24376+ /* PaX: limit KERNEL_CS to actual size */
24377+ unsigned long addr, limit;
24378+ struct desc_struct d;
24379+ int cpu;
24380+
24381+ limit = paravirt_enabled() ? ktva_ktla(0xffffffff) : (unsigned long)&_etext;
24382+ limit = (limit - 1UL) >> PAGE_SHIFT;
24383+
24384+ memset(__LOAD_PHYSICAL_ADDR + PAGE_OFFSET, POISON_FREE_INITMEM, PAGE_SIZE);
24385+ for (cpu = 0; cpu < nr_cpu_ids; cpu++) {
24386+ pack_descriptor(&d, get_desc_base(&get_cpu_gdt_table(cpu)[GDT_ENTRY_KERNEL_CS]), limit, 0x9B, 0xC);
24387+ write_gdt_entry(get_cpu_gdt_table(cpu), GDT_ENTRY_KERNEL_CS, &d, DESCTYPE_S);
24388+ }
24389+
24390+ /* PaX: make KERNEL_CS read-only */
24391+ addr = PFN_ALIGN(ktla_ktva((unsigned long)&_text));
24392+ if (!paravirt_enabled())
24393+ set_memory_ro(addr, (PFN_ALIGN(_sdata) - addr) >> PAGE_SHIFT);
24394+/*
24395+ for (addr = ktla_ktva((unsigned long)&_text); addr < (unsigned long)&_sdata; addr += PMD_SIZE) {
24396+ pgd = pgd_offset_k(addr);
24397+ pud = pud_offset(pgd, addr);
24398+ pmd = pmd_offset(pud, addr);
24399+ set_pmd(pmd, __pmd(pmd_val(*pmd) & ~_PAGE_RW));
24400+ }
24401+*/
24402+#ifdef CONFIG_X86_PAE
24403+ set_memory_nx(PFN_ALIGN(__init_begin), (PFN_ALIGN(__init_end) - PFN_ALIGN(__init_begin)) >> PAGE_SHIFT);
24404+/*
24405+ for (addr = (unsigned long)&__init_begin; addr < (unsigned long)&__init_end; addr += PMD_SIZE) {
24406+ pgd = pgd_offset_k(addr);
24407+ pud = pud_offset(pgd, addr);
24408+ pmd = pmd_offset(pud, addr);
24409+ set_pmd(pmd, __pmd(pmd_val(*pmd) | (_PAGE_NX & __supported_pte_mask)));
24410+ }
24411+*/
24412+#endif
24413+
24414+#ifdef CONFIG_MODULES
24415+ set_memory_4k((unsigned long)MODULES_EXEC_VADDR, (MODULES_EXEC_END - MODULES_EXEC_VADDR) >> PAGE_SHIFT);
24416+#endif
24417+
24418+#else
24419+ pgd_t *pgd;
24420+ pud_t *pud;
24421+ pmd_t *pmd;
24422+ unsigned long addr, end;
24423+
24424+ /* PaX: make kernel code/rodata read-only, rest non-executable */
24425+ for (addr = __START_KERNEL_map; addr < __START_KERNEL_map + KERNEL_IMAGE_SIZE; addr += PMD_SIZE) {
24426+ pgd = pgd_offset_k(addr);
24427+ pud = pud_offset(pgd, addr);
24428+ pmd = pmd_offset(pud, addr);
24429+ if (!pmd_present(*pmd))
24430+ continue;
24431+ if ((unsigned long)_text <= addr && addr < (unsigned long)_sdata)
24432+ set_pmd(pmd, __pmd(pmd_val(*pmd) & ~_PAGE_RW));
24433+ else
24434+ set_pmd(pmd, __pmd(pmd_val(*pmd) | (_PAGE_NX & __supported_pte_mask)));
24435+ }
24436+
24437+ addr = (unsigned long)__va(__pa(__START_KERNEL_map));
24438+ end = addr + KERNEL_IMAGE_SIZE;
24439+ for (; addr < end; addr += PMD_SIZE) {
24440+ pgd = pgd_offset_k(addr);
24441+ pud = pud_offset(pgd, addr);
24442+ pmd = pmd_offset(pud, addr);
24443+ if (!pmd_present(*pmd))
24444+ continue;
24445+ if ((unsigned long)__va(__pa(_text)) <= addr && addr < (unsigned long)__va(__pa(_sdata)))
24446+ set_pmd(pmd, __pmd(pmd_val(*pmd) & ~_PAGE_RW));
24447+ }
24448+#endif
24449+
24450+ flush_tlb_all();
24451+#endif
24452+
24453 free_init_pages("unused kernel memory",
24454 (unsigned long)(&__init_begin),
24455 (unsigned long)(&__init_end));
24456diff --git a/arch/x86/mm/init_32.c b/arch/x86/mm/init_32.c
24457index 29f7c6d..b46b35b 100644
24458--- a/arch/x86/mm/init_32.c
24459+++ b/arch/x86/mm/init_32.c
24460@@ -74,36 +74,6 @@ static __init void *alloc_low_page(void)
24461 }
24462
24463 /*
24464- * Creates a middle page table and puts a pointer to it in the
24465- * given global directory entry. This only returns the gd entry
24466- * in non-PAE compilation mode, since the middle layer is folded.
24467- */
24468-static pmd_t * __init one_md_table_init(pgd_t *pgd)
24469-{
24470- pud_t *pud;
24471- pmd_t *pmd_table;
24472-
24473-#ifdef CONFIG_X86_PAE
24474- if (!(pgd_val(*pgd) & _PAGE_PRESENT)) {
24475- if (after_bootmem)
24476- pmd_table = (pmd_t *)alloc_bootmem_pages(PAGE_SIZE);
24477- else
24478- pmd_table = (pmd_t *)alloc_low_page();
24479- paravirt_alloc_pmd(&init_mm, __pa(pmd_table) >> PAGE_SHIFT);
24480- set_pgd(pgd, __pgd(__pa(pmd_table) | _PAGE_PRESENT));
24481- pud = pud_offset(pgd, 0);
24482- BUG_ON(pmd_table != pmd_offset(pud, 0));
24483-
24484- return pmd_table;
24485- }
24486-#endif
24487- pud = pud_offset(pgd, 0);
24488- pmd_table = pmd_offset(pud, 0);
24489-
24490- return pmd_table;
24491-}
24492-
24493-/*
24494 * Create a page table and place a pointer to it in a middle page
24495 * directory entry:
24496 */
24497@@ -123,13 +93,28 @@ static pte_t * __init one_page_table_init(pmd_t *pmd)
24498 page_table = (pte_t *)alloc_low_page();
24499
24500 paravirt_alloc_pte(&init_mm, __pa(page_table) >> PAGE_SHIFT);
24501+#if defined(CONFIG_PAX_PAGEEXEC) || defined(CONFIG_PAX_SEGMEXEC)
24502+ set_pmd(pmd, __pmd(__pa(page_table) | _KERNPG_TABLE));
24503+#else
24504 set_pmd(pmd, __pmd(__pa(page_table) | _PAGE_TABLE));
24505+#endif
24506 BUG_ON(page_table != pte_offset_kernel(pmd, 0));
24507 }
24508
24509 return pte_offset_kernel(pmd, 0);
24510 }
24511
24512+static pmd_t * __init one_md_table_init(pgd_t *pgd)
24513+{
24514+ pud_t *pud;
24515+ pmd_t *pmd_table;
24516+
24517+ pud = pud_offset(pgd, 0);
24518+ pmd_table = pmd_offset(pud, 0);
24519+
24520+ return pmd_table;
24521+}
24522+
24523 pmd_t * __init populate_extra_pmd(unsigned long vaddr)
24524 {
24525 int pgd_idx = pgd_index(vaddr);
24526@@ -203,6 +188,7 @@ page_table_range_init(unsigned long start, unsigned long end, pgd_t *pgd_base)
24527 int pgd_idx, pmd_idx;
24528 unsigned long vaddr;
24529 pgd_t *pgd;
24530+ pud_t *pud;
24531 pmd_t *pmd;
24532 pte_t *pte = NULL;
24533
24534@@ -212,8 +198,13 @@ page_table_range_init(unsigned long start, unsigned long end, pgd_t *pgd_base)
24535 pgd = pgd_base + pgd_idx;
24536
24537 for ( ; (pgd_idx < PTRS_PER_PGD) && (vaddr != end); pgd++, pgd_idx++) {
24538- pmd = one_md_table_init(pgd);
24539- pmd = pmd + pmd_index(vaddr);
24540+ pud = pud_offset(pgd, vaddr);
24541+ pmd = pmd_offset(pud, vaddr);
24542+
24543+#ifdef CONFIG_X86_PAE
24544+ paravirt_alloc_pmd(&init_mm, __pa(pmd) >> PAGE_SHIFT);
24545+#endif
24546+
24547 for (; (pmd_idx < PTRS_PER_PMD) && (vaddr != end);
24548 pmd++, pmd_idx++) {
24549 pte = page_table_kmap_check(one_page_table_init(pmd),
24550@@ -225,11 +216,20 @@ page_table_range_init(unsigned long start, unsigned long end, pgd_t *pgd_base)
24551 }
24552 }
24553
24554-static inline int is_kernel_text(unsigned long addr)
24555+static inline int is_kernel_text(unsigned long start, unsigned long end)
24556 {
24557- if (addr >= (unsigned long)_text && addr <= (unsigned long)__init_end)
24558- return 1;
24559- return 0;
24560+ if ((start > ktla_ktva((unsigned long)_etext) ||
24561+ end <= ktla_ktva((unsigned long)_stext)) &&
24562+ (start > ktla_ktva((unsigned long)_einittext) ||
24563+ end <= ktla_ktva((unsigned long)_sinittext)) &&
24564+
24565+#ifdef CONFIG_ACPI_SLEEP
24566+ (start > (unsigned long)__va(acpi_wakeup_address) + 0x4000 || end <= (unsigned long)__va(acpi_wakeup_address)) &&
24567+#endif
24568+
24569+ (start > (unsigned long)__va(0xfffff) || end <= (unsigned long)__va(0xc0000)))
24570+ return 0;
24571+ return 1;
24572 }
24573
24574 /*
24575@@ -246,9 +246,10 @@ kernel_physical_mapping_init(unsigned long start,
24576 unsigned long last_map_addr = end;
24577 unsigned long start_pfn, end_pfn;
24578 pgd_t *pgd_base = swapper_pg_dir;
24579- int pgd_idx, pmd_idx, pte_ofs;
24580+ unsigned int pgd_idx, pmd_idx, pte_ofs;
24581 unsigned long pfn;
24582 pgd_t *pgd;
24583+ pud_t *pud;
24584 pmd_t *pmd;
24585 pte_t *pte;
24586 unsigned pages_2m, pages_4k;
24587@@ -281,8 +282,13 @@ repeat:
24588 pfn = start_pfn;
24589 pgd_idx = pgd_index((pfn<<PAGE_SHIFT) + PAGE_OFFSET);
24590 pgd = pgd_base + pgd_idx;
24591- for (; pgd_idx < PTRS_PER_PGD; pgd++, pgd_idx++) {
24592- pmd = one_md_table_init(pgd);
24593+ for (; pgd_idx < PTRS_PER_PGD && pfn < max_low_pfn; pgd++, pgd_idx++) {
24594+ pud = pud_offset(pgd, 0);
24595+ pmd = pmd_offset(pud, 0);
24596+
24597+#ifdef CONFIG_X86_PAE
24598+ paravirt_alloc_pmd(&init_mm, __pa(pmd) >> PAGE_SHIFT);
24599+#endif
24600
24601 if (pfn >= end_pfn)
24602 continue;
24603@@ -294,14 +300,13 @@ repeat:
24604 #endif
24605 for (; pmd_idx < PTRS_PER_PMD && pfn < end_pfn;
24606 pmd++, pmd_idx++) {
24607- unsigned int addr = pfn * PAGE_SIZE + PAGE_OFFSET;
24608+ unsigned long address = pfn * PAGE_SIZE + PAGE_OFFSET;
24609
24610 /*
24611 * Map with big pages if possible, otherwise
24612 * create normal page tables:
24613 */
24614 if (use_pse) {
24615- unsigned int addr2;
24616 pgprot_t prot = PAGE_KERNEL_LARGE;
24617 /*
24618 * first pass will use the same initial
24619@@ -311,11 +316,7 @@ repeat:
24620 __pgprot(PTE_IDENT_ATTR |
24621 _PAGE_PSE);
24622
24623- addr2 = (pfn + PTRS_PER_PTE-1) * PAGE_SIZE +
24624- PAGE_OFFSET + PAGE_SIZE-1;
24625-
24626- if (is_kernel_text(addr) ||
24627- is_kernel_text(addr2))
24628+ if (is_kernel_text(address, address + PMD_SIZE))
24629 prot = PAGE_KERNEL_LARGE_EXEC;
24630
24631 pages_2m++;
24632@@ -332,7 +333,7 @@ repeat:
24633 pte_ofs = pte_index((pfn<<PAGE_SHIFT) + PAGE_OFFSET);
24634 pte += pte_ofs;
24635 for (; pte_ofs < PTRS_PER_PTE && pfn < end_pfn;
24636- pte++, pfn++, pte_ofs++, addr += PAGE_SIZE) {
24637+ pte++, pfn++, pte_ofs++, address += PAGE_SIZE) {
24638 pgprot_t prot = PAGE_KERNEL;
24639 /*
24640 * first pass will use the same initial
24641@@ -340,7 +341,7 @@ repeat:
24642 */
24643 pgprot_t init_prot = __pgprot(PTE_IDENT_ATTR);
24644
24645- if (is_kernel_text(addr))
24646+ if (is_kernel_text(address, address + PAGE_SIZE))
24647 prot = PAGE_KERNEL_EXEC;
24648
24649 pages_4k++;
24650@@ -472,7 +473,7 @@ void __init native_pagetable_setup_start(pgd_t *base)
24651
24652 pud = pud_offset(pgd, va);
24653 pmd = pmd_offset(pud, va);
24654- if (!pmd_present(*pmd))
24655+ if (!pmd_present(*pmd) || pmd_huge(*pmd))
24656 break;
24657
24658 pte = pte_offset_kernel(pmd, va);
24659@@ -524,12 +525,10 @@ void __init early_ioremap_page_table_range_init(void)
24660
24661 static void __init pagetable_init(void)
24662 {
24663- pgd_t *pgd_base = swapper_pg_dir;
24664-
24665- permanent_kmaps_init(pgd_base);
24666+ permanent_kmaps_init(swapper_pg_dir);
24667 }
24668
24669-pteval_t __supported_pte_mask __read_mostly = ~(_PAGE_NX | _PAGE_GLOBAL | _PAGE_IOMAP);
24670+pteval_t __supported_pte_mask __read_only = ~(_PAGE_NX | _PAGE_GLOBAL | _PAGE_IOMAP);
24671 EXPORT_SYMBOL_GPL(__supported_pte_mask);
24672
24673 /* user-defined highmem size */
24674@@ -757,6 +756,12 @@ void __init mem_init(void)
24675
24676 pci_iommu_alloc();
24677
24678+#ifdef CONFIG_PAX_PER_CPU_PGD
24679+ clone_pgd_range(get_cpu_pgd(0) + KERNEL_PGD_BOUNDARY,
24680+ swapper_pg_dir + KERNEL_PGD_BOUNDARY,
24681+ KERNEL_PGD_PTRS);
24682+#endif
24683+
24684 #ifdef CONFIG_FLATMEM
24685 BUG_ON(!mem_map);
24686 #endif
24687@@ -774,7 +779,7 @@ void __init mem_init(void)
24688 set_highmem_pages_init();
24689
24690 codesize = (unsigned long) &_etext - (unsigned long) &_text;
24691- datasize = (unsigned long) &_edata - (unsigned long) &_etext;
24692+ datasize = (unsigned long) &_edata - (unsigned long) &_sdata;
24693 initsize = (unsigned long) &__init_end - (unsigned long) &__init_begin;
24694
24695 printk(KERN_INFO "Memory: %luk/%luk available (%dk kernel code, "
24696@@ -815,10 +820,10 @@ void __init mem_init(void)
24697 ((unsigned long)&__init_end -
24698 (unsigned long)&__init_begin) >> 10,
24699
24700- (unsigned long)&_etext, (unsigned long)&_edata,
24701- ((unsigned long)&_edata - (unsigned long)&_etext) >> 10,
24702+ (unsigned long)&_sdata, (unsigned long)&_edata,
24703+ ((unsigned long)&_edata - (unsigned long)&_sdata) >> 10,
24704
24705- (unsigned long)&_text, (unsigned long)&_etext,
24706+ ktla_ktva((unsigned long)&_text), ktla_ktva((unsigned long)&_etext),
24707 ((unsigned long)&_etext - (unsigned long)&_text) >> 10);
24708
24709 /*
24710@@ -896,6 +901,7 @@ void set_kernel_text_rw(void)
24711 if (!kernel_set_to_readonly)
24712 return;
24713
24714+ start = ktla_ktva(start);
24715 pr_debug("Set kernel text: %lx - %lx for read write\n",
24716 start, start+size);
24717
24718@@ -910,6 +916,7 @@ void set_kernel_text_ro(void)
24719 if (!kernel_set_to_readonly)
24720 return;
24721
24722+ start = ktla_ktva(start);
24723 pr_debug("Set kernel text: %lx - %lx for read only\n",
24724 start, start+size);
24725
24726@@ -938,6 +945,7 @@ void mark_rodata_ro(void)
24727 unsigned long start = PFN_ALIGN(_text);
24728 unsigned long size = PFN_ALIGN(_etext) - start;
24729
24730+ start = ktla_ktva(start);
24731 set_pages_ro(virt_to_page(start), size >> PAGE_SHIFT);
24732 printk(KERN_INFO "Write protecting the kernel text: %luk\n",
24733 size >> 10);
24734diff --git a/arch/x86/mm/init_64.c b/arch/x86/mm/init_64.c
24735index bbaaa00..796fa65 100644
24736--- a/arch/x86/mm/init_64.c
24737+++ b/arch/x86/mm/init_64.c
24738@@ -75,7 +75,7 @@ early_param("gbpages", parse_direct_gbpages_on);
24739 * around without checking the pgd every time.
24740 */
24741
24742-pteval_t __supported_pte_mask __read_mostly = ~_PAGE_IOMAP;
24743+pteval_t __supported_pte_mask __read_only = ~(_PAGE_NX | _PAGE_IOMAP);
24744 EXPORT_SYMBOL_GPL(__supported_pte_mask);
24745
24746 int force_personality32;
24747@@ -108,12 +108,22 @@ void sync_global_pgds(unsigned long start, unsigned long end)
24748
24749 for (address = start; address <= end; address += PGDIR_SIZE) {
24750 const pgd_t *pgd_ref = pgd_offset_k(address);
24751+
24752+#ifdef CONFIG_PAX_PER_CPU_PGD
24753+ unsigned long cpu;
24754+#else
24755 struct page *page;
24756+#endif
24757
24758 if (pgd_none(*pgd_ref))
24759 continue;
24760
24761 spin_lock(&pgd_lock);
24762+
24763+#ifdef CONFIG_PAX_PER_CPU_PGD
24764+ for (cpu = 0; cpu < nr_cpu_ids; ++cpu) {
24765+ pgd_t *pgd = pgd_offset_cpu(cpu, address);
24766+#else
24767 list_for_each_entry(page, &pgd_list, lru) {
24768 pgd_t *pgd;
24769 spinlock_t *pgt_lock;
24770@@ -122,6 +132,7 @@ void sync_global_pgds(unsigned long start, unsigned long end)
24771 /* the pgt_lock only for Xen */
24772 pgt_lock = &pgd_page_get_mm(page)->page_table_lock;
24773 spin_lock(pgt_lock);
24774+#endif
24775
24776 if (pgd_none(*pgd))
24777 set_pgd(pgd, *pgd_ref);
24778@@ -129,7 +140,10 @@ void sync_global_pgds(unsigned long start, unsigned long end)
24779 BUG_ON(pgd_page_vaddr(*pgd)
24780 != pgd_page_vaddr(*pgd_ref));
24781
24782+#ifndef CONFIG_PAX_PER_CPU_PGD
24783 spin_unlock(pgt_lock);
24784+#endif
24785+
24786 }
24787 spin_unlock(&pgd_lock);
24788 }
24789@@ -203,7 +217,9 @@ void set_pte_vaddr_pud(pud_t *pud_page, unsigned long vaddr, pte_t new_pte)
24790 pmd = fill_pmd(pud, vaddr);
24791 pte = fill_pte(pmd, vaddr);
24792
24793+ pax_open_kernel();
24794 set_pte(pte, new_pte);
24795+ pax_close_kernel();
24796
24797 /*
24798 * It's enough to flush this one mapping.
24799@@ -262,14 +278,12 @@ static void __init __init_extra_mapping(unsigned long phys, unsigned long size,
24800 pgd = pgd_offset_k((unsigned long)__va(phys));
24801 if (pgd_none(*pgd)) {
24802 pud = (pud_t *) spp_getpage();
24803- set_pgd(pgd, __pgd(__pa(pud) | _KERNPG_TABLE |
24804- _PAGE_USER));
24805+ set_pgd(pgd, __pgd(__pa(pud) | _PAGE_TABLE));
24806 }
24807 pud = pud_offset(pgd, (unsigned long)__va(phys));
24808 if (pud_none(*pud)) {
24809 pmd = (pmd_t *) spp_getpage();
24810- set_pud(pud, __pud(__pa(pmd) | _KERNPG_TABLE |
24811- _PAGE_USER));
24812+ set_pud(pud, __pud(__pa(pmd) | _PAGE_TABLE));
24813 }
24814 pmd = pmd_offset(pud, phys);
24815 BUG_ON(!pmd_none(*pmd));
24816@@ -330,7 +344,7 @@ static __ref void *alloc_low_page(unsigned long *phys)
24817 if (pfn >= pgt_buf_top)
24818 panic("alloc_low_page: ran out of memory");
24819
24820- adr = early_memremap(pfn * PAGE_SIZE, PAGE_SIZE);
24821+ adr = (void __force_kernel *)early_memremap(pfn * PAGE_SIZE, PAGE_SIZE);
24822 clear_page(adr);
24823 *phys = pfn * PAGE_SIZE;
24824 return adr;
24825@@ -346,7 +360,7 @@ static __ref void *map_low_page(void *virt)
24826
24827 phys = __pa(virt);
24828 left = phys & (PAGE_SIZE - 1);
24829- adr = early_memremap(phys & PAGE_MASK, PAGE_SIZE);
24830+ adr = (void __force_kernel *)early_memremap(phys & PAGE_MASK, PAGE_SIZE);
24831 adr = (void *)(((unsigned long)adr) | left);
24832
24833 return adr;
24834@@ -693,6 +707,12 @@ void __init mem_init(void)
24835
24836 pci_iommu_alloc();
24837
24838+#ifdef CONFIG_PAX_PER_CPU_PGD
24839+ clone_pgd_range(get_cpu_pgd(0) + KERNEL_PGD_BOUNDARY,
24840+ swapper_pg_dir + KERNEL_PGD_BOUNDARY,
24841+ KERNEL_PGD_PTRS);
24842+#endif
24843+
24844 /* clear_bss() already clear the empty_zero_page */
24845
24846 reservedpages = 0;
24847@@ -853,8 +873,8 @@ int kern_addr_valid(unsigned long addr)
24848 static struct vm_area_struct gate_vma = {
24849 .vm_start = VSYSCALL_START,
24850 .vm_end = VSYSCALL_START + (VSYSCALL_MAPPED_PAGES * PAGE_SIZE),
24851- .vm_page_prot = PAGE_READONLY_EXEC,
24852- .vm_flags = VM_READ | VM_EXEC
24853+ .vm_page_prot = PAGE_READONLY,
24854+ .vm_flags = VM_READ
24855 };
24856
24857 struct vm_area_struct *get_gate_vma(struct mm_struct *mm)
24858@@ -888,7 +908,7 @@ int in_gate_area_no_mm(unsigned long addr)
24859
24860 const char *arch_vma_name(struct vm_area_struct *vma)
24861 {
24862- if (vma->vm_mm && vma->vm_start == (long)vma->vm_mm->context.vdso)
24863+ if (vma->vm_mm && vma->vm_start == vma->vm_mm->context.vdso)
24864 return "[vdso]";
24865 if (vma == &gate_vma)
24866 return "[vsyscall]";
24867diff --git a/arch/x86/mm/iomap_32.c b/arch/x86/mm/iomap_32.c
24868index 7b179b4..6bd1777 100644
24869--- a/arch/x86/mm/iomap_32.c
24870+++ b/arch/x86/mm/iomap_32.c
24871@@ -64,7 +64,11 @@ void *kmap_atomic_prot_pfn(unsigned long pfn, pgprot_t prot)
24872 type = kmap_atomic_idx_push();
24873 idx = type + KM_TYPE_NR * smp_processor_id();
24874 vaddr = __fix_to_virt(FIX_KMAP_BEGIN + idx);
24875+
24876+ pax_open_kernel();
24877 set_pte(kmap_pte - idx, pfn_pte(pfn, prot));
24878+ pax_close_kernel();
24879+
24880 arch_flush_lazy_mmu_mode();
24881
24882 return (void *)vaddr;
24883diff --git a/arch/x86/mm/ioremap.c b/arch/x86/mm/ioremap.c
24884index be1ef57..55f0160 100644
24885--- a/arch/x86/mm/ioremap.c
24886+++ b/arch/x86/mm/ioremap.c
24887@@ -97,7 +97,7 @@ static void __iomem *__ioremap_caller(resource_size_t phys_addr,
24888 for (pfn = phys_addr >> PAGE_SHIFT; pfn <= last_pfn; pfn++) {
24889 int is_ram = page_is_ram(pfn);
24890
24891- if (is_ram && pfn_valid(pfn) && !PageReserved(pfn_to_page(pfn)))
24892+ if (is_ram && pfn_valid(pfn) && (pfn >= 0x100 || !PageReserved(pfn_to_page(pfn))))
24893 return NULL;
24894 WARN_ON_ONCE(is_ram);
24895 }
24896@@ -315,6 +315,9 @@ void *xlate_dev_mem_ptr(unsigned long phys)
24897
24898 /* If page is RAM, we can use __va. Otherwise ioremap and unmap. */
24899 if (page_is_ram(start >> PAGE_SHIFT))
24900+#ifdef CONFIG_HIGHMEM
24901+ if ((start >> PAGE_SHIFT) < max_low_pfn)
24902+#endif
24903 return __va(phys);
24904
24905 addr = (void __force *)ioremap_cache(start, PAGE_SIZE);
24906@@ -344,7 +347,7 @@ static int __init early_ioremap_debug_setup(char *str)
24907 early_param("early_ioremap_debug", early_ioremap_debug_setup);
24908
24909 static __initdata int after_paging_init;
24910-static pte_t bm_pte[PAGE_SIZE/sizeof(pte_t)] __page_aligned_bss;
24911+static pte_t bm_pte[PAGE_SIZE/sizeof(pte_t)] __read_only __aligned(PAGE_SIZE);
24912
24913 static inline pmd_t * __init early_ioremap_pmd(unsigned long addr)
24914 {
24915@@ -381,8 +384,7 @@ void __init early_ioremap_init(void)
24916 slot_virt[i] = __fix_to_virt(FIX_BTMAP_BEGIN - NR_FIX_BTMAPS*i);
24917
24918 pmd = early_ioremap_pmd(fix_to_virt(FIX_BTMAP_BEGIN));
24919- memset(bm_pte, 0, sizeof(bm_pte));
24920- pmd_populate_kernel(&init_mm, pmd, bm_pte);
24921+ pmd_populate_user(&init_mm, pmd, bm_pte);
24922
24923 /*
24924 * The boot-ioremap range spans multiple pmds, for which
24925diff --git a/arch/x86/mm/kmemcheck/kmemcheck.c b/arch/x86/mm/kmemcheck/kmemcheck.c
24926index d87dd6d..bf3fa66 100644
24927--- a/arch/x86/mm/kmemcheck/kmemcheck.c
24928+++ b/arch/x86/mm/kmemcheck/kmemcheck.c
24929@@ -622,9 +622,9 @@ bool kmemcheck_fault(struct pt_regs *regs, unsigned long address,
24930 * memory (e.g. tracked pages)? For now, we need this to avoid
24931 * invoking kmemcheck for PnP BIOS calls.
24932 */
24933- if (regs->flags & X86_VM_MASK)
24934+ if (v8086_mode(regs))
24935 return false;
24936- if (regs->cs != __KERNEL_CS)
24937+ if (regs->cs != __KERNEL_CS && regs->cs != __KERNEXEC_KERNEL_CS)
24938 return false;
24939
24940 pte = kmemcheck_pte_lookup(address);
24941diff --git a/arch/x86/mm/mmap.c b/arch/x86/mm/mmap.c
24942index 845df68..1d8d29f 100644
24943--- a/arch/x86/mm/mmap.c
24944+++ b/arch/x86/mm/mmap.c
24945@@ -52,7 +52,7 @@ static unsigned int stack_maxrandom_size(void)
24946 * Leave an at least ~128 MB hole with possible stack randomization.
24947 */
24948 #define MIN_GAP (128*1024*1024UL + stack_maxrandom_size())
24949-#define MAX_GAP (TASK_SIZE/6*5)
24950+#define MAX_GAP (pax_task_size/6*5)
24951
24952 static int mmap_is_legacy(void)
24953 {
24954@@ -82,27 +82,40 @@ static unsigned long mmap_rnd(void)
24955 return rnd << PAGE_SHIFT;
24956 }
24957
24958-static unsigned long mmap_base(void)
24959+static unsigned long mmap_base(struct mm_struct *mm)
24960 {
24961 unsigned long gap = rlimit(RLIMIT_STACK);
24962+ unsigned long pax_task_size = TASK_SIZE;
24963+
24964+#ifdef CONFIG_PAX_SEGMEXEC
24965+ if (mm->pax_flags & MF_PAX_SEGMEXEC)
24966+ pax_task_size = SEGMEXEC_TASK_SIZE;
24967+#endif
24968
24969 if (gap < MIN_GAP)
24970 gap = MIN_GAP;
24971 else if (gap > MAX_GAP)
24972 gap = MAX_GAP;
24973
24974- return PAGE_ALIGN(TASK_SIZE - gap - mmap_rnd());
24975+ return PAGE_ALIGN(pax_task_size - gap - mmap_rnd());
24976 }
24977
24978 /*
24979 * Bottom-up (legacy) layout on X86_32 did not support randomization, X86_64
24980 * does, but not when emulating X86_32
24981 */
24982-static unsigned long mmap_legacy_base(void)
24983+static unsigned long mmap_legacy_base(struct mm_struct *mm)
24984 {
24985- if (mmap_is_ia32())
24986+ if (mmap_is_ia32()) {
24987+
24988+#ifdef CONFIG_PAX_SEGMEXEC
24989+ if (mm->pax_flags & MF_PAX_SEGMEXEC)
24990+ return SEGMEXEC_TASK_UNMAPPED_BASE;
24991+ else
24992+#endif
24993+
24994 return TASK_UNMAPPED_BASE;
24995- else
24996+ } else
24997 return TASK_UNMAPPED_BASE + mmap_rnd();
24998 }
24999
25000@@ -113,11 +126,23 @@ static unsigned long mmap_legacy_base(void)
25001 void arch_pick_mmap_layout(struct mm_struct *mm)
25002 {
25003 if (mmap_is_legacy()) {
25004- mm->mmap_base = mmap_legacy_base();
25005+ mm->mmap_base = mmap_legacy_base(mm);
25006+
25007+#ifdef CONFIG_PAX_RANDMMAP
25008+ if (mm->pax_flags & MF_PAX_RANDMMAP)
25009+ mm->mmap_base += mm->delta_mmap;
25010+#endif
25011+
25012 mm->get_unmapped_area = arch_get_unmapped_area;
25013 mm->unmap_area = arch_unmap_area;
25014 } else {
25015- mm->mmap_base = mmap_base();
25016+ mm->mmap_base = mmap_base(mm);
25017+
25018+#ifdef CONFIG_PAX_RANDMMAP
25019+ if (mm->pax_flags & MF_PAX_RANDMMAP)
25020+ mm->mmap_base -= mm->delta_mmap + mm->delta_stack;
25021+#endif
25022+
25023 mm->get_unmapped_area = arch_get_unmapped_area_topdown;
25024 mm->unmap_area = arch_unmap_area_topdown;
25025 }
25026diff --git a/arch/x86/mm/mmio-mod.c b/arch/x86/mm/mmio-mod.c
25027index de54b9b..799051e 100644
25028--- a/arch/x86/mm/mmio-mod.c
25029+++ b/arch/x86/mm/mmio-mod.c
25030@@ -194,7 +194,7 @@ static void pre(struct kmmio_probe *p, struct pt_regs *regs,
25031 break;
25032 default:
25033 {
25034- unsigned char *ip = (unsigned char *)instptr;
25035+ unsigned char *ip = (unsigned char *)ktla_ktva(instptr);
25036 my_trace->opcode = MMIO_UNKNOWN_OP;
25037 my_trace->width = 0;
25038 my_trace->value = (*ip) << 16 | *(ip + 1) << 8 |
25039@@ -234,7 +234,7 @@ static void post(struct kmmio_probe *p, unsigned long condition,
25040 static void ioremap_trace_core(resource_size_t offset, unsigned long size,
25041 void __iomem *addr)
25042 {
25043- static atomic_t next_id;
25044+ static atomic_unchecked_t next_id;
25045 struct remap_trace *trace = kmalloc(sizeof(*trace), GFP_KERNEL);
25046 /* These are page-unaligned. */
25047 struct mmiotrace_map map = {
25048@@ -258,7 +258,7 @@ static void ioremap_trace_core(resource_size_t offset, unsigned long size,
25049 .private = trace
25050 },
25051 .phys = offset,
25052- .id = atomic_inc_return(&next_id)
25053+ .id = atomic_inc_return_unchecked(&next_id)
25054 };
25055 map.map_id = trace->id;
25056
25057diff --git a/arch/x86/mm/pageattr-test.c b/arch/x86/mm/pageattr-test.c
25058index b008656..773eac2 100644
25059--- a/arch/x86/mm/pageattr-test.c
25060+++ b/arch/x86/mm/pageattr-test.c
25061@@ -36,7 +36,7 @@ enum {
25062
25063 static int pte_testbit(pte_t pte)
25064 {
25065- return pte_flags(pte) & _PAGE_UNUSED1;
25066+ return pte_flags(pte) & _PAGE_CPA_TEST;
25067 }
25068
25069 struct split_state {
25070diff --git a/arch/x86/mm/pageattr.c b/arch/x86/mm/pageattr.c
25071index f9e5267..77b1a40 100644
25072--- a/arch/x86/mm/pageattr.c
25073+++ b/arch/x86/mm/pageattr.c
25074@@ -261,7 +261,7 @@ static inline pgprot_t static_protections(pgprot_t prot, unsigned long address,
25075 */
25076 #ifdef CONFIG_PCI_BIOS
25077 if (pcibios_enabled && within(pfn, BIOS_BEGIN >> PAGE_SHIFT, BIOS_END >> PAGE_SHIFT))
25078- pgprot_val(forbidden) |= _PAGE_NX;
25079+ pgprot_val(forbidden) |= _PAGE_NX & __supported_pte_mask;
25080 #endif
25081
25082 /*
25083@@ -269,9 +269,10 @@ static inline pgprot_t static_protections(pgprot_t prot, unsigned long address,
25084 * Does not cover __inittext since that is gone later on. On
25085 * 64bit we do not enforce !NX on the low mapping
25086 */
25087- if (within(address, (unsigned long)_text, (unsigned long)_etext))
25088- pgprot_val(forbidden) |= _PAGE_NX;
25089+ if (within(address, ktla_ktva((unsigned long)_text), ktla_ktva((unsigned long)_etext)))
25090+ pgprot_val(forbidden) |= _PAGE_NX & __supported_pte_mask;
25091
25092+#ifdef CONFIG_DEBUG_RODATA
25093 /*
25094 * The .rodata section needs to be read-only. Using the pfn
25095 * catches all aliases.
25096@@ -279,6 +280,7 @@ static inline pgprot_t static_protections(pgprot_t prot, unsigned long address,
25097 if (within(pfn, __pa((unsigned long)__start_rodata) >> PAGE_SHIFT,
25098 __pa((unsigned long)__end_rodata) >> PAGE_SHIFT))
25099 pgprot_val(forbidden) |= _PAGE_RW;
25100+#endif
25101
25102 #if defined(CONFIG_X86_64) && defined(CONFIG_DEBUG_RODATA)
25103 /*
25104@@ -317,6 +319,13 @@ static inline pgprot_t static_protections(pgprot_t prot, unsigned long address,
25105 }
25106 #endif
25107
25108+#ifdef CONFIG_PAX_KERNEXEC
25109+ if (within(pfn, __pa((unsigned long)&_text), __pa((unsigned long)&_sdata))) {
25110+ pgprot_val(forbidden) |= _PAGE_RW;
25111+ pgprot_val(forbidden) |= _PAGE_NX & __supported_pte_mask;
25112+ }
25113+#endif
25114+
25115 prot = __pgprot(pgprot_val(prot) & ~pgprot_val(forbidden));
25116
25117 return prot;
25118@@ -369,23 +378,37 @@ EXPORT_SYMBOL_GPL(lookup_address);
25119 static void __set_pmd_pte(pte_t *kpte, unsigned long address, pte_t pte)
25120 {
25121 /* change init_mm */
25122+ pax_open_kernel();
25123 set_pte_atomic(kpte, pte);
25124+
25125 #ifdef CONFIG_X86_32
25126 if (!SHARED_KERNEL_PMD) {
25127+
25128+#ifdef CONFIG_PAX_PER_CPU_PGD
25129+ unsigned long cpu;
25130+#else
25131 struct page *page;
25132+#endif
25133
25134+#ifdef CONFIG_PAX_PER_CPU_PGD
25135+ for (cpu = 0; cpu < nr_cpu_ids; ++cpu) {
25136+ pgd_t *pgd = get_cpu_pgd(cpu);
25137+#else
25138 list_for_each_entry(page, &pgd_list, lru) {
25139- pgd_t *pgd;
25140+ pgd_t *pgd = (pgd_t *)page_address(page);
25141+#endif
25142+
25143 pud_t *pud;
25144 pmd_t *pmd;
25145
25146- pgd = (pgd_t *)page_address(page) + pgd_index(address);
25147+ pgd += pgd_index(address);
25148 pud = pud_offset(pgd, address);
25149 pmd = pmd_offset(pud, address);
25150 set_pte_atomic((pte_t *)pmd, pte);
25151 }
25152 }
25153 #endif
25154+ pax_close_kernel();
25155 }
25156
25157 static int
25158diff --git a/arch/x86/mm/pat.c b/arch/x86/mm/pat.c
25159index f6ff57b..481690f 100644
25160--- a/arch/x86/mm/pat.c
25161+++ b/arch/x86/mm/pat.c
25162@@ -361,7 +361,7 @@ int free_memtype(u64 start, u64 end)
25163
25164 if (!entry) {
25165 printk(KERN_INFO "%s:%d freeing invalid memtype %Lx-%Lx\n",
25166- current->comm, current->pid, start, end);
25167+ current->comm, task_pid_nr(current), start, end);
25168 return -EINVAL;
25169 }
25170
25171@@ -492,8 +492,8 @@ static inline int range_is_allowed(unsigned long pfn, unsigned long size)
25172 while (cursor < to) {
25173 if (!devmem_is_allowed(pfn)) {
25174 printk(KERN_INFO
25175- "Program %s tried to access /dev/mem between %Lx->%Lx.\n",
25176- current->comm, from, to);
25177+ "Program %s tried to access /dev/mem between %Lx->%Lx (%Lx).\n",
25178+ current->comm, from, to, cursor);
25179 return 0;
25180 }
25181 cursor += PAGE_SIZE;
25182@@ -557,7 +557,7 @@ int kernel_map_sync_memtype(u64 base, unsigned long size, unsigned long flags)
25183 printk(KERN_INFO
25184 "%s:%d ioremap_change_attr failed %s "
25185 "for %Lx-%Lx\n",
25186- current->comm, current->pid,
25187+ current->comm, task_pid_nr(current),
25188 cattr_name(flags),
25189 base, (unsigned long long)(base + size));
25190 return -EINVAL;
25191@@ -593,7 +593,7 @@ static int reserve_pfn_range(u64 paddr, unsigned long size, pgprot_t *vma_prot,
25192 if (want_flags != flags) {
25193 printk(KERN_WARNING
25194 "%s:%d map pfn RAM range req %s for %Lx-%Lx, got %s\n",
25195- current->comm, current->pid,
25196+ current->comm, task_pid_nr(current),
25197 cattr_name(want_flags),
25198 (unsigned long long)paddr,
25199 (unsigned long long)(paddr + size),
25200@@ -615,7 +615,7 @@ static int reserve_pfn_range(u64 paddr, unsigned long size, pgprot_t *vma_prot,
25201 free_memtype(paddr, paddr + size);
25202 printk(KERN_ERR "%s:%d map pfn expected mapping type %s"
25203 " for %Lx-%Lx, got %s\n",
25204- current->comm, current->pid,
25205+ current->comm, task_pid_nr(current),
25206 cattr_name(want_flags),
25207 (unsigned long long)paddr,
25208 (unsigned long long)(paddr + size),
25209diff --git a/arch/x86/mm/pf_in.c b/arch/x86/mm/pf_in.c
25210index 9f0614d..92ae64a 100644
25211--- a/arch/x86/mm/pf_in.c
25212+++ b/arch/x86/mm/pf_in.c
25213@@ -148,7 +148,7 @@ enum reason_type get_ins_type(unsigned long ins_addr)
25214 int i;
25215 enum reason_type rv = OTHERS;
25216
25217- p = (unsigned char *)ins_addr;
25218+ p = (unsigned char *)ktla_ktva(ins_addr);
25219 p += skip_prefix(p, &prf);
25220 p += get_opcode(p, &opcode);
25221
25222@@ -168,7 +168,7 @@ static unsigned int get_ins_reg_width(unsigned long ins_addr)
25223 struct prefix_bits prf;
25224 int i;
25225
25226- p = (unsigned char *)ins_addr;
25227+ p = (unsigned char *)ktla_ktva(ins_addr);
25228 p += skip_prefix(p, &prf);
25229 p += get_opcode(p, &opcode);
25230
25231@@ -191,7 +191,7 @@ unsigned int get_ins_mem_width(unsigned long ins_addr)
25232 struct prefix_bits prf;
25233 int i;
25234
25235- p = (unsigned char *)ins_addr;
25236+ p = (unsigned char *)ktla_ktva(ins_addr);
25237 p += skip_prefix(p, &prf);
25238 p += get_opcode(p, &opcode);
25239
25240@@ -415,7 +415,7 @@ unsigned long get_ins_reg_val(unsigned long ins_addr, struct pt_regs *regs)
25241 struct prefix_bits prf;
25242 int i;
25243
25244- p = (unsigned char *)ins_addr;
25245+ p = (unsigned char *)ktla_ktva(ins_addr);
25246 p += skip_prefix(p, &prf);
25247 p += get_opcode(p, &opcode);
25248 for (i = 0; i < ARRAY_SIZE(reg_rop); i++)
25249@@ -470,7 +470,7 @@ unsigned long get_ins_imm_val(unsigned long ins_addr)
25250 struct prefix_bits prf;
25251 int i;
25252
25253- p = (unsigned char *)ins_addr;
25254+ p = (unsigned char *)ktla_ktva(ins_addr);
25255 p += skip_prefix(p, &prf);
25256 p += get_opcode(p, &opcode);
25257 for (i = 0; i < ARRAY_SIZE(imm_wop); i++)
25258diff --git a/arch/x86/mm/pgtable.c b/arch/x86/mm/pgtable.c
25259index 8573b83..c3b1a30 100644
25260--- a/arch/x86/mm/pgtable.c
25261+++ b/arch/x86/mm/pgtable.c
25262@@ -84,10 +84,52 @@ static inline void pgd_list_del(pgd_t *pgd)
25263 list_del(&page->lru);
25264 }
25265
25266-#define UNSHARED_PTRS_PER_PGD \
25267- (SHARED_KERNEL_PMD ? KERNEL_PGD_BOUNDARY : PTRS_PER_PGD)
25268+#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
25269+pgdval_t clone_pgd_mask __read_only = ~_PAGE_PRESENT;
25270
25271+void __shadow_user_pgds(pgd_t *dst, const pgd_t *src, int count)
25272+{
25273+ while (count--)
25274+ *dst++ = __pgd((pgd_val(*src++) | (_PAGE_NX & __supported_pte_mask)) & ~_PAGE_USER);
25275+}
25276+#endif
25277
25278+#ifdef CONFIG_PAX_PER_CPU_PGD
25279+void __clone_user_pgds(pgd_t *dst, const pgd_t *src, int count)
25280+{
25281+ while (count--)
25282+
25283+#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
25284+ *dst++ = __pgd(pgd_val(*src++) & clone_pgd_mask);
25285+#else
25286+ *dst++ = *src++;
25287+#endif
25288+
25289+}
25290+#endif
25291+
25292+#ifdef CONFIG_X86_64
25293+#define pxd_t pud_t
25294+#define pyd_t pgd_t
25295+#define paravirt_release_pxd(pfn) paravirt_release_pud(pfn)
25296+#define pxd_free(mm, pud) pud_free((mm), (pud))
25297+#define pyd_populate(mm, pgd, pud) pgd_populate((mm), (pgd), (pud))
25298+#define pyd_offset(mm, address) pgd_offset((mm), (address))
25299+#define PYD_SIZE PGDIR_SIZE
25300+#else
25301+#define pxd_t pmd_t
25302+#define pyd_t pud_t
25303+#define paravirt_release_pxd(pfn) paravirt_release_pmd(pfn)
25304+#define pxd_free(mm, pud) pmd_free((mm), (pud))
25305+#define pyd_populate(mm, pgd, pud) pud_populate((mm), (pgd), (pud))
25306+#define pyd_offset(mm, address) pud_offset((mm), (address))
25307+#define PYD_SIZE PUD_SIZE
25308+#endif
25309+
25310+#ifdef CONFIG_PAX_PER_CPU_PGD
25311+static inline void pgd_ctor(struct mm_struct *mm, pgd_t *pgd) {}
25312+static inline void pgd_dtor(pgd_t *pgd) {}
25313+#else
25314 static void pgd_set_mm(pgd_t *pgd, struct mm_struct *mm)
25315 {
25316 BUILD_BUG_ON(sizeof(virt_to_page(pgd)->index) < sizeof(mm));
25317@@ -128,6 +170,7 @@ static void pgd_dtor(pgd_t *pgd)
25318 pgd_list_del(pgd);
25319 spin_unlock(&pgd_lock);
25320 }
25321+#endif
25322
25323 /*
25324 * List of all pgd's needed for non-PAE so it can invalidate entries
25325@@ -140,7 +183,7 @@ static void pgd_dtor(pgd_t *pgd)
25326 * -- wli
25327 */
25328
25329-#ifdef CONFIG_X86_PAE
25330+#if defined(CONFIG_X86_32) && defined(CONFIG_X86_PAE)
25331 /*
25332 * In PAE mode, we need to do a cr3 reload (=tlb flush) when
25333 * updating the top-level pagetable entries to guarantee the
25334@@ -152,7 +195,7 @@ static void pgd_dtor(pgd_t *pgd)
25335 * not shared between pagetables (!SHARED_KERNEL_PMDS), we allocate
25336 * and initialize the kernel pmds here.
25337 */
25338-#define PREALLOCATED_PMDS UNSHARED_PTRS_PER_PGD
25339+#define PREALLOCATED_PXDS (SHARED_KERNEL_PMD ? KERNEL_PGD_BOUNDARY : PTRS_PER_PGD)
25340
25341 void pud_populate(struct mm_struct *mm, pud_t *pudp, pmd_t *pmd)
25342 {
25343@@ -170,36 +213,38 @@ void pud_populate(struct mm_struct *mm, pud_t *pudp, pmd_t *pmd)
25344 */
25345 flush_tlb_mm(mm);
25346 }
25347+#elif defined(CONFIG_X86_64) && defined(CONFIG_PAX_PER_CPU_PGD)
25348+#define PREALLOCATED_PXDS USER_PGD_PTRS
25349 #else /* !CONFIG_X86_PAE */
25350
25351 /* No need to prepopulate any pagetable entries in non-PAE modes. */
25352-#define PREALLOCATED_PMDS 0
25353+#define PREALLOCATED_PXDS 0
25354
25355 #endif /* CONFIG_X86_PAE */
25356
25357-static void free_pmds(pmd_t *pmds[])
25358+static void free_pxds(pxd_t *pxds[])
25359 {
25360 int i;
25361
25362- for(i = 0; i < PREALLOCATED_PMDS; i++)
25363- if (pmds[i])
25364- free_page((unsigned long)pmds[i]);
25365+ for(i = 0; i < PREALLOCATED_PXDS; i++)
25366+ if (pxds[i])
25367+ free_page((unsigned long)pxds[i]);
25368 }
25369
25370-static int preallocate_pmds(pmd_t *pmds[])
25371+static int preallocate_pxds(pxd_t *pxds[])
25372 {
25373 int i;
25374 bool failed = false;
25375
25376- for(i = 0; i < PREALLOCATED_PMDS; i++) {
25377- pmd_t *pmd = (pmd_t *)__get_free_page(PGALLOC_GFP);
25378- if (pmd == NULL)
25379+ for(i = 0; i < PREALLOCATED_PXDS; i++) {
25380+ pxd_t *pxd = (pxd_t *)__get_free_page(PGALLOC_GFP);
25381+ if (pxd == NULL)
25382 failed = true;
25383- pmds[i] = pmd;
25384+ pxds[i] = pxd;
25385 }
25386
25387 if (failed) {
25388- free_pmds(pmds);
25389+ free_pxds(pxds);
25390 return -ENOMEM;
25391 }
25392
25393@@ -212,51 +257,55 @@ static int preallocate_pmds(pmd_t *pmds[])
25394 * preallocate which never got a corresponding vma will need to be
25395 * freed manually.
25396 */
25397-static void pgd_mop_up_pmds(struct mm_struct *mm, pgd_t *pgdp)
25398+static void pgd_mop_up_pxds(struct mm_struct *mm, pgd_t *pgdp)
25399 {
25400 int i;
25401
25402- for(i = 0; i < PREALLOCATED_PMDS; i++) {
25403+ for(i = 0; i < PREALLOCATED_PXDS; i++) {
25404 pgd_t pgd = pgdp[i];
25405
25406 if (pgd_val(pgd) != 0) {
25407- pmd_t *pmd = (pmd_t *)pgd_page_vaddr(pgd);
25408+ pxd_t *pxd = (pxd_t *)pgd_page_vaddr(pgd);
25409
25410- pgdp[i] = native_make_pgd(0);
25411+ set_pgd(pgdp + i, native_make_pgd(0));
25412
25413- paravirt_release_pmd(pgd_val(pgd) >> PAGE_SHIFT);
25414- pmd_free(mm, pmd);
25415+ paravirt_release_pxd(pgd_val(pgd) >> PAGE_SHIFT);
25416+ pxd_free(mm, pxd);
25417 }
25418 }
25419 }
25420
25421-static void pgd_prepopulate_pmd(struct mm_struct *mm, pgd_t *pgd, pmd_t *pmds[])
25422+static void pgd_prepopulate_pxd(struct mm_struct *mm, pgd_t *pgd, pxd_t *pxds[])
25423 {
25424- pud_t *pud;
25425+ pyd_t *pyd;
25426 unsigned long addr;
25427 int i;
25428
25429- if (PREALLOCATED_PMDS == 0) /* Work around gcc-3.4.x bug */
25430+ if (PREALLOCATED_PXDS == 0) /* Work around gcc-3.4.x bug */
25431 return;
25432
25433- pud = pud_offset(pgd, 0);
25434+#ifdef CONFIG_X86_64
25435+ pyd = pyd_offset(mm, 0L);
25436+#else
25437+ pyd = pyd_offset(pgd, 0L);
25438+#endif
25439
25440- for (addr = i = 0; i < PREALLOCATED_PMDS;
25441- i++, pud++, addr += PUD_SIZE) {
25442- pmd_t *pmd = pmds[i];
25443+ for (addr = i = 0; i < PREALLOCATED_PXDS;
25444+ i++, pyd++, addr += PYD_SIZE) {
25445+ pxd_t *pxd = pxds[i];
25446
25447 if (i >= KERNEL_PGD_BOUNDARY)
25448- memcpy(pmd, (pmd_t *)pgd_page_vaddr(swapper_pg_dir[i]),
25449- sizeof(pmd_t) * PTRS_PER_PMD);
25450+ memcpy(pxd, (pxd_t *)pgd_page_vaddr(swapper_pg_dir[i]),
25451+ sizeof(pxd_t) * PTRS_PER_PMD);
25452
25453- pud_populate(mm, pud, pmd);
25454+ pyd_populate(mm, pyd, pxd);
25455 }
25456 }
25457
25458 pgd_t *pgd_alloc(struct mm_struct *mm)
25459 {
25460 pgd_t *pgd;
25461- pmd_t *pmds[PREALLOCATED_PMDS];
25462+ pxd_t *pxds[PREALLOCATED_PXDS];
25463
25464 pgd = (pgd_t *)__get_free_page(PGALLOC_GFP);
25465
25466@@ -265,11 +314,11 @@ pgd_t *pgd_alloc(struct mm_struct *mm)
25467
25468 mm->pgd = pgd;
25469
25470- if (preallocate_pmds(pmds) != 0)
25471+ if (preallocate_pxds(pxds) != 0)
25472 goto out_free_pgd;
25473
25474 if (paravirt_pgd_alloc(mm) != 0)
25475- goto out_free_pmds;
25476+ goto out_free_pxds;
25477
25478 /*
25479 * Make sure that pre-populating the pmds is atomic with
25480@@ -279,14 +328,14 @@ pgd_t *pgd_alloc(struct mm_struct *mm)
25481 spin_lock(&pgd_lock);
25482
25483 pgd_ctor(mm, pgd);
25484- pgd_prepopulate_pmd(mm, pgd, pmds);
25485+ pgd_prepopulate_pxd(mm, pgd, pxds);
25486
25487 spin_unlock(&pgd_lock);
25488
25489 return pgd;
25490
25491-out_free_pmds:
25492- free_pmds(pmds);
25493+out_free_pxds:
25494+ free_pxds(pxds);
25495 out_free_pgd:
25496 free_page((unsigned long)pgd);
25497 out:
25498@@ -295,7 +344,7 @@ out:
25499
25500 void pgd_free(struct mm_struct *mm, pgd_t *pgd)
25501 {
25502- pgd_mop_up_pmds(mm, pgd);
25503+ pgd_mop_up_pxds(mm, pgd);
25504 pgd_dtor(pgd);
25505 paravirt_pgd_free(mm, pgd);
25506 free_page((unsigned long)pgd);
25507diff --git a/arch/x86/mm/pgtable_32.c b/arch/x86/mm/pgtable_32.c
25508index cac7184..09a39fa 100644
25509--- a/arch/x86/mm/pgtable_32.c
25510+++ b/arch/x86/mm/pgtable_32.c
25511@@ -48,10 +48,13 @@ void set_pte_vaddr(unsigned long vaddr, pte_t pteval)
25512 return;
25513 }
25514 pte = pte_offset_kernel(pmd, vaddr);
25515+
25516+ pax_open_kernel();
25517 if (pte_val(pteval))
25518 set_pte_at(&init_mm, vaddr, pte, pteval);
25519 else
25520 pte_clear(&init_mm, vaddr, pte);
25521+ pax_close_kernel();
25522
25523 /*
25524 * It's enough to flush this one mapping.
25525diff --git a/arch/x86/mm/setup_nx.c b/arch/x86/mm/setup_nx.c
25526index 410531d..0f16030 100644
25527--- a/arch/x86/mm/setup_nx.c
25528+++ b/arch/x86/mm/setup_nx.c
25529@@ -5,8 +5,10 @@
25530 #include <asm/pgtable.h>
25531 #include <asm/proto.h>
25532
25533+#if defined(CONFIG_X86_64) || defined(CONFIG_X86_PAE)
25534 static int disable_nx __cpuinitdata;
25535
25536+#ifndef CONFIG_PAX_PAGEEXEC
25537 /*
25538 * noexec = on|off
25539 *
25540@@ -28,12 +30,17 @@ static int __init noexec_setup(char *str)
25541 return 0;
25542 }
25543 early_param("noexec", noexec_setup);
25544+#endif
25545+
25546+#endif
25547
25548 void __cpuinit x86_configure_nx(void)
25549 {
25550+#if defined(CONFIG_X86_64) || defined(CONFIG_X86_PAE)
25551 if (cpu_has_nx && !disable_nx)
25552 __supported_pte_mask |= _PAGE_NX;
25553 else
25554+#endif
25555 __supported_pte_mask &= ~_PAGE_NX;
25556 }
25557
25558diff --git a/arch/x86/mm/tlb.c b/arch/x86/mm/tlb.c
25559index d6c0418..06a0ad5 100644
25560--- a/arch/x86/mm/tlb.c
25561+++ b/arch/x86/mm/tlb.c
25562@@ -65,7 +65,11 @@ void leave_mm(int cpu)
25563 BUG();
25564 cpumask_clear_cpu(cpu,
25565 mm_cpumask(percpu_read(cpu_tlbstate.active_mm)));
25566+
25567+#ifndef CONFIG_PAX_PER_CPU_PGD
25568 load_cr3(swapper_pg_dir);
25569+#endif
25570+
25571 }
25572 EXPORT_SYMBOL_GPL(leave_mm);
25573
25574diff --git a/arch/x86/net/bpf_jit.S b/arch/x86/net/bpf_jit.S
25575index 6687022..ceabcfa 100644
25576--- a/arch/x86/net/bpf_jit.S
25577+++ b/arch/x86/net/bpf_jit.S
25578@@ -9,6 +9,7 @@
25579 */
25580 #include <linux/linkage.h>
25581 #include <asm/dwarf2.h>
25582+#include <asm/alternative-asm.h>
25583
25584 /*
25585 * Calling convention :
25586@@ -35,6 +36,7 @@ sk_load_word:
25587 jle bpf_slow_path_word
25588 mov (SKBDATA,%rsi),%eax
25589 bswap %eax /* ntohl() */
25590+ pax_force_retaddr
25591 ret
25592
25593
25594@@ -53,6 +55,7 @@ sk_load_half:
25595 jle bpf_slow_path_half
25596 movzwl (SKBDATA,%rsi),%eax
25597 rol $8,%ax # ntohs()
25598+ pax_force_retaddr
25599 ret
25600
25601 sk_load_byte_ind:
25602@@ -66,6 +69,7 @@ sk_load_byte:
25603 cmp %esi,%r9d /* if (offset >= hlen) goto bpf_slow_path_byte */
25604 jle bpf_slow_path_byte
25605 movzbl (SKBDATA,%rsi),%eax
25606+ pax_force_retaddr
25607 ret
25608
25609 /**
25610@@ -82,6 +86,7 @@ ENTRY(sk_load_byte_msh)
25611 movzbl (SKBDATA,%rsi),%ebx
25612 and $15,%bl
25613 shl $2,%bl
25614+ pax_force_retaddr
25615 ret
25616 CFI_ENDPROC
25617 ENDPROC(sk_load_byte_msh)
25618@@ -91,6 +96,7 @@ bpf_error:
25619 xor %eax,%eax
25620 mov -8(%rbp),%rbx
25621 leaveq
25622+ pax_force_retaddr
25623 ret
25624
25625 /* rsi contains offset and can be scratched */
25626@@ -113,6 +119,7 @@ bpf_slow_path_word:
25627 js bpf_error
25628 mov -12(%rbp),%eax
25629 bswap %eax
25630+ pax_force_retaddr
25631 ret
25632
25633 bpf_slow_path_half:
25634@@ -121,12 +128,14 @@ bpf_slow_path_half:
25635 mov -12(%rbp),%ax
25636 rol $8,%ax
25637 movzwl %ax,%eax
25638+ pax_force_retaddr
25639 ret
25640
25641 bpf_slow_path_byte:
25642 bpf_slow_path_common(1)
25643 js bpf_error
25644 movzbl -12(%rbp),%eax
25645+ pax_force_retaddr
25646 ret
25647
25648 bpf_slow_path_byte_msh:
25649@@ -137,4 +146,5 @@ bpf_slow_path_byte_msh:
25650 and $15,%al
25651 shl $2,%al
25652 xchg %eax,%ebx
25653+ pax_force_retaddr
25654 ret
25655diff --git a/arch/x86/net/bpf_jit_comp.c b/arch/x86/net/bpf_jit_comp.c
25656index 7c1b765..8c072c6 100644
25657--- a/arch/x86/net/bpf_jit_comp.c
25658+++ b/arch/x86/net/bpf_jit_comp.c
25659@@ -117,6 +117,10 @@ static inline void bpf_flush_icache(void *start, void *end)
25660 set_fs(old_fs);
25661 }
25662
25663+struct bpf_jit_work {
25664+ struct work_struct work;
25665+ void *image;
25666+};
25667
25668 void bpf_jit_compile(struct sk_filter *fp)
25669 {
25670@@ -141,6 +145,10 @@ void bpf_jit_compile(struct sk_filter *fp)
25671 if (addrs == NULL)
25672 return;
25673
25674+ fp->work = kmalloc(sizeof(*fp->work), GFP_KERNEL);
25675+ if (!fp->work)
25676+ goto out;
25677+
25678 /* Before first pass, make a rough estimation of addrs[]
25679 * each bpf instruction is translated to less than 64 bytes
25680 */
25681@@ -476,7 +484,7 @@ void bpf_jit_compile(struct sk_filter *fp)
25682 func = sk_load_word;
25683 common_load: seen |= SEEN_DATAREF;
25684 if ((int)K < 0)
25685- goto out;
25686+ goto error;
25687 t_offset = func - (image + addrs[i]);
25688 EMIT1_off32(0xbe, K); /* mov imm32,%esi */
25689 EMIT1_off32(0xe8, t_offset); /* call */
25690@@ -586,17 +594,18 @@ cond_branch: f_offset = addrs[i + filter[i].jf] - addrs[i];
25691 break;
25692 default:
25693 /* hmm, too complex filter, give up with jit compiler */
25694- goto out;
25695+ goto error;
25696 }
25697 ilen = prog - temp;
25698 if (image) {
25699 if (unlikely(proglen + ilen > oldproglen)) {
25700 pr_err("bpb_jit_compile fatal error\n");
25701- kfree(addrs);
25702- module_free(NULL, image);
25703- return;
25704+ module_free_exec(NULL, image);
25705+ goto error;
25706 }
25707+ pax_open_kernel();
25708 memcpy(image + proglen, temp, ilen);
25709+ pax_close_kernel();
25710 }
25711 proglen += ilen;
25712 addrs[i] = proglen;
25713@@ -617,11 +626,9 @@ cond_branch: f_offset = addrs[i + filter[i].jf] - addrs[i];
25714 break;
25715 }
25716 if (proglen == oldproglen) {
25717- image = module_alloc(max_t(unsigned int,
25718- proglen,
25719- sizeof(struct work_struct)));
25720+ image = module_alloc_exec(proglen);
25721 if (!image)
25722- goto out;
25723+ goto error;
25724 }
25725 oldproglen = proglen;
25726 }
25727@@ -637,7 +644,10 @@ cond_branch: f_offset = addrs[i + filter[i].jf] - addrs[i];
25728 bpf_flush_icache(image, image + proglen);
25729
25730 fp->bpf_func = (void *)image;
25731- }
25732+ } else
25733+error:
25734+ kfree(fp->work);
25735+
25736 out:
25737 kfree(addrs);
25738 return;
25739@@ -645,18 +655,20 @@ out:
25740
25741 static void jit_free_defer(struct work_struct *arg)
25742 {
25743- module_free(NULL, arg);
25744+ module_free_exec(NULL, ((struct bpf_jit_work *)arg)->image);
25745+ kfree(arg);
25746 }
25747
25748 /* run from softirq, we must use a work_struct to call
25749- * module_free() from process context
25750+ * module_free_exec() from process context
25751 */
25752 void bpf_jit_free(struct sk_filter *fp)
25753 {
25754 if (fp->bpf_func != sk_run_filter) {
25755- struct work_struct *work = (struct work_struct *)fp->bpf_func;
25756+ struct work_struct *work = &fp->work->work;
25757
25758 INIT_WORK(work, jit_free_defer);
25759+ fp->work->image = fp->bpf_func;
25760 schedule_work(work);
25761 }
25762 }
25763diff --git a/arch/x86/oprofile/backtrace.c b/arch/x86/oprofile/backtrace.c
25764index bff89df..377758a 100644
25765--- a/arch/x86/oprofile/backtrace.c
25766+++ b/arch/x86/oprofile/backtrace.c
25767@@ -46,11 +46,11 @@ dump_user_backtrace_32(struct stack_frame_ia32 *head)
25768 struct stack_frame_ia32 *fp;
25769 unsigned long bytes;
25770
25771- bytes = copy_from_user_nmi(bufhead, head, sizeof(bufhead));
25772+ bytes = copy_from_user_nmi(bufhead, (const char __force_user *)head, sizeof(bufhead));
25773 if (bytes != sizeof(bufhead))
25774 return NULL;
25775
25776- fp = (struct stack_frame_ia32 *) compat_ptr(bufhead[0].next_frame);
25777+ fp = (struct stack_frame_ia32 __force_kernel *) compat_ptr(bufhead[0].next_frame);
25778
25779 oprofile_add_trace(bufhead[0].return_address);
25780
25781@@ -92,7 +92,7 @@ static struct stack_frame *dump_user_backtrace(struct stack_frame *head)
25782 struct stack_frame bufhead[2];
25783 unsigned long bytes;
25784
25785- bytes = copy_from_user_nmi(bufhead, head, sizeof(bufhead));
25786+ bytes = copy_from_user_nmi(bufhead, (const char __force_user *)head, sizeof(bufhead));
25787 if (bytes != sizeof(bufhead))
25788 return NULL;
25789
25790@@ -111,7 +111,7 @@ x86_backtrace(struct pt_regs * const regs, unsigned int depth)
25791 {
25792 struct stack_frame *head = (struct stack_frame *)frame_pointer(regs);
25793
25794- if (!user_mode_vm(regs)) {
25795+ if (!user_mode(regs)) {
25796 unsigned long stack = kernel_stack_pointer(regs);
25797 if (depth)
25798 dump_trace(NULL, regs, (unsigned long *)stack, 0,
25799diff --git a/arch/x86/pci/mrst.c b/arch/x86/pci/mrst.c
25800index cb29191..036766d 100644
25801--- a/arch/x86/pci/mrst.c
25802+++ b/arch/x86/pci/mrst.c
25803@@ -234,7 +234,9 @@ int __init pci_mrst_init(void)
25804 printk(KERN_INFO "Moorestown platform detected, using MRST PCI ops\n");
25805 pci_mmcfg_late_init();
25806 pcibios_enable_irq = mrst_pci_irq_enable;
25807- pci_root_ops = pci_mrst_ops;
25808+ pax_open_kernel();
25809+ memcpy((void *)&pci_root_ops, &pci_mrst_ops, sizeof(pci_mrst_ops));
25810+ pax_close_kernel();
25811 /* Continue with standard init */
25812 return 1;
25813 }
25814diff --git a/arch/x86/pci/pcbios.c b/arch/x86/pci/pcbios.c
25815index db0e9a5..0372c14 100644
25816--- a/arch/x86/pci/pcbios.c
25817+++ b/arch/x86/pci/pcbios.c
25818@@ -79,50 +79,93 @@ union bios32 {
25819 static struct {
25820 unsigned long address;
25821 unsigned short segment;
25822-} bios32_indirect = { 0, __KERNEL_CS };
25823+} bios32_indirect __read_only = { 0, __PCIBIOS_CS };
25824
25825 /*
25826 * Returns the entry point for the given service, NULL on error
25827 */
25828
25829-static unsigned long bios32_service(unsigned long service)
25830+static unsigned long __devinit bios32_service(unsigned long service)
25831 {
25832 unsigned char return_code; /* %al */
25833 unsigned long address; /* %ebx */
25834 unsigned long length; /* %ecx */
25835 unsigned long entry; /* %edx */
25836 unsigned long flags;
25837+ struct desc_struct d, *gdt;
25838
25839 local_irq_save(flags);
25840- __asm__("lcall *(%%edi); cld"
25841+
25842+ gdt = get_cpu_gdt_table(smp_processor_id());
25843+
25844+ pack_descriptor(&d, 0UL, 0xFFFFFUL, 0x9B, 0xC);
25845+ write_gdt_entry(gdt, GDT_ENTRY_PCIBIOS_CS, &d, DESCTYPE_S);
25846+ pack_descriptor(&d, 0UL, 0xFFFFFUL, 0x93, 0xC);
25847+ write_gdt_entry(gdt, GDT_ENTRY_PCIBIOS_DS, &d, DESCTYPE_S);
25848+
25849+ __asm__("movw %w7, %%ds; lcall *(%%edi); push %%ss; pop %%ds; cld"
25850 : "=a" (return_code),
25851 "=b" (address),
25852 "=c" (length),
25853 "=d" (entry)
25854 : "0" (service),
25855 "1" (0),
25856- "D" (&bios32_indirect));
25857+ "D" (&bios32_indirect),
25858+ "r"(__PCIBIOS_DS)
25859+ : "memory");
25860+
25861+ pax_open_kernel();
25862+ gdt[GDT_ENTRY_PCIBIOS_CS].a = 0;
25863+ gdt[GDT_ENTRY_PCIBIOS_CS].b = 0;
25864+ gdt[GDT_ENTRY_PCIBIOS_DS].a = 0;
25865+ gdt[GDT_ENTRY_PCIBIOS_DS].b = 0;
25866+ pax_close_kernel();
25867+
25868 local_irq_restore(flags);
25869
25870 switch (return_code) {
25871- case 0:
25872- return address + entry;
25873- case 0x80: /* Not present */
25874- printk(KERN_WARNING "bios32_service(0x%lx): not present\n", service);
25875- return 0;
25876- default: /* Shouldn't happen */
25877- printk(KERN_WARNING "bios32_service(0x%lx): returned 0x%x -- BIOS bug!\n",
25878- service, return_code);
25879+ case 0: {
25880+ int cpu;
25881+ unsigned char flags;
25882+
25883+ printk(KERN_INFO "bios32_service: base:%08lx length:%08lx entry:%08lx\n", address, length, entry);
25884+ if (address >= 0xFFFF0 || length > 0x100000 - address || length <= entry) {
25885+ printk(KERN_WARNING "bios32_service: not valid\n");
25886 return 0;
25887+ }
25888+ address = address + PAGE_OFFSET;
25889+ length += 16UL; /* some BIOSs underreport this... */
25890+ flags = 4;
25891+ if (length >= 64*1024*1024) {
25892+ length >>= PAGE_SHIFT;
25893+ flags |= 8;
25894+ }
25895+
25896+ for (cpu = 0; cpu < nr_cpu_ids; cpu++) {
25897+ gdt = get_cpu_gdt_table(cpu);
25898+ pack_descriptor(&d, address, length, 0x9b, flags);
25899+ write_gdt_entry(gdt, GDT_ENTRY_PCIBIOS_CS, &d, DESCTYPE_S);
25900+ pack_descriptor(&d, address, length, 0x93, flags);
25901+ write_gdt_entry(gdt, GDT_ENTRY_PCIBIOS_DS, &d, DESCTYPE_S);
25902+ }
25903+ return entry;
25904+ }
25905+ case 0x80: /* Not present */
25906+ printk(KERN_WARNING "bios32_service(0x%lx): not present\n", service);
25907+ return 0;
25908+ default: /* Shouldn't happen */
25909+ printk(KERN_WARNING "bios32_service(0x%lx): returned 0x%x -- BIOS bug!\n",
25910+ service, return_code);
25911+ return 0;
25912 }
25913 }
25914
25915 static struct {
25916 unsigned long address;
25917 unsigned short segment;
25918-} pci_indirect = { 0, __KERNEL_CS };
25919+} pci_indirect __read_only = { 0, __PCIBIOS_CS };
25920
25921-static int pci_bios_present;
25922+static int pci_bios_present __read_only;
25923
25924 static int __devinit check_pcibios(void)
25925 {
25926@@ -131,11 +174,13 @@ static int __devinit check_pcibios(void)
25927 unsigned long flags, pcibios_entry;
25928
25929 if ((pcibios_entry = bios32_service(PCI_SERVICE))) {
25930- pci_indirect.address = pcibios_entry + PAGE_OFFSET;
25931+ pci_indirect.address = pcibios_entry;
25932
25933 local_irq_save(flags);
25934- __asm__(
25935- "lcall *(%%edi); cld\n\t"
25936+ __asm__("movw %w6, %%ds\n\t"
25937+ "lcall *%%ss:(%%edi); cld\n\t"
25938+ "push %%ss\n\t"
25939+ "pop %%ds\n\t"
25940 "jc 1f\n\t"
25941 "xor %%ah, %%ah\n"
25942 "1:"
25943@@ -144,7 +189,8 @@ static int __devinit check_pcibios(void)
25944 "=b" (ebx),
25945 "=c" (ecx)
25946 : "1" (PCIBIOS_PCI_BIOS_PRESENT),
25947- "D" (&pci_indirect)
25948+ "D" (&pci_indirect),
25949+ "r" (__PCIBIOS_DS)
25950 : "memory");
25951 local_irq_restore(flags);
25952
25953@@ -189,7 +235,10 @@ static int pci_bios_read(unsigned int seg, unsigned int bus,
25954
25955 switch (len) {
25956 case 1:
25957- __asm__("lcall *(%%esi); cld\n\t"
25958+ __asm__("movw %w6, %%ds\n\t"
25959+ "lcall *%%ss:(%%esi); cld\n\t"
25960+ "push %%ss\n\t"
25961+ "pop %%ds\n\t"
25962 "jc 1f\n\t"
25963 "xor %%ah, %%ah\n"
25964 "1:"
25965@@ -198,7 +247,8 @@ static int pci_bios_read(unsigned int seg, unsigned int bus,
25966 : "1" (PCIBIOS_READ_CONFIG_BYTE),
25967 "b" (bx),
25968 "D" ((long)reg),
25969- "S" (&pci_indirect));
25970+ "S" (&pci_indirect),
25971+ "r" (__PCIBIOS_DS));
25972 /*
25973 * Zero-extend the result beyond 8 bits, do not trust the
25974 * BIOS having done it:
25975@@ -206,7 +256,10 @@ static int pci_bios_read(unsigned int seg, unsigned int bus,
25976 *value &= 0xff;
25977 break;
25978 case 2:
25979- __asm__("lcall *(%%esi); cld\n\t"
25980+ __asm__("movw %w6, %%ds\n\t"
25981+ "lcall *%%ss:(%%esi); cld\n\t"
25982+ "push %%ss\n\t"
25983+ "pop %%ds\n\t"
25984 "jc 1f\n\t"
25985 "xor %%ah, %%ah\n"
25986 "1:"
25987@@ -215,7 +268,8 @@ static int pci_bios_read(unsigned int seg, unsigned int bus,
25988 : "1" (PCIBIOS_READ_CONFIG_WORD),
25989 "b" (bx),
25990 "D" ((long)reg),
25991- "S" (&pci_indirect));
25992+ "S" (&pci_indirect),
25993+ "r" (__PCIBIOS_DS));
25994 /*
25995 * Zero-extend the result beyond 16 bits, do not trust the
25996 * BIOS having done it:
25997@@ -223,7 +277,10 @@ static int pci_bios_read(unsigned int seg, unsigned int bus,
25998 *value &= 0xffff;
25999 break;
26000 case 4:
26001- __asm__("lcall *(%%esi); cld\n\t"
26002+ __asm__("movw %w6, %%ds\n\t"
26003+ "lcall *%%ss:(%%esi); cld\n\t"
26004+ "push %%ss\n\t"
26005+ "pop %%ds\n\t"
26006 "jc 1f\n\t"
26007 "xor %%ah, %%ah\n"
26008 "1:"
26009@@ -232,7 +289,8 @@ static int pci_bios_read(unsigned int seg, unsigned int bus,
26010 : "1" (PCIBIOS_READ_CONFIG_DWORD),
26011 "b" (bx),
26012 "D" ((long)reg),
26013- "S" (&pci_indirect));
26014+ "S" (&pci_indirect),
26015+ "r" (__PCIBIOS_DS));
26016 break;
26017 }
26018
26019@@ -256,7 +314,10 @@ static int pci_bios_write(unsigned int seg, unsigned int bus,
26020
26021 switch (len) {
26022 case 1:
26023- __asm__("lcall *(%%esi); cld\n\t"
26024+ __asm__("movw %w6, %%ds\n\t"
26025+ "lcall *%%ss:(%%esi); cld\n\t"
26026+ "push %%ss\n\t"
26027+ "pop %%ds\n\t"
26028 "jc 1f\n\t"
26029 "xor %%ah, %%ah\n"
26030 "1:"
26031@@ -265,10 +326,14 @@ static int pci_bios_write(unsigned int seg, unsigned int bus,
26032 "c" (value),
26033 "b" (bx),
26034 "D" ((long)reg),
26035- "S" (&pci_indirect));
26036+ "S" (&pci_indirect),
26037+ "r" (__PCIBIOS_DS));
26038 break;
26039 case 2:
26040- __asm__("lcall *(%%esi); cld\n\t"
26041+ __asm__("movw %w6, %%ds\n\t"
26042+ "lcall *%%ss:(%%esi); cld\n\t"
26043+ "push %%ss\n\t"
26044+ "pop %%ds\n\t"
26045 "jc 1f\n\t"
26046 "xor %%ah, %%ah\n"
26047 "1:"
26048@@ -277,10 +342,14 @@ static int pci_bios_write(unsigned int seg, unsigned int bus,
26049 "c" (value),
26050 "b" (bx),
26051 "D" ((long)reg),
26052- "S" (&pci_indirect));
26053+ "S" (&pci_indirect),
26054+ "r" (__PCIBIOS_DS));
26055 break;
26056 case 4:
26057- __asm__("lcall *(%%esi); cld\n\t"
26058+ __asm__("movw %w6, %%ds\n\t"
26059+ "lcall *%%ss:(%%esi); cld\n\t"
26060+ "push %%ss\n\t"
26061+ "pop %%ds\n\t"
26062 "jc 1f\n\t"
26063 "xor %%ah, %%ah\n"
26064 "1:"
26065@@ -289,7 +358,8 @@ static int pci_bios_write(unsigned int seg, unsigned int bus,
26066 "c" (value),
26067 "b" (bx),
26068 "D" ((long)reg),
26069- "S" (&pci_indirect));
26070+ "S" (&pci_indirect),
26071+ "r" (__PCIBIOS_DS));
26072 break;
26073 }
26074
26075@@ -394,10 +464,13 @@ struct irq_routing_table * pcibios_get_irq_routing_table(void)
26076
26077 DBG("PCI: Fetching IRQ routing table... ");
26078 __asm__("push %%es\n\t"
26079+ "movw %w8, %%ds\n\t"
26080 "push %%ds\n\t"
26081 "pop %%es\n\t"
26082- "lcall *(%%esi); cld\n\t"
26083+ "lcall *%%ss:(%%esi); cld\n\t"
26084 "pop %%es\n\t"
26085+ "push %%ss\n\t"
26086+ "pop %%ds\n"
26087 "jc 1f\n\t"
26088 "xor %%ah, %%ah\n"
26089 "1:"
26090@@ -408,7 +481,8 @@ struct irq_routing_table * pcibios_get_irq_routing_table(void)
26091 "1" (0),
26092 "D" ((long) &opt),
26093 "S" (&pci_indirect),
26094- "m" (opt)
26095+ "m" (opt),
26096+ "r" (__PCIBIOS_DS)
26097 : "memory");
26098 DBG("OK ret=%d, size=%d, map=%x\n", ret, opt.size, map);
26099 if (ret & 0xff00)
26100@@ -432,7 +506,10 @@ int pcibios_set_irq_routing(struct pci_dev *dev, int pin, int irq)
26101 {
26102 int ret;
26103
26104- __asm__("lcall *(%%esi); cld\n\t"
26105+ __asm__("movw %w5, %%ds\n\t"
26106+ "lcall *%%ss:(%%esi); cld\n\t"
26107+ "push %%ss\n\t"
26108+ "pop %%ds\n"
26109 "jc 1f\n\t"
26110 "xor %%ah, %%ah\n"
26111 "1:"
26112@@ -440,7 +517,8 @@ int pcibios_set_irq_routing(struct pci_dev *dev, int pin, int irq)
26113 : "0" (PCIBIOS_SET_PCI_HW_INT),
26114 "b" ((dev->bus->number << 8) | dev->devfn),
26115 "c" ((irq << 8) | (pin + 10)),
26116- "S" (&pci_indirect));
26117+ "S" (&pci_indirect),
26118+ "r" (__PCIBIOS_DS));
26119 return !(ret & 0xff00);
26120 }
26121 EXPORT_SYMBOL(pcibios_set_irq_routing);
26122diff --git a/arch/x86/platform/efi/efi_32.c b/arch/x86/platform/efi/efi_32.c
26123index 40e4469..1ab536e 100644
26124--- a/arch/x86/platform/efi/efi_32.c
26125+++ b/arch/x86/platform/efi/efi_32.c
26126@@ -44,11 +44,22 @@ void efi_call_phys_prelog(void)
26127 {
26128 struct desc_ptr gdt_descr;
26129
26130+#ifdef CONFIG_PAX_KERNEXEC
26131+ struct desc_struct d;
26132+#endif
26133+
26134 local_irq_save(efi_rt_eflags);
26135
26136 load_cr3(initial_page_table);
26137 __flush_tlb_all();
26138
26139+#ifdef CONFIG_PAX_KERNEXEC
26140+ pack_descriptor(&d, 0, 0xFFFFF, 0x9B, 0xC);
26141+ write_gdt_entry(get_cpu_gdt_table(0), GDT_ENTRY_KERNEXEC_EFI_CS, &d, DESCTYPE_S);
26142+ pack_descriptor(&d, 0, 0xFFFFF, 0x93, 0xC);
26143+ write_gdt_entry(get_cpu_gdt_table(0), GDT_ENTRY_KERNEXEC_EFI_DS, &d, DESCTYPE_S);
26144+#endif
26145+
26146 gdt_descr.address = __pa(get_cpu_gdt_table(0));
26147 gdt_descr.size = GDT_SIZE - 1;
26148 load_gdt(&gdt_descr);
26149@@ -58,6 +69,14 @@ void efi_call_phys_epilog(void)
26150 {
26151 struct desc_ptr gdt_descr;
26152
26153+#ifdef CONFIG_PAX_KERNEXEC
26154+ struct desc_struct d;
26155+
26156+ memset(&d, 0, sizeof d);
26157+ write_gdt_entry(get_cpu_gdt_table(0), GDT_ENTRY_KERNEXEC_EFI_CS, &d, DESCTYPE_S);
26158+ write_gdt_entry(get_cpu_gdt_table(0), GDT_ENTRY_KERNEXEC_EFI_DS, &d, DESCTYPE_S);
26159+#endif
26160+
26161 gdt_descr.address = (unsigned long)get_cpu_gdt_table(0);
26162 gdt_descr.size = GDT_SIZE - 1;
26163 load_gdt(&gdt_descr);
26164diff --git a/arch/x86/platform/efi/efi_stub_32.S b/arch/x86/platform/efi/efi_stub_32.S
26165index fbe66e6..c5c0dd2 100644
26166--- a/arch/x86/platform/efi/efi_stub_32.S
26167+++ b/arch/x86/platform/efi/efi_stub_32.S
26168@@ -6,7 +6,9 @@
26169 */
26170
26171 #include <linux/linkage.h>
26172+#include <linux/init.h>
26173 #include <asm/page_types.h>
26174+#include <asm/segment.h>
26175
26176 /*
26177 * efi_call_phys(void *, ...) is a function with variable parameters.
26178@@ -20,7 +22,7 @@
26179 * service functions will comply with gcc calling convention, too.
26180 */
26181
26182-.text
26183+__INIT
26184 ENTRY(efi_call_phys)
26185 /*
26186 * 0. The function can only be called in Linux kernel. So CS has been
26187@@ -36,9 +38,11 @@ ENTRY(efi_call_phys)
26188 * The mapping of lower virtual memory has been created in prelog and
26189 * epilog.
26190 */
26191- movl $1f, %edx
26192- subl $__PAGE_OFFSET, %edx
26193- jmp *%edx
26194+ movl $(__KERNEXEC_EFI_DS), %edx
26195+ mov %edx, %ds
26196+ mov %edx, %es
26197+ mov %edx, %ss
26198+ ljmp $(__KERNEXEC_EFI_CS),$1f-__PAGE_OFFSET
26199 1:
26200
26201 /*
26202@@ -47,14 +51,8 @@ ENTRY(efi_call_phys)
26203 * parameter 2, ..., param n. To make things easy, we save the return
26204 * address of efi_call_phys in a global variable.
26205 */
26206- popl %edx
26207- movl %edx, saved_return_addr
26208- /* get the function pointer into ECX*/
26209- popl %ecx
26210- movl %ecx, efi_rt_function_ptr
26211- movl $2f, %edx
26212- subl $__PAGE_OFFSET, %edx
26213- pushl %edx
26214+ popl (saved_return_addr)
26215+ popl (efi_rt_function_ptr)
26216
26217 /*
26218 * 3. Clear PG bit in %CR0.
26219@@ -73,9 +71,8 @@ ENTRY(efi_call_phys)
26220 /*
26221 * 5. Call the physical function.
26222 */
26223- jmp *%ecx
26224+ call *(efi_rt_function_ptr-__PAGE_OFFSET)
26225
26226-2:
26227 /*
26228 * 6. After EFI runtime service returns, control will return to
26229 * following instruction. We'd better readjust stack pointer first.
26230@@ -88,35 +85,32 @@ ENTRY(efi_call_phys)
26231 movl %cr0, %edx
26232 orl $0x80000000, %edx
26233 movl %edx, %cr0
26234- jmp 1f
26235-1:
26236+
26237 /*
26238 * 8. Now restore the virtual mode from flat mode by
26239 * adding EIP with PAGE_OFFSET.
26240 */
26241- movl $1f, %edx
26242- jmp *%edx
26243+ ljmp $(__KERNEL_CS),$1f+__PAGE_OFFSET
26244 1:
26245+ movl $(__KERNEL_DS), %edx
26246+ mov %edx, %ds
26247+ mov %edx, %es
26248+ mov %edx, %ss
26249
26250 /*
26251 * 9. Balance the stack. And because EAX contain the return value,
26252 * we'd better not clobber it.
26253 */
26254- leal efi_rt_function_ptr, %edx
26255- movl (%edx), %ecx
26256- pushl %ecx
26257+ pushl (efi_rt_function_ptr)
26258
26259 /*
26260- * 10. Push the saved return address onto the stack and return.
26261+ * 10. Return to the saved return address.
26262 */
26263- leal saved_return_addr, %edx
26264- movl (%edx), %ecx
26265- pushl %ecx
26266- ret
26267+ jmpl *(saved_return_addr)
26268 ENDPROC(efi_call_phys)
26269 .previous
26270
26271-.data
26272+__INITDATA
26273 saved_return_addr:
26274 .long 0
26275 efi_rt_function_ptr:
26276diff --git a/arch/x86/platform/efi/efi_stub_64.S b/arch/x86/platform/efi/efi_stub_64.S
26277index 4c07cca..2c8427d 100644
26278--- a/arch/x86/platform/efi/efi_stub_64.S
26279+++ b/arch/x86/platform/efi/efi_stub_64.S
26280@@ -7,6 +7,7 @@
26281 */
26282
26283 #include <linux/linkage.h>
26284+#include <asm/alternative-asm.h>
26285
26286 #define SAVE_XMM \
26287 mov %rsp, %rax; \
26288@@ -40,6 +41,7 @@ ENTRY(efi_call0)
26289 call *%rdi
26290 addq $32, %rsp
26291 RESTORE_XMM
26292+ pax_force_retaddr 0, 1
26293 ret
26294 ENDPROC(efi_call0)
26295
26296@@ -50,6 +52,7 @@ ENTRY(efi_call1)
26297 call *%rdi
26298 addq $32, %rsp
26299 RESTORE_XMM
26300+ pax_force_retaddr 0, 1
26301 ret
26302 ENDPROC(efi_call1)
26303
26304@@ -60,6 +63,7 @@ ENTRY(efi_call2)
26305 call *%rdi
26306 addq $32, %rsp
26307 RESTORE_XMM
26308+ pax_force_retaddr 0, 1
26309 ret
26310 ENDPROC(efi_call2)
26311
26312@@ -71,6 +75,7 @@ ENTRY(efi_call3)
26313 call *%rdi
26314 addq $32, %rsp
26315 RESTORE_XMM
26316+ pax_force_retaddr 0, 1
26317 ret
26318 ENDPROC(efi_call3)
26319
26320@@ -83,6 +88,7 @@ ENTRY(efi_call4)
26321 call *%rdi
26322 addq $32, %rsp
26323 RESTORE_XMM
26324+ pax_force_retaddr 0, 1
26325 ret
26326 ENDPROC(efi_call4)
26327
26328@@ -96,6 +102,7 @@ ENTRY(efi_call5)
26329 call *%rdi
26330 addq $48, %rsp
26331 RESTORE_XMM
26332+ pax_force_retaddr 0, 1
26333 ret
26334 ENDPROC(efi_call5)
26335
26336@@ -112,5 +119,6 @@ ENTRY(efi_call6)
26337 call *%rdi
26338 addq $48, %rsp
26339 RESTORE_XMM
26340+ pax_force_retaddr 0, 1
26341 ret
26342 ENDPROC(efi_call6)
26343diff --git a/arch/x86/platform/mrst/mrst.c b/arch/x86/platform/mrst/mrst.c
26344index ad4ec1c..686479e 100644
26345--- a/arch/x86/platform/mrst/mrst.c
26346+++ b/arch/x86/platform/mrst/mrst.c
26347@@ -76,18 +76,20 @@ struct sfi_rtc_table_entry sfi_mrtc_array[SFI_MRTC_MAX];
26348 EXPORT_SYMBOL_GPL(sfi_mrtc_array);
26349 int sfi_mrtc_num;
26350
26351-static void mrst_power_off(void)
26352+static __noreturn void mrst_power_off(void)
26353 {
26354 if (__mrst_cpu_chip == MRST_CPU_CHIP_LINCROFT)
26355 intel_scu_ipc_simple_command(IPCMSG_COLD_RESET, 1);
26356+ BUG();
26357 }
26358
26359-static void mrst_reboot(void)
26360+static __noreturn void mrst_reboot(void)
26361 {
26362 if (__mrst_cpu_chip == MRST_CPU_CHIP_LINCROFT)
26363 intel_scu_ipc_simple_command(IPCMSG_COLD_RESET, 0);
26364 else
26365 intel_scu_ipc_simple_command(IPCMSG_COLD_BOOT, 0);
26366+ BUG();
26367 }
26368
26369 /* parse all the mtimer info to a static mtimer array */
26370diff --git a/arch/x86/platform/uv/tlb_uv.c b/arch/x86/platform/uv/tlb_uv.c
26371index 81aee5a..9ad9aae 100644
26372--- a/arch/x86/platform/uv/tlb_uv.c
26373+++ b/arch/x86/platform/uv/tlb_uv.c
26374@@ -1433,6 +1433,8 @@ static ssize_t tunables_read(struct file *file, char __user *userbuf,
26375 * 0: display meaning of the statistics
26376 */
26377 static ssize_t ptc_proc_write(struct file *file, const char __user *user,
26378+ size_t count, loff_t *data) __size_overflow(3);
26379+static ssize_t ptc_proc_write(struct file *file, const char __user *user,
26380 size_t count, loff_t *data)
26381 {
26382 int cpu;
26383@@ -1548,6 +1550,8 @@ static int parse_tunables_write(struct bau_control *bcp, char *instr,
26384 * Handle a write to debugfs. (/sys/kernel/debug/sgi_uv/bau_tunables)
26385 */
26386 static ssize_t tunables_write(struct file *file, const char __user *user,
26387+ size_t count, loff_t *data) __size_overflow(3);
26388+static ssize_t tunables_write(struct file *file, const char __user *user,
26389 size_t count, loff_t *data)
26390 {
26391 int cpu;
26392diff --git a/arch/x86/power/cpu.c b/arch/x86/power/cpu.c
26393index f10c0af..3ec1f95 100644
26394--- a/arch/x86/power/cpu.c
26395+++ b/arch/x86/power/cpu.c
26396@@ -131,7 +131,7 @@ static void do_fpu_end(void)
26397 static void fix_processor_context(void)
26398 {
26399 int cpu = smp_processor_id();
26400- struct tss_struct *t = &per_cpu(init_tss, cpu);
26401+ struct tss_struct *t = init_tss + cpu;
26402
26403 set_tss_desc(cpu, t); /*
26404 * This just modifies memory; should not be
26405@@ -141,7 +141,9 @@ static void fix_processor_context(void)
26406 */
26407
26408 #ifdef CONFIG_X86_64
26409+ pax_open_kernel();
26410 get_cpu_gdt_table(cpu)[GDT_ENTRY_TSS].type = 9;
26411+ pax_close_kernel();
26412
26413 syscall_init(); /* This sets MSR_*STAR and related */
26414 #endif
26415diff --git a/arch/x86/vdso/Makefile b/arch/x86/vdso/Makefile
26416index 5d17950..2253fc9 100644
26417--- a/arch/x86/vdso/Makefile
26418+++ b/arch/x86/vdso/Makefile
26419@@ -137,7 +137,7 @@ quiet_cmd_vdso = VDSO $@
26420 -Wl,-T,$(filter %.lds,$^) $(filter %.o,$^) && \
26421 sh $(srctree)/$(src)/checkundef.sh '$(NM)' '$@'
26422
26423-VDSO_LDFLAGS = -fPIC -shared $(call cc-ldoption, -Wl$(comma)--hash-style=sysv)
26424+VDSO_LDFLAGS = -fPIC -shared -Wl,--no-undefined $(call cc-ldoption, -Wl$(comma)--hash-style=sysv)
26425 GCOV_PROFILE := n
26426
26427 #
26428diff --git a/arch/x86/vdso/vdso32-setup.c b/arch/x86/vdso/vdso32-setup.c
26429index 468d591..8e80a0a 100644
26430--- a/arch/x86/vdso/vdso32-setup.c
26431+++ b/arch/x86/vdso/vdso32-setup.c
26432@@ -25,6 +25,7 @@
26433 #include <asm/tlbflush.h>
26434 #include <asm/vdso.h>
26435 #include <asm/proto.h>
26436+#include <asm/mman.h>
26437
26438 enum {
26439 VDSO_DISABLED = 0,
26440@@ -226,7 +227,7 @@ static inline void map_compat_vdso(int map)
26441 void enable_sep_cpu(void)
26442 {
26443 int cpu = get_cpu();
26444- struct tss_struct *tss = &per_cpu(init_tss, cpu);
26445+ struct tss_struct *tss = init_tss + cpu;
26446
26447 if (!boot_cpu_has(X86_FEATURE_SEP)) {
26448 put_cpu();
26449@@ -249,7 +250,7 @@ static int __init gate_vma_init(void)
26450 gate_vma.vm_start = FIXADDR_USER_START;
26451 gate_vma.vm_end = FIXADDR_USER_END;
26452 gate_vma.vm_flags = VM_READ | VM_MAYREAD | VM_EXEC | VM_MAYEXEC;
26453- gate_vma.vm_page_prot = __P101;
26454+ gate_vma.vm_page_prot = vm_get_page_prot(gate_vma.vm_flags);
26455 /*
26456 * Make sure the vDSO gets into every core dump.
26457 * Dumping its contents makes post-mortem fully interpretable later
26458@@ -331,14 +332,14 @@ int arch_setup_additional_pages(struct linux_binprm *bprm, int uses_interp)
26459 if (compat)
26460 addr = VDSO_HIGH_BASE;
26461 else {
26462- addr = get_unmapped_area(NULL, 0, PAGE_SIZE, 0, 0);
26463+ addr = get_unmapped_area(NULL, 0, PAGE_SIZE, 0, MAP_EXECUTABLE);
26464 if (IS_ERR_VALUE(addr)) {
26465 ret = addr;
26466 goto up_fail;
26467 }
26468 }
26469
26470- current->mm->context.vdso = (void *)addr;
26471+ current->mm->context.vdso = addr;
26472
26473 if (compat_uses_vma || !compat) {
26474 /*
26475@@ -361,11 +362,11 @@ int arch_setup_additional_pages(struct linux_binprm *bprm, int uses_interp)
26476 }
26477
26478 current_thread_info()->sysenter_return =
26479- VDSO32_SYMBOL(addr, SYSENTER_RETURN);
26480+ (__force void __user *)VDSO32_SYMBOL(addr, SYSENTER_RETURN);
26481
26482 up_fail:
26483 if (ret)
26484- current->mm->context.vdso = NULL;
26485+ current->mm->context.vdso = 0;
26486
26487 up_write(&mm->mmap_sem);
26488
26489@@ -412,8 +413,14 @@ __initcall(ia32_binfmt_init);
26490
26491 const char *arch_vma_name(struct vm_area_struct *vma)
26492 {
26493- if (vma->vm_mm && vma->vm_start == (long)vma->vm_mm->context.vdso)
26494+ if (vma->vm_mm && vma->vm_start == vma->vm_mm->context.vdso)
26495 return "[vdso]";
26496+
26497+#ifdef CONFIG_PAX_SEGMEXEC
26498+ if (vma->vm_mm && vma->vm_mirror && vma->vm_mirror->vm_start == vma->vm_mm->context.vdso)
26499+ return "[vdso]";
26500+#endif
26501+
26502 return NULL;
26503 }
26504
26505@@ -423,7 +430,7 @@ struct vm_area_struct *get_gate_vma(struct mm_struct *mm)
26506 * Check to see if the corresponding task was created in compat vdso
26507 * mode.
26508 */
26509- if (mm && mm->context.vdso == (void *)VDSO_HIGH_BASE)
26510+ if (mm && mm->context.vdso == VDSO_HIGH_BASE)
26511 return &gate_vma;
26512 return NULL;
26513 }
26514diff --git a/arch/x86/vdso/vma.c b/arch/x86/vdso/vma.c
26515index 153407c..611cba9 100644
26516--- a/arch/x86/vdso/vma.c
26517+++ b/arch/x86/vdso/vma.c
26518@@ -16,8 +16,6 @@
26519 #include <asm/vdso.h>
26520 #include <asm/page.h>
26521
26522-unsigned int __read_mostly vdso_enabled = 1;
26523-
26524 extern char vdso_start[], vdso_end[];
26525 extern unsigned short vdso_sync_cpuid;
26526
26527@@ -96,7 +94,6 @@ static unsigned long vdso_addr(unsigned long start, unsigned len)
26528 * unaligned here as a result of stack start randomization.
26529 */
26530 addr = PAGE_ALIGN(addr);
26531- addr = align_addr(addr, NULL, ALIGN_VDSO);
26532
26533 return addr;
26534 }
26535@@ -106,40 +103,35 @@ static unsigned long vdso_addr(unsigned long start, unsigned len)
26536 int arch_setup_additional_pages(struct linux_binprm *bprm, int uses_interp)
26537 {
26538 struct mm_struct *mm = current->mm;
26539- unsigned long addr;
26540+ unsigned long addr = 0;
26541 int ret;
26542
26543- if (!vdso_enabled)
26544- return 0;
26545-
26546 down_write(&mm->mmap_sem);
26547+
26548+#ifdef CONFIG_PAX_RANDMMAP
26549+ if (!(mm->pax_flags & MF_PAX_RANDMMAP))
26550+#endif
26551+
26552 addr = vdso_addr(mm->start_stack, vdso_size);
26553+ addr = align_addr(addr, NULL, ALIGN_VDSO);
26554 addr = get_unmapped_area(NULL, addr, vdso_size, 0, 0);
26555 if (IS_ERR_VALUE(addr)) {
26556 ret = addr;
26557 goto up_fail;
26558 }
26559
26560- current->mm->context.vdso = (void *)addr;
26561+ mm->context.vdso = addr;
26562
26563 ret = install_special_mapping(mm, addr, vdso_size,
26564 VM_READ|VM_EXEC|
26565 VM_MAYREAD|VM_MAYWRITE|VM_MAYEXEC|
26566 VM_ALWAYSDUMP,
26567 vdso_pages);
26568- if (ret) {
26569- current->mm->context.vdso = NULL;
26570- goto up_fail;
26571- }
26572+
26573+ if (ret)
26574+ mm->context.vdso = 0;
26575
26576 up_fail:
26577 up_write(&mm->mmap_sem);
26578 return ret;
26579 }
26580-
26581-static __init int vdso_setup(char *s)
26582-{
26583- vdso_enabled = simple_strtoul(s, NULL, 0);
26584- return 0;
26585-}
26586-__setup("vdso=", vdso_setup);
26587diff --git a/arch/x86/xen/enlighten.c b/arch/x86/xen/enlighten.c
26588index 1f92865..c843b20 100644
26589--- a/arch/x86/xen/enlighten.c
26590+++ b/arch/x86/xen/enlighten.c
26591@@ -85,8 +85,6 @@ EXPORT_SYMBOL_GPL(xen_start_info);
26592
26593 struct shared_info xen_dummy_shared_info;
26594
26595-void *xen_initial_gdt;
26596-
26597 RESERVE_BRK(shared_info_page_brk, PAGE_SIZE);
26598 __read_mostly int xen_have_vector_callback;
26599 EXPORT_SYMBOL_GPL(xen_have_vector_callback);
26600@@ -1029,7 +1027,7 @@ static const struct pv_apic_ops xen_apic_ops __initconst = {
26601 #endif
26602 };
26603
26604-static void xen_reboot(int reason)
26605+static __noreturn void xen_reboot(int reason)
26606 {
26607 struct sched_shutdown r = { .reason = reason };
26608
26609@@ -1037,17 +1035,17 @@ static void xen_reboot(int reason)
26610 BUG();
26611 }
26612
26613-static void xen_restart(char *msg)
26614+static __noreturn void xen_restart(char *msg)
26615 {
26616 xen_reboot(SHUTDOWN_reboot);
26617 }
26618
26619-static void xen_emergency_restart(void)
26620+static __noreturn void xen_emergency_restart(void)
26621 {
26622 xen_reboot(SHUTDOWN_reboot);
26623 }
26624
26625-static void xen_machine_halt(void)
26626+static __noreturn void xen_machine_halt(void)
26627 {
26628 xen_reboot(SHUTDOWN_poweroff);
26629 }
26630@@ -1153,7 +1151,17 @@ asmlinkage void __init xen_start_kernel(void)
26631 __userpte_alloc_gfp &= ~__GFP_HIGHMEM;
26632
26633 /* Work out if we support NX */
26634- x86_configure_nx();
26635+#if defined(CONFIG_X86_64) || defined(CONFIG_X86_PAE)
26636+ if ((cpuid_eax(0x80000000) & 0xffff0000) == 0x80000000 &&
26637+ (cpuid_edx(0x80000001) & (1U << (X86_FEATURE_NX & 31)))) {
26638+ unsigned l, h;
26639+
26640+ __supported_pte_mask |= _PAGE_NX;
26641+ rdmsr(MSR_EFER, l, h);
26642+ l |= EFER_NX;
26643+ wrmsr(MSR_EFER, l, h);
26644+ }
26645+#endif
26646
26647 xen_setup_features();
26648
26649@@ -1184,13 +1192,6 @@ asmlinkage void __init xen_start_kernel(void)
26650
26651 machine_ops = xen_machine_ops;
26652
26653- /*
26654- * The only reliable way to retain the initial address of the
26655- * percpu gdt_page is to remember it here, so we can go and
26656- * mark it RW later, when the initial percpu area is freed.
26657- */
26658- xen_initial_gdt = &per_cpu(gdt_page, 0);
26659-
26660 xen_smp_init();
26661
26662 #ifdef CONFIG_ACPI_NUMA
26663diff --git a/arch/x86/xen/mmu.c b/arch/x86/xen/mmu.c
26664index 87f6673..e2555a6 100644
26665--- a/arch/x86/xen/mmu.c
26666+++ b/arch/x86/xen/mmu.c
26667@@ -1733,6 +1733,9 @@ pgd_t * __init xen_setup_kernel_pagetable(pgd_t *pgd,
26668 convert_pfn_mfn(init_level4_pgt);
26669 convert_pfn_mfn(level3_ident_pgt);
26670 convert_pfn_mfn(level3_kernel_pgt);
26671+ convert_pfn_mfn(level3_vmalloc_start_pgt);
26672+ convert_pfn_mfn(level3_vmalloc_end_pgt);
26673+ convert_pfn_mfn(level3_vmemmap_pgt);
26674
26675 l3 = m2v(pgd[pgd_index(__START_KERNEL_map)].pgd);
26676 l2 = m2v(l3[pud_index(__START_KERNEL_map)].pud);
26677@@ -1751,7 +1754,11 @@ pgd_t * __init xen_setup_kernel_pagetable(pgd_t *pgd,
26678 set_page_prot(init_level4_pgt, PAGE_KERNEL_RO);
26679 set_page_prot(level3_ident_pgt, PAGE_KERNEL_RO);
26680 set_page_prot(level3_kernel_pgt, PAGE_KERNEL_RO);
26681+ set_page_prot(level3_vmalloc_start_pgt, PAGE_KERNEL_RO);
26682+ set_page_prot(level3_vmalloc_end_pgt, PAGE_KERNEL_RO);
26683+ set_page_prot(level3_vmemmap_pgt, PAGE_KERNEL_RO);
26684 set_page_prot(level3_user_vsyscall, PAGE_KERNEL_RO);
26685+ set_page_prot(level2_vmemmap_pgt, PAGE_KERNEL_RO);
26686 set_page_prot(level2_kernel_pgt, PAGE_KERNEL_RO);
26687 set_page_prot(level2_fixmap_pgt, PAGE_KERNEL_RO);
26688
26689@@ -1962,6 +1969,7 @@ static void __init xen_post_allocator_init(void)
26690 pv_mmu_ops.set_pud = xen_set_pud;
26691 #if PAGETABLE_LEVELS == 4
26692 pv_mmu_ops.set_pgd = xen_set_pgd;
26693+ pv_mmu_ops.set_pgd_batched = xen_set_pgd;
26694 #endif
26695
26696 /* This will work as long as patching hasn't happened yet
26697@@ -2043,6 +2051,7 @@ static const struct pv_mmu_ops xen_mmu_ops __initconst = {
26698 .pud_val = PV_CALLEE_SAVE(xen_pud_val),
26699 .make_pud = PV_CALLEE_SAVE(xen_make_pud),
26700 .set_pgd = xen_set_pgd_hyper,
26701+ .set_pgd_batched = xen_set_pgd_hyper,
26702
26703 .alloc_pud = xen_alloc_pmd_init,
26704 .release_pud = xen_release_pmd_init,
26705diff --git a/arch/x86/xen/smp.c b/arch/x86/xen/smp.c
26706index 041d4fe..7666b7e 100644
26707--- a/arch/x86/xen/smp.c
26708+++ b/arch/x86/xen/smp.c
26709@@ -194,11 +194,6 @@ static void __init xen_smp_prepare_boot_cpu(void)
26710 {
26711 BUG_ON(smp_processor_id() != 0);
26712 native_smp_prepare_boot_cpu();
26713-
26714- /* We've switched to the "real" per-cpu gdt, so make sure the
26715- old memory can be recycled */
26716- make_lowmem_page_readwrite(xen_initial_gdt);
26717-
26718 xen_filter_cpu_maps();
26719 xen_setup_vcpu_info_placement();
26720 }
26721@@ -275,12 +270,12 @@ cpu_initialize_context(unsigned int cpu, struct task_struct *idle)
26722 gdt = get_cpu_gdt_table(cpu);
26723
26724 ctxt->flags = VGCF_IN_KERNEL;
26725- ctxt->user_regs.ds = __USER_DS;
26726- ctxt->user_regs.es = __USER_DS;
26727+ ctxt->user_regs.ds = __KERNEL_DS;
26728+ ctxt->user_regs.es = __KERNEL_DS;
26729 ctxt->user_regs.ss = __KERNEL_DS;
26730 #ifdef CONFIG_X86_32
26731 ctxt->user_regs.fs = __KERNEL_PERCPU;
26732- ctxt->user_regs.gs = __KERNEL_STACK_CANARY;
26733+ savesegment(gs, ctxt->user_regs.gs);
26734 #else
26735 ctxt->gs_base_kernel = per_cpu_offset(cpu);
26736 #endif
26737@@ -331,13 +326,12 @@ static int __cpuinit xen_cpu_up(unsigned int cpu)
26738 int rc;
26739
26740 per_cpu(current_task, cpu) = idle;
26741+ per_cpu(current_tinfo, cpu) = &idle->tinfo;
26742 #ifdef CONFIG_X86_32
26743 irq_ctx_init(cpu);
26744 #else
26745 clear_tsk_thread_flag(idle, TIF_FORK);
26746- per_cpu(kernel_stack, cpu) =
26747- (unsigned long)task_stack_page(idle) -
26748- KERNEL_STACK_OFFSET + THREAD_SIZE;
26749+ per_cpu(kernel_stack, cpu) = (unsigned long)task_stack_page(idle) - 16 + THREAD_SIZE;
26750 #endif
26751 xen_setup_runstate_info(cpu);
26752 xen_setup_timer(cpu);
26753diff --git a/arch/x86/xen/xen-asm_32.S b/arch/x86/xen/xen-asm_32.S
26754index b040b0e..8cc4fe0 100644
26755--- a/arch/x86/xen/xen-asm_32.S
26756+++ b/arch/x86/xen/xen-asm_32.S
26757@@ -83,14 +83,14 @@ ENTRY(xen_iret)
26758 ESP_OFFSET=4 # bytes pushed onto stack
26759
26760 /*
26761- * Store vcpu_info pointer for easy access. Do it this way to
26762- * avoid having to reload %fs
26763+ * Store vcpu_info pointer for easy access.
26764 */
26765 #ifdef CONFIG_SMP
26766- GET_THREAD_INFO(%eax)
26767- movl TI_cpu(%eax), %eax
26768- movl __per_cpu_offset(,%eax,4), %eax
26769- mov xen_vcpu(%eax), %eax
26770+ push %fs
26771+ mov $(__KERNEL_PERCPU), %eax
26772+ mov %eax, %fs
26773+ mov PER_CPU_VAR(xen_vcpu), %eax
26774+ pop %fs
26775 #else
26776 movl xen_vcpu, %eax
26777 #endif
26778diff --git a/arch/x86/xen/xen-head.S b/arch/x86/xen/xen-head.S
26779index aaa7291..3f77960 100644
26780--- a/arch/x86/xen/xen-head.S
26781+++ b/arch/x86/xen/xen-head.S
26782@@ -19,6 +19,17 @@ ENTRY(startup_xen)
26783 #ifdef CONFIG_X86_32
26784 mov %esi,xen_start_info
26785 mov $init_thread_union+THREAD_SIZE,%esp
26786+#ifdef CONFIG_SMP
26787+ movl $cpu_gdt_table,%edi
26788+ movl $__per_cpu_load,%eax
26789+ movw %ax,__KERNEL_PERCPU + 2(%edi)
26790+ rorl $16,%eax
26791+ movb %al,__KERNEL_PERCPU + 4(%edi)
26792+ movb %ah,__KERNEL_PERCPU + 7(%edi)
26793+ movl $__per_cpu_end - 1,%eax
26794+ subl $__per_cpu_start,%eax
26795+ movw %ax,__KERNEL_PERCPU + 0(%edi)
26796+#endif
26797 #else
26798 mov %rsi,xen_start_info
26799 mov $init_thread_union+THREAD_SIZE,%rsp
26800diff --git a/arch/x86/xen/xen-ops.h b/arch/x86/xen/xen-ops.h
26801index b095739..8c17bcd 100644
26802--- a/arch/x86/xen/xen-ops.h
26803+++ b/arch/x86/xen/xen-ops.h
26804@@ -10,8 +10,6 @@
26805 extern const char xen_hypervisor_callback[];
26806 extern const char xen_failsafe_callback[];
26807
26808-extern void *xen_initial_gdt;
26809-
26810 struct trap_info;
26811 void xen_copy_trap_info(struct trap_info *traps);
26812
26813diff --git a/arch/xtensa/variants/dc232b/include/variant/core.h b/arch/xtensa/variants/dc232b/include/variant/core.h
26814index 525bd3d..ef888b1 100644
26815--- a/arch/xtensa/variants/dc232b/include/variant/core.h
26816+++ b/arch/xtensa/variants/dc232b/include/variant/core.h
26817@@ -119,9 +119,9 @@
26818 ----------------------------------------------------------------------*/
26819
26820 #define XCHAL_ICACHE_LINESIZE 32 /* I-cache line size in bytes */
26821-#define XCHAL_DCACHE_LINESIZE 32 /* D-cache line size in bytes */
26822 #define XCHAL_ICACHE_LINEWIDTH 5 /* log2(I line size in bytes) */
26823 #define XCHAL_DCACHE_LINEWIDTH 5 /* log2(D line size in bytes) */
26824+#define XCHAL_DCACHE_LINESIZE (_AC(1,UL) << XCHAL_DCACHE_LINEWIDTH) /* D-cache line size in bytes */
26825
26826 #define XCHAL_ICACHE_SIZE 16384 /* I-cache size in bytes or 0 */
26827 #define XCHAL_DCACHE_SIZE 16384 /* D-cache size in bytes or 0 */
26828diff --git a/arch/xtensa/variants/fsf/include/variant/core.h b/arch/xtensa/variants/fsf/include/variant/core.h
26829index 2f33760..835e50a 100644
26830--- a/arch/xtensa/variants/fsf/include/variant/core.h
26831+++ b/arch/xtensa/variants/fsf/include/variant/core.h
26832@@ -11,6 +11,7 @@
26833 #ifndef _XTENSA_CORE_H
26834 #define _XTENSA_CORE_H
26835
26836+#include <linux/const.h>
26837
26838 /****************************************************************************
26839 Parameters Useful for Any Code, USER or PRIVILEGED
26840@@ -112,9 +113,9 @@
26841 ----------------------------------------------------------------------*/
26842
26843 #define XCHAL_ICACHE_LINESIZE 16 /* I-cache line size in bytes */
26844-#define XCHAL_DCACHE_LINESIZE 16 /* D-cache line size in bytes */
26845 #define XCHAL_ICACHE_LINEWIDTH 4 /* log2(I line size in bytes) */
26846 #define XCHAL_DCACHE_LINEWIDTH 4 /* log2(D line size in bytes) */
26847+#define XCHAL_DCACHE_LINESIZE (_AC(1,UL) << XCHAL_DCACHE_LINEWIDTH) /* D-cache line size in bytes */
26848
26849 #define XCHAL_ICACHE_SIZE 8192 /* I-cache size in bytes or 0 */
26850 #define XCHAL_DCACHE_SIZE 8192 /* D-cache size in bytes or 0 */
26851diff --git a/arch/xtensa/variants/s6000/include/variant/core.h b/arch/xtensa/variants/s6000/include/variant/core.h
26852index af00795..2bb8105 100644
26853--- a/arch/xtensa/variants/s6000/include/variant/core.h
26854+++ b/arch/xtensa/variants/s6000/include/variant/core.h
26855@@ -11,6 +11,7 @@
26856 #ifndef _XTENSA_CORE_CONFIGURATION_H
26857 #define _XTENSA_CORE_CONFIGURATION_H
26858
26859+#include <linux/const.h>
26860
26861 /****************************************************************************
26862 Parameters Useful for Any Code, USER or PRIVILEGED
26863@@ -118,9 +119,9 @@
26864 ----------------------------------------------------------------------*/
26865
26866 #define XCHAL_ICACHE_LINESIZE 16 /* I-cache line size in bytes */
26867-#define XCHAL_DCACHE_LINESIZE 16 /* D-cache line size in bytes */
26868 #define XCHAL_ICACHE_LINEWIDTH 4 /* log2(I line size in bytes) */
26869 #define XCHAL_DCACHE_LINEWIDTH 4 /* log2(D line size in bytes) */
26870+#define XCHAL_DCACHE_LINESIZE (_AC(1,UL) << XCHAL_DCACHE_LINEWIDTH) /* D-cache line size in bytes */
26871
26872 #define XCHAL_ICACHE_SIZE 32768 /* I-cache size in bytes or 0 */
26873 #define XCHAL_DCACHE_SIZE 32768 /* D-cache size in bytes or 0 */
26874diff --git a/block/blk-iopoll.c b/block/blk-iopoll.c
26875index 58916af..9cb880b 100644
26876--- a/block/blk-iopoll.c
26877+++ b/block/blk-iopoll.c
26878@@ -77,7 +77,7 @@ void blk_iopoll_complete(struct blk_iopoll *iopoll)
26879 }
26880 EXPORT_SYMBOL(blk_iopoll_complete);
26881
26882-static void blk_iopoll_softirq(struct softirq_action *h)
26883+static void blk_iopoll_softirq(void)
26884 {
26885 struct list_head *list = &__get_cpu_var(blk_cpu_iopoll);
26886 int rearm = 0, budget = blk_iopoll_budget;
26887diff --git a/block/blk-map.c b/block/blk-map.c
26888index 623e1cd..ca1e109 100644
26889--- a/block/blk-map.c
26890+++ b/block/blk-map.c
26891@@ -302,7 +302,7 @@ int blk_rq_map_kern(struct request_queue *q, struct request *rq, void *kbuf,
26892 if (!len || !kbuf)
26893 return -EINVAL;
26894
26895- do_copy = !blk_rq_aligned(q, addr, len) || object_is_on_stack(kbuf);
26896+ do_copy = !blk_rq_aligned(q, addr, len) || object_starts_on_stack(kbuf);
26897 if (do_copy)
26898 bio = bio_copy_kern(q, kbuf, len, gfp_mask, reading);
26899 else
26900diff --git a/block/blk-softirq.c b/block/blk-softirq.c
26901index 1366a89..e17f54b 100644
26902--- a/block/blk-softirq.c
26903+++ b/block/blk-softirq.c
26904@@ -17,7 +17,7 @@ static DEFINE_PER_CPU(struct list_head, blk_cpu_done);
26905 * Softirq action handler - move entries to local list and loop over them
26906 * while passing them to the queue registered handler.
26907 */
26908-static void blk_done_softirq(struct softirq_action *h)
26909+static void blk_done_softirq(void)
26910 {
26911 struct list_head *cpu_list, local_list;
26912
26913diff --git a/block/bsg.c b/block/bsg.c
26914index c0ab25c..9d49f8f 100644
26915--- a/block/bsg.c
26916+++ b/block/bsg.c
26917@@ -176,16 +176,24 @@ static int blk_fill_sgv4_hdr_rq(struct request_queue *q, struct request *rq,
26918 struct sg_io_v4 *hdr, struct bsg_device *bd,
26919 fmode_t has_write_perm)
26920 {
26921+ unsigned char tmpcmd[sizeof(rq->__cmd)];
26922+ unsigned char *cmdptr;
26923+
26924 if (hdr->request_len > BLK_MAX_CDB) {
26925 rq->cmd = kzalloc(hdr->request_len, GFP_KERNEL);
26926 if (!rq->cmd)
26927 return -ENOMEM;
26928- }
26929+ cmdptr = rq->cmd;
26930+ } else
26931+ cmdptr = tmpcmd;
26932
26933- if (copy_from_user(rq->cmd, (void __user *)(unsigned long)hdr->request,
26934+ if (copy_from_user(cmdptr, (void __user *)(unsigned long)hdr->request,
26935 hdr->request_len))
26936 return -EFAULT;
26937
26938+ if (cmdptr != rq->cmd)
26939+ memcpy(rq->cmd, cmdptr, hdr->request_len);
26940+
26941 if (hdr->subprotocol == BSG_SUB_PROTOCOL_SCSI_CMD) {
26942 if (blk_verify_command(rq->cmd, has_write_perm))
26943 return -EPERM;
26944diff --git a/block/compat_ioctl.c b/block/compat_ioctl.c
26945index 7b72502..646105c 100644
26946--- a/block/compat_ioctl.c
26947+++ b/block/compat_ioctl.c
26948@@ -340,7 +340,7 @@ static int compat_fd_ioctl(struct block_device *bdev, fmode_t mode,
26949 err |= __get_user(f->spec1, &uf->spec1);
26950 err |= __get_user(f->fmt_gap, &uf->fmt_gap);
26951 err |= __get_user(name, &uf->name);
26952- f->name = compat_ptr(name);
26953+ f->name = (void __force_kernel *)compat_ptr(name);
26954 if (err) {
26955 err = -EFAULT;
26956 goto out;
26957diff --git a/block/scsi_ioctl.c b/block/scsi_ioctl.c
26958index 688be8a..8a37d98 100644
26959--- a/block/scsi_ioctl.c
26960+++ b/block/scsi_ioctl.c
26961@@ -223,8 +223,20 @@ EXPORT_SYMBOL(blk_verify_command);
26962 static int blk_fill_sghdr_rq(struct request_queue *q, struct request *rq,
26963 struct sg_io_hdr *hdr, fmode_t mode)
26964 {
26965- if (copy_from_user(rq->cmd, hdr->cmdp, hdr->cmd_len))
26966+ unsigned char tmpcmd[sizeof(rq->__cmd)];
26967+ unsigned char *cmdptr;
26968+
26969+ if (rq->cmd != rq->__cmd)
26970+ cmdptr = rq->cmd;
26971+ else
26972+ cmdptr = tmpcmd;
26973+
26974+ if (copy_from_user(cmdptr, hdr->cmdp, hdr->cmd_len))
26975 return -EFAULT;
26976+
26977+ if (cmdptr != rq->cmd)
26978+ memcpy(rq->cmd, cmdptr, hdr->cmd_len);
26979+
26980 if (blk_verify_command(rq->cmd, mode & FMODE_WRITE))
26981 return -EPERM;
26982
26983@@ -433,6 +445,8 @@ int sg_scsi_ioctl(struct request_queue *q, struct gendisk *disk, fmode_t mode,
26984 int err;
26985 unsigned int in_len, out_len, bytes, opcode, cmdlen;
26986 char *buffer = NULL, sense[SCSI_SENSE_BUFFERSIZE];
26987+ unsigned char tmpcmd[sizeof(rq->__cmd)];
26988+ unsigned char *cmdptr;
26989
26990 if (!sic)
26991 return -EINVAL;
26992@@ -466,9 +480,18 @@ int sg_scsi_ioctl(struct request_queue *q, struct gendisk *disk, fmode_t mode,
26993 */
26994 err = -EFAULT;
26995 rq->cmd_len = cmdlen;
26996- if (copy_from_user(rq->cmd, sic->data, cmdlen))
26997+
26998+ if (rq->cmd != rq->__cmd)
26999+ cmdptr = rq->cmd;
27000+ else
27001+ cmdptr = tmpcmd;
27002+
27003+ if (copy_from_user(cmdptr, sic->data, cmdlen))
27004 goto error;
27005
27006+ if (rq->cmd != cmdptr)
27007+ memcpy(rq->cmd, cmdptr, cmdlen);
27008+
27009 if (in_len && copy_from_user(buffer, sic->data + cmdlen, in_len))
27010 goto error;
27011
27012diff --git a/crypto/ablkcipher.c b/crypto/ablkcipher.c
27013index a0f768c..1da9c73 100644
27014--- a/crypto/ablkcipher.c
27015+++ b/crypto/ablkcipher.c
27016@@ -307,6 +307,8 @@ int ablkcipher_walk_phys(struct ablkcipher_request *req,
27017 EXPORT_SYMBOL_GPL(ablkcipher_walk_phys);
27018
27019 static int setkey_unaligned(struct crypto_ablkcipher *tfm, const u8 *key,
27020+ unsigned int keylen) __size_overflow(3);
27021+static int setkey_unaligned(struct crypto_ablkcipher *tfm, const u8 *key,
27022 unsigned int keylen)
27023 {
27024 struct ablkcipher_alg *cipher = crypto_ablkcipher_alg(tfm);
27025@@ -329,6 +331,8 @@ static int setkey_unaligned(struct crypto_ablkcipher *tfm, const u8 *key,
27026 }
27027
27028 static int setkey(struct crypto_ablkcipher *tfm, const u8 *key,
27029+ unsigned int keylen) __size_overflow(3);
27030+static int setkey(struct crypto_ablkcipher *tfm, const u8 *key,
27031 unsigned int keylen)
27032 {
27033 struct ablkcipher_alg *cipher = crypto_ablkcipher_alg(tfm);
27034diff --git a/crypto/aead.c b/crypto/aead.c
27035index 04add3dc..983032f 100644
27036--- a/crypto/aead.c
27037+++ b/crypto/aead.c
27038@@ -27,6 +27,8 @@
27039 #include "internal.h"
27040
27041 static int setkey_unaligned(struct crypto_aead *tfm, const u8 *key,
27042+ unsigned int keylen) __size_overflow(3);
27043+static int setkey_unaligned(struct crypto_aead *tfm, const u8 *key,
27044 unsigned int keylen)
27045 {
27046 struct aead_alg *aead = crypto_aead_alg(tfm);
27047@@ -48,6 +50,7 @@ static int setkey_unaligned(struct crypto_aead *tfm, const u8 *key,
27048 return ret;
27049 }
27050
27051+static int setkey(struct crypto_aead *tfm, const u8 *key, unsigned int keylen) __size_overflow(3);
27052 static int setkey(struct crypto_aead *tfm, const u8 *key, unsigned int keylen)
27053 {
27054 struct aead_alg *aead = crypto_aead_alg(tfm);
27055diff --git a/crypto/blkcipher.c b/crypto/blkcipher.c
27056index 1e61d1a..cf06b86 100644
27057--- a/crypto/blkcipher.c
27058+++ b/crypto/blkcipher.c
27059@@ -359,6 +359,8 @@ int blkcipher_walk_virt_block(struct blkcipher_desc *desc,
27060 EXPORT_SYMBOL_GPL(blkcipher_walk_virt_block);
27061
27062 static int setkey_unaligned(struct crypto_tfm *tfm, const u8 *key,
27063+ unsigned int keylen) __size_overflow(3);
27064+static int setkey_unaligned(struct crypto_tfm *tfm, const u8 *key,
27065 unsigned int keylen)
27066 {
27067 struct blkcipher_alg *cipher = &tfm->__crt_alg->cra_blkcipher;
27068@@ -380,6 +382,7 @@ static int setkey_unaligned(struct crypto_tfm *tfm, const u8 *key,
27069 return ret;
27070 }
27071
27072+static int setkey(struct crypto_tfm *tfm, const u8 *key, unsigned int keylen) __size_overflow(3);
27073 static int setkey(struct crypto_tfm *tfm, const u8 *key, unsigned int keylen)
27074 {
27075 struct blkcipher_alg *cipher = &tfm->__crt_alg->cra_blkcipher;
27076diff --git a/crypto/cipher.c b/crypto/cipher.c
27077index 39541e0..802d956 100644
27078--- a/crypto/cipher.c
27079+++ b/crypto/cipher.c
27080@@ -21,6 +21,8 @@
27081 #include "internal.h"
27082
27083 static int setkey_unaligned(struct crypto_tfm *tfm, const u8 *key,
27084+ unsigned int keylen) __size_overflow(3);
27085+static int setkey_unaligned(struct crypto_tfm *tfm, const u8 *key,
27086 unsigned int keylen)
27087 {
27088 struct cipher_alg *cia = &tfm->__crt_alg->cra_cipher;
27089@@ -43,6 +45,7 @@ static int setkey_unaligned(struct crypto_tfm *tfm, const u8 *key,
27090
27091 }
27092
27093+static int setkey(struct crypto_tfm *tfm, const u8 *key, unsigned int keylen) __size_overflow(3);
27094 static int setkey(struct crypto_tfm *tfm, const u8 *key, unsigned int keylen)
27095 {
27096 struct cipher_alg *cia = &tfm->__crt_alg->cra_cipher;
27097diff --git a/crypto/cryptd.c b/crypto/cryptd.c
27098index 671d4d6..5f24030 100644
27099--- a/crypto/cryptd.c
27100+++ b/crypto/cryptd.c
27101@@ -63,7 +63,7 @@ struct cryptd_blkcipher_ctx {
27102
27103 struct cryptd_blkcipher_request_ctx {
27104 crypto_completion_t complete;
27105-};
27106+} __no_const;
27107
27108 struct cryptd_hash_ctx {
27109 struct crypto_shash *child;
27110@@ -80,7 +80,7 @@ struct cryptd_aead_ctx {
27111
27112 struct cryptd_aead_request_ctx {
27113 crypto_completion_t complete;
27114-};
27115+} __no_const;
27116
27117 static void cryptd_queue_worker(struct work_struct *work);
27118
27119diff --git a/drivers/acpi/apei/cper.c b/drivers/acpi/apei/cper.c
27120index 5d41894..22021e4 100644
27121--- a/drivers/acpi/apei/cper.c
27122+++ b/drivers/acpi/apei/cper.c
27123@@ -38,12 +38,12 @@
27124 */
27125 u64 cper_next_record_id(void)
27126 {
27127- static atomic64_t seq;
27128+ static atomic64_unchecked_t seq;
27129
27130- if (!atomic64_read(&seq))
27131- atomic64_set(&seq, ((u64)get_seconds()) << 32);
27132+ if (!atomic64_read_unchecked(&seq))
27133+ atomic64_set_unchecked(&seq, ((u64)get_seconds()) << 32);
27134
27135- return atomic64_inc_return(&seq);
27136+ return atomic64_inc_return_unchecked(&seq);
27137 }
27138 EXPORT_SYMBOL_GPL(cper_next_record_id);
27139
27140diff --git a/drivers/acpi/battery.c b/drivers/acpi/battery.c
27141index 7711d94..8622811 100644
27142--- a/drivers/acpi/battery.c
27143+++ b/drivers/acpi/battery.c
27144@@ -787,6 +787,9 @@ static int acpi_battery_print_alarm(struct seq_file *seq, int result)
27145
27146 static ssize_t acpi_battery_write_alarm(struct file *file,
27147 const char __user * buffer,
27148+ size_t count, loff_t * ppos) __size_overflow(3);
27149+static ssize_t acpi_battery_write_alarm(struct file *file,
27150+ const char __user * buffer,
27151 size_t count, loff_t * ppos)
27152 {
27153 int result = 0;
27154diff --git a/drivers/acpi/ec_sys.c b/drivers/acpi/ec_sys.c
27155index 6c47ae9..abfdd63 100644
27156--- a/drivers/acpi/ec_sys.c
27157+++ b/drivers/acpi/ec_sys.c
27158@@ -12,6 +12,7 @@
27159 #include <linux/acpi.h>
27160 #include <linux/debugfs.h>
27161 #include <linux/module.h>
27162+#include <linux/uaccess.h>
27163 #include "internal.h"
27164
27165 MODULE_AUTHOR("Thomas Renninger <trenn@suse.de>");
27166@@ -40,7 +41,7 @@ static ssize_t acpi_ec_read_io(struct file *f, char __user *buf,
27167 * struct acpi_ec *ec = ((struct seq_file *)f->private_data)->private;
27168 */
27169 unsigned int size = EC_SPACE_SIZE;
27170- u8 *data = (u8 *) buf;
27171+ u8 data;
27172 loff_t init_off = *off;
27173 int err = 0;
27174
27175@@ -53,9 +54,11 @@ static ssize_t acpi_ec_read_io(struct file *f, char __user *buf,
27176 size = count;
27177
27178 while (size) {
27179- err = ec_read(*off, &data[*off - init_off]);
27180+ err = ec_read(*off, &data);
27181 if (err)
27182 return err;
27183+ if (put_user(data, &buf[*off - init_off]))
27184+ return -EFAULT;
27185 *off += 1;
27186 size--;
27187 }
27188@@ -71,7 +74,6 @@ static ssize_t acpi_ec_write_io(struct file *f, const char __user *buf,
27189
27190 unsigned int size = count;
27191 loff_t init_off = *off;
27192- u8 *data = (u8 *) buf;
27193 int err = 0;
27194
27195 if (*off >= EC_SPACE_SIZE)
27196@@ -82,7 +84,9 @@ static ssize_t acpi_ec_write_io(struct file *f, const char __user *buf,
27197 }
27198
27199 while (size) {
27200- u8 byte_write = data[*off - init_off];
27201+ u8 byte_write;
27202+ if (get_user(byte_write, &buf[*off - init_off]))
27203+ return -EFAULT;
27204 err = ec_write(*off, byte_write);
27205 if (err)
27206 return err;
27207diff --git a/drivers/acpi/proc.c b/drivers/acpi/proc.c
27208index 251c7b62..000462d 100644
27209--- a/drivers/acpi/proc.c
27210+++ b/drivers/acpi/proc.c
27211@@ -343,19 +343,13 @@ acpi_system_write_wakeup_device(struct file *file,
27212 size_t count, loff_t * ppos)
27213 {
27214 struct list_head *node, *next;
27215- char strbuf[5];
27216- char str[5] = "";
27217- unsigned int len = count;
27218+ char strbuf[5] = {0};
27219
27220- if (len > 4)
27221- len = 4;
27222- if (len < 0)
27223+ if (count > 4)
27224+ count = 4;
27225+ if (copy_from_user(strbuf, buffer, count))
27226 return -EFAULT;
27227-
27228- if (copy_from_user(strbuf, buffer, len))
27229- return -EFAULT;
27230- strbuf[len] = '\0';
27231- sscanf(strbuf, "%s", str);
27232+ strbuf[count] = '\0';
27233
27234 mutex_lock(&acpi_device_lock);
27235 list_for_each_safe(node, next, &acpi_wakeup_device_list) {
27236@@ -364,7 +358,7 @@ acpi_system_write_wakeup_device(struct file *file,
27237 if (!dev->wakeup.flags.valid)
27238 continue;
27239
27240- if (!strncmp(dev->pnp.bus_id, str, 4)) {
27241+ if (!strncmp(dev->pnp.bus_id, strbuf, 4)) {
27242 if (device_can_wakeup(&dev->dev)) {
27243 bool enable = !device_may_wakeup(&dev->dev);
27244 device_set_wakeup_enable(&dev->dev, enable);
27245diff --git a/drivers/acpi/processor_driver.c b/drivers/acpi/processor_driver.c
27246index 9d7bc9f..a6fc091 100644
27247--- a/drivers/acpi/processor_driver.c
27248+++ b/drivers/acpi/processor_driver.c
27249@@ -473,7 +473,7 @@ static int __cpuinit acpi_processor_add(struct acpi_device *device)
27250 return 0;
27251 #endif
27252
27253- BUG_ON((pr->id >= nr_cpu_ids) || (pr->id < 0));
27254+ BUG_ON(pr->id >= nr_cpu_ids);
27255
27256 /*
27257 * Buggy BIOS check
27258diff --git a/drivers/acpi/sbs.c b/drivers/acpi/sbs.c
27259index 6e36d0c..f319944 100644
27260--- a/drivers/acpi/sbs.c
27261+++ b/drivers/acpi/sbs.c
27262@@ -655,6 +655,9 @@ static int acpi_battery_read_alarm(struct seq_file *seq, void *offset)
27263
27264 static ssize_t
27265 acpi_battery_write_alarm(struct file *file, const char __user * buffer,
27266+ size_t count, loff_t * ppos) __size_overflow(3);
27267+static ssize_t
27268+acpi_battery_write_alarm(struct file *file, const char __user * buffer,
27269 size_t count, loff_t * ppos)
27270 {
27271 struct seq_file *seq = file->private_data;
27272diff --git a/drivers/ata/libata-core.c b/drivers/ata/libata-core.c
27273index c04ad68..0b99473 100644
27274--- a/drivers/ata/libata-core.c
27275+++ b/drivers/ata/libata-core.c
27276@@ -4733,7 +4733,7 @@ void ata_qc_free(struct ata_queued_cmd *qc)
27277 struct ata_port *ap;
27278 unsigned int tag;
27279
27280- WARN_ON_ONCE(qc == NULL); /* ata_qc_from_tag _might_ return NULL */
27281+ BUG_ON(qc == NULL); /* ata_qc_from_tag _might_ return NULL */
27282 ap = qc->ap;
27283
27284 qc->flags = 0;
27285@@ -4749,7 +4749,7 @@ void __ata_qc_complete(struct ata_queued_cmd *qc)
27286 struct ata_port *ap;
27287 struct ata_link *link;
27288
27289- WARN_ON_ONCE(qc == NULL); /* ata_qc_from_tag _might_ return NULL */
27290+ BUG_ON(qc == NULL); /* ata_qc_from_tag _might_ return NULL */
27291 WARN_ON_ONCE(!(qc->flags & ATA_QCFLAG_ACTIVE));
27292 ap = qc->ap;
27293 link = qc->dev->link;
27294@@ -5754,6 +5754,7 @@ static void ata_finalize_port_ops(struct ata_port_operations *ops)
27295 return;
27296
27297 spin_lock(&lock);
27298+ pax_open_kernel();
27299
27300 for (cur = ops->inherits; cur; cur = cur->inherits) {
27301 void **inherit = (void **)cur;
27302@@ -5767,8 +5768,9 @@ static void ata_finalize_port_ops(struct ata_port_operations *ops)
27303 if (IS_ERR(*pp))
27304 *pp = NULL;
27305
27306- ops->inherits = NULL;
27307+ *(struct ata_port_operations **)&ops->inherits = NULL;
27308
27309+ pax_close_kernel();
27310 spin_unlock(&lock);
27311 }
27312
27313diff --git a/drivers/ata/pata_arasan_cf.c b/drivers/ata/pata_arasan_cf.c
27314index e8574bb..f9f6a72 100644
27315--- a/drivers/ata/pata_arasan_cf.c
27316+++ b/drivers/ata/pata_arasan_cf.c
27317@@ -862,7 +862,9 @@ static int __devinit arasan_cf_probe(struct platform_device *pdev)
27318 /* Handle platform specific quirks */
27319 if (pdata->quirk) {
27320 if (pdata->quirk & CF_BROKEN_PIO) {
27321- ap->ops->set_piomode = NULL;
27322+ pax_open_kernel();
27323+ *(void **)&ap->ops->set_piomode = NULL;
27324+ pax_close_kernel();
27325 ap->pio_mask = 0;
27326 }
27327 if (pdata->quirk & CF_BROKEN_MWDMA)
27328diff --git a/drivers/atm/adummy.c b/drivers/atm/adummy.c
27329index f9b983a..887b9d8 100644
27330--- a/drivers/atm/adummy.c
27331+++ b/drivers/atm/adummy.c
27332@@ -114,7 +114,7 @@ adummy_send(struct atm_vcc *vcc, struct sk_buff *skb)
27333 vcc->pop(vcc, skb);
27334 else
27335 dev_kfree_skb_any(skb);
27336- atomic_inc(&vcc->stats->tx);
27337+ atomic_inc_unchecked(&vcc->stats->tx);
27338
27339 return 0;
27340 }
27341diff --git a/drivers/atm/ambassador.c b/drivers/atm/ambassador.c
27342index f8f41e0..1f987dd 100644
27343--- a/drivers/atm/ambassador.c
27344+++ b/drivers/atm/ambassador.c
27345@@ -454,7 +454,7 @@ static void tx_complete (amb_dev * dev, tx_out * tx) {
27346 PRINTD (DBG_FLOW|DBG_TX, "tx_complete %p %p", dev, tx);
27347
27348 // VC layer stats
27349- atomic_inc(&ATM_SKB(skb)->vcc->stats->tx);
27350+ atomic_inc_unchecked(&ATM_SKB(skb)->vcc->stats->tx);
27351
27352 // free the descriptor
27353 kfree (tx_descr);
27354@@ -495,7 +495,7 @@ static void rx_complete (amb_dev * dev, rx_out * rx) {
27355 dump_skb ("<<<", vc, skb);
27356
27357 // VC layer stats
27358- atomic_inc(&atm_vcc->stats->rx);
27359+ atomic_inc_unchecked(&atm_vcc->stats->rx);
27360 __net_timestamp(skb);
27361 // end of our responsibility
27362 atm_vcc->push (atm_vcc, skb);
27363@@ -510,7 +510,7 @@ static void rx_complete (amb_dev * dev, rx_out * rx) {
27364 } else {
27365 PRINTK (KERN_INFO, "dropped over-size frame");
27366 // should we count this?
27367- atomic_inc(&atm_vcc->stats->rx_drop);
27368+ atomic_inc_unchecked(&atm_vcc->stats->rx_drop);
27369 }
27370
27371 } else {
27372@@ -1338,7 +1338,7 @@ static int amb_send (struct atm_vcc * atm_vcc, struct sk_buff * skb) {
27373 }
27374
27375 if (check_area (skb->data, skb->len)) {
27376- atomic_inc(&atm_vcc->stats->tx_err);
27377+ atomic_inc_unchecked(&atm_vcc->stats->tx_err);
27378 return -ENOMEM; // ?
27379 }
27380
27381diff --git a/drivers/atm/atmtcp.c b/drivers/atm/atmtcp.c
27382index b22d71c..d6e1049 100644
27383--- a/drivers/atm/atmtcp.c
27384+++ b/drivers/atm/atmtcp.c
27385@@ -207,7 +207,7 @@ static int atmtcp_v_send(struct atm_vcc *vcc,struct sk_buff *skb)
27386 if (vcc->pop) vcc->pop(vcc,skb);
27387 else dev_kfree_skb(skb);
27388 if (dev_data) return 0;
27389- atomic_inc(&vcc->stats->tx_err);
27390+ atomic_inc_unchecked(&vcc->stats->tx_err);
27391 return -ENOLINK;
27392 }
27393 size = skb->len+sizeof(struct atmtcp_hdr);
27394@@ -215,7 +215,7 @@ static int atmtcp_v_send(struct atm_vcc *vcc,struct sk_buff *skb)
27395 if (!new_skb) {
27396 if (vcc->pop) vcc->pop(vcc,skb);
27397 else dev_kfree_skb(skb);
27398- atomic_inc(&vcc->stats->tx_err);
27399+ atomic_inc_unchecked(&vcc->stats->tx_err);
27400 return -ENOBUFS;
27401 }
27402 hdr = (void *) skb_put(new_skb,sizeof(struct atmtcp_hdr));
27403@@ -226,8 +226,8 @@ static int atmtcp_v_send(struct atm_vcc *vcc,struct sk_buff *skb)
27404 if (vcc->pop) vcc->pop(vcc,skb);
27405 else dev_kfree_skb(skb);
27406 out_vcc->push(out_vcc,new_skb);
27407- atomic_inc(&vcc->stats->tx);
27408- atomic_inc(&out_vcc->stats->rx);
27409+ atomic_inc_unchecked(&vcc->stats->tx);
27410+ atomic_inc_unchecked(&out_vcc->stats->rx);
27411 return 0;
27412 }
27413
27414@@ -301,7 +301,7 @@ static int atmtcp_c_send(struct atm_vcc *vcc,struct sk_buff *skb)
27415 out_vcc = find_vcc(dev, ntohs(hdr->vpi), ntohs(hdr->vci));
27416 read_unlock(&vcc_sklist_lock);
27417 if (!out_vcc) {
27418- atomic_inc(&vcc->stats->tx_err);
27419+ atomic_inc_unchecked(&vcc->stats->tx_err);
27420 goto done;
27421 }
27422 skb_pull(skb,sizeof(struct atmtcp_hdr));
27423@@ -313,8 +313,8 @@ static int atmtcp_c_send(struct atm_vcc *vcc,struct sk_buff *skb)
27424 __net_timestamp(new_skb);
27425 skb_copy_from_linear_data(skb, skb_put(new_skb, skb->len), skb->len);
27426 out_vcc->push(out_vcc,new_skb);
27427- atomic_inc(&vcc->stats->tx);
27428- atomic_inc(&out_vcc->stats->rx);
27429+ atomic_inc_unchecked(&vcc->stats->tx);
27430+ atomic_inc_unchecked(&out_vcc->stats->rx);
27431 done:
27432 if (vcc->pop) vcc->pop(vcc,skb);
27433 else dev_kfree_skb(skb);
27434diff --git a/drivers/atm/eni.c b/drivers/atm/eni.c
27435index 956e9ac..133516d 100644
27436--- a/drivers/atm/eni.c
27437+++ b/drivers/atm/eni.c
27438@@ -526,7 +526,7 @@ static int rx_aal0(struct atm_vcc *vcc)
27439 DPRINTK(DEV_LABEL "(itf %d): trashing empty cell\n",
27440 vcc->dev->number);
27441 length = 0;
27442- atomic_inc(&vcc->stats->rx_err);
27443+ atomic_inc_unchecked(&vcc->stats->rx_err);
27444 }
27445 else {
27446 length = ATM_CELL_SIZE-1; /* no HEC */
27447@@ -581,7 +581,7 @@ static int rx_aal5(struct atm_vcc *vcc)
27448 size);
27449 }
27450 eff = length = 0;
27451- atomic_inc(&vcc->stats->rx_err);
27452+ atomic_inc_unchecked(&vcc->stats->rx_err);
27453 }
27454 else {
27455 size = (descr & MID_RED_COUNT)*(ATM_CELL_PAYLOAD >> 2);
27456@@ -598,7 +598,7 @@ static int rx_aal5(struct atm_vcc *vcc)
27457 "(VCI=%d,length=%ld,size=%ld (descr 0x%lx))\n",
27458 vcc->dev->number,vcc->vci,length,size << 2,descr);
27459 length = eff = 0;
27460- atomic_inc(&vcc->stats->rx_err);
27461+ atomic_inc_unchecked(&vcc->stats->rx_err);
27462 }
27463 }
27464 skb = eff ? atm_alloc_charge(vcc,eff << 2,GFP_ATOMIC) : NULL;
27465@@ -771,7 +771,7 @@ rx_dequeued++;
27466 vcc->push(vcc,skb);
27467 pushed++;
27468 }
27469- atomic_inc(&vcc->stats->rx);
27470+ atomic_inc_unchecked(&vcc->stats->rx);
27471 }
27472 wake_up(&eni_dev->rx_wait);
27473 }
27474@@ -1229,7 +1229,7 @@ static void dequeue_tx(struct atm_dev *dev)
27475 PCI_DMA_TODEVICE);
27476 if (vcc->pop) vcc->pop(vcc,skb);
27477 else dev_kfree_skb_irq(skb);
27478- atomic_inc(&vcc->stats->tx);
27479+ atomic_inc_unchecked(&vcc->stats->tx);
27480 wake_up(&eni_dev->tx_wait);
27481 dma_complete++;
27482 }
27483@@ -1569,7 +1569,7 @@ tx_complete++;
27484 /*--------------------------------- entries ---------------------------------*/
27485
27486
27487-static const char *media_name[] __devinitdata = {
27488+static const char *media_name[] __devinitconst = {
27489 "MMF", "SMF", "MMF", "03?", /* 0- 3 */
27490 "UTP", "05?", "06?", "07?", /* 4- 7 */
27491 "TAXI","09?", "10?", "11?", /* 8-11 */
27492diff --git a/drivers/atm/firestream.c b/drivers/atm/firestream.c
27493index 5072f8a..fa52520d 100644
27494--- a/drivers/atm/firestream.c
27495+++ b/drivers/atm/firestream.c
27496@@ -750,7 +750,7 @@ static void process_txdone_queue (struct fs_dev *dev, struct queue *q)
27497 }
27498 }
27499
27500- atomic_inc(&ATM_SKB(skb)->vcc->stats->tx);
27501+ atomic_inc_unchecked(&ATM_SKB(skb)->vcc->stats->tx);
27502
27503 fs_dprintk (FS_DEBUG_TXMEM, "i");
27504 fs_dprintk (FS_DEBUG_ALLOC, "Free t-skb: %p\n", skb);
27505@@ -817,7 +817,7 @@ static void process_incoming (struct fs_dev *dev, struct queue *q)
27506 #endif
27507 skb_put (skb, qe->p1 & 0xffff);
27508 ATM_SKB(skb)->vcc = atm_vcc;
27509- atomic_inc(&atm_vcc->stats->rx);
27510+ atomic_inc_unchecked(&atm_vcc->stats->rx);
27511 __net_timestamp(skb);
27512 fs_dprintk (FS_DEBUG_ALLOC, "Free rec-skb: %p (pushed)\n", skb);
27513 atm_vcc->push (atm_vcc, skb);
27514@@ -838,12 +838,12 @@ static void process_incoming (struct fs_dev *dev, struct queue *q)
27515 kfree (pe);
27516 }
27517 if (atm_vcc)
27518- atomic_inc(&atm_vcc->stats->rx_drop);
27519+ atomic_inc_unchecked(&atm_vcc->stats->rx_drop);
27520 break;
27521 case 0x1f: /* Reassembly abort: no buffers. */
27522 /* Silently increment error counter. */
27523 if (atm_vcc)
27524- atomic_inc(&atm_vcc->stats->rx_drop);
27525+ atomic_inc_unchecked(&atm_vcc->stats->rx_drop);
27526 break;
27527 default: /* Hmm. Haven't written the code to handle the others yet... -- REW */
27528 printk (KERN_WARNING "Don't know what to do with RX status %x: %s.\n",
27529diff --git a/drivers/atm/fore200e.c b/drivers/atm/fore200e.c
27530index 361f5ae..7fc552d 100644
27531--- a/drivers/atm/fore200e.c
27532+++ b/drivers/atm/fore200e.c
27533@@ -933,9 +933,9 @@ fore200e_tx_irq(struct fore200e* fore200e)
27534 #endif
27535 /* check error condition */
27536 if (*entry->status & STATUS_ERROR)
27537- atomic_inc(&vcc->stats->tx_err);
27538+ atomic_inc_unchecked(&vcc->stats->tx_err);
27539 else
27540- atomic_inc(&vcc->stats->tx);
27541+ atomic_inc_unchecked(&vcc->stats->tx);
27542 }
27543 }
27544
27545@@ -1084,7 +1084,7 @@ fore200e_push_rpd(struct fore200e* fore200e, struct atm_vcc* vcc, struct rpd* rp
27546 if (skb == NULL) {
27547 DPRINTK(2, "unable to alloc new skb, rx PDU length = %d\n", pdu_len);
27548
27549- atomic_inc(&vcc->stats->rx_drop);
27550+ atomic_inc_unchecked(&vcc->stats->rx_drop);
27551 return -ENOMEM;
27552 }
27553
27554@@ -1127,14 +1127,14 @@ fore200e_push_rpd(struct fore200e* fore200e, struct atm_vcc* vcc, struct rpd* rp
27555
27556 dev_kfree_skb_any(skb);
27557
27558- atomic_inc(&vcc->stats->rx_drop);
27559+ atomic_inc_unchecked(&vcc->stats->rx_drop);
27560 return -ENOMEM;
27561 }
27562
27563 ASSERT(atomic_read(&sk_atm(vcc)->sk_wmem_alloc) >= 0);
27564
27565 vcc->push(vcc, skb);
27566- atomic_inc(&vcc->stats->rx);
27567+ atomic_inc_unchecked(&vcc->stats->rx);
27568
27569 ASSERT(atomic_read(&sk_atm(vcc)->sk_wmem_alloc) >= 0);
27570
27571@@ -1212,7 +1212,7 @@ fore200e_rx_irq(struct fore200e* fore200e)
27572 DPRINTK(2, "damaged PDU on %d.%d.%d\n",
27573 fore200e->atm_dev->number,
27574 entry->rpd->atm_header.vpi, entry->rpd->atm_header.vci);
27575- atomic_inc(&vcc->stats->rx_err);
27576+ atomic_inc_unchecked(&vcc->stats->rx_err);
27577 }
27578 }
27579
27580@@ -1657,7 +1657,7 @@ fore200e_send(struct atm_vcc *vcc, struct sk_buff *skb)
27581 goto retry_here;
27582 }
27583
27584- atomic_inc(&vcc->stats->tx_err);
27585+ atomic_inc_unchecked(&vcc->stats->tx_err);
27586
27587 fore200e->tx_sat++;
27588 DPRINTK(2, "tx queue of device %s is saturated, PDU dropped - heartbeat is %08x\n",
27589diff --git a/drivers/atm/he.c b/drivers/atm/he.c
27590index 9a51df4..f3bb5f8 100644
27591--- a/drivers/atm/he.c
27592+++ b/drivers/atm/he.c
27593@@ -1709,7 +1709,7 @@ he_service_rbrq(struct he_dev *he_dev, int group)
27594
27595 if (RBRQ_HBUF_ERR(he_dev->rbrq_head)) {
27596 hprintk("HBUF_ERR! (cid 0x%x)\n", cid);
27597- atomic_inc(&vcc->stats->rx_drop);
27598+ atomic_inc_unchecked(&vcc->stats->rx_drop);
27599 goto return_host_buffers;
27600 }
27601
27602@@ -1736,7 +1736,7 @@ he_service_rbrq(struct he_dev *he_dev, int group)
27603 RBRQ_LEN_ERR(he_dev->rbrq_head)
27604 ? "LEN_ERR" : "",
27605 vcc->vpi, vcc->vci);
27606- atomic_inc(&vcc->stats->rx_err);
27607+ atomic_inc_unchecked(&vcc->stats->rx_err);
27608 goto return_host_buffers;
27609 }
27610
27611@@ -1788,7 +1788,7 @@ he_service_rbrq(struct he_dev *he_dev, int group)
27612 vcc->push(vcc, skb);
27613 spin_lock(&he_dev->global_lock);
27614
27615- atomic_inc(&vcc->stats->rx);
27616+ atomic_inc_unchecked(&vcc->stats->rx);
27617
27618 return_host_buffers:
27619 ++pdus_assembled;
27620@@ -2114,7 +2114,7 @@ __enqueue_tpd(struct he_dev *he_dev, struct he_tpd *tpd, unsigned cid)
27621 tpd->vcc->pop(tpd->vcc, tpd->skb);
27622 else
27623 dev_kfree_skb_any(tpd->skb);
27624- atomic_inc(&tpd->vcc->stats->tx_err);
27625+ atomic_inc_unchecked(&tpd->vcc->stats->tx_err);
27626 }
27627 pci_pool_free(he_dev->tpd_pool, tpd, TPD_ADDR(tpd->status));
27628 return;
27629@@ -2526,7 +2526,7 @@ he_send(struct atm_vcc *vcc, struct sk_buff *skb)
27630 vcc->pop(vcc, skb);
27631 else
27632 dev_kfree_skb_any(skb);
27633- atomic_inc(&vcc->stats->tx_err);
27634+ atomic_inc_unchecked(&vcc->stats->tx_err);
27635 return -EINVAL;
27636 }
27637
27638@@ -2537,7 +2537,7 @@ he_send(struct atm_vcc *vcc, struct sk_buff *skb)
27639 vcc->pop(vcc, skb);
27640 else
27641 dev_kfree_skb_any(skb);
27642- atomic_inc(&vcc->stats->tx_err);
27643+ atomic_inc_unchecked(&vcc->stats->tx_err);
27644 return -EINVAL;
27645 }
27646 #endif
27647@@ -2549,7 +2549,7 @@ he_send(struct atm_vcc *vcc, struct sk_buff *skb)
27648 vcc->pop(vcc, skb);
27649 else
27650 dev_kfree_skb_any(skb);
27651- atomic_inc(&vcc->stats->tx_err);
27652+ atomic_inc_unchecked(&vcc->stats->tx_err);
27653 spin_unlock_irqrestore(&he_dev->global_lock, flags);
27654 return -ENOMEM;
27655 }
27656@@ -2591,7 +2591,7 @@ he_send(struct atm_vcc *vcc, struct sk_buff *skb)
27657 vcc->pop(vcc, skb);
27658 else
27659 dev_kfree_skb_any(skb);
27660- atomic_inc(&vcc->stats->tx_err);
27661+ atomic_inc_unchecked(&vcc->stats->tx_err);
27662 spin_unlock_irqrestore(&he_dev->global_lock, flags);
27663 return -ENOMEM;
27664 }
27665@@ -2622,7 +2622,7 @@ he_send(struct atm_vcc *vcc, struct sk_buff *skb)
27666 __enqueue_tpd(he_dev, tpd, cid);
27667 spin_unlock_irqrestore(&he_dev->global_lock, flags);
27668
27669- atomic_inc(&vcc->stats->tx);
27670+ atomic_inc_unchecked(&vcc->stats->tx);
27671
27672 return 0;
27673 }
27674diff --git a/drivers/atm/horizon.c b/drivers/atm/horizon.c
27675index b812103..e391a49 100644
27676--- a/drivers/atm/horizon.c
27677+++ b/drivers/atm/horizon.c
27678@@ -1035,7 +1035,7 @@ static void rx_schedule (hrz_dev * dev, int irq) {
27679 {
27680 struct atm_vcc * vcc = ATM_SKB(skb)->vcc;
27681 // VC layer stats
27682- atomic_inc(&vcc->stats->rx);
27683+ atomic_inc_unchecked(&vcc->stats->rx);
27684 __net_timestamp(skb);
27685 // end of our responsibility
27686 vcc->push (vcc, skb);
27687@@ -1187,7 +1187,7 @@ static void tx_schedule (hrz_dev * const dev, int irq) {
27688 dev->tx_iovec = NULL;
27689
27690 // VC layer stats
27691- atomic_inc(&ATM_SKB(skb)->vcc->stats->tx);
27692+ atomic_inc_unchecked(&ATM_SKB(skb)->vcc->stats->tx);
27693
27694 // free the skb
27695 hrz_kfree_skb (skb);
27696diff --git a/drivers/atm/idt77252.c b/drivers/atm/idt77252.c
27697index 1c05212..c28e200 100644
27698--- a/drivers/atm/idt77252.c
27699+++ b/drivers/atm/idt77252.c
27700@@ -812,7 +812,7 @@ drain_scq(struct idt77252_dev *card, struct vc_map *vc)
27701 else
27702 dev_kfree_skb(skb);
27703
27704- atomic_inc(&vcc->stats->tx);
27705+ atomic_inc_unchecked(&vcc->stats->tx);
27706 }
27707
27708 atomic_dec(&scq->used);
27709@@ -1075,13 +1075,13 @@ dequeue_rx(struct idt77252_dev *card, struct rsq_entry *rsqe)
27710 if ((sb = dev_alloc_skb(64)) == NULL) {
27711 printk("%s: Can't allocate buffers for aal0.\n",
27712 card->name);
27713- atomic_add(i, &vcc->stats->rx_drop);
27714+ atomic_add_unchecked(i, &vcc->stats->rx_drop);
27715 break;
27716 }
27717 if (!atm_charge(vcc, sb->truesize)) {
27718 RXPRINTK("%s: atm_charge() dropped aal0 packets.\n",
27719 card->name);
27720- atomic_add(i - 1, &vcc->stats->rx_drop);
27721+ atomic_add_unchecked(i - 1, &vcc->stats->rx_drop);
27722 dev_kfree_skb(sb);
27723 break;
27724 }
27725@@ -1098,7 +1098,7 @@ dequeue_rx(struct idt77252_dev *card, struct rsq_entry *rsqe)
27726 ATM_SKB(sb)->vcc = vcc;
27727 __net_timestamp(sb);
27728 vcc->push(vcc, sb);
27729- atomic_inc(&vcc->stats->rx);
27730+ atomic_inc_unchecked(&vcc->stats->rx);
27731
27732 cell += ATM_CELL_PAYLOAD;
27733 }
27734@@ -1135,13 +1135,13 @@ dequeue_rx(struct idt77252_dev *card, struct rsq_entry *rsqe)
27735 "(CDC: %08x)\n",
27736 card->name, len, rpp->len, readl(SAR_REG_CDC));
27737 recycle_rx_pool_skb(card, rpp);
27738- atomic_inc(&vcc->stats->rx_err);
27739+ atomic_inc_unchecked(&vcc->stats->rx_err);
27740 return;
27741 }
27742 if (stat & SAR_RSQE_CRC) {
27743 RXPRINTK("%s: AAL5 CRC error.\n", card->name);
27744 recycle_rx_pool_skb(card, rpp);
27745- atomic_inc(&vcc->stats->rx_err);
27746+ atomic_inc_unchecked(&vcc->stats->rx_err);
27747 return;
27748 }
27749 if (skb_queue_len(&rpp->queue) > 1) {
27750@@ -1152,7 +1152,7 @@ dequeue_rx(struct idt77252_dev *card, struct rsq_entry *rsqe)
27751 RXPRINTK("%s: Can't alloc RX skb.\n",
27752 card->name);
27753 recycle_rx_pool_skb(card, rpp);
27754- atomic_inc(&vcc->stats->rx_err);
27755+ atomic_inc_unchecked(&vcc->stats->rx_err);
27756 return;
27757 }
27758 if (!atm_charge(vcc, skb->truesize)) {
27759@@ -1171,7 +1171,7 @@ dequeue_rx(struct idt77252_dev *card, struct rsq_entry *rsqe)
27760 __net_timestamp(skb);
27761
27762 vcc->push(vcc, skb);
27763- atomic_inc(&vcc->stats->rx);
27764+ atomic_inc_unchecked(&vcc->stats->rx);
27765
27766 return;
27767 }
27768@@ -1193,7 +1193,7 @@ dequeue_rx(struct idt77252_dev *card, struct rsq_entry *rsqe)
27769 __net_timestamp(skb);
27770
27771 vcc->push(vcc, skb);
27772- atomic_inc(&vcc->stats->rx);
27773+ atomic_inc_unchecked(&vcc->stats->rx);
27774
27775 if (skb->truesize > SAR_FB_SIZE_3)
27776 add_rx_skb(card, 3, SAR_FB_SIZE_3, 1);
27777@@ -1304,14 +1304,14 @@ idt77252_rx_raw(struct idt77252_dev *card)
27778 if (vcc->qos.aal != ATM_AAL0) {
27779 RPRINTK("%s: raw cell for non AAL0 vc %u.%u\n",
27780 card->name, vpi, vci);
27781- atomic_inc(&vcc->stats->rx_drop);
27782+ atomic_inc_unchecked(&vcc->stats->rx_drop);
27783 goto drop;
27784 }
27785
27786 if ((sb = dev_alloc_skb(64)) == NULL) {
27787 printk("%s: Can't allocate buffers for AAL0.\n",
27788 card->name);
27789- atomic_inc(&vcc->stats->rx_err);
27790+ atomic_inc_unchecked(&vcc->stats->rx_err);
27791 goto drop;
27792 }
27793
27794@@ -1330,7 +1330,7 @@ idt77252_rx_raw(struct idt77252_dev *card)
27795 ATM_SKB(sb)->vcc = vcc;
27796 __net_timestamp(sb);
27797 vcc->push(vcc, sb);
27798- atomic_inc(&vcc->stats->rx);
27799+ atomic_inc_unchecked(&vcc->stats->rx);
27800
27801 drop:
27802 skb_pull(queue, 64);
27803@@ -1955,13 +1955,13 @@ idt77252_send_skb(struct atm_vcc *vcc, struct sk_buff *skb, int oam)
27804
27805 if (vc == NULL) {
27806 printk("%s: NULL connection in send().\n", card->name);
27807- atomic_inc(&vcc->stats->tx_err);
27808+ atomic_inc_unchecked(&vcc->stats->tx_err);
27809 dev_kfree_skb(skb);
27810 return -EINVAL;
27811 }
27812 if (!test_bit(VCF_TX, &vc->flags)) {
27813 printk("%s: Trying to transmit on a non-tx VC.\n", card->name);
27814- atomic_inc(&vcc->stats->tx_err);
27815+ atomic_inc_unchecked(&vcc->stats->tx_err);
27816 dev_kfree_skb(skb);
27817 return -EINVAL;
27818 }
27819@@ -1973,14 +1973,14 @@ idt77252_send_skb(struct atm_vcc *vcc, struct sk_buff *skb, int oam)
27820 break;
27821 default:
27822 printk("%s: Unsupported AAL: %d\n", card->name, vcc->qos.aal);
27823- atomic_inc(&vcc->stats->tx_err);
27824+ atomic_inc_unchecked(&vcc->stats->tx_err);
27825 dev_kfree_skb(skb);
27826 return -EINVAL;
27827 }
27828
27829 if (skb_shinfo(skb)->nr_frags != 0) {
27830 printk("%s: No scatter-gather yet.\n", card->name);
27831- atomic_inc(&vcc->stats->tx_err);
27832+ atomic_inc_unchecked(&vcc->stats->tx_err);
27833 dev_kfree_skb(skb);
27834 return -EINVAL;
27835 }
27836@@ -1988,7 +1988,7 @@ idt77252_send_skb(struct atm_vcc *vcc, struct sk_buff *skb, int oam)
27837
27838 err = queue_skb(card, vc, skb, oam);
27839 if (err) {
27840- atomic_inc(&vcc->stats->tx_err);
27841+ atomic_inc_unchecked(&vcc->stats->tx_err);
27842 dev_kfree_skb(skb);
27843 return err;
27844 }
27845@@ -2011,7 +2011,7 @@ idt77252_send_oam(struct atm_vcc *vcc, void *cell, int flags)
27846 skb = dev_alloc_skb(64);
27847 if (!skb) {
27848 printk("%s: Out of memory in send_oam().\n", card->name);
27849- atomic_inc(&vcc->stats->tx_err);
27850+ atomic_inc_unchecked(&vcc->stats->tx_err);
27851 return -ENOMEM;
27852 }
27853 atomic_add(skb->truesize, &sk_atm(vcc)->sk_wmem_alloc);
27854diff --git a/drivers/atm/iphase.c b/drivers/atm/iphase.c
27855index 3d0c2b0..45441fa 100644
27856--- a/drivers/atm/iphase.c
27857+++ b/drivers/atm/iphase.c
27858@@ -1146,7 +1146,7 @@ static int rx_pkt(struct atm_dev *dev)
27859 status = (u_short) (buf_desc_ptr->desc_mode);
27860 if (status & (RX_CER | RX_PTE | RX_OFL))
27861 {
27862- atomic_inc(&vcc->stats->rx_err);
27863+ atomic_inc_unchecked(&vcc->stats->rx_err);
27864 IF_ERR(printk("IA: bad packet, dropping it");)
27865 if (status & RX_CER) {
27866 IF_ERR(printk(" cause: packet CRC error\n");)
27867@@ -1169,7 +1169,7 @@ static int rx_pkt(struct atm_dev *dev)
27868 len = dma_addr - buf_addr;
27869 if (len > iadev->rx_buf_sz) {
27870 printk("Over %d bytes sdu received, dropped!!!\n", iadev->rx_buf_sz);
27871- atomic_inc(&vcc->stats->rx_err);
27872+ atomic_inc_unchecked(&vcc->stats->rx_err);
27873 goto out_free_desc;
27874 }
27875
27876@@ -1319,7 +1319,7 @@ static void rx_dle_intr(struct atm_dev *dev)
27877 ia_vcc = INPH_IA_VCC(vcc);
27878 if (ia_vcc == NULL)
27879 {
27880- atomic_inc(&vcc->stats->rx_err);
27881+ atomic_inc_unchecked(&vcc->stats->rx_err);
27882 dev_kfree_skb_any(skb);
27883 atm_return(vcc, atm_guess_pdu2truesize(len));
27884 goto INCR_DLE;
27885@@ -1331,7 +1331,7 @@ static void rx_dle_intr(struct atm_dev *dev)
27886 if ((length > iadev->rx_buf_sz) || (length >
27887 (skb->len - sizeof(struct cpcs_trailer))))
27888 {
27889- atomic_inc(&vcc->stats->rx_err);
27890+ atomic_inc_unchecked(&vcc->stats->rx_err);
27891 IF_ERR(printk("rx_dle_intr: Bad AAL5 trailer %d (skb len %d)",
27892 length, skb->len);)
27893 dev_kfree_skb_any(skb);
27894@@ -1347,7 +1347,7 @@ static void rx_dle_intr(struct atm_dev *dev)
27895
27896 IF_RX(printk("rx_dle_intr: skb push");)
27897 vcc->push(vcc,skb);
27898- atomic_inc(&vcc->stats->rx);
27899+ atomic_inc_unchecked(&vcc->stats->rx);
27900 iadev->rx_pkt_cnt++;
27901 }
27902 INCR_DLE:
27903@@ -2827,15 +2827,15 @@ static int ia_ioctl(struct atm_dev *dev, unsigned int cmd, void __user *arg)
27904 {
27905 struct k_sonet_stats *stats;
27906 stats = &PRIV(_ia_dev[board])->sonet_stats;
27907- printk("section_bip: %d\n", atomic_read(&stats->section_bip));
27908- printk("line_bip : %d\n", atomic_read(&stats->line_bip));
27909- printk("path_bip : %d\n", atomic_read(&stats->path_bip));
27910- printk("line_febe : %d\n", atomic_read(&stats->line_febe));
27911- printk("path_febe : %d\n", atomic_read(&stats->path_febe));
27912- printk("corr_hcs : %d\n", atomic_read(&stats->corr_hcs));
27913- printk("uncorr_hcs : %d\n", atomic_read(&stats->uncorr_hcs));
27914- printk("tx_cells : %d\n", atomic_read(&stats->tx_cells));
27915- printk("rx_cells : %d\n", atomic_read(&stats->rx_cells));
27916+ printk("section_bip: %d\n", atomic_read_unchecked(&stats->section_bip));
27917+ printk("line_bip : %d\n", atomic_read_unchecked(&stats->line_bip));
27918+ printk("path_bip : %d\n", atomic_read_unchecked(&stats->path_bip));
27919+ printk("line_febe : %d\n", atomic_read_unchecked(&stats->line_febe));
27920+ printk("path_febe : %d\n", atomic_read_unchecked(&stats->path_febe));
27921+ printk("corr_hcs : %d\n", atomic_read_unchecked(&stats->corr_hcs));
27922+ printk("uncorr_hcs : %d\n", atomic_read_unchecked(&stats->uncorr_hcs));
27923+ printk("tx_cells : %d\n", atomic_read_unchecked(&stats->tx_cells));
27924+ printk("rx_cells : %d\n", atomic_read_unchecked(&stats->rx_cells));
27925 }
27926 ia_cmds.status = 0;
27927 break;
27928@@ -2940,7 +2940,7 @@ static int ia_pkt_tx (struct atm_vcc *vcc, struct sk_buff *skb) {
27929 if ((desc == 0) || (desc > iadev->num_tx_desc))
27930 {
27931 IF_ERR(printk(DEV_LABEL "invalid desc for send: %d\n", desc);)
27932- atomic_inc(&vcc->stats->tx);
27933+ atomic_inc_unchecked(&vcc->stats->tx);
27934 if (vcc->pop)
27935 vcc->pop(vcc, skb);
27936 else
27937@@ -3045,14 +3045,14 @@ static int ia_pkt_tx (struct atm_vcc *vcc, struct sk_buff *skb) {
27938 ATM_DESC(skb) = vcc->vci;
27939 skb_queue_tail(&iadev->tx_dma_q, skb);
27940
27941- atomic_inc(&vcc->stats->tx);
27942+ atomic_inc_unchecked(&vcc->stats->tx);
27943 iadev->tx_pkt_cnt++;
27944 /* Increment transaction counter */
27945 writel(2, iadev->dma+IPHASE5575_TX_COUNTER);
27946
27947 #if 0
27948 /* add flow control logic */
27949- if (atomic_read(&vcc->stats->tx) % 20 == 0) {
27950+ if (atomic_read_unchecked(&vcc->stats->tx) % 20 == 0) {
27951 if (iavcc->vc_desc_cnt > 10) {
27952 vcc->tx_quota = vcc->tx_quota * 3 / 4;
27953 printk("Tx1: vcc->tx_quota = %d \n", (u32)vcc->tx_quota );
27954diff --git a/drivers/atm/lanai.c b/drivers/atm/lanai.c
27955index f556969..0da15eb 100644
27956--- a/drivers/atm/lanai.c
27957+++ b/drivers/atm/lanai.c
27958@@ -1303,7 +1303,7 @@ static void lanai_send_one_aal5(struct lanai_dev *lanai,
27959 vcc_tx_add_aal5_trailer(lvcc, skb->len, 0, 0);
27960 lanai_endtx(lanai, lvcc);
27961 lanai_free_skb(lvcc->tx.atmvcc, skb);
27962- atomic_inc(&lvcc->tx.atmvcc->stats->tx);
27963+ atomic_inc_unchecked(&lvcc->tx.atmvcc->stats->tx);
27964 }
27965
27966 /* Try to fill the buffer - don't call unless there is backlog */
27967@@ -1426,7 +1426,7 @@ static void vcc_rx_aal5(struct lanai_vcc *lvcc, int endptr)
27968 ATM_SKB(skb)->vcc = lvcc->rx.atmvcc;
27969 __net_timestamp(skb);
27970 lvcc->rx.atmvcc->push(lvcc->rx.atmvcc, skb);
27971- atomic_inc(&lvcc->rx.atmvcc->stats->rx);
27972+ atomic_inc_unchecked(&lvcc->rx.atmvcc->stats->rx);
27973 out:
27974 lvcc->rx.buf.ptr = end;
27975 cardvcc_write(lvcc, endptr, vcc_rxreadptr);
27976@@ -1667,7 +1667,7 @@ static int handle_service(struct lanai_dev *lanai, u32 s)
27977 DPRINTK("(itf %d) got RX service entry 0x%X for non-AAL5 "
27978 "vcc %d\n", lanai->number, (unsigned int) s, vci);
27979 lanai->stats.service_rxnotaal5++;
27980- atomic_inc(&lvcc->rx.atmvcc->stats->rx_err);
27981+ atomic_inc_unchecked(&lvcc->rx.atmvcc->stats->rx_err);
27982 return 0;
27983 }
27984 if (likely(!(s & (SERVICE_TRASH | SERVICE_STREAM | SERVICE_CRCERR)))) {
27985@@ -1679,7 +1679,7 @@ static int handle_service(struct lanai_dev *lanai, u32 s)
27986 int bytes;
27987 read_unlock(&vcc_sklist_lock);
27988 DPRINTK("got trashed rx pdu on vci %d\n", vci);
27989- atomic_inc(&lvcc->rx.atmvcc->stats->rx_err);
27990+ atomic_inc_unchecked(&lvcc->rx.atmvcc->stats->rx_err);
27991 lvcc->stats.x.aal5.service_trash++;
27992 bytes = (SERVICE_GET_END(s) * 16) -
27993 (((unsigned long) lvcc->rx.buf.ptr) -
27994@@ -1691,7 +1691,7 @@ static int handle_service(struct lanai_dev *lanai, u32 s)
27995 }
27996 if (s & SERVICE_STREAM) {
27997 read_unlock(&vcc_sklist_lock);
27998- atomic_inc(&lvcc->rx.atmvcc->stats->rx_err);
27999+ atomic_inc_unchecked(&lvcc->rx.atmvcc->stats->rx_err);
28000 lvcc->stats.x.aal5.service_stream++;
28001 printk(KERN_ERR DEV_LABEL "(itf %d): Got AAL5 stream "
28002 "PDU on VCI %d!\n", lanai->number, vci);
28003@@ -1699,7 +1699,7 @@ static int handle_service(struct lanai_dev *lanai, u32 s)
28004 return 0;
28005 }
28006 DPRINTK("got rx crc error on vci %d\n", vci);
28007- atomic_inc(&lvcc->rx.atmvcc->stats->rx_err);
28008+ atomic_inc_unchecked(&lvcc->rx.atmvcc->stats->rx_err);
28009 lvcc->stats.x.aal5.service_rxcrc++;
28010 lvcc->rx.buf.ptr = &lvcc->rx.buf.start[SERVICE_GET_END(s) * 4];
28011 cardvcc_write(lvcc, SERVICE_GET_END(s), vcc_rxreadptr);
28012diff --git a/drivers/atm/nicstar.c b/drivers/atm/nicstar.c
28013index 1c70c45..300718d 100644
28014--- a/drivers/atm/nicstar.c
28015+++ b/drivers/atm/nicstar.c
28016@@ -1654,7 +1654,7 @@ static int ns_send(struct atm_vcc *vcc, struct sk_buff *skb)
28017 if ((vc = (vc_map *) vcc->dev_data) == NULL) {
28018 printk("nicstar%d: vcc->dev_data == NULL on ns_send().\n",
28019 card->index);
28020- atomic_inc(&vcc->stats->tx_err);
28021+ atomic_inc_unchecked(&vcc->stats->tx_err);
28022 dev_kfree_skb_any(skb);
28023 return -EINVAL;
28024 }
28025@@ -1662,7 +1662,7 @@ static int ns_send(struct atm_vcc *vcc, struct sk_buff *skb)
28026 if (!vc->tx) {
28027 printk("nicstar%d: Trying to transmit on a non-tx VC.\n",
28028 card->index);
28029- atomic_inc(&vcc->stats->tx_err);
28030+ atomic_inc_unchecked(&vcc->stats->tx_err);
28031 dev_kfree_skb_any(skb);
28032 return -EINVAL;
28033 }
28034@@ -1670,14 +1670,14 @@ static int ns_send(struct atm_vcc *vcc, struct sk_buff *skb)
28035 if (vcc->qos.aal != ATM_AAL5 && vcc->qos.aal != ATM_AAL0) {
28036 printk("nicstar%d: Only AAL0 and AAL5 are supported.\n",
28037 card->index);
28038- atomic_inc(&vcc->stats->tx_err);
28039+ atomic_inc_unchecked(&vcc->stats->tx_err);
28040 dev_kfree_skb_any(skb);
28041 return -EINVAL;
28042 }
28043
28044 if (skb_shinfo(skb)->nr_frags != 0) {
28045 printk("nicstar%d: No scatter-gather yet.\n", card->index);
28046- atomic_inc(&vcc->stats->tx_err);
28047+ atomic_inc_unchecked(&vcc->stats->tx_err);
28048 dev_kfree_skb_any(skb);
28049 return -EINVAL;
28050 }
28051@@ -1725,11 +1725,11 @@ static int ns_send(struct atm_vcc *vcc, struct sk_buff *skb)
28052 }
28053
28054 if (push_scqe(card, vc, scq, &scqe, skb) != 0) {
28055- atomic_inc(&vcc->stats->tx_err);
28056+ atomic_inc_unchecked(&vcc->stats->tx_err);
28057 dev_kfree_skb_any(skb);
28058 return -EIO;
28059 }
28060- atomic_inc(&vcc->stats->tx);
28061+ atomic_inc_unchecked(&vcc->stats->tx);
28062
28063 return 0;
28064 }
28065@@ -2046,14 +2046,14 @@ static void dequeue_rx(ns_dev * card, ns_rsqe * rsqe)
28066 printk
28067 ("nicstar%d: Can't allocate buffers for aal0.\n",
28068 card->index);
28069- atomic_add(i, &vcc->stats->rx_drop);
28070+ atomic_add_unchecked(i, &vcc->stats->rx_drop);
28071 break;
28072 }
28073 if (!atm_charge(vcc, sb->truesize)) {
28074 RXPRINTK
28075 ("nicstar%d: atm_charge() dropped aal0 packets.\n",
28076 card->index);
28077- atomic_add(i - 1, &vcc->stats->rx_drop); /* already increased by 1 */
28078+ atomic_add_unchecked(i - 1, &vcc->stats->rx_drop); /* already increased by 1 */
28079 dev_kfree_skb_any(sb);
28080 break;
28081 }
28082@@ -2068,7 +2068,7 @@ static void dequeue_rx(ns_dev * card, ns_rsqe * rsqe)
28083 ATM_SKB(sb)->vcc = vcc;
28084 __net_timestamp(sb);
28085 vcc->push(vcc, sb);
28086- atomic_inc(&vcc->stats->rx);
28087+ atomic_inc_unchecked(&vcc->stats->rx);
28088 cell += ATM_CELL_PAYLOAD;
28089 }
28090
28091@@ -2085,7 +2085,7 @@ static void dequeue_rx(ns_dev * card, ns_rsqe * rsqe)
28092 if (iovb == NULL) {
28093 printk("nicstar%d: Out of iovec buffers.\n",
28094 card->index);
28095- atomic_inc(&vcc->stats->rx_drop);
28096+ atomic_inc_unchecked(&vcc->stats->rx_drop);
28097 recycle_rx_buf(card, skb);
28098 return;
28099 }
28100@@ -2109,7 +2109,7 @@ static void dequeue_rx(ns_dev * card, ns_rsqe * rsqe)
28101 small or large buffer itself. */
28102 } else if (NS_PRV_IOVCNT(iovb) >= NS_MAX_IOVECS) {
28103 printk("nicstar%d: received too big AAL5 SDU.\n", card->index);
28104- atomic_inc(&vcc->stats->rx_err);
28105+ atomic_inc_unchecked(&vcc->stats->rx_err);
28106 recycle_iovec_rx_bufs(card, (struct iovec *)iovb->data,
28107 NS_MAX_IOVECS);
28108 NS_PRV_IOVCNT(iovb) = 0;
28109@@ -2129,7 +2129,7 @@ static void dequeue_rx(ns_dev * card, ns_rsqe * rsqe)
28110 ("nicstar%d: Expected a small buffer, and this is not one.\n",
28111 card->index);
28112 which_list(card, skb);
28113- atomic_inc(&vcc->stats->rx_err);
28114+ atomic_inc_unchecked(&vcc->stats->rx_err);
28115 recycle_rx_buf(card, skb);
28116 vc->rx_iov = NULL;
28117 recycle_iov_buf(card, iovb);
28118@@ -2142,7 +2142,7 @@ static void dequeue_rx(ns_dev * card, ns_rsqe * rsqe)
28119 ("nicstar%d: Expected a large buffer, and this is not one.\n",
28120 card->index);
28121 which_list(card, skb);
28122- atomic_inc(&vcc->stats->rx_err);
28123+ atomic_inc_unchecked(&vcc->stats->rx_err);
28124 recycle_iovec_rx_bufs(card, (struct iovec *)iovb->data,
28125 NS_PRV_IOVCNT(iovb));
28126 vc->rx_iov = NULL;
28127@@ -2165,7 +2165,7 @@ static void dequeue_rx(ns_dev * card, ns_rsqe * rsqe)
28128 printk(" - PDU size mismatch.\n");
28129 else
28130 printk(".\n");
28131- atomic_inc(&vcc->stats->rx_err);
28132+ atomic_inc_unchecked(&vcc->stats->rx_err);
28133 recycle_iovec_rx_bufs(card, (struct iovec *)iovb->data,
28134 NS_PRV_IOVCNT(iovb));
28135 vc->rx_iov = NULL;
28136@@ -2179,7 +2179,7 @@ static void dequeue_rx(ns_dev * card, ns_rsqe * rsqe)
28137 /* skb points to a small buffer */
28138 if (!atm_charge(vcc, skb->truesize)) {
28139 push_rxbufs(card, skb);
28140- atomic_inc(&vcc->stats->rx_drop);
28141+ atomic_inc_unchecked(&vcc->stats->rx_drop);
28142 } else {
28143 skb_put(skb, len);
28144 dequeue_sm_buf(card, skb);
28145@@ -2189,7 +2189,7 @@ static void dequeue_rx(ns_dev * card, ns_rsqe * rsqe)
28146 ATM_SKB(skb)->vcc = vcc;
28147 __net_timestamp(skb);
28148 vcc->push(vcc, skb);
28149- atomic_inc(&vcc->stats->rx);
28150+ atomic_inc_unchecked(&vcc->stats->rx);
28151 }
28152 } else if (NS_PRV_IOVCNT(iovb) == 2) { /* One small plus one large buffer */
28153 struct sk_buff *sb;
28154@@ -2200,7 +2200,7 @@ static void dequeue_rx(ns_dev * card, ns_rsqe * rsqe)
28155 if (len <= NS_SMBUFSIZE) {
28156 if (!atm_charge(vcc, sb->truesize)) {
28157 push_rxbufs(card, sb);
28158- atomic_inc(&vcc->stats->rx_drop);
28159+ atomic_inc_unchecked(&vcc->stats->rx_drop);
28160 } else {
28161 skb_put(sb, len);
28162 dequeue_sm_buf(card, sb);
28163@@ -2210,7 +2210,7 @@ static void dequeue_rx(ns_dev * card, ns_rsqe * rsqe)
28164 ATM_SKB(sb)->vcc = vcc;
28165 __net_timestamp(sb);
28166 vcc->push(vcc, sb);
28167- atomic_inc(&vcc->stats->rx);
28168+ atomic_inc_unchecked(&vcc->stats->rx);
28169 }
28170
28171 push_rxbufs(card, skb);
28172@@ -2219,7 +2219,7 @@ static void dequeue_rx(ns_dev * card, ns_rsqe * rsqe)
28173
28174 if (!atm_charge(vcc, skb->truesize)) {
28175 push_rxbufs(card, skb);
28176- atomic_inc(&vcc->stats->rx_drop);
28177+ atomic_inc_unchecked(&vcc->stats->rx_drop);
28178 } else {
28179 dequeue_lg_buf(card, skb);
28180 #ifdef NS_USE_DESTRUCTORS
28181@@ -2232,7 +2232,7 @@ static void dequeue_rx(ns_dev * card, ns_rsqe * rsqe)
28182 ATM_SKB(skb)->vcc = vcc;
28183 __net_timestamp(skb);
28184 vcc->push(vcc, skb);
28185- atomic_inc(&vcc->stats->rx);
28186+ atomic_inc_unchecked(&vcc->stats->rx);
28187 }
28188
28189 push_rxbufs(card, sb);
28190@@ -2253,7 +2253,7 @@ static void dequeue_rx(ns_dev * card, ns_rsqe * rsqe)
28191 printk
28192 ("nicstar%d: Out of huge buffers.\n",
28193 card->index);
28194- atomic_inc(&vcc->stats->rx_drop);
28195+ atomic_inc_unchecked(&vcc->stats->rx_drop);
28196 recycle_iovec_rx_bufs(card,
28197 (struct iovec *)
28198 iovb->data,
28199@@ -2304,7 +2304,7 @@ static void dequeue_rx(ns_dev * card, ns_rsqe * rsqe)
28200 card->hbpool.count++;
28201 } else
28202 dev_kfree_skb_any(hb);
28203- atomic_inc(&vcc->stats->rx_drop);
28204+ atomic_inc_unchecked(&vcc->stats->rx_drop);
28205 } else {
28206 /* Copy the small buffer to the huge buffer */
28207 sb = (struct sk_buff *)iov->iov_base;
28208@@ -2341,7 +2341,7 @@ static void dequeue_rx(ns_dev * card, ns_rsqe * rsqe)
28209 #endif /* NS_USE_DESTRUCTORS */
28210 __net_timestamp(hb);
28211 vcc->push(vcc, hb);
28212- atomic_inc(&vcc->stats->rx);
28213+ atomic_inc_unchecked(&vcc->stats->rx);
28214 }
28215 }
28216
28217diff --git a/drivers/atm/solos-pci.c b/drivers/atm/solos-pci.c
28218index 5d1d076..12fbca4 100644
28219--- a/drivers/atm/solos-pci.c
28220+++ b/drivers/atm/solos-pci.c
28221@@ -714,7 +714,7 @@ void solos_bh(unsigned long card_arg)
28222 }
28223 atm_charge(vcc, skb->truesize);
28224 vcc->push(vcc, skb);
28225- atomic_inc(&vcc->stats->rx);
28226+ atomic_inc_unchecked(&vcc->stats->rx);
28227 break;
28228
28229 case PKT_STATUS:
28230@@ -1008,7 +1008,7 @@ static uint32_t fpga_tx(struct solos_card *card)
28231 vcc = SKB_CB(oldskb)->vcc;
28232
28233 if (vcc) {
28234- atomic_inc(&vcc->stats->tx);
28235+ atomic_inc_unchecked(&vcc->stats->tx);
28236 solos_pop(vcc, oldskb);
28237 } else
28238 dev_kfree_skb_irq(oldskb);
28239diff --git a/drivers/atm/suni.c b/drivers/atm/suni.c
28240index 90f1ccc..04c4a1e 100644
28241--- a/drivers/atm/suni.c
28242+++ b/drivers/atm/suni.c
28243@@ -50,8 +50,8 @@ static DEFINE_SPINLOCK(sunis_lock);
28244
28245
28246 #define ADD_LIMITED(s,v) \
28247- atomic_add((v),&stats->s); \
28248- if (atomic_read(&stats->s) < 0) atomic_set(&stats->s,INT_MAX);
28249+ atomic_add_unchecked((v),&stats->s); \
28250+ if (atomic_read_unchecked(&stats->s) < 0) atomic_set_unchecked(&stats->s,INT_MAX);
28251
28252
28253 static void suni_hz(unsigned long from_timer)
28254diff --git a/drivers/atm/uPD98402.c b/drivers/atm/uPD98402.c
28255index 5120a96..e2572bd 100644
28256--- a/drivers/atm/uPD98402.c
28257+++ b/drivers/atm/uPD98402.c
28258@@ -42,7 +42,7 @@ static int fetch_stats(struct atm_dev *dev,struct sonet_stats __user *arg,int ze
28259 struct sonet_stats tmp;
28260 int error = 0;
28261
28262- atomic_add(GET(HECCT),&PRIV(dev)->sonet_stats.uncorr_hcs);
28263+ atomic_add_unchecked(GET(HECCT),&PRIV(dev)->sonet_stats.uncorr_hcs);
28264 sonet_copy_stats(&PRIV(dev)->sonet_stats,&tmp);
28265 if (arg) error = copy_to_user(arg,&tmp,sizeof(tmp));
28266 if (zero && !error) {
28267@@ -161,9 +161,9 @@ static int uPD98402_ioctl(struct atm_dev *dev,unsigned int cmd,void __user *arg)
28268
28269
28270 #define ADD_LIMITED(s,v) \
28271- { atomic_add(GET(v),&PRIV(dev)->sonet_stats.s); \
28272- if (atomic_read(&PRIV(dev)->sonet_stats.s) < 0) \
28273- atomic_set(&PRIV(dev)->sonet_stats.s,INT_MAX); }
28274+ { atomic_add_unchecked(GET(v),&PRIV(dev)->sonet_stats.s); \
28275+ if (atomic_read_unchecked(&PRIV(dev)->sonet_stats.s) < 0) \
28276+ atomic_set_unchecked(&PRIV(dev)->sonet_stats.s,INT_MAX); }
28277
28278
28279 static void stat_event(struct atm_dev *dev)
28280@@ -194,7 +194,7 @@ static void uPD98402_int(struct atm_dev *dev)
28281 if (reason & uPD98402_INT_PFM) stat_event(dev);
28282 if (reason & uPD98402_INT_PCO) {
28283 (void) GET(PCOCR); /* clear interrupt cause */
28284- atomic_add(GET(HECCT),
28285+ atomic_add_unchecked(GET(HECCT),
28286 &PRIV(dev)->sonet_stats.uncorr_hcs);
28287 }
28288 if ((reason & uPD98402_INT_RFO) &&
28289@@ -222,9 +222,9 @@ static int uPD98402_start(struct atm_dev *dev)
28290 PUT(~(uPD98402_INT_PFM | uPD98402_INT_ALM | uPD98402_INT_RFO |
28291 uPD98402_INT_LOS),PIMR); /* enable them */
28292 (void) fetch_stats(dev,NULL,1); /* clear kernel counters */
28293- atomic_set(&PRIV(dev)->sonet_stats.corr_hcs,-1);
28294- atomic_set(&PRIV(dev)->sonet_stats.tx_cells,-1);
28295- atomic_set(&PRIV(dev)->sonet_stats.rx_cells,-1);
28296+ atomic_set_unchecked(&PRIV(dev)->sonet_stats.corr_hcs,-1);
28297+ atomic_set_unchecked(&PRIV(dev)->sonet_stats.tx_cells,-1);
28298+ atomic_set_unchecked(&PRIV(dev)->sonet_stats.rx_cells,-1);
28299 return 0;
28300 }
28301
28302diff --git a/drivers/atm/zatm.c b/drivers/atm/zatm.c
28303index d889f56..17eb71e 100644
28304--- a/drivers/atm/zatm.c
28305+++ b/drivers/atm/zatm.c
28306@@ -460,7 +460,7 @@ printk("dummy: 0x%08lx, 0x%08lx\n",dummy[0],dummy[1]);
28307 }
28308 if (!size) {
28309 dev_kfree_skb_irq(skb);
28310- if (vcc) atomic_inc(&vcc->stats->rx_err);
28311+ if (vcc) atomic_inc_unchecked(&vcc->stats->rx_err);
28312 continue;
28313 }
28314 if (!atm_charge(vcc,skb->truesize)) {
28315@@ -470,7 +470,7 @@ printk("dummy: 0x%08lx, 0x%08lx\n",dummy[0],dummy[1]);
28316 skb->len = size;
28317 ATM_SKB(skb)->vcc = vcc;
28318 vcc->push(vcc,skb);
28319- atomic_inc(&vcc->stats->rx);
28320+ atomic_inc_unchecked(&vcc->stats->rx);
28321 }
28322 zout(pos & 0xffff,MTA(mbx));
28323 #if 0 /* probably a stupid idea */
28324@@ -734,7 +734,7 @@ if (*ZATM_PRV_DSC(skb) != (uPD98401_TXPD_V | uPD98401_TXPD_DP |
28325 skb_queue_head(&zatm_vcc->backlog,skb);
28326 break;
28327 }
28328- atomic_inc(&vcc->stats->tx);
28329+ atomic_inc_unchecked(&vcc->stats->tx);
28330 wake_up(&zatm_vcc->tx_wait);
28331 }
28332
28333diff --git a/drivers/base/devtmpfs.c b/drivers/base/devtmpfs.c
28334index a4760e0..51283cf 100644
28335--- a/drivers/base/devtmpfs.c
28336+++ b/drivers/base/devtmpfs.c
28337@@ -368,7 +368,7 @@ int devtmpfs_mount(const char *mntdir)
28338 if (!thread)
28339 return 0;
28340
28341- err = sys_mount("devtmpfs", (char *)mntdir, "devtmpfs", MS_SILENT, NULL);
28342+ err = sys_mount((char __force_user *)"devtmpfs", (char __force_user *)mntdir, (char __force_user *)"devtmpfs", MS_SILENT, NULL);
28343 if (err)
28344 printk(KERN_INFO "devtmpfs: error mounting %i\n", err);
28345 else
28346diff --git a/drivers/base/power/wakeup.c b/drivers/base/power/wakeup.c
28347index caf995f..6f76697 100644
28348--- a/drivers/base/power/wakeup.c
28349+++ b/drivers/base/power/wakeup.c
28350@@ -30,14 +30,14 @@ bool events_check_enabled;
28351 * They need to be modified together atomically, so it's better to use one
28352 * atomic variable to hold them both.
28353 */
28354-static atomic_t combined_event_count = ATOMIC_INIT(0);
28355+static atomic_unchecked_t combined_event_count = ATOMIC_INIT(0);
28356
28357 #define IN_PROGRESS_BITS (sizeof(int) * 4)
28358 #define MAX_IN_PROGRESS ((1 << IN_PROGRESS_BITS) - 1)
28359
28360 static void split_counters(unsigned int *cnt, unsigned int *inpr)
28361 {
28362- unsigned int comb = atomic_read(&combined_event_count);
28363+ unsigned int comb = atomic_read_unchecked(&combined_event_count);
28364
28365 *cnt = (comb >> IN_PROGRESS_BITS);
28366 *inpr = comb & MAX_IN_PROGRESS;
28367@@ -353,7 +353,7 @@ static void wakeup_source_activate(struct wakeup_source *ws)
28368 ws->last_time = ktime_get();
28369
28370 /* Increment the counter of events in progress. */
28371- atomic_inc(&combined_event_count);
28372+ atomic_inc_unchecked(&combined_event_count);
28373 }
28374
28375 /**
28376@@ -443,7 +443,7 @@ static void wakeup_source_deactivate(struct wakeup_source *ws)
28377 * Increment the counter of registered wakeup events and decrement the
28378 * couter of wakeup events in progress simultaneously.
28379 */
28380- atomic_add(MAX_IN_PROGRESS, &combined_event_count);
28381+ atomic_add_unchecked(MAX_IN_PROGRESS, &combined_event_count);
28382 }
28383
28384 /**
28385diff --git a/drivers/block/cciss.c b/drivers/block/cciss.c
28386index b0f553b..77b928b 100644
28387--- a/drivers/block/cciss.c
28388+++ b/drivers/block/cciss.c
28389@@ -1198,6 +1198,8 @@ static int cciss_ioctl32_passthru(struct block_device *bdev, fmode_t mode,
28390 int err;
28391 u32 cp;
28392
28393+ memset(&arg64, 0, sizeof(arg64));
28394+
28395 err = 0;
28396 err |=
28397 copy_from_user(&arg64.LUN_info, &arg32->LUN_info,
28398@@ -3007,7 +3009,7 @@ static void start_io(ctlr_info_t *h)
28399 while (!list_empty(&h->reqQ)) {
28400 c = list_entry(h->reqQ.next, CommandList_struct, list);
28401 /* can't do anything if fifo is full */
28402- if ((h->access.fifo_full(h))) {
28403+ if ((h->access->fifo_full(h))) {
28404 dev_warn(&h->pdev->dev, "fifo full\n");
28405 break;
28406 }
28407@@ -3017,7 +3019,7 @@ static void start_io(ctlr_info_t *h)
28408 h->Qdepth--;
28409
28410 /* Tell the controller execute command */
28411- h->access.submit_command(h, c);
28412+ h->access->submit_command(h, c);
28413
28414 /* Put job onto the completed Q */
28415 addQ(&h->cmpQ, c);
28416@@ -3443,17 +3445,17 @@ startio:
28417
28418 static inline unsigned long get_next_completion(ctlr_info_t *h)
28419 {
28420- return h->access.command_completed(h);
28421+ return h->access->command_completed(h);
28422 }
28423
28424 static inline int interrupt_pending(ctlr_info_t *h)
28425 {
28426- return h->access.intr_pending(h);
28427+ return h->access->intr_pending(h);
28428 }
28429
28430 static inline long interrupt_not_for_us(ctlr_info_t *h)
28431 {
28432- return ((h->access.intr_pending(h) == 0) ||
28433+ return ((h->access->intr_pending(h) == 0) ||
28434 (h->interrupts_enabled == 0));
28435 }
28436
28437@@ -3486,7 +3488,7 @@ static inline u32 next_command(ctlr_info_t *h)
28438 u32 a;
28439
28440 if (unlikely(!(h->transMethod & CFGTBL_Trans_Performant)))
28441- return h->access.command_completed(h);
28442+ return h->access->command_completed(h);
28443
28444 if ((*(h->reply_pool_head) & 1) == (h->reply_pool_wraparound)) {
28445 a = *(h->reply_pool_head); /* Next cmd in ring buffer */
28446@@ -4044,7 +4046,7 @@ static void __devinit cciss_put_controller_into_performant_mode(ctlr_info_t *h)
28447 trans_support & CFGTBL_Trans_use_short_tags);
28448
28449 /* Change the access methods to the performant access methods */
28450- h->access = SA5_performant_access;
28451+ h->access = &SA5_performant_access;
28452 h->transMethod = CFGTBL_Trans_Performant;
28453
28454 return;
28455@@ -4316,7 +4318,7 @@ static int __devinit cciss_pci_init(ctlr_info_t *h)
28456 if (prod_index < 0)
28457 return -ENODEV;
28458 h->product_name = products[prod_index].product_name;
28459- h->access = *(products[prod_index].access);
28460+ h->access = products[prod_index].access;
28461
28462 if (cciss_board_disabled(h)) {
28463 dev_warn(&h->pdev->dev, "controller appears to be disabled\n");
28464@@ -5041,7 +5043,7 @@ reinit_after_soft_reset:
28465 }
28466
28467 /* make sure the board interrupts are off */
28468- h->access.set_intr_mask(h, CCISS_INTR_OFF);
28469+ h->access->set_intr_mask(h, CCISS_INTR_OFF);
28470 rc = cciss_request_irq(h, do_cciss_msix_intr, do_cciss_intx);
28471 if (rc)
28472 goto clean2;
28473@@ -5093,7 +5095,7 @@ reinit_after_soft_reset:
28474 * fake ones to scoop up any residual completions.
28475 */
28476 spin_lock_irqsave(&h->lock, flags);
28477- h->access.set_intr_mask(h, CCISS_INTR_OFF);
28478+ h->access->set_intr_mask(h, CCISS_INTR_OFF);
28479 spin_unlock_irqrestore(&h->lock, flags);
28480 free_irq(h->intr[h->intr_mode], h);
28481 rc = cciss_request_irq(h, cciss_msix_discard_completions,
28482@@ -5113,9 +5115,9 @@ reinit_after_soft_reset:
28483 dev_info(&h->pdev->dev, "Board READY.\n");
28484 dev_info(&h->pdev->dev,
28485 "Waiting for stale completions to drain.\n");
28486- h->access.set_intr_mask(h, CCISS_INTR_ON);
28487+ h->access->set_intr_mask(h, CCISS_INTR_ON);
28488 msleep(10000);
28489- h->access.set_intr_mask(h, CCISS_INTR_OFF);
28490+ h->access->set_intr_mask(h, CCISS_INTR_OFF);
28491
28492 rc = controller_reset_failed(h->cfgtable);
28493 if (rc)
28494@@ -5138,7 +5140,7 @@ reinit_after_soft_reset:
28495 cciss_scsi_setup(h);
28496
28497 /* Turn the interrupts on so we can service requests */
28498- h->access.set_intr_mask(h, CCISS_INTR_ON);
28499+ h->access->set_intr_mask(h, CCISS_INTR_ON);
28500
28501 /* Get the firmware version */
28502 inq_buff = kzalloc(sizeof(InquiryData_struct), GFP_KERNEL);
28503@@ -5211,7 +5213,7 @@ static void cciss_shutdown(struct pci_dev *pdev)
28504 kfree(flush_buf);
28505 if (return_code != IO_OK)
28506 dev_warn(&h->pdev->dev, "Error flushing cache\n");
28507- h->access.set_intr_mask(h, CCISS_INTR_OFF);
28508+ h->access->set_intr_mask(h, CCISS_INTR_OFF);
28509 free_irq(h->intr[h->intr_mode], h);
28510 }
28511
28512diff --git a/drivers/block/cciss.h b/drivers/block/cciss.h
28513index 7fda30e..eb5dfe0 100644
28514--- a/drivers/block/cciss.h
28515+++ b/drivers/block/cciss.h
28516@@ -101,7 +101,7 @@ struct ctlr_info
28517 /* information about each logical volume */
28518 drive_info_struct *drv[CISS_MAX_LUN];
28519
28520- struct access_method access;
28521+ struct access_method *access;
28522
28523 /* queue and queue Info */
28524 struct list_head reqQ;
28525diff --git a/drivers/block/cpqarray.c b/drivers/block/cpqarray.c
28526index 9125bbe..eede5c8 100644
28527--- a/drivers/block/cpqarray.c
28528+++ b/drivers/block/cpqarray.c
28529@@ -404,7 +404,7 @@ static int __devinit cpqarray_register_ctlr( int i, struct pci_dev *pdev)
28530 if (register_blkdev(COMPAQ_SMART2_MAJOR+i, hba[i]->devname)) {
28531 goto Enomem4;
28532 }
28533- hba[i]->access.set_intr_mask(hba[i], 0);
28534+ hba[i]->access->set_intr_mask(hba[i], 0);
28535 if (request_irq(hba[i]->intr, do_ida_intr,
28536 IRQF_DISABLED|IRQF_SHARED, hba[i]->devname, hba[i]))
28537 {
28538@@ -459,7 +459,7 @@ static int __devinit cpqarray_register_ctlr( int i, struct pci_dev *pdev)
28539 add_timer(&hba[i]->timer);
28540
28541 /* Enable IRQ now that spinlock and rate limit timer are set up */
28542- hba[i]->access.set_intr_mask(hba[i], FIFO_NOT_EMPTY);
28543+ hba[i]->access->set_intr_mask(hba[i], FIFO_NOT_EMPTY);
28544
28545 for(j=0; j<NWD; j++) {
28546 struct gendisk *disk = ida_gendisk[i][j];
28547@@ -694,7 +694,7 @@ DBGINFO(
28548 for(i=0; i<NR_PRODUCTS; i++) {
28549 if (board_id == products[i].board_id) {
28550 c->product_name = products[i].product_name;
28551- c->access = *(products[i].access);
28552+ c->access = products[i].access;
28553 break;
28554 }
28555 }
28556@@ -792,7 +792,7 @@ static int __devinit cpqarray_eisa_detect(void)
28557 hba[ctlr]->intr = intr;
28558 sprintf(hba[ctlr]->devname, "ida%d", nr_ctlr);
28559 hba[ctlr]->product_name = products[j].product_name;
28560- hba[ctlr]->access = *(products[j].access);
28561+ hba[ctlr]->access = products[j].access;
28562 hba[ctlr]->ctlr = ctlr;
28563 hba[ctlr]->board_id = board_id;
28564 hba[ctlr]->pci_dev = NULL; /* not PCI */
28565@@ -980,7 +980,7 @@ static void start_io(ctlr_info_t *h)
28566
28567 while((c = h->reqQ) != NULL) {
28568 /* Can't do anything if we're busy */
28569- if (h->access.fifo_full(h) == 0)
28570+ if (h->access->fifo_full(h) == 0)
28571 return;
28572
28573 /* Get the first entry from the request Q */
28574@@ -988,7 +988,7 @@ static void start_io(ctlr_info_t *h)
28575 h->Qdepth--;
28576
28577 /* Tell the controller to do our bidding */
28578- h->access.submit_command(h, c);
28579+ h->access->submit_command(h, c);
28580
28581 /* Get onto the completion Q */
28582 addQ(&h->cmpQ, c);
28583@@ -1050,7 +1050,7 @@ static irqreturn_t do_ida_intr(int irq, void *dev_id)
28584 unsigned long flags;
28585 __u32 a,a1;
28586
28587- istat = h->access.intr_pending(h);
28588+ istat = h->access->intr_pending(h);
28589 /* Is this interrupt for us? */
28590 if (istat == 0)
28591 return IRQ_NONE;
28592@@ -1061,7 +1061,7 @@ static irqreturn_t do_ida_intr(int irq, void *dev_id)
28593 */
28594 spin_lock_irqsave(IDA_LOCK(h->ctlr), flags);
28595 if (istat & FIFO_NOT_EMPTY) {
28596- while((a = h->access.command_completed(h))) {
28597+ while((a = h->access->command_completed(h))) {
28598 a1 = a; a &= ~3;
28599 if ((c = h->cmpQ) == NULL)
28600 {
28601@@ -1449,11 +1449,11 @@ static int sendcmd(
28602 /*
28603 * Disable interrupt
28604 */
28605- info_p->access.set_intr_mask(info_p, 0);
28606+ info_p->access->set_intr_mask(info_p, 0);
28607 /* Make sure there is room in the command FIFO */
28608 /* Actually it should be completely empty at this time. */
28609 for (i = 200000; i > 0; i--) {
28610- temp = info_p->access.fifo_full(info_p);
28611+ temp = info_p->access->fifo_full(info_p);
28612 if (temp != 0) {
28613 break;
28614 }
28615@@ -1466,7 +1466,7 @@ DBG(
28616 /*
28617 * Send the cmd
28618 */
28619- info_p->access.submit_command(info_p, c);
28620+ info_p->access->submit_command(info_p, c);
28621 complete = pollcomplete(ctlr);
28622
28623 pci_unmap_single(info_p->pci_dev, (dma_addr_t) c->req.sg[0].addr,
28624@@ -1549,9 +1549,9 @@ static int revalidate_allvol(ctlr_info_t *host)
28625 * we check the new geometry. Then turn interrupts back on when
28626 * we're done.
28627 */
28628- host->access.set_intr_mask(host, 0);
28629+ host->access->set_intr_mask(host, 0);
28630 getgeometry(ctlr);
28631- host->access.set_intr_mask(host, FIFO_NOT_EMPTY);
28632+ host->access->set_intr_mask(host, FIFO_NOT_EMPTY);
28633
28634 for(i=0; i<NWD; i++) {
28635 struct gendisk *disk = ida_gendisk[ctlr][i];
28636@@ -1591,7 +1591,7 @@ static int pollcomplete(int ctlr)
28637 /* Wait (up to 2 seconds) for a command to complete */
28638
28639 for (i = 200000; i > 0; i--) {
28640- done = hba[ctlr]->access.command_completed(hba[ctlr]);
28641+ done = hba[ctlr]->access->command_completed(hba[ctlr]);
28642 if (done == 0) {
28643 udelay(10); /* a short fixed delay */
28644 } else
28645diff --git a/drivers/block/cpqarray.h b/drivers/block/cpqarray.h
28646index be73e9d..7fbf140 100644
28647--- a/drivers/block/cpqarray.h
28648+++ b/drivers/block/cpqarray.h
28649@@ -99,7 +99,7 @@ struct ctlr_info {
28650 drv_info_t drv[NWD];
28651 struct proc_dir_entry *proc;
28652
28653- struct access_method access;
28654+ struct access_method *access;
28655
28656 cmdlist_t *reqQ;
28657 cmdlist_t *cmpQ;
28658diff --git a/drivers/block/drbd/drbd_int.h b/drivers/block/drbd/drbd_int.h
28659index 9cf2035..bffca95 100644
28660--- a/drivers/block/drbd/drbd_int.h
28661+++ b/drivers/block/drbd/drbd_int.h
28662@@ -736,7 +736,7 @@ struct drbd_request;
28663 struct drbd_epoch {
28664 struct list_head list;
28665 unsigned int barrier_nr;
28666- atomic_t epoch_size; /* increased on every request added. */
28667+ atomic_unchecked_t epoch_size; /* increased on every request added. */
28668 atomic_t active; /* increased on every req. added, and dec on every finished. */
28669 unsigned long flags;
28670 };
28671@@ -1108,7 +1108,7 @@ struct drbd_conf {
28672 void *int_dig_in;
28673 void *int_dig_vv;
28674 wait_queue_head_t seq_wait;
28675- atomic_t packet_seq;
28676+ atomic_unchecked_t packet_seq;
28677 unsigned int peer_seq;
28678 spinlock_t peer_seq_lock;
28679 unsigned int minor;
28680@@ -1617,30 +1617,30 @@ static inline int drbd_setsockopt(struct socket *sock, int level, int optname,
28681
28682 static inline void drbd_tcp_cork(struct socket *sock)
28683 {
28684- int __user val = 1;
28685+ int val = 1;
28686 (void) drbd_setsockopt(sock, SOL_TCP, TCP_CORK,
28687- (char __user *)&val, sizeof(val));
28688+ (char __force_user *)&val, sizeof(val));
28689 }
28690
28691 static inline void drbd_tcp_uncork(struct socket *sock)
28692 {
28693- int __user val = 0;
28694+ int val = 0;
28695 (void) drbd_setsockopt(sock, SOL_TCP, TCP_CORK,
28696- (char __user *)&val, sizeof(val));
28697+ (char __force_user *)&val, sizeof(val));
28698 }
28699
28700 static inline void drbd_tcp_nodelay(struct socket *sock)
28701 {
28702- int __user val = 1;
28703+ int val = 1;
28704 (void) drbd_setsockopt(sock, SOL_TCP, TCP_NODELAY,
28705- (char __user *)&val, sizeof(val));
28706+ (char __force_user *)&val, sizeof(val));
28707 }
28708
28709 static inline void drbd_tcp_quickack(struct socket *sock)
28710 {
28711- int __user val = 2;
28712+ int val = 2;
28713 (void) drbd_setsockopt(sock, SOL_TCP, TCP_QUICKACK,
28714- (char __user *)&val, sizeof(val));
28715+ (char __force_user *)&val, sizeof(val));
28716 }
28717
28718 void drbd_bump_write_ordering(struct drbd_conf *mdev, enum write_ordering_e wo);
28719diff --git a/drivers/block/drbd/drbd_main.c b/drivers/block/drbd/drbd_main.c
28720index 0358e55..bc33689 100644
28721--- a/drivers/block/drbd/drbd_main.c
28722+++ b/drivers/block/drbd/drbd_main.c
28723@@ -2397,7 +2397,7 @@ static int _drbd_send_ack(struct drbd_conf *mdev, enum drbd_packets cmd,
28724 p.sector = sector;
28725 p.block_id = block_id;
28726 p.blksize = blksize;
28727- p.seq_num = cpu_to_be32(atomic_add_return(1, &mdev->packet_seq));
28728+ p.seq_num = cpu_to_be32(atomic_add_return_unchecked(1, &mdev->packet_seq));
28729
28730 if (!mdev->meta.socket || mdev->state.conn < C_CONNECTED)
28731 return false;
28732@@ -2696,7 +2696,7 @@ int drbd_send_dblock(struct drbd_conf *mdev, struct drbd_request *req)
28733 p.sector = cpu_to_be64(req->sector);
28734 p.block_id = (unsigned long)req;
28735 p.seq_num = cpu_to_be32(req->seq_num =
28736- atomic_add_return(1, &mdev->packet_seq));
28737+ atomic_add_return_unchecked(1, &mdev->packet_seq));
28738
28739 dp_flags = bio_flags_to_wire(mdev, req->master_bio->bi_rw);
28740
28741@@ -2981,7 +2981,7 @@ void drbd_init_set_defaults(struct drbd_conf *mdev)
28742 atomic_set(&mdev->unacked_cnt, 0);
28743 atomic_set(&mdev->local_cnt, 0);
28744 atomic_set(&mdev->net_cnt, 0);
28745- atomic_set(&mdev->packet_seq, 0);
28746+ atomic_set_unchecked(&mdev->packet_seq, 0);
28747 atomic_set(&mdev->pp_in_use, 0);
28748 atomic_set(&mdev->pp_in_use_by_net, 0);
28749 atomic_set(&mdev->rs_sect_in, 0);
28750@@ -3063,8 +3063,8 @@ void drbd_mdev_cleanup(struct drbd_conf *mdev)
28751 mdev->receiver.t_state);
28752
28753 /* no need to lock it, I'm the only thread alive */
28754- if (atomic_read(&mdev->current_epoch->epoch_size) != 0)
28755- dev_err(DEV, "epoch_size:%d\n", atomic_read(&mdev->current_epoch->epoch_size));
28756+ if (atomic_read_unchecked(&mdev->current_epoch->epoch_size) != 0)
28757+ dev_err(DEV, "epoch_size:%d\n", atomic_read_unchecked(&mdev->current_epoch->epoch_size));
28758 mdev->al_writ_cnt =
28759 mdev->bm_writ_cnt =
28760 mdev->read_cnt =
28761diff --git a/drivers/block/drbd/drbd_nl.c b/drivers/block/drbd/drbd_nl.c
28762index af2a250..219c74b 100644
28763--- a/drivers/block/drbd/drbd_nl.c
28764+++ b/drivers/block/drbd/drbd_nl.c
28765@@ -2359,7 +2359,7 @@ static void drbd_connector_callback(struct cn_msg *req, struct netlink_skb_parms
28766 module_put(THIS_MODULE);
28767 }
28768
28769-static atomic_t drbd_nl_seq = ATOMIC_INIT(2); /* two. */
28770+static atomic_unchecked_t drbd_nl_seq = ATOMIC_INIT(2); /* two. */
28771
28772 static unsigned short *
28773 __tl_add_blob(unsigned short *tl, enum drbd_tags tag, const void *data,
28774@@ -2430,7 +2430,7 @@ void drbd_bcast_state(struct drbd_conf *mdev, union drbd_state state)
28775 cn_reply->id.idx = CN_IDX_DRBD;
28776 cn_reply->id.val = CN_VAL_DRBD;
28777
28778- cn_reply->seq = atomic_add_return(1, &drbd_nl_seq);
28779+ cn_reply->seq = atomic_add_return_unchecked(1, &drbd_nl_seq);
28780 cn_reply->ack = 0; /* not used here. */
28781 cn_reply->len = sizeof(struct drbd_nl_cfg_reply) +
28782 (int)((char *)tl - (char *)reply->tag_list);
28783@@ -2462,7 +2462,7 @@ void drbd_bcast_ev_helper(struct drbd_conf *mdev, char *helper_name)
28784 cn_reply->id.idx = CN_IDX_DRBD;
28785 cn_reply->id.val = CN_VAL_DRBD;
28786
28787- cn_reply->seq = atomic_add_return(1, &drbd_nl_seq);
28788+ cn_reply->seq = atomic_add_return_unchecked(1, &drbd_nl_seq);
28789 cn_reply->ack = 0; /* not used here. */
28790 cn_reply->len = sizeof(struct drbd_nl_cfg_reply) +
28791 (int)((char *)tl - (char *)reply->tag_list);
28792@@ -2540,7 +2540,7 @@ void drbd_bcast_ee(struct drbd_conf *mdev,
28793 cn_reply->id.idx = CN_IDX_DRBD;
28794 cn_reply->id.val = CN_VAL_DRBD;
28795
28796- cn_reply->seq = atomic_add_return(1,&drbd_nl_seq);
28797+ cn_reply->seq = atomic_add_return_unchecked(1,&drbd_nl_seq);
28798 cn_reply->ack = 0; // not used here.
28799 cn_reply->len = sizeof(struct drbd_nl_cfg_reply) +
28800 (int)((char*)tl - (char*)reply->tag_list);
28801@@ -2579,7 +2579,7 @@ void drbd_bcast_sync_progress(struct drbd_conf *mdev)
28802 cn_reply->id.idx = CN_IDX_DRBD;
28803 cn_reply->id.val = CN_VAL_DRBD;
28804
28805- cn_reply->seq = atomic_add_return(1, &drbd_nl_seq);
28806+ cn_reply->seq = atomic_add_return_unchecked(1, &drbd_nl_seq);
28807 cn_reply->ack = 0; /* not used here. */
28808 cn_reply->len = sizeof(struct drbd_nl_cfg_reply) +
28809 (int)((char *)tl - (char *)reply->tag_list);
28810diff --git a/drivers/block/drbd/drbd_receiver.c b/drivers/block/drbd/drbd_receiver.c
28811index 43beaca..4a5b1dd 100644
28812--- a/drivers/block/drbd/drbd_receiver.c
28813+++ b/drivers/block/drbd/drbd_receiver.c
28814@@ -894,7 +894,7 @@ retry:
28815 sock->sk->sk_sndtimeo = mdev->net_conf->timeout*HZ/10;
28816 sock->sk->sk_rcvtimeo = MAX_SCHEDULE_TIMEOUT;
28817
28818- atomic_set(&mdev->packet_seq, 0);
28819+ atomic_set_unchecked(&mdev->packet_seq, 0);
28820 mdev->peer_seq = 0;
28821
28822 drbd_thread_start(&mdev->asender);
28823@@ -985,7 +985,7 @@ static enum finish_epoch drbd_may_finish_epoch(struct drbd_conf *mdev,
28824 do {
28825 next_epoch = NULL;
28826
28827- epoch_size = atomic_read(&epoch->epoch_size);
28828+ epoch_size = atomic_read_unchecked(&epoch->epoch_size);
28829
28830 switch (ev & ~EV_CLEANUP) {
28831 case EV_PUT:
28832@@ -1020,7 +1020,7 @@ static enum finish_epoch drbd_may_finish_epoch(struct drbd_conf *mdev,
28833 rv = FE_DESTROYED;
28834 } else {
28835 epoch->flags = 0;
28836- atomic_set(&epoch->epoch_size, 0);
28837+ atomic_set_unchecked(&epoch->epoch_size, 0);
28838 /* atomic_set(&epoch->active, 0); is already zero */
28839 if (rv == FE_STILL_LIVE)
28840 rv = FE_RECYCLED;
28841@@ -1191,14 +1191,14 @@ static int receive_Barrier(struct drbd_conf *mdev, enum drbd_packets cmd, unsign
28842 drbd_wait_ee_list_empty(mdev, &mdev->active_ee);
28843 drbd_flush(mdev);
28844
28845- if (atomic_read(&mdev->current_epoch->epoch_size)) {
28846+ if (atomic_read_unchecked(&mdev->current_epoch->epoch_size)) {
28847 epoch = kmalloc(sizeof(struct drbd_epoch), GFP_NOIO);
28848 if (epoch)
28849 break;
28850 }
28851
28852 epoch = mdev->current_epoch;
28853- wait_event(mdev->ee_wait, atomic_read(&epoch->epoch_size) == 0);
28854+ wait_event(mdev->ee_wait, atomic_read_unchecked(&epoch->epoch_size) == 0);
28855
28856 D_ASSERT(atomic_read(&epoch->active) == 0);
28857 D_ASSERT(epoch->flags == 0);
28858@@ -1210,11 +1210,11 @@ static int receive_Barrier(struct drbd_conf *mdev, enum drbd_packets cmd, unsign
28859 }
28860
28861 epoch->flags = 0;
28862- atomic_set(&epoch->epoch_size, 0);
28863+ atomic_set_unchecked(&epoch->epoch_size, 0);
28864 atomic_set(&epoch->active, 0);
28865
28866 spin_lock(&mdev->epoch_lock);
28867- if (atomic_read(&mdev->current_epoch->epoch_size)) {
28868+ if (atomic_read_unchecked(&mdev->current_epoch->epoch_size)) {
28869 list_add(&epoch->list, &mdev->current_epoch->list);
28870 mdev->current_epoch = epoch;
28871 mdev->epochs++;
28872@@ -1663,7 +1663,7 @@ static int receive_Data(struct drbd_conf *mdev, enum drbd_packets cmd, unsigned
28873 spin_unlock(&mdev->peer_seq_lock);
28874
28875 drbd_send_ack_dp(mdev, P_NEG_ACK, p, data_size);
28876- atomic_inc(&mdev->current_epoch->epoch_size);
28877+ atomic_inc_unchecked(&mdev->current_epoch->epoch_size);
28878 return drbd_drain_block(mdev, data_size);
28879 }
28880
28881@@ -1689,7 +1689,7 @@ static int receive_Data(struct drbd_conf *mdev, enum drbd_packets cmd, unsigned
28882
28883 spin_lock(&mdev->epoch_lock);
28884 e->epoch = mdev->current_epoch;
28885- atomic_inc(&e->epoch->epoch_size);
28886+ atomic_inc_unchecked(&e->epoch->epoch_size);
28887 atomic_inc(&e->epoch->active);
28888 spin_unlock(&mdev->epoch_lock);
28889
28890@@ -3885,7 +3885,7 @@ static void drbd_disconnect(struct drbd_conf *mdev)
28891 D_ASSERT(list_empty(&mdev->done_ee));
28892
28893 /* ok, no more ee's on the fly, it is safe to reset the epoch_size */
28894- atomic_set(&mdev->current_epoch->epoch_size, 0);
28895+ atomic_set_unchecked(&mdev->current_epoch->epoch_size, 0);
28896 D_ASSERT(list_empty(&mdev->current_epoch->list));
28897 }
28898
28899diff --git a/drivers/block/loop.c b/drivers/block/loop.c
28900index 1e888c9..05cf1b0 100644
28901--- a/drivers/block/loop.c
28902+++ b/drivers/block/loop.c
28903@@ -227,7 +227,7 @@ static int __do_lo_send_write(struct file *file,
28904 mm_segment_t old_fs = get_fs();
28905
28906 set_fs(get_ds());
28907- bw = file->f_op->write(file, buf, len, &pos);
28908+ bw = file->f_op->write(file, (const char __force_user *)buf, len, &pos);
28909 set_fs(old_fs);
28910 if (likely(bw == len))
28911 return 0;
28912diff --git a/drivers/char/Kconfig b/drivers/char/Kconfig
28913index 4364303..9adf4ee 100644
28914--- a/drivers/char/Kconfig
28915+++ b/drivers/char/Kconfig
28916@@ -8,7 +8,8 @@ source "drivers/tty/Kconfig"
28917
28918 config DEVKMEM
28919 bool "/dev/kmem virtual device support"
28920- default y
28921+ default n
28922+ depends on !GRKERNSEC_KMEM
28923 help
28924 Say Y here if you want to support the /dev/kmem device. The
28925 /dev/kmem device is rarely used, but can be used for certain
28926@@ -596,6 +597,7 @@ config DEVPORT
28927 bool
28928 depends on !M68K
28929 depends on ISA || PCI
28930+ depends on !GRKERNSEC_KMEM
28931 default y
28932
28933 source "drivers/s390/char/Kconfig"
28934diff --git a/drivers/char/agp/frontend.c b/drivers/char/agp/frontend.c
28935index 2e04433..22afc64 100644
28936--- a/drivers/char/agp/frontend.c
28937+++ b/drivers/char/agp/frontend.c
28938@@ -817,7 +817,7 @@ static int agpioc_reserve_wrap(struct agp_file_private *priv, void __user *arg)
28939 if (copy_from_user(&reserve, arg, sizeof(struct agp_region)))
28940 return -EFAULT;
28941
28942- if ((unsigned) reserve.seg_count >= ~0U/sizeof(struct agp_segment))
28943+ if ((unsigned) reserve.seg_count >= ~0U/sizeof(struct agp_segment_priv))
28944 return -EFAULT;
28945
28946 client = agp_find_client_by_pid(reserve.pid);
28947diff --git a/drivers/char/briq_panel.c b/drivers/char/briq_panel.c
28948index 095ab90..afad0a4 100644
28949--- a/drivers/char/briq_panel.c
28950+++ b/drivers/char/briq_panel.c
28951@@ -9,6 +9,7 @@
28952 #include <linux/types.h>
28953 #include <linux/errno.h>
28954 #include <linux/tty.h>
28955+#include <linux/mutex.h>
28956 #include <linux/timer.h>
28957 #include <linux/kernel.h>
28958 #include <linux/wait.h>
28959@@ -34,6 +35,7 @@ static int vfd_is_open;
28960 static unsigned char vfd[40];
28961 static int vfd_cursor;
28962 static unsigned char ledpb, led;
28963+static DEFINE_MUTEX(vfd_mutex);
28964
28965 static void update_vfd(void)
28966 {
28967@@ -140,12 +142,15 @@ static ssize_t briq_panel_write(struct file *file, const char __user *buf, size_
28968 if (!vfd_is_open)
28969 return -EBUSY;
28970
28971+ mutex_lock(&vfd_mutex);
28972 for (;;) {
28973 char c;
28974 if (!indx)
28975 break;
28976- if (get_user(c, buf))
28977+ if (get_user(c, buf)) {
28978+ mutex_unlock(&vfd_mutex);
28979 return -EFAULT;
28980+ }
28981 if (esc) {
28982 set_led(c);
28983 esc = 0;
28984@@ -175,6 +180,7 @@ static ssize_t briq_panel_write(struct file *file, const char __user *buf, size_
28985 buf++;
28986 }
28987 update_vfd();
28988+ mutex_unlock(&vfd_mutex);
28989
28990 return len;
28991 }
28992diff --git a/drivers/char/genrtc.c b/drivers/char/genrtc.c
28993index f773a9d..65cd683 100644
28994--- a/drivers/char/genrtc.c
28995+++ b/drivers/char/genrtc.c
28996@@ -273,6 +273,7 @@ static int gen_rtc_ioctl(struct file *file,
28997 switch (cmd) {
28998
28999 case RTC_PLL_GET:
29000+ memset(&pll, 0, sizeof(pll));
29001 if (get_rtc_pll(&pll))
29002 return -EINVAL;
29003 else
29004diff --git a/drivers/char/hpet.c b/drivers/char/hpet.c
29005index 0833896..cccce52 100644
29006--- a/drivers/char/hpet.c
29007+++ b/drivers/char/hpet.c
29008@@ -572,7 +572,7 @@ static inline unsigned long hpet_time_div(struct hpets *hpets,
29009 }
29010
29011 static int
29012-hpet_ioctl_common(struct hpet_dev *devp, int cmd, unsigned long arg,
29013+hpet_ioctl_common(struct hpet_dev *devp, unsigned int cmd, unsigned long arg,
29014 struct hpet_info *info)
29015 {
29016 struct hpet_timer __iomem *timer;
29017diff --git a/drivers/char/ipmi/ipmi_msghandler.c b/drivers/char/ipmi/ipmi_msghandler.c
29018index 58c0e63..46c16bf 100644
29019--- a/drivers/char/ipmi/ipmi_msghandler.c
29020+++ b/drivers/char/ipmi/ipmi_msghandler.c
29021@@ -415,7 +415,7 @@ struct ipmi_smi {
29022 struct proc_dir_entry *proc_dir;
29023 char proc_dir_name[10];
29024
29025- atomic_t stats[IPMI_NUM_STATS];
29026+ atomic_unchecked_t stats[IPMI_NUM_STATS];
29027
29028 /*
29029 * run_to_completion duplicate of smb_info, smi_info
29030@@ -448,9 +448,9 @@ static DEFINE_MUTEX(smi_watchers_mutex);
29031
29032
29033 #define ipmi_inc_stat(intf, stat) \
29034- atomic_inc(&(intf)->stats[IPMI_STAT_ ## stat])
29035+ atomic_inc_unchecked(&(intf)->stats[IPMI_STAT_ ## stat])
29036 #define ipmi_get_stat(intf, stat) \
29037- ((unsigned int) atomic_read(&(intf)->stats[IPMI_STAT_ ## stat]))
29038+ ((unsigned int) atomic_read_unchecked(&(intf)->stats[IPMI_STAT_ ## stat]))
29039
29040 static int is_lan_addr(struct ipmi_addr *addr)
29041 {
29042@@ -2868,7 +2868,7 @@ int ipmi_register_smi(struct ipmi_smi_handlers *handlers,
29043 INIT_LIST_HEAD(&intf->cmd_rcvrs);
29044 init_waitqueue_head(&intf->waitq);
29045 for (i = 0; i < IPMI_NUM_STATS; i++)
29046- atomic_set(&intf->stats[i], 0);
29047+ atomic_set_unchecked(&intf->stats[i], 0);
29048
29049 intf->proc_dir = NULL;
29050
29051diff --git a/drivers/char/ipmi/ipmi_si_intf.c b/drivers/char/ipmi/ipmi_si_intf.c
29052index 9397ab4..d01bee1 100644
29053--- a/drivers/char/ipmi/ipmi_si_intf.c
29054+++ b/drivers/char/ipmi/ipmi_si_intf.c
29055@@ -277,7 +277,7 @@ struct smi_info {
29056 unsigned char slave_addr;
29057
29058 /* Counters and things for the proc filesystem. */
29059- atomic_t stats[SI_NUM_STATS];
29060+ atomic_unchecked_t stats[SI_NUM_STATS];
29061
29062 struct task_struct *thread;
29063
29064@@ -286,9 +286,9 @@ struct smi_info {
29065 };
29066
29067 #define smi_inc_stat(smi, stat) \
29068- atomic_inc(&(smi)->stats[SI_STAT_ ## stat])
29069+ atomic_inc_unchecked(&(smi)->stats[SI_STAT_ ## stat])
29070 #define smi_get_stat(smi, stat) \
29071- ((unsigned int) atomic_read(&(smi)->stats[SI_STAT_ ## stat]))
29072+ ((unsigned int) atomic_read_unchecked(&(smi)->stats[SI_STAT_ ## stat]))
29073
29074 #define SI_MAX_PARMS 4
29075
29076@@ -3230,7 +3230,7 @@ static int try_smi_init(struct smi_info *new_smi)
29077 atomic_set(&new_smi->req_events, 0);
29078 new_smi->run_to_completion = 0;
29079 for (i = 0; i < SI_NUM_STATS; i++)
29080- atomic_set(&new_smi->stats[i], 0);
29081+ atomic_set_unchecked(&new_smi->stats[i], 0);
29082
29083 new_smi->interrupt_disabled = 1;
29084 atomic_set(&new_smi->stop_operation, 0);
29085diff --git a/drivers/char/mbcs.c b/drivers/char/mbcs.c
29086index 1aeaaba..e018570 100644
29087--- a/drivers/char/mbcs.c
29088+++ b/drivers/char/mbcs.c
29089@@ -800,7 +800,7 @@ static int mbcs_remove(struct cx_dev *dev)
29090 return 0;
29091 }
29092
29093-static const struct cx_device_id __devinitdata mbcs_id_table[] = {
29094+static const struct cx_device_id __devinitconst mbcs_id_table[] = {
29095 {
29096 .part_num = MBCS_PART_NUM,
29097 .mfg_num = MBCS_MFG_NUM,
29098diff --git a/drivers/char/mem.c b/drivers/char/mem.c
29099index 1451790..f705c30 100644
29100--- a/drivers/char/mem.c
29101+++ b/drivers/char/mem.c
29102@@ -18,6 +18,7 @@
29103 #include <linux/raw.h>
29104 #include <linux/tty.h>
29105 #include <linux/capability.h>
29106+#include <linux/security.h>
29107 #include <linux/ptrace.h>
29108 #include <linux/device.h>
29109 #include <linux/highmem.h>
29110@@ -35,6 +36,10 @@
29111 # include <linux/efi.h>
29112 #endif
29113
29114+#if defined(CONFIG_GRKERNSEC) && !defined(CONFIG_GRKERNSEC_NO_RBAC)
29115+extern const struct file_operations grsec_fops;
29116+#endif
29117+
29118 static inline unsigned long size_inside_page(unsigned long start,
29119 unsigned long size)
29120 {
29121@@ -66,9 +71,13 @@ static inline int range_is_allowed(unsigned long pfn, unsigned long size)
29122
29123 while (cursor < to) {
29124 if (!devmem_is_allowed(pfn)) {
29125+#ifdef CONFIG_GRKERNSEC_KMEM
29126+ gr_handle_mem_readwrite(from, to);
29127+#else
29128 printk(KERN_INFO
29129 "Program %s tried to access /dev/mem between %Lx->%Lx.\n",
29130 current->comm, from, to);
29131+#endif
29132 return 0;
29133 }
29134 cursor += PAGE_SIZE;
29135@@ -76,6 +85,11 @@ static inline int range_is_allowed(unsigned long pfn, unsigned long size)
29136 }
29137 return 1;
29138 }
29139+#elif defined(CONFIG_GRKERNSEC_KMEM)
29140+static inline int range_is_allowed(unsigned long pfn, unsigned long size)
29141+{
29142+ return 0;
29143+}
29144 #else
29145 static inline int range_is_allowed(unsigned long pfn, unsigned long size)
29146 {
29147@@ -118,6 +132,7 @@ static ssize_t read_mem(struct file *file, char __user *buf,
29148
29149 while (count > 0) {
29150 unsigned long remaining;
29151+ char *temp;
29152
29153 sz = size_inside_page(p, count);
29154
29155@@ -133,7 +148,23 @@ static ssize_t read_mem(struct file *file, char __user *buf,
29156 if (!ptr)
29157 return -EFAULT;
29158
29159- remaining = copy_to_user(buf, ptr, sz);
29160+#ifdef CONFIG_PAX_USERCOPY
29161+ temp = kmalloc(sz, GFP_KERNEL);
29162+ if (!temp) {
29163+ unxlate_dev_mem_ptr(p, ptr);
29164+ return -ENOMEM;
29165+ }
29166+ memcpy(temp, ptr, sz);
29167+#else
29168+ temp = ptr;
29169+#endif
29170+
29171+ remaining = copy_to_user(buf, temp, sz);
29172+
29173+#ifdef CONFIG_PAX_USERCOPY
29174+ kfree(temp);
29175+#endif
29176+
29177 unxlate_dev_mem_ptr(p, ptr);
29178 if (remaining)
29179 return -EFAULT;
29180@@ -396,9 +427,8 @@ static ssize_t read_kmem(struct file *file, char __user *buf,
29181 size_t count, loff_t *ppos)
29182 {
29183 unsigned long p = *ppos;
29184- ssize_t low_count, read, sz;
29185+ ssize_t low_count, read, sz, err = 0;
29186 char * kbuf; /* k-addr because vread() takes vmlist_lock rwlock */
29187- int err = 0;
29188
29189 read = 0;
29190 if (p < (unsigned long) high_memory) {
29191@@ -420,6 +450,8 @@ static ssize_t read_kmem(struct file *file, char __user *buf,
29192 }
29193 #endif
29194 while (low_count > 0) {
29195+ char *temp;
29196+
29197 sz = size_inside_page(p, low_count);
29198
29199 /*
29200@@ -429,7 +461,22 @@ static ssize_t read_kmem(struct file *file, char __user *buf,
29201 */
29202 kbuf = xlate_dev_kmem_ptr((char *)p);
29203
29204- if (copy_to_user(buf, kbuf, sz))
29205+#ifdef CONFIG_PAX_USERCOPY
29206+ temp = kmalloc(sz, GFP_KERNEL);
29207+ if (!temp)
29208+ return -ENOMEM;
29209+ memcpy(temp, kbuf, sz);
29210+#else
29211+ temp = kbuf;
29212+#endif
29213+
29214+ err = copy_to_user(buf, temp, sz);
29215+
29216+#ifdef CONFIG_PAX_USERCOPY
29217+ kfree(temp);
29218+#endif
29219+
29220+ if (err)
29221 return -EFAULT;
29222 buf += sz;
29223 p += sz;
29224@@ -867,6 +914,9 @@ static const struct memdev {
29225 #ifdef CONFIG_CRASH_DUMP
29226 [12] = { "oldmem", 0, &oldmem_fops, NULL },
29227 #endif
29228+#if defined(CONFIG_GRKERNSEC) && !defined(CONFIG_GRKERNSEC_NO_RBAC)
29229+ [13] = { "grsec",S_IRUSR | S_IWUGO, &grsec_fops, NULL },
29230+#endif
29231 };
29232
29233 static int memory_open(struct inode *inode, struct file *filp)
29234diff --git a/drivers/char/nvram.c b/drivers/char/nvram.c
29235index da3cfee..a5a6606 100644
29236--- a/drivers/char/nvram.c
29237+++ b/drivers/char/nvram.c
29238@@ -248,7 +248,7 @@ static ssize_t nvram_read(struct file *file, char __user *buf,
29239
29240 spin_unlock_irq(&rtc_lock);
29241
29242- if (copy_to_user(buf, contents, tmp - contents))
29243+ if (tmp - contents > sizeof(contents) || copy_to_user(buf, contents, tmp - contents))
29244 return -EFAULT;
29245
29246 *ppos = i;
29247diff --git a/drivers/char/random.c b/drivers/char/random.c
29248index 6035ab8..bdfe4fd 100644
29249--- a/drivers/char/random.c
29250+++ b/drivers/char/random.c
29251@@ -261,8 +261,13 @@
29252 /*
29253 * Configuration information
29254 */
29255+#ifdef CONFIG_GRKERNSEC_RANDNET
29256+#define INPUT_POOL_WORDS 512
29257+#define OUTPUT_POOL_WORDS 128
29258+#else
29259 #define INPUT_POOL_WORDS 128
29260 #define OUTPUT_POOL_WORDS 32
29261+#endif
29262 #define SEC_XFER_SIZE 512
29263 #define EXTRACT_SIZE 10
29264
29265@@ -300,10 +305,17 @@ static struct poolinfo {
29266 int poolwords;
29267 int tap1, tap2, tap3, tap4, tap5;
29268 } poolinfo_table[] = {
29269+#ifdef CONFIG_GRKERNSEC_RANDNET
29270+ /* x^512 + x^411 + x^308 + x^208 +x^104 + x + 1 -- 225 */
29271+ { 512, 411, 308, 208, 104, 1 },
29272+ /* x^128 + x^103 + x^76 + x^51 + x^25 + x + 1 -- 105 */
29273+ { 128, 103, 76, 51, 25, 1 },
29274+#else
29275 /* x^128 + x^103 + x^76 + x^51 +x^25 + x + 1 -- 105 */
29276 { 128, 103, 76, 51, 25, 1 },
29277 /* x^32 + x^26 + x^20 + x^14 + x^7 + x + 1 -- 15 */
29278 { 32, 26, 20, 14, 7, 1 },
29279+#endif
29280 #if 0
29281 /* x^2048 + x^1638 + x^1231 + x^819 + x^411 + x + 1 -- 115 */
29282 { 2048, 1638, 1231, 819, 411, 1 },
29283@@ -909,7 +921,7 @@ static ssize_t extract_entropy_user(struct entropy_store *r, void __user *buf,
29284
29285 extract_buf(r, tmp);
29286 i = min_t(int, nbytes, EXTRACT_SIZE);
29287- if (copy_to_user(buf, tmp, i)) {
29288+ if (i > sizeof(tmp) || copy_to_user(buf, tmp, i)) {
29289 ret = -EFAULT;
29290 break;
29291 }
29292@@ -1228,7 +1240,7 @@ EXPORT_SYMBOL(generate_random_uuid);
29293 #include <linux/sysctl.h>
29294
29295 static int min_read_thresh = 8, min_write_thresh;
29296-static int max_read_thresh = INPUT_POOL_WORDS * 32;
29297+static int max_read_thresh = OUTPUT_POOL_WORDS * 32;
29298 static int max_write_thresh = INPUT_POOL_WORDS * 32;
29299 static char sysctl_bootid[16];
29300
29301diff --git a/drivers/char/sonypi.c b/drivers/char/sonypi.c
29302index 1ee8ce7..b778bef 100644
29303--- a/drivers/char/sonypi.c
29304+++ b/drivers/char/sonypi.c
29305@@ -55,6 +55,7 @@
29306 #include <asm/uaccess.h>
29307 #include <asm/io.h>
29308 #include <asm/system.h>
29309+#include <asm/local.h>
29310
29311 #include <linux/sonypi.h>
29312
29313@@ -491,7 +492,7 @@ static struct sonypi_device {
29314 spinlock_t fifo_lock;
29315 wait_queue_head_t fifo_proc_list;
29316 struct fasync_struct *fifo_async;
29317- int open_count;
29318+ local_t open_count;
29319 int model;
29320 struct input_dev *input_jog_dev;
29321 struct input_dev *input_key_dev;
29322@@ -898,7 +899,7 @@ static int sonypi_misc_fasync(int fd, struct file *filp, int on)
29323 static int sonypi_misc_release(struct inode *inode, struct file *file)
29324 {
29325 mutex_lock(&sonypi_device.lock);
29326- sonypi_device.open_count--;
29327+ local_dec(&sonypi_device.open_count);
29328 mutex_unlock(&sonypi_device.lock);
29329 return 0;
29330 }
29331@@ -907,9 +908,9 @@ static int sonypi_misc_open(struct inode *inode, struct file *file)
29332 {
29333 mutex_lock(&sonypi_device.lock);
29334 /* Flush input queue on first open */
29335- if (!sonypi_device.open_count)
29336+ if (!local_read(&sonypi_device.open_count))
29337 kfifo_reset(&sonypi_device.fifo);
29338- sonypi_device.open_count++;
29339+ local_inc(&sonypi_device.open_count);
29340 mutex_unlock(&sonypi_device.lock);
29341
29342 return 0;
29343diff --git a/drivers/char/tpm/tpm.c b/drivers/char/tpm/tpm.c
29344index 361a1df..2471eee 100644
29345--- a/drivers/char/tpm/tpm.c
29346+++ b/drivers/char/tpm/tpm.c
29347@@ -414,7 +414,7 @@ static ssize_t tpm_transmit(struct tpm_chip *chip, const char *buf,
29348 chip->vendor.req_complete_val)
29349 goto out_recv;
29350
29351- if ((status == chip->vendor.req_canceled)) {
29352+ if (status == chip->vendor.req_canceled) {
29353 dev_err(chip->dev, "Operation Canceled\n");
29354 rc = -ECANCELED;
29355 goto out;
29356diff --git a/drivers/char/tpm/tpm_bios.c b/drivers/char/tpm/tpm_bios.c
29357index 0636520..169c1d0 100644
29358--- a/drivers/char/tpm/tpm_bios.c
29359+++ b/drivers/char/tpm/tpm_bios.c
29360@@ -173,7 +173,7 @@ static void *tpm_bios_measurements_start(struct seq_file *m, loff_t *pos)
29361 event = addr;
29362
29363 if ((event->event_type == 0 && event->event_size == 0) ||
29364- ((addr + sizeof(struct tcpa_event) + event->event_size) >= limit))
29365+ (event->event_size >= limit - addr - sizeof(struct tcpa_event)))
29366 return NULL;
29367
29368 return addr;
29369@@ -198,7 +198,7 @@ static void *tpm_bios_measurements_next(struct seq_file *m, void *v,
29370 return NULL;
29371
29372 if ((event->event_type == 0 && event->event_size == 0) ||
29373- ((v + sizeof(struct tcpa_event) + event->event_size) >= limit))
29374+ (event->event_size >= limit - v - sizeof(struct tcpa_event)))
29375 return NULL;
29376
29377 (*pos)++;
29378@@ -291,7 +291,8 @@ static int tpm_binary_bios_measurements_show(struct seq_file *m, void *v)
29379 int i;
29380
29381 for (i = 0; i < sizeof(struct tcpa_event) + event->event_size; i++)
29382- seq_putc(m, data[i]);
29383+ if (!seq_putc(m, data[i]))
29384+ return -EFAULT;
29385
29386 return 0;
29387 }
29388@@ -410,8 +411,13 @@ static int read_log(struct tpm_bios_log *log)
29389 log->bios_event_log_end = log->bios_event_log + len;
29390
29391 virt = acpi_os_map_memory(start, len);
29392+ if (!virt) {
29393+ kfree(log->bios_event_log);
29394+ log->bios_event_log = NULL;
29395+ return -EFAULT;
29396+ }
29397
29398- memcpy(log->bios_event_log, virt, len);
29399+ memcpy(log->bios_event_log, (const char __force_kernel *)virt, len);
29400
29401 acpi_os_unmap_memory(virt, len);
29402 return 0;
29403diff --git a/drivers/char/virtio_console.c b/drivers/char/virtio_console.c
29404index 8e3c46d..c139b99 100644
29405--- a/drivers/char/virtio_console.c
29406+++ b/drivers/char/virtio_console.c
29407@@ -563,7 +563,7 @@ static ssize_t fill_readbuf(struct port *port, char *out_buf, size_t out_count,
29408 if (to_user) {
29409 ssize_t ret;
29410
29411- ret = copy_to_user(out_buf, buf->buf + buf->offset, out_count);
29412+ ret = copy_to_user((char __force_user *)out_buf, buf->buf + buf->offset, out_count);
29413 if (ret)
29414 return -EFAULT;
29415 } else {
29416@@ -662,7 +662,7 @@ static ssize_t port_fops_read(struct file *filp, char __user *ubuf,
29417 if (!port_has_data(port) && !port->host_connected)
29418 return 0;
29419
29420- return fill_readbuf(port, ubuf, count, true);
29421+ return fill_readbuf(port, (char __force_kernel *)ubuf, count, true);
29422 }
29423
29424 static ssize_t port_fops_write(struct file *filp, const char __user *ubuf,
29425diff --git a/drivers/dma/dmatest.c b/drivers/dma/dmatest.c
29426index eb1d864..39ee5a7 100644
29427--- a/drivers/dma/dmatest.c
29428+++ b/drivers/dma/dmatest.c
29429@@ -591,7 +591,7 @@ static int dmatest_add_channel(struct dma_chan *chan)
29430 }
29431 if (dma_has_cap(DMA_PQ, dma_dev->cap_mask)) {
29432 cnt = dmatest_add_threads(dtc, DMA_PQ);
29433- thread_count += cnt > 0 ?: 0;
29434+ thread_count += cnt > 0 ? cnt : 0;
29435 }
29436
29437 pr_info("dmatest: Started %u threads using %s\n",
29438diff --git a/drivers/edac/amd64_edac.c b/drivers/edac/amd64_edac.c
29439index c9eee6d..f9d5280 100644
29440--- a/drivers/edac/amd64_edac.c
29441+++ b/drivers/edac/amd64_edac.c
29442@@ -2685,7 +2685,7 @@ static void __devexit amd64_remove_one_instance(struct pci_dev *pdev)
29443 * PCI core identifies what devices are on a system during boot, and then
29444 * inquiry this table to see if this driver is for a given device found.
29445 */
29446-static const struct pci_device_id amd64_pci_table[] __devinitdata = {
29447+static const struct pci_device_id amd64_pci_table[] __devinitconst = {
29448 {
29449 .vendor = PCI_VENDOR_ID_AMD,
29450 .device = PCI_DEVICE_ID_AMD_K8_NB_MEMCTL,
29451diff --git a/drivers/edac/amd76x_edac.c b/drivers/edac/amd76x_edac.c
29452index e47e73b..348e0bd 100644
29453--- a/drivers/edac/amd76x_edac.c
29454+++ b/drivers/edac/amd76x_edac.c
29455@@ -321,7 +321,7 @@ static void __devexit amd76x_remove_one(struct pci_dev *pdev)
29456 edac_mc_free(mci);
29457 }
29458
29459-static const struct pci_device_id amd76x_pci_tbl[] __devinitdata = {
29460+static const struct pci_device_id amd76x_pci_tbl[] __devinitconst = {
29461 {
29462 PCI_VEND_DEV(AMD, FE_GATE_700C), PCI_ANY_ID, PCI_ANY_ID, 0, 0,
29463 AMD762},
29464diff --git a/drivers/edac/e752x_edac.c b/drivers/edac/e752x_edac.c
29465index 1af531a..3a8ff27 100644
29466--- a/drivers/edac/e752x_edac.c
29467+++ b/drivers/edac/e752x_edac.c
29468@@ -1380,7 +1380,7 @@ static void __devexit e752x_remove_one(struct pci_dev *pdev)
29469 edac_mc_free(mci);
29470 }
29471
29472-static const struct pci_device_id e752x_pci_tbl[] __devinitdata = {
29473+static const struct pci_device_id e752x_pci_tbl[] __devinitconst = {
29474 {
29475 PCI_VEND_DEV(INTEL, 7520_0), PCI_ANY_ID, PCI_ANY_ID, 0, 0,
29476 E7520},
29477diff --git a/drivers/edac/e7xxx_edac.c b/drivers/edac/e7xxx_edac.c
29478index 6ffb6d2..383d8d7 100644
29479--- a/drivers/edac/e7xxx_edac.c
29480+++ b/drivers/edac/e7xxx_edac.c
29481@@ -525,7 +525,7 @@ static void __devexit e7xxx_remove_one(struct pci_dev *pdev)
29482 edac_mc_free(mci);
29483 }
29484
29485-static const struct pci_device_id e7xxx_pci_tbl[] __devinitdata = {
29486+static const struct pci_device_id e7xxx_pci_tbl[] __devinitconst = {
29487 {
29488 PCI_VEND_DEV(INTEL, 7205_0), PCI_ANY_ID, PCI_ANY_ID, 0, 0,
29489 E7205},
29490diff --git a/drivers/edac/edac_pci_sysfs.c b/drivers/edac/edac_pci_sysfs.c
29491index 495198a..ac08c85 100644
29492--- a/drivers/edac/edac_pci_sysfs.c
29493+++ b/drivers/edac/edac_pci_sysfs.c
29494@@ -26,8 +26,8 @@ static int edac_pci_log_pe = 1; /* log PCI parity errors */
29495 static int edac_pci_log_npe = 1; /* log PCI non-parity error errors */
29496 static int edac_pci_poll_msec = 1000; /* one second workq period */
29497
29498-static atomic_t pci_parity_count = ATOMIC_INIT(0);
29499-static atomic_t pci_nonparity_count = ATOMIC_INIT(0);
29500+static atomic_unchecked_t pci_parity_count = ATOMIC_INIT(0);
29501+static atomic_unchecked_t pci_nonparity_count = ATOMIC_INIT(0);
29502
29503 static struct kobject *edac_pci_top_main_kobj;
29504 static atomic_t edac_pci_sysfs_refcount = ATOMIC_INIT(0);
29505@@ -582,7 +582,7 @@ static void edac_pci_dev_parity_test(struct pci_dev *dev)
29506 edac_printk(KERN_CRIT, EDAC_PCI,
29507 "Signaled System Error on %s\n",
29508 pci_name(dev));
29509- atomic_inc(&pci_nonparity_count);
29510+ atomic_inc_unchecked(&pci_nonparity_count);
29511 }
29512
29513 if (status & (PCI_STATUS_PARITY)) {
29514@@ -590,7 +590,7 @@ static void edac_pci_dev_parity_test(struct pci_dev *dev)
29515 "Master Data Parity Error on %s\n",
29516 pci_name(dev));
29517
29518- atomic_inc(&pci_parity_count);
29519+ atomic_inc_unchecked(&pci_parity_count);
29520 }
29521
29522 if (status & (PCI_STATUS_DETECTED_PARITY)) {
29523@@ -598,7 +598,7 @@ static void edac_pci_dev_parity_test(struct pci_dev *dev)
29524 "Detected Parity Error on %s\n",
29525 pci_name(dev));
29526
29527- atomic_inc(&pci_parity_count);
29528+ atomic_inc_unchecked(&pci_parity_count);
29529 }
29530 }
29531
29532@@ -619,7 +619,7 @@ static void edac_pci_dev_parity_test(struct pci_dev *dev)
29533 edac_printk(KERN_CRIT, EDAC_PCI, "Bridge "
29534 "Signaled System Error on %s\n",
29535 pci_name(dev));
29536- atomic_inc(&pci_nonparity_count);
29537+ atomic_inc_unchecked(&pci_nonparity_count);
29538 }
29539
29540 if (status & (PCI_STATUS_PARITY)) {
29541@@ -627,7 +627,7 @@ static void edac_pci_dev_parity_test(struct pci_dev *dev)
29542 "Master Data Parity Error on "
29543 "%s\n", pci_name(dev));
29544
29545- atomic_inc(&pci_parity_count);
29546+ atomic_inc_unchecked(&pci_parity_count);
29547 }
29548
29549 if (status & (PCI_STATUS_DETECTED_PARITY)) {
29550@@ -635,7 +635,7 @@ static void edac_pci_dev_parity_test(struct pci_dev *dev)
29551 "Detected Parity Error on %s\n",
29552 pci_name(dev));
29553
29554- atomic_inc(&pci_parity_count);
29555+ atomic_inc_unchecked(&pci_parity_count);
29556 }
29557 }
29558 }
29559@@ -677,7 +677,7 @@ void edac_pci_do_parity_check(void)
29560 if (!check_pci_errors)
29561 return;
29562
29563- before_count = atomic_read(&pci_parity_count);
29564+ before_count = atomic_read_unchecked(&pci_parity_count);
29565
29566 /* scan all PCI devices looking for a Parity Error on devices and
29567 * bridges.
29568@@ -689,7 +689,7 @@ void edac_pci_do_parity_check(void)
29569 /* Only if operator has selected panic on PCI Error */
29570 if (edac_pci_get_panic_on_pe()) {
29571 /* If the count is different 'after' from 'before' */
29572- if (before_count != atomic_read(&pci_parity_count))
29573+ if (before_count != atomic_read_unchecked(&pci_parity_count))
29574 panic("EDAC: PCI Parity Error");
29575 }
29576 }
29577diff --git a/drivers/edac/i3000_edac.c b/drivers/edac/i3000_edac.c
29578index c0510b3..6e2a954 100644
29579--- a/drivers/edac/i3000_edac.c
29580+++ b/drivers/edac/i3000_edac.c
29581@@ -470,7 +470,7 @@ static void __devexit i3000_remove_one(struct pci_dev *pdev)
29582 edac_mc_free(mci);
29583 }
29584
29585-static const struct pci_device_id i3000_pci_tbl[] __devinitdata = {
29586+static const struct pci_device_id i3000_pci_tbl[] __devinitconst = {
29587 {
29588 PCI_VEND_DEV(INTEL, 3000_HB), PCI_ANY_ID, PCI_ANY_ID, 0, 0,
29589 I3000},
29590diff --git a/drivers/edac/i3200_edac.c b/drivers/edac/i3200_edac.c
29591index aa08497..7e6822a 100644
29592--- a/drivers/edac/i3200_edac.c
29593+++ b/drivers/edac/i3200_edac.c
29594@@ -456,7 +456,7 @@ static void __devexit i3200_remove_one(struct pci_dev *pdev)
29595 edac_mc_free(mci);
29596 }
29597
29598-static const struct pci_device_id i3200_pci_tbl[] __devinitdata = {
29599+static const struct pci_device_id i3200_pci_tbl[] __devinitconst = {
29600 {
29601 PCI_VEND_DEV(INTEL, 3200_HB), PCI_ANY_ID, PCI_ANY_ID, 0, 0,
29602 I3200},
29603diff --git a/drivers/edac/i5000_edac.c b/drivers/edac/i5000_edac.c
29604index 4dc3ac2..67d05a6 100644
29605--- a/drivers/edac/i5000_edac.c
29606+++ b/drivers/edac/i5000_edac.c
29607@@ -1516,7 +1516,7 @@ static void __devexit i5000_remove_one(struct pci_dev *pdev)
29608 *
29609 * The "E500P" device is the first device supported.
29610 */
29611-static const struct pci_device_id i5000_pci_tbl[] __devinitdata = {
29612+static const struct pci_device_id i5000_pci_tbl[] __devinitconst = {
29613 {PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_I5000_DEV16),
29614 .driver_data = I5000P},
29615
29616diff --git a/drivers/edac/i5100_edac.c b/drivers/edac/i5100_edac.c
29617index bcbdeec..9886d16 100644
29618--- a/drivers/edac/i5100_edac.c
29619+++ b/drivers/edac/i5100_edac.c
29620@@ -1051,7 +1051,7 @@ static void __devexit i5100_remove_one(struct pci_dev *pdev)
29621 edac_mc_free(mci);
29622 }
29623
29624-static const struct pci_device_id i5100_pci_tbl[] __devinitdata = {
29625+static const struct pci_device_id i5100_pci_tbl[] __devinitconst = {
29626 /* Device 16, Function 0, Channel 0 Memory Map, Error Flag/Mask, ... */
29627 { PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_5100_16) },
29628 { 0, }
29629diff --git a/drivers/edac/i5400_edac.c b/drivers/edac/i5400_edac.c
29630index 74d6ec34..baff517 100644
29631--- a/drivers/edac/i5400_edac.c
29632+++ b/drivers/edac/i5400_edac.c
29633@@ -1383,7 +1383,7 @@ static void __devexit i5400_remove_one(struct pci_dev *pdev)
29634 *
29635 * The "E500P" device is the first device supported.
29636 */
29637-static const struct pci_device_id i5400_pci_tbl[] __devinitdata = {
29638+static const struct pci_device_id i5400_pci_tbl[] __devinitconst = {
29639 {PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_5400_ERR)},
29640 {0,} /* 0 terminated list. */
29641 };
29642diff --git a/drivers/edac/i7300_edac.c b/drivers/edac/i7300_edac.c
29643index 6104dba..e7ea8e1 100644
29644--- a/drivers/edac/i7300_edac.c
29645+++ b/drivers/edac/i7300_edac.c
29646@@ -1192,7 +1192,7 @@ static void __devexit i7300_remove_one(struct pci_dev *pdev)
29647 *
29648 * Has only 8086:360c PCI ID
29649 */
29650-static const struct pci_device_id i7300_pci_tbl[] __devinitdata = {
29651+static const struct pci_device_id i7300_pci_tbl[] __devinitconst = {
29652 {PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_I7300_MCH_ERR)},
29653 {0,} /* 0 terminated list. */
29654 };
29655diff --git a/drivers/edac/i7core_edac.c b/drivers/edac/i7core_edac.c
29656index 70ad892..178943c 100644
29657--- a/drivers/edac/i7core_edac.c
29658+++ b/drivers/edac/i7core_edac.c
29659@@ -391,7 +391,7 @@ static const struct pci_id_table pci_dev_table[] = {
29660 /*
29661 * pci_device_id table for which devices we are looking for
29662 */
29663-static const struct pci_device_id i7core_pci_tbl[] __devinitdata = {
29664+static const struct pci_device_id i7core_pci_tbl[] __devinitconst = {
29665 {PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_X58_HUB_MGMT)},
29666 {PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_LYNNFIELD_QPI_LINK0)},
29667 {0,} /* 0 terminated list. */
29668diff --git a/drivers/edac/i82443bxgx_edac.c b/drivers/edac/i82443bxgx_edac.c
29669index 4329d39..f3022ef 100644
29670--- a/drivers/edac/i82443bxgx_edac.c
29671+++ b/drivers/edac/i82443bxgx_edac.c
29672@@ -380,7 +380,7 @@ static void __devexit i82443bxgx_edacmc_remove_one(struct pci_dev *pdev)
29673
29674 EXPORT_SYMBOL_GPL(i82443bxgx_edacmc_remove_one);
29675
29676-static const struct pci_device_id i82443bxgx_pci_tbl[] __devinitdata = {
29677+static const struct pci_device_id i82443bxgx_pci_tbl[] __devinitconst = {
29678 {PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82443BX_0)},
29679 {PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82443BX_2)},
29680 {PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82443GX_0)},
29681diff --git a/drivers/edac/i82860_edac.c b/drivers/edac/i82860_edac.c
29682index 931a057..fd28340 100644
29683--- a/drivers/edac/i82860_edac.c
29684+++ b/drivers/edac/i82860_edac.c
29685@@ -270,7 +270,7 @@ static void __devexit i82860_remove_one(struct pci_dev *pdev)
29686 edac_mc_free(mci);
29687 }
29688
29689-static const struct pci_device_id i82860_pci_tbl[] __devinitdata = {
29690+static const struct pci_device_id i82860_pci_tbl[] __devinitconst = {
29691 {
29692 PCI_VEND_DEV(INTEL, 82860_0), PCI_ANY_ID, PCI_ANY_ID, 0, 0,
29693 I82860},
29694diff --git a/drivers/edac/i82875p_edac.c b/drivers/edac/i82875p_edac.c
29695index 33864c6..01edc61 100644
29696--- a/drivers/edac/i82875p_edac.c
29697+++ b/drivers/edac/i82875p_edac.c
29698@@ -511,7 +511,7 @@ static void __devexit i82875p_remove_one(struct pci_dev *pdev)
29699 edac_mc_free(mci);
29700 }
29701
29702-static const struct pci_device_id i82875p_pci_tbl[] __devinitdata = {
29703+static const struct pci_device_id i82875p_pci_tbl[] __devinitconst = {
29704 {
29705 PCI_VEND_DEV(INTEL, 82875_0), PCI_ANY_ID, PCI_ANY_ID, 0, 0,
29706 I82875P},
29707diff --git a/drivers/edac/i82975x_edac.c b/drivers/edac/i82975x_edac.c
29708index a5da732..983363b 100644
29709--- a/drivers/edac/i82975x_edac.c
29710+++ b/drivers/edac/i82975x_edac.c
29711@@ -604,7 +604,7 @@ static void __devexit i82975x_remove_one(struct pci_dev *pdev)
29712 edac_mc_free(mci);
29713 }
29714
29715-static const struct pci_device_id i82975x_pci_tbl[] __devinitdata = {
29716+static const struct pci_device_id i82975x_pci_tbl[] __devinitconst = {
29717 {
29718 PCI_VEND_DEV(INTEL, 82975_0), PCI_ANY_ID, PCI_ANY_ID, 0, 0,
29719 I82975X
29720diff --git a/drivers/edac/mce_amd.h b/drivers/edac/mce_amd.h
29721index 0106747..0b40417 100644
29722--- a/drivers/edac/mce_amd.h
29723+++ b/drivers/edac/mce_amd.h
29724@@ -83,7 +83,7 @@ struct amd_decoder_ops {
29725 bool (*dc_mce)(u16, u8);
29726 bool (*ic_mce)(u16, u8);
29727 bool (*nb_mce)(u16, u8);
29728-};
29729+} __no_const;
29730
29731 void amd_report_gart_errors(bool);
29732 void amd_register_ecc_decoder(void (*f)(int, struct mce *));
29733diff --git a/drivers/edac/r82600_edac.c b/drivers/edac/r82600_edac.c
29734index b153674..ad2ba9b 100644
29735--- a/drivers/edac/r82600_edac.c
29736+++ b/drivers/edac/r82600_edac.c
29737@@ -373,7 +373,7 @@ static void __devexit r82600_remove_one(struct pci_dev *pdev)
29738 edac_mc_free(mci);
29739 }
29740
29741-static const struct pci_device_id r82600_pci_tbl[] __devinitdata = {
29742+static const struct pci_device_id r82600_pci_tbl[] __devinitconst = {
29743 {
29744 PCI_DEVICE(PCI_VENDOR_ID_RADISYS, R82600_BRIDGE_ID)
29745 },
29746diff --git a/drivers/edac/sb_edac.c b/drivers/edac/sb_edac.c
29747index 7a402bf..af0b211 100644
29748--- a/drivers/edac/sb_edac.c
29749+++ b/drivers/edac/sb_edac.c
29750@@ -367,7 +367,7 @@ static const struct pci_id_table pci_dev_descr_sbridge_table[] = {
29751 /*
29752 * pci_device_id table for which devices we are looking for
29753 */
29754-static const struct pci_device_id sbridge_pci_tbl[] __devinitdata = {
29755+static const struct pci_device_id sbridge_pci_tbl[] __devinitconst = {
29756 {PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_SBRIDGE_IMC_TA)},
29757 {0,} /* 0 terminated list. */
29758 };
29759diff --git a/drivers/edac/x38_edac.c b/drivers/edac/x38_edac.c
29760index b6f47de..c5acf3a 100644
29761--- a/drivers/edac/x38_edac.c
29762+++ b/drivers/edac/x38_edac.c
29763@@ -440,7 +440,7 @@ static void __devexit x38_remove_one(struct pci_dev *pdev)
29764 edac_mc_free(mci);
29765 }
29766
29767-static const struct pci_device_id x38_pci_tbl[] __devinitdata = {
29768+static const struct pci_device_id x38_pci_tbl[] __devinitconst = {
29769 {
29770 PCI_VEND_DEV(INTEL, X38_HB), PCI_ANY_ID, PCI_ANY_ID, 0, 0,
29771 X38},
29772diff --git a/drivers/firewire/core-card.c b/drivers/firewire/core-card.c
29773index 85661b0..c784559a 100644
29774--- a/drivers/firewire/core-card.c
29775+++ b/drivers/firewire/core-card.c
29776@@ -657,7 +657,7 @@ void fw_card_release(struct kref *kref)
29777
29778 void fw_core_remove_card(struct fw_card *card)
29779 {
29780- struct fw_card_driver dummy_driver = dummy_driver_template;
29781+ fw_card_driver_no_const dummy_driver = dummy_driver_template;
29782
29783 card->driver->update_phy_reg(card, 4,
29784 PHY_LINK_ACTIVE | PHY_CONTENDER, 0);
29785diff --git a/drivers/firewire/core-cdev.c b/drivers/firewire/core-cdev.c
29786index 4799393..37bd3ab 100644
29787--- a/drivers/firewire/core-cdev.c
29788+++ b/drivers/firewire/core-cdev.c
29789@@ -1331,8 +1331,7 @@ static int init_iso_resource(struct client *client,
29790 int ret;
29791
29792 if ((request->channels == 0 && request->bandwidth == 0) ||
29793- request->bandwidth > BANDWIDTH_AVAILABLE_INITIAL ||
29794- request->bandwidth < 0)
29795+ request->bandwidth > BANDWIDTH_AVAILABLE_INITIAL)
29796 return -EINVAL;
29797
29798 r = kmalloc(sizeof(*r), GFP_KERNEL);
29799diff --git a/drivers/firewire/core-transaction.c b/drivers/firewire/core-transaction.c
29800index 855ab3f..11f4bbd 100644
29801--- a/drivers/firewire/core-transaction.c
29802+++ b/drivers/firewire/core-transaction.c
29803@@ -37,6 +37,7 @@
29804 #include <linux/timer.h>
29805 #include <linux/types.h>
29806 #include <linux/workqueue.h>
29807+#include <linux/sched.h>
29808
29809 #include <asm/byteorder.h>
29810
29811diff --git a/drivers/firewire/core.h b/drivers/firewire/core.h
29812index b45be57..5fad18b 100644
29813--- a/drivers/firewire/core.h
29814+++ b/drivers/firewire/core.h
29815@@ -101,6 +101,7 @@ struct fw_card_driver {
29816
29817 int (*stop_iso)(struct fw_iso_context *ctx);
29818 };
29819+typedef struct fw_card_driver __no_const fw_card_driver_no_const;
29820
29821 void fw_card_initialize(struct fw_card *card,
29822 const struct fw_card_driver *driver, struct device *device);
29823diff --git a/drivers/firmware/dmi_scan.c b/drivers/firmware/dmi_scan.c
29824index 153980b..4b4d046 100644
29825--- a/drivers/firmware/dmi_scan.c
29826+++ b/drivers/firmware/dmi_scan.c
29827@@ -449,11 +449,6 @@ void __init dmi_scan_machine(void)
29828 }
29829 }
29830 else {
29831- /*
29832- * no iounmap() for that ioremap(); it would be a no-op, but
29833- * it's so early in setup that sucker gets confused into doing
29834- * what it shouldn't if we actually call it.
29835- */
29836 p = dmi_ioremap(0xF0000, 0x10000);
29837 if (p == NULL)
29838 goto error;
29839@@ -723,7 +718,7 @@ int dmi_walk(void (*decode)(const struct dmi_header *, void *),
29840 if (buf == NULL)
29841 return -1;
29842
29843- dmi_table(buf, dmi_len, dmi_num, decode, private_data);
29844+ dmi_table((char __force_kernel *)buf, dmi_len, dmi_num, decode, private_data);
29845
29846 iounmap(buf);
29847 return 0;
29848diff --git a/drivers/gpio/gpio-vr41xx.c b/drivers/gpio/gpio-vr41xx.c
29849index 98723cb..10ca85b 100644
29850--- a/drivers/gpio/gpio-vr41xx.c
29851+++ b/drivers/gpio/gpio-vr41xx.c
29852@@ -204,7 +204,7 @@ static int giu_get_irq(unsigned int irq)
29853 printk(KERN_ERR "spurious GIU interrupt: %04x(%04x),%04x(%04x)\n",
29854 maskl, pendl, maskh, pendh);
29855
29856- atomic_inc(&irq_err_count);
29857+ atomic_inc_unchecked(&irq_err_count);
29858
29859 return -EINVAL;
29860 }
29861diff --git a/drivers/gpu/drm/drm_crtc.c b/drivers/gpu/drm/drm_crtc.c
29862index 8323fc3..5c1d755 100644
29863--- a/drivers/gpu/drm/drm_crtc.c
29864+++ b/drivers/gpu/drm/drm_crtc.c
29865@@ -1379,7 +1379,7 @@ int drm_mode_getconnector(struct drm_device *dev, void *data,
29866 */
29867 if ((out_resp->count_modes >= mode_count) && mode_count) {
29868 copied = 0;
29869- mode_ptr = (struct drm_mode_modeinfo *)(unsigned long)out_resp->modes_ptr;
29870+ mode_ptr = (struct drm_mode_modeinfo __user *)(unsigned long)out_resp->modes_ptr;
29871 list_for_each_entry(mode, &connector->modes, head) {
29872 drm_crtc_convert_to_umode(&u_mode, mode);
29873 if (copy_to_user(mode_ptr + copied,
29874@@ -1394,8 +1394,8 @@ int drm_mode_getconnector(struct drm_device *dev, void *data,
29875
29876 if ((out_resp->count_props >= props_count) && props_count) {
29877 copied = 0;
29878- prop_ptr = (uint32_t *)(unsigned long)(out_resp->props_ptr);
29879- prop_values = (uint64_t *)(unsigned long)(out_resp->prop_values_ptr);
29880+ prop_ptr = (uint32_t __user *)(unsigned long)(out_resp->props_ptr);
29881+ prop_values = (uint64_t __user *)(unsigned long)(out_resp->prop_values_ptr);
29882 for (i = 0; i < DRM_CONNECTOR_MAX_PROPERTY; i++) {
29883 if (connector->property_ids[i] != 0) {
29884 if (put_user(connector->property_ids[i],
29885@@ -1417,7 +1417,7 @@ int drm_mode_getconnector(struct drm_device *dev, void *data,
29886
29887 if ((out_resp->count_encoders >= encoders_count) && encoders_count) {
29888 copied = 0;
29889- encoder_ptr = (uint32_t *)(unsigned long)(out_resp->encoders_ptr);
29890+ encoder_ptr = (uint32_t __user *)(unsigned long)(out_resp->encoders_ptr);
29891 for (i = 0; i < DRM_CONNECTOR_MAX_ENCODER; i++) {
29892 if (connector->encoder_ids[i] != 0) {
29893 if (put_user(connector->encoder_ids[i],
29894@@ -1576,7 +1576,7 @@ int drm_mode_setcrtc(struct drm_device *dev, void *data,
29895 }
29896
29897 for (i = 0; i < crtc_req->count_connectors; i++) {
29898- set_connectors_ptr = (uint32_t *)(unsigned long)crtc_req->set_connectors_ptr;
29899+ set_connectors_ptr = (uint32_t __user *)(unsigned long)crtc_req->set_connectors_ptr;
29900 if (get_user(out_id, &set_connectors_ptr[i])) {
29901 ret = -EFAULT;
29902 goto out;
29903@@ -1857,7 +1857,7 @@ int drm_mode_dirtyfb_ioctl(struct drm_device *dev,
29904 fb = obj_to_fb(obj);
29905
29906 num_clips = r->num_clips;
29907- clips_ptr = (struct drm_clip_rect *)(unsigned long)r->clips_ptr;
29908+ clips_ptr = (struct drm_clip_rect __user *)(unsigned long)r->clips_ptr;
29909
29910 if (!num_clips != !clips_ptr) {
29911 ret = -EINVAL;
29912@@ -2283,7 +2283,7 @@ int drm_mode_getproperty_ioctl(struct drm_device *dev,
29913 out_resp->flags = property->flags;
29914
29915 if ((out_resp->count_values >= value_count) && value_count) {
29916- values_ptr = (uint64_t *)(unsigned long)out_resp->values_ptr;
29917+ values_ptr = (uint64_t __user *)(unsigned long)out_resp->values_ptr;
29918 for (i = 0; i < value_count; i++) {
29919 if (copy_to_user(values_ptr + i, &property->values[i], sizeof(uint64_t))) {
29920 ret = -EFAULT;
29921@@ -2296,7 +2296,7 @@ int drm_mode_getproperty_ioctl(struct drm_device *dev,
29922 if (property->flags & DRM_MODE_PROP_ENUM) {
29923 if ((out_resp->count_enum_blobs >= enum_count) && enum_count) {
29924 copied = 0;
29925- enum_ptr = (struct drm_mode_property_enum *)(unsigned long)out_resp->enum_blob_ptr;
29926+ enum_ptr = (struct drm_mode_property_enum __user *)(unsigned long)out_resp->enum_blob_ptr;
29927 list_for_each_entry(prop_enum, &property->enum_blob_list, head) {
29928
29929 if (copy_to_user(&enum_ptr[copied].value, &prop_enum->value, sizeof(uint64_t))) {
29930@@ -2319,7 +2319,7 @@ int drm_mode_getproperty_ioctl(struct drm_device *dev,
29931 if ((out_resp->count_enum_blobs >= blob_count) && blob_count) {
29932 copied = 0;
29933 blob_id_ptr = (uint32_t *)(unsigned long)out_resp->enum_blob_ptr;
29934- blob_length_ptr = (uint32_t *)(unsigned long)out_resp->values_ptr;
29935+ blob_length_ptr = (uint32_t __user *)(unsigned long)out_resp->values_ptr;
29936
29937 list_for_each_entry(prop_blob, &property->enum_blob_list, head) {
29938 if (put_user(prop_blob->base.id, blob_id_ptr + copied)) {
29939@@ -2380,7 +2380,7 @@ int drm_mode_getblob_ioctl(struct drm_device *dev,
29940 struct drm_mode_get_blob *out_resp = data;
29941 struct drm_property_blob *blob;
29942 int ret = 0;
29943- void *blob_ptr;
29944+ void __user *blob_ptr;
29945
29946 if (!drm_core_check_feature(dev, DRIVER_MODESET))
29947 return -EINVAL;
29948@@ -2394,7 +2394,7 @@ int drm_mode_getblob_ioctl(struct drm_device *dev,
29949 blob = obj_to_blob(obj);
29950
29951 if (out_resp->length == blob->length) {
29952- blob_ptr = (void *)(unsigned long)out_resp->data;
29953+ blob_ptr = (void __user *)(unsigned long)out_resp->data;
29954 if (copy_to_user(blob_ptr, blob->data, blob->length)){
29955 ret = -EFAULT;
29956 goto done;
29957diff --git a/drivers/gpu/drm/drm_crtc_helper.c b/drivers/gpu/drm/drm_crtc_helper.c
29958index d2619d7..bd6bd00 100644
29959--- a/drivers/gpu/drm/drm_crtc_helper.c
29960+++ b/drivers/gpu/drm/drm_crtc_helper.c
29961@@ -279,7 +279,7 @@ static bool drm_encoder_crtc_ok(struct drm_encoder *encoder,
29962 struct drm_crtc *tmp;
29963 int crtc_mask = 1;
29964
29965- WARN(!crtc, "checking null crtc?\n");
29966+ BUG_ON(!crtc);
29967
29968 dev = crtc->dev;
29969
29970diff --git a/drivers/gpu/drm/drm_drv.c b/drivers/gpu/drm/drm_drv.c
29971index 40c187c..5746164 100644
29972--- a/drivers/gpu/drm/drm_drv.c
29973+++ b/drivers/gpu/drm/drm_drv.c
29974@@ -308,7 +308,7 @@ module_exit(drm_core_exit);
29975 /**
29976 * Copy and IOCTL return string to user space
29977 */
29978-static int drm_copy_field(char *buf, size_t *buf_len, const char *value)
29979+static int drm_copy_field(char __user *buf, size_t *buf_len, const char *value)
29980 {
29981 int len;
29982
29983@@ -387,7 +387,7 @@ long drm_ioctl(struct file *filp,
29984
29985 dev = file_priv->minor->dev;
29986 atomic_inc(&dev->ioctl_count);
29987- atomic_inc(&dev->counts[_DRM_STAT_IOCTLS]);
29988+ atomic_inc_unchecked(&dev->counts[_DRM_STAT_IOCTLS]);
29989 ++file_priv->ioctl_count;
29990
29991 DRM_DEBUG("pid=%d, cmd=0x%02x, nr=0x%02x, dev 0x%lx, auth=%d\n",
29992diff --git a/drivers/gpu/drm/drm_fops.c b/drivers/gpu/drm/drm_fops.c
29993index 828bf65..cdaa0e9 100644
29994--- a/drivers/gpu/drm/drm_fops.c
29995+++ b/drivers/gpu/drm/drm_fops.c
29996@@ -71,7 +71,7 @@ static int drm_setup(struct drm_device * dev)
29997 }
29998
29999 for (i = 0; i < ARRAY_SIZE(dev->counts); i++)
30000- atomic_set(&dev->counts[i], 0);
30001+ atomic_set_unchecked(&dev->counts[i], 0);
30002
30003 dev->sigdata.lock = NULL;
30004
30005@@ -135,8 +135,8 @@ int drm_open(struct inode *inode, struct file *filp)
30006
30007 retcode = drm_open_helper(inode, filp, dev);
30008 if (!retcode) {
30009- atomic_inc(&dev->counts[_DRM_STAT_OPENS]);
30010- if (!dev->open_count++)
30011+ atomic_inc_unchecked(&dev->counts[_DRM_STAT_OPENS]);
30012+ if (local_inc_return(&dev->open_count) == 1)
30013 retcode = drm_setup(dev);
30014 }
30015 if (!retcode) {
30016@@ -473,7 +473,7 @@ int drm_release(struct inode *inode, struct file *filp)
30017
30018 mutex_lock(&drm_global_mutex);
30019
30020- DRM_DEBUG("open_count = %d\n", dev->open_count);
30021+ DRM_DEBUG("open_count = %d\n", local_read(&dev->open_count));
30022
30023 if (dev->driver->preclose)
30024 dev->driver->preclose(dev, file_priv);
30025@@ -485,7 +485,7 @@ int drm_release(struct inode *inode, struct file *filp)
30026 DRM_DEBUG("pid = %d, device = 0x%lx, open_count = %d\n",
30027 task_pid_nr(current),
30028 (long)old_encode_dev(file_priv->minor->device),
30029- dev->open_count);
30030+ local_read(&dev->open_count));
30031
30032 /* Release any auth tokens that might point to this file_priv,
30033 (do that under the drm_global_mutex) */
30034@@ -571,8 +571,8 @@ int drm_release(struct inode *inode, struct file *filp)
30035 * End inline drm_release
30036 */
30037
30038- atomic_inc(&dev->counts[_DRM_STAT_CLOSES]);
30039- if (!--dev->open_count) {
30040+ atomic_inc_unchecked(&dev->counts[_DRM_STAT_CLOSES]);
30041+ if (local_dec_and_test(&dev->open_count)) {
30042 if (atomic_read(&dev->ioctl_count)) {
30043 DRM_ERROR("Device busy: %d\n",
30044 atomic_read(&dev->ioctl_count));
30045diff --git a/drivers/gpu/drm/drm_global.c b/drivers/gpu/drm/drm_global.c
30046index c87dc96..326055d 100644
30047--- a/drivers/gpu/drm/drm_global.c
30048+++ b/drivers/gpu/drm/drm_global.c
30049@@ -36,7 +36,7 @@
30050 struct drm_global_item {
30051 struct mutex mutex;
30052 void *object;
30053- int refcount;
30054+ atomic_t refcount;
30055 };
30056
30057 static struct drm_global_item glob[DRM_GLOBAL_NUM];
30058@@ -49,7 +49,7 @@ void drm_global_init(void)
30059 struct drm_global_item *item = &glob[i];
30060 mutex_init(&item->mutex);
30061 item->object = NULL;
30062- item->refcount = 0;
30063+ atomic_set(&item->refcount, 0);
30064 }
30065 }
30066
30067@@ -59,7 +59,7 @@ void drm_global_release(void)
30068 for (i = 0; i < DRM_GLOBAL_NUM; ++i) {
30069 struct drm_global_item *item = &glob[i];
30070 BUG_ON(item->object != NULL);
30071- BUG_ON(item->refcount != 0);
30072+ BUG_ON(atomic_read(&item->refcount) != 0);
30073 }
30074 }
30075
30076@@ -70,7 +70,7 @@ int drm_global_item_ref(struct drm_global_reference *ref)
30077 void *object;
30078
30079 mutex_lock(&item->mutex);
30080- if (item->refcount == 0) {
30081+ if (atomic_read(&item->refcount) == 0) {
30082 item->object = kzalloc(ref->size, GFP_KERNEL);
30083 if (unlikely(item->object == NULL)) {
30084 ret = -ENOMEM;
30085@@ -83,7 +83,7 @@ int drm_global_item_ref(struct drm_global_reference *ref)
30086 goto out_err;
30087
30088 }
30089- ++item->refcount;
30090+ atomic_inc(&item->refcount);
30091 ref->object = item->object;
30092 object = item->object;
30093 mutex_unlock(&item->mutex);
30094@@ -100,9 +100,9 @@ void drm_global_item_unref(struct drm_global_reference *ref)
30095 struct drm_global_item *item = &glob[ref->global_type];
30096
30097 mutex_lock(&item->mutex);
30098- BUG_ON(item->refcount == 0);
30099+ BUG_ON(atomic_read(&item->refcount) == 0);
30100 BUG_ON(ref->object != item->object);
30101- if (--item->refcount == 0) {
30102+ if (atomic_dec_and_test(&item->refcount)) {
30103 ref->release(ref);
30104 item->object = NULL;
30105 }
30106diff --git a/drivers/gpu/drm/drm_info.c b/drivers/gpu/drm/drm_info.c
30107index ab1162d..42587b2 100644
30108--- a/drivers/gpu/drm/drm_info.c
30109+++ b/drivers/gpu/drm/drm_info.c
30110@@ -75,10 +75,14 @@ int drm_vm_info(struct seq_file *m, void *data)
30111 struct drm_local_map *map;
30112 struct drm_map_list *r_list;
30113
30114- /* Hardcoded from _DRM_FRAME_BUFFER,
30115- _DRM_REGISTERS, _DRM_SHM, _DRM_AGP, and
30116- _DRM_SCATTER_GATHER and _DRM_CONSISTENT */
30117- const char *types[] = { "FB", "REG", "SHM", "AGP", "SG", "PCI" };
30118+ static const char * const types[] = {
30119+ [_DRM_FRAME_BUFFER] = "FB",
30120+ [_DRM_REGISTERS] = "REG",
30121+ [_DRM_SHM] = "SHM",
30122+ [_DRM_AGP] = "AGP",
30123+ [_DRM_SCATTER_GATHER] = "SG",
30124+ [_DRM_CONSISTENT] = "PCI",
30125+ [_DRM_GEM] = "GEM" };
30126 const char *type;
30127 int i;
30128
30129@@ -89,7 +93,7 @@ int drm_vm_info(struct seq_file *m, void *data)
30130 map = r_list->map;
30131 if (!map)
30132 continue;
30133- if (map->type < 0 || map->type > 5)
30134+ if (map->type >= ARRAY_SIZE(types))
30135 type = "??";
30136 else
30137 type = types[map->type];
30138@@ -290,7 +294,11 @@ int drm_vma_info(struct seq_file *m, void *data)
30139 vma->vm_flags & VM_MAYSHARE ? 's' : 'p',
30140 vma->vm_flags & VM_LOCKED ? 'l' : '-',
30141 vma->vm_flags & VM_IO ? 'i' : '-',
30142+#ifdef CONFIG_GRKERNSEC_HIDESYM
30143+ 0);
30144+#else
30145 vma->vm_pgoff);
30146+#endif
30147
30148 #if defined(__i386__)
30149 pgprot = pgprot_val(vma->vm_page_prot);
30150diff --git a/drivers/gpu/drm/drm_ioc32.c b/drivers/gpu/drm/drm_ioc32.c
30151index ddd70db..40321e6 100644
30152--- a/drivers/gpu/drm/drm_ioc32.c
30153+++ b/drivers/gpu/drm/drm_ioc32.c
30154@@ -456,7 +456,7 @@ static int compat_drm_infobufs(struct file *file, unsigned int cmd,
30155 request = compat_alloc_user_space(nbytes);
30156 if (!access_ok(VERIFY_WRITE, request, nbytes))
30157 return -EFAULT;
30158- list = (struct drm_buf_desc *) (request + 1);
30159+ list = (struct drm_buf_desc __user *) (request + 1);
30160
30161 if (__put_user(count, &request->count)
30162 || __put_user(list, &request->list))
30163@@ -517,7 +517,7 @@ static int compat_drm_mapbufs(struct file *file, unsigned int cmd,
30164 request = compat_alloc_user_space(nbytes);
30165 if (!access_ok(VERIFY_WRITE, request, nbytes))
30166 return -EFAULT;
30167- list = (struct drm_buf_pub *) (request + 1);
30168+ list = (struct drm_buf_pub __user *) (request + 1);
30169
30170 if (__put_user(count, &request->count)
30171 || __put_user(list, &request->list))
30172diff --git a/drivers/gpu/drm/drm_ioctl.c b/drivers/gpu/drm/drm_ioctl.c
30173index 904d7e9..ab88581 100644
30174--- a/drivers/gpu/drm/drm_ioctl.c
30175+++ b/drivers/gpu/drm/drm_ioctl.c
30176@@ -256,7 +256,7 @@ int drm_getstats(struct drm_device *dev, void *data,
30177 stats->data[i].value =
30178 (file_priv->master->lock.hw_lock ? file_priv->master->lock.hw_lock->lock : 0);
30179 else
30180- stats->data[i].value = atomic_read(&dev->counts[i]);
30181+ stats->data[i].value = atomic_read_unchecked(&dev->counts[i]);
30182 stats->data[i].type = dev->types[i];
30183 }
30184
30185diff --git a/drivers/gpu/drm/drm_lock.c b/drivers/gpu/drm/drm_lock.c
30186index 632ae24..244cf4a 100644
30187--- a/drivers/gpu/drm/drm_lock.c
30188+++ b/drivers/gpu/drm/drm_lock.c
30189@@ -89,7 +89,7 @@ int drm_lock(struct drm_device *dev, void *data, struct drm_file *file_priv)
30190 if (drm_lock_take(&master->lock, lock->context)) {
30191 master->lock.file_priv = file_priv;
30192 master->lock.lock_time = jiffies;
30193- atomic_inc(&dev->counts[_DRM_STAT_LOCKS]);
30194+ atomic_inc_unchecked(&dev->counts[_DRM_STAT_LOCKS]);
30195 break; /* Got lock */
30196 }
30197
30198@@ -160,7 +160,7 @@ int drm_unlock(struct drm_device *dev, void *data, struct drm_file *file_priv)
30199 return -EINVAL;
30200 }
30201
30202- atomic_inc(&dev->counts[_DRM_STAT_UNLOCKS]);
30203+ atomic_inc_unchecked(&dev->counts[_DRM_STAT_UNLOCKS]);
30204
30205 if (drm_lock_free(&master->lock, lock->context)) {
30206 /* FIXME: Should really bail out here. */
30207diff --git a/drivers/gpu/drm/i810/i810_dma.c b/drivers/gpu/drm/i810/i810_dma.c
30208index 8f371e8..9f85d52 100644
30209--- a/drivers/gpu/drm/i810/i810_dma.c
30210+++ b/drivers/gpu/drm/i810/i810_dma.c
30211@@ -950,8 +950,8 @@ static int i810_dma_vertex(struct drm_device *dev, void *data,
30212 dma->buflist[vertex->idx],
30213 vertex->discard, vertex->used);
30214
30215- atomic_add(vertex->used, &dev->counts[_DRM_STAT_SECONDARY]);
30216- atomic_inc(&dev->counts[_DRM_STAT_DMA]);
30217+ atomic_add_unchecked(vertex->used, &dev->counts[_DRM_STAT_SECONDARY]);
30218+ atomic_inc_unchecked(&dev->counts[_DRM_STAT_DMA]);
30219 sarea_priv->last_enqueue = dev_priv->counter - 1;
30220 sarea_priv->last_dispatch = (int)hw_status[5];
30221
30222@@ -1111,8 +1111,8 @@ static int i810_dma_mc(struct drm_device *dev, void *data,
30223 i810_dma_dispatch_mc(dev, dma->buflist[mc->idx], mc->used,
30224 mc->last_render);
30225
30226- atomic_add(mc->used, &dev->counts[_DRM_STAT_SECONDARY]);
30227- atomic_inc(&dev->counts[_DRM_STAT_DMA]);
30228+ atomic_add_unchecked(mc->used, &dev->counts[_DRM_STAT_SECONDARY]);
30229+ atomic_inc_unchecked(&dev->counts[_DRM_STAT_DMA]);
30230 sarea_priv->last_enqueue = dev_priv->counter - 1;
30231 sarea_priv->last_dispatch = (int)hw_status[5];
30232
30233diff --git a/drivers/gpu/drm/i810/i810_drv.h b/drivers/gpu/drm/i810/i810_drv.h
30234index c9339f4..f5e1b9d 100644
30235--- a/drivers/gpu/drm/i810/i810_drv.h
30236+++ b/drivers/gpu/drm/i810/i810_drv.h
30237@@ -108,8 +108,8 @@ typedef struct drm_i810_private {
30238 int page_flipping;
30239
30240 wait_queue_head_t irq_queue;
30241- atomic_t irq_received;
30242- atomic_t irq_emitted;
30243+ atomic_unchecked_t irq_received;
30244+ atomic_unchecked_t irq_emitted;
30245
30246 int front_offset;
30247 } drm_i810_private_t;
30248diff --git a/drivers/gpu/drm/i915/i915_debugfs.c b/drivers/gpu/drm/i915/i915_debugfs.c
30249index b2e3c97..58cf079 100644
30250--- a/drivers/gpu/drm/i915/i915_debugfs.c
30251+++ b/drivers/gpu/drm/i915/i915_debugfs.c
30252@@ -499,7 +499,7 @@ static int i915_interrupt_info(struct seq_file *m, void *data)
30253 I915_READ(GTIMR));
30254 }
30255 seq_printf(m, "Interrupts received: %d\n",
30256- atomic_read(&dev_priv->irq_received));
30257+ atomic_read_unchecked(&dev_priv->irq_received));
30258 for (i = 0; i < I915_NUM_RINGS; i++) {
30259 if (IS_GEN6(dev) || IS_GEN7(dev)) {
30260 seq_printf(m, "Graphics Interrupt mask (%s): %08x\n",
30261@@ -1232,7 +1232,7 @@ static int i915_opregion(struct seq_file *m, void *unused)
30262 return ret;
30263
30264 if (opregion->header)
30265- seq_write(m, opregion->header, OPREGION_SIZE);
30266+ seq_write(m, (const void __force_kernel *)opregion->header, OPREGION_SIZE);
30267
30268 mutex_unlock(&dev->struct_mutex);
30269
30270diff --git a/drivers/gpu/drm/i915/i915_dma.c b/drivers/gpu/drm/i915/i915_dma.c
30271index c4da951..3c59c5c 100644
30272--- a/drivers/gpu/drm/i915/i915_dma.c
30273+++ b/drivers/gpu/drm/i915/i915_dma.c
30274@@ -1172,7 +1172,7 @@ static bool i915_switcheroo_can_switch(struct pci_dev *pdev)
30275 bool can_switch;
30276
30277 spin_lock(&dev->count_lock);
30278- can_switch = (dev->open_count == 0);
30279+ can_switch = (local_read(&dev->open_count) == 0);
30280 spin_unlock(&dev->count_lock);
30281 return can_switch;
30282 }
30283diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h
30284index ae294a0..1755461 100644
30285--- a/drivers/gpu/drm/i915/i915_drv.h
30286+++ b/drivers/gpu/drm/i915/i915_drv.h
30287@@ -229,7 +229,7 @@ struct drm_i915_display_funcs {
30288 /* render clock increase/decrease */
30289 /* display clock increase/decrease */
30290 /* pll clock increase/decrease */
30291-};
30292+} __no_const;
30293
30294 struct intel_device_info {
30295 u8 gen;
30296@@ -318,7 +318,7 @@ typedef struct drm_i915_private {
30297 int current_page;
30298 int page_flipping;
30299
30300- atomic_t irq_received;
30301+ atomic_unchecked_t irq_received;
30302
30303 /* protects the irq masks */
30304 spinlock_t irq_lock;
30305@@ -893,7 +893,7 @@ struct drm_i915_gem_object {
30306 * will be page flipped away on the next vblank. When it
30307 * reaches 0, dev_priv->pending_flip_queue will be woken up.
30308 */
30309- atomic_t pending_flip;
30310+ atomic_unchecked_t pending_flip;
30311 };
30312
30313 #define to_intel_bo(x) container_of(x, struct drm_i915_gem_object, base)
30314@@ -1273,7 +1273,7 @@ extern int intel_setup_gmbus(struct drm_device *dev);
30315 extern void intel_teardown_gmbus(struct drm_device *dev);
30316 extern void intel_gmbus_set_speed(struct i2c_adapter *adapter, int speed);
30317 extern void intel_gmbus_force_bit(struct i2c_adapter *adapter, bool force_bit);
30318-extern inline bool intel_gmbus_is_forced_bit(struct i2c_adapter *adapter)
30319+static inline bool intel_gmbus_is_forced_bit(struct i2c_adapter *adapter)
30320 {
30321 return container_of(adapter, struct intel_gmbus, adapter)->force_bit;
30322 }
30323diff --git a/drivers/gpu/drm/i915/i915_gem_execbuffer.c b/drivers/gpu/drm/i915/i915_gem_execbuffer.c
30324index b9da890..cad1d98 100644
30325--- a/drivers/gpu/drm/i915/i915_gem_execbuffer.c
30326+++ b/drivers/gpu/drm/i915/i915_gem_execbuffer.c
30327@@ -189,7 +189,7 @@ i915_gem_object_set_to_gpu_domain(struct drm_i915_gem_object *obj,
30328 i915_gem_clflush_object(obj);
30329
30330 if (obj->base.pending_write_domain)
30331- cd->flips |= atomic_read(&obj->pending_flip);
30332+ cd->flips |= atomic_read_unchecked(&obj->pending_flip);
30333
30334 /* The actual obj->write_domain will be updated with
30335 * pending_write_domain after we emit the accumulated flush for all
30336@@ -882,9 +882,9 @@ i915_gem_check_execbuffer(struct drm_i915_gem_execbuffer2 *exec)
30337
30338 static int
30339 validate_exec_list(struct drm_i915_gem_exec_object2 *exec,
30340- int count)
30341+ unsigned int count)
30342 {
30343- int i;
30344+ unsigned int i;
30345
30346 for (i = 0; i < count; i++) {
30347 char __user *ptr = (char __user *)(uintptr_t)exec[i].relocs_ptr;
30348diff --git a/drivers/gpu/drm/i915/i915_irq.c b/drivers/gpu/drm/i915/i915_irq.c
30349index d47a53b..61154c2 100644
30350--- a/drivers/gpu/drm/i915/i915_irq.c
30351+++ b/drivers/gpu/drm/i915/i915_irq.c
30352@@ -475,7 +475,7 @@ static irqreturn_t ivybridge_irq_handler(DRM_IRQ_ARGS)
30353 u32 de_iir, gt_iir, de_ier, pch_iir, pm_iir;
30354 struct drm_i915_master_private *master_priv;
30355
30356- atomic_inc(&dev_priv->irq_received);
30357+ atomic_inc_unchecked(&dev_priv->irq_received);
30358
30359 /* disable master interrupt before clearing iir */
30360 de_ier = I915_READ(DEIER);
30361@@ -566,7 +566,7 @@ static irqreturn_t ironlake_irq_handler(DRM_IRQ_ARGS)
30362 struct drm_i915_master_private *master_priv;
30363 u32 bsd_usr_interrupt = GT_BSD_USER_INTERRUPT;
30364
30365- atomic_inc(&dev_priv->irq_received);
30366+ atomic_inc_unchecked(&dev_priv->irq_received);
30367
30368 if (IS_GEN6(dev))
30369 bsd_usr_interrupt = GT_GEN6_BSD_USER_INTERRUPT;
30370@@ -1231,7 +1231,7 @@ static irqreturn_t i915_driver_irq_handler(DRM_IRQ_ARGS)
30371 int ret = IRQ_NONE, pipe;
30372 bool blc_event = false;
30373
30374- atomic_inc(&dev_priv->irq_received);
30375+ atomic_inc_unchecked(&dev_priv->irq_received);
30376
30377 iir = I915_READ(IIR);
30378
30379@@ -1750,7 +1750,7 @@ static void ironlake_irq_preinstall(struct drm_device *dev)
30380 {
30381 drm_i915_private_t *dev_priv = (drm_i915_private_t *) dev->dev_private;
30382
30383- atomic_set(&dev_priv->irq_received, 0);
30384+ atomic_set_unchecked(&dev_priv->irq_received, 0);
30385
30386 INIT_WORK(&dev_priv->hotplug_work, i915_hotplug_work_func);
30387 INIT_WORK(&dev_priv->error_work, i915_error_work_func);
30388@@ -1938,7 +1938,7 @@ static void i915_driver_irq_preinstall(struct drm_device * dev)
30389 drm_i915_private_t *dev_priv = (drm_i915_private_t *) dev->dev_private;
30390 int pipe;
30391
30392- atomic_set(&dev_priv->irq_received, 0);
30393+ atomic_set_unchecked(&dev_priv->irq_received, 0);
30394
30395 INIT_WORK(&dev_priv->hotplug_work, i915_hotplug_work_func);
30396 INIT_WORK(&dev_priv->error_work, i915_error_work_func);
30397diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
30398index 9ec9755..6d1cf2d 100644
30399--- a/drivers/gpu/drm/i915/intel_display.c
30400+++ b/drivers/gpu/drm/i915/intel_display.c
30401@@ -2230,7 +2230,7 @@ intel_pipe_set_base(struct drm_crtc *crtc, int x, int y,
30402
30403 wait_event(dev_priv->pending_flip_queue,
30404 atomic_read(&dev_priv->mm.wedged) ||
30405- atomic_read(&obj->pending_flip) == 0);
30406+ atomic_read_unchecked(&obj->pending_flip) == 0);
30407
30408 /* Big Hammer, we also need to ensure that any pending
30409 * MI_WAIT_FOR_EVENT inside a user batch buffer on the
30410@@ -2851,7 +2851,7 @@ static void intel_crtc_wait_for_pending_flips(struct drm_crtc *crtc)
30411 obj = to_intel_framebuffer(crtc->fb)->obj;
30412 dev_priv = crtc->dev->dev_private;
30413 wait_event(dev_priv->pending_flip_queue,
30414- atomic_read(&obj->pending_flip) == 0);
30415+ atomic_read_unchecked(&obj->pending_flip) == 0);
30416 }
30417
30418 static bool intel_crtc_driving_pch(struct drm_crtc *crtc)
30419@@ -6952,7 +6952,7 @@ static void do_intel_finish_page_flip(struct drm_device *dev,
30420
30421 atomic_clear_mask(1 << intel_crtc->plane,
30422 &obj->pending_flip.counter);
30423- if (atomic_read(&obj->pending_flip) == 0)
30424+ if (atomic_read_unchecked(&obj->pending_flip) == 0)
30425 wake_up(&dev_priv->pending_flip_queue);
30426
30427 schedule_work(&work->work);
30428@@ -7242,7 +7242,7 @@ static int intel_crtc_page_flip(struct drm_crtc *crtc,
30429 /* Block clients from rendering to the new back buffer until
30430 * the flip occurs and the object is no longer visible.
30431 */
30432- atomic_add(1 << intel_crtc->plane, &work->old_fb_obj->pending_flip);
30433+ atomic_add_unchecked(1 << intel_crtc->plane, &work->old_fb_obj->pending_flip);
30434
30435 ret = dev_priv->display.queue_flip(dev, crtc, fb, obj);
30436 if (ret)
30437@@ -7256,7 +7256,7 @@ static int intel_crtc_page_flip(struct drm_crtc *crtc,
30438 return 0;
30439
30440 cleanup_pending:
30441- atomic_sub(1 << intel_crtc->plane, &work->old_fb_obj->pending_flip);
30442+ atomic_sub_unchecked(1 << intel_crtc->plane, &work->old_fb_obj->pending_flip);
30443 drm_gem_object_unreference(&work->old_fb_obj->base);
30444 drm_gem_object_unreference(&obj->base);
30445 mutex_unlock(&dev->struct_mutex);
30446diff --git a/drivers/gpu/drm/mga/mga_drv.h b/drivers/gpu/drm/mga/mga_drv.h
30447index 54558a0..2d97005 100644
30448--- a/drivers/gpu/drm/mga/mga_drv.h
30449+++ b/drivers/gpu/drm/mga/mga_drv.h
30450@@ -120,9 +120,9 @@ typedef struct drm_mga_private {
30451 u32 clear_cmd;
30452 u32 maccess;
30453
30454- atomic_t vbl_received; /**< Number of vblanks received. */
30455+ atomic_unchecked_t vbl_received; /**< Number of vblanks received. */
30456 wait_queue_head_t fence_queue;
30457- atomic_t last_fence_retired;
30458+ atomic_unchecked_t last_fence_retired;
30459 u32 next_fence_to_post;
30460
30461 unsigned int fb_cpp;
30462diff --git a/drivers/gpu/drm/mga/mga_irq.c b/drivers/gpu/drm/mga/mga_irq.c
30463index 2581202..f230a8d9 100644
30464--- a/drivers/gpu/drm/mga/mga_irq.c
30465+++ b/drivers/gpu/drm/mga/mga_irq.c
30466@@ -44,7 +44,7 @@ u32 mga_get_vblank_counter(struct drm_device *dev, int crtc)
30467 if (crtc != 0)
30468 return 0;
30469
30470- return atomic_read(&dev_priv->vbl_received);
30471+ return atomic_read_unchecked(&dev_priv->vbl_received);
30472 }
30473
30474
30475@@ -60,7 +60,7 @@ irqreturn_t mga_driver_irq_handler(DRM_IRQ_ARGS)
30476 /* VBLANK interrupt */
30477 if (status & MGA_VLINEPEN) {
30478 MGA_WRITE(MGA_ICLEAR, MGA_VLINEICLR);
30479- atomic_inc(&dev_priv->vbl_received);
30480+ atomic_inc_unchecked(&dev_priv->vbl_received);
30481 drm_handle_vblank(dev, 0);
30482 handled = 1;
30483 }
30484@@ -79,7 +79,7 @@ irqreturn_t mga_driver_irq_handler(DRM_IRQ_ARGS)
30485 if ((prim_start & ~0x03) != (prim_end & ~0x03))
30486 MGA_WRITE(MGA_PRIMEND, prim_end);
30487
30488- atomic_inc(&dev_priv->last_fence_retired);
30489+ atomic_inc_unchecked(&dev_priv->last_fence_retired);
30490 DRM_WAKEUP(&dev_priv->fence_queue);
30491 handled = 1;
30492 }
30493@@ -130,7 +130,7 @@ int mga_driver_fence_wait(struct drm_device *dev, unsigned int *sequence)
30494 * using fences.
30495 */
30496 DRM_WAIT_ON(ret, dev_priv->fence_queue, 3 * DRM_HZ,
30497- (((cur_fence = atomic_read(&dev_priv->last_fence_retired))
30498+ (((cur_fence = atomic_read_unchecked(&dev_priv->last_fence_retired))
30499 - *sequence) <= (1 << 23)));
30500
30501 *sequence = cur_fence;
30502diff --git a/drivers/gpu/drm/nouveau/nouveau_bios.c b/drivers/gpu/drm/nouveau/nouveau_bios.c
30503index 5fc201b..7b032b9 100644
30504--- a/drivers/gpu/drm/nouveau/nouveau_bios.c
30505+++ b/drivers/gpu/drm/nouveau/nouveau_bios.c
30506@@ -201,7 +201,7 @@ struct methods {
30507 const char desc[8];
30508 void (*loadbios)(struct drm_device *, uint8_t *);
30509 const bool rw;
30510-};
30511+} __do_const;
30512
30513 static struct methods shadow_methods[] = {
30514 { "PRAMIN", load_vbios_pramin, true },
30515@@ -5474,7 +5474,7 @@ parse_bit_U_tbl_entry(struct drm_device *dev, struct nvbios *bios,
30516 struct bit_table {
30517 const char id;
30518 int (* const parse_fn)(struct drm_device *, struct nvbios *, struct bit_entry *);
30519-};
30520+} __no_const;
30521
30522 #define BIT_TABLE(id, funcid) ((struct bit_table){ id, parse_bit_##funcid##_tbl_entry })
30523
30524diff --git a/drivers/gpu/drm/nouveau/nouveau_drv.h b/drivers/gpu/drm/nouveau/nouveau_drv.h
30525index 4c0be3a..5757582 100644
30526--- a/drivers/gpu/drm/nouveau/nouveau_drv.h
30527+++ b/drivers/gpu/drm/nouveau/nouveau_drv.h
30528@@ -238,7 +238,7 @@ struct nouveau_channel {
30529 struct list_head pending;
30530 uint32_t sequence;
30531 uint32_t sequence_ack;
30532- atomic_t last_sequence_irq;
30533+ atomic_unchecked_t last_sequence_irq;
30534 struct nouveau_vma vma;
30535 } fence;
30536
30537@@ -319,7 +319,7 @@ struct nouveau_exec_engine {
30538 u32 handle, u16 class);
30539 void (*set_tile_region)(struct drm_device *dev, int i);
30540 void (*tlb_flush)(struct drm_device *, int engine);
30541-};
30542+} __no_const;
30543
30544 struct nouveau_instmem_engine {
30545 void *priv;
30546@@ -341,13 +341,13 @@ struct nouveau_instmem_engine {
30547 struct nouveau_mc_engine {
30548 int (*init)(struct drm_device *dev);
30549 void (*takedown)(struct drm_device *dev);
30550-};
30551+} __no_const;
30552
30553 struct nouveau_timer_engine {
30554 int (*init)(struct drm_device *dev);
30555 void (*takedown)(struct drm_device *dev);
30556 uint64_t (*read)(struct drm_device *dev);
30557-};
30558+} __no_const;
30559
30560 struct nouveau_fb_engine {
30561 int num_tiles;
30562@@ -558,7 +558,7 @@ struct nouveau_vram_engine {
30563 void (*put)(struct drm_device *, struct nouveau_mem **);
30564
30565 bool (*flags_valid)(struct drm_device *, u32 tile_flags);
30566-};
30567+} __no_const;
30568
30569 struct nouveau_engine {
30570 struct nouveau_instmem_engine instmem;
30571@@ -706,7 +706,7 @@ struct drm_nouveau_private {
30572 struct drm_global_reference mem_global_ref;
30573 struct ttm_bo_global_ref bo_global_ref;
30574 struct ttm_bo_device bdev;
30575- atomic_t validate_sequence;
30576+ atomic_unchecked_t validate_sequence;
30577 } ttm;
30578
30579 struct {
30580diff --git a/drivers/gpu/drm/nouveau/nouveau_fence.c b/drivers/gpu/drm/nouveau/nouveau_fence.c
30581index 2f6daae..c9d7b9e 100644
30582--- a/drivers/gpu/drm/nouveau/nouveau_fence.c
30583+++ b/drivers/gpu/drm/nouveau/nouveau_fence.c
30584@@ -85,7 +85,7 @@ nouveau_fence_update(struct nouveau_channel *chan)
30585 if (USE_REFCNT(dev))
30586 sequence = nvchan_rd32(chan, 0x48);
30587 else
30588- sequence = atomic_read(&chan->fence.last_sequence_irq);
30589+ sequence = atomic_read_unchecked(&chan->fence.last_sequence_irq);
30590
30591 if (chan->fence.sequence_ack == sequence)
30592 goto out;
30593@@ -539,7 +539,7 @@ nouveau_fence_channel_init(struct nouveau_channel *chan)
30594 return ret;
30595 }
30596
30597- atomic_set(&chan->fence.last_sequence_irq, 0);
30598+ atomic_set_unchecked(&chan->fence.last_sequence_irq, 0);
30599 return 0;
30600 }
30601
30602diff --git a/drivers/gpu/drm/nouveau/nouveau_gem.c b/drivers/gpu/drm/nouveau/nouveau_gem.c
30603index 7ce3fde..cb3ea04 100644
30604--- a/drivers/gpu/drm/nouveau/nouveau_gem.c
30605+++ b/drivers/gpu/drm/nouveau/nouveau_gem.c
30606@@ -314,7 +314,7 @@ validate_init(struct nouveau_channel *chan, struct drm_file *file_priv,
30607 int trycnt = 0;
30608 int ret, i;
30609
30610- sequence = atomic_add_return(1, &dev_priv->ttm.validate_sequence);
30611+ sequence = atomic_add_return_unchecked(1, &dev_priv->ttm.validate_sequence);
30612 retry:
30613 if (++trycnt > 100000) {
30614 NV_ERROR(dev, "%s failed and gave up.\n", __func__);
30615diff --git a/drivers/gpu/drm/nouveau/nouveau_state.c b/drivers/gpu/drm/nouveau/nouveau_state.c
30616index d8831ab..0ba8356 100644
30617--- a/drivers/gpu/drm/nouveau/nouveau_state.c
30618+++ b/drivers/gpu/drm/nouveau/nouveau_state.c
30619@@ -542,7 +542,7 @@ static bool nouveau_switcheroo_can_switch(struct pci_dev *pdev)
30620 bool can_switch;
30621
30622 spin_lock(&dev->count_lock);
30623- can_switch = (dev->open_count == 0);
30624+ can_switch = (local_read(&dev->open_count) == 0);
30625 spin_unlock(&dev->count_lock);
30626 return can_switch;
30627 }
30628diff --git a/drivers/gpu/drm/nouveau/nv04_graph.c b/drivers/gpu/drm/nouveau/nv04_graph.c
30629index dbdea8e..cd6eeeb 100644
30630--- a/drivers/gpu/drm/nouveau/nv04_graph.c
30631+++ b/drivers/gpu/drm/nouveau/nv04_graph.c
30632@@ -554,7 +554,7 @@ static int
30633 nv04_graph_mthd_set_ref(struct nouveau_channel *chan,
30634 u32 class, u32 mthd, u32 data)
30635 {
30636- atomic_set(&chan->fence.last_sequence_irq, data);
30637+ atomic_set_unchecked(&chan->fence.last_sequence_irq, data);
30638 return 0;
30639 }
30640
30641diff --git a/drivers/gpu/drm/r128/r128_cce.c b/drivers/gpu/drm/r128/r128_cce.c
30642index bcac90b..53bfc76 100644
30643--- a/drivers/gpu/drm/r128/r128_cce.c
30644+++ b/drivers/gpu/drm/r128/r128_cce.c
30645@@ -378,7 +378,7 @@ static int r128_do_init_cce(struct drm_device *dev, drm_r128_init_t *init)
30646
30647 /* GH: Simple idle check.
30648 */
30649- atomic_set(&dev_priv->idle_count, 0);
30650+ atomic_set_unchecked(&dev_priv->idle_count, 0);
30651
30652 /* We don't support anything other than bus-mastering ring mode,
30653 * but the ring can be in either AGP or PCI space for the ring
30654diff --git a/drivers/gpu/drm/r128/r128_drv.h b/drivers/gpu/drm/r128/r128_drv.h
30655index 930c71b..499aded 100644
30656--- a/drivers/gpu/drm/r128/r128_drv.h
30657+++ b/drivers/gpu/drm/r128/r128_drv.h
30658@@ -90,14 +90,14 @@ typedef struct drm_r128_private {
30659 int is_pci;
30660 unsigned long cce_buffers_offset;
30661
30662- atomic_t idle_count;
30663+ atomic_unchecked_t idle_count;
30664
30665 int page_flipping;
30666 int current_page;
30667 u32 crtc_offset;
30668 u32 crtc_offset_cntl;
30669
30670- atomic_t vbl_received;
30671+ atomic_unchecked_t vbl_received;
30672
30673 u32 color_fmt;
30674 unsigned int front_offset;
30675diff --git a/drivers/gpu/drm/r128/r128_irq.c b/drivers/gpu/drm/r128/r128_irq.c
30676index 429d5a0..7e899ed 100644
30677--- a/drivers/gpu/drm/r128/r128_irq.c
30678+++ b/drivers/gpu/drm/r128/r128_irq.c
30679@@ -42,7 +42,7 @@ u32 r128_get_vblank_counter(struct drm_device *dev, int crtc)
30680 if (crtc != 0)
30681 return 0;
30682
30683- return atomic_read(&dev_priv->vbl_received);
30684+ return atomic_read_unchecked(&dev_priv->vbl_received);
30685 }
30686
30687 irqreturn_t r128_driver_irq_handler(DRM_IRQ_ARGS)
30688@@ -56,7 +56,7 @@ irqreturn_t r128_driver_irq_handler(DRM_IRQ_ARGS)
30689 /* VBLANK interrupt */
30690 if (status & R128_CRTC_VBLANK_INT) {
30691 R128_WRITE(R128_GEN_INT_STATUS, R128_CRTC_VBLANK_INT_AK);
30692- atomic_inc(&dev_priv->vbl_received);
30693+ atomic_inc_unchecked(&dev_priv->vbl_received);
30694 drm_handle_vblank(dev, 0);
30695 return IRQ_HANDLED;
30696 }
30697diff --git a/drivers/gpu/drm/r128/r128_state.c b/drivers/gpu/drm/r128/r128_state.c
30698index a9e33ce..09edd4b 100644
30699--- a/drivers/gpu/drm/r128/r128_state.c
30700+++ b/drivers/gpu/drm/r128/r128_state.c
30701@@ -321,10 +321,10 @@ static void r128_clear_box(drm_r128_private_t *dev_priv,
30702
30703 static void r128_cce_performance_boxes(drm_r128_private_t *dev_priv)
30704 {
30705- if (atomic_read(&dev_priv->idle_count) == 0)
30706+ if (atomic_read_unchecked(&dev_priv->idle_count) == 0)
30707 r128_clear_box(dev_priv, 64, 4, 8, 8, 0, 255, 0);
30708 else
30709- atomic_set(&dev_priv->idle_count, 0);
30710+ atomic_set_unchecked(&dev_priv->idle_count, 0);
30711 }
30712
30713 #endif
30714diff --git a/drivers/gpu/drm/radeon/mkregtable.c b/drivers/gpu/drm/radeon/mkregtable.c
30715index 5a82b6b..9e69c73 100644
30716--- a/drivers/gpu/drm/radeon/mkregtable.c
30717+++ b/drivers/gpu/drm/radeon/mkregtable.c
30718@@ -637,14 +637,14 @@ static int parser_auth(struct table *t, const char *filename)
30719 regex_t mask_rex;
30720 regmatch_t match[4];
30721 char buf[1024];
30722- size_t end;
30723+ long end;
30724 int len;
30725 int done = 0;
30726 int r;
30727 unsigned o;
30728 struct offset *offset;
30729 char last_reg_s[10];
30730- int last_reg;
30731+ unsigned long last_reg;
30732
30733 if (regcomp
30734 (&mask_rex, "(0x[0-9a-fA-F]*) *([_a-zA-Z0-9]*)", REG_EXTENDED)) {
30735diff --git a/drivers/gpu/drm/radeon/r600_cs.c b/drivers/gpu/drm/radeon/r600_cs.c
30736index cb1acff..8861bc5 100644
30737--- a/drivers/gpu/drm/radeon/r600_cs.c
30738+++ b/drivers/gpu/drm/radeon/r600_cs.c
30739@@ -1304,6 +1304,7 @@ static int r600_check_texture_resource(struct radeon_cs_parser *p, u32 idx,
30740 h0 = G_038004_TEX_HEIGHT(word1) + 1;
30741 d0 = G_038004_TEX_DEPTH(word1);
30742 nfaces = 1;
30743+ array = 0;
30744 switch (G_038000_DIM(word0)) {
30745 case V_038000_SQ_TEX_DIM_1D:
30746 case V_038000_SQ_TEX_DIM_2D:
30747diff --git a/drivers/gpu/drm/radeon/radeon.h b/drivers/gpu/drm/radeon/radeon.h
30748index 8227e76..ce0b195 100644
30749--- a/drivers/gpu/drm/radeon/radeon.h
30750+++ b/drivers/gpu/drm/radeon/radeon.h
30751@@ -192,7 +192,7 @@ extern int sumo_get_temp(struct radeon_device *rdev);
30752 */
30753 struct radeon_fence_driver {
30754 uint32_t scratch_reg;
30755- atomic_t seq;
30756+ atomic_unchecked_t seq;
30757 uint32_t last_seq;
30758 unsigned long last_jiffies;
30759 unsigned long last_timeout;
30760@@ -530,7 +530,7 @@ struct r600_blit_cp_primitives {
30761 int x2, int y2);
30762 void (*draw_auto)(struct radeon_device *rdev);
30763 void (*set_default_state)(struct radeon_device *rdev);
30764-};
30765+} __no_const;
30766
30767 struct r600_blit {
30768 struct mutex mutex;
30769@@ -954,7 +954,7 @@ struct radeon_asic {
30770 void (*pre_page_flip)(struct radeon_device *rdev, int crtc);
30771 u32 (*page_flip)(struct radeon_device *rdev, int crtc, u64 crtc_base);
30772 void (*post_page_flip)(struct radeon_device *rdev, int crtc);
30773-};
30774+} __no_const;
30775
30776 /*
30777 * Asic structures
30778diff --git a/drivers/gpu/drm/radeon/radeon_device.c b/drivers/gpu/drm/radeon/radeon_device.c
30779index 9231564..78b00fd 100644
30780--- a/drivers/gpu/drm/radeon/radeon_device.c
30781+++ b/drivers/gpu/drm/radeon/radeon_device.c
30782@@ -687,7 +687,7 @@ static bool radeon_switcheroo_can_switch(struct pci_dev *pdev)
30783 bool can_switch;
30784
30785 spin_lock(&dev->count_lock);
30786- can_switch = (dev->open_count == 0);
30787+ can_switch = (local_read(&dev->open_count) == 0);
30788 spin_unlock(&dev->count_lock);
30789 return can_switch;
30790 }
30791diff --git a/drivers/gpu/drm/radeon/radeon_drv.h b/drivers/gpu/drm/radeon/radeon_drv.h
30792index a1b59ca..86f2d44 100644
30793--- a/drivers/gpu/drm/radeon/radeon_drv.h
30794+++ b/drivers/gpu/drm/radeon/radeon_drv.h
30795@@ -255,7 +255,7 @@ typedef struct drm_radeon_private {
30796
30797 /* SW interrupt */
30798 wait_queue_head_t swi_queue;
30799- atomic_t swi_emitted;
30800+ atomic_unchecked_t swi_emitted;
30801 int vblank_crtc;
30802 uint32_t irq_enable_reg;
30803 uint32_t r500_disp_irq_reg;
30804diff --git a/drivers/gpu/drm/radeon/radeon_fence.c b/drivers/gpu/drm/radeon/radeon_fence.c
30805index 76ec0e9..6feb1a3 100644
30806--- a/drivers/gpu/drm/radeon/radeon_fence.c
30807+++ b/drivers/gpu/drm/radeon/radeon_fence.c
30808@@ -78,7 +78,7 @@ int radeon_fence_emit(struct radeon_device *rdev, struct radeon_fence *fence)
30809 write_unlock_irqrestore(&rdev->fence_drv.lock, irq_flags);
30810 return 0;
30811 }
30812- fence->seq = atomic_add_return(1, &rdev->fence_drv.seq);
30813+ fence->seq = atomic_add_return_unchecked(1, &rdev->fence_drv.seq);
30814 if (!rdev->cp.ready)
30815 /* FIXME: cp is not running assume everythings is done right
30816 * away
30817@@ -373,7 +373,7 @@ int radeon_fence_driver_init(struct radeon_device *rdev)
30818 return r;
30819 }
30820 radeon_fence_write(rdev, 0);
30821- atomic_set(&rdev->fence_drv.seq, 0);
30822+ atomic_set_unchecked(&rdev->fence_drv.seq, 0);
30823 INIT_LIST_HEAD(&rdev->fence_drv.created);
30824 INIT_LIST_HEAD(&rdev->fence_drv.emited);
30825 INIT_LIST_HEAD(&rdev->fence_drv.signaled);
30826diff --git a/drivers/gpu/drm/radeon/radeon_ioc32.c b/drivers/gpu/drm/radeon/radeon_ioc32.c
30827index 48b7cea..342236f 100644
30828--- a/drivers/gpu/drm/radeon/radeon_ioc32.c
30829+++ b/drivers/gpu/drm/radeon/radeon_ioc32.c
30830@@ -359,7 +359,7 @@ static int compat_radeon_cp_setparam(struct file *file, unsigned int cmd,
30831 request = compat_alloc_user_space(sizeof(*request));
30832 if (!access_ok(VERIFY_WRITE, request, sizeof(*request))
30833 || __put_user(req32.param, &request->param)
30834- || __put_user((void __user *)(unsigned long)req32.value,
30835+ || __put_user((unsigned long)req32.value,
30836 &request->value))
30837 return -EFAULT;
30838
30839diff --git a/drivers/gpu/drm/radeon/radeon_irq.c b/drivers/gpu/drm/radeon/radeon_irq.c
30840index 00da384..32f972d 100644
30841--- a/drivers/gpu/drm/radeon/radeon_irq.c
30842+++ b/drivers/gpu/drm/radeon/radeon_irq.c
30843@@ -225,8 +225,8 @@ static int radeon_emit_irq(struct drm_device * dev)
30844 unsigned int ret;
30845 RING_LOCALS;
30846
30847- atomic_inc(&dev_priv->swi_emitted);
30848- ret = atomic_read(&dev_priv->swi_emitted);
30849+ atomic_inc_unchecked(&dev_priv->swi_emitted);
30850+ ret = atomic_read_unchecked(&dev_priv->swi_emitted);
30851
30852 BEGIN_RING(4);
30853 OUT_RING_REG(RADEON_LAST_SWI_REG, ret);
30854@@ -352,7 +352,7 @@ int radeon_driver_irq_postinstall(struct drm_device *dev)
30855 drm_radeon_private_t *dev_priv =
30856 (drm_radeon_private_t *) dev->dev_private;
30857
30858- atomic_set(&dev_priv->swi_emitted, 0);
30859+ atomic_set_unchecked(&dev_priv->swi_emitted, 0);
30860 DRM_INIT_WAITQUEUE(&dev_priv->swi_queue);
30861
30862 dev->max_vblank_count = 0x001fffff;
30863diff --git a/drivers/gpu/drm/radeon/radeon_state.c b/drivers/gpu/drm/radeon/radeon_state.c
30864index e8422ae..d22d4a8 100644
30865--- a/drivers/gpu/drm/radeon/radeon_state.c
30866+++ b/drivers/gpu/drm/radeon/radeon_state.c
30867@@ -2168,7 +2168,7 @@ static int radeon_cp_clear(struct drm_device *dev, void *data, struct drm_file *
30868 if (sarea_priv->nbox > RADEON_NR_SAREA_CLIPRECTS)
30869 sarea_priv->nbox = RADEON_NR_SAREA_CLIPRECTS;
30870
30871- if (DRM_COPY_FROM_USER(&depth_boxes, clear->depth_boxes,
30872+ if (sarea_priv->nbox > RADEON_NR_SAREA_CLIPRECTS || DRM_COPY_FROM_USER(&depth_boxes, clear->depth_boxes,
30873 sarea_priv->nbox * sizeof(depth_boxes[0])))
30874 return -EFAULT;
30875
30876@@ -3031,7 +3031,7 @@ static int radeon_cp_getparam(struct drm_device *dev, void *data, struct drm_fil
30877 {
30878 drm_radeon_private_t *dev_priv = dev->dev_private;
30879 drm_radeon_getparam_t *param = data;
30880- int value;
30881+ int value = 0;
30882
30883 DRM_DEBUG("pid=%d\n", DRM_CURRENTPID);
30884
30885diff --git a/drivers/gpu/drm/radeon/radeon_ttm.c b/drivers/gpu/drm/radeon/radeon_ttm.c
30886index 0b5468b..9c4b308 100644
30887--- a/drivers/gpu/drm/radeon/radeon_ttm.c
30888+++ b/drivers/gpu/drm/radeon/radeon_ttm.c
30889@@ -672,8 +672,10 @@ int radeon_mmap(struct file *filp, struct vm_area_struct *vma)
30890 }
30891 if (unlikely(ttm_vm_ops == NULL)) {
30892 ttm_vm_ops = vma->vm_ops;
30893- radeon_ttm_vm_ops = *ttm_vm_ops;
30894- radeon_ttm_vm_ops.fault = &radeon_ttm_fault;
30895+ pax_open_kernel();
30896+ memcpy((void *)&radeon_ttm_vm_ops, ttm_vm_ops, sizeof(radeon_ttm_vm_ops));
30897+ *(void **)&radeon_ttm_vm_ops.fault = &radeon_ttm_fault;
30898+ pax_close_kernel();
30899 }
30900 vma->vm_ops = &radeon_ttm_vm_ops;
30901 return 0;
30902diff --git a/drivers/gpu/drm/radeon/rs690.c b/drivers/gpu/drm/radeon/rs690.c
30903index a9049ed..501f284 100644
30904--- a/drivers/gpu/drm/radeon/rs690.c
30905+++ b/drivers/gpu/drm/radeon/rs690.c
30906@@ -304,9 +304,11 @@ void rs690_crtc_bandwidth_compute(struct radeon_device *rdev,
30907 if (rdev->pm.max_bandwidth.full > rdev->pm.sideport_bandwidth.full &&
30908 rdev->pm.sideport_bandwidth.full)
30909 rdev->pm.max_bandwidth = rdev->pm.sideport_bandwidth;
30910- read_delay_latency.full = dfixed_const(370 * 800 * 1000);
30911+ read_delay_latency.full = dfixed_const(800 * 1000);
30912 read_delay_latency.full = dfixed_div(read_delay_latency,
30913 rdev->pm.igp_sideport_mclk);
30914+ a.full = dfixed_const(370);
30915+ read_delay_latency.full = dfixed_mul(read_delay_latency, a);
30916 } else {
30917 if (rdev->pm.max_bandwidth.full > rdev->pm.k8_bandwidth.full &&
30918 rdev->pm.k8_bandwidth.full)
30919diff --git a/drivers/gpu/drm/ttm/ttm_page_alloc.c b/drivers/gpu/drm/ttm/ttm_page_alloc.c
30920index 727e93d..1565650 100644
30921--- a/drivers/gpu/drm/ttm/ttm_page_alloc.c
30922+++ b/drivers/gpu/drm/ttm/ttm_page_alloc.c
30923@@ -398,9 +398,9 @@ static int ttm_pool_get_num_unused_pages(void)
30924 static int ttm_pool_mm_shrink(struct shrinker *shrink,
30925 struct shrink_control *sc)
30926 {
30927- static atomic_t start_pool = ATOMIC_INIT(0);
30928+ static atomic_unchecked_t start_pool = ATOMIC_INIT(0);
30929 unsigned i;
30930- unsigned pool_offset = atomic_add_return(1, &start_pool);
30931+ unsigned pool_offset = atomic_add_return_unchecked(1, &start_pool);
30932 struct ttm_page_pool *pool;
30933 int shrink_pages = sc->nr_to_scan;
30934
30935diff --git a/drivers/gpu/drm/via/via_drv.h b/drivers/gpu/drm/via/via_drv.h
30936index 9cf87d9..2000b7d 100644
30937--- a/drivers/gpu/drm/via/via_drv.h
30938+++ b/drivers/gpu/drm/via/via_drv.h
30939@@ -51,7 +51,7 @@ typedef struct drm_via_ring_buffer {
30940 typedef uint32_t maskarray_t[5];
30941
30942 typedef struct drm_via_irq {
30943- atomic_t irq_received;
30944+ atomic_unchecked_t irq_received;
30945 uint32_t pending_mask;
30946 uint32_t enable_mask;
30947 wait_queue_head_t irq_queue;
30948@@ -75,7 +75,7 @@ typedef struct drm_via_private {
30949 struct timeval last_vblank;
30950 int last_vblank_valid;
30951 unsigned usec_per_vblank;
30952- atomic_t vbl_received;
30953+ atomic_unchecked_t vbl_received;
30954 drm_via_state_t hc_state;
30955 char pci_buf[VIA_PCI_BUF_SIZE];
30956 const uint32_t *fire_offsets[VIA_FIRE_BUF_SIZE];
30957diff --git a/drivers/gpu/drm/via/via_irq.c b/drivers/gpu/drm/via/via_irq.c
30958index d391f48..10c8ca3 100644
30959--- a/drivers/gpu/drm/via/via_irq.c
30960+++ b/drivers/gpu/drm/via/via_irq.c
30961@@ -102,7 +102,7 @@ u32 via_get_vblank_counter(struct drm_device *dev, int crtc)
30962 if (crtc != 0)
30963 return 0;
30964
30965- return atomic_read(&dev_priv->vbl_received);
30966+ return atomic_read_unchecked(&dev_priv->vbl_received);
30967 }
30968
30969 irqreturn_t via_driver_irq_handler(DRM_IRQ_ARGS)
30970@@ -117,8 +117,8 @@ irqreturn_t via_driver_irq_handler(DRM_IRQ_ARGS)
30971
30972 status = VIA_READ(VIA_REG_INTERRUPT);
30973 if (status & VIA_IRQ_VBLANK_PENDING) {
30974- atomic_inc(&dev_priv->vbl_received);
30975- if (!(atomic_read(&dev_priv->vbl_received) & 0x0F)) {
30976+ atomic_inc_unchecked(&dev_priv->vbl_received);
30977+ if (!(atomic_read_unchecked(&dev_priv->vbl_received) & 0x0F)) {
30978 do_gettimeofday(&cur_vblank);
30979 if (dev_priv->last_vblank_valid) {
30980 dev_priv->usec_per_vblank =
30981@@ -128,7 +128,7 @@ irqreturn_t via_driver_irq_handler(DRM_IRQ_ARGS)
30982 dev_priv->last_vblank = cur_vblank;
30983 dev_priv->last_vblank_valid = 1;
30984 }
30985- if (!(atomic_read(&dev_priv->vbl_received) & 0xFF)) {
30986+ if (!(atomic_read_unchecked(&dev_priv->vbl_received) & 0xFF)) {
30987 DRM_DEBUG("US per vblank is: %u\n",
30988 dev_priv->usec_per_vblank);
30989 }
30990@@ -138,7 +138,7 @@ irqreturn_t via_driver_irq_handler(DRM_IRQ_ARGS)
30991
30992 for (i = 0; i < dev_priv->num_irqs; ++i) {
30993 if (status & cur_irq->pending_mask) {
30994- atomic_inc(&cur_irq->irq_received);
30995+ atomic_inc_unchecked(&cur_irq->irq_received);
30996 DRM_WAKEUP(&cur_irq->irq_queue);
30997 handled = 1;
30998 if (dev_priv->irq_map[drm_via_irq_dma0_td] == i)
30999@@ -243,11 +243,11 @@ via_driver_irq_wait(struct drm_device *dev, unsigned int irq, int force_sequence
31000 DRM_WAIT_ON(ret, cur_irq->irq_queue, 3 * DRM_HZ,
31001 ((VIA_READ(masks[irq][2]) & masks[irq][3]) ==
31002 masks[irq][4]));
31003- cur_irq_sequence = atomic_read(&cur_irq->irq_received);
31004+ cur_irq_sequence = atomic_read_unchecked(&cur_irq->irq_received);
31005 } else {
31006 DRM_WAIT_ON(ret, cur_irq->irq_queue, 3 * DRM_HZ,
31007 (((cur_irq_sequence =
31008- atomic_read(&cur_irq->irq_received)) -
31009+ atomic_read_unchecked(&cur_irq->irq_received)) -
31010 *sequence) <= (1 << 23)));
31011 }
31012 *sequence = cur_irq_sequence;
31013@@ -285,7 +285,7 @@ void via_driver_irq_preinstall(struct drm_device *dev)
31014 }
31015
31016 for (i = 0; i < dev_priv->num_irqs; ++i) {
31017- atomic_set(&cur_irq->irq_received, 0);
31018+ atomic_set_unchecked(&cur_irq->irq_received, 0);
31019 cur_irq->enable_mask = dev_priv->irq_masks[i][0];
31020 cur_irq->pending_mask = dev_priv->irq_masks[i][1];
31021 DRM_INIT_WAITQUEUE(&cur_irq->irq_queue);
31022@@ -367,7 +367,7 @@ int via_wait_irq(struct drm_device *dev, void *data, struct drm_file *file_priv)
31023 switch (irqwait->request.type & ~VIA_IRQ_FLAGS_MASK) {
31024 case VIA_IRQ_RELATIVE:
31025 irqwait->request.sequence +=
31026- atomic_read(&cur_irq->irq_received);
31027+ atomic_read_unchecked(&cur_irq->irq_received);
31028 irqwait->request.type &= ~_DRM_VBLANK_RELATIVE;
31029 case VIA_IRQ_ABSOLUTE:
31030 break;
31031diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_drv.h b/drivers/gpu/drm/vmwgfx/vmwgfx_drv.h
31032index dc27970..f18b008 100644
31033--- a/drivers/gpu/drm/vmwgfx/vmwgfx_drv.h
31034+++ b/drivers/gpu/drm/vmwgfx/vmwgfx_drv.h
31035@@ -260,7 +260,7 @@ struct vmw_private {
31036 * Fencing and IRQs.
31037 */
31038
31039- atomic_t marker_seq;
31040+ atomic_unchecked_t marker_seq;
31041 wait_queue_head_t fence_queue;
31042 wait_queue_head_t fifo_queue;
31043 int fence_queue_waiters; /* Protected by hw_mutex */
31044diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_fifo.c b/drivers/gpu/drm/vmwgfx/vmwgfx_fifo.c
31045index a0c2f12..68ae6cb 100644
31046--- a/drivers/gpu/drm/vmwgfx/vmwgfx_fifo.c
31047+++ b/drivers/gpu/drm/vmwgfx/vmwgfx_fifo.c
31048@@ -137,7 +137,7 @@ int vmw_fifo_init(struct vmw_private *dev_priv, struct vmw_fifo_state *fifo)
31049 (unsigned int) min,
31050 (unsigned int) fifo->capabilities);
31051
31052- atomic_set(&dev_priv->marker_seq, dev_priv->last_read_seqno);
31053+ atomic_set_unchecked(&dev_priv->marker_seq, dev_priv->last_read_seqno);
31054 iowrite32(dev_priv->last_read_seqno, fifo_mem + SVGA_FIFO_FENCE);
31055 vmw_marker_queue_init(&fifo->marker_queue);
31056 return vmw_fifo_send_fence(dev_priv, &dummy);
31057@@ -355,7 +355,7 @@ void *vmw_fifo_reserve(struct vmw_private *dev_priv, uint32_t bytes)
31058 if (reserveable)
31059 iowrite32(bytes, fifo_mem +
31060 SVGA_FIFO_RESERVED);
31061- return fifo_mem + (next_cmd >> 2);
31062+ return (__le32 __force_kernel *)fifo_mem + (next_cmd >> 2);
31063 } else {
31064 need_bounce = true;
31065 }
31066@@ -475,7 +475,7 @@ int vmw_fifo_send_fence(struct vmw_private *dev_priv, uint32_t *seqno)
31067
31068 fm = vmw_fifo_reserve(dev_priv, bytes);
31069 if (unlikely(fm == NULL)) {
31070- *seqno = atomic_read(&dev_priv->marker_seq);
31071+ *seqno = atomic_read_unchecked(&dev_priv->marker_seq);
31072 ret = -ENOMEM;
31073 (void)vmw_fallback_wait(dev_priv, false, true, *seqno,
31074 false, 3*HZ);
31075@@ -483,7 +483,7 @@ int vmw_fifo_send_fence(struct vmw_private *dev_priv, uint32_t *seqno)
31076 }
31077
31078 do {
31079- *seqno = atomic_add_return(1, &dev_priv->marker_seq);
31080+ *seqno = atomic_add_return_unchecked(1, &dev_priv->marker_seq);
31081 } while (*seqno == 0);
31082
31083 if (!(fifo_state->capabilities & SVGA_FIFO_CAP_FENCE)) {
31084diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_irq.c b/drivers/gpu/drm/vmwgfx/vmwgfx_irq.c
31085index cabc95f..14b3d77 100644
31086--- a/drivers/gpu/drm/vmwgfx/vmwgfx_irq.c
31087+++ b/drivers/gpu/drm/vmwgfx/vmwgfx_irq.c
31088@@ -107,7 +107,7 @@ bool vmw_seqno_passed(struct vmw_private *dev_priv,
31089 * emitted. Then the fence is stale and signaled.
31090 */
31091
31092- ret = ((atomic_read(&dev_priv->marker_seq) - seqno)
31093+ ret = ((atomic_read_unchecked(&dev_priv->marker_seq) - seqno)
31094 > VMW_FENCE_WRAP);
31095
31096 return ret;
31097@@ -138,7 +138,7 @@ int vmw_fallback_wait(struct vmw_private *dev_priv,
31098
31099 if (fifo_idle)
31100 down_read(&fifo_state->rwsem);
31101- signal_seq = atomic_read(&dev_priv->marker_seq);
31102+ signal_seq = atomic_read_unchecked(&dev_priv->marker_seq);
31103 ret = 0;
31104
31105 for (;;) {
31106diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_marker.c b/drivers/gpu/drm/vmwgfx/vmwgfx_marker.c
31107index 8a8725c..afed796 100644
31108--- a/drivers/gpu/drm/vmwgfx/vmwgfx_marker.c
31109+++ b/drivers/gpu/drm/vmwgfx/vmwgfx_marker.c
31110@@ -151,7 +151,7 @@ int vmw_wait_lag(struct vmw_private *dev_priv,
31111 while (!vmw_lag_lt(queue, us)) {
31112 spin_lock(&queue->lock);
31113 if (list_empty(&queue->head))
31114- seqno = atomic_read(&dev_priv->marker_seq);
31115+ seqno = atomic_read_unchecked(&dev_priv->marker_seq);
31116 else {
31117 marker = list_first_entry(&queue->head,
31118 struct vmw_marker, head);
31119diff --git a/drivers/hid/hid-core.c b/drivers/hid/hid-core.c
31120index bb656d8..4169fca 100644
31121--- a/drivers/hid/hid-core.c
31122+++ b/drivers/hid/hid-core.c
31123@@ -2012,7 +2012,7 @@ static bool hid_ignore(struct hid_device *hdev)
31124
31125 int hid_add_device(struct hid_device *hdev)
31126 {
31127- static atomic_t id = ATOMIC_INIT(0);
31128+ static atomic_unchecked_t id = ATOMIC_INIT(0);
31129 int ret;
31130
31131 if (WARN_ON(hdev->status & HID_STAT_ADDED))
31132@@ -2027,7 +2027,7 @@ int hid_add_device(struct hid_device *hdev)
31133 /* XXX hack, any other cleaner solution after the driver core
31134 * is converted to allow more than 20 bytes as the device name? */
31135 dev_set_name(&hdev->dev, "%04X:%04X:%04X.%04X", hdev->bus,
31136- hdev->vendor, hdev->product, atomic_inc_return(&id));
31137+ hdev->vendor, hdev->product, atomic_inc_return_unchecked(&id));
31138
31139 hid_debug_register(hdev, dev_name(&hdev->dev));
31140 ret = device_add(&hdev->dev);
31141diff --git a/drivers/hid/usbhid/hiddev.c b/drivers/hid/usbhid/hiddev.c
31142index 4ef02b2..8a96831 100644
31143--- a/drivers/hid/usbhid/hiddev.c
31144+++ b/drivers/hid/usbhid/hiddev.c
31145@@ -624,7 +624,7 @@ static long hiddev_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
31146 break;
31147
31148 case HIDIOCAPPLICATION:
31149- if (arg < 0 || arg >= hid->maxapplication)
31150+ if (arg >= hid->maxapplication)
31151 break;
31152
31153 for (i = 0; i < hid->maxcollection; i++)
31154diff --git a/drivers/hv/channel.c b/drivers/hv/channel.c
31155index 4065374..10ed7dc 100644
31156--- a/drivers/hv/channel.c
31157+++ b/drivers/hv/channel.c
31158@@ -400,8 +400,8 @@ int vmbus_establish_gpadl(struct vmbus_channel *channel, void *kbuffer,
31159 int ret = 0;
31160 int t;
31161
31162- next_gpadl_handle = atomic_read(&vmbus_connection.next_gpadl_handle);
31163- atomic_inc(&vmbus_connection.next_gpadl_handle);
31164+ next_gpadl_handle = atomic_read_unchecked(&vmbus_connection.next_gpadl_handle);
31165+ atomic_inc_unchecked(&vmbus_connection.next_gpadl_handle);
31166
31167 ret = create_gpadl_header(kbuffer, size, &msginfo, &msgcount);
31168 if (ret)
31169diff --git a/drivers/hv/hv.c b/drivers/hv/hv.c
31170index 0fb100e..baf87e5 100644
31171--- a/drivers/hv/hv.c
31172+++ b/drivers/hv/hv.c
31173@@ -132,7 +132,7 @@ static u64 do_hypercall(u64 control, void *input, void *output)
31174 u64 output_address = (output) ? virt_to_phys(output) : 0;
31175 u32 output_address_hi = output_address >> 32;
31176 u32 output_address_lo = output_address & 0xFFFFFFFF;
31177- void *hypercall_page = hv_context.hypercall_page;
31178+ void *hypercall_page = ktva_ktla(hv_context.hypercall_page);
31179
31180 __asm__ __volatile__ ("call *%8" : "=d"(hv_status_hi),
31181 "=a"(hv_status_lo) : "d" (control_hi),
31182diff --git a/drivers/hv/hyperv_vmbus.h b/drivers/hv/hyperv_vmbus.h
31183index 0aee112..b72d21f 100644
31184--- a/drivers/hv/hyperv_vmbus.h
31185+++ b/drivers/hv/hyperv_vmbus.h
31186@@ -556,7 +556,7 @@ enum vmbus_connect_state {
31187 struct vmbus_connection {
31188 enum vmbus_connect_state conn_state;
31189
31190- atomic_t next_gpadl_handle;
31191+ atomic_unchecked_t next_gpadl_handle;
31192
31193 /*
31194 * Represents channel interrupts. Each bit position represents a
31195diff --git a/drivers/hv/vmbus_drv.c b/drivers/hv/vmbus_drv.c
31196index d2d0a2a..90b8f4d 100644
31197--- a/drivers/hv/vmbus_drv.c
31198+++ b/drivers/hv/vmbus_drv.c
31199@@ -663,10 +663,10 @@ int vmbus_device_register(struct hv_device *child_device_obj)
31200 {
31201 int ret = 0;
31202
31203- static atomic_t device_num = ATOMIC_INIT(0);
31204+ static atomic_unchecked_t device_num = ATOMIC_INIT(0);
31205
31206 dev_set_name(&child_device_obj->device, "vmbus_0_%d",
31207- atomic_inc_return(&device_num));
31208+ atomic_inc_return_unchecked(&device_num));
31209
31210 child_device_obj->device.bus = &hv_bus;
31211 child_device_obj->device.parent = &hv_acpi_dev->dev;
31212diff --git a/drivers/hwmon/acpi_power_meter.c b/drivers/hwmon/acpi_power_meter.c
31213index 66f6729..2d6de0a 100644
31214--- a/drivers/hwmon/acpi_power_meter.c
31215+++ b/drivers/hwmon/acpi_power_meter.c
31216@@ -316,8 +316,6 @@ static ssize_t set_trip(struct device *dev, struct device_attribute *devattr,
31217 return res;
31218
31219 temp /= 1000;
31220- if (temp < 0)
31221- return -EINVAL;
31222
31223 mutex_lock(&resource->lock);
31224 resource->trip[attr->index - 7] = temp;
31225diff --git a/drivers/hwmon/sht15.c b/drivers/hwmon/sht15.c
31226index 5357925..6cf0418 100644
31227--- a/drivers/hwmon/sht15.c
31228+++ b/drivers/hwmon/sht15.c
31229@@ -166,7 +166,7 @@ struct sht15_data {
31230 int supply_uV;
31231 bool supply_uV_valid;
31232 struct work_struct update_supply_work;
31233- atomic_t interrupt_handled;
31234+ atomic_unchecked_t interrupt_handled;
31235 };
31236
31237 /**
31238@@ -509,13 +509,13 @@ static int sht15_measurement(struct sht15_data *data,
31239 return ret;
31240
31241 gpio_direction_input(data->pdata->gpio_data);
31242- atomic_set(&data->interrupt_handled, 0);
31243+ atomic_set_unchecked(&data->interrupt_handled, 0);
31244
31245 enable_irq(gpio_to_irq(data->pdata->gpio_data));
31246 if (gpio_get_value(data->pdata->gpio_data) == 0) {
31247 disable_irq_nosync(gpio_to_irq(data->pdata->gpio_data));
31248 /* Only relevant if the interrupt hasn't occurred. */
31249- if (!atomic_read(&data->interrupt_handled))
31250+ if (!atomic_read_unchecked(&data->interrupt_handled))
31251 schedule_work(&data->read_work);
31252 }
31253 ret = wait_event_timeout(data->wait_queue,
31254@@ -782,7 +782,7 @@ static irqreturn_t sht15_interrupt_fired(int irq, void *d)
31255
31256 /* First disable the interrupt */
31257 disable_irq_nosync(irq);
31258- atomic_inc(&data->interrupt_handled);
31259+ atomic_inc_unchecked(&data->interrupt_handled);
31260 /* Then schedule a reading work struct */
31261 if (data->state != SHT15_READING_NOTHING)
31262 schedule_work(&data->read_work);
31263@@ -804,11 +804,11 @@ static void sht15_bh_read_data(struct work_struct *work_s)
31264 * If not, then start the interrupt again - care here as could
31265 * have gone low in meantime so verify it hasn't!
31266 */
31267- atomic_set(&data->interrupt_handled, 0);
31268+ atomic_set_unchecked(&data->interrupt_handled, 0);
31269 enable_irq(gpio_to_irq(data->pdata->gpio_data));
31270 /* If still not occurred or another handler has been scheduled */
31271 if (gpio_get_value(data->pdata->gpio_data)
31272- || atomic_read(&data->interrupt_handled))
31273+ || atomic_read_unchecked(&data->interrupt_handled))
31274 return;
31275 }
31276
31277diff --git a/drivers/i2c/busses/i2c-amd756-s4882.c b/drivers/i2c/busses/i2c-amd756-s4882.c
31278index 378fcb5..5e91fa8 100644
31279--- a/drivers/i2c/busses/i2c-amd756-s4882.c
31280+++ b/drivers/i2c/busses/i2c-amd756-s4882.c
31281@@ -43,7 +43,7 @@
31282 extern struct i2c_adapter amd756_smbus;
31283
31284 static struct i2c_adapter *s4882_adapter;
31285-static struct i2c_algorithm *s4882_algo;
31286+static i2c_algorithm_no_const *s4882_algo;
31287
31288 /* Wrapper access functions for multiplexed SMBus */
31289 static DEFINE_MUTEX(amd756_lock);
31290diff --git a/drivers/i2c/busses/i2c-nforce2-s4985.c b/drivers/i2c/busses/i2c-nforce2-s4985.c
31291index 29015eb..af2d8e9 100644
31292--- a/drivers/i2c/busses/i2c-nforce2-s4985.c
31293+++ b/drivers/i2c/busses/i2c-nforce2-s4985.c
31294@@ -41,7 +41,7 @@
31295 extern struct i2c_adapter *nforce2_smbus;
31296
31297 static struct i2c_adapter *s4985_adapter;
31298-static struct i2c_algorithm *s4985_algo;
31299+static i2c_algorithm_no_const *s4985_algo;
31300
31301 /* Wrapper access functions for multiplexed SMBus */
31302 static DEFINE_MUTEX(nforce2_lock);
31303diff --git a/drivers/i2c/i2c-mux.c b/drivers/i2c/i2c-mux.c
31304index d7a4833..7fae376 100644
31305--- a/drivers/i2c/i2c-mux.c
31306+++ b/drivers/i2c/i2c-mux.c
31307@@ -28,7 +28,7 @@
31308 /* multiplexer per channel data */
31309 struct i2c_mux_priv {
31310 struct i2c_adapter adap;
31311- struct i2c_algorithm algo;
31312+ i2c_algorithm_no_const algo;
31313
31314 struct i2c_adapter *parent;
31315 void *mux_dev; /* the mux chip/device */
31316diff --git a/drivers/ide/aec62xx.c b/drivers/ide/aec62xx.c
31317index 57d00ca..0145194 100644
31318--- a/drivers/ide/aec62xx.c
31319+++ b/drivers/ide/aec62xx.c
31320@@ -181,7 +181,7 @@ static const struct ide_port_ops atp86x_port_ops = {
31321 .cable_detect = atp86x_cable_detect,
31322 };
31323
31324-static const struct ide_port_info aec62xx_chipsets[] __devinitdata = {
31325+static const struct ide_port_info aec62xx_chipsets[] __devinitconst = {
31326 { /* 0: AEC6210 */
31327 .name = DRV_NAME,
31328 .init_chipset = init_chipset_aec62xx,
31329diff --git a/drivers/ide/alim15x3.c b/drivers/ide/alim15x3.c
31330index 2c8016a..911a27c 100644
31331--- a/drivers/ide/alim15x3.c
31332+++ b/drivers/ide/alim15x3.c
31333@@ -512,7 +512,7 @@ static const struct ide_dma_ops ali_dma_ops = {
31334 .dma_sff_read_status = ide_dma_sff_read_status,
31335 };
31336
31337-static const struct ide_port_info ali15x3_chipset __devinitdata = {
31338+static const struct ide_port_info ali15x3_chipset __devinitconst = {
31339 .name = DRV_NAME,
31340 .init_chipset = init_chipset_ali15x3,
31341 .init_hwif = init_hwif_ali15x3,
31342diff --git a/drivers/ide/amd74xx.c b/drivers/ide/amd74xx.c
31343index 3747b25..56fc995 100644
31344--- a/drivers/ide/amd74xx.c
31345+++ b/drivers/ide/amd74xx.c
31346@@ -223,7 +223,7 @@ static const struct ide_port_ops amd_port_ops = {
31347 .udma_mask = udma, \
31348 }
31349
31350-static const struct ide_port_info amd74xx_chipsets[] __devinitdata = {
31351+static const struct ide_port_info amd74xx_chipsets[] __devinitconst = {
31352 /* 0: AMD7401 */ DECLARE_AMD_DEV(0x00, ATA_UDMA2),
31353 /* 1: AMD7409 */ DECLARE_AMD_DEV(ATA_SWDMA2, ATA_UDMA4),
31354 /* 2: AMD7411/7441 */ DECLARE_AMD_DEV(ATA_SWDMA2, ATA_UDMA5),
31355diff --git a/drivers/ide/atiixp.c b/drivers/ide/atiixp.c
31356index 15f0ead..cb43480 100644
31357--- a/drivers/ide/atiixp.c
31358+++ b/drivers/ide/atiixp.c
31359@@ -139,7 +139,7 @@ static const struct ide_port_ops atiixp_port_ops = {
31360 .cable_detect = atiixp_cable_detect,
31361 };
31362
31363-static const struct ide_port_info atiixp_pci_info[] __devinitdata = {
31364+static const struct ide_port_info atiixp_pci_info[] __devinitconst = {
31365 { /* 0: IXP200/300/400/700 */
31366 .name = DRV_NAME,
31367 .enablebits = {{0x48,0x01,0x00}, {0x48,0x08,0x00}},
31368diff --git a/drivers/ide/cmd64x.c b/drivers/ide/cmd64x.c
31369index 5f80312..d1fc438 100644
31370--- a/drivers/ide/cmd64x.c
31371+++ b/drivers/ide/cmd64x.c
31372@@ -327,7 +327,7 @@ static const struct ide_dma_ops cmd646_rev1_dma_ops = {
31373 .dma_sff_read_status = ide_dma_sff_read_status,
31374 };
31375
31376-static const struct ide_port_info cmd64x_chipsets[] __devinitdata = {
31377+static const struct ide_port_info cmd64x_chipsets[] __devinitconst = {
31378 { /* 0: CMD643 */
31379 .name = DRV_NAME,
31380 .init_chipset = init_chipset_cmd64x,
31381diff --git a/drivers/ide/cs5520.c b/drivers/ide/cs5520.c
31382index 2c1e5f7..1444762 100644
31383--- a/drivers/ide/cs5520.c
31384+++ b/drivers/ide/cs5520.c
31385@@ -94,7 +94,7 @@ static const struct ide_port_ops cs5520_port_ops = {
31386 .set_dma_mode = cs5520_set_dma_mode,
31387 };
31388
31389-static const struct ide_port_info cyrix_chipset __devinitdata = {
31390+static const struct ide_port_info cyrix_chipset __devinitconst = {
31391 .name = DRV_NAME,
31392 .enablebits = { { 0x60, 0x01, 0x01 }, { 0x60, 0x02, 0x02 } },
31393 .port_ops = &cs5520_port_ops,
31394diff --git a/drivers/ide/cs5530.c b/drivers/ide/cs5530.c
31395index 4dc4eb9..49b40ad 100644
31396--- a/drivers/ide/cs5530.c
31397+++ b/drivers/ide/cs5530.c
31398@@ -245,7 +245,7 @@ static const struct ide_port_ops cs5530_port_ops = {
31399 .udma_filter = cs5530_udma_filter,
31400 };
31401
31402-static const struct ide_port_info cs5530_chipset __devinitdata = {
31403+static const struct ide_port_info cs5530_chipset __devinitconst = {
31404 .name = DRV_NAME,
31405 .init_chipset = init_chipset_cs5530,
31406 .init_hwif = init_hwif_cs5530,
31407diff --git a/drivers/ide/cs5535.c b/drivers/ide/cs5535.c
31408index 5059faf..18d4c85 100644
31409--- a/drivers/ide/cs5535.c
31410+++ b/drivers/ide/cs5535.c
31411@@ -170,7 +170,7 @@ static const struct ide_port_ops cs5535_port_ops = {
31412 .cable_detect = cs5535_cable_detect,
31413 };
31414
31415-static const struct ide_port_info cs5535_chipset __devinitdata = {
31416+static const struct ide_port_info cs5535_chipset __devinitconst = {
31417 .name = DRV_NAME,
31418 .port_ops = &cs5535_port_ops,
31419 .host_flags = IDE_HFLAG_SINGLE | IDE_HFLAG_POST_SET_MODE,
31420diff --git a/drivers/ide/cy82c693.c b/drivers/ide/cy82c693.c
31421index 847553f..3ffb49d 100644
31422--- a/drivers/ide/cy82c693.c
31423+++ b/drivers/ide/cy82c693.c
31424@@ -163,7 +163,7 @@ static const struct ide_port_ops cy82c693_port_ops = {
31425 .set_dma_mode = cy82c693_set_dma_mode,
31426 };
31427
31428-static const struct ide_port_info cy82c693_chipset __devinitdata = {
31429+static const struct ide_port_info cy82c693_chipset __devinitconst = {
31430 .name = DRV_NAME,
31431 .init_iops = init_iops_cy82c693,
31432 .port_ops = &cy82c693_port_ops,
31433diff --git a/drivers/ide/hpt366.c b/drivers/ide/hpt366.c
31434index 58c51cd..4aec3b8 100644
31435--- a/drivers/ide/hpt366.c
31436+++ b/drivers/ide/hpt366.c
31437@@ -443,7 +443,7 @@ static struct hpt_timings hpt37x_timings = {
31438 }
31439 };
31440
31441-static const struct hpt_info hpt36x __devinitdata = {
31442+static const struct hpt_info hpt36x __devinitconst = {
31443 .chip_name = "HPT36x",
31444 .chip_type = HPT36x,
31445 .udma_mask = HPT366_ALLOW_ATA66_3 ? (HPT366_ALLOW_ATA66_4 ? ATA_UDMA4 : ATA_UDMA3) : ATA_UDMA2,
31446@@ -451,7 +451,7 @@ static const struct hpt_info hpt36x __devinitdata = {
31447 .timings = &hpt36x_timings
31448 };
31449
31450-static const struct hpt_info hpt370 __devinitdata = {
31451+static const struct hpt_info hpt370 __devinitconst = {
31452 .chip_name = "HPT370",
31453 .chip_type = HPT370,
31454 .udma_mask = HPT370_ALLOW_ATA100_5 ? ATA_UDMA5 : ATA_UDMA4,
31455@@ -459,7 +459,7 @@ static const struct hpt_info hpt370 __devinitdata = {
31456 .timings = &hpt37x_timings
31457 };
31458
31459-static const struct hpt_info hpt370a __devinitdata = {
31460+static const struct hpt_info hpt370a __devinitconst = {
31461 .chip_name = "HPT370A",
31462 .chip_type = HPT370A,
31463 .udma_mask = HPT370_ALLOW_ATA100_5 ? ATA_UDMA5 : ATA_UDMA4,
31464@@ -467,7 +467,7 @@ static const struct hpt_info hpt370a __devinitdata = {
31465 .timings = &hpt37x_timings
31466 };
31467
31468-static const struct hpt_info hpt374 __devinitdata = {
31469+static const struct hpt_info hpt374 __devinitconst = {
31470 .chip_name = "HPT374",
31471 .chip_type = HPT374,
31472 .udma_mask = ATA_UDMA5,
31473@@ -475,7 +475,7 @@ static const struct hpt_info hpt374 __devinitdata = {
31474 .timings = &hpt37x_timings
31475 };
31476
31477-static const struct hpt_info hpt372 __devinitdata = {
31478+static const struct hpt_info hpt372 __devinitconst = {
31479 .chip_name = "HPT372",
31480 .chip_type = HPT372,
31481 .udma_mask = HPT372_ALLOW_ATA133_6 ? ATA_UDMA6 : ATA_UDMA5,
31482@@ -483,7 +483,7 @@ static const struct hpt_info hpt372 __devinitdata = {
31483 .timings = &hpt37x_timings
31484 };
31485
31486-static const struct hpt_info hpt372a __devinitdata = {
31487+static const struct hpt_info hpt372a __devinitconst = {
31488 .chip_name = "HPT372A",
31489 .chip_type = HPT372A,
31490 .udma_mask = HPT372_ALLOW_ATA133_6 ? ATA_UDMA6 : ATA_UDMA5,
31491@@ -491,7 +491,7 @@ static const struct hpt_info hpt372a __devinitdata = {
31492 .timings = &hpt37x_timings
31493 };
31494
31495-static const struct hpt_info hpt302 __devinitdata = {
31496+static const struct hpt_info hpt302 __devinitconst = {
31497 .chip_name = "HPT302",
31498 .chip_type = HPT302,
31499 .udma_mask = HPT302_ALLOW_ATA133_6 ? ATA_UDMA6 : ATA_UDMA5,
31500@@ -499,7 +499,7 @@ static const struct hpt_info hpt302 __devinitdata = {
31501 .timings = &hpt37x_timings
31502 };
31503
31504-static const struct hpt_info hpt371 __devinitdata = {
31505+static const struct hpt_info hpt371 __devinitconst = {
31506 .chip_name = "HPT371",
31507 .chip_type = HPT371,
31508 .udma_mask = HPT371_ALLOW_ATA133_6 ? ATA_UDMA6 : ATA_UDMA5,
31509@@ -507,7 +507,7 @@ static const struct hpt_info hpt371 __devinitdata = {
31510 .timings = &hpt37x_timings
31511 };
31512
31513-static const struct hpt_info hpt372n __devinitdata = {
31514+static const struct hpt_info hpt372n __devinitconst = {
31515 .chip_name = "HPT372N",
31516 .chip_type = HPT372N,
31517 .udma_mask = HPT372_ALLOW_ATA133_6 ? ATA_UDMA6 : ATA_UDMA5,
31518@@ -515,7 +515,7 @@ static const struct hpt_info hpt372n __devinitdata = {
31519 .timings = &hpt37x_timings
31520 };
31521
31522-static const struct hpt_info hpt302n __devinitdata = {
31523+static const struct hpt_info hpt302n __devinitconst = {
31524 .chip_name = "HPT302N",
31525 .chip_type = HPT302N,
31526 .udma_mask = HPT302_ALLOW_ATA133_6 ? ATA_UDMA6 : ATA_UDMA5,
31527@@ -523,7 +523,7 @@ static const struct hpt_info hpt302n __devinitdata = {
31528 .timings = &hpt37x_timings
31529 };
31530
31531-static const struct hpt_info hpt371n __devinitdata = {
31532+static const struct hpt_info hpt371n __devinitconst = {
31533 .chip_name = "HPT371N",
31534 .chip_type = HPT371N,
31535 .udma_mask = HPT371_ALLOW_ATA133_6 ? ATA_UDMA6 : ATA_UDMA5,
31536@@ -1361,7 +1361,7 @@ static const struct ide_dma_ops hpt36x_dma_ops = {
31537 .dma_sff_read_status = ide_dma_sff_read_status,
31538 };
31539
31540-static const struct ide_port_info hpt366_chipsets[] __devinitdata = {
31541+static const struct ide_port_info hpt366_chipsets[] __devinitconst = {
31542 { /* 0: HPT36x */
31543 .name = DRV_NAME,
31544 .init_chipset = init_chipset_hpt366,
31545diff --git a/drivers/ide/ide-cd.c b/drivers/ide/ide-cd.c
31546index 8126824..55a2798 100644
31547--- a/drivers/ide/ide-cd.c
31548+++ b/drivers/ide/ide-cd.c
31549@@ -768,7 +768,7 @@ static void cdrom_do_block_pc(ide_drive_t *drive, struct request *rq)
31550 alignment = queue_dma_alignment(q) | q->dma_pad_mask;
31551 if ((unsigned long)buf & alignment
31552 || blk_rq_bytes(rq) & q->dma_pad_mask
31553- || object_is_on_stack(buf))
31554+ || object_starts_on_stack(buf))
31555 drive->dma = 0;
31556 }
31557 }
31558diff --git a/drivers/ide/ide-pci-generic.c b/drivers/ide/ide-pci-generic.c
31559index a743e68..1cfd674 100644
31560--- a/drivers/ide/ide-pci-generic.c
31561+++ b/drivers/ide/ide-pci-generic.c
31562@@ -53,7 +53,7 @@ static const struct ide_port_ops netcell_port_ops = {
31563 .udma_mask = ATA_UDMA6, \
31564 }
31565
31566-static const struct ide_port_info generic_chipsets[] __devinitdata = {
31567+static const struct ide_port_info generic_chipsets[] __devinitconst = {
31568 /* 0: Unknown */
31569 DECLARE_GENERIC_PCI_DEV(0),
31570
31571diff --git a/drivers/ide/it8172.c b/drivers/ide/it8172.c
31572index 560e66d..d5dd180 100644
31573--- a/drivers/ide/it8172.c
31574+++ b/drivers/ide/it8172.c
31575@@ -115,7 +115,7 @@ static const struct ide_port_ops it8172_port_ops = {
31576 .set_dma_mode = it8172_set_dma_mode,
31577 };
31578
31579-static const struct ide_port_info it8172_port_info __devinitdata = {
31580+static const struct ide_port_info it8172_port_info __devinitconst = {
31581 .name = DRV_NAME,
31582 .port_ops = &it8172_port_ops,
31583 .enablebits = { {0x41, 0x80, 0x80}, {0x00, 0x00, 0x00} },
31584diff --git a/drivers/ide/it8213.c b/drivers/ide/it8213.c
31585index 46816ba..1847aeb 100644
31586--- a/drivers/ide/it8213.c
31587+++ b/drivers/ide/it8213.c
31588@@ -156,7 +156,7 @@ static const struct ide_port_ops it8213_port_ops = {
31589 .cable_detect = it8213_cable_detect,
31590 };
31591
31592-static const struct ide_port_info it8213_chipset __devinitdata = {
31593+static const struct ide_port_info it8213_chipset __devinitconst = {
31594 .name = DRV_NAME,
31595 .enablebits = { {0x41, 0x80, 0x80} },
31596 .port_ops = &it8213_port_ops,
31597diff --git a/drivers/ide/it821x.c b/drivers/ide/it821x.c
31598index 2e3169f..c5611db 100644
31599--- a/drivers/ide/it821x.c
31600+++ b/drivers/ide/it821x.c
31601@@ -630,7 +630,7 @@ static const struct ide_port_ops it821x_port_ops = {
31602 .cable_detect = it821x_cable_detect,
31603 };
31604
31605-static const struct ide_port_info it821x_chipset __devinitdata = {
31606+static const struct ide_port_info it821x_chipset __devinitconst = {
31607 .name = DRV_NAME,
31608 .init_chipset = init_chipset_it821x,
31609 .init_hwif = init_hwif_it821x,
31610diff --git a/drivers/ide/jmicron.c b/drivers/ide/jmicron.c
31611index 74c2c4a..efddd7d 100644
31612--- a/drivers/ide/jmicron.c
31613+++ b/drivers/ide/jmicron.c
31614@@ -102,7 +102,7 @@ static const struct ide_port_ops jmicron_port_ops = {
31615 .cable_detect = jmicron_cable_detect,
31616 };
31617
31618-static const struct ide_port_info jmicron_chipset __devinitdata = {
31619+static const struct ide_port_info jmicron_chipset __devinitconst = {
31620 .name = DRV_NAME,
31621 .enablebits = { { 0x40, 0x01, 0x01 }, { 0x40, 0x10, 0x10 } },
31622 .port_ops = &jmicron_port_ops,
31623diff --git a/drivers/ide/ns87415.c b/drivers/ide/ns87415.c
31624index 95327a2..73f78d8 100644
31625--- a/drivers/ide/ns87415.c
31626+++ b/drivers/ide/ns87415.c
31627@@ -293,7 +293,7 @@ static const struct ide_dma_ops ns87415_dma_ops = {
31628 .dma_sff_read_status = superio_dma_sff_read_status,
31629 };
31630
31631-static const struct ide_port_info ns87415_chipset __devinitdata = {
31632+static const struct ide_port_info ns87415_chipset __devinitconst = {
31633 .name = DRV_NAME,
31634 .init_hwif = init_hwif_ns87415,
31635 .tp_ops = &ns87415_tp_ops,
31636diff --git a/drivers/ide/opti621.c b/drivers/ide/opti621.c
31637index 1a53a4c..39edc66 100644
31638--- a/drivers/ide/opti621.c
31639+++ b/drivers/ide/opti621.c
31640@@ -131,7 +131,7 @@ static const struct ide_port_ops opti621_port_ops = {
31641 .set_pio_mode = opti621_set_pio_mode,
31642 };
31643
31644-static const struct ide_port_info opti621_chipset __devinitdata = {
31645+static const struct ide_port_info opti621_chipset __devinitconst = {
31646 .name = DRV_NAME,
31647 .enablebits = { {0x45, 0x80, 0x00}, {0x40, 0x08, 0x00} },
31648 .port_ops = &opti621_port_ops,
31649diff --git a/drivers/ide/pdc202xx_new.c b/drivers/ide/pdc202xx_new.c
31650index 9546fe2..2e5ceb6 100644
31651--- a/drivers/ide/pdc202xx_new.c
31652+++ b/drivers/ide/pdc202xx_new.c
31653@@ -465,7 +465,7 @@ static const struct ide_port_ops pdcnew_port_ops = {
31654 .udma_mask = udma, \
31655 }
31656
31657-static const struct ide_port_info pdcnew_chipsets[] __devinitdata = {
31658+static const struct ide_port_info pdcnew_chipsets[] __devinitconst = {
31659 /* 0: PDC202{68,70} */ DECLARE_PDCNEW_DEV(ATA_UDMA5),
31660 /* 1: PDC202{69,71,75,76,77} */ DECLARE_PDCNEW_DEV(ATA_UDMA6),
31661 };
31662diff --git a/drivers/ide/pdc202xx_old.c b/drivers/ide/pdc202xx_old.c
31663index 3a35ec6..5634510 100644
31664--- a/drivers/ide/pdc202xx_old.c
31665+++ b/drivers/ide/pdc202xx_old.c
31666@@ -270,7 +270,7 @@ static const struct ide_dma_ops pdc2026x_dma_ops = {
31667 .max_sectors = sectors, \
31668 }
31669
31670-static const struct ide_port_info pdc202xx_chipsets[] __devinitdata = {
31671+static const struct ide_port_info pdc202xx_chipsets[] __devinitconst = {
31672 { /* 0: PDC20246 */
31673 .name = DRV_NAME,
31674 .init_chipset = init_chipset_pdc202xx,
31675diff --git a/drivers/ide/piix.c b/drivers/ide/piix.c
31676index 1892e81..fe0fd60 100644
31677--- a/drivers/ide/piix.c
31678+++ b/drivers/ide/piix.c
31679@@ -344,7 +344,7 @@ static const struct ide_port_ops ich_port_ops = {
31680 .udma_mask = udma, \
31681 }
31682
31683-static const struct ide_port_info piix_pci_info[] __devinitdata = {
31684+static const struct ide_port_info piix_pci_info[] __devinitconst = {
31685 /* 0: MPIIX */
31686 { /*
31687 * MPIIX actually has only a single IDE channel mapped to
31688diff --git a/drivers/ide/rz1000.c b/drivers/ide/rz1000.c
31689index a6414a8..c04173e 100644
31690--- a/drivers/ide/rz1000.c
31691+++ b/drivers/ide/rz1000.c
31692@@ -38,7 +38,7 @@ static int __devinit rz1000_disable_readahead(struct pci_dev *dev)
31693 }
31694 }
31695
31696-static const struct ide_port_info rz1000_chipset __devinitdata = {
31697+static const struct ide_port_info rz1000_chipset __devinitconst = {
31698 .name = DRV_NAME,
31699 .host_flags = IDE_HFLAG_NO_DMA,
31700 };
31701diff --git a/drivers/ide/sc1200.c b/drivers/ide/sc1200.c
31702index 356b9b5..d4758eb 100644
31703--- a/drivers/ide/sc1200.c
31704+++ b/drivers/ide/sc1200.c
31705@@ -291,7 +291,7 @@ static const struct ide_dma_ops sc1200_dma_ops = {
31706 .dma_sff_read_status = ide_dma_sff_read_status,
31707 };
31708
31709-static const struct ide_port_info sc1200_chipset __devinitdata = {
31710+static const struct ide_port_info sc1200_chipset __devinitconst = {
31711 .name = DRV_NAME,
31712 .port_ops = &sc1200_port_ops,
31713 .dma_ops = &sc1200_dma_ops,
31714diff --git a/drivers/ide/scc_pata.c b/drivers/ide/scc_pata.c
31715index b7f5b0c..9701038 100644
31716--- a/drivers/ide/scc_pata.c
31717+++ b/drivers/ide/scc_pata.c
31718@@ -811,7 +811,7 @@ static const struct ide_dma_ops scc_dma_ops = {
31719 .dma_sff_read_status = scc_dma_sff_read_status,
31720 };
31721
31722-static const struct ide_port_info scc_chipset __devinitdata = {
31723+static const struct ide_port_info scc_chipset __devinitconst = {
31724 .name = "sccIDE",
31725 .init_iops = init_iops_scc,
31726 .init_dma = scc_init_dma,
31727diff --git a/drivers/ide/serverworks.c b/drivers/ide/serverworks.c
31728index 35fb8da..24d72ef 100644
31729--- a/drivers/ide/serverworks.c
31730+++ b/drivers/ide/serverworks.c
31731@@ -337,7 +337,7 @@ static const struct ide_port_ops svwks_port_ops = {
31732 .cable_detect = svwks_cable_detect,
31733 };
31734
31735-static const struct ide_port_info serverworks_chipsets[] __devinitdata = {
31736+static const struct ide_port_info serverworks_chipsets[] __devinitconst = {
31737 { /* 0: OSB4 */
31738 .name = DRV_NAME,
31739 .init_chipset = init_chipset_svwks,
31740diff --git a/drivers/ide/siimage.c b/drivers/ide/siimage.c
31741index ddeda44..46f7e30 100644
31742--- a/drivers/ide/siimage.c
31743+++ b/drivers/ide/siimage.c
31744@@ -719,7 +719,7 @@ static const struct ide_dma_ops sil_dma_ops = {
31745 .udma_mask = ATA_UDMA6, \
31746 }
31747
31748-static const struct ide_port_info siimage_chipsets[] __devinitdata = {
31749+static const struct ide_port_info siimage_chipsets[] __devinitconst = {
31750 /* 0: SiI680 */ DECLARE_SII_DEV(&sil_pata_port_ops),
31751 /* 1: SiI3112 */ DECLARE_SII_DEV(&sil_sata_port_ops)
31752 };
31753diff --git a/drivers/ide/sis5513.c b/drivers/ide/sis5513.c
31754index 4a00225..09e61b4 100644
31755--- a/drivers/ide/sis5513.c
31756+++ b/drivers/ide/sis5513.c
31757@@ -563,7 +563,7 @@ static const struct ide_port_ops sis_ata133_port_ops = {
31758 .cable_detect = sis_cable_detect,
31759 };
31760
31761-static const struct ide_port_info sis5513_chipset __devinitdata = {
31762+static const struct ide_port_info sis5513_chipset __devinitconst = {
31763 .name = DRV_NAME,
31764 .init_chipset = init_chipset_sis5513,
31765 .enablebits = { {0x4a, 0x02, 0x02}, {0x4a, 0x04, 0x04} },
31766diff --git a/drivers/ide/sl82c105.c b/drivers/ide/sl82c105.c
31767index f21dc2a..d051cd2 100644
31768--- a/drivers/ide/sl82c105.c
31769+++ b/drivers/ide/sl82c105.c
31770@@ -299,7 +299,7 @@ static const struct ide_dma_ops sl82c105_dma_ops = {
31771 .dma_sff_read_status = ide_dma_sff_read_status,
31772 };
31773
31774-static const struct ide_port_info sl82c105_chipset __devinitdata = {
31775+static const struct ide_port_info sl82c105_chipset __devinitconst = {
31776 .name = DRV_NAME,
31777 .init_chipset = init_chipset_sl82c105,
31778 .enablebits = {{0x40,0x01,0x01}, {0x40,0x10,0x10}},
31779diff --git a/drivers/ide/slc90e66.c b/drivers/ide/slc90e66.c
31780index 864ffe0..863a5e9 100644
31781--- a/drivers/ide/slc90e66.c
31782+++ b/drivers/ide/slc90e66.c
31783@@ -132,7 +132,7 @@ static const struct ide_port_ops slc90e66_port_ops = {
31784 .cable_detect = slc90e66_cable_detect,
31785 };
31786
31787-static const struct ide_port_info slc90e66_chipset __devinitdata = {
31788+static const struct ide_port_info slc90e66_chipset __devinitconst = {
31789 .name = DRV_NAME,
31790 .enablebits = { {0x41, 0x80, 0x80}, {0x43, 0x80, 0x80} },
31791 .port_ops = &slc90e66_port_ops,
31792diff --git a/drivers/ide/tc86c001.c b/drivers/ide/tc86c001.c
31793index 4799d5c..1794678 100644
31794--- a/drivers/ide/tc86c001.c
31795+++ b/drivers/ide/tc86c001.c
31796@@ -192,7 +192,7 @@ static const struct ide_dma_ops tc86c001_dma_ops = {
31797 .dma_sff_read_status = ide_dma_sff_read_status,
31798 };
31799
31800-static const struct ide_port_info tc86c001_chipset __devinitdata = {
31801+static const struct ide_port_info tc86c001_chipset __devinitconst = {
31802 .name = DRV_NAME,
31803 .init_hwif = init_hwif_tc86c001,
31804 .port_ops = &tc86c001_port_ops,
31805diff --git a/drivers/ide/triflex.c b/drivers/ide/triflex.c
31806index 281c914..55ce1b8 100644
31807--- a/drivers/ide/triflex.c
31808+++ b/drivers/ide/triflex.c
31809@@ -92,7 +92,7 @@ static const struct ide_port_ops triflex_port_ops = {
31810 .set_dma_mode = triflex_set_mode,
31811 };
31812
31813-static const struct ide_port_info triflex_device __devinitdata = {
31814+static const struct ide_port_info triflex_device __devinitconst = {
31815 .name = DRV_NAME,
31816 .enablebits = {{0x80, 0x01, 0x01}, {0x80, 0x02, 0x02}},
31817 .port_ops = &triflex_port_ops,
31818diff --git a/drivers/ide/trm290.c b/drivers/ide/trm290.c
31819index 4b42ca0..e494a98 100644
31820--- a/drivers/ide/trm290.c
31821+++ b/drivers/ide/trm290.c
31822@@ -324,7 +324,7 @@ static struct ide_dma_ops trm290_dma_ops = {
31823 .dma_check = trm290_dma_check,
31824 };
31825
31826-static const struct ide_port_info trm290_chipset __devinitdata = {
31827+static const struct ide_port_info trm290_chipset __devinitconst = {
31828 .name = DRV_NAME,
31829 .init_hwif = init_hwif_trm290,
31830 .tp_ops = &trm290_tp_ops,
31831diff --git a/drivers/ide/via82cxxx.c b/drivers/ide/via82cxxx.c
31832index f46f49c..eb77678 100644
31833--- a/drivers/ide/via82cxxx.c
31834+++ b/drivers/ide/via82cxxx.c
31835@@ -403,7 +403,7 @@ static const struct ide_port_ops via_port_ops = {
31836 .cable_detect = via82cxxx_cable_detect,
31837 };
31838
31839-static const struct ide_port_info via82cxxx_chipset __devinitdata = {
31840+static const struct ide_port_info via82cxxx_chipset __devinitconst = {
31841 .name = DRV_NAME,
31842 .init_chipset = init_chipset_via82cxxx,
31843 .enablebits = { { 0x40, 0x02, 0x02 }, { 0x40, 0x01, 0x01 } },
31844diff --git a/drivers/ieee802154/fakehard.c b/drivers/ieee802154/fakehard.c
31845index eb0e2cc..14241c7 100644
31846--- a/drivers/ieee802154/fakehard.c
31847+++ b/drivers/ieee802154/fakehard.c
31848@@ -386,7 +386,7 @@ static int __devinit ieee802154fake_probe(struct platform_device *pdev)
31849 phy->transmit_power = 0xbf;
31850
31851 dev->netdev_ops = &fake_ops;
31852- dev->ml_priv = &fake_mlme;
31853+ dev->ml_priv = (void *)&fake_mlme;
31854
31855 priv = netdev_priv(dev);
31856 priv->phy = phy;
31857diff --git a/drivers/infiniband/core/cm.c b/drivers/infiniband/core/cm.c
31858index 8b72f39..55df4c8 100644
31859--- a/drivers/infiniband/core/cm.c
31860+++ b/drivers/infiniband/core/cm.c
31861@@ -114,7 +114,7 @@ static char const counter_group_names[CM_COUNTER_GROUPS]
31862
31863 struct cm_counter_group {
31864 struct kobject obj;
31865- atomic_long_t counter[CM_ATTR_COUNT];
31866+ atomic_long_unchecked_t counter[CM_ATTR_COUNT];
31867 };
31868
31869 struct cm_counter_attribute {
31870@@ -1394,7 +1394,7 @@ static void cm_dup_req_handler(struct cm_work *work,
31871 struct ib_mad_send_buf *msg = NULL;
31872 int ret;
31873
31874- atomic_long_inc(&work->port->counter_group[CM_RECV_DUPLICATES].
31875+ atomic_long_inc_unchecked(&work->port->counter_group[CM_RECV_DUPLICATES].
31876 counter[CM_REQ_COUNTER]);
31877
31878 /* Quick state check to discard duplicate REQs. */
31879@@ -1778,7 +1778,7 @@ static void cm_dup_rep_handler(struct cm_work *work)
31880 if (!cm_id_priv)
31881 return;
31882
31883- atomic_long_inc(&work->port->counter_group[CM_RECV_DUPLICATES].
31884+ atomic_long_inc_unchecked(&work->port->counter_group[CM_RECV_DUPLICATES].
31885 counter[CM_REP_COUNTER]);
31886 ret = cm_alloc_response_msg(work->port, work->mad_recv_wc, &msg);
31887 if (ret)
31888@@ -1945,7 +1945,7 @@ static int cm_rtu_handler(struct cm_work *work)
31889 if (cm_id_priv->id.state != IB_CM_REP_SENT &&
31890 cm_id_priv->id.state != IB_CM_MRA_REP_RCVD) {
31891 spin_unlock_irq(&cm_id_priv->lock);
31892- atomic_long_inc(&work->port->counter_group[CM_RECV_DUPLICATES].
31893+ atomic_long_inc_unchecked(&work->port->counter_group[CM_RECV_DUPLICATES].
31894 counter[CM_RTU_COUNTER]);
31895 goto out;
31896 }
31897@@ -2128,7 +2128,7 @@ static int cm_dreq_handler(struct cm_work *work)
31898 cm_id_priv = cm_acquire_id(dreq_msg->remote_comm_id,
31899 dreq_msg->local_comm_id);
31900 if (!cm_id_priv) {
31901- atomic_long_inc(&work->port->counter_group[CM_RECV_DUPLICATES].
31902+ atomic_long_inc_unchecked(&work->port->counter_group[CM_RECV_DUPLICATES].
31903 counter[CM_DREQ_COUNTER]);
31904 cm_issue_drep(work->port, work->mad_recv_wc);
31905 return -EINVAL;
31906@@ -2153,7 +2153,7 @@ static int cm_dreq_handler(struct cm_work *work)
31907 case IB_CM_MRA_REP_RCVD:
31908 break;
31909 case IB_CM_TIMEWAIT:
31910- atomic_long_inc(&work->port->counter_group[CM_RECV_DUPLICATES].
31911+ atomic_long_inc_unchecked(&work->port->counter_group[CM_RECV_DUPLICATES].
31912 counter[CM_DREQ_COUNTER]);
31913 if (cm_alloc_response_msg(work->port, work->mad_recv_wc, &msg))
31914 goto unlock;
31915@@ -2167,7 +2167,7 @@ static int cm_dreq_handler(struct cm_work *work)
31916 cm_free_msg(msg);
31917 goto deref;
31918 case IB_CM_DREQ_RCVD:
31919- atomic_long_inc(&work->port->counter_group[CM_RECV_DUPLICATES].
31920+ atomic_long_inc_unchecked(&work->port->counter_group[CM_RECV_DUPLICATES].
31921 counter[CM_DREQ_COUNTER]);
31922 goto unlock;
31923 default:
31924@@ -2534,7 +2534,7 @@ static int cm_mra_handler(struct cm_work *work)
31925 ib_modify_mad(cm_id_priv->av.port->mad_agent,
31926 cm_id_priv->msg, timeout)) {
31927 if (cm_id_priv->id.lap_state == IB_CM_MRA_LAP_RCVD)
31928- atomic_long_inc(&work->port->
31929+ atomic_long_inc_unchecked(&work->port->
31930 counter_group[CM_RECV_DUPLICATES].
31931 counter[CM_MRA_COUNTER]);
31932 goto out;
31933@@ -2543,7 +2543,7 @@ static int cm_mra_handler(struct cm_work *work)
31934 break;
31935 case IB_CM_MRA_REQ_RCVD:
31936 case IB_CM_MRA_REP_RCVD:
31937- atomic_long_inc(&work->port->counter_group[CM_RECV_DUPLICATES].
31938+ atomic_long_inc_unchecked(&work->port->counter_group[CM_RECV_DUPLICATES].
31939 counter[CM_MRA_COUNTER]);
31940 /* fall through */
31941 default:
31942@@ -2705,7 +2705,7 @@ static int cm_lap_handler(struct cm_work *work)
31943 case IB_CM_LAP_IDLE:
31944 break;
31945 case IB_CM_MRA_LAP_SENT:
31946- atomic_long_inc(&work->port->counter_group[CM_RECV_DUPLICATES].
31947+ atomic_long_inc_unchecked(&work->port->counter_group[CM_RECV_DUPLICATES].
31948 counter[CM_LAP_COUNTER]);
31949 if (cm_alloc_response_msg(work->port, work->mad_recv_wc, &msg))
31950 goto unlock;
31951@@ -2721,7 +2721,7 @@ static int cm_lap_handler(struct cm_work *work)
31952 cm_free_msg(msg);
31953 goto deref;
31954 case IB_CM_LAP_RCVD:
31955- atomic_long_inc(&work->port->counter_group[CM_RECV_DUPLICATES].
31956+ atomic_long_inc_unchecked(&work->port->counter_group[CM_RECV_DUPLICATES].
31957 counter[CM_LAP_COUNTER]);
31958 goto unlock;
31959 default:
31960@@ -3005,7 +3005,7 @@ static int cm_sidr_req_handler(struct cm_work *work)
31961 cur_cm_id_priv = cm_insert_remote_sidr(cm_id_priv);
31962 if (cur_cm_id_priv) {
31963 spin_unlock_irq(&cm.lock);
31964- atomic_long_inc(&work->port->counter_group[CM_RECV_DUPLICATES].
31965+ atomic_long_inc_unchecked(&work->port->counter_group[CM_RECV_DUPLICATES].
31966 counter[CM_SIDR_REQ_COUNTER]);
31967 goto out; /* Duplicate message. */
31968 }
31969@@ -3217,10 +3217,10 @@ static void cm_send_handler(struct ib_mad_agent *mad_agent,
31970 if (!msg->context[0] && (attr_index != CM_REJ_COUNTER))
31971 msg->retries = 1;
31972
31973- atomic_long_add(1 + msg->retries,
31974+ atomic_long_add_unchecked(1 + msg->retries,
31975 &port->counter_group[CM_XMIT].counter[attr_index]);
31976 if (msg->retries)
31977- atomic_long_add(msg->retries,
31978+ atomic_long_add_unchecked(msg->retries,
31979 &port->counter_group[CM_XMIT_RETRIES].
31980 counter[attr_index]);
31981
31982@@ -3430,7 +3430,7 @@ static void cm_recv_handler(struct ib_mad_agent *mad_agent,
31983 }
31984
31985 attr_id = be16_to_cpu(mad_recv_wc->recv_buf.mad->mad_hdr.attr_id);
31986- atomic_long_inc(&port->counter_group[CM_RECV].
31987+ atomic_long_inc_unchecked(&port->counter_group[CM_RECV].
31988 counter[attr_id - CM_ATTR_ID_OFFSET]);
31989
31990 work = kmalloc(sizeof *work + sizeof(struct ib_sa_path_rec) * paths,
31991@@ -3635,7 +3635,7 @@ static ssize_t cm_show_counter(struct kobject *obj, struct attribute *attr,
31992 cm_attr = container_of(attr, struct cm_counter_attribute, attr);
31993
31994 return sprintf(buf, "%ld\n",
31995- atomic_long_read(&group->counter[cm_attr->index]));
31996+ atomic_long_read_unchecked(&group->counter[cm_attr->index]));
31997 }
31998
31999 static const struct sysfs_ops cm_counter_ops = {
32000diff --git a/drivers/infiniband/core/fmr_pool.c b/drivers/infiniband/core/fmr_pool.c
32001index 176c8f9..2627b62 100644
32002--- a/drivers/infiniband/core/fmr_pool.c
32003+++ b/drivers/infiniband/core/fmr_pool.c
32004@@ -98,8 +98,8 @@ struct ib_fmr_pool {
32005
32006 struct task_struct *thread;
32007
32008- atomic_t req_ser;
32009- atomic_t flush_ser;
32010+ atomic_unchecked_t req_ser;
32011+ atomic_unchecked_t flush_ser;
32012
32013 wait_queue_head_t force_wait;
32014 };
32015@@ -180,10 +180,10 @@ static int ib_fmr_cleanup_thread(void *pool_ptr)
32016 struct ib_fmr_pool *pool = pool_ptr;
32017
32018 do {
32019- if (atomic_read(&pool->flush_ser) - atomic_read(&pool->req_ser) < 0) {
32020+ if (atomic_read_unchecked(&pool->flush_ser) - atomic_read_unchecked(&pool->req_ser) < 0) {
32021 ib_fmr_batch_release(pool);
32022
32023- atomic_inc(&pool->flush_ser);
32024+ atomic_inc_unchecked(&pool->flush_ser);
32025 wake_up_interruptible(&pool->force_wait);
32026
32027 if (pool->flush_function)
32028@@ -191,7 +191,7 @@ static int ib_fmr_cleanup_thread(void *pool_ptr)
32029 }
32030
32031 set_current_state(TASK_INTERRUPTIBLE);
32032- if (atomic_read(&pool->flush_ser) - atomic_read(&pool->req_ser) >= 0 &&
32033+ if (atomic_read_unchecked(&pool->flush_ser) - atomic_read_unchecked(&pool->req_ser) >= 0 &&
32034 !kthread_should_stop())
32035 schedule();
32036 __set_current_state(TASK_RUNNING);
32037@@ -283,8 +283,8 @@ struct ib_fmr_pool *ib_create_fmr_pool(struct ib_pd *pd,
32038 pool->dirty_watermark = params->dirty_watermark;
32039 pool->dirty_len = 0;
32040 spin_lock_init(&pool->pool_lock);
32041- atomic_set(&pool->req_ser, 0);
32042- atomic_set(&pool->flush_ser, 0);
32043+ atomic_set_unchecked(&pool->req_ser, 0);
32044+ atomic_set_unchecked(&pool->flush_ser, 0);
32045 init_waitqueue_head(&pool->force_wait);
32046
32047 pool->thread = kthread_run(ib_fmr_cleanup_thread,
32048@@ -412,11 +412,11 @@ int ib_flush_fmr_pool(struct ib_fmr_pool *pool)
32049 }
32050 spin_unlock_irq(&pool->pool_lock);
32051
32052- serial = atomic_inc_return(&pool->req_ser);
32053+ serial = atomic_inc_return_unchecked(&pool->req_ser);
32054 wake_up_process(pool->thread);
32055
32056 if (wait_event_interruptible(pool->force_wait,
32057- atomic_read(&pool->flush_ser) - serial >= 0))
32058+ atomic_read_unchecked(&pool->flush_ser) - serial >= 0))
32059 return -EINTR;
32060
32061 return 0;
32062@@ -526,7 +526,7 @@ int ib_fmr_pool_unmap(struct ib_pool_fmr *fmr)
32063 } else {
32064 list_add_tail(&fmr->list, &pool->dirty_list);
32065 if (++pool->dirty_len >= pool->dirty_watermark) {
32066- atomic_inc(&pool->req_ser);
32067+ atomic_inc_unchecked(&pool->req_ser);
32068 wake_up_process(pool->thread);
32069 }
32070 }
32071diff --git a/drivers/infiniband/hw/cxgb4/mem.c b/drivers/infiniband/hw/cxgb4/mem.c
32072index 40c8353..946b0e4 100644
32073--- a/drivers/infiniband/hw/cxgb4/mem.c
32074+++ b/drivers/infiniband/hw/cxgb4/mem.c
32075@@ -122,7 +122,7 @@ static int write_tpt_entry(struct c4iw_rdev *rdev, u32 reset_tpt_entry,
32076 int err;
32077 struct fw_ri_tpte tpt;
32078 u32 stag_idx;
32079- static atomic_t key;
32080+ static atomic_unchecked_t key;
32081
32082 if (c4iw_fatal_error(rdev))
32083 return -EIO;
32084@@ -135,7 +135,7 @@ static int write_tpt_entry(struct c4iw_rdev *rdev, u32 reset_tpt_entry,
32085 &rdev->resource.tpt_fifo_lock);
32086 if (!stag_idx)
32087 return -ENOMEM;
32088- *stag = (stag_idx << 8) | (atomic_inc_return(&key) & 0xff);
32089+ *stag = (stag_idx << 8) | (atomic_inc_return_unchecked(&key) & 0xff);
32090 }
32091 PDBG("%s stag_state 0x%0x type 0x%0x pdid 0x%0x, stag_idx 0x%x\n",
32092 __func__, stag_state, type, pdid, stag_idx);
32093diff --git a/drivers/infiniband/hw/ipath/ipath_fs.c b/drivers/infiniband/hw/ipath/ipath_fs.c
32094index 31ae1b1..641d285 100644
32095--- a/drivers/infiniband/hw/ipath/ipath_fs.c
32096+++ b/drivers/infiniband/hw/ipath/ipath_fs.c
32097@@ -126,6 +126,8 @@ static const struct file_operations atomic_counters_ops = {
32098 };
32099
32100 static ssize_t flash_read(struct file *file, char __user *buf,
32101+ size_t count, loff_t *ppos) __size_overflow(3);
32102+static ssize_t flash_read(struct file *file, char __user *buf,
32103 size_t count, loff_t *ppos)
32104 {
32105 struct ipath_devdata *dd;
32106diff --git a/drivers/infiniband/hw/ipath/ipath_rc.c b/drivers/infiniband/hw/ipath/ipath_rc.c
32107index 79b3dbc..96e5fcc 100644
32108--- a/drivers/infiniband/hw/ipath/ipath_rc.c
32109+++ b/drivers/infiniband/hw/ipath/ipath_rc.c
32110@@ -1868,7 +1868,7 @@ void ipath_rc_rcv(struct ipath_ibdev *dev, struct ipath_ib_header *hdr,
32111 struct ib_atomic_eth *ateth;
32112 struct ipath_ack_entry *e;
32113 u64 vaddr;
32114- atomic64_t *maddr;
32115+ atomic64_unchecked_t *maddr;
32116 u64 sdata;
32117 u32 rkey;
32118 u8 next;
32119@@ -1903,11 +1903,11 @@ void ipath_rc_rcv(struct ipath_ibdev *dev, struct ipath_ib_header *hdr,
32120 IB_ACCESS_REMOTE_ATOMIC)))
32121 goto nack_acc_unlck;
32122 /* Perform atomic OP and save result. */
32123- maddr = (atomic64_t *) qp->r_sge.sge.vaddr;
32124+ maddr = (atomic64_unchecked_t *) qp->r_sge.sge.vaddr;
32125 sdata = be64_to_cpu(ateth->swap_data);
32126 e = &qp->s_ack_queue[qp->r_head_ack_queue];
32127 e->atomic_data = (opcode == OP(FETCH_ADD)) ?
32128- (u64) atomic64_add_return(sdata, maddr) - sdata :
32129+ (u64) atomic64_add_return_unchecked(sdata, maddr) - sdata :
32130 (u64) cmpxchg((u64 *) qp->r_sge.sge.vaddr,
32131 be64_to_cpu(ateth->compare_data),
32132 sdata);
32133diff --git a/drivers/infiniband/hw/ipath/ipath_ruc.c b/drivers/infiniband/hw/ipath/ipath_ruc.c
32134index 1f95bba..9530f87 100644
32135--- a/drivers/infiniband/hw/ipath/ipath_ruc.c
32136+++ b/drivers/infiniband/hw/ipath/ipath_ruc.c
32137@@ -266,7 +266,7 @@ static void ipath_ruc_loopback(struct ipath_qp *sqp)
32138 unsigned long flags;
32139 struct ib_wc wc;
32140 u64 sdata;
32141- atomic64_t *maddr;
32142+ atomic64_unchecked_t *maddr;
32143 enum ib_wc_status send_status;
32144
32145 /*
32146@@ -382,11 +382,11 @@ again:
32147 IB_ACCESS_REMOTE_ATOMIC)))
32148 goto acc_err;
32149 /* Perform atomic OP and save result. */
32150- maddr = (atomic64_t *) qp->r_sge.sge.vaddr;
32151+ maddr = (atomic64_unchecked_t *) qp->r_sge.sge.vaddr;
32152 sdata = wqe->wr.wr.atomic.compare_add;
32153 *(u64 *) sqp->s_sge.sge.vaddr =
32154 (wqe->wr.opcode == IB_WR_ATOMIC_FETCH_AND_ADD) ?
32155- (u64) atomic64_add_return(sdata, maddr) - sdata :
32156+ (u64) atomic64_add_return_unchecked(sdata, maddr) - sdata :
32157 (u64) cmpxchg((u64 *) qp->r_sge.sge.vaddr,
32158 sdata, wqe->wr.wr.atomic.swap);
32159 goto send_comp;
32160diff --git a/drivers/infiniband/hw/nes/nes.c b/drivers/infiniband/hw/nes/nes.c
32161index 5965b3d..16817fb 100644
32162--- a/drivers/infiniband/hw/nes/nes.c
32163+++ b/drivers/infiniband/hw/nes/nes.c
32164@@ -103,7 +103,7 @@ MODULE_PARM_DESC(limit_maxrdreqsz, "Limit max read request size to 256 Bytes");
32165 LIST_HEAD(nes_adapter_list);
32166 static LIST_HEAD(nes_dev_list);
32167
32168-atomic_t qps_destroyed;
32169+atomic_unchecked_t qps_destroyed;
32170
32171 static unsigned int ee_flsh_adapter;
32172 static unsigned int sysfs_nonidx_addr;
32173@@ -272,7 +272,7 @@ static void nes_cqp_rem_ref_callback(struct nes_device *nesdev, struct nes_cqp_r
32174 struct nes_qp *nesqp = cqp_request->cqp_callback_pointer;
32175 struct nes_adapter *nesadapter = nesdev->nesadapter;
32176
32177- atomic_inc(&qps_destroyed);
32178+ atomic_inc_unchecked(&qps_destroyed);
32179
32180 /* Free the control structures */
32181
32182diff --git a/drivers/infiniband/hw/nes/nes.h b/drivers/infiniband/hw/nes/nes.h
32183index 568b4f1..5ea3eff 100644
32184--- a/drivers/infiniband/hw/nes/nes.h
32185+++ b/drivers/infiniband/hw/nes/nes.h
32186@@ -178,17 +178,17 @@ extern unsigned int nes_debug_level;
32187 extern unsigned int wqm_quanta;
32188 extern struct list_head nes_adapter_list;
32189
32190-extern atomic_t cm_connects;
32191-extern atomic_t cm_accepts;
32192-extern atomic_t cm_disconnects;
32193-extern atomic_t cm_closes;
32194-extern atomic_t cm_connecteds;
32195-extern atomic_t cm_connect_reqs;
32196-extern atomic_t cm_rejects;
32197-extern atomic_t mod_qp_timouts;
32198-extern atomic_t qps_created;
32199-extern atomic_t qps_destroyed;
32200-extern atomic_t sw_qps_destroyed;
32201+extern atomic_unchecked_t cm_connects;
32202+extern atomic_unchecked_t cm_accepts;
32203+extern atomic_unchecked_t cm_disconnects;
32204+extern atomic_unchecked_t cm_closes;
32205+extern atomic_unchecked_t cm_connecteds;
32206+extern atomic_unchecked_t cm_connect_reqs;
32207+extern atomic_unchecked_t cm_rejects;
32208+extern atomic_unchecked_t mod_qp_timouts;
32209+extern atomic_unchecked_t qps_created;
32210+extern atomic_unchecked_t qps_destroyed;
32211+extern atomic_unchecked_t sw_qps_destroyed;
32212 extern u32 mh_detected;
32213 extern u32 mh_pauses_sent;
32214 extern u32 cm_packets_sent;
32215@@ -197,16 +197,16 @@ extern u32 cm_packets_created;
32216 extern u32 cm_packets_received;
32217 extern u32 cm_packets_dropped;
32218 extern u32 cm_packets_retrans;
32219-extern atomic_t cm_listens_created;
32220-extern atomic_t cm_listens_destroyed;
32221+extern atomic_unchecked_t cm_listens_created;
32222+extern atomic_unchecked_t cm_listens_destroyed;
32223 extern u32 cm_backlog_drops;
32224-extern atomic_t cm_loopbacks;
32225-extern atomic_t cm_nodes_created;
32226-extern atomic_t cm_nodes_destroyed;
32227-extern atomic_t cm_accel_dropped_pkts;
32228-extern atomic_t cm_resets_recvd;
32229-extern atomic_t pau_qps_created;
32230-extern atomic_t pau_qps_destroyed;
32231+extern atomic_unchecked_t cm_loopbacks;
32232+extern atomic_unchecked_t cm_nodes_created;
32233+extern atomic_unchecked_t cm_nodes_destroyed;
32234+extern atomic_unchecked_t cm_accel_dropped_pkts;
32235+extern atomic_unchecked_t cm_resets_recvd;
32236+extern atomic_unchecked_t pau_qps_created;
32237+extern atomic_unchecked_t pau_qps_destroyed;
32238
32239 extern u32 int_mod_timer_init;
32240 extern u32 int_mod_cq_depth_256;
32241diff --git a/drivers/infiniband/hw/nes/nes_cm.c b/drivers/infiniband/hw/nes/nes_cm.c
32242index 0a52d72..0642f36 100644
32243--- a/drivers/infiniband/hw/nes/nes_cm.c
32244+++ b/drivers/infiniband/hw/nes/nes_cm.c
32245@@ -68,14 +68,14 @@ u32 cm_packets_dropped;
32246 u32 cm_packets_retrans;
32247 u32 cm_packets_created;
32248 u32 cm_packets_received;
32249-atomic_t cm_listens_created;
32250-atomic_t cm_listens_destroyed;
32251+atomic_unchecked_t cm_listens_created;
32252+atomic_unchecked_t cm_listens_destroyed;
32253 u32 cm_backlog_drops;
32254-atomic_t cm_loopbacks;
32255-atomic_t cm_nodes_created;
32256-atomic_t cm_nodes_destroyed;
32257-atomic_t cm_accel_dropped_pkts;
32258-atomic_t cm_resets_recvd;
32259+atomic_unchecked_t cm_loopbacks;
32260+atomic_unchecked_t cm_nodes_created;
32261+atomic_unchecked_t cm_nodes_destroyed;
32262+atomic_unchecked_t cm_accel_dropped_pkts;
32263+atomic_unchecked_t cm_resets_recvd;
32264
32265 static inline int mini_cm_accelerated(struct nes_cm_core *, struct nes_cm_node *);
32266 static struct nes_cm_listener *mini_cm_listen(struct nes_cm_core *, struct nes_vnic *, struct nes_cm_info *);
32267@@ -148,13 +148,13 @@ static struct nes_cm_ops nes_cm_api = {
32268
32269 static struct nes_cm_core *g_cm_core;
32270
32271-atomic_t cm_connects;
32272-atomic_t cm_accepts;
32273-atomic_t cm_disconnects;
32274-atomic_t cm_closes;
32275-atomic_t cm_connecteds;
32276-atomic_t cm_connect_reqs;
32277-atomic_t cm_rejects;
32278+atomic_unchecked_t cm_connects;
32279+atomic_unchecked_t cm_accepts;
32280+atomic_unchecked_t cm_disconnects;
32281+atomic_unchecked_t cm_closes;
32282+atomic_unchecked_t cm_connecteds;
32283+atomic_unchecked_t cm_connect_reqs;
32284+atomic_unchecked_t cm_rejects;
32285
32286 int nes_add_ref_cm_node(struct nes_cm_node *cm_node)
32287 {
32288@@ -1271,7 +1271,7 @@ static int mini_cm_dec_refcnt_listen(struct nes_cm_core *cm_core,
32289 kfree(listener);
32290 listener = NULL;
32291 ret = 0;
32292- atomic_inc(&cm_listens_destroyed);
32293+ atomic_inc_unchecked(&cm_listens_destroyed);
32294 } else {
32295 spin_unlock_irqrestore(&cm_core->listen_list_lock, flags);
32296 }
32297@@ -1473,7 +1473,7 @@ static struct nes_cm_node *make_cm_node(struct nes_cm_core *cm_core,
32298 cm_node->rem_mac);
32299
32300 add_hte_node(cm_core, cm_node);
32301- atomic_inc(&cm_nodes_created);
32302+ atomic_inc_unchecked(&cm_nodes_created);
32303
32304 return cm_node;
32305 }
32306@@ -1531,7 +1531,7 @@ static int rem_ref_cm_node(struct nes_cm_core *cm_core,
32307 }
32308
32309 atomic_dec(&cm_core->node_cnt);
32310- atomic_inc(&cm_nodes_destroyed);
32311+ atomic_inc_unchecked(&cm_nodes_destroyed);
32312 nesqp = cm_node->nesqp;
32313 if (nesqp) {
32314 nesqp->cm_node = NULL;
32315@@ -1595,7 +1595,7 @@ static int process_options(struct nes_cm_node *cm_node, u8 *optionsloc,
32316
32317 static void drop_packet(struct sk_buff *skb)
32318 {
32319- atomic_inc(&cm_accel_dropped_pkts);
32320+ atomic_inc_unchecked(&cm_accel_dropped_pkts);
32321 dev_kfree_skb_any(skb);
32322 }
32323
32324@@ -1658,7 +1658,7 @@ static void handle_rst_pkt(struct nes_cm_node *cm_node, struct sk_buff *skb,
32325 {
32326
32327 int reset = 0; /* whether to send reset in case of err.. */
32328- atomic_inc(&cm_resets_recvd);
32329+ atomic_inc_unchecked(&cm_resets_recvd);
32330 nes_debug(NES_DBG_CM, "Received Reset, cm_node = %p, state = %u."
32331 " refcnt=%d\n", cm_node, cm_node->state,
32332 atomic_read(&cm_node->ref_count));
32333@@ -2299,7 +2299,7 @@ static struct nes_cm_node *mini_cm_connect(struct nes_cm_core *cm_core,
32334 rem_ref_cm_node(cm_node->cm_core, cm_node);
32335 return NULL;
32336 }
32337- atomic_inc(&cm_loopbacks);
32338+ atomic_inc_unchecked(&cm_loopbacks);
32339 loopbackremotenode->loopbackpartner = cm_node;
32340 loopbackremotenode->tcp_cntxt.rcv_wscale =
32341 NES_CM_DEFAULT_RCV_WND_SCALE;
32342@@ -2574,7 +2574,7 @@ static int mini_cm_recv_pkt(struct nes_cm_core *cm_core,
32343 nes_queue_mgt_skbs(skb, nesvnic, cm_node->nesqp);
32344 else {
32345 rem_ref_cm_node(cm_core, cm_node);
32346- atomic_inc(&cm_accel_dropped_pkts);
32347+ atomic_inc_unchecked(&cm_accel_dropped_pkts);
32348 dev_kfree_skb_any(skb);
32349 }
32350 break;
32351@@ -2880,7 +2880,7 @@ static int nes_cm_disconn_true(struct nes_qp *nesqp)
32352
32353 if ((cm_id) && (cm_id->event_handler)) {
32354 if (issue_disconn) {
32355- atomic_inc(&cm_disconnects);
32356+ atomic_inc_unchecked(&cm_disconnects);
32357 cm_event.event = IW_CM_EVENT_DISCONNECT;
32358 cm_event.status = disconn_status;
32359 cm_event.local_addr = cm_id->local_addr;
32360@@ -2902,7 +2902,7 @@ static int nes_cm_disconn_true(struct nes_qp *nesqp)
32361 }
32362
32363 if (issue_close) {
32364- atomic_inc(&cm_closes);
32365+ atomic_inc_unchecked(&cm_closes);
32366 nes_disconnect(nesqp, 1);
32367
32368 cm_id->provider_data = nesqp;
32369@@ -3038,7 +3038,7 @@ int nes_accept(struct iw_cm_id *cm_id, struct iw_cm_conn_param *conn_param)
32370
32371 nes_debug(NES_DBG_CM, "QP%u, cm_node=%p, jiffies = %lu listener = %p\n",
32372 nesqp->hwqp.qp_id, cm_node, jiffies, cm_node->listener);
32373- atomic_inc(&cm_accepts);
32374+ atomic_inc_unchecked(&cm_accepts);
32375
32376 nes_debug(NES_DBG_CM, "netdev refcnt = %u.\n",
32377 netdev_refcnt_read(nesvnic->netdev));
32378@@ -3240,7 +3240,7 @@ int nes_reject(struct iw_cm_id *cm_id, const void *pdata, u8 pdata_len)
32379 struct nes_cm_core *cm_core;
32380 u8 *start_buff;
32381
32382- atomic_inc(&cm_rejects);
32383+ atomic_inc_unchecked(&cm_rejects);
32384 cm_node = (struct nes_cm_node *)cm_id->provider_data;
32385 loopback = cm_node->loopbackpartner;
32386 cm_core = cm_node->cm_core;
32387@@ -3300,7 +3300,7 @@ int nes_connect(struct iw_cm_id *cm_id, struct iw_cm_conn_param *conn_param)
32388 ntohl(cm_id->local_addr.sin_addr.s_addr),
32389 ntohs(cm_id->local_addr.sin_port));
32390
32391- atomic_inc(&cm_connects);
32392+ atomic_inc_unchecked(&cm_connects);
32393 nesqp->active_conn = 1;
32394
32395 /* cache the cm_id in the qp */
32396@@ -3406,7 +3406,7 @@ int nes_create_listen(struct iw_cm_id *cm_id, int backlog)
32397 g_cm_core->api->stop_listener(g_cm_core, (void *)cm_node);
32398 return err;
32399 }
32400- atomic_inc(&cm_listens_created);
32401+ atomic_inc_unchecked(&cm_listens_created);
32402 }
32403
32404 cm_id->add_ref(cm_id);
32405@@ -3507,7 +3507,7 @@ static void cm_event_connected(struct nes_cm_event *event)
32406
32407 if (nesqp->destroyed)
32408 return;
32409- atomic_inc(&cm_connecteds);
32410+ atomic_inc_unchecked(&cm_connecteds);
32411 nes_debug(NES_DBG_CM, "QP%u attempting to connect to 0x%08X:0x%04X on"
32412 " local port 0x%04X. jiffies = %lu.\n",
32413 nesqp->hwqp.qp_id,
32414@@ -3694,7 +3694,7 @@ static void cm_event_reset(struct nes_cm_event *event)
32415
32416 cm_id->add_ref(cm_id);
32417 ret = cm_id->event_handler(cm_id, &cm_event);
32418- atomic_inc(&cm_closes);
32419+ atomic_inc_unchecked(&cm_closes);
32420 cm_event.event = IW_CM_EVENT_CLOSE;
32421 cm_event.status = 0;
32422 cm_event.provider_data = cm_id->provider_data;
32423@@ -3730,7 +3730,7 @@ static void cm_event_mpa_req(struct nes_cm_event *event)
32424 return;
32425 cm_id = cm_node->cm_id;
32426
32427- atomic_inc(&cm_connect_reqs);
32428+ atomic_inc_unchecked(&cm_connect_reqs);
32429 nes_debug(NES_DBG_CM, "cm_node = %p - cm_id = %p, jiffies = %lu\n",
32430 cm_node, cm_id, jiffies);
32431
32432@@ -3770,7 +3770,7 @@ static void cm_event_mpa_reject(struct nes_cm_event *event)
32433 return;
32434 cm_id = cm_node->cm_id;
32435
32436- atomic_inc(&cm_connect_reqs);
32437+ atomic_inc_unchecked(&cm_connect_reqs);
32438 nes_debug(NES_DBG_CM, "cm_node = %p - cm_id = %p, jiffies = %lu\n",
32439 cm_node, cm_id, jiffies);
32440
32441diff --git a/drivers/infiniband/hw/nes/nes_mgt.c b/drivers/infiniband/hw/nes/nes_mgt.c
32442index b3b2a24..7bfaf1e 100644
32443--- a/drivers/infiniband/hw/nes/nes_mgt.c
32444+++ b/drivers/infiniband/hw/nes/nes_mgt.c
32445@@ -40,8 +40,8 @@
32446 #include "nes.h"
32447 #include "nes_mgt.h"
32448
32449-atomic_t pau_qps_created;
32450-atomic_t pau_qps_destroyed;
32451+atomic_unchecked_t pau_qps_created;
32452+atomic_unchecked_t pau_qps_destroyed;
32453
32454 static void nes_replenish_mgt_rq(struct nes_vnic_mgt *mgtvnic)
32455 {
32456@@ -621,7 +621,7 @@ void nes_destroy_pau_qp(struct nes_device *nesdev, struct nes_qp *nesqp)
32457 {
32458 struct sk_buff *skb;
32459 unsigned long flags;
32460- atomic_inc(&pau_qps_destroyed);
32461+ atomic_inc_unchecked(&pau_qps_destroyed);
32462
32463 /* Free packets that have not yet been forwarded */
32464 /* Lock is acquired by skb_dequeue when removing the skb */
32465@@ -812,7 +812,7 @@ static void nes_mgt_ce_handler(struct nes_device *nesdev, struct nes_hw_nic_cq *
32466 cq->cq_vbase[head].cqe_words[NES_NIC_CQE_HASH_RCVNXT]);
32467 skb_queue_head_init(&nesqp->pau_list);
32468 spin_lock_init(&nesqp->pau_lock);
32469- atomic_inc(&pau_qps_created);
32470+ atomic_inc_unchecked(&pau_qps_created);
32471 nes_change_quad_hash(nesdev, mgtvnic->nesvnic, nesqp);
32472 }
32473
32474diff --git a/drivers/infiniband/hw/nes/nes_nic.c b/drivers/infiniband/hw/nes/nes_nic.c
32475index c00d2f3..8834298 100644
32476--- a/drivers/infiniband/hw/nes/nes_nic.c
32477+++ b/drivers/infiniband/hw/nes/nes_nic.c
32478@@ -1277,39 +1277,39 @@ static void nes_netdev_get_ethtool_stats(struct net_device *netdev,
32479 target_stat_values[++index] = mh_detected;
32480 target_stat_values[++index] = mh_pauses_sent;
32481 target_stat_values[++index] = nesvnic->endnode_ipv4_tcp_retransmits;
32482- target_stat_values[++index] = atomic_read(&cm_connects);
32483- target_stat_values[++index] = atomic_read(&cm_accepts);
32484- target_stat_values[++index] = atomic_read(&cm_disconnects);
32485- target_stat_values[++index] = atomic_read(&cm_connecteds);
32486- target_stat_values[++index] = atomic_read(&cm_connect_reqs);
32487- target_stat_values[++index] = atomic_read(&cm_rejects);
32488- target_stat_values[++index] = atomic_read(&mod_qp_timouts);
32489- target_stat_values[++index] = atomic_read(&qps_created);
32490- target_stat_values[++index] = atomic_read(&sw_qps_destroyed);
32491- target_stat_values[++index] = atomic_read(&qps_destroyed);
32492- target_stat_values[++index] = atomic_read(&cm_closes);
32493+ target_stat_values[++index] = atomic_read_unchecked(&cm_connects);
32494+ target_stat_values[++index] = atomic_read_unchecked(&cm_accepts);
32495+ target_stat_values[++index] = atomic_read_unchecked(&cm_disconnects);
32496+ target_stat_values[++index] = atomic_read_unchecked(&cm_connecteds);
32497+ target_stat_values[++index] = atomic_read_unchecked(&cm_connect_reqs);
32498+ target_stat_values[++index] = atomic_read_unchecked(&cm_rejects);
32499+ target_stat_values[++index] = atomic_read_unchecked(&mod_qp_timouts);
32500+ target_stat_values[++index] = atomic_read_unchecked(&qps_created);
32501+ target_stat_values[++index] = atomic_read_unchecked(&sw_qps_destroyed);
32502+ target_stat_values[++index] = atomic_read_unchecked(&qps_destroyed);
32503+ target_stat_values[++index] = atomic_read_unchecked(&cm_closes);
32504 target_stat_values[++index] = cm_packets_sent;
32505 target_stat_values[++index] = cm_packets_bounced;
32506 target_stat_values[++index] = cm_packets_created;
32507 target_stat_values[++index] = cm_packets_received;
32508 target_stat_values[++index] = cm_packets_dropped;
32509 target_stat_values[++index] = cm_packets_retrans;
32510- target_stat_values[++index] = atomic_read(&cm_listens_created);
32511- target_stat_values[++index] = atomic_read(&cm_listens_destroyed);
32512+ target_stat_values[++index] = atomic_read_unchecked(&cm_listens_created);
32513+ target_stat_values[++index] = atomic_read_unchecked(&cm_listens_destroyed);
32514 target_stat_values[++index] = cm_backlog_drops;
32515- target_stat_values[++index] = atomic_read(&cm_loopbacks);
32516- target_stat_values[++index] = atomic_read(&cm_nodes_created);
32517- target_stat_values[++index] = atomic_read(&cm_nodes_destroyed);
32518- target_stat_values[++index] = atomic_read(&cm_accel_dropped_pkts);
32519- target_stat_values[++index] = atomic_read(&cm_resets_recvd);
32520+ target_stat_values[++index] = atomic_read_unchecked(&cm_loopbacks);
32521+ target_stat_values[++index] = atomic_read_unchecked(&cm_nodes_created);
32522+ target_stat_values[++index] = atomic_read_unchecked(&cm_nodes_destroyed);
32523+ target_stat_values[++index] = atomic_read_unchecked(&cm_accel_dropped_pkts);
32524+ target_stat_values[++index] = atomic_read_unchecked(&cm_resets_recvd);
32525 target_stat_values[++index] = nesadapter->free_4kpbl;
32526 target_stat_values[++index] = nesadapter->free_256pbl;
32527 target_stat_values[++index] = int_mod_timer_init;
32528 target_stat_values[++index] = nesvnic->lro_mgr.stats.aggregated;
32529 target_stat_values[++index] = nesvnic->lro_mgr.stats.flushed;
32530 target_stat_values[++index] = nesvnic->lro_mgr.stats.no_desc;
32531- target_stat_values[++index] = atomic_read(&pau_qps_created);
32532- target_stat_values[++index] = atomic_read(&pau_qps_destroyed);
32533+ target_stat_values[++index] = atomic_read_unchecked(&pau_qps_created);
32534+ target_stat_values[++index] = atomic_read_unchecked(&pau_qps_destroyed);
32535 }
32536
32537 /**
32538diff --git a/drivers/infiniband/hw/nes/nes_verbs.c b/drivers/infiniband/hw/nes/nes_verbs.c
32539index 5095bc4..41e8fff 100644
32540--- a/drivers/infiniband/hw/nes/nes_verbs.c
32541+++ b/drivers/infiniband/hw/nes/nes_verbs.c
32542@@ -46,9 +46,9 @@
32543
32544 #include <rdma/ib_umem.h>
32545
32546-atomic_t mod_qp_timouts;
32547-atomic_t qps_created;
32548-atomic_t sw_qps_destroyed;
32549+atomic_unchecked_t mod_qp_timouts;
32550+atomic_unchecked_t qps_created;
32551+atomic_unchecked_t sw_qps_destroyed;
32552
32553 static void nes_unregister_ofa_device(struct nes_ib_device *nesibdev);
32554
32555@@ -1131,7 +1131,7 @@ static struct ib_qp *nes_create_qp(struct ib_pd *ibpd,
32556 if (init_attr->create_flags)
32557 return ERR_PTR(-EINVAL);
32558
32559- atomic_inc(&qps_created);
32560+ atomic_inc_unchecked(&qps_created);
32561 switch (init_attr->qp_type) {
32562 case IB_QPT_RC:
32563 if (nes_drv_opt & NES_DRV_OPT_NO_INLINE_DATA) {
32564@@ -1460,7 +1460,7 @@ static int nes_destroy_qp(struct ib_qp *ibqp)
32565 struct iw_cm_event cm_event;
32566 int ret = 0;
32567
32568- atomic_inc(&sw_qps_destroyed);
32569+ atomic_inc_unchecked(&sw_qps_destroyed);
32570 nesqp->destroyed = 1;
32571
32572 /* Blow away the connection if it exists. */
32573diff --git a/drivers/infiniband/hw/qib/qib.h b/drivers/infiniband/hw/qib/qib.h
32574index b881bdc..c2e360c 100644
32575--- a/drivers/infiniband/hw/qib/qib.h
32576+++ b/drivers/infiniband/hw/qib/qib.h
32577@@ -51,6 +51,7 @@
32578 #include <linux/completion.h>
32579 #include <linux/kref.h>
32580 #include <linux/sched.h>
32581+#include <linux/slab.h>
32582
32583 #include "qib_common.h"
32584 #include "qib_verbs.h"
32585diff --git a/drivers/infiniband/hw/qib/qib_fs.c b/drivers/infiniband/hw/qib/qib_fs.c
32586index df7fa25..0c854f0 100644
32587--- a/drivers/infiniband/hw/qib/qib_fs.c
32588+++ b/drivers/infiniband/hw/qib/qib_fs.c
32589@@ -267,6 +267,8 @@ static const struct file_operations qsfp_ops[] = {
32590 };
32591
32592 static ssize_t flash_read(struct file *file, char __user *buf,
32593+ size_t count, loff_t *ppos) __size_overflow(3);
32594+static ssize_t flash_read(struct file *file, char __user *buf,
32595 size_t count, loff_t *ppos)
32596 {
32597 struct qib_devdata *dd;
32598diff --git a/drivers/input/gameport/gameport.c b/drivers/input/gameport/gameport.c
32599index c351aa4..e6967c2 100644
32600--- a/drivers/input/gameport/gameport.c
32601+++ b/drivers/input/gameport/gameport.c
32602@@ -488,14 +488,14 @@ EXPORT_SYMBOL(gameport_set_phys);
32603 */
32604 static void gameport_init_port(struct gameport *gameport)
32605 {
32606- static atomic_t gameport_no = ATOMIC_INIT(0);
32607+ static atomic_unchecked_t gameport_no = ATOMIC_INIT(0);
32608
32609 __module_get(THIS_MODULE);
32610
32611 mutex_init(&gameport->drv_mutex);
32612 device_initialize(&gameport->dev);
32613 dev_set_name(&gameport->dev, "gameport%lu",
32614- (unsigned long)atomic_inc_return(&gameport_no) - 1);
32615+ (unsigned long)atomic_inc_return_unchecked(&gameport_no) - 1);
32616 gameport->dev.bus = &gameport_bus;
32617 gameport->dev.release = gameport_release_port;
32618 if (gameport->parent)
32619diff --git a/drivers/input/input.c b/drivers/input/input.c
32620index da38d97..2aa0b79 100644
32621--- a/drivers/input/input.c
32622+++ b/drivers/input/input.c
32623@@ -1814,7 +1814,7 @@ static void input_cleanse_bitmasks(struct input_dev *dev)
32624 */
32625 int input_register_device(struct input_dev *dev)
32626 {
32627- static atomic_t input_no = ATOMIC_INIT(0);
32628+ static atomic_unchecked_t input_no = ATOMIC_INIT(0);
32629 struct input_handler *handler;
32630 const char *path;
32631 int error;
32632@@ -1851,7 +1851,7 @@ int input_register_device(struct input_dev *dev)
32633 dev->setkeycode = input_default_setkeycode;
32634
32635 dev_set_name(&dev->dev, "input%ld",
32636- (unsigned long) atomic_inc_return(&input_no) - 1);
32637+ (unsigned long) atomic_inc_return_unchecked(&input_no) - 1);
32638
32639 error = device_add(&dev->dev);
32640 if (error)
32641diff --git a/drivers/input/joystick/sidewinder.c b/drivers/input/joystick/sidewinder.c
32642index b8d8611..7a4a04b 100644
32643--- a/drivers/input/joystick/sidewinder.c
32644+++ b/drivers/input/joystick/sidewinder.c
32645@@ -30,6 +30,7 @@
32646 #include <linux/kernel.h>
32647 #include <linux/module.h>
32648 #include <linux/slab.h>
32649+#include <linux/sched.h>
32650 #include <linux/init.h>
32651 #include <linux/input.h>
32652 #include <linux/gameport.h>
32653diff --git a/drivers/input/joystick/xpad.c b/drivers/input/joystick/xpad.c
32654index d728875..844c89b 100644
32655--- a/drivers/input/joystick/xpad.c
32656+++ b/drivers/input/joystick/xpad.c
32657@@ -710,7 +710,7 @@ static void xpad_led_set(struct led_classdev *led_cdev,
32658
32659 static int xpad_led_probe(struct usb_xpad *xpad)
32660 {
32661- static atomic_t led_seq = ATOMIC_INIT(0);
32662+ static atomic_unchecked_t led_seq = ATOMIC_INIT(0);
32663 long led_no;
32664 struct xpad_led *led;
32665 struct led_classdev *led_cdev;
32666@@ -723,7 +723,7 @@ static int xpad_led_probe(struct usb_xpad *xpad)
32667 if (!led)
32668 return -ENOMEM;
32669
32670- led_no = (long)atomic_inc_return(&led_seq) - 1;
32671+ led_no = (long)atomic_inc_return_unchecked(&led_seq) - 1;
32672
32673 snprintf(led->name, sizeof(led->name), "xpad%ld", led_no);
32674 led->xpad = xpad;
32675diff --git a/drivers/input/mousedev.c b/drivers/input/mousedev.c
32676index 0110b5a..d3ad144 100644
32677--- a/drivers/input/mousedev.c
32678+++ b/drivers/input/mousedev.c
32679@@ -763,7 +763,7 @@ static ssize_t mousedev_read(struct file *file, char __user *buffer,
32680
32681 spin_unlock_irq(&client->packet_lock);
32682
32683- if (copy_to_user(buffer, data, count))
32684+ if (count > sizeof(data) || copy_to_user(buffer, data, count))
32685 return -EFAULT;
32686
32687 return count;
32688diff --git a/drivers/input/serio/serio.c b/drivers/input/serio/serio.c
32689index ba70058..571d25d 100644
32690--- a/drivers/input/serio/serio.c
32691+++ b/drivers/input/serio/serio.c
32692@@ -497,7 +497,7 @@ static void serio_release_port(struct device *dev)
32693 */
32694 static void serio_init_port(struct serio *serio)
32695 {
32696- static atomic_t serio_no = ATOMIC_INIT(0);
32697+ static atomic_unchecked_t serio_no = ATOMIC_INIT(0);
32698
32699 __module_get(THIS_MODULE);
32700
32701@@ -508,7 +508,7 @@ static void serio_init_port(struct serio *serio)
32702 mutex_init(&serio->drv_mutex);
32703 device_initialize(&serio->dev);
32704 dev_set_name(&serio->dev, "serio%ld",
32705- (long)atomic_inc_return(&serio_no) - 1);
32706+ (long)atomic_inc_return_unchecked(&serio_no) - 1);
32707 serio->dev.bus = &serio_bus;
32708 serio->dev.release = serio_release_port;
32709 serio->dev.groups = serio_device_attr_groups;
32710diff --git a/drivers/isdn/capi/capi.c b/drivers/isdn/capi/capi.c
32711index e44933d..9ba484a 100644
32712--- a/drivers/isdn/capi/capi.c
32713+++ b/drivers/isdn/capi/capi.c
32714@@ -83,8 +83,8 @@ struct capiminor {
32715
32716 struct capi20_appl *ap;
32717 u32 ncci;
32718- atomic_t datahandle;
32719- atomic_t msgid;
32720+ atomic_unchecked_t datahandle;
32721+ atomic_unchecked_t msgid;
32722
32723 struct tty_port port;
32724 int ttyinstop;
32725@@ -397,7 +397,7 @@ gen_data_b3_resp_for(struct capiminor *mp, struct sk_buff *skb)
32726 capimsg_setu16(s, 2, mp->ap->applid);
32727 capimsg_setu8 (s, 4, CAPI_DATA_B3);
32728 capimsg_setu8 (s, 5, CAPI_RESP);
32729- capimsg_setu16(s, 6, atomic_inc_return(&mp->msgid));
32730+ capimsg_setu16(s, 6, atomic_inc_return_unchecked(&mp->msgid));
32731 capimsg_setu32(s, 8, mp->ncci);
32732 capimsg_setu16(s, 12, datahandle);
32733 }
32734@@ -518,14 +518,14 @@ static void handle_minor_send(struct capiminor *mp)
32735 mp->outbytes -= len;
32736 spin_unlock_bh(&mp->outlock);
32737
32738- datahandle = atomic_inc_return(&mp->datahandle);
32739+ datahandle = atomic_inc_return_unchecked(&mp->datahandle);
32740 skb_push(skb, CAPI_DATA_B3_REQ_LEN);
32741 memset(skb->data, 0, CAPI_DATA_B3_REQ_LEN);
32742 capimsg_setu16(skb->data, 0, CAPI_DATA_B3_REQ_LEN);
32743 capimsg_setu16(skb->data, 2, mp->ap->applid);
32744 capimsg_setu8 (skb->data, 4, CAPI_DATA_B3);
32745 capimsg_setu8 (skb->data, 5, CAPI_REQ);
32746- capimsg_setu16(skb->data, 6, atomic_inc_return(&mp->msgid));
32747+ capimsg_setu16(skb->data, 6, atomic_inc_return_unchecked(&mp->msgid));
32748 capimsg_setu32(skb->data, 8, mp->ncci); /* NCCI */
32749 capimsg_setu32(skb->data, 12, (u32)(long)skb->data);/* Data32 */
32750 capimsg_setu16(skb->data, 16, len); /* Data length */
32751diff --git a/drivers/isdn/gigaset/common.c b/drivers/isdn/gigaset/common.c
32752index db621db..825ea1a 100644
32753--- a/drivers/isdn/gigaset/common.c
32754+++ b/drivers/isdn/gigaset/common.c
32755@@ -723,7 +723,7 @@ struct cardstate *gigaset_initcs(struct gigaset_driver *drv, int channels,
32756 cs->commands_pending = 0;
32757 cs->cur_at_seq = 0;
32758 cs->gotfwver = -1;
32759- cs->open_count = 0;
32760+ local_set(&cs->open_count, 0);
32761 cs->dev = NULL;
32762 cs->tty = NULL;
32763 cs->tty_dev = NULL;
32764diff --git a/drivers/isdn/gigaset/gigaset.h b/drivers/isdn/gigaset/gigaset.h
32765index 212efaf..f187c6b 100644
32766--- a/drivers/isdn/gigaset/gigaset.h
32767+++ b/drivers/isdn/gigaset/gigaset.h
32768@@ -35,6 +35,7 @@
32769 #include <linux/tty_driver.h>
32770 #include <linux/list.h>
32771 #include <linux/atomic.h>
32772+#include <asm/local.h>
32773
32774 #define GIG_VERSION {0, 5, 0, 0}
32775 #define GIG_COMPAT {0, 4, 0, 0}
32776@@ -433,7 +434,7 @@ struct cardstate {
32777 spinlock_t cmdlock;
32778 unsigned curlen, cmdbytes;
32779
32780- unsigned open_count;
32781+ local_t open_count;
32782 struct tty_struct *tty;
32783 struct tasklet_struct if_wake_tasklet;
32784 unsigned control_state;
32785diff --git a/drivers/isdn/gigaset/interface.c b/drivers/isdn/gigaset/interface.c
32786index ee0a549..a7c9798 100644
32787--- a/drivers/isdn/gigaset/interface.c
32788+++ b/drivers/isdn/gigaset/interface.c
32789@@ -163,9 +163,7 @@ static int if_open(struct tty_struct *tty, struct file *filp)
32790 }
32791 tty->driver_data = cs;
32792
32793- ++cs->open_count;
32794-
32795- if (cs->open_count == 1) {
32796+ if (local_inc_return(&cs->open_count) == 1) {
32797 spin_lock_irqsave(&cs->lock, flags);
32798 cs->tty = tty;
32799 spin_unlock_irqrestore(&cs->lock, flags);
32800@@ -193,10 +191,10 @@ static void if_close(struct tty_struct *tty, struct file *filp)
32801
32802 if (!cs->connected)
32803 gig_dbg(DEBUG_IF, "not connected"); /* nothing to do */
32804- else if (!cs->open_count)
32805+ else if (!local_read(&cs->open_count))
32806 dev_warn(cs->dev, "%s: device not opened\n", __func__);
32807 else {
32808- if (!--cs->open_count) {
32809+ if (!local_dec_return(&cs->open_count)) {
32810 spin_lock_irqsave(&cs->lock, flags);
32811 cs->tty = NULL;
32812 spin_unlock_irqrestore(&cs->lock, flags);
32813@@ -231,7 +229,7 @@ static int if_ioctl(struct tty_struct *tty,
32814 if (!cs->connected) {
32815 gig_dbg(DEBUG_IF, "not connected");
32816 retval = -ENODEV;
32817- } else if (!cs->open_count)
32818+ } else if (!local_read(&cs->open_count))
32819 dev_warn(cs->dev, "%s: device not opened\n", __func__);
32820 else {
32821 retval = 0;
32822@@ -361,7 +359,7 @@ static int if_write(struct tty_struct *tty, const unsigned char *buf, int count)
32823 retval = -ENODEV;
32824 goto done;
32825 }
32826- if (!cs->open_count) {
32827+ if (!local_read(&cs->open_count)) {
32828 dev_warn(cs->dev, "%s: device not opened\n", __func__);
32829 retval = -ENODEV;
32830 goto done;
32831@@ -414,7 +412,7 @@ static int if_write_room(struct tty_struct *tty)
32832 if (!cs->connected) {
32833 gig_dbg(DEBUG_IF, "not connected");
32834 retval = -ENODEV;
32835- } else if (!cs->open_count)
32836+ } else if (!local_read(&cs->open_count))
32837 dev_warn(cs->dev, "%s: device not opened\n", __func__);
32838 else if (cs->mstate != MS_LOCKED) {
32839 dev_warn(cs->dev, "can't write to unlocked device\n");
32840@@ -444,7 +442,7 @@ static int if_chars_in_buffer(struct tty_struct *tty)
32841
32842 if (!cs->connected)
32843 gig_dbg(DEBUG_IF, "not connected");
32844- else if (!cs->open_count)
32845+ else if (!local_read(&cs->open_count))
32846 dev_warn(cs->dev, "%s: device not opened\n", __func__);
32847 else if (cs->mstate != MS_LOCKED)
32848 dev_warn(cs->dev, "can't write to unlocked device\n");
32849@@ -472,7 +470,7 @@ static void if_throttle(struct tty_struct *tty)
32850
32851 if (!cs->connected)
32852 gig_dbg(DEBUG_IF, "not connected"); /* nothing to do */
32853- else if (!cs->open_count)
32854+ else if (!local_read(&cs->open_count))
32855 dev_warn(cs->dev, "%s: device not opened\n", __func__);
32856 else
32857 gig_dbg(DEBUG_IF, "%s: not implemented\n", __func__);
32858@@ -496,7 +494,7 @@ static void if_unthrottle(struct tty_struct *tty)
32859
32860 if (!cs->connected)
32861 gig_dbg(DEBUG_IF, "not connected"); /* nothing to do */
32862- else if (!cs->open_count)
32863+ else if (!local_read(&cs->open_count))
32864 dev_warn(cs->dev, "%s: device not opened\n", __func__);
32865 else
32866 gig_dbg(DEBUG_IF, "%s: not implemented\n", __func__);
32867@@ -527,7 +525,7 @@ static void if_set_termios(struct tty_struct *tty, struct ktermios *old)
32868 goto out;
32869 }
32870
32871- if (!cs->open_count) {
32872+ if (!local_read(&cs->open_count)) {
32873 dev_warn(cs->dev, "%s: device not opened\n", __func__);
32874 goto out;
32875 }
32876diff --git a/drivers/isdn/hardware/avm/b1.c b/drivers/isdn/hardware/avm/b1.c
32877index 2a57da59..e7a12ed 100644
32878--- a/drivers/isdn/hardware/avm/b1.c
32879+++ b/drivers/isdn/hardware/avm/b1.c
32880@@ -176,7 +176,7 @@ int b1_load_t4file(avmcard *card, capiloaddatapart * t4file)
32881 }
32882 if (left) {
32883 if (t4file->user) {
32884- if (copy_from_user(buf, dp, left))
32885+ if (left > sizeof buf || copy_from_user(buf, dp, left))
32886 return -EFAULT;
32887 } else {
32888 memcpy(buf, dp, left);
32889@@ -224,7 +224,7 @@ int b1_load_config(avmcard *card, capiloaddatapart * config)
32890 }
32891 if (left) {
32892 if (config->user) {
32893- if (copy_from_user(buf, dp, left))
32894+ if (left > sizeof buf || copy_from_user(buf, dp, left))
32895 return -EFAULT;
32896 } else {
32897 memcpy(buf, dp, left);
32898diff --git a/drivers/isdn/hardware/eicon/divasync.h b/drivers/isdn/hardware/eicon/divasync.h
32899index 85784a7..a19ca98 100644
32900--- a/drivers/isdn/hardware/eicon/divasync.h
32901+++ b/drivers/isdn/hardware/eicon/divasync.h
32902@@ -146,7 +146,7 @@ typedef struct _diva_didd_add_adapter {
32903 } diva_didd_add_adapter_t;
32904 typedef struct _diva_didd_remove_adapter {
32905 IDI_CALL p_request;
32906-} diva_didd_remove_adapter_t;
32907+} __no_const diva_didd_remove_adapter_t;
32908 typedef struct _diva_didd_read_adapter_array {
32909 void * buffer;
32910 dword length;
32911diff --git a/drivers/isdn/hardware/eicon/xdi_adapter.h b/drivers/isdn/hardware/eicon/xdi_adapter.h
32912index a3bd163..8956575 100644
32913--- a/drivers/isdn/hardware/eicon/xdi_adapter.h
32914+++ b/drivers/isdn/hardware/eicon/xdi_adapter.h
32915@@ -44,7 +44,7 @@ typedef struct _xdi_mbox_t {
32916 typedef struct _diva_os_idi_adapter_interface {
32917 diva_init_card_proc_t cleanup_adapter_proc;
32918 diva_cmd_card_proc_t cmd_proc;
32919-} diva_os_idi_adapter_interface_t;
32920+} __no_const diva_os_idi_adapter_interface_t;
32921
32922 typedef struct _diva_os_xdi_adapter {
32923 struct list_head link;
32924diff --git a/drivers/isdn/i4l/isdn_net.c b/drivers/isdn/i4l/isdn_net.c
32925index 2339d73..802ab87a 100644
32926--- a/drivers/isdn/i4l/isdn_net.c
32927+++ b/drivers/isdn/i4l/isdn_net.c
32928@@ -1901,7 +1901,7 @@ static int isdn_net_header(struct sk_buff *skb, struct net_device *dev,
32929 {
32930 isdn_net_local *lp = netdev_priv(dev);
32931 unsigned char *p;
32932- ushort len = 0;
32933+ int len = 0;
32934
32935 switch (lp->p_encap) {
32936 case ISDN_NET_ENCAP_ETHER:
32937diff --git a/drivers/isdn/icn/icn.c b/drivers/isdn/icn/icn.c
32938index 1f355bb..43f1fea 100644
32939--- a/drivers/isdn/icn/icn.c
32940+++ b/drivers/isdn/icn/icn.c
32941@@ -1045,7 +1045,7 @@ icn_writecmd(const u_char * buf, int len, int user, icn_card * card)
32942 if (count > len)
32943 count = len;
32944 if (user) {
32945- if (copy_from_user(msg, buf, count))
32946+ if (count > sizeof msg || copy_from_user(msg, buf, count))
32947 return -EFAULT;
32948 } else
32949 memcpy(msg, buf, count);
32950diff --git a/drivers/lguest/core.c b/drivers/lguest/core.c
32951index b5fdcb7..5b6c59f 100644
32952--- a/drivers/lguest/core.c
32953+++ b/drivers/lguest/core.c
32954@@ -92,9 +92,17 @@ static __init int map_switcher(void)
32955 * it's worked so far. The end address needs +1 because __get_vm_area
32956 * allocates an extra guard page, so we need space for that.
32957 */
32958+
32959+#if defined(CONFIG_MODULES) && defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
32960+ switcher_vma = __get_vm_area(TOTAL_SWITCHER_PAGES * PAGE_SIZE,
32961+ VM_ALLOC | VM_KERNEXEC, SWITCHER_ADDR, SWITCHER_ADDR
32962+ + (TOTAL_SWITCHER_PAGES+1) * PAGE_SIZE);
32963+#else
32964 switcher_vma = __get_vm_area(TOTAL_SWITCHER_PAGES * PAGE_SIZE,
32965 VM_ALLOC, SWITCHER_ADDR, SWITCHER_ADDR
32966 + (TOTAL_SWITCHER_PAGES+1) * PAGE_SIZE);
32967+#endif
32968+
32969 if (!switcher_vma) {
32970 err = -ENOMEM;
32971 printk("lguest: could not map switcher pages high\n");
32972@@ -119,7 +127,7 @@ static __init int map_switcher(void)
32973 * Now the Switcher is mapped at the right address, we can't fail!
32974 * Copy in the compiled-in Switcher code (from x86/switcher_32.S).
32975 */
32976- memcpy(switcher_vma->addr, start_switcher_text,
32977+ memcpy(switcher_vma->addr, ktla_ktva(start_switcher_text),
32978 end_switcher_text - start_switcher_text);
32979
32980 printk(KERN_INFO "lguest: mapped switcher at %p\n",
32981diff --git a/drivers/lguest/lguest_user.c b/drivers/lguest/lguest_user.c
32982index ff4a0bc..f5fdd9c 100644
32983--- a/drivers/lguest/lguest_user.c
32984+++ b/drivers/lguest/lguest_user.c
32985@@ -198,6 +198,7 @@ static int user_send_irq(struct lg_cpu *cpu, const unsigned long __user *input)
32986 * Once our Guest is initialized, the Launcher makes it run by reading
32987 * from /dev/lguest.
32988 */
32989+static ssize_t read(struct file *file, char __user *user, size_t size,loff_t*o) __size_overflow(3);
32990 static ssize_t read(struct file *file, char __user *user, size_t size,loff_t*o)
32991 {
32992 struct lguest *lg = file->private_data;
32993diff --git a/drivers/lguest/x86/core.c b/drivers/lguest/x86/core.c
32994index 65af42f..530c87a 100644
32995--- a/drivers/lguest/x86/core.c
32996+++ b/drivers/lguest/x86/core.c
32997@@ -59,7 +59,7 @@ static struct {
32998 /* Offset from where switcher.S was compiled to where we've copied it */
32999 static unsigned long switcher_offset(void)
33000 {
33001- return SWITCHER_ADDR - (unsigned long)start_switcher_text;
33002+ return SWITCHER_ADDR - (unsigned long)ktla_ktva(start_switcher_text);
33003 }
33004
33005 /* This cpu's struct lguest_pages. */
33006@@ -100,7 +100,13 @@ static void copy_in_guest_info(struct lg_cpu *cpu, struct lguest_pages *pages)
33007 * These copies are pretty cheap, so we do them unconditionally: */
33008 /* Save the current Host top-level page directory.
33009 */
33010+
33011+#ifdef CONFIG_PAX_PER_CPU_PGD
33012+ pages->state.host_cr3 = read_cr3();
33013+#else
33014 pages->state.host_cr3 = __pa(current->mm->pgd);
33015+#endif
33016+
33017 /*
33018 * Set up the Guest's page tables to see this CPU's pages (and no
33019 * other CPU's pages).
33020@@ -472,7 +478,7 @@ void __init lguest_arch_host_init(void)
33021 * compiled-in switcher code and the high-mapped copy we just made.
33022 */
33023 for (i = 0; i < IDT_ENTRIES; i++)
33024- default_idt_entries[i] += switcher_offset();
33025+ default_idt_entries[i] = ktla_ktva(default_idt_entries[i]) + switcher_offset();
33026
33027 /*
33028 * Set up the Switcher's per-cpu areas.
33029@@ -555,7 +561,7 @@ void __init lguest_arch_host_init(void)
33030 * it will be undisturbed when we switch. To change %cs and jump we
33031 * need this structure to feed to Intel's "lcall" instruction.
33032 */
33033- lguest_entry.offset = (long)switch_to_guest + switcher_offset();
33034+ lguest_entry.offset = (long)ktla_ktva(switch_to_guest) + switcher_offset();
33035 lguest_entry.segment = LGUEST_CS;
33036
33037 /*
33038diff --git a/drivers/lguest/x86/switcher_32.S b/drivers/lguest/x86/switcher_32.S
33039index 40634b0..4f5855e 100644
33040--- a/drivers/lguest/x86/switcher_32.S
33041+++ b/drivers/lguest/x86/switcher_32.S
33042@@ -87,6 +87,7 @@
33043 #include <asm/page.h>
33044 #include <asm/segment.h>
33045 #include <asm/lguest.h>
33046+#include <asm/processor-flags.h>
33047
33048 // We mark the start of the code to copy
33049 // It's placed in .text tho it's never run here
33050@@ -149,6 +150,13 @@ ENTRY(switch_to_guest)
33051 // Changes type when we load it: damn Intel!
33052 // For after we switch over our page tables
33053 // That entry will be read-only: we'd crash.
33054+
33055+#ifdef CONFIG_PAX_KERNEXEC
33056+ mov %cr0, %edx
33057+ xor $X86_CR0_WP, %edx
33058+ mov %edx, %cr0
33059+#endif
33060+
33061 movl $(GDT_ENTRY_TSS*8), %edx
33062 ltr %dx
33063
33064@@ -157,9 +165,15 @@ ENTRY(switch_to_guest)
33065 // Let's clear it again for our return.
33066 // The GDT descriptor of the Host
33067 // Points to the table after two "size" bytes
33068- movl (LGUEST_PAGES_host_gdt_desc+2)(%eax), %edx
33069+ movl (LGUEST_PAGES_host_gdt_desc+2)(%eax), %eax
33070 // Clear "used" from type field (byte 5, bit 2)
33071- andb $0xFD, (GDT_ENTRY_TSS*8 + 5)(%edx)
33072+ andb $0xFD, (GDT_ENTRY_TSS*8 + 5)(%eax)
33073+
33074+#ifdef CONFIG_PAX_KERNEXEC
33075+ mov %cr0, %eax
33076+ xor $X86_CR0_WP, %eax
33077+ mov %eax, %cr0
33078+#endif
33079
33080 // Once our page table's switched, the Guest is live!
33081 // The Host fades as we run this final step.
33082@@ -295,13 +309,12 @@ deliver_to_host:
33083 // I consulted gcc, and it gave
33084 // These instructions, which I gladly credit:
33085 leal (%edx,%ebx,8), %eax
33086- movzwl (%eax),%edx
33087- movl 4(%eax), %eax
33088- xorw %ax, %ax
33089- orl %eax, %edx
33090+ movl 4(%eax), %edx
33091+ movw (%eax), %dx
33092 // Now the address of the handler's in %edx
33093 // We call it now: its "iret" drops us home.
33094- jmp *%edx
33095+ ljmp $__KERNEL_CS, $1f
33096+1: jmp *%edx
33097
33098 // Every interrupt can come to us here
33099 // But we must truly tell each apart.
33100diff --git a/drivers/macintosh/macio_asic.c b/drivers/macintosh/macio_asic.c
33101index 4daf9e5..b8d1d0f 100644
33102--- a/drivers/macintosh/macio_asic.c
33103+++ b/drivers/macintosh/macio_asic.c
33104@@ -748,7 +748,7 @@ static void __devexit macio_pci_remove(struct pci_dev* pdev)
33105 * MacIO is matched against any Apple ID, it's probe() function
33106 * will then decide wether it applies or not
33107 */
33108-static const struct pci_device_id __devinitdata pci_ids [] = { {
33109+static const struct pci_device_id __devinitconst pci_ids [] = { {
33110 .vendor = PCI_VENDOR_ID_APPLE,
33111 .device = PCI_ANY_ID,
33112 .subvendor = PCI_ANY_ID,
33113diff --git a/drivers/md/dm-ioctl.c b/drivers/md/dm-ioctl.c
33114index 1ce84ed..0fdd40a 100644
33115--- a/drivers/md/dm-ioctl.c
33116+++ b/drivers/md/dm-ioctl.c
33117@@ -1589,7 +1589,7 @@ static int validate_params(uint cmd, struct dm_ioctl *param)
33118 cmd == DM_LIST_VERSIONS_CMD)
33119 return 0;
33120
33121- if ((cmd == DM_DEV_CREATE_CMD)) {
33122+ if (cmd == DM_DEV_CREATE_CMD) {
33123 if (!*param->name) {
33124 DMWARN("name not supplied when creating device");
33125 return -EINVAL;
33126diff --git a/drivers/md/dm-raid1.c b/drivers/md/dm-raid1.c
33127index 9bfd057..01180bc 100644
33128--- a/drivers/md/dm-raid1.c
33129+++ b/drivers/md/dm-raid1.c
33130@@ -40,7 +40,7 @@ enum dm_raid1_error {
33131
33132 struct mirror {
33133 struct mirror_set *ms;
33134- atomic_t error_count;
33135+ atomic_unchecked_t error_count;
33136 unsigned long error_type;
33137 struct dm_dev *dev;
33138 sector_t offset;
33139@@ -185,7 +185,7 @@ static struct mirror *get_valid_mirror(struct mirror_set *ms)
33140 struct mirror *m;
33141
33142 for (m = ms->mirror; m < ms->mirror + ms->nr_mirrors; m++)
33143- if (!atomic_read(&m->error_count))
33144+ if (!atomic_read_unchecked(&m->error_count))
33145 return m;
33146
33147 return NULL;
33148@@ -217,7 +217,7 @@ static void fail_mirror(struct mirror *m, enum dm_raid1_error error_type)
33149 * simple way to tell if a device has encountered
33150 * errors.
33151 */
33152- atomic_inc(&m->error_count);
33153+ atomic_inc_unchecked(&m->error_count);
33154
33155 if (test_and_set_bit(error_type, &m->error_type))
33156 return;
33157@@ -408,7 +408,7 @@ static struct mirror *choose_mirror(struct mirror_set *ms, sector_t sector)
33158 struct mirror *m = get_default_mirror(ms);
33159
33160 do {
33161- if (likely(!atomic_read(&m->error_count)))
33162+ if (likely(!atomic_read_unchecked(&m->error_count)))
33163 return m;
33164
33165 if (m-- == ms->mirror)
33166@@ -422,7 +422,7 @@ static int default_ok(struct mirror *m)
33167 {
33168 struct mirror *default_mirror = get_default_mirror(m->ms);
33169
33170- return !atomic_read(&default_mirror->error_count);
33171+ return !atomic_read_unchecked(&default_mirror->error_count);
33172 }
33173
33174 static int mirror_available(struct mirror_set *ms, struct bio *bio)
33175@@ -559,7 +559,7 @@ static void do_reads(struct mirror_set *ms, struct bio_list *reads)
33176 */
33177 if (likely(region_in_sync(ms, region, 1)))
33178 m = choose_mirror(ms, bio->bi_sector);
33179- else if (m && atomic_read(&m->error_count))
33180+ else if (m && atomic_read_unchecked(&m->error_count))
33181 m = NULL;
33182
33183 if (likely(m))
33184@@ -937,7 +937,7 @@ static int get_mirror(struct mirror_set *ms, struct dm_target *ti,
33185 }
33186
33187 ms->mirror[mirror].ms = ms;
33188- atomic_set(&(ms->mirror[mirror].error_count), 0);
33189+ atomic_set_unchecked(&(ms->mirror[mirror].error_count), 0);
33190 ms->mirror[mirror].error_type = 0;
33191 ms->mirror[mirror].offset = offset;
33192
33193@@ -1347,7 +1347,7 @@ static void mirror_resume(struct dm_target *ti)
33194 */
33195 static char device_status_char(struct mirror *m)
33196 {
33197- if (!atomic_read(&(m->error_count)))
33198+ if (!atomic_read_unchecked(&(m->error_count)))
33199 return 'A';
33200
33201 return (test_bit(DM_RAID1_FLUSH_ERROR, &(m->error_type))) ? 'F' :
33202diff --git a/drivers/md/dm-stripe.c b/drivers/md/dm-stripe.c
33203index 3d80cf0..b77cc47 100644
33204--- a/drivers/md/dm-stripe.c
33205+++ b/drivers/md/dm-stripe.c
33206@@ -20,7 +20,7 @@ struct stripe {
33207 struct dm_dev *dev;
33208 sector_t physical_start;
33209
33210- atomic_t error_count;
33211+ atomic_unchecked_t error_count;
33212 };
33213
33214 struct stripe_c {
33215@@ -192,7 +192,7 @@ static int stripe_ctr(struct dm_target *ti, unsigned int argc, char **argv)
33216 kfree(sc);
33217 return r;
33218 }
33219- atomic_set(&(sc->stripe[i].error_count), 0);
33220+ atomic_set_unchecked(&(sc->stripe[i].error_count), 0);
33221 }
33222
33223 ti->private = sc;
33224@@ -314,7 +314,7 @@ static int stripe_status(struct dm_target *ti,
33225 DMEMIT("%d ", sc->stripes);
33226 for (i = 0; i < sc->stripes; i++) {
33227 DMEMIT("%s ", sc->stripe[i].dev->name);
33228- buffer[i] = atomic_read(&(sc->stripe[i].error_count)) ?
33229+ buffer[i] = atomic_read_unchecked(&(sc->stripe[i].error_count)) ?
33230 'D' : 'A';
33231 }
33232 buffer[i] = '\0';
33233@@ -361,8 +361,8 @@ static int stripe_end_io(struct dm_target *ti, struct bio *bio,
33234 */
33235 for (i = 0; i < sc->stripes; i++)
33236 if (!strcmp(sc->stripe[i].dev->name, major_minor)) {
33237- atomic_inc(&(sc->stripe[i].error_count));
33238- if (atomic_read(&(sc->stripe[i].error_count)) <
33239+ atomic_inc_unchecked(&(sc->stripe[i].error_count));
33240+ if (atomic_read_unchecked(&(sc->stripe[i].error_count)) <
33241 DM_IO_ERROR_THRESHOLD)
33242 schedule_work(&sc->trigger_event);
33243 }
33244diff --git a/drivers/md/dm-table.c b/drivers/md/dm-table.c
33245index 8e91321..fd17aef 100644
33246--- a/drivers/md/dm-table.c
33247+++ b/drivers/md/dm-table.c
33248@@ -391,7 +391,7 @@ static int device_area_is_invalid(struct dm_target *ti, struct dm_dev *dev,
33249 if (!dev_size)
33250 return 0;
33251
33252- if ((start >= dev_size) || (start + len > dev_size)) {
33253+ if ((start >= dev_size) || (len > dev_size - start)) {
33254 DMWARN("%s: %s too small for target: "
33255 "start=%llu, len=%llu, dev_size=%llu",
33256 dm_device_name(ti->table->md), bdevname(bdev, b),
33257diff --git a/drivers/md/dm-thin-metadata.c b/drivers/md/dm-thin-metadata.c
33258index 237571a..fb6d19b 100644
33259--- a/drivers/md/dm-thin-metadata.c
33260+++ b/drivers/md/dm-thin-metadata.c
33261@@ -432,7 +432,7 @@ static int init_pmd(struct dm_pool_metadata *pmd,
33262
33263 pmd->info.tm = tm;
33264 pmd->info.levels = 2;
33265- pmd->info.value_type.context = pmd->data_sm;
33266+ pmd->info.value_type.context = (dm_space_map_no_const *)pmd->data_sm;
33267 pmd->info.value_type.size = sizeof(__le64);
33268 pmd->info.value_type.inc = data_block_inc;
33269 pmd->info.value_type.dec = data_block_dec;
33270@@ -451,7 +451,7 @@ static int init_pmd(struct dm_pool_metadata *pmd,
33271
33272 pmd->bl_info.tm = tm;
33273 pmd->bl_info.levels = 1;
33274- pmd->bl_info.value_type.context = pmd->data_sm;
33275+ pmd->bl_info.value_type.context = (dm_space_map_no_const *)pmd->data_sm;
33276 pmd->bl_info.value_type.size = sizeof(__le64);
33277 pmd->bl_info.value_type.inc = data_block_inc;
33278 pmd->bl_info.value_type.dec = data_block_dec;
33279diff --git a/drivers/md/dm.c b/drivers/md/dm.c
33280index 4720f68..78d1df7 100644
33281--- a/drivers/md/dm.c
33282+++ b/drivers/md/dm.c
33283@@ -177,9 +177,9 @@ struct mapped_device {
33284 /*
33285 * Event handling.
33286 */
33287- atomic_t event_nr;
33288+ atomic_unchecked_t event_nr;
33289 wait_queue_head_t eventq;
33290- atomic_t uevent_seq;
33291+ atomic_unchecked_t uevent_seq;
33292 struct list_head uevent_list;
33293 spinlock_t uevent_lock; /* Protect access to uevent_list */
33294
33295@@ -1845,8 +1845,8 @@ static struct mapped_device *alloc_dev(int minor)
33296 rwlock_init(&md->map_lock);
33297 atomic_set(&md->holders, 1);
33298 atomic_set(&md->open_count, 0);
33299- atomic_set(&md->event_nr, 0);
33300- atomic_set(&md->uevent_seq, 0);
33301+ atomic_set_unchecked(&md->event_nr, 0);
33302+ atomic_set_unchecked(&md->uevent_seq, 0);
33303 INIT_LIST_HEAD(&md->uevent_list);
33304 spin_lock_init(&md->uevent_lock);
33305
33306@@ -1980,7 +1980,7 @@ static void event_callback(void *context)
33307
33308 dm_send_uevents(&uevents, &disk_to_dev(md->disk)->kobj);
33309
33310- atomic_inc(&md->event_nr);
33311+ atomic_inc_unchecked(&md->event_nr);
33312 wake_up(&md->eventq);
33313 }
33314
33315@@ -2622,18 +2622,18 @@ int dm_kobject_uevent(struct mapped_device *md, enum kobject_action action,
33316
33317 uint32_t dm_next_uevent_seq(struct mapped_device *md)
33318 {
33319- return atomic_add_return(1, &md->uevent_seq);
33320+ return atomic_add_return_unchecked(1, &md->uevent_seq);
33321 }
33322
33323 uint32_t dm_get_event_nr(struct mapped_device *md)
33324 {
33325- return atomic_read(&md->event_nr);
33326+ return atomic_read_unchecked(&md->event_nr);
33327 }
33328
33329 int dm_wait_event(struct mapped_device *md, int event_nr)
33330 {
33331 return wait_event_interruptible(md->eventq,
33332- (event_nr != atomic_read(&md->event_nr)));
33333+ (event_nr != atomic_read_unchecked(&md->event_nr)));
33334 }
33335
33336 void dm_uevent_add(struct mapped_device *md, struct list_head *elist)
33337diff --git a/drivers/md/md.c b/drivers/md/md.c
33338index f47f1f8..b7f559e 100644
33339--- a/drivers/md/md.c
33340+++ b/drivers/md/md.c
33341@@ -278,10 +278,10 @@ EXPORT_SYMBOL_GPL(md_trim_bio);
33342 * start build, activate spare
33343 */
33344 static DECLARE_WAIT_QUEUE_HEAD(md_event_waiters);
33345-static atomic_t md_event_count;
33346+static atomic_unchecked_t md_event_count;
33347 void md_new_event(struct mddev *mddev)
33348 {
33349- atomic_inc(&md_event_count);
33350+ atomic_inc_unchecked(&md_event_count);
33351 wake_up(&md_event_waiters);
33352 }
33353 EXPORT_SYMBOL_GPL(md_new_event);
33354@@ -291,7 +291,7 @@ EXPORT_SYMBOL_GPL(md_new_event);
33355 */
33356 static void md_new_event_inintr(struct mddev *mddev)
33357 {
33358- atomic_inc(&md_event_count);
33359+ atomic_inc_unchecked(&md_event_count);
33360 wake_up(&md_event_waiters);
33361 }
33362
33363@@ -1525,7 +1525,7 @@ static int super_1_load(struct md_rdev *rdev, struct md_rdev *refdev, int minor_
33364
33365 rdev->preferred_minor = 0xffff;
33366 rdev->data_offset = le64_to_cpu(sb->data_offset);
33367- atomic_set(&rdev->corrected_errors, le32_to_cpu(sb->cnt_corrected_read));
33368+ atomic_set_unchecked(&rdev->corrected_errors, le32_to_cpu(sb->cnt_corrected_read));
33369
33370 rdev->sb_size = le32_to_cpu(sb->max_dev) * 2 + 256;
33371 bmask = queue_logical_block_size(rdev->bdev->bd_disk->queue)-1;
33372@@ -1742,7 +1742,7 @@ static void super_1_sync(struct mddev *mddev, struct md_rdev *rdev)
33373 else
33374 sb->resync_offset = cpu_to_le64(0);
33375
33376- sb->cnt_corrected_read = cpu_to_le32(atomic_read(&rdev->corrected_errors));
33377+ sb->cnt_corrected_read = cpu_to_le32(atomic_read_unchecked(&rdev->corrected_errors));
33378
33379 sb->raid_disks = cpu_to_le32(mddev->raid_disks);
33380 sb->size = cpu_to_le64(mddev->dev_sectors);
33381@@ -2639,7 +2639,7 @@ __ATTR(state, S_IRUGO|S_IWUSR, state_show, state_store);
33382 static ssize_t
33383 errors_show(struct md_rdev *rdev, char *page)
33384 {
33385- return sprintf(page, "%d\n", atomic_read(&rdev->corrected_errors));
33386+ return sprintf(page, "%d\n", atomic_read_unchecked(&rdev->corrected_errors));
33387 }
33388
33389 static ssize_t
33390@@ -2648,7 +2648,7 @@ errors_store(struct md_rdev *rdev, const char *buf, size_t len)
33391 char *e;
33392 unsigned long n = simple_strtoul(buf, &e, 10);
33393 if (*buf && (*e == 0 || *e == '\n')) {
33394- atomic_set(&rdev->corrected_errors, n);
33395+ atomic_set_unchecked(&rdev->corrected_errors, n);
33396 return len;
33397 }
33398 return -EINVAL;
33399@@ -3039,8 +3039,8 @@ int md_rdev_init(struct md_rdev *rdev)
33400 rdev->sb_loaded = 0;
33401 rdev->bb_page = NULL;
33402 atomic_set(&rdev->nr_pending, 0);
33403- atomic_set(&rdev->read_errors, 0);
33404- atomic_set(&rdev->corrected_errors, 0);
33405+ atomic_set_unchecked(&rdev->read_errors, 0);
33406+ atomic_set_unchecked(&rdev->corrected_errors, 0);
33407
33408 INIT_LIST_HEAD(&rdev->same_set);
33409 init_waitqueue_head(&rdev->blocked_wait);
33410@@ -6683,7 +6683,7 @@ static int md_seq_show(struct seq_file *seq, void *v)
33411
33412 spin_unlock(&pers_lock);
33413 seq_printf(seq, "\n");
33414- seq->poll_event = atomic_read(&md_event_count);
33415+ seq->poll_event = atomic_read_unchecked(&md_event_count);
33416 return 0;
33417 }
33418 if (v == (void*)2) {
33419@@ -6772,7 +6772,7 @@ static int md_seq_show(struct seq_file *seq, void *v)
33420 chunk_kb ? "KB" : "B");
33421 if (bitmap->file) {
33422 seq_printf(seq, ", file: ");
33423- seq_path(seq, &bitmap->file->f_path, " \t\n");
33424+ seq_path(seq, &bitmap->file->f_path, " \t\n\\");
33425 }
33426
33427 seq_printf(seq, "\n");
33428@@ -6803,7 +6803,7 @@ static int md_seq_open(struct inode *inode, struct file *file)
33429 return error;
33430
33431 seq = file->private_data;
33432- seq->poll_event = atomic_read(&md_event_count);
33433+ seq->poll_event = atomic_read_unchecked(&md_event_count);
33434 return error;
33435 }
33436
33437@@ -6817,7 +6817,7 @@ static unsigned int mdstat_poll(struct file *filp, poll_table *wait)
33438 /* always allow read */
33439 mask = POLLIN | POLLRDNORM;
33440
33441- if (seq->poll_event != atomic_read(&md_event_count))
33442+ if (seq->poll_event != atomic_read_unchecked(&md_event_count))
33443 mask |= POLLERR | POLLPRI;
33444 return mask;
33445 }
33446@@ -6861,7 +6861,7 @@ static int is_mddev_idle(struct mddev *mddev, int init)
33447 struct gendisk *disk = rdev->bdev->bd_contains->bd_disk;
33448 curr_events = (int)part_stat_read(&disk->part0, sectors[0]) +
33449 (int)part_stat_read(&disk->part0, sectors[1]) -
33450- atomic_read(&disk->sync_io);
33451+ atomic_read_unchecked(&disk->sync_io);
33452 /* sync IO will cause sync_io to increase before the disk_stats
33453 * as sync_io is counted when a request starts, and
33454 * disk_stats is counted when it completes.
33455diff --git a/drivers/md/md.h b/drivers/md/md.h
33456index cf742d9..7c7c745 100644
33457--- a/drivers/md/md.h
33458+++ b/drivers/md/md.h
33459@@ -120,13 +120,13 @@ struct md_rdev {
33460 * only maintained for arrays that
33461 * support hot removal
33462 */
33463- atomic_t read_errors; /* number of consecutive read errors that
33464+ atomic_unchecked_t read_errors; /* number of consecutive read errors that
33465 * we have tried to ignore.
33466 */
33467 struct timespec last_read_error; /* monotonic time since our
33468 * last read error
33469 */
33470- atomic_t corrected_errors; /* number of corrected read errors,
33471+ atomic_unchecked_t corrected_errors; /* number of corrected read errors,
33472 * for reporting to userspace and storing
33473 * in superblock.
33474 */
33475@@ -410,7 +410,7 @@ static inline void rdev_dec_pending(struct md_rdev *rdev, struct mddev *mddev)
33476
33477 static inline void md_sync_acct(struct block_device *bdev, unsigned long nr_sectors)
33478 {
33479- atomic_add(nr_sectors, &bdev->bd_contains->bd_disk->sync_io);
33480+ atomic_add_unchecked(nr_sectors, &bdev->bd_contains->bd_disk->sync_io);
33481 }
33482
33483 struct md_personality
33484diff --git a/drivers/md/persistent-data/dm-space-map-checker.c b/drivers/md/persistent-data/dm-space-map-checker.c
33485index 50ed53b..4f29d7d 100644
33486--- a/drivers/md/persistent-data/dm-space-map-checker.c
33487+++ b/drivers/md/persistent-data/dm-space-map-checker.c
33488@@ -159,7 +159,7 @@ static void ca_destroy(struct count_array *ca)
33489 /*----------------------------------------------------------------*/
33490
33491 struct sm_checker {
33492- struct dm_space_map sm;
33493+ dm_space_map_no_const sm;
33494
33495 struct count_array old_counts;
33496 struct count_array counts;
33497diff --git a/drivers/md/persistent-data/dm-space-map-disk.c b/drivers/md/persistent-data/dm-space-map-disk.c
33498index fc469ba..2d91555 100644
33499--- a/drivers/md/persistent-data/dm-space-map-disk.c
33500+++ b/drivers/md/persistent-data/dm-space-map-disk.c
33501@@ -23,7 +23,7 @@
33502 * Space map interface.
33503 */
33504 struct sm_disk {
33505- struct dm_space_map sm;
33506+ dm_space_map_no_const sm;
33507
33508 struct ll_disk ll;
33509 struct ll_disk old_ll;
33510diff --git a/drivers/md/persistent-data/dm-space-map-metadata.c b/drivers/md/persistent-data/dm-space-map-metadata.c
33511index e89ae5e..062e4c2 100644
33512--- a/drivers/md/persistent-data/dm-space-map-metadata.c
33513+++ b/drivers/md/persistent-data/dm-space-map-metadata.c
33514@@ -43,7 +43,7 @@ struct block_op {
33515 };
33516
33517 struct sm_metadata {
33518- struct dm_space_map sm;
33519+ dm_space_map_no_const sm;
33520
33521 struct ll_disk ll;
33522 struct ll_disk old_ll;
33523diff --git a/drivers/md/persistent-data/dm-space-map.h b/drivers/md/persistent-data/dm-space-map.h
33524index 1cbfc6b..56e1dbb 100644
33525--- a/drivers/md/persistent-data/dm-space-map.h
33526+++ b/drivers/md/persistent-data/dm-space-map.h
33527@@ -60,6 +60,7 @@ struct dm_space_map {
33528 int (*root_size)(struct dm_space_map *sm, size_t *result);
33529 int (*copy_root)(struct dm_space_map *sm, void *copy_to_here_le, size_t len);
33530 };
33531+typedef struct dm_space_map __no_const dm_space_map_no_const;
33532
33533 /*----------------------------------------------------------------*/
33534
33535diff --git a/drivers/md/raid1.c b/drivers/md/raid1.c
33536index 7d9e071..015b1d5 100644
33537--- a/drivers/md/raid1.c
33538+++ b/drivers/md/raid1.c
33539@@ -1568,7 +1568,7 @@ static int fix_sync_read_error(struct r1bio *r1_bio)
33540 if (r1_sync_page_io(rdev, sect, s,
33541 bio->bi_io_vec[idx].bv_page,
33542 READ) != 0)
33543- atomic_add(s, &rdev->corrected_errors);
33544+ atomic_add_unchecked(s, &rdev->corrected_errors);
33545 }
33546 sectors -= s;
33547 sect += s;
33548@@ -1781,7 +1781,7 @@ static void fix_read_error(struct r1conf *conf, int read_disk,
33549 test_bit(In_sync, &rdev->flags)) {
33550 if (r1_sync_page_io(rdev, sect, s,
33551 conf->tmppage, READ)) {
33552- atomic_add(s, &rdev->corrected_errors);
33553+ atomic_add_unchecked(s, &rdev->corrected_errors);
33554 printk(KERN_INFO
33555 "md/raid1:%s: read error corrected "
33556 "(%d sectors at %llu on %s)\n",
33557diff --git a/drivers/md/raid10.c b/drivers/md/raid10.c
33558index 685ddf3..955b087 100644
33559--- a/drivers/md/raid10.c
33560+++ b/drivers/md/raid10.c
33561@@ -1440,7 +1440,7 @@ static void end_sync_read(struct bio *bio, int error)
33562 /* The write handler will notice the lack of
33563 * R10BIO_Uptodate and record any errors etc
33564 */
33565- atomic_add(r10_bio->sectors,
33566+ atomic_add_unchecked(r10_bio->sectors,
33567 &conf->mirrors[d].rdev->corrected_errors);
33568
33569 /* for reconstruct, we always reschedule after a read.
33570@@ -1740,7 +1740,7 @@ static void check_decay_read_errors(struct mddev *mddev, struct md_rdev *rdev)
33571 {
33572 struct timespec cur_time_mon;
33573 unsigned long hours_since_last;
33574- unsigned int read_errors = atomic_read(&rdev->read_errors);
33575+ unsigned int read_errors = atomic_read_unchecked(&rdev->read_errors);
33576
33577 ktime_get_ts(&cur_time_mon);
33578
33579@@ -1762,9 +1762,9 @@ static void check_decay_read_errors(struct mddev *mddev, struct md_rdev *rdev)
33580 * overflowing the shift of read_errors by hours_since_last.
33581 */
33582 if (hours_since_last >= 8 * sizeof(read_errors))
33583- atomic_set(&rdev->read_errors, 0);
33584+ atomic_set_unchecked(&rdev->read_errors, 0);
33585 else
33586- atomic_set(&rdev->read_errors, read_errors >> hours_since_last);
33587+ atomic_set_unchecked(&rdev->read_errors, read_errors >> hours_since_last);
33588 }
33589
33590 static int r10_sync_page_io(struct md_rdev *rdev, sector_t sector,
33591@@ -1814,8 +1814,8 @@ static void fix_read_error(struct r10conf *conf, struct mddev *mddev, struct r10
33592 return;
33593
33594 check_decay_read_errors(mddev, rdev);
33595- atomic_inc(&rdev->read_errors);
33596- if (atomic_read(&rdev->read_errors) > max_read_errors) {
33597+ atomic_inc_unchecked(&rdev->read_errors);
33598+ if (atomic_read_unchecked(&rdev->read_errors) > max_read_errors) {
33599 char b[BDEVNAME_SIZE];
33600 bdevname(rdev->bdev, b);
33601
33602@@ -1823,7 +1823,7 @@ static void fix_read_error(struct r10conf *conf, struct mddev *mddev, struct r10
33603 "md/raid10:%s: %s: Raid device exceeded "
33604 "read_error threshold [cur %d:max %d]\n",
33605 mdname(mddev), b,
33606- atomic_read(&rdev->read_errors), max_read_errors);
33607+ atomic_read_unchecked(&rdev->read_errors), max_read_errors);
33608 printk(KERN_NOTICE
33609 "md/raid10:%s: %s: Failing raid device\n",
33610 mdname(mddev), b);
33611@@ -1968,7 +1968,7 @@ static void fix_read_error(struct r10conf *conf, struct mddev *mddev, struct r10
33612 (unsigned long long)(
33613 sect + rdev->data_offset),
33614 bdevname(rdev->bdev, b));
33615- atomic_add(s, &rdev->corrected_errors);
33616+ atomic_add_unchecked(s, &rdev->corrected_errors);
33617 }
33618
33619 rdev_dec_pending(rdev, mddev);
33620diff --git a/drivers/md/raid5.c b/drivers/md/raid5.c
33621index 858fdbb..b2dac95 100644
33622--- a/drivers/md/raid5.c
33623+++ b/drivers/md/raid5.c
33624@@ -1610,19 +1610,19 @@ static void raid5_end_read_request(struct bio * bi, int error)
33625 (unsigned long long)(sh->sector
33626 + rdev->data_offset),
33627 bdevname(rdev->bdev, b));
33628- atomic_add(STRIPE_SECTORS, &rdev->corrected_errors);
33629+ atomic_add_unchecked(STRIPE_SECTORS, &rdev->corrected_errors);
33630 clear_bit(R5_ReadError, &sh->dev[i].flags);
33631 clear_bit(R5_ReWrite, &sh->dev[i].flags);
33632 }
33633- if (atomic_read(&conf->disks[i].rdev->read_errors))
33634- atomic_set(&conf->disks[i].rdev->read_errors, 0);
33635+ if (atomic_read_unchecked(&conf->disks[i].rdev->read_errors))
33636+ atomic_set_unchecked(&conf->disks[i].rdev->read_errors, 0);
33637 } else {
33638 const char *bdn = bdevname(conf->disks[i].rdev->bdev, b);
33639 int retry = 0;
33640 rdev = conf->disks[i].rdev;
33641
33642 clear_bit(R5_UPTODATE, &sh->dev[i].flags);
33643- atomic_inc(&rdev->read_errors);
33644+ atomic_inc_unchecked(&rdev->read_errors);
33645 if (conf->mddev->degraded >= conf->max_degraded)
33646 printk_ratelimited(
33647 KERN_WARNING
33648@@ -1642,7 +1642,7 @@ static void raid5_end_read_request(struct bio * bi, int error)
33649 (unsigned long long)(sh->sector
33650 + rdev->data_offset),
33651 bdn);
33652- else if (atomic_read(&rdev->read_errors)
33653+ else if (atomic_read_unchecked(&rdev->read_errors)
33654 > conf->max_nr_stripes)
33655 printk(KERN_WARNING
33656 "md/raid:%s: Too many read errors, failing device %s.\n",
33657diff --git a/drivers/media/dvb/ddbridge/ddbridge-core.c b/drivers/media/dvb/ddbridge/ddbridge-core.c
33658index ba9a643..e474ab5 100644
33659--- a/drivers/media/dvb/ddbridge/ddbridge-core.c
33660+++ b/drivers/media/dvb/ddbridge/ddbridge-core.c
33661@@ -1678,7 +1678,7 @@ static struct ddb_info ddb_v6 = {
33662 .subvendor = _subvend, .subdevice = _subdev, \
33663 .driver_data = (unsigned long)&_driverdata }
33664
33665-static const struct pci_device_id ddb_id_tbl[] __devinitdata = {
33666+static const struct pci_device_id ddb_id_tbl[] __devinitconst = {
33667 DDB_ID(DDVID, 0x0002, DDVID, 0x0001, ddb_octopus),
33668 DDB_ID(DDVID, 0x0003, DDVID, 0x0001, ddb_octopus),
33669 DDB_ID(DDVID, 0x0003, DDVID, 0x0002, ddb_octopus_le),
33670diff --git a/drivers/media/dvb/dvb-core/dvb_demux.h b/drivers/media/dvb/dvb-core/dvb_demux.h
33671index a7d876f..8c21b61 100644
33672--- a/drivers/media/dvb/dvb-core/dvb_demux.h
33673+++ b/drivers/media/dvb/dvb-core/dvb_demux.h
33674@@ -73,7 +73,7 @@ struct dvb_demux_feed {
33675 union {
33676 dmx_ts_cb ts;
33677 dmx_section_cb sec;
33678- } cb;
33679+ } __no_const cb;
33680
33681 struct dvb_demux *demux;
33682 void *priv;
33683diff --git a/drivers/media/dvb/dvb-core/dvbdev.c b/drivers/media/dvb/dvb-core/dvbdev.c
33684index f732877..d38c35a 100644
33685--- a/drivers/media/dvb/dvb-core/dvbdev.c
33686+++ b/drivers/media/dvb/dvb-core/dvbdev.c
33687@@ -192,7 +192,7 @@ int dvb_register_device(struct dvb_adapter *adap, struct dvb_device **pdvbdev,
33688 const struct dvb_device *template, void *priv, int type)
33689 {
33690 struct dvb_device *dvbdev;
33691- struct file_operations *dvbdevfops;
33692+ file_operations_no_const *dvbdevfops;
33693 struct device *clsdev;
33694 int minor;
33695 int id;
33696diff --git a/drivers/media/dvb/dvb-usb/cxusb.c b/drivers/media/dvb/dvb-usb/cxusb.c
33697index 9f2a02c..5920f88 100644
33698--- a/drivers/media/dvb/dvb-usb/cxusb.c
33699+++ b/drivers/media/dvb/dvb-usb/cxusb.c
33700@@ -1069,7 +1069,7 @@ static struct dib0070_config dib7070p_dib0070_config = {
33701 struct dib0700_adapter_state {
33702 int (*set_param_save) (struct dvb_frontend *,
33703 struct dvb_frontend_parameters *);
33704-};
33705+} __no_const;
33706
33707 static int dib7070_set_param_override(struct dvb_frontend *fe,
33708 struct dvb_frontend_parameters *fep)
33709diff --git a/drivers/media/dvb/dvb-usb/dw2102.c b/drivers/media/dvb/dvb-usb/dw2102.c
33710index f103ec1..5e8968b 100644
33711--- a/drivers/media/dvb/dvb-usb/dw2102.c
33712+++ b/drivers/media/dvb/dvb-usb/dw2102.c
33713@@ -95,7 +95,7 @@ struct su3000_state {
33714
33715 struct s6x0_state {
33716 int (*old_set_voltage)(struct dvb_frontend *f, fe_sec_voltage_t v);
33717-};
33718+} __no_const;
33719
33720 /* debug */
33721 static int dvb_usb_dw2102_debug;
33722diff --git a/drivers/media/dvb/frontends/dib3000.h b/drivers/media/dvb/frontends/dib3000.h
33723index 404f63a..4796533 100644
33724--- a/drivers/media/dvb/frontends/dib3000.h
33725+++ b/drivers/media/dvb/frontends/dib3000.h
33726@@ -39,7 +39,7 @@ struct dib_fe_xfer_ops
33727 int (*fifo_ctrl)(struct dvb_frontend *fe, int onoff);
33728 int (*pid_ctrl)(struct dvb_frontend *fe, int index, int pid, int onoff);
33729 int (*tuner_pass_ctrl)(struct dvb_frontend *fe, int onoff, u8 pll_ctrl);
33730-};
33731+} __no_const;
33732
33733 #if defined(CONFIG_DVB_DIB3000MB) || (defined(CONFIG_DVB_DIB3000MB_MODULE) && defined(MODULE))
33734 extern struct dvb_frontend* dib3000mb_attach(const struct dib3000_config* config,
33735diff --git a/drivers/media/dvb/frontends/ds3000.c b/drivers/media/dvb/frontends/ds3000.c
33736index 90bf573..e8463da 100644
33737--- a/drivers/media/dvb/frontends/ds3000.c
33738+++ b/drivers/media/dvb/frontends/ds3000.c
33739@@ -1210,7 +1210,7 @@ static int ds3000_set_frontend(struct dvb_frontend *fe,
33740
33741 for (i = 0; i < 30 ; i++) {
33742 ds3000_read_status(fe, &status);
33743- if (status && FE_HAS_LOCK)
33744+ if (status & FE_HAS_LOCK)
33745 break;
33746
33747 msleep(10);
33748diff --git a/drivers/media/dvb/ngene/ngene-cards.c b/drivers/media/dvb/ngene/ngene-cards.c
33749index 0564192..75b16f5 100644
33750--- a/drivers/media/dvb/ngene/ngene-cards.c
33751+++ b/drivers/media/dvb/ngene/ngene-cards.c
33752@@ -477,7 +477,7 @@ static struct ngene_info ngene_info_m780 = {
33753
33754 /****************************************************************************/
33755
33756-static const struct pci_device_id ngene_id_tbl[] __devinitdata = {
33757+static const struct pci_device_id ngene_id_tbl[] __devinitconst = {
33758 NGENE_ID(0x18c3, 0xabc3, ngene_info_cineS2),
33759 NGENE_ID(0x18c3, 0xabc4, ngene_info_cineS2),
33760 NGENE_ID(0x18c3, 0xdb01, ngene_info_satixS2),
33761diff --git a/drivers/media/radio/radio-cadet.c b/drivers/media/radio/radio-cadet.c
33762index 16a089f..ab1667d 100644
33763--- a/drivers/media/radio/radio-cadet.c
33764+++ b/drivers/media/radio/radio-cadet.c
33765@@ -326,6 +326,8 @@ static ssize_t cadet_read(struct file *file, char __user *data, size_t count, lo
33766 unsigned char readbuf[RDS_BUFFER];
33767 int i = 0;
33768
33769+ if (count > RDS_BUFFER)
33770+ return -EFAULT;
33771 mutex_lock(&dev->lock);
33772 if (dev->rdsstat == 0) {
33773 dev->rdsstat = 1;
33774diff --git a/drivers/media/rc/redrat3.c b/drivers/media/rc/redrat3.c
33775index 61287fc..8b08712 100644
33776--- a/drivers/media/rc/redrat3.c
33777+++ b/drivers/media/rc/redrat3.c
33778@@ -905,7 +905,7 @@ static int redrat3_set_tx_carrier(struct rc_dev *dev, u32 carrier)
33779 return carrier;
33780 }
33781
33782-static int redrat3_transmit_ir(struct rc_dev *rcdev, int *txbuf, u32 n)
33783+static int redrat3_transmit_ir(struct rc_dev *rcdev, unsigned *txbuf, u32 n)
33784 {
33785 struct redrat3_dev *rr3 = rcdev->priv;
33786 struct device *dev = rr3->dev;
33787diff --git a/drivers/media/video/au0828/au0828.h b/drivers/media/video/au0828/au0828.h
33788index 9cde353..8c6a1c3 100644
33789--- a/drivers/media/video/au0828/au0828.h
33790+++ b/drivers/media/video/au0828/au0828.h
33791@@ -191,7 +191,7 @@ struct au0828_dev {
33792
33793 /* I2C */
33794 struct i2c_adapter i2c_adap;
33795- struct i2c_algorithm i2c_algo;
33796+ i2c_algorithm_no_const i2c_algo;
33797 struct i2c_client i2c_client;
33798 u32 i2c_rc;
33799
33800diff --git a/drivers/media/video/cx88/cx88-alsa.c b/drivers/media/video/cx88/cx88-alsa.c
33801index 68d1240..46b32eb 100644
33802--- a/drivers/media/video/cx88/cx88-alsa.c
33803+++ b/drivers/media/video/cx88/cx88-alsa.c
33804@@ -766,7 +766,7 @@ static struct snd_kcontrol_new snd_cx88_alc_switch = {
33805 * Only boards with eeprom and byte 1 at eeprom=1 have it
33806 */
33807
33808-static const struct pci_device_id const cx88_audio_pci_tbl[] __devinitdata = {
33809+static const struct pci_device_id const cx88_audio_pci_tbl[] __devinitconst = {
33810 {0x14f1,0x8801,PCI_ANY_ID,PCI_ANY_ID,0,0,0},
33811 {0x14f1,0x8811,PCI_ANY_ID,PCI_ANY_ID,0,0,0},
33812 {0, }
33813diff --git a/drivers/media/video/omap/omap_vout.c b/drivers/media/video/omap/omap_vout.c
33814index ee0d0b3..63f6b78 100644
33815--- a/drivers/media/video/omap/omap_vout.c
33816+++ b/drivers/media/video/omap/omap_vout.c
33817@@ -64,7 +64,6 @@ enum omap_vout_channels {
33818 OMAP_VIDEO2,
33819 };
33820
33821-static struct videobuf_queue_ops video_vbq_ops;
33822 /* Variables configurable through module params*/
33823 static u32 video1_numbuffers = 3;
33824 static u32 video2_numbuffers = 3;
33825@@ -999,6 +998,12 @@ static int omap_vout_open(struct file *file)
33826 {
33827 struct videobuf_queue *q;
33828 struct omap_vout_device *vout = NULL;
33829+ static struct videobuf_queue_ops video_vbq_ops = {
33830+ .buf_setup = omap_vout_buffer_setup,
33831+ .buf_prepare = omap_vout_buffer_prepare,
33832+ .buf_release = omap_vout_buffer_release,
33833+ .buf_queue = omap_vout_buffer_queue,
33834+ };
33835
33836 vout = video_drvdata(file);
33837 v4l2_dbg(1, debug, &vout->vid_dev->v4l2_dev, "Entering %s\n", __func__);
33838@@ -1016,10 +1021,6 @@ static int omap_vout_open(struct file *file)
33839 vout->type = V4L2_BUF_TYPE_VIDEO_OUTPUT;
33840
33841 q = &vout->vbq;
33842- video_vbq_ops.buf_setup = omap_vout_buffer_setup;
33843- video_vbq_ops.buf_prepare = omap_vout_buffer_prepare;
33844- video_vbq_ops.buf_release = omap_vout_buffer_release;
33845- video_vbq_ops.buf_queue = omap_vout_buffer_queue;
33846 spin_lock_init(&vout->vbq_lock);
33847
33848 videobuf_queue_dma_contig_init(q, &video_vbq_ops, q->dev,
33849diff --git a/drivers/media/video/pvrusb2/pvrusb2-hdw-internal.h b/drivers/media/video/pvrusb2/pvrusb2-hdw-internal.h
33850index 305e6aa..0143317 100644
33851--- a/drivers/media/video/pvrusb2/pvrusb2-hdw-internal.h
33852+++ b/drivers/media/video/pvrusb2/pvrusb2-hdw-internal.h
33853@@ -196,7 +196,7 @@ struct pvr2_hdw {
33854
33855 /* I2C stuff */
33856 struct i2c_adapter i2c_adap;
33857- struct i2c_algorithm i2c_algo;
33858+ i2c_algorithm_no_const i2c_algo;
33859 pvr2_i2c_func i2c_func[PVR2_I2C_FUNC_CNT];
33860 int i2c_cx25840_hack_state;
33861 int i2c_linked;
33862diff --git a/drivers/media/video/saa7164/saa7164-encoder.c b/drivers/media/video/saa7164/saa7164-encoder.c
33863index 2fd38a0..ddec3c4 100644
33864--- a/drivers/media/video/saa7164/saa7164-encoder.c
33865+++ b/drivers/media/video/saa7164/saa7164-encoder.c
33866@@ -1136,6 +1136,8 @@ struct saa7164_user_buffer *saa7164_enc_next_buf(struct saa7164_port *port)
33867 }
33868
33869 static ssize_t fops_read(struct file *file, char __user *buffer,
33870+ size_t count, loff_t *pos) __size_overflow(3);
33871+static ssize_t fops_read(struct file *file, char __user *buffer,
33872 size_t count, loff_t *pos)
33873 {
33874 struct saa7164_encoder_fh *fh = file->private_data;
33875diff --git a/drivers/media/video/saa7164/saa7164-vbi.c b/drivers/media/video/saa7164/saa7164-vbi.c
33876index e2e0341..b80056c 100644
33877--- a/drivers/media/video/saa7164/saa7164-vbi.c
33878+++ b/drivers/media/video/saa7164/saa7164-vbi.c
33879@@ -1081,6 +1081,8 @@ struct saa7164_user_buffer *saa7164_vbi_next_buf(struct saa7164_port *port)
33880 }
33881
33882 static ssize_t fops_read(struct file *file, char __user *buffer,
33883+ size_t count, loff_t *pos) __size_overflow(3);
33884+static ssize_t fops_read(struct file *file, char __user *buffer,
33885 size_t count, loff_t *pos)
33886 {
33887 struct saa7164_vbi_fh *fh = file->private_data;
33888diff --git a/drivers/media/video/timblogiw.c b/drivers/media/video/timblogiw.c
33889index a0895bf..b7ebb1b 100644
33890--- a/drivers/media/video/timblogiw.c
33891+++ b/drivers/media/video/timblogiw.c
33892@@ -745,7 +745,7 @@ static int timblogiw_mmap(struct file *file, struct vm_area_struct *vma)
33893
33894 /* Platform device functions */
33895
33896-static __devinitconst struct v4l2_ioctl_ops timblogiw_ioctl_ops = {
33897+static __devinitconst v4l2_ioctl_ops_no_const timblogiw_ioctl_ops = {
33898 .vidioc_querycap = timblogiw_querycap,
33899 .vidioc_enum_fmt_vid_cap = timblogiw_enum_fmt,
33900 .vidioc_g_fmt_vid_cap = timblogiw_g_fmt,
33901@@ -767,7 +767,7 @@ static __devinitconst struct v4l2_ioctl_ops timblogiw_ioctl_ops = {
33902 .vidioc_enum_framesizes = timblogiw_enum_framesizes,
33903 };
33904
33905-static __devinitconst struct v4l2_file_operations timblogiw_fops = {
33906+static __devinitconst v4l2_file_operations_no_const timblogiw_fops = {
33907 .owner = THIS_MODULE,
33908 .open = timblogiw_open,
33909 .release = timblogiw_close,
33910diff --git a/drivers/message/fusion/mptbase.c b/drivers/message/fusion/mptbase.c
33911index e9c6a60..daf6a33 100644
33912--- a/drivers/message/fusion/mptbase.c
33913+++ b/drivers/message/fusion/mptbase.c
33914@@ -6753,8 +6753,13 @@ static int mpt_iocinfo_proc_show(struct seq_file *m, void *v)
33915 seq_printf(m, " MaxChainDepth = 0x%02x frames\n", ioc->facts.MaxChainDepth);
33916 seq_printf(m, " MinBlockSize = 0x%02x bytes\n", 4*ioc->facts.BlockSize);
33917
33918+#ifdef CONFIG_GRKERNSEC_HIDESYM
33919+ seq_printf(m, " RequestFrames @ 0x%p (Dma @ 0x%p)\n", NULL, NULL);
33920+#else
33921 seq_printf(m, " RequestFrames @ 0x%p (Dma @ 0x%p)\n",
33922 (void *)ioc->req_frames, (void *)(ulong)ioc->req_frames_dma);
33923+#endif
33924+
33925 /*
33926 * Rounding UP to nearest 4-kB boundary here...
33927 */
33928diff --git a/drivers/message/fusion/mptsas.c b/drivers/message/fusion/mptsas.c
33929index 9d95042..b808101 100644
33930--- a/drivers/message/fusion/mptsas.c
33931+++ b/drivers/message/fusion/mptsas.c
33932@@ -446,6 +446,23 @@ mptsas_is_end_device(struct mptsas_devinfo * attached)
33933 return 0;
33934 }
33935
33936+static inline void
33937+mptsas_set_rphy(MPT_ADAPTER *ioc, struct mptsas_phyinfo *phy_info, struct sas_rphy *rphy)
33938+{
33939+ if (phy_info->port_details) {
33940+ phy_info->port_details->rphy = rphy;
33941+ dsaswideprintk(ioc, printk(MYIOC_s_DEBUG_FMT "sas_rphy_add: rphy=%p\n",
33942+ ioc->name, rphy));
33943+ }
33944+
33945+ if (rphy) {
33946+ dsaswideprintk(ioc, dev_printk(KERN_DEBUG,
33947+ &rphy->dev, MYIOC_s_FMT "add:", ioc->name));
33948+ dsaswideprintk(ioc, printk(MYIOC_s_DEBUG_FMT "rphy=%p release=%p\n",
33949+ ioc->name, rphy, rphy->dev.release));
33950+ }
33951+}
33952+
33953 /* no mutex */
33954 static void
33955 mptsas_port_delete(MPT_ADAPTER *ioc, struct mptsas_portinfo_details * port_details)
33956@@ -484,23 +501,6 @@ mptsas_get_rphy(struct mptsas_phyinfo *phy_info)
33957 return NULL;
33958 }
33959
33960-static inline void
33961-mptsas_set_rphy(MPT_ADAPTER *ioc, struct mptsas_phyinfo *phy_info, struct sas_rphy *rphy)
33962-{
33963- if (phy_info->port_details) {
33964- phy_info->port_details->rphy = rphy;
33965- dsaswideprintk(ioc, printk(MYIOC_s_DEBUG_FMT "sas_rphy_add: rphy=%p\n",
33966- ioc->name, rphy));
33967- }
33968-
33969- if (rphy) {
33970- dsaswideprintk(ioc, dev_printk(KERN_DEBUG,
33971- &rphy->dev, MYIOC_s_FMT "add:", ioc->name));
33972- dsaswideprintk(ioc, printk(MYIOC_s_DEBUG_FMT "rphy=%p release=%p\n",
33973- ioc->name, rphy, rphy->dev.release));
33974- }
33975-}
33976-
33977 static inline struct sas_port *
33978 mptsas_get_port(struct mptsas_phyinfo *phy_info)
33979 {
33980diff --git a/drivers/message/fusion/mptscsih.c b/drivers/message/fusion/mptscsih.c
33981index 0c3ced7..1fe34ec 100644
33982--- a/drivers/message/fusion/mptscsih.c
33983+++ b/drivers/message/fusion/mptscsih.c
33984@@ -1270,15 +1270,16 @@ mptscsih_info(struct Scsi_Host *SChost)
33985
33986 h = shost_priv(SChost);
33987
33988- if (h) {
33989- if (h->info_kbuf == NULL)
33990- if ((h->info_kbuf = kmalloc(0x1000 /* 4Kb */, GFP_KERNEL)) == NULL)
33991- return h->info_kbuf;
33992- h->info_kbuf[0] = '\0';
33993+ if (!h)
33994+ return NULL;
33995
33996- mpt_print_ioc_summary(h->ioc, h->info_kbuf, &size, 0, 0);
33997- h->info_kbuf[size-1] = '\0';
33998- }
33999+ if (h->info_kbuf == NULL)
34000+ if ((h->info_kbuf = kmalloc(0x1000 /* 4Kb */, GFP_KERNEL)) == NULL)
34001+ return h->info_kbuf;
34002+ h->info_kbuf[0] = '\0';
34003+
34004+ mpt_print_ioc_summary(h->ioc, h->info_kbuf, &size, 0, 0);
34005+ h->info_kbuf[size-1] = '\0';
34006
34007 return h->info_kbuf;
34008 }
34009diff --git a/drivers/message/i2o/i2o_proc.c b/drivers/message/i2o/i2o_proc.c
34010index 07dbeaf..5533142 100644
34011--- a/drivers/message/i2o/i2o_proc.c
34012+++ b/drivers/message/i2o/i2o_proc.c
34013@@ -255,13 +255,6 @@ static char *scsi_devices[] = {
34014 "Array Controller Device"
34015 };
34016
34017-static char *chtostr(u8 * chars, int n)
34018-{
34019- char tmp[256];
34020- tmp[0] = 0;
34021- return strncat(tmp, (char *)chars, n);
34022-}
34023-
34024 static int i2o_report_query_status(struct seq_file *seq, int block_status,
34025 char *group)
34026 {
34027@@ -838,8 +831,7 @@ static int i2o_seq_show_ddm_table(struct seq_file *seq, void *v)
34028
34029 seq_printf(seq, "%-#7x", ddm_table.i2o_vendor_id);
34030 seq_printf(seq, "%-#8x", ddm_table.module_id);
34031- seq_printf(seq, "%-29s",
34032- chtostr(ddm_table.module_name_version, 28));
34033+ seq_printf(seq, "%-.28s", ddm_table.module_name_version);
34034 seq_printf(seq, "%9d ", ddm_table.data_size);
34035 seq_printf(seq, "%8d", ddm_table.code_size);
34036
34037@@ -940,8 +932,8 @@ static int i2o_seq_show_drivers_stored(struct seq_file *seq, void *v)
34038
34039 seq_printf(seq, "%-#7x", dst->i2o_vendor_id);
34040 seq_printf(seq, "%-#8x", dst->module_id);
34041- seq_printf(seq, "%-29s", chtostr(dst->module_name_version, 28));
34042- seq_printf(seq, "%-9s", chtostr(dst->date, 8));
34043+ seq_printf(seq, "%-.28s", dst->module_name_version);
34044+ seq_printf(seq, "%-.8s", dst->date);
34045 seq_printf(seq, "%8d ", dst->module_size);
34046 seq_printf(seq, "%8d ", dst->mpb_size);
34047 seq_printf(seq, "0x%04x", dst->module_flags);
34048@@ -1272,14 +1264,10 @@ static int i2o_seq_show_dev_identity(struct seq_file *seq, void *v)
34049 seq_printf(seq, "Device Class : %s\n", i2o_get_class_name(work16[0]));
34050 seq_printf(seq, "Owner TID : %0#5x\n", work16[2]);
34051 seq_printf(seq, "Parent TID : %0#5x\n", work16[3]);
34052- seq_printf(seq, "Vendor info : %s\n",
34053- chtostr((u8 *) (work32 + 2), 16));
34054- seq_printf(seq, "Product info : %s\n",
34055- chtostr((u8 *) (work32 + 6), 16));
34056- seq_printf(seq, "Description : %s\n",
34057- chtostr((u8 *) (work32 + 10), 16));
34058- seq_printf(seq, "Product rev. : %s\n",
34059- chtostr((u8 *) (work32 + 14), 8));
34060+ seq_printf(seq, "Vendor info : %.16s\n", (u8 *) (work32 + 2));
34061+ seq_printf(seq, "Product info : %.16s\n", (u8 *) (work32 + 6));
34062+ seq_printf(seq, "Description : %.16s\n", (u8 *) (work32 + 10));
34063+ seq_printf(seq, "Product rev. : %.8s\n", (u8 *) (work32 + 14));
34064
34065 seq_printf(seq, "Serial number : ");
34066 print_serial_number(seq, (u8 *) (work32 + 16),
34067@@ -1324,10 +1312,8 @@ static int i2o_seq_show_ddm_identity(struct seq_file *seq, void *v)
34068 }
34069
34070 seq_printf(seq, "Registering DDM TID : 0x%03x\n", result.ddm_tid);
34071- seq_printf(seq, "Module name : %s\n",
34072- chtostr(result.module_name, 24));
34073- seq_printf(seq, "Module revision : %s\n",
34074- chtostr(result.module_rev, 8));
34075+ seq_printf(seq, "Module name : %.24s\n", result.module_name);
34076+ seq_printf(seq, "Module revision : %.8s\n", result.module_rev);
34077
34078 seq_printf(seq, "Serial number : ");
34079 print_serial_number(seq, result.serial_number, sizeof(result) - 36);
34080@@ -1358,14 +1344,10 @@ static int i2o_seq_show_uinfo(struct seq_file *seq, void *v)
34081 return 0;
34082 }
34083
34084- seq_printf(seq, "Device name : %s\n",
34085- chtostr(result.device_name, 64));
34086- seq_printf(seq, "Service name : %s\n",
34087- chtostr(result.service_name, 64));
34088- seq_printf(seq, "Physical name : %s\n",
34089- chtostr(result.physical_location, 64));
34090- seq_printf(seq, "Instance number : %s\n",
34091- chtostr(result.instance_number, 4));
34092+ seq_printf(seq, "Device name : %.64s\n", result.device_name);
34093+ seq_printf(seq, "Service name : %.64s\n", result.service_name);
34094+ seq_printf(seq, "Physical name : %.64s\n", result.physical_location);
34095+ seq_printf(seq, "Instance number : %.4s\n", result.instance_number);
34096
34097 return 0;
34098 }
34099diff --git a/drivers/message/i2o/iop.c b/drivers/message/i2o/iop.c
34100index a8c08f3..155fe3d 100644
34101--- a/drivers/message/i2o/iop.c
34102+++ b/drivers/message/i2o/iop.c
34103@@ -111,10 +111,10 @@ u32 i2o_cntxt_list_add(struct i2o_controller * c, void *ptr)
34104
34105 spin_lock_irqsave(&c->context_list_lock, flags);
34106
34107- if (unlikely(atomic_inc_and_test(&c->context_list_counter)))
34108- atomic_inc(&c->context_list_counter);
34109+ if (unlikely(atomic_inc_and_test_unchecked(&c->context_list_counter)))
34110+ atomic_inc_unchecked(&c->context_list_counter);
34111
34112- entry->context = atomic_read(&c->context_list_counter);
34113+ entry->context = atomic_read_unchecked(&c->context_list_counter);
34114
34115 list_add(&entry->list, &c->context_list);
34116
34117@@ -1077,7 +1077,7 @@ struct i2o_controller *i2o_iop_alloc(void)
34118
34119 #if BITS_PER_LONG == 64
34120 spin_lock_init(&c->context_list_lock);
34121- atomic_set(&c->context_list_counter, 0);
34122+ atomic_set_unchecked(&c->context_list_counter, 0);
34123 INIT_LIST_HEAD(&c->context_list);
34124 #endif
34125
34126diff --git a/drivers/mfd/abx500-core.c b/drivers/mfd/abx500-core.c
34127index 7ce65f4..e66e9bc 100644
34128--- a/drivers/mfd/abx500-core.c
34129+++ b/drivers/mfd/abx500-core.c
34130@@ -15,7 +15,7 @@ static LIST_HEAD(abx500_list);
34131
34132 struct abx500_device_entry {
34133 struct list_head list;
34134- struct abx500_ops ops;
34135+ abx500_ops_no_const ops;
34136 struct device *dev;
34137 };
34138
34139diff --git a/drivers/mfd/janz-cmodio.c b/drivers/mfd/janz-cmodio.c
34140index 5c2a06a..8fa077c 100644
34141--- a/drivers/mfd/janz-cmodio.c
34142+++ b/drivers/mfd/janz-cmodio.c
34143@@ -13,6 +13,7 @@
34144
34145 #include <linux/kernel.h>
34146 #include <linux/module.h>
34147+#include <linux/slab.h>
34148 #include <linux/init.h>
34149 #include <linux/pci.h>
34150 #include <linux/interrupt.h>
34151diff --git a/drivers/misc/lis3lv02d/lis3lv02d.c b/drivers/misc/lis3lv02d/lis3lv02d.c
34152index 29d12a7..f900ba4 100644
34153--- a/drivers/misc/lis3lv02d/lis3lv02d.c
34154+++ b/drivers/misc/lis3lv02d/lis3lv02d.c
34155@@ -464,7 +464,7 @@ static irqreturn_t lis302dl_interrupt(int irq, void *data)
34156 * the lid is closed. This leads to interrupts as soon as a little move
34157 * is done.
34158 */
34159- atomic_inc(&lis3->count);
34160+ atomic_inc_unchecked(&lis3->count);
34161
34162 wake_up_interruptible(&lis3->misc_wait);
34163 kill_fasync(&lis3->async_queue, SIGIO, POLL_IN);
34164@@ -550,7 +550,7 @@ static int lis3lv02d_misc_open(struct inode *inode, struct file *file)
34165 if (lis3->pm_dev)
34166 pm_runtime_get_sync(lis3->pm_dev);
34167
34168- atomic_set(&lis3->count, 0);
34169+ atomic_set_unchecked(&lis3->count, 0);
34170 return 0;
34171 }
34172
34173@@ -583,7 +583,7 @@ static ssize_t lis3lv02d_misc_read(struct file *file, char __user *buf,
34174 add_wait_queue(&lis3->misc_wait, &wait);
34175 while (true) {
34176 set_current_state(TASK_INTERRUPTIBLE);
34177- data = atomic_xchg(&lis3->count, 0);
34178+ data = atomic_xchg_unchecked(&lis3->count, 0);
34179 if (data)
34180 break;
34181
34182@@ -624,7 +624,7 @@ static unsigned int lis3lv02d_misc_poll(struct file *file, poll_table *wait)
34183 struct lis3lv02d, miscdev);
34184
34185 poll_wait(file, &lis3->misc_wait, wait);
34186- if (atomic_read(&lis3->count))
34187+ if (atomic_read_unchecked(&lis3->count))
34188 return POLLIN | POLLRDNORM;
34189 return 0;
34190 }
34191diff --git a/drivers/misc/lis3lv02d/lis3lv02d.h b/drivers/misc/lis3lv02d/lis3lv02d.h
34192index 2b1482a..5d33616 100644
34193--- a/drivers/misc/lis3lv02d/lis3lv02d.h
34194+++ b/drivers/misc/lis3lv02d/lis3lv02d.h
34195@@ -266,7 +266,7 @@ struct lis3lv02d {
34196 struct input_polled_dev *idev; /* input device */
34197 struct platform_device *pdev; /* platform device */
34198 struct regulator_bulk_data regulators[2];
34199- atomic_t count; /* interrupt count after last read */
34200+ atomic_unchecked_t count; /* interrupt count after last read */
34201 union axis_conversion ac; /* hw -> logical axis */
34202 int mapped_btns[3];
34203
34204diff --git a/drivers/misc/sgi-gru/gruhandles.c b/drivers/misc/sgi-gru/gruhandles.c
34205index 2f30bad..c4c13d0 100644
34206--- a/drivers/misc/sgi-gru/gruhandles.c
34207+++ b/drivers/misc/sgi-gru/gruhandles.c
34208@@ -44,8 +44,8 @@ static void update_mcs_stats(enum mcs_op op, unsigned long clks)
34209 unsigned long nsec;
34210
34211 nsec = CLKS2NSEC(clks);
34212- atomic_long_inc(&mcs_op_statistics[op].count);
34213- atomic_long_add(nsec, &mcs_op_statistics[op].total);
34214+ atomic_long_inc_unchecked(&mcs_op_statistics[op].count);
34215+ atomic_long_add_unchecked(nsec, &mcs_op_statistics[op].total);
34216 if (mcs_op_statistics[op].max < nsec)
34217 mcs_op_statistics[op].max = nsec;
34218 }
34219diff --git a/drivers/misc/sgi-gru/gruprocfs.c b/drivers/misc/sgi-gru/gruprocfs.c
34220index 7768b87..f8aac38 100644
34221--- a/drivers/misc/sgi-gru/gruprocfs.c
34222+++ b/drivers/misc/sgi-gru/gruprocfs.c
34223@@ -32,9 +32,9 @@
34224
34225 #define printstat(s, f) printstat_val(s, &gru_stats.f, #f)
34226
34227-static void printstat_val(struct seq_file *s, atomic_long_t *v, char *id)
34228+static void printstat_val(struct seq_file *s, atomic_long_unchecked_t *v, char *id)
34229 {
34230- unsigned long val = atomic_long_read(v);
34231+ unsigned long val = atomic_long_read_unchecked(v);
34232
34233 seq_printf(s, "%16lu %s\n", val, id);
34234 }
34235@@ -134,8 +134,8 @@ static int mcs_statistics_show(struct seq_file *s, void *p)
34236
34237 seq_printf(s, "%-20s%12s%12s%12s\n", "#id", "count", "aver-clks", "max-clks");
34238 for (op = 0; op < mcsop_last; op++) {
34239- count = atomic_long_read(&mcs_op_statistics[op].count);
34240- total = atomic_long_read(&mcs_op_statistics[op].total);
34241+ count = atomic_long_read_unchecked(&mcs_op_statistics[op].count);
34242+ total = atomic_long_read_unchecked(&mcs_op_statistics[op].total);
34243 max = mcs_op_statistics[op].max;
34244 seq_printf(s, "%-20s%12ld%12ld%12ld\n", id[op], count,
34245 count ? total / count : 0, max);
34246diff --git a/drivers/misc/sgi-gru/grutables.h b/drivers/misc/sgi-gru/grutables.h
34247index 5c3ce24..4915ccb 100644
34248--- a/drivers/misc/sgi-gru/grutables.h
34249+++ b/drivers/misc/sgi-gru/grutables.h
34250@@ -167,82 +167,82 @@ extern unsigned int gru_max_gids;
34251 * GRU statistics.
34252 */
34253 struct gru_stats_s {
34254- atomic_long_t vdata_alloc;
34255- atomic_long_t vdata_free;
34256- atomic_long_t gts_alloc;
34257- atomic_long_t gts_free;
34258- atomic_long_t gms_alloc;
34259- atomic_long_t gms_free;
34260- atomic_long_t gts_double_allocate;
34261- atomic_long_t assign_context;
34262- atomic_long_t assign_context_failed;
34263- atomic_long_t free_context;
34264- atomic_long_t load_user_context;
34265- atomic_long_t load_kernel_context;
34266- atomic_long_t lock_kernel_context;
34267- atomic_long_t unlock_kernel_context;
34268- atomic_long_t steal_user_context;
34269- atomic_long_t steal_kernel_context;
34270- atomic_long_t steal_context_failed;
34271- atomic_long_t nopfn;
34272- atomic_long_t asid_new;
34273- atomic_long_t asid_next;
34274- atomic_long_t asid_wrap;
34275- atomic_long_t asid_reuse;
34276- atomic_long_t intr;
34277- atomic_long_t intr_cbr;
34278- atomic_long_t intr_tfh;
34279- atomic_long_t intr_spurious;
34280- atomic_long_t intr_mm_lock_failed;
34281- atomic_long_t call_os;
34282- atomic_long_t call_os_wait_queue;
34283- atomic_long_t user_flush_tlb;
34284- atomic_long_t user_unload_context;
34285- atomic_long_t user_exception;
34286- atomic_long_t set_context_option;
34287- atomic_long_t check_context_retarget_intr;
34288- atomic_long_t check_context_unload;
34289- atomic_long_t tlb_dropin;
34290- atomic_long_t tlb_preload_page;
34291- atomic_long_t tlb_dropin_fail_no_asid;
34292- atomic_long_t tlb_dropin_fail_upm;
34293- atomic_long_t tlb_dropin_fail_invalid;
34294- atomic_long_t tlb_dropin_fail_range_active;
34295- atomic_long_t tlb_dropin_fail_idle;
34296- atomic_long_t tlb_dropin_fail_fmm;
34297- atomic_long_t tlb_dropin_fail_no_exception;
34298- atomic_long_t tfh_stale_on_fault;
34299- atomic_long_t mmu_invalidate_range;
34300- atomic_long_t mmu_invalidate_page;
34301- atomic_long_t flush_tlb;
34302- atomic_long_t flush_tlb_gru;
34303- atomic_long_t flush_tlb_gru_tgh;
34304- atomic_long_t flush_tlb_gru_zero_asid;
34305+ atomic_long_unchecked_t vdata_alloc;
34306+ atomic_long_unchecked_t vdata_free;
34307+ atomic_long_unchecked_t gts_alloc;
34308+ atomic_long_unchecked_t gts_free;
34309+ atomic_long_unchecked_t gms_alloc;
34310+ atomic_long_unchecked_t gms_free;
34311+ atomic_long_unchecked_t gts_double_allocate;
34312+ atomic_long_unchecked_t assign_context;
34313+ atomic_long_unchecked_t assign_context_failed;
34314+ atomic_long_unchecked_t free_context;
34315+ atomic_long_unchecked_t load_user_context;
34316+ atomic_long_unchecked_t load_kernel_context;
34317+ atomic_long_unchecked_t lock_kernel_context;
34318+ atomic_long_unchecked_t unlock_kernel_context;
34319+ atomic_long_unchecked_t steal_user_context;
34320+ atomic_long_unchecked_t steal_kernel_context;
34321+ atomic_long_unchecked_t steal_context_failed;
34322+ atomic_long_unchecked_t nopfn;
34323+ atomic_long_unchecked_t asid_new;
34324+ atomic_long_unchecked_t asid_next;
34325+ atomic_long_unchecked_t asid_wrap;
34326+ atomic_long_unchecked_t asid_reuse;
34327+ atomic_long_unchecked_t intr;
34328+ atomic_long_unchecked_t intr_cbr;
34329+ atomic_long_unchecked_t intr_tfh;
34330+ atomic_long_unchecked_t intr_spurious;
34331+ atomic_long_unchecked_t intr_mm_lock_failed;
34332+ atomic_long_unchecked_t call_os;
34333+ atomic_long_unchecked_t call_os_wait_queue;
34334+ atomic_long_unchecked_t user_flush_tlb;
34335+ atomic_long_unchecked_t user_unload_context;
34336+ atomic_long_unchecked_t user_exception;
34337+ atomic_long_unchecked_t set_context_option;
34338+ atomic_long_unchecked_t check_context_retarget_intr;
34339+ atomic_long_unchecked_t check_context_unload;
34340+ atomic_long_unchecked_t tlb_dropin;
34341+ atomic_long_unchecked_t tlb_preload_page;
34342+ atomic_long_unchecked_t tlb_dropin_fail_no_asid;
34343+ atomic_long_unchecked_t tlb_dropin_fail_upm;
34344+ atomic_long_unchecked_t tlb_dropin_fail_invalid;
34345+ atomic_long_unchecked_t tlb_dropin_fail_range_active;
34346+ atomic_long_unchecked_t tlb_dropin_fail_idle;
34347+ atomic_long_unchecked_t tlb_dropin_fail_fmm;
34348+ atomic_long_unchecked_t tlb_dropin_fail_no_exception;
34349+ atomic_long_unchecked_t tfh_stale_on_fault;
34350+ atomic_long_unchecked_t mmu_invalidate_range;
34351+ atomic_long_unchecked_t mmu_invalidate_page;
34352+ atomic_long_unchecked_t flush_tlb;
34353+ atomic_long_unchecked_t flush_tlb_gru;
34354+ atomic_long_unchecked_t flush_tlb_gru_tgh;
34355+ atomic_long_unchecked_t flush_tlb_gru_zero_asid;
34356
34357- atomic_long_t copy_gpa;
34358- atomic_long_t read_gpa;
34359+ atomic_long_unchecked_t copy_gpa;
34360+ atomic_long_unchecked_t read_gpa;
34361
34362- atomic_long_t mesq_receive;
34363- atomic_long_t mesq_receive_none;
34364- atomic_long_t mesq_send;
34365- atomic_long_t mesq_send_failed;
34366- atomic_long_t mesq_noop;
34367- atomic_long_t mesq_send_unexpected_error;
34368- atomic_long_t mesq_send_lb_overflow;
34369- atomic_long_t mesq_send_qlimit_reached;
34370- atomic_long_t mesq_send_amo_nacked;
34371- atomic_long_t mesq_send_put_nacked;
34372- atomic_long_t mesq_page_overflow;
34373- atomic_long_t mesq_qf_locked;
34374- atomic_long_t mesq_qf_noop_not_full;
34375- atomic_long_t mesq_qf_switch_head_failed;
34376- atomic_long_t mesq_qf_unexpected_error;
34377- atomic_long_t mesq_noop_unexpected_error;
34378- atomic_long_t mesq_noop_lb_overflow;
34379- atomic_long_t mesq_noop_qlimit_reached;
34380- atomic_long_t mesq_noop_amo_nacked;
34381- atomic_long_t mesq_noop_put_nacked;
34382- atomic_long_t mesq_noop_page_overflow;
34383+ atomic_long_unchecked_t mesq_receive;
34384+ atomic_long_unchecked_t mesq_receive_none;
34385+ atomic_long_unchecked_t mesq_send;
34386+ atomic_long_unchecked_t mesq_send_failed;
34387+ atomic_long_unchecked_t mesq_noop;
34388+ atomic_long_unchecked_t mesq_send_unexpected_error;
34389+ atomic_long_unchecked_t mesq_send_lb_overflow;
34390+ atomic_long_unchecked_t mesq_send_qlimit_reached;
34391+ atomic_long_unchecked_t mesq_send_amo_nacked;
34392+ atomic_long_unchecked_t mesq_send_put_nacked;
34393+ atomic_long_unchecked_t mesq_page_overflow;
34394+ atomic_long_unchecked_t mesq_qf_locked;
34395+ atomic_long_unchecked_t mesq_qf_noop_not_full;
34396+ atomic_long_unchecked_t mesq_qf_switch_head_failed;
34397+ atomic_long_unchecked_t mesq_qf_unexpected_error;
34398+ atomic_long_unchecked_t mesq_noop_unexpected_error;
34399+ atomic_long_unchecked_t mesq_noop_lb_overflow;
34400+ atomic_long_unchecked_t mesq_noop_qlimit_reached;
34401+ atomic_long_unchecked_t mesq_noop_amo_nacked;
34402+ atomic_long_unchecked_t mesq_noop_put_nacked;
34403+ atomic_long_unchecked_t mesq_noop_page_overflow;
34404
34405 };
34406
34407@@ -251,8 +251,8 @@ enum mcs_op {cchop_allocate, cchop_start, cchop_interrupt, cchop_interrupt_sync,
34408 tghop_invalidate, mcsop_last};
34409
34410 struct mcs_op_statistic {
34411- atomic_long_t count;
34412- atomic_long_t total;
34413+ atomic_long_unchecked_t count;
34414+ atomic_long_unchecked_t total;
34415 unsigned long max;
34416 };
34417
34418@@ -275,7 +275,7 @@ extern struct mcs_op_statistic mcs_op_statistics[mcsop_last];
34419
34420 #define STAT(id) do { \
34421 if (gru_options & OPT_STATS) \
34422- atomic_long_inc(&gru_stats.id); \
34423+ atomic_long_inc_unchecked(&gru_stats.id); \
34424 } while (0)
34425
34426 #ifdef CONFIG_SGI_GRU_DEBUG
34427diff --git a/drivers/misc/sgi-xp/xp.h b/drivers/misc/sgi-xp/xp.h
34428index 851b2f2..a4ec097 100644
34429--- a/drivers/misc/sgi-xp/xp.h
34430+++ b/drivers/misc/sgi-xp/xp.h
34431@@ -289,7 +289,7 @@ struct xpc_interface {
34432 xpc_notify_func, void *);
34433 void (*received) (short, int, void *);
34434 enum xp_retval (*partid_to_nasids) (short, void *);
34435-};
34436+} __no_const;
34437
34438 extern struct xpc_interface xpc_interface;
34439
34440diff --git a/drivers/misc/sgi-xp/xpc.h b/drivers/misc/sgi-xp/xpc.h
34441index b94d5f7..7f494c5 100644
34442--- a/drivers/misc/sgi-xp/xpc.h
34443+++ b/drivers/misc/sgi-xp/xpc.h
34444@@ -835,6 +835,7 @@ struct xpc_arch_operations {
34445 void (*received_payload) (struct xpc_channel *, void *);
34446 void (*notify_senders_of_disconnect) (struct xpc_channel *);
34447 };
34448+typedef struct xpc_arch_operations __no_const xpc_arch_operations_no_const;
34449
34450 /* struct xpc_partition act_state values (for XPC HB) */
34451
34452@@ -876,7 +877,7 @@ extern struct xpc_registration xpc_registrations[];
34453 /* found in xpc_main.c */
34454 extern struct device *xpc_part;
34455 extern struct device *xpc_chan;
34456-extern struct xpc_arch_operations xpc_arch_ops;
34457+extern xpc_arch_operations_no_const xpc_arch_ops;
34458 extern int xpc_disengage_timelimit;
34459 extern int xpc_disengage_timedout;
34460 extern int xpc_activate_IRQ_rcvd;
34461diff --git a/drivers/misc/sgi-xp/xpc_main.c b/drivers/misc/sgi-xp/xpc_main.c
34462index 8d082b4..aa749ae 100644
34463--- a/drivers/misc/sgi-xp/xpc_main.c
34464+++ b/drivers/misc/sgi-xp/xpc_main.c
34465@@ -162,7 +162,7 @@ static struct notifier_block xpc_die_notifier = {
34466 .notifier_call = xpc_system_die,
34467 };
34468
34469-struct xpc_arch_operations xpc_arch_ops;
34470+xpc_arch_operations_no_const xpc_arch_ops;
34471
34472 /*
34473 * Timer function to enforce the timelimit on the partition disengage.
34474diff --git a/drivers/mmc/host/sdhci-pci.c b/drivers/mmc/host/sdhci-pci.c
34475index 6878a94..fe5c5f1 100644
34476--- a/drivers/mmc/host/sdhci-pci.c
34477+++ b/drivers/mmc/host/sdhci-pci.c
34478@@ -673,7 +673,7 @@ static const struct sdhci_pci_fixes sdhci_via = {
34479 .probe = via_probe,
34480 };
34481
34482-static const struct pci_device_id pci_ids[] __devinitdata = {
34483+static const struct pci_device_id pci_ids[] __devinitconst = {
34484 {
34485 .vendor = PCI_VENDOR_ID_RICOH,
34486 .device = PCI_DEVICE_ID_RICOH_R5C822,
34487diff --git a/drivers/mtd/devices/doc2000.c b/drivers/mtd/devices/doc2000.c
34488index e9fad91..0a7a16a 100644
34489--- a/drivers/mtd/devices/doc2000.c
34490+++ b/drivers/mtd/devices/doc2000.c
34491@@ -773,7 +773,7 @@ static int doc_write(struct mtd_info *mtd, loff_t to, size_t len,
34492
34493 /* The ECC will not be calculated correctly if less than 512 is written */
34494 /* DBB-
34495- if (len != 0x200 && eccbuf)
34496+ if (len != 0x200)
34497 printk(KERN_WARNING
34498 "ECC needs a full sector write (adr: %lx size %lx)\n",
34499 (long) to, (long) len);
34500diff --git a/drivers/mtd/devices/doc2001.c b/drivers/mtd/devices/doc2001.c
34501index a3f7a27..234016e 100644
34502--- a/drivers/mtd/devices/doc2001.c
34503+++ b/drivers/mtd/devices/doc2001.c
34504@@ -392,7 +392,7 @@ static int doc_read (struct mtd_info *mtd, loff_t from, size_t len,
34505 struct Nand *mychip = &this->chips[from >> (this->chipshift)];
34506
34507 /* Don't allow read past end of device */
34508- if (from >= this->totlen)
34509+ if (from >= this->totlen || !len)
34510 return -EINVAL;
34511
34512 /* Don't allow a single read to cross a 512-byte block boundary */
34513diff --git a/drivers/mtd/nand/denali.c b/drivers/mtd/nand/denali.c
34514index 3984d48..28aa897 100644
34515--- a/drivers/mtd/nand/denali.c
34516+++ b/drivers/mtd/nand/denali.c
34517@@ -26,6 +26,7 @@
34518 #include <linux/pci.h>
34519 #include <linux/mtd/mtd.h>
34520 #include <linux/module.h>
34521+#include <linux/slab.h>
34522
34523 #include "denali.h"
34524
34525diff --git a/drivers/mtd/nftlmount.c b/drivers/mtd/nftlmount.c
34526index ac40925..483b753 100644
34527--- a/drivers/mtd/nftlmount.c
34528+++ b/drivers/mtd/nftlmount.c
34529@@ -24,6 +24,7 @@
34530 #include <asm/errno.h>
34531 #include <linux/delay.h>
34532 #include <linux/slab.h>
34533+#include <linux/sched.h>
34534 #include <linux/mtd/mtd.h>
34535 #include <linux/mtd/nand.h>
34536 #include <linux/mtd/nftl.h>
34537diff --git a/drivers/mtd/ubi/build.c b/drivers/mtd/ubi/build.c
34538index 6c3fb5a..5b2eeb0 100644
34539--- a/drivers/mtd/ubi/build.c
34540+++ b/drivers/mtd/ubi/build.c
34541@@ -1311,7 +1311,7 @@ module_exit(ubi_exit);
34542 static int __init bytes_str_to_int(const char *str)
34543 {
34544 char *endp;
34545- unsigned long result;
34546+ unsigned long result, scale = 1;
34547
34548 result = simple_strtoul(str, &endp, 0);
34549 if (str == endp || result >= INT_MAX) {
34550@@ -1322,11 +1322,11 @@ static int __init bytes_str_to_int(const char *str)
34551
34552 switch (*endp) {
34553 case 'G':
34554- result *= 1024;
34555+ scale *= 1024;
34556 case 'M':
34557- result *= 1024;
34558+ scale *= 1024;
34559 case 'K':
34560- result *= 1024;
34561+ scale *= 1024;
34562 if (endp[1] == 'i' && endp[2] == 'B')
34563 endp += 2;
34564 case '\0':
34565@@ -1337,7 +1337,13 @@ static int __init bytes_str_to_int(const char *str)
34566 return -EINVAL;
34567 }
34568
34569- return result;
34570+ if (result*scale >= INT_MAX) {
34571+ printk(KERN_ERR "UBI error: incorrect bytes count: \"%s\"\n",
34572+ str);
34573+ return -EINVAL;
34574+ }
34575+
34576+ return result*scale;
34577 }
34578
34579 /**
34580diff --git a/drivers/mtd/ubi/debug.c b/drivers/mtd/ubi/debug.c
34581index ab80c0d..aec8580 100644
34582--- a/drivers/mtd/ubi/debug.c
34583+++ b/drivers/mtd/ubi/debug.c
34584@@ -338,6 +338,8 @@ out:
34585
34586 /* Write an UBI debugfs file */
34587 static ssize_t dfs_file_write(struct file *file, const char __user *user_buf,
34588+ size_t count, loff_t *ppos) __size_overflow(3);
34589+static ssize_t dfs_file_write(struct file *file, const char __user *user_buf,
34590 size_t count, loff_t *ppos)
34591 {
34592 unsigned long ubi_num = (unsigned long)file->private_data;
34593diff --git a/drivers/net/ethernet/atheros/atlx/atl2.c b/drivers/net/ethernet/atheros/atlx/atl2.c
34594index 1feae59..c2a61d2 100644
34595--- a/drivers/net/ethernet/atheros/atlx/atl2.c
34596+++ b/drivers/net/ethernet/atheros/atlx/atl2.c
34597@@ -2857,7 +2857,7 @@ static void atl2_force_ps(struct atl2_hw *hw)
34598 */
34599
34600 #define ATL2_PARAM(X, desc) \
34601- static const int __devinitdata X[ATL2_MAX_NIC + 1] = ATL2_PARAM_INIT; \
34602+ static const int __devinitconst X[ATL2_MAX_NIC + 1] = ATL2_PARAM_INIT; \
34603 MODULE_PARM(X, "1-" __MODULE_STRING(ATL2_MAX_NIC) "i"); \
34604 MODULE_PARM_DESC(X, desc);
34605 #else
34606diff --git a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_sp.h b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_sp.h
34607index 9a517c2..a50cfcb 100644
34608--- a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_sp.h
34609+++ b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_sp.h
34610@@ -449,7 +449,7 @@ struct bnx2x_rx_mode_obj {
34611
34612 int (*wait_comp)(struct bnx2x *bp,
34613 struct bnx2x_rx_mode_ramrod_params *p);
34614-};
34615+} __no_const;
34616
34617 /********************** Set multicast group ***********************************/
34618
34619diff --git a/drivers/net/ethernet/broadcom/tg3.h b/drivers/net/ethernet/broadcom/tg3.h
34620index 94b4bd0..73c02de 100644
34621--- a/drivers/net/ethernet/broadcom/tg3.h
34622+++ b/drivers/net/ethernet/broadcom/tg3.h
34623@@ -134,6 +134,7 @@
34624 #define CHIPREV_ID_5750_A0 0x4000
34625 #define CHIPREV_ID_5750_A1 0x4001
34626 #define CHIPREV_ID_5750_A3 0x4003
34627+#define CHIPREV_ID_5750_C1 0x4201
34628 #define CHIPREV_ID_5750_C2 0x4202
34629 #define CHIPREV_ID_5752_A0_HW 0x5000
34630 #define CHIPREV_ID_5752_A0 0x6000
34631diff --git a/drivers/net/ethernet/chelsio/cxgb3/l2t.h b/drivers/net/ethernet/chelsio/cxgb3/l2t.h
34632index c5f5479..2e8c260 100644
34633--- a/drivers/net/ethernet/chelsio/cxgb3/l2t.h
34634+++ b/drivers/net/ethernet/chelsio/cxgb3/l2t.h
34635@@ -87,7 +87,7 @@ typedef void (*arp_failure_handler_func)(struct t3cdev * dev,
34636 */
34637 struct l2t_skb_cb {
34638 arp_failure_handler_func arp_failure_handler;
34639-};
34640+} __no_const;
34641
34642 #define L2T_SKB_CB(skb) ((struct l2t_skb_cb *)(skb)->cb)
34643
34644diff --git a/drivers/net/ethernet/chelsio/cxgb3/sge.c b/drivers/net/ethernet/chelsio/cxgb3/sge.c
34645index cfb60e1..9c76da7 100644
34646--- a/drivers/net/ethernet/chelsio/cxgb3/sge.c
34647+++ b/drivers/net/ethernet/chelsio/cxgb3/sge.c
34648@@ -611,6 +611,8 @@ static void recycle_rx_buf(struct adapter *adap, struct sge_fl *q,
34649 * of the SW ring.
34650 */
34651 static void *alloc_ring(struct pci_dev *pdev, size_t nelem, size_t elem_size,
34652+ size_t sw_size, dma_addr_t * phys, void *metadata) __size_overflow(2,4);
34653+static void *alloc_ring(struct pci_dev *pdev, size_t nelem, size_t elem_size,
34654 size_t sw_size, dma_addr_t * phys, void *metadata)
34655 {
34656 size_t len = nelem * elem_size;
34657diff --git a/drivers/net/ethernet/chelsio/cxgb4/sge.c b/drivers/net/ethernet/chelsio/cxgb4/sge.c
34658index 140254c..5b8a0a6 100644
34659--- a/drivers/net/ethernet/chelsio/cxgb4/sge.c
34660+++ b/drivers/net/ethernet/chelsio/cxgb4/sge.c
34661@@ -593,6 +593,9 @@ static inline void __refill_fl(struct adapter *adap, struct sge_fl *fl)
34662 */
34663 static void *alloc_ring(struct device *dev, size_t nelem, size_t elem_size,
34664 size_t sw_size, dma_addr_t *phys, void *metadata,
34665+ size_t stat_size, int node) __size_overflow(2,4);
34666+static void *alloc_ring(struct device *dev, size_t nelem, size_t elem_size,
34667+ size_t sw_size, dma_addr_t *phys, void *metadata,
34668 size_t stat_size, int node)
34669 {
34670 size_t len = nelem * elem_size + stat_size;
34671diff --git a/drivers/net/ethernet/chelsio/cxgb4vf/sge.c b/drivers/net/ethernet/chelsio/cxgb4vf/sge.c
34672index 8d5d55a..a3c3474 100644
34673--- a/drivers/net/ethernet/chelsio/cxgb4vf/sge.c
34674+++ b/drivers/net/ethernet/chelsio/cxgb4vf/sge.c
34675@@ -730,6 +730,9 @@ static inline void __refill_fl(struct adapter *adapter, struct sge_fl *fl)
34676 */
34677 static void *alloc_ring(struct device *dev, size_t nelem, size_t hwsize,
34678 size_t swsize, dma_addr_t *busaddrp, void *swringp,
34679+ size_t stat_size) __size_overflow(2,4);
34680+static void *alloc_ring(struct device *dev, size_t nelem, size_t hwsize,
34681+ size_t swsize, dma_addr_t *busaddrp, void *swringp,
34682 size_t stat_size)
34683 {
34684 /*
34685diff --git a/drivers/net/ethernet/dec/tulip/de4x5.c b/drivers/net/ethernet/dec/tulip/de4x5.c
34686index 871bcaa..4043505 100644
34687--- a/drivers/net/ethernet/dec/tulip/de4x5.c
34688+++ b/drivers/net/ethernet/dec/tulip/de4x5.c
34689@@ -5397,7 +5397,7 @@ de4x5_ioctl(struct net_device *dev, struct ifreq *rq, int cmd)
34690 for (i=0; i<ETH_ALEN; i++) {
34691 tmp.addr[i] = dev->dev_addr[i];
34692 }
34693- if (copy_to_user(ioc->data, tmp.addr, ioc->len)) return -EFAULT;
34694+ if (ioc->len > sizeof tmp.addr || copy_to_user(ioc->data, tmp.addr, ioc->len)) return -EFAULT;
34695 break;
34696
34697 case DE4X5_SET_HWADDR: /* Set the hardware address */
34698@@ -5437,7 +5437,7 @@ de4x5_ioctl(struct net_device *dev, struct ifreq *rq, int cmd)
34699 spin_lock_irqsave(&lp->lock, flags);
34700 memcpy(&statbuf, &lp->pktStats, ioc->len);
34701 spin_unlock_irqrestore(&lp->lock, flags);
34702- if (copy_to_user(ioc->data, &statbuf, ioc->len))
34703+ if (ioc->len > sizeof statbuf || copy_to_user(ioc->data, &statbuf, ioc->len))
34704 return -EFAULT;
34705 break;
34706 }
34707diff --git a/drivers/net/ethernet/dec/tulip/eeprom.c b/drivers/net/ethernet/dec/tulip/eeprom.c
34708index 14d5b61..1398636 100644
34709--- a/drivers/net/ethernet/dec/tulip/eeprom.c
34710+++ b/drivers/net/ethernet/dec/tulip/eeprom.c
34711@@ -79,7 +79,7 @@ static struct eeprom_fixup eeprom_fixups[] __devinitdata = {
34712 {NULL}};
34713
34714
34715-static const char *block_name[] __devinitdata = {
34716+static const char *block_name[] __devinitconst = {
34717 "21140 non-MII",
34718 "21140 MII PHY",
34719 "21142 Serial PHY",
34720diff --git a/drivers/net/ethernet/dec/tulip/winbond-840.c b/drivers/net/ethernet/dec/tulip/winbond-840.c
34721index 4d01219..b58d26d 100644
34722--- a/drivers/net/ethernet/dec/tulip/winbond-840.c
34723+++ b/drivers/net/ethernet/dec/tulip/winbond-840.c
34724@@ -236,7 +236,7 @@ struct pci_id_info {
34725 int drv_flags; /* Driver use, intended as capability flags. */
34726 };
34727
34728-static const struct pci_id_info pci_id_tbl[] __devinitdata = {
34729+static const struct pci_id_info pci_id_tbl[] __devinitconst = {
34730 { /* Sometime a Level-One switch card. */
34731 "Winbond W89c840", CanHaveMII | HasBrokenTx | FDXOnNoMII},
34732 { "Winbond W89c840", CanHaveMII | HasBrokenTx},
34733diff --git a/drivers/net/ethernet/dlink/sundance.c b/drivers/net/ethernet/dlink/sundance.c
34734index dcd7f7a..ecb7fb3 100644
34735--- a/drivers/net/ethernet/dlink/sundance.c
34736+++ b/drivers/net/ethernet/dlink/sundance.c
34737@@ -218,7 +218,7 @@ enum {
34738 struct pci_id_info {
34739 const char *name;
34740 };
34741-static const struct pci_id_info pci_id_tbl[] __devinitdata = {
34742+static const struct pci_id_info pci_id_tbl[] __devinitconst = {
34743 {"D-Link DFE-550TX FAST Ethernet Adapter"},
34744 {"D-Link DFE-550FX 100Mbps Fiber-optics Adapter"},
34745 {"D-Link DFE-580TX 4 port Server Adapter"},
34746diff --git a/drivers/net/ethernet/emulex/benet/be_main.c b/drivers/net/ethernet/emulex/benet/be_main.c
34747index bf266a0..e024af7 100644
34748--- a/drivers/net/ethernet/emulex/benet/be_main.c
34749+++ b/drivers/net/ethernet/emulex/benet/be_main.c
34750@@ -397,7 +397,7 @@ static void accumulate_16bit_val(u32 *acc, u16 val)
34751
34752 if (wrapped)
34753 newacc += 65536;
34754- ACCESS_ONCE(*acc) = newacc;
34755+ ACCESS_ONCE_RW(*acc) = newacc;
34756 }
34757
34758 void be_parse_stats(struct be_adapter *adapter)
34759diff --git a/drivers/net/ethernet/faraday/ftgmac100.c b/drivers/net/ethernet/faraday/ftgmac100.c
34760index fb5579a..debdffa 100644
34761--- a/drivers/net/ethernet/faraday/ftgmac100.c
34762+++ b/drivers/net/ethernet/faraday/ftgmac100.c
34763@@ -30,6 +30,8 @@
34764 #include <linux/netdevice.h>
34765 #include <linux/phy.h>
34766 #include <linux/platform_device.h>
34767+#include <linux/interrupt.h>
34768+#include <linux/irqreturn.h>
34769 #include <net/ip.h>
34770
34771 #include "ftgmac100.h"
34772diff --git a/drivers/net/ethernet/faraday/ftmac100.c b/drivers/net/ethernet/faraday/ftmac100.c
34773index a127cb2..0d043cd 100644
34774--- a/drivers/net/ethernet/faraday/ftmac100.c
34775+++ b/drivers/net/ethernet/faraday/ftmac100.c
34776@@ -30,6 +30,8 @@
34777 #include <linux/module.h>
34778 #include <linux/netdevice.h>
34779 #include <linux/platform_device.h>
34780+#include <linux/interrupt.h>
34781+#include <linux/irqreturn.h>
34782
34783 #include "ftmac100.h"
34784
34785diff --git a/drivers/net/ethernet/fealnx.c b/drivers/net/ethernet/fealnx.c
34786index 61d2bdd..7f1154a 100644
34787--- a/drivers/net/ethernet/fealnx.c
34788+++ b/drivers/net/ethernet/fealnx.c
34789@@ -150,7 +150,7 @@ struct chip_info {
34790 int flags;
34791 };
34792
34793-static const struct chip_info skel_netdrv_tbl[] __devinitdata = {
34794+static const struct chip_info skel_netdrv_tbl[] __devinitconst = {
34795 { "100/10M Ethernet PCI Adapter", HAS_MII_XCVR },
34796 { "100/10M Ethernet PCI Adapter", HAS_CHIP_XCVR },
34797 { "1000/100/10M Ethernet PCI Adapter", HAS_MII_XCVR },
34798diff --git a/drivers/net/ethernet/intel/e1000e/80003es2lan.c b/drivers/net/ethernet/intel/e1000e/80003es2lan.c
34799index e1159e5..e18684d 100644
34800--- a/drivers/net/ethernet/intel/e1000e/80003es2lan.c
34801+++ b/drivers/net/ethernet/intel/e1000e/80003es2lan.c
34802@@ -205,7 +205,7 @@ static s32 e1000_init_mac_params_80003es2lan(struct e1000_adapter *adapter)
34803 {
34804 struct e1000_hw *hw = &adapter->hw;
34805 struct e1000_mac_info *mac = &hw->mac;
34806- struct e1000_mac_operations *func = &mac->ops;
34807+ e1000_mac_operations_no_const *func = &mac->ops;
34808
34809 /* Set media type */
34810 switch (adapter->pdev->device) {
34811diff --git a/drivers/net/ethernet/intel/e1000e/82571.c b/drivers/net/ethernet/intel/e1000e/82571.c
34812index a3e65fd..f451444 100644
34813--- a/drivers/net/ethernet/intel/e1000e/82571.c
34814+++ b/drivers/net/ethernet/intel/e1000e/82571.c
34815@@ -239,7 +239,7 @@ static s32 e1000_init_mac_params_82571(struct e1000_adapter *adapter)
34816 {
34817 struct e1000_hw *hw = &adapter->hw;
34818 struct e1000_mac_info *mac = &hw->mac;
34819- struct e1000_mac_operations *func = &mac->ops;
34820+ e1000_mac_operations_no_const *func = &mac->ops;
34821 u32 swsm = 0;
34822 u32 swsm2 = 0;
34823 bool force_clear_smbi = false;
34824diff --git a/drivers/net/ethernet/intel/e1000e/hw.h b/drivers/net/ethernet/intel/e1000e/hw.h
34825index 2967039..ca8c40c 100644
34826--- a/drivers/net/ethernet/intel/e1000e/hw.h
34827+++ b/drivers/net/ethernet/intel/e1000e/hw.h
34828@@ -778,6 +778,7 @@ struct e1000_mac_operations {
34829 void (*write_vfta)(struct e1000_hw *, u32, u32);
34830 s32 (*read_mac_addr)(struct e1000_hw *);
34831 };
34832+typedef struct e1000_mac_operations __no_const e1000_mac_operations_no_const;
34833
34834 /*
34835 * When to use various PHY register access functions:
34836@@ -818,6 +819,7 @@ struct e1000_phy_operations {
34837 void (*power_up)(struct e1000_hw *);
34838 void (*power_down)(struct e1000_hw *);
34839 };
34840+typedef struct e1000_phy_operations __no_const e1000_phy_operations_no_const;
34841
34842 /* Function pointers for the NVM. */
34843 struct e1000_nvm_operations {
34844@@ -829,9 +831,10 @@ struct e1000_nvm_operations {
34845 s32 (*validate)(struct e1000_hw *);
34846 s32 (*write)(struct e1000_hw *, u16, u16, u16 *);
34847 };
34848+typedef struct e1000_nvm_operations __no_const e1000_nvm_operations_no_const;
34849
34850 struct e1000_mac_info {
34851- struct e1000_mac_operations ops;
34852+ e1000_mac_operations_no_const ops;
34853 u8 addr[ETH_ALEN];
34854 u8 perm_addr[ETH_ALEN];
34855
34856@@ -872,7 +875,7 @@ struct e1000_mac_info {
34857 };
34858
34859 struct e1000_phy_info {
34860- struct e1000_phy_operations ops;
34861+ e1000_phy_operations_no_const ops;
34862
34863 enum e1000_phy_type type;
34864
34865@@ -906,7 +909,7 @@ struct e1000_phy_info {
34866 };
34867
34868 struct e1000_nvm_info {
34869- struct e1000_nvm_operations ops;
34870+ e1000_nvm_operations_no_const ops;
34871
34872 enum e1000_nvm_type type;
34873 enum e1000_nvm_override override;
34874diff --git a/drivers/net/ethernet/intel/igb/e1000_hw.h b/drivers/net/ethernet/intel/igb/e1000_hw.h
34875index 4519a13..f97fcd0 100644
34876--- a/drivers/net/ethernet/intel/igb/e1000_hw.h
34877+++ b/drivers/net/ethernet/intel/igb/e1000_hw.h
34878@@ -314,6 +314,7 @@ struct e1000_mac_operations {
34879 s32 (*read_mac_addr)(struct e1000_hw *);
34880 s32 (*get_speed_and_duplex)(struct e1000_hw *, u16 *, u16 *);
34881 };
34882+typedef struct e1000_mac_operations __no_const e1000_mac_operations_no_const;
34883
34884 struct e1000_phy_operations {
34885 s32 (*acquire)(struct e1000_hw *);
34886@@ -330,6 +331,7 @@ struct e1000_phy_operations {
34887 s32 (*set_d3_lplu_state)(struct e1000_hw *, bool);
34888 s32 (*write_reg)(struct e1000_hw *, u32, u16);
34889 };
34890+typedef struct e1000_phy_operations __no_const e1000_phy_operations_no_const;
34891
34892 struct e1000_nvm_operations {
34893 s32 (*acquire)(struct e1000_hw *);
34894@@ -339,6 +341,7 @@ struct e1000_nvm_operations {
34895 s32 (*update)(struct e1000_hw *);
34896 s32 (*validate)(struct e1000_hw *);
34897 };
34898+typedef struct e1000_nvm_operations __no_const e1000_nvm_operations_no_const;
34899
34900 struct e1000_info {
34901 s32 (*get_invariants)(struct e1000_hw *);
34902@@ -350,7 +353,7 @@ struct e1000_info {
34903 extern const struct e1000_info e1000_82575_info;
34904
34905 struct e1000_mac_info {
34906- struct e1000_mac_operations ops;
34907+ e1000_mac_operations_no_const ops;
34908
34909 u8 addr[6];
34910 u8 perm_addr[6];
34911@@ -388,7 +391,7 @@ struct e1000_mac_info {
34912 };
34913
34914 struct e1000_phy_info {
34915- struct e1000_phy_operations ops;
34916+ e1000_phy_operations_no_const ops;
34917
34918 enum e1000_phy_type type;
34919
34920@@ -423,7 +426,7 @@ struct e1000_phy_info {
34921 };
34922
34923 struct e1000_nvm_info {
34924- struct e1000_nvm_operations ops;
34925+ e1000_nvm_operations_no_const ops;
34926 enum e1000_nvm_type type;
34927 enum e1000_nvm_override override;
34928
34929@@ -468,6 +471,7 @@ struct e1000_mbx_operations {
34930 s32 (*check_for_ack)(struct e1000_hw *, u16);
34931 s32 (*check_for_rst)(struct e1000_hw *, u16);
34932 };
34933+typedef struct e1000_mbx_operations __no_const e1000_mbx_operations_no_const;
34934
34935 struct e1000_mbx_stats {
34936 u32 msgs_tx;
34937@@ -479,7 +483,7 @@ struct e1000_mbx_stats {
34938 };
34939
34940 struct e1000_mbx_info {
34941- struct e1000_mbx_operations ops;
34942+ e1000_mbx_operations_no_const ops;
34943 struct e1000_mbx_stats stats;
34944 u32 timeout;
34945 u32 usec_delay;
34946diff --git a/drivers/net/ethernet/intel/igbvf/vf.h b/drivers/net/ethernet/intel/igbvf/vf.h
34947index d7ed58f..64cde36 100644
34948--- a/drivers/net/ethernet/intel/igbvf/vf.h
34949+++ b/drivers/net/ethernet/intel/igbvf/vf.h
34950@@ -189,9 +189,10 @@ struct e1000_mac_operations {
34951 s32 (*read_mac_addr)(struct e1000_hw *);
34952 s32 (*set_vfta)(struct e1000_hw *, u16, bool);
34953 };
34954+typedef struct e1000_mac_operations __no_const e1000_mac_operations_no_const;
34955
34956 struct e1000_mac_info {
34957- struct e1000_mac_operations ops;
34958+ e1000_mac_operations_no_const ops;
34959 u8 addr[6];
34960 u8 perm_addr[6];
34961
34962@@ -213,6 +214,7 @@ struct e1000_mbx_operations {
34963 s32 (*check_for_ack)(struct e1000_hw *);
34964 s32 (*check_for_rst)(struct e1000_hw *);
34965 };
34966+typedef struct e1000_mbx_operations __no_const e1000_mbx_operations_no_const;
34967
34968 struct e1000_mbx_stats {
34969 u32 msgs_tx;
34970@@ -224,7 +226,7 @@ struct e1000_mbx_stats {
34971 };
34972
34973 struct e1000_mbx_info {
34974- struct e1000_mbx_operations ops;
34975+ e1000_mbx_operations_no_const ops;
34976 struct e1000_mbx_stats stats;
34977 u32 timeout;
34978 u32 usec_delay;
34979diff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_type.h b/drivers/net/ethernet/intel/ixgbe/ixgbe_type.h
34980index 6c5cca8..de8ef63 100644
34981--- a/drivers/net/ethernet/intel/ixgbe/ixgbe_type.h
34982+++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_type.h
34983@@ -2708,6 +2708,7 @@ struct ixgbe_eeprom_operations {
34984 s32 (*update_checksum)(struct ixgbe_hw *);
34985 u16 (*calc_checksum)(struct ixgbe_hw *);
34986 };
34987+typedef struct ixgbe_eeprom_operations __no_const ixgbe_eeprom_operations_no_const;
34988
34989 struct ixgbe_mac_operations {
34990 s32 (*init_hw)(struct ixgbe_hw *);
34991@@ -2769,6 +2770,7 @@ struct ixgbe_mac_operations {
34992 /* Manageability interface */
34993 s32 (*set_fw_drv_ver)(struct ixgbe_hw *, u8, u8, u8, u8);
34994 };
34995+typedef struct ixgbe_mac_operations __no_const ixgbe_mac_operations_no_const;
34996
34997 struct ixgbe_phy_operations {
34998 s32 (*identify)(struct ixgbe_hw *);
34999@@ -2788,9 +2790,10 @@ struct ixgbe_phy_operations {
35000 s32 (*write_i2c_eeprom)(struct ixgbe_hw *, u8, u8);
35001 s32 (*check_overtemp)(struct ixgbe_hw *);
35002 };
35003+typedef struct ixgbe_phy_operations __no_const ixgbe_phy_operations_no_const;
35004
35005 struct ixgbe_eeprom_info {
35006- struct ixgbe_eeprom_operations ops;
35007+ ixgbe_eeprom_operations_no_const ops;
35008 enum ixgbe_eeprom_type type;
35009 u32 semaphore_delay;
35010 u16 word_size;
35011@@ -2800,7 +2803,7 @@ struct ixgbe_eeprom_info {
35012
35013 #define IXGBE_FLAGS_DOUBLE_RESET_REQUIRED 0x01
35014 struct ixgbe_mac_info {
35015- struct ixgbe_mac_operations ops;
35016+ ixgbe_mac_operations_no_const ops;
35017 enum ixgbe_mac_type type;
35018 u8 addr[IXGBE_ETH_LENGTH_OF_ADDRESS];
35019 u8 perm_addr[IXGBE_ETH_LENGTH_OF_ADDRESS];
35020@@ -2828,7 +2831,7 @@ struct ixgbe_mac_info {
35021 };
35022
35023 struct ixgbe_phy_info {
35024- struct ixgbe_phy_operations ops;
35025+ ixgbe_phy_operations_no_const ops;
35026 struct mdio_if_info mdio;
35027 enum ixgbe_phy_type type;
35028 u32 id;
35029@@ -2856,6 +2859,7 @@ struct ixgbe_mbx_operations {
35030 s32 (*check_for_ack)(struct ixgbe_hw *, u16);
35031 s32 (*check_for_rst)(struct ixgbe_hw *, u16);
35032 };
35033+typedef struct ixgbe_mbx_operations __no_const ixgbe_mbx_operations_no_const;
35034
35035 struct ixgbe_mbx_stats {
35036 u32 msgs_tx;
35037@@ -2867,7 +2871,7 @@ struct ixgbe_mbx_stats {
35038 };
35039
35040 struct ixgbe_mbx_info {
35041- struct ixgbe_mbx_operations ops;
35042+ ixgbe_mbx_operations_no_const ops;
35043 struct ixgbe_mbx_stats stats;
35044 u32 timeout;
35045 u32 usec_delay;
35046diff --git a/drivers/net/ethernet/intel/ixgbevf/vf.h b/drivers/net/ethernet/intel/ixgbevf/vf.h
35047index 10306b4..28df758 100644
35048--- a/drivers/net/ethernet/intel/ixgbevf/vf.h
35049+++ b/drivers/net/ethernet/intel/ixgbevf/vf.h
35050@@ -70,6 +70,7 @@ struct ixgbe_mac_operations {
35051 s32 (*clear_vfta)(struct ixgbe_hw *);
35052 s32 (*set_vfta)(struct ixgbe_hw *, u32, u32, bool);
35053 };
35054+typedef struct ixgbe_mac_operations __no_const ixgbe_mac_operations_no_const;
35055
35056 enum ixgbe_mac_type {
35057 ixgbe_mac_unknown = 0,
35058@@ -79,7 +80,7 @@ enum ixgbe_mac_type {
35059 };
35060
35061 struct ixgbe_mac_info {
35062- struct ixgbe_mac_operations ops;
35063+ ixgbe_mac_operations_no_const ops;
35064 u8 addr[6];
35065 u8 perm_addr[6];
35066
35067@@ -103,6 +104,7 @@ struct ixgbe_mbx_operations {
35068 s32 (*check_for_ack)(struct ixgbe_hw *);
35069 s32 (*check_for_rst)(struct ixgbe_hw *);
35070 };
35071+typedef struct ixgbe_mbx_operations __no_const ixgbe_mbx_operations_no_const;
35072
35073 struct ixgbe_mbx_stats {
35074 u32 msgs_tx;
35075@@ -114,7 +116,7 @@ struct ixgbe_mbx_stats {
35076 };
35077
35078 struct ixgbe_mbx_info {
35079- struct ixgbe_mbx_operations ops;
35080+ ixgbe_mbx_operations_no_const ops;
35081 struct ixgbe_mbx_stats stats;
35082 u32 timeout;
35083 u32 udelay;
35084diff --git a/drivers/net/ethernet/mellanox/mlx4/main.c b/drivers/net/ethernet/mellanox/mlx4/main.c
35085index 94bbc85..78c12e6 100644
35086--- a/drivers/net/ethernet/mellanox/mlx4/main.c
35087+++ b/drivers/net/ethernet/mellanox/mlx4/main.c
35088@@ -40,6 +40,7 @@
35089 #include <linux/dma-mapping.h>
35090 #include <linux/slab.h>
35091 #include <linux/io-mapping.h>
35092+#include <linux/sched.h>
35093
35094 #include <linux/mlx4/device.h>
35095 #include <linux/mlx4/doorbell.h>
35096diff --git a/drivers/net/ethernet/neterion/vxge/vxge-config.h b/drivers/net/ethernet/neterion/vxge/vxge-config.h
35097index 5046a64..71ca936 100644
35098--- a/drivers/net/ethernet/neterion/vxge/vxge-config.h
35099+++ b/drivers/net/ethernet/neterion/vxge/vxge-config.h
35100@@ -514,7 +514,7 @@ struct vxge_hw_uld_cbs {
35101 void (*link_down)(struct __vxge_hw_device *devh);
35102 void (*crit_err)(struct __vxge_hw_device *devh,
35103 enum vxge_hw_event type, u64 ext_data);
35104-};
35105+} __no_const;
35106
35107 /*
35108 * struct __vxge_hw_blockpool_entry - Block private data structure
35109diff --git a/drivers/net/ethernet/neterion/vxge/vxge-traffic.h b/drivers/net/ethernet/neterion/vxge/vxge-traffic.h
35110index 4a518a3..936b334 100644
35111--- a/drivers/net/ethernet/neterion/vxge/vxge-traffic.h
35112+++ b/drivers/net/ethernet/neterion/vxge/vxge-traffic.h
35113@@ -2088,7 +2088,7 @@ struct vxge_hw_mempool_cbs {
35114 struct vxge_hw_mempool_dma *dma_object,
35115 u32 index,
35116 u32 is_last);
35117-};
35118+} __no_const;
35119
35120 #define VXGE_HW_VIRTUAL_PATH_HANDLE(vpath) \
35121 ((struct __vxge_hw_vpath_handle *)(vpath)->vpath_handles.next)
35122diff --git a/drivers/net/ethernet/realtek/r8169.c b/drivers/net/ethernet/realtek/r8169.c
35123index 0cf2351..56c4cef 100644
35124--- a/drivers/net/ethernet/realtek/r8169.c
35125+++ b/drivers/net/ethernet/realtek/r8169.c
35126@@ -698,17 +698,17 @@ struct rtl8169_private {
35127 struct mdio_ops {
35128 void (*write)(void __iomem *, int, int);
35129 int (*read)(void __iomem *, int);
35130- } mdio_ops;
35131+ } __no_const mdio_ops;
35132
35133 struct pll_power_ops {
35134 void (*down)(struct rtl8169_private *);
35135 void (*up)(struct rtl8169_private *);
35136- } pll_power_ops;
35137+ } __no_const pll_power_ops;
35138
35139 struct jumbo_ops {
35140 void (*enable)(struct rtl8169_private *);
35141 void (*disable)(struct rtl8169_private *);
35142- } jumbo_ops;
35143+ } __no_const jumbo_ops;
35144
35145 int (*set_speed)(struct net_device *, u8 aneg, u16 sp, u8 dpx, u32 adv);
35146 int (*get_settings)(struct net_device *, struct ethtool_cmd *);
35147diff --git a/drivers/net/ethernet/sis/sis190.c b/drivers/net/ethernet/sis/sis190.c
35148index 1b4658c..a30dabb 100644
35149--- a/drivers/net/ethernet/sis/sis190.c
35150+++ b/drivers/net/ethernet/sis/sis190.c
35151@@ -1624,7 +1624,7 @@ static int __devinit sis190_get_mac_addr_from_eeprom(struct pci_dev *pdev,
35152 static int __devinit sis190_get_mac_addr_from_apc(struct pci_dev *pdev,
35153 struct net_device *dev)
35154 {
35155- static const u16 __devinitdata ids[] = { 0x0965, 0x0966, 0x0968 };
35156+ static const u16 __devinitconst ids[] = { 0x0965, 0x0966, 0x0968 };
35157 struct sis190_private *tp = netdev_priv(dev);
35158 struct pci_dev *isa_bridge;
35159 u8 reg, tmp8;
35160diff --git a/drivers/net/ethernet/stmicro/stmmac/mmc_core.c b/drivers/net/ethernet/stmicro/stmmac/mmc_core.c
35161index 41e6b33..8e89b0f 100644
35162--- a/drivers/net/ethernet/stmicro/stmmac/mmc_core.c
35163+++ b/drivers/net/ethernet/stmicro/stmmac/mmc_core.c
35164@@ -139,8 +139,8 @@ void dwmac_mmc_ctrl(void __iomem *ioaddr, unsigned int mode)
35165
35166 writel(value, ioaddr + MMC_CNTRL);
35167
35168- pr_debug("stmmac: MMC ctrl register (offset 0x%x): 0x%08x\n",
35169- MMC_CNTRL, value);
35170+// pr_debug("stmmac: MMC ctrl register (offset 0x%x): 0x%08x\n",
35171+// MMC_CNTRL, value);
35172 }
35173
35174 /* To mask all all interrupts.*/
35175diff --git a/drivers/net/ppp/ppp_generic.c b/drivers/net/ppp/ppp_generic.c
35176index 486b404..0d6677d 100644
35177--- a/drivers/net/ppp/ppp_generic.c
35178+++ b/drivers/net/ppp/ppp_generic.c
35179@@ -987,7 +987,6 @@ ppp_net_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)
35180 void __user *addr = (void __user *) ifr->ifr_ifru.ifru_data;
35181 struct ppp_stats stats;
35182 struct ppp_comp_stats cstats;
35183- char *vers;
35184
35185 switch (cmd) {
35186 case SIOCGPPPSTATS:
35187@@ -1009,8 +1008,7 @@ ppp_net_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)
35188 break;
35189
35190 case SIOCGPPPVER:
35191- vers = PPP_VERSION;
35192- if (copy_to_user(addr, vers, strlen(vers) + 1))
35193+ if (copy_to_user(addr, PPP_VERSION, sizeof(PPP_VERSION)))
35194 break;
35195 err = 0;
35196 break;
35197diff --git a/drivers/net/tokenring/abyss.c b/drivers/net/tokenring/abyss.c
35198index 515f122..41dd273 100644
35199--- a/drivers/net/tokenring/abyss.c
35200+++ b/drivers/net/tokenring/abyss.c
35201@@ -451,10 +451,12 @@ static struct pci_driver abyss_driver = {
35202
35203 static int __init abyss_init (void)
35204 {
35205- abyss_netdev_ops = tms380tr_netdev_ops;
35206+ pax_open_kernel();
35207+ memcpy((void *)&abyss_netdev_ops, &tms380tr_netdev_ops, sizeof(tms380tr_netdev_ops));
35208
35209- abyss_netdev_ops.ndo_open = abyss_open;
35210- abyss_netdev_ops.ndo_stop = abyss_close;
35211+ *(void **)&abyss_netdev_ops.ndo_open = abyss_open;
35212+ *(void **)&abyss_netdev_ops.ndo_stop = abyss_close;
35213+ pax_close_kernel();
35214
35215 return pci_register_driver(&abyss_driver);
35216 }
35217diff --git a/drivers/net/tokenring/madgemc.c b/drivers/net/tokenring/madgemc.c
35218index 6153cfd..cf69c1c 100644
35219--- a/drivers/net/tokenring/madgemc.c
35220+++ b/drivers/net/tokenring/madgemc.c
35221@@ -744,9 +744,11 @@ static struct mca_driver madgemc_driver = {
35222
35223 static int __init madgemc_init (void)
35224 {
35225- madgemc_netdev_ops = tms380tr_netdev_ops;
35226- madgemc_netdev_ops.ndo_open = madgemc_open;
35227- madgemc_netdev_ops.ndo_stop = madgemc_close;
35228+ pax_open_kernel();
35229+ memcpy((void *)&madgemc_netdev_ops, &tms380tr_netdev_ops, sizeof(tms380tr_netdev_ops));
35230+ *(void **)&madgemc_netdev_ops.ndo_open = madgemc_open;
35231+ *(void **)&madgemc_netdev_ops.ndo_stop = madgemc_close;
35232+ pax_close_kernel();
35233
35234 return mca_register_driver (&madgemc_driver);
35235 }
35236diff --git a/drivers/net/tokenring/proteon.c b/drivers/net/tokenring/proteon.c
35237index 8d362e6..f91cc52 100644
35238--- a/drivers/net/tokenring/proteon.c
35239+++ b/drivers/net/tokenring/proteon.c
35240@@ -353,9 +353,11 @@ static int __init proteon_init(void)
35241 struct platform_device *pdev;
35242 int i, num = 0, err = 0;
35243
35244- proteon_netdev_ops = tms380tr_netdev_ops;
35245- proteon_netdev_ops.ndo_open = proteon_open;
35246- proteon_netdev_ops.ndo_stop = tms380tr_close;
35247+ pax_open_kernel();
35248+ memcpy((void *)&proteon_netdev_ops, &tms380tr_netdev_ops, sizeof(tms380tr_netdev_ops));
35249+ *(void **)&proteon_netdev_ops.ndo_open = proteon_open;
35250+ *(void **)&proteon_netdev_ops.ndo_stop = tms380tr_close;
35251+ pax_close_kernel();
35252
35253 err = platform_driver_register(&proteon_driver);
35254 if (err)
35255diff --git a/drivers/net/tokenring/skisa.c b/drivers/net/tokenring/skisa.c
35256index 46db5c5..37c1536 100644
35257--- a/drivers/net/tokenring/skisa.c
35258+++ b/drivers/net/tokenring/skisa.c
35259@@ -363,9 +363,11 @@ static int __init sk_isa_init(void)
35260 struct platform_device *pdev;
35261 int i, num = 0, err = 0;
35262
35263- sk_isa_netdev_ops = tms380tr_netdev_ops;
35264- sk_isa_netdev_ops.ndo_open = sk_isa_open;
35265- sk_isa_netdev_ops.ndo_stop = tms380tr_close;
35266+ pax_open_kernel();
35267+ memcpy((void *)&sk_isa_netdev_ops, &tms380tr_netdev_ops, sizeof(tms380tr_netdev_ops));
35268+ *(void **)&sk_isa_netdev_ops.ndo_open = sk_isa_open;
35269+ *(void **)&sk_isa_netdev_ops.ndo_stop = tms380tr_close;
35270+ pax_close_kernel();
35271
35272 err = platform_driver_register(&sk_isa_driver);
35273 if (err)
35274diff --git a/drivers/net/tun.c b/drivers/net/tun.c
35275index 7bea9c6..7ef073c 100644
35276--- a/drivers/net/tun.c
35277+++ b/drivers/net/tun.c
35278@@ -359,7 +359,7 @@ static void tun_free_netdev(struct net_device *dev)
35279 {
35280 struct tun_struct *tun = netdev_priv(dev);
35281
35282- sock_put(tun->socket.sk);
35283+ sk_release_kernel(tun->socket.sk);
35284 }
35285
35286 /* Net device open. */
35287@@ -979,10 +979,18 @@ static int tun_recvmsg(struct kiocb *iocb, struct socket *sock,
35288 return ret;
35289 }
35290
35291+static int tun_release(struct socket *sock)
35292+{
35293+ if (sock->sk)
35294+ sock_put(sock->sk);
35295+ return 0;
35296+}
35297+
35298 /* Ops structure to mimic raw sockets with tun */
35299 static const struct proto_ops tun_socket_ops = {
35300 .sendmsg = tun_sendmsg,
35301 .recvmsg = tun_recvmsg,
35302+ .release = tun_release,
35303 };
35304
35305 static struct proto tun_proto = {
35306@@ -1109,10 +1117,11 @@ static int tun_set_iff(struct net *net, struct file *file, struct ifreq *ifr)
35307 tun->vnet_hdr_sz = sizeof(struct virtio_net_hdr);
35308
35309 err = -ENOMEM;
35310- sk = sk_alloc(net, AF_UNSPEC, GFP_KERNEL, &tun_proto);
35311+ sk = sk_alloc(&init_net, AF_UNSPEC, GFP_KERNEL, &tun_proto);
35312 if (!sk)
35313 goto err_free_dev;
35314
35315+ sk_change_net(sk, net);
35316 tun->socket.wq = &tun->wq;
35317 init_waitqueue_head(&tun->wq.wait);
35318 tun->socket.ops = &tun_socket_ops;
35319@@ -1173,7 +1182,7 @@ static int tun_set_iff(struct net *net, struct file *file, struct ifreq *ifr)
35320 return 0;
35321
35322 err_free_sk:
35323- sock_put(sk);
35324+ tun_free_netdev(dev);
35325 err_free_dev:
35326 free_netdev(dev);
35327 failed:
35328diff --git a/drivers/net/usb/hso.c b/drivers/net/usb/hso.c
35329index 304fe78..db112fa 100644
35330--- a/drivers/net/usb/hso.c
35331+++ b/drivers/net/usb/hso.c
35332@@ -71,7 +71,7 @@
35333 #include <asm/byteorder.h>
35334 #include <linux/serial_core.h>
35335 #include <linux/serial.h>
35336-
35337+#include <asm/local.h>
35338
35339 #define MOD_AUTHOR "Option Wireless"
35340 #define MOD_DESCRIPTION "USB High Speed Option driver"
35341@@ -257,7 +257,7 @@ struct hso_serial {
35342
35343 /* from usb_serial_port */
35344 struct tty_struct *tty;
35345- int open_count;
35346+ local_t open_count;
35347 spinlock_t serial_lock;
35348
35349 int (*write_data) (struct hso_serial *serial);
35350@@ -1190,7 +1190,7 @@ static void put_rxbuf_data_and_resubmit_ctrl_urb(struct hso_serial *serial)
35351 struct urb *urb;
35352
35353 urb = serial->rx_urb[0];
35354- if (serial->open_count > 0) {
35355+ if (local_read(&serial->open_count) > 0) {
35356 count = put_rxbuf_data(urb, serial);
35357 if (count == -1)
35358 return;
35359@@ -1226,7 +1226,7 @@ static void hso_std_serial_read_bulk_callback(struct urb *urb)
35360 DUMP1(urb->transfer_buffer, urb->actual_length);
35361
35362 /* Anyone listening? */
35363- if (serial->open_count == 0)
35364+ if (local_read(&serial->open_count) == 0)
35365 return;
35366
35367 if (status == 0) {
35368@@ -1311,8 +1311,7 @@ static int hso_serial_open(struct tty_struct *tty, struct file *filp)
35369 spin_unlock_irq(&serial->serial_lock);
35370
35371 /* check for port already opened, if not set the termios */
35372- serial->open_count++;
35373- if (serial->open_count == 1) {
35374+ if (local_inc_return(&serial->open_count) == 1) {
35375 serial->rx_state = RX_IDLE;
35376 /* Force default termio settings */
35377 _hso_serial_set_termios(tty, NULL);
35378@@ -1324,7 +1323,7 @@ static int hso_serial_open(struct tty_struct *tty, struct file *filp)
35379 result = hso_start_serial_device(serial->parent, GFP_KERNEL);
35380 if (result) {
35381 hso_stop_serial_device(serial->parent);
35382- serial->open_count--;
35383+ local_dec(&serial->open_count);
35384 kref_put(&serial->parent->ref, hso_serial_ref_free);
35385 }
35386 } else {
35387@@ -1361,10 +1360,10 @@ static void hso_serial_close(struct tty_struct *tty, struct file *filp)
35388
35389 /* reset the rts and dtr */
35390 /* do the actual close */
35391- serial->open_count--;
35392+ local_dec(&serial->open_count);
35393
35394- if (serial->open_count <= 0) {
35395- serial->open_count = 0;
35396+ if (local_read(&serial->open_count) <= 0) {
35397+ local_set(&serial->open_count, 0);
35398 spin_lock_irq(&serial->serial_lock);
35399 if (serial->tty == tty) {
35400 serial->tty->driver_data = NULL;
35401@@ -1446,7 +1445,7 @@ static void hso_serial_set_termios(struct tty_struct *tty, struct ktermios *old)
35402
35403 /* the actual setup */
35404 spin_lock_irqsave(&serial->serial_lock, flags);
35405- if (serial->open_count)
35406+ if (local_read(&serial->open_count))
35407 _hso_serial_set_termios(tty, old);
35408 else
35409 tty->termios = old;
35410@@ -1905,7 +1904,7 @@ static void intr_callback(struct urb *urb)
35411 D1("Pending read interrupt on port %d\n", i);
35412 spin_lock(&serial->serial_lock);
35413 if (serial->rx_state == RX_IDLE &&
35414- serial->open_count > 0) {
35415+ local_read(&serial->open_count) > 0) {
35416 /* Setup and send a ctrl req read on
35417 * port i */
35418 if (!serial->rx_urb_filled[0]) {
35419@@ -3098,7 +3097,7 @@ static int hso_resume(struct usb_interface *iface)
35420 /* Start all serial ports */
35421 for (i = 0; i < HSO_SERIAL_TTY_MINORS; i++) {
35422 if (serial_table[i] && (serial_table[i]->interface == iface)) {
35423- if (dev2ser(serial_table[i])->open_count) {
35424+ if (local_read(&dev2ser(serial_table[i])->open_count)) {
35425 result =
35426 hso_start_serial_device(serial_table[i], GFP_NOIO);
35427 hso_kick_transmit(dev2ser(serial_table[i]));
35428diff --git a/drivers/net/vmxnet3/vmxnet3_ethtool.c b/drivers/net/vmxnet3/vmxnet3_ethtool.c
35429index e662cbc..8d4a102 100644
35430--- a/drivers/net/vmxnet3/vmxnet3_ethtool.c
35431+++ b/drivers/net/vmxnet3/vmxnet3_ethtool.c
35432@@ -601,8 +601,7 @@ vmxnet3_set_rss_indir(struct net_device *netdev,
35433 * Return with error code if any of the queue indices
35434 * is out of range
35435 */
35436- if (p->ring_index[i] < 0 ||
35437- p->ring_index[i] >= adapter->num_rx_queues)
35438+ if (p->ring_index[i] >= adapter->num_rx_queues)
35439 return -EINVAL;
35440 }
35441
35442diff --git a/drivers/net/wireless/ath/ath.h b/drivers/net/wireless/ath/ath.h
35443index 0f9ee46..e2d6e65 100644
35444--- a/drivers/net/wireless/ath/ath.h
35445+++ b/drivers/net/wireless/ath/ath.h
35446@@ -119,6 +119,7 @@ struct ath_ops {
35447 void (*write_flush) (void *);
35448 u32 (*rmw)(void *, u32 reg_offset, u32 set, u32 clr);
35449 };
35450+typedef struct ath_ops __no_const ath_ops_no_const;
35451
35452 struct ath_common;
35453 struct ath_bus_ops;
35454diff --git a/drivers/net/wireless/ath/ath5k/debug.c b/drivers/net/wireless/ath/ath5k/debug.c
35455index 8c5ce8b..abf101b 100644
35456--- a/drivers/net/wireless/ath/ath5k/debug.c
35457+++ b/drivers/net/wireless/ath/ath5k/debug.c
35458@@ -343,6 +343,9 @@ static ssize_t read_file_debug(struct file *file, char __user *user_buf,
35459
35460 static ssize_t write_file_debug(struct file *file,
35461 const char __user *userbuf,
35462+ size_t count, loff_t *ppos) __size_overflow(3);
35463+static ssize_t write_file_debug(struct file *file,
35464+ const char __user *userbuf,
35465 size_t count, loff_t *ppos)
35466 {
35467 struct ath5k_hw *ah = file->private_data;
35468diff --git a/drivers/net/wireless/ath/ath9k/ar9002_mac.c b/drivers/net/wireless/ath/ath9k/ar9002_mac.c
35469index b592016..fe47870 100644
35470--- a/drivers/net/wireless/ath/ath9k/ar9002_mac.c
35471+++ b/drivers/net/wireless/ath/ath9k/ar9002_mac.c
35472@@ -183,8 +183,8 @@ ar9002_set_txdesc(struct ath_hw *ah, void *ds, struct ath_tx_info *i)
35473 ads->ds_txstatus6 = ads->ds_txstatus7 = 0;
35474 ads->ds_txstatus8 = ads->ds_txstatus9 = 0;
35475
35476- ACCESS_ONCE(ads->ds_link) = i->link;
35477- ACCESS_ONCE(ads->ds_data) = i->buf_addr[0];
35478+ ACCESS_ONCE_RW(ads->ds_link) = i->link;
35479+ ACCESS_ONCE_RW(ads->ds_data) = i->buf_addr[0];
35480
35481 ctl1 = i->buf_len[0] | (i->is_last ? 0 : AR_TxMore);
35482 ctl6 = SM(i->keytype, AR_EncrType);
35483@@ -198,26 +198,26 @@ ar9002_set_txdesc(struct ath_hw *ah, void *ds, struct ath_tx_info *i)
35484
35485 if ((i->is_first || i->is_last) &&
35486 i->aggr != AGGR_BUF_MIDDLE && i->aggr != AGGR_BUF_LAST) {
35487- ACCESS_ONCE(ads->ds_ctl2) = set11nTries(i->rates, 0)
35488+ ACCESS_ONCE_RW(ads->ds_ctl2) = set11nTries(i->rates, 0)
35489 | set11nTries(i->rates, 1)
35490 | set11nTries(i->rates, 2)
35491 | set11nTries(i->rates, 3)
35492 | (i->dur_update ? AR_DurUpdateEna : 0)
35493 | SM(0, AR_BurstDur);
35494
35495- ACCESS_ONCE(ads->ds_ctl3) = set11nRate(i->rates, 0)
35496+ ACCESS_ONCE_RW(ads->ds_ctl3) = set11nRate(i->rates, 0)
35497 | set11nRate(i->rates, 1)
35498 | set11nRate(i->rates, 2)
35499 | set11nRate(i->rates, 3);
35500 } else {
35501- ACCESS_ONCE(ads->ds_ctl2) = 0;
35502- ACCESS_ONCE(ads->ds_ctl3) = 0;
35503+ ACCESS_ONCE_RW(ads->ds_ctl2) = 0;
35504+ ACCESS_ONCE_RW(ads->ds_ctl3) = 0;
35505 }
35506
35507 if (!i->is_first) {
35508- ACCESS_ONCE(ads->ds_ctl0) = 0;
35509- ACCESS_ONCE(ads->ds_ctl1) = ctl1;
35510- ACCESS_ONCE(ads->ds_ctl6) = ctl6;
35511+ ACCESS_ONCE_RW(ads->ds_ctl0) = 0;
35512+ ACCESS_ONCE_RW(ads->ds_ctl1) = ctl1;
35513+ ACCESS_ONCE_RW(ads->ds_ctl6) = ctl6;
35514 return;
35515 }
35516
35517@@ -242,7 +242,7 @@ ar9002_set_txdesc(struct ath_hw *ah, void *ds, struct ath_tx_info *i)
35518 break;
35519 }
35520
35521- ACCESS_ONCE(ads->ds_ctl0) = (i->pkt_len & AR_FrameLen)
35522+ ACCESS_ONCE_RW(ads->ds_ctl0) = (i->pkt_len & AR_FrameLen)
35523 | (i->flags & ATH9K_TXDESC_VMF ? AR_VirtMoreFrag : 0)
35524 | SM(i->txpower, AR_XmitPower)
35525 | (i->flags & ATH9K_TXDESC_VEOL ? AR_VEOL : 0)
35526@@ -252,19 +252,19 @@ ar9002_set_txdesc(struct ath_hw *ah, void *ds, struct ath_tx_info *i)
35527 | (i->flags & ATH9K_TXDESC_RTSENA ? AR_RTSEnable :
35528 (i->flags & ATH9K_TXDESC_CTSENA ? AR_CTSEnable : 0));
35529
35530- ACCESS_ONCE(ads->ds_ctl1) = ctl1;
35531- ACCESS_ONCE(ads->ds_ctl6) = ctl6;
35532+ ACCESS_ONCE_RW(ads->ds_ctl1) = ctl1;
35533+ ACCESS_ONCE_RW(ads->ds_ctl6) = ctl6;
35534
35535 if (i->aggr == AGGR_BUF_MIDDLE || i->aggr == AGGR_BUF_LAST)
35536 return;
35537
35538- ACCESS_ONCE(ads->ds_ctl4) = set11nPktDurRTSCTS(i->rates, 0)
35539+ ACCESS_ONCE_RW(ads->ds_ctl4) = set11nPktDurRTSCTS(i->rates, 0)
35540 | set11nPktDurRTSCTS(i->rates, 1);
35541
35542- ACCESS_ONCE(ads->ds_ctl5) = set11nPktDurRTSCTS(i->rates, 2)
35543+ ACCESS_ONCE_RW(ads->ds_ctl5) = set11nPktDurRTSCTS(i->rates, 2)
35544 | set11nPktDurRTSCTS(i->rates, 3);
35545
35546- ACCESS_ONCE(ads->ds_ctl7) = set11nRateFlags(i->rates, 0)
35547+ ACCESS_ONCE_RW(ads->ds_ctl7) = set11nRateFlags(i->rates, 0)
35548 | set11nRateFlags(i->rates, 1)
35549 | set11nRateFlags(i->rates, 2)
35550 | set11nRateFlags(i->rates, 3)
35551diff --git a/drivers/net/wireless/ath/ath9k/ar9003_mac.c b/drivers/net/wireless/ath/ath9k/ar9003_mac.c
35552index f5ae3c6..7936af3 100644
35553--- a/drivers/net/wireless/ath/ath9k/ar9003_mac.c
35554+++ b/drivers/net/wireless/ath/ath9k/ar9003_mac.c
35555@@ -35,47 +35,47 @@ ar9003_set_txdesc(struct ath_hw *ah, void *ds, struct ath_tx_info *i)
35556 (i->qcu << AR_TxQcuNum_S) | 0x17;
35557
35558 checksum += val;
35559- ACCESS_ONCE(ads->info) = val;
35560+ ACCESS_ONCE_RW(ads->info) = val;
35561
35562 checksum += i->link;
35563- ACCESS_ONCE(ads->link) = i->link;
35564+ ACCESS_ONCE_RW(ads->link) = i->link;
35565
35566 checksum += i->buf_addr[0];
35567- ACCESS_ONCE(ads->data0) = i->buf_addr[0];
35568+ ACCESS_ONCE_RW(ads->data0) = i->buf_addr[0];
35569 checksum += i->buf_addr[1];
35570- ACCESS_ONCE(ads->data1) = i->buf_addr[1];
35571+ ACCESS_ONCE_RW(ads->data1) = i->buf_addr[1];
35572 checksum += i->buf_addr[2];
35573- ACCESS_ONCE(ads->data2) = i->buf_addr[2];
35574+ ACCESS_ONCE_RW(ads->data2) = i->buf_addr[2];
35575 checksum += i->buf_addr[3];
35576- ACCESS_ONCE(ads->data3) = i->buf_addr[3];
35577+ ACCESS_ONCE_RW(ads->data3) = i->buf_addr[3];
35578
35579 checksum += (val = (i->buf_len[0] << AR_BufLen_S) & AR_BufLen);
35580- ACCESS_ONCE(ads->ctl3) = val;
35581+ ACCESS_ONCE_RW(ads->ctl3) = val;
35582 checksum += (val = (i->buf_len[1] << AR_BufLen_S) & AR_BufLen);
35583- ACCESS_ONCE(ads->ctl5) = val;
35584+ ACCESS_ONCE_RW(ads->ctl5) = val;
35585 checksum += (val = (i->buf_len[2] << AR_BufLen_S) & AR_BufLen);
35586- ACCESS_ONCE(ads->ctl7) = val;
35587+ ACCESS_ONCE_RW(ads->ctl7) = val;
35588 checksum += (val = (i->buf_len[3] << AR_BufLen_S) & AR_BufLen);
35589- ACCESS_ONCE(ads->ctl9) = val;
35590+ ACCESS_ONCE_RW(ads->ctl9) = val;
35591
35592 checksum = (u16) (((checksum & 0xffff) + (checksum >> 16)) & 0xffff);
35593- ACCESS_ONCE(ads->ctl10) = checksum;
35594+ ACCESS_ONCE_RW(ads->ctl10) = checksum;
35595
35596 if (i->is_first || i->is_last) {
35597- ACCESS_ONCE(ads->ctl13) = set11nTries(i->rates, 0)
35598+ ACCESS_ONCE_RW(ads->ctl13) = set11nTries(i->rates, 0)
35599 | set11nTries(i->rates, 1)
35600 | set11nTries(i->rates, 2)
35601 | set11nTries(i->rates, 3)
35602 | (i->dur_update ? AR_DurUpdateEna : 0)
35603 | SM(0, AR_BurstDur);
35604
35605- ACCESS_ONCE(ads->ctl14) = set11nRate(i->rates, 0)
35606+ ACCESS_ONCE_RW(ads->ctl14) = set11nRate(i->rates, 0)
35607 | set11nRate(i->rates, 1)
35608 | set11nRate(i->rates, 2)
35609 | set11nRate(i->rates, 3);
35610 } else {
35611- ACCESS_ONCE(ads->ctl13) = 0;
35612- ACCESS_ONCE(ads->ctl14) = 0;
35613+ ACCESS_ONCE_RW(ads->ctl13) = 0;
35614+ ACCESS_ONCE_RW(ads->ctl14) = 0;
35615 }
35616
35617 ads->ctl20 = 0;
35618@@ -84,17 +84,17 @@ ar9003_set_txdesc(struct ath_hw *ah, void *ds, struct ath_tx_info *i)
35619
35620 ctl17 = SM(i->keytype, AR_EncrType);
35621 if (!i->is_first) {
35622- ACCESS_ONCE(ads->ctl11) = 0;
35623- ACCESS_ONCE(ads->ctl12) = i->is_last ? 0 : AR_TxMore;
35624- ACCESS_ONCE(ads->ctl15) = 0;
35625- ACCESS_ONCE(ads->ctl16) = 0;
35626- ACCESS_ONCE(ads->ctl17) = ctl17;
35627- ACCESS_ONCE(ads->ctl18) = 0;
35628- ACCESS_ONCE(ads->ctl19) = 0;
35629+ ACCESS_ONCE_RW(ads->ctl11) = 0;
35630+ ACCESS_ONCE_RW(ads->ctl12) = i->is_last ? 0 : AR_TxMore;
35631+ ACCESS_ONCE_RW(ads->ctl15) = 0;
35632+ ACCESS_ONCE_RW(ads->ctl16) = 0;
35633+ ACCESS_ONCE_RW(ads->ctl17) = ctl17;
35634+ ACCESS_ONCE_RW(ads->ctl18) = 0;
35635+ ACCESS_ONCE_RW(ads->ctl19) = 0;
35636 return;
35637 }
35638
35639- ACCESS_ONCE(ads->ctl11) = (i->pkt_len & AR_FrameLen)
35640+ ACCESS_ONCE_RW(ads->ctl11) = (i->pkt_len & AR_FrameLen)
35641 | (i->flags & ATH9K_TXDESC_VMF ? AR_VirtMoreFrag : 0)
35642 | SM(i->txpower, AR_XmitPower)
35643 | (i->flags & ATH9K_TXDESC_VEOL ? AR_VEOL : 0)
35644@@ -130,22 +130,22 @@ ar9003_set_txdesc(struct ath_hw *ah, void *ds, struct ath_tx_info *i)
35645 val = (i->flags & ATH9K_TXDESC_PAPRD) >> ATH9K_TXDESC_PAPRD_S;
35646 ctl12 |= SM(val, AR_PAPRDChainMask);
35647
35648- ACCESS_ONCE(ads->ctl12) = ctl12;
35649- ACCESS_ONCE(ads->ctl17) = ctl17;
35650+ ACCESS_ONCE_RW(ads->ctl12) = ctl12;
35651+ ACCESS_ONCE_RW(ads->ctl17) = ctl17;
35652
35653- ACCESS_ONCE(ads->ctl15) = set11nPktDurRTSCTS(i->rates, 0)
35654+ ACCESS_ONCE_RW(ads->ctl15) = set11nPktDurRTSCTS(i->rates, 0)
35655 | set11nPktDurRTSCTS(i->rates, 1);
35656
35657- ACCESS_ONCE(ads->ctl16) = set11nPktDurRTSCTS(i->rates, 2)
35658+ ACCESS_ONCE_RW(ads->ctl16) = set11nPktDurRTSCTS(i->rates, 2)
35659 | set11nPktDurRTSCTS(i->rates, 3);
35660
35661- ACCESS_ONCE(ads->ctl18) = set11nRateFlags(i->rates, 0)
35662+ ACCESS_ONCE_RW(ads->ctl18) = set11nRateFlags(i->rates, 0)
35663 | set11nRateFlags(i->rates, 1)
35664 | set11nRateFlags(i->rates, 2)
35665 | set11nRateFlags(i->rates, 3)
35666 | SM(i->rtscts_rate, AR_RTSCTSRate);
35667
35668- ACCESS_ONCE(ads->ctl19) = AR_Not_Sounding;
35669+ ACCESS_ONCE_RW(ads->ctl19) = AR_Not_Sounding;
35670 }
35671
35672 static u16 ar9003_calc_ptr_chksum(struct ar9003_txc *ads)
35673diff --git a/drivers/net/wireless/ath/ath9k/debug.c b/drivers/net/wireless/ath/ath9k/debug.c
35674index 2741203..837a960 100644
35675--- a/drivers/net/wireless/ath/ath9k/debug.c
35676+++ b/drivers/net/wireless/ath/ath9k/debug.c
35677@@ -60,6 +60,8 @@ static ssize_t read_file_debug(struct file *file, char __user *user_buf,
35678 }
35679
35680 static ssize_t write_file_debug(struct file *file, const char __user *user_buf,
35681+ size_t count, loff_t *ppos) __size_overflow(3);
35682+static ssize_t write_file_debug(struct file *file, const char __user *user_buf,
35683 size_t count, loff_t *ppos)
35684 {
35685 struct ath_softc *sc = file->private_data;
35686diff --git a/drivers/net/wireless/ath/ath9k/htc_drv_debug.c b/drivers/net/wireless/ath/ath9k/htc_drv_debug.c
35687index d3ff33c..c98bcda 100644
35688--- a/drivers/net/wireless/ath/ath9k/htc_drv_debug.c
35689+++ b/drivers/net/wireless/ath/ath9k/htc_drv_debug.c
35690@@ -464,6 +464,8 @@ static ssize_t read_file_debug(struct file *file, char __user *user_buf,
35691 }
35692
35693 static ssize_t write_file_debug(struct file *file, const char __user *user_buf,
35694+ size_t count, loff_t *ppos) __size_overflow(3);
35695+static ssize_t write_file_debug(struct file *file, const char __user *user_buf,
35696 size_t count, loff_t *ppos)
35697 {
35698 struct ath9k_htc_priv *priv = file->private_data;
35699diff --git a/drivers/net/wireless/ath/ath9k/hw.h b/drivers/net/wireless/ath/ath9k/hw.h
35700index 1bd8edf..10c6d30 100644
35701--- a/drivers/net/wireless/ath/ath9k/hw.h
35702+++ b/drivers/net/wireless/ath/ath9k/hw.h
35703@@ -605,7 +605,7 @@ struct ath_hw_private_ops {
35704
35705 /* ANI */
35706 void (*ani_cache_ini_regs)(struct ath_hw *ah);
35707-};
35708+} __no_const;
35709
35710 /**
35711 * struct ath_hw_ops - callbacks used by hardware code and driver code
35712@@ -635,7 +635,7 @@ struct ath_hw_ops {
35713 void (*antdiv_comb_conf_set)(struct ath_hw *ah,
35714 struct ath_hw_antcomb_conf *antconf);
35715
35716-};
35717+} __no_const;
35718
35719 struct ath_nf_limits {
35720 s16 max;
35721@@ -655,7 +655,7 @@ enum ath_cal_list {
35722 #define AH_FASTCC 0x4
35723
35724 struct ath_hw {
35725- struct ath_ops reg_ops;
35726+ ath_ops_no_const reg_ops;
35727
35728 struct ieee80211_hw *hw;
35729 struct ath_common common;
35730diff --git a/drivers/net/wireless/brcm80211/brcmsmac/phy/phy_int.h b/drivers/net/wireless/brcm80211/brcmsmac/phy/phy_int.h
35731index bea8524..c677c06 100644
35732--- a/drivers/net/wireless/brcm80211/brcmsmac/phy/phy_int.h
35733+++ b/drivers/net/wireless/brcm80211/brcmsmac/phy/phy_int.h
35734@@ -547,7 +547,7 @@ struct phy_func_ptr {
35735 void (*carrsuppr)(struct brcms_phy *);
35736 s32 (*rxsigpwr)(struct brcms_phy *, s32);
35737 void (*detach)(struct brcms_phy *);
35738-};
35739+} __no_const;
35740
35741 struct brcms_phy {
35742 struct brcms_phy_pub pubpi_ro;
35743diff --git a/drivers/net/wireless/iwlegacy/iwl3945-base.c b/drivers/net/wireless/iwlegacy/iwl3945-base.c
35744index 05f2ad1..ae00eea 100644
35745--- a/drivers/net/wireless/iwlegacy/iwl3945-base.c
35746+++ b/drivers/net/wireless/iwlegacy/iwl3945-base.c
35747@@ -3685,7 +3685,9 @@ static int iwl3945_pci_probe(struct pci_dev *pdev, const struct pci_device_id *e
35748 */
35749 if (iwl3945_mod_params.disable_hw_scan) {
35750 IWL_DEBUG_INFO(priv, "Disabling hw_scan\n");
35751- iwl3945_hw_ops.hw_scan = NULL;
35752+ pax_open_kernel();
35753+ *(void **)&iwl3945_hw_ops.hw_scan = NULL;
35754+ pax_close_kernel();
35755 }
35756
35757 IWL_DEBUG_INFO(priv, "*** LOAD DRIVER ***\n");
35758diff --git a/drivers/net/wireless/iwlwifi/iwl-debug.h b/drivers/net/wireless/iwlwifi/iwl-debug.h
35759index 69a77e2..552b42c 100644
35760--- a/drivers/net/wireless/iwlwifi/iwl-debug.h
35761+++ b/drivers/net/wireless/iwlwifi/iwl-debug.h
35762@@ -71,8 +71,8 @@ do { \
35763 } while (0)
35764
35765 #else
35766-#define IWL_DEBUG(m, level, fmt, args...)
35767-#define IWL_DEBUG_LIMIT(m, level, fmt, args...)
35768+#define IWL_DEBUG(m, level, fmt, args...) do {} while (0)
35769+#define IWL_DEBUG_LIMIT(m, level, fmt, args...) do {} while (0)
35770 #define iwl_print_hex_dump(m, level, p, len)
35771 #endif /* CONFIG_IWLWIFI_DEBUG */
35772
35773diff --git a/drivers/net/wireless/mac80211_hwsim.c b/drivers/net/wireless/mac80211_hwsim.c
35774index 523ad55..f8c5dc5 100644
35775--- a/drivers/net/wireless/mac80211_hwsim.c
35776+++ b/drivers/net/wireless/mac80211_hwsim.c
35777@@ -1678,9 +1678,11 @@ static int __init init_mac80211_hwsim(void)
35778 return -EINVAL;
35779
35780 if (fake_hw_scan) {
35781- mac80211_hwsim_ops.hw_scan = mac80211_hwsim_hw_scan;
35782- mac80211_hwsim_ops.sw_scan_start = NULL;
35783- mac80211_hwsim_ops.sw_scan_complete = NULL;
35784+ pax_open_kernel();
35785+ *(void **)&mac80211_hwsim_ops.hw_scan = mac80211_hwsim_hw_scan;
35786+ *(void **)&mac80211_hwsim_ops.sw_scan_start = NULL;
35787+ *(void **)&mac80211_hwsim_ops.sw_scan_complete = NULL;
35788+ pax_close_kernel();
35789 }
35790
35791 spin_lock_init(&hwsim_radio_lock);
35792diff --git a/drivers/net/wireless/mwifiex/main.h b/drivers/net/wireless/mwifiex/main.h
35793index 30f138b..c904585 100644
35794--- a/drivers/net/wireless/mwifiex/main.h
35795+++ b/drivers/net/wireless/mwifiex/main.h
35796@@ -543,7 +543,7 @@ struct mwifiex_if_ops {
35797 void (*cleanup_mpa_buf) (struct mwifiex_adapter *);
35798 int (*cmdrsp_complete) (struct mwifiex_adapter *, struct sk_buff *);
35799 int (*event_complete) (struct mwifiex_adapter *, struct sk_buff *);
35800-};
35801+} __no_const;
35802
35803 struct mwifiex_adapter {
35804 u8 iface_type;
35805diff --git a/drivers/net/wireless/rndis_wlan.c b/drivers/net/wireless/rndis_wlan.c
35806index 0c13840..a5c3ed6 100644
35807--- a/drivers/net/wireless/rndis_wlan.c
35808+++ b/drivers/net/wireless/rndis_wlan.c
35809@@ -1275,7 +1275,7 @@ static int set_rts_threshold(struct usbnet *usbdev, u32 rts_threshold)
35810
35811 netdev_dbg(usbdev->net, "%s(): %i\n", __func__, rts_threshold);
35812
35813- if (rts_threshold < 0 || rts_threshold > 2347)
35814+ if (rts_threshold > 2347)
35815 rts_threshold = 2347;
35816
35817 tmp = cpu_to_le32(rts_threshold);
35818diff --git a/drivers/net/wireless/wl1251/wl1251.h b/drivers/net/wireless/wl1251/wl1251.h
35819index a77f1bb..c608b2b 100644
35820--- a/drivers/net/wireless/wl1251/wl1251.h
35821+++ b/drivers/net/wireless/wl1251/wl1251.h
35822@@ -266,7 +266,7 @@ struct wl1251_if_operations {
35823 void (*reset)(struct wl1251 *wl);
35824 void (*enable_irq)(struct wl1251 *wl);
35825 void (*disable_irq)(struct wl1251 *wl);
35826-};
35827+} __no_const;
35828
35829 struct wl1251 {
35830 struct ieee80211_hw *hw;
35831diff --git a/drivers/oprofile/buffer_sync.c b/drivers/oprofile/buffer_sync.c
35832index f34b5b2..b5abb9f 100644
35833--- a/drivers/oprofile/buffer_sync.c
35834+++ b/drivers/oprofile/buffer_sync.c
35835@@ -343,7 +343,7 @@ static void add_data(struct op_entry *entry, struct mm_struct *mm)
35836 if (cookie == NO_COOKIE)
35837 offset = pc;
35838 if (cookie == INVALID_COOKIE) {
35839- atomic_inc(&oprofile_stats.sample_lost_no_mapping);
35840+ atomic_inc_unchecked(&oprofile_stats.sample_lost_no_mapping);
35841 offset = pc;
35842 }
35843 if (cookie != last_cookie) {
35844@@ -387,14 +387,14 @@ add_sample(struct mm_struct *mm, struct op_sample *s, int in_kernel)
35845 /* add userspace sample */
35846
35847 if (!mm) {
35848- atomic_inc(&oprofile_stats.sample_lost_no_mm);
35849+ atomic_inc_unchecked(&oprofile_stats.sample_lost_no_mm);
35850 return 0;
35851 }
35852
35853 cookie = lookup_dcookie(mm, s->eip, &offset);
35854
35855 if (cookie == INVALID_COOKIE) {
35856- atomic_inc(&oprofile_stats.sample_lost_no_mapping);
35857+ atomic_inc_unchecked(&oprofile_stats.sample_lost_no_mapping);
35858 return 0;
35859 }
35860
35861@@ -563,7 +563,7 @@ void sync_buffer(int cpu)
35862 /* ignore backtraces if failed to add a sample */
35863 if (state == sb_bt_start) {
35864 state = sb_bt_ignore;
35865- atomic_inc(&oprofile_stats.bt_lost_no_mapping);
35866+ atomic_inc_unchecked(&oprofile_stats.bt_lost_no_mapping);
35867 }
35868 }
35869 release_mm(mm);
35870diff --git a/drivers/oprofile/event_buffer.c b/drivers/oprofile/event_buffer.c
35871index c0cc4e7..44d4e54 100644
35872--- a/drivers/oprofile/event_buffer.c
35873+++ b/drivers/oprofile/event_buffer.c
35874@@ -53,7 +53,7 @@ void add_event_entry(unsigned long value)
35875 }
35876
35877 if (buffer_pos == buffer_size) {
35878- atomic_inc(&oprofile_stats.event_lost_overflow);
35879+ atomic_inc_unchecked(&oprofile_stats.event_lost_overflow);
35880 return;
35881 }
35882
35883diff --git a/drivers/oprofile/oprof.c b/drivers/oprofile/oprof.c
35884index f8c752e..28bf4fc 100644
35885--- a/drivers/oprofile/oprof.c
35886+++ b/drivers/oprofile/oprof.c
35887@@ -110,7 +110,7 @@ static void switch_worker(struct work_struct *work)
35888 if (oprofile_ops.switch_events())
35889 return;
35890
35891- atomic_inc(&oprofile_stats.multiplex_counter);
35892+ atomic_inc_unchecked(&oprofile_stats.multiplex_counter);
35893 start_switch_worker();
35894 }
35895
35896diff --git a/drivers/oprofile/oprofile_files.c b/drivers/oprofile/oprofile_files.c
35897index 84a208d..f07d177 100644
35898--- a/drivers/oprofile/oprofile_files.c
35899+++ b/drivers/oprofile/oprofile_files.c
35900@@ -36,6 +36,8 @@ static ssize_t timeout_read(struct file *file, char __user *buf,
35901
35902
35903 static ssize_t timeout_write(struct file *file, char const __user *buf,
35904+ size_t count, loff_t *offset) __size_overflow(3);
35905+static ssize_t timeout_write(struct file *file, char const __user *buf,
35906 size_t count, loff_t *offset)
35907 {
35908 unsigned long val;
35909@@ -72,6 +74,7 @@ static ssize_t depth_read(struct file *file, char __user *buf, size_t count, lof
35910 }
35911
35912
35913+static ssize_t depth_write(struct file *file, char const __user *buf, size_t count, loff_t *offset) __size_overflow(3);
35914 static ssize_t depth_write(struct file *file, char const __user *buf, size_t count, loff_t *offset)
35915 {
35916 unsigned long val;
35917@@ -126,12 +129,14 @@ static const struct file_operations cpu_type_fops = {
35918 };
35919
35920
35921+static ssize_t enable_read(struct file *file, char __user *buf, size_t count, loff_t *offset) __size_overflow(3);
35922 static ssize_t enable_read(struct file *file, char __user *buf, size_t count, loff_t *offset)
35923 {
35924 return oprofilefs_ulong_to_user(oprofile_started, buf, count, offset);
35925 }
35926
35927
35928+static ssize_t enable_write(struct file *file, char const __user *buf, size_t count, loff_t *offset) __size_overflow(3);
35929 static ssize_t enable_write(struct file *file, char const __user *buf, size_t count, loff_t *offset)
35930 {
35931 unsigned long val;
35932diff --git a/drivers/oprofile/oprofile_stats.c b/drivers/oprofile/oprofile_stats.c
35933index 917d28e..d62d981 100644
35934--- a/drivers/oprofile/oprofile_stats.c
35935+++ b/drivers/oprofile/oprofile_stats.c
35936@@ -30,11 +30,11 @@ void oprofile_reset_stats(void)
35937 cpu_buf->sample_invalid_eip = 0;
35938 }
35939
35940- atomic_set(&oprofile_stats.sample_lost_no_mm, 0);
35941- atomic_set(&oprofile_stats.sample_lost_no_mapping, 0);
35942- atomic_set(&oprofile_stats.event_lost_overflow, 0);
35943- atomic_set(&oprofile_stats.bt_lost_no_mapping, 0);
35944- atomic_set(&oprofile_stats.multiplex_counter, 0);
35945+ atomic_set_unchecked(&oprofile_stats.sample_lost_no_mm, 0);
35946+ atomic_set_unchecked(&oprofile_stats.sample_lost_no_mapping, 0);
35947+ atomic_set_unchecked(&oprofile_stats.event_lost_overflow, 0);
35948+ atomic_set_unchecked(&oprofile_stats.bt_lost_no_mapping, 0);
35949+ atomic_set_unchecked(&oprofile_stats.multiplex_counter, 0);
35950 }
35951
35952
35953diff --git a/drivers/oprofile/oprofile_stats.h b/drivers/oprofile/oprofile_stats.h
35954index 38b6fc0..b5cbfce 100644
35955--- a/drivers/oprofile/oprofile_stats.h
35956+++ b/drivers/oprofile/oprofile_stats.h
35957@@ -13,11 +13,11 @@
35958 #include <linux/atomic.h>
35959
35960 struct oprofile_stat_struct {
35961- atomic_t sample_lost_no_mm;
35962- atomic_t sample_lost_no_mapping;
35963- atomic_t bt_lost_no_mapping;
35964- atomic_t event_lost_overflow;
35965- atomic_t multiplex_counter;
35966+ atomic_unchecked_t sample_lost_no_mm;
35967+ atomic_unchecked_t sample_lost_no_mapping;
35968+ atomic_unchecked_t bt_lost_no_mapping;
35969+ atomic_unchecked_t event_lost_overflow;
35970+ atomic_unchecked_t multiplex_counter;
35971 };
35972
35973 extern struct oprofile_stat_struct oprofile_stats;
35974diff --git a/drivers/oprofile/oprofilefs.c b/drivers/oprofile/oprofilefs.c
35975index 2f0aa0f..d5246c3 100644
35976--- a/drivers/oprofile/oprofilefs.c
35977+++ b/drivers/oprofile/oprofilefs.c
35978@@ -97,6 +97,7 @@ static ssize_t ulong_read_file(struct file *file, char __user *buf, size_t count
35979 }
35980
35981
35982+static ssize_t ulong_write_file(struct file *file, char const __user *buf, size_t count, loff_t *offset) __size_overflow(3);
35983 static ssize_t ulong_write_file(struct file *file, char const __user *buf, size_t count, loff_t *offset)
35984 {
35985 unsigned long value;
35986@@ -193,7 +194,7 @@ static const struct file_operations atomic_ro_fops = {
35987
35988
35989 int oprofilefs_create_ro_atomic(struct super_block *sb, struct dentry *root,
35990- char const *name, atomic_t *val)
35991+ char const *name, atomic_unchecked_t *val)
35992 {
35993 return __oprofilefs_create_file(sb, root, name,
35994 &atomic_ro_fops, 0444, val);
35995diff --git a/drivers/parport/procfs.c b/drivers/parport/procfs.c
35996index 3f56bc0..707d642 100644
35997--- a/drivers/parport/procfs.c
35998+++ b/drivers/parport/procfs.c
35999@@ -64,7 +64,7 @@ static int do_active_device(ctl_table *table, int write,
36000
36001 *ppos += len;
36002
36003- return copy_to_user(result, buffer, len) ? -EFAULT : 0;
36004+ return (len > sizeof buffer || copy_to_user(result, buffer, len)) ? -EFAULT : 0;
36005 }
36006
36007 #ifdef CONFIG_PARPORT_1284
36008@@ -106,7 +106,7 @@ static int do_autoprobe(ctl_table *table, int write,
36009
36010 *ppos += len;
36011
36012- return copy_to_user (result, buffer, len) ? -EFAULT : 0;
36013+ return (len > sizeof buffer || copy_to_user (result, buffer, len)) ? -EFAULT : 0;
36014 }
36015 #endif /* IEEE1284.3 support. */
36016
36017diff --git a/drivers/pci/hotplug/cpci_hotplug.h b/drivers/pci/hotplug/cpci_hotplug.h
36018index 9fff878..ad0ad53 100644
36019--- a/drivers/pci/hotplug/cpci_hotplug.h
36020+++ b/drivers/pci/hotplug/cpci_hotplug.h
36021@@ -59,7 +59,7 @@ struct cpci_hp_controller_ops {
36022 int (*hardware_test) (struct slot* slot, u32 value);
36023 u8 (*get_power) (struct slot* slot);
36024 int (*set_power) (struct slot* slot, int value);
36025-};
36026+} __no_const;
36027
36028 struct cpci_hp_controller {
36029 unsigned int irq;
36030diff --git a/drivers/pci/hotplug/cpqphp_nvram.c b/drivers/pci/hotplug/cpqphp_nvram.c
36031index 76ba8a1..20ca857 100644
36032--- a/drivers/pci/hotplug/cpqphp_nvram.c
36033+++ b/drivers/pci/hotplug/cpqphp_nvram.c
36034@@ -428,9 +428,13 @@ static u32 store_HRT (void __iomem *rom_start)
36035
36036 void compaq_nvram_init (void __iomem *rom_start)
36037 {
36038+
36039+#ifndef CONFIG_PAX_KERNEXEC
36040 if (rom_start) {
36041 compaq_int15_entry_point = (rom_start + ROM_INT15_PHY_ADDR - ROM_PHY_ADDR);
36042 }
36043+#endif
36044+
36045 dbg("int15 entry = %p\n", compaq_int15_entry_point);
36046
36047 /* initialize our int15 lock */
36048diff --git a/drivers/pci/pcie/aspm.c b/drivers/pci/pcie/aspm.c
36049index 24f049e..051f66e 100644
36050--- a/drivers/pci/pcie/aspm.c
36051+++ b/drivers/pci/pcie/aspm.c
36052@@ -27,9 +27,9 @@
36053 #define MODULE_PARAM_PREFIX "pcie_aspm."
36054
36055 /* Note: those are not register definitions */
36056-#define ASPM_STATE_L0S_UP (1) /* Upstream direction L0s state */
36057-#define ASPM_STATE_L0S_DW (2) /* Downstream direction L0s state */
36058-#define ASPM_STATE_L1 (4) /* L1 state */
36059+#define ASPM_STATE_L0S_UP (1U) /* Upstream direction L0s state */
36060+#define ASPM_STATE_L0S_DW (2U) /* Downstream direction L0s state */
36061+#define ASPM_STATE_L1 (4U) /* L1 state */
36062 #define ASPM_STATE_L0S (ASPM_STATE_L0S_UP | ASPM_STATE_L0S_DW)
36063 #define ASPM_STATE_ALL (ASPM_STATE_L0S | ASPM_STATE_L1)
36064
36065diff --git a/drivers/pci/probe.c b/drivers/pci/probe.c
36066index dfee1b3..a454fb6 100644
36067--- a/drivers/pci/probe.c
36068+++ b/drivers/pci/probe.c
36069@@ -136,7 +136,7 @@ int __pci_read_base(struct pci_dev *dev, enum pci_bar_type type,
36070 u32 l, sz, mask;
36071 u16 orig_cmd;
36072
36073- mask = type ? PCI_ROM_ADDRESS_MASK : ~0;
36074+ mask = type ? (u32)PCI_ROM_ADDRESS_MASK : ~0;
36075
36076 if (!dev->mmio_always_on) {
36077 pci_read_config_word(dev, PCI_COMMAND, &orig_cmd);
36078diff --git a/drivers/pci/proc.c b/drivers/pci/proc.c
36079index 27911b5..5b6db88 100644
36080--- a/drivers/pci/proc.c
36081+++ b/drivers/pci/proc.c
36082@@ -476,7 +476,16 @@ static const struct file_operations proc_bus_pci_dev_operations = {
36083 static int __init pci_proc_init(void)
36084 {
36085 struct pci_dev *dev = NULL;
36086+
36087+#ifdef CONFIG_GRKERNSEC_PROC_ADD
36088+#ifdef CONFIG_GRKERNSEC_PROC_USER
36089+ proc_bus_pci_dir = proc_mkdir_mode("bus/pci", S_IRUSR | S_IXUSR, NULL);
36090+#elif defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
36091+ proc_bus_pci_dir = proc_mkdir_mode("bus/pci", S_IRUSR | S_IXUSR | S_IRGRP | S_IXGRP, NULL);
36092+#endif
36093+#else
36094 proc_bus_pci_dir = proc_mkdir("bus/pci", NULL);
36095+#endif
36096 proc_create("devices", 0, proc_bus_pci_dir,
36097 &proc_bus_pci_dev_operations);
36098 proc_initialized = 1;
36099diff --git a/drivers/platform/x86/asus_acpi.c b/drivers/platform/x86/asus_acpi.c
36100index d9312b3..59f63f2 100644
36101--- a/drivers/platform/x86/asus_acpi.c
36102+++ b/drivers/platform/x86/asus_acpi.c
36103@@ -887,6 +887,8 @@ static int lcd_proc_open(struct inode *inode, struct file *file)
36104 }
36105
36106 static ssize_t lcd_proc_write(struct file *file, const char __user *buffer,
36107+ size_t count, loff_t *pos) __size_overflow(3);
36108+static ssize_t lcd_proc_write(struct file *file, const char __user *buffer,
36109 size_t count, loff_t *pos)
36110 {
36111 int rv, value;
36112diff --git a/drivers/platform/x86/thinkpad_acpi.c b/drivers/platform/x86/thinkpad_acpi.c
36113index 7b82868..b9344c9 100644
36114--- a/drivers/platform/x86/thinkpad_acpi.c
36115+++ b/drivers/platform/x86/thinkpad_acpi.c
36116@@ -2094,7 +2094,7 @@ static int hotkey_mask_get(void)
36117 return 0;
36118 }
36119
36120-void static hotkey_mask_warn_incomplete_mask(void)
36121+static void hotkey_mask_warn_incomplete_mask(void)
36122 {
36123 /* log only what the user can fix... */
36124 const u32 wantedmask = hotkey_driver_mask &
36125@@ -2325,11 +2325,6 @@ static void hotkey_read_nvram(struct tp_nvram_state *n, const u32 m)
36126 }
36127 }
36128
36129-static void hotkey_compare_and_issue_event(struct tp_nvram_state *oldn,
36130- struct tp_nvram_state *newn,
36131- const u32 event_mask)
36132-{
36133-
36134 #define TPACPI_COMPARE_KEY(__scancode, __member) \
36135 do { \
36136 if ((event_mask & (1 << __scancode)) && \
36137@@ -2343,36 +2338,42 @@ static void hotkey_compare_and_issue_event(struct tp_nvram_state *oldn,
36138 tpacpi_hotkey_send_key(__scancode); \
36139 } while (0)
36140
36141- void issue_volchange(const unsigned int oldvol,
36142- const unsigned int newvol)
36143- {
36144- unsigned int i = oldvol;
36145+static void issue_volchange(const unsigned int oldvol,
36146+ const unsigned int newvol,
36147+ const u32 event_mask)
36148+{
36149+ unsigned int i = oldvol;
36150
36151- while (i > newvol) {
36152- TPACPI_MAY_SEND_KEY(TP_ACPI_HOTKEYSCAN_VOLUMEDOWN);
36153- i--;
36154- }
36155- while (i < newvol) {
36156- TPACPI_MAY_SEND_KEY(TP_ACPI_HOTKEYSCAN_VOLUMEUP);
36157- i++;
36158- }
36159+ while (i > newvol) {
36160+ TPACPI_MAY_SEND_KEY(TP_ACPI_HOTKEYSCAN_VOLUMEDOWN);
36161+ i--;
36162 }
36163+ while (i < newvol) {
36164+ TPACPI_MAY_SEND_KEY(TP_ACPI_HOTKEYSCAN_VOLUMEUP);
36165+ i++;
36166+ }
36167+}
36168
36169- void issue_brightnesschange(const unsigned int oldbrt,
36170- const unsigned int newbrt)
36171- {
36172- unsigned int i = oldbrt;
36173+static void issue_brightnesschange(const unsigned int oldbrt,
36174+ const unsigned int newbrt,
36175+ const u32 event_mask)
36176+{
36177+ unsigned int i = oldbrt;
36178
36179- while (i > newbrt) {
36180- TPACPI_MAY_SEND_KEY(TP_ACPI_HOTKEYSCAN_FNEND);
36181- i--;
36182- }
36183- while (i < newbrt) {
36184- TPACPI_MAY_SEND_KEY(TP_ACPI_HOTKEYSCAN_FNHOME);
36185- i++;
36186- }
36187+ while (i > newbrt) {
36188+ TPACPI_MAY_SEND_KEY(TP_ACPI_HOTKEYSCAN_FNEND);
36189+ i--;
36190+ }
36191+ while (i < newbrt) {
36192+ TPACPI_MAY_SEND_KEY(TP_ACPI_HOTKEYSCAN_FNHOME);
36193+ i++;
36194 }
36195+}
36196
36197+static void hotkey_compare_and_issue_event(struct tp_nvram_state *oldn,
36198+ struct tp_nvram_state *newn,
36199+ const u32 event_mask)
36200+{
36201 TPACPI_COMPARE_KEY(TP_ACPI_HOTKEYSCAN_THINKPAD, thinkpad_toggle);
36202 TPACPI_COMPARE_KEY(TP_ACPI_HOTKEYSCAN_FNSPACE, zoom_toggle);
36203 TPACPI_COMPARE_KEY(TP_ACPI_HOTKEYSCAN_FNF7, display_toggle);
36204@@ -2406,7 +2407,7 @@ static void hotkey_compare_and_issue_event(struct tp_nvram_state *oldn,
36205 oldn->volume_level != newn->volume_level) {
36206 /* recently muted, or repeated mute keypress, or
36207 * multiple presses ending in mute */
36208- issue_volchange(oldn->volume_level, newn->volume_level);
36209+ issue_volchange(oldn->volume_level, newn->volume_level, event_mask);
36210 TPACPI_MAY_SEND_KEY(TP_ACPI_HOTKEYSCAN_MUTE);
36211 }
36212 } else {
36213@@ -2416,7 +2417,7 @@ static void hotkey_compare_and_issue_event(struct tp_nvram_state *oldn,
36214 TPACPI_MAY_SEND_KEY(TP_ACPI_HOTKEYSCAN_VOLUMEUP);
36215 }
36216 if (oldn->volume_level != newn->volume_level) {
36217- issue_volchange(oldn->volume_level, newn->volume_level);
36218+ issue_volchange(oldn->volume_level, newn->volume_level, event_mask);
36219 } else if (oldn->volume_toggle != newn->volume_toggle) {
36220 /* repeated vol up/down keypress at end of scale ? */
36221 if (newn->volume_level == 0)
36222@@ -2429,7 +2430,8 @@ static void hotkey_compare_and_issue_event(struct tp_nvram_state *oldn,
36223 /* handle brightness */
36224 if (oldn->brightness_level != newn->brightness_level) {
36225 issue_brightnesschange(oldn->brightness_level,
36226- newn->brightness_level);
36227+ newn->brightness_level,
36228+ event_mask);
36229 } else if (oldn->brightness_toggle != newn->brightness_toggle) {
36230 /* repeated key presses that didn't change state */
36231 if (newn->brightness_level == 0)
36232@@ -2438,10 +2440,10 @@ static void hotkey_compare_and_issue_event(struct tp_nvram_state *oldn,
36233 && !tp_features.bright_unkfw)
36234 TPACPI_MAY_SEND_KEY(TP_ACPI_HOTKEYSCAN_FNHOME);
36235 }
36236+}
36237
36238 #undef TPACPI_COMPARE_KEY
36239 #undef TPACPI_MAY_SEND_KEY
36240-}
36241
36242 /*
36243 * Polling driver
36244diff --git a/drivers/platform/x86/toshiba_acpi.c b/drivers/platform/x86/toshiba_acpi.c
36245index dcdc1f4..85cee16 100644
36246--- a/drivers/platform/x86/toshiba_acpi.c
36247+++ b/drivers/platform/x86/toshiba_acpi.c
36248@@ -517,6 +517,8 @@ static int set_lcd_status(struct backlight_device *bd)
36249 }
36250
36251 static ssize_t lcd_proc_write(struct file *file, const char __user *buf,
36252+ size_t count, loff_t *pos) __size_overflow(3);
36253+static ssize_t lcd_proc_write(struct file *file, const char __user *buf,
36254 size_t count, loff_t *pos)
36255 {
36256 struct toshiba_acpi_dev *dev = PDE(file->f_path.dentry->d_inode)->data;
36257diff --git a/drivers/pnp/pnpbios/bioscalls.c b/drivers/pnp/pnpbios/bioscalls.c
36258index b859d16..5cc6b1a 100644
36259--- a/drivers/pnp/pnpbios/bioscalls.c
36260+++ b/drivers/pnp/pnpbios/bioscalls.c
36261@@ -59,7 +59,7 @@ do { \
36262 set_desc_limit(&gdt[(selname) >> 3], (size) - 1); \
36263 } while(0)
36264
36265-static struct desc_struct bad_bios_desc = GDT_ENTRY_INIT(0x4092,
36266+static const struct desc_struct bad_bios_desc = GDT_ENTRY_INIT(0x4093,
36267 (unsigned long)__va(0x400UL), PAGE_SIZE - 0x400 - 1);
36268
36269 /*
36270@@ -96,7 +96,10 @@ static inline u16 call_pnp_bios(u16 func, u16 arg1, u16 arg2, u16 arg3,
36271
36272 cpu = get_cpu();
36273 save_desc_40 = get_cpu_gdt_table(cpu)[0x40 / 8];
36274+
36275+ pax_open_kernel();
36276 get_cpu_gdt_table(cpu)[0x40 / 8] = bad_bios_desc;
36277+ pax_close_kernel();
36278
36279 /* On some boxes IRQ's during PnP BIOS calls are deadly. */
36280 spin_lock_irqsave(&pnp_bios_lock, flags);
36281@@ -134,7 +137,10 @@ static inline u16 call_pnp_bios(u16 func, u16 arg1, u16 arg2, u16 arg3,
36282 :"memory");
36283 spin_unlock_irqrestore(&pnp_bios_lock, flags);
36284
36285+ pax_open_kernel();
36286 get_cpu_gdt_table(cpu)[0x40 / 8] = save_desc_40;
36287+ pax_close_kernel();
36288+
36289 put_cpu();
36290
36291 /* If we get here and this is set then the PnP BIOS faulted on us. */
36292@@ -468,7 +474,7 @@ int pnp_bios_read_escd(char *data, u32 nvram_base)
36293 return status;
36294 }
36295
36296-void pnpbios_calls_init(union pnp_bios_install_struct *header)
36297+void __init pnpbios_calls_init(union pnp_bios_install_struct *header)
36298 {
36299 int i;
36300
36301@@ -476,6 +482,8 @@ void pnpbios_calls_init(union pnp_bios_install_struct *header)
36302 pnp_bios_callpoint.offset = header->fields.pm16offset;
36303 pnp_bios_callpoint.segment = PNP_CS16;
36304
36305+ pax_open_kernel();
36306+
36307 for_each_possible_cpu(i) {
36308 struct desc_struct *gdt = get_cpu_gdt_table(i);
36309 if (!gdt)
36310@@ -487,4 +495,6 @@ void pnpbios_calls_init(union pnp_bios_install_struct *header)
36311 set_desc_base(&gdt[GDT_ENTRY_PNPBIOS_DS],
36312 (unsigned long)__va(header->fields.pm16dseg));
36313 }
36314+
36315+ pax_close_kernel();
36316 }
36317diff --git a/drivers/pnp/resource.c b/drivers/pnp/resource.c
36318index b0ecacb..7c9da2e 100644
36319--- a/drivers/pnp/resource.c
36320+++ b/drivers/pnp/resource.c
36321@@ -360,7 +360,7 @@ int pnp_check_irq(struct pnp_dev *dev, struct resource *res)
36322 return 1;
36323
36324 /* check if the resource is valid */
36325- if (*irq < 0 || *irq > 15)
36326+ if (*irq > 15)
36327 return 0;
36328
36329 /* check if the resource is reserved */
36330@@ -424,7 +424,7 @@ int pnp_check_dma(struct pnp_dev *dev, struct resource *res)
36331 return 1;
36332
36333 /* check if the resource is valid */
36334- if (*dma < 0 || *dma == 4 || *dma > 7)
36335+ if (*dma == 4 || *dma > 7)
36336 return 0;
36337
36338 /* check if the resource is reserved */
36339diff --git a/drivers/power/bq27x00_battery.c b/drivers/power/bq27x00_battery.c
36340index bb16f5b..c751eef 100644
36341--- a/drivers/power/bq27x00_battery.c
36342+++ b/drivers/power/bq27x00_battery.c
36343@@ -67,7 +67,7 @@
36344 struct bq27x00_device_info;
36345 struct bq27x00_access_methods {
36346 int (*read)(struct bq27x00_device_info *di, u8 reg, bool single);
36347-};
36348+} __no_const;
36349
36350 enum bq27x00_chip { BQ27000, BQ27500 };
36351
36352diff --git a/drivers/regulator/max8660.c b/drivers/regulator/max8660.c
36353index 33f5d9a..d957d3f 100644
36354--- a/drivers/regulator/max8660.c
36355+++ b/drivers/regulator/max8660.c
36356@@ -383,8 +383,10 @@ static int __devinit max8660_probe(struct i2c_client *client,
36357 max8660->shadow_regs[MAX8660_OVER1] = 5;
36358 } else {
36359 /* Otherwise devices can be toggled via software */
36360- max8660_dcdc_ops.enable = max8660_dcdc_enable;
36361- max8660_dcdc_ops.disable = max8660_dcdc_disable;
36362+ pax_open_kernel();
36363+ *(void **)&max8660_dcdc_ops.enable = max8660_dcdc_enable;
36364+ *(void **)&max8660_dcdc_ops.disable = max8660_dcdc_disable;
36365+ pax_close_kernel();
36366 }
36367
36368 /*
36369diff --git a/drivers/regulator/mc13892-regulator.c b/drivers/regulator/mc13892-regulator.c
36370index 023d17d..74ef35b 100644
36371--- a/drivers/regulator/mc13892-regulator.c
36372+++ b/drivers/regulator/mc13892-regulator.c
36373@@ -565,10 +565,12 @@ static int __devinit mc13892_regulator_probe(struct platform_device *pdev)
36374 }
36375 mc13xxx_unlock(mc13892);
36376
36377- mc13892_regulators[MC13892_VCAM].desc.ops->set_mode
36378+ pax_open_kernel();
36379+ *(void **)&mc13892_regulators[MC13892_VCAM].desc.ops->set_mode
36380 = mc13892_vcam_set_mode;
36381- mc13892_regulators[MC13892_VCAM].desc.ops->get_mode
36382+ *(void **)&mc13892_regulators[MC13892_VCAM].desc.ops->get_mode
36383 = mc13892_vcam_get_mode;
36384+ pax_close_kernel();
36385 for (i = 0; i < pdata->num_regulators; i++) {
36386 init_data = &pdata->regulators[i];
36387 priv->regulators[i] = regulator_register(
36388diff --git a/drivers/rtc/rtc-dev.c b/drivers/rtc/rtc-dev.c
36389index cace6d3..f623fda 100644
36390--- a/drivers/rtc/rtc-dev.c
36391+++ b/drivers/rtc/rtc-dev.c
36392@@ -14,6 +14,7 @@
36393 #include <linux/module.h>
36394 #include <linux/rtc.h>
36395 #include <linux/sched.h>
36396+#include <linux/grsecurity.h>
36397 #include "rtc-core.h"
36398
36399 static dev_t rtc_devt;
36400@@ -345,6 +346,8 @@ static long rtc_dev_ioctl(struct file *file,
36401 if (copy_from_user(&tm, uarg, sizeof(tm)))
36402 return -EFAULT;
36403
36404+ gr_log_timechange();
36405+
36406 return rtc_set_time(rtc, &tm);
36407
36408 case RTC_PIE_ON:
36409diff --git a/drivers/scsi/aacraid/aacraid.h b/drivers/scsi/aacraid/aacraid.h
36410index ffb5878..e6d785c 100644
36411--- a/drivers/scsi/aacraid/aacraid.h
36412+++ b/drivers/scsi/aacraid/aacraid.h
36413@@ -492,7 +492,7 @@ struct adapter_ops
36414 int (*adapter_scsi)(struct fib * fib, struct scsi_cmnd * cmd);
36415 /* Administrative operations */
36416 int (*adapter_comm)(struct aac_dev * dev, int comm);
36417-};
36418+} __no_const;
36419
36420 /*
36421 * Define which interrupt handler needs to be installed
36422diff --git a/drivers/scsi/aacraid/linit.c b/drivers/scsi/aacraid/linit.c
36423index 705e13e..91c873c 100644
36424--- a/drivers/scsi/aacraid/linit.c
36425+++ b/drivers/scsi/aacraid/linit.c
36426@@ -93,7 +93,7 @@ static DECLARE_PCI_DEVICE_TABLE(aac_pci_tbl) = {
36427 #elif defined(__devinitconst)
36428 static const struct pci_device_id aac_pci_tbl[] __devinitconst = {
36429 #else
36430-static const struct pci_device_id aac_pci_tbl[] __devinitdata = {
36431+static const struct pci_device_id aac_pci_tbl[] __devinitconst = {
36432 #endif
36433 { 0x1028, 0x0001, 0x1028, 0x0001, 0, 0, 0 }, /* PERC 2/Si (Iguana/PERC2Si) */
36434 { 0x1028, 0x0002, 0x1028, 0x0002, 0, 0, 1 }, /* PERC 3/Di (Opal/PERC3Di) */
36435diff --git a/drivers/scsi/aic94xx/aic94xx_init.c b/drivers/scsi/aic94xx/aic94xx_init.c
36436index d5ff142..49c0ebb 100644
36437--- a/drivers/scsi/aic94xx/aic94xx_init.c
36438+++ b/drivers/scsi/aic94xx/aic94xx_init.c
36439@@ -1012,7 +1012,7 @@ static struct sas_domain_function_template aic94xx_transport_functions = {
36440 .lldd_control_phy = asd_control_phy,
36441 };
36442
36443-static const struct pci_device_id aic94xx_pci_table[] __devinitdata = {
36444+static const struct pci_device_id aic94xx_pci_table[] __devinitconst = {
36445 {PCI_DEVICE(PCI_VENDOR_ID_ADAPTEC2, 0x410),0, 0, 1},
36446 {PCI_DEVICE(PCI_VENDOR_ID_ADAPTEC2, 0x412),0, 0, 1},
36447 {PCI_DEVICE(PCI_VENDOR_ID_ADAPTEC2, 0x416),0, 0, 1},
36448diff --git a/drivers/scsi/bfa/bfa.h b/drivers/scsi/bfa/bfa.h
36449index a796de9..1ef20e1 100644
36450--- a/drivers/scsi/bfa/bfa.h
36451+++ b/drivers/scsi/bfa/bfa.h
36452@@ -196,7 +196,7 @@ struct bfa_hwif_s {
36453 u32 *end);
36454 int cpe_vec_q0;
36455 int rme_vec_q0;
36456-};
36457+} __no_const;
36458 typedef void (*bfa_cb_iocfc_t) (void *cbarg, enum bfa_status status);
36459
36460 struct bfa_faa_cbfn_s {
36461diff --git a/drivers/scsi/bfa/bfa_fcpim.c b/drivers/scsi/bfa/bfa_fcpim.c
36462index e07bd47..cd1bbbb 100644
36463--- a/drivers/scsi/bfa/bfa_fcpim.c
36464+++ b/drivers/scsi/bfa/bfa_fcpim.c
36465@@ -4121,7 +4121,7 @@ bfa_fcp_attach(struct bfa_s *bfa, void *bfad, struct bfa_iocfc_cfg_s *cfg,
36466
36467 bfa_iotag_attach(fcp);
36468
36469- fcp->itn_arr = (struct bfa_itn_s *) bfa_mem_kva_curp(fcp);
36470+ fcp->itn_arr = (bfa_itn_s_no_const *) bfa_mem_kva_curp(fcp);
36471 bfa_mem_kva_curp(fcp) = (u8 *)fcp->itn_arr +
36472 (fcp->num_itns * sizeof(struct bfa_itn_s));
36473 memset(fcp->itn_arr, 0,
36474@@ -4179,7 +4179,7 @@ bfa_itn_create(struct bfa_s *bfa, struct bfa_rport_s *rport,
36475 void (*isr)(struct bfa_s *bfa, struct bfi_msg_s *m))
36476 {
36477 struct bfa_fcp_mod_s *fcp = BFA_FCP_MOD(bfa);
36478- struct bfa_itn_s *itn;
36479+ bfa_itn_s_no_const *itn;
36480
36481 itn = BFA_ITN_FROM_TAG(fcp, rport->rport_tag);
36482 itn->isr = isr;
36483diff --git a/drivers/scsi/bfa/bfa_fcpim.h b/drivers/scsi/bfa/bfa_fcpim.h
36484index 1080bcb..a3b39e3 100644
36485--- a/drivers/scsi/bfa/bfa_fcpim.h
36486+++ b/drivers/scsi/bfa/bfa_fcpim.h
36487@@ -37,6 +37,7 @@ struct bfa_iotag_s {
36488 struct bfa_itn_s {
36489 bfa_isr_func_t isr;
36490 };
36491+typedef struct bfa_itn_s __no_const bfa_itn_s_no_const;
36492
36493 void bfa_itn_create(struct bfa_s *bfa, struct bfa_rport_s *rport,
36494 void (*isr)(struct bfa_s *bfa, struct bfi_msg_s *m));
36495@@ -149,7 +150,7 @@ struct bfa_fcp_mod_s {
36496 struct list_head iotag_tio_free_q; /* free IO resources */
36497 struct list_head iotag_unused_q; /* unused IO resources*/
36498 struct bfa_iotag_s *iotag_arr;
36499- struct bfa_itn_s *itn_arr;
36500+ bfa_itn_s_no_const *itn_arr;
36501 int num_ioim_reqs;
36502 int num_fwtio_reqs;
36503 int num_itns;
36504diff --git a/drivers/scsi/bfa/bfa_ioc.h b/drivers/scsi/bfa/bfa_ioc.h
36505index 546d46b..642fa5b 100644
36506--- a/drivers/scsi/bfa/bfa_ioc.h
36507+++ b/drivers/scsi/bfa/bfa_ioc.h
36508@@ -258,7 +258,7 @@ struct bfa_ioc_cbfn_s {
36509 bfa_ioc_disable_cbfn_t disable_cbfn;
36510 bfa_ioc_hbfail_cbfn_t hbfail_cbfn;
36511 bfa_ioc_reset_cbfn_t reset_cbfn;
36512-};
36513+} __no_const;
36514
36515 /*
36516 * IOC event notification mechanism.
36517@@ -346,7 +346,7 @@ struct bfa_ioc_hwif_s {
36518 void (*ioc_sync_ack) (struct bfa_ioc_s *ioc);
36519 bfa_boolean_t (*ioc_sync_complete) (struct bfa_ioc_s *ioc);
36520 bfa_boolean_t (*ioc_lpu_read_stat) (struct bfa_ioc_s *ioc);
36521-};
36522+} __no_const;
36523
36524 /*
36525 * Queue element to wait for room in request queue. FIFO order is
36526diff --git a/drivers/scsi/hosts.c b/drivers/scsi/hosts.c
36527index 351dc0b..951dc32 100644
36528--- a/drivers/scsi/hosts.c
36529+++ b/drivers/scsi/hosts.c
36530@@ -42,7 +42,7 @@
36531 #include "scsi_logging.h"
36532
36533
36534-static atomic_t scsi_host_next_hn; /* host_no for next new host */
36535+static atomic_unchecked_t scsi_host_next_hn; /* host_no for next new host */
36536
36537
36538 static void scsi_host_cls_release(struct device *dev)
36539@@ -357,7 +357,7 @@ struct Scsi_Host *scsi_host_alloc(struct scsi_host_template *sht, int privsize)
36540 * subtract one because we increment first then return, but we need to
36541 * know what the next host number was before increment
36542 */
36543- shost->host_no = atomic_inc_return(&scsi_host_next_hn) - 1;
36544+ shost->host_no = atomic_inc_return_unchecked(&scsi_host_next_hn) - 1;
36545 shost->dma_channel = 0xff;
36546
36547 /* These three are default values which can be overridden */
36548diff --git a/drivers/scsi/hpsa.c b/drivers/scsi/hpsa.c
36549index 865d452..e9b7fa7 100644
36550--- a/drivers/scsi/hpsa.c
36551+++ b/drivers/scsi/hpsa.c
36552@@ -505,7 +505,7 @@ static inline u32 next_command(struct ctlr_info *h)
36553 u32 a;
36554
36555 if (unlikely(!(h->transMethod & CFGTBL_Trans_Performant)))
36556- return h->access.command_completed(h);
36557+ return h->access->command_completed(h);
36558
36559 if ((*(h->reply_pool_head) & 1) == (h->reply_pool_wraparound)) {
36560 a = *(h->reply_pool_head); /* Next cmd in ring buffer */
36561@@ -2989,7 +2989,7 @@ static void start_io(struct ctlr_info *h)
36562 while (!list_empty(&h->reqQ)) {
36563 c = list_entry(h->reqQ.next, struct CommandList, list);
36564 /* can't do anything if fifo is full */
36565- if ((h->access.fifo_full(h))) {
36566+ if ((h->access->fifo_full(h))) {
36567 dev_warn(&h->pdev->dev, "fifo full\n");
36568 break;
36569 }
36570@@ -2999,7 +2999,7 @@ static void start_io(struct ctlr_info *h)
36571 h->Qdepth--;
36572
36573 /* Tell the controller execute command */
36574- h->access.submit_command(h, c);
36575+ h->access->submit_command(h, c);
36576
36577 /* Put job onto the completed Q */
36578 addQ(&h->cmpQ, c);
36579@@ -3008,17 +3008,17 @@ static void start_io(struct ctlr_info *h)
36580
36581 static inline unsigned long get_next_completion(struct ctlr_info *h)
36582 {
36583- return h->access.command_completed(h);
36584+ return h->access->command_completed(h);
36585 }
36586
36587 static inline bool interrupt_pending(struct ctlr_info *h)
36588 {
36589- return h->access.intr_pending(h);
36590+ return h->access->intr_pending(h);
36591 }
36592
36593 static inline long interrupt_not_for_us(struct ctlr_info *h)
36594 {
36595- return (h->access.intr_pending(h) == 0) ||
36596+ return (h->access->intr_pending(h) == 0) ||
36597 (h->interrupts_enabled == 0);
36598 }
36599
36600@@ -3917,7 +3917,7 @@ static int __devinit hpsa_pci_init(struct ctlr_info *h)
36601 if (prod_index < 0)
36602 return -ENODEV;
36603 h->product_name = products[prod_index].product_name;
36604- h->access = *(products[prod_index].access);
36605+ h->access = products[prod_index].access;
36606
36607 if (hpsa_board_disabled(h->pdev)) {
36608 dev_warn(&h->pdev->dev, "controller appears to be disabled\n");
36609@@ -4162,7 +4162,7 @@ static void controller_lockup_detected(struct ctlr_info *h)
36610
36611 assert_spin_locked(&lockup_detector_lock);
36612 remove_ctlr_from_lockup_detector_list(h);
36613- h->access.set_intr_mask(h, HPSA_INTR_OFF);
36614+ h->access->set_intr_mask(h, HPSA_INTR_OFF);
36615 spin_lock_irqsave(&h->lock, flags);
36616 h->lockup_detected = readl(h->vaddr + SA5_SCRATCHPAD_OFFSET);
36617 spin_unlock_irqrestore(&h->lock, flags);
36618@@ -4340,7 +4340,7 @@ reinit_after_soft_reset:
36619 }
36620
36621 /* make sure the board interrupts are off */
36622- h->access.set_intr_mask(h, HPSA_INTR_OFF);
36623+ h->access->set_intr_mask(h, HPSA_INTR_OFF);
36624
36625 if (hpsa_request_irq(h, do_hpsa_intr_msi, do_hpsa_intr_intx))
36626 goto clean2;
36627@@ -4374,7 +4374,7 @@ reinit_after_soft_reset:
36628 * fake ones to scoop up any residual completions.
36629 */
36630 spin_lock_irqsave(&h->lock, flags);
36631- h->access.set_intr_mask(h, HPSA_INTR_OFF);
36632+ h->access->set_intr_mask(h, HPSA_INTR_OFF);
36633 spin_unlock_irqrestore(&h->lock, flags);
36634 free_irq(h->intr[h->intr_mode], h);
36635 rc = hpsa_request_irq(h, hpsa_msix_discard_completions,
36636@@ -4393,9 +4393,9 @@ reinit_after_soft_reset:
36637 dev_info(&h->pdev->dev, "Board READY.\n");
36638 dev_info(&h->pdev->dev,
36639 "Waiting for stale completions to drain.\n");
36640- h->access.set_intr_mask(h, HPSA_INTR_ON);
36641+ h->access->set_intr_mask(h, HPSA_INTR_ON);
36642 msleep(10000);
36643- h->access.set_intr_mask(h, HPSA_INTR_OFF);
36644+ h->access->set_intr_mask(h, HPSA_INTR_OFF);
36645
36646 rc = controller_reset_failed(h->cfgtable);
36647 if (rc)
36648@@ -4416,7 +4416,7 @@ reinit_after_soft_reset:
36649 }
36650
36651 /* Turn the interrupts on so we can service requests */
36652- h->access.set_intr_mask(h, HPSA_INTR_ON);
36653+ h->access->set_intr_mask(h, HPSA_INTR_ON);
36654
36655 hpsa_hba_inquiry(h);
36656 hpsa_register_scsi(h); /* hook ourselves into SCSI subsystem */
36657@@ -4468,7 +4468,7 @@ static void hpsa_shutdown(struct pci_dev *pdev)
36658 * To write all data in the battery backed cache to disks
36659 */
36660 hpsa_flush_cache(h);
36661- h->access.set_intr_mask(h, HPSA_INTR_OFF);
36662+ h->access->set_intr_mask(h, HPSA_INTR_OFF);
36663 free_irq(h->intr[h->intr_mode], h);
36664 #ifdef CONFIG_PCI_MSI
36665 if (h->msix_vector)
36666@@ -4632,7 +4632,7 @@ static __devinit void hpsa_enter_performant_mode(struct ctlr_info *h,
36667 return;
36668 }
36669 /* Change the access methods to the performant access methods */
36670- h->access = SA5_performant_access;
36671+ h->access = &SA5_performant_access;
36672 h->transMethod = CFGTBL_Trans_Performant;
36673 }
36674
36675diff --git a/drivers/scsi/hpsa.h b/drivers/scsi/hpsa.h
36676index 91edafb..a9b88ec 100644
36677--- a/drivers/scsi/hpsa.h
36678+++ b/drivers/scsi/hpsa.h
36679@@ -73,7 +73,7 @@ struct ctlr_info {
36680 unsigned int msix_vector;
36681 unsigned int msi_vector;
36682 int intr_mode; /* either PERF_MODE_INT or SIMPLE_MODE_INT */
36683- struct access_method access;
36684+ struct access_method *access;
36685
36686 /* queue and queue Info */
36687 struct list_head reqQ;
36688diff --git a/drivers/scsi/ips.h b/drivers/scsi/ips.h
36689index f2df059..a3a9930 100644
36690--- a/drivers/scsi/ips.h
36691+++ b/drivers/scsi/ips.h
36692@@ -1027,7 +1027,7 @@ typedef struct {
36693 int (*intr)(struct ips_ha *);
36694 void (*enableint)(struct ips_ha *);
36695 uint32_t (*statupd)(struct ips_ha *);
36696-} ips_hw_func_t;
36697+} __no_const ips_hw_func_t;
36698
36699 typedef struct ips_ha {
36700 uint8_t ha_id[IPS_MAX_CHANNELS+1];
36701diff --git a/drivers/scsi/libfc/fc_exch.c b/drivers/scsi/libfc/fc_exch.c
36702index 9de9db2..1e09660 100644
36703--- a/drivers/scsi/libfc/fc_exch.c
36704+++ b/drivers/scsi/libfc/fc_exch.c
36705@@ -105,12 +105,12 @@ struct fc_exch_mgr {
36706 * all together if not used XXX
36707 */
36708 struct {
36709- atomic_t no_free_exch;
36710- atomic_t no_free_exch_xid;
36711- atomic_t xid_not_found;
36712- atomic_t xid_busy;
36713- atomic_t seq_not_found;
36714- atomic_t non_bls_resp;
36715+ atomic_unchecked_t no_free_exch;
36716+ atomic_unchecked_t no_free_exch_xid;
36717+ atomic_unchecked_t xid_not_found;
36718+ atomic_unchecked_t xid_busy;
36719+ atomic_unchecked_t seq_not_found;
36720+ atomic_unchecked_t non_bls_resp;
36721 } stats;
36722 };
36723
36724@@ -719,7 +719,7 @@ static struct fc_exch *fc_exch_em_alloc(struct fc_lport *lport,
36725 /* allocate memory for exchange */
36726 ep = mempool_alloc(mp->ep_pool, GFP_ATOMIC);
36727 if (!ep) {
36728- atomic_inc(&mp->stats.no_free_exch);
36729+ atomic_inc_unchecked(&mp->stats.no_free_exch);
36730 goto out;
36731 }
36732 memset(ep, 0, sizeof(*ep));
36733@@ -780,7 +780,7 @@ out:
36734 return ep;
36735 err:
36736 spin_unlock_bh(&pool->lock);
36737- atomic_inc(&mp->stats.no_free_exch_xid);
36738+ atomic_inc_unchecked(&mp->stats.no_free_exch_xid);
36739 mempool_free(ep, mp->ep_pool);
36740 return NULL;
36741 }
36742@@ -923,7 +923,7 @@ static enum fc_pf_rjt_reason fc_seq_lookup_recip(struct fc_lport *lport,
36743 xid = ntohs(fh->fh_ox_id); /* we originated exch */
36744 ep = fc_exch_find(mp, xid);
36745 if (!ep) {
36746- atomic_inc(&mp->stats.xid_not_found);
36747+ atomic_inc_unchecked(&mp->stats.xid_not_found);
36748 reject = FC_RJT_OX_ID;
36749 goto out;
36750 }
36751@@ -953,7 +953,7 @@ static enum fc_pf_rjt_reason fc_seq_lookup_recip(struct fc_lport *lport,
36752 ep = fc_exch_find(mp, xid);
36753 if ((f_ctl & FC_FC_FIRST_SEQ) && fc_sof_is_init(fr_sof(fp))) {
36754 if (ep) {
36755- atomic_inc(&mp->stats.xid_busy);
36756+ atomic_inc_unchecked(&mp->stats.xid_busy);
36757 reject = FC_RJT_RX_ID;
36758 goto rel;
36759 }
36760@@ -964,7 +964,7 @@ static enum fc_pf_rjt_reason fc_seq_lookup_recip(struct fc_lport *lport,
36761 }
36762 xid = ep->xid; /* get our XID */
36763 } else if (!ep) {
36764- atomic_inc(&mp->stats.xid_not_found);
36765+ atomic_inc_unchecked(&mp->stats.xid_not_found);
36766 reject = FC_RJT_RX_ID; /* XID not found */
36767 goto out;
36768 }
36769@@ -981,7 +981,7 @@ static enum fc_pf_rjt_reason fc_seq_lookup_recip(struct fc_lport *lport,
36770 } else {
36771 sp = &ep->seq;
36772 if (sp->id != fh->fh_seq_id) {
36773- atomic_inc(&mp->stats.seq_not_found);
36774+ atomic_inc_unchecked(&mp->stats.seq_not_found);
36775 if (f_ctl & FC_FC_END_SEQ) {
36776 /*
36777 * Update sequence_id based on incoming last
36778@@ -1431,22 +1431,22 @@ static void fc_exch_recv_seq_resp(struct fc_exch_mgr *mp, struct fc_frame *fp)
36779
36780 ep = fc_exch_find(mp, ntohs(fh->fh_ox_id));
36781 if (!ep) {
36782- atomic_inc(&mp->stats.xid_not_found);
36783+ atomic_inc_unchecked(&mp->stats.xid_not_found);
36784 goto out;
36785 }
36786 if (ep->esb_stat & ESB_ST_COMPLETE) {
36787- atomic_inc(&mp->stats.xid_not_found);
36788+ atomic_inc_unchecked(&mp->stats.xid_not_found);
36789 goto rel;
36790 }
36791 if (ep->rxid == FC_XID_UNKNOWN)
36792 ep->rxid = ntohs(fh->fh_rx_id);
36793 if (ep->sid != 0 && ep->sid != ntoh24(fh->fh_d_id)) {
36794- atomic_inc(&mp->stats.xid_not_found);
36795+ atomic_inc_unchecked(&mp->stats.xid_not_found);
36796 goto rel;
36797 }
36798 if (ep->did != ntoh24(fh->fh_s_id) &&
36799 ep->did != FC_FID_FLOGI) {
36800- atomic_inc(&mp->stats.xid_not_found);
36801+ atomic_inc_unchecked(&mp->stats.xid_not_found);
36802 goto rel;
36803 }
36804 sof = fr_sof(fp);
36805@@ -1455,7 +1455,7 @@ static void fc_exch_recv_seq_resp(struct fc_exch_mgr *mp, struct fc_frame *fp)
36806 sp->ssb_stat |= SSB_ST_RESP;
36807 sp->id = fh->fh_seq_id;
36808 } else if (sp->id != fh->fh_seq_id) {
36809- atomic_inc(&mp->stats.seq_not_found);
36810+ atomic_inc_unchecked(&mp->stats.seq_not_found);
36811 goto rel;
36812 }
36813
36814@@ -1519,9 +1519,9 @@ static void fc_exch_recv_resp(struct fc_exch_mgr *mp, struct fc_frame *fp)
36815 sp = fc_seq_lookup_orig(mp, fp); /* doesn't hold sequence */
36816
36817 if (!sp)
36818- atomic_inc(&mp->stats.xid_not_found);
36819+ atomic_inc_unchecked(&mp->stats.xid_not_found);
36820 else
36821- atomic_inc(&mp->stats.non_bls_resp);
36822+ atomic_inc_unchecked(&mp->stats.non_bls_resp);
36823
36824 fc_frame_free(fp);
36825 }
36826diff --git a/drivers/scsi/libsas/sas_ata.c b/drivers/scsi/libsas/sas_ata.c
36827index db9238f..4378ed2 100644
36828--- a/drivers/scsi/libsas/sas_ata.c
36829+++ b/drivers/scsi/libsas/sas_ata.c
36830@@ -368,7 +368,7 @@ static struct ata_port_operations sas_sata_ops = {
36831 .postreset = ata_std_postreset,
36832 .error_handler = ata_std_error_handler,
36833 .post_internal_cmd = sas_ata_post_internal,
36834- .qc_defer = ata_std_qc_defer,
36835+ .qc_defer = ata_std_qc_defer,
36836 .qc_prep = ata_noop_qc_prep,
36837 .qc_issue = sas_ata_qc_issue,
36838 .qc_fill_rtf = sas_ata_qc_fill_rtf,
36839diff --git a/drivers/scsi/lpfc/lpfc.h b/drivers/scsi/lpfc/lpfc.h
36840index bb4c8e0..f33d849 100644
36841--- a/drivers/scsi/lpfc/lpfc.h
36842+++ b/drivers/scsi/lpfc/lpfc.h
36843@@ -425,7 +425,7 @@ struct lpfc_vport {
36844 struct dentry *debug_nodelist;
36845 struct dentry *vport_debugfs_root;
36846 struct lpfc_debugfs_trc *disc_trc;
36847- atomic_t disc_trc_cnt;
36848+ atomic_unchecked_t disc_trc_cnt;
36849 #endif
36850 uint8_t stat_data_enabled;
36851 uint8_t stat_data_blocked;
36852@@ -835,8 +835,8 @@ struct lpfc_hba {
36853 struct timer_list fabric_block_timer;
36854 unsigned long bit_flags;
36855 #define FABRIC_COMANDS_BLOCKED 0
36856- atomic_t num_rsrc_err;
36857- atomic_t num_cmd_success;
36858+ atomic_unchecked_t num_rsrc_err;
36859+ atomic_unchecked_t num_cmd_success;
36860 unsigned long last_rsrc_error_time;
36861 unsigned long last_ramp_down_time;
36862 unsigned long last_ramp_up_time;
36863@@ -866,7 +866,7 @@ struct lpfc_hba {
36864
36865 struct dentry *debug_slow_ring_trc;
36866 struct lpfc_debugfs_trc *slow_ring_trc;
36867- atomic_t slow_ring_trc_cnt;
36868+ atomic_unchecked_t slow_ring_trc_cnt;
36869 /* iDiag debugfs sub-directory */
36870 struct dentry *idiag_root;
36871 struct dentry *idiag_pci_cfg;
36872diff --git a/drivers/scsi/lpfc/lpfc_debugfs.c b/drivers/scsi/lpfc/lpfc_debugfs.c
36873index 2838259..a07cfb5 100644
36874--- a/drivers/scsi/lpfc/lpfc_debugfs.c
36875+++ b/drivers/scsi/lpfc/lpfc_debugfs.c
36876@@ -106,7 +106,7 @@ MODULE_PARM_DESC(lpfc_debugfs_mask_disc_trc,
36877
36878 #include <linux/debugfs.h>
36879
36880-static atomic_t lpfc_debugfs_seq_trc_cnt = ATOMIC_INIT(0);
36881+static atomic_unchecked_t lpfc_debugfs_seq_trc_cnt = ATOMIC_INIT(0);
36882 static unsigned long lpfc_debugfs_start_time = 0L;
36883
36884 /* iDiag */
36885@@ -147,7 +147,7 @@ lpfc_debugfs_disc_trc_data(struct lpfc_vport *vport, char *buf, int size)
36886 lpfc_debugfs_enable = 0;
36887
36888 len = 0;
36889- index = (atomic_read(&vport->disc_trc_cnt) + 1) &
36890+ index = (atomic_read_unchecked(&vport->disc_trc_cnt) + 1) &
36891 (lpfc_debugfs_max_disc_trc - 1);
36892 for (i = index; i < lpfc_debugfs_max_disc_trc; i++) {
36893 dtp = vport->disc_trc + i;
36894@@ -213,7 +213,7 @@ lpfc_debugfs_slow_ring_trc_data(struct lpfc_hba *phba, char *buf, int size)
36895 lpfc_debugfs_enable = 0;
36896
36897 len = 0;
36898- index = (atomic_read(&phba->slow_ring_trc_cnt) + 1) &
36899+ index = (atomic_read_unchecked(&phba->slow_ring_trc_cnt) + 1) &
36900 (lpfc_debugfs_max_slow_ring_trc - 1);
36901 for (i = index; i < lpfc_debugfs_max_slow_ring_trc; i++) {
36902 dtp = phba->slow_ring_trc + i;
36903@@ -636,14 +636,14 @@ lpfc_debugfs_disc_trc(struct lpfc_vport *vport, int mask, char *fmt,
36904 !vport || !vport->disc_trc)
36905 return;
36906
36907- index = atomic_inc_return(&vport->disc_trc_cnt) &
36908+ index = atomic_inc_return_unchecked(&vport->disc_trc_cnt) &
36909 (lpfc_debugfs_max_disc_trc - 1);
36910 dtp = vport->disc_trc + index;
36911 dtp->fmt = fmt;
36912 dtp->data1 = data1;
36913 dtp->data2 = data2;
36914 dtp->data3 = data3;
36915- dtp->seq_cnt = atomic_inc_return(&lpfc_debugfs_seq_trc_cnt);
36916+ dtp->seq_cnt = atomic_inc_return_unchecked(&lpfc_debugfs_seq_trc_cnt);
36917 dtp->jif = jiffies;
36918 #endif
36919 return;
36920@@ -674,14 +674,14 @@ lpfc_debugfs_slow_ring_trc(struct lpfc_hba *phba, char *fmt,
36921 !phba || !phba->slow_ring_trc)
36922 return;
36923
36924- index = atomic_inc_return(&phba->slow_ring_trc_cnt) &
36925+ index = atomic_inc_return_unchecked(&phba->slow_ring_trc_cnt) &
36926 (lpfc_debugfs_max_slow_ring_trc - 1);
36927 dtp = phba->slow_ring_trc + index;
36928 dtp->fmt = fmt;
36929 dtp->data1 = data1;
36930 dtp->data2 = data2;
36931 dtp->data3 = data3;
36932- dtp->seq_cnt = atomic_inc_return(&lpfc_debugfs_seq_trc_cnt);
36933+ dtp->seq_cnt = atomic_inc_return_unchecked(&lpfc_debugfs_seq_trc_cnt);
36934 dtp->jif = jiffies;
36935 #endif
36936 return;
36937@@ -3986,7 +3986,7 @@ lpfc_debugfs_initialize(struct lpfc_vport *vport)
36938 "slow_ring buffer\n");
36939 goto debug_failed;
36940 }
36941- atomic_set(&phba->slow_ring_trc_cnt, 0);
36942+ atomic_set_unchecked(&phba->slow_ring_trc_cnt, 0);
36943 memset(phba->slow_ring_trc, 0,
36944 (sizeof(struct lpfc_debugfs_trc) *
36945 lpfc_debugfs_max_slow_ring_trc));
36946@@ -4032,7 +4032,7 @@ lpfc_debugfs_initialize(struct lpfc_vport *vport)
36947 "buffer\n");
36948 goto debug_failed;
36949 }
36950- atomic_set(&vport->disc_trc_cnt, 0);
36951+ atomic_set_unchecked(&vport->disc_trc_cnt, 0);
36952
36953 snprintf(name, sizeof(name), "discovery_trace");
36954 vport->debug_disc_trc =
36955diff --git a/drivers/scsi/lpfc/lpfc_init.c b/drivers/scsi/lpfc/lpfc_init.c
36956index 55bc4fc..a2a109c 100644
36957--- a/drivers/scsi/lpfc/lpfc_init.c
36958+++ b/drivers/scsi/lpfc/lpfc_init.c
36959@@ -10027,8 +10027,10 @@ lpfc_init(void)
36960 printk(LPFC_COPYRIGHT "\n");
36961
36962 if (lpfc_enable_npiv) {
36963- lpfc_transport_functions.vport_create = lpfc_vport_create;
36964- lpfc_transport_functions.vport_delete = lpfc_vport_delete;
36965+ pax_open_kernel();
36966+ *(void **)&lpfc_transport_functions.vport_create = lpfc_vport_create;
36967+ *(void **)&lpfc_transport_functions.vport_delete = lpfc_vport_delete;
36968+ pax_close_kernel();
36969 }
36970 lpfc_transport_template =
36971 fc_attach_transport(&lpfc_transport_functions);
36972diff --git a/drivers/scsi/lpfc/lpfc_scsi.c b/drivers/scsi/lpfc/lpfc_scsi.c
36973index 2e1e54e..1af0a0d 100644
36974--- a/drivers/scsi/lpfc/lpfc_scsi.c
36975+++ b/drivers/scsi/lpfc/lpfc_scsi.c
36976@@ -305,7 +305,7 @@ lpfc_rampdown_queue_depth(struct lpfc_hba *phba)
36977 uint32_t evt_posted;
36978
36979 spin_lock_irqsave(&phba->hbalock, flags);
36980- atomic_inc(&phba->num_rsrc_err);
36981+ atomic_inc_unchecked(&phba->num_rsrc_err);
36982 phba->last_rsrc_error_time = jiffies;
36983
36984 if ((phba->last_ramp_down_time + QUEUE_RAMP_DOWN_INTERVAL) > jiffies) {
36985@@ -346,7 +346,7 @@ lpfc_rampup_queue_depth(struct lpfc_vport *vport,
36986 unsigned long flags;
36987 struct lpfc_hba *phba = vport->phba;
36988 uint32_t evt_posted;
36989- atomic_inc(&phba->num_cmd_success);
36990+ atomic_inc_unchecked(&phba->num_cmd_success);
36991
36992 if (vport->cfg_lun_queue_depth <= queue_depth)
36993 return;
36994@@ -390,8 +390,8 @@ lpfc_ramp_down_queue_handler(struct lpfc_hba *phba)
36995 unsigned long num_rsrc_err, num_cmd_success;
36996 int i;
36997
36998- num_rsrc_err = atomic_read(&phba->num_rsrc_err);
36999- num_cmd_success = atomic_read(&phba->num_cmd_success);
37000+ num_rsrc_err = atomic_read_unchecked(&phba->num_rsrc_err);
37001+ num_cmd_success = atomic_read_unchecked(&phba->num_cmd_success);
37002
37003 vports = lpfc_create_vport_work_array(phba);
37004 if (vports != NULL)
37005@@ -411,8 +411,8 @@ lpfc_ramp_down_queue_handler(struct lpfc_hba *phba)
37006 }
37007 }
37008 lpfc_destroy_vport_work_array(phba, vports);
37009- atomic_set(&phba->num_rsrc_err, 0);
37010- atomic_set(&phba->num_cmd_success, 0);
37011+ atomic_set_unchecked(&phba->num_rsrc_err, 0);
37012+ atomic_set_unchecked(&phba->num_cmd_success, 0);
37013 }
37014
37015 /**
37016@@ -446,8 +446,8 @@ lpfc_ramp_up_queue_handler(struct lpfc_hba *phba)
37017 }
37018 }
37019 lpfc_destroy_vport_work_array(phba, vports);
37020- atomic_set(&phba->num_rsrc_err, 0);
37021- atomic_set(&phba->num_cmd_success, 0);
37022+ atomic_set_unchecked(&phba->num_rsrc_err, 0);
37023+ atomic_set_unchecked(&phba->num_cmd_success, 0);
37024 }
37025
37026 /**
37027diff --git a/drivers/scsi/pmcraid.c b/drivers/scsi/pmcraid.c
37028index 5163edb..7b142bc 100644
37029--- a/drivers/scsi/pmcraid.c
37030+++ b/drivers/scsi/pmcraid.c
37031@@ -200,8 +200,8 @@ static int pmcraid_slave_alloc(struct scsi_device *scsi_dev)
37032 res->scsi_dev = scsi_dev;
37033 scsi_dev->hostdata = res;
37034 res->change_detected = 0;
37035- atomic_set(&res->read_failures, 0);
37036- atomic_set(&res->write_failures, 0);
37037+ atomic_set_unchecked(&res->read_failures, 0);
37038+ atomic_set_unchecked(&res->write_failures, 0);
37039 rc = 0;
37040 }
37041 spin_unlock_irqrestore(&pinstance->resource_lock, lock_flags);
37042@@ -2676,9 +2676,9 @@ static int pmcraid_error_handler(struct pmcraid_cmd *cmd)
37043
37044 /* If this was a SCSI read/write command keep count of errors */
37045 if (SCSI_CMD_TYPE(scsi_cmd->cmnd[0]) == SCSI_READ_CMD)
37046- atomic_inc(&res->read_failures);
37047+ atomic_inc_unchecked(&res->read_failures);
37048 else if (SCSI_CMD_TYPE(scsi_cmd->cmnd[0]) == SCSI_WRITE_CMD)
37049- atomic_inc(&res->write_failures);
37050+ atomic_inc_unchecked(&res->write_failures);
37051
37052 if (!RES_IS_GSCSI(res->cfg_entry) &&
37053 masked_ioasc != PMCRAID_IOASC_HW_DEVICE_BUS_STATUS_ERROR) {
37054@@ -3534,7 +3534,7 @@ static int pmcraid_queuecommand_lck(
37055 * block of scsi_cmd which is re-used (e.g. cancel/abort), which uses
37056 * hrrq_id assigned here in queuecommand
37057 */
37058- ioarcb->hrrq_id = atomic_add_return(1, &(pinstance->last_message_id)) %
37059+ ioarcb->hrrq_id = atomic_add_return_unchecked(1, &(pinstance->last_message_id)) %
37060 pinstance->num_hrrq;
37061 cmd->cmd_done = pmcraid_io_done;
37062
37063@@ -3859,7 +3859,7 @@ static long pmcraid_ioctl_passthrough(
37064 * block of scsi_cmd which is re-used (e.g. cancel/abort), which uses
37065 * hrrq_id assigned here in queuecommand
37066 */
37067- ioarcb->hrrq_id = atomic_add_return(1, &(pinstance->last_message_id)) %
37068+ ioarcb->hrrq_id = atomic_add_return_unchecked(1, &(pinstance->last_message_id)) %
37069 pinstance->num_hrrq;
37070
37071 if (request_size) {
37072@@ -4497,7 +4497,7 @@ static void pmcraid_worker_function(struct work_struct *workp)
37073
37074 pinstance = container_of(workp, struct pmcraid_instance, worker_q);
37075 /* add resources only after host is added into system */
37076- if (!atomic_read(&pinstance->expose_resources))
37077+ if (!atomic_read_unchecked(&pinstance->expose_resources))
37078 return;
37079
37080 fw_version = be16_to_cpu(pinstance->inq_data->fw_version);
37081@@ -5331,8 +5331,8 @@ static int __devinit pmcraid_init_instance(
37082 init_waitqueue_head(&pinstance->reset_wait_q);
37083
37084 atomic_set(&pinstance->outstanding_cmds, 0);
37085- atomic_set(&pinstance->last_message_id, 0);
37086- atomic_set(&pinstance->expose_resources, 0);
37087+ atomic_set_unchecked(&pinstance->last_message_id, 0);
37088+ atomic_set_unchecked(&pinstance->expose_resources, 0);
37089
37090 INIT_LIST_HEAD(&pinstance->free_res_q);
37091 INIT_LIST_HEAD(&pinstance->used_res_q);
37092@@ -6047,7 +6047,7 @@ static int __devinit pmcraid_probe(
37093 /* Schedule worker thread to handle CCN and take care of adding and
37094 * removing devices to OS
37095 */
37096- atomic_set(&pinstance->expose_resources, 1);
37097+ atomic_set_unchecked(&pinstance->expose_resources, 1);
37098 schedule_work(&pinstance->worker_q);
37099 return rc;
37100
37101diff --git a/drivers/scsi/pmcraid.h b/drivers/scsi/pmcraid.h
37102index ca496c7..9c791d5 100644
37103--- a/drivers/scsi/pmcraid.h
37104+++ b/drivers/scsi/pmcraid.h
37105@@ -748,7 +748,7 @@ struct pmcraid_instance {
37106 struct pmcraid_isr_param hrrq_vector[PMCRAID_NUM_MSIX_VECTORS];
37107
37108 /* Message id as filled in last fired IOARCB, used to identify HRRQ */
37109- atomic_t last_message_id;
37110+ atomic_unchecked_t last_message_id;
37111
37112 /* configuration table */
37113 struct pmcraid_config_table *cfg_table;
37114@@ -777,7 +777,7 @@ struct pmcraid_instance {
37115 atomic_t outstanding_cmds;
37116
37117 /* should add/delete resources to mid-layer now ?*/
37118- atomic_t expose_resources;
37119+ atomic_unchecked_t expose_resources;
37120
37121
37122
37123@@ -813,8 +813,8 @@ struct pmcraid_resource_entry {
37124 struct pmcraid_config_table_entry_ext cfg_entry_ext;
37125 };
37126 struct scsi_device *scsi_dev; /* Link scsi_device structure */
37127- atomic_t read_failures; /* count of failed READ commands */
37128- atomic_t write_failures; /* count of failed WRITE commands */
37129+ atomic_unchecked_t read_failures; /* count of failed READ commands */
37130+ atomic_unchecked_t write_failures; /* count of failed WRITE commands */
37131
37132 /* To indicate add/delete/modify during CCN */
37133 u8 change_detected;
37134diff --git a/drivers/scsi/qla2xxx/qla_def.h b/drivers/scsi/qla2xxx/qla_def.h
37135index fcf052c..a8025a4 100644
37136--- a/drivers/scsi/qla2xxx/qla_def.h
37137+++ b/drivers/scsi/qla2xxx/qla_def.h
37138@@ -2244,7 +2244,7 @@ struct isp_operations {
37139 int (*get_flash_version) (struct scsi_qla_host *, void *);
37140 int (*start_scsi) (srb_t *);
37141 int (*abort_isp) (struct scsi_qla_host *);
37142-};
37143+} __no_const;
37144
37145 /* MSI-X Support *************************************************************/
37146
37147diff --git a/drivers/scsi/qla4xxx/ql4_def.h b/drivers/scsi/qla4xxx/ql4_def.h
37148index fd5edc6..4906148 100644
37149--- a/drivers/scsi/qla4xxx/ql4_def.h
37150+++ b/drivers/scsi/qla4xxx/ql4_def.h
37151@@ -258,7 +258,7 @@ struct ddb_entry {
37152 * (4000 only) */
37153 atomic_t relogin_timer; /* Max Time to wait for
37154 * relogin to complete */
37155- atomic_t relogin_retry_count; /* Num of times relogin has been
37156+ atomic_unchecked_t relogin_retry_count; /* Num of times relogin has been
37157 * retried */
37158 uint32_t default_time2wait; /* Default Min time between
37159 * relogins (+aens) */
37160diff --git a/drivers/scsi/qla4xxx/ql4_os.c b/drivers/scsi/qla4xxx/ql4_os.c
37161index 4169c8b..a8b896b 100644
37162--- a/drivers/scsi/qla4xxx/ql4_os.c
37163+++ b/drivers/scsi/qla4xxx/ql4_os.c
37164@@ -2104,12 +2104,12 @@ void qla4xxx_check_relogin_flash_ddb(struct iscsi_cls_session *cls_sess)
37165 */
37166 if (!iscsi_is_session_online(cls_sess)) {
37167 /* Reset retry relogin timer */
37168- atomic_inc(&ddb_entry->relogin_retry_count);
37169+ atomic_inc_unchecked(&ddb_entry->relogin_retry_count);
37170 DEBUG2(ql4_printk(KERN_INFO, ha,
37171 "%s: index[%d] relogin timed out-retrying"
37172 " relogin (%d), retry (%d)\n", __func__,
37173 ddb_entry->fw_ddb_index,
37174- atomic_read(&ddb_entry->relogin_retry_count),
37175+ atomic_read_unchecked(&ddb_entry->relogin_retry_count),
37176 ddb_entry->default_time2wait + 4));
37177 set_bit(DPC_RELOGIN_DEVICE, &ha->dpc_flags);
37178 atomic_set(&ddb_entry->retry_relogin_timer,
37179@@ -3835,7 +3835,7 @@ static void qla4xxx_setup_flash_ddb_entry(struct scsi_qla_host *ha,
37180
37181 atomic_set(&ddb_entry->retry_relogin_timer, INVALID_ENTRY);
37182 atomic_set(&ddb_entry->relogin_timer, 0);
37183- atomic_set(&ddb_entry->relogin_retry_count, 0);
37184+ atomic_set_unchecked(&ddb_entry->relogin_retry_count, 0);
37185
37186 ddb_entry->default_relogin_timeout =
37187 le16_to_cpu(ddb_entry->fw_ddb_entry.def_timeout);
37188diff --git a/drivers/scsi/scsi.c b/drivers/scsi/scsi.c
37189index 2aeb2e9..46e3925 100644
37190--- a/drivers/scsi/scsi.c
37191+++ b/drivers/scsi/scsi.c
37192@@ -655,7 +655,7 @@ int scsi_dispatch_cmd(struct scsi_cmnd *cmd)
37193 unsigned long timeout;
37194 int rtn = 0;
37195
37196- atomic_inc(&cmd->device->iorequest_cnt);
37197+ atomic_inc_unchecked(&cmd->device->iorequest_cnt);
37198
37199 /* check if the device is still usable */
37200 if (unlikely(cmd->device->sdev_state == SDEV_DEL)) {
37201diff --git a/drivers/scsi/scsi_lib.c b/drivers/scsi/scsi_lib.c
37202index f85cfa6..a57c9e8 100644
37203--- a/drivers/scsi/scsi_lib.c
37204+++ b/drivers/scsi/scsi_lib.c
37205@@ -1416,7 +1416,7 @@ static void scsi_kill_request(struct request *req, struct request_queue *q)
37206 shost = sdev->host;
37207 scsi_init_cmd_errh(cmd);
37208 cmd->result = DID_NO_CONNECT << 16;
37209- atomic_inc(&cmd->device->iorequest_cnt);
37210+ atomic_inc_unchecked(&cmd->device->iorequest_cnt);
37211
37212 /*
37213 * SCSI request completion path will do scsi_device_unbusy(),
37214@@ -1442,9 +1442,9 @@ static void scsi_softirq_done(struct request *rq)
37215
37216 INIT_LIST_HEAD(&cmd->eh_entry);
37217
37218- atomic_inc(&cmd->device->iodone_cnt);
37219+ atomic_inc_unchecked(&cmd->device->iodone_cnt);
37220 if (cmd->result)
37221- atomic_inc(&cmd->device->ioerr_cnt);
37222+ atomic_inc_unchecked(&cmd->device->ioerr_cnt);
37223
37224 disposition = scsi_decide_disposition(cmd);
37225 if (disposition != SUCCESS &&
37226diff --git a/drivers/scsi/scsi_sysfs.c b/drivers/scsi/scsi_sysfs.c
37227index 04c2a27..9d8bd66 100644
37228--- a/drivers/scsi/scsi_sysfs.c
37229+++ b/drivers/scsi/scsi_sysfs.c
37230@@ -660,7 +660,7 @@ show_iostat_##field(struct device *dev, struct device_attribute *attr, \
37231 char *buf) \
37232 { \
37233 struct scsi_device *sdev = to_scsi_device(dev); \
37234- unsigned long long count = atomic_read(&sdev->field); \
37235+ unsigned long long count = atomic_read_unchecked(&sdev->field); \
37236 return snprintf(buf, 20, "0x%llx\n", count); \
37237 } \
37238 static DEVICE_ATTR(field, S_IRUGO, show_iostat_##field, NULL)
37239diff --git a/drivers/scsi/scsi_tgt_lib.c b/drivers/scsi/scsi_tgt_lib.c
37240index 84a1fdf..693b0d6 100644
37241--- a/drivers/scsi/scsi_tgt_lib.c
37242+++ b/drivers/scsi/scsi_tgt_lib.c
37243@@ -362,7 +362,7 @@ static int scsi_map_user_pages(struct scsi_tgt_cmd *tcmd, struct scsi_cmnd *cmd,
37244 int err;
37245
37246 dprintk("%lx %u\n", uaddr, len);
37247- err = blk_rq_map_user(q, rq, NULL, (void *)uaddr, len, GFP_KERNEL);
37248+ err = blk_rq_map_user(q, rq, NULL, (void __user *)uaddr, len, GFP_KERNEL);
37249 if (err) {
37250 /*
37251 * TODO: need to fixup sg_tablesize, max_segment_size,
37252diff --git a/drivers/scsi/scsi_transport_fc.c b/drivers/scsi/scsi_transport_fc.c
37253index 1b21491..1b7f60e 100644
37254--- a/drivers/scsi/scsi_transport_fc.c
37255+++ b/drivers/scsi/scsi_transport_fc.c
37256@@ -484,7 +484,7 @@ static DECLARE_TRANSPORT_CLASS(fc_vport_class,
37257 * Netlink Infrastructure
37258 */
37259
37260-static atomic_t fc_event_seq;
37261+static atomic_unchecked_t fc_event_seq;
37262
37263 /**
37264 * fc_get_event_number - Obtain the next sequential FC event number
37265@@ -497,7 +497,7 @@ static atomic_t fc_event_seq;
37266 u32
37267 fc_get_event_number(void)
37268 {
37269- return atomic_add_return(1, &fc_event_seq);
37270+ return atomic_add_return_unchecked(1, &fc_event_seq);
37271 }
37272 EXPORT_SYMBOL(fc_get_event_number);
37273
37274@@ -645,7 +645,7 @@ static __init int fc_transport_init(void)
37275 {
37276 int error;
37277
37278- atomic_set(&fc_event_seq, 0);
37279+ atomic_set_unchecked(&fc_event_seq, 0);
37280
37281 error = transport_class_register(&fc_host_class);
37282 if (error)
37283@@ -835,7 +835,7 @@ static int fc_str_to_dev_loss(const char *buf, unsigned long *val)
37284 char *cp;
37285
37286 *val = simple_strtoul(buf, &cp, 0);
37287- if ((*cp && (*cp != '\n')) || (*val < 0))
37288+ if (*cp && (*cp != '\n'))
37289 return -EINVAL;
37290 /*
37291 * Check for overflow; dev_loss_tmo is u32
37292diff --git a/drivers/scsi/scsi_transport_iscsi.c b/drivers/scsi/scsi_transport_iscsi.c
37293index 96029e6..4d77fa0 100644
37294--- a/drivers/scsi/scsi_transport_iscsi.c
37295+++ b/drivers/scsi/scsi_transport_iscsi.c
37296@@ -79,7 +79,7 @@ struct iscsi_internal {
37297 struct transport_container session_cont;
37298 };
37299
37300-static atomic_t iscsi_session_nr; /* sysfs session id for next new session */
37301+static atomic_unchecked_t iscsi_session_nr; /* sysfs session id for next new session */
37302 static struct workqueue_struct *iscsi_eh_timer_workq;
37303
37304 static DEFINE_IDA(iscsi_sess_ida);
37305@@ -1062,7 +1062,7 @@ int iscsi_add_session(struct iscsi_cls_session *session, unsigned int target_id)
37306 int err;
37307
37308 ihost = shost->shost_data;
37309- session->sid = atomic_add_return(1, &iscsi_session_nr);
37310+ session->sid = atomic_add_return_unchecked(1, &iscsi_session_nr);
37311
37312 if (target_id == ISCSI_MAX_TARGET) {
37313 id = ida_simple_get(&iscsi_sess_ida, 0, 0, GFP_KERNEL);
37314@@ -2663,7 +2663,7 @@ static __init int iscsi_transport_init(void)
37315 printk(KERN_INFO "Loading iSCSI transport class v%s.\n",
37316 ISCSI_TRANSPORT_VERSION);
37317
37318- atomic_set(&iscsi_session_nr, 0);
37319+ atomic_set_unchecked(&iscsi_session_nr, 0);
37320
37321 err = class_register(&iscsi_transport_class);
37322 if (err)
37323diff --git a/drivers/scsi/scsi_transport_srp.c b/drivers/scsi/scsi_transport_srp.c
37324index 21a045e..ec89e03 100644
37325--- a/drivers/scsi/scsi_transport_srp.c
37326+++ b/drivers/scsi/scsi_transport_srp.c
37327@@ -33,7 +33,7 @@
37328 #include "scsi_transport_srp_internal.h"
37329
37330 struct srp_host_attrs {
37331- atomic_t next_port_id;
37332+ atomic_unchecked_t next_port_id;
37333 };
37334 #define to_srp_host_attrs(host) ((struct srp_host_attrs *)(host)->shost_data)
37335
37336@@ -62,7 +62,7 @@ static int srp_host_setup(struct transport_container *tc, struct device *dev,
37337 struct Scsi_Host *shost = dev_to_shost(dev);
37338 struct srp_host_attrs *srp_host = to_srp_host_attrs(shost);
37339
37340- atomic_set(&srp_host->next_port_id, 0);
37341+ atomic_set_unchecked(&srp_host->next_port_id, 0);
37342 return 0;
37343 }
37344
37345@@ -211,7 +211,7 @@ struct srp_rport *srp_rport_add(struct Scsi_Host *shost,
37346 memcpy(rport->port_id, ids->port_id, sizeof(rport->port_id));
37347 rport->roles = ids->roles;
37348
37349- id = atomic_inc_return(&to_srp_host_attrs(shost)->next_port_id);
37350+ id = atomic_inc_return_unchecked(&to_srp_host_attrs(shost)->next_port_id);
37351 dev_set_name(&rport->dev, "port-%d:%d", shost->host_no, id);
37352
37353 transport_setup_device(&rport->dev);
37354diff --git a/drivers/scsi/sg.c b/drivers/scsi/sg.c
37355index 441a1c5..07cece7 100644
37356--- a/drivers/scsi/sg.c
37357+++ b/drivers/scsi/sg.c
37358@@ -1077,7 +1077,7 @@ sg_ioctl(struct file *filp, unsigned int cmd_in, unsigned long arg)
37359 sdp->disk->disk_name,
37360 MKDEV(SCSI_GENERIC_MAJOR, sdp->index),
37361 NULL,
37362- (char *)arg);
37363+ (char __user *)arg);
37364 case BLKTRACESTART:
37365 return blk_trace_startstop(sdp->device->request_queue, 1);
37366 case BLKTRACESTOP:
37367@@ -2312,7 +2312,7 @@ struct sg_proc_leaf {
37368 const struct file_operations * fops;
37369 };
37370
37371-static struct sg_proc_leaf sg_proc_leaf_arr[] = {
37372+static const struct sg_proc_leaf sg_proc_leaf_arr[] = {
37373 {"allow_dio", &adio_fops},
37374 {"debug", &debug_fops},
37375 {"def_reserved_size", &dressz_fops},
37376@@ -2327,7 +2327,7 @@ sg_proc_init(void)
37377 {
37378 int k, mask;
37379 int num_leaves = ARRAY_SIZE(sg_proc_leaf_arr);
37380- struct sg_proc_leaf * leaf;
37381+ const struct sg_proc_leaf * leaf;
37382
37383 sg_proc_sgp = proc_mkdir(sg_proc_sg_dirname, NULL);
37384 if (!sg_proc_sgp)
37385diff --git a/drivers/spi/spi-dw-pci.c b/drivers/spi/spi-dw-pci.c
37386index f64250e..1ee3049 100644
37387--- a/drivers/spi/spi-dw-pci.c
37388+++ b/drivers/spi/spi-dw-pci.c
37389@@ -149,7 +149,7 @@ static int spi_resume(struct pci_dev *pdev)
37390 #define spi_resume NULL
37391 #endif
37392
37393-static const struct pci_device_id pci_ids[] __devinitdata = {
37394+static const struct pci_device_id pci_ids[] __devinitconst = {
37395 /* Intel MID platform SPI controller 0 */
37396 { PCI_DEVICE(PCI_VENDOR_ID_INTEL, 0x0800) },
37397 {},
37398diff --git a/drivers/spi/spi.c b/drivers/spi/spi.c
37399index 77eae99..b7cdcc9 100644
37400--- a/drivers/spi/spi.c
37401+++ b/drivers/spi/spi.c
37402@@ -1024,7 +1024,7 @@ int spi_bus_unlock(struct spi_master *master)
37403 EXPORT_SYMBOL_GPL(spi_bus_unlock);
37404
37405 /* portable code must never pass more than 32 bytes */
37406-#define SPI_BUFSIZ max(32,SMP_CACHE_BYTES)
37407+#define SPI_BUFSIZ max(32UL,SMP_CACHE_BYTES)
37408
37409 static u8 *buf;
37410
37411diff --git a/drivers/staging/gma500/power.c b/drivers/staging/gma500/power.c
37412index 436fe97..4082570 100644
37413--- a/drivers/staging/gma500/power.c
37414+++ b/drivers/staging/gma500/power.c
37415@@ -266,7 +266,7 @@ bool gma_power_begin(struct drm_device *dev, bool force_on)
37416 ret = gma_resume_pci(dev->pdev);
37417 if (ret == 0) {
37418 /* FIXME: we want to defer this for Medfield/Oaktrail */
37419- gma_resume_display(dev);
37420+ gma_resume_display(dev->pdev);
37421 psb_irq_preinstall(dev);
37422 psb_irq_postinstall(dev);
37423 pm_runtime_get(&dev->pdev->dev);
37424diff --git a/drivers/staging/hv/rndis_filter.c b/drivers/staging/hv/rndis_filter.c
37425index bafccb3..e3ac78d 100644
37426--- a/drivers/staging/hv/rndis_filter.c
37427+++ b/drivers/staging/hv/rndis_filter.c
37428@@ -42,7 +42,7 @@ struct rndis_device {
37429
37430 enum rndis_device_state state;
37431 bool link_state;
37432- atomic_t new_req_id;
37433+ atomic_unchecked_t new_req_id;
37434
37435 spinlock_t request_lock;
37436 struct list_head req_list;
37437@@ -116,7 +116,7 @@ static struct rndis_request *get_rndis_request(struct rndis_device *dev,
37438 * template
37439 */
37440 set = &rndis_msg->msg.set_req;
37441- set->req_id = atomic_inc_return(&dev->new_req_id);
37442+ set->req_id = atomic_inc_return_unchecked(&dev->new_req_id);
37443
37444 /* Add to the request list */
37445 spin_lock_irqsave(&dev->request_lock, flags);
37446@@ -646,7 +646,7 @@ static void rndis_filter_halt_device(struct rndis_device *dev)
37447
37448 /* Setup the rndis set */
37449 halt = &request->request_msg.msg.halt_req;
37450- halt->req_id = atomic_inc_return(&dev->new_req_id);
37451+ halt->req_id = atomic_inc_return_unchecked(&dev->new_req_id);
37452
37453 /* Ignore return since this msg is optional. */
37454 rndis_filter_send_request(dev, request);
37455diff --git a/drivers/staging/iio/buffer_generic.h b/drivers/staging/iio/buffer_generic.h
37456index 9e8f010..af9efb56 100644
37457--- a/drivers/staging/iio/buffer_generic.h
37458+++ b/drivers/staging/iio/buffer_generic.h
37459@@ -64,7 +64,7 @@ struct iio_buffer_access_funcs {
37460
37461 int (*is_enabled)(struct iio_buffer *buffer);
37462 int (*enable)(struct iio_buffer *buffer);
37463-};
37464+} __no_const;
37465
37466 /**
37467 * struct iio_buffer_setup_ops - buffer setup related callbacks
37468diff --git a/drivers/staging/octeon/ethernet-rx.c b/drivers/staging/octeon/ethernet-rx.c
37469index 8b307b4..a97ac91 100644
37470--- a/drivers/staging/octeon/ethernet-rx.c
37471+++ b/drivers/staging/octeon/ethernet-rx.c
37472@@ -420,11 +420,11 @@ static int cvm_oct_napi_poll(struct napi_struct *napi, int budget)
37473 /* Increment RX stats for virtual ports */
37474 if (work->ipprt >= CVMX_PIP_NUM_INPUT_PORTS) {
37475 #ifdef CONFIG_64BIT
37476- atomic64_add(1, (atomic64_t *)&priv->stats.rx_packets);
37477- atomic64_add(skb->len, (atomic64_t *)&priv->stats.rx_bytes);
37478+ atomic64_add_unchecked(1, (atomic64_unchecked_t *)&priv->stats.rx_packets);
37479+ atomic64_add_unchecked(skb->len, (atomic64_unchecked_t *)&priv->stats.rx_bytes);
37480 #else
37481- atomic_add(1, (atomic_t *)&priv->stats.rx_packets);
37482- atomic_add(skb->len, (atomic_t *)&priv->stats.rx_bytes);
37483+ atomic_add_unchecked(1, (atomic_unchecked_t *)&priv->stats.rx_packets);
37484+ atomic_add_unchecked(skb->len, (atomic_unchecked_t *)&priv->stats.rx_bytes);
37485 #endif
37486 }
37487 netif_receive_skb(skb);
37488@@ -436,9 +436,9 @@ static int cvm_oct_napi_poll(struct napi_struct *napi, int budget)
37489 dev->name);
37490 */
37491 #ifdef CONFIG_64BIT
37492- atomic64_add(1, (atomic64_t *)&priv->stats.rx_dropped);
37493+ atomic64_unchecked_add(1, (atomic64_unchecked_t *)&priv->stats.rx_dropped);
37494 #else
37495- atomic_add(1, (atomic_t *)&priv->stats.rx_dropped);
37496+ atomic_add_unchecked(1, (atomic_unchecked_t *)&priv->stats.rx_dropped);
37497 #endif
37498 dev_kfree_skb_irq(skb);
37499 }
37500diff --git a/drivers/staging/octeon/ethernet.c b/drivers/staging/octeon/ethernet.c
37501index 076f866..2308070 100644
37502--- a/drivers/staging/octeon/ethernet.c
37503+++ b/drivers/staging/octeon/ethernet.c
37504@@ -258,11 +258,11 @@ static struct net_device_stats *cvm_oct_common_get_stats(struct net_device *dev)
37505 * since the RX tasklet also increments it.
37506 */
37507 #ifdef CONFIG_64BIT
37508- atomic64_add(rx_status.dropped_packets,
37509- (atomic64_t *)&priv->stats.rx_dropped);
37510+ atomic64_add_unchecked(rx_status.dropped_packets,
37511+ (atomic64_unchecked_t *)&priv->stats.rx_dropped);
37512 #else
37513- atomic_add(rx_status.dropped_packets,
37514- (atomic_t *)&priv->stats.rx_dropped);
37515+ atomic_add_unchecked(rx_status.dropped_packets,
37516+ (atomic_unchecked_t *)&priv->stats.rx_dropped);
37517 #endif
37518 }
37519
37520diff --git a/drivers/staging/pohmelfs/inode.c b/drivers/staging/pohmelfs/inode.c
37521index 7a19555..466456d 100644
37522--- a/drivers/staging/pohmelfs/inode.c
37523+++ b/drivers/staging/pohmelfs/inode.c
37524@@ -1861,7 +1861,7 @@ static int pohmelfs_fill_super(struct super_block *sb, void *data, int silent)
37525 mutex_init(&psb->mcache_lock);
37526 psb->mcache_root = RB_ROOT;
37527 psb->mcache_timeout = msecs_to_jiffies(5000);
37528- atomic_long_set(&psb->mcache_gen, 0);
37529+ atomic_long_set_unchecked(&psb->mcache_gen, 0);
37530
37531 psb->trans_max_pages = 100;
37532
37533@@ -1876,7 +1876,7 @@ static int pohmelfs_fill_super(struct super_block *sb, void *data, int silent)
37534 INIT_LIST_HEAD(&psb->crypto_ready_list);
37535 INIT_LIST_HEAD(&psb->crypto_active_list);
37536
37537- atomic_set(&psb->trans_gen, 1);
37538+ atomic_set_unchecked(&psb->trans_gen, 1);
37539 atomic_long_set(&psb->total_inodes, 0);
37540
37541 mutex_init(&psb->state_lock);
37542diff --git a/drivers/staging/pohmelfs/mcache.c b/drivers/staging/pohmelfs/mcache.c
37543index e22665c..a2a9390 100644
37544--- a/drivers/staging/pohmelfs/mcache.c
37545+++ b/drivers/staging/pohmelfs/mcache.c
37546@@ -121,7 +121,7 @@ struct pohmelfs_mcache *pohmelfs_mcache_alloc(struct pohmelfs_sb *psb, u64 start
37547 m->data = data;
37548 m->start = start;
37549 m->size = size;
37550- m->gen = atomic_long_inc_return(&psb->mcache_gen);
37551+ m->gen = atomic_long_inc_return_unchecked(&psb->mcache_gen);
37552
37553 mutex_lock(&psb->mcache_lock);
37554 err = pohmelfs_mcache_insert(psb, m);
37555diff --git a/drivers/staging/pohmelfs/netfs.h b/drivers/staging/pohmelfs/netfs.h
37556index 985b6b7..7699e05 100644
37557--- a/drivers/staging/pohmelfs/netfs.h
37558+++ b/drivers/staging/pohmelfs/netfs.h
37559@@ -571,14 +571,14 @@ struct pohmelfs_config;
37560 struct pohmelfs_sb {
37561 struct rb_root mcache_root;
37562 struct mutex mcache_lock;
37563- atomic_long_t mcache_gen;
37564+ atomic_long_unchecked_t mcache_gen;
37565 unsigned long mcache_timeout;
37566
37567 unsigned int idx;
37568
37569 unsigned int trans_retries;
37570
37571- atomic_t trans_gen;
37572+ atomic_unchecked_t trans_gen;
37573
37574 unsigned int crypto_attached_size;
37575 unsigned int crypto_align_size;
37576diff --git a/drivers/staging/pohmelfs/trans.c b/drivers/staging/pohmelfs/trans.c
37577index 06c1a74..866eebc 100644
37578--- a/drivers/staging/pohmelfs/trans.c
37579+++ b/drivers/staging/pohmelfs/trans.c
37580@@ -492,7 +492,7 @@ int netfs_trans_finish(struct netfs_trans *t, struct pohmelfs_sb *psb)
37581 int err;
37582 struct netfs_cmd *cmd = t->iovec.iov_base;
37583
37584- t->gen = atomic_inc_return(&psb->trans_gen);
37585+ t->gen = atomic_inc_return_unchecked(&psb->trans_gen);
37586
37587 cmd->size = t->iovec.iov_len - sizeof(struct netfs_cmd) +
37588 t->attached_size + t->attached_pages * sizeof(struct netfs_cmd);
37589diff --git a/drivers/staging/rtl8192e/rtllib_module.c b/drivers/staging/rtl8192e/rtllib_module.c
37590index c36a140..dd27fda 100644
37591--- a/drivers/staging/rtl8192e/rtllib_module.c
37592+++ b/drivers/staging/rtl8192e/rtllib_module.c
37593@@ -228,6 +228,8 @@ static int show_debug_level(char *page, char **start, off_t offset,
37594 }
37595
37596 static int store_debug_level(struct file *file, const char __user *buffer,
37597+ unsigned long count, void *data) __size_overflow(3);
37598+static int store_debug_level(struct file *file, const char __user *buffer,
37599 unsigned long count, void *data)
37600 {
37601 char buf[] = "0x00000000";
37602diff --git a/drivers/staging/rtl8192u/ieee80211/ieee80211_module.c b/drivers/staging/rtl8192u/ieee80211/ieee80211_module.c
37603index e3d47bc..85f4d0d 100644
37604--- a/drivers/staging/rtl8192u/ieee80211/ieee80211_module.c
37605+++ b/drivers/staging/rtl8192u/ieee80211/ieee80211_module.c
37606@@ -250,6 +250,8 @@ static int show_debug_level(char *page, char **start, off_t offset,
37607 }
37608
37609 static int store_debug_level(struct file *file, const char *buffer,
37610+ unsigned long count, void *data) __size_overflow(3);
37611+static int store_debug_level(struct file *file, const char *buffer,
37612 unsigned long count, void *data)
37613 {
37614 char buf[] = "0x00000000";
37615diff --git a/drivers/staging/rtl8712/rtl871x_io.h b/drivers/staging/rtl8712/rtl871x_io.h
37616index 86308a0..feaa925 100644
37617--- a/drivers/staging/rtl8712/rtl871x_io.h
37618+++ b/drivers/staging/rtl8712/rtl871x_io.h
37619@@ -108,7 +108,7 @@ struct _io_ops {
37620 u8 *pmem);
37621 u32 (*_write_port)(struct intf_hdl *pintfhdl, u32 addr, u32 cnt,
37622 u8 *pmem);
37623-};
37624+} __no_const;
37625
37626 struct io_req {
37627 struct list_head list;
37628diff --git a/drivers/staging/sbe-2t3e3/netdev.c b/drivers/staging/sbe-2t3e3/netdev.c
37629index c7b5e8b..783d6cb 100644
37630--- a/drivers/staging/sbe-2t3e3/netdev.c
37631+++ b/drivers/staging/sbe-2t3e3/netdev.c
37632@@ -51,7 +51,7 @@ int t3e3_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)
37633 t3e3_if_config(sc, cmd_2t3e3, (char *)&param, &resp, &rlen);
37634
37635 if (rlen)
37636- if (copy_to_user(data, &resp, rlen))
37637+ if (rlen > sizeof resp || copy_to_user(data, &resp, rlen))
37638 return -EFAULT;
37639
37640 return 0;
37641diff --git a/drivers/staging/usbip/usbip_common.h b/drivers/staging/usbip/usbip_common.h
37642index be21617..0954e45 100644
37643--- a/drivers/staging/usbip/usbip_common.h
37644+++ b/drivers/staging/usbip/usbip_common.h
37645@@ -289,7 +289,7 @@ struct usbip_device {
37646 void (*shutdown)(struct usbip_device *);
37647 void (*reset)(struct usbip_device *);
37648 void (*unusable)(struct usbip_device *);
37649- } eh_ops;
37650+ } __no_const eh_ops;
37651 };
37652
37653 #if 0
37654diff --git a/drivers/staging/usbip/vhci.h b/drivers/staging/usbip/vhci.h
37655index 88b3298..3783eee 100644
37656--- a/drivers/staging/usbip/vhci.h
37657+++ b/drivers/staging/usbip/vhci.h
37658@@ -88,7 +88,7 @@ struct vhci_hcd {
37659 unsigned resuming:1;
37660 unsigned long re_timeout;
37661
37662- atomic_t seqnum;
37663+ atomic_unchecked_t seqnum;
37664
37665 /*
37666 * NOTE:
37667diff --git a/drivers/staging/usbip/vhci_hcd.c b/drivers/staging/usbip/vhci_hcd.c
37668index 2ee97e2..0420b86 100644
37669--- a/drivers/staging/usbip/vhci_hcd.c
37670+++ b/drivers/staging/usbip/vhci_hcd.c
37671@@ -527,7 +527,7 @@ static void vhci_tx_urb(struct urb *urb)
37672 return;
37673 }
37674
37675- priv->seqnum = atomic_inc_return(&the_controller->seqnum);
37676+ priv->seqnum = atomic_inc_return_unchecked(&the_controller->seqnum);
37677 if (priv->seqnum == 0xffff)
37678 dev_info(&urb->dev->dev, "seqnum max\n");
37679
37680@@ -779,7 +779,7 @@ static int vhci_urb_dequeue(struct usb_hcd *hcd, struct urb *urb, int status)
37681 return -ENOMEM;
37682 }
37683
37684- unlink->seqnum = atomic_inc_return(&the_controller->seqnum);
37685+ unlink->seqnum = atomic_inc_return_unchecked(&the_controller->seqnum);
37686 if (unlink->seqnum == 0xffff)
37687 pr_info("seqnum max\n");
37688
37689@@ -969,7 +969,7 @@ static int vhci_start(struct usb_hcd *hcd)
37690 vdev->rhport = rhport;
37691 }
37692
37693- atomic_set(&vhci->seqnum, 0);
37694+ atomic_set_unchecked(&vhci->seqnum, 0);
37695 spin_lock_init(&vhci->lock);
37696
37697 hcd->power_budget = 0; /* no limit */
37698diff --git a/drivers/staging/usbip/vhci_rx.c b/drivers/staging/usbip/vhci_rx.c
37699index 3872b8c..fe6d2f4 100644
37700--- a/drivers/staging/usbip/vhci_rx.c
37701+++ b/drivers/staging/usbip/vhci_rx.c
37702@@ -77,7 +77,7 @@ static void vhci_recv_ret_submit(struct vhci_device *vdev,
37703 if (!urb) {
37704 pr_err("cannot find a urb of seqnum %u\n", pdu->base.seqnum);
37705 pr_info("max seqnum %d\n",
37706- atomic_read(&the_controller->seqnum));
37707+ atomic_read_unchecked(&the_controller->seqnum));
37708 usbip_event_add(ud, VDEV_EVENT_ERROR_TCP);
37709 return;
37710 }
37711diff --git a/drivers/staging/vt6655/hostap.c b/drivers/staging/vt6655/hostap.c
37712index 7735027..30eed13 100644
37713--- a/drivers/staging/vt6655/hostap.c
37714+++ b/drivers/staging/vt6655/hostap.c
37715@@ -79,14 +79,13 @@ static int msglevel =MSG_LEVEL_INFO;
37716 *
37717 */
37718
37719+static net_device_ops_no_const apdev_netdev_ops;
37720+
37721 static int hostap_enable_hostapd(PSDevice pDevice, int rtnl_locked)
37722 {
37723 PSDevice apdev_priv;
37724 struct net_device *dev = pDevice->dev;
37725 int ret;
37726- const struct net_device_ops apdev_netdev_ops = {
37727- .ndo_start_xmit = pDevice->tx_80211,
37728- };
37729
37730 DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "%s: Enabling hostapd mode\n", dev->name);
37731
37732@@ -98,6 +97,8 @@ static int hostap_enable_hostapd(PSDevice pDevice, int rtnl_locked)
37733 *apdev_priv = *pDevice;
37734 memcpy(pDevice->apdev->dev_addr, dev->dev_addr, ETH_ALEN);
37735
37736+ /* only half broken now */
37737+ apdev_netdev_ops.ndo_start_xmit = pDevice->tx_80211;
37738 pDevice->apdev->netdev_ops = &apdev_netdev_ops;
37739
37740 pDevice->apdev->type = ARPHRD_IEEE80211;
37741diff --git a/drivers/staging/vt6656/hostap.c b/drivers/staging/vt6656/hostap.c
37742index 51b5adf..098e320 100644
37743--- a/drivers/staging/vt6656/hostap.c
37744+++ b/drivers/staging/vt6656/hostap.c
37745@@ -80,14 +80,13 @@ static int msglevel =MSG_LEVEL_INFO;
37746 *
37747 */
37748
37749+static net_device_ops_no_const apdev_netdev_ops;
37750+
37751 static int hostap_enable_hostapd(PSDevice pDevice, int rtnl_locked)
37752 {
37753 PSDevice apdev_priv;
37754 struct net_device *dev = pDevice->dev;
37755 int ret;
37756- const struct net_device_ops apdev_netdev_ops = {
37757- .ndo_start_xmit = pDevice->tx_80211,
37758- };
37759
37760 DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "%s: Enabling hostapd mode\n", dev->name);
37761
37762@@ -99,6 +98,8 @@ static int hostap_enable_hostapd(PSDevice pDevice, int rtnl_locked)
37763 *apdev_priv = *pDevice;
37764 memcpy(pDevice->apdev->dev_addr, dev->dev_addr, ETH_ALEN);
37765
37766+ /* only half broken now */
37767+ apdev_netdev_ops.ndo_start_xmit = pDevice->tx_80211;
37768 pDevice->apdev->netdev_ops = &apdev_netdev_ops;
37769
37770 pDevice->apdev->type = ARPHRD_IEEE80211;
37771diff --git a/drivers/staging/wlan-ng/hfa384x_usb.c b/drivers/staging/wlan-ng/hfa384x_usb.c
37772index 7843dfd..3db105f 100644
37773--- a/drivers/staging/wlan-ng/hfa384x_usb.c
37774+++ b/drivers/staging/wlan-ng/hfa384x_usb.c
37775@@ -204,7 +204,7 @@ static void unlocked_usbctlx_complete(hfa384x_t *hw, hfa384x_usbctlx_t *ctlx);
37776
37777 struct usbctlx_completor {
37778 int (*complete) (struct usbctlx_completor *);
37779-};
37780+} __no_const;
37781
37782 static int
37783 hfa384x_usbctlx_complete_sync(hfa384x_t *hw,
37784diff --git a/drivers/staging/zcache/tmem.c b/drivers/staging/zcache/tmem.c
37785index 1ca66ea..76f1343 100644
37786--- a/drivers/staging/zcache/tmem.c
37787+++ b/drivers/staging/zcache/tmem.c
37788@@ -39,7 +39,7 @@
37789 * A tmem host implementation must use this function to register callbacks
37790 * for memory allocation.
37791 */
37792-static struct tmem_hostops tmem_hostops;
37793+static tmem_hostops_no_const tmem_hostops;
37794
37795 static void tmem_objnode_tree_init(void);
37796
37797@@ -53,7 +53,7 @@ void tmem_register_hostops(struct tmem_hostops *m)
37798 * A tmem host implementation must use this function to register
37799 * callbacks for a page-accessible memory (PAM) implementation
37800 */
37801-static struct tmem_pamops tmem_pamops;
37802+static tmem_pamops_no_const tmem_pamops;
37803
37804 void tmem_register_pamops(struct tmem_pamops *m)
37805 {
37806diff --git a/drivers/staging/zcache/tmem.h b/drivers/staging/zcache/tmem.h
37807index ed147c4..94fc3c6 100644
37808--- a/drivers/staging/zcache/tmem.h
37809+++ b/drivers/staging/zcache/tmem.h
37810@@ -180,6 +180,7 @@ struct tmem_pamops {
37811 void (*new_obj)(struct tmem_obj *);
37812 int (*replace_in_obj)(void *, struct tmem_obj *);
37813 };
37814+typedef struct tmem_pamops __no_const tmem_pamops_no_const;
37815 extern void tmem_register_pamops(struct tmem_pamops *m);
37816
37817 /* memory allocation methods provided by the host implementation */
37818@@ -189,6 +190,7 @@ struct tmem_hostops {
37819 struct tmem_objnode *(*objnode_alloc)(struct tmem_pool *);
37820 void (*objnode_free)(struct tmem_objnode *, struct tmem_pool *);
37821 };
37822+typedef struct tmem_hostops __no_const tmem_hostops_no_const;
37823 extern void tmem_register_hostops(struct tmem_hostops *m);
37824
37825 /* core tmem accessor functions */
37826diff --git a/drivers/target/iscsi/iscsi_target.c b/drivers/target/iscsi/iscsi_target.c
37827index 03d3528..6bbe82f 100644
37828--- a/drivers/target/iscsi/iscsi_target.c
37829+++ b/drivers/target/iscsi/iscsi_target.c
37830@@ -1364,7 +1364,7 @@ static int iscsit_handle_data_out(struct iscsi_conn *conn, unsigned char *buf)
37831 * outstanding_r2ts reaches zero, go ahead and send the delayed
37832 * TASK_ABORTED status.
37833 */
37834- if (atomic_read(&se_cmd->t_transport_aborted) != 0) {
37835+ if (atomic_read_unchecked(&se_cmd->t_transport_aborted) != 0) {
37836 if (hdr->flags & ISCSI_FLAG_CMD_FINAL)
37837 if (--cmd->outstanding_r2ts < 1) {
37838 iscsit_stop_dataout_timer(cmd);
37839diff --git a/drivers/target/target_core_tmr.c b/drivers/target/target_core_tmr.c
37840index 6845228..df77141 100644
37841--- a/drivers/target/target_core_tmr.c
37842+++ b/drivers/target/target_core_tmr.c
37843@@ -250,7 +250,7 @@ static void core_tmr_drain_task_list(
37844 cmd->se_tfo->get_task_tag(cmd), cmd->pr_res_key,
37845 cmd->t_task_list_num,
37846 atomic_read(&cmd->t_task_cdbs_left),
37847- atomic_read(&cmd->t_task_cdbs_sent),
37848+ atomic_read_unchecked(&cmd->t_task_cdbs_sent),
37849 atomic_read(&cmd->t_transport_active),
37850 atomic_read(&cmd->t_transport_stop),
37851 atomic_read(&cmd->t_transport_sent));
37852@@ -281,7 +281,7 @@ static void core_tmr_drain_task_list(
37853 pr_debug("LUN_RESET: got t_transport_active = 1 for"
37854 " task: %p, t_fe_count: %d dev: %p\n", task,
37855 fe_count, dev);
37856- atomic_set(&cmd->t_transport_aborted, 1);
37857+ atomic_set_unchecked(&cmd->t_transport_aborted, 1);
37858 spin_unlock_irqrestore(&cmd->t_state_lock, flags);
37859
37860 core_tmr_handle_tas_abort(tmr_nacl, cmd, tas, fe_count);
37861@@ -289,7 +289,7 @@ static void core_tmr_drain_task_list(
37862 }
37863 pr_debug("LUN_RESET: Got t_transport_active = 0 for task: %p,"
37864 " t_fe_count: %d dev: %p\n", task, fe_count, dev);
37865- atomic_set(&cmd->t_transport_aborted, 1);
37866+ atomic_set_unchecked(&cmd->t_transport_aborted, 1);
37867 spin_unlock_irqrestore(&cmd->t_state_lock, flags);
37868
37869 core_tmr_handle_tas_abort(tmr_nacl, cmd, tas, fe_count);
37870diff --git a/drivers/target/target_core_transport.c b/drivers/target/target_core_transport.c
37871index cdb774b..8753593 100644
37872--- a/drivers/target/target_core_transport.c
37873+++ b/drivers/target/target_core_transport.c
37874@@ -1343,7 +1343,7 @@ struct se_device *transport_add_device_to_core_hba(
37875
37876 dev->queue_depth = dev_limits->queue_depth;
37877 atomic_set(&dev->depth_left, dev->queue_depth);
37878- atomic_set(&dev->dev_ordered_id, 0);
37879+ atomic_set_unchecked(&dev->dev_ordered_id, 0);
37880
37881 se_dev_set_default_attribs(dev, dev_limits);
37882
37883@@ -1530,7 +1530,7 @@ static int transport_check_alloc_task_attr(struct se_cmd *cmd)
37884 * Used to determine when ORDERED commands should go from
37885 * Dormant to Active status.
37886 */
37887- cmd->se_ordered_id = atomic_inc_return(&cmd->se_dev->dev_ordered_id);
37888+ cmd->se_ordered_id = atomic_inc_return_unchecked(&cmd->se_dev->dev_ordered_id);
37889 smp_mb__after_atomic_inc();
37890 pr_debug("Allocated se_ordered_id: %u for Task Attr: 0x%02x on %s\n",
37891 cmd->se_ordered_id, cmd->sam_task_attr,
37892@@ -1800,7 +1800,7 @@ static void transport_generic_request_failure(struct se_cmd *cmd)
37893 " t_transport_active: %d t_transport_stop: %d"
37894 " t_transport_sent: %d\n", cmd->t_task_list_num,
37895 atomic_read(&cmd->t_task_cdbs_left),
37896- atomic_read(&cmd->t_task_cdbs_sent),
37897+ atomic_read_unchecked(&cmd->t_task_cdbs_sent),
37898 atomic_read(&cmd->t_task_cdbs_ex_left),
37899 atomic_read(&cmd->t_transport_active),
37900 atomic_read(&cmd->t_transport_stop),
37901@@ -2089,9 +2089,9 @@ check_depth:
37902
37903 spin_lock_irqsave(&cmd->t_state_lock, flags);
37904 task->task_flags |= (TF_ACTIVE | TF_SENT);
37905- atomic_inc(&cmd->t_task_cdbs_sent);
37906+ atomic_inc_unchecked(&cmd->t_task_cdbs_sent);
37907
37908- if (atomic_read(&cmd->t_task_cdbs_sent) ==
37909+ if (atomic_read_unchecked(&cmd->t_task_cdbs_sent) ==
37910 cmd->t_task_list_num)
37911 atomic_set(&cmd->t_transport_sent, 1);
37912
37913@@ -4297,7 +4297,7 @@ bool transport_wait_for_tasks(struct se_cmd *cmd)
37914 atomic_set(&cmd->transport_lun_stop, 0);
37915 }
37916 if (!atomic_read(&cmd->t_transport_active) ||
37917- atomic_read(&cmd->t_transport_aborted)) {
37918+ atomic_read_unchecked(&cmd->t_transport_aborted)) {
37919 spin_unlock_irqrestore(&cmd->t_state_lock, flags);
37920 return false;
37921 }
37922@@ -4546,7 +4546,7 @@ int transport_check_aborted_status(struct se_cmd *cmd, int send_status)
37923 {
37924 int ret = 0;
37925
37926- if (atomic_read(&cmd->t_transport_aborted) != 0) {
37927+ if (atomic_read_unchecked(&cmd->t_transport_aborted) != 0) {
37928 if (!send_status ||
37929 (cmd->se_cmd_flags & SCF_SENT_DELAYED_TAS))
37930 return 1;
37931@@ -4583,7 +4583,7 @@ void transport_send_task_abort(struct se_cmd *cmd)
37932 */
37933 if (cmd->data_direction == DMA_TO_DEVICE) {
37934 if (cmd->se_tfo->write_pending_status(cmd) != 0) {
37935- atomic_inc(&cmd->t_transport_aborted);
37936+ atomic_inc_unchecked(&cmd->t_transport_aborted);
37937 smp_mb__after_atomic_inc();
37938 }
37939 }
37940diff --git a/drivers/tty/hvc/hvcs.c b/drivers/tty/hvc/hvcs.c
37941index b9040be..e3f5aab 100644
37942--- a/drivers/tty/hvc/hvcs.c
37943+++ b/drivers/tty/hvc/hvcs.c
37944@@ -83,6 +83,7 @@
37945 #include <asm/hvcserver.h>
37946 #include <asm/uaccess.h>
37947 #include <asm/vio.h>
37948+#include <asm/local.h>
37949
37950 /*
37951 * 1.3.0 -> 1.3.1 In hvcs_open memset(..,0x00,..) instead of memset(..,0x3F,00).
37952@@ -270,7 +271,7 @@ struct hvcs_struct {
37953 unsigned int index;
37954
37955 struct tty_struct *tty;
37956- int open_count;
37957+ local_t open_count;
37958
37959 /*
37960 * Used to tell the driver kernel_thread what operations need to take
37961@@ -422,7 +423,7 @@ static ssize_t hvcs_vterm_state_store(struct device *dev, struct device_attribut
37962
37963 spin_lock_irqsave(&hvcsd->lock, flags);
37964
37965- if (hvcsd->open_count > 0) {
37966+ if (local_read(&hvcsd->open_count) > 0) {
37967 spin_unlock_irqrestore(&hvcsd->lock, flags);
37968 printk(KERN_INFO "HVCS: vterm state unchanged. "
37969 "The hvcs device node is still in use.\n");
37970@@ -1145,7 +1146,7 @@ static int hvcs_open(struct tty_struct *tty, struct file *filp)
37971 if ((retval = hvcs_partner_connect(hvcsd)))
37972 goto error_release;
37973
37974- hvcsd->open_count = 1;
37975+ local_set(&hvcsd->open_count, 1);
37976 hvcsd->tty = tty;
37977 tty->driver_data = hvcsd;
37978
37979@@ -1179,7 +1180,7 @@ fast_open:
37980
37981 spin_lock_irqsave(&hvcsd->lock, flags);
37982 kref_get(&hvcsd->kref);
37983- hvcsd->open_count++;
37984+ local_inc(&hvcsd->open_count);
37985 hvcsd->todo_mask |= HVCS_SCHED_READ;
37986 spin_unlock_irqrestore(&hvcsd->lock, flags);
37987
37988@@ -1223,7 +1224,7 @@ static void hvcs_close(struct tty_struct *tty, struct file *filp)
37989 hvcsd = tty->driver_data;
37990
37991 spin_lock_irqsave(&hvcsd->lock, flags);
37992- if (--hvcsd->open_count == 0) {
37993+ if (local_dec_and_test(&hvcsd->open_count)) {
37994
37995 vio_disable_interrupts(hvcsd->vdev);
37996
37997@@ -1249,10 +1250,10 @@ static void hvcs_close(struct tty_struct *tty, struct file *filp)
37998 free_irq(irq, hvcsd);
37999 kref_put(&hvcsd->kref, destroy_hvcs_struct);
38000 return;
38001- } else if (hvcsd->open_count < 0) {
38002+ } else if (local_read(&hvcsd->open_count) < 0) {
38003 printk(KERN_ERR "HVCS: vty-server@%X open_count: %d"
38004 " is missmanaged.\n",
38005- hvcsd->vdev->unit_address, hvcsd->open_count);
38006+ hvcsd->vdev->unit_address, local_read(&hvcsd->open_count));
38007 }
38008
38009 spin_unlock_irqrestore(&hvcsd->lock, flags);
38010@@ -1268,7 +1269,7 @@ static void hvcs_hangup(struct tty_struct * tty)
38011
38012 spin_lock_irqsave(&hvcsd->lock, flags);
38013 /* Preserve this so that we know how many kref refs to put */
38014- temp_open_count = hvcsd->open_count;
38015+ temp_open_count = local_read(&hvcsd->open_count);
38016
38017 /*
38018 * Don't kref put inside the spinlock because the destruction
38019@@ -1283,7 +1284,7 @@ static void hvcs_hangup(struct tty_struct * tty)
38020 hvcsd->tty->driver_data = NULL;
38021 hvcsd->tty = NULL;
38022
38023- hvcsd->open_count = 0;
38024+ local_set(&hvcsd->open_count, 0);
38025
38026 /* This will drop any buffered data on the floor which is OK in a hangup
38027 * scenario. */
38028@@ -1354,7 +1355,7 @@ static int hvcs_write(struct tty_struct *tty,
38029 * the middle of a write operation? This is a crummy place to do this
38030 * but we want to keep it all in the spinlock.
38031 */
38032- if (hvcsd->open_count <= 0) {
38033+ if (local_read(&hvcsd->open_count) <= 0) {
38034 spin_unlock_irqrestore(&hvcsd->lock, flags);
38035 return -ENODEV;
38036 }
38037@@ -1428,7 +1429,7 @@ static int hvcs_write_room(struct tty_struct *tty)
38038 {
38039 struct hvcs_struct *hvcsd = tty->driver_data;
38040
38041- if (!hvcsd || hvcsd->open_count <= 0)
38042+ if (!hvcsd || local_read(&hvcsd->open_count) <= 0)
38043 return 0;
38044
38045 return HVCS_BUFF_LEN - hvcsd->chars_in_buffer;
38046diff --git a/drivers/tty/ipwireless/tty.c b/drivers/tty/ipwireless/tty.c
38047index ef92869..f4ebd88 100644
38048--- a/drivers/tty/ipwireless/tty.c
38049+++ b/drivers/tty/ipwireless/tty.c
38050@@ -29,6 +29,7 @@
38051 #include <linux/tty_driver.h>
38052 #include <linux/tty_flip.h>
38053 #include <linux/uaccess.h>
38054+#include <asm/local.h>
38055
38056 #include "tty.h"
38057 #include "network.h"
38058@@ -51,7 +52,7 @@ struct ipw_tty {
38059 int tty_type;
38060 struct ipw_network *network;
38061 struct tty_struct *linux_tty;
38062- int open_count;
38063+ local_t open_count;
38064 unsigned int control_lines;
38065 struct mutex ipw_tty_mutex;
38066 int tx_bytes_queued;
38067@@ -127,10 +128,10 @@ static int ipw_open(struct tty_struct *linux_tty, struct file *filp)
38068 mutex_unlock(&tty->ipw_tty_mutex);
38069 return -ENODEV;
38070 }
38071- if (tty->open_count == 0)
38072+ if (local_read(&tty->open_count) == 0)
38073 tty->tx_bytes_queued = 0;
38074
38075- tty->open_count++;
38076+ local_inc(&tty->open_count);
38077
38078 tty->linux_tty = linux_tty;
38079 linux_tty->driver_data = tty;
38080@@ -146,9 +147,7 @@ static int ipw_open(struct tty_struct *linux_tty, struct file *filp)
38081
38082 static void do_ipw_close(struct ipw_tty *tty)
38083 {
38084- tty->open_count--;
38085-
38086- if (tty->open_count == 0) {
38087+ if (local_dec_return(&tty->open_count) == 0) {
38088 struct tty_struct *linux_tty = tty->linux_tty;
38089
38090 if (linux_tty != NULL) {
38091@@ -169,7 +168,7 @@ static void ipw_hangup(struct tty_struct *linux_tty)
38092 return;
38093
38094 mutex_lock(&tty->ipw_tty_mutex);
38095- if (tty->open_count == 0) {
38096+ if (local_read(&tty->open_count) == 0) {
38097 mutex_unlock(&tty->ipw_tty_mutex);
38098 return;
38099 }
38100@@ -198,7 +197,7 @@ void ipwireless_tty_received(struct ipw_tty *tty, unsigned char *data,
38101 return;
38102 }
38103
38104- if (!tty->open_count) {
38105+ if (!local_read(&tty->open_count)) {
38106 mutex_unlock(&tty->ipw_tty_mutex);
38107 return;
38108 }
38109@@ -240,7 +239,7 @@ static int ipw_write(struct tty_struct *linux_tty,
38110 return -ENODEV;
38111
38112 mutex_lock(&tty->ipw_tty_mutex);
38113- if (!tty->open_count) {
38114+ if (!local_read(&tty->open_count)) {
38115 mutex_unlock(&tty->ipw_tty_mutex);
38116 return -EINVAL;
38117 }
38118@@ -280,7 +279,7 @@ static int ipw_write_room(struct tty_struct *linux_tty)
38119 if (!tty)
38120 return -ENODEV;
38121
38122- if (!tty->open_count)
38123+ if (!local_read(&tty->open_count))
38124 return -EINVAL;
38125
38126 room = IPWIRELESS_TX_QUEUE_SIZE - tty->tx_bytes_queued;
38127@@ -322,7 +321,7 @@ static int ipw_chars_in_buffer(struct tty_struct *linux_tty)
38128 if (!tty)
38129 return 0;
38130
38131- if (!tty->open_count)
38132+ if (!local_read(&tty->open_count))
38133 return 0;
38134
38135 return tty->tx_bytes_queued;
38136@@ -403,7 +402,7 @@ static int ipw_tiocmget(struct tty_struct *linux_tty)
38137 if (!tty)
38138 return -ENODEV;
38139
38140- if (!tty->open_count)
38141+ if (!local_read(&tty->open_count))
38142 return -EINVAL;
38143
38144 return get_control_lines(tty);
38145@@ -419,7 +418,7 @@ ipw_tiocmset(struct tty_struct *linux_tty,
38146 if (!tty)
38147 return -ENODEV;
38148
38149- if (!tty->open_count)
38150+ if (!local_read(&tty->open_count))
38151 return -EINVAL;
38152
38153 return set_control_lines(tty, set, clear);
38154@@ -433,7 +432,7 @@ static int ipw_ioctl(struct tty_struct *linux_tty,
38155 if (!tty)
38156 return -ENODEV;
38157
38158- if (!tty->open_count)
38159+ if (!local_read(&tty->open_count))
38160 return -EINVAL;
38161
38162 /* FIXME: Exactly how is the tty object locked here .. */
38163@@ -582,7 +581,7 @@ void ipwireless_tty_free(struct ipw_tty *tty)
38164 against a parallel ioctl etc */
38165 mutex_lock(&ttyj->ipw_tty_mutex);
38166 }
38167- while (ttyj->open_count)
38168+ while (local_read(&ttyj->open_count))
38169 do_ipw_close(ttyj);
38170 ipwireless_disassociate_network_ttys(network,
38171 ttyj->channel_idx);
38172diff --git a/drivers/tty/n_gsm.c b/drivers/tty/n_gsm.c
38173index fc7bbba..9527e93 100644
38174--- a/drivers/tty/n_gsm.c
38175+++ b/drivers/tty/n_gsm.c
38176@@ -1629,7 +1629,7 @@ static struct gsm_dlci *gsm_dlci_alloc(struct gsm_mux *gsm, int addr)
38177 kref_init(&dlci->ref);
38178 mutex_init(&dlci->mutex);
38179 dlci->fifo = &dlci->_fifo;
38180- if (kfifo_alloc(&dlci->_fifo, 4096, GFP_KERNEL) < 0) {
38181+ if (kfifo_alloc(&dlci->_fifo, 4096, GFP_KERNEL)) {
38182 kfree(dlci);
38183 return NULL;
38184 }
38185diff --git a/drivers/tty/n_tty.c b/drivers/tty/n_tty.c
38186index 39d6ab6..eb97f41 100644
38187--- a/drivers/tty/n_tty.c
38188+++ b/drivers/tty/n_tty.c
38189@@ -2123,6 +2123,7 @@ void n_tty_inherit_ops(struct tty_ldisc_ops *ops)
38190 {
38191 *ops = tty_ldisc_N_TTY;
38192 ops->owner = NULL;
38193- ops->refcount = ops->flags = 0;
38194+ atomic_set(&ops->refcount, 0);
38195+ ops->flags = 0;
38196 }
38197 EXPORT_SYMBOL_GPL(n_tty_inherit_ops);
38198diff --git a/drivers/tty/pty.c b/drivers/tty/pty.c
38199index e18604b..a7d5a11 100644
38200--- a/drivers/tty/pty.c
38201+++ b/drivers/tty/pty.c
38202@@ -773,8 +773,10 @@ static void __init unix98_pty_init(void)
38203 register_sysctl_table(pty_root_table);
38204
38205 /* Now create the /dev/ptmx special device */
38206+ pax_open_kernel();
38207 tty_default_fops(&ptmx_fops);
38208- ptmx_fops.open = ptmx_open;
38209+ *(void **)&ptmx_fops.open = ptmx_open;
38210+ pax_close_kernel();
38211
38212 cdev_init(&ptmx_cdev, &ptmx_fops);
38213 if (cdev_add(&ptmx_cdev, MKDEV(TTYAUX_MAJOR, 2), 1) ||
38214diff --git a/drivers/tty/serial/kgdboc.c b/drivers/tty/serial/kgdboc.c
38215index 2b42a01..32a2ed3 100644
38216--- a/drivers/tty/serial/kgdboc.c
38217+++ b/drivers/tty/serial/kgdboc.c
38218@@ -24,8 +24,9 @@
38219 #define MAX_CONFIG_LEN 40
38220
38221 static struct kgdb_io kgdboc_io_ops;
38222+static struct kgdb_io kgdboc_io_ops_console;
38223
38224-/* -1 = init not run yet, 0 = unconfigured, 1 = configured. */
38225+/* -1 = init not run yet, 0 = unconfigured, 1/2 = configured. */
38226 static int configured = -1;
38227
38228 static char config[MAX_CONFIG_LEN];
38229@@ -148,6 +149,8 @@ static void cleanup_kgdboc(void)
38230 kgdboc_unregister_kbd();
38231 if (configured == 1)
38232 kgdb_unregister_io_module(&kgdboc_io_ops);
38233+ else if (configured == 2)
38234+ kgdb_unregister_io_module(&kgdboc_io_ops_console);
38235 }
38236
38237 static int configure_kgdboc(void)
38238@@ -157,13 +160,13 @@ static int configure_kgdboc(void)
38239 int err;
38240 char *cptr = config;
38241 struct console *cons;
38242+ int is_console = 0;
38243
38244 err = kgdboc_option_setup(config);
38245 if (err || !strlen(config) || isspace(config[0]))
38246 goto noconfig;
38247
38248 err = -ENODEV;
38249- kgdboc_io_ops.is_console = 0;
38250 kgdb_tty_driver = NULL;
38251
38252 kgdboc_use_kms = 0;
38253@@ -184,7 +187,7 @@ static int configure_kgdboc(void)
38254 int idx;
38255 if (cons->device && cons->device(cons, &idx) == p &&
38256 idx == tty_line) {
38257- kgdboc_io_ops.is_console = 1;
38258+ is_console = 1;
38259 break;
38260 }
38261 cons = cons->next;
38262@@ -194,12 +197,16 @@ static int configure_kgdboc(void)
38263 kgdb_tty_line = tty_line;
38264
38265 do_register:
38266- err = kgdb_register_io_module(&kgdboc_io_ops);
38267+ if (is_console) {
38268+ err = kgdb_register_io_module(&kgdboc_io_ops_console);
38269+ configured = 2;
38270+ } else {
38271+ err = kgdb_register_io_module(&kgdboc_io_ops);
38272+ configured = 1;
38273+ }
38274 if (err)
38275 goto noconfig;
38276
38277- configured = 1;
38278-
38279 return 0;
38280
38281 noconfig:
38282@@ -213,7 +220,7 @@ noconfig:
38283 static int __init init_kgdboc(void)
38284 {
38285 /* Already configured? */
38286- if (configured == 1)
38287+ if (configured >= 1)
38288 return 0;
38289
38290 return configure_kgdboc();
38291@@ -262,7 +269,7 @@ static int param_set_kgdboc_var(const char *kmessage, struct kernel_param *kp)
38292 if (config[len - 1] == '\n')
38293 config[len - 1] = '\0';
38294
38295- if (configured == 1)
38296+ if (configured >= 1)
38297 cleanup_kgdboc();
38298
38299 /* Go and configure with the new params. */
38300@@ -302,6 +309,15 @@ static struct kgdb_io kgdboc_io_ops = {
38301 .post_exception = kgdboc_post_exp_handler,
38302 };
38303
38304+static struct kgdb_io kgdboc_io_ops_console = {
38305+ .name = "kgdboc",
38306+ .read_char = kgdboc_get_char,
38307+ .write_char = kgdboc_put_char,
38308+ .pre_exception = kgdboc_pre_exp_handler,
38309+ .post_exception = kgdboc_post_exp_handler,
38310+ .is_console = 1
38311+};
38312+
38313 #ifdef CONFIG_KGDB_SERIAL_CONSOLE
38314 /* This is only available if kgdboc is a built in for early debugging */
38315 static int __init kgdboc_early_init(char *opt)
38316diff --git a/drivers/tty/tty_io.c b/drivers/tty/tty_io.c
38317index 05085be..67eadb0 100644
38318--- a/drivers/tty/tty_io.c
38319+++ b/drivers/tty/tty_io.c
38320@@ -3240,7 +3240,7 @@ EXPORT_SYMBOL_GPL(get_current_tty);
38321
38322 void tty_default_fops(struct file_operations *fops)
38323 {
38324- *fops = tty_fops;
38325+ memcpy((void *)fops, &tty_fops, sizeof(tty_fops));
38326 }
38327
38328 /*
38329diff --git a/drivers/tty/tty_ldisc.c b/drivers/tty/tty_ldisc.c
38330index 8e0924f..4204eb4 100644
38331--- a/drivers/tty/tty_ldisc.c
38332+++ b/drivers/tty/tty_ldisc.c
38333@@ -75,7 +75,7 @@ static void put_ldisc(struct tty_ldisc *ld)
38334 if (atomic_dec_and_lock(&ld->users, &tty_ldisc_lock)) {
38335 struct tty_ldisc_ops *ldo = ld->ops;
38336
38337- ldo->refcount--;
38338+ atomic_dec(&ldo->refcount);
38339 module_put(ldo->owner);
38340 spin_unlock_irqrestore(&tty_ldisc_lock, flags);
38341
38342@@ -110,7 +110,7 @@ int tty_register_ldisc(int disc, struct tty_ldisc_ops *new_ldisc)
38343 spin_lock_irqsave(&tty_ldisc_lock, flags);
38344 tty_ldiscs[disc] = new_ldisc;
38345 new_ldisc->num = disc;
38346- new_ldisc->refcount = 0;
38347+ atomic_set(&new_ldisc->refcount, 0);
38348 spin_unlock_irqrestore(&tty_ldisc_lock, flags);
38349
38350 return ret;
38351@@ -138,7 +138,7 @@ int tty_unregister_ldisc(int disc)
38352 return -EINVAL;
38353
38354 spin_lock_irqsave(&tty_ldisc_lock, flags);
38355- if (tty_ldiscs[disc]->refcount)
38356+ if (atomic_read(&tty_ldiscs[disc]->refcount))
38357 ret = -EBUSY;
38358 else
38359 tty_ldiscs[disc] = NULL;
38360@@ -159,7 +159,7 @@ static struct tty_ldisc_ops *get_ldops(int disc)
38361 if (ldops) {
38362 ret = ERR_PTR(-EAGAIN);
38363 if (try_module_get(ldops->owner)) {
38364- ldops->refcount++;
38365+ atomic_inc(&ldops->refcount);
38366 ret = ldops;
38367 }
38368 }
38369@@ -172,7 +172,7 @@ static void put_ldops(struct tty_ldisc_ops *ldops)
38370 unsigned long flags;
38371
38372 spin_lock_irqsave(&tty_ldisc_lock, flags);
38373- ldops->refcount--;
38374+ atomic_dec(&ldops->refcount);
38375 module_put(ldops->owner);
38376 spin_unlock_irqrestore(&tty_ldisc_lock, flags);
38377 }
38378diff --git a/drivers/tty/vt/keyboard.c b/drivers/tty/vt/keyboard.c
38379index a605549..6bd3c96 100644
38380--- a/drivers/tty/vt/keyboard.c
38381+++ b/drivers/tty/vt/keyboard.c
38382@@ -657,6 +657,16 @@ static void k_spec(struct vc_data *vc, unsigned char value, char up_flag)
38383 kbd->kbdmode == VC_OFF) &&
38384 value != KVAL(K_SAK))
38385 return; /* SAK is allowed even in raw mode */
38386+
38387+#if defined(CONFIG_GRKERNSEC_PROC) || defined(CONFIG_GRKERNSEC_PROC_MEMMAP)
38388+ {
38389+ void *func = fn_handler[value];
38390+ if (func == fn_show_state || func == fn_show_ptregs ||
38391+ func == fn_show_mem)
38392+ return;
38393+ }
38394+#endif
38395+
38396 fn_handler[value](vc);
38397 }
38398
38399diff --git a/drivers/tty/vt/vt_ioctl.c b/drivers/tty/vt/vt_ioctl.c
38400index 65447c5..0526f0a 100644
38401--- a/drivers/tty/vt/vt_ioctl.c
38402+++ b/drivers/tty/vt/vt_ioctl.c
38403@@ -207,9 +207,6 @@ do_kdsk_ioctl(int cmd, struct kbentry __user *user_kbe, int perm, struct kbd_str
38404 if (copy_from_user(&tmp, user_kbe, sizeof(struct kbentry)))
38405 return -EFAULT;
38406
38407- if (!capable(CAP_SYS_TTY_CONFIG))
38408- perm = 0;
38409-
38410 switch (cmd) {
38411 case KDGKBENT:
38412 key_map = key_maps[s];
38413@@ -221,6 +218,9 @@ do_kdsk_ioctl(int cmd, struct kbentry __user *user_kbe, int perm, struct kbd_str
38414 val = (i ? K_HOLE : K_NOSUCHMAP);
38415 return put_user(val, &user_kbe->kb_value);
38416 case KDSKBENT:
38417+ if (!capable(CAP_SYS_TTY_CONFIG))
38418+ perm = 0;
38419+
38420 if (!perm)
38421 return -EPERM;
38422 if (!i && v == K_NOSUCHMAP) {
38423@@ -322,9 +322,6 @@ do_kdgkb_ioctl(int cmd, struct kbsentry __user *user_kdgkb, int perm)
38424 int i, j, k;
38425 int ret;
38426
38427- if (!capable(CAP_SYS_TTY_CONFIG))
38428- perm = 0;
38429-
38430 kbs = kmalloc(sizeof(*kbs), GFP_KERNEL);
38431 if (!kbs) {
38432 ret = -ENOMEM;
38433@@ -358,6 +355,9 @@ do_kdgkb_ioctl(int cmd, struct kbsentry __user *user_kdgkb, int perm)
38434 kfree(kbs);
38435 return ((p && *p) ? -EOVERFLOW : 0);
38436 case KDSKBSENT:
38437+ if (!capable(CAP_SYS_TTY_CONFIG))
38438+ perm = 0;
38439+
38440 if (!perm) {
38441 ret = -EPERM;
38442 goto reterr;
38443diff --git a/drivers/uio/uio.c b/drivers/uio/uio.c
38444index a783d53..cb30d94 100644
38445--- a/drivers/uio/uio.c
38446+++ b/drivers/uio/uio.c
38447@@ -25,6 +25,7 @@
38448 #include <linux/kobject.h>
38449 #include <linux/cdev.h>
38450 #include <linux/uio_driver.h>
38451+#include <asm/local.h>
38452
38453 #define UIO_MAX_DEVICES (1U << MINORBITS)
38454
38455@@ -32,10 +33,10 @@ struct uio_device {
38456 struct module *owner;
38457 struct device *dev;
38458 int minor;
38459- atomic_t event;
38460+ atomic_unchecked_t event;
38461 struct fasync_struct *async_queue;
38462 wait_queue_head_t wait;
38463- int vma_count;
38464+ local_t vma_count;
38465 struct uio_info *info;
38466 struct kobject *map_dir;
38467 struct kobject *portio_dir;
38468@@ -242,7 +243,7 @@ static ssize_t show_event(struct device *dev,
38469 struct device_attribute *attr, char *buf)
38470 {
38471 struct uio_device *idev = dev_get_drvdata(dev);
38472- return sprintf(buf, "%u\n", (unsigned int)atomic_read(&idev->event));
38473+ return sprintf(buf, "%u\n", (unsigned int)atomic_read_unchecked(&idev->event));
38474 }
38475
38476 static struct device_attribute uio_class_attributes[] = {
38477@@ -408,7 +409,7 @@ void uio_event_notify(struct uio_info *info)
38478 {
38479 struct uio_device *idev = info->uio_dev;
38480
38481- atomic_inc(&idev->event);
38482+ atomic_inc_unchecked(&idev->event);
38483 wake_up_interruptible(&idev->wait);
38484 kill_fasync(&idev->async_queue, SIGIO, POLL_IN);
38485 }
38486@@ -461,7 +462,7 @@ static int uio_open(struct inode *inode, struct file *filep)
38487 }
38488
38489 listener->dev = idev;
38490- listener->event_count = atomic_read(&idev->event);
38491+ listener->event_count = atomic_read_unchecked(&idev->event);
38492 filep->private_data = listener;
38493
38494 if (idev->info->open) {
38495@@ -512,7 +513,7 @@ static unsigned int uio_poll(struct file *filep, poll_table *wait)
38496 return -EIO;
38497
38498 poll_wait(filep, &idev->wait, wait);
38499- if (listener->event_count != atomic_read(&idev->event))
38500+ if (listener->event_count != atomic_read_unchecked(&idev->event))
38501 return POLLIN | POLLRDNORM;
38502 return 0;
38503 }
38504@@ -537,7 +538,7 @@ static ssize_t uio_read(struct file *filep, char __user *buf,
38505 do {
38506 set_current_state(TASK_INTERRUPTIBLE);
38507
38508- event_count = atomic_read(&idev->event);
38509+ event_count = atomic_read_unchecked(&idev->event);
38510 if (event_count != listener->event_count) {
38511 if (copy_to_user(buf, &event_count, count))
38512 retval = -EFAULT;
38513@@ -606,13 +607,13 @@ static int uio_find_mem_index(struct vm_area_struct *vma)
38514 static void uio_vma_open(struct vm_area_struct *vma)
38515 {
38516 struct uio_device *idev = vma->vm_private_data;
38517- idev->vma_count++;
38518+ local_inc(&idev->vma_count);
38519 }
38520
38521 static void uio_vma_close(struct vm_area_struct *vma)
38522 {
38523 struct uio_device *idev = vma->vm_private_data;
38524- idev->vma_count--;
38525+ local_dec(&idev->vma_count);
38526 }
38527
38528 static int uio_vma_fault(struct vm_area_struct *vma, struct vm_fault *vmf)
38529@@ -821,7 +822,7 @@ int __uio_register_device(struct module *owner,
38530 idev->owner = owner;
38531 idev->info = info;
38532 init_waitqueue_head(&idev->wait);
38533- atomic_set(&idev->event, 0);
38534+ atomic_set_unchecked(&idev->event, 0);
38535
38536 ret = uio_get_minor(idev);
38537 if (ret)
38538diff --git a/drivers/usb/atm/cxacru.c b/drivers/usb/atm/cxacru.c
38539index a845f8b..4f54072 100644
38540--- a/drivers/usb/atm/cxacru.c
38541+++ b/drivers/usb/atm/cxacru.c
38542@@ -473,7 +473,7 @@ static ssize_t cxacru_sysfs_store_adsl_config(struct device *dev,
38543 ret = sscanf(buf + pos, "%x=%x%n", &index, &value, &tmp);
38544 if (ret < 2)
38545 return -EINVAL;
38546- if (index < 0 || index > 0x7f)
38547+ if (index > 0x7f)
38548 return -EINVAL;
38549 pos += tmp;
38550
38551diff --git a/drivers/usb/atm/usbatm.c b/drivers/usb/atm/usbatm.c
38552index d3448ca..d2864ca 100644
38553--- a/drivers/usb/atm/usbatm.c
38554+++ b/drivers/usb/atm/usbatm.c
38555@@ -333,7 +333,7 @@ static void usbatm_extract_one_cell(struct usbatm_data *instance, unsigned char
38556 if (printk_ratelimit())
38557 atm_warn(instance, "%s: OAM not supported (vpi %d, vci %d)!\n",
38558 __func__, vpi, vci);
38559- atomic_inc(&vcc->stats->rx_err);
38560+ atomic_inc_unchecked(&vcc->stats->rx_err);
38561 return;
38562 }
38563
38564@@ -361,7 +361,7 @@ static void usbatm_extract_one_cell(struct usbatm_data *instance, unsigned char
38565 if (length > ATM_MAX_AAL5_PDU) {
38566 atm_rldbg(instance, "%s: bogus length %u (vcc: 0x%p)!\n",
38567 __func__, length, vcc);
38568- atomic_inc(&vcc->stats->rx_err);
38569+ atomic_inc_unchecked(&vcc->stats->rx_err);
38570 goto out;
38571 }
38572
38573@@ -370,14 +370,14 @@ static void usbatm_extract_one_cell(struct usbatm_data *instance, unsigned char
38574 if (sarb->len < pdu_length) {
38575 atm_rldbg(instance, "%s: bogus pdu_length %u (sarb->len: %u, vcc: 0x%p)!\n",
38576 __func__, pdu_length, sarb->len, vcc);
38577- atomic_inc(&vcc->stats->rx_err);
38578+ atomic_inc_unchecked(&vcc->stats->rx_err);
38579 goto out;
38580 }
38581
38582 if (crc32_be(~0, skb_tail_pointer(sarb) - pdu_length, pdu_length) != 0xc704dd7b) {
38583 atm_rldbg(instance, "%s: packet failed crc check (vcc: 0x%p)!\n",
38584 __func__, vcc);
38585- atomic_inc(&vcc->stats->rx_err);
38586+ atomic_inc_unchecked(&vcc->stats->rx_err);
38587 goto out;
38588 }
38589
38590@@ -387,7 +387,7 @@ static void usbatm_extract_one_cell(struct usbatm_data *instance, unsigned char
38591 if (printk_ratelimit())
38592 atm_err(instance, "%s: no memory for skb (length: %u)!\n",
38593 __func__, length);
38594- atomic_inc(&vcc->stats->rx_drop);
38595+ atomic_inc_unchecked(&vcc->stats->rx_drop);
38596 goto out;
38597 }
38598
38599@@ -412,7 +412,7 @@ static void usbatm_extract_one_cell(struct usbatm_data *instance, unsigned char
38600
38601 vcc->push(vcc, skb);
38602
38603- atomic_inc(&vcc->stats->rx);
38604+ atomic_inc_unchecked(&vcc->stats->rx);
38605 out:
38606 skb_trim(sarb, 0);
38607 }
38608@@ -615,7 +615,7 @@ static void usbatm_tx_process(unsigned long data)
38609 struct atm_vcc *vcc = UDSL_SKB(skb)->atm.vcc;
38610
38611 usbatm_pop(vcc, skb);
38612- atomic_inc(&vcc->stats->tx);
38613+ atomic_inc_unchecked(&vcc->stats->tx);
38614
38615 skb = skb_dequeue(&instance->sndqueue);
38616 }
38617@@ -773,11 +773,11 @@ static int usbatm_atm_proc_read(struct atm_dev *atm_dev, loff_t * pos, char *pag
38618 if (!left--)
38619 return sprintf(page,
38620 "AAL5: tx %d ( %d err ), rx %d ( %d err, %d drop )\n",
38621- atomic_read(&atm_dev->stats.aal5.tx),
38622- atomic_read(&atm_dev->stats.aal5.tx_err),
38623- atomic_read(&atm_dev->stats.aal5.rx),
38624- atomic_read(&atm_dev->stats.aal5.rx_err),
38625- atomic_read(&atm_dev->stats.aal5.rx_drop));
38626+ atomic_read_unchecked(&atm_dev->stats.aal5.tx),
38627+ atomic_read_unchecked(&atm_dev->stats.aal5.tx_err),
38628+ atomic_read_unchecked(&atm_dev->stats.aal5.rx),
38629+ atomic_read_unchecked(&atm_dev->stats.aal5.rx_err),
38630+ atomic_read_unchecked(&atm_dev->stats.aal5.rx_drop));
38631
38632 if (!left--) {
38633 if (instance->disconnected)
38634diff --git a/drivers/usb/core/devices.c b/drivers/usb/core/devices.c
38635index d956965..4179a77 100644
38636--- a/drivers/usb/core/devices.c
38637+++ b/drivers/usb/core/devices.c
38638@@ -126,7 +126,7 @@ static const char format_endpt[] =
38639 * time it gets called.
38640 */
38641 static struct device_connect_event {
38642- atomic_t count;
38643+ atomic_unchecked_t count;
38644 wait_queue_head_t wait;
38645 } device_event = {
38646 .count = ATOMIC_INIT(1),
38647@@ -164,7 +164,7 @@ static const struct class_info clas_info[] = {
38648
38649 void usbfs_conn_disc_event(void)
38650 {
38651- atomic_add(2, &device_event.count);
38652+ atomic_add_unchecked(2, &device_event.count);
38653 wake_up(&device_event.wait);
38654 }
38655
38656@@ -648,7 +648,7 @@ static unsigned int usb_device_poll(struct file *file,
38657
38658 poll_wait(file, &device_event.wait, wait);
38659
38660- event_count = atomic_read(&device_event.count);
38661+ event_count = atomic_read_unchecked(&device_event.count);
38662 if (file->f_version != event_count) {
38663 file->f_version = event_count;
38664 return POLLIN | POLLRDNORM;
38665diff --git a/drivers/usb/early/ehci-dbgp.c b/drivers/usb/early/ehci-dbgp.c
38666index 1fc8f12..20647c1 100644
38667--- a/drivers/usb/early/ehci-dbgp.c
38668+++ b/drivers/usb/early/ehci-dbgp.c
38669@@ -97,7 +97,8 @@ static inline u32 dbgp_len_update(u32 x, u32 len)
38670
38671 #ifdef CONFIG_KGDB
38672 static struct kgdb_io kgdbdbgp_io_ops;
38673-#define dbgp_kgdb_mode (dbg_io_ops == &kgdbdbgp_io_ops)
38674+static struct kgdb_io kgdbdbgp_io_ops_console;
38675+#define dbgp_kgdb_mode (dbg_io_ops == &kgdbdbgp_io_ops || dbg_io_ops == &kgdbdbgp_io_ops_console)
38676 #else
38677 #define dbgp_kgdb_mode (0)
38678 #endif
38679@@ -1035,6 +1036,13 @@ static struct kgdb_io kgdbdbgp_io_ops = {
38680 .write_char = kgdbdbgp_write_char,
38681 };
38682
38683+static struct kgdb_io kgdbdbgp_io_ops_console = {
38684+ .name = "kgdbdbgp",
38685+ .read_char = kgdbdbgp_read_char,
38686+ .write_char = kgdbdbgp_write_char,
38687+ .is_console = 1
38688+};
38689+
38690 static int kgdbdbgp_wait_time;
38691
38692 static int __init kgdbdbgp_parse_config(char *str)
38693@@ -1050,8 +1058,10 @@ static int __init kgdbdbgp_parse_config(char *str)
38694 ptr++;
38695 kgdbdbgp_wait_time = simple_strtoul(ptr, &ptr, 10);
38696 }
38697- kgdb_register_io_module(&kgdbdbgp_io_ops);
38698- kgdbdbgp_io_ops.is_console = early_dbgp_console.index != -1;
38699+ if (early_dbgp_console.index != -1)
38700+ kgdb_register_io_module(&kgdbdbgp_io_ops_console);
38701+ else
38702+ kgdb_register_io_module(&kgdbdbgp_io_ops);
38703
38704 return 0;
38705 }
38706diff --git a/drivers/usb/wusbcore/wa-hc.h b/drivers/usb/wusbcore/wa-hc.h
38707index d6bea3e..60b250e 100644
38708--- a/drivers/usb/wusbcore/wa-hc.h
38709+++ b/drivers/usb/wusbcore/wa-hc.h
38710@@ -192,7 +192,7 @@ struct wahc {
38711 struct list_head xfer_delayed_list;
38712 spinlock_t xfer_list_lock;
38713 struct work_struct xfer_work;
38714- atomic_t xfer_id_count;
38715+ atomic_unchecked_t xfer_id_count;
38716 };
38717
38718
38719@@ -246,7 +246,7 @@ static inline void wa_init(struct wahc *wa)
38720 INIT_LIST_HEAD(&wa->xfer_delayed_list);
38721 spin_lock_init(&wa->xfer_list_lock);
38722 INIT_WORK(&wa->xfer_work, wa_urb_enqueue_run);
38723- atomic_set(&wa->xfer_id_count, 1);
38724+ atomic_set_unchecked(&wa->xfer_id_count, 1);
38725 }
38726
38727 /**
38728diff --git a/drivers/usb/wusbcore/wa-xfer.c b/drivers/usb/wusbcore/wa-xfer.c
38729index 57c01ab..8a05959 100644
38730--- a/drivers/usb/wusbcore/wa-xfer.c
38731+++ b/drivers/usb/wusbcore/wa-xfer.c
38732@@ -296,7 +296,7 @@ out:
38733 */
38734 static void wa_xfer_id_init(struct wa_xfer *xfer)
38735 {
38736- xfer->id = atomic_add_return(1, &xfer->wa->xfer_id_count);
38737+ xfer->id = atomic_add_return_unchecked(1, &xfer->wa->xfer_id_count);
38738 }
38739
38740 /*
38741diff --git a/drivers/vhost/vhost.c b/drivers/vhost/vhost.c
38742index c14c42b..f955cc2 100644
38743--- a/drivers/vhost/vhost.c
38744+++ b/drivers/vhost/vhost.c
38745@@ -629,7 +629,7 @@ static long vhost_set_memory(struct vhost_dev *d, struct vhost_memory __user *m)
38746 return 0;
38747 }
38748
38749-static long vhost_set_vring(struct vhost_dev *d, int ioctl, void __user *argp)
38750+static long vhost_set_vring(struct vhost_dev *d, unsigned int ioctl, void __user *argp)
38751 {
38752 struct file *eventfp, *filep = NULL,
38753 *pollstart = NULL, *pollstop = NULL;
38754diff --git a/drivers/video/aty/aty128fb.c b/drivers/video/aty/aty128fb.c
38755index b0b2ac3..89a4399 100644
38756--- a/drivers/video/aty/aty128fb.c
38757+++ b/drivers/video/aty/aty128fb.c
38758@@ -148,7 +148,7 @@ enum {
38759 };
38760
38761 /* Must match above enum */
38762-static const char *r128_family[] __devinitdata = {
38763+static const char *r128_family[] __devinitconst = {
38764 "AGP",
38765 "PCI",
38766 "PRO AGP",
38767diff --git a/drivers/video/backlight/s6e63m0.c b/drivers/video/backlight/s6e63m0.c
38768index e132157..516db70 100644
38769--- a/drivers/video/backlight/s6e63m0.c
38770+++ b/drivers/video/backlight/s6e63m0.c
38771@@ -690,7 +690,7 @@ static ssize_t s6e63m0_sysfs_store_gamma_mode(struct device *dev,
38772 struct backlight_device *bd = NULL;
38773 int brightness, rc;
38774
38775- rc = strict_strtoul(buf, 0, (unsigned long *)&lcd->gamma_mode);
38776+ rc = kstrtouint(buf, 0, &lcd->gamma_mode);
38777 if (rc < 0)
38778 return rc;
38779
38780diff --git a/drivers/video/fbcmap.c b/drivers/video/fbcmap.c
38781index 5c3960d..15cf8fc 100644
38782--- a/drivers/video/fbcmap.c
38783+++ b/drivers/video/fbcmap.c
38784@@ -285,8 +285,7 @@ int fb_set_user_cmap(struct fb_cmap_user *cmap, struct fb_info *info)
38785 rc = -ENODEV;
38786 goto out;
38787 }
38788- if (cmap->start < 0 || (!info->fbops->fb_setcolreg &&
38789- !info->fbops->fb_setcmap)) {
38790+ if (!info->fbops->fb_setcolreg && !info->fbops->fb_setcmap) {
38791 rc = -EINVAL;
38792 goto out1;
38793 }
38794diff --git a/drivers/video/fbmem.c b/drivers/video/fbmem.c
38795index ad93629..e020fc3 100644
38796--- a/drivers/video/fbmem.c
38797+++ b/drivers/video/fbmem.c
38798@@ -428,7 +428,7 @@ static void fb_do_show_logo(struct fb_info *info, struct fb_image *image,
38799 image->dx += image->width + 8;
38800 }
38801 } else if (rotate == FB_ROTATE_UD) {
38802- for (x = 0; x < num && image->dx >= 0; x++) {
38803+ for (x = 0; x < num && (__s32)image->dx >= 0; x++) {
38804 info->fbops->fb_imageblit(info, image);
38805 image->dx -= image->width + 8;
38806 }
38807@@ -440,7 +440,7 @@ static void fb_do_show_logo(struct fb_info *info, struct fb_image *image,
38808 image->dy += image->height + 8;
38809 }
38810 } else if (rotate == FB_ROTATE_CCW) {
38811- for (x = 0; x < num && image->dy >= 0; x++) {
38812+ for (x = 0; x < num && (__s32)image->dy >= 0; x++) {
38813 info->fbops->fb_imageblit(info, image);
38814 image->dy -= image->height + 8;
38815 }
38816@@ -1143,7 +1143,7 @@ static long do_fb_ioctl(struct fb_info *info, unsigned int cmd,
38817 return -EFAULT;
38818 if (con2fb.console < 1 || con2fb.console > MAX_NR_CONSOLES)
38819 return -EINVAL;
38820- if (con2fb.framebuffer < 0 || con2fb.framebuffer >= FB_MAX)
38821+ if (con2fb.framebuffer >= FB_MAX)
38822 return -EINVAL;
38823 if (!registered_fb[con2fb.framebuffer])
38824 request_module("fb%d", con2fb.framebuffer);
38825diff --git a/drivers/video/geode/gx1fb_core.c b/drivers/video/geode/gx1fb_core.c
38826index 5a5d092..265c5ed 100644
38827--- a/drivers/video/geode/gx1fb_core.c
38828+++ b/drivers/video/geode/gx1fb_core.c
38829@@ -29,7 +29,7 @@ static int crt_option = 1;
38830 static char panel_option[32] = "";
38831
38832 /* Modes relevant to the GX1 (taken from modedb.c) */
38833-static const struct fb_videomode __devinitdata gx1_modedb[] = {
38834+static const struct fb_videomode __devinitconst gx1_modedb[] = {
38835 /* 640x480-60 VESA */
38836 { NULL, 60, 640, 480, 39682, 48, 16, 33, 10, 96, 2,
38837 0, FB_VMODE_NONINTERLACED, FB_MODE_IS_VESA },
38838diff --git a/drivers/video/gxt4500.c b/drivers/video/gxt4500.c
38839index 0fad23f..0e9afa4 100644
38840--- a/drivers/video/gxt4500.c
38841+++ b/drivers/video/gxt4500.c
38842@@ -156,7 +156,7 @@ struct gxt4500_par {
38843 static char *mode_option;
38844
38845 /* default mode: 1280x1024 @ 60 Hz, 8 bpp */
38846-static const struct fb_videomode defaultmode __devinitdata = {
38847+static const struct fb_videomode defaultmode __devinitconst = {
38848 .refresh = 60,
38849 .xres = 1280,
38850 .yres = 1024,
38851@@ -581,7 +581,7 @@ static int gxt4500_blank(int blank, struct fb_info *info)
38852 return 0;
38853 }
38854
38855-static const struct fb_fix_screeninfo gxt4500_fix __devinitdata = {
38856+static const struct fb_fix_screeninfo gxt4500_fix __devinitconst = {
38857 .id = "IBM GXT4500P",
38858 .type = FB_TYPE_PACKED_PIXELS,
38859 .visual = FB_VISUAL_PSEUDOCOLOR,
38860diff --git a/drivers/video/i810/i810_accel.c b/drivers/video/i810/i810_accel.c
38861index 7672d2e..b56437f 100644
38862--- a/drivers/video/i810/i810_accel.c
38863+++ b/drivers/video/i810/i810_accel.c
38864@@ -73,6 +73,7 @@ static inline int wait_for_space(struct fb_info *info, u32 space)
38865 }
38866 }
38867 printk("ringbuffer lockup!!!\n");
38868+ printk("head:%u tail:%u iring.size:%u space:%u\n", head, tail, par->iring.size, space);
38869 i810_report_error(mmio);
38870 par->dev_flags |= LOCKUP;
38871 info->pixmap.scan_align = 1;
38872diff --git a/drivers/video/i810/i810_main.c b/drivers/video/i810/i810_main.c
38873index 318f6fb..9a389c1 100644
38874--- a/drivers/video/i810/i810_main.c
38875+++ b/drivers/video/i810/i810_main.c
38876@@ -97,7 +97,7 @@ static int i810fb_blank (int blank_mode, struct fb_info *info);
38877 static void i810fb_release_resource (struct fb_info *info, struct i810fb_par *par);
38878
38879 /* PCI */
38880-static const char *i810_pci_list[] __devinitdata = {
38881+static const char *i810_pci_list[] __devinitconst = {
38882 "Intel(R) 810 Framebuffer Device" ,
38883 "Intel(R) 810-DC100 Framebuffer Device" ,
38884 "Intel(R) 810E Framebuffer Device" ,
38885diff --git a/drivers/video/jz4740_fb.c b/drivers/video/jz4740_fb.c
38886index de36693..3c63fc2 100644
38887--- a/drivers/video/jz4740_fb.c
38888+++ b/drivers/video/jz4740_fb.c
38889@@ -136,7 +136,7 @@ struct jzfb {
38890 uint32_t pseudo_palette[16];
38891 };
38892
38893-static const struct fb_fix_screeninfo jzfb_fix __devinitdata = {
38894+static const struct fb_fix_screeninfo jzfb_fix __devinitconst = {
38895 .id = "JZ4740 FB",
38896 .type = FB_TYPE_PACKED_PIXELS,
38897 .visual = FB_VISUAL_TRUECOLOR,
38898diff --git a/drivers/video/logo/logo_linux_clut224.ppm b/drivers/video/logo/logo_linux_clut224.ppm
38899index 3c14e43..eafa544 100644
38900--- a/drivers/video/logo/logo_linux_clut224.ppm
38901+++ b/drivers/video/logo/logo_linux_clut224.ppm
38902@@ -1,1604 +1,1123 @@
38903 P3
38904-# Standard 224-color Linux logo
38905 80 80
38906 255
38907- 0 0 0 0 0 0 0 0 0 0 0 0
38908- 0 0 0 0 0 0 0 0 0 0 0 0
38909- 0 0 0 0 0 0 0 0 0 0 0 0
38910- 0 0 0 0 0 0 0 0 0 0 0 0
38911- 0 0 0 0 0 0 0 0 0 0 0 0
38912- 0 0 0 0 0 0 0 0 0 0 0 0
38913- 0 0 0 0 0 0 0 0 0 0 0 0
38914- 0 0 0 0 0 0 0 0 0 0 0 0
38915- 0 0 0 0 0 0 0 0 0 0 0 0
38916- 6 6 6 6 6 6 10 10 10 10 10 10
38917- 10 10 10 6 6 6 6 6 6 6 6 6
38918- 0 0 0 0 0 0 0 0 0 0 0 0
38919- 0 0 0 0 0 0 0 0 0 0 0 0
38920- 0 0 0 0 0 0 0 0 0 0 0 0
38921- 0 0 0 0 0 0 0 0 0 0 0 0
38922- 0 0 0 0 0 0 0 0 0 0 0 0
38923- 0 0 0 0 0 0 0 0 0 0 0 0
38924- 0 0 0 0 0 0 0 0 0 0 0 0
38925- 0 0 0 0 0 0 0 0 0 0 0 0
38926- 0 0 0 0 0 0 0 0 0 0 0 0
38927- 0 0 0 0 0 0 0 0 0 0 0 0
38928- 0 0 0 0 0 0 0 0 0 0 0 0
38929- 0 0 0 0 0 0 0 0 0 0 0 0
38930- 0 0 0 0 0 0 0 0 0 0 0 0
38931- 0 0 0 0 0 0 0 0 0 0 0 0
38932- 0 0 0 0 0 0 0 0 0 0 0 0
38933- 0 0 0 0 0 0 0 0 0 0 0 0
38934- 0 0 0 0 0 0 0 0 0 0 0 0
38935- 0 0 0 6 6 6 10 10 10 14 14 14
38936- 22 22 22 26 26 26 30 30 30 34 34 34
38937- 30 30 30 30 30 30 26 26 26 18 18 18
38938- 14 14 14 10 10 10 6 6 6 0 0 0
38939- 0 0 0 0 0 0 0 0 0 0 0 0
38940- 0 0 0 0 0 0 0 0 0 0 0 0
38941- 0 0 0 0 0 0 0 0 0 0 0 0
38942- 0 0 0 0 0 0 0 0 0 0 0 0
38943- 0 0 0 0 0 0 0 0 0 0 0 0
38944- 0 0 0 0 0 0 0 0 0 0 0 0
38945- 0 0 0 0 0 0 0 0 0 0 0 0
38946- 0 0 0 0 0 0 0 0 0 0 0 0
38947- 0 0 0 0 0 0 0 0 0 0 0 0
38948- 0 0 0 0 0 1 0 0 1 0 0 0
38949- 0 0 0 0 0 0 0 0 0 0 0 0
38950- 0 0 0 0 0 0 0 0 0 0 0 0
38951- 0 0 0 0 0 0 0 0 0 0 0 0
38952- 0 0 0 0 0 0 0 0 0 0 0 0
38953- 0 0 0 0 0 0 0 0 0 0 0 0
38954- 0 0 0 0 0 0 0 0 0 0 0 0
38955- 6 6 6 14 14 14 26 26 26 42 42 42
38956- 54 54 54 66 66 66 78 78 78 78 78 78
38957- 78 78 78 74 74 74 66 66 66 54 54 54
38958- 42 42 42 26 26 26 18 18 18 10 10 10
38959- 6 6 6 0 0 0 0 0 0 0 0 0
38960- 0 0 0 0 0 0 0 0 0 0 0 0
38961- 0 0 0 0 0 0 0 0 0 0 0 0
38962- 0 0 0 0 0 0 0 0 0 0 0 0
38963- 0 0 0 0 0 0 0 0 0 0 0 0
38964- 0 0 0 0 0 0 0 0 0 0 0 0
38965- 0 0 0 0 0 0 0 0 0 0 0 0
38966- 0 0 0 0 0 0 0 0 0 0 0 0
38967- 0 0 0 0 0 0 0 0 0 0 0 0
38968- 0 0 1 0 0 0 0 0 0 0 0 0
38969- 0 0 0 0 0 0 0 0 0 0 0 0
38970- 0 0 0 0 0 0 0 0 0 0 0 0
38971- 0 0 0 0 0 0 0 0 0 0 0 0
38972- 0 0 0 0 0 0 0 0 0 0 0 0
38973- 0 0 0 0 0 0 0 0 0 0 0 0
38974- 0 0 0 0 0 0 0 0 0 10 10 10
38975- 22 22 22 42 42 42 66 66 66 86 86 86
38976- 66 66 66 38 38 38 38 38 38 22 22 22
38977- 26 26 26 34 34 34 54 54 54 66 66 66
38978- 86 86 86 70 70 70 46 46 46 26 26 26
38979- 14 14 14 6 6 6 0 0 0 0 0 0
38980- 0 0 0 0 0 0 0 0 0 0 0 0
38981- 0 0 0 0 0 0 0 0 0 0 0 0
38982- 0 0 0 0 0 0 0 0 0 0 0 0
38983- 0 0 0 0 0 0 0 0 0 0 0 0
38984- 0 0 0 0 0 0 0 0 0 0 0 0
38985- 0 0 0 0 0 0 0 0 0 0 0 0
38986- 0 0 0 0 0 0 0 0 0 0 0 0
38987- 0 0 0 0 0 0 0 0 0 0 0 0
38988- 0 0 1 0 0 1 0 0 1 0 0 0
38989- 0 0 0 0 0 0 0 0 0 0 0 0
38990- 0 0 0 0 0 0 0 0 0 0 0 0
38991- 0 0 0 0 0 0 0 0 0 0 0 0
38992- 0 0 0 0 0 0 0 0 0 0 0 0
38993- 0 0 0 0 0 0 0 0 0 0 0 0
38994- 0 0 0 0 0 0 10 10 10 26 26 26
38995- 50 50 50 82 82 82 58 58 58 6 6 6
38996- 2 2 6 2 2 6 2 2 6 2 2 6
38997- 2 2 6 2 2 6 2 2 6 2 2 6
38998- 6 6 6 54 54 54 86 86 86 66 66 66
38999- 38 38 38 18 18 18 6 6 6 0 0 0
39000- 0 0 0 0 0 0 0 0 0 0 0 0
39001- 0 0 0 0 0 0 0 0 0 0 0 0
39002- 0 0 0 0 0 0 0 0 0 0 0 0
39003- 0 0 0 0 0 0 0 0 0 0 0 0
39004- 0 0 0 0 0 0 0 0 0 0 0 0
39005- 0 0 0 0 0 0 0 0 0 0 0 0
39006- 0 0 0 0 0 0 0 0 0 0 0 0
39007- 0 0 0 0 0 0 0 0 0 0 0 0
39008- 0 0 0 0 0 0 0 0 0 0 0 0
39009- 0 0 0 0 0 0 0 0 0 0 0 0
39010- 0 0 0 0 0 0 0 0 0 0 0 0
39011- 0 0 0 0 0 0 0 0 0 0 0 0
39012- 0 0 0 0 0 0 0 0 0 0 0 0
39013- 0 0 0 0 0 0 0 0 0 0 0 0
39014- 0 0 0 6 6 6 22 22 22 50 50 50
39015- 78 78 78 34 34 34 2 2 6 2 2 6
39016- 2 2 6 2 2 6 2 2 6 2 2 6
39017- 2 2 6 2 2 6 2 2 6 2 2 6
39018- 2 2 6 2 2 6 6 6 6 70 70 70
39019- 78 78 78 46 46 46 22 22 22 6 6 6
39020- 0 0 0 0 0 0 0 0 0 0 0 0
39021- 0 0 0 0 0 0 0 0 0 0 0 0
39022- 0 0 0 0 0 0 0 0 0 0 0 0
39023- 0 0 0 0 0 0 0 0 0 0 0 0
39024- 0 0 0 0 0 0 0 0 0 0 0 0
39025- 0 0 0 0 0 0 0 0 0 0 0 0
39026- 0 0 0 0 0 0 0 0 0 0 0 0
39027- 0 0 0 0 0 0 0 0 0 0 0 0
39028- 0 0 1 0 0 1 0 0 1 0 0 0
39029- 0 0 0 0 0 0 0 0 0 0 0 0
39030- 0 0 0 0 0 0 0 0 0 0 0 0
39031- 0 0 0 0 0 0 0 0 0 0 0 0
39032- 0 0 0 0 0 0 0 0 0 0 0 0
39033- 0 0 0 0 0 0 0 0 0 0 0 0
39034- 6 6 6 18 18 18 42 42 42 82 82 82
39035- 26 26 26 2 2 6 2 2 6 2 2 6
39036- 2 2 6 2 2 6 2 2 6 2 2 6
39037- 2 2 6 2 2 6 2 2 6 14 14 14
39038- 46 46 46 34 34 34 6 6 6 2 2 6
39039- 42 42 42 78 78 78 42 42 42 18 18 18
39040- 6 6 6 0 0 0 0 0 0 0 0 0
39041- 0 0 0 0 0 0 0 0 0 0 0 0
39042- 0 0 0 0 0 0 0 0 0 0 0 0
39043- 0 0 0 0 0 0 0 0 0 0 0 0
39044- 0 0 0 0 0 0 0 0 0 0 0 0
39045- 0 0 0 0 0 0 0 0 0 0 0 0
39046- 0 0 0 0 0 0 0 0 0 0 0 0
39047- 0 0 0 0 0 0 0 0 0 0 0 0
39048- 0 0 1 0 0 0 0 0 1 0 0 0
39049- 0 0 0 0 0 0 0 0 0 0 0 0
39050- 0 0 0 0 0 0 0 0 0 0 0 0
39051- 0 0 0 0 0 0 0 0 0 0 0 0
39052- 0 0 0 0 0 0 0 0 0 0 0 0
39053- 0 0 0 0 0 0 0 0 0 0 0 0
39054- 10 10 10 30 30 30 66 66 66 58 58 58
39055- 2 2 6 2 2 6 2 2 6 2 2 6
39056- 2 2 6 2 2 6 2 2 6 2 2 6
39057- 2 2 6 2 2 6 2 2 6 26 26 26
39058- 86 86 86 101 101 101 46 46 46 10 10 10
39059- 2 2 6 58 58 58 70 70 70 34 34 34
39060- 10 10 10 0 0 0 0 0 0 0 0 0
39061- 0 0 0 0 0 0 0 0 0 0 0 0
39062- 0 0 0 0 0 0 0 0 0 0 0 0
39063- 0 0 0 0 0 0 0 0 0 0 0 0
39064- 0 0 0 0 0 0 0 0 0 0 0 0
39065- 0 0 0 0 0 0 0 0 0 0 0 0
39066- 0 0 0 0 0 0 0 0 0 0 0 0
39067- 0 0 0 0 0 0 0 0 0 0 0 0
39068- 0 0 1 0 0 1 0 0 1 0 0 0
39069- 0 0 0 0 0 0 0 0 0 0 0 0
39070- 0 0 0 0 0 0 0 0 0 0 0 0
39071- 0 0 0 0 0 0 0 0 0 0 0 0
39072- 0 0 0 0 0 0 0 0 0 0 0 0
39073- 0 0 0 0 0 0 0 0 0 0 0 0
39074- 14 14 14 42 42 42 86 86 86 10 10 10
39075- 2 2 6 2 2 6 2 2 6 2 2 6
39076- 2 2 6 2 2 6 2 2 6 2 2 6
39077- 2 2 6 2 2 6 2 2 6 30 30 30
39078- 94 94 94 94 94 94 58 58 58 26 26 26
39079- 2 2 6 6 6 6 78 78 78 54 54 54
39080- 22 22 22 6 6 6 0 0 0 0 0 0
39081- 0 0 0 0 0 0 0 0 0 0 0 0
39082- 0 0 0 0 0 0 0 0 0 0 0 0
39083- 0 0 0 0 0 0 0 0 0 0 0 0
39084- 0 0 0 0 0 0 0 0 0 0 0 0
39085- 0 0 0 0 0 0 0 0 0 0 0 0
39086- 0 0 0 0 0 0 0 0 0 0 0 0
39087- 0 0 0 0 0 0 0 0 0 0 0 0
39088- 0 0 0 0 0 0 0 0 0 0 0 0
39089- 0 0 0 0 0 0 0 0 0 0 0 0
39090- 0 0 0 0 0 0 0 0 0 0 0 0
39091- 0 0 0 0 0 0 0 0 0 0 0 0
39092- 0 0 0 0 0 0 0 0 0 0 0 0
39093- 0 0 0 0 0 0 0 0 0 6 6 6
39094- 22 22 22 62 62 62 62 62 62 2 2 6
39095- 2 2 6 2 2 6 2 2 6 2 2 6
39096- 2 2 6 2 2 6 2 2 6 2 2 6
39097- 2 2 6 2 2 6 2 2 6 26 26 26
39098- 54 54 54 38 38 38 18 18 18 10 10 10
39099- 2 2 6 2 2 6 34 34 34 82 82 82
39100- 38 38 38 14 14 14 0 0 0 0 0 0
39101- 0 0 0 0 0 0 0 0 0 0 0 0
39102- 0 0 0 0 0 0 0 0 0 0 0 0
39103- 0 0 0 0 0 0 0 0 0 0 0 0
39104- 0 0 0 0 0 0 0 0 0 0 0 0
39105- 0 0 0 0 0 0 0 0 0 0 0 0
39106- 0 0 0 0 0 0 0 0 0 0 0 0
39107- 0 0 0 0 0 0 0 0 0 0 0 0
39108- 0 0 0 0 0 1 0 0 1 0 0 0
39109- 0 0 0 0 0 0 0 0 0 0 0 0
39110- 0 0 0 0 0 0 0 0 0 0 0 0
39111- 0 0 0 0 0 0 0 0 0 0 0 0
39112- 0 0 0 0 0 0 0 0 0 0 0 0
39113- 0 0 0 0 0 0 0 0 0 6 6 6
39114- 30 30 30 78 78 78 30 30 30 2 2 6
39115- 2 2 6 2 2 6 2 2 6 2 2 6
39116- 2 2 6 2 2 6 2 2 6 2 2 6
39117- 2 2 6 2 2 6 2 2 6 10 10 10
39118- 10 10 10 2 2 6 2 2 6 2 2 6
39119- 2 2 6 2 2 6 2 2 6 78 78 78
39120- 50 50 50 18 18 18 6 6 6 0 0 0
39121- 0 0 0 0 0 0 0 0 0 0 0 0
39122- 0 0 0 0 0 0 0 0 0 0 0 0
39123- 0 0 0 0 0 0 0 0 0 0 0 0
39124- 0 0 0 0 0 0 0 0 0 0 0 0
39125- 0 0 0 0 0 0 0 0 0 0 0 0
39126- 0 0 0 0 0 0 0 0 0 0 0 0
39127- 0 0 0 0 0 0 0 0 0 0 0 0
39128- 0 0 1 0 0 0 0 0 0 0 0 0
39129- 0 0 0 0 0 0 0 0 0 0 0 0
39130- 0 0 0 0 0 0 0 0 0 0 0 0
39131- 0 0 0 0 0 0 0 0 0 0 0 0
39132- 0 0 0 0 0 0 0 0 0 0 0 0
39133- 0 0 0 0 0 0 0 0 0 10 10 10
39134- 38 38 38 86 86 86 14 14 14 2 2 6
39135- 2 2 6 2 2 6 2 2 6 2 2 6
39136- 2 2 6 2 2 6 2 2 6 2 2 6
39137- 2 2 6 2 2 6 2 2 6 2 2 6
39138- 2 2 6 2 2 6 2 2 6 2 2 6
39139- 2 2 6 2 2 6 2 2 6 54 54 54
39140- 66 66 66 26 26 26 6 6 6 0 0 0
39141- 0 0 0 0 0 0 0 0 0 0 0 0
39142- 0 0 0 0 0 0 0 0 0 0 0 0
39143- 0 0 0 0 0 0 0 0 0 0 0 0
39144- 0 0 0 0 0 0 0 0 0 0 0 0
39145- 0 0 0 0 0 0 0 0 0 0 0 0
39146- 0 0 0 0 0 0 0 0 0 0 0 0
39147- 0 0 0 0 0 0 0 0 0 0 0 0
39148- 0 0 0 0 0 1 0 0 1 0 0 0
39149- 0 0 0 0 0 0 0 0 0 0 0 0
39150- 0 0 0 0 0 0 0 0 0 0 0 0
39151- 0 0 0 0 0 0 0 0 0 0 0 0
39152- 0 0 0 0 0 0 0 0 0 0 0 0
39153- 0 0 0 0 0 0 0 0 0 14 14 14
39154- 42 42 42 82 82 82 2 2 6 2 2 6
39155- 2 2 6 6 6 6 10 10 10 2 2 6
39156- 2 2 6 2 2 6 2 2 6 2 2 6
39157- 2 2 6 2 2 6 2 2 6 6 6 6
39158- 14 14 14 10 10 10 2 2 6 2 2 6
39159- 2 2 6 2 2 6 2 2 6 18 18 18
39160- 82 82 82 34 34 34 10 10 10 0 0 0
39161- 0 0 0 0 0 0 0 0 0 0 0 0
39162- 0 0 0 0 0 0 0 0 0 0 0 0
39163- 0 0 0 0 0 0 0 0 0 0 0 0
39164- 0 0 0 0 0 0 0 0 0 0 0 0
39165- 0 0 0 0 0 0 0 0 0 0 0 0
39166- 0 0 0 0 0 0 0 0 0 0 0 0
39167- 0 0 0 0 0 0 0 0 0 0 0 0
39168- 0 0 1 0 0 0 0 0 0 0 0 0
39169- 0 0 0 0 0 0 0 0 0 0 0 0
39170- 0 0 0 0 0 0 0 0 0 0 0 0
39171- 0 0 0 0 0 0 0 0 0 0 0 0
39172- 0 0 0 0 0 0 0 0 0 0 0 0
39173- 0 0 0 0 0 0 0 0 0 14 14 14
39174- 46 46 46 86 86 86 2 2 6 2 2 6
39175- 6 6 6 6 6 6 22 22 22 34 34 34
39176- 6 6 6 2 2 6 2 2 6 2 2 6
39177- 2 2 6 2 2 6 18 18 18 34 34 34
39178- 10 10 10 50 50 50 22 22 22 2 2 6
39179- 2 2 6 2 2 6 2 2 6 10 10 10
39180- 86 86 86 42 42 42 14 14 14 0 0 0
39181- 0 0 0 0 0 0 0 0 0 0 0 0
39182- 0 0 0 0 0 0 0 0 0 0 0 0
39183- 0 0 0 0 0 0 0 0 0 0 0 0
39184- 0 0 0 0 0 0 0 0 0 0 0 0
39185- 0 0 0 0 0 0 0 0 0 0 0 0
39186- 0 0 0 0 0 0 0 0 0 0 0 0
39187- 0 0 0 0 0 0 0 0 0 0 0 0
39188- 0 0 1 0 0 1 0 0 1 0 0 0
39189- 0 0 0 0 0 0 0 0 0 0 0 0
39190- 0 0 0 0 0 0 0 0 0 0 0 0
39191- 0 0 0 0 0 0 0 0 0 0 0 0
39192- 0 0 0 0 0 0 0 0 0 0 0 0
39193- 0 0 0 0 0 0 0 0 0 14 14 14
39194- 46 46 46 86 86 86 2 2 6 2 2 6
39195- 38 38 38 116 116 116 94 94 94 22 22 22
39196- 22 22 22 2 2 6 2 2 6 2 2 6
39197- 14 14 14 86 86 86 138 138 138 162 162 162
39198-154 154 154 38 38 38 26 26 26 6 6 6
39199- 2 2 6 2 2 6 2 2 6 2 2 6
39200- 86 86 86 46 46 46 14 14 14 0 0 0
39201- 0 0 0 0 0 0 0 0 0 0 0 0
39202- 0 0 0 0 0 0 0 0 0 0 0 0
39203- 0 0 0 0 0 0 0 0 0 0 0 0
39204- 0 0 0 0 0 0 0 0 0 0 0 0
39205- 0 0 0 0 0 0 0 0 0 0 0 0
39206- 0 0 0 0 0 0 0 0 0 0 0 0
39207- 0 0 0 0 0 0 0 0 0 0 0 0
39208- 0 0 0 0 0 0 0 0 0 0 0 0
39209- 0 0 0 0 0 0 0 0 0 0 0 0
39210- 0 0 0 0 0 0 0 0 0 0 0 0
39211- 0 0 0 0 0 0 0 0 0 0 0 0
39212- 0 0 0 0 0 0 0 0 0 0 0 0
39213- 0 0 0 0 0 0 0 0 0 14 14 14
39214- 46 46 46 86 86 86 2 2 6 14 14 14
39215-134 134 134 198 198 198 195 195 195 116 116 116
39216- 10 10 10 2 2 6 2 2 6 6 6 6
39217-101 98 89 187 187 187 210 210 210 218 218 218
39218-214 214 214 134 134 134 14 14 14 6 6 6
39219- 2 2 6 2 2 6 2 2 6 2 2 6
39220- 86 86 86 50 50 50 18 18 18 6 6 6
39221- 0 0 0 0 0 0 0 0 0 0 0 0
39222- 0 0 0 0 0 0 0 0 0 0 0 0
39223- 0 0 0 0 0 0 0 0 0 0 0 0
39224- 0 0 0 0 0 0 0 0 0 0 0 0
39225- 0 0 0 0 0 0 0 0 0 0 0 0
39226- 0 0 0 0 0 0 0 0 0 0 0 0
39227- 0 0 0 0 0 0 0 0 1 0 0 0
39228- 0 0 1 0 0 1 0 0 1 0 0 0
39229- 0 0 0 0 0 0 0 0 0 0 0 0
39230- 0 0 0 0 0 0 0 0 0 0 0 0
39231- 0 0 0 0 0 0 0 0 0 0 0 0
39232- 0 0 0 0 0 0 0 0 0 0 0 0
39233- 0 0 0 0 0 0 0 0 0 14 14 14
39234- 46 46 46 86 86 86 2 2 6 54 54 54
39235-218 218 218 195 195 195 226 226 226 246 246 246
39236- 58 58 58 2 2 6 2 2 6 30 30 30
39237-210 210 210 253 253 253 174 174 174 123 123 123
39238-221 221 221 234 234 234 74 74 74 2 2 6
39239- 2 2 6 2 2 6 2 2 6 2 2 6
39240- 70 70 70 58 58 58 22 22 22 6 6 6
39241- 0 0 0 0 0 0 0 0 0 0 0 0
39242- 0 0 0 0 0 0 0 0 0 0 0 0
39243- 0 0 0 0 0 0 0 0 0 0 0 0
39244- 0 0 0 0 0 0 0 0 0 0 0 0
39245- 0 0 0 0 0 0 0 0 0 0 0 0
39246- 0 0 0 0 0 0 0 0 0 0 0 0
39247- 0 0 0 0 0 0 0 0 0 0 0 0
39248- 0 0 0 0 0 0 0 0 0 0 0 0
39249- 0 0 0 0 0 0 0 0 0 0 0 0
39250- 0 0 0 0 0 0 0 0 0 0 0 0
39251- 0 0 0 0 0 0 0 0 0 0 0 0
39252- 0 0 0 0 0 0 0 0 0 0 0 0
39253- 0 0 0 0 0 0 0 0 0 14 14 14
39254- 46 46 46 82 82 82 2 2 6 106 106 106
39255-170 170 170 26 26 26 86 86 86 226 226 226
39256-123 123 123 10 10 10 14 14 14 46 46 46
39257-231 231 231 190 190 190 6 6 6 70 70 70
39258- 90 90 90 238 238 238 158 158 158 2 2 6
39259- 2 2 6 2 2 6 2 2 6 2 2 6
39260- 70 70 70 58 58 58 22 22 22 6 6 6
39261- 0 0 0 0 0 0 0 0 0 0 0 0
39262- 0 0 0 0 0 0 0 0 0 0 0 0
39263- 0 0 0 0 0 0 0 0 0 0 0 0
39264- 0 0 0 0 0 0 0 0 0 0 0 0
39265- 0 0 0 0 0 0 0 0 0 0 0 0
39266- 0 0 0 0 0 0 0 0 0 0 0 0
39267- 0 0 0 0 0 0 0 0 1 0 0 0
39268- 0 0 1 0 0 1 0 0 1 0 0 0
39269- 0 0 0 0 0 0 0 0 0 0 0 0
39270- 0 0 0 0 0 0 0 0 0 0 0 0
39271- 0 0 0 0 0 0 0 0 0 0 0 0
39272- 0 0 0 0 0 0 0 0 0 0 0 0
39273- 0 0 0 0 0 0 0 0 0 14 14 14
39274- 42 42 42 86 86 86 6 6 6 116 116 116
39275-106 106 106 6 6 6 70 70 70 149 149 149
39276-128 128 128 18 18 18 38 38 38 54 54 54
39277-221 221 221 106 106 106 2 2 6 14 14 14
39278- 46 46 46 190 190 190 198 198 198 2 2 6
39279- 2 2 6 2 2 6 2 2 6 2 2 6
39280- 74 74 74 62 62 62 22 22 22 6 6 6
39281- 0 0 0 0 0 0 0 0 0 0 0 0
39282- 0 0 0 0 0 0 0 0 0 0 0 0
39283- 0 0 0 0 0 0 0 0 0 0 0 0
39284- 0 0 0 0 0 0 0 0 0 0 0 0
39285- 0 0 0 0 0 0 0 0 0 0 0 0
39286- 0 0 0 0 0 0 0 0 0 0 0 0
39287- 0 0 0 0 0 0 0 0 1 0 0 0
39288- 0 0 1 0 0 0 0 0 1 0 0 0
39289- 0 0 0 0 0 0 0 0 0 0 0 0
39290- 0 0 0 0 0 0 0 0 0 0 0 0
39291- 0 0 0 0 0 0 0 0 0 0 0 0
39292- 0 0 0 0 0 0 0 0 0 0 0 0
39293- 0 0 0 0 0 0 0 0 0 14 14 14
39294- 42 42 42 94 94 94 14 14 14 101 101 101
39295-128 128 128 2 2 6 18 18 18 116 116 116
39296-118 98 46 121 92 8 121 92 8 98 78 10
39297-162 162 162 106 106 106 2 2 6 2 2 6
39298- 2 2 6 195 195 195 195 195 195 6 6 6
39299- 2 2 6 2 2 6 2 2 6 2 2 6
39300- 74 74 74 62 62 62 22 22 22 6 6 6
39301- 0 0 0 0 0 0 0 0 0 0 0 0
39302- 0 0 0 0 0 0 0 0 0 0 0 0
39303- 0 0 0 0 0 0 0 0 0 0 0 0
39304- 0 0 0 0 0 0 0 0 0 0 0 0
39305- 0 0 0 0 0 0 0 0 0 0 0 0
39306- 0 0 0 0 0 0 0 0 0 0 0 0
39307- 0 0 0 0 0 0 0 0 1 0 0 1
39308- 0 0 1 0 0 0 0 0 1 0 0 0
39309- 0 0 0 0 0 0 0 0 0 0 0 0
39310- 0 0 0 0 0 0 0 0 0 0 0 0
39311- 0 0 0 0 0 0 0 0 0 0 0 0
39312- 0 0 0 0 0 0 0 0 0 0 0 0
39313- 0 0 0 0 0 0 0 0 0 10 10 10
39314- 38 38 38 90 90 90 14 14 14 58 58 58
39315-210 210 210 26 26 26 54 38 6 154 114 10
39316-226 170 11 236 186 11 225 175 15 184 144 12
39317-215 174 15 175 146 61 37 26 9 2 2 6
39318- 70 70 70 246 246 246 138 138 138 2 2 6
39319- 2 2 6 2 2 6 2 2 6 2 2 6
39320- 70 70 70 66 66 66 26 26 26 6 6 6
39321- 0 0 0 0 0 0 0 0 0 0 0 0
39322- 0 0 0 0 0 0 0 0 0 0 0 0
39323- 0 0 0 0 0 0 0 0 0 0 0 0
39324- 0 0 0 0 0 0 0 0 0 0 0 0
39325- 0 0 0 0 0 0 0 0 0 0 0 0
39326- 0 0 0 0 0 0 0 0 0 0 0 0
39327- 0 0 0 0 0 0 0 0 0 0 0 0
39328- 0 0 0 0 0 0 0 0 0 0 0 0
39329- 0 0 0 0 0 0 0 0 0 0 0 0
39330- 0 0 0 0 0 0 0 0 0 0 0 0
39331- 0 0 0 0 0 0 0 0 0 0 0 0
39332- 0 0 0 0 0 0 0 0 0 0 0 0
39333- 0 0 0 0 0 0 0 0 0 10 10 10
39334- 38 38 38 86 86 86 14 14 14 10 10 10
39335-195 195 195 188 164 115 192 133 9 225 175 15
39336-239 182 13 234 190 10 232 195 16 232 200 30
39337-245 207 45 241 208 19 232 195 16 184 144 12
39338-218 194 134 211 206 186 42 42 42 2 2 6
39339- 2 2 6 2 2 6 2 2 6 2 2 6
39340- 50 50 50 74 74 74 30 30 30 6 6 6
39341- 0 0 0 0 0 0 0 0 0 0 0 0
39342- 0 0 0 0 0 0 0 0 0 0 0 0
39343- 0 0 0 0 0 0 0 0 0 0 0 0
39344- 0 0 0 0 0 0 0 0 0 0 0 0
39345- 0 0 0 0 0 0 0 0 0 0 0 0
39346- 0 0 0 0 0 0 0 0 0 0 0 0
39347- 0 0 0 0 0 0 0 0 0 0 0 0
39348- 0 0 0 0 0 0 0 0 0 0 0 0
39349- 0 0 0 0 0 0 0 0 0 0 0 0
39350- 0 0 0 0 0 0 0 0 0 0 0 0
39351- 0 0 0 0 0 0 0 0 0 0 0 0
39352- 0 0 0 0 0 0 0 0 0 0 0 0
39353- 0 0 0 0 0 0 0 0 0 10 10 10
39354- 34 34 34 86 86 86 14 14 14 2 2 6
39355-121 87 25 192 133 9 219 162 10 239 182 13
39356-236 186 11 232 195 16 241 208 19 244 214 54
39357-246 218 60 246 218 38 246 215 20 241 208 19
39358-241 208 19 226 184 13 121 87 25 2 2 6
39359- 2 2 6 2 2 6 2 2 6 2 2 6
39360- 50 50 50 82 82 82 34 34 34 10 10 10
39361- 0 0 0 0 0 0 0 0 0 0 0 0
39362- 0 0 0 0 0 0 0 0 0 0 0 0
39363- 0 0 0 0 0 0 0 0 0 0 0 0
39364- 0 0 0 0 0 0 0 0 0 0 0 0
39365- 0 0 0 0 0 0 0 0 0 0 0 0
39366- 0 0 0 0 0 0 0 0 0 0 0 0
39367- 0 0 0 0 0 0 0 0 0 0 0 0
39368- 0 0 0 0 0 0 0 0 0 0 0 0
39369- 0 0 0 0 0 0 0 0 0 0 0 0
39370- 0 0 0 0 0 0 0 0 0 0 0 0
39371- 0 0 0 0 0 0 0 0 0 0 0 0
39372- 0 0 0 0 0 0 0 0 0 0 0 0
39373- 0 0 0 0 0 0 0 0 0 10 10 10
39374- 34 34 34 82 82 82 30 30 30 61 42 6
39375-180 123 7 206 145 10 230 174 11 239 182 13
39376-234 190 10 238 202 15 241 208 19 246 218 74
39377-246 218 38 246 215 20 246 215 20 246 215 20
39378-226 184 13 215 174 15 184 144 12 6 6 6
39379- 2 2 6 2 2 6 2 2 6 2 2 6
39380- 26 26 26 94 94 94 42 42 42 14 14 14
39381- 0 0 0 0 0 0 0 0 0 0 0 0
39382- 0 0 0 0 0 0 0 0 0 0 0 0
39383- 0 0 0 0 0 0 0 0 0 0 0 0
39384- 0 0 0 0 0 0 0 0 0 0 0 0
39385- 0 0 0 0 0 0 0 0 0 0 0 0
39386- 0 0 0 0 0 0 0 0 0 0 0 0
39387- 0 0 0 0 0 0 0 0 0 0 0 0
39388- 0 0 0 0 0 0 0 0 0 0 0 0
39389- 0 0 0 0 0 0 0 0 0 0 0 0
39390- 0 0 0 0 0 0 0 0 0 0 0 0
39391- 0 0 0 0 0 0 0 0 0 0 0 0
39392- 0 0 0 0 0 0 0 0 0 0 0 0
39393- 0 0 0 0 0 0 0 0 0 10 10 10
39394- 30 30 30 78 78 78 50 50 50 104 69 6
39395-192 133 9 216 158 10 236 178 12 236 186 11
39396-232 195 16 241 208 19 244 214 54 245 215 43
39397-246 215 20 246 215 20 241 208 19 198 155 10
39398-200 144 11 216 158 10 156 118 10 2 2 6
39399- 2 2 6 2 2 6 2 2 6 2 2 6
39400- 6 6 6 90 90 90 54 54 54 18 18 18
39401- 6 6 6 0 0 0 0 0 0 0 0 0
39402- 0 0 0 0 0 0 0 0 0 0 0 0
39403- 0 0 0 0 0 0 0 0 0 0 0 0
39404- 0 0 0 0 0 0 0 0 0 0 0 0
39405- 0 0 0 0 0 0 0 0 0 0 0 0
39406- 0 0 0 0 0 0 0 0 0 0 0 0
39407- 0 0 0 0 0 0 0 0 0 0 0 0
39408- 0 0 0 0 0 0 0 0 0 0 0 0
39409- 0 0 0 0 0 0 0 0 0 0 0 0
39410- 0 0 0 0 0 0 0 0 0 0 0 0
39411- 0 0 0 0 0 0 0 0 0 0 0 0
39412- 0 0 0 0 0 0 0 0 0 0 0 0
39413- 0 0 0 0 0 0 0 0 0 10 10 10
39414- 30 30 30 78 78 78 46 46 46 22 22 22
39415-137 92 6 210 162 10 239 182 13 238 190 10
39416-238 202 15 241 208 19 246 215 20 246 215 20
39417-241 208 19 203 166 17 185 133 11 210 150 10
39418-216 158 10 210 150 10 102 78 10 2 2 6
39419- 6 6 6 54 54 54 14 14 14 2 2 6
39420- 2 2 6 62 62 62 74 74 74 30 30 30
39421- 10 10 10 0 0 0 0 0 0 0 0 0
39422- 0 0 0 0 0 0 0 0 0 0 0 0
39423- 0 0 0 0 0 0 0 0 0 0 0 0
39424- 0 0 0 0 0 0 0 0 0 0 0 0
39425- 0 0 0 0 0 0 0 0 0 0 0 0
39426- 0 0 0 0 0 0 0 0 0 0 0 0
39427- 0 0 0 0 0 0 0 0 0 0 0 0
39428- 0 0 0 0 0 0 0 0 0 0 0 0
39429- 0 0 0 0 0 0 0 0 0 0 0 0
39430- 0 0 0 0 0 0 0 0 0 0 0 0
39431- 0 0 0 0 0 0 0 0 0 0 0 0
39432- 0 0 0 0 0 0 0 0 0 0 0 0
39433- 0 0 0 0 0 0 0 0 0 10 10 10
39434- 34 34 34 78 78 78 50 50 50 6 6 6
39435- 94 70 30 139 102 15 190 146 13 226 184 13
39436-232 200 30 232 195 16 215 174 15 190 146 13
39437-168 122 10 192 133 9 210 150 10 213 154 11
39438-202 150 34 182 157 106 101 98 89 2 2 6
39439- 2 2 6 78 78 78 116 116 116 58 58 58
39440- 2 2 6 22 22 22 90 90 90 46 46 46
39441- 18 18 18 6 6 6 0 0 0 0 0 0
39442- 0 0 0 0 0 0 0 0 0 0 0 0
39443- 0 0 0 0 0 0 0 0 0 0 0 0
39444- 0 0 0 0 0 0 0 0 0 0 0 0
39445- 0 0 0 0 0 0 0 0 0 0 0 0
39446- 0 0 0 0 0 0 0 0 0 0 0 0
39447- 0 0 0 0 0 0 0 0 0 0 0 0
39448- 0 0 0 0 0 0 0 0 0 0 0 0
39449- 0 0 0 0 0 0 0 0 0 0 0 0
39450- 0 0 0 0 0 0 0 0 0 0 0 0
39451- 0 0 0 0 0 0 0 0 0 0 0 0
39452- 0 0 0 0 0 0 0 0 0 0 0 0
39453- 0 0 0 0 0 0 0 0 0 10 10 10
39454- 38 38 38 86 86 86 50 50 50 6 6 6
39455-128 128 128 174 154 114 156 107 11 168 122 10
39456-198 155 10 184 144 12 197 138 11 200 144 11
39457-206 145 10 206 145 10 197 138 11 188 164 115
39458-195 195 195 198 198 198 174 174 174 14 14 14
39459- 2 2 6 22 22 22 116 116 116 116 116 116
39460- 22 22 22 2 2 6 74 74 74 70 70 70
39461- 30 30 30 10 10 10 0 0 0 0 0 0
39462- 0 0 0 0 0 0 0 0 0 0 0 0
39463- 0 0 0 0 0 0 0 0 0 0 0 0
39464- 0 0 0 0 0 0 0 0 0 0 0 0
39465- 0 0 0 0 0 0 0 0 0 0 0 0
39466- 0 0 0 0 0 0 0 0 0 0 0 0
39467- 0 0 0 0 0 0 0 0 0 0 0 0
39468- 0 0 0 0 0 0 0 0 0 0 0 0
39469- 0 0 0 0 0 0 0 0 0 0 0 0
39470- 0 0 0 0 0 0 0 0 0 0 0 0
39471- 0 0 0 0 0 0 0 0 0 0 0 0
39472- 0 0 0 0 0 0 0 0 0 0 0 0
39473- 0 0 0 0 0 0 6 6 6 18 18 18
39474- 50 50 50 101 101 101 26 26 26 10 10 10
39475-138 138 138 190 190 190 174 154 114 156 107 11
39476-197 138 11 200 144 11 197 138 11 192 133 9
39477-180 123 7 190 142 34 190 178 144 187 187 187
39478-202 202 202 221 221 221 214 214 214 66 66 66
39479- 2 2 6 2 2 6 50 50 50 62 62 62
39480- 6 6 6 2 2 6 10 10 10 90 90 90
39481- 50 50 50 18 18 18 6 6 6 0 0 0
39482- 0 0 0 0 0 0 0 0 0 0 0 0
39483- 0 0 0 0 0 0 0 0 0 0 0 0
39484- 0 0 0 0 0 0 0 0 0 0 0 0
39485- 0 0 0 0 0 0 0 0 0 0 0 0
39486- 0 0 0 0 0 0 0 0 0 0 0 0
39487- 0 0 0 0 0 0 0 0 0 0 0 0
39488- 0 0 0 0 0 0 0 0 0 0 0 0
39489- 0 0 0 0 0 0 0 0 0 0 0 0
39490- 0 0 0 0 0 0 0 0 0 0 0 0
39491- 0 0 0 0 0 0 0 0 0 0 0 0
39492- 0 0 0 0 0 0 0 0 0 0 0 0
39493- 0 0 0 0 0 0 10 10 10 34 34 34
39494- 74 74 74 74 74 74 2 2 6 6 6 6
39495-144 144 144 198 198 198 190 190 190 178 166 146
39496-154 121 60 156 107 11 156 107 11 168 124 44
39497-174 154 114 187 187 187 190 190 190 210 210 210
39498-246 246 246 253 253 253 253 253 253 182 182 182
39499- 6 6 6 2 2 6 2 2 6 2 2 6
39500- 2 2 6 2 2 6 2 2 6 62 62 62
39501- 74 74 74 34 34 34 14 14 14 0 0 0
39502- 0 0 0 0 0 0 0 0 0 0 0 0
39503- 0 0 0 0 0 0 0 0 0 0 0 0
39504- 0 0 0 0 0 0 0 0 0 0 0 0
39505- 0 0 0 0 0 0 0 0 0 0 0 0
39506- 0 0 0 0 0 0 0 0 0 0 0 0
39507- 0 0 0 0 0 0 0 0 0 0 0 0
39508- 0 0 0 0 0 0 0 0 0 0 0 0
39509- 0 0 0 0 0 0 0 0 0 0 0 0
39510- 0 0 0 0 0 0 0 0 0 0 0 0
39511- 0 0 0 0 0 0 0 0 0 0 0 0
39512- 0 0 0 0 0 0 0 0 0 0 0 0
39513- 0 0 0 10 10 10 22 22 22 54 54 54
39514- 94 94 94 18 18 18 2 2 6 46 46 46
39515-234 234 234 221 221 221 190 190 190 190 190 190
39516-190 190 190 187 187 187 187 187 187 190 190 190
39517-190 190 190 195 195 195 214 214 214 242 242 242
39518-253 253 253 253 253 253 253 253 253 253 253 253
39519- 82 82 82 2 2 6 2 2 6 2 2 6
39520- 2 2 6 2 2 6 2 2 6 14 14 14
39521- 86 86 86 54 54 54 22 22 22 6 6 6
39522- 0 0 0 0 0 0 0 0 0 0 0 0
39523- 0 0 0 0 0 0 0 0 0 0 0 0
39524- 0 0 0 0 0 0 0 0 0 0 0 0
39525- 0 0 0 0 0 0 0 0 0 0 0 0
39526- 0 0 0 0 0 0 0 0 0 0 0 0
39527- 0 0 0 0 0 0 0 0 0 0 0 0
39528- 0 0 0 0 0 0 0 0 0 0 0 0
39529- 0 0 0 0 0 0 0 0 0 0 0 0
39530- 0 0 0 0 0 0 0 0 0 0 0 0
39531- 0 0 0 0 0 0 0 0 0 0 0 0
39532- 0 0 0 0 0 0 0 0 0 0 0 0
39533- 6 6 6 18 18 18 46 46 46 90 90 90
39534- 46 46 46 18 18 18 6 6 6 182 182 182
39535-253 253 253 246 246 246 206 206 206 190 190 190
39536-190 190 190 190 190 190 190 190 190 190 190 190
39537-206 206 206 231 231 231 250 250 250 253 253 253
39538-253 253 253 253 253 253 253 253 253 253 253 253
39539-202 202 202 14 14 14 2 2 6 2 2 6
39540- 2 2 6 2 2 6 2 2 6 2 2 6
39541- 42 42 42 86 86 86 42 42 42 18 18 18
39542- 6 6 6 0 0 0 0 0 0 0 0 0
39543- 0 0 0 0 0 0 0 0 0 0 0 0
39544- 0 0 0 0 0 0 0 0 0 0 0 0
39545- 0 0 0 0 0 0 0 0 0 0 0 0
39546- 0 0 0 0 0 0 0 0 0 0 0 0
39547- 0 0 0 0 0 0 0 0 0 0 0 0
39548- 0 0 0 0 0 0 0 0 0 0 0 0
39549- 0 0 0 0 0 0 0 0 0 0 0 0
39550- 0 0 0 0 0 0 0 0 0 0 0 0
39551- 0 0 0 0 0 0 0 0 0 0 0 0
39552- 0 0 0 0 0 0 0 0 0 6 6 6
39553- 14 14 14 38 38 38 74 74 74 66 66 66
39554- 2 2 6 6 6 6 90 90 90 250 250 250
39555-253 253 253 253 253 253 238 238 238 198 198 198
39556-190 190 190 190 190 190 195 195 195 221 221 221
39557-246 246 246 253 253 253 253 253 253 253 253 253
39558-253 253 253 253 253 253 253 253 253 253 253 253
39559-253 253 253 82 82 82 2 2 6 2 2 6
39560- 2 2 6 2 2 6 2 2 6 2 2 6
39561- 2 2 6 78 78 78 70 70 70 34 34 34
39562- 14 14 14 6 6 6 0 0 0 0 0 0
39563- 0 0 0 0 0 0 0 0 0 0 0 0
39564- 0 0 0 0 0 0 0 0 0 0 0 0
39565- 0 0 0 0 0 0 0 0 0 0 0 0
39566- 0 0 0 0 0 0 0 0 0 0 0 0
39567- 0 0 0 0 0 0 0 0 0 0 0 0
39568- 0 0 0 0 0 0 0 0 0 0 0 0
39569- 0 0 0 0 0 0 0 0 0 0 0 0
39570- 0 0 0 0 0 0 0 0 0 0 0 0
39571- 0 0 0 0 0 0 0 0 0 0 0 0
39572- 0 0 0 0 0 0 0 0 0 14 14 14
39573- 34 34 34 66 66 66 78 78 78 6 6 6
39574- 2 2 6 18 18 18 218 218 218 253 253 253
39575-253 253 253 253 253 253 253 253 253 246 246 246
39576-226 226 226 231 231 231 246 246 246 253 253 253
39577-253 253 253 253 253 253 253 253 253 253 253 253
39578-253 253 253 253 253 253 253 253 253 253 253 253
39579-253 253 253 178 178 178 2 2 6 2 2 6
39580- 2 2 6 2 2 6 2 2 6 2 2 6
39581- 2 2 6 18 18 18 90 90 90 62 62 62
39582- 30 30 30 10 10 10 0 0 0 0 0 0
39583- 0 0 0 0 0 0 0 0 0 0 0 0
39584- 0 0 0 0 0 0 0 0 0 0 0 0
39585- 0 0 0 0 0 0 0 0 0 0 0 0
39586- 0 0 0 0 0 0 0 0 0 0 0 0
39587- 0 0 0 0 0 0 0 0 0 0 0 0
39588- 0 0 0 0 0 0 0 0 0 0 0 0
39589- 0 0 0 0 0 0 0 0 0 0 0 0
39590- 0 0 0 0 0 0 0 0 0 0 0 0
39591- 0 0 0 0 0 0 0 0 0 0 0 0
39592- 0 0 0 0 0 0 10 10 10 26 26 26
39593- 58 58 58 90 90 90 18 18 18 2 2 6
39594- 2 2 6 110 110 110 253 253 253 253 253 253
39595-253 253 253 253 253 253 253 253 253 253 253 253
39596-250 250 250 253 253 253 253 253 253 253 253 253
39597-253 253 253 253 253 253 253 253 253 253 253 253
39598-253 253 253 253 253 253 253 253 253 253 253 253
39599-253 253 253 231 231 231 18 18 18 2 2 6
39600- 2 2 6 2 2 6 2 2 6 2 2 6
39601- 2 2 6 2 2 6 18 18 18 94 94 94
39602- 54 54 54 26 26 26 10 10 10 0 0 0
39603- 0 0 0 0 0 0 0 0 0 0 0 0
39604- 0 0 0 0 0 0 0 0 0 0 0 0
39605- 0 0 0 0 0 0 0 0 0 0 0 0
39606- 0 0 0 0 0 0 0 0 0 0 0 0
39607- 0 0 0 0 0 0 0 0 0 0 0 0
39608- 0 0 0 0 0 0 0 0 0 0 0 0
39609- 0 0 0 0 0 0 0 0 0 0 0 0
39610- 0 0 0 0 0 0 0 0 0 0 0 0
39611- 0 0 0 0 0 0 0 0 0 0 0 0
39612- 0 0 0 6 6 6 22 22 22 50 50 50
39613- 90 90 90 26 26 26 2 2 6 2 2 6
39614- 14 14 14 195 195 195 250 250 250 253 253 253
39615-253 253 253 253 253 253 253 253 253 253 253 253
39616-253 253 253 253 253 253 253 253 253 253 253 253
39617-253 253 253 253 253 253 253 253 253 253 253 253
39618-253 253 253 253 253 253 253 253 253 253 253 253
39619-250 250 250 242 242 242 54 54 54 2 2 6
39620- 2 2 6 2 2 6 2 2 6 2 2 6
39621- 2 2 6 2 2 6 2 2 6 38 38 38
39622- 86 86 86 50 50 50 22 22 22 6 6 6
39623- 0 0 0 0 0 0 0 0 0 0 0 0
39624- 0 0 0 0 0 0 0 0 0 0 0 0
39625- 0 0 0 0 0 0 0 0 0 0 0 0
39626- 0 0 0 0 0 0 0 0 0 0 0 0
39627- 0 0 0 0 0 0 0 0 0 0 0 0
39628- 0 0 0 0 0 0 0 0 0 0 0 0
39629- 0 0 0 0 0 0 0 0 0 0 0 0
39630- 0 0 0 0 0 0 0 0 0 0 0 0
39631- 0 0 0 0 0 0 0 0 0 0 0 0
39632- 6 6 6 14 14 14 38 38 38 82 82 82
39633- 34 34 34 2 2 6 2 2 6 2 2 6
39634- 42 42 42 195 195 195 246 246 246 253 253 253
39635-253 253 253 253 253 253 253 253 253 250 250 250
39636-242 242 242 242 242 242 250 250 250 253 253 253
39637-253 253 253 253 253 253 253 253 253 253 253 253
39638-253 253 253 250 250 250 246 246 246 238 238 238
39639-226 226 226 231 231 231 101 101 101 6 6 6
39640- 2 2 6 2 2 6 2 2 6 2 2 6
39641- 2 2 6 2 2 6 2 2 6 2 2 6
39642- 38 38 38 82 82 82 42 42 42 14 14 14
39643- 6 6 6 0 0 0 0 0 0 0 0 0
39644- 0 0 0 0 0 0 0 0 0 0 0 0
39645- 0 0 0 0 0 0 0 0 0 0 0 0
39646- 0 0 0 0 0 0 0 0 0 0 0 0
39647- 0 0 0 0 0 0 0 0 0 0 0 0
39648- 0 0 0 0 0 0 0 0 0 0 0 0
39649- 0 0 0 0 0 0 0 0 0 0 0 0
39650- 0 0 0 0 0 0 0 0 0 0 0 0
39651- 0 0 0 0 0 0 0 0 0 0 0 0
39652- 10 10 10 26 26 26 62 62 62 66 66 66
39653- 2 2 6 2 2 6 2 2 6 6 6 6
39654- 70 70 70 170 170 170 206 206 206 234 234 234
39655-246 246 246 250 250 250 250 250 250 238 238 238
39656-226 226 226 231 231 231 238 238 238 250 250 250
39657-250 250 250 250 250 250 246 246 246 231 231 231
39658-214 214 214 206 206 206 202 202 202 202 202 202
39659-198 198 198 202 202 202 182 182 182 18 18 18
39660- 2 2 6 2 2 6 2 2 6 2 2 6
39661- 2 2 6 2 2 6 2 2 6 2 2 6
39662- 2 2 6 62 62 62 66 66 66 30 30 30
39663- 10 10 10 0 0 0 0 0 0 0 0 0
39664- 0 0 0 0 0 0 0 0 0 0 0 0
39665- 0 0 0 0 0 0 0 0 0 0 0 0
39666- 0 0 0 0 0 0 0 0 0 0 0 0
39667- 0 0 0 0 0 0 0 0 0 0 0 0
39668- 0 0 0 0 0 0 0 0 0 0 0 0
39669- 0 0 0 0 0 0 0 0 0 0 0 0
39670- 0 0 0 0 0 0 0 0 0 0 0 0
39671- 0 0 0 0 0 0 0 0 0 0 0 0
39672- 14 14 14 42 42 42 82 82 82 18 18 18
39673- 2 2 6 2 2 6 2 2 6 10 10 10
39674- 94 94 94 182 182 182 218 218 218 242 242 242
39675-250 250 250 253 253 253 253 253 253 250 250 250
39676-234 234 234 253 253 253 253 253 253 253 253 253
39677-253 253 253 253 253 253 253 253 253 246 246 246
39678-238 238 238 226 226 226 210 210 210 202 202 202
39679-195 195 195 195 195 195 210 210 210 158 158 158
39680- 6 6 6 14 14 14 50 50 50 14 14 14
39681- 2 2 6 2 2 6 2 2 6 2 2 6
39682- 2 2 6 6 6 6 86 86 86 46 46 46
39683- 18 18 18 6 6 6 0 0 0 0 0 0
39684- 0 0 0 0 0 0 0 0 0 0 0 0
39685- 0 0 0 0 0 0 0 0 0 0 0 0
39686- 0 0 0 0 0 0 0 0 0 0 0 0
39687- 0 0 0 0 0 0 0 0 0 0 0 0
39688- 0 0 0 0 0 0 0 0 0 0 0 0
39689- 0 0 0 0 0 0 0 0 0 0 0 0
39690- 0 0 0 0 0 0 0 0 0 0 0 0
39691- 0 0 0 0 0 0 0 0 0 6 6 6
39692- 22 22 22 54 54 54 70 70 70 2 2 6
39693- 2 2 6 10 10 10 2 2 6 22 22 22
39694-166 166 166 231 231 231 250 250 250 253 253 253
39695-253 253 253 253 253 253 253 253 253 250 250 250
39696-242 242 242 253 253 253 253 253 253 253 253 253
39697-253 253 253 253 253 253 253 253 253 253 253 253
39698-253 253 253 253 253 253 253 253 253 246 246 246
39699-231 231 231 206 206 206 198 198 198 226 226 226
39700- 94 94 94 2 2 6 6 6 6 38 38 38
39701- 30 30 30 2 2 6 2 2 6 2 2 6
39702- 2 2 6 2 2 6 62 62 62 66 66 66
39703- 26 26 26 10 10 10 0 0 0 0 0 0
39704- 0 0 0 0 0 0 0 0 0 0 0 0
39705- 0 0 0 0 0 0 0 0 0 0 0 0
39706- 0 0 0 0 0 0 0 0 0 0 0 0
39707- 0 0 0 0 0 0 0 0 0 0 0 0
39708- 0 0 0 0 0 0 0 0 0 0 0 0
39709- 0 0 0 0 0 0 0 0 0 0 0 0
39710- 0 0 0 0 0 0 0 0 0 0 0 0
39711- 0 0 0 0 0 0 0 0 0 10 10 10
39712- 30 30 30 74 74 74 50 50 50 2 2 6
39713- 26 26 26 26 26 26 2 2 6 106 106 106
39714-238 238 238 253 253 253 253 253 253 253 253 253
39715-253 253 253 253 253 253 253 253 253 253 253 253
39716-253 253 253 253 253 253 253 253 253 253 253 253
39717-253 253 253 253 253 253 253 253 253 253 253 253
39718-253 253 253 253 253 253 253 253 253 253 253 253
39719-253 253 253 246 246 246 218 218 218 202 202 202
39720-210 210 210 14 14 14 2 2 6 2 2 6
39721- 30 30 30 22 22 22 2 2 6 2 2 6
39722- 2 2 6 2 2 6 18 18 18 86 86 86
39723- 42 42 42 14 14 14 0 0 0 0 0 0
39724- 0 0 0 0 0 0 0 0 0 0 0 0
39725- 0 0 0 0 0 0 0 0 0 0 0 0
39726- 0 0 0 0 0 0 0 0 0 0 0 0
39727- 0 0 0 0 0 0 0 0 0 0 0 0
39728- 0 0 0 0 0 0 0 0 0 0 0 0
39729- 0 0 0 0 0 0 0 0 0 0 0 0
39730- 0 0 0 0 0 0 0 0 0 0 0 0
39731- 0 0 0 0 0 0 0 0 0 14 14 14
39732- 42 42 42 90 90 90 22 22 22 2 2 6
39733- 42 42 42 2 2 6 18 18 18 218 218 218
39734-253 253 253 253 253 253 253 253 253 253 253 253
39735-253 253 253 253 253 253 253 253 253 253 253 253
39736-253 253 253 253 253 253 253 253 253 253 253 253
39737-253 253 253 253 253 253 253 253 253 253 253 253
39738-253 253 253 253 253 253 253 253 253 253 253 253
39739-253 253 253 253 253 253 250 250 250 221 221 221
39740-218 218 218 101 101 101 2 2 6 14 14 14
39741- 18 18 18 38 38 38 10 10 10 2 2 6
39742- 2 2 6 2 2 6 2 2 6 78 78 78
39743- 58 58 58 22 22 22 6 6 6 0 0 0
39744- 0 0 0 0 0 0 0 0 0 0 0 0
39745- 0 0 0 0 0 0 0 0 0 0 0 0
39746- 0 0 0 0 0 0 0 0 0 0 0 0
39747- 0 0 0 0 0 0 0 0 0 0 0 0
39748- 0 0 0 0 0 0 0 0 0 0 0 0
39749- 0 0 0 0 0 0 0 0 0 0 0 0
39750- 0 0 0 0 0 0 0 0 0 0 0 0
39751- 0 0 0 0 0 0 6 6 6 18 18 18
39752- 54 54 54 82 82 82 2 2 6 26 26 26
39753- 22 22 22 2 2 6 123 123 123 253 253 253
39754-253 253 253 253 253 253 253 253 253 253 253 253
39755-253 253 253 253 253 253 253 253 253 253 253 253
39756-253 253 253 253 253 253 253 253 253 253 253 253
39757-253 253 253 253 253 253 253 253 253 253 253 253
39758-253 253 253 253 253 253 253 253 253 253 253 253
39759-253 253 253 253 253 253 253 253 253 250 250 250
39760-238 238 238 198 198 198 6 6 6 38 38 38
39761- 58 58 58 26 26 26 38 38 38 2 2 6
39762- 2 2 6 2 2 6 2 2 6 46 46 46
39763- 78 78 78 30 30 30 10 10 10 0 0 0
39764- 0 0 0 0 0 0 0 0 0 0 0 0
39765- 0 0 0 0 0 0 0 0 0 0 0 0
39766- 0 0 0 0 0 0 0 0 0 0 0 0
39767- 0 0 0 0 0 0 0 0 0 0 0 0
39768- 0 0 0 0 0 0 0 0 0 0 0 0
39769- 0 0 0 0 0 0 0 0 0 0 0 0
39770- 0 0 0 0 0 0 0 0 0 0 0 0
39771- 0 0 0 0 0 0 10 10 10 30 30 30
39772- 74 74 74 58 58 58 2 2 6 42 42 42
39773- 2 2 6 22 22 22 231 231 231 253 253 253
39774-253 253 253 253 253 253 253 253 253 253 253 253
39775-253 253 253 253 253 253 253 253 253 250 250 250
39776-253 253 253 253 253 253 253 253 253 253 253 253
39777-253 253 253 253 253 253 253 253 253 253 253 253
39778-253 253 253 253 253 253 253 253 253 253 253 253
39779-253 253 253 253 253 253 253 253 253 253 253 253
39780-253 253 253 246 246 246 46 46 46 38 38 38
39781- 42 42 42 14 14 14 38 38 38 14 14 14
39782- 2 2 6 2 2 6 2 2 6 6 6 6
39783- 86 86 86 46 46 46 14 14 14 0 0 0
39784- 0 0 0 0 0 0 0 0 0 0 0 0
39785- 0 0 0 0 0 0 0 0 0 0 0 0
39786- 0 0 0 0 0 0 0 0 0 0 0 0
39787- 0 0 0 0 0 0 0 0 0 0 0 0
39788- 0 0 0 0 0 0 0 0 0 0 0 0
39789- 0 0 0 0 0 0 0 0 0 0 0 0
39790- 0 0 0 0 0 0 0 0 0 0 0 0
39791- 0 0 0 6 6 6 14 14 14 42 42 42
39792- 90 90 90 18 18 18 18 18 18 26 26 26
39793- 2 2 6 116 116 116 253 253 253 253 253 253
39794-253 253 253 253 253 253 253 253 253 253 253 253
39795-253 253 253 253 253 253 250 250 250 238 238 238
39796-253 253 253 253 253 253 253 253 253 253 253 253
39797-253 253 253 253 253 253 253 253 253 253 253 253
39798-253 253 253 253 253 253 253 253 253 253 253 253
39799-253 253 253 253 253 253 253 253 253 253 253 253
39800-253 253 253 253 253 253 94 94 94 6 6 6
39801- 2 2 6 2 2 6 10 10 10 34 34 34
39802- 2 2 6 2 2 6 2 2 6 2 2 6
39803- 74 74 74 58 58 58 22 22 22 6 6 6
39804- 0 0 0 0 0 0 0 0 0 0 0 0
39805- 0 0 0 0 0 0 0 0 0 0 0 0
39806- 0 0 0 0 0 0 0 0 0 0 0 0
39807- 0 0 0 0 0 0 0 0 0 0 0 0
39808- 0 0 0 0 0 0 0 0 0 0 0 0
39809- 0 0 0 0 0 0 0 0 0 0 0 0
39810- 0 0 0 0 0 0 0 0 0 0 0 0
39811- 0 0 0 10 10 10 26 26 26 66 66 66
39812- 82 82 82 2 2 6 38 38 38 6 6 6
39813- 14 14 14 210 210 210 253 253 253 253 253 253
39814-253 253 253 253 253 253 253 253 253 253 253 253
39815-253 253 253 253 253 253 246 246 246 242 242 242
39816-253 253 253 253 253 253 253 253 253 253 253 253
39817-253 253 253 253 253 253 253 253 253 253 253 253
39818-253 253 253 253 253 253 253 253 253 253 253 253
39819-253 253 253 253 253 253 253 253 253 253 253 253
39820-253 253 253 253 253 253 144 144 144 2 2 6
39821- 2 2 6 2 2 6 2 2 6 46 46 46
39822- 2 2 6 2 2 6 2 2 6 2 2 6
39823- 42 42 42 74 74 74 30 30 30 10 10 10
39824- 0 0 0 0 0 0 0 0 0 0 0 0
39825- 0 0 0 0 0 0 0 0 0 0 0 0
39826- 0 0 0 0 0 0 0 0 0 0 0 0
39827- 0 0 0 0 0 0 0 0 0 0 0 0
39828- 0 0 0 0 0 0 0 0 0 0 0 0
39829- 0 0 0 0 0 0 0 0 0 0 0 0
39830- 0 0 0 0 0 0 0 0 0 0 0 0
39831- 6 6 6 14 14 14 42 42 42 90 90 90
39832- 26 26 26 6 6 6 42 42 42 2 2 6
39833- 74 74 74 250 250 250 253 253 253 253 253 253
39834-253 253 253 253 253 253 253 253 253 253 253 253
39835-253 253 253 253 253 253 242 242 242 242 242 242
39836-253 253 253 253 253 253 253 253 253 253 253 253
39837-253 253 253 253 253 253 253 253 253 253 253 253
39838-253 253 253 253 253 253 253 253 253 253 253 253
39839-253 253 253 253 253 253 253 253 253 253 253 253
39840-253 253 253 253 253 253 182 182 182 2 2 6
39841- 2 2 6 2 2 6 2 2 6 46 46 46
39842- 2 2 6 2 2 6 2 2 6 2 2 6
39843- 10 10 10 86 86 86 38 38 38 10 10 10
39844- 0 0 0 0 0 0 0 0 0 0 0 0
39845- 0 0 0 0 0 0 0 0 0 0 0 0
39846- 0 0 0 0 0 0 0 0 0 0 0 0
39847- 0 0 0 0 0 0 0 0 0 0 0 0
39848- 0 0 0 0 0 0 0 0 0 0 0 0
39849- 0 0 0 0 0 0 0 0 0 0 0 0
39850- 0 0 0 0 0 0 0 0 0 0 0 0
39851- 10 10 10 26 26 26 66 66 66 82 82 82
39852- 2 2 6 22 22 22 18 18 18 2 2 6
39853-149 149 149 253 253 253 253 253 253 253 253 253
39854-253 253 253 253 253 253 253 253 253 253 253 253
39855-253 253 253 253 253 253 234 234 234 242 242 242
39856-253 253 253 253 253 253 253 253 253 253 253 253
39857-253 253 253 253 253 253 253 253 253 253 253 253
39858-253 253 253 253 253 253 253 253 253 253 253 253
39859-253 253 253 253 253 253 253 253 253 253 253 253
39860-253 253 253 253 253 253 206 206 206 2 2 6
39861- 2 2 6 2 2 6 2 2 6 38 38 38
39862- 2 2 6 2 2 6 2 2 6 2 2 6
39863- 6 6 6 86 86 86 46 46 46 14 14 14
39864- 0 0 0 0 0 0 0 0 0 0 0 0
39865- 0 0 0 0 0 0 0 0 0 0 0 0
39866- 0 0 0 0 0 0 0 0 0 0 0 0
39867- 0 0 0 0 0 0 0 0 0 0 0 0
39868- 0 0 0 0 0 0 0 0 0 0 0 0
39869- 0 0 0 0 0 0 0 0 0 0 0 0
39870- 0 0 0 0 0 0 0 0 0 6 6 6
39871- 18 18 18 46 46 46 86 86 86 18 18 18
39872- 2 2 6 34 34 34 10 10 10 6 6 6
39873-210 210 210 253 253 253 253 253 253 253 253 253
39874-253 253 253 253 253 253 253 253 253 253 253 253
39875-253 253 253 253 253 253 234 234 234 242 242 242
39876-253 253 253 253 253 253 253 253 253 253 253 253
39877-253 253 253 253 253 253 253 253 253 253 253 253
39878-253 253 253 253 253 253 253 253 253 253 253 253
39879-253 253 253 253 253 253 253 253 253 253 253 253
39880-253 253 253 253 253 253 221 221 221 6 6 6
39881- 2 2 6 2 2 6 6 6 6 30 30 30
39882- 2 2 6 2 2 6 2 2 6 2 2 6
39883- 2 2 6 82 82 82 54 54 54 18 18 18
39884- 6 6 6 0 0 0 0 0 0 0 0 0
39885- 0 0 0 0 0 0 0 0 0 0 0 0
39886- 0 0 0 0 0 0 0 0 0 0 0 0
39887- 0 0 0 0 0 0 0 0 0 0 0 0
39888- 0 0 0 0 0 0 0 0 0 0 0 0
39889- 0 0 0 0 0 0 0 0 0 0 0 0
39890- 0 0 0 0 0 0 0 0 0 10 10 10
39891- 26 26 26 66 66 66 62 62 62 2 2 6
39892- 2 2 6 38 38 38 10 10 10 26 26 26
39893-238 238 238 253 253 253 253 253 253 253 253 253
39894-253 253 253 253 253 253 253 253 253 253 253 253
39895-253 253 253 253 253 253 231 231 231 238 238 238
39896-253 253 253 253 253 253 253 253 253 253 253 253
39897-253 253 253 253 253 253 253 253 253 253 253 253
39898-253 253 253 253 253 253 253 253 253 253 253 253
39899-253 253 253 253 253 253 253 253 253 253 253 253
39900-253 253 253 253 253 253 231 231 231 6 6 6
39901- 2 2 6 2 2 6 10 10 10 30 30 30
39902- 2 2 6 2 2 6 2 2 6 2 2 6
39903- 2 2 6 66 66 66 58 58 58 22 22 22
39904- 6 6 6 0 0 0 0 0 0 0 0 0
39905- 0 0 0 0 0 0 0 0 0 0 0 0
39906- 0 0 0 0 0 0 0 0 0 0 0 0
39907- 0 0 0 0 0 0 0 0 0 0 0 0
39908- 0 0 0 0 0 0 0 0 0 0 0 0
39909- 0 0 0 0 0 0 0 0 0 0 0 0
39910- 0 0 0 0 0 0 0 0 0 10 10 10
39911- 38 38 38 78 78 78 6 6 6 2 2 6
39912- 2 2 6 46 46 46 14 14 14 42 42 42
39913-246 246 246 253 253 253 253 253 253 253 253 253
39914-253 253 253 253 253 253 253 253 253 253 253 253
39915-253 253 253 253 253 253 231 231 231 242 242 242
39916-253 253 253 253 253 253 253 253 253 253 253 253
39917-253 253 253 253 253 253 253 253 253 253 253 253
39918-253 253 253 253 253 253 253 253 253 253 253 253
39919-253 253 253 253 253 253 253 253 253 253 253 253
39920-253 253 253 253 253 253 234 234 234 10 10 10
39921- 2 2 6 2 2 6 22 22 22 14 14 14
39922- 2 2 6 2 2 6 2 2 6 2 2 6
39923- 2 2 6 66 66 66 62 62 62 22 22 22
39924- 6 6 6 0 0 0 0 0 0 0 0 0
39925- 0 0 0 0 0 0 0 0 0 0 0 0
39926- 0 0 0 0 0 0 0 0 0 0 0 0
39927- 0 0 0 0 0 0 0 0 0 0 0 0
39928- 0 0 0 0 0 0 0 0 0 0 0 0
39929- 0 0 0 0 0 0 0 0 0 0 0 0
39930- 0 0 0 0 0 0 6 6 6 18 18 18
39931- 50 50 50 74 74 74 2 2 6 2 2 6
39932- 14 14 14 70 70 70 34 34 34 62 62 62
39933-250 250 250 253 253 253 253 253 253 253 253 253
39934-253 253 253 253 253 253 253 253 253 253 253 253
39935-253 253 253 253 253 253 231 231 231 246 246 246
39936-253 253 253 253 253 253 253 253 253 253 253 253
39937-253 253 253 253 253 253 253 253 253 253 253 253
39938-253 253 253 253 253 253 253 253 253 253 253 253
39939-253 253 253 253 253 253 253 253 253 253 253 253
39940-253 253 253 253 253 253 234 234 234 14 14 14
39941- 2 2 6 2 2 6 30 30 30 2 2 6
39942- 2 2 6 2 2 6 2 2 6 2 2 6
39943- 2 2 6 66 66 66 62 62 62 22 22 22
39944- 6 6 6 0 0 0 0 0 0 0 0 0
39945- 0 0 0 0 0 0 0 0 0 0 0 0
39946- 0 0 0 0 0 0 0 0 0 0 0 0
39947- 0 0 0 0 0 0 0 0 0 0 0 0
39948- 0 0 0 0 0 0 0 0 0 0 0 0
39949- 0 0 0 0 0 0 0 0 0 0 0 0
39950- 0 0 0 0 0 0 6 6 6 18 18 18
39951- 54 54 54 62 62 62 2 2 6 2 2 6
39952- 2 2 6 30 30 30 46 46 46 70 70 70
39953-250 250 250 253 253 253 253 253 253 253 253 253
39954-253 253 253 253 253 253 253 253 253 253 253 253
39955-253 253 253 253 253 253 231 231 231 246 246 246
39956-253 253 253 253 253 253 253 253 253 253 253 253
39957-253 253 253 253 253 253 253 253 253 253 253 253
39958-253 253 253 253 253 253 253 253 253 253 253 253
39959-253 253 253 253 253 253 253 253 253 253 253 253
39960-253 253 253 253 253 253 226 226 226 10 10 10
39961- 2 2 6 6 6 6 30 30 30 2 2 6
39962- 2 2 6 2 2 6 2 2 6 2 2 6
39963- 2 2 6 66 66 66 58 58 58 22 22 22
39964- 6 6 6 0 0 0 0 0 0 0 0 0
39965- 0 0 0 0 0 0 0 0 0 0 0 0
39966- 0 0 0 0 0 0 0 0 0 0 0 0
39967- 0 0 0 0 0 0 0 0 0 0 0 0
39968- 0 0 0 0 0 0 0 0 0 0 0 0
39969- 0 0 0 0 0 0 0 0 0 0 0 0
39970- 0 0 0 0 0 0 6 6 6 22 22 22
39971- 58 58 58 62 62 62 2 2 6 2 2 6
39972- 2 2 6 2 2 6 30 30 30 78 78 78
39973-250 250 250 253 253 253 253 253 253 253 253 253
39974-253 253 253 253 253 253 253 253 253 253 253 253
39975-253 253 253 253 253 253 231 231 231 246 246 246
39976-253 253 253 253 253 253 253 253 253 253 253 253
39977-253 253 253 253 253 253 253 253 253 253 253 253
39978-253 253 253 253 253 253 253 253 253 253 253 253
39979-253 253 253 253 253 253 253 253 253 253 253 253
39980-253 253 253 253 253 253 206 206 206 2 2 6
39981- 22 22 22 34 34 34 18 14 6 22 22 22
39982- 26 26 26 18 18 18 6 6 6 2 2 6
39983- 2 2 6 82 82 82 54 54 54 18 18 18
39984- 6 6 6 0 0 0 0 0 0 0 0 0
39985- 0 0 0 0 0 0 0 0 0 0 0 0
39986- 0 0 0 0 0 0 0 0 0 0 0 0
39987- 0 0 0 0 0 0 0 0 0 0 0 0
39988- 0 0 0 0 0 0 0 0 0 0 0 0
39989- 0 0 0 0 0 0 0 0 0 0 0 0
39990- 0 0 0 0 0 0 6 6 6 26 26 26
39991- 62 62 62 106 106 106 74 54 14 185 133 11
39992-210 162 10 121 92 8 6 6 6 62 62 62
39993-238 238 238 253 253 253 253 253 253 253 253 253
39994-253 253 253 253 253 253 253 253 253 253 253 253
39995-253 253 253 253 253 253 231 231 231 246 246 246
39996-253 253 253 253 253 253 253 253 253 253 253 253
39997-253 253 253 253 253 253 253 253 253 253 253 253
39998-253 253 253 253 253 253 253 253 253 253 253 253
39999-253 253 253 253 253 253 253 253 253 253 253 253
40000-253 253 253 253 253 253 158 158 158 18 18 18
40001- 14 14 14 2 2 6 2 2 6 2 2 6
40002- 6 6 6 18 18 18 66 66 66 38 38 38
40003- 6 6 6 94 94 94 50 50 50 18 18 18
40004- 6 6 6 0 0 0 0 0 0 0 0 0
40005- 0 0 0 0 0 0 0 0 0 0 0 0
40006- 0 0 0 0 0 0 0 0 0 0 0 0
40007- 0 0 0 0 0 0 0 0 0 0 0 0
40008- 0 0 0 0 0 0 0 0 0 0 0 0
40009- 0 0 0 0 0 0 0 0 0 6 6 6
40010- 10 10 10 10 10 10 18 18 18 38 38 38
40011- 78 78 78 142 134 106 216 158 10 242 186 14
40012-246 190 14 246 190 14 156 118 10 10 10 10
40013- 90 90 90 238 238 238 253 253 253 253 253 253
40014-253 253 253 253 253 253 253 253 253 253 253 253
40015-253 253 253 253 253 253 231 231 231 250 250 250
40016-253 253 253 253 253 253 253 253 253 253 253 253
40017-253 253 253 253 253 253 253 253 253 253 253 253
40018-253 253 253 253 253 253 253 253 253 253 253 253
40019-253 253 253 253 253 253 253 253 253 246 230 190
40020-238 204 91 238 204 91 181 142 44 37 26 9
40021- 2 2 6 2 2 6 2 2 6 2 2 6
40022- 2 2 6 2 2 6 38 38 38 46 46 46
40023- 26 26 26 106 106 106 54 54 54 18 18 18
40024- 6 6 6 0 0 0 0 0 0 0 0 0
40025- 0 0 0 0 0 0 0 0 0 0 0 0
40026- 0 0 0 0 0 0 0 0 0 0 0 0
40027- 0 0 0 0 0 0 0 0 0 0 0 0
40028- 0 0 0 0 0 0 0 0 0 0 0 0
40029- 0 0 0 6 6 6 14 14 14 22 22 22
40030- 30 30 30 38 38 38 50 50 50 70 70 70
40031-106 106 106 190 142 34 226 170 11 242 186 14
40032-246 190 14 246 190 14 246 190 14 154 114 10
40033- 6 6 6 74 74 74 226 226 226 253 253 253
40034-253 253 253 253 253 253 253 253 253 253 253 253
40035-253 253 253 253 253 253 231 231 231 250 250 250
40036-253 253 253 253 253 253 253 253 253 253 253 253
40037-253 253 253 253 253 253 253 253 253 253 253 253
40038-253 253 253 253 253 253 253 253 253 253 253 253
40039-253 253 253 253 253 253 253 253 253 228 184 62
40040-241 196 14 241 208 19 232 195 16 38 30 10
40041- 2 2 6 2 2 6 2 2 6 2 2 6
40042- 2 2 6 6 6 6 30 30 30 26 26 26
40043-203 166 17 154 142 90 66 66 66 26 26 26
40044- 6 6 6 0 0 0 0 0 0 0 0 0
40045- 0 0 0 0 0 0 0 0 0 0 0 0
40046- 0 0 0 0 0 0 0 0 0 0 0 0
40047- 0 0 0 0 0 0 0 0 0 0 0 0
40048- 0 0 0 0 0 0 0 0 0 0 0 0
40049- 6 6 6 18 18 18 38 38 38 58 58 58
40050- 78 78 78 86 86 86 101 101 101 123 123 123
40051-175 146 61 210 150 10 234 174 13 246 186 14
40052-246 190 14 246 190 14 246 190 14 238 190 10
40053-102 78 10 2 2 6 46 46 46 198 198 198
40054-253 253 253 253 253 253 253 253 253 253 253 253
40055-253 253 253 253 253 253 234 234 234 242 242 242
40056-253 253 253 253 253 253 253 253 253 253 253 253
40057-253 253 253 253 253 253 253 253 253 253 253 253
40058-253 253 253 253 253 253 253 253 253 253 253 253
40059-253 253 253 253 253 253 253 253 253 224 178 62
40060-242 186 14 241 196 14 210 166 10 22 18 6
40061- 2 2 6 2 2 6 2 2 6 2 2 6
40062- 2 2 6 2 2 6 6 6 6 121 92 8
40063-238 202 15 232 195 16 82 82 82 34 34 34
40064- 10 10 10 0 0 0 0 0 0 0 0 0
40065- 0 0 0 0 0 0 0 0 0 0 0 0
40066- 0 0 0 0 0 0 0 0 0 0 0 0
40067- 0 0 0 0 0 0 0 0 0 0 0 0
40068- 0 0 0 0 0 0 0 0 0 0 0 0
40069- 14 14 14 38 38 38 70 70 70 154 122 46
40070-190 142 34 200 144 11 197 138 11 197 138 11
40071-213 154 11 226 170 11 242 186 14 246 190 14
40072-246 190 14 246 190 14 246 190 14 246 190 14
40073-225 175 15 46 32 6 2 2 6 22 22 22
40074-158 158 158 250 250 250 253 253 253 253 253 253
40075-253 253 253 253 253 253 253 253 253 253 253 253
40076-253 253 253 253 253 253 253 253 253 253 253 253
40077-253 253 253 253 253 253 253 253 253 253 253 253
40078-253 253 253 253 253 253 253 253 253 253 253 253
40079-253 253 253 250 250 250 242 242 242 224 178 62
40080-239 182 13 236 186 11 213 154 11 46 32 6
40081- 2 2 6 2 2 6 2 2 6 2 2 6
40082- 2 2 6 2 2 6 61 42 6 225 175 15
40083-238 190 10 236 186 11 112 100 78 42 42 42
40084- 14 14 14 0 0 0 0 0 0 0 0 0
40085- 0 0 0 0 0 0 0 0 0 0 0 0
40086- 0 0 0 0 0 0 0 0 0 0 0 0
40087- 0 0 0 0 0 0 0 0 0 0 0 0
40088- 0 0 0 0 0 0 0 0 0 6 6 6
40089- 22 22 22 54 54 54 154 122 46 213 154 11
40090-226 170 11 230 174 11 226 170 11 226 170 11
40091-236 178 12 242 186 14 246 190 14 246 190 14
40092-246 190 14 246 190 14 246 190 14 246 190 14
40093-241 196 14 184 144 12 10 10 10 2 2 6
40094- 6 6 6 116 116 116 242 242 242 253 253 253
40095-253 253 253 253 253 253 253 253 253 253 253 253
40096-253 253 253 253 253 253 253 253 253 253 253 253
40097-253 253 253 253 253 253 253 253 253 253 253 253
40098-253 253 253 253 253 253 253 253 253 253 253 253
40099-253 253 253 231 231 231 198 198 198 214 170 54
40100-236 178 12 236 178 12 210 150 10 137 92 6
40101- 18 14 6 2 2 6 2 2 6 2 2 6
40102- 6 6 6 70 47 6 200 144 11 236 178 12
40103-239 182 13 239 182 13 124 112 88 58 58 58
40104- 22 22 22 6 6 6 0 0 0 0 0 0
40105- 0 0 0 0 0 0 0 0 0 0 0 0
40106- 0 0 0 0 0 0 0 0 0 0 0 0
40107- 0 0 0 0 0 0 0 0 0 0 0 0
40108- 0 0 0 0 0 0 0 0 0 10 10 10
40109- 30 30 30 70 70 70 180 133 36 226 170 11
40110-239 182 13 242 186 14 242 186 14 246 186 14
40111-246 190 14 246 190 14 246 190 14 246 190 14
40112-246 190 14 246 190 14 246 190 14 246 190 14
40113-246 190 14 232 195 16 98 70 6 2 2 6
40114- 2 2 6 2 2 6 66 66 66 221 221 221
40115-253 253 253 253 253 253 253 253 253 253 253 253
40116-253 253 253 253 253 253 253 253 253 253 253 253
40117-253 253 253 253 253 253 253 253 253 253 253 253
40118-253 253 253 253 253 253 253 253 253 253 253 253
40119-253 253 253 206 206 206 198 198 198 214 166 58
40120-230 174 11 230 174 11 216 158 10 192 133 9
40121-163 110 8 116 81 8 102 78 10 116 81 8
40122-167 114 7 197 138 11 226 170 11 239 182 13
40123-242 186 14 242 186 14 162 146 94 78 78 78
40124- 34 34 34 14 14 14 6 6 6 0 0 0
40125- 0 0 0 0 0 0 0 0 0 0 0 0
40126- 0 0 0 0 0 0 0 0 0 0 0 0
40127- 0 0 0 0 0 0 0 0 0 0 0 0
40128- 0 0 0 0 0 0 0 0 0 6 6 6
40129- 30 30 30 78 78 78 190 142 34 226 170 11
40130-239 182 13 246 190 14 246 190 14 246 190 14
40131-246 190 14 246 190 14 246 190 14 246 190 14
40132-246 190 14 246 190 14 246 190 14 246 190 14
40133-246 190 14 241 196 14 203 166 17 22 18 6
40134- 2 2 6 2 2 6 2 2 6 38 38 38
40135-218 218 218 253 253 253 253 253 253 253 253 253
40136-253 253 253 253 253 253 253 253 253 253 253 253
40137-253 253 253 253 253 253 253 253 253 253 253 253
40138-253 253 253 253 253 253 253 253 253 253 253 253
40139-250 250 250 206 206 206 198 198 198 202 162 69
40140-226 170 11 236 178 12 224 166 10 210 150 10
40141-200 144 11 197 138 11 192 133 9 197 138 11
40142-210 150 10 226 170 11 242 186 14 246 190 14
40143-246 190 14 246 186 14 225 175 15 124 112 88
40144- 62 62 62 30 30 30 14 14 14 6 6 6
40145- 0 0 0 0 0 0 0 0 0 0 0 0
40146- 0 0 0 0 0 0 0 0 0 0 0 0
40147- 0 0 0 0 0 0 0 0 0 0 0 0
40148- 0 0 0 0 0 0 0 0 0 10 10 10
40149- 30 30 30 78 78 78 174 135 50 224 166 10
40150-239 182 13 246 190 14 246 190 14 246 190 14
40151-246 190 14 246 190 14 246 190 14 246 190 14
40152-246 190 14 246 190 14 246 190 14 246 190 14
40153-246 190 14 246 190 14 241 196 14 139 102 15
40154- 2 2 6 2 2 6 2 2 6 2 2 6
40155- 78 78 78 250 250 250 253 253 253 253 253 253
40156-253 253 253 253 253 253 253 253 253 253 253 253
40157-253 253 253 253 253 253 253 253 253 253 253 253
40158-253 253 253 253 253 253 253 253 253 253 253 253
40159-250 250 250 214 214 214 198 198 198 190 150 46
40160-219 162 10 236 178 12 234 174 13 224 166 10
40161-216 158 10 213 154 11 213 154 11 216 158 10
40162-226 170 11 239 182 13 246 190 14 246 190 14
40163-246 190 14 246 190 14 242 186 14 206 162 42
40164-101 101 101 58 58 58 30 30 30 14 14 14
40165- 6 6 6 0 0 0 0 0 0 0 0 0
40166- 0 0 0 0 0 0 0 0 0 0 0 0
40167- 0 0 0 0 0 0 0 0 0 0 0 0
40168- 0 0 0 0 0 0 0 0 0 10 10 10
40169- 30 30 30 74 74 74 174 135 50 216 158 10
40170-236 178 12 246 190 14 246 190 14 246 190 14
40171-246 190 14 246 190 14 246 190 14 246 190 14
40172-246 190 14 246 190 14 246 190 14 246 190 14
40173-246 190 14 246 190 14 241 196 14 226 184 13
40174- 61 42 6 2 2 6 2 2 6 2 2 6
40175- 22 22 22 238 238 238 253 253 253 253 253 253
40176-253 253 253 253 253 253 253 253 253 253 253 253
40177-253 253 253 253 253 253 253 253 253 253 253 253
40178-253 253 253 253 253 253 253 253 253 253 253 253
40179-253 253 253 226 226 226 187 187 187 180 133 36
40180-216 158 10 236 178 12 239 182 13 236 178 12
40181-230 174 11 226 170 11 226 170 11 230 174 11
40182-236 178 12 242 186 14 246 190 14 246 190 14
40183-246 190 14 246 190 14 246 186 14 239 182 13
40184-206 162 42 106 106 106 66 66 66 34 34 34
40185- 14 14 14 6 6 6 0 0 0 0 0 0
40186- 0 0 0 0 0 0 0 0 0 0 0 0
40187- 0 0 0 0 0 0 0 0 0 0 0 0
40188- 0 0 0 0 0 0 0 0 0 6 6 6
40189- 26 26 26 70 70 70 163 133 67 213 154 11
40190-236 178 12 246 190 14 246 190 14 246 190 14
40191-246 190 14 246 190 14 246 190 14 246 190 14
40192-246 190 14 246 190 14 246 190 14 246 190 14
40193-246 190 14 246 190 14 246 190 14 241 196 14
40194-190 146 13 18 14 6 2 2 6 2 2 6
40195- 46 46 46 246 246 246 253 253 253 253 253 253
40196-253 253 253 253 253 253 253 253 253 253 253 253
40197-253 253 253 253 253 253 253 253 253 253 253 253
40198-253 253 253 253 253 253 253 253 253 253 253 253
40199-253 253 253 221 221 221 86 86 86 156 107 11
40200-216 158 10 236 178 12 242 186 14 246 186 14
40201-242 186 14 239 182 13 239 182 13 242 186 14
40202-242 186 14 246 186 14 246 190 14 246 190 14
40203-246 190 14 246 190 14 246 190 14 246 190 14
40204-242 186 14 225 175 15 142 122 72 66 66 66
40205- 30 30 30 10 10 10 0 0 0 0 0 0
40206- 0 0 0 0 0 0 0 0 0 0 0 0
40207- 0 0 0 0 0 0 0 0 0 0 0 0
40208- 0 0 0 0 0 0 0 0 0 6 6 6
40209- 26 26 26 70 70 70 163 133 67 210 150 10
40210-236 178 12 246 190 14 246 190 14 246 190 14
40211-246 190 14 246 190 14 246 190 14 246 190 14
40212-246 190 14 246 190 14 246 190 14 246 190 14
40213-246 190 14 246 190 14 246 190 14 246 190 14
40214-232 195 16 121 92 8 34 34 34 106 106 106
40215-221 221 221 253 253 253 253 253 253 253 253 253
40216-253 253 253 253 253 253 253 253 253 253 253 253
40217-253 253 253 253 253 253 253 253 253 253 253 253
40218-253 253 253 253 253 253 253 253 253 253 253 253
40219-242 242 242 82 82 82 18 14 6 163 110 8
40220-216 158 10 236 178 12 242 186 14 246 190 14
40221-246 190 14 246 190 14 246 190 14 246 190 14
40222-246 190 14 246 190 14 246 190 14 246 190 14
40223-246 190 14 246 190 14 246 190 14 246 190 14
40224-246 190 14 246 190 14 242 186 14 163 133 67
40225- 46 46 46 18 18 18 6 6 6 0 0 0
40226- 0 0 0 0 0 0 0 0 0 0 0 0
40227- 0 0 0 0 0 0 0 0 0 0 0 0
40228- 0 0 0 0 0 0 0 0 0 10 10 10
40229- 30 30 30 78 78 78 163 133 67 210 150 10
40230-236 178 12 246 186 14 246 190 14 246 190 14
40231-246 190 14 246 190 14 246 190 14 246 190 14
40232-246 190 14 246 190 14 246 190 14 246 190 14
40233-246 190 14 246 190 14 246 190 14 246 190 14
40234-241 196 14 215 174 15 190 178 144 253 253 253
40235-253 253 253 253 253 253 253 253 253 253 253 253
40236-253 253 253 253 253 253 253 253 253 253 253 253
40237-253 253 253 253 253 253 253 253 253 253 253 253
40238-253 253 253 253 253 253 253 253 253 218 218 218
40239- 58 58 58 2 2 6 22 18 6 167 114 7
40240-216 158 10 236 178 12 246 186 14 246 190 14
40241-246 190 14 246 190 14 246 190 14 246 190 14
40242-246 190 14 246 190 14 246 190 14 246 190 14
40243-246 190 14 246 190 14 246 190 14 246 190 14
40244-246 190 14 246 186 14 242 186 14 190 150 46
40245- 54 54 54 22 22 22 6 6 6 0 0 0
40246- 0 0 0 0 0 0 0 0 0 0 0 0
40247- 0 0 0 0 0 0 0 0 0 0 0 0
40248- 0 0 0 0 0 0 0 0 0 14 14 14
40249- 38 38 38 86 86 86 180 133 36 213 154 11
40250-236 178 12 246 186 14 246 190 14 246 190 14
40251-246 190 14 246 190 14 246 190 14 246 190 14
40252-246 190 14 246 190 14 246 190 14 246 190 14
40253-246 190 14 246 190 14 246 190 14 246 190 14
40254-246 190 14 232 195 16 190 146 13 214 214 214
40255-253 253 253 253 253 253 253 253 253 253 253 253
40256-253 253 253 253 253 253 253 253 253 253 253 253
40257-253 253 253 253 253 253 253 253 253 253 253 253
40258-253 253 253 250 250 250 170 170 170 26 26 26
40259- 2 2 6 2 2 6 37 26 9 163 110 8
40260-219 162 10 239 182 13 246 186 14 246 190 14
40261-246 190 14 246 190 14 246 190 14 246 190 14
40262-246 190 14 246 190 14 246 190 14 246 190 14
40263-246 190 14 246 190 14 246 190 14 246 190 14
40264-246 186 14 236 178 12 224 166 10 142 122 72
40265- 46 46 46 18 18 18 6 6 6 0 0 0
40266- 0 0 0 0 0 0 0 0 0 0 0 0
40267- 0 0 0 0 0 0 0 0 0 0 0 0
40268- 0 0 0 0 0 0 6 6 6 18 18 18
40269- 50 50 50 109 106 95 192 133 9 224 166 10
40270-242 186 14 246 190 14 246 190 14 246 190 14
40271-246 190 14 246 190 14 246 190 14 246 190 14
40272-246 190 14 246 190 14 246 190 14 246 190 14
40273-246 190 14 246 190 14 246 190 14 246 190 14
40274-242 186 14 226 184 13 210 162 10 142 110 46
40275-226 226 226 253 253 253 253 253 253 253 253 253
40276-253 253 253 253 253 253 253 253 253 253 253 253
40277-253 253 253 253 253 253 253 253 253 253 253 253
40278-198 198 198 66 66 66 2 2 6 2 2 6
40279- 2 2 6 2 2 6 50 34 6 156 107 11
40280-219 162 10 239 182 13 246 186 14 246 190 14
40281-246 190 14 246 190 14 246 190 14 246 190 14
40282-246 190 14 246 190 14 246 190 14 246 190 14
40283-246 190 14 246 190 14 246 190 14 242 186 14
40284-234 174 13 213 154 11 154 122 46 66 66 66
40285- 30 30 30 10 10 10 0 0 0 0 0 0
40286- 0 0 0 0 0 0 0 0 0 0 0 0
40287- 0 0 0 0 0 0 0 0 0 0 0 0
40288- 0 0 0 0 0 0 6 6 6 22 22 22
40289- 58 58 58 154 121 60 206 145 10 234 174 13
40290-242 186 14 246 186 14 246 190 14 246 190 14
40291-246 190 14 246 190 14 246 190 14 246 190 14
40292-246 190 14 246 190 14 246 190 14 246 190 14
40293-246 190 14 246 190 14 246 190 14 246 190 14
40294-246 186 14 236 178 12 210 162 10 163 110 8
40295- 61 42 6 138 138 138 218 218 218 250 250 250
40296-253 253 253 253 253 253 253 253 253 250 250 250
40297-242 242 242 210 210 210 144 144 144 66 66 66
40298- 6 6 6 2 2 6 2 2 6 2 2 6
40299- 2 2 6 2 2 6 61 42 6 163 110 8
40300-216 158 10 236 178 12 246 190 14 246 190 14
40301-246 190 14 246 190 14 246 190 14 246 190 14
40302-246 190 14 246 190 14 246 190 14 246 190 14
40303-246 190 14 239 182 13 230 174 11 216 158 10
40304-190 142 34 124 112 88 70 70 70 38 38 38
40305- 18 18 18 6 6 6 0 0 0 0 0 0
40306- 0 0 0 0 0 0 0 0 0 0 0 0
40307- 0 0 0 0 0 0 0 0 0 0 0 0
40308- 0 0 0 0 0 0 6 6 6 22 22 22
40309- 62 62 62 168 124 44 206 145 10 224 166 10
40310-236 178 12 239 182 13 242 186 14 242 186 14
40311-246 186 14 246 190 14 246 190 14 246 190 14
40312-246 190 14 246 190 14 246 190 14 246 190 14
40313-246 190 14 246 190 14 246 190 14 246 190 14
40314-246 190 14 236 178 12 216 158 10 175 118 6
40315- 80 54 7 2 2 6 6 6 6 30 30 30
40316- 54 54 54 62 62 62 50 50 50 38 38 38
40317- 14 14 14 2 2 6 2 2 6 2 2 6
40318- 2 2 6 2 2 6 2 2 6 2 2 6
40319- 2 2 6 6 6 6 80 54 7 167 114 7
40320-213 154 11 236 178 12 246 190 14 246 190 14
40321-246 190 14 246 190 14 246 190 14 246 190 14
40322-246 190 14 242 186 14 239 182 13 239 182 13
40323-230 174 11 210 150 10 174 135 50 124 112 88
40324- 82 82 82 54 54 54 34 34 34 18 18 18
40325- 6 6 6 0 0 0 0 0 0 0 0 0
40326- 0 0 0 0 0 0 0 0 0 0 0 0
40327- 0 0 0 0 0 0 0 0 0 0 0 0
40328- 0 0 0 0 0 0 6 6 6 18 18 18
40329- 50 50 50 158 118 36 192 133 9 200 144 11
40330-216 158 10 219 162 10 224 166 10 226 170 11
40331-230 174 11 236 178 12 239 182 13 239 182 13
40332-242 186 14 246 186 14 246 190 14 246 190 14
40333-246 190 14 246 190 14 246 190 14 246 190 14
40334-246 186 14 230 174 11 210 150 10 163 110 8
40335-104 69 6 10 10 10 2 2 6 2 2 6
40336- 2 2 6 2 2 6 2 2 6 2 2 6
40337- 2 2 6 2 2 6 2 2 6 2 2 6
40338- 2 2 6 2 2 6 2 2 6 2 2 6
40339- 2 2 6 6 6 6 91 60 6 167 114 7
40340-206 145 10 230 174 11 242 186 14 246 190 14
40341-246 190 14 246 190 14 246 186 14 242 186 14
40342-239 182 13 230 174 11 224 166 10 213 154 11
40343-180 133 36 124 112 88 86 86 86 58 58 58
40344- 38 38 38 22 22 22 10 10 10 6 6 6
40345- 0 0 0 0 0 0 0 0 0 0 0 0
40346- 0 0 0 0 0 0 0 0 0 0 0 0
40347- 0 0 0 0 0 0 0 0 0 0 0 0
40348- 0 0 0 0 0 0 0 0 0 14 14 14
40349- 34 34 34 70 70 70 138 110 50 158 118 36
40350-167 114 7 180 123 7 192 133 9 197 138 11
40351-200 144 11 206 145 10 213 154 11 219 162 10
40352-224 166 10 230 174 11 239 182 13 242 186 14
40353-246 186 14 246 186 14 246 186 14 246 186 14
40354-239 182 13 216 158 10 185 133 11 152 99 6
40355-104 69 6 18 14 6 2 2 6 2 2 6
40356- 2 2 6 2 2 6 2 2 6 2 2 6
40357- 2 2 6 2 2 6 2 2 6 2 2 6
40358- 2 2 6 2 2 6 2 2 6 2 2 6
40359- 2 2 6 6 6 6 80 54 7 152 99 6
40360-192 133 9 219 162 10 236 178 12 239 182 13
40361-246 186 14 242 186 14 239 182 13 236 178 12
40362-224 166 10 206 145 10 192 133 9 154 121 60
40363- 94 94 94 62 62 62 42 42 42 22 22 22
40364- 14 14 14 6 6 6 0 0 0 0 0 0
40365- 0 0 0 0 0 0 0 0 0 0 0 0
40366- 0 0 0 0 0 0 0 0 0 0 0 0
40367- 0 0 0 0 0 0 0 0 0 0 0 0
40368- 0 0 0 0 0 0 0 0 0 6 6 6
40369- 18 18 18 34 34 34 58 58 58 78 78 78
40370-101 98 89 124 112 88 142 110 46 156 107 11
40371-163 110 8 167 114 7 175 118 6 180 123 7
40372-185 133 11 197 138 11 210 150 10 219 162 10
40373-226 170 11 236 178 12 236 178 12 234 174 13
40374-219 162 10 197 138 11 163 110 8 130 83 6
40375- 91 60 6 10 10 10 2 2 6 2 2 6
40376- 18 18 18 38 38 38 38 38 38 38 38 38
40377- 38 38 38 38 38 38 38 38 38 38 38 38
40378- 38 38 38 38 38 38 26 26 26 2 2 6
40379- 2 2 6 6 6 6 70 47 6 137 92 6
40380-175 118 6 200 144 11 219 162 10 230 174 11
40381-234 174 13 230 174 11 219 162 10 210 150 10
40382-192 133 9 163 110 8 124 112 88 82 82 82
40383- 50 50 50 30 30 30 14 14 14 6 6 6
40384- 0 0 0 0 0 0 0 0 0 0 0 0
40385- 0 0 0 0 0 0 0 0 0 0 0 0
40386- 0 0 0 0 0 0 0 0 0 0 0 0
40387- 0 0 0 0 0 0 0 0 0 0 0 0
40388- 0 0 0 0 0 0 0 0 0 0 0 0
40389- 6 6 6 14 14 14 22 22 22 34 34 34
40390- 42 42 42 58 58 58 74 74 74 86 86 86
40391-101 98 89 122 102 70 130 98 46 121 87 25
40392-137 92 6 152 99 6 163 110 8 180 123 7
40393-185 133 11 197 138 11 206 145 10 200 144 11
40394-180 123 7 156 107 11 130 83 6 104 69 6
40395- 50 34 6 54 54 54 110 110 110 101 98 89
40396- 86 86 86 82 82 82 78 78 78 78 78 78
40397- 78 78 78 78 78 78 78 78 78 78 78 78
40398- 78 78 78 82 82 82 86 86 86 94 94 94
40399-106 106 106 101 101 101 86 66 34 124 80 6
40400-156 107 11 180 123 7 192 133 9 200 144 11
40401-206 145 10 200 144 11 192 133 9 175 118 6
40402-139 102 15 109 106 95 70 70 70 42 42 42
40403- 22 22 22 10 10 10 0 0 0 0 0 0
40404- 0 0 0 0 0 0 0 0 0 0 0 0
40405- 0 0 0 0 0 0 0 0 0 0 0 0
40406- 0 0 0 0 0 0 0 0 0 0 0 0
40407- 0 0 0 0 0 0 0 0 0 0 0 0
40408- 0 0 0 0 0 0 0 0 0 0 0 0
40409- 0 0 0 0 0 0 6 6 6 10 10 10
40410- 14 14 14 22 22 22 30 30 30 38 38 38
40411- 50 50 50 62 62 62 74 74 74 90 90 90
40412-101 98 89 112 100 78 121 87 25 124 80 6
40413-137 92 6 152 99 6 152 99 6 152 99 6
40414-138 86 6 124 80 6 98 70 6 86 66 30
40415-101 98 89 82 82 82 58 58 58 46 46 46
40416- 38 38 38 34 34 34 34 34 34 34 34 34
40417- 34 34 34 34 34 34 34 34 34 34 34 34
40418- 34 34 34 34 34 34 38 38 38 42 42 42
40419- 54 54 54 82 82 82 94 86 76 91 60 6
40420-134 86 6 156 107 11 167 114 7 175 118 6
40421-175 118 6 167 114 7 152 99 6 121 87 25
40422-101 98 89 62 62 62 34 34 34 18 18 18
40423- 6 6 6 0 0 0 0 0 0 0 0 0
40424- 0 0 0 0 0 0 0 0 0 0 0 0
40425- 0 0 0 0 0 0 0 0 0 0 0 0
40426- 0 0 0 0 0 0 0 0 0 0 0 0
40427- 0 0 0 0 0 0 0 0 0 0 0 0
40428- 0 0 0 0 0 0 0 0 0 0 0 0
40429- 0 0 0 0 0 0 0 0 0 0 0 0
40430- 0 0 0 6 6 6 6 6 6 10 10 10
40431- 18 18 18 22 22 22 30 30 30 42 42 42
40432- 50 50 50 66 66 66 86 86 86 101 98 89
40433-106 86 58 98 70 6 104 69 6 104 69 6
40434-104 69 6 91 60 6 82 62 34 90 90 90
40435- 62 62 62 38 38 38 22 22 22 14 14 14
40436- 10 10 10 10 10 10 10 10 10 10 10 10
40437- 10 10 10 10 10 10 6 6 6 10 10 10
40438- 10 10 10 10 10 10 10 10 10 14 14 14
40439- 22 22 22 42 42 42 70 70 70 89 81 66
40440- 80 54 7 104 69 6 124 80 6 137 92 6
40441-134 86 6 116 81 8 100 82 52 86 86 86
40442- 58 58 58 30 30 30 14 14 14 6 6 6
40443- 0 0 0 0 0 0 0 0 0 0 0 0
40444- 0 0 0 0 0 0 0 0 0 0 0 0
40445- 0 0 0 0 0 0 0 0 0 0 0 0
40446- 0 0 0 0 0 0 0 0 0 0 0 0
40447- 0 0 0 0 0 0 0 0 0 0 0 0
40448- 0 0 0 0 0 0 0 0 0 0 0 0
40449- 0 0 0 0 0 0 0 0 0 0 0 0
40450- 0 0 0 0 0 0 0 0 0 0 0 0
40451- 0 0 0 6 6 6 10 10 10 14 14 14
40452- 18 18 18 26 26 26 38 38 38 54 54 54
40453- 70 70 70 86 86 86 94 86 76 89 81 66
40454- 89 81 66 86 86 86 74 74 74 50 50 50
40455- 30 30 30 14 14 14 6 6 6 0 0 0
40456- 0 0 0 0 0 0 0 0 0 0 0 0
40457- 0 0 0 0 0 0 0 0 0 0 0 0
40458- 0 0 0 0 0 0 0 0 0 0 0 0
40459- 6 6 6 18 18 18 34 34 34 58 58 58
40460- 82 82 82 89 81 66 89 81 66 89 81 66
40461- 94 86 66 94 86 76 74 74 74 50 50 50
40462- 26 26 26 14 14 14 6 6 6 0 0 0
40463- 0 0 0 0 0 0 0 0 0 0 0 0
40464- 0 0 0 0 0 0 0 0 0 0 0 0
40465- 0 0 0 0 0 0 0 0 0 0 0 0
40466- 0 0 0 0 0 0 0 0 0 0 0 0
40467- 0 0 0 0 0 0 0 0 0 0 0 0
40468- 0 0 0 0 0 0 0 0 0 0 0 0
40469- 0 0 0 0 0 0 0 0 0 0 0 0
40470- 0 0 0 0 0 0 0 0 0 0 0 0
40471- 0 0 0 0 0 0 0 0 0 0 0 0
40472- 6 6 6 6 6 6 14 14 14 18 18 18
40473- 30 30 30 38 38 38 46 46 46 54 54 54
40474- 50 50 50 42 42 42 30 30 30 18 18 18
40475- 10 10 10 0 0 0 0 0 0 0 0 0
40476- 0 0 0 0 0 0 0 0 0 0 0 0
40477- 0 0 0 0 0 0 0 0 0 0 0 0
40478- 0 0 0 0 0 0 0 0 0 0 0 0
40479- 0 0 0 6 6 6 14 14 14 26 26 26
40480- 38 38 38 50 50 50 58 58 58 58 58 58
40481- 54 54 54 42 42 42 30 30 30 18 18 18
40482- 10 10 10 0 0 0 0 0 0 0 0 0
40483- 0 0 0 0 0 0 0 0 0 0 0 0
40484- 0 0 0 0 0 0 0 0 0 0 0 0
40485- 0 0 0 0 0 0 0 0 0 0 0 0
40486- 0 0 0 0 0 0 0 0 0 0 0 0
40487- 0 0 0 0 0 0 0 0 0 0 0 0
40488- 0 0 0 0 0 0 0 0 0 0 0 0
40489- 0 0 0 0 0 0 0 0 0 0 0 0
40490- 0 0 0 0 0 0 0 0 0 0 0 0
40491- 0 0 0 0 0 0 0 0 0 0 0 0
40492- 0 0 0 0 0 0 0 0 0 6 6 6
40493- 6 6 6 10 10 10 14 14 14 18 18 18
40494- 18 18 18 14 14 14 10 10 10 6 6 6
40495- 0 0 0 0 0 0 0 0 0 0 0 0
40496- 0 0 0 0 0 0 0 0 0 0 0 0
40497- 0 0 0 0 0 0 0 0 0 0 0 0
40498- 0 0 0 0 0 0 0 0 0 0 0 0
40499- 0 0 0 0 0 0 0 0 0 6 6 6
40500- 14 14 14 18 18 18 22 22 22 22 22 22
40501- 18 18 18 14 14 14 10 10 10 6 6 6
40502- 0 0 0 0 0 0 0 0 0 0 0 0
40503- 0 0 0 0 0 0 0 0 0 0 0 0
40504- 0 0 0 0 0 0 0 0 0 0 0 0
40505- 0 0 0 0 0 0 0 0 0 0 0 0
40506- 0 0 0 0 0 0 0 0 0 0 0 0
40507+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
40508+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
40509+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
40510+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
40511+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
40512+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
40513+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
40514+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
40515+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
40516+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
40517+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
40518+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
40519+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
40520+4 4 4 4 4 4
40521+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
40522+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
40523+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
40524+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
40525+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
40526+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
40527+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
40528+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
40529+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
40530+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
40531+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
40532+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
40533+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
40534+4 4 4 4 4 4
40535+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
40536+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
40537+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
40538+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
40539+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
40540+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
40541+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
40542+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
40543+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
40544+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
40545+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
40546+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
40547+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
40548+4 4 4 4 4 4
40549+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
40550+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
40551+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
40552+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
40553+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
40554+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
40555+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
40556+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
40557+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
40558+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
40559+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
40560+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
40561+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
40562+4 4 4 4 4 4
40563+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
40564+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
40565+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
40566+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
40567+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
40568+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
40569+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
40570+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
40571+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
40572+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
40573+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
40574+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
40575+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
40576+4 4 4 4 4 4
40577+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
40578+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
40579+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
40580+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
40581+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
40582+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
40583+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
40584+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
40585+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
40586+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
40587+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
40588+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
40589+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
40590+4 4 4 4 4 4
40591+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
40592+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
40593+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
40594+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
40595+4 4 4 4 4 4 4 4 4 3 3 3 0 0 0 0 0 0
40596+0 0 0 0 0 0 0 0 0 0 0 0 3 3 3 4 4 4
40597+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
40598+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
40599+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
40600+4 4 4 4 4 4 4 4 4 4 4 4 1 1 1 0 0 0
40601+0 0 0 3 3 3 4 4 4 4 4 4 4 4 4 4 4 4
40602+4 4 4 4 4 4 4 4 4 2 1 0 2 1 0 3 2 2
40603+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
40604+4 4 4 4 4 4
40605+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
40606+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
40607+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
40608+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
40609+4 4 4 4 4 4 2 2 2 0 0 0 3 4 3 26 28 28
40610+37 38 37 37 38 37 14 17 19 2 2 2 0 0 0 2 2 2
40611+5 5 5 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
40612+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
40613+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
40614+4 4 4 4 4 4 3 3 3 0 0 0 1 1 1 6 6 6
40615+2 2 2 0 0 0 3 3 3 4 4 4 4 4 4 4 4 4
40616+4 4 5 3 3 3 1 0 0 0 0 0 1 0 0 0 0 0
40617+1 1 1 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
40618+4 4 4 4 4 4
40619+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
40620+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
40621+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
40622+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
40623+2 2 2 0 0 0 0 0 0 14 17 19 60 74 84 137 136 137
40624+153 152 153 137 136 137 125 124 125 60 73 81 6 6 6 3 1 0
40625+0 0 0 3 3 3 4 4 4 4 4 4 4 4 4 4 4 4
40626+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
40627+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
40628+4 4 4 4 4 4 0 0 0 4 4 4 41 54 63 125 124 125
40629+60 73 81 6 6 6 4 0 0 3 3 3 4 4 4 4 4 4
40630+4 4 4 0 0 0 6 9 11 41 54 63 41 65 82 22 30 35
40631+2 2 2 2 1 0 4 4 4 4 4 4 4 4 4 4 4 4
40632+4 4 4 4 4 4
40633+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
40634+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
40635+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
40636+4 4 4 4 4 4 5 5 5 5 5 5 2 2 2 0 0 0
40637+4 0 0 6 6 6 41 54 63 137 136 137 174 174 174 167 166 167
40638+165 164 165 165 164 165 163 162 163 163 162 163 125 124 125 41 54 63
40639+1 1 1 0 0 0 0 0 0 3 3 3 5 5 5 4 4 4
40640+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
40641+4 4 4 4 4 4 4 4 4 4 4 4 5 5 5 5 5 5
40642+3 3 3 2 0 0 4 0 0 60 73 81 156 155 156 167 166 167
40643+163 162 163 85 115 134 5 7 8 0 0 0 4 4 4 5 5 5
40644+0 0 0 2 5 5 55 98 126 90 154 193 90 154 193 72 125 159
40645+37 51 59 2 0 0 1 1 1 4 5 5 4 4 4 4 4 4
40646+4 4 4 4 4 4
40647+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
40648+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
40649+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
40650+4 4 4 5 5 5 4 4 4 1 1 1 0 0 0 3 3 3
40651+37 38 37 125 124 125 163 162 163 174 174 174 158 157 158 158 157 158
40652+156 155 156 156 155 156 158 157 158 165 164 165 174 174 174 166 165 166
40653+125 124 125 16 19 21 1 0 0 0 0 0 0 0 0 4 4 4
40654+5 5 5 5 5 5 4 4 4 4 4 4 4 4 4 4 4 4
40655+4 4 4 4 4 4 4 4 4 5 5 5 5 5 5 1 1 1
40656+0 0 0 0 0 0 37 38 37 153 152 153 174 174 174 158 157 158
40657+174 174 174 163 162 163 37 38 37 4 3 3 4 0 0 1 1 1
40658+0 0 0 22 40 52 101 161 196 101 161 196 90 154 193 101 161 196
40659+64 123 161 14 17 19 0 0 0 4 4 4 4 4 4 4 4 4
40660+4 4 4 4 4 4
40661+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
40662+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
40663+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 5 5 5
40664+5 5 5 2 2 2 0 0 0 4 0 0 24 26 27 85 115 134
40665+156 155 156 174 174 174 167 166 167 156 155 156 154 153 154 157 156 157
40666+156 155 156 156 155 156 155 154 155 153 152 153 158 157 158 167 166 167
40667+174 174 174 156 155 156 60 74 84 16 19 21 0 0 0 0 0 0
40668+1 1 1 5 5 5 5 5 5 4 4 4 4 4 4 4 4 4
40669+4 4 4 5 5 5 6 6 6 3 3 3 0 0 0 4 0 0
40670+13 16 17 60 73 81 137 136 137 165 164 165 156 155 156 153 152 153
40671+174 174 174 177 184 187 60 73 81 3 1 0 0 0 0 1 1 2
40672+22 30 35 64 123 161 136 185 209 90 154 193 90 154 193 90 154 193
40673+90 154 193 21 29 34 0 0 0 3 2 2 4 4 5 4 4 4
40674+4 4 4 4 4 4
40675+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
40676+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
40677+4 4 4 4 4 4 4 4 4 4 4 4 5 5 5 3 3 3
40678+0 0 0 0 0 0 10 13 16 60 74 84 157 156 157 174 174 174
40679+174 174 174 158 157 158 153 152 153 154 153 154 156 155 156 155 154 155
40680+156 155 156 155 154 155 154 153 154 157 156 157 154 153 154 153 152 153
40681+163 162 163 174 174 174 177 184 187 137 136 137 60 73 81 13 16 17
40682+4 0 0 0 0 0 3 3 3 5 5 5 4 4 4 4 4 4
40683+5 5 5 4 4 4 1 1 1 0 0 0 3 3 3 41 54 63
40684+131 129 131 174 174 174 174 174 174 174 174 174 167 166 167 174 174 174
40685+190 197 201 137 136 137 24 26 27 4 0 0 16 21 25 50 82 103
40686+90 154 193 136 185 209 90 154 193 101 161 196 101 161 196 101 161 196
40687+31 91 132 3 6 7 0 0 0 4 4 4 4 4 4 4 4 4
40688+4 4 4 4 4 4
40689+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
40690+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
40691+4 4 4 4 4 4 4 4 4 2 2 2 0 0 0 4 0 0
40692+4 0 0 43 57 68 137 136 137 177 184 187 174 174 174 163 162 163
40693+155 154 155 155 154 155 156 155 156 155 154 155 158 157 158 165 164 165
40694+167 166 167 166 165 166 163 162 163 157 156 157 155 154 155 155 154 155
40695+153 152 153 156 155 156 167 166 167 174 174 174 174 174 174 131 129 131
40696+41 54 63 5 5 5 0 0 0 0 0 0 3 3 3 4 4 4
40697+1 1 1 0 0 0 1 0 0 26 28 28 125 124 125 174 174 174
40698+177 184 187 174 174 174 174 174 174 156 155 156 131 129 131 137 136 137
40699+125 124 125 24 26 27 4 0 0 41 65 82 90 154 193 136 185 209
40700+136 185 209 101 161 196 53 118 160 37 112 160 90 154 193 34 86 122
40701+7 12 15 0 0 0 4 4 4 4 4 4 4 4 4 4 4 4
40702+4 4 4 4 4 4
40703+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
40704+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
40705+4 4 4 3 3 3 0 0 0 0 0 0 5 5 5 37 38 37
40706+125 124 125 167 166 167 174 174 174 167 166 167 158 157 158 155 154 155
40707+156 155 156 156 155 156 156 155 156 163 162 163 167 166 167 155 154 155
40708+137 136 137 153 152 153 156 155 156 165 164 165 163 162 163 156 155 156
40709+156 155 156 156 155 156 155 154 155 158 157 158 166 165 166 174 174 174
40710+167 166 167 125 124 125 37 38 37 1 0 0 0 0 0 0 0 0
40711+0 0 0 24 26 27 60 74 84 158 157 158 174 174 174 174 174 174
40712+166 165 166 158 157 158 125 124 125 41 54 63 13 16 17 6 6 6
40713+6 6 6 37 38 37 80 127 157 136 185 209 101 161 196 101 161 196
40714+90 154 193 28 67 93 6 10 14 13 20 25 13 20 25 6 10 14
40715+1 1 2 4 3 3 4 4 4 4 4 4 4 4 4 4 4 4
40716+4 4 4 4 4 4
40717+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
40718+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
40719+1 1 1 1 0 0 4 3 3 37 38 37 60 74 84 153 152 153
40720+167 166 167 167 166 167 158 157 158 154 153 154 155 154 155 156 155 156
40721+157 156 157 158 157 158 167 166 167 167 166 167 131 129 131 43 57 68
40722+26 28 28 37 38 37 60 73 81 131 129 131 165 164 165 166 165 166
40723+158 157 158 155 154 155 156 155 156 156 155 156 156 155 156 158 157 158
40724+165 164 165 174 174 174 163 162 163 60 74 84 16 19 21 13 16 17
40725+60 73 81 131 129 131 174 174 174 174 174 174 167 166 167 165 164 165
40726+137 136 137 60 73 81 24 26 27 4 0 0 4 0 0 16 19 21
40727+52 104 138 101 161 196 136 185 209 136 185 209 90 154 193 27 99 146
40728+13 20 25 4 5 7 2 5 5 4 5 7 1 1 2 0 0 0
40729+4 4 4 4 4 4 3 3 3 2 2 2 2 2 2 4 4 4
40730+4 4 4 4 4 4
40731+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
40732+4 4 4 4 4 4 4 4 4 4 4 4 3 3 3 0 0 0
40733+0 0 0 13 16 17 60 73 81 137 136 137 174 174 174 166 165 166
40734+158 157 158 156 155 156 157 156 157 156 155 156 155 154 155 158 157 158
40735+167 166 167 174 174 174 153 152 153 60 73 81 16 19 21 4 0 0
40736+4 0 0 4 0 0 6 6 6 26 28 28 60 74 84 158 157 158
40737+174 174 174 166 165 166 157 156 157 155 154 155 156 155 156 156 155 156
40738+155 154 155 158 157 158 167 166 167 167 166 167 131 129 131 125 124 125
40739+137 136 137 167 166 167 167 166 167 174 174 174 158 157 158 125 124 125
40740+16 19 21 4 0 0 4 0 0 10 13 16 49 76 92 107 159 188
40741+136 185 209 136 185 209 90 154 193 26 108 161 22 40 52 6 10 14
40742+2 3 3 1 1 2 1 1 2 4 4 5 4 4 5 4 4 5
40743+4 4 5 2 2 1 0 0 0 0 0 0 0 0 0 2 2 2
40744+4 4 4 4 4 4
40745+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
40746+4 4 4 5 5 5 3 3 3 0 0 0 1 0 0 4 0 0
40747+37 51 59 131 129 131 167 166 167 167 166 167 163 162 163 157 156 157
40748+157 156 157 155 154 155 153 152 153 157 156 157 167 166 167 174 174 174
40749+153 152 153 125 124 125 37 38 37 4 0 0 4 0 0 4 0 0
40750+4 3 3 4 3 3 4 0 0 6 6 6 4 0 0 37 38 37
40751+125 124 125 174 174 174 174 174 174 165 164 165 156 155 156 154 153 154
40752+156 155 156 156 155 156 155 154 155 163 162 163 158 157 158 163 162 163
40753+174 174 174 174 174 174 174 174 174 125 124 125 37 38 37 0 0 0
40754+4 0 0 6 9 11 41 54 63 90 154 193 136 185 209 146 190 211
40755+136 185 209 37 112 160 22 40 52 6 10 14 3 6 7 1 1 2
40756+1 1 2 3 3 3 1 1 2 3 3 3 4 4 4 4 4 4
40757+2 2 2 2 0 0 16 19 21 37 38 37 24 26 27 0 0 0
40758+0 0 0 4 4 4
40759+4 4 4 4 4 4 4 4 4 4 4 4 5 5 5 5 5 5
40760+4 4 4 0 0 0 0 0 0 0 0 0 26 28 28 120 125 127
40761+158 157 158 174 174 174 165 164 165 157 156 157 155 154 155 156 155 156
40762+153 152 153 153 152 153 167 166 167 174 174 174 174 174 174 125 124 125
40763+37 38 37 4 0 0 0 0 0 4 0 0 4 3 3 4 4 4
40764+4 4 4 4 4 4 5 5 5 4 0 0 4 0 0 4 0 0
40765+4 3 3 43 57 68 137 136 137 174 174 174 174 174 174 165 164 165
40766+154 153 154 153 152 153 153 152 153 153 152 153 163 162 163 174 174 174
40767+174 174 174 153 152 153 60 73 81 6 6 6 4 0 0 4 3 3
40768+32 43 50 80 127 157 136 185 209 146 190 211 146 190 211 90 154 193
40769+28 67 93 28 67 93 40 71 93 3 6 7 1 1 2 2 5 5
40770+50 82 103 79 117 143 26 37 45 0 0 0 3 3 3 1 1 1
40771+0 0 0 41 54 63 137 136 137 174 174 174 153 152 153 60 73 81
40772+2 0 0 0 0 0
40773+4 4 4 4 4 4 4 4 4 4 4 4 6 6 6 2 2 2
40774+0 0 0 2 0 0 24 26 27 60 74 84 153 152 153 174 174 174
40775+174 174 174 157 156 157 154 153 154 156 155 156 154 153 154 153 152 153
40776+165 164 165 174 174 174 177 184 187 137 136 137 43 57 68 6 6 6
40777+4 0 0 2 0 0 3 3 3 5 5 5 5 5 5 4 4 4
40778+4 4 4 4 4 4 4 4 4 5 5 5 6 6 6 4 3 3
40779+4 0 0 4 0 0 24 26 27 60 73 81 153 152 153 174 174 174
40780+174 174 174 158 157 158 158 157 158 174 174 174 174 174 174 158 157 158
40781+60 74 84 24 26 27 4 0 0 4 0 0 17 23 27 59 113 148
40782+136 185 209 191 222 234 146 190 211 136 185 209 31 91 132 7 11 13
40783+22 40 52 101 161 196 90 154 193 6 9 11 3 4 4 43 95 132
40784+136 185 209 172 205 220 55 98 126 0 0 0 0 0 0 2 0 0
40785+26 28 28 153 152 153 177 184 187 167 166 167 177 184 187 165 164 165
40786+37 38 37 0 0 0
40787+4 4 4 4 4 4 5 5 5 5 5 5 1 1 1 0 0 0
40788+13 16 17 60 73 81 137 136 137 174 174 174 174 174 174 165 164 165
40789+153 152 153 153 152 153 155 154 155 154 153 154 158 157 158 174 174 174
40790+177 184 187 163 162 163 60 73 81 16 19 21 4 0 0 4 0 0
40791+4 3 3 4 4 4 5 5 5 5 5 5 4 4 4 5 5 5
40792+5 5 5 5 5 5 5 5 5 4 4 4 4 4 4 5 5 5
40793+6 6 6 4 0 0 4 0 0 4 0 0 24 26 27 60 74 84
40794+166 165 166 174 174 174 177 184 187 165 164 165 125 124 125 24 26 27
40795+4 0 0 4 0 0 5 5 5 50 82 103 136 185 209 172 205 220
40796+146 190 211 136 185 209 26 108 161 22 40 52 7 12 15 44 81 103
40797+71 116 144 28 67 93 37 51 59 41 65 82 100 139 164 101 161 196
40798+90 154 193 90 154 193 28 67 93 0 0 0 0 0 0 26 28 28
40799+125 124 125 167 166 167 163 162 163 153 152 153 163 162 163 174 174 174
40800+85 115 134 4 0 0
40801+4 4 4 5 5 5 4 4 4 1 0 0 4 0 0 34 47 55
40802+125 124 125 174 174 174 174 174 174 167 166 167 157 156 157 153 152 153
40803+155 154 155 155 154 155 158 157 158 166 165 166 167 166 167 154 153 154
40804+125 124 125 26 28 28 4 0 0 4 0 0 4 0 0 5 5 5
40805+5 5 5 4 4 4 4 4 4 4 4 4 4 4 4 1 1 1
40806+0 0 0 0 0 0 1 1 1 4 4 4 4 4 4 4 4 4
40807+5 5 5 5 5 5 4 3 3 4 0 0 4 0 0 6 6 6
40808+37 38 37 131 129 131 137 136 137 37 38 37 0 0 0 4 0 0
40809+4 5 5 43 61 72 90 154 193 172 205 220 146 190 211 136 185 209
40810+90 154 193 28 67 93 13 20 25 43 61 72 71 116 144 44 81 103
40811+2 5 5 7 11 13 59 113 148 101 161 196 90 154 193 28 67 93
40812+13 20 25 6 10 14 0 0 0 13 16 17 60 73 81 137 136 137
40813+166 165 166 158 157 158 156 155 156 154 153 154 167 166 167 174 174 174
40814+60 73 81 4 0 0
40815+4 4 4 4 4 4 0 0 0 3 3 3 60 74 84 174 174 174
40816+174 174 174 167 166 167 163 162 163 155 154 155 157 156 157 155 154 155
40817+156 155 156 163 162 163 167 166 167 158 157 158 125 124 125 37 38 37
40818+4 3 3 4 0 0 4 0 0 6 6 6 6 6 6 5 5 5
40819+4 4 4 4 4 4 4 4 4 1 1 1 0 0 0 2 3 3
40820+10 13 16 7 11 13 1 0 0 0 0 0 2 2 1 4 4 4
40821+4 4 4 4 4 4 4 4 4 5 5 5 4 3 3 4 0 0
40822+4 0 0 7 11 13 13 16 17 4 0 0 3 3 3 34 47 55
40823+80 127 157 146 190 211 172 205 220 136 185 209 136 185 209 136 185 209
40824+28 67 93 22 40 52 55 98 126 55 98 126 21 29 34 7 11 13
40825+50 82 103 101 161 196 101 161 196 35 83 115 13 20 25 2 2 1
40826+1 1 2 1 1 2 37 51 59 131 129 131 174 174 174 174 174 174
40827+167 166 167 163 162 163 163 162 163 167 166 167 174 174 174 125 124 125
40828+16 19 21 4 0 0
40829+4 4 4 4 0 0 4 0 0 60 74 84 174 174 174 174 174 174
40830+158 157 158 155 154 155 155 154 155 156 155 156 155 154 155 158 157 158
40831+167 166 167 165 164 165 131 129 131 60 73 81 13 16 17 4 0 0
40832+4 0 0 4 3 3 6 6 6 4 3 3 5 5 5 4 4 4
40833+4 4 4 3 2 2 0 0 0 0 0 0 7 11 13 45 69 86
40834+80 127 157 71 116 144 43 61 72 7 11 13 0 0 0 1 1 1
40835+4 3 3 4 4 4 4 4 4 4 4 4 6 6 6 5 5 5
40836+3 2 2 4 0 0 1 0 0 21 29 34 59 113 148 136 185 209
40837+146 190 211 136 185 209 136 185 209 136 185 209 136 185 209 136 185 209
40838+68 124 159 44 81 103 22 40 52 13 16 17 43 61 72 90 154 193
40839+136 185 209 59 113 148 21 29 34 3 4 3 1 1 1 0 0 0
40840+24 26 27 125 124 125 163 162 163 174 174 174 166 165 166 165 164 165
40841+163 162 163 125 124 125 125 124 125 125 124 125 125 124 125 26 28 28
40842+4 0 0 4 3 3
40843+3 3 3 0 0 0 24 26 27 153 152 153 177 184 187 158 157 158
40844+156 155 156 156 155 156 155 154 155 155 154 155 165 164 165 174 174 174
40845+155 154 155 60 74 84 26 28 28 4 0 0 4 0 0 3 1 0
40846+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 3 3
40847+2 0 0 0 0 0 0 0 0 32 43 50 72 125 159 101 161 196
40848+136 185 209 101 161 196 101 161 196 79 117 143 32 43 50 0 0 0
40849+0 0 0 2 2 2 4 4 4 4 4 4 3 3 3 1 0 0
40850+0 0 0 4 5 5 49 76 92 101 161 196 146 190 211 146 190 211
40851+136 185 209 136 185 209 136 185 209 136 185 209 136 185 209 90 154 193
40852+28 67 93 13 16 17 37 51 59 80 127 157 136 185 209 90 154 193
40853+22 40 52 6 9 11 3 4 3 2 2 1 16 19 21 60 73 81
40854+137 136 137 163 162 163 158 157 158 166 165 166 167 166 167 153 152 153
40855+60 74 84 37 38 37 6 6 6 13 16 17 4 0 0 1 0 0
40856+3 2 2 4 4 4
40857+3 2 2 4 0 0 37 38 37 137 136 137 167 166 167 158 157 158
40858+157 156 157 154 153 154 157 156 157 167 166 167 174 174 174 125 124 125
40859+37 38 37 4 0 0 4 0 0 4 0 0 4 3 3 4 4 4
40860+4 4 4 4 4 4 5 5 5 5 5 5 1 1 1 0 0 0
40861+0 0 0 16 21 25 55 98 126 90 154 193 136 185 209 101 161 196
40862+101 161 196 101 161 196 136 185 209 136 185 209 101 161 196 55 98 126
40863+14 17 19 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
40864+22 40 52 90 154 193 146 190 211 146 190 211 136 185 209 136 185 209
40865+136 185 209 136 185 209 136 185 209 101 161 196 35 83 115 7 11 13
40866+17 23 27 59 113 148 136 185 209 101 161 196 34 86 122 7 12 15
40867+2 5 5 3 4 3 6 6 6 60 73 81 131 129 131 163 162 163
40868+166 165 166 174 174 174 174 174 174 163 162 163 125 124 125 41 54 63
40869+13 16 17 4 0 0 4 0 0 4 0 0 1 0 0 2 2 2
40870+4 4 4 4 4 4
40871+1 1 1 2 1 0 43 57 68 137 136 137 153 152 153 153 152 153
40872+163 162 163 156 155 156 165 164 165 167 166 167 60 74 84 6 6 6
40873+4 0 0 4 0 0 5 5 5 4 4 4 4 4 4 4 4 4
40874+4 5 5 6 6 6 4 3 3 0 0 0 0 0 0 11 15 18
40875+40 71 93 100 139 164 101 161 196 101 161 196 101 161 196 101 161 196
40876+101 161 196 101 161 196 101 161 196 101 161 196 136 185 209 136 185 209
40877+101 161 196 45 69 86 6 6 6 0 0 0 17 23 27 55 98 126
40878+136 185 209 146 190 211 136 185 209 136 185 209 136 185 209 136 185 209
40879+136 185 209 136 185 209 90 154 193 22 40 52 7 11 13 50 82 103
40880+136 185 209 136 185 209 53 118 160 22 40 52 7 11 13 2 5 5
40881+3 4 3 37 38 37 125 124 125 157 156 157 166 165 166 167 166 167
40882+174 174 174 174 174 174 137 136 137 60 73 81 4 0 0 4 0 0
40883+4 0 0 4 0 0 5 5 5 3 3 3 3 3 3 4 4 4
40884+4 4 4 4 4 4
40885+4 0 0 4 0 0 41 54 63 137 136 137 125 124 125 131 129 131
40886+155 154 155 167 166 167 174 174 174 60 74 84 6 6 6 4 0 0
40887+4 3 3 6 6 6 4 4 4 4 4 4 4 4 4 5 5 5
40888+4 4 4 1 1 1 0 0 0 3 6 7 41 65 82 72 125 159
40889+101 161 196 101 161 196 101 161 196 90 154 193 90 154 193 101 161 196
40890+101 161 196 101 161 196 101 161 196 101 161 196 101 161 196 136 185 209
40891+136 185 209 136 185 209 80 127 157 55 98 126 101 161 196 146 190 211
40892+136 185 209 136 185 209 136 185 209 101 161 196 136 185 209 101 161 196
40893+136 185 209 101 161 196 35 83 115 22 30 35 101 161 196 172 205 220
40894+90 154 193 28 67 93 7 11 13 2 5 5 3 4 3 13 16 17
40895+85 115 134 167 166 167 174 174 174 174 174 174 174 174 174 174 174 174
40896+167 166 167 60 74 84 13 16 17 4 0 0 4 0 0 4 3 3
40897+6 6 6 5 5 5 4 4 4 5 5 5 4 4 4 5 5 5
40898+5 5 5 5 5 5
40899+1 1 1 4 0 0 41 54 63 137 136 137 137 136 137 125 124 125
40900+131 129 131 167 166 167 157 156 157 37 38 37 6 6 6 4 0 0
40901+6 6 6 5 5 5 4 4 4 4 4 4 4 5 5 2 2 1
40902+0 0 0 0 0 0 26 37 45 58 111 146 101 161 196 101 161 196
40903+101 161 196 90 154 193 90 154 193 90 154 193 101 161 196 101 161 196
40904+101 161 196 101 161 196 101 161 196 101 161 196 101 161 196 101 161 196
40905+101 161 196 136 185 209 136 185 209 136 185 209 146 190 211 136 185 209
40906+136 185 209 101 161 196 136 185 209 136 185 209 101 161 196 136 185 209
40907+101 161 196 136 185 209 136 185 209 136 185 209 136 185 209 16 89 141
40908+7 11 13 2 5 5 2 5 5 13 16 17 60 73 81 154 154 154
40909+174 174 174 174 174 174 174 174 174 174 174 174 163 162 163 125 124 125
40910+24 26 27 4 0 0 4 0 0 4 0 0 5 5 5 5 5 5
40911+4 4 4 4 4 4 4 4 4 5 5 5 5 5 5 5 5 5
40912+5 5 5 4 4 4
40913+4 0 0 6 6 6 37 38 37 137 136 137 137 136 137 131 129 131
40914+131 129 131 153 152 153 131 129 131 26 28 28 4 0 0 4 3 3
40915+6 6 6 4 4 4 4 4 4 4 4 4 0 0 0 0 0 0
40916+13 20 25 51 88 114 90 154 193 101 161 196 101 161 196 90 154 193
40917+90 154 193 90 154 193 90 154 193 90 154 193 90 154 193 101 161 196
40918+101 161 196 101 161 196 101 161 196 101 161 196 136 185 209 101 161 196
40919+101 161 196 136 185 209 101 161 196 136 185 209 136 185 209 101 161 196
40920+136 185 209 101 161 196 136 185 209 101 161 196 101 161 196 101 161 196
40921+136 185 209 136 185 209 136 185 209 37 112 160 21 29 34 5 7 8
40922+2 5 5 13 16 17 43 57 68 131 129 131 174 174 174 174 174 174
40923+174 174 174 167 166 167 157 156 157 125 124 125 37 38 37 4 0 0
40924+4 0 0 4 0 0 5 5 5 5 5 5 4 4 4 4 4 4
40925+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
40926+4 4 4 4 4 4
40927+1 1 1 4 0 0 41 54 63 153 152 153 137 136 137 137 136 137
40928+137 136 137 153 152 153 125 124 125 24 26 27 4 0 0 3 2 2
40929+4 4 4 4 4 4 4 3 3 4 0 0 3 6 7 43 61 72
40930+64 123 161 101 161 196 90 154 193 90 154 193 90 154 193 90 154 193
40931+90 154 193 90 154 193 90 154 193 90 154 193 101 161 196 90 154 193
40932+101 161 196 101 161 196 101 161 196 101 161 196 101 161 196 101 161 196
40933+101 161 196 101 161 196 101 161 196 101 161 196 101 161 196 101 161 196
40934+136 185 209 101 161 196 101 161 196 136 185 209 136 185 209 101 161 196
40935+101 161 196 90 154 193 28 67 93 13 16 17 7 11 13 3 6 7
40936+37 51 59 125 124 125 163 162 163 174 174 174 167 166 167 166 165 166
40937+167 166 167 131 129 131 60 73 81 4 0 0 4 0 0 4 0 0
40938+3 3 3 5 5 5 6 6 6 4 4 4 4 4 4 4 4 4
40939+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
40940+4 4 4 4 4 4
40941+4 0 0 4 0 0 41 54 63 137 136 137 153 152 153 137 136 137
40942+153 152 153 157 156 157 125 124 125 24 26 27 0 0 0 2 2 2
40943+4 4 4 4 4 4 2 0 0 0 0 0 28 67 93 90 154 193
40944+90 154 193 90 154 193 90 154 193 90 154 193 64 123 161 90 154 193
40945+90 154 193 90 154 193 90 154 193 90 154 193 90 154 193 101 161 196
40946+90 154 193 101 161 196 101 161 196 101 161 196 90 154 193 136 185 209
40947+101 161 196 101 161 196 136 185 209 101 161 196 136 185 209 101 161 196
40948+101 161 196 101 161 196 136 185 209 101 161 196 101 161 196 90 154 193
40949+35 83 115 13 16 17 3 6 7 2 5 5 13 16 17 60 74 84
40950+154 154 154 166 165 166 165 164 165 158 157 158 163 162 163 157 156 157
40951+60 74 84 13 16 17 4 0 0 4 0 0 3 2 2 4 4 4
40952+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
40953+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
40954+4 4 4 4 4 4
40955+1 1 1 4 0 0 41 54 63 157 156 157 155 154 155 137 136 137
40956+153 152 153 158 157 158 137 136 137 26 28 28 2 0 0 2 2 2
40957+4 4 4 4 4 4 1 0 0 6 10 14 34 86 122 90 154 193
40958+64 123 161 90 154 193 64 123 161 90 154 193 90 154 193 90 154 193
40959+64 123 161 90 154 193 90 154 193 90 154 193 90 154 193 90 154 193
40960+101 161 196 101 161 196 101 161 196 101 161 196 101 161 196 101 161 196
40961+101 161 196 101 161 196 101 161 196 101 161 196 101 161 196 101 161 196
40962+136 185 209 101 161 196 136 185 209 90 154 193 26 108 161 22 40 52
40963+13 16 17 5 7 8 2 5 5 2 5 5 37 38 37 165 164 165
40964+174 174 174 163 162 163 154 154 154 165 164 165 167 166 167 60 73 81
40965+6 6 6 4 0 0 4 0 0 4 4 4 4 4 4 4 4 4
40966+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
40967+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
40968+4 4 4 4 4 4
40969+4 0 0 6 6 6 41 54 63 156 155 156 158 157 158 153 152 153
40970+156 155 156 165 164 165 137 136 137 26 28 28 0 0 0 2 2 2
40971+4 4 5 4 4 4 2 0 0 7 12 15 31 96 139 64 123 161
40972+90 154 193 64 123 161 90 154 193 90 154 193 64 123 161 90 154 193
40973+90 154 193 90 154 193 90 154 193 90 154 193 90 154 193 90 154 193
40974+90 154 193 90 154 193 90 154 193 101 161 196 101 161 196 101 161 196
40975+101 161 196 101 161 196 101 161 196 101 161 196 101 161 196 136 185 209
40976+101 161 196 136 185 209 26 108 161 22 40 52 7 11 13 5 7 8
40977+2 5 5 2 5 5 2 5 5 2 2 1 37 38 37 158 157 158
40978+174 174 174 154 154 154 156 155 156 167 166 167 165 164 165 37 38 37
40979+4 0 0 4 3 3 5 5 5 4 4 4 4 4 4 4 4 4
40980+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
40981+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
40982+4 4 4 4 4 4
40983+3 1 0 4 0 0 60 73 81 157 156 157 163 162 163 153 152 153
40984+158 157 158 167 166 167 137 136 137 26 28 28 2 0 0 2 2 2
40985+4 5 5 4 4 4 4 0 0 7 12 15 24 86 132 26 108 161
40986+37 112 160 64 123 161 90 154 193 64 123 161 90 154 193 90 154 193
40987+90 154 193 90 154 193 90 154 193 90 154 193 90 154 193 90 154 193
40988+90 154 193 101 161 196 90 154 193 101 161 196 101 161 196 101 161 196
40989+101 161 196 101 161 196 101 161 196 136 185 209 101 161 196 136 185 209
40990+90 154 193 35 83 115 13 16 17 13 16 17 7 11 13 3 6 7
40991+5 7 8 6 6 6 3 4 3 2 2 1 30 32 34 154 154 154
40992+167 166 167 154 154 154 154 154 154 174 174 174 165 164 165 37 38 37
40993+6 6 6 4 0 0 6 6 6 4 4 4 4 4 4 4 4 4
40994+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
40995+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
40996+4 4 4 4 4 4
40997+4 0 0 4 0 0 41 54 63 163 162 163 166 165 166 154 154 154
40998+163 162 163 174 174 174 137 136 137 26 28 28 0 0 0 2 2 2
40999+4 5 5 4 4 5 1 1 2 6 10 14 28 67 93 18 97 151
41000+18 97 151 18 97 151 26 108 161 37 112 160 37 112 160 90 154 193
41001+64 123 161 90 154 193 90 154 193 90 154 193 90 154 193 101 161 196
41002+90 154 193 101 161 196 101 161 196 90 154 193 101 161 196 101 161 196
41003+101 161 196 101 161 196 101 161 196 136 185 209 90 154 193 16 89 141
41004+13 20 25 7 11 13 5 7 8 5 7 8 2 5 5 4 5 5
41005+3 4 3 4 5 5 3 4 3 0 0 0 37 38 37 158 157 158
41006+174 174 174 158 157 158 158 157 158 167 166 167 174 174 174 41 54 63
41007+4 0 0 3 2 2 5 5 5 4 4 4 4 4 4 4 4 4
41008+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41009+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41010+4 4 4 4 4 4
41011+1 1 1 4 0 0 60 73 81 165 164 165 174 174 174 158 157 158
41012+167 166 167 174 174 174 153 152 153 26 28 28 2 0 0 2 2 2
41013+4 5 5 4 4 4 4 0 0 7 12 15 10 87 144 10 87 144
41014+18 97 151 18 97 151 18 97 151 26 108 161 26 108 161 26 108 161
41015+26 108 161 37 112 160 53 118 160 90 154 193 90 154 193 90 154 193
41016+90 154 193 90 154 193 101 161 196 101 161 196 101 161 196 101 161 196
41017+101 161 196 136 185 209 90 154 193 26 108 161 22 40 52 13 16 17
41018+7 11 13 3 6 7 5 7 8 5 7 8 2 5 5 4 5 5
41019+4 5 5 6 6 6 3 4 3 0 0 0 30 32 34 158 157 158
41020+174 174 174 156 155 156 155 154 155 165 164 165 154 153 154 37 38 37
41021+4 0 0 4 3 3 5 5 5 4 4 4 4 4 4 4 4 4
41022+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41023+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41024+4 4 4 4 4 4
41025+4 0 0 4 0 0 60 73 81 167 166 167 174 174 174 163 162 163
41026+174 174 174 174 174 174 153 152 153 26 28 28 0 0 0 3 3 3
41027+5 5 5 4 4 4 1 1 2 7 12 15 28 67 93 18 97 151
41028+18 97 151 18 97 151 18 97 151 18 97 151 18 97 151 26 108 161
41029+26 108 161 26 108 161 26 108 161 26 108 161 26 108 161 26 108 161
41030+90 154 193 26 108 161 90 154 193 90 154 193 90 154 193 101 161 196
41031+101 161 196 26 108 161 22 40 52 13 16 17 7 11 13 2 5 5
41032+2 5 5 6 6 6 2 5 5 4 5 5 4 5 5 4 5 5
41033+3 4 3 5 5 5 3 4 3 2 0 0 30 32 34 137 136 137
41034+153 152 153 137 136 137 131 129 131 137 136 137 131 129 131 37 38 37
41035+4 0 0 4 3 3 5 5 5 4 4 4 4 4 4 4 4 4
41036+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41037+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41038+4 4 4 4 4 4
41039+1 1 1 4 0 0 60 73 81 167 166 167 174 174 174 166 165 166
41040+174 174 174 177 184 187 153 152 153 30 32 34 1 0 0 3 3 3
41041+5 5 5 4 3 3 4 0 0 7 12 15 10 87 144 10 87 144
41042+18 97 151 18 97 151 18 97 151 26 108 161 26 108 161 26 108 161
41043+26 108 161 26 108 161 26 108 161 26 108 161 26 108 161 26 108 161
41044+26 108 161 26 108 161 26 108 161 90 154 193 90 154 193 26 108 161
41045+35 83 115 13 16 17 7 11 13 5 7 8 3 6 7 5 7 8
41046+2 5 5 6 6 6 4 5 5 4 5 5 3 4 3 4 5 5
41047+3 4 3 6 6 6 3 4 3 0 0 0 26 28 28 125 124 125
41048+131 129 131 125 124 125 125 124 125 131 129 131 131 129 131 37 38 37
41049+4 0 0 3 3 3 5 5 5 4 4 4 4 4 4 4 4 4
41050+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41051+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41052+4 4 4 4 4 4
41053+3 1 0 4 0 0 60 73 81 174 174 174 177 184 187 167 166 167
41054+174 174 174 177 184 187 153 152 153 30 32 34 0 0 0 3 3 3
41055+5 5 5 4 4 4 1 1 2 6 10 14 28 67 93 18 97 151
41056+18 97 151 18 97 151 18 97 151 18 97 151 18 97 151 26 108 161
41057+26 108 161 26 108 161 26 108 161 26 108 161 26 108 161 26 108 161
41058+26 108 161 90 154 193 26 108 161 26 108 161 24 86 132 13 20 25
41059+7 11 13 13 20 25 22 40 52 5 7 8 3 4 3 3 4 3
41060+4 5 5 3 4 3 4 5 5 3 4 3 4 5 5 3 4 3
41061+4 4 4 5 5 5 3 3 3 2 0 0 26 28 28 125 124 125
41062+137 136 137 125 124 125 125 124 125 137 136 137 131 129 131 37 38 37
41063+0 0 0 3 3 3 5 5 5 4 4 4 4 4 4 4 4 4
41064+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41065+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41066+4 4 4 4 4 4
41067+1 1 1 4 0 0 60 73 81 174 174 174 177 184 187 174 174 174
41068+174 174 174 190 197 201 157 156 157 30 32 34 1 0 0 3 3 3
41069+5 5 5 4 3 3 4 0 0 7 12 15 10 87 144 10 87 144
41070+18 97 151 19 95 150 19 95 150 18 97 151 18 97 151 26 108 161
41071+18 97 151 26 108 161 26 108 161 26 108 161 26 108 161 90 154 193
41072+26 108 161 26 108 161 26 108 161 22 40 52 2 5 5 3 4 3
41073+28 67 93 37 112 160 34 86 122 2 5 5 3 4 3 3 4 3
41074+3 4 3 3 4 3 3 4 3 2 2 1 3 4 3 4 4 4
41075+4 5 5 5 5 5 3 3 3 0 0 0 26 28 28 131 129 131
41076+137 136 137 125 124 125 125 124 125 137 136 137 131 129 131 37 38 37
41077+0 0 0 3 3 3 5 5 5 4 4 4 4 4 4 4 4 4
41078+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41079+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41080+4 4 4 4 4 4
41081+4 0 0 4 0 0 60 73 81 174 174 174 177 184 187 174 174 174
41082+174 174 174 190 197 201 158 157 158 30 32 34 0 0 0 2 2 2
41083+5 5 5 4 4 4 1 1 2 6 10 14 28 67 93 18 97 151
41084+10 87 144 19 95 150 19 95 150 18 97 151 18 97 151 18 97 151
41085+26 108 161 26 108 161 26 108 161 26 108 161 26 108 161 26 108 161
41086+18 97 151 22 40 52 2 5 5 2 2 1 22 40 52 26 108 161
41087+90 154 193 37 112 160 22 40 52 3 4 3 13 20 25 22 30 35
41088+3 6 7 1 1 1 2 2 2 6 9 11 5 5 5 4 3 3
41089+4 4 4 5 5 5 3 3 3 2 0 0 26 28 28 131 129 131
41090+137 136 137 125 124 125 125 124 125 137 136 137 131 129 131 37 38 37
41091+0 0 0 3 3 3 5 5 5 4 4 4 4 4 4 4 4 4
41092+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41093+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41094+4 4 4 4 4 4
41095+1 1 1 4 0 0 60 73 81 177 184 187 193 200 203 174 174 174
41096+177 184 187 193 200 203 163 162 163 30 32 34 4 0 0 2 2 2
41097+5 5 5 4 3 3 4 0 0 6 10 14 24 86 132 10 87 144
41098+10 87 144 10 87 144 19 95 150 19 95 150 19 95 150 18 97 151
41099+26 108 161 26 108 161 26 108 161 90 154 193 26 108 161 28 67 93
41100+6 10 14 2 5 5 13 20 25 24 86 132 37 112 160 90 154 193
41101+10 87 144 7 12 15 2 5 5 28 67 93 37 112 160 28 67 93
41102+2 2 1 7 12 15 35 83 115 28 67 93 3 6 7 1 0 0
41103+4 4 4 5 5 5 3 3 3 0 0 0 26 28 28 131 129 131
41104+137 136 137 125 124 125 125 124 125 137 136 137 131 129 131 37 38 37
41105+0 0 0 3 3 3 5 5 5 4 4 4 4 4 4 4 4 4
41106+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41107+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41108+4 4 4 4 4 4
41109+4 0 0 4 0 0 60 73 81 174 174 174 190 197 201 174 174 174
41110+177 184 187 193 200 203 163 162 163 30 32 34 0 0 0 2 2 2
41111+5 5 5 4 4 4 1 1 2 6 10 14 28 67 93 10 87 144
41112+10 87 144 16 89 141 19 95 150 10 87 144 26 108 161 26 108 161
41113+26 108 161 26 108 161 26 108 161 28 67 93 6 10 14 1 1 2
41114+7 12 15 28 67 93 26 108 161 16 89 141 24 86 132 21 29 34
41115+3 4 3 21 29 34 37 112 160 37 112 160 27 99 146 21 29 34
41116+21 29 34 26 108 161 90 154 193 35 83 115 1 1 2 2 0 0
41117+4 4 4 5 5 5 3 3 3 2 0 0 26 28 28 125 124 125
41118+137 136 137 125 124 125 125 124 125 137 136 137 131 129 131 37 38 37
41119+0 0 0 3 3 3 5 5 5 4 4 4 4 4 4 4 4 4
41120+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41121+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41122+4 4 4 4 4 4
41123+3 1 0 4 0 0 60 73 81 193 200 203 193 200 203 174 174 174
41124+190 197 201 193 200 203 165 164 165 37 38 37 4 0 0 2 2 2
41125+5 5 5 4 3 3 4 0 0 6 10 14 24 86 132 10 87 144
41126+10 87 144 10 87 144 16 89 141 18 97 151 18 97 151 10 87 144
41127+24 86 132 24 86 132 13 20 25 4 5 7 4 5 7 22 40 52
41128+18 97 151 37 112 160 26 108 161 7 12 15 1 1 1 0 0 0
41129+28 67 93 37 112 160 26 108 161 28 67 93 22 40 52 28 67 93
41130+26 108 161 90 154 193 26 108 161 10 87 144 0 0 0 2 0 0
41131+4 4 4 5 5 5 3 3 3 0 0 0 26 28 28 131 129 131
41132+137 136 137 125 124 125 125 124 125 137 136 137 131 129 131 37 38 37
41133+0 0 0 3 3 3 5 5 5 4 4 4 4 4 4 4 4 4
41134+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41135+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41136+4 4 4 4 4 4
41137+4 0 0 6 6 6 60 73 81 174 174 174 193 200 203 174 174 174
41138+190 197 201 193 200 203 165 164 165 30 32 34 0 0 0 2 2 2
41139+5 5 5 4 4 4 1 1 2 6 10 14 28 67 93 10 87 144
41140+10 87 144 10 87 144 10 87 144 18 97 151 28 67 93 6 10 14
41141+0 0 0 1 1 2 4 5 7 13 20 25 16 89 141 26 108 161
41142+26 108 161 26 108 161 24 86 132 6 9 11 2 3 3 22 40 52
41143+37 112 160 16 89 141 22 40 52 28 67 93 26 108 161 26 108 161
41144+90 154 193 26 108 161 26 108 161 28 67 93 1 1 1 4 0 0
41145+4 4 4 5 5 5 3 3 3 4 0 0 26 28 28 124 126 130
41146+137 136 137 125 124 125 125 124 125 137 136 137 131 129 131 37 38 37
41147+0 0 0 3 3 3 5 5 5 4 4 4 4 4 4 4 4 4
41148+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41149+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41150+4 4 4 4 4 4
41151+4 0 0 4 0 0 60 73 81 193 200 203 193 200 203 174 174 174
41152+193 200 203 193 200 203 167 166 167 37 38 37 4 0 0 2 2 2
41153+5 5 5 4 4 4 4 0 0 6 10 14 28 67 93 10 87 144
41154+10 87 144 10 87 144 18 97 151 10 87 144 13 20 25 4 5 7
41155+1 1 2 1 1 1 22 40 52 26 108 161 26 108 161 26 108 161
41156+26 108 161 26 108 161 26 108 161 24 86 132 22 40 52 22 40 52
41157+22 40 52 22 40 52 10 87 144 26 108 161 26 108 161 26 108 161
41158+26 108 161 26 108 161 90 154 193 10 87 144 0 0 0 4 0 0
41159+4 4 4 5 5 5 3 3 3 0 0 0 26 28 28 131 129 131
41160+137 136 137 125 124 125 125 124 125 137 136 137 131 129 131 37 38 37
41161+0 0 0 3 3 3 5 5 5 4 4 4 4 4 4 4 4 4
41162+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41163+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41164+4 4 4 4 4 4
41165+4 0 0 6 6 6 60 73 81 174 174 174 220 221 221 174 174 174
41166+190 197 201 205 212 215 167 166 167 30 32 34 0 0 0 2 2 2
41167+5 5 5 4 4 4 1 1 2 6 10 14 28 67 93 10 87 144
41168+10 87 144 10 87 144 10 87 144 10 87 144 22 40 52 1 1 2
41169+2 0 0 1 1 2 24 86 132 26 108 161 26 108 161 26 108 161
41170+26 108 161 19 95 150 16 89 141 10 87 144 22 40 52 22 40 52
41171+10 87 144 26 108 161 37 112 160 26 108 161 26 108 161 26 108 161
41172+26 108 161 26 108 161 26 108 161 28 67 93 2 0 0 3 1 0
41173+4 4 4 5 5 5 3 3 3 2 0 0 26 28 28 131 129 131
41174+137 136 137 125 124 125 125 124 125 137 136 137 131 129 131 37 38 37
41175+0 0 0 3 3 3 5 5 5 4 4 4 4 4 4 4 4 4
41176+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41177+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41178+4 4 4 4 4 4
41179+4 0 0 4 0 0 60 73 81 220 221 221 190 197 201 174 174 174
41180+193 200 203 193 200 203 174 174 174 37 38 37 4 0 0 2 2 2
41181+5 5 5 4 4 4 3 2 2 1 1 2 13 20 25 10 87 144
41182+10 87 144 10 87 144 10 87 144 10 87 144 10 87 144 13 20 25
41183+13 20 25 22 40 52 10 87 144 18 97 151 18 97 151 26 108 161
41184+10 87 144 13 20 25 6 10 14 21 29 34 24 86 132 18 97 151
41185+26 108 161 26 108 161 26 108 161 26 108 161 26 108 161 26 108 161
41186+26 108 161 90 154 193 18 97 151 13 20 25 0 0 0 4 3 3
41187+4 4 4 5 5 5 3 3 3 0 0 0 26 28 28 131 129 131
41188+137 136 137 125 124 125 125 124 125 137 136 137 131 129 131 37 38 37
41189+0 0 0 3 3 3 5 5 5 4 4 4 4 4 4 4 4 4
41190+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41191+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41192+4 4 4 4 4 4
41193+4 0 0 6 6 6 60 73 81 174 174 174 220 221 221 174 174 174
41194+190 197 201 220 221 221 167 166 167 30 32 34 1 0 0 2 2 2
41195+5 5 5 4 4 4 4 4 5 2 5 5 4 5 7 13 20 25
41196+28 67 93 10 87 144 10 87 144 10 87 144 10 87 144 10 87 144
41197+10 87 144 10 87 144 18 97 151 10 87 144 18 97 151 18 97 151
41198+28 67 93 2 3 3 0 0 0 28 67 93 26 108 161 26 108 161
41199+26 108 161 26 108 161 26 108 161 26 108 161 26 108 161 26 108 161
41200+26 108 161 10 87 144 13 20 25 1 1 2 3 2 2 4 4 4
41201+4 4 4 5 5 5 3 3 3 2 0 0 26 28 28 131 129 131
41202+137 136 137 125 124 125 125 124 125 137 136 137 131 129 131 37 38 37
41203+0 0 0 3 3 3 5 5 5 4 4 4 4 4 4 4 4 4
41204+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41205+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41206+4 4 4 4 4 4
41207+4 0 0 4 0 0 60 73 81 220 221 221 190 197 201 174 174 174
41208+193 200 203 193 200 203 174 174 174 26 28 28 4 0 0 4 3 3
41209+5 5 5 4 4 4 4 4 4 4 4 5 1 1 2 2 5 5
41210+4 5 7 22 40 52 10 87 144 10 87 144 18 97 151 10 87 144
41211+10 87 144 10 87 144 10 87 144 10 87 144 10 87 144 18 97 151
41212+10 87 144 28 67 93 22 40 52 10 87 144 26 108 161 18 97 151
41213+18 97 151 18 97 151 26 108 161 26 108 161 26 108 161 26 108 161
41214+22 40 52 1 1 2 0 0 0 2 3 3 4 4 4 4 4 4
41215+4 4 4 5 5 5 4 4 4 0 0 0 26 28 28 131 129 131
41216+137 136 137 125 124 125 125 124 125 137 136 137 131 129 131 37 38 37
41217+0 0 0 3 3 3 5 5 5 4 4 4 4 4 4 4 4 4
41218+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41219+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41220+4 4 4 4 4 4
41221+4 0 0 6 6 6 60 73 81 174 174 174 220 221 221 174 174 174
41222+190 197 201 220 221 221 190 197 201 41 54 63 4 0 0 2 2 2
41223+6 6 6 4 4 4 4 4 4 4 4 5 4 4 5 3 3 3
41224+1 1 2 1 1 2 6 10 14 22 40 52 10 87 144 18 97 151
41225+18 97 151 10 87 144 10 87 144 10 87 144 18 97 151 10 87 144
41226+10 87 144 18 97 151 26 108 161 18 97 151 18 97 151 10 87 144
41227+26 108 161 26 108 161 26 108 161 10 87 144 28 67 93 6 10 14
41228+1 1 2 1 1 2 4 3 3 4 4 5 4 4 4 4 4 4
41229+5 5 5 5 5 5 1 1 1 4 0 0 37 51 59 137 136 137
41230+137 136 137 125 124 125 125 124 125 137 136 137 131 129 131 37 38 37
41231+0 0 0 3 3 3 5 5 5 4 4 4 4 4 4 4 4 4
41232+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41233+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41234+4 4 4 4 4 4
41235+4 0 0 4 0 0 60 73 81 220 221 221 193 200 203 174 174 174
41236+193 200 203 193 200 203 220 221 221 137 136 137 13 16 17 4 0 0
41237+2 2 2 4 4 4 4 4 4 4 4 4 4 4 4 4 4 5
41238+4 4 5 4 3 3 1 1 2 4 5 7 13 20 25 28 67 93
41239+10 87 144 10 87 144 10 87 144 10 87 144 10 87 144 10 87 144
41240+10 87 144 18 97 151 18 97 151 10 87 144 18 97 151 26 108 161
41241+26 108 161 18 97 151 28 67 93 6 10 14 0 0 0 0 0 0
41242+2 3 3 4 5 5 4 4 5 4 4 4 4 4 4 5 5 5
41243+3 3 3 1 1 1 0 0 0 16 19 21 125 124 125 137 136 137
41244+131 129 131 125 124 125 125 124 125 137 136 137 131 129 131 37 38 37
41245+0 0 0 3 3 3 5 5 5 4 4 4 4 4 4 4 4 4
41246+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41247+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41248+4 4 4 4 4 4
41249+4 0 0 6 6 6 60 73 81 174 174 174 220 221 221 174 174 174
41250+193 200 203 190 197 201 220 221 221 220 221 221 153 152 153 30 32 34
41251+0 0 0 0 0 0 2 2 2 4 4 4 4 4 4 4 4 4
41252+4 4 4 4 5 5 4 5 7 1 1 2 1 1 2 4 5 7
41253+13 20 25 28 67 93 10 87 144 18 97 151 10 87 144 10 87 144
41254+10 87 144 10 87 144 10 87 144 18 97 151 26 108 161 18 97 151
41255+28 67 93 7 12 15 0 0 0 0 0 0 2 2 1 4 4 4
41256+4 5 5 4 5 5 4 4 4 4 4 4 3 3 3 0 0 0
41257+0 0 0 0 0 0 37 38 37 125 124 125 158 157 158 131 129 131
41258+125 124 125 125 124 125 125 124 125 137 136 137 131 129 131 37 38 37
41259+0 0 0 3 3 3 5 5 5 4 4 4 4 4 4 4 4 4
41260+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41261+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41262+4 4 4 4 4 4
41263+4 3 3 4 0 0 41 54 63 193 200 203 220 221 221 174 174 174
41264+193 200 203 193 200 203 193 200 203 220 221 221 244 246 246 193 200 203
41265+120 125 127 5 5 5 1 0 0 0 0 0 1 1 1 4 4 4
41266+4 4 4 4 4 4 4 5 5 4 5 5 4 4 5 1 1 2
41267+4 5 7 4 5 7 22 40 52 10 87 144 10 87 144 10 87 144
41268+10 87 144 10 87 144 18 97 151 10 87 144 10 87 144 13 20 25
41269+4 5 7 2 3 3 1 1 2 4 4 4 4 5 5 4 4 4
41270+4 4 4 4 4 4 4 4 4 1 1 1 0 0 0 1 1 2
41271+24 26 27 60 74 84 153 152 153 163 162 163 137 136 137 125 124 125
41272+125 124 125 125 124 125 125 124 125 137 136 137 125 124 125 26 28 28
41273+0 0 0 3 3 3 5 5 5 4 4 4 4 4 4 4 4 4
41274+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41275+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41276+4 4 4 4 4 4
41277+4 0 0 6 6 6 26 28 28 156 155 156 220 221 221 220 221 221
41278+174 174 174 193 200 203 193 200 203 193 200 203 205 212 215 220 221 221
41279+220 221 221 167 166 167 60 73 81 7 11 13 0 0 0 0 0 0
41280+3 3 3 4 4 4 4 4 4 4 4 4 4 4 5 4 4 5
41281+4 4 5 1 1 2 1 1 2 4 5 7 22 40 52 10 87 144
41282+10 87 144 10 87 144 10 87 144 22 40 52 4 5 7 1 1 2
41283+1 1 2 4 4 5 4 4 4 4 4 4 4 4 4 4 4 4
41284+5 5 5 2 2 2 0 0 0 4 0 0 16 19 21 60 73 81
41285+137 136 137 167 166 167 158 157 158 137 136 137 131 129 131 131 129 131
41286+125 124 125 125 124 125 131 129 131 155 154 155 60 74 84 5 7 8
41287+0 0 0 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41288+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41289+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41290+4 4 4 4 4 4
41291+5 5 5 4 0 0 4 0 0 60 73 81 193 200 203 220 221 221
41292+193 200 203 193 200 203 193 200 203 193 200 203 205 212 215 220 221 221
41293+220 221 221 220 221 221 220 221 221 137 136 137 43 57 68 6 6 6
41294+4 0 0 1 1 1 4 4 4 4 4 4 4 4 4 4 4 4
41295+4 4 5 4 4 5 3 2 2 1 1 2 2 5 5 13 20 25
41296+22 40 52 22 40 52 13 20 25 2 3 3 1 1 2 3 3 3
41297+4 5 7 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41298+1 1 1 0 0 0 2 3 3 41 54 63 131 129 131 166 165 166
41299+166 165 166 155 154 155 153 152 153 137 136 137 137 136 137 125 124 125
41300+125 124 125 137 136 137 137 136 137 125 124 125 37 38 37 4 3 3
41301+4 3 3 5 5 5 4 4 4 4 4 4 4 4 4 4 4 4
41302+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41303+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41304+4 4 4 4 4 4
41305+4 3 3 6 6 6 6 6 6 13 16 17 60 73 81 167 166 167
41306+220 221 221 220 221 221 220 221 221 193 200 203 193 200 203 193 200 203
41307+205 212 215 220 221 221 220 221 221 244 246 246 205 212 215 125 124 125
41308+24 26 27 0 0 0 0 0 0 2 2 2 5 5 5 5 5 5
41309+4 4 4 4 4 4 4 4 4 4 4 5 1 1 2 4 5 7
41310+4 5 7 4 5 7 1 1 2 3 2 2 4 4 5 4 4 4
41311+4 4 4 4 4 4 5 5 5 4 4 4 0 0 0 0 0 0
41312+2 0 0 26 28 28 125 124 125 174 174 174 174 174 174 166 165 166
41313+156 155 156 153 152 153 137 136 137 137 136 137 131 129 131 137 136 137
41314+137 136 137 137 136 137 60 74 84 30 32 34 4 0 0 4 0 0
41315+5 5 5 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41316+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41317+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41318+4 4 4 4 4 4
41319+5 5 5 6 6 6 4 0 0 4 0 0 6 6 6 26 28 28
41320+125 124 125 174 174 174 220 221 221 220 221 221 220 221 221 193 200 203
41321+205 212 215 220 221 221 205 212 215 220 221 221 220 221 221 244 246 246
41322+193 200 203 60 74 84 13 16 17 4 0 0 0 0 0 3 3 3
41323+5 5 5 5 5 5 4 4 4 4 4 4 4 4 5 3 3 3
41324+1 1 2 3 3 3 4 4 5 4 4 5 4 4 4 4 4 4
41325+5 5 5 5 5 5 2 2 2 0 0 0 0 0 0 13 16 17
41326+60 74 84 174 174 174 193 200 203 174 174 174 167 166 167 163 162 163
41327+153 152 153 153 152 153 137 136 137 137 136 137 153 152 153 137 136 137
41328+125 124 125 41 54 63 24 26 27 4 0 0 4 0 0 5 5 5
41329+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41330+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41331+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41332+4 4 4 4 4 4
41333+4 3 3 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6
41334+6 6 6 37 38 37 131 129 131 220 221 221 220 221 221 220 221 221
41335+193 200 203 193 200 203 220 221 221 205 212 215 220 221 221 244 246 246
41336+244 246 246 244 246 246 174 174 174 41 54 63 0 0 0 0 0 0
41337+0 0 0 4 4 4 5 5 5 5 5 5 4 4 4 4 4 5
41338+4 4 5 4 4 5 4 4 4 4 4 4 6 6 6 6 6 6
41339+3 3 3 0 0 0 2 0 0 13 16 17 60 73 81 156 155 156
41340+220 221 221 193 200 203 174 174 174 165 164 165 163 162 163 154 153 154
41341+153 152 153 153 152 153 158 157 158 163 162 163 137 136 137 60 73 81
41342+13 16 17 4 0 0 4 0 0 4 3 3 4 4 4 4 4 4
41343+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41344+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41345+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41346+4 4 4 4 4 4
41347+5 5 5 4 3 3 4 3 3 6 6 6 6 6 6 6 6 6
41348+6 6 6 6 6 6 6 6 6 37 38 37 167 166 167 244 246 246
41349+244 246 246 220 221 221 205 212 215 205 212 215 220 221 221 193 200 203
41350+220 221 221 244 246 246 244 246 246 244 246 246 137 136 137 37 38 37
41351+3 2 2 0 0 0 1 1 1 5 5 5 5 5 5 4 4 4
41352+4 4 4 4 4 4 4 4 4 5 5 5 4 4 4 1 1 1
41353+0 0 0 5 5 5 43 57 68 153 152 153 193 200 203 220 221 221
41354+177 184 187 174 174 174 167 166 167 166 165 166 158 157 158 157 156 157
41355+158 157 158 166 165 166 156 155 156 85 115 134 13 16 17 4 0 0
41356+4 0 0 4 0 0 5 5 5 5 5 5 4 4 4 4 4 4
41357+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41358+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41359+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41360+4 4 4 4 4 4
41361+5 5 5 4 3 3 6 6 6 6 6 6 4 0 0 6 6 6
41362+6 6 6 6 6 6 6 6 6 6 6 6 13 16 17 60 73 81
41363+177 184 187 220 221 221 220 221 221 220 221 221 205 212 215 220 221 221
41364+220 221 221 205 212 215 220 221 221 244 246 246 244 246 246 205 212 215
41365+125 124 125 30 32 34 0 0 0 0 0 0 2 2 2 5 5 5
41366+4 4 4 4 4 4 4 4 4 1 1 1 0 0 0 1 0 0
41367+37 38 37 131 129 131 205 212 215 220 221 221 193 200 203 174 174 174
41368+174 174 174 174 174 174 167 166 167 165 164 165 166 165 166 167 166 167
41369+158 157 158 125 124 125 37 38 37 4 0 0 4 0 0 4 0 0
41370+4 3 3 5 5 5 4 4 4 4 4 4 4 4 4 4 4 4
41371+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41372+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41373+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41374+4 4 4 4 4 4
41375+4 4 4 5 5 5 4 3 3 4 3 3 6 6 6 6 6 6
41376+4 0 0 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6
41377+26 28 28 125 124 125 205 212 215 220 221 221 220 221 221 220 221 221
41378+205 212 215 220 221 221 205 212 215 220 221 221 220 221 221 244 246 246
41379+244 246 246 190 197 201 60 74 84 16 19 21 4 0 0 0 0 0
41380+0 0 0 0 0 0 0 0 0 0 0 0 16 19 21 120 125 127
41381+177 184 187 220 221 221 205 212 215 177 184 187 174 174 174 177 184 187
41382+174 174 174 174 174 174 167 166 167 174 174 174 166 165 166 137 136 137
41383+60 73 81 13 16 17 4 0 0 4 0 0 4 3 3 6 6 6
41384+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41385+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41386+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41387+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41388+4 4 4 4 4 4
41389+5 5 5 4 3 3 5 5 5 4 3 3 6 6 6 4 0 0
41390+6 6 6 6 6 6 4 0 0 6 6 6 4 0 0 6 6 6
41391+6 6 6 6 6 6 37 38 37 137 136 137 193 200 203 220 221 221
41392+220 221 221 205 212 215 220 221 221 205 212 215 205 212 215 220 221 221
41393+220 221 221 220 221 221 244 246 246 166 165 166 43 57 68 2 2 2
41394+0 0 0 4 0 0 16 19 21 60 73 81 157 156 157 202 210 214
41395+220 221 221 193 200 203 177 184 187 177 184 187 177 184 187 174 174 174
41396+174 174 174 174 174 174 174 174 174 157 156 157 60 74 84 24 26 27
41397+4 0 0 4 0 0 4 0 0 6 6 6 4 4 4 4 4 4
41398+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41399+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41400+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41401+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41402+4 4 4 4 4 4
41403+4 4 4 4 4 4 5 5 5 4 3 3 5 5 5 6 6 6
41404+6 6 6 4 0 0 6 6 6 6 6 6 6 6 6 4 0 0
41405+4 0 0 4 0 0 6 6 6 24 26 27 60 73 81 167 166 167
41406+220 221 221 220 221 221 220 221 221 205 212 215 205 212 215 205 212 215
41407+205 212 215 220 221 221 220 221 221 220 221 221 205 212 215 137 136 137
41408+60 74 84 125 124 125 137 136 137 190 197 201 220 221 221 193 200 203
41409+177 184 187 177 184 187 177 184 187 174 174 174 174 174 174 177 184 187
41410+190 197 201 174 174 174 125 124 125 37 38 37 6 6 6 4 0 0
41411+4 0 0 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41412+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41413+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41414+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41415+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41416+4 4 4 4 4 4
41417+4 4 4 4 4 4 5 5 5 5 5 5 4 3 3 6 6 6
41418+4 0 0 6 6 6 6 6 6 6 6 6 4 0 0 6 6 6
41419+6 6 6 6 6 6 4 0 0 4 0 0 6 6 6 6 6 6
41420+125 124 125 193 200 203 244 246 246 220 221 221 205 212 215 205 212 215
41421+205 212 215 193 200 203 205 212 215 205 212 215 220 221 221 220 221 221
41422+193 200 203 193 200 203 205 212 215 193 200 203 193 200 203 177 184 187
41423+190 197 201 190 197 201 174 174 174 190 197 201 193 200 203 190 197 201
41424+153 152 153 60 73 81 4 0 0 4 0 0 4 0 0 3 2 2
41425+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41426+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41427+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41428+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41429+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41430+4 4 4 4 4 4
41431+4 4 4 4 4 4 4 4 4 4 4 4 5 5 5 4 3 3
41432+6 6 6 4 3 3 4 3 3 4 3 3 6 6 6 6 6 6
41433+4 0 0 6 6 6 6 6 6 6 6 6 4 0 0 4 0 0
41434+4 0 0 26 28 28 131 129 131 220 221 221 244 246 246 220 221 221
41435+205 212 215 193 200 203 205 212 215 193 200 203 193 200 203 205 212 215
41436+220 221 221 193 200 203 193 200 203 193 200 203 190 197 201 174 174 174
41437+174 174 174 190 197 201 193 200 203 193 200 203 167 166 167 125 124 125
41438+6 6 6 4 0 0 4 0 0 4 3 3 4 4 4 4 4 4
41439+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41440+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41441+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41442+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41443+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41444+4 4 4 4 4 4
41445+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 5 5 5
41446+5 5 5 4 3 3 5 5 5 6 6 6 4 3 3 5 5 5
41447+6 6 6 6 6 6 4 0 0 6 6 6 6 6 6 6 6 6
41448+4 0 0 4 0 0 6 6 6 41 54 63 158 157 158 220 221 221
41449+220 221 221 220 221 221 193 200 203 193 200 203 193 200 203 190 197 201
41450+190 197 201 190 197 201 190 197 201 190 197 201 174 174 174 193 200 203
41451+193 200 203 220 221 221 174 174 174 125 124 125 37 38 37 4 0 0
41452+4 0 0 4 3 3 6 6 6 4 4 4 4 4 4 4 4 4
41453+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41454+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41455+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41456+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41457+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41458+4 4 4 4 4 4
41459+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41460+4 4 4 5 5 5 4 3 3 4 3 3 4 3 3 5 5 5
41461+4 3 3 6 6 6 5 5 5 4 3 3 6 6 6 6 6 6
41462+6 6 6 6 6 6 4 0 0 4 0 0 13 16 17 60 73 81
41463+174 174 174 220 221 221 220 221 221 205 212 215 190 197 201 174 174 174
41464+193 200 203 174 174 174 190 197 201 174 174 174 193 200 203 220 221 221
41465+193 200 203 131 129 131 37 38 37 6 6 6 4 0 0 4 0 0
41466+6 6 6 6 6 6 4 3 3 5 5 5 4 4 4 4 4 4
41467+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41468+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41469+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41470+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41471+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41472+4 4 4 4 4 4
41473+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41474+4 4 4 4 4 4 4 4 4 5 5 5 5 5 5 5 5 5
41475+5 5 5 4 3 3 4 3 3 5 5 5 4 3 3 4 3 3
41476+5 5 5 6 6 6 6 6 6 4 0 0 6 6 6 6 6 6
41477+6 6 6 125 124 125 174 174 174 220 221 221 220 221 221 193 200 203
41478+193 200 203 193 200 203 193 200 203 193 200 203 220 221 221 158 157 158
41479+60 73 81 6 6 6 4 0 0 4 0 0 5 5 5 6 6 6
41480+5 5 5 5 5 5 4 4 4 4 4 4 4 4 4 4 4 4
41481+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41482+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41483+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41484+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41485+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41486+4 4 4 4 4 4
41487+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41488+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41489+4 4 4 5 5 5 5 5 5 4 3 3 5 5 5 4 3 3
41490+5 5 5 5 5 5 6 6 6 6 6 6 4 0 0 4 0 0
41491+4 0 0 4 0 0 26 28 28 125 124 125 174 174 174 193 200 203
41492+193 200 203 174 174 174 193 200 203 167 166 167 125 124 125 6 6 6
41493+6 6 6 6 6 6 4 0 0 6 6 6 6 6 6 5 5 5
41494+4 3 3 5 5 5 4 4 4 4 4 4 4 4 4 4 4 4
41495+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41496+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41497+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41498+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41499+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41500+4 4 4 4 4 4
41501+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41502+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41503+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 5 5 5
41504+4 3 3 6 6 6 4 0 0 6 6 6 6 6 6 6 6 6
41505+6 6 6 4 0 0 4 0 0 6 6 6 37 38 37 125 124 125
41506+153 152 153 131 129 131 125 124 125 37 38 37 6 6 6 6 6 6
41507+6 6 6 4 0 0 6 6 6 6 6 6 4 3 3 5 5 5
41508+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41509+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41510+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41511+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41512+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41513+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41514+4 4 4 4 4 4
41515+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41516+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41517+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41518+4 4 4 5 5 5 5 5 5 4 3 3 5 5 5 4 3 3
41519+6 6 6 6 6 6 4 0 0 4 0 0 6 6 6 6 6 6
41520+24 26 27 24 26 27 6 6 6 6 6 6 6 6 6 4 0 0
41521+6 6 6 6 6 6 4 0 0 6 6 6 5 5 5 4 3 3
41522+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41523+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41524+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41525+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41526+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41527+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41528+4 4 4 4 4 4
41529+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41530+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41531+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41532+4 4 4 4 4 4 5 5 5 4 3 3 5 5 5 6 6 6
41533+4 0 0 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6
41534+6 6 6 6 6 6 6 6 6 4 0 0 6 6 6 6 6 6
41535+4 0 0 6 6 6 6 6 6 4 3 3 5 5 5 4 4 4
41536+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41537+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41538+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41539+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41540+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41541+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41542+4 4 4 4 4 4
41543+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41544+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41545+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41546+4 4 4 4 4 4 4 4 4 5 5 5 4 3 3 5 5 5
41547+5 5 5 5 5 5 4 0 0 6 6 6 4 0 0 6 6 6
41548+6 6 6 6 6 6 6 6 6 4 0 0 6 6 6 4 0 0
41549+6 6 6 4 3 3 5 5 5 4 3 3 5 5 5 4 4 4
41550+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41551+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41552+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41553+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41554+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41555+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41556+4 4 4 4 4 4
41557+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41558+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41559+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41560+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 5 5 5
41561+4 3 3 6 6 6 4 3 3 6 6 6 6 6 6 6 6 6
41562+4 0 0 6 6 6 4 0 0 6 6 6 6 6 6 6 6 6
41563+6 6 6 4 3 3 5 5 5 4 4 4 4 4 4 4 4 4
41564+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41565+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41566+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41567+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41568+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41569+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41570+4 4 4 4 4 4
41571+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41572+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41573+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41574+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41575+4 4 4 5 5 5 4 3 3 5 5 5 4 0 0 6 6 6
41576+6 6 6 4 0 0 6 6 6 6 6 6 4 0 0 6 6 6
41577+4 3 3 5 5 5 5 5 5 4 4 4 4 4 4 4 4 4
41578+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41579+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41580+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41581+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41582+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41583+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41584+4 4 4 4 4 4
41585+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41586+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41587+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41588+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41589+4 4 4 5 5 5 4 3 3 5 5 5 6 6 6 4 3 3
41590+4 3 3 6 6 6 6 6 6 4 3 3 6 6 6 4 3 3
41591+5 5 5 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41592+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41593+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41594+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41595+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41596+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41597+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41598+4 4 4 4 4 4
41599+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41600+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41601+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41602+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41603+4 4 4 4 4 4 4 4 4 5 5 5 4 3 3 6 6 6
41604+5 5 5 4 3 3 4 3 3 4 3 3 5 5 5 5 5 5
41605+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41606+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41607+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41608+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41609+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41610+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41611+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41612+4 4 4 4 4 4
41613+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41614+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41615+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41616+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41617+4 4 4 4 4 4 4 4 4 4 4 4 5 5 5 4 3 3
41618+5 5 5 4 3 3 5 5 5 5 5 5 4 4 4 4 4 4
41619+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41620+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41621+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41622+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41623+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41624+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41625+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
41626+4 4 4 4 4 4
41627diff --git a/drivers/video/udlfb.c b/drivers/video/udlfb.c
41628index 3473e75..c930142 100644
41629--- a/drivers/video/udlfb.c
41630+++ b/drivers/video/udlfb.c
41631@@ -619,11 +619,11 @@ int dlfb_handle_damage(struct dlfb_data *dev, int x, int y,
41632 dlfb_urb_completion(urb);
41633
41634 error:
41635- atomic_add(bytes_sent, &dev->bytes_sent);
41636- atomic_add(bytes_identical, &dev->bytes_identical);
41637- atomic_add(width*height*2, &dev->bytes_rendered);
41638+ atomic_add_unchecked(bytes_sent, &dev->bytes_sent);
41639+ atomic_add_unchecked(bytes_identical, &dev->bytes_identical);
41640+ atomic_add_unchecked(width*height*2, &dev->bytes_rendered);
41641 end_cycles = get_cycles();
41642- atomic_add(((unsigned int) ((end_cycles - start_cycles)
41643+ atomic_add_unchecked(((unsigned int) ((end_cycles - start_cycles)
41644 >> 10)), /* Kcycles */
41645 &dev->cpu_kcycles_used);
41646
41647@@ -744,11 +744,11 @@ static void dlfb_dpy_deferred_io(struct fb_info *info,
41648 dlfb_urb_completion(urb);
41649
41650 error:
41651- atomic_add(bytes_sent, &dev->bytes_sent);
41652- atomic_add(bytes_identical, &dev->bytes_identical);
41653- atomic_add(bytes_rendered, &dev->bytes_rendered);
41654+ atomic_add_unchecked(bytes_sent, &dev->bytes_sent);
41655+ atomic_add_unchecked(bytes_identical, &dev->bytes_identical);
41656+ atomic_add_unchecked(bytes_rendered, &dev->bytes_rendered);
41657 end_cycles = get_cycles();
41658- atomic_add(((unsigned int) ((end_cycles - start_cycles)
41659+ atomic_add_unchecked(((unsigned int) ((end_cycles - start_cycles)
41660 >> 10)), /* Kcycles */
41661 &dev->cpu_kcycles_used);
41662 }
41663@@ -1368,7 +1368,7 @@ static ssize_t metrics_bytes_rendered_show(struct device *fbdev,
41664 struct fb_info *fb_info = dev_get_drvdata(fbdev);
41665 struct dlfb_data *dev = fb_info->par;
41666 return snprintf(buf, PAGE_SIZE, "%u\n",
41667- atomic_read(&dev->bytes_rendered));
41668+ atomic_read_unchecked(&dev->bytes_rendered));
41669 }
41670
41671 static ssize_t metrics_bytes_identical_show(struct device *fbdev,
41672@@ -1376,7 +1376,7 @@ static ssize_t metrics_bytes_identical_show(struct device *fbdev,
41673 struct fb_info *fb_info = dev_get_drvdata(fbdev);
41674 struct dlfb_data *dev = fb_info->par;
41675 return snprintf(buf, PAGE_SIZE, "%u\n",
41676- atomic_read(&dev->bytes_identical));
41677+ atomic_read_unchecked(&dev->bytes_identical));
41678 }
41679
41680 static ssize_t metrics_bytes_sent_show(struct device *fbdev,
41681@@ -1384,7 +1384,7 @@ static ssize_t metrics_bytes_sent_show(struct device *fbdev,
41682 struct fb_info *fb_info = dev_get_drvdata(fbdev);
41683 struct dlfb_data *dev = fb_info->par;
41684 return snprintf(buf, PAGE_SIZE, "%u\n",
41685- atomic_read(&dev->bytes_sent));
41686+ atomic_read_unchecked(&dev->bytes_sent));
41687 }
41688
41689 static ssize_t metrics_cpu_kcycles_used_show(struct device *fbdev,
41690@@ -1392,7 +1392,7 @@ static ssize_t metrics_cpu_kcycles_used_show(struct device *fbdev,
41691 struct fb_info *fb_info = dev_get_drvdata(fbdev);
41692 struct dlfb_data *dev = fb_info->par;
41693 return snprintf(buf, PAGE_SIZE, "%u\n",
41694- atomic_read(&dev->cpu_kcycles_used));
41695+ atomic_read_unchecked(&dev->cpu_kcycles_used));
41696 }
41697
41698 static ssize_t edid_show(
41699@@ -1449,10 +1449,10 @@ static ssize_t metrics_reset_store(struct device *fbdev,
41700 struct fb_info *fb_info = dev_get_drvdata(fbdev);
41701 struct dlfb_data *dev = fb_info->par;
41702
41703- atomic_set(&dev->bytes_rendered, 0);
41704- atomic_set(&dev->bytes_identical, 0);
41705- atomic_set(&dev->bytes_sent, 0);
41706- atomic_set(&dev->cpu_kcycles_used, 0);
41707+ atomic_set_unchecked(&dev->bytes_rendered, 0);
41708+ atomic_set_unchecked(&dev->bytes_identical, 0);
41709+ atomic_set_unchecked(&dev->bytes_sent, 0);
41710+ atomic_set_unchecked(&dev->cpu_kcycles_used, 0);
41711
41712 return count;
41713 }
41714diff --git a/drivers/video/uvesafb.c b/drivers/video/uvesafb.c
41715index 7f8472c..9842e87 100644
41716--- a/drivers/video/uvesafb.c
41717+++ b/drivers/video/uvesafb.c
41718@@ -19,6 +19,7 @@
41719 #include <linux/io.h>
41720 #include <linux/mutex.h>
41721 #include <linux/slab.h>
41722+#include <linux/moduleloader.h>
41723 #include <video/edid.h>
41724 #include <video/uvesafb.h>
41725 #ifdef CONFIG_X86
41726@@ -121,7 +122,7 @@ static int uvesafb_helper_start(void)
41727 NULL,
41728 };
41729
41730- return call_usermodehelper(v86d_path, argv, envp, 1);
41731+ return call_usermodehelper(v86d_path, argv, envp, UMH_WAIT_PROC);
41732 }
41733
41734 /*
41735@@ -569,10 +570,32 @@ static int __devinit uvesafb_vbe_getpmi(struct uvesafb_ktask *task,
41736 if ((task->t.regs.eax & 0xffff) != 0x4f || task->t.regs.es < 0xc000) {
41737 par->pmi_setpal = par->ypan = 0;
41738 } else {
41739+
41740+#ifdef CONFIG_PAX_KERNEXEC
41741+#ifdef CONFIG_MODULES
41742+ par->pmi_code = module_alloc_exec((u16)task->t.regs.ecx);
41743+#endif
41744+ if (!par->pmi_code) {
41745+ par->pmi_setpal = par->ypan = 0;
41746+ return 0;
41747+ }
41748+#endif
41749+
41750 par->pmi_base = (u16 *)phys_to_virt(((u32)task->t.regs.es << 4)
41751 + task->t.regs.edi);
41752+
41753+#if defined(CONFIG_MODULES) && defined(CONFIG_PAX_KERNEXEC)
41754+ pax_open_kernel();
41755+ memcpy(par->pmi_code, par->pmi_base, (u16)task->t.regs.ecx);
41756+ pax_close_kernel();
41757+
41758+ par->pmi_start = ktva_ktla(par->pmi_code + par->pmi_base[1]);
41759+ par->pmi_pal = ktva_ktla(par->pmi_code + par->pmi_base[2]);
41760+#else
41761 par->pmi_start = (u8 *)par->pmi_base + par->pmi_base[1];
41762 par->pmi_pal = (u8 *)par->pmi_base + par->pmi_base[2];
41763+#endif
41764+
41765 printk(KERN_INFO "uvesafb: protected mode interface info at "
41766 "%04x:%04x\n",
41767 (u16)task->t.regs.es, (u16)task->t.regs.edi);
41768@@ -1821,6 +1844,11 @@ out:
41769 if (par->vbe_modes)
41770 kfree(par->vbe_modes);
41771
41772+#if defined(CONFIG_MODULES) && defined(CONFIG_PAX_KERNEXEC)
41773+ if (par->pmi_code)
41774+ module_free_exec(NULL, par->pmi_code);
41775+#endif
41776+
41777 framebuffer_release(info);
41778 return err;
41779 }
41780@@ -1847,6 +1875,12 @@ static int uvesafb_remove(struct platform_device *dev)
41781 kfree(par->vbe_state_orig);
41782 if (par->vbe_state_saved)
41783 kfree(par->vbe_state_saved);
41784+
41785+#if defined(CONFIG_MODULES) && defined(CONFIG_PAX_KERNEXEC)
41786+ if (par->pmi_code)
41787+ module_free_exec(NULL, par->pmi_code);
41788+#endif
41789+
41790 }
41791
41792 framebuffer_release(info);
41793diff --git a/drivers/video/vesafb.c b/drivers/video/vesafb.c
41794index 501b340..86bd4cf 100644
41795--- a/drivers/video/vesafb.c
41796+++ b/drivers/video/vesafb.c
41797@@ -9,6 +9,7 @@
41798 */
41799
41800 #include <linux/module.h>
41801+#include <linux/moduleloader.h>
41802 #include <linux/kernel.h>
41803 #include <linux/errno.h>
41804 #include <linux/string.h>
41805@@ -52,8 +53,8 @@ static int vram_remap __initdata; /* Set amount of memory to be used */
41806 static int vram_total __initdata; /* Set total amount of memory */
41807 static int pmi_setpal __read_mostly = 1; /* pmi for palette changes ??? */
41808 static int ypan __read_mostly; /* 0..nothing, 1..ypan, 2..ywrap */
41809-static void (*pmi_start)(void) __read_mostly;
41810-static void (*pmi_pal) (void) __read_mostly;
41811+static void (*pmi_start)(void) __read_only;
41812+static void (*pmi_pal) (void) __read_only;
41813 static int depth __read_mostly;
41814 static int vga_compat __read_mostly;
41815 /* --------------------------------------------------------------------- */
41816@@ -233,6 +234,7 @@ static int __init vesafb_probe(struct platform_device *dev)
41817 unsigned int size_vmode;
41818 unsigned int size_remap;
41819 unsigned int size_total;
41820+ void *pmi_code = NULL;
41821
41822 if (screen_info.orig_video_isVGA != VIDEO_TYPE_VLFB)
41823 return -ENODEV;
41824@@ -275,10 +277,6 @@ static int __init vesafb_probe(struct platform_device *dev)
41825 size_remap = size_total;
41826 vesafb_fix.smem_len = size_remap;
41827
41828-#ifndef __i386__
41829- screen_info.vesapm_seg = 0;
41830-#endif
41831-
41832 if (!request_mem_region(vesafb_fix.smem_start, size_total, "vesafb")) {
41833 printk(KERN_WARNING
41834 "vesafb: cannot reserve video memory at 0x%lx\n",
41835@@ -307,9 +305,21 @@ static int __init vesafb_probe(struct platform_device *dev)
41836 printk(KERN_INFO "vesafb: mode is %dx%dx%d, linelength=%d, pages=%d\n",
41837 vesafb_defined.xres, vesafb_defined.yres, vesafb_defined.bits_per_pixel, vesafb_fix.line_length, screen_info.pages);
41838
41839+#ifdef __i386__
41840+
41841+#if defined(CONFIG_MODULES) && defined(CONFIG_PAX_KERNEXEC)
41842+ pmi_code = module_alloc_exec(screen_info.vesapm_size);
41843+ if (!pmi_code)
41844+#elif !defined(CONFIG_PAX_KERNEXEC)
41845+ if (0)
41846+#endif
41847+
41848+#endif
41849+ screen_info.vesapm_seg = 0;
41850+
41851 if (screen_info.vesapm_seg) {
41852- printk(KERN_INFO "vesafb: protected mode interface info at %04x:%04x\n",
41853- screen_info.vesapm_seg,screen_info.vesapm_off);
41854+ printk(KERN_INFO "vesafb: protected mode interface info at %04x:%04x %04x bytes\n",
41855+ screen_info.vesapm_seg,screen_info.vesapm_off,screen_info.vesapm_size);
41856 }
41857
41858 if (screen_info.vesapm_seg < 0xc000)
41859@@ -317,9 +327,25 @@ static int __init vesafb_probe(struct platform_device *dev)
41860
41861 if (ypan || pmi_setpal) {
41862 unsigned short *pmi_base;
41863+
41864 pmi_base = (unsigned short*)phys_to_virt(((unsigned long)screen_info.vesapm_seg << 4) + screen_info.vesapm_off);
41865- pmi_start = (void*)((char*)pmi_base + pmi_base[1]);
41866- pmi_pal = (void*)((char*)pmi_base + pmi_base[2]);
41867+
41868+#if defined(CONFIG_MODULES) && defined(CONFIG_PAX_KERNEXEC)
41869+ pax_open_kernel();
41870+ memcpy(pmi_code, pmi_base, screen_info.vesapm_size);
41871+#else
41872+ pmi_code = pmi_base;
41873+#endif
41874+
41875+ pmi_start = (void*)((char*)pmi_code + pmi_base[1]);
41876+ pmi_pal = (void*)((char*)pmi_code + pmi_base[2]);
41877+
41878+#if defined(CONFIG_MODULES) && defined(CONFIG_PAX_KERNEXEC)
41879+ pmi_start = ktva_ktla(pmi_start);
41880+ pmi_pal = ktva_ktla(pmi_pal);
41881+ pax_close_kernel();
41882+#endif
41883+
41884 printk(KERN_INFO "vesafb: pmi: set display start = %p, set palette = %p\n",pmi_start,pmi_pal);
41885 if (pmi_base[3]) {
41886 printk(KERN_INFO "vesafb: pmi: ports = ");
41887@@ -488,6 +514,11 @@ static int __init vesafb_probe(struct platform_device *dev)
41888 info->node, info->fix.id);
41889 return 0;
41890 err:
41891+
41892+#if defined(__i386__) && defined(CONFIG_MODULES) && defined(CONFIG_PAX_KERNEXEC)
41893+ module_free_exec(NULL, pmi_code);
41894+#endif
41895+
41896 if (info->screen_base)
41897 iounmap(info->screen_base);
41898 framebuffer_release(info);
41899diff --git a/drivers/video/via/via_clock.h b/drivers/video/via/via_clock.h
41900index 88714ae..16c2e11 100644
41901--- a/drivers/video/via/via_clock.h
41902+++ b/drivers/video/via/via_clock.h
41903@@ -56,7 +56,7 @@ struct via_clock {
41904
41905 void (*set_engine_pll_state)(u8 state);
41906 void (*set_engine_pll)(struct via_pll_config config);
41907-};
41908+} __no_const;
41909
41910
41911 static inline u32 get_pll_internal_frequency(u32 ref_freq,
41912diff --git a/drivers/xen/xen-pciback/conf_space.h b/drivers/xen/xen-pciback/conf_space.h
41913index e56c934..fc22f4b 100644
41914--- a/drivers/xen/xen-pciback/conf_space.h
41915+++ b/drivers/xen/xen-pciback/conf_space.h
41916@@ -44,15 +44,15 @@ struct config_field {
41917 struct {
41918 conf_dword_write write;
41919 conf_dword_read read;
41920- } dw;
41921+ } __no_const dw;
41922 struct {
41923 conf_word_write write;
41924 conf_word_read read;
41925- } w;
41926+ } __no_const w;
41927 struct {
41928 conf_byte_write write;
41929 conf_byte_read read;
41930- } b;
41931+ } __no_const b;
41932 } u;
41933 struct list_head list;
41934 };
41935diff --git a/fs/9p/vfs_inode.c b/fs/9p/vfs_inode.c
41936index 879ed88..bc03a01 100644
41937--- a/fs/9p/vfs_inode.c
41938+++ b/fs/9p/vfs_inode.c
41939@@ -1286,7 +1286,7 @@ static void *v9fs_vfs_follow_link(struct dentry *dentry, struct nameidata *nd)
41940 void
41941 v9fs_vfs_put_link(struct dentry *dentry, struct nameidata *nd, void *p)
41942 {
41943- char *s = nd_get_link(nd);
41944+ const char *s = nd_get_link(nd);
41945
41946 P9_DPRINTK(P9_DEBUG_VFS, " %s %s\n", dentry->d_name.name,
41947 IS_ERR(s) ? "<error>" : s);
41948diff --git a/fs/Kconfig.binfmt b/fs/Kconfig.binfmt
41949index 79e2ca7..5828ad1 100644
41950--- a/fs/Kconfig.binfmt
41951+++ b/fs/Kconfig.binfmt
41952@@ -86,7 +86,7 @@ config HAVE_AOUT
41953
41954 config BINFMT_AOUT
41955 tristate "Kernel support for a.out and ECOFF binaries"
41956- depends on HAVE_AOUT
41957+ depends on HAVE_AOUT && BROKEN
41958 ---help---
41959 A.out (Assembler.OUTput) is a set of formats for libraries and
41960 executables used in the earliest versions of UNIX. Linux used
41961diff --git a/fs/aio.c b/fs/aio.c
41962index b9d64d8..86cb1d5 100644
41963--- a/fs/aio.c
41964+++ b/fs/aio.c
41965@@ -119,7 +119,7 @@ static int aio_setup_ring(struct kioctx *ctx)
41966 size += sizeof(struct io_event) * nr_events;
41967 nr_pages = (size + PAGE_SIZE-1) >> PAGE_SHIFT;
41968
41969- if (nr_pages < 0)
41970+ if (nr_pages <= 0)
41971 return -EINVAL;
41972
41973 nr_events = (PAGE_SIZE * nr_pages - sizeof(struct aio_ring)) / sizeof(struct io_event);
41974@@ -1461,22 +1461,27 @@ static ssize_t aio_fsync(struct kiocb *iocb)
41975 static ssize_t aio_setup_vectored_rw(int type, struct kiocb *kiocb, bool compat)
41976 {
41977 ssize_t ret;
41978+ struct iovec iovstack;
41979
41980 #ifdef CONFIG_COMPAT
41981 if (compat)
41982 ret = compat_rw_copy_check_uvector(type,
41983 (struct compat_iovec __user *)kiocb->ki_buf,
41984- kiocb->ki_nbytes, 1, &kiocb->ki_inline_vec,
41985+ kiocb->ki_nbytes, 1, &iovstack,
41986 &kiocb->ki_iovec, 1);
41987 else
41988 #endif
41989 ret = rw_copy_check_uvector(type,
41990 (struct iovec __user *)kiocb->ki_buf,
41991- kiocb->ki_nbytes, 1, &kiocb->ki_inline_vec,
41992+ kiocb->ki_nbytes, 1, &iovstack,
41993 &kiocb->ki_iovec, 1);
41994 if (ret < 0)
41995 goto out;
41996
41997+ if (kiocb->ki_iovec == &iovstack) {
41998+ kiocb->ki_inline_vec = iovstack;
41999+ kiocb->ki_iovec = &kiocb->ki_inline_vec;
42000+ }
42001 kiocb->ki_nr_segs = kiocb->ki_nbytes;
42002 kiocb->ki_cur_seg = 0;
42003 /* ki_nbytes/left now reflect bytes instead of segs */
42004diff --git a/fs/attr.c b/fs/attr.c
42005index 7ee7ba4..0c61a60 100644
42006--- a/fs/attr.c
42007+++ b/fs/attr.c
42008@@ -99,6 +99,7 @@ int inode_newsize_ok(const struct inode *inode, loff_t offset)
42009 unsigned long limit;
42010
42011 limit = rlimit(RLIMIT_FSIZE);
42012+ gr_learn_resource(current, RLIMIT_FSIZE, (unsigned long)offset, 1);
42013 if (limit != RLIM_INFINITY && offset > limit)
42014 goto out_sig;
42015 if (offset > inode->i_sb->s_maxbytes)
42016diff --git a/fs/autofs4/waitq.c b/fs/autofs4/waitq.c
42017index 6861f61..a25f010 100644
42018--- a/fs/autofs4/waitq.c
42019+++ b/fs/autofs4/waitq.c
42020@@ -60,7 +60,7 @@ static int autofs4_write(struct file *file, const void *addr, int bytes)
42021 {
42022 unsigned long sigpipe, flags;
42023 mm_segment_t fs;
42024- const char *data = (const char *)addr;
42025+ const char __user *data = (const char __force_user *)addr;
42026 ssize_t wr = 0;
42027
42028 /** WARNING: this is not safe for writing more than PIPE_BUF bytes! **/
42029diff --git a/fs/befs/linuxvfs.c b/fs/befs/linuxvfs.c
42030index 8342ca6..82fd192 100644
42031--- a/fs/befs/linuxvfs.c
42032+++ b/fs/befs/linuxvfs.c
42033@@ -503,7 +503,7 @@ static void befs_put_link(struct dentry *dentry, struct nameidata *nd, void *p)
42034 {
42035 befs_inode_info *befs_ino = BEFS_I(dentry->d_inode);
42036 if (befs_ino->i_flags & BEFS_LONG_SYMLINK) {
42037- char *link = nd_get_link(nd);
42038+ const char *link = nd_get_link(nd);
42039 if (!IS_ERR(link))
42040 kfree(link);
42041 }
42042diff --git a/fs/binfmt_aout.c b/fs/binfmt_aout.c
42043index a6395bd..f1e376a 100644
42044--- a/fs/binfmt_aout.c
42045+++ b/fs/binfmt_aout.c
42046@@ -16,6 +16,7 @@
42047 #include <linux/string.h>
42048 #include <linux/fs.h>
42049 #include <linux/file.h>
42050+#include <linux/security.h>
42051 #include <linux/stat.h>
42052 #include <linux/fcntl.h>
42053 #include <linux/ptrace.h>
42054@@ -86,6 +87,8 @@ static int aout_core_dump(struct coredump_params *cprm)
42055 #endif
42056 # define START_STACK(u) ((void __user *)u.start_stack)
42057
42058+ memset(&dump, 0, sizeof(dump));
42059+
42060 fs = get_fs();
42061 set_fs(KERNEL_DS);
42062 has_dumped = 1;
42063@@ -97,10 +100,12 @@ static int aout_core_dump(struct coredump_params *cprm)
42064
42065 /* If the size of the dump file exceeds the rlimit, then see what would happen
42066 if we wrote the stack, but not the data area. */
42067+ gr_learn_resource(current, RLIMIT_CORE, (dump.u_dsize + dump.u_ssize+1) * PAGE_SIZE, 1);
42068 if ((dump.u_dsize + dump.u_ssize+1) * PAGE_SIZE > cprm->limit)
42069 dump.u_dsize = 0;
42070
42071 /* Make sure we have enough room to write the stack and data areas. */
42072+ gr_learn_resource(current, RLIMIT_CORE, (dump.u_ssize + 1) * PAGE_SIZE, 1);
42073 if ((dump.u_ssize + 1) * PAGE_SIZE > cprm->limit)
42074 dump.u_ssize = 0;
42075
42076@@ -234,6 +239,8 @@ static int load_aout_binary(struct linux_binprm * bprm, struct pt_regs * regs)
42077 rlim = rlimit(RLIMIT_DATA);
42078 if (rlim >= RLIM_INFINITY)
42079 rlim = ~0;
42080+
42081+ gr_learn_resource(current, RLIMIT_DATA, ex.a_data + ex.a_bss, 1);
42082 if (ex.a_data + ex.a_bss > rlim)
42083 return -ENOMEM;
42084
42085@@ -259,9 +266,37 @@ static int load_aout_binary(struct linux_binprm * bprm, struct pt_regs * regs)
42086 current->mm->free_area_cache = current->mm->mmap_base;
42087 current->mm->cached_hole_size = 0;
42088
42089+ retval = setup_arg_pages(bprm, STACK_TOP, EXSTACK_DEFAULT);
42090+ if (retval < 0) {
42091+ /* Someone check-me: is this error path enough? */
42092+ send_sig(SIGKILL, current, 0);
42093+ return retval;
42094+ }
42095+
42096 install_exec_creds(bprm);
42097 current->flags &= ~PF_FORKNOEXEC;
42098
42099+#if defined(CONFIG_PAX_NOEXEC) || defined(CONFIG_PAX_ASLR)
42100+ current->mm->pax_flags = 0UL;
42101+#endif
42102+
42103+#ifdef CONFIG_PAX_PAGEEXEC
42104+ if (!(N_FLAGS(ex) & F_PAX_PAGEEXEC)) {
42105+ current->mm->pax_flags |= MF_PAX_PAGEEXEC;
42106+
42107+#ifdef CONFIG_PAX_EMUTRAMP
42108+ if (N_FLAGS(ex) & F_PAX_EMUTRAMP)
42109+ current->mm->pax_flags |= MF_PAX_EMUTRAMP;
42110+#endif
42111+
42112+#ifdef CONFIG_PAX_MPROTECT
42113+ if (!(N_FLAGS(ex) & F_PAX_MPROTECT))
42114+ current->mm->pax_flags |= MF_PAX_MPROTECT;
42115+#endif
42116+
42117+ }
42118+#endif
42119+
42120 if (N_MAGIC(ex) == OMAGIC) {
42121 unsigned long text_addr, map_size;
42122 loff_t pos;
42123@@ -334,7 +369,7 @@ static int load_aout_binary(struct linux_binprm * bprm, struct pt_regs * regs)
42124
42125 down_write(&current->mm->mmap_sem);
42126 error = do_mmap(bprm->file, N_DATADDR(ex), ex.a_data,
42127- PROT_READ | PROT_WRITE | PROT_EXEC,
42128+ PROT_READ | PROT_WRITE,
42129 MAP_FIXED | MAP_PRIVATE | MAP_DENYWRITE | MAP_EXECUTABLE,
42130 fd_offset + ex.a_text);
42131 up_write(&current->mm->mmap_sem);
42132@@ -352,13 +387,6 @@ beyond_if:
42133 return retval;
42134 }
42135
42136- retval = setup_arg_pages(bprm, STACK_TOP, EXSTACK_DEFAULT);
42137- if (retval < 0) {
42138- /* Someone check-me: is this error path enough? */
42139- send_sig(SIGKILL, current, 0);
42140- return retval;
42141- }
42142-
42143 current->mm->start_stack =
42144 (unsigned long) create_aout_tables((char __user *) bprm->p, bprm);
42145 #ifdef __alpha__
42146diff --git a/fs/binfmt_elf.c b/fs/binfmt_elf.c
42147index 6ff96c6..b5fb43a 100644
42148--- a/fs/binfmt_elf.c
42149+++ b/fs/binfmt_elf.c
42150@@ -32,6 +32,7 @@
42151 #include <linux/elf.h>
42152 #include <linux/utsname.h>
42153 #include <linux/coredump.h>
42154+#include <linux/xattr.h>
42155 #include <asm/uaccess.h>
42156 #include <asm/param.h>
42157 #include <asm/page.h>
42158@@ -51,6 +52,10 @@ static int elf_core_dump(struct coredump_params *cprm);
42159 #define elf_core_dump NULL
42160 #endif
42161
42162+#ifdef CONFIG_PAX_MPROTECT
42163+static void elf_handle_mprotect(struct vm_area_struct *vma, unsigned long newflags);
42164+#endif
42165+
42166 #if ELF_EXEC_PAGESIZE > PAGE_SIZE
42167 #define ELF_MIN_ALIGN ELF_EXEC_PAGESIZE
42168 #else
42169@@ -70,6 +75,11 @@ static struct linux_binfmt elf_format = {
42170 .load_binary = load_elf_binary,
42171 .load_shlib = load_elf_library,
42172 .core_dump = elf_core_dump,
42173+
42174+#ifdef CONFIG_PAX_MPROTECT
42175+ .handle_mprotect= elf_handle_mprotect,
42176+#endif
42177+
42178 .min_coredump = ELF_EXEC_PAGESIZE,
42179 };
42180
42181@@ -77,6 +87,8 @@ static struct linux_binfmt elf_format = {
42182
42183 static int set_brk(unsigned long start, unsigned long end)
42184 {
42185+ unsigned long e = end;
42186+
42187 start = ELF_PAGEALIGN(start);
42188 end = ELF_PAGEALIGN(end);
42189 if (end > start) {
42190@@ -87,7 +99,7 @@ static int set_brk(unsigned long start, unsigned long end)
42191 if (BAD_ADDR(addr))
42192 return addr;
42193 }
42194- current->mm->start_brk = current->mm->brk = end;
42195+ current->mm->start_brk = current->mm->brk = e;
42196 return 0;
42197 }
42198
42199@@ -148,12 +160,13 @@ create_elf_tables(struct linux_binprm *bprm, struct elfhdr *exec,
42200 elf_addr_t __user *u_rand_bytes;
42201 const char *k_platform = ELF_PLATFORM;
42202 const char *k_base_platform = ELF_BASE_PLATFORM;
42203- unsigned char k_rand_bytes[16];
42204+ u32 k_rand_bytes[4];
42205 int items;
42206 elf_addr_t *elf_info;
42207 int ei_index = 0;
42208 const struct cred *cred = current_cred();
42209 struct vm_area_struct *vma;
42210+ unsigned long saved_auxv[AT_VECTOR_SIZE];
42211
42212 /*
42213 * In some cases (e.g. Hyper-Threading), we want to avoid L1
42214@@ -195,8 +208,12 @@ create_elf_tables(struct linux_binprm *bprm, struct elfhdr *exec,
42215 * Generate 16 random bytes for userspace PRNG seeding.
42216 */
42217 get_random_bytes(k_rand_bytes, sizeof(k_rand_bytes));
42218- u_rand_bytes = (elf_addr_t __user *)
42219- STACK_ALLOC(p, sizeof(k_rand_bytes));
42220+ srandom32(k_rand_bytes[0] ^ random32());
42221+ srandom32(k_rand_bytes[1] ^ random32());
42222+ srandom32(k_rand_bytes[2] ^ random32());
42223+ srandom32(k_rand_bytes[3] ^ random32());
42224+ p = STACK_ROUND(p, sizeof(k_rand_bytes));
42225+ u_rand_bytes = (elf_addr_t __user *) p;
42226 if (__copy_to_user(u_rand_bytes, k_rand_bytes, sizeof(k_rand_bytes)))
42227 return -EFAULT;
42228
42229@@ -308,9 +325,11 @@ create_elf_tables(struct linux_binprm *bprm, struct elfhdr *exec,
42230 return -EFAULT;
42231 current->mm->env_end = p;
42232
42233+ memcpy(saved_auxv, elf_info, ei_index * sizeof(elf_addr_t));
42234+
42235 /* Put the elf_info on the stack in the right place. */
42236 sp = (elf_addr_t __user *)envp + 1;
42237- if (copy_to_user(sp, elf_info, ei_index * sizeof(elf_addr_t)))
42238+ if (copy_to_user(sp, saved_auxv, ei_index * sizeof(elf_addr_t)))
42239 return -EFAULT;
42240 return 0;
42241 }
42242@@ -381,10 +400,10 @@ static unsigned long load_elf_interp(struct elfhdr *interp_elf_ex,
42243 {
42244 struct elf_phdr *elf_phdata;
42245 struct elf_phdr *eppnt;
42246- unsigned long load_addr = 0;
42247+ unsigned long load_addr = 0, pax_task_size = TASK_SIZE;
42248 int load_addr_set = 0;
42249 unsigned long last_bss = 0, elf_bss = 0;
42250- unsigned long error = ~0UL;
42251+ unsigned long error = -EINVAL;
42252 unsigned long total_size;
42253 int retval, i, size;
42254
42255@@ -430,6 +449,11 @@ static unsigned long load_elf_interp(struct elfhdr *interp_elf_ex,
42256 goto out_close;
42257 }
42258
42259+#ifdef CONFIG_PAX_SEGMEXEC
42260+ if (current->mm->pax_flags & MF_PAX_SEGMEXEC)
42261+ pax_task_size = SEGMEXEC_TASK_SIZE;
42262+#endif
42263+
42264 eppnt = elf_phdata;
42265 for (i = 0; i < interp_elf_ex->e_phnum; i++, eppnt++) {
42266 if (eppnt->p_type == PT_LOAD) {
42267@@ -473,8 +497,8 @@ static unsigned long load_elf_interp(struct elfhdr *interp_elf_ex,
42268 k = load_addr + eppnt->p_vaddr;
42269 if (BAD_ADDR(k) ||
42270 eppnt->p_filesz > eppnt->p_memsz ||
42271- eppnt->p_memsz > TASK_SIZE ||
42272- TASK_SIZE - eppnt->p_memsz < k) {
42273+ eppnt->p_memsz > pax_task_size ||
42274+ pax_task_size - eppnt->p_memsz < k) {
42275 error = -ENOMEM;
42276 goto out_close;
42277 }
42278@@ -528,6 +552,351 @@ out:
42279 return error;
42280 }
42281
42282+#if defined(CONFIG_PAX_EI_PAX) || defined(CONFIG_PAX_PT_PAX_FLAGS) || defined(CONFIG_PAX_XATTR_PAX_FLAGS)
42283+static unsigned long pax_parse_pt_pax_softmode(const struct elf_phdr * const elf_phdata)
42284+{
42285+ unsigned long pax_flags = 0UL;
42286+
42287+#ifdef CONFIG_PAX_PT_PAX_FLAGS
42288+
42289+#ifdef CONFIG_PAX_PAGEEXEC
42290+ if (elf_phdata->p_flags & PF_PAGEEXEC)
42291+ pax_flags |= MF_PAX_PAGEEXEC;
42292+#endif
42293+
42294+#ifdef CONFIG_PAX_SEGMEXEC
42295+ if (elf_phdata->p_flags & PF_SEGMEXEC)
42296+ pax_flags |= MF_PAX_SEGMEXEC;
42297+#endif
42298+
42299+#if defined(CONFIG_PAX_PAGEEXEC) && defined(CONFIG_PAX_SEGMEXEC)
42300+ if ((pax_flags & (MF_PAX_PAGEEXEC | MF_PAX_SEGMEXEC)) == (MF_PAX_PAGEEXEC | MF_PAX_SEGMEXEC)) {
42301+ if ((__supported_pte_mask & _PAGE_NX))
42302+ pax_flags &= ~MF_PAX_SEGMEXEC;
42303+ else
42304+ pax_flags &= ~MF_PAX_PAGEEXEC;
42305+ }
42306+#endif
42307+
42308+#ifdef CONFIG_PAX_EMUTRAMP
42309+ if (elf_phdata->p_flags & PF_EMUTRAMP)
42310+ pax_flags |= MF_PAX_EMUTRAMP;
42311+#endif
42312+
42313+#ifdef CONFIG_PAX_MPROTECT
42314+ if (elf_phdata->p_flags & PF_MPROTECT)
42315+ pax_flags |= MF_PAX_MPROTECT;
42316+#endif
42317+
42318+#if defined(CONFIG_PAX_RANDMMAP) || defined(CONFIG_PAX_RANDUSTACK)
42319+ if (randomize_va_space && (elf_phdata->p_flags & PF_RANDMMAP))
42320+ pax_flags |= MF_PAX_RANDMMAP;
42321+#endif
42322+
42323+#endif
42324+
42325+ return pax_flags;
42326+}
42327+
42328+static unsigned long pax_parse_pt_pax_hardmode(const struct elf_phdr * const elf_phdata)
42329+{
42330+ unsigned long pax_flags = 0UL;
42331+
42332+#ifdef CONFIG_PAX_PT_PAX_FLAGS
42333+
42334+#ifdef CONFIG_PAX_PAGEEXEC
42335+ if (!(elf_phdata->p_flags & PF_NOPAGEEXEC))
42336+ pax_flags |= MF_PAX_PAGEEXEC;
42337+#endif
42338+
42339+#ifdef CONFIG_PAX_SEGMEXEC
42340+ if (!(elf_phdata->p_flags & PF_NOSEGMEXEC))
42341+ pax_flags |= MF_PAX_SEGMEXEC;
42342+#endif
42343+
42344+#if defined(CONFIG_PAX_PAGEEXEC) && defined(CONFIG_PAX_SEGMEXEC)
42345+ if ((pax_flags & (MF_PAX_PAGEEXEC | MF_PAX_SEGMEXEC)) == (MF_PAX_PAGEEXEC | MF_PAX_SEGMEXEC)) {
42346+ if ((__supported_pte_mask & _PAGE_NX))
42347+ pax_flags &= ~MF_PAX_SEGMEXEC;
42348+ else
42349+ pax_flags &= ~MF_PAX_PAGEEXEC;
42350+ }
42351+#endif
42352+
42353+#ifdef CONFIG_PAX_EMUTRAMP
42354+ if (!(elf_phdata->p_flags & PF_NOEMUTRAMP))
42355+ pax_flags |= MF_PAX_EMUTRAMP;
42356+#endif
42357+
42358+#ifdef CONFIG_PAX_MPROTECT
42359+ if (!(elf_phdata->p_flags & PF_NOMPROTECT))
42360+ pax_flags |= MF_PAX_MPROTECT;
42361+#endif
42362+
42363+#if defined(CONFIG_PAX_RANDMMAP) || defined(CONFIG_PAX_RANDUSTACK)
42364+ if (randomize_va_space && !(elf_phdata->p_flags & PF_NORANDMMAP))
42365+ pax_flags |= MF_PAX_RANDMMAP;
42366+#endif
42367+
42368+#endif
42369+
42370+ return pax_flags;
42371+}
42372+
42373+static unsigned long pax_parse_ei_pax(const struct elfhdr * const elf_ex)
42374+{
42375+ unsigned long pax_flags = 0UL;
42376+
42377+#ifdef CONFIG_PAX_EI_PAX
42378+
42379+#ifdef CONFIG_PAX_PAGEEXEC
42380+ if (!(elf_ex->e_ident[EI_PAX] & EF_PAX_PAGEEXEC))
42381+ pax_flags |= MF_PAX_PAGEEXEC;
42382+#endif
42383+
42384+#ifdef CONFIG_PAX_SEGMEXEC
42385+ if (!(elf_ex->e_ident[EI_PAX] & EF_PAX_SEGMEXEC))
42386+ pax_flags |= MF_PAX_SEGMEXEC;
42387+#endif
42388+
42389+#if defined(CONFIG_PAX_PAGEEXEC) && defined(CONFIG_PAX_SEGMEXEC)
42390+ if ((pax_flags & (MF_PAX_PAGEEXEC | MF_PAX_SEGMEXEC)) == (MF_PAX_PAGEEXEC | MF_PAX_SEGMEXEC)) {
42391+ if ((__supported_pte_mask & _PAGE_NX))
42392+ pax_flags &= ~MF_PAX_SEGMEXEC;
42393+ else
42394+ pax_flags &= ~MF_PAX_PAGEEXEC;
42395+ }
42396+#endif
42397+
42398+#ifdef CONFIG_PAX_EMUTRAMP
42399+ if ((pax_flags & (MF_PAX_PAGEEXEC | MF_PAX_SEGMEXEC)) && (elf_ex->e_ident[EI_PAX] & EF_PAX_EMUTRAMP))
42400+ pax_flags |= MF_PAX_EMUTRAMP;
42401+#endif
42402+
42403+#ifdef CONFIG_PAX_MPROTECT
42404+ if ((pax_flags & (MF_PAX_PAGEEXEC | MF_PAX_SEGMEXEC)) && !(elf_ex->e_ident[EI_PAX] & EF_PAX_MPROTECT))
42405+ pax_flags |= MF_PAX_MPROTECT;
42406+#endif
42407+
42408+#ifdef CONFIG_PAX_ASLR
42409+ if (randomize_va_space && !(elf_ex->e_ident[EI_PAX] & EF_PAX_RANDMMAP))
42410+ pax_flags |= MF_PAX_RANDMMAP;
42411+#endif
42412+
42413+#else
42414+
42415+#ifdef CONFIG_PAX_PAGEEXEC
42416+ pax_flags |= MF_PAX_PAGEEXEC;
42417+#endif
42418+
42419+#ifdef CONFIG_PAX_MPROTECT
42420+ pax_flags |= MF_PAX_MPROTECT;
42421+#endif
42422+
42423+#ifdef CONFIG_PAX_RANDMMAP
42424+ pax_flags |= MF_PAX_RANDMMAP;
42425+#endif
42426+
42427+#ifdef CONFIG_PAX_SEGMEXEC
42428+ if (!(pax_flags & MF_PAX_PAGEEXEC) || !(__supported_pte_mask & _PAGE_NX)) {
42429+ pax_flags &= ~MF_PAX_PAGEEXEC;
42430+ pax_flags |= MF_PAX_SEGMEXEC;
42431+ }
42432+#endif
42433+
42434+#endif
42435+
42436+ return pax_flags;
42437+}
42438+
42439+static unsigned long pax_parse_pt_pax(const struct elfhdr * const elf_ex, const struct elf_phdr * const elf_phdata)
42440+{
42441+
42442+#ifdef CONFIG_PAX_PT_PAX_FLAGS
42443+ unsigned long i;
42444+
42445+ for (i = 0UL; i < elf_ex->e_phnum; i++)
42446+ if (elf_phdata[i].p_type == PT_PAX_FLAGS) {
42447+ if (((elf_phdata[i].p_flags & PF_PAGEEXEC) && (elf_phdata[i].p_flags & PF_NOPAGEEXEC)) ||
42448+ ((elf_phdata[i].p_flags & PF_SEGMEXEC) && (elf_phdata[i].p_flags & PF_NOSEGMEXEC)) ||
42449+ ((elf_phdata[i].p_flags & PF_EMUTRAMP) && (elf_phdata[i].p_flags & PF_NOEMUTRAMP)) ||
42450+ ((elf_phdata[i].p_flags & PF_MPROTECT) && (elf_phdata[i].p_flags & PF_NOMPROTECT)) ||
42451+ ((elf_phdata[i].p_flags & PF_RANDMMAP) && (elf_phdata[i].p_flags & PF_NORANDMMAP)))
42452+ return ~0UL;
42453+
42454+#ifdef CONFIG_PAX_SOFTMODE
42455+ if (pax_softmode)
42456+ return pax_parse_pt_pax_softmode(&elf_phdata[i]);
42457+ else
42458+#endif
42459+
42460+ return pax_parse_pt_pax_hardmode(&elf_phdata[i]);
42461+ break;
42462+ }
42463+#endif
42464+
42465+ return ~0UL;
42466+}
42467+
42468+#ifdef CONFIG_PAX_XATTR_PAX_FLAGS
42469+static unsigned long pax_parse_xattr_pax_softmode(unsigned long pax_flags_softmode)
42470+{
42471+ unsigned long pax_flags = 0UL;
42472+
42473+#ifdef CONFIG_PAX_PAGEEXEC
42474+ if (pax_flags_softmode & MF_PAX_PAGEEXEC)
42475+ pax_flags |= MF_PAX_PAGEEXEC;
42476+#endif
42477+
42478+#ifdef CONFIG_PAX_SEGMEXEC
42479+ if (pax_flags_softmode & MF_PAX_SEGMEXEC)
42480+ pax_flags |= MF_PAX_SEGMEXEC;
42481+#endif
42482+
42483+#if defined(CONFIG_PAX_PAGEEXEC) && defined(CONFIG_PAX_SEGMEXEC)
42484+ if ((pax_flags & (MF_PAX_PAGEEXEC | MF_PAX_SEGMEXEC)) == (MF_PAX_PAGEEXEC | MF_PAX_SEGMEXEC)) {
42485+ if ((__supported_pte_mask & _PAGE_NX))
42486+ pax_flags &= ~MF_PAX_SEGMEXEC;
42487+ else
42488+ pax_flags &= ~MF_PAX_PAGEEXEC;
42489+ }
42490+#endif
42491+
42492+#ifdef CONFIG_PAX_EMUTRAMP
42493+ if (pax_flags_softmode & MF_PAX_EMUTRAMP)
42494+ pax_flags |= MF_PAX_EMUTRAMP;
42495+#endif
42496+
42497+#ifdef CONFIG_PAX_MPROTECT
42498+ if (pax_flags_softmode & MF_PAX_MPROTECT)
42499+ pax_flags |= MF_PAX_MPROTECT;
42500+#endif
42501+
42502+#if defined(CONFIG_PAX_RANDMMAP) || defined(CONFIG_PAX_RANDUSTACK)
42503+ if (randomize_va_space && (pax_flags_softmode & MF_PAX_RANDMMAP))
42504+ pax_flags |= MF_PAX_RANDMMAP;
42505+#endif
42506+
42507+ return pax_flags;
42508+}
42509+
42510+static unsigned long pax_parse_xattr_pax_hardmode(unsigned long pax_flags_hardmode)
42511+{
42512+ unsigned long pax_flags = 0UL;
42513+
42514+#ifdef CONFIG_PAX_PAGEEXEC
42515+ if (!(pax_flags_hardmode & MF_PAX_PAGEEXEC))
42516+ pax_flags |= MF_PAX_PAGEEXEC;
42517+#endif
42518+
42519+#ifdef CONFIG_PAX_SEGMEXEC
42520+ if (!(pax_flags_hardmode & MF_PAX_SEGMEXEC))
42521+ pax_flags |= MF_PAX_SEGMEXEC;
42522+#endif
42523+
42524+#if defined(CONFIG_PAX_PAGEEXEC) && defined(CONFIG_PAX_SEGMEXEC)
42525+ if ((pax_flags & (MF_PAX_PAGEEXEC | MF_PAX_SEGMEXEC)) == (MF_PAX_PAGEEXEC | MF_PAX_SEGMEXEC)) {
42526+ if ((__supported_pte_mask & _PAGE_NX))
42527+ pax_flags &= ~MF_PAX_SEGMEXEC;
42528+ else
42529+ pax_flags &= ~MF_PAX_PAGEEXEC;
42530+ }
42531+#endif
42532+
42533+#ifdef CONFIG_PAX_EMUTRAMP
42534+ if (!(pax_flags_hardmode & MF_PAX_EMUTRAMP))
42535+ pax_flags |= MF_PAX_EMUTRAMP;
42536+#endif
42537+
42538+#ifdef CONFIG_PAX_MPROTECT
42539+ if (!(pax_flags_hardmode & MF_PAX_MPROTECT))
42540+ pax_flags |= MF_PAX_MPROTECT;
42541+#endif
42542+
42543+#if defined(CONFIG_PAX_RANDMMAP) || defined(CONFIG_PAX_RANDUSTACK)
42544+ if (randomize_va_space && !(pax_flags_hardmode & MF_PAX_RANDMMAP))
42545+ pax_flags |= MF_PAX_RANDMMAP;
42546+#endif
42547+
42548+ return pax_flags;
42549+}
42550+#endif
42551+
42552+static unsigned long pax_parse_xattr_pax(struct file * const file)
42553+{
42554+
42555+#ifdef CONFIG_PAX_XATTR_PAX_FLAGS
42556+ ssize_t xattr_size, i;
42557+ unsigned char xattr_value[5];
42558+ unsigned long pax_flags_hardmode = 0UL, pax_flags_softmode = 0UL;
42559+
42560+ xattr_size = vfs_getxattr(file->f_path.dentry, XATTR_NAME_PAX_FLAGS, xattr_value, sizeof xattr_value);
42561+ if (xattr_size <= 0)
42562+ return ~0UL;
42563+
42564+ for (i = 0; i < xattr_size; i++)
42565+ switch (xattr_value[i]) {
42566+ default:
42567+ return ~0UL;
42568+
42569+#define parse_flag(option1, option2, flag) \
42570+ case option1: \
42571+ pax_flags_hardmode |= MF_PAX_##flag; \
42572+ break; \
42573+ case option2: \
42574+ pax_flags_softmode |= MF_PAX_##flag; \
42575+ break;
42576+
42577+ parse_flag('p', 'P', PAGEEXEC);
42578+ parse_flag('e', 'E', EMUTRAMP);
42579+ parse_flag('m', 'M', MPROTECT);
42580+ parse_flag('r', 'R', RANDMMAP);
42581+ parse_flag('s', 'S', SEGMEXEC);
42582+
42583+#undef parse_flag
42584+ }
42585+
42586+ if (pax_flags_hardmode & pax_flags_softmode)
42587+ return ~0UL;
42588+
42589+#ifdef CONFIG_PAX_SOFTMODE
42590+ if (pax_softmode)
42591+ return pax_parse_xattr_pax_softmode(pax_flags_softmode);
42592+ else
42593+#endif
42594+
42595+ return pax_parse_xattr_pax_hardmode(pax_flags_hardmode);
42596+#else
42597+ return ~0UL;
42598+#endif
42599+
42600+}
42601+
42602+static long pax_parse_pax_flags(const struct elfhdr * const elf_ex, const struct elf_phdr * const elf_phdata, struct file * const file)
42603+{
42604+ unsigned long pax_flags, pt_pax_flags, xattr_pax_flags;
42605+
42606+ pax_flags = pax_parse_ei_pax(elf_ex);
42607+ pt_pax_flags = pax_parse_pt_pax(elf_ex, elf_phdata);
42608+ xattr_pax_flags = pax_parse_xattr_pax(file);
42609+
42610+ if (pt_pax_flags == ~0UL)
42611+ pt_pax_flags = xattr_pax_flags;
42612+ else if (xattr_pax_flags == ~0UL)
42613+ xattr_pax_flags = pt_pax_flags;
42614+ if (pt_pax_flags != xattr_pax_flags)
42615+ return -EINVAL;
42616+ if (pt_pax_flags != ~0UL)
42617+ pax_flags = pt_pax_flags;
42618+
42619+ if (0 > pax_check_flags(&pax_flags))
42620+ return -EINVAL;
42621+
42622+ current->mm->pax_flags = pax_flags;
42623+ return 0;
42624+}
42625+#endif
42626+
42627 /*
42628 * These are the functions used to load ELF style executables and shared
42629 * libraries. There is no binary dependent code anywhere else.
42630@@ -544,6 +913,11 @@ static unsigned long randomize_stack_top(unsigned long stack_top)
42631 {
42632 unsigned int random_variable = 0;
42633
42634+#ifdef CONFIG_PAX_RANDUSTACK
42635+ if (randomize_va_space)
42636+ return stack_top - current->mm->delta_stack;
42637+#endif
42638+
42639 if ((current->flags & PF_RANDOMIZE) &&
42640 !(current->personality & ADDR_NO_RANDOMIZE)) {
42641 random_variable = get_random_int() & STACK_RND_MASK;
42642@@ -562,7 +936,7 @@ static int load_elf_binary(struct linux_binprm *bprm, struct pt_regs *regs)
42643 unsigned long load_addr = 0, load_bias = 0;
42644 int load_addr_set = 0;
42645 char * elf_interpreter = NULL;
42646- unsigned long error;
42647+ unsigned long error = 0;
42648 struct elf_phdr *elf_ppnt, *elf_phdata;
42649 unsigned long elf_bss, elf_brk;
42650 int retval, i;
42651@@ -572,11 +946,11 @@ static int load_elf_binary(struct linux_binprm *bprm, struct pt_regs *regs)
42652 unsigned long start_code, end_code, start_data, end_data;
42653 unsigned long reloc_func_desc __maybe_unused = 0;
42654 int executable_stack = EXSTACK_DEFAULT;
42655- unsigned long def_flags = 0;
42656 struct {
42657 struct elfhdr elf_ex;
42658 struct elfhdr interp_elf_ex;
42659 } *loc;
42660+ unsigned long pax_task_size = TASK_SIZE;
42661
42662 loc = kmalloc(sizeof(*loc), GFP_KERNEL);
42663 if (!loc) {
42664@@ -713,11 +1087,81 @@ static int load_elf_binary(struct linux_binprm *bprm, struct pt_regs *regs)
42665
42666 /* OK, This is the point of no return */
42667 current->flags &= ~PF_FORKNOEXEC;
42668- current->mm->def_flags = def_flags;
42669+
42670+#if defined(CONFIG_PAX_NOEXEC) || defined(CONFIG_PAX_ASLR)
42671+ current->mm->pax_flags = 0UL;
42672+#endif
42673+
42674+#ifdef CONFIG_PAX_DLRESOLVE
42675+ current->mm->call_dl_resolve = 0UL;
42676+#endif
42677+
42678+#if defined(CONFIG_PPC32) && defined(CONFIG_PAX_EMUSIGRT)
42679+ current->mm->call_syscall = 0UL;
42680+#endif
42681+
42682+#ifdef CONFIG_PAX_ASLR
42683+ current->mm->delta_mmap = 0UL;
42684+ current->mm->delta_stack = 0UL;
42685+#endif
42686+
42687+ current->mm->def_flags = 0;
42688+
42689+#if defined(CONFIG_PAX_EI_PAX) || defined(CONFIG_PAX_PT_PAX_FLAGS) || defined(CONFIG_PAX_XATTR_PAX_FLAGS)
42690+ if (0 > pax_parse_pax_flags(&loc->elf_ex, elf_phdata, bprm->file)) {
42691+ send_sig(SIGKILL, current, 0);
42692+ goto out_free_dentry;
42693+ }
42694+#endif
42695+
42696+#ifdef CONFIG_PAX_HAVE_ACL_FLAGS
42697+ pax_set_initial_flags(bprm);
42698+#elif defined(CONFIG_PAX_HOOK_ACL_FLAGS)
42699+ if (pax_set_initial_flags_func)
42700+ (pax_set_initial_flags_func)(bprm);
42701+#endif
42702+
42703+#ifdef CONFIG_ARCH_TRACK_EXEC_LIMIT
42704+ if ((current->mm->pax_flags & MF_PAX_PAGEEXEC) && !(__supported_pte_mask & _PAGE_NX)) {
42705+ current->mm->context.user_cs_limit = PAGE_SIZE;
42706+ current->mm->def_flags |= VM_PAGEEXEC;
42707+ }
42708+#endif
42709+
42710+#ifdef CONFIG_PAX_SEGMEXEC
42711+ if (current->mm->pax_flags & MF_PAX_SEGMEXEC) {
42712+ current->mm->context.user_cs_base = SEGMEXEC_TASK_SIZE;
42713+ current->mm->context.user_cs_limit = TASK_SIZE-SEGMEXEC_TASK_SIZE;
42714+ pax_task_size = SEGMEXEC_TASK_SIZE;
42715+ current->mm->def_flags |= VM_NOHUGEPAGE;
42716+ }
42717+#endif
42718+
42719+#if defined(CONFIG_ARCH_TRACK_EXEC_LIMIT) || defined(CONFIG_PAX_SEGMEXEC)
42720+ if (current->mm->pax_flags & (MF_PAX_PAGEEXEC | MF_PAX_SEGMEXEC)) {
42721+ set_user_cs(current->mm->context.user_cs_base, current->mm->context.user_cs_limit, get_cpu());
42722+ put_cpu();
42723+ }
42724+#endif
42725
42726 /* Do this immediately, since STACK_TOP as used in setup_arg_pages
42727 may depend on the personality. */
42728 SET_PERSONALITY(loc->elf_ex);
42729+
42730+#ifdef CONFIG_PAX_ASLR
42731+ if (current->mm->pax_flags & MF_PAX_RANDMMAP) {
42732+ current->mm->delta_mmap = (pax_get_random_long() & ((1UL << PAX_DELTA_MMAP_LEN)-1)) << PAGE_SHIFT;
42733+ current->mm->delta_stack = (pax_get_random_long() & ((1UL << PAX_DELTA_STACK_LEN)-1)) << PAGE_SHIFT;
42734+ }
42735+#endif
42736+
42737+#if defined(CONFIG_PAX_PAGEEXEC) || defined(CONFIG_PAX_SEGMEXEC)
42738+ if (current->mm->pax_flags & (MF_PAX_PAGEEXEC | MF_PAX_SEGMEXEC)) {
42739+ executable_stack = EXSTACK_DISABLE_X;
42740+ current->personality &= ~READ_IMPLIES_EXEC;
42741+ } else
42742+#endif
42743+
42744 if (elf_read_implies_exec(loc->elf_ex, executable_stack))
42745 current->personality |= READ_IMPLIES_EXEC;
42746
42747@@ -808,6 +1252,20 @@ static int load_elf_binary(struct linux_binprm *bprm, struct pt_regs *regs)
42748 #else
42749 load_bias = ELF_PAGESTART(ELF_ET_DYN_BASE - vaddr);
42750 #endif
42751+
42752+#ifdef CONFIG_PAX_RANDMMAP
42753+ /* PaX: randomize base address at the default exe base if requested */
42754+ if ((current->mm->pax_flags & MF_PAX_RANDMMAP) && elf_interpreter) {
42755+#ifdef CONFIG_SPARC64
42756+ load_bias = (pax_get_random_long() & ((1UL << PAX_DELTA_MMAP_LEN) - 1)) << (PAGE_SHIFT+1);
42757+#else
42758+ load_bias = (pax_get_random_long() & ((1UL << PAX_DELTA_MMAP_LEN) - 1)) << PAGE_SHIFT;
42759+#endif
42760+ load_bias = ELF_PAGESTART(PAX_ELF_ET_DYN_BASE - vaddr + load_bias);
42761+ elf_flags |= MAP_FIXED;
42762+ }
42763+#endif
42764+
42765 }
42766
42767 error = elf_map(bprm->file, load_bias + vaddr, elf_ppnt,
42768@@ -840,9 +1298,9 @@ static int load_elf_binary(struct linux_binprm *bprm, struct pt_regs *regs)
42769 * allowed task size. Note that p_filesz must always be
42770 * <= p_memsz so it is only necessary to check p_memsz.
42771 */
42772- if (BAD_ADDR(k) || elf_ppnt->p_filesz > elf_ppnt->p_memsz ||
42773- elf_ppnt->p_memsz > TASK_SIZE ||
42774- TASK_SIZE - elf_ppnt->p_memsz < k) {
42775+ if (k >= pax_task_size || elf_ppnt->p_filesz > elf_ppnt->p_memsz ||
42776+ elf_ppnt->p_memsz > pax_task_size ||
42777+ pax_task_size - elf_ppnt->p_memsz < k) {
42778 /* set_brk can never work. Avoid overflows. */
42779 send_sig(SIGKILL, current, 0);
42780 retval = -EINVAL;
42781@@ -870,6 +1328,11 @@ static int load_elf_binary(struct linux_binprm *bprm, struct pt_regs *regs)
42782 start_data += load_bias;
42783 end_data += load_bias;
42784
42785+#ifdef CONFIG_PAX_RANDMMAP
42786+ if (current->mm->pax_flags & MF_PAX_RANDMMAP)
42787+ elf_brk += PAGE_SIZE + ((pax_get_random_long() & ((1UL << 22) - 1UL)) << 4);
42788+#endif
42789+
42790 /* Calling set_brk effectively mmaps the pages that we need
42791 * for the bss and break sections. We must do this before
42792 * mapping in the interpreter, to make sure it doesn't wind
42793@@ -881,9 +1344,11 @@ static int load_elf_binary(struct linux_binprm *bprm, struct pt_regs *regs)
42794 goto out_free_dentry;
42795 }
42796 if (likely(elf_bss != elf_brk) && unlikely(padzero(elf_bss))) {
42797- send_sig(SIGSEGV, current, 0);
42798- retval = -EFAULT; /* Nobody gets to see this, but.. */
42799- goto out_free_dentry;
42800+ /*
42801+ * This bss-zeroing can fail if the ELF
42802+ * file specifies odd protections. So
42803+ * we don't check the return value
42804+ */
42805 }
42806
42807 if (elf_interpreter) {
42808@@ -1098,7 +1563,7 @@ out:
42809 * Decide what to dump of a segment, part, all or none.
42810 */
42811 static unsigned long vma_dump_size(struct vm_area_struct *vma,
42812- unsigned long mm_flags)
42813+ unsigned long mm_flags, long signr)
42814 {
42815 #define FILTER(type) (mm_flags & (1UL << MMF_DUMP_##type))
42816
42817@@ -1132,7 +1597,7 @@ static unsigned long vma_dump_size(struct vm_area_struct *vma,
42818 if (vma->vm_file == NULL)
42819 return 0;
42820
42821- if (FILTER(MAPPED_PRIVATE))
42822+ if (signr == SIGKILL || FILTER(MAPPED_PRIVATE))
42823 goto whole;
42824
42825 /*
42826@@ -1354,9 +1819,9 @@ static void fill_auxv_note(struct memelfnote *note, struct mm_struct *mm)
42827 {
42828 elf_addr_t *auxv = (elf_addr_t *) mm->saved_auxv;
42829 int i = 0;
42830- do
42831+ do {
42832 i += 2;
42833- while (auxv[i - 2] != AT_NULL);
42834+ } while (auxv[i - 2] != AT_NULL);
42835 fill_note(note, "CORE", NT_AUXV, i * sizeof(elf_addr_t), auxv);
42836 }
42837
42838@@ -1862,14 +2327,14 @@ static void fill_extnum_info(struct elfhdr *elf, struct elf_shdr *shdr4extnum,
42839 }
42840
42841 static size_t elf_core_vma_data_size(struct vm_area_struct *gate_vma,
42842- unsigned long mm_flags)
42843+ struct coredump_params *cprm)
42844 {
42845 struct vm_area_struct *vma;
42846 size_t size = 0;
42847
42848 for (vma = first_vma(current, gate_vma); vma != NULL;
42849 vma = next_vma(vma, gate_vma))
42850- size += vma_dump_size(vma, mm_flags);
42851+ size += vma_dump_size(vma, cprm->mm_flags, cprm->signr);
42852 return size;
42853 }
42854
42855@@ -1963,7 +2428,7 @@ static int elf_core_dump(struct coredump_params *cprm)
42856
42857 dataoff = offset = roundup(offset, ELF_EXEC_PAGESIZE);
42858
42859- offset += elf_core_vma_data_size(gate_vma, cprm->mm_flags);
42860+ offset += elf_core_vma_data_size(gate_vma, cprm);
42861 offset += elf_core_extra_data_size();
42862 e_shoff = offset;
42863
42864@@ -1977,10 +2442,12 @@ static int elf_core_dump(struct coredump_params *cprm)
42865 offset = dataoff;
42866
42867 size += sizeof(*elf);
42868+ gr_learn_resource(current, RLIMIT_CORE, size, 1);
42869 if (size > cprm->limit || !dump_write(cprm->file, elf, sizeof(*elf)))
42870 goto end_coredump;
42871
42872 size += sizeof(*phdr4note);
42873+ gr_learn_resource(current, RLIMIT_CORE, size, 1);
42874 if (size > cprm->limit
42875 || !dump_write(cprm->file, phdr4note, sizeof(*phdr4note)))
42876 goto end_coredump;
42877@@ -1994,7 +2461,7 @@ static int elf_core_dump(struct coredump_params *cprm)
42878 phdr.p_offset = offset;
42879 phdr.p_vaddr = vma->vm_start;
42880 phdr.p_paddr = 0;
42881- phdr.p_filesz = vma_dump_size(vma, cprm->mm_flags);
42882+ phdr.p_filesz = vma_dump_size(vma, cprm->mm_flags, cprm->signr);
42883 phdr.p_memsz = vma->vm_end - vma->vm_start;
42884 offset += phdr.p_filesz;
42885 phdr.p_flags = vma->vm_flags & VM_READ ? PF_R : 0;
42886@@ -2005,6 +2472,7 @@ static int elf_core_dump(struct coredump_params *cprm)
42887 phdr.p_align = ELF_EXEC_PAGESIZE;
42888
42889 size += sizeof(phdr);
42890+ gr_learn_resource(current, RLIMIT_CORE, size, 1);
42891 if (size > cprm->limit
42892 || !dump_write(cprm->file, &phdr, sizeof(phdr)))
42893 goto end_coredump;
42894@@ -2029,7 +2497,7 @@ static int elf_core_dump(struct coredump_params *cprm)
42895 unsigned long addr;
42896 unsigned long end;
42897
42898- end = vma->vm_start + vma_dump_size(vma, cprm->mm_flags);
42899+ end = vma->vm_start + vma_dump_size(vma, cprm->mm_flags, cprm->signr);
42900
42901 for (addr = vma->vm_start; addr < end; addr += PAGE_SIZE) {
42902 struct page *page;
42903@@ -2038,6 +2506,7 @@ static int elf_core_dump(struct coredump_params *cprm)
42904 page = get_dump_page(addr);
42905 if (page) {
42906 void *kaddr = kmap(page);
42907+ gr_learn_resource(current, RLIMIT_CORE, size + PAGE_SIZE, 1);
42908 stop = ((size += PAGE_SIZE) > cprm->limit) ||
42909 !dump_write(cprm->file, kaddr,
42910 PAGE_SIZE);
42911@@ -2055,6 +2524,7 @@ static int elf_core_dump(struct coredump_params *cprm)
42912
42913 if (e_phnum == PN_XNUM) {
42914 size += sizeof(*shdr4extnum);
42915+ gr_learn_resource(current, RLIMIT_CORE, size, 1);
42916 if (size > cprm->limit
42917 || !dump_write(cprm->file, shdr4extnum,
42918 sizeof(*shdr4extnum)))
42919@@ -2075,6 +2545,97 @@ out:
42920
42921 #endif /* CONFIG_ELF_CORE */
42922
42923+#ifdef CONFIG_PAX_MPROTECT
42924+/* PaX: non-PIC ELF libraries need relocations on their executable segments
42925+ * therefore we'll grant them VM_MAYWRITE once during their life. Similarly
42926+ * we'll remove VM_MAYWRITE for good on RELRO segments.
42927+ *
42928+ * The checks favour ld-linux.so behaviour which operates on a per ELF segment
42929+ * basis because we want to allow the common case and not the special ones.
42930+ */
42931+static void elf_handle_mprotect(struct vm_area_struct *vma, unsigned long newflags)
42932+{
42933+ struct elfhdr elf_h;
42934+ struct elf_phdr elf_p;
42935+ unsigned long i;
42936+ unsigned long oldflags;
42937+ bool is_textrel_rw, is_textrel_rx, is_relro;
42938+
42939+ if (!(vma->vm_mm->pax_flags & MF_PAX_MPROTECT))
42940+ return;
42941+
42942+ oldflags = vma->vm_flags & (VM_MAYEXEC | VM_MAYWRITE | VM_MAYREAD | VM_EXEC | VM_WRITE | VM_READ);
42943+ newflags &= VM_MAYEXEC | VM_MAYWRITE | VM_MAYREAD | VM_EXEC | VM_WRITE | VM_READ;
42944+
42945+#ifdef CONFIG_PAX_ELFRELOCS
42946+ /* possible TEXTREL */
42947+ is_textrel_rw = vma->vm_file && !vma->anon_vma && oldflags == (VM_MAYEXEC | VM_MAYREAD | VM_EXEC | VM_READ) && newflags == (VM_WRITE | VM_READ);
42948+ 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);
42949+#else
42950+ is_textrel_rw = false;
42951+ is_textrel_rx = false;
42952+#endif
42953+
42954+ /* possible RELRO */
42955+ is_relro = vma->vm_file && vma->anon_vma && oldflags == (VM_MAYWRITE | VM_MAYREAD | VM_READ) && newflags == (VM_MAYWRITE | VM_MAYREAD | VM_READ);
42956+
42957+ if (!is_textrel_rw && !is_textrel_rx && !is_relro)
42958+ return;
42959+
42960+ if (sizeof(elf_h) != kernel_read(vma->vm_file, 0UL, (char *)&elf_h, sizeof(elf_h)) ||
42961+ memcmp(elf_h.e_ident, ELFMAG, SELFMAG) ||
42962+
42963+#ifdef CONFIG_PAX_ETEXECRELOCS
42964+ ((is_textrel_rw || is_textrel_rx) && (elf_h.e_type != ET_DYN && elf_h.e_type != ET_EXEC)) ||
42965+#else
42966+ ((is_textrel_rw || is_textrel_rx) && elf_h.e_type != ET_DYN) ||
42967+#endif
42968+
42969+ (is_relro && (elf_h.e_type != ET_DYN && elf_h.e_type != ET_EXEC)) ||
42970+ !elf_check_arch(&elf_h) ||
42971+ elf_h.e_phentsize != sizeof(struct elf_phdr) ||
42972+ elf_h.e_phnum > 65536UL / sizeof(struct elf_phdr))
42973+ return;
42974+
42975+ for (i = 0UL; i < elf_h.e_phnum; i++) {
42976+ if (sizeof(elf_p) != kernel_read(vma->vm_file, elf_h.e_phoff + i*sizeof(elf_p), (char *)&elf_p, sizeof(elf_p)))
42977+ return;
42978+ switch (elf_p.p_type) {
42979+ case PT_DYNAMIC:
42980+ if (!is_textrel_rw && !is_textrel_rx)
42981+ continue;
42982+ i = 0UL;
42983+ while ((i+1) * sizeof(elf_dyn) <= elf_p.p_filesz) {
42984+ elf_dyn dyn;
42985+
42986+ if (sizeof(dyn) != kernel_read(vma->vm_file, elf_p.p_offset + i*sizeof(dyn), (char *)&dyn, sizeof(dyn)))
42987+ return;
42988+ if (dyn.d_tag == DT_NULL)
42989+ return;
42990+ if (dyn.d_tag == DT_TEXTREL || (dyn.d_tag == DT_FLAGS && (dyn.d_un.d_val & DF_TEXTREL))) {
42991+ gr_log_textrel(vma);
42992+ if (is_textrel_rw)
42993+ vma->vm_flags |= VM_MAYWRITE;
42994+ else
42995+ /* PaX: disallow write access after relocs are done, hopefully noone else needs it... */
42996+ vma->vm_flags &= ~VM_MAYWRITE;
42997+ return;
42998+ }
42999+ i++;
43000+ }
43001+ return;
43002+
43003+ case PT_GNU_RELRO:
43004+ if (!is_relro)
43005+ continue;
43006+ if ((elf_p.p_offset >> PAGE_SHIFT) == vma->vm_pgoff && ELF_PAGEALIGN(elf_p.p_memsz) == vma->vm_end - vma->vm_start)
43007+ vma->vm_flags &= ~VM_MAYWRITE;
43008+ return;
43009+ }
43010+ }
43011+}
43012+#endif
43013+
43014 static int __init init_elf_binfmt(void)
43015 {
43016 return register_binfmt(&elf_format);
43017diff --git a/fs/binfmt_flat.c b/fs/binfmt_flat.c
43018index 1bffbe0..c8c283e 100644
43019--- a/fs/binfmt_flat.c
43020+++ b/fs/binfmt_flat.c
43021@@ -567,7 +567,9 @@ static int load_flat_file(struct linux_binprm * bprm,
43022 realdatastart = (unsigned long) -ENOMEM;
43023 printk("Unable to allocate RAM for process data, errno %d\n",
43024 (int)-realdatastart);
43025+ down_write(&current->mm->mmap_sem);
43026 do_munmap(current->mm, textpos, text_len);
43027+ up_write(&current->mm->mmap_sem);
43028 ret = realdatastart;
43029 goto err;
43030 }
43031@@ -591,8 +593,10 @@ static int load_flat_file(struct linux_binprm * bprm,
43032 }
43033 if (IS_ERR_VALUE(result)) {
43034 printk("Unable to read data+bss, errno %d\n", (int)-result);
43035+ down_write(&current->mm->mmap_sem);
43036 do_munmap(current->mm, textpos, text_len);
43037 do_munmap(current->mm, realdatastart, len);
43038+ up_write(&current->mm->mmap_sem);
43039 ret = result;
43040 goto err;
43041 }
43042@@ -661,8 +665,10 @@ static int load_flat_file(struct linux_binprm * bprm,
43043 }
43044 if (IS_ERR_VALUE(result)) {
43045 printk("Unable to read code+data+bss, errno %d\n",(int)-result);
43046+ down_write(&current->mm->mmap_sem);
43047 do_munmap(current->mm, textpos, text_len + data_len + extra +
43048 MAX_SHARED_LIBS * sizeof(unsigned long));
43049+ up_write(&current->mm->mmap_sem);
43050 ret = result;
43051 goto err;
43052 }
43053diff --git a/fs/bio.c b/fs/bio.c
43054index b1fe82c..84da0a9 100644
43055--- a/fs/bio.c
43056+++ b/fs/bio.c
43057@@ -1233,7 +1233,7 @@ static void bio_copy_kern_endio(struct bio *bio, int err)
43058 const int read = bio_data_dir(bio) == READ;
43059 struct bio_map_data *bmd = bio->bi_private;
43060 int i;
43061- char *p = bmd->sgvecs[0].iov_base;
43062+ char *p = (char __force_kernel *)bmd->sgvecs[0].iov_base;
43063
43064 __bio_for_each_segment(bvec, bio, i, 0) {
43065 char *addr = page_address(bvec->bv_page);
43066diff --git a/fs/block_dev.c b/fs/block_dev.c
43067index abe9b48..5df59e8 100644
43068--- a/fs/block_dev.c
43069+++ b/fs/block_dev.c
43070@@ -681,7 +681,7 @@ static bool bd_may_claim(struct block_device *bdev, struct block_device *whole,
43071 else if (bdev->bd_contains == bdev)
43072 return true; /* is a whole device which isn't held */
43073
43074- else if (whole->bd_holder == bd_may_claim)
43075+ else if (whole->bd_holder == (void *)bd_may_claim)
43076 return true; /* is a partition of a device that is being partitioned */
43077 else if (whole->bd_holder != NULL)
43078 return false; /* is a partition of a held device */
43079diff --git a/fs/btrfs/ctree.c b/fs/btrfs/ctree.c
43080index dede441..f2a2507 100644
43081--- a/fs/btrfs/ctree.c
43082+++ b/fs/btrfs/ctree.c
43083@@ -488,9 +488,12 @@ static noinline int __btrfs_cow_block(struct btrfs_trans_handle *trans,
43084 free_extent_buffer(buf);
43085 add_root_to_dirty_list(root);
43086 } else {
43087- if (root->root_key.objectid == BTRFS_TREE_RELOC_OBJECTID)
43088- parent_start = parent->start;
43089- else
43090+ if (root->root_key.objectid == BTRFS_TREE_RELOC_OBJECTID) {
43091+ if (parent)
43092+ parent_start = parent->start;
43093+ else
43094+ parent_start = 0;
43095+ } else
43096 parent_start = 0;
43097
43098 WARN_ON(trans->transid != btrfs_header_generation(parent));
43099diff --git a/fs/btrfs/inode.c b/fs/btrfs/inode.c
43100index fd1a06d..6e9033d 100644
43101--- a/fs/btrfs/inode.c
43102+++ b/fs/btrfs/inode.c
43103@@ -6895,7 +6895,7 @@ fail:
43104 return -ENOMEM;
43105 }
43106
43107-static int btrfs_getattr(struct vfsmount *mnt,
43108+int btrfs_getattr(struct vfsmount *mnt,
43109 struct dentry *dentry, struct kstat *stat)
43110 {
43111 struct inode *inode = dentry->d_inode;
43112@@ -6909,6 +6909,14 @@ static int btrfs_getattr(struct vfsmount *mnt,
43113 return 0;
43114 }
43115
43116+EXPORT_SYMBOL(btrfs_getattr);
43117+
43118+dev_t get_btrfs_dev_from_inode(struct inode *inode)
43119+{
43120+ return BTRFS_I(inode)->root->anon_dev;
43121+}
43122+EXPORT_SYMBOL(get_btrfs_dev_from_inode);
43123+
43124 /*
43125 * If a file is moved, it will inherit the cow and compression flags of the new
43126 * directory.
43127diff --git a/fs/btrfs/ioctl.c b/fs/btrfs/ioctl.c
43128index c04f02c..f5c9e2e 100644
43129--- a/fs/btrfs/ioctl.c
43130+++ b/fs/btrfs/ioctl.c
43131@@ -2733,9 +2733,12 @@ long btrfs_ioctl_space_info(struct btrfs_root *root, void __user *arg)
43132 for (i = 0; i < num_types; i++) {
43133 struct btrfs_space_info *tmp;
43134
43135+ /* Don't copy in more than we allocated */
43136 if (!slot_count)
43137 break;
43138
43139+ slot_count--;
43140+
43141 info = NULL;
43142 rcu_read_lock();
43143 list_for_each_entry_rcu(tmp, &root->fs_info->space_info,
43144@@ -2757,15 +2760,12 @@ long btrfs_ioctl_space_info(struct btrfs_root *root, void __user *arg)
43145 memcpy(dest, &space, sizeof(space));
43146 dest++;
43147 space_args.total_spaces++;
43148- slot_count--;
43149 }
43150- if (!slot_count)
43151- break;
43152 }
43153 up_read(&info->groups_sem);
43154 }
43155
43156- user_dest = (struct btrfs_ioctl_space_info *)
43157+ user_dest = (struct btrfs_ioctl_space_info __user *)
43158 (arg + sizeof(struct btrfs_ioctl_space_args));
43159
43160 if (copy_to_user(user_dest, dest_orig, alloc_size))
43161diff --git a/fs/btrfs/relocation.c b/fs/btrfs/relocation.c
43162index cfb5543..1ae7347 100644
43163--- a/fs/btrfs/relocation.c
43164+++ b/fs/btrfs/relocation.c
43165@@ -1244,7 +1244,7 @@ static int __update_reloc_root(struct btrfs_root *root, int del)
43166 }
43167 spin_unlock(&rc->reloc_root_tree.lock);
43168
43169- BUG_ON((struct btrfs_root *)node->data != root);
43170+ BUG_ON(!node || (struct btrfs_root *)node->data != root);
43171
43172 if (!del) {
43173 spin_lock(&rc->reloc_root_tree.lock);
43174diff --git a/fs/cachefiles/bind.c b/fs/cachefiles/bind.c
43175index 622f469..e8d2d55 100644
43176--- a/fs/cachefiles/bind.c
43177+++ b/fs/cachefiles/bind.c
43178@@ -39,13 +39,11 @@ int cachefiles_daemon_bind(struct cachefiles_cache *cache, char *args)
43179 args);
43180
43181 /* start by checking things over */
43182- ASSERT(cache->fstop_percent >= 0 &&
43183- cache->fstop_percent < cache->fcull_percent &&
43184+ ASSERT(cache->fstop_percent < cache->fcull_percent &&
43185 cache->fcull_percent < cache->frun_percent &&
43186 cache->frun_percent < 100);
43187
43188- ASSERT(cache->bstop_percent >= 0 &&
43189- cache->bstop_percent < cache->bcull_percent &&
43190+ ASSERT(cache->bstop_percent < cache->bcull_percent &&
43191 cache->bcull_percent < cache->brun_percent &&
43192 cache->brun_percent < 100);
43193
43194diff --git a/fs/cachefiles/daemon.c b/fs/cachefiles/daemon.c
43195index 0a1467b..6a53245 100644
43196--- a/fs/cachefiles/daemon.c
43197+++ b/fs/cachefiles/daemon.c
43198@@ -196,7 +196,7 @@ static ssize_t cachefiles_daemon_read(struct file *file, char __user *_buffer,
43199 if (n > buflen)
43200 return -EMSGSIZE;
43201
43202- if (copy_to_user(_buffer, buffer, n) != 0)
43203+ if (n > sizeof(buffer) || copy_to_user(_buffer, buffer, n) != 0)
43204 return -EFAULT;
43205
43206 return n;
43207@@ -222,7 +222,7 @@ static ssize_t cachefiles_daemon_write(struct file *file,
43208 if (test_bit(CACHEFILES_DEAD, &cache->flags))
43209 return -EIO;
43210
43211- if (datalen < 0 || datalen > PAGE_SIZE - 1)
43212+ if (datalen > PAGE_SIZE - 1)
43213 return -EOPNOTSUPP;
43214
43215 /* drag the command string into the kernel so we can parse it */
43216@@ -386,7 +386,7 @@ static int cachefiles_daemon_fstop(struct cachefiles_cache *cache, char *args)
43217 if (args[0] != '%' || args[1] != '\0')
43218 return -EINVAL;
43219
43220- if (fstop < 0 || fstop >= cache->fcull_percent)
43221+ if (fstop >= cache->fcull_percent)
43222 return cachefiles_daemon_range_error(cache, args);
43223
43224 cache->fstop_percent = fstop;
43225@@ -458,7 +458,7 @@ static int cachefiles_daemon_bstop(struct cachefiles_cache *cache, char *args)
43226 if (args[0] != '%' || args[1] != '\0')
43227 return -EINVAL;
43228
43229- if (bstop < 0 || bstop >= cache->bcull_percent)
43230+ if (bstop >= cache->bcull_percent)
43231 return cachefiles_daemon_range_error(cache, args);
43232
43233 cache->bstop_percent = bstop;
43234diff --git a/fs/cachefiles/internal.h b/fs/cachefiles/internal.h
43235index bd6bc1b..b627b53 100644
43236--- a/fs/cachefiles/internal.h
43237+++ b/fs/cachefiles/internal.h
43238@@ -57,7 +57,7 @@ struct cachefiles_cache {
43239 wait_queue_head_t daemon_pollwq; /* poll waitqueue for daemon */
43240 struct rb_root active_nodes; /* active nodes (can't be culled) */
43241 rwlock_t active_lock; /* lock for active_nodes */
43242- atomic_t gravecounter; /* graveyard uniquifier */
43243+ atomic_unchecked_t gravecounter; /* graveyard uniquifier */
43244 unsigned frun_percent; /* when to stop culling (% files) */
43245 unsigned fcull_percent; /* when to start culling (% files) */
43246 unsigned fstop_percent; /* when to stop allocating (% files) */
43247@@ -169,19 +169,19 @@ extern int cachefiles_check_in_use(struct cachefiles_cache *cache,
43248 * proc.c
43249 */
43250 #ifdef CONFIG_CACHEFILES_HISTOGRAM
43251-extern atomic_t cachefiles_lookup_histogram[HZ];
43252-extern atomic_t cachefiles_mkdir_histogram[HZ];
43253-extern atomic_t cachefiles_create_histogram[HZ];
43254+extern atomic_unchecked_t cachefiles_lookup_histogram[HZ];
43255+extern atomic_unchecked_t cachefiles_mkdir_histogram[HZ];
43256+extern atomic_unchecked_t cachefiles_create_histogram[HZ];
43257
43258 extern int __init cachefiles_proc_init(void);
43259 extern void cachefiles_proc_cleanup(void);
43260 static inline
43261-void cachefiles_hist(atomic_t histogram[], unsigned long start_jif)
43262+void cachefiles_hist(atomic_unchecked_t histogram[], unsigned long start_jif)
43263 {
43264 unsigned long jif = jiffies - start_jif;
43265 if (jif >= HZ)
43266 jif = HZ - 1;
43267- atomic_inc(&histogram[jif]);
43268+ atomic_inc_unchecked(&histogram[jif]);
43269 }
43270
43271 #else
43272diff --git a/fs/cachefiles/namei.c b/fs/cachefiles/namei.c
43273index a0358c2..d6137f2 100644
43274--- a/fs/cachefiles/namei.c
43275+++ b/fs/cachefiles/namei.c
43276@@ -318,7 +318,7 @@ try_again:
43277 /* first step is to make up a grave dentry in the graveyard */
43278 sprintf(nbuffer, "%08x%08x",
43279 (uint32_t) get_seconds(),
43280- (uint32_t) atomic_inc_return(&cache->gravecounter));
43281+ (uint32_t) atomic_inc_return_unchecked(&cache->gravecounter));
43282
43283 /* do the multiway lock magic */
43284 trap = lock_rename(cache->graveyard, dir);
43285diff --git a/fs/cachefiles/proc.c b/fs/cachefiles/proc.c
43286index eccd339..4c1d995 100644
43287--- a/fs/cachefiles/proc.c
43288+++ b/fs/cachefiles/proc.c
43289@@ -14,9 +14,9 @@
43290 #include <linux/seq_file.h>
43291 #include "internal.h"
43292
43293-atomic_t cachefiles_lookup_histogram[HZ];
43294-atomic_t cachefiles_mkdir_histogram[HZ];
43295-atomic_t cachefiles_create_histogram[HZ];
43296+atomic_unchecked_t cachefiles_lookup_histogram[HZ];
43297+atomic_unchecked_t cachefiles_mkdir_histogram[HZ];
43298+atomic_unchecked_t cachefiles_create_histogram[HZ];
43299
43300 /*
43301 * display the latency histogram
43302@@ -35,9 +35,9 @@ static int cachefiles_histogram_show(struct seq_file *m, void *v)
43303 return 0;
43304 default:
43305 index = (unsigned long) v - 3;
43306- x = atomic_read(&cachefiles_lookup_histogram[index]);
43307- y = atomic_read(&cachefiles_mkdir_histogram[index]);
43308- z = atomic_read(&cachefiles_create_histogram[index]);
43309+ x = atomic_read_unchecked(&cachefiles_lookup_histogram[index]);
43310+ y = atomic_read_unchecked(&cachefiles_mkdir_histogram[index]);
43311+ z = atomic_read_unchecked(&cachefiles_create_histogram[index]);
43312 if (x == 0 && y == 0 && z == 0)
43313 return 0;
43314
43315diff --git a/fs/cachefiles/rdwr.c b/fs/cachefiles/rdwr.c
43316index 0e3c092..818480e 100644
43317--- a/fs/cachefiles/rdwr.c
43318+++ b/fs/cachefiles/rdwr.c
43319@@ -945,7 +945,7 @@ int cachefiles_write_page(struct fscache_storage *op, struct page *page)
43320 old_fs = get_fs();
43321 set_fs(KERNEL_DS);
43322 ret = file->f_op->write(
43323- file, (const void __user *) data, len, &pos);
43324+ file, (const void __force_user *) data, len, &pos);
43325 set_fs(old_fs);
43326 kunmap(page);
43327 if (ret != len)
43328diff --git a/fs/ceph/dir.c b/fs/ceph/dir.c
43329index 9895400..78a67e7 100644
43330--- a/fs/ceph/dir.c
43331+++ b/fs/ceph/dir.c
43332@@ -244,7 +244,7 @@ static int ceph_readdir(struct file *filp, void *dirent, filldir_t filldir)
43333 struct ceph_fs_client *fsc = ceph_inode_to_client(inode);
43334 struct ceph_mds_client *mdsc = fsc->mdsc;
43335 unsigned frag = fpos_frag(filp->f_pos);
43336- int off = fpos_off(filp->f_pos);
43337+ unsigned int off = fpos_off(filp->f_pos);
43338 int err;
43339 u32 ftype;
43340 struct ceph_mds_reply_info_parsed *rinfo;
43341@@ -598,7 +598,7 @@ static struct dentry *ceph_lookup(struct inode *dir, struct dentry *dentry,
43342 if (nd &&
43343 (nd->flags & LOOKUP_OPEN) &&
43344 !(nd->intent.open.flags & O_CREAT)) {
43345- int mode = nd->intent.open.create_mode & ~current->fs->umask;
43346+ int mode = nd->intent.open.create_mode & ~current_umask();
43347 return ceph_lookup_open(dir, dentry, nd, mode, 1);
43348 }
43349
43350diff --git a/fs/cifs/asn1.c b/fs/cifs/asn1.c
43351index cfd1ce3..6b13a74 100644
43352--- a/fs/cifs/asn1.c
43353+++ b/fs/cifs/asn1.c
43354@@ -416,6 +416,9 @@ asn1_subid_decode(struct asn1_ctx *ctx, unsigned long *subid)
43355
43356 static int
43357 asn1_oid_decode(struct asn1_ctx *ctx,
43358+ unsigned char *eoc, unsigned long **oid, unsigned int *len) __size_overflow(2);
43359+static int
43360+asn1_oid_decode(struct asn1_ctx *ctx,
43361 unsigned char *eoc, unsigned long **oid, unsigned int *len)
43362 {
43363 unsigned long subid;
43364diff --git a/fs/cifs/cifs_debug.c b/fs/cifs/cifs_debug.c
43365index 84e8c07..6170d31 100644
43366--- a/fs/cifs/cifs_debug.c
43367+++ b/fs/cifs/cifs_debug.c
43368@@ -265,8 +265,8 @@ static ssize_t cifs_stats_proc_write(struct file *file,
43369
43370 if (c == '1' || c == 'y' || c == 'Y' || c == '0') {
43371 #ifdef CONFIG_CIFS_STATS2
43372- atomic_set(&totBufAllocCount, 0);
43373- atomic_set(&totSmBufAllocCount, 0);
43374+ atomic_set_unchecked(&totBufAllocCount, 0);
43375+ atomic_set_unchecked(&totSmBufAllocCount, 0);
43376 #endif /* CONFIG_CIFS_STATS2 */
43377 spin_lock(&cifs_tcp_ses_lock);
43378 list_for_each(tmp1, &cifs_tcp_ses_list) {
43379@@ -279,25 +279,25 @@ static ssize_t cifs_stats_proc_write(struct file *file,
43380 tcon = list_entry(tmp3,
43381 struct cifs_tcon,
43382 tcon_list);
43383- atomic_set(&tcon->num_smbs_sent, 0);
43384- atomic_set(&tcon->num_writes, 0);
43385- atomic_set(&tcon->num_reads, 0);
43386- atomic_set(&tcon->num_oplock_brks, 0);
43387- atomic_set(&tcon->num_opens, 0);
43388- atomic_set(&tcon->num_posixopens, 0);
43389- atomic_set(&tcon->num_posixmkdirs, 0);
43390- atomic_set(&tcon->num_closes, 0);
43391- atomic_set(&tcon->num_deletes, 0);
43392- atomic_set(&tcon->num_mkdirs, 0);
43393- atomic_set(&tcon->num_rmdirs, 0);
43394- atomic_set(&tcon->num_renames, 0);
43395- atomic_set(&tcon->num_t2renames, 0);
43396- atomic_set(&tcon->num_ffirst, 0);
43397- atomic_set(&tcon->num_fnext, 0);
43398- atomic_set(&tcon->num_fclose, 0);
43399- atomic_set(&tcon->num_hardlinks, 0);
43400- atomic_set(&tcon->num_symlinks, 0);
43401- atomic_set(&tcon->num_locks, 0);
43402+ atomic_set_unchecked(&tcon->num_smbs_sent, 0);
43403+ atomic_set_unchecked(&tcon->num_writes, 0);
43404+ atomic_set_unchecked(&tcon->num_reads, 0);
43405+ atomic_set_unchecked(&tcon->num_oplock_brks, 0);
43406+ atomic_set_unchecked(&tcon->num_opens, 0);
43407+ atomic_set_unchecked(&tcon->num_posixopens, 0);
43408+ atomic_set_unchecked(&tcon->num_posixmkdirs, 0);
43409+ atomic_set_unchecked(&tcon->num_closes, 0);
43410+ atomic_set_unchecked(&tcon->num_deletes, 0);
43411+ atomic_set_unchecked(&tcon->num_mkdirs, 0);
43412+ atomic_set_unchecked(&tcon->num_rmdirs, 0);
43413+ atomic_set_unchecked(&tcon->num_renames, 0);
43414+ atomic_set_unchecked(&tcon->num_t2renames, 0);
43415+ atomic_set_unchecked(&tcon->num_ffirst, 0);
43416+ atomic_set_unchecked(&tcon->num_fnext, 0);
43417+ atomic_set_unchecked(&tcon->num_fclose, 0);
43418+ atomic_set_unchecked(&tcon->num_hardlinks, 0);
43419+ atomic_set_unchecked(&tcon->num_symlinks, 0);
43420+ atomic_set_unchecked(&tcon->num_locks, 0);
43421 }
43422 }
43423 }
43424@@ -327,8 +327,8 @@ static int cifs_stats_proc_show(struct seq_file *m, void *v)
43425 smBufAllocCount.counter, cifs_min_small);
43426 #ifdef CONFIG_CIFS_STATS2
43427 seq_printf(m, "Total Large %d Small %d Allocations\n",
43428- atomic_read(&totBufAllocCount),
43429- atomic_read(&totSmBufAllocCount));
43430+ atomic_read_unchecked(&totBufAllocCount),
43431+ atomic_read_unchecked(&totSmBufAllocCount));
43432 #endif /* CONFIG_CIFS_STATS2 */
43433
43434 seq_printf(m, "Operations (MIDs): %d\n", atomic_read(&midCount));
43435@@ -357,41 +357,41 @@ static int cifs_stats_proc_show(struct seq_file *m, void *v)
43436 if (tcon->need_reconnect)
43437 seq_puts(m, "\tDISCONNECTED ");
43438 seq_printf(m, "\nSMBs: %d Oplock Breaks: %d",
43439- atomic_read(&tcon->num_smbs_sent),
43440- atomic_read(&tcon->num_oplock_brks));
43441+ atomic_read_unchecked(&tcon->num_smbs_sent),
43442+ atomic_read_unchecked(&tcon->num_oplock_brks));
43443 seq_printf(m, "\nReads: %d Bytes: %lld",
43444- atomic_read(&tcon->num_reads),
43445+ atomic_read_unchecked(&tcon->num_reads),
43446 (long long)(tcon->bytes_read));
43447 seq_printf(m, "\nWrites: %d Bytes: %lld",
43448- atomic_read(&tcon->num_writes),
43449+ atomic_read_unchecked(&tcon->num_writes),
43450 (long long)(tcon->bytes_written));
43451 seq_printf(m, "\nFlushes: %d",
43452- atomic_read(&tcon->num_flushes));
43453+ atomic_read_unchecked(&tcon->num_flushes));
43454 seq_printf(m, "\nLocks: %d HardLinks: %d "
43455 "Symlinks: %d",
43456- atomic_read(&tcon->num_locks),
43457- atomic_read(&tcon->num_hardlinks),
43458- atomic_read(&tcon->num_symlinks));
43459+ atomic_read_unchecked(&tcon->num_locks),
43460+ atomic_read_unchecked(&tcon->num_hardlinks),
43461+ atomic_read_unchecked(&tcon->num_symlinks));
43462 seq_printf(m, "\nOpens: %d Closes: %d "
43463 "Deletes: %d",
43464- atomic_read(&tcon->num_opens),
43465- atomic_read(&tcon->num_closes),
43466- atomic_read(&tcon->num_deletes));
43467+ atomic_read_unchecked(&tcon->num_opens),
43468+ atomic_read_unchecked(&tcon->num_closes),
43469+ atomic_read_unchecked(&tcon->num_deletes));
43470 seq_printf(m, "\nPosix Opens: %d "
43471 "Posix Mkdirs: %d",
43472- atomic_read(&tcon->num_posixopens),
43473- atomic_read(&tcon->num_posixmkdirs));
43474+ atomic_read_unchecked(&tcon->num_posixopens),
43475+ atomic_read_unchecked(&tcon->num_posixmkdirs));
43476 seq_printf(m, "\nMkdirs: %d Rmdirs: %d",
43477- atomic_read(&tcon->num_mkdirs),
43478- atomic_read(&tcon->num_rmdirs));
43479+ atomic_read_unchecked(&tcon->num_mkdirs),
43480+ atomic_read_unchecked(&tcon->num_rmdirs));
43481 seq_printf(m, "\nRenames: %d T2 Renames %d",
43482- atomic_read(&tcon->num_renames),
43483- atomic_read(&tcon->num_t2renames));
43484+ atomic_read_unchecked(&tcon->num_renames),
43485+ atomic_read_unchecked(&tcon->num_t2renames));
43486 seq_printf(m, "\nFindFirst: %d FNext %d "
43487 "FClose %d",
43488- atomic_read(&tcon->num_ffirst),
43489- atomic_read(&tcon->num_fnext),
43490- atomic_read(&tcon->num_fclose));
43491+ atomic_read_unchecked(&tcon->num_ffirst),
43492+ atomic_read_unchecked(&tcon->num_fnext),
43493+ atomic_read_unchecked(&tcon->num_fclose));
43494 }
43495 }
43496 }
43497diff --git a/fs/cifs/cifsfs.c b/fs/cifs/cifsfs.c
43498index 8f1fe32..38f9e27 100644
43499--- a/fs/cifs/cifsfs.c
43500+++ b/fs/cifs/cifsfs.c
43501@@ -989,7 +989,7 @@ cifs_init_request_bufs(void)
43502 cifs_req_cachep = kmem_cache_create("cifs_request",
43503 CIFSMaxBufSize +
43504 MAX_CIFS_HDR_SIZE, 0,
43505- SLAB_HWCACHE_ALIGN, NULL);
43506+ SLAB_HWCACHE_ALIGN | SLAB_USERCOPY, NULL);
43507 if (cifs_req_cachep == NULL)
43508 return -ENOMEM;
43509
43510@@ -1016,7 +1016,7 @@ cifs_init_request_bufs(void)
43511 efficient to alloc 1 per page off the slab compared to 17K (5page)
43512 alloc of large cifs buffers even when page debugging is on */
43513 cifs_sm_req_cachep = kmem_cache_create("cifs_small_rq",
43514- MAX_CIFS_SMALL_BUFFER_SIZE, 0, SLAB_HWCACHE_ALIGN,
43515+ MAX_CIFS_SMALL_BUFFER_SIZE, 0, SLAB_HWCACHE_ALIGN | SLAB_USERCOPY,
43516 NULL);
43517 if (cifs_sm_req_cachep == NULL) {
43518 mempool_destroy(cifs_req_poolp);
43519@@ -1101,8 +1101,8 @@ init_cifs(void)
43520 atomic_set(&bufAllocCount, 0);
43521 atomic_set(&smBufAllocCount, 0);
43522 #ifdef CONFIG_CIFS_STATS2
43523- atomic_set(&totBufAllocCount, 0);
43524- atomic_set(&totSmBufAllocCount, 0);
43525+ atomic_set_unchecked(&totBufAllocCount, 0);
43526+ atomic_set_unchecked(&totSmBufAllocCount, 0);
43527 #endif /* CONFIG_CIFS_STATS2 */
43528
43529 atomic_set(&midCount, 0);
43530diff --git a/fs/cifs/cifsglob.h b/fs/cifs/cifsglob.h
43531index 8238aa1..0347196 100644
43532--- a/fs/cifs/cifsglob.h
43533+++ b/fs/cifs/cifsglob.h
43534@@ -392,28 +392,28 @@ struct cifs_tcon {
43535 __u16 Flags; /* optional support bits */
43536 enum statusEnum tidStatus;
43537 #ifdef CONFIG_CIFS_STATS
43538- atomic_t num_smbs_sent;
43539- atomic_t num_writes;
43540- atomic_t num_reads;
43541- atomic_t num_flushes;
43542- atomic_t num_oplock_brks;
43543- atomic_t num_opens;
43544- atomic_t num_closes;
43545- atomic_t num_deletes;
43546- atomic_t num_mkdirs;
43547- atomic_t num_posixopens;
43548- atomic_t num_posixmkdirs;
43549- atomic_t num_rmdirs;
43550- atomic_t num_renames;
43551- atomic_t num_t2renames;
43552- atomic_t num_ffirst;
43553- atomic_t num_fnext;
43554- atomic_t num_fclose;
43555- atomic_t num_hardlinks;
43556- atomic_t num_symlinks;
43557- atomic_t num_locks;
43558- atomic_t num_acl_get;
43559- atomic_t num_acl_set;
43560+ atomic_unchecked_t num_smbs_sent;
43561+ atomic_unchecked_t num_writes;
43562+ atomic_unchecked_t num_reads;
43563+ atomic_unchecked_t num_flushes;
43564+ atomic_unchecked_t num_oplock_brks;
43565+ atomic_unchecked_t num_opens;
43566+ atomic_unchecked_t num_closes;
43567+ atomic_unchecked_t num_deletes;
43568+ atomic_unchecked_t num_mkdirs;
43569+ atomic_unchecked_t num_posixopens;
43570+ atomic_unchecked_t num_posixmkdirs;
43571+ atomic_unchecked_t num_rmdirs;
43572+ atomic_unchecked_t num_renames;
43573+ atomic_unchecked_t num_t2renames;
43574+ atomic_unchecked_t num_ffirst;
43575+ atomic_unchecked_t num_fnext;
43576+ atomic_unchecked_t num_fclose;
43577+ atomic_unchecked_t num_hardlinks;
43578+ atomic_unchecked_t num_symlinks;
43579+ atomic_unchecked_t num_locks;
43580+ atomic_unchecked_t num_acl_get;
43581+ atomic_unchecked_t num_acl_set;
43582 #ifdef CONFIG_CIFS_STATS2
43583 unsigned long long time_writes;
43584 unsigned long long time_reads;
43585@@ -628,7 +628,7 @@ convert_delimiter(char *path, char delim)
43586 }
43587
43588 #ifdef CONFIG_CIFS_STATS
43589-#define cifs_stats_inc atomic_inc
43590+#define cifs_stats_inc atomic_inc_unchecked
43591
43592 static inline void cifs_stats_bytes_written(struct cifs_tcon *tcon,
43593 unsigned int bytes)
43594@@ -985,8 +985,8 @@ GLOBAL_EXTERN atomic_t tconInfoReconnectCount;
43595 /* Various Debug counters */
43596 GLOBAL_EXTERN atomic_t bufAllocCount; /* current number allocated */
43597 #ifdef CONFIG_CIFS_STATS2
43598-GLOBAL_EXTERN atomic_t totBufAllocCount; /* total allocated over all time */
43599-GLOBAL_EXTERN atomic_t totSmBufAllocCount;
43600+GLOBAL_EXTERN atomic_unchecked_t totBufAllocCount; /* total allocated over all time */
43601+GLOBAL_EXTERN atomic_unchecked_t totSmBufAllocCount;
43602 #endif
43603 GLOBAL_EXTERN atomic_t smBufAllocCount;
43604 GLOBAL_EXTERN atomic_t midCount;
43605diff --git a/fs/cifs/link.c b/fs/cifs/link.c
43606index 6b0e064..94e6c3c 100644
43607--- a/fs/cifs/link.c
43608+++ b/fs/cifs/link.c
43609@@ -600,7 +600,7 @@ symlink_exit:
43610
43611 void cifs_put_link(struct dentry *direntry, struct nameidata *nd, void *cookie)
43612 {
43613- char *p = nd_get_link(nd);
43614+ const char *p = nd_get_link(nd);
43615 if (!IS_ERR(p))
43616 kfree(p);
43617 }
43618diff --git a/fs/cifs/misc.c b/fs/cifs/misc.c
43619index 703ef5c..2a44ed5 100644
43620--- a/fs/cifs/misc.c
43621+++ b/fs/cifs/misc.c
43622@@ -156,7 +156,7 @@ cifs_buf_get(void)
43623 memset(ret_buf, 0, sizeof(struct smb_hdr) + 3);
43624 atomic_inc(&bufAllocCount);
43625 #ifdef CONFIG_CIFS_STATS2
43626- atomic_inc(&totBufAllocCount);
43627+ atomic_inc_unchecked(&totBufAllocCount);
43628 #endif /* CONFIG_CIFS_STATS2 */
43629 }
43630
43631@@ -191,7 +191,7 @@ cifs_small_buf_get(void)
43632 /* memset(ret_buf, 0, sizeof(struct smb_hdr) + 27);*/
43633 atomic_inc(&smBufAllocCount);
43634 #ifdef CONFIG_CIFS_STATS2
43635- atomic_inc(&totSmBufAllocCount);
43636+ atomic_inc_unchecked(&totSmBufAllocCount);
43637 #endif /* CONFIG_CIFS_STATS2 */
43638
43639 }
43640diff --git a/fs/coda/cache.c b/fs/coda/cache.c
43641index 6901578..d402eb5 100644
43642--- a/fs/coda/cache.c
43643+++ b/fs/coda/cache.c
43644@@ -24,7 +24,7 @@
43645 #include "coda_linux.h"
43646 #include "coda_cache.h"
43647
43648-static atomic_t permission_epoch = ATOMIC_INIT(0);
43649+static atomic_unchecked_t permission_epoch = ATOMIC_INIT(0);
43650
43651 /* replace or extend an acl cache hit */
43652 void coda_cache_enter(struct inode *inode, int mask)
43653@@ -32,7 +32,7 @@ void coda_cache_enter(struct inode *inode, int mask)
43654 struct coda_inode_info *cii = ITOC(inode);
43655
43656 spin_lock(&cii->c_lock);
43657- cii->c_cached_epoch = atomic_read(&permission_epoch);
43658+ cii->c_cached_epoch = atomic_read_unchecked(&permission_epoch);
43659 if (cii->c_uid != current_fsuid()) {
43660 cii->c_uid = current_fsuid();
43661 cii->c_cached_perm = mask;
43662@@ -46,14 +46,14 @@ void coda_cache_clear_inode(struct inode *inode)
43663 {
43664 struct coda_inode_info *cii = ITOC(inode);
43665 spin_lock(&cii->c_lock);
43666- cii->c_cached_epoch = atomic_read(&permission_epoch) - 1;
43667+ cii->c_cached_epoch = atomic_read_unchecked(&permission_epoch) - 1;
43668 spin_unlock(&cii->c_lock);
43669 }
43670
43671 /* remove all acl caches */
43672 void coda_cache_clear_all(struct super_block *sb)
43673 {
43674- atomic_inc(&permission_epoch);
43675+ atomic_inc_unchecked(&permission_epoch);
43676 }
43677
43678
43679@@ -66,7 +66,7 @@ int coda_cache_check(struct inode *inode, int mask)
43680 spin_lock(&cii->c_lock);
43681 hit = (mask & cii->c_cached_perm) == mask &&
43682 cii->c_uid == current_fsuid() &&
43683- cii->c_cached_epoch == atomic_read(&permission_epoch);
43684+ cii->c_cached_epoch == atomic_read_unchecked(&permission_epoch);
43685 spin_unlock(&cii->c_lock);
43686
43687 return hit;
43688diff --git a/fs/compat.c b/fs/compat.c
43689index c987875..08771ca 100644
43690--- a/fs/compat.c
43691+++ b/fs/compat.c
43692@@ -132,8 +132,8 @@ asmlinkage long compat_sys_utimes(const char __user *filename, struct compat_tim
43693 static int cp_compat_stat(struct kstat *stat, struct compat_stat __user *ubuf)
43694 {
43695 compat_ino_t ino = stat->ino;
43696- typeof(ubuf->st_uid) uid = 0;
43697- typeof(ubuf->st_gid) gid = 0;
43698+ typeof(((struct compat_stat *)0)->st_uid) uid = 0;
43699+ typeof(((struct compat_stat *)0)->st_gid) gid = 0;
43700 int err;
43701
43702 SET_UID(uid, stat->uid);
43703@@ -504,7 +504,7 @@ compat_sys_io_setup(unsigned nr_reqs, u32 __user *ctx32p)
43704
43705 set_fs(KERNEL_DS);
43706 /* The __user pointer cast is valid because of the set_fs() */
43707- ret = sys_io_setup(nr_reqs, (aio_context_t __user *) &ctx64);
43708+ ret = sys_io_setup(nr_reqs, (aio_context_t __force_user *) &ctx64);
43709 set_fs(oldfs);
43710 /* truncating is ok because it's a user address */
43711 if (!ret)
43712@@ -562,7 +562,7 @@ ssize_t compat_rw_copy_check_uvector(int type,
43713 goto out;
43714
43715 ret = -EINVAL;
43716- if (nr_segs > UIO_MAXIOV || nr_segs < 0)
43717+ if (nr_segs > UIO_MAXIOV)
43718 goto out;
43719 if (nr_segs > fast_segs) {
43720 ret = -ENOMEM;
43721@@ -845,6 +845,7 @@ struct compat_old_linux_dirent {
43722
43723 struct compat_readdir_callback {
43724 struct compat_old_linux_dirent __user *dirent;
43725+ struct file * file;
43726 int result;
43727 };
43728
43729@@ -862,6 +863,10 @@ static int compat_fillonedir(void *__buf, const char *name, int namlen,
43730 buf->result = -EOVERFLOW;
43731 return -EOVERFLOW;
43732 }
43733+
43734+ if (!gr_acl_handle_filldir(buf->file, name, namlen, ino))
43735+ return 0;
43736+
43737 buf->result++;
43738 dirent = buf->dirent;
43739 if (!access_ok(VERIFY_WRITE, dirent,
43740@@ -894,6 +899,7 @@ asmlinkage long compat_sys_old_readdir(unsigned int fd,
43741
43742 buf.result = 0;
43743 buf.dirent = dirent;
43744+ buf.file = file;
43745
43746 error = vfs_readdir(file, compat_fillonedir, &buf);
43747 if (buf.result)
43748@@ -914,6 +920,7 @@ struct compat_linux_dirent {
43749 struct compat_getdents_callback {
43750 struct compat_linux_dirent __user *current_dir;
43751 struct compat_linux_dirent __user *previous;
43752+ struct file * file;
43753 int count;
43754 int error;
43755 };
43756@@ -935,6 +942,10 @@ static int compat_filldir(void *__buf, const char *name, int namlen,
43757 buf->error = -EOVERFLOW;
43758 return -EOVERFLOW;
43759 }
43760+
43761+ if (!gr_acl_handle_filldir(buf->file, name, namlen, ino))
43762+ return 0;
43763+
43764 dirent = buf->previous;
43765 if (dirent) {
43766 if (__put_user(offset, &dirent->d_off))
43767@@ -982,6 +993,7 @@ asmlinkage long compat_sys_getdents(unsigned int fd,
43768 buf.previous = NULL;
43769 buf.count = count;
43770 buf.error = 0;
43771+ buf.file = file;
43772
43773 error = vfs_readdir(file, compat_filldir, &buf);
43774 if (error >= 0)
43775@@ -1003,6 +1015,7 @@ out:
43776 struct compat_getdents_callback64 {
43777 struct linux_dirent64 __user *current_dir;
43778 struct linux_dirent64 __user *previous;
43779+ struct file * file;
43780 int count;
43781 int error;
43782 };
43783@@ -1019,6 +1032,10 @@ static int compat_filldir64(void * __buf, const char * name, int namlen, loff_t
43784 buf->error = -EINVAL; /* only used if we fail.. */
43785 if (reclen > buf->count)
43786 return -EINVAL;
43787+
43788+ if (!gr_acl_handle_filldir(buf->file, name, namlen, ino))
43789+ return 0;
43790+
43791 dirent = buf->previous;
43792
43793 if (dirent) {
43794@@ -1070,13 +1087,14 @@ asmlinkage long compat_sys_getdents64(unsigned int fd,
43795 buf.previous = NULL;
43796 buf.count = count;
43797 buf.error = 0;
43798+ buf.file = file;
43799
43800 error = vfs_readdir(file, compat_filldir64, &buf);
43801 if (error >= 0)
43802 error = buf.error;
43803 lastdirent = buf.previous;
43804 if (lastdirent) {
43805- typeof(lastdirent->d_off) d_off = file->f_pos;
43806+ typeof(((struct linux_dirent64 *)0)->d_off) d_off = file->f_pos;
43807 if (__put_user_unaligned(d_off, &lastdirent->d_off))
43808 error = -EFAULT;
43809 else
43810diff --git a/fs/compat_binfmt_elf.c b/fs/compat_binfmt_elf.c
43811index 112e45a..b59845b 100644
43812--- a/fs/compat_binfmt_elf.c
43813+++ b/fs/compat_binfmt_elf.c
43814@@ -30,11 +30,13 @@
43815 #undef elf_phdr
43816 #undef elf_shdr
43817 #undef elf_note
43818+#undef elf_dyn
43819 #undef elf_addr_t
43820 #define elfhdr elf32_hdr
43821 #define elf_phdr elf32_phdr
43822 #define elf_shdr elf32_shdr
43823 #define elf_note elf32_note
43824+#define elf_dyn Elf32_Dyn
43825 #define elf_addr_t Elf32_Addr
43826
43827 /*
43828diff --git a/fs/compat_ioctl.c b/fs/compat_ioctl.c
43829index 51352de..93292ff 100644
43830--- a/fs/compat_ioctl.c
43831+++ b/fs/compat_ioctl.c
43832@@ -210,6 +210,8 @@ static int do_video_set_spu_palette(unsigned int fd, unsigned int cmd,
43833
43834 err = get_user(palp, &up->palette);
43835 err |= get_user(length, &up->length);
43836+ if (err)
43837+ return -EFAULT;
43838
43839 up_native = compat_alloc_user_space(sizeof(struct video_spu_palette));
43840 err = put_user(compat_ptr(palp), &up_native->palette);
43841@@ -621,7 +623,7 @@ static int serial_struct_ioctl(unsigned fd, unsigned cmd,
43842 return -EFAULT;
43843 if (__get_user(udata, &ss32->iomem_base))
43844 return -EFAULT;
43845- ss.iomem_base = compat_ptr(udata);
43846+ ss.iomem_base = (unsigned char __force_kernel *)compat_ptr(udata);
43847 if (__get_user(ss.iomem_reg_shift, &ss32->iomem_reg_shift) ||
43848 __get_user(ss.port_high, &ss32->port_high))
43849 return -EFAULT;
43850@@ -796,7 +798,7 @@ static int compat_ioctl_preallocate(struct file *file,
43851 copy_in_user(&p->l_len, &p32->l_len, sizeof(s64)) ||
43852 copy_in_user(&p->l_sysid, &p32->l_sysid, sizeof(s32)) ||
43853 copy_in_user(&p->l_pid, &p32->l_pid, sizeof(u32)) ||
43854- copy_in_user(&p->l_pad, &p32->l_pad, 4*sizeof(u32)))
43855+ copy_in_user(p->l_pad, &p32->l_pad, 4*sizeof(u32)))
43856 return -EFAULT;
43857
43858 return ioctl_preallocate(file, p);
43859@@ -1644,8 +1646,8 @@ asmlinkage long compat_sys_ioctl(unsigned int fd, unsigned int cmd,
43860 static int __init init_sys32_ioctl_cmp(const void *p, const void *q)
43861 {
43862 unsigned int a, b;
43863- a = *(unsigned int *)p;
43864- b = *(unsigned int *)q;
43865+ a = *(const unsigned int *)p;
43866+ b = *(const unsigned int *)q;
43867 if (a > b)
43868 return 1;
43869 if (a < b)
43870diff --git a/fs/configfs/dir.c b/fs/configfs/dir.c
43871index 9a37a9b..35792b6 100644
43872--- a/fs/configfs/dir.c
43873+++ b/fs/configfs/dir.c
43874@@ -1575,7 +1575,8 @@ static int configfs_readdir(struct file * filp, void * dirent, filldir_t filldir
43875 }
43876 for (p=q->next; p!= &parent_sd->s_children; p=p->next) {
43877 struct configfs_dirent *next;
43878- const char * name;
43879+ const unsigned char * name;
43880+ char d_name[sizeof(next->s_dentry->d_iname)];
43881 int len;
43882 struct inode *inode = NULL;
43883
43884@@ -1585,7 +1586,12 @@ static int configfs_readdir(struct file * filp, void * dirent, filldir_t filldir
43885 continue;
43886
43887 name = configfs_get_name(next);
43888- len = strlen(name);
43889+ if (next->s_dentry && name == next->s_dentry->d_iname) {
43890+ len = next->s_dentry->d_name.len;
43891+ memcpy(d_name, name, len);
43892+ name = d_name;
43893+ } else
43894+ len = strlen(name);
43895
43896 /*
43897 * We'll have a dentry and an inode for
43898diff --git a/fs/dcache.c b/fs/dcache.c
43899index f7908ae..920a680 100644
43900--- a/fs/dcache.c
43901+++ b/fs/dcache.c
43902@@ -3042,7 +3042,7 @@ void __init vfs_caches_init(unsigned long mempages)
43903 mempages -= reserve;
43904
43905 names_cachep = kmem_cache_create("names_cache", PATH_MAX, 0,
43906- SLAB_HWCACHE_ALIGN|SLAB_PANIC, NULL);
43907+ SLAB_HWCACHE_ALIGN|SLAB_PANIC|SLAB_USERCOPY, NULL);
43908
43909 dcache_init();
43910 inode_init();
43911diff --git a/fs/debugfs/inode.c b/fs/debugfs/inode.c
43912index f3a257d..715ac0f 100644
43913--- a/fs/debugfs/inode.c
43914+++ b/fs/debugfs/inode.c
43915@@ -261,7 +261,11 @@ EXPORT_SYMBOL_GPL(debugfs_create_file);
43916 struct dentry *debugfs_create_dir(const char *name, struct dentry *parent)
43917 {
43918 return debugfs_create_file(name,
43919+#ifdef CONFIG_GRKERNSEC_SYSFS_RESTRICT
43920+ S_IFDIR | S_IRWXU,
43921+#else
43922 S_IFDIR | S_IRWXU | S_IRUGO | S_IXUGO,
43923+#endif
43924 parent, NULL, NULL);
43925 }
43926 EXPORT_SYMBOL_GPL(debugfs_create_dir);
43927diff --git a/fs/ecryptfs/inode.c b/fs/ecryptfs/inode.c
43928index af11098..81e3bbe 100644
43929--- a/fs/ecryptfs/inode.c
43930+++ b/fs/ecryptfs/inode.c
43931@@ -691,7 +691,7 @@ static int ecryptfs_readlink_lower(struct dentry *dentry, char **buf,
43932 old_fs = get_fs();
43933 set_fs(get_ds());
43934 rc = lower_dentry->d_inode->i_op->readlink(lower_dentry,
43935- (char __user *)lower_buf,
43936+ (char __force_user *)lower_buf,
43937 lower_bufsiz);
43938 set_fs(old_fs);
43939 if (rc < 0)
43940@@ -737,7 +737,7 @@ static void *ecryptfs_follow_link(struct dentry *dentry, struct nameidata *nd)
43941 }
43942 old_fs = get_fs();
43943 set_fs(get_ds());
43944- rc = dentry->d_inode->i_op->readlink(dentry, (char __user *)buf, len);
43945+ rc = dentry->d_inode->i_op->readlink(dentry, (char __force_user *)buf, len);
43946 set_fs(old_fs);
43947 if (rc < 0) {
43948 kfree(buf);
43949@@ -752,7 +752,7 @@ out:
43950 static void
43951 ecryptfs_put_link(struct dentry *dentry, struct nameidata *nd, void *ptr)
43952 {
43953- char *buf = nd_get_link(nd);
43954+ const char *buf = nd_get_link(nd);
43955 if (!IS_ERR(buf)) {
43956 /* Free the char* */
43957 kfree(buf);
43958diff --git a/fs/ecryptfs/miscdev.c b/fs/ecryptfs/miscdev.c
43959index 0dc5a3d..d3cdeea 100644
43960--- a/fs/ecryptfs/miscdev.c
43961+++ b/fs/ecryptfs/miscdev.c
43962@@ -328,7 +328,7 @@ check_list:
43963 goto out_unlock_msg_ctx;
43964 i = 5;
43965 if (msg_ctx->msg) {
43966- if (copy_to_user(&buf[i], packet_length, packet_length_size))
43967+ if (packet_length_size > sizeof(packet_length) || copy_to_user(&buf[i], packet_length, packet_length_size))
43968 goto out_unlock_msg_ctx;
43969 i += packet_length_size;
43970 if (copy_to_user(&buf[i], msg_ctx->msg, msg_ctx->msg_size))
43971diff --git a/fs/ecryptfs/read_write.c b/fs/ecryptfs/read_write.c
43972index 608c1c3..7d040a8 100644
43973--- a/fs/ecryptfs/read_write.c
43974+++ b/fs/ecryptfs/read_write.c
43975@@ -48,7 +48,7 @@ int ecryptfs_write_lower(struct inode *ecryptfs_inode, char *data,
43976 return -EIO;
43977 fs_save = get_fs();
43978 set_fs(get_ds());
43979- rc = vfs_write(lower_file, data, size, &offset);
43980+ rc = vfs_write(lower_file, (const char __force_user *)data, size, &offset);
43981 set_fs(fs_save);
43982 mark_inode_dirty_sync(ecryptfs_inode);
43983 return rc;
43984@@ -244,7 +244,7 @@ int ecryptfs_read_lower(char *data, loff_t offset, size_t size,
43985 return -EIO;
43986 fs_save = get_fs();
43987 set_fs(get_ds());
43988- rc = vfs_read(lower_file, data, size, &offset);
43989+ rc = vfs_read(lower_file, (char __force_user *)data, size, &offset);
43990 set_fs(fs_save);
43991 return rc;
43992 }
43993diff --git a/fs/exec.c b/fs/exec.c
43994index 3625464..ff895b9 100644
43995--- a/fs/exec.c
43996+++ b/fs/exec.c
43997@@ -55,12 +55,28 @@
43998 #include <linux/pipe_fs_i.h>
43999 #include <linux/oom.h>
44000 #include <linux/compat.h>
44001+#include <linux/random.h>
44002+#include <linux/seq_file.h>
44003+
44004+#ifdef CONFIG_PAX_REFCOUNT
44005+#include <linux/kallsyms.h>
44006+#include <linux/kdebug.h>
44007+#endif
44008
44009 #include <asm/uaccess.h>
44010 #include <asm/mmu_context.h>
44011 #include <asm/tlb.h>
44012 #include "internal.h"
44013
44014+#ifndef CONFIG_PAX_HAVE_ACL_FLAGS
44015+void __weak pax_set_initial_flags(struct linux_binprm *bprm) {}
44016+#endif
44017+
44018+#ifdef CONFIG_PAX_HOOK_ACL_FLAGS
44019+void (*pax_set_initial_flags_func)(struct linux_binprm *bprm);
44020+EXPORT_SYMBOL(pax_set_initial_flags_func);
44021+#endif
44022+
44023 int core_uses_pid;
44024 char core_pattern[CORENAME_MAX_SIZE] = "core";
44025 unsigned int core_pipe_limit;
44026@@ -70,7 +86,7 @@ struct core_name {
44027 char *corename;
44028 int used, size;
44029 };
44030-static atomic_t call_count = ATOMIC_INIT(1);
44031+static atomic_unchecked_t call_count = ATOMIC_INIT(1);
44032
44033 /* The maximal length of core_pattern is also specified in sysctl.c */
44034
44035@@ -188,18 +204,10 @@ static struct page *get_arg_page(struct linux_binprm *bprm, unsigned long pos,
44036 int write)
44037 {
44038 struct page *page;
44039- int ret;
44040
44041-#ifdef CONFIG_STACK_GROWSUP
44042- if (write) {
44043- ret = expand_downwards(bprm->vma, pos);
44044- if (ret < 0)
44045- return NULL;
44046- }
44047-#endif
44048- ret = get_user_pages(current, bprm->mm, pos,
44049- 1, write, 1, &page, NULL);
44050- if (ret <= 0)
44051+ if (0 > expand_downwards(bprm->vma, pos))
44052+ return NULL;
44053+ if (0 >= get_user_pages(current, bprm->mm, pos, 1, write, 1, &page, NULL))
44054 return NULL;
44055
44056 if (write) {
44057@@ -215,6 +223,17 @@ static struct page *get_arg_page(struct linux_binprm *bprm, unsigned long pos,
44058 if (size <= ARG_MAX)
44059 return page;
44060
44061+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
44062+ // only allow 512KB for argv+env on suid/sgid binaries
44063+ // to prevent easy ASLR exhaustion
44064+ if (((bprm->cred->euid != current_euid()) ||
44065+ (bprm->cred->egid != current_egid())) &&
44066+ (size > (512 * 1024))) {
44067+ put_page(page);
44068+ return NULL;
44069+ }
44070+#endif
44071+
44072 /*
44073 * Limit to 1/4-th the stack size for the argv+env strings.
44074 * This ensures that:
44075@@ -274,6 +293,11 @@ static int __bprm_mm_init(struct linux_binprm *bprm)
44076 vma->vm_end = STACK_TOP_MAX;
44077 vma->vm_start = vma->vm_end - PAGE_SIZE;
44078 vma->vm_flags = VM_STACK_FLAGS | VM_STACK_INCOMPLETE_SETUP;
44079+
44080+#ifdef CONFIG_PAX_SEGMEXEC
44081+ vma->vm_flags &= ~(VM_EXEC | VM_MAYEXEC);
44082+#endif
44083+
44084 vma->vm_page_prot = vm_get_page_prot(vma->vm_flags);
44085 INIT_LIST_HEAD(&vma->anon_vma_chain);
44086
44087@@ -288,6 +312,12 @@ static int __bprm_mm_init(struct linux_binprm *bprm)
44088 mm->stack_vm = mm->total_vm = 1;
44089 up_write(&mm->mmap_sem);
44090 bprm->p = vma->vm_end - sizeof(void *);
44091+
44092+#ifdef CONFIG_PAX_RANDUSTACK
44093+ if (randomize_va_space)
44094+ bprm->p ^= random32() & ~PAGE_MASK;
44095+#endif
44096+
44097 return 0;
44098 err:
44099 up_write(&mm->mmap_sem);
44100@@ -396,19 +426,7 @@ err:
44101 return err;
44102 }
44103
44104-struct user_arg_ptr {
44105-#ifdef CONFIG_COMPAT
44106- bool is_compat;
44107-#endif
44108- union {
44109- const char __user *const __user *native;
44110-#ifdef CONFIG_COMPAT
44111- compat_uptr_t __user *compat;
44112-#endif
44113- } ptr;
44114-};
44115-
44116-static const char __user *get_user_arg_ptr(struct user_arg_ptr argv, int nr)
44117+const char __user *get_user_arg_ptr(struct user_arg_ptr argv, int nr)
44118 {
44119 const char __user *native;
44120
44121@@ -417,14 +435,14 @@ static const char __user *get_user_arg_ptr(struct user_arg_ptr argv, int nr)
44122 compat_uptr_t compat;
44123
44124 if (get_user(compat, argv.ptr.compat + nr))
44125- return ERR_PTR(-EFAULT);
44126+ return (const char __force_user *)ERR_PTR(-EFAULT);
44127
44128 return compat_ptr(compat);
44129 }
44130 #endif
44131
44132 if (get_user(native, argv.ptr.native + nr))
44133- return ERR_PTR(-EFAULT);
44134+ return (const char __force_user *)ERR_PTR(-EFAULT);
44135
44136 return native;
44137 }
44138@@ -443,7 +461,7 @@ static int count(struct user_arg_ptr argv, int max)
44139 if (!p)
44140 break;
44141
44142- if (IS_ERR(p))
44143+ if (IS_ERR((const char __force_kernel *)p))
44144 return -EFAULT;
44145
44146 if (i++ >= max)
44147@@ -477,7 +495,7 @@ static int copy_strings(int argc, struct user_arg_ptr argv,
44148
44149 ret = -EFAULT;
44150 str = get_user_arg_ptr(argv, argc);
44151- if (IS_ERR(str))
44152+ if (IS_ERR((const char __force_kernel *)str))
44153 goto out;
44154
44155 len = strnlen_user(str, MAX_ARG_STRLEN);
44156@@ -559,7 +577,7 @@ int copy_strings_kernel(int argc, const char *const *__argv,
44157 int r;
44158 mm_segment_t oldfs = get_fs();
44159 struct user_arg_ptr argv = {
44160- .ptr.native = (const char __user *const __user *)__argv,
44161+ .ptr.native = (const char __force_user *const __force_user *)__argv,
44162 };
44163
44164 set_fs(KERNEL_DS);
44165@@ -594,7 +612,8 @@ static int shift_arg_pages(struct vm_area_struct *vma, unsigned long shift)
44166 unsigned long new_end = old_end - shift;
44167 struct mmu_gather tlb;
44168
44169- BUG_ON(new_start > new_end);
44170+ if (new_start >= new_end || new_start < mmap_min_addr)
44171+ return -ENOMEM;
44172
44173 /*
44174 * ensure there are no vmas between where we want to go
44175@@ -603,6 +622,10 @@ static int shift_arg_pages(struct vm_area_struct *vma, unsigned long shift)
44176 if (vma != find_vma(mm, new_start))
44177 return -EFAULT;
44178
44179+#ifdef CONFIG_PAX_SEGMEXEC
44180+ BUG_ON(pax_find_mirror_vma(vma));
44181+#endif
44182+
44183 /*
44184 * cover the whole range: [new_start, old_end)
44185 */
44186@@ -683,10 +706,6 @@ int setup_arg_pages(struct linux_binprm *bprm,
44187 stack_top = arch_align_stack(stack_top);
44188 stack_top = PAGE_ALIGN(stack_top);
44189
44190- if (unlikely(stack_top < mmap_min_addr) ||
44191- unlikely(vma->vm_end - vma->vm_start >= stack_top - mmap_min_addr))
44192- return -ENOMEM;
44193-
44194 stack_shift = vma->vm_end - stack_top;
44195
44196 bprm->p -= stack_shift;
44197@@ -698,8 +717,28 @@ int setup_arg_pages(struct linux_binprm *bprm,
44198 bprm->exec -= stack_shift;
44199
44200 down_write(&mm->mmap_sem);
44201+
44202+ /* Move stack pages down in memory. */
44203+ if (stack_shift) {
44204+ ret = shift_arg_pages(vma, stack_shift);
44205+ if (ret)
44206+ goto out_unlock;
44207+ }
44208+
44209 vm_flags = VM_STACK_FLAGS;
44210
44211+#if defined(CONFIG_PAX_PAGEEXEC) || defined(CONFIG_PAX_SEGMEXEC)
44212+ if (mm->pax_flags & (MF_PAX_PAGEEXEC | MF_PAX_SEGMEXEC)) {
44213+ vm_flags &= ~VM_EXEC;
44214+
44215+#ifdef CONFIG_PAX_MPROTECT
44216+ if (mm->pax_flags & MF_PAX_MPROTECT)
44217+ vm_flags &= ~VM_MAYEXEC;
44218+#endif
44219+
44220+ }
44221+#endif
44222+
44223 /*
44224 * Adjust stack execute permissions; explicitly enable for
44225 * EXSTACK_ENABLE_X, disable for EXSTACK_DISABLE_X and leave alone
44226@@ -718,13 +757,6 @@ int setup_arg_pages(struct linux_binprm *bprm,
44227 goto out_unlock;
44228 BUG_ON(prev != vma);
44229
44230- /* Move stack pages down in memory. */
44231- if (stack_shift) {
44232- ret = shift_arg_pages(vma, stack_shift);
44233- if (ret)
44234- goto out_unlock;
44235- }
44236-
44237 /* mprotect_fixup is overkill to remove the temporary stack flags */
44238 vma->vm_flags &= ~VM_STACK_INCOMPLETE_SETUP;
44239
44240@@ -805,7 +837,7 @@ int kernel_read(struct file *file, loff_t offset,
44241 old_fs = get_fs();
44242 set_fs(get_ds());
44243 /* The cast to a user pointer is valid due to the set_fs() */
44244- result = vfs_read(file, (void __user *)addr, count, &pos);
44245+ result = vfs_read(file, (void __force_user *)addr, count, &pos);
44246 set_fs(old_fs);
44247 return result;
44248 }
44249@@ -1067,6 +1099,21 @@ void set_task_comm(struct task_struct *tsk, char *buf)
44250 perf_event_comm(tsk);
44251 }
44252
44253+static void filename_to_taskname(char *tcomm, const char *fn, unsigned int len)
44254+{
44255+ int i, ch;
44256+
44257+ /* Copies the binary name from after last slash */
44258+ for (i = 0; (ch = *(fn++)) != '\0';) {
44259+ if (ch == '/')
44260+ i = 0; /* overwrite what we wrote */
44261+ else
44262+ if (i < len - 1)
44263+ tcomm[i++] = ch;
44264+ }
44265+ tcomm[i] = '\0';
44266+}
44267+
44268 int flush_old_exec(struct linux_binprm * bprm)
44269 {
44270 int retval;
44271@@ -1081,6 +1128,7 @@ int flush_old_exec(struct linux_binprm * bprm)
44272
44273 set_mm_exe_file(bprm->mm, bprm->file);
44274
44275+ filename_to_taskname(bprm->tcomm, bprm->filename, sizeof(bprm->tcomm));
44276 /*
44277 * Release all of the old mmap stuff
44278 */
44279@@ -1112,10 +1160,6 @@ EXPORT_SYMBOL(would_dump);
44280
44281 void setup_new_exec(struct linux_binprm * bprm)
44282 {
44283- int i, ch;
44284- const char *name;
44285- char tcomm[sizeof(current->comm)];
44286-
44287 arch_pick_mmap_layout(current->mm);
44288
44289 /* This is the point of no return */
44290@@ -1126,18 +1170,7 @@ void setup_new_exec(struct linux_binprm * bprm)
44291 else
44292 set_dumpable(current->mm, suid_dumpable);
44293
44294- name = bprm->filename;
44295-
44296- /* Copies the binary name from after last slash */
44297- for (i=0; (ch = *(name++)) != '\0';) {
44298- if (ch == '/')
44299- i = 0; /* overwrite what we wrote */
44300- else
44301- if (i < (sizeof(tcomm) - 1))
44302- tcomm[i++] = ch;
44303- }
44304- tcomm[i] = '\0';
44305- set_task_comm(current, tcomm);
44306+ set_task_comm(current, bprm->tcomm);
44307
44308 /* Set the new mm task size. We have to do that late because it may
44309 * depend on TIF_32BIT which is only updated in flush_thread() on
44310@@ -1247,7 +1280,7 @@ int check_unsafe_exec(struct linux_binprm *bprm)
44311 }
44312 rcu_read_unlock();
44313
44314- if (p->fs->users > n_fs) {
44315+ if (atomic_read(&p->fs->users) > n_fs) {
44316 bprm->unsafe |= LSM_UNSAFE_SHARE;
44317 } else {
44318 res = -EAGAIN;
44319@@ -1442,6 +1475,28 @@ int search_binary_handler(struct linux_binprm *bprm,struct pt_regs *regs)
44320
44321 EXPORT_SYMBOL(search_binary_handler);
44322
44323+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
44324+static DEFINE_PER_CPU(u64, exec_counter);
44325+static int __init init_exec_counters(void)
44326+{
44327+ unsigned int cpu;
44328+
44329+ for_each_possible_cpu(cpu) {
44330+ per_cpu(exec_counter, cpu) = (u64)cpu;
44331+ }
44332+
44333+ return 0;
44334+}
44335+early_initcall(init_exec_counters);
44336+static inline void increment_exec_counter(void)
44337+{
44338+ BUILD_BUG_ON(NR_CPUS > (1 << 16));
44339+ current->exec_id = this_cpu_add_return(exec_counter, 1 << 16);
44340+}
44341+#else
44342+static inline void increment_exec_counter(void) {}
44343+#endif
44344+
44345 /*
44346 * sys_execve() executes a new program.
44347 */
44348@@ -1450,6 +1505,11 @@ static int do_execve_common(const char *filename,
44349 struct user_arg_ptr envp,
44350 struct pt_regs *regs)
44351 {
44352+#ifdef CONFIG_GRKERNSEC
44353+ struct file *old_exec_file;
44354+ struct acl_subject_label *old_acl;
44355+ struct rlimit old_rlim[RLIM_NLIMITS];
44356+#endif
44357 struct linux_binprm *bprm;
44358 struct file *file;
44359 struct files_struct *displaced;
44360@@ -1457,6 +1517,8 @@ static int do_execve_common(const char *filename,
44361 int retval;
44362 const struct cred *cred = current_cred();
44363
44364+ gr_learn_resource(current, RLIMIT_NPROC, atomic_read(&current->cred->user->processes), 1);
44365+
44366 /*
44367 * We move the actual failure in case of RLIMIT_NPROC excess from
44368 * set*uid() to execve() because too many poorly written programs
44369@@ -1497,12 +1559,27 @@ static int do_execve_common(const char *filename,
44370 if (IS_ERR(file))
44371 goto out_unmark;
44372
44373+ if (gr_ptrace_readexec(file, bprm->unsafe)) {
44374+ retval = -EPERM;
44375+ goto out_file;
44376+ }
44377+
44378 sched_exec();
44379
44380 bprm->file = file;
44381 bprm->filename = filename;
44382 bprm->interp = filename;
44383
44384+ if (gr_process_user_ban()) {
44385+ retval = -EPERM;
44386+ goto out_file;
44387+ }
44388+
44389+ if (!gr_acl_handle_execve(file->f_dentry, file->f_vfsmnt)) {
44390+ retval = -EACCES;
44391+ goto out_file;
44392+ }
44393+
44394 retval = bprm_mm_init(bprm);
44395 if (retval)
44396 goto out_file;
44397@@ -1519,24 +1596,65 @@ static int do_execve_common(const char *filename,
44398 if (retval < 0)
44399 goto out;
44400
44401+#ifdef CONFIG_GRKERNSEC
44402+ old_acl = current->acl;
44403+ memcpy(old_rlim, current->signal->rlim, sizeof(old_rlim));
44404+ old_exec_file = current->exec_file;
44405+ get_file(file);
44406+ current->exec_file = file;
44407+#endif
44408+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
44409+ /* limit suid stack to 8MB
44410+ we saved the old limits above and will restore them if this exec fails
44411+ */
44412+ if (((bprm->cred->euid != current_euid()) || (bprm->cred->egid != current_egid())) &&
44413+ (old_rlim[RLIMIT_STACK].rlim_cur > (8 * 1024 * 1024)))
44414+ current->signal->rlim[RLIMIT_STACK].rlim_cur = 8 * 1024 * 1024;
44415+#endif
44416+
44417+ if (!gr_tpe_allow(file)) {
44418+ retval = -EACCES;
44419+ goto out_fail;
44420+ }
44421+
44422+ if (gr_check_crash_exec(file)) {
44423+ retval = -EACCES;
44424+ goto out_fail;
44425+ }
44426+
44427+ retval = gr_set_proc_label(file->f_dentry, file->f_vfsmnt,
44428+ bprm->unsafe);
44429+ if (retval < 0)
44430+ goto out_fail;
44431+
44432 retval = copy_strings_kernel(1, &bprm->filename, bprm);
44433 if (retval < 0)
44434- goto out;
44435+ goto out_fail;
44436
44437 bprm->exec = bprm->p;
44438 retval = copy_strings(bprm->envc, envp, bprm);
44439 if (retval < 0)
44440- goto out;
44441+ goto out_fail;
44442
44443 retval = copy_strings(bprm->argc, argv, bprm);
44444 if (retval < 0)
44445- goto out;
44446+ goto out_fail;
44447+
44448+ gr_log_chroot_exec(file->f_dentry, file->f_vfsmnt);
44449+
44450+ gr_handle_exec_args(bprm, argv);
44451
44452 retval = search_binary_handler(bprm,regs);
44453 if (retval < 0)
44454- goto out;
44455+ goto out_fail;
44456+#ifdef CONFIG_GRKERNSEC
44457+ if (old_exec_file)
44458+ fput(old_exec_file);
44459+#endif
44460
44461 /* execve succeeded */
44462+
44463+ increment_exec_counter();
44464 current->fs->in_exec = 0;
44465 current->in_execve = 0;
44466 acct_update_integrals(current);
44467@@ -1545,6 +1663,14 @@ static int do_execve_common(const char *filename,
44468 put_files_struct(displaced);
44469 return retval;
44470
44471+out_fail:
44472+#ifdef CONFIG_GRKERNSEC
44473+ current->acl = old_acl;
44474+ memcpy(current->signal->rlim, old_rlim, sizeof(old_rlim));
44475+ fput(current->exec_file);
44476+ current->exec_file = old_exec_file;
44477+#endif
44478+
44479 out:
44480 if (bprm->mm) {
44481 acct_arg_size(bprm, 0);
44482@@ -1618,7 +1744,7 @@ static int expand_corename(struct core_name *cn)
44483 {
44484 char *old_corename = cn->corename;
44485
44486- cn->size = CORENAME_MAX_SIZE * atomic_inc_return(&call_count);
44487+ cn->size = CORENAME_MAX_SIZE * atomic_inc_return_unchecked(&call_count);
44488 cn->corename = krealloc(old_corename, cn->size, GFP_KERNEL);
44489
44490 if (!cn->corename) {
44491@@ -1715,7 +1841,7 @@ static int format_corename(struct core_name *cn, long signr)
44492 int pid_in_pattern = 0;
44493 int err = 0;
44494
44495- cn->size = CORENAME_MAX_SIZE * atomic_read(&call_count);
44496+ cn->size = CORENAME_MAX_SIZE * atomic_read_unchecked(&call_count);
44497 cn->corename = kmalloc(cn->size, GFP_KERNEL);
44498 cn->used = 0;
44499
44500@@ -1812,6 +1938,228 @@ out:
44501 return ispipe;
44502 }
44503
44504+int pax_check_flags(unsigned long *flags)
44505+{
44506+ int retval = 0;
44507+
44508+#if !defined(CONFIG_X86_32) || !defined(CONFIG_PAX_SEGMEXEC)
44509+ if (*flags & MF_PAX_SEGMEXEC)
44510+ {
44511+ *flags &= ~MF_PAX_SEGMEXEC;
44512+ retval = -EINVAL;
44513+ }
44514+#endif
44515+
44516+ if ((*flags & MF_PAX_PAGEEXEC)
44517+
44518+#ifdef CONFIG_PAX_PAGEEXEC
44519+ && (*flags & MF_PAX_SEGMEXEC)
44520+#endif
44521+
44522+ )
44523+ {
44524+ *flags &= ~MF_PAX_PAGEEXEC;
44525+ retval = -EINVAL;
44526+ }
44527+
44528+ if ((*flags & MF_PAX_MPROTECT)
44529+
44530+#ifdef CONFIG_PAX_MPROTECT
44531+ && !(*flags & (MF_PAX_PAGEEXEC | MF_PAX_SEGMEXEC))
44532+#endif
44533+
44534+ )
44535+ {
44536+ *flags &= ~MF_PAX_MPROTECT;
44537+ retval = -EINVAL;
44538+ }
44539+
44540+ if ((*flags & MF_PAX_EMUTRAMP)
44541+
44542+#ifdef CONFIG_PAX_EMUTRAMP
44543+ && !(*flags & (MF_PAX_PAGEEXEC | MF_PAX_SEGMEXEC))
44544+#endif
44545+
44546+ )
44547+ {
44548+ *flags &= ~MF_PAX_EMUTRAMP;
44549+ retval = -EINVAL;
44550+ }
44551+
44552+ return retval;
44553+}
44554+
44555+EXPORT_SYMBOL(pax_check_flags);
44556+
44557+#if defined(CONFIG_PAX_PAGEEXEC) || defined(CONFIG_PAX_SEGMEXEC)
44558+void pax_report_fault(struct pt_regs *regs, void *pc, void *sp)
44559+{
44560+ struct task_struct *tsk = current;
44561+ struct mm_struct *mm = current->mm;
44562+ char *buffer_exec = (char *)__get_free_page(GFP_KERNEL);
44563+ char *buffer_fault = (char *)__get_free_page(GFP_KERNEL);
44564+ char *path_exec = NULL;
44565+ char *path_fault = NULL;
44566+ unsigned long start = 0UL, end = 0UL, offset = 0UL;
44567+
44568+ if (buffer_exec && buffer_fault) {
44569+ struct vm_area_struct *vma, *vma_exec = NULL, *vma_fault = NULL;
44570+
44571+ down_read(&mm->mmap_sem);
44572+ vma = mm->mmap;
44573+ while (vma && (!vma_exec || !vma_fault)) {
44574+ if ((vma->vm_flags & VM_EXECUTABLE) && vma->vm_file)
44575+ vma_exec = vma;
44576+ if (vma->vm_start <= (unsigned long)pc && (unsigned long)pc < vma->vm_end)
44577+ vma_fault = vma;
44578+ vma = vma->vm_next;
44579+ }
44580+ if (vma_exec) {
44581+ path_exec = d_path(&vma_exec->vm_file->f_path, buffer_exec, PAGE_SIZE);
44582+ if (IS_ERR(path_exec))
44583+ path_exec = "<path too long>";
44584+ else {
44585+ path_exec = mangle_path(buffer_exec, path_exec, "\t\n\\");
44586+ if (path_exec) {
44587+ *path_exec = 0;
44588+ path_exec = buffer_exec;
44589+ } else
44590+ path_exec = "<path too long>";
44591+ }
44592+ }
44593+ if (vma_fault) {
44594+ start = vma_fault->vm_start;
44595+ end = vma_fault->vm_end;
44596+ offset = vma_fault->vm_pgoff << PAGE_SHIFT;
44597+ if (vma_fault->vm_file) {
44598+ path_fault = d_path(&vma_fault->vm_file->f_path, buffer_fault, PAGE_SIZE);
44599+ if (IS_ERR(path_fault))
44600+ path_fault = "<path too long>";
44601+ else {
44602+ path_fault = mangle_path(buffer_fault, path_fault, "\t\n\\");
44603+ if (path_fault) {
44604+ *path_fault = 0;
44605+ path_fault = buffer_fault;
44606+ } else
44607+ path_fault = "<path too long>";
44608+ }
44609+ } else
44610+ path_fault = "<anonymous mapping>";
44611+ }
44612+ up_read(&mm->mmap_sem);
44613+ }
44614+ if (tsk->signal->curr_ip)
44615+ printk(KERN_ERR "PAX: From %pI4: execution attempt in: %s, %08lx-%08lx %08lx\n", &tsk->signal->curr_ip, path_fault, start, end, offset);
44616+ else
44617+ printk(KERN_ERR "PAX: execution attempt in: %s, %08lx-%08lx %08lx\n", path_fault, start, end, offset);
44618+ printk(KERN_ERR "PAX: terminating task: %s(%s):%d, uid/euid: %u/%u, "
44619+ "PC: %p, SP: %p\n", path_exec, tsk->comm, task_pid_nr(tsk),
44620+ task_uid(tsk), task_euid(tsk), pc, sp);
44621+ free_page((unsigned long)buffer_exec);
44622+ free_page((unsigned long)buffer_fault);
44623+ pax_report_insns(regs, pc, sp);
44624+ do_coredump(SIGKILL, SIGKILL, regs);
44625+}
44626+#endif
44627+
44628+#ifdef CONFIG_PAX_REFCOUNT
44629+void pax_report_refcount_overflow(struct pt_regs *regs)
44630+{
44631+ if (current->signal->curr_ip)
44632+ printk(KERN_ERR "PAX: From %pI4: refcount overflow detected in: %s:%d, uid/euid: %u/%u\n",
44633+ &current->signal->curr_ip, current->comm, task_pid_nr(current), current_uid(), current_euid());
44634+ else
44635+ printk(KERN_ERR "PAX: refcount overflow detected in: %s:%d, uid/euid: %u/%u\n",
44636+ current->comm, task_pid_nr(current), current_uid(), current_euid());
44637+ print_symbol(KERN_ERR "PAX: refcount overflow occured at: %s\n", instruction_pointer(regs));
44638+ show_regs(regs);
44639+ force_sig_info(SIGKILL, SEND_SIG_FORCED, current);
44640+}
44641+#endif
44642+
44643+#ifdef CONFIG_PAX_USERCOPY
44644+/* 0: not at all, 1: fully, 2: fully inside frame, -1: partially (implies an error) */
44645+int object_is_on_stack(const void *obj, unsigned long len)
44646+{
44647+ const void * const stack = task_stack_page(current);
44648+ const void * const stackend = stack + THREAD_SIZE;
44649+
44650+#if defined(CONFIG_FRAME_POINTER) && defined(CONFIG_X86)
44651+ const void *frame = NULL;
44652+ const void *oldframe;
44653+#endif
44654+
44655+ if (obj + len < obj)
44656+ return -1;
44657+
44658+ if (obj + len <= stack || stackend <= obj)
44659+ return 0;
44660+
44661+ if (obj < stack || stackend < obj + len)
44662+ return -1;
44663+
44664+#if defined(CONFIG_FRAME_POINTER) && defined(CONFIG_X86)
44665+ oldframe = __builtin_frame_address(1);
44666+ if (oldframe)
44667+ frame = __builtin_frame_address(2);
44668+ /*
44669+ low ----------------------------------------------> high
44670+ [saved bp][saved ip][args][local vars][saved bp][saved ip]
44671+ ^----------------^
44672+ allow copies only within here
44673+ */
44674+ while (stack <= frame && frame < stackend) {
44675+ /* if obj + len extends past the last frame, this
44676+ check won't pass and the next frame will be 0,
44677+ causing us to bail out and correctly report
44678+ the copy as invalid
44679+ */
44680+ if (obj + len <= frame)
44681+ return obj >= oldframe + 2 * sizeof(void *) ? 2 : -1;
44682+ oldframe = frame;
44683+ frame = *(const void * const *)frame;
44684+ }
44685+ return -1;
44686+#else
44687+ return 1;
44688+#endif
44689+}
44690+
44691+__noreturn void pax_report_usercopy(const void *ptr, unsigned long len, bool to, const char *type)
44692+{
44693+ if (current->signal->curr_ip)
44694+ printk(KERN_ERR "PAX: From %pI4: kernel memory %s attempt detected %s %p (%s) (%lu bytes)\n",
44695+ &current->signal->curr_ip, to ? "leak" : "overwrite", to ? "from" : "to", ptr, type ? : "unknown", len);
44696+ else
44697+ printk(KERN_ERR "PAX: kernel memory %s attempt detected %s %p (%s) (%lu bytes)\n",
44698+ to ? "leak" : "overwrite", to ? "from" : "to", ptr, type ? : "unknown", len);
44699+ dump_stack();
44700+ gr_handle_kernel_exploit();
44701+ do_group_exit(SIGKILL);
44702+}
44703+#endif
44704+
44705+#ifdef CONFIG_PAX_MEMORY_STACKLEAK
44706+void pax_track_stack(void)
44707+{
44708+ unsigned long sp = (unsigned long)&sp;
44709+ if (sp < current_thread_info()->lowest_stack &&
44710+ sp > (unsigned long)task_stack_page(current))
44711+ current_thread_info()->lowest_stack = sp;
44712+}
44713+EXPORT_SYMBOL(pax_track_stack);
44714+#endif
44715+
44716+#ifdef CONFIG_PAX_SIZE_OVERFLOW
44717+void report_size_overflow(const char *file, unsigned int line, const char *func)
44718+{
44719+ printk(KERN_ERR "PAX: size overflow detected in function %s %s:%u\n", func, file, line);
44720+ dump_stack();
44721+ do_group_exit(SIGKILL);
44722+}
44723+EXPORT_SYMBOL(report_size_overflow);
44724+#endif
44725+
44726 static int zap_process(struct task_struct *start, int exit_code)
44727 {
44728 struct task_struct *t;
44729@@ -2023,17 +2371,17 @@ static void wait_for_dump_helpers(struct file *file)
44730 pipe = file->f_path.dentry->d_inode->i_pipe;
44731
44732 pipe_lock(pipe);
44733- pipe->readers++;
44734- pipe->writers--;
44735+ atomic_inc(&pipe->readers);
44736+ atomic_dec(&pipe->writers);
44737
44738- while ((pipe->readers > 1) && (!signal_pending(current))) {
44739+ while ((atomic_read(&pipe->readers) > 1) && (!signal_pending(current))) {
44740 wake_up_interruptible_sync(&pipe->wait);
44741 kill_fasync(&pipe->fasync_readers, SIGIO, POLL_IN);
44742 pipe_wait(pipe);
44743 }
44744
44745- pipe->readers--;
44746- pipe->writers++;
44747+ atomic_dec(&pipe->readers);
44748+ atomic_inc(&pipe->writers);
44749 pipe_unlock(pipe);
44750
44751 }
44752@@ -2094,7 +2442,7 @@ void do_coredump(long signr, int exit_code, struct pt_regs *regs)
44753 int retval = 0;
44754 int flag = 0;
44755 int ispipe;
44756- static atomic_t core_dump_count = ATOMIC_INIT(0);
44757+ static atomic_unchecked_t core_dump_count = ATOMIC_INIT(0);
44758 struct coredump_params cprm = {
44759 .signr = signr,
44760 .regs = regs,
44761@@ -2109,6 +2457,9 @@ void do_coredump(long signr, int exit_code, struct pt_regs *regs)
44762
44763 audit_core_dumps(signr);
44764
44765+ if (signr == SIGSEGV || signr == SIGBUS || signr == SIGKILL || signr == SIGILL)
44766+ gr_handle_brute_attach(current, cprm.mm_flags);
44767+
44768 binfmt = mm->binfmt;
44769 if (!binfmt || !binfmt->core_dump)
44770 goto fail;
44771@@ -2176,7 +2527,7 @@ void do_coredump(long signr, int exit_code, struct pt_regs *regs)
44772 }
44773 cprm.limit = RLIM_INFINITY;
44774
44775- dump_count = atomic_inc_return(&core_dump_count);
44776+ dump_count = atomic_inc_return_unchecked(&core_dump_count);
44777 if (core_pipe_limit && (core_pipe_limit < dump_count)) {
44778 printk(KERN_WARNING "Pid %d(%s) over core_pipe_limit\n",
44779 task_tgid_vnr(current), current->comm);
44780@@ -2203,6 +2554,8 @@ void do_coredump(long signr, int exit_code, struct pt_regs *regs)
44781 } else {
44782 struct inode *inode;
44783
44784+ gr_learn_resource(current, RLIMIT_CORE, binfmt->min_coredump, 1);
44785+
44786 if (cprm.limit < binfmt->min_coredump)
44787 goto fail_unlock;
44788
44789@@ -2246,7 +2599,7 @@ close_fail:
44790 filp_close(cprm.file, NULL);
44791 fail_dropcount:
44792 if (ispipe)
44793- atomic_dec(&core_dump_count);
44794+ atomic_dec_unchecked(&core_dump_count);
44795 fail_unlock:
44796 kfree(cn.corename);
44797 fail_corename:
44798@@ -2265,7 +2618,7 @@ fail:
44799 */
44800 int dump_write(struct file *file, const void *addr, int nr)
44801 {
44802- return access_ok(VERIFY_READ, addr, nr) && file->f_op->write(file, addr, nr, &file->f_pos) == nr;
44803+ return access_ok(VERIFY_READ, addr, nr) && file->f_op->write(file, (const char __force_user *)addr, nr, &file->f_pos) == nr;
44804 }
44805 EXPORT_SYMBOL(dump_write);
44806
44807diff --git a/fs/ext2/balloc.c b/fs/ext2/balloc.c
44808index a8cbe1b..fed04cb 100644
44809--- a/fs/ext2/balloc.c
44810+++ b/fs/ext2/balloc.c
44811@@ -1192,7 +1192,7 @@ static int ext2_has_free_blocks(struct ext2_sb_info *sbi)
44812
44813 free_blocks = percpu_counter_read_positive(&sbi->s_freeblocks_counter);
44814 root_blocks = le32_to_cpu(sbi->s_es->s_r_blocks_count);
44815- if (free_blocks < root_blocks + 1 && !capable(CAP_SYS_RESOURCE) &&
44816+ if (free_blocks < root_blocks + 1 && !capable_nolog(CAP_SYS_RESOURCE) &&
44817 sbi->s_resuid != current_fsuid() &&
44818 (sbi->s_resgid == 0 || !in_group_p (sbi->s_resgid))) {
44819 return 0;
44820diff --git a/fs/ext3/balloc.c b/fs/ext3/balloc.c
44821index a203892..4e64db5 100644
44822--- a/fs/ext3/balloc.c
44823+++ b/fs/ext3/balloc.c
44824@@ -1446,9 +1446,10 @@ static int ext3_has_free_blocks(struct ext3_sb_info *sbi, int use_reservation)
44825
44826 free_blocks = percpu_counter_read_positive(&sbi->s_freeblocks_counter);
44827 root_blocks = le32_to_cpu(sbi->s_es->s_r_blocks_count);
44828- if (free_blocks < root_blocks + 1 && !capable(CAP_SYS_RESOURCE) &&
44829+ if (free_blocks < root_blocks + 1 &&
44830 !use_reservation && sbi->s_resuid != current_fsuid() &&
44831- (sbi->s_resgid == 0 || !in_group_p (sbi->s_resgid))) {
44832+ (sbi->s_resgid == 0 || !in_group_p (sbi->s_resgid)) &&
44833+ !capable_nolog(CAP_SYS_RESOURCE)) {
44834 return 0;
44835 }
44836 return 1;
44837diff --git a/fs/ext4/balloc.c b/fs/ext4/balloc.c
44838index 12ccacd..a6035fce0 100644
44839--- a/fs/ext4/balloc.c
44840+++ b/fs/ext4/balloc.c
44841@@ -436,8 +436,8 @@ static int ext4_has_free_clusters(struct ext4_sb_info *sbi,
44842 /* Hm, nope. Are (enough) root reserved clusters available? */
44843 if (sbi->s_resuid == current_fsuid() ||
44844 ((sbi->s_resgid != 0) && in_group_p(sbi->s_resgid)) ||
44845- capable(CAP_SYS_RESOURCE) ||
44846- (flags & EXT4_MB_USE_ROOT_BLOCKS)) {
44847+ (flags & EXT4_MB_USE_ROOT_BLOCKS) ||
44848+ capable_nolog(CAP_SYS_RESOURCE)) {
44849
44850 if (free_clusters >= (nclusters + dirty_clusters))
44851 return 1;
44852diff --git a/fs/ext4/ext4.h b/fs/ext4/ext4.h
44853index 5b0e26a..0aa002d 100644
44854--- a/fs/ext4/ext4.h
44855+++ b/fs/ext4/ext4.h
44856@@ -1208,19 +1208,19 @@ struct ext4_sb_info {
44857 unsigned long s_mb_last_start;
44858
44859 /* stats for buddy allocator */
44860- atomic_t s_bal_reqs; /* number of reqs with len > 1 */
44861- atomic_t s_bal_success; /* we found long enough chunks */
44862- atomic_t s_bal_allocated; /* in blocks */
44863- atomic_t s_bal_ex_scanned; /* total extents scanned */
44864- atomic_t s_bal_goals; /* goal hits */
44865- atomic_t s_bal_breaks; /* too long searches */
44866- atomic_t s_bal_2orders; /* 2^order hits */
44867+ atomic_unchecked_t s_bal_reqs; /* number of reqs with len > 1 */
44868+ atomic_unchecked_t s_bal_success; /* we found long enough chunks */
44869+ atomic_unchecked_t s_bal_allocated; /* in blocks */
44870+ atomic_unchecked_t s_bal_ex_scanned; /* total extents scanned */
44871+ atomic_unchecked_t s_bal_goals; /* goal hits */
44872+ atomic_unchecked_t s_bal_breaks; /* too long searches */
44873+ atomic_unchecked_t s_bal_2orders; /* 2^order hits */
44874 spinlock_t s_bal_lock;
44875 unsigned long s_mb_buddies_generated;
44876 unsigned long long s_mb_generation_time;
44877- atomic_t s_mb_lost_chunks;
44878- atomic_t s_mb_preallocated;
44879- atomic_t s_mb_discarded;
44880+ atomic_unchecked_t s_mb_lost_chunks;
44881+ atomic_unchecked_t s_mb_preallocated;
44882+ atomic_unchecked_t s_mb_discarded;
44883 atomic_t s_lock_busy;
44884
44885 /* locality groups */
44886diff --git a/fs/ext4/mballoc.c b/fs/ext4/mballoc.c
44887index e2d8be8..c7f0ce9 100644
44888--- a/fs/ext4/mballoc.c
44889+++ b/fs/ext4/mballoc.c
44890@@ -1794,7 +1794,7 @@ void ext4_mb_simple_scan_group(struct ext4_allocation_context *ac,
44891 BUG_ON(ac->ac_b_ex.fe_len != ac->ac_g_ex.fe_len);
44892
44893 if (EXT4_SB(sb)->s_mb_stats)
44894- atomic_inc(&EXT4_SB(sb)->s_bal_2orders);
44895+ atomic_inc_unchecked(&EXT4_SB(sb)->s_bal_2orders);
44896
44897 break;
44898 }
44899@@ -2088,7 +2088,7 @@ repeat:
44900 ac->ac_status = AC_STATUS_CONTINUE;
44901 ac->ac_flags |= EXT4_MB_HINT_FIRST;
44902 cr = 3;
44903- atomic_inc(&sbi->s_mb_lost_chunks);
44904+ atomic_inc_unchecked(&sbi->s_mb_lost_chunks);
44905 goto repeat;
44906 }
44907 }
44908@@ -2592,25 +2592,25 @@ int ext4_mb_release(struct super_block *sb)
44909 if (sbi->s_mb_stats) {
44910 ext4_msg(sb, KERN_INFO,
44911 "mballoc: %u blocks %u reqs (%u success)",
44912- atomic_read(&sbi->s_bal_allocated),
44913- atomic_read(&sbi->s_bal_reqs),
44914- atomic_read(&sbi->s_bal_success));
44915+ atomic_read_unchecked(&sbi->s_bal_allocated),
44916+ atomic_read_unchecked(&sbi->s_bal_reqs),
44917+ atomic_read_unchecked(&sbi->s_bal_success));
44918 ext4_msg(sb, KERN_INFO,
44919 "mballoc: %u extents scanned, %u goal hits, "
44920 "%u 2^N hits, %u breaks, %u lost",
44921- atomic_read(&sbi->s_bal_ex_scanned),
44922- atomic_read(&sbi->s_bal_goals),
44923- atomic_read(&sbi->s_bal_2orders),
44924- atomic_read(&sbi->s_bal_breaks),
44925- atomic_read(&sbi->s_mb_lost_chunks));
44926+ atomic_read_unchecked(&sbi->s_bal_ex_scanned),
44927+ atomic_read_unchecked(&sbi->s_bal_goals),
44928+ atomic_read_unchecked(&sbi->s_bal_2orders),
44929+ atomic_read_unchecked(&sbi->s_bal_breaks),
44930+ atomic_read_unchecked(&sbi->s_mb_lost_chunks));
44931 ext4_msg(sb, KERN_INFO,
44932 "mballoc: %lu generated and it took %Lu",
44933 sbi->s_mb_buddies_generated,
44934 sbi->s_mb_generation_time);
44935 ext4_msg(sb, KERN_INFO,
44936 "mballoc: %u preallocated, %u discarded",
44937- atomic_read(&sbi->s_mb_preallocated),
44938- atomic_read(&sbi->s_mb_discarded));
44939+ atomic_read_unchecked(&sbi->s_mb_preallocated),
44940+ atomic_read_unchecked(&sbi->s_mb_discarded));
44941 }
44942
44943 free_percpu(sbi->s_locality_groups);
44944@@ -3096,16 +3096,16 @@ static void ext4_mb_collect_stats(struct ext4_allocation_context *ac)
44945 struct ext4_sb_info *sbi = EXT4_SB(ac->ac_sb);
44946
44947 if (sbi->s_mb_stats && ac->ac_g_ex.fe_len > 1) {
44948- atomic_inc(&sbi->s_bal_reqs);
44949- atomic_add(ac->ac_b_ex.fe_len, &sbi->s_bal_allocated);
44950+ atomic_inc_unchecked(&sbi->s_bal_reqs);
44951+ atomic_add_unchecked(ac->ac_b_ex.fe_len, &sbi->s_bal_allocated);
44952 if (ac->ac_b_ex.fe_len >= ac->ac_o_ex.fe_len)
44953- atomic_inc(&sbi->s_bal_success);
44954- atomic_add(ac->ac_found, &sbi->s_bal_ex_scanned);
44955+ atomic_inc_unchecked(&sbi->s_bal_success);
44956+ atomic_add_unchecked(ac->ac_found, &sbi->s_bal_ex_scanned);
44957 if (ac->ac_g_ex.fe_start == ac->ac_b_ex.fe_start &&
44958 ac->ac_g_ex.fe_group == ac->ac_b_ex.fe_group)
44959- atomic_inc(&sbi->s_bal_goals);
44960+ atomic_inc_unchecked(&sbi->s_bal_goals);
44961 if (ac->ac_found > sbi->s_mb_max_to_scan)
44962- atomic_inc(&sbi->s_bal_breaks);
44963+ atomic_inc_unchecked(&sbi->s_bal_breaks);
44964 }
44965
44966 if (ac->ac_op == EXT4_MB_HISTORY_ALLOC)
44967@@ -3509,7 +3509,7 @@ ext4_mb_new_inode_pa(struct ext4_allocation_context *ac)
44968 trace_ext4_mb_new_inode_pa(ac, pa);
44969
44970 ext4_mb_use_inode_pa(ac, pa);
44971- atomic_add(pa->pa_free, &sbi->s_mb_preallocated);
44972+ atomic_add_unchecked(pa->pa_free, &sbi->s_mb_preallocated);
44973
44974 ei = EXT4_I(ac->ac_inode);
44975 grp = ext4_get_group_info(sb, ac->ac_b_ex.fe_group);
44976@@ -3569,7 +3569,7 @@ ext4_mb_new_group_pa(struct ext4_allocation_context *ac)
44977 trace_ext4_mb_new_group_pa(ac, pa);
44978
44979 ext4_mb_use_group_pa(ac, pa);
44980- atomic_add(pa->pa_free, &EXT4_SB(sb)->s_mb_preallocated);
44981+ atomic_add_unchecked(pa->pa_free, &EXT4_SB(sb)->s_mb_preallocated);
44982
44983 grp = ext4_get_group_info(sb, ac->ac_b_ex.fe_group);
44984 lg = ac->ac_lg;
44985@@ -3658,7 +3658,7 @@ ext4_mb_release_inode_pa(struct ext4_buddy *e4b, struct buffer_head *bitmap_bh,
44986 * from the bitmap and continue.
44987 */
44988 }
44989- atomic_add(free, &sbi->s_mb_discarded);
44990+ atomic_add_unchecked(free, &sbi->s_mb_discarded);
44991
44992 return err;
44993 }
44994@@ -3676,7 +3676,7 @@ ext4_mb_release_group_pa(struct ext4_buddy *e4b,
44995 ext4_get_group_no_and_offset(sb, pa->pa_pstart, &group, &bit);
44996 BUG_ON(group != e4b->bd_group && pa->pa_len != 0);
44997 mb_free_blocks(pa->pa_inode, e4b, bit, pa->pa_len);
44998- atomic_add(pa->pa_len, &EXT4_SB(sb)->s_mb_discarded);
44999+ atomic_add_unchecked(pa->pa_len, &EXT4_SB(sb)->s_mb_discarded);
45000 trace_ext4_mballoc_discard(sb, NULL, group, bit, pa->pa_len);
45001
45002 return 0;
45003diff --git a/fs/fcntl.c b/fs/fcntl.c
45004index 22764c7..86372c9 100644
45005--- a/fs/fcntl.c
45006+++ b/fs/fcntl.c
45007@@ -224,6 +224,11 @@ int __f_setown(struct file *filp, struct pid *pid, enum pid_type type,
45008 if (err)
45009 return err;
45010
45011+ if (gr_handle_chroot_fowner(pid, type))
45012+ return -ENOENT;
45013+ if (gr_check_protected_task_fowner(pid, type))
45014+ return -EACCES;
45015+
45016 f_modown(filp, pid, type, force);
45017 return 0;
45018 }
45019@@ -266,7 +271,7 @@ pid_t f_getown(struct file *filp)
45020
45021 static int f_setown_ex(struct file *filp, unsigned long arg)
45022 {
45023- struct f_owner_ex * __user owner_p = (void * __user)arg;
45024+ struct f_owner_ex __user *owner_p = (void __user *)arg;
45025 struct f_owner_ex owner;
45026 struct pid *pid;
45027 int type;
45028@@ -306,7 +311,7 @@ static int f_setown_ex(struct file *filp, unsigned long arg)
45029
45030 static int f_getown_ex(struct file *filp, unsigned long arg)
45031 {
45032- struct f_owner_ex * __user owner_p = (void * __user)arg;
45033+ struct f_owner_ex __user *owner_p = (void __user *)arg;
45034 struct f_owner_ex owner;
45035 int ret = 0;
45036
45037@@ -348,6 +353,7 @@ static long do_fcntl(int fd, unsigned int cmd, unsigned long arg,
45038 switch (cmd) {
45039 case F_DUPFD:
45040 case F_DUPFD_CLOEXEC:
45041+ gr_learn_resource(current, RLIMIT_NOFILE, arg, 0);
45042 if (arg >= rlimit(RLIMIT_NOFILE))
45043 break;
45044 err = alloc_fd(arg, cmd == F_DUPFD_CLOEXEC ? O_CLOEXEC : 0);
45045diff --git a/fs/fifo.c b/fs/fifo.c
45046index b1a524d..4ee270e 100644
45047--- a/fs/fifo.c
45048+++ b/fs/fifo.c
45049@@ -58,10 +58,10 @@ static int fifo_open(struct inode *inode, struct file *filp)
45050 */
45051 filp->f_op = &read_pipefifo_fops;
45052 pipe->r_counter++;
45053- if (pipe->readers++ == 0)
45054+ if (atomic_inc_return(&pipe->readers) == 1)
45055 wake_up_partner(inode);
45056
45057- if (!pipe->writers) {
45058+ if (!atomic_read(&pipe->writers)) {
45059 if ((filp->f_flags & O_NONBLOCK)) {
45060 /* suppress POLLHUP until we have
45061 * seen a writer */
45062@@ -81,15 +81,15 @@ static int fifo_open(struct inode *inode, struct file *filp)
45063 * errno=ENXIO when there is no process reading the FIFO.
45064 */
45065 ret = -ENXIO;
45066- if ((filp->f_flags & O_NONBLOCK) && !pipe->readers)
45067+ if ((filp->f_flags & O_NONBLOCK) && !atomic_read(&pipe->readers))
45068 goto err;
45069
45070 filp->f_op = &write_pipefifo_fops;
45071 pipe->w_counter++;
45072- if (!pipe->writers++)
45073+ if (atomic_inc_return(&pipe->writers) == 1)
45074 wake_up_partner(inode);
45075
45076- if (!pipe->readers) {
45077+ if (!atomic_read(&pipe->readers)) {
45078 wait_for_partner(inode, &pipe->r_counter);
45079 if (signal_pending(current))
45080 goto err_wr;
45081@@ -105,11 +105,11 @@ static int fifo_open(struct inode *inode, struct file *filp)
45082 */
45083 filp->f_op = &rdwr_pipefifo_fops;
45084
45085- pipe->readers++;
45086- pipe->writers++;
45087+ atomic_inc(&pipe->readers);
45088+ atomic_inc(&pipe->writers);
45089 pipe->r_counter++;
45090 pipe->w_counter++;
45091- if (pipe->readers == 1 || pipe->writers == 1)
45092+ if (atomic_read(&pipe->readers) == 1 || atomic_read(&pipe->writers) == 1)
45093 wake_up_partner(inode);
45094 break;
45095
45096@@ -123,19 +123,19 @@ static int fifo_open(struct inode *inode, struct file *filp)
45097 return 0;
45098
45099 err_rd:
45100- if (!--pipe->readers)
45101+ if (atomic_dec_and_test(&pipe->readers))
45102 wake_up_interruptible(&pipe->wait);
45103 ret = -ERESTARTSYS;
45104 goto err;
45105
45106 err_wr:
45107- if (!--pipe->writers)
45108+ if (atomic_dec_and_test(&pipe->writers))
45109 wake_up_interruptible(&pipe->wait);
45110 ret = -ERESTARTSYS;
45111 goto err;
45112
45113 err:
45114- if (!pipe->readers && !pipe->writers)
45115+ if (!atomic_read(&pipe->readers) && !atomic_read(&pipe->writers))
45116 free_pipe_info(inode);
45117
45118 err_nocleanup:
45119diff --git a/fs/file.c b/fs/file.c
45120index 4c6992d..104cdea 100644
45121--- a/fs/file.c
45122+++ b/fs/file.c
45123@@ -15,6 +15,7 @@
45124 #include <linux/slab.h>
45125 #include <linux/vmalloc.h>
45126 #include <linux/file.h>
45127+#include <linux/security.h>
45128 #include <linux/fdtable.h>
45129 #include <linux/bitops.h>
45130 #include <linux/interrupt.h>
45131@@ -254,6 +255,7 @@ int expand_files(struct files_struct *files, int nr)
45132 * N.B. For clone tasks sharing a files structure, this test
45133 * will limit the total number of files that can be opened.
45134 */
45135+ gr_learn_resource(current, RLIMIT_NOFILE, nr, 0);
45136 if (nr >= rlimit(RLIMIT_NOFILE))
45137 return -EMFILE;
45138
45139diff --git a/fs/filesystems.c b/fs/filesystems.c
45140index 0845f84..7b4ebef 100644
45141--- a/fs/filesystems.c
45142+++ b/fs/filesystems.c
45143@@ -274,7 +274,12 @@ struct file_system_type *get_fs_type(const char *name)
45144 int len = dot ? dot - name : strlen(name);
45145
45146 fs = __get_fs_type(name, len);
45147+
45148+#ifdef CONFIG_GRKERNSEC_MODHARDEN
45149+ if (!fs && (___request_module(true, "grsec_modharden_fs", "%.*s", len, name) == 0))
45150+#else
45151 if (!fs && (request_module("%.*s", len, name) == 0))
45152+#endif
45153 fs = __get_fs_type(name, len);
45154
45155 if (dot && fs && !(fs->fs_flags & FS_HAS_SUBTYPE)) {
45156diff --git a/fs/fs_struct.c b/fs/fs_struct.c
45157index 78b519c..a8b4979 100644
45158--- a/fs/fs_struct.c
45159+++ b/fs/fs_struct.c
45160@@ -4,6 +4,7 @@
45161 #include <linux/path.h>
45162 #include <linux/slab.h>
45163 #include <linux/fs_struct.h>
45164+#include <linux/grsecurity.h>
45165 #include "internal.h"
45166
45167 static inline void path_get_longterm(struct path *path)
45168@@ -31,6 +32,7 @@ void set_fs_root(struct fs_struct *fs, struct path *path)
45169 old_root = fs->root;
45170 fs->root = *path;
45171 path_get_longterm(path);
45172+ gr_set_chroot_entries(current, path);
45173 write_seqcount_end(&fs->seq);
45174 spin_unlock(&fs->lock);
45175 if (old_root.dentry)
45176@@ -74,6 +76,7 @@ void chroot_fs_refs(struct path *old_root, struct path *new_root)
45177 && fs->root.mnt == old_root->mnt) {
45178 path_get_longterm(new_root);
45179 fs->root = *new_root;
45180+ gr_set_chroot_entries(p, new_root);
45181 count++;
45182 }
45183 if (fs->pwd.dentry == old_root->dentry
45184@@ -109,7 +112,8 @@ void exit_fs(struct task_struct *tsk)
45185 spin_lock(&fs->lock);
45186 write_seqcount_begin(&fs->seq);
45187 tsk->fs = NULL;
45188- kill = !--fs->users;
45189+ gr_clear_chroot_entries(tsk);
45190+ kill = !atomic_dec_return(&fs->users);
45191 write_seqcount_end(&fs->seq);
45192 spin_unlock(&fs->lock);
45193 task_unlock(tsk);
45194@@ -123,7 +127,7 @@ struct fs_struct *copy_fs_struct(struct fs_struct *old)
45195 struct fs_struct *fs = kmem_cache_alloc(fs_cachep, GFP_KERNEL);
45196 /* We don't need to lock fs - think why ;-) */
45197 if (fs) {
45198- fs->users = 1;
45199+ atomic_set(&fs->users, 1);
45200 fs->in_exec = 0;
45201 spin_lock_init(&fs->lock);
45202 seqcount_init(&fs->seq);
45203@@ -132,6 +136,9 @@ struct fs_struct *copy_fs_struct(struct fs_struct *old)
45204 spin_lock(&old->lock);
45205 fs->root = old->root;
45206 path_get_longterm(&fs->root);
45207+ /* instead of calling gr_set_chroot_entries here,
45208+ we call it from every caller of this function
45209+ */
45210 fs->pwd = old->pwd;
45211 path_get_longterm(&fs->pwd);
45212 spin_unlock(&old->lock);
45213@@ -150,8 +157,9 @@ int unshare_fs_struct(void)
45214
45215 task_lock(current);
45216 spin_lock(&fs->lock);
45217- kill = !--fs->users;
45218+ kill = !atomic_dec_return(&fs->users);
45219 current->fs = new_fs;
45220+ gr_set_chroot_entries(current, &new_fs->root);
45221 spin_unlock(&fs->lock);
45222 task_unlock(current);
45223
45224@@ -164,13 +172,13 @@ EXPORT_SYMBOL_GPL(unshare_fs_struct);
45225
45226 int current_umask(void)
45227 {
45228- return current->fs->umask;
45229+ return current->fs->umask | gr_acl_umask();
45230 }
45231 EXPORT_SYMBOL(current_umask);
45232
45233 /* to be mentioned only in INIT_TASK */
45234 struct fs_struct init_fs = {
45235- .users = 1,
45236+ .users = ATOMIC_INIT(1),
45237 .lock = __SPIN_LOCK_UNLOCKED(init_fs.lock),
45238 .seq = SEQCNT_ZERO,
45239 .umask = 0022,
45240@@ -186,12 +194,13 @@ void daemonize_fs_struct(void)
45241 task_lock(current);
45242
45243 spin_lock(&init_fs.lock);
45244- init_fs.users++;
45245+ atomic_inc(&init_fs.users);
45246 spin_unlock(&init_fs.lock);
45247
45248 spin_lock(&fs->lock);
45249 current->fs = &init_fs;
45250- kill = !--fs->users;
45251+ gr_set_chroot_entries(current, &current->fs->root);
45252+ kill = !atomic_dec_return(&fs->users);
45253 spin_unlock(&fs->lock);
45254
45255 task_unlock(current);
45256diff --git a/fs/fscache/cookie.c b/fs/fscache/cookie.c
45257index 9905350..02eaec4 100644
45258--- a/fs/fscache/cookie.c
45259+++ b/fs/fscache/cookie.c
45260@@ -68,11 +68,11 @@ struct fscache_cookie *__fscache_acquire_cookie(
45261 parent ? (char *) parent->def->name : "<no-parent>",
45262 def->name, netfs_data);
45263
45264- fscache_stat(&fscache_n_acquires);
45265+ fscache_stat_unchecked(&fscache_n_acquires);
45266
45267 /* if there's no parent cookie, then we don't create one here either */
45268 if (!parent) {
45269- fscache_stat(&fscache_n_acquires_null);
45270+ fscache_stat_unchecked(&fscache_n_acquires_null);
45271 _leave(" [no parent]");
45272 return NULL;
45273 }
45274@@ -87,7 +87,7 @@ struct fscache_cookie *__fscache_acquire_cookie(
45275 /* allocate and initialise a cookie */
45276 cookie = kmem_cache_alloc(fscache_cookie_jar, GFP_KERNEL);
45277 if (!cookie) {
45278- fscache_stat(&fscache_n_acquires_oom);
45279+ fscache_stat_unchecked(&fscache_n_acquires_oom);
45280 _leave(" [ENOMEM]");
45281 return NULL;
45282 }
45283@@ -109,13 +109,13 @@ struct fscache_cookie *__fscache_acquire_cookie(
45284
45285 switch (cookie->def->type) {
45286 case FSCACHE_COOKIE_TYPE_INDEX:
45287- fscache_stat(&fscache_n_cookie_index);
45288+ fscache_stat_unchecked(&fscache_n_cookie_index);
45289 break;
45290 case FSCACHE_COOKIE_TYPE_DATAFILE:
45291- fscache_stat(&fscache_n_cookie_data);
45292+ fscache_stat_unchecked(&fscache_n_cookie_data);
45293 break;
45294 default:
45295- fscache_stat(&fscache_n_cookie_special);
45296+ fscache_stat_unchecked(&fscache_n_cookie_special);
45297 break;
45298 }
45299
45300@@ -126,13 +126,13 @@ struct fscache_cookie *__fscache_acquire_cookie(
45301 if (fscache_acquire_non_index_cookie(cookie) < 0) {
45302 atomic_dec(&parent->n_children);
45303 __fscache_cookie_put(cookie);
45304- fscache_stat(&fscache_n_acquires_nobufs);
45305+ fscache_stat_unchecked(&fscache_n_acquires_nobufs);
45306 _leave(" = NULL");
45307 return NULL;
45308 }
45309 }
45310
45311- fscache_stat(&fscache_n_acquires_ok);
45312+ fscache_stat_unchecked(&fscache_n_acquires_ok);
45313 _leave(" = %p", cookie);
45314 return cookie;
45315 }
45316@@ -168,7 +168,7 @@ static int fscache_acquire_non_index_cookie(struct fscache_cookie *cookie)
45317 cache = fscache_select_cache_for_object(cookie->parent);
45318 if (!cache) {
45319 up_read(&fscache_addremove_sem);
45320- fscache_stat(&fscache_n_acquires_no_cache);
45321+ fscache_stat_unchecked(&fscache_n_acquires_no_cache);
45322 _leave(" = -ENOMEDIUM [no cache]");
45323 return -ENOMEDIUM;
45324 }
45325@@ -256,12 +256,12 @@ static int fscache_alloc_object(struct fscache_cache *cache,
45326 object = cache->ops->alloc_object(cache, cookie);
45327 fscache_stat_d(&fscache_n_cop_alloc_object);
45328 if (IS_ERR(object)) {
45329- fscache_stat(&fscache_n_object_no_alloc);
45330+ fscache_stat_unchecked(&fscache_n_object_no_alloc);
45331 ret = PTR_ERR(object);
45332 goto error;
45333 }
45334
45335- fscache_stat(&fscache_n_object_alloc);
45336+ fscache_stat_unchecked(&fscache_n_object_alloc);
45337
45338 object->debug_id = atomic_inc_return(&fscache_object_debug_id);
45339
45340@@ -377,10 +377,10 @@ void __fscache_update_cookie(struct fscache_cookie *cookie)
45341 struct fscache_object *object;
45342 struct hlist_node *_p;
45343
45344- fscache_stat(&fscache_n_updates);
45345+ fscache_stat_unchecked(&fscache_n_updates);
45346
45347 if (!cookie) {
45348- fscache_stat(&fscache_n_updates_null);
45349+ fscache_stat_unchecked(&fscache_n_updates_null);
45350 _leave(" [no cookie]");
45351 return;
45352 }
45353@@ -414,12 +414,12 @@ void __fscache_relinquish_cookie(struct fscache_cookie *cookie, int retire)
45354 struct fscache_object *object;
45355 unsigned long event;
45356
45357- fscache_stat(&fscache_n_relinquishes);
45358+ fscache_stat_unchecked(&fscache_n_relinquishes);
45359 if (retire)
45360- fscache_stat(&fscache_n_relinquishes_retire);
45361+ fscache_stat_unchecked(&fscache_n_relinquishes_retire);
45362
45363 if (!cookie) {
45364- fscache_stat(&fscache_n_relinquishes_null);
45365+ fscache_stat_unchecked(&fscache_n_relinquishes_null);
45366 _leave(" [no cookie]");
45367 return;
45368 }
45369@@ -435,7 +435,7 @@ void __fscache_relinquish_cookie(struct fscache_cookie *cookie, int retire)
45370
45371 /* wait for the cookie to finish being instantiated (or to fail) */
45372 if (test_bit(FSCACHE_COOKIE_CREATING, &cookie->flags)) {
45373- fscache_stat(&fscache_n_relinquishes_waitcrt);
45374+ fscache_stat_unchecked(&fscache_n_relinquishes_waitcrt);
45375 wait_on_bit(&cookie->flags, FSCACHE_COOKIE_CREATING,
45376 fscache_wait_bit, TASK_UNINTERRUPTIBLE);
45377 }
45378diff --git a/fs/fscache/internal.h b/fs/fscache/internal.h
45379index f6aad48..88dcf26 100644
45380--- a/fs/fscache/internal.h
45381+++ b/fs/fscache/internal.h
45382@@ -144,94 +144,94 @@ extern void fscache_proc_cleanup(void);
45383 extern atomic_t fscache_n_ops_processed[FSCACHE_MAX_THREADS];
45384 extern atomic_t fscache_n_objs_processed[FSCACHE_MAX_THREADS];
45385
45386-extern atomic_t fscache_n_op_pend;
45387-extern atomic_t fscache_n_op_run;
45388-extern atomic_t fscache_n_op_enqueue;
45389-extern atomic_t fscache_n_op_deferred_release;
45390-extern atomic_t fscache_n_op_release;
45391-extern atomic_t fscache_n_op_gc;
45392-extern atomic_t fscache_n_op_cancelled;
45393-extern atomic_t fscache_n_op_rejected;
45394+extern atomic_unchecked_t fscache_n_op_pend;
45395+extern atomic_unchecked_t fscache_n_op_run;
45396+extern atomic_unchecked_t fscache_n_op_enqueue;
45397+extern atomic_unchecked_t fscache_n_op_deferred_release;
45398+extern atomic_unchecked_t fscache_n_op_release;
45399+extern atomic_unchecked_t fscache_n_op_gc;
45400+extern atomic_unchecked_t fscache_n_op_cancelled;
45401+extern atomic_unchecked_t fscache_n_op_rejected;
45402
45403-extern atomic_t fscache_n_attr_changed;
45404-extern atomic_t fscache_n_attr_changed_ok;
45405-extern atomic_t fscache_n_attr_changed_nobufs;
45406-extern atomic_t fscache_n_attr_changed_nomem;
45407-extern atomic_t fscache_n_attr_changed_calls;
45408+extern atomic_unchecked_t fscache_n_attr_changed;
45409+extern atomic_unchecked_t fscache_n_attr_changed_ok;
45410+extern atomic_unchecked_t fscache_n_attr_changed_nobufs;
45411+extern atomic_unchecked_t fscache_n_attr_changed_nomem;
45412+extern atomic_unchecked_t fscache_n_attr_changed_calls;
45413
45414-extern atomic_t fscache_n_allocs;
45415-extern atomic_t fscache_n_allocs_ok;
45416-extern atomic_t fscache_n_allocs_wait;
45417-extern atomic_t fscache_n_allocs_nobufs;
45418-extern atomic_t fscache_n_allocs_intr;
45419-extern atomic_t fscache_n_allocs_object_dead;
45420-extern atomic_t fscache_n_alloc_ops;
45421-extern atomic_t fscache_n_alloc_op_waits;
45422+extern atomic_unchecked_t fscache_n_allocs;
45423+extern atomic_unchecked_t fscache_n_allocs_ok;
45424+extern atomic_unchecked_t fscache_n_allocs_wait;
45425+extern atomic_unchecked_t fscache_n_allocs_nobufs;
45426+extern atomic_unchecked_t fscache_n_allocs_intr;
45427+extern atomic_unchecked_t fscache_n_allocs_object_dead;
45428+extern atomic_unchecked_t fscache_n_alloc_ops;
45429+extern atomic_unchecked_t fscache_n_alloc_op_waits;
45430
45431-extern atomic_t fscache_n_retrievals;
45432-extern atomic_t fscache_n_retrievals_ok;
45433-extern atomic_t fscache_n_retrievals_wait;
45434-extern atomic_t fscache_n_retrievals_nodata;
45435-extern atomic_t fscache_n_retrievals_nobufs;
45436-extern atomic_t fscache_n_retrievals_intr;
45437-extern atomic_t fscache_n_retrievals_nomem;
45438-extern atomic_t fscache_n_retrievals_object_dead;
45439-extern atomic_t fscache_n_retrieval_ops;
45440-extern atomic_t fscache_n_retrieval_op_waits;
45441+extern atomic_unchecked_t fscache_n_retrievals;
45442+extern atomic_unchecked_t fscache_n_retrievals_ok;
45443+extern atomic_unchecked_t fscache_n_retrievals_wait;
45444+extern atomic_unchecked_t fscache_n_retrievals_nodata;
45445+extern atomic_unchecked_t fscache_n_retrievals_nobufs;
45446+extern atomic_unchecked_t fscache_n_retrievals_intr;
45447+extern atomic_unchecked_t fscache_n_retrievals_nomem;
45448+extern atomic_unchecked_t fscache_n_retrievals_object_dead;
45449+extern atomic_unchecked_t fscache_n_retrieval_ops;
45450+extern atomic_unchecked_t fscache_n_retrieval_op_waits;
45451
45452-extern atomic_t fscache_n_stores;
45453-extern atomic_t fscache_n_stores_ok;
45454-extern atomic_t fscache_n_stores_again;
45455-extern atomic_t fscache_n_stores_nobufs;
45456-extern atomic_t fscache_n_stores_oom;
45457-extern atomic_t fscache_n_store_ops;
45458-extern atomic_t fscache_n_store_calls;
45459-extern atomic_t fscache_n_store_pages;
45460-extern atomic_t fscache_n_store_radix_deletes;
45461-extern atomic_t fscache_n_store_pages_over_limit;
45462+extern atomic_unchecked_t fscache_n_stores;
45463+extern atomic_unchecked_t fscache_n_stores_ok;
45464+extern atomic_unchecked_t fscache_n_stores_again;
45465+extern atomic_unchecked_t fscache_n_stores_nobufs;
45466+extern atomic_unchecked_t fscache_n_stores_oom;
45467+extern atomic_unchecked_t fscache_n_store_ops;
45468+extern atomic_unchecked_t fscache_n_store_calls;
45469+extern atomic_unchecked_t fscache_n_store_pages;
45470+extern atomic_unchecked_t fscache_n_store_radix_deletes;
45471+extern atomic_unchecked_t fscache_n_store_pages_over_limit;
45472
45473-extern atomic_t fscache_n_store_vmscan_not_storing;
45474-extern atomic_t fscache_n_store_vmscan_gone;
45475-extern atomic_t fscache_n_store_vmscan_busy;
45476-extern atomic_t fscache_n_store_vmscan_cancelled;
45477+extern atomic_unchecked_t fscache_n_store_vmscan_not_storing;
45478+extern atomic_unchecked_t fscache_n_store_vmscan_gone;
45479+extern atomic_unchecked_t fscache_n_store_vmscan_busy;
45480+extern atomic_unchecked_t fscache_n_store_vmscan_cancelled;
45481
45482-extern atomic_t fscache_n_marks;
45483-extern atomic_t fscache_n_uncaches;
45484+extern atomic_unchecked_t fscache_n_marks;
45485+extern atomic_unchecked_t fscache_n_uncaches;
45486
45487-extern atomic_t fscache_n_acquires;
45488-extern atomic_t fscache_n_acquires_null;
45489-extern atomic_t fscache_n_acquires_no_cache;
45490-extern atomic_t fscache_n_acquires_ok;
45491-extern atomic_t fscache_n_acquires_nobufs;
45492-extern atomic_t fscache_n_acquires_oom;
45493+extern atomic_unchecked_t fscache_n_acquires;
45494+extern atomic_unchecked_t fscache_n_acquires_null;
45495+extern atomic_unchecked_t fscache_n_acquires_no_cache;
45496+extern atomic_unchecked_t fscache_n_acquires_ok;
45497+extern atomic_unchecked_t fscache_n_acquires_nobufs;
45498+extern atomic_unchecked_t fscache_n_acquires_oom;
45499
45500-extern atomic_t fscache_n_updates;
45501-extern atomic_t fscache_n_updates_null;
45502-extern atomic_t fscache_n_updates_run;
45503+extern atomic_unchecked_t fscache_n_updates;
45504+extern atomic_unchecked_t fscache_n_updates_null;
45505+extern atomic_unchecked_t fscache_n_updates_run;
45506
45507-extern atomic_t fscache_n_relinquishes;
45508-extern atomic_t fscache_n_relinquishes_null;
45509-extern atomic_t fscache_n_relinquishes_waitcrt;
45510-extern atomic_t fscache_n_relinquishes_retire;
45511+extern atomic_unchecked_t fscache_n_relinquishes;
45512+extern atomic_unchecked_t fscache_n_relinquishes_null;
45513+extern atomic_unchecked_t fscache_n_relinquishes_waitcrt;
45514+extern atomic_unchecked_t fscache_n_relinquishes_retire;
45515
45516-extern atomic_t fscache_n_cookie_index;
45517-extern atomic_t fscache_n_cookie_data;
45518-extern atomic_t fscache_n_cookie_special;
45519+extern atomic_unchecked_t fscache_n_cookie_index;
45520+extern atomic_unchecked_t fscache_n_cookie_data;
45521+extern atomic_unchecked_t fscache_n_cookie_special;
45522
45523-extern atomic_t fscache_n_object_alloc;
45524-extern atomic_t fscache_n_object_no_alloc;
45525-extern atomic_t fscache_n_object_lookups;
45526-extern atomic_t fscache_n_object_lookups_negative;
45527-extern atomic_t fscache_n_object_lookups_positive;
45528-extern atomic_t fscache_n_object_lookups_timed_out;
45529-extern atomic_t fscache_n_object_created;
45530-extern atomic_t fscache_n_object_avail;
45531-extern atomic_t fscache_n_object_dead;
45532+extern atomic_unchecked_t fscache_n_object_alloc;
45533+extern atomic_unchecked_t fscache_n_object_no_alloc;
45534+extern atomic_unchecked_t fscache_n_object_lookups;
45535+extern atomic_unchecked_t fscache_n_object_lookups_negative;
45536+extern atomic_unchecked_t fscache_n_object_lookups_positive;
45537+extern atomic_unchecked_t fscache_n_object_lookups_timed_out;
45538+extern atomic_unchecked_t fscache_n_object_created;
45539+extern atomic_unchecked_t fscache_n_object_avail;
45540+extern atomic_unchecked_t fscache_n_object_dead;
45541
45542-extern atomic_t fscache_n_checkaux_none;
45543-extern atomic_t fscache_n_checkaux_okay;
45544-extern atomic_t fscache_n_checkaux_update;
45545-extern atomic_t fscache_n_checkaux_obsolete;
45546+extern atomic_unchecked_t fscache_n_checkaux_none;
45547+extern atomic_unchecked_t fscache_n_checkaux_okay;
45548+extern atomic_unchecked_t fscache_n_checkaux_update;
45549+extern atomic_unchecked_t fscache_n_checkaux_obsolete;
45550
45551 extern atomic_t fscache_n_cop_alloc_object;
45552 extern atomic_t fscache_n_cop_lookup_object;
45553@@ -255,6 +255,11 @@ static inline void fscache_stat(atomic_t *stat)
45554 atomic_inc(stat);
45555 }
45556
45557+static inline void fscache_stat_unchecked(atomic_unchecked_t *stat)
45558+{
45559+ atomic_inc_unchecked(stat);
45560+}
45561+
45562 static inline void fscache_stat_d(atomic_t *stat)
45563 {
45564 atomic_dec(stat);
45565@@ -267,6 +272,7 @@ extern const struct file_operations fscache_stats_fops;
45566
45567 #define __fscache_stat(stat) (NULL)
45568 #define fscache_stat(stat) do {} while (0)
45569+#define fscache_stat_unchecked(stat) do {} while (0)
45570 #define fscache_stat_d(stat) do {} while (0)
45571 #endif
45572
45573diff --git a/fs/fscache/object.c b/fs/fscache/object.c
45574index b6b897c..0ffff9c 100644
45575--- a/fs/fscache/object.c
45576+++ b/fs/fscache/object.c
45577@@ -128,7 +128,7 @@ static void fscache_object_state_machine(struct fscache_object *object)
45578 /* update the object metadata on disk */
45579 case FSCACHE_OBJECT_UPDATING:
45580 clear_bit(FSCACHE_OBJECT_EV_UPDATE, &object->events);
45581- fscache_stat(&fscache_n_updates_run);
45582+ fscache_stat_unchecked(&fscache_n_updates_run);
45583 fscache_stat(&fscache_n_cop_update_object);
45584 object->cache->ops->update_object(object);
45585 fscache_stat_d(&fscache_n_cop_update_object);
45586@@ -217,7 +217,7 @@ static void fscache_object_state_machine(struct fscache_object *object)
45587 spin_lock(&object->lock);
45588 object->state = FSCACHE_OBJECT_DEAD;
45589 spin_unlock(&object->lock);
45590- fscache_stat(&fscache_n_object_dead);
45591+ fscache_stat_unchecked(&fscache_n_object_dead);
45592 goto terminal_transit;
45593
45594 /* handle the parent cache of this object being withdrawn from
45595@@ -232,7 +232,7 @@ static void fscache_object_state_machine(struct fscache_object *object)
45596 spin_lock(&object->lock);
45597 object->state = FSCACHE_OBJECT_DEAD;
45598 spin_unlock(&object->lock);
45599- fscache_stat(&fscache_n_object_dead);
45600+ fscache_stat_unchecked(&fscache_n_object_dead);
45601 goto terminal_transit;
45602
45603 /* complain about the object being woken up once it is
45604@@ -461,7 +461,7 @@ static void fscache_lookup_object(struct fscache_object *object)
45605 parent->cookie->def->name, cookie->def->name,
45606 object->cache->tag->name);
45607
45608- fscache_stat(&fscache_n_object_lookups);
45609+ fscache_stat_unchecked(&fscache_n_object_lookups);
45610 fscache_stat(&fscache_n_cop_lookup_object);
45611 ret = object->cache->ops->lookup_object(object);
45612 fscache_stat_d(&fscache_n_cop_lookup_object);
45613@@ -472,7 +472,7 @@ static void fscache_lookup_object(struct fscache_object *object)
45614 if (ret == -ETIMEDOUT) {
45615 /* probably stuck behind another object, so move this one to
45616 * the back of the queue */
45617- fscache_stat(&fscache_n_object_lookups_timed_out);
45618+ fscache_stat_unchecked(&fscache_n_object_lookups_timed_out);
45619 set_bit(FSCACHE_OBJECT_EV_REQUEUE, &object->events);
45620 }
45621
45622@@ -495,7 +495,7 @@ void fscache_object_lookup_negative(struct fscache_object *object)
45623
45624 spin_lock(&object->lock);
45625 if (object->state == FSCACHE_OBJECT_LOOKING_UP) {
45626- fscache_stat(&fscache_n_object_lookups_negative);
45627+ fscache_stat_unchecked(&fscache_n_object_lookups_negative);
45628
45629 /* transit here to allow write requests to begin stacking up
45630 * and read requests to begin returning ENODATA */
45631@@ -541,7 +541,7 @@ void fscache_obtained_object(struct fscache_object *object)
45632 * result, in which case there may be data available */
45633 spin_lock(&object->lock);
45634 if (object->state == FSCACHE_OBJECT_LOOKING_UP) {
45635- fscache_stat(&fscache_n_object_lookups_positive);
45636+ fscache_stat_unchecked(&fscache_n_object_lookups_positive);
45637
45638 clear_bit(FSCACHE_COOKIE_NO_DATA_YET, &cookie->flags);
45639
45640@@ -555,7 +555,7 @@ void fscache_obtained_object(struct fscache_object *object)
45641 set_bit(FSCACHE_OBJECT_EV_REQUEUE, &object->events);
45642 } else {
45643 ASSERTCMP(object->state, ==, FSCACHE_OBJECT_CREATING);
45644- fscache_stat(&fscache_n_object_created);
45645+ fscache_stat_unchecked(&fscache_n_object_created);
45646
45647 object->state = FSCACHE_OBJECT_AVAILABLE;
45648 spin_unlock(&object->lock);
45649@@ -602,7 +602,7 @@ static void fscache_object_available(struct fscache_object *object)
45650 fscache_enqueue_dependents(object);
45651
45652 fscache_hist(fscache_obj_instantiate_histogram, object->lookup_jif);
45653- fscache_stat(&fscache_n_object_avail);
45654+ fscache_stat_unchecked(&fscache_n_object_avail);
45655
45656 _leave("");
45657 }
45658@@ -861,7 +861,7 @@ enum fscache_checkaux fscache_check_aux(struct fscache_object *object,
45659 enum fscache_checkaux result;
45660
45661 if (!object->cookie->def->check_aux) {
45662- fscache_stat(&fscache_n_checkaux_none);
45663+ fscache_stat_unchecked(&fscache_n_checkaux_none);
45664 return FSCACHE_CHECKAUX_OKAY;
45665 }
45666
45667@@ -870,17 +870,17 @@ enum fscache_checkaux fscache_check_aux(struct fscache_object *object,
45668 switch (result) {
45669 /* entry okay as is */
45670 case FSCACHE_CHECKAUX_OKAY:
45671- fscache_stat(&fscache_n_checkaux_okay);
45672+ fscache_stat_unchecked(&fscache_n_checkaux_okay);
45673 break;
45674
45675 /* entry requires update */
45676 case FSCACHE_CHECKAUX_NEEDS_UPDATE:
45677- fscache_stat(&fscache_n_checkaux_update);
45678+ fscache_stat_unchecked(&fscache_n_checkaux_update);
45679 break;
45680
45681 /* entry requires deletion */
45682 case FSCACHE_CHECKAUX_OBSOLETE:
45683- fscache_stat(&fscache_n_checkaux_obsolete);
45684+ fscache_stat_unchecked(&fscache_n_checkaux_obsolete);
45685 break;
45686
45687 default:
45688diff --git a/fs/fscache/operation.c b/fs/fscache/operation.c
45689index 30afdfa..2256596 100644
45690--- a/fs/fscache/operation.c
45691+++ b/fs/fscache/operation.c
45692@@ -17,7 +17,7 @@
45693 #include <linux/slab.h>
45694 #include "internal.h"
45695
45696-atomic_t fscache_op_debug_id;
45697+atomic_unchecked_t fscache_op_debug_id;
45698 EXPORT_SYMBOL(fscache_op_debug_id);
45699
45700 /**
45701@@ -38,7 +38,7 @@ void fscache_enqueue_operation(struct fscache_operation *op)
45702 ASSERTCMP(op->object->state, >=, FSCACHE_OBJECT_AVAILABLE);
45703 ASSERTCMP(atomic_read(&op->usage), >, 0);
45704
45705- fscache_stat(&fscache_n_op_enqueue);
45706+ fscache_stat_unchecked(&fscache_n_op_enqueue);
45707 switch (op->flags & FSCACHE_OP_TYPE) {
45708 case FSCACHE_OP_ASYNC:
45709 _debug("queue async");
45710@@ -69,7 +69,7 @@ static void fscache_run_op(struct fscache_object *object,
45711 wake_up_bit(&op->flags, FSCACHE_OP_WAITING);
45712 if (op->processor)
45713 fscache_enqueue_operation(op);
45714- fscache_stat(&fscache_n_op_run);
45715+ fscache_stat_unchecked(&fscache_n_op_run);
45716 }
45717
45718 /*
45719@@ -98,11 +98,11 @@ int fscache_submit_exclusive_op(struct fscache_object *object,
45720 if (object->n_ops > 1) {
45721 atomic_inc(&op->usage);
45722 list_add_tail(&op->pend_link, &object->pending_ops);
45723- fscache_stat(&fscache_n_op_pend);
45724+ fscache_stat_unchecked(&fscache_n_op_pend);
45725 } else if (!list_empty(&object->pending_ops)) {
45726 atomic_inc(&op->usage);
45727 list_add_tail(&op->pend_link, &object->pending_ops);
45728- fscache_stat(&fscache_n_op_pend);
45729+ fscache_stat_unchecked(&fscache_n_op_pend);
45730 fscache_start_operations(object);
45731 } else {
45732 ASSERTCMP(object->n_in_progress, ==, 0);
45733@@ -118,7 +118,7 @@ int fscache_submit_exclusive_op(struct fscache_object *object,
45734 object->n_exclusive++; /* reads and writes must wait */
45735 atomic_inc(&op->usage);
45736 list_add_tail(&op->pend_link, &object->pending_ops);
45737- fscache_stat(&fscache_n_op_pend);
45738+ fscache_stat_unchecked(&fscache_n_op_pend);
45739 ret = 0;
45740 } else {
45741 /* not allowed to submit ops in any other state */
45742@@ -203,11 +203,11 @@ int fscache_submit_op(struct fscache_object *object,
45743 if (object->n_exclusive > 0) {
45744 atomic_inc(&op->usage);
45745 list_add_tail(&op->pend_link, &object->pending_ops);
45746- fscache_stat(&fscache_n_op_pend);
45747+ fscache_stat_unchecked(&fscache_n_op_pend);
45748 } else if (!list_empty(&object->pending_ops)) {
45749 atomic_inc(&op->usage);
45750 list_add_tail(&op->pend_link, &object->pending_ops);
45751- fscache_stat(&fscache_n_op_pend);
45752+ fscache_stat_unchecked(&fscache_n_op_pend);
45753 fscache_start_operations(object);
45754 } else {
45755 ASSERTCMP(object->n_exclusive, ==, 0);
45756@@ -219,12 +219,12 @@ int fscache_submit_op(struct fscache_object *object,
45757 object->n_ops++;
45758 atomic_inc(&op->usage);
45759 list_add_tail(&op->pend_link, &object->pending_ops);
45760- fscache_stat(&fscache_n_op_pend);
45761+ fscache_stat_unchecked(&fscache_n_op_pend);
45762 ret = 0;
45763 } else if (object->state == FSCACHE_OBJECT_DYING ||
45764 object->state == FSCACHE_OBJECT_LC_DYING ||
45765 object->state == FSCACHE_OBJECT_WITHDRAWING) {
45766- fscache_stat(&fscache_n_op_rejected);
45767+ fscache_stat_unchecked(&fscache_n_op_rejected);
45768 ret = -ENOBUFS;
45769 } else if (!test_bit(FSCACHE_IOERROR, &object->cache->flags)) {
45770 fscache_report_unexpected_submission(object, op, ostate);
45771@@ -294,7 +294,7 @@ int fscache_cancel_op(struct fscache_operation *op)
45772
45773 ret = -EBUSY;
45774 if (!list_empty(&op->pend_link)) {
45775- fscache_stat(&fscache_n_op_cancelled);
45776+ fscache_stat_unchecked(&fscache_n_op_cancelled);
45777 list_del_init(&op->pend_link);
45778 object->n_ops--;
45779 if (test_bit(FSCACHE_OP_EXCLUSIVE, &op->flags))
45780@@ -331,7 +331,7 @@ void fscache_put_operation(struct fscache_operation *op)
45781 if (test_and_set_bit(FSCACHE_OP_DEAD, &op->flags))
45782 BUG();
45783
45784- fscache_stat(&fscache_n_op_release);
45785+ fscache_stat_unchecked(&fscache_n_op_release);
45786
45787 if (op->release) {
45788 op->release(op);
45789@@ -348,7 +348,7 @@ void fscache_put_operation(struct fscache_operation *op)
45790 * lock, and defer it otherwise */
45791 if (!spin_trylock(&object->lock)) {
45792 _debug("defer put");
45793- fscache_stat(&fscache_n_op_deferred_release);
45794+ fscache_stat_unchecked(&fscache_n_op_deferred_release);
45795
45796 cache = object->cache;
45797 spin_lock(&cache->op_gc_list_lock);
45798@@ -410,7 +410,7 @@ void fscache_operation_gc(struct work_struct *work)
45799
45800 _debug("GC DEFERRED REL OBJ%x OP%x",
45801 object->debug_id, op->debug_id);
45802- fscache_stat(&fscache_n_op_gc);
45803+ fscache_stat_unchecked(&fscache_n_op_gc);
45804
45805 ASSERTCMP(atomic_read(&op->usage), ==, 0);
45806
45807diff --git a/fs/fscache/page.c b/fs/fscache/page.c
45808index 3f7a59b..cf196cc 100644
45809--- a/fs/fscache/page.c
45810+++ b/fs/fscache/page.c
45811@@ -60,7 +60,7 @@ bool __fscache_maybe_release_page(struct fscache_cookie *cookie,
45812 val = radix_tree_lookup(&cookie->stores, page->index);
45813 if (!val) {
45814 rcu_read_unlock();
45815- fscache_stat(&fscache_n_store_vmscan_not_storing);
45816+ fscache_stat_unchecked(&fscache_n_store_vmscan_not_storing);
45817 __fscache_uncache_page(cookie, page);
45818 return true;
45819 }
45820@@ -90,11 +90,11 @@ bool __fscache_maybe_release_page(struct fscache_cookie *cookie,
45821 spin_unlock(&cookie->stores_lock);
45822
45823 if (xpage) {
45824- fscache_stat(&fscache_n_store_vmscan_cancelled);
45825- fscache_stat(&fscache_n_store_radix_deletes);
45826+ fscache_stat_unchecked(&fscache_n_store_vmscan_cancelled);
45827+ fscache_stat_unchecked(&fscache_n_store_radix_deletes);
45828 ASSERTCMP(xpage, ==, page);
45829 } else {
45830- fscache_stat(&fscache_n_store_vmscan_gone);
45831+ fscache_stat_unchecked(&fscache_n_store_vmscan_gone);
45832 }
45833
45834 wake_up_bit(&cookie->flags, 0);
45835@@ -107,7 +107,7 @@ page_busy:
45836 /* we might want to wait here, but that could deadlock the allocator as
45837 * the work threads writing to the cache may all end up sleeping
45838 * on memory allocation */
45839- fscache_stat(&fscache_n_store_vmscan_busy);
45840+ fscache_stat_unchecked(&fscache_n_store_vmscan_busy);
45841 return false;
45842 }
45843 EXPORT_SYMBOL(__fscache_maybe_release_page);
45844@@ -131,7 +131,7 @@ static void fscache_end_page_write(struct fscache_object *object,
45845 FSCACHE_COOKIE_STORING_TAG);
45846 if (!radix_tree_tag_get(&cookie->stores, page->index,
45847 FSCACHE_COOKIE_PENDING_TAG)) {
45848- fscache_stat(&fscache_n_store_radix_deletes);
45849+ fscache_stat_unchecked(&fscache_n_store_radix_deletes);
45850 xpage = radix_tree_delete(&cookie->stores, page->index);
45851 }
45852 spin_unlock(&cookie->stores_lock);
45853@@ -152,7 +152,7 @@ static void fscache_attr_changed_op(struct fscache_operation *op)
45854
45855 _enter("{OBJ%x OP%x}", object->debug_id, op->debug_id);
45856
45857- fscache_stat(&fscache_n_attr_changed_calls);
45858+ fscache_stat_unchecked(&fscache_n_attr_changed_calls);
45859
45860 if (fscache_object_is_active(object)) {
45861 fscache_stat(&fscache_n_cop_attr_changed);
45862@@ -177,11 +177,11 @@ int __fscache_attr_changed(struct fscache_cookie *cookie)
45863
45864 ASSERTCMP(cookie->def->type, !=, FSCACHE_COOKIE_TYPE_INDEX);
45865
45866- fscache_stat(&fscache_n_attr_changed);
45867+ fscache_stat_unchecked(&fscache_n_attr_changed);
45868
45869 op = kzalloc(sizeof(*op), GFP_KERNEL);
45870 if (!op) {
45871- fscache_stat(&fscache_n_attr_changed_nomem);
45872+ fscache_stat_unchecked(&fscache_n_attr_changed_nomem);
45873 _leave(" = -ENOMEM");
45874 return -ENOMEM;
45875 }
45876@@ -199,7 +199,7 @@ int __fscache_attr_changed(struct fscache_cookie *cookie)
45877 if (fscache_submit_exclusive_op(object, op) < 0)
45878 goto nobufs;
45879 spin_unlock(&cookie->lock);
45880- fscache_stat(&fscache_n_attr_changed_ok);
45881+ fscache_stat_unchecked(&fscache_n_attr_changed_ok);
45882 fscache_put_operation(op);
45883 _leave(" = 0");
45884 return 0;
45885@@ -207,7 +207,7 @@ int __fscache_attr_changed(struct fscache_cookie *cookie)
45886 nobufs:
45887 spin_unlock(&cookie->lock);
45888 kfree(op);
45889- fscache_stat(&fscache_n_attr_changed_nobufs);
45890+ fscache_stat_unchecked(&fscache_n_attr_changed_nobufs);
45891 _leave(" = %d", -ENOBUFS);
45892 return -ENOBUFS;
45893 }
45894@@ -243,7 +243,7 @@ static struct fscache_retrieval *fscache_alloc_retrieval(
45895 /* allocate a retrieval operation and attempt to submit it */
45896 op = kzalloc(sizeof(*op), GFP_NOIO);
45897 if (!op) {
45898- fscache_stat(&fscache_n_retrievals_nomem);
45899+ fscache_stat_unchecked(&fscache_n_retrievals_nomem);
45900 return NULL;
45901 }
45902
45903@@ -271,13 +271,13 @@ static int fscache_wait_for_deferred_lookup(struct fscache_cookie *cookie)
45904 return 0;
45905 }
45906
45907- fscache_stat(&fscache_n_retrievals_wait);
45908+ fscache_stat_unchecked(&fscache_n_retrievals_wait);
45909
45910 jif = jiffies;
45911 if (wait_on_bit(&cookie->flags, FSCACHE_COOKIE_LOOKING_UP,
45912 fscache_wait_bit_interruptible,
45913 TASK_INTERRUPTIBLE) != 0) {
45914- fscache_stat(&fscache_n_retrievals_intr);
45915+ fscache_stat_unchecked(&fscache_n_retrievals_intr);
45916 _leave(" = -ERESTARTSYS");
45917 return -ERESTARTSYS;
45918 }
45919@@ -295,8 +295,8 @@ static int fscache_wait_for_deferred_lookup(struct fscache_cookie *cookie)
45920 */
45921 static int fscache_wait_for_retrieval_activation(struct fscache_object *object,
45922 struct fscache_retrieval *op,
45923- atomic_t *stat_op_waits,
45924- atomic_t *stat_object_dead)
45925+ atomic_unchecked_t *stat_op_waits,
45926+ atomic_unchecked_t *stat_object_dead)
45927 {
45928 int ret;
45929
45930@@ -304,7 +304,7 @@ static int fscache_wait_for_retrieval_activation(struct fscache_object *object,
45931 goto check_if_dead;
45932
45933 _debug(">>> WT");
45934- fscache_stat(stat_op_waits);
45935+ fscache_stat_unchecked(stat_op_waits);
45936 if (wait_on_bit(&op->op.flags, FSCACHE_OP_WAITING,
45937 fscache_wait_bit_interruptible,
45938 TASK_INTERRUPTIBLE) < 0) {
45939@@ -321,7 +321,7 @@ static int fscache_wait_for_retrieval_activation(struct fscache_object *object,
45940
45941 check_if_dead:
45942 if (unlikely(fscache_object_is_dead(object))) {
45943- fscache_stat(stat_object_dead);
45944+ fscache_stat_unchecked(stat_object_dead);
45945 return -ENOBUFS;
45946 }
45947 return 0;
45948@@ -348,7 +348,7 @@ int __fscache_read_or_alloc_page(struct fscache_cookie *cookie,
45949
45950 _enter("%p,%p,,,", cookie, page);
45951
45952- fscache_stat(&fscache_n_retrievals);
45953+ fscache_stat_unchecked(&fscache_n_retrievals);
45954
45955 if (hlist_empty(&cookie->backing_objects))
45956 goto nobufs;
45957@@ -381,7 +381,7 @@ int __fscache_read_or_alloc_page(struct fscache_cookie *cookie,
45958 goto nobufs_unlock;
45959 spin_unlock(&cookie->lock);
45960
45961- fscache_stat(&fscache_n_retrieval_ops);
45962+ fscache_stat_unchecked(&fscache_n_retrieval_ops);
45963
45964 /* pin the netfs read context in case we need to do the actual netfs
45965 * read because we've encountered a cache read failure */
45966@@ -411,15 +411,15 @@ int __fscache_read_or_alloc_page(struct fscache_cookie *cookie,
45967
45968 error:
45969 if (ret == -ENOMEM)
45970- fscache_stat(&fscache_n_retrievals_nomem);
45971+ fscache_stat_unchecked(&fscache_n_retrievals_nomem);
45972 else if (ret == -ERESTARTSYS)
45973- fscache_stat(&fscache_n_retrievals_intr);
45974+ fscache_stat_unchecked(&fscache_n_retrievals_intr);
45975 else if (ret == -ENODATA)
45976- fscache_stat(&fscache_n_retrievals_nodata);
45977+ fscache_stat_unchecked(&fscache_n_retrievals_nodata);
45978 else if (ret < 0)
45979- fscache_stat(&fscache_n_retrievals_nobufs);
45980+ fscache_stat_unchecked(&fscache_n_retrievals_nobufs);
45981 else
45982- fscache_stat(&fscache_n_retrievals_ok);
45983+ fscache_stat_unchecked(&fscache_n_retrievals_ok);
45984
45985 fscache_put_retrieval(op);
45986 _leave(" = %d", ret);
45987@@ -429,7 +429,7 @@ nobufs_unlock:
45988 spin_unlock(&cookie->lock);
45989 kfree(op);
45990 nobufs:
45991- fscache_stat(&fscache_n_retrievals_nobufs);
45992+ fscache_stat_unchecked(&fscache_n_retrievals_nobufs);
45993 _leave(" = -ENOBUFS");
45994 return -ENOBUFS;
45995 }
45996@@ -467,7 +467,7 @@ int __fscache_read_or_alloc_pages(struct fscache_cookie *cookie,
45997
45998 _enter("%p,,%d,,,", cookie, *nr_pages);
45999
46000- fscache_stat(&fscache_n_retrievals);
46001+ fscache_stat_unchecked(&fscache_n_retrievals);
46002
46003 if (hlist_empty(&cookie->backing_objects))
46004 goto nobufs;
46005@@ -497,7 +497,7 @@ int __fscache_read_or_alloc_pages(struct fscache_cookie *cookie,
46006 goto nobufs_unlock;
46007 spin_unlock(&cookie->lock);
46008
46009- fscache_stat(&fscache_n_retrieval_ops);
46010+ fscache_stat_unchecked(&fscache_n_retrieval_ops);
46011
46012 /* pin the netfs read context in case we need to do the actual netfs
46013 * read because we've encountered a cache read failure */
46014@@ -527,15 +527,15 @@ int __fscache_read_or_alloc_pages(struct fscache_cookie *cookie,
46015
46016 error:
46017 if (ret == -ENOMEM)
46018- fscache_stat(&fscache_n_retrievals_nomem);
46019+ fscache_stat_unchecked(&fscache_n_retrievals_nomem);
46020 else if (ret == -ERESTARTSYS)
46021- fscache_stat(&fscache_n_retrievals_intr);
46022+ fscache_stat_unchecked(&fscache_n_retrievals_intr);
46023 else if (ret == -ENODATA)
46024- fscache_stat(&fscache_n_retrievals_nodata);
46025+ fscache_stat_unchecked(&fscache_n_retrievals_nodata);
46026 else if (ret < 0)
46027- fscache_stat(&fscache_n_retrievals_nobufs);
46028+ fscache_stat_unchecked(&fscache_n_retrievals_nobufs);
46029 else
46030- fscache_stat(&fscache_n_retrievals_ok);
46031+ fscache_stat_unchecked(&fscache_n_retrievals_ok);
46032
46033 fscache_put_retrieval(op);
46034 _leave(" = %d", ret);
46035@@ -545,7 +545,7 @@ nobufs_unlock:
46036 spin_unlock(&cookie->lock);
46037 kfree(op);
46038 nobufs:
46039- fscache_stat(&fscache_n_retrievals_nobufs);
46040+ fscache_stat_unchecked(&fscache_n_retrievals_nobufs);
46041 _leave(" = -ENOBUFS");
46042 return -ENOBUFS;
46043 }
46044@@ -569,7 +569,7 @@ int __fscache_alloc_page(struct fscache_cookie *cookie,
46045
46046 _enter("%p,%p,,,", cookie, page);
46047
46048- fscache_stat(&fscache_n_allocs);
46049+ fscache_stat_unchecked(&fscache_n_allocs);
46050
46051 if (hlist_empty(&cookie->backing_objects))
46052 goto nobufs;
46053@@ -595,7 +595,7 @@ int __fscache_alloc_page(struct fscache_cookie *cookie,
46054 goto nobufs_unlock;
46055 spin_unlock(&cookie->lock);
46056
46057- fscache_stat(&fscache_n_alloc_ops);
46058+ fscache_stat_unchecked(&fscache_n_alloc_ops);
46059
46060 ret = fscache_wait_for_retrieval_activation(
46061 object, op,
46062@@ -611,11 +611,11 @@ int __fscache_alloc_page(struct fscache_cookie *cookie,
46063
46064 error:
46065 if (ret == -ERESTARTSYS)
46066- fscache_stat(&fscache_n_allocs_intr);
46067+ fscache_stat_unchecked(&fscache_n_allocs_intr);
46068 else if (ret < 0)
46069- fscache_stat(&fscache_n_allocs_nobufs);
46070+ fscache_stat_unchecked(&fscache_n_allocs_nobufs);
46071 else
46072- fscache_stat(&fscache_n_allocs_ok);
46073+ fscache_stat_unchecked(&fscache_n_allocs_ok);
46074
46075 fscache_put_retrieval(op);
46076 _leave(" = %d", ret);
46077@@ -625,7 +625,7 @@ nobufs_unlock:
46078 spin_unlock(&cookie->lock);
46079 kfree(op);
46080 nobufs:
46081- fscache_stat(&fscache_n_allocs_nobufs);
46082+ fscache_stat_unchecked(&fscache_n_allocs_nobufs);
46083 _leave(" = -ENOBUFS");
46084 return -ENOBUFS;
46085 }
46086@@ -666,7 +666,7 @@ static void fscache_write_op(struct fscache_operation *_op)
46087
46088 spin_lock(&cookie->stores_lock);
46089
46090- fscache_stat(&fscache_n_store_calls);
46091+ fscache_stat_unchecked(&fscache_n_store_calls);
46092
46093 /* find a page to store */
46094 page = NULL;
46095@@ -677,7 +677,7 @@ static void fscache_write_op(struct fscache_operation *_op)
46096 page = results[0];
46097 _debug("gang %d [%lx]", n, page->index);
46098 if (page->index > op->store_limit) {
46099- fscache_stat(&fscache_n_store_pages_over_limit);
46100+ fscache_stat_unchecked(&fscache_n_store_pages_over_limit);
46101 goto superseded;
46102 }
46103
46104@@ -689,7 +689,7 @@ static void fscache_write_op(struct fscache_operation *_op)
46105 spin_unlock(&cookie->stores_lock);
46106 spin_unlock(&object->lock);
46107
46108- fscache_stat(&fscache_n_store_pages);
46109+ fscache_stat_unchecked(&fscache_n_store_pages);
46110 fscache_stat(&fscache_n_cop_write_page);
46111 ret = object->cache->ops->write_page(op, page);
46112 fscache_stat_d(&fscache_n_cop_write_page);
46113@@ -757,7 +757,7 @@ int __fscache_write_page(struct fscache_cookie *cookie,
46114 ASSERTCMP(cookie->def->type, !=, FSCACHE_COOKIE_TYPE_INDEX);
46115 ASSERT(PageFsCache(page));
46116
46117- fscache_stat(&fscache_n_stores);
46118+ fscache_stat_unchecked(&fscache_n_stores);
46119
46120 op = kzalloc(sizeof(*op), GFP_NOIO);
46121 if (!op)
46122@@ -808,7 +808,7 @@ int __fscache_write_page(struct fscache_cookie *cookie,
46123 spin_unlock(&cookie->stores_lock);
46124 spin_unlock(&object->lock);
46125
46126- op->op.debug_id = atomic_inc_return(&fscache_op_debug_id);
46127+ op->op.debug_id = atomic_inc_return_unchecked(&fscache_op_debug_id);
46128 op->store_limit = object->store_limit;
46129
46130 if (fscache_submit_op(object, &op->op) < 0)
46131@@ -816,8 +816,8 @@ int __fscache_write_page(struct fscache_cookie *cookie,
46132
46133 spin_unlock(&cookie->lock);
46134 radix_tree_preload_end();
46135- fscache_stat(&fscache_n_store_ops);
46136- fscache_stat(&fscache_n_stores_ok);
46137+ fscache_stat_unchecked(&fscache_n_store_ops);
46138+ fscache_stat_unchecked(&fscache_n_stores_ok);
46139
46140 /* the work queue now carries its own ref on the object */
46141 fscache_put_operation(&op->op);
46142@@ -825,14 +825,14 @@ int __fscache_write_page(struct fscache_cookie *cookie,
46143 return 0;
46144
46145 already_queued:
46146- fscache_stat(&fscache_n_stores_again);
46147+ fscache_stat_unchecked(&fscache_n_stores_again);
46148 already_pending:
46149 spin_unlock(&cookie->stores_lock);
46150 spin_unlock(&object->lock);
46151 spin_unlock(&cookie->lock);
46152 radix_tree_preload_end();
46153 kfree(op);
46154- fscache_stat(&fscache_n_stores_ok);
46155+ fscache_stat_unchecked(&fscache_n_stores_ok);
46156 _leave(" = 0");
46157 return 0;
46158
46159@@ -851,14 +851,14 @@ nobufs:
46160 spin_unlock(&cookie->lock);
46161 radix_tree_preload_end();
46162 kfree(op);
46163- fscache_stat(&fscache_n_stores_nobufs);
46164+ fscache_stat_unchecked(&fscache_n_stores_nobufs);
46165 _leave(" = -ENOBUFS");
46166 return -ENOBUFS;
46167
46168 nomem_free:
46169 kfree(op);
46170 nomem:
46171- fscache_stat(&fscache_n_stores_oom);
46172+ fscache_stat_unchecked(&fscache_n_stores_oom);
46173 _leave(" = -ENOMEM");
46174 return -ENOMEM;
46175 }
46176@@ -876,7 +876,7 @@ void __fscache_uncache_page(struct fscache_cookie *cookie, struct page *page)
46177 ASSERTCMP(cookie->def->type, !=, FSCACHE_COOKIE_TYPE_INDEX);
46178 ASSERTCMP(page, !=, NULL);
46179
46180- fscache_stat(&fscache_n_uncaches);
46181+ fscache_stat_unchecked(&fscache_n_uncaches);
46182
46183 /* cache withdrawal may beat us to it */
46184 if (!PageFsCache(page))
46185@@ -929,7 +929,7 @@ void fscache_mark_pages_cached(struct fscache_retrieval *op,
46186 unsigned long loop;
46187
46188 #ifdef CONFIG_FSCACHE_STATS
46189- atomic_add(pagevec->nr, &fscache_n_marks);
46190+ atomic_add_unchecked(pagevec->nr, &fscache_n_marks);
46191 #endif
46192
46193 for (loop = 0; loop < pagevec->nr; loop++) {
46194diff --git a/fs/fscache/stats.c b/fs/fscache/stats.c
46195index 4765190..2a067f2 100644
46196--- a/fs/fscache/stats.c
46197+++ b/fs/fscache/stats.c
46198@@ -18,95 +18,95 @@
46199 /*
46200 * operation counters
46201 */
46202-atomic_t fscache_n_op_pend;
46203-atomic_t fscache_n_op_run;
46204-atomic_t fscache_n_op_enqueue;
46205-atomic_t fscache_n_op_requeue;
46206-atomic_t fscache_n_op_deferred_release;
46207-atomic_t fscache_n_op_release;
46208-atomic_t fscache_n_op_gc;
46209-atomic_t fscache_n_op_cancelled;
46210-atomic_t fscache_n_op_rejected;
46211+atomic_unchecked_t fscache_n_op_pend;
46212+atomic_unchecked_t fscache_n_op_run;
46213+atomic_unchecked_t fscache_n_op_enqueue;
46214+atomic_unchecked_t fscache_n_op_requeue;
46215+atomic_unchecked_t fscache_n_op_deferred_release;
46216+atomic_unchecked_t fscache_n_op_release;
46217+atomic_unchecked_t fscache_n_op_gc;
46218+atomic_unchecked_t fscache_n_op_cancelled;
46219+atomic_unchecked_t fscache_n_op_rejected;
46220
46221-atomic_t fscache_n_attr_changed;
46222-atomic_t fscache_n_attr_changed_ok;
46223-atomic_t fscache_n_attr_changed_nobufs;
46224-atomic_t fscache_n_attr_changed_nomem;
46225-atomic_t fscache_n_attr_changed_calls;
46226+atomic_unchecked_t fscache_n_attr_changed;
46227+atomic_unchecked_t fscache_n_attr_changed_ok;
46228+atomic_unchecked_t fscache_n_attr_changed_nobufs;
46229+atomic_unchecked_t fscache_n_attr_changed_nomem;
46230+atomic_unchecked_t fscache_n_attr_changed_calls;
46231
46232-atomic_t fscache_n_allocs;
46233-atomic_t fscache_n_allocs_ok;
46234-atomic_t fscache_n_allocs_wait;
46235-atomic_t fscache_n_allocs_nobufs;
46236-atomic_t fscache_n_allocs_intr;
46237-atomic_t fscache_n_allocs_object_dead;
46238-atomic_t fscache_n_alloc_ops;
46239-atomic_t fscache_n_alloc_op_waits;
46240+atomic_unchecked_t fscache_n_allocs;
46241+atomic_unchecked_t fscache_n_allocs_ok;
46242+atomic_unchecked_t fscache_n_allocs_wait;
46243+atomic_unchecked_t fscache_n_allocs_nobufs;
46244+atomic_unchecked_t fscache_n_allocs_intr;
46245+atomic_unchecked_t fscache_n_allocs_object_dead;
46246+atomic_unchecked_t fscache_n_alloc_ops;
46247+atomic_unchecked_t fscache_n_alloc_op_waits;
46248
46249-atomic_t fscache_n_retrievals;
46250-atomic_t fscache_n_retrievals_ok;
46251-atomic_t fscache_n_retrievals_wait;
46252-atomic_t fscache_n_retrievals_nodata;
46253-atomic_t fscache_n_retrievals_nobufs;
46254-atomic_t fscache_n_retrievals_intr;
46255-atomic_t fscache_n_retrievals_nomem;
46256-atomic_t fscache_n_retrievals_object_dead;
46257-atomic_t fscache_n_retrieval_ops;
46258-atomic_t fscache_n_retrieval_op_waits;
46259+atomic_unchecked_t fscache_n_retrievals;
46260+atomic_unchecked_t fscache_n_retrievals_ok;
46261+atomic_unchecked_t fscache_n_retrievals_wait;
46262+atomic_unchecked_t fscache_n_retrievals_nodata;
46263+atomic_unchecked_t fscache_n_retrievals_nobufs;
46264+atomic_unchecked_t fscache_n_retrievals_intr;
46265+atomic_unchecked_t fscache_n_retrievals_nomem;
46266+atomic_unchecked_t fscache_n_retrievals_object_dead;
46267+atomic_unchecked_t fscache_n_retrieval_ops;
46268+atomic_unchecked_t fscache_n_retrieval_op_waits;
46269
46270-atomic_t fscache_n_stores;
46271-atomic_t fscache_n_stores_ok;
46272-atomic_t fscache_n_stores_again;
46273-atomic_t fscache_n_stores_nobufs;
46274-atomic_t fscache_n_stores_oom;
46275-atomic_t fscache_n_store_ops;
46276-atomic_t fscache_n_store_calls;
46277-atomic_t fscache_n_store_pages;
46278-atomic_t fscache_n_store_radix_deletes;
46279-atomic_t fscache_n_store_pages_over_limit;
46280+atomic_unchecked_t fscache_n_stores;
46281+atomic_unchecked_t fscache_n_stores_ok;
46282+atomic_unchecked_t fscache_n_stores_again;
46283+atomic_unchecked_t fscache_n_stores_nobufs;
46284+atomic_unchecked_t fscache_n_stores_oom;
46285+atomic_unchecked_t fscache_n_store_ops;
46286+atomic_unchecked_t fscache_n_store_calls;
46287+atomic_unchecked_t fscache_n_store_pages;
46288+atomic_unchecked_t fscache_n_store_radix_deletes;
46289+atomic_unchecked_t fscache_n_store_pages_over_limit;
46290
46291-atomic_t fscache_n_store_vmscan_not_storing;
46292-atomic_t fscache_n_store_vmscan_gone;
46293-atomic_t fscache_n_store_vmscan_busy;
46294-atomic_t fscache_n_store_vmscan_cancelled;
46295+atomic_unchecked_t fscache_n_store_vmscan_not_storing;
46296+atomic_unchecked_t fscache_n_store_vmscan_gone;
46297+atomic_unchecked_t fscache_n_store_vmscan_busy;
46298+atomic_unchecked_t fscache_n_store_vmscan_cancelled;
46299
46300-atomic_t fscache_n_marks;
46301-atomic_t fscache_n_uncaches;
46302+atomic_unchecked_t fscache_n_marks;
46303+atomic_unchecked_t fscache_n_uncaches;
46304
46305-atomic_t fscache_n_acquires;
46306-atomic_t fscache_n_acquires_null;
46307-atomic_t fscache_n_acquires_no_cache;
46308-atomic_t fscache_n_acquires_ok;
46309-atomic_t fscache_n_acquires_nobufs;
46310-atomic_t fscache_n_acquires_oom;
46311+atomic_unchecked_t fscache_n_acquires;
46312+atomic_unchecked_t fscache_n_acquires_null;
46313+atomic_unchecked_t fscache_n_acquires_no_cache;
46314+atomic_unchecked_t fscache_n_acquires_ok;
46315+atomic_unchecked_t fscache_n_acquires_nobufs;
46316+atomic_unchecked_t fscache_n_acquires_oom;
46317
46318-atomic_t fscache_n_updates;
46319-atomic_t fscache_n_updates_null;
46320-atomic_t fscache_n_updates_run;
46321+atomic_unchecked_t fscache_n_updates;
46322+atomic_unchecked_t fscache_n_updates_null;
46323+atomic_unchecked_t fscache_n_updates_run;
46324
46325-atomic_t fscache_n_relinquishes;
46326-atomic_t fscache_n_relinquishes_null;
46327-atomic_t fscache_n_relinquishes_waitcrt;
46328-atomic_t fscache_n_relinquishes_retire;
46329+atomic_unchecked_t fscache_n_relinquishes;
46330+atomic_unchecked_t fscache_n_relinquishes_null;
46331+atomic_unchecked_t fscache_n_relinquishes_waitcrt;
46332+atomic_unchecked_t fscache_n_relinquishes_retire;
46333
46334-atomic_t fscache_n_cookie_index;
46335-atomic_t fscache_n_cookie_data;
46336-atomic_t fscache_n_cookie_special;
46337+atomic_unchecked_t fscache_n_cookie_index;
46338+atomic_unchecked_t fscache_n_cookie_data;
46339+atomic_unchecked_t fscache_n_cookie_special;
46340
46341-atomic_t fscache_n_object_alloc;
46342-atomic_t fscache_n_object_no_alloc;
46343-atomic_t fscache_n_object_lookups;
46344-atomic_t fscache_n_object_lookups_negative;
46345-atomic_t fscache_n_object_lookups_positive;
46346-atomic_t fscache_n_object_lookups_timed_out;
46347-atomic_t fscache_n_object_created;
46348-atomic_t fscache_n_object_avail;
46349-atomic_t fscache_n_object_dead;
46350+atomic_unchecked_t fscache_n_object_alloc;
46351+atomic_unchecked_t fscache_n_object_no_alloc;
46352+atomic_unchecked_t fscache_n_object_lookups;
46353+atomic_unchecked_t fscache_n_object_lookups_negative;
46354+atomic_unchecked_t fscache_n_object_lookups_positive;
46355+atomic_unchecked_t fscache_n_object_lookups_timed_out;
46356+atomic_unchecked_t fscache_n_object_created;
46357+atomic_unchecked_t fscache_n_object_avail;
46358+atomic_unchecked_t fscache_n_object_dead;
46359
46360-atomic_t fscache_n_checkaux_none;
46361-atomic_t fscache_n_checkaux_okay;
46362-atomic_t fscache_n_checkaux_update;
46363-atomic_t fscache_n_checkaux_obsolete;
46364+atomic_unchecked_t fscache_n_checkaux_none;
46365+atomic_unchecked_t fscache_n_checkaux_okay;
46366+atomic_unchecked_t fscache_n_checkaux_update;
46367+atomic_unchecked_t fscache_n_checkaux_obsolete;
46368
46369 atomic_t fscache_n_cop_alloc_object;
46370 atomic_t fscache_n_cop_lookup_object;
46371@@ -133,113 +133,113 @@ static int fscache_stats_show(struct seq_file *m, void *v)
46372 seq_puts(m, "FS-Cache statistics\n");
46373
46374 seq_printf(m, "Cookies: idx=%u dat=%u spc=%u\n",
46375- atomic_read(&fscache_n_cookie_index),
46376- atomic_read(&fscache_n_cookie_data),
46377- atomic_read(&fscache_n_cookie_special));
46378+ atomic_read_unchecked(&fscache_n_cookie_index),
46379+ atomic_read_unchecked(&fscache_n_cookie_data),
46380+ atomic_read_unchecked(&fscache_n_cookie_special));
46381
46382 seq_printf(m, "Objects: alc=%u nal=%u avl=%u ded=%u\n",
46383- atomic_read(&fscache_n_object_alloc),
46384- atomic_read(&fscache_n_object_no_alloc),
46385- atomic_read(&fscache_n_object_avail),
46386- atomic_read(&fscache_n_object_dead));
46387+ atomic_read_unchecked(&fscache_n_object_alloc),
46388+ atomic_read_unchecked(&fscache_n_object_no_alloc),
46389+ atomic_read_unchecked(&fscache_n_object_avail),
46390+ atomic_read_unchecked(&fscache_n_object_dead));
46391 seq_printf(m, "ChkAux : non=%u ok=%u upd=%u obs=%u\n",
46392- atomic_read(&fscache_n_checkaux_none),
46393- atomic_read(&fscache_n_checkaux_okay),
46394- atomic_read(&fscache_n_checkaux_update),
46395- atomic_read(&fscache_n_checkaux_obsolete));
46396+ atomic_read_unchecked(&fscache_n_checkaux_none),
46397+ atomic_read_unchecked(&fscache_n_checkaux_okay),
46398+ atomic_read_unchecked(&fscache_n_checkaux_update),
46399+ atomic_read_unchecked(&fscache_n_checkaux_obsolete));
46400
46401 seq_printf(m, "Pages : mrk=%u unc=%u\n",
46402- atomic_read(&fscache_n_marks),
46403- atomic_read(&fscache_n_uncaches));
46404+ atomic_read_unchecked(&fscache_n_marks),
46405+ atomic_read_unchecked(&fscache_n_uncaches));
46406
46407 seq_printf(m, "Acquire: n=%u nul=%u noc=%u ok=%u nbf=%u"
46408 " oom=%u\n",
46409- atomic_read(&fscache_n_acquires),
46410- atomic_read(&fscache_n_acquires_null),
46411- atomic_read(&fscache_n_acquires_no_cache),
46412- atomic_read(&fscache_n_acquires_ok),
46413- atomic_read(&fscache_n_acquires_nobufs),
46414- atomic_read(&fscache_n_acquires_oom));
46415+ atomic_read_unchecked(&fscache_n_acquires),
46416+ atomic_read_unchecked(&fscache_n_acquires_null),
46417+ atomic_read_unchecked(&fscache_n_acquires_no_cache),
46418+ atomic_read_unchecked(&fscache_n_acquires_ok),
46419+ atomic_read_unchecked(&fscache_n_acquires_nobufs),
46420+ atomic_read_unchecked(&fscache_n_acquires_oom));
46421
46422 seq_printf(m, "Lookups: n=%u neg=%u pos=%u crt=%u tmo=%u\n",
46423- atomic_read(&fscache_n_object_lookups),
46424- atomic_read(&fscache_n_object_lookups_negative),
46425- atomic_read(&fscache_n_object_lookups_positive),
46426- atomic_read(&fscache_n_object_created),
46427- atomic_read(&fscache_n_object_lookups_timed_out));
46428+ atomic_read_unchecked(&fscache_n_object_lookups),
46429+ atomic_read_unchecked(&fscache_n_object_lookups_negative),
46430+ atomic_read_unchecked(&fscache_n_object_lookups_positive),
46431+ atomic_read_unchecked(&fscache_n_object_created),
46432+ atomic_read_unchecked(&fscache_n_object_lookups_timed_out));
46433
46434 seq_printf(m, "Updates: n=%u nul=%u run=%u\n",
46435- atomic_read(&fscache_n_updates),
46436- atomic_read(&fscache_n_updates_null),
46437- atomic_read(&fscache_n_updates_run));
46438+ atomic_read_unchecked(&fscache_n_updates),
46439+ atomic_read_unchecked(&fscache_n_updates_null),
46440+ atomic_read_unchecked(&fscache_n_updates_run));
46441
46442 seq_printf(m, "Relinqs: n=%u nul=%u wcr=%u rtr=%u\n",
46443- atomic_read(&fscache_n_relinquishes),
46444- atomic_read(&fscache_n_relinquishes_null),
46445- atomic_read(&fscache_n_relinquishes_waitcrt),
46446- atomic_read(&fscache_n_relinquishes_retire));
46447+ atomic_read_unchecked(&fscache_n_relinquishes),
46448+ atomic_read_unchecked(&fscache_n_relinquishes_null),
46449+ atomic_read_unchecked(&fscache_n_relinquishes_waitcrt),
46450+ atomic_read_unchecked(&fscache_n_relinquishes_retire));
46451
46452 seq_printf(m, "AttrChg: n=%u ok=%u nbf=%u oom=%u run=%u\n",
46453- atomic_read(&fscache_n_attr_changed),
46454- atomic_read(&fscache_n_attr_changed_ok),
46455- atomic_read(&fscache_n_attr_changed_nobufs),
46456- atomic_read(&fscache_n_attr_changed_nomem),
46457- atomic_read(&fscache_n_attr_changed_calls));
46458+ atomic_read_unchecked(&fscache_n_attr_changed),
46459+ atomic_read_unchecked(&fscache_n_attr_changed_ok),
46460+ atomic_read_unchecked(&fscache_n_attr_changed_nobufs),
46461+ atomic_read_unchecked(&fscache_n_attr_changed_nomem),
46462+ atomic_read_unchecked(&fscache_n_attr_changed_calls));
46463
46464 seq_printf(m, "Allocs : n=%u ok=%u wt=%u nbf=%u int=%u\n",
46465- atomic_read(&fscache_n_allocs),
46466- atomic_read(&fscache_n_allocs_ok),
46467- atomic_read(&fscache_n_allocs_wait),
46468- atomic_read(&fscache_n_allocs_nobufs),
46469- atomic_read(&fscache_n_allocs_intr));
46470+ atomic_read_unchecked(&fscache_n_allocs),
46471+ atomic_read_unchecked(&fscache_n_allocs_ok),
46472+ atomic_read_unchecked(&fscache_n_allocs_wait),
46473+ atomic_read_unchecked(&fscache_n_allocs_nobufs),
46474+ atomic_read_unchecked(&fscache_n_allocs_intr));
46475 seq_printf(m, "Allocs : ops=%u owt=%u abt=%u\n",
46476- atomic_read(&fscache_n_alloc_ops),
46477- atomic_read(&fscache_n_alloc_op_waits),
46478- atomic_read(&fscache_n_allocs_object_dead));
46479+ atomic_read_unchecked(&fscache_n_alloc_ops),
46480+ atomic_read_unchecked(&fscache_n_alloc_op_waits),
46481+ atomic_read_unchecked(&fscache_n_allocs_object_dead));
46482
46483 seq_printf(m, "Retrvls: n=%u ok=%u wt=%u nod=%u nbf=%u"
46484 " int=%u oom=%u\n",
46485- atomic_read(&fscache_n_retrievals),
46486- atomic_read(&fscache_n_retrievals_ok),
46487- atomic_read(&fscache_n_retrievals_wait),
46488- atomic_read(&fscache_n_retrievals_nodata),
46489- atomic_read(&fscache_n_retrievals_nobufs),
46490- atomic_read(&fscache_n_retrievals_intr),
46491- atomic_read(&fscache_n_retrievals_nomem));
46492+ atomic_read_unchecked(&fscache_n_retrievals),
46493+ atomic_read_unchecked(&fscache_n_retrievals_ok),
46494+ atomic_read_unchecked(&fscache_n_retrievals_wait),
46495+ atomic_read_unchecked(&fscache_n_retrievals_nodata),
46496+ atomic_read_unchecked(&fscache_n_retrievals_nobufs),
46497+ atomic_read_unchecked(&fscache_n_retrievals_intr),
46498+ atomic_read_unchecked(&fscache_n_retrievals_nomem));
46499 seq_printf(m, "Retrvls: ops=%u owt=%u abt=%u\n",
46500- atomic_read(&fscache_n_retrieval_ops),
46501- atomic_read(&fscache_n_retrieval_op_waits),
46502- atomic_read(&fscache_n_retrievals_object_dead));
46503+ atomic_read_unchecked(&fscache_n_retrieval_ops),
46504+ atomic_read_unchecked(&fscache_n_retrieval_op_waits),
46505+ atomic_read_unchecked(&fscache_n_retrievals_object_dead));
46506
46507 seq_printf(m, "Stores : n=%u ok=%u agn=%u nbf=%u oom=%u\n",
46508- atomic_read(&fscache_n_stores),
46509- atomic_read(&fscache_n_stores_ok),
46510- atomic_read(&fscache_n_stores_again),
46511- atomic_read(&fscache_n_stores_nobufs),
46512- atomic_read(&fscache_n_stores_oom));
46513+ atomic_read_unchecked(&fscache_n_stores),
46514+ atomic_read_unchecked(&fscache_n_stores_ok),
46515+ atomic_read_unchecked(&fscache_n_stores_again),
46516+ atomic_read_unchecked(&fscache_n_stores_nobufs),
46517+ atomic_read_unchecked(&fscache_n_stores_oom));
46518 seq_printf(m, "Stores : ops=%u run=%u pgs=%u rxd=%u olm=%u\n",
46519- atomic_read(&fscache_n_store_ops),
46520- atomic_read(&fscache_n_store_calls),
46521- atomic_read(&fscache_n_store_pages),
46522- atomic_read(&fscache_n_store_radix_deletes),
46523- atomic_read(&fscache_n_store_pages_over_limit));
46524+ atomic_read_unchecked(&fscache_n_store_ops),
46525+ atomic_read_unchecked(&fscache_n_store_calls),
46526+ atomic_read_unchecked(&fscache_n_store_pages),
46527+ atomic_read_unchecked(&fscache_n_store_radix_deletes),
46528+ atomic_read_unchecked(&fscache_n_store_pages_over_limit));
46529
46530 seq_printf(m, "VmScan : nos=%u gon=%u bsy=%u can=%u\n",
46531- atomic_read(&fscache_n_store_vmscan_not_storing),
46532- atomic_read(&fscache_n_store_vmscan_gone),
46533- atomic_read(&fscache_n_store_vmscan_busy),
46534- atomic_read(&fscache_n_store_vmscan_cancelled));
46535+ atomic_read_unchecked(&fscache_n_store_vmscan_not_storing),
46536+ atomic_read_unchecked(&fscache_n_store_vmscan_gone),
46537+ atomic_read_unchecked(&fscache_n_store_vmscan_busy),
46538+ atomic_read_unchecked(&fscache_n_store_vmscan_cancelled));
46539
46540 seq_printf(m, "Ops : pend=%u run=%u enq=%u can=%u rej=%u\n",
46541- atomic_read(&fscache_n_op_pend),
46542- atomic_read(&fscache_n_op_run),
46543- atomic_read(&fscache_n_op_enqueue),
46544- atomic_read(&fscache_n_op_cancelled),
46545- atomic_read(&fscache_n_op_rejected));
46546+ atomic_read_unchecked(&fscache_n_op_pend),
46547+ atomic_read_unchecked(&fscache_n_op_run),
46548+ atomic_read_unchecked(&fscache_n_op_enqueue),
46549+ atomic_read_unchecked(&fscache_n_op_cancelled),
46550+ atomic_read_unchecked(&fscache_n_op_rejected));
46551 seq_printf(m, "Ops : dfr=%u rel=%u gc=%u\n",
46552- atomic_read(&fscache_n_op_deferred_release),
46553- atomic_read(&fscache_n_op_release),
46554- atomic_read(&fscache_n_op_gc));
46555+ atomic_read_unchecked(&fscache_n_op_deferred_release),
46556+ atomic_read_unchecked(&fscache_n_op_release),
46557+ atomic_read_unchecked(&fscache_n_op_gc));
46558
46559 seq_printf(m, "CacheOp: alo=%d luo=%d luc=%d gro=%d\n",
46560 atomic_read(&fscache_n_cop_alloc_object),
46561diff --git a/fs/fuse/cuse.c b/fs/fuse/cuse.c
46562index 3426521..3b75162 100644
46563--- a/fs/fuse/cuse.c
46564+++ b/fs/fuse/cuse.c
46565@@ -587,10 +587,12 @@ static int __init cuse_init(void)
46566 INIT_LIST_HEAD(&cuse_conntbl[i]);
46567
46568 /* inherit and extend fuse_dev_operations */
46569- cuse_channel_fops = fuse_dev_operations;
46570- cuse_channel_fops.owner = THIS_MODULE;
46571- cuse_channel_fops.open = cuse_channel_open;
46572- cuse_channel_fops.release = cuse_channel_release;
46573+ pax_open_kernel();
46574+ memcpy((void *)&cuse_channel_fops, &fuse_dev_operations, sizeof(fuse_dev_operations));
46575+ *(void **)&cuse_channel_fops.owner = THIS_MODULE;
46576+ *(void **)&cuse_channel_fops.open = cuse_channel_open;
46577+ *(void **)&cuse_channel_fops.release = cuse_channel_release;
46578+ pax_close_kernel();
46579
46580 cuse_class = class_create(THIS_MODULE, "cuse");
46581 if (IS_ERR(cuse_class))
46582diff --git a/fs/fuse/dev.c b/fs/fuse/dev.c
46583index 2aaf3ea..8e50863 100644
46584--- a/fs/fuse/dev.c
46585+++ b/fs/fuse/dev.c
46586@@ -1242,7 +1242,7 @@ static ssize_t fuse_dev_splice_read(struct file *in, loff_t *ppos,
46587 ret = 0;
46588 pipe_lock(pipe);
46589
46590- if (!pipe->readers) {
46591+ if (!atomic_read(&pipe->readers)) {
46592 send_sig(SIGPIPE, current, 0);
46593 if (!ret)
46594 ret = -EPIPE;
46595diff --git a/fs/fuse/dir.c b/fs/fuse/dir.c
46596index 9f63e49..d8a64c0 100644
46597--- a/fs/fuse/dir.c
46598+++ b/fs/fuse/dir.c
46599@@ -1147,7 +1147,7 @@ static char *read_link(struct dentry *dentry)
46600 return link;
46601 }
46602
46603-static void free_link(char *link)
46604+static void free_link(const char *link)
46605 {
46606 if (!IS_ERR(link))
46607 free_page((unsigned long) link);
46608diff --git a/fs/gfs2/inode.c b/fs/gfs2/inode.c
46609index cfd4959..a780959 100644
46610--- a/fs/gfs2/inode.c
46611+++ b/fs/gfs2/inode.c
46612@@ -1490,7 +1490,7 @@ out:
46613
46614 static void gfs2_put_link(struct dentry *dentry, struct nameidata *nd, void *p)
46615 {
46616- char *s = nd_get_link(nd);
46617+ const char *s = nd_get_link(nd);
46618 if (!IS_ERR(s))
46619 kfree(s);
46620 }
46621diff --git a/fs/hugetlbfs/inode.c b/fs/hugetlbfs/inode.c
46622index 0be5a78..9cfb853 100644
46623--- a/fs/hugetlbfs/inode.c
46624+++ b/fs/hugetlbfs/inode.c
46625@@ -915,7 +915,7 @@ static struct file_system_type hugetlbfs_fs_type = {
46626 .kill_sb = kill_litter_super,
46627 };
46628
46629-static struct vfsmount *hugetlbfs_vfsmount;
46630+struct vfsmount *hugetlbfs_vfsmount;
46631
46632 static int can_do_hugetlb_shm(void)
46633 {
46634diff --git a/fs/inode.c b/fs/inode.c
46635index ee4e66b..9a39f9c 100644
46636--- a/fs/inode.c
46637+++ b/fs/inode.c
46638@@ -787,8 +787,8 @@ unsigned int get_next_ino(void)
46639
46640 #ifdef CONFIG_SMP
46641 if (unlikely((res & (LAST_INO_BATCH-1)) == 0)) {
46642- static atomic_t shared_last_ino;
46643- int next = atomic_add_return(LAST_INO_BATCH, &shared_last_ino);
46644+ static atomic_unchecked_t shared_last_ino;
46645+ int next = atomic_add_return_unchecked(LAST_INO_BATCH, &shared_last_ino);
46646
46647 res = next - LAST_INO_BATCH;
46648 }
46649@@ -855,8 +855,7 @@ void lockdep_annotate_inode_mutex_key(struct inode *inode)
46650 struct file_system_type *type = inode->i_sb->s_type;
46651
46652 /* Set new key only if filesystem hasn't already changed it */
46653- if (!lockdep_match_class(&inode->i_mutex,
46654- &type->i_mutex_key)) {
46655+ if (lockdep_match_class(&inode->i_mutex, &type->i_mutex_key)) {
46656 /*
46657 * ensure nobody is actually holding i_mutex
46658 */
46659@@ -883,6 +882,7 @@ void unlock_new_inode(struct inode *inode)
46660 spin_lock(&inode->i_lock);
46661 WARN_ON(!(inode->i_state & I_NEW));
46662 inode->i_state &= ~I_NEW;
46663+ smp_mb();
46664 wake_up_bit(&inode->i_state, __I_NEW);
46665 spin_unlock(&inode->i_lock);
46666 }
46667diff --git a/fs/jffs2/erase.c b/fs/jffs2/erase.c
46668index e513f19..2ab1351 100644
46669--- a/fs/jffs2/erase.c
46670+++ b/fs/jffs2/erase.c
46671@@ -439,7 +439,8 @@ static void jffs2_mark_erased_block(struct jffs2_sb_info *c, struct jffs2_eraseb
46672 struct jffs2_unknown_node marker = {
46673 .magic = cpu_to_je16(JFFS2_MAGIC_BITMASK),
46674 .nodetype = cpu_to_je16(JFFS2_NODETYPE_CLEANMARKER),
46675- .totlen = cpu_to_je32(c->cleanmarker_size)
46676+ .totlen = cpu_to_je32(c->cleanmarker_size),
46677+ .hdr_crc = cpu_to_je32(0)
46678 };
46679
46680 jffs2_prealloc_raw_node_refs(c, jeb, 1);
46681diff --git a/fs/jffs2/wbuf.c b/fs/jffs2/wbuf.c
46682index b09e51d..e482afa 100644
46683--- a/fs/jffs2/wbuf.c
46684+++ b/fs/jffs2/wbuf.c
46685@@ -1011,7 +1011,8 @@ static const struct jffs2_unknown_node oob_cleanmarker =
46686 {
46687 .magic = constant_cpu_to_je16(JFFS2_MAGIC_BITMASK),
46688 .nodetype = constant_cpu_to_je16(JFFS2_NODETYPE_CLEANMARKER),
46689- .totlen = constant_cpu_to_je32(8)
46690+ .totlen = constant_cpu_to_je32(8),
46691+ .hdr_crc = constant_cpu_to_je32(0)
46692 };
46693
46694 /*
46695diff --git a/fs/jfs/super.c b/fs/jfs/super.c
46696index a44eff0..462e07d 100644
46697--- a/fs/jfs/super.c
46698+++ b/fs/jfs/super.c
46699@@ -802,7 +802,7 @@ static int __init init_jfs_fs(void)
46700
46701 jfs_inode_cachep =
46702 kmem_cache_create("jfs_ip", sizeof(struct jfs_inode_info), 0,
46703- SLAB_RECLAIM_ACCOUNT|SLAB_MEM_SPREAD,
46704+ SLAB_RECLAIM_ACCOUNT|SLAB_MEM_SPREAD|SLAB_USERCOPY,
46705 init_once);
46706 if (jfs_inode_cachep == NULL)
46707 return -ENOMEM;
46708diff --git a/fs/libfs.c b/fs/libfs.c
46709index f6d411e..e82a08d 100644
46710--- a/fs/libfs.c
46711+++ b/fs/libfs.c
46712@@ -165,6 +165,9 @@ int dcache_readdir(struct file * filp, void * dirent, filldir_t filldir)
46713
46714 for (p=q->next; p != &dentry->d_subdirs; p=p->next) {
46715 struct dentry *next;
46716+ char d_name[sizeof(next->d_iname)];
46717+ const unsigned char *name;
46718+
46719 next = list_entry(p, struct dentry, d_u.d_child);
46720 spin_lock_nested(&next->d_lock, DENTRY_D_LOCK_NESTED);
46721 if (!simple_positive(next)) {
46722@@ -174,7 +177,12 @@ int dcache_readdir(struct file * filp, void * dirent, filldir_t filldir)
46723
46724 spin_unlock(&next->d_lock);
46725 spin_unlock(&dentry->d_lock);
46726- if (filldir(dirent, next->d_name.name,
46727+ name = next->d_name.name;
46728+ if (name == next->d_iname) {
46729+ memcpy(d_name, name, next->d_name.len);
46730+ name = d_name;
46731+ }
46732+ if (filldir(dirent, name,
46733 next->d_name.len, filp->f_pos,
46734 next->d_inode->i_ino,
46735 dt_type(next->d_inode)) < 0)
46736diff --git a/fs/lockd/clntproc.c b/fs/lockd/clntproc.c
46737index 8392cb8..80d6193 100644
46738--- a/fs/lockd/clntproc.c
46739+++ b/fs/lockd/clntproc.c
46740@@ -36,11 +36,11 @@ static const struct rpc_call_ops nlmclnt_cancel_ops;
46741 /*
46742 * Cookie counter for NLM requests
46743 */
46744-static atomic_t nlm_cookie = ATOMIC_INIT(0x1234);
46745+static atomic_unchecked_t nlm_cookie = ATOMIC_INIT(0x1234);
46746
46747 void nlmclnt_next_cookie(struct nlm_cookie *c)
46748 {
46749- u32 cookie = atomic_inc_return(&nlm_cookie);
46750+ u32 cookie = atomic_inc_return_unchecked(&nlm_cookie);
46751
46752 memcpy(c->data, &cookie, 4);
46753 c->len=4;
46754diff --git a/fs/locks.c b/fs/locks.c
46755index 637694b..f84a121 100644
46756--- a/fs/locks.c
46757+++ b/fs/locks.c
46758@@ -2074,16 +2074,16 @@ void locks_remove_flock(struct file *filp)
46759 return;
46760
46761 if (filp->f_op && filp->f_op->flock) {
46762- struct file_lock fl = {
46763+ struct file_lock flock = {
46764 .fl_pid = current->tgid,
46765 .fl_file = filp,
46766 .fl_flags = FL_FLOCK,
46767 .fl_type = F_UNLCK,
46768 .fl_end = OFFSET_MAX,
46769 };
46770- filp->f_op->flock(filp, F_SETLKW, &fl);
46771- if (fl.fl_ops && fl.fl_ops->fl_release_private)
46772- fl.fl_ops->fl_release_private(&fl);
46773+ filp->f_op->flock(filp, F_SETLKW, &flock);
46774+ if (flock.fl_ops && flock.fl_ops->fl_release_private)
46775+ flock.fl_ops->fl_release_private(&flock);
46776 }
46777
46778 lock_flocks();
46779diff --git a/fs/namei.c b/fs/namei.c
46780index 9680cef..a19f203 100644
46781--- a/fs/namei.c
46782+++ b/fs/namei.c
46783@@ -279,16 +279,32 @@ int generic_permission(struct inode *inode, int mask)
46784 if (ret != -EACCES)
46785 return ret;
46786
46787+#ifdef CONFIG_GRKERNSEC
46788+ /* we'll block if we have to log due to a denied capability use */
46789+ if (mask & MAY_NOT_BLOCK)
46790+ return -ECHILD;
46791+#endif
46792+
46793 if (S_ISDIR(inode->i_mode)) {
46794 /* DACs are overridable for directories */
46795- if (ns_capable(inode_userns(inode), CAP_DAC_OVERRIDE))
46796- return 0;
46797 if (!(mask & MAY_WRITE))
46798- if (ns_capable(inode_userns(inode), CAP_DAC_READ_SEARCH))
46799+ if (ns_capable_nolog(inode_userns(inode), CAP_DAC_OVERRIDE) ||
46800+ ns_capable(inode_userns(inode), CAP_DAC_READ_SEARCH))
46801 return 0;
46802+ if (ns_capable(inode_userns(inode), CAP_DAC_OVERRIDE))
46803+ return 0;
46804 return -EACCES;
46805 }
46806 /*
46807+ * Searching includes executable on directories, else just read.
46808+ */
46809+ mask &= MAY_READ | MAY_WRITE | MAY_EXEC;
46810+ if (mask == MAY_READ)
46811+ if (ns_capable_nolog(inode_userns(inode), CAP_DAC_OVERRIDE) ||
46812+ ns_capable(inode_userns(inode), CAP_DAC_READ_SEARCH))
46813+ return 0;
46814+
46815+ /*
46816 * Read/write DACs are always overridable.
46817 * Executable DACs are overridable when there is
46818 * at least one exec bit set.
46819@@ -297,14 +313,6 @@ int generic_permission(struct inode *inode, int mask)
46820 if (ns_capable(inode_userns(inode), CAP_DAC_OVERRIDE))
46821 return 0;
46822
46823- /*
46824- * Searching includes executable on directories, else just read.
46825- */
46826- mask &= MAY_READ | MAY_WRITE | MAY_EXEC;
46827- if (mask == MAY_READ)
46828- if (ns_capable(inode_userns(inode), CAP_DAC_READ_SEARCH))
46829- return 0;
46830-
46831 return -EACCES;
46832 }
46833
46834@@ -653,11 +661,19 @@ follow_link(struct path *link, struct nameidata *nd, void **p)
46835 return error;
46836 }
46837
46838+ if (gr_handle_follow_link(dentry->d_parent->d_inode,
46839+ dentry->d_inode, dentry, nd->path.mnt)) {
46840+ error = -EACCES;
46841+ *p = ERR_PTR(error); /* no ->put_link(), please */
46842+ path_put(&nd->path);
46843+ return error;
46844+ }
46845+
46846 nd->last_type = LAST_BIND;
46847 *p = dentry->d_inode->i_op->follow_link(dentry, nd);
46848 error = PTR_ERR(*p);
46849 if (!IS_ERR(*p)) {
46850- char *s = nd_get_link(nd);
46851+ const char *s = nd_get_link(nd);
46852 error = 0;
46853 if (s)
46854 error = __vfs_follow_link(nd, s);
46855@@ -1624,6 +1640,21 @@ static int path_lookupat(int dfd, const char *name,
46856 if (!err)
46857 err = complete_walk(nd);
46858
46859+ if (!(nd->flags & LOOKUP_PARENT)) {
46860+#ifdef CONFIG_GRKERNSEC
46861+ if (flags & LOOKUP_RCU) {
46862+ if (!err)
46863+ path_put(&nd->path);
46864+ err = -ECHILD;
46865+ } else
46866+#endif
46867+ if (!gr_acl_handle_hidden_file(nd->path.dentry, nd->path.mnt)) {
46868+ if (!err)
46869+ path_put(&nd->path);
46870+ err = -ENOENT;
46871+ }
46872+ }
46873+
46874 if (!err && nd->flags & LOOKUP_DIRECTORY) {
46875 if (!nd->inode->i_op->lookup) {
46876 path_put(&nd->path);
46877@@ -1651,6 +1682,15 @@ static int do_path_lookup(int dfd, const char *name,
46878 retval = path_lookupat(dfd, name, flags | LOOKUP_REVAL, nd);
46879
46880 if (likely(!retval)) {
46881+ if (*name != '/' && nd->path.dentry && nd->inode) {
46882+#ifdef CONFIG_GRKERNSEC
46883+ if (flags & LOOKUP_RCU)
46884+ return -ECHILD;
46885+#endif
46886+ if (!gr_chroot_fchdir(nd->path.dentry, nd->path.mnt))
46887+ return -ENOENT;
46888+ }
46889+
46890 if (unlikely(!audit_dummy_context())) {
46891 if (nd->path.dentry && nd->inode)
46892 audit_inode(name, nd->path.dentry);
46893@@ -2048,6 +2088,13 @@ static int may_open(struct path *path, int acc_mode, int flag)
46894 if (flag & O_NOATIME && !inode_owner_or_capable(inode))
46895 return -EPERM;
46896
46897+ if (gr_handle_rofs_blockwrite(dentry, path->mnt, acc_mode))
46898+ return -EPERM;
46899+ if (gr_handle_rawio(inode))
46900+ return -EPERM;
46901+ if (!gr_acl_handle_open(dentry, path->mnt, acc_mode))
46902+ return -EACCES;
46903+
46904 return 0;
46905 }
46906
46907@@ -2109,6 +2156,16 @@ static struct file *do_last(struct nameidata *nd, struct path *path,
46908 error = complete_walk(nd);
46909 if (error)
46910 return ERR_PTR(error);
46911+#ifdef CONFIG_GRKERNSEC
46912+ if (nd->flags & LOOKUP_RCU) {
46913+ error = -ECHILD;
46914+ goto exit;
46915+ }
46916+#endif
46917+ if (!gr_acl_handle_hidden_file(nd->path.dentry, nd->path.mnt)) {
46918+ error = -ENOENT;
46919+ goto exit;
46920+ }
46921 audit_inode(pathname, nd->path.dentry);
46922 if (open_flag & O_CREAT) {
46923 error = -EISDIR;
46924@@ -2119,6 +2176,16 @@ static struct file *do_last(struct nameidata *nd, struct path *path,
46925 error = complete_walk(nd);
46926 if (error)
46927 return ERR_PTR(error);
46928+#ifdef CONFIG_GRKERNSEC
46929+ if (nd->flags & LOOKUP_RCU) {
46930+ error = -ECHILD;
46931+ goto exit;
46932+ }
46933+#endif
46934+ if (!gr_acl_handle_hidden_file(dir, nd->path.mnt)) {
46935+ error = -ENOENT;
46936+ goto exit;
46937+ }
46938 audit_inode(pathname, dir);
46939 goto ok;
46940 }
46941@@ -2140,6 +2207,16 @@ static struct file *do_last(struct nameidata *nd, struct path *path,
46942 error = complete_walk(nd);
46943 if (error)
46944 return ERR_PTR(error);
46945+#ifdef CONFIG_GRKERNSEC
46946+ if (nd->flags & LOOKUP_RCU) {
46947+ error = -ECHILD;
46948+ goto exit;
46949+ }
46950+#endif
46951+ if (!gr_acl_handle_hidden_file(nd->path.dentry, nd->path.mnt)) {
46952+ error = -ENOENT;
46953+ goto exit;
46954+ }
46955
46956 error = -ENOTDIR;
46957 if (nd->flags & LOOKUP_DIRECTORY) {
46958@@ -2180,6 +2257,12 @@ static struct file *do_last(struct nameidata *nd, struct path *path,
46959 /* Negative dentry, just create the file */
46960 if (!dentry->d_inode) {
46961 int mode = op->mode;
46962+
46963+ if (!gr_acl_handle_creat(path->dentry, nd->path.dentry, path->mnt, open_flag, acc_mode, mode)) {
46964+ error = -EACCES;
46965+ goto exit_mutex_unlock;
46966+ }
46967+
46968 if (!IS_POSIXACL(dir->d_inode))
46969 mode &= ~current_umask();
46970 /*
46971@@ -2203,6 +2286,8 @@ static struct file *do_last(struct nameidata *nd, struct path *path,
46972 error = vfs_create(dir->d_inode, dentry, mode, nd);
46973 if (error)
46974 goto exit_mutex_unlock;
46975+ else
46976+ gr_handle_create(path->dentry, path->mnt);
46977 mutex_unlock(&dir->d_inode->i_mutex);
46978 dput(nd->path.dentry);
46979 nd->path.dentry = dentry;
46980@@ -2212,6 +2297,19 @@ static struct file *do_last(struct nameidata *nd, struct path *path,
46981 /*
46982 * It already exists.
46983 */
46984+
46985+ if (!gr_acl_handle_hidden_file(dentry, nd->path.mnt)) {
46986+ error = -ENOENT;
46987+ goto exit_mutex_unlock;
46988+ }
46989+
46990+ /* only check if O_CREAT is specified, all other checks need to go
46991+ into may_open */
46992+ if (gr_handle_fifo(path->dentry, path->mnt, dir, open_flag, acc_mode)) {
46993+ error = -EACCES;
46994+ goto exit_mutex_unlock;
46995+ }
46996+
46997 mutex_unlock(&dir->d_inode->i_mutex);
46998 audit_inode(pathname, path->dentry);
46999
47000@@ -2424,6 +2522,11 @@ struct dentry *kern_path_create(int dfd, const char *pathname, struct path *path
47001 *path = nd.path;
47002 return dentry;
47003 eexist:
47004+ if (!gr_acl_handle_hidden_file(dentry, nd.path.mnt)) {
47005+ dput(dentry);
47006+ dentry = ERR_PTR(-ENOENT);
47007+ goto fail;
47008+ }
47009 dput(dentry);
47010 dentry = ERR_PTR(-EEXIST);
47011 fail:
47012@@ -2446,6 +2549,20 @@ struct dentry *user_path_create(int dfd, const char __user *pathname, struct pat
47013 }
47014 EXPORT_SYMBOL(user_path_create);
47015
47016+static struct dentry *user_path_create_with_name(int dfd, const char __user *pathname, struct path *path, char **to, int is_dir)
47017+{
47018+ char *tmp = getname(pathname);
47019+ struct dentry *res;
47020+ if (IS_ERR(tmp))
47021+ return ERR_CAST(tmp);
47022+ res = kern_path_create(dfd, tmp, path, is_dir);
47023+ if (IS_ERR(res))
47024+ putname(tmp);
47025+ else
47026+ *to = tmp;
47027+ return res;
47028+}
47029+
47030 int vfs_mknod(struct inode *dir, struct dentry *dentry, int mode, dev_t dev)
47031 {
47032 int error = may_create(dir, dentry);
47033@@ -2513,6 +2630,17 @@ SYSCALL_DEFINE4(mknodat, int, dfd, const char __user *, filename, int, mode,
47034 error = mnt_want_write(path.mnt);
47035 if (error)
47036 goto out_dput;
47037+
47038+ if (gr_handle_chroot_mknod(dentry, path.mnt, mode)) {
47039+ error = -EPERM;
47040+ goto out_drop_write;
47041+ }
47042+
47043+ if (!gr_acl_handle_mknod(dentry, path.dentry, path.mnt, mode)) {
47044+ error = -EACCES;
47045+ goto out_drop_write;
47046+ }
47047+
47048 error = security_path_mknod(&path, dentry, mode, dev);
47049 if (error)
47050 goto out_drop_write;
47051@@ -2530,6 +2658,9 @@ SYSCALL_DEFINE4(mknodat, int, dfd, const char __user *, filename, int, mode,
47052 }
47053 out_drop_write:
47054 mnt_drop_write(path.mnt);
47055+
47056+ if (!error)
47057+ gr_handle_create(dentry, path.mnt);
47058 out_dput:
47059 dput(dentry);
47060 mutex_unlock(&path.dentry->d_inode->i_mutex);
47061@@ -2579,12 +2710,21 @@ SYSCALL_DEFINE3(mkdirat, int, dfd, const char __user *, pathname, int, mode)
47062 error = mnt_want_write(path.mnt);
47063 if (error)
47064 goto out_dput;
47065+
47066+ if (!gr_acl_handle_mkdir(dentry, path.dentry, path.mnt)) {
47067+ error = -EACCES;
47068+ goto out_drop_write;
47069+ }
47070+
47071 error = security_path_mkdir(&path, dentry, mode);
47072 if (error)
47073 goto out_drop_write;
47074 error = vfs_mkdir(path.dentry->d_inode, dentry, mode);
47075 out_drop_write:
47076 mnt_drop_write(path.mnt);
47077+
47078+ if (!error)
47079+ gr_handle_create(dentry, path.mnt);
47080 out_dput:
47081 dput(dentry);
47082 mutex_unlock(&path.dentry->d_inode->i_mutex);
47083@@ -2664,6 +2804,8 @@ static long do_rmdir(int dfd, const char __user *pathname)
47084 char * name;
47085 struct dentry *dentry;
47086 struct nameidata nd;
47087+ ino_t saved_ino = 0;
47088+ dev_t saved_dev = 0;
47089
47090 error = user_path_parent(dfd, pathname, &nd, &name);
47091 if (error)
47092@@ -2692,6 +2834,15 @@ static long do_rmdir(int dfd, const char __user *pathname)
47093 error = -ENOENT;
47094 goto exit3;
47095 }
47096+
47097+ saved_ino = dentry->d_inode->i_ino;
47098+ saved_dev = gr_get_dev_from_dentry(dentry);
47099+
47100+ if (!gr_acl_handle_rmdir(dentry, nd.path.mnt)) {
47101+ error = -EACCES;
47102+ goto exit3;
47103+ }
47104+
47105 error = mnt_want_write(nd.path.mnt);
47106 if (error)
47107 goto exit3;
47108@@ -2699,6 +2850,8 @@ static long do_rmdir(int dfd, const char __user *pathname)
47109 if (error)
47110 goto exit4;
47111 error = vfs_rmdir(nd.path.dentry->d_inode, dentry);
47112+ if (!error && (saved_dev || saved_ino))
47113+ gr_handle_delete(saved_ino, saved_dev);
47114 exit4:
47115 mnt_drop_write(nd.path.mnt);
47116 exit3:
47117@@ -2761,6 +2914,8 @@ static long do_unlinkat(int dfd, const char __user *pathname)
47118 struct dentry *dentry;
47119 struct nameidata nd;
47120 struct inode *inode = NULL;
47121+ ino_t saved_ino = 0;
47122+ dev_t saved_dev = 0;
47123
47124 error = user_path_parent(dfd, pathname, &nd, &name);
47125 if (error)
47126@@ -2783,6 +2938,16 @@ static long do_unlinkat(int dfd, const char __user *pathname)
47127 if (!inode)
47128 goto slashes;
47129 ihold(inode);
47130+
47131+ if (inode->i_nlink <= 1) {
47132+ saved_ino = inode->i_ino;
47133+ saved_dev = gr_get_dev_from_dentry(dentry);
47134+ }
47135+ if (!gr_acl_handle_unlink(dentry, nd.path.mnt)) {
47136+ error = -EACCES;
47137+ goto exit2;
47138+ }
47139+
47140 error = mnt_want_write(nd.path.mnt);
47141 if (error)
47142 goto exit2;
47143@@ -2790,6 +2955,8 @@ static long do_unlinkat(int dfd, const char __user *pathname)
47144 if (error)
47145 goto exit3;
47146 error = vfs_unlink(nd.path.dentry->d_inode, dentry);
47147+ if (!error && (saved_ino || saved_dev))
47148+ gr_handle_delete(saved_ino, saved_dev);
47149 exit3:
47150 mnt_drop_write(nd.path.mnt);
47151 exit2:
47152@@ -2865,10 +3032,18 @@ SYSCALL_DEFINE3(symlinkat, const char __user *, oldname,
47153 error = mnt_want_write(path.mnt);
47154 if (error)
47155 goto out_dput;
47156+
47157+ if (!gr_acl_handle_symlink(dentry, path.dentry, path.mnt, from)) {
47158+ error = -EACCES;
47159+ goto out_drop_write;
47160+ }
47161+
47162 error = security_path_symlink(&path, dentry, from);
47163 if (error)
47164 goto out_drop_write;
47165 error = vfs_symlink(path.dentry->d_inode, dentry, from);
47166+ if (!error)
47167+ gr_handle_create(dentry, path.mnt);
47168 out_drop_write:
47169 mnt_drop_write(path.mnt);
47170 out_dput:
47171@@ -2940,6 +3115,7 @@ SYSCALL_DEFINE5(linkat, int, olddfd, const char __user *, oldname,
47172 {
47173 struct dentry *new_dentry;
47174 struct path old_path, new_path;
47175+ char *to = NULL;
47176 int how = 0;
47177 int error;
47178
47179@@ -2963,7 +3139,7 @@ SYSCALL_DEFINE5(linkat, int, olddfd, const char __user *, oldname,
47180 if (error)
47181 return error;
47182
47183- new_dentry = user_path_create(newdfd, newname, &new_path, 0);
47184+ new_dentry = user_path_create_with_name(newdfd, newname, &new_path, &to, 0);
47185 error = PTR_ERR(new_dentry);
47186 if (IS_ERR(new_dentry))
47187 goto out;
47188@@ -2974,13 +3150,30 @@ SYSCALL_DEFINE5(linkat, int, olddfd, const char __user *, oldname,
47189 error = mnt_want_write(new_path.mnt);
47190 if (error)
47191 goto out_dput;
47192+
47193+ if (gr_handle_hardlink(old_path.dentry, old_path.mnt,
47194+ old_path.dentry->d_inode,
47195+ old_path.dentry->d_inode->i_mode, to)) {
47196+ error = -EACCES;
47197+ goto out_drop_write;
47198+ }
47199+
47200+ if (!gr_acl_handle_link(new_dentry, new_path.dentry, new_path.mnt,
47201+ old_path.dentry, old_path.mnt, to)) {
47202+ error = -EACCES;
47203+ goto out_drop_write;
47204+ }
47205+
47206 error = security_path_link(old_path.dentry, &new_path, new_dentry);
47207 if (error)
47208 goto out_drop_write;
47209 error = vfs_link(old_path.dentry, new_path.dentry->d_inode, new_dentry);
47210+ if (!error)
47211+ gr_handle_create(new_dentry, new_path.mnt);
47212 out_drop_write:
47213 mnt_drop_write(new_path.mnt);
47214 out_dput:
47215+ putname(to);
47216 dput(new_dentry);
47217 mutex_unlock(&new_path.dentry->d_inode->i_mutex);
47218 path_put(&new_path);
47219@@ -3208,6 +3401,12 @@ SYSCALL_DEFINE4(renameat, int, olddfd, const char __user *, oldname,
47220 if (new_dentry == trap)
47221 goto exit5;
47222
47223+ error = gr_acl_handle_rename(new_dentry, new_dir, newnd.path.mnt,
47224+ old_dentry, old_dir->d_inode, oldnd.path.mnt,
47225+ to);
47226+ if (error)
47227+ goto exit5;
47228+
47229 error = mnt_want_write(oldnd.path.mnt);
47230 if (error)
47231 goto exit5;
47232@@ -3217,6 +3416,9 @@ SYSCALL_DEFINE4(renameat, int, olddfd, const char __user *, oldname,
47233 goto exit6;
47234 error = vfs_rename(old_dir->d_inode, old_dentry,
47235 new_dir->d_inode, new_dentry);
47236+ if (!error)
47237+ gr_handle_rename(old_dir->d_inode, new_dir->d_inode, old_dentry,
47238+ new_dentry, oldnd.path.mnt, new_dentry->d_inode ? 1 : 0);
47239 exit6:
47240 mnt_drop_write(oldnd.path.mnt);
47241 exit5:
47242@@ -3242,6 +3444,8 @@ SYSCALL_DEFINE2(rename, const char __user *, oldname, const char __user *, newna
47243
47244 int vfs_readlink(struct dentry *dentry, char __user *buffer, int buflen, const char *link)
47245 {
47246+ char tmpbuf[64];
47247+ const char *newlink;
47248 int len;
47249
47250 len = PTR_ERR(link);
47251@@ -3251,7 +3455,14 @@ int vfs_readlink(struct dentry *dentry, char __user *buffer, int buflen, const c
47252 len = strlen(link);
47253 if (len > (unsigned) buflen)
47254 len = buflen;
47255- if (copy_to_user(buffer, link, len))
47256+
47257+ if (len < sizeof(tmpbuf)) {
47258+ memcpy(tmpbuf, link, len);
47259+ newlink = tmpbuf;
47260+ } else
47261+ newlink = link;
47262+
47263+ if (copy_to_user(buffer, newlink, len))
47264 len = -EFAULT;
47265 out:
47266 return len;
47267diff --git a/fs/namespace.c b/fs/namespace.c
47268index cfc6d44..b4632a5 100644
47269--- a/fs/namespace.c
47270+++ b/fs/namespace.c
47271@@ -1326,6 +1326,9 @@ static int do_umount(struct vfsmount *mnt, int flags)
47272 if (!(sb->s_flags & MS_RDONLY))
47273 retval = do_remount_sb(sb, MS_RDONLY, NULL, 0);
47274 up_write(&sb->s_umount);
47275+
47276+ gr_log_remount(mnt->mnt_devname, retval);
47277+
47278 return retval;
47279 }
47280
47281@@ -1345,6 +1348,9 @@ static int do_umount(struct vfsmount *mnt, int flags)
47282 br_write_unlock(vfsmount_lock);
47283 up_write(&namespace_sem);
47284 release_mounts(&umount_list);
47285+
47286+ gr_log_unmount(mnt->mnt_devname, retval);
47287+
47288 return retval;
47289 }
47290
47291@@ -2336,6 +2342,16 @@ long do_mount(char *dev_name, char *dir_name, char *type_page,
47292 MS_NOATIME | MS_NODIRATIME | MS_RELATIME| MS_KERNMOUNT |
47293 MS_STRICTATIME);
47294
47295+ if (gr_handle_rofs_mount(path.dentry, path.mnt, mnt_flags)) {
47296+ retval = -EPERM;
47297+ goto dput_out;
47298+ }
47299+
47300+ if (gr_handle_chroot_mount(path.dentry, path.mnt, dev_name)) {
47301+ retval = -EPERM;
47302+ goto dput_out;
47303+ }
47304+
47305 if (flags & MS_REMOUNT)
47306 retval = do_remount(&path, flags & ~MS_REMOUNT, mnt_flags,
47307 data_page);
47308@@ -2350,6 +2366,9 @@ long do_mount(char *dev_name, char *dir_name, char *type_page,
47309 dev_name, data_page);
47310 dput_out:
47311 path_put(&path);
47312+
47313+ gr_log_mount(dev_name, dir_name, retval);
47314+
47315 return retval;
47316 }
47317
47318@@ -2605,6 +2624,11 @@ SYSCALL_DEFINE2(pivot_root, const char __user *, new_root,
47319 if (error)
47320 goto out2;
47321
47322+ if (gr_handle_chroot_pivot()) {
47323+ error = -EPERM;
47324+ goto out2;
47325+ }
47326+
47327 get_fs_root(current->fs, &root);
47328 error = lock_mount(&old);
47329 if (error)
47330diff --git a/fs/ncpfs/ncplib_kernel.h b/fs/ncpfs/ncplib_kernel.h
47331index 09881e6..308ff20 100644
47332--- a/fs/ncpfs/ncplib_kernel.h
47333+++ b/fs/ncpfs/ncplib_kernel.h
47334@@ -130,7 +130,7 @@ static inline int ncp_is_nfs_extras(struct ncp_server* server, unsigned int voln
47335 int ncp__io2vol(struct ncp_server *, unsigned char *, unsigned int *,
47336 const unsigned char *, unsigned int, int);
47337 int ncp__vol2io(struct ncp_server *, unsigned char *, unsigned int *,
47338- const unsigned char *, unsigned int, int);
47339+ const unsigned char *, unsigned int, int) __size_overflow(5);
47340
47341 #define NCP_ESC ':'
47342 #define NCP_IO_TABLE(sb) (NCP_SBP(sb)->nls_io)
47343@@ -146,7 +146,7 @@ int ncp__vol2io(struct ncp_server *, unsigned char *, unsigned int *,
47344 int ncp__io2vol(unsigned char *, unsigned int *,
47345 const unsigned char *, unsigned int, int);
47346 int ncp__vol2io(unsigned char *, unsigned int *,
47347- const unsigned char *, unsigned int, int);
47348+ const unsigned char *, unsigned int, int) __size_overflow(5);
47349
47350 #define NCP_IO_TABLE(sb) NULL
47351 #define ncp_tolower(t, c) tolower(c)
47352diff --git a/fs/nfs/blocklayout/blocklayout.c b/fs/nfs/blocklayout/blocklayout.c
47353index 3db6b82..a57597e 100644
47354--- a/fs/nfs/blocklayout/blocklayout.c
47355+++ b/fs/nfs/blocklayout/blocklayout.c
47356@@ -90,7 +90,7 @@ static int is_writable(struct pnfs_block_extent *be, sector_t isect)
47357 */
47358 struct parallel_io {
47359 struct kref refcnt;
47360- struct rpc_call_ops call_ops;
47361+ rpc_call_ops_no_const call_ops;
47362 void (*pnfs_callback) (void *data);
47363 void *data;
47364 };
47365diff --git a/fs/nfs/inode.c b/fs/nfs/inode.c
47366index 50a15fa..ca113f9 100644
47367--- a/fs/nfs/inode.c
47368+++ b/fs/nfs/inode.c
47369@@ -150,7 +150,7 @@ static void nfs_zap_caches_locked(struct inode *inode)
47370 nfsi->attrtimeo = NFS_MINATTRTIMEO(inode);
47371 nfsi->attrtimeo_timestamp = jiffies;
47372
47373- memset(NFS_COOKIEVERF(inode), 0, sizeof(NFS_COOKIEVERF(inode)));
47374+ memset(NFS_COOKIEVERF(inode), 0, sizeof(NFS_I(inode)->cookieverf));
47375 if (S_ISREG(mode) || S_ISDIR(mode) || S_ISLNK(mode))
47376 nfsi->cache_validity |= NFS_INO_INVALID_ATTR|NFS_INO_INVALID_DATA|NFS_INO_INVALID_ACCESS|NFS_INO_INVALID_ACL|NFS_INO_REVAL_PAGECACHE;
47377 else
47378@@ -1002,16 +1002,16 @@ static int nfs_size_need_update(const struct inode *inode, const struct nfs_fatt
47379 return nfs_size_to_loff_t(fattr->size) > i_size_read(inode);
47380 }
47381
47382-static atomic_long_t nfs_attr_generation_counter;
47383+static atomic_long_unchecked_t nfs_attr_generation_counter;
47384
47385 static unsigned long nfs_read_attr_generation_counter(void)
47386 {
47387- return atomic_long_read(&nfs_attr_generation_counter);
47388+ return atomic_long_read_unchecked(&nfs_attr_generation_counter);
47389 }
47390
47391 unsigned long nfs_inc_attr_generation_counter(void)
47392 {
47393- return atomic_long_inc_return(&nfs_attr_generation_counter);
47394+ return atomic_long_inc_return_unchecked(&nfs_attr_generation_counter);
47395 }
47396
47397 void nfs_fattr_init(struct nfs_fattr *fattr)
47398diff --git a/fs/nfsd/vfs.c b/fs/nfsd/vfs.c
47399index 7a2e442..8e544cc 100644
47400--- a/fs/nfsd/vfs.c
47401+++ b/fs/nfsd/vfs.c
47402@@ -914,7 +914,7 @@ nfsd_vfs_read(struct svc_rqst *rqstp, struct svc_fh *fhp, struct file *file,
47403 } else {
47404 oldfs = get_fs();
47405 set_fs(KERNEL_DS);
47406- host_err = vfs_readv(file, (struct iovec __user *)vec, vlen, &offset);
47407+ host_err = vfs_readv(file, (struct iovec __force_user *)vec, vlen, &offset);
47408 set_fs(oldfs);
47409 }
47410
47411@@ -1018,7 +1018,7 @@ nfsd_vfs_write(struct svc_rqst *rqstp, struct svc_fh *fhp, struct file *file,
47412
47413 /* Write the data. */
47414 oldfs = get_fs(); set_fs(KERNEL_DS);
47415- host_err = vfs_writev(file, (struct iovec __user *)vec, vlen, &offset);
47416+ host_err = vfs_writev(file, (struct iovec __force_user *)vec, vlen, &offset);
47417 set_fs(oldfs);
47418 if (host_err < 0)
47419 goto out_nfserr;
47420@@ -1553,7 +1553,7 @@ nfsd_readlink(struct svc_rqst *rqstp, struct svc_fh *fhp, char *buf, int *lenp)
47421 */
47422
47423 oldfs = get_fs(); set_fs(KERNEL_DS);
47424- host_err = inode->i_op->readlink(dentry, buf, *lenp);
47425+ host_err = inode->i_op->readlink(dentry, (char __force_user *)buf, *lenp);
47426 set_fs(oldfs);
47427
47428 if (host_err < 0)
47429diff --git a/fs/nilfs2/the_nilfs.c b/fs/nilfs2/the_nilfs.c
47430index d327140..501b7f8 100644
47431--- a/fs/nilfs2/the_nilfs.c
47432+++ b/fs/nilfs2/the_nilfs.c
47433@@ -409,6 +409,12 @@ static int nilfs_store_disk_layout(struct the_nilfs *nilfs,
47434 nilfs->ns_first_data_block = le64_to_cpu(sbp->s_first_data_block);
47435 nilfs->ns_r_segments_percentage =
47436 le32_to_cpu(sbp->s_r_segments_percentage);
47437+ if (nilfs->ns_r_segments_percentage < 1 ||
47438+ nilfs->ns_r_segments_percentage > 99) {
47439+ printk(KERN_ERR "NILFS: invalid reserved segments percentage.\n");
47440+ return -EINVAL;
47441+ }
47442+
47443 nilfs_set_nsegments(nilfs, le64_to_cpu(sbp->s_nsegments));
47444 nilfs->ns_crc_seed = le32_to_cpu(sbp->s_crc_seed);
47445 return 0;
47446@@ -515,6 +521,7 @@ static int nilfs_load_super_block(struct the_nilfs *nilfs,
47447 brelse(sbh[1]);
47448 sbh[1] = NULL;
47449 sbp[1] = NULL;
47450+ valid[1] = 0;
47451 swp = 0;
47452 }
47453 if (!valid[swp]) {
47454diff --git a/fs/notify/fanotify/fanotify_user.c b/fs/notify/fanotify/fanotify_user.c
47455index 9fde1c0..14e8827 100644
47456--- a/fs/notify/fanotify/fanotify_user.c
47457+++ b/fs/notify/fanotify/fanotify_user.c
47458@@ -276,7 +276,8 @@ static ssize_t copy_event_to_user(struct fsnotify_group *group,
47459 goto out_close_fd;
47460
47461 ret = -EFAULT;
47462- if (copy_to_user(buf, &fanotify_event_metadata,
47463+ if (fanotify_event_metadata.event_len > sizeof fanotify_event_metadata ||
47464+ copy_to_user(buf, &fanotify_event_metadata,
47465 fanotify_event_metadata.event_len))
47466 goto out_kill_access_response;
47467
47468diff --git a/fs/notify/notification.c b/fs/notify/notification.c
47469index ee18815..7aa5d01 100644
47470--- a/fs/notify/notification.c
47471+++ b/fs/notify/notification.c
47472@@ -57,7 +57,7 @@ static struct kmem_cache *fsnotify_event_holder_cachep;
47473 * get set to 0 so it will never get 'freed'
47474 */
47475 static struct fsnotify_event *q_overflow_event;
47476-static atomic_t fsnotify_sync_cookie = ATOMIC_INIT(0);
47477+static atomic_unchecked_t fsnotify_sync_cookie = ATOMIC_INIT(0);
47478
47479 /**
47480 * fsnotify_get_cookie - return a unique cookie for use in synchronizing events.
47481@@ -65,7 +65,7 @@ static atomic_t fsnotify_sync_cookie = ATOMIC_INIT(0);
47482 */
47483 u32 fsnotify_get_cookie(void)
47484 {
47485- return atomic_inc_return(&fsnotify_sync_cookie);
47486+ return atomic_inc_return_unchecked(&fsnotify_sync_cookie);
47487 }
47488 EXPORT_SYMBOL_GPL(fsnotify_get_cookie);
47489
47490diff --git a/fs/ntfs/dir.c b/fs/ntfs/dir.c
47491index 99e3610..02c1068 100644
47492--- a/fs/ntfs/dir.c
47493+++ b/fs/ntfs/dir.c
47494@@ -1329,7 +1329,7 @@ find_next_index_buffer:
47495 ia = (INDEX_ALLOCATION*)(kaddr + (ia_pos & ~PAGE_CACHE_MASK &
47496 ~(s64)(ndir->itype.index.block_size - 1)));
47497 /* Bounds checks. */
47498- if (unlikely((u8*)ia < kaddr || (u8*)ia > kaddr + PAGE_CACHE_SIZE)) {
47499+ if (unlikely(!kaddr || (u8*)ia < kaddr || (u8*)ia > kaddr + PAGE_CACHE_SIZE)) {
47500 ntfs_error(sb, "Out of bounds check failed. Corrupt directory "
47501 "inode 0x%lx or driver bug.", vdir->i_ino);
47502 goto err_out;
47503diff --git a/fs/ntfs/file.c b/fs/ntfs/file.c
47504index c587e2d..3641eaa 100644
47505--- a/fs/ntfs/file.c
47506+++ b/fs/ntfs/file.c
47507@@ -2229,6 +2229,6 @@ const struct inode_operations ntfs_file_inode_ops = {
47508 #endif /* NTFS_RW */
47509 };
47510
47511-const struct file_operations ntfs_empty_file_ops = {};
47512+const struct file_operations ntfs_empty_file_ops __read_only;
47513
47514-const struct inode_operations ntfs_empty_inode_ops = {};
47515+const struct inode_operations ntfs_empty_inode_ops __read_only;
47516diff --git a/fs/ocfs2/localalloc.c b/fs/ocfs2/localalloc.c
47517index 210c352..a174f83 100644
47518--- a/fs/ocfs2/localalloc.c
47519+++ b/fs/ocfs2/localalloc.c
47520@@ -1283,7 +1283,7 @@ static int ocfs2_local_alloc_slide_window(struct ocfs2_super *osb,
47521 goto bail;
47522 }
47523
47524- atomic_inc(&osb->alloc_stats.moves);
47525+ atomic_inc_unchecked(&osb->alloc_stats.moves);
47526
47527 bail:
47528 if (handle)
47529diff --git a/fs/ocfs2/ocfs2.h b/fs/ocfs2/ocfs2.h
47530index d355e6e..578d905 100644
47531--- a/fs/ocfs2/ocfs2.h
47532+++ b/fs/ocfs2/ocfs2.h
47533@@ -235,11 +235,11 @@ enum ocfs2_vol_state
47534
47535 struct ocfs2_alloc_stats
47536 {
47537- atomic_t moves;
47538- atomic_t local_data;
47539- atomic_t bitmap_data;
47540- atomic_t bg_allocs;
47541- atomic_t bg_extends;
47542+ atomic_unchecked_t moves;
47543+ atomic_unchecked_t local_data;
47544+ atomic_unchecked_t bitmap_data;
47545+ atomic_unchecked_t bg_allocs;
47546+ atomic_unchecked_t bg_extends;
47547 };
47548
47549 enum ocfs2_local_alloc_state
47550diff --git a/fs/ocfs2/suballoc.c b/fs/ocfs2/suballoc.c
47551index ba5d97e..c77db25 100644
47552--- a/fs/ocfs2/suballoc.c
47553+++ b/fs/ocfs2/suballoc.c
47554@@ -872,7 +872,7 @@ static int ocfs2_reserve_suballoc_bits(struct ocfs2_super *osb,
47555 mlog_errno(status);
47556 goto bail;
47557 }
47558- atomic_inc(&osb->alloc_stats.bg_extends);
47559+ atomic_inc_unchecked(&osb->alloc_stats.bg_extends);
47560
47561 /* You should never ask for this much metadata */
47562 BUG_ON(bits_wanted >
47563@@ -2008,7 +2008,7 @@ int ocfs2_claim_metadata(handle_t *handle,
47564 mlog_errno(status);
47565 goto bail;
47566 }
47567- atomic_inc(&OCFS2_SB(ac->ac_inode->i_sb)->alloc_stats.bg_allocs);
47568+ atomic_inc_unchecked(&OCFS2_SB(ac->ac_inode->i_sb)->alloc_stats.bg_allocs);
47569
47570 *suballoc_loc = res.sr_bg_blkno;
47571 *suballoc_bit_start = res.sr_bit_offset;
47572@@ -2172,7 +2172,7 @@ int ocfs2_claim_new_inode_at_loc(handle_t *handle,
47573 trace_ocfs2_claim_new_inode_at_loc((unsigned long long)di_blkno,
47574 res->sr_bits);
47575
47576- atomic_inc(&OCFS2_SB(ac->ac_inode->i_sb)->alloc_stats.bg_allocs);
47577+ atomic_inc_unchecked(&OCFS2_SB(ac->ac_inode->i_sb)->alloc_stats.bg_allocs);
47578
47579 BUG_ON(res->sr_bits != 1);
47580
47581@@ -2214,7 +2214,7 @@ int ocfs2_claim_new_inode(handle_t *handle,
47582 mlog_errno(status);
47583 goto bail;
47584 }
47585- atomic_inc(&OCFS2_SB(ac->ac_inode->i_sb)->alloc_stats.bg_allocs);
47586+ atomic_inc_unchecked(&OCFS2_SB(ac->ac_inode->i_sb)->alloc_stats.bg_allocs);
47587
47588 BUG_ON(res.sr_bits != 1);
47589
47590@@ -2318,7 +2318,7 @@ int __ocfs2_claim_clusters(handle_t *handle,
47591 cluster_start,
47592 num_clusters);
47593 if (!status)
47594- atomic_inc(&osb->alloc_stats.local_data);
47595+ atomic_inc_unchecked(&osb->alloc_stats.local_data);
47596 } else {
47597 if (min_clusters > (osb->bitmap_cpg - 1)) {
47598 /* The only paths asking for contiguousness
47599@@ -2344,7 +2344,7 @@ int __ocfs2_claim_clusters(handle_t *handle,
47600 ocfs2_desc_bitmap_to_cluster_off(ac->ac_inode,
47601 res.sr_bg_blkno,
47602 res.sr_bit_offset);
47603- atomic_inc(&osb->alloc_stats.bitmap_data);
47604+ atomic_inc_unchecked(&osb->alloc_stats.bitmap_data);
47605 *num_clusters = res.sr_bits;
47606 }
47607 }
47608diff --git a/fs/ocfs2/super.c b/fs/ocfs2/super.c
47609index 4994f8b..eaab8eb 100644
47610--- a/fs/ocfs2/super.c
47611+++ b/fs/ocfs2/super.c
47612@@ -301,11 +301,11 @@ static int ocfs2_osb_dump(struct ocfs2_super *osb, char *buf, int len)
47613 "%10s => GlobalAllocs: %d LocalAllocs: %d "
47614 "SubAllocs: %d LAWinMoves: %d SAExtends: %d\n",
47615 "Stats",
47616- atomic_read(&osb->alloc_stats.bitmap_data),
47617- atomic_read(&osb->alloc_stats.local_data),
47618- atomic_read(&osb->alloc_stats.bg_allocs),
47619- atomic_read(&osb->alloc_stats.moves),
47620- atomic_read(&osb->alloc_stats.bg_extends));
47621+ atomic_read_unchecked(&osb->alloc_stats.bitmap_data),
47622+ atomic_read_unchecked(&osb->alloc_stats.local_data),
47623+ atomic_read_unchecked(&osb->alloc_stats.bg_allocs),
47624+ atomic_read_unchecked(&osb->alloc_stats.moves),
47625+ atomic_read_unchecked(&osb->alloc_stats.bg_extends));
47626
47627 out += snprintf(buf + out, len - out,
47628 "%10s => State: %u Descriptor: %llu Size: %u bits "
47629@@ -2119,11 +2119,11 @@ static int ocfs2_initialize_super(struct super_block *sb,
47630 spin_lock_init(&osb->osb_xattr_lock);
47631 ocfs2_init_steal_slots(osb);
47632
47633- atomic_set(&osb->alloc_stats.moves, 0);
47634- atomic_set(&osb->alloc_stats.local_data, 0);
47635- atomic_set(&osb->alloc_stats.bitmap_data, 0);
47636- atomic_set(&osb->alloc_stats.bg_allocs, 0);
47637- atomic_set(&osb->alloc_stats.bg_extends, 0);
47638+ atomic_set_unchecked(&osb->alloc_stats.moves, 0);
47639+ atomic_set_unchecked(&osb->alloc_stats.local_data, 0);
47640+ atomic_set_unchecked(&osb->alloc_stats.bitmap_data, 0);
47641+ atomic_set_unchecked(&osb->alloc_stats.bg_allocs, 0);
47642+ atomic_set_unchecked(&osb->alloc_stats.bg_extends, 0);
47643
47644 /* Copy the blockcheck stats from the superblock probe */
47645 osb->osb_ecc_stats = *stats;
47646diff --git a/fs/ocfs2/symlink.c b/fs/ocfs2/symlink.c
47647index 5d22872..523db20 100644
47648--- a/fs/ocfs2/symlink.c
47649+++ b/fs/ocfs2/symlink.c
47650@@ -142,7 +142,7 @@ bail:
47651
47652 static void ocfs2_fast_put_link(struct dentry *dentry, struct nameidata *nd, void *cookie)
47653 {
47654- char *link = nd_get_link(nd);
47655+ const char *link = nd_get_link(nd);
47656 if (!IS_ERR(link))
47657 kfree(link);
47658 }
47659diff --git a/fs/open.c b/fs/open.c
47660index 22c41b5..78894cf 100644
47661--- a/fs/open.c
47662+++ b/fs/open.c
47663@@ -112,6 +112,10 @@ static long do_sys_truncate(const char __user *pathname, loff_t length)
47664 error = locks_verify_truncate(inode, NULL, length);
47665 if (!error)
47666 error = security_path_truncate(&path);
47667+
47668+ if (!error && !gr_acl_handle_truncate(path.dentry, path.mnt))
47669+ error = -EACCES;
47670+
47671 if (!error)
47672 error = do_truncate(path.dentry, length, 0, NULL);
47673
47674@@ -358,6 +362,9 @@ SYSCALL_DEFINE3(faccessat, int, dfd, const char __user *, filename, int, mode)
47675 if (__mnt_is_readonly(path.mnt))
47676 res = -EROFS;
47677
47678+ if (!res && !gr_acl_handle_access(path.dentry, path.mnt, mode))
47679+ res = -EACCES;
47680+
47681 out_path_release:
47682 path_put(&path);
47683 out:
47684@@ -384,6 +391,8 @@ SYSCALL_DEFINE1(chdir, const char __user *, filename)
47685 if (error)
47686 goto dput_and_out;
47687
47688+ gr_log_chdir(path.dentry, path.mnt);
47689+
47690 set_fs_pwd(current->fs, &path);
47691
47692 dput_and_out:
47693@@ -410,6 +419,13 @@ SYSCALL_DEFINE1(fchdir, unsigned int, fd)
47694 goto out_putf;
47695
47696 error = inode_permission(inode, MAY_EXEC | MAY_CHDIR);
47697+
47698+ if (!error && !gr_chroot_fchdir(file->f_path.dentry, file->f_path.mnt))
47699+ error = -EPERM;
47700+
47701+ if (!error)
47702+ gr_log_chdir(file->f_path.dentry, file->f_path.mnt);
47703+
47704 if (!error)
47705 set_fs_pwd(current->fs, &file->f_path);
47706 out_putf:
47707@@ -438,7 +454,13 @@ SYSCALL_DEFINE1(chroot, const char __user *, filename)
47708 if (error)
47709 goto dput_and_out;
47710
47711+ if (gr_handle_chroot_chroot(path.dentry, path.mnt))
47712+ goto dput_and_out;
47713+
47714 set_fs_root(current->fs, &path);
47715+
47716+ gr_handle_chroot_chdir(&path);
47717+
47718 error = 0;
47719 dput_and_out:
47720 path_put(&path);
47721@@ -456,6 +478,16 @@ static int chmod_common(struct path *path, umode_t mode)
47722 if (error)
47723 return error;
47724 mutex_lock(&inode->i_mutex);
47725+
47726+ if (!gr_acl_handle_chmod(path->dentry, path->mnt, &mode)) {
47727+ error = -EACCES;
47728+ goto out_unlock;
47729+ }
47730+ if (gr_handle_chroot_chmod(path->dentry, path->mnt, mode)) {
47731+ error = -EACCES;
47732+ goto out_unlock;
47733+ }
47734+
47735 error = security_path_chmod(path->dentry, path->mnt, mode);
47736 if (error)
47737 goto out_unlock;
47738@@ -506,6 +538,9 @@ static int chown_common(struct path *path, uid_t user, gid_t group)
47739 int error;
47740 struct iattr newattrs;
47741
47742+ if (!gr_acl_handle_chown(path->dentry, path->mnt))
47743+ return -EACCES;
47744+
47745 newattrs.ia_valid = ATTR_CTIME;
47746 if (user != (uid_t) -1) {
47747 newattrs.ia_valid |= ATTR_UID;
47748diff --git a/fs/partitions/efi.c b/fs/partitions/efi.c
47749index 6296b40..417c00f 100644
47750--- a/fs/partitions/efi.c
47751+++ b/fs/partitions/efi.c
47752@@ -234,14 +234,14 @@ static gpt_entry *alloc_read_gpt_entries(struct parsed_partitions *state,
47753 if (!gpt)
47754 return NULL;
47755
47756+ if (!le32_to_cpu(gpt->num_partition_entries))
47757+ return NULL;
47758+ pte = kcalloc(le32_to_cpu(gpt->num_partition_entries), le32_to_cpu(gpt->sizeof_partition_entry), GFP_KERNEL);
47759+ if (!pte)
47760+ return NULL;
47761+
47762 count = le32_to_cpu(gpt->num_partition_entries) *
47763 le32_to_cpu(gpt->sizeof_partition_entry);
47764- if (!count)
47765- return NULL;
47766- pte = kzalloc(count, GFP_KERNEL);
47767- if (!pte)
47768- return NULL;
47769-
47770 if (read_lba(state, le64_to_cpu(gpt->partition_entry_lba),
47771 (u8 *) pte,
47772 count) < count) {
47773diff --git a/fs/partitions/ldm.c b/fs/partitions/ldm.c
47774index bd8ae78..539d250 100644
47775--- a/fs/partitions/ldm.c
47776+++ b/fs/partitions/ldm.c
47777@@ -1324,7 +1324,7 @@ static bool ldm_frag_add (const u8 *data, int size, struct list_head *frags)
47778 goto found;
47779 }
47780
47781- f = kmalloc (sizeof (*f) + size*num, GFP_KERNEL);
47782+ f = kmalloc (size*num + sizeof (*f), GFP_KERNEL);
47783 if (!f) {
47784 ldm_crit ("Out of memory.");
47785 return false;
47786diff --git a/fs/pipe.c b/fs/pipe.c
47787index 4065f07..68c0706 100644
47788--- a/fs/pipe.c
47789+++ b/fs/pipe.c
47790@@ -420,9 +420,9 @@ redo:
47791 }
47792 if (bufs) /* More to do? */
47793 continue;
47794- if (!pipe->writers)
47795+ if (!atomic_read(&pipe->writers))
47796 break;
47797- if (!pipe->waiting_writers) {
47798+ if (!atomic_read(&pipe->waiting_writers)) {
47799 /* syscall merging: Usually we must not sleep
47800 * if O_NONBLOCK is set, or if we got some data.
47801 * But if a writer sleeps in kernel space, then
47802@@ -481,7 +481,7 @@ pipe_write(struct kiocb *iocb, const struct iovec *_iov,
47803 mutex_lock(&inode->i_mutex);
47804 pipe = inode->i_pipe;
47805
47806- if (!pipe->readers) {
47807+ if (!atomic_read(&pipe->readers)) {
47808 send_sig(SIGPIPE, current, 0);
47809 ret = -EPIPE;
47810 goto out;
47811@@ -530,7 +530,7 @@ redo1:
47812 for (;;) {
47813 int bufs;
47814
47815- if (!pipe->readers) {
47816+ if (!atomic_read(&pipe->readers)) {
47817 send_sig(SIGPIPE, current, 0);
47818 if (!ret)
47819 ret = -EPIPE;
47820@@ -616,9 +616,9 @@ redo2:
47821 kill_fasync(&pipe->fasync_readers, SIGIO, POLL_IN);
47822 do_wakeup = 0;
47823 }
47824- pipe->waiting_writers++;
47825+ atomic_inc(&pipe->waiting_writers);
47826 pipe_wait(pipe);
47827- pipe->waiting_writers--;
47828+ atomic_dec(&pipe->waiting_writers);
47829 }
47830 out:
47831 mutex_unlock(&inode->i_mutex);
47832@@ -685,7 +685,7 @@ pipe_poll(struct file *filp, poll_table *wait)
47833 mask = 0;
47834 if (filp->f_mode & FMODE_READ) {
47835 mask = (nrbufs > 0) ? POLLIN | POLLRDNORM : 0;
47836- if (!pipe->writers && filp->f_version != pipe->w_counter)
47837+ if (!atomic_read(&pipe->writers) && filp->f_version != pipe->w_counter)
47838 mask |= POLLHUP;
47839 }
47840
47841@@ -695,7 +695,7 @@ pipe_poll(struct file *filp, poll_table *wait)
47842 * Most Unices do not set POLLERR for FIFOs but on Linux they
47843 * behave exactly like pipes for poll().
47844 */
47845- if (!pipe->readers)
47846+ if (!atomic_read(&pipe->readers))
47847 mask |= POLLERR;
47848 }
47849
47850@@ -709,10 +709,10 @@ pipe_release(struct inode *inode, int decr, int decw)
47851
47852 mutex_lock(&inode->i_mutex);
47853 pipe = inode->i_pipe;
47854- pipe->readers -= decr;
47855- pipe->writers -= decw;
47856+ atomic_sub(decr, &pipe->readers);
47857+ atomic_sub(decw, &pipe->writers);
47858
47859- if (!pipe->readers && !pipe->writers) {
47860+ if (!atomic_read(&pipe->readers) && !atomic_read(&pipe->writers)) {
47861 free_pipe_info(inode);
47862 } else {
47863 wake_up_interruptible_sync_poll(&pipe->wait, POLLIN | POLLOUT | POLLRDNORM | POLLWRNORM | POLLERR | POLLHUP);
47864@@ -802,7 +802,7 @@ pipe_read_open(struct inode *inode, struct file *filp)
47865
47866 if (inode->i_pipe) {
47867 ret = 0;
47868- inode->i_pipe->readers++;
47869+ atomic_inc(&inode->i_pipe->readers);
47870 }
47871
47872 mutex_unlock(&inode->i_mutex);
47873@@ -819,7 +819,7 @@ pipe_write_open(struct inode *inode, struct file *filp)
47874
47875 if (inode->i_pipe) {
47876 ret = 0;
47877- inode->i_pipe->writers++;
47878+ atomic_inc(&inode->i_pipe->writers);
47879 }
47880
47881 mutex_unlock(&inode->i_mutex);
47882@@ -837,9 +837,9 @@ pipe_rdwr_open(struct inode *inode, struct file *filp)
47883 if (inode->i_pipe) {
47884 ret = 0;
47885 if (filp->f_mode & FMODE_READ)
47886- inode->i_pipe->readers++;
47887+ atomic_inc(&inode->i_pipe->readers);
47888 if (filp->f_mode & FMODE_WRITE)
47889- inode->i_pipe->writers++;
47890+ atomic_inc(&inode->i_pipe->writers);
47891 }
47892
47893 mutex_unlock(&inode->i_mutex);
47894@@ -931,7 +931,7 @@ void free_pipe_info(struct inode *inode)
47895 inode->i_pipe = NULL;
47896 }
47897
47898-static struct vfsmount *pipe_mnt __read_mostly;
47899+struct vfsmount *pipe_mnt __read_mostly;
47900
47901 /*
47902 * pipefs_dname() is called from d_path().
47903@@ -961,7 +961,8 @@ static struct inode * get_pipe_inode(void)
47904 goto fail_iput;
47905 inode->i_pipe = pipe;
47906
47907- pipe->readers = pipe->writers = 1;
47908+ atomic_set(&pipe->readers, 1);
47909+ atomic_set(&pipe->writers, 1);
47910 inode->i_fop = &rdwr_pipefifo_fops;
47911
47912 /*
47913diff --git a/fs/proc/Kconfig b/fs/proc/Kconfig
47914index 15af622..0e9f4467 100644
47915--- a/fs/proc/Kconfig
47916+++ b/fs/proc/Kconfig
47917@@ -30,12 +30,12 @@ config PROC_FS
47918
47919 config PROC_KCORE
47920 bool "/proc/kcore support" if !ARM
47921- depends on PROC_FS && MMU
47922+ depends on PROC_FS && MMU && !GRKERNSEC_PROC_ADD
47923
47924 config PROC_VMCORE
47925 bool "/proc/vmcore support"
47926- depends on PROC_FS && CRASH_DUMP
47927- default y
47928+ depends on PROC_FS && CRASH_DUMP && !GRKERNSEC
47929+ default n
47930 help
47931 Exports the dump image of crashed kernel in ELF format.
47932
47933@@ -59,8 +59,8 @@ config PROC_SYSCTL
47934 limited in memory.
47935
47936 config PROC_PAGE_MONITOR
47937- default y
47938- depends on PROC_FS && MMU
47939+ default n
47940+ depends on PROC_FS && MMU && !GRKERNSEC
47941 bool "Enable /proc page monitoring" if EXPERT
47942 help
47943 Various /proc files exist to monitor process memory utilization:
47944diff --git a/fs/proc/array.c b/fs/proc/array.c
47945index 3a1dafd..bf1bd84 100644
47946--- a/fs/proc/array.c
47947+++ b/fs/proc/array.c
47948@@ -60,6 +60,7 @@
47949 #include <linux/tty.h>
47950 #include <linux/string.h>
47951 #include <linux/mman.h>
47952+#include <linux/grsecurity.h>
47953 #include <linux/proc_fs.h>
47954 #include <linux/ioport.h>
47955 #include <linux/uaccess.h>
47956@@ -337,6 +338,21 @@ static void task_cpus_allowed(struct seq_file *m, struct task_struct *task)
47957 seq_putc(m, '\n');
47958 }
47959
47960+#if defined(CONFIG_PAX_NOEXEC) || defined(CONFIG_PAX_ASLR)
47961+static inline void task_pax(struct seq_file *m, struct task_struct *p)
47962+{
47963+ if (p->mm)
47964+ seq_printf(m, "PaX:\t%c%c%c%c%c\n",
47965+ p->mm->pax_flags & MF_PAX_PAGEEXEC ? 'P' : 'p',
47966+ p->mm->pax_flags & MF_PAX_EMUTRAMP ? 'E' : 'e',
47967+ p->mm->pax_flags & MF_PAX_MPROTECT ? 'M' : 'm',
47968+ p->mm->pax_flags & MF_PAX_RANDMMAP ? 'R' : 'r',
47969+ p->mm->pax_flags & MF_PAX_SEGMEXEC ? 'S' : 's');
47970+ else
47971+ seq_printf(m, "PaX:\t-----\n");
47972+}
47973+#endif
47974+
47975 int proc_pid_status(struct seq_file *m, struct pid_namespace *ns,
47976 struct pid *pid, struct task_struct *task)
47977 {
47978@@ -354,9 +370,24 @@ int proc_pid_status(struct seq_file *m, struct pid_namespace *ns,
47979 task_cpus_allowed(m, task);
47980 cpuset_task_status_allowed(m, task);
47981 task_context_switch_counts(m, task);
47982+
47983+#if defined(CONFIG_PAX_NOEXEC) || defined(CONFIG_PAX_ASLR)
47984+ task_pax(m, task);
47985+#endif
47986+
47987+#if defined(CONFIG_GRKERNSEC) && !defined(CONFIG_GRKERNSEC_NO_RBAC)
47988+ task_grsec_rbac(m, task);
47989+#endif
47990+
47991 return 0;
47992 }
47993
47994+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
47995+#define PAX_RAND_FLAGS(_mm) (_mm != NULL && _mm != current->mm && \
47996+ (_mm->pax_flags & MF_PAX_RANDMMAP || \
47997+ _mm->pax_flags & MF_PAX_SEGMEXEC))
47998+#endif
47999+
48000 static int do_task_stat(struct seq_file *m, struct pid_namespace *ns,
48001 struct pid *pid, struct task_struct *task, int whole)
48002 {
48003@@ -378,6 +409,13 @@ static int do_task_stat(struct seq_file *m, struct pid_namespace *ns,
48004 char tcomm[sizeof(task->comm)];
48005 unsigned long flags;
48006
48007+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
48008+ if (current->exec_id != m->exec_id) {
48009+ gr_log_badprocpid("stat");
48010+ return 0;
48011+ }
48012+#endif
48013+
48014 state = *get_task_state(task);
48015 vsize = eip = esp = 0;
48016 permitted = ptrace_may_access(task, PTRACE_MODE_READ);
48017@@ -449,6 +487,19 @@ static int do_task_stat(struct seq_file *m, struct pid_namespace *ns,
48018 gtime = task->gtime;
48019 }
48020
48021+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
48022+ if (PAX_RAND_FLAGS(mm)) {
48023+ eip = 0;
48024+ esp = 0;
48025+ wchan = 0;
48026+ }
48027+#endif
48028+#ifdef CONFIG_GRKERNSEC_HIDESYM
48029+ wchan = 0;
48030+ eip =0;
48031+ esp =0;
48032+#endif
48033+
48034 /* scale priority and nice values from timeslices to -20..20 */
48035 /* to make it look like a "normal" Unix priority/nice value */
48036 priority = task_prio(task);
48037@@ -489,9 +540,15 @@ static int do_task_stat(struct seq_file *m, struct pid_namespace *ns,
48038 vsize,
48039 mm ? get_mm_rss(mm) : 0,
48040 rsslim,
48041+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
48042+ PAX_RAND_FLAGS(mm) ? 1 : (mm ? (permitted ? mm->start_code : 1) : 0),
48043+ PAX_RAND_FLAGS(mm) ? 1 : (mm ? (permitted ? mm->end_code : 1) : 0),
48044+ PAX_RAND_FLAGS(mm) ? 0 : ((permitted && mm) ? mm->start_stack : 0),
48045+#else
48046 mm ? (permitted ? mm->start_code : 1) : 0,
48047 mm ? (permitted ? mm->end_code : 1) : 0,
48048 (permitted && mm) ? mm->start_stack : 0,
48049+#endif
48050 esp,
48051 eip,
48052 /* The signal information here is obsolete.
48053@@ -533,8 +590,15 @@ int proc_pid_statm(struct seq_file *m, struct pid_namespace *ns,
48054 struct pid *pid, struct task_struct *task)
48055 {
48056 unsigned long size = 0, resident = 0, shared = 0, text = 0, data = 0;
48057- struct mm_struct *mm = get_task_mm(task);
48058+ struct mm_struct *mm;
48059
48060+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
48061+ if (current->exec_id != m->exec_id) {
48062+ gr_log_badprocpid("statm");
48063+ return 0;
48064+ }
48065+#endif
48066+ mm = get_task_mm(task);
48067 if (mm) {
48068 size = task_statm(mm, &shared, &text, &data, &resident);
48069 mmput(mm);
48070@@ -544,3 +608,18 @@ int proc_pid_statm(struct seq_file *m, struct pid_namespace *ns,
48071
48072 return 0;
48073 }
48074+
48075+#ifdef CONFIG_GRKERNSEC_PROC_IPADDR
48076+int proc_pid_ipaddr(struct task_struct *task, char *buffer)
48077+{
48078+ u32 curr_ip = 0;
48079+ unsigned long flags;
48080+
48081+ if (lock_task_sighand(task, &flags)) {
48082+ curr_ip = task->signal->curr_ip;
48083+ unlock_task_sighand(task, &flags);
48084+ }
48085+
48086+ return sprintf(buffer, "%pI4\n", &curr_ip);
48087+}
48088+#endif
48089diff --git a/fs/proc/base.c b/fs/proc/base.c
48090index 1ace83d..f5e575d 100644
48091--- a/fs/proc/base.c
48092+++ b/fs/proc/base.c
48093@@ -107,6 +107,22 @@ struct pid_entry {
48094 union proc_op op;
48095 };
48096
48097+struct getdents_callback {
48098+ struct linux_dirent __user * current_dir;
48099+ struct linux_dirent __user * previous;
48100+ struct file * file;
48101+ int count;
48102+ int error;
48103+};
48104+
48105+static int gr_fake_filldir(void * __buf, const char *name, int namlen,
48106+ loff_t offset, u64 ino, unsigned int d_type)
48107+{
48108+ struct getdents_callback * buf = (struct getdents_callback *) __buf;
48109+ buf->error = -EINVAL;
48110+ return 0;
48111+}
48112+
48113 #define NOD(NAME, MODE, IOP, FOP, OP) { \
48114 .name = (NAME), \
48115 .len = sizeof(NAME) - 1, \
48116@@ -194,26 +210,6 @@ static int proc_root_link(struct inode *inode, struct path *path)
48117 return result;
48118 }
48119
48120-static struct mm_struct *mm_access(struct task_struct *task, unsigned int mode)
48121-{
48122- struct mm_struct *mm;
48123- int err;
48124-
48125- err = mutex_lock_killable(&task->signal->cred_guard_mutex);
48126- if (err)
48127- return ERR_PTR(err);
48128-
48129- mm = get_task_mm(task);
48130- if (mm && mm != current->mm &&
48131- !ptrace_may_access(task, mode)) {
48132- mmput(mm);
48133- mm = ERR_PTR(-EACCES);
48134- }
48135- mutex_unlock(&task->signal->cred_guard_mutex);
48136-
48137- return mm;
48138-}
48139-
48140 struct mm_struct *mm_for_maps(struct task_struct *task)
48141 {
48142 return mm_access(task, PTRACE_MODE_READ);
48143@@ -229,6 +225,9 @@ static int proc_pid_cmdline(struct task_struct *task, char * buffer)
48144 if (!mm->arg_end)
48145 goto out_mm; /* Shh! No looking before we're done */
48146
48147+ if (gr_acl_handle_procpidmem(task))
48148+ goto out_mm;
48149+
48150 len = mm->arg_end - mm->arg_start;
48151
48152 if (len > PAGE_SIZE)
48153@@ -256,12 +255,28 @@ out:
48154 return res;
48155 }
48156
48157+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
48158+#define PAX_RAND_FLAGS(_mm) (_mm != NULL && _mm != current->mm && \
48159+ (_mm->pax_flags & MF_PAX_RANDMMAP || \
48160+ _mm->pax_flags & MF_PAX_SEGMEXEC))
48161+#endif
48162+
48163 static int proc_pid_auxv(struct task_struct *task, char *buffer)
48164 {
48165 struct mm_struct *mm = mm_for_maps(task);
48166 int res = PTR_ERR(mm);
48167 if (mm && !IS_ERR(mm)) {
48168 unsigned int nwords = 0;
48169+
48170+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
48171+ /* allow if we're currently ptracing this task */
48172+ if (PAX_RAND_FLAGS(mm) &&
48173+ (!(task->ptrace & PT_PTRACED) || (task->parent != current))) {
48174+ mmput(mm);
48175+ return 0;
48176+ }
48177+#endif
48178+
48179 do {
48180 nwords += 2;
48181 } while (mm->saved_auxv[nwords - 2] != 0); /* AT_NULL */
48182@@ -275,7 +290,7 @@ static int proc_pid_auxv(struct task_struct *task, char *buffer)
48183 }
48184
48185
48186-#ifdef CONFIG_KALLSYMS
48187+#if defined(CONFIG_KALLSYMS) && !defined(CONFIG_GRKERNSEC_HIDESYM)
48188 /*
48189 * Provides a wchan file via kallsyms in a proper one-value-per-file format.
48190 * Returns the resolved symbol. If that fails, simply return the address.
48191@@ -314,7 +329,7 @@ static void unlock_trace(struct task_struct *task)
48192 mutex_unlock(&task->signal->cred_guard_mutex);
48193 }
48194
48195-#ifdef CONFIG_STACKTRACE
48196+#if defined(CONFIG_STACKTRACE) && !defined(CONFIG_GRKERNSEC_HIDESYM)
48197
48198 #define MAX_STACK_TRACE_DEPTH 64
48199
48200@@ -505,7 +520,7 @@ static int proc_pid_limits(struct task_struct *task, char *buffer)
48201 return count;
48202 }
48203
48204-#ifdef CONFIG_HAVE_ARCH_TRACEHOOK
48205+#if defined(CONFIG_HAVE_ARCH_TRACEHOOK) && !defined(CONFIG_GRKERNSEC_PROC_MEMMAP)
48206 static int proc_pid_syscall(struct task_struct *task, char *buffer)
48207 {
48208 long nr;
48209@@ -534,7 +549,7 @@ static int proc_pid_syscall(struct task_struct *task, char *buffer)
48210 /************************************************************************/
48211
48212 /* permission checks */
48213-static int proc_fd_access_allowed(struct inode *inode)
48214+static int proc_fd_access_allowed(struct inode *inode, unsigned int log)
48215 {
48216 struct task_struct *task;
48217 int allowed = 0;
48218@@ -544,7 +559,10 @@ static int proc_fd_access_allowed(struct inode *inode)
48219 */
48220 task = get_proc_task(inode);
48221 if (task) {
48222- allowed = ptrace_may_access(task, PTRACE_MODE_READ);
48223+ if (log)
48224+ allowed = ptrace_may_access_log(task, PTRACE_MODE_READ);
48225+ else
48226+ allowed = ptrace_may_access(task, PTRACE_MODE_READ);
48227 put_task_struct(task);
48228 }
48229 return allowed;
48230@@ -786,6 +804,10 @@ static int mem_open(struct inode* inode, struct file* file)
48231 file->f_mode |= FMODE_UNSIGNED_OFFSET;
48232 file->private_data = mm;
48233
48234+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
48235+ file->f_version = current->exec_id;
48236+#endif
48237+
48238 return 0;
48239 }
48240
48241@@ -797,6 +819,17 @@ static ssize_t mem_rw(struct file *file, char __user *buf,
48242 ssize_t copied;
48243 char *page;
48244
48245+#ifdef CONFIG_GRKERNSEC
48246+ if (write)
48247+ return -EPERM;
48248+#endif
48249+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
48250+ if (file->f_version != current->exec_id) {
48251+ gr_log_badprocpid("mem");
48252+ return 0;
48253+ }
48254+#endif
48255+
48256 if (!mm)
48257 return 0;
48258
48259@@ -897,6 +930,9 @@ static ssize_t environ_read(struct file *file, char __user *buf,
48260 if (!task)
48261 goto out_no_task;
48262
48263+ if (gr_acl_handle_procpidmem(task))
48264+ goto out;
48265+
48266 ret = -ENOMEM;
48267 page = (char *)__get_free_page(GFP_TEMPORARY);
48268 if (!page)
48269@@ -1519,7 +1555,7 @@ static void *proc_pid_follow_link(struct dentry *dentry, struct nameidata *nd)
48270 path_put(&nd->path);
48271
48272 /* Are we allowed to snoop on the tasks file descriptors? */
48273- if (!proc_fd_access_allowed(inode))
48274+ if (!proc_fd_access_allowed(inode,0))
48275 goto out;
48276
48277 error = PROC_I(inode)->op.proc_get_link(inode, &nd->path);
48278@@ -1558,8 +1594,18 @@ static int proc_pid_readlink(struct dentry * dentry, char __user * buffer, int b
48279 struct path path;
48280
48281 /* Are we allowed to snoop on the tasks file descriptors? */
48282- if (!proc_fd_access_allowed(inode))
48283- goto out;
48284+ /* logging this is needed for learning on chromium to work properly,
48285+ but we don't want to flood the logs from 'ps' which does a readlink
48286+ on /proc/fd/2 of tasks in the listing, nor do we want 'ps' to learn
48287+ CAP_SYS_PTRACE as it's not necessary for its basic functionality
48288+ */
48289+ if (dentry->d_name.name[0] == '2' && dentry->d_name.name[1] == '\0') {
48290+ if (!proc_fd_access_allowed(inode,0))
48291+ goto out;
48292+ } else {
48293+ if (!proc_fd_access_allowed(inode,1))
48294+ goto out;
48295+ }
48296
48297 error = PROC_I(inode)->op.proc_get_link(inode, &path);
48298 if (error)
48299@@ -1624,7 +1670,11 @@ struct inode *proc_pid_make_inode(struct super_block * sb, struct task_struct *t
48300 rcu_read_lock();
48301 cred = __task_cred(task);
48302 inode->i_uid = cred->euid;
48303+#ifdef CONFIG_GRKERNSEC_PROC_USERGROUP
48304+ inode->i_gid = CONFIG_GRKERNSEC_PROC_GID;
48305+#else
48306 inode->i_gid = cred->egid;
48307+#endif
48308 rcu_read_unlock();
48309 }
48310 security_task_to_inode(task, inode);
48311@@ -1642,6 +1692,9 @@ int pid_getattr(struct vfsmount *mnt, struct dentry *dentry, struct kstat *stat)
48312 struct inode *inode = dentry->d_inode;
48313 struct task_struct *task;
48314 const struct cred *cred;
48315+#if defined(CONFIG_GRKERNSEC_PROC_USER) || defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
48316+ const struct cred *tmpcred = current_cred();
48317+#endif
48318
48319 generic_fillattr(inode, stat);
48320
48321@@ -1649,13 +1702,41 @@ int pid_getattr(struct vfsmount *mnt, struct dentry *dentry, struct kstat *stat)
48322 stat->uid = 0;
48323 stat->gid = 0;
48324 task = pid_task(proc_pid(inode), PIDTYPE_PID);
48325+
48326+ if (task && (gr_pid_is_chrooted(task) || gr_check_hidden_task(task))) {
48327+ rcu_read_unlock();
48328+ return -ENOENT;
48329+ }
48330+
48331 if (task) {
48332+ cred = __task_cred(task);
48333+#if defined(CONFIG_GRKERNSEC_PROC_USER) || defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
48334+ if (!tmpcred->uid || (tmpcred->uid == cred->uid)
48335+#ifdef CONFIG_GRKERNSEC_PROC_USERGROUP
48336+ || in_group_p(CONFIG_GRKERNSEC_PROC_GID)
48337+#endif
48338+ ) {
48339+#endif
48340 if ((inode->i_mode == (S_IFDIR|S_IRUGO|S_IXUGO)) ||
48341+#ifdef CONFIG_GRKERNSEC_PROC_USER
48342+ (inode->i_mode == (S_IFDIR|S_IRUSR|S_IXUSR)) ||
48343+#elif defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
48344+ (inode->i_mode == (S_IFDIR|S_IRUSR|S_IRGRP|S_IXUSR|S_IXGRP)) ||
48345+#endif
48346 task_dumpable(task)) {
48347- cred = __task_cred(task);
48348 stat->uid = cred->euid;
48349+#ifdef CONFIG_GRKERNSEC_PROC_USERGROUP
48350+ stat->gid = CONFIG_GRKERNSEC_PROC_GID;
48351+#else
48352 stat->gid = cred->egid;
48353+#endif
48354 }
48355+#if defined(CONFIG_GRKERNSEC_PROC_USER) || defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
48356+ } else {
48357+ rcu_read_unlock();
48358+ return -ENOENT;
48359+ }
48360+#endif
48361 }
48362 rcu_read_unlock();
48363 return 0;
48364@@ -1692,11 +1773,20 @@ int pid_revalidate(struct dentry *dentry, struct nameidata *nd)
48365
48366 if (task) {
48367 if ((inode->i_mode == (S_IFDIR|S_IRUGO|S_IXUGO)) ||
48368+#ifdef CONFIG_GRKERNSEC_PROC_USER
48369+ (inode->i_mode == (S_IFDIR|S_IRUSR|S_IXUSR)) ||
48370+#elif defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
48371+ (inode->i_mode == (S_IFDIR|S_IRUSR|S_IRGRP|S_IXUSR|S_IXGRP)) ||
48372+#endif
48373 task_dumpable(task)) {
48374 rcu_read_lock();
48375 cred = __task_cred(task);
48376 inode->i_uid = cred->euid;
48377+#ifdef CONFIG_GRKERNSEC_PROC_USERGROUP
48378+ inode->i_gid = CONFIG_GRKERNSEC_PROC_GID;
48379+#else
48380 inode->i_gid = cred->egid;
48381+#endif
48382 rcu_read_unlock();
48383 } else {
48384 inode->i_uid = 0;
48385@@ -1814,7 +1904,8 @@ static int proc_fd_info(struct inode *inode, struct path *path, char *info)
48386 int fd = proc_fd(inode);
48387
48388 if (task) {
48389- files = get_files_struct(task);
48390+ if (!gr_acl_handle_procpidmem(task))
48391+ files = get_files_struct(task);
48392 put_task_struct(task);
48393 }
48394 if (files) {
48395@@ -2082,11 +2173,21 @@ static const struct file_operations proc_fd_operations = {
48396 */
48397 static int proc_fd_permission(struct inode *inode, int mask)
48398 {
48399+ struct task_struct *task;
48400 int rv = generic_permission(inode, mask);
48401- if (rv == 0)
48402- return 0;
48403+
48404 if (task_pid(current) == proc_pid(inode))
48405 rv = 0;
48406+
48407+ task = get_proc_task(inode);
48408+ if (task == NULL)
48409+ return rv;
48410+
48411+ if (gr_acl_handle_procpidmem(task))
48412+ rv = -EACCES;
48413+
48414+ put_task_struct(task);
48415+
48416 return rv;
48417 }
48418
48419@@ -2196,6 +2297,9 @@ static struct dentry *proc_pident_lookup(struct inode *dir,
48420 if (!task)
48421 goto out_no_task;
48422
48423+ if (gr_pid_is_chrooted(task) || gr_check_hidden_task(task))
48424+ goto out;
48425+
48426 /*
48427 * Yes, it does not scale. And it should not. Don't add
48428 * new entries into /proc/<tgid>/ without very good reasons.
48429@@ -2240,6 +2344,9 @@ static int proc_pident_readdir(struct file *filp,
48430 if (!task)
48431 goto out_no_task;
48432
48433+ if (gr_pid_is_chrooted(task) || gr_check_hidden_task(task))
48434+ goto out;
48435+
48436 ret = 0;
48437 i = filp->f_pos;
48438 switch (i) {
48439@@ -2510,7 +2617,7 @@ static void *proc_self_follow_link(struct dentry *dentry, struct nameidata *nd)
48440 static void proc_self_put_link(struct dentry *dentry, struct nameidata *nd,
48441 void *cookie)
48442 {
48443- char *s = nd_get_link(nd);
48444+ const char *s = nd_get_link(nd);
48445 if (!IS_ERR(s))
48446 __putname(s);
48447 }
48448@@ -2708,7 +2815,7 @@ static const struct pid_entry tgid_base_stuff[] = {
48449 REG("autogroup", S_IRUGO|S_IWUSR, proc_pid_sched_autogroup_operations),
48450 #endif
48451 REG("comm", S_IRUGO|S_IWUSR, proc_pid_set_comm_operations),
48452-#ifdef CONFIG_HAVE_ARCH_TRACEHOOK
48453+#if defined(CONFIG_HAVE_ARCH_TRACEHOOK) && !defined(CONFIG_GRKERNSEC_PROC_MEMMAP)
48454 INF("syscall", S_IRUGO, proc_pid_syscall),
48455 #endif
48456 INF("cmdline", S_IRUGO, proc_pid_cmdline),
48457@@ -2733,10 +2840,10 @@ static const struct pid_entry tgid_base_stuff[] = {
48458 #ifdef CONFIG_SECURITY
48459 DIR("attr", S_IRUGO|S_IXUGO, proc_attr_dir_inode_operations, proc_attr_dir_operations),
48460 #endif
48461-#ifdef CONFIG_KALLSYMS
48462+#if defined(CONFIG_KALLSYMS) && !defined(CONFIG_GRKERNSEC_HIDESYM)
48463 INF("wchan", S_IRUGO, proc_pid_wchan),
48464 #endif
48465-#ifdef CONFIG_STACKTRACE
48466+#if defined(CONFIG_STACKTRACE) && !defined(CONFIG_GRKERNSEC_HIDESYM)
48467 ONE("stack", S_IRUGO, proc_pid_stack),
48468 #endif
48469 #ifdef CONFIG_SCHEDSTATS
48470@@ -2770,6 +2877,9 @@ static const struct pid_entry tgid_base_stuff[] = {
48471 #ifdef CONFIG_HARDWALL
48472 INF("hardwall", S_IRUGO, proc_pid_hardwall),
48473 #endif
48474+#ifdef CONFIG_GRKERNSEC_PROC_IPADDR
48475+ INF("ipaddr", S_IRUSR, proc_pid_ipaddr),
48476+#endif
48477 };
48478
48479 static int proc_tgid_base_readdir(struct file * filp,
48480@@ -2895,7 +3005,14 @@ static struct dentry *proc_pid_instantiate(struct inode *dir,
48481 if (!inode)
48482 goto out;
48483
48484+#ifdef CONFIG_GRKERNSEC_PROC_USER
48485+ inode->i_mode = S_IFDIR|S_IRUSR|S_IXUSR;
48486+#elif defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
48487+ inode->i_gid = CONFIG_GRKERNSEC_PROC_GID;
48488+ inode->i_mode = S_IFDIR|S_IRUSR|S_IRGRP|S_IXUSR|S_IXGRP;
48489+#else
48490 inode->i_mode = S_IFDIR|S_IRUGO|S_IXUGO;
48491+#endif
48492 inode->i_op = &proc_tgid_base_inode_operations;
48493 inode->i_fop = &proc_tgid_base_operations;
48494 inode->i_flags|=S_IMMUTABLE;
48495@@ -2937,7 +3054,11 @@ struct dentry *proc_pid_lookup(struct inode *dir, struct dentry * dentry, struct
48496 if (!task)
48497 goto out;
48498
48499+ if (gr_pid_is_chrooted(task) || gr_check_hidden_task(task))
48500+ goto out_put_task;
48501+
48502 result = proc_pid_instantiate(dir, dentry, task, NULL);
48503+out_put_task:
48504 put_task_struct(task);
48505 out:
48506 return result;
48507@@ -3002,6 +3123,11 @@ int proc_pid_readdir(struct file * filp, void * dirent, filldir_t filldir)
48508 {
48509 unsigned int nr;
48510 struct task_struct *reaper;
48511+#if defined(CONFIG_GRKERNSEC_PROC_USER) || defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
48512+ const struct cred *tmpcred = current_cred();
48513+ const struct cred *itercred;
48514+#endif
48515+ filldir_t __filldir = filldir;
48516 struct tgid_iter iter;
48517 struct pid_namespace *ns;
48518
48519@@ -3025,8 +3151,27 @@ int proc_pid_readdir(struct file * filp, void * dirent, filldir_t filldir)
48520 for (iter = next_tgid(ns, iter);
48521 iter.task;
48522 iter.tgid += 1, iter = next_tgid(ns, iter)) {
48523+#if defined(CONFIG_GRKERNSEC_PROC_USER) || defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
48524+ rcu_read_lock();
48525+ itercred = __task_cred(iter.task);
48526+#endif
48527+ if (gr_pid_is_chrooted(iter.task) || gr_check_hidden_task(iter.task)
48528+#if defined(CONFIG_GRKERNSEC_PROC_USER) || defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
48529+ || (tmpcred->uid && (itercred->uid != tmpcred->uid)
48530+#ifdef CONFIG_GRKERNSEC_PROC_USERGROUP
48531+ && !in_group_p(CONFIG_GRKERNSEC_PROC_GID)
48532+#endif
48533+ )
48534+#endif
48535+ )
48536+ __filldir = &gr_fake_filldir;
48537+ else
48538+ __filldir = filldir;
48539+#if defined(CONFIG_GRKERNSEC_PROC_USER) || defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
48540+ rcu_read_unlock();
48541+#endif
48542 filp->f_pos = iter.tgid + TGID_OFFSET;
48543- if (proc_pid_fill_cache(filp, dirent, filldir, iter) < 0) {
48544+ if (proc_pid_fill_cache(filp, dirent, __filldir, iter) < 0) {
48545 put_task_struct(iter.task);
48546 goto out;
48547 }
48548@@ -3054,7 +3199,7 @@ static const struct pid_entry tid_base_stuff[] = {
48549 REG("sched", S_IRUGO|S_IWUSR, proc_pid_sched_operations),
48550 #endif
48551 REG("comm", S_IRUGO|S_IWUSR, proc_pid_set_comm_operations),
48552-#ifdef CONFIG_HAVE_ARCH_TRACEHOOK
48553+#if defined(CONFIG_HAVE_ARCH_TRACEHOOK) && !defined(CONFIG_GRKERNSEC_PROC_MEMMAP)
48554 INF("syscall", S_IRUGO, proc_pid_syscall),
48555 #endif
48556 INF("cmdline", S_IRUGO, proc_pid_cmdline),
48557@@ -3078,10 +3223,10 @@ static const struct pid_entry tid_base_stuff[] = {
48558 #ifdef CONFIG_SECURITY
48559 DIR("attr", S_IRUGO|S_IXUGO, proc_attr_dir_inode_operations, proc_attr_dir_operations),
48560 #endif
48561-#ifdef CONFIG_KALLSYMS
48562+#if defined(CONFIG_KALLSYMS) && !defined(CONFIG_GRKERNSEC_HIDESYM)
48563 INF("wchan", S_IRUGO, proc_pid_wchan),
48564 #endif
48565-#ifdef CONFIG_STACKTRACE
48566+#if defined(CONFIG_STACKTRACE) && !defined(CONFIG_GRKERNSEC_HIDESYM)
48567 ONE("stack", S_IRUGO, proc_pid_stack),
48568 #endif
48569 #ifdef CONFIG_SCHEDSTATS
48570diff --git a/fs/proc/cmdline.c b/fs/proc/cmdline.c
48571index 82676e3..5f8518a 100644
48572--- a/fs/proc/cmdline.c
48573+++ b/fs/proc/cmdline.c
48574@@ -23,7 +23,11 @@ static const struct file_operations cmdline_proc_fops = {
48575
48576 static int __init proc_cmdline_init(void)
48577 {
48578+#ifdef CONFIG_GRKERNSEC_PROC_ADD
48579+ proc_create_grsec("cmdline", 0, NULL, &cmdline_proc_fops);
48580+#else
48581 proc_create("cmdline", 0, NULL, &cmdline_proc_fops);
48582+#endif
48583 return 0;
48584 }
48585 module_init(proc_cmdline_init);
48586diff --git a/fs/proc/devices.c b/fs/proc/devices.c
48587index b143471..bb105e5 100644
48588--- a/fs/proc/devices.c
48589+++ b/fs/proc/devices.c
48590@@ -64,7 +64,11 @@ static const struct file_operations proc_devinfo_operations = {
48591
48592 static int __init proc_devices_init(void)
48593 {
48594+#ifdef CONFIG_GRKERNSEC_PROC_ADD
48595+ proc_create_grsec("devices", 0, NULL, &proc_devinfo_operations);
48596+#else
48597 proc_create("devices", 0, NULL, &proc_devinfo_operations);
48598+#endif
48599 return 0;
48600 }
48601 module_init(proc_devices_init);
48602diff --git a/fs/proc/inode.c b/fs/proc/inode.c
48603index 7737c54..7172574 100644
48604--- a/fs/proc/inode.c
48605+++ b/fs/proc/inode.c
48606@@ -18,12 +18,18 @@
48607 #include <linux/module.h>
48608 #include <linux/sysctl.h>
48609 #include <linux/slab.h>
48610+#include <linux/grsecurity.h>
48611
48612 #include <asm/system.h>
48613 #include <asm/uaccess.h>
48614
48615 #include "internal.h"
48616
48617+#ifdef CONFIG_PROC_SYSCTL
48618+extern const struct inode_operations proc_sys_inode_operations;
48619+extern const struct inode_operations proc_sys_dir_operations;
48620+#endif
48621+
48622 static void proc_evict_inode(struct inode *inode)
48623 {
48624 struct proc_dir_entry *de;
48625@@ -49,6 +55,13 @@ static void proc_evict_inode(struct inode *inode)
48626 ns_ops = PROC_I(inode)->ns_ops;
48627 if (ns_ops && ns_ops->put)
48628 ns_ops->put(PROC_I(inode)->ns);
48629+
48630+#ifdef CONFIG_PROC_SYSCTL
48631+ if (inode->i_op == &proc_sys_inode_operations ||
48632+ inode->i_op == &proc_sys_dir_operations)
48633+ gr_handle_delete(inode->i_ino, inode->i_sb->s_dev);
48634+#endif
48635+
48636 }
48637
48638 static struct kmem_cache * proc_inode_cachep;
48639@@ -440,7 +453,11 @@ struct inode *proc_get_inode(struct super_block *sb, struct proc_dir_entry *de)
48640 if (de->mode) {
48641 inode->i_mode = de->mode;
48642 inode->i_uid = de->uid;
48643+#ifdef CONFIG_GRKERNSEC_PROC_USERGROUP
48644+ inode->i_gid = CONFIG_GRKERNSEC_PROC_GID;
48645+#else
48646 inode->i_gid = de->gid;
48647+#endif
48648 }
48649 if (de->size)
48650 inode->i_size = de->size;
48651diff --git a/fs/proc/internal.h b/fs/proc/internal.h
48652index 7838e5c..ff92cbc 100644
48653--- a/fs/proc/internal.h
48654+++ b/fs/proc/internal.h
48655@@ -51,6 +51,9 @@ extern int proc_pid_status(struct seq_file *m, struct pid_namespace *ns,
48656 struct pid *pid, struct task_struct *task);
48657 extern int proc_pid_statm(struct seq_file *m, struct pid_namespace *ns,
48658 struct pid *pid, struct task_struct *task);
48659+#ifdef CONFIG_GRKERNSEC_PROC_IPADDR
48660+extern int proc_pid_ipaddr(struct task_struct *task, char *buffer);
48661+#endif
48662 extern loff_t mem_lseek(struct file *file, loff_t offset, int orig);
48663
48664 extern const struct file_operations proc_maps_operations;
48665diff --git a/fs/proc/kcore.c b/fs/proc/kcore.c
48666index d245cb2..f4e8498 100644
48667--- a/fs/proc/kcore.c
48668+++ b/fs/proc/kcore.c
48669@@ -478,9 +478,10 @@ read_kcore(struct file *file, char __user *buffer, size_t buflen, loff_t *fpos)
48670 * the addresses in the elf_phdr on our list.
48671 */
48672 start = kc_offset_to_vaddr(*fpos - elf_buflen);
48673- if ((tsz = (PAGE_SIZE - (start & ~PAGE_MASK))) > buflen)
48674+ tsz = PAGE_SIZE - (start & ~PAGE_MASK);
48675+ if (tsz > buflen)
48676 tsz = buflen;
48677-
48678+
48679 while (buflen) {
48680 struct kcore_list *m;
48681
48682@@ -509,20 +510,23 @@ read_kcore(struct file *file, char __user *buffer, size_t buflen, loff_t *fpos)
48683 kfree(elf_buf);
48684 } else {
48685 if (kern_addr_valid(start)) {
48686- unsigned long n;
48687+ char *elf_buf;
48688+ mm_segment_t oldfs;
48689
48690- n = copy_to_user(buffer, (char *)start, tsz);
48691- /*
48692- * We cannot distingush between fault on source
48693- * and fault on destination. When this happens
48694- * we clear too and hope it will trigger the
48695- * EFAULT again.
48696- */
48697- if (n) {
48698- if (clear_user(buffer + tsz - n,
48699- n))
48700+ elf_buf = kmalloc(tsz, GFP_KERNEL);
48701+ if (!elf_buf)
48702+ return -ENOMEM;
48703+ oldfs = get_fs();
48704+ set_fs(KERNEL_DS);
48705+ if (!__copy_from_user(elf_buf, (const void __user *)start, tsz)) {
48706+ set_fs(oldfs);
48707+ if (copy_to_user(buffer, elf_buf, tsz)) {
48708+ kfree(elf_buf);
48709 return -EFAULT;
48710+ }
48711 }
48712+ set_fs(oldfs);
48713+ kfree(elf_buf);
48714 } else {
48715 if (clear_user(buffer, tsz))
48716 return -EFAULT;
48717@@ -542,6 +546,9 @@ read_kcore(struct file *file, char __user *buffer, size_t buflen, loff_t *fpos)
48718
48719 static int open_kcore(struct inode *inode, struct file *filp)
48720 {
48721+#if defined(CONFIG_GRKERNSEC_PROC_ADD) || defined(CONFIG_GRKERNSEC_HIDESYM)
48722+ return -EPERM;
48723+#endif
48724 if (!capable(CAP_SYS_RAWIO))
48725 return -EPERM;
48726 if (kcore_need_update)
48727diff --git a/fs/proc/meminfo.c b/fs/proc/meminfo.c
48728index 80e4645..53e5fcf 100644
48729--- a/fs/proc/meminfo.c
48730+++ b/fs/proc/meminfo.c
48731@@ -158,7 +158,7 @@ static int meminfo_proc_show(struct seq_file *m, void *v)
48732 vmi.used >> 10,
48733 vmi.largest_chunk >> 10
48734 #ifdef CONFIG_MEMORY_FAILURE
48735- ,atomic_long_read(&mce_bad_pages) << (PAGE_SHIFT - 10)
48736+ ,atomic_long_read_unchecked(&mce_bad_pages) << (PAGE_SHIFT - 10)
48737 #endif
48738 #ifdef CONFIG_TRANSPARENT_HUGEPAGE
48739 ,K(global_page_state(NR_ANON_TRANSPARENT_HUGEPAGES) *
48740diff --git a/fs/proc/nommu.c b/fs/proc/nommu.c
48741index b1822dd..df622cb 100644
48742--- a/fs/proc/nommu.c
48743+++ b/fs/proc/nommu.c
48744@@ -66,7 +66,7 @@ static int nommu_region_show(struct seq_file *m, struct vm_region *region)
48745 if (len < 1)
48746 len = 1;
48747 seq_printf(m, "%*c", len, ' ');
48748- seq_path(m, &file->f_path, "");
48749+ seq_path(m, &file->f_path, "\n\\");
48750 }
48751
48752 seq_putc(m, '\n');
48753diff --git a/fs/proc/proc_net.c b/fs/proc/proc_net.c
48754index f738024..876984a 100644
48755--- a/fs/proc/proc_net.c
48756+++ b/fs/proc/proc_net.c
48757@@ -105,6 +105,17 @@ static struct net *get_proc_task_net(struct inode *dir)
48758 struct task_struct *task;
48759 struct nsproxy *ns;
48760 struct net *net = NULL;
48761+#if defined(CONFIG_GRKERNSEC_PROC_USER) || defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
48762+ const struct cred *cred = current_cred();
48763+#endif
48764+
48765+#ifdef CONFIG_GRKERNSEC_PROC_USER
48766+ if (cred->fsuid)
48767+ return net;
48768+#elif defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
48769+ if (cred->fsuid && !in_group_p(CONFIG_GRKERNSEC_PROC_GID))
48770+ return net;
48771+#endif
48772
48773 rcu_read_lock();
48774 task = pid_task(proc_pid(dir), PIDTYPE_PID);
48775diff --git a/fs/proc/proc_sysctl.c b/fs/proc/proc_sysctl.c
48776index a6b6217..1e0579d 100644
48777--- a/fs/proc/proc_sysctl.c
48778+++ b/fs/proc/proc_sysctl.c
48779@@ -9,11 +9,13 @@
48780 #include <linux/namei.h>
48781 #include "internal.h"
48782
48783+extern __u32 gr_handle_sysctl(const struct ctl_table *table, const int op);
48784+
48785 static const struct dentry_operations proc_sys_dentry_operations;
48786 static const struct file_operations proc_sys_file_operations;
48787-static const struct inode_operations proc_sys_inode_operations;
48788+const struct inode_operations proc_sys_inode_operations;
48789 static const struct file_operations proc_sys_dir_file_operations;
48790-static const struct inode_operations proc_sys_dir_operations;
48791+const struct inode_operations proc_sys_dir_operations;
48792
48793 void proc_sys_poll_notify(struct ctl_table_poll *poll)
48794 {
48795@@ -131,8 +133,14 @@ static struct dentry *proc_sys_lookup(struct inode *dir, struct dentry *dentry,
48796
48797 err = NULL;
48798 d_set_d_op(dentry, &proc_sys_dentry_operations);
48799+
48800+ gr_handle_proc_create(dentry, inode);
48801+
48802 d_add(dentry, inode);
48803
48804+ if (gr_handle_sysctl(p, MAY_EXEC))
48805+ err = ERR_PTR(-ENOENT);
48806+
48807 out:
48808 sysctl_head_finish(head);
48809 return err;
48810@@ -163,6 +171,12 @@ static ssize_t proc_sys_call_handler(struct file *filp, void __user *buf,
48811 if (!table->proc_handler)
48812 goto out;
48813
48814+#ifdef CONFIG_GRKERNSEC
48815+ error = -EPERM;
48816+ if (write && !capable(CAP_SYS_ADMIN))
48817+ goto out;
48818+#endif
48819+
48820 /* careful: calling conventions are nasty here */
48821 res = count;
48822 error = table->proc_handler(table, write, buf, &res, ppos);
48823@@ -245,6 +259,9 @@ static int proc_sys_fill_cache(struct file *filp, void *dirent,
48824 return -ENOMEM;
48825 } else {
48826 d_set_d_op(child, &proc_sys_dentry_operations);
48827+
48828+ gr_handle_proc_create(child, inode);
48829+
48830 d_add(child, inode);
48831 }
48832 } else {
48833@@ -273,6 +290,9 @@ static int scan(struct ctl_table_header *head, ctl_table *table,
48834 if (*pos < file->f_pos)
48835 continue;
48836
48837+ if (gr_handle_sysctl(table, 0))
48838+ continue;
48839+
48840 res = proc_sys_fill_cache(file, dirent, filldir, head, table);
48841 if (res)
48842 return res;
48843@@ -398,6 +418,9 @@ static int proc_sys_getattr(struct vfsmount *mnt, struct dentry *dentry, struct
48844 if (IS_ERR(head))
48845 return PTR_ERR(head);
48846
48847+ if (table && gr_handle_sysctl(table, MAY_EXEC))
48848+ return -ENOENT;
48849+
48850 generic_fillattr(inode, stat);
48851 if (table)
48852 stat->mode = (stat->mode & S_IFMT) | table->mode;
48853@@ -420,13 +443,13 @@ static const struct file_operations proc_sys_dir_file_operations = {
48854 .llseek = generic_file_llseek,
48855 };
48856
48857-static const struct inode_operations proc_sys_inode_operations = {
48858+const struct inode_operations proc_sys_inode_operations = {
48859 .permission = proc_sys_permission,
48860 .setattr = proc_sys_setattr,
48861 .getattr = proc_sys_getattr,
48862 };
48863
48864-static const struct inode_operations proc_sys_dir_operations = {
48865+const struct inode_operations proc_sys_dir_operations = {
48866 .lookup = proc_sys_lookup,
48867 .permission = proc_sys_permission,
48868 .setattr = proc_sys_setattr,
48869diff --git a/fs/proc/root.c b/fs/proc/root.c
48870index 03102d9..4ae347e 100644
48871--- a/fs/proc/root.c
48872+++ b/fs/proc/root.c
48873@@ -121,7 +121,15 @@ void __init proc_root_init(void)
48874 #ifdef CONFIG_PROC_DEVICETREE
48875 proc_device_tree_init();
48876 #endif
48877+#ifdef CONFIG_GRKERNSEC_PROC_ADD
48878+#ifdef CONFIG_GRKERNSEC_PROC_USER
48879+ proc_mkdir_mode("bus", S_IRUSR | S_IXUSR, NULL);
48880+#elif defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
48881+ proc_mkdir_mode("bus", S_IRUSR | S_IXUSR | S_IRGRP | S_IXGRP, NULL);
48882+#endif
48883+#else
48884 proc_mkdir("bus", NULL);
48885+#endif
48886 proc_sys_init();
48887 }
48888
48889diff --git a/fs/proc/task_mmu.c b/fs/proc/task_mmu.c
48890index 7dcd2a2..b2f410e 100644
48891--- a/fs/proc/task_mmu.c
48892+++ b/fs/proc/task_mmu.c
48893@@ -11,6 +11,7 @@
48894 #include <linux/rmap.h>
48895 #include <linux/swap.h>
48896 #include <linux/swapops.h>
48897+#include <linux/grsecurity.h>
48898
48899 #include <asm/elf.h>
48900 #include <asm/uaccess.h>
48901@@ -52,8 +53,13 @@ void task_mem(struct seq_file *m, struct mm_struct *mm)
48902 "VmExe:\t%8lu kB\n"
48903 "VmLib:\t%8lu kB\n"
48904 "VmPTE:\t%8lu kB\n"
48905- "VmSwap:\t%8lu kB\n",
48906- hiwater_vm << (PAGE_SHIFT-10),
48907+ "VmSwap:\t%8lu kB\n"
48908+
48909+#ifdef CONFIG_ARCH_TRACK_EXEC_LIMIT
48910+ "CsBase:\t%8lx\nCsLim:\t%8lx\n"
48911+#endif
48912+
48913+ ,hiwater_vm << (PAGE_SHIFT-10),
48914 (total_vm - mm->reserved_vm) << (PAGE_SHIFT-10),
48915 mm->locked_vm << (PAGE_SHIFT-10),
48916 mm->pinned_vm << (PAGE_SHIFT-10),
48917@@ -62,7 +68,13 @@ void task_mem(struct seq_file *m, struct mm_struct *mm)
48918 data << (PAGE_SHIFT-10),
48919 mm->stack_vm << (PAGE_SHIFT-10), text, lib,
48920 (PTRS_PER_PTE*sizeof(pte_t)*mm->nr_ptes) >> 10,
48921- swap << (PAGE_SHIFT-10));
48922+ swap << (PAGE_SHIFT-10)
48923+
48924+#ifdef CONFIG_ARCH_TRACK_EXEC_LIMIT
48925+ , mm->context.user_cs_base, mm->context.user_cs_limit
48926+#endif
48927+
48928+ );
48929 }
48930
48931 unsigned long task_vsize(struct mm_struct *mm)
48932@@ -209,6 +221,12 @@ static int do_maps_open(struct inode *inode, struct file *file,
48933 return ret;
48934 }
48935
48936+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
48937+#define PAX_RAND_FLAGS(_mm) (_mm != NULL && _mm != current->mm && \
48938+ (_mm->pax_flags & MF_PAX_RANDMMAP || \
48939+ _mm->pax_flags & MF_PAX_SEGMEXEC))
48940+#endif
48941+
48942 static void show_map_vma(struct seq_file *m, struct vm_area_struct *vma)
48943 {
48944 struct mm_struct *mm = vma->vm_mm;
48945@@ -227,13 +245,13 @@ static void show_map_vma(struct seq_file *m, struct vm_area_struct *vma)
48946 pgoff = ((loff_t)vma->vm_pgoff) << PAGE_SHIFT;
48947 }
48948
48949- /* We don't show the stack guard page in /proc/maps */
48950+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
48951+ start = PAX_RAND_FLAGS(mm) ? 0UL : vma->vm_start;
48952+ end = PAX_RAND_FLAGS(mm) ? 0UL : vma->vm_end;
48953+#else
48954 start = vma->vm_start;
48955- if (stack_guard_page_start(vma, start))
48956- start += PAGE_SIZE;
48957 end = vma->vm_end;
48958- if (stack_guard_page_end(vma, end))
48959- end -= PAGE_SIZE;
48960+#endif
48961
48962 seq_printf(m, "%08lx-%08lx %c%c%c%c %08llx %02x:%02x %lu %n",
48963 start,
48964@@ -242,7 +260,11 @@ static void show_map_vma(struct seq_file *m, struct vm_area_struct *vma)
48965 flags & VM_WRITE ? 'w' : '-',
48966 flags & VM_EXEC ? 'x' : '-',
48967 flags & VM_MAYSHARE ? 's' : 'p',
48968+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
48969+ PAX_RAND_FLAGS(mm) ? 0UL : pgoff,
48970+#else
48971 pgoff,
48972+#endif
48973 MAJOR(dev), MINOR(dev), ino, &len);
48974
48975 /*
48976@@ -251,7 +273,7 @@ static void show_map_vma(struct seq_file *m, struct vm_area_struct *vma)
48977 */
48978 if (file) {
48979 pad_len_spaces(m, len);
48980- seq_path(m, &file->f_path, "\n");
48981+ seq_path(m, &file->f_path, "\n\\");
48982 } else {
48983 const char *name = arch_vma_name(vma);
48984 if (!name) {
48985@@ -259,8 +281,9 @@ static void show_map_vma(struct seq_file *m, struct vm_area_struct *vma)
48986 if (vma->vm_start <= mm->brk &&
48987 vma->vm_end >= mm->start_brk) {
48988 name = "[heap]";
48989- } else if (vma->vm_start <= mm->start_stack &&
48990- vma->vm_end >= mm->start_stack) {
48991+ } else if ((vma->vm_flags & (VM_GROWSDOWN | VM_GROWSUP)) ||
48992+ (vma->vm_start <= mm->start_stack &&
48993+ vma->vm_end >= mm->start_stack)) {
48994 name = "[stack]";
48995 }
48996 } else {
48997@@ -281,6 +304,13 @@ static int show_map(struct seq_file *m, void *v)
48998 struct proc_maps_private *priv = m->private;
48999 struct task_struct *task = priv->task;
49000
49001+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
49002+ if (current->exec_id != m->exec_id) {
49003+ gr_log_badprocpid("maps");
49004+ return 0;
49005+ }
49006+#endif
49007+
49008 show_map_vma(m, vma);
49009
49010 if (m->count < m->size) /* vma is copied successfully */
49011@@ -434,12 +464,23 @@ static int show_smap(struct seq_file *m, void *v)
49012 .private = &mss,
49013 };
49014
49015+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
49016+ if (current->exec_id != m->exec_id) {
49017+ gr_log_badprocpid("smaps");
49018+ return 0;
49019+ }
49020+#endif
49021 memset(&mss, 0, sizeof mss);
49022- mss.vma = vma;
49023- /* mmap_sem is held in m_start */
49024- if (vma->vm_mm && !is_vm_hugetlb_page(vma))
49025- walk_page_range(vma->vm_start, vma->vm_end, &smaps_walk);
49026-
49027+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
49028+ if (!PAX_RAND_FLAGS(vma->vm_mm)) {
49029+#endif
49030+ mss.vma = vma;
49031+ /* mmap_sem is held in m_start */
49032+ if (vma->vm_mm && !is_vm_hugetlb_page(vma))
49033+ walk_page_range(vma->vm_start, vma->vm_end, &smaps_walk);
49034+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
49035+ }
49036+#endif
49037 show_map_vma(m, vma);
49038
49039 seq_printf(m,
49040@@ -457,7 +498,11 @@ static int show_smap(struct seq_file *m, void *v)
49041 "KernelPageSize: %8lu kB\n"
49042 "MMUPageSize: %8lu kB\n"
49043 "Locked: %8lu kB\n",
49044+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
49045+ PAX_RAND_FLAGS(vma->vm_mm) ? 0UL : (vma->vm_end - vma->vm_start) >> 10,
49046+#else
49047 (vma->vm_end - vma->vm_start) >> 10,
49048+#endif
49049 mss.resident >> 10,
49050 (unsigned long)(mss.pss >> (10 + PSS_SHIFT)),
49051 mss.shared_clean >> 10,
49052@@ -1015,6 +1060,13 @@ static int show_numa_map(struct seq_file *m, void *v)
49053 int n;
49054 char buffer[50];
49055
49056+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
49057+ if (current->exec_id != m->exec_id) {
49058+ gr_log_badprocpid("numa_maps");
49059+ return 0;
49060+ }
49061+#endif
49062+
49063 if (!mm)
49064 return 0;
49065
49066@@ -1032,11 +1084,15 @@ static int show_numa_map(struct seq_file *m, void *v)
49067 mpol_to_str(buffer, sizeof(buffer), pol, 0);
49068 mpol_cond_put(pol);
49069
49070+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
49071+ seq_printf(m, "%08lx %s", PAX_RAND_FLAGS(vma->vm_mm) ? 0UL : vma->vm_start, buffer);
49072+#else
49073 seq_printf(m, "%08lx %s", vma->vm_start, buffer);
49074+#endif
49075
49076 if (file) {
49077 seq_printf(m, " file=");
49078- seq_path(m, &file->f_path, "\n\t= ");
49079+ seq_path(m, &file->f_path, "\n\t\\= ");
49080 } else if (vma->vm_start <= mm->brk && vma->vm_end >= mm->start_brk) {
49081 seq_printf(m, " heap");
49082 } else if (vma->vm_start <= mm->start_stack &&
49083diff --git a/fs/proc/task_nommu.c b/fs/proc/task_nommu.c
49084index 980de54..2a4db5f 100644
49085--- a/fs/proc/task_nommu.c
49086+++ b/fs/proc/task_nommu.c
49087@@ -51,7 +51,7 @@ void task_mem(struct seq_file *m, struct mm_struct *mm)
49088 else
49089 bytes += kobjsize(mm);
49090
49091- if (current->fs && current->fs->users > 1)
49092+ if (current->fs && atomic_read(&current->fs->users) > 1)
49093 sbytes += kobjsize(current->fs);
49094 else
49095 bytes += kobjsize(current->fs);
49096@@ -166,7 +166,7 @@ static int nommu_vma_show(struct seq_file *m, struct vm_area_struct *vma)
49097
49098 if (file) {
49099 pad_len_spaces(m, len);
49100- seq_path(m, &file->f_path, "");
49101+ seq_path(m, &file->f_path, "\n\\");
49102 } else if (mm) {
49103 if (vma->vm_start <= mm->start_stack &&
49104 vma->vm_end >= mm->start_stack) {
49105diff --git a/fs/quota/netlink.c b/fs/quota/netlink.c
49106index d67908b..d13f6a6 100644
49107--- a/fs/quota/netlink.c
49108+++ b/fs/quota/netlink.c
49109@@ -33,7 +33,7 @@ static struct genl_family quota_genl_family = {
49110 void quota_send_warning(short type, unsigned int id, dev_t dev,
49111 const char warntype)
49112 {
49113- static atomic_t seq;
49114+ static atomic_unchecked_t seq;
49115 struct sk_buff *skb;
49116 void *msg_head;
49117 int ret;
49118@@ -49,7 +49,7 @@ void quota_send_warning(short type, unsigned int id, dev_t dev,
49119 "VFS: Not enough memory to send quota warning.\n");
49120 return;
49121 }
49122- msg_head = genlmsg_put(skb, 0, atomic_add_return(1, &seq),
49123+ msg_head = genlmsg_put(skb, 0, atomic_add_return_unchecked(1, &seq),
49124 &quota_genl_family, 0, QUOTA_NL_C_WARNING);
49125 if (!msg_head) {
49126 printk(KERN_ERR
49127diff --git a/fs/readdir.c b/fs/readdir.c
49128index 356f715..c918d38 100644
49129--- a/fs/readdir.c
49130+++ b/fs/readdir.c
49131@@ -17,6 +17,7 @@
49132 #include <linux/security.h>
49133 #include <linux/syscalls.h>
49134 #include <linux/unistd.h>
49135+#include <linux/namei.h>
49136
49137 #include <asm/uaccess.h>
49138
49139@@ -67,6 +68,7 @@ struct old_linux_dirent {
49140
49141 struct readdir_callback {
49142 struct old_linux_dirent __user * dirent;
49143+ struct file * file;
49144 int result;
49145 };
49146
49147@@ -84,6 +86,10 @@ static int fillonedir(void * __buf, const char * name, int namlen, loff_t offset
49148 buf->result = -EOVERFLOW;
49149 return -EOVERFLOW;
49150 }
49151+
49152+ if (!gr_acl_handle_filldir(buf->file, name, namlen, ino))
49153+ return 0;
49154+
49155 buf->result++;
49156 dirent = buf->dirent;
49157 if (!access_ok(VERIFY_WRITE, dirent,
49158@@ -116,6 +122,7 @@ SYSCALL_DEFINE3(old_readdir, unsigned int, fd,
49159
49160 buf.result = 0;
49161 buf.dirent = dirent;
49162+ buf.file = file;
49163
49164 error = vfs_readdir(file, fillonedir, &buf);
49165 if (buf.result)
49166@@ -142,6 +149,7 @@ struct linux_dirent {
49167 struct getdents_callback {
49168 struct linux_dirent __user * current_dir;
49169 struct linux_dirent __user * previous;
49170+ struct file * file;
49171 int count;
49172 int error;
49173 };
49174@@ -163,6 +171,10 @@ static int filldir(void * __buf, const char * name, int namlen, loff_t offset,
49175 buf->error = -EOVERFLOW;
49176 return -EOVERFLOW;
49177 }
49178+
49179+ if (!gr_acl_handle_filldir(buf->file, name, namlen, ino))
49180+ return 0;
49181+
49182 dirent = buf->previous;
49183 if (dirent) {
49184 if (__put_user(offset, &dirent->d_off))
49185@@ -210,6 +222,7 @@ SYSCALL_DEFINE3(getdents, unsigned int, fd,
49186 buf.previous = NULL;
49187 buf.count = count;
49188 buf.error = 0;
49189+ buf.file = file;
49190
49191 error = vfs_readdir(file, filldir, &buf);
49192 if (error >= 0)
49193@@ -229,6 +242,7 @@ out:
49194 struct getdents_callback64 {
49195 struct linux_dirent64 __user * current_dir;
49196 struct linux_dirent64 __user * previous;
49197+ struct file *file;
49198 int count;
49199 int error;
49200 };
49201@@ -244,6 +258,10 @@ static int filldir64(void * __buf, const char * name, int namlen, loff_t offset,
49202 buf->error = -EINVAL; /* only used if we fail.. */
49203 if (reclen > buf->count)
49204 return -EINVAL;
49205+
49206+ if (!gr_acl_handle_filldir(buf->file, name, namlen, ino))
49207+ return 0;
49208+
49209 dirent = buf->previous;
49210 if (dirent) {
49211 if (__put_user(offset, &dirent->d_off))
49212@@ -291,6 +309,7 @@ SYSCALL_DEFINE3(getdents64, unsigned int, fd,
49213
49214 buf.current_dir = dirent;
49215 buf.previous = NULL;
49216+ buf.file = file;
49217 buf.count = count;
49218 buf.error = 0;
49219
49220@@ -299,7 +318,7 @@ SYSCALL_DEFINE3(getdents64, unsigned int, fd,
49221 error = buf.error;
49222 lastdirent = buf.previous;
49223 if (lastdirent) {
49224- typeof(lastdirent->d_off) d_off = file->f_pos;
49225+ typeof(((struct linux_dirent64 *)0)->d_off) d_off = file->f_pos;
49226 if (__put_user(d_off, &lastdirent->d_off))
49227 error = -EFAULT;
49228 else
49229diff --git a/fs/reiserfs/do_balan.c b/fs/reiserfs/do_balan.c
49230index 60c0804..d814f98 100644
49231--- a/fs/reiserfs/do_balan.c
49232+++ b/fs/reiserfs/do_balan.c
49233@@ -2051,7 +2051,7 @@ void do_balance(struct tree_balance *tb, /* tree_balance structure */
49234 return;
49235 }
49236
49237- atomic_inc(&(fs_generation(tb->tb_sb)));
49238+ atomic_inc_unchecked(&(fs_generation(tb->tb_sb)));
49239 do_balance_starts(tb);
49240
49241 /* balance leaf returns 0 except if combining L R and S into
49242diff --git a/fs/reiserfs/procfs.c b/fs/reiserfs/procfs.c
49243index 7a99811..a7c96c4 100644
49244--- a/fs/reiserfs/procfs.c
49245+++ b/fs/reiserfs/procfs.c
49246@@ -113,7 +113,7 @@ static int show_super(struct seq_file *m, struct super_block *sb)
49247 "SMALL_TAILS " : "NO_TAILS ",
49248 replay_only(sb) ? "REPLAY_ONLY " : "",
49249 convert_reiserfs(sb) ? "CONV " : "",
49250- atomic_read(&r->s_generation_counter),
49251+ atomic_read_unchecked(&r->s_generation_counter),
49252 SF(s_disk_reads), SF(s_disk_writes), SF(s_fix_nodes),
49253 SF(s_do_balance), SF(s_unneeded_left_neighbor),
49254 SF(s_good_search_by_key_reada), SF(s_bmaps),
49255diff --git a/fs/select.c b/fs/select.c
49256index d33418f..2a5345e 100644
49257--- a/fs/select.c
49258+++ b/fs/select.c
49259@@ -20,6 +20,7 @@
49260 #include <linux/module.h>
49261 #include <linux/slab.h>
49262 #include <linux/poll.h>
49263+#include <linux/security.h>
49264 #include <linux/personality.h> /* for STICKY_TIMEOUTS */
49265 #include <linux/file.h>
49266 #include <linux/fdtable.h>
49267@@ -837,6 +838,7 @@ int do_sys_poll(struct pollfd __user *ufds, unsigned int nfds,
49268 struct poll_list *walk = head;
49269 unsigned long todo = nfds;
49270
49271+ gr_learn_resource(current, RLIMIT_NOFILE, nfds, 1);
49272 if (nfds > rlimit(RLIMIT_NOFILE))
49273 return -EINVAL;
49274
49275diff --git a/fs/seq_file.c b/fs/seq_file.c
49276index dba43c3..4b3f701 100644
49277--- a/fs/seq_file.c
49278+++ b/fs/seq_file.c
49279@@ -9,6 +9,7 @@
49280 #include <linux/module.h>
49281 #include <linux/seq_file.h>
49282 #include <linux/slab.h>
49283+#include <linux/sched.h>
49284
49285 #include <asm/uaccess.h>
49286 #include <asm/page.h>
49287@@ -40,6 +41,9 @@ int seq_open(struct file *file, const struct seq_operations *op)
49288 memset(p, 0, sizeof(*p));
49289 mutex_init(&p->lock);
49290 p->op = op;
49291+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
49292+ p->exec_id = current->exec_id;
49293+#endif
49294
49295 /*
49296 * Wrappers around seq_open(e.g. swaps_open) need to be
49297@@ -549,7 +553,7 @@ static void single_stop(struct seq_file *p, void *v)
49298 int single_open(struct file *file, int (*show)(struct seq_file *, void *),
49299 void *data)
49300 {
49301- struct seq_operations *op = kmalloc(sizeof(*op), GFP_KERNEL);
49302+ seq_operations_no_const *op = kmalloc(sizeof(*op), GFP_KERNEL);
49303 int res = -ENOMEM;
49304
49305 if (op) {
49306diff --git a/fs/splice.c b/fs/splice.c
49307index fa2defa..8601650 100644
49308--- a/fs/splice.c
49309+++ b/fs/splice.c
49310@@ -194,7 +194,7 @@ ssize_t splice_to_pipe(struct pipe_inode_info *pipe,
49311 pipe_lock(pipe);
49312
49313 for (;;) {
49314- if (!pipe->readers) {
49315+ if (!atomic_read(&pipe->readers)) {
49316 send_sig(SIGPIPE, current, 0);
49317 if (!ret)
49318 ret = -EPIPE;
49319@@ -248,9 +248,9 @@ ssize_t splice_to_pipe(struct pipe_inode_info *pipe,
49320 do_wakeup = 0;
49321 }
49322
49323- pipe->waiting_writers++;
49324+ atomic_inc(&pipe->waiting_writers);
49325 pipe_wait(pipe);
49326- pipe->waiting_writers--;
49327+ atomic_dec(&pipe->waiting_writers);
49328 }
49329
49330 pipe_unlock(pipe);
49331@@ -560,7 +560,7 @@ static ssize_t kernel_readv(struct file *file, const struct iovec *vec,
49332 old_fs = get_fs();
49333 set_fs(get_ds());
49334 /* The cast to a user pointer is valid due to the set_fs() */
49335- res = vfs_readv(file, (const struct iovec __user *)vec, vlen, &pos);
49336+ res = vfs_readv(file, (const struct iovec __force_user *)vec, vlen, &pos);
49337 set_fs(old_fs);
49338
49339 return res;
49340@@ -575,7 +575,7 @@ static ssize_t kernel_write(struct file *file, const char *buf, size_t count,
49341 old_fs = get_fs();
49342 set_fs(get_ds());
49343 /* The cast to a user pointer is valid due to the set_fs() */
49344- res = vfs_write(file, (const char __user *)buf, count, &pos);
49345+ res = vfs_write(file, (const char __force_user *)buf, count, &pos);
49346 set_fs(old_fs);
49347
49348 return res;
49349@@ -626,7 +626,7 @@ ssize_t default_file_splice_read(struct file *in, loff_t *ppos,
49350 goto err;
49351
49352 this_len = min_t(size_t, len, PAGE_CACHE_SIZE - offset);
49353- vec[i].iov_base = (void __user *) page_address(page);
49354+ vec[i].iov_base = (void __force_user *) page_address(page);
49355 vec[i].iov_len = this_len;
49356 spd.pages[i] = page;
49357 spd.nr_pages++;
49358@@ -846,10 +846,10 @@ EXPORT_SYMBOL(splice_from_pipe_feed);
49359 int splice_from_pipe_next(struct pipe_inode_info *pipe, struct splice_desc *sd)
49360 {
49361 while (!pipe->nrbufs) {
49362- if (!pipe->writers)
49363+ if (!atomic_read(&pipe->writers))
49364 return 0;
49365
49366- if (!pipe->waiting_writers && sd->num_spliced)
49367+ if (!atomic_read(&pipe->waiting_writers) && sd->num_spliced)
49368 return 0;
49369
49370 if (sd->flags & SPLICE_F_NONBLOCK)
49371@@ -1182,7 +1182,7 @@ ssize_t splice_direct_to_actor(struct file *in, struct splice_desc *sd,
49372 * out of the pipe right after the splice_to_pipe(). So set
49373 * PIPE_READERS appropriately.
49374 */
49375- pipe->readers = 1;
49376+ atomic_set(&pipe->readers, 1);
49377
49378 current->splice_pipe = pipe;
49379 }
49380@@ -1734,9 +1734,9 @@ static int ipipe_prep(struct pipe_inode_info *pipe, unsigned int flags)
49381 ret = -ERESTARTSYS;
49382 break;
49383 }
49384- if (!pipe->writers)
49385+ if (!atomic_read(&pipe->writers))
49386 break;
49387- if (!pipe->waiting_writers) {
49388+ if (!atomic_read(&pipe->waiting_writers)) {
49389 if (flags & SPLICE_F_NONBLOCK) {
49390 ret = -EAGAIN;
49391 break;
49392@@ -1768,7 +1768,7 @@ static int opipe_prep(struct pipe_inode_info *pipe, unsigned int flags)
49393 pipe_lock(pipe);
49394
49395 while (pipe->nrbufs >= pipe->buffers) {
49396- if (!pipe->readers) {
49397+ if (!atomic_read(&pipe->readers)) {
49398 send_sig(SIGPIPE, current, 0);
49399 ret = -EPIPE;
49400 break;
49401@@ -1781,9 +1781,9 @@ static int opipe_prep(struct pipe_inode_info *pipe, unsigned int flags)
49402 ret = -ERESTARTSYS;
49403 break;
49404 }
49405- pipe->waiting_writers++;
49406+ atomic_inc(&pipe->waiting_writers);
49407 pipe_wait(pipe);
49408- pipe->waiting_writers--;
49409+ atomic_dec(&pipe->waiting_writers);
49410 }
49411
49412 pipe_unlock(pipe);
49413@@ -1819,14 +1819,14 @@ retry:
49414 pipe_double_lock(ipipe, opipe);
49415
49416 do {
49417- if (!opipe->readers) {
49418+ if (!atomic_read(&opipe->readers)) {
49419 send_sig(SIGPIPE, current, 0);
49420 if (!ret)
49421 ret = -EPIPE;
49422 break;
49423 }
49424
49425- if (!ipipe->nrbufs && !ipipe->writers)
49426+ if (!ipipe->nrbufs && !atomic_read(&ipipe->writers))
49427 break;
49428
49429 /*
49430@@ -1923,7 +1923,7 @@ static int link_pipe(struct pipe_inode_info *ipipe,
49431 pipe_double_lock(ipipe, opipe);
49432
49433 do {
49434- if (!opipe->readers) {
49435+ if (!atomic_read(&opipe->readers)) {
49436 send_sig(SIGPIPE, current, 0);
49437 if (!ret)
49438 ret = -EPIPE;
49439@@ -1968,7 +1968,7 @@ static int link_pipe(struct pipe_inode_info *ipipe,
49440 * return EAGAIN if we have the potential of some data in the
49441 * future, otherwise just return 0
49442 */
49443- if (!ret && ipipe->waiting_writers && (flags & SPLICE_F_NONBLOCK))
49444+ if (!ret && atomic_read(&ipipe->waiting_writers) && (flags & SPLICE_F_NONBLOCK))
49445 ret = -EAGAIN;
49446
49447 pipe_unlock(ipipe);
49448diff --git a/fs/sysfs/bin.c b/fs/sysfs/bin.c
49449index a475983..9c6a1f0 100644
49450--- a/fs/sysfs/bin.c
49451+++ b/fs/sysfs/bin.c
49452@@ -67,6 +67,8 @@ fill_read(struct file *file, char *buffer, loff_t off, size_t count)
49453 }
49454
49455 static ssize_t
49456+read(struct file *file, char __user *userbuf, size_t bytes, loff_t *off) __size_overflow(3);
49457+static ssize_t
49458 read(struct file *file, char __user *userbuf, size_t bytes, loff_t *off)
49459 {
49460 struct bin_buffer *bb = file->private_data;
49461diff --git a/fs/sysfs/dir.c b/fs/sysfs/dir.c
49462index 7fdf6a7..e6cd8ad 100644
49463--- a/fs/sysfs/dir.c
49464+++ b/fs/sysfs/dir.c
49465@@ -642,6 +642,18 @@ static int create_dir(struct kobject *kobj, struct sysfs_dirent *parent_sd,
49466 struct sysfs_dirent *sd;
49467 int rc;
49468
49469+#ifdef CONFIG_GRKERNSEC_SYSFS_RESTRICT
49470+ const char *parent_name = parent_sd->s_name;
49471+
49472+ mode = S_IFDIR | S_IRWXU;
49473+
49474+ if ((!strcmp(parent_name, "") && (!strcmp(name, "devices") || !strcmp(name, "fs"))) ||
49475+ (!strcmp(parent_name, "devices") && !strcmp(name, "system")) ||
49476+ (!strcmp(parent_name, "fs") && (!strcmp(name, "selinux") || !strcmp(name, "fuse"))) ||
49477+ (!strcmp(parent_name, "system") && !strcmp(name, "cpu")))
49478+ mode = S_IFDIR | S_IRWXU | S_IRUGO | S_IXUGO;
49479+#endif
49480+
49481 /* allocate */
49482 sd = sysfs_new_dirent(name, mode, SYSFS_DIR);
49483 if (!sd)
49484diff --git a/fs/sysfs/file.c b/fs/sysfs/file.c
49485index 779789a..f58193c 100644
49486--- a/fs/sysfs/file.c
49487+++ b/fs/sysfs/file.c
49488@@ -37,7 +37,7 @@ static DEFINE_SPINLOCK(sysfs_open_dirent_lock);
49489
49490 struct sysfs_open_dirent {
49491 atomic_t refcnt;
49492- atomic_t event;
49493+ atomic_unchecked_t event;
49494 wait_queue_head_t poll;
49495 struct list_head buffers; /* goes through sysfs_buffer.list */
49496 };
49497@@ -81,7 +81,7 @@ static int fill_read_buffer(struct dentry * dentry, struct sysfs_buffer * buffer
49498 if (!sysfs_get_active(attr_sd))
49499 return -ENODEV;
49500
49501- buffer->event = atomic_read(&attr_sd->s_attr.open->event);
49502+ buffer->event = atomic_read_unchecked(&attr_sd->s_attr.open->event);
49503 count = ops->show(kobj, attr_sd->s_attr.attr, buffer->page);
49504
49505 sysfs_put_active(attr_sd);
49506@@ -287,7 +287,7 @@ static int sysfs_get_open_dirent(struct sysfs_dirent *sd,
49507 return -ENOMEM;
49508
49509 atomic_set(&new_od->refcnt, 0);
49510- atomic_set(&new_od->event, 1);
49511+ atomic_set_unchecked(&new_od->event, 1);
49512 init_waitqueue_head(&new_od->poll);
49513 INIT_LIST_HEAD(&new_od->buffers);
49514 goto retry;
49515@@ -432,7 +432,7 @@ static unsigned int sysfs_poll(struct file *filp, poll_table *wait)
49516
49517 sysfs_put_active(attr_sd);
49518
49519- if (buffer->event != atomic_read(&od->event))
49520+ if (buffer->event != atomic_read_unchecked(&od->event))
49521 goto trigger;
49522
49523 return DEFAULT_POLLMASK;
49524@@ -451,7 +451,7 @@ void sysfs_notify_dirent(struct sysfs_dirent *sd)
49525
49526 od = sd->s_attr.open;
49527 if (od) {
49528- atomic_inc(&od->event);
49529+ atomic_inc_unchecked(&od->event);
49530 wake_up_interruptible(&od->poll);
49531 }
49532
49533diff --git a/fs/sysfs/symlink.c b/fs/sysfs/symlink.c
49534index a7ac78f..02158e1 100644
49535--- a/fs/sysfs/symlink.c
49536+++ b/fs/sysfs/symlink.c
49537@@ -286,7 +286,7 @@ static void *sysfs_follow_link(struct dentry *dentry, struct nameidata *nd)
49538
49539 static void sysfs_put_link(struct dentry *dentry, struct nameidata *nd, void *cookie)
49540 {
49541- char *page = nd_get_link(nd);
49542+ const char *page = nd_get_link(nd);
49543 if (!IS_ERR(page))
49544 free_page((unsigned long)page);
49545 }
49546diff --git a/fs/ubifs/debug.c b/fs/ubifs/debug.c
49547index b09ba2d..1cad1a8 100644
49548--- a/fs/ubifs/debug.c
49549+++ b/fs/ubifs/debug.c
49550@@ -2817,6 +2817,7 @@ static ssize_t dfs_file_read(struct file *file, char __user *u, size_t count,
49551 * debugfs file. Returns %0 or %1 in case of success and a negative error code
49552 * in case of failure.
49553 */
49554+static int interpret_user_input(const char __user *u, size_t count) __size_overflow(2);
49555 static int interpret_user_input(const char __user *u, size_t count)
49556 {
49557 size_t buf_size;
49558@@ -2835,6 +2836,8 @@ static int interpret_user_input(const char __user *u, size_t count)
49559 }
49560
49561 static ssize_t dfs_file_write(struct file *file, const char __user *u,
49562+ size_t count, loff_t *ppos) __size_overflow(3);
49563+static ssize_t dfs_file_write(struct file *file, const char __user *u,
49564 size_t count, loff_t *ppos)
49565 {
49566 struct ubifs_info *c = file->private_data;
49567diff --git a/fs/udf/file.c b/fs/udf/file.c
49568index dca0c38..d567b84 100644
49569--- a/fs/udf/file.c
49570+++ b/fs/udf/file.c
49571@@ -201,12 +201,10 @@ out:
49572 static int udf_release_file(struct inode *inode, struct file *filp)
49573 {
49574 if (filp->f_mode & FMODE_WRITE) {
49575- mutex_lock(&inode->i_mutex);
49576 down_write(&UDF_I(inode)->i_data_sem);
49577 udf_discard_prealloc(inode);
49578 udf_truncate_tail_extent(inode);
49579 up_write(&UDF_I(inode)->i_data_sem);
49580- mutex_unlock(&inode->i_mutex);
49581 }
49582 return 0;
49583 }
49584diff --git a/fs/udf/misc.c b/fs/udf/misc.c
49585index c175b4d..8f36a16 100644
49586--- a/fs/udf/misc.c
49587+++ b/fs/udf/misc.c
49588@@ -289,7 +289,7 @@ void udf_new_tag(char *data, uint16_t ident, uint16_t version, uint16_t snum,
49589
49590 u8 udf_tag_checksum(const struct tag *t)
49591 {
49592- u8 *data = (u8 *)t;
49593+ const u8 *data = (const u8 *)t;
49594 u8 checksum = 0;
49595 int i;
49596 for (i = 0; i < sizeof(struct tag); ++i)
49597diff --git a/fs/utimes.c b/fs/utimes.c
49598index ba653f3..06ea4b1 100644
49599--- a/fs/utimes.c
49600+++ b/fs/utimes.c
49601@@ -1,6 +1,7 @@
49602 #include <linux/compiler.h>
49603 #include <linux/file.h>
49604 #include <linux/fs.h>
49605+#include <linux/security.h>
49606 #include <linux/linkage.h>
49607 #include <linux/mount.h>
49608 #include <linux/namei.h>
49609@@ -101,6 +102,12 @@ static int utimes_common(struct path *path, struct timespec *times)
49610 goto mnt_drop_write_and_out;
49611 }
49612 }
49613+
49614+ if (!gr_acl_handle_utime(path->dentry, path->mnt)) {
49615+ error = -EACCES;
49616+ goto mnt_drop_write_and_out;
49617+ }
49618+
49619 mutex_lock(&inode->i_mutex);
49620 error = notify_change(path->dentry, &newattrs);
49621 mutex_unlock(&inode->i_mutex);
49622diff --git a/fs/xattr.c b/fs/xattr.c
49623index 67583de..c5aad14 100644
49624--- a/fs/xattr.c
49625+++ b/fs/xattr.c
49626@@ -315,7 +315,7 @@ EXPORT_SYMBOL_GPL(vfs_removexattr);
49627 * Extended attribute SET operations
49628 */
49629 static long
49630-setxattr(struct dentry *d, const char __user *name, const void __user *value,
49631+setxattr(struct path *path, const char __user *name, const void __user *value,
49632 size_t size, int flags)
49633 {
49634 int error;
49635@@ -339,7 +339,13 @@ setxattr(struct dentry *d, const char __user *name, const void __user *value,
49636 return PTR_ERR(kvalue);
49637 }
49638
49639- error = vfs_setxattr(d, kname, kvalue, size, flags);
49640+ if (!gr_acl_handle_setxattr(path->dentry, path->mnt)) {
49641+ error = -EACCES;
49642+ goto out;
49643+ }
49644+
49645+ error = vfs_setxattr(path->dentry, kname, kvalue, size, flags);
49646+out:
49647 kfree(kvalue);
49648 return error;
49649 }
49650@@ -356,7 +362,7 @@ SYSCALL_DEFINE5(setxattr, const char __user *, pathname,
49651 return error;
49652 error = mnt_want_write(path.mnt);
49653 if (!error) {
49654- error = setxattr(path.dentry, name, value, size, flags);
49655+ error = setxattr(&path, name, value, size, flags);
49656 mnt_drop_write(path.mnt);
49657 }
49658 path_put(&path);
49659@@ -375,7 +381,7 @@ SYSCALL_DEFINE5(lsetxattr, const char __user *, pathname,
49660 return error;
49661 error = mnt_want_write(path.mnt);
49662 if (!error) {
49663- error = setxattr(path.dentry, name, value, size, flags);
49664+ error = setxattr(&path, name, value, size, flags);
49665 mnt_drop_write(path.mnt);
49666 }
49667 path_put(&path);
49668@@ -386,17 +392,15 @@ SYSCALL_DEFINE5(fsetxattr, int, fd, const char __user *, name,
49669 const void __user *,value, size_t, size, int, flags)
49670 {
49671 struct file *f;
49672- struct dentry *dentry;
49673 int error = -EBADF;
49674
49675 f = fget(fd);
49676 if (!f)
49677 return error;
49678- dentry = f->f_path.dentry;
49679- audit_inode(NULL, dentry);
49680+ audit_inode(NULL, f->f_path.dentry);
49681 error = mnt_want_write_file(f);
49682 if (!error) {
49683- error = setxattr(dentry, name, value, size, flags);
49684+ error = setxattr(&f->f_path, name, value, size, flags);
49685 mnt_drop_write(f->f_path.mnt);
49686 }
49687 fput(f);
49688diff --git a/fs/xattr_acl.c b/fs/xattr_acl.c
49689index 8d5a506..7f62712 100644
49690--- a/fs/xattr_acl.c
49691+++ b/fs/xattr_acl.c
49692@@ -17,8 +17,8 @@
49693 struct posix_acl *
49694 posix_acl_from_xattr(const void *value, size_t size)
49695 {
49696- posix_acl_xattr_header *header = (posix_acl_xattr_header *)value;
49697- posix_acl_xattr_entry *entry = (posix_acl_xattr_entry *)(header+1), *end;
49698+ const posix_acl_xattr_header *header = (const posix_acl_xattr_header *)value;
49699+ const posix_acl_xattr_entry *entry = (const posix_acl_xattr_entry *)(header+1), *end;
49700 int count;
49701 struct posix_acl *acl;
49702 struct posix_acl_entry *acl_e;
49703diff --git a/fs/xfs/xfs_bmap.c b/fs/xfs/xfs_bmap.c
49704index d0ab788..827999b 100644
49705--- a/fs/xfs/xfs_bmap.c
49706+++ b/fs/xfs/xfs_bmap.c
49707@@ -190,7 +190,7 @@ xfs_bmap_validate_ret(
49708 int nmap,
49709 int ret_nmap);
49710 #else
49711-#define xfs_bmap_validate_ret(bno,len,flags,mval,onmap,nmap)
49712+#define xfs_bmap_validate_ret(bno,len,flags,mval,onmap,nmap) do {} while (0)
49713 #endif /* DEBUG */
49714
49715 STATIC int
49716diff --git a/fs/xfs/xfs_dir2_sf.c b/fs/xfs/xfs_dir2_sf.c
49717index 79d05e8..e3e5861 100644
49718--- a/fs/xfs/xfs_dir2_sf.c
49719+++ b/fs/xfs/xfs_dir2_sf.c
49720@@ -852,7 +852,15 @@ xfs_dir2_sf_getdents(
49721 }
49722
49723 ino = xfs_dir2_sfe_get_ino(sfp, sfep);
49724- if (filldir(dirent, (char *)sfep->name, sfep->namelen,
49725+ if (dp->i_df.if_u1.if_data == dp->i_df.if_u2.if_inline_data) {
49726+ char name[sfep->namelen];
49727+ memcpy(name, sfep->name, sfep->namelen);
49728+ if (filldir(dirent, name, sfep->namelen,
49729+ off & 0x7fffffff, ino, DT_UNKNOWN)) {
49730+ *offset = off & 0x7fffffff;
49731+ return 0;
49732+ }
49733+ } else if (filldir(dirent, (char *)sfep->name, sfep->namelen,
49734 off & 0x7fffffff, ino, DT_UNKNOWN)) {
49735 *offset = off & 0x7fffffff;
49736 return 0;
49737diff --git a/fs/xfs/xfs_ioctl.c b/fs/xfs/xfs_ioctl.c
49738index d99a905..9f88202 100644
49739--- a/fs/xfs/xfs_ioctl.c
49740+++ b/fs/xfs/xfs_ioctl.c
49741@@ -128,7 +128,7 @@ xfs_find_handle(
49742 }
49743
49744 error = -EFAULT;
49745- if (copy_to_user(hreq->ohandle, &handle, hsize) ||
49746+ if (hsize > sizeof handle || copy_to_user(hreq->ohandle, &handle, hsize) ||
49747 copy_to_user(hreq->ohandlen, &hsize, sizeof(__s32)))
49748 goto out_put;
49749
49750diff --git a/fs/xfs/xfs_iops.c b/fs/xfs/xfs_iops.c
49751index 23ce927..e274cc1 100644
49752--- a/fs/xfs/xfs_iops.c
49753+++ b/fs/xfs/xfs_iops.c
49754@@ -447,7 +447,7 @@ xfs_vn_put_link(
49755 struct nameidata *nd,
49756 void *p)
49757 {
49758- char *s = nd_get_link(nd);
49759+ const char *s = nd_get_link(nd);
49760
49761 if (!IS_ERR(s))
49762 kfree(s);
49763diff --git a/grsecurity/Kconfig b/grsecurity/Kconfig
49764new file mode 100644
49765index 0000000..4089e05
49766--- /dev/null
49767+++ b/grsecurity/Kconfig
49768@@ -0,0 +1,1078 @@
49769+#
49770+# grecurity configuration
49771+#
49772+
49773+menu "Grsecurity"
49774+
49775+config GRKERNSEC
49776+ bool "Grsecurity"
49777+ select CRYPTO
49778+ select CRYPTO_SHA256
49779+ help
49780+ If you say Y here, you will be able to configure many features
49781+ that will enhance the security of your system. It is highly
49782+ recommended that you say Y here and read through the help
49783+ for each option so that you fully understand the features and
49784+ can evaluate their usefulness for your machine.
49785+
49786+choice
49787+ prompt "Security Level"
49788+ depends on GRKERNSEC
49789+ default GRKERNSEC_CUSTOM
49790+
49791+config GRKERNSEC_LOW
49792+ bool "Low"
49793+ select GRKERNSEC_LINK
49794+ select GRKERNSEC_FIFO
49795+ select GRKERNSEC_RANDNET
49796+ select GRKERNSEC_DMESG
49797+ select GRKERNSEC_CHROOT
49798+ select GRKERNSEC_CHROOT_CHDIR
49799+
49800+ help
49801+ If you choose this option, several of the grsecurity options will
49802+ be enabled that will give you greater protection against a number
49803+ of attacks, while assuring that none of your software will have any
49804+ conflicts with the additional security measures. If you run a lot
49805+ of unusual software, or you are having problems with the higher
49806+ security levels, you should say Y here. With this option, the
49807+ following features are enabled:
49808+
49809+ - Linking restrictions
49810+ - FIFO restrictions
49811+ - Restricted dmesg
49812+ - Enforced chdir("/") on chroot
49813+ - Runtime module disabling
49814+
49815+config GRKERNSEC_MEDIUM
49816+ bool "Medium"
49817+ select PAX
49818+ select PAX_EI_PAX
49819+ select PAX_PT_PAX_FLAGS
49820+ select PAX_HAVE_ACL_FLAGS
49821+ select GRKERNSEC_PROC_MEMMAP if (PAX_NOEXEC || PAX_ASLR)
49822+ select GRKERNSEC_CHROOT
49823+ select GRKERNSEC_CHROOT_SYSCTL
49824+ select GRKERNSEC_LINK
49825+ select GRKERNSEC_FIFO
49826+ select GRKERNSEC_DMESG
49827+ select GRKERNSEC_RANDNET
49828+ select GRKERNSEC_FORKFAIL
49829+ select GRKERNSEC_TIME
49830+ select GRKERNSEC_SIGNAL
49831+ select GRKERNSEC_CHROOT
49832+ select GRKERNSEC_CHROOT_UNIX
49833+ select GRKERNSEC_CHROOT_MOUNT
49834+ select GRKERNSEC_CHROOT_PIVOT
49835+ select GRKERNSEC_CHROOT_DOUBLE
49836+ select GRKERNSEC_CHROOT_CHDIR
49837+ select GRKERNSEC_CHROOT_MKNOD
49838+ select GRKERNSEC_PROC
49839+ select GRKERNSEC_PROC_USERGROUP
49840+ select PAX_RANDUSTACK
49841+ select PAX_ASLR
49842+ select PAX_RANDMMAP
49843+ select PAX_REFCOUNT if (X86 || SPARC64)
49844+ select PAX_USERCOPY if ((X86 || SPARC || PPC || ARM) && (SLAB || SLUB || SLOB))
49845+
49846+ help
49847+ If you say Y here, several features in addition to those included
49848+ in the low additional security level will be enabled. These
49849+ features provide even more security to your system, though in rare
49850+ cases they may be incompatible with very old or poorly written
49851+ software. If you enable this option, make sure that your auth
49852+ service (identd) is running as gid 1001. With this option,
49853+ the following features (in addition to those provided in the
49854+ low additional security level) will be enabled:
49855+
49856+ - Failed fork logging
49857+ - Time change logging
49858+ - Signal logging
49859+ - Deny mounts in chroot
49860+ - Deny double chrooting
49861+ - Deny sysctl writes in chroot
49862+ - Deny mknod in chroot
49863+ - Deny access to abstract AF_UNIX sockets out of chroot
49864+ - Deny pivot_root in chroot
49865+ - Denied reads/writes of /dev/kmem, /dev/mem, and /dev/port
49866+ - /proc restrictions with special GID set to 10 (usually wheel)
49867+ - Address Space Layout Randomization (ASLR)
49868+ - Prevent exploitation of most refcount overflows
49869+ - Bounds checking of copying between the kernel and userland
49870+
49871+config GRKERNSEC_HIGH
49872+ bool "High"
49873+ select GRKERNSEC_LINK
49874+ select GRKERNSEC_FIFO
49875+ select GRKERNSEC_DMESG
49876+ select GRKERNSEC_FORKFAIL
49877+ select GRKERNSEC_TIME
49878+ select GRKERNSEC_SIGNAL
49879+ select GRKERNSEC_CHROOT
49880+ select GRKERNSEC_CHROOT_SHMAT
49881+ select GRKERNSEC_CHROOT_UNIX
49882+ select GRKERNSEC_CHROOT_MOUNT
49883+ select GRKERNSEC_CHROOT_FCHDIR
49884+ select GRKERNSEC_CHROOT_PIVOT
49885+ select GRKERNSEC_CHROOT_DOUBLE
49886+ select GRKERNSEC_CHROOT_CHDIR
49887+ select GRKERNSEC_CHROOT_MKNOD
49888+ select GRKERNSEC_CHROOT_CAPS
49889+ select GRKERNSEC_CHROOT_SYSCTL
49890+ select GRKERNSEC_CHROOT_FINDTASK
49891+ select GRKERNSEC_SYSFS_RESTRICT
49892+ select GRKERNSEC_PROC
49893+ select GRKERNSEC_PROC_MEMMAP if (PAX_NOEXEC || PAX_ASLR)
49894+ select GRKERNSEC_HIDESYM
49895+ select GRKERNSEC_BRUTE
49896+ select GRKERNSEC_PROC_USERGROUP
49897+ select GRKERNSEC_KMEM
49898+ select GRKERNSEC_RESLOG
49899+ select GRKERNSEC_RANDNET
49900+ select GRKERNSEC_PROC_ADD
49901+ select GRKERNSEC_CHROOT_CHMOD
49902+ select GRKERNSEC_CHROOT_NICE
49903+ select GRKERNSEC_SETXID
49904+ select GRKERNSEC_AUDIT_MOUNT
49905+ select GRKERNSEC_MODHARDEN if (MODULES)
49906+ select GRKERNSEC_HARDEN_PTRACE
49907+ select GRKERNSEC_PTRACE_READEXEC
49908+ select GRKERNSEC_VM86 if (X86_32)
49909+ select GRKERNSEC_KERN_LOCKOUT if (X86 || ARM || PPC || SPARC)
49910+ select PAX
49911+ select PAX_RANDUSTACK
49912+ select PAX_ASLR
49913+ select PAX_RANDMMAP
49914+ select PAX_NOEXEC
49915+ select PAX_MPROTECT
49916+ select PAX_EI_PAX
49917+ select PAX_PT_PAX_FLAGS
49918+ select PAX_HAVE_ACL_FLAGS
49919+ select PAX_KERNEXEC if ((PPC || X86) && (!X86_32 || X86_WP_WORKS_OK) && !XEN)
49920+ select PAX_MEMORY_UDEREF if (X86 && !XEN)
49921+ select PAX_RANDKSTACK if (X86_TSC && X86)
49922+ select PAX_SEGMEXEC if (X86_32)
49923+ select PAX_PAGEEXEC
49924+ select PAX_EMUPLT if (ALPHA || PARISC || SPARC)
49925+ select PAX_EMUTRAMP if (PARISC)
49926+ select PAX_EMUSIGRT if (PARISC)
49927+ select PAX_ETEXECRELOCS if (ALPHA || IA64 || PARISC)
49928+ select PAX_ELFRELOCS if (PAX_ETEXECRELOCS || (IA64 || PPC || X86))
49929+ select PAX_REFCOUNT if (X86 || SPARC64)
49930+ select PAX_USERCOPY if ((X86 || PPC || SPARC || ARM) && (SLAB || SLUB || SLOB))
49931+ help
49932+ If you say Y here, many of the features of grsecurity will be
49933+ enabled, which will protect you against many kinds of attacks
49934+ against your system. The heightened security comes at a cost
49935+ of an increased chance of incompatibilities with rare software
49936+ on your machine. Since this security level enables PaX, you should
49937+ view <http://pax.grsecurity.net> and read about the PaX
49938+ project. While you are there, download chpax and run it on
49939+ binaries that cause problems with PaX. Also remember that
49940+ since the /proc restrictions are enabled, you must run your
49941+ identd as gid 1001. This security level enables the following
49942+ features in addition to those listed in the low and medium
49943+ security levels:
49944+
49945+ - Additional /proc restrictions
49946+ - Chmod restrictions in chroot
49947+ - No signals, ptrace, or viewing of processes outside of chroot
49948+ - Capability restrictions in chroot
49949+ - Deny fchdir out of chroot
49950+ - Priority restrictions in chroot
49951+ - Segmentation-based implementation of PaX
49952+ - Mprotect restrictions
49953+ - Removal of addresses from /proc/<pid>/[smaps|maps|stat]
49954+ - Kernel stack randomization
49955+ - Mount/unmount/remount logging
49956+ - Kernel symbol hiding
49957+ - Hardening of module auto-loading
49958+ - Ptrace restrictions
49959+ - Restricted vm86 mode
49960+ - Restricted sysfs/debugfs
49961+ - Active kernel exploit response
49962+
49963+config GRKERNSEC_CUSTOM
49964+ bool "Custom"
49965+ help
49966+ If you say Y here, you will be able to configure every grsecurity
49967+ option, which allows you to enable many more features that aren't
49968+ covered in the basic security levels. These additional features
49969+ include TPE, socket restrictions, and the sysctl system for
49970+ grsecurity. It is advised that you read through the help for
49971+ each option to determine its usefulness in your situation.
49972+
49973+endchoice
49974+
49975+menu "Memory Protections"
49976+depends on GRKERNSEC
49977+
49978+config GRKERNSEC_KMEM
49979+ bool "Deny reading/writing to /dev/kmem, /dev/mem, and /dev/port"
49980+ select STRICT_DEVMEM if (X86 || ARM || TILE || S390)
49981+ help
49982+ If you say Y here, /dev/kmem and /dev/mem won't be allowed to
49983+ be written to or read from to modify or leak the contents of the running
49984+ kernel. /dev/port will also not be allowed to be opened. If you have module
49985+ support disabled, enabling this will close up four ways that are
49986+ currently used to insert malicious code into the running kernel.
49987+ Even with all these features enabled, we still highly recommend that
49988+ you use the RBAC system, as it is still possible for an attacker to
49989+ modify the running kernel through privileged I/O granted by ioperm/iopl.
49990+ If you are not using XFree86, you may be able to stop this additional
49991+ case by enabling the 'Disable privileged I/O' option. Though nothing
49992+ legitimately writes to /dev/kmem, XFree86 does need to write to /dev/mem,
49993+ but only to video memory, which is the only writing we allow in this
49994+ case. If /dev/kmem or /dev/mem are mmaped without PROT_WRITE, they will
49995+ not be allowed to mprotect it with PROT_WRITE later.
49996+ It is highly recommended that you say Y here if you meet all the
49997+ conditions above.
49998+
49999+config GRKERNSEC_VM86
50000+ bool "Restrict VM86 mode"
50001+ depends on X86_32
50002+
50003+ help
50004+ If you say Y here, only processes with CAP_SYS_RAWIO will be able to
50005+ make use of a special execution mode on 32bit x86 processors called
50006+ Virtual 8086 (VM86) mode. XFree86 may need vm86 mode for certain
50007+ video cards and will still work with this option enabled. The purpose
50008+ of the option is to prevent exploitation of emulation errors in
50009+ virtualization of vm86 mode like the one discovered in VMWare in 2009.
50010+ Nearly all users should be able to enable this option.
50011+
50012+config GRKERNSEC_IO
50013+ bool "Disable privileged I/O"
50014+ depends on X86
50015+ select RTC_CLASS
50016+ select RTC_INTF_DEV
50017+ select RTC_DRV_CMOS
50018+
50019+ help
50020+ If you say Y here, all ioperm and iopl calls will return an error.
50021+ Ioperm and iopl can be used to modify the running kernel.
50022+ Unfortunately, some programs need this access to operate properly,
50023+ the most notable of which are XFree86 and hwclock. hwclock can be
50024+ remedied by having RTC support in the kernel, so real-time
50025+ clock support is enabled if this option is enabled, to ensure
50026+ that hwclock operates correctly. XFree86 still will not
50027+ operate correctly with this option enabled, so DO NOT CHOOSE Y
50028+ IF YOU USE XFree86. If you use XFree86 and you still want to
50029+ protect your kernel against modification, use the RBAC system.
50030+
50031+config GRKERNSEC_PROC_MEMMAP
50032+ bool "Harden ASLR against information leaks and entropy reduction"
50033+ default y if (PAX_NOEXEC || PAX_ASLR)
50034+ depends on PAX_NOEXEC || PAX_ASLR
50035+ help
50036+ If you say Y here, the /proc/<pid>/maps and /proc/<pid>/stat files will
50037+ give no information about the addresses of its mappings if
50038+ PaX features that rely on random addresses are enabled on the task.
50039+ In addition to sanitizing this information and disabling other
50040+ dangerous sources of information, this option causes reads of sensitive
50041+ /proc/<pid> entries where the file descriptor was opened in a different
50042+ task than the one performing the read. Such attempts are logged.
50043+ This option also limits argv/env strings for suid/sgid binaries
50044+ to 512KB to prevent a complete exhaustion of the stack entropy provided
50045+ by ASLR. Finally, it places an 8MB stack resource limit on suid/sgid
50046+ binaries to prevent alternative mmap layouts from being abused.
50047+
50048+ If you use PaX it is essential that you say Y here as it closes up
50049+ several holes that make full ASLR useless locally.
50050+
50051+config GRKERNSEC_BRUTE
50052+ bool "Deter exploit bruteforcing"
50053+ help
50054+ If you say Y here, attempts to bruteforce exploits against forking
50055+ daemons such as apache or sshd, as well as against suid/sgid binaries
50056+ will be deterred. When a child of a forking daemon is killed by PaX
50057+ or crashes due to an illegal instruction or other suspicious signal,
50058+ the parent process will be delayed 30 seconds upon every subsequent
50059+ fork until the administrator is able to assess the situation and
50060+ restart the daemon.
50061+ In the suid/sgid case, the attempt is logged, the user has all their
50062+ processes terminated, and they are prevented from executing any further
50063+ processes for 15 minutes.
50064+ It is recommended that you also enable signal logging in the auditing
50065+ section so that logs are generated when a process triggers a suspicious
50066+ signal.
50067+ If the sysctl option is enabled, a sysctl option with name
50068+ "deter_bruteforce" is created.
50069+
50070+
50071+config GRKERNSEC_MODHARDEN
50072+ bool "Harden module auto-loading"
50073+ depends on MODULES
50074+ help
50075+ If you say Y here, module auto-loading in response to use of some
50076+ feature implemented by an unloaded module will be restricted to
50077+ root users. Enabling this option helps defend against attacks
50078+ by unprivileged users who abuse the auto-loading behavior to
50079+ cause a vulnerable module to load that is then exploited.
50080+
50081+ If this option prevents a legitimate use of auto-loading for a
50082+ non-root user, the administrator can execute modprobe manually
50083+ with the exact name of the module mentioned in the alert log.
50084+ Alternatively, the administrator can add the module to the list
50085+ of modules loaded at boot by modifying init scripts.
50086+
50087+ Modification of init scripts will most likely be needed on
50088+ Ubuntu servers with encrypted home directory support enabled,
50089+ as the first non-root user logging in will cause the ecb(aes),
50090+ ecb(aes)-all, cbc(aes), and cbc(aes)-all modules to be loaded.
50091+
50092+config GRKERNSEC_HIDESYM
50093+ bool "Hide kernel symbols"
50094+ help
50095+ If you say Y here, getting information on loaded modules, and
50096+ displaying all kernel symbols through a syscall will be restricted
50097+ to users with CAP_SYS_MODULE. For software compatibility reasons,
50098+ /proc/kallsyms will be restricted to the root user. The RBAC
50099+ system can hide that entry even from root.
50100+
50101+ This option also prevents leaking of kernel addresses through
50102+ several /proc entries.
50103+
50104+ Note that this option is only effective provided the following
50105+ conditions are met:
50106+ 1) The kernel using grsecurity is not precompiled by some distribution
50107+ 2) You have also enabled GRKERNSEC_DMESG
50108+ 3) You are using the RBAC system and hiding other files such as your
50109+ kernel image and System.map. Alternatively, enabling this option
50110+ causes the permissions on /boot, /lib/modules, and the kernel
50111+ source directory to change at compile time to prevent
50112+ reading by non-root users.
50113+ If the above conditions are met, this option will aid in providing a
50114+ useful protection against local kernel exploitation of overflows
50115+ and arbitrary read/write vulnerabilities.
50116+
50117+config GRKERNSEC_KERN_LOCKOUT
50118+ bool "Active kernel exploit response"
50119+ depends on X86 || ARM || PPC || SPARC
50120+ help
50121+ If you say Y here, when a PaX alert is triggered due to suspicious
50122+ activity in the kernel (from KERNEXEC/UDEREF/USERCOPY)
50123+ or an OOPs occurs due to bad memory accesses, instead of just
50124+ terminating the offending process (and potentially allowing
50125+ a subsequent exploit from the same user), we will take one of two
50126+ actions:
50127+ If the user was root, we will panic the system
50128+ If the user was non-root, we will log the attempt, terminate
50129+ all processes owned by the user, then prevent them from creating
50130+ any new processes until the system is restarted
50131+ This deters repeated kernel exploitation/bruteforcing attempts
50132+ and is useful for later forensics.
50133+
50134+endmenu
50135+menu "Role Based Access Control Options"
50136+depends on GRKERNSEC
50137+
50138+config GRKERNSEC_RBAC_DEBUG
50139+ bool
50140+
50141+config GRKERNSEC_NO_RBAC
50142+ bool "Disable RBAC system"
50143+ help
50144+ If you say Y here, the /dev/grsec device will be removed from the kernel,
50145+ preventing the RBAC system from being enabled. You should only say Y
50146+ here if you have no intention of using the RBAC system, so as to prevent
50147+ an attacker with root access from misusing the RBAC system to hide files
50148+ and processes when loadable module support and /dev/[k]mem have been
50149+ locked down.
50150+
50151+config GRKERNSEC_ACL_HIDEKERN
50152+ bool "Hide kernel processes"
50153+ help
50154+ If you say Y here, all kernel threads will be hidden to all
50155+ processes but those whose subject has the "view hidden processes"
50156+ flag.
50157+
50158+config GRKERNSEC_ACL_MAXTRIES
50159+ int "Maximum tries before password lockout"
50160+ default 3
50161+ help
50162+ This option enforces the maximum number of times a user can attempt
50163+ to authorize themselves with the grsecurity RBAC system before being
50164+ denied the ability to attempt authorization again for a specified time.
50165+ The lower the number, the harder it will be to brute-force a password.
50166+
50167+config GRKERNSEC_ACL_TIMEOUT
50168+ int "Time to wait after max password tries, in seconds"
50169+ default 30
50170+ help
50171+ This option specifies the time the user must wait after attempting to
50172+ authorize to the RBAC system with the maximum number of invalid
50173+ passwords. The higher the number, the harder it will be to brute-force
50174+ a password.
50175+
50176+endmenu
50177+menu "Filesystem Protections"
50178+depends on GRKERNSEC
50179+
50180+config GRKERNSEC_PROC
50181+ bool "Proc restrictions"
50182+ help
50183+ If you say Y here, the permissions of the /proc filesystem
50184+ will be altered to enhance system security and privacy. You MUST
50185+ choose either a user only restriction or a user and group restriction.
50186+ Depending upon the option you choose, you can either restrict users to
50187+ see only the processes they themselves run, or choose a group that can
50188+ view all processes and files normally restricted to root if you choose
50189+ the "restrict to user only" option. NOTE: If you're running identd or
50190+ ntpd as a non-root user, you will have to run it as the group you
50191+ specify here.
50192+
50193+config GRKERNSEC_PROC_USER
50194+ bool "Restrict /proc to user only"
50195+ depends on GRKERNSEC_PROC
50196+ help
50197+ If you say Y here, non-root users will only be able to view their own
50198+ processes, and restricts them from viewing network-related information,
50199+ and viewing kernel symbol and module information.
50200+
50201+config GRKERNSEC_PROC_USERGROUP
50202+ bool "Allow special group"
50203+ depends on GRKERNSEC_PROC && !GRKERNSEC_PROC_USER
50204+ help
50205+ If you say Y here, you will be able to select a group that will be
50206+ able to view all processes and network-related information. If you've
50207+ enabled GRKERNSEC_HIDESYM, kernel and symbol information may still
50208+ remain hidden. This option is useful if you want to run identd as
50209+ a non-root user.
50210+
50211+config GRKERNSEC_PROC_GID
50212+ int "GID for special group"
50213+ depends on GRKERNSEC_PROC_USERGROUP
50214+ default 1001
50215+
50216+config GRKERNSEC_PROC_ADD
50217+ bool "Additional restrictions"
50218+ depends on GRKERNSEC_PROC_USER || GRKERNSEC_PROC_USERGROUP
50219+ help
50220+ If you say Y here, additional restrictions will be placed on
50221+ /proc that keep normal users from viewing device information and
50222+ slabinfo information that could be useful for exploits.
50223+
50224+config GRKERNSEC_LINK
50225+ bool "Linking restrictions"
50226+ help
50227+ If you say Y here, /tmp race exploits will be prevented, since users
50228+ will no longer be able to follow symlinks owned by other users in
50229+ world-writable +t directories (e.g. /tmp), unless the owner of the
50230+ symlink is the owner of the directory. users will also not be
50231+ able to hardlink to files they do not own. If the sysctl option is
50232+ enabled, a sysctl option with name "linking_restrictions" is created.
50233+
50234+config GRKERNSEC_FIFO
50235+ bool "FIFO restrictions"
50236+ help
50237+ If you say Y here, users will not be able to write to FIFOs they don't
50238+ own in world-writable +t directories (e.g. /tmp), unless the owner of
50239+ the FIFO is the same owner of the directory it's held in. If the sysctl
50240+ option is enabled, a sysctl option with name "fifo_restrictions" is
50241+ created.
50242+
50243+config GRKERNSEC_SYSFS_RESTRICT
50244+ bool "Sysfs/debugfs restriction"
50245+ depends on SYSFS
50246+ help
50247+ If you say Y here, sysfs (the pseudo-filesystem mounted at /sys) and
50248+ any filesystem normally mounted under it (e.g. debugfs) will be
50249+ mostly accessible only by root. These filesystems generally provide access
50250+ to hardware and debug information that isn't appropriate for unprivileged
50251+ users of the system. Sysfs and debugfs have also become a large source
50252+ of new vulnerabilities, ranging from infoleaks to local compromise.
50253+ There has been very little oversight with an eye toward security involved
50254+ in adding new exporters of information to these filesystems, so their
50255+ use is discouraged.
50256+ For reasons of compatibility, a few directories have been whitelisted
50257+ for access by non-root users:
50258+ /sys/fs/selinux
50259+ /sys/fs/fuse
50260+ /sys/devices/system/cpu
50261+
50262+config GRKERNSEC_ROFS
50263+ bool "Runtime read-only mount protection"
50264+ help
50265+ If you say Y here, a sysctl option with name "romount_protect" will
50266+ be created. By setting this option to 1 at runtime, filesystems
50267+ will be protected in the following ways:
50268+ * No new writable mounts will be allowed
50269+ * Existing read-only mounts won't be able to be remounted read/write
50270+ * Write operations will be denied on all block devices
50271+ This option acts independently of grsec_lock: once it is set to 1,
50272+ it cannot be turned off. Therefore, please be mindful of the resulting
50273+ behavior if this option is enabled in an init script on a read-only
50274+ filesystem. This feature is mainly intended for secure embedded systems.
50275+
50276+config GRKERNSEC_CHROOT
50277+ bool "Chroot jail restrictions"
50278+ help
50279+ If you say Y here, you will be able to choose several options that will
50280+ make breaking out of a chrooted jail much more difficult. If you
50281+ encounter no software incompatibilities with the following options, it
50282+ is recommended that you enable each one.
50283+
50284+config GRKERNSEC_CHROOT_MOUNT
50285+ bool "Deny mounts"
50286+ depends on GRKERNSEC_CHROOT
50287+ help
50288+ If you say Y here, processes inside a chroot will not be able to
50289+ mount or remount filesystems. If the sysctl option is enabled, a
50290+ sysctl option with name "chroot_deny_mount" is created.
50291+
50292+config GRKERNSEC_CHROOT_DOUBLE
50293+ bool "Deny double-chroots"
50294+ depends on GRKERNSEC_CHROOT
50295+ help
50296+ If you say Y here, processes inside a chroot will not be able to chroot
50297+ again outside the chroot. This is a widely used method of breaking
50298+ out of a chroot jail and should not be allowed. If the sysctl
50299+ option is enabled, a sysctl option with name
50300+ "chroot_deny_chroot" is created.
50301+
50302+config GRKERNSEC_CHROOT_PIVOT
50303+ bool "Deny pivot_root in chroot"
50304+ depends on GRKERNSEC_CHROOT
50305+ help
50306+ If you say Y here, processes inside a chroot will not be able to use
50307+ a function called pivot_root() that was introduced in Linux 2.3.41. It
50308+ works similar to chroot in that it changes the root filesystem. This
50309+ function could be misused in a chrooted process to attempt to break out
50310+ of the chroot, and therefore should not be allowed. If the sysctl
50311+ option is enabled, a sysctl option with name "chroot_deny_pivot" is
50312+ created.
50313+
50314+config GRKERNSEC_CHROOT_CHDIR
50315+ bool "Enforce chdir(\"/\") on all chroots"
50316+ depends on GRKERNSEC_CHROOT
50317+ help
50318+ If you say Y here, the current working directory of all newly-chrooted
50319+ applications will be set to the the root directory of the chroot.
50320+ The man page on chroot(2) states:
50321+ Note that this call does not change the current working
50322+ directory, so that `.' can be outside the tree rooted at
50323+ `/'. In particular, the super-user can escape from a
50324+ `chroot jail' by doing `mkdir foo; chroot foo; cd ..'.
50325+
50326+ It is recommended that you say Y here, since it's not known to break
50327+ any software. If the sysctl option is enabled, a sysctl option with
50328+ name "chroot_enforce_chdir" is created.
50329+
50330+config GRKERNSEC_CHROOT_CHMOD
50331+ bool "Deny (f)chmod +s"
50332+ depends on GRKERNSEC_CHROOT
50333+ help
50334+ If you say Y here, processes inside a chroot will not be able to chmod
50335+ or fchmod files to make them have suid or sgid bits. This protects
50336+ against another published method of breaking a chroot. If the sysctl
50337+ option is enabled, a sysctl option with name "chroot_deny_chmod" is
50338+ created.
50339+
50340+config GRKERNSEC_CHROOT_FCHDIR
50341+ bool "Deny fchdir out of chroot"
50342+ depends on GRKERNSEC_CHROOT
50343+ help
50344+ If you say Y here, a well-known method of breaking chroots by fchdir'ing
50345+ to a file descriptor of the chrooting process that points to a directory
50346+ outside the filesystem will be stopped. If the sysctl option
50347+ is enabled, a sysctl option with name "chroot_deny_fchdir" is created.
50348+
50349+config GRKERNSEC_CHROOT_MKNOD
50350+ bool "Deny mknod"
50351+ depends on GRKERNSEC_CHROOT
50352+ help
50353+ If you say Y here, processes inside a chroot will not be allowed to
50354+ mknod. The problem with using mknod inside a chroot is that it
50355+ would allow an attacker to create a device entry that is the same
50356+ as one on the physical root of your system, which could range from
50357+ anything from the console device to a device for your harddrive (which
50358+ they could then use to wipe the drive or steal data). It is recommended
50359+ that you say Y here, unless you run into software incompatibilities.
50360+ If the sysctl option is enabled, a sysctl option with name
50361+ "chroot_deny_mknod" is created.
50362+
50363+config GRKERNSEC_CHROOT_SHMAT
50364+ bool "Deny shmat() out of chroot"
50365+ depends on GRKERNSEC_CHROOT
50366+ help
50367+ If you say Y here, processes inside a chroot will not be able to attach
50368+ to shared memory segments that were created outside of the chroot jail.
50369+ It is recommended that you say Y here. If the sysctl option is enabled,
50370+ a sysctl option with name "chroot_deny_shmat" is created.
50371+
50372+config GRKERNSEC_CHROOT_UNIX
50373+ bool "Deny access to abstract AF_UNIX sockets out of chroot"
50374+ depends on GRKERNSEC_CHROOT
50375+ help
50376+ If you say Y here, processes inside a chroot will not be able to
50377+ connect to abstract (meaning not belonging to a filesystem) Unix
50378+ domain sockets that were bound outside of a chroot. It is recommended
50379+ that you say Y here. If the sysctl option is enabled, a sysctl option
50380+ with name "chroot_deny_unix" is created.
50381+
50382+config GRKERNSEC_CHROOT_FINDTASK
50383+ bool "Protect outside processes"
50384+ depends on GRKERNSEC_CHROOT
50385+ help
50386+ If you say Y here, processes inside a chroot will not be able to
50387+ kill, send signals with fcntl, ptrace, capget, getpgid, setpgid,
50388+ getsid, or view any process outside of the chroot. If the sysctl
50389+ option is enabled, a sysctl option with name "chroot_findtask" is
50390+ created.
50391+
50392+config GRKERNSEC_CHROOT_NICE
50393+ bool "Restrict priority changes"
50394+ depends on GRKERNSEC_CHROOT
50395+ help
50396+ If you say Y here, processes inside a chroot will not be able to raise
50397+ the priority of processes in the chroot, or alter the priority of
50398+ processes outside the chroot. This provides more security than simply
50399+ removing CAP_SYS_NICE from the process' capability set. If the
50400+ sysctl option is enabled, a sysctl option with name "chroot_restrict_nice"
50401+ is created.
50402+
50403+config GRKERNSEC_CHROOT_SYSCTL
50404+ bool "Deny sysctl writes"
50405+ depends on GRKERNSEC_CHROOT
50406+ help
50407+ If you say Y here, an attacker in a chroot will not be able to
50408+ write to sysctl entries, either by sysctl(2) or through a /proc
50409+ interface. It is strongly recommended that you say Y here. If the
50410+ sysctl option is enabled, a sysctl option with name
50411+ "chroot_deny_sysctl" is created.
50412+
50413+config GRKERNSEC_CHROOT_CAPS
50414+ bool "Capability restrictions"
50415+ depends on GRKERNSEC_CHROOT
50416+ help
50417+ If you say Y here, the capabilities on all processes within a
50418+ chroot jail will be lowered to stop module insertion, raw i/o,
50419+ system and net admin tasks, rebooting the system, modifying immutable
50420+ files, modifying IPC owned by another, and changing the system time.
50421+ This is left an option because it can break some apps. Disable this
50422+ if your chrooted apps are having problems performing those kinds of
50423+ tasks. If the sysctl option is enabled, a sysctl option with
50424+ name "chroot_caps" is created.
50425+
50426+endmenu
50427+menu "Kernel Auditing"
50428+depends on GRKERNSEC
50429+
50430+config GRKERNSEC_AUDIT_GROUP
50431+ bool "Single group for auditing"
50432+ help
50433+ If you say Y here, the exec, chdir, and (un)mount logging features
50434+ will only operate on a group you specify. This option is recommended
50435+ if you only want to watch certain users instead of having a large
50436+ amount of logs from the entire system. If the sysctl option is enabled,
50437+ a sysctl option with name "audit_group" is created.
50438+
50439+config GRKERNSEC_AUDIT_GID
50440+ int "GID for auditing"
50441+ depends on GRKERNSEC_AUDIT_GROUP
50442+ default 1007
50443+
50444+config GRKERNSEC_EXECLOG
50445+ bool "Exec logging"
50446+ help
50447+ If you say Y here, all execve() calls will be logged (since the
50448+ other exec*() calls are frontends to execve(), all execution
50449+ will be logged). Useful for shell-servers that like to keep track
50450+ of their users. If the sysctl option is enabled, a sysctl option with
50451+ name "exec_logging" is created.
50452+ WARNING: This option when enabled will produce a LOT of logs, especially
50453+ on an active system.
50454+
50455+config GRKERNSEC_RESLOG
50456+ bool "Resource logging"
50457+ help
50458+ If you say Y here, all attempts to overstep resource limits will
50459+ be logged with the resource name, the requested size, and the current
50460+ limit. It is highly recommended that you say Y here. If the sysctl
50461+ option is enabled, a sysctl option with name "resource_logging" is
50462+ created. If the RBAC system is enabled, the sysctl value is ignored.
50463+
50464+config GRKERNSEC_CHROOT_EXECLOG
50465+ bool "Log execs within chroot"
50466+ help
50467+ If you say Y here, all executions inside a chroot jail will be logged
50468+ to syslog. This can cause a large amount of logs if certain
50469+ applications (eg. djb's daemontools) are installed on the system, and
50470+ is therefore left as an option. If the sysctl option is enabled, a
50471+ sysctl option with name "chroot_execlog" is created.
50472+
50473+config GRKERNSEC_AUDIT_PTRACE
50474+ bool "Ptrace logging"
50475+ help
50476+ If you say Y here, all attempts to attach to a process via ptrace
50477+ will be logged. If the sysctl option is enabled, a sysctl option
50478+ with name "audit_ptrace" is created.
50479+
50480+config GRKERNSEC_AUDIT_CHDIR
50481+ bool "Chdir logging"
50482+ help
50483+ If you say Y here, all chdir() calls will be logged. If the sysctl
50484+ option is enabled, a sysctl option with name "audit_chdir" is created.
50485+
50486+config GRKERNSEC_AUDIT_MOUNT
50487+ bool "(Un)Mount logging"
50488+ help
50489+ If you say Y here, all mounts and unmounts will be logged. If the
50490+ sysctl option is enabled, a sysctl option with name "audit_mount" is
50491+ created.
50492+
50493+config GRKERNSEC_SIGNAL
50494+ bool "Signal logging"
50495+ help
50496+ If you say Y here, certain important signals will be logged, such as
50497+ SIGSEGV, which will as a result inform you of when a error in a program
50498+ occurred, which in some cases could mean a possible exploit attempt.
50499+ If the sysctl option is enabled, a sysctl option with name
50500+ "signal_logging" is created.
50501+
50502+config GRKERNSEC_FORKFAIL
50503+ bool "Fork failure logging"
50504+ help
50505+ If you say Y here, all failed fork() attempts will be logged.
50506+ This could suggest a fork bomb, or someone attempting to overstep
50507+ their process limit. If the sysctl option is enabled, a sysctl option
50508+ with name "forkfail_logging" is created.
50509+
50510+config GRKERNSEC_TIME
50511+ bool "Time change logging"
50512+ help
50513+ If you say Y here, any changes of the system clock will be logged.
50514+ If the sysctl option is enabled, a sysctl option with name
50515+ "timechange_logging" is created.
50516+
50517+config GRKERNSEC_PROC_IPADDR
50518+ bool "/proc/<pid>/ipaddr support"
50519+ help
50520+ If you say Y here, a new entry will be added to each /proc/<pid>
50521+ directory that contains the IP address of the person using the task.
50522+ The IP is carried across local TCP and AF_UNIX stream sockets.
50523+ This information can be useful for IDS/IPSes to perform remote response
50524+ to a local attack. The entry is readable by only the owner of the
50525+ process (and root if he has CAP_DAC_OVERRIDE, which can be removed via
50526+ the RBAC system), and thus does not create privacy concerns.
50527+
50528+config GRKERNSEC_RWXMAP_LOG
50529+ bool 'Denied RWX mmap/mprotect logging'
50530+ depends on PAX_MPROTECT && !PAX_EMUPLT && !PAX_EMUSIGRT
50531+ help
50532+ If you say Y here, calls to mmap() and mprotect() with explicit
50533+ usage of PROT_WRITE and PROT_EXEC together will be logged when
50534+ denied by the PAX_MPROTECT feature. If the sysctl option is
50535+ enabled, a sysctl option with name "rwxmap_logging" is created.
50536+
50537+config GRKERNSEC_AUDIT_TEXTREL
50538+ bool 'ELF text relocations logging (READ HELP)'
50539+ depends on PAX_MPROTECT
50540+ help
50541+ If you say Y here, text relocations will be logged with the filename
50542+ of the offending library or binary. The purpose of the feature is
50543+ to help Linux distribution developers get rid of libraries and
50544+ binaries that need text relocations which hinder the future progress
50545+ of PaX. Only Linux distribution developers should say Y here, and
50546+ never on a production machine, as this option creates an information
50547+ leak that could aid an attacker in defeating the randomization of
50548+ a single memory region. If the sysctl option is enabled, a sysctl
50549+ option with name "audit_textrel" is created.
50550+
50551+endmenu
50552+
50553+menu "Executable Protections"
50554+depends on GRKERNSEC
50555+
50556+config GRKERNSEC_DMESG
50557+ bool "Dmesg(8) restriction"
50558+ help
50559+ If you say Y here, non-root users will not be able to use dmesg(8)
50560+ to view up to the last 4kb of messages in the kernel's log buffer.
50561+ The kernel's log buffer often contains kernel addresses and other
50562+ identifying information useful to an attacker in fingerprinting a
50563+ system for a targeted exploit.
50564+ If the sysctl option is enabled, a sysctl option with name "dmesg" is
50565+ created.
50566+
50567+config GRKERNSEC_HARDEN_PTRACE
50568+ bool "Deter ptrace-based process snooping"
50569+ help
50570+ If you say Y here, TTY sniffers and other malicious monitoring
50571+ programs implemented through ptrace will be defeated. If you
50572+ have been using the RBAC system, this option has already been
50573+ enabled for several years for all users, with the ability to make
50574+ fine-grained exceptions.
50575+
50576+ This option only affects the ability of non-root users to ptrace
50577+ processes that are not a descendent of the ptracing process.
50578+ This means that strace ./binary and gdb ./binary will still work,
50579+ but attaching to arbitrary processes will not. If the sysctl
50580+ option is enabled, a sysctl option with name "harden_ptrace" is
50581+ created.
50582+
50583+config GRKERNSEC_PTRACE_READEXEC
50584+ bool "Require read access to ptrace sensitive binaries"
50585+ help
50586+ If you say Y here, unprivileged users will not be able to ptrace unreadable
50587+ binaries. This option is useful in environments that
50588+ remove the read bits (e.g. file mode 4711) from suid binaries to
50589+ prevent infoleaking of their contents. This option adds
50590+ consistency to the use of that file mode, as the binary could normally
50591+ be read out when run without privileges while ptracing.
50592+
50593+ If the sysctl option is enabled, a sysctl option with name "ptrace_readexec"
50594+ is created.
50595+
50596+config GRKERNSEC_SETXID
50597+ bool "Enforce consistent multithreaded privileges"
50598+ help
50599+ If you say Y here, a change from a root uid to a non-root uid
50600+ in a multithreaded application will cause the resulting uids,
50601+ gids, supplementary groups, and capabilities in that thread
50602+ to be propagated to the other threads of the process. In most
50603+ cases this is unnecessary, as glibc will emulate this behavior
50604+ on behalf of the application. Other libcs do not act in the
50605+ same way, allowing the other threads of the process to continue
50606+ running with root privileges. If the sysctl option is enabled,
50607+ a sysctl option with name "consistent_setxid" is created.
50608+
50609+config GRKERNSEC_TPE
50610+ bool "Trusted Path Execution (TPE)"
50611+ help
50612+ If you say Y here, you will be able to choose a gid to add to the
50613+ supplementary groups of users you want to mark as "untrusted."
50614+ These users will not be able to execute any files that are not in
50615+ root-owned directories writable only by root. If the sysctl option
50616+ is enabled, a sysctl option with name "tpe" is created.
50617+
50618+config GRKERNSEC_TPE_ALL
50619+ bool "Partially restrict all non-root users"
50620+ depends on GRKERNSEC_TPE
50621+ help
50622+ If you say Y here, all non-root users will be covered under
50623+ a weaker TPE restriction. This is separate from, and in addition to,
50624+ the main TPE options that you have selected elsewhere. Thus, if a
50625+ "trusted" GID is chosen, this restriction applies to even that GID.
50626+ Under this restriction, all non-root users will only be allowed to
50627+ execute files in directories they own that are not group or
50628+ world-writable, or in directories owned by root and writable only by
50629+ root. If the sysctl option is enabled, a sysctl option with name
50630+ "tpe_restrict_all" is created.
50631+
50632+config GRKERNSEC_TPE_INVERT
50633+ bool "Invert GID option"
50634+ depends on GRKERNSEC_TPE
50635+ help
50636+ If you say Y here, the group you specify in the TPE configuration will
50637+ decide what group TPE restrictions will be *disabled* for. This
50638+ option is useful if you want TPE restrictions to be applied to most
50639+ users on the system. If the sysctl option is enabled, a sysctl option
50640+ with name "tpe_invert" is created. Unlike other sysctl options, this
50641+ entry will default to on for backward-compatibility.
50642+
50643+config GRKERNSEC_TPE_GID
50644+ int "GID for untrusted users"
50645+ depends on GRKERNSEC_TPE && !GRKERNSEC_TPE_INVERT
50646+ default 1005
50647+ help
50648+ Setting this GID determines what group TPE restrictions will be
50649+ *enabled* for. If the sysctl option is enabled, a sysctl option
50650+ with name "tpe_gid" is created.
50651+
50652+config GRKERNSEC_TPE_GID
50653+ int "GID for trusted users"
50654+ depends on GRKERNSEC_TPE && GRKERNSEC_TPE_INVERT
50655+ default 1005
50656+ help
50657+ Setting this GID determines what group TPE restrictions will be
50658+ *disabled* for. If the sysctl option is enabled, a sysctl option
50659+ with name "tpe_gid" is created.
50660+
50661+endmenu
50662+menu "Network Protections"
50663+depends on GRKERNSEC
50664+
50665+config GRKERNSEC_RANDNET
50666+ bool "Larger entropy pools"
50667+ help
50668+ If you say Y here, the entropy pools used for many features of Linux
50669+ and grsecurity will be doubled in size. Since several grsecurity
50670+ features use additional randomness, it is recommended that you say Y
50671+ here. Saying Y here has a similar effect as modifying
50672+ /proc/sys/kernel/random/poolsize.
50673+
50674+config GRKERNSEC_BLACKHOLE
50675+ bool "TCP/UDP blackhole and LAST_ACK DoS prevention"
50676+ depends on NET
50677+ help
50678+ If you say Y here, neither TCP resets nor ICMP
50679+ destination-unreachable packets will be sent in response to packets
50680+ sent to ports for which no associated listening process exists.
50681+ This feature supports both IPV4 and IPV6 and exempts the
50682+ loopback interface from blackholing. Enabling this feature
50683+ makes a host more resilient to DoS attacks and reduces network
50684+ visibility against scanners.
50685+
50686+ The blackhole feature as-implemented is equivalent to the FreeBSD
50687+ blackhole feature, as it prevents RST responses to all packets, not
50688+ just SYNs. Under most application behavior this causes no
50689+ problems, but applications (like haproxy) may not close certain
50690+ connections in a way that cleanly terminates them on the remote
50691+ end, leaving the remote host in LAST_ACK state. Because of this
50692+ side-effect and to prevent intentional LAST_ACK DoSes, this
50693+ feature also adds automatic mitigation against such attacks.
50694+ The mitigation drastically reduces the amount of time a socket
50695+ can spend in LAST_ACK state. If you're using haproxy and not
50696+ all servers it connects to have this option enabled, consider
50697+ disabling this feature on the haproxy host.
50698+
50699+ If the sysctl option is enabled, two sysctl options with names
50700+ "ip_blackhole" and "lastack_retries" will be created.
50701+ While "ip_blackhole" takes the standard zero/non-zero on/off
50702+ toggle, "lastack_retries" uses the same kinds of values as
50703+ "tcp_retries1" and "tcp_retries2". The default value of 4
50704+ prevents a socket from lasting more than 45 seconds in LAST_ACK
50705+ state.
50706+
50707+config GRKERNSEC_SOCKET
50708+ bool "Socket restrictions"
50709+ depends on NET
50710+ help
50711+ If you say Y here, you will be able to choose from several options.
50712+ If you assign a GID on your system and add it to the supplementary
50713+ groups of users you want to restrict socket access to, this patch
50714+ will perform up to three things, based on the option(s) you choose.
50715+
50716+config GRKERNSEC_SOCKET_ALL
50717+ bool "Deny any sockets to group"
50718+ depends on GRKERNSEC_SOCKET
50719+ help
50720+ If you say Y here, you will be able to choose a GID of whose users will
50721+ be unable to connect to other hosts from your machine or run server
50722+ applications from your machine. If the sysctl option is enabled, a
50723+ sysctl option with name "socket_all" is created.
50724+
50725+config GRKERNSEC_SOCKET_ALL_GID
50726+ int "GID to deny all sockets for"
50727+ depends on GRKERNSEC_SOCKET_ALL
50728+ default 1004
50729+ help
50730+ Here you can choose the GID to disable socket access for. Remember to
50731+ add the users you want socket access disabled for to the GID
50732+ specified here. If the sysctl option is enabled, a sysctl option
50733+ with name "socket_all_gid" is created.
50734+
50735+config GRKERNSEC_SOCKET_CLIENT
50736+ bool "Deny client sockets to group"
50737+ depends on GRKERNSEC_SOCKET
50738+ help
50739+ If you say Y here, you will be able to choose a GID of whose users will
50740+ be unable to connect to other hosts from your machine, but will be
50741+ able to run servers. If this option is enabled, all users in the group
50742+ you specify will have to use passive mode when initiating ftp transfers
50743+ from the shell on your machine. If the sysctl option is enabled, a
50744+ sysctl option with name "socket_client" is created.
50745+
50746+config GRKERNSEC_SOCKET_CLIENT_GID
50747+ int "GID to deny client sockets for"
50748+ depends on GRKERNSEC_SOCKET_CLIENT
50749+ default 1003
50750+ help
50751+ Here you can choose the GID to disable client socket access for.
50752+ Remember to add the users you want client socket access disabled for to
50753+ the GID specified here. If the sysctl option is enabled, a sysctl
50754+ option with name "socket_client_gid" is created.
50755+
50756+config GRKERNSEC_SOCKET_SERVER
50757+ bool "Deny server sockets to group"
50758+ depends on GRKERNSEC_SOCKET
50759+ help
50760+ If you say Y here, you will be able to choose a GID of whose users will
50761+ be unable to run server applications from your machine. If the sysctl
50762+ option is enabled, a sysctl option with name "socket_server" is created.
50763+
50764+config GRKERNSEC_SOCKET_SERVER_GID
50765+ int "GID to deny server sockets for"
50766+ depends on GRKERNSEC_SOCKET_SERVER
50767+ default 1002
50768+ help
50769+ Here you can choose the GID to disable server socket access for.
50770+ Remember to add the users you want server socket access disabled for to
50771+ the GID specified here. If the sysctl option is enabled, a sysctl
50772+ option with name "socket_server_gid" is created.
50773+
50774+endmenu
50775+menu "Sysctl support"
50776+depends on GRKERNSEC && SYSCTL
50777+
50778+config GRKERNSEC_SYSCTL
50779+ bool "Sysctl support"
50780+ help
50781+ If you say Y here, you will be able to change the options that
50782+ grsecurity runs with at bootup, without having to recompile your
50783+ kernel. You can echo values to files in /proc/sys/kernel/grsecurity
50784+ to enable (1) or disable (0) various features. All the sysctl entries
50785+ are mutable until the "grsec_lock" entry is set to a non-zero value.
50786+ All features enabled in the kernel configuration are disabled at boot
50787+ if you do not say Y to the "Turn on features by default" option.
50788+ All options should be set at startup, and the grsec_lock entry should
50789+ be set to a non-zero value after all the options are set.
50790+ *THIS IS EXTREMELY IMPORTANT*
50791+
50792+config GRKERNSEC_SYSCTL_DISTRO
50793+ bool "Extra sysctl support for distro makers (READ HELP)"
50794+ depends on GRKERNSEC_SYSCTL && GRKERNSEC_IO
50795+ help
50796+ If you say Y here, additional sysctl options will be created
50797+ for features that affect processes running as root. Therefore,
50798+ it is critical when using this option that the grsec_lock entry be
50799+ enabled after boot. Only distros with prebuilt kernel packages
50800+ with this option enabled that can ensure grsec_lock is enabled
50801+ after boot should use this option.
50802+ *Failure to set grsec_lock after boot makes all grsec features
50803+ this option covers useless*
50804+
50805+ Currently this option creates the following sysctl entries:
50806+ "Disable Privileged I/O": "disable_priv_io"
50807+
50808+config GRKERNSEC_SYSCTL_ON
50809+ bool "Turn on features by default"
50810+ depends on GRKERNSEC_SYSCTL
50811+ help
50812+ If you say Y here, instead of having all features enabled in the
50813+ kernel configuration disabled at boot time, the features will be
50814+ enabled at boot time. It is recommended you say Y here unless
50815+ there is some reason you would want all sysctl-tunable features to
50816+ be disabled by default. As mentioned elsewhere, it is important
50817+ to enable the grsec_lock entry once you have finished modifying
50818+ the sysctl entries.
50819+
50820+endmenu
50821+menu "Logging Options"
50822+depends on GRKERNSEC
50823+
50824+config GRKERNSEC_FLOODTIME
50825+ int "Seconds in between log messages (minimum)"
50826+ default 10
50827+ help
50828+ This option allows you to enforce the number of seconds between
50829+ grsecurity log messages. The default should be suitable for most
50830+ people, however, if you choose to change it, choose a value small enough
50831+ to allow informative logs to be produced, but large enough to
50832+ prevent flooding.
50833+
50834+config GRKERNSEC_FLOODBURST
50835+ int "Number of messages in a burst (maximum)"
50836+ default 6
50837+ help
50838+ This option allows you to choose the maximum number of messages allowed
50839+ within the flood time interval you chose in a separate option. The
50840+ default should be suitable for most people, however if you find that
50841+ many of your logs are being interpreted as flooding, you may want to
50842+ raise this value.
50843+
50844+endmenu
50845+
50846+endmenu
50847diff --git a/grsecurity/Makefile b/grsecurity/Makefile
50848new file mode 100644
50849index 0000000..1b9afa9
50850--- /dev/null
50851+++ b/grsecurity/Makefile
50852@@ -0,0 +1,38 @@
50853+# grsecurity's ACL system was originally written in 2001 by Michael Dalton
50854+# during 2001-2009 it has been completely redesigned by Brad Spengler
50855+# into an RBAC system
50856+#
50857+# All code in this directory and various hooks inserted throughout the kernel
50858+# are copyright Brad Spengler - Open Source Security, Inc., and released
50859+# under the GPL v2 or higher
50860+
50861+KBUILD_CFLAGS += -Werror
50862+
50863+obj-y = grsec_chdir.o grsec_chroot.o grsec_exec.o grsec_fifo.o grsec_fork.o \
50864+ grsec_mount.o grsec_sig.o grsec_sysctl.o \
50865+ grsec_time.o grsec_tpe.o grsec_link.o grsec_pax.o grsec_ptrace.o
50866+
50867+obj-$(CONFIG_GRKERNSEC) += grsec_init.o grsum.o gracl.o gracl_segv.o \
50868+ gracl_cap.o gracl_alloc.o gracl_shm.o grsec_mem.o gracl_fs.o \
50869+ gracl_learn.o grsec_log.o
50870+obj-$(CONFIG_GRKERNSEC_RESLOG) += gracl_res.o
50871+
50872+ifdef CONFIG_NET
50873+obj-y += grsec_sock.o
50874+obj-$(CONFIG_GRKERNSEC) += gracl_ip.o
50875+endif
50876+
50877+ifndef CONFIG_GRKERNSEC
50878+obj-y += grsec_disabled.o
50879+endif
50880+
50881+ifdef CONFIG_GRKERNSEC_HIDESYM
50882+extra-y := grsec_hidesym.o
50883+$(obj)/grsec_hidesym.o:
50884+ @-chmod -f 500 /boot
50885+ @-chmod -f 500 /lib/modules
50886+ @-chmod -f 500 /lib64/modules
50887+ @-chmod -f 500 /lib32/modules
50888+ @-chmod -f 700 .
50889+ @echo ' grsec: protected kernel image paths'
50890+endif
50891diff --git a/grsecurity/gracl.c b/grsecurity/gracl.c
50892new file mode 100644
50893index 0000000..2d9c682
50894--- /dev/null
50895+++ b/grsecurity/gracl.c
50896@@ -0,0 +1,4172 @@
50897+#include <linux/kernel.h>
50898+#include <linux/module.h>
50899+#include <linux/sched.h>
50900+#include <linux/mm.h>
50901+#include <linux/file.h>
50902+#include <linux/fs.h>
50903+#include <linux/namei.h>
50904+#include <linux/mount.h>
50905+#include <linux/tty.h>
50906+#include <linux/proc_fs.h>
50907+#include <linux/lglock.h>
50908+#include <linux/slab.h>
50909+#include <linux/vmalloc.h>
50910+#include <linux/types.h>
50911+#include <linux/sysctl.h>
50912+#include <linux/netdevice.h>
50913+#include <linux/ptrace.h>
50914+#include <linux/gracl.h>
50915+#include <linux/gralloc.h>
50916+#include <linux/security.h>
50917+#include <linux/grinternal.h>
50918+#include <linux/pid_namespace.h>
50919+#include <linux/fdtable.h>
50920+#include <linux/percpu.h>
50921+
50922+#include <asm/uaccess.h>
50923+#include <asm/errno.h>
50924+#include <asm/mman.h>
50925+
50926+static struct acl_role_db acl_role_set;
50927+static struct name_db name_set;
50928+static struct inodev_db inodev_set;
50929+
50930+/* for keeping track of userspace pointers used for subjects, so we
50931+ can share references in the kernel as well
50932+*/
50933+
50934+static struct path real_root;
50935+
50936+static struct acl_subj_map_db subj_map_set;
50937+
50938+static struct acl_role_label *default_role;
50939+
50940+static struct acl_role_label *role_list;
50941+
50942+static u16 acl_sp_role_value;
50943+
50944+extern char *gr_shared_page[4];
50945+static DEFINE_MUTEX(gr_dev_mutex);
50946+DEFINE_RWLOCK(gr_inode_lock);
50947+
50948+struct gr_arg *gr_usermode;
50949+
50950+static unsigned int gr_status __read_only = GR_STATUS_INIT;
50951+
50952+extern int chkpw(struct gr_arg *entry, unsigned char *salt, unsigned char *sum);
50953+extern void gr_clear_learn_entries(void);
50954+
50955+#ifdef CONFIG_GRKERNSEC_RESLOG
50956+extern void gr_log_resource(const struct task_struct *task,
50957+ const int res, const unsigned long wanted, const int gt);
50958+#endif
50959+
50960+unsigned char *gr_system_salt;
50961+unsigned char *gr_system_sum;
50962+
50963+static struct sprole_pw **acl_special_roles = NULL;
50964+static __u16 num_sprole_pws = 0;
50965+
50966+static struct acl_role_label *kernel_role = NULL;
50967+
50968+static unsigned int gr_auth_attempts = 0;
50969+static unsigned long gr_auth_expires = 0UL;
50970+
50971+#ifdef CONFIG_NET
50972+extern struct vfsmount *sock_mnt;
50973+#endif
50974+
50975+extern struct vfsmount *pipe_mnt;
50976+extern struct vfsmount *shm_mnt;
50977+#ifdef CONFIG_HUGETLBFS
50978+extern struct vfsmount *hugetlbfs_vfsmount;
50979+#endif
50980+
50981+static struct acl_object_label *fakefs_obj_rw;
50982+static struct acl_object_label *fakefs_obj_rwx;
50983+
50984+extern int gr_init_uidset(void);
50985+extern void gr_free_uidset(void);
50986+extern void gr_remove_uid(uid_t uid);
50987+extern int gr_find_uid(uid_t uid);
50988+
50989+DECLARE_BRLOCK(vfsmount_lock);
50990+
50991+__inline__ int
50992+gr_acl_is_enabled(void)
50993+{
50994+ return (gr_status & GR_READY);
50995+}
50996+
50997+#ifdef CONFIG_BTRFS_FS
50998+extern dev_t get_btrfs_dev_from_inode(struct inode *inode);
50999+extern int btrfs_getattr(struct vfsmount *mnt, struct dentry *dentry, struct kstat *stat);
51000+#endif
51001+
51002+static inline dev_t __get_dev(const struct dentry *dentry)
51003+{
51004+#ifdef CONFIG_BTRFS_FS
51005+ if (dentry->d_inode->i_op && dentry->d_inode->i_op->getattr == &btrfs_getattr)
51006+ return get_btrfs_dev_from_inode(dentry->d_inode);
51007+ else
51008+#endif
51009+ return dentry->d_inode->i_sb->s_dev;
51010+}
51011+
51012+dev_t gr_get_dev_from_dentry(struct dentry *dentry)
51013+{
51014+ return __get_dev(dentry);
51015+}
51016+
51017+static char gr_task_roletype_to_char(struct task_struct *task)
51018+{
51019+ switch (task->role->roletype &
51020+ (GR_ROLE_DEFAULT | GR_ROLE_USER | GR_ROLE_GROUP |
51021+ GR_ROLE_SPECIAL)) {
51022+ case GR_ROLE_DEFAULT:
51023+ return 'D';
51024+ case GR_ROLE_USER:
51025+ return 'U';
51026+ case GR_ROLE_GROUP:
51027+ return 'G';
51028+ case GR_ROLE_SPECIAL:
51029+ return 'S';
51030+ }
51031+
51032+ return 'X';
51033+}
51034+
51035+char gr_roletype_to_char(void)
51036+{
51037+ return gr_task_roletype_to_char(current);
51038+}
51039+
51040+__inline__ int
51041+gr_acl_tpe_check(void)
51042+{
51043+ if (unlikely(!(gr_status & GR_READY)))
51044+ return 0;
51045+ if (current->role->roletype & GR_ROLE_TPE)
51046+ return 1;
51047+ else
51048+ return 0;
51049+}
51050+
51051+int
51052+gr_handle_rawio(const struct inode *inode)
51053+{
51054+#ifdef CONFIG_GRKERNSEC_CHROOT_CAPS
51055+ if (inode && S_ISBLK(inode->i_mode) &&
51056+ grsec_enable_chroot_caps && proc_is_chrooted(current) &&
51057+ !capable(CAP_SYS_RAWIO))
51058+ return 1;
51059+#endif
51060+ return 0;
51061+}
51062+
51063+static int
51064+gr_streq(const char *a, const char *b, const unsigned int lena, const unsigned int lenb)
51065+{
51066+ if (likely(lena != lenb))
51067+ return 0;
51068+
51069+ return !memcmp(a, b, lena);
51070+}
51071+
51072+static int prepend(char **buffer, int *buflen, const char *str, int namelen)
51073+{
51074+ *buflen -= namelen;
51075+ if (*buflen < 0)
51076+ return -ENAMETOOLONG;
51077+ *buffer -= namelen;
51078+ memcpy(*buffer, str, namelen);
51079+ return 0;
51080+}
51081+
51082+static int prepend_name(char **buffer, int *buflen, struct qstr *name)
51083+{
51084+ return prepend(buffer, buflen, name->name, name->len);
51085+}
51086+
51087+static int prepend_path(const struct path *path, struct path *root,
51088+ char **buffer, int *buflen)
51089+{
51090+ struct dentry *dentry = path->dentry;
51091+ struct vfsmount *vfsmnt = path->mnt;
51092+ bool slash = false;
51093+ int error = 0;
51094+
51095+ while (dentry != root->dentry || vfsmnt != root->mnt) {
51096+ struct dentry * parent;
51097+
51098+ if (dentry == vfsmnt->mnt_root || IS_ROOT(dentry)) {
51099+ /* Global root? */
51100+ if (vfsmnt->mnt_parent == vfsmnt) {
51101+ goto out;
51102+ }
51103+ dentry = vfsmnt->mnt_mountpoint;
51104+ vfsmnt = vfsmnt->mnt_parent;
51105+ continue;
51106+ }
51107+ parent = dentry->d_parent;
51108+ prefetch(parent);
51109+ spin_lock(&dentry->d_lock);
51110+ error = prepend_name(buffer, buflen, &dentry->d_name);
51111+ spin_unlock(&dentry->d_lock);
51112+ if (!error)
51113+ error = prepend(buffer, buflen, "/", 1);
51114+ if (error)
51115+ break;
51116+
51117+ slash = true;
51118+ dentry = parent;
51119+ }
51120+
51121+out:
51122+ if (!error && !slash)
51123+ error = prepend(buffer, buflen, "/", 1);
51124+
51125+ return error;
51126+}
51127+
51128+/* this must be called with vfsmount_lock and rename_lock held */
51129+
51130+static char *__our_d_path(const struct path *path, struct path *root,
51131+ char *buf, int buflen)
51132+{
51133+ char *res = buf + buflen;
51134+ int error;
51135+
51136+ prepend(&res, &buflen, "\0", 1);
51137+ error = prepend_path(path, root, &res, &buflen);
51138+ if (error)
51139+ return ERR_PTR(error);
51140+
51141+ return res;
51142+}
51143+
51144+static char *
51145+gen_full_path(struct path *path, struct path *root, char *buf, int buflen)
51146+{
51147+ char *retval;
51148+
51149+ retval = __our_d_path(path, root, buf, buflen);
51150+ if (unlikely(IS_ERR(retval)))
51151+ retval = strcpy(buf, "<path too long>");
51152+ else if (unlikely(retval[1] == '/' && retval[2] == '\0'))
51153+ retval[1] = '\0';
51154+
51155+ return retval;
51156+}
51157+
51158+static char *
51159+__d_real_path(const struct dentry *dentry, const struct vfsmount *vfsmnt,
51160+ char *buf, int buflen)
51161+{
51162+ struct path path;
51163+ char *res;
51164+
51165+ path.dentry = (struct dentry *)dentry;
51166+ path.mnt = (struct vfsmount *)vfsmnt;
51167+
51168+ /* we can use real_root.dentry, real_root.mnt, because this is only called
51169+ by the RBAC system */
51170+ res = gen_full_path(&path, &real_root, buf, buflen);
51171+
51172+ return res;
51173+}
51174+
51175+static char *
51176+d_real_path(const struct dentry *dentry, const struct vfsmount *vfsmnt,
51177+ char *buf, int buflen)
51178+{
51179+ char *res;
51180+ struct path path;
51181+ struct path root;
51182+ struct task_struct *reaper = &init_task;
51183+
51184+ path.dentry = (struct dentry *)dentry;
51185+ path.mnt = (struct vfsmount *)vfsmnt;
51186+
51187+ /* we can't use real_root.dentry, real_root.mnt, because they belong only to the RBAC system */
51188+ get_fs_root(reaper->fs, &root);
51189+
51190+ write_seqlock(&rename_lock);
51191+ br_read_lock(vfsmount_lock);
51192+ res = gen_full_path(&path, &root, buf, buflen);
51193+ br_read_unlock(vfsmount_lock);
51194+ write_sequnlock(&rename_lock);
51195+
51196+ path_put(&root);
51197+ return res;
51198+}
51199+
51200+static char *
51201+gr_to_filename_rbac(const struct dentry *dentry, const struct vfsmount *mnt)
51202+{
51203+ char *ret;
51204+ write_seqlock(&rename_lock);
51205+ br_read_lock(vfsmount_lock);
51206+ ret = __d_real_path(dentry, mnt, per_cpu_ptr(gr_shared_page[0],smp_processor_id()),
51207+ PAGE_SIZE);
51208+ br_read_unlock(vfsmount_lock);
51209+ write_sequnlock(&rename_lock);
51210+ return ret;
51211+}
51212+
51213+static char *
51214+gr_to_proc_filename_rbac(const struct dentry *dentry, const struct vfsmount *mnt)
51215+{
51216+ char *ret;
51217+ char *buf;
51218+ int buflen;
51219+
51220+ write_seqlock(&rename_lock);
51221+ br_read_lock(vfsmount_lock);
51222+ buf = per_cpu_ptr(gr_shared_page[0], smp_processor_id());
51223+ ret = __d_real_path(dentry, mnt, buf, PAGE_SIZE - 6);
51224+ buflen = (int)(ret - buf);
51225+ if (buflen >= 5)
51226+ prepend(&ret, &buflen, "/proc", 5);
51227+ else
51228+ ret = strcpy(buf, "<path too long>");
51229+ br_read_unlock(vfsmount_lock);
51230+ write_sequnlock(&rename_lock);
51231+ return ret;
51232+}
51233+
51234+char *
51235+gr_to_filename_nolock(const struct dentry *dentry, const struct vfsmount *mnt)
51236+{
51237+ return __d_real_path(dentry, mnt, per_cpu_ptr(gr_shared_page[0],smp_processor_id()),
51238+ PAGE_SIZE);
51239+}
51240+
51241+char *
51242+gr_to_filename(const struct dentry *dentry, const struct vfsmount *mnt)
51243+{
51244+ return d_real_path(dentry, mnt, per_cpu_ptr(gr_shared_page[0], smp_processor_id()),
51245+ PAGE_SIZE);
51246+}
51247+
51248+char *
51249+gr_to_filename1(const struct dentry *dentry, const struct vfsmount *mnt)
51250+{
51251+ return d_real_path(dentry, mnt, per_cpu_ptr(gr_shared_page[1], smp_processor_id()),
51252+ PAGE_SIZE);
51253+}
51254+
51255+char *
51256+gr_to_filename2(const struct dentry *dentry, const struct vfsmount *mnt)
51257+{
51258+ return d_real_path(dentry, mnt, per_cpu_ptr(gr_shared_page[2], smp_processor_id()),
51259+ PAGE_SIZE);
51260+}
51261+
51262+char *
51263+gr_to_filename3(const struct dentry *dentry, const struct vfsmount *mnt)
51264+{
51265+ return d_real_path(dentry, mnt, per_cpu_ptr(gr_shared_page[3], smp_processor_id()),
51266+ PAGE_SIZE);
51267+}
51268+
51269+__inline__ __u32
51270+to_gr_audit(const __u32 reqmode)
51271+{
51272+ /* masks off auditable permission flags, then shifts them to create
51273+ auditing flags, and adds the special case of append auditing if
51274+ we're requesting write */
51275+ return (((reqmode & ~GR_AUDITS) << 10) | ((reqmode & GR_WRITE) ? GR_AUDIT_APPEND : 0));
51276+}
51277+
51278+struct acl_subject_label *
51279+lookup_subject_map(const struct acl_subject_label *userp)
51280+{
51281+ unsigned int index = shash(userp, subj_map_set.s_size);
51282+ struct subject_map *match;
51283+
51284+ match = subj_map_set.s_hash[index];
51285+
51286+ while (match && match->user != userp)
51287+ match = match->next;
51288+
51289+ if (match != NULL)
51290+ return match->kernel;
51291+ else
51292+ return NULL;
51293+}
51294+
51295+static void
51296+insert_subj_map_entry(struct subject_map *subjmap)
51297+{
51298+ unsigned int index = shash(subjmap->user, subj_map_set.s_size);
51299+ struct subject_map **curr;
51300+
51301+ subjmap->prev = NULL;
51302+
51303+ curr = &subj_map_set.s_hash[index];
51304+ if (*curr != NULL)
51305+ (*curr)->prev = subjmap;
51306+
51307+ subjmap->next = *curr;
51308+ *curr = subjmap;
51309+
51310+ return;
51311+}
51312+
51313+static struct acl_role_label *
51314+lookup_acl_role_label(const struct task_struct *task, const uid_t uid,
51315+ const gid_t gid)
51316+{
51317+ unsigned int index = rhash(uid, GR_ROLE_USER, acl_role_set.r_size);
51318+ struct acl_role_label *match;
51319+ struct role_allowed_ip *ipp;
51320+ unsigned int x;
51321+ u32 curr_ip = task->signal->curr_ip;
51322+
51323+ task->signal->saved_ip = curr_ip;
51324+
51325+ match = acl_role_set.r_hash[index];
51326+
51327+ while (match) {
51328+ if ((match->roletype & (GR_ROLE_DOMAIN | GR_ROLE_USER)) == (GR_ROLE_DOMAIN | GR_ROLE_USER)) {
51329+ for (x = 0; x < match->domain_child_num; x++) {
51330+ if (match->domain_children[x] == uid)
51331+ goto found;
51332+ }
51333+ } else if (match->uidgid == uid && match->roletype & GR_ROLE_USER)
51334+ break;
51335+ match = match->next;
51336+ }
51337+found:
51338+ if (match == NULL) {
51339+ try_group:
51340+ index = rhash(gid, GR_ROLE_GROUP, acl_role_set.r_size);
51341+ match = acl_role_set.r_hash[index];
51342+
51343+ while (match) {
51344+ if ((match->roletype & (GR_ROLE_DOMAIN | GR_ROLE_GROUP)) == (GR_ROLE_DOMAIN | GR_ROLE_GROUP)) {
51345+ for (x = 0; x < match->domain_child_num; x++) {
51346+ if (match->domain_children[x] == gid)
51347+ goto found2;
51348+ }
51349+ } else if (match->uidgid == gid && match->roletype & GR_ROLE_GROUP)
51350+ break;
51351+ match = match->next;
51352+ }
51353+found2:
51354+ if (match == NULL)
51355+ match = default_role;
51356+ if (match->allowed_ips == NULL)
51357+ return match;
51358+ else {
51359+ for (ipp = match->allowed_ips; ipp; ipp = ipp->next) {
51360+ if (likely
51361+ ((ntohl(curr_ip) & ipp->netmask) ==
51362+ (ntohl(ipp->addr) & ipp->netmask)))
51363+ return match;
51364+ }
51365+ match = default_role;
51366+ }
51367+ } else if (match->allowed_ips == NULL) {
51368+ return match;
51369+ } else {
51370+ for (ipp = match->allowed_ips; ipp; ipp = ipp->next) {
51371+ if (likely
51372+ ((ntohl(curr_ip) & ipp->netmask) ==
51373+ (ntohl(ipp->addr) & ipp->netmask)))
51374+ return match;
51375+ }
51376+ goto try_group;
51377+ }
51378+
51379+ return match;
51380+}
51381+
51382+struct acl_subject_label *
51383+lookup_acl_subj_label(const ino_t ino, const dev_t dev,
51384+ const struct acl_role_label *role)
51385+{
51386+ unsigned int index = fhash(ino, dev, role->subj_hash_size);
51387+ struct acl_subject_label *match;
51388+
51389+ match = role->subj_hash[index];
51390+
51391+ while (match && (match->inode != ino || match->device != dev ||
51392+ (match->mode & GR_DELETED))) {
51393+ match = match->next;
51394+ }
51395+
51396+ if (match && !(match->mode & GR_DELETED))
51397+ return match;
51398+ else
51399+ return NULL;
51400+}
51401+
51402+struct acl_subject_label *
51403+lookup_acl_subj_label_deleted(const ino_t ino, const dev_t dev,
51404+ const struct acl_role_label *role)
51405+{
51406+ unsigned int index = fhash(ino, dev, role->subj_hash_size);
51407+ struct acl_subject_label *match;
51408+
51409+ match = role->subj_hash[index];
51410+
51411+ while (match && (match->inode != ino || match->device != dev ||
51412+ !(match->mode & GR_DELETED))) {
51413+ match = match->next;
51414+ }
51415+
51416+ if (match && (match->mode & GR_DELETED))
51417+ return match;
51418+ else
51419+ return NULL;
51420+}
51421+
51422+static struct acl_object_label *
51423+lookup_acl_obj_label(const ino_t ino, const dev_t dev,
51424+ const struct acl_subject_label *subj)
51425+{
51426+ unsigned int index = fhash(ino, dev, subj->obj_hash_size);
51427+ struct acl_object_label *match;
51428+
51429+ match = subj->obj_hash[index];
51430+
51431+ while (match && (match->inode != ino || match->device != dev ||
51432+ (match->mode & GR_DELETED))) {
51433+ match = match->next;
51434+ }
51435+
51436+ if (match && !(match->mode & GR_DELETED))
51437+ return match;
51438+ else
51439+ return NULL;
51440+}
51441+
51442+static struct acl_object_label *
51443+lookup_acl_obj_label_create(const ino_t ino, const dev_t dev,
51444+ const struct acl_subject_label *subj)
51445+{
51446+ unsigned int index = fhash(ino, dev, subj->obj_hash_size);
51447+ struct acl_object_label *match;
51448+
51449+ match = subj->obj_hash[index];
51450+
51451+ while (match && (match->inode != ino || match->device != dev ||
51452+ !(match->mode & GR_DELETED))) {
51453+ match = match->next;
51454+ }
51455+
51456+ if (match && (match->mode & GR_DELETED))
51457+ return match;
51458+
51459+ match = subj->obj_hash[index];
51460+
51461+ while (match && (match->inode != ino || match->device != dev ||
51462+ (match->mode & GR_DELETED))) {
51463+ match = match->next;
51464+ }
51465+
51466+ if (match && !(match->mode & GR_DELETED))
51467+ return match;
51468+ else
51469+ return NULL;
51470+}
51471+
51472+static struct name_entry *
51473+lookup_name_entry(const char *name)
51474+{
51475+ unsigned int len = strlen(name);
51476+ unsigned int key = full_name_hash(name, len);
51477+ unsigned int index = key % name_set.n_size;
51478+ struct name_entry *match;
51479+
51480+ match = name_set.n_hash[index];
51481+
51482+ while (match && (match->key != key || !gr_streq(match->name, name, match->len, len)))
51483+ match = match->next;
51484+
51485+ return match;
51486+}
51487+
51488+static struct name_entry *
51489+lookup_name_entry_create(const char *name)
51490+{
51491+ unsigned int len = strlen(name);
51492+ unsigned int key = full_name_hash(name, len);
51493+ unsigned int index = key % name_set.n_size;
51494+ struct name_entry *match;
51495+
51496+ match = name_set.n_hash[index];
51497+
51498+ while (match && (match->key != key || !gr_streq(match->name, name, match->len, len) ||
51499+ !match->deleted))
51500+ match = match->next;
51501+
51502+ if (match && match->deleted)
51503+ return match;
51504+
51505+ match = name_set.n_hash[index];
51506+
51507+ while (match && (match->key != key || !gr_streq(match->name, name, match->len, len) ||
51508+ match->deleted))
51509+ match = match->next;
51510+
51511+ if (match && !match->deleted)
51512+ return match;
51513+ else
51514+ return NULL;
51515+}
51516+
51517+static struct inodev_entry *
51518+lookup_inodev_entry(const ino_t ino, const dev_t dev)
51519+{
51520+ unsigned int index = fhash(ino, dev, inodev_set.i_size);
51521+ struct inodev_entry *match;
51522+
51523+ match = inodev_set.i_hash[index];
51524+
51525+ while (match && (match->nentry->inode != ino || match->nentry->device != dev))
51526+ match = match->next;
51527+
51528+ return match;
51529+}
51530+
51531+static void
51532+insert_inodev_entry(struct inodev_entry *entry)
51533+{
51534+ unsigned int index = fhash(entry->nentry->inode, entry->nentry->device,
51535+ inodev_set.i_size);
51536+ struct inodev_entry **curr;
51537+
51538+ entry->prev = NULL;
51539+
51540+ curr = &inodev_set.i_hash[index];
51541+ if (*curr != NULL)
51542+ (*curr)->prev = entry;
51543+
51544+ entry->next = *curr;
51545+ *curr = entry;
51546+
51547+ return;
51548+}
51549+
51550+static void
51551+__insert_acl_role_label(struct acl_role_label *role, uid_t uidgid)
51552+{
51553+ unsigned int index =
51554+ rhash(uidgid, role->roletype & (GR_ROLE_USER | GR_ROLE_GROUP), acl_role_set.r_size);
51555+ struct acl_role_label **curr;
51556+ struct acl_role_label *tmp, *tmp2;
51557+
51558+ curr = &acl_role_set.r_hash[index];
51559+
51560+ /* simple case, slot is empty, just set it to our role */
51561+ if (*curr == NULL) {
51562+ *curr = role;
51563+ } else {
51564+ /* example:
51565+ 1 -> 2 -> 3 (adding 2 -> 3 to here)
51566+ 2 -> 3
51567+ */
51568+ /* first check to see if we can already be reached via this slot */
51569+ tmp = *curr;
51570+ while (tmp && tmp != role)
51571+ tmp = tmp->next;
51572+ if (tmp == role) {
51573+ /* we don't need to add ourselves to this slot's chain */
51574+ return;
51575+ }
51576+ /* we need to add ourselves to this chain, two cases */
51577+ if (role->next == NULL) {
51578+ /* simple case, append the current chain to our role */
51579+ role->next = *curr;
51580+ *curr = role;
51581+ } else {
51582+ /* 1 -> 2 -> 3 -> 4
51583+ 2 -> 3 -> 4
51584+ 3 -> 4 (adding 1 -> 2 -> 3 -> 4 to here)
51585+ */
51586+ /* trickier case: walk our role's chain until we find
51587+ the role for the start of the current slot's chain */
51588+ tmp = role;
51589+ tmp2 = *curr;
51590+ while (tmp->next && tmp->next != tmp2)
51591+ tmp = tmp->next;
51592+ if (tmp->next == tmp2) {
51593+ /* from example above, we found 3, so just
51594+ replace this slot's chain with ours */
51595+ *curr = role;
51596+ } else {
51597+ /* we didn't find a subset of our role's chain
51598+ in the current slot's chain, so append their
51599+ chain to ours, and set us as the first role in
51600+ the slot's chain
51601+
51602+ we could fold this case with the case above,
51603+ but making it explicit for clarity
51604+ */
51605+ tmp->next = tmp2;
51606+ *curr = role;
51607+ }
51608+ }
51609+ }
51610+
51611+ return;
51612+}
51613+
51614+static void
51615+insert_acl_role_label(struct acl_role_label *role)
51616+{
51617+ int i;
51618+
51619+ if (role_list == NULL) {
51620+ role_list = role;
51621+ role->prev = NULL;
51622+ } else {
51623+ role->prev = role_list;
51624+ role_list = role;
51625+ }
51626+
51627+ /* used for hash chains */
51628+ role->next = NULL;
51629+
51630+ if (role->roletype & GR_ROLE_DOMAIN) {
51631+ for (i = 0; i < role->domain_child_num; i++)
51632+ __insert_acl_role_label(role, role->domain_children[i]);
51633+ } else
51634+ __insert_acl_role_label(role, role->uidgid);
51635+}
51636+
51637+static int
51638+insert_name_entry(char *name, const ino_t inode, const dev_t device, __u8 deleted)
51639+{
51640+ struct name_entry **curr, *nentry;
51641+ struct inodev_entry *ientry;
51642+ unsigned int len = strlen(name);
51643+ unsigned int key = full_name_hash(name, len);
51644+ unsigned int index = key % name_set.n_size;
51645+
51646+ curr = &name_set.n_hash[index];
51647+
51648+ while (*curr && ((*curr)->key != key || !gr_streq((*curr)->name, name, (*curr)->len, len)))
51649+ curr = &((*curr)->next);
51650+
51651+ if (*curr != NULL)
51652+ return 1;
51653+
51654+ nentry = acl_alloc(sizeof (struct name_entry));
51655+ if (nentry == NULL)
51656+ return 0;
51657+ ientry = acl_alloc(sizeof (struct inodev_entry));
51658+ if (ientry == NULL)
51659+ return 0;
51660+ ientry->nentry = nentry;
51661+
51662+ nentry->key = key;
51663+ nentry->name = name;
51664+ nentry->inode = inode;
51665+ nentry->device = device;
51666+ nentry->len = len;
51667+ nentry->deleted = deleted;
51668+
51669+ nentry->prev = NULL;
51670+ curr = &name_set.n_hash[index];
51671+ if (*curr != NULL)
51672+ (*curr)->prev = nentry;
51673+ nentry->next = *curr;
51674+ *curr = nentry;
51675+
51676+ /* insert us into the table searchable by inode/dev */
51677+ insert_inodev_entry(ientry);
51678+
51679+ return 1;
51680+}
51681+
51682+static void
51683+insert_acl_obj_label(struct acl_object_label *obj,
51684+ struct acl_subject_label *subj)
51685+{
51686+ unsigned int index =
51687+ fhash(obj->inode, obj->device, subj->obj_hash_size);
51688+ struct acl_object_label **curr;
51689+
51690+
51691+ obj->prev = NULL;
51692+
51693+ curr = &subj->obj_hash[index];
51694+ if (*curr != NULL)
51695+ (*curr)->prev = obj;
51696+
51697+ obj->next = *curr;
51698+ *curr = obj;
51699+
51700+ return;
51701+}
51702+
51703+static void
51704+insert_acl_subj_label(struct acl_subject_label *obj,
51705+ struct acl_role_label *role)
51706+{
51707+ unsigned int index = fhash(obj->inode, obj->device, role->subj_hash_size);
51708+ struct acl_subject_label **curr;
51709+
51710+ obj->prev = NULL;
51711+
51712+ curr = &role->subj_hash[index];
51713+ if (*curr != NULL)
51714+ (*curr)->prev = obj;
51715+
51716+ obj->next = *curr;
51717+ *curr = obj;
51718+
51719+ return;
51720+}
51721+
51722+/* allocating chained hash tables, so optimal size is where lambda ~ 1 */
51723+
51724+static void *
51725+create_table(__u32 * len, int elementsize)
51726+{
51727+ unsigned int table_sizes[] = {
51728+ 7, 13, 31, 61, 127, 251, 509, 1021, 2039, 4093, 8191, 16381,
51729+ 32749, 65521, 131071, 262139, 524287, 1048573, 2097143,
51730+ 4194301, 8388593, 16777213, 33554393, 67108859
51731+ };
51732+ void *newtable = NULL;
51733+ unsigned int pwr = 0;
51734+
51735+ while ((pwr < ((sizeof (table_sizes) / sizeof (table_sizes[0])) - 1)) &&
51736+ table_sizes[pwr] <= *len)
51737+ pwr++;
51738+
51739+ if (table_sizes[pwr] <= *len || (table_sizes[pwr] > ULONG_MAX / elementsize))
51740+ return newtable;
51741+
51742+ if ((table_sizes[pwr] * elementsize) <= PAGE_SIZE)
51743+ newtable =
51744+ kmalloc(table_sizes[pwr] * elementsize, GFP_KERNEL);
51745+ else
51746+ newtable = vmalloc(table_sizes[pwr] * elementsize);
51747+
51748+ *len = table_sizes[pwr];
51749+
51750+ return newtable;
51751+}
51752+
51753+static int
51754+init_variables(const struct gr_arg *arg)
51755+{
51756+ struct task_struct *reaper = &init_task;
51757+ unsigned int stacksize;
51758+
51759+ subj_map_set.s_size = arg->role_db.num_subjects;
51760+ acl_role_set.r_size = arg->role_db.num_roles + arg->role_db.num_domain_children;
51761+ name_set.n_size = arg->role_db.num_objects;
51762+ inodev_set.i_size = arg->role_db.num_objects;
51763+
51764+ if (!subj_map_set.s_size || !acl_role_set.r_size ||
51765+ !name_set.n_size || !inodev_set.i_size)
51766+ return 1;
51767+
51768+ if (!gr_init_uidset())
51769+ return 1;
51770+
51771+ /* set up the stack that holds allocation info */
51772+
51773+ stacksize = arg->role_db.num_pointers + 5;
51774+
51775+ if (!acl_alloc_stack_init(stacksize))
51776+ return 1;
51777+
51778+ /* grab reference for the real root dentry and vfsmount */
51779+ get_fs_root(reaper->fs, &real_root);
51780+
51781+#ifdef CONFIG_GRKERNSEC_RBAC_DEBUG
51782+ printk(KERN_ALERT "Obtained real root device=%d, inode=%lu\n", __get_dev(real_root.dentry), real_root.dentry->d_inode->i_ino);
51783+#endif
51784+
51785+ fakefs_obj_rw = acl_alloc(sizeof(struct acl_object_label));
51786+ if (fakefs_obj_rw == NULL)
51787+ return 1;
51788+ fakefs_obj_rw->mode = GR_FIND | GR_READ | GR_WRITE;
51789+
51790+ fakefs_obj_rwx = acl_alloc(sizeof(struct acl_object_label));
51791+ if (fakefs_obj_rwx == NULL)
51792+ return 1;
51793+ fakefs_obj_rwx->mode = GR_FIND | GR_READ | GR_WRITE | GR_EXEC;
51794+
51795+ subj_map_set.s_hash =
51796+ (struct subject_map **) create_table(&subj_map_set.s_size, sizeof(void *));
51797+ acl_role_set.r_hash =
51798+ (struct acl_role_label **) create_table(&acl_role_set.r_size, sizeof(void *));
51799+ name_set.n_hash = (struct name_entry **) create_table(&name_set.n_size, sizeof(void *));
51800+ inodev_set.i_hash =
51801+ (struct inodev_entry **) create_table(&inodev_set.i_size, sizeof(void *));
51802+
51803+ if (!subj_map_set.s_hash || !acl_role_set.r_hash ||
51804+ !name_set.n_hash || !inodev_set.i_hash)
51805+ return 1;
51806+
51807+ memset(subj_map_set.s_hash, 0,
51808+ sizeof(struct subject_map *) * subj_map_set.s_size);
51809+ memset(acl_role_set.r_hash, 0,
51810+ sizeof (struct acl_role_label *) * acl_role_set.r_size);
51811+ memset(name_set.n_hash, 0,
51812+ sizeof (struct name_entry *) * name_set.n_size);
51813+ memset(inodev_set.i_hash, 0,
51814+ sizeof (struct inodev_entry *) * inodev_set.i_size);
51815+
51816+ return 0;
51817+}
51818+
51819+/* free information not needed after startup
51820+ currently contains user->kernel pointer mappings for subjects
51821+*/
51822+
51823+static void
51824+free_init_variables(void)
51825+{
51826+ __u32 i;
51827+
51828+ if (subj_map_set.s_hash) {
51829+ for (i = 0; i < subj_map_set.s_size; i++) {
51830+ if (subj_map_set.s_hash[i]) {
51831+ kfree(subj_map_set.s_hash[i]);
51832+ subj_map_set.s_hash[i] = NULL;
51833+ }
51834+ }
51835+
51836+ if ((subj_map_set.s_size * sizeof (struct subject_map *)) <=
51837+ PAGE_SIZE)
51838+ kfree(subj_map_set.s_hash);
51839+ else
51840+ vfree(subj_map_set.s_hash);
51841+ }
51842+
51843+ return;
51844+}
51845+
51846+static void
51847+free_variables(void)
51848+{
51849+ struct acl_subject_label *s;
51850+ struct acl_role_label *r;
51851+ struct task_struct *task, *task2;
51852+ unsigned int x;
51853+
51854+ gr_clear_learn_entries();
51855+
51856+ read_lock(&tasklist_lock);
51857+ do_each_thread(task2, task) {
51858+ task->acl_sp_role = 0;
51859+ task->acl_role_id = 0;
51860+ task->acl = NULL;
51861+ task->role = NULL;
51862+ } while_each_thread(task2, task);
51863+ read_unlock(&tasklist_lock);
51864+
51865+ /* release the reference to the real root dentry and vfsmount */
51866+ path_put(&real_root);
51867+ memset(&real_root, 0, sizeof(real_root));
51868+
51869+ /* free all object hash tables */
51870+
51871+ FOR_EACH_ROLE_START(r)
51872+ if (r->subj_hash == NULL)
51873+ goto next_role;
51874+ FOR_EACH_SUBJECT_START(r, s, x)
51875+ if (s->obj_hash == NULL)
51876+ break;
51877+ if ((s->obj_hash_size * sizeof (struct acl_object_label *)) <= PAGE_SIZE)
51878+ kfree(s->obj_hash);
51879+ else
51880+ vfree(s->obj_hash);
51881+ FOR_EACH_SUBJECT_END(s, x)
51882+ FOR_EACH_NESTED_SUBJECT_START(r, s)
51883+ if (s->obj_hash == NULL)
51884+ break;
51885+ if ((s->obj_hash_size * sizeof (struct acl_object_label *)) <= PAGE_SIZE)
51886+ kfree(s->obj_hash);
51887+ else
51888+ vfree(s->obj_hash);
51889+ FOR_EACH_NESTED_SUBJECT_END(s)
51890+ if ((r->subj_hash_size * sizeof (struct acl_subject_label *)) <= PAGE_SIZE)
51891+ kfree(r->subj_hash);
51892+ else
51893+ vfree(r->subj_hash);
51894+ r->subj_hash = NULL;
51895+next_role:
51896+ FOR_EACH_ROLE_END(r)
51897+
51898+ acl_free_all();
51899+
51900+ if (acl_role_set.r_hash) {
51901+ if ((acl_role_set.r_size * sizeof (struct acl_role_label *)) <=
51902+ PAGE_SIZE)
51903+ kfree(acl_role_set.r_hash);
51904+ else
51905+ vfree(acl_role_set.r_hash);
51906+ }
51907+ if (name_set.n_hash) {
51908+ if ((name_set.n_size * sizeof (struct name_entry *)) <=
51909+ PAGE_SIZE)
51910+ kfree(name_set.n_hash);
51911+ else
51912+ vfree(name_set.n_hash);
51913+ }
51914+
51915+ if (inodev_set.i_hash) {
51916+ if ((inodev_set.i_size * sizeof (struct inodev_entry *)) <=
51917+ PAGE_SIZE)
51918+ kfree(inodev_set.i_hash);
51919+ else
51920+ vfree(inodev_set.i_hash);
51921+ }
51922+
51923+ gr_free_uidset();
51924+
51925+ memset(&name_set, 0, sizeof (struct name_db));
51926+ memset(&inodev_set, 0, sizeof (struct inodev_db));
51927+ memset(&acl_role_set, 0, sizeof (struct acl_role_db));
51928+ memset(&subj_map_set, 0, sizeof (struct acl_subj_map_db));
51929+
51930+ default_role = NULL;
51931+ kernel_role = NULL;
51932+ role_list = NULL;
51933+
51934+ return;
51935+}
51936+
51937+static __u32
51938+count_user_objs(struct acl_object_label *userp)
51939+{
51940+ struct acl_object_label o_tmp;
51941+ __u32 num = 0;
51942+
51943+ while (userp) {
51944+ if (copy_from_user(&o_tmp, userp,
51945+ sizeof (struct acl_object_label)))
51946+ break;
51947+
51948+ userp = o_tmp.prev;
51949+ num++;
51950+ }
51951+
51952+ return num;
51953+}
51954+
51955+static struct acl_subject_label *
51956+do_copy_user_subj(struct acl_subject_label *userp, struct acl_role_label *role);
51957+
51958+static int
51959+copy_user_glob(struct acl_object_label *obj)
51960+{
51961+ struct acl_object_label *g_tmp, **guser;
51962+ unsigned int len;
51963+ char *tmp;
51964+
51965+ if (obj->globbed == NULL)
51966+ return 0;
51967+
51968+ guser = &obj->globbed;
51969+ while (*guser) {
51970+ g_tmp = (struct acl_object_label *)
51971+ acl_alloc(sizeof (struct acl_object_label));
51972+ if (g_tmp == NULL)
51973+ return -ENOMEM;
51974+
51975+ if (copy_from_user(g_tmp, *guser,
51976+ sizeof (struct acl_object_label)))
51977+ return -EFAULT;
51978+
51979+ len = strnlen_user(g_tmp->filename, PATH_MAX);
51980+
51981+ if (!len || len >= PATH_MAX)
51982+ return -EINVAL;
51983+
51984+ if ((tmp = (char *) acl_alloc(len)) == NULL)
51985+ return -ENOMEM;
51986+
51987+ if (copy_from_user(tmp, g_tmp->filename, len))
51988+ return -EFAULT;
51989+ tmp[len-1] = '\0';
51990+ g_tmp->filename = tmp;
51991+
51992+ *guser = g_tmp;
51993+ guser = &(g_tmp->next);
51994+ }
51995+
51996+ return 0;
51997+}
51998+
51999+static int
52000+copy_user_objs(struct acl_object_label *userp, struct acl_subject_label *subj,
52001+ struct acl_role_label *role)
52002+{
52003+ struct acl_object_label *o_tmp;
52004+ unsigned int len;
52005+ int ret;
52006+ char *tmp;
52007+
52008+ while (userp) {
52009+ if ((o_tmp = (struct acl_object_label *)
52010+ acl_alloc(sizeof (struct acl_object_label))) == NULL)
52011+ return -ENOMEM;
52012+
52013+ if (copy_from_user(o_tmp, userp,
52014+ sizeof (struct acl_object_label)))
52015+ return -EFAULT;
52016+
52017+ userp = o_tmp->prev;
52018+
52019+ len = strnlen_user(o_tmp->filename, PATH_MAX);
52020+
52021+ if (!len || len >= PATH_MAX)
52022+ return -EINVAL;
52023+
52024+ if ((tmp = (char *) acl_alloc(len)) == NULL)
52025+ return -ENOMEM;
52026+
52027+ if (copy_from_user(tmp, o_tmp->filename, len))
52028+ return -EFAULT;
52029+ tmp[len-1] = '\0';
52030+ o_tmp->filename = tmp;
52031+
52032+ insert_acl_obj_label(o_tmp, subj);
52033+ if (!insert_name_entry(o_tmp->filename, o_tmp->inode,
52034+ o_tmp->device, (o_tmp->mode & GR_DELETED) ? 1 : 0))
52035+ return -ENOMEM;
52036+
52037+ ret = copy_user_glob(o_tmp);
52038+ if (ret)
52039+ return ret;
52040+
52041+ if (o_tmp->nested) {
52042+ o_tmp->nested = do_copy_user_subj(o_tmp->nested, role);
52043+ if (IS_ERR(o_tmp->nested))
52044+ return PTR_ERR(o_tmp->nested);
52045+
52046+ /* insert into nested subject list */
52047+ o_tmp->nested->next = role->hash->first;
52048+ role->hash->first = o_tmp->nested;
52049+ }
52050+ }
52051+
52052+ return 0;
52053+}
52054+
52055+static __u32
52056+count_user_subjs(struct acl_subject_label *userp)
52057+{
52058+ struct acl_subject_label s_tmp;
52059+ __u32 num = 0;
52060+
52061+ while (userp) {
52062+ if (copy_from_user(&s_tmp, userp,
52063+ sizeof (struct acl_subject_label)))
52064+ break;
52065+
52066+ userp = s_tmp.prev;
52067+ /* do not count nested subjects against this count, since
52068+ they are not included in the hash table, but are
52069+ attached to objects. We have already counted
52070+ the subjects in userspace for the allocation
52071+ stack
52072+ */
52073+ if (!(s_tmp.mode & GR_NESTED))
52074+ num++;
52075+ }
52076+
52077+ return num;
52078+}
52079+
52080+static int
52081+copy_user_allowedips(struct acl_role_label *rolep)
52082+{
52083+ struct role_allowed_ip *ruserip, *rtmp = NULL, *rlast;
52084+
52085+ ruserip = rolep->allowed_ips;
52086+
52087+ while (ruserip) {
52088+ rlast = rtmp;
52089+
52090+ if ((rtmp = (struct role_allowed_ip *)
52091+ acl_alloc(sizeof (struct role_allowed_ip))) == NULL)
52092+ return -ENOMEM;
52093+
52094+ if (copy_from_user(rtmp, ruserip,
52095+ sizeof (struct role_allowed_ip)))
52096+ return -EFAULT;
52097+
52098+ ruserip = rtmp->prev;
52099+
52100+ if (!rlast) {
52101+ rtmp->prev = NULL;
52102+ rolep->allowed_ips = rtmp;
52103+ } else {
52104+ rlast->next = rtmp;
52105+ rtmp->prev = rlast;
52106+ }
52107+
52108+ if (!ruserip)
52109+ rtmp->next = NULL;
52110+ }
52111+
52112+ return 0;
52113+}
52114+
52115+static int
52116+copy_user_transitions(struct acl_role_label *rolep)
52117+{
52118+ struct role_transition *rusertp, *rtmp = NULL, *rlast;
52119+
52120+ unsigned int len;
52121+ char *tmp;
52122+
52123+ rusertp = rolep->transitions;
52124+
52125+ while (rusertp) {
52126+ rlast = rtmp;
52127+
52128+ if ((rtmp = (struct role_transition *)
52129+ acl_alloc(sizeof (struct role_transition))) == NULL)
52130+ return -ENOMEM;
52131+
52132+ if (copy_from_user(rtmp, rusertp,
52133+ sizeof (struct role_transition)))
52134+ return -EFAULT;
52135+
52136+ rusertp = rtmp->prev;
52137+
52138+ len = strnlen_user(rtmp->rolename, GR_SPROLE_LEN);
52139+
52140+ if (!len || len >= GR_SPROLE_LEN)
52141+ return -EINVAL;
52142+
52143+ if ((tmp = (char *) acl_alloc(len)) == NULL)
52144+ return -ENOMEM;
52145+
52146+ if (copy_from_user(tmp, rtmp->rolename, len))
52147+ return -EFAULT;
52148+ tmp[len-1] = '\0';
52149+ rtmp->rolename = tmp;
52150+
52151+ if (!rlast) {
52152+ rtmp->prev = NULL;
52153+ rolep->transitions = rtmp;
52154+ } else {
52155+ rlast->next = rtmp;
52156+ rtmp->prev = rlast;
52157+ }
52158+
52159+ if (!rusertp)
52160+ rtmp->next = NULL;
52161+ }
52162+
52163+ return 0;
52164+}
52165+
52166+static struct acl_subject_label *
52167+do_copy_user_subj(struct acl_subject_label *userp, struct acl_role_label *role)
52168+{
52169+ struct acl_subject_label *s_tmp = NULL, *s_tmp2;
52170+ unsigned int len;
52171+ char *tmp;
52172+ __u32 num_objs;
52173+ struct acl_ip_label **i_tmp, *i_utmp2;
52174+ struct gr_hash_struct ghash;
52175+ struct subject_map *subjmap;
52176+ unsigned int i_num;
52177+ int err;
52178+
52179+ s_tmp = lookup_subject_map(userp);
52180+
52181+ /* we've already copied this subject into the kernel, just return
52182+ the reference to it, and don't copy it over again
52183+ */
52184+ if (s_tmp)
52185+ return(s_tmp);
52186+
52187+ if ((s_tmp = (struct acl_subject_label *)
52188+ acl_alloc(sizeof (struct acl_subject_label))) == NULL)
52189+ return ERR_PTR(-ENOMEM);
52190+
52191+ subjmap = (struct subject_map *)kmalloc(sizeof (struct subject_map), GFP_KERNEL);
52192+ if (subjmap == NULL)
52193+ return ERR_PTR(-ENOMEM);
52194+
52195+ subjmap->user = userp;
52196+ subjmap->kernel = s_tmp;
52197+ insert_subj_map_entry(subjmap);
52198+
52199+ if (copy_from_user(s_tmp, userp,
52200+ sizeof (struct acl_subject_label)))
52201+ return ERR_PTR(-EFAULT);
52202+
52203+ len = strnlen_user(s_tmp->filename, PATH_MAX);
52204+
52205+ if (!len || len >= PATH_MAX)
52206+ return ERR_PTR(-EINVAL);
52207+
52208+ if ((tmp = (char *) acl_alloc(len)) == NULL)
52209+ return ERR_PTR(-ENOMEM);
52210+
52211+ if (copy_from_user(tmp, s_tmp->filename, len))
52212+ return ERR_PTR(-EFAULT);
52213+ tmp[len-1] = '\0';
52214+ s_tmp->filename = tmp;
52215+
52216+ if (!strcmp(s_tmp->filename, "/"))
52217+ role->root_label = s_tmp;
52218+
52219+ if (copy_from_user(&ghash, s_tmp->hash, sizeof(struct gr_hash_struct)))
52220+ return ERR_PTR(-EFAULT);
52221+
52222+ /* copy user and group transition tables */
52223+
52224+ if (s_tmp->user_trans_num) {
52225+ uid_t *uidlist;
52226+
52227+ uidlist = (uid_t *)acl_alloc_num(s_tmp->user_trans_num, sizeof(uid_t));
52228+ if (uidlist == NULL)
52229+ return ERR_PTR(-ENOMEM);
52230+ if (copy_from_user(uidlist, s_tmp->user_transitions, s_tmp->user_trans_num * sizeof(uid_t)))
52231+ return ERR_PTR(-EFAULT);
52232+
52233+ s_tmp->user_transitions = uidlist;
52234+ }
52235+
52236+ if (s_tmp->group_trans_num) {
52237+ gid_t *gidlist;
52238+
52239+ gidlist = (gid_t *)acl_alloc_num(s_tmp->group_trans_num, sizeof(gid_t));
52240+ if (gidlist == NULL)
52241+ return ERR_PTR(-ENOMEM);
52242+ if (copy_from_user(gidlist, s_tmp->group_transitions, s_tmp->group_trans_num * sizeof(gid_t)))
52243+ return ERR_PTR(-EFAULT);
52244+
52245+ s_tmp->group_transitions = gidlist;
52246+ }
52247+
52248+ /* set up object hash table */
52249+ num_objs = count_user_objs(ghash.first);
52250+
52251+ s_tmp->obj_hash_size = num_objs;
52252+ s_tmp->obj_hash =
52253+ (struct acl_object_label **)
52254+ create_table(&(s_tmp->obj_hash_size), sizeof(void *));
52255+
52256+ if (!s_tmp->obj_hash)
52257+ return ERR_PTR(-ENOMEM);
52258+
52259+ memset(s_tmp->obj_hash, 0,
52260+ s_tmp->obj_hash_size *
52261+ sizeof (struct acl_object_label *));
52262+
52263+ /* add in objects */
52264+ err = copy_user_objs(ghash.first, s_tmp, role);
52265+
52266+ if (err)
52267+ return ERR_PTR(err);
52268+
52269+ /* set pointer for parent subject */
52270+ if (s_tmp->parent_subject) {
52271+ s_tmp2 = do_copy_user_subj(s_tmp->parent_subject, role);
52272+
52273+ if (IS_ERR(s_tmp2))
52274+ return s_tmp2;
52275+
52276+ s_tmp->parent_subject = s_tmp2;
52277+ }
52278+
52279+ /* add in ip acls */
52280+
52281+ if (!s_tmp->ip_num) {
52282+ s_tmp->ips = NULL;
52283+ goto insert;
52284+ }
52285+
52286+ i_tmp =
52287+ (struct acl_ip_label **) acl_alloc_num(s_tmp->ip_num,
52288+ sizeof (struct acl_ip_label *));
52289+
52290+ if (!i_tmp)
52291+ return ERR_PTR(-ENOMEM);
52292+
52293+ for (i_num = 0; i_num < s_tmp->ip_num; i_num++) {
52294+ *(i_tmp + i_num) =
52295+ (struct acl_ip_label *)
52296+ acl_alloc(sizeof (struct acl_ip_label));
52297+ if (!*(i_tmp + i_num))
52298+ return ERR_PTR(-ENOMEM);
52299+
52300+ if (copy_from_user
52301+ (&i_utmp2, s_tmp->ips + i_num,
52302+ sizeof (struct acl_ip_label *)))
52303+ return ERR_PTR(-EFAULT);
52304+
52305+ if (copy_from_user
52306+ (*(i_tmp + i_num), i_utmp2,
52307+ sizeof (struct acl_ip_label)))
52308+ return ERR_PTR(-EFAULT);
52309+
52310+ if ((*(i_tmp + i_num))->iface == NULL)
52311+ continue;
52312+
52313+ len = strnlen_user((*(i_tmp + i_num))->iface, IFNAMSIZ);
52314+ if (!len || len >= IFNAMSIZ)
52315+ return ERR_PTR(-EINVAL);
52316+ tmp = acl_alloc(len);
52317+ if (tmp == NULL)
52318+ return ERR_PTR(-ENOMEM);
52319+ if (copy_from_user(tmp, (*(i_tmp + i_num))->iface, len))
52320+ return ERR_PTR(-EFAULT);
52321+ (*(i_tmp + i_num))->iface = tmp;
52322+ }
52323+
52324+ s_tmp->ips = i_tmp;
52325+
52326+insert:
52327+ if (!insert_name_entry(s_tmp->filename, s_tmp->inode,
52328+ s_tmp->device, (s_tmp->mode & GR_DELETED) ? 1 : 0))
52329+ return ERR_PTR(-ENOMEM);
52330+
52331+ return s_tmp;
52332+}
52333+
52334+static int
52335+copy_user_subjs(struct acl_subject_label *userp, struct acl_role_label *role)
52336+{
52337+ struct acl_subject_label s_pre;
52338+ struct acl_subject_label * ret;
52339+ int err;
52340+
52341+ while (userp) {
52342+ if (copy_from_user(&s_pre, userp,
52343+ sizeof (struct acl_subject_label)))
52344+ return -EFAULT;
52345+
52346+ /* do not add nested subjects here, add
52347+ while parsing objects
52348+ */
52349+
52350+ if (s_pre.mode & GR_NESTED) {
52351+ userp = s_pre.prev;
52352+ continue;
52353+ }
52354+
52355+ ret = do_copy_user_subj(userp, role);
52356+
52357+ err = PTR_ERR(ret);
52358+ if (IS_ERR(ret))
52359+ return err;
52360+
52361+ insert_acl_subj_label(ret, role);
52362+
52363+ userp = s_pre.prev;
52364+ }
52365+
52366+ return 0;
52367+}
52368+
52369+static int
52370+copy_user_acl(struct gr_arg *arg)
52371+{
52372+ struct acl_role_label *r_tmp = NULL, **r_utmp, *r_utmp2;
52373+ struct sprole_pw *sptmp;
52374+ struct gr_hash_struct *ghash;
52375+ uid_t *domainlist;
52376+ unsigned int r_num;
52377+ unsigned int len;
52378+ char *tmp;
52379+ int err = 0;
52380+ __u16 i;
52381+ __u32 num_subjs;
52382+
52383+ /* we need a default and kernel role */
52384+ if (arg->role_db.num_roles < 2)
52385+ return -EINVAL;
52386+
52387+ /* copy special role authentication info from userspace */
52388+
52389+ num_sprole_pws = arg->num_sprole_pws;
52390+ acl_special_roles = (struct sprole_pw **) acl_alloc_num(num_sprole_pws, sizeof(struct sprole_pw *));
52391+
52392+ if (!acl_special_roles && num_sprole_pws)
52393+ return -ENOMEM;
52394+
52395+ for (i = 0; i < num_sprole_pws; i++) {
52396+ sptmp = (struct sprole_pw *) acl_alloc(sizeof(struct sprole_pw));
52397+ if (!sptmp)
52398+ return -ENOMEM;
52399+ if (copy_from_user(sptmp, arg->sprole_pws + i,
52400+ sizeof (struct sprole_pw)))
52401+ return -EFAULT;
52402+
52403+ len = strnlen_user(sptmp->rolename, GR_SPROLE_LEN);
52404+
52405+ if (!len || len >= GR_SPROLE_LEN)
52406+ return -EINVAL;
52407+
52408+ if ((tmp = (char *) acl_alloc(len)) == NULL)
52409+ return -ENOMEM;
52410+
52411+ if (copy_from_user(tmp, sptmp->rolename, len))
52412+ return -EFAULT;
52413+
52414+ tmp[len-1] = '\0';
52415+#ifdef CONFIG_GRKERNSEC_RBAC_DEBUG
52416+ printk(KERN_ALERT "Copying special role %s\n", tmp);
52417+#endif
52418+ sptmp->rolename = tmp;
52419+ acl_special_roles[i] = sptmp;
52420+ }
52421+
52422+ r_utmp = (struct acl_role_label **) arg->role_db.r_table;
52423+
52424+ for (r_num = 0; r_num < arg->role_db.num_roles; r_num++) {
52425+ r_tmp = acl_alloc(sizeof (struct acl_role_label));
52426+
52427+ if (!r_tmp)
52428+ return -ENOMEM;
52429+
52430+ if (copy_from_user(&r_utmp2, r_utmp + r_num,
52431+ sizeof (struct acl_role_label *)))
52432+ return -EFAULT;
52433+
52434+ if (copy_from_user(r_tmp, r_utmp2,
52435+ sizeof (struct acl_role_label)))
52436+ return -EFAULT;
52437+
52438+ len = strnlen_user(r_tmp->rolename, GR_SPROLE_LEN);
52439+
52440+ if (!len || len >= PATH_MAX)
52441+ return -EINVAL;
52442+
52443+ if ((tmp = (char *) acl_alloc(len)) == NULL)
52444+ return -ENOMEM;
52445+
52446+ if (copy_from_user(tmp, r_tmp->rolename, len))
52447+ return -EFAULT;
52448+
52449+ tmp[len-1] = '\0';
52450+ r_tmp->rolename = tmp;
52451+
52452+ if (!strcmp(r_tmp->rolename, "default")
52453+ && (r_tmp->roletype & GR_ROLE_DEFAULT)) {
52454+ default_role = r_tmp;
52455+ } else if (!strcmp(r_tmp->rolename, ":::kernel:::")) {
52456+ kernel_role = r_tmp;
52457+ }
52458+
52459+ if ((ghash = (struct gr_hash_struct *) acl_alloc(sizeof(struct gr_hash_struct))) == NULL)
52460+ return -ENOMEM;
52461+
52462+ if (copy_from_user(ghash, r_tmp->hash, sizeof(struct gr_hash_struct)))
52463+ return -EFAULT;
52464+
52465+ r_tmp->hash = ghash;
52466+
52467+ num_subjs = count_user_subjs(r_tmp->hash->first);
52468+
52469+ r_tmp->subj_hash_size = num_subjs;
52470+ r_tmp->subj_hash =
52471+ (struct acl_subject_label **)
52472+ create_table(&(r_tmp->subj_hash_size), sizeof(void *));
52473+
52474+ if (!r_tmp->subj_hash)
52475+ return -ENOMEM;
52476+
52477+ err = copy_user_allowedips(r_tmp);
52478+ if (err)
52479+ return err;
52480+
52481+ /* copy domain info */
52482+ if (r_tmp->domain_children != NULL) {
52483+ domainlist = acl_alloc_num(r_tmp->domain_child_num, sizeof(uid_t));
52484+ if (domainlist == NULL)
52485+ return -ENOMEM;
52486+
52487+ if (copy_from_user(domainlist, r_tmp->domain_children, r_tmp->domain_child_num * sizeof(uid_t)))
52488+ return -EFAULT;
52489+
52490+ r_tmp->domain_children = domainlist;
52491+ }
52492+
52493+ err = copy_user_transitions(r_tmp);
52494+ if (err)
52495+ return err;
52496+
52497+ memset(r_tmp->subj_hash, 0,
52498+ r_tmp->subj_hash_size *
52499+ sizeof (struct acl_subject_label *));
52500+
52501+ err = copy_user_subjs(r_tmp->hash->first, r_tmp);
52502+
52503+ if (err)
52504+ return err;
52505+
52506+ /* set nested subject list to null */
52507+ r_tmp->hash->first = NULL;
52508+
52509+ insert_acl_role_label(r_tmp);
52510+ }
52511+
52512+ if (default_role == NULL || kernel_role == NULL)
52513+ return -EINVAL;
52514+
52515+ return err;
52516+}
52517+
52518+static int
52519+gracl_init(struct gr_arg *args)
52520+{
52521+ int error = 0;
52522+
52523+ memcpy(gr_system_salt, args->salt, GR_SALT_LEN);
52524+ memcpy(gr_system_sum, args->sum, GR_SHA_LEN);
52525+
52526+ if (init_variables(args)) {
52527+ gr_log_str(GR_DONT_AUDIT_GOOD, GR_INITF_ACL_MSG, GR_VERSION);
52528+ error = -ENOMEM;
52529+ free_variables();
52530+ goto out;
52531+ }
52532+
52533+ error = copy_user_acl(args);
52534+ free_init_variables();
52535+ if (error) {
52536+ free_variables();
52537+ goto out;
52538+ }
52539+
52540+ if ((error = gr_set_acls(0))) {
52541+ free_variables();
52542+ goto out;
52543+ }
52544+
52545+ pax_open_kernel();
52546+ gr_status |= GR_READY;
52547+ pax_close_kernel();
52548+
52549+ out:
52550+ return error;
52551+}
52552+
52553+/* derived from glibc fnmatch() 0: match, 1: no match*/
52554+
52555+static int
52556+glob_match(const char *p, const char *n)
52557+{
52558+ char c;
52559+
52560+ while ((c = *p++) != '\0') {
52561+ switch (c) {
52562+ case '?':
52563+ if (*n == '\0')
52564+ return 1;
52565+ else if (*n == '/')
52566+ return 1;
52567+ break;
52568+ case '\\':
52569+ if (*n != c)
52570+ return 1;
52571+ break;
52572+ case '*':
52573+ for (c = *p++; c == '?' || c == '*'; c = *p++) {
52574+ if (*n == '/')
52575+ return 1;
52576+ else if (c == '?') {
52577+ if (*n == '\0')
52578+ return 1;
52579+ else
52580+ ++n;
52581+ }
52582+ }
52583+ if (c == '\0') {
52584+ return 0;
52585+ } else {
52586+ const char *endp;
52587+
52588+ if ((endp = strchr(n, '/')) == NULL)
52589+ endp = n + strlen(n);
52590+
52591+ if (c == '[') {
52592+ for (--p; n < endp; ++n)
52593+ if (!glob_match(p, n))
52594+ return 0;
52595+ } else if (c == '/') {
52596+ while (*n != '\0' && *n != '/')
52597+ ++n;
52598+ if (*n == '/' && !glob_match(p, n + 1))
52599+ return 0;
52600+ } else {
52601+ for (--p; n < endp; ++n)
52602+ if (*n == c && !glob_match(p, n))
52603+ return 0;
52604+ }
52605+
52606+ return 1;
52607+ }
52608+ case '[':
52609+ {
52610+ int not;
52611+ char cold;
52612+
52613+ if (*n == '\0' || *n == '/')
52614+ return 1;
52615+
52616+ not = (*p == '!' || *p == '^');
52617+ if (not)
52618+ ++p;
52619+
52620+ c = *p++;
52621+ for (;;) {
52622+ unsigned char fn = (unsigned char)*n;
52623+
52624+ if (c == '\0')
52625+ return 1;
52626+ else {
52627+ if (c == fn)
52628+ goto matched;
52629+ cold = c;
52630+ c = *p++;
52631+
52632+ if (c == '-' && *p != ']') {
52633+ unsigned char cend = *p++;
52634+
52635+ if (cend == '\0')
52636+ return 1;
52637+
52638+ if (cold <= fn && fn <= cend)
52639+ goto matched;
52640+
52641+ c = *p++;
52642+ }
52643+ }
52644+
52645+ if (c == ']')
52646+ break;
52647+ }
52648+ if (!not)
52649+ return 1;
52650+ break;
52651+ matched:
52652+ while (c != ']') {
52653+ if (c == '\0')
52654+ return 1;
52655+
52656+ c = *p++;
52657+ }
52658+ if (not)
52659+ return 1;
52660+ }
52661+ break;
52662+ default:
52663+ if (c != *n)
52664+ return 1;
52665+ }
52666+
52667+ ++n;
52668+ }
52669+
52670+ if (*n == '\0')
52671+ return 0;
52672+
52673+ if (*n == '/')
52674+ return 0;
52675+
52676+ return 1;
52677+}
52678+
52679+static struct acl_object_label *
52680+chk_glob_label(struct acl_object_label *globbed,
52681+ const struct dentry *dentry, const struct vfsmount *mnt, char **path)
52682+{
52683+ struct acl_object_label *tmp;
52684+
52685+ if (*path == NULL)
52686+ *path = gr_to_filename_nolock(dentry, mnt);
52687+
52688+ tmp = globbed;
52689+
52690+ while (tmp) {
52691+ if (!glob_match(tmp->filename, *path))
52692+ return tmp;
52693+ tmp = tmp->next;
52694+ }
52695+
52696+ return NULL;
52697+}
52698+
52699+static struct acl_object_label *
52700+__full_lookup(const struct dentry *orig_dentry, const struct vfsmount *orig_mnt,
52701+ const ino_t curr_ino, const dev_t curr_dev,
52702+ const struct acl_subject_label *subj, char **path, const int checkglob)
52703+{
52704+ struct acl_subject_label *tmpsubj;
52705+ struct acl_object_label *retval;
52706+ struct acl_object_label *retval2;
52707+
52708+ tmpsubj = (struct acl_subject_label *) subj;
52709+ read_lock(&gr_inode_lock);
52710+ do {
52711+ retval = lookup_acl_obj_label(curr_ino, curr_dev, tmpsubj);
52712+ if (retval) {
52713+ if (checkglob && retval->globbed) {
52714+ retval2 = chk_glob_label(retval->globbed, orig_dentry, orig_mnt, path);
52715+ if (retval2)
52716+ retval = retval2;
52717+ }
52718+ break;
52719+ }
52720+ } while ((tmpsubj = tmpsubj->parent_subject));
52721+ read_unlock(&gr_inode_lock);
52722+
52723+ return retval;
52724+}
52725+
52726+static __inline__ struct acl_object_label *
52727+full_lookup(const struct dentry *orig_dentry, const struct vfsmount *orig_mnt,
52728+ struct dentry *curr_dentry,
52729+ const struct acl_subject_label *subj, char **path, const int checkglob)
52730+{
52731+ int newglob = checkglob;
52732+ ino_t inode;
52733+ dev_t device;
52734+
52735+ /* if we aren't checking a subdirectory of the original path yet, don't do glob checking
52736+ as we don't want a / * rule to match instead of the / object
52737+ don't do this for create lookups that call this function though, since they're looking up
52738+ on the parent and thus need globbing checks on all paths
52739+ */
52740+ if (orig_dentry == curr_dentry && newglob != GR_CREATE_GLOB)
52741+ newglob = GR_NO_GLOB;
52742+
52743+ spin_lock(&curr_dentry->d_lock);
52744+ inode = curr_dentry->d_inode->i_ino;
52745+ device = __get_dev(curr_dentry);
52746+ spin_unlock(&curr_dentry->d_lock);
52747+
52748+ return __full_lookup(orig_dentry, orig_mnt, inode, device, subj, path, newglob);
52749+}
52750+
52751+static struct acl_object_label *
52752+__chk_obj_label(const struct dentry *l_dentry, const struct vfsmount *l_mnt,
52753+ const struct acl_subject_label *subj, char *path, const int checkglob)
52754+{
52755+ struct dentry *dentry = (struct dentry *) l_dentry;
52756+ struct vfsmount *mnt = (struct vfsmount *) l_mnt;
52757+ struct acl_object_label *retval;
52758+ struct dentry *parent;
52759+
52760+ write_seqlock(&rename_lock);
52761+ br_read_lock(vfsmount_lock);
52762+
52763+ if (unlikely((mnt == shm_mnt && dentry->d_inode->i_nlink == 0) || mnt == pipe_mnt ||
52764+#ifdef CONFIG_NET
52765+ mnt == sock_mnt ||
52766+#endif
52767+#ifdef CONFIG_HUGETLBFS
52768+ (mnt == hugetlbfs_vfsmount && dentry->d_inode->i_nlink == 0) ||
52769+#endif
52770+ /* ignore Eric Biederman */
52771+ IS_PRIVATE(l_dentry->d_inode))) {
52772+ retval = (subj->mode & GR_SHMEXEC) ? fakefs_obj_rwx : fakefs_obj_rw;
52773+ goto out;
52774+ }
52775+
52776+ for (;;) {
52777+ if (dentry == real_root.dentry && mnt == real_root.mnt)
52778+ break;
52779+
52780+ if (dentry == mnt->mnt_root || IS_ROOT(dentry)) {
52781+ if (mnt->mnt_parent == mnt)
52782+ break;
52783+
52784+ retval = full_lookup(l_dentry, l_mnt, dentry, subj, &path, checkglob);
52785+ if (retval != NULL)
52786+ goto out;
52787+
52788+ dentry = mnt->mnt_mountpoint;
52789+ mnt = mnt->mnt_parent;
52790+ continue;
52791+ }
52792+
52793+ parent = dentry->d_parent;
52794+ retval = full_lookup(l_dentry, l_mnt, dentry, subj, &path, checkglob);
52795+ if (retval != NULL)
52796+ goto out;
52797+
52798+ dentry = parent;
52799+ }
52800+
52801+ retval = full_lookup(l_dentry, l_mnt, dentry, subj, &path, checkglob);
52802+
52803+ /* real_root is pinned so we don't have to hold a reference */
52804+ if (retval == NULL)
52805+ retval = full_lookup(l_dentry, l_mnt, real_root.dentry, subj, &path, checkglob);
52806+out:
52807+ br_read_unlock(vfsmount_lock);
52808+ write_sequnlock(&rename_lock);
52809+
52810+ BUG_ON(retval == NULL);
52811+
52812+ return retval;
52813+}
52814+
52815+static __inline__ struct acl_object_label *
52816+chk_obj_label(const struct dentry *l_dentry, const struct vfsmount *l_mnt,
52817+ const struct acl_subject_label *subj)
52818+{
52819+ char *path = NULL;
52820+ return __chk_obj_label(l_dentry, l_mnt, subj, path, GR_REG_GLOB);
52821+}
52822+
52823+static __inline__ struct acl_object_label *
52824+chk_obj_label_noglob(const struct dentry *l_dentry, const struct vfsmount *l_mnt,
52825+ const struct acl_subject_label *subj)
52826+{
52827+ char *path = NULL;
52828+ return __chk_obj_label(l_dentry, l_mnt, subj, path, GR_NO_GLOB);
52829+}
52830+
52831+static __inline__ struct acl_object_label *
52832+chk_obj_create_label(const struct dentry *l_dentry, const struct vfsmount *l_mnt,
52833+ const struct acl_subject_label *subj, char *path)
52834+{
52835+ return __chk_obj_label(l_dentry, l_mnt, subj, path, GR_CREATE_GLOB);
52836+}
52837+
52838+static struct acl_subject_label *
52839+chk_subj_label(const struct dentry *l_dentry, const struct vfsmount *l_mnt,
52840+ const struct acl_role_label *role)
52841+{
52842+ struct dentry *dentry = (struct dentry *) l_dentry;
52843+ struct vfsmount *mnt = (struct vfsmount *) l_mnt;
52844+ struct acl_subject_label *retval;
52845+ struct dentry *parent;
52846+
52847+ write_seqlock(&rename_lock);
52848+ br_read_lock(vfsmount_lock);
52849+
52850+ for (;;) {
52851+ if (dentry == real_root.dentry && mnt == real_root.mnt)
52852+ break;
52853+ if (dentry == mnt->mnt_root || IS_ROOT(dentry)) {
52854+ if (mnt->mnt_parent == mnt)
52855+ break;
52856+
52857+ spin_lock(&dentry->d_lock);
52858+ read_lock(&gr_inode_lock);
52859+ retval =
52860+ lookup_acl_subj_label(dentry->d_inode->i_ino,
52861+ __get_dev(dentry), role);
52862+ read_unlock(&gr_inode_lock);
52863+ spin_unlock(&dentry->d_lock);
52864+ if (retval != NULL)
52865+ goto out;
52866+
52867+ dentry = mnt->mnt_mountpoint;
52868+ mnt = mnt->mnt_parent;
52869+ continue;
52870+ }
52871+
52872+ spin_lock(&dentry->d_lock);
52873+ read_lock(&gr_inode_lock);
52874+ retval = lookup_acl_subj_label(dentry->d_inode->i_ino,
52875+ __get_dev(dentry), role);
52876+ read_unlock(&gr_inode_lock);
52877+ parent = dentry->d_parent;
52878+ spin_unlock(&dentry->d_lock);
52879+
52880+ if (retval != NULL)
52881+ goto out;
52882+
52883+ dentry = parent;
52884+ }
52885+
52886+ spin_lock(&dentry->d_lock);
52887+ read_lock(&gr_inode_lock);
52888+ retval = lookup_acl_subj_label(dentry->d_inode->i_ino,
52889+ __get_dev(dentry), role);
52890+ read_unlock(&gr_inode_lock);
52891+ spin_unlock(&dentry->d_lock);
52892+
52893+ if (unlikely(retval == NULL)) {
52894+ /* real_root is pinned, we don't need to hold a reference */
52895+ read_lock(&gr_inode_lock);
52896+ retval = lookup_acl_subj_label(real_root.dentry->d_inode->i_ino,
52897+ __get_dev(real_root.dentry), role);
52898+ read_unlock(&gr_inode_lock);
52899+ }
52900+out:
52901+ br_read_unlock(vfsmount_lock);
52902+ write_sequnlock(&rename_lock);
52903+
52904+ BUG_ON(retval == NULL);
52905+
52906+ return retval;
52907+}
52908+
52909+static void
52910+gr_log_learn(const struct dentry *dentry, const struct vfsmount *mnt, const __u32 mode)
52911+{
52912+ struct task_struct *task = current;
52913+ const struct cred *cred = current_cred();
52914+
52915+ security_learn(GR_LEARN_AUDIT_MSG, task->role->rolename, task->role->roletype,
52916+ cred->uid, cred->gid, task->exec_file ? gr_to_filename1(task->exec_file->f_path.dentry,
52917+ task->exec_file->f_path.mnt) : task->acl->filename, task->acl->filename,
52918+ 1UL, 1UL, gr_to_filename(dentry, mnt), (unsigned long) mode, &task->signal->saved_ip);
52919+
52920+ return;
52921+}
52922+
52923+static void
52924+gr_log_learn_sysctl(const char *path, const __u32 mode)
52925+{
52926+ struct task_struct *task = current;
52927+ const struct cred *cred = current_cred();
52928+
52929+ security_learn(GR_LEARN_AUDIT_MSG, task->role->rolename, task->role->roletype,
52930+ cred->uid, cred->gid, task->exec_file ? gr_to_filename1(task->exec_file->f_path.dentry,
52931+ task->exec_file->f_path.mnt) : task->acl->filename, task->acl->filename,
52932+ 1UL, 1UL, path, (unsigned long) mode, &task->signal->saved_ip);
52933+
52934+ return;
52935+}
52936+
52937+static void
52938+gr_log_learn_id_change(const char type, const unsigned int real,
52939+ const unsigned int effective, const unsigned int fs)
52940+{
52941+ struct task_struct *task = current;
52942+ const struct cred *cred = current_cred();
52943+
52944+ security_learn(GR_ID_LEARN_MSG, task->role->rolename, task->role->roletype,
52945+ cred->uid, cred->gid, task->exec_file ? gr_to_filename1(task->exec_file->f_path.dentry,
52946+ task->exec_file->f_path.mnt) : task->acl->filename, task->acl->filename,
52947+ type, real, effective, fs, &task->signal->saved_ip);
52948+
52949+ return;
52950+}
52951+
52952+__u32
52953+gr_search_file(const struct dentry * dentry, const __u32 mode,
52954+ const struct vfsmount * mnt)
52955+{
52956+ __u32 retval = mode;
52957+ struct acl_subject_label *curracl;
52958+ struct acl_object_label *currobj;
52959+
52960+ if (unlikely(!(gr_status & GR_READY)))
52961+ return (mode & ~GR_AUDITS);
52962+
52963+ curracl = current->acl;
52964+
52965+ currobj = chk_obj_label(dentry, mnt, curracl);
52966+ retval = currobj->mode & mode;
52967+
52968+ /* if we're opening a specified transfer file for writing
52969+ (e.g. /dev/initctl), then transfer our role to init
52970+ */
52971+ if (unlikely(currobj->mode & GR_INIT_TRANSFER && retval & GR_WRITE &&
52972+ current->role->roletype & GR_ROLE_PERSIST)) {
52973+ struct task_struct *task = init_pid_ns.child_reaper;
52974+
52975+ if (task->role != current->role) {
52976+ task->acl_sp_role = 0;
52977+ task->acl_role_id = current->acl_role_id;
52978+ task->role = current->role;
52979+ rcu_read_lock();
52980+ read_lock(&grsec_exec_file_lock);
52981+ gr_apply_subject_to_task(task);
52982+ read_unlock(&grsec_exec_file_lock);
52983+ rcu_read_unlock();
52984+ gr_log_noargs(GR_DONT_AUDIT_GOOD, GR_INIT_TRANSFER_MSG);
52985+ }
52986+ }
52987+
52988+ if (unlikely
52989+ ((curracl->mode & (GR_LEARN | GR_INHERITLEARN)) && !(mode & GR_NOPTRACE)
52990+ && (retval != (mode & ~(GR_AUDITS | GR_SUPPRESS))))) {
52991+ __u32 new_mode = mode;
52992+
52993+ new_mode &= ~(GR_AUDITS | GR_SUPPRESS);
52994+
52995+ retval = new_mode;
52996+
52997+ if (new_mode & GR_EXEC && curracl->mode & GR_INHERITLEARN)
52998+ new_mode |= GR_INHERIT;
52999+
53000+ if (!(mode & GR_NOLEARN))
53001+ gr_log_learn(dentry, mnt, new_mode);
53002+ }
53003+
53004+ return retval;
53005+}
53006+
53007+struct acl_object_label *gr_get_create_object(const struct dentry *new_dentry,
53008+ const struct dentry *parent,
53009+ const struct vfsmount *mnt)
53010+{
53011+ struct name_entry *match;
53012+ struct acl_object_label *matchpo;
53013+ struct acl_subject_label *curracl;
53014+ char *path;
53015+
53016+ if (unlikely(!(gr_status & GR_READY)))
53017+ return NULL;
53018+
53019+ preempt_disable();
53020+ path = gr_to_filename_rbac(new_dentry, mnt);
53021+ match = lookup_name_entry_create(path);
53022+
53023+ curracl = current->acl;
53024+
53025+ if (match) {
53026+ read_lock(&gr_inode_lock);
53027+ matchpo = lookup_acl_obj_label_create(match->inode, match->device, curracl);
53028+ read_unlock(&gr_inode_lock);
53029+
53030+ if (matchpo) {
53031+ preempt_enable();
53032+ return matchpo;
53033+ }
53034+ }
53035+
53036+ // lookup parent
53037+
53038+ matchpo = chk_obj_create_label(parent, mnt, curracl, path);
53039+
53040+ preempt_enable();
53041+ return matchpo;
53042+}
53043+
53044+__u32
53045+gr_check_create(const struct dentry * new_dentry, const struct dentry * parent,
53046+ const struct vfsmount * mnt, const __u32 mode)
53047+{
53048+ struct acl_object_label *matchpo;
53049+ __u32 retval;
53050+
53051+ if (unlikely(!(gr_status & GR_READY)))
53052+ return (mode & ~GR_AUDITS);
53053+
53054+ matchpo = gr_get_create_object(new_dentry, parent, mnt);
53055+
53056+ retval = matchpo->mode & mode;
53057+
53058+ if ((retval != (mode & ~(GR_AUDITS | GR_SUPPRESS)))
53059+ && (current->acl->mode & (GR_LEARN | GR_INHERITLEARN))) {
53060+ __u32 new_mode = mode;
53061+
53062+ new_mode &= ~(GR_AUDITS | GR_SUPPRESS);
53063+
53064+ gr_log_learn(new_dentry, mnt, new_mode);
53065+ return new_mode;
53066+ }
53067+
53068+ return retval;
53069+}
53070+
53071+__u32
53072+gr_check_link(const struct dentry * new_dentry,
53073+ const struct dentry * parent_dentry,
53074+ const struct vfsmount * parent_mnt,
53075+ const struct dentry * old_dentry, const struct vfsmount * old_mnt)
53076+{
53077+ struct acl_object_label *obj;
53078+ __u32 oldmode, newmode;
53079+ __u32 needmode;
53080+ __u32 checkmodes = GR_FIND | GR_APPEND | GR_WRITE | GR_EXEC | GR_SETID | GR_READ |
53081+ GR_DELETE | GR_INHERIT;
53082+
53083+ if (unlikely(!(gr_status & GR_READY)))
53084+ return (GR_CREATE | GR_LINK);
53085+
53086+ obj = chk_obj_label(old_dentry, old_mnt, current->acl);
53087+ oldmode = obj->mode;
53088+
53089+ obj = gr_get_create_object(new_dentry, parent_dentry, parent_mnt);
53090+ newmode = obj->mode;
53091+
53092+ needmode = newmode & checkmodes;
53093+
53094+ // old name for hardlink must have at least the permissions of the new name
53095+ if ((oldmode & needmode) != needmode)
53096+ goto bad;
53097+
53098+ // if old name had restrictions/auditing, make sure the new name does as well
53099+ needmode = oldmode & (GR_NOPTRACE | GR_PTRACERD | GR_INHERIT | GR_AUDITS);
53100+
53101+ // don't allow hardlinking of suid/sgid files without permission
53102+ if (old_dentry->d_inode->i_mode & (S_ISUID | S_ISGID))
53103+ needmode |= GR_SETID;
53104+
53105+ if ((newmode & needmode) != needmode)
53106+ goto bad;
53107+
53108+ // enforce minimum permissions
53109+ if ((newmode & (GR_CREATE | GR_LINK)) == (GR_CREATE | GR_LINK))
53110+ return newmode;
53111+bad:
53112+ needmode = oldmode;
53113+ if (old_dentry->d_inode->i_mode & (S_ISUID | S_ISGID))
53114+ needmode |= GR_SETID;
53115+
53116+ if (current->acl->mode & (GR_LEARN | GR_INHERITLEARN)) {
53117+ gr_log_learn(old_dentry, old_mnt, needmode | GR_CREATE | GR_LINK);
53118+ return (GR_CREATE | GR_LINK);
53119+ } else if (newmode & GR_SUPPRESS)
53120+ return GR_SUPPRESS;
53121+ else
53122+ return 0;
53123+}
53124+
53125+int
53126+gr_check_hidden_task(const struct task_struct *task)
53127+{
53128+ if (unlikely(!(gr_status & GR_READY)))
53129+ return 0;
53130+
53131+ if (!(task->acl->mode & GR_PROCFIND) && !(current->acl->mode & GR_VIEW))
53132+ return 1;
53133+
53134+ return 0;
53135+}
53136+
53137+int
53138+gr_check_protected_task(const struct task_struct *task)
53139+{
53140+ if (unlikely(!(gr_status & GR_READY) || !task))
53141+ return 0;
53142+
53143+ if ((task->acl->mode & GR_PROTECTED) && !(current->acl->mode & GR_KILL) &&
53144+ task->acl != current->acl)
53145+ return 1;
53146+
53147+ return 0;
53148+}
53149+
53150+int
53151+gr_check_protected_task_fowner(struct pid *pid, enum pid_type type)
53152+{
53153+ struct task_struct *p;
53154+ int ret = 0;
53155+
53156+ if (unlikely(!(gr_status & GR_READY) || !pid))
53157+ return ret;
53158+
53159+ read_lock(&tasklist_lock);
53160+ do_each_pid_task(pid, type, p) {
53161+ if ((p->acl->mode & GR_PROTECTED) && !(current->acl->mode & GR_KILL) &&
53162+ p->acl != current->acl) {
53163+ ret = 1;
53164+ goto out;
53165+ }
53166+ } while_each_pid_task(pid, type, p);
53167+out:
53168+ read_unlock(&tasklist_lock);
53169+
53170+ return ret;
53171+}
53172+
53173+void
53174+gr_copy_label(struct task_struct *tsk)
53175+{
53176+ /* plain copying of fields is already done by dup_task_struct */
53177+ tsk->signal->used_accept = 0;
53178+ tsk->acl_sp_role = 0;
53179+ //tsk->acl_role_id = current->acl_role_id;
53180+ //tsk->acl = current->acl;
53181+ //tsk->role = current->role;
53182+ tsk->signal->curr_ip = current->signal->curr_ip;
53183+ tsk->signal->saved_ip = current->signal->saved_ip;
53184+ if (current->exec_file)
53185+ get_file(current->exec_file);
53186+ //tsk->exec_file = current->exec_file;
53187+ //tsk->is_writable = current->is_writable;
53188+ if (unlikely(current->signal->used_accept)) {
53189+ current->signal->curr_ip = 0;
53190+ current->signal->saved_ip = 0;
53191+ }
53192+
53193+ return;
53194+}
53195+
53196+static void
53197+gr_set_proc_res(struct task_struct *task)
53198+{
53199+ struct acl_subject_label *proc;
53200+ unsigned short i;
53201+
53202+ proc = task->acl;
53203+
53204+ if (proc->mode & (GR_LEARN | GR_INHERITLEARN))
53205+ return;
53206+
53207+ for (i = 0; i < RLIM_NLIMITS; i++) {
53208+ if (!(proc->resmask & (1 << i)))
53209+ continue;
53210+
53211+ task->signal->rlim[i].rlim_cur = proc->res[i].rlim_cur;
53212+ task->signal->rlim[i].rlim_max = proc->res[i].rlim_max;
53213+ }
53214+
53215+ return;
53216+}
53217+
53218+extern int __gr_process_user_ban(struct user_struct *user);
53219+
53220+int
53221+gr_check_user_change(int real, int effective, int fs)
53222+{
53223+ unsigned int i;
53224+ __u16 num;
53225+ uid_t *uidlist;
53226+ int curuid;
53227+ int realok = 0;
53228+ int effectiveok = 0;
53229+ int fsok = 0;
53230+
53231+#if defined(CONFIG_GRKERNSEC_KERN_LOCKOUT) || defined(CONFIG_GRKERNSEC_BRUTE)
53232+ struct user_struct *user;
53233+
53234+ if (real == -1)
53235+ goto skipit;
53236+
53237+ user = find_user(real);
53238+ if (user == NULL)
53239+ goto skipit;
53240+
53241+ if (__gr_process_user_ban(user)) {
53242+ /* for find_user */
53243+ free_uid(user);
53244+ return 1;
53245+ }
53246+
53247+ /* for find_user */
53248+ free_uid(user);
53249+
53250+skipit:
53251+#endif
53252+
53253+ if (unlikely(!(gr_status & GR_READY)))
53254+ return 0;
53255+
53256+ if (current->acl->mode & (GR_LEARN | GR_INHERITLEARN))
53257+ gr_log_learn_id_change('u', real, effective, fs);
53258+
53259+ num = current->acl->user_trans_num;
53260+ uidlist = current->acl->user_transitions;
53261+
53262+ if (uidlist == NULL)
53263+ return 0;
53264+
53265+ if (real == -1)
53266+ realok = 1;
53267+ if (effective == -1)
53268+ effectiveok = 1;
53269+ if (fs == -1)
53270+ fsok = 1;
53271+
53272+ if (current->acl->user_trans_type & GR_ID_ALLOW) {
53273+ for (i = 0; i < num; i++) {
53274+ curuid = (int)uidlist[i];
53275+ if (real == curuid)
53276+ realok = 1;
53277+ if (effective == curuid)
53278+ effectiveok = 1;
53279+ if (fs == curuid)
53280+ fsok = 1;
53281+ }
53282+ } else if (current->acl->user_trans_type & GR_ID_DENY) {
53283+ for (i = 0; i < num; i++) {
53284+ curuid = (int)uidlist[i];
53285+ if (real == curuid)
53286+ break;
53287+ if (effective == curuid)
53288+ break;
53289+ if (fs == curuid)
53290+ break;
53291+ }
53292+ /* not in deny list */
53293+ if (i == num) {
53294+ realok = 1;
53295+ effectiveok = 1;
53296+ fsok = 1;
53297+ }
53298+ }
53299+
53300+ if (realok && effectiveok && fsok)
53301+ return 0;
53302+ else {
53303+ gr_log_int(GR_DONT_AUDIT, GR_USRCHANGE_ACL_MSG, realok ? (effectiveok ? (fsok ? 0 : fs) : effective) : real);
53304+ return 1;
53305+ }
53306+}
53307+
53308+int
53309+gr_check_group_change(int real, int effective, int fs)
53310+{
53311+ unsigned int i;
53312+ __u16 num;
53313+ gid_t *gidlist;
53314+ int curgid;
53315+ int realok = 0;
53316+ int effectiveok = 0;
53317+ int fsok = 0;
53318+
53319+ if (unlikely(!(gr_status & GR_READY)))
53320+ return 0;
53321+
53322+ if (current->acl->mode & (GR_LEARN | GR_INHERITLEARN))
53323+ gr_log_learn_id_change('g', real, effective, fs);
53324+
53325+ num = current->acl->group_trans_num;
53326+ gidlist = current->acl->group_transitions;
53327+
53328+ if (gidlist == NULL)
53329+ return 0;
53330+
53331+ if (real == -1)
53332+ realok = 1;
53333+ if (effective == -1)
53334+ effectiveok = 1;
53335+ if (fs == -1)
53336+ fsok = 1;
53337+
53338+ if (current->acl->group_trans_type & GR_ID_ALLOW) {
53339+ for (i = 0; i < num; i++) {
53340+ curgid = (int)gidlist[i];
53341+ if (real == curgid)
53342+ realok = 1;
53343+ if (effective == curgid)
53344+ effectiveok = 1;
53345+ if (fs == curgid)
53346+ fsok = 1;
53347+ }
53348+ } else if (current->acl->group_trans_type & GR_ID_DENY) {
53349+ for (i = 0; i < num; i++) {
53350+ curgid = (int)gidlist[i];
53351+ if (real == curgid)
53352+ break;
53353+ if (effective == curgid)
53354+ break;
53355+ if (fs == curgid)
53356+ break;
53357+ }
53358+ /* not in deny list */
53359+ if (i == num) {
53360+ realok = 1;
53361+ effectiveok = 1;
53362+ fsok = 1;
53363+ }
53364+ }
53365+
53366+ if (realok && effectiveok && fsok)
53367+ return 0;
53368+ else {
53369+ gr_log_int(GR_DONT_AUDIT, GR_GRPCHANGE_ACL_MSG, realok ? (effectiveok ? (fsok ? 0 : fs) : effective) : real);
53370+ return 1;
53371+ }
53372+}
53373+
53374+extern int gr_acl_is_capable(const int cap);
53375+
53376+void
53377+gr_set_role_label(struct task_struct *task, const uid_t uid, const uid_t gid)
53378+{
53379+ struct acl_role_label *role = task->role;
53380+ struct acl_subject_label *subj = NULL;
53381+ struct acl_object_label *obj;
53382+ struct file *filp;
53383+
53384+ if (unlikely(!(gr_status & GR_READY)))
53385+ return;
53386+
53387+ filp = task->exec_file;
53388+
53389+ /* kernel process, we'll give them the kernel role */
53390+ if (unlikely(!filp)) {
53391+ task->role = kernel_role;
53392+ task->acl = kernel_role->root_label;
53393+ return;
53394+ } else if (!task->role || !(task->role->roletype & GR_ROLE_SPECIAL))
53395+ role = lookup_acl_role_label(task, uid, gid);
53396+
53397+ /* don't change the role if we're not a privileged process */
53398+ if (role && task->role != role &&
53399+ (((role->roletype & GR_ROLE_USER) && !gr_acl_is_capable(CAP_SETUID)) ||
53400+ ((role->roletype & GR_ROLE_GROUP) && !gr_acl_is_capable(CAP_SETGID))))
53401+ return;
53402+
53403+ /* perform subject lookup in possibly new role
53404+ we can use this result below in the case where role == task->role
53405+ */
53406+ subj = chk_subj_label(filp->f_path.dentry, filp->f_path.mnt, role);
53407+
53408+ /* if we changed uid/gid, but result in the same role
53409+ and are using inheritance, don't lose the inherited subject
53410+ if current subject is other than what normal lookup
53411+ would result in, we arrived via inheritance, don't
53412+ lose subject
53413+ */
53414+ if (role != task->role || (!(task->acl->mode & GR_INHERITLEARN) &&
53415+ (subj == task->acl)))
53416+ task->acl = subj;
53417+
53418+ task->role = role;
53419+
53420+ task->is_writable = 0;
53421+
53422+ /* ignore additional mmap checks for processes that are writable
53423+ by the default ACL */
53424+ obj = chk_obj_label(filp->f_path.dentry, filp->f_path.mnt, default_role->root_label);
53425+ if (unlikely(obj->mode & GR_WRITE))
53426+ task->is_writable = 1;
53427+ obj = chk_obj_label(filp->f_path.dentry, filp->f_path.mnt, task->role->root_label);
53428+ if (unlikely(obj->mode & GR_WRITE))
53429+ task->is_writable = 1;
53430+
53431+#ifdef CONFIG_GRKERNSEC_RBAC_DEBUG
53432+ printk(KERN_ALERT "Set role label for (%s:%d): role:%s, subject:%s\n", task->comm, task->pid, task->role->rolename, task->acl->filename);
53433+#endif
53434+
53435+ gr_set_proc_res(task);
53436+
53437+ return;
53438+}
53439+
53440+int
53441+gr_set_proc_label(const struct dentry *dentry, const struct vfsmount *mnt,
53442+ const int unsafe_flags)
53443+{
53444+ struct task_struct *task = current;
53445+ struct acl_subject_label *newacl;
53446+ struct acl_object_label *obj;
53447+ __u32 retmode;
53448+
53449+ if (unlikely(!(gr_status & GR_READY)))
53450+ return 0;
53451+
53452+ newacl = chk_subj_label(dentry, mnt, task->role);
53453+
53454+ task_lock(task);
53455+ if (unsafe_flags && !(task->acl->mode & GR_POVERRIDE) && (task->acl != newacl) &&
53456+ !(task->role->roletype & GR_ROLE_GOD) &&
53457+ !gr_search_file(dentry, GR_PTRACERD, mnt) &&
53458+ !(task->acl->mode & (GR_LEARN | GR_INHERITLEARN))) {
53459+ task_unlock(task);
53460+ if (unsafe_flags & LSM_UNSAFE_SHARE)
53461+ gr_log_fs_generic(GR_DONT_AUDIT, GR_UNSAFESHARE_EXEC_ACL_MSG, dentry, mnt);
53462+ else
53463+ gr_log_fs_generic(GR_DONT_AUDIT, GR_PTRACE_EXEC_ACL_MSG, dentry, mnt);
53464+ return -EACCES;
53465+ }
53466+ task_unlock(task);
53467+
53468+ obj = chk_obj_label(dentry, mnt, task->acl);
53469+ retmode = obj->mode & (GR_INHERIT | GR_AUDIT_INHERIT);
53470+
53471+ if (!(task->acl->mode & GR_INHERITLEARN) &&
53472+ ((newacl->mode & GR_LEARN) || !(retmode & GR_INHERIT))) {
53473+ if (obj->nested)
53474+ task->acl = obj->nested;
53475+ else
53476+ task->acl = newacl;
53477+ } else if (retmode & GR_INHERIT && retmode & GR_AUDIT_INHERIT)
53478+ gr_log_str_fs(GR_DO_AUDIT, GR_INHERIT_ACL_MSG, task->acl->filename, dentry, mnt);
53479+
53480+ task->is_writable = 0;
53481+
53482+ /* ignore additional mmap checks for processes that are writable
53483+ by the default ACL */
53484+ obj = chk_obj_label(dentry, mnt, default_role->root_label);
53485+ if (unlikely(obj->mode & GR_WRITE))
53486+ task->is_writable = 1;
53487+ obj = chk_obj_label(dentry, mnt, task->role->root_label);
53488+ if (unlikely(obj->mode & GR_WRITE))
53489+ task->is_writable = 1;
53490+
53491+ gr_set_proc_res(task);
53492+
53493+#ifdef CONFIG_GRKERNSEC_RBAC_DEBUG
53494+ printk(KERN_ALERT "Set subject label for (%s:%d): role:%s, subject:%s\n", task->comm, task->pid, task->role->rolename, task->acl->filename);
53495+#endif
53496+ return 0;
53497+}
53498+
53499+/* always called with valid inodev ptr */
53500+static void
53501+do_handle_delete(struct inodev_entry *inodev, const ino_t ino, const dev_t dev)
53502+{
53503+ struct acl_object_label *matchpo;
53504+ struct acl_subject_label *matchps;
53505+ struct acl_subject_label *subj;
53506+ struct acl_role_label *role;
53507+ unsigned int x;
53508+
53509+ FOR_EACH_ROLE_START(role)
53510+ FOR_EACH_SUBJECT_START(role, subj, x)
53511+ if ((matchpo = lookup_acl_obj_label(ino, dev, subj)) != NULL)
53512+ matchpo->mode |= GR_DELETED;
53513+ FOR_EACH_SUBJECT_END(subj,x)
53514+ FOR_EACH_NESTED_SUBJECT_START(role, subj)
53515+ if (subj->inode == ino && subj->device == dev)
53516+ subj->mode |= GR_DELETED;
53517+ FOR_EACH_NESTED_SUBJECT_END(subj)
53518+ if ((matchps = lookup_acl_subj_label(ino, dev, role)) != NULL)
53519+ matchps->mode |= GR_DELETED;
53520+ FOR_EACH_ROLE_END(role)
53521+
53522+ inodev->nentry->deleted = 1;
53523+
53524+ return;
53525+}
53526+
53527+void
53528+gr_handle_delete(const ino_t ino, const dev_t dev)
53529+{
53530+ struct inodev_entry *inodev;
53531+
53532+ if (unlikely(!(gr_status & GR_READY)))
53533+ return;
53534+
53535+ write_lock(&gr_inode_lock);
53536+ inodev = lookup_inodev_entry(ino, dev);
53537+ if (inodev != NULL)
53538+ do_handle_delete(inodev, ino, dev);
53539+ write_unlock(&gr_inode_lock);
53540+
53541+ return;
53542+}
53543+
53544+static void
53545+update_acl_obj_label(const ino_t oldinode, const dev_t olddevice,
53546+ const ino_t newinode, const dev_t newdevice,
53547+ struct acl_subject_label *subj)
53548+{
53549+ unsigned int index = fhash(oldinode, olddevice, subj->obj_hash_size);
53550+ struct acl_object_label *match;
53551+
53552+ match = subj->obj_hash[index];
53553+
53554+ while (match && (match->inode != oldinode ||
53555+ match->device != olddevice ||
53556+ !(match->mode & GR_DELETED)))
53557+ match = match->next;
53558+
53559+ if (match && (match->inode == oldinode)
53560+ && (match->device == olddevice)
53561+ && (match->mode & GR_DELETED)) {
53562+ if (match->prev == NULL) {
53563+ subj->obj_hash[index] = match->next;
53564+ if (match->next != NULL)
53565+ match->next->prev = NULL;
53566+ } else {
53567+ match->prev->next = match->next;
53568+ if (match->next != NULL)
53569+ match->next->prev = match->prev;
53570+ }
53571+ match->prev = NULL;
53572+ match->next = NULL;
53573+ match->inode = newinode;
53574+ match->device = newdevice;
53575+ match->mode &= ~GR_DELETED;
53576+
53577+ insert_acl_obj_label(match, subj);
53578+ }
53579+
53580+ return;
53581+}
53582+
53583+static void
53584+update_acl_subj_label(const ino_t oldinode, const dev_t olddevice,
53585+ const ino_t newinode, const dev_t newdevice,
53586+ struct acl_role_label *role)
53587+{
53588+ unsigned int index = fhash(oldinode, olddevice, role->subj_hash_size);
53589+ struct acl_subject_label *match;
53590+
53591+ match = role->subj_hash[index];
53592+
53593+ while (match && (match->inode != oldinode ||
53594+ match->device != olddevice ||
53595+ !(match->mode & GR_DELETED)))
53596+ match = match->next;
53597+
53598+ if (match && (match->inode == oldinode)
53599+ && (match->device == olddevice)
53600+ && (match->mode & GR_DELETED)) {
53601+ if (match->prev == NULL) {
53602+ role->subj_hash[index] = match->next;
53603+ if (match->next != NULL)
53604+ match->next->prev = NULL;
53605+ } else {
53606+ match->prev->next = match->next;
53607+ if (match->next != NULL)
53608+ match->next->prev = match->prev;
53609+ }
53610+ match->prev = NULL;
53611+ match->next = NULL;
53612+ match->inode = newinode;
53613+ match->device = newdevice;
53614+ match->mode &= ~GR_DELETED;
53615+
53616+ insert_acl_subj_label(match, role);
53617+ }
53618+
53619+ return;
53620+}
53621+
53622+static void
53623+update_inodev_entry(const ino_t oldinode, const dev_t olddevice,
53624+ const ino_t newinode, const dev_t newdevice)
53625+{
53626+ unsigned int index = fhash(oldinode, olddevice, inodev_set.i_size);
53627+ struct inodev_entry *match;
53628+
53629+ match = inodev_set.i_hash[index];
53630+
53631+ while (match && (match->nentry->inode != oldinode ||
53632+ match->nentry->device != olddevice || !match->nentry->deleted))
53633+ match = match->next;
53634+
53635+ if (match && (match->nentry->inode == oldinode)
53636+ && (match->nentry->device == olddevice) &&
53637+ match->nentry->deleted) {
53638+ if (match->prev == NULL) {
53639+ inodev_set.i_hash[index] = match->next;
53640+ if (match->next != NULL)
53641+ match->next->prev = NULL;
53642+ } else {
53643+ match->prev->next = match->next;
53644+ if (match->next != NULL)
53645+ match->next->prev = match->prev;
53646+ }
53647+ match->prev = NULL;
53648+ match->next = NULL;
53649+ match->nentry->inode = newinode;
53650+ match->nentry->device = newdevice;
53651+ match->nentry->deleted = 0;
53652+
53653+ insert_inodev_entry(match);
53654+ }
53655+
53656+ return;
53657+}
53658+
53659+static void
53660+__do_handle_create(const struct name_entry *matchn, ino_t ino, dev_t dev)
53661+{
53662+ struct acl_subject_label *subj;
53663+ struct acl_role_label *role;
53664+ unsigned int x;
53665+
53666+ FOR_EACH_ROLE_START(role)
53667+ update_acl_subj_label(matchn->inode, matchn->device, ino, dev, role);
53668+
53669+ FOR_EACH_NESTED_SUBJECT_START(role, subj)
53670+ if ((subj->inode == ino) && (subj->device == dev)) {
53671+ subj->inode = ino;
53672+ subj->device = dev;
53673+ }
53674+ FOR_EACH_NESTED_SUBJECT_END(subj)
53675+ FOR_EACH_SUBJECT_START(role, subj, x)
53676+ update_acl_obj_label(matchn->inode, matchn->device,
53677+ ino, dev, subj);
53678+ FOR_EACH_SUBJECT_END(subj,x)
53679+ FOR_EACH_ROLE_END(role)
53680+
53681+ update_inodev_entry(matchn->inode, matchn->device, ino, dev);
53682+
53683+ return;
53684+}
53685+
53686+static void
53687+do_handle_create(const struct name_entry *matchn, const struct dentry *dentry,
53688+ const struct vfsmount *mnt)
53689+{
53690+ ino_t ino = dentry->d_inode->i_ino;
53691+ dev_t dev = __get_dev(dentry);
53692+
53693+ __do_handle_create(matchn, ino, dev);
53694+
53695+ return;
53696+}
53697+
53698+void
53699+gr_handle_create(const struct dentry *dentry, const struct vfsmount *mnt)
53700+{
53701+ struct name_entry *matchn;
53702+
53703+ if (unlikely(!(gr_status & GR_READY)))
53704+ return;
53705+
53706+ preempt_disable();
53707+ matchn = lookup_name_entry(gr_to_filename_rbac(dentry, mnt));
53708+
53709+ if (unlikely((unsigned long)matchn)) {
53710+ write_lock(&gr_inode_lock);
53711+ do_handle_create(matchn, dentry, mnt);
53712+ write_unlock(&gr_inode_lock);
53713+ }
53714+ preempt_enable();
53715+
53716+ return;
53717+}
53718+
53719+void
53720+gr_handle_proc_create(const struct dentry *dentry, const struct inode *inode)
53721+{
53722+ struct name_entry *matchn;
53723+
53724+ if (unlikely(!(gr_status & GR_READY)))
53725+ return;
53726+
53727+ preempt_disable();
53728+ matchn = lookup_name_entry(gr_to_proc_filename_rbac(dentry, init_pid_ns.proc_mnt));
53729+
53730+ if (unlikely((unsigned long)matchn)) {
53731+ write_lock(&gr_inode_lock);
53732+ __do_handle_create(matchn, inode->i_ino, inode->i_sb->s_dev);
53733+ write_unlock(&gr_inode_lock);
53734+ }
53735+ preempt_enable();
53736+
53737+ return;
53738+}
53739+
53740+void
53741+gr_handle_rename(struct inode *old_dir, struct inode *new_dir,
53742+ struct dentry *old_dentry,
53743+ struct dentry *new_dentry,
53744+ struct vfsmount *mnt, const __u8 replace)
53745+{
53746+ struct name_entry *matchn;
53747+ struct inodev_entry *inodev;
53748+ struct inode *inode = new_dentry->d_inode;
53749+ ino_t old_ino = old_dentry->d_inode->i_ino;
53750+ dev_t old_dev = __get_dev(old_dentry);
53751+
53752+ /* vfs_rename swaps the name and parent link for old_dentry and
53753+ new_dentry
53754+ at this point, old_dentry has the new name, parent link, and inode
53755+ for the renamed file
53756+ if a file is being replaced by a rename, new_dentry has the inode
53757+ and name for the replaced file
53758+ */
53759+
53760+ if (unlikely(!(gr_status & GR_READY)))
53761+ return;
53762+
53763+ preempt_disable();
53764+ matchn = lookup_name_entry(gr_to_filename_rbac(old_dentry, mnt));
53765+
53766+ /* we wouldn't have to check d_inode if it weren't for
53767+ NFS silly-renaming
53768+ */
53769+
53770+ write_lock(&gr_inode_lock);
53771+ if (unlikely(replace && inode)) {
53772+ ino_t new_ino = inode->i_ino;
53773+ dev_t new_dev = __get_dev(new_dentry);
53774+
53775+ inodev = lookup_inodev_entry(new_ino, new_dev);
53776+ if (inodev != NULL && ((inode->i_nlink <= 1) || S_ISDIR(inode->i_mode)))
53777+ do_handle_delete(inodev, new_ino, new_dev);
53778+ }
53779+
53780+ inodev = lookup_inodev_entry(old_ino, old_dev);
53781+ if (inodev != NULL && ((old_dentry->d_inode->i_nlink <= 1) || S_ISDIR(old_dentry->d_inode->i_mode)))
53782+ do_handle_delete(inodev, old_ino, old_dev);
53783+
53784+ if (unlikely((unsigned long)matchn))
53785+ do_handle_create(matchn, old_dentry, mnt);
53786+
53787+ write_unlock(&gr_inode_lock);
53788+ preempt_enable();
53789+
53790+ return;
53791+}
53792+
53793+static int
53794+lookup_special_role_auth(__u16 mode, const char *rolename, unsigned char **salt,
53795+ unsigned char **sum)
53796+{
53797+ struct acl_role_label *r;
53798+ struct role_allowed_ip *ipp;
53799+ struct role_transition *trans;
53800+ unsigned int i;
53801+ int found = 0;
53802+ u32 curr_ip = current->signal->curr_ip;
53803+
53804+ current->signal->saved_ip = curr_ip;
53805+
53806+ /* check transition table */
53807+
53808+ for (trans = current->role->transitions; trans; trans = trans->next) {
53809+ if (!strcmp(rolename, trans->rolename)) {
53810+ found = 1;
53811+ break;
53812+ }
53813+ }
53814+
53815+ if (!found)
53816+ return 0;
53817+
53818+ /* handle special roles that do not require authentication
53819+ and check ip */
53820+
53821+ FOR_EACH_ROLE_START(r)
53822+ if (!strcmp(rolename, r->rolename) &&
53823+ (r->roletype & GR_ROLE_SPECIAL)) {
53824+ found = 0;
53825+ if (r->allowed_ips != NULL) {
53826+ for (ipp = r->allowed_ips; ipp; ipp = ipp->next) {
53827+ if ((ntohl(curr_ip) & ipp->netmask) ==
53828+ (ntohl(ipp->addr) & ipp->netmask))
53829+ found = 1;
53830+ }
53831+ } else
53832+ found = 2;
53833+ if (!found)
53834+ return 0;
53835+
53836+ if (((mode == GR_SPROLE) && (r->roletype & GR_ROLE_NOPW)) ||
53837+ ((mode == GR_SPROLEPAM) && (r->roletype & GR_ROLE_PAM))) {
53838+ *salt = NULL;
53839+ *sum = NULL;
53840+ return 1;
53841+ }
53842+ }
53843+ FOR_EACH_ROLE_END(r)
53844+
53845+ for (i = 0; i < num_sprole_pws; i++) {
53846+ if (!strcmp(rolename, acl_special_roles[i]->rolename)) {
53847+ *salt = acl_special_roles[i]->salt;
53848+ *sum = acl_special_roles[i]->sum;
53849+ return 1;
53850+ }
53851+ }
53852+
53853+ return 0;
53854+}
53855+
53856+static void
53857+assign_special_role(char *rolename)
53858+{
53859+ struct acl_object_label *obj;
53860+ struct acl_role_label *r;
53861+ struct acl_role_label *assigned = NULL;
53862+ struct task_struct *tsk;
53863+ struct file *filp;
53864+
53865+ FOR_EACH_ROLE_START(r)
53866+ if (!strcmp(rolename, r->rolename) &&
53867+ (r->roletype & GR_ROLE_SPECIAL)) {
53868+ assigned = r;
53869+ break;
53870+ }
53871+ FOR_EACH_ROLE_END(r)
53872+
53873+ if (!assigned)
53874+ return;
53875+
53876+ read_lock(&tasklist_lock);
53877+ read_lock(&grsec_exec_file_lock);
53878+
53879+ tsk = current->real_parent;
53880+ if (tsk == NULL)
53881+ goto out_unlock;
53882+
53883+ filp = tsk->exec_file;
53884+ if (filp == NULL)
53885+ goto out_unlock;
53886+
53887+ tsk->is_writable = 0;
53888+
53889+ tsk->acl_sp_role = 1;
53890+ tsk->acl_role_id = ++acl_sp_role_value;
53891+ tsk->role = assigned;
53892+ tsk->acl = chk_subj_label(filp->f_path.dentry, filp->f_path.mnt, tsk->role);
53893+
53894+ /* ignore additional mmap checks for processes that are writable
53895+ by the default ACL */
53896+ obj = chk_obj_label(filp->f_path.dentry, filp->f_path.mnt, default_role->root_label);
53897+ if (unlikely(obj->mode & GR_WRITE))
53898+ tsk->is_writable = 1;
53899+ obj = chk_obj_label(filp->f_path.dentry, filp->f_path.mnt, tsk->role->root_label);
53900+ if (unlikely(obj->mode & GR_WRITE))
53901+ tsk->is_writable = 1;
53902+
53903+#ifdef CONFIG_GRKERNSEC_RBAC_DEBUG
53904+ printk(KERN_ALERT "Assigning special role:%s subject:%s to process (%s:%d)\n", tsk->role->rolename, tsk->acl->filename, tsk->comm, tsk->pid);
53905+#endif
53906+
53907+out_unlock:
53908+ read_unlock(&grsec_exec_file_lock);
53909+ read_unlock(&tasklist_lock);
53910+ return;
53911+}
53912+
53913+int gr_check_secure_terminal(struct task_struct *task)
53914+{
53915+ struct task_struct *p, *p2, *p3;
53916+ struct files_struct *files;
53917+ struct fdtable *fdt;
53918+ struct file *our_file = NULL, *file;
53919+ int i;
53920+
53921+ if (task->signal->tty == NULL)
53922+ return 1;
53923+
53924+ files = get_files_struct(task);
53925+ if (files != NULL) {
53926+ rcu_read_lock();
53927+ fdt = files_fdtable(files);
53928+ for (i=0; i < fdt->max_fds; i++) {
53929+ file = fcheck_files(files, i);
53930+ if (file && (our_file == NULL) && (file->private_data == task->signal->tty)) {
53931+ get_file(file);
53932+ our_file = file;
53933+ }
53934+ }
53935+ rcu_read_unlock();
53936+ put_files_struct(files);
53937+ }
53938+
53939+ if (our_file == NULL)
53940+ return 1;
53941+
53942+ read_lock(&tasklist_lock);
53943+ do_each_thread(p2, p) {
53944+ files = get_files_struct(p);
53945+ if (files == NULL ||
53946+ (p->signal && p->signal->tty == task->signal->tty)) {
53947+ if (files != NULL)
53948+ put_files_struct(files);
53949+ continue;
53950+ }
53951+ rcu_read_lock();
53952+ fdt = files_fdtable(files);
53953+ for (i=0; i < fdt->max_fds; i++) {
53954+ file = fcheck_files(files, i);
53955+ if (file && S_ISCHR(file->f_path.dentry->d_inode->i_mode) &&
53956+ file->f_path.dentry->d_inode->i_rdev == our_file->f_path.dentry->d_inode->i_rdev) {
53957+ p3 = task;
53958+ while (p3->pid > 0) {
53959+ if (p3 == p)
53960+ break;
53961+ p3 = p3->real_parent;
53962+ }
53963+ if (p3 == p)
53964+ break;
53965+ gr_log_ttysniff(GR_DONT_AUDIT_GOOD, GR_TTYSNIFF_ACL_MSG, p);
53966+ gr_handle_alertkill(p);
53967+ rcu_read_unlock();
53968+ put_files_struct(files);
53969+ read_unlock(&tasklist_lock);
53970+ fput(our_file);
53971+ return 0;
53972+ }
53973+ }
53974+ rcu_read_unlock();
53975+ put_files_struct(files);
53976+ } while_each_thread(p2, p);
53977+ read_unlock(&tasklist_lock);
53978+
53979+ fput(our_file);
53980+ return 1;
53981+}
53982+
53983+ssize_t
53984+write_grsec_handler(struct file *file, const char * buf, size_t count, loff_t *ppos)
53985+{
53986+ struct gr_arg_wrapper uwrap;
53987+ unsigned char *sprole_salt = NULL;
53988+ unsigned char *sprole_sum = NULL;
53989+ int error = sizeof (struct gr_arg_wrapper);
53990+ int error2 = 0;
53991+
53992+ mutex_lock(&gr_dev_mutex);
53993+
53994+ if ((gr_status & GR_READY) && !(current->acl->mode & GR_KERNELAUTH)) {
53995+ error = -EPERM;
53996+ goto out;
53997+ }
53998+
53999+ if (count != sizeof (struct gr_arg_wrapper)) {
54000+ gr_log_int_int(GR_DONT_AUDIT_GOOD, GR_DEV_ACL_MSG, (int)count, (int)sizeof(struct gr_arg_wrapper));
54001+ error = -EINVAL;
54002+ goto out;
54003+ }
54004+
54005+
54006+ if (gr_auth_expires && time_after_eq(get_seconds(), gr_auth_expires)) {
54007+ gr_auth_expires = 0;
54008+ gr_auth_attempts = 0;
54009+ }
54010+
54011+ if (copy_from_user(&uwrap, buf, sizeof (struct gr_arg_wrapper))) {
54012+ error = -EFAULT;
54013+ goto out;
54014+ }
54015+
54016+ if ((uwrap.version != GRSECURITY_VERSION) || (uwrap.size != sizeof(struct gr_arg))) {
54017+ error = -EINVAL;
54018+ goto out;
54019+ }
54020+
54021+ if (copy_from_user(gr_usermode, uwrap.arg, sizeof (struct gr_arg))) {
54022+ error = -EFAULT;
54023+ goto out;
54024+ }
54025+
54026+ if (gr_usermode->mode != GR_SPROLE && gr_usermode->mode != GR_SPROLEPAM &&
54027+ gr_auth_attempts >= CONFIG_GRKERNSEC_ACL_MAXTRIES &&
54028+ time_after(gr_auth_expires, get_seconds())) {
54029+ error = -EBUSY;
54030+ goto out;
54031+ }
54032+
54033+ /* if non-root trying to do anything other than use a special role,
54034+ do not attempt authentication, do not count towards authentication
54035+ locking
54036+ */
54037+
54038+ if (gr_usermode->mode != GR_SPROLE && gr_usermode->mode != GR_STATUS &&
54039+ gr_usermode->mode != GR_UNSPROLE && gr_usermode->mode != GR_SPROLEPAM &&
54040+ current_uid()) {
54041+ error = -EPERM;
54042+ goto out;
54043+ }
54044+
54045+ /* ensure pw and special role name are null terminated */
54046+
54047+ gr_usermode->pw[GR_PW_LEN - 1] = '\0';
54048+ gr_usermode->sp_role[GR_SPROLE_LEN - 1] = '\0';
54049+
54050+ /* Okay.
54051+ * We have our enough of the argument structure..(we have yet
54052+ * to copy_from_user the tables themselves) . Copy the tables
54053+ * only if we need them, i.e. for loading operations. */
54054+
54055+ switch (gr_usermode->mode) {
54056+ case GR_STATUS:
54057+ if (gr_status & GR_READY) {
54058+ error = 1;
54059+ if (!gr_check_secure_terminal(current))
54060+ error = 3;
54061+ } else
54062+ error = 2;
54063+ goto out;
54064+ case GR_SHUTDOWN:
54065+ if ((gr_status & GR_READY)
54066+ && !(chkpw(gr_usermode, gr_system_salt, gr_system_sum))) {
54067+ pax_open_kernel();
54068+ gr_status &= ~GR_READY;
54069+ pax_close_kernel();
54070+
54071+ gr_log_noargs(GR_DONT_AUDIT_GOOD, GR_SHUTS_ACL_MSG);
54072+ free_variables();
54073+ memset(gr_usermode, 0, sizeof (struct gr_arg));
54074+ memset(gr_system_salt, 0, GR_SALT_LEN);
54075+ memset(gr_system_sum, 0, GR_SHA_LEN);
54076+ } else if (gr_status & GR_READY) {
54077+ gr_log_noargs(GR_DONT_AUDIT, GR_SHUTF_ACL_MSG);
54078+ error = -EPERM;
54079+ } else {
54080+ gr_log_noargs(GR_DONT_AUDIT_GOOD, GR_SHUTI_ACL_MSG);
54081+ error = -EAGAIN;
54082+ }
54083+ break;
54084+ case GR_ENABLE:
54085+ if (!(gr_status & GR_READY) && !(error2 = gracl_init(gr_usermode)))
54086+ gr_log_str(GR_DONT_AUDIT_GOOD, GR_ENABLE_ACL_MSG, GR_VERSION);
54087+ else {
54088+ if (gr_status & GR_READY)
54089+ error = -EAGAIN;
54090+ else
54091+ error = error2;
54092+ gr_log_str(GR_DONT_AUDIT, GR_ENABLEF_ACL_MSG, GR_VERSION);
54093+ }
54094+ break;
54095+ case GR_RELOAD:
54096+ if (!(gr_status & GR_READY)) {
54097+ gr_log_str(GR_DONT_AUDIT_GOOD, GR_RELOADI_ACL_MSG, GR_VERSION);
54098+ error = -EAGAIN;
54099+ } else if (!(chkpw(gr_usermode, gr_system_salt, gr_system_sum))) {
54100+ preempt_disable();
54101+
54102+ pax_open_kernel();
54103+ gr_status &= ~GR_READY;
54104+ pax_close_kernel();
54105+
54106+ free_variables();
54107+ if (!(error2 = gracl_init(gr_usermode))) {
54108+ preempt_enable();
54109+ gr_log_str(GR_DONT_AUDIT_GOOD, GR_RELOAD_ACL_MSG, GR_VERSION);
54110+ } else {
54111+ preempt_enable();
54112+ error = error2;
54113+ gr_log_str(GR_DONT_AUDIT, GR_RELOADF_ACL_MSG, GR_VERSION);
54114+ }
54115+ } else {
54116+ gr_log_str(GR_DONT_AUDIT, GR_RELOADF_ACL_MSG, GR_VERSION);
54117+ error = -EPERM;
54118+ }
54119+ break;
54120+ case GR_SEGVMOD:
54121+ if (unlikely(!(gr_status & GR_READY))) {
54122+ gr_log_noargs(GR_DONT_AUDIT_GOOD, GR_SEGVMODI_ACL_MSG);
54123+ error = -EAGAIN;
54124+ break;
54125+ }
54126+
54127+ if (!(chkpw(gr_usermode, gr_system_salt, gr_system_sum))) {
54128+ gr_log_noargs(GR_DONT_AUDIT_GOOD, GR_SEGVMODS_ACL_MSG);
54129+ if (gr_usermode->segv_device && gr_usermode->segv_inode) {
54130+ struct acl_subject_label *segvacl;
54131+ segvacl =
54132+ lookup_acl_subj_label(gr_usermode->segv_inode,
54133+ gr_usermode->segv_device,
54134+ current->role);
54135+ if (segvacl) {
54136+ segvacl->crashes = 0;
54137+ segvacl->expires = 0;
54138+ }
54139+ } else if (gr_find_uid(gr_usermode->segv_uid) >= 0) {
54140+ gr_remove_uid(gr_usermode->segv_uid);
54141+ }
54142+ } else {
54143+ gr_log_noargs(GR_DONT_AUDIT, GR_SEGVMODF_ACL_MSG);
54144+ error = -EPERM;
54145+ }
54146+ break;
54147+ case GR_SPROLE:
54148+ case GR_SPROLEPAM:
54149+ if (unlikely(!(gr_status & GR_READY))) {
54150+ gr_log_noargs(GR_DONT_AUDIT_GOOD, GR_SPROLEI_ACL_MSG);
54151+ error = -EAGAIN;
54152+ break;
54153+ }
54154+
54155+ if (current->role->expires && time_after_eq(get_seconds(), current->role->expires)) {
54156+ current->role->expires = 0;
54157+ current->role->auth_attempts = 0;
54158+ }
54159+
54160+ if (current->role->auth_attempts >= CONFIG_GRKERNSEC_ACL_MAXTRIES &&
54161+ time_after(current->role->expires, get_seconds())) {
54162+ error = -EBUSY;
54163+ goto out;
54164+ }
54165+
54166+ if (lookup_special_role_auth
54167+ (gr_usermode->mode, gr_usermode->sp_role, &sprole_salt, &sprole_sum)
54168+ && ((!sprole_salt && !sprole_sum)
54169+ || !(chkpw(gr_usermode, sprole_salt, sprole_sum)))) {
54170+ char *p = "";
54171+ assign_special_role(gr_usermode->sp_role);
54172+ read_lock(&tasklist_lock);
54173+ if (current->real_parent)
54174+ p = current->real_parent->role->rolename;
54175+ read_unlock(&tasklist_lock);
54176+ gr_log_str_int(GR_DONT_AUDIT_GOOD, GR_SPROLES_ACL_MSG,
54177+ p, acl_sp_role_value);
54178+ } else {
54179+ gr_log_str(GR_DONT_AUDIT, GR_SPROLEF_ACL_MSG, gr_usermode->sp_role);
54180+ error = -EPERM;
54181+ if(!(current->role->auth_attempts++))
54182+ current->role->expires = get_seconds() + CONFIG_GRKERNSEC_ACL_TIMEOUT;
54183+
54184+ goto out;
54185+ }
54186+ break;
54187+ case GR_UNSPROLE:
54188+ if (unlikely(!(gr_status & GR_READY))) {
54189+ gr_log_noargs(GR_DONT_AUDIT_GOOD, GR_UNSPROLEI_ACL_MSG);
54190+ error = -EAGAIN;
54191+ break;
54192+ }
54193+
54194+ if (current->role->roletype & GR_ROLE_SPECIAL) {
54195+ char *p = "";
54196+ int i = 0;
54197+
54198+ read_lock(&tasklist_lock);
54199+ if (current->real_parent) {
54200+ p = current->real_parent->role->rolename;
54201+ i = current->real_parent->acl_role_id;
54202+ }
54203+ read_unlock(&tasklist_lock);
54204+
54205+ gr_log_str_int(GR_DONT_AUDIT_GOOD, GR_UNSPROLES_ACL_MSG, p, i);
54206+ gr_set_acls(1);
54207+ } else {
54208+ error = -EPERM;
54209+ goto out;
54210+ }
54211+ break;
54212+ default:
54213+ gr_log_int(GR_DONT_AUDIT, GR_INVMODE_ACL_MSG, gr_usermode->mode);
54214+ error = -EINVAL;
54215+ break;
54216+ }
54217+
54218+ if (error != -EPERM)
54219+ goto out;
54220+
54221+ if(!(gr_auth_attempts++))
54222+ gr_auth_expires = get_seconds() + CONFIG_GRKERNSEC_ACL_TIMEOUT;
54223+
54224+ out:
54225+ mutex_unlock(&gr_dev_mutex);
54226+ return error;
54227+}
54228+
54229+/* must be called with
54230+ rcu_read_lock();
54231+ read_lock(&tasklist_lock);
54232+ read_lock(&grsec_exec_file_lock);
54233+*/
54234+int gr_apply_subject_to_task(struct task_struct *task)
54235+{
54236+ struct acl_object_label *obj;
54237+ char *tmpname;
54238+ struct acl_subject_label *tmpsubj;
54239+ struct file *filp;
54240+ struct name_entry *nmatch;
54241+
54242+ filp = task->exec_file;
54243+ if (filp == NULL)
54244+ return 0;
54245+
54246+ /* the following is to apply the correct subject
54247+ on binaries running when the RBAC system
54248+ is enabled, when the binaries have been
54249+ replaced or deleted since their execution
54250+ -----
54251+ when the RBAC system starts, the inode/dev
54252+ from exec_file will be one the RBAC system
54253+ is unaware of. It only knows the inode/dev
54254+ of the present file on disk, or the absence
54255+ of it.
54256+ */
54257+ preempt_disable();
54258+ tmpname = gr_to_filename_rbac(filp->f_path.dentry, filp->f_path.mnt);
54259+
54260+ nmatch = lookup_name_entry(tmpname);
54261+ preempt_enable();
54262+ tmpsubj = NULL;
54263+ if (nmatch) {
54264+ if (nmatch->deleted)
54265+ tmpsubj = lookup_acl_subj_label_deleted(nmatch->inode, nmatch->device, task->role);
54266+ else
54267+ tmpsubj = lookup_acl_subj_label(nmatch->inode, nmatch->device, task->role);
54268+ if (tmpsubj != NULL)
54269+ task->acl = tmpsubj;
54270+ }
54271+ if (tmpsubj == NULL)
54272+ task->acl = chk_subj_label(filp->f_path.dentry, filp->f_path.mnt,
54273+ task->role);
54274+ if (task->acl) {
54275+ task->is_writable = 0;
54276+ /* ignore additional mmap checks for processes that are writable
54277+ by the default ACL */
54278+ obj = chk_obj_label(filp->f_path.dentry, filp->f_path.mnt, default_role->root_label);
54279+ if (unlikely(obj->mode & GR_WRITE))
54280+ task->is_writable = 1;
54281+ obj = chk_obj_label(filp->f_path.dentry, filp->f_path.mnt, task->role->root_label);
54282+ if (unlikely(obj->mode & GR_WRITE))
54283+ task->is_writable = 1;
54284+
54285+ gr_set_proc_res(task);
54286+
54287+#ifdef CONFIG_GRKERNSEC_RBAC_DEBUG
54288+ printk(KERN_ALERT "gr_set_acls for (%s:%d): role:%s, subject:%s\n", task->comm, task->pid, task->role->rolename, task->acl->filename);
54289+#endif
54290+ } else {
54291+ return 1;
54292+ }
54293+
54294+ return 0;
54295+}
54296+
54297+int
54298+gr_set_acls(const int type)
54299+{
54300+ struct task_struct *task, *task2;
54301+ struct acl_role_label *role = current->role;
54302+ __u16 acl_role_id = current->acl_role_id;
54303+ const struct cred *cred;
54304+ int ret;
54305+
54306+ rcu_read_lock();
54307+ read_lock(&tasklist_lock);
54308+ read_lock(&grsec_exec_file_lock);
54309+ do_each_thread(task2, task) {
54310+ /* check to see if we're called from the exit handler,
54311+ if so, only replace ACLs that have inherited the admin
54312+ ACL */
54313+
54314+ if (type && (task->role != role ||
54315+ task->acl_role_id != acl_role_id))
54316+ continue;
54317+
54318+ task->acl_role_id = 0;
54319+ task->acl_sp_role = 0;
54320+
54321+ if (task->exec_file) {
54322+ cred = __task_cred(task);
54323+ task->role = lookup_acl_role_label(task, cred->uid, cred->gid);
54324+ ret = gr_apply_subject_to_task(task);
54325+ if (ret) {
54326+ read_unlock(&grsec_exec_file_lock);
54327+ read_unlock(&tasklist_lock);
54328+ rcu_read_unlock();
54329+ gr_log_str_int(GR_DONT_AUDIT_GOOD, GR_DEFACL_MSG, task->comm, task->pid);
54330+ return ret;
54331+ }
54332+ } else {
54333+ // it's a kernel process
54334+ task->role = kernel_role;
54335+ task->acl = kernel_role->root_label;
54336+#ifdef CONFIG_GRKERNSEC_ACL_HIDEKERN
54337+ task->acl->mode &= ~GR_PROCFIND;
54338+#endif
54339+ }
54340+ } while_each_thread(task2, task);
54341+ read_unlock(&grsec_exec_file_lock);
54342+ read_unlock(&tasklist_lock);
54343+ rcu_read_unlock();
54344+
54345+ return 0;
54346+}
54347+
54348+void
54349+gr_learn_resource(const struct task_struct *task,
54350+ const int res, const unsigned long wanted, const int gt)
54351+{
54352+ struct acl_subject_label *acl;
54353+ const struct cred *cred;
54354+
54355+ if (unlikely((gr_status & GR_READY) &&
54356+ task->acl && (task->acl->mode & (GR_LEARN | GR_INHERITLEARN))))
54357+ goto skip_reslog;
54358+
54359+#ifdef CONFIG_GRKERNSEC_RESLOG
54360+ gr_log_resource(task, res, wanted, gt);
54361+#endif
54362+ skip_reslog:
54363+
54364+ if (unlikely(!(gr_status & GR_READY) || !wanted || res >= GR_NLIMITS))
54365+ return;
54366+
54367+ acl = task->acl;
54368+
54369+ if (likely(!acl || !(acl->mode & (GR_LEARN | GR_INHERITLEARN)) ||
54370+ !(acl->resmask & (1 << (unsigned short) res))))
54371+ return;
54372+
54373+ if (wanted >= acl->res[res].rlim_cur) {
54374+ unsigned long res_add;
54375+
54376+ res_add = wanted;
54377+ switch (res) {
54378+ case RLIMIT_CPU:
54379+ res_add += GR_RLIM_CPU_BUMP;
54380+ break;
54381+ case RLIMIT_FSIZE:
54382+ res_add += GR_RLIM_FSIZE_BUMP;
54383+ break;
54384+ case RLIMIT_DATA:
54385+ res_add += GR_RLIM_DATA_BUMP;
54386+ break;
54387+ case RLIMIT_STACK:
54388+ res_add += GR_RLIM_STACK_BUMP;
54389+ break;
54390+ case RLIMIT_CORE:
54391+ res_add += GR_RLIM_CORE_BUMP;
54392+ break;
54393+ case RLIMIT_RSS:
54394+ res_add += GR_RLIM_RSS_BUMP;
54395+ break;
54396+ case RLIMIT_NPROC:
54397+ res_add += GR_RLIM_NPROC_BUMP;
54398+ break;
54399+ case RLIMIT_NOFILE:
54400+ res_add += GR_RLIM_NOFILE_BUMP;
54401+ break;
54402+ case RLIMIT_MEMLOCK:
54403+ res_add += GR_RLIM_MEMLOCK_BUMP;
54404+ break;
54405+ case RLIMIT_AS:
54406+ res_add += GR_RLIM_AS_BUMP;
54407+ break;
54408+ case RLIMIT_LOCKS:
54409+ res_add += GR_RLIM_LOCKS_BUMP;
54410+ break;
54411+ case RLIMIT_SIGPENDING:
54412+ res_add += GR_RLIM_SIGPENDING_BUMP;
54413+ break;
54414+ case RLIMIT_MSGQUEUE:
54415+ res_add += GR_RLIM_MSGQUEUE_BUMP;
54416+ break;
54417+ case RLIMIT_NICE:
54418+ res_add += GR_RLIM_NICE_BUMP;
54419+ break;
54420+ case RLIMIT_RTPRIO:
54421+ res_add += GR_RLIM_RTPRIO_BUMP;
54422+ break;
54423+ case RLIMIT_RTTIME:
54424+ res_add += GR_RLIM_RTTIME_BUMP;
54425+ break;
54426+ }
54427+
54428+ acl->res[res].rlim_cur = res_add;
54429+
54430+ if (wanted > acl->res[res].rlim_max)
54431+ acl->res[res].rlim_max = res_add;
54432+
54433+ /* only log the subject filename, since resource logging is supported for
54434+ single-subject learning only */
54435+ rcu_read_lock();
54436+ cred = __task_cred(task);
54437+ security_learn(GR_LEARN_AUDIT_MSG, task->role->rolename,
54438+ task->role->roletype, cred->uid, cred->gid, acl->filename,
54439+ acl->filename, acl->res[res].rlim_cur, acl->res[res].rlim_max,
54440+ "", (unsigned long) res, &task->signal->saved_ip);
54441+ rcu_read_unlock();
54442+ }
54443+
54444+ return;
54445+}
54446+
54447+#if defined(CONFIG_PAX_HAVE_ACL_FLAGS) && (defined(CONFIG_PAX_NOEXEC) || defined(CONFIG_PAX_ASLR))
54448+void
54449+pax_set_initial_flags(struct linux_binprm *bprm)
54450+{
54451+ struct task_struct *task = current;
54452+ struct acl_subject_label *proc;
54453+ unsigned long flags;
54454+
54455+ if (unlikely(!(gr_status & GR_READY)))
54456+ return;
54457+
54458+ flags = pax_get_flags(task);
54459+
54460+ proc = task->acl;
54461+
54462+ if (proc->pax_flags & GR_PAX_DISABLE_PAGEEXEC)
54463+ flags &= ~MF_PAX_PAGEEXEC;
54464+ if (proc->pax_flags & GR_PAX_DISABLE_SEGMEXEC)
54465+ flags &= ~MF_PAX_SEGMEXEC;
54466+ if (proc->pax_flags & GR_PAX_DISABLE_RANDMMAP)
54467+ flags &= ~MF_PAX_RANDMMAP;
54468+ if (proc->pax_flags & GR_PAX_DISABLE_EMUTRAMP)
54469+ flags &= ~MF_PAX_EMUTRAMP;
54470+ if (proc->pax_flags & GR_PAX_DISABLE_MPROTECT)
54471+ flags &= ~MF_PAX_MPROTECT;
54472+
54473+ if (proc->pax_flags & GR_PAX_ENABLE_PAGEEXEC)
54474+ flags |= MF_PAX_PAGEEXEC;
54475+ if (proc->pax_flags & GR_PAX_ENABLE_SEGMEXEC)
54476+ flags |= MF_PAX_SEGMEXEC;
54477+ if (proc->pax_flags & GR_PAX_ENABLE_RANDMMAP)
54478+ flags |= MF_PAX_RANDMMAP;
54479+ if (proc->pax_flags & GR_PAX_ENABLE_EMUTRAMP)
54480+ flags |= MF_PAX_EMUTRAMP;
54481+ if (proc->pax_flags & GR_PAX_ENABLE_MPROTECT)
54482+ flags |= MF_PAX_MPROTECT;
54483+
54484+ pax_set_flags(task, flags);
54485+
54486+ return;
54487+}
54488+#endif
54489+
54490+#ifdef CONFIG_SYSCTL
54491+/* Eric Biederman likes breaking userland ABI and every inode-based security
54492+ system to save 35kb of memory */
54493+
54494+/* we modify the passed in filename, but adjust it back before returning */
54495+static struct acl_object_label *gr_lookup_by_name(char *name, unsigned int len)
54496+{
54497+ struct name_entry *nmatch;
54498+ char *p, *lastp = NULL;
54499+ struct acl_object_label *obj = NULL, *tmp;
54500+ struct acl_subject_label *tmpsubj;
54501+ char c = '\0';
54502+
54503+ read_lock(&gr_inode_lock);
54504+
54505+ p = name + len - 1;
54506+ do {
54507+ nmatch = lookup_name_entry(name);
54508+ if (lastp != NULL)
54509+ *lastp = c;
54510+
54511+ if (nmatch == NULL)
54512+ goto next_component;
54513+ tmpsubj = current->acl;
54514+ do {
54515+ obj = lookup_acl_obj_label(nmatch->inode, nmatch->device, tmpsubj);
54516+ if (obj != NULL) {
54517+ tmp = obj->globbed;
54518+ while (tmp) {
54519+ if (!glob_match(tmp->filename, name)) {
54520+ obj = tmp;
54521+ goto found_obj;
54522+ }
54523+ tmp = tmp->next;
54524+ }
54525+ goto found_obj;
54526+ }
54527+ } while ((tmpsubj = tmpsubj->parent_subject));
54528+next_component:
54529+ /* end case */
54530+ if (p == name)
54531+ break;
54532+
54533+ while (*p != '/')
54534+ p--;
54535+ if (p == name)
54536+ lastp = p + 1;
54537+ else {
54538+ lastp = p;
54539+ p--;
54540+ }
54541+ c = *lastp;
54542+ *lastp = '\0';
54543+ } while (1);
54544+found_obj:
54545+ read_unlock(&gr_inode_lock);
54546+ /* obj returned will always be non-null */
54547+ return obj;
54548+}
54549+
54550+/* returns 0 when allowing, non-zero on error
54551+ op of 0 is used for readdir, so we don't log the names of hidden files
54552+*/
54553+__u32
54554+gr_handle_sysctl(const struct ctl_table *table, const int op)
54555+{
54556+ struct ctl_table *tmp;
54557+ const char *proc_sys = "/proc/sys";
54558+ char *path;
54559+ struct acl_object_label *obj;
54560+ unsigned short len = 0, pos = 0, depth = 0, i;
54561+ __u32 err = 0;
54562+ __u32 mode = 0;
54563+
54564+ if (unlikely(!(gr_status & GR_READY)))
54565+ return 0;
54566+
54567+ /* for now, ignore operations on non-sysctl entries if it's not a
54568+ readdir*/
54569+ if (table->child != NULL && op != 0)
54570+ return 0;
54571+
54572+ mode |= GR_FIND;
54573+ /* it's only a read if it's an entry, read on dirs is for readdir */
54574+ if (op & MAY_READ)
54575+ mode |= GR_READ;
54576+ if (op & MAY_WRITE)
54577+ mode |= GR_WRITE;
54578+
54579+ preempt_disable();
54580+
54581+ path = per_cpu_ptr(gr_shared_page[0], smp_processor_id());
54582+
54583+ /* it's only a read/write if it's an actual entry, not a dir
54584+ (which are opened for readdir)
54585+ */
54586+
54587+ /* convert the requested sysctl entry into a pathname */
54588+
54589+ for (tmp = (struct ctl_table *)table; tmp != NULL; tmp = tmp->parent) {
54590+ len += strlen(tmp->procname);
54591+ len++;
54592+ depth++;
54593+ }
54594+
54595+ if ((len + depth + strlen(proc_sys) + 1) > PAGE_SIZE) {
54596+ /* deny */
54597+ goto out;
54598+ }
54599+
54600+ memset(path, 0, PAGE_SIZE);
54601+
54602+ memcpy(path, proc_sys, strlen(proc_sys));
54603+
54604+ pos += strlen(proc_sys);
54605+
54606+ for (; depth > 0; depth--) {
54607+ path[pos] = '/';
54608+ pos++;
54609+ for (i = 1, tmp = (struct ctl_table *)table; tmp != NULL; tmp = tmp->parent) {
54610+ if (depth == i) {
54611+ memcpy(path + pos, tmp->procname,
54612+ strlen(tmp->procname));
54613+ pos += strlen(tmp->procname);
54614+ }
54615+ i++;
54616+ }
54617+ }
54618+
54619+ obj = gr_lookup_by_name(path, pos);
54620+ err = obj->mode & (mode | to_gr_audit(mode) | GR_SUPPRESS);
54621+
54622+ if (unlikely((current->acl->mode & (GR_LEARN | GR_INHERITLEARN)) &&
54623+ ((err & mode) != mode))) {
54624+ __u32 new_mode = mode;
54625+
54626+ new_mode &= ~(GR_AUDITS | GR_SUPPRESS);
54627+
54628+ err = 0;
54629+ gr_log_learn_sysctl(path, new_mode);
54630+ } else if (!(err & GR_FIND) && !(err & GR_SUPPRESS) && op != 0) {
54631+ gr_log_hidden_sysctl(GR_DONT_AUDIT, GR_HIDDEN_ACL_MSG, path);
54632+ err = -ENOENT;
54633+ } else if (!(err & GR_FIND)) {
54634+ err = -ENOENT;
54635+ } else if (((err & mode) & ~GR_FIND) != (mode & ~GR_FIND) && !(err & GR_SUPPRESS)) {
54636+ gr_log_str4(GR_DONT_AUDIT, GR_SYSCTL_ACL_MSG, "denied",
54637+ path, (mode & GR_READ) ? " reading" : "",
54638+ (mode & GR_WRITE) ? " writing" : "");
54639+ err = -EACCES;
54640+ } else if ((err & mode) != mode) {
54641+ err = -EACCES;
54642+ } else if ((((err & mode) & ~GR_FIND) == (mode & ~GR_FIND)) && (err & GR_AUDITS)) {
54643+ gr_log_str4(GR_DO_AUDIT, GR_SYSCTL_ACL_MSG, "successful",
54644+ path, (mode & GR_READ) ? " reading" : "",
54645+ (mode & GR_WRITE) ? " writing" : "");
54646+ err = 0;
54647+ } else
54648+ err = 0;
54649+
54650+ out:
54651+ preempt_enable();
54652+
54653+ return err;
54654+}
54655+#endif
54656+
54657+int
54658+gr_handle_proc_ptrace(struct task_struct *task)
54659+{
54660+ struct file *filp;
54661+ struct task_struct *tmp = task;
54662+ struct task_struct *curtemp = current;
54663+ __u32 retmode;
54664+
54665+#ifndef CONFIG_GRKERNSEC_HARDEN_PTRACE
54666+ if (unlikely(!(gr_status & GR_READY)))
54667+ return 0;
54668+#endif
54669+
54670+ read_lock(&tasklist_lock);
54671+ read_lock(&grsec_exec_file_lock);
54672+ filp = task->exec_file;
54673+
54674+ while (tmp->pid > 0) {
54675+ if (tmp == curtemp)
54676+ break;
54677+ tmp = tmp->real_parent;
54678+ }
54679+
54680+ if (!filp || (tmp->pid == 0 && ((grsec_enable_harden_ptrace && current_uid() && !(gr_status & GR_READY)) ||
54681+ ((gr_status & GR_READY) && !(current->acl->mode & GR_RELAXPTRACE))))) {
54682+ read_unlock(&grsec_exec_file_lock);
54683+ read_unlock(&tasklist_lock);
54684+ return 1;
54685+ }
54686+
54687+#ifdef CONFIG_GRKERNSEC_HARDEN_PTRACE
54688+ if (!(gr_status & GR_READY)) {
54689+ read_unlock(&grsec_exec_file_lock);
54690+ read_unlock(&tasklist_lock);
54691+ return 0;
54692+ }
54693+#endif
54694+
54695+ retmode = gr_search_file(filp->f_path.dentry, GR_NOPTRACE, filp->f_path.mnt);
54696+ read_unlock(&grsec_exec_file_lock);
54697+ read_unlock(&tasklist_lock);
54698+
54699+ if (retmode & GR_NOPTRACE)
54700+ return 1;
54701+
54702+ if (!(current->acl->mode & GR_POVERRIDE) && !(current->role->roletype & GR_ROLE_GOD)
54703+ && (current->acl != task->acl || (current->acl != current->role->root_label
54704+ && current->pid != task->pid)))
54705+ return 1;
54706+
54707+ return 0;
54708+}
54709+
54710+void task_grsec_rbac(struct seq_file *m, struct task_struct *p)
54711+{
54712+ if (unlikely(!(gr_status & GR_READY)))
54713+ return;
54714+
54715+ if (!(current->role->roletype & GR_ROLE_GOD))
54716+ return;
54717+
54718+ seq_printf(m, "RBAC:\t%.64s:%c:%.950s\n",
54719+ p->role->rolename, gr_task_roletype_to_char(p),
54720+ p->acl->filename);
54721+}
54722+
54723+int
54724+gr_handle_ptrace(struct task_struct *task, const long request)
54725+{
54726+ struct task_struct *tmp = task;
54727+ struct task_struct *curtemp = current;
54728+ __u32 retmode;
54729+
54730+#ifndef CONFIG_GRKERNSEC_HARDEN_PTRACE
54731+ if (unlikely(!(gr_status & GR_READY)))
54732+ return 0;
54733+#endif
54734+
54735+ read_lock(&tasklist_lock);
54736+ while (tmp->pid > 0) {
54737+ if (tmp == curtemp)
54738+ break;
54739+ tmp = tmp->real_parent;
54740+ }
54741+
54742+ if (tmp->pid == 0 && ((grsec_enable_harden_ptrace && current_uid() && !(gr_status & GR_READY)) ||
54743+ ((gr_status & GR_READY) && !(current->acl->mode & GR_RELAXPTRACE)))) {
54744+ read_unlock(&tasklist_lock);
54745+ gr_log_ptrace(GR_DONT_AUDIT, GR_PTRACE_ACL_MSG, task);
54746+ return 1;
54747+ }
54748+ read_unlock(&tasklist_lock);
54749+
54750+#ifdef CONFIG_GRKERNSEC_HARDEN_PTRACE
54751+ if (!(gr_status & GR_READY))
54752+ return 0;
54753+#endif
54754+
54755+ read_lock(&grsec_exec_file_lock);
54756+ if (unlikely(!task->exec_file)) {
54757+ read_unlock(&grsec_exec_file_lock);
54758+ return 0;
54759+ }
54760+
54761+ retmode = gr_search_file(task->exec_file->f_path.dentry, GR_PTRACERD | GR_NOPTRACE, task->exec_file->f_path.mnt);
54762+ read_unlock(&grsec_exec_file_lock);
54763+
54764+ if (retmode & GR_NOPTRACE) {
54765+ gr_log_ptrace(GR_DONT_AUDIT, GR_PTRACE_ACL_MSG, task);
54766+ return 1;
54767+ }
54768+
54769+ if (retmode & GR_PTRACERD) {
54770+ switch (request) {
54771+ case PTRACE_SEIZE:
54772+ case PTRACE_POKETEXT:
54773+ case PTRACE_POKEDATA:
54774+ case PTRACE_POKEUSR:
54775+#if !defined(CONFIG_PPC32) && !defined(CONFIG_PPC64) && !defined(CONFIG_PARISC) && !defined(CONFIG_ALPHA) && !defined(CONFIG_IA64)
54776+ case PTRACE_SETREGS:
54777+ case PTRACE_SETFPREGS:
54778+#endif
54779+#ifdef CONFIG_X86
54780+ case PTRACE_SETFPXREGS:
54781+#endif
54782+#ifdef CONFIG_ALTIVEC
54783+ case PTRACE_SETVRREGS:
54784+#endif
54785+ return 1;
54786+ default:
54787+ return 0;
54788+ }
54789+ } else if (!(current->acl->mode & GR_POVERRIDE) &&
54790+ !(current->role->roletype & GR_ROLE_GOD) &&
54791+ (current->acl != task->acl)) {
54792+ gr_log_ptrace(GR_DONT_AUDIT, GR_PTRACE_ACL_MSG, task);
54793+ return 1;
54794+ }
54795+
54796+ return 0;
54797+}
54798+
54799+static int is_writable_mmap(const struct file *filp)
54800+{
54801+ struct task_struct *task = current;
54802+ struct acl_object_label *obj, *obj2;
54803+
54804+ if (gr_status & GR_READY && !(task->acl->mode & GR_OVERRIDE) &&
54805+ !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))) {
54806+ obj = chk_obj_label(filp->f_path.dentry, filp->f_path.mnt, default_role->root_label);
54807+ obj2 = chk_obj_label(filp->f_path.dentry, filp->f_path.mnt,
54808+ task->role->root_label);
54809+ if (unlikely((obj->mode & GR_WRITE) || (obj2->mode & GR_WRITE))) {
54810+ gr_log_fs_generic(GR_DONT_AUDIT, GR_WRITLIB_ACL_MSG, filp->f_path.dentry, filp->f_path.mnt);
54811+ return 1;
54812+ }
54813+ }
54814+ return 0;
54815+}
54816+
54817+int
54818+gr_acl_handle_mmap(const struct file *file, const unsigned long prot)
54819+{
54820+ __u32 mode;
54821+
54822+ if (unlikely(!file || !(prot & PROT_EXEC)))
54823+ return 1;
54824+
54825+ if (is_writable_mmap(file))
54826+ return 0;
54827+
54828+ mode =
54829+ gr_search_file(file->f_path.dentry,
54830+ GR_EXEC | GR_AUDIT_EXEC | GR_SUPPRESS,
54831+ file->f_path.mnt);
54832+
54833+ if (!gr_tpe_allow(file))
54834+ return 0;
54835+
54836+ if (unlikely(!(mode & GR_EXEC) && !(mode & GR_SUPPRESS))) {
54837+ gr_log_fs_rbac_generic(GR_DONT_AUDIT, GR_MMAP_ACL_MSG, file->f_path.dentry, file->f_path.mnt);
54838+ return 0;
54839+ } else if (unlikely(!(mode & GR_EXEC))) {
54840+ return 0;
54841+ } else if (unlikely(mode & GR_EXEC && mode & GR_AUDIT_EXEC)) {
54842+ gr_log_fs_rbac_generic(GR_DO_AUDIT, GR_MMAP_ACL_MSG, file->f_path.dentry, file->f_path.mnt);
54843+ return 1;
54844+ }
54845+
54846+ return 1;
54847+}
54848+
54849+int
54850+gr_acl_handle_mprotect(const struct file *file, const unsigned long prot)
54851+{
54852+ __u32 mode;
54853+
54854+ if (unlikely(!file || !(prot & PROT_EXEC)))
54855+ return 1;
54856+
54857+ if (is_writable_mmap(file))
54858+ return 0;
54859+
54860+ mode =
54861+ gr_search_file(file->f_path.dentry,
54862+ GR_EXEC | GR_AUDIT_EXEC | GR_SUPPRESS,
54863+ file->f_path.mnt);
54864+
54865+ if (!gr_tpe_allow(file))
54866+ return 0;
54867+
54868+ if (unlikely(!(mode & GR_EXEC) && !(mode & GR_SUPPRESS))) {
54869+ gr_log_fs_rbac_generic(GR_DONT_AUDIT, GR_MPROTECT_ACL_MSG, file->f_path.dentry, file->f_path.mnt);
54870+ return 0;
54871+ } else if (unlikely(!(mode & GR_EXEC))) {
54872+ return 0;
54873+ } else if (unlikely(mode & GR_EXEC && mode & GR_AUDIT_EXEC)) {
54874+ gr_log_fs_rbac_generic(GR_DO_AUDIT, GR_MPROTECT_ACL_MSG, file->f_path.dentry, file->f_path.mnt);
54875+ return 1;
54876+ }
54877+
54878+ return 1;
54879+}
54880+
54881+void
54882+gr_acl_handle_psacct(struct task_struct *task, const long code)
54883+{
54884+ unsigned long runtime;
54885+ unsigned long cputime;
54886+ unsigned int wday, cday;
54887+ __u8 whr, chr;
54888+ __u8 wmin, cmin;
54889+ __u8 wsec, csec;
54890+ struct timespec timeval;
54891+
54892+ if (unlikely(!(gr_status & GR_READY) || !task->acl ||
54893+ !(task->acl->mode & GR_PROCACCT)))
54894+ return;
54895+
54896+ do_posix_clock_monotonic_gettime(&timeval);
54897+ runtime = timeval.tv_sec - task->start_time.tv_sec;
54898+ wday = runtime / (3600 * 24);
54899+ runtime -= wday * (3600 * 24);
54900+ whr = runtime / 3600;
54901+ runtime -= whr * 3600;
54902+ wmin = runtime / 60;
54903+ runtime -= wmin * 60;
54904+ wsec = runtime;
54905+
54906+ cputime = (task->utime + task->stime) / HZ;
54907+ cday = cputime / (3600 * 24);
54908+ cputime -= cday * (3600 * 24);
54909+ chr = cputime / 3600;
54910+ cputime -= chr * 3600;
54911+ cmin = cputime / 60;
54912+ cputime -= cmin * 60;
54913+ csec = cputime;
54914+
54915+ gr_log_procacct(GR_DO_AUDIT, GR_ACL_PROCACCT_MSG, task, wday, whr, wmin, wsec, cday, chr, cmin, csec, code);
54916+
54917+ return;
54918+}
54919+
54920+void gr_set_kernel_label(struct task_struct *task)
54921+{
54922+ if (gr_status & GR_READY) {
54923+ task->role = kernel_role;
54924+ task->acl = kernel_role->root_label;
54925+ }
54926+ return;
54927+}
54928+
54929+#ifdef CONFIG_TASKSTATS
54930+int gr_is_taskstats_denied(int pid)
54931+{
54932+ struct task_struct *task;
54933+#if defined(CONFIG_GRKERNSEC_PROC_USER) || defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
54934+ const struct cred *cred;
54935+#endif
54936+ int ret = 0;
54937+
54938+ /* restrict taskstats viewing to un-chrooted root users
54939+ who have the 'view' subject flag if the RBAC system is enabled
54940+ */
54941+
54942+ rcu_read_lock();
54943+ read_lock(&tasklist_lock);
54944+ task = find_task_by_vpid(pid);
54945+ if (task) {
54946+#ifdef CONFIG_GRKERNSEC_CHROOT
54947+ if (proc_is_chrooted(task))
54948+ ret = -EACCES;
54949+#endif
54950+#if defined(CONFIG_GRKERNSEC_PROC_USER) || defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
54951+ cred = __task_cred(task);
54952+#ifdef CONFIG_GRKERNSEC_PROC_USER
54953+ if (cred->uid != 0)
54954+ ret = -EACCES;
54955+#elif defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
54956+ if (cred->uid != 0 && !groups_search(cred->group_info, CONFIG_GRKERNSEC_PROC_GID))
54957+ ret = -EACCES;
54958+#endif
54959+#endif
54960+ if (gr_status & GR_READY) {
54961+ if (!(task->acl->mode & GR_VIEW))
54962+ ret = -EACCES;
54963+ }
54964+ } else
54965+ ret = -ENOENT;
54966+
54967+ read_unlock(&tasklist_lock);
54968+ rcu_read_unlock();
54969+
54970+ return ret;
54971+}
54972+#endif
54973+
54974+/* AUXV entries are filled via a descendant of search_binary_handler
54975+ after we've already applied the subject for the target
54976+*/
54977+int gr_acl_enable_at_secure(void)
54978+{
54979+ if (unlikely(!(gr_status & GR_READY)))
54980+ return 0;
54981+
54982+ if (current->acl->mode & GR_ATSECURE)
54983+ return 1;
54984+
54985+ return 0;
54986+}
54987+
54988+int gr_acl_handle_filldir(const struct file *file, const char *name, const unsigned int namelen, const ino_t ino)
54989+{
54990+ struct task_struct *task = current;
54991+ struct dentry *dentry = file->f_path.dentry;
54992+ struct vfsmount *mnt = file->f_path.mnt;
54993+ struct acl_object_label *obj, *tmp;
54994+ struct acl_subject_label *subj;
54995+ unsigned int bufsize;
54996+ int is_not_root;
54997+ char *path;
54998+ dev_t dev = __get_dev(dentry);
54999+
55000+ if (unlikely(!(gr_status & GR_READY)))
55001+ return 1;
55002+
55003+ if (task->acl->mode & (GR_LEARN | GR_INHERITLEARN))
55004+ return 1;
55005+
55006+ /* ignore Eric Biederman */
55007+ if (IS_PRIVATE(dentry->d_inode))
55008+ return 1;
55009+
55010+ subj = task->acl;
55011+ do {
55012+ obj = lookup_acl_obj_label(ino, dev, subj);
55013+ if (obj != NULL)
55014+ return (obj->mode & GR_FIND) ? 1 : 0;
55015+ } while ((subj = subj->parent_subject));
55016+
55017+ /* this is purely an optimization since we're looking for an object
55018+ for the directory we're doing a readdir on
55019+ if it's possible for any globbed object to match the entry we're
55020+ filling into the directory, then the object we find here will be
55021+ an anchor point with attached globbed objects
55022+ */
55023+ obj = chk_obj_label_noglob(dentry, mnt, task->acl);
55024+ if (obj->globbed == NULL)
55025+ return (obj->mode & GR_FIND) ? 1 : 0;
55026+
55027+ is_not_root = ((obj->filename[0] == '/') &&
55028+ (obj->filename[1] == '\0')) ? 0 : 1;
55029+ bufsize = PAGE_SIZE - namelen - is_not_root;
55030+
55031+ /* check bufsize > PAGE_SIZE || bufsize == 0 */
55032+ if (unlikely((bufsize - 1) > (PAGE_SIZE - 1)))
55033+ return 1;
55034+
55035+ preempt_disable();
55036+ path = d_real_path(dentry, mnt, per_cpu_ptr(gr_shared_page[0], smp_processor_id()),
55037+ bufsize);
55038+
55039+ bufsize = strlen(path);
55040+
55041+ /* if base is "/", don't append an additional slash */
55042+ if (is_not_root)
55043+ *(path + bufsize) = '/';
55044+ memcpy(path + bufsize + is_not_root, name, namelen);
55045+ *(path + bufsize + namelen + is_not_root) = '\0';
55046+
55047+ tmp = obj->globbed;
55048+ while (tmp) {
55049+ if (!glob_match(tmp->filename, path)) {
55050+ preempt_enable();
55051+ return (tmp->mode & GR_FIND) ? 1 : 0;
55052+ }
55053+ tmp = tmp->next;
55054+ }
55055+ preempt_enable();
55056+ return (obj->mode & GR_FIND) ? 1 : 0;
55057+}
55058+
55059+#ifdef CONFIG_NETFILTER_XT_MATCH_GRADM_MODULE
55060+EXPORT_SYMBOL(gr_acl_is_enabled);
55061+#endif
55062+EXPORT_SYMBOL(gr_learn_resource);
55063+EXPORT_SYMBOL(gr_set_kernel_label);
55064+#ifdef CONFIG_SECURITY
55065+EXPORT_SYMBOL(gr_check_user_change);
55066+EXPORT_SYMBOL(gr_check_group_change);
55067+#endif
55068+
55069diff --git a/grsecurity/gracl_alloc.c b/grsecurity/gracl_alloc.c
55070new file mode 100644
55071index 0000000..34fefda
55072--- /dev/null
55073+++ b/grsecurity/gracl_alloc.c
55074@@ -0,0 +1,105 @@
55075+#include <linux/kernel.h>
55076+#include <linux/mm.h>
55077+#include <linux/slab.h>
55078+#include <linux/vmalloc.h>
55079+#include <linux/gracl.h>
55080+#include <linux/grsecurity.h>
55081+
55082+static unsigned long alloc_stack_next = 1;
55083+static unsigned long alloc_stack_size = 1;
55084+static void **alloc_stack;
55085+
55086+static __inline__ int
55087+alloc_pop(void)
55088+{
55089+ if (alloc_stack_next == 1)
55090+ return 0;
55091+
55092+ kfree(alloc_stack[alloc_stack_next - 2]);
55093+
55094+ alloc_stack_next--;
55095+
55096+ return 1;
55097+}
55098+
55099+static __inline__ int
55100+alloc_push(void *buf)
55101+{
55102+ if (alloc_stack_next >= alloc_stack_size)
55103+ return 1;
55104+
55105+ alloc_stack[alloc_stack_next - 1] = buf;
55106+
55107+ alloc_stack_next++;
55108+
55109+ return 0;
55110+}
55111+
55112+void *
55113+acl_alloc(unsigned long len)
55114+{
55115+ void *ret = NULL;
55116+
55117+ if (!len || len > PAGE_SIZE)
55118+ goto out;
55119+
55120+ ret = kmalloc(len, GFP_KERNEL);
55121+
55122+ if (ret) {
55123+ if (alloc_push(ret)) {
55124+ kfree(ret);
55125+ ret = NULL;
55126+ }
55127+ }
55128+
55129+out:
55130+ return ret;
55131+}
55132+
55133+void *
55134+acl_alloc_num(unsigned long num, unsigned long len)
55135+{
55136+ if (!len || (num > (PAGE_SIZE / len)))
55137+ return NULL;
55138+
55139+ return acl_alloc(num * len);
55140+}
55141+
55142+void
55143+acl_free_all(void)
55144+{
55145+ if (gr_acl_is_enabled() || !alloc_stack)
55146+ return;
55147+
55148+ while (alloc_pop()) ;
55149+
55150+ if (alloc_stack) {
55151+ if ((alloc_stack_size * sizeof (void *)) <= PAGE_SIZE)
55152+ kfree(alloc_stack);
55153+ else
55154+ vfree(alloc_stack);
55155+ }
55156+
55157+ alloc_stack = NULL;
55158+ alloc_stack_size = 1;
55159+ alloc_stack_next = 1;
55160+
55161+ return;
55162+}
55163+
55164+int
55165+acl_alloc_stack_init(unsigned long size)
55166+{
55167+ if ((size * sizeof (void *)) <= PAGE_SIZE)
55168+ alloc_stack =
55169+ (void **) kmalloc(size * sizeof (void *), GFP_KERNEL);
55170+ else
55171+ alloc_stack = (void **) vmalloc(size * sizeof (void *));
55172+
55173+ alloc_stack_size = size;
55174+
55175+ if (!alloc_stack)
55176+ return 0;
55177+ else
55178+ return 1;
55179+}
55180diff --git a/grsecurity/gracl_cap.c b/grsecurity/gracl_cap.c
55181new file mode 100644
55182index 0000000..955ddfb
55183--- /dev/null
55184+++ b/grsecurity/gracl_cap.c
55185@@ -0,0 +1,101 @@
55186+#include <linux/kernel.h>
55187+#include <linux/module.h>
55188+#include <linux/sched.h>
55189+#include <linux/gracl.h>
55190+#include <linux/grsecurity.h>
55191+#include <linux/grinternal.h>
55192+
55193+extern const char *captab_log[];
55194+extern int captab_log_entries;
55195+
55196+int
55197+gr_acl_is_capable(const int cap)
55198+{
55199+ struct task_struct *task = current;
55200+ const struct cred *cred = current_cred();
55201+ struct acl_subject_label *curracl;
55202+ kernel_cap_t cap_drop = __cap_empty_set, cap_mask = __cap_empty_set;
55203+ kernel_cap_t cap_audit = __cap_empty_set;
55204+
55205+ if (!gr_acl_is_enabled())
55206+ return 1;
55207+
55208+ curracl = task->acl;
55209+
55210+ cap_drop = curracl->cap_lower;
55211+ cap_mask = curracl->cap_mask;
55212+ cap_audit = curracl->cap_invert_audit;
55213+
55214+ while ((curracl = curracl->parent_subject)) {
55215+ /* if the cap isn't specified in the current computed mask but is specified in the
55216+ current level subject, and is lowered in the current level subject, then add
55217+ it to the set of dropped capabilities
55218+ otherwise, add the current level subject's mask to the current computed mask
55219+ */
55220+ if (!cap_raised(cap_mask, cap) && cap_raised(curracl->cap_mask, cap)) {
55221+ cap_raise(cap_mask, cap);
55222+ if (cap_raised(curracl->cap_lower, cap))
55223+ cap_raise(cap_drop, cap);
55224+ if (cap_raised(curracl->cap_invert_audit, cap))
55225+ cap_raise(cap_audit, cap);
55226+ }
55227+ }
55228+
55229+ if (!cap_raised(cap_drop, cap)) {
55230+ if (cap_raised(cap_audit, cap))
55231+ gr_log_cap(GR_DO_AUDIT, GR_CAP_ACL_MSG2, task, captab_log[cap]);
55232+ return 1;
55233+ }
55234+
55235+ curracl = task->acl;
55236+
55237+ if ((curracl->mode & (GR_LEARN | GR_INHERITLEARN))
55238+ && cap_raised(cred->cap_effective, cap)) {
55239+ security_learn(GR_LEARN_AUDIT_MSG, task->role->rolename,
55240+ task->role->roletype, cred->uid,
55241+ cred->gid, task->exec_file ?
55242+ gr_to_filename(task->exec_file->f_path.dentry,
55243+ task->exec_file->f_path.mnt) : curracl->filename,
55244+ curracl->filename, 0UL,
55245+ 0UL, "", (unsigned long) cap, &task->signal->saved_ip);
55246+ return 1;
55247+ }
55248+
55249+ if ((cap >= 0) && (cap < captab_log_entries) && cap_raised(cred->cap_effective, cap) && !cap_raised(cap_audit, cap))
55250+ gr_log_cap(GR_DONT_AUDIT, GR_CAP_ACL_MSG, task, captab_log[cap]);
55251+ return 0;
55252+}
55253+
55254+int
55255+gr_acl_is_capable_nolog(const int cap)
55256+{
55257+ struct acl_subject_label *curracl;
55258+ kernel_cap_t cap_drop = __cap_empty_set, cap_mask = __cap_empty_set;
55259+
55260+ if (!gr_acl_is_enabled())
55261+ return 1;
55262+
55263+ curracl = current->acl;
55264+
55265+ cap_drop = curracl->cap_lower;
55266+ cap_mask = curracl->cap_mask;
55267+
55268+ while ((curracl = curracl->parent_subject)) {
55269+ /* if the cap isn't specified in the current computed mask but is specified in the
55270+ current level subject, and is lowered in the current level subject, then add
55271+ it to the set of dropped capabilities
55272+ otherwise, add the current level subject's mask to the current computed mask
55273+ */
55274+ if (!cap_raised(cap_mask, cap) && cap_raised(curracl->cap_mask, cap)) {
55275+ cap_raise(cap_mask, cap);
55276+ if (cap_raised(curracl->cap_lower, cap))
55277+ cap_raise(cap_drop, cap);
55278+ }
55279+ }
55280+
55281+ if (!cap_raised(cap_drop, cap))
55282+ return 1;
55283+
55284+ return 0;
55285+}
55286+
55287diff --git a/grsecurity/gracl_fs.c b/grsecurity/gracl_fs.c
55288new file mode 100644
55289index 0000000..88d0e87
55290--- /dev/null
55291+++ b/grsecurity/gracl_fs.c
55292@@ -0,0 +1,435 @@
55293+#include <linux/kernel.h>
55294+#include <linux/sched.h>
55295+#include <linux/types.h>
55296+#include <linux/fs.h>
55297+#include <linux/file.h>
55298+#include <linux/stat.h>
55299+#include <linux/grsecurity.h>
55300+#include <linux/grinternal.h>
55301+#include <linux/gracl.h>
55302+
55303+umode_t
55304+gr_acl_umask(void)
55305+{
55306+ if (unlikely(!gr_acl_is_enabled()))
55307+ return 0;
55308+
55309+ return current->role->umask;
55310+}
55311+
55312+__u32
55313+gr_acl_handle_hidden_file(const struct dentry * dentry,
55314+ const struct vfsmount * mnt)
55315+{
55316+ __u32 mode;
55317+
55318+ if (unlikely(!dentry->d_inode))
55319+ return GR_FIND;
55320+
55321+ mode =
55322+ gr_search_file(dentry, GR_FIND | GR_AUDIT_FIND | GR_SUPPRESS, mnt);
55323+
55324+ if (unlikely(mode & GR_FIND && mode & GR_AUDIT_FIND)) {
55325+ gr_log_fs_rbac_generic(GR_DO_AUDIT, GR_HIDDEN_ACL_MSG, dentry, mnt);
55326+ return mode;
55327+ } else if (unlikely(!(mode & GR_FIND) && !(mode & GR_SUPPRESS))) {
55328+ gr_log_fs_rbac_generic(GR_DONT_AUDIT, GR_HIDDEN_ACL_MSG, dentry, mnt);
55329+ return 0;
55330+ } else if (unlikely(!(mode & GR_FIND)))
55331+ return 0;
55332+
55333+ return GR_FIND;
55334+}
55335+
55336+__u32
55337+gr_acl_handle_open(const struct dentry * dentry, const struct vfsmount * mnt,
55338+ int acc_mode)
55339+{
55340+ __u32 reqmode = GR_FIND;
55341+ __u32 mode;
55342+
55343+ if (unlikely(!dentry->d_inode))
55344+ return reqmode;
55345+
55346+ if (acc_mode & MAY_APPEND)
55347+ reqmode |= GR_APPEND;
55348+ else if (acc_mode & MAY_WRITE)
55349+ reqmode |= GR_WRITE;
55350+ if ((acc_mode & MAY_READ) && !S_ISDIR(dentry->d_inode->i_mode))
55351+ reqmode |= GR_READ;
55352+
55353+ mode =
55354+ gr_search_file(dentry, reqmode | to_gr_audit(reqmode) | GR_SUPPRESS,
55355+ mnt);
55356+
55357+ if (unlikely(((mode & reqmode) == reqmode) && mode & GR_AUDITS)) {
55358+ gr_log_fs_rbac_mode2(GR_DO_AUDIT, GR_OPEN_ACL_MSG, dentry, mnt,
55359+ reqmode & GR_READ ? " reading" : "",
55360+ reqmode & GR_WRITE ? " writing" : reqmode &
55361+ GR_APPEND ? " appending" : "");
55362+ return reqmode;
55363+ } else
55364+ if (unlikely((mode & reqmode) != reqmode && !(mode & GR_SUPPRESS)))
55365+ {
55366+ gr_log_fs_rbac_mode2(GR_DONT_AUDIT, GR_OPEN_ACL_MSG, dentry, mnt,
55367+ reqmode & GR_READ ? " reading" : "",
55368+ reqmode & GR_WRITE ? " writing" : reqmode &
55369+ GR_APPEND ? " appending" : "");
55370+ return 0;
55371+ } else if (unlikely((mode & reqmode) != reqmode))
55372+ return 0;
55373+
55374+ return reqmode;
55375+}
55376+
55377+__u32
55378+gr_acl_handle_creat(const struct dentry * dentry,
55379+ const struct dentry * p_dentry,
55380+ const struct vfsmount * p_mnt, int open_flags, int acc_mode,
55381+ const int imode)
55382+{
55383+ __u32 reqmode = GR_WRITE | GR_CREATE;
55384+ __u32 mode;
55385+
55386+ if (acc_mode & MAY_APPEND)
55387+ reqmode |= GR_APPEND;
55388+ // if a directory was required or the directory already exists, then
55389+ // don't count this open as a read
55390+ if ((acc_mode & MAY_READ) &&
55391+ !((open_flags & O_DIRECTORY) || (dentry->d_inode && S_ISDIR(dentry->d_inode->i_mode))))
55392+ reqmode |= GR_READ;
55393+ if ((open_flags & O_CREAT) && (imode & (S_ISUID | S_ISGID)))
55394+ reqmode |= GR_SETID;
55395+
55396+ mode =
55397+ gr_check_create(dentry, p_dentry, p_mnt,
55398+ reqmode | to_gr_audit(reqmode) | GR_SUPPRESS);
55399+
55400+ if (unlikely(((mode & reqmode) == reqmode) && mode & GR_AUDITS)) {
55401+ gr_log_fs_rbac_mode2(GR_DO_AUDIT, GR_CREATE_ACL_MSG, dentry, p_mnt,
55402+ reqmode & GR_READ ? " reading" : "",
55403+ reqmode & GR_WRITE ? " writing" : reqmode &
55404+ GR_APPEND ? " appending" : "");
55405+ return reqmode;
55406+ } else
55407+ if (unlikely((mode & reqmode) != reqmode && !(mode & GR_SUPPRESS)))
55408+ {
55409+ gr_log_fs_rbac_mode2(GR_DONT_AUDIT, GR_CREATE_ACL_MSG, dentry, p_mnt,
55410+ reqmode & GR_READ ? " reading" : "",
55411+ reqmode & GR_WRITE ? " writing" : reqmode &
55412+ GR_APPEND ? " appending" : "");
55413+ return 0;
55414+ } else if (unlikely((mode & reqmode) != reqmode))
55415+ return 0;
55416+
55417+ return reqmode;
55418+}
55419+
55420+__u32
55421+gr_acl_handle_access(const struct dentry * dentry, const struct vfsmount * mnt,
55422+ const int fmode)
55423+{
55424+ __u32 mode, reqmode = GR_FIND;
55425+
55426+ if ((fmode & S_IXOTH) && !S_ISDIR(dentry->d_inode->i_mode))
55427+ reqmode |= GR_EXEC;
55428+ if (fmode & S_IWOTH)
55429+ reqmode |= GR_WRITE;
55430+ if (fmode & S_IROTH)
55431+ reqmode |= GR_READ;
55432+
55433+ mode =
55434+ gr_search_file(dentry, reqmode | to_gr_audit(reqmode) | GR_SUPPRESS,
55435+ mnt);
55436+
55437+ if (unlikely(((mode & reqmode) == reqmode) && mode & GR_AUDITS)) {
55438+ gr_log_fs_rbac_mode3(GR_DO_AUDIT, GR_ACCESS_ACL_MSG, dentry, mnt,
55439+ reqmode & GR_READ ? " reading" : "",
55440+ reqmode & GR_WRITE ? " writing" : "",
55441+ reqmode & GR_EXEC ? " executing" : "");
55442+ return reqmode;
55443+ } else
55444+ if (unlikely((mode & reqmode) != reqmode && !(mode & GR_SUPPRESS)))
55445+ {
55446+ gr_log_fs_rbac_mode3(GR_DONT_AUDIT, GR_ACCESS_ACL_MSG, dentry, mnt,
55447+ reqmode & GR_READ ? " reading" : "",
55448+ reqmode & GR_WRITE ? " writing" : "",
55449+ reqmode & GR_EXEC ? " executing" : "");
55450+ return 0;
55451+ } else if (unlikely((mode & reqmode) != reqmode))
55452+ return 0;
55453+
55454+ return reqmode;
55455+}
55456+
55457+static __u32 generic_fs_handler(const struct dentry *dentry, const struct vfsmount *mnt, __u32 reqmode, const char *fmt)
55458+{
55459+ __u32 mode;
55460+
55461+ mode = gr_search_file(dentry, reqmode | to_gr_audit(reqmode) | GR_SUPPRESS, mnt);
55462+
55463+ if (unlikely(((mode & (reqmode)) == (reqmode)) && mode & GR_AUDITS)) {
55464+ gr_log_fs_rbac_generic(GR_DO_AUDIT, fmt, dentry, mnt);
55465+ return mode;
55466+ } else if (unlikely((mode & (reqmode)) != (reqmode) && !(mode & GR_SUPPRESS))) {
55467+ gr_log_fs_rbac_generic(GR_DONT_AUDIT, fmt, dentry, mnt);
55468+ return 0;
55469+ } else if (unlikely((mode & (reqmode)) != (reqmode)))
55470+ return 0;
55471+
55472+ return (reqmode);
55473+}
55474+
55475+__u32
55476+gr_acl_handle_rmdir(const struct dentry * dentry, const struct vfsmount * mnt)
55477+{
55478+ return generic_fs_handler(dentry, mnt, GR_WRITE | GR_DELETE , GR_RMDIR_ACL_MSG);
55479+}
55480+
55481+__u32
55482+gr_acl_handle_unlink(const struct dentry *dentry, const struct vfsmount *mnt)
55483+{
55484+ return generic_fs_handler(dentry, mnt, GR_WRITE | GR_DELETE , GR_UNLINK_ACL_MSG);
55485+}
55486+
55487+__u32
55488+gr_acl_handle_truncate(const struct dentry *dentry, const struct vfsmount *mnt)
55489+{
55490+ return generic_fs_handler(dentry, mnt, GR_WRITE, GR_TRUNCATE_ACL_MSG);
55491+}
55492+
55493+__u32
55494+gr_acl_handle_utime(const struct dentry *dentry, const struct vfsmount *mnt)
55495+{
55496+ return generic_fs_handler(dentry, mnt, GR_WRITE, GR_ATIME_ACL_MSG);
55497+}
55498+
55499+__u32
55500+gr_acl_handle_chmod(const struct dentry *dentry, const struct vfsmount *mnt,
55501+ umode_t *modeptr)
55502+{
55503+ umode_t mode;
55504+
55505+ *modeptr &= ~gr_acl_umask();
55506+ mode = *modeptr;
55507+
55508+ if (unlikely(dentry->d_inode && S_ISSOCK(dentry->d_inode->i_mode)))
55509+ return 1;
55510+
55511+ if (unlikely(mode & (S_ISUID | S_ISGID))) {
55512+ return generic_fs_handler(dentry, mnt, GR_WRITE | GR_SETID,
55513+ GR_CHMOD_ACL_MSG);
55514+ } else {
55515+ return generic_fs_handler(dentry, mnt, GR_WRITE, GR_CHMOD_ACL_MSG);
55516+ }
55517+}
55518+
55519+__u32
55520+gr_acl_handle_chown(const struct dentry *dentry, const struct vfsmount *mnt)
55521+{
55522+ return generic_fs_handler(dentry, mnt, GR_WRITE, GR_CHOWN_ACL_MSG);
55523+}
55524+
55525+__u32
55526+gr_acl_handle_setxattr(const struct dentry *dentry, const struct vfsmount *mnt)
55527+{
55528+ return generic_fs_handler(dentry, mnt, GR_WRITE, GR_SETXATTR_ACL_MSG);
55529+}
55530+
55531+__u32
55532+gr_acl_handle_execve(const struct dentry *dentry, const struct vfsmount *mnt)
55533+{
55534+ return generic_fs_handler(dentry, mnt, GR_EXEC, GR_EXEC_ACL_MSG);
55535+}
55536+
55537+__u32
55538+gr_acl_handle_unix(const struct dentry *dentry, const struct vfsmount *mnt)
55539+{
55540+ return generic_fs_handler(dentry, mnt, GR_READ | GR_WRITE,
55541+ GR_UNIXCONNECT_ACL_MSG);
55542+}
55543+
55544+/* hardlinks require at minimum create and link permission,
55545+ any additional privilege required is based on the
55546+ privilege of the file being linked to
55547+*/
55548+__u32
55549+gr_acl_handle_link(const struct dentry * new_dentry,
55550+ const struct dentry * parent_dentry,
55551+ const struct vfsmount * parent_mnt,
55552+ const struct dentry * old_dentry,
55553+ const struct vfsmount * old_mnt, const char *to)
55554+{
55555+ __u32 mode;
55556+ __u32 needmode = GR_CREATE | GR_LINK;
55557+ __u32 needaudit = GR_AUDIT_CREATE | GR_AUDIT_LINK;
55558+
55559+ mode =
55560+ gr_check_link(new_dentry, parent_dentry, parent_mnt, old_dentry,
55561+ old_mnt);
55562+
55563+ if (unlikely(((mode & needmode) == needmode) && (mode & needaudit))) {
55564+ gr_log_fs_rbac_str(GR_DO_AUDIT, GR_LINK_ACL_MSG, old_dentry, old_mnt, to);
55565+ return mode;
55566+ } else if (unlikely(((mode & needmode) != needmode) && !(mode & GR_SUPPRESS))) {
55567+ gr_log_fs_rbac_str(GR_DONT_AUDIT, GR_LINK_ACL_MSG, old_dentry, old_mnt, to);
55568+ return 0;
55569+ } else if (unlikely((mode & needmode) != needmode))
55570+ return 0;
55571+
55572+ return 1;
55573+}
55574+
55575+__u32
55576+gr_acl_handle_symlink(const struct dentry * new_dentry,
55577+ const struct dentry * parent_dentry,
55578+ const struct vfsmount * parent_mnt, const char *from)
55579+{
55580+ __u32 needmode = GR_WRITE | GR_CREATE;
55581+ __u32 mode;
55582+
55583+ mode =
55584+ gr_check_create(new_dentry, parent_dentry, parent_mnt,
55585+ GR_CREATE | GR_AUDIT_CREATE |
55586+ GR_WRITE | GR_AUDIT_WRITE | GR_SUPPRESS);
55587+
55588+ if (unlikely(mode & GR_WRITE && mode & GR_AUDITS)) {
55589+ gr_log_fs_str_rbac(GR_DO_AUDIT, GR_SYMLINK_ACL_MSG, from, new_dentry, parent_mnt);
55590+ return mode;
55591+ } else if (unlikely(((mode & needmode) != needmode) && !(mode & GR_SUPPRESS))) {
55592+ gr_log_fs_str_rbac(GR_DONT_AUDIT, GR_SYMLINK_ACL_MSG, from, new_dentry, parent_mnt);
55593+ return 0;
55594+ } else if (unlikely((mode & needmode) != needmode))
55595+ return 0;
55596+
55597+ return (GR_WRITE | GR_CREATE);
55598+}
55599+
55600+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)
55601+{
55602+ __u32 mode;
55603+
55604+ mode = gr_check_create(new_dentry, parent_dentry, parent_mnt, reqmode | to_gr_audit(reqmode) | GR_SUPPRESS);
55605+
55606+ if (unlikely(((mode & (reqmode)) == (reqmode)) && mode & GR_AUDITS)) {
55607+ gr_log_fs_rbac_generic(GR_DO_AUDIT, fmt, new_dentry, parent_mnt);
55608+ return mode;
55609+ } else if (unlikely((mode & (reqmode)) != (reqmode) && !(mode & GR_SUPPRESS))) {
55610+ gr_log_fs_rbac_generic(GR_DONT_AUDIT, fmt, new_dentry, parent_mnt);
55611+ return 0;
55612+ } else if (unlikely((mode & (reqmode)) != (reqmode)))
55613+ return 0;
55614+
55615+ return (reqmode);
55616+}
55617+
55618+__u32
55619+gr_acl_handle_mknod(const struct dentry * new_dentry,
55620+ const struct dentry * parent_dentry,
55621+ const struct vfsmount * parent_mnt,
55622+ const int mode)
55623+{
55624+ __u32 reqmode = GR_WRITE | GR_CREATE;
55625+ if (unlikely(mode & (S_ISUID | S_ISGID)))
55626+ reqmode |= GR_SETID;
55627+
55628+ return generic_fs_create_handler(new_dentry, parent_dentry, parent_mnt,
55629+ reqmode, GR_MKNOD_ACL_MSG);
55630+}
55631+
55632+__u32
55633+gr_acl_handle_mkdir(const struct dentry *new_dentry,
55634+ const struct dentry *parent_dentry,
55635+ const struct vfsmount *parent_mnt)
55636+{
55637+ return generic_fs_create_handler(new_dentry, parent_dentry, parent_mnt,
55638+ GR_WRITE | GR_CREATE, GR_MKDIR_ACL_MSG);
55639+}
55640+
55641+#define RENAME_CHECK_SUCCESS(old, new) \
55642+ (((old & (GR_WRITE | GR_READ)) == (GR_WRITE | GR_READ)) && \
55643+ ((new & (GR_WRITE | GR_READ)) == (GR_WRITE | GR_READ)))
55644+
55645+int
55646+gr_acl_handle_rename(struct dentry *new_dentry,
55647+ struct dentry *parent_dentry,
55648+ const struct vfsmount *parent_mnt,
55649+ struct dentry *old_dentry,
55650+ struct inode *old_parent_inode,
55651+ struct vfsmount *old_mnt, const char *newname)
55652+{
55653+ __u32 comp1, comp2;
55654+ int error = 0;
55655+
55656+ if (unlikely(!gr_acl_is_enabled()))
55657+ return 0;
55658+
55659+ if (!new_dentry->d_inode) {
55660+ comp1 = gr_check_create(new_dentry, parent_dentry, parent_mnt,
55661+ GR_READ | GR_WRITE | GR_CREATE | GR_AUDIT_READ |
55662+ GR_AUDIT_WRITE | GR_AUDIT_CREATE | GR_SUPPRESS);
55663+ comp2 = gr_search_file(old_dentry, GR_READ | GR_WRITE |
55664+ GR_DELETE | GR_AUDIT_DELETE |
55665+ GR_AUDIT_READ | GR_AUDIT_WRITE |
55666+ GR_SUPPRESS, old_mnt);
55667+ } else {
55668+ comp1 = gr_search_file(new_dentry, GR_READ | GR_WRITE |
55669+ GR_CREATE | GR_DELETE |
55670+ GR_AUDIT_CREATE | GR_AUDIT_DELETE |
55671+ GR_AUDIT_READ | GR_AUDIT_WRITE |
55672+ GR_SUPPRESS, parent_mnt);
55673+ comp2 =
55674+ gr_search_file(old_dentry,
55675+ GR_READ | GR_WRITE | GR_AUDIT_READ |
55676+ GR_DELETE | GR_AUDIT_DELETE |
55677+ GR_AUDIT_WRITE | GR_SUPPRESS, old_mnt);
55678+ }
55679+
55680+ if (RENAME_CHECK_SUCCESS(comp1, comp2) &&
55681+ ((comp1 & GR_AUDITS) || (comp2 & GR_AUDITS)))
55682+ gr_log_fs_rbac_str(GR_DO_AUDIT, GR_RENAME_ACL_MSG, old_dentry, old_mnt, newname);
55683+ else if (!RENAME_CHECK_SUCCESS(comp1, comp2) && !(comp1 & GR_SUPPRESS)
55684+ && !(comp2 & GR_SUPPRESS)) {
55685+ gr_log_fs_rbac_str(GR_DONT_AUDIT, GR_RENAME_ACL_MSG, old_dentry, old_mnt, newname);
55686+ error = -EACCES;
55687+ } else if (unlikely(!RENAME_CHECK_SUCCESS(comp1, comp2)))
55688+ error = -EACCES;
55689+
55690+ return error;
55691+}
55692+
55693+void
55694+gr_acl_handle_exit(void)
55695+{
55696+ u16 id;
55697+ char *rolename;
55698+ struct file *exec_file;
55699+
55700+ if (unlikely(current->acl_sp_role && gr_acl_is_enabled() &&
55701+ !(current->role->roletype & GR_ROLE_PERSIST))) {
55702+ id = current->acl_role_id;
55703+ rolename = current->role->rolename;
55704+ gr_set_acls(1);
55705+ gr_log_str_int(GR_DONT_AUDIT_GOOD, GR_SPROLEL_ACL_MSG, rolename, id);
55706+ }
55707+
55708+ write_lock(&grsec_exec_file_lock);
55709+ exec_file = current->exec_file;
55710+ current->exec_file = NULL;
55711+ write_unlock(&grsec_exec_file_lock);
55712+
55713+ if (exec_file)
55714+ fput(exec_file);
55715+}
55716+
55717+int
55718+gr_acl_handle_procpidmem(const struct task_struct *task)
55719+{
55720+ if (unlikely(!gr_acl_is_enabled()))
55721+ return 0;
55722+
55723+ if (task != current && task->acl->mode & GR_PROTPROCFD)
55724+ return -EACCES;
55725+
55726+ return 0;
55727+}
55728diff --git a/grsecurity/gracl_ip.c b/grsecurity/gracl_ip.c
55729new file mode 100644
55730index 0000000..17050ca
55731--- /dev/null
55732+++ b/grsecurity/gracl_ip.c
55733@@ -0,0 +1,381 @@
55734+#include <linux/kernel.h>
55735+#include <asm/uaccess.h>
55736+#include <asm/errno.h>
55737+#include <net/sock.h>
55738+#include <linux/file.h>
55739+#include <linux/fs.h>
55740+#include <linux/net.h>
55741+#include <linux/in.h>
55742+#include <linux/skbuff.h>
55743+#include <linux/ip.h>
55744+#include <linux/udp.h>
55745+#include <linux/types.h>
55746+#include <linux/sched.h>
55747+#include <linux/netdevice.h>
55748+#include <linux/inetdevice.h>
55749+#include <linux/gracl.h>
55750+#include <linux/grsecurity.h>
55751+#include <linux/grinternal.h>
55752+
55753+#define GR_BIND 0x01
55754+#define GR_CONNECT 0x02
55755+#define GR_INVERT 0x04
55756+#define GR_BINDOVERRIDE 0x08
55757+#define GR_CONNECTOVERRIDE 0x10
55758+#define GR_SOCK_FAMILY 0x20
55759+
55760+static const char * gr_protocols[IPPROTO_MAX] = {
55761+ "ip", "icmp", "igmp", "ggp", "ipencap", "st", "tcp", "cbt",
55762+ "egp", "igp", "bbn-rcc", "nvp", "pup", "argus", "emcon", "xnet",
55763+ "chaos", "udp", "mux", "dcn", "hmp", "prm", "xns-idp", "trunk-1",
55764+ "trunk-2", "leaf-1", "leaf-2", "rdp", "irtp", "iso-tp4", "netblt", "mfe-nsp",
55765+ "merit-inp", "sep", "3pc", "idpr", "xtp", "ddp", "idpr-cmtp", "tp++",
55766+ "il", "ipv6", "sdrp", "ipv6-route", "ipv6-frag", "idrp", "rsvp", "gre",
55767+ "mhrp", "bna", "ipv6-crypt", "ipv6-auth", "i-nlsp", "swipe", "narp", "mobile",
55768+ "tlsp", "skip", "ipv6-icmp", "ipv6-nonxt", "ipv6-opts", "unknown:61", "cftp", "unknown:63",
55769+ "sat-expak", "kryptolan", "rvd", "ippc", "unknown:68", "sat-mon", "visa", "ipcv",
55770+ "cpnx", "cphb", "wsn", "pvp", "br-sat-mon", "sun-nd", "wb-mon", "wb-expak",
55771+ "iso-ip", "vmtp", "secure-vmtp", "vines", "ttp", "nfsnet-igp", "dgp", "tcf",
55772+ "eigrp", "ospf", "sprite-rpc", "larp", "mtp", "ax.25", "ipip", "micp",
55773+ "scc-sp", "etherip", "encap", "unknown:99", "gmtp", "ifmp", "pnni", "pim",
55774+ "aris", "scps", "qnx", "a/n", "ipcomp", "snp", "compaq-peer", "ipx-in-ip",
55775+ "vrrp", "pgm", "unknown:114", "l2tp", "ddx", "iatp", "stp", "srp",
55776+ "uti", "smp", "sm", "ptp", "isis", "fire", "crtp", "crdup",
55777+ "sscopmce", "iplt", "sps", "pipe", "sctp", "fc", "unkown:134", "unknown:135",
55778+ "unknown:136", "unknown:137", "unknown:138", "unknown:139", "unknown:140", "unknown:141", "unknown:142", "unknown:143",
55779+ "unknown:144", "unknown:145", "unknown:146", "unknown:147", "unknown:148", "unknown:149", "unknown:150", "unknown:151",
55780+ "unknown:152", "unknown:153", "unknown:154", "unknown:155", "unknown:156", "unknown:157", "unknown:158", "unknown:159",
55781+ "unknown:160", "unknown:161", "unknown:162", "unknown:163", "unknown:164", "unknown:165", "unknown:166", "unknown:167",
55782+ "unknown:168", "unknown:169", "unknown:170", "unknown:171", "unknown:172", "unknown:173", "unknown:174", "unknown:175",
55783+ "unknown:176", "unknown:177", "unknown:178", "unknown:179", "unknown:180", "unknown:181", "unknown:182", "unknown:183",
55784+ "unknown:184", "unknown:185", "unknown:186", "unknown:187", "unknown:188", "unknown:189", "unknown:190", "unknown:191",
55785+ "unknown:192", "unknown:193", "unknown:194", "unknown:195", "unknown:196", "unknown:197", "unknown:198", "unknown:199",
55786+ "unknown:200", "unknown:201", "unknown:202", "unknown:203", "unknown:204", "unknown:205", "unknown:206", "unknown:207",
55787+ "unknown:208", "unknown:209", "unknown:210", "unknown:211", "unknown:212", "unknown:213", "unknown:214", "unknown:215",
55788+ "unknown:216", "unknown:217", "unknown:218", "unknown:219", "unknown:220", "unknown:221", "unknown:222", "unknown:223",
55789+ "unknown:224", "unknown:225", "unknown:226", "unknown:227", "unknown:228", "unknown:229", "unknown:230", "unknown:231",
55790+ "unknown:232", "unknown:233", "unknown:234", "unknown:235", "unknown:236", "unknown:237", "unknown:238", "unknown:239",
55791+ "unknown:240", "unknown:241", "unknown:242", "unknown:243", "unknown:244", "unknown:245", "unknown:246", "unknown:247",
55792+ "unknown:248", "unknown:249", "unknown:250", "unknown:251", "unknown:252", "unknown:253", "unknown:254", "unknown:255",
55793+ };
55794+
55795+static const char * gr_socktypes[SOCK_MAX] = {
55796+ "unknown:0", "stream", "dgram", "raw", "rdm", "seqpacket", "unknown:6",
55797+ "unknown:7", "unknown:8", "unknown:9", "packet"
55798+ };
55799+
55800+static const char * gr_sockfamilies[AF_MAX+1] = {
55801+ "unspec", "unix", "inet", "ax25", "ipx", "appletalk", "netrom", "bridge", "atmpvc", "x25",
55802+ "inet6", "rose", "decnet", "netbeui", "security", "key", "netlink", "packet", "ash",
55803+ "econet", "atmsvc", "rds", "sna", "irda", "ppox", "wanpipe", "llc", "fam_27", "fam_28",
55804+ "tipc", "bluetooth", "iucv", "rxrpc", "isdn", "phonet", "ieee802154", "ciaf"
55805+ };
55806+
55807+const char *
55808+gr_proto_to_name(unsigned char proto)
55809+{
55810+ return gr_protocols[proto];
55811+}
55812+
55813+const char *
55814+gr_socktype_to_name(unsigned char type)
55815+{
55816+ return gr_socktypes[type];
55817+}
55818+
55819+const char *
55820+gr_sockfamily_to_name(unsigned char family)
55821+{
55822+ return gr_sockfamilies[family];
55823+}
55824+
55825+int
55826+gr_search_socket(const int domain, const int type, const int protocol)
55827+{
55828+ struct acl_subject_label *curr;
55829+ const struct cred *cred = current_cred();
55830+
55831+ if (unlikely(!gr_acl_is_enabled()))
55832+ goto exit;
55833+
55834+ if ((domain < 0) || (type < 0) || (protocol < 0) ||
55835+ (domain >= AF_MAX) || (type >= SOCK_MAX) || (protocol >= IPPROTO_MAX))
55836+ goto exit; // let the kernel handle it
55837+
55838+ curr = current->acl;
55839+
55840+ if (curr->sock_families[domain / 32] & (1 << (domain % 32))) {
55841+ /* the family is allowed, if this is PF_INET allow it only if
55842+ the extra sock type/protocol checks pass */
55843+ if (domain == PF_INET)
55844+ goto inet_check;
55845+ goto exit;
55846+ } else {
55847+ if (curr->mode & (GR_LEARN | GR_INHERITLEARN)) {
55848+ __u32 fakeip = 0;
55849+ security_learn(GR_IP_LEARN_MSG, current->role->rolename,
55850+ current->role->roletype, cred->uid,
55851+ cred->gid, current->exec_file ?
55852+ gr_to_filename(current->exec_file->f_path.dentry,
55853+ current->exec_file->f_path.mnt) :
55854+ curr->filename, curr->filename,
55855+ &fakeip, domain, 0, 0, GR_SOCK_FAMILY,
55856+ &current->signal->saved_ip);
55857+ goto exit;
55858+ }
55859+ goto exit_fail;
55860+ }
55861+
55862+inet_check:
55863+ /* the rest of this checking is for IPv4 only */
55864+ if (!curr->ips)
55865+ goto exit;
55866+
55867+ if ((curr->ip_type & (1 << type)) &&
55868+ (curr->ip_proto[protocol / 32] & (1 << (protocol % 32))))
55869+ goto exit;
55870+
55871+ if (curr->mode & (GR_LEARN | GR_INHERITLEARN)) {
55872+ /* we don't place acls on raw sockets , and sometimes
55873+ dgram/ip sockets are opened for ioctl and not
55874+ bind/connect, so we'll fake a bind learn log */
55875+ if (type == SOCK_RAW || type == SOCK_PACKET) {
55876+ __u32 fakeip = 0;
55877+ security_learn(GR_IP_LEARN_MSG, current->role->rolename,
55878+ current->role->roletype, cred->uid,
55879+ cred->gid, current->exec_file ?
55880+ gr_to_filename(current->exec_file->f_path.dentry,
55881+ current->exec_file->f_path.mnt) :
55882+ curr->filename, curr->filename,
55883+ &fakeip, 0, type,
55884+ protocol, GR_CONNECT, &current->signal->saved_ip);
55885+ } else if ((type == SOCK_DGRAM) && (protocol == IPPROTO_IP)) {
55886+ __u32 fakeip = 0;
55887+ security_learn(GR_IP_LEARN_MSG, current->role->rolename,
55888+ current->role->roletype, cred->uid,
55889+ cred->gid, current->exec_file ?
55890+ gr_to_filename(current->exec_file->f_path.dentry,
55891+ current->exec_file->f_path.mnt) :
55892+ curr->filename, curr->filename,
55893+ &fakeip, 0, type,
55894+ protocol, GR_BIND, &current->signal->saved_ip);
55895+ }
55896+ /* we'll log when they use connect or bind */
55897+ goto exit;
55898+ }
55899+
55900+exit_fail:
55901+ if (domain == PF_INET)
55902+ gr_log_str3(GR_DONT_AUDIT, GR_SOCK_MSG, gr_sockfamily_to_name(domain),
55903+ gr_socktype_to_name(type), gr_proto_to_name(protocol));
55904+ else
55905+ gr_log_str2_int(GR_DONT_AUDIT, GR_SOCK_NOINET_MSG, gr_sockfamily_to_name(domain),
55906+ gr_socktype_to_name(type), protocol);
55907+
55908+ return 0;
55909+exit:
55910+ return 1;
55911+}
55912+
55913+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)
55914+{
55915+ if ((ip->mode & mode) &&
55916+ (ip_port >= ip->low) &&
55917+ (ip_port <= ip->high) &&
55918+ ((ntohl(ip_addr) & our_netmask) ==
55919+ (ntohl(our_addr) & our_netmask))
55920+ && (ip->proto[protocol / 32] & (1 << (protocol % 32)))
55921+ && (ip->type & (1 << type))) {
55922+ if (ip->mode & GR_INVERT)
55923+ return 2; // specifically denied
55924+ else
55925+ return 1; // allowed
55926+ }
55927+
55928+ return 0; // not specifically allowed, may continue parsing
55929+}
55930+
55931+static int
55932+gr_search_connectbind(const int full_mode, struct sock *sk,
55933+ struct sockaddr_in *addr, const int type)
55934+{
55935+ char iface[IFNAMSIZ] = {0};
55936+ struct acl_subject_label *curr;
55937+ struct acl_ip_label *ip;
55938+ struct inet_sock *isk;
55939+ struct net_device *dev;
55940+ struct in_device *idev;
55941+ unsigned long i;
55942+ int ret;
55943+ int mode = full_mode & (GR_BIND | GR_CONNECT);
55944+ __u32 ip_addr = 0;
55945+ __u32 our_addr;
55946+ __u32 our_netmask;
55947+ char *p;
55948+ __u16 ip_port = 0;
55949+ const struct cred *cred = current_cred();
55950+
55951+ if (unlikely(!gr_acl_is_enabled() || sk->sk_family != PF_INET))
55952+ return 0;
55953+
55954+ curr = current->acl;
55955+ isk = inet_sk(sk);
55956+
55957+ /* INADDR_ANY overriding for binds, inaddr_any_override is already in network order */
55958+ if ((full_mode & GR_BINDOVERRIDE) && addr->sin_addr.s_addr == htonl(INADDR_ANY) && curr->inaddr_any_override != 0)
55959+ addr->sin_addr.s_addr = curr->inaddr_any_override;
55960+ if ((full_mode & GR_CONNECT) && isk->inet_saddr == htonl(INADDR_ANY) && curr->inaddr_any_override != 0) {
55961+ struct sockaddr_in saddr;
55962+ int err;
55963+
55964+ saddr.sin_family = AF_INET;
55965+ saddr.sin_addr.s_addr = curr->inaddr_any_override;
55966+ saddr.sin_port = isk->inet_sport;
55967+
55968+ err = security_socket_bind(sk->sk_socket, (struct sockaddr *)&saddr, sizeof(struct sockaddr_in));
55969+ if (err)
55970+ return err;
55971+
55972+ err = sk->sk_socket->ops->bind(sk->sk_socket, (struct sockaddr *)&saddr, sizeof(struct sockaddr_in));
55973+ if (err)
55974+ return err;
55975+ }
55976+
55977+ if (!curr->ips)
55978+ return 0;
55979+
55980+ ip_addr = addr->sin_addr.s_addr;
55981+ ip_port = ntohs(addr->sin_port);
55982+
55983+ if (curr->mode & (GR_LEARN | GR_INHERITLEARN)) {
55984+ security_learn(GR_IP_LEARN_MSG, current->role->rolename,
55985+ current->role->roletype, cred->uid,
55986+ cred->gid, current->exec_file ?
55987+ gr_to_filename(current->exec_file->f_path.dentry,
55988+ current->exec_file->f_path.mnt) :
55989+ curr->filename, curr->filename,
55990+ &ip_addr, ip_port, type,
55991+ sk->sk_protocol, mode, &current->signal->saved_ip);
55992+ return 0;
55993+ }
55994+
55995+ for (i = 0; i < curr->ip_num; i++) {
55996+ ip = *(curr->ips + i);
55997+ if (ip->iface != NULL) {
55998+ strncpy(iface, ip->iface, IFNAMSIZ - 1);
55999+ p = strchr(iface, ':');
56000+ if (p != NULL)
56001+ *p = '\0';
56002+ dev = dev_get_by_name(sock_net(sk), iface);
56003+ if (dev == NULL)
56004+ continue;
56005+ idev = in_dev_get(dev);
56006+ if (idev == NULL) {
56007+ dev_put(dev);
56008+ continue;
56009+ }
56010+ rcu_read_lock();
56011+ for_ifa(idev) {
56012+ if (!strcmp(ip->iface, ifa->ifa_label)) {
56013+ our_addr = ifa->ifa_address;
56014+ our_netmask = 0xffffffff;
56015+ ret = check_ip_policy(ip, ip_addr, ip_port, sk->sk_protocol, mode, type, our_addr, our_netmask);
56016+ if (ret == 1) {
56017+ rcu_read_unlock();
56018+ in_dev_put(idev);
56019+ dev_put(dev);
56020+ return 0;
56021+ } else if (ret == 2) {
56022+ rcu_read_unlock();
56023+ in_dev_put(idev);
56024+ dev_put(dev);
56025+ goto denied;
56026+ }
56027+ }
56028+ } endfor_ifa(idev);
56029+ rcu_read_unlock();
56030+ in_dev_put(idev);
56031+ dev_put(dev);
56032+ } else {
56033+ our_addr = ip->addr;
56034+ our_netmask = ip->netmask;
56035+ ret = check_ip_policy(ip, ip_addr, ip_port, sk->sk_protocol, mode, type, our_addr, our_netmask);
56036+ if (ret == 1)
56037+ return 0;
56038+ else if (ret == 2)
56039+ goto denied;
56040+ }
56041+ }
56042+
56043+denied:
56044+ if (mode == GR_BIND)
56045+ 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));
56046+ else if (mode == GR_CONNECT)
56047+ 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));
56048+
56049+ return -EACCES;
56050+}
56051+
56052+int
56053+gr_search_connect(struct socket *sock, struct sockaddr_in *addr)
56054+{
56055+ return gr_search_connectbind(GR_CONNECT | GR_CONNECTOVERRIDE, sock->sk, addr, sock->type);
56056+}
56057+
56058+int
56059+gr_search_bind(struct socket *sock, struct sockaddr_in *addr)
56060+{
56061+ return gr_search_connectbind(GR_BIND | GR_BINDOVERRIDE, sock->sk, addr, sock->type);
56062+}
56063+
56064+int gr_search_listen(struct socket *sock)
56065+{
56066+ struct sock *sk = sock->sk;
56067+ struct sockaddr_in addr;
56068+
56069+ addr.sin_addr.s_addr = inet_sk(sk)->inet_saddr;
56070+ addr.sin_port = inet_sk(sk)->inet_sport;
56071+
56072+ return gr_search_connectbind(GR_BIND | GR_CONNECTOVERRIDE, sock->sk, &addr, sock->type);
56073+}
56074+
56075+int gr_search_accept(struct socket *sock)
56076+{
56077+ struct sock *sk = sock->sk;
56078+ struct sockaddr_in addr;
56079+
56080+ addr.sin_addr.s_addr = inet_sk(sk)->inet_saddr;
56081+ addr.sin_port = inet_sk(sk)->inet_sport;
56082+
56083+ return gr_search_connectbind(GR_BIND | GR_CONNECTOVERRIDE, sock->sk, &addr, sock->type);
56084+}
56085+
56086+int
56087+gr_search_udp_sendmsg(struct sock *sk, struct sockaddr_in *addr)
56088+{
56089+ if (addr)
56090+ return gr_search_connectbind(GR_CONNECT, sk, addr, SOCK_DGRAM);
56091+ else {
56092+ struct sockaddr_in sin;
56093+ const struct inet_sock *inet = inet_sk(sk);
56094+
56095+ sin.sin_addr.s_addr = inet->inet_daddr;
56096+ sin.sin_port = inet->inet_dport;
56097+
56098+ return gr_search_connectbind(GR_CONNECT | GR_CONNECTOVERRIDE, sk, &sin, SOCK_DGRAM);
56099+ }
56100+}
56101+
56102+int
56103+gr_search_udp_recvmsg(struct sock *sk, const struct sk_buff *skb)
56104+{
56105+ struct sockaddr_in sin;
56106+
56107+ if (unlikely(skb->len < sizeof (struct udphdr)))
56108+ return 0; // skip this packet
56109+
56110+ sin.sin_addr.s_addr = ip_hdr(skb)->saddr;
56111+ sin.sin_port = udp_hdr(skb)->source;
56112+
56113+ return gr_search_connectbind(GR_CONNECT | GR_CONNECTOVERRIDE, sk, &sin, SOCK_DGRAM);
56114+}
56115diff --git a/grsecurity/gracl_learn.c b/grsecurity/gracl_learn.c
56116new file mode 100644
56117index 0000000..25f54ef
56118--- /dev/null
56119+++ b/grsecurity/gracl_learn.c
56120@@ -0,0 +1,207 @@
56121+#include <linux/kernel.h>
56122+#include <linux/mm.h>
56123+#include <linux/sched.h>
56124+#include <linux/poll.h>
56125+#include <linux/string.h>
56126+#include <linux/file.h>
56127+#include <linux/types.h>
56128+#include <linux/vmalloc.h>
56129+#include <linux/grinternal.h>
56130+
56131+extern ssize_t write_grsec_handler(struct file * file, const char __user * buf,
56132+ size_t count, loff_t *ppos);
56133+extern int gr_acl_is_enabled(void);
56134+
56135+static DECLARE_WAIT_QUEUE_HEAD(learn_wait);
56136+static int gr_learn_attached;
56137+
56138+/* use a 512k buffer */
56139+#define LEARN_BUFFER_SIZE (512 * 1024)
56140+
56141+static DEFINE_SPINLOCK(gr_learn_lock);
56142+static DEFINE_MUTEX(gr_learn_user_mutex);
56143+
56144+/* we need to maintain two buffers, so that the kernel context of grlearn
56145+ uses a semaphore around the userspace copying, and the other kernel contexts
56146+ use a spinlock when copying into the buffer, since they cannot sleep
56147+*/
56148+static char *learn_buffer;
56149+static char *learn_buffer_user;
56150+static int learn_buffer_len;
56151+static int learn_buffer_user_len;
56152+
56153+static ssize_t
56154+read_learn(struct file *file, char __user * buf, size_t count, loff_t * ppos)
56155+{
56156+ DECLARE_WAITQUEUE(wait, current);
56157+ ssize_t retval = 0;
56158+
56159+ add_wait_queue(&learn_wait, &wait);
56160+ set_current_state(TASK_INTERRUPTIBLE);
56161+ do {
56162+ mutex_lock(&gr_learn_user_mutex);
56163+ spin_lock(&gr_learn_lock);
56164+ if (learn_buffer_len)
56165+ break;
56166+ spin_unlock(&gr_learn_lock);
56167+ mutex_unlock(&gr_learn_user_mutex);
56168+ if (file->f_flags & O_NONBLOCK) {
56169+ retval = -EAGAIN;
56170+ goto out;
56171+ }
56172+ if (signal_pending(current)) {
56173+ retval = -ERESTARTSYS;
56174+ goto out;
56175+ }
56176+
56177+ schedule();
56178+ } while (1);
56179+
56180+ memcpy(learn_buffer_user, learn_buffer, learn_buffer_len);
56181+ learn_buffer_user_len = learn_buffer_len;
56182+ retval = learn_buffer_len;
56183+ learn_buffer_len = 0;
56184+
56185+ spin_unlock(&gr_learn_lock);
56186+
56187+ if (copy_to_user(buf, learn_buffer_user, learn_buffer_user_len))
56188+ retval = -EFAULT;
56189+
56190+ mutex_unlock(&gr_learn_user_mutex);
56191+out:
56192+ set_current_state(TASK_RUNNING);
56193+ remove_wait_queue(&learn_wait, &wait);
56194+ return retval;
56195+}
56196+
56197+static unsigned int
56198+poll_learn(struct file * file, poll_table * wait)
56199+{
56200+ poll_wait(file, &learn_wait, wait);
56201+
56202+ if (learn_buffer_len)
56203+ return (POLLIN | POLLRDNORM);
56204+
56205+ return 0;
56206+}
56207+
56208+void
56209+gr_clear_learn_entries(void)
56210+{
56211+ char *tmp;
56212+
56213+ mutex_lock(&gr_learn_user_mutex);
56214+ spin_lock(&gr_learn_lock);
56215+ tmp = learn_buffer;
56216+ learn_buffer = NULL;
56217+ spin_unlock(&gr_learn_lock);
56218+ if (tmp)
56219+ vfree(tmp);
56220+ if (learn_buffer_user != NULL) {
56221+ vfree(learn_buffer_user);
56222+ learn_buffer_user = NULL;
56223+ }
56224+ learn_buffer_len = 0;
56225+ mutex_unlock(&gr_learn_user_mutex);
56226+
56227+ return;
56228+}
56229+
56230+void
56231+gr_add_learn_entry(const char *fmt, ...)
56232+{
56233+ va_list args;
56234+ unsigned int len;
56235+
56236+ if (!gr_learn_attached)
56237+ return;
56238+
56239+ spin_lock(&gr_learn_lock);
56240+
56241+ /* leave a gap at the end so we know when it's "full" but don't have to
56242+ compute the exact length of the string we're trying to append
56243+ */
56244+ if (learn_buffer_len > LEARN_BUFFER_SIZE - 16384) {
56245+ spin_unlock(&gr_learn_lock);
56246+ wake_up_interruptible(&learn_wait);
56247+ return;
56248+ }
56249+ if (learn_buffer == NULL) {
56250+ spin_unlock(&gr_learn_lock);
56251+ return;
56252+ }
56253+
56254+ va_start(args, fmt);
56255+ len = vsnprintf(learn_buffer + learn_buffer_len, LEARN_BUFFER_SIZE - learn_buffer_len, fmt, args);
56256+ va_end(args);
56257+
56258+ learn_buffer_len += len + 1;
56259+
56260+ spin_unlock(&gr_learn_lock);
56261+ wake_up_interruptible(&learn_wait);
56262+
56263+ return;
56264+}
56265+
56266+static int
56267+open_learn(struct inode *inode, struct file *file)
56268+{
56269+ if (file->f_mode & FMODE_READ && gr_learn_attached)
56270+ return -EBUSY;
56271+ if (file->f_mode & FMODE_READ) {
56272+ int retval = 0;
56273+ mutex_lock(&gr_learn_user_mutex);
56274+ if (learn_buffer == NULL)
56275+ learn_buffer = vmalloc(LEARN_BUFFER_SIZE);
56276+ if (learn_buffer_user == NULL)
56277+ learn_buffer_user = vmalloc(LEARN_BUFFER_SIZE);
56278+ if (learn_buffer == NULL) {
56279+ retval = -ENOMEM;
56280+ goto out_error;
56281+ }
56282+ if (learn_buffer_user == NULL) {
56283+ retval = -ENOMEM;
56284+ goto out_error;
56285+ }
56286+ learn_buffer_len = 0;
56287+ learn_buffer_user_len = 0;
56288+ gr_learn_attached = 1;
56289+out_error:
56290+ mutex_unlock(&gr_learn_user_mutex);
56291+ return retval;
56292+ }
56293+ return 0;
56294+}
56295+
56296+static int
56297+close_learn(struct inode *inode, struct file *file)
56298+{
56299+ if (file->f_mode & FMODE_READ) {
56300+ char *tmp = NULL;
56301+ mutex_lock(&gr_learn_user_mutex);
56302+ spin_lock(&gr_learn_lock);
56303+ tmp = learn_buffer;
56304+ learn_buffer = NULL;
56305+ spin_unlock(&gr_learn_lock);
56306+ if (tmp)
56307+ vfree(tmp);
56308+ if (learn_buffer_user != NULL) {
56309+ vfree(learn_buffer_user);
56310+ learn_buffer_user = NULL;
56311+ }
56312+ learn_buffer_len = 0;
56313+ learn_buffer_user_len = 0;
56314+ gr_learn_attached = 0;
56315+ mutex_unlock(&gr_learn_user_mutex);
56316+ }
56317+
56318+ return 0;
56319+}
56320+
56321+const struct file_operations grsec_fops = {
56322+ .read = read_learn,
56323+ .write = write_grsec_handler,
56324+ .open = open_learn,
56325+ .release = close_learn,
56326+ .poll = poll_learn,
56327+};
56328diff --git a/grsecurity/gracl_res.c b/grsecurity/gracl_res.c
56329new file mode 100644
56330index 0000000..39645c9
56331--- /dev/null
56332+++ b/grsecurity/gracl_res.c
56333@@ -0,0 +1,68 @@
56334+#include <linux/kernel.h>
56335+#include <linux/sched.h>
56336+#include <linux/gracl.h>
56337+#include <linux/grinternal.h>
56338+
56339+static const char *restab_log[] = {
56340+ [RLIMIT_CPU] = "RLIMIT_CPU",
56341+ [RLIMIT_FSIZE] = "RLIMIT_FSIZE",
56342+ [RLIMIT_DATA] = "RLIMIT_DATA",
56343+ [RLIMIT_STACK] = "RLIMIT_STACK",
56344+ [RLIMIT_CORE] = "RLIMIT_CORE",
56345+ [RLIMIT_RSS] = "RLIMIT_RSS",
56346+ [RLIMIT_NPROC] = "RLIMIT_NPROC",
56347+ [RLIMIT_NOFILE] = "RLIMIT_NOFILE",
56348+ [RLIMIT_MEMLOCK] = "RLIMIT_MEMLOCK",
56349+ [RLIMIT_AS] = "RLIMIT_AS",
56350+ [RLIMIT_LOCKS] = "RLIMIT_LOCKS",
56351+ [RLIMIT_SIGPENDING] = "RLIMIT_SIGPENDING",
56352+ [RLIMIT_MSGQUEUE] = "RLIMIT_MSGQUEUE",
56353+ [RLIMIT_NICE] = "RLIMIT_NICE",
56354+ [RLIMIT_RTPRIO] = "RLIMIT_RTPRIO",
56355+ [RLIMIT_RTTIME] = "RLIMIT_RTTIME",
56356+ [GR_CRASH_RES] = "RLIMIT_CRASH"
56357+};
56358+
56359+void
56360+gr_log_resource(const struct task_struct *task,
56361+ const int res, const unsigned long wanted, const int gt)
56362+{
56363+ const struct cred *cred;
56364+ unsigned long rlim;
56365+
56366+ if (!gr_acl_is_enabled() && !grsec_resource_logging)
56367+ return;
56368+
56369+ // not yet supported resource
56370+ if (unlikely(!restab_log[res]))
56371+ return;
56372+
56373+ if (res == RLIMIT_CPU || res == RLIMIT_RTTIME)
56374+ rlim = task_rlimit_max(task, res);
56375+ else
56376+ rlim = task_rlimit(task, res);
56377+
56378+ if (likely((rlim == RLIM_INFINITY) || (gt && wanted <= rlim) || (!gt && wanted < rlim)))
56379+ return;
56380+
56381+ rcu_read_lock();
56382+ cred = __task_cred(task);
56383+
56384+ if (res == RLIMIT_NPROC &&
56385+ (cap_raised(cred->cap_effective, CAP_SYS_ADMIN) ||
56386+ cap_raised(cred->cap_effective, CAP_SYS_RESOURCE)))
56387+ goto out_rcu_unlock;
56388+ else if (res == RLIMIT_MEMLOCK &&
56389+ cap_raised(cred->cap_effective, CAP_IPC_LOCK))
56390+ goto out_rcu_unlock;
56391+ else if (res == RLIMIT_NICE && cap_raised(cred->cap_effective, CAP_SYS_NICE))
56392+ goto out_rcu_unlock;
56393+ rcu_read_unlock();
56394+
56395+ gr_log_res_ulong2_str(GR_DONT_AUDIT, GR_RESOURCE_MSG, task, wanted, restab_log[res], rlim);
56396+
56397+ return;
56398+out_rcu_unlock:
56399+ rcu_read_unlock();
56400+ return;
56401+}
56402diff --git a/grsecurity/gracl_segv.c b/grsecurity/gracl_segv.c
56403new file mode 100644
56404index 0000000..5556be3
56405--- /dev/null
56406+++ b/grsecurity/gracl_segv.c
56407@@ -0,0 +1,299 @@
56408+#include <linux/kernel.h>
56409+#include <linux/mm.h>
56410+#include <asm/uaccess.h>
56411+#include <asm/errno.h>
56412+#include <asm/mman.h>
56413+#include <net/sock.h>
56414+#include <linux/file.h>
56415+#include <linux/fs.h>
56416+#include <linux/net.h>
56417+#include <linux/in.h>
56418+#include <linux/slab.h>
56419+#include <linux/types.h>
56420+#include <linux/sched.h>
56421+#include <linux/timer.h>
56422+#include <linux/gracl.h>
56423+#include <linux/grsecurity.h>
56424+#include <linux/grinternal.h>
56425+
56426+static struct crash_uid *uid_set;
56427+static unsigned short uid_used;
56428+static DEFINE_SPINLOCK(gr_uid_lock);
56429+extern rwlock_t gr_inode_lock;
56430+extern struct acl_subject_label *
56431+ lookup_acl_subj_label(const ino_t inode, const dev_t dev,
56432+ struct acl_role_label *role);
56433+
56434+#ifdef CONFIG_BTRFS_FS
56435+extern dev_t get_btrfs_dev_from_inode(struct inode *inode);
56436+extern int btrfs_getattr(struct vfsmount *mnt, struct dentry *dentry, struct kstat *stat);
56437+#endif
56438+
56439+static inline dev_t __get_dev(const struct dentry *dentry)
56440+{
56441+#ifdef CONFIG_BTRFS_FS
56442+ if (dentry->d_inode->i_op && dentry->d_inode->i_op->getattr == &btrfs_getattr)
56443+ return get_btrfs_dev_from_inode(dentry->d_inode);
56444+ else
56445+#endif
56446+ return dentry->d_inode->i_sb->s_dev;
56447+}
56448+
56449+int
56450+gr_init_uidset(void)
56451+{
56452+ uid_set =
56453+ kmalloc(GR_UIDTABLE_MAX * sizeof (struct crash_uid), GFP_KERNEL);
56454+ uid_used = 0;
56455+
56456+ return uid_set ? 1 : 0;
56457+}
56458+
56459+void
56460+gr_free_uidset(void)
56461+{
56462+ if (uid_set)
56463+ kfree(uid_set);
56464+
56465+ return;
56466+}
56467+
56468+int
56469+gr_find_uid(const uid_t uid)
56470+{
56471+ struct crash_uid *tmp = uid_set;
56472+ uid_t buid;
56473+ int low = 0, high = uid_used - 1, mid;
56474+
56475+ while (high >= low) {
56476+ mid = (low + high) >> 1;
56477+ buid = tmp[mid].uid;
56478+ if (buid == uid)
56479+ return mid;
56480+ if (buid > uid)
56481+ high = mid - 1;
56482+ if (buid < uid)
56483+ low = mid + 1;
56484+ }
56485+
56486+ return -1;
56487+}
56488+
56489+static __inline__ void
56490+gr_insertsort(void)
56491+{
56492+ unsigned short i, j;
56493+ struct crash_uid index;
56494+
56495+ for (i = 1; i < uid_used; i++) {
56496+ index = uid_set[i];
56497+ j = i;
56498+ while ((j > 0) && uid_set[j - 1].uid > index.uid) {
56499+ uid_set[j] = uid_set[j - 1];
56500+ j--;
56501+ }
56502+ uid_set[j] = index;
56503+ }
56504+
56505+ return;
56506+}
56507+
56508+static __inline__ void
56509+gr_insert_uid(const uid_t uid, const unsigned long expires)
56510+{
56511+ int loc;
56512+
56513+ if (uid_used == GR_UIDTABLE_MAX)
56514+ return;
56515+
56516+ loc = gr_find_uid(uid);
56517+
56518+ if (loc >= 0) {
56519+ uid_set[loc].expires = expires;
56520+ return;
56521+ }
56522+
56523+ uid_set[uid_used].uid = uid;
56524+ uid_set[uid_used].expires = expires;
56525+ uid_used++;
56526+
56527+ gr_insertsort();
56528+
56529+ return;
56530+}
56531+
56532+void
56533+gr_remove_uid(const unsigned short loc)
56534+{
56535+ unsigned short i;
56536+
56537+ for (i = loc + 1; i < uid_used; i++)
56538+ uid_set[i - 1] = uid_set[i];
56539+
56540+ uid_used--;
56541+
56542+ return;
56543+}
56544+
56545+int
56546+gr_check_crash_uid(const uid_t uid)
56547+{
56548+ int loc;
56549+ int ret = 0;
56550+
56551+ if (unlikely(!gr_acl_is_enabled()))
56552+ return 0;
56553+
56554+ spin_lock(&gr_uid_lock);
56555+ loc = gr_find_uid(uid);
56556+
56557+ if (loc < 0)
56558+ goto out_unlock;
56559+
56560+ if (time_before_eq(uid_set[loc].expires, get_seconds()))
56561+ gr_remove_uid(loc);
56562+ else
56563+ ret = 1;
56564+
56565+out_unlock:
56566+ spin_unlock(&gr_uid_lock);
56567+ return ret;
56568+}
56569+
56570+static __inline__ int
56571+proc_is_setxid(const struct cred *cred)
56572+{
56573+ if (cred->uid != cred->euid || cred->uid != cred->suid ||
56574+ cred->uid != cred->fsuid)
56575+ return 1;
56576+ if (cred->gid != cred->egid || cred->gid != cred->sgid ||
56577+ cred->gid != cred->fsgid)
56578+ return 1;
56579+
56580+ return 0;
56581+}
56582+
56583+extern int gr_fake_force_sig(int sig, struct task_struct *t);
56584+
56585+void
56586+gr_handle_crash(struct task_struct *task, const int sig)
56587+{
56588+ struct acl_subject_label *curr;
56589+ struct task_struct *tsk, *tsk2;
56590+ const struct cred *cred;
56591+ const struct cred *cred2;
56592+
56593+ if (sig != SIGSEGV && sig != SIGKILL && sig != SIGBUS && sig != SIGILL)
56594+ return;
56595+
56596+ if (unlikely(!gr_acl_is_enabled()))
56597+ return;
56598+
56599+ curr = task->acl;
56600+
56601+ if (!(curr->resmask & (1 << GR_CRASH_RES)))
56602+ return;
56603+
56604+ if (time_before_eq(curr->expires, get_seconds())) {
56605+ curr->expires = 0;
56606+ curr->crashes = 0;
56607+ }
56608+
56609+ curr->crashes++;
56610+
56611+ if (!curr->expires)
56612+ curr->expires = get_seconds() + curr->res[GR_CRASH_RES].rlim_max;
56613+
56614+ if ((curr->crashes >= curr->res[GR_CRASH_RES].rlim_cur) &&
56615+ time_after(curr->expires, get_seconds())) {
56616+ rcu_read_lock();
56617+ cred = __task_cred(task);
56618+ if (cred->uid && proc_is_setxid(cred)) {
56619+ gr_log_crash1(GR_DONT_AUDIT, GR_SEGVSTART_ACL_MSG, task, curr->res[GR_CRASH_RES].rlim_max);
56620+ spin_lock(&gr_uid_lock);
56621+ gr_insert_uid(cred->uid, curr->expires);
56622+ spin_unlock(&gr_uid_lock);
56623+ curr->expires = 0;
56624+ curr->crashes = 0;
56625+ read_lock(&tasklist_lock);
56626+ do_each_thread(tsk2, tsk) {
56627+ cred2 = __task_cred(tsk);
56628+ if (tsk != task && cred2->uid == cred->uid)
56629+ gr_fake_force_sig(SIGKILL, tsk);
56630+ } while_each_thread(tsk2, tsk);
56631+ read_unlock(&tasklist_lock);
56632+ } else {
56633+ gr_log_crash2(GR_DONT_AUDIT, GR_SEGVNOSUID_ACL_MSG, task, curr->res[GR_CRASH_RES].rlim_max);
56634+ read_lock(&tasklist_lock);
56635+ read_lock(&grsec_exec_file_lock);
56636+ do_each_thread(tsk2, tsk) {
56637+ if (likely(tsk != task)) {
56638+ // if this thread has the same subject as the one that triggered
56639+ // RES_CRASH and it's the same binary, kill it
56640+ if (tsk->acl == task->acl && tsk->exec_file == task->exec_file)
56641+ gr_fake_force_sig(SIGKILL, tsk);
56642+ }
56643+ } while_each_thread(tsk2, tsk);
56644+ read_unlock(&grsec_exec_file_lock);
56645+ read_unlock(&tasklist_lock);
56646+ }
56647+ rcu_read_unlock();
56648+ }
56649+
56650+ return;
56651+}
56652+
56653+int
56654+gr_check_crash_exec(const struct file *filp)
56655+{
56656+ struct acl_subject_label *curr;
56657+
56658+ if (unlikely(!gr_acl_is_enabled()))
56659+ return 0;
56660+
56661+ read_lock(&gr_inode_lock);
56662+ curr = lookup_acl_subj_label(filp->f_path.dentry->d_inode->i_ino,
56663+ __get_dev(filp->f_path.dentry),
56664+ current->role);
56665+ read_unlock(&gr_inode_lock);
56666+
56667+ if (!curr || !(curr->resmask & (1 << GR_CRASH_RES)) ||
56668+ (!curr->crashes && !curr->expires))
56669+ return 0;
56670+
56671+ if ((curr->crashes >= curr->res[GR_CRASH_RES].rlim_cur) &&
56672+ time_after(curr->expires, get_seconds()))
56673+ return 1;
56674+ else if (time_before_eq(curr->expires, get_seconds())) {
56675+ curr->crashes = 0;
56676+ curr->expires = 0;
56677+ }
56678+
56679+ return 0;
56680+}
56681+
56682+void
56683+gr_handle_alertkill(struct task_struct *task)
56684+{
56685+ struct acl_subject_label *curracl;
56686+ __u32 curr_ip;
56687+ struct task_struct *p, *p2;
56688+
56689+ if (unlikely(!gr_acl_is_enabled()))
56690+ return;
56691+
56692+ curracl = task->acl;
56693+ curr_ip = task->signal->curr_ip;
56694+
56695+ if ((curracl->mode & GR_KILLIPPROC) && curr_ip) {
56696+ read_lock(&tasklist_lock);
56697+ do_each_thread(p2, p) {
56698+ if (p->signal->curr_ip == curr_ip)
56699+ gr_fake_force_sig(SIGKILL, p);
56700+ } while_each_thread(p2, p);
56701+ read_unlock(&tasklist_lock);
56702+ } else if (curracl->mode & GR_KILLPROC)
56703+ gr_fake_force_sig(SIGKILL, task);
56704+
56705+ return;
56706+}
56707diff --git a/grsecurity/gracl_shm.c b/grsecurity/gracl_shm.c
56708new file mode 100644
56709index 0000000..9d83a69
56710--- /dev/null
56711+++ b/grsecurity/gracl_shm.c
56712@@ -0,0 +1,40 @@
56713+#include <linux/kernel.h>
56714+#include <linux/mm.h>
56715+#include <linux/sched.h>
56716+#include <linux/file.h>
56717+#include <linux/ipc.h>
56718+#include <linux/gracl.h>
56719+#include <linux/grsecurity.h>
56720+#include <linux/grinternal.h>
56721+
56722+int
56723+gr_handle_shmat(const pid_t shm_cprid, const pid_t shm_lapid,
56724+ const time_t shm_createtime, const uid_t cuid, const int shmid)
56725+{
56726+ struct task_struct *task;
56727+
56728+ if (!gr_acl_is_enabled())
56729+ return 1;
56730+
56731+ rcu_read_lock();
56732+ read_lock(&tasklist_lock);
56733+
56734+ task = find_task_by_vpid(shm_cprid);
56735+
56736+ if (unlikely(!task))
56737+ task = find_task_by_vpid(shm_lapid);
56738+
56739+ if (unlikely(task && (time_before_eq((unsigned long)task->start_time.tv_sec, (unsigned long)shm_createtime) ||
56740+ (task->pid == shm_lapid)) &&
56741+ (task->acl->mode & GR_PROTSHM) &&
56742+ (task->acl != current->acl))) {
56743+ read_unlock(&tasklist_lock);
56744+ rcu_read_unlock();
56745+ gr_log_int3(GR_DONT_AUDIT, GR_SHMAT_ACL_MSG, cuid, shm_cprid, shmid);
56746+ return 0;
56747+ }
56748+ read_unlock(&tasklist_lock);
56749+ rcu_read_unlock();
56750+
56751+ return 1;
56752+}
56753diff --git a/grsecurity/grsec_chdir.c b/grsecurity/grsec_chdir.c
56754new file mode 100644
56755index 0000000..bc0be01
56756--- /dev/null
56757+++ b/grsecurity/grsec_chdir.c
56758@@ -0,0 +1,19 @@
56759+#include <linux/kernel.h>
56760+#include <linux/sched.h>
56761+#include <linux/fs.h>
56762+#include <linux/file.h>
56763+#include <linux/grsecurity.h>
56764+#include <linux/grinternal.h>
56765+
56766+void
56767+gr_log_chdir(const struct dentry *dentry, const struct vfsmount *mnt)
56768+{
56769+#ifdef CONFIG_GRKERNSEC_AUDIT_CHDIR
56770+ if ((grsec_enable_chdir && grsec_enable_group &&
56771+ in_group_p(grsec_audit_gid)) || (grsec_enable_chdir &&
56772+ !grsec_enable_group)) {
56773+ gr_log_fs_generic(GR_DO_AUDIT, GR_CHDIR_AUDIT_MSG, dentry, mnt);
56774+ }
56775+#endif
56776+ return;
56777+}
56778diff --git a/grsecurity/grsec_chroot.c b/grsecurity/grsec_chroot.c
56779new file mode 100644
56780index 0000000..a2dc675
56781--- /dev/null
56782+++ b/grsecurity/grsec_chroot.c
56783@@ -0,0 +1,351 @@
56784+#include <linux/kernel.h>
56785+#include <linux/module.h>
56786+#include <linux/sched.h>
56787+#include <linux/file.h>
56788+#include <linux/fs.h>
56789+#include <linux/mount.h>
56790+#include <linux/types.h>
56791+#include <linux/pid_namespace.h>
56792+#include <linux/grsecurity.h>
56793+#include <linux/grinternal.h>
56794+
56795+void gr_set_chroot_entries(struct task_struct *task, struct path *path)
56796+{
56797+#ifdef CONFIG_GRKERNSEC
56798+ if (task->pid > 1 && path->dentry != init_task.fs->root.dentry &&
56799+ path->dentry != task->nsproxy->mnt_ns->root->mnt_root)
56800+ task->gr_is_chrooted = 1;
56801+ else
56802+ task->gr_is_chrooted = 0;
56803+
56804+ task->gr_chroot_dentry = path->dentry;
56805+#endif
56806+ return;
56807+}
56808+
56809+void gr_clear_chroot_entries(struct task_struct *task)
56810+{
56811+#ifdef CONFIG_GRKERNSEC
56812+ task->gr_is_chrooted = 0;
56813+ task->gr_chroot_dentry = NULL;
56814+#endif
56815+ return;
56816+}
56817+
56818+int
56819+gr_handle_chroot_unix(const pid_t pid)
56820+{
56821+#ifdef CONFIG_GRKERNSEC_CHROOT_UNIX
56822+ struct task_struct *p;
56823+
56824+ if (unlikely(!grsec_enable_chroot_unix))
56825+ return 1;
56826+
56827+ if (likely(!proc_is_chrooted(current)))
56828+ return 1;
56829+
56830+ rcu_read_lock();
56831+ read_lock(&tasklist_lock);
56832+ p = find_task_by_vpid_unrestricted(pid);
56833+ if (unlikely(p && !have_same_root(current, p))) {
56834+ read_unlock(&tasklist_lock);
56835+ rcu_read_unlock();
56836+ gr_log_noargs(GR_DONT_AUDIT, GR_UNIX_CHROOT_MSG);
56837+ return 0;
56838+ }
56839+ read_unlock(&tasklist_lock);
56840+ rcu_read_unlock();
56841+#endif
56842+ return 1;
56843+}
56844+
56845+int
56846+gr_handle_chroot_nice(void)
56847+{
56848+#ifdef CONFIG_GRKERNSEC_CHROOT_NICE
56849+ if (grsec_enable_chroot_nice && proc_is_chrooted(current)) {
56850+ gr_log_noargs(GR_DONT_AUDIT, GR_NICE_CHROOT_MSG);
56851+ return -EPERM;
56852+ }
56853+#endif
56854+ return 0;
56855+}
56856+
56857+int
56858+gr_handle_chroot_setpriority(struct task_struct *p, const int niceval)
56859+{
56860+#ifdef CONFIG_GRKERNSEC_CHROOT_NICE
56861+ if (grsec_enable_chroot_nice && (niceval < task_nice(p))
56862+ && proc_is_chrooted(current)) {
56863+ gr_log_str_int(GR_DONT_AUDIT, GR_PRIORITY_CHROOT_MSG, p->comm, p->pid);
56864+ return -EACCES;
56865+ }
56866+#endif
56867+ return 0;
56868+}
56869+
56870+int
56871+gr_handle_chroot_rawio(const struct inode *inode)
56872+{
56873+#ifdef CONFIG_GRKERNSEC_CHROOT_CAPS
56874+ if (grsec_enable_chroot_caps && proc_is_chrooted(current) &&
56875+ inode && S_ISBLK(inode->i_mode) && !capable(CAP_SYS_RAWIO))
56876+ return 1;
56877+#endif
56878+ return 0;
56879+}
56880+
56881+int
56882+gr_handle_chroot_fowner(struct pid *pid, enum pid_type type)
56883+{
56884+#ifdef CONFIG_GRKERNSEC_CHROOT_FINDTASK
56885+ struct task_struct *p;
56886+ int ret = 0;
56887+ if (!grsec_enable_chroot_findtask || !proc_is_chrooted(current) || !pid)
56888+ return ret;
56889+
56890+ read_lock(&tasklist_lock);
56891+ do_each_pid_task(pid, type, p) {
56892+ if (!have_same_root(current, p)) {
56893+ ret = 1;
56894+ goto out;
56895+ }
56896+ } while_each_pid_task(pid, type, p);
56897+out:
56898+ read_unlock(&tasklist_lock);
56899+ return ret;
56900+#endif
56901+ return 0;
56902+}
56903+
56904+int
56905+gr_pid_is_chrooted(struct task_struct *p)
56906+{
56907+#ifdef CONFIG_GRKERNSEC_CHROOT_FINDTASK
56908+ if (!grsec_enable_chroot_findtask || !proc_is_chrooted(current) || p == NULL)
56909+ return 0;
56910+
56911+ if ((p->exit_state & (EXIT_ZOMBIE | EXIT_DEAD)) ||
56912+ !have_same_root(current, p)) {
56913+ return 1;
56914+ }
56915+#endif
56916+ return 0;
56917+}
56918+
56919+EXPORT_SYMBOL(gr_pid_is_chrooted);
56920+
56921+#if defined(CONFIG_GRKERNSEC_CHROOT_DOUBLE) || defined(CONFIG_GRKERNSEC_CHROOT_FCHDIR)
56922+int gr_is_outside_chroot(const struct dentry *u_dentry, const struct vfsmount *u_mnt)
56923+{
56924+ struct path path, currentroot;
56925+ int ret = 0;
56926+
56927+ path.dentry = (struct dentry *)u_dentry;
56928+ path.mnt = (struct vfsmount *)u_mnt;
56929+ get_fs_root(current->fs, &currentroot);
56930+ if (path_is_under(&path, &currentroot))
56931+ ret = 1;
56932+ path_put(&currentroot);
56933+
56934+ return ret;
56935+}
56936+#endif
56937+
56938+int
56939+gr_chroot_fchdir(struct dentry *u_dentry, struct vfsmount *u_mnt)
56940+{
56941+#ifdef CONFIG_GRKERNSEC_CHROOT_FCHDIR
56942+ if (!grsec_enable_chroot_fchdir)
56943+ return 1;
56944+
56945+ if (!proc_is_chrooted(current))
56946+ return 1;
56947+ else if (!gr_is_outside_chroot(u_dentry, u_mnt)) {
56948+ gr_log_fs_generic(GR_DONT_AUDIT, GR_CHROOT_FCHDIR_MSG, u_dentry, u_mnt);
56949+ return 0;
56950+ }
56951+#endif
56952+ return 1;
56953+}
56954+
56955+int
56956+gr_chroot_shmat(const pid_t shm_cprid, const pid_t shm_lapid,
56957+ const time_t shm_createtime)
56958+{
56959+#ifdef CONFIG_GRKERNSEC_CHROOT_SHMAT
56960+ struct task_struct *p;
56961+ time_t starttime;
56962+
56963+ if (unlikely(!grsec_enable_chroot_shmat))
56964+ return 1;
56965+
56966+ if (likely(!proc_is_chrooted(current)))
56967+ return 1;
56968+
56969+ rcu_read_lock();
56970+ read_lock(&tasklist_lock);
56971+
56972+ if ((p = find_task_by_vpid_unrestricted(shm_cprid))) {
56973+ starttime = p->start_time.tv_sec;
56974+ if (time_before_eq((unsigned long)starttime, (unsigned long)shm_createtime)) {
56975+ if (have_same_root(current, p)) {
56976+ goto allow;
56977+ } else {
56978+ read_unlock(&tasklist_lock);
56979+ rcu_read_unlock();
56980+ gr_log_noargs(GR_DONT_AUDIT, GR_SHMAT_CHROOT_MSG);
56981+ return 0;
56982+ }
56983+ }
56984+ /* creator exited, pid reuse, fall through to next check */
56985+ }
56986+ if ((p = find_task_by_vpid_unrestricted(shm_lapid))) {
56987+ if (unlikely(!have_same_root(current, p))) {
56988+ read_unlock(&tasklist_lock);
56989+ rcu_read_unlock();
56990+ gr_log_noargs(GR_DONT_AUDIT, GR_SHMAT_CHROOT_MSG);
56991+ return 0;
56992+ }
56993+ }
56994+
56995+allow:
56996+ read_unlock(&tasklist_lock);
56997+ rcu_read_unlock();
56998+#endif
56999+ return 1;
57000+}
57001+
57002+void
57003+gr_log_chroot_exec(const struct dentry *dentry, const struct vfsmount *mnt)
57004+{
57005+#ifdef CONFIG_GRKERNSEC_CHROOT_EXECLOG
57006+ if (grsec_enable_chroot_execlog && proc_is_chrooted(current))
57007+ gr_log_fs_generic(GR_DO_AUDIT, GR_EXEC_CHROOT_MSG, dentry, mnt);
57008+#endif
57009+ return;
57010+}
57011+
57012+int
57013+gr_handle_chroot_mknod(const struct dentry *dentry,
57014+ const struct vfsmount *mnt, const int mode)
57015+{
57016+#ifdef CONFIG_GRKERNSEC_CHROOT_MKNOD
57017+ if (grsec_enable_chroot_mknod && !S_ISFIFO(mode) && !S_ISREG(mode) &&
57018+ proc_is_chrooted(current)) {
57019+ gr_log_fs_generic(GR_DONT_AUDIT, GR_MKNOD_CHROOT_MSG, dentry, mnt);
57020+ return -EPERM;
57021+ }
57022+#endif
57023+ return 0;
57024+}
57025+
57026+int
57027+gr_handle_chroot_mount(const struct dentry *dentry,
57028+ const struct vfsmount *mnt, const char *dev_name)
57029+{
57030+#ifdef CONFIG_GRKERNSEC_CHROOT_MOUNT
57031+ if (grsec_enable_chroot_mount && proc_is_chrooted(current)) {
57032+ gr_log_str_fs(GR_DONT_AUDIT, GR_MOUNT_CHROOT_MSG, dev_name ? dev_name : "none", dentry, mnt);
57033+ return -EPERM;
57034+ }
57035+#endif
57036+ return 0;
57037+}
57038+
57039+int
57040+gr_handle_chroot_pivot(void)
57041+{
57042+#ifdef CONFIG_GRKERNSEC_CHROOT_PIVOT
57043+ if (grsec_enable_chroot_pivot && proc_is_chrooted(current)) {
57044+ gr_log_noargs(GR_DONT_AUDIT, GR_PIVOT_CHROOT_MSG);
57045+ return -EPERM;
57046+ }
57047+#endif
57048+ return 0;
57049+}
57050+
57051+int
57052+gr_handle_chroot_chroot(const struct dentry *dentry, const struct vfsmount *mnt)
57053+{
57054+#ifdef CONFIG_GRKERNSEC_CHROOT_DOUBLE
57055+ if (grsec_enable_chroot_double && proc_is_chrooted(current) &&
57056+ !gr_is_outside_chroot(dentry, mnt)) {
57057+ gr_log_fs_generic(GR_DONT_AUDIT, GR_CHROOT_CHROOT_MSG, dentry, mnt);
57058+ return -EPERM;
57059+ }
57060+#endif
57061+ return 0;
57062+}
57063+
57064+extern const char *captab_log[];
57065+extern int captab_log_entries;
57066+
57067+int
57068+gr_chroot_is_capable(const int cap)
57069+{
57070+#ifdef CONFIG_GRKERNSEC_CHROOT_CAPS
57071+ if (grsec_enable_chroot_caps && proc_is_chrooted(current)) {
57072+ kernel_cap_t chroot_caps = GR_CHROOT_CAPS;
57073+ if (cap_raised(chroot_caps, cap)) {
57074+ const struct cred *creds = current_cred();
57075+ if (cap_raised(creds->cap_effective, cap) && cap < captab_log_entries) {
57076+ gr_log_cap(GR_DONT_AUDIT, GR_CAP_CHROOT_MSG, current, captab_log[cap]);
57077+ }
57078+ return 0;
57079+ }
57080+ }
57081+#endif
57082+ return 1;
57083+}
57084+
57085+int
57086+gr_chroot_is_capable_nolog(const int cap)
57087+{
57088+#ifdef CONFIG_GRKERNSEC_CHROOT_CAPS
57089+ if (grsec_enable_chroot_caps && proc_is_chrooted(current)) {
57090+ kernel_cap_t chroot_caps = GR_CHROOT_CAPS;
57091+ if (cap_raised(chroot_caps, cap)) {
57092+ return 0;
57093+ }
57094+ }
57095+#endif
57096+ return 1;
57097+}
57098+
57099+int
57100+gr_handle_chroot_sysctl(const int op)
57101+{
57102+#ifdef CONFIG_GRKERNSEC_CHROOT_SYSCTL
57103+ if (grsec_enable_chroot_sysctl && (op & MAY_WRITE) &&
57104+ proc_is_chrooted(current))
57105+ return -EACCES;
57106+#endif
57107+ return 0;
57108+}
57109+
57110+void
57111+gr_handle_chroot_chdir(struct path *path)
57112+{
57113+#ifdef CONFIG_GRKERNSEC_CHROOT_CHDIR
57114+ if (grsec_enable_chroot_chdir)
57115+ set_fs_pwd(current->fs, path);
57116+#endif
57117+ return;
57118+}
57119+
57120+int
57121+gr_handle_chroot_chmod(const struct dentry *dentry,
57122+ const struct vfsmount *mnt, const int mode)
57123+{
57124+#ifdef CONFIG_GRKERNSEC_CHROOT_CHMOD
57125+ /* allow chmod +s on directories, but not files */
57126+ if (grsec_enable_chroot_chmod && !S_ISDIR(dentry->d_inode->i_mode) &&
57127+ ((mode & S_ISUID) || ((mode & (S_ISGID | S_IXGRP)) == (S_ISGID | S_IXGRP))) &&
57128+ proc_is_chrooted(current)) {
57129+ gr_log_fs_generic(GR_DONT_AUDIT, GR_CHMOD_CHROOT_MSG, dentry, mnt);
57130+ return -EPERM;
57131+ }
57132+#endif
57133+ return 0;
57134+}
57135diff --git a/grsecurity/grsec_disabled.c b/grsecurity/grsec_disabled.c
57136new file mode 100644
57137index 0000000..213ad8b
57138--- /dev/null
57139+++ b/grsecurity/grsec_disabled.c
57140@@ -0,0 +1,437 @@
57141+#include <linux/kernel.h>
57142+#include <linux/module.h>
57143+#include <linux/sched.h>
57144+#include <linux/file.h>
57145+#include <linux/fs.h>
57146+#include <linux/kdev_t.h>
57147+#include <linux/net.h>
57148+#include <linux/in.h>
57149+#include <linux/ip.h>
57150+#include <linux/skbuff.h>
57151+#include <linux/sysctl.h>
57152+
57153+#ifdef CONFIG_PAX_HAVE_ACL_FLAGS
57154+void
57155+pax_set_initial_flags(struct linux_binprm *bprm)
57156+{
57157+ return;
57158+}
57159+#endif
57160+
57161+#ifdef CONFIG_SYSCTL
57162+__u32
57163+gr_handle_sysctl(const struct ctl_table * table, const int op)
57164+{
57165+ return 0;
57166+}
57167+#endif
57168+
57169+#ifdef CONFIG_TASKSTATS
57170+int gr_is_taskstats_denied(int pid)
57171+{
57172+ return 0;
57173+}
57174+#endif
57175+
57176+int
57177+gr_acl_is_enabled(void)
57178+{
57179+ return 0;
57180+}
57181+
57182+void
57183+gr_handle_proc_create(const struct dentry *dentry, const struct inode *inode)
57184+{
57185+ return;
57186+}
57187+
57188+int
57189+gr_handle_rawio(const struct inode *inode)
57190+{
57191+ return 0;
57192+}
57193+
57194+void
57195+gr_acl_handle_psacct(struct task_struct *task, const long code)
57196+{
57197+ return;
57198+}
57199+
57200+int
57201+gr_handle_ptrace(struct task_struct *task, const long request)
57202+{
57203+ return 0;
57204+}
57205+
57206+int
57207+gr_handle_proc_ptrace(struct task_struct *task)
57208+{
57209+ return 0;
57210+}
57211+
57212+void
57213+gr_learn_resource(const struct task_struct *task,
57214+ const int res, const unsigned long wanted, const int gt)
57215+{
57216+ return;
57217+}
57218+
57219+int
57220+gr_set_acls(const int type)
57221+{
57222+ return 0;
57223+}
57224+
57225+int
57226+gr_check_hidden_task(const struct task_struct *tsk)
57227+{
57228+ return 0;
57229+}
57230+
57231+int
57232+gr_check_protected_task(const struct task_struct *task)
57233+{
57234+ return 0;
57235+}
57236+
57237+int
57238+gr_check_protected_task_fowner(struct pid *pid, enum pid_type type)
57239+{
57240+ return 0;
57241+}
57242+
57243+void
57244+gr_copy_label(struct task_struct *tsk)
57245+{
57246+ return;
57247+}
57248+
57249+void
57250+gr_set_pax_flags(struct task_struct *task)
57251+{
57252+ return;
57253+}
57254+
57255+int
57256+gr_set_proc_label(const struct dentry *dentry, const struct vfsmount *mnt,
57257+ const int unsafe_share)
57258+{
57259+ return 0;
57260+}
57261+
57262+void
57263+gr_handle_delete(const ino_t ino, const dev_t dev)
57264+{
57265+ return;
57266+}
57267+
57268+void
57269+gr_handle_create(const struct dentry *dentry, const struct vfsmount *mnt)
57270+{
57271+ return;
57272+}
57273+
57274+void
57275+gr_handle_crash(struct task_struct *task, const int sig)
57276+{
57277+ return;
57278+}
57279+
57280+int
57281+gr_check_crash_exec(const struct file *filp)
57282+{
57283+ return 0;
57284+}
57285+
57286+int
57287+gr_check_crash_uid(const uid_t uid)
57288+{
57289+ return 0;
57290+}
57291+
57292+void
57293+gr_handle_rename(struct inode *old_dir, struct inode *new_dir,
57294+ struct dentry *old_dentry,
57295+ struct dentry *new_dentry,
57296+ struct vfsmount *mnt, const __u8 replace)
57297+{
57298+ return;
57299+}
57300+
57301+int
57302+gr_search_socket(const int family, const int type, const int protocol)
57303+{
57304+ return 1;
57305+}
57306+
57307+int
57308+gr_search_connectbind(const int mode, const struct socket *sock,
57309+ const struct sockaddr_in *addr)
57310+{
57311+ return 0;
57312+}
57313+
57314+void
57315+gr_handle_alertkill(struct task_struct *task)
57316+{
57317+ return;
57318+}
57319+
57320+__u32
57321+gr_acl_handle_execve(const struct dentry * dentry, const struct vfsmount * mnt)
57322+{
57323+ return 1;
57324+}
57325+
57326+__u32
57327+gr_acl_handle_hidden_file(const struct dentry * dentry,
57328+ const struct vfsmount * mnt)
57329+{
57330+ return 1;
57331+}
57332+
57333+__u32
57334+gr_acl_handle_open(const struct dentry * dentry, const struct vfsmount * mnt,
57335+ int acc_mode)
57336+{
57337+ return 1;
57338+}
57339+
57340+__u32
57341+gr_acl_handle_rmdir(const struct dentry * dentry, const struct vfsmount * mnt)
57342+{
57343+ return 1;
57344+}
57345+
57346+__u32
57347+gr_acl_handle_unlink(const struct dentry * dentry, const struct vfsmount * mnt)
57348+{
57349+ return 1;
57350+}
57351+
57352+int
57353+gr_acl_handle_mmap(const struct file *file, const unsigned long prot,
57354+ unsigned int *vm_flags)
57355+{
57356+ return 1;
57357+}
57358+
57359+__u32
57360+gr_acl_handle_truncate(const struct dentry * dentry,
57361+ const struct vfsmount * mnt)
57362+{
57363+ return 1;
57364+}
57365+
57366+__u32
57367+gr_acl_handle_utime(const struct dentry * dentry, const struct vfsmount * mnt)
57368+{
57369+ return 1;
57370+}
57371+
57372+__u32
57373+gr_acl_handle_access(const struct dentry * dentry,
57374+ const struct vfsmount * mnt, const int fmode)
57375+{
57376+ return 1;
57377+}
57378+
57379+__u32
57380+gr_acl_handle_chmod(const struct dentry * dentry, const struct vfsmount * mnt,
57381+ umode_t *mode)
57382+{
57383+ return 1;
57384+}
57385+
57386+__u32
57387+gr_acl_handle_chown(const struct dentry * dentry, const struct vfsmount * mnt)
57388+{
57389+ return 1;
57390+}
57391+
57392+__u32
57393+gr_acl_handle_setxattr(const struct dentry * dentry, const struct vfsmount * mnt)
57394+{
57395+ return 1;
57396+}
57397+
57398+void
57399+grsecurity_init(void)
57400+{
57401+ return;
57402+}
57403+
57404+umode_t gr_acl_umask(void)
57405+{
57406+ return 0;
57407+}
57408+
57409+__u32
57410+gr_acl_handle_mknod(const struct dentry * new_dentry,
57411+ const struct dentry * parent_dentry,
57412+ const struct vfsmount * parent_mnt,
57413+ const int mode)
57414+{
57415+ return 1;
57416+}
57417+
57418+__u32
57419+gr_acl_handle_mkdir(const struct dentry * new_dentry,
57420+ const struct dentry * parent_dentry,
57421+ const struct vfsmount * parent_mnt)
57422+{
57423+ return 1;
57424+}
57425+
57426+__u32
57427+gr_acl_handle_symlink(const struct dentry * new_dentry,
57428+ const struct dentry * parent_dentry,
57429+ const struct vfsmount * parent_mnt, const char *from)
57430+{
57431+ return 1;
57432+}
57433+
57434+__u32
57435+gr_acl_handle_link(const struct dentry * new_dentry,
57436+ const struct dentry * parent_dentry,
57437+ const struct vfsmount * parent_mnt,
57438+ const struct dentry * old_dentry,
57439+ const struct vfsmount * old_mnt, const char *to)
57440+{
57441+ return 1;
57442+}
57443+
57444+int
57445+gr_acl_handle_rename(const struct dentry *new_dentry,
57446+ const struct dentry *parent_dentry,
57447+ const struct vfsmount *parent_mnt,
57448+ const struct dentry *old_dentry,
57449+ const struct inode *old_parent_inode,
57450+ const struct vfsmount *old_mnt, const char *newname)
57451+{
57452+ return 0;
57453+}
57454+
57455+int
57456+gr_acl_handle_filldir(const struct file *file, const char *name,
57457+ const int namelen, const ino_t ino)
57458+{
57459+ return 1;
57460+}
57461+
57462+int
57463+gr_handle_shmat(const pid_t shm_cprid, const pid_t shm_lapid,
57464+ const time_t shm_createtime, const uid_t cuid, const int shmid)
57465+{
57466+ return 1;
57467+}
57468+
57469+int
57470+gr_search_bind(const struct socket *sock, const struct sockaddr_in *addr)
57471+{
57472+ return 0;
57473+}
57474+
57475+int
57476+gr_search_accept(const struct socket *sock)
57477+{
57478+ return 0;
57479+}
57480+
57481+int
57482+gr_search_listen(const struct socket *sock)
57483+{
57484+ return 0;
57485+}
57486+
57487+int
57488+gr_search_connect(const struct socket *sock, const struct sockaddr_in *addr)
57489+{
57490+ return 0;
57491+}
57492+
57493+__u32
57494+gr_acl_handle_unix(const struct dentry * dentry, const struct vfsmount * mnt)
57495+{
57496+ return 1;
57497+}
57498+
57499+__u32
57500+gr_acl_handle_creat(const struct dentry * dentry,
57501+ const struct dentry * p_dentry,
57502+ const struct vfsmount * p_mnt, int open_flags, int acc_mode,
57503+ const int imode)
57504+{
57505+ return 1;
57506+}
57507+
57508+void
57509+gr_acl_handle_exit(void)
57510+{
57511+ return;
57512+}
57513+
57514+int
57515+gr_acl_handle_mprotect(const struct file *file, const unsigned long prot)
57516+{
57517+ return 1;
57518+}
57519+
57520+void
57521+gr_set_role_label(const uid_t uid, const gid_t gid)
57522+{
57523+ return;
57524+}
57525+
57526+int
57527+gr_acl_handle_procpidmem(const struct task_struct *task)
57528+{
57529+ return 0;
57530+}
57531+
57532+int
57533+gr_search_udp_recvmsg(const struct sock *sk, const struct sk_buff *skb)
57534+{
57535+ return 0;
57536+}
57537+
57538+int
57539+gr_search_udp_sendmsg(const struct sock *sk, const struct sockaddr_in *addr)
57540+{
57541+ return 0;
57542+}
57543+
57544+void
57545+gr_set_kernel_label(struct task_struct *task)
57546+{
57547+ return;
57548+}
57549+
57550+int
57551+gr_check_user_change(int real, int effective, int fs)
57552+{
57553+ return 0;
57554+}
57555+
57556+int
57557+gr_check_group_change(int real, int effective, int fs)
57558+{
57559+ return 0;
57560+}
57561+
57562+int gr_acl_enable_at_secure(void)
57563+{
57564+ return 0;
57565+}
57566+
57567+dev_t gr_get_dev_from_dentry(struct dentry *dentry)
57568+{
57569+ return dentry->d_inode->i_sb->s_dev;
57570+}
57571+
57572+EXPORT_SYMBOL(gr_learn_resource);
57573+EXPORT_SYMBOL(gr_set_kernel_label);
57574+#ifdef CONFIG_SECURITY
57575+EXPORT_SYMBOL(gr_check_user_change);
57576+EXPORT_SYMBOL(gr_check_group_change);
57577+#endif
57578diff --git a/grsecurity/grsec_exec.c b/grsecurity/grsec_exec.c
57579new file mode 100644
57580index 0000000..2b05ada
57581--- /dev/null
57582+++ b/grsecurity/grsec_exec.c
57583@@ -0,0 +1,146 @@
57584+#include <linux/kernel.h>
57585+#include <linux/sched.h>
57586+#include <linux/file.h>
57587+#include <linux/binfmts.h>
57588+#include <linux/fs.h>
57589+#include <linux/types.h>
57590+#include <linux/grdefs.h>
57591+#include <linux/grsecurity.h>
57592+#include <linux/grinternal.h>
57593+#include <linux/capability.h>
57594+#include <linux/module.h>
57595+
57596+#include <asm/uaccess.h>
57597+
57598+#ifdef CONFIG_GRKERNSEC_EXECLOG
57599+static char gr_exec_arg_buf[132];
57600+static DEFINE_MUTEX(gr_exec_arg_mutex);
57601+#endif
57602+
57603+extern const char __user *get_user_arg_ptr(struct user_arg_ptr argv, int nr);
57604+
57605+void
57606+gr_handle_exec_args(struct linux_binprm *bprm, struct user_arg_ptr argv)
57607+{
57608+#ifdef CONFIG_GRKERNSEC_EXECLOG
57609+ char *grarg = gr_exec_arg_buf;
57610+ unsigned int i, x, execlen = 0;
57611+ char c;
57612+
57613+ if (!((grsec_enable_execlog && grsec_enable_group &&
57614+ in_group_p(grsec_audit_gid))
57615+ || (grsec_enable_execlog && !grsec_enable_group)))
57616+ return;
57617+
57618+ mutex_lock(&gr_exec_arg_mutex);
57619+ memset(grarg, 0, sizeof(gr_exec_arg_buf));
57620+
57621+ for (i = 0; i < bprm->argc && execlen < 128; i++) {
57622+ const char __user *p;
57623+ unsigned int len;
57624+
57625+ p = get_user_arg_ptr(argv, i);
57626+ if (IS_ERR(p))
57627+ goto log;
57628+
57629+ len = strnlen_user(p, 128 - execlen);
57630+ if (len > 128 - execlen)
57631+ len = 128 - execlen;
57632+ else if (len > 0)
57633+ len--;
57634+ if (copy_from_user(grarg + execlen, p, len))
57635+ goto log;
57636+
57637+ /* rewrite unprintable characters */
57638+ for (x = 0; x < len; x++) {
57639+ c = *(grarg + execlen + x);
57640+ if (c < 32 || c > 126)
57641+ *(grarg + execlen + x) = ' ';
57642+ }
57643+
57644+ execlen += len;
57645+ *(grarg + execlen) = ' ';
57646+ *(grarg + execlen + 1) = '\0';
57647+ execlen++;
57648+ }
57649+
57650+ log:
57651+ gr_log_fs_str(GR_DO_AUDIT, GR_EXEC_AUDIT_MSG, bprm->file->f_path.dentry,
57652+ bprm->file->f_path.mnt, grarg);
57653+ mutex_unlock(&gr_exec_arg_mutex);
57654+#endif
57655+ return;
57656+}
57657+
57658+#ifdef CONFIG_GRKERNSEC
57659+extern int gr_acl_is_capable(const int cap);
57660+extern int gr_acl_is_capable_nolog(const int cap);
57661+extern int gr_chroot_is_capable(const int cap);
57662+extern int gr_chroot_is_capable_nolog(const int cap);
57663+#endif
57664+
57665+const char *captab_log[] = {
57666+ "CAP_CHOWN",
57667+ "CAP_DAC_OVERRIDE",
57668+ "CAP_DAC_READ_SEARCH",
57669+ "CAP_FOWNER",
57670+ "CAP_FSETID",
57671+ "CAP_KILL",
57672+ "CAP_SETGID",
57673+ "CAP_SETUID",
57674+ "CAP_SETPCAP",
57675+ "CAP_LINUX_IMMUTABLE",
57676+ "CAP_NET_BIND_SERVICE",
57677+ "CAP_NET_BROADCAST",
57678+ "CAP_NET_ADMIN",
57679+ "CAP_NET_RAW",
57680+ "CAP_IPC_LOCK",
57681+ "CAP_IPC_OWNER",
57682+ "CAP_SYS_MODULE",
57683+ "CAP_SYS_RAWIO",
57684+ "CAP_SYS_CHROOT",
57685+ "CAP_SYS_PTRACE",
57686+ "CAP_SYS_PACCT",
57687+ "CAP_SYS_ADMIN",
57688+ "CAP_SYS_BOOT",
57689+ "CAP_SYS_NICE",
57690+ "CAP_SYS_RESOURCE",
57691+ "CAP_SYS_TIME",
57692+ "CAP_SYS_TTY_CONFIG",
57693+ "CAP_MKNOD",
57694+ "CAP_LEASE",
57695+ "CAP_AUDIT_WRITE",
57696+ "CAP_AUDIT_CONTROL",
57697+ "CAP_SETFCAP",
57698+ "CAP_MAC_OVERRIDE",
57699+ "CAP_MAC_ADMIN",
57700+ "CAP_SYSLOG",
57701+ "CAP_WAKE_ALARM"
57702+};
57703+
57704+int captab_log_entries = sizeof(captab_log)/sizeof(captab_log[0]);
57705+
57706+int gr_is_capable(const int cap)
57707+{
57708+#ifdef CONFIG_GRKERNSEC
57709+ if (gr_acl_is_capable(cap) && gr_chroot_is_capable(cap))
57710+ return 1;
57711+ return 0;
57712+#else
57713+ return 1;
57714+#endif
57715+}
57716+
57717+int gr_is_capable_nolog(const int cap)
57718+{
57719+#ifdef CONFIG_GRKERNSEC
57720+ if (gr_acl_is_capable_nolog(cap) && gr_chroot_is_capable_nolog(cap))
57721+ return 1;
57722+ return 0;
57723+#else
57724+ return 1;
57725+#endif
57726+}
57727+
57728+EXPORT_SYMBOL(gr_is_capable);
57729+EXPORT_SYMBOL(gr_is_capable_nolog);
57730diff --git a/grsecurity/grsec_fifo.c b/grsecurity/grsec_fifo.c
57731new file mode 100644
57732index 0000000..d3ee748
57733--- /dev/null
57734+++ b/grsecurity/grsec_fifo.c
57735@@ -0,0 +1,24 @@
57736+#include <linux/kernel.h>
57737+#include <linux/sched.h>
57738+#include <linux/fs.h>
57739+#include <linux/file.h>
57740+#include <linux/grinternal.h>
57741+
57742+int
57743+gr_handle_fifo(const struct dentry *dentry, const struct vfsmount *mnt,
57744+ const struct dentry *dir, const int flag, const int acc_mode)
57745+{
57746+#ifdef CONFIG_GRKERNSEC_FIFO
57747+ const struct cred *cred = current_cred();
57748+
57749+ if (grsec_enable_fifo && S_ISFIFO(dentry->d_inode->i_mode) &&
57750+ !(flag & O_EXCL) && (dir->d_inode->i_mode & S_ISVTX) &&
57751+ (dentry->d_inode->i_uid != dir->d_inode->i_uid) &&
57752+ (cred->fsuid != dentry->d_inode->i_uid)) {
57753+ if (!inode_permission(dentry->d_inode, acc_mode))
57754+ gr_log_fs_int2(GR_DONT_AUDIT, GR_FIFO_MSG, dentry, mnt, dentry->d_inode->i_uid, dentry->d_inode->i_gid);
57755+ return -EACCES;
57756+ }
57757+#endif
57758+ return 0;
57759+}
57760diff --git a/grsecurity/grsec_fork.c b/grsecurity/grsec_fork.c
57761new file mode 100644
57762index 0000000..8ca18bf
57763--- /dev/null
57764+++ b/grsecurity/grsec_fork.c
57765@@ -0,0 +1,23 @@
57766+#include <linux/kernel.h>
57767+#include <linux/sched.h>
57768+#include <linux/grsecurity.h>
57769+#include <linux/grinternal.h>
57770+#include <linux/errno.h>
57771+
57772+void
57773+gr_log_forkfail(const int retval)
57774+{
57775+#ifdef CONFIG_GRKERNSEC_FORKFAIL
57776+ if (grsec_enable_forkfail && (retval == -EAGAIN || retval == -ENOMEM)) {
57777+ switch (retval) {
57778+ case -EAGAIN:
57779+ gr_log_str(GR_DONT_AUDIT, GR_FAILFORK_MSG, "EAGAIN");
57780+ break;
57781+ case -ENOMEM:
57782+ gr_log_str(GR_DONT_AUDIT, GR_FAILFORK_MSG, "ENOMEM");
57783+ break;
57784+ }
57785+ }
57786+#endif
57787+ return;
57788+}
57789diff --git a/grsecurity/grsec_init.c b/grsecurity/grsec_init.c
57790new file mode 100644
57791index 0000000..01ddde4
57792--- /dev/null
57793+++ b/grsecurity/grsec_init.c
57794@@ -0,0 +1,277 @@
57795+#include <linux/kernel.h>
57796+#include <linux/sched.h>
57797+#include <linux/mm.h>
57798+#include <linux/gracl.h>
57799+#include <linux/slab.h>
57800+#include <linux/vmalloc.h>
57801+#include <linux/percpu.h>
57802+#include <linux/module.h>
57803+
57804+int grsec_enable_ptrace_readexec;
57805+int grsec_enable_setxid;
57806+int grsec_enable_brute;
57807+int grsec_enable_link;
57808+int grsec_enable_dmesg;
57809+int grsec_enable_harden_ptrace;
57810+int grsec_enable_fifo;
57811+int grsec_enable_execlog;
57812+int grsec_enable_signal;
57813+int grsec_enable_forkfail;
57814+int grsec_enable_audit_ptrace;
57815+int grsec_enable_time;
57816+int grsec_enable_audit_textrel;
57817+int grsec_enable_group;
57818+int grsec_audit_gid;
57819+int grsec_enable_chdir;
57820+int grsec_enable_mount;
57821+int grsec_enable_rofs;
57822+int grsec_enable_chroot_findtask;
57823+int grsec_enable_chroot_mount;
57824+int grsec_enable_chroot_shmat;
57825+int grsec_enable_chroot_fchdir;
57826+int grsec_enable_chroot_double;
57827+int grsec_enable_chroot_pivot;
57828+int grsec_enable_chroot_chdir;
57829+int grsec_enable_chroot_chmod;
57830+int grsec_enable_chroot_mknod;
57831+int grsec_enable_chroot_nice;
57832+int grsec_enable_chroot_execlog;
57833+int grsec_enable_chroot_caps;
57834+int grsec_enable_chroot_sysctl;
57835+int grsec_enable_chroot_unix;
57836+int grsec_enable_tpe;
57837+int grsec_tpe_gid;
57838+int grsec_enable_blackhole;
57839+#ifdef CONFIG_IPV6_MODULE
57840+EXPORT_SYMBOL(grsec_enable_blackhole);
57841+#endif
57842+int grsec_lastack_retries;
57843+int grsec_enable_tpe_all;
57844+int grsec_enable_tpe_invert;
57845+int grsec_enable_socket_all;
57846+int grsec_socket_all_gid;
57847+int grsec_enable_socket_client;
57848+int grsec_socket_client_gid;
57849+int grsec_enable_socket_server;
57850+int grsec_socket_server_gid;
57851+int grsec_resource_logging;
57852+int grsec_disable_privio;
57853+int grsec_enable_log_rwxmaps;
57854+int grsec_lock;
57855+
57856+DEFINE_SPINLOCK(grsec_alert_lock);
57857+unsigned long grsec_alert_wtime = 0;
57858+unsigned long grsec_alert_fyet = 0;
57859+
57860+DEFINE_SPINLOCK(grsec_audit_lock);
57861+
57862+DEFINE_RWLOCK(grsec_exec_file_lock);
57863+
57864+char *gr_shared_page[4];
57865+
57866+char *gr_alert_log_fmt;
57867+char *gr_audit_log_fmt;
57868+char *gr_alert_log_buf;
57869+char *gr_audit_log_buf;
57870+
57871+extern struct gr_arg *gr_usermode;
57872+extern unsigned char *gr_system_salt;
57873+extern unsigned char *gr_system_sum;
57874+
57875+void __init
57876+grsecurity_init(void)
57877+{
57878+ int j;
57879+ /* create the per-cpu shared pages */
57880+
57881+#ifdef CONFIG_X86
57882+ memset((char *)(0x41a + PAGE_OFFSET), 0, 36);
57883+#endif
57884+
57885+ for (j = 0; j < 4; j++) {
57886+ gr_shared_page[j] = (char *)__alloc_percpu(PAGE_SIZE, __alignof__(unsigned long long));
57887+ if (gr_shared_page[j] == NULL) {
57888+ panic("Unable to allocate grsecurity shared page");
57889+ return;
57890+ }
57891+ }
57892+
57893+ /* allocate log buffers */
57894+ gr_alert_log_fmt = kmalloc(512, GFP_KERNEL);
57895+ if (!gr_alert_log_fmt) {
57896+ panic("Unable to allocate grsecurity alert log format buffer");
57897+ return;
57898+ }
57899+ gr_audit_log_fmt = kmalloc(512, GFP_KERNEL);
57900+ if (!gr_audit_log_fmt) {
57901+ panic("Unable to allocate grsecurity audit log format buffer");
57902+ return;
57903+ }
57904+ gr_alert_log_buf = (char *) get_zeroed_page(GFP_KERNEL);
57905+ if (!gr_alert_log_buf) {
57906+ panic("Unable to allocate grsecurity alert log buffer");
57907+ return;
57908+ }
57909+ gr_audit_log_buf = (char *) get_zeroed_page(GFP_KERNEL);
57910+ if (!gr_audit_log_buf) {
57911+ panic("Unable to allocate grsecurity audit log buffer");
57912+ return;
57913+ }
57914+
57915+ /* allocate memory for authentication structure */
57916+ gr_usermode = kmalloc(sizeof(struct gr_arg), GFP_KERNEL);
57917+ gr_system_salt = kmalloc(GR_SALT_LEN, GFP_KERNEL);
57918+ gr_system_sum = kmalloc(GR_SHA_LEN, GFP_KERNEL);
57919+
57920+ if (!gr_usermode || !gr_system_salt || !gr_system_sum) {
57921+ panic("Unable to allocate grsecurity authentication structure");
57922+ return;
57923+ }
57924+
57925+
57926+#ifdef CONFIG_GRKERNSEC_IO
57927+#if !defined(CONFIG_GRKERNSEC_SYSCTL_DISTRO)
57928+ grsec_disable_privio = 1;
57929+#elif defined(CONFIG_GRKERNSEC_SYSCTL_ON)
57930+ grsec_disable_privio = 1;
57931+#else
57932+ grsec_disable_privio = 0;
57933+#endif
57934+#endif
57935+
57936+#ifdef CONFIG_GRKERNSEC_TPE_INVERT
57937+ /* for backward compatibility, tpe_invert always defaults to on if
57938+ enabled in the kernel
57939+ */
57940+ grsec_enable_tpe_invert = 1;
57941+#endif
57942+
57943+#if !defined(CONFIG_GRKERNSEC_SYSCTL) || defined(CONFIG_GRKERNSEC_SYSCTL_ON)
57944+#ifndef CONFIG_GRKERNSEC_SYSCTL
57945+ grsec_lock = 1;
57946+#endif
57947+
57948+#ifdef CONFIG_GRKERNSEC_AUDIT_TEXTREL
57949+ grsec_enable_audit_textrel = 1;
57950+#endif
57951+#ifdef CONFIG_GRKERNSEC_RWXMAP_LOG
57952+ grsec_enable_log_rwxmaps = 1;
57953+#endif
57954+#ifdef CONFIG_GRKERNSEC_AUDIT_GROUP
57955+ grsec_enable_group = 1;
57956+ grsec_audit_gid = CONFIG_GRKERNSEC_AUDIT_GID;
57957+#endif
57958+#ifdef CONFIG_GRKERNSEC_PTRACE_READEXEC
57959+ grsec_enable_ptrace_readexec = 1;
57960+#endif
57961+#ifdef CONFIG_GRKERNSEC_AUDIT_CHDIR
57962+ grsec_enable_chdir = 1;
57963+#endif
57964+#ifdef CONFIG_GRKERNSEC_HARDEN_PTRACE
57965+ grsec_enable_harden_ptrace = 1;
57966+#endif
57967+#ifdef CONFIG_GRKERNSEC_AUDIT_MOUNT
57968+ grsec_enable_mount = 1;
57969+#endif
57970+#ifdef CONFIG_GRKERNSEC_LINK
57971+ grsec_enable_link = 1;
57972+#endif
57973+#ifdef CONFIG_GRKERNSEC_BRUTE
57974+ grsec_enable_brute = 1;
57975+#endif
57976+#ifdef CONFIG_GRKERNSEC_DMESG
57977+ grsec_enable_dmesg = 1;
57978+#endif
57979+#ifdef CONFIG_GRKERNSEC_BLACKHOLE
57980+ grsec_enable_blackhole = 1;
57981+ grsec_lastack_retries = 4;
57982+#endif
57983+#ifdef CONFIG_GRKERNSEC_FIFO
57984+ grsec_enable_fifo = 1;
57985+#endif
57986+#ifdef CONFIG_GRKERNSEC_EXECLOG
57987+ grsec_enable_execlog = 1;
57988+#endif
57989+#ifdef CONFIG_GRKERNSEC_SETXID
57990+ grsec_enable_setxid = 1;
57991+#endif
57992+#ifdef CONFIG_GRKERNSEC_SIGNAL
57993+ grsec_enable_signal = 1;
57994+#endif
57995+#ifdef CONFIG_GRKERNSEC_FORKFAIL
57996+ grsec_enable_forkfail = 1;
57997+#endif
57998+#ifdef CONFIG_GRKERNSEC_TIME
57999+ grsec_enable_time = 1;
58000+#endif
58001+#ifdef CONFIG_GRKERNSEC_RESLOG
58002+ grsec_resource_logging = 1;
58003+#endif
58004+#ifdef CONFIG_GRKERNSEC_CHROOT_FINDTASK
58005+ grsec_enable_chroot_findtask = 1;
58006+#endif
58007+#ifdef CONFIG_GRKERNSEC_CHROOT_UNIX
58008+ grsec_enable_chroot_unix = 1;
58009+#endif
58010+#ifdef CONFIG_GRKERNSEC_CHROOT_MOUNT
58011+ grsec_enable_chroot_mount = 1;
58012+#endif
58013+#ifdef CONFIG_GRKERNSEC_CHROOT_FCHDIR
58014+ grsec_enable_chroot_fchdir = 1;
58015+#endif
58016+#ifdef CONFIG_GRKERNSEC_CHROOT_SHMAT
58017+ grsec_enable_chroot_shmat = 1;
58018+#endif
58019+#ifdef CONFIG_GRKERNSEC_AUDIT_PTRACE
58020+ grsec_enable_audit_ptrace = 1;
58021+#endif
58022+#ifdef CONFIG_GRKERNSEC_CHROOT_DOUBLE
58023+ grsec_enable_chroot_double = 1;
58024+#endif
58025+#ifdef CONFIG_GRKERNSEC_CHROOT_PIVOT
58026+ grsec_enable_chroot_pivot = 1;
58027+#endif
58028+#ifdef CONFIG_GRKERNSEC_CHROOT_CHDIR
58029+ grsec_enable_chroot_chdir = 1;
58030+#endif
58031+#ifdef CONFIG_GRKERNSEC_CHROOT_CHMOD
58032+ grsec_enable_chroot_chmod = 1;
58033+#endif
58034+#ifdef CONFIG_GRKERNSEC_CHROOT_MKNOD
58035+ grsec_enable_chroot_mknod = 1;
58036+#endif
58037+#ifdef CONFIG_GRKERNSEC_CHROOT_NICE
58038+ grsec_enable_chroot_nice = 1;
58039+#endif
58040+#ifdef CONFIG_GRKERNSEC_CHROOT_EXECLOG
58041+ grsec_enable_chroot_execlog = 1;
58042+#endif
58043+#ifdef CONFIG_GRKERNSEC_CHROOT_CAPS
58044+ grsec_enable_chroot_caps = 1;
58045+#endif
58046+#ifdef CONFIG_GRKERNSEC_CHROOT_SYSCTL
58047+ grsec_enable_chroot_sysctl = 1;
58048+#endif
58049+#ifdef CONFIG_GRKERNSEC_TPE
58050+ grsec_enable_tpe = 1;
58051+ grsec_tpe_gid = CONFIG_GRKERNSEC_TPE_GID;
58052+#ifdef CONFIG_GRKERNSEC_TPE_ALL
58053+ grsec_enable_tpe_all = 1;
58054+#endif
58055+#endif
58056+#ifdef CONFIG_GRKERNSEC_SOCKET_ALL
58057+ grsec_enable_socket_all = 1;
58058+ grsec_socket_all_gid = CONFIG_GRKERNSEC_SOCKET_ALL_GID;
58059+#endif
58060+#ifdef CONFIG_GRKERNSEC_SOCKET_CLIENT
58061+ grsec_enable_socket_client = 1;
58062+ grsec_socket_client_gid = CONFIG_GRKERNSEC_SOCKET_CLIENT_GID;
58063+#endif
58064+#ifdef CONFIG_GRKERNSEC_SOCKET_SERVER
58065+ grsec_enable_socket_server = 1;
58066+ grsec_socket_server_gid = CONFIG_GRKERNSEC_SOCKET_SERVER_GID;
58067+#endif
58068+#endif
58069+
58070+ return;
58071+}
58072diff --git a/grsecurity/grsec_link.c b/grsecurity/grsec_link.c
58073new file mode 100644
58074index 0000000..3efe141
58075--- /dev/null
58076+++ b/grsecurity/grsec_link.c
58077@@ -0,0 +1,43 @@
58078+#include <linux/kernel.h>
58079+#include <linux/sched.h>
58080+#include <linux/fs.h>
58081+#include <linux/file.h>
58082+#include <linux/grinternal.h>
58083+
58084+int
58085+gr_handle_follow_link(const struct inode *parent,
58086+ const struct inode *inode,
58087+ const struct dentry *dentry, const struct vfsmount *mnt)
58088+{
58089+#ifdef CONFIG_GRKERNSEC_LINK
58090+ const struct cred *cred = current_cred();
58091+
58092+ if (grsec_enable_link && S_ISLNK(inode->i_mode) &&
58093+ (parent->i_mode & S_ISVTX) && (parent->i_uid != inode->i_uid) &&
58094+ (parent->i_mode & S_IWOTH) && (cred->fsuid != inode->i_uid)) {
58095+ gr_log_fs_int2(GR_DONT_AUDIT, GR_SYMLINK_MSG, dentry, mnt, inode->i_uid, inode->i_gid);
58096+ return -EACCES;
58097+ }
58098+#endif
58099+ return 0;
58100+}
58101+
58102+int
58103+gr_handle_hardlink(const struct dentry *dentry,
58104+ const struct vfsmount *mnt,
58105+ struct inode *inode, const int mode, const char *to)
58106+{
58107+#ifdef CONFIG_GRKERNSEC_LINK
58108+ const struct cred *cred = current_cred();
58109+
58110+ if (grsec_enable_link && cred->fsuid != inode->i_uid &&
58111+ (!S_ISREG(mode) || (mode & S_ISUID) ||
58112+ ((mode & (S_ISGID | S_IXGRP)) == (S_ISGID | S_IXGRP)) ||
58113+ (inode_permission(inode, MAY_READ | MAY_WRITE))) &&
58114+ !capable(CAP_FOWNER) && cred->uid) {
58115+ gr_log_fs_int2_str(GR_DONT_AUDIT, GR_HARDLINK_MSG, dentry, mnt, inode->i_uid, inode->i_gid, to);
58116+ return -EPERM;
58117+ }
58118+#endif
58119+ return 0;
58120+}
58121diff --git a/grsecurity/grsec_log.c b/grsecurity/grsec_log.c
58122new file mode 100644
58123index 0000000..a45d2e9
58124--- /dev/null
58125+++ b/grsecurity/grsec_log.c
58126@@ -0,0 +1,322 @@
58127+#include <linux/kernel.h>
58128+#include <linux/sched.h>
58129+#include <linux/file.h>
58130+#include <linux/tty.h>
58131+#include <linux/fs.h>
58132+#include <linux/grinternal.h>
58133+
58134+#ifdef CONFIG_TREE_PREEMPT_RCU
58135+#define DISABLE_PREEMPT() preempt_disable()
58136+#define ENABLE_PREEMPT() preempt_enable()
58137+#else
58138+#define DISABLE_PREEMPT()
58139+#define ENABLE_PREEMPT()
58140+#endif
58141+
58142+#define BEGIN_LOCKS(x) \
58143+ DISABLE_PREEMPT(); \
58144+ rcu_read_lock(); \
58145+ read_lock(&tasklist_lock); \
58146+ read_lock(&grsec_exec_file_lock); \
58147+ if (x != GR_DO_AUDIT) \
58148+ spin_lock(&grsec_alert_lock); \
58149+ else \
58150+ spin_lock(&grsec_audit_lock)
58151+
58152+#define END_LOCKS(x) \
58153+ if (x != GR_DO_AUDIT) \
58154+ spin_unlock(&grsec_alert_lock); \
58155+ else \
58156+ spin_unlock(&grsec_audit_lock); \
58157+ read_unlock(&grsec_exec_file_lock); \
58158+ read_unlock(&tasklist_lock); \
58159+ rcu_read_unlock(); \
58160+ ENABLE_PREEMPT(); \
58161+ if (x == GR_DONT_AUDIT) \
58162+ gr_handle_alertkill(current)
58163+
58164+enum {
58165+ FLOODING,
58166+ NO_FLOODING
58167+};
58168+
58169+extern char *gr_alert_log_fmt;
58170+extern char *gr_audit_log_fmt;
58171+extern char *gr_alert_log_buf;
58172+extern char *gr_audit_log_buf;
58173+
58174+static int gr_log_start(int audit)
58175+{
58176+ char *loglevel = (audit == GR_DO_AUDIT) ? KERN_INFO : KERN_ALERT;
58177+ char *fmt = (audit == GR_DO_AUDIT) ? gr_audit_log_fmt : gr_alert_log_fmt;
58178+ char *buf = (audit == GR_DO_AUDIT) ? gr_audit_log_buf : gr_alert_log_buf;
58179+#if (CONFIG_GRKERNSEC_FLOODTIME > 0 && CONFIG_GRKERNSEC_FLOODBURST > 0)
58180+ unsigned long curr_secs = get_seconds();
58181+
58182+ if (audit == GR_DO_AUDIT)
58183+ goto set_fmt;
58184+
58185+ if (!grsec_alert_wtime || time_after(curr_secs, grsec_alert_wtime + CONFIG_GRKERNSEC_FLOODTIME)) {
58186+ grsec_alert_wtime = curr_secs;
58187+ grsec_alert_fyet = 0;
58188+ } else if (time_before_eq(curr_secs, grsec_alert_wtime + CONFIG_GRKERNSEC_FLOODTIME)
58189+ && (grsec_alert_fyet < CONFIG_GRKERNSEC_FLOODBURST)) {
58190+ grsec_alert_fyet++;
58191+ } else if (grsec_alert_fyet == CONFIG_GRKERNSEC_FLOODBURST) {
58192+ grsec_alert_wtime = curr_secs;
58193+ grsec_alert_fyet++;
58194+ printk(KERN_ALERT "grsec: more alerts, logging disabled for %d seconds\n", CONFIG_GRKERNSEC_FLOODTIME);
58195+ return FLOODING;
58196+ }
58197+ else return FLOODING;
58198+
58199+set_fmt:
58200+#endif
58201+ memset(buf, 0, PAGE_SIZE);
58202+ if (current->signal->curr_ip && gr_acl_is_enabled()) {
58203+ sprintf(fmt, "%s%s", loglevel, "grsec: From %pI4: (%.64s:%c:%.950s) ");
58204+ snprintf(buf, PAGE_SIZE - 1, fmt, &current->signal->curr_ip, current->role->rolename, gr_roletype_to_char(), current->acl->filename);
58205+ } else if (current->signal->curr_ip) {
58206+ sprintf(fmt, "%s%s", loglevel, "grsec: From %pI4: ");
58207+ snprintf(buf, PAGE_SIZE - 1, fmt, &current->signal->curr_ip);
58208+ } else if (gr_acl_is_enabled()) {
58209+ sprintf(fmt, "%s%s", loglevel, "grsec: (%.64s:%c:%.950s) ");
58210+ snprintf(buf, PAGE_SIZE - 1, fmt, current->role->rolename, gr_roletype_to_char(), current->acl->filename);
58211+ } else {
58212+ sprintf(fmt, "%s%s", loglevel, "grsec: ");
58213+ strcpy(buf, fmt);
58214+ }
58215+
58216+ return NO_FLOODING;
58217+}
58218+
58219+static void gr_log_middle(int audit, const char *msg, va_list ap)
58220+ __attribute__ ((format (printf, 2, 0)));
58221+
58222+static void gr_log_middle(int audit, const char *msg, va_list ap)
58223+{
58224+ char *buf = (audit == GR_DO_AUDIT) ? gr_audit_log_buf : gr_alert_log_buf;
58225+ unsigned int len = strlen(buf);
58226+
58227+ vsnprintf(buf + len, PAGE_SIZE - len - 1, msg, ap);
58228+
58229+ return;
58230+}
58231+
58232+static void gr_log_middle_varargs(int audit, const char *msg, ...)
58233+ __attribute__ ((format (printf, 2, 3)));
58234+
58235+static void gr_log_middle_varargs(int audit, const char *msg, ...)
58236+{
58237+ char *buf = (audit == GR_DO_AUDIT) ? gr_audit_log_buf : gr_alert_log_buf;
58238+ unsigned int len = strlen(buf);
58239+ va_list ap;
58240+
58241+ va_start(ap, msg);
58242+ vsnprintf(buf + len, PAGE_SIZE - len - 1, msg, ap);
58243+ va_end(ap);
58244+
58245+ return;
58246+}
58247+
58248+static void gr_log_end(int audit, int append_default)
58249+{
58250+ char *buf = (audit == GR_DO_AUDIT) ? gr_audit_log_buf : gr_alert_log_buf;
58251+
58252+ if (append_default) {
58253+ unsigned int len = strlen(buf);
58254+ snprintf(buf + len, PAGE_SIZE - len - 1, DEFAULTSECMSG, DEFAULTSECARGS(current, current_cred(), __task_cred(current->real_parent)));
58255+ }
58256+
58257+ printk("%s\n", buf);
58258+
58259+ return;
58260+}
58261+
58262+void gr_log_varargs(int audit, const char *msg, int argtypes, ...)
58263+{
58264+ int logtype;
58265+ char *result = (audit == GR_DO_AUDIT) ? "successful" : "denied";
58266+ char *str1 = NULL, *str2 = NULL, *str3 = NULL;
58267+ void *voidptr = NULL;
58268+ int num1 = 0, num2 = 0;
58269+ unsigned long ulong1 = 0, ulong2 = 0;
58270+ struct dentry *dentry = NULL;
58271+ struct vfsmount *mnt = NULL;
58272+ struct file *file = NULL;
58273+ struct task_struct *task = NULL;
58274+ const struct cred *cred, *pcred;
58275+ va_list ap;
58276+
58277+ BEGIN_LOCKS(audit);
58278+ logtype = gr_log_start(audit);
58279+ if (logtype == FLOODING) {
58280+ END_LOCKS(audit);
58281+ return;
58282+ }
58283+ va_start(ap, argtypes);
58284+ switch (argtypes) {
58285+ case GR_TTYSNIFF:
58286+ task = va_arg(ap, struct task_struct *);
58287+ 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);
58288+ break;
58289+ case GR_SYSCTL_HIDDEN:
58290+ str1 = va_arg(ap, char *);
58291+ gr_log_middle_varargs(audit, msg, result, str1);
58292+ break;
58293+ case GR_RBAC:
58294+ dentry = va_arg(ap, struct dentry *);
58295+ mnt = va_arg(ap, struct vfsmount *);
58296+ gr_log_middle_varargs(audit, msg, result, gr_to_filename(dentry, mnt));
58297+ break;
58298+ case GR_RBAC_STR:
58299+ dentry = va_arg(ap, struct dentry *);
58300+ mnt = va_arg(ap, struct vfsmount *);
58301+ str1 = va_arg(ap, char *);
58302+ gr_log_middle_varargs(audit, msg, result, gr_to_filename(dentry, mnt), str1);
58303+ break;
58304+ case GR_STR_RBAC:
58305+ str1 = va_arg(ap, char *);
58306+ dentry = va_arg(ap, struct dentry *);
58307+ mnt = va_arg(ap, struct vfsmount *);
58308+ gr_log_middle_varargs(audit, msg, result, str1, gr_to_filename(dentry, mnt));
58309+ break;
58310+ case GR_RBAC_MODE2:
58311+ dentry = va_arg(ap, struct dentry *);
58312+ mnt = va_arg(ap, struct vfsmount *);
58313+ str1 = va_arg(ap, char *);
58314+ str2 = va_arg(ap, char *);
58315+ gr_log_middle_varargs(audit, msg, result, gr_to_filename(dentry, mnt), str1, str2);
58316+ break;
58317+ case GR_RBAC_MODE3:
58318+ dentry = va_arg(ap, struct dentry *);
58319+ mnt = va_arg(ap, struct vfsmount *);
58320+ str1 = va_arg(ap, char *);
58321+ str2 = va_arg(ap, char *);
58322+ str3 = va_arg(ap, char *);
58323+ gr_log_middle_varargs(audit, msg, result, gr_to_filename(dentry, mnt), str1, str2, str3);
58324+ break;
58325+ case GR_FILENAME:
58326+ dentry = va_arg(ap, struct dentry *);
58327+ mnt = va_arg(ap, struct vfsmount *);
58328+ gr_log_middle_varargs(audit, msg, gr_to_filename(dentry, mnt));
58329+ break;
58330+ case GR_STR_FILENAME:
58331+ str1 = va_arg(ap, char *);
58332+ dentry = va_arg(ap, struct dentry *);
58333+ mnt = va_arg(ap, struct vfsmount *);
58334+ gr_log_middle_varargs(audit, msg, str1, gr_to_filename(dentry, mnt));
58335+ break;
58336+ case GR_FILENAME_STR:
58337+ dentry = va_arg(ap, struct dentry *);
58338+ mnt = va_arg(ap, struct vfsmount *);
58339+ str1 = va_arg(ap, char *);
58340+ gr_log_middle_varargs(audit, msg, gr_to_filename(dentry, mnt), str1);
58341+ break;
58342+ case GR_FILENAME_TWO_INT:
58343+ dentry = va_arg(ap, struct dentry *);
58344+ mnt = va_arg(ap, struct vfsmount *);
58345+ num1 = va_arg(ap, int);
58346+ num2 = va_arg(ap, int);
58347+ gr_log_middle_varargs(audit, msg, gr_to_filename(dentry, mnt), num1, num2);
58348+ break;
58349+ case GR_FILENAME_TWO_INT_STR:
58350+ dentry = va_arg(ap, struct dentry *);
58351+ mnt = va_arg(ap, struct vfsmount *);
58352+ num1 = va_arg(ap, int);
58353+ num2 = va_arg(ap, int);
58354+ str1 = va_arg(ap, char *);
58355+ gr_log_middle_varargs(audit, msg, gr_to_filename(dentry, mnt), num1, num2, str1);
58356+ break;
58357+ case GR_TEXTREL:
58358+ file = va_arg(ap, struct file *);
58359+ ulong1 = va_arg(ap, unsigned long);
58360+ ulong2 = va_arg(ap, unsigned long);
58361+ gr_log_middle_varargs(audit, msg, file ? gr_to_filename(file->f_path.dentry, file->f_path.mnt) : "<anonymous mapping>", ulong1, ulong2);
58362+ break;
58363+ case GR_PTRACE:
58364+ task = va_arg(ap, struct task_struct *);
58365+ 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);
58366+ break;
58367+ case GR_RESOURCE:
58368+ task = va_arg(ap, struct task_struct *);
58369+ cred = __task_cred(task);
58370+ pcred = __task_cred(task->real_parent);
58371+ ulong1 = va_arg(ap, unsigned long);
58372+ str1 = va_arg(ap, char *);
58373+ ulong2 = va_arg(ap, unsigned long);
58374+ 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);
58375+ break;
58376+ case GR_CAP:
58377+ task = va_arg(ap, struct task_struct *);
58378+ cred = __task_cred(task);
58379+ pcred = __task_cred(task->real_parent);
58380+ str1 = va_arg(ap, char *);
58381+ 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);
58382+ break;
58383+ case GR_SIG:
58384+ str1 = va_arg(ap, char *);
58385+ voidptr = va_arg(ap, void *);
58386+ gr_log_middle_varargs(audit, msg, str1, voidptr);
58387+ break;
58388+ case GR_SIG2:
58389+ task = va_arg(ap, struct task_struct *);
58390+ cred = __task_cred(task);
58391+ pcred = __task_cred(task->real_parent);
58392+ num1 = va_arg(ap, int);
58393+ 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);
58394+ break;
58395+ case GR_CRASH1:
58396+ task = va_arg(ap, struct task_struct *);
58397+ cred = __task_cred(task);
58398+ pcred = __task_cred(task->real_parent);
58399+ ulong1 = va_arg(ap, unsigned long);
58400+ 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);
58401+ break;
58402+ case GR_CRASH2:
58403+ task = va_arg(ap, struct task_struct *);
58404+ cred = __task_cred(task);
58405+ pcred = __task_cred(task->real_parent);
58406+ ulong1 = va_arg(ap, unsigned long);
58407+ 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);
58408+ break;
58409+ case GR_RWXMAP:
58410+ file = va_arg(ap, struct file *);
58411+ gr_log_middle_varargs(audit, msg, file ? gr_to_filename(file->f_path.dentry, file->f_path.mnt) : "<anonymous mapping>");
58412+ break;
58413+ case GR_PSACCT:
58414+ {
58415+ unsigned int wday, cday;
58416+ __u8 whr, chr;
58417+ __u8 wmin, cmin;
58418+ __u8 wsec, csec;
58419+ char cur_tty[64] = { 0 };
58420+ char parent_tty[64] = { 0 };
58421+
58422+ task = va_arg(ap, struct task_struct *);
58423+ wday = va_arg(ap, unsigned int);
58424+ cday = va_arg(ap, unsigned int);
58425+ whr = va_arg(ap, int);
58426+ chr = va_arg(ap, int);
58427+ wmin = va_arg(ap, int);
58428+ cmin = va_arg(ap, int);
58429+ wsec = va_arg(ap, int);
58430+ csec = va_arg(ap, int);
58431+ ulong1 = va_arg(ap, unsigned long);
58432+ cred = __task_cred(task);
58433+ pcred = __task_cred(task->real_parent);
58434+
58435+ 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);
58436+ }
58437+ break;
58438+ default:
58439+ gr_log_middle(audit, msg, ap);
58440+ }
58441+ va_end(ap);
58442+ // these don't need DEFAULTSECARGS printed on the end
58443+ if (argtypes == GR_CRASH1 || argtypes == GR_CRASH2)
58444+ gr_log_end(audit, 0);
58445+ else
58446+ gr_log_end(audit, 1);
58447+ END_LOCKS(audit);
58448+}
58449diff --git a/grsecurity/grsec_mem.c b/grsecurity/grsec_mem.c
58450new file mode 100644
58451index 0000000..f536303
58452--- /dev/null
58453+++ b/grsecurity/grsec_mem.c
58454@@ -0,0 +1,40 @@
58455+#include <linux/kernel.h>
58456+#include <linux/sched.h>
58457+#include <linux/mm.h>
58458+#include <linux/mman.h>
58459+#include <linux/grinternal.h>
58460+
58461+void
58462+gr_handle_ioperm(void)
58463+{
58464+ gr_log_noargs(GR_DONT_AUDIT, GR_IOPERM_MSG);
58465+ return;
58466+}
58467+
58468+void
58469+gr_handle_iopl(void)
58470+{
58471+ gr_log_noargs(GR_DONT_AUDIT, GR_IOPL_MSG);
58472+ return;
58473+}
58474+
58475+void
58476+gr_handle_mem_readwrite(u64 from, u64 to)
58477+{
58478+ gr_log_two_u64(GR_DONT_AUDIT, GR_MEM_READWRITE_MSG, from, to);
58479+ return;
58480+}
58481+
58482+void
58483+gr_handle_vm86(void)
58484+{
58485+ gr_log_noargs(GR_DONT_AUDIT, GR_VM86_MSG);
58486+ return;
58487+}
58488+
58489+void
58490+gr_log_badprocpid(const char *entry)
58491+{
58492+ gr_log_str(GR_DONT_AUDIT, GR_BADPROCPID_MSG, entry);
58493+ return;
58494+}
58495diff --git a/grsecurity/grsec_mount.c b/grsecurity/grsec_mount.c
58496new file mode 100644
58497index 0000000..2131422
58498--- /dev/null
58499+++ b/grsecurity/grsec_mount.c
58500@@ -0,0 +1,62 @@
58501+#include <linux/kernel.h>
58502+#include <linux/sched.h>
58503+#include <linux/mount.h>
58504+#include <linux/grsecurity.h>
58505+#include <linux/grinternal.h>
58506+
58507+void
58508+gr_log_remount(const char *devname, const int retval)
58509+{
58510+#ifdef CONFIG_GRKERNSEC_AUDIT_MOUNT
58511+ if (grsec_enable_mount && (retval >= 0))
58512+ gr_log_str(GR_DO_AUDIT, GR_REMOUNT_AUDIT_MSG, devname ? devname : "none");
58513+#endif
58514+ return;
58515+}
58516+
58517+void
58518+gr_log_unmount(const char *devname, const int retval)
58519+{
58520+#ifdef CONFIG_GRKERNSEC_AUDIT_MOUNT
58521+ if (grsec_enable_mount && (retval >= 0))
58522+ gr_log_str(GR_DO_AUDIT, GR_UNMOUNT_AUDIT_MSG, devname ? devname : "none");
58523+#endif
58524+ return;
58525+}
58526+
58527+void
58528+gr_log_mount(const char *from, const char *to, const int retval)
58529+{
58530+#ifdef CONFIG_GRKERNSEC_AUDIT_MOUNT
58531+ if (grsec_enable_mount && (retval >= 0))
58532+ gr_log_str_str(GR_DO_AUDIT, GR_MOUNT_AUDIT_MSG, from ? from : "none", to);
58533+#endif
58534+ return;
58535+}
58536+
58537+int
58538+gr_handle_rofs_mount(struct dentry *dentry, struct vfsmount *mnt, int mnt_flags)
58539+{
58540+#ifdef CONFIG_GRKERNSEC_ROFS
58541+ if (grsec_enable_rofs && !(mnt_flags & MNT_READONLY)) {
58542+ gr_log_fs_generic(GR_DO_AUDIT, GR_ROFS_MOUNT_MSG, dentry, mnt);
58543+ return -EPERM;
58544+ } else
58545+ return 0;
58546+#endif
58547+ return 0;
58548+}
58549+
58550+int
58551+gr_handle_rofs_blockwrite(struct dentry *dentry, struct vfsmount *mnt, int acc_mode)
58552+{
58553+#ifdef CONFIG_GRKERNSEC_ROFS
58554+ if (grsec_enable_rofs && (acc_mode & MAY_WRITE) &&
58555+ dentry->d_inode && S_ISBLK(dentry->d_inode->i_mode)) {
58556+ gr_log_fs_generic(GR_DO_AUDIT, GR_ROFS_BLOCKWRITE_MSG, dentry, mnt);
58557+ return -EPERM;
58558+ } else
58559+ return 0;
58560+#endif
58561+ return 0;
58562+}
58563diff --git a/grsecurity/grsec_pax.c b/grsecurity/grsec_pax.c
58564new file mode 100644
58565index 0000000..a3b12a0
58566--- /dev/null
58567+++ b/grsecurity/grsec_pax.c
58568@@ -0,0 +1,36 @@
58569+#include <linux/kernel.h>
58570+#include <linux/sched.h>
58571+#include <linux/mm.h>
58572+#include <linux/file.h>
58573+#include <linux/grinternal.h>
58574+#include <linux/grsecurity.h>
58575+
58576+void
58577+gr_log_textrel(struct vm_area_struct * vma)
58578+{
58579+#ifdef CONFIG_GRKERNSEC_AUDIT_TEXTREL
58580+ if (grsec_enable_audit_textrel)
58581+ gr_log_textrel_ulong_ulong(GR_DO_AUDIT, GR_TEXTREL_AUDIT_MSG, vma->vm_file, vma->vm_start, vma->vm_pgoff);
58582+#endif
58583+ return;
58584+}
58585+
58586+void
58587+gr_log_rwxmmap(struct file *file)
58588+{
58589+#ifdef CONFIG_GRKERNSEC_RWXMAP_LOG
58590+ if (grsec_enable_log_rwxmaps)
58591+ gr_log_rwxmap(GR_DONT_AUDIT, GR_RWXMMAP_MSG, file);
58592+#endif
58593+ return;
58594+}
58595+
58596+void
58597+gr_log_rwxmprotect(struct file *file)
58598+{
58599+#ifdef CONFIG_GRKERNSEC_RWXMAP_LOG
58600+ if (grsec_enable_log_rwxmaps)
58601+ gr_log_rwxmap(GR_DONT_AUDIT, GR_RWXMPROTECT_MSG, file);
58602+#endif
58603+ return;
58604+}
58605diff --git a/grsecurity/grsec_ptrace.c b/grsecurity/grsec_ptrace.c
58606new file mode 100644
58607index 0000000..f7f29aa
58608--- /dev/null
58609+++ b/grsecurity/grsec_ptrace.c
58610@@ -0,0 +1,30 @@
58611+#include <linux/kernel.h>
58612+#include <linux/sched.h>
58613+#include <linux/grinternal.h>
58614+#include <linux/security.h>
58615+
58616+void
58617+gr_audit_ptrace(struct task_struct *task)
58618+{
58619+#ifdef CONFIG_GRKERNSEC_AUDIT_PTRACE
58620+ if (grsec_enable_audit_ptrace)
58621+ gr_log_ptrace(GR_DO_AUDIT, GR_PTRACE_AUDIT_MSG, task);
58622+#endif
58623+ return;
58624+}
58625+
58626+int
58627+gr_ptrace_readexec(struct file *file, int unsafe_flags)
58628+{
58629+#ifdef CONFIG_GRKERNSEC_PTRACE_READEXEC
58630+ const struct dentry *dentry = file->f_path.dentry;
58631+ const struct vfsmount *mnt = file->f_path.mnt;
58632+
58633+ if (grsec_enable_ptrace_readexec && (unsafe_flags & LSM_UNSAFE_PTRACE) &&
58634+ (inode_permission(dentry->d_inode, MAY_READ) || !gr_acl_handle_open(dentry, mnt, MAY_READ))) {
58635+ gr_log_fs_generic(GR_DONT_AUDIT, GR_PTRACE_READEXEC_MSG, dentry, mnt);
58636+ return -EACCES;
58637+ }
58638+#endif
58639+ return 0;
58640+}
58641diff --git a/grsecurity/grsec_sig.c b/grsecurity/grsec_sig.c
58642new file mode 100644
58643index 0000000..7a5b2de
58644--- /dev/null
58645+++ b/grsecurity/grsec_sig.c
58646@@ -0,0 +1,207 @@
58647+#include <linux/kernel.h>
58648+#include <linux/sched.h>
58649+#include <linux/delay.h>
58650+#include <linux/grsecurity.h>
58651+#include <linux/grinternal.h>
58652+#include <linux/hardirq.h>
58653+
58654+char *signames[] = {
58655+ [SIGSEGV] = "Segmentation fault",
58656+ [SIGILL] = "Illegal instruction",
58657+ [SIGABRT] = "Abort",
58658+ [SIGBUS] = "Invalid alignment/Bus error"
58659+};
58660+
58661+void
58662+gr_log_signal(const int sig, const void *addr, const struct task_struct *t)
58663+{
58664+#ifdef CONFIG_GRKERNSEC_SIGNAL
58665+ if (grsec_enable_signal && ((sig == SIGSEGV) || (sig == SIGILL) ||
58666+ (sig == SIGABRT) || (sig == SIGBUS))) {
58667+ if (t->pid == current->pid) {
58668+ gr_log_sig_addr(GR_DONT_AUDIT_GOOD, GR_UNISIGLOG_MSG, signames[sig], addr);
58669+ } else {
58670+ gr_log_sig_task(GR_DONT_AUDIT_GOOD, GR_DUALSIGLOG_MSG, t, sig);
58671+ }
58672+ }
58673+#endif
58674+ return;
58675+}
58676+
58677+int
58678+gr_handle_signal(const struct task_struct *p, const int sig)
58679+{
58680+#ifdef CONFIG_GRKERNSEC
58681+ /* ignore the 0 signal for protected task checks */
58682+ if (current->pid > 1 && sig && gr_check_protected_task(p)) {
58683+ gr_log_sig_task(GR_DONT_AUDIT, GR_SIG_ACL_MSG, p, sig);
58684+ return -EPERM;
58685+ } else if (gr_pid_is_chrooted((struct task_struct *)p)) {
58686+ return -EPERM;
58687+ }
58688+#endif
58689+ return 0;
58690+}
58691+
58692+#ifdef CONFIG_GRKERNSEC
58693+extern int specific_send_sig_info(int sig, struct siginfo *info, struct task_struct *t);
58694+
58695+int gr_fake_force_sig(int sig, struct task_struct *t)
58696+{
58697+ unsigned long int flags;
58698+ int ret, blocked, ignored;
58699+ struct k_sigaction *action;
58700+
58701+ spin_lock_irqsave(&t->sighand->siglock, flags);
58702+ action = &t->sighand->action[sig-1];
58703+ ignored = action->sa.sa_handler == SIG_IGN;
58704+ blocked = sigismember(&t->blocked, sig);
58705+ if (blocked || ignored) {
58706+ action->sa.sa_handler = SIG_DFL;
58707+ if (blocked) {
58708+ sigdelset(&t->blocked, sig);
58709+ recalc_sigpending_and_wake(t);
58710+ }
58711+ }
58712+ if (action->sa.sa_handler == SIG_DFL)
58713+ t->signal->flags &= ~SIGNAL_UNKILLABLE;
58714+ ret = specific_send_sig_info(sig, SEND_SIG_PRIV, t);
58715+
58716+ spin_unlock_irqrestore(&t->sighand->siglock, flags);
58717+
58718+ return ret;
58719+}
58720+#endif
58721+
58722+#ifdef CONFIG_GRKERNSEC_BRUTE
58723+#define GR_USER_BAN_TIME (15 * 60)
58724+
58725+static int __get_dumpable(unsigned long mm_flags)
58726+{
58727+ int ret;
58728+
58729+ ret = mm_flags & MMF_DUMPABLE_MASK;
58730+ return (ret >= 2) ? 2 : ret;
58731+}
58732+#endif
58733+
58734+void gr_handle_brute_attach(struct task_struct *p, unsigned long mm_flags)
58735+{
58736+#ifdef CONFIG_GRKERNSEC_BRUTE
58737+ uid_t uid = 0;
58738+
58739+ if (!grsec_enable_brute)
58740+ return;
58741+
58742+ rcu_read_lock();
58743+ read_lock(&tasklist_lock);
58744+ read_lock(&grsec_exec_file_lock);
58745+ if (p->real_parent && p->real_parent->exec_file == p->exec_file)
58746+ p->real_parent->brute = 1;
58747+ else {
58748+ const struct cred *cred = __task_cred(p), *cred2;
58749+ struct task_struct *tsk, *tsk2;
58750+
58751+ if (!__get_dumpable(mm_flags) && cred->uid) {
58752+ struct user_struct *user;
58753+
58754+ uid = cred->uid;
58755+
58756+ /* this is put upon execution past expiration */
58757+ user = find_user(uid);
58758+ if (user == NULL)
58759+ goto unlock;
58760+ user->banned = 1;
58761+ user->ban_expires = get_seconds() + GR_USER_BAN_TIME;
58762+ if (user->ban_expires == ~0UL)
58763+ user->ban_expires--;
58764+
58765+ do_each_thread(tsk2, tsk) {
58766+ cred2 = __task_cred(tsk);
58767+ if (tsk != p && cred2->uid == uid)
58768+ gr_fake_force_sig(SIGKILL, tsk);
58769+ } while_each_thread(tsk2, tsk);
58770+ }
58771+ }
58772+unlock:
58773+ read_unlock(&grsec_exec_file_lock);
58774+ read_unlock(&tasklist_lock);
58775+ rcu_read_unlock();
58776+
58777+ if (uid)
58778+ printk(KERN_ALERT "grsec: bruteforce prevention initiated against uid %u, banning for %d minutes\n", uid, GR_USER_BAN_TIME / 60);
58779+
58780+#endif
58781+ return;
58782+}
58783+
58784+void gr_handle_brute_check(void)
58785+{
58786+#ifdef CONFIG_GRKERNSEC_BRUTE
58787+ if (current->brute)
58788+ msleep(30 * 1000);
58789+#endif
58790+ return;
58791+}
58792+
58793+void gr_handle_kernel_exploit(void)
58794+{
58795+#ifdef CONFIG_GRKERNSEC_KERN_LOCKOUT
58796+ const struct cred *cred;
58797+ struct task_struct *tsk, *tsk2;
58798+ struct user_struct *user;
58799+ uid_t uid;
58800+
58801+ if (in_irq() || in_serving_softirq() || in_nmi())
58802+ panic("grsec: halting the system due to suspicious kernel crash caused in interrupt context");
58803+
58804+ uid = current_uid();
58805+
58806+ if (uid == 0)
58807+ panic("grsec: halting the system due to suspicious kernel crash caused by root");
58808+ else {
58809+ /* kill all the processes of this user, hold a reference
58810+ to their creds struct, and prevent them from creating
58811+ another process until system reset
58812+ */
58813+ printk(KERN_ALERT "grsec: banning user with uid %u until system restart for suspicious kernel crash\n", uid);
58814+ /* we intentionally leak this ref */
58815+ user = get_uid(current->cred->user);
58816+ if (user) {
58817+ user->banned = 1;
58818+ user->ban_expires = ~0UL;
58819+ }
58820+
58821+ read_lock(&tasklist_lock);
58822+ do_each_thread(tsk2, tsk) {
58823+ cred = __task_cred(tsk);
58824+ if (cred->uid == uid)
58825+ gr_fake_force_sig(SIGKILL, tsk);
58826+ } while_each_thread(tsk2, tsk);
58827+ read_unlock(&tasklist_lock);
58828+ }
58829+#endif
58830+}
58831+
58832+int __gr_process_user_ban(struct user_struct *user)
58833+{
58834+#if defined(CONFIG_GRKERNSEC_KERN_LOCKOUT) || defined(CONFIG_GRKERNSEC_BRUTE)
58835+ if (unlikely(user->banned)) {
58836+ if (user->ban_expires != ~0UL && time_after_eq(get_seconds(), user->ban_expires)) {
58837+ user->banned = 0;
58838+ user->ban_expires = 0;
58839+ free_uid(user);
58840+ } else
58841+ return -EPERM;
58842+ }
58843+#endif
58844+ return 0;
58845+}
58846+
58847+int gr_process_user_ban(void)
58848+{
58849+#if defined(CONFIG_GRKERNSEC_KERN_LOCKOUT) || defined(CONFIG_GRKERNSEC_BRUTE)
58850+ return __gr_process_user_ban(current->cred->user);
58851+#endif
58852+ return 0;
58853+}
58854diff --git a/grsecurity/grsec_sock.c b/grsecurity/grsec_sock.c
58855new file mode 100644
58856index 0000000..4030d57
58857--- /dev/null
58858+++ b/grsecurity/grsec_sock.c
58859@@ -0,0 +1,244 @@
58860+#include <linux/kernel.h>
58861+#include <linux/module.h>
58862+#include <linux/sched.h>
58863+#include <linux/file.h>
58864+#include <linux/net.h>
58865+#include <linux/in.h>
58866+#include <linux/ip.h>
58867+#include <net/sock.h>
58868+#include <net/inet_sock.h>
58869+#include <linux/grsecurity.h>
58870+#include <linux/grinternal.h>
58871+#include <linux/gracl.h>
58872+
58873+extern int gr_search_udp_recvmsg(const struct sock *sk, const struct sk_buff *skb);
58874+extern int gr_search_udp_sendmsg(const struct sock *sk, const struct sockaddr_in *addr);
58875+
58876+EXPORT_SYMBOL(gr_search_udp_recvmsg);
58877+EXPORT_SYMBOL(gr_search_udp_sendmsg);
58878+
58879+#ifdef CONFIG_UNIX_MODULE
58880+EXPORT_SYMBOL(gr_acl_handle_unix);
58881+EXPORT_SYMBOL(gr_acl_handle_mknod);
58882+EXPORT_SYMBOL(gr_handle_chroot_unix);
58883+EXPORT_SYMBOL(gr_handle_create);
58884+#endif
58885+
58886+#ifdef CONFIG_GRKERNSEC
58887+#define gr_conn_table_size 32749
58888+struct conn_table_entry {
58889+ struct conn_table_entry *next;
58890+ struct signal_struct *sig;
58891+};
58892+
58893+struct conn_table_entry *gr_conn_table[gr_conn_table_size];
58894+DEFINE_SPINLOCK(gr_conn_table_lock);
58895+
58896+extern const char * gr_socktype_to_name(unsigned char type);
58897+extern const char * gr_proto_to_name(unsigned char proto);
58898+extern const char * gr_sockfamily_to_name(unsigned char family);
58899+
58900+static __inline__ int
58901+conn_hash(__u32 saddr, __u32 daddr, __u16 sport, __u16 dport, unsigned int size)
58902+{
58903+ return ((daddr + saddr + (sport << 8) + (dport << 16)) % size);
58904+}
58905+
58906+static __inline__ int
58907+conn_match(const struct signal_struct *sig, __u32 saddr, __u32 daddr,
58908+ __u16 sport, __u16 dport)
58909+{
58910+ if (unlikely(sig->gr_saddr == saddr && sig->gr_daddr == daddr &&
58911+ sig->gr_sport == sport && sig->gr_dport == dport))
58912+ return 1;
58913+ else
58914+ return 0;
58915+}
58916+
58917+static void gr_add_to_task_ip_table_nolock(struct signal_struct *sig, struct conn_table_entry *newent)
58918+{
58919+ struct conn_table_entry **match;
58920+ unsigned int index;
58921+
58922+ index = conn_hash(sig->gr_saddr, sig->gr_daddr,
58923+ sig->gr_sport, sig->gr_dport,
58924+ gr_conn_table_size);
58925+
58926+ newent->sig = sig;
58927+
58928+ match = &gr_conn_table[index];
58929+ newent->next = *match;
58930+ *match = newent;
58931+
58932+ return;
58933+}
58934+
58935+static void gr_del_task_from_ip_table_nolock(struct signal_struct *sig)
58936+{
58937+ struct conn_table_entry *match, *last = NULL;
58938+ unsigned int index;
58939+
58940+ index = conn_hash(sig->gr_saddr, sig->gr_daddr,
58941+ sig->gr_sport, sig->gr_dport,
58942+ gr_conn_table_size);
58943+
58944+ match = gr_conn_table[index];
58945+ while (match && !conn_match(match->sig,
58946+ sig->gr_saddr, sig->gr_daddr, sig->gr_sport,
58947+ sig->gr_dport)) {
58948+ last = match;
58949+ match = match->next;
58950+ }
58951+
58952+ if (match) {
58953+ if (last)
58954+ last->next = match->next;
58955+ else
58956+ gr_conn_table[index] = NULL;
58957+ kfree(match);
58958+ }
58959+
58960+ return;
58961+}
58962+
58963+static struct signal_struct * gr_lookup_task_ip_table(__u32 saddr, __u32 daddr,
58964+ __u16 sport, __u16 dport)
58965+{
58966+ struct conn_table_entry *match;
58967+ unsigned int index;
58968+
58969+ index = conn_hash(saddr, daddr, sport, dport, gr_conn_table_size);
58970+
58971+ match = gr_conn_table[index];
58972+ while (match && !conn_match(match->sig, saddr, daddr, sport, dport))
58973+ match = match->next;
58974+
58975+ if (match)
58976+ return match->sig;
58977+ else
58978+ return NULL;
58979+}
58980+
58981+#endif
58982+
58983+void gr_update_task_in_ip_table(struct task_struct *task, const struct inet_sock *inet)
58984+{
58985+#ifdef CONFIG_GRKERNSEC
58986+ struct signal_struct *sig = task->signal;
58987+ struct conn_table_entry *newent;
58988+
58989+ newent = kmalloc(sizeof(struct conn_table_entry), GFP_ATOMIC);
58990+ if (newent == NULL)
58991+ return;
58992+ /* no bh lock needed since we are called with bh disabled */
58993+ spin_lock(&gr_conn_table_lock);
58994+ gr_del_task_from_ip_table_nolock(sig);
58995+ sig->gr_saddr = inet->inet_rcv_saddr;
58996+ sig->gr_daddr = inet->inet_daddr;
58997+ sig->gr_sport = inet->inet_sport;
58998+ sig->gr_dport = inet->inet_dport;
58999+ gr_add_to_task_ip_table_nolock(sig, newent);
59000+ spin_unlock(&gr_conn_table_lock);
59001+#endif
59002+ return;
59003+}
59004+
59005+void gr_del_task_from_ip_table(struct task_struct *task)
59006+{
59007+#ifdef CONFIG_GRKERNSEC
59008+ spin_lock_bh(&gr_conn_table_lock);
59009+ gr_del_task_from_ip_table_nolock(task->signal);
59010+ spin_unlock_bh(&gr_conn_table_lock);
59011+#endif
59012+ return;
59013+}
59014+
59015+void
59016+gr_attach_curr_ip(const struct sock *sk)
59017+{
59018+#ifdef CONFIG_GRKERNSEC
59019+ struct signal_struct *p, *set;
59020+ const struct inet_sock *inet = inet_sk(sk);
59021+
59022+ if (unlikely(sk->sk_protocol != IPPROTO_TCP))
59023+ return;
59024+
59025+ set = current->signal;
59026+
59027+ spin_lock_bh(&gr_conn_table_lock);
59028+ p = gr_lookup_task_ip_table(inet->inet_daddr, inet->inet_rcv_saddr,
59029+ inet->inet_dport, inet->inet_sport);
59030+ if (unlikely(p != NULL)) {
59031+ set->curr_ip = p->curr_ip;
59032+ set->used_accept = 1;
59033+ gr_del_task_from_ip_table_nolock(p);
59034+ spin_unlock_bh(&gr_conn_table_lock);
59035+ return;
59036+ }
59037+ spin_unlock_bh(&gr_conn_table_lock);
59038+
59039+ set->curr_ip = inet->inet_daddr;
59040+ set->used_accept = 1;
59041+#endif
59042+ return;
59043+}
59044+
59045+int
59046+gr_handle_sock_all(const int family, const int type, const int protocol)
59047+{
59048+#ifdef CONFIG_GRKERNSEC_SOCKET_ALL
59049+ if (grsec_enable_socket_all && in_group_p(grsec_socket_all_gid) &&
59050+ (family != AF_UNIX)) {
59051+ if (family == AF_INET)
59052+ gr_log_str3(GR_DONT_AUDIT, GR_SOCK_MSG, gr_sockfamily_to_name(family), gr_socktype_to_name(type), gr_proto_to_name(protocol));
59053+ else
59054+ gr_log_str2_int(GR_DONT_AUDIT, GR_SOCK_NOINET_MSG, gr_sockfamily_to_name(family), gr_socktype_to_name(type), protocol);
59055+ return -EACCES;
59056+ }
59057+#endif
59058+ return 0;
59059+}
59060+
59061+int
59062+gr_handle_sock_server(const struct sockaddr *sck)
59063+{
59064+#ifdef CONFIG_GRKERNSEC_SOCKET_SERVER
59065+ if (grsec_enable_socket_server &&
59066+ in_group_p(grsec_socket_server_gid) &&
59067+ sck && (sck->sa_family != AF_UNIX) &&
59068+ (sck->sa_family != AF_LOCAL)) {
59069+ gr_log_noargs(GR_DONT_AUDIT, GR_BIND_MSG);
59070+ return -EACCES;
59071+ }
59072+#endif
59073+ return 0;
59074+}
59075+
59076+int
59077+gr_handle_sock_server_other(const struct sock *sck)
59078+{
59079+#ifdef CONFIG_GRKERNSEC_SOCKET_SERVER
59080+ if (grsec_enable_socket_server &&
59081+ in_group_p(grsec_socket_server_gid) &&
59082+ sck && (sck->sk_family != AF_UNIX) &&
59083+ (sck->sk_family != AF_LOCAL)) {
59084+ gr_log_noargs(GR_DONT_AUDIT, GR_BIND_MSG);
59085+ return -EACCES;
59086+ }
59087+#endif
59088+ return 0;
59089+}
59090+
59091+int
59092+gr_handle_sock_client(const struct sockaddr *sck)
59093+{
59094+#ifdef CONFIG_GRKERNSEC_SOCKET_CLIENT
59095+ if (grsec_enable_socket_client && in_group_p(grsec_socket_client_gid) &&
59096+ sck && (sck->sa_family != AF_UNIX) &&
59097+ (sck->sa_family != AF_LOCAL)) {
59098+ gr_log_noargs(GR_DONT_AUDIT, GR_CONNECT_MSG);
59099+ return -EACCES;
59100+ }
59101+#endif
59102+ return 0;
59103+}
59104diff --git a/grsecurity/grsec_sysctl.c b/grsecurity/grsec_sysctl.c
59105new file mode 100644
59106index 0000000..a1aedd7
59107--- /dev/null
59108+++ b/grsecurity/grsec_sysctl.c
59109@@ -0,0 +1,451 @@
59110+#include <linux/kernel.h>
59111+#include <linux/sched.h>
59112+#include <linux/sysctl.h>
59113+#include <linux/grsecurity.h>
59114+#include <linux/grinternal.h>
59115+
59116+int
59117+gr_handle_sysctl_mod(const char *dirname, const char *name, const int op)
59118+{
59119+#ifdef CONFIG_GRKERNSEC_SYSCTL
59120+ if (!strcmp(dirname, "grsecurity") && grsec_lock && (op & MAY_WRITE)) {
59121+ gr_log_str(GR_DONT_AUDIT, GR_SYSCTL_MSG, name);
59122+ return -EACCES;
59123+ }
59124+#endif
59125+ return 0;
59126+}
59127+
59128+#ifdef CONFIG_GRKERNSEC_ROFS
59129+static int __maybe_unused one = 1;
59130+#endif
59131+
59132+#if defined(CONFIG_GRKERNSEC_SYSCTL) || defined(CONFIG_GRKERNSEC_ROFS)
59133+struct ctl_table grsecurity_table[] = {
59134+#ifdef CONFIG_GRKERNSEC_SYSCTL
59135+#ifdef CONFIG_GRKERNSEC_SYSCTL_DISTRO
59136+#ifdef CONFIG_GRKERNSEC_IO
59137+ {
59138+ .procname = "disable_priv_io",
59139+ .data = &grsec_disable_privio,
59140+ .maxlen = sizeof(int),
59141+ .mode = 0600,
59142+ .proc_handler = &proc_dointvec,
59143+ },
59144+#endif
59145+#endif
59146+#ifdef CONFIG_GRKERNSEC_LINK
59147+ {
59148+ .procname = "linking_restrictions",
59149+ .data = &grsec_enable_link,
59150+ .maxlen = sizeof(int),
59151+ .mode = 0600,
59152+ .proc_handler = &proc_dointvec,
59153+ },
59154+#endif
59155+#ifdef CONFIG_GRKERNSEC_BRUTE
59156+ {
59157+ .procname = "deter_bruteforce",
59158+ .data = &grsec_enable_brute,
59159+ .maxlen = sizeof(int),
59160+ .mode = 0600,
59161+ .proc_handler = &proc_dointvec,
59162+ },
59163+#endif
59164+#ifdef CONFIG_GRKERNSEC_FIFO
59165+ {
59166+ .procname = "fifo_restrictions",
59167+ .data = &grsec_enable_fifo,
59168+ .maxlen = sizeof(int),
59169+ .mode = 0600,
59170+ .proc_handler = &proc_dointvec,
59171+ },
59172+#endif
59173+#ifdef CONFIG_GRKERNSEC_PTRACE_READEXEC
59174+ {
59175+ .procname = "ptrace_readexec",
59176+ .data = &grsec_enable_ptrace_readexec,
59177+ .maxlen = sizeof(int),
59178+ .mode = 0600,
59179+ .proc_handler = &proc_dointvec,
59180+ },
59181+#endif
59182+#ifdef CONFIG_GRKERNSEC_SETXID
59183+ {
59184+ .procname = "consistent_setxid",
59185+ .data = &grsec_enable_setxid,
59186+ .maxlen = sizeof(int),
59187+ .mode = 0600,
59188+ .proc_handler = &proc_dointvec,
59189+ },
59190+#endif
59191+#ifdef CONFIG_GRKERNSEC_BLACKHOLE
59192+ {
59193+ .procname = "ip_blackhole",
59194+ .data = &grsec_enable_blackhole,
59195+ .maxlen = sizeof(int),
59196+ .mode = 0600,
59197+ .proc_handler = &proc_dointvec,
59198+ },
59199+ {
59200+ .procname = "lastack_retries",
59201+ .data = &grsec_lastack_retries,
59202+ .maxlen = sizeof(int),
59203+ .mode = 0600,
59204+ .proc_handler = &proc_dointvec,
59205+ },
59206+#endif
59207+#ifdef CONFIG_GRKERNSEC_EXECLOG
59208+ {
59209+ .procname = "exec_logging",
59210+ .data = &grsec_enable_execlog,
59211+ .maxlen = sizeof(int),
59212+ .mode = 0600,
59213+ .proc_handler = &proc_dointvec,
59214+ },
59215+#endif
59216+#ifdef CONFIG_GRKERNSEC_RWXMAP_LOG
59217+ {
59218+ .procname = "rwxmap_logging",
59219+ .data = &grsec_enable_log_rwxmaps,
59220+ .maxlen = sizeof(int),
59221+ .mode = 0600,
59222+ .proc_handler = &proc_dointvec,
59223+ },
59224+#endif
59225+#ifdef CONFIG_GRKERNSEC_SIGNAL
59226+ {
59227+ .procname = "signal_logging",
59228+ .data = &grsec_enable_signal,
59229+ .maxlen = sizeof(int),
59230+ .mode = 0600,
59231+ .proc_handler = &proc_dointvec,
59232+ },
59233+#endif
59234+#ifdef CONFIG_GRKERNSEC_FORKFAIL
59235+ {
59236+ .procname = "forkfail_logging",
59237+ .data = &grsec_enable_forkfail,
59238+ .maxlen = sizeof(int),
59239+ .mode = 0600,
59240+ .proc_handler = &proc_dointvec,
59241+ },
59242+#endif
59243+#ifdef CONFIG_GRKERNSEC_TIME
59244+ {
59245+ .procname = "timechange_logging",
59246+ .data = &grsec_enable_time,
59247+ .maxlen = sizeof(int),
59248+ .mode = 0600,
59249+ .proc_handler = &proc_dointvec,
59250+ },
59251+#endif
59252+#ifdef CONFIG_GRKERNSEC_CHROOT_SHMAT
59253+ {
59254+ .procname = "chroot_deny_shmat",
59255+ .data = &grsec_enable_chroot_shmat,
59256+ .maxlen = sizeof(int),
59257+ .mode = 0600,
59258+ .proc_handler = &proc_dointvec,
59259+ },
59260+#endif
59261+#ifdef CONFIG_GRKERNSEC_CHROOT_UNIX
59262+ {
59263+ .procname = "chroot_deny_unix",
59264+ .data = &grsec_enable_chroot_unix,
59265+ .maxlen = sizeof(int),
59266+ .mode = 0600,
59267+ .proc_handler = &proc_dointvec,
59268+ },
59269+#endif
59270+#ifdef CONFIG_GRKERNSEC_CHROOT_MOUNT
59271+ {
59272+ .procname = "chroot_deny_mount",
59273+ .data = &grsec_enable_chroot_mount,
59274+ .maxlen = sizeof(int),
59275+ .mode = 0600,
59276+ .proc_handler = &proc_dointvec,
59277+ },
59278+#endif
59279+#ifdef CONFIG_GRKERNSEC_CHROOT_FCHDIR
59280+ {
59281+ .procname = "chroot_deny_fchdir",
59282+ .data = &grsec_enable_chroot_fchdir,
59283+ .maxlen = sizeof(int),
59284+ .mode = 0600,
59285+ .proc_handler = &proc_dointvec,
59286+ },
59287+#endif
59288+#ifdef CONFIG_GRKERNSEC_CHROOT_DOUBLE
59289+ {
59290+ .procname = "chroot_deny_chroot",
59291+ .data = &grsec_enable_chroot_double,
59292+ .maxlen = sizeof(int),
59293+ .mode = 0600,
59294+ .proc_handler = &proc_dointvec,
59295+ },
59296+#endif
59297+#ifdef CONFIG_GRKERNSEC_CHROOT_PIVOT
59298+ {
59299+ .procname = "chroot_deny_pivot",
59300+ .data = &grsec_enable_chroot_pivot,
59301+ .maxlen = sizeof(int),
59302+ .mode = 0600,
59303+ .proc_handler = &proc_dointvec,
59304+ },
59305+#endif
59306+#ifdef CONFIG_GRKERNSEC_CHROOT_CHDIR
59307+ {
59308+ .procname = "chroot_enforce_chdir",
59309+ .data = &grsec_enable_chroot_chdir,
59310+ .maxlen = sizeof(int),
59311+ .mode = 0600,
59312+ .proc_handler = &proc_dointvec,
59313+ },
59314+#endif
59315+#ifdef CONFIG_GRKERNSEC_CHROOT_CHMOD
59316+ {
59317+ .procname = "chroot_deny_chmod",
59318+ .data = &grsec_enable_chroot_chmod,
59319+ .maxlen = sizeof(int),
59320+ .mode = 0600,
59321+ .proc_handler = &proc_dointvec,
59322+ },
59323+#endif
59324+#ifdef CONFIG_GRKERNSEC_CHROOT_MKNOD
59325+ {
59326+ .procname = "chroot_deny_mknod",
59327+ .data = &grsec_enable_chroot_mknod,
59328+ .maxlen = sizeof(int),
59329+ .mode = 0600,
59330+ .proc_handler = &proc_dointvec,
59331+ },
59332+#endif
59333+#ifdef CONFIG_GRKERNSEC_CHROOT_NICE
59334+ {
59335+ .procname = "chroot_restrict_nice",
59336+ .data = &grsec_enable_chroot_nice,
59337+ .maxlen = sizeof(int),
59338+ .mode = 0600,
59339+ .proc_handler = &proc_dointvec,
59340+ },
59341+#endif
59342+#ifdef CONFIG_GRKERNSEC_CHROOT_EXECLOG
59343+ {
59344+ .procname = "chroot_execlog",
59345+ .data = &grsec_enable_chroot_execlog,
59346+ .maxlen = sizeof(int),
59347+ .mode = 0600,
59348+ .proc_handler = &proc_dointvec,
59349+ },
59350+#endif
59351+#ifdef CONFIG_GRKERNSEC_CHROOT_CAPS
59352+ {
59353+ .procname = "chroot_caps",
59354+ .data = &grsec_enable_chroot_caps,
59355+ .maxlen = sizeof(int),
59356+ .mode = 0600,
59357+ .proc_handler = &proc_dointvec,
59358+ },
59359+#endif
59360+#ifdef CONFIG_GRKERNSEC_CHROOT_SYSCTL
59361+ {
59362+ .procname = "chroot_deny_sysctl",
59363+ .data = &grsec_enable_chroot_sysctl,
59364+ .maxlen = sizeof(int),
59365+ .mode = 0600,
59366+ .proc_handler = &proc_dointvec,
59367+ },
59368+#endif
59369+#ifdef CONFIG_GRKERNSEC_TPE
59370+ {
59371+ .procname = "tpe",
59372+ .data = &grsec_enable_tpe,
59373+ .maxlen = sizeof(int),
59374+ .mode = 0600,
59375+ .proc_handler = &proc_dointvec,
59376+ },
59377+ {
59378+ .procname = "tpe_gid",
59379+ .data = &grsec_tpe_gid,
59380+ .maxlen = sizeof(int),
59381+ .mode = 0600,
59382+ .proc_handler = &proc_dointvec,
59383+ },
59384+#endif
59385+#ifdef CONFIG_GRKERNSEC_TPE_INVERT
59386+ {
59387+ .procname = "tpe_invert",
59388+ .data = &grsec_enable_tpe_invert,
59389+ .maxlen = sizeof(int),
59390+ .mode = 0600,
59391+ .proc_handler = &proc_dointvec,
59392+ },
59393+#endif
59394+#ifdef CONFIG_GRKERNSEC_TPE_ALL
59395+ {
59396+ .procname = "tpe_restrict_all",
59397+ .data = &grsec_enable_tpe_all,
59398+ .maxlen = sizeof(int),
59399+ .mode = 0600,
59400+ .proc_handler = &proc_dointvec,
59401+ },
59402+#endif
59403+#ifdef CONFIG_GRKERNSEC_SOCKET_ALL
59404+ {
59405+ .procname = "socket_all",
59406+ .data = &grsec_enable_socket_all,
59407+ .maxlen = sizeof(int),
59408+ .mode = 0600,
59409+ .proc_handler = &proc_dointvec,
59410+ },
59411+ {
59412+ .procname = "socket_all_gid",
59413+ .data = &grsec_socket_all_gid,
59414+ .maxlen = sizeof(int),
59415+ .mode = 0600,
59416+ .proc_handler = &proc_dointvec,
59417+ },
59418+#endif
59419+#ifdef CONFIG_GRKERNSEC_SOCKET_CLIENT
59420+ {
59421+ .procname = "socket_client",
59422+ .data = &grsec_enable_socket_client,
59423+ .maxlen = sizeof(int),
59424+ .mode = 0600,
59425+ .proc_handler = &proc_dointvec,
59426+ },
59427+ {
59428+ .procname = "socket_client_gid",
59429+ .data = &grsec_socket_client_gid,
59430+ .maxlen = sizeof(int),
59431+ .mode = 0600,
59432+ .proc_handler = &proc_dointvec,
59433+ },
59434+#endif
59435+#ifdef CONFIG_GRKERNSEC_SOCKET_SERVER
59436+ {
59437+ .procname = "socket_server",
59438+ .data = &grsec_enable_socket_server,
59439+ .maxlen = sizeof(int),
59440+ .mode = 0600,
59441+ .proc_handler = &proc_dointvec,
59442+ },
59443+ {
59444+ .procname = "socket_server_gid",
59445+ .data = &grsec_socket_server_gid,
59446+ .maxlen = sizeof(int),
59447+ .mode = 0600,
59448+ .proc_handler = &proc_dointvec,
59449+ },
59450+#endif
59451+#ifdef CONFIG_GRKERNSEC_AUDIT_GROUP
59452+ {
59453+ .procname = "audit_group",
59454+ .data = &grsec_enable_group,
59455+ .maxlen = sizeof(int),
59456+ .mode = 0600,
59457+ .proc_handler = &proc_dointvec,
59458+ },
59459+ {
59460+ .procname = "audit_gid",
59461+ .data = &grsec_audit_gid,
59462+ .maxlen = sizeof(int),
59463+ .mode = 0600,
59464+ .proc_handler = &proc_dointvec,
59465+ },
59466+#endif
59467+#ifdef CONFIG_GRKERNSEC_AUDIT_CHDIR
59468+ {
59469+ .procname = "audit_chdir",
59470+ .data = &grsec_enable_chdir,
59471+ .maxlen = sizeof(int),
59472+ .mode = 0600,
59473+ .proc_handler = &proc_dointvec,
59474+ },
59475+#endif
59476+#ifdef CONFIG_GRKERNSEC_AUDIT_MOUNT
59477+ {
59478+ .procname = "audit_mount",
59479+ .data = &grsec_enable_mount,
59480+ .maxlen = sizeof(int),
59481+ .mode = 0600,
59482+ .proc_handler = &proc_dointvec,
59483+ },
59484+#endif
59485+#ifdef CONFIG_GRKERNSEC_AUDIT_TEXTREL
59486+ {
59487+ .procname = "audit_textrel",
59488+ .data = &grsec_enable_audit_textrel,
59489+ .maxlen = sizeof(int),
59490+ .mode = 0600,
59491+ .proc_handler = &proc_dointvec,
59492+ },
59493+#endif
59494+#ifdef CONFIG_GRKERNSEC_DMESG
59495+ {
59496+ .procname = "dmesg",
59497+ .data = &grsec_enable_dmesg,
59498+ .maxlen = sizeof(int),
59499+ .mode = 0600,
59500+ .proc_handler = &proc_dointvec,
59501+ },
59502+#endif
59503+#ifdef CONFIG_GRKERNSEC_CHROOT_FINDTASK
59504+ {
59505+ .procname = "chroot_findtask",
59506+ .data = &grsec_enable_chroot_findtask,
59507+ .maxlen = sizeof(int),
59508+ .mode = 0600,
59509+ .proc_handler = &proc_dointvec,
59510+ },
59511+#endif
59512+#ifdef CONFIG_GRKERNSEC_RESLOG
59513+ {
59514+ .procname = "resource_logging",
59515+ .data = &grsec_resource_logging,
59516+ .maxlen = sizeof(int),
59517+ .mode = 0600,
59518+ .proc_handler = &proc_dointvec,
59519+ },
59520+#endif
59521+#ifdef CONFIG_GRKERNSEC_AUDIT_PTRACE
59522+ {
59523+ .procname = "audit_ptrace",
59524+ .data = &grsec_enable_audit_ptrace,
59525+ .maxlen = sizeof(int),
59526+ .mode = 0600,
59527+ .proc_handler = &proc_dointvec,
59528+ },
59529+#endif
59530+#ifdef CONFIG_GRKERNSEC_HARDEN_PTRACE
59531+ {
59532+ .procname = "harden_ptrace",
59533+ .data = &grsec_enable_harden_ptrace,
59534+ .maxlen = sizeof(int),
59535+ .mode = 0600,
59536+ .proc_handler = &proc_dointvec,
59537+ },
59538+#endif
59539+ {
59540+ .procname = "grsec_lock",
59541+ .data = &grsec_lock,
59542+ .maxlen = sizeof(int),
59543+ .mode = 0600,
59544+ .proc_handler = &proc_dointvec,
59545+ },
59546+#endif
59547+#ifdef CONFIG_GRKERNSEC_ROFS
59548+ {
59549+ .procname = "romount_protect",
59550+ .data = &grsec_enable_rofs,
59551+ .maxlen = sizeof(int),
59552+ .mode = 0600,
59553+ .proc_handler = &proc_dointvec_minmax,
59554+ .extra1 = &one,
59555+ .extra2 = &one,
59556+ },
59557+#endif
59558+ { }
59559+};
59560+#endif
59561diff --git a/grsecurity/grsec_time.c b/grsecurity/grsec_time.c
59562new file mode 100644
59563index 0000000..0dc13c3
59564--- /dev/null
59565+++ b/grsecurity/grsec_time.c
59566@@ -0,0 +1,16 @@
59567+#include <linux/kernel.h>
59568+#include <linux/sched.h>
59569+#include <linux/grinternal.h>
59570+#include <linux/module.h>
59571+
59572+void
59573+gr_log_timechange(void)
59574+{
59575+#ifdef CONFIG_GRKERNSEC_TIME
59576+ if (grsec_enable_time)
59577+ gr_log_noargs(GR_DONT_AUDIT_GOOD, GR_TIME_MSG);
59578+#endif
59579+ return;
59580+}
59581+
59582+EXPORT_SYMBOL(gr_log_timechange);
59583diff --git a/grsecurity/grsec_tpe.c b/grsecurity/grsec_tpe.c
59584new file mode 100644
59585index 0000000..07e0dc0
59586--- /dev/null
59587+++ b/grsecurity/grsec_tpe.c
59588@@ -0,0 +1,73 @@
59589+#include <linux/kernel.h>
59590+#include <linux/sched.h>
59591+#include <linux/file.h>
59592+#include <linux/fs.h>
59593+#include <linux/grinternal.h>
59594+
59595+extern int gr_acl_tpe_check(void);
59596+
59597+int
59598+gr_tpe_allow(const struct file *file)
59599+{
59600+#ifdef CONFIG_GRKERNSEC
59601+ struct inode *inode = file->f_path.dentry->d_parent->d_inode;
59602+ const struct cred *cred = current_cred();
59603+ char *msg = NULL;
59604+ char *msg2 = NULL;
59605+
59606+ // never restrict root
59607+ if (!cred->uid)
59608+ return 1;
59609+
59610+ if (grsec_enable_tpe) {
59611+#ifdef CONFIG_GRKERNSEC_TPE_INVERT
59612+ if (grsec_enable_tpe_invert && !in_group_p(grsec_tpe_gid))
59613+ msg = "not being in trusted group";
59614+ else if (!grsec_enable_tpe_invert && in_group_p(grsec_tpe_gid))
59615+ msg = "being in untrusted group";
59616+#else
59617+ if (in_group_p(grsec_tpe_gid))
59618+ msg = "being in untrusted group";
59619+#endif
59620+ }
59621+ if (!msg && gr_acl_tpe_check())
59622+ msg = "being in untrusted role";
59623+
59624+ // not in any affected group/role
59625+ if (!msg)
59626+ goto next_check;
59627+
59628+ if (inode->i_uid)
59629+ msg2 = "file in non-root-owned directory";
59630+ else if (inode->i_mode & S_IWOTH)
59631+ msg2 = "file in world-writable directory";
59632+ else if (inode->i_mode & S_IWGRP)
59633+ msg2 = "file in group-writable directory";
59634+
59635+ if (msg && msg2) {
59636+ char fullmsg[70] = {0};
59637+ snprintf(fullmsg, sizeof(fullmsg)-1, "%s and %s", msg, msg2);
59638+ gr_log_str_fs(GR_DONT_AUDIT, GR_EXEC_TPE_MSG, fullmsg, file->f_path.dentry, file->f_path.mnt);
59639+ return 0;
59640+ }
59641+ msg = NULL;
59642+next_check:
59643+#ifdef CONFIG_GRKERNSEC_TPE_ALL
59644+ if (!grsec_enable_tpe || !grsec_enable_tpe_all)
59645+ return 1;
59646+
59647+ if (inode->i_uid && (inode->i_uid != cred->uid))
59648+ msg = "directory not owned by user";
59649+ else if (inode->i_mode & S_IWOTH)
59650+ msg = "file in world-writable directory";
59651+ else if (inode->i_mode & S_IWGRP)
59652+ msg = "file in group-writable directory";
59653+
59654+ if (msg) {
59655+ gr_log_str_fs(GR_DONT_AUDIT, GR_EXEC_TPE_MSG, msg, file->f_path.dentry, file->f_path.mnt);
59656+ return 0;
59657+ }
59658+#endif
59659+#endif
59660+ return 1;
59661+}
59662diff --git a/grsecurity/grsum.c b/grsecurity/grsum.c
59663new file mode 100644
59664index 0000000..9f7b1ac
59665--- /dev/null
59666+++ b/grsecurity/grsum.c
59667@@ -0,0 +1,61 @@
59668+#include <linux/err.h>
59669+#include <linux/kernel.h>
59670+#include <linux/sched.h>
59671+#include <linux/mm.h>
59672+#include <linux/scatterlist.h>
59673+#include <linux/crypto.h>
59674+#include <linux/gracl.h>
59675+
59676+
59677+#if !defined(CONFIG_CRYPTO) || defined(CONFIG_CRYPTO_MODULE) || !defined(CONFIG_CRYPTO_SHA256) || defined(CONFIG_CRYPTO_SHA256_MODULE)
59678+#error "crypto and sha256 must be built into the kernel"
59679+#endif
59680+
59681+int
59682+chkpw(struct gr_arg *entry, unsigned char *salt, unsigned char *sum)
59683+{
59684+ char *p;
59685+ struct crypto_hash *tfm;
59686+ struct hash_desc desc;
59687+ struct scatterlist sg;
59688+ unsigned char temp_sum[GR_SHA_LEN];
59689+ volatile int retval = 0;
59690+ volatile int dummy = 0;
59691+ unsigned int i;
59692+
59693+ sg_init_table(&sg, 1);
59694+
59695+ tfm = crypto_alloc_hash("sha256", 0, CRYPTO_ALG_ASYNC);
59696+ if (IS_ERR(tfm)) {
59697+ /* should never happen, since sha256 should be built in */
59698+ return 1;
59699+ }
59700+
59701+ desc.tfm = tfm;
59702+ desc.flags = 0;
59703+
59704+ crypto_hash_init(&desc);
59705+
59706+ p = salt;
59707+ sg_set_buf(&sg, p, GR_SALT_LEN);
59708+ crypto_hash_update(&desc, &sg, sg.length);
59709+
59710+ p = entry->pw;
59711+ sg_set_buf(&sg, p, strlen(p));
59712+
59713+ crypto_hash_update(&desc, &sg, sg.length);
59714+
59715+ crypto_hash_final(&desc, temp_sum);
59716+
59717+ memset(entry->pw, 0, GR_PW_LEN);
59718+
59719+ for (i = 0; i < GR_SHA_LEN; i++)
59720+ if (sum[i] != temp_sum[i])
59721+ retval = 1;
59722+ else
59723+ dummy = 1; // waste a cycle
59724+
59725+ crypto_free_hash(tfm);
59726+
59727+ return retval;
59728+}
59729diff --git a/include/acpi/acpi_bus.h b/include/acpi/acpi_bus.h
59730index 6cd5b64..f620d2d 100644
59731--- a/include/acpi/acpi_bus.h
59732+++ b/include/acpi/acpi_bus.h
59733@@ -107,7 +107,7 @@ struct acpi_device_ops {
59734 acpi_op_bind bind;
59735 acpi_op_unbind unbind;
59736 acpi_op_notify notify;
59737-};
59738+} __no_const;
59739
59740 #define ACPI_DRIVER_ALL_NOTIFY_EVENTS 0x1 /* system AND device events */
59741
59742diff --git a/include/asm-generic/atomic-long.h b/include/asm-generic/atomic-long.h
59743index b7babf0..71e4e74 100644
59744--- a/include/asm-generic/atomic-long.h
59745+++ b/include/asm-generic/atomic-long.h
59746@@ -22,6 +22,12 @@
59747
59748 typedef atomic64_t atomic_long_t;
59749
59750+#ifdef CONFIG_PAX_REFCOUNT
59751+typedef atomic64_unchecked_t atomic_long_unchecked_t;
59752+#else
59753+typedef atomic64_t atomic_long_unchecked_t;
59754+#endif
59755+
59756 #define ATOMIC_LONG_INIT(i) ATOMIC64_INIT(i)
59757
59758 static inline long atomic_long_read(atomic_long_t *l)
59759@@ -31,6 +37,15 @@ static inline long atomic_long_read(atomic_long_t *l)
59760 return (long)atomic64_read(v);
59761 }
59762
59763+#ifdef CONFIG_PAX_REFCOUNT
59764+static inline long atomic_long_read_unchecked(atomic_long_unchecked_t *l)
59765+{
59766+ atomic64_unchecked_t *v = (atomic64_unchecked_t *)l;
59767+
59768+ return (long)atomic64_read_unchecked(v);
59769+}
59770+#endif
59771+
59772 static inline void atomic_long_set(atomic_long_t *l, long i)
59773 {
59774 atomic64_t *v = (atomic64_t *)l;
59775@@ -38,6 +53,15 @@ static inline void atomic_long_set(atomic_long_t *l, long i)
59776 atomic64_set(v, i);
59777 }
59778
59779+#ifdef CONFIG_PAX_REFCOUNT
59780+static inline void atomic_long_set_unchecked(atomic_long_unchecked_t *l, long i)
59781+{
59782+ atomic64_unchecked_t *v = (atomic64_unchecked_t *)l;
59783+
59784+ atomic64_set_unchecked(v, i);
59785+}
59786+#endif
59787+
59788 static inline void atomic_long_inc(atomic_long_t *l)
59789 {
59790 atomic64_t *v = (atomic64_t *)l;
59791@@ -45,6 +69,15 @@ static inline void atomic_long_inc(atomic_long_t *l)
59792 atomic64_inc(v);
59793 }
59794
59795+#ifdef CONFIG_PAX_REFCOUNT
59796+static inline void atomic_long_inc_unchecked(atomic_long_unchecked_t *l)
59797+{
59798+ atomic64_unchecked_t *v = (atomic64_unchecked_t *)l;
59799+
59800+ atomic64_inc_unchecked(v);
59801+}
59802+#endif
59803+
59804 static inline void atomic_long_dec(atomic_long_t *l)
59805 {
59806 atomic64_t *v = (atomic64_t *)l;
59807@@ -52,6 +85,15 @@ static inline void atomic_long_dec(atomic_long_t *l)
59808 atomic64_dec(v);
59809 }
59810
59811+#ifdef CONFIG_PAX_REFCOUNT
59812+static inline void atomic_long_dec_unchecked(atomic_long_unchecked_t *l)
59813+{
59814+ atomic64_unchecked_t *v = (atomic64_unchecked_t *)l;
59815+
59816+ atomic64_dec_unchecked(v);
59817+}
59818+#endif
59819+
59820 static inline void atomic_long_add(long i, atomic_long_t *l)
59821 {
59822 atomic64_t *v = (atomic64_t *)l;
59823@@ -59,6 +101,15 @@ static inline void atomic_long_add(long i, atomic_long_t *l)
59824 atomic64_add(i, v);
59825 }
59826
59827+#ifdef CONFIG_PAX_REFCOUNT
59828+static inline void atomic_long_add_unchecked(long i, atomic_long_unchecked_t *l)
59829+{
59830+ atomic64_unchecked_t *v = (atomic64_unchecked_t *)l;
59831+
59832+ atomic64_add_unchecked(i, v);
59833+}
59834+#endif
59835+
59836 static inline void atomic_long_sub(long i, atomic_long_t *l)
59837 {
59838 atomic64_t *v = (atomic64_t *)l;
59839@@ -66,6 +117,15 @@ static inline void atomic_long_sub(long i, atomic_long_t *l)
59840 atomic64_sub(i, v);
59841 }
59842
59843+#ifdef CONFIG_PAX_REFCOUNT
59844+static inline void atomic_long_sub_unchecked(long i, atomic_long_unchecked_t *l)
59845+{
59846+ atomic64_unchecked_t *v = (atomic64_unchecked_t *)l;
59847+
59848+ atomic64_sub_unchecked(i, v);
59849+}
59850+#endif
59851+
59852 static inline int atomic_long_sub_and_test(long i, atomic_long_t *l)
59853 {
59854 atomic64_t *v = (atomic64_t *)l;
59855@@ -115,6 +175,15 @@ static inline long atomic_long_inc_return(atomic_long_t *l)
59856 return (long)atomic64_inc_return(v);
59857 }
59858
59859+#ifdef CONFIG_PAX_REFCOUNT
59860+static inline long atomic_long_inc_return_unchecked(atomic_long_unchecked_t *l)
59861+{
59862+ atomic64_unchecked_t *v = (atomic64_unchecked_t *)l;
59863+
59864+ return (long)atomic64_inc_return_unchecked(v);
59865+}
59866+#endif
59867+
59868 static inline long atomic_long_dec_return(atomic_long_t *l)
59869 {
59870 atomic64_t *v = (atomic64_t *)l;
59871@@ -140,6 +209,12 @@ static inline long atomic_long_add_unless(atomic_long_t *l, long a, long u)
59872
59873 typedef atomic_t atomic_long_t;
59874
59875+#ifdef CONFIG_PAX_REFCOUNT
59876+typedef atomic_unchecked_t atomic_long_unchecked_t;
59877+#else
59878+typedef atomic_t atomic_long_unchecked_t;
59879+#endif
59880+
59881 #define ATOMIC_LONG_INIT(i) ATOMIC_INIT(i)
59882 static inline long atomic_long_read(atomic_long_t *l)
59883 {
59884@@ -148,6 +223,15 @@ static inline long atomic_long_read(atomic_long_t *l)
59885 return (long)atomic_read(v);
59886 }
59887
59888+#ifdef CONFIG_PAX_REFCOUNT
59889+static inline long atomic_long_read_unchecked(atomic_long_unchecked_t *l)
59890+{
59891+ atomic_unchecked_t *v = (atomic_unchecked_t *)l;
59892+
59893+ return (long)atomic_read_unchecked(v);
59894+}
59895+#endif
59896+
59897 static inline void atomic_long_set(atomic_long_t *l, long i)
59898 {
59899 atomic_t *v = (atomic_t *)l;
59900@@ -155,6 +239,15 @@ static inline void atomic_long_set(atomic_long_t *l, long i)
59901 atomic_set(v, i);
59902 }
59903
59904+#ifdef CONFIG_PAX_REFCOUNT
59905+static inline void atomic_long_set_unchecked(atomic_long_unchecked_t *l, long i)
59906+{
59907+ atomic_unchecked_t *v = (atomic_unchecked_t *)l;
59908+
59909+ atomic_set_unchecked(v, i);
59910+}
59911+#endif
59912+
59913 static inline void atomic_long_inc(atomic_long_t *l)
59914 {
59915 atomic_t *v = (atomic_t *)l;
59916@@ -162,6 +255,15 @@ static inline void atomic_long_inc(atomic_long_t *l)
59917 atomic_inc(v);
59918 }
59919
59920+#ifdef CONFIG_PAX_REFCOUNT
59921+static inline void atomic_long_inc_unchecked(atomic_long_unchecked_t *l)
59922+{
59923+ atomic_unchecked_t *v = (atomic_unchecked_t *)l;
59924+
59925+ atomic_inc_unchecked(v);
59926+}
59927+#endif
59928+
59929 static inline void atomic_long_dec(atomic_long_t *l)
59930 {
59931 atomic_t *v = (atomic_t *)l;
59932@@ -169,6 +271,15 @@ static inline void atomic_long_dec(atomic_long_t *l)
59933 atomic_dec(v);
59934 }
59935
59936+#ifdef CONFIG_PAX_REFCOUNT
59937+static inline void atomic_long_dec_unchecked(atomic_long_unchecked_t *l)
59938+{
59939+ atomic_unchecked_t *v = (atomic_unchecked_t *)l;
59940+
59941+ atomic_dec_unchecked(v);
59942+}
59943+#endif
59944+
59945 static inline void atomic_long_add(long i, atomic_long_t *l)
59946 {
59947 atomic_t *v = (atomic_t *)l;
59948@@ -176,6 +287,15 @@ static inline void atomic_long_add(long i, atomic_long_t *l)
59949 atomic_add(i, v);
59950 }
59951
59952+#ifdef CONFIG_PAX_REFCOUNT
59953+static inline void atomic_long_add_unchecked(long i, atomic_long_unchecked_t *l)
59954+{
59955+ atomic_unchecked_t *v = (atomic_unchecked_t *)l;
59956+
59957+ atomic_add_unchecked(i, v);
59958+}
59959+#endif
59960+
59961 static inline void atomic_long_sub(long i, atomic_long_t *l)
59962 {
59963 atomic_t *v = (atomic_t *)l;
59964@@ -183,6 +303,15 @@ static inline void atomic_long_sub(long i, atomic_long_t *l)
59965 atomic_sub(i, v);
59966 }
59967
59968+#ifdef CONFIG_PAX_REFCOUNT
59969+static inline void atomic_long_sub_unchecked(long i, atomic_long_unchecked_t *l)
59970+{
59971+ atomic_unchecked_t *v = (atomic_unchecked_t *)l;
59972+
59973+ atomic_sub_unchecked(i, v);
59974+}
59975+#endif
59976+
59977 static inline int atomic_long_sub_and_test(long i, atomic_long_t *l)
59978 {
59979 atomic_t *v = (atomic_t *)l;
59980@@ -232,6 +361,15 @@ static inline long atomic_long_inc_return(atomic_long_t *l)
59981 return (long)atomic_inc_return(v);
59982 }
59983
59984+#ifdef CONFIG_PAX_REFCOUNT
59985+static inline long atomic_long_inc_return_unchecked(atomic_long_unchecked_t *l)
59986+{
59987+ atomic_unchecked_t *v = (atomic_unchecked_t *)l;
59988+
59989+ return (long)atomic_inc_return_unchecked(v);
59990+}
59991+#endif
59992+
59993 static inline long atomic_long_dec_return(atomic_long_t *l)
59994 {
59995 atomic_t *v = (atomic_t *)l;
59996@@ -255,4 +393,49 @@ static inline long atomic_long_add_unless(atomic_long_t *l, long a, long u)
59997
59998 #endif /* BITS_PER_LONG == 64 */
59999
60000+#ifdef CONFIG_PAX_REFCOUNT
60001+static inline void pax_refcount_needs_these_functions(void)
60002+{
60003+ atomic_read_unchecked((atomic_unchecked_t *)NULL);
60004+ atomic_set_unchecked((atomic_unchecked_t *)NULL, 0);
60005+ atomic_add_unchecked(0, (atomic_unchecked_t *)NULL);
60006+ atomic_sub_unchecked(0, (atomic_unchecked_t *)NULL);
60007+ atomic_inc_unchecked((atomic_unchecked_t *)NULL);
60008+ (void)atomic_inc_and_test_unchecked((atomic_unchecked_t *)NULL);
60009+ atomic_inc_return_unchecked((atomic_unchecked_t *)NULL);
60010+ atomic_add_return_unchecked(0, (atomic_unchecked_t *)NULL);
60011+ atomic_dec_unchecked((atomic_unchecked_t *)NULL);
60012+ atomic_cmpxchg_unchecked((atomic_unchecked_t *)NULL, 0, 0);
60013+ (void)atomic_xchg_unchecked((atomic_unchecked_t *)NULL, 0);
60014+
60015+ atomic_long_read_unchecked((atomic_long_unchecked_t *)NULL);
60016+ atomic_long_set_unchecked((atomic_long_unchecked_t *)NULL, 0);
60017+ atomic_long_add_unchecked(0, (atomic_long_unchecked_t *)NULL);
60018+ atomic_long_sub_unchecked(0, (atomic_long_unchecked_t *)NULL);
60019+ atomic_long_inc_unchecked((atomic_long_unchecked_t *)NULL);
60020+ atomic_long_inc_return_unchecked((atomic_long_unchecked_t *)NULL);
60021+ atomic_long_dec_unchecked((atomic_long_unchecked_t *)NULL);
60022+}
60023+#else
60024+#define atomic_read_unchecked(v) atomic_read(v)
60025+#define atomic_set_unchecked(v, i) atomic_set((v), (i))
60026+#define atomic_add_unchecked(i, v) atomic_add((i), (v))
60027+#define atomic_sub_unchecked(i, v) atomic_sub((i), (v))
60028+#define atomic_inc_unchecked(v) atomic_inc(v)
60029+#define atomic_inc_and_test_unchecked(v) atomic_inc_and_test(v)
60030+#define atomic_inc_return_unchecked(v) atomic_inc_return(v)
60031+#define atomic_add_return_unchecked(i, v) atomic_add_return((i), (v))
60032+#define atomic_dec_unchecked(v) atomic_dec(v)
60033+#define atomic_cmpxchg_unchecked(v, o, n) atomic_cmpxchg((v), (o), (n))
60034+#define atomic_xchg_unchecked(v, i) atomic_xchg((v), (i))
60035+
60036+#define atomic_long_read_unchecked(v) atomic_long_read(v)
60037+#define atomic_long_set_unchecked(v, i) atomic_long_set((v), (i))
60038+#define atomic_long_add_unchecked(i, v) atomic_long_add((i), (v))
60039+#define atomic_long_sub_unchecked(i, v) atomic_long_sub((i), (v))
60040+#define atomic_long_inc_unchecked(v) atomic_long_inc(v)
60041+#define atomic_long_inc_return_unchecked(v) atomic_long_inc_return(v)
60042+#define atomic_long_dec_unchecked(v) atomic_long_dec(v)
60043+#endif
60044+
60045 #endif /* _ASM_GENERIC_ATOMIC_LONG_H */
60046diff --git a/include/asm-generic/atomic64.h b/include/asm-generic/atomic64.h
60047index b18ce4f..2ee2843 100644
60048--- a/include/asm-generic/atomic64.h
60049+++ b/include/asm-generic/atomic64.h
60050@@ -16,6 +16,8 @@ typedef struct {
60051 long long counter;
60052 } atomic64_t;
60053
60054+typedef atomic64_t atomic64_unchecked_t;
60055+
60056 #define ATOMIC64_INIT(i) { (i) }
60057
60058 extern long long atomic64_read(const atomic64_t *v);
60059@@ -39,4 +41,14 @@ extern int atomic64_add_unless(atomic64_t *v, long long a, long long u);
60060 #define atomic64_dec_and_test(v) (atomic64_dec_return((v)) == 0)
60061 #define atomic64_inc_not_zero(v) atomic64_add_unless((v), 1LL, 0LL)
60062
60063+#define atomic64_read_unchecked(v) atomic64_read(v)
60064+#define atomic64_set_unchecked(v, i) atomic64_set((v), (i))
60065+#define atomic64_add_unchecked(a, v) atomic64_add((a), (v))
60066+#define atomic64_add_return_unchecked(a, v) atomic64_add_return((a), (v))
60067+#define atomic64_sub_unchecked(a, v) atomic64_sub((a), (v))
60068+#define atomic64_inc_unchecked(v) atomic64_inc(v)
60069+#define atomic64_inc_return_unchecked(v) atomic64_inc_return(v)
60070+#define atomic64_dec_unchecked(v) atomic64_dec(v)
60071+#define atomic64_cmpxchg_unchecked(v, o, n) atomic64_cmpxchg((v), (o), (n))
60072+
60073 #endif /* _ASM_GENERIC_ATOMIC64_H */
60074diff --git a/include/asm-generic/cache.h b/include/asm-generic/cache.h
60075index 1bfcfe5..e04c5c9 100644
60076--- a/include/asm-generic/cache.h
60077+++ b/include/asm-generic/cache.h
60078@@ -6,7 +6,7 @@
60079 * cache lines need to provide their own cache.h.
60080 */
60081
60082-#define L1_CACHE_SHIFT 5
60083-#define L1_CACHE_BYTES (1 << L1_CACHE_SHIFT)
60084+#define L1_CACHE_SHIFT 5UL
60085+#define L1_CACHE_BYTES (1UL << L1_CACHE_SHIFT)
60086
60087 #endif /* __ASM_GENERIC_CACHE_H */
60088diff --git a/include/asm-generic/emergency-restart.h b/include/asm-generic/emergency-restart.h
60089index 0d68a1e..b74a761 100644
60090--- a/include/asm-generic/emergency-restart.h
60091+++ b/include/asm-generic/emergency-restart.h
60092@@ -1,7 +1,7 @@
60093 #ifndef _ASM_GENERIC_EMERGENCY_RESTART_H
60094 #define _ASM_GENERIC_EMERGENCY_RESTART_H
60095
60096-static inline void machine_emergency_restart(void)
60097+static inline __noreturn void machine_emergency_restart(void)
60098 {
60099 machine_restart(NULL);
60100 }
60101diff --git a/include/asm-generic/kmap_types.h b/include/asm-generic/kmap_types.h
60102index 0232ccb..13d9165 100644
60103--- a/include/asm-generic/kmap_types.h
60104+++ b/include/asm-generic/kmap_types.h
60105@@ -29,10 +29,11 @@ KMAP_D(16) KM_IRQ_PTE,
60106 KMAP_D(17) KM_NMI,
60107 KMAP_D(18) KM_NMI_PTE,
60108 KMAP_D(19) KM_KDB,
60109+KMAP_D(20) KM_CLEARPAGE,
60110 /*
60111 * Remember to update debug_kmap_atomic() when adding new kmap types!
60112 */
60113-KMAP_D(20) KM_TYPE_NR
60114+KMAP_D(21) KM_TYPE_NR
60115 };
60116
60117 #undef KMAP_D
60118diff --git a/include/asm-generic/local.h b/include/asm-generic/local.h
60119index 9ceb03b..2efbcbd 100644
60120--- a/include/asm-generic/local.h
60121+++ b/include/asm-generic/local.h
60122@@ -39,6 +39,7 @@ typedef struct
60123 #define local_add_return(i, l) atomic_long_add_return((i), (&(l)->a))
60124 #define local_sub_return(i, l) atomic_long_sub_return((i), (&(l)->a))
60125 #define local_inc_return(l) atomic_long_inc_return(&(l)->a)
60126+#define local_dec_return(l) atomic_long_dec_return(&(l)->a)
60127
60128 #define local_cmpxchg(l, o, n) atomic_long_cmpxchg((&(l)->a), (o), (n))
60129 #define local_xchg(l, n) atomic_long_xchg((&(l)->a), (n))
60130diff --git a/include/asm-generic/pgtable-nopmd.h b/include/asm-generic/pgtable-nopmd.h
60131index 725612b..9cc513a 100644
60132--- a/include/asm-generic/pgtable-nopmd.h
60133+++ b/include/asm-generic/pgtable-nopmd.h
60134@@ -1,14 +1,19 @@
60135 #ifndef _PGTABLE_NOPMD_H
60136 #define _PGTABLE_NOPMD_H
60137
60138-#ifndef __ASSEMBLY__
60139-
60140 #include <asm-generic/pgtable-nopud.h>
60141
60142-struct mm_struct;
60143-
60144 #define __PAGETABLE_PMD_FOLDED
60145
60146+#define PMD_SHIFT PUD_SHIFT
60147+#define PTRS_PER_PMD 1
60148+#define PMD_SIZE (_AC(1,UL) << PMD_SHIFT)
60149+#define PMD_MASK (~(PMD_SIZE-1))
60150+
60151+#ifndef __ASSEMBLY__
60152+
60153+struct mm_struct;
60154+
60155 /*
60156 * Having the pmd type consist of a pud gets the size right, and allows
60157 * us to conceptually access the pud entry that this pmd is folded into
60158@@ -16,11 +21,6 @@ struct mm_struct;
60159 */
60160 typedef struct { pud_t pud; } pmd_t;
60161
60162-#define PMD_SHIFT PUD_SHIFT
60163-#define PTRS_PER_PMD 1
60164-#define PMD_SIZE (1UL << PMD_SHIFT)
60165-#define PMD_MASK (~(PMD_SIZE-1))
60166-
60167 /*
60168 * The "pud_xxx()" functions here are trivial for a folded two-level
60169 * setup: the pmd is never bad, and a pmd always exists (as it's folded
60170diff --git a/include/asm-generic/pgtable-nopud.h b/include/asm-generic/pgtable-nopud.h
60171index 810431d..ccc3638 100644
60172--- a/include/asm-generic/pgtable-nopud.h
60173+++ b/include/asm-generic/pgtable-nopud.h
60174@@ -1,10 +1,15 @@
60175 #ifndef _PGTABLE_NOPUD_H
60176 #define _PGTABLE_NOPUD_H
60177
60178-#ifndef __ASSEMBLY__
60179-
60180 #define __PAGETABLE_PUD_FOLDED
60181
60182+#define PUD_SHIFT PGDIR_SHIFT
60183+#define PTRS_PER_PUD 1
60184+#define PUD_SIZE (_AC(1,UL) << PUD_SHIFT)
60185+#define PUD_MASK (~(PUD_SIZE-1))
60186+
60187+#ifndef __ASSEMBLY__
60188+
60189 /*
60190 * Having the pud type consist of a pgd gets the size right, and allows
60191 * us to conceptually access the pgd entry that this pud is folded into
60192@@ -12,11 +17,6 @@
60193 */
60194 typedef struct { pgd_t pgd; } pud_t;
60195
60196-#define PUD_SHIFT PGDIR_SHIFT
60197-#define PTRS_PER_PUD 1
60198-#define PUD_SIZE (1UL << PUD_SHIFT)
60199-#define PUD_MASK (~(PUD_SIZE-1))
60200-
60201 /*
60202 * The "pgd_xxx()" functions here are trivial for a folded two-level
60203 * setup: the pud is never bad, and a pud always exists (as it's folded
60204diff --git a/include/asm-generic/pgtable.h b/include/asm-generic/pgtable.h
60205index 76bff2b..c7a14e2 100644
60206--- a/include/asm-generic/pgtable.h
60207+++ b/include/asm-generic/pgtable.h
60208@@ -443,6 +443,14 @@ static inline int pmd_write(pmd_t pmd)
60209 #endif /* __HAVE_ARCH_PMD_WRITE */
60210 #endif
60211
60212+#ifndef __HAVE_ARCH_PAX_OPEN_KERNEL
60213+static inline unsigned long pax_open_kernel(void) { return 0; }
60214+#endif
60215+
60216+#ifndef __HAVE_ARCH_PAX_CLOSE_KERNEL
60217+static inline unsigned long pax_close_kernel(void) { return 0; }
60218+#endif
60219+
60220 #endif /* !__ASSEMBLY__ */
60221
60222 #endif /* _ASM_GENERIC_PGTABLE_H */
60223diff --git a/include/asm-generic/uaccess.h b/include/asm-generic/uaccess.h
60224index ac68c99..90d3439 100644
60225--- a/include/asm-generic/uaccess.h
60226+++ b/include/asm-generic/uaccess.h
60227@@ -76,6 +76,8 @@ extern unsigned long search_exception_table(unsigned long);
60228 */
60229 #ifndef __copy_from_user
60230 static inline __must_check long __copy_from_user(void *to,
60231+ const void __user * from, unsigned long n) __size_overflow(3);
60232+static inline __must_check long __copy_from_user(void *to,
60233 const void __user * from, unsigned long n)
60234 {
60235 if (__builtin_constant_p(n)) {
60236@@ -106,6 +108,8 @@ static inline __must_check long __copy_from_user(void *to,
60237
60238 #ifndef __copy_to_user
60239 static inline __must_check long __copy_to_user(void __user *to,
60240+ const void *from, unsigned long n) __size_overflow(3);
60241+static inline __must_check long __copy_to_user(void __user *to,
60242 const void *from, unsigned long n)
60243 {
60244 if (__builtin_constant_p(n)) {
60245@@ -224,6 +228,7 @@ extern int __put_user_bad(void) __attribute__((noreturn));
60246 -EFAULT; \
60247 })
60248
60249+static inline int __get_user_fn(size_t size, const void __user *ptr, void *x) __size_overflow(1);
60250 static inline int __get_user_fn(size_t size, const void __user *ptr, void *x)
60251 {
60252 size = __copy_from_user(x, ptr, size);
60253@@ -240,6 +245,7 @@ extern int __get_user_bad(void) __attribute__((noreturn));
60254 #define __copy_to_user_inatomic __copy_to_user
60255 #endif
60256
60257+static inline long copy_from_user(void *to, const void __user * from, unsigned long n) __size_overflow(3);
60258 static inline long copy_from_user(void *to,
60259 const void __user * from, unsigned long n)
60260 {
60261@@ -250,6 +256,7 @@ static inline long copy_from_user(void *to,
60262 return n;
60263 }
60264
60265+static inline long copy_to_user(void __user *to, const void *from, unsigned long n) __size_overflow(3);
60266 static inline long copy_to_user(void __user *to,
60267 const void *from, unsigned long n)
60268 {
60269@@ -309,6 +316,8 @@ static inline long strlen_user(const char __user *src)
60270 */
60271 #ifndef __clear_user
60272 static inline __must_check unsigned long
60273+__clear_user(void __user *to, unsigned long n) __size_overflow(2);
60274+static inline __must_check unsigned long
60275 __clear_user(void __user *to, unsigned long n)
60276 {
60277 memset((void __force *)to, 0, n);
60278@@ -317,6 +326,8 @@ __clear_user(void __user *to, unsigned long n)
60279 #endif
60280
60281 static inline __must_check unsigned long
60282+clear_user(void __user *to, unsigned long n) __size_overflow(2);
60283+static inline __must_check unsigned long
60284 clear_user(void __user *to, unsigned long n)
60285 {
60286 might_sleep();
60287diff --git a/include/asm-generic/vmlinux.lds.h b/include/asm-generic/vmlinux.lds.h
60288index b5e2e4c..6a5373e 100644
60289--- a/include/asm-generic/vmlinux.lds.h
60290+++ b/include/asm-generic/vmlinux.lds.h
60291@@ -217,6 +217,7 @@
60292 .rodata : AT(ADDR(.rodata) - LOAD_OFFSET) { \
60293 VMLINUX_SYMBOL(__start_rodata) = .; \
60294 *(.rodata) *(.rodata.*) \
60295+ *(.data..read_only) \
60296 *(__vermagic) /* Kernel version magic */ \
60297 . = ALIGN(8); \
60298 VMLINUX_SYMBOL(__start___tracepoints_ptrs) = .; \
60299@@ -722,17 +723,18 @@
60300 * section in the linker script will go there too. @phdr should have
60301 * a leading colon.
60302 *
60303- * Note that this macros defines __per_cpu_load as an absolute symbol.
60304+ * Note that this macros defines per_cpu_load as an absolute symbol.
60305 * If there is no need to put the percpu section at a predetermined
60306 * address, use PERCPU_SECTION.
60307 */
60308 #define PERCPU_VADDR(cacheline, vaddr, phdr) \
60309- VMLINUX_SYMBOL(__per_cpu_load) = .; \
60310- .data..percpu vaddr : AT(VMLINUX_SYMBOL(__per_cpu_load) \
60311+ per_cpu_load = .; \
60312+ .data..percpu vaddr : AT(VMLINUX_SYMBOL(per_cpu_load) \
60313 - LOAD_OFFSET) { \
60314+ VMLINUX_SYMBOL(__per_cpu_load) = . + per_cpu_load; \
60315 PERCPU_INPUT(cacheline) \
60316 } phdr \
60317- . = VMLINUX_SYMBOL(__per_cpu_load) + SIZEOF(.data..percpu);
60318+ . = VMLINUX_SYMBOL(per_cpu_load) + SIZEOF(.data..percpu);
60319
60320 /**
60321 * PERCPU_SECTION - define output section for percpu area, simple version
60322diff --git a/include/drm/drmP.h b/include/drm/drmP.h
60323index bf4b2dc..2d0762f 100644
60324--- a/include/drm/drmP.h
60325+++ b/include/drm/drmP.h
60326@@ -72,6 +72,7 @@
60327 #include <linux/workqueue.h>
60328 #include <linux/poll.h>
60329 #include <asm/pgalloc.h>
60330+#include <asm/local.h>
60331 #include "drm.h"
60332
60333 #include <linux/idr.h>
60334@@ -1038,7 +1039,7 @@ struct drm_device {
60335
60336 /** \name Usage Counters */
60337 /*@{ */
60338- int open_count; /**< Outstanding files open */
60339+ local_t open_count; /**< Outstanding files open */
60340 atomic_t ioctl_count; /**< Outstanding IOCTLs pending */
60341 atomic_t vma_count; /**< Outstanding vma areas open */
60342 int buf_use; /**< Buffers in use -- cannot alloc */
60343@@ -1049,7 +1050,7 @@ struct drm_device {
60344 /*@{ */
60345 unsigned long counters;
60346 enum drm_stat_type types[15];
60347- atomic_t counts[15];
60348+ atomic_unchecked_t counts[15];
60349 /*@} */
60350
60351 struct list_head filelist;
60352diff --git a/include/drm/drm_crtc_helper.h b/include/drm/drm_crtc_helper.h
60353index 73b0712..0b7ef2f 100644
60354--- a/include/drm/drm_crtc_helper.h
60355+++ b/include/drm/drm_crtc_helper.h
60356@@ -74,7 +74,7 @@ struct drm_crtc_helper_funcs {
60357
60358 /* disable crtc when not in use - more explicit than dpms off */
60359 void (*disable)(struct drm_crtc *crtc);
60360-};
60361+} __no_const;
60362
60363 struct drm_encoder_helper_funcs {
60364 void (*dpms)(struct drm_encoder *encoder, int mode);
60365@@ -95,7 +95,7 @@ struct drm_encoder_helper_funcs {
60366 struct drm_connector *connector);
60367 /* disable encoder when not in use - more explicit than dpms off */
60368 void (*disable)(struct drm_encoder *encoder);
60369-};
60370+} __no_const;
60371
60372 struct drm_connector_helper_funcs {
60373 int (*get_modes)(struct drm_connector *connector);
60374diff --git a/include/drm/ttm/ttm_memory.h b/include/drm/ttm/ttm_memory.h
60375index 26c1f78..6722682 100644
60376--- a/include/drm/ttm/ttm_memory.h
60377+++ b/include/drm/ttm/ttm_memory.h
60378@@ -47,7 +47,7 @@
60379
60380 struct ttm_mem_shrink {
60381 int (*do_shrink) (struct ttm_mem_shrink *);
60382-};
60383+} __no_const;
60384
60385 /**
60386 * struct ttm_mem_global - Global memory accounting structure.
60387diff --git a/include/linux/a.out.h b/include/linux/a.out.h
60388index e86dfca..40cc55f 100644
60389--- a/include/linux/a.out.h
60390+++ b/include/linux/a.out.h
60391@@ -39,6 +39,14 @@ enum machine_type {
60392 M_MIPS2 = 152 /* MIPS R6000/R4000 binary */
60393 };
60394
60395+/* Constants for the N_FLAGS field */
60396+#define F_PAX_PAGEEXEC 1 /* Paging based non-executable pages */
60397+#define F_PAX_EMUTRAMP 2 /* Emulate trampolines */
60398+#define F_PAX_MPROTECT 4 /* Restrict mprotect() */
60399+#define F_PAX_RANDMMAP 8 /* Randomize mmap() base */
60400+/*#define F_PAX_RANDEXEC 16*/ /* Randomize ET_EXEC base */
60401+#define F_PAX_SEGMEXEC 32 /* Segmentation based non-executable pages */
60402+
60403 #if !defined (N_MAGIC)
60404 #define N_MAGIC(exec) ((exec).a_info & 0xffff)
60405 #endif
60406diff --git a/include/linux/atmdev.h b/include/linux/atmdev.h
60407index 49a83ca..df96b54 100644
60408--- a/include/linux/atmdev.h
60409+++ b/include/linux/atmdev.h
60410@@ -237,7 +237,7 @@ struct compat_atm_iobuf {
60411 #endif
60412
60413 struct k_atm_aal_stats {
60414-#define __HANDLE_ITEM(i) atomic_t i
60415+#define __HANDLE_ITEM(i) atomic_unchecked_t i
60416 __AAL_STAT_ITEMS
60417 #undef __HANDLE_ITEM
60418 };
60419diff --git a/include/linux/binfmts.h b/include/linux/binfmts.h
60420index fd88a39..8a801b4 100644
60421--- a/include/linux/binfmts.h
60422+++ b/include/linux/binfmts.h
60423@@ -18,7 +18,7 @@ struct pt_regs;
60424 #define BINPRM_BUF_SIZE 128
60425
60426 #ifdef __KERNEL__
60427-#include <linux/list.h>
60428+#include <linux/sched.h>
60429
60430 #define CORENAME_MAX_SIZE 128
60431
60432@@ -58,6 +58,7 @@ struct linux_binprm {
60433 unsigned interp_flags;
60434 unsigned interp_data;
60435 unsigned long loader, exec;
60436+ char tcomm[TASK_COMM_LEN];
60437 };
60438
60439 #define BINPRM_FLAGS_ENFORCE_NONDUMP_BIT 0
60440@@ -88,6 +89,7 @@ struct linux_binfmt {
60441 int (*load_binary)(struct linux_binprm *, struct pt_regs * regs);
60442 int (*load_shlib)(struct file *);
60443 int (*core_dump)(struct coredump_params *cprm);
60444+ void (*handle_mprotect)(struct vm_area_struct *vma, unsigned long newflags);
60445 unsigned long min_coredump; /* minimal dump size */
60446 };
60447
60448diff --git a/include/linux/blkdev.h b/include/linux/blkdev.h
60449index 0ed1eb0..3ab569b 100644
60450--- a/include/linux/blkdev.h
60451+++ b/include/linux/blkdev.h
60452@@ -1315,7 +1315,7 @@ struct block_device_operations {
60453 /* this callback is with swap_lock and sometimes page table lock held */
60454 void (*swap_slot_free_notify) (struct block_device *, unsigned long);
60455 struct module *owner;
60456-};
60457+} __do_const;
60458
60459 extern int __blkdev_driver_ioctl(struct block_device *, fmode_t, unsigned int,
60460 unsigned long);
60461diff --git a/include/linux/blktrace_api.h b/include/linux/blktrace_api.h
60462index 4d1a074..88f929a 100644
60463--- a/include/linux/blktrace_api.h
60464+++ b/include/linux/blktrace_api.h
60465@@ -162,7 +162,7 @@ struct blk_trace {
60466 struct dentry *dir;
60467 struct dentry *dropped_file;
60468 struct dentry *msg_file;
60469- atomic_t dropped;
60470+ atomic_unchecked_t dropped;
60471 };
60472
60473 extern int blk_trace_ioctl(struct block_device *, unsigned, char __user *);
60474diff --git a/include/linux/byteorder/little_endian.h b/include/linux/byteorder/little_endian.h
60475index 83195fb..0b0f77d 100644
60476--- a/include/linux/byteorder/little_endian.h
60477+++ b/include/linux/byteorder/little_endian.h
60478@@ -42,51 +42,51 @@
60479
60480 static inline __le64 __cpu_to_le64p(const __u64 *p)
60481 {
60482- return (__force __le64)*p;
60483+ return (__force const __le64)*p;
60484 }
60485 static inline __u64 __le64_to_cpup(const __le64 *p)
60486 {
60487- return (__force __u64)*p;
60488+ return (__force const __u64)*p;
60489 }
60490 static inline __le32 __cpu_to_le32p(const __u32 *p)
60491 {
60492- return (__force __le32)*p;
60493+ return (__force const __le32)*p;
60494 }
60495 static inline __u32 __le32_to_cpup(const __le32 *p)
60496 {
60497- return (__force __u32)*p;
60498+ return (__force const __u32)*p;
60499 }
60500 static inline __le16 __cpu_to_le16p(const __u16 *p)
60501 {
60502- return (__force __le16)*p;
60503+ return (__force const __le16)*p;
60504 }
60505 static inline __u16 __le16_to_cpup(const __le16 *p)
60506 {
60507- return (__force __u16)*p;
60508+ return (__force const __u16)*p;
60509 }
60510 static inline __be64 __cpu_to_be64p(const __u64 *p)
60511 {
60512- return (__force __be64)__swab64p(p);
60513+ return (__force const __be64)__swab64p(p);
60514 }
60515 static inline __u64 __be64_to_cpup(const __be64 *p)
60516 {
60517- return __swab64p((__u64 *)p);
60518+ return __swab64p((const __u64 *)p);
60519 }
60520 static inline __be32 __cpu_to_be32p(const __u32 *p)
60521 {
60522- return (__force __be32)__swab32p(p);
60523+ return (__force const __be32)__swab32p(p);
60524 }
60525 static inline __u32 __be32_to_cpup(const __be32 *p)
60526 {
60527- return __swab32p((__u32 *)p);
60528+ return __swab32p((const __u32 *)p);
60529 }
60530 static inline __be16 __cpu_to_be16p(const __u16 *p)
60531 {
60532- return (__force __be16)__swab16p(p);
60533+ return (__force const __be16)__swab16p(p);
60534 }
60535 static inline __u16 __be16_to_cpup(const __be16 *p)
60536 {
60537- return __swab16p((__u16 *)p);
60538+ return __swab16p((const __u16 *)p);
60539 }
60540 #define __cpu_to_le64s(x) do { (void)(x); } while (0)
60541 #define __le64_to_cpus(x) do { (void)(x); } while (0)
60542diff --git a/include/linux/cache.h b/include/linux/cache.h
60543index 4c57065..4307975 100644
60544--- a/include/linux/cache.h
60545+++ b/include/linux/cache.h
60546@@ -16,6 +16,10 @@
60547 #define __read_mostly
60548 #endif
60549
60550+#ifndef __read_only
60551+#define __read_only __read_mostly
60552+#endif
60553+
60554 #ifndef ____cacheline_aligned
60555 #define ____cacheline_aligned __attribute__((__aligned__(SMP_CACHE_BYTES)))
60556 #endif
60557diff --git a/include/linux/capability.h b/include/linux/capability.h
60558index a63d13d..069bfd5 100644
60559--- a/include/linux/capability.h
60560+++ b/include/linux/capability.h
60561@@ -548,6 +548,9 @@ extern bool capable(int cap);
60562 extern bool ns_capable(struct user_namespace *ns, int cap);
60563 extern bool task_ns_capable(struct task_struct *t, int cap);
60564 extern bool nsown_capable(int cap);
60565+extern bool task_ns_capable_nolog(struct task_struct *t, int cap);
60566+extern bool ns_capable_nolog(struct user_namespace *ns, int cap);
60567+extern bool capable_nolog(int cap);
60568
60569 /* audit system wants to get cap info from files as well */
60570 extern int get_vfs_caps_from_disk(const struct dentry *dentry, struct cpu_vfs_cap_data *cpu_caps);
60571diff --git a/include/linux/cleancache.h b/include/linux/cleancache.h
60572index 04ffb2e..6799180 100644
60573--- a/include/linux/cleancache.h
60574+++ b/include/linux/cleancache.h
60575@@ -31,7 +31,7 @@ struct cleancache_ops {
60576 void (*flush_page)(int, struct cleancache_filekey, pgoff_t);
60577 void (*flush_inode)(int, struct cleancache_filekey);
60578 void (*flush_fs)(int);
60579-};
60580+} __no_const;
60581
60582 extern struct cleancache_ops
60583 cleancache_register_ops(struct cleancache_ops *ops);
60584diff --git a/include/linux/compiler-gcc4.h b/include/linux/compiler-gcc4.h
60585index dfadc96..d90deca 100644
60586--- a/include/linux/compiler-gcc4.h
60587+++ b/include/linux/compiler-gcc4.h
60588@@ -31,6 +31,15 @@
60589
60590
60591 #if __GNUC_MINOR__ >= 5
60592+
60593+#ifdef CONSTIFY_PLUGIN
60594+#define __no_const __attribute__((no_const))
60595+#define __do_const __attribute__((do_const))
60596+#endif
60597+
60598+#ifdef SIZE_OVERFLOW_PLUGIN
60599+#define __size_overflow(...) __attribute__((size_overflow(__VA_ARGS__)))
60600+#endif
60601 /*
60602 * Mark a position in code as unreachable. This can be used to
60603 * suppress control flow warnings after asm blocks that transfer
60604@@ -46,6 +55,11 @@
60605 #define __noclone __attribute__((__noclone__))
60606
60607 #endif
60608+
60609+#define __alloc_size(...) __attribute((alloc_size(__VA_ARGS__)))
60610+#define __bos(ptr, arg) __builtin_object_size((ptr), (arg))
60611+#define __bos0(ptr) __bos((ptr), 0)
60612+#define __bos1(ptr) __bos((ptr), 1)
60613 #endif
60614
60615 #if __GNUC_MINOR__ > 0
60616diff --git a/include/linux/compiler.h b/include/linux/compiler.h
60617index 320d6c9..1221a6b 100644
60618--- a/include/linux/compiler.h
60619+++ b/include/linux/compiler.h
60620@@ -5,31 +5,62 @@
60621
60622 #ifdef __CHECKER__
60623 # define __user __attribute__((noderef, address_space(1)))
60624+# define __force_user __force __user
60625 # define __kernel __attribute__((address_space(0)))
60626+# define __force_kernel __force __kernel
60627 # define __safe __attribute__((safe))
60628 # define __force __attribute__((force))
60629 # define __nocast __attribute__((nocast))
60630 # define __iomem __attribute__((noderef, address_space(2)))
60631+# define __force_iomem __force __iomem
60632 # define __acquires(x) __attribute__((context(x,0,1)))
60633 # define __releases(x) __attribute__((context(x,1,0)))
60634 # define __acquire(x) __context__(x,1)
60635 # define __release(x) __context__(x,-1)
60636 # define __cond_lock(x,c) ((c) ? ({ __acquire(x); 1; }) : 0)
60637 # define __percpu __attribute__((noderef, address_space(3)))
60638+# define __force_percpu __force __percpu
60639 #ifdef CONFIG_SPARSE_RCU_POINTER
60640 # define __rcu __attribute__((noderef, address_space(4)))
60641+# define __force_rcu __force __rcu
60642 #else
60643 # define __rcu
60644+# define __force_rcu
60645 #endif
60646 extern void __chk_user_ptr(const volatile void __user *);
60647 extern void __chk_io_ptr(const volatile void __iomem *);
60648+#elif defined(CHECKER_PLUGIN)
60649+//# define __user
60650+//# define __force_user
60651+//# define __kernel
60652+//# define __force_kernel
60653+# define __safe
60654+# define __force
60655+# define __nocast
60656+# define __iomem
60657+# define __force_iomem
60658+# define __chk_user_ptr(x) (void)0
60659+# define __chk_io_ptr(x) (void)0
60660+# define __builtin_warning(x, y...) (1)
60661+# define __acquires(x)
60662+# define __releases(x)
60663+# define __acquire(x) (void)0
60664+# define __release(x) (void)0
60665+# define __cond_lock(x,c) (c)
60666+# define __percpu
60667+# define __force_percpu
60668+# define __rcu
60669+# define __force_rcu
60670 #else
60671 # define __user
60672+# define __force_user
60673 # define __kernel
60674+# define __force_kernel
60675 # define __safe
60676 # define __force
60677 # define __nocast
60678 # define __iomem
60679+# define __force_iomem
60680 # define __chk_user_ptr(x) (void)0
60681 # define __chk_io_ptr(x) (void)0
60682 # define __builtin_warning(x, y...) (1)
60683@@ -39,7 +70,9 @@ extern void __chk_io_ptr(const volatile void __iomem *);
60684 # define __release(x) (void)0
60685 # define __cond_lock(x,c) (c)
60686 # define __percpu
60687+# define __force_percpu
60688 # define __rcu
60689+# define __force_rcu
60690 #endif
60691
60692 #ifdef __KERNEL__
60693@@ -264,6 +297,17 @@ void ftrace_likely_update(struct ftrace_branch_data *f, int val, int expect);
60694 # define __attribute_const__ /* unimplemented */
60695 #endif
60696
60697+#ifndef __no_const
60698+# define __no_const
60699+#endif
60700+
60701+#ifndef __do_const
60702+# define __do_const
60703+#endif
60704+
60705+#ifndef __size_overflow
60706+# define __size_overflow(...)
60707+#endif
60708 /*
60709 * Tell gcc if a function is cold. The compiler will assume any path
60710 * directly leading to the call is unlikely.
60711@@ -273,6 +317,22 @@ void ftrace_likely_update(struct ftrace_branch_data *f, int val, int expect);
60712 #define __cold
60713 #endif
60714
60715+#ifndef __alloc_size
60716+#define __alloc_size(...)
60717+#endif
60718+
60719+#ifndef __bos
60720+#define __bos(ptr, arg)
60721+#endif
60722+
60723+#ifndef __bos0
60724+#define __bos0(ptr)
60725+#endif
60726+
60727+#ifndef __bos1
60728+#define __bos1(ptr)
60729+#endif
60730+
60731 /* Simple shorthand for a section definition */
60732 #ifndef __section
60733 # define __section(S) __attribute__ ((__section__(#S)))
60734@@ -306,6 +366,7 @@ void ftrace_likely_update(struct ftrace_branch_data *f, int val, int expect);
60735 * use is to mediate communication between process-level code and irq/NMI
60736 * handlers, all running on the same CPU.
60737 */
60738-#define ACCESS_ONCE(x) (*(volatile typeof(x) *)&(x))
60739+#define ACCESS_ONCE(x) (*(volatile const typeof(x) *)&(x))
60740+#define ACCESS_ONCE_RW(x) (*(volatile typeof(x) *)&(x))
60741
60742 #endif /* __LINUX_COMPILER_H */
60743diff --git a/include/linux/cpuset.h b/include/linux/cpuset.h
60744index e9eaec5..bfeb9bb 100644
60745--- a/include/linux/cpuset.h
60746+++ b/include/linux/cpuset.h
60747@@ -118,7 +118,7 @@ static inline void put_mems_allowed(void)
60748 * nodemask.
60749 */
60750 smp_mb();
60751- --ACCESS_ONCE(current->mems_allowed_change_disable);
60752+ --ACCESS_ONCE_RW(current->mems_allowed_change_disable);
60753 }
60754
60755 static inline void set_mems_allowed(nodemask_t nodemask)
60756diff --git a/include/linux/crash_dump.h b/include/linux/crash_dump.h
60757index b936763..48685ee 100644
60758--- a/include/linux/crash_dump.h
60759+++ b/include/linux/crash_dump.h
60760@@ -14,7 +14,7 @@ extern unsigned long long elfcorehdr_addr;
60761 extern unsigned long long elfcorehdr_size;
60762
60763 extern ssize_t copy_oldmem_page(unsigned long, char *, size_t,
60764- unsigned long, int);
60765+ unsigned long, int) __size_overflow(3);
60766
60767 /* Architecture code defines this if there are other possible ELF
60768 * machine types, e.g. on bi-arch capable hardware. */
60769diff --git a/include/linux/cred.h b/include/linux/cred.h
60770index 4030896..8d6f342 100644
60771--- a/include/linux/cred.h
60772+++ b/include/linux/cred.h
60773@@ -207,6 +207,9 @@ static inline void validate_creds_for_do_exit(struct task_struct *tsk)
60774 static inline void validate_process_creds(void)
60775 {
60776 }
60777+static inline void validate_task_creds(struct task_struct *task)
60778+{
60779+}
60780 #endif
60781
60782 /**
60783diff --git a/include/linux/crypto.h b/include/linux/crypto.h
60784index 8a94217..15d49e3 100644
60785--- a/include/linux/crypto.h
60786+++ b/include/linux/crypto.h
60787@@ -365,7 +365,7 @@ struct cipher_tfm {
60788 const u8 *key, unsigned int keylen);
60789 void (*cit_encrypt_one)(struct crypto_tfm *tfm, u8 *dst, const u8 *src);
60790 void (*cit_decrypt_one)(struct crypto_tfm *tfm, u8 *dst, const u8 *src);
60791-};
60792+} __no_const;
60793
60794 struct hash_tfm {
60795 int (*init)(struct hash_desc *desc);
60796@@ -386,13 +386,13 @@ struct compress_tfm {
60797 int (*cot_decompress)(struct crypto_tfm *tfm,
60798 const u8 *src, unsigned int slen,
60799 u8 *dst, unsigned int *dlen);
60800-};
60801+} __no_const;
60802
60803 struct rng_tfm {
60804 int (*rng_gen_random)(struct crypto_rng *tfm, u8 *rdata,
60805 unsigned int dlen);
60806 int (*rng_reset)(struct crypto_rng *tfm, u8 *seed, unsigned int slen);
60807-};
60808+} __no_const;
60809
60810 #define crt_ablkcipher crt_u.ablkcipher
60811 #define crt_aead crt_u.aead
60812diff --git a/include/linux/decompress/mm.h b/include/linux/decompress/mm.h
60813index 7925bf0..d5143d2 100644
60814--- a/include/linux/decompress/mm.h
60815+++ b/include/linux/decompress/mm.h
60816@@ -77,7 +77,7 @@ static void free(void *where)
60817 * warnings when not needed (indeed large_malloc / large_free are not
60818 * needed by inflate */
60819
60820-#define malloc(a) kmalloc(a, GFP_KERNEL)
60821+#define malloc(a) kmalloc((a), GFP_KERNEL)
60822 #define free(a) kfree(a)
60823
60824 #define large_malloc(a) vmalloc(a)
60825diff --git a/include/linux/dma-mapping.h b/include/linux/dma-mapping.h
60826index e13117c..e9fc938 100644
60827--- a/include/linux/dma-mapping.h
60828+++ b/include/linux/dma-mapping.h
60829@@ -46,7 +46,7 @@ struct dma_map_ops {
60830 u64 (*get_required_mask)(struct device *dev);
60831 #endif
60832 int is_phys;
60833-};
60834+} __do_const;
60835
60836 #define DMA_BIT_MASK(n) (((n) == 64) ? ~0ULL : ((1ULL<<(n))-1))
60837
60838diff --git a/include/linux/efi.h b/include/linux/efi.h
60839index 2362a0b..cfaf8fcc 100644
60840--- a/include/linux/efi.h
60841+++ b/include/linux/efi.h
60842@@ -446,7 +446,7 @@ struct efivar_operations {
60843 efi_get_variable_t *get_variable;
60844 efi_get_next_variable_t *get_next_variable;
60845 efi_set_variable_t *set_variable;
60846-};
60847+} __no_const;
60848
60849 struct efivars {
60850 /*
60851diff --git a/include/linux/elf.h b/include/linux/elf.h
60852index 31f0508..5421c01 100644
60853--- a/include/linux/elf.h
60854+++ b/include/linux/elf.h
60855@@ -49,6 +49,17 @@ typedef __s64 Elf64_Sxword;
60856 #define PT_GNU_EH_FRAME 0x6474e550
60857
60858 #define PT_GNU_STACK (PT_LOOS + 0x474e551)
60859+#define PT_GNU_RELRO (PT_LOOS + 0x474e552)
60860+
60861+#define PT_PAX_FLAGS (PT_LOOS + 0x5041580)
60862+
60863+/* Constants for the e_flags field */
60864+#define EF_PAX_PAGEEXEC 1 /* Paging based non-executable pages */
60865+#define EF_PAX_EMUTRAMP 2 /* Emulate trampolines */
60866+#define EF_PAX_MPROTECT 4 /* Restrict mprotect() */
60867+#define EF_PAX_RANDMMAP 8 /* Randomize mmap() base */
60868+/*#define EF_PAX_RANDEXEC 16*/ /* Randomize ET_EXEC base */
60869+#define EF_PAX_SEGMEXEC 32 /* Segmentation based non-executable pages */
60870
60871 /*
60872 * Extended Numbering
60873@@ -106,6 +117,8 @@ typedef __s64 Elf64_Sxword;
60874 #define DT_DEBUG 21
60875 #define DT_TEXTREL 22
60876 #define DT_JMPREL 23
60877+#define DT_FLAGS 30
60878+ #define DF_TEXTREL 0x00000004
60879 #define DT_ENCODING 32
60880 #define OLD_DT_LOOS 0x60000000
60881 #define DT_LOOS 0x6000000d
60882@@ -252,6 +265,19 @@ typedef struct elf64_hdr {
60883 #define PF_W 0x2
60884 #define PF_X 0x1
60885
60886+#define PF_PAGEEXEC (1U << 4) /* Enable PAGEEXEC */
60887+#define PF_NOPAGEEXEC (1U << 5) /* Disable PAGEEXEC */
60888+#define PF_SEGMEXEC (1U << 6) /* Enable SEGMEXEC */
60889+#define PF_NOSEGMEXEC (1U << 7) /* Disable SEGMEXEC */
60890+#define PF_MPROTECT (1U << 8) /* Enable MPROTECT */
60891+#define PF_NOMPROTECT (1U << 9) /* Disable MPROTECT */
60892+/*#define PF_RANDEXEC (1U << 10)*/ /* Enable RANDEXEC */
60893+/*#define PF_NORANDEXEC (1U << 11)*/ /* Disable RANDEXEC */
60894+#define PF_EMUTRAMP (1U << 12) /* Enable EMUTRAMP */
60895+#define PF_NOEMUTRAMP (1U << 13) /* Disable EMUTRAMP */
60896+#define PF_RANDMMAP (1U << 14) /* Enable RANDMMAP */
60897+#define PF_NORANDMMAP (1U << 15) /* Disable RANDMMAP */
60898+
60899 typedef struct elf32_phdr{
60900 Elf32_Word p_type;
60901 Elf32_Off p_offset;
60902@@ -344,6 +370,8 @@ typedef struct elf64_shdr {
60903 #define EI_OSABI 7
60904 #define EI_PAD 8
60905
60906+#define EI_PAX 14
60907+
60908 #define ELFMAG0 0x7f /* EI_MAG */
60909 #define ELFMAG1 'E'
60910 #define ELFMAG2 'L'
60911@@ -423,6 +451,7 @@ extern Elf32_Dyn _DYNAMIC [];
60912 #define elf_note elf32_note
60913 #define elf_addr_t Elf32_Off
60914 #define Elf_Half Elf32_Half
60915+#define elf_dyn Elf32_Dyn
60916
60917 #else
60918
60919@@ -433,6 +462,7 @@ extern Elf64_Dyn _DYNAMIC [];
60920 #define elf_note elf64_note
60921 #define elf_addr_t Elf64_Off
60922 #define Elf_Half Elf64_Half
60923+#define elf_dyn Elf64_Dyn
60924
60925 #endif
60926
60927diff --git a/include/linux/filter.h b/include/linux/filter.h
60928index 8eeb205..d59bfa2 100644
60929--- a/include/linux/filter.h
60930+++ b/include/linux/filter.h
60931@@ -134,6 +134,7 @@ struct sock_fprog { /* Required for SO_ATTACH_FILTER. */
60932
60933 struct sk_buff;
60934 struct sock;
60935+struct bpf_jit_work;
60936
60937 struct sk_filter
60938 {
60939@@ -141,6 +142,9 @@ struct sk_filter
60940 unsigned int len; /* Number of filter blocks */
60941 unsigned int (*bpf_func)(const struct sk_buff *skb,
60942 const struct sock_filter *filter);
60943+#ifdef CONFIG_BPF_JIT
60944+ struct bpf_jit_work *work;
60945+#endif
60946 struct rcu_head rcu;
60947 struct sock_filter insns[0];
60948 };
60949diff --git a/include/linux/firewire.h b/include/linux/firewire.h
60950index 84ccf8e..2e9b14c 100644
60951--- a/include/linux/firewire.h
60952+++ b/include/linux/firewire.h
60953@@ -428,7 +428,7 @@ struct fw_iso_context {
60954 union {
60955 fw_iso_callback_t sc;
60956 fw_iso_mc_callback_t mc;
60957- } callback;
60958+ } __no_const callback;
60959 void *callback_data;
60960 };
60961
60962diff --git a/include/linux/fs.h b/include/linux/fs.h
60963index 10b2288..09180e4 100644
60964--- a/include/linux/fs.h
60965+++ b/include/linux/fs.h
60966@@ -1609,7 +1609,8 @@ struct file_operations {
60967 int (*setlease)(struct file *, long, struct file_lock **);
60968 long (*fallocate)(struct file *file, int mode, loff_t offset,
60969 loff_t len);
60970-};
60971+} __do_const;
60972+typedef struct file_operations __no_const file_operations_no_const;
60973
60974 struct inode_operations {
60975 struct dentry * (*lookup) (struct inode *,struct dentry *, struct nameidata *);
60976diff --git a/include/linux/fs_struct.h b/include/linux/fs_struct.h
60977index 003dc0f..3c4ea97 100644
60978--- a/include/linux/fs_struct.h
60979+++ b/include/linux/fs_struct.h
60980@@ -6,7 +6,7 @@
60981 #include <linux/seqlock.h>
60982
60983 struct fs_struct {
60984- int users;
60985+ atomic_t users;
60986 spinlock_t lock;
60987 seqcount_t seq;
60988 int umask;
60989diff --git a/include/linux/fscache-cache.h b/include/linux/fscache-cache.h
60990index ce31408..b1ad003 100644
60991--- a/include/linux/fscache-cache.h
60992+++ b/include/linux/fscache-cache.h
60993@@ -102,7 +102,7 @@ struct fscache_operation {
60994 fscache_operation_release_t release;
60995 };
60996
60997-extern atomic_t fscache_op_debug_id;
60998+extern atomic_unchecked_t fscache_op_debug_id;
60999 extern void fscache_op_work_func(struct work_struct *work);
61000
61001 extern void fscache_enqueue_operation(struct fscache_operation *);
61002@@ -122,7 +122,7 @@ static inline void fscache_operation_init(struct fscache_operation *op,
61003 {
61004 INIT_WORK(&op->work, fscache_op_work_func);
61005 atomic_set(&op->usage, 1);
61006- op->debug_id = atomic_inc_return(&fscache_op_debug_id);
61007+ op->debug_id = atomic_inc_return_unchecked(&fscache_op_debug_id);
61008 op->processor = processor;
61009 op->release = release;
61010 INIT_LIST_HEAD(&op->pend_link);
61011diff --git a/include/linux/fsnotify.h b/include/linux/fsnotify.h
61012index 2a53f10..0187fdf 100644
61013--- a/include/linux/fsnotify.h
61014+++ b/include/linux/fsnotify.h
61015@@ -314,7 +314,7 @@ static inline void fsnotify_change(struct dentry *dentry, unsigned int ia_valid)
61016 */
61017 static inline const unsigned char *fsnotify_oldname_init(const unsigned char *name)
61018 {
61019- return kstrdup(name, GFP_KERNEL);
61020+ return (const unsigned char *)kstrdup((const char *)name, GFP_KERNEL);
61021 }
61022
61023 /*
61024diff --git a/include/linux/fsnotify_backend.h b/include/linux/fsnotify_backend.h
61025index 91d0e0a3..035666b 100644
61026--- a/include/linux/fsnotify_backend.h
61027+++ b/include/linux/fsnotify_backend.h
61028@@ -105,6 +105,7 @@ struct fsnotify_ops {
61029 void (*freeing_mark)(struct fsnotify_mark *mark, struct fsnotify_group *group);
61030 void (*free_event_priv)(struct fsnotify_event_private_data *priv);
61031 };
61032+typedef struct fsnotify_ops __no_const fsnotify_ops_no_const;
61033
61034 /*
61035 * A group is a "thing" that wants to receive notification about filesystem
61036diff --git a/include/linux/ftrace_event.h b/include/linux/ftrace_event.h
61037index c3da42d..c70e0df 100644
61038--- a/include/linux/ftrace_event.h
61039+++ b/include/linux/ftrace_event.h
61040@@ -97,7 +97,7 @@ struct trace_event_functions {
61041 trace_print_func raw;
61042 trace_print_func hex;
61043 trace_print_func binary;
61044-};
61045+} __no_const;
61046
61047 struct trace_event {
61048 struct hlist_node node;
61049@@ -254,7 +254,7 @@ extern int trace_define_field(struct ftrace_event_call *call, const char *type,
61050 extern int trace_add_event_call(struct ftrace_event_call *call);
61051 extern void trace_remove_event_call(struct ftrace_event_call *call);
61052
61053-#define is_signed_type(type) (((type)(-1)) < 0)
61054+#define is_signed_type(type) (((type)(-1)) < (type)1)
61055
61056 int trace_set_clr_event(const char *system, const char *event, int set);
61057
61058diff --git a/include/linux/genhd.h b/include/linux/genhd.h
61059index c6f7f6a..aa0f7d3 100644
61060--- a/include/linux/genhd.h
61061+++ b/include/linux/genhd.h
61062@@ -185,7 +185,7 @@ struct gendisk {
61063 struct kobject *slave_dir;
61064
61065 struct timer_rand_state *random;
61066- atomic_t sync_io; /* RAID */
61067+ atomic_unchecked_t sync_io; /* RAID */
61068 struct disk_events *ev;
61069 #ifdef CONFIG_BLK_DEV_INTEGRITY
61070 struct blk_integrity *integrity;
61071diff --git a/include/linux/gracl.h b/include/linux/gracl.h
61072new file mode 100644
61073index 0000000..8a130b6
61074--- /dev/null
61075+++ b/include/linux/gracl.h
61076@@ -0,0 +1,319 @@
61077+#ifndef GR_ACL_H
61078+#define GR_ACL_H
61079+
61080+#include <linux/grdefs.h>
61081+#include <linux/resource.h>
61082+#include <linux/capability.h>
61083+#include <linux/dcache.h>
61084+#include <asm/resource.h>
61085+
61086+/* Major status information */
61087+
61088+#define GR_VERSION "grsecurity 2.9"
61089+#define GRSECURITY_VERSION 0x2900
61090+
61091+enum {
61092+ GR_SHUTDOWN = 0,
61093+ GR_ENABLE = 1,
61094+ GR_SPROLE = 2,
61095+ GR_RELOAD = 3,
61096+ GR_SEGVMOD = 4,
61097+ GR_STATUS = 5,
61098+ GR_UNSPROLE = 6,
61099+ GR_PASSSET = 7,
61100+ GR_SPROLEPAM = 8,
61101+};
61102+
61103+/* Password setup definitions
61104+ * kernel/grhash.c */
61105+enum {
61106+ GR_PW_LEN = 128,
61107+ GR_SALT_LEN = 16,
61108+ GR_SHA_LEN = 32,
61109+};
61110+
61111+enum {
61112+ GR_SPROLE_LEN = 64,
61113+};
61114+
61115+enum {
61116+ GR_NO_GLOB = 0,
61117+ GR_REG_GLOB,
61118+ GR_CREATE_GLOB
61119+};
61120+
61121+#define GR_NLIMITS 32
61122+
61123+/* Begin Data Structures */
61124+
61125+struct sprole_pw {
61126+ unsigned char *rolename;
61127+ unsigned char salt[GR_SALT_LEN];
61128+ unsigned char sum[GR_SHA_LEN]; /* 256-bit SHA hash of the password */
61129+};
61130+
61131+struct name_entry {
61132+ __u32 key;
61133+ ino_t inode;
61134+ dev_t device;
61135+ char *name;
61136+ __u16 len;
61137+ __u8 deleted;
61138+ struct name_entry *prev;
61139+ struct name_entry *next;
61140+};
61141+
61142+struct inodev_entry {
61143+ struct name_entry *nentry;
61144+ struct inodev_entry *prev;
61145+ struct inodev_entry *next;
61146+};
61147+
61148+struct acl_role_db {
61149+ struct acl_role_label **r_hash;
61150+ __u32 r_size;
61151+};
61152+
61153+struct inodev_db {
61154+ struct inodev_entry **i_hash;
61155+ __u32 i_size;
61156+};
61157+
61158+struct name_db {
61159+ struct name_entry **n_hash;
61160+ __u32 n_size;
61161+};
61162+
61163+struct crash_uid {
61164+ uid_t uid;
61165+ unsigned long expires;
61166+};
61167+
61168+struct gr_hash_struct {
61169+ void **table;
61170+ void **nametable;
61171+ void *first;
61172+ __u32 table_size;
61173+ __u32 used_size;
61174+ int type;
61175+};
61176+
61177+/* Userspace Grsecurity ACL data structures */
61178+
61179+struct acl_subject_label {
61180+ char *filename;
61181+ ino_t inode;
61182+ dev_t device;
61183+ __u32 mode;
61184+ kernel_cap_t cap_mask;
61185+ kernel_cap_t cap_lower;
61186+ kernel_cap_t cap_invert_audit;
61187+
61188+ struct rlimit res[GR_NLIMITS];
61189+ __u32 resmask;
61190+
61191+ __u8 user_trans_type;
61192+ __u8 group_trans_type;
61193+ uid_t *user_transitions;
61194+ gid_t *group_transitions;
61195+ __u16 user_trans_num;
61196+ __u16 group_trans_num;
61197+
61198+ __u32 sock_families[2];
61199+ __u32 ip_proto[8];
61200+ __u32 ip_type;
61201+ struct acl_ip_label **ips;
61202+ __u32 ip_num;
61203+ __u32 inaddr_any_override;
61204+
61205+ __u32 crashes;
61206+ unsigned long expires;
61207+
61208+ struct acl_subject_label *parent_subject;
61209+ struct gr_hash_struct *hash;
61210+ struct acl_subject_label *prev;
61211+ struct acl_subject_label *next;
61212+
61213+ struct acl_object_label **obj_hash;
61214+ __u32 obj_hash_size;
61215+ __u16 pax_flags;
61216+};
61217+
61218+struct role_allowed_ip {
61219+ __u32 addr;
61220+ __u32 netmask;
61221+
61222+ struct role_allowed_ip *prev;
61223+ struct role_allowed_ip *next;
61224+};
61225+
61226+struct role_transition {
61227+ char *rolename;
61228+
61229+ struct role_transition *prev;
61230+ struct role_transition *next;
61231+};
61232+
61233+struct acl_role_label {
61234+ char *rolename;
61235+ uid_t uidgid;
61236+ __u16 roletype;
61237+
61238+ __u16 auth_attempts;
61239+ unsigned long expires;
61240+
61241+ struct acl_subject_label *root_label;
61242+ struct gr_hash_struct *hash;
61243+
61244+ struct acl_role_label *prev;
61245+ struct acl_role_label *next;
61246+
61247+ struct role_transition *transitions;
61248+ struct role_allowed_ip *allowed_ips;
61249+ uid_t *domain_children;
61250+ __u16 domain_child_num;
61251+
61252+ umode_t umask;
61253+
61254+ struct acl_subject_label **subj_hash;
61255+ __u32 subj_hash_size;
61256+};
61257+
61258+struct user_acl_role_db {
61259+ struct acl_role_label **r_table;
61260+ __u32 num_pointers; /* Number of allocations to track */
61261+ __u32 num_roles; /* Number of roles */
61262+ __u32 num_domain_children; /* Number of domain children */
61263+ __u32 num_subjects; /* Number of subjects */
61264+ __u32 num_objects; /* Number of objects */
61265+};
61266+
61267+struct acl_object_label {
61268+ char *filename;
61269+ ino_t inode;
61270+ dev_t device;
61271+ __u32 mode;
61272+
61273+ struct acl_subject_label *nested;
61274+ struct acl_object_label *globbed;
61275+
61276+ /* next two structures not used */
61277+
61278+ struct acl_object_label *prev;
61279+ struct acl_object_label *next;
61280+};
61281+
61282+struct acl_ip_label {
61283+ char *iface;
61284+ __u32 addr;
61285+ __u32 netmask;
61286+ __u16 low, high;
61287+ __u8 mode;
61288+ __u32 type;
61289+ __u32 proto[8];
61290+
61291+ /* next two structures not used */
61292+
61293+ struct acl_ip_label *prev;
61294+ struct acl_ip_label *next;
61295+};
61296+
61297+struct gr_arg {
61298+ struct user_acl_role_db role_db;
61299+ unsigned char pw[GR_PW_LEN];
61300+ unsigned char salt[GR_SALT_LEN];
61301+ unsigned char sum[GR_SHA_LEN];
61302+ unsigned char sp_role[GR_SPROLE_LEN];
61303+ struct sprole_pw *sprole_pws;
61304+ dev_t segv_device;
61305+ ino_t segv_inode;
61306+ uid_t segv_uid;
61307+ __u16 num_sprole_pws;
61308+ __u16 mode;
61309+};
61310+
61311+struct gr_arg_wrapper {
61312+ struct gr_arg *arg;
61313+ __u32 version;
61314+ __u32 size;
61315+};
61316+
61317+struct subject_map {
61318+ struct acl_subject_label *user;
61319+ struct acl_subject_label *kernel;
61320+ struct subject_map *prev;
61321+ struct subject_map *next;
61322+};
61323+
61324+struct acl_subj_map_db {
61325+ struct subject_map **s_hash;
61326+ __u32 s_size;
61327+};
61328+
61329+/* End Data Structures Section */
61330+
61331+/* Hash functions generated by empirical testing by Brad Spengler
61332+ Makes good use of the low bits of the inode. Generally 0-1 times
61333+ in loop for successful match. 0-3 for unsuccessful match.
61334+ Shift/add algorithm with modulus of table size and an XOR*/
61335+
61336+static __inline__ unsigned int
61337+rhash(const uid_t uid, const __u16 type, const unsigned int sz)
61338+{
61339+ return ((((uid + type) << (16 + type)) ^ uid) % sz);
61340+}
61341+
61342+ static __inline__ unsigned int
61343+shash(const struct acl_subject_label *userp, const unsigned int sz)
61344+{
61345+ return ((const unsigned long)userp % sz);
61346+}
61347+
61348+static __inline__ unsigned int
61349+fhash(const ino_t ino, const dev_t dev, const unsigned int sz)
61350+{
61351+ return (((ino + dev) ^ ((ino << 13) + (ino << 23) + (dev << 9))) % sz);
61352+}
61353+
61354+static __inline__ unsigned int
61355+nhash(const char *name, const __u16 len, const unsigned int sz)
61356+{
61357+ return full_name_hash((const unsigned char *)name, len) % sz;
61358+}
61359+
61360+#define FOR_EACH_ROLE_START(role) \
61361+ role = role_list; \
61362+ while (role) {
61363+
61364+#define FOR_EACH_ROLE_END(role) \
61365+ role = role->prev; \
61366+ }
61367+
61368+#define FOR_EACH_SUBJECT_START(role,subj,iter) \
61369+ subj = NULL; \
61370+ iter = 0; \
61371+ while (iter < role->subj_hash_size) { \
61372+ if (subj == NULL) \
61373+ subj = role->subj_hash[iter]; \
61374+ if (subj == NULL) { \
61375+ iter++; \
61376+ continue; \
61377+ }
61378+
61379+#define FOR_EACH_SUBJECT_END(subj,iter) \
61380+ subj = subj->next; \
61381+ if (subj == NULL) \
61382+ iter++; \
61383+ }
61384+
61385+
61386+#define FOR_EACH_NESTED_SUBJECT_START(role,subj) \
61387+ subj = role->hash->first; \
61388+ while (subj != NULL) {
61389+
61390+#define FOR_EACH_NESTED_SUBJECT_END(subj) \
61391+ subj = subj->next; \
61392+ }
61393+
61394+#endif
61395+
61396diff --git a/include/linux/gralloc.h b/include/linux/gralloc.h
61397new file mode 100644
61398index 0000000..323ecf2
61399--- /dev/null
61400+++ b/include/linux/gralloc.h
61401@@ -0,0 +1,9 @@
61402+#ifndef __GRALLOC_H
61403+#define __GRALLOC_H
61404+
61405+void acl_free_all(void);
61406+int acl_alloc_stack_init(unsigned long size);
61407+void *acl_alloc(unsigned long len);
61408+void *acl_alloc_num(unsigned long num, unsigned long len);
61409+
61410+#endif
61411diff --git a/include/linux/grdefs.h b/include/linux/grdefs.h
61412new file mode 100644
61413index 0000000..b30e9bc
61414--- /dev/null
61415+++ b/include/linux/grdefs.h
61416@@ -0,0 +1,140 @@
61417+#ifndef GRDEFS_H
61418+#define GRDEFS_H
61419+
61420+/* Begin grsecurity status declarations */
61421+
61422+enum {
61423+ GR_READY = 0x01,
61424+ GR_STATUS_INIT = 0x00 // disabled state
61425+};
61426+
61427+/* Begin ACL declarations */
61428+
61429+/* Role flags */
61430+
61431+enum {
61432+ GR_ROLE_USER = 0x0001,
61433+ GR_ROLE_GROUP = 0x0002,
61434+ GR_ROLE_DEFAULT = 0x0004,
61435+ GR_ROLE_SPECIAL = 0x0008,
61436+ GR_ROLE_AUTH = 0x0010,
61437+ GR_ROLE_NOPW = 0x0020,
61438+ GR_ROLE_GOD = 0x0040,
61439+ GR_ROLE_LEARN = 0x0080,
61440+ GR_ROLE_TPE = 0x0100,
61441+ GR_ROLE_DOMAIN = 0x0200,
61442+ GR_ROLE_PAM = 0x0400,
61443+ GR_ROLE_PERSIST = 0x0800
61444+};
61445+
61446+/* ACL Subject and Object mode flags */
61447+enum {
61448+ GR_DELETED = 0x80000000
61449+};
61450+
61451+/* ACL Object-only mode flags */
61452+enum {
61453+ GR_READ = 0x00000001,
61454+ GR_APPEND = 0x00000002,
61455+ GR_WRITE = 0x00000004,
61456+ GR_EXEC = 0x00000008,
61457+ GR_FIND = 0x00000010,
61458+ GR_INHERIT = 0x00000020,
61459+ GR_SETID = 0x00000040,
61460+ GR_CREATE = 0x00000080,
61461+ GR_DELETE = 0x00000100,
61462+ GR_LINK = 0x00000200,
61463+ GR_AUDIT_READ = 0x00000400,
61464+ GR_AUDIT_APPEND = 0x00000800,
61465+ GR_AUDIT_WRITE = 0x00001000,
61466+ GR_AUDIT_EXEC = 0x00002000,
61467+ GR_AUDIT_FIND = 0x00004000,
61468+ GR_AUDIT_INHERIT= 0x00008000,
61469+ GR_AUDIT_SETID = 0x00010000,
61470+ GR_AUDIT_CREATE = 0x00020000,
61471+ GR_AUDIT_DELETE = 0x00040000,
61472+ GR_AUDIT_LINK = 0x00080000,
61473+ GR_PTRACERD = 0x00100000,
61474+ GR_NOPTRACE = 0x00200000,
61475+ GR_SUPPRESS = 0x00400000,
61476+ GR_NOLEARN = 0x00800000,
61477+ GR_INIT_TRANSFER= 0x01000000
61478+};
61479+
61480+#define GR_AUDITS (GR_AUDIT_READ | GR_AUDIT_WRITE | GR_AUDIT_APPEND | GR_AUDIT_EXEC | \
61481+ GR_AUDIT_FIND | GR_AUDIT_INHERIT | GR_AUDIT_SETID | \
61482+ GR_AUDIT_CREATE | GR_AUDIT_DELETE | GR_AUDIT_LINK)
61483+
61484+/* ACL subject-only mode flags */
61485+enum {
61486+ GR_KILL = 0x00000001,
61487+ GR_VIEW = 0x00000002,
61488+ GR_PROTECTED = 0x00000004,
61489+ GR_LEARN = 0x00000008,
61490+ GR_OVERRIDE = 0x00000010,
61491+ /* just a placeholder, this mode is only used in userspace */
61492+ GR_DUMMY = 0x00000020,
61493+ GR_PROTSHM = 0x00000040,
61494+ GR_KILLPROC = 0x00000080,
61495+ GR_KILLIPPROC = 0x00000100,
61496+ /* just a placeholder, this mode is only used in userspace */
61497+ GR_NOTROJAN = 0x00000200,
61498+ GR_PROTPROCFD = 0x00000400,
61499+ GR_PROCACCT = 0x00000800,
61500+ GR_RELAXPTRACE = 0x00001000,
61501+ GR_NESTED = 0x00002000,
61502+ GR_INHERITLEARN = 0x00004000,
61503+ GR_PROCFIND = 0x00008000,
61504+ GR_POVERRIDE = 0x00010000,
61505+ GR_KERNELAUTH = 0x00020000,
61506+ GR_ATSECURE = 0x00040000,
61507+ GR_SHMEXEC = 0x00080000
61508+};
61509+
61510+enum {
61511+ GR_PAX_ENABLE_SEGMEXEC = 0x0001,
61512+ GR_PAX_ENABLE_PAGEEXEC = 0x0002,
61513+ GR_PAX_ENABLE_MPROTECT = 0x0004,
61514+ GR_PAX_ENABLE_RANDMMAP = 0x0008,
61515+ GR_PAX_ENABLE_EMUTRAMP = 0x0010,
61516+ GR_PAX_DISABLE_SEGMEXEC = 0x0100,
61517+ GR_PAX_DISABLE_PAGEEXEC = 0x0200,
61518+ GR_PAX_DISABLE_MPROTECT = 0x0400,
61519+ GR_PAX_DISABLE_RANDMMAP = 0x0800,
61520+ GR_PAX_DISABLE_EMUTRAMP = 0x1000,
61521+};
61522+
61523+enum {
61524+ GR_ID_USER = 0x01,
61525+ GR_ID_GROUP = 0x02,
61526+};
61527+
61528+enum {
61529+ GR_ID_ALLOW = 0x01,
61530+ GR_ID_DENY = 0x02,
61531+};
61532+
61533+#define GR_CRASH_RES 31
61534+#define GR_UIDTABLE_MAX 500
61535+
61536+/* begin resource learning section */
61537+enum {
61538+ GR_RLIM_CPU_BUMP = 60,
61539+ GR_RLIM_FSIZE_BUMP = 50000,
61540+ GR_RLIM_DATA_BUMP = 10000,
61541+ GR_RLIM_STACK_BUMP = 1000,
61542+ GR_RLIM_CORE_BUMP = 10000,
61543+ GR_RLIM_RSS_BUMP = 500000,
61544+ GR_RLIM_NPROC_BUMP = 1,
61545+ GR_RLIM_NOFILE_BUMP = 5,
61546+ GR_RLIM_MEMLOCK_BUMP = 50000,
61547+ GR_RLIM_AS_BUMP = 500000,
61548+ GR_RLIM_LOCKS_BUMP = 2,
61549+ GR_RLIM_SIGPENDING_BUMP = 5,
61550+ GR_RLIM_MSGQUEUE_BUMP = 10000,
61551+ GR_RLIM_NICE_BUMP = 1,
61552+ GR_RLIM_RTPRIO_BUMP = 1,
61553+ GR_RLIM_RTTIME_BUMP = 1000000
61554+};
61555+
61556+#endif
61557diff --git a/include/linux/grinternal.h b/include/linux/grinternal.h
61558new file mode 100644
61559index 0000000..da390f1
61560--- /dev/null
61561+++ b/include/linux/grinternal.h
61562@@ -0,0 +1,221 @@
61563+#ifndef __GRINTERNAL_H
61564+#define __GRINTERNAL_H
61565+
61566+#ifdef CONFIG_GRKERNSEC
61567+
61568+#include <linux/fs.h>
61569+#include <linux/mnt_namespace.h>
61570+#include <linux/nsproxy.h>
61571+#include <linux/gracl.h>
61572+#include <linux/grdefs.h>
61573+#include <linux/grmsg.h>
61574+
61575+void gr_add_learn_entry(const char *fmt, ...)
61576+ __attribute__ ((format (printf, 1, 2)));
61577+__u32 gr_search_file(const struct dentry *dentry, const __u32 mode,
61578+ const struct vfsmount *mnt);
61579+__u32 gr_check_create(const struct dentry *new_dentry,
61580+ const struct dentry *parent,
61581+ const struct vfsmount *mnt, const __u32 mode);
61582+int gr_check_protected_task(const struct task_struct *task);
61583+__u32 to_gr_audit(const __u32 reqmode);
61584+int gr_set_acls(const int type);
61585+int gr_apply_subject_to_task(struct task_struct *task);
61586+int gr_acl_is_enabled(void);
61587+char gr_roletype_to_char(void);
61588+
61589+void gr_handle_alertkill(struct task_struct *task);
61590+char *gr_to_filename(const struct dentry *dentry,
61591+ const struct vfsmount *mnt);
61592+char *gr_to_filename1(const struct dentry *dentry,
61593+ const struct vfsmount *mnt);
61594+char *gr_to_filename2(const struct dentry *dentry,
61595+ const struct vfsmount *mnt);
61596+char *gr_to_filename3(const struct dentry *dentry,
61597+ const struct vfsmount *mnt);
61598+
61599+extern int grsec_enable_ptrace_readexec;
61600+extern int grsec_enable_harden_ptrace;
61601+extern int grsec_enable_link;
61602+extern int grsec_enable_fifo;
61603+extern int grsec_enable_execve;
61604+extern int grsec_enable_shm;
61605+extern int grsec_enable_execlog;
61606+extern int grsec_enable_signal;
61607+extern int grsec_enable_audit_ptrace;
61608+extern int grsec_enable_forkfail;
61609+extern int grsec_enable_time;
61610+extern int grsec_enable_rofs;
61611+extern int grsec_enable_chroot_shmat;
61612+extern int grsec_enable_chroot_mount;
61613+extern int grsec_enable_chroot_double;
61614+extern int grsec_enable_chroot_pivot;
61615+extern int grsec_enable_chroot_chdir;
61616+extern int grsec_enable_chroot_chmod;
61617+extern int grsec_enable_chroot_mknod;
61618+extern int grsec_enable_chroot_fchdir;
61619+extern int grsec_enable_chroot_nice;
61620+extern int grsec_enable_chroot_execlog;
61621+extern int grsec_enable_chroot_caps;
61622+extern int grsec_enable_chroot_sysctl;
61623+extern int grsec_enable_chroot_unix;
61624+extern int grsec_enable_tpe;
61625+extern int grsec_tpe_gid;
61626+extern int grsec_enable_tpe_all;
61627+extern int grsec_enable_tpe_invert;
61628+extern int grsec_enable_socket_all;
61629+extern int grsec_socket_all_gid;
61630+extern int grsec_enable_socket_client;
61631+extern int grsec_socket_client_gid;
61632+extern int grsec_enable_socket_server;
61633+extern int grsec_socket_server_gid;
61634+extern int grsec_audit_gid;
61635+extern int grsec_enable_group;
61636+extern int grsec_enable_audit_textrel;
61637+extern int grsec_enable_log_rwxmaps;
61638+extern int grsec_enable_mount;
61639+extern int grsec_enable_chdir;
61640+extern int grsec_resource_logging;
61641+extern int grsec_enable_blackhole;
61642+extern int grsec_lastack_retries;
61643+extern int grsec_enable_brute;
61644+extern int grsec_lock;
61645+
61646+extern spinlock_t grsec_alert_lock;
61647+extern unsigned long grsec_alert_wtime;
61648+extern unsigned long grsec_alert_fyet;
61649+
61650+extern spinlock_t grsec_audit_lock;
61651+
61652+extern rwlock_t grsec_exec_file_lock;
61653+
61654+#define gr_task_fullpath(tsk) ((tsk)->exec_file ? \
61655+ gr_to_filename2((tsk)->exec_file->f_path.dentry, \
61656+ (tsk)->exec_file->f_vfsmnt) : "/")
61657+
61658+#define gr_parent_task_fullpath(tsk) ((tsk)->real_parent->exec_file ? \
61659+ gr_to_filename3((tsk)->real_parent->exec_file->f_path.dentry, \
61660+ (tsk)->real_parent->exec_file->f_vfsmnt) : "/")
61661+
61662+#define gr_task_fullpath0(tsk) ((tsk)->exec_file ? \
61663+ gr_to_filename((tsk)->exec_file->f_path.dentry, \
61664+ (tsk)->exec_file->f_vfsmnt) : "/")
61665+
61666+#define gr_parent_task_fullpath0(tsk) ((tsk)->real_parent->exec_file ? \
61667+ gr_to_filename1((tsk)->real_parent->exec_file->f_path.dentry, \
61668+ (tsk)->real_parent->exec_file->f_vfsmnt) : "/")
61669+
61670+#define proc_is_chrooted(tsk_a) ((tsk_a)->gr_is_chrooted)
61671+
61672+#define have_same_root(tsk_a,tsk_b) ((tsk_a)->gr_chroot_dentry == (tsk_b)->gr_chroot_dentry)
61673+
61674+#define DEFAULTSECARGS(task, cred, pcred) gr_task_fullpath(task), (task)->comm, \
61675+ (task)->pid, (cred)->uid, \
61676+ (cred)->euid, (cred)->gid, (cred)->egid, \
61677+ gr_parent_task_fullpath(task), \
61678+ (task)->real_parent->comm, (task)->real_parent->pid, \
61679+ (pcred)->uid, (pcred)->euid, \
61680+ (pcred)->gid, (pcred)->egid
61681+
61682+#define GR_CHROOT_CAPS {{ \
61683+ CAP_TO_MASK(CAP_LINUX_IMMUTABLE) | CAP_TO_MASK(CAP_NET_ADMIN) | \
61684+ CAP_TO_MASK(CAP_SYS_MODULE) | CAP_TO_MASK(CAP_SYS_RAWIO) | \
61685+ CAP_TO_MASK(CAP_SYS_PACCT) | CAP_TO_MASK(CAP_SYS_ADMIN) | \
61686+ CAP_TO_MASK(CAP_SYS_BOOT) | CAP_TO_MASK(CAP_SYS_TIME) | \
61687+ CAP_TO_MASK(CAP_NET_RAW) | CAP_TO_MASK(CAP_SYS_TTY_CONFIG) | \
61688+ CAP_TO_MASK(CAP_IPC_OWNER) | CAP_TO_MASK(CAP_SETFCAP), \
61689+ CAP_TO_MASK(CAP_SYSLOG) | CAP_TO_MASK(CAP_MAC_ADMIN) }}
61690+
61691+#define security_learn(normal_msg,args...) \
61692+({ \
61693+ read_lock(&grsec_exec_file_lock); \
61694+ gr_add_learn_entry(normal_msg "\n", ## args); \
61695+ read_unlock(&grsec_exec_file_lock); \
61696+})
61697+
61698+enum {
61699+ GR_DO_AUDIT,
61700+ GR_DONT_AUDIT,
61701+ /* used for non-audit messages that we shouldn't kill the task on */
61702+ GR_DONT_AUDIT_GOOD
61703+};
61704+
61705+enum {
61706+ GR_TTYSNIFF,
61707+ GR_RBAC,
61708+ GR_RBAC_STR,
61709+ GR_STR_RBAC,
61710+ GR_RBAC_MODE2,
61711+ GR_RBAC_MODE3,
61712+ GR_FILENAME,
61713+ GR_SYSCTL_HIDDEN,
61714+ GR_NOARGS,
61715+ GR_ONE_INT,
61716+ GR_ONE_INT_TWO_STR,
61717+ GR_ONE_STR,
61718+ GR_STR_INT,
61719+ GR_TWO_STR_INT,
61720+ GR_TWO_INT,
61721+ GR_TWO_U64,
61722+ GR_THREE_INT,
61723+ GR_FIVE_INT_TWO_STR,
61724+ GR_TWO_STR,
61725+ GR_THREE_STR,
61726+ GR_FOUR_STR,
61727+ GR_STR_FILENAME,
61728+ GR_FILENAME_STR,
61729+ GR_FILENAME_TWO_INT,
61730+ GR_FILENAME_TWO_INT_STR,
61731+ GR_TEXTREL,
61732+ GR_PTRACE,
61733+ GR_RESOURCE,
61734+ GR_CAP,
61735+ GR_SIG,
61736+ GR_SIG2,
61737+ GR_CRASH1,
61738+ GR_CRASH2,
61739+ GR_PSACCT,
61740+ GR_RWXMAP
61741+};
61742+
61743+#define gr_log_hidden_sysctl(audit, msg, str) gr_log_varargs(audit, msg, GR_SYSCTL_HIDDEN, str)
61744+#define gr_log_ttysniff(audit, msg, task) gr_log_varargs(audit, msg, GR_TTYSNIFF, task)
61745+#define gr_log_fs_rbac_generic(audit, msg, dentry, mnt) gr_log_varargs(audit, msg, GR_RBAC, dentry, mnt)
61746+#define gr_log_fs_rbac_str(audit, msg, dentry, mnt, str) gr_log_varargs(audit, msg, GR_RBAC_STR, dentry, mnt, str)
61747+#define gr_log_fs_str_rbac(audit, msg, str, dentry, mnt) gr_log_varargs(audit, msg, GR_STR_RBAC, str, dentry, mnt)
61748+#define gr_log_fs_rbac_mode2(audit, msg, dentry, mnt, str1, str2) gr_log_varargs(audit, msg, GR_RBAC_MODE2, dentry, mnt, str1, str2)
61749+#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)
61750+#define gr_log_fs_generic(audit, msg, dentry, mnt) gr_log_varargs(audit, msg, GR_FILENAME, dentry, mnt)
61751+#define gr_log_noargs(audit, msg) gr_log_varargs(audit, msg, GR_NOARGS)
61752+#define gr_log_int(audit, msg, num) gr_log_varargs(audit, msg, GR_ONE_INT, num)
61753+#define gr_log_int_str2(audit, msg, num, str1, str2) gr_log_varargs(audit, msg, GR_ONE_INT_TWO_STR, num, str1, str2)
61754+#define gr_log_str(audit, msg, str) gr_log_varargs(audit, msg, GR_ONE_STR, str)
61755+#define gr_log_str_int(audit, msg, str, num) gr_log_varargs(audit, msg, GR_STR_INT, str, num)
61756+#define gr_log_int_int(audit, msg, num1, num2) gr_log_varargs(audit, msg, GR_TWO_INT, num1, num2)
61757+#define gr_log_two_u64(audit, msg, num1, num2) gr_log_varargs(audit, msg, GR_TWO_U64, num1, num2)
61758+#define gr_log_int3(audit, msg, num1, num2, num3) gr_log_varargs(audit, msg, GR_THREE_INT, num1, num2, num3)
61759+#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)
61760+#define gr_log_str_str(audit, msg, str1, str2) gr_log_varargs(audit, msg, GR_TWO_STR, str1, str2)
61761+#define gr_log_str2_int(audit, msg, str1, str2, num) gr_log_varargs(audit, msg, GR_TWO_STR_INT, str1, str2, num)
61762+#define gr_log_str3(audit, msg, str1, str2, str3) gr_log_varargs(audit, msg, GR_THREE_STR, str1, str2, str3)
61763+#define gr_log_str4(audit, msg, str1, str2, str3, str4) gr_log_varargs(audit, msg, GR_FOUR_STR, str1, str2, str3, str4)
61764+#define gr_log_str_fs(audit, msg, str, dentry, mnt) gr_log_varargs(audit, msg, GR_STR_FILENAME, str, dentry, mnt)
61765+#define gr_log_fs_str(audit, msg, dentry, mnt, str) gr_log_varargs(audit, msg, GR_FILENAME_STR, dentry, mnt, str)
61766+#define gr_log_fs_int2(audit, msg, dentry, mnt, num1, num2) gr_log_varargs(audit, msg, GR_FILENAME_TWO_INT, dentry, mnt, num1, num2)
61767+#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)
61768+#define gr_log_textrel_ulong_ulong(audit, msg, file, ulong1, ulong2) gr_log_varargs(audit, msg, GR_TEXTREL, file, ulong1, ulong2)
61769+#define gr_log_ptrace(audit, msg, task) gr_log_varargs(audit, msg, GR_PTRACE, task)
61770+#define gr_log_res_ulong2_str(audit, msg, task, ulong1, str, ulong2) gr_log_varargs(audit, msg, GR_RESOURCE, task, ulong1, str, ulong2)
61771+#define gr_log_cap(audit, msg, task, str) gr_log_varargs(audit, msg, GR_CAP, task, str)
61772+#define gr_log_sig_addr(audit, msg, str, addr) gr_log_varargs(audit, msg, GR_SIG, str, addr)
61773+#define gr_log_sig_task(audit, msg, task, num) gr_log_varargs(audit, msg, GR_SIG2, task, num)
61774+#define gr_log_crash1(audit, msg, task, ulong) gr_log_varargs(audit, msg, GR_CRASH1, task, ulong)
61775+#define gr_log_crash2(audit, msg, task, ulong1) gr_log_varargs(audit, msg, GR_CRASH2, task, ulong1)
61776+#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)
61777+#define gr_log_rwxmap(audit, msg, str) gr_log_varargs(audit, msg, GR_RWXMAP, str)
61778+
61779+void gr_log_varargs(int audit, const char *msg, int argtypes, ...);
61780+
61781+#endif
61782+
61783+#endif
61784diff --git a/include/linux/grmsg.h b/include/linux/grmsg.h
61785new file mode 100644
61786index 0000000..ae576a1
61787--- /dev/null
61788+++ b/include/linux/grmsg.h
61789@@ -0,0 +1,109 @@
61790+#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"
61791+#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"
61792+#define GR_PTRACE_ACL_MSG "denied ptrace of %.950s(%.16s:%d) by "
61793+#define GR_STOPMOD_MSG "denied modification of module state by "
61794+#define GR_ROFS_BLOCKWRITE_MSG "denied write to block device %.950s by "
61795+#define GR_ROFS_MOUNT_MSG "denied writable mount of %.950s by "
61796+#define GR_IOPERM_MSG "denied use of ioperm() by "
61797+#define GR_IOPL_MSG "denied use of iopl() by "
61798+#define GR_SHMAT_ACL_MSG "denied attach of shared memory of UID %u, PID %d, ID %u by "
61799+#define GR_UNIX_CHROOT_MSG "denied connect() to abstract AF_UNIX socket outside of chroot by "
61800+#define GR_SHMAT_CHROOT_MSG "denied attach of shared memory outside of chroot by "
61801+#define GR_MEM_READWRITE_MSG "denied access of range %Lx -> %Lx in /dev/mem by "
61802+#define GR_SYMLINK_MSG "not following symlink %.950s owned by %d.%d by "
61803+#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"
61804+#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"
61805+#define GR_HIDDEN_ACL_MSG "%s access to hidden file %.950s by "
61806+#define GR_OPEN_ACL_MSG "%s open of %.950s for%s%s by "
61807+#define GR_CREATE_ACL_MSG "%s create of %.950s for%s%s by "
61808+#define GR_FIFO_MSG "denied writing FIFO %.950s of %d.%d by "
61809+#define GR_MKNOD_CHROOT_MSG "denied mknod of %.950s from chroot by "
61810+#define GR_MKNOD_ACL_MSG "%s mknod of %.950s by "
61811+#define GR_UNIXCONNECT_ACL_MSG "%s connect() to the unix domain socket %.950s by "
61812+#define GR_TTYSNIFF_ACL_MSG "terminal being sniffed by IP:%pI4 %.480s[%.16s:%d], parent %.480s[%.16s:%d] against "
61813+#define GR_MKDIR_ACL_MSG "%s mkdir of %.950s by "
61814+#define GR_RMDIR_ACL_MSG "%s rmdir of %.950s by "
61815+#define GR_UNLINK_ACL_MSG "%s unlink of %.950s by "
61816+#define GR_SYMLINK_ACL_MSG "%s symlink from %.480s to %.480s by "
61817+#define GR_HARDLINK_MSG "denied hardlink of %.930s (owned by %d.%d) to %.30s for "
61818+#define GR_LINK_ACL_MSG "%s link of %.480s to %.480s by "
61819+#define GR_INHERIT_ACL_MSG "successful inherit of %.480s's ACL for %.480s by "
61820+#define GR_RENAME_ACL_MSG "%s rename of %.480s to %.480s by "
61821+#define GR_UNSAFESHARE_EXEC_ACL_MSG "denied exec with cloned fs of %.950s by "
61822+#define GR_PTRACE_EXEC_ACL_MSG "denied ptrace of %.950s by "
61823+#define GR_EXEC_ACL_MSG "%s execution of %.950s by "
61824+#define GR_EXEC_TPE_MSG "denied untrusted exec (due to %.70s) of %.950s by "
61825+#define GR_SEGVSTART_ACL_MSG "possible exploit bruteforcing on " DEFAULTSECMSG " banning uid %u from login for %lu seconds"
61826+#define GR_SEGVNOSUID_ACL_MSG "possible exploit bruteforcing on " DEFAULTSECMSG " banning execution for %lu seconds"
61827+#define GR_MOUNT_CHROOT_MSG "denied mount of %.256s as %.930s from chroot by "
61828+#define GR_PIVOT_CHROOT_MSG "denied pivot_root from chroot by "
61829+#define GR_TRUNCATE_ACL_MSG "%s truncate of %.950s by "
61830+#define GR_ATIME_ACL_MSG "%s access time change of %.950s by "
61831+#define GR_ACCESS_ACL_MSG "%s access of %.950s for%s%s%s by "
61832+#define GR_CHROOT_CHROOT_MSG "denied double chroot to %.950s by "
61833+#define GR_CHMOD_CHROOT_MSG "denied chmod +s of %.950s by "
61834+#define GR_CHMOD_ACL_MSG "%s chmod of %.950s by "
61835+#define GR_CHROOT_FCHDIR_MSG "denied fchdir outside of chroot to %.950s by "
61836+#define GR_CHOWN_ACL_MSG "%s chown of %.950s by "
61837+#define GR_SETXATTR_ACL_MSG "%s setting extended attributes of %.950s by "
61838+#define GR_WRITLIB_ACL_MSG "denied load of writable library %.950s by "
61839+#define GR_INITF_ACL_MSG "init_variables() failed %s by "
61840+#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"
61841+#define GR_DEV_ACL_MSG "/dev/grsec: %d bytes sent %d required, being fed garbage by "
61842+#define GR_SHUTS_ACL_MSG "shutdown auth success for "
61843+#define GR_SHUTF_ACL_MSG "shutdown auth failure for "
61844+#define GR_SHUTI_ACL_MSG "ignoring shutdown for disabled RBAC system for "
61845+#define GR_SEGVMODS_ACL_MSG "segvmod auth success for "
61846+#define GR_SEGVMODF_ACL_MSG "segvmod auth failure for "
61847+#define GR_SEGVMODI_ACL_MSG "ignoring segvmod for disabled RBAC system for "
61848+#define GR_ENABLE_ACL_MSG "%s RBAC system loaded by "
61849+#define GR_ENABLEF_ACL_MSG "unable to load %s for "
61850+#define GR_RELOADI_ACL_MSG "ignoring reload request for disabled RBAC system"
61851+#define GR_RELOAD_ACL_MSG "%s RBAC system reloaded by "
61852+#define GR_RELOADF_ACL_MSG "failed reload of %s for "
61853+#define GR_SPROLEI_ACL_MSG "ignoring change to special role for disabled RBAC system for "
61854+#define GR_SPROLES_ACL_MSG "successful change to special role %s (id %d) by "
61855+#define GR_SPROLEL_ACL_MSG "special role %s (id %d) exited by "
61856+#define GR_SPROLEF_ACL_MSG "special role %s failure for "
61857+#define GR_UNSPROLEI_ACL_MSG "ignoring unauth of special role for disabled RBAC system for "
61858+#define GR_UNSPROLES_ACL_MSG "successful unauth of special role %s (id %d) by "
61859+#define GR_INVMODE_ACL_MSG "invalid mode %d by "
61860+#define GR_PRIORITY_CHROOT_MSG "denied priority change of process (%.16s:%d) by "
61861+#define GR_FAILFORK_MSG "failed fork with errno %s by "
61862+#define GR_NICE_CHROOT_MSG "denied priority change by "
61863+#define GR_UNISIGLOG_MSG "%.32s occurred at %p in "
61864+#define GR_DUALSIGLOG_MSG "signal %d sent to " DEFAULTSECMSG " by "
61865+#define GR_SIG_ACL_MSG "denied send of signal %d to protected task " DEFAULTSECMSG " by "
61866+#define GR_SYSCTL_MSG "denied modification of grsecurity sysctl value : %.32s by "
61867+#define GR_SYSCTL_ACL_MSG "%s sysctl of %.950s for%s%s by "
61868+#define GR_TIME_MSG "time set by "
61869+#define GR_DEFACL_MSG "fatal: unable to find subject for (%.16s:%d), loaded by "
61870+#define GR_MMAP_ACL_MSG "%s executable mmap of %.950s by "
61871+#define GR_MPROTECT_ACL_MSG "%s executable mprotect of %.950s by "
61872+#define GR_SOCK_MSG "denied socket(%.16s,%.16s,%.16s) by "
61873+#define GR_SOCK_NOINET_MSG "denied socket(%.16s,%.16s,%d) by "
61874+#define GR_BIND_MSG "denied bind() by "
61875+#define GR_CONNECT_MSG "denied connect() by "
61876+#define GR_BIND_ACL_MSG "denied bind() to %pI4 port %u sock type %.16s protocol %.16s by "
61877+#define GR_CONNECT_ACL_MSG "denied connect() to %pI4 port %u sock type %.16s protocol %.16s by "
61878+#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"
61879+#define GR_EXEC_CHROOT_MSG "exec of %.980s within chroot by process "
61880+#define GR_CAP_ACL_MSG "use of %s denied for "
61881+#define GR_CAP_CHROOT_MSG "use of %s in chroot denied for "
61882+#define GR_CAP_ACL_MSG2 "use of %s permitted for "
61883+#define GR_USRCHANGE_ACL_MSG "change to uid %u denied for "
61884+#define GR_GRPCHANGE_ACL_MSG "change to gid %u denied for "
61885+#define GR_REMOUNT_AUDIT_MSG "remount of %.256s by "
61886+#define GR_UNMOUNT_AUDIT_MSG "unmount of %.256s by "
61887+#define GR_MOUNT_AUDIT_MSG "mount of %.256s to %.256s by "
61888+#define GR_CHDIR_AUDIT_MSG "chdir to %.980s by "
61889+#define GR_EXEC_AUDIT_MSG "exec of %.930s (%.128s) by "
61890+#define GR_RESOURCE_MSG "denied resource overstep by requesting %lu for %.16s against limit %lu for "
61891+#define GR_RWXMMAP_MSG "denied RWX mmap of %.950s by "
61892+#define GR_RWXMPROTECT_MSG "denied RWX mprotect of %.950s by "
61893+#define GR_TEXTREL_AUDIT_MSG "text relocation in %s, VMA:0x%08lx 0x%08lx by "
61894+#define GR_VM86_MSG "denied use of vm86 by "
61895+#define GR_PTRACE_AUDIT_MSG "process %.950s(%.16s:%d) attached to via ptrace by "
61896+#define GR_PTRACE_READEXEC_MSG "denied ptrace of unreadable binary %.950s by "
61897+#define GR_INIT_TRANSFER_MSG "persistent special role transferred privilege to init by "
61898+#define GR_BADPROCPID_MSG "denied read of sensitive /proc/pid/%s entry via fd passed across exec by "
61899diff --git a/include/linux/grsecurity.h b/include/linux/grsecurity.h
61900new file mode 100644
61901index 0000000..2ccf677
61902--- /dev/null
61903+++ b/include/linux/grsecurity.h
61904@@ -0,0 +1,229 @@
61905+#ifndef GR_SECURITY_H
61906+#define GR_SECURITY_H
61907+#include <linux/fs.h>
61908+#include <linux/fs_struct.h>
61909+#include <linux/binfmts.h>
61910+#include <linux/gracl.h>
61911+
61912+/* notify of brain-dead configs */
61913+#if defined(CONFIG_GRKERNSEC_PROC_USER) && defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
61914+#error "CONFIG_GRKERNSEC_PROC_USER and CONFIG_GRKERNSEC_PROC_USERGROUP cannot both be enabled."
61915+#endif
61916+#if defined(CONFIG_PAX_NOEXEC) && !defined(CONFIG_PAX_PAGEEXEC) && !defined(CONFIG_PAX_SEGMEXEC) && !defined(CONFIG_PAX_KERNEXEC)
61917+#error "CONFIG_PAX_NOEXEC enabled, but PAGEEXEC, SEGMEXEC, and KERNEXEC are disabled."
61918+#endif
61919+#if defined(CONFIG_PAX_ASLR) && !defined(CONFIG_PAX_RANDKSTACK) && !defined(CONFIG_PAX_RANDUSTACK) && !defined(CONFIG_PAX_RANDMMAP)
61920+#error "CONFIG_PAX_ASLR enabled, but RANDKSTACK, RANDUSTACK, and RANDMMAP are disabled."
61921+#endif
61922+#if defined(CONFIG_PAX) && !defined(CONFIG_PAX_NOEXEC) && !defined(CONFIG_PAX_ASLR)
61923+#error "CONFIG_PAX enabled, but no PaX options are enabled."
61924+#endif
61925+
61926+#include <linux/compat.h>
61927+
61928+struct user_arg_ptr {
61929+#ifdef CONFIG_COMPAT
61930+ bool is_compat;
61931+#endif
61932+ union {
61933+ const char __user *const __user *native;
61934+#ifdef CONFIG_COMPAT
61935+ compat_uptr_t __user *compat;
61936+#endif
61937+ } ptr;
61938+};
61939+
61940+void gr_handle_brute_attach(struct task_struct *p, unsigned long mm_flags);
61941+void gr_handle_brute_check(void);
61942+void gr_handle_kernel_exploit(void);
61943+int gr_process_user_ban(void);
61944+
61945+char gr_roletype_to_char(void);
61946+
61947+int gr_acl_enable_at_secure(void);
61948+
61949+int gr_check_user_change(int real, int effective, int fs);
61950+int gr_check_group_change(int real, int effective, int fs);
61951+
61952+void gr_del_task_from_ip_table(struct task_struct *p);
61953+
61954+int gr_pid_is_chrooted(struct task_struct *p);
61955+int gr_handle_chroot_fowner(struct pid *pid, enum pid_type type);
61956+int gr_handle_chroot_nice(void);
61957+int gr_handle_chroot_sysctl(const int op);
61958+int gr_handle_chroot_setpriority(struct task_struct *p,
61959+ const int niceval);
61960+int gr_chroot_fchdir(struct dentry *u_dentry, struct vfsmount *u_mnt);
61961+int gr_handle_chroot_chroot(const struct dentry *dentry,
61962+ const struct vfsmount *mnt);
61963+void gr_handle_chroot_chdir(struct path *path);
61964+int gr_handle_chroot_chmod(const struct dentry *dentry,
61965+ const struct vfsmount *mnt, const int mode);
61966+int gr_handle_chroot_mknod(const struct dentry *dentry,
61967+ const struct vfsmount *mnt, const int mode);
61968+int gr_handle_chroot_mount(const struct dentry *dentry,
61969+ const struct vfsmount *mnt,
61970+ const char *dev_name);
61971+int gr_handle_chroot_pivot(void);
61972+int gr_handle_chroot_unix(const pid_t pid);
61973+
61974+int gr_handle_rawio(const struct inode *inode);
61975+
61976+void gr_handle_ioperm(void);
61977+void gr_handle_iopl(void);
61978+
61979+umode_t gr_acl_umask(void);
61980+
61981+int gr_tpe_allow(const struct file *file);
61982+
61983+void gr_set_chroot_entries(struct task_struct *task, struct path *path);
61984+void gr_clear_chroot_entries(struct task_struct *task);
61985+
61986+void gr_log_forkfail(const int retval);
61987+void gr_log_timechange(void);
61988+void gr_log_signal(const int sig, const void *addr, const struct task_struct *t);
61989+void gr_log_chdir(const struct dentry *dentry,
61990+ const struct vfsmount *mnt);
61991+void gr_log_chroot_exec(const struct dentry *dentry,
61992+ const struct vfsmount *mnt);
61993+void gr_handle_exec_args(struct linux_binprm *bprm, struct user_arg_ptr argv);
61994+void gr_log_remount(const char *devname, const int retval);
61995+void gr_log_unmount(const char *devname, const int retval);
61996+void gr_log_mount(const char *from, const char *to, const int retval);
61997+void gr_log_textrel(struct vm_area_struct *vma);
61998+void gr_log_rwxmmap(struct file *file);
61999+void gr_log_rwxmprotect(struct file *file);
62000+
62001+int gr_handle_follow_link(const struct inode *parent,
62002+ const struct inode *inode,
62003+ const struct dentry *dentry,
62004+ const struct vfsmount *mnt);
62005+int gr_handle_fifo(const struct dentry *dentry,
62006+ const struct vfsmount *mnt,
62007+ const struct dentry *dir, const int flag,
62008+ const int acc_mode);
62009+int gr_handle_hardlink(const struct dentry *dentry,
62010+ const struct vfsmount *mnt,
62011+ struct inode *inode,
62012+ const int mode, const char *to);
62013+
62014+int gr_is_capable(const int cap);
62015+int gr_is_capable_nolog(const int cap);
62016+void gr_learn_resource(const struct task_struct *task, const int limit,
62017+ const unsigned long wanted, const int gt);
62018+void gr_copy_label(struct task_struct *tsk);
62019+void gr_handle_crash(struct task_struct *task, const int sig);
62020+int gr_handle_signal(const struct task_struct *p, const int sig);
62021+int gr_check_crash_uid(const uid_t uid);
62022+int gr_check_protected_task(const struct task_struct *task);
62023+int gr_check_protected_task_fowner(struct pid *pid, enum pid_type type);
62024+int gr_acl_handle_mmap(const struct file *file,
62025+ const unsigned long prot);
62026+int gr_acl_handle_mprotect(const struct file *file,
62027+ const unsigned long prot);
62028+int gr_check_hidden_task(const struct task_struct *tsk);
62029+__u32 gr_acl_handle_truncate(const struct dentry *dentry,
62030+ const struct vfsmount *mnt);
62031+__u32 gr_acl_handle_utime(const struct dentry *dentry,
62032+ const struct vfsmount *mnt);
62033+__u32 gr_acl_handle_access(const struct dentry *dentry,
62034+ const struct vfsmount *mnt, const int fmode);
62035+__u32 gr_acl_handle_chmod(const struct dentry *dentry,
62036+ const struct vfsmount *mnt, umode_t *mode);
62037+__u32 gr_acl_handle_chown(const struct dentry *dentry,
62038+ const struct vfsmount *mnt);
62039+__u32 gr_acl_handle_setxattr(const struct dentry *dentry,
62040+ const struct vfsmount *mnt);
62041+int gr_handle_ptrace(struct task_struct *task, const long request);
62042+int gr_handle_proc_ptrace(struct task_struct *task);
62043+__u32 gr_acl_handle_execve(const struct dentry *dentry,
62044+ const struct vfsmount *mnt);
62045+int gr_check_crash_exec(const struct file *filp);
62046+int gr_acl_is_enabled(void);
62047+void gr_set_kernel_label(struct task_struct *task);
62048+void gr_set_role_label(struct task_struct *task, const uid_t uid,
62049+ const gid_t gid);
62050+int gr_set_proc_label(const struct dentry *dentry,
62051+ const struct vfsmount *mnt,
62052+ const int unsafe_flags);
62053+__u32 gr_acl_handle_hidden_file(const struct dentry *dentry,
62054+ const struct vfsmount *mnt);
62055+__u32 gr_acl_handle_open(const struct dentry *dentry,
62056+ const struct vfsmount *mnt, int acc_mode);
62057+__u32 gr_acl_handle_creat(const struct dentry *dentry,
62058+ const struct dentry *p_dentry,
62059+ const struct vfsmount *p_mnt,
62060+ int open_flags, int acc_mode, const int imode);
62061+void gr_handle_create(const struct dentry *dentry,
62062+ const struct vfsmount *mnt);
62063+void gr_handle_proc_create(const struct dentry *dentry,
62064+ const struct inode *inode);
62065+__u32 gr_acl_handle_mknod(const struct dentry *new_dentry,
62066+ const struct dentry *parent_dentry,
62067+ const struct vfsmount *parent_mnt,
62068+ const int mode);
62069+__u32 gr_acl_handle_mkdir(const struct dentry *new_dentry,
62070+ const struct dentry *parent_dentry,
62071+ const struct vfsmount *parent_mnt);
62072+__u32 gr_acl_handle_rmdir(const struct dentry *dentry,
62073+ const struct vfsmount *mnt);
62074+void gr_handle_delete(const ino_t ino, const dev_t dev);
62075+__u32 gr_acl_handle_unlink(const struct dentry *dentry,
62076+ const struct vfsmount *mnt);
62077+__u32 gr_acl_handle_symlink(const struct dentry *new_dentry,
62078+ const struct dentry *parent_dentry,
62079+ const struct vfsmount *parent_mnt,
62080+ const char *from);
62081+__u32 gr_acl_handle_link(const struct dentry *new_dentry,
62082+ const struct dentry *parent_dentry,
62083+ const struct vfsmount *parent_mnt,
62084+ const struct dentry *old_dentry,
62085+ const struct vfsmount *old_mnt, const char *to);
62086+int gr_acl_handle_rename(struct dentry *new_dentry,
62087+ struct dentry *parent_dentry,
62088+ const struct vfsmount *parent_mnt,
62089+ struct dentry *old_dentry,
62090+ struct inode *old_parent_inode,
62091+ struct vfsmount *old_mnt, const char *newname);
62092+void gr_handle_rename(struct inode *old_dir, struct inode *new_dir,
62093+ struct dentry *old_dentry,
62094+ struct dentry *new_dentry,
62095+ struct vfsmount *mnt, const __u8 replace);
62096+__u32 gr_check_link(const struct dentry *new_dentry,
62097+ const struct dentry *parent_dentry,
62098+ const struct vfsmount *parent_mnt,
62099+ const struct dentry *old_dentry,
62100+ const struct vfsmount *old_mnt);
62101+int gr_acl_handle_filldir(const struct file *file, const char *name,
62102+ const unsigned int namelen, const ino_t ino);
62103+
62104+__u32 gr_acl_handle_unix(const struct dentry *dentry,
62105+ const struct vfsmount *mnt);
62106+void gr_acl_handle_exit(void);
62107+void gr_acl_handle_psacct(struct task_struct *task, const long code);
62108+int gr_acl_handle_procpidmem(const struct task_struct *task);
62109+int gr_handle_rofs_mount(struct dentry *dentry, struct vfsmount *mnt, int mnt_flags);
62110+int gr_handle_rofs_blockwrite(struct dentry *dentry, struct vfsmount *mnt, int acc_mode);
62111+void gr_audit_ptrace(struct task_struct *task);
62112+dev_t gr_get_dev_from_dentry(struct dentry *dentry);
62113+
62114+int gr_ptrace_readexec(struct file *file, int unsafe_flags);
62115+
62116+#ifdef CONFIG_GRKERNSEC
62117+void task_grsec_rbac(struct seq_file *m, struct task_struct *p);
62118+void gr_handle_vm86(void);
62119+void gr_handle_mem_readwrite(u64 from, u64 to);
62120+
62121+void gr_log_badprocpid(const char *entry);
62122+
62123+extern int grsec_enable_dmesg;
62124+extern int grsec_disable_privio;
62125+#ifdef CONFIG_GRKERNSEC_CHROOT_FINDTASK
62126+extern int grsec_enable_chroot_findtask;
62127+#endif
62128+#ifdef CONFIG_GRKERNSEC_SETXID
62129+extern int grsec_enable_setxid;
62130+#endif
62131+#endif
62132+
62133+#endif
62134diff --git a/include/linux/grsock.h b/include/linux/grsock.h
62135new file mode 100644
62136index 0000000..e7ffaaf
62137--- /dev/null
62138+++ b/include/linux/grsock.h
62139@@ -0,0 +1,19 @@
62140+#ifndef __GRSOCK_H
62141+#define __GRSOCK_H
62142+
62143+extern void gr_attach_curr_ip(const struct sock *sk);
62144+extern int gr_handle_sock_all(const int family, const int type,
62145+ const int protocol);
62146+extern int gr_handle_sock_server(const struct sockaddr *sck);
62147+extern int gr_handle_sock_server_other(const struct sock *sck);
62148+extern int gr_handle_sock_client(const struct sockaddr *sck);
62149+extern int gr_search_connect(struct socket * sock,
62150+ struct sockaddr_in * addr);
62151+extern int gr_search_bind(struct socket * sock,
62152+ struct sockaddr_in * addr);
62153+extern int gr_search_listen(struct socket * sock);
62154+extern int gr_search_accept(struct socket * sock);
62155+extern int gr_search_socket(const int domain, const int type,
62156+ const int protocol);
62157+
62158+#endif
62159diff --git a/include/linux/hid.h b/include/linux/hid.h
62160index c235e4e..f0cf7a0 100644
62161--- a/include/linux/hid.h
62162+++ b/include/linux/hid.h
62163@@ -679,7 +679,7 @@ struct hid_ll_driver {
62164 unsigned int code, int value);
62165
62166 int (*parse)(struct hid_device *hdev);
62167-};
62168+} __no_const;
62169
62170 #define PM_HINT_FULLON 1<<5
62171 #define PM_HINT_NORMAL 1<<1
62172diff --git a/include/linux/highmem.h b/include/linux/highmem.h
62173index 3a93f73..b19d0b3 100644
62174--- a/include/linux/highmem.h
62175+++ b/include/linux/highmem.h
62176@@ -185,6 +185,18 @@ static inline void clear_highpage(struct page *page)
62177 kunmap_atomic(kaddr, KM_USER0);
62178 }
62179
62180+static inline void sanitize_highpage(struct page *page)
62181+{
62182+ void *kaddr;
62183+ unsigned long flags;
62184+
62185+ local_irq_save(flags);
62186+ kaddr = kmap_atomic(page, KM_CLEARPAGE);
62187+ clear_page(kaddr);
62188+ kunmap_atomic(kaddr, KM_CLEARPAGE);
62189+ local_irq_restore(flags);
62190+}
62191+
62192 static inline void zero_user_segments(struct page *page,
62193 unsigned start1, unsigned end1,
62194 unsigned start2, unsigned end2)
62195diff --git a/include/linux/i2c.h b/include/linux/i2c.h
62196index 07d103a..04ec65b 100644
62197--- a/include/linux/i2c.h
62198+++ b/include/linux/i2c.h
62199@@ -364,6 +364,7 @@ struct i2c_algorithm {
62200 /* To determine what the adapter supports */
62201 u32 (*functionality) (struct i2c_adapter *);
62202 };
62203+typedef struct i2c_algorithm __no_const i2c_algorithm_no_const;
62204
62205 /*
62206 * i2c_adapter is the structure used to identify a physical i2c bus along
62207diff --git a/include/linux/i2o.h b/include/linux/i2o.h
62208index a6deef4..c56a7f2 100644
62209--- a/include/linux/i2o.h
62210+++ b/include/linux/i2o.h
62211@@ -564,7 +564,7 @@ struct i2o_controller {
62212 struct i2o_device *exec; /* Executive */
62213 #if BITS_PER_LONG == 64
62214 spinlock_t context_list_lock; /* lock for context_list */
62215- atomic_t context_list_counter; /* needed for unique contexts */
62216+ atomic_unchecked_t context_list_counter; /* needed for unique contexts */
62217 struct list_head context_list; /* list of context id's
62218 and pointers */
62219 #endif
62220diff --git a/include/linux/init.h b/include/linux/init.h
62221index 9146f39..885354d 100644
62222--- a/include/linux/init.h
62223+++ b/include/linux/init.h
62224@@ -293,13 +293,13 @@ void __init parse_early_options(char *cmdline);
62225
62226 /* Each module must use one module_init(). */
62227 #define module_init(initfn) \
62228- static inline initcall_t __inittest(void) \
62229+ static inline __used initcall_t __inittest(void) \
62230 { return initfn; } \
62231 int init_module(void) __attribute__((alias(#initfn)));
62232
62233 /* This is only required if you want to be unloadable. */
62234 #define module_exit(exitfn) \
62235- static inline exitcall_t __exittest(void) \
62236+ static inline __used exitcall_t __exittest(void) \
62237 { return exitfn; } \
62238 void cleanup_module(void) __attribute__((alias(#exitfn)));
62239
62240diff --git a/include/linux/init_task.h b/include/linux/init_task.h
62241index 32574ee..00d4ef1 100644
62242--- a/include/linux/init_task.h
62243+++ b/include/linux/init_task.h
62244@@ -128,6 +128,12 @@ extern struct cred init_cred;
62245
62246 #define INIT_TASK_COMM "swapper"
62247
62248+#ifdef CONFIG_X86
62249+#define INIT_TASK_THREAD_INFO .tinfo = INIT_THREAD_INFO,
62250+#else
62251+#define INIT_TASK_THREAD_INFO
62252+#endif
62253+
62254 /*
62255 * INIT_TASK is used to set up the first task table, touch at
62256 * your own risk!. Base=0, limit=0x1fffff (=2MB)
62257@@ -166,6 +172,7 @@ extern struct cred init_cred;
62258 RCU_INIT_POINTER(.cred, &init_cred), \
62259 .comm = INIT_TASK_COMM, \
62260 .thread = INIT_THREAD, \
62261+ INIT_TASK_THREAD_INFO \
62262 .fs = &init_fs, \
62263 .files = &init_files, \
62264 .signal = &init_signals, \
62265diff --git a/include/linux/intel-iommu.h b/include/linux/intel-iommu.h
62266index e6ca56d..8583707 100644
62267--- a/include/linux/intel-iommu.h
62268+++ b/include/linux/intel-iommu.h
62269@@ -296,7 +296,7 @@ struct iommu_flush {
62270 u8 fm, u64 type);
62271 void (*flush_iotlb)(struct intel_iommu *iommu, u16 did, u64 addr,
62272 unsigned int size_order, u64 type);
62273-};
62274+} __no_const;
62275
62276 enum {
62277 SR_DMAR_FECTL_REG,
62278diff --git a/include/linux/interrupt.h b/include/linux/interrupt.h
62279index a64b00e..464d8bc 100644
62280--- a/include/linux/interrupt.h
62281+++ b/include/linux/interrupt.h
62282@@ -441,7 +441,7 @@ enum
62283 /* map softirq index to softirq name. update 'softirq_to_name' in
62284 * kernel/softirq.c when adding a new softirq.
62285 */
62286-extern char *softirq_to_name[NR_SOFTIRQS];
62287+extern const char * const softirq_to_name[NR_SOFTIRQS];
62288
62289 /* softirq mask and active fields moved to irq_cpustat_t in
62290 * asm/hardirq.h to get better cache usage. KAO
62291@@ -449,12 +449,12 @@ extern char *softirq_to_name[NR_SOFTIRQS];
62292
62293 struct softirq_action
62294 {
62295- void (*action)(struct softirq_action *);
62296+ void (*action)(void);
62297 };
62298
62299 asmlinkage void do_softirq(void);
62300 asmlinkage void __do_softirq(void);
62301-extern void open_softirq(int nr, void (*action)(struct softirq_action *));
62302+extern void open_softirq(int nr, void (*action)(void));
62303 extern void softirq_init(void);
62304 static inline void __raise_softirq_irqoff(unsigned int nr)
62305 {
62306diff --git a/include/linux/kallsyms.h b/include/linux/kallsyms.h
62307index 3875719..4cd454c 100644
62308--- a/include/linux/kallsyms.h
62309+++ b/include/linux/kallsyms.h
62310@@ -15,7 +15,8 @@
62311
62312 struct module;
62313
62314-#ifdef CONFIG_KALLSYMS
62315+#if !defined(__INCLUDED_BY_HIDESYM) || !defined(CONFIG_KALLSYMS)
62316+#if defined(CONFIG_KALLSYMS) && !defined(CONFIG_GRKERNSEC_HIDESYM)
62317 /* Lookup the address for a symbol. Returns 0 if not found. */
62318 unsigned long kallsyms_lookup_name(const char *name);
62319
62320@@ -99,6 +100,16 @@ static inline int lookup_symbol_attrs(unsigned long addr, unsigned long *size, u
62321 /* Stupid that this does nothing, but I didn't create this mess. */
62322 #define __print_symbol(fmt, addr)
62323 #endif /*CONFIG_KALLSYMS*/
62324+#else /* when included by kallsyms.c, vsnprintf.c, or
62325+ arch/x86/kernel/dumpstack.c, with HIDESYM enabled */
62326+extern void __print_symbol(const char *fmt, unsigned long address);
62327+extern int sprint_backtrace(char *buffer, unsigned long address);
62328+extern int sprint_symbol(char *buffer, unsigned long address);
62329+const char *kallsyms_lookup(unsigned long addr,
62330+ unsigned long *symbolsize,
62331+ unsigned long *offset,
62332+ char **modname, char *namebuf);
62333+#endif
62334
62335 /* This macro allows us to keep printk typechecking */
62336 static __printf(1, 2)
62337diff --git a/include/linux/kgdb.h b/include/linux/kgdb.h
62338index fa39183..40160be 100644
62339--- a/include/linux/kgdb.h
62340+++ b/include/linux/kgdb.h
62341@@ -53,7 +53,7 @@ extern int kgdb_connected;
62342 extern int kgdb_io_module_registered;
62343
62344 extern atomic_t kgdb_setting_breakpoint;
62345-extern atomic_t kgdb_cpu_doing_single_step;
62346+extern atomic_unchecked_t kgdb_cpu_doing_single_step;
62347
62348 extern struct task_struct *kgdb_usethread;
62349 extern struct task_struct *kgdb_contthread;
62350@@ -251,7 +251,7 @@ struct kgdb_arch {
62351 void (*disable_hw_break)(struct pt_regs *regs);
62352 void (*remove_all_hw_break)(void);
62353 void (*correct_hw_break)(void);
62354-};
62355+} __do_const;
62356
62357 /**
62358 * struct kgdb_io - Describe the interface for an I/O driver to talk with KGDB.
62359@@ -276,7 +276,7 @@ struct kgdb_io {
62360 void (*pre_exception) (void);
62361 void (*post_exception) (void);
62362 int is_console;
62363-};
62364+} __do_const;
62365
62366 extern struct kgdb_arch arch_kgdb_ops;
62367
62368diff --git a/include/linux/kmod.h b/include/linux/kmod.h
62369index b16f653..eb908f4 100644
62370--- a/include/linux/kmod.h
62371+++ b/include/linux/kmod.h
62372@@ -34,6 +34,8 @@ extern char modprobe_path[]; /* for sysctl */
62373 * usually useless though. */
62374 extern __printf(2, 3)
62375 int __request_module(bool wait, const char *name, ...);
62376+extern __printf(3, 4)
62377+int ___request_module(bool wait, char *param_name, const char *name, ...);
62378 #define request_module(mod...) __request_module(true, mod)
62379 #define request_module_nowait(mod...) __request_module(false, mod)
62380 #define try_then_request_module(x, mod...) \
62381diff --git a/include/linux/kvm_host.h b/include/linux/kvm_host.h
62382index d526231..c9599fc 100644
62383--- a/include/linux/kvm_host.h
62384+++ b/include/linux/kvm_host.h
62385@@ -308,7 +308,7 @@ void kvm_vcpu_uninit(struct kvm_vcpu *vcpu);
62386 void vcpu_load(struct kvm_vcpu *vcpu);
62387 void vcpu_put(struct kvm_vcpu *vcpu);
62388
62389-int kvm_init(void *opaque, unsigned vcpu_size, unsigned vcpu_align,
62390+int kvm_init(const void *opaque, unsigned vcpu_size, unsigned vcpu_align,
62391 struct module *module);
62392 void kvm_exit(void);
62393
62394@@ -385,20 +385,20 @@ void kvm_get_pfn(pfn_t pfn);
62395 int kvm_read_guest_page(struct kvm *kvm, gfn_t gfn, void *data, int offset,
62396 int len);
62397 int kvm_read_guest_atomic(struct kvm *kvm, gpa_t gpa, void *data,
62398- unsigned long len);
62399-int kvm_read_guest(struct kvm *kvm, gpa_t gpa, void *data, unsigned long len);
62400+ unsigned long len) __size_overflow(4);
62401+int kvm_read_guest(struct kvm *kvm, gpa_t gpa, void *data, unsigned long len) __size_overflow(2,4);
62402 int kvm_read_guest_cached(struct kvm *kvm, struct gfn_to_hva_cache *ghc,
62403- void *data, unsigned long len);
62404+ void *data, unsigned long len) __size_overflow(4);
62405 int kvm_write_guest_page(struct kvm *kvm, gfn_t gfn, const void *data,
62406 int offset, int len);
62407 int kvm_write_guest(struct kvm *kvm, gpa_t gpa, const void *data,
62408- unsigned long len);
62409+ unsigned long len) __size_overflow(2,4);
62410 int kvm_write_guest_cached(struct kvm *kvm, struct gfn_to_hva_cache *ghc,
62411- void *data, unsigned long len);
62412+ void *data, unsigned long len) __size_overflow(4);
62413 int kvm_gfn_to_hva_cache_init(struct kvm *kvm, struct gfn_to_hva_cache *ghc,
62414 gpa_t gpa);
62415 int kvm_clear_guest_page(struct kvm *kvm, gfn_t gfn, int offset, int len);
62416-int kvm_clear_guest(struct kvm *kvm, gpa_t gpa, unsigned long len);
62417+int kvm_clear_guest(struct kvm *kvm, gpa_t gpa, unsigned long len) __size_overflow(2,3);
62418 struct kvm_memory_slot *gfn_to_memslot(struct kvm *kvm, gfn_t gfn);
62419 int kvm_is_visible_gfn(struct kvm *kvm, gfn_t gfn);
62420 unsigned long kvm_host_page_size(struct kvm *kvm, gfn_t gfn);
62421@@ -454,7 +454,7 @@ int kvm_arch_vcpu_ioctl_set_guest_debug(struct kvm_vcpu *vcpu,
62422 struct kvm_guest_debug *dbg);
62423 int kvm_arch_vcpu_ioctl_run(struct kvm_vcpu *vcpu, struct kvm_run *kvm_run);
62424
62425-int kvm_arch_init(void *opaque);
62426+int kvm_arch_init(const void *opaque);
62427 void kvm_arch_exit(void);
62428
62429 int kvm_arch_vcpu_init(struct kvm_vcpu *vcpu);
62430@@ -690,7 +690,7 @@ int kvm_setup_default_irq_routing(struct kvm *kvm);
62431 int kvm_set_irq_routing(struct kvm *kvm,
62432 const struct kvm_irq_routing_entry *entries,
62433 unsigned nr,
62434- unsigned flags);
62435+ unsigned flags) __size_overflow(3);
62436 void kvm_free_irq_routing(struct kvm *kvm);
62437
62438 #else
62439diff --git a/include/linux/libata.h b/include/linux/libata.h
62440index cafc09a..d7e7829 100644
62441--- a/include/linux/libata.h
62442+++ b/include/linux/libata.h
62443@@ -909,7 +909,7 @@ struct ata_port_operations {
62444 * fields must be pointers.
62445 */
62446 const struct ata_port_operations *inherits;
62447-};
62448+} __do_const;
62449
62450 struct ata_port_info {
62451 unsigned long flags;
62452diff --git a/include/linux/mca.h b/include/linux/mca.h
62453index 3797270..7765ede 100644
62454--- a/include/linux/mca.h
62455+++ b/include/linux/mca.h
62456@@ -80,7 +80,7 @@ struct mca_bus_accessor_functions {
62457 int region);
62458 void * (*mca_transform_memory)(struct mca_device *,
62459 void *memory);
62460-};
62461+} __no_const;
62462
62463 struct mca_bus {
62464 u64 default_dma_mask;
62465diff --git a/include/linux/memory.h b/include/linux/memory.h
62466index 935699b..11042cc 100644
62467--- a/include/linux/memory.h
62468+++ b/include/linux/memory.h
62469@@ -144,7 +144,7 @@ struct memory_accessor {
62470 size_t count);
62471 ssize_t (*write)(struct memory_accessor *, const char *buf,
62472 off_t offset, size_t count);
62473-};
62474+} __no_const;
62475
62476 /*
62477 * Kernel text modification mutex, used for code patching. Users of this lock
62478diff --git a/include/linux/mfd/abx500.h b/include/linux/mfd/abx500.h
62479index 9970337..9444122 100644
62480--- a/include/linux/mfd/abx500.h
62481+++ b/include/linux/mfd/abx500.h
62482@@ -188,6 +188,7 @@ struct abx500_ops {
62483 int (*event_registers_startup_state_get) (struct device *, u8 *);
62484 int (*startup_irq_enabled) (struct device *, unsigned int);
62485 };
62486+typedef struct abx500_ops __no_const abx500_ops_no_const;
62487
62488 int abx500_register_ops(struct device *core_dev, struct abx500_ops *ops);
62489 void abx500_remove_ops(struct device *dev);
62490diff --git a/include/linux/mm.h b/include/linux/mm.h
62491index 4baadd1..2e0b45e 100644
62492--- a/include/linux/mm.h
62493+++ b/include/linux/mm.h
62494@@ -115,7 +115,14 @@ extern unsigned int kobjsize(const void *objp);
62495
62496 #define VM_CAN_NONLINEAR 0x08000000 /* Has ->fault & does nonlinear pages */
62497 #define VM_MIXEDMAP 0x10000000 /* Can contain "struct page" and pure PFN pages */
62498+
62499+#if defined(CONFIG_PAX_PAGEEXEC) && defined(CONFIG_X86_32)
62500+#define VM_SAO 0x00000000 /* Strong Access Ordering (powerpc) */
62501+#define VM_PAGEEXEC 0x20000000 /* vma->vm_page_prot needs special handling */
62502+#else
62503 #define VM_SAO 0x20000000 /* Strong Access Ordering (powerpc) */
62504+#endif
62505+
62506 #define VM_PFN_AT_MMAP 0x40000000 /* PFNMAP vma that is fully mapped at mmap time */
62507 #define VM_MERGEABLE 0x80000000 /* KSM may merge identical pages */
62508
62509@@ -1012,34 +1019,6 @@ int set_page_dirty(struct page *page);
62510 int set_page_dirty_lock(struct page *page);
62511 int clear_page_dirty_for_io(struct page *page);
62512
62513-/* Is the vma a continuation of the stack vma above it? */
62514-static inline int vma_growsdown(struct vm_area_struct *vma, unsigned long addr)
62515-{
62516- return vma && (vma->vm_end == addr) && (vma->vm_flags & VM_GROWSDOWN);
62517-}
62518-
62519-static inline int stack_guard_page_start(struct vm_area_struct *vma,
62520- unsigned long addr)
62521-{
62522- return (vma->vm_flags & VM_GROWSDOWN) &&
62523- (vma->vm_start == addr) &&
62524- !vma_growsdown(vma->vm_prev, addr);
62525-}
62526-
62527-/* Is the vma a continuation of the stack vma below it? */
62528-static inline int vma_growsup(struct vm_area_struct *vma, unsigned long addr)
62529-{
62530- return vma && (vma->vm_start == addr) && (vma->vm_flags & VM_GROWSUP);
62531-}
62532-
62533-static inline int stack_guard_page_end(struct vm_area_struct *vma,
62534- unsigned long addr)
62535-{
62536- return (vma->vm_flags & VM_GROWSUP) &&
62537- (vma->vm_end == addr) &&
62538- !vma_growsup(vma->vm_next, addr);
62539-}
62540-
62541 extern unsigned long move_page_tables(struct vm_area_struct *vma,
62542 unsigned long old_addr, struct vm_area_struct *new_vma,
62543 unsigned long new_addr, unsigned long len);
62544@@ -1134,6 +1113,15 @@ static inline void sync_mm_rss(struct task_struct *task, struct mm_struct *mm)
62545 }
62546 #endif
62547
62548+#ifdef CONFIG_MMU
62549+pgprot_t vm_get_page_prot(vm_flags_t vm_flags);
62550+#else
62551+static inline pgprot_t vm_get_page_prot(vm_flags_t vm_flags)
62552+{
62553+ return __pgprot(0);
62554+}
62555+#endif
62556+
62557 int vma_wants_writenotify(struct vm_area_struct *vma);
62558
62559 extern pte_t *__get_locked_pte(struct mm_struct *mm, unsigned long addr,
62560@@ -1419,6 +1407,7 @@ out:
62561 }
62562
62563 extern int do_munmap(struct mm_struct *, unsigned long, size_t);
62564+extern int __do_munmap(struct mm_struct *, unsigned long, size_t);
62565
62566 extern unsigned long do_brk(unsigned long, unsigned long);
62567
62568@@ -1476,6 +1465,10 @@ extern struct vm_area_struct * find_vma(struct mm_struct * mm, unsigned long add
62569 extern struct vm_area_struct * find_vma_prev(struct mm_struct * mm, unsigned long addr,
62570 struct vm_area_struct **pprev);
62571
62572+extern struct vm_area_struct *pax_find_mirror_vma(struct vm_area_struct *vma);
62573+extern __must_check long pax_mirror_vma(struct vm_area_struct *vma_m, struct vm_area_struct *vma);
62574+extern void pax_mirror_file_pte(struct vm_area_struct *vma, unsigned long address, struct page *page_m, spinlock_t *ptl);
62575+
62576 /* Look up the first VMA which intersects the interval start_addr..end_addr-1,
62577 NULL if none. Assume start_addr < end_addr. */
62578 static inline struct vm_area_struct * find_vma_intersection(struct mm_struct * mm, unsigned long start_addr, unsigned long end_addr)
62579@@ -1492,15 +1485,6 @@ static inline unsigned long vma_pages(struct vm_area_struct *vma)
62580 return (vma->vm_end - vma->vm_start) >> PAGE_SHIFT;
62581 }
62582
62583-#ifdef CONFIG_MMU
62584-pgprot_t vm_get_page_prot(unsigned long vm_flags);
62585-#else
62586-static inline pgprot_t vm_get_page_prot(unsigned long vm_flags)
62587-{
62588- return __pgprot(0);
62589-}
62590-#endif
62591-
62592 struct vm_area_struct *find_extend_vma(struct mm_struct *, unsigned long addr);
62593 int remap_pfn_range(struct vm_area_struct *, unsigned long addr,
62594 unsigned long pfn, unsigned long size, pgprot_t);
62595@@ -1614,7 +1598,7 @@ extern int unpoison_memory(unsigned long pfn);
62596 extern int sysctl_memory_failure_early_kill;
62597 extern int sysctl_memory_failure_recovery;
62598 extern void shake_page(struct page *p, int access);
62599-extern atomic_long_t mce_bad_pages;
62600+extern atomic_long_unchecked_t mce_bad_pages;
62601 extern int soft_offline_page(struct page *page, int flags);
62602
62603 extern void dump_page(struct page *page);
62604@@ -1628,5 +1612,11 @@ extern void copy_user_huge_page(struct page *dst, struct page *src,
62605 unsigned int pages_per_huge_page);
62606 #endif /* CONFIG_TRANSPARENT_HUGEPAGE || CONFIG_HUGETLBFS */
62607
62608+#ifdef CONFIG_ARCH_TRACK_EXEC_LIMIT
62609+extern void track_exec_limit(struct mm_struct *mm, unsigned long start, unsigned long end, unsigned long prot);
62610+#else
62611+static inline void track_exec_limit(struct mm_struct *mm, unsigned long start, unsigned long end, unsigned long prot) {}
62612+#endif
62613+
62614 #endif /* __KERNEL__ */
62615 #endif /* _LINUX_MM_H */
62616diff --git a/include/linux/mm_types.h b/include/linux/mm_types.h
62617index 5b42f1b..759e4b4 100644
62618--- a/include/linux/mm_types.h
62619+++ b/include/linux/mm_types.h
62620@@ -253,6 +253,8 @@ struct vm_area_struct {
62621 #ifdef CONFIG_NUMA
62622 struct mempolicy *vm_policy; /* NUMA policy for the VMA */
62623 #endif
62624+
62625+ struct vm_area_struct *vm_mirror;/* PaX: mirror vma or NULL */
62626 };
62627
62628 struct core_thread {
62629@@ -389,6 +391,24 @@ struct mm_struct {
62630 #ifdef CONFIG_CPUMASK_OFFSTACK
62631 struct cpumask cpumask_allocation;
62632 #endif
62633+
62634+#if defined(CONFIG_PAX_NOEXEC) || defined(CONFIG_PAX_ASLR)
62635+ unsigned long pax_flags;
62636+#endif
62637+
62638+#ifdef CONFIG_PAX_DLRESOLVE
62639+ unsigned long call_dl_resolve;
62640+#endif
62641+
62642+#if defined(CONFIG_PPC32) && defined(CONFIG_PAX_EMUSIGRT)
62643+ unsigned long call_syscall;
62644+#endif
62645+
62646+#ifdef CONFIG_PAX_ASLR
62647+ unsigned long delta_mmap; /* randomized offset */
62648+ unsigned long delta_stack; /* randomized offset */
62649+#endif
62650+
62651 };
62652
62653 static inline void mm_init_cpumask(struct mm_struct *mm)
62654diff --git a/include/linux/mmu_notifier.h b/include/linux/mmu_notifier.h
62655index 1d1b1e1..2a13c78 100644
62656--- a/include/linux/mmu_notifier.h
62657+++ b/include/linux/mmu_notifier.h
62658@@ -255,12 +255,12 @@ static inline void mmu_notifier_mm_destroy(struct mm_struct *mm)
62659 */
62660 #define ptep_clear_flush_notify(__vma, __address, __ptep) \
62661 ({ \
62662- pte_t __pte; \
62663+ pte_t ___pte; \
62664 struct vm_area_struct *___vma = __vma; \
62665 unsigned long ___address = __address; \
62666- __pte = ptep_clear_flush(___vma, ___address, __ptep); \
62667+ ___pte = ptep_clear_flush(___vma, ___address, __ptep); \
62668 mmu_notifier_invalidate_page(___vma->vm_mm, ___address); \
62669- __pte; \
62670+ ___pte; \
62671 })
62672
62673 #define pmdp_clear_flush_notify(__vma, __address, __pmdp) \
62674diff --git a/include/linux/mmzone.h b/include/linux/mmzone.h
62675index 188cb2f..d78409b 100644
62676--- a/include/linux/mmzone.h
62677+++ b/include/linux/mmzone.h
62678@@ -369,7 +369,7 @@ struct zone {
62679 unsigned long flags; /* zone flags, see below */
62680
62681 /* Zone statistics */
62682- atomic_long_t vm_stat[NR_VM_ZONE_STAT_ITEMS];
62683+ atomic_long_unchecked_t vm_stat[NR_VM_ZONE_STAT_ITEMS];
62684
62685 /*
62686 * The target ratio of ACTIVE_ANON to INACTIVE_ANON pages on
62687diff --git a/include/linux/mod_devicetable.h b/include/linux/mod_devicetable.h
62688index 468819c..17b9db3 100644
62689--- a/include/linux/mod_devicetable.h
62690+++ b/include/linux/mod_devicetable.h
62691@@ -12,7 +12,7 @@
62692 typedef unsigned long kernel_ulong_t;
62693 #endif
62694
62695-#define PCI_ANY_ID (~0)
62696+#define PCI_ANY_ID ((__u16)~0)
62697
62698 struct pci_device_id {
62699 __u32 vendor, device; /* Vendor and device ID or PCI_ANY_ID*/
62700@@ -131,7 +131,7 @@ struct usb_device_id {
62701 #define USB_DEVICE_ID_MATCH_INT_SUBCLASS 0x0100
62702 #define USB_DEVICE_ID_MATCH_INT_PROTOCOL 0x0200
62703
62704-#define HID_ANY_ID (~0)
62705+#define HID_ANY_ID (~0U)
62706
62707 struct hid_device_id {
62708 __u16 bus;
62709diff --git a/include/linux/module.h b/include/linux/module.h
62710index 3cb7839..511cb87 100644
62711--- a/include/linux/module.h
62712+++ b/include/linux/module.h
62713@@ -17,6 +17,7 @@
62714 #include <linux/moduleparam.h>
62715 #include <linux/tracepoint.h>
62716 #include <linux/export.h>
62717+#include <linux/fs.h>
62718
62719 #include <linux/percpu.h>
62720 #include <asm/module.h>
62721@@ -261,19 +262,16 @@ struct module
62722 int (*init)(void);
62723
62724 /* If this is non-NULL, vfree after init() returns */
62725- void *module_init;
62726+ void *module_init_rx, *module_init_rw;
62727
62728 /* Here is the actual code + data, vfree'd on unload. */
62729- void *module_core;
62730+ void *module_core_rx, *module_core_rw;
62731
62732 /* Here are the sizes of the init and core sections */
62733- unsigned int init_size, core_size;
62734+ unsigned int init_size_rw, core_size_rw;
62735
62736 /* The size of the executable code in each section. */
62737- unsigned int init_text_size, core_text_size;
62738-
62739- /* Size of RO sections of the module (text+rodata) */
62740- unsigned int init_ro_size, core_ro_size;
62741+ unsigned int init_size_rx, core_size_rx;
62742
62743 /* Arch-specific module values */
62744 struct mod_arch_specific arch;
62745@@ -329,6 +327,10 @@ struct module
62746 #ifdef CONFIG_EVENT_TRACING
62747 struct ftrace_event_call **trace_events;
62748 unsigned int num_trace_events;
62749+ struct file_operations trace_id;
62750+ struct file_operations trace_enable;
62751+ struct file_operations trace_format;
62752+ struct file_operations trace_filter;
62753 #endif
62754 #ifdef CONFIG_FTRACE_MCOUNT_RECORD
62755 unsigned int num_ftrace_callsites;
62756@@ -379,16 +381,46 @@ bool is_module_address(unsigned long addr);
62757 bool is_module_percpu_address(unsigned long addr);
62758 bool is_module_text_address(unsigned long addr);
62759
62760+static inline int within_module_range(unsigned long addr, void *start, unsigned long size)
62761+{
62762+
62763+#ifdef CONFIG_PAX_KERNEXEC
62764+ if (ktla_ktva(addr) >= (unsigned long)start &&
62765+ ktla_ktva(addr) < (unsigned long)start + size)
62766+ return 1;
62767+#endif
62768+
62769+ return ((void *)addr >= start && (void *)addr < start + size);
62770+}
62771+
62772+static inline int within_module_core_rx(unsigned long addr, struct module *mod)
62773+{
62774+ return within_module_range(addr, mod->module_core_rx, mod->core_size_rx);
62775+}
62776+
62777+static inline int within_module_core_rw(unsigned long addr, struct module *mod)
62778+{
62779+ return within_module_range(addr, mod->module_core_rw, mod->core_size_rw);
62780+}
62781+
62782+static inline int within_module_init_rx(unsigned long addr, struct module *mod)
62783+{
62784+ return within_module_range(addr, mod->module_init_rx, mod->init_size_rx);
62785+}
62786+
62787+static inline int within_module_init_rw(unsigned long addr, struct module *mod)
62788+{
62789+ return within_module_range(addr, mod->module_init_rw, mod->init_size_rw);
62790+}
62791+
62792 static inline int within_module_core(unsigned long addr, struct module *mod)
62793 {
62794- return (unsigned long)mod->module_core <= addr &&
62795- addr < (unsigned long)mod->module_core + mod->core_size;
62796+ return within_module_core_rx(addr, mod) || within_module_core_rw(addr, mod);
62797 }
62798
62799 static inline int within_module_init(unsigned long addr, struct module *mod)
62800 {
62801- return (unsigned long)mod->module_init <= addr &&
62802- addr < (unsigned long)mod->module_init + mod->init_size;
62803+ return within_module_init_rx(addr, mod) || within_module_init_rw(addr, mod);
62804 }
62805
62806 /* Search for module by name: must hold module_mutex. */
62807diff --git a/include/linux/moduleloader.h b/include/linux/moduleloader.h
62808index b2be02e..edb10c9 100644
62809--- a/include/linux/moduleloader.h
62810+++ b/include/linux/moduleloader.h
62811@@ -23,11 +23,23 @@ unsigned int arch_mod_section_prepend(struct module *mod, unsigned int section);
62812
62813 /* Allocator used for allocating struct module, core sections and init
62814 sections. Returns NULL on failure. */
62815-void *module_alloc(unsigned long size);
62816+void *module_alloc(unsigned long size) __size_overflow(1);
62817+
62818+#ifdef CONFIG_PAX_KERNEXEC
62819+void *module_alloc_exec(unsigned long size);
62820+#else
62821+#define module_alloc_exec(x) module_alloc(x)
62822+#endif
62823
62824 /* Free memory returned from module_alloc. */
62825 void module_free(struct module *mod, void *module_region);
62826
62827+#ifdef CONFIG_PAX_KERNEXEC
62828+void module_free_exec(struct module *mod, void *module_region);
62829+#else
62830+#define module_free_exec(x, y) module_free((x), (y))
62831+#endif
62832+
62833 /* Apply the given relocation to the (simplified) ELF. Return -error
62834 or 0. */
62835 int apply_relocate(Elf_Shdr *sechdrs,
62836diff --git a/include/linux/moduleparam.h b/include/linux/moduleparam.h
62837index 7939f63..ec6df57 100644
62838--- a/include/linux/moduleparam.h
62839+++ b/include/linux/moduleparam.h
62840@@ -260,7 +260,7 @@ static inline void __kernel_param_unlock(void)
62841 * @len is usually just sizeof(string).
62842 */
62843 #define module_param_string(name, string, len, perm) \
62844- static const struct kparam_string __param_string_##name \
62845+ static const struct kparam_string __param_string_##name __used \
62846 = { len, string }; \
62847 __module_param_call(MODULE_PARAM_PREFIX, name, \
62848 &param_ops_string, \
62849@@ -395,7 +395,7 @@ extern int param_get_invbool(char *buffer, const struct kernel_param *kp);
62850 * module_param_named() for why this might be necessary.
62851 */
62852 #define module_param_array_named(name, array, type, nump, perm) \
62853- static const struct kparam_array __param_arr_##name \
62854+ static const struct kparam_array __param_arr_##name __used \
62855 = { .max = ARRAY_SIZE(array), .num = nump, \
62856 .ops = &param_ops_##type, \
62857 .elemsize = sizeof(array[0]), .elem = array }; \
62858diff --git a/include/linux/mtd/map.h b/include/linux/mtd/map.h
62859index a9e6ba4..0f9e29b 100644
62860--- a/include/linux/mtd/map.h
62861+++ b/include/linux/mtd/map.h
62862@@ -25,6 +25,7 @@
62863 #include <linux/types.h>
62864 #include <linux/list.h>
62865 #include <linux/string.h>
62866+#include <linux/kernel.h>
62867 #include <linux/bug.h>
62868
62869
62870diff --git a/include/linux/namei.h b/include/linux/namei.h
62871index ffc0213..2c1f2cb 100644
62872--- a/include/linux/namei.h
62873+++ b/include/linux/namei.h
62874@@ -24,7 +24,7 @@ struct nameidata {
62875 unsigned seq;
62876 int last_type;
62877 unsigned depth;
62878- char *saved_names[MAX_NESTED_LINKS + 1];
62879+ const char *saved_names[MAX_NESTED_LINKS + 1];
62880
62881 /* Intent data */
62882 union {
62883@@ -94,12 +94,12 @@ extern int follow_up(struct path *);
62884 extern struct dentry *lock_rename(struct dentry *, struct dentry *);
62885 extern void unlock_rename(struct dentry *, struct dentry *);
62886
62887-static inline void nd_set_link(struct nameidata *nd, char *path)
62888+static inline void nd_set_link(struct nameidata *nd, const char *path)
62889 {
62890 nd->saved_names[nd->depth] = path;
62891 }
62892
62893-static inline char *nd_get_link(struct nameidata *nd)
62894+static inline const char *nd_get_link(const struct nameidata *nd)
62895 {
62896 return nd->saved_names[nd->depth];
62897 }
62898diff --git a/include/linux/netdevice.h b/include/linux/netdevice.h
62899index a82ad4d..90d15b7 100644
62900--- a/include/linux/netdevice.h
62901+++ b/include/linux/netdevice.h
62902@@ -949,6 +949,7 @@ struct net_device_ops {
62903 int (*ndo_set_features)(struct net_device *dev,
62904 u32 features);
62905 };
62906+typedef struct net_device_ops __no_const net_device_ops_no_const;
62907
62908 /*
62909 * The DEVICE structure.
62910@@ -1088,7 +1089,7 @@ struct net_device {
62911 int iflink;
62912
62913 struct net_device_stats stats;
62914- atomic_long_t rx_dropped; /* dropped packets by core network
62915+ atomic_long_unchecked_t rx_dropped; /* dropped packets by core network
62916 * Do not use this in drivers.
62917 */
62918
62919diff --git a/include/linux/netfilter/xt_gradm.h b/include/linux/netfilter/xt_gradm.h
62920new file mode 100644
62921index 0000000..33f4af8
62922--- /dev/null
62923+++ b/include/linux/netfilter/xt_gradm.h
62924@@ -0,0 +1,9 @@
62925+#ifndef _LINUX_NETFILTER_XT_GRADM_H
62926+#define _LINUX_NETFILTER_XT_GRADM_H 1
62927+
62928+struct xt_gradm_mtinfo {
62929+ __u16 flags;
62930+ __u16 invflags;
62931+};
62932+
62933+#endif
62934diff --git a/include/linux/of_pdt.h b/include/linux/of_pdt.h
62935index c65a18a..0c05f3a 100644
62936--- a/include/linux/of_pdt.h
62937+++ b/include/linux/of_pdt.h
62938@@ -32,7 +32,7 @@ struct of_pdt_ops {
62939
62940 /* return 0 on success; fill in 'len' with number of bytes in path */
62941 int (*pkg2path)(phandle node, char *buf, const int buflen, int *len);
62942-};
62943+} __no_const;
62944
62945 extern void *prom_early_alloc(unsigned long size);
62946
62947diff --git a/include/linux/oprofile.h b/include/linux/oprofile.h
62948index a4c5624..2dabfb7 100644
62949--- a/include/linux/oprofile.h
62950+++ b/include/linux/oprofile.h
62951@@ -139,9 +139,9 @@ int oprofilefs_create_ulong(struct super_block * sb, struct dentry * root,
62952 int oprofilefs_create_ro_ulong(struct super_block * sb, struct dentry * root,
62953 char const * name, ulong * val);
62954
62955-/** Create a file for read-only access to an atomic_t. */
62956+/** Create a file for read-only access to an atomic_unchecked_t. */
62957 int oprofilefs_create_ro_atomic(struct super_block * sb, struct dentry * root,
62958- char const * name, atomic_t * val);
62959+ char const * name, atomic_unchecked_t * val);
62960
62961 /** create a directory */
62962 struct dentry * oprofilefs_mkdir(struct super_block * sb, struct dentry * root,
62963@@ -163,7 +163,7 @@ ssize_t oprofilefs_ulong_to_user(unsigned long val, char __user * buf, size_t co
62964 * Read an ASCII string for a number from a userspace buffer and fill *val on success.
62965 * Returns 0 on success, < 0 on error.
62966 */
62967-int oprofilefs_ulong_from_user(unsigned long * val, char const __user * buf, size_t count);
62968+int oprofilefs_ulong_from_user(unsigned long * val, char const __user * buf, size_t count) __size_overflow(3);
62969
62970 /** lock for read/write safety */
62971 extern raw_spinlock_t oprofilefs_lock;
62972diff --git a/include/linux/padata.h b/include/linux/padata.h
62973index 4633b2f..988bc08 100644
62974--- a/include/linux/padata.h
62975+++ b/include/linux/padata.h
62976@@ -129,7 +129,7 @@ struct parallel_data {
62977 struct padata_instance *pinst;
62978 struct padata_parallel_queue __percpu *pqueue;
62979 struct padata_serial_queue __percpu *squeue;
62980- atomic_t seq_nr;
62981+ atomic_unchecked_t seq_nr;
62982 atomic_t reorder_objects;
62983 atomic_t refcnt;
62984 unsigned int max_seq_nr;
62985diff --git a/include/linux/perf_event.h b/include/linux/perf_event.h
62986index b1f8912..c955bff 100644
62987--- a/include/linux/perf_event.h
62988+++ b/include/linux/perf_event.h
62989@@ -748,8 +748,8 @@ struct perf_event {
62990
62991 enum perf_event_active_state state;
62992 unsigned int attach_state;
62993- local64_t count;
62994- atomic64_t child_count;
62995+ local64_t count; /* PaX: fix it one day */
62996+ atomic64_unchecked_t child_count;
62997
62998 /*
62999 * These are the total time in nanoseconds that the event
63000@@ -800,8 +800,8 @@ struct perf_event {
63001 * These accumulate total time (in nanoseconds) that children
63002 * events have been enabled and running, respectively.
63003 */
63004- atomic64_t child_total_time_enabled;
63005- atomic64_t child_total_time_running;
63006+ atomic64_unchecked_t child_total_time_enabled;
63007+ atomic64_unchecked_t child_total_time_running;
63008
63009 /*
63010 * Protect attach/detach and child_list:
63011diff --git a/include/linux/personality.h b/include/linux/personality.h
63012index 8fc7dd1a..c19d89e 100644
63013--- a/include/linux/personality.h
63014+++ b/include/linux/personality.h
63015@@ -44,6 +44,7 @@ enum {
63016 #define PER_CLEAR_ON_SETID (READ_IMPLIES_EXEC | \
63017 ADDR_NO_RANDOMIZE | \
63018 ADDR_COMPAT_LAYOUT | \
63019+ ADDR_LIMIT_3GB | \
63020 MMAP_PAGE_ZERO)
63021
63022 /*
63023diff --git a/include/linux/pipe_fs_i.h b/include/linux/pipe_fs_i.h
63024index 77257c9..51d473a 100644
63025--- a/include/linux/pipe_fs_i.h
63026+++ b/include/linux/pipe_fs_i.h
63027@@ -46,9 +46,9 @@ struct pipe_buffer {
63028 struct pipe_inode_info {
63029 wait_queue_head_t wait;
63030 unsigned int nrbufs, curbuf, buffers;
63031- unsigned int readers;
63032- unsigned int writers;
63033- unsigned int waiting_writers;
63034+ atomic_t readers;
63035+ atomic_t writers;
63036+ atomic_t waiting_writers;
63037 unsigned int r_counter;
63038 unsigned int w_counter;
63039 struct page *tmp_page;
63040diff --git a/include/linux/pm_runtime.h b/include/linux/pm_runtime.h
63041index d3085e7..fd01052 100644
63042--- a/include/linux/pm_runtime.h
63043+++ b/include/linux/pm_runtime.h
63044@@ -95,7 +95,7 @@ static inline bool pm_runtime_callbacks_present(struct device *dev)
63045
63046 static inline void pm_runtime_mark_last_busy(struct device *dev)
63047 {
63048- ACCESS_ONCE(dev->power.last_busy) = jiffies;
63049+ ACCESS_ONCE_RW(dev->power.last_busy) = jiffies;
63050 }
63051
63052 #else /* !CONFIG_PM_RUNTIME */
63053diff --git a/include/linux/poison.h b/include/linux/poison.h
63054index 79159de..f1233a9 100644
63055--- a/include/linux/poison.h
63056+++ b/include/linux/poison.h
63057@@ -19,8 +19,8 @@
63058 * under normal circumstances, used to verify that nobody uses
63059 * non-initialized list entries.
63060 */
63061-#define LIST_POISON1 ((void *) 0x00100100 + POISON_POINTER_DELTA)
63062-#define LIST_POISON2 ((void *) 0x00200200 + POISON_POINTER_DELTA)
63063+#define LIST_POISON1 ((void *) (long)0xFFFFFF01)
63064+#define LIST_POISON2 ((void *) (long)0xFFFFFF02)
63065
63066 /********** include/linux/timer.h **********/
63067 /*
63068diff --git a/include/linux/preempt.h b/include/linux/preempt.h
63069index 58969b2..ead129b 100644
63070--- a/include/linux/preempt.h
63071+++ b/include/linux/preempt.h
63072@@ -123,7 +123,7 @@ struct preempt_ops {
63073 void (*sched_in)(struct preempt_notifier *notifier, int cpu);
63074 void (*sched_out)(struct preempt_notifier *notifier,
63075 struct task_struct *next);
63076-};
63077+} __no_const;
63078
63079 /**
63080 * preempt_notifier - key for installing preemption notifiers
63081diff --git a/include/linux/proc_fs.h b/include/linux/proc_fs.h
63082index 643b96c..ef55a9c 100644
63083--- a/include/linux/proc_fs.h
63084+++ b/include/linux/proc_fs.h
63085@@ -155,6 +155,19 @@ static inline struct proc_dir_entry *proc_create(const char *name, mode_t mode,
63086 return proc_create_data(name, mode, parent, proc_fops, NULL);
63087 }
63088
63089+static inline struct proc_dir_entry *proc_create_grsec(const char *name, mode_t mode,
63090+ struct proc_dir_entry *parent, const struct file_operations *proc_fops)
63091+{
63092+#ifdef CONFIG_GRKERNSEC_PROC_USER
63093+ return proc_create_data(name, S_IRUSR, parent, proc_fops, NULL);
63094+#elif defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
63095+ return proc_create_data(name, S_IRUSR | S_IRGRP, parent, proc_fops, NULL);
63096+#else
63097+ return proc_create_data(name, mode, parent, proc_fops, NULL);
63098+#endif
63099+}
63100+
63101+
63102 static inline struct proc_dir_entry *create_proc_read_entry(const char *name,
63103 mode_t mode, struct proc_dir_entry *base,
63104 read_proc_t *read_proc, void * data)
63105@@ -258,7 +271,7 @@ union proc_op {
63106 int (*proc_show)(struct seq_file *m,
63107 struct pid_namespace *ns, struct pid *pid,
63108 struct task_struct *task);
63109-};
63110+} __no_const;
63111
63112 struct ctl_table_header;
63113 struct ctl_table;
63114diff --git a/include/linux/ptrace.h b/include/linux/ptrace.h
63115index 800f113..e9ee2e3 100644
63116--- a/include/linux/ptrace.h
63117+++ b/include/linux/ptrace.h
63118@@ -129,10 +129,12 @@ extern void __ptrace_unlink(struct task_struct *child);
63119 extern void exit_ptrace(struct task_struct *tracer);
63120 #define PTRACE_MODE_READ 1
63121 #define PTRACE_MODE_ATTACH 2
63122-/* Returns 0 on success, -errno on denial. */
63123-extern int __ptrace_may_access(struct task_struct *task, unsigned int mode);
63124 /* Returns true on success, false on denial. */
63125 extern bool ptrace_may_access(struct task_struct *task, unsigned int mode);
63126+/* Returns true on success, false on denial. */
63127+extern bool ptrace_may_access_log(struct task_struct *task, unsigned int mode);
63128+/* Returns true on success, false on denial. */
63129+extern bool ptrace_may_access_nolock(struct task_struct *task, unsigned int mode);
63130
63131 static inline int ptrace_reparented(struct task_struct *child)
63132 {
63133diff --git a/include/linux/random.h b/include/linux/random.h
63134index 8f74538..02a1012 100644
63135--- a/include/linux/random.h
63136+++ b/include/linux/random.h
63137@@ -69,12 +69,17 @@ void srandom32(u32 seed);
63138
63139 u32 prandom32(struct rnd_state *);
63140
63141+static inline unsigned long pax_get_random_long(void)
63142+{
63143+ return random32() + (sizeof(long) > 4 ? (unsigned long)random32() << 32 : 0);
63144+}
63145+
63146 /*
63147 * Handle minimum values for seeds
63148 */
63149 static inline u32 __seed(u32 x, u32 m)
63150 {
63151- return (x < m) ? x + m : x;
63152+ return (x <= m) ? x + m + 1 : x;
63153 }
63154
63155 /**
63156diff --git a/include/linux/reboot.h b/include/linux/reboot.h
63157index e0879a7..a12f962 100644
63158--- a/include/linux/reboot.h
63159+++ b/include/linux/reboot.h
63160@@ -52,9 +52,9 @@ extern int unregister_reboot_notifier(struct notifier_block *);
63161 * Architecture-specific implementations of sys_reboot commands.
63162 */
63163
63164-extern void machine_restart(char *cmd);
63165-extern void machine_halt(void);
63166-extern void machine_power_off(void);
63167+extern void machine_restart(char *cmd) __noreturn;
63168+extern void machine_halt(void) __noreturn;
63169+extern void machine_power_off(void) __noreturn;
63170
63171 extern void machine_shutdown(void);
63172 struct pt_regs;
63173@@ -65,9 +65,9 @@ extern void machine_crash_shutdown(struct pt_regs *);
63174 */
63175
63176 extern void kernel_restart_prepare(char *cmd);
63177-extern void kernel_restart(char *cmd);
63178-extern void kernel_halt(void);
63179-extern void kernel_power_off(void);
63180+extern void kernel_restart(char *cmd) __noreturn;
63181+extern void kernel_halt(void) __noreturn;
63182+extern void kernel_power_off(void) __noreturn;
63183
63184 extern int C_A_D; /* for sysctl */
63185 void ctrl_alt_del(void);
63186@@ -81,7 +81,7 @@ extern int orderly_poweroff(bool force);
63187 * Emergency restart, callable from an interrupt handler.
63188 */
63189
63190-extern void emergency_restart(void);
63191+extern void emergency_restart(void) __noreturn;
63192 #include <asm/emergency-restart.h>
63193
63194 #endif
63195diff --git a/include/linux/reiserfs_fs.h b/include/linux/reiserfs_fs.h
63196index 96d465f..b084e05 100644
63197--- a/include/linux/reiserfs_fs.h
63198+++ b/include/linux/reiserfs_fs.h
63199@@ -1406,7 +1406,7 @@ static inline loff_t max_reiserfs_offset(struct inode *inode)
63200 #define REISERFS_USER_MEM 1 /* reiserfs user memory mode */
63201
63202 #define fs_generation(s) (REISERFS_SB(s)->s_generation_counter)
63203-#define get_generation(s) atomic_read (&fs_generation(s))
63204+#define get_generation(s) atomic_read_unchecked (&fs_generation(s))
63205 #define FILESYSTEM_CHANGED_TB(tb) (get_generation((tb)->tb_sb) != (tb)->fs_gen)
63206 #define __fs_changed(gen,s) (gen != get_generation (s))
63207 #define fs_changed(gen,s) \
63208diff --git a/include/linux/reiserfs_fs_sb.h b/include/linux/reiserfs_fs_sb.h
63209index 52c83b6..18ed7eb 100644
63210--- a/include/linux/reiserfs_fs_sb.h
63211+++ b/include/linux/reiserfs_fs_sb.h
63212@@ -386,7 +386,7 @@ struct reiserfs_sb_info {
63213 /* Comment? -Hans */
63214 wait_queue_head_t s_wait;
63215 /* To be obsoleted soon by per buffer seals.. -Hans */
63216- atomic_t s_generation_counter; // increased by one every time the
63217+ atomic_unchecked_t s_generation_counter; // increased by one every time the
63218 // tree gets re-balanced
63219 unsigned long s_properties; /* File system properties. Currently holds
63220 on-disk FS format */
63221diff --git a/include/linux/relay.h b/include/linux/relay.h
63222index 14a86bc..17d0700 100644
63223--- a/include/linux/relay.h
63224+++ b/include/linux/relay.h
63225@@ -159,7 +159,7 @@ struct rchan_callbacks
63226 * The callback should return 0 if successful, negative if not.
63227 */
63228 int (*remove_buf_file)(struct dentry *dentry);
63229-};
63230+} __no_const;
63231
63232 /*
63233 * CONFIG_RELAY kernel API, kernel/relay.c
63234diff --git a/include/linux/rfkill.h b/include/linux/rfkill.h
63235index c6c6084..5bf1212 100644
63236--- a/include/linux/rfkill.h
63237+++ b/include/linux/rfkill.h
63238@@ -147,6 +147,7 @@ struct rfkill_ops {
63239 void (*query)(struct rfkill *rfkill, void *data);
63240 int (*set_block)(void *data, bool blocked);
63241 };
63242+typedef struct rfkill_ops __no_const rfkill_ops_no_const;
63243
63244 #if defined(CONFIG_RFKILL) || defined(CONFIG_RFKILL_MODULE)
63245 /**
63246diff --git a/include/linux/rio.h b/include/linux/rio.h
63247index 4d50611..c6858a2 100644
63248--- a/include/linux/rio.h
63249+++ b/include/linux/rio.h
63250@@ -315,7 +315,7 @@ struct rio_ops {
63251 int mbox, void *buffer, size_t len);
63252 int (*add_inb_buffer)(struct rio_mport *mport, int mbox, void *buf);
63253 void *(*get_inb_message)(struct rio_mport *mport, int mbox);
63254-};
63255+} __no_const;
63256
63257 #define RIO_RESOURCE_MEM 0x00000100
63258 #define RIO_RESOURCE_DOORBELL 0x00000200
63259diff --git a/include/linux/rmap.h b/include/linux/rmap.h
63260index 2148b12..519b820 100644
63261--- a/include/linux/rmap.h
63262+++ b/include/linux/rmap.h
63263@@ -119,8 +119,8 @@ static inline void anon_vma_unlock(struct anon_vma *anon_vma)
63264 void anon_vma_init(void); /* create anon_vma_cachep */
63265 int anon_vma_prepare(struct vm_area_struct *);
63266 void unlink_anon_vmas(struct vm_area_struct *);
63267-int anon_vma_clone(struct vm_area_struct *, struct vm_area_struct *);
63268-int anon_vma_fork(struct vm_area_struct *, struct vm_area_struct *);
63269+int anon_vma_clone(struct vm_area_struct *, const struct vm_area_struct *);
63270+int anon_vma_fork(struct vm_area_struct *, const struct vm_area_struct *);
63271 void __anon_vma_link(struct vm_area_struct *);
63272
63273 static inline void anon_vma_merge(struct vm_area_struct *vma,
63274diff --git a/include/linux/sched.h b/include/linux/sched.h
63275index 1c4f3e9..342eb1f 100644
63276--- a/include/linux/sched.h
63277+++ b/include/linux/sched.h
63278@@ -101,6 +101,7 @@ struct bio_list;
63279 struct fs_struct;
63280 struct perf_event_context;
63281 struct blk_plug;
63282+struct linux_binprm;
63283
63284 /*
63285 * List of flags we want to share for kernel threads,
63286@@ -380,10 +381,13 @@ struct user_namespace;
63287 #define DEFAULT_MAX_MAP_COUNT (USHRT_MAX - MAPCOUNT_ELF_CORE_MARGIN)
63288
63289 extern int sysctl_max_map_count;
63290+extern unsigned long sysctl_heap_stack_gap;
63291
63292 #include <linux/aio.h>
63293
63294 #ifdef CONFIG_MMU
63295+extern bool check_heap_stack_gap(const struct vm_area_struct *vma, unsigned long addr, unsigned long len);
63296+extern unsigned long skip_heap_stack_gap(const struct vm_area_struct *vma, unsigned long len);
63297 extern void arch_pick_mmap_layout(struct mm_struct *mm);
63298 extern unsigned long
63299 arch_get_unmapped_area(struct file *, unsigned long, unsigned long,
63300@@ -629,6 +633,17 @@ struct signal_struct {
63301 #ifdef CONFIG_TASKSTATS
63302 struct taskstats *stats;
63303 #endif
63304+
63305+#ifdef CONFIG_GRKERNSEC
63306+ u32 curr_ip;
63307+ u32 saved_ip;
63308+ u32 gr_saddr;
63309+ u32 gr_daddr;
63310+ u16 gr_sport;
63311+ u16 gr_dport;
63312+ u8 used_accept:1;
63313+#endif
63314+
63315 #ifdef CONFIG_AUDIT
63316 unsigned audit_tty;
63317 struct tty_audit_buf *tty_audit_buf;
63318@@ -710,6 +725,11 @@ struct user_struct {
63319 struct key *session_keyring; /* UID's default session keyring */
63320 #endif
63321
63322+#if defined(CONFIG_GRKERNSEC_KERN_LOCKOUT) || defined(CONFIG_GRKERNSEC_BRUTE)
63323+ unsigned int banned;
63324+ unsigned long ban_expires;
63325+#endif
63326+
63327 /* Hash table maintenance information */
63328 struct hlist_node uidhash_node;
63329 uid_t uid;
63330@@ -1337,8 +1357,8 @@ struct task_struct {
63331 struct list_head thread_group;
63332
63333 struct completion *vfork_done; /* for vfork() */
63334- int __user *set_child_tid; /* CLONE_CHILD_SETTID */
63335- int __user *clear_child_tid; /* CLONE_CHILD_CLEARTID */
63336+ pid_t __user *set_child_tid; /* CLONE_CHILD_SETTID */
63337+ pid_t __user *clear_child_tid; /* CLONE_CHILD_CLEARTID */
63338
63339 cputime_t utime, stime, utimescaled, stimescaled;
63340 cputime_t gtime;
63341@@ -1354,13 +1374,6 @@ struct task_struct {
63342 struct task_cputime cputime_expires;
63343 struct list_head cpu_timers[3];
63344
63345-/* process credentials */
63346- const struct cred __rcu *real_cred; /* objective and real subjective task
63347- * credentials (COW) */
63348- const struct cred __rcu *cred; /* effective (overridable) subjective task
63349- * credentials (COW) */
63350- struct cred *replacement_session_keyring; /* for KEYCTL_SESSION_TO_PARENT */
63351-
63352 char comm[TASK_COMM_LEN]; /* executable name excluding path
63353 - access with [gs]et_task_comm (which lock
63354 it with task_lock())
63355@@ -1377,8 +1390,16 @@ struct task_struct {
63356 #endif
63357 /* CPU-specific state of this task */
63358 struct thread_struct thread;
63359+/* thread_info moved to task_struct */
63360+#ifdef CONFIG_X86
63361+ struct thread_info tinfo;
63362+#endif
63363 /* filesystem information */
63364 struct fs_struct *fs;
63365+
63366+ const struct cred __rcu *cred; /* effective (overridable) subjective task
63367+ * credentials (COW) */
63368+
63369 /* open file information */
63370 struct files_struct *files;
63371 /* namespaces */
63372@@ -1425,6 +1446,11 @@ struct task_struct {
63373 struct rt_mutex_waiter *pi_blocked_on;
63374 #endif
63375
63376+/* process credentials */
63377+ const struct cred __rcu *real_cred; /* objective and real subjective task
63378+ * credentials (COW) */
63379+ struct cred *replacement_session_keyring; /* for KEYCTL_SESSION_TO_PARENT */
63380+
63381 #ifdef CONFIG_DEBUG_MUTEXES
63382 /* mutex deadlock detection */
63383 struct mutex_waiter *blocked_on;
63384@@ -1540,6 +1566,27 @@ struct task_struct {
63385 unsigned long default_timer_slack_ns;
63386
63387 struct list_head *scm_work_list;
63388+
63389+#ifdef CONFIG_GRKERNSEC
63390+ /* grsecurity */
63391+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
63392+ u64 exec_id;
63393+#endif
63394+#ifdef CONFIG_GRKERNSEC_SETXID
63395+ const struct cred *delayed_cred;
63396+#endif
63397+ struct dentry *gr_chroot_dentry;
63398+ struct acl_subject_label *acl;
63399+ struct acl_role_label *role;
63400+ struct file *exec_file;
63401+ u16 acl_role_id;
63402+ /* is this the task that authenticated to the special role */
63403+ u8 acl_sp_role;
63404+ u8 is_writable;
63405+ u8 brute;
63406+ u8 gr_is_chrooted;
63407+#endif
63408+
63409 #ifdef CONFIG_FUNCTION_GRAPH_TRACER
63410 /* Index of current stored address in ret_stack */
63411 int curr_ret_stack;
63412@@ -1574,6 +1621,51 @@ struct task_struct {
63413 #endif
63414 };
63415
63416+#define MF_PAX_PAGEEXEC 0x01000000 /* Paging based non-executable pages */
63417+#define MF_PAX_EMUTRAMP 0x02000000 /* Emulate trampolines */
63418+#define MF_PAX_MPROTECT 0x04000000 /* Restrict mprotect() */
63419+#define MF_PAX_RANDMMAP 0x08000000 /* Randomize mmap() base */
63420+/*#define MF_PAX_RANDEXEC 0x10000000*/ /* Randomize ET_EXEC base */
63421+#define MF_PAX_SEGMEXEC 0x20000000 /* Segmentation based non-executable pages */
63422+
63423+#ifdef CONFIG_PAX_SOFTMODE
63424+extern int pax_softmode;
63425+#endif
63426+
63427+extern int pax_check_flags(unsigned long *);
63428+
63429+/* if tsk != current then task_lock must be held on it */
63430+#if defined(CONFIG_PAX_NOEXEC) || defined(CONFIG_PAX_ASLR)
63431+static inline unsigned long pax_get_flags(struct task_struct *tsk)
63432+{
63433+ if (likely(tsk->mm))
63434+ return tsk->mm->pax_flags;
63435+ else
63436+ return 0UL;
63437+}
63438+
63439+/* if tsk != current then task_lock must be held on it */
63440+static inline long pax_set_flags(struct task_struct *tsk, unsigned long flags)
63441+{
63442+ if (likely(tsk->mm)) {
63443+ tsk->mm->pax_flags = flags;
63444+ return 0;
63445+ }
63446+ return -EINVAL;
63447+}
63448+#endif
63449+
63450+#ifdef CONFIG_PAX_HAVE_ACL_FLAGS
63451+extern void pax_set_initial_flags(struct linux_binprm *bprm);
63452+#elif defined(CONFIG_PAX_HOOK_ACL_FLAGS)
63453+extern void (*pax_set_initial_flags_func)(struct linux_binprm *bprm);
63454+#endif
63455+
63456+extern void pax_report_fault(struct pt_regs *regs, void *pc, void *sp);
63457+extern void pax_report_insns(struct pt_regs *regs, void *pc, void *sp);
63458+extern void pax_report_refcount_overflow(struct pt_regs *regs);
63459+extern __noreturn void pax_report_usercopy(const void *ptr, unsigned long len, bool to, const char *type);
63460+
63461 /* Future-safe accessor for struct task_struct's cpus_allowed. */
63462 #define tsk_cpus_allowed(tsk) (&(tsk)->cpus_allowed)
63463
63464@@ -2081,7 +2173,9 @@ void yield(void);
63465 extern struct exec_domain default_exec_domain;
63466
63467 union thread_union {
63468+#ifndef CONFIG_X86
63469 struct thread_info thread_info;
63470+#endif
63471 unsigned long stack[THREAD_SIZE/sizeof(long)];
63472 };
63473
63474@@ -2114,6 +2208,7 @@ extern struct pid_namespace init_pid_ns;
63475 */
63476
63477 extern struct task_struct *find_task_by_vpid(pid_t nr);
63478+extern struct task_struct *find_task_by_vpid_unrestricted(pid_t nr);
63479 extern struct task_struct *find_task_by_pid_ns(pid_t nr,
63480 struct pid_namespace *ns);
63481
63482@@ -2235,6 +2330,12 @@ static inline void mmdrop(struct mm_struct * mm)
63483 extern void mmput(struct mm_struct *);
63484 /* Grab a reference to a task's mm, if it is not already going away */
63485 extern struct mm_struct *get_task_mm(struct task_struct *task);
63486+/*
63487+ * Grab a reference to a task's mm, if it is not already going away
63488+ * and ptrace_may_access with the mode parameter passed to it
63489+ * succeeds.
63490+ */
63491+extern struct mm_struct *mm_access(struct task_struct *task, unsigned int mode);
63492 /* Remove the current tasks stale references to the old mm_struct */
63493 extern void mm_release(struct task_struct *, struct mm_struct *);
63494 /* Allocate a new mm structure and copy contents from tsk->mm */
63495@@ -2251,7 +2352,7 @@ extern void __cleanup_sighand(struct sighand_struct *);
63496 extern void exit_itimers(struct signal_struct *);
63497 extern void flush_itimer_signals(void);
63498
63499-extern NORET_TYPE void do_group_exit(int);
63500+extern __noreturn void do_group_exit(int);
63501
63502 extern void daemonize(const char *, ...);
63503 extern int allow_signal(int);
63504@@ -2416,13 +2517,17 @@ static inline unsigned long *end_of_stack(struct task_struct *p)
63505
63506 #endif
63507
63508-static inline int object_is_on_stack(void *obj)
63509+static inline int object_starts_on_stack(void *obj)
63510 {
63511- void *stack = task_stack_page(current);
63512+ const void *stack = task_stack_page(current);
63513
63514 return (obj >= stack) && (obj < (stack + THREAD_SIZE));
63515 }
63516
63517+#ifdef CONFIG_PAX_USERCOPY
63518+extern int object_is_on_stack(const void *obj, unsigned long len);
63519+#endif
63520+
63521 extern void thread_info_cache_init(void);
63522
63523 #ifdef CONFIG_DEBUG_STACK_USAGE
63524diff --git a/include/linux/screen_info.h b/include/linux/screen_info.h
63525index 899fbb4..1cb4138 100644
63526--- a/include/linux/screen_info.h
63527+++ b/include/linux/screen_info.h
63528@@ -43,7 +43,8 @@ struct screen_info {
63529 __u16 pages; /* 0x32 */
63530 __u16 vesa_attributes; /* 0x34 */
63531 __u32 capabilities; /* 0x36 */
63532- __u8 _reserved[6]; /* 0x3a */
63533+ __u16 vesapm_size; /* 0x3a */
63534+ __u8 _reserved[4]; /* 0x3c */
63535 } __attribute__((packed));
63536
63537 #define VIDEO_TYPE_MDA 0x10 /* Monochrome Text Display */
63538diff --git a/include/linux/security.h b/include/linux/security.h
63539index e8c619d..e0cbd1c 100644
63540--- a/include/linux/security.h
63541+++ b/include/linux/security.h
63542@@ -37,6 +37,7 @@
63543 #include <linux/xfrm.h>
63544 #include <linux/slab.h>
63545 #include <linux/xattr.h>
63546+#include <linux/grsecurity.h>
63547 #include <net/flow.h>
63548
63549 /* Maximum number of letters for an LSM name string */
63550diff --git a/include/linux/seq_file.h b/include/linux/seq_file.h
63551index 0b69a46..b2ffa4c 100644
63552--- a/include/linux/seq_file.h
63553+++ b/include/linux/seq_file.h
63554@@ -24,6 +24,9 @@ struct seq_file {
63555 struct mutex lock;
63556 const struct seq_operations *op;
63557 int poll_event;
63558+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
63559+ u64 exec_id;
63560+#endif
63561 void *private;
63562 };
63563
63564@@ -33,6 +36,7 @@ struct seq_operations {
63565 void * (*next) (struct seq_file *m, void *v, loff_t *pos);
63566 int (*show) (struct seq_file *m, void *v);
63567 };
63568+typedef struct seq_operations __no_const seq_operations_no_const;
63569
63570 #define SEQ_SKIP 1
63571
63572diff --git a/include/linux/shm.h b/include/linux/shm.h
63573index 92808b8..c28cac4 100644
63574--- a/include/linux/shm.h
63575+++ b/include/linux/shm.h
63576@@ -98,6 +98,10 @@ struct shmid_kernel /* private to the kernel */
63577
63578 /* The task created the shm object. NULL if the task is dead. */
63579 struct task_struct *shm_creator;
63580+#ifdef CONFIG_GRKERNSEC
63581+ time_t shm_createtime;
63582+ pid_t shm_lapid;
63583+#endif
63584 };
63585
63586 /* shm_mode upper byte flags */
63587diff --git a/include/linux/skbuff.h b/include/linux/skbuff.h
63588index 6cf8b53..bcce844 100644
63589--- a/include/linux/skbuff.h
63590+++ b/include/linux/skbuff.h
63591@@ -642,7 +642,7 @@ static inline struct skb_shared_hwtstamps *skb_hwtstamps(struct sk_buff *skb)
63592 */
63593 static inline int skb_queue_empty(const struct sk_buff_head *list)
63594 {
63595- return list->next == (struct sk_buff *)list;
63596+ return list->next == (const struct sk_buff *)list;
63597 }
63598
63599 /**
63600@@ -655,7 +655,7 @@ static inline int skb_queue_empty(const struct sk_buff_head *list)
63601 static inline bool skb_queue_is_last(const struct sk_buff_head *list,
63602 const struct sk_buff *skb)
63603 {
63604- return skb->next == (struct sk_buff *)list;
63605+ return skb->next == (const struct sk_buff *)list;
63606 }
63607
63608 /**
63609@@ -668,7 +668,7 @@ static inline bool skb_queue_is_last(const struct sk_buff_head *list,
63610 static inline bool skb_queue_is_first(const struct sk_buff_head *list,
63611 const struct sk_buff *skb)
63612 {
63613- return skb->prev == (struct sk_buff *)list;
63614+ return skb->prev == (const struct sk_buff *)list;
63615 }
63616
63617 /**
63618@@ -1533,7 +1533,7 @@ static inline int pskb_network_may_pull(struct sk_buff *skb, unsigned int len)
63619 * NET_IP_ALIGN(2) + ethernet_header(14) + IP_header(20/40) + ports(8)
63620 */
63621 #ifndef NET_SKB_PAD
63622-#define NET_SKB_PAD max(32, L1_CACHE_BYTES)
63623+#define NET_SKB_PAD max(_AC(32,UL), L1_CACHE_BYTES)
63624 #endif
63625
63626 extern int ___pskb_trim(struct sk_buff *skb, unsigned int len);
63627diff --git a/include/linux/slab.h b/include/linux/slab.h
63628index 573c809..07e1f43 100644
63629--- a/include/linux/slab.h
63630+++ b/include/linux/slab.h
63631@@ -11,12 +11,20 @@
63632
63633 #include <linux/gfp.h>
63634 #include <linux/types.h>
63635+#include <linux/err.h>
63636
63637 /*
63638 * Flags to pass to kmem_cache_create().
63639 * The ones marked DEBUG are only valid if CONFIG_SLAB_DEBUG is set.
63640 */
63641 #define SLAB_DEBUG_FREE 0x00000100UL /* DEBUG: Perform (expensive) checks on free */
63642+
63643+#ifdef CONFIG_PAX_USERCOPY
63644+#define SLAB_USERCOPY 0x00000200UL /* PaX: Allow copying objs to/from userland */
63645+#else
63646+#define SLAB_USERCOPY 0x00000000UL
63647+#endif
63648+
63649 #define SLAB_RED_ZONE 0x00000400UL /* DEBUG: Red zone objs in a cache */
63650 #define SLAB_POISON 0x00000800UL /* DEBUG: Poison objects */
63651 #define SLAB_HWCACHE_ALIGN 0x00002000UL /* Align objs on cache lines */
63652@@ -87,10 +95,13 @@
63653 * ZERO_SIZE_PTR can be passed to kfree though in the same way that NULL can.
63654 * Both make kfree a no-op.
63655 */
63656-#define ZERO_SIZE_PTR ((void *)16)
63657+#define ZERO_SIZE_PTR \
63658+({ \
63659+ BUILD_BUG_ON(!(MAX_ERRNO & ~PAGE_MASK));\
63660+ (void *)(-MAX_ERRNO-1L); \
63661+})
63662
63663-#define ZERO_OR_NULL_PTR(x) ((unsigned long)(x) <= \
63664- (unsigned long)ZERO_SIZE_PTR)
63665+#define ZERO_OR_NULL_PTR(x) ((unsigned long)(x) - 1 >= (unsigned long)ZERO_SIZE_PTR - 1)
63666
63667 /*
63668 * struct kmem_cache related prototypes
63669@@ -156,11 +167,12 @@ unsigned int kmem_cache_size(struct kmem_cache *);
63670 /*
63671 * Common kmalloc functions provided by all allocators
63672 */
63673-void * __must_check __krealloc(const void *, size_t, gfp_t);
63674-void * __must_check krealloc(const void *, size_t, gfp_t);
63675+void * __must_check __krealloc(const void *, size_t, gfp_t) __size_overflow(2);
63676+void * __must_check krealloc(const void *, size_t, gfp_t) __size_overflow(2);
63677 void kfree(const void *);
63678 void kzfree(const void *);
63679 size_t ksize(const void *);
63680+void check_object_size(const void *ptr, unsigned long n, bool to);
63681
63682 /*
63683 * Allocator specific definitions. These are mainly used to establish optimized
63684@@ -287,7 +299,7 @@ static inline void *kmem_cache_alloc_node(struct kmem_cache *cachep,
63685 */
63686 #if defined(CONFIG_DEBUG_SLAB) || defined(CONFIG_SLUB) || \
63687 (defined(CONFIG_SLAB) && defined(CONFIG_TRACING))
63688-extern void *__kmalloc_track_caller(size_t, gfp_t, unsigned long);
63689+extern void *__kmalloc_track_caller(size_t, gfp_t, unsigned long) __size_overflow(1);
63690 #define kmalloc_track_caller(size, flags) \
63691 __kmalloc_track_caller(size, flags, _RET_IP_)
63692 #else
63693@@ -306,7 +318,7 @@ extern void *__kmalloc_track_caller(size_t, gfp_t, unsigned long);
63694 */
63695 #if defined(CONFIG_DEBUG_SLAB) || defined(CONFIG_SLUB) || \
63696 (defined(CONFIG_SLAB) && defined(CONFIG_TRACING))
63697-extern void *__kmalloc_node_track_caller(size_t, gfp_t, int, unsigned long);
63698+extern void *__kmalloc_node_track_caller(size_t, gfp_t, int, unsigned long) __size_overflow(1);
63699 #define kmalloc_node_track_caller(size, flags, node) \
63700 __kmalloc_node_track_caller(size, flags, node, \
63701 _RET_IP_)
63702diff --git a/include/linux/slab_def.h b/include/linux/slab_def.h
63703index d00e0ba..d61fb1f 100644
63704--- a/include/linux/slab_def.h
63705+++ b/include/linux/slab_def.h
63706@@ -68,10 +68,10 @@ struct kmem_cache {
63707 unsigned long node_allocs;
63708 unsigned long node_frees;
63709 unsigned long node_overflow;
63710- atomic_t allochit;
63711- atomic_t allocmiss;
63712- atomic_t freehit;
63713- atomic_t freemiss;
63714+ atomic_unchecked_t allochit;
63715+ atomic_unchecked_t allocmiss;
63716+ atomic_unchecked_t freehit;
63717+ atomic_unchecked_t freemiss;
63718
63719 /*
63720 * If debugging is enabled, then the allocator can add additional
63721@@ -109,7 +109,7 @@ struct cache_sizes {
63722 extern struct cache_sizes malloc_sizes[];
63723
63724 void *kmem_cache_alloc(struct kmem_cache *, gfp_t);
63725-void *__kmalloc(size_t size, gfp_t flags);
63726+void *__kmalloc(size_t size, gfp_t flags) __size_overflow(1);
63727
63728 #ifdef CONFIG_TRACING
63729 extern void *kmem_cache_alloc_trace(size_t size,
63730@@ -127,6 +127,7 @@ static inline size_t slab_buffer_size(struct kmem_cache *cachep)
63731 }
63732 #endif
63733
63734+static __always_inline void *kmalloc(size_t size, gfp_t flags) __size_overflow(1);
63735 static __always_inline void *kmalloc(size_t size, gfp_t flags)
63736 {
63737 struct kmem_cache *cachep;
63738@@ -162,7 +163,7 @@ found:
63739 }
63740
63741 #ifdef CONFIG_NUMA
63742-extern void *__kmalloc_node(size_t size, gfp_t flags, int node);
63743+extern void *__kmalloc_node(size_t size, gfp_t flags, int node) __size_overflow(1);
63744 extern void *kmem_cache_alloc_node(struct kmem_cache *, gfp_t flags, int node);
63745
63746 #ifdef CONFIG_TRACING
63747@@ -181,6 +182,7 @@ kmem_cache_alloc_node_trace(size_t size,
63748 }
63749 #endif
63750
63751+static __always_inline void *kmalloc_node(size_t size, gfp_t flags, int node) __size_overflow(1);
63752 static __always_inline void *kmalloc_node(size_t size, gfp_t flags, int node)
63753 {
63754 struct kmem_cache *cachep;
63755diff --git a/include/linux/slob_def.h b/include/linux/slob_def.h
63756index 0ec00b3..65e7e0e 100644
63757--- a/include/linux/slob_def.h
63758+++ b/include/linux/slob_def.h
63759@@ -9,8 +9,9 @@ static __always_inline void *kmem_cache_alloc(struct kmem_cache *cachep,
63760 return kmem_cache_alloc_node(cachep, flags, -1);
63761 }
63762
63763-void *__kmalloc_node(size_t size, gfp_t flags, int node);
63764+void *__kmalloc_node(size_t size, gfp_t flags, int node) __size_overflow(1);
63765
63766+static __always_inline void *kmalloc_node(size_t size, gfp_t flags, int node) __size_overflow(1);
63767 static __always_inline void *kmalloc_node(size_t size, gfp_t flags, int node)
63768 {
63769 return __kmalloc_node(size, flags, node);
63770@@ -24,11 +25,13 @@ static __always_inline void *kmalloc_node(size_t size, gfp_t flags, int node)
63771 * kmalloc is the normal method of allocating memory
63772 * in the kernel.
63773 */
63774+static __always_inline void *kmalloc(size_t size, gfp_t flags) __size_overflow(1);
63775 static __always_inline void *kmalloc(size_t size, gfp_t flags)
63776 {
63777 return __kmalloc_node(size, flags, -1);
63778 }
63779
63780+static __always_inline void *__kmalloc(size_t size, gfp_t flags) __size_overflow(1);
63781 static __always_inline void *__kmalloc(size_t size, gfp_t flags)
63782 {
63783 return kmalloc(size, flags);
63784diff --git a/include/linux/slub_def.h b/include/linux/slub_def.h
63785index a32bcfd..d26bd6e 100644
63786--- a/include/linux/slub_def.h
63787+++ b/include/linux/slub_def.h
63788@@ -89,7 +89,7 @@ struct kmem_cache {
63789 struct kmem_cache_order_objects max;
63790 struct kmem_cache_order_objects min;
63791 gfp_t allocflags; /* gfp flags to use on each alloc */
63792- int refcount; /* Refcount for slab cache destroy */
63793+ atomic_t refcount; /* Refcount for slab cache destroy */
63794 void (*ctor)(void *);
63795 int inuse; /* Offset to metadata */
63796 int align; /* Alignment */
63797@@ -204,6 +204,7 @@ static __always_inline int kmalloc_index(size_t size)
63798 * This ought to end up with a global pointer to the right cache
63799 * in kmalloc_caches.
63800 */
63801+static __always_inline struct kmem_cache *kmalloc_slab(size_t size) __size_overflow(1);
63802 static __always_inline struct kmem_cache *kmalloc_slab(size_t size)
63803 {
63804 int index = kmalloc_index(size);
63805@@ -215,9 +216,11 @@ static __always_inline struct kmem_cache *kmalloc_slab(size_t size)
63806 }
63807
63808 void *kmem_cache_alloc(struct kmem_cache *, gfp_t);
63809-void *__kmalloc(size_t size, gfp_t flags);
63810+void *__kmalloc(size_t size, gfp_t flags) __alloc_size(1) __size_overflow(1);
63811
63812 static __always_inline void *
63813+kmalloc_order(size_t size, gfp_t flags, unsigned int order) __size_overflow(1);
63814+static __always_inline void *
63815 kmalloc_order(size_t size, gfp_t flags, unsigned int order)
63816 {
63817 void *ret = (void *) __get_free_pages(flags | __GFP_COMP, order);
63818@@ -256,12 +259,14 @@ kmalloc_order_trace(size_t size, gfp_t flags, unsigned int order)
63819 }
63820 #endif
63821
63822+static __always_inline void *kmalloc_large(size_t size, gfp_t flags) __size_overflow(1);
63823 static __always_inline void *kmalloc_large(size_t size, gfp_t flags)
63824 {
63825 unsigned int order = get_order(size);
63826 return kmalloc_order_trace(size, flags, order);
63827 }
63828
63829+static __always_inline void *kmalloc(size_t size, gfp_t flags) __size_overflow(1);
63830 static __always_inline void *kmalloc(size_t size, gfp_t flags)
63831 {
63832 if (__builtin_constant_p(size)) {
63833@@ -281,7 +286,7 @@ static __always_inline void *kmalloc(size_t size, gfp_t flags)
63834 }
63835
63836 #ifdef CONFIG_NUMA
63837-void *__kmalloc_node(size_t size, gfp_t flags, int node);
63838+void *__kmalloc_node(size_t size, gfp_t flags, int node) __size_overflow(1);
63839 void *kmem_cache_alloc_node(struct kmem_cache *, gfp_t flags, int node);
63840
63841 #ifdef CONFIG_TRACING
63842@@ -298,6 +303,7 @@ kmem_cache_alloc_node_trace(struct kmem_cache *s,
63843 }
63844 #endif
63845
63846+static __always_inline void *kmalloc_node(size_t size, gfp_t flags, int node) __size_overflow(1);
63847 static __always_inline void *kmalloc_node(size_t size, gfp_t flags, int node)
63848 {
63849 if (__builtin_constant_p(size) &&
63850diff --git a/include/linux/sonet.h b/include/linux/sonet.h
63851index de8832d..0147b46 100644
63852--- a/include/linux/sonet.h
63853+++ b/include/linux/sonet.h
63854@@ -61,7 +61,7 @@ struct sonet_stats {
63855 #include <linux/atomic.h>
63856
63857 struct k_sonet_stats {
63858-#define __HANDLE_ITEM(i) atomic_t i
63859+#define __HANDLE_ITEM(i) atomic_unchecked_t i
63860 __SONET_ITEMS
63861 #undef __HANDLE_ITEM
63862 };
63863diff --git a/include/linux/sunrpc/clnt.h b/include/linux/sunrpc/clnt.h
63864index 3d8f9c4..69f1c0a 100644
63865--- a/include/linux/sunrpc/clnt.h
63866+++ b/include/linux/sunrpc/clnt.h
63867@@ -172,9 +172,9 @@ static inline unsigned short rpc_get_port(const struct sockaddr *sap)
63868 {
63869 switch (sap->sa_family) {
63870 case AF_INET:
63871- return ntohs(((struct sockaddr_in *)sap)->sin_port);
63872+ return ntohs(((const struct sockaddr_in *)sap)->sin_port);
63873 case AF_INET6:
63874- return ntohs(((struct sockaddr_in6 *)sap)->sin6_port);
63875+ return ntohs(((const struct sockaddr_in6 *)sap)->sin6_port);
63876 }
63877 return 0;
63878 }
63879@@ -207,7 +207,7 @@ static inline bool __rpc_cmp_addr4(const struct sockaddr *sap1,
63880 static inline bool __rpc_copy_addr4(struct sockaddr *dst,
63881 const struct sockaddr *src)
63882 {
63883- const struct sockaddr_in *ssin = (struct sockaddr_in *) src;
63884+ const struct sockaddr_in *ssin = (const struct sockaddr_in *) src;
63885 struct sockaddr_in *dsin = (struct sockaddr_in *) dst;
63886
63887 dsin->sin_family = ssin->sin_family;
63888@@ -310,7 +310,7 @@ static inline u32 rpc_get_scope_id(const struct sockaddr *sa)
63889 if (sa->sa_family != AF_INET6)
63890 return 0;
63891
63892- return ((struct sockaddr_in6 *) sa)->sin6_scope_id;
63893+ return ((const struct sockaddr_in6 *) sa)->sin6_scope_id;
63894 }
63895
63896 #endif /* __KERNEL__ */
63897diff --git a/include/linux/sunrpc/sched.h b/include/linux/sunrpc/sched.h
63898index e775689..9e206d9 100644
63899--- a/include/linux/sunrpc/sched.h
63900+++ b/include/linux/sunrpc/sched.h
63901@@ -105,6 +105,7 @@ struct rpc_call_ops {
63902 void (*rpc_call_done)(struct rpc_task *, void *);
63903 void (*rpc_release)(void *);
63904 };
63905+typedef struct rpc_call_ops __no_const rpc_call_ops_no_const;
63906
63907 struct rpc_task_setup {
63908 struct rpc_task *task;
63909diff --git a/include/linux/sunrpc/svc_rdma.h b/include/linux/sunrpc/svc_rdma.h
63910index c14fe86..393245e 100644
63911--- a/include/linux/sunrpc/svc_rdma.h
63912+++ b/include/linux/sunrpc/svc_rdma.h
63913@@ -53,15 +53,15 @@ extern unsigned int svcrdma_ord;
63914 extern unsigned int svcrdma_max_requests;
63915 extern unsigned int svcrdma_max_req_size;
63916
63917-extern atomic_t rdma_stat_recv;
63918-extern atomic_t rdma_stat_read;
63919-extern atomic_t rdma_stat_write;
63920-extern atomic_t rdma_stat_sq_starve;
63921-extern atomic_t rdma_stat_rq_starve;
63922-extern atomic_t rdma_stat_rq_poll;
63923-extern atomic_t rdma_stat_rq_prod;
63924-extern atomic_t rdma_stat_sq_poll;
63925-extern atomic_t rdma_stat_sq_prod;
63926+extern atomic_unchecked_t rdma_stat_recv;
63927+extern atomic_unchecked_t rdma_stat_read;
63928+extern atomic_unchecked_t rdma_stat_write;
63929+extern atomic_unchecked_t rdma_stat_sq_starve;
63930+extern atomic_unchecked_t rdma_stat_rq_starve;
63931+extern atomic_unchecked_t rdma_stat_rq_poll;
63932+extern atomic_unchecked_t rdma_stat_rq_prod;
63933+extern atomic_unchecked_t rdma_stat_sq_poll;
63934+extern atomic_unchecked_t rdma_stat_sq_prod;
63935
63936 #define RPCRDMA_VERSION 1
63937
63938diff --git a/include/linux/sysctl.h b/include/linux/sysctl.h
63939index 703cfa33..0b8ca72ac 100644
63940--- a/include/linux/sysctl.h
63941+++ b/include/linux/sysctl.h
63942@@ -155,7 +155,11 @@ enum
63943 KERN_PANIC_ON_NMI=76, /* int: whether we will panic on an unrecovered */
63944 };
63945
63946-
63947+#ifdef CONFIG_PAX_SOFTMODE
63948+enum {
63949+ PAX_SOFTMODE=1 /* PaX: disable/enable soft mode */
63950+};
63951+#endif
63952
63953 /* CTL_VM names: */
63954 enum
63955@@ -968,6 +972,8 @@ typedef int proc_handler (struct ctl_table *ctl, int write,
63956
63957 extern int proc_dostring(struct ctl_table *, int,
63958 void __user *, size_t *, loff_t *);
63959+extern int proc_dostring_modpriv(struct ctl_table *, int,
63960+ void __user *, size_t *, loff_t *);
63961 extern int proc_dointvec(struct ctl_table *, int,
63962 void __user *, size_t *, loff_t *);
63963 extern int proc_dointvec_minmax(struct ctl_table *, int,
63964diff --git a/include/linux/tracehook.h b/include/linux/tracehook.h
63965index a71a292..51bd91d 100644
63966--- a/include/linux/tracehook.h
63967+++ b/include/linux/tracehook.h
63968@@ -54,12 +54,12 @@ struct linux_binprm;
63969 /*
63970 * ptrace report for syscall entry and exit looks identical.
63971 */
63972-static inline void ptrace_report_syscall(struct pt_regs *regs)
63973+static inline int ptrace_report_syscall(struct pt_regs *regs)
63974 {
63975 int ptrace = current->ptrace;
63976
63977 if (!(ptrace & PT_PTRACED))
63978- return;
63979+ return 0;
63980
63981 ptrace_notify(SIGTRAP | ((ptrace & PT_TRACESYSGOOD) ? 0x80 : 0));
63982
63983@@ -72,6 +72,8 @@ static inline void ptrace_report_syscall(struct pt_regs *regs)
63984 send_sig(current->exit_code, current, 1);
63985 current->exit_code = 0;
63986 }
63987+
63988+ return fatal_signal_pending(current);
63989 }
63990
63991 /**
63992@@ -96,8 +98,7 @@ static inline void ptrace_report_syscall(struct pt_regs *regs)
63993 static inline __must_check int tracehook_report_syscall_entry(
63994 struct pt_regs *regs)
63995 {
63996- ptrace_report_syscall(regs);
63997- return 0;
63998+ return ptrace_report_syscall(regs);
63999 }
64000
64001 /**
64002diff --git a/include/linux/tty_ldisc.h b/include/linux/tty_ldisc.h
64003index ff7dc08..893e1bd 100644
64004--- a/include/linux/tty_ldisc.h
64005+++ b/include/linux/tty_ldisc.h
64006@@ -148,7 +148,7 @@ struct tty_ldisc_ops {
64007
64008 struct module *owner;
64009
64010- int refcount;
64011+ atomic_t refcount;
64012 };
64013
64014 struct tty_ldisc {
64015diff --git a/include/linux/types.h b/include/linux/types.h
64016index 57a9723..dbe234a 100644
64017--- a/include/linux/types.h
64018+++ b/include/linux/types.h
64019@@ -213,10 +213,26 @@ typedef struct {
64020 int counter;
64021 } atomic_t;
64022
64023+#ifdef CONFIG_PAX_REFCOUNT
64024+typedef struct {
64025+ int counter;
64026+} atomic_unchecked_t;
64027+#else
64028+typedef atomic_t atomic_unchecked_t;
64029+#endif
64030+
64031 #ifdef CONFIG_64BIT
64032 typedef struct {
64033 long counter;
64034 } atomic64_t;
64035+
64036+#ifdef CONFIG_PAX_REFCOUNT
64037+typedef struct {
64038+ long counter;
64039+} atomic64_unchecked_t;
64040+#else
64041+typedef atomic64_t atomic64_unchecked_t;
64042+#endif
64043 #endif
64044
64045 struct list_head {
64046diff --git a/include/linux/uaccess.h b/include/linux/uaccess.h
64047index 5ca0951..53a2fff 100644
64048--- a/include/linux/uaccess.h
64049+++ b/include/linux/uaccess.h
64050@@ -76,11 +76,11 @@ static inline unsigned long __copy_from_user_nocache(void *to,
64051 long ret; \
64052 mm_segment_t old_fs = get_fs(); \
64053 \
64054- set_fs(KERNEL_DS); \
64055 pagefault_disable(); \
64056- ret = __copy_from_user_inatomic(&(retval), (__force typeof(retval) __user *)(addr), sizeof(retval)); \
64057- pagefault_enable(); \
64058+ set_fs(KERNEL_DS); \
64059+ ret = __copy_from_user_inatomic(&(retval), (typeof(retval) __force_user *)(addr), sizeof(retval)); \
64060 set_fs(old_fs); \
64061+ pagefault_enable(); \
64062 ret; \
64063 })
64064
64065@@ -105,7 +105,7 @@ extern long __probe_kernel_read(void *dst, const void *src, size_t size);
64066 * Safely write to address @dst from the buffer at @src. If a kernel fault
64067 * happens, handle that and return -EFAULT.
64068 */
64069-extern long notrace probe_kernel_write(void *dst, const void *src, size_t size);
64070+extern long notrace probe_kernel_write(void *dst, const void *src, size_t size) __size_overflow(3);
64071 extern long notrace __probe_kernel_write(void *dst, const void *src, size_t size);
64072
64073 #endif /* __LINUX_UACCESS_H__ */
64074diff --git a/include/linux/unaligned/access_ok.h b/include/linux/unaligned/access_ok.h
64075index 99c1b4d..bb94261 100644
64076--- a/include/linux/unaligned/access_ok.h
64077+++ b/include/linux/unaligned/access_ok.h
64078@@ -6,32 +6,32 @@
64079
64080 static inline u16 get_unaligned_le16(const void *p)
64081 {
64082- return le16_to_cpup((__le16 *)p);
64083+ return le16_to_cpup((const __le16 *)p);
64084 }
64085
64086 static inline u32 get_unaligned_le32(const void *p)
64087 {
64088- return le32_to_cpup((__le32 *)p);
64089+ return le32_to_cpup((const __le32 *)p);
64090 }
64091
64092 static inline u64 get_unaligned_le64(const void *p)
64093 {
64094- return le64_to_cpup((__le64 *)p);
64095+ return le64_to_cpup((const __le64 *)p);
64096 }
64097
64098 static inline u16 get_unaligned_be16(const void *p)
64099 {
64100- return be16_to_cpup((__be16 *)p);
64101+ return be16_to_cpup((const __be16 *)p);
64102 }
64103
64104 static inline u32 get_unaligned_be32(const void *p)
64105 {
64106- return be32_to_cpup((__be32 *)p);
64107+ return be32_to_cpup((const __be32 *)p);
64108 }
64109
64110 static inline u64 get_unaligned_be64(const void *p)
64111 {
64112- return be64_to_cpup((__be64 *)p);
64113+ return be64_to_cpup((const __be64 *)p);
64114 }
64115
64116 static inline void put_unaligned_le16(u16 val, void *p)
64117diff --git a/include/linux/usb/renesas_usbhs.h b/include/linux/usb/renesas_usbhs.h
64118index e5a40c3..20ab0f6 100644
64119--- a/include/linux/usb/renesas_usbhs.h
64120+++ b/include/linux/usb/renesas_usbhs.h
64121@@ -39,7 +39,7 @@ enum {
64122 */
64123 struct renesas_usbhs_driver_callback {
64124 int (*notify_hotplug)(struct platform_device *pdev);
64125-};
64126+} __no_const;
64127
64128 /*
64129 * callback functions for platform
64130@@ -89,7 +89,7 @@ struct renesas_usbhs_platform_callback {
64131 * VBUS control is needed for Host
64132 */
64133 int (*set_vbus)(struct platform_device *pdev, int enable);
64134-};
64135+} __no_const;
64136
64137 /*
64138 * parameters for renesas usbhs
64139diff --git a/include/linux/vermagic.h b/include/linux/vermagic.h
64140index 6f8fbcf..8259001 100644
64141--- a/include/linux/vermagic.h
64142+++ b/include/linux/vermagic.h
64143@@ -25,9 +25,35 @@
64144 #define MODULE_ARCH_VERMAGIC ""
64145 #endif
64146
64147+#ifdef CONFIG_PAX_REFCOUNT
64148+#define MODULE_PAX_REFCOUNT "REFCOUNT "
64149+#else
64150+#define MODULE_PAX_REFCOUNT ""
64151+#endif
64152+
64153+#ifdef CONSTIFY_PLUGIN
64154+#define MODULE_CONSTIFY_PLUGIN "CONSTIFY_PLUGIN "
64155+#else
64156+#define MODULE_CONSTIFY_PLUGIN ""
64157+#endif
64158+
64159+#ifdef STACKLEAK_PLUGIN
64160+#define MODULE_STACKLEAK_PLUGIN "STACKLEAK_PLUGIN "
64161+#else
64162+#define MODULE_STACKLEAK_PLUGIN ""
64163+#endif
64164+
64165+#ifdef CONFIG_GRKERNSEC
64166+#define MODULE_GRSEC "GRSEC "
64167+#else
64168+#define MODULE_GRSEC ""
64169+#endif
64170+
64171 #define VERMAGIC_STRING \
64172 UTS_RELEASE " " \
64173 MODULE_VERMAGIC_SMP MODULE_VERMAGIC_PREEMPT \
64174 MODULE_VERMAGIC_MODULE_UNLOAD MODULE_VERMAGIC_MODVERSIONS \
64175- MODULE_ARCH_VERMAGIC
64176+ MODULE_ARCH_VERMAGIC \
64177+ MODULE_PAX_REFCOUNT MODULE_CONSTIFY_PLUGIN MODULE_STACKLEAK_PLUGIN \
64178+ MODULE_GRSEC
64179
64180diff --git a/include/linux/vmalloc.h b/include/linux/vmalloc.h
64181index 4bde182..c42a656 100644
64182--- a/include/linux/vmalloc.h
64183+++ b/include/linux/vmalloc.h
64184@@ -14,6 +14,11 @@ struct vm_area_struct; /* vma defining user mapping in mm_types.h */
64185 #define VM_USERMAP 0x00000008 /* suitable for remap_vmalloc_range */
64186 #define VM_VPAGES 0x00000010 /* buffer for pages was vmalloc'ed */
64187 #define VM_UNLIST 0x00000020 /* vm_struct is not listed in vmlist */
64188+
64189+#if defined(CONFIG_MODULES) && defined(CONFIG_X86) && defined(CONFIG_PAX_KERNEXEC)
64190+#define VM_KERNEXEC 0x00000040 /* allocate from executable kernel memory range */
64191+#endif
64192+
64193 /* bits [20..32] reserved for arch specific ioremap internals */
64194
64195 /*
64196@@ -51,18 +56,18 @@ static inline void vmalloc_init(void)
64197 }
64198 #endif
64199
64200-extern void *vmalloc(unsigned long size);
64201-extern void *vzalloc(unsigned long size);
64202-extern void *vmalloc_user(unsigned long size);
64203-extern void *vmalloc_node(unsigned long size, int node);
64204-extern void *vzalloc_node(unsigned long size, int node);
64205-extern void *vmalloc_exec(unsigned long size);
64206-extern void *vmalloc_32(unsigned long size);
64207-extern void *vmalloc_32_user(unsigned long size);
64208-extern void *__vmalloc(unsigned long size, gfp_t gfp_mask, pgprot_t prot);
64209+extern void *vmalloc(unsigned long size) __size_overflow(1);
64210+extern void *vzalloc(unsigned long size) __size_overflow(1);
64211+extern void *vmalloc_user(unsigned long size) __size_overflow(1);
64212+extern void *vmalloc_node(unsigned long size, int node) __size_overflow(1);
64213+extern void *vzalloc_node(unsigned long size, int node) __size_overflow(1);
64214+extern void *vmalloc_exec(unsigned long size) __size_overflow(1);
64215+extern void *vmalloc_32(unsigned long size) __size_overflow(1);
64216+extern void *vmalloc_32_user(unsigned long size) __size_overflow(1);
64217+extern void *__vmalloc(unsigned long size, gfp_t gfp_mask, pgprot_t prot) __size_overflow(1);
64218 extern void *__vmalloc_node_range(unsigned long size, unsigned long align,
64219 unsigned long start, unsigned long end, gfp_t gfp_mask,
64220- pgprot_t prot, int node, void *caller);
64221+ pgprot_t prot, int node, void *caller) __size_overflow(1);
64222 extern void vfree(const void *addr);
64223
64224 extern void *vmap(struct page **pages, unsigned int count,
64225@@ -123,8 +128,8 @@ extern struct vm_struct *alloc_vm_area(size_t size, pte_t **ptes);
64226 extern void free_vm_area(struct vm_struct *area);
64227
64228 /* for /dev/kmem */
64229-extern long vread(char *buf, char *addr, unsigned long count);
64230-extern long vwrite(char *buf, char *addr, unsigned long count);
64231+extern long vread(char *buf, char *addr, unsigned long count) __size_overflow(3);
64232+extern long vwrite(char *buf, char *addr, unsigned long count) __size_overflow(3);
64233
64234 /*
64235 * Internals. Dont't use..
64236diff --git a/include/linux/vmstat.h b/include/linux/vmstat.h
64237index 65efb92..137adbb 100644
64238--- a/include/linux/vmstat.h
64239+++ b/include/linux/vmstat.h
64240@@ -87,18 +87,18 @@ static inline void vm_events_fold_cpu(int cpu)
64241 /*
64242 * Zone based page accounting with per cpu differentials.
64243 */
64244-extern atomic_long_t vm_stat[NR_VM_ZONE_STAT_ITEMS];
64245+extern atomic_long_unchecked_t vm_stat[NR_VM_ZONE_STAT_ITEMS];
64246
64247 static inline void zone_page_state_add(long x, struct zone *zone,
64248 enum zone_stat_item item)
64249 {
64250- atomic_long_add(x, &zone->vm_stat[item]);
64251- atomic_long_add(x, &vm_stat[item]);
64252+ atomic_long_add_unchecked(x, &zone->vm_stat[item]);
64253+ atomic_long_add_unchecked(x, &vm_stat[item]);
64254 }
64255
64256 static inline unsigned long global_page_state(enum zone_stat_item item)
64257 {
64258- long x = atomic_long_read(&vm_stat[item]);
64259+ long x = atomic_long_read_unchecked(&vm_stat[item]);
64260 #ifdef CONFIG_SMP
64261 if (x < 0)
64262 x = 0;
64263@@ -109,7 +109,7 @@ static inline unsigned long global_page_state(enum zone_stat_item item)
64264 static inline unsigned long zone_page_state(struct zone *zone,
64265 enum zone_stat_item item)
64266 {
64267- long x = atomic_long_read(&zone->vm_stat[item]);
64268+ long x = atomic_long_read_unchecked(&zone->vm_stat[item]);
64269 #ifdef CONFIG_SMP
64270 if (x < 0)
64271 x = 0;
64272@@ -126,7 +126,7 @@ static inline unsigned long zone_page_state(struct zone *zone,
64273 static inline unsigned long zone_page_state_snapshot(struct zone *zone,
64274 enum zone_stat_item item)
64275 {
64276- long x = atomic_long_read(&zone->vm_stat[item]);
64277+ long x = atomic_long_read_unchecked(&zone->vm_stat[item]);
64278
64279 #ifdef CONFIG_SMP
64280 int cpu;
64281@@ -221,8 +221,8 @@ static inline void __mod_zone_page_state(struct zone *zone,
64282
64283 static inline void __inc_zone_state(struct zone *zone, enum zone_stat_item item)
64284 {
64285- atomic_long_inc(&zone->vm_stat[item]);
64286- atomic_long_inc(&vm_stat[item]);
64287+ atomic_long_inc_unchecked(&zone->vm_stat[item]);
64288+ atomic_long_inc_unchecked(&vm_stat[item]);
64289 }
64290
64291 static inline void __inc_zone_page_state(struct page *page,
64292@@ -233,8 +233,8 @@ static inline void __inc_zone_page_state(struct page *page,
64293
64294 static inline void __dec_zone_state(struct zone *zone, enum zone_stat_item item)
64295 {
64296- atomic_long_dec(&zone->vm_stat[item]);
64297- atomic_long_dec(&vm_stat[item]);
64298+ atomic_long_dec_unchecked(&zone->vm_stat[item]);
64299+ atomic_long_dec_unchecked(&vm_stat[item]);
64300 }
64301
64302 static inline void __dec_zone_page_state(struct page *page,
64303diff --git a/include/linux/xattr.h b/include/linux/xattr.h
64304index e5d1220..ef6e406 100644
64305--- a/include/linux/xattr.h
64306+++ b/include/linux/xattr.h
64307@@ -57,6 +57,11 @@
64308 #define XATTR_POSIX_ACL_DEFAULT "posix_acl_default"
64309 #define XATTR_NAME_POSIX_ACL_DEFAULT XATTR_SYSTEM_PREFIX XATTR_POSIX_ACL_DEFAULT
64310
64311+/* User namespace */
64312+#define XATTR_PAX_PREFIX XATTR_USER_PREFIX "pax."
64313+#define XATTR_PAX_FLAGS_SUFFIX "flags"
64314+#define XATTR_NAME_PAX_FLAGS XATTR_PAX_PREFIX XATTR_PAX_FLAGS_SUFFIX
64315+
64316 #ifdef __KERNEL__
64317
64318 #include <linux/types.h>
64319diff --git a/include/media/saa7146_vv.h b/include/media/saa7146_vv.h
64320index 4aeff96..b378cdc 100644
64321--- a/include/media/saa7146_vv.h
64322+++ b/include/media/saa7146_vv.h
64323@@ -163,7 +163,7 @@ struct saa7146_ext_vv
64324 int (*std_callback)(struct saa7146_dev*, struct saa7146_standard *);
64325
64326 /* the extension can override this */
64327- struct v4l2_ioctl_ops ops;
64328+ v4l2_ioctl_ops_no_const ops;
64329 /* pointer to the saa7146 core ops */
64330 const struct v4l2_ioctl_ops *core_ops;
64331
64332diff --git a/include/media/v4l2-dev.h b/include/media/v4l2-dev.h
64333index c7c40f1..4f01585 100644
64334--- a/include/media/v4l2-dev.h
64335+++ b/include/media/v4l2-dev.h
64336@@ -56,7 +56,7 @@ int v4l2_prio_check(struct v4l2_prio_state *global, enum v4l2_priority local);
64337
64338
64339 struct v4l2_file_operations {
64340- struct module *owner;
64341+ struct module * const owner;
64342 ssize_t (*read) (struct file *, char __user *, size_t, loff_t *);
64343 ssize_t (*write) (struct file *, const char __user *, size_t, loff_t *);
64344 unsigned int (*poll) (struct file *, struct poll_table_struct *);
64345@@ -68,6 +68,7 @@ struct v4l2_file_operations {
64346 int (*open) (struct file *);
64347 int (*release) (struct file *);
64348 };
64349+typedef struct v4l2_file_operations __no_const v4l2_file_operations_no_const;
64350
64351 /*
64352 * Newer version of video_device, handled by videodev2.c
64353diff --git a/include/media/v4l2-ioctl.h b/include/media/v4l2-ioctl.h
64354index 4d1c74a..65e1221 100644
64355--- a/include/media/v4l2-ioctl.h
64356+++ b/include/media/v4l2-ioctl.h
64357@@ -274,7 +274,7 @@ struct v4l2_ioctl_ops {
64358 long (*vidioc_default) (struct file *file, void *fh,
64359 bool valid_prio, int cmd, void *arg);
64360 };
64361-
64362+typedef struct v4l2_ioctl_ops __no_const v4l2_ioctl_ops_no_const;
64363
64364 /* v4l debugging and diagnostics */
64365
64366diff --git a/include/net/caif/caif_hsi.h b/include/net/caif/caif_hsi.h
64367index 8d55251..dfe5b0a 100644
64368--- a/include/net/caif/caif_hsi.h
64369+++ b/include/net/caif/caif_hsi.h
64370@@ -98,7 +98,7 @@ struct cfhsi_drv {
64371 void (*rx_done_cb) (struct cfhsi_drv *drv);
64372 void (*wake_up_cb) (struct cfhsi_drv *drv);
64373 void (*wake_down_cb) (struct cfhsi_drv *drv);
64374-};
64375+} __no_const;
64376
64377 /* Structure implemented by HSI device. */
64378 struct cfhsi_dev {
64379diff --git a/include/net/caif/cfctrl.h b/include/net/caif/cfctrl.h
64380index 9e5425b..8136ffc 100644
64381--- a/include/net/caif/cfctrl.h
64382+++ b/include/net/caif/cfctrl.h
64383@@ -52,7 +52,7 @@ struct cfctrl_rsp {
64384 void (*radioset_rsp)(void);
64385 void (*reject_rsp)(struct cflayer *layer, u8 linkid,
64386 struct cflayer *client_layer);
64387-};
64388+} __no_const;
64389
64390 /* Link Setup Parameters for CAIF-Links. */
64391 struct cfctrl_link_param {
64392@@ -101,8 +101,8 @@ struct cfctrl_request_info {
64393 struct cfctrl {
64394 struct cfsrvl serv;
64395 struct cfctrl_rsp res;
64396- atomic_t req_seq_no;
64397- atomic_t rsp_seq_no;
64398+ atomic_unchecked_t req_seq_no;
64399+ atomic_unchecked_t rsp_seq_no;
64400 struct list_head list;
64401 /* Protects from simultaneous access to first_req list */
64402 spinlock_t info_list_lock;
64403diff --git a/include/net/flow.h b/include/net/flow.h
64404index 2a7eefd..3250f3b 100644
64405--- a/include/net/flow.h
64406+++ b/include/net/flow.h
64407@@ -218,6 +218,6 @@ extern struct flow_cache_object *flow_cache_lookup(
64408
64409 extern void flow_cache_flush(void);
64410 extern void flow_cache_flush_deferred(void);
64411-extern atomic_t flow_cache_genid;
64412+extern atomic_unchecked_t flow_cache_genid;
64413
64414 #endif
64415diff --git a/include/net/inetpeer.h b/include/net/inetpeer.h
64416index e9ff3fc..9d3e5c7 100644
64417--- a/include/net/inetpeer.h
64418+++ b/include/net/inetpeer.h
64419@@ -48,8 +48,8 @@ struct inet_peer {
64420 */
64421 union {
64422 struct {
64423- atomic_t rid; /* Frag reception counter */
64424- atomic_t ip_id_count; /* IP ID for the next packet */
64425+ atomic_unchecked_t rid; /* Frag reception counter */
64426+ atomic_unchecked_t ip_id_count; /* IP ID for the next packet */
64427 __u32 tcp_ts;
64428 __u32 tcp_ts_stamp;
64429 };
64430@@ -113,11 +113,11 @@ static inline int inet_getid(struct inet_peer *p, int more)
64431 more++;
64432 inet_peer_refcheck(p);
64433 do {
64434- old = atomic_read(&p->ip_id_count);
64435+ old = atomic_read_unchecked(&p->ip_id_count);
64436 new = old + more;
64437 if (!new)
64438 new = 1;
64439- } while (atomic_cmpxchg(&p->ip_id_count, old, new) != old);
64440+ } while (atomic_cmpxchg_unchecked(&p->ip_id_count, old, new) != old);
64441 return new;
64442 }
64443
64444diff --git a/include/net/ip_fib.h b/include/net/ip_fib.h
64445index 10422ef..662570f 100644
64446--- a/include/net/ip_fib.h
64447+++ b/include/net/ip_fib.h
64448@@ -146,7 +146,7 @@ extern __be32 fib_info_update_nh_saddr(struct net *net, struct fib_nh *nh);
64449
64450 #define FIB_RES_SADDR(net, res) \
64451 ((FIB_RES_NH(res).nh_saddr_genid == \
64452- atomic_read(&(net)->ipv4.dev_addr_genid)) ? \
64453+ atomic_read_unchecked(&(net)->ipv4.dev_addr_genid)) ? \
64454 FIB_RES_NH(res).nh_saddr : \
64455 fib_info_update_nh_saddr((net), &FIB_RES_NH(res)))
64456 #define FIB_RES_GW(res) (FIB_RES_NH(res).nh_gw)
64457diff --git a/include/net/ip_vs.h b/include/net/ip_vs.h
64458index e5a7b9a..f4fc44b 100644
64459--- a/include/net/ip_vs.h
64460+++ b/include/net/ip_vs.h
64461@@ -509,7 +509,7 @@ struct ip_vs_conn {
64462 struct ip_vs_conn *control; /* Master control connection */
64463 atomic_t n_control; /* Number of controlled ones */
64464 struct ip_vs_dest *dest; /* real server */
64465- atomic_t in_pkts; /* incoming packet counter */
64466+ atomic_unchecked_t in_pkts; /* incoming packet counter */
64467
64468 /* packet transmitter for different forwarding methods. If it
64469 mangles the packet, it must return NF_DROP or better NF_STOLEN,
64470@@ -647,7 +647,7 @@ struct ip_vs_dest {
64471 __be16 port; /* port number of the server */
64472 union nf_inet_addr addr; /* IP address of the server */
64473 volatile unsigned flags; /* dest status flags */
64474- atomic_t conn_flags; /* flags to copy to conn */
64475+ atomic_unchecked_t conn_flags; /* flags to copy to conn */
64476 atomic_t weight; /* server weight */
64477
64478 atomic_t refcnt; /* reference counter */
64479diff --git a/include/net/irda/ircomm_core.h b/include/net/irda/ircomm_core.h
64480index 69b610a..fe3962c 100644
64481--- a/include/net/irda/ircomm_core.h
64482+++ b/include/net/irda/ircomm_core.h
64483@@ -51,7 +51,7 @@ typedef struct {
64484 int (*connect_response)(struct ircomm_cb *, struct sk_buff *);
64485 int (*disconnect_request)(struct ircomm_cb *, struct sk_buff *,
64486 struct ircomm_info *);
64487-} call_t;
64488+} __no_const call_t;
64489
64490 struct ircomm_cb {
64491 irda_queue_t queue;
64492diff --git a/include/net/irda/ircomm_tty.h b/include/net/irda/ircomm_tty.h
64493index 59ba38bc..d515662 100644
64494--- a/include/net/irda/ircomm_tty.h
64495+++ b/include/net/irda/ircomm_tty.h
64496@@ -35,6 +35,7 @@
64497 #include <linux/termios.h>
64498 #include <linux/timer.h>
64499 #include <linux/tty.h> /* struct tty_struct */
64500+#include <asm/local.h>
64501
64502 #include <net/irda/irias_object.h>
64503 #include <net/irda/ircomm_core.h>
64504@@ -105,8 +106,8 @@ struct ircomm_tty_cb {
64505 unsigned short close_delay;
64506 unsigned short closing_wait; /* time to wait before closing */
64507
64508- int open_count;
64509- int blocked_open; /* # of blocked opens */
64510+ local_t open_count;
64511+ local_t blocked_open; /* # of blocked opens */
64512
64513 /* Protect concurent access to :
64514 * o self->open_count
64515diff --git a/include/net/iucv/af_iucv.h b/include/net/iucv/af_iucv.h
64516index f2419cf..473679f 100644
64517--- a/include/net/iucv/af_iucv.h
64518+++ b/include/net/iucv/af_iucv.h
64519@@ -139,7 +139,7 @@ struct iucv_sock {
64520 struct iucv_sock_list {
64521 struct hlist_head head;
64522 rwlock_t lock;
64523- atomic_t autobind_name;
64524+ atomic_unchecked_t autobind_name;
64525 };
64526
64527 unsigned int iucv_sock_poll(struct file *file, struct socket *sock,
64528diff --git a/include/net/neighbour.h b/include/net/neighbour.h
64529index 2720884..3aa5c25 100644
64530--- a/include/net/neighbour.h
64531+++ b/include/net/neighbour.h
64532@@ -122,7 +122,7 @@ struct neigh_ops {
64533 void (*error_report)(struct neighbour *, struct sk_buff *);
64534 int (*output)(struct neighbour *, struct sk_buff *);
64535 int (*connected_output)(struct neighbour *, struct sk_buff *);
64536-};
64537+} __do_const;
64538
64539 struct pneigh_entry {
64540 struct pneigh_entry *next;
64541diff --git a/include/net/netlink.h b/include/net/netlink.h
64542index cb1f350..3279d2c 100644
64543--- a/include/net/netlink.h
64544+++ b/include/net/netlink.h
64545@@ -569,7 +569,7 @@ static inline void *nlmsg_get_pos(struct sk_buff *skb)
64546 static inline void nlmsg_trim(struct sk_buff *skb, const void *mark)
64547 {
64548 if (mark)
64549- skb_trim(skb, (unsigned char *) mark - skb->data);
64550+ skb_trim(skb, (const unsigned char *) mark - skb->data);
64551 }
64552
64553 /**
64554diff --git a/include/net/netns/ipv4.h b/include/net/netns/ipv4.h
64555index d786b4f..4c3dd41 100644
64556--- a/include/net/netns/ipv4.h
64557+++ b/include/net/netns/ipv4.h
64558@@ -56,8 +56,8 @@ struct netns_ipv4 {
64559
64560 unsigned int sysctl_ping_group_range[2];
64561
64562- atomic_t rt_genid;
64563- atomic_t dev_addr_genid;
64564+ atomic_unchecked_t rt_genid;
64565+ atomic_unchecked_t dev_addr_genid;
64566
64567 #ifdef CONFIG_IP_MROUTE
64568 #ifndef CONFIG_IP_MROUTE_MULTIPLE_TABLES
64569diff --git a/include/net/sctp/sctp.h b/include/net/sctp/sctp.h
64570index 6a72a58..e6a127d 100644
64571--- a/include/net/sctp/sctp.h
64572+++ b/include/net/sctp/sctp.h
64573@@ -318,9 +318,9 @@ do { \
64574
64575 #else /* SCTP_DEBUG */
64576
64577-#define SCTP_DEBUG_PRINTK(whatever...)
64578-#define SCTP_DEBUG_PRINTK_CONT(fmt, args...)
64579-#define SCTP_DEBUG_PRINTK_IPADDR(whatever...)
64580+#define SCTP_DEBUG_PRINTK(whatever...) do {} while (0)
64581+#define SCTP_DEBUG_PRINTK_CONT(fmt, args...) do {} while (0)
64582+#define SCTP_DEBUG_PRINTK_IPADDR(whatever...) do {} while (0)
64583 #define SCTP_ENABLE_DEBUG
64584 #define SCTP_DISABLE_DEBUG
64585 #define SCTP_ASSERT(expr, str, func)
64586diff --git a/include/net/sock.h b/include/net/sock.h
64587index 32e3937..87a1dbc 100644
64588--- a/include/net/sock.h
64589+++ b/include/net/sock.h
64590@@ -277,7 +277,7 @@ struct sock {
64591 #ifdef CONFIG_RPS
64592 __u32 sk_rxhash;
64593 #endif
64594- atomic_t sk_drops;
64595+ atomic_unchecked_t sk_drops;
64596 int sk_rcvbuf;
64597
64598 struct sk_filter __rcu *sk_filter;
64599@@ -1402,7 +1402,7 @@ static inline void sk_nocaps_add(struct sock *sk, int flags)
64600 }
64601
64602 static inline int skb_do_copy_data_nocache(struct sock *sk, struct sk_buff *skb,
64603- char __user *from, char *to,
64604+ char __user *from, unsigned char *to,
64605 int copy, int offset)
64606 {
64607 if (skb->ip_summed == CHECKSUM_NONE) {
64608diff --git a/include/net/tcp.h b/include/net/tcp.h
64609index bb18c4d..bb87972 100644
64610--- a/include/net/tcp.h
64611+++ b/include/net/tcp.h
64612@@ -1409,7 +1409,7 @@ struct tcp_seq_afinfo {
64613 char *name;
64614 sa_family_t family;
64615 const struct file_operations *seq_fops;
64616- struct seq_operations seq_ops;
64617+ seq_operations_no_const seq_ops;
64618 };
64619
64620 struct tcp_iter_state {
64621diff --git a/include/net/udp.h b/include/net/udp.h
64622index 3b285f4..0219639 100644
64623--- a/include/net/udp.h
64624+++ b/include/net/udp.h
64625@@ -237,7 +237,7 @@ struct udp_seq_afinfo {
64626 sa_family_t family;
64627 struct udp_table *udp_table;
64628 const struct file_operations *seq_fops;
64629- struct seq_operations seq_ops;
64630+ seq_operations_no_const seq_ops;
64631 };
64632
64633 struct udp_iter_state {
64634diff --git a/include/net/xfrm.h b/include/net/xfrm.h
64635index b203e14..1df3991 100644
64636--- a/include/net/xfrm.h
64637+++ b/include/net/xfrm.h
64638@@ -505,7 +505,7 @@ struct xfrm_policy {
64639 struct timer_list timer;
64640
64641 struct flow_cache_object flo;
64642- atomic_t genid;
64643+ atomic_unchecked_t genid;
64644 u32 priority;
64645 u32 index;
64646 struct xfrm_mark mark;
64647diff --git a/include/rdma/iw_cm.h b/include/rdma/iw_cm.h
64648index 1a046b1..ee0bef0 100644
64649--- a/include/rdma/iw_cm.h
64650+++ b/include/rdma/iw_cm.h
64651@@ -122,7 +122,7 @@ struct iw_cm_verbs {
64652 int backlog);
64653
64654 int (*destroy_listen)(struct iw_cm_id *cm_id);
64655-};
64656+} __no_const;
64657
64658 /**
64659 * iw_create_cm_id - Create an IW CM identifier.
64660diff --git a/include/scsi/libfc.h b/include/scsi/libfc.h
64661index 5d1a758..1dbf795 100644
64662--- a/include/scsi/libfc.h
64663+++ b/include/scsi/libfc.h
64664@@ -748,6 +748,7 @@ struct libfc_function_template {
64665 */
64666 void (*disc_stop_final) (struct fc_lport *);
64667 };
64668+typedef struct libfc_function_template __no_const libfc_function_template_no_const;
64669
64670 /**
64671 * struct fc_disc - Discovery context
64672@@ -851,7 +852,7 @@ struct fc_lport {
64673 struct fc_vport *vport;
64674
64675 /* Operational Information */
64676- struct libfc_function_template tt;
64677+ libfc_function_template_no_const tt;
64678 u8 link_up;
64679 u8 qfull;
64680 enum fc_lport_state state;
64681diff --git a/include/scsi/scsi_device.h b/include/scsi/scsi_device.h
64682index 5591ed5..13eb457 100644
64683--- a/include/scsi/scsi_device.h
64684+++ b/include/scsi/scsi_device.h
64685@@ -161,9 +161,9 @@ struct scsi_device {
64686 unsigned int max_device_blocked; /* what device_blocked counts down from */
64687 #define SCSI_DEFAULT_DEVICE_BLOCKED 3
64688
64689- atomic_t iorequest_cnt;
64690- atomic_t iodone_cnt;
64691- atomic_t ioerr_cnt;
64692+ atomic_unchecked_t iorequest_cnt;
64693+ atomic_unchecked_t iodone_cnt;
64694+ atomic_unchecked_t ioerr_cnt;
64695
64696 struct device sdev_gendev,
64697 sdev_dev;
64698diff --git a/include/scsi/scsi_transport_fc.h b/include/scsi/scsi_transport_fc.h
64699index 2a65167..91e01f8 100644
64700--- a/include/scsi/scsi_transport_fc.h
64701+++ b/include/scsi/scsi_transport_fc.h
64702@@ -711,7 +711,7 @@ struct fc_function_template {
64703 unsigned long show_host_system_hostname:1;
64704
64705 unsigned long disable_target_scan:1;
64706-};
64707+} __do_const;
64708
64709
64710 /**
64711diff --git a/include/sound/ak4xxx-adda.h b/include/sound/ak4xxx-adda.h
64712index 030b87c..98a6954 100644
64713--- a/include/sound/ak4xxx-adda.h
64714+++ b/include/sound/ak4xxx-adda.h
64715@@ -35,7 +35,7 @@ struct snd_ak4xxx_ops {
64716 void (*write)(struct snd_akm4xxx *ak, int chip, unsigned char reg,
64717 unsigned char val);
64718 void (*set_rate_val)(struct snd_akm4xxx *ak, unsigned int rate);
64719-};
64720+} __no_const;
64721
64722 #define AK4XXX_IMAGE_SIZE (AK4XXX_MAX_CHIPS * 16) /* 64 bytes */
64723
64724diff --git a/include/sound/hwdep.h b/include/sound/hwdep.h
64725index 8c05e47..2b5df97 100644
64726--- a/include/sound/hwdep.h
64727+++ b/include/sound/hwdep.h
64728@@ -49,7 +49,7 @@ struct snd_hwdep_ops {
64729 struct snd_hwdep_dsp_status *status);
64730 int (*dsp_load)(struct snd_hwdep *hw,
64731 struct snd_hwdep_dsp_image *image);
64732-};
64733+} __no_const;
64734
64735 struct snd_hwdep {
64736 struct snd_card *card;
64737diff --git a/include/sound/info.h b/include/sound/info.h
64738index 5492cc4..1a65278 100644
64739--- a/include/sound/info.h
64740+++ b/include/sound/info.h
64741@@ -44,7 +44,7 @@ struct snd_info_entry_text {
64742 struct snd_info_buffer *buffer);
64743 void (*write)(struct snd_info_entry *entry,
64744 struct snd_info_buffer *buffer);
64745-};
64746+} __no_const;
64747
64748 struct snd_info_entry_ops {
64749 int (*open)(struct snd_info_entry *entry,
64750diff --git a/include/sound/pcm.h b/include/sound/pcm.h
64751index 0cf91b2..b70cae4 100644
64752--- a/include/sound/pcm.h
64753+++ b/include/sound/pcm.h
64754@@ -81,6 +81,7 @@ struct snd_pcm_ops {
64755 int (*mmap)(struct snd_pcm_substream *substream, struct vm_area_struct *vma);
64756 int (*ack)(struct snd_pcm_substream *substream);
64757 };
64758+typedef struct snd_pcm_ops __no_const snd_pcm_ops_no_const;
64759
64760 /*
64761 *
64762diff --git a/include/sound/sb16_csp.h b/include/sound/sb16_csp.h
64763index af1b49e..a5d55a5 100644
64764--- a/include/sound/sb16_csp.h
64765+++ b/include/sound/sb16_csp.h
64766@@ -146,7 +146,7 @@ struct snd_sb_csp_ops {
64767 int (*csp_start) (struct snd_sb_csp * p, int sample_width, int channels);
64768 int (*csp_stop) (struct snd_sb_csp * p);
64769 int (*csp_qsound_transfer) (struct snd_sb_csp * p);
64770-};
64771+} __no_const;
64772
64773 /*
64774 * CSP private data
64775diff --git a/include/sound/soc.h b/include/sound/soc.h
64776index 11cfb59..e3f93f4 100644
64777--- a/include/sound/soc.h
64778+++ b/include/sound/soc.h
64779@@ -683,7 +683,7 @@ struct snd_soc_platform_driver {
64780 /* platform IO - used for platform DAPM */
64781 unsigned int (*read)(struct snd_soc_platform *, unsigned int);
64782 int (*write)(struct snd_soc_platform *, unsigned int, unsigned int);
64783-};
64784+} __do_const;
64785
64786 struct snd_soc_platform {
64787 const char *name;
64788diff --git a/include/sound/ymfpci.h b/include/sound/ymfpci.h
64789index 444cd6b..3327cc5 100644
64790--- a/include/sound/ymfpci.h
64791+++ b/include/sound/ymfpci.h
64792@@ -358,7 +358,7 @@ struct snd_ymfpci {
64793 spinlock_t reg_lock;
64794 spinlock_t voice_lock;
64795 wait_queue_head_t interrupt_sleep;
64796- atomic_t interrupt_sleep_count;
64797+ atomic_unchecked_t interrupt_sleep_count;
64798 struct snd_info_entry *proc_entry;
64799 const struct firmware *dsp_microcode;
64800 const struct firmware *controller_microcode;
64801diff --git a/include/target/target_core_base.h b/include/target/target_core_base.h
64802index 94bbec3..3a8c6b0 100644
64803--- a/include/target/target_core_base.h
64804+++ b/include/target/target_core_base.h
64805@@ -346,7 +346,7 @@ struct t10_reservation_ops {
64806 int (*t10_seq_non_holder)(struct se_cmd *, unsigned char *, u32);
64807 int (*t10_pr_register)(struct se_cmd *);
64808 int (*t10_pr_clear)(struct se_cmd *);
64809-};
64810+} __no_const;
64811
64812 struct t10_reservation {
64813 /* Reservation effects all target ports */
64814@@ -465,8 +465,8 @@ struct se_cmd {
64815 atomic_t t_se_count;
64816 atomic_t t_task_cdbs_left;
64817 atomic_t t_task_cdbs_ex_left;
64818- atomic_t t_task_cdbs_sent;
64819- atomic_t t_transport_aborted;
64820+ atomic_unchecked_t t_task_cdbs_sent;
64821+ atomic_unchecked_t t_transport_aborted;
64822 atomic_t t_transport_active;
64823 atomic_t t_transport_complete;
64824 atomic_t t_transport_queue_active;
64825@@ -705,7 +705,7 @@ struct se_device {
64826 /* Active commands on this virtual SE device */
64827 atomic_t simple_cmds;
64828 atomic_t depth_left;
64829- atomic_t dev_ordered_id;
64830+ atomic_unchecked_t dev_ordered_id;
64831 atomic_t execute_tasks;
64832 atomic_t dev_ordered_sync;
64833 atomic_t dev_qf_count;
64834diff --git a/include/trace/events/irq.h b/include/trace/events/irq.h
64835index 1c09820..7f5ec79 100644
64836--- a/include/trace/events/irq.h
64837+++ b/include/trace/events/irq.h
64838@@ -36,7 +36,7 @@ struct softirq_action;
64839 */
64840 TRACE_EVENT(irq_handler_entry,
64841
64842- TP_PROTO(int irq, struct irqaction *action),
64843+ TP_PROTO(int irq, const struct irqaction *action),
64844
64845 TP_ARGS(irq, action),
64846
64847@@ -66,7 +66,7 @@ TRACE_EVENT(irq_handler_entry,
64848 */
64849 TRACE_EVENT(irq_handler_exit,
64850
64851- TP_PROTO(int irq, struct irqaction *action, int ret),
64852+ TP_PROTO(int irq, const struct irqaction *action, int ret),
64853
64854 TP_ARGS(irq, action, ret),
64855
64856diff --git a/include/video/udlfb.h b/include/video/udlfb.h
64857index c41f308..6918de3 100644
64858--- a/include/video/udlfb.h
64859+++ b/include/video/udlfb.h
64860@@ -52,10 +52,10 @@ struct dlfb_data {
64861 u32 pseudo_palette[256];
64862 int blank_mode; /*one of FB_BLANK_ */
64863 /* blit-only rendering path metrics, exposed through sysfs */
64864- atomic_t bytes_rendered; /* raw pixel-bytes driver asked to render */
64865- atomic_t bytes_identical; /* saved effort with backbuffer comparison */
64866- atomic_t bytes_sent; /* to usb, after compression including overhead */
64867- atomic_t cpu_kcycles_used; /* transpired during pixel processing */
64868+ atomic_unchecked_t bytes_rendered; /* raw pixel-bytes driver asked to render */
64869+ atomic_unchecked_t bytes_identical; /* saved effort with backbuffer comparison */
64870+ atomic_unchecked_t bytes_sent; /* to usb, after compression including overhead */
64871+ atomic_unchecked_t cpu_kcycles_used; /* transpired during pixel processing */
64872 };
64873
64874 #define NR_USB_REQUEST_I2C_SUB_IO 0x02
64875diff --git a/include/video/uvesafb.h b/include/video/uvesafb.h
64876index 0993a22..32ba2fe 100644
64877--- a/include/video/uvesafb.h
64878+++ b/include/video/uvesafb.h
64879@@ -177,6 +177,7 @@ struct uvesafb_par {
64880 u8 ypan; /* 0 - nothing, 1 - ypan, 2 - ywrap */
64881 u8 pmi_setpal; /* PMI for palette changes */
64882 u16 *pmi_base; /* protected mode interface location */
64883+ u8 *pmi_code; /* protected mode code location */
64884 void *pmi_start;
64885 void *pmi_pal;
64886 u8 *vbe_state_orig; /*
64887diff --git a/init/Kconfig b/init/Kconfig
64888index 43298f9..2f56c12 100644
64889--- a/init/Kconfig
64890+++ b/init/Kconfig
64891@@ -1214,7 +1214,7 @@ config SLUB_DEBUG
64892
64893 config COMPAT_BRK
64894 bool "Disable heap randomization"
64895- default y
64896+ default n
64897 help
64898 Randomizing heap placement makes heap exploits harder, but it
64899 also breaks ancient binaries (including anything libc5 based).
64900diff --git a/init/do_mounts.c b/init/do_mounts.c
64901index db6e5ee..7677ff7 100644
64902--- a/init/do_mounts.c
64903+++ b/init/do_mounts.c
64904@@ -325,11 +325,11 @@ static void __init get_fs_names(char *page)
64905
64906 static int __init do_mount_root(char *name, char *fs, int flags, void *data)
64907 {
64908- int err = sys_mount(name, "/root", fs, flags, data);
64909+ int err = sys_mount((char __force_user *)name, (char __force_user *)"/root", (char __force_user *)fs, flags, (void __force_user *)data);
64910 if (err)
64911 return err;
64912
64913- sys_chdir((const char __user __force *)"/root");
64914+ sys_chdir((const char __force_user*)"/root");
64915 ROOT_DEV = current->fs->pwd.mnt->mnt_sb->s_dev;
64916 printk(KERN_INFO
64917 "VFS: Mounted root (%s filesystem)%s on device %u:%u.\n",
64918@@ -448,18 +448,18 @@ void __init change_floppy(char *fmt, ...)
64919 va_start(args, fmt);
64920 vsprintf(buf, fmt, args);
64921 va_end(args);
64922- fd = sys_open("/dev/root", O_RDWR | O_NDELAY, 0);
64923+ fd = sys_open((char __user *)"/dev/root", O_RDWR | O_NDELAY, 0);
64924 if (fd >= 0) {
64925 sys_ioctl(fd, FDEJECT, 0);
64926 sys_close(fd);
64927 }
64928 printk(KERN_NOTICE "VFS: Insert %s and press ENTER\n", buf);
64929- fd = sys_open("/dev/console", O_RDWR, 0);
64930+ fd = sys_open((__force const char __user *)"/dev/console", O_RDWR, 0);
64931 if (fd >= 0) {
64932 sys_ioctl(fd, TCGETS, (long)&termios);
64933 termios.c_lflag &= ~ICANON;
64934 sys_ioctl(fd, TCSETSF, (long)&termios);
64935- sys_read(fd, &c, 1);
64936+ sys_read(fd, (char __user *)&c, 1);
64937 termios.c_lflag |= ICANON;
64938 sys_ioctl(fd, TCSETSF, (long)&termios);
64939 sys_close(fd);
64940@@ -553,6 +553,6 @@ void __init prepare_namespace(void)
64941 mount_root();
64942 out:
64943 devtmpfs_mount("dev");
64944- sys_mount(".", "/", NULL, MS_MOVE, NULL);
64945- sys_chroot((const char __user __force *)".");
64946+ sys_mount((char __force_user *)".", (char __force_user *)"/", NULL, MS_MOVE, NULL);
64947+ sys_chroot((const char __force_user *)".");
64948 }
64949diff --git a/init/do_mounts.h b/init/do_mounts.h
64950index f5b978a..69dbfe8 100644
64951--- a/init/do_mounts.h
64952+++ b/init/do_mounts.h
64953@@ -15,15 +15,15 @@ extern int root_mountflags;
64954
64955 static inline int create_dev(char *name, dev_t dev)
64956 {
64957- sys_unlink(name);
64958- return sys_mknod(name, S_IFBLK|0600, new_encode_dev(dev));
64959+ sys_unlink((char __force_user *)name);
64960+ return sys_mknod((char __force_user *)name, S_IFBLK|0600, new_encode_dev(dev));
64961 }
64962
64963 #if BITS_PER_LONG == 32
64964 static inline u32 bstat(char *name)
64965 {
64966 struct stat64 stat;
64967- if (sys_stat64(name, &stat) != 0)
64968+ if (sys_stat64((char __force_user *)name, (struct stat64 __force_user *)&stat) != 0)
64969 return 0;
64970 if (!S_ISBLK(stat.st_mode))
64971 return 0;
64972@@ -35,7 +35,7 @@ static inline u32 bstat(char *name)
64973 static inline u32 bstat(char *name)
64974 {
64975 struct stat stat;
64976- if (sys_newstat(name, &stat) != 0)
64977+ if (sys_newstat((const char __force_user *)name, (struct stat __force_user *)&stat) != 0)
64978 return 0;
64979 if (!S_ISBLK(stat.st_mode))
64980 return 0;
64981diff --git a/init/do_mounts_initrd.c b/init/do_mounts_initrd.c
64982index 3098a38..253064e 100644
64983--- a/init/do_mounts_initrd.c
64984+++ b/init/do_mounts_initrd.c
64985@@ -44,13 +44,13 @@ static void __init handle_initrd(void)
64986 create_dev("/dev/root.old", Root_RAM0);
64987 /* mount initrd on rootfs' /root */
64988 mount_block_root("/dev/root.old", root_mountflags & ~MS_RDONLY);
64989- sys_mkdir("/old", 0700);
64990- root_fd = sys_open("/", 0, 0);
64991- old_fd = sys_open("/old", 0, 0);
64992+ sys_mkdir((const char __force_user *)"/old", 0700);
64993+ root_fd = sys_open((const char __force_user *)"/", 0, 0);
64994+ old_fd = sys_open((const char __force_user *)"/old", 0, 0);
64995 /* move initrd over / and chdir/chroot in initrd root */
64996- sys_chdir("/root");
64997- sys_mount(".", "/", NULL, MS_MOVE, NULL);
64998- sys_chroot(".");
64999+ sys_chdir((const char __force_user *)"/root");
65000+ sys_mount((char __force_user *)".", (char __force_user *)"/", NULL, MS_MOVE, NULL);
65001+ sys_chroot((const char __force_user *)".");
65002
65003 /*
65004 * In case that a resume from disk is carried out by linuxrc or one of
65005@@ -67,15 +67,15 @@ static void __init handle_initrd(void)
65006
65007 /* move initrd to rootfs' /old */
65008 sys_fchdir(old_fd);
65009- sys_mount("/", ".", NULL, MS_MOVE, NULL);
65010+ sys_mount((char __force_user *)"/", (char __force_user *)".", NULL, MS_MOVE, NULL);
65011 /* switch root and cwd back to / of rootfs */
65012 sys_fchdir(root_fd);
65013- sys_chroot(".");
65014+ sys_chroot((const char __force_user *)".");
65015 sys_close(old_fd);
65016 sys_close(root_fd);
65017
65018 if (new_decode_dev(real_root_dev) == Root_RAM0) {
65019- sys_chdir("/old");
65020+ sys_chdir((const char __force_user *)"/old");
65021 return;
65022 }
65023
65024@@ -83,17 +83,17 @@ static void __init handle_initrd(void)
65025 mount_root();
65026
65027 printk(KERN_NOTICE "Trying to move old root to /initrd ... ");
65028- error = sys_mount("/old", "/root/initrd", NULL, MS_MOVE, NULL);
65029+ error = sys_mount((char __force_user *)"/old", (char __force_user *)"/root/initrd", NULL, MS_MOVE, NULL);
65030 if (!error)
65031 printk("okay\n");
65032 else {
65033- int fd = sys_open("/dev/root.old", O_RDWR, 0);
65034+ int fd = sys_open((const char __force_user *)"/dev/root.old", O_RDWR, 0);
65035 if (error == -ENOENT)
65036 printk("/initrd does not exist. Ignored.\n");
65037 else
65038 printk("failed\n");
65039 printk(KERN_NOTICE "Unmounting old root\n");
65040- sys_umount("/old", MNT_DETACH);
65041+ sys_umount((char __force_user *)"/old", MNT_DETACH);
65042 printk(KERN_NOTICE "Trying to free ramdisk memory ... ");
65043 if (fd < 0) {
65044 error = fd;
65045@@ -116,11 +116,11 @@ int __init initrd_load(void)
65046 * mounted in the normal path.
65047 */
65048 if (rd_load_image("/initrd.image") && ROOT_DEV != Root_RAM0) {
65049- sys_unlink("/initrd.image");
65050+ sys_unlink((const char __force_user *)"/initrd.image");
65051 handle_initrd();
65052 return 1;
65053 }
65054 }
65055- sys_unlink("/initrd.image");
65056+ sys_unlink((const char __force_user *)"/initrd.image");
65057 return 0;
65058 }
65059diff --git a/init/do_mounts_md.c b/init/do_mounts_md.c
65060index 32c4799..c27ee74 100644
65061--- a/init/do_mounts_md.c
65062+++ b/init/do_mounts_md.c
65063@@ -170,7 +170,7 @@ static void __init md_setup_drive(void)
65064 partitioned ? "_d" : "", minor,
65065 md_setup_args[ent].device_names);
65066
65067- fd = sys_open(name, 0, 0);
65068+ fd = sys_open((char __force_user *)name, 0, 0);
65069 if (fd < 0) {
65070 printk(KERN_ERR "md: open failed - cannot start "
65071 "array %s\n", name);
65072@@ -233,7 +233,7 @@ static void __init md_setup_drive(void)
65073 * array without it
65074 */
65075 sys_close(fd);
65076- fd = sys_open(name, 0, 0);
65077+ fd = sys_open((char __force_user *)name, 0, 0);
65078 sys_ioctl(fd, BLKRRPART, 0);
65079 }
65080 sys_close(fd);
65081@@ -283,7 +283,7 @@ static void __init autodetect_raid(void)
65082
65083 wait_for_device_probe();
65084
65085- fd = sys_open((const char __user __force *) "/dev/md0", 0, 0);
65086+ fd = sys_open((const char __force_user *) "/dev/md0", 0, 0);
65087 if (fd >= 0) {
65088 sys_ioctl(fd, RAID_AUTORUN, raid_autopart);
65089 sys_close(fd);
65090diff --git a/init/initramfs.c b/init/initramfs.c
65091index 2531811..040d4d4 100644
65092--- a/init/initramfs.c
65093+++ b/init/initramfs.c
65094@@ -74,7 +74,7 @@ static void __init free_hash(void)
65095 }
65096 }
65097
65098-static long __init do_utime(char __user *filename, time_t mtime)
65099+static long __init do_utime(__force char __user *filename, time_t mtime)
65100 {
65101 struct timespec t[2];
65102
65103@@ -109,7 +109,7 @@ static void __init dir_utime(void)
65104 struct dir_entry *de, *tmp;
65105 list_for_each_entry_safe(de, tmp, &dir_list, list) {
65106 list_del(&de->list);
65107- do_utime(de->name, de->mtime);
65108+ do_utime((char __force_user *)de->name, de->mtime);
65109 kfree(de->name);
65110 kfree(de);
65111 }
65112@@ -271,7 +271,7 @@ static int __init maybe_link(void)
65113 if (nlink >= 2) {
65114 char *old = find_link(major, minor, ino, mode, collected);
65115 if (old)
65116- return (sys_link(old, collected) < 0) ? -1 : 1;
65117+ return (sys_link((char __force_user *)old, (char __force_user *)collected) < 0) ? -1 : 1;
65118 }
65119 return 0;
65120 }
65121@@ -280,11 +280,11 @@ static void __init clean_path(char *path, mode_t mode)
65122 {
65123 struct stat st;
65124
65125- if (!sys_newlstat(path, &st) && (st.st_mode^mode) & S_IFMT) {
65126+ if (!sys_newlstat((char __force_user *)path, (struct stat __force_user *)&st) && (st.st_mode^mode) & S_IFMT) {
65127 if (S_ISDIR(st.st_mode))
65128- sys_rmdir(path);
65129+ sys_rmdir((char __force_user *)path);
65130 else
65131- sys_unlink(path);
65132+ sys_unlink((char __force_user *)path);
65133 }
65134 }
65135
65136@@ -305,7 +305,7 @@ static int __init do_name(void)
65137 int openflags = O_WRONLY|O_CREAT;
65138 if (ml != 1)
65139 openflags |= O_TRUNC;
65140- wfd = sys_open(collected, openflags, mode);
65141+ wfd = sys_open((char __force_user *)collected, openflags, mode);
65142
65143 if (wfd >= 0) {
65144 sys_fchown(wfd, uid, gid);
65145@@ -317,17 +317,17 @@ static int __init do_name(void)
65146 }
65147 }
65148 } else if (S_ISDIR(mode)) {
65149- sys_mkdir(collected, mode);
65150- sys_chown(collected, uid, gid);
65151- sys_chmod(collected, mode);
65152+ sys_mkdir((char __force_user *)collected, mode);
65153+ sys_chown((char __force_user *)collected, uid, gid);
65154+ sys_chmod((char __force_user *)collected, mode);
65155 dir_add(collected, mtime);
65156 } else if (S_ISBLK(mode) || S_ISCHR(mode) ||
65157 S_ISFIFO(mode) || S_ISSOCK(mode)) {
65158 if (maybe_link() == 0) {
65159- sys_mknod(collected, mode, rdev);
65160- sys_chown(collected, uid, gid);
65161- sys_chmod(collected, mode);
65162- do_utime(collected, mtime);
65163+ sys_mknod((char __force_user *)collected, mode, rdev);
65164+ sys_chown((char __force_user *)collected, uid, gid);
65165+ sys_chmod((char __force_user *)collected, mode);
65166+ do_utime((char __force_user *)collected, mtime);
65167 }
65168 }
65169 return 0;
65170@@ -336,15 +336,15 @@ static int __init do_name(void)
65171 static int __init do_copy(void)
65172 {
65173 if (count >= body_len) {
65174- sys_write(wfd, victim, body_len);
65175+ sys_write(wfd, (char __force_user *)victim, body_len);
65176 sys_close(wfd);
65177- do_utime(vcollected, mtime);
65178+ do_utime((char __force_user *)vcollected, mtime);
65179 kfree(vcollected);
65180 eat(body_len);
65181 state = SkipIt;
65182 return 0;
65183 } else {
65184- sys_write(wfd, victim, count);
65185+ sys_write(wfd, (char __force_user *)victim, count);
65186 body_len -= count;
65187 eat(count);
65188 return 1;
65189@@ -355,9 +355,9 @@ static int __init do_symlink(void)
65190 {
65191 collected[N_ALIGN(name_len) + body_len] = '\0';
65192 clean_path(collected, 0);
65193- sys_symlink(collected + N_ALIGN(name_len), collected);
65194- sys_lchown(collected, uid, gid);
65195- do_utime(collected, mtime);
65196+ sys_symlink((char __force_user *)collected + N_ALIGN(name_len), (char __force_user *)collected);
65197+ sys_lchown((char __force_user *)collected, uid, gid);
65198+ do_utime((char __force_user *)collected, mtime);
65199 state = SkipIt;
65200 next_state = Reset;
65201 return 0;
65202diff --git a/init/main.c b/init/main.c
65203index 217ed23..ec5406f 100644
65204--- a/init/main.c
65205+++ b/init/main.c
65206@@ -96,6 +96,8 @@ static inline void mark_rodata_ro(void) { }
65207 extern void tc_init(void);
65208 #endif
65209
65210+extern void grsecurity_init(void);
65211+
65212 /*
65213 * Debug helper: via this flag we know that we are in 'early bootup code'
65214 * where only the boot processor is running with IRQ disabled. This means
65215@@ -149,6 +151,49 @@ static int __init set_reset_devices(char *str)
65216
65217 __setup("reset_devices", set_reset_devices);
65218
65219+#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
65220+extern char pax_enter_kernel_user[];
65221+extern char pax_exit_kernel_user[];
65222+extern pgdval_t clone_pgd_mask;
65223+#endif
65224+
65225+#if defined(CONFIG_X86) && defined(CONFIG_PAX_MEMORY_UDEREF)
65226+static int __init setup_pax_nouderef(char *str)
65227+{
65228+#ifdef CONFIG_X86_32
65229+ unsigned int cpu;
65230+ struct desc_struct *gdt;
65231+
65232+ for (cpu = 0; cpu < nr_cpu_ids; cpu++) {
65233+ gdt = get_cpu_gdt_table(cpu);
65234+ gdt[GDT_ENTRY_KERNEL_DS].type = 3;
65235+ gdt[GDT_ENTRY_KERNEL_DS].limit = 0xf;
65236+ gdt[GDT_ENTRY_DEFAULT_USER_CS].limit = 0xf;
65237+ gdt[GDT_ENTRY_DEFAULT_USER_DS].limit = 0xf;
65238+ }
65239+ asm("mov %0, %%ds; mov %0, %%es; mov %0, %%ss" : : "r" (__KERNEL_DS) : "memory");
65240+#else
65241+ memcpy(pax_enter_kernel_user, (unsigned char []){0xc3}, 1);
65242+ memcpy(pax_exit_kernel_user, (unsigned char []){0xc3}, 1);
65243+ clone_pgd_mask = ~(pgdval_t)0UL;
65244+#endif
65245+
65246+ return 0;
65247+}
65248+early_param("pax_nouderef", setup_pax_nouderef);
65249+#endif
65250+
65251+#ifdef CONFIG_PAX_SOFTMODE
65252+int pax_softmode;
65253+
65254+static int __init setup_pax_softmode(char *str)
65255+{
65256+ get_option(&str, &pax_softmode);
65257+ return 1;
65258+}
65259+__setup("pax_softmode=", setup_pax_softmode);
65260+#endif
65261+
65262 static const char * argv_init[MAX_INIT_ARGS+2] = { "init", NULL, };
65263 const char * envp_init[MAX_INIT_ENVS+2] = { "HOME=/", "TERM=linux", NULL, };
65264 static const char *panic_later, *panic_param;
65265@@ -681,6 +726,7 @@ int __init_or_module do_one_initcall(initcall_t fn)
65266 {
65267 int count = preempt_count();
65268 int ret;
65269+ const char *msg1 = "", *msg2 = "";
65270
65271 if (initcall_debug)
65272 ret = do_one_initcall_debug(fn);
65273@@ -693,15 +739,15 @@ int __init_or_module do_one_initcall(initcall_t fn)
65274 sprintf(msgbuf, "error code %d ", ret);
65275
65276 if (preempt_count() != count) {
65277- strlcat(msgbuf, "preemption imbalance ", sizeof(msgbuf));
65278+ msg1 = " preemption imbalance";
65279 preempt_count() = count;
65280 }
65281 if (irqs_disabled()) {
65282- strlcat(msgbuf, "disabled interrupts ", sizeof(msgbuf));
65283+ msg2 = " disabled interrupts";
65284 local_irq_enable();
65285 }
65286- if (msgbuf[0]) {
65287- printk("initcall %pF returned with %s\n", fn, msgbuf);
65288+ if (msgbuf[0] || *msg1 || *msg2) {
65289+ printk("initcall %pF returned with %s%s%s\n", fn, msgbuf, msg1, msg2);
65290 }
65291
65292 return ret;
65293@@ -820,7 +866,7 @@ static int __init kernel_init(void * unused)
65294 do_basic_setup();
65295
65296 /* Open the /dev/console on the rootfs, this should never fail */
65297- if (sys_open((const char __user *) "/dev/console", O_RDWR, 0) < 0)
65298+ if (sys_open((const char __force_user *) "/dev/console", O_RDWR, 0) < 0)
65299 printk(KERN_WARNING "Warning: unable to open an initial console.\n");
65300
65301 (void) sys_dup(0);
65302@@ -833,11 +879,13 @@ static int __init kernel_init(void * unused)
65303 if (!ramdisk_execute_command)
65304 ramdisk_execute_command = "/init";
65305
65306- if (sys_access((const char __user *) ramdisk_execute_command, 0) != 0) {
65307+ if (sys_access((const char __force_user *) ramdisk_execute_command, 0) != 0) {
65308 ramdisk_execute_command = NULL;
65309 prepare_namespace();
65310 }
65311
65312+ grsecurity_init();
65313+
65314 /*
65315 * Ok, we have completed the initial bootup, and
65316 * we're essentially up and running. Get rid of the
65317diff --git a/ipc/mqueue.c b/ipc/mqueue.c
65318index 5b4293d..f179875 100644
65319--- a/ipc/mqueue.c
65320+++ b/ipc/mqueue.c
65321@@ -156,6 +156,7 @@ static struct inode *mqueue_get_inode(struct super_block *sb,
65322 mq_bytes = (mq_msg_tblsz +
65323 (info->attr.mq_maxmsg * info->attr.mq_msgsize));
65324
65325+ gr_learn_resource(current, RLIMIT_MSGQUEUE, u->mq_bytes + mq_bytes, 1);
65326 spin_lock(&mq_lock);
65327 if (u->mq_bytes + mq_bytes < u->mq_bytes ||
65328 u->mq_bytes + mq_bytes > task_rlimit(p, RLIMIT_MSGQUEUE)) {
65329diff --git a/ipc/msg.c b/ipc/msg.c
65330index 7385de2..a8180e08 100644
65331--- a/ipc/msg.c
65332+++ b/ipc/msg.c
65333@@ -309,18 +309,19 @@ static inline int msg_security(struct kern_ipc_perm *ipcp, int msgflg)
65334 return security_msg_queue_associate(msq, msgflg);
65335 }
65336
65337+static struct ipc_ops msg_ops = {
65338+ .getnew = newque,
65339+ .associate = msg_security,
65340+ .more_checks = NULL
65341+};
65342+
65343 SYSCALL_DEFINE2(msgget, key_t, key, int, msgflg)
65344 {
65345 struct ipc_namespace *ns;
65346- struct ipc_ops msg_ops;
65347 struct ipc_params msg_params;
65348
65349 ns = current->nsproxy->ipc_ns;
65350
65351- msg_ops.getnew = newque;
65352- msg_ops.associate = msg_security;
65353- msg_ops.more_checks = NULL;
65354-
65355 msg_params.key = key;
65356 msg_params.flg = msgflg;
65357
65358diff --git a/ipc/sem.c b/ipc/sem.c
65359index 5215a81..cfc0cac 100644
65360--- a/ipc/sem.c
65361+++ b/ipc/sem.c
65362@@ -364,10 +364,15 @@ static inline int sem_more_checks(struct kern_ipc_perm *ipcp,
65363 return 0;
65364 }
65365
65366+static struct ipc_ops sem_ops = {
65367+ .getnew = newary,
65368+ .associate = sem_security,
65369+ .more_checks = sem_more_checks
65370+};
65371+
65372 SYSCALL_DEFINE3(semget, key_t, key, int, nsems, int, semflg)
65373 {
65374 struct ipc_namespace *ns;
65375- struct ipc_ops sem_ops;
65376 struct ipc_params sem_params;
65377
65378 ns = current->nsproxy->ipc_ns;
65379@@ -375,10 +380,6 @@ SYSCALL_DEFINE3(semget, key_t, key, int, nsems, int, semflg)
65380 if (nsems < 0 || nsems > ns->sc_semmsl)
65381 return -EINVAL;
65382
65383- sem_ops.getnew = newary;
65384- sem_ops.associate = sem_security;
65385- sem_ops.more_checks = sem_more_checks;
65386-
65387 sem_params.key = key;
65388 sem_params.flg = semflg;
65389 sem_params.u.nsems = nsems;
65390diff --git a/ipc/shm.c b/ipc/shm.c
65391index b76be5b..859e750 100644
65392--- a/ipc/shm.c
65393+++ b/ipc/shm.c
65394@@ -69,6 +69,14 @@ static void shm_destroy (struct ipc_namespace *ns, struct shmid_kernel *shp);
65395 static int sysvipc_shm_proc_show(struct seq_file *s, void *it);
65396 #endif
65397
65398+#ifdef CONFIG_GRKERNSEC
65399+extern int gr_handle_shmat(const pid_t shm_cprid, const pid_t shm_lapid,
65400+ const time_t shm_createtime, const uid_t cuid,
65401+ const int shmid);
65402+extern int gr_chroot_shmat(const pid_t shm_cprid, const pid_t shm_lapid,
65403+ const time_t shm_createtime);
65404+#endif
65405+
65406 void shm_init_ns(struct ipc_namespace *ns)
65407 {
65408 ns->shm_ctlmax = SHMMAX;
65409@@ -508,6 +516,14 @@ static int newseg(struct ipc_namespace *ns, struct ipc_params *params)
65410 shp->shm_lprid = 0;
65411 shp->shm_atim = shp->shm_dtim = 0;
65412 shp->shm_ctim = get_seconds();
65413+#ifdef CONFIG_GRKERNSEC
65414+ {
65415+ struct timespec timeval;
65416+ do_posix_clock_monotonic_gettime(&timeval);
65417+
65418+ shp->shm_createtime = timeval.tv_sec;
65419+ }
65420+#endif
65421 shp->shm_segsz = size;
65422 shp->shm_nattch = 0;
65423 shp->shm_file = file;
65424@@ -559,18 +575,19 @@ static inline int shm_more_checks(struct kern_ipc_perm *ipcp,
65425 return 0;
65426 }
65427
65428+static struct ipc_ops shm_ops = {
65429+ .getnew = newseg,
65430+ .associate = shm_security,
65431+ .more_checks = shm_more_checks
65432+};
65433+
65434 SYSCALL_DEFINE3(shmget, key_t, key, size_t, size, int, shmflg)
65435 {
65436 struct ipc_namespace *ns;
65437- struct ipc_ops shm_ops;
65438 struct ipc_params shm_params;
65439
65440 ns = current->nsproxy->ipc_ns;
65441
65442- shm_ops.getnew = newseg;
65443- shm_ops.associate = shm_security;
65444- shm_ops.more_checks = shm_more_checks;
65445-
65446 shm_params.key = key;
65447 shm_params.flg = shmflg;
65448 shm_params.u.size = size;
65449@@ -988,6 +1005,12 @@ long do_shmat(int shmid, char __user *shmaddr, int shmflg, ulong *raddr)
65450 f_mode = FMODE_READ | FMODE_WRITE;
65451 }
65452 if (shmflg & SHM_EXEC) {
65453+
65454+#ifdef CONFIG_PAX_MPROTECT
65455+ if (current->mm->pax_flags & MF_PAX_MPROTECT)
65456+ goto out;
65457+#endif
65458+
65459 prot |= PROT_EXEC;
65460 acc_mode |= S_IXUGO;
65461 }
65462@@ -1011,9 +1034,21 @@ long do_shmat(int shmid, char __user *shmaddr, int shmflg, ulong *raddr)
65463 if (err)
65464 goto out_unlock;
65465
65466+#ifdef CONFIG_GRKERNSEC
65467+ if (!gr_handle_shmat(shp->shm_cprid, shp->shm_lapid, shp->shm_createtime,
65468+ shp->shm_perm.cuid, shmid) ||
65469+ !gr_chroot_shmat(shp->shm_cprid, shp->shm_lapid, shp->shm_createtime)) {
65470+ err = -EACCES;
65471+ goto out_unlock;
65472+ }
65473+#endif
65474+
65475 path = shp->shm_file->f_path;
65476 path_get(&path);
65477 shp->shm_nattch++;
65478+#ifdef CONFIG_GRKERNSEC
65479+ shp->shm_lapid = current->pid;
65480+#endif
65481 size = i_size_read(path.dentry->d_inode);
65482 shm_unlock(shp);
65483
65484diff --git a/kernel/acct.c b/kernel/acct.c
65485index fa7eb3d..7faf116 100644
65486--- a/kernel/acct.c
65487+++ b/kernel/acct.c
65488@@ -570,7 +570,7 @@ static void do_acct_process(struct bsd_acct_struct *acct,
65489 */
65490 flim = current->signal->rlim[RLIMIT_FSIZE].rlim_cur;
65491 current->signal->rlim[RLIMIT_FSIZE].rlim_cur = RLIM_INFINITY;
65492- file->f_op->write(file, (char *)&ac,
65493+ file->f_op->write(file, (char __force_user *)&ac,
65494 sizeof(acct_t), &file->f_pos);
65495 current->signal->rlim[RLIMIT_FSIZE].rlim_cur = flim;
65496 set_fs(fs);
65497diff --git a/kernel/audit.c b/kernel/audit.c
65498index 09fae26..ed71d5b 100644
65499--- a/kernel/audit.c
65500+++ b/kernel/audit.c
65501@@ -115,7 +115,7 @@ u32 audit_sig_sid = 0;
65502 3) suppressed due to audit_rate_limit
65503 4) suppressed due to audit_backlog_limit
65504 */
65505-static atomic_t audit_lost = ATOMIC_INIT(0);
65506+static atomic_unchecked_t audit_lost = ATOMIC_INIT(0);
65507
65508 /* The netlink socket. */
65509 static struct sock *audit_sock;
65510@@ -237,7 +237,7 @@ void audit_log_lost(const char *message)
65511 unsigned long now;
65512 int print;
65513
65514- atomic_inc(&audit_lost);
65515+ atomic_inc_unchecked(&audit_lost);
65516
65517 print = (audit_failure == AUDIT_FAIL_PANIC || !audit_rate_limit);
65518
65519@@ -256,7 +256,7 @@ void audit_log_lost(const char *message)
65520 printk(KERN_WARNING
65521 "audit: audit_lost=%d audit_rate_limit=%d "
65522 "audit_backlog_limit=%d\n",
65523- atomic_read(&audit_lost),
65524+ atomic_read_unchecked(&audit_lost),
65525 audit_rate_limit,
65526 audit_backlog_limit);
65527 audit_panic(message);
65528@@ -689,7 +689,7 @@ static int audit_receive_msg(struct sk_buff *skb, struct nlmsghdr *nlh)
65529 status_set.pid = audit_pid;
65530 status_set.rate_limit = audit_rate_limit;
65531 status_set.backlog_limit = audit_backlog_limit;
65532- status_set.lost = atomic_read(&audit_lost);
65533+ status_set.lost = atomic_read_unchecked(&audit_lost);
65534 status_set.backlog = skb_queue_len(&audit_skb_queue);
65535 audit_send_reply(NETLINK_CB(skb).pid, seq, AUDIT_GET, 0, 0,
65536 &status_set, sizeof(status_set));
65537@@ -1260,12 +1260,13 @@ static void audit_log_vformat(struct audit_buffer *ab, const char *fmt,
65538 avail = audit_expand(ab,
65539 max_t(unsigned, AUDIT_BUFSIZ, 1+len-avail));
65540 if (!avail)
65541- goto out;
65542+ goto out_va_end;
65543 len = vsnprintf(skb_tail_pointer(skb), avail, fmt, args2);
65544 }
65545- va_end(args2);
65546 if (len > 0)
65547 skb_put(skb, len);
65548+out_va_end:
65549+ va_end(args2);
65550 out:
65551 return;
65552 }
65553diff --git a/kernel/auditsc.c b/kernel/auditsc.c
65554index 47b7fc1..c003c33 100644
65555--- a/kernel/auditsc.c
65556+++ b/kernel/auditsc.c
65557@@ -1166,8 +1166,8 @@ static void audit_log_execve_info(struct audit_context *context,
65558 struct audit_buffer **ab,
65559 struct audit_aux_data_execve *axi)
65560 {
65561- int i;
65562- size_t len, len_sent = 0;
65563+ int i, len;
65564+ size_t len_sent = 0;
65565 const char __user *p;
65566 char *buf;
65567
65568@@ -2118,7 +2118,7 @@ int auditsc_get_stamp(struct audit_context *ctx,
65569 }
65570
65571 /* global counter which is incremented every time something logs in */
65572-static atomic_t session_id = ATOMIC_INIT(0);
65573+static atomic_unchecked_t session_id = ATOMIC_INIT(0);
65574
65575 /**
65576 * audit_set_loginuid - set a task's audit_context loginuid
65577@@ -2131,7 +2131,7 @@ static atomic_t session_id = ATOMIC_INIT(0);
65578 */
65579 int audit_set_loginuid(struct task_struct *task, uid_t loginuid)
65580 {
65581- unsigned int sessionid = atomic_inc_return(&session_id);
65582+ unsigned int sessionid = atomic_inc_return_unchecked(&session_id);
65583 struct audit_context *context = task->audit_context;
65584
65585 if (context && context->in_syscall) {
65586diff --git a/kernel/capability.c b/kernel/capability.c
65587index b463871..fa3ea1f 100644
65588--- a/kernel/capability.c
65589+++ b/kernel/capability.c
65590@@ -202,6 +202,9 @@ SYSCALL_DEFINE2(capget, cap_user_header_t, header, cap_user_data_t, dataptr)
65591 * before modification is attempted and the application
65592 * fails.
65593 */
65594+ if (tocopy > ARRAY_SIZE(kdata))
65595+ return -EFAULT;
65596+
65597 if (copy_to_user(dataptr, kdata, tocopy
65598 * sizeof(struct __user_cap_data_struct))) {
65599 return -EFAULT;
65600@@ -374,7 +377,7 @@ bool ns_capable(struct user_namespace *ns, int cap)
65601 BUG();
65602 }
65603
65604- if (security_capable(ns, current_cred(), cap) == 0) {
65605+ if (security_capable(ns, current_cred(), cap) == 0 && gr_is_capable(cap)) {
65606 current->flags |= PF_SUPERPRIV;
65607 return true;
65608 }
65609@@ -382,6 +385,27 @@ bool ns_capable(struct user_namespace *ns, int cap)
65610 }
65611 EXPORT_SYMBOL(ns_capable);
65612
65613+bool ns_capable_nolog(struct user_namespace *ns, int cap)
65614+{
65615+ if (unlikely(!cap_valid(cap))) {
65616+ printk(KERN_CRIT "capable() called with invalid cap=%u\n", cap);
65617+ BUG();
65618+ }
65619+
65620+ if (security_capable(ns, current_cred(), cap) == 0 && gr_is_capable_nolog(cap)) {
65621+ current->flags |= PF_SUPERPRIV;
65622+ return true;
65623+ }
65624+ return false;
65625+}
65626+EXPORT_SYMBOL(ns_capable_nolog);
65627+
65628+bool capable_nolog(int cap)
65629+{
65630+ return ns_capable_nolog(&init_user_ns, cap);
65631+}
65632+EXPORT_SYMBOL(capable_nolog);
65633+
65634 /**
65635 * task_ns_capable - Determine whether current task has a superior
65636 * capability targeted at a specific task's user namespace.
65637@@ -396,6 +420,12 @@ bool task_ns_capable(struct task_struct *t, int cap)
65638 }
65639 EXPORT_SYMBOL(task_ns_capable);
65640
65641+bool task_ns_capable_nolog(struct task_struct *t, int cap)
65642+{
65643+ return ns_capable_nolog(task_cred_xxx(t, user)->user_ns, cap);
65644+}
65645+EXPORT_SYMBOL(task_ns_capable_nolog);
65646+
65647 /**
65648 * nsown_capable - Check superior capability to one's own user_ns
65649 * @cap: The capability in question
65650diff --git a/kernel/compat.c b/kernel/compat.c
65651index f346ced..aa2b1f4 100644
65652--- a/kernel/compat.c
65653+++ b/kernel/compat.c
65654@@ -13,6 +13,7 @@
65655
65656 #include <linux/linkage.h>
65657 #include <linux/compat.h>
65658+#include <linux/module.h>
65659 #include <linux/errno.h>
65660 #include <linux/time.h>
65661 #include <linux/signal.h>
65662@@ -168,7 +169,7 @@ static long compat_nanosleep_restart(struct restart_block *restart)
65663 mm_segment_t oldfs;
65664 long ret;
65665
65666- restart->nanosleep.rmtp = (struct timespec __user *) &rmt;
65667+ restart->nanosleep.rmtp = (struct timespec __force_user *) &rmt;
65668 oldfs = get_fs();
65669 set_fs(KERNEL_DS);
65670 ret = hrtimer_nanosleep_restart(restart);
65671@@ -200,7 +201,7 @@ asmlinkage long compat_sys_nanosleep(struct compat_timespec __user *rqtp,
65672 oldfs = get_fs();
65673 set_fs(KERNEL_DS);
65674 ret = hrtimer_nanosleep(&tu,
65675- rmtp ? (struct timespec __user *)&rmt : NULL,
65676+ rmtp ? (struct timespec __force_user *)&rmt : NULL,
65677 HRTIMER_MODE_REL, CLOCK_MONOTONIC);
65678 set_fs(oldfs);
65679
65680@@ -309,7 +310,7 @@ asmlinkage long compat_sys_sigpending(compat_old_sigset_t __user *set)
65681 mm_segment_t old_fs = get_fs();
65682
65683 set_fs(KERNEL_DS);
65684- ret = sys_sigpending((old_sigset_t __user *) &s);
65685+ ret = sys_sigpending((old_sigset_t __force_user *) &s);
65686 set_fs(old_fs);
65687 if (ret == 0)
65688 ret = put_user(s, set);
65689@@ -332,8 +333,8 @@ asmlinkage long compat_sys_sigprocmask(int how, compat_old_sigset_t __user *set,
65690 old_fs = get_fs();
65691 set_fs(KERNEL_DS);
65692 ret = sys_sigprocmask(how,
65693- set ? (old_sigset_t __user *) &s : NULL,
65694- oset ? (old_sigset_t __user *) &s : NULL);
65695+ set ? (old_sigset_t __force_user *) &s : NULL,
65696+ oset ? (old_sigset_t __force_user *) &s : NULL);
65697 set_fs(old_fs);
65698 if (ret == 0)
65699 if (oset)
65700@@ -370,7 +371,7 @@ asmlinkage long compat_sys_old_getrlimit(unsigned int resource,
65701 mm_segment_t old_fs = get_fs();
65702
65703 set_fs(KERNEL_DS);
65704- ret = sys_old_getrlimit(resource, &r);
65705+ ret = sys_old_getrlimit(resource, (struct rlimit __force_user *)&r);
65706 set_fs(old_fs);
65707
65708 if (!ret) {
65709@@ -442,7 +443,7 @@ asmlinkage long compat_sys_getrusage(int who, struct compat_rusage __user *ru)
65710 mm_segment_t old_fs = get_fs();
65711
65712 set_fs(KERNEL_DS);
65713- ret = sys_getrusage(who, (struct rusage __user *) &r);
65714+ ret = sys_getrusage(who, (struct rusage __force_user *) &r);
65715 set_fs(old_fs);
65716
65717 if (ret)
65718@@ -469,8 +470,8 @@ compat_sys_wait4(compat_pid_t pid, compat_uint_t __user *stat_addr, int options,
65719 set_fs (KERNEL_DS);
65720 ret = sys_wait4(pid,
65721 (stat_addr ?
65722- (unsigned int __user *) &status : NULL),
65723- options, (struct rusage __user *) &r);
65724+ (unsigned int __force_user *) &status : NULL),
65725+ options, (struct rusage __force_user *) &r);
65726 set_fs (old_fs);
65727
65728 if (ret > 0) {
65729@@ -495,8 +496,8 @@ asmlinkage long compat_sys_waitid(int which, compat_pid_t pid,
65730 memset(&info, 0, sizeof(info));
65731
65732 set_fs(KERNEL_DS);
65733- ret = sys_waitid(which, pid, (siginfo_t __user *)&info, options,
65734- uru ? (struct rusage __user *)&ru : NULL);
65735+ ret = sys_waitid(which, pid, (siginfo_t __force_user *)&info, options,
65736+ uru ? (struct rusage __force_user *)&ru : NULL);
65737 set_fs(old_fs);
65738
65739 if ((ret < 0) || (info.si_signo == 0))
65740@@ -626,8 +627,8 @@ long compat_sys_timer_settime(timer_t timer_id, int flags,
65741 oldfs = get_fs();
65742 set_fs(KERNEL_DS);
65743 err = sys_timer_settime(timer_id, flags,
65744- (struct itimerspec __user *) &newts,
65745- (struct itimerspec __user *) &oldts);
65746+ (struct itimerspec __force_user *) &newts,
65747+ (struct itimerspec __force_user *) &oldts);
65748 set_fs(oldfs);
65749 if (!err && old && put_compat_itimerspec(old, &oldts))
65750 return -EFAULT;
65751@@ -644,7 +645,7 @@ long compat_sys_timer_gettime(timer_t timer_id,
65752 oldfs = get_fs();
65753 set_fs(KERNEL_DS);
65754 err = sys_timer_gettime(timer_id,
65755- (struct itimerspec __user *) &ts);
65756+ (struct itimerspec __force_user *) &ts);
65757 set_fs(oldfs);
65758 if (!err && put_compat_itimerspec(setting, &ts))
65759 return -EFAULT;
65760@@ -663,7 +664,7 @@ long compat_sys_clock_settime(clockid_t which_clock,
65761 oldfs = get_fs();
65762 set_fs(KERNEL_DS);
65763 err = sys_clock_settime(which_clock,
65764- (struct timespec __user *) &ts);
65765+ (struct timespec __force_user *) &ts);
65766 set_fs(oldfs);
65767 return err;
65768 }
65769@@ -678,7 +679,7 @@ long compat_sys_clock_gettime(clockid_t which_clock,
65770 oldfs = get_fs();
65771 set_fs(KERNEL_DS);
65772 err = sys_clock_gettime(which_clock,
65773- (struct timespec __user *) &ts);
65774+ (struct timespec __force_user *) &ts);
65775 set_fs(oldfs);
65776 if (!err && put_compat_timespec(&ts, tp))
65777 return -EFAULT;
65778@@ -698,7 +699,7 @@ long compat_sys_clock_adjtime(clockid_t which_clock,
65779
65780 oldfs = get_fs();
65781 set_fs(KERNEL_DS);
65782- ret = sys_clock_adjtime(which_clock, (struct timex __user *) &txc);
65783+ ret = sys_clock_adjtime(which_clock, (struct timex __force_user *) &txc);
65784 set_fs(oldfs);
65785
65786 err = compat_put_timex(utp, &txc);
65787@@ -718,7 +719,7 @@ long compat_sys_clock_getres(clockid_t which_clock,
65788 oldfs = get_fs();
65789 set_fs(KERNEL_DS);
65790 err = sys_clock_getres(which_clock,
65791- (struct timespec __user *) &ts);
65792+ (struct timespec __force_user *) &ts);
65793 set_fs(oldfs);
65794 if (!err && tp && put_compat_timespec(&ts, tp))
65795 return -EFAULT;
65796@@ -730,9 +731,9 @@ static long compat_clock_nanosleep_restart(struct restart_block *restart)
65797 long err;
65798 mm_segment_t oldfs;
65799 struct timespec tu;
65800- struct compat_timespec *rmtp = restart->nanosleep.compat_rmtp;
65801+ struct compat_timespec __user *rmtp = restart->nanosleep.compat_rmtp;
65802
65803- restart->nanosleep.rmtp = (struct timespec __user *) &tu;
65804+ restart->nanosleep.rmtp = (struct timespec __force_user *) &tu;
65805 oldfs = get_fs();
65806 set_fs(KERNEL_DS);
65807 err = clock_nanosleep_restart(restart);
65808@@ -764,8 +765,8 @@ long compat_sys_clock_nanosleep(clockid_t which_clock, int flags,
65809 oldfs = get_fs();
65810 set_fs(KERNEL_DS);
65811 err = sys_clock_nanosleep(which_clock, flags,
65812- (struct timespec __user *) &in,
65813- (struct timespec __user *) &out);
65814+ (struct timespec __force_user *) &in,
65815+ (struct timespec __force_user *) &out);
65816 set_fs(oldfs);
65817
65818 if ((err == -ERESTART_RESTARTBLOCK) && rmtp &&
65819diff --git a/kernel/configs.c b/kernel/configs.c
65820index 42e8fa0..9e7406b 100644
65821--- a/kernel/configs.c
65822+++ b/kernel/configs.c
65823@@ -74,8 +74,19 @@ static int __init ikconfig_init(void)
65824 struct proc_dir_entry *entry;
65825
65826 /* create the current config file */
65827+#if defined(CONFIG_GRKERNSEC_PROC_ADD) || defined(CONFIG_GRKERNSEC_HIDESYM)
65828+#if defined(CONFIG_GRKERNSEC_PROC_USER) || defined(CONFIG_GRKERNSEC_HIDESYM)
65829+ entry = proc_create("config.gz", S_IFREG | S_IRUSR, NULL,
65830+ &ikconfig_file_ops);
65831+#elif defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
65832+ entry = proc_create("config.gz", S_IFREG | S_IRUSR | S_IRGRP, NULL,
65833+ &ikconfig_file_ops);
65834+#endif
65835+#else
65836 entry = proc_create("config.gz", S_IFREG | S_IRUGO, NULL,
65837 &ikconfig_file_ops);
65838+#endif
65839+
65840 if (!entry)
65841 return -ENOMEM;
65842
65843diff --git a/kernel/cred.c b/kernel/cred.c
65844index 5791612..a3c04dc 100644
65845--- a/kernel/cred.c
65846+++ b/kernel/cred.c
65847@@ -204,6 +204,15 @@ void exit_creds(struct task_struct *tsk)
65848 validate_creds(cred);
65849 put_cred(cred);
65850 }
65851+
65852+#ifdef CONFIG_GRKERNSEC_SETXID
65853+ cred = (struct cred *) tsk->delayed_cred;
65854+ if (cred) {
65855+ tsk->delayed_cred = NULL;
65856+ validate_creds(cred);
65857+ put_cred(cred);
65858+ }
65859+#endif
65860 }
65861
65862 /**
65863@@ -470,7 +479,7 @@ error_put:
65864 * Always returns 0 thus allowing this function to be tail-called at the end
65865 * of, say, sys_setgid().
65866 */
65867-int commit_creds(struct cred *new)
65868+static int __commit_creds(struct cred *new)
65869 {
65870 struct task_struct *task = current;
65871 const struct cred *old = task->real_cred;
65872@@ -489,6 +498,8 @@ int commit_creds(struct cred *new)
65873
65874 get_cred(new); /* we will require a ref for the subj creds too */
65875
65876+ gr_set_role_label(task, new->uid, new->gid);
65877+
65878 /* dumpability changes */
65879 if (old->euid != new->euid ||
65880 old->egid != new->egid ||
65881@@ -538,6 +549,92 @@ int commit_creds(struct cred *new)
65882 put_cred(old);
65883 return 0;
65884 }
65885+#ifdef CONFIG_GRKERNSEC_SETXID
65886+extern int set_user(struct cred *new);
65887+
65888+void gr_delayed_cred_worker(void)
65889+{
65890+ const struct cred *new = current->delayed_cred;
65891+ struct cred *ncred;
65892+
65893+ current->delayed_cred = NULL;
65894+
65895+ if (current_uid() && new != NULL) {
65896+ // from doing get_cred on it when queueing this
65897+ put_cred(new);
65898+ return;
65899+ } else if (new == NULL)
65900+ return;
65901+
65902+ ncred = prepare_creds();
65903+ if (!ncred)
65904+ goto die;
65905+ // uids
65906+ ncred->uid = new->uid;
65907+ ncred->euid = new->euid;
65908+ ncred->suid = new->suid;
65909+ ncred->fsuid = new->fsuid;
65910+ // gids
65911+ ncred->gid = new->gid;
65912+ ncred->egid = new->egid;
65913+ ncred->sgid = new->sgid;
65914+ ncred->fsgid = new->fsgid;
65915+ // groups
65916+ if (set_groups(ncred, new->group_info) < 0) {
65917+ abort_creds(ncred);
65918+ goto die;
65919+ }
65920+ // caps
65921+ ncred->securebits = new->securebits;
65922+ ncred->cap_inheritable = new->cap_inheritable;
65923+ ncred->cap_permitted = new->cap_permitted;
65924+ ncred->cap_effective = new->cap_effective;
65925+ ncred->cap_bset = new->cap_bset;
65926+
65927+ if (set_user(ncred)) {
65928+ abort_creds(ncred);
65929+ goto die;
65930+ }
65931+
65932+ // from doing get_cred on it when queueing this
65933+ put_cred(new);
65934+
65935+ __commit_creds(ncred);
65936+ return;
65937+die:
65938+ // from doing get_cred on it when queueing this
65939+ put_cred(new);
65940+ do_group_exit(SIGKILL);
65941+}
65942+#endif
65943+
65944+int commit_creds(struct cred *new)
65945+{
65946+#ifdef CONFIG_GRKERNSEC_SETXID
65947+ struct task_struct *t;
65948+
65949+ /* we won't get called with tasklist_lock held for writing
65950+ and interrupts disabled as the cred struct in that case is
65951+ init_cred
65952+ */
65953+ if (grsec_enable_setxid && !current_is_single_threaded() &&
65954+ !current_uid() && new->uid) {
65955+ rcu_read_lock();
65956+ read_lock(&tasklist_lock);
65957+ for (t = next_thread(current); t != current;
65958+ t = next_thread(t)) {
65959+ if (t->delayed_cred == NULL) {
65960+ t->delayed_cred = get_cred(new);
65961+ set_tsk_need_resched(t);
65962+ }
65963+ }
65964+ read_unlock(&tasklist_lock);
65965+ rcu_read_unlock();
65966+ }
65967+#endif
65968+ return __commit_creds(new);
65969+}
65970+
65971 EXPORT_SYMBOL(commit_creds);
65972
65973 /**
65974diff --git a/kernel/debug/debug_core.c b/kernel/debug/debug_core.c
65975index 0d7c087..01b8cef 100644
65976--- a/kernel/debug/debug_core.c
65977+++ b/kernel/debug/debug_core.c
65978@@ -119,7 +119,7 @@ static DEFINE_RAW_SPINLOCK(dbg_slave_lock);
65979 */
65980 static atomic_t masters_in_kgdb;
65981 static atomic_t slaves_in_kgdb;
65982-static atomic_t kgdb_break_tasklet_var;
65983+static atomic_unchecked_t kgdb_break_tasklet_var;
65984 atomic_t kgdb_setting_breakpoint;
65985
65986 struct task_struct *kgdb_usethread;
65987@@ -129,7 +129,7 @@ int kgdb_single_step;
65988 static pid_t kgdb_sstep_pid;
65989
65990 /* to keep track of the CPU which is doing the single stepping*/
65991-atomic_t kgdb_cpu_doing_single_step = ATOMIC_INIT(-1);
65992+atomic_unchecked_t kgdb_cpu_doing_single_step = ATOMIC_INIT(-1);
65993
65994 /*
65995 * If you are debugging a problem where roundup (the collection of
65996@@ -542,7 +542,7 @@ return_normal:
65997 * kernel will only try for the value of sstep_tries before
65998 * giving up and continuing on.
65999 */
66000- if (atomic_read(&kgdb_cpu_doing_single_step) != -1 &&
66001+ if (atomic_read_unchecked(&kgdb_cpu_doing_single_step) != -1 &&
66002 (kgdb_info[cpu].task &&
66003 kgdb_info[cpu].task->pid != kgdb_sstep_pid) && --sstep_tries) {
66004 atomic_set(&kgdb_active, -1);
66005@@ -636,8 +636,8 @@ cpu_master_loop:
66006 }
66007
66008 kgdb_restore:
66009- if (atomic_read(&kgdb_cpu_doing_single_step) != -1) {
66010- int sstep_cpu = atomic_read(&kgdb_cpu_doing_single_step);
66011+ if (atomic_read_unchecked(&kgdb_cpu_doing_single_step) != -1) {
66012+ int sstep_cpu = atomic_read_unchecked(&kgdb_cpu_doing_single_step);
66013 if (kgdb_info[sstep_cpu].task)
66014 kgdb_sstep_pid = kgdb_info[sstep_cpu].task->pid;
66015 else
66016@@ -834,18 +834,18 @@ static void kgdb_unregister_callbacks(void)
66017 static void kgdb_tasklet_bpt(unsigned long ing)
66018 {
66019 kgdb_breakpoint();
66020- atomic_set(&kgdb_break_tasklet_var, 0);
66021+ atomic_set_unchecked(&kgdb_break_tasklet_var, 0);
66022 }
66023
66024 static DECLARE_TASKLET(kgdb_tasklet_breakpoint, kgdb_tasklet_bpt, 0);
66025
66026 void kgdb_schedule_breakpoint(void)
66027 {
66028- if (atomic_read(&kgdb_break_tasklet_var) ||
66029+ if (atomic_read_unchecked(&kgdb_break_tasklet_var) ||
66030 atomic_read(&kgdb_active) != -1 ||
66031 atomic_read(&kgdb_setting_breakpoint))
66032 return;
66033- atomic_inc(&kgdb_break_tasklet_var);
66034+ atomic_inc_unchecked(&kgdb_break_tasklet_var);
66035 tasklet_schedule(&kgdb_tasklet_breakpoint);
66036 }
66037 EXPORT_SYMBOL_GPL(kgdb_schedule_breakpoint);
66038diff --git a/kernel/debug/kdb/kdb_main.c b/kernel/debug/kdb/kdb_main.c
66039index 63786e7..0780cac 100644
66040--- a/kernel/debug/kdb/kdb_main.c
66041+++ b/kernel/debug/kdb/kdb_main.c
66042@@ -1980,7 +1980,7 @@ static int kdb_lsmod(int argc, const char **argv)
66043 list_for_each_entry(mod, kdb_modules, list) {
66044
66045 kdb_printf("%-20s%8u 0x%p ", mod->name,
66046- mod->core_size, (void *)mod);
66047+ mod->core_size_rx + mod->core_size_rw, (void *)mod);
66048 #ifdef CONFIG_MODULE_UNLOAD
66049 kdb_printf("%4d ", module_refcount(mod));
66050 #endif
66051@@ -1990,7 +1990,7 @@ static int kdb_lsmod(int argc, const char **argv)
66052 kdb_printf(" (Loading)");
66053 else
66054 kdb_printf(" (Live)");
66055- kdb_printf(" 0x%p", mod->module_core);
66056+ kdb_printf(" 0x%p 0x%p", mod->module_core_rx, mod->module_core_rw);
66057
66058 #ifdef CONFIG_MODULE_UNLOAD
66059 {
66060diff --git a/kernel/events/core.c b/kernel/events/core.c
66061index 58690af..d903d75 100644
66062--- a/kernel/events/core.c
66063+++ b/kernel/events/core.c
66064@@ -173,7 +173,7 @@ int perf_proc_update_handler(struct ctl_table *table, int write,
66065 return 0;
66066 }
66067
66068-static atomic64_t perf_event_id;
66069+static atomic64_unchecked_t perf_event_id;
66070
66071 static void cpu_ctx_sched_out(struct perf_cpu_context *cpuctx,
66072 enum event_type_t event_type);
66073@@ -2540,7 +2540,7 @@ static void __perf_event_read(void *info)
66074
66075 static inline u64 perf_event_count(struct perf_event *event)
66076 {
66077- return local64_read(&event->count) + atomic64_read(&event->child_count);
66078+ return local64_read(&event->count) + atomic64_read_unchecked(&event->child_count);
66079 }
66080
66081 static u64 perf_event_read(struct perf_event *event)
66082@@ -3065,9 +3065,9 @@ u64 perf_event_read_value(struct perf_event *event, u64 *enabled, u64 *running)
66083 mutex_lock(&event->child_mutex);
66084 total += perf_event_read(event);
66085 *enabled += event->total_time_enabled +
66086- atomic64_read(&event->child_total_time_enabled);
66087+ atomic64_read_unchecked(&event->child_total_time_enabled);
66088 *running += event->total_time_running +
66089- atomic64_read(&event->child_total_time_running);
66090+ atomic64_read_unchecked(&event->child_total_time_running);
66091
66092 list_for_each_entry(child, &event->child_list, child_list) {
66093 total += perf_event_read(child);
66094@@ -3474,10 +3474,10 @@ void perf_event_update_userpage(struct perf_event *event)
66095 userpg->offset -= local64_read(&event->hw.prev_count);
66096
66097 userpg->time_enabled = enabled +
66098- atomic64_read(&event->child_total_time_enabled);
66099+ atomic64_read_unchecked(&event->child_total_time_enabled);
66100
66101 userpg->time_running = running +
66102- atomic64_read(&event->child_total_time_running);
66103+ atomic64_read_unchecked(&event->child_total_time_running);
66104
66105 barrier();
66106 ++userpg->lock;
66107@@ -3906,11 +3906,11 @@ static void perf_output_read_one(struct perf_output_handle *handle,
66108 values[n++] = perf_event_count(event);
66109 if (read_format & PERF_FORMAT_TOTAL_TIME_ENABLED) {
66110 values[n++] = enabled +
66111- atomic64_read(&event->child_total_time_enabled);
66112+ atomic64_read_unchecked(&event->child_total_time_enabled);
66113 }
66114 if (read_format & PERF_FORMAT_TOTAL_TIME_RUNNING) {
66115 values[n++] = running +
66116- atomic64_read(&event->child_total_time_running);
66117+ atomic64_read_unchecked(&event->child_total_time_running);
66118 }
66119 if (read_format & PERF_FORMAT_ID)
66120 values[n++] = primary_event_id(event);
66121@@ -4561,12 +4561,12 @@ static void perf_event_mmap_event(struct perf_mmap_event *mmap_event)
66122 * need to add enough zero bytes after the string to handle
66123 * the 64bit alignment we do later.
66124 */
66125- buf = kzalloc(PATH_MAX + sizeof(u64), GFP_KERNEL);
66126+ buf = kzalloc(PATH_MAX, GFP_KERNEL);
66127 if (!buf) {
66128 name = strncpy(tmp, "//enomem", sizeof(tmp));
66129 goto got_name;
66130 }
66131- name = d_path(&file->f_path, buf, PATH_MAX);
66132+ name = d_path(&file->f_path, buf, PATH_MAX - sizeof(u64));
66133 if (IS_ERR(name)) {
66134 name = strncpy(tmp, "//toolong", sizeof(tmp));
66135 goto got_name;
66136@@ -5921,7 +5921,7 @@ perf_event_alloc(struct perf_event_attr *attr, int cpu,
66137 event->parent = parent_event;
66138
66139 event->ns = get_pid_ns(current->nsproxy->pid_ns);
66140- event->id = atomic64_inc_return(&perf_event_id);
66141+ event->id = atomic64_inc_return_unchecked(&perf_event_id);
66142
66143 event->state = PERF_EVENT_STATE_INACTIVE;
66144
66145@@ -6443,10 +6443,10 @@ static void sync_child_event(struct perf_event *child_event,
66146 /*
66147 * Add back the child's count to the parent's count:
66148 */
66149- atomic64_add(child_val, &parent_event->child_count);
66150- atomic64_add(child_event->total_time_enabled,
66151+ atomic64_add_unchecked(child_val, &parent_event->child_count);
66152+ atomic64_add_unchecked(child_event->total_time_enabled,
66153 &parent_event->child_total_time_enabled);
66154- atomic64_add(child_event->total_time_running,
66155+ atomic64_add_unchecked(child_event->total_time_running,
66156 &parent_event->child_total_time_running);
66157
66158 /*
66159diff --git a/kernel/exit.c b/kernel/exit.c
66160index e6e01b9..0a21b0a 100644
66161--- a/kernel/exit.c
66162+++ b/kernel/exit.c
66163@@ -57,6 +57,10 @@
66164 #include <asm/pgtable.h>
66165 #include <asm/mmu_context.h>
66166
66167+#ifdef CONFIG_GRKERNSEC
66168+extern rwlock_t grsec_exec_file_lock;
66169+#endif
66170+
66171 static void exit_mm(struct task_struct * tsk);
66172
66173 static void __unhash_process(struct task_struct *p, bool group_dead)
66174@@ -168,6 +172,10 @@ void release_task(struct task_struct * p)
66175 struct task_struct *leader;
66176 int zap_leader;
66177 repeat:
66178+#ifdef CONFIG_NET
66179+ gr_del_task_from_ip_table(p);
66180+#endif
66181+
66182 /* don't need to get the RCU readlock here - the process is dead and
66183 * can't be modifying its own credentials. But shut RCU-lockdep up */
66184 rcu_read_lock();
66185@@ -380,7 +388,7 @@ int allow_signal(int sig)
66186 * know it'll be handled, so that they don't get converted to
66187 * SIGKILL or just silently dropped.
66188 */
66189- current->sighand->action[(sig)-1].sa.sa_handler = (void __user *)2;
66190+ current->sighand->action[(sig)-1].sa.sa_handler = (__force void __user *)2;
66191 recalc_sigpending();
66192 spin_unlock_irq(&current->sighand->siglock);
66193 return 0;
66194@@ -416,6 +424,17 @@ void daemonize(const char *name, ...)
66195 vsnprintf(current->comm, sizeof(current->comm), name, args);
66196 va_end(args);
66197
66198+#ifdef CONFIG_GRKERNSEC
66199+ write_lock(&grsec_exec_file_lock);
66200+ if (current->exec_file) {
66201+ fput(current->exec_file);
66202+ current->exec_file = NULL;
66203+ }
66204+ write_unlock(&grsec_exec_file_lock);
66205+#endif
66206+
66207+ gr_set_kernel_label(current);
66208+
66209 /*
66210 * If we were started as result of loading a module, close all of the
66211 * user space pages. We don't need them, and if we didn't close them
66212@@ -893,6 +912,8 @@ NORET_TYPE void do_exit(long code)
66213 struct task_struct *tsk = current;
66214 int group_dead;
66215
66216+ set_fs(USER_DS);
66217+
66218 profile_task_exit(tsk);
66219
66220 WARN_ON(blk_needs_flush_plug(tsk));
66221@@ -909,7 +930,6 @@ NORET_TYPE void do_exit(long code)
66222 * mm_release()->clear_child_tid() from writing to a user-controlled
66223 * kernel address.
66224 */
66225- set_fs(USER_DS);
66226
66227 ptrace_event(PTRACE_EVENT_EXIT, code);
66228
66229@@ -971,6 +991,9 @@ NORET_TYPE void do_exit(long code)
66230 tsk->exit_code = code;
66231 taskstats_exit(tsk, group_dead);
66232
66233+ gr_acl_handle_psacct(tsk, code);
66234+ gr_acl_handle_exit();
66235+
66236 exit_mm(tsk);
66237
66238 if (group_dead)
66239@@ -1068,7 +1091,7 @@ SYSCALL_DEFINE1(exit, int, error_code)
66240 * Take down every thread in the group. This is called by fatal signals
66241 * as well as by sys_exit_group (below).
66242 */
66243-NORET_TYPE void
66244+__noreturn void
66245 do_group_exit(int exit_code)
66246 {
66247 struct signal_struct *sig = current->signal;
66248diff --git a/kernel/fork.c b/kernel/fork.c
66249index 0acf42c0..9e40e2e 100644
66250--- a/kernel/fork.c
66251+++ b/kernel/fork.c
66252@@ -281,7 +281,7 @@ static struct task_struct *dup_task_struct(struct task_struct *orig)
66253 *stackend = STACK_END_MAGIC; /* for overflow detection */
66254
66255 #ifdef CONFIG_CC_STACKPROTECTOR
66256- tsk->stack_canary = get_random_int();
66257+ tsk->stack_canary = pax_get_random_long();
66258 #endif
66259
66260 /*
66261@@ -305,13 +305,77 @@ out:
66262 }
66263
66264 #ifdef CONFIG_MMU
66265+static struct vm_area_struct *dup_vma(struct mm_struct *mm, struct vm_area_struct *mpnt)
66266+{
66267+ struct vm_area_struct *tmp;
66268+ unsigned long charge;
66269+ struct mempolicy *pol;
66270+ struct file *file;
66271+
66272+ charge = 0;
66273+ if (mpnt->vm_flags & VM_ACCOUNT) {
66274+ unsigned int len = (mpnt->vm_end - mpnt->vm_start) >> PAGE_SHIFT;
66275+ if (security_vm_enough_memory(len))
66276+ goto fail_nomem;
66277+ charge = len;
66278+ }
66279+ tmp = kmem_cache_alloc(vm_area_cachep, GFP_KERNEL);
66280+ if (!tmp)
66281+ goto fail_nomem;
66282+ *tmp = *mpnt;
66283+ tmp->vm_mm = mm;
66284+ INIT_LIST_HEAD(&tmp->anon_vma_chain);
66285+ pol = mpol_dup(vma_policy(mpnt));
66286+ if (IS_ERR(pol))
66287+ goto fail_nomem_policy;
66288+ vma_set_policy(tmp, pol);
66289+ if (anon_vma_fork(tmp, mpnt))
66290+ goto fail_nomem_anon_vma_fork;
66291+ tmp->vm_flags &= ~VM_LOCKED;
66292+ tmp->vm_next = tmp->vm_prev = NULL;
66293+ tmp->vm_mirror = NULL;
66294+ file = tmp->vm_file;
66295+ if (file) {
66296+ struct inode *inode = file->f_path.dentry->d_inode;
66297+ struct address_space *mapping = file->f_mapping;
66298+
66299+ get_file(file);
66300+ if (tmp->vm_flags & VM_DENYWRITE)
66301+ atomic_dec(&inode->i_writecount);
66302+ mutex_lock(&mapping->i_mmap_mutex);
66303+ if (tmp->vm_flags & VM_SHARED)
66304+ mapping->i_mmap_writable++;
66305+ flush_dcache_mmap_lock(mapping);
66306+ /* insert tmp into the share list, just after mpnt */
66307+ vma_prio_tree_add(tmp, mpnt);
66308+ flush_dcache_mmap_unlock(mapping);
66309+ mutex_unlock(&mapping->i_mmap_mutex);
66310+ }
66311+
66312+ /*
66313+ * Clear hugetlb-related page reserves for children. This only
66314+ * affects MAP_PRIVATE mappings. Faults generated by the child
66315+ * are not guaranteed to succeed, even if read-only
66316+ */
66317+ if (is_vm_hugetlb_page(tmp))
66318+ reset_vma_resv_huge_pages(tmp);
66319+
66320+ return tmp;
66321+
66322+fail_nomem_anon_vma_fork:
66323+ mpol_put(pol);
66324+fail_nomem_policy:
66325+ kmem_cache_free(vm_area_cachep, tmp);
66326+fail_nomem:
66327+ vm_unacct_memory(charge);
66328+ return NULL;
66329+}
66330+
66331 static int dup_mmap(struct mm_struct *mm, struct mm_struct *oldmm)
66332 {
66333 struct vm_area_struct *mpnt, *tmp, *prev, **pprev;
66334 struct rb_node **rb_link, *rb_parent;
66335 int retval;
66336- unsigned long charge;
66337- struct mempolicy *pol;
66338
66339 down_write(&oldmm->mmap_sem);
66340 flush_cache_dup_mm(oldmm);
66341@@ -323,8 +387,8 @@ static int dup_mmap(struct mm_struct *mm, struct mm_struct *oldmm)
66342 mm->locked_vm = 0;
66343 mm->mmap = NULL;
66344 mm->mmap_cache = NULL;
66345- mm->free_area_cache = oldmm->mmap_base;
66346- mm->cached_hole_size = ~0UL;
66347+ mm->free_area_cache = oldmm->free_area_cache;
66348+ mm->cached_hole_size = oldmm->cached_hole_size;
66349 mm->map_count = 0;
66350 cpumask_clear(mm_cpumask(mm));
66351 mm->mm_rb = RB_ROOT;
66352@@ -340,8 +404,6 @@ static int dup_mmap(struct mm_struct *mm, struct mm_struct *oldmm)
66353
66354 prev = NULL;
66355 for (mpnt = oldmm->mmap; mpnt; mpnt = mpnt->vm_next) {
66356- struct file *file;
66357-
66358 if (mpnt->vm_flags & VM_DONTCOPY) {
66359 long pages = vma_pages(mpnt);
66360 mm->total_vm -= pages;
66361@@ -349,53 +411,11 @@ static int dup_mmap(struct mm_struct *mm, struct mm_struct *oldmm)
66362 -pages);
66363 continue;
66364 }
66365- charge = 0;
66366- if (mpnt->vm_flags & VM_ACCOUNT) {
66367- unsigned int len = (mpnt->vm_end - mpnt->vm_start) >> PAGE_SHIFT;
66368- if (security_vm_enough_memory(len))
66369- goto fail_nomem;
66370- charge = len;
66371+ tmp = dup_vma(mm, mpnt);
66372+ if (!tmp) {
66373+ retval = -ENOMEM;
66374+ goto out;
66375 }
66376- tmp = kmem_cache_alloc(vm_area_cachep, GFP_KERNEL);
66377- if (!tmp)
66378- goto fail_nomem;
66379- *tmp = *mpnt;
66380- INIT_LIST_HEAD(&tmp->anon_vma_chain);
66381- pol = mpol_dup(vma_policy(mpnt));
66382- retval = PTR_ERR(pol);
66383- if (IS_ERR(pol))
66384- goto fail_nomem_policy;
66385- vma_set_policy(tmp, pol);
66386- tmp->vm_mm = mm;
66387- if (anon_vma_fork(tmp, mpnt))
66388- goto fail_nomem_anon_vma_fork;
66389- tmp->vm_flags &= ~VM_LOCKED;
66390- tmp->vm_next = tmp->vm_prev = NULL;
66391- file = tmp->vm_file;
66392- if (file) {
66393- struct inode *inode = file->f_path.dentry->d_inode;
66394- struct address_space *mapping = file->f_mapping;
66395-
66396- get_file(file);
66397- if (tmp->vm_flags & VM_DENYWRITE)
66398- atomic_dec(&inode->i_writecount);
66399- mutex_lock(&mapping->i_mmap_mutex);
66400- if (tmp->vm_flags & VM_SHARED)
66401- mapping->i_mmap_writable++;
66402- flush_dcache_mmap_lock(mapping);
66403- /* insert tmp into the share list, just after mpnt */
66404- vma_prio_tree_add(tmp, mpnt);
66405- flush_dcache_mmap_unlock(mapping);
66406- mutex_unlock(&mapping->i_mmap_mutex);
66407- }
66408-
66409- /*
66410- * Clear hugetlb-related page reserves for children. This only
66411- * affects MAP_PRIVATE mappings. Faults generated by the child
66412- * are not guaranteed to succeed, even if read-only
66413- */
66414- if (is_vm_hugetlb_page(tmp))
66415- reset_vma_resv_huge_pages(tmp);
66416
66417 /*
66418 * Link in the new vma and copy the page table entries.
66419@@ -418,6 +438,31 @@ static int dup_mmap(struct mm_struct *mm, struct mm_struct *oldmm)
66420 if (retval)
66421 goto out;
66422 }
66423+
66424+#ifdef CONFIG_PAX_SEGMEXEC
66425+ if (oldmm->pax_flags & MF_PAX_SEGMEXEC) {
66426+ struct vm_area_struct *mpnt_m;
66427+
66428+ for (mpnt = oldmm->mmap, mpnt_m = mm->mmap; mpnt; mpnt = mpnt->vm_next, mpnt_m = mpnt_m->vm_next) {
66429+ BUG_ON(!mpnt_m || mpnt_m->vm_mirror || mpnt->vm_mm != oldmm || mpnt_m->vm_mm != mm);
66430+
66431+ if (!mpnt->vm_mirror)
66432+ continue;
66433+
66434+ if (mpnt->vm_end <= SEGMEXEC_TASK_SIZE) {
66435+ BUG_ON(mpnt->vm_mirror->vm_mirror != mpnt);
66436+ mpnt->vm_mirror = mpnt_m;
66437+ } else {
66438+ BUG_ON(mpnt->vm_mirror->vm_mirror == mpnt || mpnt->vm_mirror->vm_mirror->vm_mm != mm);
66439+ mpnt_m->vm_mirror = mpnt->vm_mirror->vm_mirror;
66440+ mpnt_m->vm_mirror->vm_mirror = mpnt_m;
66441+ mpnt->vm_mirror->vm_mirror = mpnt;
66442+ }
66443+ }
66444+ BUG_ON(mpnt_m);
66445+ }
66446+#endif
66447+
66448 /* a new mm has just been created */
66449 arch_dup_mmap(oldmm, mm);
66450 retval = 0;
66451@@ -426,14 +471,6 @@ out:
66452 flush_tlb_mm(oldmm);
66453 up_write(&oldmm->mmap_sem);
66454 return retval;
66455-fail_nomem_anon_vma_fork:
66456- mpol_put(pol);
66457-fail_nomem_policy:
66458- kmem_cache_free(vm_area_cachep, tmp);
66459-fail_nomem:
66460- retval = -ENOMEM;
66461- vm_unacct_memory(charge);
66462- goto out;
66463 }
66464
66465 static inline int mm_alloc_pgd(struct mm_struct *mm)
66466@@ -645,6 +682,26 @@ struct mm_struct *get_task_mm(struct task_struct *task)
66467 }
66468 EXPORT_SYMBOL_GPL(get_task_mm);
66469
66470+struct mm_struct *mm_access(struct task_struct *task, unsigned int mode)
66471+{
66472+ struct mm_struct *mm;
66473+ int err;
66474+
66475+ err = mutex_lock_killable(&task->signal->cred_guard_mutex);
66476+ if (err)
66477+ return ERR_PTR(err);
66478+
66479+ mm = get_task_mm(task);
66480+ if (mm && ((mm != current->mm && !ptrace_may_access(task, mode)) ||
66481+ (mode == PTRACE_MODE_ATTACH && (gr_handle_proc_ptrace(task) || gr_acl_handle_procpidmem(task))))) {
66482+ mmput(mm);
66483+ mm = ERR_PTR(-EACCES);
66484+ }
66485+ mutex_unlock(&task->signal->cred_guard_mutex);
66486+
66487+ return mm;
66488+}
66489+
66490 /* Please note the differences between mmput and mm_release.
66491 * mmput is called whenever we stop holding onto a mm_struct,
66492 * error success whatever.
66493@@ -830,13 +887,14 @@ static int copy_fs(unsigned long clone_flags, struct task_struct *tsk)
66494 spin_unlock(&fs->lock);
66495 return -EAGAIN;
66496 }
66497- fs->users++;
66498+ atomic_inc(&fs->users);
66499 spin_unlock(&fs->lock);
66500 return 0;
66501 }
66502 tsk->fs = copy_fs_struct(fs);
66503 if (!tsk->fs)
66504 return -ENOMEM;
66505+ gr_set_chroot_entries(tsk, &tsk->fs->root);
66506 return 0;
66507 }
66508
66509@@ -1100,6 +1158,9 @@ static struct task_struct *copy_process(unsigned long clone_flags,
66510 DEBUG_LOCKS_WARN_ON(!p->softirqs_enabled);
66511 #endif
66512 retval = -EAGAIN;
66513+
66514+ gr_learn_resource(p, RLIMIT_NPROC, atomic_read(&p->real_cred->user->processes), 0);
66515+
66516 if (atomic_read(&p->real_cred->user->processes) >=
66517 task_rlimit(p, RLIMIT_NPROC)) {
66518 if (!capable(CAP_SYS_ADMIN) && !capable(CAP_SYS_RESOURCE) &&
66519@@ -1259,6 +1320,8 @@ static struct task_struct *copy_process(unsigned long clone_flags,
66520 if (clone_flags & CLONE_THREAD)
66521 p->tgid = current->tgid;
66522
66523+ gr_copy_label(p);
66524+
66525 p->set_child_tid = (clone_flags & CLONE_CHILD_SETTID) ? child_tidptr : NULL;
66526 /*
66527 * Clear TID on mm_release()?
66528@@ -1421,6 +1484,8 @@ bad_fork_cleanup_count:
66529 bad_fork_free:
66530 free_task(p);
66531 fork_out:
66532+ gr_log_forkfail(retval);
66533+
66534 return ERR_PTR(retval);
66535 }
66536
66537@@ -1521,6 +1586,8 @@ long do_fork(unsigned long clone_flags,
66538 if (clone_flags & CLONE_PARENT_SETTID)
66539 put_user(nr, parent_tidptr);
66540
66541+ gr_handle_brute_check();
66542+
66543 if (clone_flags & CLONE_VFORK) {
66544 p->vfork_done = &vfork;
66545 init_completion(&vfork);
66546@@ -1630,7 +1697,7 @@ static int unshare_fs(unsigned long unshare_flags, struct fs_struct **new_fsp)
66547 return 0;
66548
66549 /* don't need lock here; in the worst case we'll do useless copy */
66550- if (fs->users == 1)
66551+ if (atomic_read(&fs->users) == 1)
66552 return 0;
66553
66554 *new_fsp = copy_fs_struct(fs);
66555@@ -1719,7 +1786,8 @@ SYSCALL_DEFINE1(unshare, unsigned long, unshare_flags)
66556 fs = current->fs;
66557 spin_lock(&fs->lock);
66558 current->fs = new_fs;
66559- if (--fs->users)
66560+ gr_set_chroot_entries(current, &current->fs->root);
66561+ if (atomic_dec_return(&fs->users))
66562 new_fs = NULL;
66563 else
66564 new_fs = fs;
66565diff --git a/kernel/futex.c b/kernel/futex.c
66566index 1614be2..37abc7e 100644
66567--- a/kernel/futex.c
66568+++ b/kernel/futex.c
66569@@ -54,6 +54,7 @@
66570 #include <linux/mount.h>
66571 #include <linux/pagemap.h>
66572 #include <linux/syscalls.h>
66573+#include <linux/ptrace.h>
66574 #include <linux/signal.h>
66575 #include <linux/export.h>
66576 #include <linux/magic.h>
66577@@ -238,6 +239,11 @@ get_futex_key(u32 __user *uaddr, int fshared, union futex_key *key, int rw)
66578 struct page *page, *page_head;
66579 int err, ro = 0;
66580
66581+#ifdef CONFIG_PAX_SEGMEXEC
66582+ if ((mm->pax_flags & MF_PAX_SEGMEXEC) && address >= SEGMEXEC_TASK_SIZE)
66583+ return -EFAULT;
66584+#endif
66585+
66586 /*
66587 * The futex address must be "naturally" aligned.
66588 */
66589@@ -2459,6 +2465,10 @@ SYSCALL_DEFINE3(get_robust_list, int, pid,
66590 if (!p)
66591 goto err_unlock;
66592 ret = -EPERM;
66593+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
66594+ if (!ptrace_may_access(p, PTRACE_MODE_READ))
66595+ goto err_unlock;
66596+#endif
66597 pcred = __task_cred(p);
66598 /* If victim is in different user_ns, then uids are not
66599 comparable, so we must have CAP_SYS_PTRACE */
66600@@ -2724,6 +2734,7 @@ static int __init futex_init(void)
66601 {
66602 u32 curval;
66603 int i;
66604+ mm_segment_t oldfs;
66605
66606 /*
66607 * This will fail and we want it. Some arch implementations do
66608@@ -2735,8 +2746,11 @@ static int __init futex_init(void)
66609 * implementation, the non-functional ones will return
66610 * -ENOSYS.
66611 */
66612+ oldfs = get_fs();
66613+ set_fs(USER_DS);
66614 if (cmpxchg_futex_value_locked(&curval, NULL, 0, 0) == -EFAULT)
66615 futex_cmpxchg_enabled = 1;
66616+ set_fs(oldfs);
66617
66618 for (i = 0; i < ARRAY_SIZE(futex_queues); i++) {
66619 plist_head_init(&futex_queues[i].chain);
66620diff --git a/kernel/futex_compat.c b/kernel/futex_compat.c
66621index 5f9e689..582d46d 100644
66622--- a/kernel/futex_compat.c
66623+++ b/kernel/futex_compat.c
66624@@ -10,6 +10,7 @@
66625 #include <linux/compat.h>
66626 #include <linux/nsproxy.h>
66627 #include <linux/futex.h>
66628+#include <linux/ptrace.h>
66629
66630 #include <asm/uaccess.h>
66631
66632@@ -136,7 +137,8 @@ compat_sys_get_robust_list(int pid, compat_uptr_t __user *head_ptr,
66633 {
66634 struct compat_robust_list_head __user *head;
66635 unsigned long ret;
66636- const struct cred *cred = current_cred(), *pcred;
66637+ const struct cred *cred = current_cred();
66638+ const struct cred *pcred;
66639
66640 if (!futex_cmpxchg_enabled)
66641 return -ENOSYS;
66642@@ -152,6 +154,10 @@ compat_sys_get_robust_list(int pid, compat_uptr_t __user *head_ptr,
66643 if (!p)
66644 goto err_unlock;
66645 ret = -EPERM;
66646+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
66647+ if (!ptrace_may_access(p, PTRACE_MODE_READ))
66648+ goto err_unlock;
66649+#endif
66650 pcred = __task_cred(p);
66651 /* If victim is in different user_ns, then uids are not
66652 comparable, so we must have CAP_SYS_PTRACE */
66653diff --git a/kernel/gcov/base.c b/kernel/gcov/base.c
66654index 9b22d03..6295b62 100644
66655--- a/kernel/gcov/base.c
66656+++ b/kernel/gcov/base.c
66657@@ -102,11 +102,6 @@ void gcov_enable_events(void)
66658 }
66659
66660 #ifdef CONFIG_MODULES
66661-static inline int within(void *addr, void *start, unsigned long size)
66662-{
66663- return ((addr >= start) && (addr < start + size));
66664-}
66665-
66666 /* Update list and generate events when modules are unloaded. */
66667 static int gcov_module_notifier(struct notifier_block *nb, unsigned long event,
66668 void *data)
66669@@ -121,7 +116,7 @@ static int gcov_module_notifier(struct notifier_block *nb, unsigned long event,
66670 prev = NULL;
66671 /* Remove entries located in module from linked list. */
66672 for (info = gcov_info_head; info; info = info->next) {
66673- if (within(info, mod->module_core, mod->core_size)) {
66674+ if (within_module_core_rw((unsigned long)info, mod)) {
66675 if (prev)
66676 prev->next = info->next;
66677 else
66678diff --git a/kernel/hrtimer.c b/kernel/hrtimer.c
66679index ae34bf5..4e2f3d0 100644
66680--- a/kernel/hrtimer.c
66681+++ b/kernel/hrtimer.c
66682@@ -1393,7 +1393,7 @@ void hrtimer_peek_ahead_timers(void)
66683 local_irq_restore(flags);
66684 }
66685
66686-static void run_hrtimer_softirq(struct softirq_action *h)
66687+static void run_hrtimer_softirq(void)
66688 {
66689 hrtimer_peek_ahead_timers();
66690 }
66691diff --git a/kernel/jump_label.c b/kernel/jump_label.c
66692index 66ff710..05a5128 100644
66693--- a/kernel/jump_label.c
66694+++ b/kernel/jump_label.c
66695@@ -55,7 +55,9 @@ jump_label_sort_entries(struct jump_entry *start, struct jump_entry *stop)
66696
66697 size = (((unsigned long)stop - (unsigned long)start)
66698 / sizeof(struct jump_entry));
66699+ pax_open_kernel();
66700 sort(start, size, sizeof(struct jump_entry), jump_label_cmp, NULL);
66701+ pax_close_kernel();
66702 }
66703
66704 static void jump_label_update(struct jump_label_key *key, int enable);
66705@@ -303,10 +305,12 @@ static void jump_label_invalidate_module_init(struct module *mod)
66706 struct jump_entry *iter_stop = iter_start + mod->num_jump_entries;
66707 struct jump_entry *iter;
66708
66709+ pax_open_kernel();
66710 for (iter = iter_start; iter < iter_stop; iter++) {
66711 if (within_module_init(iter->code, mod))
66712 iter->code = 0;
66713 }
66714+ pax_close_kernel();
66715 }
66716
66717 static int
66718diff --git a/kernel/kallsyms.c b/kernel/kallsyms.c
66719index 079f1d3..a407562 100644
66720--- a/kernel/kallsyms.c
66721+++ b/kernel/kallsyms.c
66722@@ -11,6 +11,9 @@
66723 * Changed the compression method from stem compression to "table lookup"
66724 * compression (see scripts/kallsyms.c for a more complete description)
66725 */
66726+#ifdef CONFIG_GRKERNSEC_HIDESYM
66727+#define __INCLUDED_BY_HIDESYM 1
66728+#endif
66729 #include <linux/kallsyms.h>
66730 #include <linux/module.h>
66731 #include <linux/init.h>
66732@@ -53,12 +56,33 @@ extern const unsigned long kallsyms_markers[] __attribute__((weak));
66733
66734 static inline int is_kernel_inittext(unsigned long addr)
66735 {
66736+ if (system_state != SYSTEM_BOOTING)
66737+ return 0;
66738+
66739 if (addr >= (unsigned long)_sinittext
66740 && addr <= (unsigned long)_einittext)
66741 return 1;
66742 return 0;
66743 }
66744
66745+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
66746+#ifdef CONFIG_MODULES
66747+static inline int is_module_text(unsigned long addr)
66748+{
66749+ if ((unsigned long)MODULES_EXEC_VADDR <= addr && addr <= (unsigned long)MODULES_EXEC_END)
66750+ return 1;
66751+
66752+ addr = ktla_ktva(addr);
66753+ return (unsigned long)MODULES_EXEC_VADDR <= addr && addr <= (unsigned long)MODULES_EXEC_END;
66754+}
66755+#else
66756+static inline int is_module_text(unsigned long addr)
66757+{
66758+ return 0;
66759+}
66760+#endif
66761+#endif
66762+
66763 static inline int is_kernel_text(unsigned long addr)
66764 {
66765 if ((addr >= (unsigned long)_stext && addr <= (unsigned long)_etext) ||
66766@@ -69,13 +93,28 @@ static inline int is_kernel_text(unsigned long addr)
66767
66768 static inline int is_kernel(unsigned long addr)
66769 {
66770+
66771+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
66772+ if (is_kernel_text(addr) || is_kernel_inittext(addr))
66773+ return 1;
66774+
66775+ if (ktla_ktva((unsigned long)_text) <= addr && addr < (unsigned long)_end)
66776+#else
66777 if (addr >= (unsigned long)_stext && addr <= (unsigned long)_end)
66778+#endif
66779+
66780 return 1;
66781 return in_gate_area_no_mm(addr);
66782 }
66783
66784 static int is_ksym_addr(unsigned long addr)
66785 {
66786+
66787+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
66788+ if (is_module_text(addr))
66789+ return 0;
66790+#endif
66791+
66792 if (all_var)
66793 return is_kernel(addr);
66794
66795@@ -454,7 +493,6 @@ static unsigned long get_ksymbol_core(struct kallsym_iter *iter)
66796
66797 static void reset_iter(struct kallsym_iter *iter, loff_t new_pos)
66798 {
66799- iter->name[0] = '\0';
66800 iter->nameoff = get_symbol_offset(new_pos);
66801 iter->pos = new_pos;
66802 }
66803@@ -502,6 +540,11 @@ static int s_show(struct seq_file *m, void *p)
66804 {
66805 struct kallsym_iter *iter = m->private;
66806
66807+#ifdef CONFIG_GRKERNSEC_HIDESYM
66808+ if (current_uid())
66809+ return 0;
66810+#endif
66811+
66812 /* Some debugging symbols have no name. Ignore them. */
66813 if (!iter->name[0])
66814 return 0;
66815@@ -540,7 +583,7 @@ static int kallsyms_open(struct inode *inode, struct file *file)
66816 struct kallsym_iter *iter;
66817 int ret;
66818
66819- iter = kmalloc(sizeof(*iter), GFP_KERNEL);
66820+ iter = kzalloc(sizeof(*iter), GFP_KERNEL);
66821 if (!iter)
66822 return -ENOMEM;
66823 reset_iter(iter, 0);
66824diff --git a/kernel/kexec.c b/kernel/kexec.c
66825index dc7bc08..4601964 100644
66826--- a/kernel/kexec.c
66827+++ b/kernel/kexec.c
66828@@ -1048,7 +1048,8 @@ asmlinkage long compat_sys_kexec_load(unsigned long entry,
66829 unsigned long flags)
66830 {
66831 struct compat_kexec_segment in;
66832- struct kexec_segment out, __user *ksegments;
66833+ struct kexec_segment out;
66834+ struct kexec_segment __user *ksegments;
66835 unsigned long i, result;
66836
66837 /* Don't allow clients that don't understand the native
66838diff --git a/kernel/kmod.c b/kernel/kmod.c
66839index a4bea97..7a1ae9a 100644
66840--- a/kernel/kmod.c
66841+++ b/kernel/kmod.c
66842@@ -73,13 +73,12 @@ char modprobe_path[KMOD_PATH_LEN] = "/sbin/modprobe";
66843 * If module auto-loading support is disabled then this function
66844 * becomes a no-operation.
66845 */
66846-int __request_module(bool wait, const char *fmt, ...)
66847+static int ____request_module(bool wait, char *module_param, const char *fmt, va_list ap)
66848 {
66849- va_list args;
66850 char module_name[MODULE_NAME_LEN];
66851 unsigned int max_modprobes;
66852 int ret;
66853- char *argv[] = { modprobe_path, "-q", "--", module_name, NULL };
66854+ char *argv[] = { modprobe_path, "-q", "--", module_name, module_param, NULL };
66855 static char *envp[] = { "HOME=/",
66856 "TERM=linux",
66857 "PATH=/sbin:/usr/sbin:/bin:/usr/bin",
66858@@ -88,9 +87,7 @@ int __request_module(bool wait, const char *fmt, ...)
66859 #define MAX_KMOD_CONCURRENT 50 /* Completely arbitrary value - KAO */
66860 static int kmod_loop_msg;
66861
66862- va_start(args, fmt);
66863- ret = vsnprintf(module_name, MODULE_NAME_LEN, fmt, args);
66864- va_end(args);
66865+ ret = vsnprintf(module_name, MODULE_NAME_LEN, fmt, ap);
66866 if (ret >= MODULE_NAME_LEN)
66867 return -ENAMETOOLONG;
66868
66869@@ -98,6 +95,20 @@ int __request_module(bool wait, const char *fmt, ...)
66870 if (ret)
66871 return ret;
66872
66873+#ifdef CONFIG_GRKERNSEC_MODHARDEN
66874+ if (!current_uid()) {
66875+ /* hack to workaround consolekit/udisks stupidity */
66876+ read_lock(&tasklist_lock);
66877+ if (!strcmp(current->comm, "mount") &&
66878+ current->real_parent && !strncmp(current->real_parent->comm, "udisk", 5)) {
66879+ read_unlock(&tasklist_lock);
66880+ printk(KERN_ALERT "grsec: denied attempt to auto-load fs module %.64s by udisks\n", module_name);
66881+ return -EPERM;
66882+ }
66883+ read_unlock(&tasklist_lock);
66884+ }
66885+#endif
66886+
66887 /* If modprobe needs a service that is in a module, we get a recursive
66888 * loop. Limit the number of running kmod threads to max_threads/2 or
66889 * MAX_KMOD_CONCURRENT, whichever is the smaller. A cleaner method
66890@@ -133,6 +144,47 @@ int __request_module(bool wait, const char *fmt, ...)
66891 atomic_dec(&kmod_concurrent);
66892 return ret;
66893 }
66894+
66895+int ___request_module(bool wait, char *module_param, const char *fmt, ...)
66896+{
66897+ va_list args;
66898+ int ret;
66899+
66900+ va_start(args, fmt);
66901+ ret = ____request_module(wait, module_param, fmt, args);
66902+ va_end(args);
66903+
66904+ return ret;
66905+}
66906+
66907+int __request_module(bool wait, const char *fmt, ...)
66908+{
66909+ va_list args;
66910+ int ret;
66911+
66912+#ifdef CONFIG_GRKERNSEC_MODHARDEN
66913+ if (current_uid()) {
66914+ char module_param[MODULE_NAME_LEN];
66915+
66916+ memset(module_param, 0, sizeof(module_param));
66917+
66918+ snprintf(module_param, sizeof(module_param) - 1, "grsec_modharden_normal%u_", current_uid());
66919+
66920+ va_start(args, fmt);
66921+ ret = ____request_module(wait, module_param, fmt, args);
66922+ va_end(args);
66923+
66924+ return ret;
66925+ }
66926+#endif
66927+
66928+ va_start(args, fmt);
66929+ ret = ____request_module(wait, NULL, fmt, args);
66930+ va_end(args);
66931+
66932+ return ret;
66933+}
66934+
66935 EXPORT_SYMBOL(__request_module);
66936 #endif /* CONFIG_MODULES */
66937
66938@@ -222,7 +274,7 @@ static int wait_for_helper(void *data)
66939 *
66940 * Thus the __user pointer cast is valid here.
66941 */
66942- sys_wait4(pid, (int __user *)&ret, 0, NULL);
66943+ sys_wait4(pid, (int __force_user *)&ret, 0, NULL);
66944
66945 /*
66946 * If ret is 0, either ____call_usermodehelper failed and the
66947diff --git a/kernel/kprobes.c b/kernel/kprobes.c
66948index bc90b87..43c7d8c 100644
66949--- a/kernel/kprobes.c
66950+++ b/kernel/kprobes.c
66951@@ -185,7 +185,7 @@ static kprobe_opcode_t __kprobes *__get_insn_slot(struct kprobe_insn_cache *c)
66952 * kernel image and loaded module images reside. This is required
66953 * so x86_64 can correctly handle the %rip-relative fixups.
66954 */
66955- kip->insns = module_alloc(PAGE_SIZE);
66956+ kip->insns = module_alloc_exec(PAGE_SIZE);
66957 if (!kip->insns) {
66958 kfree(kip);
66959 return NULL;
66960@@ -225,7 +225,7 @@ static int __kprobes collect_one_slot(struct kprobe_insn_page *kip, int idx)
66961 */
66962 if (!list_is_singular(&kip->list)) {
66963 list_del(&kip->list);
66964- module_free(NULL, kip->insns);
66965+ module_free_exec(NULL, kip->insns);
66966 kfree(kip);
66967 }
66968 return 1;
66969@@ -1955,7 +1955,7 @@ static int __init init_kprobes(void)
66970 {
66971 int i, err = 0;
66972 unsigned long offset = 0, size = 0;
66973- char *modname, namebuf[128];
66974+ char *modname, namebuf[KSYM_NAME_LEN];
66975 const char *symbol_name;
66976 void *addr;
66977 struct kprobe_blackpoint *kb;
66978@@ -2081,7 +2081,7 @@ static int __kprobes show_kprobe_addr(struct seq_file *pi, void *v)
66979 const char *sym = NULL;
66980 unsigned int i = *(loff_t *) v;
66981 unsigned long offset = 0;
66982- char *modname, namebuf[128];
66983+ char *modname, namebuf[KSYM_NAME_LEN];
66984
66985 head = &kprobe_table[i];
66986 preempt_disable();
66987diff --git a/kernel/lockdep.c b/kernel/lockdep.c
66988index b2e08c9..01d8049 100644
66989--- a/kernel/lockdep.c
66990+++ b/kernel/lockdep.c
66991@@ -592,6 +592,10 @@ static int static_obj(void *obj)
66992 end = (unsigned long) &_end,
66993 addr = (unsigned long) obj;
66994
66995+#ifdef CONFIG_PAX_KERNEXEC
66996+ start = ktla_ktva(start);
66997+#endif
66998+
66999 /*
67000 * static variable?
67001 */
67002@@ -731,6 +735,7 @@ register_lock_class(struct lockdep_map *lock, unsigned int subclass, int force)
67003 if (!static_obj(lock->key)) {
67004 debug_locks_off();
67005 printk("INFO: trying to register non-static key.\n");
67006+ printk("lock:%pS key:%pS.\n", lock, lock->key);
67007 printk("the code is fine but needs lockdep annotation.\n");
67008 printk("turning off the locking correctness validator.\n");
67009 dump_stack();
67010@@ -3042,7 +3047,7 @@ static int __lock_acquire(struct lockdep_map *lock, unsigned int subclass,
67011 if (!class)
67012 return 0;
67013 }
67014- atomic_inc((atomic_t *)&class->ops);
67015+ atomic_inc_unchecked((atomic_unchecked_t *)&class->ops);
67016 if (very_verbose(class)) {
67017 printk("\nacquire class [%p] %s", class->key, class->name);
67018 if (class->name_version > 1)
67019diff --git a/kernel/lockdep_proc.c b/kernel/lockdep_proc.c
67020index 91c32a0..b2c71c5 100644
67021--- a/kernel/lockdep_proc.c
67022+++ b/kernel/lockdep_proc.c
67023@@ -39,7 +39,7 @@ static void l_stop(struct seq_file *m, void *v)
67024
67025 static void print_name(struct seq_file *m, struct lock_class *class)
67026 {
67027- char str[128];
67028+ char str[KSYM_NAME_LEN];
67029 const char *name = class->name;
67030
67031 if (!name) {
67032diff --git a/kernel/module.c b/kernel/module.c
67033index 178333c..04e3408 100644
67034--- a/kernel/module.c
67035+++ b/kernel/module.c
67036@@ -58,6 +58,7 @@
67037 #include <linux/jump_label.h>
67038 #include <linux/pfn.h>
67039 #include <linux/bsearch.h>
67040+#include <linux/grsecurity.h>
67041
67042 #define CREATE_TRACE_POINTS
67043 #include <trace/events/module.h>
67044@@ -119,7 +120,8 @@ static BLOCKING_NOTIFIER_HEAD(module_notify_list);
67045
67046 /* Bounds of module allocation, for speeding __module_address.
67047 * Protected by module_mutex. */
67048-static unsigned long module_addr_min = -1UL, module_addr_max = 0;
67049+static unsigned long module_addr_min_rw = -1UL, module_addr_max_rw = 0;
67050+static unsigned long module_addr_min_rx = -1UL, module_addr_max_rx = 0;
67051
67052 int register_module_notifier(struct notifier_block * nb)
67053 {
67054@@ -284,7 +286,7 @@ bool each_symbol_section(bool (*fn)(const struct symsearch *arr,
67055 return true;
67056
67057 list_for_each_entry_rcu(mod, &modules, list) {
67058- struct symsearch arr[] = {
67059+ struct symsearch modarr[] = {
67060 { mod->syms, mod->syms + mod->num_syms, mod->crcs,
67061 NOT_GPL_ONLY, false },
67062 { mod->gpl_syms, mod->gpl_syms + mod->num_gpl_syms,
67063@@ -306,7 +308,7 @@ bool each_symbol_section(bool (*fn)(const struct symsearch *arr,
67064 #endif
67065 };
67066
67067- if (each_symbol_in_section(arr, ARRAY_SIZE(arr), mod, fn, data))
67068+ if (each_symbol_in_section(modarr, ARRAY_SIZE(modarr), mod, fn, data))
67069 return true;
67070 }
67071 return false;
67072@@ -438,7 +440,7 @@ static inline void __percpu *mod_percpu(struct module *mod)
67073 static int percpu_modalloc(struct module *mod,
67074 unsigned long size, unsigned long align)
67075 {
67076- if (align > PAGE_SIZE) {
67077+ if (align-1 >= PAGE_SIZE) {
67078 printk(KERN_WARNING "%s: per-cpu alignment %li > %li\n",
67079 mod->name, align, PAGE_SIZE);
67080 align = PAGE_SIZE;
67081@@ -1183,7 +1185,7 @@ resolve_symbol_wait(struct module *mod,
67082 */
67083 #ifdef CONFIG_SYSFS
67084
67085-#ifdef CONFIG_KALLSYMS
67086+#if defined(CONFIG_KALLSYMS) && !defined(CONFIG_GRKERNSEC_HIDESYM)
67087 static inline bool sect_empty(const Elf_Shdr *sect)
67088 {
67089 return !(sect->sh_flags & SHF_ALLOC) || sect->sh_size == 0;
67090@@ -1649,21 +1651,21 @@ static void set_section_ro_nx(void *base,
67091
67092 static void unset_module_core_ro_nx(struct module *mod)
67093 {
67094- set_page_attributes(mod->module_core + mod->core_text_size,
67095- mod->module_core + mod->core_size,
67096+ set_page_attributes(mod->module_core_rw,
67097+ mod->module_core_rw + mod->core_size_rw,
67098 set_memory_x);
67099- set_page_attributes(mod->module_core,
67100- mod->module_core + mod->core_ro_size,
67101+ set_page_attributes(mod->module_core_rx,
67102+ mod->module_core_rx + mod->core_size_rx,
67103 set_memory_rw);
67104 }
67105
67106 static void unset_module_init_ro_nx(struct module *mod)
67107 {
67108- set_page_attributes(mod->module_init + mod->init_text_size,
67109- mod->module_init + mod->init_size,
67110+ set_page_attributes(mod->module_init_rw,
67111+ mod->module_init_rw + mod->init_size_rw,
67112 set_memory_x);
67113- set_page_attributes(mod->module_init,
67114- mod->module_init + mod->init_ro_size,
67115+ set_page_attributes(mod->module_init_rx,
67116+ mod->module_init_rx + mod->init_size_rx,
67117 set_memory_rw);
67118 }
67119
67120@@ -1674,14 +1676,14 @@ void set_all_modules_text_rw(void)
67121
67122 mutex_lock(&module_mutex);
67123 list_for_each_entry_rcu(mod, &modules, list) {
67124- if ((mod->module_core) && (mod->core_text_size)) {
67125- set_page_attributes(mod->module_core,
67126- mod->module_core + mod->core_text_size,
67127+ if ((mod->module_core_rx) && (mod->core_size_rx)) {
67128+ set_page_attributes(mod->module_core_rx,
67129+ mod->module_core_rx + mod->core_size_rx,
67130 set_memory_rw);
67131 }
67132- if ((mod->module_init) && (mod->init_text_size)) {
67133- set_page_attributes(mod->module_init,
67134- mod->module_init + mod->init_text_size,
67135+ if ((mod->module_init_rx) && (mod->init_size_rx)) {
67136+ set_page_attributes(mod->module_init_rx,
67137+ mod->module_init_rx + mod->init_size_rx,
67138 set_memory_rw);
67139 }
67140 }
67141@@ -1695,14 +1697,14 @@ void set_all_modules_text_ro(void)
67142
67143 mutex_lock(&module_mutex);
67144 list_for_each_entry_rcu(mod, &modules, list) {
67145- if ((mod->module_core) && (mod->core_text_size)) {
67146- set_page_attributes(mod->module_core,
67147- mod->module_core + mod->core_text_size,
67148+ if ((mod->module_core_rx) && (mod->core_size_rx)) {
67149+ set_page_attributes(mod->module_core_rx,
67150+ mod->module_core_rx + mod->core_size_rx,
67151 set_memory_ro);
67152 }
67153- if ((mod->module_init) && (mod->init_text_size)) {
67154- set_page_attributes(mod->module_init,
67155- mod->module_init + mod->init_text_size,
67156+ if ((mod->module_init_rx) && (mod->init_size_rx)) {
67157+ set_page_attributes(mod->module_init_rx,
67158+ mod->module_init_rx + mod->init_size_rx,
67159 set_memory_ro);
67160 }
67161 }
67162@@ -1748,16 +1750,19 @@ static void free_module(struct module *mod)
67163
67164 /* This may be NULL, but that's OK */
67165 unset_module_init_ro_nx(mod);
67166- module_free(mod, mod->module_init);
67167+ module_free(mod, mod->module_init_rw);
67168+ module_free_exec(mod, mod->module_init_rx);
67169 kfree(mod->args);
67170 percpu_modfree(mod);
67171
67172 /* Free lock-classes: */
67173- lockdep_free_key_range(mod->module_core, mod->core_size);
67174+ lockdep_free_key_range(mod->module_core_rx, mod->core_size_rx);
67175+ lockdep_free_key_range(mod->module_core_rw, mod->core_size_rw);
67176
67177 /* Finally, free the core (containing the module structure) */
67178 unset_module_core_ro_nx(mod);
67179- module_free(mod, mod->module_core);
67180+ module_free_exec(mod, mod->module_core_rx);
67181+ module_free(mod, mod->module_core_rw);
67182
67183 #ifdef CONFIG_MPU
67184 update_protections(current->mm);
67185@@ -1826,10 +1831,31 @@ static int simplify_symbols(struct module *mod, const struct load_info *info)
67186 unsigned int i;
67187 int ret = 0;
67188 const struct kernel_symbol *ksym;
67189+#ifdef CONFIG_GRKERNSEC_MODHARDEN
67190+ int is_fs_load = 0;
67191+ int register_filesystem_found = 0;
67192+ char *p;
67193+
67194+ p = strstr(mod->args, "grsec_modharden_fs");
67195+ if (p) {
67196+ char *endptr = p + strlen("grsec_modharden_fs");
67197+ /* copy \0 as well */
67198+ memmove(p, endptr, strlen(mod->args) - (unsigned int)(endptr - mod->args) + 1);
67199+ is_fs_load = 1;
67200+ }
67201+#endif
67202
67203 for (i = 1; i < symsec->sh_size / sizeof(Elf_Sym); i++) {
67204 const char *name = info->strtab + sym[i].st_name;
67205
67206+#ifdef CONFIG_GRKERNSEC_MODHARDEN
67207+ /* it's a real shame this will never get ripped and copied
67208+ upstream! ;(
67209+ */
67210+ if (is_fs_load && !strcmp(name, "register_filesystem"))
67211+ register_filesystem_found = 1;
67212+#endif
67213+
67214 switch (sym[i].st_shndx) {
67215 case SHN_COMMON:
67216 /* We compiled with -fno-common. These are not
67217@@ -1850,7 +1876,9 @@ static int simplify_symbols(struct module *mod, const struct load_info *info)
67218 ksym = resolve_symbol_wait(mod, info, name);
67219 /* Ok if resolved. */
67220 if (ksym && !IS_ERR(ksym)) {
67221+ pax_open_kernel();
67222 sym[i].st_value = ksym->value;
67223+ pax_close_kernel();
67224 break;
67225 }
67226
67227@@ -1869,11 +1897,20 @@ static int simplify_symbols(struct module *mod, const struct load_info *info)
67228 secbase = (unsigned long)mod_percpu(mod);
67229 else
67230 secbase = info->sechdrs[sym[i].st_shndx].sh_addr;
67231+ pax_open_kernel();
67232 sym[i].st_value += secbase;
67233+ pax_close_kernel();
67234 break;
67235 }
67236 }
67237
67238+#ifdef CONFIG_GRKERNSEC_MODHARDEN
67239+ if (is_fs_load && !register_filesystem_found) {
67240+ printk(KERN_ALERT "grsec: Denied attempt to load non-fs module %.64s through mount\n", mod->name);
67241+ ret = -EPERM;
67242+ }
67243+#endif
67244+
67245 return ret;
67246 }
67247
67248@@ -1977,22 +2014,12 @@ static void layout_sections(struct module *mod, struct load_info *info)
67249 || s->sh_entsize != ~0UL
67250 || strstarts(sname, ".init"))
67251 continue;
67252- s->sh_entsize = get_offset(mod, &mod->core_size, s, i);
67253+ if ((s->sh_flags & SHF_WRITE) || !(s->sh_flags & SHF_ALLOC))
67254+ s->sh_entsize = get_offset(mod, &mod->core_size_rw, s, i);
67255+ else
67256+ s->sh_entsize = get_offset(mod, &mod->core_size_rx, s, i);
67257 DEBUGP("\t%s\n", name);
67258 }
67259- switch (m) {
67260- case 0: /* executable */
67261- mod->core_size = debug_align(mod->core_size);
67262- mod->core_text_size = mod->core_size;
67263- break;
67264- case 1: /* RO: text and ro-data */
67265- mod->core_size = debug_align(mod->core_size);
67266- mod->core_ro_size = mod->core_size;
67267- break;
67268- case 3: /* whole core */
67269- mod->core_size = debug_align(mod->core_size);
67270- break;
67271- }
67272 }
67273
67274 DEBUGP("Init section allocation order:\n");
67275@@ -2006,23 +2033,13 @@ static void layout_sections(struct module *mod, struct load_info *info)
67276 || s->sh_entsize != ~0UL
67277 || !strstarts(sname, ".init"))
67278 continue;
67279- s->sh_entsize = (get_offset(mod, &mod->init_size, s, i)
67280- | INIT_OFFSET_MASK);
67281+ if ((s->sh_flags & SHF_WRITE) || !(s->sh_flags & SHF_ALLOC))
67282+ s->sh_entsize = get_offset(mod, &mod->init_size_rw, s, i);
67283+ else
67284+ s->sh_entsize = get_offset(mod, &mod->init_size_rx, s, i);
67285+ s->sh_entsize |= INIT_OFFSET_MASK;
67286 DEBUGP("\t%s\n", sname);
67287 }
67288- switch (m) {
67289- case 0: /* executable */
67290- mod->init_size = debug_align(mod->init_size);
67291- mod->init_text_size = mod->init_size;
67292- break;
67293- case 1: /* RO: text and ro-data */
67294- mod->init_size = debug_align(mod->init_size);
67295- mod->init_ro_size = mod->init_size;
67296- break;
67297- case 3: /* whole init */
67298- mod->init_size = debug_align(mod->init_size);
67299- break;
67300- }
67301 }
67302 }
67303
67304@@ -2187,7 +2204,7 @@ static void layout_symtab(struct module *mod, struct load_info *info)
67305
67306 /* Put symbol section at end of init part of module. */
67307 symsect->sh_flags |= SHF_ALLOC;
67308- symsect->sh_entsize = get_offset(mod, &mod->init_size, symsect,
67309+ symsect->sh_entsize = get_offset(mod, &mod->init_size_rx, symsect,
67310 info->index.sym) | INIT_OFFSET_MASK;
67311 DEBUGP("\t%s\n", info->secstrings + symsect->sh_name);
67312
67313@@ -2204,19 +2221,19 @@ static void layout_symtab(struct module *mod, struct load_info *info)
67314 }
67315
67316 /* Append room for core symbols at end of core part. */
67317- info->symoffs = ALIGN(mod->core_size, symsect->sh_addralign ?: 1);
67318- mod->core_size = info->symoffs + ndst * sizeof(Elf_Sym);
67319+ info->symoffs = ALIGN(mod->core_size_rx, symsect->sh_addralign ?: 1);
67320+ mod->core_size_rx = info->symoffs + ndst * sizeof(Elf_Sym);
67321
67322 /* Put string table section at end of init part of module. */
67323 strsect->sh_flags |= SHF_ALLOC;
67324- strsect->sh_entsize = get_offset(mod, &mod->init_size, strsect,
67325+ strsect->sh_entsize = get_offset(mod, &mod->init_size_rx, strsect,
67326 info->index.str) | INIT_OFFSET_MASK;
67327 DEBUGP("\t%s\n", info->secstrings + strsect->sh_name);
67328
67329 /* Append room for core symbols' strings at end of core part. */
67330- info->stroffs = mod->core_size;
67331+ info->stroffs = mod->core_size_rx;
67332 __set_bit(0, info->strmap);
67333- mod->core_size += bitmap_weight(info->strmap, strsect->sh_size);
67334+ mod->core_size_rx += bitmap_weight(info->strmap, strsect->sh_size);
67335 }
67336
67337 static void add_kallsyms(struct module *mod, const struct load_info *info)
67338@@ -2232,11 +2249,13 @@ static void add_kallsyms(struct module *mod, const struct load_info *info)
67339 /* Make sure we get permanent strtab: don't use info->strtab. */
67340 mod->strtab = (void *)info->sechdrs[info->index.str].sh_addr;
67341
67342+ pax_open_kernel();
67343+
67344 /* Set types up while we still have access to sections. */
67345 for (i = 0; i < mod->num_symtab; i++)
67346 mod->symtab[i].st_info = elf_type(&mod->symtab[i], info);
67347
67348- mod->core_symtab = dst = mod->module_core + info->symoffs;
67349+ mod->core_symtab = dst = mod->module_core_rx + info->symoffs;
67350 src = mod->symtab;
67351 *dst = *src;
67352 for (ndst = i = 1; i < mod->num_symtab; ++i, ++src) {
67353@@ -2249,10 +2268,12 @@ static void add_kallsyms(struct module *mod, const struct load_info *info)
67354 }
67355 mod->core_num_syms = ndst;
67356
67357- mod->core_strtab = s = mod->module_core + info->stroffs;
67358+ mod->core_strtab = s = mod->module_core_rx + info->stroffs;
67359 for (*s = 0, i = 1; i < info->sechdrs[info->index.str].sh_size; ++i)
67360 if (test_bit(i, info->strmap))
67361 *++s = mod->strtab[i];
67362+
67363+ pax_close_kernel();
67364 }
67365 #else
67366 static inline void layout_symtab(struct module *mod, struct load_info *info)
67367@@ -2286,17 +2307,33 @@ void * __weak module_alloc(unsigned long size)
67368 return size == 0 ? NULL : vmalloc_exec(size);
67369 }
67370
67371-static void *module_alloc_update_bounds(unsigned long size)
67372+static void *module_alloc_update_bounds_rw(unsigned long size)
67373 {
67374 void *ret = module_alloc(size);
67375
67376 if (ret) {
67377 mutex_lock(&module_mutex);
67378 /* Update module bounds. */
67379- if ((unsigned long)ret < module_addr_min)
67380- module_addr_min = (unsigned long)ret;
67381- if ((unsigned long)ret + size > module_addr_max)
67382- module_addr_max = (unsigned long)ret + size;
67383+ if ((unsigned long)ret < module_addr_min_rw)
67384+ module_addr_min_rw = (unsigned long)ret;
67385+ if ((unsigned long)ret + size > module_addr_max_rw)
67386+ module_addr_max_rw = (unsigned long)ret + size;
67387+ mutex_unlock(&module_mutex);
67388+ }
67389+ return ret;
67390+}
67391+
67392+static void *module_alloc_update_bounds_rx(unsigned long size)
67393+{
67394+ void *ret = module_alloc_exec(size);
67395+
67396+ if (ret) {
67397+ mutex_lock(&module_mutex);
67398+ /* Update module bounds. */
67399+ if ((unsigned long)ret < module_addr_min_rx)
67400+ module_addr_min_rx = (unsigned long)ret;
67401+ if ((unsigned long)ret + size > module_addr_max_rx)
67402+ module_addr_max_rx = (unsigned long)ret + size;
67403 mutex_unlock(&module_mutex);
67404 }
67405 return ret;
67406@@ -2474,8 +2511,14 @@ static struct module *setup_load_info(struct load_info *info)
67407 static int check_modinfo(struct module *mod, struct load_info *info)
67408 {
67409 const char *modmagic = get_modinfo(info, "vermagic");
67410+ const char *license = get_modinfo(info, "license");
67411 int err;
67412
67413+#ifdef CONFIG_PAX_KERNEXEC_PLUGIN_METHOD_OR
67414+ if (!license || !license_is_gpl_compatible(license))
67415+ return -ENOEXEC;
67416+#endif
67417+
67418 /* This is allowed: modprobe --force will invalidate it. */
67419 if (!modmagic) {
67420 err = try_to_force_load(mod, "bad vermagic");
67421@@ -2498,7 +2541,7 @@ static int check_modinfo(struct module *mod, struct load_info *info)
67422 }
67423
67424 /* Set up license info based on the info section */
67425- set_license(mod, get_modinfo(info, "license"));
67426+ set_license(mod, license);
67427
67428 return 0;
67429 }
67430@@ -2592,7 +2635,7 @@ static int move_module(struct module *mod, struct load_info *info)
67431 void *ptr;
67432
67433 /* Do the allocs. */
67434- ptr = module_alloc_update_bounds(mod->core_size);
67435+ ptr = module_alloc_update_bounds_rw(mod->core_size_rw);
67436 /*
67437 * The pointer to this block is stored in the module structure
67438 * which is inside the block. Just mark it as not being a
67439@@ -2602,23 +2645,50 @@ static int move_module(struct module *mod, struct load_info *info)
67440 if (!ptr)
67441 return -ENOMEM;
67442
67443- memset(ptr, 0, mod->core_size);
67444- mod->module_core = ptr;
67445+ memset(ptr, 0, mod->core_size_rw);
67446+ mod->module_core_rw = ptr;
67447
67448- ptr = module_alloc_update_bounds(mod->init_size);
67449+ ptr = module_alloc_update_bounds_rw(mod->init_size_rw);
67450 /*
67451 * The pointer to this block is stored in the module structure
67452 * which is inside the block. This block doesn't need to be
67453 * scanned as it contains data and code that will be freed
67454 * after the module is initialized.
67455 */
67456- kmemleak_ignore(ptr);
67457- if (!ptr && mod->init_size) {
67458- module_free(mod, mod->module_core);
67459+ kmemleak_not_leak(ptr);
67460+ if (!ptr && mod->init_size_rw) {
67461+ module_free(mod, mod->module_core_rw);
67462 return -ENOMEM;
67463 }
67464- memset(ptr, 0, mod->init_size);
67465- mod->module_init = ptr;
67466+ memset(ptr, 0, mod->init_size_rw);
67467+ mod->module_init_rw = ptr;
67468+
67469+ ptr = module_alloc_update_bounds_rx(mod->core_size_rx);
67470+ kmemleak_not_leak(ptr);
67471+ if (!ptr) {
67472+ module_free(mod, mod->module_init_rw);
67473+ module_free(mod, mod->module_core_rw);
67474+ return -ENOMEM;
67475+ }
67476+
67477+ pax_open_kernel();
67478+ memset(ptr, 0, mod->core_size_rx);
67479+ pax_close_kernel();
67480+ mod->module_core_rx = ptr;
67481+
67482+ ptr = module_alloc_update_bounds_rx(mod->init_size_rx);
67483+ kmemleak_not_leak(ptr);
67484+ if (!ptr && mod->init_size_rx) {
67485+ module_free_exec(mod, mod->module_core_rx);
67486+ module_free(mod, mod->module_init_rw);
67487+ module_free(mod, mod->module_core_rw);
67488+ return -ENOMEM;
67489+ }
67490+
67491+ pax_open_kernel();
67492+ memset(ptr, 0, mod->init_size_rx);
67493+ pax_close_kernel();
67494+ mod->module_init_rx = ptr;
67495
67496 /* Transfer each section which specifies SHF_ALLOC */
67497 DEBUGP("final section addresses:\n");
67498@@ -2629,16 +2699,45 @@ static int move_module(struct module *mod, struct load_info *info)
67499 if (!(shdr->sh_flags & SHF_ALLOC))
67500 continue;
67501
67502- if (shdr->sh_entsize & INIT_OFFSET_MASK)
67503- dest = mod->module_init
67504- + (shdr->sh_entsize & ~INIT_OFFSET_MASK);
67505- else
67506- dest = mod->module_core + shdr->sh_entsize;
67507+ if (shdr->sh_entsize & INIT_OFFSET_MASK) {
67508+ if ((shdr->sh_flags & SHF_WRITE) || !(shdr->sh_flags & SHF_ALLOC))
67509+ dest = mod->module_init_rw
67510+ + (shdr->sh_entsize & ~INIT_OFFSET_MASK);
67511+ else
67512+ dest = mod->module_init_rx
67513+ + (shdr->sh_entsize & ~INIT_OFFSET_MASK);
67514+ } else {
67515+ if ((shdr->sh_flags & SHF_WRITE) || !(shdr->sh_flags & SHF_ALLOC))
67516+ dest = mod->module_core_rw + shdr->sh_entsize;
67517+ else
67518+ dest = mod->module_core_rx + shdr->sh_entsize;
67519+ }
67520+
67521+ if (shdr->sh_type != SHT_NOBITS) {
67522+
67523+#ifdef CONFIG_PAX_KERNEXEC
67524+#ifdef CONFIG_X86_64
67525+ if ((shdr->sh_flags & SHF_WRITE) && (shdr->sh_flags & SHF_EXECINSTR))
67526+ set_memory_x((unsigned long)dest, (shdr->sh_size + PAGE_SIZE) >> PAGE_SHIFT);
67527+#endif
67528+ if (!(shdr->sh_flags & SHF_WRITE) && (shdr->sh_flags & SHF_ALLOC)) {
67529+ pax_open_kernel();
67530+ memcpy(dest, (void *)shdr->sh_addr, shdr->sh_size);
67531+ pax_close_kernel();
67532+ } else
67533+#endif
67534
67535- if (shdr->sh_type != SHT_NOBITS)
67536 memcpy(dest, (void *)shdr->sh_addr, shdr->sh_size);
67537+ }
67538 /* Update sh_addr to point to copy in image. */
67539- shdr->sh_addr = (unsigned long)dest;
67540+
67541+#ifdef CONFIG_PAX_KERNEXEC
67542+ if (shdr->sh_flags & SHF_EXECINSTR)
67543+ shdr->sh_addr = ktva_ktla((unsigned long)dest);
67544+ else
67545+#endif
67546+
67547+ shdr->sh_addr = (unsigned long)dest;
67548 DEBUGP("\t0x%lx %s\n",
67549 shdr->sh_addr, info->secstrings + shdr->sh_name);
67550 }
67551@@ -2689,12 +2788,12 @@ static void flush_module_icache(const struct module *mod)
67552 * Do it before processing of module parameters, so the module
67553 * can provide parameter accessor functions of its own.
67554 */
67555- if (mod->module_init)
67556- flush_icache_range((unsigned long)mod->module_init,
67557- (unsigned long)mod->module_init
67558- + mod->init_size);
67559- flush_icache_range((unsigned long)mod->module_core,
67560- (unsigned long)mod->module_core + mod->core_size);
67561+ if (mod->module_init_rx)
67562+ flush_icache_range((unsigned long)mod->module_init_rx,
67563+ (unsigned long)mod->module_init_rx
67564+ + mod->init_size_rx);
67565+ flush_icache_range((unsigned long)mod->module_core_rx,
67566+ (unsigned long)mod->module_core_rx + mod->core_size_rx);
67567
67568 set_fs(old_fs);
67569 }
67570@@ -2774,8 +2873,10 @@ static void module_deallocate(struct module *mod, struct load_info *info)
67571 {
67572 kfree(info->strmap);
67573 percpu_modfree(mod);
67574- module_free(mod, mod->module_init);
67575- module_free(mod, mod->module_core);
67576+ module_free_exec(mod, mod->module_init_rx);
67577+ module_free_exec(mod, mod->module_core_rx);
67578+ module_free(mod, mod->module_init_rw);
67579+ module_free(mod, mod->module_core_rw);
67580 }
67581
67582 int __weak module_finalize(const Elf_Ehdr *hdr,
67583@@ -2839,9 +2940,38 @@ static struct module *load_module(void __user *umod,
67584 if (err)
67585 goto free_unload;
67586
67587+ /* Now copy in args */
67588+ mod->args = strndup_user(uargs, ~0UL >> 1);
67589+ if (IS_ERR(mod->args)) {
67590+ err = PTR_ERR(mod->args);
67591+ goto free_unload;
67592+ }
67593+
67594 /* Set up MODINFO_ATTR fields */
67595 setup_modinfo(mod, &info);
67596
67597+#ifdef CONFIG_GRKERNSEC_MODHARDEN
67598+ {
67599+ char *p, *p2;
67600+
67601+ if (strstr(mod->args, "grsec_modharden_netdev")) {
67602+ 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);
67603+ err = -EPERM;
67604+ goto free_modinfo;
67605+ } else if ((p = strstr(mod->args, "grsec_modharden_normal"))) {
67606+ p += strlen("grsec_modharden_normal");
67607+ p2 = strstr(p, "_");
67608+ if (p2) {
67609+ *p2 = '\0';
67610+ printk(KERN_ALERT "grsec: denied kernel module auto-load of %.64s by uid %.9s\n", mod->name, p);
67611+ *p2 = '_';
67612+ }
67613+ err = -EPERM;
67614+ goto free_modinfo;
67615+ }
67616+ }
67617+#endif
67618+
67619 /* Fix up syms, so that st_value is a pointer to location. */
67620 err = simplify_symbols(mod, &info);
67621 if (err < 0)
67622@@ -2857,13 +2987,6 @@ static struct module *load_module(void __user *umod,
67623
67624 flush_module_icache(mod);
67625
67626- /* Now copy in args */
67627- mod->args = strndup_user(uargs, ~0UL >> 1);
67628- if (IS_ERR(mod->args)) {
67629- err = PTR_ERR(mod->args);
67630- goto free_arch_cleanup;
67631- }
67632-
67633 /* Mark state as coming so strong_try_module_get() ignores us. */
67634 mod->state = MODULE_STATE_COMING;
67635
67636@@ -2921,11 +3044,10 @@ static struct module *load_module(void __user *umod,
67637 unlock:
67638 mutex_unlock(&module_mutex);
67639 synchronize_sched();
67640- kfree(mod->args);
67641- free_arch_cleanup:
67642 module_arch_cleanup(mod);
67643 free_modinfo:
67644 free_modinfo(mod);
67645+ kfree(mod->args);
67646 free_unload:
67647 module_unload_free(mod);
67648 free_module:
67649@@ -2966,16 +3088,16 @@ SYSCALL_DEFINE3(init_module, void __user *, umod,
67650 MODULE_STATE_COMING, mod);
67651
67652 /* Set RO and NX regions for core */
67653- set_section_ro_nx(mod->module_core,
67654- mod->core_text_size,
67655- mod->core_ro_size,
67656- mod->core_size);
67657+ set_section_ro_nx(mod->module_core_rx,
67658+ mod->core_size_rx,
67659+ mod->core_size_rx,
67660+ mod->core_size_rx);
67661
67662 /* Set RO and NX regions for init */
67663- set_section_ro_nx(mod->module_init,
67664- mod->init_text_size,
67665- mod->init_ro_size,
67666- mod->init_size);
67667+ set_section_ro_nx(mod->module_init_rx,
67668+ mod->init_size_rx,
67669+ mod->init_size_rx,
67670+ mod->init_size_rx);
67671
67672 do_mod_ctors(mod);
67673 /* Start the module */
67674@@ -3021,11 +3143,12 @@ SYSCALL_DEFINE3(init_module, void __user *, umod,
67675 mod->strtab = mod->core_strtab;
67676 #endif
67677 unset_module_init_ro_nx(mod);
67678- module_free(mod, mod->module_init);
67679- mod->module_init = NULL;
67680- mod->init_size = 0;
67681- mod->init_ro_size = 0;
67682- mod->init_text_size = 0;
67683+ module_free(mod, mod->module_init_rw);
67684+ module_free_exec(mod, mod->module_init_rx);
67685+ mod->module_init_rw = NULL;
67686+ mod->module_init_rx = NULL;
67687+ mod->init_size_rw = 0;
67688+ mod->init_size_rx = 0;
67689 mutex_unlock(&module_mutex);
67690
67691 return 0;
67692@@ -3056,10 +3179,16 @@ static const char *get_ksymbol(struct module *mod,
67693 unsigned long nextval;
67694
67695 /* At worse, next value is at end of module */
67696- if (within_module_init(addr, mod))
67697- nextval = (unsigned long)mod->module_init+mod->init_text_size;
67698+ if (within_module_init_rx(addr, mod))
67699+ nextval = (unsigned long)mod->module_init_rx+mod->init_size_rx;
67700+ else if (within_module_init_rw(addr, mod))
67701+ nextval = (unsigned long)mod->module_init_rw+mod->init_size_rw;
67702+ else if (within_module_core_rx(addr, mod))
67703+ nextval = (unsigned long)mod->module_core_rx+mod->core_size_rx;
67704+ else if (within_module_core_rw(addr, mod))
67705+ nextval = (unsigned long)mod->module_core_rw+mod->core_size_rw;
67706 else
67707- nextval = (unsigned long)mod->module_core+mod->core_text_size;
67708+ return NULL;
67709
67710 /* Scan for closest preceding symbol, and next symbol. (ELF
67711 starts real symbols at 1). */
67712@@ -3307,7 +3436,7 @@ static int m_show(struct seq_file *m, void *p)
67713 char buf[8];
67714
67715 seq_printf(m, "%s %u",
67716- mod->name, mod->init_size + mod->core_size);
67717+ mod->name, mod->init_size_rx + mod->init_size_rw + mod->core_size_rx + mod->core_size_rw);
67718 print_unload_info(m, mod);
67719
67720 /* Informative for users. */
67721@@ -3316,7 +3445,7 @@ static int m_show(struct seq_file *m, void *p)
67722 mod->state == MODULE_STATE_COMING ? "Loading":
67723 "Live");
67724 /* Used by oprofile and other similar tools. */
67725- seq_printf(m, " 0x%pK", mod->module_core);
67726+ seq_printf(m, " 0x%pK 0x%pK", mod->module_core_rx, mod->module_core_rw);
67727
67728 /* Taints info */
67729 if (mod->taints)
67730@@ -3352,7 +3481,17 @@ static const struct file_operations proc_modules_operations = {
67731
67732 static int __init proc_modules_init(void)
67733 {
67734+#ifndef CONFIG_GRKERNSEC_HIDESYM
67735+#ifdef CONFIG_GRKERNSEC_PROC_USER
67736+ proc_create("modules", S_IRUSR, NULL, &proc_modules_operations);
67737+#elif defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
67738+ proc_create("modules", S_IRUSR | S_IRGRP, NULL, &proc_modules_operations);
67739+#else
67740 proc_create("modules", 0, NULL, &proc_modules_operations);
67741+#endif
67742+#else
67743+ proc_create("modules", S_IRUSR, NULL, &proc_modules_operations);
67744+#endif
67745 return 0;
67746 }
67747 module_init(proc_modules_init);
67748@@ -3411,12 +3550,12 @@ struct module *__module_address(unsigned long addr)
67749 {
67750 struct module *mod;
67751
67752- if (addr < module_addr_min || addr > module_addr_max)
67753+ if ((addr < module_addr_min_rx || addr > module_addr_max_rx) &&
67754+ (addr < module_addr_min_rw || addr > module_addr_max_rw))
67755 return NULL;
67756
67757 list_for_each_entry_rcu(mod, &modules, list)
67758- if (within_module_core(addr, mod)
67759- || within_module_init(addr, mod))
67760+ if (within_module_init(addr, mod) || within_module_core(addr, mod))
67761 return mod;
67762 return NULL;
67763 }
67764@@ -3450,11 +3589,20 @@ bool is_module_text_address(unsigned long addr)
67765 */
67766 struct module *__module_text_address(unsigned long addr)
67767 {
67768- struct module *mod = __module_address(addr);
67769+ struct module *mod;
67770+
67771+#ifdef CONFIG_X86_32
67772+ addr = ktla_ktva(addr);
67773+#endif
67774+
67775+ if (addr < module_addr_min_rx || addr > module_addr_max_rx)
67776+ return NULL;
67777+
67778+ mod = __module_address(addr);
67779+
67780 if (mod) {
67781 /* Make sure it's within the text section. */
67782- if (!within(addr, mod->module_init, mod->init_text_size)
67783- && !within(addr, mod->module_core, mod->core_text_size))
67784+ if (!within_module_init_rx(addr, mod) && !within_module_core_rx(addr, mod))
67785 mod = NULL;
67786 }
67787 return mod;
67788diff --git a/kernel/mutex-debug.c b/kernel/mutex-debug.c
67789index 7e3443f..b2a1e6b 100644
67790--- a/kernel/mutex-debug.c
67791+++ b/kernel/mutex-debug.c
67792@@ -49,21 +49,21 @@ void debug_mutex_free_waiter(struct mutex_waiter *waiter)
67793 }
67794
67795 void debug_mutex_add_waiter(struct mutex *lock, struct mutex_waiter *waiter,
67796- struct thread_info *ti)
67797+ struct task_struct *task)
67798 {
67799 SMP_DEBUG_LOCKS_WARN_ON(!spin_is_locked(&lock->wait_lock));
67800
67801 /* Mark the current thread as blocked on the lock: */
67802- ti->task->blocked_on = waiter;
67803+ task->blocked_on = waiter;
67804 }
67805
67806 void mutex_remove_waiter(struct mutex *lock, struct mutex_waiter *waiter,
67807- struct thread_info *ti)
67808+ struct task_struct *task)
67809 {
67810 DEBUG_LOCKS_WARN_ON(list_empty(&waiter->list));
67811- DEBUG_LOCKS_WARN_ON(waiter->task != ti->task);
67812- DEBUG_LOCKS_WARN_ON(ti->task->blocked_on != waiter);
67813- ti->task->blocked_on = NULL;
67814+ DEBUG_LOCKS_WARN_ON(waiter->task != task);
67815+ DEBUG_LOCKS_WARN_ON(task->blocked_on != waiter);
67816+ task->blocked_on = NULL;
67817
67818 list_del_init(&waiter->list);
67819 waiter->task = NULL;
67820diff --git a/kernel/mutex-debug.h b/kernel/mutex-debug.h
67821index 0799fd3..d06ae3b 100644
67822--- a/kernel/mutex-debug.h
67823+++ b/kernel/mutex-debug.h
67824@@ -20,9 +20,9 @@ extern void debug_mutex_wake_waiter(struct mutex *lock,
67825 extern void debug_mutex_free_waiter(struct mutex_waiter *waiter);
67826 extern void debug_mutex_add_waiter(struct mutex *lock,
67827 struct mutex_waiter *waiter,
67828- struct thread_info *ti);
67829+ struct task_struct *task);
67830 extern void mutex_remove_waiter(struct mutex *lock, struct mutex_waiter *waiter,
67831- struct thread_info *ti);
67832+ struct task_struct *task);
67833 extern void debug_mutex_unlock(struct mutex *lock);
67834 extern void debug_mutex_init(struct mutex *lock, const char *name,
67835 struct lock_class_key *key);
67836diff --git a/kernel/mutex.c b/kernel/mutex.c
67837index 89096dd..f91ebc5 100644
67838--- a/kernel/mutex.c
67839+++ b/kernel/mutex.c
67840@@ -198,7 +198,7 @@ __mutex_lock_common(struct mutex *lock, long state, unsigned int subclass,
67841 spin_lock_mutex(&lock->wait_lock, flags);
67842
67843 debug_mutex_lock_common(lock, &waiter);
67844- debug_mutex_add_waiter(lock, &waiter, task_thread_info(task));
67845+ debug_mutex_add_waiter(lock, &waiter, task);
67846
67847 /* add waiting tasks to the end of the waitqueue (FIFO): */
67848 list_add_tail(&waiter.list, &lock->wait_list);
67849@@ -227,8 +227,7 @@ __mutex_lock_common(struct mutex *lock, long state, unsigned int subclass,
67850 * TASK_UNINTERRUPTIBLE case.)
67851 */
67852 if (unlikely(signal_pending_state(state, task))) {
67853- mutex_remove_waiter(lock, &waiter,
67854- task_thread_info(task));
67855+ mutex_remove_waiter(lock, &waiter, task);
67856 mutex_release(&lock->dep_map, 1, ip);
67857 spin_unlock_mutex(&lock->wait_lock, flags);
67858
67859@@ -249,7 +248,7 @@ __mutex_lock_common(struct mutex *lock, long state, unsigned int subclass,
67860 done:
67861 lock_acquired(&lock->dep_map, ip);
67862 /* got the lock - rejoice! */
67863- mutex_remove_waiter(lock, &waiter, current_thread_info());
67864+ mutex_remove_waiter(lock, &waiter, task);
67865 mutex_set_owner(lock);
67866
67867 /* set it to 0 if there are no waiters left: */
67868diff --git a/kernel/padata.c b/kernel/padata.c
67869index b452599..5d68f4e 100644
67870--- a/kernel/padata.c
67871+++ b/kernel/padata.c
67872@@ -132,10 +132,10 @@ int padata_do_parallel(struct padata_instance *pinst,
67873 padata->pd = pd;
67874 padata->cb_cpu = cb_cpu;
67875
67876- if (unlikely(atomic_read(&pd->seq_nr) == pd->max_seq_nr))
67877- atomic_set(&pd->seq_nr, -1);
67878+ if (unlikely(atomic_read_unchecked(&pd->seq_nr) == pd->max_seq_nr))
67879+ atomic_set_unchecked(&pd->seq_nr, -1);
67880
67881- padata->seq_nr = atomic_inc_return(&pd->seq_nr);
67882+ padata->seq_nr = atomic_inc_return_unchecked(&pd->seq_nr);
67883
67884 target_cpu = padata_cpu_hash(padata);
67885 queue = per_cpu_ptr(pd->pqueue, target_cpu);
67886@@ -444,7 +444,7 @@ static struct parallel_data *padata_alloc_pd(struct padata_instance *pinst,
67887 padata_init_pqueues(pd);
67888 padata_init_squeues(pd);
67889 setup_timer(&pd->timer, padata_reorder_timer, (unsigned long)pd);
67890- atomic_set(&pd->seq_nr, -1);
67891+ atomic_set_unchecked(&pd->seq_nr, -1);
67892 atomic_set(&pd->reorder_objects, 0);
67893 atomic_set(&pd->refcnt, 0);
67894 pd->pinst = pinst;
67895diff --git a/kernel/panic.c b/kernel/panic.c
67896index 3458469..342c500 100644
67897--- a/kernel/panic.c
67898+++ b/kernel/panic.c
67899@@ -78,7 +78,11 @@ NORET_TYPE void panic(const char * fmt, ...)
67900 va_end(args);
67901 printk(KERN_EMERG "Kernel panic - not syncing: %s\n",buf);
67902 #ifdef CONFIG_DEBUG_BUGVERBOSE
67903- dump_stack();
67904+ /*
67905+ * Avoid nested stack-dumping if a panic occurs during oops processing
67906+ */
67907+ if (!oops_in_progress)
67908+ dump_stack();
67909 #endif
67910
67911 /*
67912@@ -382,7 +386,7 @@ static void warn_slowpath_common(const char *file, int line, void *caller,
67913 const char *board;
67914
67915 printk(KERN_WARNING "------------[ cut here ]------------\n");
67916- printk(KERN_WARNING "WARNING: at %s:%d %pS()\n", file, line, caller);
67917+ printk(KERN_WARNING "WARNING: at %s:%d %pA()\n", file, line, caller);
67918 board = dmi_get_system_info(DMI_PRODUCT_NAME);
67919 if (board)
67920 printk(KERN_WARNING "Hardware name: %s\n", board);
67921@@ -437,7 +441,8 @@ EXPORT_SYMBOL(warn_slowpath_null);
67922 */
67923 void __stack_chk_fail(void)
67924 {
67925- panic("stack-protector: Kernel stack is corrupted in: %p\n",
67926+ dump_stack();
67927+ panic("stack-protector: Kernel stack is corrupted in: %pA\n",
67928 __builtin_return_address(0));
67929 }
67930 EXPORT_SYMBOL(__stack_chk_fail);
67931diff --git a/kernel/pid.c b/kernel/pid.c
67932index fa5f722..0c93e57 100644
67933--- a/kernel/pid.c
67934+++ b/kernel/pid.c
67935@@ -33,6 +33,7 @@
67936 #include <linux/rculist.h>
67937 #include <linux/bootmem.h>
67938 #include <linux/hash.h>
67939+#include <linux/security.h>
67940 #include <linux/pid_namespace.h>
67941 #include <linux/init_task.h>
67942 #include <linux/syscalls.h>
67943@@ -45,7 +46,7 @@ struct pid init_struct_pid = INIT_STRUCT_PID;
67944
67945 int pid_max = PID_MAX_DEFAULT;
67946
67947-#define RESERVED_PIDS 300
67948+#define RESERVED_PIDS 500
67949
67950 int pid_max_min = RESERVED_PIDS + 1;
67951 int pid_max_max = PID_MAX_LIMIT;
67952@@ -418,10 +419,18 @@ EXPORT_SYMBOL(pid_task);
67953 */
67954 struct task_struct *find_task_by_pid_ns(pid_t nr, struct pid_namespace *ns)
67955 {
67956+ struct task_struct *task;
67957+
67958 rcu_lockdep_assert(rcu_read_lock_held(),
67959 "find_task_by_pid_ns() needs rcu_read_lock()"
67960 " protection");
67961- return pid_task(find_pid_ns(nr, ns), PIDTYPE_PID);
67962+
67963+ task = pid_task(find_pid_ns(nr, ns), PIDTYPE_PID);
67964+
67965+ if (gr_pid_is_chrooted(task))
67966+ return NULL;
67967+
67968+ return task;
67969 }
67970
67971 struct task_struct *find_task_by_vpid(pid_t vnr)
67972@@ -429,6 +438,14 @@ struct task_struct *find_task_by_vpid(pid_t vnr)
67973 return find_task_by_pid_ns(vnr, current->nsproxy->pid_ns);
67974 }
67975
67976+struct task_struct *find_task_by_vpid_unrestricted(pid_t vnr)
67977+{
67978+ rcu_lockdep_assert(rcu_read_lock_held(),
67979+ "find_task_by_pid_ns() needs rcu_read_lock()"
67980+ " protection");
67981+ return pid_task(find_pid_ns(vnr, current->nsproxy->pid_ns), PIDTYPE_PID);
67982+}
67983+
67984 struct pid *get_task_pid(struct task_struct *task, enum pid_type type)
67985 {
67986 struct pid *pid;
67987diff --git a/kernel/posix-cpu-timers.c b/kernel/posix-cpu-timers.c
67988index e7cb76d..75eceb3 100644
67989--- a/kernel/posix-cpu-timers.c
67990+++ b/kernel/posix-cpu-timers.c
67991@@ -6,6 +6,7 @@
67992 #include <linux/posix-timers.h>
67993 #include <linux/errno.h>
67994 #include <linux/math64.h>
67995+#include <linux/security.h>
67996 #include <asm/uaccess.h>
67997 #include <linux/kernel_stat.h>
67998 #include <trace/events/timer.h>
67999@@ -1606,14 +1607,14 @@ struct k_clock clock_posix_cpu = {
68000
68001 static __init int init_posix_cpu_timers(void)
68002 {
68003- struct k_clock process = {
68004+ static struct k_clock process = {
68005 .clock_getres = process_cpu_clock_getres,
68006 .clock_get = process_cpu_clock_get,
68007 .timer_create = process_cpu_timer_create,
68008 .nsleep = process_cpu_nsleep,
68009 .nsleep_restart = process_cpu_nsleep_restart,
68010 };
68011- struct k_clock thread = {
68012+ static struct k_clock thread = {
68013 .clock_getres = thread_cpu_clock_getres,
68014 .clock_get = thread_cpu_clock_get,
68015 .timer_create = thread_cpu_timer_create,
68016diff --git a/kernel/posix-timers.c b/kernel/posix-timers.c
68017index 69185ae..cc2847a 100644
68018--- a/kernel/posix-timers.c
68019+++ b/kernel/posix-timers.c
68020@@ -43,6 +43,7 @@
68021 #include <linux/idr.h>
68022 #include <linux/posix-clock.h>
68023 #include <linux/posix-timers.h>
68024+#include <linux/grsecurity.h>
68025 #include <linux/syscalls.h>
68026 #include <linux/wait.h>
68027 #include <linux/workqueue.h>
68028@@ -129,7 +130,7 @@ static DEFINE_SPINLOCK(idr_lock);
68029 * which we beg off on and pass to do_sys_settimeofday().
68030 */
68031
68032-static struct k_clock posix_clocks[MAX_CLOCKS];
68033+static struct k_clock *posix_clocks[MAX_CLOCKS];
68034
68035 /*
68036 * These ones are defined below.
68037@@ -227,7 +228,7 @@ static int posix_get_boottime(const clockid_t which_clock, struct timespec *tp)
68038 */
68039 static __init int init_posix_timers(void)
68040 {
68041- struct k_clock clock_realtime = {
68042+ static struct k_clock clock_realtime = {
68043 .clock_getres = hrtimer_get_res,
68044 .clock_get = posix_clock_realtime_get,
68045 .clock_set = posix_clock_realtime_set,
68046@@ -239,7 +240,7 @@ static __init int init_posix_timers(void)
68047 .timer_get = common_timer_get,
68048 .timer_del = common_timer_del,
68049 };
68050- struct k_clock clock_monotonic = {
68051+ static struct k_clock clock_monotonic = {
68052 .clock_getres = hrtimer_get_res,
68053 .clock_get = posix_ktime_get_ts,
68054 .nsleep = common_nsleep,
68055@@ -249,19 +250,19 @@ static __init int init_posix_timers(void)
68056 .timer_get = common_timer_get,
68057 .timer_del = common_timer_del,
68058 };
68059- struct k_clock clock_monotonic_raw = {
68060+ static struct k_clock clock_monotonic_raw = {
68061 .clock_getres = hrtimer_get_res,
68062 .clock_get = posix_get_monotonic_raw,
68063 };
68064- struct k_clock clock_realtime_coarse = {
68065+ static struct k_clock clock_realtime_coarse = {
68066 .clock_getres = posix_get_coarse_res,
68067 .clock_get = posix_get_realtime_coarse,
68068 };
68069- struct k_clock clock_monotonic_coarse = {
68070+ static struct k_clock clock_monotonic_coarse = {
68071 .clock_getres = posix_get_coarse_res,
68072 .clock_get = posix_get_monotonic_coarse,
68073 };
68074- struct k_clock clock_boottime = {
68075+ static struct k_clock clock_boottime = {
68076 .clock_getres = hrtimer_get_res,
68077 .clock_get = posix_get_boottime,
68078 .nsleep = common_nsleep,
68079@@ -473,7 +474,7 @@ void posix_timers_register_clock(const clockid_t clock_id,
68080 return;
68081 }
68082
68083- posix_clocks[clock_id] = *new_clock;
68084+ posix_clocks[clock_id] = new_clock;
68085 }
68086 EXPORT_SYMBOL_GPL(posix_timers_register_clock);
68087
68088@@ -519,9 +520,9 @@ static struct k_clock *clockid_to_kclock(const clockid_t id)
68089 return (id & CLOCKFD_MASK) == CLOCKFD ?
68090 &clock_posix_dynamic : &clock_posix_cpu;
68091
68092- if (id >= MAX_CLOCKS || !posix_clocks[id].clock_getres)
68093+ if (id >= MAX_CLOCKS || !posix_clocks[id] || !posix_clocks[id]->clock_getres)
68094 return NULL;
68095- return &posix_clocks[id];
68096+ return posix_clocks[id];
68097 }
68098
68099 static int common_timer_create(struct k_itimer *new_timer)
68100@@ -959,6 +960,13 @@ SYSCALL_DEFINE2(clock_settime, const clockid_t, which_clock,
68101 if (copy_from_user(&new_tp, tp, sizeof (*tp)))
68102 return -EFAULT;
68103
68104+ /* only the CLOCK_REALTIME clock can be set, all other clocks
68105+ have their clock_set fptr set to a nosettime dummy function
68106+ CLOCK_REALTIME has a NULL clock_set fptr which causes it to
68107+ call common_clock_set, which calls do_sys_settimeofday, which
68108+ we hook
68109+ */
68110+
68111 return kc->clock_set(which_clock, &new_tp);
68112 }
68113
68114diff --git a/kernel/power/poweroff.c b/kernel/power/poweroff.c
68115index d523593..68197a4 100644
68116--- a/kernel/power/poweroff.c
68117+++ b/kernel/power/poweroff.c
68118@@ -37,7 +37,7 @@ static struct sysrq_key_op sysrq_poweroff_op = {
68119 .enable_mask = SYSRQ_ENABLE_BOOT,
68120 };
68121
68122-static int pm_sysrq_init(void)
68123+static int __init pm_sysrq_init(void)
68124 {
68125 register_sysrq_key('o', &sysrq_poweroff_op);
68126 return 0;
68127diff --git a/kernel/power/process.c b/kernel/power/process.c
68128index 3d4b954..11af930 100644
68129--- a/kernel/power/process.c
68130+++ b/kernel/power/process.c
68131@@ -41,6 +41,7 @@ static int try_to_freeze_tasks(bool sig_only)
68132 u64 elapsed_csecs64;
68133 unsigned int elapsed_csecs;
68134 bool wakeup = false;
68135+ bool timedout = false;
68136
68137 do_gettimeofday(&start);
68138
68139@@ -51,6 +52,8 @@ static int try_to_freeze_tasks(bool sig_only)
68140
68141 while (true) {
68142 todo = 0;
68143+ if (time_after(jiffies, end_time))
68144+ timedout = true;
68145 read_lock(&tasklist_lock);
68146 do_each_thread(g, p) {
68147 if (frozen(p) || !freezable(p))
68148@@ -71,9 +74,13 @@ static int try_to_freeze_tasks(bool sig_only)
68149 * try_to_stop() after schedule() in ptrace/signal
68150 * stop sees TIF_FREEZE.
68151 */
68152- if (!task_is_stopped_or_traced(p) &&
68153- !freezer_should_skip(p))
68154+ if (!task_is_stopped_or_traced(p) && !freezer_should_skip(p)) {
68155 todo++;
68156+ if (timedout) {
68157+ printk(KERN_ERR "Task refusing to freeze:\n");
68158+ sched_show_task(p);
68159+ }
68160+ }
68161 } while_each_thread(g, p);
68162 read_unlock(&tasklist_lock);
68163
68164@@ -82,7 +89,7 @@ static int try_to_freeze_tasks(bool sig_only)
68165 todo += wq_busy;
68166 }
68167
68168- if (!todo || time_after(jiffies, end_time))
68169+ if (!todo || timedout)
68170 break;
68171
68172 if (pm_wakeup_pending()) {
68173diff --git a/kernel/printk.c b/kernel/printk.c
68174index 7982a0a..2095fdc 100644
68175--- a/kernel/printk.c
68176+++ b/kernel/printk.c
68177@@ -313,6 +313,11 @@ static int check_syslog_permissions(int type, bool from_file)
68178 if (from_file && type != SYSLOG_ACTION_OPEN)
68179 return 0;
68180
68181+#ifdef CONFIG_GRKERNSEC_DMESG
68182+ if (grsec_enable_dmesg && !capable(CAP_SYSLOG) && !capable_nolog(CAP_SYS_ADMIN))
68183+ return -EPERM;
68184+#endif
68185+
68186 if (syslog_action_restricted(type)) {
68187 if (capable(CAP_SYSLOG))
68188 return 0;
68189diff --git a/kernel/profile.c b/kernel/profile.c
68190index 76b8e77..a2930e8 100644
68191--- a/kernel/profile.c
68192+++ b/kernel/profile.c
68193@@ -39,7 +39,7 @@ struct profile_hit {
68194 /* Oprofile timer tick hook */
68195 static int (*timer_hook)(struct pt_regs *) __read_mostly;
68196
68197-static atomic_t *prof_buffer;
68198+static atomic_unchecked_t *prof_buffer;
68199 static unsigned long prof_len, prof_shift;
68200
68201 int prof_on __read_mostly;
68202@@ -281,7 +281,7 @@ static void profile_flip_buffers(void)
68203 hits[i].pc = 0;
68204 continue;
68205 }
68206- atomic_add(hits[i].hits, &prof_buffer[hits[i].pc]);
68207+ atomic_add_unchecked(hits[i].hits, &prof_buffer[hits[i].pc]);
68208 hits[i].hits = hits[i].pc = 0;
68209 }
68210 }
68211@@ -342,9 +342,9 @@ static void do_profile_hits(int type, void *__pc, unsigned int nr_hits)
68212 * Add the current hit(s) and flush the write-queue out
68213 * to the global buffer:
68214 */
68215- atomic_add(nr_hits, &prof_buffer[pc]);
68216+ atomic_add_unchecked(nr_hits, &prof_buffer[pc]);
68217 for (i = 0; i < NR_PROFILE_HIT; ++i) {
68218- atomic_add(hits[i].hits, &prof_buffer[hits[i].pc]);
68219+ atomic_add_unchecked(hits[i].hits, &prof_buffer[hits[i].pc]);
68220 hits[i].pc = hits[i].hits = 0;
68221 }
68222 out:
68223@@ -419,7 +419,7 @@ static void do_profile_hits(int type, void *__pc, unsigned int nr_hits)
68224 {
68225 unsigned long pc;
68226 pc = ((unsigned long)__pc - (unsigned long)_stext) >> prof_shift;
68227- atomic_add(nr_hits, &prof_buffer[min(pc, prof_len - 1)]);
68228+ atomic_add_unchecked(nr_hits, &prof_buffer[min(pc, prof_len - 1)]);
68229 }
68230 #endif /* !CONFIG_SMP */
68231
68232@@ -517,7 +517,7 @@ read_profile(struct file *file, char __user *buf, size_t count, loff_t *ppos)
68233 return -EFAULT;
68234 buf++; p++; count--; read++;
68235 }
68236- pnt = (char *)prof_buffer + p - sizeof(atomic_t);
68237+ pnt = (char *)prof_buffer + p - sizeof(atomic_unchecked_t);
68238 if (copy_to_user(buf, (void *)pnt, count))
68239 return -EFAULT;
68240 read += count;
68241@@ -548,7 +548,7 @@ static ssize_t write_profile(struct file *file, const char __user *buf,
68242 }
68243 #endif
68244 profile_discard_flip_buffers();
68245- memset(prof_buffer, 0, prof_len * sizeof(atomic_t));
68246+ memset(prof_buffer, 0, prof_len * sizeof(atomic_unchecked_t));
68247 return count;
68248 }
68249
68250diff --git a/kernel/ptrace.c b/kernel/ptrace.c
68251index 78ab24a..332c915 100644
68252--- a/kernel/ptrace.c
68253+++ b/kernel/ptrace.c
68254@@ -172,7 +172,8 @@ int ptrace_check_attach(struct task_struct *child, bool ignore_state)
68255 return ret;
68256 }
68257
68258-int __ptrace_may_access(struct task_struct *task, unsigned int mode)
68259+static int __ptrace_may_access(struct task_struct *task, unsigned int mode,
68260+ unsigned int log)
68261 {
68262 const struct cred *cred = current_cred(), *tcred;
68263
68264@@ -198,7 +199,8 @@ int __ptrace_may_access(struct task_struct *task, unsigned int mode)
68265 cred->gid == tcred->sgid &&
68266 cred->gid == tcred->gid))
68267 goto ok;
68268- if (ns_capable(tcred->user->user_ns, CAP_SYS_PTRACE))
68269+ if ((!log && ns_capable_nolog(tcred->user->user_ns, CAP_SYS_PTRACE)) ||
68270+ (log && ns_capable(tcred->user->user_ns, CAP_SYS_PTRACE)))
68271 goto ok;
68272 rcu_read_unlock();
68273 return -EPERM;
68274@@ -207,7 +209,9 @@ ok:
68275 smp_rmb();
68276 if (task->mm)
68277 dumpable = get_dumpable(task->mm);
68278- if (!dumpable && !task_ns_capable(task, CAP_SYS_PTRACE))
68279+ if (!dumpable &&
68280+ ((!log && !task_ns_capable_nolog(task, CAP_SYS_PTRACE)) ||
68281+ (log && !task_ns_capable(task, CAP_SYS_PTRACE))))
68282 return -EPERM;
68283
68284 return security_ptrace_access_check(task, mode);
68285@@ -217,7 +221,21 @@ bool ptrace_may_access(struct task_struct *task, unsigned int mode)
68286 {
68287 int err;
68288 task_lock(task);
68289- err = __ptrace_may_access(task, mode);
68290+ err = __ptrace_may_access(task, mode, 0);
68291+ task_unlock(task);
68292+ return !err;
68293+}
68294+
68295+bool ptrace_may_access_nolock(struct task_struct *task, unsigned int mode)
68296+{
68297+ return __ptrace_may_access(task, mode, 0);
68298+}
68299+
68300+bool ptrace_may_access_log(struct task_struct *task, unsigned int mode)
68301+{
68302+ int err;
68303+ task_lock(task);
68304+ err = __ptrace_may_access(task, mode, 1);
68305 task_unlock(task);
68306 return !err;
68307 }
68308@@ -262,7 +280,7 @@ static int ptrace_attach(struct task_struct *task, long request,
68309 goto out;
68310
68311 task_lock(task);
68312- retval = __ptrace_may_access(task, PTRACE_MODE_ATTACH);
68313+ retval = __ptrace_may_access(task, PTRACE_MODE_ATTACH, 1);
68314 task_unlock(task);
68315 if (retval)
68316 goto unlock_creds;
68317@@ -277,7 +295,7 @@ static int ptrace_attach(struct task_struct *task, long request,
68318 task->ptrace = PT_PTRACED;
68319 if (seize)
68320 task->ptrace |= PT_SEIZED;
68321- if (task_ns_capable(task, CAP_SYS_PTRACE))
68322+ if (task_ns_capable_nolog(task, CAP_SYS_PTRACE))
68323 task->ptrace |= PT_PTRACE_CAP;
68324
68325 __ptrace_link(task, current);
68326@@ -483,7 +501,7 @@ int ptrace_readdata(struct task_struct *tsk, unsigned long src, char __user *dst
68327 break;
68328 return -EIO;
68329 }
68330- if (copy_to_user(dst, buf, retval))
68331+ if (retval > sizeof(buf) || copy_to_user(dst, buf, retval))
68332 return -EFAULT;
68333 copied += retval;
68334 src += retval;
68335@@ -680,7 +698,7 @@ int ptrace_request(struct task_struct *child, long request,
68336 bool seized = child->ptrace & PT_SEIZED;
68337 int ret = -EIO;
68338 siginfo_t siginfo, *si;
68339- void __user *datavp = (void __user *) data;
68340+ void __user *datavp = (__force void __user *) data;
68341 unsigned long __user *datalp = datavp;
68342 unsigned long flags;
68343
68344@@ -882,14 +900,21 @@ SYSCALL_DEFINE4(ptrace, long, request, long, pid, unsigned long, addr,
68345 goto out;
68346 }
68347
68348+ if (gr_handle_ptrace(child, request)) {
68349+ ret = -EPERM;
68350+ goto out_put_task_struct;
68351+ }
68352+
68353 if (request == PTRACE_ATTACH || request == PTRACE_SEIZE) {
68354 ret = ptrace_attach(child, request, data);
68355 /*
68356 * Some architectures need to do book-keeping after
68357 * a ptrace attach.
68358 */
68359- if (!ret)
68360+ if (!ret) {
68361 arch_ptrace_attach(child);
68362+ gr_audit_ptrace(child);
68363+ }
68364 goto out_put_task_struct;
68365 }
68366
68367@@ -915,7 +940,7 @@ int generic_ptrace_peekdata(struct task_struct *tsk, unsigned long addr,
68368 copied = access_process_vm(tsk, addr, &tmp, sizeof(tmp), 0);
68369 if (copied != sizeof(tmp))
68370 return -EIO;
68371- return put_user(tmp, (unsigned long __user *)data);
68372+ return put_user(tmp, (__force unsigned long __user *)data);
68373 }
68374
68375 int generic_ptrace_pokedata(struct task_struct *tsk, unsigned long addr,
68376@@ -1025,14 +1050,21 @@ asmlinkage long compat_sys_ptrace(compat_long_t request, compat_long_t pid,
68377 goto out;
68378 }
68379
68380+ if (gr_handle_ptrace(child, request)) {
68381+ ret = -EPERM;
68382+ goto out_put_task_struct;
68383+ }
68384+
68385 if (request == PTRACE_ATTACH || request == PTRACE_SEIZE) {
68386 ret = ptrace_attach(child, request, data);
68387 /*
68388 * Some architectures need to do book-keeping after
68389 * a ptrace attach.
68390 */
68391- if (!ret)
68392+ if (!ret) {
68393 arch_ptrace_attach(child);
68394+ gr_audit_ptrace(child);
68395+ }
68396 goto out_put_task_struct;
68397 }
68398
68399diff --git a/kernel/rcutiny.c b/kernel/rcutiny.c
68400index 636af6d..8af70ab 100644
68401--- a/kernel/rcutiny.c
68402+++ b/kernel/rcutiny.c
68403@@ -46,7 +46,7 @@
68404 struct rcu_ctrlblk;
68405 static void invoke_rcu_callbacks(void);
68406 static void __rcu_process_callbacks(struct rcu_ctrlblk *rcp);
68407-static void rcu_process_callbacks(struct softirq_action *unused);
68408+static void rcu_process_callbacks(void);
68409 static void __call_rcu(struct rcu_head *head,
68410 void (*func)(struct rcu_head *rcu),
68411 struct rcu_ctrlblk *rcp);
68412@@ -186,7 +186,7 @@ static void __rcu_process_callbacks(struct rcu_ctrlblk *rcp)
68413 RCU_TRACE(trace_rcu_batch_end(rcp->name, cb_count));
68414 }
68415
68416-static void rcu_process_callbacks(struct softirq_action *unused)
68417+static void rcu_process_callbacks(void)
68418 {
68419 __rcu_process_callbacks(&rcu_sched_ctrlblk);
68420 __rcu_process_callbacks(&rcu_bh_ctrlblk);
68421diff --git a/kernel/rcutorture.c b/kernel/rcutorture.c
68422index 764825c..3aa6ac4 100644
68423--- a/kernel/rcutorture.c
68424+++ b/kernel/rcutorture.c
68425@@ -138,12 +138,12 @@ static DEFINE_PER_CPU(long [RCU_TORTURE_PIPE_LEN + 1], rcu_torture_count) =
68426 { 0 };
68427 static DEFINE_PER_CPU(long [RCU_TORTURE_PIPE_LEN + 1], rcu_torture_batch) =
68428 { 0 };
68429-static atomic_t rcu_torture_wcount[RCU_TORTURE_PIPE_LEN + 1];
68430-static atomic_t n_rcu_torture_alloc;
68431-static atomic_t n_rcu_torture_alloc_fail;
68432-static atomic_t n_rcu_torture_free;
68433-static atomic_t n_rcu_torture_mberror;
68434-static atomic_t n_rcu_torture_error;
68435+static atomic_unchecked_t rcu_torture_wcount[RCU_TORTURE_PIPE_LEN + 1];
68436+static atomic_unchecked_t n_rcu_torture_alloc;
68437+static atomic_unchecked_t n_rcu_torture_alloc_fail;
68438+static atomic_unchecked_t n_rcu_torture_free;
68439+static atomic_unchecked_t n_rcu_torture_mberror;
68440+static atomic_unchecked_t n_rcu_torture_error;
68441 static long n_rcu_torture_boost_ktrerror;
68442 static long n_rcu_torture_boost_rterror;
68443 static long n_rcu_torture_boost_failure;
68444@@ -223,11 +223,11 @@ rcu_torture_alloc(void)
68445
68446 spin_lock_bh(&rcu_torture_lock);
68447 if (list_empty(&rcu_torture_freelist)) {
68448- atomic_inc(&n_rcu_torture_alloc_fail);
68449+ atomic_inc_unchecked(&n_rcu_torture_alloc_fail);
68450 spin_unlock_bh(&rcu_torture_lock);
68451 return NULL;
68452 }
68453- atomic_inc(&n_rcu_torture_alloc);
68454+ atomic_inc_unchecked(&n_rcu_torture_alloc);
68455 p = rcu_torture_freelist.next;
68456 list_del_init(p);
68457 spin_unlock_bh(&rcu_torture_lock);
68458@@ -240,7 +240,7 @@ rcu_torture_alloc(void)
68459 static void
68460 rcu_torture_free(struct rcu_torture *p)
68461 {
68462- atomic_inc(&n_rcu_torture_free);
68463+ atomic_inc_unchecked(&n_rcu_torture_free);
68464 spin_lock_bh(&rcu_torture_lock);
68465 list_add_tail(&p->rtort_free, &rcu_torture_freelist);
68466 spin_unlock_bh(&rcu_torture_lock);
68467@@ -360,7 +360,7 @@ rcu_torture_cb(struct rcu_head *p)
68468 i = rp->rtort_pipe_count;
68469 if (i > RCU_TORTURE_PIPE_LEN)
68470 i = RCU_TORTURE_PIPE_LEN;
68471- atomic_inc(&rcu_torture_wcount[i]);
68472+ atomic_inc_unchecked(&rcu_torture_wcount[i]);
68473 if (++rp->rtort_pipe_count >= RCU_TORTURE_PIPE_LEN) {
68474 rp->rtort_mbtest = 0;
68475 rcu_torture_free(rp);
68476@@ -407,7 +407,7 @@ static void rcu_sync_torture_deferred_free(struct rcu_torture *p)
68477 i = rp->rtort_pipe_count;
68478 if (i > RCU_TORTURE_PIPE_LEN)
68479 i = RCU_TORTURE_PIPE_LEN;
68480- atomic_inc(&rcu_torture_wcount[i]);
68481+ atomic_inc_unchecked(&rcu_torture_wcount[i]);
68482 if (++rp->rtort_pipe_count >= RCU_TORTURE_PIPE_LEN) {
68483 rp->rtort_mbtest = 0;
68484 list_del(&rp->rtort_free);
68485@@ -872,7 +872,7 @@ rcu_torture_writer(void *arg)
68486 i = old_rp->rtort_pipe_count;
68487 if (i > RCU_TORTURE_PIPE_LEN)
68488 i = RCU_TORTURE_PIPE_LEN;
68489- atomic_inc(&rcu_torture_wcount[i]);
68490+ atomic_inc_unchecked(&rcu_torture_wcount[i]);
68491 old_rp->rtort_pipe_count++;
68492 cur_ops->deferred_free(old_rp);
68493 }
68494@@ -940,7 +940,7 @@ static void rcu_torture_timer(unsigned long unused)
68495 return;
68496 }
68497 if (p->rtort_mbtest == 0)
68498- atomic_inc(&n_rcu_torture_mberror);
68499+ atomic_inc_unchecked(&n_rcu_torture_mberror);
68500 spin_lock(&rand_lock);
68501 cur_ops->read_delay(&rand);
68502 n_rcu_torture_timers++;
68503@@ -1001,7 +1001,7 @@ rcu_torture_reader(void *arg)
68504 continue;
68505 }
68506 if (p->rtort_mbtest == 0)
68507- atomic_inc(&n_rcu_torture_mberror);
68508+ atomic_inc_unchecked(&n_rcu_torture_mberror);
68509 cur_ops->read_delay(&rand);
68510 preempt_disable();
68511 pipe_count = p->rtort_pipe_count;
68512@@ -1060,16 +1060,16 @@ rcu_torture_printk(char *page)
68513 rcu_torture_current,
68514 rcu_torture_current_version,
68515 list_empty(&rcu_torture_freelist),
68516- atomic_read(&n_rcu_torture_alloc),
68517- atomic_read(&n_rcu_torture_alloc_fail),
68518- atomic_read(&n_rcu_torture_free),
68519- atomic_read(&n_rcu_torture_mberror),
68520+ atomic_read_unchecked(&n_rcu_torture_alloc),
68521+ atomic_read_unchecked(&n_rcu_torture_alloc_fail),
68522+ atomic_read_unchecked(&n_rcu_torture_free),
68523+ atomic_read_unchecked(&n_rcu_torture_mberror),
68524 n_rcu_torture_boost_ktrerror,
68525 n_rcu_torture_boost_rterror,
68526 n_rcu_torture_boost_failure,
68527 n_rcu_torture_boosts,
68528 n_rcu_torture_timers);
68529- if (atomic_read(&n_rcu_torture_mberror) != 0 ||
68530+ if (atomic_read_unchecked(&n_rcu_torture_mberror) != 0 ||
68531 n_rcu_torture_boost_ktrerror != 0 ||
68532 n_rcu_torture_boost_rterror != 0 ||
68533 n_rcu_torture_boost_failure != 0)
68534@@ -1077,7 +1077,7 @@ rcu_torture_printk(char *page)
68535 cnt += sprintf(&page[cnt], "\n%s%s ", torture_type, TORTURE_FLAG);
68536 if (i > 1) {
68537 cnt += sprintf(&page[cnt], "!!! ");
68538- atomic_inc(&n_rcu_torture_error);
68539+ atomic_inc_unchecked(&n_rcu_torture_error);
68540 WARN_ON_ONCE(1);
68541 }
68542 cnt += sprintf(&page[cnt], "Reader Pipe: ");
68543@@ -1091,7 +1091,7 @@ rcu_torture_printk(char *page)
68544 cnt += sprintf(&page[cnt], "Free-Block Circulation: ");
68545 for (i = 0; i < RCU_TORTURE_PIPE_LEN + 1; i++) {
68546 cnt += sprintf(&page[cnt], " %d",
68547- atomic_read(&rcu_torture_wcount[i]));
68548+ atomic_read_unchecked(&rcu_torture_wcount[i]));
68549 }
68550 cnt += sprintf(&page[cnt], "\n");
68551 if (cur_ops->stats)
68552@@ -1401,7 +1401,7 @@ rcu_torture_cleanup(void)
68553
68554 if (cur_ops->cleanup)
68555 cur_ops->cleanup();
68556- if (atomic_read(&n_rcu_torture_error))
68557+ if (atomic_read_unchecked(&n_rcu_torture_error))
68558 rcu_torture_print_module_parms(cur_ops, "End of test: FAILURE");
68559 else
68560 rcu_torture_print_module_parms(cur_ops, "End of test: SUCCESS");
68561@@ -1465,17 +1465,17 @@ rcu_torture_init(void)
68562
68563 rcu_torture_current = NULL;
68564 rcu_torture_current_version = 0;
68565- atomic_set(&n_rcu_torture_alloc, 0);
68566- atomic_set(&n_rcu_torture_alloc_fail, 0);
68567- atomic_set(&n_rcu_torture_free, 0);
68568- atomic_set(&n_rcu_torture_mberror, 0);
68569- atomic_set(&n_rcu_torture_error, 0);
68570+ atomic_set_unchecked(&n_rcu_torture_alloc, 0);
68571+ atomic_set_unchecked(&n_rcu_torture_alloc_fail, 0);
68572+ atomic_set_unchecked(&n_rcu_torture_free, 0);
68573+ atomic_set_unchecked(&n_rcu_torture_mberror, 0);
68574+ atomic_set_unchecked(&n_rcu_torture_error, 0);
68575 n_rcu_torture_boost_ktrerror = 0;
68576 n_rcu_torture_boost_rterror = 0;
68577 n_rcu_torture_boost_failure = 0;
68578 n_rcu_torture_boosts = 0;
68579 for (i = 0; i < RCU_TORTURE_PIPE_LEN + 1; i++)
68580- atomic_set(&rcu_torture_wcount[i], 0);
68581+ atomic_set_unchecked(&rcu_torture_wcount[i], 0);
68582 for_each_possible_cpu(cpu) {
68583 for (i = 0; i < RCU_TORTURE_PIPE_LEN + 1; i++) {
68584 per_cpu(rcu_torture_count, cpu)[i] = 0;
68585diff --git a/kernel/rcutree.c b/kernel/rcutree.c
68586index 6b76d81..7afc1b3 100644
68587--- a/kernel/rcutree.c
68588+++ b/kernel/rcutree.c
68589@@ -367,9 +367,9 @@ void rcu_enter_nohz(void)
68590 trace_rcu_dyntick("Start");
68591 /* CPUs seeing atomic_inc() must see prior RCU read-side crit sects */
68592 smp_mb__before_atomic_inc(); /* See above. */
68593- atomic_inc(&rdtp->dynticks);
68594+ atomic_inc_unchecked(&rdtp->dynticks);
68595 smp_mb__after_atomic_inc(); /* Force ordering with next sojourn. */
68596- WARN_ON_ONCE(atomic_read(&rdtp->dynticks) & 0x1);
68597+ WARN_ON_ONCE(atomic_read_unchecked(&rdtp->dynticks) & 0x1);
68598 local_irq_restore(flags);
68599 }
68600
68601@@ -391,10 +391,10 @@ void rcu_exit_nohz(void)
68602 return;
68603 }
68604 smp_mb__before_atomic_inc(); /* Force ordering w/previous sojourn. */
68605- atomic_inc(&rdtp->dynticks);
68606+ atomic_inc_unchecked(&rdtp->dynticks);
68607 /* CPUs seeing atomic_inc() must see later RCU read-side crit sects */
68608 smp_mb__after_atomic_inc(); /* See above. */
68609- WARN_ON_ONCE(!(atomic_read(&rdtp->dynticks) & 0x1));
68610+ WARN_ON_ONCE(!(atomic_read_unchecked(&rdtp->dynticks) & 0x1));
68611 trace_rcu_dyntick("End");
68612 local_irq_restore(flags);
68613 }
68614@@ -411,14 +411,14 @@ void rcu_nmi_enter(void)
68615 struct rcu_dynticks *rdtp = &__get_cpu_var(rcu_dynticks);
68616
68617 if (rdtp->dynticks_nmi_nesting == 0 &&
68618- (atomic_read(&rdtp->dynticks) & 0x1))
68619+ (atomic_read_unchecked(&rdtp->dynticks) & 0x1))
68620 return;
68621 rdtp->dynticks_nmi_nesting++;
68622 smp_mb__before_atomic_inc(); /* Force delay from prior write. */
68623- atomic_inc(&rdtp->dynticks);
68624+ atomic_inc_unchecked(&rdtp->dynticks);
68625 /* CPUs seeing atomic_inc() must see later RCU read-side crit sects */
68626 smp_mb__after_atomic_inc(); /* See above. */
68627- WARN_ON_ONCE(!(atomic_read(&rdtp->dynticks) & 0x1));
68628+ WARN_ON_ONCE(!(atomic_read_unchecked(&rdtp->dynticks) & 0x1));
68629 }
68630
68631 /**
68632@@ -437,9 +437,9 @@ void rcu_nmi_exit(void)
68633 return;
68634 /* CPUs seeing atomic_inc() must see prior RCU read-side crit sects */
68635 smp_mb__before_atomic_inc(); /* See above. */
68636- atomic_inc(&rdtp->dynticks);
68637+ atomic_inc_unchecked(&rdtp->dynticks);
68638 smp_mb__after_atomic_inc(); /* Force delay to next write. */
68639- WARN_ON_ONCE(atomic_read(&rdtp->dynticks) & 0x1);
68640+ WARN_ON_ONCE(atomic_read_unchecked(&rdtp->dynticks) & 0x1);
68641 }
68642
68643 /**
68644@@ -474,7 +474,7 @@ void rcu_irq_exit(void)
68645 */
68646 static int dyntick_save_progress_counter(struct rcu_data *rdp)
68647 {
68648- rdp->dynticks_snap = atomic_add_return(0, &rdp->dynticks->dynticks);
68649+ rdp->dynticks_snap = atomic_add_return_unchecked(0, &rdp->dynticks->dynticks);
68650 return 0;
68651 }
68652
68653@@ -489,7 +489,7 @@ static int rcu_implicit_dynticks_qs(struct rcu_data *rdp)
68654 unsigned int curr;
68655 unsigned int snap;
68656
68657- curr = (unsigned int)atomic_add_return(0, &rdp->dynticks->dynticks);
68658+ curr = (unsigned int)atomic_add_return_unchecked(0, &rdp->dynticks->dynticks);
68659 snap = (unsigned int)rdp->dynticks_snap;
68660
68661 /*
68662@@ -1552,7 +1552,7 @@ __rcu_process_callbacks(struct rcu_state *rsp, struct rcu_data *rdp)
68663 /*
68664 * Do RCU core processing for the current CPU.
68665 */
68666-static void rcu_process_callbacks(struct softirq_action *unused)
68667+static void rcu_process_callbacks(void)
68668 {
68669 trace_rcu_utilization("Start RCU core");
68670 __rcu_process_callbacks(&rcu_sched_state,
68671diff --git a/kernel/rcutree.h b/kernel/rcutree.h
68672index 849ce9e..74bc9de 100644
68673--- a/kernel/rcutree.h
68674+++ b/kernel/rcutree.h
68675@@ -86,7 +86,7 @@
68676 struct rcu_dynticks {
68677 int dynticks_nesting; /* Track irq/process nesting level. */
68678 int dynticks_nmi_nesting; /* Track NMI nesting level. */
68679- atomic_t dynticks; /* Even value for dynticks-idle, else odd. */
68680+ atomic_unchecked_t dynticks; /* Even value for dynticks-idle, else odd. */
68681 };
68682
68683 /* RCU's kthread states for tracing. */
68684diff --git a/kernel/rcutree_plugin.h b/kernel/rcutree_plugin.h
68685index 4b9b9f8..2326053 100644
68686--- a/kernel/rcutree_plugin.h
68687+++ b/kernel/rcutree_plugin.h
68688@@ -842,7 +842,7 @@ void synchronize_rcu_expedited(void)
68689
68690 /* Clean up and exit. */
68691 smp_mb(); /* ensure expedited GP seen before counter increment. */
68692- ACCESS_ONCE(sync_rcu_preempt_exp_count)++;
68693+ ACCESS_ONCE_RW(sync_rcu_preempt_exp_count)++;
68694 unlock_mb_ret:
68695 mutex_unlock(&sync_rcu_preempt_exp_mutex);
68696 mb_ret:
68697@@ -1815,8 +1815,8 @@ EXPORT_SYMBOL_GPL(synchronize_sched_expedited);
68698
68699 #else /* #ifndef CONFIG_SMP */
68700
68701-static atomic_t sync_sched_expedited_started = ATOMIC_INIT(0);
68702-static atomic_t sync_sched_expedited_done = ATOMIC_INIT(0);
68703+static atomic_unchecked_t sync_sched_expedited_started = ATOMIC_INIT(0);
68704+static atomic_unchecked_t sync_sched_expedited_done = ATOMIC_INIT(0);
68705
68706 static int synchronize_sched_expedited_cpu_stop(void *data)
68707 {
68708@@ -1871,7 +1871,7 @@ void synchronize_sched_expedited(void)
68709 int firstsnap, s, snap, trycount = 0;
68710
68711 /* Note that atomic_inc_return() implies full memory barrier. */
68712- firstsnap = snap = atomic_inc_return(&sync_sched_expedited_started);
68713+ firstsnap = snap = atomic_inc_return_unchecked(&sync_sched_expedited_started);
68714 get_online_cpus();
68715
68716 /*
68717@@ -1892,7 +1892,7 @@ void synchronize_sched_expedited(void)
68718 }
68719
68720 /* Check to see if someone else did our work for us. */
68721- s = atomic_read(&sync_sched_expedited_done);
68722+ s = atomic_read_unchecked(&sync_sched_expedited_done);
68723 if (UINT_CMP_GE((unsigned)s, (unsigned)firstsnap)) {
68724 smp_mb(); /* ensure test happens before caller kfree */
68725 return;
68726@@ -1907,7 +1907,7 @@ void synchronize_sched_expedited(void)
68727 * grace period works for us.
68728 */
68729 get_online_cpus();
68730- snap = atomic_read(&sync_sched_expedited_started) - 1;
68731+ snap = atomic_read_unchecked(&sync_sched_expedited_started) - 1;
68732 smp_mb(); /* ensure read is before try_stop_cpus(). */
68733 }
68734
68735@@ -1918,12 +1918,12 @@ void synchronize_sched_expedited(void)
68736 * than we did beat us to the punch.
68737 */
68738 do {
68739- s = atomic_read(&sync_sched_expedited_done);
68740+ s = atomic_read_unchecked(&sync_sched_expedited_done);
68741 if (UINT_CMP_GE((unsigned)s, (unsigned)snap)) {
68742 smp_mb(); /* ensure test happens before caller kfree */
68743 break;
68744 }
68745- } while (atomic_cmpxchg(&sync_sched_expedited_done, s, snap) != s);
68746+ } while (atomic_cmpxchg_unchecked(&sync_sched_expedited_done, s, snap) != s);
68747
68748 put_online_cpus();
68749 }
68750@@ -1985,7 +1985,7 @@ int rcu_needs_cpu(int cpu)
68751 for_each_online_cpu(thatcpu) {
68752 if (thatcpu == cpu)
68753 continue;
68754- snap = atomic_add_return(0, &per_cpu(rcu_dynticks,
68755+ snap = atomic_add_return_unchecked(0, &per_cpu(rcu_dynticks,
68756 thatcpu).dynticks);
68757 smp_mb(); /* Order sampling of snap with end of grace period. */
68758 if ((snap & 0x1) != 0) {
68759diff --git a/kernel/rcutree_trace.c b/kernel/rcutree_trace.c
68760index 9feffa4..54058df 100644
68761--- a/kernel/rcutree_trace.c
68762+++ b/kernel/rcutree_trace.c
68763@@ -69,7 +69,7 @@ static void print_one_rcu_data(struct seq_file *m, struct rcu_data *rdp)
68764 rdp->qs_pending);
68765 #ifdef CONFIG_NO_HZ
68766 seq_printf(m, " dt=%d/%d/%d df=%lu",
68767- atomic_read(&rdp->dynticks->dynticks),
68768+ atomic_read_unchecked(&rdp->dynticks->dynticks),
68769 rdp->dynticks->dynticks_nesting,
68770 rdp->dynticks->dynticks_nmi_nesting,
68771 rdp->dynticks_fqs);
68772@@ -143,7 +143,7 @@ static void print_one_rcu_data_csv(struct seq_file *m, struct rcu_data *rdp)
68773 rdp->qs_pending);
68774 #ifdef CONFIG_NO_HZ
68775 seq_printf(m, ",%d,%d,%d,%lu",
68776- atomic_read(&rdp->dynticks->dynticks),
68777+ atomic_read_unchecked(&rdp->dynticks->dynticks),
68778 rdp->dynticks->dynticks_nesting,
68779 rdp->dynticks->dynticks_nmi_nesting,
68780 rdp->dynticks_fqs);
68781diff --git a/kernel/resource.c b/kernel/resource.c
68782index 7640b3a..5879283 100644
68783--- a/kernel/resource.c
68784+++ b/kernel/resource.c
68785@@ -141,8 +141,18 @@ static const struct file_operations proc_iomem_operations = {
68786
68787 static int __init ioresources_init(void)
68788 {
68789+#ifdef CONFIG_GRKERNSEC_PROC_ADD
68790+#ifdef CONFIG_GRKERNSEC_PROC_USER
68791+ proc_create("ioports", S_IRUSR, NULL, &proc_ioports_operations);
68792+ proc_create("iomem", S_IRUSR, NULL, &proc_iomem_operations);
68793+#elif defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
68794+ proc_create("ioports", S_IRUSR | S_IRGRP, NULL, &proc_ioports_operations);
68795+ proc_create("iomem", S_IRUSR | S_IRGRP, NULL, &proc_iomem_operations);
68796+#endif
68797+#else
68798 proc_create("ioports", 0, NULL, &proc_ioports_operations);
68799 proc_create("iomem", 0, NULL, &proc_iomem_operations);
68800+#endif
68801 return 0;
68802 }
68803 __initcall(ioresources_init);
68804diff --git a/kernel/rtmutex-tester.c b/kernel/rtmutex-tester.c
68805index 3d9f31c..7fefc9e 100644
68806--- a/kernel/rtmutex-tester.c
68807+++ b/kernel/rtmutex-tester.c
68808@@ -20,7 +20,7 @@
68809 #define MAX_RT_TEST_MUTEXES 8
68810
68811 static spinlock_t rttest_lock;
68812-static atomic_t rttest_event;
68813+static atomic_unchecked_t rttest_event;
68814
68815 struct test_thread_data {
68816 int opcode;
68817@@ -61,7 +61,7 @@ static int handle_op(struct test_thread_data *td, int lockwakeup)
68818
68819 case RTTEST_LOCKCONT:
68820 td->mutexes[td->opdata] = 1;
68821- td->event = atomic_add_return(1, &rttest_event);
68822+ td->event = atomic_add_return_unchecked(1, &rttest_event);
68823 return 0;
68824
68825 case RTTEST_RESET:
68826@@ -74,7 +74,7 @@ static int handle_op(struct test_thread_data *td, int lockwakeup)
68827 return 0;
68828
68829 case RTTEST_RESETEVENT:
68830- atomic_set(&rttest_event, 0);
68831+ atomic_set_unchecked(&rttest_event, 0);
68832 return 0;
68833
68834 default:
68835@@ -91,9 +91,9 @@ static int handle_op(struct test_thread_data *td, int lockwakeup)
68836 return ret;
68837
68838 td->mutexes[id] = 1;
68839- td->event = atomic_add_return(1, &rttest_event);
68840+ td->event = atomic_add_return_unchecked(1, &rttest_event);
68841 rt_mutex_lock(&mutexes[id]);
68842- td->event = atomic_add_return(1, &rttest_event);
68843+ td->event = atomic_add_return_unchecked(1, &rttest_event);
68844 td->mutexes[id] = 4;
68845 return 0;
68846
68847@@ -104,9 +104,9 @@ static int handle_op(struct test_thread_data *td, int lockwakeup)
68848 return ret;
68849
68850 td->mutexes[id] = 1;
68851- td->event = atomic_add_return(1, &rttest_event);
68852+ td->event = atomic_add_return_unchecked(1, &rttest_event);
68853 ret = rt_mutex_lock_interruptible(&mutexes[id], 0);
68854- td->event = atomic_add_return(1, &rttest_event);
68855+ td->event = atomic_add_return_unchecked(1, &rttest_event);
68856 td->mutexes[id] = ret ? 0 : 4;
68857 return ret ? -EINTR : 0;
68858
68859@@ -115,9 +115,9 @@ static int handle_op(struct test_thread_data *td, int lockwakeup)
68860 if (id < 0 || id >= MAX_RT_TEST_MUTEXES || td->mutexes[id] != 4)
68861 return ret;
68862
68863- td->event = atomic_add_return(1, &rttest_event);
68864+ td->event = atomic_add_return_unchecked(1, &rttest_event);
68865 rt_mutex_unlock(&mutexes[id]);
68866- td->event = atomic_add_return(1, &rttest_event);
68867+ td->event = atomic_add_return_unchecked(1, &rttest_event);
68868 td->mutexes[id] = 0;
68869 return 0;
68870
68871@@ -164,7 +164,7 @@ void schedule_rt_mutex_test(struct rt_mutex *mutex)
68872 break;
68873
68874 td->mutexes[dat] = 2;
68875- td->event = atomic_add_return(1, &rttest_event);
68876+ td->event = atomic_add_return_unchecked(1, &rttest_event);
68877 break;
68878
68879 default:
68880@@ -184,7 +184,7 @@ void schedule_rt_mutex_test(struct rt_mutex *mutex)
68881 return;
68882
68883 td->mutexes[dat] = 3;
68884- td->event = atomic_add_return(1, &rttest_event);
68885+ td->event = atomic_add_return_unchecked(1, &rttest_event);
68886 break;
68887
68888 case RTTEST_LOCKNOWAIT:
68889@@ -196,7 +196,7 @@ void schedule_rt_mutex_test(struct rt_mutex *mutex)
68890 return;
68891
68892 td->mutexes[dat] = 1;
68893- td->event = atomic_add_return(1, &rttest_event);
68894+ td->event = atomic_add_return_unchecked(1, &rttest_event);
68895 return;
68896
68897 default:
68898diff --git a/kernel/sched.c b/kernel/sched.c
68899index d6b149c..896cbb8 100644
68900--- a/kernel/sched.c
68901+++ b/kernel/sched.c
68902@@ -4389,6 +4389,19 @@ pick_next_task(struct rq *rq)
68903 BUG(); /* the idle class will always have a runnable task */
68904 }
68905
68906+#ifdef CONFIG_GRKERNSEC_SETXID
68907+extern void gr_delayed_cred_worker(void);
68908+static inline void gr_cred_schedule(void)
68909+{
68910+ if (unlikely(current->delayed_cred))
68911+ gr_delayed_cred_worker();
68912+}
68913+#else
68914+static inline void gr_cred_schedule(void)
68915+{
68916+}
68917+#endif
68918+
68919 /*
68920 * __schedule() is the main scheduler function.
68921 */
68922@@ -4408,6 +4421,8 @@ need_resched:
68923
68924 schedule_debug(prev);
68925
68926+ gr_cred_schedule();
68927+
68928 if (sched_feat(HRTICK))
68929 hrtick_clear(rq);
68930
68931@@ -5098,6 +5113,8 @@ int can_nice(const struct task_struct *p, const int nice)
68932 /* convert nice value [19,-20] to rlimit style value [1,40] */
68933 int nice_rlim = 20 - nice;
68934
68935+ gr_learn_resource(p, RLIMIT_NICE, nice_rlim, 1);
68936+
68937 return (nice_rlim <= task_rlimit(p, RLIMIT_NICE) ||
68938 capable(CAP_SYS_NICE));
68939 }
68940@@ -5131,7 +5148,8 @@ SYSCALL_DEFINE1(nice, int, increment)
68941 if (nice > 19)
68942 nice = 19;
68943
68944- if (increment < 0 && !can_nice(current, nice))
68945+ if (increment < 0 && (!can_nice(current, nice) ||
68946+ gr_handle_chroot_nice()))
68947 return -EPERM;
68948
68949 retval = security_task_setnice(current, nice);
68950@@ -5288,6 +5306,7 @@ recheck:
68951 unsigned long rlim_rtprio =
68952 task_rlimit(p, RLIMIT_RTPRIO);
68953
68954+ gr_learn_resource(p, RLIMIT_RTPRIO, param->sched_priority, 1);
68955 /* can't set/change the rt policy */
68956 if (policy != p->policy && !rlim_rtprio)
68957 return -EPERM;
68958diff --git a/kernel/sched_autogroup.c b/kernel/sched_autogroup.c
68959index 429242f..d7cca82 100644
68960--- a/kernel/sched_autogroup.c
68961+++ b/kernel/sched_autogroup.c
68962@@ -7,7 +7,7 @@
68963
68964 unsigned int __read_mostly sysctl_sched_autogroup_enabled = 1;
68965 static struct autogroup autogroup_default;
68966-static atomic_t autogroup_seq_nr;
68967+static atomic_unchecked_t autogroup_seq_nr;
68968
68969 static void __init autogroup_init(struct task_struct *init_task)
68970 {
68971@@ -78,7 +78,7 @@ static inline struct autogroup *autogroup_create(void)
68972
68973 kref_init(&ag->kref);
68974 init_rwsem(&ag->lock);
68975- ag->id = atomic_inc_return(&autogroup_seq_nr);
68976+ ag->id = atomic_inc_return_unchecked(&autogroup_seq_nr);
68977 ag->tg = tg;
68978 #ifdef CONFIG_RT_GROUP_SCHED
68979 /*
68980diff --git a/kernel/sched_fair.c b/kernel/sched_fair.c
68981index 8a39fa3..34f3dbc 100644
68982--- a/kernel/sched_fair.c
68983+++ b/kernel/sched_fair.c
68984@@ -4801,7 +4801,7 @@ static void nohz_idle_balance(int this_cpu, enum cpu_idle_type idle) { }
68985 * run_rebalance_domains is triggered when needed from the scheduler tick.
68986 * Also triggered for nohz idle balancing (with nohz_balancing_kick set).
68987 */
68988-static void run_rebalance_domains(struct softirq_action *h)
68989+static void run_rebalance_domains(void)
68990 {
68991 int this_cpu = smp_processor_id();
68992 struct rq *this_rq = cpu_rq(this_cpu);
68993diff --git a/kernel/signal.c b/kernel/signal.c
68994index 2065515..aed2987 100644
68995--- a/kernel/signal.c
68996+++ b/kernel/signal.c
68997@@ -45,12 +45,12 @@ static struct kmem_cache *sigqueue_cachep;
68998
68999 int print_fatal_signals __read_mostly;
69000
69001-static void __user *sig_handler(struct task_struct *t, int sig)
69002+static __sighandler_t sig_handler(struct task_struct *t, int sig)
69003 {
69004 return t->sighand->action[sig - 1].sa.sa_handler;
69005 }
69006
69007-static int sig_handler_ignored(void __user *handler, int sig)
69008+static int sig_handler_ignored(__sighandler_t handler, int sig)
69009 {
69010 /* Is it explicitly or implicitly ignored? */
69011 return handler == SIG_IGN ||
69012@@ -60,7 +60,7 @@ static int sig_handler_ignored(void __user *handler, int sig)
69013 static int sig_task_ignored(struct task_struct *t, int sig,
69014 int from_ancestor_ns)
69015 {
69016- void __user *handler;
69017+ __sighandler_t handler;
69018
69019 handler = sig_handler(t, sig);
69020
69021@@ -364,6 +364,9 @@ __sigqueue_alloc(int sig, struct task_struct *t, gfp_t flags, int override_rlimi
69022 atomic_inc(&user->sigpending);
69023 rcu_read_unlock();
69024
69025+ if (!override_rlimit)
69026+ gr_learn_resource(t, RLIMIT_SIGPENDING, atomic_read(&user->sigpending), 1);
69027+
69028 if (override_rlimit ||
69029 atomic_read(&user->sigpending) <=
69030 task_rlimit(t, RLIMIT_SIGPENDING)) {
69031@@ -488,7 +491,7 @@ flush_signal_handlers(struct task_struct *t, int force_default)
69032
69033 int unhandled_signal(struct task_struct *tsk, int sig)
69034 {
69035- void __user *handler = tsk->sighand->action[sig-1].sa.sa_handler;
69036+ __sighandler_t handler = tsk->sighand->action[sig-1].sa.sa_handler;
69037 if (is_global_init(tsk))
69038 return 1;
69039 if (handler != SIG_IGN && handler != SIG_DFL)
69040@@ -815,6 +818,13 @@ static int check_kill_permission(int sig, struct siginfo *info,
69041 }
69042 }
69043
69044+ /* allow glibc communication via tgkill to other threads in our
69045+ thread group */
69046+ if ((info == SEND_SIG_NOINFO || info->si_code != SI_TKILL ||
69047+ sig != (SIGRTMIN+1) || task_tgid_vnr(t) != info->si_pid)
69048+ && gr_handle_signal(t, sig))
69049+ return -EPERM;
69050+
69051 return security_task_kill(t, info, sig, 0);
69052 }
69053
69054@@ -1165,7 +1175,7 @@ __group_send_sig_info(int sig, struct siginfo *info, struct task_struct *p)
69055 return send_signal(sig, info, p, 1);
69056 }
69057
69058-static int
69059+int
69060 specific_send_sig_info(int sig, struct siginfo *info, struct task_struct *t)
69061 {
69062 return send_signal(sig, info, t, 0);
69063@@ -1202,6 +1212,7 @@ force_sig_info(int sig, struct siginfo *info, struct task_struct *t)
69064 unsigned long int flags;
69065 int ret, blocked, ignored;
69066 struct k_sigaction *action;
69067+ int is_unhandled = 0;
69068
69069 spin_lock_irqsave(&t->sighand->siglock, flags);
69070 action = &t->sighand->action[sig-1];
69071@@ -1216,9 +1227,18 @@ force_sig_info(int sig, struct siginfo *info, struct task_struct *t)
69072 }
69073 if (action->sa.sa_handler == SIG_DFL)
69074 t->signal->flags &= ~SIGNAL_UNKILLABLE;
69075+ if (action->sa.sa_handler == SIG_IGN || action->sa.sa_handler == SIG_DFL)
69076+ is_unhandled = 1;
69077 ret = specific_send_sig_info(sig, info, t);
69078 spin_unlock_irqrestore(&t->sighand->siglock, flags);
69079
69080+ /* only deal with unhandled signals, java etc trigger SIGSEGV during
69081+ normal operation */
69082+ if (is_unhandled) {
69083+ gr_log_signal(sig, !is_si_special(info) ? info->si_addr : NULL, t);
69084+ gr_handle_crash(t, sig);
69085+ }
69086+
69087 return ret;
69088 }
69089
69090@@ -1285,8 +1305,11 @@ int group_send_sig_info(int sig, struct siginfo *info, struct task_struct *p)
69091 ret = check_kill_permission(sig, info, p);
69092 rcu_read_unlock();
69093
69094- if (!ret && sig)
69095+ if (!ret && sig) {
69096 ret = do_send_sig_info(sig, info, p, true);
69097+ if (!ret)
69098+ gr_log_signal(sig, !is_si_special(info) ? info->si_addr : NULL, p);
69099+ }
69100
69101 return ret;
69102 }
69103@@ -2754,7 +2777,15 @@ do_send_specific(pid_t tgid, pid_t pid, int sig, struct siginfo *info)
69104 int error = -ESRCH;
69105
69106 rcu_read_lock();
69107- p = find_task_by_vpid(pid);
69108+#ifdef CONFIG_GRKERNSEC_CHROOT_FINDTASK
69109+ /* allow glibc communication via tgkill to other threads in our
69110+ thread group */
69111+ if (grsec_enable_chroot_findtask && info->si_code == SI_TKILL &&
69112+ sig == (SIGRTMIN+1) && tgid == info->si_pid)
69113+ p = find_task_by_vpid_unrestricted(pid);
69114+ else
69115+#endif
69116+ p = find_task_by_vpid(pid);
69117 if (p && (tgid <= 0 || task_tgid_vnr(p) == tgid)) {
69118 error = check_kill_permission(sig, info, p);
69119 /*
69120diff --git a/kernel/smp.c b/kernel/smp.c
69121index db197d6..17aef0b 100644
69122--- a/kernel/smp.c
69123+++ b/kernel/smp.c
69124@@ -580,22 +580,22 @@ int smp_call_function(smp_call_func_t func, void *info, int wait)
69125 }
69126 EXPORT_SYMBOL(smp_call_function);
69127
69128-void ipi_call_lock(void)
69129+void ipi_call_lock(void) __acquires(call_function.lock)
69130 {
69131 raw_spin_lock(&call_function.lock);
69132 }
69133
69134-void ipi_call_unlock(void)
69135+void ipi_call_unlock(void) __releases(call_function.lock)
69136 {
69137 raw_spin_unlock(&call_function.lock);
69138 }
69139
69140-void ipi_call_lock_irq(void)
69141+void ipi_call_lock_irq(void) __acquires(call_function.lock)
69142 {
69143 raw_spin_lock_irq(&call_function.lock);
69144 }
69145
69146-void ipi_call_unlock_irq(void)
69147+void ipi_call_unlock_irq(void) __releases(call_function.lock)
69148 {
69149 raw_spin_unlock_irq(&call_function.lock);
69150 }
69151diff --git a/kernel/softirq.c b/kernel/softirq.c
69152index 2c71d91..1021f81 100644
69153--- a/kernel/softirq.c
69154+++ b/kernel/softirq.c
69155@@ -56,7 +56,7 @@ static struct softirq_action softirq_vec[NR_SOFTIRQS] __cacheline_aligned_in_smp
69156
69157 DEFINE_PER_CPU(struct task_struct *, ksoftirqd);
69158
69159-char *softirq_to_name[NR_SOFTIRQS] = {
69160+const char * const softirq_to_name[NR_SOFTIRQS] = {
69161 "HI", "TIMER", "NET_TX", "NET_RX", "BLOCK", "BLOCK_IOPOLL",
69162 "TASKLET", "SCHED", "HRTIMER", "RCU"
69163 };
69164@@ -235,7 +235,7 @@ restart:
69165 kstat_incr_softirqs_this_cpu(vec_nr);
69166
69167 trace_softirq_entry(vec_nr);
69168- h->action(h);
69169+ h->action();
69170 trace_softirq_exit(vec_nr);
69171 if (unlikely(prev_count != preempt_count())) {
69172 printk(KERN_ERR "huh, entered softirq %u %s %p"
69173@@ -385,9 +385,11 @@ void raise_softirq(unsigned int nr)
69174 local_irq_restore(flags);
69175 }
69176
69177-void open_softirq(int nr, void (*action)(struct softirq_action *))
69178+void open_softirq(int nr, void (*action)(void))
69179 {
69180- softirq_vec[nr].action = action;
69181+ pax_open_kernel();
69182+ *(void **)&softirq_vec[nr].action = action;
69183+ pax_close_kernel();
69184 }
69185
69186 /*
69187@@ -441,7 +443,7 @@ void __tasklet_hi_schedule_first(struct tasklet_struct *t)
69188
69189 EXPORT_SYMBOL(__tasklet_hi_schedule_first);
69190
69191-static void tasklet_action(struct softirq_action *a)
69192+static void tasklet_action(void)
69193 {
69194 struct tasklet_struct *list;
69195
69196@@ -476,7 +478,7 @@ static void tasklet_action(struct softirq_action *a)
69197 }
69198 }
69199
69200-static void tasklet_hi_action(struct softirq_action *a)
69201+static void tasklet_hi_action(void)
69202 {
69203 struct tasklet_struct *list;
69204
69205diff --git a/kernel/sys.c b/kernel/sys.c
69206index 481611f..0754d86 100644
69207--- a/kernel/sys.c
69208+++ b/kernel/sys.c
69209@@ -158,6 +158,12 @@ static int set_one_prio(struct task_struct *p, int niceval, int error)
69210 error = -EACCES;
69211 goto out;
69212 }
69213+
69214+ if (gr_handle_chroot_setpriority(p, niceval)) {
69215+ error = -EACCES;
69216+ goto out;
69217+ }
69218+
69219 no_nice = security_task_setnice(p, niceval);
69220 if (no_nice) {
69221 error = no_nice;
69222@@ -572,6 +578,9 @@ SYSCALL_DEFINE2(setregid, gid_t, rgid, gid_t, egid)
69223 goto error;
69224 }
69225
69226+ if (gr_check_group_change(new->gid, new->egid, -1))
69227+ goto error;
69228+
69229 if (rgid != (gid_t) -1 ||
69230 (egid != (gid_t) -1 && egid != old->gid))
69231 new->sgid = new->egid;
69232@@ -601,6 +610,10 @@ SYSCALL_DEFINE1(setgid, gid_t, gid)
69233 old = current_cred();
69234
69235 retval = -EPERM;
69236+
69237+ if (gr_check_group_change(gid, gid, gid))
69238+ goto error;
69239+
69240 if (nsown_capable(CAP_SETGID))
69241 new->gid = new->egid = new->sgid = new->fsgid = gid;
69242 else if (gid == old->gid || gid == old->sgid)
69243@@ -618,7 +631,7 @@ error:
69244 /*
69245 * change the user struct in a credentials set to match the new UID
69246 */
69247-static int set_user(struct cred *new)
69248+int set_user(struct cred *new)
69249 {
69250 struct user_struct *new_user;
69251
69252@@ -688,6 +701,9 @@ SYSCALL_DEFINE2(setreuid, uid_t, ruid, uid_t, euid)
69253 goto error;
69254 }
69255
69256+ if (gr_check_user_change(new->uid, new->euid, -1))
69257+ goto error;
69258+
69259 if (new->uid != old->uid) {
69260 retval = set_user(new);
69261 if (retval < 0)
69262@@ -732,6 +748,12 @@ SYSCALL_DEFINE1(setuid, uid_t, uid)
69263 old = current_cred();
69264
69265 retval = -EPERM;
69266+
69267+ if (gr_check_crash_uid(uid))
69268+ goto error;
69269+ if (gr_check_user_change(uid, uid, uid))
69270+ goto error;
69271+
69272 if (nsown_capable(CAP_SETUID)) {
69273 new->suid = new->uid = uid;
69274 if (uid != old->uid) {
69275@@ -786,6 +808,9 @@ SYSCALL_DEFINE3(setresuid, uid_t, ruid, uid_t, euid, uid_t, suid)
69276 goto error;
69277 }
69278
69279+ if (gr_check_user_change(ruid, euid, -1))
69280+ goto error;
69281+
69282 if (ruid != (uid_t) -1) {
69283 new->uid = ruid;
69284 if (ruid != old->uid) {
69285@@ -850,6 +875,9 @@ SYSCALL_DEFINE3(setresgid, gid_t, rgid, gid_t, egid, gid_t, sgid)
69286 goto error;
69287 }
69288
69289+ if (gr_check_group_change(rgid, egid, -1))
69290+ goto error;
69291+
69292 if (rgid != (gid_t) -1)
69293 new->gid = rgid;
69294 if (egid != (gid_t) -1)
69295@@ -896,6 +924,9 @@ SYSCALL_DEFINE1(setfsuid, uid_t, uid)
69296 old = current_cred();
69297 old_fsuid = old->fsuid;
69298
69299+ if (gr_check_user_change(-1, -1, uid))
69300+ goto error;
69301+
69302 if (uid == old->uid || uid == old->euid ||
69303 uid == old->suid || uid == old->fsuid ||
69304 nsown_capable(CAP_SETUID)) {
69305@@ -906,6 +937,7 @@ SYSCALL_DEFINE1(setfsuid, uid_t, uid)
69306 }
69307 }
69308
69309+error:
69310 abort_creds(new);
69311 return old_fsuid;
69312
69313@@ -932,12 +964,16 @@ SYSCALL_DEFINE1(setfsgid, gid_t, gid)
69314 if (gid == old->gid || gid == old->egid ||
69315 gid == old->sgid || gid == old->fsgid ||
69316 nsown_capable(CAP_SETGID)) {
69317+ if (gr_check_group_change(-1, -1, gid))
69318+ goto error;
69319+
69320 if (gid != old_fsgid) {
69321 new->fsgid = gid;
69322 goto change_okay;
69323 }
69324 }
69325
69326+error:
69327 abort_creds(new);
69328 return old_fsgid;
69329
69330@@ -1189,7 +1225,10 @@ static int override_release(char __user *release, int len)
69331 }
69332 v = ((LINUX_VERSION_CODE >> 8) & 0xff) + 40;
69333 snprintf(buf, len, "2.6.%u%s", v, rest);
69334- ret = copy_to_user(release, buf, len);
69335+ if (len > sizeof(buf))
69336+ ret = -EFAULT;
69337+ else
69338+ ret = copy_to_user(release, buf, len);
69339 }
69340 return ret;
69341 }
69342@@ -1243,19 +1282,19 @@ SYSCALL_DEFINE1(olduname, struct oldold_utsname __user *, name)
69343 return -EFAULT;
69344
69345 down_read(&uts_sem);
69346- error = __copy_to_user(&name->sysname, &utsname()->sysname,
69347+ error = __copy_to_user(name->sysname, &utsname()->sysname,
69348 __OLD_UTS_LEN);
69349 error |= __put_user(0, name->sysname + __OLD_UTS_LEN);
69350- error |= __copy_to_user(&name->nodename, &utsname()->nodename,
69351+ error |= __copy_to_user(name->nodename, &utsname()->nodename,
69352 __OLD_UTS_LEN);
69353 error |= __put_user(0, name->nodename + __OLD_UTS_LEN);
69354- error |= __copy_to_user(&name->release, &utsname()->release,
69355+ error |= __copy_to_user(name->release, &utsname()->release,
69356 __OLD_UTS_LEN);
69357 error |= __put_user(0, name->release + __OLD_UTS_LEN);
69358- error |= __copy_to_user(&name->version, &utsname()->version,
69359+ error |= __copy_to_user(name->version, &utsname()->version,
69360 __OLD_UTS_LEN);
69361 error |= __put_user(0, name->version + __OLD_UTS_LEN);
69362- error |= __copy_to_user(&name->machine, &utsname()->machine,
69363+ error |= __copy_to_user(name->machine, &utsname()->machine,
69364 __OLD_UTS_LEN);
69365 error |= __put_user(0, name->machine + __OLD_UTS_LEN);
69366 up_read(&uts_sem);
69367@@ -1720,7 +1759,7 @@ SYSCALL_DEFINE5(prctl, int, option, unsigned long, arg2, unsigned long, arg3,
69368 error = get_dumpable(me->mm);
69369 break;
69370 case PR_SET_DUMPABLE:
69371- if (arg2 < 0 || arg2 > 1) {
69372+ if (arg2 > 1) {
69373 error = -EINVAL;
69374 break;
69375 }
69376diff --git a/kernel/sysctl.c b/kernel/sysctl.c
69377index ae27196..7506d69 100644
69378--- a/kernel/sysctl.c
69379+++ b/kernel/sysctl.c
69380@@ -86,6 +86,13 @@
69381
69382
69383 #if defined(CONFIG_SYSCTL)
69384+#include <linux/grsecurity.h>
69385+#include <linux/grinternal.h>
69386+
69387+extern __u32 gr_handle_sysctl(const ctl_table *table, const int op);
69388+extern int gr_handle_sysctl_mod(const char *dirname, const char *name,
69389+ const int op);
69390+extern int gr_handle_chroot_sysctl(const int op);
69391
69392 /* External variables not in a header file. */
69393 extern int sysctl_overcommit_memory;
69394@@ -191,6 +198,7 @@ static int sysrq_sysctl_handler(ctl_table *table, int write,
69395 }
69396
69397 #endif
69398+extern struct ctl_table grsecurity_table[];
69399
69400 static struct ctl_table root_table[];
69401 static struct ctl_table_root sysctl_table_root;
69402@@ -220,6 +228,20 @@ extern struct ctl_table epoll_table[];
69403 int sysctl_legacy_va_layout;
69404 #endif
69405
69406+#ifdef CONFIG_PAX_SOFTMODE
69407+static ctl_table pax_table[] = {
69408+ {
69409+ .procname = "softmode",
69410+ .data = &pax_softmode,
69411+ .maxlen = sizeof(unsigned int),
69412+ .mode = 0600,
69413+ .proc_handler = &proc_dointvec,
69414+ },
69415+
69416+ { }
69417+};
69418+#endif
69419+
69420 /* The default sysctl tables: */
69421
69422 static struct ctl_table root_table[] = {
69423@@ -266,6 +288,22 @@ static int max_extfrag_threshold = 1000;
69424 #endif
69425
69426 static struct ctl_table kern_table[] = {
69427+#if defined(CONFIG_GRKERNSEC_SYSCTL) || defined(CONFIG_GRKERNSEC_ROFS)
69428+ {
69429+ .procname = "grsecurity",
69430+ .mode = 0500,
69431+ .child = grsecurity_table,
69432+ },
69433+#endif
69434+
69435+#ifdef CONFIG_PAX_SOFTMODE
69436+ {
69437+ .procname = "pax",
69438+ .mode = 0500,
69439+ .child = pax_table,
69440+ },
69441+#endif
69442+
69443 {
69444 .procname = "sched_child_runs_first",
69445 .data = &sysctl_sched_child_runs_first,
69446@@ -550,7 +588,7 @@ static struct ctl_table kern_table[] = {
69447 .data = &modprobe_path,
69448 .maxlen = KMOD_PATH_LEN,
69449 .mode = 0644,
69450- .proc_handler = proc_dostring,
69451+ .proc_handler = proc_dostring_modpriv,
69452 },
69453 {
69454 .procname = "modules_disabled",
69455@@ -717,16 +755,20 @@ static struct ctl_table kern_table[] = {
69456 .extra1 = &zero,
69457 .extra2 = &one,
69458 },
69459+#endif
69460 {
69461 .procname = "kptr_restrict",
69462 .data = &kptr_restrict,
69463 .maxlen = sizeof(int),
69464 .mode = 0644,
69465 .proc_handler = proc_dmesg_restrict,
69466+#ifdef CONFIG_GRKERNSEC_HIDESYM
69467+ .extra1 = &two,
69468+#else
69469 .extra1 = &zero,
69470+#endif
69471 .extra2 = &two,
69472 },
69473-#endif
69474 {
69475 .procname = "ngroups_max",
69476 .data = &ngroups_max,
69477@@ -1216,6 +1258,13 @@ static struct ctl_table vm_table[] = {
69478 .proc_handler = proc_dointvec_minmax,
69479 .extra1 = &zero,
69480 },
69481+ {
69482+ .procname = "heap_stack_gap",
69483+ .data = &sysctl_heap_stack_gap,
69484+ .maxlen = sizeof(sysctl_heap_stack_gap),
69485+ .mode = 0644,
69486+ .proc_handler = proc_doulongvec_minmax,
69487+ },
69488 #else
69489 {
69490 .procname = "nr_trim_pages",
69491@@ -1720,6 +1769,17 @@ static int test_perm(int mode, int op)
69492 int sysctl_perm(struct ctl_table_root *root, struct ctl_table *table, int op)
69493 {
69494 int mode;
69495+ int error;
69496+
69497+ if (table->parent != NULL && table->parent->procname != NULL &&
69498+ table->procname != NULL &&
69499+ gr_handle_sysctl_mod(table->parent->procname, table->procname, op))
69500+ return -EACCES;
69501+ if (gr_handle_chroot_sysctl(op))
69502+ return -EACCES;
69503+ error = gr_handle_sysctl(table, op);
69504+ if (error)
69505+ return error;
69506
69507 if (root->permissions)
69508 mode = root->permissions(root, current->nsproxy, table);
69509@@ -2124,6 +2184,16 @@ int proc_dostring(struct ctl_table *table, int write,
69510 buffer, lenp, ppos);
69511 }
69512
69513+int proc_dostring_modpriv(struct ctl_table *table, int write,
69514+ void __user *buffer, size_t *lenp, loff_t *ppos)
69515+{
69516+ if (write && !capable(CAP_SYS_MODULE))
69517+ return -EPERM;
69518+
69519+ return _proc_do_string(table->data, table->maxlen, write,
69520+ buffer, lenp, ppos);
69521+}
69522+
69523 static size_t proc_skip_spaces(char **buf)
69524 {
69525 size_t ret;
69526@@ -2229,6 +2299,8 @@ static int proc_put_long(void __user **buf, size_t *size, unsigned long val,
69527 len = strlen(tmp);
69528 if (len > *size)
69529 len = *size;
69530+ if (len > sizeof(tmp))
69531+ len = sizeof(tmp);
69532 if (copy_to_user(*buf, tmp, len))
69533 return -EFAULT;
69534 *size -= len;
69535@@ -2545,8 +2617,11 @@ static int __do_proc_doulongvec_minmax(void *data, struct ctl_table *table, int
69536 *i = val;
69537 } else {
69538 val = convdiv * (*i) / convmul;
69539- if (!first)
69540+ if (!first) {
69541 err = proc_put_char(&buffer, &left, '\t');
69542+ if (err)
69543+ break;
69544+ }
69545 err = proc_put_long(&buffer, &left, val, false);
69546 if (err)
69547 break;
69548@@ -2941,6 +3016,12 @@ int proc_dostring(struct ctl_table *table, int write,
69549 return -ENOSYS;
69550 }
69551
69552+int proc_dostring_modpriv(struct ctl_table *table, int write,
69553+ void __user *buffer, size_t *lenp, loff_t *ppos)
69554+{
69555+ return -ENOSYS;
69556+}
69557+
69558 int proc_dointvec(struct ctl_table *table, int write,
69559 void __user *buffer, size_t *lenp, loff_t *ppos)
69560 {
69561@@ -2997,6 +3078,7 @@ EXPORT_SYMBOL(proc_dointvec_minmax);
69562 EXPORT_SYMBOL(proc_dointvec_userhz_jiffies);
69563 EXPORT_SYMBOL(proc_dointvec_ms_jiffies);
69564 EXPORT_SYMBOL(proc_dostring);
69565+EXPORT_SYMBOL(proc_dostring_modpriv);
69566 EXPORT_SYMBOL(proc_doulongvec_minmax);
69567 EXPORT_SYMBOL(proc_doulongvec_ms_jiffies_minmax);
69568 EXPORT_SYMBOL(register_sysctl_table);
69569diff --git a/kernel/sysctl_binary.c b/kernel/sysctl_binary.c
69570index a650694..aaeeb20 100644
69571--- a/kernel/sysctl_binary.c
69572+++ b/kernel/sysctl_binary.c
69573@@ -989,7 +989,7 @@ static ssize_t bin_intvec(struct file *file,
69574 int i;
69575
69576 set_fs(KERNEL_DS);
69577- result = vfs_read(file, buffer, BUFSZ - 1, &pos);
69578+ result = vfs_read(file, (char __force_user *)buffer, BUFSZ - 1, &pos);
69579 set_fs(old_fs);
69580 if (result < 0)
69581 goto out_kfree;
69582@@ -1034,7 +1034,7 @@ static ssize_t bin_intvec(struct file *file,
69583 }
69584
69585 set_fs(KERNEL_DS);
69586- result = vfs_write(file, buffer, str - buffer, &pos);
69587+ result = vfs_write(file, (const char __force_user *)buffer, str - buffer, &pos);
69588 set_fs(old_fs);
69589 if (result < 0)
69590 goto out_kfree;
69591@@ -1067,7 +1067,7 @@ static ssize_t bin_ulongvec(struct file *file,
69592 int i;
69593
69594 set_fs(KERNEL_DS);
69595- result = vfs_read(file, buffer, BUFSZ - 1, &pos);
69596+ result = vfs_read(file, (char __force_user *)buffer, BUFSZ - 1, &pos);
69597 set_fs(old_fs);
69598 if (result < 0)
69599 goto out_kfree;
69600@@ -1112,7 +1112,7 @@ static ssize_t bin_ulongvec(struct file *file,
69601 }
69602
69603 set_fs(KERNEL_DS);
69604- result = vfs_write(file, buffer, str - buffer, &pos);
69605+ result = vfs_write(file, (const char __force_user *)buffer, str - buffer, &pos);
69606 set_fs(old_fs);
69607 if (result < 0)
69608 goto out_kfree;
69609@@ -1138,7 +1138,7 @@ static ssize_t bin_uuid(struct file *file,
69610 int i;
69611
69612 set_fs(KERNEL_DS);
69613- result = vfs_read(file, buf, sizeof(buf) - 1, &pos);
69614+ result = vfs_read(file, (char __force_user *)buf, sizeof(buf) - 1, &pos);
69615 set_fs(old_fs);
69616 if (result < 0)
69617 goto out;
69618@@ -1185,7 +1185,7 @@ static ssize_t bin_dn_node_address(struct file *file,
69619 __le16 dnaddr;
69620
69621 set_fs(KERNEL_DS);
69622- result = vfs_read(file, buf, sizeof(buf) - 1, &pos);
69623+ result = vfs_read(file, (char __force_user *)buf, sizeof(buf) - 1, &pos);
69624 set_fs(old_fs);
69625 if (result < 0)
69626 goto out;
69627@@ -1233,7 +1233,7 @@ static ssize_t bin_dn_node_address(struct file *file,
69628 le16_to_cpu(dnaddr) & 0x3ff);
69629
69630 set_fs(KERNEL_DS);
69631- result = vfs_write(file, buf, len, &pos);
69632+ result = vfs_write(file, (const char __force_user *)buf, len, &pos);
69633 set_fs(old_fs);
69634 if (result < 0)
69635 goto out;
69636diff --git a/kernel/sysctl_check.c b/kernel/sysctl_check.c
69637index 362da65..ab8ef8c 100644
69638--- a/kernel/sysctl_check.c
69639+++ b/kernel/sysctl_check.c
69640@@ -129,6 +129,7 @@ int sysctl_check_table(struct nsproxy *namespaces, struct ctl_table *table)
69641 set_fail(&fail, table, "Directory with extra2");
69642 } else {
69643 if ((table->proc_handler == proc_dostring) ||
69644+ (table->proc_handler == proc_dostring_modpriv) ||
69645 (table->proc_handler == proc_dointvec) ||
69646 (table->proc_handler == proc_dointvec_minmax) ||
69647 (table->proc_handler == proc_dointvec_jiffies) ||
69648diff --git a/kernel/taskstats.c b/kernel/taskstats.c
69649index e660464..c8b9e67 100644
69650--- a/kernel/taskstats.c
69651+++ b/kernel/taskstats.c
69652@@ -27,9 +27,12 @@
69653 #include <linux/cgroup.h>
69654 #include <linux/fs.h>
69655 #include <linux/file.h>
69656+#include <linux/grsecurity.h>
69657 #include <net/genetlink.h>
69658 #include <linux/atomic.h>
69659
69660+extern int gr_is_taskstats_denied(int pid);
69661+
69662 /*
69663 * Maximum length of a cpumask that can be specified in
69664 * the TASKSTATS_CMD_ATTR_REGISTER/DEREGISTER_CPUMASK attribute
69665@@ -556,6 +559,9 @@ err:
69666
69667 static int taskstats_user_cmd(struct sk_buff *skb, struct genl_info *info)
69668 {
69669+ if (gr_is_taskstats_denied(current->pid))
69670+ return -EACCES;
69671+
69672 if (info->attrs[TASKSTATS_CMD_ATTR_REGISTER_CPUMASK])
69673 return cmd_attr_register_cpumask(info);
69674 else if (info->attrs[TASKSTATS_CMD_ATTR_DEREGISTER_CPUMASK])
69675diff --git a/kernel/time.c b/kernel/time.c
69676index 73e416d..cfc6f69 100644
69677--- a/kernel/time.c
69678+++ b/kernel/time.c
69679@@ -163,6 +163,11 @@ int do_sys_settimeofday(const struct timespec *tv, const struct timezone *tz)
69680 return error;
69681
69682 if (tz) {
69683+ /* we log in do_settimeofday called below, so don't log twice
69684+ */
69685+ if (!tv)
69686+ gr_log_timechange();
69687+
69688 /* SMP safe, global irq locking makes it work. */
69689 sys_tz = *tz;
69690 update_vsyscall_tz();
69691diff --git a/kernel/time/alarmtimer.c b/kernel/time/alarmtimer.c
69692index 8a46f5d..bbe6f9c 100644
69693--- a/kernel/time/alarmtimer.c
69694+++ b/kernel/time/alarmtimer.c
69695@@ -773,7 +773,7 @@ static int __init alarmtimer_init(void)
69696 struct platform_device *pdev;
69697 int error = 0;
69698 int i;
69699- struct k_clock alarm_clock = {
69700+ static struct k_clock alarm_clock = {
69701 .clock_getres = alarm_clock_getres,
69702 .clock_get = alarm_clock_get,
69703 .timer_create = alarm_timer_create,
69704diff --git a/kernel/time/tick-broadcast.c b/kernel/time/tick-broadcast.c
69705index fd4a7b1..fae5c2a 100644
69706--- a/kernel/time/tick-broadcast.c
69707+++ b/kernel/time/tick-broadcast.c
69708@@ -115,7 +115,7 @@ int tick_device_uses_broadcast(struct clock_event_device *dev, int cpu)
69709 * then clear the broadcast bit.
69710 */
69711 if (!(dev->features & CLOCK_EVT_FEAT_C3STOP)) {
69712- int cpu = smp_processor_id();
69713+ cpu = smp_processor_id();
69714
69715 cpumask_clear_cpu(cpu, tick_get_broadcast_mask());
69716 tick_broadcast_clear_oneshot(cpu);
69717diff --git a/kernel/time/timekeeping.c b/kernel/time/timekeeping.c
69718index 2378413..be455fd 100644
69719--- a/kernel/time/timekeeping.c
69720+++ b/kernel/time/timekeeping.c
69721@@ -14,6 +14,7 @@
69722 #include <linux/init.h>
69723 #include <linux/mm.h>
69724 #include <linux/sched.h>
69725+#include <linux/grsecurity.h>
69726 #include <linux/syscore_ops.h>
69727 #include <linux/clocksource.h>
69728 #include <linux/jiffies.h>
69729@@ -365,6 +366,8 @@ int do_settimeofday(const struct timespec *tv)
69730 if ((unsigned long)tv->tv_nsec >= NSEC_PER_SEC)
69731 return -EINVAL;
69732
69733+ gr_log_timechange();
69734+
69735 write_seqlock_irqsave(&xtime_lock, flags);
69736
69737 timekeeping_forward_now();
69738diff --git a/kernel/time/timer_list.c b/kernel/time/timer_list.c
69739index 3258455..f35227d 100644
69740--- a/kernel/time/timer_list.c
69741+++ b/kernel/time/timer_list.c
69742@@ -38,12 +38,16 @@ DECLARE_PER_CPU(struct hrtimer_cpu_base, hrtimer_bases);
69743
69744 static void print_name_offset(struct seq_file *m, void *sym)
69745 {
69746+#ifdef CONFIG_GRKERNSEC_HIDESYM
69747+ SEQ_printf(m, "<%p>", NULL);
69748+#else
69749 char symname[KSYM_NAME_LEN];
69750
69751 if (lookup_symbol_name((unsigned long)sym, symname) < 0)
69752 SEQ_printf(m, "<%pK>", sym);
69753 else
69754 SEQ_printf(m, "%s", symname);
69755+#endif
69756 }
69757
69758 static void
69759@@ -112,7 +116,11 @@ next_one:
69760 static void
69761 print_base(struct seq_file *m, struct hrtimer_clock_base *base, u64 now)
69762 {
69763+#ifdef CONFIG_GRKERNSEC_HIDESYM
69764+ SEQ_printf(m, " .base: %p\n", NULL);
69765+#else
69766 SEQ_printf(m, " .base: %pK\n", base);
69767+#endif
69768 SEQ_printf(m, " .index: %d\n",
69769 base->index);
69770 SEQ_printf(m, " .resolution: %Lu nsecs\n",
69771@@ -293,7 +301,11 @@ static int __init init_timer_list_procfs(void)
69772 {
69773 struct proc_dir_entry *pe;
69774
69775+#ifdef CONFIG_GRKERNSEC_PROC_ADD
69776+ pe = proc_create("timer_list", 0400, NULL, &timer_list_fops);
69777+#else
69778 pe = proc_create("timer_list", 0444, NULL, &timer_list_fops);
69779+#endif
69780 if (!pe)
69781 return -ENOMEM;
69782 return 0;
69783diff --git a/kernel/time/timer_stats.c b/kernel/time/timer_stats.c
69784index 0b537f2..9e71eca 100644
69785--- a/kernel/time/timer_stats.c
69786+++ b/kernel/time/timer_stats.c
69787@@ -116,7 +116,7 @@ static ktime_t time_start, time_stop;
69788 static unsigned long nr_entries;
69789 static struct entry entries[MAX_ENTRIES];
69790
69791-static atomic_t overflow_count;
69792+static atomic_unchecked_t overflow_count;
69793
69794 /*
69795 * The entries are in a hash-table, for fast lookup:
69796@@ -140,7 +140,7 @@ static void reset_entries(void)
69797 nr_entries = 0;
69798 memset(entries, 0, sizeof(entries));
69799 memset(tstat_hash_table, 0, sizeof(tstat_hash_table));
69800- atomic_set(&overflow_count, 0);
69801+ atomic_set_unchecked(&overflow_count, 0);
69802 }
69803
69804 static struct entry *alloc_entry(void)
69805@@ -261,7 +261,7 @@ void timer_stats_update_stats(void *timer, pid_t pid, void *startf,
69806 if (likely(entry))
69807 entry->count++;
69808 else
69809- atomic_inc(&overflow_count);
69810+ atomic_inc_unchecked(&overflow_count);
69811
69812 out_unlock:
69813 raw_spin_unlock_irqrestore(lock, flags);
69814@@ -269,12 +269,16 @@ void timer_stats_update_stats(void *timer, pid_t pid, void *startf,
69815
69816 static void print_name_offset(struct seq_file *m, unsigned long addr)
69817 {
69818+#ifdef CONFIG_GRKERNSEC_HIDESYM
69819+ seq_printf(m, "<%p>", NULL);
69820+#else
69821 char symname[KSYM_NAME_LEN];
69822
69823 if (lookup_symbol_name(addr, symname) < 0)
69824 seq_printf(m, "<%p>", (void *)addr);
69825 else
69826 seq_printf(m, "%s", symname);
69827+#endif
69828 }
69829
69830 static int tstats_show(struct seq_file *m, void *v)
69831@@ -300,9 +304,9 @@ static int tstats_show(struct seq_file *m, void *v)
69832
69833 seq_puts(m, "Timer Stats Version: v0.2\n");
69834 seq_printf(m, "Sample period: %ld.%03ld s\n", period.tv_sec, ms);
69835- if (atomic_read(&overflow_count))
69836+ if (atomic_read_unchecked(&overflow_count))
69837 seq_printf(m, "Overflow: %d entries\n",
69838- atomic_read(&overflow_count));
69839+ atomic_read_unchecked(&overflow_count));
69840
69841 for (i = 0; i < nr_entries; i++) {
69842 entry = entries + i;
69843@@ -417,7 +421,11 @@ static int __init init_tstats_procfs(void)
69844 {
69845 struct proc_dir_entry *pe;
69846
69847+#ifdef CONFIG_GRKERNSEC_PROC_ADD
69848+ pe = proc_create("timer_stats", 0600, NULL, &tstats_fops);
69849+#else
69850 pe = proc_create("timer_stats", 0644, NULL, &tstats_fops);
69851+#endif
69852 if (!pe)
69853 return -ENOMEM;
69854 return 0;
69855diff --git a/kernel/timer.c b/kernel/timer.c
69856index 9c3c62b..441690e 100644
69857--- a/kernel/timer.c
69858+++ b/kernel/timer.c
69859@@ -1304,7 +1304,7 @@ void update_process_times(int user_tick)
69860 /*
69861 * This function runs timers and the timer-tq in bottom half context.
69862 */
69863-static void run_timer_softirq(struct softirq_action *h)
69864+static void run_timer_softirq(void)
69865 {
69866 struct tvec_base *base = __this_cpu_read(tvec_bases);
69867
69868diff --git a/kernel/trace/blktrace.c b/kernel/trace/blktrace.c
69869index 16fc34a..efd8bb8 100644
69870--- a/kernel/trace/blktrace.c
69871+++ b/kernel/trace/blktrace.c
69872@@ -324,7 +324,7 @@ static ssize_t blk_dropped_read(struct file *filp, char __user *buffer,
69873 struct blk_trace *bt = filp->private_data;
69874 char buf[16];
69875
69876- snprintf(buf, sizeof(buf), "%u\n", atomic_read(&bt->dropped));
69877+ snprintf(buf, sizeof(buf), "%u\n", atomic_read_unchecked(&bt->dropped));
69878
69879 return simple_read_from_buffer(buffer, count, ppos, buf, strlen(buf));
69880 }
69881@@ -389,7 +389,7 @@ static int blk_subbuf_start_callback(struct rchan_buf *buf, void *subbuf,
69882 return 1;
69883
69884 bt = buf->chan->private_data;
69885- atomic_inc(&bt->dropped);
69886+ atomic_inc_unchecked(&bt->dropped);
69887 return 0;
69888 }
69889
69890@@ -490,7 +490,7 @@ int do_blk_trace_setup(struct request_queue *q, char *name, dev_t dev,
69891
69892 bt->dir = dir;
69893 bt->dev = dev;
69894- atomic_set(&bt->dropped, 0);
69895+ atomic_set_unchecked(&bt->dropped, 0);
69896
69897 ret = -EIO;
69898 bt->dropped_file = debugfs_create_file("dropped", 0444, dir, bt,
69899diff --git a/kernel/trace/ftrace.c b/kernel/trace/ftrace.c
69900index 25b4f4d..6f4772d 100644
69901--- a/kernel/trace/ftrace.c
69902+++ b/kernel/trace/ftrace.c
69903@@ -1587,12 +1587,17 @@ ftrace_code_disable(struct module *mod, struct dyn_ftrace *rec)
69904 if (unlikely(ftrace_disabled))
69905 return 0;
69906
69907+ ret = ftrace_arch_code_modify_prepare();
69908+ FTRACE_WARN_ON(ret);
69909+ if (ret)
69910+ return 0;
69911+
69912 ret = ftrace_make_nop(mod, rec, MCOUNT_ADDR);
69913+ FTRACE_WARN_ON(ftrace_arch_code_modify_post_process());
69914 if (ret) {
69915 ftrace_bug(ret, ip);
69916- return 0;
69917 }
69918- return 1;
69919+ return ret ? 0 : 1;
69920 }
69921
69922 /*
69923@@ -2608,7 +2613,7 @@ static void ftrace_free_entry_rcu(struct rcu_head *rhp)
69924
69925 int
69926 register_ftrace_function_probe(char *glob, struct ftrace_probe_ops *ops,
69927- void *data)
69928+ void *data)
69929 {
69930 struct ftrace_func_probe *entry;
69931 struct ftrace_page *pg;
69932diff --git a/kernel/trace/trace.c b/kernel/trace/trace.c
69933index f2bd275..adaf3a2 100644
69934--- a/kernel/trace/trace.c
69935+++ b/kernel/trace/trace.c
69936@@ -4201,10 +4201,9 @@ static const struct file_operations tracing_dyn_info_fops = {
69937 };
69938 #endif
69939
69940-static struct dentry *d_tracer;
69941-
69942 struct dentry *tracing_init_dentry(void)
69943 {
69944+ static struct dentry *d_tracer;
69945 static int once;
69946
69947 if (d_tracer)
69948@@ -4224,10 +4223,9 @@ struct dentry *tracing_init_dentry(void)
69949 return d_tracer;
69950 }
69951
69952-static struct dentry *d_percpu;
69953-
69954 struct dentry *tracing_dentry_percpu(void)
69955 {
69956+ static struct dentry *d_percpu;
69957 static int once;
69958 struct dentry *d_tracer;
69959
69960diff --git a/kernel/trace/trace_events.c b/kernel/trace/trace_events.c
69961index c212a7f..7b02394 100644
69962--- a/kernel/trace/trace_events.c
69963+++ b/kernel/trace/trace_events.c
69964@@ -1299,10 +1299,6 @@ static LIST_HEAD(ftrace_module_file_list);
69965 struct ftrace_module_file_ops {
69966 struct list_head list;
69967 struct module *mod;
69968- struct file_operations id;
69969- struct file_operations enable;
69970- struct file_operations format;
69971- struct file_operations filter;
69972 };
69973
69974 static struct ftrace_module_file_ops *
69975@@ -1323,17 +1319,12 @@ trace_create_file_ops(struct module *mod)
69976
69977 file_ops->mod = mod;
69978
69979- file_ops->id = ftrace_event_id_fops;
69980- file_ops->id.owner = mod;
69981-
69982- file_ops->enable = ftrace_enable_fops;
69983- file_ops->enable.owner = mod;
69984-
69985- file_ops->filter = ftrace_event_filter_fops;
69986- file_ops->filter.owner = mod;
69987-
69988- file_ops->format = ftrace_event_format_fops;
69989- file_ops->format.owner = mod;
69990+ pax_open_kernel();
69991+ *(void **)&mod->trace_id.owner = mod;
69992+ *(void **)&mod->trace_enable.owner = mod;
69993+ *(void **)&mod->trace_filter.owner = mod;
69994+ *(void **)&mod->trace_format.owner = mod;
69995+ pax_close_kernel();
69996
69997 list_add(&file_ops->list, &ftrace_module_file_list);
69998
69999@@ -1357,8 +1348,8 @@ static void trace_module_add_events(struct module *mod)
70000
70001 for_each_event(call, start, end) {
70002 __trace_add_event_call(*call, mod,
70003- &file_ops->id, &file_ops->enable,
70004- &file_ops->filter, &file_ops->format);
70005+ &mod->trace_id, &mod->trace_enable,
70006+ &mod->trace_filter, &mod->trace_format);
70007 }
70008 }
70009
70010diff --git a/kernel/trace/trace_kprobe.c b/kernel/trace/trace_kprobe.c
70011index 00d527c..7c5b1a3 100644
70012--- a/kernel/trace/trace_kprobe.c
70013+++ b/kernel/trace/trace_kprobe.c
70014@@ -217,7 +217,7 @@ static __kprobes void FETCH_FUNC_NAME(memory, string)(struct pt_regs *regs,
70015 long ret;
70016 int maxlen = get_rloc_len(*(u32 *)dest);
70017 u8 *dst = get_rloc_data(dest);
70018- u8 *src = addr;
70019+ const u8 __user *src = (const u8 __force_user *)addr;
70020 mm_segment_t old_fs = get_fs();
70021 if (!maxlen)
70022 return;
70023@@ -229,7 +229,7 @@ static __kprobes void FETCH_FUNC_NAME(memory, string)(struct pt_regs *regs,
70024 pagefault_disable();
70025 do
70026 ret = __copy_from_user_inatomic(dst++, src++, 1);
70027- while (dst[-1] && ret == 0 && src - (u8 *)addr < maxlen);
70028+ while (dst[-1] && ret == 0 && src - (const u8 __force_user *)addr < maxlen);
70029 dst[-1] = '\0';
70030 pagefault_enable();
70031 set_fs(old_fs);
70032@@ -238,7 +238,7 @@ static __kprobes void FETCH_FUNC_NAME(memory, string)(struct pt_regs *regs,
70033 ((u8 *)get_rloc_data(dest))[0] = '\0';
70034 *(u32 *)dest = make_data_rloc(0, get_rloc_offs(*(u32 *)dest));
70035 } else
70036- *(u32 *)dest = make_data_rloc(src - (u8 *)addr,
70037+ *(u32 *)dest = make_data_rloc(src - (const u8 __force_user *)addr,
70038 get_rloc_offs(*(u32 *)dest));
70039 }
70040 /* Return the length of string -- including null terminal byte */
70041@@ -252,7 +252,7 @@ static __kprobes void FETCH_FUNC_NAME(memory, string_size)(struct pt_regs *regs,
70042 set_fs(KERNEL_DS);
70043 pagefault_disable();
70044 do {
70045- ret = __copy_from_user_inatomic(&c, (u8 *)addr + len, 1);
70046+ ret = __copy_from_user_inatomic(&c, (const u8 __force_user *)addr + len, 1);
70047 len++;
70048 } while (c && ret == 0 && len < MAX_STRING_SIZE);
70049 pagefault_enable();
70050diff --git a/kernel/trace/trace_mmiotrace.c b/kernel/trace/trace_mmiotrace.c
70051index fd3c8aa..5f324a6 100644
70052--- a/kernel/trace/trace_mmiotrace.c
70053+++ b/kernel/trace/trace_mmiotrace.c
70054@@ -24,7 +24,7 @@ struct header_iter {
70055 static struct trace_array *mmio_trace_array;
70056 static bool overrun_detected;
70057 static unsigned long prev_overruns;
70058-static atomic_t dropped_count;
70059+static atomic_unchecked_t dropped_count;
70060
70061 static void mmio_reset_data(struct trace_array *tr)
70062 {
70063@@ -127,7 +127,7 @@ static void mmio_close(struct trace_iterator *iter)
70064
70065 static unsigned long count_overruns(struct trace_iterator *iter)
70066 {
70067- unsigned long cnt = atomic_xchg(&dropped_count, 0);
70068+ unsigned long cnt = atomic_xchg_unchecked(&dropped_count, 0);
70069 unsigned long over = ring_buffer_overruns(iter->tr->buffer);
70070
70071 if (over > prev_overruns)
70072@@ -317,7 +317,7 @@ static void __trace_mmiotrace_rw(struct trace_array *tr,
70073 event = trace_buffer_lock_reserve(buffer, TRACE_MMIO_RW,
70074 sizeof(*entry), 0, pc);
70075 if (!event) {
70076- atomic_inc(&dropped_count);
70077+ atomic_inc_unchecked(&dropped_count);
70078 return;
70079 }
70080 entry = ring_buffer_event_data(event);
70081@@ -347,7 +347,7 @@ static void __trace_mmiotrace_map(struct trace_array *tr,
70082 event = trace_buffer_lock_reserve(buffer, TRACE_MMIO_MAP,
70083 sizeof(*entry), 0, pc);
70084 if (!event) {
70085- atomic_inc(&dropped_count);
70086+ atomic_inc_unchecked(&dropped_count);
70087 return;
70088 }
70089 entry = ring_buffer_event_data(event);
70090diff --git a/kernel/trace/trace_output.c b/kernel/trace/trace_output.c
70091index 5199930..26c73a0 100644
70092--- a/kernel/trace/trace_output.c
70093+++ b/kernel/trace/trace_output.c
70094@@ -278,7 +278,7 @@ int trace_seq_path(struct trace_seq *s, struct path *path)
70095
70096 p = d_path(path, s->buffer + s->len, PAGE_SIZE - s->len);
70097 if (!IS_ERR(p)) {
70098- p = mangle_path(s->buffer + s->len, p, "\n");
70099+ p = mangle_path(s->buffer + s->len, p, "\n\\");
70100 if (p) {
70101 s->len = p - s->buffer;
70102 return 1;
70103diff --git a/kernel/trace/trace_stack.c b/kernel/trace/trace_stack.c
70104index 77575b3..6e623d1 100644
70105--- a/kernel/trace/trace_stack.c
70106+++ b/kernel/trace/trace_stack.c
70107@@ -50,7 +50,7 @@ static inline void check_stack(void)
70108 return;
70109
70110 /* we do not handle interrupt stacks yet */
70111- if (!object_is_on_stack(&this_size))
70112+ if (!object_starts_on_stack(&this_size))
70113 return;
70114
70115 local_irq_save(flags);
70116diff --git a/kernel/trace/trace_workqueue.c b/kernel/trace/trace_workqueue.c
70117index 209b379..7f76423 100644
70118--- a/kernel/trace/trace_workqueue.c
70119+++ b/kernel/trace/trace_workqueue.c
70120@@ -22,7 +22,7 @@ struct cpu_workqueue_stats {
70121 int cpu;
70122 pid_t pid;
70123 /* Can be inserted from interrupt or user context, need to be atomic */
70124- atomic_t inserted;
70125+ atomic_unchecked_t inserted;
70126 /*
70127 * Don't need to be atomic, works are serialized in a single workqueue thread
70128 * on a single CPU.
70129@@ -60,7 +60,7 @@ probe_workqueue_insertion(void *ignore,
70130 spin_lock_irqsave(&workqueue_cpu_stat(cpu)->lock, flags);
70131 list_for_each_entry(node, &workqueue_cpu_stat(cpu)->list, list) {
70132 if (node->pid == wq_thread->pid) {
70133- atomic_inc(&node->inserted);
70134+ atomic_inc_unchecked(&node->inserted);
70135 goto found;
70136 }
70137 }
70138@@ -210,7 +210,7 @@ static int workqueue_stat_show(struct seq_file *s, void *p)
70139 tsk = get_pid_task(pid, PIDTYPE_PID);
70140 if (tsk) {
70141 seq_printf(s, "%3d %6d %6u %s\n", cws->cpu,
70142- atomic_read(&cws->inserted), cws->executed,
70143+ atomic_read_unchecked(&cws->inserted), cws->executed,
70144 tsk->comm);
70145 put_task_struct(tsk);
70146 }
70147diff --git a/lib/Kconfig.debug b/lib/Kconfig.debug
70148index 82928f5..92da771 100644
70149--- a/lib/Kconfig.debug
70150+++ b/lib/Kconfig.debug
70151@@ -1103,6 +1103,7 @@ config LATENCYTOP
70152 depends on DEBUG_KERNEL
70153 depends on STACKTRACE_SUPPORT
70154 depends on PROC_FS
70155+ depends on !GRKERNSEC_HIDESYM
70156 select FRAME_POINTER if !MIPS && !PPC && !S390 && !MICROBLAZE && !ARM_UNWIND
70157 select KALLSYMS
70158 select KALLSYMS_ALL
70159diff --git a/lib/bitmap.c b/lib/bitmap.c
70160index 0d4a127..33a06c7 100644
70161--- a/lib/bitmap.c
70162+++ b/lib/bitmap.c
70163@@ -419,7 +419,7 @@ int __bitmap_parse(const char *buf, unsigned int buflen,
70164 {
70165 int c, old_c, totaldigits, ndigits, nchunks, nbits;
70166 u32 chunk;
70167- const char __user __force *ubuf = (const char __user __force *)buf;
70168+ const char __user *ubuf = (const char __force_user *)buf;
70169
70170 bitmap_zero(maskp, nmaskbits);
70171
70172@@ -504,7 +504,7 @@ int bitmap_parse_user(const char __user *ubuf,
70173 {
70174 if (!access_ok(VERIFY_READ, ubuf, ulen))
70175 return -EFAULT;
70176- return __bitmap_parse((const char __force *)ubuf,
70177+ return __bitmap_parse((const char __force_kernel *)ubuf,
70178 ulen, 1, maskp, nmaskbits);
70179
70180 }
70181@@ -596,7 +596,7 @@ static int __bitmap_parselist(const char *buf, unsigned int buflen,
70182 {
70183 unsigned a, b;
70184 int c, old_c, totaldigits;
70185- const char __user __force *ubuf = (const char __user __force *)buf;
70186+ const char __user *ubuf = (const char __force_user *)buf;
70187 int exp_digit, in_range;
70188
70189 totaldigits = c = 0;
70190@@ -696,7 +696,7 @@ int bitmap_parselist_user(const char __user *ubuf,
70191 {
70192 if (!access_ok(VERIFY_READ, ubuf, ulen))
70193 return -EFAULT;
70194- return __bitmap_parselist((const char __force *)ubuf,
70195+ return __bitmap_parselist((const char __force_kernel *)ubuf,
70196 ulen, 1, maskp, nmaskbits);
70197 }
70198 EXPORT_SYMBOL(bitmap_parselist_user);
70199diff --git a/lib/bug.c b/lib/bug.c
70200index 1955209..cbbb2ad 100644
70201--- a/lib/bug.c
70202+++ b/lib/bug.c
70203@@ -133,6 +133,8 @@ enum bug_trap_type report_bug(unsigned long bugaddr, struct pt_regs *regs)
70204 return BUG_TRAP_TYPE_NONE;
70205
70206 bug = find_bug(bugaddr);
70207+ if (!bug)
70208+ return BUG_TRAP_TYPE_NONE;
70209
70210 file = NULL;
70211 line = 0;
70212diff --git a/lib/debugobjects.c b/lib/debugobjects.c
70213index a78b7c6..2c73084 100644
70214--- a/lib/debugobjects.c
70215+++ b/lib/debugobjects.c
70216@@ -284,7 +284,7 @@ static void debug_object_is_on_stack(void *addr, int onstack)
70217 if (limit > 4)
70218 return;
70219
70220- is_on_stack = object_is_on_stack(addr);
70221+ is_on_stack = object_starts_on_stack(addr);
70222 if (is_on_stack == onstack)
70223 return;
70224
70225diff --git a/lib/devres.c b/lib/devres.c
70226index 7c0e953..f642b5c 100644
70227--- a/lib/devres.c
70228+++ b/lib/devres.c
70229@@ -80,7 +80,7 @@ EXPORT_SYMBOL(devm_ioremap_nocache);
70230 void devm_iounmap(struct device *dev, void __iomem *addr)
70231 {
70232 WARN_ON(devres_destroy(dev, devm_ioremap_release, devm_ioremap_match,
70233- (void *)addr));
70234+ (void __force *)addr));
70235 iounmap(addr);
70236 }
70237 EXPORT_SYMBOL(devm_iounmap);
70238@@ -141,7 +141,7 @@ void devm_ioport_unmap(struct device *dev, void __iomem *addr)
70239 {
70240 ioport_unmap(addr);
70241 WARN_ON(devres_destroy(dev, devm_ioport_map_release,
70242- devm_ioport_map_match, (void *)addr));
70243+ devm_ioport_map_match, (void __force *)addr));
70244 }
70245 EXPORT_SYMBOL(devm_ioport_unmap);
70246
70247diff --git a/lib/dma-debug.c b/lib/dma-debug.c
70248index fea790a..ebb0e82 100644
70249--- a/lib/dma-debug.c
70250+++ b/lib/dma-debug.c
70251@@ -925,7 +925,7 @@ out:
70252
70253 static void check_for_stack(struct device *dev, void *addr)
70254 {
70255- if (object_is_on_stack(addr))
70256+ if (object_starts_on_stack(addr))
70257 err_printk(dev, NULL, "DMA-API: device driver maps memory from"
70258 "stack [addr=%p]\n", addr);
70259 }
70260diff --git a/lib/extable.c b/lib/extable.c
70261index 4cac81e..63e9b8f 100644
70262--- a/lib/extable.c
70263+++ b/lib/extable.c
70264@@ -13,6 +13,7 @@
70265 #include <linux/init.h>
70266 #include <linux/sort.h>
70267 #include <asm/uaccess.h>
70268+#include <asm/pgtable.h>
70269
70270 #ifndef ARCH_HAS_SORT_EXTABLE
70271 /*
70272@@ -36,8 +37,10 @@ static int cmp_ex(const void *a, const void *b)
70273 void sort_extable(struct exception_table_entry *start,
70274 struct exception_table_entry *finish)
70275 {
70276+ pax_open_kernel();
70277 sort(start, finish - start, sizeof(struct exception_table_entry),
70278 cmp_ex, NULL);
70279+ pax_close_kernel();
70280 }
70281
70282 #ifdef CONFIG_MODULES
70283diff --git a/lib/inflate.c b/lib/inflate.c
70284index 013a761..c28f3fc 100644
70285--- a/lib/inflate.c
70286+++ b/lib/inflate.c
70287@@ -269,7 +269,7 @@ static void free(void *where)
70288 malloc_ptr = free_mem_ptr;
70289 }
70290 #else
70291-#define malloc(a) kmalloc(a, GFP_KERNEL)
70292+#define malloc(a) kmalloc((a), GFP_KERNEL)
70293 #define free(a) kfree(a)
70294 #endif
70295
70296diff --git a/lib/is_single_threaded.c b/lib/is_single_threaded.c
70297index bd2bea9..6b3c95e 100644
70298--- a/lib/is_single_threaded.c
70299+++ b/lib/is_single_threaded.c
70300@@ -22,6 +22,9 @@ bool current_is_single_threaded(void)
70301 struct task_struct *p, *t;
70302 bool ret;
70303
70304+ if (!mm)
70305+ return true;
70306+
70307 if (atomic_read(&task->signal->live) != 1)
70308 return false;
70309
70310diff --git a/lib/kref.c b/lib/kref.c
70311index 3efb882..8492f4c 100644
70312--- a/lib/kref.c
70313+++ b/lib/kref.c
70314@@ -52,7 +52,7 @@ void kref_get(struct kref *kref)
70315 */
70316 int kref_put(struct kref *kref, void (*release)(struct kref *kref))
70317 {
70318- WARN_ON(release == NULL);
70319+ BUG_ON(release == NULL);
70320 WARN_ON(release == (void (*)(struct kref *))kfree);
70321
70322 if (atomic_dec_and_test(&kref->refcount)) {
70323diff --git a/lib/radix-tree.c b/lib/radix-tree.c
70324index d9df745..e73c2fe 100644
70325--- a/lib/radix-tree.c
70326+++ b/lib/radix-tree.c
70327@@ -80,7 +80,7 @@ struct radix_tree_preload {
70328 int nr;
70329 struct radix_tree_node *nodes[RADIX_TREE_MAX_PATH];
70330 };
70331-static DEFINE_PER_CPU(struct radix_tree_preload, radix_tree_preloads) = { 0, };
70332+static DEFINE_PER_CPU(struct radix_tree_preload, radix_tree_preloads);
70333
70334 static inline void *ptr_to_indirect(void *ptr)
70335 {
70336diff --git a/lib/vsprintf.c b/lib/vsprintf.c
70337index 993599e..f1dbc14 100644
70338--- a/lib/vsprintf.c
70339+++ b/lib/vsprintf.c
70340@@ -16,6 +16,9 @@
70341 * - scnprintf and vscnprintf
70342 */
70343
70344+#ifdef CONFIG_GRKERNSEC_HIDESYM
70345+#define __INCLUDED_BY_HIDESYM 1
70346+#endif
70347 #include <stdarg.h>
70348 #include <linux/module.h>
70349 #include <linux/types.h>
70350@@ -413,7 +416,7 @@ char *symbol_string(char *buf, char *end, void *ptr,
70351 char sym[KSYM_SYMBOL_LEN];
70352 if (ext == 'B')
70353 sprint_backtrace(sym, value);
70354- else if (ext != 'f' && ext != 's')
70355+ else if (ext != 'f' && ext != 's' && ext != 'a')
70356 sprint_symbol(sym, value);
70357 else
70358 kallsyms_lookup(value, NULL, NULL, NULL, sym);
70359@@ -777,7 +780,11 @@ char *uuid_string(char *buf, char *end, const u8 *addr,
70360 return string(buf, end, uuid, spec);
70361 }
70362
70363+#ifdef CONFIG_GRKERNSEC_HIDESYM
70364+int kptr_restrict __read_mostly = 2;
70365+#else
70366 int kptr_restrict __read_mostly;
70367+#endif
70368
70369 /*
70370 * Show a '%p' thing. A kernel extension is that the '%p' is followed
70371@@ -791,6 +798,8 @@ int kptr_restrict __read_mostly;
70372 * - 'S' For symbolic direct pointers with offset
70373 * - 's' For symbolic direct pointers without offset
70374 * - 'B' For backtraced symbolic direct pointers with offset
70375+ * - 'A' For symbolic direct pointers with offset approved for use with GRKERNSEC_HIDESYM
70376+ * - 'a' For symbolic direct pointers without offset approved for use with GRKERNSEC_HIDESYM
70377 * - 'R' For decoded struct resource, e.g., [mem 0x0-0x1f 64bit pref]
70378 * - 'r' For raw struct resource, e.g., [mem 0x0-0x1f flags 0x201]
70379 * - 'M' For a 6-byte MAC address, it prints the address in the
70380@@ -835,12 +844,12 @@ char *pointer(const char *fmt, char *buf, char *end, void *ptr,
70381 {
70382 if (!ptr && *fmt != 'K') {
70383 /*
70384- * Print (null) with the same width as a pointer so it makes
70385+ * Print (nil) with the same width as a pointer so it makes
70386 * tabular output look nice.
70387 */
70388 if (spec.field_width == -1)
70389 spec.field_width = 2 * sizeof(void *);
70390- return string(buf, end, "(null)", spec);
70391+ return string(buf, end, "(nil)", spec);
70392 }
70393
70394 switch (*fmt) {
70395@@ -850,6 +859,13 @@ char *pointer(const char *fmt, char *buf, char *end, void *ptr,
70396 /* Fallthrough */
70397 case 'S':
70398 case 's':
70399+#ifdef CONFIG_GRKERNSEC_HIDESYM
70400+ break;
70401+#else
70402+ return symbol_string(buf, end, ptr, spec, *fmt);
70403+#endif
70404+ case 'A':
70405+ case 'a':
70406 case 'B':
70407 return symbol_string(buf, end, ptr, spec, *fmt);
70408 case 'R':
70409@@ -878,9 +894,15 @@ char *pointer(const char *fmt, char *buf, char *end, void *ptr,
70410 case 'U':
70411 return uuid_string(buf, end, ptr, spec, fmt);
70412 case 'V':
70413- return buf + vsnprintf(buf, end > buf ? end - buf : 0,
70414- ((struct va_format *)ptr)->fmt,
70415- *(((struct va_format *)ptr)->va));
70416+ {
70417+ va_list va;
70418+
70419+ va_copy(va, *((struct va_format *)ptr)->va);
70420+ buf += vsnprintf(buf, end > buf ? end - buf : 0,
70421+ ((struct va_format *)ptr)->fmt, va);
70422+ va_end(va);
70423+ return buf;
70424+ }
70425 case 'K':
70426 /*
70427 * %pK cannot be used in IRQ context because its test
70428@@ -1608,11 +1630,11 @@ int bstr_printf(char *buf, size_t size, const char *fmt, const u32 *bin_buf)
70429 typeof(type) value; \
70430 if (sizeof(type) == 8) { \
70431 args = PTR_ALIGN(args, sizeof(u32)); \
70432- *(u32 *)&value = *(u32 *)args; \
70433- *((u32 *)&value + 1) = *(u32 *)(args + 4); \
70434+ *(u32 *)&value = *(const u32 *)args; \
70435+ *((u32 *)&value + 1) = *(const u32 *)(args + 4); \
70436 } else { \
70437 args = PTR_ALIGN(args, sizeof(type)); \
70438- value = *(typeof(type) *)args; \
70439+ value = *(const typeof(type) *)args; \
70440 } \
70441 args += sizeof(type); \
70442 value; \
70443@@ -1675,7 +1697,7 @@ int bstr_printf(char *buf, size_t size, const char *fmt, const u32 *bin_buf)
70444 case FORMAT_TYPE_STR: {
70445 const char *str_arg = args;
70446 args += strlen(str_arg) + 1;
70447- str = string(str, end, (char *)str_arg, spec);
70448+ str = string(str, end, str_arg, spec);
70449 break;
70450 }
70451
70452diff --git a/localversion-grsec b/localversion-grsec
70453new file mode 100644
70454index 0000000..7cd6065
70455--- /dev/null
70456+++ b/localversion-grsec
70457@@ -0,0 +1 @@
70458+-grsec
70459diff --git a/mm/Kconfig b/mm/Kconfig
70460index 011b110..b492af2 100644
70461--- a/mm/Kconfig
70462+++ b/mm/Kconfig
70463@@ -241,10 +241,10 @@ config KSM
70464 root has set /sys/kernel/mm/ksm/run to 1 (if CONFIG_SYSFS is set).
70465
70466 config DEFAULT_MMAP_MIN_ADDR
70467- int "Low address space to protect from user allocation"
70468+ int "Low address space to protect from user allocation"
70469 depends on MMU
70470- default 4096
70471- help
70472+ default 65536
70473+ help
70474 This is the portion of low virtual memory which should be protected
70475 from userspace allocation. Keeping a user from writing to low pages
70476 can help reduce the impact of kernel NULL pointer bugs.
70477diff --git a/mm/filemap.c b/mm/filemap.c
70478index 03c5b0e..a01e793 100644
70479--- a/mm/filemap.c
70480+++ b/mm/filemap.c
70481@@ -1770,7 +1770,7 @@ int generic_file_mmap(struct file * file, struct vm_area_struct * vma)
70482 struct address_space *mapping = file->f_mapping;
70483
70484 if (!mapping->a_ops->readpage)
70485- return -ENOEXEC;
70486+ return -ENODEV;
70487 file_accessed(file);
70488 vma->vm_ops = &generic_file_vm_ops;
70489 vma->vm_flags |= VM_CAN_NONLINEAR;
70490@@ -2176,6 +2176,7 @@ inline int generic_write_checks(struct file *file, loff_t *pos, size_t *count, i
70491 *pos = i_size_read(inode);
70492
70493 if (limit != RLIM_INFINITY) {
70494+ gr_learn_resource(current, RLIMIT_FSIZE,*pos, 0);
70495 if (*pos >= limit) {
70496 send_sig(SIGXFSZ, current, 0);
70497 return -EFBIG;
70498diff --git a/mm/fremap.c b/mm/fremap.c
70499index 9ed4fd4..c42648d 100644
70500--- a/mm/fremap.c
70501+++ b/mm/fremap.c
70502@@ -155,6 +155,11 @@ SYSCALL_DEFINE5(remap_file_pages, unsigned long, start, unsigned long, size,
70503 retry:
70504 vma = find_vma(mm, start);
70505
70506+#ifdef CONFIG_PAX_SEGMEXEC
70507+ if (vma && (mm->pax_flags & MF_PAX_SEGMEXEC) && (vma->vm_flags & VM_MAYEXEC))
70508+ goto out;
70509+#endif
70510+
70511 /*
70512 * Make sure the vma is shared, that it supports prefaulting,
70513 * and that the remapped range is valid and fully within
70514diff --git a/mm/highmem.c b/mm/highmem.c
70515index 57d82c6..e9e0552 100644
70516--- a/mm/highmem.c
70517+++ b/mm/highmem.c
70518@@ -125,9 +125,10 @@ static void flush_all_zero_pkmaps(void)
70519 * So no dangers, even with speculative execution.
70520 */
70521 page = pte_page(pkmap_page_table[i]);
70522+ pax_open_kernel();
70523 pte_clear(&init_mm, (unsigned long)page_address(page),
70524 &pkmap_page_table[i]);
70525-
70526+ pax_close_kernel();
70527 set_page_address(page, NULL);
70528 need_flush = 1;
70529 }
70530@@ -186,9 +187,11 @@ start:
70531 }
70532 }
70533 vaddr = PKMAP_ADDR(last_pkmap_nr);
70534+
70535+ pax_open_kernel();
70536 set_pte_at(&init_mm, vaddr,
70537 &(pkmap_page_table[last_pkmap_nr]), mk_pte(page, kmap_prot));
70538-
70539+ pax_close_kernel();
70540 pkmap_count[last_pkmap_nr] = 1;
70541 set_page_address(page, (void *)vaddr);
70542
70543diff --git a/mm/huge_memory.c b/mm/huge_memory.c
70544index 8f005e9..1cb1036 100644
70545--- a/mm/huge_memory.c
70546+++ b/mm/huge_memory.c
70547@@ -704,7 +704,7 @@ out:
70548 * run pte_offset_map on the pmd, if an huge pmd could
70549 * materialize from under us from a different thread.
70550 */
70551- if (unlikely(__pte_alloc(mm, vma, pmd, address)))
70552+ if (unlikely(pmd_none(*pmd) && __pte_alloc(mm, vma, pmd, address)))
70553 return VM_FAULT_OOM;
70554 /* if an huge pmd materialized from under us just retry later */
70555 if (unlikely(pmd_trans_huge(*pmd)))
70556diff --git a/mm/hugetlb.c b/mm/hugetlb.c
70557index 2316840..b418671 100644
70558--- a/mm/hugetlb.c
70559+++ b/mm/hugetlb.c
70560@@ -2347,6 +2347,27 @@ static int unmap_ref_private(struct mm_struct *mm, struct vm_area_struct *vma,
70561 return 1;
70562 }
70563
70564+#ifdef CONFIG_PAX_SEGMEXEC
70565+static void pax_mirror_huge_pte(struct vm_area_struct *vma, unsigned long address, struct page *page_m)
70566+{
70567+ struct mm_struct *mm = vma->vm_mm;
70568+ struct vm_area_struct *vma_m;
70569+ unsigned long address_m;
70570+ pte_t *ptep_m;
70571+
70572+ vma_m = pax_find_mirror_vma(vma);
70573+ if (!vma_m)
70574+ return;
70575+
70576+ BUG_ON(address >= SEGMEXEC_TASK_SIZE);
70577+ address_m = address + SEGMEXEC_TASK_SIZE;
70578+ ptep_m = huge_pte_offset(mm, address_m & HPAGE_MASK);
70579+ get_page(page_m);
70580+ hugepage_add_anon_rmap(page_m, vma_m, address_m);
70581+ set_huge_pte_at(mm, address_m, ptep_m, make_huge_pte(vma_m, page_m, 0));
70582+}
70583+#endif
70584+
70585 /*
70586 * Hugetlb_cow() should be called with page lock of the original hugepage held.
70587 */
70588@@ -2450,6 +2471,11 @@ retry_avoidcopy:
70589 make_huge_pte(vma, new_page, 1));
70590 page_remove_rmap(old_page);
70591 hugepage_add_new_anon_rmap(new_page, vma, address);
70592+
70593+#ifdef CONFIG_PAX_SEGMEXEC
70594+ pax_mirror_huge_pte(vma, address, new_page);
70595+#endif
70596+
70597 /* Make the old page be freed below */
70598 new_page = old_page;
70599 mmu_notifier_invalidate_range_end(mm,
70600@@ -2601,6 +2627,10 @@ retry:
70601 && (vma->vm_flags & VM_SHARED)));
70602 set_huge_pte_at(mm, address, ptep, new_pte);
70603
70604+#ifdef CONFIG_PAX_SEGMEXEC
70605+ pax_mirror_huge_pte(vma, address, page);
70606+#endif
70607+
70608 if ((flags & FAULT_FLAG_WRITE) && !(vma->vm_flags & VM_SHARED)) {
70609 /* Optimization, do the COW without a second fault */
70610 ret = hugetlb_cow(mm, vma, address, ptep, new_pte, page);
70611@@ -2630,6 +2660,10 @@ int hugetlb_fault(struct mm_struct *mm, struct vm_area_struct *vma,
70612 static DEFINE_MUTEX(hugetlb_instantiation_mutex);
70613 struct hstate *h = hstate_vma(vma);
70614
70615+#ifdef CONFIG_PAX_SEGMEXEC
70616+ struct vm_area_struct *vma_m;
70617+#endif
70618+
70619 ptep = huge_pte_offset(mm, address);
70620 if (ptep) {
70621 entry = huge_ptep_get(ptep);
70622@@ -2641,6 +2675,26 @@ int hugetlb_fault(struct mm_struct *mm, struct vm_area_struct *vma,
70623 VM_FAULT_SET_HINDEX(h - hstates);
70624 }
70625
70626+#ifdef CONFIG_PAX_SEGMEXEC
70627+ vma_m = pax_find_mirror_vma(vma);
70628+ if (vma_m) {
70629+ unsigned long address_m;
70630+
70631+ if (vma->vm_start > vma_m->vm_start) {
70632+ address_m = address;
70633+ address -= SEGMEXEC_TASK_SIZE;
70634+ vma = vma_m;
70635+ h = hstate_vma(vma);
70636+ } else
70637+ address_m = address + SEGMEXEC_TASK_SIZE;
70638+
70639+ if (!huge_pte_alloc(mm, address_m, huge_page_size(h)))
70640+ return VM_FAULT_OOM;
70641+ address_m &= HPAGE_MASK;
70642+ unmap_hugepage_range(vma, address_m, address_m + HPAGE_SIZE, NULL);
70643+ }
70644+#endif
70645+
70646 ptep = huge_pte_alloc(mm, address, huge_page_size(h));
70647 if (!ptep)
70648 return VM_FAULT_OOM;
70649diff --git a/mm/internal.h b/mm/internal.h
70650index 2189af4..f2ca332 100644
70651--- a/mm/internal.h
70652+++ b/mm/internal.h
70653@@ -95,6 +95,7 @@ extern void putback_lru_page(struct page *page);
70654 * in mm/page_alloc.c
70655 */
70656 extern void __free_pages_bootmem(struct page *page, unsigned int order);
70657+extern void free_compound_page(struct page *page);
70658 extern void prep_compound_page(struct page *page, unsigned long order);
70659 #ifdef CONFIG_MEMORY_FAILURE
70660 extern bool is_free_buddy_page(struct page *page);
70661diff --git a/mm/kmemleak.c b/mm/kmemleak.c
70662index f3b2a00..61da94d 100644
70663--- a/mm/kmemleak.c
70664+++ b/mm/kmemleak.c
70665@@ -357,7 +357,7 @@ static void print_unreferenced(struct seq_file *seq,
70666
70667 for (i = 0; i < object->trace_len; i++) {
70668 void *ptr = (void *)object->trace[i];
70669- seq_printf(seq, " [<%p>] %pS\n", ptr, ptr);
70670+ seq_printf(seq, " [<%p>] %pA\n", ptr, ptr);
70671 }
70672 }
70673
70674diff --git a/mm/maccess.c b/mm/maccess.c
70675index d53adf9..03a24bf 100644
70676--- a/mm/maccess.c
70677+++ b/mm/maccess.c
70678@@ -26,7 +26,7 @@ long __probe_kernel_read(void *dst, const void *src, size_t size)
70679 set_fs(KERNEL_DS);
70680 pagefault_disable();
70681 ret = __copy_from_user_inatomic(dst,
70682- (__force const void __user *)src, size);
70683+ (const void __force_user *)src, size);
70684 pagefault_enable();
70685 set_fs(old_fs);
70686
70687@@ -53,7 +53,7 @@ long __probe_kernel_write(void *dst, const void *src, size_t size)
70688
70689 set_fs(KERNEL_DS);
70690 pagefault_disable();
70691- ret = __copy_to_user_inatomic((__force void __user *)dst, src, size);
70692+ ret = __copy_to_user_inatomic((void __force_user *)dst, src, size);
70693 pagefault_enable();
70694 set_fs(old_fs);
70695
70696diff --git a/mm/madvise.c b/mm/madvise.c
70697index 74bf193..feb6fd3 100644
70698--- a/mm/madvise.c
70699+++ b/mm/madvise.c
70700@@ -45,6 +45,10 @@ static long madvise_behavior(struct vm_area_struct * vma,
70701 pgoff_t pgoff;
70702 unsigned long new_flags = vma->vm_flags;
70703
70704+#ifdef CONFIG_PAX_SEGMEXEC
70705+ struct vm_area_struct *vma_m;
70706+#endif
70707+
70708 switch (behavior) {
70709 case MADV_NORMAL:
70710 new_flags = new_flags & ~VM_RAND_READ & ~VM_SEQ_READ;
70711@@ -110,6 +114,13 @@ success:
70712 /*
70713 * vm_flags is protected by the mmap_sem held in write mode.
70714 */
70715+
70716+#ifdef CONFIG_PAX_SEGMEXEC
70717+ vma_m = pax_find_mirror_vma(vma);
70718+ if (vma_m)
70719+ vma_m->vm_flags = new_flags & ~(VM_WRITE | VM_MAYWRITE | VM_ACCOUNT);
70720+#endif
70721+
70722 vma->vm_flags = new_flags;
70723
70724 out:
70725@@ -168,6 +179,11 @@ static long madvise_dontneed(struct vm_area_struct * vma,
70726 struct vm_area_struct ** prev,
70727 unsigned long start, unsigned long end)
70728 {
70729+
70730+#ifdef CONFIG_PAX_SEGMEXEC
70731+ struct vm_area_struct *vma_m;
70732+#endif
70733+
70734 *prev = vma;
70735 if (vma->vm_flags & (VM_LOCKED|VM_HUGETLB|VM_PFNMAP))
70736 return -EINVAL;
70737@@ -180,6 +196,21 @@ static long madvise_dontneed(struct vm_area_struct * vma,
70738 zap_page_range(vma, start, end - start, &details);
70739 } else
70740 zap_page_range(vma, start, end - start, NULL);
70741+
70742+#ifdef CONFIG_PAX_SEGMEXEC
70743+ vma_m = pax_find_mirror_vma(vma);
70744+ if (vma_m) {
70745+ if (unlikely(vma->vm_flags & VM_NONLINEAR)) {
70746+ struct zap_details details = {
70747+ .nonlinear_vma = vma_m,
70748+ .last_index = ULONG_MAX,
70749+ };
70750+ zap_page_range(vma, start + SEGMEXEC_TASK_SIZE, end - start, &details);
70751+ } else
70752+ zap_page_range(vma, start + SEGMEXEC_TASK_SIZE, end - start, NULL);
70753+ }
70754+#endif
70755+
70756 return 0;
70757 }
70758
70759@@ -376,6 +407,16 @@ SYSCALL_DEFINE3(madvise, unsigned long, start, size_t, len_in, int, behavior)
70760 if (end < start)
70761 goto out;
70762
70763+#ifdef CONFIG_PAX_SEGMEXEC
70764+ if (current->mm->pax_flags & MF_PAX_SEGMEXEC) {
70765+ if (end > SEGMEXEC_TASK_SIZE)
70766+ goto out;
70767+ } else
70768+#endif
70769+
70770+ if (end > TASK_SIZE)
70771+ goto out;
70772+
70773 error = 0;
70774 if (end == start)
70775 goto out;
70776diff --git a/mm/memory-failure.c b/mm/memory-failure.c
70777index 06d3479..0778eef 100644
70778--- a/mm/memory-failure.c
70779+++ b/mm/memory-failure.c
70780@@ -61,7 +61,7 @@ int sysctl_memory_failure_early_kill __read_mostly = 0;
70781
70782 int sysctl_memory_failure_recovery __read_mostly = 1;
70783
70784-atomic_long_t mce_bad_pages __read_mostly = ATOMIC_LONG_INIT(0);
70785+atomic_long_unchecked_t mce_bad_pages __read_mostly = ATOMIC_LONG_INIT(0);
70786
70787 #if defined(CONFIG_HWPOISON_INJECT) || defined(CONFIG_HWPOISON_INJECT_MODULE)
70788
70789@@ -202,7 +202,7 @@ static int kill_proc_ao(struct task_struct *t, unsigned long addr, int trapno,
70790 si.si_signo = SIGBUS;
70791 si.si_errno = 0;
70792 si.si_code = BUS_MCEERR_AO;
70793- si.si_addr = (void *)addr;
70794+ si.si_addr = (void __user *)addr;
70795 #ifdef __ARCH_SI_TRAPNO
70796 si.si_trapno = trapno;
70797 #endif
70798@@ -1010,7 +1010,7 @@ int __memory_failure(unsigned long pfn, int trapno, int flags)
70799 }
70800
70801 nr_pages = 1 << compound_trans_order(hpage);
70802- atomic_long_add(nr_pages, &mce_bad_pages);
70803+ atomic_long_add_unchecked(nr_pages, &mce_bad_pages);
70804
70805 /*
70806 * We need/can do nothing about count=0 pages.
70807@@ -1040,7 +1040,7 @@ int __memory_failure(unsigned long pfn, int trapno, int flags)
70808 if (!PageHWPoison(hpage)
70809 || (hwpoison_filter(p) && TestClearPageHWPoison(p))
70810 || (p != hpage && TestSetPageHWPoison(hpage))) {
70811- atomic_long_sub(nr_pages, &mce_bad_pages);
70812+ atomic_long_sub_unchecked(nr_pages, &mce_bad_pages);
70813 return 0;
70814 }
70815 set_page_hwpoison_huge_page(hpage);
70816@@ -1098,7 +1098,7 @@ int __memory_failure(unsigned long pfn, int trapno, int flags)
70817 }
70818 if (hwpoison_filter(p)) {
70819 if (TestClearPageHWPoison(p))
70820- atomic_long_sub(nr_pages, &mce_bad_pages);
70821+ atomic_long_sub_unchecked(nr_pages, &mce_bad_pages);
70822 unlock_page(hpage);
70823 put_page(hpage);
70824 return 0;
70825@@ -1315,7 +1315,7 @@ int unpoison_memory(unsigned long pfn)
70826 return 0;
70827 }
70828 if (TestClearPageHWPoison(p))
70829- atomic_long_sub(nr_pages, &mce_bad_pages);
70830+ atomic_long_sub_unchecked(nr_pages, &mce_bad_pages);
70831 pr_info("MCE: Software-unpoisoned free page %#lx\n", pfn);
70832 return 0;
70833 }
70834@@ -1329,7 +1329,7 @@ int unpoison_memory(unsigned long pfn)
70835 */
70836 if (TestClearPageHWPoison(page)) {
70837 pr_info("MCE: Software-unpoisoned page %#lx\n", pfn);
70838- atomic_long_sub(nr_pages, &mce_bad_pages);
70839+ atomic_long_sub_unchecked(nr_pages, &mce_bad_pages);
70840 freeit = 1;
70841 if (PageHuge(page))
70842 clear_page_hwpoison_huge_page(page);
70843@@ -1442,7 +1442,7 @@ static int soft_offline_huge_page(struct page *page, int flags)
70844 }
70845 done:
70846 if (!PageHWPoison(hpage))
70847- atomic_long_add(1 << compound_trans_order(hpage), &mce_bad_pages);
70848+ atomic_long_add_unchecked(1 << compound_trans_order(hpage), &mce_bad_pages);
70849 set_page_hwpoison_huge_page(hpage);
70850 dequeue_hwpoisoned_huge_page(hpage);
70851 /* keep elevated page count for bad page */
70852@@ -1573,7 +1573,7 @@ int soft_offline_page(struct page *page, int flags)
70853 return ret;
70854
70855 done:
70856- atomic_long_add(1, &mce_bad_pages);
70857+ atomic_long_add_unchecked(1, &mce_bad_pages);
70858 SetPageHWPoison(page);
70859 /* keep elevated page count for bad page */
70860 return ret;
70861diff --git a/mm/memory.c b/mm/memory.c
70862index 829d437..3d3926a 100644
70863--- a/mm/memory.c
70864+++ b/mm/memory.c
70865@@ -457,8 +457,12 @@ static inline void free_pmd_range(struct mmu_gather *tlb, pud_t *pud,
70866 return;
70867
70868 pmd = pmd_offset(pud, start);
70869+
70870+#if !defined(CONFIG_X86_32) || !defined(CONFIG_PAX_PER_CPU_PGD)
70871 pud_clear(pud);
70872 pmd_free_tlb(tlb, pmd, start);
70873+#endif
70874+
70875 }
70876
70877 static inline void free_pud_range(struct mmu_gather *tlb, pgd_t *pgd,
70878@@ -489,9 +493,12 @@ static inline void free_pud_range(struct mmu_gather *tlb, pgd_t *pgd,
70879 if (end - 1 > ceiling - 1)
70880 return;
70881
70882+#if !defined(CONFIG_X86_64) || !defined(CONFIG_PAX_PER_CPU_PGD)
70883 pud = pud_offset(pgd, start);
70884 pgd_clear(pgd);
70885 pud_free_tlb(tlb, pud, start);
70886+#endif
70887+
70888 }
70889
70890 /*
70891@@ -1566,12 +1573,6 @@ no_page_table:
70892 return page;
70893 }
70894
70895-static inline int stack_guard_page(struct vm_area_struct *vma, unsigned long addr)
70896-{
70897- return stack_guard_page_start(vma, addr) ||
70898- stack_guard_page_end(vma, addr+PAGE_SIZE);
70899-}
70900-
70901 /**
70902 * __get_user_pages() - pin user pages in memory
70903 * @tsk: task_struct of target task
70904@@ -1644,10 +1645,10 @@ int __get_user_pages(struct task_struct *tsk, struct mm_struct *mm,
70905 (VM_MAYREAD | VM_MAYWRITE) : (VM_READ | VM_WRITE);
70906 i = 0;
70907
70908- do {
70909+ while (nr_pages) {
70910 struct vm_area_struct *vma;
70911
70912- vma = find_extend_vma(mm, start);
70913+ vma = find_vma(mm, start);
70914 if (!vma && in_gate_area(mm, start)) {
70915 unsigned long pg = start & PAGE_MASK;
70916 pgd_t *pgd;
70917@@ -1695,7 +1696,7 @@ int __get_user_pages(struct task_struct *tsk, struct mm_struct *mm,
70918 goto next_page;
70919 }
70920
70921- if (!vma ||
70922+ if (!vma || start < vma->vm_start ||
70923 (vma->vm_flags & (VM_IO | VM_PFNMAP)) ||
70924 !(vm_flags & vma->vm_flags))
70925 return i ? : -EFAULT;
70926@@ -1722,11 +1723,6 @@ int __get_user_pages(struct task_struct *tsk, struct mm_struct *mm,
70927 int ret;
70928 unsigned int fault_flags = 0;
70929
70930- /* For mlock, just skip the stack guard page. */
70931- if (foll_flags & FOLL_MLOCK) {
70932- if (stack_guard_page(vma, start))
70933- goto next_page;
70934- }
70935 if (foll_flags & FOLL_WRITE)
70936 fault_flags |= FAULT_FLAG_WRITE;
70937 if (nonblocking)
70938@@ -1800,7 +1796,7 @@ next_page:
70939 start += PAGE_SIZE;
70940 nr_pages--;
70941 } while (nr_pages && start < vma->vm_end);
70942- } while (nr_pages);
70943+ }
70944 return i;
70945 }
70946 EXPORT_SYMBOL(__get_user_pages);
70947@@ -2007,6 +2003,10 @@ static int insert_page(struct vm_area_struct *vma, unsigned long addr,
70948 page_add_file_rmap(page);
70949 set_pte_at(mm, addr, pte, mk_pte(page, prot));
70950
70951+#ifdef CONFIG_PAX_SEGMEXEC
70952+ pax_mirror_file_pte(vma, addr, page, ptl);
70953+#endif
70954+
70955 retval = 0;
70956 pte_unmap_unlock(pte, ptl);
70957 return retval;
70958@@ -2041,10 +2041,22 @@ out:
70959 int vm_insert_page(struct vm_area_struct *vma, unsigned long addr,
70960 struct page *page)
70961 {
70962+
70963+#ifdef CONFIG_PAX_SEGMEXEC
70964+ struct vm_area_struct *vma_m;
70965+#endif
70966+
70967 if (addr < vma->vm_start || addr >= vma->vm_end)
70968 return -EFAULT;
70969 if (!page_count(page))
70970 return -EINVAL;
70971+
70972+#ifdef CONFIG_PAX_SEGMEXEC
70973+ vma_m = pax_find_mirror_vma(vma);
70974+ if (vma_m)
70975+ vma_m->vm_flags |= VM_INSERTPAGE;
70976+#endif
70977+
70978 vma->vm_flags |= VM_INSERTPAGE;
70979 return insert_page(vma, addr, page, vma->vm_page_prot);
70980 }
70981@@ -2130,6 +2142,7 @@ int vm_insert_mixed(struct vm_area_struct *vma, unsigned long addr,
70982 unsigned long pfn)
70983 {
70984 BUG_ON(!(vma->vm_flags & VM_MIXEDMAP));
70985+ BUG_ON(vma->vm_mirror);
70986
70987 if (addr < vma->vm_start || addr >= vma->vm_end)
70988 return -EFAULT;
70989@@ -2445,6 +2458,186 @@ static inline void cow_user_page(struct page *dst, struct page *src, unsigned lo
70990 copy_user_highpage(dst, src, va, vma);
70991 }
70992
70993+#ifdef CONFIG_PAX_SEGMEXEC
70994+static void pax_unmap_mirror_pte(struct vm_area_struct *vma, unsigned long address, pmd_t *pmd)
70995+{
70996+ struct mm_struct *mm = vma->vm_mm;
70997+ spinlock_t *ptl;
70998+ pte_t *pte, entry;
70999+
71000+ pte = pte_offset_map_lock(mm, pmd, address, &ptl);
71001+ entry = *pte;
71002+ if (!pte_present(entry)) {
71003+ if (!pte_none(entry)) {
71004+ BUG_ON(pte_file(entry));
71005+ free_swap_and_cache(pte_to_swp_entry(entry));
71006+ pte_clear_not_present_full(mm, address, pte, 0);
71007+ }
71008+ } else {
71009+ struct page *page;
71010+
71011+ flush_cache_page(vma, address, pte_pfn(entry));
71012+ entry = ptep_clear_flush(vma, address, pte);
71013+ BUG_ON(pte_dirty(entry));
71014+ page = vm_normal_page(vma, address, entry);
71015+ if (page) {
71016+ update_hiwater_rss(mm);
71017+ if (PageAnon(page))
71018+ dec_mm_counter_fast(mm, MM_ANONPAGES);
71019+ else
71020+ dec_mm_counter_fast(mm, MM_FILEPAGES);
71021+ page_remove_rmap(page);
71022+ page_cache_release(page);
71023+ }
71024+ }
71025+ pte_unmap_unlock(pte, ptl);
71026+}
71027+
71028+/* PaX: if vma is mirrored, synchronize the mirror's PTE
71029+ *
71030+ * the ptl of the lower mapped page is held on entry and is not released on exit
71031+ * or inside to ensure atomic changes to the PTE states (swapout, mremap, munmap, etc)
71032+ */
71033+static void pax_mirror_anon_pte(struct vm_area_struct *vma, unsigned long address, struct page *page_m, spinlock_t *ptl)
71034+{
71035+ struct mm_struct *mm = vma->vm_mm;
71036+ unsigned long address_m;
71037+ spinlock_t *ptl_m;
71038+ struct vm_area_struct *vma_m;
71039+ pmd_t *pmd_m;
71040+ pte_t *pte_m, entry_m;
71041+
71042+ BUG_ON(!page_m || !PageAnon(page_m));
71043+
71044+ vma_m = pax_find_mirror_vma(vma);
71045+ if (!vma_m)
71046+ return;
71047+
71048+ BUG_ON(!PageLocked(page_m));
71049+ BUG_ON(address >= SEGMEXEC_TASK_SIZE);
71050+ address_m = address + SEGMEXEC_TASK_SIZE;
71051+ pmd_m = pmd_offset(pud_offset(pgd_offset(mm, address_m), address_m), address_m);
71052+ pte_m = pte_offset_map(pmd_m, address_m);
71053+ ptl_m = pte_lockptr(mm, pmd_m);
71054+ if (ptl != ptl_m) {
71055+ spin_lock_nested(ptl_m, SINGLE_DEPTH_NESTING);
71056+ if (!pte_none(*pte_m))
71057+ goto out;
71058+ }
71059+
71060+ entry_m = pfn_pte(page_to_pfn(page_m), vma_m->vm_page_prot);
71061+ page_cache_get(page_m);
71062+ page_add_anon_rmap(page_m, vma_m, address_m);
71063+ inc_mm_counter_fast(mm, MM_ANONPAGES);
71064+ set_pte_at(mm, address_m, pte_m, entry_m);
71065+ update_mmu_cache(vma_m, address_m, entry_m);
71066+out:
71067+ if (ptl != ptl_m)
71068+ spin_unlock(ptl_m);
71069+ pte_unmap(pte_m);
71070+ unlock_page(page_m);
71071+}
71072+
71073+void pax_mirror_file_pte(struct vm_area_struct *vma, unsigned long address, struct page *page_m, spinlock_t *ptl)
71074+{
71075+ struct mm_struct *mm = vma->vm_mm;
71076+ unsigned long address_m;
71077+ spinlock_t *ptl_m;
71078+ struct vm_area_struct *vma_m;
71079+ pmd_t *pmd_m;
71080+ pte_t *pte_m, entry_m;
71081+
71082+ BUG_ON(!page_m || PageAnon(page_m));
71083+
71084+ vma_m = pax_find_mirror_vma(vma);
71085+ if (!vma_m)
71086+ return;
71087+
71088+ BUG_ON(address >= SEGMEXEC_TASK_SIZE);
71089+ address_m = address + SEGMEXEC_TASK_SIZE;
71090+ pmd_m = pmd_offset(pud_offset(pgd_offset(mm, address_m), address_m), address_m);
71091+ pte_m = pte_offset_map(pmd_m, address_m);
71092+ ptl_m = pte_lockptr(mm, pmd_m);
71093+ if (ptl != ptl_m) {
71094+ spin_lock_nested(ptl_m, SINGLE_DEPTH_NESTING);
71095+ if (!pte_none(*pte_m))
71096+ goto out;
71097+ }
71098+
71099+ entry_m = pfn_pte(page_to_pfn(page_m), vma_m->vm_page_prot);
71100+ page_cache_get(page_m);
71101+ page_add_file_rmap(page_m);
71102+ inc_mm_counter_fast(mm, MM_FILEPAGES);
71103+ set_pte_at(mm, address_m, pte_m, entry_m);
71104+ update_mmu_cache(vma_m, address_m, entry_m);
71105+out:
71106+ if (ptl != ptl_m)
71107+ spin_unlock(ptl_m);
71108+ pte_unmap(pte_m);
71109+}
71110+
71111+static void pax_mirror_pfn_pte(struct vm_area_struct *vma, unsigned long address, unsigned long pfn_m, spinlock_t *ptl)
71112+{
71113+ struct mm_struct *mm = vma->vm_mm;
71114+ unsigned long address_m;
71115+ spinlock_t *ptl_m;
71116+ struct vm_area_struct *vma_m;
71117+ pmd_t *pmd_m;
71118+ pte_t *pte_m, entry_m;
71119+
71120+ vma_m = pax_find_mirror_vma(vma);
71121+ if (!vma_m)
71122+ return;
71123+
71124+ BUG_ON(address >= SEGMEXEC_TASK_SIZE);
71125+ address_m = address + SEGMEXEC_TASK_SIZE;
71126+ pmd_m = pmd_offset(pud_offset(pgd_offset(mm, address_m), address_m), address_m);
71127+ pte_m = pte_offset_map(pmd_m, address_m);
71128+ ptl_m = pte_lockptr(mm, pmd_m);
71129+ if (ptl != ptl_m) {
71130+ spin_lock_nested(ptl_m, SINGLE_DEPTH_NESTING);
71131+ if (!pte_none(*pte_m))
71132+ goto out;
71133+ }
71134+
71135+ entry_m = pfn_pte(pfn_m, vma_m->vm_page_prot);
71136+ set_pte_at(mm, address_m, pte_m, entry_m);
71137+out:
71138+ if (ptl != ptl_m)
71139+ spin_unlock(ptl_m);
71140+ pte_unmap(pte_m);
71141+}
71142+
71143+static void pax_mirror_pte(struct vm_area_struct *vma, unsigned long address, pte_t *pte, pmd_t *pmd, spinlock_t *ptl)
71144+{
71145+ struct page *page_m;
71146+ pte_t entry;
71147+
71148+ if (!(vma->vm_mm->pax_flags & MF_PAX_SEGMEXEC))
71149+ goto out;
71150+
71151+ entry = *pte;
71152+ page_m = vm_normal_page(vma, address, entry);
71153+ if (!page_m)
71154+ pax_mirror_pfn_pte(vma, address, pte_pfn(entry), ptl);
71155+ else if (PageAnon(page_m)) {
71156+ if (pax_find_mirror_vma(vma)) {
71157+ pte_unmap_unlock(pte, ptl);
71158+ lock_page(page_m);
71159+ pte = pte_offset_map_lock(vma->vm_mm, pmd, address, &ptl);
71160+ if (pte_same(entry, *pte))
71161+ pax_mirror_anon_pte(vma, address, page_m, ptl);
71162+ else
71163+ unlock_page(page_m);
71164+ }
71165+ } else
71166+ pax_mirror_file_pte(vma, address, page_m, ptl);
71167+
71168+out:
71169+ pte_unmap_unlock(pte, ptl);
71170+}
71171+#endif
71172+
71173 /*
71174 * This routine handles present pages, when users try to write
71175 * to a shared page. It is done by copying the page to a new address
71176@@ -2656,6 +2849,12 @@ gotten:
71177 */
71178 page_table = pte_offset_map_lock(mm, pmd, address, &ptl);
71179 if (likely(pte_same(*page_table, orig_pte))) {
71180+
71181+#ifdef CONFIG_PAX_SEGMEXEC
71182+ if (pax_find_mirror_vma(vma))
71183+ BUG_ON(!trylock_page(new_page));
71184+#endif
71185+
71186 if (old_page) {
71187 if (!PageAnon(old_page)) {
71188 dec_mm_counter_fast(mm, MM_FILEPAGES);
71189@@ -2707,6 +2906,10 @@ gotten:
71190 page_remove_rmap(old_page);
71191 }
71192
71193+#ifdef CONFIG_PAX_SEGMEXEC
71194+ pax_mirror_anon_pte(vma, address, new_page, ptl);
71195+#endif
71196+
71197 /* Free the old page.. */
71198 new_page = old_page;
71199 ret |= VM_FAULT_WRITE;
71200@@ -2986,6 +3189,11 @@ static int do_swap_page(struct mm_struct *mm, struct vm_area_struct *vma,
71201 swap_free(entry);
71202 if (vm_swap_full() || (vma->vm_flags & VM_LOCKED) || PageMlocked(page))
71203 try_to_free_swap(page);
71204+
71205+#ifdef CONFIG_PAX_SEGMEXEC
71206+ if ((flags & FAULT_FLAG_WRITE) || !pax_find_mirror_vma(vma))
71207+#endif
71208+
71209 unlock_page(page);
71210 if (swapcache) {
71211 /*
71212@@ -3009,6 +3217,11 @@ static int do_swap_page(struct mm_struct *mm, struct vm_area_struct *vma,
71213
71214 /* No need to invalidate - it was non-present before */
71215 update_mmu_cache(vma, address, page_table);
71216+
71217+#ifdef CONFIG_PAX_SEGMEXEC
71218+ pax_mirror_anon_pte(vma, address, page, ptl);
71219+#endif
71220+
71221 unlock:
71222 pte_unmap_unlock(page_table, ptl);
71223 out:
71224@@ -3028,40 +3241,6 @@ out_release:
71225 }
71226
71227 /*
71228- * This is like a special single-page "expand_{down|up}wards()",
71229- * except we must first make sure that 'address{-|+}PAGE_SIZE'
71230- * doesn't hit another vma.
71231- */
71232-static inline int check_stack_guard_page(struct vm_area_struct *vma, unsigned long address)
71233-{
71234- address &= PAGE_MASK;
71235- if ((vma->vm_flags & VM_GROWSDOWN) && address == vma->vm_start) {
71236- struct vm_area_struct *prev = vma->vm_prev;
71237-
71238- /*
71239- * Is there a mapping abutting this one below?
71240- *
71241- * That's only ok if it's the same stack mapping
71242- * that has gotten split..
71243- */
71244- if (prev && prev->vm_end == address)
71245- return prev->vm_flags & VM_GROWSDOWN ? 0 : -ENOMEM;
71246-
71247- expand_downwards(vma, address - PAGE_SIZE);
71248- }
71249- if ((vma->vm_flags & VM_GROWSUP) && address + PAGE_SIZE == vma->vm_end) {
71250- struct vm_area_struct *next = vma->vm_next;
71251-
71252- /* As VM_GROWSDOWN but s/below/above/ */
71253- if (next && next->vm_start == address + PAGE_SIZE)
71254- return next->vm_flags & VM_GROWSUP ? 0 : -ENOMEM;
71255-
71256- expand_upwards(vma, address + PAGE_SIZE);
71257- }
71258- return 0;
71259-}
71260-
71261-/*
71262 * We enter with non-exclusive mmap_sem (to exclude vma changes,
71263 * but allow concurrent faults), and pte mapped but not yet locked.
71264 * We return with mmap_sem still held, but pte unmapped and unlocked.
71265@@ -3070,27 +3249,23 @@ static int do_anonymous_page(struct mm_struct *mm, struct vm_area_struct *vma,
71266 unsigned long address, pte_t *page_table, pmd_t *pmd,
71267 unsigned int flags)
71268 {
71269- struct page *page;
71270+ struct page *page = NULL;
71271 spinlock_t *ptl;
71272 pte_t entry;
71273
71274- pte_unmap(page_table);
71275-
71276- /* Check if we need to add a guard page to the stack */
71277- if (check_stack_guard_page(vma, address) < 0)
71278- return VM_FAULT_SIGBUS;
71279-
71280- /* Use the zero-page for reads */
71281 if (!(flags & FAULT_FLAG_WRITE)) {
71282 entry = pte_mkspecial(pfn_pte(my_zero_pfn(address),
71283 vma->vm_page_prot));
71284- page_table = pte_offset_map_lock(mm, pmd, address, &ptl);
71285+ ptl = pte_lockptr(mm, pmd);
71286+ spin_lock(ptl);
71287 if (!pte_none(*page_table))
71288 goto unlock;
71289 goto setpte;
71290 }
71291
71292 /* Allocate our own private page. */
71293+ pte_unmap(page_table);
71294+
71295 if (unlikely(anon_vma_prepare(vma)))
71296 goto oom;
71297 page = alloc_zeroed_user_highpage_movable(vma, address);
71298@@ -3109,6 +3284,11 @@ static int do_anonymous_page(struct mm_struct *mm, struct vm_area_struct *vma,
71299 if (!pte_none(*page_table))
71300 goto release;
71301
71302+#ifdef CONFIG_PAX_SEGMEXEC
71303+ if (pax_find_mirror_vma(vma))
71304+ BUG_ON(!trylock_page(page));
71305+#endif
71306+
71307 inc_mm_counter_fast(mm, MM_ANONPAGES);
71308 page_add_new_anon_rmap(page, vma, address);
71309 setpte:
71310@@ -3116,6 +3296,12 @@ setpte:
71311
71312 /* No need to invalidate - it was non-present before */
71313 update_mmu_cache(vma, address, page_table);
71314+
71315+#ifdef CONFIG_PAX_SEGMEXEC
71316+ if (page)
71317+ pax_mirror_anon_pte(vma, address, page, ptl);
71318+#endif
71319+
71320 unlock:
71321 pte_unmap_unlock(page_table, ptl);
71322 return 0;
71323@@ -3259,6 +3445,12 @@ static int __do_fault(struct mm_struct *mm, struct vm_area_struct *vma,
71324 */
71325 /* Only go through if we didn't race with anybody else... */
71326 if (likely(pte_same(*page_table, orig_pte))) {
71327+
71328+#ifdef CONFIG_PAX_SEGMEXEC
71329+ if (anon && pax_find_mirror_vma(vma))
71330+ BUG_ON(!trylock_page(page));
71331+#endif
71332+
71333 flush_icache_page(vma, page);
71334 entry = mk_pte(page, vma->vm_page_prot);
71335 if (flags & FAULT_FLAG_WRITE)
71336@@ -3278,6 +3470,14 @@ static int __do_fault(struct mm_struct *mm, struct vm_area_struct *vma,
71337
71338 /* no need to invalidate: a not-present page won't be cached */
71339 update_mmu_cache(vma, address, page_table);
71340+
71341+#ifdef CONFIG_PAX_SEGMEXEC
71342+ if (anon)
71343+ pax_mirror_anon_pte(vma, address, page, ptl);
71344+ else
71345+ pax_mirror_file_pte(vma, address, page, ptl);
71346+#endif
71347+
71348 } else {
71349 if (cow_page)
71350 mem_cgroup_uncharge_page(cow_page);
71351@@ -3431,6 +3631,12 @@ int handle_pte_fault(struct mm_struct *mm,
71352 if (flags & FAULT_FLAG_WRITE)
71353 flush_tlb_fix_spurious_fault(vma, address);
71354 }
71355+
71356+#ifdef CONFIG_PAX_SEGMEXEC
71357+ pax_mirror_pte(vma, address, pte, pmd, ptl);
71358+ return 0;
71359+#endif
71360+
71361 unlock:
71362 pte_unmap_unlock(pte, ptl);
71363 return 0;
71364@@ -3447,6 +3653,10 @@ int handle_mm_fault(struct mm_struct *mm, struct vm_area_struct *vma,
71365 pmd_t *pmd;
71366 pte_t *pte;
71367
71368+#ifdef CONFIG_PAX_SEGMEXEC
71369+ struct vm_area_struct *vma_m;
71370+#endif
71371+
71372 __set_current_state(TASK_RUNNING);
71373
71374 count_vm_event(PGFAULT);
71375@@ -3458,6 +3668,34 @@ int handle_mm_fault(struct mm_struct *mm, struct vm_area_struct *vma,
71376 if (unlikely(is_vm_hugetlb_page(vma)))
71377 return hugetlb_fault(mm, vma, address, flags);
71378
71379+#ifdef CONFIG_PAX_SEGMEXEC
71380+ vma_m = pax_find_mirror_vma(vma);
71381+ if (vma_m) {
71382+ unsigned long address_m;
71383+ pgd_t *pgd_m;
71384+ pud_t *pud_m;
71385+ pmd_t *pmd_m;
71386+
71387+ if (vma->vm_start > vma_m->vm_start) {
71388+ address_m = address;
71389+ address -= SEGMEXEC_TASK_SIZE;
71390+ vma = vma_m;
71391+ } else
71392+ address_m = address + SEGMEXEC_TASK_SIZE;
71393+
71394+ pgd_m = pgd_offset(mm, address_m);
71395+ pud_m = pud_alloc(mm, pgd_m, address_m);
71396+ if (!pud_m)
71397+ return VM_FAULT_OOM;
71398+ pmd_m = pmd_alloc(mm, pud_m, address_m);
71399+ if (!pmd_m)
71400+ return VM_FAULT_OOM;
71401+ if (!pmd_present(*pmd_m) && __pte_alloc(mm, vma_m, pmd_m, address_m))
71402+ return VM_FAULT_OOM;
71403+ pax_unmap_mirror_pte(vma_m, address_m, pmd_m);
71404+ }
71405+#endif
71406+
71407 pgd = pgd_offset(mm, address);
71408 pud = pud_alloc(mm, pgd, address);
71409 if (!pud)
71410@@ -3487,7 +3725,7 @@ int handle_mm_fault(struct mm_struct *mm, struct vm_area_struct *vma,
71411 * run pte_offset_map on the pmd, if an huge pmd could
71412 * materialize from under us from a different thread.
71413 */
71414- if (unlikely(pmd_none(*pmd)) && __pte_alloc(mm, vma, pmd, address))
71415+ if (unlikely(pmd_none(*pmd) && __pte_alloc(mm, vma, pmd, address)))
71416 return VM_FAULT_OOM;
71417 /* if an huge pmd materialized from under us just retry later */
71418 if (unlikely(pmd_trans_huge(*pmd)))
71419@@ -3591,7 +3829,7 @@ static int __init gate_vma_init(void)
71420 gate_vma.vm_start = FIXADDR_USER_START;
71421 gate_vma.vm_end = FIXADDR_USER_END;
71422 gate_vma.vm_flags = VM_READ | VM_MAYREAD | VM_EXEC | VM_MAYEXEC;
71423- gate_vma.vm_page_prot = __P101;
71424+ gate_vma.vm_page_prot = vm_get_page_prot(gate_vma.vm_flags);
71425 /*
71426 * Make sure the vDSO gets into every core dump.
71427 * Dumping its contents makes post-mortem fully interpretable later
71428diff --git a/mm/mempolicy.c b/mm/mempolicy.c
71429index c3fdbcb..2e8ef90 100644
71430--- a/mm/mempolicy.c
71431+++ b/mm/mempolicy.c
71432@@ -640,6 +640,10 @@ static int mbind_range(struct mm_struct *mm, unsigned long start,
71433 unsigned long vmstart;
71434 unsigned long vmend;
71435
71436+#ifdef CONFIG_PAX_SEGMEXEC
71437+ struct vm_area_struct *vma_m;
71438+#endif
71439+
71440 vma = find_vma_prev(mm, start, &prev);
71441 if (!vma || vma->vm_start > start)
71442 return -EFAULT;
71443@@ -678,6 +682,16 @@ static int mbind_range(struct mm_struct *mm, unsigned long start,
71444 err = policy_vma(vma, new_pol);
71445 if (err)
71446 goto out;
71447+
71448+#ifdef CONFIG_PAX_SEGMEXEC
71449+ vma_m = pax_find_mirror_vma(vma);
71450+ if (vma_m) {
71451+ err = policy_vma(vma_m, new_pol);
71452+ if (err)
71453+ goto out;
71454+ }
71455+#endif
71456+
71457 }
71458
71459 out:
71460@@ -1111,6 +1125,17 @@ static long do_mbind(unsigned long start, unsigned long len,
71461
71462 if (end < start)
71463 return -EINVAL;
71464+
71465+#ifdef CONFIG_PAX_SEGMEXEC
71466+ if (mm->pax_flags & MF_PAX_SEGMEXEC) {
71467+ if (end > SEGMEXEC_TASK_SIZE)
71468+ return -EINVAL;
71469+ } else
71470+#endif
71471+
71472+ if (end > TASK_SIZE)
71473+ return -EINVAL;
71474+
71475 if (end == start)
71476 return 0;
71477
71478@@ -1329,6 +1354,14 @@ SYSCALL_DEFINE4(migrate_pages, pid_t, pid, unsigned long, maxnode,
71479 if (!mm)
71480 goto out;
71481
71482+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
71483+ if (mm != current->mm &&
71484+ (mm->pax_flags & MF_PAX_RANDMMAP || mm->pax_flags & MF_PAX_SEGMEXEC)) {
71485+ err = -EPERM;
71486+ goto out;
71487+ }
71488+#endif
71489+
71490 /*
71491 * Check if this process has the right to modify the specified
71492 * process. The right exists if the process has administrative
71493@@ -1338,8 +1371,7 @@ SYSCALL_DEFINE4(migrate_pages, pid_t, pid, unsigned long, maxnode,
71494 rcu_read_lock();
71495 tcred = __task_cred(task);
71496 if (cred->euid != tcred->suid && cred->euid != tcred->uid &&
71497- cred->uid != tcred->suid && cred->uid != tcred->uid &&
71498- !capable(CAP_SYS_NICE)) {
71499+ cred->uid != tcred->suid && !capable(CAP_SYS_NICE)) {
71500 rcu_read_unlock();
71501 err = -EPERM;
71502 goto out;
71503diff --git a/mm/migrate.c b/mm/migrate.c
71504index 177aca4..ab3a744 100644
71505--- a/mm/migrate.c
71506+++ b/mm/migrate.c
71507@@ -1313,6 +1313,14 @@ SYSCALL_DEFINE6(move_pages, pid_t, pid, unsigned long, nr_pages,
71508 if (!mm)
71509 return -EINVAL;
71510
71511+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
71512+ if (mm != current->mm &&
71513+ (mm->pax_flags & MF_PAX_RANDMMAP || mm->pax_flags & MF_PAX_SEGMEXEC)) {
71514+ err = -EPERM;
71515+ goto out;
71516+ }
71517+#endif
71518+
71519 /*
71520 * Check if this process has the right to modify the specified
71521 * process. The right exists if the process has administrative
71522@@ -1322,8 +1330,7 @@ SYSCALL_DEFINE6(move_pages, pid_t, pid, unsigned long, nr_pages,
71523 rcu_read_lock();
71524 tcred = __task_cred(task);
71525 if (cred->euid != tcred->suid && cred->euid != tcred->uid &&
71526- cred->uid != tcred->suid && cred->uid != tcred->uid &&
71527- !capable(CAP_SYS_NICE)) {
71528+ cred->uid != tcred->suid && !capable(CAP_SYS_NICE)) {
71529 rcu_read_unlock();
71530 err = -EPERM;
71531 goto out;
71532diff --git a/mm/mlock.c b/mm/mlock.c
71533index 4f4f53b..9511904 100644
71534--- a/mm/mlock.c
71535+++ b/mm/mlock.c
71536@@ -13,6 +13,7 @@
71537 #include <linux/pagemap.h>
71538 #include <linux/mempolicy.h>
71539 #include <linux/syscalls.h>
71540+#include <linux/security.h>
71541 #include <linux/sched.h>
71542 #include <linux/export.h>
71543 #include <linux/rmap.h>
71544@@ -385,6 +386,9 @@ static int do_mlock(unsigned long start, size_t len, int on)
71545 return -EINVAL;
71546 if (end == start)
71547 return 0;
71548+ if (end > TASK_SIZE)
71549+ return -EINVAL;
71550+
71551 vma = find_vma_prev(current->mm, start, &prev);
71552 if (!vma || vma->vm_start > start)
71553 return -ENOMEM;
71554@@ -395,6 +399,11 @@ static int do_mlock(unsigned long start, size_t len, int on)
71555 for (nstart = start ; ; ) {
71556 vm_flags_t newflags;
71557
71558+#ifdef CONFIG_PAX_SEGMEXEC
71559+ if ((current->mm->pax_flags & MF_PAX_SEGMEXEC) && (vma->vm_start >= SEGMEXEC_TASK_SIZE))
71560+ break;
71561+#endif
71562+
71563 /* Here we know that vma->vm_start <= nstart < vma->vm_end. */
71564
71565 newflags = vma->vm_flags | VM_LOCKED;
71566@@ -500,6 +509,7 @@ SYSCALL_DEFINE2(mlock, unsigned long, start, size_t, len)
71567 lock_limit >>= PAGE_SHIFT;
71568
71569 /* check against resource limits */
71570+ gr_learn_resource(current, RLIMIT_MEMLOCK, (current->mm->locked_vm << PAGE_SHIFT) + len, 1);
71571 if ((locked <= lock_limit) || capable(CAP_IPC_LOCK))
71572 error = do_mlock(start, len, 1);
71573 up_write(&current->mm->mmap_sem);
71574@@ -523,17 +533,23 @@ SYSCALL_DEFINE2(munlock, unsigned long, start, size_t, len)
71575 static int do_mlockall(int flags)
71576 {
71577 struct vm_area_struct * vma, * prev = NULL;
71578- unsigned int def_flags = 0;
71579
71580 if (flags & MCL_FUTURE)
71581- def_flags = VM_LOCKED;
71582- current->mm->def_flags = def_flags;
71583+ current->mm->def_flags |= VM_LOCKED;
71584+ else
71585+ current->mm->def_flags &= ~VM_LOCKED;
71586 if (flags == MCL_FUTURE)
71587 goto out;
71588
71589 for (vma = current->mm->mmap; vma ; vma = prev->vm_next) {
71590 vm_flags_t newflags;
71591
71592+#ifdef CONFIG_PAX_SEGMEXEC
71593+ if ((current->mm->pax_flags & MF_PAX_SEGMEXEC) && (vma->vm_start >= SEGMEXEC_TASK_SIZE))
71594+ break;
71595+#endif
71596+
71597+ BUG_ON(vma->vm_end > TASK_SIZE);
71598 newflags = vma->vm_flags | VM_LOCKED;
71599 if (!(flags & MCL_CURRENT))
71600 newflags &= ~VM_LOCKED;
71601@@ -566,6 +582,7 @@ SYSCALL_DEFINE1(mlockall, int, flags)
71602 lock_limit >>= PAGE_SHIFT;
71603
71604 ret = -ENOMEM;
71605+ gr_learn_resource(current, RLIMIT_MEMLOCK, current->mm->total_vm << PAGE_SHIFT, 1);
71606 if (!(flags & MCL_CURRENT) || (current->mm->total_vm <= lock_limit) ||
71607 capable(CAP_IPC_LOCK))
71608 ret = do_mlockall(flags);
71609diff --git a/mm/mmap.c b/mm/mmap.c
71610index eae90af..c930262 100644
71611--- a/mm/mmap.c
71612+++ b/mm/mmap.c
71613@@ -46,6 +46,16 @@
71614 #define arch_rebalance_pgtables(addr, len) (addr)
71615 #endif
71616
71617+static inline void verify_mm_writelocked(struct mm_struct *mm)
71618+{
71619+#if defined(CONFIG_DEBUG_VM) || defined(CONFIG_PAX)
71620+ if (unlikely(down_read_trylock(&mm->mmap_sem))) {
71621+ up_read(&mm->mmap_sem);
71622+ BUG();
71623+ }
71624+#endif
71625+}
71626+
71627 static void unmap_region(struct mm_struct *mm,
71628 struct vm_area_struct *vma, struct vm_area_struct *prev,
71629 unsigned long start, unsigned long end);
71630@@ -71,22 +81,32 @@ static void unmap_region(struct mm_struct *mm,
71631 * x: (no) no x: (no) yes x: (no) yes x: (yes) yes
71632 *
71633 */
71634-pgprot_t protection_map[16] = {
71635+pgprot_t protection_map[16] __read_only = {
71636 __P000, __P001, __P010, __P011, __P100, __P101, __P110, __P111,
71637 __S000, __S001, __S010, __S011, __S100, __S101, __S110, __S111
71638 };
71639
71640-pgprot_t vm_get_page_prot(unsigned long vm_flags)
71641+pgprot_t vm_get_page_prot(vm_flags_t vm_flags)
71642 {
71643- return __pgprot(pgprot_val(protection_map[vm_flags &
71644+ pgprot_t prot = __pgprot(pgprot_val(protection_map[vm_flags &
71645 (VM_READ|VM_WRITE|VM_EXEC|VM_SHARED)]) |
71646 pgprot_val(arch_vm_get_page_prot(vm_flags)));
71647+
71648+#if defined(CONFIG_PAX_PAGEEXEC) && defined(CONFIG_X86_32)
71649+ if (!(__supported_pte_mask & _PAGE_NX) &&
71650+ (vm_flags & (VM_PAGEEXEC | VM_EXEC)) == VM_PAGEEXEC &&
71651+ (vm_flags & (VM_READ | VM_WRITE)))
71652+ prot = __pgprot(pte_val(pte_exprotect(__pte(pgprot_val(prot)))));
71653+#endif
71654+
71655+ return prot;
71656 }
71657 EXPORT_SYMBOL(vm_get_page_prot);
71658
71659 int sysctl_overcommit_memory __read_mostly = OVERCOMMIT_GUESS; /* heuristic overcommit */
71660 int sysctl_overcommit_ratio __read_mostly = 50; /* default is 50% */
71661 int sysctl_max_map_count __read_mostly = DEFAULT_MAX_MAP_COUNT;
71662+unsigned long sysctl_heap_stack_gap __read_mostly = 64*1024;
71663 /*
71664 * Make sure vm_committed_as in one cacheline and not cacheline shared with
71665 * other variables. It can be updated by several CPUs frequently.
71666@@ -228,6 +248,7 @@ static struct vm_area_struct *remove_vma(struct vm_area_struct *vma)
71667 struct vm_area_struct *next = vma->vm_next;
71668
71669 might_sleep();
71670+ BUG_ON(vma->vm_mirror);
71671 if (vma->vm_ops && vma->vm_ops->close)
71672 vma->vm_ops->close(vma);
71673 if (vma->vm_file) {
71674@@ -272,6 +293,7 @@ SYSCALL_DEFINE1(brk, unsigned long, brk)
71675 * not page aligned -Ram Gupta
71676 */
71677 rlim = rlimit(RLIMIT_DATA);
71678+ gr_learn_resource(current, RLIMIT_DATA, (brk - mm->start_brk) + (mm->end_data - mm->start_data), 1);
71679 if (rlim < RLIM_INFINITY && (brk - mm->start_brk) +
71680 (mm->end_data - mm->start_data) > rlim)
71681 goto out;
71682@@ -689,6 +711,12 @@ static int
71683 can_vma_merge_before(struct vm_area_struct *vma, unsigned long vm_flags,
71684 struct anon_vma *anon_vma, struct file *file, pgoff_t vm_pgoff)
71685 {
71686+
71687+#ifdef CONFIG_PAX_SEGMEXEC
71688+ if ((vma->vm_mm->pax_flags & MF_PAX_SEGMEXEC) && vma->vm_start == SEGMEXEC_TASK_SIZE)
71689+ return 0;
71690+#endif
71691+
71692 if (is_mergeable_vma(vma, file, vm_flags) &&
71693 is_mergeable_anon_vma(anon_vma, vma->anon_vma, vma)) {
71694 if (vma->vm_pgoff == vm_pgoff)
71695@@ -708,6 +736,12 @@ static int
71696 can_vma_merge_after(struct vm_area_struct *vma, unsigned long vm_flags,
71697 struct anon_vma *anon_vma, struct file *file, pgoff_t vm_pgoff)
71698 {
71699+
71700+#ifdef CONFIG_PAX_SEGMEXEC
71701+ if ((vma->vm_mm->pax_flags & MF_PAX_SEGMEXEC) && vma->vm_end == SEGMEXEC_TASK_SIZE)
71702+ return 0;
71703+#endif
71704+
71705 if (is_mergeable_vma(vma, file, vm_flags) &&
71706 is_mergeable_anon_vma(anon_vma, vma->anon_vma, vma)) {
71707 pgoff_t vm_pglen;
71708@@ -750,13 +784,20 @@ can_vma_merge_after(struct vm_area_struct *vma, unsigned long vm_flags,
71709 struct vm_area_struct *vma_merge(struct mm_struct *mm,
71710 struct vm_area_struct *prev, unsigned long addr,
71711 unsigned long end, unsigned long vm_flags,
71712- struct anon_vma *anon_vma, struct file *file,
71713+ struct anon_vma *anon_vma, struct file *file,
71714 pgoff_t pgoff, struct mempolicy *policy)
71715 {
71716 pgoff_t pglen = (end - addr) >> PAGE_SHIFT;
71717 struct vm_area_struct *area, *next;
71718 int err;
71719
71720+#ifdef CONFIG_PAX_SEGMEXEC
71721+ unsigned long addr_m = addr + SEGMEXEC_TASK_SIZE, end_m = end + SEGMEXEC_TASK_SIZE;
71722+ struct vm_area_struct *area_m = NULL, *next_m = NULL, *prev_m = NULL;
71723+
71724+ BUG_ON((mm->pax_flags & MF_PAX_SEGMEXEC) && SEGMEXEC_TASK_SIZE < end);
71725+#endif
71726+
71727 /*
71728 * We later require that vma->vm_flags == vm_flags,
71729 * so this tests vma->vm_flags & VM_SPECIAL, too.
71730@@ -772,6 +813,15 @@ struct vm_area_struct *vma_merge(struct mm_struct *mm,
71731 if (next && next->vm_end == end) /* cases 6, 7, 8 */
71732 next = next->vm_next;
71733
71734+#ifdef CONFIG_PAX_SEGMEXEC
71735+ if (prev)
71736+ prev_m = pax_find_mirror_vma(prev);
71737+ if (area)
71738+ area_m = pax_find_mirror_vma(area);
71739+ if (next)
71740+ next_m = pax_find_mirror_vma(next);
71741+#endif
71742+
71743 /*
71744 * Can it merge with the predecessor?
71745 */
71746@@ -791,9 +841,24 @@ struct vm_area_struct *vma_merge(struct mm_struct *mm,
71747 /* cases 1, 6 */
71748 err = vma_adjust(prev, prev->vm_start,
71749 next->vm_end, prev->vm_pgoff, NULL);
71750- } else /* cases 2, 5, 7 */
71751+
71752+#ifdef CONFIG_PAX_SEGMEXEC
71753+ if (!err && prev_m)
71754+ err = vma_adjust(prev_m, prev_m->vm_start,
71755+ next_m->vm_end, prev_m->vm_pgoff, NULL);
71756+#endif
71757+
71758+ } else { /* cases 2, 5, 7 */
71759 err = vma_adjust(prev, prev->vm_start,
71760 end, prev->vm_pgoff, NULL);
71761+
71762+#ifdef CONFIG_PAX_SEGMEXEC
71763+ if (!err && prev_m)
71764+ err = vma_adjust(prev_m, prev_m->vm_start,
71765+ end_m, prev_m->vm_pgoff, NULL);
71766+#endif
71767+
71768+ }
71769 if (err)
71770 return NULL;
71771 khugepaged_enter_vma_merge(prev);
71772@@ -807,12 +872,27 @@ struct vm_area_struct *vma_merge(struct mm_struct *mm,
71773 mpol_equal(policy, vma_policy(next)) &&
71774 can_vma_merge_before(next, vm_flags,
71775 anon_vma, file, pgoff+pglen)) {
71776- if (prev && addr < prev->vm_end) /* case 4 */
71777+ if (prev && addr < prev->vm_end) { /* case 4 */
71778 err = vma_adjust(prev, prev->vm_start,
71779 addr, prev->vm_pgoff, NULL);
71780- else /* cases 3, 8 */
71781+
71782+#ifdef CONFIG_PAX_SEGMEXEC
71783+ if (!err && prev_m)
71784+ err = vma_adjust(prev_m, prev_m->vm_start,
71785+ addr_m, prev_m->vm_pgoff, NULL);
71786+#endif
71787+
71788+ } else { /* cases 3, 8 */
71789 err = vma_adjust(area, addr, next->vm_end,
71790 next->vm_pgoff - pglen, NULL);
71791+
71792+#ifdef CONFIG_PAX_SEGMEXEC
71793+ if (!err && area_m)
71794+ err = vma_adjust(area_m, addr_m, next_m->vm_end,
71795+ next_m->vm_pgoff - pglen, NULL);
71796+#endif
71797+
71798+ }
71799 if (err)
71800 return NULL;
71801 khugepaged_enter_vma_merge(area);
71802@@ -921,14 +1001,11 @@ none:
71803 void vm_stat_account(struct mm_struct *mm, unsigned long flags,
71804 struct file *file, long pages)
71805 {
71806- const unsigned long stack_flags
71807- = VM_STACK_FLAGS & (VM_GROWSUP|VM_GROWSDOWN);
71808-
71809 if (file) {
71810 mm->shared_vm += pages;
71811 if ((flags & (VM_EXEC|VM_WRITE)) == VM_EXEC)
71812 mm->exec_vm += pages;
71813- } else if (flags & stack_flags)
71814+ } else if (flags & (VM_GROWSUP|VM_GROWSDOWN))
71815 mm->stack_vm += pages;
71816 if (flags & (VM_RESERVED|VM_IO))
71817 mm->reserved_vm += pages;
71818@@ -955,7 +1032,7 @@ unsigned long do_mmap_pgoff(struct file *file, unsigned long addr,
71819 * (the exception is when the underlying filesystem is noexec
71820 * mounted, in which case we dont add PROT_EXEC.)
71821 */
71822- if ((prot & PROT_READ) && (current->personality & READ_IMPLIES_EXEC))
71823+ if ((prot & (PROT_READ | PROT_WRITE)) && (current->personality & READ_IMPLIES_EXEC))
71824 if (!(file && (file->f_path.mnt->mnt_flags & MNT_NOEXEC)))
71825 prot |= PROT_EXEC;
71826
71827@@ -981,7 +1058,7 @@ unsigned long do_mmap_pgoff(struct file *file, unsigned long addr,
71828 /* Obtain the address to map to. we verify (or select) it and ensure
71829 * that it represents a valid section of the address space.
71830 */
71831- addr = get_unmapped_area(file, addr, len, pgoff, flags);
71832+ addr = get_unmapped_area(file, addr, len, pgoff, flags | ((prot & PROT_EXEC) ? MAP_EXECUTABLE : 0));
71833 if (addr & ~PAGE_MASK)
71834 return addr;
71835
71836@@ -992,6 +1069,36 @@ unsigned long do_mmap_pgoff(struct file *file, unsigned long addr,
71837 vm_flags = calc_vm_prot_bits(prot) | calc_vm_flag_bits(flags) |
71838 mm->def_flags | VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC;
71839
71840+#ifdef CONFIG_PAX_MPROTECT
71841+ if (mm->pax_flags & MF_PAX_MPROTECT) {
71842+#ifndef CONFIG_PAX_MPROTECT_COMPAT
71843+ if ((vm_flags & (VM_WRITE | VM_EXEC)) == (VM_WRITE | VM_EXEC)) {
71844+ gr_log_rwxmmap(file);
71845+
71846+#ifdef CONFIG_PAX_EMUPLT
71847+ vm_flags &= ~VM_EXEC;
71848+#else
71849+ return -EPERM;
71850+#endif
71851+
71852+ }
71853+
71854+ if (!(vm_flags & VM_EXEC))
71855+ vm_flags &= ~VM_MAYEXEC;
71856+#else
71857+ if ((vm_flags & (VM_WRITE | VM_EXEC)) != VM_EXEC)
71858+ vm_flags &= ~(VM_EXEC | VM_MAYEXEC);
71859+#endif
71860+ else
71861+ vm_flags &= ~VM_MAYWRITE;
71862+ }
71863+#endif
71864+
71865+#if defined(CONFIG_PAX_PAGEEXEC) && defined(CONFIG_X86_32)
71866+ if ((mm->pax_flags & MF_PAX_PAGEEXEC) && file)
71867+ vm_flags &= ~VM_PAGEEXEC;
71868+#endif
71869+
71870 if (flags & MAP_LOCKED)
71871 if (!can_do_mlock())
71872 return -EPERM;
71873@@ -1003,6 +1110,7 @@ unsigned long do_mmap_pgoff(struct file *file, unsigned long addr,
71874 locked += mm->locked_vm;
71875 lock_limit = rlimit(RLIMIT_MEMLOCK);
71876 lock_limit >>= PAGE_SHIFT;
71877+ gr_learn_resource(current, RLIMIT_MEMLOCK, locked << PAGE_SHIFT, 1);
71878 if (locked > lock_limit && !capable(CAP_IPC_LOCK))
71879 return -EAGAIN;
71880 }
71881@@ -1073,6 +1181,9 @@ unsigned long do_mmap_pgoff(struct file *file, unsigned long addr,
71882 if (error)
71883 return error;
71884
71885+ if (!gr_acl_handle_mmap(file, prot))
71886+ return -EACCES;
71887+
71888 return mmap_region(file, addr, len, flags, vm_flags, pgoff);
71889 }
71890 EXPORT_SYMBOL(do_mmap_pgoff);
71891@@ -1153,7 +1264,7 @@ int vma_wants_writenotify(struct vm_area_struct *vma)
71892 vm_flags_t vm_flags = vma->vm_flags;
71893
71894 /* If it was private or non-writable, the write bit is already clear */
71895- if ((vm_flags & (VM_WRITE|VM_SHARED)) != ((VM_WRITE|VM_SHARED)))
71896+ if ((vm_flags & (VM_WRITE|VM_SHARED)) != (VM_WRITE|VM_SHARED))
71897 return 0;
71898
71899 /* The backer wishes to know when pages are first written to? */
71900@@ -1202,14 +1313,24 @@ unsigned long mmap_region(struct file *file, unsigned long addr,
71901 unsigned long charged = 0;
71902 struct inode *inode = file ? file->f_path.dentry->d_inode : NULL;
71903
71904+#ifdef CONFIG_PAX_SEGMEXEC
71905+ struct vm_area_struct *vma_m = NULL;
71906+#endif
71907+
71908+ /*
71909+ * mm->mmap_sem is required to protect against another thread
71910+ * changing the mappings in case we sleep.
71911+ */
71912+ verify_mm_writelocked(mm);
71913+
71914 /* Clear old maps */
71915 error = -ENOMEM;
71916-munmap_back:
71917 vma = find_vma_prepare(mm, addr, &prev, &rb_link, &rb_parent);
71918 if (vma && vma->vm_start < addr + len) {
71919 if (do_munmap(mm, addr, len))
71920 return -ENOMEM;
71921- goto munmap_back;
71922+ vma = find_vma_prepare(mm, addr, &prev, &rb_link, &rb_parent);
71923+ BUG_ON(vma && vma->vm_start < addr + len);
71924 }
71925
71926 /* Check against address space limit. */
71927@@ -1258,6 +1379,16 @@ munmap_back:
71928 goto unacct_error;
71929 }
71930
71931+#ifdef CONFIG_PAX_SEGMEXEC
71932+ if ((mm->pax_flags & MF_PAX_SEGMEXEC) && (vm_flags & VM_EXEC)) {
71933+ vma_m = kmem_cache_zalloc(vm_area_cachep, GFP_KERNEL);
71934+ if (!vma_m) {
71935+ error = -ENOMEM;
71936+ goto free_vma;
71937+ }
71938+ }
71939+#endif
71940+
71941 vma->vm_mm = mm;
71942 vma->vm_start = addr;
71943 vma->vm_end = addr + len;
71944@@ -1266,8 +1397,9 @@ munmap_back:
71945 vma->vm_pgoff = pgoff;
71946 INIT_LIST_HEAD(&vma->anon_vma_chain);
71947
71948+ error = -EINVAL; /* when rejecting VM_GROWSDOWN|VM_GROWSUP */
71949+
71950 if (file) {
71951- error = -EINVAL;
71952 if (vm_flags & (VM_GROWSDOWN|VM_GROWSUP))
71953 goto free_vma;
71954 if (vm_flags & VM_DENYWRITE) {
71955@@ -1281,6 +1413,19 @@ munmap_back:
71956 error = file->f_op->mmap(file, vma);
71957 if (error)
71958 goto unmap_and_free_vma;
71959+
71960+#ifdef CONFIG_PAX_SEGMEXEC
71961+ if (vma_m && (vm_flags & VM_EXECUTABLE))
71962+ added_exe_file_vma(mm);
71963+#endif
71964+
71965+#if defined(CONFIG_PAX_PAGEEXEC) && defined(CONFIG_X86_32)
71966+ if ((mm->pax_flags & MF_PAX_PAGEEXEC) && !(vma->vm_flags & VM_SPECIAL)) {
71967+ vma->vm_flags |= VM_PAGEEXEC;
71968+ vma->vm_page_prot = vm_get_page_prot(vma->vm_flags);
71969+ }
71970+#endif
71971+
71972 if (vm_flags & VM_EXECUTABLE)
71973 added_exe_file_vma(mm);
71974
71975@@ -1293,6 +1438,8 @@ munmap_back:
71976 pgoff = vma->vm_pgoff;
71977 vm_flags = vma->vm_flags;
71978 } else if (vm_flags & VM_SHARED) {
71979+ if (unlikely(vm_flags & (VM_GROWSDOWN|VM_GROWSUP)))
71980+ goto free_vma;
71981 error = shmem_zero_setup(vma);
71982 if (error)
71983 goto free_vma;
71984@@ -1316,6 +1463,11 @@ munmap_back:
71985 vma_link(mm, vma, prev, rb_link, rb_parent);
71986 file = vma->vm_file;
71987
71988+#ifdef CONFIG_PAX_SEGMEXEC
71989+ if (vma_m)
71990+ BUG_ON(pax_mirror_vma(vma_m, vma));
71991+#endif
71992+
71993 /* Once vma denies write, undo our temporary denial count */
71994 if (correct_wcount)
71995 atomic_inc(&inode->i_writecount);
71996@@ -1324,6 +1476,7 @@ out:
71997
71998 mm->total_vm += len >> PAGE_SHIFT;
71999 vm_stat_account(mm, vm_flags, file, len >> PAGE_SHIFT);
72000+ track_exec_limit(mm, addr, addr + len, vm_flags);
72001 if (vm_flags & VM_LOCKED) {
72002 if (!mlock_vma_pages_range(vma, addr, addr + len))
72003 mm->locked_vm += (len >> PAGE_SHIFT);
72004@@ -1341,6 +1494,12 @@ unmap_and_free_vma:
72005 unmap_region(mm, vma, prev, vma->vm_start, vma->vm_end);
72006 charged = 0;
72007 free_vma:
72008+
72009+#ifdef CONFIG_PAX_SEGMEXEC
72010+ if (vma_m)
72011+ kmem_cache_free(vm_area_cachep, vma_m);
72012+#endif
72013+
72014 kmem_cache_free(vm_area_cachep, vma);
72015 unacct_error:
72016 if (charged)
72017@@ -1348,6 +1507,44 @@ unacct_error:
72018 return error;
72019 }
72020
72021+bool check_heap_stack_gap(const struct vm_area_struct *vma, unsigned long addr, unsigned long len)
72022+{
72023+ if (!vma) {
72024+#ifdef CONFIG_STACK_GROWSUP
72025+ if (addr > sysctl_heap_stack_gap)
72026+ vma = find_vma(current->mm, addr - sysctl_heap_stack_gap);
72027+ else
72028+ vma = find_vma(current->mm, 0);
72029+ if (vma && (vma->vm_flags & VM_GROWSUP))
72030+ return false;
72031+#endif
72032+ return true;
72033+ }
72034+
72035+ if (addr + len > vma->vm_start)
72036+ return false;
72037+
72038+ if (vma->vm_flags & VM_GROWSDOWN)
72039+ return sysctl_heap_stack_gap <= vma->vm_start - addr - len;
72040+#ifdef CONFIG_STACK_GROWSUP
72041+ else if (vma->vm_prev && (vma->vm_prev->vm_flags & VM_GROWSUP))
72042+ return addr - vma->vm_prev->vm_end <= sysctl_heap_stack_gap;
72043+#endif
72044+
72045+ return true;
72046+}
72047+
72048+unsigned long skip_heap_stack_gap(const struct vm_area_struct *vma, unsigned long len)
72049+{
72050+ if (vma->vm_start < len)
72051+ return -ENOMEM;
72052+ if (!(vma->vm_flags & VM_GROWSDOWN))
72053+ return vma->vm_start - len;
72054+ if (sysctl_heap_stack_gap <= vma->vm_start - len)
72055+ return vma->vm_start - len - sysctl_heap_stack_gap;
72056+ return -ENOMEM;
72057+}
72058+
72059 /* Get an address range which is currently unmapped.
72060 * For shmat() with addr=0.
72061 *
72062@@ -1374,18 +1571,23 @@ arch_get_unmapped_area(struct file *filp, unsigned long addr,
72063 if (flags & MAP_FIXED)
72064 return addr;
72065
72066+#ifdef CONFIG_PAX_RANDMMAP
72067+ if (!(mm->pax_flags & MF_PAX_RANDMMAP))
72068+#endif
72069+
72070 if (addr) {
72071 addr = PAGE_ALIGN(addr);
72072- vma = find_vma(mm, addr);
72073- if (TASK_SIZE - len >= addr &&
72074- (!vma || addr + len <= vma->vm_start))
72075- return addr;
72076+ if (TASK_SIZE - len >= addr) {
72077+ vma = find_vma(mm, addr);
72078+ if (check_heap_stack_gap(vma, addr, len))
72079+ return addr;
72080+ }
72081 }
72082 if (len > mm->cached_hole_size) {
72083- start_addr = addr = mm->free_area_cache;
72084+ start_addr = addr = mm->free_area_cache;
72085 } else {
72086- start_addr = addr = TASK_UNMAPPED_BASE;
72087- mm->cached_hole_size = 0;
72088+ start_addr = addr = mm->mmap_base;
72089+ mm->cached_hole_size = 0;
72090 }
72091
72092 full_search:
72093@@ -1396,34 +1598,40 @@ full_search:
72094 * Start a new search - just in case we missed
72095 * some holes.
72096 */
72097- if (start_addr != TASK_UNMAPPED_BASE) {
72098- addr = TASK_UNMAPPED_BASE;
72099- start_addr = addr;
72100+ if (start_addr != mm->mmap_base) {
72101+ start_addr = addr = mm->mmap_base;
72102 mm->cached_hole_size = 0;
72103 goto full_search;
72104 }
72105 return -ENOMEM;
72106 }
72107- if (!vma || addr + len <= vma->vm_start) {
72108- /*
72109- * Remember the place where we stopped the search:
72110- */
72111- mm->free_area_cache = addr + len;
72112- return addr;
72113- }
72114+ if (check_heap_stack_gap(vma, addr, len))
72115+ break;
72116 if (addr + mm->cached_hole_size < vma->vm_start)
72117 mm->cached_hole_size = vma->vm_start - addr;
72118 addr = vma->vm_end;
72119 }
72120+
72121+ /*
72122+ * Remember the place where we stopped the search:
72123+ */
72124+ mm->free_area_cache = addr + len;
72125+ return addr;
72126 }
72127 #endif
72128
72129 void arch_unmap_area(struct mm_struct *mm, unsigned long addr)
72130 {
72131+
72132+#ifdef CONFIG_PAX_SEGMEXEC
72133+ if ((mm->pax_flags & MF_PAX_SEGMEXEC) && SEGMEXEC_TASK_SIZE <= addr)
72134+ return;
72135+#endif
72136+
72137 /*
72138 * Is this a new hole at the lowest possible address?
72139 */
72140- if (addr >= TASK_UNMAPPED_BASE && addr < mm->free_area_cache) {
72141+ if (addr >= mm->mmap_base && addr < mm->free_area_cache) {
72142 mm->free_area_cache = addr;
72143 mm->cached_hole_size = ~0UL;
72144 }
72145@@ -1441,7 +1649,7 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
72146 {
72147 struct vm_area_struct *vma;
72148 struct mm_struct *mm = current->mm;
72149- unsigned long addr = addr0;
72150+ unsigned long base = mm->mmap_base, addr = addr0;
72151
72152 /* requested length too big for entire address space */
72153 if (len > TASK_SIZE)
72154@@ -1450,13 +1658,18 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
72155 if (flags & MAP_FIXED)
72156 return addr;
72157
72158+#ifdef CONFIG_PAX_RANDMMAP
72159+ if (!(mm->pax_flags & MF_PAX_RANDMMAP))
72160+#endif
72161+
72162 /* requesting a specific address */
72163 if (addr) {
72164 addr = PAGE_ALIGN(addr);
72165- vma = find_vma(mm, addr);
72166- if (TASK_SIZE - len >= addr &&
72167- (!vma || addr + len <= vma->vm_start))
72168- return addr;
72169+ if (TASK_SIZE - len >= addr) {
72170+ vma = find_vma(mm, addr);
72171+ if (check_heap_stack_gap(vma, addr, len))
72172+ return addr;
72173+ }
72174 }
72175
72176 /* check if free_area_cache is useful for us */
72177@@ -1471,7 +1684,7 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
72178 /* make sure it can fit in the remaining address space */
72179 if (addr > len) {
72180 vma = find_vma(mm, addr-len);
72181- if (!vma || addr <= vma->vm_start)
72182+ if (check_heap_stack_gap(vma, addr - len, len))
72183 /* remember the address as a hint for next time */
72184 return (mm->free_area_cache = addr-len);
72185 }
72186@@ -1488,7 +1701,7 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
72187 * return with success:
72188 */
72189 vma = find_vma(mm, addr);
72190- if (!vma || addr+len <= vma->vm_start)
72191+ if (check_heap_stack_gap(vma, addr, len))
72192 /* remember the address as a hint for next time */
72193 return (mm->free_area_cache = addr);
72194
72195@@ -1497,8 +1710,8 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
72196 mm->cached_hole_size = vma->vm_start - addr;
72197
72198 /* try just below the current vma->vm_start */
72199- addr = vma->vm_start-len;
72200- } while (len < vma->vm_start);
72201+ addr = skip_heap_stack_gap(vma, len);
72202+ } while (!IS_ERR_VALUE(addr));
72203
72204 bottomup:
72205 /*
72206@@ -1507,13 +1720,21 @@ bottomup:
72207 * can happen with large stack limits and large mmap()
72208 * allocations.
72209 */
72210+ mm->mmap_base = TASK_UNMAPPED_BASE;
72211+
72212+#ifdef CONFIG_PAX_RANDMMAP
72213+ if (mm->pax_flags & MF_PAX_RANDMMAP)
72214+ mm->mmap_base += mm->delta_mmap;
72215+#endif
72216+
72217+ mm->free_area_cache = mm->mmap_base;
72218 mm->cached_hole_size = ~0UL;
72219- mm->free_area_cache = TASK_UNMAPPED_BASE;
72220 addr = arch_get_unmapped_area(filp, addr0, len, pgoff, flags);
72221 /*
72222 * Restore the topdown base:
72223 */
72224- mm->free_area_cache = mm->mmap_base;
72225+ mm->mmap_base = base;
72226+ mm->free_area_cache = base;
72227 mm->cached_hole_size = ~0UL;
72228
72229 return addr;
72230@@ -1522,6 +1743,12 @@ bottomup:
72231
72232 void arch_unmap_area_topdown(struct mm_struct *mm, unsigned long addr)
72233 {
72234+
72235+#ifdef CONFIG_PAX_SEGMEXEC
72236+ if ((mm->pax_flags & MF_PAX_SEGMEXEC) && SEGMEXEC_TASK_SIZE <= addr)
72237+ return;
72238+#endif
72239+
72240 /*
72241 * Is this a new hole at the highest possible address?
72242 */
72243@@ -1529,8 +1756,10 @@ void arch_unmap_area_topdown(struct mm_struct *mm, unsigned long addr)
72244 mm->free_area_cache = addr;
72245
72246 /* dont allow allocations above current base */
72247- if (mm->free_area_cache > mm->mmap_base)
72248+ if (mm->free_area_cache > mm->mmap_base) {
72249 mm->free_area_cache = mm->mmap_base;
72250+ mm->cached_hole_size = ~0UL;
72251+ }
72252 }
72253
72254 unsigned long
72255@@ -1603,40 +1832,50 @@ struct vm_area_struct *find_vma(struct mm_struct *mm, unsigned long addr)
72256
72257 EXPORT_SYMBOL(find_vma);
72258
72259-/* Same as find_vma, but also return a pointer to the previous VMA in *pprev. */
72260+/*
72261+ * Same as find_vma, but also return a pointer to the previous VMA in *pprev.
72262+ */
72263 struct vm_area_struct *
72264 find_vma_prev(struct mm_struct *mm, unsigned long addr,
72265 struct vm_area_struct **pprev)
72266 {
72267- struct vm_area_struct *vma = NULL, *prev = NULL;
72268- struct rb_node *rb_node;
72269- if (!mm)
72270- goto out;
72271-
72272- /* Guard against addr being lower than the first VMA */
72273- vma = mm->mmap;
72274-
72275- /* Go through the RB tree quickly. */
72276- rb_node = mm->mm_rb.rb_node;
72277-
72278- while (rb_node) {
72279- struct vm_area_struct *vma_tmp;
72280- vma_tmp = rb_entry(rb_node, struct vm_area_struct, vm_rb);
72281-
72282- if (addr < vma_tmp->vm_end) {
72283- rb_node = rb_node->rb_left;
72284- } else {
72285- prev = vma_tmp;
72286- if (!prev->vm_next || (addr < prev->vm_next->vm_end))
72287- break;
72288+ struct vm_area_struct *vma;
72289+
72290+ vma = find_vma(mm, addr);
72291+ if (vma) {
72292+ *pprev = vma->vm_prev;
72293+ } else {
72294+ struct rb_node *rb_node = mm->mm_rb.rb_node;
72295+ *pprev = NULL;
72296+ while (rb_node) {
72297+ *pprev = rb_entry(rb_node, struct vm_area_struct, vm_rb);
72298 rb_node = rb_node->rb_right;
72299 }
72300 }
72301+ return vma;
72302+}
72303+
72304+#ifdef CONFIG_PAX_SEGMEXEC
72305+struct vm_area_struct *pax_find_mirror_vma(struct vm_area_struct *vma)
72306+{
72307+ struct vm_area_struct *vma_m;
72308
72309-out:
72310- *pprev = prev;
72311- return prev ? prev->vm_next : vma;
72312+ BUG_ON(!vma || vma->vm_start >= vma->vm_end);
72313+ if (!(vma->vm_mm->pax_flags & MF_PAX_SEGMEXEC) || !(vma->vm_flags & VM_EXEC)) {
72314+ BUG_ON(vma->vm_mirror);
72315+ return NULL;
72316+ }
72317+ BUG_ON(vma->vm_start < SEGMEXEC_TASK_SIZE && SEGMEXEC_TASK_SIZE < vma->vm_end);
72318+ vma_m = vma->vm_mirror;
72319+ BUG_ON(!vma_m || vma_m->vm_mirror != vma);
72320+ BUG_ON(vma->vm_file != vma_m->vm_file);
72321+ BUG_ON(vma->vm_end - vma->vm_start != vma_m->vm_end - vma_m->vm_start);
72322+ BUG_ON(vma->vm_pgoff != vma_m->vm_pgoff);
72323+ BUG_ON(vma->anon_vma != vma_m->anon_vma && vma->anon_vma->root != vma_m->anon_vma->root);
72324+ BUG_ON((vma->vm_flags ^ vma_m->vm_flags) & ~(VM_WRITE | VM_MAYWRITE | VM_ACCOUNT | VM_LOCKED | VM_RESERVED));
72325+ return vma_m;
72326 }
72327+#endif
72328
72329 /*
72330 * Verify that the stack growth is acceptable and
72331@@ -1654,6 +1893,7 @@ static int acct_stack_growth(struct vm_area_struct *vma, unsigned long size, uns
72332 return -ENOMEM;
72333
72334 /* Stack limit test */
72335+ gr_learn_resource(current, RLIMIT_STACK, size, 1);
72336 if (size > ACCESS_ONCE(rlim[RLIMIT_STACK].rlim_cur))
72337 return -ENOMEM;
72338
72339@@ -1664,6 +1904,7 @@ static int acct_stack_growth(struct vm_area_struct *vma, unsigned long size, uns
72340 locked = mm->locked_vm + grow;
72341 limit = ACCESS_ONCE(rlim[RLIMIT_MEMLOCK].rlim_cur);
72342 limit >>= PAGE_SHIFT;
72343+ gr_learn_resource(current, RLIMIT_MEMLOCK, locked << PAGE_SHIFT, 1);
72344 if (locked > limit && !capable(CAP_IPC_LOCK))
72345 return -ENOMEM;
72346 }
72347@@ -1694,37 +1935,48 @@ static int acct_stack_growth(struct vm_area_struct *vma, unsigned long size, uns
72348 * PA-RISC uses this for its stack; IA64 for its Register Backing Store.
72349 * vma is the last one with address > vma->vm_end. Have to extend vma.
72350 */
72351+#ifndef CONFIG_IA64
72352+static
72353+#endif
72354 int expand_upwards(struct vm_area_struct *vma, unsigned long address)
72355 {
72356 int error;
72357+ bool locknext;
72358
72359 if (!(vma->vm_flags & VM_GROWSUP))
72360 return -EFAULT;
72361
72362+ /* Also guard against wrapping around to address 0. */
72363+ if (address < PAGE_ALIGN(address+1))
72364+ address = PAGE_ALIGN(address+1);
72365+ else
72366+ return -ENOMEM;
72367+
72368 /*
72369 * We must make sure the anon_vma is allocated
72370 * so that the anon_vma locking is not a noop.
72371 */
72372 if (unlikely(anon_vma_prepare(vma)))
72373 return -ENOMEM;
72374+ locknext = vma->vm_next && (vma->vm_next->vm_flags & VM_GROWSDOWN);
72375+ if (locknext && anon_vma_prepare(vma->vm_next))
72376+ return -ENOMEM;
72377 vma_lock_anon_vma(vma);
72378+ if (locknext)
72379+ vma_lock_anon_vma(vma->vm_next);
72380
72381 /*
72382 * vma->vm_start/vm_end cannot change under us because the caller
72383 * is required to hold the mmap_sem in read mode. We need the
72384- * anon_vma lock to serialize against concurrent expand_stacks.
72385- * Also guard against wrapping around to address 0.
72386+ * anon_vma locks to serialize against concurrent expand_stacks
72387+ * and expand_upwards.
72388 */
72389- if (address < PAGE_ALIGN(address+4))
72390- address = PAGE_ALIGN(address+4);
72391- else {
72392- vma_unlock_anon_vma(vma);
72393- return -ENOMEM;
72394- }
72395 error = 0;
72396
72397 /* Somebody else might have raced and expanded it already */
72398- if (address > vma->vm_end) {
72399+ 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)
72400+ error = -ENOMEM;
72401+ else if (address > vma->vm_end && (!locknext || vma->vm_next->vm_start >= address)) {
72402 unsigned long size, grow;
72403
72404 size = address - vma->vm_start;
72405@@ -1739,6 +1991,8 @@ int expand_upwards(struct vm_area_struct *vma, unsigned long address)
72406 }
72407 }
72408 }
72409+ if (locknext)
72410+ vma_unlock_anon_vma(vma->vm_next);
72411 vma_unlock_anon_vma(vma);
72412 khugepaged_enter_vma_merge(vma);
72413 return error;
72414@@ -1752,6 +2006,8 @@ int expand_downwards(struct vm_area_struct *vma,
72415 unsigned long address)
72416 {
72417 int error;
72418+ bool lockprev = false;
72419+ struct vm_area_struct *prev;
72420
72421 /*
72422 * We must make sure the anon_vma is allocated
72423@@ -1765,6 +2021,15 @@ int expand_downwards(struct vm_area_struct *vma,
72424 if (error)
72425 return error;
72426
72427+ prev = vma->vm_prev;
72428+#if defined(CONFIG_STACK_GROWSUP) || defined(CONFIG_IA64)
72429+ lockprev = prev && (prev->vm_flags & VM_GROWSUP);
72430+#endif
72431+ if (lockprev && anon_vma_prepare(prev))
72432+ return -ENOMEM;
72433+ if (lockprev)
72434+ vma_lock_anon_vma(prev);
72435+
72436 vma_lock_anon_vma(vma);
72437
72438 /*
72439@@ -1774,9 +2039,17 @@ int expand_downwards(struct vm_area_struct *vma,
72440 */
72441
72442 /* Somebody else might have raced and expanded it already */
72443- if (address < vma->vm_start) {
72444+ if (prev && (prev->vm_flags & (VM_READ | VM_WRITE | VM_EXEC)) && address - prev->vm_end < sysctl_heap_stack_gap)
72445+ error = -ENOMEM;
72446+ else if (address < vma->vm_start && (!lockprev || prev->vm_end <= address)) {
72447 unsigned long size, grow;
72448
72449+#ifdef CONFIG_PAX_SEGMEXEC
72450+ struct vm_area_struct *vma_m;
72451+
72452+ vma_m = pax_find_mirror_vma(vma);
72453+#endif
72454+
72455 size = vma->vm_end - address;
72456 grow = (vma->vm_start - address) >> PAGE_SHIFT;
72457
72458@@ -1786,11 +2059,22 @@ int expand_downwards(struct vm_area_struct *vma,
72459 if (!error) {
72460 vma->vm_start = address;
72461 vma->vm_pgoff -= grow;
72462+ track_exec_limit(vma->vm_mm, vma->vm_start, vma->vm_end, vma->vm_flags);
72463+
72464+#ifdef CONFIG_PAX_SEGMEXEC
72465+ if (vma_m) {
72466+ vma_m->vm_start -= grow << PAGE_SHIFT;
72467+ vma_m->vm_pgoff -= grow;
72468+ }
72469+#endif
72470+
72471 perf_event_mmap(vma);
72472 }
72473 }
72474 }
72475 vma_unlock_anon_vma(vma);
72476+ if (lockprev)
72477+ vma_unlock_anon_vma(prev);
72478 khugepaged_enter_vma_merge(vma);
72479 return error;
72480 }
72481@@ -1860,6 +2144,13 @@ static void remove_vma_list(struct mm_struct *mm, struct vm_area_struct *vma)
72482 do {
72483 long nrpages = vma_pages(vma);
72484
72485+#ifdef CONFIG_PAX_SEGMEXEC
72486+ if ((mm->pax_flags & MF_PAX_SEGMEXEC) && (vma->vm_start >= SEGMEXEC_TASK_SIZE)) {
72487+ vma = remove_vma(vma);
72488+ continue;
72489+ }
72490+#endif
72491+
72492 mm->total_vm -= nrpages;
72493 vm_stat_account(mm, vma->vm_flags, vma->vm_file, -nrpages);
72494 vma = remove_vma(vma);
72495@@ -1905,6 +2196,16 @@ detach_vmas_to_be_unmapped(struct mm_struct *mm, struct vm_area_struct *vma,
72496 insertion_point = (prev ? &prev->vm_next : &mm->mmap);
72497 vma->vm_prev = NULL;
72498 do {
72499+
72500+#ifdef CONFIG_PAX_SEGMEXEC
72501+ if (vma->vm_mirror) {
72502+ BUG_ON(!vma->vm_mirror->vm_mirror || vma->vm_mirror->vm_mirror != vma);
72503+ vma->vm_mirror->vm_mirror = NULL;
72504+ vma->vm_mirror->vm_flags &= ~VM_EXEC;
72505+ vma->vm_mirror = NULL;
72506+ }
72507+#endif
72508+
72509 rb_erase(&vma->vm_rb, &mm->mm_rb);
72510 mm->map_count--;
72511 tail_vma = vma;
72512@@ -1933,14 +2234,33 @@ static int __split_vma(struct mm_struct * mm, struct vm_area_struct * vma,
72513 struct vm_area_struct *new;
72514 int err = -ENOMEM;
72515
72516+#ifdef CONFIG_PAX_SEGMEXEC
72517+ struct vm_area_struct *vma_m, *new_m = NULL;
72518+ unsigned long addr_m = addr + SEGMEXEC_TASK_SIZE;
72519+#endif
72520+
72521 if (is_vm_hugetlb_page(vma) && (addr &
72522 ~(huge_page_mask(hstate_vma(vma)))))
72523 return -EINVAL;
72524
72525+#ifdef CONFIG_PAX_SEGMEXEC
72526+ vma_m = pax_find_mirror_vma(vma);
72527+#endif
72528+
72529 new = kmem_cache_alloc(vm_area_cachep, GFP_KERNEL);
72530 if (!new)
72531 goto out_err;
72532
72533+#ifdef CONFIG_PAX_SEGMEXEC
72534+ if (vma_m) {
72535+ new_m = kmem_cache_alloc(vm_area_cachep, GFP_KERNEL);
72536+ if (!new_m) {
72537+ kmem_cache_free(vm_area_cachep, new);
72538+ goto out_err;
72539+ }
72540+ }
72541+#endif
72542+
72543 /* most fields are the same, copy all, and then fixup */
72544 *new = *vma;
72545
72546@@ -1953,6 +2273,22 @@ static int __split_vma(struct mm_struct * mm, struct vm_area_struct * vma,
72547 new->vm_pgoff += ((addr - vma->vm_start) >> PAGE_SHIFT);
72548 }
72549
72550+#ifdef CONFIG_PAX_SEGMEXEC
72551+ if (vma_m) {
72552+ *new_m = *vma_m;
72553+ INIT_LIST_HEAD(&new_m->anon_vma_chain);
72554+ new_m->vm_mirror = new;
72555+ new->vm_mirror = new_m;
72556+
72557+ if (new_below)
72558+ new_m->vm_end = addr_m;
72559+ else {
72560+ new_m->vm_start = addr_m;
72561+ new_m->vm_pgoff += ((addr_m - vma_m->vm_start) >> PAGE_SHIFT);
72562+ }
72563+ }
72564+#endif
72565+
72566 pol = mpol_dup(vma_policy(vma));
72567 if (IS_ERR(pol)) {
72568 err = PTR_ERR(pol);
72569@@ -1978,6 +2314,42 @@ static int __split_vma(struct mm_struct * mm, struct vm_area_struct * vma,
72570 else
72571 err = vma_adjust(vma, vma->vm_start, addr, vma->vm_pgoff, new);
72572
72573+#ifdef CONFIG_PAX_SEGMEXEC
72574+ if (!err && vma_m) {
72575+ if (anon_vma_clone(new_m, vma_m))
72576+ goto out_free_mpol;
72577+
72578+ mpol_get(pol);
72579+ vma_set_policy(new_m, pol);
72580+
72581+ if (new_m->vm_file) {
72582+ get_file(new_m->vm_file);
72583+ if (vma_m->vm_flags & VM_EXECUTABLE)
72584+ added_exe_file_vma(mm);
72585+ }
72586+
72587+ if (new_m->vm_ops && new_m->vm_ops->open)
72588+ new_m->vm_ops->open(new_m);
72589+
72590+ if (new_below)
72591+ err = vma_adjust(vma_m, addr_m, vma_m->vm_end, vma_m->vm_pgoff +
72592+ ((addr_m - new_m->vm_start) >> PAGE_SHIFT), new_m);
72593+ else
72594+ err = vma_adjust(vma_m, vma_m->vm_start, addr_m, vma_m->vm_pgoff, new_m);
72595+
72596+ if (err) {
72597+ if (new_m->vm_ops && new_m->vm_ops->close)
72598+ new_m->vm_ops->close(new_m);
72599+ if (new_m->vm_file) {
72600+ if (vma_m->vm_flags & VM_EXECUTABLE)
72601+ removed_exe_file_vma(mm);
72602+ fput(new_m->vm_file);
72603+ }
72604+ mpol_put(pol);
72605+ }
72606+ }
72607+#endif
72608+
72609 /* Success. */
72610 if (!err)
72611 return 0;
72612@@ -1990,10 +2362,18 @@ static int __split_vma(struct mm_struct * mm, struct vm_area_struct * vma,
72613 removed_exe_file_vma(mm);
72614 fput(new->vm_file);
72615 }
72616- unlink_anon_vmas(new);
72617 out_free_mpol:
72618 mpol_put(pol);
72619 out_free_vma:
72620+
72621+#ifdef CONFIG_PAX_SEGMEXEC
72622+ if (new_m) {
72623+ unlink_anon_vmas(new_m);
72624+ kmem_cache_free(vm_area_cachep, new_m);
72625+ }
72626+#endif
72627+
72628+ unlink_anon_vmas(new);
72629 kmem_cache_free(vm_area_cachep, new);
72630 out_err:
72631 return err;
72632@@ -2006,6 +2386,15 @@ static int __split_vma(struct mm_struct * mm, struct vm_area_struct * vma,
72633 int split_vma(struct mm_struct *mm, struct vm_area_struct *vma,
72634 unsigned long addr, int new_below)
72635 {
72636+
72637+#ifdef CONFIG_PAX_SEGMEXEC
72638+ if (mm->pax_flags & MF_PAX_SEGMEXEC) {
72639+ BUG_ON(vma->vm_end > SEGMEXEC_TASK_SIZE);
72640+ if (mm->map_count >= sysctl_max_map_count-1)
72641+ return -ENOMEM;
72642+ } else
72643+#endif
72644+
72645 if (mm->map_count >= sysctl_max_map_count)
72646 return -ENOMEM;
72647
72648@@ -2017,11 +2406,30 @@ int split_vma(struct mm_struct *mm, struct vm_area_struct *vma,
72649 * work. This now handles partial unmappings.
72650 * Jeremy Fitzhardinge <jeremy@goop.org>
72651 */
72652+#ifdef CONFIG_PAX_SEGMEXEC
72653 int do_munmap(struct mm_struct *mm, unsigned long start, size_t len)
72654 {
72655+ int ret = __do_munmap(mm, start, len);
72656+ if (ret || !(mm->pax_flags & MF_PAX_SEGMEXEC))
72657+ return ret;
72658+
72659+ return __do_munmap(mm, start + SEGMEXEC_TASK_SIZE, len);
72660+}
72661+
72662+int __do_munmap(struct mm_struct *mm, unsigned long start, size_t len)
72663+#else
72664+int do_munmap(struct mm_struct *mm, unsigned long start, size_t len)
72665+#endif
72666+{
72667 unsigned long end;
72668 struct vm_area_struct *vma, *prev, *last;
72669
72670+ /*
72671+ * mm->mmap_sem is required to protect against another thread
72672+ * changing the mappings in case we sleep.
72673+ */
72674+ verify_mm_writelocked(mm);
72675+
72676 if ((start & ~PAGE_MASK) || start > TASK_SIZE || len > TASK_SIZE-start)
72677 return -EINVAL;
72678
72679@@ -2096,6 +2504,8 @@ int do_munmap(struct mm_struct *mm, unsigned long start, size_t len)
72680 /* Fix up all other VM information */
72681 remove_vma_list(mm, vma);
72682
72683+ track_exec_limit(mm, start, end, 0UL);
72684+
72685 return 0;
72686 }
72687
72688@@ -2108,22 +2518,18 @@ SYSCALL_DEFINE2(munmap, unsigned long, addr, size_t, len)
72689
72690 profile_munmap(addr);
72691
72692+#ifdef CONFIG_PAX_SEGMEXEC
72693+ if ((mm->pax_flags & MF_PAX_SEGMEXEC) &&
72694+ (len > SEGMEXEC_TASK_SIZE || addr > SEGMEXEC_TASK_SIZE-len))
72695+ return -EINVAL;
72696+#endif
72697+
72698 down_write(&mm->mmap_sem);
72699 ret = do_munmap(mm, addr, len);
72700 up_write(&mm->mmap_sem);
72701 return ret;
72702 }
72703
72704-static inline void verify_mm_writelocked(struct mm_struct *mm)
72705-{
72706-#ifdef CONFIG_DEBUG_VM
72707- if (unlikely(down_read_trylock(&mm->mmap_sem))) {
72708- WARN_ON(1);
72709- up_read(&mm->mmap_sem);
72710- }
72711-#endif
72712-}
72713-
72714 /*
72715 * this is really a simplified "do_mmap". it only handles
72716 * anonymous maps. eventually we may be able to do some
72717@@ -2137,6 +2543,7 @@ unsigned long do_brk(unsigned long addr, unsigned long len)
72718 struct rb_node ** rb_link, * rb_parent;
72719 pgoff_t pgoff = addr >> PAGE_SHIFT;
72720 int error;
72721+ unsigned long charged;
72722
72723 len = PAGE_ALIGN(len);
72724 if (!len)
72725@@ -2148,16 +2555,30 @@ unsigned long do_brk(unsigned long addr, unsigned long len)
72726
72727 flags = VM_DATA_DEFAULT_FLAGS | VM_ACCOUNT | mm->def_flags;
72728
72729+#if defined(CONFIG_PAX_PAGEEXEC) || defined(CONFIG_PAX_SEGMEXEC)
72730+ if (mm->pax_flags & (MF_PAX_PAGEEXEC | MF_PAX_SEGMEXEC)) {
72731+ flags &= ~VM_EXEC;
72732+
72733+#ifdef CONFIG_PAX_MPROTECT
72734+ if (mm->pax_flags & MF_PAX_MPROTECT)
72735+ flags &= ~VM_MAYEXEC;
72736+#endif
72737+
72738+ }
72739+#endif
72740+
72741 error = get_unmapped_area(NULL, addr, len, 0, MAP_FIXED);
72742 if (error & ~PAGE_MASK)
72743 return error;
72744
72745+ charged = len >> PAGE_SHIFT;
72746+
72747 /*
72748 * mlock MCL_FUTURE?
72749 */
72750 if (mm->def_flags & VM_LOCKED) {
72751 unsigned long locked, lock_limit;
72752- locked = len >> PAGE_SHIFT;
72753+ locked = charged;
72754 locked += mm->locked_vm;
72755 lock_limit = rlimit(RLIMIT_MEMLOCK);
72756 lock_limit >>= PAGE_SHIFT;
72757@@ -2174,22 +2595,22 @@ unsigned long do_brk(unsigned long addr, unsigned long len)
72758 /*
72759 * Clear old maps. this also does some error checking for us
72760 */
72761- munmap_back:
72762 vma = find_vma_prepare(mm, addr, &prev, &rb_link, &rb_parent);
72763 if (vma && vma->vm_start < addr + len) {
72764 if (do_munmap(mm, addr, len))
72765 return -ENOMEM;
72766- goto munmap_back;
72767+ vma = find_vma_prepare(mm, addr, &prev, &rb_link, &rb_parent);
72768+ BUG_ON(vma && vma->vm_start < addr + len);
72769 }
72770
72771 /* Check against address space limits *after* clearing old maps... */
72772- if (!may_expand_vm(mm, len >> PAGE_SHIFT))
72773+ if (!may_expand_vm(mm, charged))
72774 return -ENOMEM;
72775
72776 if (mm->map_count > sysctl_max_map_count)
72777 return -ENOMEM;
72778
72779- if (security_vm_enough_memory(len >> PAGE_SHIFT))
72780+ if (security_vm_enough_memory(charged))
72781 return -ENOMEM;
72782
72783 /* Can we just expand an old private anonymous mapping? */
72784@@ -2203,7 +2624,7 @@ unsigned long do_brk(unsigned long addr, unsigned long len)
72785 */
72786 vma = kmem_cache_zalloc(vm_area_cachep, GFP_KERNEL);
72787 if (!vma) {
72788- vm_unacct_memory(len >> PAGE_SHIFT);
72789+ vm_unacct_memory(charged);
72790 return -ENOMEM;
72791 }
72792
72793@@ -2217,11 +2638,12 @@ unsigned long do_brk(unsigned long addr, unsigned long len)
72794 vma_link(mm, vma, prev, rb_link, rb_parent);
72795 out:
72796 perf_event_mmap(vma);
72797- mm->total_vm += len >> PAGE_SHIFT;
72798+ mm->total_vm += charged;
72799 if (flags & VM_LOCKED) {
72800 if (!mlock_vma_pages_range(vma, addr, addr + len))
72801- mm->locked_vm += (len >> PAGE_SHIFT);
72802+ mm->locked_vm += charged;
72803 }
72804+ track_exec_limit(mm, addr, addr + len, flags);
72805 return addr;
72806 }
72807
72808@@ -2268,8 +2690,10 @@ void exit_mmap(struct mm_struct *mm)
72809 * Walk the list again, actually closing and freeing it,
72810 * with preemption enabled, without holding any MM locks.
72811 */
72812- while (vma)
72813+ while (vma) {
72814+ vma->vm_mirror = NULL;
72815 vma = remove_vma(vma);
72816+ }
72817
72818 BUG_ON(mm->nr_ptes > (FIRST_USER_ADDRESS+PMD_SIZE-1)>>PMD_SHIFT);
72819 }
72820@@ -2283,6 +2707,13 @@ int insert_vm_struct(struct mm_struct * mm, struct vm_area_struct * vma)
72821 struct vm_area_struct * __vma, * prev;
72822 struct rb_node ** rb_link, * rb_parent;
72823
72824+#ifdef CONFIG_PAX_SEGMEXEC
72825+ struct vm_area_struct *vma_m = NULL;
72826+#endif
72827+
72828+ if (security_file_mmap(NULL, 0, 0, 0, vma->vm_start, 1))
72829+ return -EPERM;
72830+
72831 /*
72832 * The vm_pgoff of a purely anonymous vma should be irrelevant
72833 * until its first write fault, when page's anon_vma and index
72834@@ -2305,7 +2736,22 @@ int insert_vm_struct(struct mm_struct * mm, struct vm_area_struct * vma)
72835 if ((vma->vm_flags & VM_ACCOUNT) &&
72836 security_vm_enough_memory_mm(mm, vma_pages(vma)))
72837 return -ENOMEM;
72838+
72839+#ifdef CONFIG_PAX_SEGMEXEC
72840+ if ((mm->pax_flags & MF_PAX_SEGMEXEC) && (vma->vm_flags & VM_EXEC)) {
72841+ vma_m = kmem_cache_zalloc(vm_area_cachep, GFP_KERNEL);
72842+ if (!vma_m)
72843+ return -ENOMEM;
72844+ }
72845+#endif
72846+
72847 vma_link(mm, vma, prev, rb_link, rb_parent);
72848+
72849+#ifdef CONFIG_PAX_SEGMEXEC
72850+ if (vma_m)
72851+ BUG_ON(pax_mirror_vma(vma_m, vma));
72852+#endif
72853+
72854 return 0;
72855 }
72856
72857@@ -2323,6 +2769,8 @@ struct vm_area_struct *copy_vma(struct vm_area_struct **vmap,
72858 struct rb_node **rb_link, *rb_parent;
72859 struct mempolicy *pol;
72860
72861+ BUG_ON(vma->vm_mirror);
72862+
72863 /*
72864 * If anonymous vma has not yet been faulted, update new pgoff
72865 * to match new location, to increase its chance of merging.
72866@@ -2373,6 +2821,39 @@ struct vm_area_struct *copy_vma(struct vm_area_struct **vmap,
72867 return NULL;
72868 }
72869
72870+#ifdef CONFIG_PAX_SEGMEXEC
72871+long pax_mirror_vma(struct vm_area_struct *vma_m, struct vm_area_struct *vma)
72872+{
72873+ struct vm_area_struct *prev_m;
72874+ struct rb_node **rb_link_m, *rb_parent_m;
72875+ struct mempolicy *pol_m;
72876+
72877+ BUG_ON(!(vma->vm_mm->pax_flags & MF_PAX_SEGMEXEC) || !(vma->vm_flags & VM_EXEC));
72878+ BUG_ON(vma->vm_mirror || vma_m->vm_mirror);
72879+ BUG_ON(!mpol_equal(vma_policy(vma), vma_policy(vma_m)));
72880+ *vma_m = *vma;
72881+ INIT_LIST_HEAD(&vma_m->anon_vma_chain);
72882+ if (anon_vma_clone(vma_m, vma))
72883+ return -ENOMEM;
72884+ pol_m = vma_policy(vma_m);
72885+ mpol_get(pol_m);
72886+ vma_set_policy(vma_m, pol_m);
72887+ vma_m->vm_start += SEGMEXEC_TASK_SIZE;
72888+ vma_m->vm_end += SEGMEXEC_TASK_SIZE;
72889+ vma_m->vm_flags &= ~(VM_WRITE | VM_MAYWRITE | VM_ACCOUNT | VM_LOCKED);
72890+ vma_m->vm_page_prot = vm_get_page_prot(vma_m->vm_flags);
72891+ if (vma_m->vm_file)
72892+ get_file(vma_m->vm_file);
72893+ if (vma_m->vm_ops && vma_m->vm_ops->open)
72894+ vma_m->vm_ops->open(vma_m);
72895+ find_vma_prepare(vma->vm_mm, vma_m->vm_start, &prev_m, &rb_link_m, &rb_parent_m);
72896+ vma_link(vma->vm_mm, vma_m, prev_m, rb_link_m, rb_parent_m);
72897+ vma_m->vm_mirror = vma;
72898+ vma->vm_mirror = vma_m;
72899+ return 0;
72900+}
72901+#endif
72902+
72903 /*
72904 * Return true if the calling process may expand its vm space by the passed
72905 * number of pages
72906@@ -2383,7 +2864,7 @@ int may_expand_vm(struct mm_struct *mm, unsigned long npages)
72907 unsigned long lim;
72908
72909 lim = rlimit(RLIMIT_AS) >> PAGE_SHIFT;
72910-
72911+ gr_learn_resource(current, RLIMIT_AS, (cur + npages) << PAGE_SHIFT, 1);
72912 if (cur + npages > lim)
72913 return 0;
72914 return 1;
72915@@ -2454,6 +2935,22 @@ int install_special_mapping(struct mm_struct *mm,
72916 vma->vm_start = addr;
72917 vma->vm_end = addr + len;
72918
72919+#ifdef CONFIG_PAX_MPROTECT
72920+ if (mm->pax_flags & MF_PAX_MPROTECT) {
72921+#ifndef CONFIG_PAX_MPROTECT_COMPAT
72922+ if ((vm_flags & (VM_WRITE | VM_EXEC)) == (VM_WRITE | VM_EXEC))
72923+ return -EPERM;
72924+ if (!(vm_flags & VM_EXEC))
72925+ vm_flags &= ~VM_MAYEXEC;
72926+#else
72927+ if ((vm_flags & (VM_WRITE | VM_EXEC)) != VM_EXEC)
72928+ vm_flags &= ~(VM_EXEC | VM_MAYEXEC);
72929+#endif
72930+ else
72931+ vm_flags &= ~VM_MAYWRITE;
72932+ }
72933+#endif
72934+
72935 vma->vm_flags = vm_flags | mm->def_flags | VM_DONTEXPAND;
72936 vma->vm_page_prot = vm_get_page_prot(vma->vm_flags);
72937
72938diff --git a/mm/mprotect.c b/mm/mprotect.c
72939index 5a688a2..27e031c 100644
72940--- a/mm/mprotect.c
72941+++ b/mm/mprotect.c
72942@@ -23,10 +23,16 @@
72943 #include <linux/mmu_notifier.h>
72944 #include <linux/migrate.h>
72945 #include <linux/perf_event.h>
72946+
72947+#ifdef CONFIG_PAX_MPROTECT
72948+#include <linux/elf.h>
72949+#endif
72950+
72951 #include <asm/uaccess.h>
72952 #include <asm/pgtable.h>
72953 #include <asm/cacheflush.h>
72954 #include <asm/tlbflush.h>
72955+#include <asm/mmu_context.h>
72956
72957 #ifndef pgprot_modify
72958 static inline pgprot_t pgprot_modify(pgprot_t oldprot, pgprot_t newprot)
72959@@ -141,6 +147,48 @@ static void change_protection(struct vm_area_struct *vma,
72960 flush_tlb_range(vma, start, end);
72961 }
72962
72963+#ifdef CONFIG_ARCH_TRACK_EXEC_LIMIT
72964+/* called while holding the mmap semaphor for writing except stack expansion */
72965+void track_exec_limit(struct mm_struct *mm, unsigned long start, unsigned long end, unsigned long prot)
72966+{
72967+ unsigned long oldlimit, newlimit = 0UL;
72968+
72969+ if (!(mm->pax_flags & MF_PAX_PAGEEXEC) || (__supported_pte_mask & _PAGE_NX))
72970+ return;
72971+
72972+ spin_lock(&mm->page_table_lock);
72973+ oldlimit = mm->context.user_cs_limit;
72974+ if ((prot & VM_EXEC) && oldlimit < end)
72975+ /* USER_CS limit moved up */
72976+ newlimit = end;
72977+ else if (!(prot & VM_EXEC) && start < oldlimit && oldlimit <= end)
72978+ /* USER_CS limit moved down */
72979+ newlimit = start;
72980+
72981+ if (newlimit) {
72982+ mm->context.user_cs_limit = newlimit;
72983+
72984+#ifdef CONFIG_SMP
72985+ wmb();
72986+ cpus_clear(mm->context.cpu_user_cs_mask);
72987+ cpu_set(smp_processor_id(), mm->context.cpu_user_cs_mask);
72988+#endif
72989+
72990+ set_user_cs(mm->context.user_cs_base, mm->context.user_cs_limit, smp_processor_id());
72991+ }
72992+ spin_unlock(&mm->page_table_lock);
72993+ if (newlimit == end) {
72994+ struct vm_area_struct *vma = find_vma(mm, oldlimit);
72995+
72996+ for (; vma && vma->vm_start < end; vma = vma->vm_next)
72997+ if (is_vm_hugetlb_page(vma))
72998+ hugetlb_change_protection(vma, vma->vm_start, vma->vm_end, vma->vm_page_prot);
72999+ else
73000+ change_protection(vma, vma->vm_start, vma->vm_end, vma->vm_page_prot, vma_wants_writenotify(vma));
73001+ }
73002+}
73003+#endif
73004+
73005 int
73006 mprotect_fixup(struct vm_area_struct *vma, struct vm_area_struct **pprev,
73007 unsigned long start, unsigned long end, unsigned long newflags)
73008@@ -153,11 +201,29 @@ mprotect_fixup(struct vm_area_struct *vma, struct vm_area_struct **pprev,
73009 int error;
73010 int dirty_accountable = 0;
73011
73012+#ifdef CONFIG_PAX_SEGMEXEC
73013+ struct vm_area_struct *vma_m = NULL;
73014+ unsigned long start_m, end_m;
73015+
73016+ start_m = start + SEGMEXEC_TASK_SIZE;
73017+ end_m = end + SEGMEXEC_TASK_SIZE;
73018+#endif
73019+
73020 if (newflags == oldflags) {
73021 *pprev = vma;
73022 return 0;
73023 }
73024
73025+ if (newflags & (VM_READ | VM_WRITE | VM_EXEC)) {
73026+ struct vm_area_struct *prev = vma->vm_prev, *next = vma->vm_next;
73027+
73028+ if (next && (next->vm_flags & VM_GROWSDOWN) && sysctl_heap_stack_gap > next->vm_start - end)
73029+ return -ENOMEM;
73030+
73031+ if (prev && (prev->vm_flags & VM_GROWSUP) && sysctl_heap_stack_gap > start - prev->vm_end)
73032+ return -ENOMEM;
73033+ }
73034+
73035 /*
73036 * If we make a private mapping writable we increase our commit;
73037 * but (without finer accounting) cannot reduce our commit if we
73038@@ -174,6 +240,42 @@ mprotect_fixup(struct vm_area_struct *vma, struct vm_area_struct **pprev,
73039 }
73040 }
73041
73042+#ifdef CONFIG_PAX_SEGMEXEC
73043+ if ((mm->pax_flags & MF_PAX_SEGMEXEC) && ((oldflags ^ newflags) & VM_EXEC)) {
73044+ if (start != vma->vm_start) {
73045+ error = split_vma(mm, vma, start, 1);
73046+ if (error)
73047+ goto fail;
73048+ BUG_ON(!*pprev || (*pprev)->vm_next == vma);
73049+ *pprev = (*pprev)->vm_next;
73050+ }
73051+
73052+ if (end != vma->vm_end) {
73053+ error = split_vma(mm, vma, end, 0);
73054+ if (error)
73055+ goto fail;
73056+ }
73057+
73058+ if (pax_find_mirror_vma(vma)) {
73059+ error = __do_munmap(mm, start_m, end_m - start_m);
73060+ if (error)
73061+ goto fail;
73062+ } else {
73063+ vma_m = kmem_cache_zalloc(vm_area_cachep, GFP_KERNEL);
73064+ if (!vma_m) {
73065+ error = -ENOMEM;
73066+ goto fail;
73067+ }
73068+ vma->vm_flags = newflags;
73069+ error = pax_mirror_vma(vma_m, vma);
73070+ if (error) {
73071+ vma->vm_flags = oldflags;
73072+ goto fail;
73073+ }
73074+ }
73075+ }
73076+#endif
73077+
73078 /*
73079 * First try to merge with previous and/or next vma.
73080 */
73081@@ -204,9 +306,21 @@ success:
73082 * vm_flags and vm_page_prot are protected by the mmap_sem
73083 * held in write mode.
73084 */
73085+
73086+#ifdef CONFIG_PAX_SEGMEXEC
73087+ if ((mm->pax_flags & MF_PAX_SEGMEXEC) && (newflags & VM_EXEC) && ((vma->vm_flags ^ newflags) & VM_READ))
73088+ pax_find_mirror_vma(vma)->vm_flags ^= VM_READ;
73089+#endif
73090+
73091 vma->vm_flags = newflags;
73092+
73093+#ifdef CONFIG_PAX_MPROTECT
73094+ if (mm->binfmt && mm->binfmt->handle_mprotect)
73095+ mm->binfmt->handle_mprotect(vma, newflags);
73096+#endif
73097+
73098 vma->vm_page_prot = pgprot_modify(vma->vm_page_prot,
73099- vm_get_page_prot(newflags));
73100+ vm_get_page_prot(vma->vm_flags));
73101
73102 if (vma_wants_writenotify(vma)) {
73103 vma->vm_page_prot = vm_get_page_prot(newflags & ~VM_SHARED);
73104@@ -248,6 +362,17 @@ SYSCALL_DEFINE3(mprotect, unsigned long, start, size_t, len,
73105 end = start + len;
73106 if (end <= start)
73107 return -ENOMEM;
73108+
73109+#ifdef CONFIG_PAX_SEGMEXEC
73110+ if (current->mm->pax_flags & MF_PAX_SEGMEXEC) {
73111+ if (end > SEGMEXEC_TASK_SIZE)
73112+ return -EINVAL;
73113+ } else
73114+#endif
73115+
73116+ if (end > TASK_SIZE)
73117+ return -EINVAL;
73118+
73119 if (!arch_validate_prot(prot))
73120 return -EINVAL;
73121
73122@@ -255,7 +380,7 @@ SYSCALL_DEFINE3(mprotect, unsigned long, start, size_t, len,
73123 /*
73124 * Does the application expect PROT_READ to imply PROT_EXEC:
73125 */
73126- if ((prot & PROT_READ) && (current->personality & READ_IMPLIES_EXEC))
73127+ if ((prot & (PROT_READ | PROT_WRITE)) && (current->personality & READ_IMPLIES_EXEC))
73128 prot |= PROT_EXEC;
73129
73130 vm_flags = calc_vm_prot_bits(prot);
73131@@ -287,6 +412,11 @@ SYSCALL_DEFINE3(mprotect, unsigned long, start, size_t, len,
73132 if (start > vma->vm_start)
73133 prev = vma;
73134
73135+#ifdef CONFIG_PAX_MPROTECT
73136+ if (current->mm->binfmt && current->mm->binfmt->handle_mprotect)
73137+ current->mm->binfmt->handle_mprotect(vma, vm_flags);
73138+#endif
73139+
73140 for (nstart = start ; ; ) {
73141 unsigned long newflags;
73142
73143@@ -296,6 +426,14 @@ SYSCALL_DEFINE3(mprotect, unsigned long, start, size_t, len,
73144
73145 /* newflags >> 4 shift VM_MAY% in place of VM_% */
73146 if ((newflags & ~(newflags >> 4)) & (VM_READ | VM_WRITE | VM_EXEC)) {
73147+ if (prot & (PROT_WRITE | PROT_EXEC))
73148+ gr_log_rwxmprotect(vma->vm_file);
73149+
73150+ error = -EACCES;
73151+ goto out;
73152+ }
73153+
73154+ if (!gr_acl_handle_mprotect(vma->vm_file, prot)) {
73155 error = -EACCES;
73156 goto out;
73157 }
73158@@ -310,6 +448,9 @@ SYSCALL_DEFINE3(mprotect, unsigned long, start, size_t, len,
73159 error = mprotect_fixup(vma, &prev, nstart, tmp, newflags);
73160 if (error)
73161 goto out;
73162+
73163+ track_exec_limit(current->mm, nstart, tmp, vm_flags);
73164+
73165 nstart = tmp;
73166
73167 if (nstart < prev->vm_end)
73168diff --git a/mm/mremap.c b/mm/mremap.c
73169index d6959cb..18a402a 100644
73170--- a/mm/mremap.c
73171+++ b/mm/mremap.c
73172@@ -106,6 +106,12 @@ static void move_ptes(struct vm_area_struct *vma, pmd_t *old_pmd,
73173 continue;
73174 pte = ptep_get_and_clear(mm, old_addr, old_pte);
73175 pte = move_pte(pte, new_vma->vm_page_prot, old_addr, new_addr);
73176+
73177+#ifdef CONFIG_ARCH_TRACK_EXEC_LIMIT
73178+ if (!(__supported_pte_mask & _PAGE_NX) && (new_vma->vm_flags & (VM_PAGEEXEC | VM_EXEC)) == VM_PAGEEXEC)
73179+ pte = pte_exprotect(pte);
73180+#endif
73181+
73182 set_pte_at(mm, new_addr, new_pte, pte);
73183 }
73184
73185@@ -290,6 +296,11 @@ static struct vm_area_struct *vma_to_resize(unsigned long addr,
73186 if (is_vm_hugetlb_page(vma))
73187 goto Einval;
73188
73189+#ifdef CONFIG_PAX_SEGMEXEC
73190+ if (pax_find_mirror_vma(vma))
73191+ goto Einval;
73192+#endif
73193+
73194 /* We can't remap across vm area boundaries */
73195 if (old_len > vma->vm_end - addr)
73196 goto Efault;
73197@@ -346,20 +357,25 @@ static unsigned long mremap_to(unsigned long addr,
73198 unsigned long ret = -EINVAL;
73199 unsigned long charged = 0;
73200 unsigned long map_flags;
73201+ unsigned long pax_task_size = TASK_SIZE;
73202
73203 if (new_addr & ~PAGE_MASK)
73204 goto out;
73205
73206- if (new_len > TASK_SIZE || new_addr > TASK_SIZE - new_len)
73207+#ifdef CONFIG_PAX_SEGMEXEC
73208+ if (mm->pax_flags & MF_PAX_SEGMEXEC)
73209+ pax_task_size = SEGMEXEC_TASK_SIZE;
73210+#endif
73211+
73212+ pax_task_size -= PAGE_SIZE;
73213+
73214+ if (new_len > TASK_SIZE || new_addr > pax_task_size - new_len)
73215 goto out;
73216
73217 /* Check if the location we're moving into overlaps the
73218 * old location at all, and fail if it does.
73219 */
73220- if ((new_addr <= addr) && (new_addr+new_len) > addr)
73221- goto out;
73222-
73223- if ((addr <= new_addr) && (addr+old_len) > new_addr)
73224+ if (addr + old_len > new_addr && new_addr + new_len > addr)
73225 goto out;
73226
73227 ret = security_file_mmap(NULL, 0, 0, 0, new_addr, 1);
73228@@ -431,6 +447,7 @@ unsigned long do_mremap(unsigned long addr,
73229 struct vm_area_struct *vma;
73230 unsigned long ret = -EINVAL;
73231 unsigned long charged = 0;
73232+ unsigned long pax_task_size = TASK_SIZE;
73233
73234 if (flags & ~(MREMAP_FIXED | MREMAP_MAYMOVE))
73235 goto out;
73236@@ -449,6 +466,17 @@ unsigned long do_mremap(unsigned long addr,
73237 if (!new_len)
73238 goto out;
73239
73240+#ifdef CONFIG_PAX_SEGMEXEC
73241+ if (mm->pax_flags & MF_PAX_SEGMEXEC)
73242+ pax_task_size = SEGMEXEC_TASK_SIZE;
73243+#endif
73244+
73245+ pax_task_size -= PAGE_SIZE;
73246+
73247+ if (new_len > pax_task_size || addr > pax_task_size-new_len ||
73248+ old_len > pax_task_size || addr > pax_task_size-old_len)
73249+ goto out;
73250+
73251 if (flags & MREMAP_FIXED) {
73252 if (flags & MREMAP_MAYMOVE)
73253 ret = mremap_to(addr, old_len, new_addr, new_len);
73254@@ -498,6 +526,7 @@ unsigned long do_mremap(unsigned long addr,
73255 addr + new_len);
73256 }
73257 ret = addr;
73258+ track_exec_limit(vma->vm_mm, vma->vm_start, addr + new_len, vma->vm_flags);
73259 goto out;
73260 }
73261 }
73262@@ -524,7 +553,13 @@ unsigned long do_mremap(unsigned long addr,
73263 ret = security_file_mmap(NULL, 0, 0, 0, new_addr, 1);
73264 if (ret)
73265 goto out;
73266+
73267+ map_flags = vma->vm_flags;
73268 ret = move_vma(vma, addr, old_len, new_len, new_addr);
73269+ if (!(ret & ~PAGE_MASK)) {
73270+ track_exec_limit(current->mm, addr, addr + old_len, 0UL);
73271+ track_exec_limit(current->mm, new_addr, new_addr + new_len, map_flags);
73272+ }
73273 }
73274 out:
73275 if (ret & ~PAGE_MASK)
73276diff --git a/mm/nobootmem.c b/mm/nobootmem.c
73277index 7fa41b4..6087460 100644
73278--- a/mm/nobootmem.c
73279+++ b/mm/nobootmem.c
73280@@ -110,19 +110,30 @@ static void __init __free_pages_memory(unsigned long start, unsigned long end)
73281 unsigned long __init free_all_memory_core_early(int nodeid)
73282 {
73283 int i;
73284- u64 start, end;
73285+ u64 start, end, startrange, endrange;
73286 unsigned long count = 0;
73287- struct range *range = NULL;
73288+ struct range *range = NULL, rangerange = { 0, 0 };
73289 int nr_range;
73290
73291 nr_range = get_free_all_memory_range(&range, nodeid);
73292+ startrange = __pa(range) >> PAGE_SHIFT;
73293+ endrange = (__pa(range + nr_range) - 1) >> PAGE_SHIFT;
73294
73295 for (i = 0; i < nr_range; i++) {
73296 start = range[i].start;
73297 end = range[i].end;
73298+ if (start <= endrange && startrange < end) {
73299+ BUG_ON(rangerange.start | rangerange.end);
73300+ rangerange = range[i];
73301+ continue;
73302+ }
73303 count += end - start;
73304 __free_pages_memory(start, end);
73305 }
73306+ start = rangerange.start;
73307+ end = rangerange.end;
73308+ count += end - start;
73309+ __free_pages_memory(start, end);
73310
73311 return count;
73312 }
73313diff --git a/mm/nommu.c b/mm/nommu.c
73314index f59e170..34e2a2b 100644
73315--- a/mm/nommu.c
73316+++ b/mm/nommu.c
73317@@ -62,7 +62,6 @@ int sysctl_overcommit_memory = OVERCOMMIT_GUESS; /* heuristic overcommit */
73318 int sysctl_overcommit_ratio = 50; /* default is 50% */
73319 int sysctl_max_map_count = DEFAULT_MAX_MAP_COUNT;
73320 int sysctl_nr_trim_pages = CONFIG_NOMMU_INITIAL_TRIM_EXCESS;
73321-int heap_stack_gap = 0;
73322
73323 atomic_long_t mmap_pages_allocated;
73324
73325@@ -827,15 +826,6 @@ struct vm_area_struct *find_vma(struct mm_struct *mm, unsigned long addr)
73326 EXPORT_SYMBOL(find_vma);
73327
73328 /*
73329- * find a VMA
73330- * - we don't extend stack VMAs under NOMMU conditions
73331- */
73332-struct vm_area_struct *find_extend_vma(struct mm_struct *mm, unsigned long addr)
73333-{
73334- return find_vma(mm, addr);
73335-}
73336-
73337-/*
73338 * expand a stack to a given address
73339 * - not supported under NOMMU conditions
73340 */
73341@@ -1555,6 +1545,7 @@ int split_vma(struct mm_struct *mm, struct vm_area_struct *vma,
73342
73343 /* most fields are the same, copy all, and then fixup */
73344 *new = *vma;
73345+ INIT_LIST_HEAD(&new->anon_vma_chain);
73346 *region = *vma->vm_region;
73347 new->vm_region = region;
73348
73349diff --git a/mm/page_alloc.c b/mm/page_alloc.c
73350index 485be89..c059ad3 100644
73351--- a/mm/page_alloc.c
73352+++ b/mm/page_alloc.c
73353@@ -341,7 +341,7 @@ out:
73354 * This usage means that zero-order pages may not be compound.
73355 */
73356
73357-static void free_compound_page(struct page *page)
73358+void free_compound_page(struct page *page)
73359 {
73360 __free_pages_ok(page, compound_order(page));
73361 }
73362@@ -654,6 +654,10 @@ static bool free_pages_prepare(struct page *page, unsigned int order)
73363 int i;
73364 int bad = 0;
73365
73366+#ifdef CONFIG_PAX_MEMORY_SANITIZE
73367+ unsigned long index = 1UL << order;
73368+#endif
73369+
73370 trace_mm_page_free_direct(page, order);
73371 kmemcheck_free_shadow(page, order);
73372
73373@@ -669,6 +673,12 @@ static bool free_pages_prepare(struct page *page, unsigned int order)
73374 debug_check_no_obj_freed(page_address(page),
73375 PAGE_SIZE << order);
73376 }
73377+
73378+#ifdef CONFIG_PAX_MEMORY_SANITIZE
73379+ for (; index; --index)
73380+ sanitize_highpage(page + index - 1);
73381+#endif
73382+
73383 arch_free_page(page, order);
73384 kernel_map_pages(page, 1 << order, 0);
73385
73386@@ -784,8 +794,10 @@ static int prep_new_page(struct page *page, int order, gfp_t gfp_flags)
73387 arch_alloc_page(page, order);
73388 kernel_map_pages(page, 1 << order, 1);
73389
73390+#ifndef CONFIG_PAX_MEMORY_SANITIZE
73391 if (gfp_flags & __GFP_ZERO)
73392 prep_zero_page(page, order, gfp_flags);
73393+#endif
73394
73395 if (order && (gfp_flags & __GFP_COMP))
73396 prep_compound_page(page, order);
73397@@ -3357,7 +3369,13 @@ static int pageblock_is_reserved(unsigned long start_pfn, unsigned long end_pfn)
73398 unsigned long pfn;
73399
73400 for (pfn = start_pfn; pfn < end_pfn; pfn++) {
73401+#ifdef CONFIG_X86_32
73402+ /* boot failures in VMware 8 on 32bit vanilla since
73403+ this change */
73404+ if (!pfn_valid(pfn) || PageReserved(pfn_to_page(pfn)))
73405+#else
73406 if (!pfn_valid_within(pfn) || PageReserved(pfn_to_page(pfn)))
73407+#endif
73408 return 1;
73409 }
73410 return 0;
73411diff --git a/mm/percpu.c b/mm/percpu.c
73412index 716eb4a..8d10419 100644
73413--- a/mm/percpu.c
73414+++ b/mm/percpu.c
73415@@ -121,7 +121,7 @@ static unsigned int pcpu_low_unit_cpu __read_mostly;
73416 static unsigned int pcpu_high_unit_cpu __read_mostly;
73417
73418 /* the address of the first chunk which starts with the kernel static area */
73419-void *pcpu_base_addr __read_mostly;
73420+void *pcpu_base_addr __read_only;
73421 EXPORT_SYMBOL_GPL(pcpu_base_addr);
73422
73423 static const int *pcpu_unit_map __read_mostly; /* cpu -> unit */
73424diff --git a/mm/process_vm_access.c b/mm/process_vm_access.c
73425index e920aa3..137702a 100644
73426--- a/mm/process_vm_access.c
73427+++ b/mm/process_vm_access.c
73428@@ -13,6 +13,7 @@
73429 #include <linux/uio.h>
73430 #include <linux/sched.h>
73431 #include <linux/highmem.h>
73432+#include <linux/security.h>
73433 #include <linux/ptrace.h>
73434 #include <linux/slab.h>
73435 #include <linux/syscalls.h>
73436@@ -258,19 +259,19 @@ static ssize_t process_vm_rw_core(pid_t pid, const struct iovec *lvec,
73437 size_t iov_l_curr_offset = 0;
73438 ssize_t iov_len;
73439
73440+ return -ENOSYS; // PaX: until properly audited
73441+
73442 /*
73443 * Work out how many pages of struct pages we're going to need
73444 * when eventually calling get_user_pages
73445 */
73446 for (i = 0; i < riovcnt; i++) {
73447 iov_len = rvec[i].iov_len;
73448- if (iov_len > 0) {
73449- nr_pages_iov = ((unsigned long)rvec[i].iov_base
73450- + iov_len)
73451- / PAGE_SIZE - (unsigned long)rvec[i].iov_base
73452- / PAGE_SIZE + 1;
73453- nr_pages = max(nr_pages, nr_pages_iov);
73454- }
73455+ if (iov_len <= 0)
73456+ continue;
73457+ nr_pages_iov = ((unsigned long)rvec[i].iov_base + iov_len) / PAGE_SIZE -
73458+ (unsigned long)rvec[i].iov_base / PAGE_SIZE + 1;
73459+ nr_pages = max(nr_pages, nr_pages_iov);
73460 }
73461
73462 if (nr_pages == 0)
73463@@ -298,23 +299,23 @@ static ssize_t process_vm_rw_core(pid_t pid, const struct iovec *lvec,
73464 goto free_proc_pages;
73465 }
73466
73467- task_lock(task);
73468- if (__ptrace_may_access(task, PTRACE_MODE_ATTACH)) {
73469- task_unlock(task);
73470+ if (gr_handle_ptrace(task, vm_write ? PTRACE_POKETEXT : PTRACE_ATTACH)) {
73471 rc = -EPERM;
73472 goto put_task_struct;
73473 }
73474- mm = task->mm;
73475
73476- if (!mm || (task->flags & PF_KTHREAD)) {
73477- task_unlock(task);
73478- rc = -EINVAL;
73479+ mm = mm_access(task, PTRACE_MODE_ATTACH);
73480+ if (!mm || IS_ERR(mm)) {
73481+ rc = IS_ERR(mm) ? PTR_ERR(mm) : -ESRCH;
73482+ /*
73483+ * Explicitly map EACCES to EPERM as EPERM is a more a
73484+ * appropriate error code for process_vw_readv/writev
73485+ */
73486+ if (rc == -EACCES)
73487+ rc = -EPERM;
73488 goto put_task_struct;
73489 }
73490
73491- atomic_inc(&mm->mm_users);
73492- task_unlock(task);
73493-
73494 for (i = 0; i < riovcnt && iov_l_curr_idx < liovcnt; i++) {
73495 rc = process_vm_rw_single_vec(
73496 (unsigned long)rvec[i].iov_base, rvec[i].iov_len,
73497diff --git a/mm/rmap.c b/mm/rmap.c
73498index a4fd368..e0ffec7 100644
73499--- a/mm/rmap.c
73500+++ b/mm/rmap.c
73501@@ -152,6 +152,10 @@ int anon_vma_prepare(struct vm_area_struct *vma)
73502 struct anon_vma *anon_vma = vma->anon_vma;
73503 struct anon_vma_chain *avc;
73504
73505+#ifdef CONFIG_PAX_SEGMEXEC
73506+ struct anon_vma_chain *avc_m = NULL;
73507+#endif
73508+
73509 might_sleep();
73510 if (unlikely(!anon_vma)) {
73511 struct mm_struct *mm = vma->vm_mm;
73512@@ -161,6 +165,12 @@ int anon_vma_prepare(struct vm_area_struct *vma)
73513 if (!avc)
73514 goto out_enomem;
73515
73516+#ifdef CONFIG_PAX_SEGMEXEC
73517+ avc_m = anon_vma_chain_alloc(GFP_KERNEL);
73518+ if (!avc_m)
73519+ goto out_enomem_free_avc;
73520+#endif
73521+
73522 anon_vma = find_mergeable_anon_vma(vma);
73523 allocated = NULL;
73524 if (!anon_vma) {
73525@@ -174,6 +184,21 @@ int anon_vma_prepare(struct vm_area_struct *vma)
73526 /* page_table_lock to protect against threads */
73527 spin_lock(&mm->page_table_lock);
73528 if (likely(!vma->anon_vma)) {
73529+
73530+#ifdef CONFIG_PAX_SEGMEXEC
73531+ struct vm_area_struct *vma_m = pax_find_mirror_vma(vma);
73532+
73533+ if (vma_m) {
73534+ BUG_ON(vma_m->anon_vma);
73535+ vma_m->anon_vma = anon_vma;
73536+ avc_m->anon_vma = anon_vma;
73537+ avc_m->vma = vma;
73538+ list_add(&avc_m->same_vma, &vma_m->anon_vma_chain);
73539+ list_add(&avc_m->same_anon_vma, &anon_vma->head);
73540+ avc_m = NULL;
73541+ }
73542+#endif
73543+
73544 vma->anon_vma = anon_vma;
73545 avc->anon_vma = anon_vma;
73546 avc->vma = vma;
73547@@ -187,12 +212,24 @@ int anon_vma_prepare(struct vm_area_struct *vma)
73548
73549 if (unlikely(allocated))
73550 put_anon_vma(allocated);
73551+
73552+#ifdef CONFIG_PAX_SEGMEXEC
73553+ if (unlikely(avc_m))
73554+ anon_vma_chain_free(avc_m);
73555+#endif
73556+
73557 if (unlikely(avc))
73558 anon_vma_chain_free(avc);
73559 }
73560 return 0;
73561
73562 out_enomem_free_avc:
73563+
73564+#ifdef CONFIG_PAX_SEGMEXEC
73565+ if (avc_m)
73566+ anon_vma_chain_free(avc_m);
73567+#endif
73568+
73569 anon_vma_chain_free(avc);
73570 out_enomem:
73571 return -ENOMEM;
73572@@ -243,7 +280,7 @@ static void anon_vma_chain_link(struct vm_area_struct *vma,
73573 * Attach the anon_vmas from src to dst.
73574 * Returns 0 on success, -ENOMEM on failure.
73575 */
73576-int anon_vma_clone(struct vm_area_struct *dst, struct vm_area_struct *src)
73577+int anon_vma_clone(struct vm_area_struct *dst, const struct vm_area_struct *src)
73578 {
73579 struct anon_vma_chain *avc, *pavc;
73580 struct anon_vma *root = NULL;
73581@@ -276,7 +313,7 @@ int anon_vma_clone(struct vm_area_struct *dst, struct vm_area_struct *src)
73582 * the corresponding VMA in the parent process is attached to.
73583 * Returns 0 on success, non-zero on failure.
73584 */
73585-int anon_vma_fork(struct vm_area_struct *vma, struct vm_area_struct *pvma)
73586+int anon_vma_fork(struct vm_area_struct *vma, const struct vm_area_struct *pvma)
73587 {
73588 struct anon_vma_chain *avc;
73589 struct anon_vma *anon_vma;
73590diff --git a/mm/shmem.c b/mm/shmem.c
73591index 6c253f7..367e20a 100644
73592--- a/mm/shmem.c
73593+++ b/mm/shmem.c
73594@@ -31,7 +31,7 @@
73595 #include <linux/export.h>
73596 #include <linux/swap.h>
73597
73598-static struct vfsmount *shm_mnt;
73599+struct vfsmount *shm_mnt;
73600
73601 #ifdef CONFIG_SHMEM
73602 /*
73603@@ -74,7 +74,7 @@ static struct vfsmount *shm_mnt;
73604 #define BOGO_DIRENT_SIZE 20
73605
73606 /* Symlink up to this size is kmalloc'ed instead of using a swappable page */
73607-#define SHORT_SYMLINK_LEN 128
73608+#define SHORT_SYMLINK_LEN 64
73609
73610 struct shmem_xattr {
73611 struct list_head list; /* anchored by shmem_inode_info->xattr_list */
73612@@ -2180,8 +2180,7 @@ int shmem_fill_super(struct super_block *sb, void *data, int silent)
73613 int err = -ENOMEM;
73614
73615 /* Round up to L1_CACHE_BYTES to resist false sharing */
73616- sbinfo = kzalloc(max((int)sizeof(struct shmem_sb_info),
73617- L1_CACHE_BYTES), GFP_KERNEL);
73618+ sbinfo = kzalloc(max(sizeof(struct shmem_sb_info), L1_CACHE_BYTES), GFP_KERNEL);
73619 if (!sbinfo)
73620 return -ENOMEM;
73621
73622diff --git a/mm/slab.c b/mm/slab.c
73623index 83311c9a..fcf8f86 100644
73624--- a/mm/slab.c
73625+++ b/mm/slab.c
73626@@ -151,7 +151,7 @@
73627
73628 /* Legal flag mask for kmem_cache_create(). */
73629 #if DEBUG
73630-# define CREATE_MASK (SLAB_RED_ZONE | \
73631+# define CREATE_MASK (SLAB_USERCOPY | SLAB_RED_ZONE | \
73632 SLAB_POISON | SLAB_HWCACHE_ALIGN | \
73633 SLAB_CACHE_DMA | \
73634 SLAB_STORE_USER | \
73635@@ -159,7 +159,7 @@
73636 SLAB_DESTROY_BY_RCU | SLAB_MEM_SPREAD | \
73637 SLAB_DEBUG_OBJECTS | SLAB_NOLEAKTRACE | SLAB_NOTRACK)
73638 #else
73639-# define CREATE_MASK (SLAB_HWCACHE_ALIGN | \
73640+# define CREATE_MASK (SLAB_USERCOPY | SLAB_HWCACHE_ALIGN | \
73641 SLAB_CACHE_DMA | \
73642 SLAB_RECLAIM_ACCOUNT | SLAB_PANIC | \
73643 SLAB_DESTROY_BY_RCU | SLAB_MEM_SPREAD | \
73644@@ -288,7 +288,7 @@ struct kmem_list3 {
73645 * Need this for bootstrapping a per node allocator.
73646 */
73647 #define NUM_INIT_LISTS (3 * MAX_NUMNODES)
73648-static struct kmem_list3 __initdata initkmem_list3[NUM_INIT_LISTS];
73649+static struct kmem_list3 initkmem_list3[NUM_INIT_LISTS];
73650 #define CACHE_CACHE 0
73651 #define SIZE_AC MAX_NUMNODES
73652 #define SIZE_L3 (2 * MAX_NUMNODES)
73653@@ -389,10 +389,10 @@ static void kmem_list3_init(struct kmem_list3 *parent)
73654 if ((x)->max_freeable < i) \
73655 (x)->max_freeable = i; \
73656 } while (0)
73657-#define STATS_INC_ALLOCHIT(x) atomic_inc(&(x)->allochit)
73658-#define STATS_INC_ALLOCMISS(x) atomic_inc(&(x)->allocmiss)
73659-#define STATS_INC_FREEHIT(x) atomic_inc(&(x)->freehit)
73660-#define STATS_INC_FREEMISS(x) atomic_inc(&(x)->freemiss)
73661+#define STATS_INC_ALLOCHIT(x) atomic_inc_unchecked(&(x)->allochit)
73662+#define STATS_INC_ALLOCMISS(x) atomic_inc_unchecked(&(x)->allocmiss)
73663+#define STATS_INC_FREEHIT(x) atomic_inc_unchecked(&(x)->freehit)
73664+#define STATS_INC_FREEMISS(x) atomic_inc_unchecked(&(x)->freemiss)
73665 #else
73666 #define STATS_INC_ACTIVE(x) do { } while (0)
73667 #define STATS_DEC_ACTIVE(x) do { } while (0)
73668@@ -538,7 +538,7 @@ static inline void *index_to_obj(struct kmem_cache *cache, struct slab *slab,
73669 * reciprocal_divide(offset, cache->reciprocal_buffer_size)
73670 */
73671 static inline unsigned int obj_to_index(const struct kmem_cache *cache,
73672- const struct slab *slab, void *obj)
73673+ const struct slab *slab, const void *obj)
73674 {
73675 u32 offset = (obj - slab->s_mem);
73676 return reciprocal_divide(offset, cache->reciprocal_buffer_size);
73677@@ -564,7 +564,7 @@ struct cache_names {
73678 static struct cache_names __initdata cache_names[] = {
73679 #define CACHE(x) { .name = "size-" #x, .name_dma = "size-" #x "(DMA)" },
73680 #include <linux/kmalloc_sizes.h>
73681- {NULL,}
73682+ {NULL}
73683 #undef CACHE
73684 };
73685
73686@@ -1572,7 +1572,7 @@ void __init kmem_cache_init(void)
73687 sizes[INDEX_AC].cs_cachep = kmem_cache_create(names[INDEX_AC].name,
73688 sizes[INDEX_AC].cs_size,
73689 ARCH_KMALLOC_MINALIGN,
73690- ARCH_KMALLOC_FLAGS|SLAB_PANIC,
73691+ ARCH_KMALLOC_FLAGS|SLAB_PANIC|SLAB_USERCOPY,
73692 NULL);
73693
73694 if (INDEX_AC != INDEX_L3) {
73695@@ -1580,7 +1580,7 @@ void __init kmem_cache_init(void)
73696 kmem_cache_create(names[INDEX_L3].name,
73697 sizes[INDEX_L3].cs_size,
73698 ARCH_KMALLOC_MINALIGN,
73699- ARCH_KMALLOC_FLAGS|SLAB_PANIC,
73700+ ARCH_KMALLOC_FLAGS|SLAB_PANIC|SLAB_USERCOPY,
73701 NULL);
73702 }
73703
73704@@ -1598,7 +1598,7 @@ void __init kmem_cache_init(void)
73705 sizes->cs_cachep = kmem_cache_create(names->name,
73706 sizes->cs_size,
73707 ARCH_KMALLOC_MINALIGN,
73708- ARCH_KMALLOC_FLAGS|SLAB_PANIC,
73709+ ARCH_KMALLOC_FLAGS|SLAB_PANIC|SLAB_USERCOPY,
73710 NULL);
73711 }
73712 #ifdef CONFIG_ZONE_DMA
73713@@ -4322,10 +4322,10 @@ static int s_show(struct seq_file *m, void *p)
73714 }
73715 /* cpu stats */
73716 {
73717- unsigned long allochit = atomic_read(&cachep->allochit);
73718- unsigned long allocmiss = atomic_read(&cachep->allocmiss);
73719- unsigned long freehit = atomic_read(&cachep->freehit);
73720- unsigned long freemiss = atomic_read(&cachep->freemiss);
73721+ unsigned long allochit = atomic_read_unchecked(&cachep->allochit);
73722+ unsigned long allocmiss = atomic_read_unchecked(&cachep->allocmiss);
73723+ unsigned long freehit = atomic_read_unchecked(&cachep->freehit);
73724+ unsigned long freemiss = atomic_read_unchecked(&cachep->freemiss);
73725
73726 seq_printf(m, " : cpustat %6lu %6lu %6lu %6lu",
73727 allochit, allocmiss, freehit, freemiss);
73728@@ -4584,13 +4584,62 @@ static int __init slab_proc_init(void)
73729 {
73730 proc_create("slabinfo",S_IWUSR|S_IRUSR,NULL,&proc_slabinfo_operations);
73731 #ifdef CONFIG_DEBUG_SLAB_LEAK
73732- proc_create("slab_allocators", 0, NULL, &proc_slabstats_operations);
73733+ proc_create("slab_allocators", S_IRUSR, NULL, &proc_slabstats_operations);
73734 #endif
73735 return 0;
73736 }
73737 module_init(slab_proc_init);
73738 #endif
73739
73740+void check_object_size(const void *ptr, unsigned long n, bool to)
73741+{
73742+
73743+#ifdef CONFIG_PAX_USERCOPY
73744+ struct page *page;
73745+ struct kmem_cache *cachep = NULL;
73746+ struct slab *slabp;
73747+ unsigned int objnr;
73748+ unsigned long offset;
73749+ const char *type;
73750+
73751+ if (!n)
73752+ return;
73753+
73754+ type = "<null>";
73755+ if (ZERO_OR_NULL_PTR(ptr))
73756+ goto report;
73757+
73758+ if (!virt_addr_valid(ptr))
73759+ return;
73760+
73761+ page = virt_to_head_page(ptr);
73762+
73763+ type = "<process stack>";
73764+ if (!PageSlab(page)) {
73765+ if (object_is_on_stack(ptr, n) == -1)
73766+ goto report;
73767+ return;
73768+ }
73769+
73770+ cachep = page_get_cache(page);
73771+ type = cachep->name;
73772+ if (!(cachep->flags & SLAB_USERCOPY))
73773+ goto report;
73774+
73775+ slabp = page_get_slab(page);
73776+ objnr = obj_to_index(cachep, slabp, ptr);
73777+ BUG_ON(objnr >= cachep->num);
73778+ offset = ptr - index_to_obj(cachep, slabp, objnr) - obj_offset(cachep);
73779+ if (offset <= obj_size(cachep) && n <= obj_size(cachep) - offset)
73780+ return;
73781+
73782+report:
73783+ pax_report_usercopy(ptr, n, to, type);
73784+#endif
73785+
73786+}
73787+EXPORT_SYMBOL(check_object_size);
73788+
73789 /**
73790 * ksize - get the actual amount of memory allocated for a given object
73791 * @objp: Pointer to the object
73792diff --git a/mm/slob.c b/mm/slob.c
73793index 8105be4..e045f96 100644
73794--- a/mm/slob.c
73795+++ b/mm/slob.c
73796@@ -29,7 +29,7 @@
73797 * If kmalloc is asked for objects of PAGE_SIZE or larger, it calls
73798 * alloc_pages() directly, allocating compound pages so the page order
73799 * does not have to be separately tracked, and also stores the exact
73800- * allocation size in page->private so that it can be used to accurately
73801+ * allocation size in slob_page->size so that it can be used to accurately
73802 * provide ksize(). These objects are detected in kfree() because slob_page()
73803 * is false for them.
73804 *
73805@@ -58,6 +58,7 @@
73806 */
73807
73808 #include <linux/kernel.h>
73809+#include <linux/sched.h>
73810 #include <linux/slab.h>
73811 #include <linux/mm.h>
73812 #include <linux/swap.h> /* struct reclaim_state */
73813@@ -102,7 +103,8 @@ struct slob_page {
73814 unsigned long flags; /* mandatory */
73815 atomic_t _count; /* mandatory */
73816 slobidx_t units; /* free units left in page */
73817- unsigned long pad[2];
73818+ unsigned long pad[1];
73819+ unsigned long size; /* size when >=PAGE_SIZE */
73820 slob_t *free; /* first free slob_t in page */
73821 struct list_head list; /* linked list of free pages */
73822 };
73823@@ -135,7 +137,7 @@ static LIST_HEAD(free_slob_large);
73824 */
73825 static inline int is_slob_page(struct slob_page *sp)
73826 {
73827- return PageSlab((struct page *)sp);
73828+ return PageSlab((struct page *)sp) && !sp->size;
73829 }
73830
73831 static inline void set_slob_page(struct slob_page *sp)
73832@@ -150,7 +152,7 @@ static inline void clear_slob_page(struct slob_page *sp)
73833
73834 static inline struct slob_page *slob_page(const void *addr)
73835 {
73836- return (struct slob_page *)virt_to_page(addr);
73837+ return (struct slob_page *)virt_to_head_page(addr);
73838 }
73839
73840 /*
73841@@ -210,7 +212,7 @@ static void set_slob(slob_t *s, slobidx_t size, slob_t *next)
73842 /*
73843 * Return the size of a slob block.
73844 */
73845-static slobidx_t slob_units(slob_t *s)
73846+static slobidx_t slob_units(const slob_t *s)
73847 {
73848 if (s->units > 0)
73849 return s->units;
73850@@ -220,7 +222,7 @@ static slobidx_t slob_units(slob_t *s)
73851 /*
73852 * Return the next free slob block pointer after this one.
73853 */
73854-static slob_t *slob_next(slob_t *s)
73855+static slob_t *slob_next(const slob_t *s)
73856 {
73857 slob_t *base = (slob_t *)((unsigned long)s & PAGE_MASK);
73858 slobidx_t next;
73859@@ -235,7 +237,7 @@ static slob_t *slob_next(slob_t *s)
73860 /*
73861 * Returns true if s is the last free block in its page.
73862 */
73863-static int slob_last(slob_t *s)
73864+static int slob_last(const slob_t *s)
73865 {
73866 return !((unsigned long)slob_next(s) & ~PAGE_MASK);
73867 }
73868@@ -254,6 +256,7 @@ static void *slob_new_pages(gfp_t gfp, int order, int node)
73869 if (!page)
73870 return NULL;
73871
73872+ set_slob_page(page);
73873 return page_address(page);
73874 }
73875
73876@@ -370,11 +373,11 @@ static void *slob_alloc(size_t size, gfp_t gfp, int align, int node)
73877 if (!b)
73878 return NULL;
73879 sp = slob_page(b);
73880- set_slob_page(sp);
73881
73882 spin_lock_irqsave(&slob_lock, flags);
73883 sp->units = SLOB_UNITS(PAGE_SIZE);
73884 sp->free = b;
73885+ sp->size = 0;
73886 INIT_LIST_HEAD(&sp->list);
73887 set_slob(b, SLOB_UNITS(PAGE_SIZE), b + SLOB_UNITS(PAGE_SIZE));
73888 set_slob_page_free(sp, slob_list);
73889@@ -476,10 +479,9 @@ out:
73890 * End of slob allocator proper. Begin kmem_cache_alloc and kmalloc frontend.
73891 */
73892
73893-void *__kmalloc_node(size_t size, gfp_t gfp, int node)
73894+static void *__kmalloc_node_align(size_t size, gfp_t gfp, int node, int align)
73895 {
73896- unsigned int *m;
73897- int align = max(ARCH_KMALLOC_MINALIGN, ARCH_SLAB_MINALIGN);
73898+ slob_t *m;
73899 void *ret;
73900
73901 gfp &= gfp_allowed_mask;
73902@@ -494,7 +496,10 @@ void *__kmalloc_node(size_t size, gfp_t gfp, int node)
73903
73904 if (!m)
73905 return NULL;
73906- *m = size;
73907+ BUILD_BUG_ON(ARCH_KMALLOC_MINALIGN < 2 * SLOB_UNIT);
73908+ BUILD_BUG_ON(ARCH_SLAB_MINALIGN < 2 * SLOB_UNIT);
73909+ m[0].units = size;
73910+ m[1].units = align;
73911 ret = (void *)m + align;
73912
73913 trace_kmalloc_node(_RET_IP_, ret,
73914@@ -506,16 +511,25 @@ void *__kmalloc_node(size_t size, gfp_t gfp, int node)
73915 gfp |= __GFP_COMP;
73916 ret = slob_new_pages(gfp, order, node);
73917 if (ret) {
73918- struct page *page;
73919- page = virt_to_page(ret);
73920- page->private = size;
73921+ struct slob_page *sp;
73922+ sp = slob_page(ret);
73923+ sp->size = size;
73924 }
73925
73926 trace_kmalloc_node(_RET_IP_, ret,
73927 size, PAGE_SIZE << order, gfp, node);
73928 }
73929
73930- kmemleak_alloc(ret, size, 1, gfp);
73931+ return ret;
73932+}
73933+
73934+void *__kmalloc_node(size_t size, gfp_t gfp, int node)
73935+{
73936+ int align = max(ARCH_KMALLOC_MINALIGN, ARCH_SLAB_MINALIGN);
73937+ void *ret = __kmalloc_node_align(size, gfp, node, align);
73938+
73939+ if (!ZERO_OR_NULL_PTR(ret))
73940+ kmemleak_alloc(ret, size, 1, gfp);
73941 return ret;
73942 }
73943 EXPORT_SYMBOL(__kmalloc_node);
73944@@ -533,13 +547,92 @@ void kfree(const void *block)
73945 sp = slob_page(block);
73946 if (is_slob_page(sp)) {
73947 int align = max(ARCH_KMALLOC_MINALIGN, ARCH_SLAB_MINALIGN);
73948- unsigned int *m = (unsigned int *)(block - align);
73949- slob_free(m, *m + align);
73950- } else
73951+ slob_t *m = (slob_t *)(block - align);
73952+ slob_free(m, m[0].units + align);
73953+ } else {
73954+ clear_slob_page(sp);
73955+ free_slob_page(sp);
73956+ sp->size = 0;
73957 put_page(&sp->page);
73958+ }
73959 }
73960 EXPORT_SYMBOL(kfree);
73961
73962+void check_object_size(const void *ptr, unsigned long n, bool to)
73963+{
73964+
73965+#ifdef CONFIG_PAX_USERCOPY
73966+ struct slob_page *sp;
73967+ const slob_t *free;
73968+ const void *base;
73969+ unsigned long flags;
73970+ const char *type;
73971+
73972+ if (!n)
73973+ return;
73974+
73975+ type = "<null>";
73976+ if (ZERO_OR_NULL_PTR(ptr))
73977+ goto report;
73978+
73979+ if (!virt_addr_valid(ptr))
73980+ return;
73981+
73982+ type = "<process stack>";
73983+ sp = slob_page(ptr);
73984+ if (!PageSlab((struct page *)sp)) {
73985+ if (object_is_on_stack(ptr, n) == -1)
73986+ goto report;
73987+ return;
73988+ }
73989+
73990+ type = "<slob>";
73991+ if (sp->size) {
73992+ base = page_address(&sp->page);
73993+ if (base <= ptr && n <= sp->size - (ptr - base))
73994+ return;
73995+ goto report;
73996+ }
73997+
73998+ /* some tricky double walking to find the chunk */
73999+ spin_lock_irqsave(&slob_lock, flags);
74000+ base = (void *)((unsigned long)ptr & PAGE_MASK);
74001+ free = sp->free;
74002+
74003+ while (!slob_last(free) && (void *)free <= ptr) {
74004+ base = free + slob_units(free);
74005+ free = slob_next(free);
74006+ }
74007+
74008+ while (base < (void *)free) {
74009+ slobidx_t m = ((slob_t *)base)[0].units, align = ((slob_t *)base)[1].units;
74010+ int size = SLOB_UNIT * SLOB_UNITS(m + align);
74011+ int offset;
74012+
74013+ if (ptr < base + align)
74014+ break;
74015+
74016+ offset = ptr - base - align;
74017+ if (offset >= m) {
74018+ base += size;
74019+ continue;
74020+ }
74021+
74022+ if (n > m - offset)
74023+ break;
74024+
74025+ spin_unlock_irqrestore(&slob_lock, flags);
74026+ return;
74027+ }
74028+
74029+ spin_unlock_irqrestore(&slob_lock, flags);
74030+report:
74031+ pax_report_usercopy(ptr, n, to, type);
74032+#endif
74033+
74034+}
74035+EXPORT_SYMBOL(check_object_size);
74036+
74037 /* can't use ksize for kmem_cache_alloc memory, only kmalloc */
74038 size_t ksize(const void *block)
74039 {
74040@@ -552,10 +645,10 @@ size_t ksize(const void *block)
74041 sp = slob_page(block);
74042 if (is_slob_page(sp)) {
74043 int align = max(ARCH_KMALLOC_MINALIGN, ARCH_SLAB_MINALIGN);
74044- unsigned int *m = (unsigned int *)(block - align);
74045- return SLOB_UNITS(*m) * SLOB_UNIT;
74046+ slob_t *m = (slob_t *)(block - align);
74047+ return SLOB_UNITS(m[0].units) * SLOB_UNIT;
74048 } else
74049- return sp->page.private;
74050+ return sp->size;
74051 }
74052 EXPORT_SYMBOL(ksize);
74053
74054@@ -571,8 +664,13 @@ struct kmem_cache *kmem_cache_create(const char *name, size_t size,
74055 {
74056 struct kmem_cache *c;
74057
74058+#ifdef CONFIG_PAX_USERCOPY
74059+ c = __kmalloc_node_align(sizeof(struct kmem_cache),
74060+ GFP_KERNEL, -1, ARCH_KMALLOC_MINALIGN);
74061+#else
74062 c = slob_alloc(sizeof(struct kmem_cache),
74063 GFP_KERNEL, ARCH_KMALLOC_MINALIGN, -1);
74064+#endif
74065
74066 if (c) {
74067 c->name = name;
74068@@ -614,17 +712,25 @@ void *kmem_cache_alloc_node(struct kmem_cache *c, gfp_t flags, int node)
74069
74070 lockdep_trace_alloc(flags);
74071
74072+#ifdef CONFIG_PAX_USERCOPY
74073+ b = __kmalloc_node_align(c->size, flags, node, c->align);
74074+#else
74075 if (c->size < PAGE_SIZE) {
74076 b = slob_alloc(c->size, flags, c->align, node);
74077 trace_kmem_cache_alloc_node(_RET_IP_, b, c->size,
74078 SLOB_UNITS(c->size) * SLOB_UNIT,
74079 flags, node);
74080 } else {
74081+ struct slob_page *sp;
74082+
74083 b = slob_new_pages(flags, get_order(c->size), node);
74084+ sp = slob_page(b);
74085+ sp->size = c->size;
74086 trace_kmem_cache_alloc_node(_RET_IP_, b, c->size,
74087 PAGE_SIZE << get_order(c->size),
74088 flags, node);
74089 }
74090+#endif
74091
74092 if (c->ctor)
74093 c->ctor(b);
74094@@ -636,10 +742,16 @@ EXPORT_SYMBOL(kmem_cache_alloc_node);
74095
74096 static void __kmem_cache_free(void *b, int size)
74097 {
74098- if (size < PAGE_SIZE)
74099+ struct slob_page *sp = slob_page(b);
74100+
74101+ if (is_slob_page(sp))
74102 slob_free(b, size);
74103- else
74104+ else {
74105+ clear_slob_page(sp);
74106+ free_slob_page(sp);
74107+ sp->size = 0;
74108 slob_free_pages(b, get_order(size));
74109+ }
74110 }
74111
74112 static void kmem_rcu_free(struct rcu_head *head)
74113@@ -652,17 +764,31 @@ static void kmem_rcu_free(struct rcu_head *head)
74114
74115 void kmem_cache_free(struct kmem_cache *c, void *b)
74116 {
74117+ int size = c->size;
74118+
74119+#ifdef CONFIG_PAX_USERCOPY
74120+ if (size + c->align < PAGE_SIZE) {
74121+ size += c->align;
74122+ b -= c->align;
74123+ }
74124+#endif
74125+
74126 kmemleak_free_recursive(b, c->flags);
74127 if (unlikely(c->flags & SLAB_DESTROY_BY_RCU)) {
74128 struct slob_rcu *slob_rcu;
74129- slob_rcu = b + (c->size - sizeof(struct slob_rcu));
74130- slob_rcu->size = c->size;
74131+ slob_rcu = b + (size - sizeof(struct slob_rcu));
74132+ slob_rcu->size = size;
74133 call_rcu(&slob_rcu->head, kmem_rcu_free);
74134 } else {
74135- __kmem_cache_free(b, c->size);
74136+ __kmem_cache_free(b, size);
74137 }
74138
74139+#ifdef CONFIG_PAX_USERCOPY
74140+ trace_kfree(_RET_IP_, b);
74141+#else
74142 trace_kmem_cache_free(_RET_IP_, b);
74143+#endif
74144+
74145 }
74146 EXPORT_SYMBOL(kmem_cache_free);
74147
74148diff --git a/mm/slub.c b/mm/slub.c
74149index 1a919f0..1739c9b 100644
74150--- a/mm/slub.c
74151+++ b/mm/slub.c
74152@@ -208,7 +208,7 @@ struct track {
74153
74154 enum track_item { TRACK_ALLOC, TRACK_FREE };
74155
74156-#ifdef CONFIG_SYSFS
74157+#if defined(CONFIG_SYSFS) && !defined(CONFIG_GRKERNSEC_PROC_ADD)
74158 static int sysfs_slab_add(struct kmem_cache *);
74159 static int sysfs_slab_alias(struct kmem_cache *, const char *);
74160 static void sysfs_slab_remove(struct kmem_cache *);
74161@@ -530,7 +530,7 @@ static void print_track(const char *s, struct track *t)
74162 if (!t->addr)
74163 return;
74164
74165- printk(KERN_ERR "INFO: %s in %pS age=%lu cpu=%u pid=%d\n",
74166+ printk(KERN_ERR "INFO: %s in %pA age=%lu cpu=%u pid=%d\n",
74167 s, (void *)t->addr, jiffies - t->when, t->cpu, t->pid);
74168 #ifdef CONFIG_STACKTRACE
74169 {
74170@@ -2559,6 +2559,8 @@ void kmem_cache_free(struct kmem_cache *s, void *x)
74171
74172 page = virt_to_head_page(x);
74173
74174+ BUG_ON(!PageSlab(page));
74175+
74176 slab_free(s, page, x, _RET_IP_);
74177
74178 trace_kmem_cache_free(_RET_IP_, x);
74179@@ -2592,7 +2594,7 @@ static int slub_min_objects;
74180 * Merge control. If this is set then no merging of slab caches will occur.
74181 * (Could be removed. This was introduced to pacify the merge skeptics.)
74182 */
74183-static int slub_nomerge;
74184+static int slub_nomerge = 1;
74185
74186 /*
74187 * Calculate the order of allocation given an slab object size.
74188@@ -3042,7 +3044,7 @@ static int kmem_cache_open(struct kmem_cache *s,
74189 else
74190 s->cpu_partial = 30;
74191
74192- s->refcount = 1;
74193+ atomic_set(&s->refcount, 1);
74194 #ifdef CONFIG_NUMA
74195 s->remote_node_defrag_ratio = 1000;
74196 #endif
74197@@ -3146,8 +3148,7 @@ static inline int kmem_cache_close(struct kmem_cache *s)
74198 void kmem_cache_destroy(struct kmem_cache *s)
74199 {
74200 down_write(&slub_lock);
74201- s->refcount--;
74202- if (!s->refcount) {
74203+ if (atomic_dec_and_test(&s->refcount)) {
74204 list_del(&s->list);
74205 up_write(&slub_lock);
74206 if (kmem_cache_close(s)) {
74207@@ -3358,6 +3359,50 @@ void *__kmalloc_node(size_t size, gfp_t flags, int node)
74208 EXPORT_SYMBOL(__kmalloc_node);
74209 #endif
74210
74211+void check_object_size(const void *ptr, unsigned long n, bool to)
74212+{
74213+
74214+#ifdef CONFIG_PAX_USERCOPY
74215+ struct page *page;
74216+ struct kmem_cache *s = NULL;
74217+ unsigned long offset;
74218+ const char *type;
74219+
74220+ if (!n)
74221+ return;
74222+
74223+ type = "<null>";
74224+ if (ZERO_OR_NULL_PTR(ptr))
74225+ goto report;
74226+
74227+ if (!virt_addr_valid(ptr))
74228+ return;
74229+
74230+ page = virt_to_head_page(ptr);
74231+
74232+ type = "<process stack>";
74233+ if (!PageSlab(page)) {
74234+ if (object_is_on_stack(ptr, n) == -1)
74235+ goto report;
74236+ return;
74237+ }
74238+
74239+ s = page->slab;
74240+ type = s->name;
74241+ if (!(s->flags & SLAB_USERCOPY))
74242+ goto report;
74243+
74244+ offset = (ptr - page_address(page)) % s->size;
74245+ if (offset <= s->objsize && n <= s->objsize - offset)
74246+ return;
74247+
74248+report:
74249+ pax_report_usercopy(ptr, n, to, type);
74250+#endif
74251+
74252+}
74253+EXPORT_SYMBOL(check_object_size);
74254+
74255 size_t ksize(const void *object)
74256 {
74257 struct page *page;
74258@@ -3632,7 +3677,7 @@ static void __init kmem_cache_bootstrap_fixup(struct kmem_cache *s)
74259 int node;
74260
74261 list_add(&s->list, &slab_caches);
74262- s->refcount = -1;
74263+ atomic_set(&s->refcount, -1);
74264
74265 for_each_node_state(node, N_NORMAL_MEMORY) {
74266 struct kmem_cache_node *n = get_node(s, node);
74267@@ -3749,17 +3794,17 @@ void __init kmem_cache_init(void)
74268
74269 /* Caches that are not of the two-to-the-power-of size */
74270 if (KMALLOC_MIN_SIZE <= 32) {
74271- kmalloc_caches[1] = create_kmalloc_cache("kmalloc-96", 96, 0);
74272+ kmalloc_caches[1] = create_kmalloc_cache("kmalloc-96", 96, SLAB_USERCOPY);
74273 caches++;
74274 }
74275
74276 if (KMALLOC_MIN_SIZE <= 64) {
74277- kmalloc_caches[2] = create_kmalloc_cache("kmalloc-192", 192, 0);
74278+ kmalloc_caches[2] = create_kmalloc_cache("kmalloc-192", 192, SLAB_USERCOPY);
74279 caches++;
74280 }
74281
74282 for (i = KMALLOC_SHIFT_LOW; i < SLUB_PAGE_SHIFT; i++) {
74283- kmalloc_caches[i] = create_kmalloc_cache("kmalloc", 1 << i, 0);
74284+ kmalloc_caches[i] = create_kmalloc_cache("kmalloc", 1 << i, SLAB_USERCOPY);
74285 caches++;
74286 }
74287
74288@@ -3827,7 +3872,7 @@ static int slab_unmergeable(struct kmem_cache *s)
74289 /*
74290 * We may have set a slab to be unmergeable during bootstrap.
74291 */
74292- if (s->refcount < 0)
74293+ if (atomic_read(&s->refcount) < 0)
74294 return 1;
74295
74296 return 0;
74297@@ -3886,7 +3931,7 @@ struct kmem_cache *kmem_cache_create(const char *name, size_t size,
74298 down_write(&slub_lock);
74299 s = find_mergeable(size, align, flags, name, ctor);
74300 if (s) {
74301- s->refcount++;
74302+ atomic_inc(&s->refcount);
74303 /*
74304 * Adjust the object sizes so that we clear
74305 * the complete object on kzalloc.
74306@@ -3895,7 +3940,7 @@ struct kmem_cache *kmem_cache_create(const char *name, size_t size,
74307 s->inuse = max_t(int, s->inuse, ALIGN(size, sizeof(void *)));
74308
74309 if (sysfs_slab_alias(s, name)) {
74310- s->refcount--;
74311+ atomic_dec(&s->refcount);
74312 goto err;
74313 }
74314 up_write(&slub_lock);
74315@@ -4023,7 +4068,7 @@ void *__kmalloc_node_track_caller(size_t size, gfp_t gfpflags,
74316 }
74317 #endif
74318
74319-#ifdef CONFIG_SYSFS
74320+#if defined(CONFIG_SYSFS) && !defined(CONFIG_GRKERNSEC_PROC_ADD)
74321 static int count_inuse(struct page *page)
74322 {
74323 return page->inuse;
74324@@ -4410,12 +4455,12 @@ static void resiliency_test(void)
74325 validate_slab_cache(kmalloc_caches[9]);
74326 }
74327 #else
74328-#ifdef CONFIG_SYSFS
74329+#if defined(CONFIG_SYSFS) && !defined(CONFIG_GRKERNSEC_PROC_ADD)
74330 static void resiliency_test(void) {};
74331 #endif
74332 #endif
74333
74334-#ifdef CONFIG_SYSFS
74335+#if defined(CONFIG_SYSFS) && !defined(CONFIG_GRKERNSEC_PROC_ADD)
74336 enum slab_stat_type {
74337 SL_ALL, /* All slabs */
74338 SL_PARTIAL, /* Only partially allocated slabs */
74339@@ -4656,7 +4701,7 @@ SLAB_ATTR_RO(ctor);
74340
74341 static ssize_t aliases_show(struct kmem_cache *s, char *buf)
74342 {
74343- return sprintf(buf, "%d\n", s->refcount - 1);
74344+ return sprintf(buf, "%d\n", atomic_read(&s->refcount) - 1);
74345 }
74346 SLAB_ATTR_RO(aliases);
74347
74348@@ -5223,6 +5268,7 @@ static char *create_unique_id(struct kmem_cache *s)
74349 return name;
74350 }
74351
74352+#if defined(CONFIG_SYSFS) && !defined(CONFIG_GRKERNSEC_PROC_ADD)
74353 static int sysfs_slab_add(struct kmem_cache *s)
74354 {
74355 int err;
74356@@ -5285,6 +5331,7 @@ static void sysfs_slab_remove(struct kmem_cache *s)
74357 kobject_del(&s->kobj);
74358 kobject_put(&s->kobj);
74359 }
74360+#endif
74361
74362 /*
74363 * Need to buffer aliases during bootup until sysfs becomes
74364@@ -5298,6 +5345,7 @@ struct saved_alias {
74365
74366 static struct saved_alias *alias_list;
74367
74368+#if defined(CONFIG_SYSFS) && !defined(CONFIG_GRKERNSEC_PROC_ADD)
74369 static int sysfs_slab_alias(struct kmem_cache *s, const char *name)
74370 {
74371 struct saved_alias *al;
74372@@ -5320,6 +5368,7 @@ static int sysfs_slab_alias(struct kmem_cache *s, const char *name)
74373 alias_list = al;
74374 return 0;
74375 }
74376+#endif
74377
74378 static int __init slab_sysfs_init(void)
74379 {
74380diff --git a/mm/swap.c b/mm/swap.c
74381index 55b266d..a532537 100644
74382--- a/mm/swap.c
74383+++ b/mm/swap.c
74384@@ -31,6 +31,7 @@
74385 #include <linux/backing-dev.h>
74386 #include <linux/memcontrol.h>
74387 #include <linux/gfp.h>
74388+#include <linux/hugetlb.h>
74389
74390 #include "internal.h"
74391
74392@@ -71,6 +72,8 @@ static void __put_compound_page(struct page *page)
74393
74394 __page_cache_release(page);
74395 dtor = get_compound_page_dtor(page);
74396+ if (!PageHuge(page))
74397+ BUG_ON(dtor != free_compound_page);
74398 (*dtor)(page);
74399 }
74400
74401diff --git a/mm/swapfile.c b/mm/swapfile.c
74402index b1cd120..aaae885 100644
74403--- a/mm/swapfile.c
74404+++ b/mm/swapfile.c
74405@@ -61,7 +61,7 @@ static DEFINE_MUTEX(swapon_mutex);
74406
74407 static DECLARE_WAIT_QUEUE_HEAD(proc_poll_wait);
74408 /* Activity counter to indicate that a swapon or swapoff has occurred */
74409-static atomic_t proc_poll_event = ATOMIC_INIT(0);
74410+static atomic_unchecked_t proc_poll_event = ATOMIC_INIT(0);
74411
74412 static inline unsigned char swap_count(unsigned char ent)
74413 {
74414@@ -1670,7 +1670,7 @@ SYSCALL_DEFINE1(swapoff, const char __user *, specialfile)
74415 }
74416 filp_close(swap_file, NULL);
74417 err = 0;
74418- atomic_inc(&proc_poll_event);
74419+ atomic_inc_unchecked(&proc_poll_event);
74420 wake_up_interruptible(&proc_poll_wait);
74421
74422 out_dput:
74423@@ -1686,8 +1686,8 @@ static unsigned swaps_poll(struct file *file, poll_table *wait)
74424
74425 poll_wait(file, &proc_poll_wait, wait);
74426
74427- if (seq->poll_event != atomic_read(&proc_poll_event)) {
74428- seq->poll_event = atomic_read(&proc_poll_event);
74429+ if (seq->poll_event != atomic_read_unchecked(&proc_poll_event)) {
74430+ seq->poll_event = atomic_read_unchecked(&proc_poll_event);
74431 return POLLIN | POLLRDNORM | POLLERR | POLLPRI;
74432 }
74433
74434@@ -1785,7 +1785,7 @@ static int swaps_open(struct inode *inode, struct file *file)
74435 return ret;
74436
74437 seq = file->private_data;
74438- seq->poll_event = atomic_read(&proc_poll_event);
74439+ seq->poll_event = atomic_read_unchecked(&proc_poll_event);
74440 return 0;
74441 }
74442
74443@@ -2123,7 +2123,7 @@ SYSCALL_DEFINE2(swapon, const char __user *, specialfile, int, swap_flags)
74444 (p->flags & SWP_DISCARDABLE) ? "D" : "");
74445
74446 mutex_unlock(&swapon_mutex);
74447- atomic_inc(&proc_poll_event);
74448+ atomic_inc_unchecked(&proc_poll_event);
74449 wake_up_interruptible(&proc_poll_wait);
74450
74451 if (S_ISREG(inode->i_mode))
74452diff --git a/mm/util.c b/mm/util.c
74453index 136ac4f..f917fa9 100644
74454--- a/mm/util.c
74455+++ b/mm/util.c
74456@@ -243,6 +243,12 @@ void __vma_link_list(struct mm_struct *mm, struct vm_area_struct *vma,
74457 void arch_pick_mmap_layout(struct mm_struct *mm)
74458 {
74459 mm->mmap_base = TASK_UNMAPPED_BASE;
74460+
74461+#ifdef CONFIG_PAX_RANDMMAP
74462+ if (mm->pax_flags & MF_PAX_RANDMMAP)
74463+ mm->mmap_base += mm->delta_mmap;
74464+#endif
74465+
74466 mm->get_unmapped_area = arch_get_unmapped_area;
74467 mm->unmap_area = arch_unmap_area;
74468 }
74469diff --git a/mm/vmalloc.c b/mm/vmalloc.c
74470index 27be2f0..633e5cc 100644
74471--- a/mm/vmalloc.c
74472+++ b/mm/vmalloc.c
74473@@ -39,8 +39,19 @@ static void vunmap_pte_range(pmd_t *pmd, unsigned long addr, unsigned long end)
74474
74475 pte = pte_offset_kernel(pmd, addr);
74476 do {
74477- pte_t ptent = ptep_get_and_clear(&init_mm, addr, pte);
74478- WARN_ON(!pte_none(ptent) && !pte_present(ptent));
74479+
74480+#if defined(CONFIG_MODULES) && defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
74481+ if ((unsigned long)MODULES_EXEC_VADDR <= addr && addr < (unsigned long)MODULES_EXEC_END) {
74482+ BUG_ON(!pte_exec(*pte));
74483+ set_pte_at(&init_mm, addr, pte, pfn_pte(__pa(addr) >> PAGE_SHIFT, PAGE_KERNEL_EXEC));
74484+ continue;
74485+ }
74486+#endif
74487+
74488+ {
74489+ pte_t ptent = ptep_get_and_clear(&init_mm, addr, pte);
74490+ WARN_ON(!pte_none(ptent) && !pte_present(ptent));
74491+ }
74492 } while (pte++, addr += PAGE_SIZE, addr != end);
74493 }
74494
74495@@ -91,6 +102,7 @@ static int vmap_pte_range(pmd_t *pmd, unsigned long addr,
74496 unsigned long end, pgprot_t prot, struct page **pages, int *nr)
74497 {
74498 pte_t *pte;
74499+ int ret = -ENOMEM;
74500
74501 /*
74502 * nr is a running index into the array which helps higher level
74503@@ -100,17 +112,30 @@ static int vmap_pte_range(pmd_t *pmd, unsigned long addr,
74504 pte = pte_alloc_kernel(pmd, addr);
74505 if (!pte)
74506 return -ENOMEM;
74507+
74508+ pax_open_kernel();
74509 do {
74510 struct page *page = pages[*nr];
74511
74512- if (WARN_ON(!pte_none(*pte)))
74513- return -EBUSY;
74514- if (WARN_ON(!page))
74515- return -ENOMEM;
74516+#if defined(CONFIG_MODULES) && defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
74517+ if (pgprot_val(prot) & _PAGE_NX)
74518+#endif
74519+
74520+ if (WARN_ON(!pte_none(*pte))) {
74521+ ret = -EBUSY;
74522+ goto out;
74523+ }
74524+ if (WARN_ON(!page)) {
74525+ ret = -ENOMEM;
74526+ goto out;
74527+ }
74528 set_pte_at(&init_mm, addr, pte, mk_pte(page, prot));
74529 (*nr)++;
74530 } while (pte++, addr += PAGE_SIZE, addr != end);
74531- return 0;
74532+ ret = 0;
74533+out:
74534+ pax_close_kernel();
74535+ return ret;
74536 }
74537
74538 static int vmap_pmd_range(pud_t *pud, unsigned long addr,
74539@@ -191,11 +216,20 @@ int is_vmalloc_or_module_addr(const void *x)
74540 * and fall back on vmalloc() if that fails. Others
74541 * just put it in the vmalloc space.
74542 */
74543-#if defined(CONFIG_MODULES) && defined(MODULES_VADDR)
74544+#ifdef CONFIG_MODULES
74545+#ifdef MODULES_VADDR
74546 unsigned long addr = (unsigned long)x;
74547 if (addr >= MODULES_VADDR && addr < MODULES_END)
74548 return 1;
74549 #endif
74550+
74551+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
74552+ if (x >= (const void *)MODULES_EXEC_VADDR && x < (const void *)MODULES_EXEC_END)
74553+ return 1;
74554+#endif
74555+
74556+#endif
74557+
74558 return is_vmalloc_addr(x);
74559 }
74560
74561@@ -216,8 +250,14 @@ struct page *vmalloc_to_page(const void *vmalloc_addr)
74562
74563 if (!pgd_none(*pgd)) {
74564 pud_t *pud = pud_offset(pgd, addr);
74565+#ifdef CONFIG_X86
74566+ if (!pud_large(*pud))
74567+#endif
74568 if (!pud_none(*pud)) {
74569 pmd_t *pmd = pmd_offset(pud, addr);
74570+#ifdef CONFIG_X86
74571+ if (!pmd_large(*pmd))
74572+#endif
74573 if (!pmd_none(*pmd)) {
74574 pte_t *ptep, pte;
74575
74576@@ -1294,6 +1334,16 @@ static struct vm_struct *__get_vm_area_node(unsigned long size,
74577 struct vm_struct *area;
74578
74579 BUG_ON(in_interrupt());
74580+
74581+#if defined(CONFIG_MODULES) && defined(CONFIG_X86) && defined(CONFIG_PAX_KERNEXEC)
74582+ if (flags & VM_KERNEXEC) {
74583+ if (start != VMALLOC_START || end != VMALLOC_END)
74584+ return NULL;
74585+ start = (unsigned long)MODULES_EXEC_VADDR;
74586+ end = (unsigned long)MODULES_EXEC_END;
74587+ }
74588+#endif
74589+
74590 if (flags & VM_IOREMAP) {
74591 int bit = fls(size);
74592
74593@@ -1526,6 +1576,11 @@ void *vmap(struct page **pages, unsigned int count,
74594 if (count > totalram_pages)
74595 return NULL;
74596
74597+#if defined(CONFIG_MODULES) && defined(CONFIG_X86) && defined(CONFIG_PAX_KERNEXEC)
74598+ if (!(pgprot_val(prot) & _PAGE_NX))
74599+ flags |= VM_KERNEXEC;
74600+#endif
74601+
74602 area = get_vm_area_caller((count << PAGE_SHIFT), flags,
74603 __builtin_return_address(0));
74604 if (!area)
74605@@ -1627,6 +1682,13 @@ void *__vmalloc_node_range(unsigned long size, unsigned long align,
74606 if (!size || (size >> PAGE_SHIFT) > totalram_pages)
74607 goto fail;
74608
74609+#if defined(CONFIG_MODULES) && defined(CONFIG_X86) && defined(CONFIG_PAX_KERNEXEC)
74610+ if (!(pgprot_val(prot) & _PAGE_NX))
74611+ area = __get_vm_area_node(size, align, VM_ALLOC | VM_UNLIST | VM_KERNEXEC,
74612+ VMALLOC_START, VMALLOC_END, node, gfp_mask, caller);
74613+ else
74614+#endif
74615+
74616 area = __get_vm_area_node(size, align, VM_ALLOC | VM_UNLIST,
74617 start, end, node, gfp_mask, caller);
74618 if (!area)
74619@@ -1800,10 +1862,9 @@ EXPORT_SYMBOL(vzalloc_node);
74620 * For tight control over page level allocator and protection flags
74621 * use __vmalloc() instead.
74622 */
74623-
74624 void *vmalloc_exec(unsigned long size)
74625 {
74626- return __vmalloc_node(size, 1, GFP_KERNEL | __GFP_HIGHMEM, PAGE_KERNEL_EXEC,
74627+ return __vmalloc_node(size, 1, GFP_KERNEL | __GFP_HIGHMEM | __GFP_ZERO, PAGE_KERNEL_EXEC,
74628 -1, __builtin_return_address(0));
74629 }
74630
74631@@ -2098,6 +2159,8 @@ int remap_vmalloc_range(struct vm_area_struct *vma, void *addr,
74632 unsigned long uaddr = vma->vm_start;
74633 unsigned long usize = vma->vm_end - vma->vm_start;
74634
74635+ BUG_ON(vma->vm_mirror);
74636+
74637 if ((PAGE_SIZE-1) & (unsigned long)addr)
74638 return -EINVAL;
74639
74640diff --git a/mm/vmstat.c b/mm/vmstat.c
74641index 8fd603b..cf0d930 100644
74642--- a/mm/vmstat.c
74643+++ b/mm/vmstat.c
74644@@ -78,7 +78,7 @@ void vm_events_fold_cpu(int cpu)
74645 *
74646 * vm_stat contains the global counters
74647 */
74648-atomic_long_t vm_stat[NR_VM_ZONE_STAT_ITEMS] __cacheline_aligned_in_smp;
74649+atomic_long_unchecked_t vm_stat[NR_VM_ZONE_STAT_ITEMS] __cacheline_aligned_in_smp;
74650 EXPORT_SYMBOL(vm_stat);
74651
74652 #ifdef CONFIG_SMP
74653@@ -454,7 +454,7 @@ void refresh_cpu_vm_stats(int cpu)
74654 v = p->vm_stat_diff[i];
74655 p->vm_stat_diff[i] = 0;
74656 local_irq_restore(flags);
74657- atomic_long_add(v, &zone->vm_stat[i]);
74658+ atomic_long_add_unchecked(v, &zone->vm_stat[i]);
74659 global_diff[i] += v;
74660 #ifdef CONFIG_NUMA
74661 /* 3 seconds idle till flush */
74662@@ -492,7 +492,7 @@ void refresh_cpu_vm_stats(int cpu)
74663
74664 for (i = 0; i < NR_VM_ZONE_STAT_ITEMS; i++)
74665 if (global_diff[i])
74666- atomic_long_add(global_diff[i], &vm_stat[i]);
74667+ atomic_long_add_unchecked(global_diff[i], &vm_stat[i]);
74668 }
74669
74670 #endif
74671@@ -1208,10 +1208,20 @@ static int __init setup_vmstat(void)
74672 start_cpu_timer(cpu);
74673 #endif
74674 #ifdef CONFIG_PROC_FS
74675- proc_create("buddyinfo", S_IRUGO, NULL, &fragmentation_file_operations);
74676- proc_create("pagetypeinfo", S_IRUGO, NULL, &pagetypeinfo_file_ops);
74677- proc_create("vmstat", S_IRUGO, NULL, &proc_vmstat_file_operations);
74678- proc_create("zoneinfo", S_IRUGO, NULL, &proc_zoneinfo_file_operations);
74679+ {
74680+ mode_t gr_mode = S_IRUGO;
74681+#ifdef CONFIG_GRKERNSEC_PROC_ADD
74682+ gr_mode = S_IRUSR;
74683+#endif
74684+ proc_create("buddyinfo", gr_mode, NULL, &fragmentation_file_operations);
74685+ proc_create("pagetypeinfo", gr_mode, NULL, &pagetypeinfo_file_ops);
74686+#ifdef CONFIG_GRKERNSEC_PROC_USERGROUP
74687+ proc_create("vmstat", gr_mode | S_IRGRP, NULL, &proc_vmstat_file_operations);
74688+#else
74689+ proc_create("vmstat", gr_mode, NULL, &proc_vmstat_file_operations);
74690+#endif
74691+ proc_create("zoneinfo", gr_mode, NULL, &proc_zoneinfo_file_operations);
74692+ }
74693 #endif
74694 return 0;
74695 }
74696diff --git a/net/8021q/vlan.c b/net/8021q/vlan.c
74697index 5471628..cef8398 100644
74698--- a/net/8021q/vlan.c
74699+++ b/net/8021q/vlan.c
74700@@ -588,8 +588,7 @@ static int vlan_ioctl_handler(struct net *net, void __user *arg)
74701 err = -EPERM;
74702 if (!capable(CAP_NET_ADMIN))
74703 break;
74704- if ((args.u.name_type >= 0) &&
74705- (args.u.name_type < VLAN_NAME_TYPE_HIGHEST)) {
74706+ if (args.u.name_type < VLAN_NAME_TYPE_HIGHEST) {
74707 struct vlan_net *vn;
74708
74709 vn = net_generic(net, vlan_net_id);
74710diff --git a/net/9p/trans_fd.c b/net/9p/trans_fd.c
74711index fdfdb57..38d368c 100644
74712--- a/net/9p/trans_fd.c
74713+++ b/net/9p/trans_fd.c
74714@@ -423,7 +423,7 @@ static int p9_fd_write(struct p9_client *client, void *v, int len)
74715 oldfs = get_fs();
74716 set_fs(get_ds());
74717 /* The cast to a user pointer is valid due to the set_fs() */
74718- ret = vfs_write(ts->wr, (__force void __user *)v, len, &ts->wr->f_pos);
74719+ ret = vfs_write(ts->wr, (void __force_user *)v, len, &ts->wr->f_pos);
74720 set_fs(oldfs);
74721
74722 if (ret <= 0 && ret != -ERESTARTSYS && ret != -EAGAIN)
74723diff --git a/net/atm/atm_misc.c b/net/atm/atm_misc.c
74724index f41f026..fe76ea8 100644
74725--- a/net/atm/atm_misc.c
74726+++ b/net/atm/atm_misc.c
74727@@ -17,7 +17,7 @@ int atm_charge(struct atm_vcc *vcc, int truesize)
74728 if (atomic_read(&sk_atm(vcc)->sk_rmem_alloc) <= sk_atm(vcc)->sk_rcvbuf)
74729 return 1;
74730 atm_return(vcc, truesize);
74731- atomic_inc(&vcc->stats->rx_drop);
74732+ atomic_inc_unchecked(&vcc->stats->rx_drop);
74733 return 0;
74734 }
74735 EXPORT_SYMBOL(atm_charge);
74736@@ -39,7 +39,7 @@ struct sk_buff *atm_alloc_charge(struct atm_vcc *vcc, int pdu_size,
74737 }
74738 }
74739 atm_return(vcc, guess);
74740- atomic_inc(&vcc->stats->rx_drop);
74741+ atomic_inc_unchecked(&vcc->stats->rx_drop);
74742 return NULL;
74743 }
74744 EXPORT_SYMBOL(atm_alloc_charge);
74745@@ -86,7 +86,7 @@ EXPORT_SYMBOL(atm_pcr_goal);
74746
74747 void sonet_copy_stats(struct k_sonet_stats *from, struct sonet_stats *to)
74748 {
74749-#define __HANDLE_ITEM(i) to->i = atomic_read(&from->i)
74750+#define __HANDLE_ITEM(i) to->i = atomic_read_unchecked(&from->i)
74751 __SONET_ITEMS
74752 #undef __HANDLE_ITEM
74753 }
74754@@ -94,7 +94,7 @@ EXPORT_SYMBOL(sonet_copy_stats);
74755
74756 void sonet_subtract_stats(struct k_sonet_stats *from, struct sonet_stats *to)
74757 {
74758-#define __HANDLE_ITEM(i) atomic_sub(to->i, &from->i)
74759+#define __HANDLE_ITEM(i) atomic_sub_unchecked(to->i,&from->i)
74760 __SONET_ITEMS
74761 #undef __HANDLE_ITEM
74762 }
74763diff --git a/net/atm/lec.h b/net/atm/lec.h
74764index dfc0719..47c5322 100644
74765--- a/net/atm/lec.h
74766+++ b/net/atm/lec.h
74767@@ -48,7 +48,7 @@ struct lane2_ops {
74768 const u8 *tlvs, u32 sizeoftlvs);
74769 void (*associate_indicator) (struct net_device *dev, const u8 *mac_addr,
74770 const u8 *tlvs, u32 sizeoftlvs);
74771-};
74772+} __no_const;
74773
74774 /*
74775 * ATM LAN Emulation supports both LLC & Dix Ethernet EtherType
74776diff --git a/net/atm/mpc.h b/net/atm/mpc.h
74777index 0919a88..a23d54e 100644
74778--- a/net/atm/mpc.h
74779+++ b/net/atm/mpc.h
74780@@ -33,7 +33,7 @@ struct mpoa_client {
74781 struct mpc_parameters parameters; /* parameters for this client */
74782
74783 const struct net_device_ops *old_ops;
74784- struct net_device_ops new_ops;
74785+ net_device_ops_no_const new_ops;
74786 };
74787
74788
74789diff --git a/net/atm/proc.c b/net/atm/proc.c
74790index 0d020de..011c7bb 100644
74791--- a/net/atm/proc.c
74792+++ b/net/atm/proc.c
74793@@ -45,9 +45,9 @@ static void add_stats(struct seq_file *seq, const char *aal,
74794 const struct k_atm_aal_stats *stats)
74795 {
74796 seq_printf(seq, "%s ( %d %d %d %d %d )", aal,
74797- atomic_read(&stats->tx), atomic_read(&stats->tx_err),
74798- atomic_read(&stats->rx), atomic_read(&stats->rx_err),
74799- atomic_read(&stats->rx_drop));
74800+ atomic_read_unchecked(&stats->tx),atomic_read_unchecked(&stats->tx_err),
74801+ atomic_read_unchecked(&stats->rx),atomic_read_unchecked(&stats->rx_err),
74802+ atomic_read_unchecked(&stats->rx_drop));
74803 }
74804
74805 static void atm_dev_info(struct seq_file *seq, const struct atm_dev *dev)
74806diff --git a/net/atm/resources.c b/net/atm/resources.c
74807index 23f45ce..c748f1a 100644
74808--- a/net/atm/resources.c
74809+++ b/net/atm/resources.c
74810@@ -160,7 +160,7 @@ EXPORT_SYMBOL(atm_dev_deregister);
74811 static void copy_aal_stats(struct k_atm_aal_stats *from,
74812 struct atm_aal_stats *to)
74813 {
74814-#define __HANDLE_ITEM(i) to->i = atomic_read(&from->i)
74815+#define __HANDLE_ITEM(i) to->i = atomic_read_unchecked(&from->i)
74816 __AAL_STAT_ITEMS
74817 #undef __HANDLE_ITEM
74818 }
74819@@ -168,7 +168,7 @@ static void copy_aal_stats(struct k_atm_aal_stats *from,
74820 static void subtract_aal_stats(struct k_atm_aal_stats *from,
74821 struct atm_aal_stats *to)
74822 {
74823-#define __HANDLE_ITEM(i) atomic_sub(to->i, &from->i)
74824+#define __HANDLE_ITEM(i) atomic_sub_unchecked(to->i, &from->i)
74825 __AAL_STAT_ITEMS
74826 #undef __HANDLE_ITEM
74827 }
74828diff --git a/net/batman-adv/bat_iv_ogm.c b/net/batman-adv/bat_iv_ogm.c
74829index 3512e25..2b33401 100644
74830--- a/net/batman-adv/bat_iv_ogm.c
74831+++ b/net/batman-adv/bat_iv_ogm.c
74832@@ -541,7 +541,7 @@ void bat_ogm_schedule(struct hard_iface *hard_iface, int tt_num_changes)
74833
74834 /* change sequence number to network order */
74835 batman_ogm_packet->seqno =
74836- htonl((uint32_t)atomic_read(&hard_iface->seqno));
74837+ htonl((uint32_t)atomic_read_unchecked(&hard_iface->seqno));
74838
74839 batman_ogm_packet->ttvn = atomic_read(&bat_priv->ttvn);
74840 batman_ogm_packet->tt_crc = htons((uint16_t)
74841@@ -561,7 +561,7 @@ void bat_ogm_schedule(struct hard_iface *hard_iface, int tt_num_changes)
74842 else
74843 batman_ogm_packet->gw_flags = NO_FLAGS;
74844
74845- atomic_inc(&hard_iface->seqno);
74846+ atomic_inc_unchecked(&hard_iface->seqno);
74847
74848 slide_own_bcast_window(hard_iface);
74849 bat_ogm_queue_add(bat_priv, hard_iface->packet_buff,
74850@@ -922,7 +922,7 @@ static void bat_ogm_process(const struct ethhdr *ethhdr,
74851 return;
74852
74853 /* could be changed by schedule_own_packet() */
74854- if_incoming_seqno = atomic_read(&if_incoming->seqno);
74855+ if_incoming_seqno = atomic_read_unchecked(&if_incoming->seqno);
74856
74857 has_directlink_flag = (batman_ogm_packet->flags & DIRECTLINK ? 1 : 0);
74858
74859diff --git a/net/batman-adv/hard-interface.c b/net/batman-adv/hard-interface.c
74860index 7704df4..beb4e16 100644
74861--- a/net/batman-adv/hard-interface.c
74862+++ b/net/batman-adv/hard-interface.c
74863@@ -326,8 +326,8 @@ int hardif_enable_interface(struct hard_iface *hard_iface,
74864 hard_iface->batman_adv_ptype.dev = hard_iface->net_dev;
74865 dev_add_pack(&hard_iface->batman_adv_ptype);
74866
74867- atomic_set(&hard_iface->seqno, 1);
74868- atomic_set(&hard_iface->frag_seqno, 1);
74869+ atomic_set_unchecked(&hard_iface->seqno, 1);
74870+ atomic_set_unchecked(&hard_iface->frag_seqno, 1);
74871 bat_info(hard_iface->soft_iface, "Adding interface: %s\n",
74872 hard_iface->net_dev->name);
74873
74874diff --git a/net/batman-adv/soft-interface.c b/net/batman-adv/soft-interface.c
74875index f9cc957..efd9dae 100644
74876--- a/net/batman-adv/soft-interface.c
74877+++ b/net/batman-adv/soft-interface.c
74878@@ -634,7 +634,7 @@ static int interface_tx(struct sk_buff *skb, struct net_device *soft_iface)
74879
74880 /* set broadcast sequence number */
74881 bcast_packet->seqno =
74882- htonl(atomic_inc_return(&bat_priv->bcast_seqno));
74883+ htonl(atomic_inc_return_unchecked(&bat_priv->bcast_seqno));
74884
74885 add_bcast_packet_to_list(bat_priv, skb, 1);
74886
74887@@ -828,7 +828,7 @@ struct net_device *softif_create(const char *name)
74888 atomic_set(&bat_priv->batman_queue_left, BATMAN_QUEUE_LEN);
74889
74890 atomic_set(&bat_priv->mesh_state, MESH_INACTIVE);
74891- atomic_set(&bat_priv->bcast_seqno, 1);
74892+ atomic_set_unchecked(&bat_priv->bcast_seqno, 1);
74893 atomic_set(&bat_priv->ttvn, 0);
74894 atomic_set(&bat_priv->tt_local_changes, 0);
74895 atomic_set(&bat_priv->tt_ogm_append_cnt, 0);
74896diff --git a/net/batman-adv/types.h b/net/batman-adv/types.h
74897index ab8d0fe..ceba3fd 100644
74898--- a/net/batman-adv/types.h
74899+++ b/net/batman-adv/types.h
74900@@ -38,8 +38,8 @@ struct hard_iface {
74901 int16_t if_num;
74902 char if_status;
74903 struct net_device *net_dev;
74904- atomic_t seqno;
74905- atomic_t frag_seqno;
74906+ atomic_unchecked_t seqno;
74907+ atomic_unchecked_t frag_seqno;
74908 unsigned char *packet_buff;
74909 int packet_len;
74910 struct kobject *hardif_obj;
74911@@ -154,7 +154,7 @@ struct bat_priv {
74912 atomic_t orig_interval; /* uint */
74913 atomic_t hop_penalty; /* uint */
74914 atomic_t log_level; /* uint */
74915- atomic_t bcast_seqno;
74916+ atomic_unchecked_t bcast_seqno;
74917 atomic_t bcast_queue_left;
74918 atomic_t batman_queue_left;
74919 atomic_t ttvn; /* translation table version number */
74920diff --git a/net/batman-adv/unicast.c b/net/batman-adv/unicast.c
74921index 07d1c1d..7e9bea9 100644
74922--- a/net/batman-adv/unicast.c
74923+++ b/net/batman-adv/unicast.c
74924@@ -264,7 +264,7 @@ int frag_send_skb(struct sk_buff *skb, struct bat_priv *bat_priv,
74925 frag1->flags = UNI_FRAG_HEAD | large_tail;
74926 frag2->flags = large_tail;
74927
74928- seqno = atomic_add_return(2, &hard_iface->frag_seqno);
74929+ seqno = atomic_add_return_unchecked(2, &hard_iface->frag_seqno);
74930 frag1->seqno = htons(seqno - 1);
74931 frag2->seqno = htons(seqno);
74932
74933diff --git a/net/bluetooth/hci_conn.c b/net/bluetooth/hci_conn.c
74934index c1c597e..05ebb40 100644
74935--- a/net/bluetooth/hci_conn.c
74936+++ b/net/bluetooth/hci_conn.c
74937@@ -234,7 +234,7 @@ void hci_le_ltk_reply(struct hci_conn *conn, u8 ltk[16])
74938 memset(&cp, 0, sizeof(cp));
74939
74940 cp.handle = cpu_to_le16(conn->handle);
74941- memcpy(cp.ltk, ltk, sizeof(ltk));
74942+ memcpy(cp.ltk, ltk, sizeof(cp.ltk));
74943
74944 hci_send_cmd(hdev, HCI_OP_LE_LTK_REPLY, sizeof(cp), &cp);
74945 }
74946diff --git a/net/bluetooth/l2cap_core.c b/net/bluetooth/l2cap_core.c
74947index 17b5b1c..826d872 100644
74948--- a/net/bluetooth/l2cap_core.c
74949+++ b/net/bluetooth/l2cap_core.c
74950@@ -2176,8 +2176,10 @@ static int l2cap_parse_conf_rsp(struct l2cap_chan *chan, void *rsp, int len, voi
74951 break;
74952
74953 case L2CAP_CONF_RFC:
74954- if (olen == sizeof(rfc))
74955- memcpy(&rfc, (void *)val, olen);
74956+ if (olen != sizeof(rfc))
74957+ break;
74958+
74959+ memcpy(&rfc, (void *)val, olen);
74960
74961 if (test_bit(CONF_STATE2_DEVICE, &chan->conf_state) &&
74962 rfc.mode != chan->mode)
74963@@ -2265,8 +2267,10 @@ static void l2cap_conf_rfc_get(struct l2cap_chan *chan, void *rsp, int len)
74964
74965 switch (type) {
74966 case L2CAP_CONF_RFC:
74967- if (olen == sizeof(rfc))
74968- memcpy(&rfc, (void *)val, olen);
74969+ if (olen != sizeof(rfc))
74970+ break;
74971+
74972+ memcpy(&rfc, (void *)val, olen);
74973 goto done;
74974 }
74975 }
74976diff --git a/net/bridge/br_multicast.c b/net/bridge/br_multicast.c
74977index 8eb6b15..e3db7ab 100644
74978--- a/net/bridge/br_multicast.c
74979+++ b/net/bridge/br_multicast.c
74980@@ -1488,7 +1488,7 @@ static int br_multicast_ipv6_rcv(struct net_bridge *br,
74981 nexthdr = ip6h->nexthdr;
74982 offset = ipv6_skip_exthdr(skb, sizeof(*ip6h), &nexthdr);
74983
74984- if (offset < 0 || nexthdr != IPPROTO_ICMPV6)
74985+ if (nexthdr != IPPROTO_ICMPV6)
74986 return 0;
74987
74988 /* Okay, we found ICMPv6 header */
74989diff --git a/net/bridge/netfilter/ebtables.c b/net/bridge/netfilter/ebtables.c
74990index 5864cc4..121f3a30 100644
74991--- a/net/bridge/netfilter/ebtables.c
74992+++ b/net/bridge/netfilter/ebtables.c
74993@@ -1513,7 +1513,7 @@ static int do_ebt_get_ctl(struct sock *sk, int cmd, void __user *user, int *len)
74994 tmp.valid_hooks = t->table->valid_hooks;
74995 }
74996 mutex_unlock(&ebt_mutex);
74997- if (copy_to_user(user, &tmp, *len) != 0){
74998+ if (*len > sizeof(tmp) || copy_to_user(user, &tmp, *len) != 0){
74999 BUGPRINT("c2u Didn't work\n");
75000 ret = -EFAULT;
75001 break;
75002diff --git a/net/caif/caif_socket.c b/net/caif/caif_socket.c
75003index a986280..13444a1 100644
75004--- a/net/caif/caif_socket.c
75005+++ b/net/caif/caif_socket.c
75006@@ -48,19 +48,20 @@ static struct dentry *debugfsdir;
75007 #ifdef CONFIG_DEBUG_FS
75008 struct debug_fs_counter {
75009 atomic_t caif_nr_socks;
75010- atomic_t caif_sock_create;
75011- atomic_t num_connect_req;
75012- atomic_t num_connect_resp;
75013- atomic_t num_connect_fail_resp;
75014- atomic_t num_disconnect;
75015- atomic_t num_remote_shutdown_ind;
75016- atomic_t num_tx_flow_off_ind;
75017- atomic_t num_tx_flow_on_ind;
75018- atomic_t num_rx_flow_off;
75019- atomic_t num_rx_flow_on;
75020+ atomic_unchecked_t caif_sock_create;
75021+ atomic_unchecked_t num_connect_req;
75022+ atomic_unchecked_t num_connect_resp;
75023+ atomic_unchecked_t num_connect_fail_resp;
75024+ atomic_unchecked_t num_disconnect;
75025+ atomic_unchecked_t num_remote_shutdown_ind;
75026+ atomic_unchecked_t num_tx_flow_off_ind;
75027+ atomic_unchecked_t num_tx_flow_on_ind;
75028+ atomic_unchecked_t num_rx_flow_off;
75029+ atomic_unchecked_t num_rx_flow_on;
75030 };
75031 static struct debug_fs_counter cnt;
75032 #define dbfs_atomic_inc(v) atomic_inc_return(v)
75033+#define dbfs_atomic_inc_unchecked(v) atomic_inc_return_unchecked(v)
75034 #define dbfs_atomic_dec(v) atomic_dec_return(v)
75035 #else
75036 #define dbfs_atomic_inc(v) 0
75037@@ -161,7 +162,7 @@ static int caif_queue_rcv_skb(struct sock *sk, struct sk_buff *skb)
75038 atomic_read(&cf_sk->sk.sk_rmem_alloc),
75039 sk_rcvbuf_lowwater(cf_sk));
75040 set_rx_flow_off(cf_sk);
75041- dbfs_atomic_inc(&cnt.num_rx_flow_off);
75042+ dbfs_atomic_inc_unchecked(&cnt.num_rx_flow_off);
75043 caif_flow_ctrl(sk, CAIF_MODEMCMD_FLOW_OFF_REQ);
75044 }
75045
75046@@ -172,7 +173,7 @@ static int caif_queue_rcv_skb(struct sock *sk, struct sk_buff *skb)
75047 set_rx_flow_off(cf_sk);
75048 if (net_ratelimit())
75049 pr_debug("sending flow OFF due to rmem_schedule\n");
75050- dbfs_atomic_inc(&cnt.num_rx_flow_off);
75051+ dbfs_atomic_inc_unchecked(&cnt.num_rx_flow_off);
75052 caif_flow_ctrl(sk, CAIF_MODEMCMD_FLOW_OFF_REQ);
75053 }
75054 skb->dev = NULL;
75055@@ -233,14 +234,14 @@ static void caif_ctrl_cb(struct cflayer *layr,
75056 switch (flow) {
75057 case CAIF_CTRLCMD_FLOW_ON_IND:
75058 /* OK from modem to start sending again */
75059- dbfs_atomic_inc(&cnt.num_tx_flow_on_ind);
75060+ dbfs_atomic_inc_unchecked(&cnt.num_tx_flow_on_ind);
75061 set_tx_flow_on(cf_sk);
75062 cf_sk->sk.sk_state_change(&cf_sk->sk);
75063 break;
75064
75065 case CAIF_CTRLCMD_FLOW_OFF_IND:
75066 /* Modem asks us to shut up */
75067- dbfs_atomic_inc(&cnt.num_tx_flow_off_ind);
75068+ dbfs_atomic_inc_unchecked(&cnt.num_tx_flow_off_ind);
75069 set_tx_flow_off(cf_sk);
75070 cf_sk->sk.sk_state_change(&cf_sk->sk);
75071 break;
75072@@ -249,7 +250,7 @@ static void caif_ctrl_cb(struct cflayer *layr,
75073 /* We're now connected */
75074 caif_client_register_refcnt(&cf_sk->layer,
75075 cfsk_hold, cfsk_put);
75076- dbfs_atomic_inc(&cnt.num_connect_resp);
75077+ dbfs_atomic_inc_unchecked(&cnt.num_connect_resp);
75078 cf_sk->sk.sk_state = CAIF_CONNECTED;
75079 set_tx_flow_on(cf_sk);
75080 cf_sk->sk.sk_state_change(&cf_sk->sk);
75081@@ -263,7 +264,7 @@ static void caif_ctrl_cb(struct cflayer *layr,
75082
75083 case CAIF_CTRLCMD_INIT_FAIL_RSP:
75084 /* Connect request failed */
75085- dbfs_atomic_inc(&cnt.num_connect_fail_resp);
75086+ dbfs_atomic_inc_unchecked(&cnt.num_connect_fail_resp);
75087 cf_sk->sk.sk_err = ECONNREFUSED;
75088 cf_sk->sk.sk_state = CAIF_DISCONNECTED;
75089 cf_sk->sk.sk_shutdown = SHUTDOWN_MASK;
75090@@ -277,7 +278,7 @@ static void caif_ctrl_cb(struct cflayer *layr,
75091
75092 case CAIF_CTRLCMD_REMOTE_SHUTDOWN_IND:
75093 /* Modem has closed this connection, or device is down. */
75094- dbfs_atomic_inc(&cnt.num_remote_shutdown_ind);
75095+ dbfs_atomic_inc_unchecked(&cnt.num_remote_shutdown_ind);
75096 cf_sk->sk.sk_shutdown = SHUTDOWN_MASK;
75097 cf_sk->sk.sk_err = ECONNRESET;
75098 set_rx_flow_on(cf_sk);
75099@@ -297,7 +298,7 @@ static void caif_check_flow_release(struct sock *sk)
75100 return;
75101
75102 if (atomic_read(&sk->sk_rmem_alloc) <= sk_rcvbuf_lowwater(cf_sk)) {
75103- dbfs_atomic_inc(&cnt.num_rx_flow_on);
75104+ dbfs_atomic_inc_unchecked(&cnt.num_rx_flow_on);
75105 set_rx_flow_on(cf_sk);
75106 caif_flow_ctrl(sk, CAIF_MODEMCMD_FLOW_ON_REQ);
75107 }
75108@@ -854,7 +855,7 @@ static int caif_connect(struct socket *sock, struct sockaddr *uaddr,
75109 /*ifindex = id of the interface.*/
75110 cf_sk->conn_req.ifindex = cf_sk->sk.sk_bound_dev_if;
75111
75112- dbfs_atomic_inc(&cnt.num_connect_req);
75113+ dbfs_atomic_inc_unchecked(&cnt.num_connect_req);
75114 cf_sk->layer.receive = caif_sktrecv_cb;
75115
75116 err = caif_connect_client(sock_net(sk), &cf_sk->conn_req,
75117@@ -943,7 +944,7 @@ static int caif_release(struct socket *sock)
75118 spin_unlock_bh(&sk->sk_receive_queue.lock);
75119 sock->sk = NULL;
75120
75121- dbfs_atomic_inc(&cnt.num_disconnect);
75122+ dbfs_atomic_inc_unchecked(&cnt.num_disconnect);
75123
75124 WARN_ON(IS_ERR(cf_sk->debugfs_socket_dir));
75125 if (cf_sk->debugfs_socket_dir != NULL)
75126@@ -1122,7 +1123,7 @@ static int caif_create(struct net *net, struct socket *sock, int protocol,
75127 cf_sk->conn_req.protocol = protocol;
75128 /* Increase the number of sockets created. */
75129 dbfs_atomic_inc(&cnt.caif_nr_socks);
75130- num = dbfs_atomic_inc(&cnt.caif_sock_create);
75131+ num = dbfs_atomic_inc_unchecked(&cnt.caif_sock_create);
75132 #ifdef CONFIG_DEBUG_FS
75133 if (!IS_ERR(debugfsdir)) {
75134
75135diff --git a/net/caif/cfctrl.c b/net/caif/cfctrl.c
75136index 5cf5222..6f704ad 100644
75137--- a/net/caif/cfctrl.c
75138+++ b/net/caif/cfctrl.c
75139@@ -9,6 +9,7 @@
75140 #include <linux/stddef.h>
75141 #include <linux/spinlock.h>
75142 #include <linux/slab.h>
75143+#include <linux/sched.h>
75144 #include <net/caif/caif_layer.h>
75145 #include <net/caif/cfpkt.h>
75146 #include <net/caif/cfctrl.h>
75147@@ -42,8 +43,8 @@ struct cflayer *cfctrl_create(void)
75148 memset(&dev_info, 0, sizeof(dev_info));
75149 dev_info.id = 0xff;
75150 cfsrvl_init(&this->serv, 0, &dev_info, false);
75151- atomic_set(&this->req_seq_no, 1);
75152- atomic_set(&this->rsp_seq_no, 1);
75153+ atomic_set_unchecked(&this->req_seq_no, 1);
75154+ atomic_set_unchecked(&this->rsp_seq_no, 1);
75155 this->serv.layer.receive = cfctrl_recv;
75156 sprintf(this->serv.layer.name, "ctrl");
75157 this->serv.layer.ctrlcmd = cfctrl_ctrlcmd;
75158@@ -129,8 +130,8 @@ static void cfctrl_insert_req(struct cfctrl *ctrl,
75159 struct cfctrl_request_info *req)
75160 {
75161 spin_lock_bh(&ctrl->info_list_lock);
75162- atomic_inc(&ctrl->req_seq_no);
75163- req->sequence_no = atomic_read(&ctrl->req_seq_no);
75164+ atomic_inc_unchecked(&ctrl->req_seq_no);
75165+ req->sequence_no = atomic_read_unchecked(&ctrl->req_seq_no);
75166 list_add_tail(&req->list, &ctrl->list);
75167 spin_unlock_bh(&ctrl->info_list_lock);
75168 }
75169@@ -148,7 +149,7 @@ static struct cfctrl_request_info *cfctrl_remove_req(struct cfctrl *ctrl,
75170 if (p != first)
75171 pr_warn("Requests are not received in order\n");
75172
75173- atomic_set(&ctrl->rsp_seq_no,
75174+ atomic_set_unchecked(&ctrl->rsp_seq_no,
75175 p->sequence_no);
75176 list_del(&p->list);
75177 goto out;
75178diff --git a/net/can/gw.c b/net/can/gw.c
75179index 3d79b12..8de85fa 100644
75180--- a/net/can/gw.c
75181+++ b/net/can/gw.c
75182@@ -96,7 +96,7 @@ struct cf_mod {
75183 struct {
75184 void (*xor)(struct can_frame *cf, struct cgw_csum_xor *xor);
75185 void (*crc8)(struct can_frame *cf, struct cgw_csum_crc8 *crc8);
75186- } csumfunc;
75187+ } __no_const csumfunc;
75188 };
75189
75190
75191diff --git a/net/compat.c b/net/compat.c
75192index 6def90e..c6992fa 100644
75193--- a/net/compat.c
75194+++ b/net/compat.c
75195@@ -71,9 +71,9 @@ int get_compat_msghdr(struct msghdr *kmsg, struct compat_msghdr __user *umsg)
75196 __get_user(kmsg->msg_controllen, &umsg->msg_controllen) ||
75197 __get_user(kmsg->msg_flags, &umsg->msg_flags))
75198 return -EFAULT;
75199- kmsg->msg_name = compat_ptr(tmp1);
75200- kmsg->msg_iov = compat_ptr(tmp2);
75201- kmsg->msg_control = compat_ptr(tmp3);
75202+ kmsg->msg_name = (void __force_kernel *)compat_ptr(tmp1);
75203+ kmsg->msg_iov = (void __force_kernel *)compat_ptr(tmp2);
75204+ kmsg->msg_control = (void __force_kernel *)compat_ptr(tmp3);
75205 return 0;
75206 }
75207
75208@@ -85,7 +85,7 @@ int verify_compat_iovec(struct msghdr *kern_msg, struct iovec *kern_iov,
75209
75210 if (kern_msg->msg_namelen) {
75211 if (mode == VERIFY_READ) {
75212- int err = move_addr_to_kernel(kern_msg->msg_name,
75213+ int err = move_addr_to_kernel((void __force_user *)kern_msg->msg_name,
75214 kern_msg->msg_namelen,
75215 kern_address);
75216 if (err < 0)
75217@@ -96,7 +96,7 @@ int verify_compat_iovec(struct msghdr *kern_msg, struct iovec *kern_iov,
75218 kern_msg->msg_name = NULL;
75219
75220 tot_len = iov_from_user_compat_to_kern(kern_iov,
75221- (struct compat_iovec __user *)kern_msg->msg_iov,
75222+ (struct compat_iovec __force_user *)kern_msg->msg_iov,
75223 kern_msg->msg_iovlen);
75224 if (tot_len >= 0)
75225 kern_msg->msg_iov = kern_iov;
75226@@ -116,20 +116,20 @@ int verify_compat_iovec(struct msghdr *kern_msg, struct iovec *kern_iov,
75227
75228 #define CMSG_COMPAT_FIRSTHDR(msg) \
75229 (((msg)->msg_controllen) >= sizeof(struct compat_cmsghdr) ? \
75230- (struct compat_cmsghdr __user *)((msg)->msg_control) : \
75231+ (struct compat_cmsghdr __force_user *)((msg)->msg_control) : \
75232 (struct compat_cmsghdr __user *)NULL)
75233
75234 #define CMSG_COMPAT_OK(ucmlen, ucmsg, mhdr) \
75235 ((ucmlen) >= sizeof(struct compat_cmsghdr) && \
75236 (ucmlen) <= (unsigned long) \
75237 ((mhdr)->msg_controllen - \
75238- ((char *)(ucmsg) - (char *)(mhdr)->msg_control)))
75239+ ((char __force_kernel *)(ucmsg) - (char *)(mhdr)->msg_control)))
75240
75241 static inline struct compat_cmsghdr __user *cmsg_compat_nxthdr(struct msghdr *msg,
75242 struct compat_cmsghdr __user *cmsg, int cmsg_len)
75243 {
75244 char __user *ptr = (char __user *)cmsg + CMSG_COMPAT_ALIGN(cmsg_len);
75245- if ((unsigned long)(ptr + 1 - (char __user *)msg->msg_control) >
75246+ if ((unsigned long)(ptr + 1 - (char __force_user *)msg->msg_control) >
75247 msg->msg_controllen)
75248 return NULL;
75249 return (struct compat_cmsghdr __user *)ptr;
75250@@ -221,7 +221,7 @@ int put_cmsg_compat(struct msghdr *kmsg, int level, int type, int len, void *dat
75251 {
75252 struct compat_timeval ctv;
75253 struct compat_timespec cts[3];
75254- struct compat_cmsghdr __user *cm = (struct compat_cmsghdr __user *) kmsg->msg_control;
75255+ struct compat_cmsghdr __user *cm = (struct compat_cmsghdr __force_user *) kmsg->msg_control;
75256 struct compat_cmsghdr cmhdr;
75257 int cmlen;
75258
75259@@ -273,7 +273,7 @@ int put_cmsg_compat(struct msghdr *kmsg, int level, int type, int len, void *dat
75260
75261 void scm_detach_fds_compat(struct msghdr *kmsg, struct scm_cookie *scm)
75262 {
75263- struct compat_cmsghdr __user *cm = (struct compat_cmsghdr __user *) kmsg->msg_control;
75264+ struct compat_cmsghdr __user *cm = (struct compat_cmsghdr __force_user *) kmsg->msg_control;
75265 int fdmax = (kmsg->msg_controllen - sizeof(struct compat_cmsghdr)) / sizeof(int);
75266 int fdnum = scm->fp->count;
75267 struct file **fp = scm->fp->fp;
75268@@ -370,7 +370,7 @@ static int do_set_sock_timeout(struct socket *sock, int level,
75269 return -EFAULT;
75270 old_fs = get_fs();
75271 set_fs(KERNEL_DS);
75272- err = sock_setsockopt(sock, level, optname, (char *)&ktime, sizeof(ktime));
75273+ err = sock_setsockopt(sock, level, optname, (char __force_user *)&ktime, sizeof(ktime));
75274 set_fs(old_fs);
75275
75276 return err;
75277@@ -431,7 +431,7 @@ static int do_get_sock_timeout(struct socket *sock, int level, int optname,
75278 len = sizeof(ktime);
75279 old_fs = get_fs();
75280 set_fs(KERNEL_DS);
75281- err = sock_getsockopt(sock, level, optname, (char *) &ktime, &len);
75282+ err = sock_getsockopt(sock, level, optname, (char __force_user *) &ktime, (int __force_user *)&len);
75283 set_fs(old_fs);
75284
75285 if (!err) {
75286@@ -566,7 +566,7 @@ int compat_mc_setsockopt(struct sock *sock, int level, int optname,
75287 case MCAST_JOIN_GROUP:
75288 case MCAST_LEAVE_GROUP:
75289 {
75290- struct compat_group_req __user *gr32 = (void *)optval;
75291+ struct compat_group_req __user *gr32 = (void __user *)optval;
75292 struct group_req __user *kgr =
75293 compat_alloc_user_space(sizeof(struct group_req));
75294 u32 interface;
75295@@ -587,7 +587,7 @@ int compat_mc_setsockopt(struct sock *sock, int level, int optname,
75296 case MCAST_BLOCK_SOURCE:
75297 case MCAST_UNBLOCK_SOURCE:
75298 {
75299- struct compat_group_source_req __user *gsr32 = (void *)optval;
75300+ struct compat_group_source_req __user *gsr32 = (void __user *)optval;
75301 struct group_source_req __user *kgsr = compat_alloc_user_space(
75302 sizeof(struct group_source_req));
75303 u32 interface;
75304@@ -608,7 +608,7 @@ int compat_mc_setsockopt(struct sock *sock, int level, int optname,
75305 }
75306 case MCAST_MSFILTER:
75307 {
75308- struct compat_group_filter __user *gf32 = (void *)optval;
75309+ struct compat_group_filter __user *gf32 = (void __user *)optval;
75310 struct group_filter __user *kgf;
75311 u32 interface, fmode, numsrc;
75312
75313@@ -646,7 +646,7 @@ int compat_mc_getsockopt(struct sock *sock, int level, int optname,
75314 char __user *optval, int __user *optlen,
75315 int (*getsockopt)(struct sock *, int, int, char __user *, int __user *))
75316 {
75317- struct compat_group_filter __user *gf32 = (void *)optval;
75318+ struct compat_group_filter __user *gf32 = (void __user *)optval;
75319 struct group_filter __user *kgf;
75320 int __user *koptlen;
75321 u32 interface, fmode, numsrc;
75322diff --git a/net/core/datagram.c b/net/core/datagram.c
75323index 68bbf9f..5ef0d12 100644
75324--- a/net/core/datagram.c
75325+++ b/net/core/datagram.c
75326@@ -285,7 +285,7 @@ int skb_kill_datagram(struct sock *sk, struct sk_buff *skb, unsigned int flags)
75327 }
75328
75329 kfree_skb(skb);
75330- atomic_inc(&sk->sk_drops);
75331+ atomic_inc_unchecked(&sk->sk_drops);
75332 sk_mem_reclaim_partial(sk);
75333
75334 return err;
75335diff --git a/net/core/dev.c b/net/core/dev.c
75336index c56cacf..b28e35f 100644
75337--- a/net/core/dev.c
75338+++ b/net/core/dev.c
75339@@ -1139,10 +1139,14 @@ void dev_load(struct net *net, const char *name)
75340 if (no_module && capable(CAP_NET_ADMIN))
75341 no_module = request_module("netdev-%s", name);
75342 if (no_module && capable(CAP_SYS_MODULE)) {
75343+#ifdef CONFIG_GRKERNSEC_MODHARDEN
75344+ ___request_module(true, "grsec_modharden_netdev", "%s", name);
75345+#else
75346 if (!request_module("%s", name))
75347 pr_err("Loading kernel module for a network device "
75348 "with CAP_SYS_MODULE (deprecated). Use CAP_NET_ADMIN and alias netdev-%s "
75349 "instead\n", name);
75350+#endif
75351 }
75352 }
75353 EXPORT_SYMBOL(dev_load);
75354@@ -1573,7 +1577,7 @@ int dev_forward_skb(struct net_device *dev, struct sk_buff *skb)
75355 {
75356 if (skb_shinfo(skb)->tx_flags & SKBTX_DEV_ZEROCOPY) {
75357 if (skb_copy_ubufs(skb, GFP_ATOMIC)) {
75358- atomic_long_inc(&dev->rx_dropped);
75359+ atomic_long_inc_unchecked(&dev->rx_dropped);
75360 kfree_skb(skb);
75361 return NET_RX_DROP;
75362 }
75363@@ -1583,7 +1587,7 @@ int dev_forward_skb(struct net_device *dev, struct sk_buff *skb)
75364 nf_reset(skb);
75365
75366 if (unlikely(!is_skb_forwardable(dev, skb))) {
75367- atomic_long_inc(&dev->rx_dropped);
75368+ atomic_long_inc_unchecked(&dev->rx_dropped);
75369 kfree_skb(skb);
75370 return NET_RX_DROP;
75371 }
75372@@ -2036,7 +2040,7 @@ static int illegal_highdma(struct net_device *dev, struct sk_buff *skb)
75373
75374 struct dev_gso_cb {
75375 void (*destructor)(struct sk_buff *skb);
75376-};
75377+} __no_const;
75378
75379 #define DEV_GSO_CB(skb) ((struct dev_gso_cb *)(skb)->cb)
75380
75381@@ -2970,7 +2974,7 @@ enqueue:
75382
75383 local_irq_restore(flags);
75384
75385- atomic_long_inc(&skb->dev->rx_dropped);
75386+ atomic_long_inc_unchecked(&skb->dev->rx_dropped);
75387 kfree_skb(skb);
75388 return NET_RX_DROP;
75389 }
75390@@ -3044,7 +3048,7 @@ int netif_rx_ni(struct sk_buff *skb)
75391 }
75392 EXPORT_SYMBOL(netif_rx_ni);
75393
75394-static void net_tx_action(struct softirq_action *h)
75395+static void net_tx_action(void)
75396 {
75397 struct softnet_data *sd = &__get_cpu_var(softnet_data);
75398
75399@@ -3333,7 +3337,7 @@ ncls:
75400 if (pt_prev) {
75401 ret = pt_prev->func(skb, skb->dev, pt_prev, orig_dev);
75402 } else {
75403- atomic_long_inc(&skb->dev->rx_dropped);
75404+ atomic_long_inc_unchecked(&skb->dev->rx_dropped);
75405 kfree_skb(skb);
75406 /* Jamal, now you will not able to escape explaining
75407 * me how you were going to use this. :-)
75408@@ -3897,7 +3901,7 @@ void netif_napi_del(struct napi_struct *napi)
75409 }
75410 EXPORT_SYMBOL(netif_napi_del);
75411
75412-static void net_rx_action(struct softirq_action *h)
75413+static void net_rx_action(void)
75414 {
75415 struct softnet_data *sd = &__get_cpu_var(softnet_data);
75416 unsigned long time_limit = jiffies + 2;
75417@@ -5955,7 +5959,7 @@ struct rtnl_link_stats64 *dev_get_stats(struct net_device *dev,
75418 } else {
75419 netdev_stats_to_stats64(storage, &dev->stats);
75420 }
75421- storage->rx_dropped += atomic_long_read(&dev->rx_dropped);
75422+ storage->rx_dropped += atomic_long_read_unchecked(&dev->rx_dropped);
75423 return storage;
75424 }
75425 EXPORT_SYMBOL(dev_get_stats);
75426diff --git a/net/core/flow.c b/net/core/flow.c
75427index e318c7e..168b1d0 100644
75428--- a/net/core/flow.c
75429+++ b/net/core/flow.c
75430@@ -61,7 +61,7 @@ struct flow_cache {
75431 struct timer_list rnd_timer;
75432 };
75433
75434-atomic_t flow_cache_genid = ATOMIC_INIT(0);
75435+atomic_unchecked_t flow_cache_genid = ATOMIC_INIT(0);
75436 EXPORT_SYMBOL(flow_cache_genid);
75437 static struct flow_cache flow_cache_global;
75438 static struct kmem_cache *flow_cachep __read_mostly;
75439@@ -86,7 +86,7 @@ static void flow_cache_new_hashrnd(unsigned long arg)
75440
75441 static int flow_entry_valid(struct flow_cache_entry *fle)
75442 {
75443- if (atomic_read(&flow_cache_genid) != fle->genid)
75444+ if (atomic_read_unchecked(&flow_cache_genid) != fle->genid)
75445 return 0;
75446 if (fle->object && !fle->object->ops->check(fle->object))
75447 return 0;
75448@@ -259,7 +259,7 @@ flow_cache_lookup(struct net *net, const struct flowi *key, u16 family, u8 dir,
75449 hlist_add_head(&fle->u.hlist, &fcp->hash_table[hash]);
75450 fcp->hash_count++;
75451 }
75452- } else if (likely(fle->genid == atomic_read(&flow_cache_genid))) {
75453+ } else if (likely(fle->genid == atomic_read_unchecked(&flow_cache_genid))) {
75454 flo = fle->object;
75455 if (!flo)
75456 goto ret_object;
75457@@ -280,7 +280,7 @@ nocache:
75458 }
75459 flo = resolver(net, key, family, dir, flo, ctx);
75460 if (fle) {
75461- fle->genid = atomic_read(&flow_cache_genid);
75462+ fle->genid = atomic_read_unchecked(&flow_cache_genid);
75463 if (!IS_ERR(flo))
75464 fle->object = flo;
75465 else
75466diff --git a/net/core/iovec.c b/net/core/iovec.c
75467index c40f27e..7f49254 100644
75468--- a/net/core/iovec.c
75469+++ b/net/core/iovec.c
75470@@ -42,7 +42,7 @@ int verify_iovec(struct msghdr *m, struct iovec *iov, struct sockaddr *address,
75471 if (m->msg_namelen) {
75472 if (mode == VERIFY_READ) {
75473 void __user *namep;
75474- namep = (void __user __force *) m->msg_name;
75475+ namep = (void __force_user *) m->msg_name;
75476 err = move_addr_to_kernel(namep, m->msg_namelen,
75477 address);
75478 if (err < 0)
75479@@ -54,7 +54,7 @@ int verify_iovec(struct msghdr *m, struct iovec *iov, struct sockaddr *address,
75480 }
75481
75482 size = m->msg_iovlen * sizeof(struct iovec);
75483- if (copy_from_user(iov, (void __user __force *) m->msg_iov, size))
75484+ if (copy_from_user(iov, (void __force_user *) m->msg_iov, size))
75485 return -EFAULT;
75486
75487 m->msg_iov = iov;
75488diff --git a/net/core/rtnetlink.c b/net/core/rtnetlink.c
75489index 9083e82..1673203 100644
75490--- a/net/core/rtnetlink.c
75491+++ b/net/core/rtnetlink.c
75492@@ -57,7 +57,7 @@ struct rtnl_link {
75493 rtnl_doit_func doit;
75494 rtnl_dumpit_func dumpit;
75495 rtnl_calcit_func calcit;
75496-};
75497+} __no_const;
75498
75499 static DEFINE_MUTEX(rtnl_mutex);
75500 static u16 min_ifinfo_dump_size;
75501diff --git a/net/core/scm.c b/net/core/scm.c
75502index ff52ad0..aff1c0f 100644
75503--- a/net/core/scm.c
75504+++ b/net/core/scm.c
75505@@ -220,7 +220,7 @@ EXPORT_SYMBOL(__scm_send);
75506 int put_cmsg(struct msghdr * msg, int level, int type, int len, void *data)
75507 {
75508 struct cmsghdr __user *cm
75509- = (__force struct cmsghdr __user *)msg->msg_control;
75510+ = (struct cmsghdr __force_user *)msg->msg_control;
75511 struct cmsghdr cmhdr;
75512 int cmlen = CMSG_LEN(len);
75513 int err;
75514@@ -243,7 +243,7 @@ int put_cmsg(struct msghdr * msg, int level, int type, int len, void *data)
75515 err = -EFAULT;
75516 if (copy_to_user(cm, &cmhdr, sizeof cmhdr))
75517 goto out;
75518- if (copy_to_user(CMSG_DATA(cm), data, cmlen - sizeof(struct cmsghdr)))
75519+ if (copy_to_user((void __force_user *)CMSG_DATA((void __force_kernel *)cm), data, cmlen - sizeof(struct cmsghdr)))
75520 goto out;
75521 cmlen = CMSG_SPACE(len);
75522 if (msg->msg_controllen < cmlen)
75523@@ -259,7 +259,7 @@ EXPORT_SYMBOL(put_cmsg);
75524 void scm_detach_fds(struct msghdr *msg, struct scm_cookie *scm)
75525 {
75526 struct cmsghdr __user *cm
75527- = (__force struct cmsghdr __user*)msg->msg_control;
75528+ = (struct cmsghdr __force_user *)msg->msg_control;
75529
75530 int fdmax = 0;
75531 int fdnum = scm->fp->count;
75532@@ -279,7 +279,7 @@ void scm_detach_fds(struct msghdr *msg, struct scm_cookie *scm)
75533 if (fdnum < fdmax)
75534 fdmax = fdnum;
75535
75536- for (i=0, cmfptr=(__force int __user *)CMSG_DATA(cm); i<fdmax;
75537+ for (i=0, cmfptr=(int __force_user *)CMSG_DATA((void __force_kernel *)cm); i<fdmax;
75538 i++, cmfptr++)
75539 {
75540 int new_fd;
75541diff --git a/net/core/sock.c b/net/core/sock.c
75542index b23f174..b9a0d26 100644
75543--- a/net/core/sock.c
75544+++ b/net/core/sock.c
75545@@ -289,7 +289,7 @@ int sock_queue_rcv_skb(struct sock *sk, struct sk_buff *skb)
75546 struct sk_buff_head *list = &sk->sk_receive_queue;
75547
75548 if (atomic_read(&sk->sk_rmem_alloc) >= sk->sk_rcvbuf) {
75549- atomic_inc(&sk->sk_drops);
75550+ atomic_inc_unchecked(&sk->sk_drops);
75551 trace_sock_rcvqueue_full(sk, skb);
75552 return -ENOMEM;
75553 }
75554@@ -299,7 +299,7 @@ int sock_queue_rcv_skb(struct sock *sk, struct sk_buff *skb)
75555 return err;
75556
75557 if (!sk_rmem_schedule(sk, skb->truesize)) {
75558- atomic_inc(&sk->sk_drops);
75559+ atomic_inc_unchecked(&sk->sk_drops);
75560 return -ENOBUFS;
75561 }
75562
75563@@ -319,7 +319,7 @@ int sock_queue_rcv_skb(struct sock *sk, struct sk_buff *skb)
75564 skb_dst_force(skb);
75565
75566 spin_lock_irqsave(&list->lock, flags);
75567- skb->dropcount = atomic_read(&sk->sk_drops);
75568+ skb->dropcount = atomic_read_unchecked(&sk->sk_drops);
75569 __skb_queue_tail(list, skb);
75570 spin_unlock_irqrestore(&list->lock, flags);
75571
75572@@ -339,7 +339,7 @@ int sk_receive_skb(struct sock *sk, struct sk_buff *skb, const int nested)
75573 skb->dev = NULL;
75574
75575 if (sk_rcvqueues_full(sk, skb)) {
75576- atomic_inc(&sk->sk_drops);
75577+ atomic_inc_unchecked(&sk->sk_drops);
75578 goto discard_and_relse;
75579 }
75580 if (nested)
75581@@ -357,7 +357,7 @@ int sk_receive_skb(struct sock *sk, struct sk_buff *skb, const int nested)
75582 mutex_release(&sk->sk_lock.dep_map, 1, _RET_IP_);
75583 } else if (sk_add_backlog(sk, skb)) {
75584 bh_unlock_sock(sk);
75585- atomic_inc(&sk->sk_drops);
75586+ atomic_inc_unchecked(&sk->sk_drops);
75587 goto discard_and_relse;
75588 }
75589
75590@@ -917,7 +917,7 @@ int sock_getsockopt(struct socket *sock, int level, int optname,
75591 if (len > sizeof(peercred))
75592 len = sizeof(peercred);
75593 cred_to_ucred(sk->sk_peer_pid, sk->sk_peer_cred, &peercred);
75594- if (copy_to_user(optval, &peercred, len))
75595+ if (len > sizeof(peercred) || copy_to_user(optval, &peercred, len))
75596 return -EFAULT;
75597 goto lenout;
75598 }
75599@@ -930,7 +930,7 @@ int sock_getsockopt(struct socket *sock, int level, int optname,
75600 return -ENOTCONN;
75601 if (lv < len)
75602 return -EINVAL;
75603- if (copy_to_user(optval, address, len))
75604+ if (len > sizeof(address) || copy_to_user(optval, address, len))
75605 return -EFAULT;
75606 goto lenout;
75607 }
75608@@ -963,7 +963,7 @@ int sock_getsockopt(struct socket *sock, int level, int optname,
75609
75610 if (len > lv)
75611 len = lv;
75612- if (copy_to_user(optval, &v, len))
75613+ if (len > sizeof(v) || copy_to_user(optval, &v, len))
75614 return -EFAULT;
75615 lenout:
75616 if (put_user(len, optlen))
75617@@ -2020,7 +2020,7 @@ void sock_init_data(struct socket *sock, struct sock *sk)
75618 */
75619 smp_wmb();
75620 atomic_set(&sk->sk_refcnt, 1);
75621- atomic_set(&sk->sk_drops, 0);
75622+ atomic_set_unchecked(&sk->sk_drops, 0);
75623 }
75624 EXPORT_SYMBOL(sock_init_data);
75625
75626diff --git a/net/decnet/sysctl_net_decnet.c b/net/decnet/sysctl_net_decnet.c
75627index 02e75d1..9a57a7c 100644
75628--- a/net/decnet/sysctl_net_decnet.c
75629+++ b/net/decnet/sysctl_net_decnet.c
75630@@ -174,7 +174,7 @@ static int dn_node_address_handler(ctl_table *table, int write,
75631
75632 if (len > *lenp) len = *lenp;
75633
75634- if (copy_to_user(buffer, addr, len))
75635+ if (len > sizeof addr || copy_to_user(buffer, addr, len))
75636 return -EFAULT;
75637
75638 *lenp = len;
75639@@ -237,7 +237,7 @@ static int dn_def_dev_handler(ctl_table *table, int write,
75640
75641 if (len > *lenp) len = *lenp;
75642
75643- if (copy_to_user(buffer, devname, len))
75644+ if (len > sizeof devname || copy_to_user(buffer, devname, len))
75645 return -EFAULT;
75646
75647 *lenp = len;
75648diff --git a/net/econet/Kconfig b/net/econet/Kconfig
75649index 39a2d29..f39c0fe 100644
75650--- a/net/econet/Kconfig
75651+++ b/net/econet/Kconfig
75652@@ -4,7 +4,7 @@
75653
75654 config ECONET
75655 tristate "Acorn Econet/AUN protocols (EXPERIMENTAL)"
75656- depends on EXPERIMENTAL && INET
75657+ depends on EXPERIMENTAL && INET && BROKEN
75658 ---help---
75659 Econet is a fairly old and slow networking protocol mainly used by
75660 Acorn computers to access file and print servers. It uses native
75661diff --git a/net/ipv4/ah4.c b/net/ipv4/ah4.c
75662index 36d1440..44ff28b 100644
75663--- a/net/ipv4/ah4.c
75664+++ b/net/ipv4/ah4.c
75665@@ -19,6 +19,8 @@ struct ah_skb_cb {
75666 #define AH_SKB_CB(__skb) ((struct ah_skb_cb *)&((__skb)->cb[0]))
75667
75668 static void *ah_alloc_tmp(struct crypto_ahash *ahash, int nfrags,
75669+ unsigned int size) __size_overflow(3);
75670+static void *ah_alloc_tmp(struct crypto_ahash *ahash, int nfrags,
75671 unsigned int size)
75672 {
75673 unsigned int len;
75674diff --git a/net/ipv4/fib_frontend.c b/net/ipv4/fib_frontend.c
75675index 92fc5f6..b790d91 100644
75676--- a/net/ipv4/fib_frontend.c
75677+++ b/net/ipv4/fib_frontend.c
75678@@ -970,12 +970,12 @@ static int fib_inetaddr_event(struct notifier_block *this, unsigned long event,
75679 #ifdef CONFIG_IP_ROUTE_MULTIPATH
75680 fib_sync_up(dev);
75681 #endif
75682- atomic_inc(&net->ipv4.dev_addr_genid);
75683+ atomic_inc_unchecked(&net->ipv4.dev_addr_genid);
75684 rt_cache_flush(dev_net(dev), -1);
75685 break;
75686 case NETDEV_DOWN:
75687 fib_del_ifaddr(ifa, NULL);
75688- atomic_inc(&net->ipv4.dev_addr_genid);
75689+ atomic_inc_unchecked(&net->ipv4.dev_addr_genid);
75690 if (ifa->ifa_dev->ifa_list == NULL) {
75691 /* Last address was deleted from this interface.
75692 * Disable IP.
75693@@ -1011,7 +1011,7 @@ static int fib_netdev_event(struct notifier_block *this, unsigned long event, vo
75694 #ifdef CONFIG_IP_ROUTE_MULTIPATH
75695 fib_sync_up(dev);
75696 #endif
75697- atomic_inc(&net->ipv4.dev_addr_genid);
75698+ atomic_inc_unchecked(&net->ipv4.dev_addr_genid);
75699 rt_cache_flush(dev_net(dev), -1);
75700 break;
75701 case NETDEV_DOWN:
75702diff --git a/net/ipv4/fib_semantics.c b/net/ipv4/fib_semantics.c
75703index 80106d8..232e898 100644
75704--- a/net/ipv4/fib_semantics.c
75705+++ b/net/ipv4/fib_semantics.c
75706@@ -699,7 +699,7 @@ __be32 fib_info_update_nh_saddr(struct net *net, struct fib_nh *nh)
75707 nh->nh_saddr = inet_select_addr(nh->nh_dev,
75708 nh->nh_gw,
75709 nh->nh_parent->fib_scope);
75710- nh->nh_saddr_genid = atomic_read(&net->ipv4.dev_addr_genid);
75711+ nh->nh_saddr_genid = atomic_read_unchecked(&net->ipv4.dev_addr_genid);
75712
75713 return nh->nh_saddr;
75714 }
75715diff --git a/net/ipv4/inet_diag.c b/net/ipv4/inet_diag.c
75716index ccee270..db23c3c 100644
75717--- a/net/ipv4/inet_diag.c
75718+++ b/net/ipv4/inet_diag.c
75719@@ -114,8 +114,14 @@ static int inet_csk_diag_fill(struct sock *sk,
75720 r->idiag_retrans = 0;
75721
75722 r->id.idiag_if = sk->sk_bound_dev_if;
75723+
75724+#ifdef CONFIG_GRKERNSEC_HIDESYM
75725+ r->id.idiag_cookie[0] = 0;
75726+ r->id.idiag_cookie[1] = 0;
75727+#else
75728 r->id.idiag_cookie[0] = (u32)(unsigned long)sk;
75729 r->id.idiag_cookie[1] = (u32)(((unsigned long)sk >> 31) >> 1);
75730+#endif
75731
75732 r->id.idiag_sport = inet->inet_sport;
75733 r->id.idiag_dport = inet->inet_dport;
75734@@ -210,8 +216,15 @@ static int inet_twsk_diag_fill(struct inet_timewait_sock *tw,
75735 r->idiag_family = tw->tw_family;
75736 r->idiag_retrans = 0;
75737 r->id.idiag_if = tw->tw_bound_dev_if;
75738+
75739+#ifdef CONFIG_GRKERNSEC_HIDESYM
75740+ r->id.idiag_cookie[0] = 0;
75741+ r->id.idiag_cookie[1] = 0;
75742+#else
75743 r->id.idiag_cookie[0] = (u32)(unsigned long)tw;
75744 r->id.idiag_cookie[1] = (u32)(((unsigned long)tw >> 31) >> 1);
75745+#endif
75746+
75747 r->id.idiag_sport = tw->tw_sport;
75748 r->id.idiag_dport = tw->tw_dport;
75749 r->id.idiag_src[0] = tw->tw_rcv_saddr;
75750@@ -294,12 +307,14 @@ static int inet_diag_get_exact(struct sk_buff *in_skb,
75751 if (sk == NULL)
75752 goto unlock;
75753
75754+#ifndef CONFIG_GRKERNSEC_HIDESYM
75755 err = -ESTALE;
75756 if ((req->id.idiag_cookie[0] != INET_DIAG_NOCOOKIE ||
75757 req->id.idiag_cookie[1] != INET_DIAG_NOCOOKIE) &&
75758 ((u32)(unsigned long)sk != req->id.idiag_cookie[0] ||
75759 (u32)((((unsigned long)sk) >> 31) >> 1) != req->id.idiag_cookie[1]))
75760 goto out;
75761+#endif
75762
75763 err = -ENOMEM;
75764 rep = alloc_skb(NLMSG_SPACE((sizeof(struct inet_diag_msg) +
75765@@ -589,8 +604,14 @@ static int inet_diag_fill_req(struct sk_buff *skb, struct sock *sk,
75766 r->idiag_retrans = req->retrans;
75767
75768 r->id.idiag_if = sk->sk_bound_dev_if;
75769+
75770+#ifdef CONFIG_GRKERNSEC_HIDESYM
75771+ r->id.idiag_cookie[0] = 0;
75772+ r->id.idiag_cookie[1] = 0;
75773+#else
75774 r->id.idiag_cookie[0] = (u32)(unsigned long)req;
75775 r->id.idiag_cookie[1] = (u32)(((unsigned long)req >> 31) >> 1);
75776+#endif
75777
75778 tmo = req->expires - jiffies;
75779 if (tmo < 0)
75780diff --git a/net/ipv4/inet_hashtables.c b/net/ipv4/inet_hashtables.c
75781index 984ec65..97ac518 100644
75782--- a/net/ipv4/inet_hashtables.c
75783+++ b/net/ipv4/inet_hashtables.c
75784@@ -18,12 +18,15 @@
75785 #include <linux/sched.h>
75786 #include <linux/slab.h>
75787 #include <linux/wait.h>
75788+#include <linux/security.h>
75789
75790 #include <net/inet_connection_sock.h>
75791 #include <net/inet_hashtables.h>
75792 #include <net/secure_seq.h>
75793 #include <net/ip.h>
75794
75795+extern void gr_update_task_in_ip_table(struct task_struct *task, const struct inet_sock *inet);
75796+
75797 /*
75798 * Allocate and initialize a new local port bind bucket.
75799 * The bindhash mutex for snum's hash chain must be held here.
75800@@ -530,6 +533,8 @@ ok:
75801 twrefcnt += inet_twsk_bind_unhash(tw, hinfo);
75802 spin_unlock(&head->lock);
75803
75804+ gr_update_task_in_ip_table(current, inet_sk(sk));
75805+
75806 if (tw) {
75807 inet_twsk_deschedule(tw, death_row);
75808 while (twrefcnt) {
75809diff --git a/net/ipv4/inetpeer.c b/net/ipv4/inetpeer.c
75810index 86f13c67..59a35b5 100644
75811--- a/net/ipv4/inetpeer.c
75812+++ b/net/ipv4/inetpeer.c
75813@@ -436,8 +436,8 @@ relookup:
75814 if (p) {
75815 p->daddr = *daddr;
75816 atomic_set(&p->refcnt, 1);
75817- atomic_set(&p->rid, 0);
75818- atomic_set(&p->ip_id_count,
75819+ atomic_set_unchecked(&p->rid, 0);
75820+ atomic_set_unchecked(&p->ip_id_count,
75821 (daddr->family == AF_INET) ?
75822 secure_ip_id(daddr->addr.a4) :
75823 secure_ipv6_id(daddr->addr.a6));
75824diff --git a/net/ipv4/ip_fragment.c b/net/ipv4/ip_fragment.c
75825index fdaabf2..0ec3205 100644
75826--- a/net/ipv4/ip_fragment.c
75827+++ b/net/ipv4/ip_fragment.c
75828@@ -316,7 +316,7 @@ static inline int ip_frag_too_far(struct ipq *qp)
75829 return 0;
75830
75831 start = qp->rid;
75832- end = atomic_inc_return(&peer->rid);
75833+ end = atomic_inc_return_unchecked(&peer->rid);
75834 qp->rid = end;
75835
75836 rc = qp->q.fragments && (end - start) > max;
75837diff --git a/net/ipv4/ip_sockglue.c b/net/ipv4/ip_sockglue.c
75838index 09ff51b..d3968eb 100644
75839--- a/net/ipv4/ip_sockglue.c
75840+++ b/net/ipv4/ip_sockglue.c
75841@@ -1111,7 +1111,8 @@ static int do_ip_getsockopt(struct sock *sk, int level, int optname,
75842 len = min_t(unsigned int, len, opt->optlen);
75843 if (put_user(len, optlen))
75844 return -EFAULT;
75845- if (copy_to_user(optval, opt->__data, len))
75846+ if ((len > (sizeof(optbuf) - sizeof(struct ip_options))) ||
75847+ copy_to_user(optval, opt->__data, len))
75848 return -EFAULT;
75849 return 0;
75850 }
75851@@ -1239,7 +1240,7 @@ static int do_ip_getsockopt(struct sock *sk, int level, int optname,
75852 if (sk->sk_type != SOCK_STREAM)
75853 return -ENOPROTOOPT;
75854
75855- msg.msg_control = optval;
75856+ msg.msg_control = (void __force_kernel *)optval;
75857 msg.msg_controllen = len;
75858 msg.msg_flags = flags;
75859
75860diff --git a/net/ipv4/ipconfig.c b/net/ipv4/ipconfig.c
75861index 99ec116..c5628fe 100644
75862--- a/net/ipv4/ipconfig.c
75863+++ b/net/ipv4/ipconfig.c
75864@@ -318,7 +318,7 @@ static int __init ic_devinet_ioctl(unsigned int cmd, struct ifreq *arg)
75865
75866 mm_segment_t oldfs = get_fs();
75867 set_fs(get_ds());
75868- res = devinet_ioctl(&init_net, cmd, (struct ifreq __user *) arg);
75869+ res = devinet_ioctl(&init_net, cmd, (struct ifreq __force_user *) arg);
75870 set_fs(oldfs);
75871 return res;
75872 }
75873@@ -329,7 +329,7 @@ static int __init ic_dev_ioctl(unsigned int cmd, struct ifreq *arg)
75874
75875 mm_segment_t oldfs = get_fs();
75876 set_fs(get_ds());
75877- res = dev_ioctl(&init_net, cmd, (struct ifreq __user *) arg);
75878+ res = dev_ioctl(&init_net, cmd, (struct ifreq __force_user *) arg);
75879 set_fs(oldfs);
75880 return res;
75881 }
75882@@ -340,7 +340,7 @@ static int __init ic_route_ioctl(unsigned int cmd, struct rtentry *arg)
75883
75884 mm_segment_t oldfs = get_fs();
75885 set_fs(get_ds());
75886- res = ip_rt_ioctl(&init_net, cmd, (void __user *) arg);
75887+ res = ip_rt_ioctl(&init_net, cmd, (void __force_user *) arg);
75888 set_fs(oldfs);
75889 return res;
75890 }
75891diff --git a/net/ipv4/netfilter/arp_tables.c b/net/ipv4/netfilter/arp_tables.c
75892index fd7a3f6..e5be655 100644
75893--- a/net/ipv4/netfilter/arp_tables.c
75894+++ b/net/ipv4/netfilter/arp_tables.c
75895@@ -984,6 +984,11 @@ static int __do_replace(struct net *net, const char *name,
75896 unsigned int valid_hooks,
75897 struct xt_table_info *newinfo,
75898 unsigned int num_counters,
75899+ void __user *counters_ptr) __size_overflow(5);
75900+static int __do_replace(struct net *net, const char *name,
75901+ unsigned int valid_hooks,
75902+ struct xt_table_info *newinfo,
75903+ unsigned int num_counters,
75904 void __user *counters_ptr)
75905 {
75906 int ret;
75907@@ -1104,6 +1109,8 @@ static int do_replace(struct net *net, const void __user *user,
75908 }
75909
75910 static int do_add_counters(struct net *net, const void __user *user,
75911+ unsigned int len, int compat) __size_overflow(3);
75912+static int do_add_counters(struct net *net, const void __user *user,
75913 unsigned int len, int compat)
75914 {
75915 unsigned int i, curcpu;
75916diff --git a/net/ipv4/netfilter/ip_tables.c b/net/ipv4/netfilter/ip_tables.c
75917index 24e556e..a8daf7a 100644
75918--- a/net/ipv4/netfilter/ip_tables.c
75919+++ b/net/ipv4/netfilter/ip_tables.c
75920@@ -1172,6 +1172,10 @@ get_entries(struct net *net, struct ipt_get_entries __user *uptr,
75921 static int
75922 __do_replace(struct net *net, const char *name, unsigned int valid_hooks,
75923 struct xt_table_info *newinfo, unsigned int num_counters,
75924+ void __user *counters_ptr) __size_overflow(5);
75925+static int
75926+__do_replace(struct net *net, const char *name, unsigned int valid_hooks,
75927+ struct xt_table_info *newinfo, unsigned int num_counters,
75928 void __user *counters_ptr)
75929 {
75930 int ret;
75931@@ -1293,6 +1297,9 @@ do_replace(struct net *net, const void __user *user, unsigned int len)
75932
75933 static int
75934 do_add_counters(struct net *net, const void __user *user,
75935+ unsigned int len, int compat) __size_overflow(3);
75936+static int
75937+do_add_counters(struct net *net, const void __user *user,
75938 unsigned int len, int compat)
75939 {
75940 unsigned int i, curcpu;
75941diff --git a/net/ipv4/netfilter/nf_nat_snmp_basic.c b/net/ipv4/netfilter/nf_nat_snmp_basic.c
75942index 2133c30..0e8047e 100644
75943--- a/net/ipv4/netfilter/nf_nat_snmp_basic.c
75944+++ b/net/ipv4/netfilter/nf_nat_snmp_basic.c
75945@@ -435,6 +435,10 @@ static unsigned char asn1_subid_decode(struct asn1_ctx *ctx,
75946 static unsigned char asn1_oid_decode(struct asn1_ctx *ctx,
75947 unsigned char *eoc,
75948 unsigned long **oid,
75949+ unsigned int *len) __size_overflow(2);
75950+static unsigned char asn1_oid_decode(struct asn1_ctx *ctx,
75951+ unsigned char *eoc,
75952+ unsigned long **oid,
75953 unsigned int *len)
75954 {
75955 unsigned long subid;
75956diff --git a/net/ipv4/ping.c b/net/ipv4/ping.c
75957index 43d4c3b..1914409 100644
75958--- a/net/ipv4/ping.c
75959+++ b/net/ipv4/ping.c
75960@@ -836,7 +836,7 @@ static void ping_format_sock(struct sock *sp, struct seq_file *f,
75961 sk_rmem_alloc_get(sp),
75962 0, 0L, 0, sock_i_uid(sp), 0, sock_i_ino(sp),
75963 atomic_read(&sp->sk_refcnt), sp,
75964- atomic_read(&sp->sk_drops), len);
75965+ atomic_read_unchecked(&sp->sk_drops), len);
75966 }
75967
75968 static int ping_seq_show(struct seq_file *seq, void *v)
75969diff --git a/net/ipv4/raw.c b/net/ipv4/raw.c
75970index 007e2eb..85a18a0 100644
75971--- a/net/ipv4/raw.c
75972+++ b/net/ipv4/raw.c
75973@@ -303,7 +303,7 @@ static int raw_rcv_skb(struct sock * sk, struct sk_buff * skb)
75974 int raw_rcv(struct sock *sk, struct sk_buff *skb)
75975 {
75976 if (!xfrm4_policy_check(sk, XFRM_POLICY_IN, skb)) {
75977- atomic_inc(&sk->sk_drops);
75978+ atomic_inc_unchecked(&sk->sk_drops);
75979 kfree_skb(skb);
75980 return NET_RX_DROP;
75981 }
75982@@ -738,16 +738,20 @@ static int raw_init(struct sock *sk)
75983
75984 static int raw_seticmpfilter(struct sock *sk, char __user *optval, int optlen)
75985 {
75986+ struct icmp_filter filter;
75987+
75988 if (optlen > sizeof(struct icmp_filter))
75989 optlen = sizeof(struct icmp_filter);
75990- if (copy_from_user(&raw_sk(sk)->filter, optval, optlen))
75991+ if (copy_from_user(&filter, optval, optlen))
75992 return -EFAULT;
75993+ raw_sk(sk)->filter = filter;
75994 return 0;
75995 }
75996
75997 static int raw_geticmpfilter(struct sock *sk, char __user *optval, int __user *optlen)
75998 {
75999 int len, ret = -EFAULT;
76000+ struct icmp_filter filter;
76001
76002 if (get_user(len, optlen))
76003 goto out;
76004@@ -757,8 +761,8 @@ static int raw_geticmpfilter(struct sock *sk, char __user *optval, int __user *o
76005 if (len > sizeof(struct icmp_filter))
76006 len = sizeof(struct icmp_filter);
76007 ret = -EFAULT;
76008- if (put_user(len, optlen) ||
76009- copy_to_user(optval, &raw_sk(sk)->filter, len))
76010+ filter = raw_sk(sk)->filter;
76011+ if (put_user(len, optlen) || len > sizeof filter || copy_to_user(optval, &filter, len))
76012 goto out;
76013 ret = 0;
76014 out: return ret;
76015@@ -986,7 +990,13 @@ static void raw_sock_seq_show(struct seq_file *seq, struct sock *sp, int i)
76016 sk_wmem_alloc_get(sp),
76017 sk_rmem_alloc_get(sp),
76018 0, 0L, 0, sock_i_uid(sp), 0, sock_i_ino(sp),
76019- atomic_read(&sp->sk_refcnt), sp, atomic_read(&sp->sk_drops));
76020+ atomic_read(&sp->sk_refcnt),
76021+#ifdef CONFIG_GRKERNSEC_HIDESYM
76022+ NULL,
76023+#else
76024+ sp,
76025+#endif
76026+ atomic_read_unchecked(&sp->sk_drops));
76027 }
76028
76029 static int raw_seq_show(struct seq_file *seq, void *v)
76030diff --git a/net/ipv4/route.c b/net/ipv4/route.c
76031index 94cdbc5..0cb0063 100644
76032--- a/net/ipv4/route.c
76033+++ b/net/ipv4/route.c
76034@@ -313,7 +313,7 @@ static inline unsigned int rt_hash(__be32 daddr, __be32 saddr, int idx,
76035
76036 static inline int rt_genid(struct net *net)
76037 {
76038- return atomic_read(&net->ipv4.rt_genid);
76039+ return atomic_read_unchecked(&net->ipv4.rt_genid);
76040 }
76041
76042 #ifdef CONFIG_PROC_FS
76043@@ -937,7 +937,7 @@ static void rt_cache_invalidate(struct net *net)
76044 unsigned char shuffle;
76045
76046 get_random_bytes(&shuffle, sizeof(shuffle));
76047- atomic_add(shuffle + 1U, &net->ipv4.rt_genid);
76048+ atomic_add_unchecked(shuffle + 1U, &net->ipv4.rt_genid);
76049 redirect_genid++;
76050 }
76051
76052@@ -3022,7 +3022,7 @@ static int rt_fill_info(struct net *net,
76053 error = rt->dst.error;
76054 if (peer) {
76055 inet_peer_refcheck(rt->peer);
76056- id = atomic_read(&peer->ip_id_count) & 0xffff;
76057+ id = atomic_read_unchecked(&peer->ip_id_count) & 0xffff;
76058 if (peer->tcp_ts_stamp) {
76059 ts = peer->tcp_ts;
76060 tsage = get_seconds() - peer->tcp_ts_stamp;
76061diff --git a/net/ipv4/syncookies.c b/net/ipv4/syncookies.c
76062index 90f6544..769c0e9 100644
76063--- a/net/ipv4/syncookies.c
76064+++ b/net/ipv4/syncookies.c
76065@@ -278,6 +278,7 @@ struct sock *cookie_v4_check(struct sock *sk, struct sk_buff *skb,
76066 struct rtable *rt;
76067 __u8 rcv_wscale;
76068 bool ecn_ok = false;
76069+ struct flowi4 fl4;
76070
76071 if (!sysctl_tcp_syncookies || !th->ack || th->rst)
76072 goto out;
76073@@ -346,20 +347,16 @@ struct sock *cookie_v4_check(struct sock *sk, struct sk_buff *skb,
76074 * hasn't changed since we received the original syn, but I see
76075 * no easy way to do this.
76076 */
76077- {
76078- struct flowi4 fl4;
76079-
76080- flowi4_init_output(&fl4, 0, sk->sk_mark, RT_CONN_FLAGS(sk),
76081- RT_SCOPE_UNIVERSE, IPPROTO_TCP,
76082- inet_sk_flowi_flags(sk),
76083- (opt && opt->srr) ? opt->faddr : ireq->rmt_addr,
76084- ireq->loc_addr, th->source, th->dest);
76085- security_req_classify_flow(req, flowi4_to_flowi(&fl4));
76086- rt = ip_route_output_key(sock_net(sk), &fl4);
76087- if (IS_ERR(rt)) {
76088- reqsk_free(req);
76089- goto out;
76090- }
76091+ flowi4_init_output(&fl4, 0, sk->sk_mark, RT_CONN_FLAGS(sk),
76092+ RT_SCOPE_UNIVERSE, IPPROTO_TCP,
76093+ inet_sk_flowi_flags(sk),
76094+ (opt && opt->srr) ? opt->faddr : ireq->rmt_addr,
76095+ ireq->loc_addr, th->source, th->dest);
76096+ security_req_classify_flow(req, flowi4_to_flowi(&fl4));
76097+ rt = ip_route_output_key(sock_net(sk), &fl4);
76098+ if (IS_ERR(rt)) {
76099+ reqsk_free(req);
76100+ goto out;
76101 }
76102
76103 /* Try to redo what tcp_v4_send_synack did. */
76104@@ -373,5 +370,10 @@ struct sock *cookie_v4_check(struct sock *sk, struct sk_buff *skb,
76105 ireq->rcv_wscale = rcv_wscale;
76106
76107 ret = get_cookie_sock(sk, skb, req, &rt->dst);
76108+ /* ip_queue_xmit() depends on our flow being setup
76109+ * Normal sockets get it right from inet_csk_route_child_sock()
76110+ */
76111+ if (ret)
76112+ inet_sk(ret)->cork.fl.u.ip4 = fl4;
76113 out: return ret;
76114 }
76115diff --git a/net/ipv4/tcp_ipv4.c b/net/ipv4/tcp_ipv4.c
76116index eb90aa8..74908e1 100644
76117--- a/net/ipv4/tcp_ipv4.c
76118+++ b/net/ipv4/tcp_ipv4.c
76119@@ -87,6 +87,9 @@ int sysctl_tcp_tw_reuse __read_mostly;
76120 int sysctl_tcp_low_latency __read_mostly;
76121 EXPORT_SYMBOL(sysctl_tcp_low_latency);
76122
76123+#ifdef CONFIG_GRKERNSEC_BLACKHOLE
76124+extern int grsec_enable_blackhole;
76125+#endif
76126
76127 #ifdef CONFIG_TCP_MD5SIG
76128 static struct tcp_md5sig_key *tcp_v4_md5_do_lookup(struct sock *sk,
76129@@ -1465,9 +1468,13 @@ struct sock *tcp_v4_syn_recv_sock(struct sock *sk, struct sk_buff *skb,
76130 inet_csk(newsk)->icsk_ext_hdr_len = inet_opt->opt.optlen;
76131 newinet->inet_id = newtp->write_seq ^ jiffies;
76132
76133- if (!dst && (dst = inet_csk_route_child_sock(sk, newsk, req)) == NULL)
76134- goto put_and_exit;
76135-
76136+ if (!dst) {
76137+ dst = inet_csk_route_child_sock(sk, newsk, req);
76138+ if (!dst)
76139+ goto put_and_exit;
76140+ } else {
76141+ /* syncookie case : see end of cookie_v4_check() */
76142+ }
76143 sk_setup_caps(newsk, dst);
76144
76145 tcp_mtup_init(newsk);
76146@@ -1632,6 +1639,9 @@ int tcp_v4_do_rcv(struct sock *sk, struct sk_buff *skb)
76147 return 0;
76148
76149 reset:
76150+#ifdef CONFIG_GRKERNSEC_BLACKHOLE
76151+ if (!grsec_enable_blackhole)
76152+#endif
76153 tcp_v4_send_reset(rsk, skb);
76154 discard:
76155 kfree_skb(skb);
76156@@ -1694,12 +1704,19 @@ int tcp_v4_rcv(struct sk_buff *skb)
76157 TCP_SKB_CB(skb)->sacked = 0;
76158
76159 sk = __inet_lookup_skb(&tcp_hashinfo, skb, th->source, th->dest);
76160- if (!sk)
76161+ if (!sk) {
76162+#ifdef CONFIG_GRKERNSEC_BLACKHOLE
76163+ ret = 1;
76164+#endif
76165 goto no_tcp_socket;
76166-
76167+ }
76168 process:
76169- if (sk->sk_state == TCP_TIME_WAIT)
76170+ if (sk->sk_state == TCP_TIME_WAIT) {
76171+#ifdef CONFIG_GRKERNSEC_BLACKHOLE
76172+ ret = 2;
76173+#endif
76174 goto do_time_wait;
76175+ }
76176
76177 if (unlikely(iph->ttl < inet_sk(sk)->min_ttl)) {
76178 NET_INC_STATS_BH(net, LINUX_MIB_TCPMINTTLDROP);
76179@@ -1749,6 +1766,10 @@ no_tcp_socket:
76180 bad_packet:
76181 TCP_INC_STATS_BH(net, TCP_MIB_INERRS);
76182 } else {
76183+#ifdef CONFIG_GRKERNSEC_BLACKHOLE
76184+ if (!grsec_enable_blackhole || (ret == 1 &&
76185+ (skb->dev->flags & IFF_LOOPBACK)))
76186+#endif
76187 tcp_v4_send_reset(NULL, skb);
76188 }
76189
76190@@ -2409,7 +2430,11 @@ static void get_openreq4(const struct sock *sk, const struct request_sock *req,
76191 0, /* non standard timer */
76192 0, /* open_requests have no inode */
76193 atomic_read(&sk->sk_refcnt),
76194+#ifdef CONFIG_GRKERNSEC_HIDESYM
76195+ NULL,
76196+#else
76197 req,
76198+#endif
76199 len);
76200 }
76201
76202@@ -2459,7 +2484,12 @@ static void get_tcp4_sock(struct sock *sk, struct seq_file *f, int i, int *len)
76203 sock_i_uid(sk),
76204 icsk->icsk_probes_out,
76205 sock_i_ino(sk),
76206- atomic_read(&sk->sk_refcnt), sk,
76207+ atomic_read(&sk->sk_refcnt),
76208+#ifdef CONFIG_GRKERNSEC_HIDESYM
76209+ NULL,
76210+#else
76211+ sk,
76212+#endif
76213 jiffies_to_clock_t(icsk->icsk_rto),
76214 jiffies_to_clock_t(icsk->icsk_ack.ato),
76215 (icsk->icsk_ack.quick << 1) | icsk->icsk_ack.pingpong,
76216@@ -2487,7 +2517,13 @@ static void get_timewait4_sock(const struct inet_timewait_sock *tw,
76217 " %02X %08X:%08X %02X:%08lX %08X %5d %8d %d %d %pK%n",
76218 i, src, srcp, dest, destp, tw->tw_substate, 0, 0,
76219 3, jiffies_to_clock_t(ttd), 0, 0, 0, 0,
76220- atomic_read(&tw->tw_refcnt), tw, len);
76221+ atomic_read(&tw->tw_refcnt),
76222+#ifdef CONFIG_GRKERNSEC_HIDESYM
76223+ NULL,
76224+#else
76225+ tw,
76226+#endif
76227+ len);
76228 }
76229
76230 #define TMPSZ 150
76231diff --git a/net/ipv4/tcp_minisocks.c b/net/ipv4/tcp_minisocks.c
76232index 66363b6..b0654a3 100644
76233--- a/net/ipv4/tcp_minisocks.c
76234+++ b/net/ipv4/tcp_minisocks.c
76235@@ -27,6 +27,10 @@
76236 #include <net/inet_common.h>
76237 #include <net/xfrm.h>
76238
76239+#ifdef CONFIG_GRKERNSEC_BLACKHOLE
76240+extern int grsec_enable_blackhole;
76241+#endif
76242+
76243 int sysctl_tcp_syncookies __read_mostly = 1;
76244 EXPORT_SYMBOL(sysctl_tcp_syncookies);
76245
76246@@ -751,6 +755,10 @@ listen_overflow:
76247
76248 embryonic_reset:
76249 NET_INC_STATS_BH(sock_net(sk), LINUX_MIB_EMBRYONICRSTS);
76250+
76251+#ifdef CONFIG_GRKERNSEC_BLACKHOLE
76252+ if (!grsec_enable_blackhole)
76253+#endif
76254 if (!(flg & TCP_FLAG_RST))
76255 req->rsk_ops->send_reset(sk, skb);
76256
76257diff --git a/net/ipv4/tcp_probe.c b/net/ipv4/tcp_probe.c
76258index 85ee7eb..53277ab 100644
76259--- a/net/ipv4/tcp_probe.c
76260+++ b/net/ipv4/tcp_probe.c
76261@@ -202,7 +202,7 @@ static ssize_t tcpprobe_read(struct file *file, char __user *buf,
76262 if (cnt + width >= len)
76263 break;
76264
76265- if (copy_to_user(buf + cnt, tbuf, width))
76266+ if (width > sizeof tbuf || copy_to_user(buf + cnt, tbuf, width))
76267 return -EFAULT;
76268 cnt += width;
76269 }
76270diff --git a/net/ipv4/tcp_timer.c b/net/ipv4/tcp_timer.c
76271index 2e0f0af..e2948bf 100644
76272--- a/net/ipv4/tcp_timer.c
76273+++ b/net/ipv4/tcp_timer.c
76274@@ -22,6 +22,10 @@
76275 #include <linux/gfp.h>
76276 #include <net/tcp.h>
76277
76278+#ifdef CONFIG_GRKERNSEC_BLACKHOLE
76279+extern int grsec_lastack_retries;
76280+#endif
76281+
76282 int sysctl_tcp_syn_retries __read_mostly = TCP_SYN_RETRIES;
76283 int sysctl_tcp_synack_retries __read_mostly = TCP_SYNACK_RETRIES;
76284 int sysctl_tcp_keepalive_time __read_mostly = TCP_KEEPALIVE_TIME;
76285@@ -199,6 +203,13 @@ static int tcp_write_timeout(struct sock *sk)
76286 }
76287 }
76288
76289+#ifdef CONFIG_GRKERNSEC_BLACKHOLE
76290+ if ((sk->sk_state == TCP_LAST_ACK) &&
76291+ (grsec_lastack_retries > 0) &&
76292+ (grsec_lastack_retries < retry_until))
76293+ retry_until = grsec_lastack_retries;
76294+#endif
76295+
76296 if (retransmits_timed_out(sk, retry_until,
76297 syn_set ? 0 : icsk->icsk_user_timeout, syn_set)) {
76298 /* Has it gone just too far? */
76299diff --git a/net/ipv4/udp.c b/net/ipv4/udp.c
76300index 5a65eea..bd913a1 100644
76301--- a/net/ipv4/udp.c
76302+++ b/net/ipv4/udp.c
76303@@ -86,6 +86,7 @@
76304 #include <linux/types.h>
76305 #include <linux/fcntl.h>
76306 #include <linux/module.h>
76307+#include <linux/security.h>
76308 #include <linux/socket.h>
76309 #include <linux/sockios.h>
76310 #include <linux/igmp.h>
76311@@ -108,6 +109,10 @@
76312 #include <trace/events/udp.h>
76313 #include "udp_impl.h"
76314
76315+#ifdef CONFIG_GRKERNSEC_BLACKHOLE
76316+extern int grsec_enable_blackhole;
76317+#endif
76318+
76319 struct udp_table udp_table __read_mostly;
76320 EXPORT_SYMBOL(udp_table);
76321
76322@@ -565,6 +570,9 @@ found:
76323 return s;
76324 }
76325
76326+extern int gr_search_udp_recvmsg(struct sock *sk, const struct sk_buff *skb);
76327+extern int gr_search_udp_sendmsg(struct sock *sk, struct sockaddr_in *addr);
76328+
76329 /*
76330 * This routine is called by the ICMP module when it gets some
76331 * sort of error condition. If err < 0 then the socket should
76332@@ -856,9 +864,18 @@ int udp_sendmsg(struct kiocb *iocb, struct sock *sk, struct msghdr *msg,
76333 dport = usin->sin_port;
76334 if (dport == 0)
76335 return -EINVAL;
76336+
76337+ err = gr_search_udp_sendmsg(sk, usin);
76338+ if (err)
76339+ return err;
76340 } else {
76341 if (sk->sk_state != TCP_ESTABLISHED)
76342 return -EDESTADDRREQ;
76343+
76344+ err = gr_search_udp_sendmsg(sk, NULL);
76345+ if (err)
76346+ return err;
76347+
76348 daddr = inet->inet_daddr;
76349 dport = inet->inet_dport;
76350 /* Open fast path for connected socket.
76351@@ -1099,7 +1116,7 @@ static unsigned int first_packet_length(struct sock *sk)
76352 udp_lib_checksum_complete(skb)) {
76353 UDP_INC_STATS_BH(sock_net(sk), UDP_MIB_INERRORS,
76354 IS_UDPLITE(sk));
76355- atomic_inc(&sk->sk_drops);
76356+ atomic_inc_unchecked(&sk->sk_drops);
76357 __skb_unlink(skb, rcvq);
76358 __skb_queue_tail(&list_kill, skb);
76359 }
76360@@ -1185,6 +1202,10 @@ try_again:
76361 if (!skb)
76362 goto out;
76363
76364+ err = gr_search_udp_recvmsg(sk, skb);
76365+ if (err)
76366+ goto out_free;
76367+
76368 ulen = skb->len - sizeof(struct udphdr);
76369 copied = len;
76370 if (copied > ulen)
76371@@ -1487,7 +1508,7 @@ int udp_queue_rcv_skb(struct sock *sk, struct sk_buff *skb)
76372
76373 drop:
76374 UDP_INC_STATS_BH(sock_net(sk), UDP_MIB_INERRORS, is_udplite);
76375- atomic_inc(&sk->sk_drops);
76376+ atomic_inc_unchecked(&sk->sk_drops);
76377 kfree_skb(skb);
76378 return -1;
76379 }
76380@@ -1506,7 +1527,7 @@ static void flush_stack(struct sock **stack, unsigned int count,
76381 skb1 = (i == final) ? skb : skb_clone(skb, GFP_ATOMIC);
76382
76383 if (!skb1) {
76384- atomic_inc(&sk->sk_drops);
76385+ atomic_inc_unchecked(&sk->sk_drops);
76386 UDP_INC_STATS_BH(sock_net(sk), UDP_MIB_RCVBUFERRORS,
76387 IS_UDPLITE(sk));
76388 UDP_INC_STATS_BH(sock_net(sk), UDP_MIB_INERRORS,
76389@@ -1675,6 +1696,9 @@ int __udp4_lib_rcv(struct sk_buff *skb, struct udp_table *udptable,
76390 goto csum_error;
76391
76392 UDP_INC_STATS_BH(net, UDP_MIB_NOPORTS, proto == IPPROTO_UDPLITE);
76393+#ifdef CONFIG_GRKERNSEC_BLACKHOLE
76394+ if (!grsec_enable_blackhole || (skb->dev->flags & IFF_LOOPBACK))
76395+#endif
76396 icmp_send(skb, ICMP_DEST_UNREACH, ICMP_PORT_UNREACH, 0);
76397
76398 /*
76399@@ -2098,8 +2122,13 @@ static void udp4_format_sock(struct sock *sp, struct seq_file *f,
76400 sk_wmem_alloc_get(sp),
76401 sk_rmem_alloc_get(sp),
76402 0, 0L, 0, sock_i_uid(sp), 0, sock_i_ino(sp),
76403- atomic_read(&sp->sk_refcnt), sp,
76404- atomic_read(&sp->sk_drops), len);
76405+ atomic_read(&sp->sk_refcnt),
76406+#ifdef CONFIG_GRKERNSEC_HIDESYM
76407+ NULL,
76408+#else
76409+ sp,
76410+#endif
76411+ atomic_read_unchecked(&sp->sk_drops), len);
76412 }
76413
76414 int udp4_seq_show(struct seq_file *seq, void *v)
76415diff --git a/net/ipv6/addrconf.c b/net/ipv6/addrconf.c
76416index a5521c5..984a2f4 100644
76417--- a/net/ipv6/addrconf.c
76418+++ b/net/ipv6/addrconf.c
76419@@ -2153,7 +2153,7 @@ int addrconf_set_dstaddr(struct net *net, void __user *arg)
76420 p.iph.ihl = 5;
76421 p.iph.protocol = IPPROTO_IPV6;
76422 p.iph.ttl = 64;
76423- ifr.ifr_ifru.ifru_data = (__force void __user *)&p;
76424+ ifr.ifr_ifru.ifru_data = (void __force_user *)&p;
76425
76426 if (ops->ndo_do_ioctl) {
76427 mm_segment_t oldfs = get_fs();
76428diff --git a/net/ipv6/ah6.c b/net/ipv6/ah6.c
76429index 4c0f894..fca5d15 100644
76430--- a/net/ipv6/ah6.c
76431+++ b/net/ipv6/ah6.c
76432@@ -56,6 +56,8 @@ struct ah_skb_cb {
76433 #define AH_SKB_CB(__skb) ((struct ah_skb_cb *)&((__skb)->cb[0]))
76434
76435 static void *ah_alloc_tmp(struct crypto_ahash *ahash, int nfrags,
76436+ unsigned int size) __size_overflow(3);
76437+static void *ah_alloc_tmp(struct crypto_ahash *ahash, int nfrags,
76438 unsigned int size)
76439 {
76440 unsigned int len;
76441diff --git a/net/ipv6/inet6_connection_sock.c b/net/ipv6/inet6_connection_sock.c
76442index 1567fb1..29af910 100644
76443--- a/net/ipv6/inet6_connection_sock.c
76444+++ b/net/ipv6/inet6_connection_sock.c
76445@@ -178,7 +178,7 @@ void __inet6_csk_dst_store(struct sock *sk, struct dst_entry *dst,
76446 #ifdef CONFIG_XFRM
76447 {
76448 struct rt6_info *rt = (struct rt6_info *)dst;
76449- rt->rt6i_flow_cache_genid = atomic_read(&flow_cache_genid);
76450+ rt->rt6i_flow_cache_genid = atomic_read_unchecked(&flow_cache_genid);
76451 }
76452 #endif
76453 }
76454@@ -193,7 +193,7 @@ struct dst_entry *__inet6_csk_dst_check(struct sock *sk, u32 cookie)
76455 #ifdef CONFIG_XFRM
76456 if (dst) {
76457 struct rt6_info *rt = (struct rt6_info *)dst;
76458- if (rt->rt6i_flow_cache_genid != atomic_read(&flow_cache_genid)) {
76459+ if (rt->rt6i_flow_cache_genid != atomic_read_unchecked(&flow_cache_genid)) {
76460 __sk_dst_reset(sk);
76461 dst = NULL;
76462 }
76463diff --git a/net/ipv6/ipv6_sockglue.c b/net/ipv6/ipv6_sockglue.c
76464index 26cb08c..8af9877 100644
76465--- a/net/ipv6/ipv6_sockglue.c
76466+++ b/net/ipv6/ipv6_sockglue.c
76467@@ -960,7 +960,7 @@ static int do_ipv6_getsockopt(struct sock *sk, int level, int optname,
76468 if (sk->sk_type != SOCK_STREAM)
76469 return -ENOPROTOOPT;
76470
76471- msg.msg_control = optval;
76472+ msg.msg_control = (void __force_kernel *)optval;
76473 msg.msg_controllen = len;
76474 msg.msg_flags = flags;
76475
76476diff --git a/net/ipv6/netfilter/ip6_tables.c b/net/ipv6/netfilter/ip6_tables.c
76477index 94874b0..dc413fa 100644
76478--- a/net/ipv6/netfilter/ip6_tables.c
76479+++ b/net/ipv6/netfilter/ip6_tables.c
76480@@ -1194,6 +1194,10 @@ get_entries(struct net *net, struct ip6t_get_entries __user *uptr,
76481 static int
76482 __do_replace(struct net *net, const char *name, unsigned int valid_hooks,
76483 struct xt_table_info *newinfo, unsigned int num_counters,
76484+ void __user *counters_ptr) __size_overflow(5);
76485+static int
76486+__do_replace(struct net *net, const char *name, unsigned int valid_hooks,
76487+ struct xt_table_info *newinfo, unsigned int num_counters,
76488 void __user *counters_ptr)
76489 {
76490 int ret;
76491@@ -1315,6 +1319,9 @@ do_replace(struct net *net, const void __user *user, unsigned int len)
76492
76493 static int
76494 do_add_counters(struct net *net, const void __user *user, unsigned int len,
76495+ int compat) __size_overflow(3);
76496+static int
76497+do_add_counters(struct net *net, const void __user *user, unsigned int len,
76498 int compat)
76499 {
76500 unsigned int i, curcpu;
76501diff --git a/net/ipv6/raw.c b/net/ipv6/raw.c
76502index 361ebf3..d5628fb 100644
76503--- a/net/ipv6/raw.c
76504+++ b/net/ipv6/raw.c
76505@@ -377,7 +377,7 @@ static inline int rawv6_rcv_skb(struct sock *sk, struct sk_buff *skb)
76506 {
76507 if ((raw6_sk(sk)->checksum || rcu_access_pointer(sk->sk_filter)) &&
76508 skb_checksum_complete(skb)) {
76509- atomic_inc(&sk->sk_drops);
76510+ atomic_inc_unchecked(&sk->sk_drops);
76511 kfree_skb(skb);
76512 return NET_RX_DROP;
76513 }
76514@@ -404,7 +404,7 @@ int rawv6_rcv(struct sock *sk, struct sk_buff *skb)
76515 struct raw6_sock *rp = raw6_sk(sk);
76516
76517 if (!xfrm6_policy_check(sk, XFRM_POLICY_IN, skb)) {
76518- atomic_inc(&sk->sk_drops);
76519+ atomic_inc_unchecked(&sk->sk_drops);
76520 kfree_skb(skb);
76521 return NET_RX_DROP;
76522 }
76523@@ -428,7 +428,7 @@ int rawv6_rcv(struct sock *sk, struct sk_buff *skb)
76524
76525 if (inet->hdrincl) {
76526 if (skb_checksum_complete(skb)) {
76527- atomic_inc(&sk->sk_drops);
76528+ atomic_inc_unchecked(&sk->sk_drops);
76529 kfree_skb(skb);
76530 return NET_RX_DROP;
76531 }
76532@@ -601,7 +601,7 @@ out:
76533 return err;
76534 }
76535
76536-static int rawv6_send_hdrinc(struct sock *sk, void *from, int length,
76537+static int rawv6_send_hdrinc(struct sock *sk, void *from, unsigned int length,
76538 struct flowi6 *fl6, struct dst_entry **dstp,
76539 unsigned int flags)
76540 {
76541@@ -909,12 +909,15 @@ do_confirm:
76542 static int rawv6_seticmpfilter(struct sock *sk, int level, int optname,
76543 char __user *optval, int optlen)
76544 {
76545+ struct icmp6_filter filter;
76546+
76547 switch (optname) {
76548 case ICMPV6_FILTER:
76549 if (optlen > sizeof(struct icmp6_filter))
76550 optlen = sizeof(struct icmp6_filter);
76551- if (copy_from_user(&raw6_sk(sk)->filter, optval, optlen))
76552+ if (copy_from_user(&filter, optval, optlen))
76553 return -EFAULT;
76554+ raw6_sk(sk)->filter = filter;
76555 return 0;
76556 default:
76557 return -ENOPROTOOPT;
76558@@ -927,6 +930,7 @@ static int rawv6_geticmpfilter(struct sock *sk, int level, int optname,
76559 char __user *optval, int __user *optlen)
76560 {
76561 int len;
76562+ struct icmp6_filter filter;
76563
76564 switch (optname) {
76565 case ICMPV6_FILTER:
76566@@ -938,7 +942,8 @@ static int rawv6_geticmpfilter(struct sock *sk, int level, int optname,
76567 len = sizeof(struct icmp6_filter);
76568 if (put_user(len, optlen))
76569 return -EFAULT;
76570- if (copy_to_user(optval, &raw6_sk(sk)->filter, len))
76571+ filter = raw6_sk(sk)->filter;
76572+ if (len > sizeof filter || copy_to_user(optval, &filter, len))
76573 return -EFAULT;
76574 return 0;
76575 default:
76576@@ -1245,7 +1250,13 @@ static void raw6_sock_seq_show(struct seq_file *seq, struct sock *sp, int i)
76577 0, 0L, 0,
76578 sock_i_uid(sp), 0,
76579 sock_i_ino(sp),
76580- atomic_read(&sp->sk_refcnt), sp, atomic_read(&sp->sk_drops));
76581+ atomic_read(&sp->sk_refcnt),
76582+#ifdef CONFIG_GRKERNSEC_HIDESYM
76583+ NULL,
76584+#else
76585+ sp,
76586+#endif
76587+ atomic_read_unchecked(&sp->sk_drops));
76588 }
76589
76590 static int raw6_seq_show(struct seq_file *seq, void *v)
76591diff --git a/net/ipv6/tcp_ipv6.c b/net/ipv6/tcp_ipv6.c
76592index b859e4a..f9d1589 100644
76593--- a/net/ipv6/tcp_ipv6.c
76594+++ b/net/ipv6/tcp_ipv6.c
76595@@ -93,6 +93,10 @@ static struct tcp_md5sig_key *tcp_v6_md5_do_lookup(struct sock *sk,
76596 }
76597 #endif
76598
76599+#ifdef CONFIG_GRKERNSEC_BLACKHOLE
76600+extern int grsec_enable_blackhole;
76601+#endif
76602+
76603 static void tcp_v6_hash(struct sock *sk)
76604 {
76605 if (sk->sk_state != TCP_CLOSE) {
76606@@ -1651,6 +1655,9 @@ static int tcp_v6_do_rcv(struct sock *sk, struct sk_buff *skb)
76607 return 0;
76608
76609 reset:
76610+#ifdef CONFIG_GRKERNSEC_BLACKHOLE
76611+ if (!grsec_enable_blackhole)
76612+#endif
76613 tcp_v6_send_reset(sk, skb);
76614 discard:
76615 if (opt_skb)
76616@@ -1730,12 +1737,20 @@ static int tcp_v6_rcv(struct sk_buff *skb)
76617 TCP_SKB_CB(skb)->sacked = 0;
76618
76619 sk = __inet6_lookup_skb(&tcp_hashinfo, skb, th->source, th->dest);
76620- if (!sk)
76621+ if (!sk) {
76622+#ifdef CONFIG_GRKERNSEC_BLACKHOLE
76623+ ret = 1;
76624+#endif
76625 goto no_tcp_socket;
76626+ }
76627
76628 process:
76629- if (sk->sk_state == TCP_TIME_WAIT)
76630+ if (sk->sk_state == TCP_TIME_WAIT) {
76631+#ifdef CONFIG_GRKERNSEC_BLACKHOLE
76632+ ret = 2;
76633+#endif
76634 goto do_time_wait;
76635+ }
76636
76637 if (hdr->hop_limit < inet6_sk(sk)->min_hopcount) {
76638 NET_INC_STATS_BH(net, LINUX_MIB_TCPMINTTLDROP);
76639@@ -1783,6 +1798,10 @@ no_tcp_socket:
76640 bad_packet:
76641 TCP_INC_STATS_BH(net, TCP_MIB_INERRS);
76642 } else {
76643+#ifdef CONFIG_GRKERNSEC_BLACKHOLE
76644+ if (!grsec_enable_blackhole || (ret == 1 &&
76645+ (skb->dev->flags & IFF_LOOPBACK)))
76646+#endif
76647 tcp_v6_send_reset(NULL, skb);
76648 }
76649
76650@@ -2043,7 +2062,13 @@ static void get_openreq6(struct seq_file *seq,
76651 uid,
76652 0, /* non standard timer */
76653 0, /* open_requests have no inode */
76654- 0, req);
76655+ 0,
76656+#ifdef CONFIG_GRKERNSEC_HIDESYM
76657+ NULL
76658+#else
76659+ req
76660+#endif
76661+ );
76662 }
76663
76664 static void get_tcp6_sock(struct seq_file *seq, struct sock *sp, int i)
76665@@ -2093,7 +2118,12 @@ static void get_tcp6_sock(struct seq_file *seq, struct sock *sp, int i)
76666 sock_i_uid(sp),
76667 icsk->icsk_probes_out,
76668 sock_i_ino(sp),
76669- atomic_read(&sp->sk_refcnt), sp,
76670+ atomic_read(&sp->sk_refcnt),
76671+#ifdef CONFIG_GRKERNSEC_HIDESYM
76672+ NULL,
76673+#else
76674+ sp,
76675+#endif
76676 jiffies_to_clock_t(icsk->icsk_rto),
76677 jiffies_to_clock_t(icsk->icsk_ack.ato),
76678 (icsk->icsk_ack.quick << 1 ) | icsk->icsk_ack.pingpong,
76679@@ -2128,7 +2158,13 @@ static void get_timewait6_sock(struct seq_file *seq,
76680 dest->s6_addr32[2], dest->s6_addr32[3], destp,
76681 tw->tw_substate, 0, 0,
76682 3, jiffies_to_clock_t(ttd), 0, 0, 0, 0,
76683- atomic_read(&tw->tw_refcnt), tw);
76684+ atomic_read(&tw->tw_refcnt),
76685+#ifdef CONFIG_GRKERNSEC_HIDESYM
76686+ NULL
76687+#else
76688+ tw
76689+#endif
76690+ );
76691 }
76692
76693 static int tcp6_seq_show(struct seq_file *seq, void *v)
76694diff --git a/net/ipv6/udp.c b/net/ipv6/udp.c
76695index 8c25419..47a51ae 100644
76696--- a/net/ipv6/udp.c
76697+++ b/net/ipv6/udp.c
76698@@ -50,6 +50,10 @@
76699 #include <linux/seq_file.h>
76700 #include "udp_impl.h"
76701
76702+#ifdef CONFIG_GRKERNSEC_BLACKHOLE
76703+extern int grsec_enable_blackhole;
76704+#endif
76705+
76706 int ipv6_rcv_saddr_equal(const struct sock *sk, const struct sock *sk2)
76707 {
76708 const struct in6_addr *sk_rcv_saddr6 = &inet6_sk(sk)->rcv_saddr;
76709@@ -549,7 +553,7 @@ int udpv6_queue_rcv_skb(struct sock * sk, struct sk_buff *skb)
76710
76711 return 0;
76712 drop:
76713- atomic_inc(&sk->sk_drops);
76714+ atomic_inc_unchecked(&sk->sk_drops);
76715 drop_no_sk_drops_inc:
76716 UDP6_INC_STATS_BH(sock_net(sk), UDP_MIB_INERRORS, is_udplite);
76717 kfree_skb(skb);
76718@@ -625,7 +629,7 @@ static void flush_stack(struct sock **stack, unsigned int count,
76719 continue;
76720 }
76721 drop:
76722- atomic_inc(&sk->sk_drops);
76723+ atomic_inc_unchecked(&sk->sk_drops);
76724 UDP6_INC_STATS_BH(sock_net(sk),
76725 UDP_MIB_RCVBUFERRORS, IS_UDPLITE(sk));
76726 UDP6_INC_STATS_BH(sock_net(sk),
76727@@ -780,6 +784,9 @@ int __udp6_lib_rcv(struct sk_buff *skb, struct udp_table *udptable,
76728 UDP6_INC_STATS_BH(net, UDP_MIB_NOPORTS,
76729 proto == IPPROTO_UDPLITE);
76730
76731+#ifdef CONFIG_GRKERNSEC_BLACKHOLE
76732+ if (!grsec_enable_blackhole || (skb->dev->flags & IFF_LOOPBACK))
76733+#endif
76734 icmpv6_send(skb, ICMPV6_DEST_UNREACH, ICMPV6_PORT_UNREACH, 0);
76735
76736 kfree_skb(skb);
76737@@ -796,7 +803,7 @@ int __udp6_lib_rcv(struct sk_buff *skb, struct udp_table *udptable,
76738 if (!sock_owned_by_user(sk))
76739 udpv6_queue_rcv_skb(sk, skb);
76740 else if (sk_add_backlog(sk, skb)) {
76741- atomic_inc(&sk->sk_drops);
76742+ atomic_inc_unchecked(&sk->sk_drops);
76743 bh_unlock_sock(sk);
76744 sock_put(sk);
76745 goto discard;
76746@@ -1407,8 +1414,13 @@ static void udp6_sock_seq_show(struct seq_file *seq, struct sock *sp, int bucket
76747 0, 0L, 0,
76748 sock_i_uid(sp), 0,
76749 sock_i_ino(sp),
76750- atomic_read(&sp->sk_refcnt), sp,
76751- atomic_read(&sp->sk_drops));
76752+ atomic_read(&sp->sk_refcnt),
76753+#ifdef CONFIG_GRKERNSEC_HIDESYM
76754+ NULL,
76755+#else
76756+ sp,
76757+#endif
76758+ atomic_read_unchecked(&sp->sk_drops));
76759 }
76760
76761 int udp6_seq_show(struct seq_file *seq, void *v)
76762diff --git a/net/irda/ircomm/ircomm_tty.c b/net/irda/ircomm/ircomm_tty.c
76763index 253695d..9481ce8 100644
76764--- a/net/irda/ircomm/ircomm_tty.c
76765+++ b/net/irda/ircomm/ircomm_tty.c
76766@@ -282,16 +282,16 @@ static int ircomm_tty_block_til_ready(struct ircomm_tty_cb *self,
76767 add_wait_queue(&self->open_wait, &wait);
76768
76769 IRDA_DEBUG(2, "%s(%d):block_til_ready before block on %s open_count=%d\n",
76770- __FILE__,__LINE__, tty->driver->name, self->open_count );
76771+ __FILE__,__LINE__, tty->driver->name, local_read(&self->open_count) );
76772
76773 /* As far as I can see, we protect open_count - Jean II */
76774 spin_lock_irqsave(&self->spinlock, flags);
76775 if (!tty_hung_up_p(filp)) {
76776 extra_count = 1;
76777- self->open_count--;
76778+ local_dec(&self->open_count);
76779 }
76780 spin_unlock_irqrestore(&self->spinlock, flags);
76781- self->blocked_open++;
76782+ local_inc(&self->blocked_open);
76783
76784 while (1) {
76785 if (tty->termios->c_cflag & CBAUD) {
76786@@ -331,7 +331,7 @@ static int ircomm_tty_block_til_ready(struct ircomm_tty_cb *self,
76787 }
76788
76789 IRDA_DEBUG(1, "%s(%d):block_til_ready blocking on %s open_count=%d\n",
76790- __FILE__,__LINE__, tty->driver->name, self->open_count );
76791+ __FILE__,__LINE__, tty->driver->name, local_read(&self->open_count) );
76792
76793 schedule();
76794 }
76795@@ -342,13 +342,13 @@ static int ircomm_tty_block_til_ready(struct ircomm_tty_cb *self,
76796 if (extra_count) {
76797 /* ++ is not atomic, so this should be protected - Jean II */
76798 spin_lock_irqsave(&self->spinlock, flags);
76799- self->open_count++;
76800+ local_inc(&self->open_count);
76801 spin_unlock_irqrestore(&self->spinlock, flags);
76802 }
76803- self->blocked_open--;
76804+ local_dec(&self->blocked_open);
76805
76806 IRDA_DEBUG(1, "%s(%d):block_til_ready after blocking on %s open_count=%d\n",
76807- __FILE__,__LINE__, tty->driver->name, self->open_count);
76808+ __FILE__,__LINE__, tty->driver->name, local_read(&self->open_count));
76809
76810 if (!retval)
76811 self->flags |= ASYNC_NORMAL_ACTIVE;
76812@@ -417,14 +417,14 @@ static int ircomm_tty_open(struct tty_struct *tty, struct file *filp)
76813 }
76814 /* ++ is not atomic, so this should be protected - Jean II */
76815 spin_lock_irqsave(&self->spinlock, flags);
76816- self->open_count++;
76817+ local_inc(&self->open_count);
76818
76819 tty->driver_data = self;
76820 self->tty = tty;
76821 spin_unlock_irqrestore(&self->spinlock, flags);
76822
76823 IRDA_DEBUG(1, "%s(), %s%d, count = %d\n", __func__ , tty->driver->name,
76824- self->line, self->open_count);
76825+ self->line, local_read(&self->open_count));
76826
76827 /* Not really used by us, but lets do it anyway */
76828 self->tty->low_latency = (self->flags & ASYNC_LOW_LATENCY) ? 1 : 0;
76829@@ -510,7 +510,7 @@ static void ircomm_tty_close(struct tty_struct *tty, struct file *filp)
76830 return;
76831 }
76832
76833- if ((tty->count == 1) && (self->open_count != 1)) {
76834+ if ((tty->count == 1) && (local_read(&self->open_count) != 1)) {
76835 /*
76836 * Uh, oh. tty->count is 1, which means that the tty
76837 * structure will be freed. state->count should always
76838@@ -520,16 +520,16 @@ static void ircomm_tty_close(struct tty_struct *tty, struct file *filp)
76839 */
76840 IRDA_DEBUG(0, "%s(), bad serial port count; "
76841 "tty->count is 1, state->count is %d\n", __func__ ,
76842- self->open_count);
76843- self->open_count = 1;
76844+ local_read(&self->open_count));
76845+ local_set(&self->open_count, 1);
76846 }
76847
76848- if (--self->open_count < 0) {
76849+ if (local_dec_return(&self->open_count) < 0) {
76850 IRDA_ERROR("%s(), bad serial port count for ttys%d: %d\n",
76851- __func__, self->line, self->open_count);
76852- self->open_count = 0;
76853+ __func__, self->line, local_read(&self->open_count));
76854+ local_set(&self->open_count, 0);
76855 }
76856- if (self->open_count) {
76857+ if (local_read(&self->open_count)) {
76858 spin_unlock_irqrestore(&self->spinlock, flags);
76859
76860 IRDA_DEBUG(0, "%s(), open count > 0\n", __func__ );
76861@@ -561,7 +561,7 @@ static void ircomm_tty_close(struct tty_struct *tty, struct file *filp)
76862 tty->closing = 0;
76863 self->tty = NULL;
76864
76865- if (self->blocked_open) {
76866+ if (local_read(&self->blocked_open)) {
76867 if (self->close_delay)
76868 schedule_timeout_interruptible(self->close_delay);
76869 wake_up_interruptible(&self->open_wait);
76870@@ -1013,7 +1013,7 @@ static void ircomm_tty_hangup(struct tty_struct *tty)
76871 spin_lock_irqsave(&self->spinlock, flags);
76872 self->flags &= ~ASYNC_NORMAL_ACTIVE;
76873 self->tty = NULL;
76874- self->open_count = 0;
76875+ local_set(&self->open_count, 0);
76876 spin_unlock_irqrestore(&self->spinlock, flags);
76877
76878 wake_up_interruptible(&self->open_wait);
76879@@ -1360,7 +1360,7 @@ static void ircomm_tty_line_info(struct ircomm_tty_cb *self, struct seq_file *m)
76880 seq_putc(m, '\n');
76881
76882 seq_printf(m, "Role: %s\n", self->client ? "client" : "server");
76883- seq_printf(m, "Open count: %d\n", self->open_count);
76884+ seq_printf(m, "Open count: %d\n", local_read(&self->open_count));
76885 seq_printf(m, "Max data size: %d\n", self->max_data_size);
76886 seq_printf(m, "Max header size: %d\n", self->max_header_size);
76887
76888diff --git a/net/iucv/af_iucv.c b/net/iucv/af_iucv.c
76889index 274d150..656a144 100644
76890--- a/net/iucv/af_iucv.c
76891+++ b/net/iucv/af_iucv.c
76892@@ -787,10 +787,10 @@ static int iucv_sock_autobind(struct sock *sk)
76893
76894 write_lock_bh(&iucv_sk_list.lock);
76895
76896- sprintf(name, "%08x", atomic_inc_return(&iucv_sk_list.autobind_name));
76897+ sprintf(name, "%08x", atomic_inc_return_unchecked(&iucv_sk_list.autobind_name));
76898 while (__iucv_get_sock_by_name(name)) {
76899 sprintf(name, "%08x",
76900- atomic_inc_return(&iucv_sk_list.autobind_name));
76901+ atomic_inc_return_unchecked(&iucv_sk_list.autobind_name));
76902 }
76903
76904 write_unlock_bh(&iucv_sk_list.lock);
76905diff --git a/net/key/af_key.c b/net/key/af_key.c
76906index 1e733e9..3d73c9f 100644
76907--- a/net/key/af_key.c
76908+++ b/net/key/af_key.c
76909@@ -3016,10 +3016,10 @@ static int pfkey_send_policy_notify(struct xfrm_policy *xp, int dir, const struc
76910 static u32 get_acqseq(void)
76911 {
76912 u32 res;
76913- static atomic_t acqseq;
76914+ static atomic_unchecked_t acqseq;
76915
76916 do {
76917- res = atomic_inc_return(&acqseq);
76918+ res = atomic_inc_return_unchecked(&acqseq);
76919 } while (!res);
76920 return res;
76921 }
76922diff --git a/net/mac80211/ieee80211_i.h b/net/mac80211/ieee80211_i.h
76923index 73495f1..ad51356 100644
76924--- a/net/mac80211/ieee80211_i.h
76925+++ b/net/mac80211/ieee80211_i.h
76926@@ -27,6 +27,7 @@
76927 #include <net/ieee80211_radiotap.h>
76928 #include <net/cfg80211.h>
76929 #include <net/mac80211.h>
76930+#include <asm/local.h>
76931 #include "key.h"
76932 #include "sta_info.h"
76933
76934@@ -764,7 +765,7 @@ struct ieee80211_local {
76935 /* also used to protect ampdu_ac_queue and amdpu_ac_stop_refcnt */
76936 spinlock_t queue_stop_reason_lock;
76937
76938- int open_count;
76939+ local_t open_count;
76940 int monitors, cooked_mntrs;
76941 /* number of interfaces with corresponding FIF_ flags */
76942 int fif_fcsfail, fif_plcpfail, fif_control, fif_other_bss, fif_pspoll,
76943diff --git a/net/mac80211/iface.c b/net/mac80211/iface.c
76944index 30d7355..e260095 100644
76945--- a/net/mac80211/iface.c
76946+++ b/net/mac80211/iface.c
76947@@ -211,7 +211,7 @@ static int ieee80211_do_open(struct net_device *dev, bool coming_up)
76948 break;
76949 }
76950
76951- if (local->open_count == 0) {
76952+ if (local_read(&local->open_count) == 0) {
76953 res = drv_start(local);
76954 if (res)
76955 goto err_del_bss;
76956@@ -235,7 +235,7 @@ static int ieee80211_do_open(struct net_device *dev, bool coming_up)
76957 memcpy(dev->perm_addr, dev->dev_addr, ETH_ALEN);
76958
76959 if (!is_valid_ether_addr(dev->dev_addr)) {
76960- if (!local->open_count)
76961+ if (!local_read(&local->open_count))
76962 drv_stop(local);
76963 return -EADDRNOTAVAIL;
76964 }
76965@@ -327,7 +327,7 @@ static int ieee80211_do_open(struct net_device *dev, bool coming_up)
76966 mutex_unlock(&local->mtx);
76967
76968 if (coming_up)
76969- local->open_count++;
76970+ local_inc(&local->open_count);
76971
76972 if (hw_reconf_flags) {
76973 ieee80211_hw_config(local, hw_reconf_flags);
76974@@ -347,7 +347,7 @@ static int ieee80211_do_open(struct net_device *dev, bool coming_up)
76975 err_del_interface:
76976 drv_remove_interface(local, &sdata->vif);
76977 err_stop:
76978- if (!local->open_count)
76979+ if (!local_read(&local->open_count))
76980 drv_stop(local);
76981 err_del_bss:
76982 sdata->bss = NULL;
76983@@ -472,7 +472,7 @@ static void ieee80211_do_stop(struct ieee80211_sub_if_data *sdata,
76984 }
76985
76986 if (going_down)
76987- local->open_count--;
76988+ local_dec(&local->open_count);
76989
76990 switch (sdata->vif.type) {
76991 case NL80211_IFTYPE_AP_VLAN:
76992@@ -531,7 +531,7 @@ static void ieee80211_do_stop(struct ieee80211_sub_if_data *sdata,
76993
76994 ieee80211_recalc_ps(local, -1);
76995
76996- if (local->open_count == 0) {
76997+ if (local_read(&local->open_count) == 0) {
76998 if (local->ops->napi_poll)
76999 napi_disable(&local->napi);
77000 ieee80211_clear_tx_pending(local);
77001diff --git a/net/mac80211/main.c b/net/mac80211/main.c
77002index 7d9b21d..0687004 100644
77003--- a/net/mac80211/main.c
77004+++ b/net/mac80211/main.c
77005@@ -163,7 +163,7 @@ int ieee80211_hw_config(struct ieee80211_local *local, u32 changed)
77006 local->hw.conf.power_level = power;
77007 }
77008
77009- if (changed && local->open_count) {
77010+ if (changed && local_read(&local->open_count)) {
77011 ret = drv_config(local, changed);
77012 /*
77013 * Goal:
77014diff --git a/net/mac80211/pm.c b/net/mac80211/pm.c
77015index 9ee7164..56c5061 100644
77016--- a/net/mac80211/pm.c
77017+++ b/net/mac80211/pm.c
77018@@ -34,7 +34,7 @@ int __ieee80211_suspend(struct ieee80211_hw *hw, struct cfg80211_wowlan *wowlan)
77019 struct ieee80211_sub_if_data *sdata;
77020 struct sta_info *sta;
77021
77022- if (!local->open_count)
77023+ if (!local_read(&local->open_count))
77024 goto suspend;
77025
77026 ieee80211_scan_cancel(local);
77027@@ -72,7 +72,7 @@ int __ieee80211_suspend(struct ieee80211_hw *hw, struct cfg80211_wowlan *wowlan)
77028 cancel_work_sync(&local->dynamic_ps_enable_work);
77029 del_timer_sync(&local->dynamic_ps_timer);
77030
77031- local->wowlan = wowlan && local->open_count;
77032+ local->wowlan = wowlan && local_read(&local->open_count);
77033 if (local->wowlan) {
77034 int err = drv_suspend(local, wowlan);
77035 if (err < 0) {
77036@@ -129,7 +129,7 @@ int __ieee80211_suspend(struct ieee80211_hw *hw, struct cfg80211_wowlan *wowlan)
77037 }
77038
77039 /* stop hardware - this must stop RX */
77040- if (local->open_count)
77041+ if (local_read(&local->open_count))
77042 ieee80211_stop_device(local);
77043
77044 suspend:
77045diff --git a/net/mac80211/rate.c b/net/mac80211/rate.c
77046index 7d84b87..6a69cd9 100644
77047--- a/net/mac80211/rate.c
77048+++ b/net/mac80211/rate.c
77049@@ -401,7 +401,7 @@ int ieee80211_init_rate_ctrl_alg(struct ieee80211_local *local,
77050
77051 ASSERT_RTNL();
77052
77053- if (local->open_count)
77054+ if (local_read(&local->open_count))
77055 return -EBUSY;
77056
77057 if (local->hw.flags & IEEE80211_HW_HAS_RATE_CONTROL) {
77058diff --git a/net/mac80211/rc80211_pid_debugfs.c b/net/mac80211/rc80211_pid_debugfs.c
77059index c97a065..ff61928 100644
77060--- a/net/mac80211/rc80211_pid_debugfs.c
77061+++ b/net/mac80211/rc80211_pid_debugfs.c
77062@@ -193,7 +193,7 @@ static ssize_t rate_control_pid_events_read(struct file *file, char __user *buf,
77063
77064 spin_unlock_irqrestore(&events->lock, status);
77065
77066- if (copy_to_user(buf, pb, p))
77067+ if (p > sizeof(pb) || copy_to_user(buf, pb, p))
77068 return -EFAULT;
77069
77070 return p;
77071diff --git a/net/mac80211/util.c b/net/mac80211/util.c
77072index d5230ec..c604b21 100644
77073--- a/net/mac80211/util.c
77074+++ b/net/mac80211/util.c
77075@@ -1000,7 +1000,7 @@ int ieee80211_reconfig(struct ieee80211_local *local)
77076 drv_set_coverage_class(local, hw->wiphy->coverage_class);
77077
77078 /* everything else happens only if HW was up & running */
77079- if (!local->open_count)
77080+ if (!local_read(&local->open_count))
77081 goto wake_up;
77082
77083 /*
77084diff --git a/net/netfilter/Kconfig b/net/netfilter/Kconfig
77085index d5597b7..ab6d39c 100644
77086--- a/net/netfilter/Kconfig
77087+++ b/net/netfilter/Kconfig
77088@@ -779,6 +779,16 @@ config NETFILTER_XT_MATCH_ESP
77089
77090 To compile it as a module, choose M here. If unsure, say N.
77091
77092+config NETFILTER_XT_MATCH_GRADM
77093+ tristate '"gradm" match support'
77094+ depends on NETFILTER_XTABLES && NETFILTER_ADVANCED
77095+ depends on GRKERNSEC && !GRKERNSEC_NO_RBAC
77096+ ---help---
77097+ The gradm match allows to match on grsecurity RBAC being enabled.
77098+ It is useful when iptables rules are applied early on bootup to
77099+ prevent connections to the machine (except from a trusted host)
77100+ while the RBAC system is disabled.
77101+
77102 config NETFILTER_XT_MATCH_HASHLIMIT
77103 tristate '"hashlimit" match support'
77104 depends on (IP6_NF_IPTABLES || IP6_NF_IPTABLES=n)
77105diff --git a/net/netfilter/Makefile b/net/netfilter/Makefile
77106index 1a02853..5d8c22e 100644
77107--- a/net/netfilter/Makefile
77108+++ b/net/netfilter/Makefile
77109@@ -81,6 +81,7 @@ obj-$(CONFIG_NETFILTER_XT_MATCH_DCCP) += xt_dccp.o
77110 obj-$(CONFIG_NETFILTER_XT_MATCH_DEVGROUP) += xt_devgroup.o
77111 obj-$(CONFIG_NETFILTER_XT_MATCH_DSCP) += xt_dscp.o
77112 obj-$(CONFIG_NETFILTER_XT_MATCH_ESP) += xt_esp.o
77113+obj-$(CONFIG_NETFILTER_XT_MATCH_GRADM) += xt_gradm.o
77114 obj-$(CONFIG_NETFILTER_XT_MATCH_HASHLIMIT) += xt_hashlimit.o
77115 obj-$(CONFIG_NETFILTER_XT_MATCH_HELPER) += xt_helper.o
77116 obj-$(CONFIG_NETFILTER_XT_MATCH_HL) += xt_hl.o
77117diff --git a/net/netfilter/ipvs/ip_vs_conn.c b/net/netfilter/ipvs/ip_vs_conn.c
77118index 29fa5ba..8debc79 100644
77119--- a/net/netfilter/ipvs/ip_vs_conn.c
77120+++ b/net/netfilter/ipvs/ip_vs_conn.c
77121@@ -556,7 +556,7 @@ ip_vs_bind_dest(struct ip_vs_conn *cp, struct ip_vs_dest *dest)
77122 /* Increase the refcnt counter of the dest */
77123 atomic_inc(&dest->refcnt);
77124
77125- conn_flags = atomic_read(&dest->conn_flags);
77126+ conn_flags = atomic_read_unchecked(&dest->conn_flags);
77127 if (cp->protocol != IPPROTO_UDP)
77128 conn_flags &= ~IP_VS_CONN_F_ONE_PACKET;
77129 /* Bind with the destination and its corresponding transmitter */
77130@@ -869,7 +869,7 @@ ip_vs_conn_new(const struct ip_vs_conn_param *p,
77131 atomic_set(&cp->refcnt, 1);
77132
77133 atomic_set(&cp->n_control, 0);
77134- atomic_set(&cp->in_pkts, 0);
77135+ atomic_set_unchecked(&cp->in_pkts, 0);
77136
77137 atomic_inc(&ipvs->conn_count);
77138 if (flags & IP_VS_CONN_F_NO_CPORT)
77139@@ -1149,7 +1149,7 @@ static inline int todrop_entry(struct ip_vs_conn *cp)
77140
77141 /* Don't drop the entry if its number of incoming packets is not
77142 located in [0, 8] */
77143- i = atomic_read(&cp->in_pkts);
77144+ i = atomic_read_unchecked(&cp->in_pkts);
77145 if (i > 8 || i < 0) return 0;
77146
77147 if (!todrop_rate[i]) return 0;
77148diff --git a/net/netfilter/ipvs/ip_vs_core.c b/net/netfilter/ipvs/ip_vs_core.c
77149index 6dc7d7d..e45913a 100644
77150--- a/net/netfilter/ipvs/ip_vs_core.c
77151+++ b/net/netfilter/ipvs/ip_vs_core.c
77152@@ -562,7 +562,7 @@ int ip_vs_leave(struct ip_vs_service *svc, struct sk_buff *skb,
77153 ret = cp->packet_xmit(skb, cp, pd->pp);
77154 /* do not touch skb anymore */
77155
77156- atomic_inc(&cp->in_pkts);
77157+ atomic_inc_unchecked(&cp->in_pkts);
77158 ip_vs_conn_put(cp);
77159 return ret;
77160 }
77161@@ -1611,7 +1611,7 @@ ip_vs_in(unsigned int hooknum, struct sk_buff *skb, int af)
77162 if (cp->flags & IP_VS_CONN_F_ONE_PACKET)
77163 pkts = sysctl_sync_threshold(ipvs);
77164 else
77165- pkts = atomic_add_return(1, &cp->in_pkts);
77166+ pkts = atomic_add_return_unchecked(1, &cp->in_pkts);
77167
77168 if ((ipvs->sync_state & IP_VS_STATE_MASTER) &&
77169 cp->protocol == IPPROTO_SCTP) {
77170diff --git a/net/netfilter/ipvs/ip_vs_ctl.c b/net/netfilter/ipvs/ip_vs_ctl.c
77171index e1a66cf..0910076 100644
77172--- a/net/netfilter/ipvs/ip_vs_ctl.c
77173+++ b/net/netfilter/ipvs/ip_vs_ctl.c
77174@@ -788,7 +788,7 @@ __ip_vs_update_dest(struct ip_vs_service *svc, struct ip_vs_dest *dest,
77175 ip_vs_rs_hash(ipvs, dest);
77176 write_unlock_bh(&ipvs->rs_lock);
77177 }
77178- atomic_set(&dest->conn_flags, conn_flags);
77179+ atomic_set_unchecked(&dest->conn_flags, conn_flags);
77180
77181 /* bind the service */
77182 if (!dest->svc) {
77183@@ -2028,7 +2028,7 @@ static int ip_vs_info_seq_show(struct seq_file *seq, void *v)
77184 " %-7s %-6d %-10d %-10d\n",
77185 &dest->addr.in6,
77186 ntohs(dest->port),
77187- ip_vs_fwd_name(atomic_read(&dest->conn_flags)),
77188+ ip_vs_fwd_name(atomic_read_unchecked(&dest->conn_flags)),
77189 atomic_read(&dest->weight),
77190 atomic_read(&dest->activeconns),
77191 atomic_read(&dest->inactconns));
77192@@ -2039,7 +2039,7 @@ static int ip_vs_info_seq_show(struct seq_file *seq, void *v)
77193 "%-7s %-6d %-10d %-10d\n",
77194 ntohl(dest->addr.ip),
77195 ntohs(dest->port),
77196- ip_vs_fwd_name(atomic_read(&dest->conn_flags)),
77197+ ip_vs_fwd_name(atomic_read_unchecked(&dest->conn_flags)),
77198 atomic_read(&dest->weight),
77199 atomic_read(&dest->activeconns),
77200 atomic_read(&dest->inactconns));
77201@@ -2509,7 +2509,7 @@ __ip_vs_get_dest_entries(struct net *net, const struct ip_vs_get_dests *get,
77202
77203 entry.addr = dest->addr.ip;
77204 entry.port = dest->port;
77205- entry.conn_flags = atomic_read(&dest->conn_flags);
77206+ entry.conn_flags = atomic_read_unchecked(&dest->conn_flags);
77207 entry.weight = atomic_read(&dest->weight);
77208 entry.u_threshold = dest->u_threshold;
77209 entry.l_threshold = dest->l_threshold;
77210@@ -3042,7 +3042,7 @@ static int ip_vs_genl_fill_dest(struct sk_buff *skb, struct ip_vs_dest *dest)
77211 NLA_PUT_U16(skb, IPVS_DEST_ATTR_PORT, dest->port);
77212
77213 NLA_PUT_U32(skb, IPVS_DEST_ATTR_FWD_METHOD,
77214- atomic_read(&dest->conn_flags) & IP_VS_CONN_F_FWD_MASK);
77215+ atomic_read_unchecked(&dest->conn_flags) & IP_VS_CONN_F_FWD_MASK);
77216 NLA_PUT_U32(skb, IPVS_DEST_ATTR_WEIGHT, atomic_read(&dest->weight));
77217 NLA_PUT_U32(skb, IPVS_DEST_ATTR_U_THRESH, dest->u_threshold);
77218 NLA_PUT_U32(skb, IPVS_DEST_ATTR_L_THRESH, dest->l_threshold);
77219diff --git a/net/netfilter/ipvs/ip_vs_sync.c b/net/netfilter/ipvs/ip_vs_sync.c
77220index 2b6678c0..aaa41fc 100644
77221--- a/net/netfilter/ipvs/ip_vs_sync.c
77222+++ b/net/netfilter/ipvs/ip_vs_sync.c
77223@@ -649,7 +649,7 @@ control:
77224 * i.e only increment in_pkts for Templates.
77225 */
77226 if (cp->flags & IP_VS_CONN_F_TEMPLATE) {
77227- int pkts = atomic_add_return(1, &cp->in_pkts);
77228+ int pkts = atomic_add_return_unchecked(1, &cp->in_pkts);
77229
77230 if (pkts % sysctl_sync_period(ipvs) != 1)
77231 return;
77232@@ -795,7 +795,7 @@ static void ip_vs_proc_conn(struct net *net, struct ip_vs_conn_param *param,
77233
77234 if (opt)
77235 memcpy(&cp->in_seq, opt, sizeof(*opt));
77236- atomic_set(&cp->in_pkts, sysctl_sync_threshold(ipvs));
77237+ atomic_set_unchecked(&cp->in_pkts, sysctl_sync_threshold(ipvs));
77238 cp->state = state;
77239 cp->old_state = cp->state;
77240 /*
77241diff --git a/net/netfilter/ipvs/ip_vs_xmit.c b/net/netfilter/ipvs/ip_vs_xmit.c
77242index aa2d720..d8aa111 100644
77243--- a/net/netfilter/ipvs/ip_vs_xmit.c
77244+++ b/net/netfilter/ipvs/ip_vs_xmit.c
77245@@ -1151,7 +1151,7 @@ ip_vs_icmp_xmit(struct sk_buff *skb, struct ip_vs_conn *cp,
77246 else
77247 rc = NF_ACCEPT;
77248 /* do not touch skb anymore */
77249- atomic_inc(&cp->in_pkts);
77250+ atomic_inc_unchecked(&cp->in_pkts);
77251 goto out;
77252 }
77253
77254@@ -1272,7 +1272,7 @@ ip_vs_icmp_xmit_v6(struct sk_buff *skb, struct ip_vs_conn *cp,
77255 else
77256 rc = NF_ACCEPT;
77257 /* do not touch skb anymore */
77258- atomic_inc(&cp->in_pkts);
77259+ atomic_inc_unchecked(&cp->in_pkts);
77260 goto out;
77261 }
77262
77263diff --git a/net/netfilter/nfnetlink_log.c b/net/netfilter/nfnetlink_log.c
77264index 66b2c54..c7884e3 100644
77265--- a/net/netfilter/nfnetlink_log.c
77266+++ b/net/netfilter/nfnetlink_log.c
77267@@ -70,7 +70,7 @@ struct nfulnl_instance {
77268 };
77269
77270 static DEFINE_SPINLOCK(instances_lock);
77271-static atomic_t global_seq;
77272+static atomic_unchecked_t global_seq;
77273
77274 #define INSTANCE_BUCKETS 16
77275 static struct hlist_head instance_table[INSTANCE_BUCKETS];
77276@@ -502,7 +502,7 @@ __build_packet_message(struct nfulnl_instance *inst,
77277 /* global sequence number */
77278 if (inst->flags & NFULNL_CFG_F_SEQ_GLOBAL)
77279 NLA_PUT_BE32(inst->skb, NFULA_SEQ_GLOBAL,
77280- htonl(atomic_inc_return(&global_seq)));
77281+ htonl(atomic_inc_return_unchecked(&global_seq)));
77282
77283 if (data_len) {
77284 struct nlattr *nla;
77285diff --git a/net/netfilter/xt_gradm.c b/net/netfilter/xt_gradm.c
77286new file mode 100644
77287index 0000000..6905327
77288--- /dev/null
77289+++ b/net/netfilter/xt_gradm.c
77290@@ -0,0 +1,51 @@
77291+/*
77292+ * gradm match for netfilter
77293